From dadbad0bef84f671c8194c84080c760453ecc423 Mon Sep 17 00:00:00 2001
From: Mohamed Issa <missa@openjdk.org>
Date: Tue, 4 Nov 2025 01:58:34 +0000
Subject: [PATCH 001/512] 8371088: Build fails when trying hsdis option

Reviewed-by: erikj
---
 make/autoconf/lib-hsdis.m4 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make/autoconf/lib-hsdis.m4 b/make/autoconf/lib-hsdis.m4
index 784c76424cf..0530ef90be8 100644
--- a/make/autoconf/lib-hsdis.m4
+++ b/make/autoconf/lib-hsdis.m4
@@ -304,6 +304,8 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
       # If we have libsframe add it.
       if test -e $BINUTILS_INSTALL_DIR/lib/libsframe.a; then
         HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib/libsframe.a"
+      elif test -e $BINUTILS_INSTALL_DIR/lib64/libsframe.a; then
+        HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib64/libsframe.a"
       fi
       AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], AC_MSG_ERROR([libz not found]))
     else

From 576f9694b092f2a11a6a4e5a82c2b0e12203bd9c Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Tue, 4 Nov 2025 01:58:54 +0000
Subject: [PATCH 002/512] 8361106: [TEST] com/sun/net/httpserver/Test9.java
 fails with java.nio.file.FileSystemException

Reviewed-by: dfuchs
---
 test/jdk/com/sun/net/httpserver/Test9.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/test/jdk/com/sun/net/httpserver/Test9.java b/test/jdk/com/sun/net/httpserver/Test9.java
index 6f7b1d4f5bc..6051de96596 100644
--- a/test/jdk/com/sun/net/httpserver/Test9.java
+++ b/test/jdk/com/sun/net/httpserver/Test9.java
@@ -59,7 +59,7 @@ public class Test9 extends Test {
             HttpServer.class.getPackageName() + '-' + Test9.class.getSimpleName() + '-';
 
     static SSLContext ctx;
-    static boolean error = false;
+    static volatile boolean error = false;
 
     public static void main (String[] args) throws Exception {
         HttpServer s1 = null;
@@ -67,6 +67,8 @@ public class Test9 extends Test {
         ExecutorService executor=null;
         Path smallFilePath = createTempFileOfSize(TEMP_FILE_PREFIX, null, 23);
         Path largeFilePath = createTempFileOfSize(TEMP_FILE_PREFIX, null, 2730088);
+        smallFilePath.toFile().deleteOnExit();
+        largeFilePath.toFile().deleteOnExit();
         try {
             System.out.print ("Test9: ");
             InetAddress loopback = InetAddress.getLoopbackAddress();
@@ -122,20 +124,16 @@ public class Test9 extends Test {
                 s2.stop(0);
             if (executor != null)
                 executor.shutdown ();
-            Files.delete(smallFilePath);
-            Files.delete(largeFilePath);
         }
     }
 
-    static int foo = 1;
-
     static ClientThread test (boolean fixedLen, String protocol, int port, Path filePath) throws Exception {
         ClientThread t = new ClientThread (fixedLen, protocol, port, filePath);
         t.start();
         return t;
     }
 
-    static Object fileLock = new Object();
+    static final Object fileLock = new Object();
 
     static class ClientThread extends Thread {
 
@@ -203,9 +201,8 @@ public class Test9 extends Test {
                     error = true;
                 }
                 assertFileContentsEqual(filePath, temp.toPath());
-                temp.delete();
             } catch (Exception e) {
-                e.printStackTrace();
+                System.err.println("Error occurred: " + e);
                 error = true;
             }
         }

From 50bb92a33b32778a96b1823ff995889892bef890 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Tue, 4 Nov 2025 04:59:32 +0000
Subject: [PATCH 003/512] 8370871: [s390x] consistently update top_frame_sp

Reviewed-by: rrich, lucy
---
 src/hotspot/cpu/s390/interp_masm_s390.cpp     | 21 ++++++++++++++-----
 .../templateInterpreterGenerator_s390.cpp     | 21 +++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index aa3d4849062..f62051c628e 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -575,11 +575,17 @@ void InterpreterMacroAssembler::store_ptr(int n, Register val) {
 void InterpreterMacroAssembler::prepare_to_jump_from_interpreted(Register method) {
   // Satisfy interpreter calling convention (see generate_normal_entry()).
   z_lgr(Z_R10, Z_SP); // Set sender sp (aka initial caller sp, aka unextended sp).
-  // Record top_frame_sp, because the callee might modify it, if it's compiled.
-  assert_different_registers(Z_R1, method);
-  z_sgrk(Z_R1, Z_SP, Z_fp);
-  z_srag(Z_R1, Z_R1, Interpreter::logStackElementSize);
-  z_stg(Z_R1, _z_ijava_state_neg(top_frame_sp), Z_fp);
+#ifdef ASSERT
+  NearLabel ok;
+  Register tmp = Z_R1;
+  z_lg(tmp, Address(Z_fp, _z_ijava_state_neg(top_frame_sp)));
+  z_slag(tmp, tmp, Interpreter::logStackElementSize);
+  z_agr(tmp, Z_fp);
+  z_cgr(tmp, Z_SP);
+  z_bre(ok);
+  stop("corrupted top_frame_sp");
+  bind(ok);
+#endif
   save_bcp();
   save_esp();
   z_lgr(Z_method, method); // Set Z_method (kills Z_fp!).
@@ -1918,6 +1924,11 @@ void InterpreterMacroAssembler::add_monitor_to_stack(bool     stack_is_empty,
   // Adjust stack pointer for additional monitor entry.
   resize_frame(RegisterOrConstant((intptr_t) delta), Z_fp, false);
 
+  // Rtemp3 is free at this point, use it to store top_frame_sp
+  z_sgrk(Rtemp3, Z_SP, Z_fp);
+  z_srag(Rtemp3, Rtemp3, Interpreter::logStackElementSize);
+  reg2mem_opt(Rtemp3, Address(Z_fp, _z_ijava_state_neg(top_frame_sp)));
+
   if (!stack_is_empty) {
     // Must copy stack contents down.
     NearLabel next, done;
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 3f568572966..2da21f08bbc 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1100,6 +1100,11 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
 
   // ... and push the new frame F0.
   __ push_frame(top_frame_size, fp, true /*copy_sp*/, false);
+
+  __ z_lcgr(top_frame_size);  // negate
+  __ z_srag(top_frame_size, top_frame_size, Interpreter::logStackElementSize);
+  // Store relativized top_frame_sp
+  __ z_stg(top_frame_size, _z_ijava_state_neg(top_frame_sp), fp);
   }
 
   //=============================================================================
@@ -2068,6 +2073,14 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
   __ z_lg(Z_fp, _z_abi(callers_sp), Z_SP); // Frame accessors use Z_fp.
   // Z_ARG1 (==Z_tos): exception
   // Z_ARG2          : Return address/pc that threw exception.
+  {
+    Register top_frame_sp = Z_R1_scratch; // anyway going to load it with correct value
+    __ z_lg(top_frame_sp, Address(Z_fp, _z_ijava_state_neg(top_frame_sp)));
+    __ z_slag(top_frame_sp, top_frame_sp, Interpreter::logStackElementSize);
+    __ z_agr(top_frame_sp, Z_fp);
+
+    __ resize_frame_absolute(top_frame_sp, /* temp = */ Z_R0, /* load_fp = */ true);
+  }
   __ restore_bcp();    // R13 points to call/send.
   __ restore_locals();
 
@@ -2175,6 +2188,14 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
                        false,  // install_monitor_exception
                        false); // notify_jvmdi
   __ z_lg(Z_fp, _z_abi(callers_sp), Z_SP); // Restore frame pointer.
+  {
+    Register top_frame_sp = Z_R1_scratch;
+    __ z_lg(top_frame_sp, Address(Z_fp, _z_ijava_state_neg(top_frame_sp)));
+    __ z_slag(top_frame_sp, top_frame_sp, Interpreter::logStackElementSize);
+    __ z_agr(top_frame_sp, Z_fp);
+
+    __ resize_frame_absolute(top_frame_sp, /* temp = */ Z_R0, /* load_fp = */ true);
+  }
   __ restore_bcp();
   __ restore_locals();
   __ restore_esp();

From 75e37b06c3e37ee49719a0c0d6b4ab2c4ff76098 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 4 Nov 2025 07:39:11 +0000
Subject: [PATCH 004/512] 8370332: C2 SuperWord: SIGSEGV because
 PhaseIdealLoop::split_thru_phi left dead nodes in loop _body

Reviewed-by: chagedorn, roland
---
 src/hotspot/share/opto/loopnode.hpp           |  3 +
 src/hotspot/share/opto/loopopts.cpp           | 45 +++++++----
 src/hotspot/share/opto/node.cpp               | 14 ++++
 src/hotspot/share/opto/node.hpp               |  7 ++
 ...litThruPhiRemoveDeadNodesFromLoopBody.java | 80 +++++++++++++++++++
 5 files changed, 134 insertions(+), 15 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestSplitThruPhiRemoveDeadNodesFromLoopBody.java

diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index aee934b0d11..7ea66ea5486 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1742,6 +1742,9 @@ private:
     }
   };
 
+
+  void split_thru_phi_yank_old_nodes(Node* n, Node* region);
+
 public:
 
   // Conversion of fill/copy patterns into intrinsic versions
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 71e52f373f7..cfbb4fabc0f 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -228,6 +228,9 @@ Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) {
     }
   }
 
+  split_thru_phi_yank_old_nodes(n, region);
+  _igvn.replace_node(n, phi);
+
 #ifndef PRODUCT
   if (TraceLoopOpts) {
     tty->print_cr("Split %d %s through %d Phi in %d %s",
@@ -238,6 +241,28 @@ Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) {
   return phi;
 }
 
+// If the region is a Loop, we are removing the old n,
+// and need to yank it from the _body. If any phi we
+// just split through now has no use any more, it also
+// has to be removed.
+void PhaseIdealLoop::split_thru_phi_yank_old_nodes(Node* n, Node* region) {
+  IdealLoopTree* region_loop = get_loop(region);
+  if (region->is_Loop() && region_loop->is_innermost()) {
+    region_loop->_body.yank(n);
+    for (uint j = 1; j < n->req(); j++) {
+      PhiNode* phi = n->in(j)->isa_Phi();
+      // Check that phi belongs to the region and only has n as a use.
+      if (phi != nullptr &&
+          phi->in(0) == region &&
+          phi->unique_multiple_edges_out_or_null() == n) {
+        assert(get_ctrl(phi) == region, "sanity");
+        assert(get_ctrl(n) == region, "sanity");
+        region_loop->_body.yank(phi);
+      }
+    }
+  }
+}
+
 // Test whether node 'x' can move into an inner loop relative to node 'n'.
 // Note: The test is not exact. Returns true if 'x' COULD end up in an inner loop,
 // BUT it can also return true and 'x' is in the outer loop
@@ -1207,13 +1232,10 @@ Node *PhaseIdealLoop::split_if_with_blocks_pre( Node *n ) {
 
   if (must_throttle_split_if()) return n;
 
-  // Split 'n' through the merge point if it is profitable
-  Node *phi = split_thru_phi( n, n_blk, policy );
-  if (!phi) return n;
+  // Split 'n' through the merge point if it is profitable, replacing it with a new phi.
+  Node* phi = split_thru_phi(n, n_blk, policy);
+  if (phi == nullptr) { return n; }
 
-  // Found a Phi to split thru!
-  // Replace 'n' with the new phi
-  _igvn.replace_node( n, phi );
   // Moved a load around the loop, 'en-registering' something.
   if (n_blk->is_Loop() && n->is_Load() &&
       !phi->in(LoopNode::LoopBackControl)->is_Load())
@@ -1444,15 +1466,9 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
       return;
     }
 
-    // Found a Phi to split thru!
-    // Replace 'n' with the new phi
-    _igvn.replace_node(n, phi);
-
     // Now split the bool up thru the phi
-    Node *bolphi = split_thru_phi(bol, n_ctrl, -1);
+    Node* bolphi = split_thru_phi(bol, n_ctrl, -1);
     guarantee(bolphi != nullptr, "null boolean phi node");
-
-    _igvn.replace_node(bol, bolphi);
     assert(iff->in(1) == bolphi, "");
 
     if (bolphi->Value(&_igvn)->singleton()) {
@@ -1461,8 +1477,7 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
 
     // Conditional-move?  Must split up now
     if (!iff->is_If()) {
-      Node *cmovphi = split_thru_phi(iff, n_ctrl, -1);
-      _igvn.replace_node(iff, cmovphi);
+      Node* cmovphi = split_thru_phi(iff, n_ctrl, -1);
       return;
     }
 
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 497d0d1aeb0..3a41353101d 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -2889,6 +2889,20 @@ Node* Node::find_similar(int opc) {
   return nullptr;
 }
 
+Node* Node::unique_multiple_edges_out_or_null() const {
+  Node* use = nullptr;
+  for (DUIterator_Fast kmax, k = fast_outs(kmax); k < kmax; k++) {
+    Node* u = fast_out(k);
+    if (use == nullptr) {
+      use = u; // first use
+    } else if (u != use) {
+      return nullptr; // not unique
+    } else {
+      // secondary use
+    }
+  }
+  return use;
+}
 
 //--------------------------unique_ctrl_out_or_null-------------------------
 // Return the unique control out if only one. Null if none or more than one.
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 9ce9e705eec..4e8d74a6f5e 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -422,6 +422,13 @@ public:
   Node* raw_out(uint i) const { assert(i < _outcnt,"oob"); return _out[i]; }
   // Return the unique out edge.
   Node* unique_out() const { assert(_outcnt==1,"not unique"); return _out[0]; }
+
+  // In some cases, a node n is only used by a single use, but the use may use
+  // n once or multiple times:
+  //   use = ConvF2I(this)
+  //   use = AddI(this, this)
+  Node* unique_multiple_edges_out_or_null() const;
+
   // Delete out edge at position 'i' by moving last out edge to position 'i'
   void  raw_del_out(uint i) {
     assert(i < _outcnt,"oob");
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestSplitThruPhiRemoveDeadNodesFromLoopBody.java b/test/hotspot/jtreg/compiler/loopopts/TestSplitThruPhiRemoveDeadNodesFromLoopBody.java
new file mode 100644
index 00000000000..e27f2bf2fa4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestSplitThruPhiRemoveDeadNodesFromLoopBody.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=with-flags
+ * @bug 8370332
+ * @summary This test shows a case where split_if split a node through a phi, but left the
+ *          dead node and a dead phi in the loop _body. Subsequently, SuperWord was run, and
+ *          found the dead nodes in the _body, which is not expected.
+ * @run main/othervm
+ *      -XX:CompileCommand=compileonly,*TestSplitThruPhiRemoveDeadNodesFromLoopBody::test
+ *      -Xbatch
+ *      compiler.loopopts.superword.TestSplitThruPhiRemoveDeadNodesFromLoopBody
+ */
+
+/*
+ * @test id=vanilla
+ * @bug 8370332
+ * @run main compiler.loopopts.superword.TestSplitThruPhiRemoveDeadNodesFromLoopBody
+ */
+
+package compiler.loopopts.superword;
+
+public class TestSplitThruPhiRemoveDeadNodesFromLoopBody {
+    static int N = 400;
+    static float floatZero = 0;
+    static boolean falseFlag = false;;
+
+    static int fieldStore = 0;
+    static int fieldIncr = 0;
+    static int arrayI[] = new int[N];
+
+    static void inlined() {
+        int x = 0;
+        for (int i = 0; i < 100; i++) {
+            fieldStore = 42;
+            if (falseFlag) {
+                for (int k = 0; k < 20; k++) {
+                    x += i;
+                }
+            }
+        }
+    }
+
+    static void test() {
+        inlined();
+        for (int k = 0; k < 10; k++) {
+            for (int j = 0; j < 100; j++) {
+                fieldIncr += floatZero;
+                arrayI[j] = 42; // SuperWord happens here -> SIGSEGV
+            }
+        }
+    }
+
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 1_000; i++) {
+            test();
+        }
+    }
+}

From c1476fca9d7a679d32b7b43956638b845d1027cc Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Tue, 4 Nov 2025 08:03:30 +0000
Subject: [PATCH 005/512] 8366575: Remove SDP support

Reviewed-by: alanb, erikj, jpai, michaelm
---
 make/modules/java.base/Copy.gmk               |   9 -
 .../share/classes/sun/net/sdp/SdpSupport.java |  78 -----
 .../AsynchronousServerSocketChannelImpl.java  |   2 -
 .../nio/ch/AsynchronousSocketChannelImpl.java |   2 -
 .../classes/sun/nio/ch/NioSocketImpl.java     |   7 -
 .../sun/nio/ch/ServerSocketChannelImpl.java   |   2 -
 .../classes/sun/nio/ch/SocketChannelImpl.java |   3 -
 .../unix/classes/sun/net/NetHooks.java        |  96 ------
 .../unix/classes/sun/net/sdp/SdpProvider.java | 326 ------------------
 .../ch/UnixAsynchronousSocketChannelImpl.java |   6 -
 src/java.base/unix/conf/sdp/sdp.conf.template |  30 --
 src/java.base/unix/native/libnet/SdpSupport.c | 112 ------
 .../windows/classes/sun/net/NetHooks.java     |  59 ----
 13 files changed, 732 deletions(-)
 delete mode 100644 src/java.base/share/classes/sun/net/sdp/SdpSupport.java
 delete mode 100644 src/java.base/unix/classes/sun/net/NetHooks.java
 delete mode 100644 src/java.base/unix/classes/sun/net/sdp/SdpProvider.java
 delete mode 100644 src/java.base/unix/conf/sdp/sdp.conf.template
 delete mode 100644 src/java.base/unix/native/libnet/SdpSupport.c
 delete mode 100644 src/java.base/windows/classes/sun/net/NetHooks.java

diff --git a/make/modules/java.base/Copy.gmk b/make/modules/java.base/Copy.gmk
index 4625c1f7dbc..b8c1f2c05fa 100644
--- a/make/modules/java.base/Copy.gmk
+++ b/make/modules/java.base/Copy.gmk
@@ -145,15 +145,6 @@ $(NET_PROPERTIES_DST): $(NET_PROPERTIES_SRCS)
 
 TARGETS += $(NET_PROPERTIES_DST)
 
-ifeq ($(call isTargetOs, linux), true)
-  $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
-      FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
-      DEST := $(CONF_DST_DIR)/sdp, \
-  ))
-
-  TARGETS += $(COPY_SDP_CONF)
-endif
-
 ################################################################################
 
 # JDK license and assembly exception files to be packaged in JMOD
diff --git a/src/java.base/share/classes/sun/net/sdp/SdpSupport.java b/src/java.base/share/classes/sun/net/sdp/SdpSupport.java
deleted file mode 100644
index 5aa1ecaed8a..00000000000
--- a/src/java.base/share/classes/sun/net/sdp/SdpSupport.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.net.sdp;
-
-import java.io.IOException;
-import java.io.FileDescriptor;
-
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.access.JavaIOFileDescriptorAccess;
-import jdk.internal.util.OperatingSystem;
-
-
-/**
- * This class defines methods for creating SDP sockets or "converting" existing
- * file descriptors, referencing (unbound) TCP sockets, to SDP.
- */
-
-public final class SdpSupport {
-    private static final boolean isSupported = OperatingSystem.isLinux();
-    private static final JavaIOFileDescriptorAccess fdAccess =
-        SharedSecrets.getJavaIOFileDescriptorAccess();
-
-    private SdpSupport() { }
-
-    /**
-     * Creates a SDP socket, returning file descriptor referencing the socket.
-     */
-    public static FileDescriptor createSocket() throws IOException {
-        if (!isSupported)
-            throw new UnsupportedOperationException("SDP not supported on this platform");
-        int fdVal = create0();
-        FileDescriptor fd = new FileDescriptor();
-        fdAccess.set(fd, fdVal);
-        return fd;
-    }
-
-    /**
-     * Converts an existing file descriptor, that references an unbound TCP socket,
-     * to SDP.
-     */
-    public static void convertSocket(FileDescriptor fd) throws IOException {
-        if (!isSupported)
-            throw new UnsupportedOperationException("SDP not supported on this platform");
-        int fdVal = fdAccess.get(fd);
-        convert0(fdVal);
-    }
-
-    private static native int create0() throws IOException;
-
-    private static native void convert0(int fd) throws IOException;
-
-    static {
-        jdk.internal.loader.BootLoader.loadLibrary("net");
-    }
-}
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
index 565c393c2a0..2236a42d360 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
@@ -38,7 +38,6 @@ import java.util.Collections;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
 
 /**
@@ -156,7 +155,6 @@ abstract class AsynchronousServerSocketChannelImpl
             synchronized (stateLock) {
                 if (localAddress != null)
                     throw new AlreadyBoundException();
-                NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
                 Net.bind(fd, isa.getAddress(), isa.getPort());
                 Net.listen(fd, backlog < 1 ? 50 : backlog);
                 localAddress = Net.localAddress(fd);
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
index 68983304735..52f0a71d28c 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
@@ -41,7 +41,6 @@ import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 import jdk.internal.access.JavaNioAccess;
 import jdk.internal.access.SharedSecrets;
-import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
 
 /**
@@ -447,7 +446,6 @@ abstract class AsynchronousSocketChannelImpl
                     throw new AlreadyBoundException();
                 InetSocketAddress isa = (local == null) ?
                     new InetSocketAddress(0) : Net.checkAddress(local);
-                NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
                 Net.bind(fd, isa.getAddress(), isa.getPort());
                 localAddress = Net.localAddress(fd);
             }
diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
index dd81b356738..5832e7f529a 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -55,7 +55,6 @@ import jdk.internal.access.JavaIOFileDescriptorAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.ref.CleanerFactory;
 import sun.net.ConnectionResetException;
-import sun.net.NetHooks;
 import sun.net.PlatformSocketImpl;
 import sun.net.ext.ExtendedSocketOptions;
 import jdk.internal.util.Exceptions;
@@ -501,11 +500,6 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             }
             this.state = ST_CONNECTING;
 
-            // invoke beforeTcpConnect hook if not already bound
-            if (localport == 0) {
-                NetHooks.beforeTcpConnect(fd, address, port);
-            }
-
             // save the remote address/port
             this.address = address;
             this.port = port;
@@ -637,7 +631,6 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             ensureOpen();
             if (localport != 0)
                 throw new SocketException("Already bound");
-            NetHooks.beforeTcpBind(fd, host, port);
             Net.bind(fd, host, port);
             // set the address field to the given host address to
             // maintain long standing behavior. When binding to 0.0.0.0
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index b8e25b23b69..e75110a76ad 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -55,7 +55,6 @@ import static java.net.StandardProtocolFamily.INET;
 import static java.net.StandardProtocolFamily.INET6;
 import static java.net.StandardProtocolFamily.UNIX;
 
-import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
 
 /**
@@ -331,7 +330,6 @@ class ServerSocketChannelImpl
         } else {
             isa = Net.checkAddress(local, family);
         }
-        NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
         Net.bind(family, fd, isa.getAddress(), isa.getPort());
         Net.listen(fd, backlog < 1 ? 50 : backlog);
         return Net.localAddress(fd);
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index 37e6a71d80d..6f3e8b443dc 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -62,7 +62,6 @@ import static java.net.StandardProtocolFamily.UNIX;
 import jdk.internal.event.SocketReadEvent;
 import jdk.internal.event.SocketWriteEvent;
 import sun.net.ConnectionResetException;
-import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
 import jdk.internal.util.Exceptions;
 
@@ -828,7 +827,6 @@ class SocketChannelImpl
         } else {
             isa = Net.checkAddress(local, family);
         }
-        NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
         Net.bind(family, fd, isa.getAddress(), isa.getPort());
         return Net.localAddress(fd);
     }
@@ -871,7 +869,6 @@ class SocketChannelImpl
 
             if (isNetSocket() && (localAddress == null)) {
                 InetSocketAddress isa = (InetSocketAddress) sa;
-                NetHooks.beforeTcpConnect(fd, isa.getAddress(), isa.getPort());
             }
             remoteAddress = sa;
 
diff --git a/src/java.base/unix/classes/sun/net/NetHooks.java b/src/java.base/unix/classes/sun/net/NetHooks.java
deleted file mode 100644
index b64e638f46a..00000000000
--- a/src/java.base/unix/classes/sun/net/NetHooks.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.net;
-
-import java.net.InetAddress;
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-/**
- * Defines static methods to be invoked prior to binding or connecting TCP sockets.
- */
-
-public final class NetHooks {
-
-    /**
-     * A provider with hooks to allow sockets be converted prior to binding or
-     * connecting a TCP socket.
-     *
-     * <p> Concrete implementations of this class should define a zero-argument
-     * constructor and implement the abstract methods specified below.
-     */
-    public abstract static class Provider {
-        /**
-         * Initializes a new instance of this class.
-         */
-        protected Provider() {}
-
-        /**
-         * Invoked prior to binding a TCP socket.
-         */
-        public abstract void implBeforeTcpBind(FileDescriptor fdObj,
-                                               InetAddress address,
-                                               int port)
-            throws IOException;
-
-        /**
-         * Invoked prior to connecting an unbound TCP socket.
-         */
-        public abstract void implBeforeTcpConnect(FileDescriptor fdObj,
-                                                 InetAddress address,
-                                                 int port)
-            throws IOException;
-    }
-
-    /**
-     * For now, we load the SDP provider on Solaris. In the future this may
-     * be changed to use the ServiceLoader facility to allow the deployment of
-     * other providers.
-     */
-    private static final Provider provider = new sun.net.sdp.SdpProvider();
-
-    /**
-     * Invoke prior to binding a TCP socket.
-     */
-    public static void beforeTcpBind(FileDescriptor fdObj,
-                                     InetAddress address,
-                                     int port)
-        throws IOException
-    {
-        provider.implBeforeTcpBind(fdObj, address, port);
-    }
-
-    /**
-     * Invoke prior to connecting an unbound TCP socket.
-     */
-    public static void beforeTcpConnect(FileDescriptor fdObj,
-                                        InetAddress address,
-                                        int port)
-        throws IOException
-    {
-        provider.implBeforeTcpConnect(fdObj, address, port);
-    }
-}
diff --git a/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java b/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java
deleted file mode 100644
index f2ad2717fb6..00000000000
--- a/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.net.sdp;
-
-import sun.net.NetHooks;
-import java.net.InetAddress;
-import java.net.Inet4Address;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.io.PrintStream;
-
-/**
- * A NetHooks provider that converts sockets from the TCP to SDP protocol prior
- * to binding or connecting.
- */
-
-public class SdpProvider extends NetHooks.Provider {
-    // maximum port
-    private static final int MAX_PORT = 65535;
-
-    // indicates if SDP is enabled and the rules for when the protocol is used
-    private final boolean enabled;
-    private final List<Rule> rules;
-
-    // logging for debug purposes
-    private PrintStream log;
-
-    public SdpProvider() {
-        Properties props = System.getProperties();
-        // if this property is not defined then there is nothing to do.
-        String file = props.getProperty("com.sun.sdp.conf");
-        if (file == null) {
-            this.enabled = false;
-            this.rules = null;
-            return;
-        }
-
-        // load configuration file
-        List<Rule> list = null;
-        try {
-            list = loadRulesFromFile(file);
-        } catch (IOException e) {
-            fail("Error reading %s: %s", file, e.getMessage());
-        }
-
-        // check if debugging is enabled
-        PrintStream out = null;
-        String logfile = props.getProperty("com.sun.sdp.debug");
-        if (logfile != null) {
-            out = System.out;
-            if (!logfile.isEmpty()) {
-                try {
-                    out = new PrintStream(logfile);
-                } catch (IOException ignore) { }
-            }
-        }
-
-        this.enabled = !list.isEmpty();
-        this.rules = list;
-        this.log = out;
-    }
-
-    // supported actions
-    private static enum Action {
-        BIND,
-        CONNECT;
-    }
-
-    // a rule for matching a bind or connect request
-    private static interface Rule {
-        boolean match(Action action, InetAddress address, int port);
-    }
-
-    // rule to match port[-end]
-    private static class PortRangeRule implements Rule {
-        private final Action action;
-        private final int portStart;
-        private final int portEnd;
-        PortRangeRule(Action action, int portStart, int portEnd) {
-            this.action = action;
-            this.portStart = portStart;
-            this.portEnd = portEnd;
-        }
-        Action action() {
-            return action;
-        }
-        @Override
-        public boolean match(Action action, InetAddress address, int port) {
-            return (action == this.action &&
-                    port >= this.portStart &&
-                    port <= this.portEnd);
-        }
-    }
-
-    // rule to match address[/prefix] port[-end]
-    private static class AddressPortRangeRule extends PortRangeRule {
-        private final byte[] addressAsBytes;
-        private final int prefixByteCount;
-        private final byte mask;
-        AddressPortRangeRule(Action action, InetAddress address,
-                             int prefix, int port, int end)
-        {
-            super(action, port, end);
-            this.addressAsBytes = address.getAddress();
-            this.prefixByteCount = prefix >> 3;
-            this.mask = (byte)(0xff << (8 - (prefix % 8)));
-        }
-        @Override
-        public boolean match(Action action, InetAddress address, int port) {
-            if (action != action())
-                return false;
-            byte[] candidate = address.getAddress();
-            // same address type?
-            if (candidate.length != addressAsBytes.length)
-                return false;
-            // check bytes
-            for (int i=0; i<prefixByteCount; i++) {
-                if (candidate[i] != addressAsBytes[i])
-                    return false;
-            }
-            // check remaining bits
-            if ((prefixByteCount < addressAsBytes.length) &&
-                ((candidate[prefixByteCount] & mask) !=
-                 (addressAsBytes[prefixByteCount] & mask)))
-                    return false;
-            return super.match(action, address, port);
-        }
-    }
-
-    // parses port:[-end]
-    private static int[] parsePortRange(String s) {
-        int pos = s.indexOf('-');
-        try {
-            int[] result = new int[2];
-            if (pos < 0) {
-                boolean all = s.equals("*");
-                result[0] = all ? 0 : Integer.parseInt(s);
-                result[1] = all ? MAX_PORT : result[0];
-            } else {
-                String low = s.substring(0, pos);
-                if (low.isEmpty()) low = "*";
-                String high = s.substring(pos+1);
-                if (high.isEmpty()) high = "*";
-                result[0] = low.equals("*") ? 0 : Integer.parseInt(low);
-                result[1] = high.equals("*") ? MAX_PORT : Integer.parseInt(high);
-            }
-            return result;
-        } catch (NumberFormatException e) {
-            return new int[0];
-        }
-    }
-
-    private static void fail(String msg, Object... args) {
-        Formatter f = new Formatter();
-        f.format(msg, args);
-        throw new RuntimeException(f.out().toString());
-    }
-
-    // loads rules from the given file
-    // Each non-blank/non-comment line must have the format:
-    // ("bind" | "connect") 1*LWSP-char (hostname | ipaddress["/" prefix])
-    //     1*LWSP-char ("*" | port) [ "-" ("*" | port) ]
-    private static List<Rule> loadRulesFromFile(String file)
-        throws IOException
-    {
-        try (Scanner scanner = new Scanner(new File(file))) {
-            List<Rule> result = new ArrayList<>();
-            while (scanner.hasNextLine()) {
-                String line = scanner.nextLine().trim();
-
-                // skip blank lines and comments
-                if (line.isEmpty() || line.charAt(0) == '#')
-                    continue;
-
-                // must have 3 fields
-                String[] s = line.split("\\s+");
-                if (s.length != 3) {
-                    fail("Malformed line '%s'", line);
-                    continue;
-                }
-
-                // first field is the action ("bind" or "connect")
-                Action action = null;
-                for (Action a: Action.values()) {
-                    if (s[0].equalsIgnoreCase(a.name())) {
-                        action = a;
-                        break;
-                    }
-                }
-                if (action == null) {
-                    fail("Action '%s' not recognized", s[0]);
-                    continue;
-                }
-
-                // * port[-end]
-                int[] ports = parsePortRange(s[2]);
-                if (ports.length == 0) {
-                    fail("Malformed port range '%s'", s[2]);
-                    continue;
-                }
-
-                // match all addresses
-                if (s[1].equals("*")) {
-                    result.add(new PortRangeRule(action, ports[0], ports[1]));
-                    continue;
-                }
-
-                // hostname | ipaddress[/prefix]
-                int pos = s[1].indexOf('/');
-                try {
-                    if (pos < 0) {
-                        // hostname or ipaddress (no prefix)
-                        InetAddress[] addresses = InetAddress.getAllByName(s[1]);
-                        for (InetAddress address: addresses) {
-                            int prefix =
-                                (address instanceof Inet4Address) ? 32 : 128;
-                            result.add(new AddressPortRangeRule(action, address,
-                                prefix, ports[0], ports[1]));
-                        }
-                    } else {
-                        // ipaddress/prefix
-                        InetAddress address = InetAddress
-                            .getByName(s[1].substring(0, pos));
-                        int prefix = -1;
-                        try {
-                            prefix = Integer.parseInt(s[1], pos + 1,
-                                s[1].length(), 10);
-                            if (address instanceof Inet4Address) {
-                                // must be 1-31
-                                if (prefix < 0 || prefix > 32) prefix = -1;
-                            } else {
-                                // must be 1-128
-                                if (prefix < 0 || prefix > 128) prefix = -1;
-                            }
-                        } catch (NumberFormatException e) {
-                        }
-
-                        if (prefix > 0) {
-                            result.add(new AddressPortRangeRule(action,
-                                        address, prefix, ports[0], ports[1]));
-                        } else {
-                            fail("Malformed prefix '%s'", s[1]);
-                            continue;
-                        }
-                    }
-                } catch (UnknownHostException uhe) {
-                    fail("Unknown host or malformed IP address '%s'", s[1]);
-                    continue;
-                }
-            }
-            return result;
-        }
-    }
-
-    // converts unbound TCP socket to a SDP socket if it matches the rules
-    private void convertTcpToSdpIfMatch(FileDescriptor fdObj,
-                                               Action action,
-                                               InetAddress address,
-                                               int port)
-        throws IOException
-    {
-        boolean matched = false;
-        for (Rule rule: rules) {
-            if (rule.match(action, address, port)) {
-                SdpSupport.convertSocket(fdObj);
-                matched = true;
-                break;
-            }
-        }
-        if (log != null) {
-            String addr = (address instanceof Inet4Address) ?
-                address.getHostAddress() : "[" + address.getHostAddress() + "]";
-            if (matched) {
-                log.format("%s to %s:%d (socket converted to SDP protocol)\n", action, addr, port);
-            } else {
-                log.format("%s to %s:%d (no match)\n", action, addr, port);
-            }
-        }
-    }
-
-    @Override
-    public void implBeforeTcpBind(FileDescriptor fdObj,
-                              InetAddress address,
-                              int port)
-        throws IOException
-    {
-        if (enabled)
-            convertTcpToSdpIfMatch(fdObj, Action.BIND, address, port);
-    }
-
-    @Override
-    public void implBeforeTcpConnect(FileDescriptor fdObj,
-                                InetAddress address,
-                                int port)
-        throws IOException
-    {
-        if (enabled)
-            convertTcpToSdpIfMatch(fdObj, Action.CONNECT, address, port);
-    }
-}
diff --git a/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
index 5e75e3b2486..c5b23ed2690 100644
--- a/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
@@ -35,7 +35,6 @@ import java.io.FileDescriptor;
 import jdk.internal.util.Exceptions;
 
 import sun.net.ConnectionResetException;
-import sun.net.NetHooks;
 
 /**
  * Unix implementation of AsynchronousSocketChannel
@@ -310,7 +309,6 @@ class UnixAsynchronousSocketChannelImpl
         InetSocketAddress isa = Net.checkAddress(remote);
 
         // check and set state
-        boolean notifyBeforeTcpConnect;
         synchronized (stateLock) {
             if (state == ST_CONNECTED)
                 throw new AlreadyConnectedException();
@@ -318,15 +316,11 @@ class UnixAsynchronousSocketChannelImpl
                 throw new ConnectionPendingException();
             state = ST_PENDING;
             pendingRemote = remote;
-            notifyBeforeTcpConnect = (localAddress == null);
         }
 
         Throwable e = null;
         try {
             begin();
-            // notify hook if unbound
-            if (notifyBeforeTcpConnect)
-                NetHooks.beforeTcpConnect(fd, isa.getAddress(), isa.getPort());
             int n = Net.connect(fd, isa.getAddress(), isa.getPort());
             if (n == IOStatus.UNAVAILABLE) {
                 // connection could not be established immediately
diff --git a/src/java.base/unix/conf/sdp/sdp.conf.template b/src/java.base/unix/conf/sdp/sdp.conf.template
deleted file mode 100644
index 71cb5c2ce84..00000000000
--- a/src/java.base/unix/conf/sdp/sdp.conf.template
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Configuration file to enable InfiniBand Sockets Direct Protocol.
-#
-# Each line that does not start with a comment (#) is a rule to indicate when
-# the SDP transport protocol should be used. The format of a rule is as follows:
-#   ("bind"|"connect") 1*LWSP-char (hostname|ipaddress["/"prefix]) 1*LWSP-char ("*"|port)["-"("*"|port)]
-#
-# A "bind" rule indicates that the SDP protocol transport should be used when
-# a TCP socket binds to an address/port that matches the rule. A "connect" rule
-# indicates that the SDP protocol transport should be used when an unbound
-# TCP socket attempts to connect to an address/port that matches the rule.
-# Addresses may be specified as hostnames or literal Internet Protocol (IP)
-# addresses. When a literal IP address is used then a prefix length may be used
-# to indicate the number of bits for matching (useful when a block of addresses
-# or subnet is allocated to the InfiniBand fabric). 
-
-# Use SDP for all sockets that bind to specific local addresses
-#bind    192.168.1.1    *
-#bind    fe80::21b:24ff:fe3d:7896    *
-
-# Use SDP for all sockets that bind to the wildcard address in a port range
-#bind    0.0.0.0    5000-5999
-#bind    ::0        5000-5999
-
-# Use SDP when connecting to all application services on 192.168.1.*
-#connect 192.168.1.0/24       1024-*
-
-# Use SDP when connecting to the http server or MySQL database on hpccluster.
-#connect hpccluster.foo.com   80
-#connect hpccluster.foo.com   3306
diff --git a/src/java.base/unix/native/libnet/SdpSupport.c b/src/java.base/unix/native/libnet/SdpSupport.c
deleted file mode 100644
index b56f16905fa..00000000000
--- a/src/java.base/unix/native/libnet/SdpSupport.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
-
-#if defined(__linux__)
-  #if !defined(AF_INET_SDP)
-    #define AF_INET_SDP     27
-  #endif
-#endif
-
-#include "jni.h"
-#include "jni_util.h"
-#include "net_util.h"
-
-/**
- * Creates a SDP socket.
- */
-static int create(JNIEnv* env)
-{
-    int s;
-
-#if defined(__linux__)
-    /**
-     * IPv6 not supported by SDP on Linux
-     */
-    if (ipv6_available()) {
-        JNU_ThrowIOException(env, "IPv6 not supported");
-        return -1;
-    }
-    s = socket(AF_INET_SDP, SOCK_STREAM, 0);
-#else
-    /* not supported on other platforms at this time */
-    s = -1;
-    errno = EPROTONOSUPPORT;
-#endif
-
-    if (s < 0)
-        JNU_ThrowIOExceptionWithLastError(env, "socket");
-    return s;
-}
-
-/**
- * Creates a SDP socket, returning file descriptor referencing the socket.
- */
-JNIEXPORT jint JNICALL
-Java_sun_net_sdp_SdpSupport_create0(JNIEnv *env, jclass cls)
-{
-    return create(env);
-}
-
-/**
- * Converts an existing file descriptor, that references an unbound TCP socket,
- * to SDP.
- */
-JNIEXPORT void JNICALL
-Java_sun_net_sdp_SdpSupport_convert0(JNIEnv *env, jclass cls, int fd)
-{
-    int s = create(env);
-    if (s >= 0) {
-        socklen_t len;
-        int arg, res;
-        struct linger linger;
-
-        /* copy socket options that are relevant to SDP */
-        len = sizeof(arg);
-        if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&arg, &len) == 0)
-            setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*)&arg, len);
-#ifdef SO_REUSEPORT
-        len = sizeof(arg);
-        if (getsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (char*)&arg, &len) == 0)
-            setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (char*)&arg, len);
-#endif
-        len = sizeof(arg);
-        if (getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*)&arg, &len) == 0)
-            setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char*)&arg, len);
-        len = sizeof(linger);
-        if (getsockopt(fd, SOL_SOCKET, SO_LINGER, (void*)&linger, &len) == 0)
-            setsockopt(s, SOL_SOCKET, SO_LINGER, (char*)&linger, len);
-
-        RESTARTABLE(dup2(s, fd), res);
-        if (res < 0)
-            JNU_ThrowIOExceptionWithLastError(env, "dup2");
-        res = close(s);
-        if (res < 0 && !(*env)->ExceptionCheck(env))
-            JNU_ThrowIOExceptionWithLastError(env, "close");
-    }
-}
diff --git a/src/java.base/windows/classes/sun/net/NetHooks.java b/src/java.base/windows/classes/sun/net/NetHooks.java
deleted file mode 100644
index fada9fecd5f..00000000000
--- a/src/java.base/windows/classes/sun/net/NetHooks.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.net;
-
-import java.net.InetAddress;
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-/**
- * Defines static methods to ensure that any installed net hooks are invoked
- * prior to binding or connecting TCP sockets.
- */
-
-public final class NetHooks {
-
-    /**
-     * Invoke prior to binding a TCP socket.
-     */
-    public static void beforeTcpBind(FileDescriptor fdObj,
-                                     InetAddress address,
-                                     int port)
-        throws IOException
-    {
-        // nothing to do
-    }
-
-    /**
-     * Invoke prior to connecting an unbound TCP socket.
-     */
-    public static void beforeTcpConnect(FileDescriptor fdObj,
-                                        InetAddress address,
-                                        int port)
-        throws IOException
-    {
-        // nothing to do
-    }
-}

From e4aed95cac343f1339b9bc87721561bdc4c2f5ad Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 4 Nov 2025 08:48:48 +0000
Subject: [PATCH 006/512] 8370682: G1: Survivor regions not in young gen cset
 group

Reviewed-by: iwalulya, ayang
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 28 +++++++++++--------
 src/hotspot/share/gc/g1/g1CollectionSet.cpp   |  9 +++++-
 .../share/gc/g1/g1FullGCResetMetadataTask.cpp |  7 ++---
 .../gc/g1/g1ParScanThreadState.inline.hpp     |  8 ++++--
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 72a1ae0e2a6..90b38a96d67 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2563,10 +2563,12 @@ void G1CollectedHeap::verify_region_attr_is_remset_tracked() {
   public:
     virtual bool do_heap_region(G1HeapRegion* r) {
       G1CollectedHeap* g1h = G1CollectedHeap::heap();
-      const bool is_remset_tracked = g1h->region_attr(r->bottom()).is_remset_tracked();
-      assert(r->rem_set()->is_tracked() == is_remset_tracked,
-             "Region %u remset tracking status (%s) different to region attribute (%s)",
-             r->hrm_index(), BOOL_TO_STR(r->rem_set()->is_tracked()), BOOL_TO_STR(is_remset_tracked));
+      G1HeapRegionAttr attr = g1h->region_attr(r->bottom());
+      bool const is_remset_tracked = attr.is_remset_tracked();
+      assert((r->rem_set()->is_tracked() == is_remset_tracked) ||
+             (attr.is_new_survivor() && is_remset_tracked),
+             "Region %u (%s) remset tracking status (%s) different to region attribute (%s)",
+             r->hrm_index(), r->get_type_str(), BOOL_TO_STR(r->rem_set()->is_tracked()), BOOL_TO_STR(is_remset_tracked));
       return false;
     }
   } cl;
@@ -3105,9 +3107,8 @@ G1HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
       new_alloc_region->set_eden();
       _eden.add(new_alloc_region);
       _policy->set_region_eden(new_alloc_region);
-      _policy->remset_tracker()->update_at_allocate(new_alloc_region);
-      // Install the group cardset.
-      young_regions_cset_group()->add(new_alloc_region);
+
+      collection_set()->add_eden_region(new_alloc_region);
       G1HeapRegionPrinter::alloc(new_alloc_region);
       return new_alloc_region;
     }
@@ -3120,7 +3121,6 @@ void G1CollectedHeap::retire_mutator_alloc_region(G1HeapRegion* alloc_region,
   assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
   assert(alloc_region->is_eden(), "all mutator alloc regions should be eden");
 
-  collection_set()->add_eden_region(alloc_region);
   increase_used(allocated_bytes);
   _eden.add_used_bytes(allocated_bytes);
   G1HeapRegionPrinter::retire(alloc_region);
@@ -3164,14 +3164,20 @@ G1HeapRegion* G1CollectedHeap::new_gc_alloc_region(size_t word_size, G1HeapRegio
     if (type.is_survivor()) {
       new_alloc_region->set_survivor();
       _survivor.add(new_alloc_region);
+      // The remembered set/group cardset for this region will be installed at the
+      // end of GC. Cannot do that right now because we still need the current young
+      // gen cardset group.
+      // However, register with the attribute table to collect remembered set entries
+      // immediately as it is the only source for determining the need for remembered
+      // set tracking during GC.
       register_new_survivor_region_with_region_attr(new_alloc_region);
-      // Install the group cardset.
-      young_regions_cset_group()->add(new_alloc_region);
     } else {
       new_alloc_region->set_old();
+      // Update remembered set/cardset.
+      _policy->remset_tracker()->update_at_allocate(new_alloc_region);
+      // Synchronize with region attribute table.
       update_region_attr(new_alloc_region);
     }
-    _policy->remset_tracker()->update_at_allocate(new_alloc_region);
     G1HeapRegionPrinter::alloc(new_alloc_region);
     return new_alloc_region;
   }
diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.cpp b/src/hotspot/share/gc/g1/g1CollectionSet.cpp
index eb50b7ae5be..abfddf860e6 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSet.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.cpp
@@ -163,6 +163,7 @@ void G1CollectionSet::clear() {
   assert_at_safepoint_on_vm_thread();
   _regions_cur_length = 0;
   _groups.clear();
+  assert(_optional_groups.length() == 0, "must be");
 }
 
 void G1CollectionSet::iterate(G1HeapRegionClosure* cl) const {
@@ -216,7 +217,11 @@ void G1CollectionSet::add_young_region_common(G1HeapRegion* hr) {
   assert(hr->is_young(), "invariant");
   assert(_inc_build_state == CSetBuildType::Active, "Precondition");
 
-  assert(!hr->in_collection_set(), "invariant");
+  // Add to remembered set/cardset group.
+  _g1h->policy()->remset_tracker()->update_at_allocate(hr);
+  _g1h->young_regions_cset_group()->add(hr);
+
+  // Synchronize with the region attribute table.
   _g1h->register_young_region_with_region_attr(hr);
 
   // We use UINT_MAX as "invalid" marker in verification.
@@ -233,11 +238,13 @@ void G1CollectionSet::add_young_region_common(G1HeapRegion* hr) {
 }
 
 void G1CollectionSet::add_survivor_regions(G1HeapRegion* hr) {
+  assert_at_safepoint_on_vm_thread();
   assert(hr->is_survivor(), "Must only add survivor regions, but is %s", hr->get_type_str());
   add_young_region_common(hr);
 }
 
 void G1CollectionSet::add_eden_region(G1HeapRegion* hr) {
+  assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
   assert(hr->is_eden(), "Must only add eden regions, but is %s", hr->get_type_str());
   add_young_region_common(hr);
 }
diff --git a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp
index 02397392a6e..c8fba3459aa 100644
--- a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.cpp
@@ -31,16 +31,13 @@ G1FullGCResetMetadataTask::G1ResetMetadataClosure::G1ResetMetadataClosure(G1Full
   _collector(collector) { }
 
 void G1FullGCResetMetadataTask::G1ResetMetadataClosure::reset_region_metadata(G1HeapRegion* hr) {
+  assert(hr->is_humongous() || !hr->rem_set()->has_cset_group(),
+         "Non-humongous regions must not have cset group");
   hr->rem_set()->clear();
   hr->clear_both_card_tables();
 }
 
 bool G1FullGCResetMetadataTask::G1ResetMetadataClosure::do_heap_region(G1HeapRegion* hr) {
-  if (!hr->is_humongous()) {
-    hr->uninstall_cset_group();
-  }
-
-
   uint const region_idx = hr->hrm_index();
   if (!_collector->is_compaction_target(region_idx)) {
     assert(!hr->is_free(), "all free regions should be compaction targets");
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
index 5e827a7fd60..854c341f720 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
@@ -151,11 +151,13 @@ template <class T> void G1ParScanThreadState::mark_card_if_tracked(G1HeapRegionA
 
 #ifdef ASSERT
   G1HeapRegion* const hr_obj = _g1h->heap_region_containing(o);
-  assert(region_attr.is_remset_tracked() == hr_obj->rem_set()->is_tracked(),
-         "State flag indicating remset tracking disagrees (%s) with actual remembered set (%s) for region %u",
+  assert((region_attr.is_remset_tracked() == hr_obj->rem_set()->is_tracked()) ||
+         (region_attr.is_new_survivor() && region_attr.is_remset_tracked()),
+         "State flag indicating remset tracking disagrees (%s) with actual remembered set (%s) for region %u (%s)",
          BOOL_TO_STR(region_attr.is_remset_tracked()),
          BOOL_TO_STR(hr_obj->rem_set()->is_tracked()),
-         hr_obj->hrm_index());
+         hr_obj->hrm_index(),
+         hr_obj->get_type_str());
 #endif
   if (!region_attr.is_remset_tracked()) {
     return;

From 21f41c5f49cd3c5e6e4f29ed38701a4d92c16098 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 4 Nov 2025 09:22:47 +0000
Subject: [PATCH 007/512] 8370774: Merge ModRefBarrierSet into
 CardTableBarrierSet

Reviewed-by: tschatzl, iwalulya
---
 .../gc/g1/g1BarrierSetAssembler_aarch64.cpp   |   2 +-
 .../gc/g1/g1BarrierSetAssembler_aarch64.hpp   |   4 +-
 .../cardTableBarrierSetAssembler_aarch64.cpp  |  25 +++
 .../cardTableBarrierSetAssembler_aarch64.hpp  |  16 +-
 .../modRefBarrierSetAssembler_aarch64.cpp     |  53 -------
 .../modRefBarrierSetAssembler_aarch64.hpp     |  54 -------
 .../arm/gc/g1/g1BarrierSetAssembler_arm.cpp   |   2 +-
 .../arm/gc/g1/g1BarrierSetAssembler_arm.hpp   |   4 +-
 .../cardTableBarrierSetAssembler_arm.cpp      |  24 +++
 .../cardTableBarrierSetAssembler_arm.hpp      |  17 ++-
 .../shared/modRefBarrierSetAssembler_arm.cpp  |  52 -------
 .../shared/modRefBarrierSetAssembler_arm.hpp  |  54 -------
 .../ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp   |   8 +-
 .../ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp   |   4 +-
 .../cardTableBarrierSetAssembler_ppc.cpp      |  61 ++++++++
 .../cardTableBarrierSetAssembler_ppc.hpp      |  31 +++-
 .../shared/modRefBarrierSetAssembler_ppc.cpp  |  91 -----------
 .../shared/modRefBarrierSetAssembler_ppc.hpp  |  66 --------
 .../gc/g1/g1BarrierSetAssembler_riscv.cpp     |   2 +-
 .../gc/g1/g1BarrierSetAssembler_riscv.hpp     |   4 +-
 .../cardTableBarrierSetAssembler_riscv.cpp    |  23 +++
 .../cardTableBarrierSetAssembler_riscv.hpp    |  18 ++-
 .../modRefBarrierSetAssembler_riscv.cpp       |  53 -------
 .../modRefBarrierSetAssembler_riscv.hpp       |  55 -------
 .../s390/gc/g1/g1BarrierSetAssembler_s390.cpp |   2 +-
 .../s390/gc/g1/g1BarrierSetAssembler_s390.hpp |   4 +-
 .../cardTableBarrierSetAssembler_s390.cpp     |  39 +++++
 .../cardTableBarrierSetAssembler_s390.hpp     |  17 ++-
 .../shared/modRefBarrierSetAssembler_s390.cpp |  73 ---------
 .../shared/modRefBarrierSetAssembler_s390.hpp |  55 -------
 .../x86/gc/g1/g1BarrierSetAssembler_x86.cpp   |   2 +-
 .../x86/gc/g1/g1BarrierSetAssembler_x86.hpp   |   4 +-
 .../cardTableBarrierSetAssembler_x86.cpp      |  52 +++++++
 .../cardTableBarrierSetAssembler_x86.hpp      |  18 ++-
 .../shared/modRefBarrierSetAssembler_x86.cpp  |  80 ----------
 .../shared/modRefBarrierSetAssembler_x86.hpp  |  53 -------
 .../shared/modRefBarrierSetAssembler_zero.hpp |  30 ----
 src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp |   4 +-
 src/hotspot/share/gc/g1/g1BarrierSet.hpp      |   4 +-
 .../share/gc/g1/g1BarrierSet.inline.hpp       |   6 +-
 src/hotspot/share/gc/serial/serialFullGC.cpp  |   1 -
 .../share/gc/shared/barrierSetConfig.hpp      |  12 +-
 .../gc/shared/barrierSetConfig.inline.hpp     |   1 -
 .../gc/shared/c1/cardTableBarrierSetC1.cpp    |  62 ++++++++
 .../gc/shared/c1/cardTableBarrierSetC1.hpp    |  15 +-
 .../share/gc/shared/c1/modRefBarrierSetC1.cpp |  94 ------------
 .../share/gc/shared/c1/modRefBarrierSetC1.hpp |  50 ------
 .../gc/shared/c2/cardTableBarrierSetC2.cpp    |  79 ++++++++++
 .../gc/shared/c2/cardTableBarrierSetC2.hpp    |  12 +-
 .../share/gc/shared/c2/modRefBarrierSetC2.cpp | 107 -------------
 .../share/gc/shared/c2/modRefBarrierSetC2.hpp |  49 ------
 .../share/gc/shared/cardTableBarrierSet.cpp   |  20 ++-
 .../share/gc/shared/cardTableBarrierSet.hpp   |  56 ++++++-
 .../gc/shared/cardTableBarrierSet.inline.hpp  | 113 +++++++++++++-
 .../share/gc/shared/modRefBarrierSet.hpp      | 108 -------------
 .../gc/shared/modRefBarrierSet.inline.hpp     | 144 ------------------
 .../gc/shared/modRefBarrierSetAssembler.hpp   |  32 ----
 src/hotspot/share/gc/shared/vmStructs_gc.hpp  |   4 +-
 src/hotspot/share/oops/access.inline.hpp      |   4 +-
 .../share/runtime/continuationFreezeThaw.cpp  |   2 +-
 60 files changed, 698 insertions(+), 1433 deletions(-)
 delete mode 100644 src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp
 delete mode 100644 src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp
 delete mode 100644 src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.cpp
 delete mode 100644 src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp
 delete mode 100644 src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp
 delete mode 100644 src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp
 delete mode 100644 src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp
 delete mode 100644 src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp
 delete mode 100644 src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp
 delete mode 100644 src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp
 delete mode 100644 src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
 delete mode 100644 src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
 delete mode 100644 src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp
 delete mode 100644 src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.cpp
 delete mode 100644 src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp
 delete mode 100644 src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp
 delete mode 100644 src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp
 delete mode 100644 src/hotspot/share/gc/shared/modRefBarrierSet.hpp
 delete mode 100644 src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
 delete mode 100644 src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp

diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
index 974527f30e9..3138c76c593 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
@@ -347,7 +347,7 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0;
   bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
   bool on_reference = on_weak || on_phantom;
-  ModRefBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp2);
+  CardTableBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp2);
   if (on_oop && on_reference) {
     // LR is live.  It must be saved around calls.
     __ enter(/*strip_ret_addr*/true); // barrier may call runtime
diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
index 72040cd7ad2..777a86e804b 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
@@ -26,7 +26,7 @@
 #define CPU_AARCH64_GC_G1_G1BARRIERSETASSEMBLER_AARCH64_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "utilities/macros.hpp"
 
 class LIR_Assembler;
@@ -34,7 +34,7 @@ class StubAssembler;
 class G1PreBarrierStub;
 class G1PreBarrierStubC2;
 
-class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
 protected:
   void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                        Register addr, Register count, RegSet saved_regs);
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
index ea36183c9de..c039e55cd4d 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
@@ -32,6 +32,31 @@
 
 #define __ masm->
 
+void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                      Register src, Register dst, Register count, RegSet saved_regs) {
+
+  if (is_oop) {
+    gen_write_ref_array_pre_barrier(masm, decorators, dst, count, saved_regs);
+  }
+}
+
+void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                      Register start, Register count, Register tmp,
+                                                      RegSet saved_regs) {
+  if (is_oop) {
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+  }
+}
+
+void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
+  if (is_reference_type(type)) {
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  }
+}
+
 void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst) {
 
   BarrierSet* bs = BarrierSet::barrier_set();
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
index d0d5e4c3d4c..91a65710f45 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
@@ -26,17 +26,27 @@
 #define CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 
-class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+class CardTableBarrierSetAssembler: public BarrierSetAssembler {
 protected:
-  void store_check(MacroAssembler* masm, Register obj, Address dst);
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                               Register addr, Register count, RegSet saved_regs) {}
 
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                 Register start, Register count, Register tmp, RegSet saved_regs);
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register src, Register dst, Register count, RegSet saved_regs);
+
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register start, Register count, Register tmp, RegSet saved_regs);
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
+
+  void store_check(MacroAssembler* masm, Register obj, Address dst);
 };
 
 #endif // CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp
deleted file mode 100644
index 68901591893..00000000000
--- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
-
-#define __ masm->
-
-void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                   Register src, Register dst, Register count, RegSet saved_regs) {
-
-  if (is_oop) {
-    gen_write_ref_array_pre_barrier(masm, decorators, dst, count, saved_regs);
-  }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                   Register start, Register count, Register tmp,
-                                                   RegSet saved_regs) {
-  if (is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
-  }
-}
-
-void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
-  if (is_reference_type(type)) {
-    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  }
-}
diff --git a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp
deleted file mode 100644
index 22f98441f4e..00000000000
--- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_AARCH64_GC_SHARED_MODREFBARRIERSETASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_GC_SHARED_MODREFBARRIERSETASSEMBLER_AARCH64_HPP
-
-#include "asm/macroAssembler.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-
-// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetAssembler: public BarrierSetAssembler {
-protected:
-  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                               Register addr, Register count, RegSet saved_regs) {}
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register start, Register count, Register tmp, RegSet saved_regs) {}
-
-  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) = 0;
-
-public:
-  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register src, Register dst, Register count, RegSet saved_regs);
-  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs);
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
-};
-
-#endif // CPU_AARCH64_GC_SHARED_MODREFBARRIERSETASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
index 74a9f273a43..e8ac1f56bda 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
@@ -320,7 +320,7 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
   bool on_reference = on_weak || on_phantom;
 
-  ModRefBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp2, tmp3);
+  CardTableBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp2, tmp3);
   if (on_oop && on_reference) {
     // Generate the G1 pre-barrier code to log the value of
     // the referent field in an SATB buffer.
diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp
index 9e0eff4601b..e3c8cf46600 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp
@@ -26,7 +26,7 @@
 #define CPU_ARM_GC_G1_G1BARRIERSETASSEMBLER_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "utilities/macros.hpp"
 
 class LIR_Assembler;
@@ -34,7 +34,7 @@ class StubAssembler;
 class G1PreBarrierStub;
 class G1PreBarrierStubC2;
 
-class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
 protected:
   void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                        Register addr, Register count, int callee_saved_regs);
diff --git a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp
index 91d3b8e9e5c..2427d46cafa 100644
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp
@@ -40,6 +40,30 @@
 
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
+void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                      Register addr, Register count, int callee_saved_regs) {
+
+  if (is_oop) {
+    gen_write_ref_array_pre_barrier(masm, decorators, addr, count, callee_saved_regs);
+  }
+}
+
+void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                      Register addr, Register count, Register tmp) {
+  if (is_oop) {
+    gen_write_ref_array_post_barrier(masm, decorators, addr, count, tmp);
+  }
+}
+
+void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                            Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null) {
+  if (type == T_OBJECT || type == T_ARRAY) {
+    oop_store_at(masm, decorators, type, obj, new_val, tmp1, tmp2, tmp3, is_null);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type, obj, new_val, tmp1, tmp2, tmp3, is_null);
+  }
+}
+
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                     Register addr, Register count, Register tmp) {
   BLOCK_COMMENT("CardTablePostBarrier");
diff --git a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
index e08a68445a8..ce767754294 100644
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
@@ -26,9 +26,9 @@
 #define CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 
-class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+class CardTableBarrierSetAssembler: public BarrierSetAssembler {
 private:
   void store_check(MacroAssembler* masm, Register obj, Address dst);
   void store_check_part1(MacroAssembler* masm, Register card_table_base);
@@ -37,10 +37,23 @@ private:
   void set_card(MacroAssembler* masm, Register card_table_base, Address card_table_addr, Register tmp);
 
 protected:
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                               Register addr, Register count, int callee_saved_regs) {}
+
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                 Register addr, Register count, Register tmp);
+
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null);
+
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register addr, Register count, int callee_saved_regs);
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register addr, Register count, Register tmp);
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address obj, Register val, Register tmp1, Register tmp2, Register tmp3, bool is_null);
+
 };
 
 #endif // CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.cpp
deleted file mode 100644
index cb4058d48ed..00000000000
--- a/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
-
-#define __ masm->
-
-void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                   Register addr, Register count, int callee_saved_regs) {
-
-  if (is_oop) {
-    gen_write_ref_array_pre_barrier(masm, decorators, addr, count, callee_saved_regs);
-  }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                   Register addr, Register count, Register tmp) {
-  if (is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, addr, count, tmp);
-  }
-}
-
-void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null) {
-  if (type == T_OBJECT || type == T_ARRAY) {
-    oop_store_at(masm, decorators, type, obj, new_val, tmp1, tmp2, tmp3, is_null);
-  } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, obj, new_val, tmp1, tmp2, tmp3, is_null);
-  }
-}
diff --git a/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp
deleted file mode 100644
index e41d8dc4727..00000000000
--- a/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_ARM_GC_SHARED_MODREFBARRIERSETASSEMBLER_ARM_HPP
-#define CPU_ARM_GC_SHARED_MODREFBARRIERSETASSEMBLER_ARM_HPP
-
-#include "asm/macroAssembler.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-
-// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetAssembler: public BarrierSetAssembler {
-protected:
-  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                               Register addr, Register count, int callee_saved_regs) {}
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register addr, Register count, Register tmp) {}
-
-  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address obj, Register val, Register tmp1, Register tmp2, Register tmp3, bool is_null) = 0;
-
-public:
-  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register addr, Register count, int callee_saved_regs);
-  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register addr, Register count, Register tmp);
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address obj, Register val, Register tmp1, Register tmp2, Register tmp3, bool is_null);
-};
-
-#endif // CPU_ARM_GC_SHARED_MODREFBARRIERSETASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
index 65bfd683abd..5c3e1302ed3 100644
--- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp
@@ -321,10 +321,10 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   Label done;
   if (on_oop && on_reference && L_handle_null == nullptr) { L_handle_null = &done; }
   // Load the value of the referent field.
-  ModRefBarrierSetAssembler::load_at(masm, decorators, type,
-                                     base, ind_or_offs, dst,
-                                     tmp1, tmp2,
-                                     preservation_level, L_handle_null);
+  CardTableBarrierSetAssembler::load_at(masm, decorators, type,
+                                        base, ind_or_offs, dst,
+                                        tmp1, tmp2,
+                                        preservation_level, L_handle_null);
   if (on_oop && on_reference) {
     // Generate the G1 pre-barrier code to log the value of
     // the referent field in an SATB buffer. Note with
diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp
index e059cc661af..a72dfb80ee4 100644
--- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp
@@ -27,7 +27,7 @@
 #define CPU_PPC_GC_G1_G1BARRIERSETASSEMBLER_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef COMPILER2
@@ -39,7 +39,7 @@ class StubAssembler;
 class G1PreBarrierStub;
 class G1PreBarrierStubC2;
 
-class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
 protected:
   virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                Register from, Register to, Register count,
diff --git a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp
index e1272ce508d..7404f7e2e5c 100644
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp
@@ -29,6 +29,7 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "runtime/jniHandles.hpp"
 
 #define __ masm->
 
@@ -40,6 +41,66 @@
 
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
+void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                      Register src, Register dst, Register count, Register preserve1, Register preserve2) {
+  if (type == T_OBJECT) {
+    gen_write_ref_array_pre_barrier(masm, decorators,
+                                    src, dst, count,
+                                    preserve1, preserve2);
+
+    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
+    if (!checkcast) {
+      assert_different_registers(dst, count, R9_ARG7, R10_ARG8);
+      // Save some arguments for epilogue, e.g. disjoint_long_copy_core destroys them.
+      __ mr(R9_ARG7, dst);
+      __ mr(R10_ARG8, count);
+    }
+  }
+}
+
+void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                      Register dst, Register count, Register preserve) {
+  if (type == T_OBJECT) {
+    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
+    if (!checkcast) {
+      gen_write_ref_array_post_barrier(masm, decorators, R9_ARG7, R10_ARG8, preserve);
+    } else {
+      gen_write_ref_array_post_barrier(masm, decorators, dst, count, preserve);
+    }
+  }
+}
+
+void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                            Register base, RegisterOrConstant ind_or_offs, Register val,
+                                            Register tmp1, Register tmp2, Register tmp3,
+                                            MacroAssembler::PreservationLevel preservation_level) {
+  if (is_reference_type(type)) {
+    oop_store_at(masm, decorators, type,
+                 base, ind_or_offs, val,
+                 tmp1, tmp2, tmp3,
+                 preservation_level);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type,
+                                  base, ind_or_offs, val,
+                                  tmp1, tmp2, tmp3,
+                                  preservation_level);
+  }
+}
+
+void CardTableBarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Register value,
+                                                   Register tmp1, Register tmp2,
+                                                   MacroAssembler::PreservationLevel preservation_level) {
+  Label done;
+  __ cmpdi(CR0, value, 0);
+  __ beq(CR0, done);         // Use null as-is.
+
+  __ clrrdi(tmp1, value, JNIHandles::tag_size);
+  __ ld(value, 0, tmp1);      // Resolve (untagged) jobject.
+
+  __ verify_oop(value, FILE_AND_LINE);
+  __ bind(done);
+}
+
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr,
                                                                     Register count, Register preserve) {
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
diff --git a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp
index 7d8e59e2c98..261d6ef85d9 100644
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp
@@ -27,21 +27,42 @@
 #define CPU_PPC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 
-class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+class CardTableBarrierSetAssembler: public BarrierSetAssembler {
 protected:
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register addr, Register count, Register preserve);
-
   void card_table_write(MacroAssembler* masm, CardTable::CardValue* byte_map_base, Register tmp, Register obj);
 
   void card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register tmp);
 
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                               Register from, Register to, Register count,
+                                               Register preserve1, Register preserve2) {}
+  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                                Register addr, Register count, Register preserve);
+
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Register base, RegisterOrConstant ind_or_offs, Register val,
                             Register tmp1, Register tmp2, Register tmp3,
                             MacroAssembler::PreservationLevel preservation_level);
+
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register src, Register dst, Register count,
+                                  Register preserve1, Register preserve2);
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register dst, Register count,
+                                  Register preserve);
+
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Register base, RegisterOrConstant ind_or_offs, Register val,
+                        Register tmp1, Register tmp2, Register tmp3,
+                        MacroAssembler::PreservationLevel preservation_level);
+
+  virtual void resolve_jobject(MacroAssembler* masm, Register value,
+                               Register tmp1, Register tmp2,
+                               MacroAssembler::PreservationLevel preservation_level);
+
 };
 
 #endif // CPU_PPC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp
deleted file mode 100644
index 4cdf56f6ad6..00000000000
--- a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, 2025 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
-#include "runtime/jniHandles.hpp"
-#include "utilities/macros.hpp"
-
-#define __ masm->
-
-void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                   Register src, Register dst, Register count, Register preserve1, Register preserve2) {
-  if (type == T_OBJECT) {
-    gen_write_ref_array_pre_barrier(masm, decorators,
-                                    src, dst, count,
-                                    preserve1, preserve2);
-
-    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
-    if (!checkcast) {
-      assert_different_registers(dst, count, R9_ARG7, R10_ARG8);
-      // Save some arguments for epilogue, e.g. disjoint_long_copy_core destroys them.
-      __ mr(R9_ARG7, dst);
-      __ mr(R10_ARG8, count);
-    }
-  }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                   Register dst, Register count, Register preserve) {
-  if (type == T_OBJECT) {
-    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
-    if (!checkcast) {
-      gen_write_ref_array_post_barrier(masm, decorators, R9_ARG7, R10_ARG8, preserve);
-    } else {
-      gen_write_ref_array_post_barrier(masm, decorators, dst, count, preserve);
-    }
-  }
-}
-
-void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Register base, RegisterOrConstant ind_or_offs, Register val,
-                                         Register tmp1, Register tmp2, Register tmp3,
-                                         MacroAssembler::PreservationLevel preservation_level) {
-  if (is_reference_type(type)) {
-    oop_store_at(masm, decorators, type,
-                 base, ind_or_offs, val,
-                 tmp1, tmp2, tmp3,
-                 preservation_level);
-  } else {
-    BarrierSetAssembler::store_at(masm, decorators, type,
-                                  base, ind_or_offs, val,
-                                  tmp1, tmp2, tmp3,
-                                  preservation_level);
-  }
-}
-
-void ModRefBarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Register value,
-                                                Register tmp1, Register tmp2,
-                                                MacroAssembler::PreservationLevel preservation_level) {
-  Label done;
-  __ cmpdi(CR0, value, 0);
-  __ beq(CR0, done);         // Use null as-is.
-
-  __ clrrdi(tmp1, value, JNIHandles::tag_size);
-  __ ld(value, 0, tmp1);      // Resolve (untagged) jobject.
-
-  __ verify_oop(value, FILE_AND_LINE);
-  __ bind(done);
-}
diff --git a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp
deleted file mode 100644
index 5d105f6c048..00000000000
--- a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, 2021 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_PPC_GC_SHARED_MODREFBARRIERSETASSEMBLER_PPC_HPP
-#define CPU_PPC_GC_SHARED_MODREFBARRIERSETASSEMBLER_PPC_HPP
-
-#include "asm/macroAssembler.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-
-// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetAssembler: public BarrierSetAssembler {
-protected:
-  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                               Register from, Register to, Register count,
-                                               Register preserve1, Register preserve2) {}
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register addr, Register count, Register preserve) {}
-
-  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Register base, RegisterOrConstant ind_or_offs, Register val,
-                            Register tmp1, Register tmp2, Register tmp3,
-                            MacroAssembler::PreservationLevel preservation_level) = 0;
-public:
-  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                  Register src, Register dst, Register count,
-                                  Register preserve1, Register preserve2);
-  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                  Register dst, Register count,
-                                  Register preserve);
-
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Register base, RegisterOrConstant ind_or_offs, Register val,
-                        Register tmp1, Register tmp2, Register tmp3,
-                        MacroAssembler::PreservationLevel preservation_level);
-
-  virtual void resolve_jobject(MacroAssembler* masm, Register value,
-                               Register tmp1, Register tmp2,
-                               MacroAssembler::PreservationLevel preservation_level);
-};
-
-#endif // CPU_PPC_GC_SHARED_MODREFBARRIERSETASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
index 64e9cbe1f47..966afde4cb0 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
@@ -345,7 +345,7 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0;
   bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
   bool on_reference = on_weak || on_phantom;
-  ModRefBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp2);
+  CardTableBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp2);
   if (on_oop && on_reference) {
     // RA is live.  It must be saved around calls.
     __ enter(); // barrier may call runtime
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
index 654ba934242..d2d2f4d49bc 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
@@ -27,7 +27,7 @@
 #define CPU_RISCV_GC_G1_G1BARRIERSETASSEMBLER_RISCV_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef COMPILER1
@@ -37,7 +37,7 @@ class StubAssembler;
 class G1PreBarrierStub;
 class G1PreBarrierStubC2;
 
-class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
 protected:
   void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                        Register addr, Register count, RegSet saved_regs);
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
index df7ff65442e..408620dc56f 100644
--- a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
@@ -33,6 +33,29 @@
 
 #define __ masm->
 
+void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                      Register src, Register dst, Register count, RegSet saved_regs) {
+  if (is_oop) {
+    gen_write_ref_array_pre_barrier(masm, decorators, dst, count, saved_regs);
+  }
+}
+
+void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                      Register start, Register count, Register tmp,
+                                                      RegSet saved_regs) {
+  if (is_oop) {
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+  }
+}
+
+void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
+  if (is_reference_type(type)) {
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  }
+}
 
 void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Register tmp) {
   assert_different_registers(obj, tmp);
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
index b8ce585ea70..98737c3623f 100644
--- a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
@@ -27,16 +27,30 @@
 #define CPU_RISCV_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_RISCV_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 
-class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+class CardTableBarrierSetAssembler: public BarrierSetAssembler {
 protected:
   void store_check(MacroAssembler* masm, Register obj, Register tmp);
 
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                               Register addr, Register count, RegSet saved_regs) {}
+
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                 Register start, Register count, Register tmp, RegSet saved_regs);
+
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
+
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register src, Register dst, Register count, RegSet saved_regs);
+
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register start, Register count, Register tmp, RegSet saved_regs);
+
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 };
 
 #endif // #ifndef CPU_RISCV_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp
deleted file mode 100644
index 6b0871007f4..00000000000
--- a/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
-
-#define __ masm->
-
-void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                   Register src, Register dst, Register count, RegSet saved_regs) {
-  if (is_oop) {
-    gen_write_ref_array_pre_barrier(masm, decorators, dst, count, saved_regs);
-  }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                   Register start, Register count, Register tmp,
-                                                   RegSet saved_regs) {
-  if (is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
-  }
-}
-
-void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
-  if (is_reference_type(type)) {
-    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  }
-}
diff --git a/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp
deleted file mode 100644
index 45e64777ed7..00000000000
--- a/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_RISCV_GC_SHARED_MODREFBARRIERSETASSEMBLER_RISCV_HPP
-#define CPU_RISCV_GC_SHARED_MODREFBARRIERSETASSEMBLER_RISCV_HPP
-
-#include "asm/macroAssembler.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-
-// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetAssembler: public BarrierSetAssembler {
-protected:
-  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                               Register addr, Register count, RegSet saved_regs) {}
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register start, Register count, Register tmp, RegSet saved_regs) {}
-
-  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) = 0;
-
-public:
-  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register src, Register dst, Register count, RegSet saved_regs);
-  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs);
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
-};
-
-#endif // CPU_RISCV_GC_SHARED_MODREFBARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
index e4fe690663a..272136fc28c 100644
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
@@ -279,7 +279,7 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   bool on_reference = on_weak || on_phantom;
   Label done;
   if (on_oop && on_reference && L_handle_null == nullptr) { L_handle_null = &done; }
-  ModRefBarrierSetAssembler::load_at(masm, decorators, type, src, dst, tmp1, tmp2, L_handle_null);
+  CardTableBarrierSetAssembler::load_at(masm, decorators, type, src, dst, tmp1, tmp2, L_handle_null);
   if (on_oop && on_reference) {
     // Generate the G1 pre-barrier code to log the value of
     // the referent field in an SATB buffer.
diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp
index fdec751c43b..00e0a116207 100644
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp
@@ -27,7 +27,7 @@
 #define CPU_S390_GC_G1_G1BARRIERSETASSEMBLER_S390_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "utilities/macros.hpp"
 
 class LIR_Assembler;
@@ -35,7 +35,7 @@ class StubAssembler;
 class G1PreBarrierStub;
 class G1PreBarrierStubC2;
 
-class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
  protected:
   virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count);
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
diff --git a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp
index f8f1fe839d2..a0da6ebe682 100644
--- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp
@@ -29,6 +29,7 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "runtime/jniHandles.hpp"
 
 #define __ masm->
 
@@ -42,6 +43,44 @@
 
 #define TIMES_OOP (UseCompressedOops ? Address::times_4 : Address::times_8)
 
+void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                      Register src, Register dst, Register count) {
+  if (is_reference_type(type)) {
+    gen_write_ref_array_pre_barrier(masm, decorators, dst, count);
+  }
+}
+
+void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                      Register dst, Register count, bool do_return) {
+  if (is_reference_type(type)) {
+    gen_write_ref_array_post_barrier(masm, decorators, dst, count, do_return);
+  } else {
+    if (do_return) { __ z_br(Z_R14); }
+  }
+}
+
+void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                            const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
+  if (is_reference_type(type)) {
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  }
+}
+
+void CardTableBarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2) {
+  NearLabel done;
+
+  __ z_ltgr(value, value);
+  __ z_bre(done);  // use null as-is.
+
+  __ z_nill(value, ~JNIHandles::tag_mask);
+  __ z_lg(value, 0, value); // Resolve (untagged) jobject.
+
+  __ verify_oop(value, FILE_AND_LINE);
+  __ bind(done);
+}
+
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
                                                                     bool do_return) {
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
diff --git a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp
index 43ec1e08dca..eb64a09a51f 100644
--- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp
@@ -27,17 +27,30 @@
 #define CPU_S390_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_S390_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 
-class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+class CardTableBarrierSetAssembler: public BarrierSetAssembler {
 protected:
   void store_check(MacroAssembler* masm, Register store_addr, Register tmp);
 
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count) {}
+
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
                                                 bool do_return);
 
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3);
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register src, Register dst, Register count);
+
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register dst, Register count, bool do_return = false);
+
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3);
+
+  virtual void resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2);
 };
 
 #endif // CPU_S390_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp
deleted file mode 100644
index 4d37ae2e4ce..00000000000
--- a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, 2024 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
-#include "runtime/jniHandles.hpp"
-
-#define __ masm->
-
-void ModRefBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
-                                                                 bool do_return) {
-  if (do_return) { __ z_br(Z_R14); }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                   Register src, Register dst, Register count) {
-  if (is_reference_type(type)) {
-    gen_write_ref_array_pre_barrier(masm, decorators, dst, count);
-  }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                   Register dst, Register count, bool do_return) {
-  if (is_reference_type(type)) {
-    gen_write_ref_array_post_barrier(masm, decorators, dst, count, do_return);
-  } else {
-    if (do_return) { __ z_br(Z_R14); }
-  }
-}
-
-void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
-  if (is_reference_type(type)) {
-    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  }
-}
-
-void ModRefBarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2) {
-  NearLabel done;
-
-  __ z_ltgr(value, value);
-  __ z_bre(done);  // use null as-is.
-
-  __ z_nill(value, ~JNIHandles::tag_mask);
-  __ z_lg(value, 0, value); // Resolve (untagged) jobject.
-
-  __ verify_oop(value, FILE_AND_LINE);
-  __ bind(done);
-}
diff --git a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp
deleted file mode 100644
index 7f53d033780..00000000000
--- a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, 2024 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_S390_GC_SHARED_MODREFBARRIERSETASSEMBLER_S390_HPP
-#define CPU_S390_GC_SHARED_MODREFBARRIERSETASSEMBLER_S390_HPP
-
-#include "asm/macroAssembler.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-
-// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetAssembler: public BarrierSetAssembler {
-protected:
-  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count) {}
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
-                                                bool do_return);
-  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3) = 0;
-public:
-  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                  Register src, Register dst, Register count);
-  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                  Register dst, Register count, bool do_return = false);
-
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3);
-
-  virtual void resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2);
-};
-
-#endif // CPU_S390_GC_SHARED_MODREFBARRIERSETASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index a846289d91b..586135fcebc 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -144,7 +144,7 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0;
   bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
   bool on_reference = on_weak || on_phantom;
-  ModRefBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1);
+  CardTableBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1);
   if (on_oop && on_reference) {
     // Generate the G1 pre-barrier code to log the value of
     // the referent field in an SATB buffer.
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
index 4b2de41de69..0db96495bee 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
@@ -26,7 +26,7 @@
 #define CPU_X86_GC_G1_G1BARRIERSETASSEMBLER_X86_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 
 class LIR_Assembler;
 class StubAssembler;
@@ -34,7 +34,7 @@ class G1PreBarrierStub;
 class G1BarrierStubC2;
 class G1PreBarrierStubC2;
 
-class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+class G1BarrierSetAssembler: public CardTableBarrierSetAssembler {
  protected:
   virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count);
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, Register tmp);
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
index ba89b09e4dc..2b91662ddb5 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
@@ -41,6 +41,58 @@
 
 #define TIMES_OOP (UseCompressedOops ? Address::times_4 : Address::times_8)
 
+void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                      Register src, Register dst, Register count) {
+  bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
+  bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
+  bool obj_int = (type == T_OBJECT) && UseCompressedOops;
+
+  if (is_reference_type(type)) {
+    if (!checkcast) {
+      if (!obj_int) {
+        // Save count for barrier
+        __ movptr(r11, count);
+      } else if (disjoint) {
+        // Save dst in r11 in the disjoint case
+        __ movq(r11, dst);
+      }
+    }
+    gen_write_ref_array_pre_barrier(masm, decorators, dst, count);
+  }
+}
+
+void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                      Register src, Register dst, Register count) {
+  bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
+  bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
+  bool obj_int = (type == T_OBJECT) && UseCompressedOops;
+  Register tmp = rax;
+
+  if (is_reference_type(type)) {
+    if (!checkcast) {
+      if (!obj_int) {
+        // Save count for barrier
+        count = r11;
+      } else if (disjoint) {
+        // Use the saved dst in the disjoint case
+        dst = r11;
+      }
+    } else {
+      tmp = rscratch1;
+    }
+    gen_write_ref_array_post_barrier(masm, decorators, dst, count, tmp);
+  }
+}
+
+void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
+  if (is_reference_type(type)) {
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+  }
+}
+
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                     Register addr, Register count, Register tmp) {
   BarrierSet *bs = BarrierSet::barrier_set();
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
index 4760b222977..6f71ec64218 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
@@ -26,16 +26,30 @@
 #define CPU_X86_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_X86_HPP
 
 #include "asm/macroAssembler.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 
-class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+class CardTableBarrierSetAssembler: public BarrierSetAssembler {
 protected:
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                               Register addr, Register count) {}
+
   void store_check(MacroAssembler* masm, Register obj, Address dst);
 
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, Register tmp);
 
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
+
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register src, Register dst, Register count);
+
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register src, Register dst, Register count);
+
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
+
 };
 
 #endif // CPU_X86_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
deleted file mode 100644
index 42109b069f2..00000000000
--- a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/modRefBarrierSetAssembler.hpp"
-
-#define __ masm->
-
-void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                   Register src, Register dst, Register count) {
-  bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
-  bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
-  bool obj_int = (type == T_OBJECT) && UseCompressedOops;
-
-  if (is_reference_type(type)) {
-    if (!checkcast) {
-      if (!obj_int) {
-        // Save count for barrier
-        __ movptr(r11, count);
-      } else if (disjoint) {
-        // Save dst in r11 in the disjoint case
-        __ movq(r11, dst);
-      }
-    }
-    gen_write_ref_array_pre_barrier(masm, decorators, dst, count);
-  }
-}
-
-void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                   Register src, Register dst, Register count) {
-  bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
-  bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
-  bool obj_int = (type == T_OBJECT) && UseCompressedOops;
-  Register tmp = rax;
-
-  if (is_reference_type(type)) {
-    if (!checkcast) {
-      if (!obj_int) {
-        // Save count for barrier
-        count = r11;
-      } else if (disjoint) {
-        // Use the saved dst in the disjoint case
-        dst = r11;
-      }
-    } else {
-      tmp = rscratch1;
-    }
-    gen_write_ref_array_post_barrier(masm, decorators, dst, count, tmp);
-  }
-}
-
-void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
-  if (is_reference_type(type)) {
-    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
-  }
-}
diff --git a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
deleted file mode 100644
index c8b5043256a..00000000000
--- a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP
-#define CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP
-
-#include "asm/macroAssembler.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-
-// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetAssembler: public BarrierSetAssembler {
-protected:
-  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                               Register addr, Register count) {}
-  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register addr, Register count, Register tmp) {}
-  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) = 0;
-public:
-  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                  Register src, Register dst, Register count);
-  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                  Register src, Register dst, Register count);
-
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
-};
-
-#endif // CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp b/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp
deleted file mode 100644
index 78c8fc1653a..00000000000
--- a/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_ZERO_GC_SHARED_MODREFBARRIERSETASSEMBLER_ZERO_HPP
-#define CPU_ZERO_GC_SHARED_MODREFBARRIERSETASSEMBLER_ZERO_HPP
-
-class ModRefBarrierSetAssembler;
-
-#endif // CPU_ZERO_GC_SHARED_MODREFBARRIERSETASSEMBLER_ZERO_HPP
diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp
index 89f5676a2d2..76dcd7fa4ff 100644
--- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp
+++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp
@@ -27,7 +27,7 @@
 
 #include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_Compilation.hpp"
-#include "gc/shared/c1/modRefBarrierSetC1.hpp"
+#include "gc/shared/c1/cardTableBarrierSetC1.hpp"
 
 class G1PreBarrierStub: public CodeStub {
   friend class G1BarrierSetC1;
@@ -93,7 +93,7 @@ class G1PreBarrierStub: public CodeStub {
 
 class CodeBlob;
 
-class G1BarrierSetC1 : public ModRefBarrierSetC1 {
+class G1BarrierSetC1 : public CardTableBarrierSetC1 {
  protected:
   CodeBlob* _pre_barrier_c1_runtime_code_blob;
 
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index 58a70ed6a60..bf595973a32 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -117,8 +117,8 @@ class G1BarrierSet: public CardTableBarrierSet {
 
   // Callbacks for runtime accesses.
   template <DecoratorSet decorators, typename BarrierSetT = G1BarrierSet>
-  class AccessBarrier: public ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT> {
-    typedef ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT> ModRef;
+  class AccessBarrier: public CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT> {
+    typedef CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT> CardTableBS;
     typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
 
   public:
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index ffba561f11f..ee2c1450d9b 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -94,7 +94,7 @@ template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_not_in_heap(T* addr) {
-  oop value = ModRef::oop_load_not_in_heap(addr);
+  oop value = CardTableBS::oop_load_not_in_heap(addr);
   enqueue_preloaded_if_weak(decorators, value);
   return value;
 }
@@ -103,7 +103,7 @@ template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_in_heap(T* addr) {
-  oop value = ModRef::oop_load_in_heap(addr);
+  oop value = CardTableBS::oop_load_in_heap(addr);
   enqueue_preloaded_if_weak(decorators, value);
   return value;
 }
@@ -111,7 +111,7 @@ oop_load_in_heap(T* addr) {
 template <DecoratorSet decorators, typename BarrierSetT>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_in_heap_at(oop base, ptrdiff_t offset) {
-  oop value = ModRef::oop_load_in_heap_at(base, offset);
+  oop value = CardTableBS::oop_load_in_heap_at(base, offset);
   enqueue_preloaded_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), value);
   return value;
 }
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 76a335d209f..546084e38dd 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -48,7 +48,6 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
-#include "gc/shared/modRefBarrierSet.hpp"
 #include "gc/shared/oopStorageSet.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/referencePolicy.hpp"
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
index 8bb7cf7c7ef..5a160f52c5a 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
@@ -27,20 +27,12 @@
 
 #include "utilities/macros.hpp"
 
-// Do something for each concrete barrier set part of the build.
-#define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
+// Do something for each barrier set part of the build.
+#define FOR_EACH_BARRIER_SET_DO(f)                   \
   f(CardTableBarrierSet)                             \
   EPSILONGC_ONLY(f(EpsilonBarrierSet))               \
   G1GC_ONLY(f(G1BarrierSet))                         \
   SHENANDOAHGC_ONLY(f(ShenandoahBarrierSet))         \
   ZGC_ONLY(f(ZBarrierSet))
 
-#define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f)          \
-  f(ModRef)
-
-// Do something for each known barrier set.
-#define FOR_EACH_BARRIER_SET_DO(f)    \
-  FOR_EACH_ABSTRACT_BARRIER_SET_DO(f) \
-  FOR_EACH_CONCRETE_BARRIER_SET_DO(f)
-
 #endif // SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
index f637c227ee1..32a8719e21f 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
@@ -28,7 +28,6 @@
 #include "gc/shared/barrierSetConfig.hpp"
 
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
-#include "gc/shared/modRefBarrierSet.inline.hpp"
 
 #if INCLUDE_EPSILONGC
 #include "gc/epsilon/epsilonBarrierSet.hpp"
diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
index 278b1b158aa..ebc1c1c7fb7 100644
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
@@ -34,6 +34,68 @@
 #define __ gen->lir()->
 #endif
 
+void CardTableBarrierSetC1::store_at_resolved(LIRAccess& access, LIR_Opr value) {
+  DecoratorSet decorators = access.decorators();
+  bool is_array = (decorators & IS_ARRAY) != 0;
+  bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
+
+  if (access.is_oop()) {
+    pre_barrier(access, access.resolved_addr(),
+                LIR_OprFact::illegalOpr /* pre_val */, access.patch_emit_info());
+  }
+
+  BarrierSetC1::store_at_resolved(access, value);
+
+  if (access.is_oop()) {
+    bool precise = is_array || on_anonymous;
+    LIR_Opr post_addr = precise ? access.resolved_addr() : access.base().opr();
+    post_barrier(access, post_addr, value);
+  }
+}
+
+LIR_Opr CardTableBarrierSetC1::atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value) {
+  if (access.is_oop()) {
+    pre_barrier(access, access.resolved_addr(),
+                LIR_OprFact::illegalOpr /* pre_val */, nullptr);
+  }
+
+  LIR_Opr result = BarrierSetC1::atomic_cmpxchg_at_resolved(access, cmp_value, new_value);
+
+  if (access.is_oop()) {
+    post_barrier(access, access.resolved_addr(), new_value.result());
+  }
+
+  return result;
+}
+
+LIR_Opr CardTableBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value) {
+  if (access.is_oop()) {
+    pre_barrier(access, access.resolved_addr(),
+                LIR_OprFact::illegalOpr /* pre_val */, nullptr);
+  }
+
+  LIR_Opr result = BarrierSetC1::atomic_xchg_at_resolved(access, value);
+
+  if (access.is_oop()) {
+    post_barrier(access, access.resolved_addr(), value.result());
+  }
+
+  return result;
+}
+
+// This overrides the default to resolve the address into a register,
+// assuming it will be used by a write barrier anyway.
+LIR_Opr CardTableBarrierSetC1::resolve_address(LIRAccess& access, bool resolve_in_register) {
+  DecoratorSet decorators = access.decorators();
+  bool needs_patching = (decorators & C1_NEEDS_PATCHING) != 0;
+  bool is_write = (decorators & ACCESS_WRITE) != 0;
+  bool is_array = (decorators & IS_ARRAY) != 0;
+  bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
+  bool precise = is_array || on_anonymous;
+  resolve_in_register |= !needs_patching && is_write && access.is_oop() && precise;
+  return BarrierSetC1::resolve_address(access, resolve_in_register);
+}
+
 void CardTableBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Opr new_val) {
   DecoratorSet decorators = access.decorators();
   LIRGenerator* gen = access.gen();
diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp
index 2b1629575b3..10e8311e764 100644
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp
@@ -25,11 +25,22 @@
 #ifndef SHARE_GC_SHARED_C1_CARDTABLEBARRIERSETC1_HPP
 #define SHARE_GC_SHARED_C1_CARDTABLEBARRIERSETC1_HPP
 
-#include "gc/shared/c1/modRefBarrierSetC1.hpp"
+#include "gc/shared/c1/barrierSetC1.hpp"
 
-class CardTableBarrierSetC1 : public ModRefBarrierSetC1 {
+class CardTableBarrierSetC1 : public BarrierSetC1 {
 protected:
+  virtual void pre_barrier(LIRAccess& access, LIR_Opr addr_opr,
+                         LIR_Opr pre_val, CodeEmitInfo* info) {}
+
   virtual void post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Opr new_val);
+
+  virtual LIR_Opr resolve_address(LIRAccess& access, bool resolve_in_register);
+
+  virtual void store_at_resolved(LIRAccess& access, LIR_Opr value);
+
+  virtual LIR_Opr atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value);
+
+  virtual LIR_Opr atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value);
 };
 
 #endif // SHARE_GC_SHARED_C1_CARDTABLEBARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.cpp
deleted file mode 100644
index d7d463d252e..00000000000
--- a/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "gc/shared/c1/modRefBarrierSetC1.hpp"
-#include "utilities/macros.hpp"
-
-#ifdef ASSERT
-#define __ gen->lir(__FILE__, __LINE__)->
-#else
-#define __ gen->lir()->
-#endif
-
-void ModRefBarrierSetC1::store_at_resolved(LIRAccess& access, LIR_Opr value) {
-  DecoratorSet decorators = access.decorators();
-  bool is_array = (decorators & IS_ARRAY) != 0;
-  bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
-
-  if (access.is_oop()) {
-    pre_barrier(access, access.resolved_addr(),
-                LIR_OprFact::illegalOpr /* pre_val */, access.patch_emit_info());
-  }
-
-  BarrierSetC1::store_at_resolved(access, value);
-
-  if (access.is_oop()) {
-    bool precise = is_array || on_anonymous;
-    LIR_Opr post_addr = precise ? access.resolved_addr() : access.base().opr();
-    post_barrier(access, post_addr, value);
-  }
-}
-
-LIR_Opr ModRefBarrierSetC1::atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value) {
-  if (access.is_oop()) {
-    pre_barrier(access, access.resolved_addr(),
-                LIR_OprFact::illegalOpr /* pre_val */, nullptr);
-  }
-
-  LIR_Opr result = BarrierSetC1::atomic_cmpxchg_at_resolved(access, cmp_value, new_value);
-
-  if (access.is_oop()) {
-    post_barrier(access, access.resolved_addr(), new_value.result());
-  }
-
-  return result;
-}
-
-LIR_Opr ModRefBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value) {
-  if (access.is_oop()) {
-    pre_barrier(access, access.resolved_addr(),
-                LIR_OprFact::illegalOpr /* pre_val */, nullptr);
-  }
-
-  LIR_Opr result = BarrierSetC1::atomic_xchg_at_resolved(access, value);
-
-  if (access.is_oop()) {
-    post_barrier(access, access.resolved_addr(), value.result());
-  }
-
-  return result;
-}
-
-// This overrides the default to resolve the address into a register,
-// assuming it will be used by a write barrier anyway.
-LIR_Opr ModRefBarrierSetC1::resolve_address(LIRAccess& access, bool resolve_in_register) {
-  DecoratorSet decorators = access.decorators();
-  bool needs_patching = (decorators & C1_NEEDS_PATCHING) != 0;
-  bool is_write = (decorators & ACCESS_WRITE) != 0;
-  bool is_array = (decorators & IS_ARRAY) != 0;
-  bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
-  bool precise = is_array || on_anonymous;
-  resolve_in_register |= !needs_patching && is_write && access.is_oop() && precise;
-  return BarrierSetC1::resolve_address(access, resolve_in_register);
-}
diff --git a/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp
deleted file mode 100644
index 2bd547c41b1..00000000000
--- a/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_C1_MODREFBARRIERSETC1_HPP
-#define SHARE_GC_SHARED_C1_MODREFBARRIERSETC1_HPP
-
-#include "gc/shared/c1/barrierSetC1.hpp"
-
-// The ModRefBarrierSetC1 filters away accesses on BasicTypes other
-// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
-// accesses, which are overridden in the concrete BarrierSetAssembler.
-
-class ModRefBarrierSetC1 : public BarrierSetC1 {
-protected:
-  virtual void pre_barrier(LIRAccess& access, LIR_Opr addr_opr,
-                           LIR_Opr pre_val, CodeEmitInfo* info) {}
-  virtual void post_barrier(LIRAccess& access, LIR_Opr addr,
-                            LIR_Opr new_val) {}
-
-  virtual LIR_Opr resolve_address(LIRAccess& access, bool resolve_in_register);
-
-  virtual void store_at_resolved(LIRAccess& access, LIR_Opr value);
-
-  virtual LIR_Opr atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value);
-
-  virtual LIR_Opr atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value);
-};
-
-#endif // SHARE_GC_SHARED_C1_MODREFBARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
index 536cd6da1ef..fada2672e9f 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
@@ -35,6 +35,85 @@
 
 #define __ ideal.
 
+Node* CardTableBarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) const {
+  DecoratorSet decorators = access.decorators();
+
+  Node* adr = access.addr().node();
+
+  bool is_array = (decorators & IS_ARRAY) != 0;
+  bool anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
+  bool in_heap = (decorators & IN_HEAP) != 0;
+  bool use_precise = is_array || anonymous;
+  bool tightly_coupled_alloc = (decorators & C2_TIGHTLY_COUPLED_ALLOC) != 0;
+
+  if (!access.is_oop() || tightly_coupled_alloc || (!in_heap && !anonymous)) {
+    return BarrierSetC2::store_at_resolved(access, val);
+  }
+
+  assert(access.is_parse_access(), "entry not supported at optimization time");
+  C2ParseAccess& parse_access = static_cast<C2ParseAccess&>(access);
+
+  Node* store = BarrierSetC2::store_at_resolved(access, val);
+  post_barrier(parse_access.kit(), access.base(), adr, val.node(), use_precise);
+
+  return store;
+}
+
+Node* CardTableBarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
+                                                            Node* new_val, const Type* value_type) const {
+  if (!access.is_oop()) {
+    return BarrierSetC2::atomic_cmpxchg_val_at_resolved(access, expected_val, new_val, value_type);
+  }
+
+  Node* result = BarrierSetC2::atomic_cmpxchg_val_at_resolved(access, expected_val, new_val, value_type);
+
+  post_barrier(access.kit(), access.base(), access.addr().node(), new_val, true);
+
+  return result;
+}
+
+Node* CardTableBarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
+                                                             Node* new_val, const Type* value_type) const {
+  GraphKit* kit = access.kit();
+
+  if (!access.is_oop()) {
+    return BarrierSetC2::atomic_cmpxchg_bool_at_resolved(access, expected_val, new_val, value_type);
+  }
+
+  Node* load_store = BarrierSetC2::atomic_cmpxchg_bool_at_resolved(access, expected_val, new_val, value_type);
+
+  // Emit the post barrier only when the actual store happened. This makes sense
+  // to check only for LS_cmp_* that can fail to set the value.
+  // LS_cmp_exchange does not produce any branches by default, so there is no
+  // boolean result to piggyback on. TODO: When we merge CompareAndSwap with
+  // CompareAndExchange and move branches here, it would make sense to conditionalize
+  // post_barriers for LS_cmp_exchange as well.
+  //
+  // CAS success path is marked more likely since we anticipate this is a performance
+  // critical path, while CAS failure path can use the penalty for going through unlikely
+  // path as backoff. Which is still better than doing a store barrier there.
+  IdealKit ideal(kit);
+  ideal.if_then(load_store, BoolTest::ne, ideal.ConI(0), PROB_STATIC_FREQUENT); {
+    kit->sync_kit(ideal);
+    post_barrier(kit, access.base(), access.addr().node(), new_val, true);
+    ideal.sync_kit(kit);
+  } ideal.end_if();
+  kit->final_sync(ideal);
+
+  return load_store;
+}
+
+Node* CardTableBarrierSetC2::atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const {
+  Node* result = BarrierSetC2::atomic_xchg_at_resolved(access, new_val, value_type);
+  if (!access.is_oop()) {
+    return result;
+  }
+
+  post_barrier(access.kit(), access.base(), access.addr().node(), new_val, true);
+
+  return result;
+}
+
 Node* CardTableBarrierSetC2::byte_map_base_node(GraphKit* kit) const {
   // Get base of card map
   CardTable::CardValue* card_table_base = ci_card_table_address();
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
index 1263030a8b5..84876808f0d 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
@@ -25,9 +25,9 @@
 #ifndef SHARE_GC_SHARED_C2_CARDTABLEBARRIERSETC2_HPP
 #define SHARE_GC_SHARED_C2_CARDTABLEBARRIERSETC2_HPP
 
-#include "gc/shared/c2/modRefBarrierSetC2.hpp"
+#include "gc/shared/c2/barrierSetC2.hpp"
 
-class CardTableBarrierSetC2: public ModRefBarrierSetC2 {
+class CardTableBarrierSetC2: public BarrierSetC2 {
 protected:
   virtual void post_barrier(GraphKit* kit,
                             Node* obj,
@@ -35,6 +35,14 @@ protected:
                             Node* val,
                             bool use_precise) const;
 
+  virtual Node* store_at_resolved(C2Access& access, C2AccessValue& val) const;
+
+  virtual Node* atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
+                                               Node* new_val, const Type* value_type) const;
+  virtual Node* atomic_cmpxchg_bool_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
+                                                Node* new_val, const Type* value_type) const;
+  virtual Node* atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const;
+
   Node* byte_map_base_node(GraphKit* kit) const;
 
 public:
diff --git a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp
deleted file mode 100644
index ddc9caedd71..00000000000
--- a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "gc/shared/c2/modRefBarrierSetC2.hpp"
-#include "opto/arraycopynode.hpp"
-#include "opto/graphKit.hpp"
-#include "opto/idealKit.hpp"
-
-Node* ModRefBarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) const {
-  DecoratorSet decorators = access.decorators();
-
-  Node* adr = access.addr().node();
-
-  bool is_array = (decorators & IS_ARRAY) != 0;
-  bool anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
-  bool in_heap = (decorators & IN_HEAP) != 0;
-  bool use_precise = is_array || anonymous;
-  bool tightly_coupled_alloc = (decorators & C2_TIGHTLY_COUPLED_ALLOC) != 0;
-
-  if (!access.is_oop() || tightly_coupled_alloc || (!in_heap && !anonymous)) {
-    return BarrierSetC2::store_at_resolved(access, val);
-  }
-
-  assert(access.is_parse_access(), "entry not supported at optimization time");
-  C2ParseAccess& parse_access = static_cast<C2ParseAccess&>(access);
-
-  Node* store = BarrierSetC2::store_at_resolved(access, val);
-  post_barrier(parse_access.kit(), access.base(), adr, val.node(), use_precise);
-
-  return store;
-}
-
-Node* ModRefBarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
-                                                         Node* new_val, const Type* value_type) const {
-  if (!access.is_oop()) {
-    return BarrierSetC2::atomic_cmpxchg_val_at_resolved(access, expected_val, new_val, value_type);
-  }
-
-  Node* result = BarrierSetC2::atomic_cmpxchg_val_at_resolved(access, expected_val, new_val, value_type);
-
-  post_barrier(access.kit(), access.base(), access.addr().node(), new_val, true);
-
-  return result;
-}
-
-Node* ModRefBarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
-                                                          Node* new_val, const Type* value_type) const {
-  GraphKit* kit = access.kit();
-
-  if (!access.is_oop()) {
-    return BarrierSetC2::atomic_cmpxchg_bool_at_resolved(access, expected_val, new_val, value_type);
-  }
-
-  Node* load_store = BarrierSetC2::atomic_cmpxchg_bool_at_resolved(access, expected_val, new_val, value_type);
-
-  // Emit the post barrier only when the actual store happened. This makes sense
-  // to check only for LS_cmp_* that can fail to set the value.
-  // LS_cmp_exchange does not produce any branches by default, so there is no
-  // boolean result to piggyback on. TODO: When we merge CompareAndSwap with
-  // CompareAndExchange and move branches here, it would make sense to conditionalize
-  // post_barriers for LS_cmp_exchange as well.
-  //
-  // CAS success path is marked more likely since we anticipate this is a performance
-  // critical path, while CAS failure path can use the penalty for going through unlikely
-  // path as backoff. Which is still better than doing a store barrier there.
-  IdealKit ideal(kit);
-  ideal.if_then(load_store, BoolTest::ne, ideal.ConI(0), PROB_STATIC_FREQUENT); {
-    kit->sync_kit(ideal);
-    post_barrier(kit, access.base(), access.addr().node(), new_val, true);
-    ideal.sync_kit(kit);
-  } ideal.end_if();
-  kit->final_sync(ideal);
-
-  return load_store;
-}
-
-Node* ModRefBarrierSetC2::atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const {
-  Node* result = BarrierSetC2::atomic_xchg_at_resolved(access, new_val, value_type);
-  if (!access.is_oop()) {
-    return result;
-  }
-
-  post_barrier(access.kit(), access.base(), access.addr().node(), new_val, true);
-
-  return result;
-}
diff --git a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp
deleted file mode 100644
index 42fe3f7d0b6..00000000000
--- a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_C2_MODREFBARRIERSETC2_HPP
-#define SHARE_GC_SHARED_C2_MODREFBARRIERSETC2_HPP
-
-#include "gc/shared/c2/barrierSetC2.hpp"
-
-class TypeOopPtr;
-
-class ModRefBarrierSetC2: public BarrierSetC2 {
-protected:
-  virtual void post_barrier(GraphKit* kit,
-                            Node* obj,
-                            Node* adr,
-                            Node* val,
-                            bool use_precise) const {}
-
-  virtual Node* store_at_resolved(C2Access& access, C2AccessValue& val) const;
-
-  virtual Node* atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
-                                               Node* new_val, const Type* value_type) const;
-  virtual Node* atomic_cmpxchg_bool_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
-                                                Node* new_val, const Type* value_type) const;
-  virtual Node* atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const;
-};
-
-#endif // SHARE_GC_SHARED_C2_MODREFBARRIERSETC2_HPP
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index de514f64be2..539e40820a8 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -53,18 +53,22 @@ CardTableBarrierSet::CardTableBarrierSet(BarrierSetAssembler* barrier_set_assemb
                                          BarrierSetC2* barrier_set_c2,
                                          CardTable* card_table,
                                          const BarrierSet::FakeRtti& fake_rtti) :
-  ModRefBarrierSet(barrier_set_assembler,
-                   barrier_set_c1,
-                   barrier_set_c2,
-                   fake_rtti.add_tag(BarrierSet::CardTableBarrierSet)),
+  BarrierSet(barrier_set_assembler,
+             barrier_set_c1,
+             barrier_set_c2,
+             nullptr /* barrier_set_nmethod */,
+             nullptr /* barrier_set_stack_chunk */,
+             fake_rtti.add_tag(BarrierSet::CardTableBarrierSet)),
   _card_table(card_table)
 {}
 
 CardTableBarrierSet::CardTableBarrierSet(CardTable* card_table) :
-  ModRefBarrierSet(make_barrier_set_assembler<CardTableBarrierSetAssembler>(),
-                   make_barrier_set_c1<CardTableBarrierSetC1>(),
-                   make_barrier_set_c2<CardTableBarrierSetC2>(),
-                   BarrierSet::FakeRtti(BarrierSet::CardTableBarrierSet)),
+  BarrierSet(make_barrier_set_assembler<CardTableBarrierSetAssembler>(),
+             make_barrier_set_c1<CardTableBarrierSetC1>(),
+             make_barrier_set_c2<CardTableBarrierSetC2>(),
+             nullptr /* barrier_set_nmethod */,
+             nullptr /* barrier_set_stack_chunk */,
+             BarrierSet::FakeRtti(BarrierSet::CardTableBarrierSet)),
   _card_table(card_table)
 {}
 
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index a5646c303f3..dea36098673 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -25,8 +25,9 @@
 #ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
 #define SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
 
+#include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
-#include "gc/shared/modRefBarrierSet.hpp"
+#include "memory/memRegion.hpp"
 #include "utilities/align.hpp"
 
 // This kind of "BarrierSet" allows a "CollectedHeap" to detect and
@@ -41,7 +42,7 @@
 // Closures used to scan dirty cards should take these
 // considerations into account.
 
-class CardTableBarrierSet: public ModRefBarrierSet {
+class CardTableBarrierSet: public BarrierSet {
   // Some classes get to look at some private stuff.
   friend class VMStructs;
 
@@ -59,23 +60,68 @@ public:
   CardTableBarrierSet(CardTable* card_table);
   virtual ~CardTableBarrierSet();
 
-  CardTable* card_table() const { return _card_table; }
+  template <DecoratorSet decorators, typename T>
+  inline void write_ref_field_pre(T* addr) {}
 
   // Record a reference update. Note that these versions are precise!
   // The scanning code has to handle the fact that the write barrier may be
   // either precise or imprecise. We make non-virtual inline variants of
   // these functions here for performance.
   template <DecoratorSet decorators, typename T>
-  void write_ref_field_post(T* field);
+  inline void write_ref_field_post(T *addr);
 
+  // Causes all refs in "mr" to be assumed to be modified (by this JavaThread).
   virtual void write_region(MemRegion mr);
 
+  // Operations on arrays, or general regions (e.g., for "clone") may be
+  // optimized by some barriers.
+
+  // Below length is the # array elements being written
+  virtual void write_ref_array_pre(oop* dst, size_t length,
+                                   bool dest_uninitialized) {}
+  virtual void write_ref_array_pre(narrowOop* dst, size_t length,
+                                   bool dest_uninitialized) {}
+  // Below count is the # array elements being written, starting
+  // at the address "start", which may not necessarily be HeapWord-aligned
+  inline void write_ref_array(HeapWord* start, size_t count);
+
+  CardTable* card_table() const { return _card_table; }
+
   virtual void on_slowpath_allocation_exit(JavaThread* thread, oop new_obj);
 
   virtual void print_on(outputStream* st) const;
 
   template <DecoratorSet decorators, typename BarrierSetT = CardTableBarrierSet>
-  class AccessBarrier: public ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT> {};
+  class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
+    typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
+
+  public:
+    template <typename T>
+    static void oop_store_in_heap(T* addr, oop value);
+    template <typename T>
+    static oop oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value);
+    template <typename T>
+    static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
+
+    template <typename T>
+    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                      size_t length);
+
+    static void clone_in_heap(oop src, oop dst, size_t size);
+
+    static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value) {
+      oop_store_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), value);
+    }
+
+    static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value) {
+      return oop_atomic_xchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), new_value);
+    }
+
+    static oop oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
+      return oop_atomic_cmpxchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), compare_value, new_value);
+    }
+  };
 };
 
 template<>
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
index 3d87cb2e69d..7fc3fee1e7c 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
@@ -27,8 +27,11 @@
 
 #include "gc/shared/cardTableBarrierSet.hpp"
 
+#include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "oops/compressedOops.inline.hpp"
+#include "oops/objArrayOop.hpp"
+#include "oops/oop.hpp"
 
 template <DecoratorSet decorators, typename T>
 inline void CardTableBarrierSet::write_ref_field_post(T* field) {
@@ -36,4 +39,112 @@ inline void CardTableBarrierSet::write_ref_field_post(T* field) {
   *byte = CardTable::dirty_card_val();
 }
 
+class Klass;
+
+// count is number of array elements being written
+void CardTableBarrierSet::write_ref_array(HeapWord* start, size_t count) {
+  HeapWord* end = (HeapWord*)((char*)start + (count*heapOopSize));
+  // In the case of compressed oops, start and end may potentially be misaligned;
+  // so we need to conservatively align the first downward (this is not
+  // strictly necessary for current uses, but a case of good hygiene and,
+  // if you will, aesthetics) and the second upward (this is essential for
+  // current uses) to a HeapWord boundary, so we mark all cards overlapping
+  // this write. If this evolves in the future to calling a
+  // logging barrier of narrow oop granularity, like the pre-barrier for G1
+  // (mentioned here merely by way of example), we will need to change this
+  // interface, so it is "exactly precise" (if i may be allowed the adverbial
+  // redundancy for emphasis) and does not include narrow oop slots not
+  // included in the original write interval.
+  HeapWord* aligned_start = align_down(start, HeapWordSize);
+  HeapWord* aligned_end   = align_up  (end,   HeapWordSize);
+  // If compressed oops were not being used, these should already be aligned
+  assert(UseCompressedOops || (aligned_start == start && aligned_end == end),
+         "Expected heap word alignment of start and end");
+  write_region(MemRegion(aligned_start, aligned_end));
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline void CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
+oop_store_in_heap(T* addr, oop value) {
+  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
+  bs->template write_ref_field_pre<decorators>(addr);
+  Raw::oop_store(addr, value);
+  bs->template write_ref_field_post<decorators>(addr);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
+oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value) {
+  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
+  bs->template write_ref_field_pre<decorators>(addr);
+  oop result = Raw::oop_atomic_cmpxchg(addr, compare_value, new_value);
+  if (result == compare_value) {
+    bs->template write_ref_field_post<decorators>(addr);
+  }
+  return result;
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
+oop_atomic_xchg_in_heap(T* addr, oop new_value) {
+  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
+  bs->template write_ref_field_pre<decorators>(addr);
+  oop result = Raw::oop_atomic_xchg(addr, new_value);
+  bs->template write_ref_field_post<decorators>(addr);
+  return result;
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline bool CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
+oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                      size_t length) {
+  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
+
+  src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+  dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+  if (!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
+    // Optimized covariant case
+    bs->write_ref_array_pre(dst_raw, length,
+                            HasDecorator<decorators, IS_DEST_UNINITIALIZED>::value);
+    Raw::oop_arraycopy(nullptr, 0, src_raw, nullptr, 0, dst_raw, length);
+    bs->write_ref_array((HeapWord*)dst_raw, length);
+  } else {
+    assert(dst_obj != nullptr, "better have an actual oop");
+    Klass* bound = objArrayOop(dst_obj)->element_klass();
+    T* from = const_cast<T*>(src_raw);
+    T* end = from + length;
+    for (T* p = dst_raw; from < end; from++, p++) {
+      T element = *from;
+      if (oopDesc::is_instanceof_or_null(CompressedOops::decode(element), bound)) {
+        bs->template write_ref_field_pre<decorators>(p);
+        *p = element;
+      } else {
+        // We must do a barrier to cover the partial copy.
+        const size_t pd = pointer_delta(p, dst_raw, (size_t)heapOopSize);
+        // pointer delta is scaled to number of elements (length field in
+        // objArrayOop) which we assume is 32 bit.
+        assert(pd == (size_t)(int)pd, "length field overflow");
+        bs->write_ref_array((HeapWord*)dst_raw, pd);
+        return false;
+      }
+    }
+    bs->write_ref_array((HeapWord*)dst_raw, length);
+  }
+  return true;
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+inline void CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
+clone_in_heap(oop src, oop dst, size_t size) {
+  Raw::clone(src, dst, size);
+  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
+  bs->write_region(MemRegion((HeapWord*)(void*)dst, size));
+}
+
 #endif // SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
deleted file mode 100644
index c078d151233..00000000000
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_MODREFBARRIERSET_HPP
-#define SHARE_GC_SHARED_MODREFBARRIERSET_HPP
-
-#include "gc/shared/barrierSet.hpp"
-#include "memory/memRegion.hpp"
-
-class Klass;
-
-class ModRefBarrierSet: public BarrierSet {
-protected:
-  ModRefBarrierSet(BarrierSetAssembler* barrier_set_assembler,
-                   BarrierSetC1* barrier_set_c1,
-                   BarrierSetC2* barrier_set_c2,
-                   const BarrierSet::FakeRtti& fake_rtti)
-    : BarrierSet(barrier_set_assembler,
-                 barrier_set_c1,
-                 barrier_set_c2,
-                 nullptr /* barrier_set_nmethod */,
-                 nullptr /* barrier_set_stack_chunk */,
-                 fake_rtti.add_tag(BarrierSet::ModRef)) { }
-  ~ModRefBarrierSet() { }
-
-public:
-  template <DecoratorSet decorators, typename T>
-  inline void write_ref_field_pre(T* addr) {}
-
-  template <DecoratorSet decorators, typename T>
-  inline void write_ref_field_post(T *addr) {}
-
-  // Causes all refs in "mr" to be assumed to be modified (by this JavaThread).
-  virtual void write_region(MemRegion mr) = 0;
-
-  // Operations on arrays, or general regions (e.g., for "clone") may be
-  // optimized by some barriers.
-
-  // Below length is the # array elements being written
-  virtual void write_ref_array_pre(oop* dst, size_t length,
-                                   bool dest_uninitialized) {}
-  virtual void write_ref_array_pre(narrowOop* dst, size_t length,
-                                   bool dest_uninitialized) {}
-  // Below count is the # array elements being written, starting
-  // at the address "start", which may not necessarily be HeapWord-aligned
-  inline void write_ref_array(HeapWord* start, size_t count);
-
-  // The ModRef abstraction introduces pre and post barriers
-  template <DecoratorSet decorators, typename BarrierSetT>
-  class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
-    typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
-
-  public:
-    template <typename T>
-    static void oop_store_in_heap(T* addr, oop value);
-    template <typename T>
-    static oop oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value);
-    template <typename T>
-    static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
-
-    template <typename T>
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                      size_t length);
-
-    static void clone_in_heap(oop src, oop dst, size_t size);
-
-    static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value) {
-      oop_store_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), value);
-    }
-
-    static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value) {
-      return oop_atomic_xchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), new_value);
-    }
-
-    static oop oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
-      return oop_atomic_cmpxchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), compare_value, new_value);
-    }
-  };
-};
-
-template<>
-struct BarrierSet::GetName<ModRefBarrierSet> {
-  static const BarrierSet::Name value = BarrierSet::ModRef;
-};
-
-#endif // SHARE_GC_SHARED_MODREFBARRIERSET_HPP
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
deleted file mode 100644
index f5ad4f2c756..00000000000
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
-#define SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
-
-#include "gc/shared/modRefBarrierSet.hpp"
-
-#include "gc/shared/barrierSet.hpp"
-#include "oops/compressedOops.inline.hpp"
-#include "oops/objArrayOop.hpp"
-#include "oops/oop.hpp"
-#include "runtime/thread.hpp"
-
-class Klass;
-
-// count is number of array elements being written
-void ModRefBarrierSet::write_ref_array(HeapWord* start, size_t count) {
-  HeapWord* end = (HeapWord*)((char*)start + (count*heapOopSize));
-  // In the case of compressed oops, start and end may potentially be misaligned;
-  // so we need to conservatively align the first downward (this is not
-  // strictly necessary for current uses, but a case of good hygiene and,
-  // if you will, aesthetics) and the second upward (this is essential for
-  // current uses) to a HeapWord boundary, so we mark all cards overlapping
-  // this write. If this evolves in the future to calling a
-  // logging barrier of narrow oop granularity, like the pre-barrier for G1
-  // (mentioned here merely by way of example), we will need to change this
-  // interface, so it is "exactly precise" (if i may be allowed the adverbial
-  // redundancy for emphasis) and does not include narrow oop slots not
-  // included in the original write interval.
-  HeapWord* aligned_start = align_down(start, HeapWordSize);
-  HeapWord* aligned_end   = align_up  (end,   HeapWordSize);
-  // If compressed oops were not being used, these should already be aligned
-  assert(UseCompressedOops || (aligned_start == start && aligned_end == end),
-         "Expected heap word alignment of start and end");
-  write_region(MemRegion(aligned_start, aligned_end));
-}
-
-template <DecoratorSet decorators, typename BarrierSetT>
-template <typename T>
-inline void ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
-oop_store_in_heap(T* addr, oop value) {
-  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
-  bs->template write_ref_field_pre<decorators>(addr);
-  Raw::oop_store(addr, value);
-  bs->template write_ref_field_post<decorators>(addr);
-}
-
-template <DecoratorSet decorators, typename BarrierSetT>
-template <typename T>
-inline oop ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
-oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value) {
-  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
-  bs->template write_ref_field_pre<decorators>(addr);
-  oop result = Raw::oop_atomic_cmpxchg(addr, compare_value, new_value);
-  if (result == compare_value) {
-    bs->template write_ref_field_post<decorators>(addr);
-  }
-  return result;
-}
-
-template <DecoratorSet decorators, typename BarrierSetT>
-template <typename T>
-inline oop ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
-oop_atomic_xchg_in_heap(T* addr, oop new_value) {
-  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
-  bs->template write_ref_field_pre<decorators>(addr);
-  oop result = Raw::oop_atomic_xchg(addr, new_value);
-  bs->template write_ref_field_post<decorators>(addr);
-  return result;
-}
-
-template <DecoratorSet decorators, typename BarrierSetT>
-template <typename T>
-inline bool ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
-oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                      size_t length) {
-  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
-
-  src_raw = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
-  dst_raw = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
-
-  if (!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
-    // Optimized covariant case
-    bs->write_ref_array_pre(dst_raw, length,
-                            HasDecorator<decorators, IS_DEST_UNINITIALIZED>::value);
-    Raw::oop_arraycopy(nullptr, 0, src_raw, nullptr, 0, dst_raw, length);
-    bs->write_ref_array((HeapWord*)dst_raw, length);
-  } else {
-    assert(dst_obj != nullptr, "better have an actual oop");
-    Klass* bound = objArrayOop(dst_obj)->element_klass();
-    T* from = const_cast<T*>(src_raw);
-    T* end = from + length;
-    for (T* p = dst_raw; from < end; from++, p++) {
-      T element = *from;
-      if (oopDesc::is_instanceof_or_null(CompressedOops::decode(element), bound)) {
-        bs->template write_ref_field_pre<decorators>(p);
-        *p = element;
-      } else {
-        // We must do a barrier to cover the partial copy.
-        const size_t pd = pointer_delta(p, dst_raw, (size_t)heapOopSize);
-        // pointer delta is scaled to number of elements (length field in
-        // objArrayOop) which we assume is 32 bit.
-        assert(pd == (size_t)(int)pd, "length field overflow");
-        bs->write_ref_array((HeapWord*)dst_raw, pd);
-        return false;
-      }
-    }
-    bs->write_ref_array((HeapWord*)dst_raw, length);
-  }
-  return true;
-}
-
-template <DecoratorSet decorators, typename BarrierSetT>
-inline void ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
-clone_in_heap(oop src, oop dst, size_t size) {
-  Raw::clone(src, dst, size);
-  BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
-  bs->write_region(MemRegion((HeapWord*)(void*)dst, size));
-}
-
-#endif // SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp b/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp
deleted file mode 100644
index 43f1a5d2dc3..00000000000
--- a/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_MODREFBARRIERSETASSEMBLER_HPP
-#define SHARE_GC_SHARED_MODREFBARRIERSETASSEMBLER_HPP
-
-#include "utilities/macros.hpp"
-
-#include CPU_HEADER(gc/shared/modRefBarrierSetAssembler)
-
-#endif // SHARE_GC_SHARED_MODREFBARRIERSETASSEMBLER_HPP
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index 9d84a56fbd7..3a644079875 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -132,8 +132,7 @@
   declare_toplevel_type(CollectedHeap)                                    \
   declare_toplevel_type(ContiguousSpace)                                  \
   declare_toplevel_type(BarrierSet)                                       \
-           declare_type(ModRefBarrierSet,             BarrierSet)         \
-           declare_type(CardTableBarrierSet,          ModRefBarrierSet)   \
+           declare_type(CardTableBarrierSet,             BarrierSet)      \
   declare_toplevel_type(CardTable)                                        \
   declare_toplevel_type(BarrierSet::Name)                                 \
                                                                           \
@@ -183,7 +182,6 @@
                                                                             \
   declare_constant(AgeTable::table_size)                                    \
                                                                             \
-  declare_constant(BarrierSet::ModRef)                                      \
   declare_constant(BarrierSet::CardTableBarrierSet)                         \
                                                                             \
   declare_constant(BOTConstants::LogBase)                                   \
diff --git a/src/hotspot/share/oops/access.inline.hpp b/src/hotspot/share/oops/access.inline.hpp
index b3f15f1168d..da3d54c4902 100644
--- a/src/hotspot/share/oops/access.inline.hpp
+++ b/src/hotspot/share/oops/access.inline.hpp
@@ -219,7 +219,7 @@ namespace AccessInternal {
             AccessBarrier<ds>, barrier_type, ds>::oop_access_barrier; \
         }                                                               \
         break;
-        FOR_EACH_CONCRETE_BARRIER_SET_DO(BARRIER_SET_RESOLVE_BARRIER_CLOSURE)
+        FOR_EACH_BARRIER_SET_DO(BARRIER_SET_RESOLVE_BARRIER_CLOSURE)
 #undef BARRIER_SET_RESOLVE_BARRIER_CLOSURE
 
       default:
@@ -242,7 +242,7 @@ namespace AccessInternal {
             AccessBarrier<ds>, barrier_type, ds>::access_barrier; \
         }                                                                 \
         break;
-        FOR_EACH_CONCRETE_BARRIER_SET_DO(BARRIER_SET_RESOLVE_BARRIER_CLOSURE)
+        FOR_EACH_BARRIER_SET_DO(BARRIER_SET_RESOLVE_BARRIER_CLOSURE)
 #undef BARRIER_SET_RESOLVE_BARRIER_CLOSURE
 
       default:
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 5df1220a5ce..6ede40c22e0 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -3054,7 +3054,7 @@ private:
         resolve<use_compressed, typename BarrierSet::GetType<BarrierSet::bs_name>::type>(); \
       }                                                                 \
         break;
-      FOR_EACH_CONCRETE_BARRIER_SET_DO(BARRIER_SET_RESOLVE_BARRIER_CLOSURE)
+      FOR_EACH_BARRIER_SET_DO(BARRIER_SET_RESOLVE_BARRIER_CLOSURE)
 #undef BARRIER_SET_RESOLVE_BARRIER_CLOSURE
 
     default:

From 19cca0a2a829396291fa4140b2082ef518425518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 4 Nov 2025 09:35:46 +0000
Subject: [PATCH 008/512] 8371131: Cleanup Thread parameter in CollectedHeap
 TLAB methods

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/epsilon/epsilonHeap.cpp      |  2 +-
 src/hotspot/share/gc/epsilon/epsilonHeap.hpp      |  8 ++++----
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp       |  6 +++---
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp       |  6 +++---
 .../share/gc/parallel/mutableNUMASpace.cpp        |  6 +++---
 .../share/gc/parallel/mutableNUMASpace.hpp        |  6 +++---
 src/hotspot/share/gc/parallel/mutableSpace.hpp    | 10 +++++-----
 .../share/gc/parallel/parallelScavengeHeap.cpp    | 12 ++++++------
 .../share/gc/parallel/parallelScavengeHeap.hpp    |  6 +++---
 src/hotspot/share/gc/serial/serialHeap.cpp        |  6 +++---
 src/hotspot/share/gc/serial/serialHeap.hpp        |  6 +++---
 src/hotspot/share/gc/shared/collectedHeap.hpp     |  8 ++++----
 .../share/gc/shared/threadLocalAllocBuffer.cpp    | 15 +++++++--------
 .../gc/shared/threadLocalAllocBuffer.inline.hpp   |  3 +--
 .../gc/shenandoah/shenandoahGenerationalHeap.cpp  |  2 +-
 .../gc/shenandoah/shenandoahGenerationalHeap.hpp  |  2 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp        |  6 +++---
 .../share/gc/shenandoah/shenandoahHeap.hpp        |  6 +++---
 src/hotspot/share/gc/z/zCollectedHeap.cpp         |  6 +++---
 src/hotspot/share/gc/z/zCollectedHeap.hpp         |  6 +++---
 20 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index f3d411e34ba..e5ae673ef0c 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -91,7 +91,7 @@ GrowableArray<MemoryPool*> EpsilonHeap::memory_pools() {
   return memory_pools;
 }
 
-size_t EpsilonHeap::unsafe_max_tlab_alloc(Thread* thr) const {
+size_t EpsilonHeap::unsafe_max_tlab_alloc() const {
   // Return max allocatable TLAB size, and let allocation path figure out
   // the actual allocation size. Note: result should be in bytes.
   return _max_tlab_size * HeapWordSize;
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
index e23e24a5afc..4f812bde8b3 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -90,10 +90,10 @@ public:
                               size_t* actual_size) override;
 
   // TLAB allocation
-  size_t tlab_capacity(Thread* thr)         const override { return capacity();     }
-  size_t tlab_used(Thread* thr)             const override { return used();         }
-  size_t max_tlab_size()                    const override { return _max_tlab_size; }
-  size_t unsafe_max_tlab_alloc(Thread* thr) const override;
+  size_t tlab_capacity()         const override { return capacity();     }
+  size_t tlab_used()             const override { return used();         }
+  size_t max_tlab_size()         const override { return _max_tlab_size; }
+  size_t unsafe_max_tlab_alloc() const override;
 
   void collect(GCCause::Cause cause) override;
   void do_full_collection(bool clear_all_soft_refs) override;
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 90b38a96d67..8a5c6d4579e 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2268,11 +2268,11 @@ bool G1CollectedHeap::block_is_obj(const HeapWord* addr) const {
   return hr->block_is_obj(addr, hr->parsable_bottom_acquire());
 }
 
-size_t G1CollectedHeap::tlab_capacity(Thread* ignored) const {
+size_t G1CollectedHeap::tlab_capacity() const {
   return eden_target_length() * G1HeapRegion::GrainBytes;
 }
 
-size_t G1CollectedHeap::tlab_used(Thread* ignored) const {
+size_t G1CollectedHeap::tlab_used() const {
   return _eden.length() * G1HeapRegion::GrainBytes;
 }
 
@@ -2282,7 +2282,7 @@ size_t G1CollectedHeap::max_tlab_size() const {
   return align_down(_humongous_object_threshold_in_words, MinObjAlignment);
 }
 
-size_t G1CollectedHeap::unsafe_max_tlab_alloc(Thread* ignored) const {
+size_t G1CollectedHeap::unsafe_max_tlab_alloc() const {
   return _allocator->unsafe_max_tlab_alloc();
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 3dc52c037ec..e160cb9e428 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1202,10 +1202,10 @@ public:
   // Section on thread-local allocation buffers (TLABs)
   // See CollectedHeap for semantics.
 
-  size_t tlab_capacity(Thread* ignored) const override;
-  size_t tlab_used(Thread* ignored) const override;
+  size_t tlab_capacity() const override;
+  size_t tlab_used() const override;
   size_t max_tlab_size() const override;
-  size_t unsafe_max_tlab_alloc(Thread* ignored) const override;
+  size_t unsafe_max_tlab_alloc() const override;
 
   inline bool is_in_young(const oop obj) const;
   inline bool requires_barriers(stackChunkOop obj) const override;
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index 62ece4e0605..e0b1edf2efc 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -110,7 +110,7 @@ size_t MutableNUMASpace::free_in_words() const {
   return s;
 }
 
-size_t MutableNUMASpace::tlab_capacity(Thread *ignored) const {
+size_t MutableNUMASpace::tlab_capacity() const {
   size_t s = 0;
   for (LGRPSpace* ls : *lgrp_spaces()) {
     s += ls->space()->capacity_in_bytes();
@@ -118,7 +118,7 @@ size_t MutableNUMASpace::tlab_capacity(Thread *ignored) const {
   return s / (size_t)lgrp_spaces()->length();
 }
 
-size_t MutableNUMASpace::tlab_used(Thread *ignored) const {
+size_t MutableNUMASpace::tlab_used() const {
   size_t s = 0;
   for (LGRPSpace* ls : *lgrp_spaces()) {
     s += ls->space()->used_in_bytes();
@@ -126,7 +126,7 @@ size_t MutableNUMASpace::tlab_used(Thread *ignored) const {
   return s / (size_t)lgrp_spaces()->length();
 }
 
-size_t MutableNUMASpace::unsafe_max_tlab_alloc(Thread *ignored) const {
+size_t MutableNUMASpace::unsafe_max_tlab_alloc() const {
   size_t s = 0;
   for (LGRPSpace* ls : *lgrp_spaces()) {
     s += ls->space()->free_in_bytes();
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index 9302b262bb8..4b8bca430f8 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -166,9 +166,9 @@ public:
   virtual size_t used_in_words() const;
   virtual size_t free_in_words() const;
 
-  virtual size_t tlab_capacity(Thread* ignored) const;
-  virtual size_t tlab_used(Thread* ignored) const;
-  virtual size_t unsafe_max_tlab_alloc(Thread* ignored) const;
+  virtual size_t tlab_capacity() const;
+  virtual size_t tlab_used() const;
+  virtual size_t unsafe_max_tlab_alloc() const;
 
   // Allocation (return null if full)
   virtual HeapWord* cas_allocate(size_t word_size);
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index 785bfe27228..37fa7e3710e 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -117,11 +117,11 @@ public:
   size_t free_in_bytes() const                { return free_in_words() * HeapWordSize; }
 
   // Size computations.  Sizes are in heapwords.
-  virtual size_t used_in_words() const                    { return pointer_delta(top(), bottom()); }
-  virtual size_t free_in_words() const                    { return pointer_delta(end(),    top()); }
-  virtual size_t tlab_capacity(Thread* thr) const         { return capacity_in_bytes();            }
-  virtual size_t tlab_used(Thread* thr) const             { return used_in_bytes();                }
-  virtual size_t unsafe_max_tlab_alloc(Thread* thr) const { return free_in_bytes();                }
+  virtual size_t used_in_words() const         { return pointer_delta(top(), bottom()); }
+  virtual size_t free_in_words() const         { return pointer_delta(end(),    top()); }
+  virtual size_t tlab_capacity() const         { return capacity_in_bytes();            }
+  virtual size_t tlab_used() const             { return used_in_bytes();                }
+  virtual size_t unsafe_max_tlab_alloc() const { return free_in_bytes();                }
 
   // Allocation (return null if full)
   virtual HeapWord* cas_allocate(size_t word_size);
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 2e7d8011869..f5ed40c40e5 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -456,16 +456,16 @@ void ParallelScavengeHeap::ensure_parsability(bool retire_tlabs) {
   young_gen()->eden_space()->ensure_parsability();
 }
 
-size_t ParallelScavengeHeap::tlab_capacity(Thread* thr) const {
-  return young_gen()->eden_space()->tlab_capacity(thr);
+size_t ParallelScavengeHeap::tlab_capacity() const {
+  return young_gen()->eden_space()->tlab_capacity();
 }
 
-size_t ParallelScavengeHeap::tlab_used(Thread* thr) const {
-  return young_gen()->eden_space()->tlab_used(thr);
+size_t ParallelScavengeHeap::tlab_used() const {
+  return young_gen()->eden_space()->tlab_used();
 }
 
-size_t ParallelScavengeHeap::unsafe_max_tlab_alloc(Thread* thr) const {
-  return young_gen()->eden_space()->unsafe_max_tlab_alloc(thr);
+size_t ParallelScavengeHeap::unsafe_max_tlab_alloc() const {
+  return young_gen()->eden_space()->unsafe_max_tlab_alloc();
 }
 
 HeapWord* ParallelScavengeHeap::allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) {
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index 962a3c4b15b..de1e3ce851c 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -214,9 +214,9 @@ public:
   void ensure_parsability(bool retire_tlabs) override;
   void resize_all_tlabs() override;
 
-  size_t tlab_capacity(Thread* thr) const override;
-  size_t tlab_used(Thread* thr) const override;
-  size_t unsafe_max_tlab_alloc(Thread* thr) const override;
+  size_t tlab_capacity() const override;
+  size_t tlab_used() const override;
+  size_t unsafe_max_tlab_alloc() const override;
 
   void object_iterate(ObjectClosure* cl) override;
   void object_iterate_parallel(ObjectClosure* cl, HeapBlockClaimer* claimer);
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 1d62af65ebd..00d74e691eb 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -660,16 +660,16 @@ bool SerialHeap::block_is_obj(const HeapWord* addr) const {
   return addr < _old_gen->space()->top();
 }
 
-size_t SerialHeap::tlab_capacity(Thread* thr) const {
+size_t SerialHeap::tlab_capacity() const {
   // Only young-gen supports tlab allocation.
   return _young_gen->tlab_capacity();
 }
 
-size_t SerialHeap::tlab_used(Thread* thr) const {
+size_t SerialHeap::tlab_used() const {
   return _young_gen->tlab_used();
 }
 
-size_t SerialHeap::unsafe_max_tlab_alloc(Thread* thr) const {
+size_t SerialHeap::unsafe_max_tlab_alloc() const {
   return _young_gen->unsafe_max_tlab_alloc();
 }
 
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 3915f8c4af9..432cd73f616 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -189,9 +189,9 @@ public:
   bool block_is_obj(const HeapWord* addr) const;
 
   // Section on TLAB's.
-  size_t tlab_capacity(Thread* thr) const override;
-  size_t tlab_used(Thread* thr) const override;
-  size_t unsafe_max_tlab_alloc(Thread* thr) const override;
+  size_t tlab_capacity() const override;
+  size_t tlab_used() const override;
+  size_t unsafe_max_tlab_alloc() const override;
   HeapWord* allocate_new_tlab(size_t min_size,
                               size_t requested_size,
                               size_t* actual_size) override;
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 63ef2cf83de..3b5865e0001 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -341,17 +341,17 @@ protected:
   virtual void ensure_parsability(bool retire_tlabs);
 
   // The amount of space available for thread-local allocation buffers.
-  virtual size_t tlab_capacity(Thread *thr) const = 0;
+  virtual size_t tlab_capacity() const = 0;
 
-  // The amount of used space for thread-local allocation buffers for the given thread.
-  virtual size_t tlab_used(Thread *thr) const = 0;
+  // The amount of space used for thread-local allocation buffers.
+  virtual size_t tlab_used() const = 0;
 
   virtual size_t max_tlab_size() const;
 
   // An estimate of the maximum allocation that could be performed
   // for thread-local allocation buffers without triggering any
   // collection or expansion activity.
-  virtual size_t unsafe_max_tlab_alloc(Thread *thr) const = 0;
+  virtual size_t unsafe_max_tlab_alloc() const = 0;
 
   // Perform a collection of the heap; intended for use in implementing
   // "System.gc".  This probably implies as full a collection as the
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index dc5e415ea38..9635ed4d0cb 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -72,12 +72,11 @@ size_t ThreadLocalAllocBuffer::remaining() {
 }
 
 void ThreadLocalAllocBuffer::accumulate_and_reset_statistics(ThreadLocalAllocStats* stats) {
-  Thread* thr     = thread();
-  size_t capacity = Universe::heap()->tlab_capacity(thr);
-  size_t used     = Universe::heap()->tlab_used(thr);
+  size_t capacity = Universe::heap()->tlab_capacity();
+  size_t used = Universe::heap()->tlab_used();
 
   _gc_waste += (unsigned)remaining();
-  size_t total_allocated = thr->allocated_bytes();
+  size_t total_allocated = (size_t)thread()->allocated_bytes();
   size_t allocated_since_last_gc = total_allocated - _allocated_before_last_gc;
   _allocated_before_last_gc = total_allocated;
 
@@ -148,7 +147,7 @@ void ThreadLocalAllocBuffer::resize() {
   // Compute the next tlab size using expected allocation amount
   assert(ResizeTLAB, "Should not call this otherwise");
   size_t alloc = (size_t)(_allocation_fraction.average() *
-                          (Universe::heap()->tlab_capacity(thread()) / HeapWordSize));
+                          (Universe::heap()->tlab_capacity() / HeapWordSize));
   size_t new_size = alloc / _target_refills;
 
   new_size = clamp(new_size, min_size(), max_size());
@@ -204,7 +203,7 @@ void ThreadLocalAllocBuffer::initialize() {
 
   set_desired_size(initial_desired_size());
 
-  size_t capacity = Universe::heap()->tlab_capacity(thread()) / HeapWordSize;
+  size_t capacity = Universe::heap()->tlab_capacity() / HeapWordSize;
   if (capacity > 0) {
     // Keep alloc_frac as float and not double to avoid the double to float conversion
     float alloc_frac = desired_size() * target_refills() / (float)capacity;
@@ -268,7 +267,7 @@ size_t ThreadLocalAllocBuffer::initial_desired_size() {
     // Initial size is a function of the average number of allocating threads.
     unsigned int nof_threads = ThreadLocalAllocStats::allocating_threads_avg();
 
-    init_sz  = (Universe::heap()->tlab_capacity(thread()) / HeapWordSize) /
+    init_sz  = (Universe::heap()->tlab_capacity() / HeapWordSize) /
                       (nof_threads * target_refills());
     init_sz = align_object_size(init_sz);
   }
@@ -289,7 +288,7 @@ void ThreadLocalAllocBuffer::print_stats(const char* tag) {
   Thread* thrd = thread();
   size_t waste = _gc_waste + _refill_waste;
   double waste_percent = percent_of(waste, _allocated_size);
-  size_t tlab_used  = Universe::heap()->tlab_used(thrd);
+  size_t tlab_used  = Universe::heap()->tlab_used();
   log.trace("TLAB: %s thread: " PTR_FORMAT " [id: %2d]"
             " desired_size: %zuKB"
             " slow allocs: %d  refill waste: %zuB"
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
index 22d19b77806..441686c5c4c 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
@@ -54,8 +54,7 @@ inline HeapWord* ThreadLocalAllocBuffer::allocate(size_t size) {
 inline size_t ThreadLocalAllocBuffer::compute_size(size_t obj_size) {
   // Compute the size for the new TLAB.
   // The "last" tlab may be smaller to reduce fragmentation.
-  // unsafe_max_tlab_alloc is just a hint.
-  const size_t available_size = Universe::heap()->unsafe_max_tlab_alloc(thread()) / HeapWordSize;
+  const size_t available_size = Universe::heap()->unsafe_max_tlab_alloc() / HeapWordSize;
   size_t new_tlab_size = MIN3(available_size, desired_size() + align_object_size(obj_size), max_size());
 
   // Make sure there's enough room for object and filler int[].
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index e5f766f9df1..28053dffd5a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -74,7 +74,7 @@ size_t ShenandoahGenerationalHeap::calculate_max_plab() {
 }
 
 // Returns size in bytes
-size_t ShenandoahGenerationalHeap::unsafe_max_tlab_alloc(Thread *thread) const {
+size_t ShenandoahGenerationalHeap::unsafe_max_tlab_alloc() const {
   return MIN2(ShenandoahHeapRegion::max_tlab_size_bytes(), young_generation()->available());
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
index 3eeec26dbbf..ed0223dc6fd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
@@ -56,7 +56,7 @@ public:
 
   void print_init_logger() const override;
 
-  size_t unsafe_max_tlab_alloc(Thread *thread) const override;
+  size_t unsafe_max_tlab_alloc() const override;
 
 private:
   // ---------- Evacuations and Promotions
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index f66d83204a4..5b353ee2103 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1507,7 +1507,7 @@ void ShenandoahHeap::gclabs_retire(bool resize) {
 }
 
 // Returns size in bytes
-size_t ShenandoahHeap::unsafe_max_tlab_alloc(Thread *thread) const {
+size_t ShenandoahHeap::unsafe_max_tlab_alloc() const {
   // Return the max allowed size, and let the allocation path
   // figure out the safe size for current allocation.
   return ShenandoahHeapRegion::max_tlab_size_bytes();
@@ -1649,7 +1649,7 @@ void ShenandoahHeap::verify(VerifyOption vo) {
     }
   }
 }
-size_t ShenandoahHeap::tlab_capacity(Thread *thr) const {
+size_t ShenandoahHeap::tlab_capacity() const {
   return _free_set->capacity();
 }
 
@@ -2125,7 +2125,7 @@ GCTracer* ShenandoahHeap::tracer() {
   return shenandoah_policy()->tracer();
 }
 
-size_t ShenandoahHeap::tlab_used(Thread* thread) const {
+size_t ShenandoahHeap::tlab_used() const {
   return _free_set->used();
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 6cbe44fef09..e5961efd36e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -692,10 +692,10 @@ public:
                                                Metaspace::MetadataType mdtype) override;
 
   HeapWord* allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) override;
-  size_t tlab_capacity(Thread *thr) const override;
-  size_t unsafe_max_tlab_alloc(Thread *thread) const override;
+  size_t tlab_capacity() const override;
+  size_t unsafe_max_tlab_alloc() const override;
   size_t max_tlab_size() const override;
-  size_t tlab_used(Thread* ignored) const override;
+  size_t tlab_used() const override;
 
   void ensure_parsability(bool retire_labs) override;
 
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index ae60219139c..1fbb4b25e2d 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -222,11 +222,11 @@ void ZCollectedHeap::do_full_collection(bool clear_all_soft_refs) {
   ShouldNotReachHere();
 }
 
-size_t ZCollectedHeap::tlab_capacity(Thread* ignored) const {
+size_t ZCollectedHeap::tlab_capacity() const {
   return _heap.tlab_capacity();
 }
 
-size_t ZCollectedHeap::tlab_used(Thread* ignored) const {
+size_t ZCollectedHeap::tlab_used() const {
   return _heap.tlab_used();
 }
 
@@ -234,7 +234,7 @@ size_t ZCollectedHeap::max_tlab_size() const {
   return _heap.max_tlab_size() / HeapWordSize;
 }
 
-size_t ZCollectedHeap::unsafe_max_tlab_alloc(Thread* ignored) const {
+size_t ZCollectedHeap::unsafe_max_tlab_alloc() const {
   return _heap.unsafe_max_tlab_alloc();
 }
 
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp
index bbcddec917f..07366b35d30 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.hpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp
@@ -83,10 +83,10 @@ public:
   void collect_as_vm_thread(GCCause::Cause cause) override;
   void do_full_collection(bool clear_all_soft_refs) override;
 
-  size_t tlab_capacity(Thread* thr) const override;
-  size_t tlab_used(Thread* thr) const override;
+  size_t tlab_capacity() const override;
+  size_t tlab_used() const override;
   size_t max_tlab_size() const override;
-  size_t unsafe_max_tlab_alloc(Thread* thr) const override;
+  size_t unsafe_max_tlab_alloc() const override;
 
   MemoryUsage memory_usage() override;
   GrowableArray<GCMemoryManager*> memory_managers() override;

From a98b9e7cfa433d4bf2acbf59a1c9d3714c3c065d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <bmaillard@openjdk.org>
Date: Tue, 4 Nov 2025 09:42:18 +0000
Subject: [PATCH 009/512] 8362832:
 compiler/macronodes/TestTopInMacroElimination.java hits assert(false) failed:
 unexpected node

Reviewed-by: dlunden, epeter, kvn
---
 src/hotspot/share/opto/macro.cpp                             | 5 +++++
 test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt        | 3 ---
 .../jtreg/compiler/macronodes/TestTopInMacroElimination.java | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index ce33f0bec82..702aca592f3 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -501,6 +501,11 @@ Node *PhaseMacroExpand::value_from_mem(Node *sfpt_mem, Node *sfpt_ctl, BasicType
       }
     } else if (mem->is_ArrayCopy()) {
       done = true;
+    } else if (mem->is_top()) {
+      // The slice is on a dead path. Returning nullptr would lead to elimination
+      // bailout, but we want to prevent that. Just forwarding the top is also legal,
+      // and IGVN can just clean things up, and remove whatever receives top.
+      return mem;
     } else {
       DEBUG_ONLY( mem->dump(); )
       assert(false, "unexpected node");
diff --git a/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt b/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
index 636d02cb8b0..1e6c0c735a9 100644
--- a/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
+++ b/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
@@ -27,9 +27,6 @@
 #
 #############################################################################
 
-
-compiler/macronodes/TestTopInMacroElimination.java      8362832 generic-all
-
 gc/stringdedup/TestStringDeduplicationAgeThreshold.java 8362562 generic-all
 gc/stringdedup/TestStringDeduplicationInterned.java     8362562 generic-all
 gc/stringdedup/TestStringDeduplicationPrintOptions.java 8362562 generic-all
diff --git a/test/hotspot/jtreg/compiler/macronodes/TestTopInMacroElimination.java b/test/hotspot/jtreg/compiler/macronodes/TestTopInMacroElimination.java
index 86ff4e9b874..c57eb78c6a1 100644
--- a/test/hotspot/jtreg/compiler/macronodes/TestTopInMacroElimination.java
+++ b/test/hotspot/jtreg/compiler/macronodes/TestTopInMacroElimination.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8325030
+ * @bug 8325030 8362832
  * @summary Regression test for an assert triggered during allocation elimination because top is found during
  * constructing new phis.
  * @run main/othervm -XX:-ProfileExceptionHandlers compiler.macronodes.TestTopInMacroElimination

From a840dc22c575b5d2b5b6017a536a6541fc1f0a44 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 4 Nov 2025 09:54:50 +0000
Subject: [PATCH 010/512] 8364741: [asan]
 runtime/ErrorHandling/PrintVMInfoAtExitTest.java fails because output differs
 slightly

Reviewed-by: syan, phubner, jsikstro
---
 .../ErrorHandling/PrintVMInfoAtExitTest.java      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
index 2b9393e3d35..5e535bab626 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
@@ -27,14 +27,18 @@
  * @test
  * @summary Test PrintVMInfoAtExit
  * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @modules java.base/jdk.internal.misc
  * @requires vm.flagless
  * @requires vm.bits == "64"
- * @run driver PrintVMInfoAtExitTest
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI PrintVMInfoAtExitTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+
 
 public class PrintVMInfoAtExitTest {
 
@@ -53,7 +57,14 @@ public class PrintVMInfoAtExitTest {
     output_detail.shouldContain("--  S U M M A R Y --");
     output_detail.shouldContain("Command Line: -Xmx64M -Xms64M -XX:-CreateCoredumpOnCrash -XX:+UnlockDiagnosticVMOptions -XX:+PrintVMInfoAtExit -XX:NativeMemoryTracking=summary -XX:CompressedClassSpaceSize=256m");
     output_detail.shouldContain("Native Memory Tracking:");
-    output_detail.shouldContain("Java Heap (reserved=65536KB, committed=65536KB)");
+    WhiteBox wb = WhiteBox.getWhiteBox();
+    if (wb.isAsanEnabled()) {
+        // the reserved value can be influenced by asan
+        output_detail.shouldContain("Java Heap (reserved=");
+        output_detail.shouldContain(", committed=65536KB)");
+    } else {
+        output_detail.shouldContain("Java Heap (reserved=65536KB, committed=65536KB)");
+    }
   }
 }
 

From e6546683a8dd9a64255ce4c5606089068ec92e5d Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 4 Nov 2025 11:17:56 +0000
Subject: [PATCH 011/512] 8327963: C2: fix construction of memory graph around
 Initialize node to prevent incorrect execution if allocation is removed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Emanuel Peter <epeter@openjdk.org>
Co-authored-by: Roberto Castañeda Lozano <rcastanedalo@openjdk.org>
Reviewed-by: epeter, rcastanedalo
---
 src/hotspot/share/opto/classes.hpp            |   1 +
 src/hotspot/share/opto/escape.cpp             |  52 ++-
 src/hotspot/share/opto/escape.hpp             |   8 +-
 src/hotspot/share/opto/graphKit.cpp           |  15 +-
 src/hotspot/share/opto/idealGraphPrinter.cpp  |   2 +-
 src/hotspot/share/opto/library_call.cpp       |  18 +-
 src/hotspot/share/opto/loopTransform.cpp      |   4 +-
 src/hotspot/share/opto/loopopts.cpp           |   5 +-
 src/hotspot/share/opto/macro.cpp              |  49 ++-
 src/hotspot/share/opto/matcher.cpp            |  22 +-
 src/hotspot/share/opto/memnode.cpp            |  59 ++-
 src/hotspot/share/opto/memnode.hpp            |  44 ++-
 src/hotspot/share/opto/multnode.cpp           |  73 ++--
 src/hotspot/share/opto/multnode.hpp           | 134 +++++++
 src/hotspot/share/opto/node.cpp               |   2 +-
 src/hotspot/share/opto/node.hpp               |   3 +
 src/hotspot/share/opto/phaseX.cpp             |  10 +-
 src/hotspot/share/opto/stringopts.cpp         |   8 +-
 .../ServerCompilerScheduler.java              |   4 +-
 .../filters/condenseGraph.filter              |   1 +
 .../escapeAnalysis/TestIterativeEA.java       |  10 +-
 ...arlyEliminationOfAllocationWithoutUse.java |  67 ++++
 ...TestEliminationOfAllocationWithoutUse.java | 338 ++++++++++++++++++
 .../TestInitializingStoreCapturing.java       |  59 +++
 24 files changed, 897 insertions(+), 91 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/macronodes/TestEarlyEliminationOfAllocationWithoutUse.java
 create mode 100644 test/hotspot/jtreg/compiler/macronodes/TestEliminationOfAllocationWithoutUse.java
 create mode 100644 test/hotspot/jtreg/compiler/macronodes/TestInitializingStoreCapturing.java

diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 587d5fad8f2..d56abaa17dd 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -274,6 +274,7 @@ macro(NegL)
 macro(NegD)
 macro(NegF)
 macro(NeverBranch)
+macro(NarrowMemProj)
 macro(OnSpinWait)
 macro(Opaque1)
 macro(OpaqueLoopInit)
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index a148b167ee3..61aa009361f 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -863,7 +863,7 @@ Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr
 //                      \|/
 //                      Phi        # "Field" Phi
 //
-void ConnectionGraph::reduce_phi_on_castpp_field_load(Node* curr_castpp, GrowableArray<Node *>  &alloc_worklist, GrowableArray<Node *>  &memnode_worklist) {
+void ConnectionGraph::reduce_phi_on_castpp_field_load(Node* curr_castpp, GrowableArray<Node*> &alloc_worklist) {
   Node* ophi = curr_castpp->in(1);
   assert(ophi->is_Phi(), "Expected this to be a Phi node.");
 
@@ -1279,7 +1279,7 @@ bool ConnectionGraph::reduce_phi_on_safepoints_helper(Node* ophi, Node* cast, No
   return true;
 }
 
-void ConnectionGraph::reduce_phi(PhiNode* ophi, GrowableArray<Node *>  &alloc_worklist, GrowableArray<Node *>  &memnode_worklist) {
+void ConnectionGraph::reduce_phi(PhiNode* ophi, GrowableArray<Node*> &alloc_worklist) {
   bool delay = _igvn->delay_transform();
   _igvn->set_delay_transform(true);
   _igvn->hash_delete(ophi);
@@ -1306,7 +1306,7 @@ void ConnectionGraph::reduce_phi(PhiNode* ophi, GrowableArray<Node *>  &alloc_wo
   // splitting CastPPs we make reference to the inputs of the Cmp that is used
   // by the If controlling the CastPP.
   for (uint i = 0; i < castpps.size(); i++) {
-    reduce_phi_on_castpp_field_load(castpps.at(i), alloc_worklist, memnode_worklist);
+    reduce_phi_on_castpp_field_load(castpps.at(i), alloc_worklist);
   }
 
   for (uint i = 0; i < others.size(); i++) {
@@ -4152,6 +4152,11 @@ Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArra
         // which contains this memory slice, otherwise skip over it.
         if (alloc == nullptr || alloc->_idx != (uint)toop->instance_id()) {
           result = proj_in->in(TypeFunc::Memory);
+        } else if (C->get_alias_index(result->adr_type()) != alias_idx) {
+          assert(C->get_general_index(alias_idx) == C->get_alias_index(result->adr_type()), "should be projection for the same field/array element");
+          result = get_map(result->_idx);
+          assert(result != nullptr, "new projection should have been allocated");
+          break;
         }
       } else if (proj_in->is_MemBar()) {
         // Check if there is an array copy for a clone
@@ -4448,6 +4453,22 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       _compile->get_alias_index(tinst->add_offset(oopDesc::mark_offset_in_bytes()));
       _compile->get_alias_index(tinst->add_offset(oopDesc::klass_offset_in_bytes()));
       if (alloc->is_Allocate() && (t->isa_instptr() || t->isa_aryptr())) {
+        // Add a new NarrowMem projection for each existing NarrowMem projection with new adr type
+        InitializeNode* init = alloc->as_Allocate()->initialization();
+        assert(init != nullptr, "can't find Initialization node for this Allocate node");
+        auto process_narrow_proj = [&](NarrowMemProjNode* proj) {
+          const TypePtr* adr_type = proj->adr_type();
+          const TypePtr* new_adr_type = tinst->add_offset(adr_type->offset());
+          if (adr_type != new_adr_type && !init->already_has_narrow_mem_proj_with_adr_type(new_adr_type)) {
+            DEBUG_ONLY( uint alias_idx = _compile->get_alias_index(new_adr_type); )
+            assert(_compile->get_general_index(alias_idx) == _compile->get_alias_index(adr_type), "new adr type should be narrowed down from existing adr type");
+            NarrowMemProjNode* new_proj = new NarrowMemProjNode(init, new_adr_type);
+            igvn->set_type(new_proj, new_proj->bottom_type());
+            record_for_optimizer(new_proj);
+            set_map(proj, new_proj); // record it so ConnectionGraph::find_inst_mem() can find it
+          }
+        };
+        init->for_each_narrow_mem_proj_with_new_uses(process_narrow_proj);
 
         // First, put on the worklist all Field edges from Connection Graph
         // which is more accurate than putting immediate users from Ideal Graph.
@@ -4519,7 +4540,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       // finishes. For now we just try to split out the SR inputs of the merge.
       Node* parent = n->in(1);
       if (reducible_merges.member(n)) {
-        reduce_phi(n->as_Phi(), alloc_worklist, memnode_worklist);
+        reduce_phi(n->as_Phi(), alloc_worklist);
 #ifdef ASSERT
         if (VerifyReduceAllocationMerges) {
           reduced_merges.push(n);
@@ -4711,11 +4732,13 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
     }
     if (n->is_Phi() || n->is_ClearArray()) {
       // we don't need to do anything, but the users must be pushed
-    } else if (n->is_MemBar()) { // Initialize, MemBar nodes
-      // we don't need to do anything, but the users must be pushed
-      n = n->as_MemBar()->proj_out_or_null(TypeFunc::Memory);
-      if (n == nullptr) {
-        continue;
+    } else if (n->is_MemBar()) { // MemBar nodes
+      if (!n->is_Initialize()) { // memory projections for Initialize pushed below (so we get to all their uses)
+        // we don't need to do anything, but the users must be pushed
+        n = n->as_MemBar()->proj_out_or_null(TypeFunc::Memory);
+        if (n == nullptr) {
+          continue;
+        }
       }
     } else if (n->is_CallLeaf()) {
       // Runtime calls with narrow memory input (no MergeMem node)
@@ -4732,6 +4755,8 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       // get the memory projection
       n = n->find_out_with(Op_SCMemProj);
       assert(n != nullptr && n->Opcode() == Op_SCMemProj, "memory projection required");
+    } else if (n->is_Proj()) {
+      assert(n->in(0)->is_Initialize(), "we only push memory projections for Initialize");
     } else {
 #ifdef ASSERT
       if (!n->is_Mem()) {
@@ -4775,6 +4800,11 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
         if (use->in(TypeFunc::Memory) == n) { // Ignore precedent edge
           memnode_worklist.append_if_missing(use);
         }
+      } else if (use->is_Proj()) {
+        assert(n->is_Initialize(), "We only push projections of Initialize");
+        if (use->as_Proj()->_con == TypeFunc::Memory) { // Ignore precedent edge
+          memnode_worklist.append_if_missing(use);
+        }
 #ifdef ASSERT
       } else if(use->is_Mem()) {
         assert(use->in(MemNode::Memory) != n, "EA: missing memory path");
@@ -4826,7 +4856,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       // First, update mergemem by moving memory nodes to corresponding slices
       // if their type became more precise since this mergemem was created.
       while (mem->is_Mem()) {
-        const Type *at = igvn->type(mem->in(MemNode::Address));
+        const Type* at = igvn->type(mem->in(MemNode::Address));
         if (at != Type::TOP) {
           assert (at->isa_ptr() != nullptr, "pointer type required.");
           uint idx = (uint)_compile->get_alias_index(at->is_ptr());
@@ -4946,7 +4976,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       record_for_optimizer(n);
     } else {
       assert(n->is_Allocate() || n->is_CheckCastPP() ||
-             n->is_AddP() || n->is_Phi(), "unknown node used for set_map()");
+             n->is_AddP() || n->is_Phi() || n->is_NarrowMemProj(), "unknown node used for set_map()");
     }
   }
 #if 0 // ifdef ASSERT
diff --git a/src/hotspot/share/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp
index 0b8cd3aa138..77d14525383 100644
--- a/src/hotspot/share/opto/escape.hpp
+++ b/src/hotspot/share/opto/escape.hpp
@@ -563,8 +563,10 @@ private:
                         // Memory Phi    - most recent unique Phi split out
                         //                 from this Phi
                         // MemNode       - new memory input for this node
-                        // ChecCastPP    - allocation that this is a cast of
+                        // CheckCastPP   - allocation that this is a cast of
                         // allocation    - CheckCastPP of the allocation
+                        // NarrowMem     - newly created projection (type includes instance_id) from projection created
+                        //                 before EA
 
   // manage entries in _node_map
 
@@ -609,11 +611,11 @@ private:
   bool can_reduce_phi_check_inputs(PhiNode* ophi) const;
 
   void reduce_phi_on_field_access(Node* previous_addp, GrowableArray<Node *>  &alloc_worklist);
-  void reduce_phi_on_castpp_field_load(Node* castpp, GrowableArray<Node *>  &alloc_worklist, GrowableArray<Node *>  &memnode_worklist);
+  void reduce_phi_on_castpp_field_load(Node* castpp, GrowableArray<Node*> &alloc_worklist);
   void reduce_phi_on_cmp(Node* cmp);
   bool reduce_phi_on_safepoints(PhiNode* ophi);
   bool reduce_phi_on_safepoints_helper(Node* ophi, Node* cast, Node* selector, Unique_Node_List& safepoints);
-  void reduce_phi(PhiNode* ophi, GrowableArray<Node *>  &alloc_worklist, GrowableArray<Node *>  &memnode_worklist);
+  void reduce_phi(PhiNode* ophi, GrowableArray<Node*> &alloc_worklist);
 
   void set_not_scalar_replaceable(PointsToNode* ptn NOT_PRODUCT(COMMA const char* reason)) const {
 #ifndef PRODUCT
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index d4776d9d2f0..49c411843d5 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -3641,14 +3641,17 @@ Node* GraphKit::set_output_for_allocation(AllocateNode* alloc,
     record_for_igvn(minit_in); // fold it up later, if possible
     Node* minit_out = memory(rawidx);
     assert(minit_out->is_Proj() && minit_out->in(0) == init, "");
-    // Add an edge in the MergeMem for the header fields so an access
-    // to one of those has correct memory state
-    set_memory(minit_out, C->get_alias_index(oop_type->add_offset(oopDesc::mark_offset_in_bytes())));
-    set_memory(minit_out, C->get_alias_index(oop_type->add_offset(oopDesc::klass_offset_in_bytes())));
+    int mark_idx = C->get_alias_index(oop_type->add_offset(oopDesc::mark_offset_in_bytes()));
+    // Add an edge in the MergeMem for the header fields so an access to one of those has correct memory state.
+    // Use one NarrowMemProjNode per slice to properly record the adr type of each slice. The Initialize node will have
+    // multiple projections as a result.
+    set_memory(_gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(mark_idx))), mark_idx);
+    int klass_idx = C->get_alias_index(oop_type->add_offset(oopDesc::klass_offset_in_bytes()));
+    set_memory(_gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(klass_idx))), klass_idx);
     if (oop_type->isa_aryptr()) {
       const TypePtr* telemref = oop_type->add_offset(Type::OffsetBot);
       int            elemidx  = C->get_alias_index(telemref);
-      hook_memory_on_init(*this, elemidx, minit_in, minit_out);
+      hook_memory_on_init(*this, elemidx, minit_in, _gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(elemidx))));
     } else if (oop_type->isa_instptr()) {
       ciInstanceKlass* ik = oop_type->is_instptr()->instance_klass();
       for (int i = 0, len = ik->nof_nonstatic_fields(); i < len; i++) {
@@ -3657,7 +3660,7 @@ Node* GraphKit::set_output_for_allocation(AllocateNode* alloc,
           continue;  // do not bother to track really large numbers of fields
         // Find (or create) the alias category for this field:
         int fieldidx = C->alias_type(field)->index();
-        hook_memory_on_init(*this, fieldidx, minit_in, minit_out);
+        hook_memory_on_init(*this, fieldidx, minit_in, _gvn.transform(new NarrowMemProjNode(init, C->get_adr_type(fieldidx))));
       }
     }
   }
diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 9a35691f7ff..2873c1ef9d7 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -598,7 +598,7 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
       t->dump_on(&s2);
     } else if( t == Type::MEMORY ) {
       s2.print("  Memory:");
-      MemNode::dump_adr_type(node, node->adr_type(), &s2);
+      MemNode::dump_adr_type(node->adr_type(), &s2);
     }
 
     assert(s2.size() < sizeof(buffer), "size in range");
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index bd8a550b9ab..7a213102efd 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -5544,7 +5544,7 @@ void LibraryCallKit::arraycopy_move_allocation_here(AllocateArrayNode* alloc, No
     InitializeNode* init = alloc->initialization();
     Node* alloc_mem = alloc->in(TypeFunc::Memory);
     C->gvn_replace_by(callprojs.fallthrough_ioproj, alloc->in(TypeFunc::I_O));
-    C->gvn_replace_by(init->proj_out(TypeFunc::Memory), alloc_mem);
+    init->replace_mem_projs_by(alloc_mem, C);
 
     // The CastIINode created in GraphKit::new_array (in AllocateArrayNode::make_ideal_length) must stay below
     // the allocation (i.e. is only valid if the allocation succeeds):
@@ -5595,8 +5595,20 @@ void LibraryCallKit::arraycopy_move_allocation_here(AllocateArrayNode* alloc, No
     }
     const TypePtr* telemref = ary_type->add_offset(Type::OffsetBot);
     int            elemidx  = C->get_alias_index(telemref);
-    set_memory(init->proj_out_or_null(TypeFunc::Memory), Compile::AliasIdxRaw);
-    set_memory(init->proj_out_or_null(TypeFunc::Memory), elemidx);
+    // Need to properly move every memory projection for the Initialize
+#ifdef ASSERT
+    int mark_idx = C->get_alias_index(ary_type->add_offset(oopDesc::mark_offset_in_bytes()));
+    int klass_idx = C->get_alias_index(ary_type->add_offset(oopDesc::klass_offset_in_bytes()));
+#endif
+    auto move_proj = [&](ProjNode* proj) {
+      int alias_idx = C->get_alias_index(proj->adr_type());
+      assert(alias_idx == Compile::AliasIdxRaw ||
+             alias_idx == elemidx ||
+             alias_idx == mark_idx ||
+             alias_idx == klass_idx, "should be raw memory or array element type");
+      set_memory(proj, alias_idx);
+    };
+    init->for_each_proj(move_proj, TypeFunc::Memory);
 
     Node* allocx = _gvn.transform(alloc);
     assert(allocx == alloc, "where has the allocation gone?");
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 0c03a85d64c..9a21c7f5dda 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -4042,7 +4042,9 @@ bool PhaseIdealLoop::intrinsify_fill(IdealLoopTree* lpt) {
   call->init_req(TypeFunc::I_O,       C->top());       // Does no I/O.
   call->init_req(TypeFunc::Memory,    mem_phi->in(LoopNode::EntryControl));
   call->init_req(TypeFunc::ReturnAdr, C->start()->proj_out_or_null(TypeFunc::ReturnAdr));
-  call->init_req(TypeFunc::FramePtr,  C->start()->proj_out_or_null(TypeFunc::FramePtr));
+  Node* frame = new ParmNode(C->start(), TypeFunc::FramePtr);
+  _igvn.register_new_node_with_optimizer(frame);
+  call->init_req(TypeFunc::FramePtr,  frame);
   _igvn.register_new_node_with_optimizer(call);
   result_ctrl = new ProjNode(call,TypeFunc::Control);
   _igvn.register_new_node_with_optimizer(result_ctrl);
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index cfbb4fabc0f..50b1ae0de8d 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -2693,8 +2693,9 @@ void PhaseIdealLoop::fix_ctrl_uses(const Node_List& body, const IdealLoopTree* l
         if (head->is_strip_mined() && mode != IgnoreStripMined) {
           CountedLoopNode* cl = head->as_CountedLoop();
           CountedLoopEndNode* cle = cl->loopexit();
-          Node* cle_out = cle->proj_out_or_null(false);
-          if (use == cle_out) {
+          // is use the projection that exits the loop from the CountedLoopEndNode?
+          if (use->in(0) == cle) {
+            IfFalseNode* cle_out = use->as_IfFalse();
             IfNode* le = cl->outer_loop_end();
             use = le->proj_out(false);
             use_loop = get_loop(use);
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 702aca592f3..90602bc2b35 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -1042,7 +1042,6 @@ void PhaseMacroExpand::process_users_of_allocation(CallNode *alloc) {
       if (use->is_Initialize()) {
         // Eliminate Initialize node.
         InitializeNode *init = use->as_Initialize();
-        assert(init->outcnt() <= 2, "only a control and memory projection expected");
         Node *ctrl_proj = init->proj_out_or_null(TypeFunc::Control);
         if (ctrl_proj != nullptr) {
           _igvn.replace_node(ctrl_proj, init->in(TypeFunc::Control));
@@ -1052,18 +1051,18 @@ void PhaseMacroExpand::process_users_of_allocation(CallNode *alloc) {
           assert(tmp == nullptr || tmp == _callprojs.fallthrough_catchproj, "allocation control projection");
 #endif
         }
-        Node *mem_proj = init->proj_out_or_null(TypeFunc::Memory);
-        if (mem_proj != nullptr) {
-          Node *mem = init->in(TypeFunc::Memory);
+        Node* mem = init->in(TypeFunc::Memory);
 #ifdef ASSERT
+        if (init->number_of_projs(TypeFunc::Memory) > 0) {
           if (mem->is_MergeMem()) {
-            assert(mem->in(TypeFunc::Memory) == _callprojs.fallthrough_memproj, "allocation memory projection");
+            assert(mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw) == _callprojs.fallthrough_memproj, "allocation memory projection");
           } else {
             assert(mem == _callprojs.fallthrough_memproj, "allocation memory projection");
           }
-#endif
-          _igvn.replace_node(mem_proj, mem);
         }
+#endif
+        init->replace_mem_projs_by(mem, &_igvn);
+        assert(init->outcnt() == 0, "should only have had a control and some memory projections, and we removed them");
       } else  {
         assert(false, "only Initialize or AddP expected");
       }
@@ -1650,7 +1649,16 @@ void PhaseMacroExpand::expand_initialize_membar(AllocateNode* alloc, InitializeN
       // No InitializeNode or no stores captured by zeroing
       // elimination. Simply add the MemBarStoreStore after object
       // initialization.
-      MemBarNode* mb = MemBarNode::make(C, Op_MemBarStoreStore, Compile::AliasIdxBot);
+      // What we want is to prevent the compiler and the CPU from re-ordering the stores that initialize this object
+      // with subsequent stores to any slice. As a consequence, this MemBar should capture the entire memory state at
+      // this point in the IR and produce a new memory state that should cover all slices. However, the Initialize node
+      // only captures/produces a partial memory state making it complicated to insert such a MemBar. Because
+      // re-ordering by the compiler can't happen by construction (a later Store that publishes the just allocated
+      // object reference is indirectly control dependent on the Initialize node), preventing reordering by the CPU is
+      // sufficient. For that a MemBar on the raw memory slice is good enough.
+      // If init is null, this allocation does have an InitializeNode but this logic can't locate it (see comment in
+      // PhaseMacroExpand::initialize_object()).
+      MemBarNode* mb = MemBarNode::make(C, Op_MemBarStoreStore, Compile::AliasIdxRaw);
       transform_later(mb);
 
       mb->init_req(TypeFunc::Memory, fast_oop_rawmem);
@@ -1666,24 +1674,33 @@ void PhaseMacroExpand::expand_initialize_membar(AllocateNode* alloc, InitializeN
       // barrier.
 
       Node* init_ctrl = init->proj_out_or_null(TypeFunc::Control);
-      Node* init_mem = init->proj_out_or_null(TypeFunc::Memory);
 
-      MemBarNode* mb = MemBarNode::make(C, Op_MemBarStoreStore, Compile::AliasIdxBot);
+      // See comment above that explains why a raw memory MemBar is good enough.
+      MemBarNode* mb = MemBarNode::make(C, Op_MemBarStoreStore, Compile::AliasIdxRaw);
       transform_later(mb);
 
       Node* ctrl = new ProjNode(init, TypeFunc::Control);
       transform_later(ctrl);
-      Node* mem = new ProjNode(init, TypeFunc::Memory);
-      transform_later(mem);
+      Node* old_raw_mem_proj = nullptr;
+      auto find_raw_mem = [&](ProjNode* proj) {
+        if (C->get_alias_index(proj->adr_type()) == Compile::AliasIdxRaw) {
+          assert(old_raw_mem_proj == nullptr, "only one expected");
+          old_raw_mem_proj = proj;
+        }
+      };
+      init->for_each_proj(find_raw_mem, TypeFunc::Memory);
+      assert(old_raw_mem_proj != nullptr, "should have found raw mem Proj");
+      Node* raw_mem_proj = new ProjNode(init, TypeFunc::Memory);
+      transform_later(raw_mem_proj);
 
       // The MemBarStoreStore depends on control and memory coming
       // from the InitializeNode
-      mb->init_req(TypeFunc::Memory, mem);
+      mb->init_req(TypeFunc::Memory, raw_mem_proj);
       mb->init_req(TypeFunc::Control, ctrl);
 
       ctrl = new ProjNode(mb, TypeFunc::Control);
       transform_later(ctrl);
-      mem = new ProjNode(mb, TypeFunc::Memory);
+      Node* mem = new ProjNode(mb, TypeFunc::Memory);
       transform_later(mem);
 
       // All nodes that depended on the InitializeNode for control
@@ -1692,9 +1709,7 @@ void PhaseMacroExpand::expand_initialize_membar(AllocateNode* alloc, InitializeN
       if (init_ctrl != nullptr) {
         _igvn.replace_node(init_ctrl, ctrl);
       }
-      if (init_mem != nullptr) {
-        _igvn.replace_node(init_mem, mem);
-      }
+      _igvn.replace_node(old_raw_mem_proj, mem);
     }
   }
 }
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index c63cefe7ac2..159e13d8d23 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -151,6 +151,8 @@ void Matcher::verify_new_nodes_only(Node* xroot) {
       continue;
     }
     assert(C->node_arena()->contains(n), "dead node");
+    assert(!n->is_Initialize() || n->as_Initialize()->number_of_projs(TypeFunc::Memory) == 1,
+           "after matching, Initialize should have a single memory projection");
     for (uint j = 0; j < n->req(); j++) {
       Node* in = n->in(j);
       if (in != nullptr) {
@@ -1029,7 +1031,7 @@ Node *Matcher::xform( Node *n, int max_stack ) {
       // Old-space or new-space check
       if (!C->node_arena()->contains(n)) {
         // Old space!
-        Node* m;
+        Node* m = nullptr;
         if (has_new_node(n)) {  // Not yet Label/Reduced
           m = new_node(n);
         } else {
@@ -1044,9 +1046,21 @@ Node *Matcher::xform( Node *n, int max_stack ) {
             }
           } else {                  // Nothing the matcher cares about
             if (n->is_Proj() && n->in(0) != nullptr && n->in(0)->is_Multi()) {       // Projections?
-              // Convert to machine-dependent projection
-              m = n->in(0)->as_Multi()->match( n->as_Proj(), this );
-              NOT_PRODUCT(record_new2old(m, n);)
+              if (n->in(0)->is_Initialize() && n->as_Proj()->_con == TypeFunc::Memory) {
+                // Initialize may have multiple NarrowMem projections. They would all match to identical raw mem MachProjs.
+                // We don't need multiple MachProjs. Create one if none already exist, otherwise use existing one.
+                m = n->in(0)->as_Initialize()->mem_mach_proj();
+                if (m == nullptr && has_new_node(n->in(0))) {
+                  InitializeNode* new_init = new_node(n->in(0))->as_Initialize();
+                  m = new_init->mem_mach_proj();
+                }
+                assert(m == nullptr || m->is_MachProj(), "no mem projection yet or a MachProj created during matching");
+              }
+              if (m == nullptr) {
+                // Convert to machine-dependent projection
+                m = n->in(0)->as_Multi()->match( n->as_Proj(), this );
+                NOT_PRODUCT(record_new2old(m, n);)
+              }
               if (m->in(0) != nullptr) // m might be top
                 collect_null_checks(m, n);
             } else {                // Else just a regular 'ol guy
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 9187ef1a361..f42a6ea9489 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -91,7 +91,7 @@ void MemNode::dump_spec(outputStream *st) const {
   if (in(Address) != nullptr)
     _adr_type = in(Address)->bottom_type()->isa_ptr();
 #endif
-  dump_adr_type(this, _adr_type, st);
+  dump_adr_type(_adr_type, st);
 
   Compile* C = Compile::current();
   if (C->alias_type(_adr_type)->is_volatile()) {
@@ -108,7 +108,7 @@ void MemNode::dump_spec(outputStream *st) const {
   }
 }
 
-void MemNode::dump_adr_type(const Node* mem, const TypePtr* adr_type, outputStream *st) {
+void MemNode::dump_adr_type(const TypePtr* adr_type, outputStream* st) {
   st->print(" @");
   if (adr_type == nullptr) {
     st->print("null");
@@ -4229,7 +4229,7 @@ MemBarNode* MemBarNode::make(Compile* C, int opcode, int atp, Node* pn) {
 }
 
 void MemBarNode::remove(PhaseIterGVN *igvn) {
-  assert(outcnt() > 0 && outcnt() <= 2, "Only one or two out edges allowed");
+  assert(outcnt() > 0 && (outcnt() <= 2 || Opcode() == Op_Initialize), "Only one or two out edges allowed");
   if (trailing_store() || trailing_load_store()) {
     MemBarNode* leading = leading_membar();
     if (leading != nullptr) {
@@ -4237,12 +4237,16 @@ void MemBarNode::remove(PhaseIterGVN *igvn) {
       leading->remove(igvn);
     }
   }
-  if (proj_out_or_null(TypeFunc::Memory) != nullptr) {
-    igvn->replace_node(proj_out(TypeFunc::Memory), in(TypeFunc::Memory));
-  }
   if (proj_out_or_null(TypeFunc::Control) != nullptr) {
     igvn->replace_node(proj_out(TypeFunc::Control), in(TypeFunc::Control));
   }
+  if (is_Initialize()) {
+    as_Initialize()->replace_mem_projs_by(in(TypeFunc::Memory), igvn);
+  } else {
+    if (proj_out_or_null(TypeFunc::Memory) != nullptr) {
+      igvn->replace_node(proj_out(TypeFunc::Memory), in(TypeFunc::Memory));
+    }
+  }
 }
 
 //------------------------------Ideal------------------------------------------
@@ -5445,6 +5449,48 @@ Node* InitializeNode::complete_stores(Node* rawctl, Node* rawmem, Node* rawptr,
   return rawmem;
 }
 
+void InitializeNode::replace_mem_projs_by(Node* mem, Compile* C) {
+  auto replace_proj = [&](ProjNode* proj) {
+    C->gvn_replace_by(proj, mem);
+    return CONTINUE;
+  };
+  apply_to_projs(replace_proj, TypeFunc::Memory);
+}
+
+void InitializeNode::replace_mem_projs_by(Node* mem, PhaseIterGVN* igvn) {
+  DUIterator_Fast imax, i = fast_outs(imax);
+  auto replace_proj = [&](ProjNode* proj) {
+    igvn->replace_node(proj, mem);
+    --i; --imax;
+    return CONTINUE;
+  };
+  apply_to_projs(imax, i, replace_proj, TypeFunc::Memory);
+}
+
+bool InitializeNode::already_has_narrow_mem_proj_with_adr_type(const TypePtr* adr_type) const {
+  auto find_proj = [&](ProjNode* proj) {
+    if (proj->adr_type() == adr_type) {
+      return BREAK_AND_RETURN_CURRENT_PROJ;
+    }
+    return CONTINUE;
+  };
+  DUIterator_Fast imax, i = fast_outs(imax);
+  return apply_to_narrow_mem_projs_any_iterator(UsesIteratorFast(imax, i, this), find_proj) != nullptr;
+}
+
+MachProjNode* InitializeNode::mem_mach_proj() const {
+  auto find_proj = [](ProjNode* proj) {
+    if (proj->is_MachProj()) {
+      return BREAK_AND_RETURN_CURRENT_PROJ;
+    }
+    return CONTINUE;
+  };
+  ProjNode* proj = apply_to_projs(find_proj, TypeFunc::Memory);
+  if (proj == nullptr) {
+    return nullptr;
+  }
+  return proj->as_MachProj();
+}
 
 #ifdef ASSERT
 bool InitializeNode::stores_are_sane(PhaseValues* phase) {
@@ -5867,6 +5913,7 @@ Node* MergeMemNode::memory_at(uint alias_idx) const {
            || n->adr_type() == nullptr // address is TOP
            || n->adr_type() == TypePtr::BOTTOM
            || n->adr_type() == TypeRawPtr::BOTTOM
+           || n->is_NarrowMemProj()
            || !Compile::current()->do_aliasing(),
            "must be a wide memory");
     // do_aliasing == false if we are organizing the memory states manually.
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index 810a9fe9445..d554c037012 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -167,7 +167,7 @@ public:
   bool is_unsafe_access() const { return _unsafe_access; }
 
 #ifndef PRODUCT
-  static void dump_adr_type(const Node* mem, const TypePtr* adr_type, outputStream *st);
+  static void dump_adr_type(const TypePtr* adr_type, outputStream* st);
   virtual void dump_spec(outputStream *st) const;
 #endif
 };
@@ -1371,7 +1371,20 @@ public:
                         intptr_t header_size, Node* size_in_bytes,
                         PhaseIterGVN* phase);
 
- private:
+  // An Initialize node has multiple memory projections. Helper methods used when the node is removed.
+  // For use at parse time
+  void replace_mem_projs_by(Node* mem, Compile* C);
+  // For use with IGVN
+  void replace_mem_projs_by(Node* mem, PhaseIterGVN* igvn);
+
+  // Does a NarrowMemProj with this adr_type and this node as input already exist?
+  bool already_has_narrow_mem_proj_with_adr_type(const TypePtr* adr_type) const;
+
+  // Used during matching: find the MachProj memory projection if there's one. Expectation is that there should be at
+  // most one.
+  MachProjNode* mem_mach_proj() const;
+
+private:
   void remove_extra_zeroes();
 
   // Find out where a captured store should be placed (or already is placed).
@@ -1388,6 +1401,33 @@ public:
                                PhaseGVN* phase);
 
   intptr_t find_next_fullword_store(uint i, PhaseGVN* phase);
+
+  // Iterate with i over all NarrowMemProj uses calling callback
+  template <class Callback, class Iterator> NarrowMemProjNode* apply_to_narrow_mem_projs_any_iterator(Iterator i, Callback callback) const {
+    auto filter = [&](ProjNode* proj) {
+      if (proj->is_NarrowMemProj() && callback(proj->as_NarrowMemProj()) == BREAK_AND_RETURN_CURRENT_PROJ) {
+        return BREAK_AND_RETURN_CURRENT_PROJ;
+      }
+      return CONTINUE;
+    };
+    ProjNode* res = apply_to_projs_any_iterator(i, filter);
+    if (res == nullptr) {
+      return nullptr;
+    }
+    return res->as_NarrowMemProj();
+  }
+
+public:
+
+  // callback is allowed to add new uses that will then be iterated over
+  template <class Callback> void for_each_narrow_mem_proj_with_new_uses(Callback callback) const {
+    auto callback_always_continue = [&](NarrowMemProjNode* proj) {
+      callback(proj);
+      return MultiNode::CONTINUE;
+    };
+    DUIterator i = outs();
+    apply_to_narrow_mem_projs_any_iterator(UsesIterator(i, this), callback_always_continue);
+  }
 };
 
 //------------------------------MergeMem---------------------------------------
diff --git a/src/hotspot/share/opto/multnode.cpp b/src/hotspot/share/opto/multnode.cpp
index 4d8d1f4246c..9409a2f6af3 100644
--- a/src/hotspot/share/opto/multnode.cpp
+++ b/src/hotspot/share/opto/multnode.cpp
@@ -45,30 +45,58 @@ Node *MultiNode::match( const ProjNode *proj, const Matcher *m ) { return proj->
 // Get a named projection or null if not found
 ProjNode* MultiNode::proj_out_or_null(uint which_proj) const {
   assert((Opcode() != Op_If && Opcode() != Op_RangeCheck) || which_proj == (uint)true || which_proj == (uint)false, "must be 1 or 0");
-  for( DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++ ) {
-    Node *p = fast_out(i);
-    if (p->is_Proj()) {
-      ProjNode *proj = p->as_Proj();
-      if (proj->_con == which_proj) {
-        assert((Opcode() != Op_If && Opcode() != Op_RangeCheck) || proj->Opcode() == (which_proj ? Op_IfTrue : Op_IfFalse), "bad if #2");
-        return proj;
-      }
-    } else {
-      assert(p == this && this->is_Start(), "else must be proj");
-      continue;
-    }
-  }
-  return nullptr;
+  assert(number_of_projs(which_proj) <= 1, "only when there's a single projection");
+  ProjNode* proj = find_first(which_proj);
+  assert(proj == nullptr || (Opcode() != Op_If && Opcode() != Op_RangeCheck) || proj->Opcode() == (which_proj ? Op_IfTrue : Op_IfFalse),
+         "incorrect projection node at If/RangeCheck: IfTrue on false path or IfFalse on true path");
+  return proj;
 }
 
 ProjNode* MultiNode::proj_out_or_null(uint which_proj, bool is_io_use) const {
-  for (DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++) {
-    ProjNode* proj = fast_out(i)->isa_Proj();
-    if (proj != nullptr && (proj->_con == which_proj) && (proj->_is_io_use == is_io_use)) {
-      return proj;
+  assert(number_of_projs(which_proj, is_io_use) <= 1, "only when there's a single projection");
+  return find_first(which_proj, is_io_use);
+}
+
+template<class Callback> ProjNode* MultiNode::apply_to_projs(Callback callback, uint which_proj, bool is_io_use) const {
+  auto filter = [&](ProjNode* proj) {
+    if (proj->_is_io_use == is_io_use && callback(proj) == BREAK_AND_RETURN_CURRENT_PROJ) {
+      return BREAK_AND_RETURN_CURRENT_PROJ;
     }
-  }
-  return nullptr;
+    return CONTINUE;
+  };
+  return apply_to_projs(filter, which_proj);
+}
+
+uint MultiNode::number_of_projs(uint which_proj) const {
+  uint cnt = 0;
+  auto count_projs = [&](ProjNode* proj) {
+    cnt++;
+  };
+  for_each_proj(count_projs, which_proj);
+  return cnt;
+}
+
+uint MultiNode::number_of_projs(uint which_proj, bool is_io_use) const {
+  uint cnt = 0;
+  auto count_projs = [&](ProjNode* proj) {
+    cnt++;
+  };
+  for_each_proj(count_projs, which_proj, is_io_use);
+  return cnt;
+}
+
+ProjNode* MultiNode::find_first(uint which_proj) const {
+  auto find_proj = [&](ProjNode* proj) {
+    return BREAK_AND_RETURN_CURRENT_PROJ;
+  };
+  return apply_to_projs(find_proj, which_proj);
+}
+
+ProjNode* MultiNode::find_first(uint which_proj, bool is_io_use) const {
+  auto find_proj = [](ProjNode* proj) {
+    return BREAK_AND_RETURN_CURRENT_PROJ;
+  };
+  return apply_to_projs(find_proj, which_proj, is_io_use);
 }
 
 // Get a named projection
@@ -239,3 +267,8 @@ ProjNode* ProjNode::other_if_proj() const {
   assert(_con == 0 || _con == 1, "not an if?");
   return in(0)->as_If()->proj_out(1-_con);
 }
+
+NarrowMemProjNode::NarrowMemProjNode(InitializeNode* src, const TypePtr* adr_type)
+  : ProjNode(src, TypeFunc::Memory), _adr_type(adr_type) {
+  init_class_id(Class_NarrowMemProj);
+}
diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp
index 834dcfdca6d..be1351cc5b1 100644
--- a/src/hotspot/share/opto/multnode.hpp
+++ b/src/hotspot/share/opto/multnode.hpp
@@ -49,6 +49,105 @@ public:
   ProjNode* proj_out(uint which_proj) const; // Get a named projection
   ProjNode* proj_out_or_null(uint which_proj) const;
   ProjNode* proj_out_or_null(uint which_proj, bool is_io_use) const;
+  uint number_of_projs(uint which_proj) const;
+  uint number_of_projs(uint which_proj, bool is_io_use) const;
+
+protected:
+
+  // Provide single interface for DUIterator_Fast/DUIterator for template method below
+  class UsesIteratorFast {
+    DUIterator_Fast& _imax;
+    DUIterator_Fast& _i;
+    const Node* _node;
+
+  public:
+    bool cont() {
+      return _i < _imax;
+    }
+    void next() {
+      _i++;
+    }
+    Node* current() {
+      return _node->fast_out(_i);
+    }
+    UsesIteratorFast(DUIterator_Fast& imax, DUIterator_Fast& i, const Node* node)
+      : _imax(imax), _i(i), _node(node) {
+    }
+  };
+
+  class UsesIterator {
+    DUIterator& _i;
+    const Node* _node;
+
+  public:
+    bool cont() {
+      return _node->has_out(_i);
+    }
+    void next() {
+      _i++;
+    }
+    Node* current() {
+      return _node->out(_i);
+    }
+    UsesIterator(DUIterator& i, const Node* node)
+      : _i(i), _node(node) {
+    }
+  };
+
+  // Iterate with i over all Proj uses calling callback
+  template<class Callback, class Iterator> ProjNode* apply_to_projs_any_iterator(Iterator i, Callback callback) const {
+    for (; i.cont(); i.next()) {
+      Node* p = i.current();
+      if (p->is_Proj()) {
+        ProjNode* proj = p->as_Proj();
+        ApplyToProjs result = callback(proj);
+        if (result == BREAK_AND_RETURN_CURRENT_PROJ) {
+          return proj;
+        }
+        assert(result == CONTINUE, "should be either break or continue");
+      } else {
+        assert(p == this && is_Start(), "else must be proj");
+      }
+    }
+    return nullptr;
+  }
+  enum ApplyToProjs {
+    CONTINUE,
+    BREAK_AND_RETURN_CURRENT_PROJ
+  };
+
+  // Run callback on projections with iterator passed as argument
+  template <class Callback> ProjNode* apply_to_projs(DUIterator_Fast& imax, DUIterator_Fast& i, Callback callback, uint which_proj) const;
+
+  // Same but with default iterator and for matching _con
+  template<class Callback> ProjNode* apply_to_projs(Callback callback, uint which_proj) const {
+    DUIterator_Fast imax, i = fast_outs(imax);
+    return apply_to_projs(imax, i, callback, which_proj);
+  }
+
+  // Same but for matching _con and _is_io_use
+  template <class Callback> ProjNode* apply_to_projs(Callback callback, uint which_proj, bool is_io_use) const;
+
+public:
+  template<class Callback> void for_each_proj(Callback callback, uint which_proj) const {
+    auto callback_always_continue = [&](ProjNode* proj) {
+      callback(proj);
+      return MultiNode::CONTINUE;
+    };
+    apply_to_projs(callback_always_continue, which_proj);
+  }
+
+  template <class Callback> void for_each_proj(Callback callback, uint which_proj, bool is_io_use) const {
+    auto callback_always_continue = [&](ProjNode* proj) {
+      callback(proj);
+      return MultiNode::CONTINUE;
+    };
+    apply_to_projs(callback_always_continue, which_proj, is_io_use);
+  }
+
+
+  ProjNode* find_first(uint which_proj) const;
+  ProjNode* find_first(uint which_proj, bool is_io_use) const;
 };
 
 //------------------------------ProjNode---------------------------------------
@@ -106,6 +205,41 @@ public:
   ProjNode* other_if_proj() const;
 };
 
+// A ProjNode variant that captures an adr_type(). Used as a projection of InitializeNode to have the right adr_type()
+// for array elements/fields.
+class NarrowMemProjNode : public ProjNode {
+private:
+  const TypePtr* const _adr_type;
+protected:
+  virtual uint hash() const {
+    return ProjNode::hash() + _adr_type->hash();
+  }
+  virtual bool cmp(const Node& n) const {
+    return ProjNode::cmp(n) && ((NarrowMemProjNode&)n)._adr_type == _adr_type;
+  }
+  virtual uint size_of() const {
+    return sizeof(*this);
+  }
+public:
+  NarrowMemProjNode(InitializeNode* src, const TypePtr* adr_type);
+
+  virtual const TypePtr* adr_type() const {
+    return _adr_type;
+  }
+
+  virtual int Opcode() const;
+};
+
+template <class Callback> ProjNode* MultiNode::apply_to_projs(DUIterator_Fast& imax, DUIterator_Fast& i, Callback callback, uint which_proj) const {
+  auto filter = [&](ProjNode* proj) {
+    if (proj->_con == which_proj && callback(proj) == BREAK_AND_RETURN_CURRENT_PROJ) {
+      return BREAK_AND_RETURN_CURRENT_PROJ;
+    }
+    return CONTINUE;
+  };
+  return apply_to_projs_any_iterator(UsesIteratorFast(imax, i, this), filter);
+}
+
 /* Tuples are used to avoid manual graph surgery. When a node with Proj outputs (such as a call)
  * must be removed and its ouputs replaced by its input, or some other value, we can make its
  * ::Ideal return a tuple of what we want for each output: the ::Identity of output Proj will
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 3a41353101d..93ded36363e 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -2602,7 +2602,7 @@ void Node::dump(const char* suffix, bool mark, outputStream* st, DumpConfig* dc)
     t->dump_on(st);
   } else if (t == Type::MEMORY) {
     st->print("  Memory:");
-    MemNode::dump_adr_type(this, adr_type(), st);
+    MemNode::dump_adr_type(adr_type(), st);
   } else if (Verbose || WizardMode) {
     st->print("  Type:");
     if (t) {
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 4e8d74a6f5e..6067bcbac8d 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -134,6 +134,7 @@ class MoveNode;
 class MulNode;
 class MultiNode;
 class MultiBranchNode;
+class NarrowMemProjNode;
 class NegNode;
 class NegVNode;
 class NeverBranchNode;
@@ -771,6 +772,7 @@ public:
         DEFINE_CLASS_ID(IfFalse,   IfProj, 1)
       DEFINE_CLASS_ID(Parm,      Proj, 4)
       DEFINE_CLASS_ID(MachProj,  Proj, 5)
+      DEFINE_CLASS_ID(NarrowMemProj, Proj, 6)
 
     DEFINE_CLASS_ID(Mem, Node, 4)
       DEFINE_CLASS_ID(Load, Mem, 0)
@@ -989,6 +991,7 @@ public:
   DEFINE_CLASS_QUERY(Multi)
   DEFINE_CLASS_QUERY(MultiBranch)
   DEFINE_CLASS_QUERY(MulVL)
+  DEFINE_CLASS_QUERY(NarrowMemProj)
   DEFINE_CLASS_QUERY(Neg)
   DEFINE_CLASS_QUERY(NegV)
   DEFINE_CLASS_QUERY(NeverBranch)
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index ce5160c5984..b5b15275e21 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2592,12 +2592,14 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
+  auto enqueue_init_mem_projs = [&](ProjNode* proj) {
+    add_users_to_worklist0(proj, worklist);
+  };
   // If changed initialization activity, check dependent Stores
   if (use_op == Op_Allocate || use_op == Op_AllocateArray) {
     InitializeNode* init = use->as_Allocate()->initialization();
     if (init != nullptr) {
-      Node* imem = init->proj_out_or_null(TypeFunc::Memory);
-      if (imem != nullptr) add_users_to_worklist0(imem, worklist);
+      init->for_each_proj(enqueue_init_mem_projs, TypeFunc::Memory);
     }
   }
   // If the ValidLengthTest input changes then the fallthrough path out of the AllocateArray may have become dead.
@@ -2611,8 +2613,8 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
   }
 
   if (use_op == Op_Initialize) {
-    Node* imem = use->as_Initialize()->proj_out_or_null(TypeFunc::Memory);
-    if (imem != nullptr) add_users_to_worklist0(imem, worklist);
+    InitializeNode* init = use->as_Initialize();
+    init->for_each_proj(enqueue_init_mem_projs, TypeFunc::Memory);
   }
   // Loading the java mirror from a Klass requires two loads and the type
   // of the mirror load depends on the type of 'n'. See LoadNode::Value().
diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index 420423dd246..6b98c4ca2b0 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -380,17 +380,13 @@ void StringConcat::eliminate_initialize(InitializeNode* init) {
   Compile* C = _stringopts->C;
 
   // Eliminate Initialize node.
-  assert(init->outcnt() <= 2, "only a control and memory projection expected");
   assert(init->req() <= InitializeNode::RawStores, "no pending inits");
   Node *ctrl_proj = init->proj_out_or_null(TypeFunc::Control);
   if (ctrl_proj != nullptr) {
     C->gvn_replace_by(ctrl_proj, init->in(TypeFunc::Control));
   }
-  Node *mem_proj = init->proj_out_or_null(TypeFunc::Memory);
-  if (mem_proj != nullptr) {
-    Node *mem = init->in(TypeFunc::Memory);
-    C->gvn_replace_by(mem_proj, mem);
-  }
+  Node* mem = init->in(TypeFunc::Memory);
+  init->replace_mem_projs_by(mem, C);
   C->gvn_replace_by(init, C->top());
   init->disconnect_inputs(C);
 }
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
index 93199ea35a1..c7d18eccf11 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
@@ -675,7 +675,9 @@ public class ServerCompilerScheduler implements Scheduler {
     }
 
     private static boolean isProj(Node n) {
-        return hasName(n, "Proj") || hasName(n, "MachProj");
+        return hasName(n, "Proj") ||
+               hasName(n, "MachProj") ||
+               hasName(n, "NarrowMemProj");
     }
 
     private static boolean isParm(Node n) {
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/condenseGraph.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/condenseGraph.filter
index 6919f06da00..5e9de455e1f 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/condenseGraph.filter
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/condenseGraph.filter
@@ -53,6 +53,7 @@ split(and([matches("name", "Parm|MachProj"),
 
 // Combine single-input nodes.
 combine(anyNode, matches("name", "Proj|IfFalse|IfTrue|JProj|MachProj|JumpProj|CatchProj|Parm"));
+combine(anyNode, matches("name", "NarrowMemProj"), ["N"]);
 combine(anyNode, matches("name", "SCMemProj"), ["SCM"]);
 combine(matches("name", "SubTypeCheck|Cmp.*"), matches("name", "Bool"), ["[dump_spec]"]);
 combine(anyNode, matches("name", "Decode(N|NarrowPtr|NKlass)"), ["DC"]);
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
index 299f98995a0..a5688ef8041 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
@@ -48,9 +48,13 @@ public class TestIterativeEA {
     System.out.println(analyzer.getOutput());
 
     analyzer.shouldHaveExitValue(0);
-    analyzer.shouldContain("++++ Eliminated: 26 Allocate");
-    analyzer.shouldContain("++++ Eliminated: 48 Allocate");
-    analyzer.shouldContain("++++ Eliminated: 78 Allocate");
+    analyzer.shouldMatch(
+            "(?s)" + // Let .* also match line terminators.
+            "Eliminated: \\d+ Allocate" +
+            ".*" +
+            "Eliminated: \\d+ Allocate" +
+            ".*" +
+            "Eliminated: \\d+ Allocate");
   }
 
   static class A {
diff --git a/test/hotspot/jtreg/compiler/macronodes/TestEarlyEliminationOfAllocationWithoutUse.java b/test/hotspot/jtreg/compiler/macronodes/TestEarlyEliminationOfAllocationWithoutUse.java
new file mode 100644
index 00000000000..5987bb0bb4b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/macronodes/TestEarlyEliminationOfAllocationWithoutUse.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8327963
+ * @summary C2: fix construction of memory graph around Initialize node to prevent incorrect execution if allocation is removed
+ * @run main/othervm -XX:-BackgroundCompilation compiler.macronodes.TestEarlyEliminationOfAllocationWithoutUse
+ * @run main/othervm compiler.macronodes.TestEarlyEliminationOfAllocationWithoutUse
+ */
+
+package compiler.macronodes;
+import java.util.Arrays;
+
+public class TestEarlyEliminationOfAllocationWithoutUse {
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        boolean[] allTrue = new boolean[3];
+        Arrays.fill(allTrue, true);
+        A a = new A();
+        boolean[] allFalse = new boolean[3];
+        for (int i = 0; i < 20_000; i++) {
+            a.field1 = 0;
+            test1(a, allTrue);
+            test1(a, allFalse);
+            if (a.field1 != 42) {
+                throw new RuntimeException("Lost Store");
+            }
+        }
+    }
+
+    private static void test1(A otherA, boolean[] flags) {
+        otherA.field1 = 42;
+        // Fully unrolled before EA
+        for (int i = 0; i < 3; i++) {
+            A a = new A(); // removed right after EA
+            if (flags[i]) {
+                break;
+            }
+        }
+    }
+
+    private static class A {
+        int field1;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/macronodes/TestEliminationOfAllocationWithoutUse.java b/test/hotspot/jtreg/compiler/macronodes/TestEliminationOfAllocationWithoutUse.java
new file mode 100644
index 00000000000..9eee4c555bf
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/macronodes/TestEliminationOfAllocationWithoutUse.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8327012 8327963
+ * @summary Revealed issue where hook_memory_on_init links some array slice to the rawptr slice.
+ *          Now that array slice depends on the rawslice. And then when the Initialize MemBar gets
+ *          removed in expand_allocate_common, the rawslice sees that it has now no effect, looks
+ *          through the MergeMem and sees the initial state. That way, also the linked array slice
+ *          goes to the initial state, even if before the allocation there were stores on the array
+ *          slice. This leads to a messed up memory graph, and missing stores in the generated code.
+ *
+ * @run main/othervm -Xcomp -XX:-TieredCompilation
+ *                   -XX:CompileCommand=compileonly,compiler.macronodes.TestEliminationOfAllocationWithoutUse::test*
+ *                   compiler.macronodes.TestEliminationOfAllocationWithoutUse
+ * @run main/othervm -Xcomp
+ *                   -XX:CompileCommand=compileonly,compiler.macronodes.TestEliminationOfAllocationWithoutUse::test*
+ *                   compiler.macronodes.TestEliminationOfAllocationWithoutUse
+ */
+
+package compiler.macronodes;
+
+public class TestEliminationOfAllocationWithoutUse {
+
+    static public void main(String[] args) {
+        int failures = 0;
+        failures += run1();
+        failures += run2();
+        failures += run3();
+        failures += run4();
+        failures += run5();
+        failures += run6();
+        failures += run7();
+        failures += run8();
+        failures += run9();
+        if (failures != 0) {
+            throw new RuntimeException("Had test failures: " + failures);
+        }
+    }
+
+    static public int run1() {
+        int size = 10;
+        double[] arr1 = new double[size];
+        double[] arr2 = new double[size];
+        test1(arr1, arr2);
+
+        double sum = 0;
+        for (int i = 0; i < arr1.length; ++i) {
+            sum += arr1[i] - arr2[i];
+        }
+
+        if (sum != (double)(size)) {
+            System.out.println("test1: wrong result: " + sum + " vs expected: " + size);
+            return 1;
+        }
+        return 0;
+    }
+
+    // Simplified from JDK-8327012 regression test.
+    public static void test1(double[] arr1, double[] arr2) {
+        for(int i = 0; i < arr1.length; ++i) {
+            // stores on double[] slice
+            arr1[i] = (double)(i + 2);
+            arr2[i] = (double)(i + 1);
+            // Allocation without use: but Initialize MemBar tangles the rawptr and double[] slices
+            double[] tmp = new double[100];
+            // When the Initialize MemBar is removed, the rawptr slice sees that there is no effect
+            // and takes the initial state. The double[] slice is hooked on to the rawptr slice, and
+            // also thinks it has the initial state, ignoring the double[] stores above.
+        }
+    }
+
+    static public int run2() {
+        int size = 10;
+        double[] arr1 = new double[size];
+        test2(arr1);
+
+        double sum = 0;
+        for(int i = 0; i < arr1.length; ++i) {
+            sum += arr1[i];
+        }
+
+        if (sum != (double)(size)) {
+            System.out.println("test2: wrong result: " + sum + " vs expected: " + size);
+            return 1;
+        }
+        return 0;
+    }
+
+    // Simplified from test1
+    public static void test2(double[] arr1) {
+        for(int i = 0; i < arr1.length; ++i) {
+            arr1[i] = 1;
+            double[] tmp = new double[100];
+        }
+    }
+
+    static public int run3() {
+        int size = 10;
+        int[] arr1 = new int[size];
+        test3(arr1);
+
+        int sum = 0;
+        for(int i = 0; i < arr1.length; ++i) {
+            sum += arr1[i];
+        }
+
+        if (sum != size) {
+            System.out.println("test3: wrong result: " + sum + " vs expected: " + size);
+            return 1;
+        }
+        return 0;
+    }
+
+    // Modified from test2
+    public static void test3(int[] arr1) {
+        for(int i = 0; i < arr1.length; ++i) {
+            arr1[i] = 1;
+            int[] tmp = new int[100];
+        }
+    }
+
+    // From TestIncorrectResult.java in JDK-8324739
+    static int test4(int l2) {
+       int[] tmp = new int[20];
+
+       for (int j = 0; j < l2; ++j) {
+           tmp[j] = 42;
+           int[] unused_but_necessary = new int[400];
+       }
+
+       return tmp[0];
+    }
+
+    public static int run4() {
+        for (int i = 0; i < 100; ++i) {
+            long res = test4(20);
+
+            if (res != 42) {
+                System.out.println("test4: wrong result: " + res + " vs expected: 42");
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    // From JDK-8336701
+    static class Test5 {
+        int[] b = new int[400];
+        static int[] staticArray = new int[400];
+    }
+
+    static void test5() {
+        long e;
+        for (e = 1; e < 9; ++e) {
+            Test5.staticArray[(int) e] -= e;
+            synchronized (new Test5()) { }
+        }
+        for (int f = 0; f < 10000; ++f) ;
+    }
+
+    static int run5() {
+        new Test5();
+        for (int i = 0; i < 1000; ++i) {
+            test5();
+        }
+        if (Test5.staticArray[8] != -8000) {
+            System.out.println("test5: wrong result: " + Test5.staticArray[8] + " vs expected: -8000");
+            return 1;
+        }
+        return 0;
+    }
+
+    // From JDK-8336293
+    static class Test6 {
+        static long c;
+        static int a = 400;
+        double[] b = new double[400];
+    }
+
+    static void test6() {
+        long d;
+        double[] e = new double[Test6.a];
+        for (int f = 0; f < e.length; f++)
+            e[f] = 1.116242;
+        d = 1;
+        while (++d < 7)
+            synchronized (new Test6()) { }
+        long g = 0;
+        for (int f = 0; f < e.length; f++)
+            g += e[f];
+        Test6.c += g;
+    }
+
+    static int run6() {
+        new Test6();
+        for (int f = 0; f < 10000; ++f) {
+            test6();
+        }
+        if (Test6.c != 4000000) {
+            System.out.println("test6: wrong result: " + Test6.c + " vs expected: 4000000 ");
+            return 1;
+        }
+        return 0;
+    }
+
+    // From JDK-8327868
+    static class Test7 {
+        static int a = 400;
+        int[] b = new int[400];
+        static int[] staticArray = new int[a];
+    }
+
+    static int test7() {
+        int l, d = 3;
+        for (l = 2; 58 > l; l++) {
+            for (int e = 2; e < 8; e += 2)
+                for (int f = 1; f < e; f += 2)
+                    synchronized (new Test7()) {
+                    }
+            do
+                ; while (d < 2);
+            int g = 0;
+            do
+                g++;
+            while (g < 20000);
+            Test7.staticArray[1] -= 3023399;
+        }
+        int h = 0;
+        for (int i = 0; i < Test7.staticArray.length; i++)
+            h += Test7.staticArray[i];
+        return h;
+    }
+
+    static int run7() {
+        new Test7();
+        int res = test7();
+        if (res != -169310344) {
+            System.out.println("test7: wrong result: " + res + " vs expected: -169310344");
+            return 1;
+        }
+        return 0;
+    }
+
+    // from JDK-8329984
+    static class Test8 {
+        static int a = 400;
+        int[] e = new int[400];
+    }
+
+    static int test8() {
+        int i = 22738;
+        int b;
+        int h;
+        int[] c = new int[Test8.a];
+        for (b = 3; b < 273; b++) {
+            h = 1;
+            while (++h < 97) switch (b % 6 + 56) {
+                case 56:
+                    c[1] = i;
+                case 57:
+                    synchronized (new Test8()) {}
+            }
+        }
+        int k = 0;
+        for (int j = 0; j < c.length; j++) k += c[j];
+        return k;
+    }
+
+    public static int run8() {
+        new Test8();
+        for (int i = 0; i < 20; i++) {
+            int res = test8();
+            if (res != 22738) {
+                System.out.println("test8: wrong result: " + res + " vs expected: 22738");
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    // from JDK-8341009
+   static class Test9 {
+        static int a = 256;
+        float[] b = new float[256];
+        static long c;
+    }
+
+  static void test9() {
+    for (int f = 0; f < 10000; ++f) ;
+    float[][] g = new float[Test9.a][Test9.a];
+    for (int d = 7; d < 16; d++) {
+      long e = 1;
+      do {
+        g[d][(int) e] = d;
+        synchronized (new Test9()) {
+        }
+      } while (++e < 5);
+    }
+    for (int i = 0; i < Test9.a; ++i) {
+      for (int j = 0; j < Test9.a ; ++j) {
+          Test9.c += g[i][j];
+      }
+    }
+  }
+
+  static int run9() {
+    for (int j = 6; 116 > j; ++j) {
+        test9();
+    }
+    if (Test9.c != 43560) {
+        System.out.println("test9: wrong result: " + Test9.c + " vs expected: 43560");
+        return 1;
+    }
+    return 0;
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/macronodes/TestInitializingStoreCapturing.java b/test/hotspot/jtreg/compiler/macronodes/TestInitializingStoreCapturing.java
new file mode 100644
index 00000000000..0176d6a4801
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/macronodes/TestInitializingStoreCapturing.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8327012 8327963
+ * @summary Test that initializing store gets captured, i.e. moved before the InitializeNode
+ *          and made into a raw-store.
+ * @library /test/lib /
+ * @run driver compiler.macronodes.TestInitializingStoreCapturing
+ */
+
+package compiler.macronodes;
+
+import compiler.lib.ir_framework.*;
+
+public class TestInitializingStoreCapturing {
+
+    static class A {
+        float value;
+        A(float v) { value = v; }
+    };
+
+    static public void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_F, "= 0"})
+    static A testInitializeField() {
+        return new A(4.2f);
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_F, "= 0"})
+    static float[] testInitializeArray() {
+        return new float[] {4.2f};
+    }
+}

From 642ba4cfd18b7e17ff7f0ac3b2ce557bcaa93784 Mon Sep 17 00:00:00 2001
From: Kieran Farrell <kfarrell@openjdk.org>
Date: Tue, 4 Nov 2025 14:02:24 +0000
Subject: [PATCH 012/512] 8334015: Add Support for UUID Version 7 (UUIDv7)
 defined in RFC 9562

Reviewed-by: rriggs, jpai, alanb
---
 .../share/classes/java/util/UUID.java         | 82 +++++++++++++++----
 test/jdk/java/util/UUID/UUIDTest.java         | 50 ++++++++++-
 2 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java
index d1c81badba6..fa66d199239 100644
--- a/src/java.base/share/classes/java/util/UUID.java
+++ b/src/java.base/share/classes/java/util/UUID.java
@@ -59,21 +59,21 @@ import jdk.internal.util.ByteArrayLittleEndian;
  * {@code UUID}.  The bit layout described above is valid only for a {@code
  * UUID} with a variant value of 2, which indicates the Leach-Salz variant.
  *
- * <p> The version field holds a value that describes the type of this {@code
- * UUID}.  There are four different basic types of UUIDs: time-based, DCE
- * security, name-based, and randomly generated UUIDs.  These types have a
- * version value of 1, 2, 3 and 4, respectively.
+ * <p> See <a href="https://www.rfc-editor.org/rfc/rfc9562.html">
+ * <i>RFC 9562: Universally Unique Identifiers (UUIDs)</i></a> for the complete specification,
+ * including the UUID format, layouts, and algorithms for creating {@code UUID}s.
  *
- * <p> For more information including algorithms used to create {@code UUID}s,
- * see <a href="http://www.ietf.org/rfc/rfc4122.txt"> <i>RFC&nbsp;4122: A
- * Universally Unique IDentifier (UUID) URN Namespace</i></a>, section 4.2
- * &quot;Algorithms for Creating a Time-Based UUID&quot;.
+ * <p> There are eight defined types of UUIDs, each identified by a version number:
+ * time-based (version 1), DCE security (version 2), name-based with MD5 (version 3),
+ * randomly generated (version 4), name-based with SHA-1 (version 5), reordered time-based (version 6),
+ * Unix epoch time-based (version 7), and custom-defined layout (version 8).
  *
- * @spec https://www.rfc-editor.org/info/rfc4122
- *      RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace
+ * @spec https://www.rfc-editor.org/rfc/rfc9562.html
+ *      RFC 9562 Universally Unique IDentifiers (UUIDs)
  * @since   1.5
  */
 public final class UUID implements java.io.Serializable, Comparable<UUID> {
+
     /**
      * Explicit serialVersionUID for interoperability.
      */
@@ -178,6 +178,62 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
         return new UUID(md5Bytes);
     }
 
+    /**
+     * Creates a type 7 UUID (UUIDv7) {@code UUID} from the given Unix Epoch timestamp.
+     *
+     * The returned {@code UUID} will have the given {@code timestamp} in
+     * the first 6 bytes, followed by the version and variant bits representing {@code UUIDv7},
+     * and the remaining bytes will contain random data from a cryptographically strong
+     * pseudo-random number generator.
+     *
+     * @apiNote {@code UUIDv7} values are created by allocating a Unix timestamp in milliseconds
+     * in the most significant 48 bits, allocating the required version (4 bits) and variant (2-bits)
+     * and filling the remaining 74 bits with random bits. As such, this method rejects {@code timestamp}
+     * values that do not fit into 48 bits.
+     * <p>
+     * Monotonicity (each subsequent value being greater than the last) is a primary characteristic
+     * of {@code UUIDv7} values. This is due to the {@code timestamp} value being part of the {@code UUID}.
+     * Callers of this method that wish to generate monotonic {@code UUIDv7} values are expected to
+     * ensure that the given {@code timestamp} value is monotonic.
+     *
+     *
+     * @param timestamp the number of milliseconds since midnight 1 Jan 1970 UTC,
+     *                 leap seconds excluded.
+     *
+     * @return a {@code UUID} constructed using the given {@code timestamp}
+     *
+     * @throws IllegalArgumentException if the timestamp is negative or greater than {@code (1L << 48) - 1}
+     *
+     * @since 26
+     */
+    public static UUID ofEpochMillis(long timestamp) {
+        if ((timestamp >> 48) != 0) {
+            throw new IllegalArgumentException("Supplied timestamp: " + timestamp + "does not fit within 48 bits");
+        }
+
+        SecureRandom ng = Holder.numberGenerator;
+        byte[] randomBytes = new byte[16];
+        ng.nextBytes(randomBytes);
+
+        // Embed the timestamp into the first 6 bytes
+        randomBytes[0] = (byte)(timestamp >>> 40);
+        randomBytes[1] = (byte)(timestamp >>> 32);
+        randomBytes[2] = (byte)(timestamp >>> 24);
+        randomBytes[3] = (byte)(timestamp >>> 16);
+        randomBytes[4] = (byte)(timestamp >>> 8);
+        randomBytes[5] = (byte)(timestamp);
+
+        // Set version to 7
+        randomBytes[6] &= 0x0f;
+        randomBytes[6] |= 0x70;
+
+        // Set variant to IETF
+        randomBytes[8] &= 0x3f;
+        randomBytes[8] |= (byte) 0x80;
+
+        return new UUID(randomBytes);
+    }
+
     private static final byte[] NIBBLES;
     static {
         byte[] ns = new byte[256];
@@ -320,6 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
      * <li>2    DCE security UUID
      * <li>3    Name-based UUID
      * <li>4    Randomly generated UUID
+     * <li>7    Unix Epoch time-based UUID
      * </ul>
      *
      * @return  The version number of this {@code UUID}
@@ -336,16 +393,13 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
      * The variant number has the following meaning:
      * <ul>
      * <li>0    Reserved for NCS backward compatibility
-     * <li>2    <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>
+     * <li>2    <a href="https://www.ietf.org/rfc/rfc9562.txt">IETF&nbsp;RFC&nbsp;9562</a>
      * (Leach-Salz), used by this class
      * <li>6    Reserved, Microsoft Corporation backward compatibility
      * <li>7    Reserved for future definition
      * </ul>
      *
      * @return  The variant number of this {@code UUID}
-     *
-     * @spec https://www.rfc-editor.org/info/rfc4122
-     *      RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace
      */
     public int variant() {
         // This field is composed of a varying number of bits.
diff --git a/test/jdk/java/util/UUID/UUIDTest.java b/test/jdk/java/util/UUID/UUIDTest.java
index 9fbd6dc1788..cb447a05656 100644
--- a/test/jdk/java/util/UUID/UUIDTest.java
+++ b/test/jdk/java/util/UUID/UUIDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class UUIDTest {
         randomUUIDTest();
         randomUUIDTest_Multi();
         nameUUIDFromBytesTest();
+        testOfEpochMillisTimestamp();
         stringTest();
         versionTest();
         variantTest();
@@ -146,6 +147,44 @@ public class UUIDTest {
         }
     }
 
+    private static void testOfEpochMillisTimestamp() {
+        // Should not throw for valid currentTimeMillis() timestamp
+        long timestamp = System.currentTimeMillis();
+        try {
+            UUID u = UUID.ofEpochMillis(timestamp);
+            if (u == null) {
+                throw new AssertionError("Generated UUID should not be null for timestamp: " + timestamp);
+            }
+        } catch (Exception e) {
+            throw new AssertionError("Unexpected exception with timestamp " + timestamp, e);
+        }
+
+        // Should not throw for the 48-bit long
+        long value = 0xFEDCBA987654L;
+        try {
+            UUID u = UUID.ofEpochMillis(value);
+            if (u == null) {
+                throw new AssertionError("Generated UUID should not be null for 48-bit long: " + value);
+            }
+        } catch (Exception e) {
+            throw new AssertionError("Unexpected exception with 48-bit long " + value, e);
+        }
+
+        // Should throw for negative timestamp
+        value = -0xFEDCBA987654L;
+        try {
+            UUID.ofEpochMillis(value);
+            throw new AssertionError("Expected IllegalArgumentException with negative timestamp: " + value);
+        } catch (IllegalArgumentException expected) {}
+
+        // Should throw for timestamp > 48 bits
+        value = 1L << 48;
+        try {
+            UUID.ofEpochMillis(value);
+            throw new AssertionError("Expected IllegalArgumentException with timestamp > 48 bits: " + value);
+        } catch (IllegalArgumentException expected) {}
+    }
+
     private static void stringTest() throws Exception {
         for (int i = 0; i < COUNT; i++) {
             UUID u1 = UUID.randomUUID();
@@ -187,6 +226,15 @@ public class UUIDTest {
             throw new Exception("nameUUIDFromBytes not type 3: " + test);
         }
 
+        long timestamp = System.currentTimeMillis();
+        test = UUID.ofEpochMillis(timestamp);
+        if (test.version() != 7) {
+            throw new Exception("ofEpochMillis not type 7: " + test);
+        }
+        if (test.variant() != 2) {
+            throw new Exception("ofEpochMillis not variant 2: " + test);
+        }
+
         test = UUID.fromString("9835451d-e2e0-1e41-8a5a-be785f17dcda");
         if (test.version() != 1) {
             throw new Exception("wrong version fromString 1");

From d4622b2ceac6b6aef2717bf427878df1290c4a38 Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jonas.norlinder@oracle.com>
Date: Tue, 4 Nov 2025 14:27:14 +0000
Subject: [PATCH 013/512] 8371130: Remove String template leftovers

Reviewed-by: redestad, rriggs
---
 .../java/lang/AbstractStringBuilder.java      | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index f1da102236a..05b395ebf83 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -2046,42 +2046,6 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
         return value;
     }
 
-    /**
-     * Used by StringConcatHelper via JLA. Adds the current builder count to the
-     * accumulation of items being concatenated. If the coder for the builder is
-     * UTF16 then upgrade the whole concatenation to UTF16.
-     *
-     * @param lengthCoder running accumulation of length and coder
-     *
-     * @return updated accumulation of length and coder
-     */
-    long mix(long lengthCoder) {
-        return (lengthCoder + count) | ((long)coder << 32);
-    }
-
-    /**
-     * Used by StringConcatHelper via JLA. Adds the characters in the builder value to the
-     * concatenation buffer and then updates the running accumulation of length.
-     *
-     * @param lengthCoder running accumulation of length and coder
-     * @param buffer      concatenation buffer
-     *
-     * @return running accumulation of length and coder minus the number of characters added
-     */
-    long prepend(long lengthCoder, byte[] buffer) {
-        lengthCoder -= count;
-
-        if (lengthCoder < ((long)UTF16 << 32)) {
-            System.arraycopy(value, 0, buffer, (int)lengthCoder, count);
-        } else if (isLatin1(coder)) {
-            StringUTF16.inflate(value, 0, buffer, (int)lengthCoder, count);
-        } else {
-            System.arraycopy(value, 0, buffer, (int)lengthCoder << 1, count << 1);
-        }
-
-        return lengthCoder;
-    }
-
     private AbstractStringBuilder repeat(char c, int count) {
         byte coder = this.coder;
         int prevCount = this.count;

From c0c76703bc10d5caa1cda7e2820d0702df5b8008 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Tue, 4 Nov 2025 15:20:22 +0000
Subject: [PATCH 014/512] 8366817:
 test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java and
 JdkProcClient.java should not delete logs

Reviewed-by: syan, rhalade
---
 .../javax/net/ssl/TLSCommon/interop/AbstractPeer.java    | 9 +--------
 .../javax/net/ssl/TLSCommon/interop/JdkProcClient.java   | 3 +--
 .../javax/net/ssl/TLSCommon/interop/JdkProcServer.java   | 3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/test/jdk/javax/net/ssl/TLSCommon/interop/AbstractPeer.java b/test/jdk/javax/net/ssl/TLSCommon/interop/AbstractPeer.java
index 1bfc3ebcdbb..9950caf1921 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/interop/AbstractPeer.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/interop/AbstractPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,13 +49,6 @@ public abstract class AbstractPeer implements Peer {
         System.out.println(Utilities.readFile(logPath).orElse(""));
     }
 
-    /*
-     * Deletes log file if exists.
-     */
-    protected void deleteLog() throws IOException {
-        Utilities.deleteFile(getLogPath());
-    }
-
     /*
      * The negotiated application protocol.
      */
diff --git a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcClient.java b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcClient.java
index 91d1a8d1ead..7d3cb7d1665 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcClient.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,7 +148,6 @@ public class JdkProcClient extends AbstractClient {
     @Override
     public void close() throws IOException {
         printLog();
-        deleteLog();
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java
index b07a039203e..a6c8a13e0c6 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,7 +166,6 @@ public class JdkProcServer extends AbstractServer {
     public void close() throws IOException {
         printLog();
         deletePort();
-        deleteLog();
     }
 
     private static int readPort() {

From a51a0bf57feaae0862fd7f3dbf305883d49781a0 Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Tue, 4 Nov 2025 15:40:40 +0000
Subject: [PATCH 015/512] 8370344: Arbitrary Java frames on stack during scoped
 access

Reviewed-by: pchilanomate, dholmes, liach
---
 .../share/prims/scopedMemoryAccess.cpp        |  55 +++++---
 src/hotspot/share/runtime/handshake.cpp       |   2 +
 src/hotspot/share/runtime/javaThread.cpp      |   1 +
 src/hotspot/share/runtime/javaThread.hpp      |  18 +++
 .../sharedclosejfr/TestSharedCloseJFR.java    | 123 ++++++++++++++++
 .../foreign/sharedclosejfr/sharedCloseJfr.jfc |   7 +
 .../TestSharedCloseJvmti.java                 | 130 +++++++++++++++++
 .../sharedclosejvmti/libSharedCloseAgent.cpp  | 133 ++++++++++++++++++
 .../lang/foreign/SharedCloseStackWalk.java    |  92 ++++++++++++
 9 files changed, 545 insertions(+), 16 deletions(-)
 create mode 100644 test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java
 create mode 100644 test/jdk/java/foreign/sharedclosejfr/sharedCloseJfr.jfc
 create mode 100644 test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
 create mode 100644 test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/SharedCloseStackWalk.java

diff --git a/src/hotspot/share/prims/scopedMemoryAccess.cpp b/src/hotspot/share/prims/scopedMemoryAccess.cpp
index c1d1b8cd8c0..26ae5bc03f5 100644
--- a/src/hotspot/share/prims/scopedMemoryAccess.cpp
+++ b/src/hotspot/share/prims/scopedMemoryAccess.cpp
@@ -22,9 +22,11 @@
  *
  */
 
+#include "classfile/moduleEntry.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "jni.h"
 #include "jvm.h"
+#include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/logStream.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -36,7 +38,7 @@
 #include "runtime/vframe.inline.hpp"
 
 template<typename Func>
-static bool for_scoped_method(JavaThread* jt, const Func& func) {
+static void for_scoped_methods(JavaThread* jt, bool agents_loaded, const Func& func) {
   ResourceMark rm;
 #ifdef ASSERT
   LogMessage(foreign) msg;
@@ -44,12 +46,26 @@ static bool for_scoped_method(JavaThread* jt, const Func& func) {
   if (ls.is_enabled()) {
     ls.print_cr("Walking thread: %s", jt->name());
   }
+
+  bool would_have_bailed = false;
 #endif
 
-  const int max_critical_stack_depth = 10;
-  int depth = 0;
   for (vframeStream stream(jt); !stream.at_end(); stream.next()) {
     Method* m = stream.method();
+
+    if (!agents_loaded &&
+      (m->method_holder()->module()->name() != vmSymbols::java_base())) {
+      // Stop walking if we see a frame outside of java.base.
+
+      // If any JVMTI agents are loaded, we also have to keep walking, since
+      // agents can add arbitrary Java frames to the stack inside a @Scoped method.
+#ifndef ASSERT
+      return;
+#else
+      would_have_bailed = true;
+#endif
+    }
+
     bool is_scoped = m->is_scoped();
 
 #ifdef ASSERT
@@ -60,36 +76,43 @@ static bool for_scoped_method(JavaThread* jt, const Func& func) {
 #endif
 
     if (is_scoped) {
-      assert(depth < max_critical_stack_depth, "can't have more than %d critical frames", max_critical_stack_depth);
-      return func(stream);
+      assert(!would_have_bailed, "would have missed scoped method on release build");
+      bool done = func(stream);
+      if (done || !agents_loaded) {
+        // We may also have to keep walking after finding a @Scoped method,
+        // since there may be multiple @Scoped methods active on the stack
+        // if a JVMTI agent callback runs during a scoped access and calls
+        // back into Java code that then itself does a scoped access.
+        return;
+      }
     }
-    depth++;
-
-#ifndef ASSERT
-    // On debug builds, just keep searching the stack
-    // in case we missed an @Scoped method further up
-    if (depth >= max_critical_stack_depth) {
-      break;
-    }
-#endif
   }
-  return false;
 }
 
 static bool is_accessing_session(JavaThread* jt, oop session, bool& in_scoped) {
-  return for_scoped_method(jt, [&](vframeStream& stream){
+  bool agents_loaded = JvmtiEnv::environments_might_exist();
+  if (!agents_loaded && jt->is_throwing_unsafe_access_error()) {
+    // Ignore this thread. It is in the process of throwing another exception
+    // already.
+    return false;
+  }
+
+  bool is_accessing_session = false;
+  for_scoped_methods(jt, agents_loaded, [&](vframeStream& stream){
     in_scoped = true;
     StackValueCollection* locals = stream.asJavaVFrame()->locals();
     for (int i = 0; i < locals->size(); i++) {
       StackValue* var = locals->at(i);
       if (var->type() == T_OBJECT) {
         if (var->get_obj() == session) {
+          is_accessing_session = true;
           return true;
         }
       }
     }
     return false;
   });
+  return is_accessing_session;
 }
 
 static frame get_last_frame(JavaThread* jt) {
diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp
index e9a00c2a3bc..f468f27e2c0 100644
--- a/src/hotspot/share/runtime/handshake.cpp
+++ b/src/hotspot/share/runtime/handshake.cpp
@@ -722,6 +722,8 @@ void HandshakeState::handle_unsafe_access_error() {
   MutexUnlocker ml(&_lock, Mutex::_no_safepoint_check_flag);
   // We may be at method entry which requires we save the do-not-unlock flag.
   UnlockFlagSaver fs(_handshakee);
+  // Tell code inspecting handshakee's stack what we are doing
+  ThrowingUnsafeAccessError tuae(_handshakee);
   Handle h_exception = Exceptions::new_exception(_handshakee, vmSymbols::java_lang_InternalError(), "a fault occurred in an unsafe memory access operation");
   if (h_exception()->is_a(vmClasses::InternalError_klass())) {
     java_lang_InternalError::set_during_unsafe_access(h_exception());
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 36544cf1118..b9b4237e7ee 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -444,6 +444,7 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _terminated(_not_terminated),
   _in_deopt_handler(0),
   _doing_unsafe_access(false),
+  _throwing_unsafe_access_error(false),
   _do_not_unlock_if_synchronized(false),
 #if INCLUDE_JVMTI
   _carrier_thread_suspended(false),
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index a6a00bfbd03..c0b25384fac 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -317,6 +317,7 @@ class JavaThread: public Thread {
   jint                  _in_deopt_handler;       // count of deoptimization
                                                  // handlers thread is in
   volatile bool         _doing_unsafe_access;    // Thread may fault due to unsafe access
+  volatile bool         _throwing_unsafe_access_error;   // Thread has faulted and is throwing an exception
   bool                  _do_not_unlock_if_synchronized;  // Do not unlock the receiver of a synchronized method (since it was
                                                          // never locked) when throwing an exception. Used by interpreter only.
 #if INCLUDE_JVMTI
@@ -622,6 +623,9 @@ private:
   bool doing_unsafe_access()                     { return _doing_unsafe_access; }
   void set_doing_unsafe_access(bool val)         { _doing_unsafe_access = val; }
 
+  bool is_throwing_unsafe_access_error()          { return _throwing_unsafe_access_error; }
+  void set_throwing_unsafe_access_error(bool val) { _throwing_unsafe_access_error = val; }
+
   bool do_not_unlock_if_synchronized()             { return _do_not_unlock_if_synchronized; }
   void set_do_not_unlock_if_synchronized(bool val) { _do_not_unlock_if_synchronized = val; }
 
@@ -1354,4 +1358,18 @@ class ThreadInClassInitializer : public StackObj {
   }
 };
 
+class ThrowingUnsafeAccessError : public StackObj {
+  JavaThread* _thread;
+  bool _prev;
+public:
+  ThrowingUnsafeAccessError(JavaThread* thread) :
+      _thread(thread),
+      _prev(thread->is_throwing_unsafe_access_error()) {
+    _thread->set_throwing_unsafe_access_error(true);
+  }
+  ~ThrowingUnsafeAccessError() {
+    _thread->set_throwing_unsafe_access_error(_prev);
+  }
+};
+
 #endif // SHARE_RUNTIME_JAVATHREAD_HPP
diff --git a/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java b/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java
new file mode 100644
index 00000000000..b59373b5b4e
--- /dev/null
+++ b/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8370344
+ * @requires os.family != "windows"
+ * @requires vm.flavor != "zero"
+ * @requires vm.hasJFR
+ * @summary Test closing a shared scope during faulting access
+ *
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main jdk.test.lib.FileInstaller sharedCloseJfr.jfc sharedCloseJfr.jfc
+ * @run main/othervm
+ *   -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *   -XX:StartFlightRecording:filename=recording.jfr,dumponexit=true,settings=sharedCloseJfr.jfc
+ *   TestSharedCloseJFR
+ */
+
+import jdk.test.whitebox.WhiteBox;
+
+import java.io.RandomAccessFile;
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+// We are interested in the following scenario:
+// When accessing a memory-mapped file that is truncated
+// a segmentation fault will occur (see also test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java)
+//
+// This segmentation fault will be caught in the VM's signal handler
+// and get turned into an InternalError by a VM handshake operation.
+// This handshake operation calls back into Java to the constructor
+// of InternalError. This constructor calls super constructors until
+// it ends up in the constructor of Throwable, where JFR starts logging
+// the Throwable being created. This logging code adds a bunch
+// of extra Java frames to the stack.
+//
+// All of this occurs during the original memory access, i.e.
+// while we are inside a @Scoped method call (jdk.internal.misc.ScopedMemoryAccess).
+// If at this point a shared arena is closed in another thread,
+// the shared scope closure handshake (src/hotspot/share/prims/scopedMemoryAccess.cpp)
+// will see all the extra frames added by JFR and the InternalError constructor,
+// while walking the stack of the thread doing the faulting access.
+//
+// This test is here to make sure that the shared scope closure handshake can
+// deal with that situation.
+public class TestSharedCloseJFR {
+
+    private static final int PAGE_SIZE = WhiteBox.getWhiteBox().getVMPageSize();
+
+    public static void main(String[] args) throws Throwable {
+        String fileName = "tmp.txt";
+        Path path = Path.of(fileName);
+        AtomicBoolean stop = new AtomicBoolean();
+
+        Files.write(path, "1".repeat(PAGE_SIZE + 1000).getBytes());
+        try (RandomAccessFile file = new RandomAccessFile(fileName, "rw")) {
+            FileChannel fileChannel = file.getChannel();
+            MemorySegment segment =
+                    fileChannel.map(FileChannel.MapMode.READ_WRITE, 0, fileChannel.size(), Arena.ofAuto());
+            // truncate file
+            // this will make the access fault
+            Files.write(path, "2".getBytes());
+
+            // start worker thread
+            CountDownLatch latch = new CountDownLatch(1);
+            Thread.ofPlatform().start(() -> {
+                latch.countDown();
+                while (!stop.get()) {
+                    Arena.ofShared().close(); // hammer VM with handshakes
+                }
+            });
+
+            // wait util the worker thread has started
+            latch.await();
+
+            // access (should fault)
+            // try it a few times until we get a handshake during JFR reporting
+            for (int i = 0; i < 50_000; i++) {
+                try {
+                    segment.get(ValueLayout.JAVA_INT, PAGE_SIZE);
+                    throw new RuntimeException("InternalError was expected");
+                } catch (InternalError e) {
+                    // InternalError as expected
+                    if (!e.getMessage().contains("a fault occurred in an unsafe memory access")) {
+                        throw new RuntimeException("Unexpected exception", e);
+                    }
+                }
+            }
+        } finally {
+            // stop worker
+            stop.set(true);
+        }
+    }
+}
diff --git a/test/jdk/java/foreign/sharedclosejfr/sharedCloseJfr.jfc b/test/jdk/java/foreign/sharedclosejfr/sharedCloseJfr.jfc
new file mode 100644
index 00000000000..13f3406a5de
--- /dev/null
+++ b/test/jdk/java/foreign/sharedclosejfr/sharedCloseJfr.jfc
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration label="Custom" version="2.0">
+  <event name="jdk.JavaErrorThrow">
+    <setting name="enabled" control="enable-errors">true</setting>
+    <setting name="stackTrace">true</setting>
+  </event>
+</configuration>
diff --git a/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java b/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
new file mode 100644
index 00000000000..b7106da24e8
--- /dev/null
+++ b/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8370344
+ * @library /test/lib
+ * @run junit/native TestSharedCloseJvmti
+ */
+
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import org.junit.jupiter.api.Test;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class TestSharedCloseJvmti {
+
+    private static final String JVMTI_AGENT_LIB = Path.of(Utils.TEST_NATIVE_PATH, System.mapLibraryName("SharedCloseAgent"))
+            .toAbsolutePath().toString();
+
+    @Test
+    void eventDuringScopedAccess() throws Throwable {
+        List<String> command = new ArrayList<>(List.of(
+                "-agentpath:" + JVMTI_AGENT_LIB,
+                "-Xcheck:jni",
+                EventDuringScopedAccessRunner.class.getName()
+        ));
+
+        try {
+            ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(command);
+            Process process = ProcessTools.startProcess("fork", pb, null, null, 1L, TimeUnit.MINUTES);
+            OutputAnalyzer output = new OutputAnalyzer(process);
+            output.shouldHaveExitValue(0);
+            output.stderrShouldContain("Exception in thread \"Trigger\" jdk.internal.misc.ScopedMemoryAccess$ScopedAccessError: Invalid memory access");
+        } catch (TimeoutException e) {
+            throw new RuntimeException("Timeout while waiting for forked process");
+        }
+    }
+
+    public static class EventDuringScopedAccessRunner {
+        static final int ADDED_FRAMES = 10;
+
+        static final CountDownLatch MAIN_LATCH = new CountDownLatch(1);
+        static final CountDownLatch TARGET_LATCH = new CountDownLatch(1);
+        static final MemorySegment OTHER_SEGMENT = Arena.global().allocate(4);
+
+        static volatile int SINK;
+
+        public static void main(String[] args) throws Throwable {
+            try (Arena arena = Arena.ofShared()) {
+                MemorySegment segment = arena.allocate(4);
+                // run in separate thread so that waiting on
+                // latch doesn't block main thread
+                Thread.ofPlatform().name("Trigger").start(() -> {
+                    SINK = segment.get(ValueLayout.JAVA_INT, 0);
+                });
+                // wait until trigger thread is in JVMTI event callback
+                MAIN_LATCH.await();
+            }
+            // Notify trigger thread that arena was closed
+            TARGET_LATCH.countDown();
+        }
+
+        static boolean reentrant = false;
+
+        // called by jvmti agent
+        // we get here after checking arena liveness
+        private static void target() {
+            String callerName = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).walk(frames ->
+                    frames.skip(2).findFirst().orElseThrow().getClassName());
+            if (!callerName.equals("jdk.internal.misc.ScopedMemoryAccess")) {
+                return;
+            }
+
+            if (reentrant) {
+                // put some frames on the stack, so stack walk does not see @Scoped method
+                addFrames(0);
+            } else {
+                reentrant = true;
+                SINK = OTHER_SEGMENT.get(ValueLayout.JAVA_INT, 0);
+                reentrant = false;
+            }
+        }
+
+        private static void addFrames(int depth) {
+            if (depth >= ADDED_FRAMES) {
+                // notify main thread to close the arena
+                MAIN_LATCH.countDown();
+                try {
+                    // wait here until main thread has closed arena
+                    TARGET_LATCH.await();
+                } catch (InterruptedException ex) {
+                    throw new RuntimeException("Unexpected interruption");
+                }
+                return;
+            }
+            addFrames(depth + 1);
+        }
+    }
+}
diff --git a/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp b/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
new file mode 100644
index 00000000000..6406c46f61c
--- /dev/null
+++ b/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jvmti.h>
+
+#include <string.h>
+
+static jclass MAIN_CLS;
+static jmethodID TARGET_ID;
+
+static const char* TARGET_CLASS_NAME = "TestSharedCloseJvmti$EventDuringScopedAccessRunner";
+static const char* TARGET_METHOD_NAME = "target";
+static const char* TARGET_METHOD_SIG = "()V";
+
+static const char* INTERCEPT_CLASS_NAME = "Ljdk/internal/foreign/MemorySessionImpl;";
+static const char* INTERCEPT_METHOD_NAME = "checkValidStateRaw";
+
+void start(jvmtiEnv *jvmti_env, JNIEnv* jni_env) {
+
+  jclass cls = jni_env->FindClass(TARGET_CLASS_NAME);
+  if (cls == nullptr) {
+    jni_env->ExceptionDescribe();
+    return;
+  }
+
+  MAIN_CLS = (jclass) jni_env->NewGlobalRef(cls);
+
+  TARGET_ID = jni_env->GetStaticMethodID(cls, TARGET_METHOD_NAME, TARGET_METHOD_SIG);
+  if (TARGET_ID == nullptr) {
+    jni_env->ExceptionDescribe();
+    return;
+  }
+}
+
+void method_exit(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, jmethodID method,
+                 jboolean was_popped_by_exception, jvalue return_value) {
+  char* method_name = nullptr;
+  jvmtiError err = jvmti_env->GetMethodName(method, &method_name, nullptr, nullptr);
+  if (err != JVMTI_ERROR_NONE) {
+    return;
+  }
+
+  if (strcmp(method_name, INTERCEPT_METHOD_NAME) != 0) {
+    jvmti_env->Deallocate((unsigned char*) method_name);
+    return;
+  }
+
+  jclass cls;
+  err = jvmti_env->GetMethodDeclaringClass(method, &cls);
+  if (err != JVMTI_ERROR_NONE) {
+    jvmti_env->Deallocate((unsigned char*) method_name);
+    return;
+  }
+
+  char* class_sig = nullptr;
+  err = jvmti_env->GetClassSignature(cls, &class_sig, nullptr);
+  if (err != JVMTI_ERROR_NONE) {
+    jvmti_env->Deallocate((unsigned char*) method_name);
+    return;
+  }
+
+  if (strcmp(class_sig, INTERCEPT_CLASS_NAME) != 0) {
+    jvmti_env->Deallocate((unsigned char*) method_name);
+    jvmti_env->Deallocate((unsigned char*) class_sig);
+    return;
+  }
+
+  jni_env->CallStaticVoidMethod(MAIN_CLS, TARGET_ID);
+  if (jni_env->ExceptionOccurred()) {
+    jni_env->ExceptionDescribe();
+  }
+
+  jvmti_env->Deallocate((unsigned char*) method_name);
+  jvmti_env->Deallocate((unsigned char*) class_sig);
+}
+
+JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
+  jvmtiEnv* env;
+  jint jni_err = vm->GetEnv((void**) &env, JVMTI_VERSION);
+  if (jni_err != JNI_OK) {
+    return jni_err;
+  }
+
+  jvmtiCapabilities capabilities{};
+  capabilities.can_generate_method_exit_events = 1;
+
+  jvmtiError err = env->AddCapabilities(&capabilities);
+  if (err != JVMTI_ERROR_NONE) {
+    return err;
+  }
+
+  jvmtiEventCallbacks callbacks;
+  callbacks.VMStart = start;
+  callbacks.MethodExit = method_exit;
+
+  err = env->SetEventCallbacks(&callbacks, (jint) sizeof(callbacks));
+  if (err != JVMTI_ERROR_NONE) {
+    return err;
+  }
+
+  err = env->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, nullptr);
+  if (err != JVMTI_ERROR_NONE) {
+    return err;
+  }
+
+  err = env->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_START, nullptr);
+  if (err != JVMTI_ERROR_NONE) {
+    return err;
+  }
+
+  return 0;
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SharedCloseStackWalk.java b/test/micro/org/openjdk/bench/java/lang/foreign/SharedCloseStackWalk.java
new file mode 100644
index 00000000000..ead4bcb5089
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SharedCloseStackWalk.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.foreign;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.lang.foreign.Arena;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 10, time = 10, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Benchmark)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@Fork(value = 1, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+public class SharedCloseStackWalk {
+
+    @Param({"1", "10", "100"})
+    int numOtherThread;
+
+    @Param({"10", "100", "1000"})
+    int extraFrames;
+
+    @Param({"false", "true"})
+    boolean virtualThreads;
+
+    private CountDownLatch stop;
+
+    @Setup
+    public void setup() {
+        stop = new CountDownLatch(1);
+        for (int i = 0; i < numOtherThread; i++) {
+            (virtualThreads
+                    ? Thread.ofVirtual()
+                    : Thread.ofPlatform()).start(() -> recurse(0));
+        }
+    }
+
+    @TearDown
+    public void teardown() {
+        stop.countDown();
+    }
+
+    @Benchmark
+    public void sharedOpenClose() {
+        Arena.ofShared().close();
+    }
+
+    private void recurse(int depth) {
+        if (depth == extraFrames) {
+            try {
+                stop.await();
+            } catch (InterruptedException e) {
+                throw new RuntimeException("Don't interrupt me!", e);
+            }
+        } else {
+            recurse(depth + 1);
+        }
+    }
+}

From 7d3c66f379fcb24d4505c2c12e20b24dce313e56 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 4 Nov 2025 15:58:19 +0000
Subject: [PATCH 016/512] 8371114: Problemlist
 vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java

Reviewed-by: amenkov, syan, sspitsyn
---
 test/hotspot/jtreg/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 3dac8821165..2065737c2a1 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -167,6 +167,7 @@ vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
 
 vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
 vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/TestDescription.java 8288911 macosx-all
+vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java 8371103 generic-all
 
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java 8208259 generic-all

From 2f455ed146ff2e56da4532e9430e4c85ca9497ad Mon Sep 17 00:00:00 2001
From: Peyang <peyang@peya.tokyo>
Date: Tue, 4 Nov 2025 16:08:15 +0000
Subject: [PATCH 017/512] 8371092: NullPointerException in
 AltServiceUsageTest.afterClass() test

Reviewed-by: dfuchs
---
 .../java/net/httpclient/AltServiceUsageTest.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/net/httpclient/AltServiceUsageTest.java b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
index 8b9193432f0..673357a59aa 100644
--- a/test/jdk/java/net/httpclient/AltServiceUsageTest.java
+++ b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
@@ -123,7 +123,7 @@ public class AltServiceUsageTest implements HttpServerAdapters {
     public void afterClass() throws Exception {
         safeStop(originServer);
         safeStop(altServer);
-        udpNotResponding.close();
+        safeClose(udpNotResponding);
     }
 
     private static void safeStop(final HttpTestServer server) {
@@ -140,6 +140,19 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         }
     }
 
+    private static void safeClose(final DatagramChannel channel) {
+        if (channel == null) {
+            return;
+        }
+        try {
+            System.out.println("Closing DatagramChannel " + channel.getLocalAddress());
+            channel.close();
+        } catch (Exception e) {
+            System.err.println("Ignoring exception: " + e.getMessage() + " that occurred " +
+                    "during close of DatagramChannel: " + channel);
+        }
+    }
+
     private static class H3AltServicePublisher implements HttpTestHandler {
         private static final String RESPONSE_CONTENT = "apple";
 

From 4c6af03f81e068a98b8f4628b96682a54f3946da Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Tue, 4 Nov 2025 16:47:33 +0000
Subject: [PATCH 018/512] 8337142: StackOverflowError in
 Types.containsTypeRecursive with deeply nested type hierarchy

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Types.java       | 44 +++++++++++--
 .../types/SOEForDeeplyNestedTypeTest.java     | 64 +++++++++++++++++++
 2 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/types/SOEForDeeplyNestedTypeTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 98ad65fdc05..ffd304c18a2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -1346,7 +1346,7 @@ public class Types {
          * Type-equality relation - type variables are considered
          * equals if they share the same object identity.
          */
-        TypeRelation isSameTypeVisitor = new TypeRelation() {
+        abstract class TypeEqualityVisitor extends TypeRelation {
 
             public Boolean visitType(Type t, Type s) {
                 if (t.equalsIgnoreMetadata(s))
@@ -1385,10 +1385,12 @@ public class Types {
                 } else {
                     WildcardType t2 = (WildcardType)s;
                     return (t.kind == t2.kind || (t.isExtendsBound() && s.isExtendsBound())) &&
-                            isSameType(t.type, t2.type);
+                            sameTypeComparator(t.type, t2.type);
                 }
             }
 
+            abstract boolean sameTypeComparator(Type t, Type s);
+
             @Override
             public Boolean visitClassType(ClassType t, Type s) {
                 if (t == s)
@@ -1419,9 +1421,11 @@ public class Types {
                 }
                 return t.tsym == s.tsym
                     && visit(t.getEnclosingType(), s.getEnclosingType())
-                    && containsTypeEquivalent(t.getTypeArguments(), s.getTypeArguments());
+                    && sameTypeArguments(t.getTypeArguments(), s.getTypeArguments());
             }
 
+            abstract boolean sameTypeArguments(List<Type> ts, List<Type> ss);
+
             @Override
             public Boolean visitArrayType(ArrayType t, Type s) {
                 if (t == s)
@@ -1477,6 +1481,16 @@ public class Types {
             public Boolean visitErrorType(ErrorType t, Type s) {
                 return true;
             }
+        }
+
+        TypeEqualityVisitor isSameTypeVisitor = new TypeEqualityVisitor() {
+            boolean sameTypeComparator(Type t, Type s) {
+                return isSameType(t, s);
+            }
+
+            boolean sameTypeArguments(List<Type> ts, List<Type> ss) {
+                return containsTypeEquivalent(ts, ss);
+            }
         };
 
     // </editor-fold>
@@ -3862,7 +3876,7 @@ public class Types {
     // where
         class TypePair {
             final Type t1;
-            final Type t2;;
+            final Type t2;
 
             TypePair(Type t1, Type t2) {
                 this.t1 = t1;
@@ -3875,10 +3889,28 @@ public class Types {
             @Override
             public boolean equals(Object obj) {
                 return (obj instanceof TypePair typePair)
-                        && isSameType(t1, typePair.t1)
-                        && isSameType(t2, typePair.t2);
+                        && exactTypeVisitor.visit(t1, typePair.t1)
+                        && exactTypeVisitor.visit(t2, typePair.t2);
             }
         }
+
+        TypeEqualityVisitor exactTypeVisitor = new TypeEqualityVisitor() {
+            @Override
+            boolean sameTypeArguments(List<Type> ts, List<Type> ss) {
+                while (ts.nonEmpty() && ss.nonEmpty()
+                        && sameTypeComparator(ts.head, ss.head)) {
+                    ts = ts.tail;
+                    ss = ss.tail;
+                }
+                return ts.isEmpty() && ss.isEmpty();
+            }
+
+            @Override
+            boolean sameTypeComparator(Type t, Type s) {
+                return exactTypeVisitor.visit(t, s);
+            }
+        };
+
         Set<TypePair> mergeCache = new HashSet<>();
         private Type merge(Type c1, Type c2) {
             ClassType class1 = (ClassType) c1;
diff --git a/test/langtools/tools/javac/types/SOEForDeeplyNestedTypeTest.java b/test/langtools/tools/javac/types/SOEForDeeplyNestedTypeTest.java
new file mode 100644
index 00000000000..ad268ddef24
--- /dev/null
+++ b/test/langtools/tools/javac/types/SOEForDeeplyNestedTypeTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8337142
+ * @summary StackOverflowError in Types.containsTypeRecursive with deeply nested type hierarchy
+ * @compile SOEForDeeplyNestedTypeTest.java
+ */
+
+import java.util.List;
+
+public class SOEForDeeplyNestedTypeTest {
+    class T {
+        List<M<?, ?>> xs = List.of(new M<>(One.class), new M<>(Two.class), new M<>(Two.class));
+    }
+
+    class M<R extends Eight, I extends Nine<? extends R>> {
+        M(Class<? extends I> c) {}
+    }
+
+    class One implements Three<Five>, Six<One> {}
+    class Two implements Four<Seven>, Six<Two> {}
+    interface Three<R extends Eight> extends Nine<R> {}
+    interface Four<R extends Eight> extends Nine<R> {}
+    class Five extends Ten<Five> implements Eleven<Twelve>, Thirteen {}
+    interface Six<FullKeyT extends TwentyTwo> extends TwentyTwo {}
+    class Seven extends Ten<Seven> implements Eleven<Fourteen>, Thirteen {}
+    interface Eight {}
+    interface Nine<R extends Eight> extends TwentyTwo {}
+    class Ten<K extends TwentyTwo> implements TwentyTwo {}
+    interface Eleven<PkT extends Twenty> extends Twenty {}
+    class Twelve extends Ten<Twelve> implements Eleven<Sixteen>, Thirteen {}
+    interface Thirteen extends Seventeen {}
+    class Fourteen extends Ten<Fourteen> implements Eleven<Fifteen>, Thirteen {}
+    class Fifteen extends Ten<Fifteen> implements Eleven<Twelve>, Thirteen {}
+    class Sixteen extends Nineteen<Sixteen> implements Eighteen, Thirteen {}
+    interface Seventeen extends Twenty {}
+    interface Eighteen extends Twenty {}
+    class Nineteen<K extends Twenty> extends Ten<K> implements Twenty {}
+    interface Twenty extends TwentyTwo {}
+    class TwentyOne<R extends Eight> {}
+    interface TwentyTwo extends Eight {}
+}

From 8224292ba57f3d6f79c1a3515348824d92ef45fe Mon Sep 17 00:00:00 2001
From: Koushik Thirupattur <koushik.thirupattur@oracle.com>
Date: Tue, 4 Nov 2025 18:42:52 +0000
Subject: [PATCH 019/512] 8365069: Refactor tests to use PEM API (Phase 1)

Reviewed-by: ascarpino
---
 .../KeyStore/PKCS12/WriteP12Test.java         |  29 ++---
 .../security/KeyStore/TestKeyStoreBasic.java  |  83 ++++++-------
 .../selfIssued/DisableRevocation.java         |  66 ++++-------
 .../selfIssued/KeyUsageMatters.java           |  86 +++++---------
 .../CertPathValidator/OCSP/FailoverToCRL.java |  30 ++---
 .../indirectCRL/CircularCRLOneLevel.java      |  42 +++----
 .../CircularCRLOneLevelRevoked.java           |  43 +++----
 .../NameConstraintsWithRID.java               |  28 ++---
 .../NameConstraintsWithUnexpectedRID.java     |  25 ++--
 .../NameConstraintsWithoutRID.java            |  28 ++---
 .../trustAnchor/ValWithAnchorByName.java      |  18 ++-
 test/jdk/javax/net/ssl/TLSCommon/TLSTest.java | 110 +++++++++++-------
 .../DisabledAlgorithms/CPBuilder.java         |  41 +++----
 .../DisabledAlgorithms/CPBuilderWithMD5.java  |  37 +++---
 .../CPValidatorEndEntity.java                 |  32 +++--
 .../CPValidatorIntermediate.java              |  29 ++---
 .../X509TrustManagerImpl/PKIXExtendedTM.java  |  17 ++-
 .../SunX509ExtendedTM.java                    |  18 ++-
 18 files changed, 322 insertions(+), 440 deletions(-)

diff --git a/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java
index f4024090f2f..96bbbbcde13 100644
--- a/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java
+++ b/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.Key;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.UnrecoverableKeyException;
+import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
@@ -50,6 +45,7 @@ import java.util.Enumeration;
  * @summary Write different types p12 key store to Check the write related
  *  APIs.
  * @run main WriteP12Test
+ * @enablePreview
  */
 
 public class WriteP12Test {
@@ -128,19 +124,16 @@ public class WriteP12Test {
     private final Certificate testLeadCert;
     private final Certificate caCert;
 
-    WriteP12Test() throws CertificateException {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        caCert = cf.generateCertificate(new ByteArrayInputStream(CA_CERT_STR
-                .getBytes()));
-        testLeadCert = cf.generateCertificate(new ByteArrayInputStream(
-                LEAD_CERT.getBytes()));
-        testerCert = cf.generateCertificate(new ByteArrayInputStream(END_CERT
-                .getBytes()));
+    WriteP12Test() {
+        PEMDecoder pemDecoder = PEMDecoder.of();
+        caCert = pemDecoder.decode(CA_CERT_STR, X509Certificate.class);
+        testLeadCert = pemDecoder.decode(LEAD_CERT, X509Certificate.class);
+        testerCert = pemDecoder.decode(END_CERT, X509Certificate.class);
     }
 
-    public static void main(String[] args) throws CertificateException,
-            UnrecoverableKeyException, KeyStoreException,
-            NoSuchProviderException, NoSuchAlgorithmException, IOException {
+    public static void main(String[] args) throws UnrecoverableKeyException,
+            KeyStoreException, NoSuchProviderException,
+            NoSuchAlgorithmException, IOException {
         WriteP12Test jstest = new WriteP12Test();
         out.println("test WriteP12CertChain");
         /*
diff --git a/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java b/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java
index 1a31d51c418..8218c9cb48a 100644
--- a/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java
+++ b/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,54 +21,48 @@
  * questions.
  */
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyFactory;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.UnrecoverableKeyException;
+import java.security.*;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Base64;
+import java.security.cert.X509Certificate;
 
 /*
  * @test
  * @bug 8048621 8133090 8167371 8236671
+ * @enablePreview
  * @summary Test basic operations with keystores (jks, jceks, pkcs12)
  * @author Yu-Ching Valerie PENG
  */
 public class TestKeyStoreBasic {
 
-    private static final String PRIVATE_KEY_PKCS8_BASE64 = ""
-        + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpyz97liuWPDYcLH9TX8BiT78o"
-        + "lCmAfmevvch6ncXUVuCzbdaKuKXwn4EVbDszsVJLoK5zdtP+X3iDhutj+IgKmLhuczF3M9VIcWr+"
-        + "JJUyTH4+3h/RT8cjCDZOmk9iXkb5ifruVsLqzb9g+Vp140Oz7leikne7KmclHvTfvFd0WDI7Gb9v"
-        + "o4f5rT717BXJ/n+M6pNk8DLpLiEu6eziYvXRv5x+t5Go3x0eCXdaxEQUf2j876Wfr2qHRJK7lDfF"
-        + "e1DDsMg/KpKGiILYZ+g2qtVMZSxtp5BZEtfB5qV/IE5kWO+mCIAGpXSZIdbERR6pZUq8GLEe1T9e"
-        + "+sO6H24w2F19AgMBAAECggEBAId/12187dO6wUPCjumuJA1QrrBnbKdKONyai36uoc1Od4s5QFj7"
-        + "+hEIeS7rbGNYQuBvnkgusAbzkW0FIpxpHce3EJez/emux6pEOKoP77BwMt9gy+txyu0+BHi91FQg"
-        + "AGvrnQDO5EYVY4Cz/WjOsJzKu8zVLg+DS0Toa2qRFwmUe9mVAXPNOCZ3Oae/Q6tCDsaINNw0fmjj"
-        + "jn6uohPbS+n6xENG3FkQXB36getXy310xTGED2J27cmAQH6gLR6Kl2iROzNPbbpBqbuemI9kbcld"
-        + "EwBS1jRfZWeaPstYA1niVrE9UgUBzemnoh4TDkG076sYthHMr5QFGjPswnwtJ4ECgYEA0sURQ5+v"
-        + "baH4tdaemI3qpnknXTlzSpuZZmAoyvY0Id0mlduwKwmZ3Y5989wHfnnhFfyNO4IkTKjI2Wp97qP5"
-        + "4eqUNpA7FtNU7KUzMcFDTtwtNZuRYMrKlqo2lLbA+gVrAYpYZFL4b7tcwtX4DnYorDsmude6W8sG"
-        + "4Mx2VdFJC9UCgYEAzjsdXCYH5doWUHb0dvn9ID7IikffEMRM720MRjrnnnVbpzx6ACntkPDNZg7p"
-        + "TRE/mx7iBz81ZaUWE+V0wd0JvCHEdpAz3mksyvDFhU4Bgs6xzf2pSul5muhsx3hHcvvPezz5Bnxs"
-        + "faJlzkxfwotyGmvWN15GA/pyfsZjsbbTpwkCgYAO6NnbysQCIV8SnegCKqfatt9N/O5m7LLhRxQb"
-        + "p2bwrlA4cZ34rWkw/w9x3LK7A6wkfgUPnJkswxPSLXJTG05l6M4rPfCwIKr1Qopojp9QSMr569NQ"
-        + "4YeLOOc7heIIzbFQHpU6I5Rncv2Q2sn9W+ZsqJKIuvX34FjQNiZ406EzMQKBgHSxOGS61D84DuZK"
-        + "2Ps1awhC3kB4eHzJRms3vflDPWoJJ+pSKwpKrzUTPHXiPBqyhtYkPGszVeiE6CAr9sv3YZnFVaBs"
-        + "6hyQUJsob+uE/w/gGvXe8VsFDx0bJOodYfhrCbTHBHWqE81nBcocpxayxsayfAzqWB3KKd0YLrMR"
-        + "K2PZAoGAcZa8915R2m0KZ6HVJUt/JDR85jCbN71kcVDFY2XSFkOJvOdFoHNfRckfLzjq9Y2MSSTV"
-        + "+QDWbDo2doUQCejJUTaN8nP79tfyir24X5uVPvQaeVoGTKYb+LfUqK0F60lStmjuddIGSZH55y3v"
-        + "+9XjmxbVERtd1lqgQg3VlmKlEXY=";
+    private static final String PRIVATE_KEY_PKCS8_BASE64 = """
+        -----BEGIN PRIVATE KEY-----
+        MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpyz97liuWPDYcLH9TX8BiT78o
+        lCmAfmevvch6ncXUVuCzbdaKuKXwn4EVbDszsVJLoK5zdtP+X3iDhutj+IgKmLhuczF3M9VIcWr+
+        JJUyTH4+3h/RT8cjCDZOmk9iXkb5ifruVsLqzb9g+Vp140Oz7leikne7KmclHvTfvFd0WDI7Gb9v
+        o4f5rT717BXJ/n+M6pNk8DLpLiEu6eziYvXRv5x+t5Go3x0eCXdaxEQUf2j876Wfr2qHRJK7lDfF
+        e1DDsMg/KpKGiILYZ+g2qtVMZSxtp5BZEtfB5qV/IE5kWO+mCIAGpXSZIdbERR6pZUq8GLEe1T9e
+        +sO6H24w2F19AgMBAAECggEBAId/12187dO6wUPCjumuJA1QrrBnbKdKONyai36uoc1Od4s5QFj7
+        +hEIeS7rbGNYQuBvnkgusAbzkW0FIpxpHce3EJez/emux6pEOKoP77BwMt9gy+txyu0+BHi91FQg
+        AGvrnQDO5EYVY4Cz/WjOsJzKu8zVLg+DS0Toa2qRFwmUe9mVAXPNOCZ3Oae/Q6tCDsaINNw0fmjj
+        jn6uohPbS+n6xENG3FkQXB36getXy310xTGED2J27cmAQH6gLR6Kl2iROzNPbbpBqbuemI9kbcld
+        EwBS1jRfZWeaPstYA1niVrE9UgUBzemnoh4TDkG076sYthHMr5QFGjPswnwtJ4ECgYEA0sURQ5+v
+        baH4tdaemI3qpnknXTlzSpuZZmAoyvY0Id0mlduwKwmZ3Y5989wHfnnhFfyNO4IkTKjI2Wp97qP5
+        4eqUNpA7FtNU7KUzMcFDTtwtNZuRYMrKlqo2lLbA+gVrAYpYZFL4b7tcwtX4DnYorDsmude6W8sG
+        4Mx2VdFJC9UCgYEAzjsdXCYH5doWUHb0dvn9ID7IikffEMRM720MRjrnnnVbpzx6ACntkPDNZg7p
+        TRE/mx7iBz81ZaUWE+V0wd0JvCHEdpAz3mksyvDFhU4Bgs6xzf2pSul5muhsx3hHcvvPezz5Bnxs
+        faJlzkxfwotyGmvWN15GA/pyfsZjsbbTpwkCgYAO6NnbysQCIV8SnegCKqfatt9N/O5m7LLhRxQb
+        p2bwrlC4cZ34rWkw/w9x3LK7A6wkfgUPnJkswxPSLXJTG05l6M4rPfCwIKr1Qopojp9QSMr569NQ
+        4YeLOOc7heIIzbFQHpU6I5Rncv2Q2sn9W+ZsqJKIuvX34FjQNiZ406EzMQKBgHSxOGS61D84DuZK
+        2Ps1awhC3kB4eHzJRms3vflDPWoJJ+pSKwpKrzUTPHXiPBqyhtYkPGszVeiE6CAr9sv3YZnFVaBs
+        6hyQUJsob+uE/w/gGvXe8VsFDx0bJOodYfhrCbTHBHWqE81nBcocpxayxsayfAzqWB3KKd0YLrMR
+        K2PZAoGAcZa8915R2m0KZ6HVJUt/JDR85jCbN71kcVDFY2XSFkOJvOdFoHNfRckfLzjq9Y2MSSTV
+        +QDWbDo2doUQCejJUTaN8nP79tfyir24X5uVPvQaeVoGTKYb+LfUqK0F60lStmjuddIGSZH55y3v
+        +9XjmxbVERtd1lqgQg3VlmKlEXY=
+        -----END PRIVATE KEY-----
+        """;
 
     /*
      * Certificate:
@@ -132,20 +126,9 @@ public class TestKeyStoreBasic {
 
     public void runTest(String provider) throws Exception {
 
-        // load private key
-        // all keystore types should support private keys
-        KeySpec spec = new PKCS8EncodedKeySpec(
-                Base64.getMimeDecoder().decode(PRIVATE_KEY_PKCS8_BASE64));
-        PrivateKey privateKey = KeyFactory.getInstance("RSA")
-                .generatePrivate(spec);
-
-        // load x509 certificate
-        Certificate cert;
-        try (InputStream is = new BufferedInputStream(
-                new ByteArrayInputStream(CERTIFICATE.getBytes()))) {
-            cert = CertificateFactory.getInstance("X.509")
-                    .generateCertificate(is);
-        }
+        PEMDecoder pemDecoder = PEMDecoder.of();
+        PrivateKey privateKey = pemDecoder.decode(PRIVATE_KEY_PKCS8_BASE64, PrivateKey.class);
+        Certificate cert = pemDecoder.decode(CERTIFICATE, X509Certificate.class);
 
         int numEntries = 5;
         String type = null;
diff --git a/test/jdk/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java
index b72550e4c5d..23a0b11d93c 100644
--- a/test/jdk/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java
+++ b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,11 +36,14 @@
  * @run main/othervm DisableRevocation subca
  * @run main/othervm DisableRevocation subci
  * @run main/othervm DisableRevocation alice
+ * @enablePreview
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -143,49 +146,29 @@ public final class DisableRevocation {
         "G93Dcf0U1JRO77juc61Br5paAy8Bok18Y/MeG7uKgB2MAEJYKhGKbCrfMw==\n" +
         "-----END CERTIFICATE-----";
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        X509Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
 
     private static CertStore generateCertificateStore() throws Exception {
-        Collection entries = new HashSet();
+        Collection<DEREncodable> entries = new HashSet<>();
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is;
-
-        is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(subCaCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(topCrlIssuerCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
+        entries.add(PEM_DECODER.decode(targetCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(subCaCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(topCrlIssuerCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(subCrlIssuerCertStr, X509Certificate.class));
 
         return CertStore.getInstance("Collection",
                             new CollectionCertStoreParameters(entries));
@@ -198,15 +181,16 @@ public final class DisableRevocation {
         // generate certificate from certificate string
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         ByteArrayInputStream is = null;
+        String cert;
         if (name.equals("subca")) {
-            is = new ByteArrayInputStream(subCaCertStr.getBytes());
+            cert = subCaCertStr;
         } else if (name.equals("subci")) {
-            is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+            cert = subCrlIssuerCertStr;
         } else {
-            is = new ByteArrayInputStream(targetCertStr.getBytes());
+            cert = targetCertStr;
         }
 
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(cert, X509Certificate.class);
         byte[] extVal = target.getExtensionValue("2.5.29.14");
         if (extVal != null) {
             DerInputStream in = new DerInputStream(extVal);
@@ -222,19 +206,17 @@ public final class DisableRevocation {
 
     private static boolean match(String name, Certificate cert)
                 throws Exception {
-        X509CertSelector selector = new X509CertSelector();
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = null;
+        String newCert;
         if (name.equals("subca")) {
-            is = new ByteArrayInputStream(subCaCertStr.getBytes());
+            newCert = subCaCertStr;
         } else if (name.equals("subci")) {
-            is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+            newCert = subCrlIssuerCertStr;
         } else {
-            is = new ByteArrayInputStream(targetCertStr.getBytes());
+            newCert = targetCertStr;
         }
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(newCert, X509Certificate.class);
 
         return target.equals(cert);
     }
diff --git a/test/jdk/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java
index ec238cb40c9..1343aefa7f3 100644
--- a/test/jdk/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java
+++ b/test/jdk/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
  * @bug 6852744 8133489
  * @summary PIT b61: PKI test suite fails because self signed certificates
  *          are being rejected
+ * @enablePreview
  * @modules java.base/sun.security.util
  * @run main/othervm -Djava.security.debug=certpath KeyUsageMatters subca
  * @run main/othervm -Djava.security.debug=certpath KeyUsageMatters subci
@@ -41,6 +42,8 @@
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -66,6 +69,8 @@ import sun.security.util.DerInputStream;
  */
 public final class KeyUsageMatters {
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     // the trust anchor
     static String selfSignedCertStr =
         "-----BEGIN CERTIFICATE-----\n" +
@@ -179,57 +184,30 @@ public final class KeyUsageMatters {
 
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        // generate certificate from cert string
+        X509Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
 
     private static CertStore generateCertificateStore() throws Exception {
-        Collection entries = new HashSet();
+        Collection<DEREncodable> entries = new HashSet<>();
 
-        // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is;
-
-        is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(subCaCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(topCrlIssuerCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
-        cert = cf.generateCertificate(is);
-        entries.add(cert);
-
-        // generate CRL from CRL string
-        is = new ByteArrayInputStream(topCrlStr.getBytes());
-        Collection mixes = cf.generateCRLs(is);
-        entries.addAll(mixes);
-
-        is = new ByteArrayInputStream(subCrlStr.getBytes());
-        mixes = cf.generateCRLs(is);
-        entries.addAll(mixes);
+        // Decode and add certificates
+        entries.add(PEM_DECODER.decode(targetCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(subCaCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(topCrlIssuerCertStr, X509Certificate.class));
+        entries.add(PEM_DECODER.decode(subCrlIssuerCertStr, X509Certificate.class));
 
+        // Decode and add CRLs
+        entries.add(PEM_DECODER.decode(topCrlStr, X509CRL.class));
+        entries.add(PEM_DECODER.decode(subCrlStr, X509CRL.class));
         return CertStore.getInstance("Collection",
                             new CollectionCertStoreParameters(entries));
     }
@@ -239,17 +217,16 @@ public final class KeyUsageMatters {
         X509CertSelector selector = new X509CertSelector();
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = null;
+        String cert;
         if (name.equals("subca")) {
-            is = new ByteArrayInputStream(subCaCertStr.getBytes());
+            cert = subCaCertStr;
         } else if (name.equals("subci")) {
-            is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+            cert = subCrlIssuerCertStr;
         } else {
-            is = new ByteArrayInputStream(targetCertStr.getBytes());
+            cert = targetCertStr;
         }
 
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(cert, X509Certificate.class);
         byte[] extVal = target.getExtensionValue("2.5.29.14");
         if (extVal != null) {
             DerInputStream in = new DerInputStream(extVal);
@@ -263,21 +240,18 @@ public final class KeyUsageMatters {
         return selector;
     }
 
-    private static boolean match(String name, Certificate cert)
-                throws Exception {
-        X509CertSelector selector = new X509CertSelector();
+    private static boolean match(String name, Certificate cert) {
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = null;
+       String newCert;
         if (name.equals("subca")) {
-            is = new ByteArrayInputStream(subCaCertStr.getBytes());
+            newCert = subCaCertStr;
         } else if (name.equals("subci")) {
-            is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+            newCert = subCrlIssuerCertStr;
         } else {
-            is = new ByteArrayInputStream(targetCertStr.getBytes());
+            newCert = targetCertStr;
         }
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(newCert, X509Certificate.class);
 
         return target.equals(cert);
     }
diff --git a/test/jdk/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java b/test/jdk/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java
index d1e4e8c6a29..2232ae06711 100644
--- a/test/jdk/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java
+++ b/test/jdk/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
  * @bug 6383095
  * @summary CRL revoked certificate failures masked by OCSP failures
  * @run main/othervm FailoverToCRL
+ * @enablePreview
  * @author Xuelei Fan
  */
 
@@ -136,11 +137,14 @@
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.cert.CertPathValidatorException.BasicReason;
+import java.util.Collections;
 
 public class FailoverToCRL {
 
@@ -193,32 +197,29 @@ public class FailoverToCRL {
         "-----END X509 CRL-----";
 
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     private static CertPath generateCertificatePath()
-            throws CertificateException {
+            throws CertificateException, IOException {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
         ByteArrayInputStream is =
                 new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate targetCert = cf.generateCertificate(is);
 
         // generate certification path
-        List<Certificate> list = Arrays.asList(new Certificate[] {targetCert});
+        List<Certificate> list = Collections.singletonList(PEM_DECODER.decode
+                (is, X509Certificate.class));
 
         return cf.generateCertPath(list);
     }
 
-    private static Set<TrustAnchor> generateTrustAnchors()
-            throws CertificateException {
+    private static Set<TrustAnchor> generateTrustAnchors() {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
+        X509Certificate trustedCert = PEM_DECODER.decode(trusedCertStr, X509Certificate.class);
 
         // generate a trust anchor
-        TrustAnchor anchor = new TrustAnchor((X509Certificate)trusedCert, null);
+        TrustAnchor anchor = new TrustAnchor(trustedCert, null);
 
         return Collections.singleton(anchor);
     }
@@ -231,7 +232,10 @@ public class FailoverToCRL {
                     new ByteArrayInputStream(crlStr.getBytes());
 
         // generate a cert store
-        Collection<? extends CRL> crls = cf.generateCRLs(is);
+        Collection<DEREncodable> crls = new HashSet<>();
+
+        crls.add(PEM_DECODER.decode(crlStr, X509CRL.class));
+
         return CertStore.getInstance("Collection",
                             new CollectionCertStoreParameters(crls));
     }
diff --git a/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java
index 9a21ae2de0d..947f0e0b485 100644
--- a/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java
+++ b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,11 +33,14 @@
  * @bug 6720721
  * @summary CRL check with circular depency support needed
  * @run main/othervm CircularCRLOneLevel
+ * @enablePreview
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -107,22 +110,19 @@ public class CircularCRLOneLevel {
         "oKLrE9+yCOkYUOpiRlz43/3vkEL5hjIKMcDSZnPKBZi1h16Yj2hPe9GMibNip54=\n" +
         "-----END X509 CRL-----";
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     private static CertPath generateCertificatePath()
             throws CertificateException {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        ByteArrayInputStream is;
+        Certificate targetCert = PEM_DECODER.decode(targetCertStr, X509Certificate.class);
 
-        is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate targetCert = cf.generateCertificate(is);
-
-        is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate certification path
-        List<Certificate> list = Arrays.asList(new Certificate[] {
-                        targetCert, selfSignedCert});
+        List<Certificate> list = Arrays.asList(targetCert, selfSignedCert);
 
         return cf.generateCertPath(list);
     }
@@ -130,35 +130,21 @@ public class CircularCRLOneLevel {
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        X509Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
 
     private static CertStore generateCertificateStore() throws Exception {
-        // generate CRL from CRL string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(crlStr.getBytes());
 
         // generate a cert store
-        Collection crls = cf.generateCRLs(is);
-
-        is = new ByteArrayInputStream(crlIssuerCertStr.getBytes());
-        Collection certs = cf.generateCertificates(is);
-
-        Collection entries = new HashSet();
-        entries.addAll(crls);
-        entries.addAll(certs);
+        Collection<DEREncodable> entries = new HashSet<>();
+        entries.add(PEM_DECODER.decode(crlStr, X509CRL.class));
+        entries.add(PEM_DECODER.decode(crlIssuerCertStr, X509Certificate.class));
 
         return CertStore.getInstance("Collection",
                             new CollectionCertStoreParameters(entries));
diff --git a/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java
index 944483683ba..251883d4e51 100644
--- a/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java
+++ b/test/jdk/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,11 +33,14 @@
  * @bug 6720721
  * @summary CRL check with circular depency support needed
  * @run main/othervm CircularCRLOneLevelRevoked
+ * @enablePreview
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -108,22 +111,19 @@ public class CircularCRLOneLevelRevoked {
         "oKLrE9+yCOkYUOpiRlz43/3vkEL5hjIKMcDSZnPKBZi1h16Yj2hPe9GMibNip54=\n" +
         "-----END X509 CRL-----";
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     private static CertPath generateCertificatePath()
             throws CertificateException {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        ByteArrayInputStream is;
+        Certificate targetCert = PEM_DECODER.decode(targetCertStr, X509Certificate.class);
 
-        is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate targetCert = cf.generateCertificate(is);
-
-        is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate certification path
-        List<Certificate> list = Arrays.asList(new Certificate[] {
-                        targetCert, selfSignedCert});
+        List<Certificate> list = Arrays.asList(targetCert, selfSignedCert);
 
         return cf.generateCertPath(list);
     }
@@ -131,35 +131,20 @@ public class CircularCRLOneLevelRevoked {
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        X509Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
 
     private static CertStore generateCertificateStore() throws Exception {
         // generate CRL from CRL string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(crlStr.getBytes());
-
-        // generate a cert store
-        Collection crls = cf.generateCRLs(is);
-
-        is = new ByteArrayInputStream(crlIssuerCertStr.getBytes());
-        Collection certs = cf.generateCertificates(is);
-
-        Collection entries = new HashSet();
-        entries.addAll(crls);
-        entries.addAll(certs);
+        Collection<DEREncodable> entries = new HashSet<>();
+        entries.add(PEM_DECODER.decode(crlStr, X509CRL.class));
+        entries.add(PEM_DECODER.decode(crlIssuerCertStr, X509Certificate.class));
 
         return CertStore.getInstance("Collection",
                             new CollectionCertStoreParameters(entries));
diff --git a/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java
index 34a15287f2d..d7dcfc6b6d5 100644
--- a/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java
+++ b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,13 @@
  *
  * @bug 6845286
  * @summary Add regression test for name constraints
+ * @enablePreview
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -90,25 +92,21 @@ public class NameConstraintsWithRID {
         "FbcNIaCtg8blO5ImdOz5hAi+NuY=\n" +
         "-----END CERTIFICATE-----";
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     private static CertPath generateCertificatePath()
             throws CertificateException {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        ByteArrayInputStream is;
+        Certificate targetCert = PEM_DECODER.decode(targetCertStr, X509Certificate.class);
 
-        is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate targetCert = cf.generateCertificate(is);
+        Certificate subCaCert = PEM_DECODER.decode(subCaCertStr, X509Certificate.class);
 
-        is = new ByteArrayInputStream(subCaCertStr.getBytes());
-        Certificate subCaCert = cf.generateCertificate(is);
-
-        is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate certification path
-        List<Certificate> list = Arrays.asList(new Certificate[] {
-                        targetCert, subCaCert, selfSignedCert});
+        List<Certificate> list = Arrays.asList(targetCert, subCaCert, selfSignedCert);
 
         return cf.generateCertPath(list);
     }
@@ -116,15 +114,11 @@ public class NameConstraintsWithRID {
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        X509Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
diff --git a/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java
index a493d6c7324..333e9b19f30 100644
--- a/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java
+++ b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,13 @@
  *
  * @bug 6845286
  * @summary Add regression test for name constraints
+ * @enablePreview
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -90,41 +92,40 @@ public class NameConstraintsWithUnexpectedRID {
         "dcVScVdLUDeqE/3f+5yt1JPRuA==\n" +
         "-----END CERTIFICATE-----";
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of()
+            ;
     private static CertPath generateCertificatePath()
-            throws CertificateException {
+            throws CertificateException, IOException {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
         ByteArrayInputStream is;
 
         is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate targetCert = cf.generateCertificate(is);
+        Certificate targetCert = PEM_DECODER.decode(is, X509Certificate.class);
 
         is = new ByteArrayInputStream(subCaCertStr.getBytes());
-        Certificate subCaCert = cf.generateCertificate(is);
+        Certificate subCaCert = PEM_DECODER.decode(is, X509Certificate.class);
 
         is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        Certificate selfSignedCert = PEM_DECODER.decode(is, X509Certificate.class);
 
         // generate certification path
-        List<Certificate> list = Arrays.asList(new Certificate[] {
-                        targetCert, subCaCert, selfSignedCert});
+        List<Certificate> list = Arrays.asList(targetCert, subCaCert, selfSignedCert);
 
         return cf.generateCertPath(list);
     }
 
     private static Set<TrustAnchor> generateTrustAnchors()
-            throws CertificateException {
+            throws IOException {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
         ByteArrayInputStream is =
                     new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        X509Certificate selfSignedCert = PEM_DECODER.decode(is, X509Certificate.class);;
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
diff --git a/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java
index 0d11d767625..63b4f921e0e 100644
--- a/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java
+++ b/test/jdk/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,13 @@
  *
  * @bug 6845286
  * @summary Add regression test for name constraints
+ * @enablePreview
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -90,25 +92,21 @@ public class NameConstraintsWithoutRID {
         "/A==\n" +
         "-----END CERTIFICATE-----";
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     private static CertPath generateCertificatePath()
             throws CertificateException {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        ByteArrayInputStream is;
+        Certificate targetCert = PEM_DECODER.decode(targetCertStr, X509Certificate.class);
 
-        is = new ByteArrayInputStream(targetCertStr.getBytes());
-        Certificate targetCert = cf.generateCertificate(is);
+        Certificate subCaCert = PEM_DECODER.decode(subCaCertStr, X509Certificate.class);
 
-        is = new ByteArrayInputStream(subCaCertStr.getBytes());
-        Certificate subCaCert = cf.generateCertificate(is);
-
-        is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate certification path
-        List<Certificate> list = Arrays.asList(new Certificate[] {
-                        targetCert, subCaCert, selfSignedCert});
+        List<Certificate> list = Arrays.asList(targetCert, subCaCert, selfSignedCert);
 
         return cf.generateCertPath(list);
     }
@@ -116,15 +114,11 @@ public class NameConstraintsWithoutRID {
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(selfSignedCertStr.getBytes());
-        Certificate selfSignedCert = cf.generateCertificate(is);
+        X509Certificate selfSignedCert = PEM_DECODER.decode(selfSignedCertStr, X509Certificate.class);
 
         // generate a trust anchor
         TrustAnchor anchor =
-            new TrustAnchor((X509Certificate)selfSignedCert, null);
+            new TrustAnchor(selfSignedCert, null);
 
         return Collections.singleton(anchor);
     }
diff --git a/test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java b/test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java
index c57abdf243d..58d3c37975a 100644
--- a/test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java
+++ b/test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,13 @@
  * @bug 8132926
  * @summary PKIXParameters built with public key form of TrustAnchor causes
  *          NPE during cert path building/validation
+ * @enablePreview
  * @run main ValWithAnchorByName
  */
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.PEMDecoder;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertPath;
@@ -232,9 +235,10 @@ public class ValWithAnchorByName {
     public static void main(String[] args) throws Exception {
         TrustAnchor anchor;
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        X509Certificate rootCert = generateCertificate(cf, ROOT_CA_CERT);
-        X509Certificate eeCert = generateCertificate(cf, EE_CERT);
-        X509Certificate intCaCert = generateCertificate(cf, INT_CA_CERT);
+        PEMDecoder pemDecoder = PEMDecoder.of();
+        X509Certificate rootCert = pemDecoder.decode(ROOT_CA_CERT, X509Certificate.class);
+        X509Certificate eeCert = pemDecoder.decode(EE_CERT, X509Certificate.class);
+        X509Certificate intCaCert = pemDecoder.decode(INT_CA_CERT, X509Certificate.class);
         List<X509Certificate> certList = new ArrayList<X509Certificate>() {{
             add(eeCert);
             add(intCaCert);
@@ -283,10 +287,4 @@ public class ValWithAnchorByName {
 
         validator.validate(path, params);
     }
-
-    private static X509Certificate generateCertificate(CertificateFactory cf,
-            String encoded) throws CertificateException {
-        ByteArrayInputStream is = new ByteArrayInputStream(encoded.getBytes());
-        return (X509Certificate)cf.generateCertificate(is);
-    }
 }
diff --git a/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java b/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
index 1b3aef8b0fe..6aec08deedd 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
@@ -25,12 +25,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.security.KeyFactory;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Security;
+import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
 import java.util.concurrent.CountDownLatch;
@@ -49,6 +47,7 @@ import javax.net.ssl.TrustManagerFactory;
 /*
  * @test
  * @bug 8205111
+ * @enablePreview
  * @summary Test TLS with different types of supported keys.
  * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
  * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
@@ -315,34 +314,27 @@ public class TLSTest {
             String trustedCertStr, String keyCertStr,
             String privateKey, String keyType) throws Exception {
 
-        // Generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        PEMDecoder pemDecoder = PEMDecoder.of();
 
         // Create a key store
         KeyStore ts = KeyStore.getInstance("PKCS12");
         KeyStore ks = KeyStore.getInstance("PKCS12");
         ts.load(null, null);
         ks.load(null, null);
-        char passphrase[] = "passphrase".toCharArray();
+        char[] passphrase = "passphrase".toCharArray();
 
         // Import the trusted cert
         ts.setCertificateEntry("trusted-cert-" + keyType,
-                cf.generateCertificate(new ByteArrayInputStream(
-                        trustedCertStr.getBytes())));
+                pemDecoder.decode(trustedCertStr, X509Certificate.class));
 
         boolean hasKeyMaterials = keyCertStr != null && privateKey != null;
         if (hasKeyMaterials) {
 
             // Generate the private key.
-            PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                    Base64.getMimeDecoder().decode(privateKey));
-            KeyFactory kf = KeyFactory.getInstance(keyType);
-            PrivateKey priKey = kf.generatePrivate(priKeySpec);
-
+            PrivateKey priKey = pemDecoder.decode(privateKey, PrivateKey.class);
             // Generate certificate chain
-            Certificate keyCert = cf.generateCertificate(
-                    new ByteArrayInputStream(keyCertStr.getBytes()));
-            Certificate[] chain = new Certificate[]{keyCert};
+            Certificate keyCert =pemDecoder.decode(keyCertStr, X509Certificate.class);
+                    Certificate[] chain = new Certificate[]{keyCert};
 
             // Import the key entry.
             ks.setKeyEntry("cert-" + keyType, priKey, passphrase, chain);
@@ -422,9 +414,11 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgVHQp1EG3PgASz7Nu\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgVHQp1EG3PgASz7Nu\n"
                 + "uv9dvFLxsr3qfgC6CgZU4xorLbChRANCAARdc4XgHchFHqyzVKlx8Nlpl5zFSZyk\n"
-                + "jE3qvm5PVrGRgTmcyXBLcq9fPOyQEbq59Lieyd2C1DZTLh2klmfIRMRr"
+                + "jE3qvm5PVrGRgTmcyXBLcq9fPOyQEbq59Lieyd2C1DZTLh2klmfIRMRr\n"
+                + "-----END PRIVATE KEY-----"
         ),
         ecdsa_sha1(
                 "EC",
@@ -449,9 +443,11 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgyJJNI8eqYVKcCshG\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgyJJNI8eqYVKcCshG\n"
                 + "t89mrRZ1jMeD8fAbgijAG7WfgtGhRANCAAR6LMO6lBGdmpo87XTjtA2vsXvq1kd8\n"
-                + "ktaIGEdCrA8BKk0A30LW8SY5Be29ScYu8d+IjQ3X/fpblrVh/64pOgQz"
+                + "ktaIGEdCrA8BKk0A30LW8SY5Be29ScYu8d+IjQ3X/fpblrVh/64pOgQz\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pss_pss_sha256(
                 "RSASSA-PSS",
@@ -487,7 +483,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEuwIBADALBgkqhkiG9w0BAQoEggSnMIIEowIBAAKCAQEApfK+EK4NuwWFDv9V\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEuwIBADALBgkqhkiG9w0BAQoEggSnMIIEowIBAAKCAQEApfK+EK4NuwWFDv9V\n"
                 + "WtiMfEDxszf5b85irz+RX9uqLzVuL0VMevB8wIYYlrXJfj8C0myaia3hJE5ZXuz5\n"
                 + "0QMqW8t3zu2QCtGN2Ih6rmgYO3fu2BYYR8L/IBtJWXMgNAZFxSR6nau+qmq9MRwu\n"
                 + "g1Xs15tCt5nHHsphrRUfQc1pgI/uw2LEsL7U0O1jaEJn9HHQzEjO9SMGk8CML09s\n"
@@ -512,7 +509,8 @@ public class TLSTest {
                 + "ofaiiWffsaytVvotmT6+atElvAMbAua42V+nAQKBgHtIn3mYMHLriYGhQzpkFEA2\n"
                 + "8YcAMlKppueOMAKVy8nLu2r3MidmLAhMiKJQKG45I3Yg0/t/25tXLiOPJlwrOebh\n"
                 + "xQqUBI/JUOIpGAEnr48jhOXnCS+i+z294G5U/RgjXrlR4bCPvrtCmwzWwe0h79w2\n"
-                + "Q2hO5ZTW6UD9CVA85whf"
+                + "Q2hO5ZTW6UD9CVA85whf\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pss_rsae_sha256(
                 "RSA",
@@ -579,7 +577,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDD8nVjgSWSwVmP\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDD8nVjgSWSwVmP\n"
                 + "6wHXl+8cjESonTvCqSU1xLiySoqOH+/u5kTcg5uk7J9qr3sDpLLVmnB7lITrv3cx\n"
                 + "X7GufAC2lrWPhKdY2/BTpCGP4Twg/sC7Z2MnAPNabmPh+BhpQA3PllULdnsV/aEK\n"
                 + "eP3dFF+piJmSDKwowLhDc0wdD1t15jDk812UnNQugd465g0g6z57m3MFX1veUrya\n"
@@ -604,7 +603,8 @@ public class TLSTest {
                 + "j+4Sinm9qkHWc7ixKZdocRQjCriHrENSMy/FBNBBAoGAfi0ZGZxyIeik5qUBy+P+\n"
                 + "+ce6n5/1kdczPTpzJae+eCPqg3VQuGz3NutZ2tdx1IMcYSeMfiB6xLMWSKSraxEi\n"
                 + "2BCtdPcyUau8w12BXwn+hyK2u79OhHbexisrJUOVXE+yA8C/k0r0SrZHS0PHYZjj\n"
-                + "xkWyr/6XyeGP/vX8WvfF2eM="
+                + "xkWyr/6XyeGP/vX8WvfF2eM=\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pkcs1_sha1(
                 "RSA",
@@ -638,7 +638,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClt40e4e/lW5S1\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClt40e4e/lW5S1\n"
                 + "4zFrkZrg3ZAOeYaTWkAa6EVUbtGiH/eRTeAnODRQey9zQFRY8cM6izBheJbfPN9r\n"
                 + "ZN1SfL8R4XfHHDXS9udX4zWIOcrAMQxoK2KEFMcJ1F3cMFGQ1vIM+A4FTjObHl9m\n"
                 + "Et6Pq0LQTPlX7JJw+1R7REJYSkxFm7h/lsr/8CScVxF4SZtO6/EMPoG2kSPylQlq\n"
@@ -663,7 +664,8 @@ public class TLSTest {
                 + "7qCBIYk8Nk9F7v+7M69NAfK97Dd5gzRsyL3sbFECgYBxz2nCKeBv2frxtD36nlY1\n"
                 + "bDhZv1Asyxq0yt9GSkVWeHnSIFHfwBu3w6qW7+qdlQizu+6GZ3wq9dyyrXUA4zPU\n"
                 + "QnYWYYk30p4uqLXFCrnscVOm3v7f51oEYVoEKjqGl2C/BTy7iSgCRd+cp6y34DsV\n"
-                + "PsRyQCB/QarxsDNAuioguQ=="
+                + "PsRyQCB/QarxsDNAuioguQ==\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pkcs1_sha256(
                 "RSA",
@@ -697,7 +699,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDaMM8YyiBz12rb\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDaMM8YyiBz12rb\n"
                 + "Dlv4Uept9oY+iRGbI5uJTzL+X92qQzn0hX6qPxVBQjg22l0JNavXrzXbPgCNeuTk\n"
                 + "cgGsQJ9Bsc9RybWuZ7lhVnRbFXT5R/KEOasbAMuGTEapzeE6FGuUXbB1d5R+MjOG\n"
                 + "9L35L/jTX763+O+r5yoUXUEefNg676WduL+j3k6qjwyXCJGqDfHLd81F+peTsNbL\n"
@@ -722,7 +725,8 @@ public class TLSTest {
                 + "QFuQIMdYm9dJLZnOkxLXrOZoHeui0poX2Ya6FawhAoGAAI/QCyDbuvnJzGmjSbvl\n"
                 + "5Ndr9lNAansCXaUzXuVLp6dD6PnB8HVCE8tdETZrcXseyTBeltaxAhj+tCybJvDO\n"
                 + "sV8UmPR0w9ibExmUIVGX5BpoRlB/KWxEG3ar/wJbUZVZ2oSdIAZvCvdbN956SLDg\n"
-                + "Pg5M5wrRqs71s2EiIJd0HrU="
+                + "Pg5M5wrRqs71s2EiIJd0HrU=\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pkcs1_sha384(
                 "RSA",
@@ -756,7 +760,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC8iCdCvecakzP9\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC8iCdCvecakzP9\n"
                 + "BiSyTav5KmptGGI4Wejpz+TImZK7xNDTxFXwB3wJqWcAOQeU8GhOYKpjm/1o66ly\n"
                 + "XX6MJ7t7iJ3Pggmy5jUpFT9SPiVhWo7VbvwfEiAp3eNtKAD3rbyUno2G/o6rIDwo\n"
                 + "IicpugjwV0OZ1FXO74UKYYosG1RWc486TMzO22SuDujJSgJqBiLNktjyWFQDxF+D\n"
@@ -781,7 +786,8 @@ public class TLSTest {
                 + "jFP4YVofTd3ltSFI3x5pVZA2a88rE49gNkGWU9mReD0CgYEAkXoH6Sn+Elp6Oa+k\n"
                 + "jF5jQ14RNH4SoBSFR8mY6jOIGzINTWiMCaBMiPusjkrq7SfgIM3iEeJWmgghlZdl\n"
                 + "0ynmwThnfQnEEtsvpSMteI11eVrZrMGVZOhgALxf4zcmQCpPVQicNQLkocuAZSAo\n"
-                + "mzO1FvNUBCMZb/5PQdiFw3pMEyQ="
+                + "mzO1FvNUBCMZb/5PQdiFw3pMEyQ=\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pkcs1_sha512(
                 "RSA",
@@ -815,7 +821,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDaF4fhwBKMatza\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDaF4fhwBKMatza\n"
                 + "KvqfimqhBLNPmaGVHz+IX/let8hJJud9k1mc+TZxNBIMPwc1tFP1u+2shhAhOsaB\n"
                 + "RgoFPC3DJywzq/vr5MVaw8EdZufxufJ4awXGE1eytFdliKoPCiI8T4nxpNAy3haU\n"
                 + "0FpmO3/0ERRjJPJnxzndZZoT1pITexDKe6Vnyu6GRz2FvJsQ7VR8BARYhj6dHRT1\n"
@@ -840,7 +847,8 @@ public class TLSTest {
                 + "K86SqEklQKYXAnUmZiESGQgjSn68llowSwTznZPhAoGBAMH2scnvGRbPmzm91pyY\n"
                 + "1loeejtO8qWQsRFaSZyqtlW1c/zHaotTU1XhmVxnliv/HCb3t7qlssb3snCTUY9R\n"
                 + "mcyMWbaTIBMNfW2IspX4hhkLuCwzhskl/08/8GJwkOEAo3q/TYigyFPVEwq8R9uq\n"
-                + "l0uEakWMhPrvr/N1FT1KXo6S"
+                + "l0uEakWMhPrvr/N1FT1KXo6S\n"
+                + "-----END PRIVATE KEY-----"
         ),
         ecdsa_secp384r1_sha384(
                 "EC",
@@ -867,10 +875,12 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCpxyn85BJ+JFfT5U7U\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCpxyn85BJ+JFfT5U7U\n"
                 + "VY+c8v2oY873YOVussMDiC82VYGKZDZH8D6C6h0b33iCpm2hZANiAAR5esh3fLL/\n"
                 + "SYk81dcZeUxJAS8ilLIMJwopB3ZmbWq3SADUdRIe6V9K3IdQjoOX+ljuJHTA7/Fg\n"
-                + "haGKuapP5dtU9NYglvbjkt/0YWJH93pTJRupe42D0amdRGzLlmHHgN8="
+                + "haGKuapP5dtU9NYglvbjkt/0YWJH93pTJRupe42D0amdRGzLlmHHgN8=\n"
+                + "-----END PRIVATE KEY-----"
         ),
         ecdsa_secp521r1_sha512(
                 "EC",
@@ -898,12 +908,14 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAz7qc9msPhSoh0iiT\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAz7qc9msPhSoh0iiT\n"
                 + "Z0146/sLJL5K+JNo2KdKpZOf1mS/egCCbp7lndigL7jr0JnBRIjk+pmeBtIId6mW\n"
                 + "MrcvF4KhgYkDgYYABACzWmHHe0hLD4bYcDyvhl+VDdD/mj1TnN4XPv0+woQ9KwTX\n"
                 + "GEZtTJYNqwFJ5Qo69WyWLm9jLSF07XfZDs2X5AA1QQBFjZrHkRFcgkFj1L49F0/s\n"
                 + "4bh+v3rpG/y9oITaDylX02cC1qU3eyTyIIR1VS2G8v1HqeimIR3sXP1IxEY5K7Xw\n"
-                + "Vg=="
+                + "Vg==\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pss_rsae_sha384(
                 "RSA",
@@ -970,7 +982,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCe7chGqR+iYpXW\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCe7chGqR+iYpXW\n"
                 + "HDWK0LZVff4XDc/dS0CloNQr6GAa/Gb7p37vkjWStk5BKpRg1SNZtssFNEOXR4ph\n"
                 + "jFf3boUQ7A1i9e+eYJAmbGalwwotY1zxdr5kfaWYxIiMSaPHHwPfe/pnY1RF6lOs\n"
                 + "LlegPw6xxg08LETaU+M9QCJ9EodXDEb19/KwINer/Cduou7TdVDFPYY02lMoj7Wr\n"
@@ -995,7 +1008,8 @@ public class TLSTest {
                 + "xd/NBqsx/vHpxxxeekBfu8rhI1h7M7XLBHL4s30CgYEAnmwpLxK36H4fyg3FT5uS\n"
                 + "nCJuWFIP8LvWaPm8iDUJ45flOPbXokoV+UZbe7A+TK6tdyTXtfoM59/IsLtiEp7n\n"
                 + "VuE9osST2ZOTD+l10ukIcjJJgI/Pwjtd36EGXyGftdAtT4sFMRxP4sGSXZodqHrZ\n"
-                + "T9fE4yY/E4FyzS7yMeoXIyo="
+                + "T9fE4yY/E4FyzS7yMeoXIyo=\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pss_rsae_sha512(
                 "RSA",
@@ -1062,7 +1076,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCyeGmgpaHoXnR\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCyeGmgpaHoXnR\n"
                 + "csuhMhzsoinxDqSCHfJB62g0HuZDpZG3yjlEU9zVTLeuCtWsrQnC0LCaNODjjvE9\n"
                 + "vI1tbY5L7B1pz3JNHrASzituzd3vPNlKjX5fEUG4dBEOIx0UvwTDlf8taL897aLR\n"
                 + "mUHKE29qPV3Xo80M794CdQsUSq/sNQDkE1qFm7MAmznXTS++RUqtofyz4W570KBw\n"
@@ -1087,7 +1102,8 @@ public class TLSTest {
                 + "+LAfJE/tRliLHYDfAyRnjoZn2bPZQr8Qroj5+xydAoGACHEc7aoEwZ/z8cnrHuoT\n"
                 + "T0QUw6HNlic5FgK+bZy7SXj9SqJBkWADzRJ/tVDopWT/EiDiGeqNP/uBPYt6i7m2\n"
                 + "SoqCLYdGDIbUFyDQg3zC48IXlHyEF3whx0bg/0hoKs/E/rXuxYIH/10aEwmb0FQO\n"
-                + "GA3T726uW8XrrTssMkhzixU="
+                + "GA3T726uW8XrrTssMkhzixU=\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pss_pss_sha384(
                 "RSASSA-PSS",
@@ -1123,7 +1139,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvAIBADALBgkqhkiG9w0BAQoEggSoMIIEpAIBAAKCAQEAz+1/SVKdaz83Mcs6\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvAIBADALBgkqhkiG9w0BAQoEggSoMIIEpAIBAAKCAQEAz+1/SVKdaz83Mcs6\n"
                 + "RzkuIyZvwDoYCQubniueMJ/mcMSJOIQIxxgxrFCH8cw5jFu5wsb5sPwVdMXwKgnS\n"
                 + "0WHdSHfXDLjYj2Ig7vywtdKzEW3RZdBkL52qlxi29BCREyYhFomHppY7MK+BN4c3\n"
                 + "ipOmdnVw+FoVJfTPuAAoweYRg01A9LCmDDLY0X89U1VLYJ286hzHNHWRWOwVQiKD\n"
@@ -1148,7 +1165,8 @@ public class TLSTest {
                 + "MZwdpuKcfsysbPZhnaoBHc5kf6lNBreahd+PfQKBgQDzZHFUndVfI28zn10ZzY8M\n"
                 + "zVeUMn+m1Dhp/e4F0t3XPTWCkwlYI3bk0k5BWHYSdLb2R7gKhTMynxPUb53oeY6P\n"
                 + "Pt/tA+dbjGHPx+v98wOorsD28qH0WG/V1xQdGRA9/dDZtJDolLqNn2B3t0QH9Kco\n"
-                + "LsJldTLzMQSVP/05BAt6DQ=="
+                + "LsJldTLzMQSVP/05BAt6DQ==\n"
+                + "-----END PRIVATE KEY-----"
         ),
         rsa_pss_pss_sha512(
                 "RSASSA-PSS",
@@ -1184,7 +1202,8 @@ public class TLSTest {
                 //
                 // Private key.
                 //
-                "MIIEvAIBADALBgkqhkiG9w0BAQoEggSoMIIEpAIBAAKCAQEAxv/aW7ezE+gXt2lI\n"
+                "-----BEGIN PRIVATE KEY-----\n"
+                + "MIIEvAIBADALBgkqhkiG9w0BAQoEggSoMIIEpAIBAAKCAQEAxv/aW7ezE+gXt2lI\n"
                 + "PeFSkPQTKIy2IwQ8zO23f8tO/i33XeuyFIUOVZCXMYLO0LW/M7Z1CUBM8iwZHGQP\n"
                 + "4b76S1FyVD91IrETVddjAXx1HBQFTd96XZu1/1CQ1WnVGUwH3uj1CLpP/maTpk58\n"
                 + "BP7BH4QmQLTcJvtPBHcrFISvWlZfN7wvnhI9tufOFc3dn0I/WGFNYTdDilr2r6x7\n"
@@ -1209,7 +1228,8 @@ public class TLSTest {
                 + "qckcE14nt7o5rlcHNwLQ0o8h+IHxBnZdXernwQKBgQCunOWvYd7MGlIjpkl6roq7\n"
                 + "MrQ/zaAkUyGsTgBxEu3p5+x2ENG6SukEtHGGDE6TMxlcKdTSohL2lXZX2AkP+eXf\n"
                 + "sF3h66iQ8DrGrYoyCgx3KTx3G+KPfblAqwDMTqj2G5fAeWDwXrpEacpTXiFZvNAn\n"
-                + "KtqEurWf+mUeJVzLj1x1BA=="
+                + "KtqEurWf+mUeJVzLj1x1BA==\n"
+                + "-----END PRIVATE KEY-----"
         );
 
         private final String keyType;
diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java
index 0037ac7bad6..91ea3533cb8 100644
--- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java
+++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *
  * @bug 6861062
  * @summary Disable MD2 support
+ * @enablePreview
  *
  * @run main/othervm CPBuilder trustAnchor_SHA1withRSA_1024 0 true
  * @run main/othervm CPBuilder trustAnchor_SHA1withRSA_512  0 true
@@ -48,14 +49,16 @@
  * @author Xuelei Fan
  */
 
-import java.io.*;
-import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
 
 public class CPBuilder {
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     // SHA1withRSA 1024
     static String trustAnchor_SHA1withRSA_1024 =
         "-----BEGIN CERTIFICATE-----\n" +
@@ -321,35 +324,27 @@ public class CPBuilder {
 
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
         HashSet<TrustAnchor> anchors = new HashSet<TrustAnchor>();
 
-        ByteArrayInputStream is =
-            new ByteArrayInputStream(trustAnchor_SHA1withRSA_1024.getBytes());
-        Certificate cert = cf.generateCertificate(is);
-        TrustAnchor anchor = new TrustAnchor((X509Certificate)cert, null);
+        // generate certificate from certificate string
+        X509Certificate cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_1024, X509Certificate.class);
+        TrustAnchor anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
-        is = new ByteArrayInputStream(trustAnchor_SHA1withRSA_512.getBytes());
-        cert = cf.generateCertificate(is);
-        anchor = new TrustAnchor((X509Certificate)cert, null);
+        cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_512, X509Certificate.class);
+        anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
         return anchors;
     }
 
     private static CertStore generateCertificateStore() throws Exception {
-        Collection entries = new HashSet();
-
-        // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        Collection<DEREncodable> entries = new HashSet<>();
 
         for (String key : certmap.keySet()) {
             String certStr = certmap.get(key);
-            ByteArrayInputStream is =
-                        new ByteArrayInputStream(certStr.getBytes());
-            Certificate cert = cf.generateCertificate(is);
+            DEREncodable cert = PEM_DECODER.decode(certStr, X509Certificate.class);
             entries.add(cert);
         }
 
@@ -367,9 +362,7 @@ public class CPBuilder {
         }
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = new ByteArrayInputStream(certStr.getBytes());
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(certStr, X509Certificate.class);
 
         selector.setCertificate(target);
 
@@ -386,9 +379,7 @@ public class CPBuilder {
         }
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = new ByteArrayInputStream(certStr.getBytes());
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(certStr, X509Certificate.class);
 
         return target.equals(cert);
     }
diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java
index 9785b270299..036a9634469 100644
--- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java
+++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *
  * @bug 8030829
  * @summary Add MD5 to jdk.certpath.disabledAlgorithms security property
+ * @enablePreview
  *
  * @run main/othervm CPBuilderWithMD5 trustAnchor_SHA1withRSA_1024 0 true
  * @run main/othervm CPBuilderWithMD5 trustAnchor_SHA1withRSA_512  0 true
@@ -53,14 +54,15 @@
  * certificates used in this test are generated by an updated generate.sh that
  * replacing MD2 with MD5 algorithm.
  */
-import java.io.*;
-import java.net.SocketException;
+import java.security.DEREncodable;
+import java.security.PEMDecoder;
 import java.util.*;
-import java.security.Security;
 import java.security.cert.*;
 
 public class CPBuilderWithMD5 {
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     // SHA1withRSA 1024
     static String trustAnchor_SHA1withRSA_1024 =
         "-----BEGIN CERTIFICATE-----\n" +
@@ -326,35 +328,30 @@ public class CPBuilderWithMD5 {
 
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
         HashSet<TrustAnchor> anchors = new HashSet<TrustAnchor>();
 
-        ByteArrayInputStream is =
-            new ByteArrayInputStream(trustAnchor_SHA1withRSA_1024.getBytes());
-        Certificate cert = cf.generateCertificate(is);
+        // generate certificate from certificate string
+        X509Certificate cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_1024, X509Certificate.class);
         TrustAnchor anchor = new TrustAnchor((X509Certificate)cert, null);
         anchors.add(anchor);
 
-        is = new ByteArrayInputStream(trustAnchor_SHA1withRSA_512.getBytes());
-        cert = cf.generateCertificate(is);
-        anchor = new TrustAnchor((X509Certificate)cert, null);
+        cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_512, X509Certificate.class);
+        anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
         return anchors;
     }
 
     private static CertStore generateCertificateStore() throws Exception {
-        Collection entries = new HashSet();
+        Collection<DEREncodable> entries = new HashSet<>();
 
         // generate certificate from certificate string
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
         for (String key : certmap.keySet()) {
             String certStr = certmap.get(key);
-            ByteArrayInputStream is =
-                        new ByteArrayInputStream(certStr.getBytes());
-            Certificate cert = cf.generateCertificate(is);
+            DEREncodable cert = PEM_DECODER.decode(certStr, X509Certificate.class);
             entries.add(cert);
         }
 
@@ -372,9 +369,7 @@ public class CPBuilderWithMD5 {
         }
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = new ByteArrayInputStream(certStr.getBytes());
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(certStr, X509Certificate.class);
 
         selector.setCertificate(target);
 
@@ -391,9 +386,7 @@ public class CPBuilderWithMD5 {
         }
 
         // generate certificate from certificate string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        ByteArrayInputStream is = new ByteArrayInputStream(certStr.getBytes());
-        X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+        X509Certificate target = PEM_DECODER.decode(certStr, X509Certificate.class);
 
         return target.equals(cert);
     }
diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java
index bd43bde75e4..aa19bc2f0c8 100644
--- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java
+++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,12 +31,14 @@
  * @summary Disable MD2 support.
  *          New CertPathValidatorException.BasicReason enum constant for
  *     constrained algorithm.
+ * @enablePreview
  * @run main/othervm CPValidatorEndEntity
  * @author Xuelei Fan
  */
 
 import java.io.*;
 import java.net.SocketException;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -44,6 +46,8 @@ import java.security.cert.CertPathValidatorException.*;
 
 public class CPValidatorEndEntity {
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     // SHA1withRSA 1024
     static String trustAnchor_SHA1withRSA_1024 =
         "-----BEGIN CERTIFICATE-----\n" +
@@ -278,38 +282,28 @@ public class CPValidatorEndEntity {
     private static CertPath generateCertificatePath(String castr,
             String eestr) throws CertificateException {
         // generate certificate from cert strings
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is;
-
-        is = new ByteArrayInputStream(castr.getBytes());
-        Certificate cacert = cf.generateCertificate(is);
-
-        is = new ByteArrayInputStream(eestr.getBytes());
-        Certificate eecert = cf.generateCertificate(is);
+        Certificate cacert = PEM_DECODER.decode(castr, X509Certificate.class);
+        Certificate eecert = PEM_DECODER.decode(eestr, X509Certificate.class);
 
         // generate certification path
         List<Certificate> list = Arrays.asList(new Certificate[] {
                         eecert, cacert});
 
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
         return cf.generateCertPath(list);
     }
 
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
         HashSet<TrustAnchor> anchors = new HashSet<TrustAnchor>();
 
-        ByteArrayInputStream is =
-            new ByteArrayInputStream(trustAnchor_SHA1withRSA_1024.getBytes());
-        Certificate cert = cf.generateCertificate(is);
-        TrustAnchor anchor = new TrustAnchor((X509Certificate)cert, null);
+        X509Certificate cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_1024, X509Certificate.class);
+        TrustAnchor anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
-        is = new ByteArrayInputStream(trustAnchor_SHA1withRSA_512.getBytes());
-        cert = cf.generateCertificate(is);
-        anchor = new TrustAnchor((X509Certificate)cert, null);
+        cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_512, X509Certificate.class);
+        anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
         return anchors;
diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java
index d7d0fe69f23..72dff1694b1 100644
--- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java
+++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,12 +31,12 @@
  * @summary Disable MD2 support
  *          new CertPathValidatorException.BasicReason enum constant for
  *     constrained algorithm
+ * @enablePreview
  * @run main/othervm CPValidatorIntermediate
  * @author Xuelei Fan
  */
 
-import java.io.*;
-import java.net.SocketException;
+import java.security.PEMDecoder;
 import java.util.*;
 import java.security.Security;
 import java.security.cert.*;
@@ -44,6 +44,8 @@ import java.security.cert.CertPathValidatorException.*;
 
 public class CPValidatorIntermediate {
 
+    private static final PEMDecoder PEM_DECODER = PEMDecoder.of();
+
     // SHA1withRSA 1024
     static String trustAnchor_SHA1withRSA_1024 =
         "-----BEGIN CERTIFICATE-----\n" +
@@ -183,10 +185,7 @@ public class CPValidatorIntermediate {
         // generate certificate from cert strings
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        ByteArrayInputStream is;
-
-        is = new ByteArrayInputStream(certStr.getBytes());
-        Certificate cert = cf.generateCertificate(is);
+        Certificate cert = PEM_DECODER.decode(certStr, X509Certificate.class);
 
         // generate certification path
         List<Certificate> list = Arrays.asList(new Certificate[] {cert});
@@ -196,19 +195,15 @@ public class CPValidatorIntermediate {
 
     private static Set<TrustAnchor> generateTrustAnchors()
             throws CertificateException {
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        HashSet<TrustAnchor> anchors = new HashSet<TrustAnchor>();
 
-        ByteArrayInputStream is =
-            new ByteArrayInputStream(trustAnchor_SHA1withRSA_1024.getBytes());
-        Certificate cert = cf.generateCertificate(is);
-        TrustAnchor anchor = new TrustAnchor((X509Certificate)cert, null);
+        HashSet<TrustAnchor> anchors = new HashSet<TrustAnchor>();
+        // generate certificate from cert string
+        X509Certificate cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_1024, X509Certificate.class);
+        TrustAnchor anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
-        is = new ByteArrayInputStream(trustAnchor_SHA1withRSA_512.getBytes());
-        cert = cf.generateCertificate(is);
-        anchor = new TrustAnchor((X509Certificate)cert, null);
+        cert = PEM_DECODER.decode(trustAnchor_SHA1withRSA_512, X509Certificate.class);
+        anchor = new TrustAnchor(cert, null);
         anchors.add(anchor);
 
         return anchors;
diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
index fcc7cbf73f0..28f9f8e1f19 100644
--- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
+++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
@@ -30,6 +30,7 @@
  * @test
  * @bug 6916074 8170131
  * @summary Add support for TLS 1.2
+ * @enablePreview
  * @run main/othervm PKIXExtendedTM 0
  * @run main/othervm PKIXExtendedTM 1
  * @run main/othervm PKIXExtendedTM 2
@@ -38,12 +39,14 @@
 
 import java.io.*;
 import javax.net.ssl.*;
+import java.security.PEMDecoder;
 import java.security.Security;
 import java.security.KeyStore;
 import java.security.KeyFactory;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertPathValidatorException;
+import java.security.cert.X509Certificate;
 import java.security.spec.*;
 import java.security.interfaces.*;
 import java.math.BigInteger;
@@ -904,7 +907,7 @@ public class PKIXExtendedTM {
         (byte)0x4f
     };
 
-    static char passphrase[] = "passphrase".toCharArray();
+    static char[] passphrase = "passphrase".toCharArray();
 
     /*
      * Is the server ready to serve?
@@ -999,13 +1002,9 @@ public class PKIXExtendedTM {
             String keyCertStr, byte[] modulus,
             byte[] privateExponent, char[] passphrase) throws Exception {
 
+        PEMDecoder pemDecoder = PEMDecoder.of();
         // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
-        is.close();
+        Certificate trusedCert = pemDecoder.decode(trusedCertStr, X509Certificate.class);
 
         // create a key store
         KeyStore ks = KeyStore.getInstance("JKS");
@@ -1024,9 +1023,7 @@ public class PKIXExtendedTM {
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
 
             // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
+            Certificate keyCert = pemDecoder.decode(keyCertStr, X509Certificate.class);
 
             Certificate[] chain = new Certificate[2];
             chain[0] = keyCert;
diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
index f95aee76dab..13491bebe22 100644
--- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
+++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,13 @@
  * @test
  * @bug 6916074
  * @summary Add support for TLS 1.2
+ * @enablePreview
  * @run main/othervm SunX509ExtendedTM
  */
 
 import java.net.*;
+import java.security.PEMDecoder;
+import java.security.cert.X509Certificate;
 import java.util.*;
 import java.io.*;
 import javax.net.ssl.*;
@@ -997,13 +1000,10 @@ public class SunX509ExtendedTM {
             String keyCertStr, byte[] modulus,
             byte[] privateExponent, char[] passphrase) throws Exception {
 
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        PEMDecoder pemDecoder = PEMDecoder.of();
 
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
-        is.close();
+        // generate certificate from cert string
+        Certificate trusedCert = pemDecoder.decode(trusedCertStr, X509Certificate.class);
 
         // create a key store
         KeyStore ks = KeyStore.getInstance("JKS");
@@ -1022,9 +1022,7 @@ public class SunX509ExtendedTM {
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
 
             // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
+            Certificate keyCert = pemDecoder.decode(keyCertStr, X509Certificate.class);
 
             Certificate[] chain = new Certificate[2];
             chain[0] = keyCert;

From 0555f6228c59c6739b8b824d64eb6c1545a5520a Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 4 Nov 2025 19:44:04 +0000
Subject: [PATCH 020/512] 8371094: --mac-signing-key-user-name no longer works

Reviewed-by: almatvee
---
 .../jdk/jpackage/internal/SigningIdentityBuilder.java      | 4 +++-
 test/jdk/tools/jpackage/macosx/MacSignTest.java            | 7 +++++++
 test/jdk/tools/jpackage/macosx/base/SigningBase.java       | 4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
index 119d7797453..bf8f1519fe1 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
@@ -113,14 +113,16 @@ final class SigningIdentityBuilder {
 
         final var signingIdentityNames = certificateSelector.signingIdentities();
 
+        // Look up for the exact match.
         var matchingCertificates = mappedCertficates.stream().filter(e -> {
             return signingIdentityNames.contains(e.getKey());
         }).map(Map.Entry::getValue).toList();
 
         if (matchingCertificates.isEmpty()) {
+            // No exact matches found, look up for substrings.
             matchingCertificates = mappedCertficates.stream().filter(e -> {
                 return signingIdentityNames.stream().anyMatch(filter -> {
-                    return filter.startsWith(e.getKey());
+                    return e.getKey().startsWith(filter);
                 });
             }).map(Map.Entry::getValue).toList();
         }
diff --git a/test/jdk/tools/jpackage/macosx/MacSignTest.java b/test/jdk/tools/jpackage/macosx/MacSignTest.java
index f5f8b3825cc..014fbc84548 100644
--- a/test/jdk/tools/jpackage/macosx/MacSignTest.java
+++ b/test/jdk/tools/jpackage/macosx/MacSignTest.java
@@ -184,6 +184,7 @@ public class MacSignTest {
 
     @Test
     @ParameterSupplier
+    @ParameterSupplier("testSelectSigningIdentity_JDK_8371094")
     public static void testSelectSigningIdentity(String signingKeyUserName, CertificateRequest certRequest) {
 
         MacSign.withKeychain(keychain -> {
@@ -207,6 +208,12 @@ public class MacSignTest {
         }).toList();
     }
 
+    public static Collection<Object[]> testSelectSigningIdentity_JDK_8371094() {
+        return List.<Object[]>of(new Object[] {
+                "ACME Technologies Limited", SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD.spec()
+        });
+    }
+
     enum SignOption {
         EXPIRED_SIGNING_KEY_USER_NAME("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), true, false),
         EXPIRED_SIGNING_KEY_USER_NAME_PKG("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.PKG_EXPIRED.spec(), true, false),
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningBase.java b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
index 1e38f9b0c29..b1a709c9cf0 100644
--- a/test/jdk/tools/jpackage/macosx/base/SigningBase.java
+++ b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
@@ -68,6 +68,7 @@ public class SigningBase {
     public enum StandardCertificateRequest {
         CODESIGN(cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
         CODESIGN_COPY(cert().days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        CODESIGN_ACME_TECH_LTD(cert().days(100).userName("ACME Technologies Limited (ABC12345)")),
         PKG(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
         PKG_COPY(cert().type(CertificateType.INSTALLER).days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
         CODESIGN_UNICODE(cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
@@ -101,7 +102,8 @@ public class SigningBase {
                 StandardCertificateRequest.CODESIGN,
                 StandardCertificateRequest.PKG,
                 StandardCertificateRequest.CODESIGN_UNICODE,
-                StandardCertificateRequest.PKG_UNICODE),
+                StandardCertificateRequest.PKG_UNICODE,
+                StandardCertificateRequest.CODESIGN_ACME_TECH_LTD),
         /**
          * A keychain with some good and some expired certificates.
          */

From 325082302266f25d4fac33d0d4a9492c72de3ffc Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Tue, 4 Nov 2025 20:40:38 +0000
Subject: [PATCH 021/512] 8364361: [process] java.lang.Process should implement
 Closeable

Reviewed-by: lancea, darcy, naoto, jpai, alanb, prappo
---
 .../share/classes/java/lang/Process.java      | 140 +++-
 .../lang/snippet-files/ProcessExamples.java   |  51 ++
 .../java/lang/Process/ProcessCloseTest.java   | 760 ++++++++++++++++++
 3 files changed, 945 insertions(+), 6 deletions(-)
 create mode 100644 src/java.base/share/classes/java/lang/snippet-files/ProcessExamples.java
 create mode 100644 test/jdk/java/lang/Process/ProcessCloseTest.java

diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java
index 577ee538326..8aef43fe6c9 100644
--- a/src/java.base/share/classes/java/lang/Process.java
+++ b/src/java.base/share/classes/java/lang/Process.java
@@ -85,7 +85,29 @@ import java.util.stream.Stream;
  * <p>As of 1.5, {@link ProcessBuilder#start()} is the preferred way
  * to create a {@code Process}.
  *
- * <p>Subclasses of Process should override the {@link #onExit()} and
+ * <p>Subclasses of Process should ensure that each overridden method
+ * invokes the superclass method.
+ * For example, if {@linkplain #close() close} is overridden, the subclass should
+ * ensure that {@code Process.close()} is called.
+ * {@snippet lang = "java" :
+ * public class LoggingProcess extends java.lang.Process {
+ *     ...
+ *     @Override
+ *     public void close() throws IOException  {
+ *         try {
+ *             super.close();
+ *         } catch (IOException ex) {
+ *             LOGGER.log(ex);
+*          } finally {
+ *             LOGGER.log("process closed");
+ *         }
+ *     }
+ *     ...
+ * }
+ * }
+ *
+ * <p>Subclasses of Process that wrap another Process instance
+ * should override and delegate the {@link #onExit()} and
  * {@link #toHandle()} methods to provide a fully functional Process including the
  * {@linkplain #pid() process id},
  * {@linkplain #info() information about the process},
@@ -99,7 +121,9 @@ import java.util.stream.Stream;
  * process and for the communication streams between them.
  * The resources to control the process and for communication between the processes are retained
  * until there are no longer any references to the Process or the input, error, and output streams
- * or readers, or they have been closed.
+ * or readers, or they have been closed. The Process {@linkplain Process#close close} method closes
+ * all the streams and terminates the process to release the resources. Using try-with-resources
+ * will ensure the process is terminated when the try-with-resources block exits.
  *
  * <p>The process is not killed when there are no more references to the {@code Process} object,
  * but rather the process continues executing asynchronously.
@@ -107,15 +131,15 @@ import java.util.stream.Stream;
  * that are no longer referenced to prevent leaking operating system resources.
  * Processes that have terminated or been terminated are monitored and their resources released.
  *
- * <p>Streams should be {@code closed} when they are no longer needed, to avoid delaying
+ * <p>Streams should be closed when they are no longer needed, to avoid delaying
  * releasing the operating system resources.
  * {@code Try-with-resources} can be used to open and close the streams.
  * <p>For example, to capture the output of a program known to produce some output and then exit:
  * {@snippet lang = "java" :
  * List<String> capture(List<String> args) throws Exception {
  *     ProcessBuilder pb = new ProcessBuilder(args);
- *     Process process = pb.start();
- *     try (BufferedReader in = process.inputReader()) {
+ *     try (Process process = pb.start();
+ *          BufferedReader in = process.inputReader()) {
  *         List<String> captured = in.readAllLines();
  *         int status = process.waitFor();
  *         if (status != 0) {
@@ -139,7 +163,7 @@ import java.util.stream.Stream;
  *
  * @since   1.0
  */
-public abstract class Process {
+public abstract class Process implements Closeable {
 
     // Readers and Writers created for this process; so repeated calls return the same object
     // All updates must be done while synchronized on this Process.
@@ -149,12 +173,116 @@ public abstract class Process {
     private Charset inputCharset;
     private BufferedReader errorReader;
     private Charset errorCharset;
+    private boolean closed;     // true if close() has been called
 
     /**
      * Default constructor for Process.
      */
     public Process() {}
 
+    /**
+     * Closes all reader and writer streams and waits for the process to terminate.
+     * This method is idempotent, if this {@code Process} has already been closed
+     * invoking this method has no effect.
+     * <p>
+     * If the data from the process input or error streams is needed, it must be read before
+     * calling this method. The contents of streams that have not been read to end of stream
+     * are lost, they are discarded or ignored.
+     * <p>
+     * If the process exit value is of interest, then the caller must
+     * {@linkplain #waitFor() wait for} the process to terminate before calling this method.
+     * <p>
+     * Streams should be closed when no longer needed.
+     * Closing an already closed stream usually has no effect but is specific to the stream.
+     * If an {@code IOException} occurs when closing a stream it is thrown
+     * after the process has terminated.
+     * Exceptions thrown by closing the streams, if any, are added to the first
+     * {@code IOException} as {@linkplain IOException#addSuppressed suppressed exceptions}.
+     * <p>
+     * After the streams are closed this method {@linkplain #waitFor() waits for} the
+     * process to terminate. If {@linkplain Thread#interrupt interrupted} while waiting
+     * the process is {@linkplain #destroyForcibly() forcibly destroyed} and
+     * this method continues to wait for the process to terminate.
+     * The interrupted status is re-asserted before this method returns or
+     * any {@code IOExceptions} are thrown.
+     * @apiNote
+     * Try-with-resources example to write text to a process, read back the
+     * response, and close the streams and process:
+     * {@snippet file="ProcessExamples.java" region=example}
+     *
+     * @implNote
+     * Concrete implementations that override this class are strongly encouraged to
+     * override this method and invoke the superclass {@code close} method.
+     *
+     * @implSpec
+     * This method closes the process I/O streams and then
+     * {@linkplain #waitFor() waits for} the process to terminate.
+     * If {@link #waitFor() waitFor()} is {@linkplain Thread#interrupt() interrupted}
+     * the process is {@linkplain #destroyForcibly() forcibly destroyed}
+     * and then {@code close()} waits for the process to terminate.
+     * @throws IOException if closing any of the streams throws an exception
+     * @since 26
+     */
+    @Override
+    public void close() throws IOException {
+        synchronized(this) {
+            if (closed) {
+                return;
+            }
+            closed = true;
+            // Close each stream
+            IOException ioe = quietClose(outputWriter != null ? outputWriter : getOutputStream(), null);
+            ioe = quietClose(inputReader != null ? inputReader : getInputStream(), ioe);
+            ioe = quietClose(errorReader != null ? errorReader : getErrorStream(), ioe);
+
+            // Wait for the process to terminate
+            // If waitFor is interrupted, destroy the process
+            // Continue waiting indefinitely for the process to terminate
+            if (!tryWait()) {
+                destroyForcibly();
+                while (!tryWait()) {
+                    continue;
+                }
+                // Re-assert the interrupted status
+                Thread.currentThread().interrupt();
+            }
+            if (ioe != null) {
+                throw ioe;
+            }
+        }
+    }
+
+    // Try to wait for the process to terminate.
+    // Return true if the process has terminated, false if wait is interrupted.
+    private boolean tryWait() {
+        try {
+            waitFor();
+            return true;
+        } catch (InterruptedException ie) {
+            return false;
+        }
+    }
+
+    // Quietly close.
+    // If an IOException occurs, and it is the first, return it.
+    // If there is no first IOException, a first IOException is created with the Throwable.
+    // Otherwise, add the Throwable as a suppressed exception to the first.
+    private static IOException quietClose(Closeable c, IOException firstIOE) {
+        try {
+            c.close();
+            return firstIOE;
+        } catch (Throwable th) {
+            if (firstIOE == null && th instanceof IOException ioe) {
+                return ioe;
+            } else if (firstIOE == null) {
+                firstIOE = new IOException(th);
+            } else {
+                firstIOE.addSuppressed(th);
+            }
+            return firstIOE;
+        }
+    }
+
     /**
      * Returns the output stream connected to the normal input of the
      * process.  Output to the stream is piped into the standard
diff --git a/src/java.base/share/classes/java/lang/snippet-files/ProcessExamples.java b/src/java.base/share/classes/java/lang/snippet-files/ProcessExamples.java
new file mode 100644
index 00000000000..99ea32afff3
--- /dev/null
+++ b/src/java.base/share/classes/java/lang/snippet-files/ProcessExamples.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public class ProcessExamples {
+    // @start region=example
+    void main() {
+        try (Process p = new ProcessBuilder("cat").start();
+             var writer = p.outputWriter();
+             var reader = p.inputReader()) {
+            writer.write(haiku);
+            writer.close();
+            // Read all lines and print each
+            reader.readAllLines()
+                    .forEach(IO::println);
+            var status = p.waitFor();
+            if (status != 0)
+                throw new RuntimeException("unexpected process status: " + status);
+        } catch (Exception e) {
+            System.out.println("Process failed: " + e);
+        }
+    }
+
+    static final String haiku = """
+                Oh, the sunrise glow;
+                Paddling with the river flow;
+                Chilling still, go slow.
+                """;
+    // @end region=example
+}
diff --git a/test/jdk/java/lang/Process/ProcessCloseTest.java b/test/jdk/java/lang/Process/ProcessCloseTest.java
new file mode 100644
index 00000000000..3e4040b62f1
--- /dev/null
+++ b/test/jdk/java/lang/Process/ProcessCloseTest.java
@@ -0,0 +1,760 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.java.lang.Process;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+/*
+ * @test
+ * @bug 8364361
+ * @summary Tests for Process.close
+ * @modules java.base/java.lang:+open java.base/java.io:+open
+ * @run junit jdk.java.lang.Process.ProcessCloseTest
+ */
+public class ProcessCloseTest {
+
+    private final static boolean OS_WINDOWS = System.getProperty("os.name").startsWith("Windows");
+    private final static String CAT_PROGRAM = "cat";
+    public static final String FORCED_CLOSE_MSG = "Forced close";
+    private static List<String> JAVA_ARGS;
+
+    private static List<String> setupJavaEXE() {
+        String JAVA_HOME = System.getProperty("test.jdk");
+        if (JAVA_HOME == null)
+            JAVA_HOME = System.getProperty("JAVA_HOME");
+        String classPath = System.getProperty("test.class.path");
+        return  List.of(JAVA_HOME + "/bin/java", "-cp", classPath, ProcessCloseTest.class.getName());
+    }
+
+    private static List<String> javaArgs(ChildCommand... moreArgs) {
+
+        List<String> javaArgs = JAVA_ARGS;
+        if (javaArgs == null) {
+            JAVA_ARGS = javaArgs = setupJavaEXE();
+        }
+        List<String> args = new ArrayList<>(javaArgs);
+        for (ChildCommand arg : moreArgs) {
+            args.add(arg.toString());
+        }
+        return args;
+    }
+
+    /**
+     * {@return A Stream of Arguments}
+     * Each Argument consists of three lists.
+     * - A List of command line arguments to start a process.
+     *   `javaArgs can be used to launch a Java child with ChildCommands
+     * - A List of ProcessCommand actions to be invoked on that process
+     * - A List of commands to be invoked on the process after the close or T-W-R exit.
+     */
+    static Stream<Arguments> singleThreadTestCases() {
+        return Stream.of(
+                Arguments.of(List.of("echo", "xyz0"),
+                        List.of(ProcessCommand.STDOUT_PRINT_ALL_LINES,
+                                ProcessCommand.STDERR_EXPECT_EMPTY,
+                                ExitStatus.NORMAL),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(List.of("echo", "xyz1"),
+                        List.of(ProcessCommand.STDOUT_PRINT_ALL_LINES),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(javaArgs(ChildCommand.STDOUT_ECHO),
+                        List.of(ProcessCommand.WRITER_WRITE,
+                                ProcessCommand.WRITER_CLOSE,
+                                ProcessCommand.STDOUT_PRINT_ALL_LINES),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(javaArgs(ChildCommand.STDOUT_ECHO),
+                        List.of(ProcessCommand.STDOUT_WRITE,
+                                ProcessCommand.STDOUT_CLOSE,
+                                ProcessCommand.STDOUT_PRINT_ALL_LINES),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(javaArgs(ChildCommand.STDOUT_ECHO),
+                        List.of(ProcessCommand.STDOUT_WRITE,
+                                ProcessCommand.STDOUT_CLOSE,
+                                ExitStatus.NORMAL),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(List.of(CAT_PROGRAM, "NoSuchFile.txt"),
+                        List.of(ProcessCommand.STDERR_PRINT_ALL_LINES,
+                                ProcessCommand.STDOUT_EXPECT_EMPTY),
+                        List.of(ExitStatus.FAIL)),
+                Arguments.of(javaArgs(ChildCommand.STDOUT_MARCO),
+                        List.of(ProcessCommand.STDOUT_EXPECT_POLO,
+                                ProcessCommand.STDERR_EXPECT_EMPTY),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(javaArgs(ChildCommand.STDERR_MARCO),
+                        List.of(ProcessCommand.STDERR_EXPECT_POLO,
+                                ProcessCommand.STDOUT_EXPECT_EMPTY),
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(javaArgs(ChildCommand.PROCESS_EXIT1),
+                        List.of(ExitStatus.FAIL),
+                        List.of(ExitStatus.FAIL)),       // Got expected status == 1
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_INTERRUPT, // schedule an interrupt (in .2 sec)
+                                ProcessCommand.PROCESS_CLOSE,
+                                ProcessCommand.PROCESS_CHECK_INTERRUPTED), // Verify interrupted status
+                        List.of(ExitStatus.KILLED)), // And process was destroyed
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_INTERRUPT), // interrupts the TWR/close
+                        List.of(ProcessCommand.PROCESS_CHECK_INTERRUPTED, ExitStatus.KILLED)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ExitStatus.NORMAL), // waitFor before T-W-R exit
+                        List.of(ExitStatus.NORMAL)),
+                Arguments.of(List.of("echo", "abc"),
+                        List.of(ProcessCommand.PROCESS_CLOSE),
+                        List.of(ExitStatus.RACY)),
+                Arguments.of(javaArgs(ChildCommand.STDOUT_ECHO),
+                        List.of(ProcessCommand.STDOUT_WRITE,
+                                ProcessCommand.PROCESS_CLOSE),
+                        List.of(ExitStatus.PIPE)),
+                Arguments.of(List.of("echo", "def"),
+                        List.of(ProcessCommand.PROCESS_DESTROY),
+                        List.of(ExitStatus.RACY)), // Racy, not deterministic
+                Arguments.of(javaArgs(ChildCommand.STDOUT_ECHO),
+                        List.of(ProcessCommand.STDOUT_WRITE,
+                                ProcessCommand.PROCESS_DESTROY),
+                        List.of(ExitStatus.RACY)), // Racy, not deterministic
+                Arguments.of(List.of("echo"),
+                        List.of(ExitStatus.NORMAL),
+                        List.of(ExitStatus.NORMAL))
+        );
+    }
+
+    // Utility to process each command on the process
+    private static void doCommands(Process proc, List<Consumer<Process>> commands) {
+        commands.forEach(c -> {
+            Log.printf("    %s\n", c);
+            c.accept(proc);
+        });
+    }
+
+    @ParameterizedTest
+    @MethodSource("singleThreadTestCases")
+    void simple(List<String> args, List<Consumer<Process>> commands,
+                List<Consumer<Process>> postCommands) throws IOException {
+        var log = Log.get();
+        try {
+            ProcessBuilder pb = new ProcessBuilder(args);
+            Process p = pb.start(); // Buffer any debug output
+            Log.printf("Program: %s; pid: %d\n", args, p.pid());
+            doCommands(p, commands);
+            p.close();
+            doCommands(p, postCommands);
+        } catch (Throwable ex) {
+            System.err.print(log);
+            throw ex;
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("singleThreadTestCases")
+    void autoCloseable(List<String> args, List<Consumer<Process>> commands,
+                       List<Consumer<Process>> postCommands) {
+        var log = Log.get();
+        try {
+            ProcessBuilder pb = new ProcessBuilder(args);
+            Process proc = null;
+            try (Process p = pb.start()) {
+                proc = p;
+                Log.printf("Program: %s; pid: %d\n", args, p.pid());
+                doCommands(p, commands);
+            } catch (IOException ioe) {
+                Assertions.fail(ioe);
+            }
+            doCommands(proc, postCommands);
+        } catch (Throwable ex) {
+            System.err.println(log);
+            throw ex;
+        }
+    }
+
+    /**
+     * Test AutoCloseable for the process and out, in, and err streams.
+     * @param args The command line arguments
+     * @param commands the commands to the process
+     * @param postCommands The expected final exit status
+     */
+    @ParameterizedTest
+    @MethodSource("singleThreadTestCases")
+    void autoCloseableAll(List<String> args, List<Consumer<Process>> commands,
+                          List<Consumer<Process>> postCommands) {
+        var log = Log.get();
+        try {
+            ProcessBuilder pb = new ProcessBuilder(args);
+            Process proc = null;
+            try (Process p = pb.start(); var out = p.getOutputStream();
+                 var in = p.getInputStream();
+                 var err = p.getErrorStream()) {
+                proc = p;
+                Log.printf("Program: %s; pid: %d\n", args, p.pid());
+                doCommands(p, commands);
+            } catch (IOException ioe) {
+                Assertions.fail(ioe);
+            }
+            doCommands(proc, postCommands);
+        }  catch (Throwable ex) {
+            System.err.println(log);
+            throw ex;
+        }
+    }
+
+    /**
+     * ExitStatus named values and assertions
+     */
+    enum ExitStatus implements Consumer<Process> {
+        NORMAL(0),
+            FAIL(1),
+            PIPE(0, 1, 141),   // SIGPIPE
+            KILLED(1, 137), // SIGKILL
+            TERMINATED(0, 143), // SIGTERM
+            RACY(0, 1, 137, 143),
+        ;
+        private final int[] allowedStatus;
+
+        ExitStatus(int... status) {
+            this.allowedStatus = status;
+        }
+
+        // If used as a process command, checks the exit status
+        public void accept(Process p) {
+            try {
+                Instant begin = Instant.now();
+                final int exitStatus = p.waitFor();
+                Duration latency = begin.until(Instant.now());
+                Log.printf("    ExitStatus: %d, sig#: %d, waitFor latency: %s%n",
+                        exitStatus, exitStatus & 0x7f, latency);
+                assertEquals(exitStatus);
+            } catch (InterruptedException ie) {
+                Assertions.fail("Unexpected InterruptedException checking status: " + this);
+            }
+        }
+
+        // Check a status matches one of the allowed exit status values
+        void assertEquals(int actual) {
+            for (int status : allowedStatus) {
+                if (status == actual) {
+                    return;     // status is expected
+                }
+            }
+            if (this == RACY) {
+                // Not an error but report the actual status
+                Log.printf("Racy exit status: %d\n", actual);
+            } else {
+                Assertions.fail("Status: " + actual + ", sig#: " + (actual & 0x7f) +
+                        ", expected one of: " + Arrays.toString(allowedStatus));
+            }
+        }
+    }
+
+    /**
+     * Commands on a Process that can be sequenced in the parent.
+     * See ChildCommands for commands that can be sent to the child process.
+     */
+    enum ProcessCommand implements Consumer<Process> {
+        PROCESS_CLOSE(ProcessCommand::processClose),
+        PROCESS_DESTROY(ProcessCommand::processDestroy),
+        PROCESS_FORCE_OUT_CLOSE_EXCEPTION(ProcessCommand::processForceOutCloseException),
+        PROCESS_FORCE_IN_CLOSE_EXCEPTION(ProcessCommand::processForceInCloseException),
+        PROCESS_FORCE_ERROR_CLOSE_EXCEPTION(ProcessCommand::processForceErrorCloseException),
+        WRITER_WRITE(ProcessCommand::writerWrite),
+        WRITER_CLOSE(ProcessCommand::writerClose),
+        STDOUT_PRINT_ALL_LINES(ProcessCommand::stdoutPrintAllLines),
+        STDERR_PRINT_ALL_LINES(ProcessCommand::stderrPrintAllLines),
+        STDOUT_WRITE(ProcessCommand::stdoutWrite),
+        STDOUT_CLOSE(ProcessCommand::stdoutClose),
+        STDOUT_EXPECT_POLO(ProcessCommand::stdoutExpectPolo),
+        STDERR_EXPECT_POLO(ProcessCommand::stderrExpectPolo),
+        STDOUT_EXPECT_EMPTY(ProcessCommand::stdoutExpectEmpty),
+        STDERR_EXPECT_EMPTY(ProcessCommand::stderrExpectEmpty),
+        PROCESS_INTERRUPT(ProcessCommand::processInterruptThread),
+        PROCESS_CHECK_INTERRUPTED(ProcessCommand::processAssertInterrupted),
+        ;
+        private final Consumer<Process> command;
+
+        ProcessCommand(Consumer<Process> command) {
+            this.command = command;
+        }
+
+        public void accept(Process p) {
+            command.accept(p);
+        }
+
+        private static void stdoutPrintAllLines(Process p) {
+            try {
+                var lines = p.inputReader().readAllLines();
+                Assertions.assertNotEquals(0, lines.size(), "stdout should not be empty");
+                Log.printf("        %d lines\n", lines.size());
+                Log.printf("%s%n", lines.toString().indent(8));
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        private static void stderrPrintAllLines(Process p) {
+            try {
+                var lines = p.errorReader().readAllLines();
+                Assertions.assertNotEquals(0, lines.size(), "stderr should not be empty");
+                Log.printf("        %d lines\n", lines.size());
+                Log.printf("%s%n", lines.toString().indent(8));
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        private static void writerWrite(Process p) {
+            try {
+                p.outputWriter().write("Now is the time.");
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        private static void writerClose(Process p) {
+            try {
+                p.outputWriter().close();
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        private static void stdoutExpectPolo(Process p) {
+            String line = readLine(p.getInputStream());
+            Assertions.assertEquals("Polo", line, "Stdout Expected Polo");
+        }
+
+        private static void stderrExpectPolo(Process p) {
+            String line = readLine(p.getErrorStream());
+            Assertions.assertEquals("Polo", line, "Stderr Expected Polo");
+        }
+
+        private static void stdoutExpectEmpty(Process p) {
+            String line = readLine(p.getInputStream());
+            Assertions.assertEquals("", line, "Stdout Expected Empty");
+        }
+
+        private static void stderrExpectEmpty(Process p) {
+            String line = readLine(p.getErrorStream());
+            Assertions.assertEquals("", line, "Stderr Expected Empty");
+        }
+
+        private static String readLine(InputStream in) {
+            StringBuilder sb = new StringBuilder();
+            try {
+                int ch;
+                while ((ch = in.read()) != -1) {
+                    if (ch == '\n') {
+                        // end of line
+                        return sb.toString();
+                    }
+                    if (ch != '\r') {       // ignore cr - Windows defense
+                        sb.append((char) ch);
+                    }
+                }
+                // EOF - return string if no LF found
+                return sb.toString();
+            } catch (IOException ioe) {
+                return ioe.getMessage();
+            }
+        }
+
+        private static void stdoutWrite(Process p) {
+            try {
+                var out = p.getOutputStream();
+                out.write("stdout-write".getBytes(StandardCharsets.UTF_8));
+                out.flush();
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        private static void stdoutClose(Process p) {
+            try {
+                p.getOutputStream().close();
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        private static void processClose(Process p) {
+            try {
+                p.close();
+            } catch (IOException ioe) {
+                Assertions.fail(ioe);
+            }
+        }
+
+        private static void processDestroy(Process p) {
+            p.destroy();
+        }
+
+        // Interpose an input stream that throws on close()
+        private static void processForceInCloseException(Process p) {
+            try {
+                synchronized (p) {
+                    Field stdinField = p.getClass().getDeclaredField(OS_WINDOWS ? "stdin_stream" : "stdin");
+                    stdinField.setAccessible(true);
+                    stdinField.set(p, new ThrowingOutputStream((OutputStream) stdinField.get(p)));
+                }
+            } catch (Exception ex) {
+                Assertions.fail("Failed to setup InputStream for throwing close", ex);
+            }
+        }
+
+        // Interpose an output stream that throws on close()
+        private static void processForceOutCloseException(Process p) {
+            try {
+                synchronized (p) {
+                    Field stdoutField = p.getClass().getDeclaredField(OS_WINDOWS ? "stdout_stream" : "stdout");
+                    stdoutField.setAccessible(true);
+                    stdoutField.set(p, new ThrowingInputStream((InputStream) stdoutField.get(p)));
+                }
+            } catch (Exception ex) {
+                Assertions.fail("Failed to setup OutputStream throwing close", ex);
+            }
+        }
+
+        // Interpose an error stream that throws on close()
+        private static void processForceErrorCloseException(Process p) {
+            try {
+                synchronized (p) {
+                    Field stderrField = p.getClass().getDeclaredField(OS_WINDOWS ? "stderr_stream" : "stderr");
+                    stderrField.setAccessible(true);
+                    stderrField.set(p, new ThrowingInputStream((InputStream) stderrField.get(p)));
+                }
+            } catch (Exception ex) {
+                Assertions.fail("Failed to setup OutputStream for throwing close", ex);
+            }
+        }
+
+        // Hard coded to interrupt the invoking thread at a fixed rate of .2 second, if process is alive
+        private static void processInterruptThread(Process p) {
+            if (p.isAlive()) {
+                int delay = 200;
+                final Thread targetThread = Thread.currentThread();
+                ForkJoinPool common = ForkJoinPool.commonPool();
+                final ThreadInterruptor interrupter = new ThreadInterruptor(p, targetThread);
+                common.scheduleAtFixedRate(interrupter, delay, delay, TimeUnit.MILLISECONDS);
+            }
+        }
+
+        // Verify that an interrupt is pending and reset it
+        private static void processAssertInterrupted(Process p) {
+            Assertions.assertTrue(Thread.interrupted(), "Expected an interrupt");
+        }
+    }
+
+    // Runnable scheduled at a fixed rate to interrupt a thread if a process is alive.
+    private static class ThreadInterruptor implements Runnable {
+        private final Process process;
+        private final Thread targetThread;
+        private int count;
+
+        ThreadInterruptor(Process process, Thread targetThread) {
+            this.process = process;
+            this.targetThread = targetThread;
+            this.count = 0;
+        }
+
+        public void run() {
+            if (process.isAlive()) {
+                count++;
+                Log.printf("Interrupting thread, count: %d%n", count);
+                targetThread.interrupt();
+            } else {
+                throw new RuntimeException("process not alive");
+            }
+        }
+    }
+
+    // Commands to Java child sent as command line arguments
+    enum ChildCommand {
+        STDOUT_ECHO(ChildCommand::stdoutEchoBytes),
+        STDERR_ECHO(ChildCommand::stderrEchoBytes),
+        SLEEP(ChildCommand::SLEEP),
+        STDOUT_MARCO(ChildCommand::stdoutMarco),
+        STDERR_MARCO(ChildCommand::stderrMarco),
+        PROCESS_EXIT1(ChildCommand::processExit1),
+        ;
+        private final Runnable command;
+        ChildCommand(Runnable cmd) {
+            this.command = cmd;
+        }
+
+        // The child sleeps before continuing with next ChildCommand
+        private static void SLEEP() {
+            final int sleepMS = 2_000;
+            try {
+                Thread.sleep(sleepMS);
+            } catch (InterruptedException ie) {
+                // Interrupted sleep, re-assert interrupted status
+                System.err.println("Sleep interrupted");  // Note the interruption in the log
+                Thread.currentThread().interrupt();
+            }
+        }
+
+        private static void stdoutEchoBytes() {
+            echoBytes(System.in, System.out);
+        }
+
+        private static void stderrEchoBytes() {
+            echoBytes(System.in, System.err);
+        }
+
+        private static void echoBytes(InputStream in, PrintStream out) {
+            try {
+                byte[] bytes = in.readAllBytes();
+                out.write(bytes);
+            } catch (IOException ioe) {
+                out.println(ioe);
+            }
+        }
+
+        private static void stdoutMarco() {
+            System.out.println("Polo");
+        }
+
+        private static void stderrMarco() {
+            System.err.println("Polo");
+        }
+
+        private static void processExit1() {
+            System.exit(1);
+        }
+    }
+
+    static Stream<Arguments> closeExceptions() {
+        return Stream.of(
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_OUT_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_IN_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_ERROR_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_OUT_CLOSE_EXCEPTION,
+                                ProcessCommand.PROCESS_FORCE_IN_CLOSE_EXCEPTION,
+                                ProcessCommand.PROCESS_FORCE_ERROR_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG, FORCED_CLOSE_MSG, FORCED_CLOSE_MSG)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_OUT_CLOSE_EXCEPTION,
+                                ProcessCommand.PROCESS_FORCE_IN_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG, FORCED_CLOSE_MSG)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_OUT_CLOSE_EXCEPTION,
+                                ProcessCommand.PROCESS_FORCE_ERROR_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG, FORCED_CLOSE_MSG)),
+                Arguments.of(javaArgs(ChildCommand.SLEEP),
+                        List.of(ProcessCommand.PROCESS_FORCE_IN_CLOSE_EXCEPTION,
+                                ProcessCommand.PROCESS_FORCE_ERROR_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG, FORCED_CLOSE_MSG)),
+                Arguments.of(List.of("echo", "xyz1"),
+                        List.of(ProcessCommand.PROCESS_FORCE_OUT_CLOSE_EXCEPTION),
+                        List.of(ExitStatus.RACY), List.of(FORCED_CLOSE_MSG))
+        );
+    }
+    /**
+     * Test AutoCloseable for cases that are expected to throw exceptions.
+     * The list of ProcessCommands controls what is sent to the process and closing of streams.
+     * The command line arguments control the sequence of actions taken by the child.
+     * @param args The command line arguments for the child process
+     * @param commands the commands to this process controlling the child
+     * @param postCommands The expected final exit status
+     * @param expectedMessages the list of exception messages expected by close()
+     */
+    @ParameterizedTest
+    @MethodSource("closeExceptions")
+    void testStreamsCloseThrowing(List<String> args, List<Consumer<Process>> commands,
+                                  List<Consumer<Process>> postCommands, List<String> expectedMessages) {
+        var log = Log.get();
+        try {
+            ProcessBuilder pb = new ProcessBuilder(args);
+            Process proc = null;
+            IOException expectedIOE = null;
+            try (Process p = pb.start()) {
+                proc = p;
+                Log.printf("Program: %s; pid: %d\n",args, p.pid());
+                doCommands(p, commands);
+            } catch (IOException ioe) {
+                expectedIOE = ioe;
+            }
+            // Check the exceptions thrown, if any
+            if (expectedIOE != null) {
+                // Check each exception that it is expected
+                Assertions.assertEquals(expectedMessages.getFirst(), expectedIOE.getMessage(),
+                        "Unexpected exception message");
+                var suppressedEx = expectedIOE.getSuppressed();
+                Assertions.assertEquals(expectedMessages.size() - 1, suppressedEx.length,
+                        "Number of suppressed exceptions");
+                for (int i = 1; i < expectedMessages.size(); i++) {
+                    Assertions.assertEquals(expectedMessages.get(i),
+                            suppressedEx[i - 1].getMessage(),
+                            "Unexpected suppressed exception message");
+                }
+            }
+            Assertions.assertNotNull(proc, "Process is null");
+            doCommands(proc, postCommands);
+        }  catch (Exception ex) {
+            System.err.println(log);
+            throw ex;
+        }
+    }
+
+    /**
+     * An OutputStream that delegates to another stream and always throws IOException on close().
+     */
+    private static class ThrowingOutputStream extends FilterOutputStream {
+        public ThrowingOutputStream(OutputStream out) {
+            super(out);
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                out.close();
+            } catch (IOException ioe) {
+                // ignore except to log the exception; may be useful to debug
+                ioe.printStackTrace(System.err);
+            }
+            throw new IOException(FORCED_CLOSE_MSG);
+        }
+    }
+
+    /**
+     * An InputStream that delegates to another stream and always throws IOException on close().
+     */
+    private static class ThrowingInputStream extends FilterInputStream {
+        public ThrowingInputStream(InputStream in) {
+            super(in);
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                in.close();
+            } catch (IOException ioe) {
+                // ignore except to log the exception; may be useful to debug
+                ioe.printStackTrace(System.err);
+            }
+            throw new IOException(FORCED_CLOSE_MSG);
+        }
+    }
+
+    // Copy of ProcessExamples in java/lang/snippet-files/ProcessExamples.java
+    @Test
+    void example() {
+        try (Process p = new ProcessBuilder(CAT_PROGRAM).start();
+             Writer writer = p.outputWriter();
+             Reader reader = p.inputReader()) {
+            writer.write(haiku);
+            writer.close();
+            // Read all lines and print each
+            reader.readAllLines()
+                    .forEach(System.out::println);
+            var status = p.waitFor();
+            if (status != 0)
+                throw new RuntimeException("unexpected process status: " + status);
+        } catch (Exception e) {
+            System.err.println("Process failed: " + e);
+        }
+    }
+
+    String haiku = """
+                Oh, the sunrise glow;
+                Paddling with the river flow;
+                Chilling still, go slow.
+                """;
+
+    /**
+     * Child program that executes child actions as named by command line args.
+     * @param childCommands a sequence of ChildCommand names.
+     */
+    public static void main(String... childCommands)  {
+        List<String> args = List.of(childCommands);
+        List<ChildCommand> commands = args.stream().map(ChildCommand::valueOf).toList();
+        commands.forEach(c -> c.command.run());
+    }
+
+    /**
+     * Log of output produced on a thread during a test.
+     * Normally, the output is buffered and only output to stderr if the test fails.
+     * Set -DDEBUG=true to send all output to stderr as it occurs.
+     */
+    private static class Log {
+
+        private static final boolean DEBUG = Boolean.getBoolean("DEBUG");
+        private final static ScopedValue<Appendable> OUT = ScopedValue.newInstance();
+        private final static ScopedValue.Carrier LOG = setupLog();
+
+        private static ScopedValue.Carrier setupLog() {
+            if (DEBUG) {
+                return ScopedValue.where(OUT, System.err);
+            } else {
+                return ScopedValue.where(OUT, new StringBuffer());
+            }
+        }
+
+        // Return the log for this thread and clear the buffer.
+        private static Appendable get() {
+            var log = LOG.get(OUT);
+            if (log instanceof StringBuffer sb)
+                sb.setLength(0);
+            return log;
+        }
+
+        // Printf to the log for this thread.
+        private static void printf(String format, Object... args) {
+            try {
+                var log = LOG.get(OUT);
+                log.append(format.formatted(args));
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+    }
+}

From 8585b46c1221f6894f4f1cda34714e7b49a8cccb Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 4 Nov 2025 21:40:50 +0000
Subject: [PATCH 022/512] =?UTF-8?q?8364583:=20ColorConvertOp=20fails=20for?=
 =?UTF-8?q?=20CMYK=20=E2=86=92=20RGB=20conversion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: serb, psadhukhan, honkar
---
 .../java/awt/image/ColorConvertOp.java        |   2 +-
 .../ColorConvertOp/ColorConvertOpCMYK.java    |  51 ++++++++++++++++++
 .../awt/image/ColorConvertOp/black_cmyk.jpg   | Bin 0 -> 220 bytes
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java
 create mode 100644 test/jdk/java/awt/image/ColorConvertOp/black_cmyk.jpg

diff --git a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
index c1c60397198..bf0292ca5c3 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
@@ -808,7 +808,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
                 idx = 0;
                 for (int x = 0; x < w; x++) {
                     pixel = srcRas.getDataElements(x, y, pixel);
-                    color = srcCM.getNormalizedComponents(pixel, color, 0);
+                    color = srcCM.getNormalizedComponents(pixel, null, 0);
                     if (needSrcAlpha) {
                         alpha[x] = color[srcNumComp];
                     }
diff --git a/test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java b/test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java
new file mode 100644
index 00000000000..9b008c591a8
--- /dev/null
+++ b/test/jdk/java/awt/image/ColorConvertOp/ColorConvertOpCMYK.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.io.File;
+
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorConvertOp;
+import java.awt.image.ColorModel;
+
+import javax.imageio.ImageIO;
+
+/*
+ * @test
+ * @bug 8364583
+ * @summary Verify CMYK images work with ColorConvertOp
+ */
+
+public class ColorConvertOpCMYK {
+
+    public static void main(String[] args) throws Exception {
+        String sep = System.getProperty("file.separator");
+        String dir = System.getProperty("test.src", ".");
+        String prefix = dir + sep;
+        File file = new File(prefix + "black_cmyk.jpg");
+        BufferedImage source = ImageIO.read(file);
+        ColorModel sourceModel = source.getColorModel();
+        ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        ColorConvertOp convertOp = new ColorConvertOp(cs, null);
+        BufferedImage rgb = convertOp.filter(source, null);
+    }
+}
diff --git a/test/jdk/java/awt/image/ColorConvertOp/black_cmyk.jpg b/test/jdk/java/awt/image/ColorConvertOp/black_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1446f063bddf0c80a63a4a9da213b5560ad1d236
GIT binary patch
literal 220
zcmZ9FO%8%E6odz<O<#f10^WgJ7(+rt!p;p_gKJOYeO!15e>R@LD?D2_M8A2NOeT35
zzVQoo*LE$UD8kkY{D#>~r^68w0{ldSco7I5dxR7LCFN3*(wY>JPV-bJCLzjPW^!wt
z)oD={w)ENZ1(iaLS~L!W!|2dE@D(dR{GFMNd|lc97W{w_4F-(pfi=$E-rxN8oA~|#
DH1{1W

literal 0
HcmV?d00001


From 245eeb41bc749cba4e44bf3998cf07e7a1b784ed Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 4 Nov 2025 21:47:40 +0000
Subject: [PATCH 023/512] 8357252: sun/awt/font/TestArabicHebrew.java fails in
 OEL 9 and 10 x64

Reviewed-by: serb, psadhukhan, kizune
---
 src/java.desktop/unix/native/common/awt/fontpath.c | 10 +---------
 test/jdk/sun/awt/font/TestArabicHebrew.java        |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index 95499cfc948..d3821504bfb 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -1038,7 +1038,7 @@ Java_sun_font_FontConfigManager_getFontConfig
             return;
         }
         fontCount = 0;
-        minGlyphs = 20;
+        minGlyphs = 0;
         if (debugMinGlyphsStr != NULL) {
             int val = minGlyphs;
             sscanf(debugMinGlyphsStr, "%5d", &val);
@@ -1086,14 +1086,6 @@ Java_sun_font_FontConfigManager_getFontConfig
                 return;
             }
 
-            /* We don't want 20 or 30 fonts, so once we hit 10 fonts,
-             * then require that they really be adding value. Too many
-             * adversely affects load time for minimal value-add.
-             * This is still likely far more than we've had in the past.
-             */
-            if (j==10) {
-                minGlyphs = 50;
-            }
             if (unionCharset == NULL) {
                 unionCharset = charset;
             } else {
diff --git a/test/jdk/sun/awt/font/TestArabicHebrew.java b/test/jdk/sun/awt/font/TestArabicHebrew.java
index 61cbe931c32..356d36a4d21 100644
--- a/test/jdk/sun/awt/font/TestArabicHebrew.java
+++ b/test/jdk/sun/awt/font/TestArabicHebrew.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4198081
+ * @bug 4198081 8357252
  * @key headful
  * @summary Arabic characters should appear instead of boxes and be correctly shaped.
  *          Hebrew characters should appear instead of boxes.

From 984c87cf767a46a2c1000a4030dfd91a62b03b4d Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 4 Nov 2025 21:47:58 +0000
Subject: [PATCH 024/512] 8370719: [Linux] Use /etc/os-release values for font
 configuration file names

Reviewed-by: kizune, psadhukhan
---
 .../classes/sun/font/FcFontConfiguration.java | 34 ++-----------------
 .../classes/sun/font/MFontConfiguration.java  | 34 ++-----------------
 2 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
index 328e2454842..27d6773105e 100644
--- a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
+++ b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
@@ -317,42 +317,14 @@ public final class FcFontConfiguration extends FontConfiguration {
             return;
         }
         try {
-            File f;
-            if ((f = new File("/etc/lsb-release")).canRead()) {
-                    /* Ubuntu and (perhaps others) use only lsb-release.
-                     * Syntax and encoding is compatible with java properties.
-                     * For Ubuntu the ID is "Ubuntu".
-                     */
-                    Properties props = new Properties();
-                    try (FileInputStream fis = new FileInputStream(f)) {
-                        props.load(fis);
-                    }
-                    osName = extractInfo(props.getProperty("DISTRIB_ID"));
-                    osVersion = extractInfo(props.getProperty("DISTRIB_RELEASE"));
-            } else if ((f = new File("/etc/redhat-release")).canRead()) {
-                osName = "RedHat";
-                osVersion = getVersionString(f);
-            } else if ((f = new File("/etc/SuSE-release")).canRead()) {
-                osName = "SuSE";
-                osVersion = getVersionString(f);
-            } else if ((f = new File("/etc/turbolinux-release")).canRead()) {
-                osName = "Turbo";
-                osVersion = getVersionString(f);
-            } else if ((f = new File("/etc/fedora-release")).canRead()) {
-                osName = "Fedora";
-                osVersion = getVersionString(f);
-            } else if ((f = new File("/etc/os-release")).canRead()) {
+            File f = new File("/etc/os-release");
+            if (f.canRead()) {
                 Properties props = new Properties();
                 try (FileInputStream fis = new FileInputStream(f)) {
                     props.load(fis);
                 }
-                osName = extractInfo(props.getProperty("NAME"));
+                osName = extractInfo(props.getProperty("ID"));
                 osVersion = extractInfo(props.getProperty("VERSION_ID"));
-                if (osName.equals("SLES")) {
-                    osName = "SuSE";
-                } else {
-                    osName = extractInfo(props.getProperty("ID"));
-                }
             }
         } catch (Exception e) {
             if (FontUtilities.debugFonts()) {
diff --git a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
index 3d7e68d8dea..f5a8fe8b3c0 100644
--- a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
+++ b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
@@ -91,42 +91,14 @@ public final class MFontConfiguration extends FontConfiguration {
 
         if (osName.equals("Linux")) {
             try {
-                File f;
-                if ((f = new File("/etc/fedora-release")).canRead()) {
-                    osName = "Fedora";
-                    osVersion = getVersionString(f);
-                } else if ((f = new File("/etc/redhat-release")).canRead()) {
-                    osName = "RedHat";
-                    osVersion = getVersionString(f);
-                } else if ((f = new File("/etc/turbolinux-release")).canRead()) {
-                    osName = "Turbo";
-                    osVersion = getVersionString(f);
-                } else if ((f = new File("/etc/SuSE-release")).canRead()) {
-                    osName = "SuSE";
-                    osVersion = getVersionString(f);
-                } else if ((f = new File("/etc/lsb-release")).canRead()) {
-                    /* Ubuntu and (perhaps others) use only lsb-release.
-                     * Syntax and encoding is compatible with java properties.
-                     * For Ubuntu the ID is "Ubuntu".
-                     */
+                File f = new File("/etc/os-release");
+                if (f.canRead()) {
                     Properties props = new Properties();
                     try (FileInputStream fis = new FileInputStream(f)) {
                         props.load(fis);
                     }
-                    osName = extractInfo(props.getProperty("DISTRIB_ID"));
-                    osVersion = extractInfo(props.getProperty("DISTRIB_RELEASE"));
-                } else if ((f = new File("/etc/os-release")).canRead()) {
-                    Properties props = new Properties();
-                    try (FileInputStream fis = new FileInputStream(f)) {
-                        props.load(fis);
-                    }
-                    osName = extractInfo(props.getProperty("NAME"));
+                    osName = extractInfo(props.getProperty("ID"));
                     osVersion = extractInfo(props.getProperty("VERSION_ID"));
-                    if (osName.equals("SLES")) {
-                        osName = "SuSE";
-                    } else {
-                        osName = extractInfo(props.getProperty("ID"));
-                    }
                 }
             } catch (Exception e) {
             }

From 146f8a83f9195ff246e2c3803c79171509df7d24 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 4 Nov 2025 21:49:41 +0000
Subject: [PATCH 025/512] 4954405: Data buffers created with an offset are
 unusable

Reviewed-by: avu, psadhukhan, jdv
---
 .../sun/awt/image/ByteInterleavedRaster.java  |  4 +-
 .../ByteInterleavedRasterOffsetsTest.java     | 73 +++++++++++++++++++
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java

diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
index f0dedd9775a..775e7803c5b 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
@@ -206,7 +206,7 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
             this.pixelStride = csm.getPixelStride();
             this.dataOffsets = csm.getBandOffsets();
             for (int i = 0; i < getNumDataElements(); i++) {
-                dataOffsets[i] += xOffset*pixelStride+yOffset*scanlineStride;
+                dataOffsets[i] += dataBuffer.getOffset() + xOffset*pixelStride+yOffset*scanlineStride;
             }
         } else if (sampleModel instanceof SinglePixelPackedSampleModel) {
             SinglePixelPackedSampleModel sppsm =
@@ -227,7 +227,7 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
         }
         this.bandOffset = this.dataOffsets[0];
 
-        this.dbOffsetPacked = dataBuffer.getOffset() -
+        this.dbOffsetPacked = -
             sampleModelTranslateY*scanlineStride -
             sampleModelTranslateX*pixelStride;
         this.dbOffset = dbOffsetPacked -
diff --git a/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java b/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java
new file mode 100644
index 00000000000..ec077c45ff1
--- /dev/null
+++ b/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+
+/*
+ * @test
+ * @bug  4954405
+ * @summary Verify DataBuffer offsets are handled by ByteInterleavedRaster
+ */
+
+public class ByteInterleavedOffsetsTest {
+
+    public static void main(String[] args) {
+        byte[] data = { 0, -1, 0, 0 }; // only set the R sample.
+        int[] bandOffsets = { 0, 1, 2 };
+        DataBuffer databuf = new DataBufferByte(data, 3, 1);
+        WritableRaster raster =
+            Raster.createInterleavedRaster(databuf, 1, 1, 3, 3, bandOffsets, null);
+        int[] pixels = raster.getPixels(0, 0, 1, 1, (int[])null);
+        byte[] elements = (byte[])raster.getDataElements(0, 0, null);
+        ColorModel colorModel = new ComponentColorModel(
+                ColorSpace.getInstance(ColorSpace.CS_sRGB), false, false,
+                ColorModel.OPAQUE, DataBuffer.TYPE_BYTE);
+        BufferedImage img = new BufferedImage(colorModel, raster, false, null);
+        int pixel = img.getRGB(0, 0);
+
+        System.out.println("PIXEL0=" + Integer.toHexString(pixels[0]));
+        System.out.println("PIXEL1=" + Integer.toHexString(pixels[1]));
+        System.out.println("PIXEL2=" + Integer.toHexString(pixels[2]));
+        System.out.println("ELEMENT0=" + Integer.toHexString(elements[0] & 0xff));
+        System.out.println("ELEMENT1=" + Integer.toHexString(elements[1] & 0xff));
+        System.out.println("ELEMENT2=" + Integer.toHexString(elements[2] & 0xff));
+        System.out.println("PIXEL=" + Integer.toHexString(pixel));
+
+        if ((pixels[0] != 0xff) || (pixels[1] != 0) || (pixels[2] != 0)) {
+            throw new RuntimeException("Unexpected pixels");
+        }
+        if (((elements[0] & 0xff) != 0xff) || (elements[1] != 0) || (elements[2] != 0)) {
+            throw new RuntimeException("Unexpected elements");
+        }
+        if (pixel != 0xffff0000) {
+            throw new RuntimeException("Unexpected pixel");
+        }
+    }
+}

From 463f5dc112386802b9ce0cc985a961ecfd3fbc55 Mon Sep 17 00:00:00 2001
From: Koushik Thirupattur <koushik.thirupattur@oracle.com>
Date: Tue, 4 Nov 2025 22:08:33 +0000
Subject: [PATCH 026/512] 8371296: Refactor tests to use PEM API (Phase 1) -
 Fix WriteP12Test failure

Reviewed-by: ascarpino
---
 test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java b/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java
index 96bbbbcde13..535cb8c8f4c 100644
--- a/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java
+++ b/test/jdk/java/security/KeyStore/PKCS12/WriteP12Test.java
@@ -133,7 +133,7 @@ public class WriteP12Test {
 
     public static void main(String[] args) throws UnrecoverableKeyException,
             KeyStoreException, NoSuchProviderException,
-            NoSuchAlgorithmException, IOException {
+            NoSuchAlgorithmException, IOException, CertificateException {
         WriteP12Test jstest = new WriteP12Test();
         out.println("test WriteP12CertChain");
         /*

From c8f5fd6ff3808804eda03c9754698a00dd06449c Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 4 Nov 2025 22:41:17 +0000
Subject: [PATCH 027/512] 8371184: Improve jpackage test coverage for
 "--app-image" option

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/PackageTestTest.java    |   3 +-
 .../jdk/jpackage/test/AdditionalLauncher.java |   2 +-
 .../jdk/jpackage/test/ConfigFilesStasher.java |   4 +-
 .../jdk/jpackage/test/JPackageCommand.java    | 173 ++++++++++++++----
 .../jdk/jpackage/test/LauncherVerifier.java   |  36 +++-
 .../jdk/jpackage/test/LinuxHelper.java        |  10 +-
 .../helpers/jdk/jpackage/test/MacHelper.java  |  45 ++++-
 .../jdk/jpackage/test/PackageTest.java        |  10 +
 .../jdk/jpackage/test/PropertyFinder.java     |  30 ++-
 .../macosx/SigningPackageTwoStepTest.java     |   4 +-
 .../jpackage/share/AddLShortcutTest.java      |  48 ++---
 .../tools/jpackage/share/AddLauncherTest.java |   5 +-
 .../tools/jpackage/share/AppContentTest.java  |   4 +-
 .../jpackage/share/AppImagePackageTest.java   |  35 ++--
 .../tools/jpackage/share/InstallDirTest.java  |  40 ++--
 .../share/MultiLauncherTwoPhaseTest.java      |  14 +-
 .../jpackage/share/MultiNameTwoPhaseTest.java |  14 +-
 .../jpackage/share/PostImageScriptTest.java   |   5 +-
 .../jdk/tools/jpackage/share/ServiceTest.java |   5 +-
 .../jpackage/windows/Win8282351Test.java      |  25 +--
 20 files changed, 331 insertions(+), 181 deletions(-)

diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
index 4cf89fca3cc..4723f4dadbd 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
@@ -351,7 +351,8 @@ public class PackageTestTest extends JUnitAdapter {
                     }
 
                     @Override
-                    public void verifyIsOfType(PackageType ... types) {
+                    public JPackageCommand verifyIsOfType(Set<PackageType> types) {
+                        return this;
                     }
 
                     @Override
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
index a41e2b5043f..4f0e3f4e485 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
@@ -165,7 +165,7 @@ public final class AdditionalLauncher {
 
     public void applyTo(JPackageCommand cmd) {
         cmd.addPrerequisiteAction(this::initialize);
-        cmd.addVerifyAction(createVerifierAsConsumer());
+        cmd.addVerifyAction(createVerifierAsConsumer(), JPackageCommand.ActionRole.LAUNCHER_VERIFIER);
     }
 
     public void applyTo(PackageTest test) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
index 11627ab9125..0b3f5defbac 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
@@ -192,9 +192,7 @@ final class ConfigFilesStasher {
     }
 
     private static ApplicationLayout appImageAppLayout(JPackageCommand cmd) {
-        if (cmd.isRuntime()) {
-            throw new UnsupportedOperationException();
-        }
+        cmd.verifyNotRuntime();
 
         if (cmd.isImagePackageType()) {
             return platformAppImage();
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
index 088a9fe3bad..57915b91d8b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -28,13 +28,16 @@ import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toCollection;
 import static jdk.jpackage.test.AdditionalLauncher.forEachAdditionalLauncher;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -48,6 +51,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -56,6 +60,7 @@ import java.util.regex.Pattern;
 import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
@@ -85,7 +90,6 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         ignoreDefaultRuntime = cmd.ignoreDefaultRuntime;
         ignoreDefaultVerbose = cmd.ignoreDefaultVerbose;
         this.immutable = immutable;
-        dmgInstallDir = cmd.dmgInstallDir;
         prerequisiteActions = new Actions(cmd.prerequisiteActions);
         verifyActions = new Actions(cmd.verifyActions);
         standardAsserts = cmd.standardAsserts;
@@ -165,11 +169,6 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return null;
     }
 
-    public String getArgumentValue(String argName,
-            Function<JPackageCommand, String> defaultValueSupplier) {
-        return getArgumentValue(argName, defaultValueSupplier, v -> v);
-    }
-
     public <T> T getArgumentValue(String argName,
             Supplier<T> defaultValueSupplier,
             Function<String, T> stringConverter) {
@@ -332,16 +331,35 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return this;
     }
 
+    public JPackageCommand usePredefinedAppImage(Path predefinedAppImagePath) {
+        return setArgumentValue("--app-image", Objects.requireNonNull(predefinedAppImagePath))
+                .removeArgumentWithValue("--input");
+    }
+
     JPackageCommand addPrerequisiteAction(ThrowingConsumer<JPackageCommand> action) {
         prerequisiteActions.add(action);
         return this;
     }
 
     JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand> action) {
-        verifyActions.add(action);
+        return addVerifyAction(action, ActionRole.DEFAULT);
+    }
+
+    enum ActionRole {
+        DEFAULT,
+        LAUNCHER_VERIFIER,
+        ;
+    }
+
+    JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand> action, ActionRole actionRole) {
+        verifyActions.add(action, actionRole);
         return this;
     }
 
+    Stream<ThrowingConsumer<JPackageCommand>> getVerifyActionsWithRole(ActionRole actionRole) {
+        return verifyActions.actionsWithRole(actionRole);
+    }
+
     /**
      * Shorthand for {@code helloAppImage(null)}.
      */
@@ -550,11 +568,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }
 
         if (TKit.isOSX()) {
-            if (packageType() == PackageType.MAC_DMG && dmgInstallDir != null) {
-                return dmgInstallDir;
-            } else {
-                return MacHelper.getInstallationDirectory(this);
-            }
+            return MacHelper.getInstallationDirectory(this);
         }
 
         throw TKit.throwUnknownPlatformError();
@@ -676,10 +690,11 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return Collections.unmodifiableList(names);
     }
 
-    private void verifyNotRuntime() {
+    JPackageCommand verifyNotRuntime() {
         if (isRuntime()) {
-            throw new IllegalArgumentException("Java runtime packaging");
+            throw new UnsupportedOperationException("Java runtime packaging");
         }
+        return this;
     }
 
     /**
@@ -1212,6 +1227,52 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                 MacHelper.verifyUnsignedBundleSignature(cmd);
             }
         }),
+        PREDEFINED_APP_IMAGE_COPY(cmd -> {
+            Optional.ofNullable(cmd.getArgumentValue("--app-image")).filter(_ -> {
+                return !TKit.isOSX() || !MacHelper.signPredefinedAppImage(cmd);
+            }).map(Path::of).ifPresent(predefinedAppImage -> {
+
+                TKit.trace(String.format(
+                        "Check contents of the predefined app image [%s] copied verbatim",
+                        predefinedAppImage));
+
+                var outputAppImageDir = cmd.pathToUnpackedPackageFile(cmd.appInstallationDirectory());
+
+                try (var walk = Files.walk(predefinedAppImage)) {
+                    var filteredWalk = walk;
+                    if (!cmd.expectAppImageFile()) {
+                        var appImageFile = AppImageFile.getPathInAppImage(predefinedAppImage);
+                        // Exclude ".jpackage.xml" as it should no be in the output bundle.
+                        var pred = Predicate.<Path>isEqual(appImageFile).negate();
+                        if (TKit.isOSX()) {
+                            // On MacOS exclude files that can be signed as their digests change.
+                            pred = pred.and(path -> {
+                                return MacHelper.isVerbatimCopyFromPredefinedAppImage(cmd, path);
+                            });
+                        }
+
+                        filteredWalk = walk.filter(pred);
+                    }
+
+                    var verbatimPaths = filteredWalk.collect(toCollection(TreeSet::new));
+
+                    // Remove nonempty directories from the collection of paths copied verbatim.
+                    verbatimPaths.removeAll(verbatimPaths.stream().map(Path::getParent).toList());
+
+                    verbatimPaths.forEach(ThrowingConsumer.toConsumer(p -> {
+                        if (Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) {
+                            TKit.assertDirectoryExists(p);
+                        } else {
+                            TKit.assertSameFileContent(p, outputAppImageDir.resolve(predefinedAppImage.relativize(p)));
+                        }
+                    }));
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+
+                TKit.trace("Done");
+            });
+        })
         ;
 
         StandardAssert(Consumer<JPackageCommand> action) {
@@ -1220,9 +1281,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
         private static JPackageCommand convertFromRuntime(JPackageCommand cmd) {
             var copy = cmd.createMutableCopy();
-            copy.immutable = false;
             copy.removeArgumentWithValue("--runtime-image");
-            copy.dmgInstallDir = cmd.appInstallationDirectory();
             if (!copy.hasArgument("--name")) {
                 copy.addArguments("--name", cmd.nameFromRuntimeImage().orElseThrow());
             }
@@ -1440,29 +1499,35 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return getPrintableCommandLine();
     }
 
-    public void verifyIsOfType(Collection<PackageType> types) {
-        verifyIsOfType(types.toArray(PackageType[]::new));
+    public final JPackageCommand verifyIsOfType(PackageType ... types) {
+        return verifyIsOfType(Set.of(types));
     }
 
-    public void verifyIsOfType(PackageType ... types) {
-        final var typesSet = Stream.of(types).collect(Collectors.toSet());
+    public final JPackageCommand verifyIsOfType(Iterable<PackageType> types) {
+        return verifyIsOfType(StreamSupport.stream(types.spliterator(), false).collect(toSet()));
+    }
+
+    public JPackageCommand verifyIsOfType(Set<PackageType> types) {
+        Objects.requireNonNull(types);
         if (!hasArgument("--type")) {
             if (!isImagePackageType()) {
-                if ((TKit.isLinux() && typesSet.equals(PackageType.LINUX)) || (TKit.isWindows() && typesSet.equals(PackageType.WINDOWS))) {
-                    return;
+                if ((TKit.isLinux() && types.equals(PackageType.LINUX)) || (TKit.isWindows() && types.equals(PackageType.WINDOWS))) {
+                    return this;
                 }
 
-                if (TKit.isOSX() && typesSet.equals(PackageType.MAC)) {
-                    return;
+                if (TKit.isOSX() && types.equals(PackageType.MAC)) {
+                    return this;
                 }
-            } else if (typesSet.equals(Set.of(PackageType.IMAGE))) {
-                return;
+            } else if (types.equals(Set.of(PackageType.IMAGE))) {
+                return this;
             }
         }
 
-        if (!typesSet.contains(packageType())) {
-            throw new IllegalArgumentException("Unexpected type");
+        if (!types.contains(packageType())) {
+            throw new UnsupportedOperationException(String.format("Unsupported operation for type [%s]", packageType().getType()));
         }
+
+        return this;
     }
 
     public CfgFile readLauncherCfgFile() {
@@ -1558,18 +1623,47 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }
 
         void add(ThrowingConsumer<JPackageCommand> action) {
-            Objects.requireNonNull(action);
+            add(action, ActionRole.DEFAULT);
+        }
+
+        void add(ThrowingConsumer<JPackageCommand> action, ActionRole role) {
             verifyMutable();
-            actions.add(new Consumer<JPackageCommand>() {
-                @Override
-                public void accept(JPackageCommand t) {
-                    if (!executed) {
-                        executed = true;
-                        ThrowingConsumer.toConsumer(action).accept(t);
-                    }
+            actions.add(new Action(action, role));
+        }
+
+        Stream<ThrowingConsumer<JPackageCommand>> actionsWithRole(ActionRole role) {
+            Objects.requireNonNull(role);
+            return actions.stream().filter(action -> {
+                return Objects.equals(action.role(), role);
+            }).map(Action::impl);
+        }
+
+        private static final class Action implements Consumer<JPackageCommand> {
+
+            Action(ThrowingConsumer<JPackageCommand> impl, ActionRole role) {
+                this.impl = Objects.requireNonNull(impl);
+                this.role = Objects.requireNonNull(role);
+            }
+
+            ActionRole role() {
+                return role;
+            }
+
+            ThrowingConsumer<JPackageCommand> impl() {
+                return impl;
+            }
+
+            @Override
+            public void accept(JPackageCommand cmd) {
+                if (!executed) {
+                    executed = true;
+                    ThrowingConsumer.toConsumer(impl).accept(cmd);
                 }
-                private boolean executed;
-            });
+            }
+
+            private final ActionRole role;
+            private final ThrowingConsumer<JPackageCommand> impl;
+            private boolean executed;
         }
 
         @Override
@@ -1578,7 +1672,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             actions.forEach(action -> action.accept(JPackageCommand.this));
         }
 
-        private final List<Consumer<JPackageCommand>> actions;
+        private final List<Action> actions;
     }
 
     private Boolean withToolProvider;
@@ -1589,7 +1683,6 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     private boolean ignoreDefaultRuntime;
     private boolean ignoreDefaultVerbose;
     private boolean immutable;
-    private Path dmgInstallDir;
     private final Actions prerequisiteActions;
     private final Actions verifyActions;
     private Path executeInDirectory;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
index 489788b565a..da5b8583c72 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
@@ -24,6 +24,7 @@ package jdk.jpackage.test;
 
 import static java.util.stream.Collectors.toMap;
 import static jdk.jpackage.test.AdditionalLauncher.NO_ICON;
+import static jdk.jpackage.test.AdditionalLauncher.getAdditionalLauncherProperties;
 import static jdk.jpackage.test.LauncherShortcut.LINUX_SHORTCUT;
 
 import java.io.IOException;
@@ -34,6 +35,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -72,6 +74,12 @@ public final class LauncherVerifier {
         new LauncherVerifier(cmd).verify(cmd, Action.EXECUTE_LAUNCHER);
     }
 
+    static String launcherDescription(JPackageCommand cmd, String launcherName) {
+        return launcherDescription(cmd, launcherName, (theCmd, theLauncherName) -> {
+            return getAdditionalLauncherProperties(theCmd, theLauncherName);
+        });
+    }
+
 
     public enum Action {
         VERIFY_ICON(LauncherVerifier::verifyIcon),
@@ -137,8 +145,8 @@ public final class LauncherVerifier {
     }
 
     private String getDescription(JPackageCommand cmd) {
-        return findProperty("description").orElseGet(() -> {
-            return cmd.getArgumentValue("--description", cmd::name);
+        return launcherDescription(cmd, name, (theCmd, theLauncherName) -> {
+            return properties.orElseThrow();
         });
     }
 
@@ -272,7 +280,11 @@ public final class LauncherVerifier {
     }
 
     private void verifyDescription(JPackageCommand cmd) throws IOException {
-        if (TKit.isWindows()) {
+        if (TKit.isWindows() && !cmd.hasArgument("--app-image")) {
+            // On Windows, check the description if the predefined app image is not configured.
+            // The description and the icon are encoded in the launcher executable, which should be
+            // copied verbatim from the predefined app image into the output bundle.
+            // This check is done in the JPackageCommand class, so there is no need to duplicate it here.
             String expectedDescription = getDescription(cmd);
             Path launcherPath = cmd.appLauncherPath(name);
             String actualDescription =
@@ -424,6 +436,24 @@ public final class LauncherVerifier {
         });
     }
 
+    private static String launcherDescription(
+            JPackageCommand cmd,
+            String launcherName,
+            BiFunction<JPackageCommand, String, PropertyFile> addLauncherPropertyFileGetter) {
+
+        return PropertyFinder.findLauncherProperty(cmd, launcherName,
+                PropertyFinder.cmdlineOptionWithValue("--description"),
+                PropertyFinder.launcherPropertyFile("description"),
+                PropertyFinder.nop()
+        ).orElseGet(() -> {
+            if (cmd.isMainLauncher(launcherName)) {
+                return cmd.mainLauncherName();
+            } else {
+                return launcherDescription(cmd, null, addLauncherPropertyFileGetter);
+            }
+        });
+    }
+
 
     private static final class DefaultEntitlements {
         private static Map<String, Object> loadFromResources(String resourceName) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
index c8df0f640d0..25358e8ecdc 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -26,7 +26,6 @@ import static java.util.Collections.unmodifiableSortedSet;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
-import static jdk.jpackage.test.AdditionalLauncher.getAdditionalLauncherProperties;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -560,14 +559,7 @@ public final class LinuxHelper {
         TKit.assertTrue(mandatoryKeys.isEmpty(), String.format(
                 "Check for missing %s keys in the file", mandatoryKeys));
 
-        final String launcherDescription;
-        if (cmd.name().equals(launcherName) || predefinedAppImage.isPresent()) {
-            launcherDescription = Optional.ofNullable(cmd.getArgumentValue("--description")).orElseGet(cmd::name);
-        } else {
-            launcherDescription = getAdditionalLauncherProperties(cmd, launcherName).findProperty("description").or(() -> {
-                return Optional.ofNullable(cmd.getArgumentValue("--description"));
-            }).orElseGet(cmd::name);
-        }
+        final var launcherDescription = LauncherVerifier.launcherDescription(cmd, launcherName);
 
         for (var e : List.of(
                 Map.entry("Type", "Application"),
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
index 5c0914ed2f4..4e239e16b59 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -545,6 +545,43 @@ public final class MacHelper {
         }
     }
 
+    static boolean isVerbatimCopyFromPredefinedAppImage(JPackageCommand cmd, Path path) {
+        cmd.verifyIsOfType(PackageType.MAC);
+
+        final var predefinedAppImage = Path.of(cmd.getArgumentValue("--app-image"));
+
+        final var appLayout = ApplicationLayout.macAppImage().resolveAt(predefinedAppImage);
+
+        if (!path.startsWith(predefinedAppImage)) {
+            throw new IllegalArgumentException(
+                    String.format("Path [%s] is not in directory [%s]", path, predefinedAppImage));
+        }
+
+        if (path.startsWith(appLayout.contentDirectory().resolve("_CodeSignature"))) {
+            // A file in the "Contents/_CodeSignature" directory.
+            return false;
+        }
+
+        final var outputAppImageDir = cmd.pathToUnpackedPackageFile(cmd.appInstallationDirectory());
+
+        final var outputAppImagePath = outputAppImageDir.resolve(predefinedAppImage.relativize(path));
+
+        if (path.startsWith(appLayout.launchersDirectory()) &&
+                cmd.launcherNames(true).stream().map(cmd::appLauncherPath).collect(toSet()).contains(outputAppImagePath)) {
+            // The `path` references a launcher.
+            // It can be signed and its digest may change.
+            return false;
+        }
+
+        if (path.startsWith(appLayout.runtimeHomeDirectory().resolve("bin"))) {
+            // The `path` references an executable native command in JDK's "bin" subdirectory.
+            // It can be signed and its digest may change.
+            return false;
+        }
+
+        return true;
+    }
+
     static void verifyUnsignedBundleSignature(JPackageCommand cmd) {
         if (!cmd.isImagePackageType()) {
             MacSignVerify.assertUnsigned(cmd.outputBundle());
@@ -716,12 +753,8 @@ public final class MacHelper {
         final var defaultInstallLocation = Path.of(
                 cmd.isRuntime() ? "/Library/Java/JavaVirtualMachines" : "/Applications");
 
-        final Path installLocation;
-        if (cmd.packageType() == PackageType.MAC_DMG) {
-            installLocation = defaultInstallLocation;
-        } else {
-            installLocation = cmd.getArgumentValue("--install-dir", () -> defaultInstallLocation, Path::of);
-        }
+        final Path installLocation = Optional.ofNullable(cmd.getArgumentValue("--install-dir"))
+                .map(Path::of).orElse(defaultInstallLocation);
 
         return installLocation.resolve(cmd.name() + (cmd.isRuntime() ? ".jdk" : ".app"));
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
index 2e73f43b58d..5b3815510ce 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -60,6 +60,7 @@ import java.util.stream.StreamSupport;
 import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
+import jdk.jpackage.test.JPackageCommand.ActionRole;
 
 
 /**
@@ -233,6 +234,15 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
+    public PackageTest usePredefinedAppImage(JPackageCommand appImageCmd) {
+        appImageCmd.verifyIsOfType(PackageType.IMAGE);
+        addInitializer(cmd -> {
+            cmd.usePredefinedAppImage(appImageCmd.outputBundle());
+        });
+        appImageCmd.getVerifyActionsWithRole(ActionRole.LAUNCHER_VERIFIER).forEach(this::addInstallVerifier);
+        return this;
+    }
+
     public PackageTest disablePackageInstaller() {
         currentTypes.forEach(disabledInstallers::add);
         return this;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
index e310de855c6..54e3ef2ec54 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
@@ -26,7 +26,9 @@ import static jdk.jpackage.test.AdditionalLauncher.getAdditionalLauncherProperti
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import jdk.jpackage.test.AdditionalLauncher.PropertyFile;
 
@@ -42,6 +44,12 @@ final class PropertyFinder {
             };
         }
 
+        default Finder<T> defaultValue(Supplier<String> v) {
+            return target -> {
+                return Optional.of(find(target).orElseGet(v));
+            };
+        }
+
         default Finder<T> map(UnaryOperator<String> v) {
             Objects.requireNonNull(v);
             return target -> {
@@ -134,7 +142,27 @@ final class PropertyFinder {
             Finder<PropertyFile> addLauncherPropertyFileFinder,
             Finder<AppImageFile> appImageFileFinder) {
 
+        return findLauncherProperty(
+                cmd,
+                launcherName,
+                (theCmd, theLauncherName) -> {
+                    return getAdditionalLauncherProperties(theCmd, theLauncherName);
+                },
+                cmdlineFinder,
+                addLauncherPropertyFileFinder,
+                appImageFileFinder);
+    }
+
+    static Optional<String> findLauncherProperty(
+            JPackageCommand cmd,
+            String launcherName,
+            BiFunction<JPackageCommand, String, PropertyFile> addLauncherPropertyFileGetter,
+            Finder<JPackageCommand> cmdlineFinder,
+            Finder<PropertyFile> addLauncherPropertyFileFinder,
+            Finder<AppImageFile> appImageFileFinder) {
+
         Objects.requireNonNull(cmd);
+        Objects.requireNonNull(addLauncherPropertyFileGetter);
         Objects.requireNonNull(cmdlineFinder);
         Objects.requireNonNull(addLauncherPropertyFileFinder);
         Objects.requireNonNull(appImageFileFinder);
@@ -148,7 +176,7 @@ final class PropertyFinder {
         if (mainLauncher) {
             reply = cmdlineFinder.find(cmd);
         } else if (appImageFilePath.isEmpty()) {
-            var props = getAdditionalLauncherProperties(cmd, launcherName);
+            var props = addLauncherPropertyFileGetter.apply(cmd, launcherName);
             reply = addLauncherPropertyFileFinder.find(props);
         } else {
             reply = Optional.empty();
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
index 32311fd121e..586d8d68444 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
@@ -199,10 +199,8 @@ public class SigningPackageTwoStepTest {
 
             test.forTypes(signPackage.keySet()).addRunOnceInitializer(() -> {
                 appImageCmd.setArgumentValue("--dest", TKit.createTempDirectory("appimage")).execute(0);
-            }).addInitializer(cmd -> {
+            }).usePredefinedAppImage(appImageCmd).addInitializer(cmd -> {
                 MacHelper.useKeychain(cmd, keychain);
-                cmd.addArguments("--app-image", appImageCmd.outputBundle());
-                cmd.removeArgumentWithValue("--input");
                 Optional.ofNullable(signPackage.get(cmd.packageType())).ifPresent(signOption -> {
                     signOption.setTo(cmd);
                 });
diff --git a/test/jdk/tools/jpackage/share/AddLShortcutTest.java b/test/jdk/tools/jpackage/share/AddLShortcutTest.java
index f000e79227e..ef8f277e267 100644
--- a/test/jdk/tools/jpackage/share/AddLShortcutTest.java
+++ b/test/jdk/tools/jpackage/share/AddLShortcutTest.java
@@ -196,27 +196,22 @@ public class AddLShortcutTest {
         // and applies shortcut configuration to the main launcher in the native packaging jpackage command.
         //
 
-        Path[] predefinedAppImage = new Path[1];
+        var appImageCmd = JPackageCommand.helloAppImage()
+                .setArgumentValue("--name", "foo")
+                .setFakeRuntime();
 
-        new PackageTest().addRunOnceInitializer(() -> {
-            var cmd = JPackageCommand.helloAppImage()
-                    .setArgumentValue("--name", "foo")
-                    .setFakeRuntime();
+        for (var i = 1; i != cfgs.length; ++i) {
+            var al = new AdditionalLauncher("launcher-" + i);
+            cfgs[i].applyToAdditionalLauncher(al);
+            al.withoutVerifyActions(Action.EXECUTE_LAUNCHER).applyTo(appImageCmd);
+        }
 
-            for (var i = 1; i != cfgs.length; ++i) {
-                var al = new AdditionalLauncher("launcher-" + i);
-                cfgs[i].applyToAdditionalLauncher(al);
-                al.withoutVerifyActions(Action.EXECUTE_LAUNCHER).applyTo(cmd);
-            }
-
-            cmd.execute();
-
-            predefinedAppImage[0] = cmd.outputBundle();
-        }).addInitializer(cmd -> {
+        new PackageTest()
+        .addRunOnceInitializer(appImageCmd::execute)
+        .usePredefinedAppImage(appImageCmd)
+        .addInitializer(cmd -> {
             cfgs[0].applyToMainLauncher(cmd);
-            cmd.removeArgumentWithValue("--input");
             cmd.setArgumentValue("--name", "AddLShortcutDir2Test");
-            cmd.addArguments("--app-image", predefinedAppImage[0]);
         }).run(RunnablePackageTest.Action.CREATE_AND_UNPACK);
     }
 
@@ -237,20 +232,15 @@ public class AddLShortcutTest {
             shortcutArgs.add(startupDirectory.asStringValue());
         }
 
-        Path[] predefinedAppImage = new Path[1];
+        var appImageCmd = JPackageCommand.helloAppImage()
+                .setArgumentValue("--name", "foo")
+                .setFakeRuntime();
 
-        new PackageTest().addRunOnceInitializer(() -> {
-            var cmd = JPackageCommand.helloAppImage()
-                    .setArgumentValue("--name", "foo")
-                    .setFakeRuntime();
-
-            cmd.execute();
-
-            predefinedAppImage[0] = cmd.outputBundle();
-        }).addInitializer(cmd -> {
-            cmd.removeArgumentWithValue("--input");
+        new PackageTest()
+        .addRunOnceInitializer(appImageCmd::execute)
+        .usePredefinedAppImage(appImageCmd)
+        .addInitializer(cmd -> {
             cmd.setArgumentValue("--name", "AddLShortcutDir3Test");
-            cmd.addArguments("--app-image", predefinedAppImage[0]);
             cmd.ignoreDefaultVerbose(true);
         }).addInitializer(cmd -> {
             cmd.addArguments(shortcutArgs);
diff --git a/test/jdk/tools/jpackage/share/AddLauncherTest.java b/test/jdk/tools/jpackage/share/AddLauncherTest.java
index 21f475cbd78..2a85de33051 100644
--- a/test/jdk/tools/jpackage/share/AddLauncherTest.java
+++ b/test/jdk/tools/jpackage/share/AddLauncherTest.java
@@ -275,10 +275,9 @@ public class AddLauncherTest {
         if (withPredefinedAppImage) {
             new PackageTest().addInitializer(cmd -> {
                 cmd.setArgumentValue("--name", "Bar");
-                // Should not have impact of launcher descriptions, but it does.
+                // Should not have impact on launcher descriptions, but it does.
                 cmd.setArgumentValue("--description", "Installer");
-                cmd.removeArgumentWithValue("--input").setArgumentValue("--app-image", target.cmd().orElseThrow().outputBundle());
-            }).mutate(addLinuxShortcuts()).run(Action.CREATE_AND_UNPACK);
+            }).usePredefinedAppImage(target.cmd().orElseThrow()).mutate(addLinuxShortcuts()).run(Action.CREATE_AND_UNPACK);
         }
     }
 
diff --git a/test/jdk/tools/jpackage/share/AppContentTest.java b/test/jdk/tools/jpackage/share/AppContentTest.java
index 5b5734df61d..97c83bba57d 100644
--- a/test/jdk/tools/jpackage/share/AppContentTest.java
+++ b/test/jdk/tools/jpackage/share/AppContentTest.java
@@ -499,11 +499,11 @@ public class AppContentTest {
         return new FileContentFactory(() -> {
             var basedir = TKit.createTempDirectory("content").resolve(path);
 
-            for (var textFile : Map.ofEntries(
+            for (var textFile : List.of(
                     entry("woods/moose", "The moose"),
                     entry("woods/bear", "The bear"),
                     entry("woods/trees/jay", "The gray jay")
-            ).entrySet()) {
+            )) {
                 var src = basedir.resolve(textFile.getKey());
                 Files.createDirectories(src.getParent());
                 TKit.createTextFile(src, Stream.of(textFile.getValue()));
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index aacb76b122b..94eb086e4c6 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -62,15 +62,12 @@ public class AppImagePackageTest {
     @Test
     public static void test() {
 
-        var appImageCmd = JPackageCommand.helloAppImage()
-                .setArgumentValue("--dest", TKit.createTempDirectory("appimage"));
+        final var appImageCmd = createAppImageCommand();
 
         new PackageTest()
         .addRunOnceInitializer(appImageCmd::execute)
-        .addInitializer(cmd -> {
-            cmd.addArguments("--app-image", appImageCmd.outputBundle());
-            cmd.removeArgumentWithValue("--input");
-        }).addBundleDesktopIntegrationVerifier(false).run();
+        .usePredefinedAppImage(appImageCmd)
+        .addBundleDesktopIntegrationVerifier(false).run();
     }
 
     /**
@@ -85,10 +82,7 @@ public class AppImagePackageTest {
     @Parameter("false")
     public static void testEmpty(boolean withIcon) throws IOException {
 
-        var appImageCmd = JPackageCommand.helloAppImage()
-                .setFakeRuntime()
-                .setArgumentValue("--name", "EmptyAppImagePackageTest")
-                .setArgumentValue("--dest", TKit.createTempDirectory("appimage"));
+        final var appImageCmd = createAppImageCommand();
 
         new PackageTest()
         .addRunOnceInitializer(appImageCmd::execute)
@@ -116,12 +110,11 @@ public class AppImagePackageTest {
                 TKit.trace("Done");
             }
         })
+        .usePredefinedAppImage(appImageCmd)
         .addInitializer(cmd -> {
-            cmd.addArguments("--app-image", appImageCmd.outputBundle());
             if (withIcon) {
-                cmd.addArguments("--icon", iconPath("icon"));
+                cmd.setArgumentValue("--icon", iconPath("icon"));
             }
-            cmd.removeArgumentWithValue("--input");
 
             cmd.excludeStandardAsserts(
                     StandardAssert.MAIN_JAR_FILE,
@@ -160,10 +153,8 @@ public class AppImagePackageTest {
      */
     @Test
     public static void testBadAppImage3() {
-        Path appImageDir = TKit.createTempDirectory("appimage");
 
-        JPackageCommand appImageCmd = JPackageCommand.helloAppImage().
-                setFakeRuntime().setArgumentValue("--dest", appImageDir);
+        final var appImageCmd = createAppImageCommand();
 
         configureBadAppImage(appImageCmd.outputBundle()).addRunOnceInitializer(() -> {
             appImageCmd.execute();
@@ -176,10 +167,8 @@ public class AppImagePackageTest {
      */
     @Test
     public static void testBadAppImageFile() {
-        final var appImageRoot = TKit.createTempDirectory("appimage");
 
-        final var appImageCmd = JPackageCommand.helloAppImage().
-                setFakeRuntime().setArgumentValue("--dest", appImageRoot);
+        final var appImageCmd = createAppImageCommand();
 
         final var appImageDir = appImageCmd.outputBundle();
 
@@ -202,13 +191,17 @@ public class AppImagePackageTest {
 
     private static PackageTest configureBadAppImage(Path appImageDir, CannedFormattedString expectedError) {
         return new PackageTest().addInitializer(cmd -> {
-            cmd.addArguments("--app-image", appImageDir);
-            cmd.removeArgumentWithValue("--input");
+            cmd.usePredefinedAppImage(appImageDir);
             cmd.ignoreDefaultVerbose(true); // no "--verbose" option
             cmd.validateOutput(expectedError);
         }).setExpectedExitCode(1);
     }
 
+    private static JPackageCommand createAppImageCommand() {
+        final var appImageRoot = TKit.createTempDirectory("appimage");
+        return JPackageCommand.helloAppImage().setFakeRuntime().setArgumentValue("--dest", appImageRoot);
+    }
+
     private static Path iconPath(String name) {
         return TKit.TEST_SRC_ROOT.resolve(Path.of("resources", name
                 + TKit.ICON_SUFFIX));
diff --git a/test/jdk/tools/jpackage/share/InstallDirTest.java b/test/jdk/tools/jpackage/share/InstallDirTest.java
index 5106eed3fc6..db22077cd62 100644
--- a/test/jdk/tools/jpackage/share/InstallDirTest.java
+++ b/test/jdk/tools/jpackage/share/InstallDirTest.java
@@ -34,8 +34,6 @@ import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.RunnablePackageTest.Action;
-import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.TKit.TextStreamVerifier;
 
 /**
  * Test --install-dir parameter. Output of the test should be
@@ -113,9 +111,9 @@ public class InstallDirTest {
         .run();
     }
 
-    record DmgTestSpec(Path installDir, boolean runtimeInstaller) {
+    record TestSpec(Path installDir, boolean runtimeInstaller) {
 
-        DmgTestSpec {
+        TestSpec {
             Objects.requireNonNull(installDir);
         }
 
@@ -135,8 +133,8 @@ public class InstallDirTest {
                 return this;
             }
 
-            DmgTestSpec create() {
-                return new DmgTestSpec(installDir, runtimeInstaller);
+            TestSpec create() {
+                return new TestSpec(installDir, runtimeInstaller);
             }
 
             private Path installDir;
@@ -154,7 +152,7 @@ public class InstallDirTest {
         }
 
         void run() {
-            final var test = new PackageTest().forTypes(PackageType.MAC_DMG).ignoreBundleOutputDir();
+            final var test = new PackageTest().ignoreBundleOutputDir();
             if (runtimeInstaller) {
                 test.addInitializer(cmd -> {
                     cmd.removeArgumentWithValue("--input");
@@ -164,33 +162,33 @@ public class InstallDirTest {
             }
 
             test.addInitializer(JPackageCommand::setFakeRuntime).addInitializer(cmd -> {
-                cmd.addArguments("--install-dir", installDir);
+                cmd.setArgumentValue("--install-dir", installDir);
             }).run(Action.CREATE_AND_UNPACK);
         }
     }
 
     @Test(ifOS = OperatingSystem.MACOS)
     @ParameterSupplier
-    public static void testDmg(DmgTestSpec testSpec) {
+    public static void testMac(TestSpec testSpec) {
         testSpec.run();
     }
 
-    public static List<Object[]> testDmg() {
+    public static List<Object[]> testMac() {
         return Stream.of(
-                DmgTestSpec.build().acceptedInstallDir("/foo"),
-                DmgTestSpec.build().acceptedInstallDir("/foo/bar"),
-                DmgTestSpec.build().acceptedInstallDir("/foo").runtimeInstaller(),
-                DmgTestSpec.build().acceptedInstallDir("/foo/bar").runtimeInstaller(),
+                TestSpec.build().acceptedInstallDir("/foo"),
+                TestSpec.build().acceptedInstallDir("/foo/bar"),
+                TestSpec.build().acceptedInstallDir("/foo").runtimeInstaller(),
+                TestSpec.build().acceptedInstallDir("/foo/bar").runtimeInstaller(),
 
-                DmgTestSpec.build().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
-                DmgTestSpec.build().acceptedInstallDir("/Applications").runtimeInstaller(),
+                TestSpec.build().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
+                TestSpec.build().acceptedInstallDir("/Applications").runtimeInstaller(),
 
-                DmgTestSpec.build().acceptedInstallDir("/Applications"),
-                DmgTestSpec.build().acceptedInstallDir("/Applications/foo/bar/buz"),
+                TestSpec.build().acceptedInstallDir("/Applications"),
+                TestSpec.build().acceptedInstallDir("/Applications/foo/bar/buz"),
 
-                DmgTestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
-                DmgTestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines/foo/bar/buz")
-        ).map(DmgTestSpec.Builder::create).map(testSpec -> {
+                TestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
+                TestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines/foo/bar/buz")
+        ).map(TestSpec.Builder::create).map(testSpec -> {
             return new Object[] { testSpec };
         }).toList();
     }
diff --git a/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java b/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java
index d348b5c170d..0786255893f 100644
--- a/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java
+++ b/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java
@@ -22,13 +22,12 @@
  */
 
 import java.nio.file.Path;
-import java.io.IOException;
 import jdk.jpackage.test.AdditionalLauncher;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.JPackageCommand;
 
 /**
  * Test multiple launchers in two phases. First test creates app image and then
@@ -55,7 +54,7 @@ import jdk.jpackage.test.JPackageCommand;
 public class MultiLauncherTwoPhaseTest {
 
     @Test
-    public static void test() throws IOException {
+    public static void test() {
         Path appimageOutput = TKit.createTempDirectory("appimage");
 
         JPackageCommand appImageCmd = JPackageCommand.helloAppImage()
@@ -68,12 +67,9 @@ public class MultiLauncherTwoPhaseTest {
         launcher2.applyTo(appImageCmd);
 
         PackageTest packageTest = new PackageTest()
-                .addRunOnceInitializer(() -> appImageCmd.execute())
+                .addRunOnceInitializer(appImageCmd::execute)
                 .addBundleDesktopIntegrationVerifier(true)
-                .addInitializer(cmd -> {
-                    cmd.addArguments("--app-image", appImageCmd.outputBundle());
-                    cmd.removeArgumentWithValue("--input");
-                })
+                .usePredefinedAppImage(appImageCmd)
                 .forTypes(PackageType.WINDOWS)
                 .addInitializer(cmd -> {
                     cmd.addArguments("--win-shortcut", "--win-menu",
diff --git a/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java b/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java
index de8412c2839..6d4c597cb51 100644
--- a/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java
+++ b/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java
@@ -22,13 +22,12 @@
  */
 
 import java.nio.file.Path;
-import java.io.IOException;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.Annotations.Parameter;
-import jdk.jpackage.test.JPackageCommand;
 
 /**
  * Test creation of packages in tho phases with different names.
@@ -58,9 +57,7 @@ public class MultiNameTwoPhaseTest {
     @Parameter({"MultiNameTest", ""})
     @Parameter({"", "MultiNameTestInstaller"})
     @Parameter({"", ""})
-    public static void test(String... testArgs) throws IOException {
-        String appName = testArgs[0];
-        String installName = testArgs[1];
+    public static void test(String appName, String installName) {
 
         Path appimageOutput = TKit.createTempDirectory("appimage");
 
@@ -74,9 +71,8 @@ public class MultiNameTwoPhaseTest {
         PackageTest packageTest = new PackageTest()
                 .addRunOnceInitializer(() -> appImageCmd.execute())
                 .addBundleDesktopIntegrationVerifier(true)
+                .usePredefinedAppImage(appImageCmd)
                 .addInitializer(cmd -> {
-                    cmd.addArguments("--app-image", appImageCmd.outputBundle());
-                    cmd.removeArgumentWithValue("--input");
                     cmd.removeArgumentWithValue("--name");
                     if (!installName.isEmpty()) {
                         cmd.addArguments("--name", installName);
diff --git a/test/jdk/tools/jpackage/share/PostImageScriptTest.java b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
index 68ded999e4a..5e9127d8fa8 100644
--- a/test/jdk/tools/jpackage/share/PostImageScriptTest.java
+++ b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
@@ -107,10 +107,7 @@ public class PostImageScriptTest {
                     });
                 }
                 case EXTERNAL_APP_IMAGE -> {
-                    test.addInitializer(cmd -> {
-                        cmd.removeArgumentWithValue("--input");
-                        cmd.addArguments("--app-image", appImageCmd.outputBundle());
-                    });
+                    test.usePredefinedAppImage(appImageCmd);
                 }
             }
 
diff --git a/test/jdk/tools/jpackage/share/ServiceTest.java b/test/jdk/tools/jpackage/share/ServiceTest.java
index 56e003f508c..226f8f16bdc 100644
--- a/test/jdk/tools/jpackage/share/ServiceTest.java
+++ b/test/jdk/tools/jpackage/share/ServiceTest.java
@@ -243,10 +243,7 @@ public class ServiceTest {
 
         new PackageTest().excludeTypes(MAC_DMG)
                 .addRunOnceInitializer(appImageCmd.cmd().orElseThrow()::execute)
-                .addInitializer(cmd -> {
-                    cmd.removeArgumentWithValue("--input");
-                    cmd.addArguments("--app-image", appImageCmd.cmd().orElseThrow().outputBundle());
-                })
+                .usePredefinedAppImage(appImageCmd.cmd().orElseThrow())
                 .addInitializer(cmd -> {
                     if (mainLauncherAsService) {
                         cmd.addArgument("--launcher-as-service");
diff --git a/test/jdk/tools/jpackage/windows/Win8282351Test.java b/test/jdk/tools/jpackage/windows/Win8282351Test.java
index 55357437762..93731c7cfc6 100644
--- a/test/jdk/tools/jpackage/windows/Win8282351Test.java
+++ b/test/jdk/tools/jpackage/windows/Win8282351Test.java
@@ -24,9 +24,11 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import jdk.jpackage.test.PackageTest;
-import jdk.jpackage.test.JPackageCommand;
+import java.util.List;
+import java.util.stream.Stream;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.RunnablePackageTest.Action;
 import jdk.jpackage.test.TKit;
 
@@ -48,13 +50,13 @@ import jdk.jpackage.test.TKit;
 public class Win8282351Test {
 
     @Test
-    public void test() throws IOException {
+    public void test() {
         Path appimageOutput = TKit.createTempDirectory("appimage");
 
         JPackageCommand appImageCmd = JPackageCommand.helloAppImage()
                 .setFakeRuntime().setArgumentValue("--dest", appimageOutput);
 
-        String[] filesWithDollarCharsInNames = new String[]{
+        var filesWithDollarCharsInNames = Stream.of(
             "Pane$$anon$$greater$1.class",
             "$",
             "$$",
@@ -63,11 +65,11 @@ public class Win8282351Test {
             "$$$$$",
             "foo$.class",
             "1$b$$a$$$r$$$$.class"
-        };
+        ).map(Path::of).toList();
 
-        String[] dirsWithDollarCharsInNames = new String[]{
-            Path.of("foo", String.join("/", filesWithDollarCharsInNames)).toString()
-        };
+        var dirsWithDollarCharsInNames = List.of(
+                filesWithDollarCharsInNames.stream().reduce(Path.of("foo"), Path::resolve)
+        );
 
         String name = appImageCmd.name() + "$-$$-$$$";
 
@@ -75,7 +77,7 @@ public class Win8282351Test {
                 .addRunOnceInitializer(() -> {
                     appImageCmd.execute();
                     for (var path : filesWithDollarCharsInNames) {
-                        createImageFile(appImageCmd, Path.of(path));
+                        createImageFile(appImageCmd, path);
                     }
 
                     for (var path : dirsWithDollarCharsInNames) {
@@ -83,16 +85,15 @@ public class Win8282351Test {
                                 appImageCmd.outputBundle().resolve(path));
                     }
                 })
+                .usePredefinedAppImage(appImageCmd)
                 .addInitializer(cmd -> {
                     cmd.setArgumentValue("--name", name);
-                    cmd.addArguments("--app-image", appImageCmd.outputBundle());
-                    cmd.removeArgumentWithValue("--input");
                     cmd.addArgument("--win-menu");
                     cmd.addArgument("--win-shortcut");
                 })
                 .addInstallVerifier(cmd -> {
                     for (var path : filesWithDollarCharsInNames) {
-                        verifyImageFile(appImageCmd, Path.of(path));
+                        verifyImageFile(appImageCmd, path);
                     }
 
                     for (var path : dirsWithDollarCharsInNames) {

From c6a88155b519a5d0b22f6009e75a0e6388601756 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Tue, 4 Nov 2025 23:32:41 +0000
Subject: [PATCH 028/512] 8369238: Allow virtual thread preemption on some
 common class initialization paths

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Co-authored-by: Fei Yang <fyang@openjdk.org>
Co-authored-by: Richard Reingruber <rrich@openjdk.org>
Reviewed-by: sspitsyn, dholmes, coleenp, fbredberg
---
 .../continuationFreezeThaw_aarch64.inline.hpp |  46 +-
 .../continuationHelper_aarch64.inline.hpp     |   3 +
 .../cpu/aarch64/interp_masm_aarch64.cpp       |  99 +++-
 .../cpu/aarch64/interp_masm_aarch64.hpp       |  16 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  16 +-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |   1 +
 .../smallRegisterMap_aarch64.inline.hpp       |  23 +-
 .../stackChunkFrameStream_aarch64.inline.hpp  |  13 +-
 .../cpu/aarch64/templateTable_aarch64.cpp     |   6 +-
 .../arm/continuationFreezeThaw_arm.inline.hpp |  14 +
 .../cpu/arm/smallRegisterMap_arm.inline.hpp   |  23 +-
 .../arm/stackChunkFrameStream_arm.inline.hpp  |   3 +-
 .../ppc/continuationFreezeThaw_ppc.inline.hpp |  35 +-
 .../cpu/ppc/continuationHelper_ppc.inline.hpp |   3 +
 src/hotspot/cpu/ppc/frame_ppc.hpp             |   2 +-
 src/hotspot/cpu/ppc/interp_masm_ppc.hpp       |   4 +-
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp    |  65 ++-
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    |  35 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.hpp    |  22 +-
 .../cpu/ppc/macroAssembler_ppc.inline.hpp     |   3 +-
 .../cpu/ppc/smallRegisterMap_ppc.inline.hpp   |  24 +-
 .../ppc/stackChunkFrameStream_ppc.inline.hpp  |  13 +-
 .../ppc/templateInterpreterGenerator_ppc.cpp  |   7 +-
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp  |   6 +-
 .../continuationFreezeThaw_riscv.inline.hpp   |  46 +-
 .../riscv/continuationHelper_riscv.inline.hpp |   3 +
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   | 100 +++-
 src/hotspot/cpu/riscv/interp_masm_riscv.hpp   |  19 +-
 .../cpu/riscv/macroAssembler_riscv.cpp        |  17 +-
 .../cpu/riscv/macroAssembler_riscv.hpp        |   1 +
 .../riscv/smallRegisterMap_riscv.inline.hpp   |  24 +-
 .../stackChunkFrameStream_riscv.inline.hpp    |  13 +-
 src/hotspot/cpu/riscv/templateTable_riscv.cpp |   6 +-
 .../continuationFreezeThaw_s390.inline.hpp    |  14 +
 .../cpu/s390/smallRegisterMap_s390.inline.hpp |  23 +-
 .../stackChunkFrameStream_s390.inline.hpp     |   3 +-
 .../x86/continuationFreezeThaw_x86.inline.hpp |  46 +-
 .../cpu/x86/continuationHelper_x86.inline.hpp |   3 +
 src/hotspot/cpu/x86/interp_masm_x86.cpp       |  94 +++-
 src/hotspot/cpu/x86/interp_masm_x86.hpp       |  15 +-
 .../cpu/x86/smallRegisterMap_x86.inline.hpp   |  20 +-
 .../x86/stackChunkFrameStream_x86.inline.hpp  |  13 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp     |   8 +-
 .../continuationFreezeThaw_zero.inline.hpp    |  14 +
 .../cpu/zero/smallRegisterMap_zero.inline.hpp |  23 +-
 .../stackChunkFrameStream_zero.inline.hpp     |   3 +-
 .../share/cds/aotConstantPoolResolver.cpp     |   4 +-
 src/hotspot/share/cds/heapShared.cpp          |   3 +-
 src/hotspot/share/ci/ciField.cpp              |   2 +-
 src/hotspot/share/classfile/javaClasses.cpp   |   6 +
 src/hotspot/share/classfile/javaClasses.hpp   |   2 +
 src/hotspot/share/classfile/vmClassMacros.hpp |   1 +
 src/hotspot/share/classfile/vmSymbols.hpp     |   3 +
 .../share/interpreter/interpreterRuntime.cpp  |  40 +-
 .../share/interpreter/interpreterRuntime.hpp  |  13 +-
 .../share/interpreter/linkResolver.cpp        |  50 +-
 .../share/interpreter/linkResolver.hpp        |  24 +-
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |   2 +-
 src/hotspot/share/memory/universe.cpp         |   6 +
 src/hotspot/share/memory/universe.hpp         |   1 +
 src/hotspot/share/oops/instanceKlass.cpp      |  59 ++-
 src/hotspot/share/oops/instanceKlass.hpp      |   1 +
 .../share/oops/instanceStackChunkKlass.cpp    |   3 +-
 src/hotspot/share/oops/klass.cpp              |   4 +
 src/hotspot/share/oops/klass.hpp              |   1 +
 src/hotspot/share/oops/stackChunkOop.cpp      |  19 +-
 src/hotspot/share/oops/stackChunkOop.hpp      |   6 +
 .../share/oops/stackChunkOop.inline.hpp       |  17 +-
 src/hotspot/share/prims/jvmtiExport.cpp       |  14 +-
 src/hotspot/share/prims/jvmtiExport.hpp       |  17 +-
 src/hotspot/share/prims/methodHandles.cpp     |   4 +-
 src/hotspot/share/runtime/continuation.hpp    |   5 +-
 .../share/runtime/continuationFreezeThaw.cpp  | 361 +++++++++++--
 .../share/runtime/continuationJavaClasses.cpp |   2 +
 .../share/runtime/continuationJavaClasses.hpp |  10 +
 .../continuationJavaClasses.inline.hpp        |  16 +
 src/hotspot/share/runtime/frame.cpp           |  36 +-
 src/hotspot/share/runtime/frame.hpp           |   3 +-
 src/hotspot/share/runtime/javaCalls.cpp       |   3 +-
 src/hotspot/share/runtime/javaThread.cpp      |   4 +
 src/hotspot/share/runtime/javaThread.hpp      |  47 +-
 src/hotspot/share/runtime/objectMonitor.cpp   |  28 +-
 src/hotspot/share/runtime/objectMonitor.hpp   |   6 +-
 .../share/runtime/smallRegisterMap.inline.hpp |  15 +
 .../share/runtime/stackChunkFrameStream.hpp   |  16 +-
 .../runtime/stackChunkFrameStream.inline.hpp  |   7 +-
 src/hotspot/share/runtime/stackValue.cpp      |   4 +-
 src/hotspot/share/runtime/synchronizer.cpp    |  35 +-
 src/hotspot/share/runtime/synchronizer.hpp    |   7 +-
 .../share/runtime/synchronizer.inline.hpp     |   4 +
 src/hotspot/share/runtime/threads.cpp         |   1 +
 src/hotspot/share/utilities/exceptions.cpp    |  31 ++
 src/hotspot/share/utilities/exceptions.hpp    |  10 +
 .../classes/java/lang/VirtualThread.java      |   6 +-
 .../jdk/internal/vm/PreemptedException.java   |  41 ++
 test/hotspot/gtest/oops/test_markWord.cpp     |   2 +-
 .../SingleStepKlassInit.java                  |  90 ++++
 .../libSingleStepKlassInit.cpp                |  86 +++
 .../java/lang/Thread/virtual/JfrEvents.java   |  10 +-
 .../java/lang/Thread/virtual/KlassInit.java   | 490 ++++++++++++++++++
 .../lang/Thread/virtual/YieldQueuing.java     |   8 +
 .../stress/LotsOfContendedMonitorEnter.java   |  25 +-
 102 files changed, 2252 insertions(+), 449 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/vm/PreemptedException.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/SingleStepKlassInit.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/libSingleStepKlassInit.cpp
 create mode 100644 test/jdk/java/lang/Thread/virtual/KlassInit.java

diff --git a/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp
index 1fd59b81d9e..a1a5209de7a 100644
--- a/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/continuationFreezeThaw_aarch64.inline.hpp
@@ -200,6 +200,41 @@ inline void FreezeBase::patch_pd_unused(intptr_t* sp) {
   *fp_addr = badAddressVal;
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  intptr_t* sp = _top_frame.sp();
+  if (_top_frame.is_interpreted_frame()) {
+    // In case the top frame is interpreted we need to set up the anchor using
+    // the last_sp saved in the frame (remove possible alignment added while
+    // thawing, see ThawBase::finish_thaw()). We also clear last_sp to match
+    // the behavior when calling the VM from the interpreter (we check for this
+    // in FreezeBase::prepare_freeze_interpreted_top_frame, which can be reached
+    // if preempting again at redo_vmcall()).
+    _last_sp_from_frame = _top_frame.interpreter_frame_last_sp();
+    assert(_last_sp_from_frame != nullptr, "");
+    _top_frame.interpreter_frame_set_last_sp(nullptr);
+    if (sp != _last_sp_from_frame) {
+      // We need to move up return pc and fp. They will be read next in
+      // set_anchor() and set as _last_Java_pc and _last_Java_fp respectively.
+      _last_sp_from_frame[-1] = (intptr_t)_top_frame.pc();
+      _last_sp_from_frame[-2] = (intptr_t)_top_frame.fp();
+    }
+    _is_interpreted = true;
+    sp = _last_sp_from_frame;
+  }
+  return sp;
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+  if (_is_interpreted) {
+    // Restore last_sp_from_frame and possibly overwritten pc.
+    _top_frame.interpreter_frame_set_last_sp(_last_sp_from_frame);
+    intptr_t* sp = _top_frame.sp();
+    if (sp != _last_sp_from_frame) {
+      sp[-1] = (intptr_t)_top_frame.pc();
+    }
+  }
+}
+
 //////// Thaw
 
 // Fast path
@@ -304,10 +339,17 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   frame enterSpecial = new_entry_frame();
   intptr_t* sp = enterSpecial.sp();
 
+  // We only need to set the return pc. rfp will be restored back in gen_continuation_enter().
   sp[-1] = (intptr_t)ContinuationEntry::cleanup_pc();
-  sp[-2] = (intptr_t)enterSpecial.fp();
+  return sp;
+}
 
-  log_develop_trace(continuations, preempt)("push_cleanup_continuation initial sp: " INTPTR_FORMAT " final sp: " INTPTR_FORMAT, p2i(sp + 2 * frame::metadata_words), p2i(sp));
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  frame enterSpecial = new_entry_frame();
+  intptr_t* sp = enterSpecial.sp();
+
+  // We only need to set the return pc. rfp will be restored back in generate_cont_preempt_stub().
+  sp[-1] = (intptr_t)StubRoutines::cont_preempt_stub();
   return sp;
 }
 
diff --git a/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
index e39580369db..19a892f5ff8 100644
--- a/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
@@ -52,6 +52,9 @@ static inline void patch_return_pc_with_preempt_stub(frame& f) {
     // The target will check for preemption once it returns to the interpreter
     // or the native wrapper code and will manually jump to the preempt stub.
     JavaThread *thread = JavaThread::current();
+    DEBUG_ONLY(Method* m = f.is_interpreted_frame() ? f.interpreter_frame_method() : f.cb()->as_nmethod()->method();)
+    assert(m->is_object_wait0() || thread->interp_at_preemptable_vmcall_cnt() > 0,
+           "preemptable VM call not using call_VM_preemptable");
     thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
   }
 }
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index 6f8795494a2..cf4d5a63496 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -479,6 +479,14 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
 
+#ifdef ASSERT
+  Label not_preempted;
+  ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
+  cbz(rscratch1, not_preempted);
+  stop("remove_activation: should not have alternate return address set");
+  bind(not_preempted);
+#endif /* ASSERT */
+
   // get the value of _do_not_unlock_if_synchronized into r3
   const Address do_not_unlock_if_synchronized(rthread,
     in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
@@ -1371,6 +1379,7 @@ void InterpreterMacroAssembler::call_VM_leaf_base(address entry_point,
 void InterpreterMacroAssembler::call_VM_base(Register oop_result,
                                              Register java_thread,
                                              Register last_java_sp,
+                                             Label*   return_pc,
                                              address  entry_point,
                                              int      number_of_arguments,
                                              bool     check_exceptions) {
@@ -1394,26 +1403,34 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
 #endif /* ASSERT */
   // super call
   MacroAssembler::call_VM_base(oop_result, noreg, last_java_sp,
-                               entry_point, number_of_arguments,
-                     check_exceptions);
+                               return_pc, entry_point,
+                               number_of_arguments, check_exceptions);
 // interpreter specific
   restore_bcp();
   restore_locals();
 }
 
-void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
-                                                    address entry_point,
-                                                    Register arg_1) {
-  assert(arg_1 == c_rarg1, "");
+void InterpreterMacroAssembler::call_VM_preemptable_helper(Register oop_result,
+                                                           address entry_point,
+                                                           int number_of_arguments,
+                                                           bool check_exceptions) {
+  assert(InterpreterRuntime::is_preemptable_call(entry_point), "VM call not preemptable, should use call_VM()");
   Label resume_pc, not_preempted;
 
 #ifdef ASSERT
   {
-    Label L;
+    Label L1, L2;
     ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
-    cbz(rscratch1, L);
-    stop("Should not have alternate return address set");
-    bind(L);
+    cbz(rscratch1, L1);
+    stop("call_VM_preemptable_helper: Should not have alternate return address set");
+    bind(L1);
+    // We check this counter in patch_return_pc_with_preempt_stub() during freeze.
+    incrementw(Address(rthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    ldrw(rscratch1, Address(rthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    cmpw(rscratch1, 0);
+    br(Assembler::GT, L2);
+    stop("call_VM_preemptable_helper: should be > 0");
+    bind(L2);
   }
 #endif /* ASSERT */
 
@@ -1421,12 +1438,23 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
   push_cont_fastpath();
 
   // Make VM call. In case of preemption set last_pc to the one we want to resume to.
-  adr(rscratch1, resume_pc);
-  str(rscratch1, Address(rthread, JavaThread::last_Java_pc_offset()));
-  call_VM_base(oop_result, noreg, noreg, entry_point, 1, false /*check_exceptions*/);
+  // Note: call_VM_base will use resume_pc label to set last_Java_pc.
+  call_VM_base(noreg, noreg, noreg, &resume_pc, entry_point, number_of_arguments, false /*check_exceptions*/);
 
   pop_cont_fastpath();
 
+#ifdef ASSERT
+  {
+    Label L;
+    decrementw(Address(rthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    ldrw(rscratch1, Address(rthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    cmpw(rscratch1, 0);
+    br(Assembler::GE, L);
+    stop("call_VM_preemptable_helper: should be >= 0");
+    bind(L);
+  }
+#endif /* ASSERT */
+
   // Check if preempted.
   ldr(rscratch1, Address(rthread, JavaThread::preempt_alternate_return_offset()));
   cbz(rscratch1, not_preempted);
@@ -1438,6 +1466,51 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
   restore_after_resume(false /* is_native */);
 
   bind(not_preempted);
+  if (check_exceptions) {
+    // check for pending exceptions
+    ldr(rscratch1, Address(rthread, in_bytes(Thread::pending_exception_offset())));
+    Label ok;
+    cbz(rscratch1, ok);
+    lea(rscratch1, RuntimeAddress(StubRoutines::forward_exception_entry()));
+    br(rscratch1);
+    bind(ok);
+  }
+
+  // get oop result if there is one and reset the value in the thread
+  if (oop_result->is_valid()) {
+    get_vm_result_oop(oop_result, rthread);
+  }
+}
+
+static void pass_arg1(MacroAssembler* masm, Register arg) {
+  if (c_rarg1 != arg ) {
+    masm->mov(c_rarg1, arg);
+  }
+}
+
+static void pass_arg2(MacroAssembler* masm, Register arg) {
+  if (c_rarg2 != arg ) {
+    masm->mov(c_rarg2, arg);
+  }
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                         address entry_point,
+                                         Register arg_1,
+                                         bool check_exceptions) {
+  pass_arg1(this, arg_1);
+  call_VM_preemptable_helper(oop_result, entry_point, 1, check_exceptions);
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                         address entry_point,
+                                         Register arg_1,
+                                         Register arg_2,
+                                         bool check_exceptions) {
+  LP64_ONLY(assert_different_registers(arg_1, c_rarg2));
+  pass_arg2(this, arg_2);
+  pass_arg1(this, arg_1);
+  call_VM_preemptable_helper(oop_result, entry_point, 2, check_exceptions);
 }
 
 void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index e07e6e49f53..2b230a3b73e 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -45,6 +45,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
   virtual void call_VM_base(Register oop_result,
                             Register java_thread,
                             Register last_java_sp,
+                            Label*   return_pc,
                             address  entry_point,
                             int number_of_arguments,
                             bool check_exceptions);
@@ -58,11 +59,24 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void load_earlyret_value(TosState state);
 
+  // Use for vthread preemption
   void call_VM_preemptable(Register oop_result,
                            address entry_point,
-                           Register arg_1);
+                           Register arg_1,
+                           bool check_exceptions = true);
+  void call_VM_preemptable(Register oop_result,
+                           address entry_point,
+                           Register arg_1,
+                           Register arg_2,
+                           bool check_exceptions = true);
   void restore_after_resume(bool is_native);
+ private:
+  void call_VM_preemptable_helper(Register oop_result,
+                                  address entry_point,
+                                  int number_of_arguments,
+                                  bool check_exceptions);
 
+ public:
   void jump_to_entry(address entry);
 
   virtual void check_and_handle_popframe(Register java_thread);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 14009789319..e6dd29f105a 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -743,13 +743,10 @@ static void pass_arg3(MacroAssembler* masm, Register arg) {
   }
 }
 
-static bool is_preemptable(address entry_point) {
-  return entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter);
-}
-
 void MacroAssembler::call_VM_base(Register oop_result,
                                   Register java_thread,
                                   Register last_java_sp,
+                                  Label*   return_pc,
                                   address  entry_point,
                                   int      number_of_arguments,
                                   bool     check_exceptions) {
@@ -782,12 +779,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
   assert(last_java_sp != rfp, "can't use rfp");
 
   Label l;
-  if (is_preemptable(entry_point)) {
-    // skip setting last_pc since we already set it to desired value.
-    set_last_Java_frame(last_java_sp, rfp, noreg, rscratch1);
-  } else {
-    set_last_Java_frame(last_java_sp, rfp, l, rscratch1);
-  }
+  set_last_Java_frame(last_java_sp, rfp, return_pc != nullptr ? *return_pc : l, rscratch1);
 
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
@@ -822,7 +814,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
 }
 
 void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions) {
-  call_VM_base(oop_result, noreg, noreg, entry_point, number_of_arguments, check_exceptions);
+  call_VM_base(oop_result, noreg, noreg, nullptr, entry_point, number_of_arguments, check_exceptions);
 }
 
 // Check the entry target is always reachable from any branch.
@@ -1080,7 +1072,7 @@ void MacroAssembler::call_VM(Register oop_result,
                              address entry_point,
                              int number_of_arguments,
                              bool check_exceptions) {
-  call_VM_base(oop_result, rthread, last_java_sp, entry_point, number_of_arguments, check_exceptions);
+  call_VM_base(oop_result, rthread, last_java_sp, nullptr, entry_point, number_of_arguments, check_exceptions);
 }
 
 void MacroAssembler::call_VM(Register oop_result,
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index d5a16e424e4..7bfc6c562e3 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -81,6 +81,7 @@ class MacroAssembler: public Assembler {
     Register oop_result,               // where an oop-result ends up if any; use noreg otherwise
     Register java_thread,              // the thread if computed before     ; use noreg otherwise
     Register last_java_sp,             // to set up last_Java_frame in stubs; use noreg otherwise
+    Label*   return_pc,                // to set up last_Java_frame; use nullptr otherwise
     address  entry_point,              // the entry point
     int      number_of_arguments,      // the number of arguments (w/o thread) to pop after the call
     bool     check_exceptions          // whether to check for pending exceptions after return
diff --git a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
index 45e8f2f4202..dd00e765eea 100644
--- a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
@@ -28,18 +28,17 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
-// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+class SmallRegisterMap;
+
+// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
+
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
-private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ assert (r == rfp->as_VMReg() || r == rfp->as_VMReg()->next(), "Reg: %s", r->name()); })
 public:
@@ -71,7 +70,7 @@ public:
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
diff --git a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
index 8a221f13772..8d2f013e116 100644
--- a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
@@ -108,17 +108,14 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   assert_is_interpreted_and_frame_type_mixed();
   ResourceMark rm;
-  InterpreterOopMap mask;
   frame f = to_frame();
-  f.interpreted_frame_oop_map(&mask);
-  return  mask.num_oops()
-        + 1 // for the mirror oop
-        + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
-        + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
-              (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
+  InterpreterOopCount closure;
+  f.oops_interpreted_do(&closure, map);
+  return closure.count();
 }
 
 template<>
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index f4774f31bbd..cde142b39ac 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -2304,7 +2304,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   // Class initialization barrier slow path lands here as well.
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ mov(temp, (int) code);
-  __ call_VM(noreg, entry, temp);
+  __ call_VM_preemptable(noreg, entry, temp);
 
   // Update registers with resolved info
   __ load_method_entry(Rcache, index);
@@ -2356,7 +2356,7 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   // Class initialization barrier slow path lands here as well.
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ mov(temp, (int) code);
-  __ call_VM(noreg, entry, temp);
+  __ call_VM_preemptable(noreg, entry, temp);
 
   // Update registers with resolved info
   __ load_field_entry(Rcache, index);
@@ -3700,7 +3700,7 @@ void TemplateTable::_new() {
   __ bind(slow_case);
   __ get_constant_pool(c_rarg1);
   __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
-  call_VM(r0, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
+  __ call_VM_preemptable(r0, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
   __ verify_oop(r0);
 
   // continue
diff --git a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
index 389cf4dc936..05172ffeba3 100644
--- a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
@@ -68,6 +68,15 @@ inline void FreezeBase::patch_stack_pd(intptr_t* frame_sp, intptr_t* heap_sp) {
   Unimplemented();
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  Unimplemented();
+  return nullptr;
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+  Unimplemented();
+}
+
 inline frame ThawBase::new_entry_frame() {
   Unimplemented();
   return frame();
@@ -100,6 +109,11 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   return nullptr;
 }
 
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  Unimplemented();
+  return nullptr;
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   Unimplemented();
diff --git a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
index 903a71aab53..1223384d3b7 100644
--- a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
@@ -28,18 +28,17 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
-// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+class SmallRegisterMap;
+
+// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
+
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
-private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ Unimplemented(); })
 public:
@@ -69,7 +68,7 @@ public:
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
diff --git a/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp b/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp
index ae97ec60f32..2da68d6d5ee 100644
--- a/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp
@@ -85,7 +85,8 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   Unimplemented();
   return 0;
 }
diff --git a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
index fa878b07d43..e35bdae70d6 100644
--- a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
@@ -72,9 +72,16 @@ void FreezeBase::adjust_interpreted_frame_unextended_sp(frame& f) {
 }
 
 inline void FreezeBase::prepare_freeze_interpreted_top_frame(frame& f) {
-  // nothing to do
-  DEBUG_ONLY( intptr_t* lspp = (intptr_t*) &(f.get_ijava_state()->top_frame_sp); )
-  assert(*lspp == f.unextended_sp() - f.fp(), "should be " INTPTR_FORMAT " usp:" INTPTR_FORMAT " fp:" INTPTR_FORMAT, *lspp, p2i(f.unextended_sp()), p2i(f.fp()));
+  // Nothing to do. We don't save a last sp since we cannot use sp as esp.
+  // Instead the top frame is trimmed when making an i2i call. The original
+  // top_frame_sp is set when the frame is pushed (see generate_fixed_frame()).
+  // An interpreter top frame that was just thawed is resized to top_frame_sp by the
+  // resume adapter (see generate_cont_resume_interpreter_adapter()). So the assertion is
+  // false, if we freeze again right after thawing as we do when redoing a vm call wasn't
+  // successful.
+  assert(_thread->interp_redoing_vm_call() ||
+         ((intptr_t*)f.at_relative(ijava_idx(top_frame_sp)) == f.unextended_sp()),
+         "top_frame_sp:" PTR_FORMAT " usp:" PTR_FORMAT, f.at_relative(ijava_idx(top_frame_sp)), p2i(f.unextended_sp()));
 }
 
 inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, const frame& hf) {
@@ -337,6 +344,15 @@ inline void FreezeBase::patch_pd(frame& hf, const frame& caller) {
 inline void FreezeBase::patch_pd_unused(intptr_t* sp) {
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  // Nothing to do on PPC because the interpreter does not use SP as expression stack pointer.
+  // Instead there is a dedicated register R15_esp which is not affected by VM calls.
+  return _top_frame.sp();
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+}
+
 //////// Thaw
 
 // Fast path
@@ -566,6 +582,19 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   return enterSpecial.sp();
 }
 
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  frame enterSpecial = new_entry_frame();
+  frame::common_abi* enterSpecial_abi = (frame::common_abi*)enterSpecial.sp();
+
+  enterSpecial_abi->lr = (intptr_t)StubRoutines::cont_preempt_stub();
+
+  log_develop_trace(continuations, preempt)("push_preempt_adapter enterSpecial sp: " INTPTR_FORMAT " adapter pc: " INTPTR_FORMAT,
+                                            p2i(enterSpecial_abi),
+                                            p2i(StubRoutines::cont_preempt_stub()));
+
+  return enterSpecial.sp();
+}
+
 inline void ThawBase::patch_pd(frame& f, const frame& caller) {
   patch_callee_link(caller, caller.fp());
   // Prevent assertion if f gets deoptimized right away before it's fully initialized
diff --git a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
index d55bf0da3e3..7c6d19d442b 100644
--- a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
@@ -37,6 +37,9 @@ static inline void patch_return_pc_with_preempt_stub(frame& f) {
     // The target will check for preemption once it returns to the interpreter
     // or the native wrapper code and will manually jump to the preempt stub.
     JavaThread *thread = JavaThread::current();
+    DEBUG_ONLY(Method* m = f.is_interpreted_frame() ? f.interpreter_frame_method() : f.cb()->as_nmethod()->method();)
+    assert(m->is_object_wait0() || thread->interp_at_preemptable_vmcall_cnt() > 0,
+           "preemptable VM call not using call_VM_preemptable");
     thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
   }
 }
diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp
index 188015f5cd9..ebe5d24c072 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp
@@ -215,7 +215,7 @@
     uint64_t bcp;
     uint64_t esp;
     uint64_t mdx;
-    uint64_t top_frame_sp; // Maybe define parent_frame_abi and move there.
+    uint64_t top_frame_sp; // Original sp to be restored when returning from an i2i call
     uint64_t sender_sp;
     // Slots only needed for native calls. Maybe better to move elsewhere.
     uint64_t oop_tmp;
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
index 9140dd7ca4e..4ea33ebaf63 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
@@ -49,12 +49,14 @@ class InterpreterMacroAssembler: public MacroAssembler {
   virtual void check_and_handle_popframe(Register scratch_reg);
   virtual void check_and_handle_earlyret(Register scratch_reg);
 
+  // Use for vthread preemption
   void call_VM_preemptable(Register oop_result, address entry_point, Register arg_1, bool check_exceptions = true);
+  void call_VM_preemptable(Register oop_result, address entry_point, Register arg_1, Register arg_2, bool check_exceptions = true);
   void restore_after_resume(Register fp);
   // R22 and R31 are preserved when a vthread gets preempted in the interpreter.
   // The interpreter already assumes that these registers are nonvolatile across native calls.
   bool nonvolatile_accross_vthread_preemtion(Register r) const {
-    return r->is_nonvolatile() && ((r == R22) || (r == R31));
+    return r->is_nonvolatile() && ((r == R24) || (r == R31));
   }
 
   // Base routine for all dispatches.
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index 503cc259432..0d32ea8003e 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -108,6 +108,8 @@ void InterpreterMacroAssembler::dispatch_prolog(TosState state, int bcp_incr) {
 // own dispatch. The dispatch address in R24_dispatch_addr is used for the
 // dispatch.
 void InterpreterMacroAssembler::dispatch_epilog(TosState state, int bcp_incr) {
+  assert(nonvolatile_accross_vthread_preemtion(R24_dispatch_addr),
+         "Requirement of field accesses (e.g. putstatic)");
   if (bcp_incr) { addi(R14_bcp, R14_bcp, bcp_incr); }
   mtctr(R24_dispatch_addr);
   bcctr(bcondAlways, 0, bhintbhBCCTRisNotPredictable);
@@ -862,6 +864,9 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
                                                   bool install_monitor_exception) {
   BLOCK_COMMENT("remove_activation {");
 
+  asm_assert_mem8_is_zero(in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread,
+                          "remove_activation: should not have alternate return address set");
+
   unlock_if_synchronized_method(state, throw_monitor_exception, install_monitor_exception);
 
   // The below poll is for the stack watermark barrier. It allows fixing up frames lazily,
@@ -2014,35 +2019,67 @@ void InterpreterMacroAssembler::call_VM(Register oop_result, address entry_point
 }
 
 void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address entry_point,
-                                        Register arg_1, bool check_exceptions) {
+                                                    Register arg_1,
+                                                    bool check_exceptions) {
   if (!Continuations::enabled()) {
     call_VM(oop_result, entry_point, arg_1, check_exceptions);
     return;
   }
+  call_VM_preemptable(oop_result, entry_point, arg_1, noreg /* arg_2 */, check_exceptions);
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address entry_point,
+                                                    Register arg_1, Register arg_2,
+                                                    bool check_exceptions) {
+  if (!Continuations::enabled()) {
+    call_VM(oop_result, entry_point, arg_1, arg_2, check_exceptions);
+    return;
+  }
 
   Label resume_pc, not_preempted;
+  Register tmp = R11_scratch1;
+  assert_different_registers(arg_1, tmp);
+  assert_different_registers(arg_2, tmp);
 
-  DEBUG_ONLY(ld(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread));
-  DEBUG_ONLY(cmpdi(CR0, R0, 0));
-  asm_assert_eq("Should not have alternate return address set");
+#ifdef ASSERT
+  asm_assert_mem8_is_zero(in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread,
+                          "Should not have alternate return address set");
+  // We check this counter in patch_return_pc_with_preempt_stub() during freeze.
+  lwa(tmp, in_bytes(JavaThread::interp_at_preemptable_vmcall_cnt_offset()), R16_thread);
+  addi(tmp, tmp, 1);
+  cmpwi(CR0, tmp, 0);
+  stw(tmp, in_bytes(JavaThread::interp_at_preemptable_vmcall_cnt_offset()), R16_thread);
+  asm_assert(gt, "call_VM_preemptable: should be > 0");
+#endif // ASSERT
 
   // Preserve 2 registers
-  assert(nonvolatile_accross_vthread_preemtion(R31) && nonvolatile_accross_vthread_preemtion(R22), "");
+  assert(nonvolatile_accross_vthread_preemtion(R31) && nonvolatile_accross_vthread_preemtion(R24), "");
   ld(R3_ARG1, _abi0(callers_sp), R1_SP); // load FP
   std(R31, _ijava_state_neg(lresult), R3_ARG1);
-  std(R22, _ijava_state_neg(fresult), R3_ARG1);
+  std(R24, _ijava_state_neg(fresult), R3_ARG1);
 
   // We set resume_pc as last java pc. It will be saved if the vthread gets preempted.
   // Later execution will continue right there.
   mr_if_needed(R4_ARG2, arg_1);
+  assert(arg_2 != R4_ARG2, "smashed argument");
+  mr_if_needed(R5_ARG3, arg_2, true /* allow_noreg */);
   push_cont_fastpath();
-  call_VM(oop_result, entry_point, false /*check_exceptions*/, &resume_pc /* last_java_pc */);
+  call_VM(noreg /* oop_result */, entry_point, false /*check_exceptions*/, &resume_pc /* last_java_pc */);
   pop_cont_fastpath();
 
+#ifdef ASSERT
+  lwa(tmp, in_bytes(JavaThread::interp_at_preemptable_vmcall_cnt_offset()), R16_thread);
+  addi(tmp, tmp, -1);
+  cmpwi(CR0, tmp, 0);
+  stw(tmp, in_bytes(JavaThread::interp_at_preemptable_vmcall_cnt_offset()), R16_thread);
+  asm_assert(ge, "call_VM_preemptable: should be >= 0");
+#endif // ASSERT
+
   // Jump to handler if the call was preempted
   ld(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
   cmpdi(CR0, R0, 0);
   beq(CR0, not_preempted);
+  // Preempted. Frames are already frozen on heap.
   mtlr(R0);
   li(R0, 0);
   std(R0, in_bytes(JavaThread::preempt_alternate_return_offset()), R16_thread);
@@ -2050,21 +2087,21 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result, address
 
   bind(resume_pc); // Location to resume execution
   restore_after_resume(noreg /* fp */);
+
   bind(not_preempted);
+  if (check_exceptions) {
+    check_and_forward_exception(R11_scratch1, R12_scratch2);
+  }
+  if (oop_result->is_valid()) {
+    get_vm_result_oop(oop_result);
+  }
 }
 
 void InterpreterMacroAssembler::restore_after_resume(Register fp) {
-  if (!Continuations::enabled()) return;
-
   const address resume_adapter = TemplateInterpreter::cont_resume_interpreter_adapter();
   add_const_optimized(R31, R29_TOC, MacroAssembler::offset_to_global_toc(resume_adapter));
   mtctr(R31);
   bctrl();
-  // Restore registers that are preserved across vthread preemption
-  assert(nonvolatile_accross_vthread_preemtion(R31) && nonvolatile_accross_vthread_preemtion(R22), "");
-  ld(R3_ARG1, _abi0(callers_sp), R1_SP); // load FP
-  ld(R31, _ijava_state_neg(lresult), R3_ARG1);
-  ld(R22, _ijava_state_neg(fresult), R3_ARG1);
 #ifdef ASSERT
   // Assert FP is in R11_scratch1 (see generate_cont_resume_interpreter_adapter())
   {
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 00a46504e14..5a7e2172b29 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -757,9 +757,9 @@ void MacroAssembler::clobber_nonvolatile_registers() {
       R31
   };
   Register bad = regs[0];
-  load_const_optimized(bad, 0xbad0101babe11111);
-  for (uint32_t i = 1; i < (sizeof(regs) / sizeof(Register)); i++) {
-    mr(regs[i], bad);
+  load_const_optimized(bad, 0xbad0101babe00000);
+  for (int i = (sizeof(regs) / sizeof(Register)) - 1; i >= 0; i--) {
+    addi(regs[i], bad, regs[i]->encoding());
   }
   BLOCK_COMMENT("} clobber nonvolatile registers");
 }
@@ -4341,21 +4341,36 @@ void MacroAssembler::multiply_to_len(Register x, Register xlen,
   bind(L_done);
 }   // multiply_to_len
 
-void MacroAssembler::asm_assert(bool check_equal, const char *msg) {
 #ifdef ASSERT
+void MacroAssembler::asm_assert(AsmAssertCond cond, const char *msg) {
   Label ok;
-  if (check_equal) {
+  switch (cond) {
+  case eq:
     beq(CR0, ok);
-  } else {
+    break;
+  case ne:
     bne(CR0, ok);
+    break;
+  case ge:
+    bge(CR0, ok);
+    break;
+  case gt:
+    bgt(CR0, ok);
+    break;
+  case lt:
+    blt(CR0, ok);
+    break;
+  case le:
+    ble(CR0, ok);
+    break;
+  default:
+    assert(false, "unknown cond:%d", cond);
   }
   stop(msg);
   bind(ok);
-#endif
 }
 
-#ifdef ASSERT
-void MacroAssembler::asm_assert_mems_zero(bool check_equal, int size, int mem_offset,
+void MacroAssembler::asm_assert_mems_zero(AsmAssertCond cond, int size, int mem_offset,
                                           Register mem_base, const char* msg) {
   switch (size) {
     case 4:
@@ -4369,7 +4384,7 @@ void MacroAssembler::asm_assert_mems_zero(bool check_equal, int size, int mem_of
     default:
       ShouldNotReachHere();
   }
-  asm_assert(check_equal, msg);
+  asm_assert(cond, msg);
 }
 #endif // ASSERT
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 63be608094f..61e6a173823 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -68,7 +68,7 @@ class MacroAssembler: public Assembler {
   void store_sized_value(Register dst, RegisterOrConstant offs, Register base, size_t size_in_bytes);
 
   // Move register if destination register and target register are different
-  inline void mr_if_needed(Register rd, Register rs);
+  inline void mr_if_needed(Register rd, Register rs, bool allow_invalid = false);
   inline void fmr_if_needed(FloatRegister rd, FloatRegister rs);
   // This is dedicated for emitting scheduled mach nodes. For better
   // readability of the ad file I put it here.
@@ -942,21 +942,29 @@ class MacroAssembler: public Assembler {
   //
 
   // assert on cr0
-  void asm_assert(bool check_equal, const char* msg);
-  void asm_assert_eq(const char* msg) { asm_assert(true, msg); }
-  void asm_assert_ne(const char* msg) { asm_assert(false, msg); }
+  enum AsmAssertCond {
+    eq,
+    ne,
+    ge,
+    gt,
+    lt,
+    le
+  };
+  void asm_assert(AsmAssertCond cond, const char* msg) PRODUCT_RETURN;
+  void asm_assert_eq(const char* msg) { asm_assert(eq, msg); }
+  void asm_assert_ne(const char* msg) { asm_assert(ne, msg); }
 
  private:
-  void asm_assert_mems_zero(bool check_equal, int size, int mem_offset, Register mem_base,
+  void asm_assert_mems_zero(AsmAssertCond cond, int size, int mem_offset, Register mem_base,
                             const char* msg) NOT_DEBUG_RETURN;
 
  public:
 
   void asm_assert_mem8_is_zero(int mem_offset, Register mem_base, const char* msg) {
-    asm_assert_mems_zero(true,  8, mem_offset, mem_base, msg);
+    asm_assert_mems_zero(eq,  8, mem_offset, mem_base, msg);
   }
   void asm_assert_mem8_isnot_zero(int mem_offset, Register mem_base, const char* msg) {
-    asm_assert_mems_zero(false, 8, mem_offset, mem_base, msg);
+    asm_assert_mems_zero(ne, 8, mem_offset, mem_base, msg);
   }
 
   // Calls verify_oop. If UseCompressedOops is on, decodes the oop.
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
index d27011112e2..2b19d84c69c 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -65,7 +65,8 @@ inline void MacroAssembler::round_to(Register r, int modulus) {
 }
 
 // Move register if destination register and target register are different.
-inline void MacroAssembler::mr_if_needed(Register rd, Register rs) {
+inline void MacroAssembler::mr_if_needed(Register rd, Register rs, bool allow_noreg) {
+  if (allow_noreg && (rs == noreg)) return;
   if (rs != rd) mr(rd, rs);
 }
 inline void MacroAssembler::fmr_if_needed(FloatRegister rd, FloatRegister rs) {
diff --git a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
index fd352a53716..221a3c01341 100644
--- a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
@@ -28,18 +28,18 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
+class SmallRegisterMap;
+
 // Java frames don't have callee saved registers, so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
+ public:
   // as_RegisterMap is used when we didn't want to templatize and abstract over RegisterMap type to support SmallRegisterMap
   // Consider enhancing SmallRegisterMap to support those cases
   const RegisterMap* as_RegisterMap() const { return nullptr; }
@@ -61,14 +61,14 @@ public:
 
   JavaThread* thread() const {
   #ifndef ASSERT
-    guarantee (false, "");
+    guarantee (false, "unreachable");
   #endif
     return nullptr;
   }
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
@@ -76,7 +76,7 @@ public:
 #ifdef ASSERT
   bool should_skip_missing() const  { return false; }
   VMReg find_register_spilled_here(void* p, intptr_t* sp) {
-    Unimplemented();
+    assert(false, "Shouldn't reach here! p:" PTR_FORMAT " sp:" PTR_FORMAT, p2i(p), p2i(p));
     return nullptr;
   }
   void print() const { print_on(tty); }
diff --git a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
index 07f1c9c1c6f..a14ec9303f6 100644
--- a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
@@ -176,17 +176,14 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   assert_is_interpreted_and_frame_type_mixed();
   ResourceMark rm;
-  InterpreterOopMap mask;
   frame f = to_frame();
-  f.interpreted_frame_oop_map(&mask);
-  return  mask.num_oops()
-          + 1 // for the mirror oop
-          + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
-          + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
-                                 (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
+  InterpreterOopCount closure;
+  f.oops_interpreted_do(&closure, map);
+  return closure.count();
 }
 
 template<>
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index 199b578a36f..3fe7d353962 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -702,6 +702,11 @@ address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter()
 
   __ load_const_optimized(R25_templateTableBase, (address)Interpreter::dispatch_table((TosState)0), R12_scratch2);
   __ restore_interpreter_state(R11_scratch1, false, true /*restore_top_frame_sp*/);
+  // Restore registers that are preserved across vthread preemption
+  assert(__ nonvolatile_accross_vthread_preemtion(R31) && __ nonvolatile_accross_vthread_preemtion(R24), "");
+  __ ld(R3_ARG1, _abi0(callers_sp), R1_SP); // load FP
+  __ ld(R31, _ijava_state_neg(lresult), R3_ARG1);
+  __ ld(R24, _ijava_state_neg(fresult), R3_ARG1);
   __ blr();
 
   return start;
@@ -1249,7 +1254,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   const Register pending_exception    = R0;
   const Register result_handler_addr  = R31;
   const Register native_method_fd     = R12_scratch2; // preferred in MacroAssembler::branch_to
-  const Register access_flags         = R22_tmp2;
+  const Register access_flags         = R24_tmp4;
   const Register active_handles       = R11_scratch1; // R26_monitor saved to state.
   const Register sync_state           = R12_scratch2;
   const Register sync_state_addr      = sync_state;   // Address is dead after use.
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 09acd1c067d..8d61ba1b2d7 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -2214,7 +2214,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no, Register Rca
   __ bind(L_clinit_barrier_slow);
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ li(R4_ARG2, code);
-  __ call_VM(noreg, entry, R4_ARG2);
+  __ call_VM_preemptable(noreg, entry, R4_ARG2);
 
   // Update registers with resolved info.
   __ load_method_entry(Rcache, Rindex);
@@ -2262,7 +2262,7 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no, Register Rcac
   __ bind(L_clinit_barrier_slow);
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ li(R4_ARG2, code);
-  __ call_VM(noreg, entry, R4_ARG2);
+  __ call_VM_preemptable(noreg, entry, R4_ARG2);
 
   // Update registers with resolved info
   __ load_field_entry(Rcache, index);
@@ -3864,7 +3864,7 @@ void TemplateTable::_new() {
   // --------------------------------------------------------------------------
   // slow case
   __ bind(Lslow_case);
-  call_VM(R17_tos, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), Rcpool, Rindex);
+  __ call_VM_preemptable(R17_tos, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), Rcpool, Rindex);
 
   // continue
   __ bind(Ldone);
diff --git a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
index 461dc19f383..d6586617a63 100644
--- a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
@@ -207,6 +207,41 @@ inline void ThawBase::prefetch_chunk_pd(void* start, int size) {
   Prefetch::read(start, size - 64);
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  intptr_t* sp = _top_frame.sp();
+  if (_top_frame.is_interpreted_frame()) {
+    // In case the top frame is interpreted we need to set up the anchor using
+    // the last_sp saved in the frame (remove possible alignment added while
+    // thawing, see ThawBase::finish_thaw()). We also clear last_sp to match
+    // the behavior when calling the VM from the interpreter (we check for this
+    // in FreezeBase::prepare_freeze_interpreted_top_frame, which can be reached
+    // if preempting again at redo_vmcall()).
+    _last_sp_from_frame = _top_frame.interpreter_frame_last_sp();
+    assert(_last_sp_from_frame != nullptr, "");
+    _top_frame.interpreter_frame_set_last_sp(nullptr);
+    if (sp != _last_sp_from_frame) {
+      // We need to move up return pc and fp. They will be read next in
+      // set_anchor() and set as _last_Java_pc and _last_Java_fp respectively.
+      _last_sp_from_frame[-1] = (intptr_t)_top_frame.pc();
+      _last_sp_from_frame[-2] = (intptr_t)_top_frame.fp();
+    }
+    _is_interpreted = true;
+    sp = _last_sp_from_frame;
+  }
+  return sp;
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+  if (_is_interpreted) {
+    // Restore last_sp_from_frame and possibly overwritten pc.
+    _top_frame.interpreter_frame_set_last_sp(_last_sp_from_frame);
+    intptr_t* sp = _top_frame.sp();
+    if (sp != _last_sp_from_frame) {
+      sp[-1] = (intptr_t)_top_frame.pc();
+    }
+  }
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   // Fast path depends on !PreserveFramePointer. See can_thaw_fast().
@@ -305,10 +340,17 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   frame enterSpecial = new_entry_frame();
   intptr_t* sp = enterSpecial.sp();
 
+  // We only need to set the return pc. fp will be restored back in gen_continuation_enter().
   sp[-1] = (intptr_t)ContinuationEntry::cleanup_pc();
-  sp[-2] = (intptr_t)enterSpecial.fp();
+  return sp;
+}
 
-  log_develop_trace(continuations, preempt)("push_cleanup_continuation initial sp: " INTPTR_FORMAT " final sp: " INTPTR_FORMAT, p2i(sp + 2 * frame::metadata_words), p2i(sp));
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  frame enterSpecial = new_entry_frame();
+  intptr_t* sp = enterSpecial.sp();
+
+  // We only need to set the return pc. fp will be restored back in generate_cont_preempt_stub().
+  sp[-1] = (intptr_t)StubRoutines::cont_preempt_stub();
   return sp;
 }
 
diff --git a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
index 424d56edf5a..918bf3db8cc 100644
--- a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
@@ -52,6 +52,9 @@ static inline void patch_return_pc_with_preempt_stub(frame& f) {
     // The target will check for preemption once it returns to the interpreter
     // or the native wrapper code and will manually jump to the preempt stub.
     JavaThread *thread = JavaThread::current();
+    DEBUG_ONLY(Method* m = f.is_interpreted_frame() ? f.interpreter_frame_method() : f.cb()->as_nmethod()->method();)
+    assert(m->is_object_wait0() || thread->interp_at_preemptable_vmcall_cnt() > 0,
+           "preemptable VM call not using call_VM_preemptable");
     thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
   }
 }
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index 549c9cda7b6..5af8ea1da37 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -518,6 +518,14 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
 
+#ifdef ASSERT
+  Label not_preempted;
+  ld(t0, Address(xthread, JavaThread::preempt_alternate_return_offset()));
+  beqz(t0, not_preempted);
+  stop("remove_activation: should not have alternate return address set");
+  bind(not_preempted);
+#endif /* ASSERT */
+
   // get the value of _do_not_unlock_if_synchronized into x13
   const Address do_not_unlock_if_synchronized(xthread,
     in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
@@ -1441,6 +1449,7 @@ void InterpreterMacroAssembler::call_VM_leaf_base(address entry_point,
 void InterpreterMacroAssembler::call_VM_base(Register oop_result,
                                              Register java_thread,
                                              Register last_java_sp,
+                                             Label*   return_pc,
                                              address  entry_point,
                                              int      number_of_arguments,
                                              bool     check_exceptions) {
@@ -1463,26 +1472,34 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
 #endif /* ASSERT */
   // super call
   MacroAssembler::call_VM_base(oop_result, noreg, last_java_sp,
-                               entry_point, number_of_arguments,
-                               check_exceptions);
-// interpreter specific
+                               return_pc, entry_point,
+                               number_of_arguments, check_exceptions);
+  // interpreter specific
   restore_bcp();
   restore_locals();
 }
 
-void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
-                                                    address entry_point,
-                                                    Register arg_1) {
-  assert(arg_1 == c_rarg1, "");
+void InterpreterMacroAssembler::call_VM_preemptable_helper(Register oop_result,
+                                                           address entry_point,
+                                                           int number_of_arguments,
+                                                           bool check_exceptions) {
+  assert(InterpreterRuntime::is_preemptable_call(entry_point),
+         "VM call not preemptable, should use call_VM()");
   Label resume_pc, not_preempted;
 
 #ifdef ASSERT
   {
-    Label L;
+    Label L1, L2;
     ld(t0, Address(xthread, JavaThread::preempt_alternate_return_offset()));
-    beqz(t0, L);
-    stop("Should not have alternate return address set");
-    bind(L);
+    beqz(t0, L1);
+    stop("call_VM_preemptable_helper: Should not have alternate return address set");
+    bind(L1);
+    // We check this counter in patch_return_pc_with_preempt_stub() during freeze.
+    incrementw(Address(xthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    lw(t0, Address(xthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    bgtz(t0, L2);
+    stop("call_VM_preemptable_helper: should be > 0");
+    bind(L2);
   }
 #endif /* ASSERT */
 
@@ -1490,12 +1507,22 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
   push_cont_fastpath();
 
   // Make VM call. In case of preemption set last_pc to the one we want to resume to.
-  la(t0, resume_pc);
-  sd(t0, Address(xthread, JavaThread::last_Java_pc_offset()));
-  call_VM_base(oop_result, noreg, noreg, entry_point, 1, false /*check_exceptions*/);
+  // Note: call_VM_base will use resume_pc label to set last_Java_pc.
+  call_VM_base(noreg, noreg, noreg, &resume_pc, entry_point, number_of_arguments, false /*check_exceptions*/);
 
   pop_cont_fastpath();
 
+#ifdef ASSERT
+  {
+    Label L;
+    decrementw(Address(xthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    lw(t0, Address(xthread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    bgez(t0, L);
+    stop("call_VM_preemptable_helper: should be >= 0");
+    bind(L);
+  }
+#endif /* ASSERT */
+
   // Check if preempted.
   ld(t1, Address(xthread, JavaThread::preempt_alternate_return_offset()));
   beqz(t1, not_preempted);
@@ -1507,6 +1534,51 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
   restore_after_resume(false /* is_native */);
 
   bind(not_preempted);
+  if (check_exceptions) {
+    // check for pending exceptions
+    ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+    Label ok;
+    beqz(t0, ok);
+    la(t1, RuntimeAddress(StubRoutines::forward_exception_entry()));
+    jr(t1);
+    bind(ok);
+  }
+
+  // get oop result if there is one and reset the value in the thread
+  if (oop_result->is_valid()) {
+    get_vm_result_oop(oop_result, xthread);
+  }
+}
+
+static void pass_arg1(MacroAssembler* masm, Register arg) {
+  if (c_rarg1 != arg) {
+    masm->mv(c_rarg1, arg);
+  }
+}
+
+static void pass_arg2(MacroAssembler* masm, Register arg) {
+  if (c_rarg2 != arg) {
+    masm->mv(c_rarg2, arg);
+  }
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                         address entry_point,
+                                         Register arg_1,
+                                         bool check_exceptions) {
+  pass_arg1(this, arg_1);
+  call_VM_preemptable_helper(oop_result, entry_point, 1, check_exceptions);
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                         address entry_point,
+                                         Register arg_1,
+                                         Register arg_2,
+                                         bool check_exceptions) {
+  LP64_ONLY(assert_different_registers(arg_1, c_rarg2));
+  pass_arg2(this, arg_2);
+  pass_arg1(this, arg_1);
+  call_VM_preemptable_helper(oop_result, entry_point, 2, check_exceptions);
 }
 
 void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index 295f1b22191..89b2ed17291 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -46,6 +46,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
   virtual void call_VM_base(Register oop_result,
                             Register java_thread,
                             Register last_java_sp,
+                            Label*   return_pc,
                             address  entry_point,
                             int number_of_arguments,
                             bool check_exceptions);
@@ -59,11 +60,27 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void load_earlyret_value(TosState state);
 
+  // Use for vthread preemption
   void call_VM_preemptable(Register oop_result,
                            address entry_point,
-                           Register arg_1);
+                           Register arg_1,
+                           bool check_exceptions = true);
+
+  void call_VM_preemptable(Register oop_result,
+                           address entry_point,
+                           Register arg_1,
+                           Register arg_2,
+                           bool check_exceptions = true);
+
   void restore_after_resume(bool is_native);
 
+ private:
+  void call_VM_preemptable_helper(Register oop_result,
+                                  address entry_point,
+                                  int number_of_arguments,
+                                  bool check_exceptions);
+
+ public:
   void jump_to_entry(address entry);
 
   virtual void check_and_handle_popframe(Register java_thread);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 700e42e6194..54304ec648d 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -233,7 +233,7 @@ int MacroAssembler::align(int modulus, int extra_offset) {
 }
 
 void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions) {
-  call_VM_base(oop_result, noreg, noreg, entry_point, number_of_arguments, check_exceptions);
+  call_VM_base(oop_result, noreg, noreg, nullptr, entry_point, number_of_arguments, check_exceptions);
 }
 
 // Implementation of call_VM versions
@@ -284,7 +284,7 @@ void MacroAssembler::call_VM(Register oop_result,
                              address entry_point,
                              int number_of_arguments,
                              bool check_exceptions) {
-  call_VM_base(oop_result, xthread, last_java_sp, entry_point, number_of_arguments, check_exceptions);
+  call_VM_base(oop_result, xthread, last_java_sp, nullptr, entry_point, number_of_arguments, check_exceptions);
 }
 
 void MacroAssembler::call_VM(Register oop_result,
@@ -409,13 +409,10 @@ void MacroAssembler::reset_last_Java_frame(bool clear_fp) {
   sd(zr, Address(xthread, JavaThread::last_Java_pc_offset()));
 }
 
-static bool is_preemptable(address entry_point) {
-  return entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter);
-}
-
 void MacroAssembler::call_VM_base(Register oop_result,
                                   Register java_thread,
                                   Register last_java_sp,
+                                  Label*   return_pc,
                                   address  entry_point,
                                   int      number_of_arguments,
                                   bool     check_exceptions) {
@@ -423,6 +420,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
   if (!java_thread->is_valid()) {
     java_thread = xthread;
   }
+
   // determine last_java_sp register
   if (!last_java_sp->is_valid()) {
     last_java_sp = esp;
@@ -442,12 +440,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
   assert(last_java_sp != fp, "can't use fp");
 
   Label l;
-  if (is_preemptable(entry_point)) {
-    // skip setting last_pc since we already set it to desired value.
-    set_last_Java_frame(last_java_sp, fp, noreg);
-  } else {
-    set_last_Java_frame(last_java_sp, fp, l, t0);
-  }
+  set_last_Java_frame(last_java_sp, fp, return_pc != nullptr ? *return_pc : l, t0);
 
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 9e713e90270..e0e610ff49a 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -168,6 +168,7 @@ class MacroAssembler: public Assembler {
     Register oop_result,               // where an oop-result ends up if any; use noreg otherwise
     Register java_thread,              // the thread if computed before     ; use noreg otherwise
     Register last_java_sp,             // to set up last_Java_frame in stubs; use noreg otherwise
+    Label*   return_pc,                // to set up last_Java_frame; use nullptr otherwise
     address  entry_point,              // the entry point
     int      number_of_arguments,      // the number of arguments (w/o thread) to pop after the call
     bool     check_exceptions          // whether to check for pending exceptions after return
diff --git a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
index 541cb0cbcb5..ea5aef14ae1 100644
--- a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
@@ -28,20 +28,20 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
-// Java frames don't have callee saved registers (except for fp), so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+class SmallRegisterMap;
+
+// Java frames don't have callee saved registers (except for fp), so we can use a smaller RegisterMap
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
+
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
-private:
   static void assert_is_fp(VMReg r) NOT_DEBUG_RETURN
                                     DEBUG_ONLY({ assert (r == fp->as_VMReg() || r == fp->as_VMReg()->next(), "Reg: %s", r->name()); })
+
 public:
   // as_RegisterMap is used when we didn't want to templatize and abstract over RegisterMap type to support SmallRegisterMap
   // Consider enhancing SmallRegisterMap to support those cases
@@ -71,7 +71,7 @@ public:
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
diff --git a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
index fa8a8fb47f0..9e2b8003dc4 100644
--- a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
@@ -106,17 +106,14 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   assert_is_interpreted_and_frame_type_mixed();
   ResourceMark rm;
-  InterpreterOopMap mask;
   frame f = to_frame();
-  f.interpreted_frame_oop_map(&mask);
-  return mask.num_oops()
-        + 1 // for the mirror oop
-        + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
-        + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
-              (intptr_t*)f.interpreter_frame_monitor_end()) / BasicObjectLock::size();
+  InterpreterOopCount closure;
+  f.oops_interpreted_do(&closure, map);
+  return closure.count();
 }
 
 template<>
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index bd4a89d8199..ca41583e4bc 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -2206,7 +2206,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   // Class initialization barrier slow path lands here as well.
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ mv(temp, (int) code);
-  __ call_VM(noreg, entry, temp);
+  __ call_VM_preemptable(noreg, entry, temp);
 
   // Update registers with resolved info
   __ load_method_entry(Rcache, index);
@@ -2259,7 +2259,7 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   // Class initialization barrier slow path lands here as well.
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ mv(temp, (int) code);
-  __ call_VM(noreg, entry, temp);
+  __ call_VM_preemptable(noreg, entry, temp);
 
   // Update registers with resolved info
   __ load_field_entry(Rcache, index);
@@ -3612,7 +3612,7 @@ void TemplateTable::_new() {
   __ bind(slow_case);
   __ get_constant_pool(c_rarg1);
   __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
-  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
+  __ call_VM_preemptable(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
   __ verify_oop(x10);
 
   // continue
diff --git a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
index d39821bd034..33ac17effa7 100644
--- a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
@@ -68,6 +68,15 @@ inline void FreezeBase::patch_stack_pd(intptr_t* frame_sp, intptr_t* heap_sp) {
   Unimplemented();
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  Unimplemented();
+  return nullptr;
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+  Unimplemented();
+}
+
 inline frame ThawBase::new_entry_frame() {
   Unimplemented();
   return frame();
@@ -100,6 +109,11 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   return nullptr;
 }
 
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  Unimplemented();
+  return nullptr;
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   Unimplemented();
diff --git a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
index 3a0afb27260..43363ccd933 100644
--- a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
@@ -28,18 +28,17 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
-// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+class SmallRegisterMap;
+
+// Java frames don't have callee saved registers (except for rfp), so we can use a smaller SmallRegisterMapType
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
+
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
-private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ Unimplemented(); })
 public:
@@ -69,7 +68,7 @@ public:
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
diff --git a/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp b/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp
index d94dea33e55..4fff0846a80 100644
--- a/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp
@@ -85,7 +85,8 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   Unimplemented();
   return 0;
 }
diff --git a/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp b/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
index 126f4043cad..7691a84a9fe 100644
--- a/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
@@ -191,6 +191,41 @@ inline void FreezeBase::patch_pd_unused(intptr_t* sp) {
   *fp_addr = badAddressVal;
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  intptr_t* sp = _top_frame.sp();
+  if (_top_frame.is_interpreted_frame()) {
+    // In case the top frame is interpreted we need to set up the anchor using
+    // the last_sp saved in the frame (remove possible alignment added while
+    // thawing, see ThawBase::finish_thaw()). We also clear last_sp to match
+    // the behavior when calling the VM from the interpreter (we check for this
+    // in FreezeBase::prepare_freeze_interpreted_top_frame, which can be reached
+    // if preempting again at redo_vmcall()).
+    _last_sp_from_frame = _top_frame.interpreter_frame_last_sp();
+    assert(_last_sp_from_frame != nullptr, "");
+    _top_frame.interpreter_frame_set_last_sp(nullptr);
+    if (sp != _last_sp_from_frame) {
+      // We need to move up return pc and fp. They will be read next in
+      // set_anchor() and set as _last_Java_pc and _last_Java_fp respectively.
+      _last_sp_from_frame[-1] = (intptr_t)_top_frame.pc();
+      _last_sp_from_frame[-2] = (intptr_t)_top_frame.fp();
+    }
+    _is_interpreted = true;
+    sp = _last_sp_from_frame;
+  }
+  return sp;
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+  if (_is_interpreted) {
+    // Restore last_sp_from_frame and possibly overwritten pc.
+    _top_frame.interpreter_frame_set_last_sp(_last_sp_from_frame);
+    intptr_t* sp = _top_frame.sp();
+    if (sp != _last_sp_from_frame) {
+      sp[-1] = (intptr_t)_top_frame.pc();
+    }
+  }
+}
+
 //////// Thaw
 
 // Fast path
@@ -291,10 +326,17 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   frame enterSpecial = new_entry_frame();
   intptr_t* sp = enterSpecial.sp();
 
+  // We only need to set the return pc. rbp will be restored back in gen_continuation_enter().
   sp[-1] = (intptr_t)ContinuationEntry::cleanup_pc();
-  sp[-2] = (intptr_t)enterSpecial.fp();
+  return sp;
+}
 
-  log_develop_trace(continuations, preempt)("push_cleanup_continuation initial sp: " INTPTR_FORMAT " final sp: " INTPTR_FORMAT, p2i(sp + 2 * frame::metadata_words), p2i(sp));
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  frame enterSpecial = new_entry_frame();
+  intptr_t* sp = enterSpecial.sp();
+
+  // We only need to set the return pc. rbp will be restored back in generate_cont_preempt_stub().
+  sp[-1] = (intptr_t)StubRoutines::cont_preempt_stub();
   return sp;
 }
 
diff --git a/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp b/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
index 6d72e1b80e8..bb32e55db75 100644
--- a/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
@@ -50,6 +50,9 @@ static inline void patch_return_pc_with_preempt_stub(frame& f) {
     // The target will check for preemption once it returns to the interpreter
     // or the native wrapper code and will manually jump to the preempt stub.
     JavaThread *thread = JavaThread::current();
+    DEBUG_ONLY(Method* m = f.is_interpreted_frame() ? f.interpreter_frame_method() : f.cb()->as_nmethod()->method();)
+    assert(m->is_object_wait0() || thread->interp_at_preemptable_vmcall_cnt() > 0,
+           "preemptable VM call not using call_VM_preemptable");
     thread->set_preempt_alternate_return(StubRoutines::cont_preempt_stub());
   }
 }
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 9720be17892..110dfab5808 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -326,19 +326,26 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
   restore_locals();
 }
 
-void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
-                                                    address entry_point,
-                                                    Register arg_1) {
-  assert(arg_1 == c_rarg1, "");
+void InterpreterMacroAssembler::call_VM_preemptable_helper(Register oop_result,
+                                                           address entry_point,
+                                                           int number_of_arguments,
+                                                           bool check_exceptions) {
+  assert(InterpreterRuntime::is_preemptable_call(entry_point), "VM call not preemptable, should use call_VM()");
   Label resume_pc, not_preempted;
 
 #ifdef ASSERT
   {
-    Label L;
+    Label L1, L2;
     cmpptr(Address(r15_thread, JavaThread::preempt_alternate_return_offset()), NULL_WORD);
-    jcc(Assembler::equal, L);
-    stop("Should not have alternate return address set");
-    bind(L);
+    jcc(Assembler::equal, L1);
+    stop("call_VM_preemptable_helper: should not have alternate return address set");
+    bind(L1);
+    // We check this counter in patch_return_pc_with_preempt_stub() during freeze.
+    incrementl(Address(r15_thread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    cmpl(Address(r15_thread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()), 0);
+    jcc(Assembler::greater, L2);
+    stop("call_VM_preemptable_helper: should be > 0");
+    bind(L2);
   }
 #endif /* ASSERT */
 
@@ -346,14 +353,25 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
   push_cont_fastpath();
 
   // Make VM call. In case of preemption set last_pc to the one we want to resume to.
-  // Note: call_VM_helper requires last_Java_pc for anchor to be at the top of the stack.
   lea(rscratch1, resume_pc);
   push(rscratch1);
-  MacroAssembler::call_VM_helper(oop_result, entry_point, 1, false /*check_exceptions*/);
+  lea(rax, Address(rsp, wordSize));
+  call_VM_base(noreg, rax, entry_point, number_of_arguments, false);
   pop(rscratch1);
 
   pop_cont_fastpath();
 
+#ifdef ASSERT
+  {
+    Label L;
+    decrementl(Address(r15_thread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()));
+    cmpl(Address(r15_thread, JavaThread::interp_at_preemptable_vmcall_cnt_offset()), 0);
+    jcc(Assembler::greaterEqual, L);
+    stop("call_VM_preemptable_helper: should be >= 0");
+    bind(L);
+  }
+#endif /* ASSERT */
+
   // Check if preempted.
   movptr(rscratch1, Address(r15_thread, JavaThread::preempt_alternate_return_offset()));
   cmpptr(rscratch1, NULL_WORD);
@@ -366,6 +384,54 @@ void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
   restore_after_resume(false /* is_native */);
 
   bind(not_preempted);
+  if (check_exceptions) {
+    // check for pending exceptions
+    cmpptr(Address(r15_thread, Thread::pending_exception_offset()), NULL_WORD);
+    Label ok;
+    jcc(Assembler::equal, ok);
+    // Exception stub expects return pc to be at top of stack. We only need
+    // it to check Interpreter::contains(return_address) so anything will do.
+    lea(rscratch1, resume_pc);
+    push(rscratch1);
+    jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+    bind(ok);
+  }
+
+  // get oop result if there is one and reset the value in the thread
+  if (oop_result->is_valid()) {
+    get_vm_result_oop(oop_result);
+  }
+}
+
+static void pass_arg1(MacroAssembler* masm, Register arg) {
+  if (c_rarg1 != arg ) {
+    masm->mov(c_rarg1, arg);
+  }
+}
+
+static void pass_arg2(MacroAssembler* masm, Register arg) {
+  if (c_rarg2 != arg ) {
+    masm->mov(c_rarg2, arg);
+  }
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                         address entry_point,
+                                         Register arg_1,
+                                         bool check_exceptions) {
+  pass_arg1(this, arg_1);
+  call_VM_preemptable_helper(oop_result, entry_point, 1, check_exceptions);
+}
+
+void InterpreterMacroAssembler::call_VM_preemptable(Register oop_result,
+                                         address entry_point,
+                                         Register arg_1,
+                                         Register arg_2,
+                                         bool check_exceptions) {
+  LP64_ONLY(assert_different_registers(arg_1, c_rarg2));
+  pass_arg2(this, arg_2);
+  pass_arg1(this, arg_1);
+  call_VM_preemptable_helper(oop_result, entry_point, 2, check_exceptions);
 }
 
 void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
@@ -800,6 +866,14 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
 
+#ifdef ASSERT
+  Label not_preempted;
+  cmpptr(Address(r15_thread, JavaThread::preempt_alternate_return_offset()), NULL_WORD);
+  jcc(Assembler::equal, not_preempted);
+  stop("remove_activation: should not have alternate return address set");
+  bind(not_preempted);
+#endif /* ASSERT */
+
   const Register rthread = r15_thread;
   const Register robj    = c_rarg1;
   const Register rmon    = c_rarg1;
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index a36a697eebf..1d2080cd542 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -62,11 +62,24 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void load_earlyret_value(TosState state);
 
+  // Use for vthread preemption
   void call_VM_preemptable(Register oop_result,
                            address entry_point,
-                           Register arg_1);
+                           Register arg_1,
+                           bool check_exceptions = true);
+  void call_VM_preemptable(Register oop_result,
+                           address entry_point,
+                           Register arg_1,
+                           Register arg_2,
+                           bool check_exceptions = true);
   void restore_after_resume(bool is_native);
+ private:
+  void call_VM_preemptable_helper(Register oop_result,
+                                  address entry_point,
+                                  int number_of_arguments,
+                                  bool check_exceptions);
 
+ public:
   // Interpreter-specific registers
   void save_bcp() {
     movptr(Address(rbp, frame::interpreter_frame_bcp_offset * wordSize), _bcp_register);
diff --git a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
index 930a8af0794..78b604c16fc 100644
--- a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
@@ -28,19 +28,17 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
+class SmallRegisterMap;
+
 // Java frames don't have callee saved registers (except for rbp), so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
-private:
   static void assert_is_rbp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ assert(r == rbp->as_VMReg() || r == rbp->as_VMReg()->next(), "Reg: %s", r->name()); })
 public:
@@ -72,7 +70,7 @@ public:
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
diff --git a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
index 6289b903ab1..ebdae8a7eac 100644
--- a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
@@ -106,17 +106,14 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   assert_is_interpreted_and_frame_type_mixed();
   ResourceMark rm;
-  InterpreterOopMap mask;
   frame f = to_frame();
-  f.interpreted_frame_oop_map(&mask);
-  return  mask.num_oops()
-        + 1 // for the mirror oop
-        + (f.interpreter_frame_method()->is_native() ? 1 : 0) // temp oop slot
-        + pointer_delta_as_int((intptr_t*)f.interpreter_frame_monitor_begin(),
-              (intptr_t*)f.interpreter_frame_monitor_end())/BasicObjectLock::size();
+  InterpreterOopCount closure;
+  f.oops_interpreted_do(&closure, map);
+  return closure.count();
 }
 
 template<>
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index c8dafb2d023..7065f653e19 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -2233,7 +2233,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   // Class initialization barrier slow path lands here as well.
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ movl(temp, code);
-  __ call_VM(noreg, entry, temp);
+  __ call_VM_preemptable(noreg, entry, temp);
   // Update registers with resolved info
   __ load_method_entry(cache, index);
   __ bind(L_done);
@@ -2280,7 +2280,7 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   // Class initialization barrier slow path lands here as well.
   address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
   __ movl(temp, code);
-  __ call_VM(noreg, entry, temp);
+  __ call_VM_preemptable(noreg, entry, temp);
   // Update registers with resolved info
   __ load_field_entry(cache, index);
   __ bind(L_done);
@@ -3644,8 +3644,8 @@ void TemplateTable::_new() {
 
   __ get_constant_pool(c_rarg1);
   __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
-  call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
-   __ verify_oop(rax);
+  __ call_VM_preemptable(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
+  __ verify_oop(rax);
 
   // continue
   __ bind(done);
diff --git a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
index eb6be8772f9..22f596b161a 100644
--- a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
@@ -68,6 +68,15 @@ inline void FreezeBase::patch_stack_pd(intptr_t* frame_sp, intptr_t* heap_sp) {
   Unimplemented();
 }
 
+inline intptr_t* AnchorMark::anchor_mark_set_pd() {
+  Unimplemented();
+  return nullptr;
+}
+
+inline void AnchorMark::anchor_mark_clear_pd() {
+  Unimplemented();
+}
+
 inline frame ThawBase::new_entry_frame() {
   Unimplemented();
   return frame();
@@ -100,6 +109,11 @@ inline intptr_t* ThawBase::push_cleanup_continuation() {
   return nullptr;
 }
 
+inline intptr_t* ThawBase::push_preempt_adapter() {
+  Unimplemented();
+  return nullptr;
+}
+
 template <typename ConfigT>
 inline void Thaw<ConfigT>::patch_caller_links(intptr_t* sp, intptr_t* bottom) {
   Unimplemented();
diff --git a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
index bbb70fa2065..906575ab669 100644
--- a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
@@ -28,18 +28,17 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/registerMap.hpp"
 
-// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
-class SmallRegisterMap {
-  constexpr SmallRegisterMap() = default;
-  ~SmallRegisterMap() = default;
-  NONCOPYABLE(SmallRegisterMap);
+class SmallRegisterMap;
+
+// Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
+template <bool IncludeArgs>
+class SmallRegisterMapType {
+  friend SmallRegisterMap;
+
+  constexpr SmallRegisterMapType() = default;
+  ~SmallRegisterMapType() = default;
+  NONCOPYABLE(SmallRegisterMapType);
 
-public:
-  static const SmallRegisterMap* instance() {
-    static constexpr SmallRegisterMap the_instance{};
-    return &the_instance;
-  }
-private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ Unimplemented(); })
 public:
@@ -69,7 +68,7 @@ public:
 
   bool update_map()    const { return false; }
   bool walk_cont()     const { return false; }
-  bool include_argument_oops() const { return false; }
+  bool include_argument_oops() const { return IncludeArgs; }
   void set_include_argument_oops(bool f)  {}
   bool in_cont()       const { return false; }
   stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
diff --git a/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp b/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp
index 84d6dee9149..3b9643fb3f4 100644
--- a/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp
@@ -85,7 +85,8 @@ inline int StackChunkFrameStream<frame_kind>::interpreter_frame_stack_argsize()
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::interpreter_frame_num_oops(RegisterMapT* map) const {
   Unimplemented();
   return 0;
 }
diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.cpp b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
index ff47d00c484..ddf7d32ed70 100644
--- a/src/hotspot/share/cds/aotConstantPoolResolver.cpp
+++ b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
@@ -318,13 +318,13 @@ void AOTConstantPoolResolver::maybe_resolve_fmi_ref(InstanceKlass* ik, Method* m
     if (!VM_Version::supports_fast_class_init_checks()) {
       return; // Do not resolve since interpreter lacks fast clinit barriers support
     }
-    InterpreterRuntime::resolve_get_put(bc, raw_index, mh, cp, false /*initialize_holder*/, CHECK);
+    InterpreterRuntime::resolve_get_put(bc, raw_index, mh, cp, ClassInitMode::dont_init, CHECK);
     is_static = " *** static";
     break;
 
   case Bytecodes::_getfield:
   case Bytecodes::_putfield:
-    InterpreterRuntime::resolve_get_put(bc, raw_index, mh, cp, false /*initialize_holder*/, CHECK);
+    InterpreterRuntime::resolve_get_put(bc, raw_index, mh, cp, ClassInitMode::dont_init, CHECK);
     break;
 
   case Bytecodes::_invokestatic:
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index de4d1c8a729..146ee4af1e0 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -1809,7 +1809,8 @@ void HeapShared::check_special_subgraph_classes() {
           name != vmSymbols::java_lang_ArrayStoreException() &&
           name != vmSymbols::java_lang_ClassCastException() &&
           name != vmSymbols::java_lang_InternalError() &&
-          name != vmSymbols::java_lang_NullPointerException()) {
+          name != vmSymbols::java_lang_NullPointerException() &&
+          name != vmSymbols::jdk_internal_vm_PreemptedException()) {
         ResourceMark rm;
         fatal("special subgraph cannot have objects of type %s", subgraph_k->external_name());
       }
diff --git a/src/hotspot/share/ci/ciField.cpp b/src/hotspot/share/ci/ciField.cpp
index cbe0cadbc93..d47c4c508d7 100644
--- a/src/hotspot/share/ci/ciField.cpp
+++ b/src/hotspot/share/ci/ciField.cpp
@@ -400,7 +400,7 @@ bool ciField::will_link(ciMethod* accessing_method,
                      _name->get_symbol(), _signature->get_symbol(),
                      methodHandle(THREAD, accessing_method->get_Method()));
   fieldDescriptor result;
-  LinkResolver::resolve_field(result, link_info, bc, false, CHECK_AND_CLEAR_(false));
+  LinkResolver::resolve_field(result, link_info, bc, ClassInitMode::dont_init, CHECK_AND_CLEAR_(false));
 
   // update the hit-cache, unless there is a problem with memory scoping:
   if (accessing_method->holder()->is_shared() || !is_shared()) {
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index cfe55bf7f76..ac701e8364f 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -2115,6 +2115,7 @@ int java_lang_VirtualThread::_state_offset;
 int java_lang_VirtualThread::_next_offset;
 int java_lang_VirtualThread::_onWaitingList_offset;
 int java_lang_VirtualThread::_notified_offset;
+int java_lang_VirtualThread::_interruptible_wait_offset;
 int java_lang_VirtualThread::_timeout_offset;
 int java_lang_VirtualThread::_objectWaiter_offset;
 
@@ -2126,6 +2127,7 @@ int java_lang_VirtualThread::_objectWaiter_offset;
   macro(_next_offset,                      k, "next",               vthread_signature,           false); \
   macro(_onWaitingList_offset,             k, "onWaitingList",      bool_signature,              false); \
   macro(_notified_offset,                  k, "notified",           bool_signature,              false); \
+  macro(_interruptible_wait_offset,        k, "interruptibleWait",  bool_signature,              false); \
   macro(_timeout_offset,                   k, "timeout",            long_signature,              false);
 
 
@@ -2195,6 +2197,10 @@ void java_lang_VirtualThread::set_notified(oop vthread, jboolean value) {
   vthread->bool_field_put_volatile(_notified_offset, value);
 }
 
+void java_lang_VirtualThread::set_interruptible_wait(oop vthread, jboolean value) {
+  vthread->bool_field_put_volatile(_interruptible_wait_offset, value);
+}
+
 jlong java_lang_VirtualThread::timeout(oop vthread) {
   return vthread->long_field(_timeout_offset);
 }
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 750f27fcf47..28f8c0a3b8c 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -563,6 +563,7 @@ class java_lang_VirtualThread : AllStatic {
   static int _next_offset;
   static int _onWaitingList_offset;
   static int _notified_offset;
+  static int _interruptible_wait_offset;
   static int _recheckInterval_offset;
   static int _timeout_offset;
   static int _objectWaiter_offset;
@@ -615,6 +616,7 @@ class java_lang_VirtualThread : AllStatic {
   static jlong timeout(oop vthread);
   static void set_timeout(oop vthread, jlong value);
   static void set_notified(oop vthread, jboolean value);
+  static void set_interruptible_wait(oop vthread, jboolean value);
   static bool is_preempted(oop vthread);
   static JavaThreadStatus map_state_to_thread_status(int state);
 
diff --git a/src/hotspot/share/classfile/vmClassMacros.hpp b/src/hotspot/share/classfile/vmClassMacros.hpp
index 1edc13054d4..04f0aaaaa44 100644
--- a/src/hotspot/share/classfile/vmClassMacros.hpp
+++ b/src/hotspot/share/classfile/vmClassMacros.hpp
@@ -75,6 +75,7 @@
   do_klass(IllegalMonitorStateException_klass,          java_lang_IllegalMonitorStateException                ) \
   do_klass(Reference_klass,                             java_lang_ref_Reference                               ) \
   do_klass(IllegalCallerException_klass,                java_lang_IllegalCallerException                      ) \
+  do_klass(PreemptedException_klass,                    jdk_internal_vm_PreemptedException                    ) \
                                                                                                                 \
   /* ref klasses and set reference types */                                                                     \
   do_klass(SoftReference_klass,                         java_lang_ref_SoftReference                           ) \
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index 06f27f09c5c..d22700b8d1f 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -220,6 +220,7 @@ class SerializeClosure;
   template(java_lang_Exception,                       "java/lang/Exception")                      \
   template(java_lang_RuntimeException,                "java/lang/RuntimeException")               \
   template(java_io_IOException,                       "java/io/IOException")                      \
+  template(jdk_internal_vm_PreemptedException,        "jdk/internal/vm/PreemptedException")       \
                                                                                                   \
   /* error klasses: at least all errors thrown by the VM have entries here */                     \
   template(java_lang_AbstractMethodError,             "java/lang/AbstractMethodError")            \
@@ -512,6 +513,8 @@ class SerializeClosure;
   template(maxThawingSize_name,                       "maxThawingSize")                           \
   template(lockStackSize_name,                        "lockStackSize")                            \
   template(objectWaiter_name,                         "objectWaiter")                             \
+  template(atKlassInit_name,                          "atKlassInit")                              \
+  template(hasArgsAtTop_name,                         "hasArgsAtTop")                             \
                                                                                                   \
   /* name symbols needed by intrinsics */                                                         \
   VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, template, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 6e067c77287..5f4cc6c450d 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -219,7 +219,7 @@ JRT_ENTRY(void, InterpreterRuntime::_new(JavaThread* current, ConstantPool* pool
   klass->check_valid_for_instantiation(true, CHECK);
 
   // Make sure klass is initialized
-  klass->initialize(CHECK);
+  klass->initialize_preemptable(CHECK_AND_CLEAR_PREEMPTED);
 
   oop obj = klass->allocate_instance(CHECK);
   current->set_vm_result_oop(obj);
@@ -646,18 +646,19 @@ JRT_END
 // Fields
 //
 
-void InterpreterRuntime::resolve_get_put(JavaThread* current, Bytecodes::Code bytecode) {
+void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, TRAPS) {
+  JavaThread* current = THREAD;
   LastFrameAccessor last_frame(current);
   constantPoolHandle pool(current, last_frame.method()->constants());
   methodHandle m(current, last_frame.method());
 
-  resolve_get_put(bytecode, last_frame.get_index_u2(bytecode), m, pool, true /*initialize_holder*/, current);
+  resolve_get_put(bytecode, last_frame.get_index_u2(bytecode), m, pool, ClassInitMode::init_preemptable, THREAD);
 }
 
 void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, int field_index,
                                          methodHandle& m,
                                          constantPoolHandle& pool,
-                                         bool initialize_holder, TRAPS) {
+                                         ClassInitMode init_mode, TRAPS) {
   fieldDescriptor info;
   bool is_put    = (bytecode == Bytecodes::_putfield  || bytecode == Bytecodes::_nofast_putfield ||
                     bytecode == Bytecodes::_putstatic);
@@ -665,8 +666,7 @@ void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, int field_ind
 
   {
     JvmtiHideSingleStepping jhss(THREAD);
-    LinkResolver::resolve_field_access(info, pool, field_index,
-                                       m, bytecode, initialize_holder, CHECK);
+    LinkResolver::resolve_field_access(info, pool, field_index, m, bytecode, init_mode, CHECK);
   } // end JvmtiHideSingleStepping
 
   // check if link resolution caused cpCache to be updated
@@ -794,7 +794,8 @@ JRT_ENTRY(void, InterpreterRuntime::_breakpoint(JavaThread* current, Method* met
   JvmtiExport::post_raw_breakpoint(current, method, bcp);
 JRT_END
 
-void InterpreterRuntime::resolve_invoke(JavaThread* current, Bytecodes::Code bytecode) {
+void InterpreterRuntime::resolve_invoke(Bytecodes::Code bytecode, TRAPS) {
+  JavaThread* current = THREAD;
   LastFrameAccessor last_frame(current);
   // extract receiver from the outgoing argument list if necessary
   Handle receiver(current, nullptr);
@@ -822,10 +823,9 @@ void InterpreterRuntime::resolve_invoke(JavaThread* current, Bytecodes::Code byt
   int method_index = last_frame.get_index_u2(bytecode);
   {
     JvmtiHideSingleStepping jhss(current);
-    JavaThread* THREAD = current; // For exception macros.
     LinkResolver::resolve_invoke(info, receiver, pool,
                                  method_index, bytecode,
-                                 THREAD);
+                                 ClassInitMode::init_preemptable, THREAD);
 
     if (HAS_PENDING_EXCEPTION) {
       if (ProfileTraps && PENDING_EXCEPTION->klass()->name() == vmSymbols::java_lang_NullPointerException()) {
@@ -933,7 +933,8 @@ void InterpreterRuntime::cds_resolve_invoke(Bytecodes::Code bytecode, int method
 }
 
 // First time execution:  Resolve symbols, create a permanent MethodType object.
-void InterpreterRuntime::resolve_invokehandle(JavaThread* current) {
+void InterpreterRuntime::resolve_invokehandle(TRAPS) {
+  JavaThread* current = THREAD;
   const Bytecodes::Code bytecode = Bytecodes::_invokehandle;
   LastFrameAccessor last_frame(current);
 
@@ -962,7 +963,8 @@ void InterpreterRuntime::cds_resolve_invokehandle(int raw_index,
 }
 
 // First time execution:  Resolve symbols, create a permanent CallSite object.
-void InterpreterRuntime::resolve_invokedynamic(JavaThread* current) {
+void InterpreterRuntime::resolve_invokedynamic(TRAPS) {
+  JavaThread* current = THREAD;
   LastFrameAccessor last_frame(current);
   const Bytecodes::Code bytecode = Bytecodes::_invokedynamic;
 
@@ -997,19 +999,19 @@ JRT_ENTRY(void, InterpreterRuntime::resolve_from_cache(JavaThread* current, Byte
   case Bytecodes::_putstatic:
   case Bytecodes::_getfield:
   case Bytecodes::_putfield:
-    resolve_get_put(current, bytecode);
+    resolve_get_put(bytecode, CHECK_AND_CLEAR_PREEMPTED);
     break;
   case Bytecodes::_invokevirtual:
   case Bytecodes::_invokespecial:
   case Bytecodes::_invokestatic:
   case Bytecodes::_invokeinterface:
-    resolve_invoke(current, bytecode);
+    resolve_invoke(bytecode, CHECK_AND_CLEAR_PREEMPTED);
     break;
   case Bytecodes::_invokehandle:
-    resolve_invokehandle(current);
+    resolve_invokehandle(THREAD);
     break;
   case Bytecodes::_invokedynamic:
-    resolve_invokedynamic(current);
+    resolve_invokedynamic(THREAD);
     break;
   default:
     fatal("unexpected bytecode: %s", Bytecodes::name(bytecode));
@@ -1524,3 +1526,11 @@ JRT_LEAF(intptr_t, InterpreterRuntime::trace_bytecode(JavaThread* current, intpt
   return preserve_this_value;
 JRT_END
 #endif // !PRODUCT
+
+#ifdef ASSERT
+bool InterpreterRuntime::is_preemptable_call(address entry_point) {
+  return entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter) ||
+         entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache) ||
+         entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::_new);
+}
+#endif // ASSERT
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp
index cdee0c9daa7..f553debcd75 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.hpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp
@@ -94,7 +94,7 @@ class InterpreterRuntime: AllStatic {
 
   // Used by AOTConstantPoolResolver
   static void resolve_get_put(Bytecodes::Code bytecode, int field_index,
-                              methodHandle& m, constantPoolHandle& pool, bool initialize_holder, TRAPS);
+                              methodHandle& m, constantPoolHandle& pool, ClassInitMode init_mode, TRAPS);
   static void cds_resolve_invoke(Bytecodes::Code bytecode, int method_index,
                                  constantPoolHandle& pool, TRAPS);
   static void cds_resolve_invokehandle(int raw_index,
@@ -103,12 +103,12 @@ class InterpreterRuntime: AllStatic {
                                         constantPoolHandle& pool, TRAPS);
 private:
   // Statics & fields
-  static void resolve_get_put(JavaThread* current, Bytecodes::Code bytecode);
+  static void resolve_get_put(Bytecodes::Code bytecode, TRAPS);
 
   // Calls
-  static void resolve_invoke(JavaThread* current, Bytecodes::Code bytecode);
-  static void resolve_invokehandle (JavaThread* current);
-  static void resolve_invokedynamic(JavaThread* current);
+  static void resolve_invoke(Bytecodes::Code bytecode, TRAPS);
+  static void resolve_invokehandle (TRAPS);
+  static void resolve_invokedynamic(TRAPS);
 
   static void update_invoke_cp_cache_entry(CallInfo& info, Bytecodes::Code bytecode,
                                            methodHandle& resolved_method,
@@ -170,6 +170,9 @@ private:
   static void    verify_mdp(Method* method, address bcp, address mdp);
 #endif // ASSERT
   static MethodCounters* build_method_counters(JavaThread* current, Method* m);
+
+  // Virtual Thread Preemption
+  DEBUG_ONLY(static bool is_preemptable_call(address entry_point);)
 };
 
 
diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
index d46ccdb4d1c..c82398b654c 100644
--- a/src/hotspot/share/interpreter/linkResolver.cpp
+++ b/src/hotspot/share/interpreter/linkResolver.cpp
@@ -986,14 +986,14 @@ void LinkResolver::resolve_field_access(fieldDescriptor& fd,
                                         int index,
                                         const methodHandle& method,
                                         Bytecodes::Code byte,
-                                        bool initialize_class, TRAPS) {
+                                        ClassInitMode init_mode, TRAPS) {
   LinkInfo link_info(pool, index, method, byte, CHECK);
-  resolve_field(fd, link_info, byte, initialize_class, CHECK);
+  resolve_field(fd, link_info, byte, init_mode, CHECK);
 }
 
 void LinkResolver::resolve_field(fieldDescriptor& fd,
                                  const LinkInfo& link_info,
-                                 Bytecodes::Code byte, bool initialize_class,
+                                 Bytecodes::Code byte, ClassInitMode init_mode,
                                  TRAPS) {
   assert(byte == Bytecodes::_getstatic || byte == Bytecodes::_putstatic ||
          byte == Bytecodes::_getfield  || byte == Bytecodes::_putfield  ||
@@ -1077,8 +1077,12 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
     //
     // note 2: we don't want to force initialization if we are just checking
     //         if the field access is legal; e.g., during compilation
-    if (is_static && initialize_class) {
-      sel_klass->initialize(CHECK);
+    if (is_static) {
+      if (init_mode == ClassInitMode::init) {
+        sel_klass->initialize(CHECK);
+      } else if (init_mode == ClassInitMode::init_preemptable) {
+        sel_klass->initialize_preemptable(CHECK);
+      }
     }
   }
 
@@ -1104,15 +1108,19 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
 
 void LinkResolver::resolve_static_call(CallInfo& result,
                                        const LinkInfo& link_info,
-                                       bool initialize_class, TRAPS) {
+                                       ClassInitMode init_mode, TRAPS) {
   Method* resolved_method = linktime_resolve_static_method(link_info, CHECK);
 
   // The resolved class can change as a result of this resolution.
   Klass* resolved_klass = resolved_method->method_holder();
 
   // Initialize klass (this should only happen if everything is ok)
-  if (initialize_class && resolved_klass->should_be_initialized()) {
-    resolved_klass->initialize(CHECK);
+  if (init_mode != ClassInitMode::dont_init && resolved_klass->should_be_initialized()) {
+    if (init_mode == ClassInitMode::init) {
+      resolved_klass->initialize(CHECK);
+    } else if (init_mode == ClassInitMode::init_preemptable) {
+      resolved_klass->initialize_preemptable(CHECK);
+    }
     // Use updated LinkInfo to reresolve with resolved method holder
     LinkInfo new_info(resolved_klass, link_info.name(), link_info.signature(),
                       link_info.current_klass(),
@@ -1127,7 +1135,7 @@ void LinkResolver::resolve_static_call(CallInfo& result,
 }
 
 void LinkResolver::cds_resolve_static_call(CallInfo& result, const LinkInfo& link_info, TRAPS) {
-  resolve_static_call(result, link_info, /*initialize_class*/false, CHECK);
+  resolve_static_call(result, link_info, ClassInitMode::dont_init, CHECK);
 }
 
 // throws linktime exceptions
@@ -1678,7 +1686,7 @@ int LinkResolver::resolve_virtual_vtable_index(Klass* receiver_klass,
 Method* LinkResolver::resolve_static_call_or_null(const LinkInfo& link_info) {
   EXCEPTION_MARK;
   CallInfo info;
-  resolve_static_call(info, link_info, /*initialize_class*/false, THREAD);
+  resolve_static_call(info, link_info, ClassInitMode::dont_init, THREAD);
   if (HAS_PENDING_EXCEPTION) {
     CLEAR_PENDING_EXCEPTION;
     return nullptr;
@@ -1702,15 +1710,15 @@ Method* LinkResolver::resolve_special_call_or_null(const LinkInfo& link_info) {
 //------------------------------------------------------------------------------------------------------------------------
 // ConstantPool entries
 
-void LinkResolver::resolve_invoke(CallInfo& result, Handle recv, const constantPoolHandle& pool, int index, Bytecodes::Code byte, TRAPS) {
+void LinkResolver::resolve_invoke(CallInfo& result, Handle recv, const constantPoolHandle& pool, int index, Bytecodes::Code byte, ClassInitMode init_mode, TRAPS) {
   switch (byte) {
-    case Bytecodes::_invokestatic   : resolve_invokestatic   (result,       pool, index, CHECK); break;
-    case Bytecodes::_invokespecial  : resolve_invokespecial  (result, recv, pool, index, CHECK); break;
-    case Bytecodes::_invokevirtual  : resolve_invokevirtual  (result, recv, pool, index, CHECK); break;
-    case Bytecodes::_invokehandle   : resolve_invokehandle   (result,       pool, index, CHECK); break;
-    case Bytecodes::_invokedynamic  : resolve_invokedynamic  (result,       pool, index, CHECK); break;
-    case Bytecodes::_invokeinterface: resolve_invokeinterface(result, recv, pool, index, CHECK); break;
-    default                         :                                                            break;
+    case Bytecodes::_invokestatic   : resolve_invokestatic   (result,       pool, index, init_mode, CHECK); break;
+    case Bytecodes::_invokespecial  : resolve_invokespecial  (result, recv, pool, index,            CHECK); break;
+    case Bytecodes::_invokevirtual  : resolve_invokevirtual  (result, recv, pool, index,            CHECK); break;
+    case Bytecodes::_invokehandle   : resolve_invokehandle   (result,       pool, index,            CHECK); break;
+    case Bytecodes::_invokedynamic  : resolve_invokedynamic  (result,       pool, index,            CHECK); break;
+    case Bytecodes::_invokeinterface: resolve_invokeinterface(result, recv, pool, index,            CHECK); break;
+    default                         :                                                                       break;
   }
   return;
 }
@@ -1732,7 +1740,7 @@ void LinkResolver::resolve_invoke(CallInfo& result, Handle& recv,
                              /*check_null_and_abstract=*/true, CHECK);
       break;
     case Bytecodes::_invokestatic:
-      resolve_static_call(result, link_info, /*initialize_class=*/false, CHECK);
+      resolve_static_call(result, link_info, ClassInitMode::dont_init, CHECK);
       break;
     case Bytecodes::_invokespecial:
       resolve_special_call(result, recv, link_info, CHECK);
@@ -1743,9 +1751,9 @@ void LinkResolver::resolve_invoke(CallInfo& result, Handle& recv,
   }
 }
 
-void LinkResolver::resolve_invokestatic(CallInfo& result, const constantPoolHandle& pool, int index, TRAPS) {
+void LinkResolver::resolve_invokestatic(CallInfo& result, const constantPoolHandle& pool, int index, ClassInitMode init_mode, TRAPS) {
   LinkInfo link_info(pool, index, Bytecodes::_invokestatic, CHECK);
-  resolve_static_call(result, link_info, /*initialize_class*/true, CHECK);
+  resolve_static_call(result, link_info, init_mode, CHECK);
 }
 
 
diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
index 18fb4ee6ccb..4d28e712c5f 100644
--- a/src/hotspot/share/interpreter/linkResolver.hpp
+++ b/src/hotspot/share/interpreter/linkResolver.hpp
@@ -189,6 +189,12 @@ class LinkInfo : public StackObj {
   void         print()  PRODUCT_RETURN;
 };
 
+enum class ClassInitMode {
+  dont_init,
+  init,
+  init_preemptable
+};
+
 // Link information for getfield/putfield & getstatic/putstatic bytecodes
 // is represented using a fieldDescriptor.
 
@@ -267,7 +273,7 @@ class LinkResolver: AllStatic {
 
   // runtime resolving from constant pool
   static void resolve_invokestatic   (CallInfo& result,
-                                      const constantPoolHandle& pool, int index, TRAPS);
+                                      const constantPoolHandle& pool, int index, ClassInitMode mode, TRAPS);
   static void resolve_invokespecial  (CallInfo& result, Handle recv,
                                       const constantPoolHandle& pool, int index, TRAPS);
   static void resolve_invokevirtual  (CallInfo& result, Handle recv,
@@ -295,22 +301,21 @@ class LinkResolver: AllStatic {
                                    int index,
                                    const methodHandle& method,
                                    Bytecodes::Code byte,
-                                   bool initialize_class, TRAPS);
+                                   ClassInitMode mode, TRAPS);
   static void resolve_field_access(fieldDescriptor& result,
                                    const constantPoolHandle& pool,
                                    int index,
                                    const methodHandle& method,
                                    Bytecodes::Code byte, TRAPS) {
-    resolve_field_access(result, pool, index, method, byte,
-                         /* initialize_class*/true, THREAD);
+    resolve_field_access(result, pool, index, method, byte, ClassInitMode::init, THREAD);
   }
   static void resolve_field(fieldDescriptor& result, const LinkInfo& link_info,
                             Bytecodes::Code access_kind,
-                            bool initialize_class, TRAPS);
+                            ClassInitMode mode, TRAPS);
 
   static void resolve_static_call   (CallInfo& result,
                                      const LinkInfo& link_info,
-                                     bool initialize_klass, TRAPS);
+                                     ClassInitMode mode, TRAPS);
   static void resolve_special_call  (CallInfo& result,
                                      Handle recv,
                                      const LinkInfo& link_info,
@@ -353,7 +358,12 @@ class LinkResolver: AllStatic {
   // runtime resolving from constant pool
   static void resolve_invoke(CallInfo& result, Handle recv,
                              const constantPoolHandle& pool, int index,
-                             Bytecodes::Code byte, TRAPS);
+                             Bytecodes::Code byte, ClassInitMode static_mode, TRAPS);
+  static void resolve_invoke(CallInfo& result, Handle recv,
+                             const constantPoolHandle& pool, int index,
+                             Bytecodes::Code byte, TRAPS) {
+    resolve_invoke(result, recv, pool, index, byte, ClassInitMode::init, THREAD);
+  }
 
   // runtime resolving from attached method
   static void resolve_invoke(CallInfo& result, Handle& recv,
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 36a6fae794a..5891bec9c8a 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -1008,7 +1008,7 @@ C2V_VMENTRY_NULL(jobject, resolveFieldInPool, (JNIEnv* env, jobject, ARGUMENT_PA
   }
 
   LinkInfo link_info(cp, index, mh, code, CHECK_NULL);
-  LinkResolver::resolve_field(fd, link_info, Bytecodes::java_code(code), false, CHECK_NULL);
+  LinkResolver::resolve_field(fd, link_info, Bytecodes::java_code(code), ClassInitMode::dont_init, CHECK_NULL);
   JVMCIPrimitiveArray info = JVMCIENV->wrap(info_handle);
   if (info.is_null() || JVMCIENV->get_length(info) != 4) {
     JVMCI_ERROR_NULL("info must not be null and have a length of 4");
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 756619bff33..69afe5c6450 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -238,6 +238,7 @@ static BuiltinException _internal_error;
 static BuiltinException _array_index_out_of_bounds_exception;
 static BuiltinException _array_store_exception;
 static BuiltinException _class_cast_exception;
+static BuiltinException _preempted_exception;
 
 objArrayOop Universe::the_empty_class_array ()  {
   return (objArrayOop)_the_empty_class_array.resolve();
@@ -258,6 +259,7 @@ oop Universe::internal_error_instance()           { return _internal_error.insta
 oop Universe::array_index_out_of_bounds_exception_instance() { return _array_index_out_of_bounds_exception.instance(); }
 oop Universe::array_store_exception_instance()    { return _array_store_exception.instance(); }
 oop Universe::class_cast_exception_instance()     { return _class_cast_exception.instance(); }
+oop Universe::preempted_exception_instance()      { return _preempted_exception.instance(); }
 
 oop Universe::the_null_sentinel()                 { return _the_null_sentinel.resolve(); }
 
@@ -317,6 +319,7 @@ void Universe::archive_exception_instances() {
   _array_index_out_of_bounds_exception.store_in_cds();
   _array_store_exception.store_in_cds();
   _class_cast_exception.store_in_cds();
+  _preempted_exception.store_in_cds();
 }
 
 void Universe::load_archived_object_instances() {
@@ -336,6 +339,7 @@ void Universe::load_archived_object_instances() {
     _array_index_out_of_bounds_exception.load_from_cds();
     _array_store_exception.load_from_cds();
     _class_cast_exception.load_from_cds();
+    _preempted_exception.load_from_cds();
   }
 }
 #endif
@@ -355,6 +359,7 @@ void Universe::serialize(SerializeClosure* f) {
   _array_index_out_of_bounds_exception.serialize(f);
   _array_store_exception.serialize(f);
   _class_cast_exception.serialize(f);
+  _preempted_exception.serialize(f);
 #endif
 
   f->do_ptr(&_fillerArrayKlass);
@@ -1139,6 +1144,7 @@ bool universe_post_init() {
   _array_index_out_of_bounds_exception.init_if_empty(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), CHECK_false);
   _array_store_exception.init_if_empty(vmSymbols::java_lang_ArrayStoreException(), CHECK_false);
   _class_cast_exception.init_if_empty(vmSymbols::java_lang_ClassCastException(), CHECK_false);
+  _preempted_exception.init_if_empty(vmSymbols::jdk_internal_vm_PreemptedException(), CHECK_false);
 
   // Virtual Machine Error for when we get into a situation we can't resolve
   Klass* k = vmClasses::InternalError_klass();
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index 37ca965062e..df2c1d66d3c 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -244,6 +244,7 @@ class Universe: AllStatic {
   static oop          array_index_out_of_bounds_exception_instance();
   static oop          array_store_exception_instance();
   static oop          class_cast_exception_instance();
+  static oop          preempted_exception_instance();
   static oop          vm_exception()                  { return internal_error_instance(); }
 
   static Array<Klass*>* the_array_interfaces_array()  { return _the_array_interfaces_array; }
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index e13f4849454..2d03b69ee92 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -793,10 +793,11 @@ oop InstanceKlass::init_lock() const {
   return lock;
 }
 
-// Set the initialization lock to null so the object can be GC'ed.  Any racing
+// Set the initialization lock to null so the object can be GC'ed. Any racing
 // threads to get this lock will see a null lock and will not lock.
 // That's okay because they all check for initialized state after getting
-// the lock and return.
+// the lock and return. For preempted vthreads we keep the oop protected
+// in the ObjectMonitor (see ObjectMonitor::set_object_strong()).
 void InstanceKlass::fence_and_clear_init_lock() {
   // make sure previous stores are all done, notably the init_state.
   OrderAccess::storestore();
@@ -804,6 +805,31 @@ void InstanceKlass::fence_and_clear_init_lock() {
   assert(!is_not_initialized(), "class must be initialized now");
 }
 
+class PreemptableInitCall {
+  JavaThread* _thread;
+  bool _previous;
+  DEBUG_ONLY(InstanceKlass* _previous_klass;)
+ public:
+  PreemptableInitCall(JavaThread* thread, InstanceKlass* ik) : _thread(thread) {
+    _previous = thread->at_preemptable_init();
+    _thread->set_at_preemptable_init(true);
+    DEBUG_ONLY(_previous_klass = _thread->preempt_init_klass();)
+    DEBUG_ONLY(_thread->set_preempt_init_klass(ik));
+  }
+  ~PreemptableInitCall() {
+    _thread->set_at_preemptable_init(_previous);
+    DEBUG_ONLY(_thread->set_preempt_init_klass(_previous_klass));
+  }
+};
+
+void InstanceKlass::initialize_preemptable(TRAPS) {
+  if (this->should_be_initialized()) {
+    PreemptableInitCall pic(THREAD, this);
+    initialize_impl(THREAD);
+  } else {
+    assert(is_initialized(), "sanity check");
+  }
+}
 
 // See "The Virtual Machine Specification" section 2.16.5 for a detailed explanation of the class initialization
 // process. The step comments refers to the procedure described in that section.
@@ -980,7 +1006,12 @@ bool InstanceKlass::link_class_impl(TRAPS) {
   {
     HandleMark hm(THREAD);
     Handle h_init_lock(THREAD, init_lock());
-    ObjectLocker ol(h_init_lock, jt);
+    ObjectLocker ol(h_init_lock, CHECK_PREEMPTABLE_false);
+    // Don't allow preemption if we link/initialize classes below,
+    // since that would release this monitor while we are in the
+    // middle of linking this class.
+    NoPreemptMark npm(THREAD);
+
     // rewritten will have been set if loader constraint error found
     // on an earlier link attempt
     // don't verify or rewrite if already rewritten
@@ -1174,6 +1205,17 @@ void InstanceKlass::clean_initialization_error_table() {
   }
 }
 
+class ThreadWaitingForClassInit : public StackObj {
+  JavaThread* _thread;
+ public:
+  ThreadWaitingForClassInit(JavaThread* thread, InstanceKlass* ik) : _thread(thread) {
+    _thread->set_class_to_be_initialized(ik);
+  }
+  ~ThreadWaitingForClassInit() {
+    _thread->set_class_to_be_initialized(nullptr);
+  }
+};
+
 void InstanceKlass::initialize_impl(TRAPS) {
   HandleMark hm(THREAD);
 
@@ -1193,7 +1235,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
   // Step 1
   {
     Handle h_init_lock(THREAD, init_lock());
-    ObjectLocker ol(h_init_lock, jt);
+    ObjectLocker ol(h_init_lock, CHECK_PREEMPTABLE);
 
     // Step 2
     // If we were to use wait() instead of waitInterruptibly() then
@@ -1206,9 +1248,8 @@ void InstanceKlass::initialize_impl(TRAPS) {
                                jt->name(), external_name(), init_thread_name());
       }
       wait = true;
-      jt->set_class_to_be_initialized(this);
-      ol.wait_uninterruptibly(jt);
-      jt->set_class_to_be_initialized(nullptr);
+      ThreadWaitingForClassInit twcl(THREAD, this);
+      ol.wait_uninterruptibly(CHECK_PREEMPTABLE);
     }
 
     // Step 3
@@ -1266,6 +1307,10 @@ void InstanceKlass::initialize_impl(TRAPS) {
     }
   }
 
+  // Block preemption once we are the initializer thread. Unmounting now
+  // would complicate the reentrant case (identity is platform thread).
+  NoPreemptMark npm(THREAD);
+
   // Step 7
   // Next, if C is a class rather than an interface, initialize it's super class and super
   // interfaces.
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 82c82714f9b..8bb9741af9f 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -538,6 +538,7 @@ public:
   void initialize_with_aot_initialized_mirror(TRAPS);
   void assert_no_clinit_will_run_for_aot_initialized_class() const NOT_DEBUG_RETURN;
   void initialize(TRAPS);
+  void initialize_preemptable(TRAPS);
   void link_class(TRAPS);
   bool link_class_or_fail(TRAPS); // returns false on failure
   void rewrite_class(TRAPS);
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.cpp b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
index db60e74013f..aaa3eaa4f6b 100644
--- a/src/hotspot/share/oops/instanceStackChunkKlass.cpp
+++ b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
@@ -195,7 +195,8 @@ public:
   }
 
   const RegisterMap* get_map(const RegisterMap* map,      intptr_t* sp) { return map; }
-  const RegisterMap* get_map(const SmallRegisterMap* map, intptr_t* sp) { return map->copy_to_RegisterMap(&_map, sp); }
+  template <typename SmallRegisterMapT>
+  const RegisterMap* get_map(const SmallRegisterMapT map, intptr_t* sp) { return map->copy_to_RegisterMap(&_map, sp); }
 
   template <ChunkFrames frame_kind, typename RegisterMapT>
   bool do_frame(const StackChunkFrameStream<frame_kind>& f, const RegisterMapT* map) {
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 208a274d766..d9041cc54f4 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -252,6 +252,10 @@ void Klass::initialize(TRAPS) {
   ShouldNotReachHere();
 }
 
+void Klass::initialize_preemptable(TRAPS) {
+  ShouldNotReachHere();
+}
+
 Klass* Klass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
 #ifdef ASSERT
   tty->print_cr("Error: find_field called on a klass oop."
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index db3360b080e..5ac393d7614 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -580,6 +580,7 @@ public:
   virtual bool should_be_initialized() const    { return false; }
   // initializes the klass
   virtual void initialize(TRAPS);
+  virtual void initialize_preemptable(TRAPS);
   virtual Klass* find_field(Symbol* name, Symbol* signature, fieldDescriptor* fd) const;
   virtual Method* uncached_lookup_method(const Symbol* name, const Symbol* signature,
                                          OverpassLookupMode overpass_mode,
diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index 13a94d65f8e..67e5e474cce 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -56,7 +56,7 @@ public:
 
   virtual void oops_do(OopClosure* cl) override {
     if (_f.is_interpreted_frame()) {
-      _f.oops_interpreted_do(cl, nullptr);
+      _f.oops_interpreted_do(cl, _map);
     } else {
       OopMapDo<OopClosure, DerivedOopClosure, IncludeAllValues> visitor(cl, nullptr);
       visitor.oops_do(&_f, _map, _f.oop_map());
@@ -139,7 +139,7 @@ static int num_java_frames(const StackChunkFrameStream<ChunkFrames::Mixed>& f) {
 int stackChunkOopDesc::num_java_frames() const {
   int n = 0;
   for (StackChunkFrameStream<ChunkFrames::Mixed> f(const_cast<stackChunkOopDesc*>(this)); !f.is_done();
-       f.next(SmallRegisterMap::instance())) {
+       f.next(SmallRegisterMap::instance_no_args())) {
     if (!f.is_stub()) {
       n += ::num_java_frames(f);
     }
@@ -415,10 +415,12 @@ template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Lo
 template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::Mixed>& f, const RegisterMap* map);
 template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Load> (const StackChunkFrameStream<ChunkFrames::CompiledOnly>& f, const RegisterMap* map);
 template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::CompiledOnly>& f, const RegisterMap* map);
-template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Load> (const StackChunkFrameStream<ChunkFrames::Mixed>& f, const SmallRegisterMap* map);
-template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::Mixed>& f, const SmallRegisterMap* map);
-template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Load> (const StackChunkFrameStream<ChunkFrames::CompiledOnly>& f, const SmallRegisterMap* map);
-template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::CompiledOnly>& f, const SmallRegisterMap* map);
+template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Load> (const StackChunkFrameStream<ChunkFrames::Mixed>& f, const SmallRegisterMapNoArgs* map);
+template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::Mixed>& f, const SmallRegisterMapNoArgs* map);
+template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Load> (const StackChunkFrameStream<ChunkFrames::CompiledOnly>& f, const SmallRegisterMapNoArgs* map);
+template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::CompiledOnly>& f, const SmallRegisterMapNoArgs* map);
+template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Load> (const StackChunkFrameStream<ChunkFrames::Mixed>& f, const SmallRegisterMapWithArgs* map);
+template void stackChunkOopDesc::do_barriers0<stackChunkOopDesc::BarrierType::Store>(const StackChunkFrameStream<ChunkFrames::Mixed>& f, const SmallRegisterMapWithArgs* map);
 
 template <typename RegisterMapT>
 void stackChunkOopDesc::fix_thawed_frame(const frame& f, const RegisterMapT* map) {
@@ -438,7 +440,8 @@ void stackChunkOopDesc::fix_thawed_frame(const frame& f, const RegisterMapT* map
 }
 
 template void stackChunkOopDesc::fix_thawed_frame(const frame& f, const RegisterMap* map);
-template void stackChunkOopDesc::fix_thawed_frame(const frame& f, const SmallRegisterMap* map);
+template void stackChunkOopDesc::fix_thawed_frame(const frame& f, const SmallRegisterMapNoArgs* map);
+template void stackChunkOopDesc::fix_thawed_frame(const frame& f, const SmallRegisterMapWithArgs* map);
 
 void stackChunkOopDesc::transfer_lockstack(oop* dst, bool requires_barriers) {
   const bool requires_gc_barriers = is_gc_mode() || requires_barriers;
@@ -527,7 +530,7 @@ public:
     _cb = f.cb();
 
     int fsize = f.frame_size() - ((f.is_interpreted() == _callee_interpreted) ? _argsize : 0);
-    int num_oops = f.num_oops();
+    int num_oops = f.num_oops(map);
     assert(num_oops >= 0, "");
 
     _argsize   = f.stack_argsize() + frame::metadata_words_at_top;
diff --git a/src/hotspot/share/oops/stackChunkOop.hpp b/src/hotspot/share/oops/stackChunkOop.hpp
index 57ab6316c2a..79944f0326e 100644
--- a/src/hotspot/share/oops/stackChunkOop.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.hpp
@@ -137,6 +137,12 @@ public:
   inline bool preempted() const;
   inline void set_preempted(bool value);
 
+  inline bool at_klass_init() const;
+  inline void set_at_klass_init(bool value);
+
+  inline bool has_args_at_top() const;
+  inline void set_has_args_at_top(bool value);
+
   inline bool has_lockstack() const;
   inline void set_has_lockstack(bool value);
 
diff --git a/src/hotspot/share/oops/stackChunkOop.inline.hpp b/src/hotspot/share/oops/stackChunkOop.inline.hpp
index 9c91e934328..4fe5b913ade 100644
--- a/src/hotspot/share/oops/stackChunkOop.inline.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.inline.hpp
@@ -168,6 +168,18 @@ inline void stackChunkOopDesc::set_preempted(bool value) {
   set_flag(FLAG_PREEMPTED, value);
 }
 
+inline bool stackChunkOopDesc::at_klass_init() const { return jdk_internal_vm_StackChunk::atKlassInit(as_oop()); }
+inline void stackChunkOopDesc::set_at_klass_init(bool value) {
+  assert(at_klass_init() != value, "");
+  jdk_internal_vm_StackChunk::set_atKlassInit(this, value);
+}
+
+inline bool stackChunkOopDesc::has_args_at_top() const { return jdk_internal_vm_StackChunk::hasArgsAtTop(as_oop()); }
+inline void stackChunkOopDesc::set_has_args_at_top(bool value) {
+  assert(has_args_at_top() != value, "");
+  jdk_internal_vm_StackChunk::set_hasArgsAtTop(this, value);
+}
+
 inline bool stackChunkOopDesc::has_lockstack() const         { return is_flag(FLAG_HAS_LOCKSTACK); }
 inline void stackChunkOopDesc::set_has_lockstack(bool value) { set_flag(FLAG_HAS_LOCKSTACK, value); }
 
@@ -210,7 +222,7 @@ inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure
 
 template <ChunkFrames frame_kind, class StackChunkFrameClosureType>
 inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure) {
-  const SmallRegisterMap* map = SmallRegisterMap::instance();
+  const auto* map = SmallRegisterMap::instance_no_args();
   assert(!map->in_cont(), "");
 
   StackChunkFrameStream<frame_kind> f(this);
@@ -230,6 +242,9 @@ inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure
 
     should_continue = closure->do_frame(f, &full_map);
     f.next(map);
+  } else if (frame_kind == ChunkFrames::Mixed && f.is_interpreted() && has_args_at_top()) {
+    should_continue = closure->do_frame(f, SmallRegisterMap::instance_with_args());
+    f.next(map);
   }
   assert(!f.is_stub(), "");
 
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 4c3dc9ebf03..d241ca6110a 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -1337,21 +1337,19 @@ void JvmtiExport::at_single_stepping_point(JavaThread *thread, Method* method, a
 }
 
 
-void JvmtiExport::expose_single_stepping(JavaThread *thread) {
-  JvmtiThreadState *state = get_jvmti_thread_state(thread);
-  if (state != nullptr) {
-    state->clear_hide_single_stepping();
-  }
+void JvmtiExport::expose_single_stepping(JvmtiThreadState* state) {
+  assert(state != nullptr, "must be non-null");
+  state->clear_hide_single_stepping();
 }
 
 
-bool JvmtiExport::hide_single_stepping(JavaThread *thread) {
+JvmtiThreadState* JvmtiExport::hide_single_stepping(JavaThread *thread) {
   JvmtiThreadState *state = get_jvmti_thread_state(thread);
   if (state != nullptr && state->is_enabled(JVMTI_EVENT_SINGLE_STEP)) {
     state->set_hide_single_stepping();
-    return true;
+    return state;
   } else {
-    return false;
+    return nullptr;
   }
 }
 
diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
index 8906d6b81df..66f5413c8f6 100644
--- a/src/hotspot/share/prims/jvmtiExport.hpp
+++ b/src/hotspot/share/prims/jvmtiExport.hpp
@@ -317,8 +317,8 @@ class JvmtiExport : public AllStatic {
 
   // single stepping management methods
   static void at_single_stepping_point(JavaThread *thread, Method* method, address location) NOT_JVMTI_RETURN;
-  static void expose_single_stepping(JavaThread *thread) NOT_JVMTI_RETURN;
-  static bool hide_single_stepping(JavaThread *thread) NOT_JVMTI_RETURN_(false);
+  static void expose_single_stepping(JvmtiThreadState* state) NOT_JVMTI_RETURN;
+  static JvmtiThreadState* hide_single_stepping(JavaThread *thread) NOT_JVMTI_RETURN_(nullptr);
 
   // Methods that notify the debugger that something interesting has happened in the VM.
   static void post_early_vm_start        () NOT_JVMTI_RETURN;
@@ -622,23 +622,20 @@ class JvmtiGCMarker : public StackObj {
 // internal single step events.
 class JvmtiHideSingleStepping : public StackObj {
  private:
-  bool         _single_step_hidden;
-  JavaThread * _thread;
+  JvmtiThreadState* _state;
 
  public:
-  JvmtiHideSingleStepping(JavaThread * thread) {
+  JvmtiHideSingleStepping(JavaThread * thread) : _state(nullptr) {
     assert(thread != nullptr, "sanity check");
 
-    _single_step_hidden = false;
-    _thread = thread;
     if (JvmtiExport::should_post_single_step()) {
-      _single_step_hidden = JvmtiExport::hide_single_stepping(_thread);
+      _state = JvmtiExport::hide_single_stepping(thread);
     }
   }
 
   ~JvmtiHideSingleStepping() {
-    if (_single_step_hidden) {
-      JvmtiExport::expose_single_stepping(_thread);
+    if (_state != nullptr) {
+      JvmtiExport::expose_single_stepping(_state);
     }
   }
 };
diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index b13bd392eaa..c243cae20ab 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -771,7 +771,7 @@ Handle MethodHandles::resolve_MemberName(Handle mname, Klass* caller, int lookup
         assert(!HAS_PENDING_EXCEPTION, "");
         if (ref_kind == JVM_REF_invokeStatic) {
           LinkResolver::resolve_static_call(result,
-                        link_info, false, THREAD);
+                        link_info, ClassInitMode::dont_init, THREAD);
         } else if (ref_kind == JVM_REF_invokeInterface) {
           LinkResolver::resolve_interface_call(result, Handle(), defc,
                         link_info, false, THREAD);
@@ -833,7 +833,7 @@ Handle MethodHandles::resolve_MemberName(Handle mname, Klass* caller, int lookup
       {
         assert(!HAS_PENDING_EXCEPTION, "");
         LinkInfo link_info(defc, name, type, caller, LinkInfo::AccessCheck::skip, loader_constraint_check);
-        LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD);
+        LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, ClassInitMode::dont_init, THREAD);
         if (HAS_PENDING_EXCEPTION) {
           if (speculative_resolve) {
             CLEAR_PENDING_EXCEPTION;
diff --git a/src/hotspot/share/runtime/continuation.hpp b/src/hotspot/share/runtime/continuation.hpp
index 0cfd484361d..c54a56ce7eb 100644
--- a/src/hotspot/share/runtime/continuation.hpp
+++ b/src/hotspot/share/runtime/continuation.hpp
@@ -62,8 +62,9 @@ class Continuation : AllStatic {
 public:
 
   enum preempt_kind {
-    freeze_on_monitorenter,
-    freeze_on_wait
+    monitorenter,
+    object_wait,
+    object_locker
   };
 
   enum thaw_kind {
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 6ede40c22e0..2a31e5fb5b2 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -34,11 +34,14 @@
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/memAllocator.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
+#include "interpreter/bytecodeStream.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "oops/access.inline.hpp"
+#include "oops/constantPool.inline.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -64,6 +67,8 @@
 #include "runtime/stackFrameStream.inline.hpp"
 #include "runtime/stackOverflow.hpp"
 #include "runtime/stackWatermarkSet.inline.hpp"
+#include "runtime/vframe.inline.hpp"
+#include "runtime/vframe_hp.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
@@ -74,6 +79,12 @@
 #if INCLUDE_JFR
 #include "jfr/jfr.inline.hpp"
 #endif
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
 
 /*
  * This file contains the implementation of continuation freezing (yield) and thawing (run).
@@ -182,8 +193,9 @@ static void verify_continuation(oop continuation) { Continuation::debug_verify_c
 static void do_deopt_after_thaw(JavaThread* thread);
 static bool do_verify_after_thaw(JavaThread* thread, stackChunkOop chunk, outputStream* st);
 static void log_frames(JavaThread* thread);
-static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp, bool preempted);
+static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp);
 static void print_frame_layout(const frame& f, bool callee_complete, outputStream* st = tty);
+static void verify_frame_kind(frame& top, Continuation::preempt_kind preempt_kind, Method** m_ptr = nullptr, const char** code_name_ptr = nullptr, int* bci_ptr = nullptr, stackChunkOop chunk = nullptr);
 
 #define assert_pfl(p, ...) \
 do {                                           \
@@ -461,7 +473,7 @@ private:
   inline void patch_pd(frame& callee, const frame& caller);
   inline void patch_pd_unused(intptr_t* sp);
   void adjust_interpreted_frame_unextended_sp(frame& f);
-  static inline void prepare_freeze_interpreted_top_frame(frame& f);
+  inline void prepare_freeze_interpreted_top_frame(frame& f);
   static inline void relativize_interpreted_frame_metadata(const frame& f, const frame& hf);
 
 protected:
@@ -1089,13 +1101,27 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
   assert(!chunk->is_empty() || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).to_frame().is_empty(), "");
 
   if (_preempt) {
-    frame f = _thread->last_frame();
-    if (f.is_interpreted_frame()) {
+    frame top_frame = _thread->last_frame();
+    if (top_frame.is_interpreted_frame()) {
       // Some platforms do not save the last_sp in the top interpreter frame on VM calls.
       // We need it so that on resume we can restore the sp to the right place, since
       // thawing might add an alignment word to the expression stack (see finish_thaw()).
       // We do it now that we know freezing will be successful.
-      prepare_freeze_interpreted_top_frame(f);
+      prepare_freeze_interpreted_top_frame(top_frame);
+    }
+
+    // Do this now so should_process_args_at_top() is set before calling finish_freeze
+    // in case we might need to apply GC barriers to frames in this stackChunk.
+    if (_thread->at_preemptable_init()) {
+      assert(top_frame.is_interpreted_frame(), "only InterpreterRuntime::_new/resolve_from_cache allowed");
+      chunk->set_at_klass_init(true);
+      methodHandle m(_thread, top_frame.interpreter_frame_method());
+      Bytecode_invoke call = Bytecode_invoke_check(m, top_frame.interpreter_frame_bci());
+      assert(!call.is_valid() || call.is_invokestatic(), "only invokestatic allowed");
+      if (call.is_invokestatic() && call.size_of_parameters() > 0) {
+        assert(top_frame.interpreter_frame_expression_stack_size() > 0, "should have parameters in exp stack");
+        chunk->set_has_args_at_top(true);
+      }
     }
   }
 
@@ -1607,6 +1633,25 @@ void FreezeBase::throw_stack_overflow_on_humongous_chunk() {
   Exceptions::_throw_msg(_thread, __FILE__, __LINE__, vmSymbols::java_lang_StackOverflowError(), "Humongous stack chunk");
 }
 
+class AnchorMark : public StackObj {
+  JavaThread* _current;
+  frame& _top_frame;
+  intptr_t* _last_sp_from_frame;
+  bool _is_interpreted;
+
+ public:
+  AnchorMark(JavaThread* current, frame& f) : _current(current), _top_frame(f), _is_interpreted(false) {
+    intptr_t* sp = anchor_mark_set_pd();
+    set_anchor(_current, sp);
+  }
+  ~AnchorMark() {
+    clear_anchor(_current);
+    anchor_mark_clear_pd();
+  }
+  inline intptr_t* anchor_mark_set_pd();
+  inline void anchor_mark_clear_pd();
+};
+
 #if INCLUDE_JVMTI
 static int num_java_frames(ContinuationWrapper& cont) {
   ResourceMark rm; // used for scope traversal in num_java_frames(nmethod*, address)
@@ -1636,27 +1681,25 @@ static void jvmti_yield_cleanup(JavaThread* thread, ContinuationWrapper& cont) {
   }
 }
 
-static void jvmti_mount_end(JavaThread* current, ContinuationWrapper& cont, frame top) {
+static void jvmti_mount_end(JavaThread* current, ContinuationWrapper& cont, frame top, Continuation::preempt_kind pk) {
   assert(current->vthread() != nullptr, "must be");
 
-  HandleMarkCleaner hm(current);
+  HandleMarkCleaner hm(current);  // Cleanup all handles (including so._conth) before returning to Java.
   Handle vth(current, current->vthread());
-
   ContinuationWrapper::SafepointOp so(current, cont);
-
-  // Since we might safepoint set the anchor so that the stack can be walked.
-  set_anchor(current, top.sp());
+  AnchorMark am(current, top);  // Set anchor so that the stack is walkable.
 
   JRT_BLOCK
     JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)vth.raw_value(), false);
 
     if (current->pending_contended_entered_event()) {
-      JvmtiExport::post_monitor_contended_entered(current, current->contended_entered_monitor());
+      // No monitor JVMTI events for ObjectLocker case.
+      if (pk != Continuation::object_locker) {
+        JvmtiExport::post_monitor_contended_entered(current, current->contended_entered_monitor());
+      }
       current->set_contended_entered_monitor(nullptr);
     }
   JRT_BLOCK_END
-
-  clear_anchor(current);
 }
 #endif // INCLUDE_JVMTI
 
@@ -1679,6 +1722,109 @@ bool FreezeBase::check_valid_fast_path() {
   }
   return true;
 }
+
+static void verify_frame_kind(frame& top, Continuation::preempt_kind preempt_kind, Method** m_ptr, const char** code_name_ptr, int* bci_ptr, stackChunkOop chunk) {
+  Method* m;
+  const char* code_name;
+  int bci;
+  if (preempt_kind == Continuation::monitorenter) {
+    assert(top.is_interpreted_frame() || top.is_runtime_frame(), "unexpected %sframe",
+      top.is_compiled_frame() ? "compiled " : top.is_native_frame() ? "native " : "");
+    bool at_sync_method;
+    if (top.is_interpreted_frame()) {
+      m = top.interpreter_frame_method();
+      assert(!m->is_native() || m->is_synchronized(), "invalid method %s", m->external_name());
+      address bcp = top.interpreter_frame_bcp();
+      assert(bcp != 0 || m->is_native(), "");
+      at_sync_method = m->is_synchronized() && (bcp == 0 || bcp == m->code_base());
+      // bcp is advanced on monitorenter before making the VM call, adjust for that.
+      bool at_sync_bytecode = bcp > m->code_base() && Bytecode(m, bcp - 1).code() == Bytecodes::Code::_monitorenter;
+      assert(at_sync_method || at_sync_bytecode, "");
+      bci = at_sync_method ? -1 : top.interpreter_frame_bci();
+    } else {
+      JavaThread* current = JavaThread::current();
+      ResourceMark rm(current);
+      CodeBlob* cb = top.cb();
+      RegisterMap reg_map(current,
+                  RegisterMap::UpdateMap::skip,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::include);
+      if (top.is_heap_frame()) {
+        assert(chunk != nullptr, "");
+        reg_map.set_stack_chunk(chunk);
+        top = chunk->relativize(top);
+        top.set_frame_index(0);
+      }
+      frame fr = top.sender(&reg_map);
+      vframe*  vf  = vframe::new_vframe(&fr, &reg_map, current);
+      compiledVFrame* cvf = compiledVFrame::cast(vf);
+      m = cvf->method();
+      bci = cvf->scope()->bci();
+      at_sync_method = bci == SynchronizationEntryBCI;
+      assert(!at_sync_method || m->is_synchronized(), "bci is %d but method %s is not synchronized", bci, m->external_name());
+      bool is_c1_monitorenter = false, is_c2_monitorenter = false;
+      COMPILER1_PRESENT(is_c1_monitorenter = cb == Runtime1::blob_for(StubId::c1_monitorenter_id) ||
+                                             cb == Runtime1::blob_for(StubId::c1_monitorenter_nofpu_id);)
+      COMPILER2_PRESENT(is_c2_monitorenter = cb == CodeCache::find_blob(OptoRuntime::complete_monitor_locking_Java());)
+      assert(is_c1_monitorenter || is_c2_monitorenter, "wrong runtime stub frame");
+    }
+    code_name = at_sync_method ? "synchronized method" : "monitorenter";
+  } else if (preempt_kind == Continuation::object_wait) {
+    assert(top.is_interpreted_frame() || top.is_native_frame(), "");
+    m  = top.is_interpreted_frame() ? top.interpreter_frame_method() : top.cb()->as_nmethod()->method();
+    assert(m->is_object_wait0(), "");
+    bci = 0;
+    code_name = "";
+  } else {
+    assert(preempt_kind == Continuation::object_locker, "invalid preempt kind");
+    assert(top.is_interpreted_frame(), "");
+    m = top.interpreter_frame_method();
+    Bytecode current_bytecode = Bytecode(m, top.interpreter_frame_bcp());
+    Bytecodes::Code code = current_bytecode.code();
+    assert(code == Bytecodes::Code::_new || code == Bytecodes::Code::_invokestatic ||
+           (code == Bytecodes::Code::_getstatic || code == Bytecodes::Code::_putstatic), "invalid bytecode");
+    bci = top.interpreter_frame_bci();
+    code_name = Bytecodes::name(current_bytecode.code());
+  }
+  assert(bci >= 0 || m->is_synchronized(), "invalid bci:%d at method %s", bci, m->external_name());
+
+  if (m_ptr != nullptr) {
+    *m_ptr = m;
+    *code_name_ptr = code_name;
+    *bci_ptr = bci;
+  }
+}
+
+static void log_preempt_after_freeze(const ContinuationWrapper& cont) {
+  JavaThread* current = cont.thread();
+  int64_t tid = current->monitor_owner_id();
+
+  StackChunkFrameStream<ChunkFrames::Mixed> sfs(cont.tail());
+  frame top_frame = sfs.to_frame();
+  bool at_init = current->at_preemptable_init();
+  bool at_enter = current->current_pending_monitor() != nullptr;
+  bool at_wait = current->current_waiting_monitor() != nullptr;
+  assert((at_enter && !at_wait) || (!at_enter && at_wait), "");
+  Continuation::preempt_kind pk = at_init ? Continuation::object_locker : at_enter ? Continuation::monitorenter : Continuation::object_wait;
+
+  Method* m = nullptr;
+  const char* code_name = nullptr;
+  int bci = InvalidFrameStateBci;
+  verify_frame_kind(top_frame, pk, &m, &code_name, &bci, cont.tail());
+  assert(m != nullptr && code_name != nullptr && bci != InvalidFrameStateBci, "should be set");
+
+  ResourceMark rm(current);
+  if (bci < 0) {
+    log_trace(continuations, preempt)("Preempted " INT64_FORMAT " while synchronizing on %smethod %s", tid, m->is_native() ? "native " : "", m->external_name());
+  } else if (m->is_object_wait0()) {
+    log_trace(continuations, preempt)("Preempted " INT64_FORMAT " at native method %s", tid, m->external_name());
+  } else {
+    Klass* k = current->preempt_init_klass();
+    assert(k != nullptr || !at_init, "");
+    log_trace(continuations, preempt)("Preempted " INT64_FORMAT " at %s(bci:%d) in method %s %s%s", tid, code_name, bci,
+            m->external_name(), at_init ? "trying to initialize klass " : "", at_init ? k->external_name() : "");
+  }
+}
 #endif // ASSERT
 
 static inline freeze_result freeze_epilog(ContinuationWrapper& cont) {
@@ -1708,9 +1854,10 @@ static freeze_result preempt_epilog(ContinuationWrapper& cont, freeze_result res
     return res;
   }
 
+  // Set up things so that on return to Java we jump to preempt stub.
   patch_return_pc_with_preempt_stub(old_last_frame);
   cont.tail()->set_preempted(true);
-
+  DEBUG_ONLY(log_preempt_after_freeze(cont);)
   return freeze_epilog(cont);
 }
 
@@ -1906,10 +2053,14 @@ protected:
   intptr_t* _fastpath;
   bool _barriers;
   bool _preempted_case;
+  bool _process_args_at_top;
   intptr_t* _top_unextended_sp_before_thaw;
   int _align_size;
   DEBUG_ONLY(intptr_t* _top_stack_address);
 
+  // Only used for preemption on ObjectLocker
+  ObjectMonitor* _init_lock;
+
   StackChunkFrameStream<ChunkFrames::Mixed> _stream;
 
   NOT_PRODUCT(int _frames;)
@@ -1936,6 +2087,8 @@ protected:
 
   intptr_t* handle_preempted_continuation(intptr_t* sp, Continuation::preempt_kind preempt_kind, bool fast_case);
   inline intptr_t* push_cleanup_continuation();
+  inline intptr_t* push_preempt_adapter();
+  intptr_t* redo_vmcall(JavaThread* current, frame& top);
   void throw_interrupted_exception(JavaThread* current, frame& top);
 
   void recurse_thaw(const frame& heap_frame, frame& caller, int num_frames, bool top_on_preempt_case);
@@ -1952,12 +2105,12 @@ private:
   inline void patch(frame& f, const frame& caller, bool bottom);
   void clear_bitmap_bits(address start, address end);
 
-  NOINLINE void recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames);
+  NOINLINE void recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames, bool is_top);
   void recurse_thaw_compiled_frame(const frame& hf, frame& caller, int num_frames, bool stub_caller);
   void recurse_thaw_stub_frame(const frame& hf, frame& caller, int num_frames);
   void recurse_thaw_native_frame(const frame& hf, frame& caller, int num_frames);
 
-  void push_return_frame(frame& f);
+  void push_return_frame(const frame& f);
   inline frame new_entry_frame();
   template<typename FKind> frame new_stack_frame(const frame& hf, frame& caller, bool bottom);
   inline void patch_pd(frame& f, const frame& sender);
@@ -2052,7 +2205,7 @@ int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &arg
     // If we don't thaw the top compiled frame too, after restoring the saved
     // registers back in Java, we would hit the return barrier to thaw one more
     // frame effectively overwriting the restored registers during that call.
-    f.next(SmallRegisterMap::instance(), true /* stop */);
+    f.next(SmallRegisterMap::instance_no_args(), true /* stop */);
     assert(!f.is_done(), "");
 
     f.get_cb();
@@ -2068,7 +2221,7 @@ int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &arg
     }
   }
 
-  f.next(SmallRegisterMap::instance(), true /* stop */);
+  f.next(SmallRegisterMap::instance_no_args(), true /* stop */);
   empty = f.is_done();
   assert(!empty || argsize == chunk->argsize(), "");
 
@@ -2200,12 +2353,12 @@ NOINLINE intptr_t* Thaw<ConfigT>::thaw_fast(stackChunkOop chunk) {
 #endif
 
 #ifdef ASSERT
-  set_anchor(_thread, rs.sp());
-  log_frames(_thread);
   if (LoomDeoptAfterThaw) {
+    frame top(rs.sp());
+    AnchorMark am(_thread, top);
+    log_frames(_thread);
     do_deopt_after_thaw(_thread);
   }
-  clear_anchor(_thread);
 #endif
 
   return rs.sp();
@@ -2228,29 +2381,49 @@ NOINLINE intptr_t* Thaw<ConfigT>::thaw_slow(stackChunkOop chunk, Continuation::t
   Continuation::preempt_kind preempt_kind;
   bool retry_fast_path = false;
 
+  _process_args_at_top = false;
   _preempted_case = chunk->preempted();
   if (_preempted_case) {
+    ObjectMonitor* mon = nullptr;
     ObjectWaiter* waiter = java_lang_VirtualThread::objectWaiter(_thread->vthread());
     if (waiter != nullptr) {
       // Mounted again after preemption. Resume the pending monitor operation,
       // which will be either a monitorenter or Object.wait() call.
-      ObjectMonitor* mon = waiter->monitor();
-      preempt_kind = waiter->is_wait() ? Continuation::freeze_on_wait : Continuation::freeze_on_monitorenter;
+      mon = waiter->monitor();
+      preempt_kind = waiter->is_wait() ? Continuation::object_wait : Continuation::monitorenter;
 
       bool mon_acquired = mon->resume_operation(_thread, waiter, _cont);
       assert(!mon_acquired || mon->has_owner(_thread), "invariant");
       if (!mon_acquired) {
         // Failed to acquire monitor. Return to enterSpecial to unmount again.
+        log_develop_trace(continuations, preempt)("Failed to acquire monitor, unmounting again");
         return push_cleanup_continuation();
       }
       chunk = _cont.tail();  // reload oop in case of safepoint in resume_operation (if posting JVMTI events).
+      JVMTI_ONLY(assert(_thread->contended_entered_monitor() == nullptr || _thread->contended_entered_monitor() == mon, ""));
     } else {
-      // Preemption cancelled in moniterenter case. We actually acquired
-      // the monitor after freezing all frames so nothing to do.
-      preempt_kind = Continuation::freeze_on_monitorenter;
+      // Preemption cancelled on moniterenter or ObjectLocker case. We
+      // actually acquired the monitor after freezing all frames so no
+      // need to call resume_operation. If this is the ObjectLocker case
+      // we released the monitor already at ~ObjectLocker, so _init_lock
+      // will be set to nullptr below since there is no monitor to release.
+      preempt_kind = Continuation::monitorenter;
     }
+
     // Call this first to avoid racing with GC threads later when modifying the chunk flags.
     relativize_chunk_concurrently(chunk);
+
+    if (chunk->at_klass_init()) {
+      preempt_kind = Continuation::object_locker;
+      chunk->set_at_klass_init(false);
+      _process_args_at_top = chunk->has_args_at_top();
+      if (_process_args_at_top) {
+        // Only needed for the top frame which will be thawed.
+        chunk->set_has_args_at_top(false);
+      }
+      assert(waiter == nullptr || mon != nullptr, "should have a monitor");
+      _init_lock = mon;  // remember monitor since we will need it on handle_preempted_continuation()
+    }
     chunk->set_preempted(false);
     retry_fast_path = true;
   } else {
@@ -2334,7 +2507,7 @@ void ThawBase::recurse_thaw(const frame& heap_frame, frame& caller, int num_fram
   } else if (!heap_frame.is_interpreted_frame()) {
     recurse_thaw_compiled_frame(heap_frame, caller, num_frames, false);
   } else {
-    recurse_thaw_interpreted_frame(heap_frame, caller, num_frames);
+    recurse_thaw_interpreted_frame(heap_frame, caller, num_frames, top_on_preempt_case);
   }
 }
 
@@ -2346,7 +2519,7 @@ bool ThawBase::recurse_thaw_java_frame(frame& caller, int num_frames) {
 
   int argsize = _stream.stack_argsize();
 
-  _stream.next(SmallRegisterMap::instance());
+  _stream.next(SmallRegisterMap::instance_no_args());
   assert(_stream.to_frame().is_empty() == _stream.is_done(), "");
 
   // we never leave a compiled caller of an interpreted frame as the top frame in the chunk
@@ -2451,9 +2624,10 @@ void ThawBase::clear_bitmap_bits(address start, address end) {
 }
 
 intptr_t* ThawBase::handle_preempted_continuation(intptr_t* sp, Continuation::preempt_kind preempt_kind, bool fast_case) {
-  assert(preempt_kind == Continuation::freeze_on_wait || preempt_kind == Continuation::freeze_on_monitorenter, "");
   frame top(sp);
   assert(top.pc() == *(address*)(sp - frame::sender_sp_ret_address_offset()), "");
+  DEBUG_ONLY(verify_frame_kind(top, preempt_kind);)
+  NOT_PRODUCT(int64_t tid = _thread->monitor_owner_id();)
 
 #if INCLUDE_JVMTI
   // Finish the VTMS transition.
@@ -2461,7 +2635,7 @@ intptr_t* ThawBase::handle_preempted_continuation(intptr_t* sp, Continuation::pr
   bool is_vthread = Continuation::continuation_scope(_cont.continuation()) == java_lang_VirtualThread::vthread_scope();
   if (is_vthread) {
     if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-      jvmti_mount_end(_thread, _cont, top);
+      jvmti_mount_end(_thread, _cont, top, preempt_kind);
     } else {
       _thread->set_is_in_VTMS_transition(false);
       java_lang_Thread::set_is_in_VTMS_transition(_thread->vthread(), false);
@@ -2478,36 +2652,103 @@ intptr_t* ThawBase::handle_preempted_continuation(intptr_t* sp, Continuation::pr
     patch_pd(top, sp + fsize);
   }
 
-  if (preempt_kind == Continuation::freeze_on_wait) {
+  if (preempt_kind == Continuation::object_wait) {
     // Check now if we need to throw IE exception.
-    if (_thread->pending_interrupted_exception()) {
+    bool throw_ie = _thread->pending_interrupted_exception();
+    if (throw_ie) {
       throw_interrupted_exception(_thread, top);
       _thread->set_pending_interrupted_exception(false);
     }
-  } else if (top.is_runtime_frame()) {
-    // The continuation might now run on a different platform thread than the previous time so
-    // we need to adjust the current thread saved in the stub frame before restoring registers.
-    JavaThread** thread_addr = frame::saved_thread_address(top);
-    if (thread_addr != nullptr) *thread_addr = _thread;
+    log_develop_trace(continuations, preempt)("Resuming " INT64_FORMAT" after preemption on Object.wait%s", tid, throw_ie ? "(throwing IE)" : "");
+  } else if (preempt_kind == Continuation::monitorenter) {
+    if (top.is_runtime_frame()) {
+      // The continuation might now run on a different platform thread than the previous time so
+      // we need to adjust the current thread saved in the stub frame before restoring registers.
+      JavaThread** thread_addr = frame::saved_thread_address(top);
+      if (thread_addr != nullptr) *thread_addr = _thread;
+    }
+    log_develop_trace(continuations, preempt)("Resuming " INT64_FORMAT " after preemption on monitorenter", tid);
+  } else {
+    // We need to redo the original call into the VM. First though, we need
+    // to exit the monitor we just acquired (except on preemption cancelled
+    // case where it was already released).
+    assert(preempt_kind == Continuation::object_locker, "");
+    if (_init_lock != nullptr) _init_lock->exit(_thread);
+    sp = redo_vmcall(_thread, top);
+  }
+  return sp;
+}
+
+intptr_t* ThawBase::redo_vmcall(JavaThread* current, frame& top) {
+  assert(!current->preempting(), "");
+  NOT_PRODUCT(int64_t tid = current->monitor_owner_id();)
+  intptr_t* sp = top.sp();
+
+  {
+    HandleMarkCleaner hmc(current);  // Cleanup all handles (including so._conth) before returning to Java.
+    ContinuationWrapper::SafepointOp so(current, _cont);
+    AnchorMark am(current, top);    // Set the anchor so that the stack is walkable.
+
+    Method* m = top.interpreter_frame_method();
+    Bytecode current_bytecode = Bytecode(m, top.interpreter_frame_bcp());
+    Bytecodes::Code code = current_bytecode.code();
+    log_develop_trace(continuations, preempt)("Redoing InterpreterRuntime::%s for " INT64_FORMAT, code == Bytecodes::Code::_new ? "_new" : "resolve_from_cache", tid);
+
+    // These InterpreterRuntime entry points use JRT_ENTRY which uses a HandleMarkCleaner.
+    // Create a HandeMark to avoid destroying so._conth.
+    HandleMark hm(current);
+    DEBUG_ONLY(JavaThread::AtRedoVMCall apvmc(current);)
+    if (code == Bytecodes::Code::_new) {
+      InterpreterRuntime::_new(current, m->constants(), current_bytecode.get_index_u2(code));
+    } else {
+      InterpreterRuntime::resolve_from_cache(current, code);
+    }
+  }
+
+  if (current->preempting()) {
+    // Preempted again so we just arrange to return to preempt stub to unmount.
+    sp = push_preempt_adapter();
+    current->set_preempt_alternate_return(nullptr);
+    bool cancelled = current->preemption_cancelled();
+    if (cancelled) {
+      // Since preemption was cancelled, the thread will call thaw again from the preempt
+      // stub. These retries could happen several times due to contention on the init_lock,
+      // so just let the vthread umount to give a chance for other vthreads to run.
+      current->set_preemption_cancelled(false);
+      oop vthread = current->vthread();
+      assert(java_lang_VirtualThread::state(vthread) == java_lang_VirtualThread::RUNNING, "wrong state for vthread");
+      java_lang_VirtualThread::set_state(vthread, java_lang_VirtualThread::YIELDING);
+#if INCLUDE_JVMTI
+      if (current->contended_entered_monitor() != nullptr) {
+        current->set_contended_entered_monitor(nullptr);
+      }
+#endif
+    }
+    log_develop_trace(continuations, preempt)("Preempted " INT64_FORMAT " again%s", tid, cancelled ? "(preemption cancelled, setting state to YIELDING)" : "");
+  } else {
+    log_develop_trace(continuations, preempt)("Call succesful, resuming " INT64_FORMAT, tid);
   }
   return sp;
 }
 
 void ThawBase::throw_interrupted_exception(JavaThread* current, frame& top) {
+  HandleMarkCleaner hm(current);  // Cleanup all handles (including so._conth) before returning to Java.
   ContinuationWrapper::SafepointOp so(current, _cont);
-  // Since we might safepoint set the anchor so that the stack can be walked.
-  set_anchor(current, top.sp());
+  AnchorMark am(current, top);  // Set the anchor so that the stack is walkable.
   JRT_BLOCK
     THROW(vmSymbols::java_lang_InterruptedException());
   JRT_BLOCK_END
-  clear_anchor(current);
 }
 
-NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames) {
+NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames, bool is_top) {
   assert(hf.is_interpreted_frame(), "");
 
   if (UNLIKELY(seen_by_gc())) {
-    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
+    if (is_top && _process_args_at_top) {
+      _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance_with_args());
+    } else {
+      _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance_no_args());
+    }
   }
 
   const bool is_bottom_frame = recurse_thaw_java_frame<ContinuationHelper::InterpretedFrame>(caller, num_frames);
@@ -2552,7 +2793,7 @@ NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& c
 
   if (!is_bottom_frame) {
     // can only fix caller once this frame is thawed (due to callee saved regs)
-    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance());
+    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance_no_args());
   } else if (_cont.tail()->has_bitmap() && locals > 0) {
     assert(hf.is_heap_frame(), "should be");
     address start = (address)(heap_frame_bottom - locals);
@@ -2569,7 +2810,7 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
   assert(_preempted_case || !stub_caller, "stub caller not at preemption");
 
   if (!stub_caller && UNLIKELY(seen_by_gc())) { // recurse_thaw_stub_frame already invoked our barriers with a full regmap
-    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
+    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance_no_args());
   }
 
   const bool is_bottom_frame = recurse_thaw_java_frame<ContinuationHelper::CompiledFrame>(caller, num_frames);
@@ -2628,7 +2869,7 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
 
   if (!is_bottom_frame) {
     // can only fix caller once this frame is thawed (due to callee saved regs); this happens on the stack
-    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance());
+    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance_no_args());
   } else if (_cont.tail()->has_bitmap() && added_argsize > 0) {
     address start = (address)(heap_frame_top + ContinuationHelper::CompiledFrame::size(hf) + frame::metadata_words_at_top);
     int stack_args_slots = f.cb()->as_nmethod()->num_stack_arg_slots(false /* rounded */);
@@ -2654,7 +2895,7 @@ void ThawBase::recurse_thaw_stub_frame(const frame& hf, frame& caller, int num_f
     assert(!_stream.is_done(), "");
     _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, &map);
   } else {
-    _stream.next(SmallRegisterMap::instance());
+    _stream.next(SmallRegisterMap::instance_no_args());
     assert(!_stream.is_done(), "");
   }
 
@@ -2694,7 +2935,7 @@ void ThawBase::recurse_thaw_native_frame(const frame& hf, frame& caller, int num
   assert(_preempted_case && hf.cb()->as_nmethod()->method()->is_object_wait0(), "");
 
   if (UNLIKELY(seen_by_gc())) { // recurse_thaw_stub_frame already invoked our barriers with a full regmap
-    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
+    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance_no_args());
   }
 
   const bool is_bottom_frame = recurse_thaw_java_frame<ContinuationHelper::NativeFrame>(caller, num_frames);
@@ -2732,7 +2973,7 @@ void ThawBase::recurse_thaw_native_frame(const frame& hf, frame& caller, int num
   assert(!f.cb()->as_nmethod()->is_marked_for_deoptimization(), "");
 
   // can only fix caller once this frame is thawed (due to callee saved regs); this happens on the stack
-  _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance());
+  _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance_no_args());
 
   DEBUG_ONLY(after_thaw_java_frame(f, false /* bottom */);)
   caller = f;
@@ -2759,7 +3000,12 @@ void ThawBase::finish_thaw(frame& f) {
     f.set_sp(align_down(f.sp(), frame::frame_alignment));
   }
   push_return_frame(f);
-  chunk->fix_thawed_frame(f, SmallRegisterMap::instance()); // can only fix caller after push_return_frame (due to callee saved regs)
+   // can only fix caller after push_return_frame (due to callee saved regs)
+  if (_process_args_at_top) {
+    chunk->fix_thawed_frame(f, SmallRegisterMap::instance_with_args());
+  } else {
+    chunk->fix_thawed_frame(f, SmallRegisterMap::instance_no_args());
+  }
 
   assert(_cont.is_empty() == _cont.last_frame().is_empty(), "");
 
@@ -2773,7 +3019,7 @@ void ThawBase::finish_thaw(frame& f) {
   }
 }
 
-void ThawBase::push_return_frame(frame& f) { // see generate_cont_thaw
+void ThawBase::push_return_frame(const frame& f) { // see generate_cont_thaw
   assert(!f.is_compiled_frame() || f.is_deoptimized_frame() == f.cb()->as_nmethod()->is_deopt_pc(f.raw_pc()), "");
   assert(!f.is_compiled_frame() || f.is_deoptimized_frame() == (f.pc() != f.raw_pc()), "");
 
@@ -2821,11 +3067,10 @@ static inline intptr_t* thaw_internal(JavaThread* thread, const Continuation::th
   clear_anchor(thread);
 #endif
 
-  DEBUG_ONLY(bool preempted = cont.tail()->preempted();)
   Thaw<ConfigT> thw(thread, cont);
   intptr_t* const sp = thw.thaw(kind);
   assert(is_aligned(sp, frame::frame_alignment), "");
-  DEBUG_ONLY(log_frames_after_thaw(thread, cont, sp, preempted);)
+  DEBUG_ONLY(log_frames_after_thaw(thread, cont, sp);)
 
   CONT_JFR_ONLY(thw.jfr_info().post_jfr_event(&event, cont.continuation(), thread);)
 
@@ -2967,14 +3212,16 @@ static void log_frames(JavaThread* thread) {
   ls.print_cr("======= end frames =========");
 }
 
-static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp, bool preempted) {
+static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont, intptr_t* sp) {
   intptr_t* sp0 = sp;
   address pc0 = *(address*)(sp - frame::sender_sp_ret_address_offset());
 
-  if (preempted && sp0 == cont.entrySP()) {
+  bool preempted = false;
+  stackChunkOop tail = cont.tail();
+  if (tail != nullptr && tail->preempted()) {
     // Still preempted (monitor not acquired) so no frames were thawed.
-    assert(cont.tail()->preempted(), "");
     set_anchor(thread, cont.entrySP(), cont.entryPC());
+    preempted = true;
   } else {
     set_anchor(thread, sp0);
   }
@@ -2983,7 +3230,7 @@ static void log_frames_after_thaw(JavaThread* thread, ContinuationWrapper& cont,
   if (LoomVerifyAfterThaw) {
     assert(do_verify_after_thaw(thread, cont.tail(), tty), "");
   }
-  assert(ContinuationEntry::assert_entry_frame_laid_out(thread), "");
+  assert(preempted || ContinuationEntry::assert_entry_frame_laid_out(thread), "");
   clear_anchor(thread);
 
   LogTarget(Trace, continuations) lt;
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.cpp b/src/hotspot/share/runtime/continuationJavaClasses.cpp
index a5b7ea4ad93..6e4e52e0107 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.cpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.cpp
@@ -87,6 +87,8 @@ int jdk_internal_vm_StackChunk::_bottom_offset;
 int jdk_internal_vm_StackChunk::_flags_offset;
 int jdk_internal_vm_StackChunk::_maxThawingSize_offset;
 int jdk_internal_vm_StackChunk::_lockStackSize_offset;
+int jdk_internal_vm_StackChunk::_atKlassInit_offset;
+int jdk_internal_vm_StackChunk::_hasArgsAtTop_offset;
 int jdk_internal_vm_StackChunk::_cont_offset;
 
 #define STACKCHUNK_FIELDS_DO(macro) \
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.hpp b/src/hotspot/share/runtime/continuationJavaClasses.hpp
index f9cd53ff9f0..91224b94e1e 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.hpp
@@ -76,6 +76,8 @@ class jdk_internal_vm_Continuation: AllStatic {
   macro(jdk_internal_vm_StackChunk, pc,              intptr_signature,       false) \
   macro(jdk_internal_vm_StackChunk, maxThawingSize,  int_signature,          false) \
   macro(jdk_internal_vm_StackChunk, lockStackSize,   byte_signature,         false) \
+  macro(jdk_internal_vm_StackChunk, atKlassInit,     bool_signature,         false) \
+  macro(jdk_internal_vm_StackChunk, hasArgsAtTop,    bool_signature,         false) \
 
 class jdk_internal_vm_StackChunk: AllStatic {
   friend class JavaClasses;
@@ -88,6 +90,8 @@ class jdk_internal_vm_StackChunk: AllStatic {
   static int _flags_offset;
   static int _maxThawingSize_offset;
   static int _lockStackSize_offset;
+  static int _atKlassInit_offset;
+  static int _hasArgsAtTop_offset;
   static int _cont_offset;
 
 
@@ -129,6 +133,12 @@ class jdk_internal_vm_StackChunk: AllStatic {
   static inline uint8_t lockStackSize(oop chunk);
   static inline void set_lockStackSize(oop chunk, uint8_t value);
 
+  static inline bool atKlassInit(oop chunk);
+  static inline void set_atKlassInit(oop chunk, bool value);
+
+  static inline bool hasArgsAtTop(oop chunk);
+  static inline void set_hasArgsAtTop(oop chunk, bool value);
+
   // cont oop's processing is essential for the chunk's GC protocol
   static inline oop cont(oop chunk);
   template<typename P>
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp b/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
index f464648cdc3..c6d80652180 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
@@ -194,4 +194,20 @@ inline void jdk_internal_vm_StackChunk::set_lockStackSize(oop chunk, uint8_t val
   AtomicAccess::store(chunk->field_addr<uint8_t>(_lockStackSize_offset), value);
 }
 
+inline bool jdk_internal_vm_StackChunk::atKlassInit(oop chunk) {
+  return chunk->bool_field(_atKlassInit_offset);
+}
+
+inline void jdk_internal_vm_StackChunk::set_atKlassInit(oop chunk, bool value) {
+  chunk->bool_field_put(_atKlassInit_offset, (jboolean)value);
+}
+
+inline bool jdk_internal_vm_StackChunk::hasArgsAtTop(oop chunk) {
+  return chunk->bool_field(_hasArgsAtTop_offset);
+}
+
+inline void jdk_internal_vm_StackChunk::set_hasArgsAtTop(oop chunk, bool value) {
+  chunk->bool_field_put(_hasArgsAtTop_offset, (jboolean)value);
+}
+
 #endif // SHARE_RUNTIME_CONTINUATIONJAVACLASSES_INLINE_HPP
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index e578e614440..b5cd4acc75d 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -891,7 +891,8 @@ oop frame::interpreter_callee_receiver(Symbol* signature) {
   return *interpreter_callee_receiver_addr(signature);
 }
 
-void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool query_oop_map_cache) const {
+template <typename RegisterMapT>
+void frame::oops_interpreted_do(OopClosure* f, const RegisterMapT* map, bool query_oop_map_cache) const {
   assert(is_interpreted_frame(), "Not an interpreted frame");
   Thread *thread = Thread::current();
   methodHandle m (thread, interpreter_frame_method());
@@ -928,33 +929,19 @@ void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool quer
 
   int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals();
 
-  Symbol* signature = nullptr;
-  bool has_receiver = false;
-
   // Process a callee's arguments if we are at a call site
   // (i.e., if we are at an invoke bytecode)
   // This is used sometimes for calling into the VM, not for another
   // interpreted or compiled frame.
-  if (!m->is_native()) {
+  if (!m->is_native() && map != nullptr && map->include_argument_oops()) {
     Bytecode_invoke call = Bytecode_invoke_check(m, bci);
-    if (map != nullptr && call.is_valid()) {
-      signature = call.signature();
-      has_receiver = call.has_receiver();
-      if (map->include_argument_oops() &&
-          interpreter_frame_expression_stack_size() > 0) {
-        ResourceMark rm(thread);  // is this right ???
-        // we are at a call site & the expression stack is not empty
-        // => process callee's arguments
-        //
-        // Note: The expression stack can be empty if an exception
-        //       occurred during method resolution/execution. In all
-        //       cases we empty the expression stack completely be-
-        //       fore handling the exception (the exception handling
-        //       code in the interpreter calls a blocking runtime
-        //       routine which can cause this code to be executed).
-        //       (was bug gri 7/27/98)
-        oops_interpreted_arguments_do(signature, has_receiver, f);
-      }
+    if (call.is_valid() && interpreter_frame_expression_stack_size() > 0) {
+      ResourceMark rm(thread);  // is this right ???
+      Symbol* signature = call.signature();
+      bool has_receiver = call.has_receiver();
+      // We are at a call site & the expression stack is not empty
+      // so we might have callee arguments we need to process.
+      oops_interpreted_arguments_do(signature, has_receiver, f);
     }
   }
 
@@ -970,6 +957,9 @@ void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool quer
   mask.iterate_oop(&blk);
 }
 
+template void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool query_oop_map_cache) const;
+template void frame::oops_interpreted_do(OopClosure* f, const SmallRegisterMapNoArgs* map, bool query_oop_map_cache) const;
+template void frame::oops_interpreted_do(OopClosure* f, const SmallRegisterMapWithArgs* map, bool query_oop_map_cache) const;
 
 void frame::oops_interpreted_arguments_do(Symbol* signature, bool has_receiver, OopClosure* f) const {
   InterpretedArgumentOopFinder finder(signature, has_receiver, this, f);
diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp
index fbe7310f3ae..f54553086f6 100644
--- a/src/hotspot/share/runtime/frame.hpp
+++ b/src/hotspot/share/runtime/frame.hpp
@@ -456,7 +456,8 @@ class frame {
 
   // Oops-do's
   void oops_compiled_arguments_do(Symbol* signature, bool has_receiver, bool has_appendix, const RegisterMap* reg_map, OopClosure* f) const;
-  void oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool query_oop_map_cache = true) const;
+  template <typename RegisterMapT>
+  void oops_interpreted_do(OopClosure* f, const RegisterMapT* map, bool query_oop_map_cache = true) const;
 
  private:
   void oops_interpreted_arguments_do(Symbol* signature, bool has_receiver, OopClosure* f) const;
diff --git a/src/hotspot/share/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp
index ec3132220d9..3ed678284e4 100644
--- a/src/hotspot/share/runtime/javaCalls.cpp
+++ b/src/hotspot/share/runtime/javaCalls.cpp
@@ -58,6 +58,7 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei
   guarantee(thread->is_Java_thread(), "crucial check - the VM thread cannot and must not escape to Java code");
   assert(!thread->owns_locks(), "must release all locks when leaving VM");
   guarantee(thread->can_call_java(), "cannot make java calls from the native compiler");
+  assert(!thread->preempting(), "Unexpected Java upcall whilst processing preemption");
   _result   = result;
 
   // Allocate handle block for Java code. This must be done before we change thread_state to _thread_in_Java_or_stub,
@@ -242,7 +243,7 @@ void JavaCalls::call_special(JavaValue* result, Handle receiver, Klass* klass, S
 void JavaCalls::call_static(JavaValue* result, Klass* klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
   CallInfo callinfo;
   LinkInfo link_info(klass, name, signature);
-  LinkResolver::resolve_static_call(callinfo, link_info, true, CHECK);
+  LinkResolver::resolve_static_call(callinfo, link_info, ClassInitMode::init, CHECK);
   methodHandle method(THREAD, callinfo.selected_method());
   assert(method.not_null(), "should have thrown exception");
 
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index b9b4237e7ee..838f8e4c581 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -494,6 +494,10 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _preempt_alternate_return(nullptr),
   _preemption_cancelled(false),
   _pending_interrupted_exception(false),
+  _at_preemptable_init(false),
+  DEBUG_ONLY(_preempt_init_klass(nullptr) COMMA)
+  DEBUG_ONLY(_interp_at_preemptable_vmcall_cnt(0) COMMA)
+  DEBUG_ONLY(_interp_redoing_vm_call(false) COMMA)
 
   _handshake(this),
   _suspend_resume_manager(this, &_handshake._lock),
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index c0b25384fac..b0cd6fb3e4f 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -485,6 +485,9 @@ class JavaThread: public Thread {
   // For Object.wait() we set this field to know if we need to
   // throw IE at the end of thawing before returning to Java.
   bool _pending_interrupted_exception;
+  // We allow preemption on some klass initialization calls.
+  // We use this boolean to mark such calls.
+  bool _at_preemptable_init;
 
  public:
   bool preemption_cancelled()           { return _preemption_cancelled; }
@@ -493,11 +496,46 @@ class JavaThread: public Thread {
   bool pending_interrupted_exception()           { return _pending_interrupted_exception; }
   void set_pending_interrupted_exception(bool b) { _pending_interrupted_exception = b; }
 
-  bool preempting()           { return _preempt_alternate_return != nullptr; }
+  bool preempting()                              { return _preempt_alternate_return != nullptr; }
   void set_preempt_alternate_return(address val) { _preempt_alternate_return = val; }
 
-private:
+  bool at_preemptable_init()           { return _at_preemptable_init; }
+  void set_at_preemptable_init(bool b) { _at_preemptable_init = b; }
 
+#ifdef ASSERT
+  // Used for extra logging with -Xlog:continuation+preempt
+  InstanceKlass* _preempt_init_klass;
+
+  InstanceKlass* preempt_init_klass() { return _preempt_init_klass; }
+  void set_preempt_init_klass(InstanceKlass* ik) { _preempt_init_klass = ik; }
+
+  int _interp_at_preemptable_vmcall_cnt;
+  int interp_at_preemptable_vmcall_cnt() { return _interp_at_preemptable_vmcall_cnt; }
+
+  bool _interp_redoing_vm_call;
+  bool interp_redoing_vm_call() const { return _interp_redoing_vm_call; };
+
+  class AtRedoVMCall : public StackObj {
+    JavaThread* _thread;
+   public:
+    AtRedoVMCall(JavaThread* t) : _thread(t) {
+      assert(!_thread->_interp_redoing_vm_call, "");
+      _thread->_interp_redoing_vm_call = true;
+      _thread->_interp_at_preemptable_vmcall_cnt++;
+      assert(_thread->_interp_at_preemptable_vmcall_cnt > 0, "Unexpected count: %d",
+             _thread->_interp_at_preemptable_vmcall_cnt);
+    }
+    ~AtRedoVMCall() {
+      assert(_thread->_interp_redoing_vm_call, "");
+      _thread->_interp_redoing_vm_call = false;
+      _thread->_interp_at_preemptable_vmcall_cnt--;
+      assert(_thread->_interp_at_preemptable_vmcall_cnt >= 0, "Unexpected count: %d",
+             _thread->_interp_at_preemptable_vmcall_cnt);
+    }
+  };
+#endif // ASSERT
+
+private:
   friend class VMThread;
   friend class ThreadWaitTransition;
   friend class VM_Exit;
@@ -885,6 +923,7 @@ public:
   static ByteSize cont_fastpath_offset()      { return byte_offset_of(JavaThread, _cont_fastpath); }
   static ByteSize preemption_cancelled_offset()  { return byte_offset_of(JavaThread, _preemption_cancelled); }
   static ByteSize preempt_alternate_return_offset() { return byte_offset_of(JavaThread, _preempt_alternate_return); }
+  DEBUG_ONLY(static ByteSize interp_at_preemptable_vmcall_cnt_offset() { return byte_offset_of(JavaThread, _interp_at_preemptable_vmcall_cnt); })
   static ByteSize unlocked_inflated_monitor_offset() { return byte_offset_of(JavaThread, _unlocked_inflated_monitor); }
 
 #if INCLUDE_JVMTI
@@ -1330,8 +1369,8 @@ class NoPreemptMark {
   ContinuationEntry* _ce;
   bool _unpin;
  public:
-  NoPreemptMark(JavaThread* thread) : _ce(thread->last_continuation()), _unpin(false) {
-    if (_ce != nullptr) _unpin = _ce->pin();
+  NoPreemptMark(JavaThread* thread, bool ignore_mark = false) : _ce(thread->last_continuation()), _unpin(false) {
+    if (_ce != nullptr && !ignore_mark) _unpin = _ce->pin();
   }
   ~NoPreemptMark() { if (_unpin) _ce->unpin(); }
 };
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index f6d569b1b7a..6a99568ba44 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -304,6 +304,7 @@ ObjectMonitor::ObjectMonitor(oop object) :
 
 ObjectMonitor::~ObjectMonitor() {
   _object.release(_oop_storage);
+  _object_strong.release(JavaThread::thread_oop_storage());
 }
 
 oop ObjectMonitor::object() const {
@@ -311,6 +312,20 @@ oop ObjectMonitor::object() const {
   return _object.resolve();
 }
 
+// Keep object protected during ObjectLocker preemption.
+void ObjectMonitor::set_object_strong() {
+  check_object_context();
+  if (_object_strong.is_empty()) {
+    if (AtomicAccess::cmpxchg(&_object_strong_lock, 0, 1) == 0) {
+      if (_object_strong.is_empty()) {
+        assert(_object.resolve() != nullptr, "");
+        _object_strong = OopHandle(JavaThread::thread_oop_storage(), _object.resolve());
+      }
+      AtomicAccess::release_store(&_object_strong_lock, 0);
+    }
+  }
+}
+
 void ObjectMonitor::ExitOnSuspend::operator()(JavaThread* current) {
   if (current->is_suspended()) {
     _om->_recursions = 0;
@@ -1813,7 +1828,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     current->set_current_waiting_monitor(this);
     result = Continuation::try_preempt(current, ce->cont_oop(current));
     if (result == freeze_ok) {
-      vthread_wait(current, millis);
+      vthread_wait(current, millis, interruptible);
       current->set_current_waiting_monitor(nullptr);
       return;
     }
@@ -2167,12 +2182,14 @@ void ObjectMonitor::quick_notifyAll(JavaThread* current) {
   }
 }
 
-void ObjectMonitor::vthread_wait(JavaThread* current, jlong millis) {
+void ObjectMonitor::vthread_wait(JavaThread* current, jlong millis, bool interruptible) {
   oop vthread = current->vthread();
   ObjectWaiter* node = new ObjectWaiter(vthread, this);
   node->_is_wait = true;
+  node->_interruptible = interruptible;
   node->TState = ObjectWaiter::TS_WAIT;
   java_lang_VirtualThread::set_notified(vthread, false);  // Reset notified flag
+  java_lang_VirtualThread::set_interruptible_wait(vthread, interruptible);
 
   // Enter the waiting queue, which is a circular doubly linked list in this case
   // but it could be a priority queue or any data structure.
@@ -2217,11 +2234,12 @@ bool ObjectMonitor::vthread_wait_reenter(JavaThread* current, ObjectWaiter* node
   ObjectWaiter::TStates state = node->TState;
   bool was_notified = state == ObjectWaiter::TS_ENTER;
   assert(was_notified || state == ObjectWaiter::TS_RUN, "");
-  node->_interrupted = !was_notified && current->is_interrupted(false);
+  node->_interrupted = node->_interruptible && !was_notified && current->is_interrupted(false);
 
-  // Post JFR and JVMTI events.
+  // Post JFR and JVMTI events. If non-interruptible we are in
+  // ObjectLocker case so we don't post anything.
   EventJavaMonitorWait wait_event;
-  if (wait_event.should_commit() || JvmtiExport::should_post_monitor_waited()) {
+  if (node->_interruptible && (wait_event.should_commit() || JvmtiExport::should_post_monitor_waited())) {
     vthread_monitor_waited_event(current, node, cont, &wait_event, !was_notified && !node->_interrupted);
   }
 
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 77919d99955..2da41786309 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -55,6 +55,7 @@ class ObjectWaiter : public CHeapObj<mtThread> {
   bool           _is_wait;
   bool        _at_reenter;
   bool       _interrupted;
+  bool     _interruptible;
   bool     _do_timed_park;
   bool            _active;    // Contention monitoring is enabled
  public:
@@ -200,10 +201,12 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
                                     // ObjectMonitor::deflate_monitor().
   int64_t _unmounted_vthreads;      // Number of nodes in the _entry_list associated with unmounted vthreads.
                                     // It might be temporarily more than the actual number but never less.
+  OopHandle _object_strong;         // Used to protect object during preemption on class initialization
 
   ObjectWaiter* volatile _wait_set; // LL of threads waiting on the monitor - wait()
   volatile int  _waiters;           // number of waiting threads
   volatile int _wait_set_lock;      // protects wait set queue - simple spinlock
+  volatile int _object_strong_lock; // protects setting of _object_strong
 
  public:
 
@@ -343,6 +346,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   oop       object_peek() const;
   bool      object_is_dead() const;
   bool      object_refers_to(oop obj) const;
+  void      set_object_strong();
 
   // Returns true if the specified thread owns the ObjectMonitor. Otherwise
   // returns false and throws IllegalMonitorStateException (IMSE).
@@ -405,7 +409,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   ObjectWaiter* entry_list_tail(JavaThread* current);
 
   bool      vthread_monitor_enter(JavaThread* current, ObjectWaiter* node = nullptr);
-  void      vthread_wait(JavaThread* current, jlong millis);
+  void      vthread_wait(JavaThread* current, jlong millis, bool interruptible);
   bool      vthread_wait_reenter(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont);
   void      vthread_epilog(JavaThread* current, ObjectWaiter* node);
 
diff --git a/src/hotspot/share/runtime/smallRegisterMap.inline.hpp b/src/hotspot/share/runtime/smallRegisterMap.inline.hpp
index e0de6acbd6d..09febdaf450 100644
--- a/src/hotspot/share/runtime/smallRegisterMap.inline.hpp
+++ b/src/hotspot/share/runtime/smallRegisterMap.inline.hpp
@@ -29,4 +29,19 @@
 
 #include CPU_HEADER_INLINE(smallRegisterMap)
 
+typedef SmallRegisterMapType<false> SmallRegisterMapNoArgs;
+typedef SmallRegisterMapType<true>  SmallRegisterMapWithArgs;
+
+class SmallRegisterMap : AllStatic {
+public:
+  static const SmallRegisterMapNoArgs* instance_no_args() {
+    static constexpr SmallRegisterMapNoArgs the_instance{};
+    return &the_instance;
+  }
+  static const SmallRegisterMapWithArgs* instance_with_args() {
+    static constexpr SmallRegisterMapWithArgs the_instance_with_args{};
+    return &the_instance_with_args;
+  }
+};
+
 #endif // SHARE_RUNTIME_SMALLREGISTERMAP_HPP
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.hpp
index 207203dbb35..cb46254d125 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.hpp
@@ -26,6 +26,7 @@
 #define SHARE_RUNTIME_STACKCHUNKFRAMESTREAM_HPP
 
 #include "memory/allocation.hpp"
+#include "memory/iterator.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -79,7 +80,8 @@ public:
   const ImmutableOopMap* oopmap() const { if (_oopmap == nullptr) get_oopmap(); return _oopmap; }
   inline int frame_size() const;
   inline int stack_argsize() const;
-  inline int num_oops() const;
+  template <typename RegisterMapT>
+  inline int num_oops(RegisterMapT* map) const;
 
   inline void initialize_register_map(RegisterMap* map);
   template <typename RegisterMapT> inline void next(RegisterMapT* map, bool stop = false);
@@ -101,7 +103,8 @@ public:
   inline address get_pc() const;
 
   inline int interpreter_frame_size() const;
-  inline int interpreter_frame_num_oops() const;
+  template <typename RegisterMapT>
+  inline int interpreter_frame_num_oops(RegisterMapT* map) const;
   inline int interpreter_frame_stack_argsize() const;
   inline void next_for_interpreter_frame();
   inline intptr_t* unextended_sp_for_interpreter_frame() const;
@@ -123,4 +126,13 @@ public:
   inline void iterate_derived_pointers(DerivedOopClosureType* closure, const RegisterMapT* map) const;
 };
 
+class InterpreterOopCount : public OopClosure {
+  int _count;
+public:
+  InterpreterOopCount() : _count(0) {}
+  void do_oop(oop* p) override { _count++; }
+  void do_oop(narrowOop* p) override { _count++; }
+  int count() { return _count; }
+};
+
 #endif // SHARE_RUNTIME_STACKCHUNKFRAMESTREAM_HPP
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
index 09c267b408b..97166950752 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
@@ -195,9 +195,10 @@ inline int StackChunkFrameStream<frame_kind>::stack_argsize() const {
 }
 
 template <ChunkFrames frame_kind>
-inline int StackChunkFrameStream<frame_kind>::num_oops() const {
+template <typename RegisterMapT>
+inline int StackChunkFrameStream<frame_kind>::num_oops(RegisterMapT* map) const {
   if (is_interpreted()) {
-    return interpreter_frame_num_oops();
+    return interpreter_frame_num_oops(map);
   } else if (is_compiled()) {
     return oopmap()->num_oops();
   } else {
@@ -365,7 +366,7 @@ template <class OopClosureType, class RegisterMapT>
 inline void StackChunkFrameStream<frame_kind>::iterate_oops(OopClosureType* closure, const RegisterMapT* map) const {
   if (is_interpreted()) {
     frame f = to_frame();
-    f.oops_interpreted_do(closure, nullptr, true);
+    f.oops_interpreted_do(closure, map, true);
   } else {
     DEBUG_ONLY(int oops = 0;)
     for (OopMapStream oms(oopmap()); !oms.is_done(); oms.next()) {
diff --git a/src/hotspot/share/runtime/stackValue.cpp b/src/hotspot/share/runtime/stackValue.cpp
index 52d2631f3c9..fc810a1fa80 100644
--- a/src/hotspot/share/runtime/stackValue.cpp
+++ b/src/hotspot/share/runtime/stackValue.cpp
@@ -38,7 +38,7 @@ class RegisterMap;
 class SmallRegisterMap;
 
 template StackValue* StackValue::create_stack_value(const frame* fr, const RegisterMap* reg_map, ScopeValue* sv);
-template StackValue* StackValue::create_stack_value(const frame* fr, const SmallRegisterMap* reg_map, ScopeValue* sv);
+template StackValue* StackValue::create_stack_value(const frame* fr, const SmallRegisterMapNoArgs* reg_map, ScopeValue* sv);
 
 template<typename RegisterMapT>
 StackValue* StackValue::create_stack_value(const frame* fr, const RegisterMapT* reg_map, ScopeValue* sv) {
@@ -257,7 +257,7 @@ StackValue* StackValue::create_stack_value(ScopeValue* sv, address value_addr, c
 }
 
 template address StackValue::stack_value_address(const frame* fr, const RegisterMap* reg_map, ScopeValue* sv);
-template address StackValue::stack_value_address(const frame* fr, const SmallRegisterMap* reg_map, ScopeValue* sv);
+template address StackValue::stack_value_address(const frame* fr, const SmallRegisterMapNoArgs* reg_map, ScopeValue* sv);
 
 template<typename RegisterMapT>
 address StackValue::stack_value_address(const frame* fr, const RegisterMapT* reg_map, ScopeValue* sv) {
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index e513c57fe06..36e38b4dd35 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -475,22 +475,45 @@ void ObjectSynchronizer::jni_exit(oop obj, TRAPS) {
 // -----------------------------------------------------------------------------
 // Internal VM locks on java objects
 // standard constructor, allows locking failures
-ObjectLocker::ObjectLocker(Handle obj, JavaThread* thread) : _npm(thread) {
-  _thread = thread;
+ObjectLocker::ObjectLocker(Handle obj, TRAPS) : _thread(THREAD), _obj(obj),
+  _npm(_thread, _thread->at_preemptable_init() /* ignore_mark */), _skip_exit(false) {
+  assert(!_thread->preempting(), "");
+
   _thread->check_for_valid_safepoint_state();
-  _obj = obj;
 
   if (_obj() != nullptr) {
     ObjectSynchronizer::enter(_obj, &_lock, _thread);
+
+    if (_thread->preempting()) {
+      // If preemption was cancelled we acquired the monitor after freezing
+      // the frames. Redoing the vm call later in thaw will require us to
+      // release it since the call should look like the original one. We
+      // do it in ~ObjectLocker to reduce the window of time we hold the
+      // monitor since we can't do anything useful with it now, and would
+      // otherwise just force other vthreads to preempt in case they try
+      // to acquire this monitor.
+      _skip_exit = !_thread->preemption_cancelled();
+      ObjectSynchronizer::read_monitor(_thread, _obj())->set_object_strong();
+      _thread->set_pending_preempted_exception();
+
+    }
   }
 }
 
 ObjectLocker::~ObjectLocker() {
-  if (_obj() != nullptr) {
+  if (_obj() != nullptr && !_skip_exit) {
     ObjectSynchronizer::exit(_obj(), &_lock, _thread);
   }
 }
 
+void ObjectLocker::wait_uninterruptibly(TRAPS) {
+  ObjectSynchronizer::waitUninterruptibly(_obj, 0, _thread);
+  if (_thread->preempting()) {
+    _skip_exit = true;
+    ObjectSynchronizer::read_monitor(_thread, _obj())->set_object_strong();
+    _thread->set_pending_preempted_exception();
+  }
+}
 
 // -----------------------------------------------------------------------------
 //  Wait/Notify/NotifyAll
@@ -517,9 +540,7 @@ int ObjectSynchronizer::wait(Handle obj, jlong millis, TRAPS) {
 }
 
 void ObjectSynchronizer::waitUninterruptibly(Handle obj, jlong millis, TRAPS) {
-  if (millis < 0) {
-    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "timeout value is negative");
-  }
+  assert(millis >= 0, "timeout value is negative");
 
   ObjectMonitor* monitor;
   monitor = LightweightSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_wait, CHECK);
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
index 419cf2bf5bb..2337569176e 100644
--- a/src/hotspot/share/runtime/synchronizer.hpp
+++ b/src/hotspot/share/runtime/synchronizer.hpp
@@ -126,6 +126,7 @@ public:
   static const char* inflate_cause_name(const InflateCause cause);
 
   inline static ObjectMonitor* read_monitor(markWord mark);
+  inline static ObjectMonitor* read_monitor(Thread* current, oop obj);
   inline static ObjectMonitor* read_monitor(Thread* current, oop obj, markWord mark);
 
   // Returns the identity hash value for an oop
@@ -224,13 +225,13 @@ class ObjectLocker : public StackObj {
   Handle      _obj;
   BasicLock   _lock;
   NoPreemptMark _npm;
+  bool    _skip_exit;
  public:
-  ObjectLocker(Handle obj, JavaThread* current);
+  ObjectLocker(Handle obj, TRAPS);
   ~ObjectLocker();
 
   // Monitor behavior
-  void wait(TRAPS)  { ObjectSynchronizer::wait(_obj, 0, CHECK); } // wait forever
-  void wait_uninterruptibly(TRAPS)  { ObjectSynchronizer::waitUninterruptibly(_obj, 0, CHECK); } // wait forever
+  void wait_uninterruptibly(TRAPS);
   void notify_all(TRAPS)  { ObjectSynchronizer::notifyall(_obj, CHECK); }
 };
 
diff --git a/src/hotspot/share/runtime/synchronizer.inline.hpp b/src/hotspot/share/runtime/synchronizer.inline.hpp
index cdbeb1daf5b..7bcbd91eda7 100644
--- a/src/hotspot/share/runtime/synchronizer.inline.hpp
+++ b/src/hotspot/share/runtime/synchronizer.inline.hpp
@@ -34,6 +34,10 @@ inline ObjectMonitor* ObjectSynchronizer::read_monitor(markWord mark) {
   return mark.monitor();
 }
 
+inline ObjectMonitor* ObjectSynchronizer::read_monitor(Thread* current, oop obj) {
+  return ObjectSynchronizer::read_monitor(current, obj, obj->mark());
+}
+
 inline ObjectMonitor* ObjectSynchronizer::read_monitor(Thread* current, oop obj, markWord mark) {
   if (!UseObjectMonitorTable) {
     return read_monitor(mark);
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 299905ff0a2..10c3636273d 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -410,6 +410,7 @@ void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) {
   initialize_class(vmSymbols::java_lang_ClassCastException(), CHECK);
   initialize_class(vmSymbols::java_lang_ArrayStoreException(), CHECK);
   initialize_class(vmSymbols::java_lang_ArithmeticException(), CHECK);
+  initialize_class(vmSymbols::jdk_internal_vm_PreemptedException(), CHECK);
   initialize_class(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), CHECK);
   initialize_class(vmSymbols::java_lang_StackOverflowError(), CHECK);
   initialize_class(vmSymbols::java_lang_IllegalMonitorStateException(), CHECK);
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index e7acb4387ed..22a8cd6e0ef 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -62,6 +62,8 @@ void ThreadShadow::set_pending_exception(oop exception, const char* file, int li
 }
 
 void ThreadShadow::clear_pending_exception() {
+  assert(_pending_exception == nullptr || !_pending_exception->is_a(vmClasses::PreemptedException_klass()),
+         "unexpected PreemptedException, missing NoPreemptMark?");
   LogTarget(Debug, exceptions) lt;
   if (_pending_exception != nullptr && lt.is_enabled()) {
     ResourceMark rm;
@@ -82,6 +84,30 @@ void ThreadShadow::clear_pending_nonasync_exception() {
   }
 }
 
+void ThreadShadow::set_pending_preempted_exception() {
+  assert(!has_pending_exception(), "");
+  // We always install the same pre-allocated exception since we only
+  // want to use the TRAPS mechanism to bail out from all methods until
+  // reaching the one using the CHECK_AND_CLEAR_PREEMPTED macro.
+  set_pending_exception(Universe::preempted_exception_instance(), __FILE__, __LINE__);
+}
+
+void ThreadShadow::clear_pending_preempted_exception() {
+  assert(has_pending_exception(), "");
+  if (pending_exception()->is_a(vmClasses::PreemptedException_klass())) {
+    _pending_exception = nullptr;
+    _exception_file    = nullptr;
+    _exception_line    = 0;
+  }
+}
+
+#ifdef ASSERT
+void ThreadShadow::check_preempted_exception() {
+  assert(has_pending_exception(), "");
+  assert(pending_exception()->is_a(vmClasses::PreemptedException_klass()), "should only be PreemptedException");
+}
+#endif
+
 // Implementation of Exceptions
 
 bool Exceptions::special_exception(JavaThread* thread, const char* file, int line, Handle h_exception, Symbol* h_name, const char* message) {
@@ -317,6 +343,11 @@ Handle Exceptions::new_exception(JavaThread* thread, Symbol* name,
 
   if (!thread->has_pending_exception()) {
     assert(klass != nullptr, "klass must exist");
+    // We could get here while linking or initializing a klass
+    // from a preemptable call. Don't preempt here since before
+    // the PreemptedException is propagated we might make an upcall
+    // to Java to initialize the object with the cause of exception.
+    NoPreemptMark npm(thread);
     h_exception = JavaCalls::construct_new_instance(InstanceKlass::cast(klass),
                                 signature,
                                 args,
diff --git a/src/hotspot/share/utilities/exceptions.hpp b/src/hotspot/share/utilities/exceptions.hpp
index 94f4a04546d..e76a0041d20 100644
--- a/src/hotspot/share/utilities/exceptions.hpp
+++ b/src/hotspot/share/utilities/exceptions.hpp
@@ -94,6 +94,10 @@ class ThreadShadow: public CHeapObj<mtThread> {
   // use CLEAR_PENDING_NONASYNC_EXCEPTION to clear probable nonasync exception.
   void clear_pending_nonasync_exception();
 
+  void set_pending_preempted_exception();
+  void clear_pending_preempted_exception();
+  void check_preempted_exception() NOT_DEBUG_RETURN;
+
   ThreadShadow() : _pending_exception(nullptr),
                    _exception_file(nullptr), _exception_line(0) {}
 };
@@ -230,6 +234,8 @@ class Exceptions {
 #define CHECK_NULL                               CHECK_(nullptr)
 #define CHECK_false                              CHECK_(false)
 #define CHECK_JNI_ERR                            CHECK_(JNI_ERR)
+#define CHECK_PREEMPTABLE                        THREAD); if (HAS_PENDING_EXCEPTION) { THREAD->check_preempted_exception(); return;       } (void)(0
+#define CHECK_PREEMPTABLE_false                  THREAD); if (HAS_PENDING_EXCEPTION) { THREAD->check_preempted_exception(); return false; } (void)(0
 
 // CAUTION: These macros clears all exceptions including async exceptions, use it with caution.
 #define CHECK_AND_CLEAR                         THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return;        } (void)(0
@@ -249,6 +255,10 @@ class Exceptions {
 #define CHECK_AND_CLEAR_NONASYNC_NULL           CHECK_AND_CLEAR_NONASYNC_(nullptr)
 #define CHECK_AND_CLEAR_NONASYNC_false          CHECK_AND_CLEAR_NONASYNC_(false)
 
+#define CLEAR_PENDING_PREEMPTED_EXCEPTION       (((ThreadShadow*)THREAD)->clear_pending_preempted_exception())
+#define CHECK_AND_CLEAR_PREEMPTED               THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_PREEMPTED_EXCEPTION; return; } (void)(0
+
+
 // The THROW... macros should be used to throw an exception. They require a THREAD variable to be
 // visible within the scope containing the THROW. Usually this is achieved by declaring the function
 // with a TRAPS argument.
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index a23cbb72a6c..6064b46d50a 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -168,6 +168,9 @@ final class VirtualThread extends BaseVirtualThread {
     // notified by Object.notify/notifyAll while waiting in Object.wait
     private volatile boolean notified;
 
+    // true when waiting in Object.wait, false for VM internal uninterruptible Object.wait
+    private volatile boolean interruptibleWait;
+
     // timed-wait support
     private byte timedWaitSeqNo;
 
@@ -599,6 +602,7 @@ final class VirtualThread extends BaseVirtualThread {
         // Object.wait
         if (s == WAITING || s == TIMED_WAITING) {
             int newState;
+            boolean interruptible = interruptibleWait;
             if (s == WAITING) {
                 setState(newState = WAIT);
             } else {
@@ -628,7 +632,7 @@ final class VirtualThread extends BaseVirtualThread {
             }
 
             // may have been interrupted while in transition to wait state
-            if (interrupted && compareAndSetState(newState, UNBLOCKED)) {
+            if (interruptible && interrupted && compareAndSetState(newState, UNBLOCKED)) {
                 submitRunContinuation();
                 return;
             }
diff --git a/src/java.base/share/classes/jdk/internal/vm/PreemptedException.java b/src/java.base/share/classes/jdk/internal/vm/PreemptedException.java
new file mode 100644
index 00000000000..56b3764f2fd
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/vm/PreemptedException.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.vm;
+
+/**
+ * Internal exception used only by the VM.
+ */
+public class PreemptedException extends RuntimeException {
+    @java.io.Serial
+    private static final long serialVersionUID = 6700691236100628123L;
+
+    /**
+     * Constructs an {@code PreemptedException} with no detail  message.
+     */
+    public PreemptedException() {
+        super();
+    }
+}
diff --git a/test/hotspot/gtest/oops/test_markWord.cpp b/test/hotspot/gtest/oops/test_markWord.cpp
index 226d5a2dd74..f894acb5d1b 100644
--- a/test/hotspot/gtest/oops/test_markWord.cpp
+++ b/test/hotspot/gtest/oops/test_markWord.cpp
@@ -102,7 +102,7 @@ TEST_VM(markWord, printing) {
     st = new LockerThread(&done, h_obj());
     st->doit();
 
-    ol.wait(THREAD);
+    ol.wait_uninterruptibly(THREAD);
     assert_test_pattern(h_obj, "monitor");
     done.wait_with_safepoint_check(THREAD);  // wait till the thread is done.
   }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/SingleStepKlassInit.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/SingleStepKlassInit.java
new file mode 100644
index 00000000000..457c4b345c7
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/SingleStepKlassInit.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @library /test/lib
+ * @requires vm.continuations
+ * @run main/othervm/native -agentlib:SingleStepKlassInit -XX:CompileCommand=exclude,SingleStepKlassInit::lambda$main*
+ *      -XX:CompileCommand=exclude,SingleStepKlassInit$$Lambda*::run SingleStepKlassInit
+ */
+
+import java.util.concurrent.CountDownLatch;
+
+public class SingleStepKlassInit {
+    private static final int MAX_VTHREAD_COUNT = 8 * Runtime.getRuntime().availableProcessors();
+    private static final CountDownLatch finishInvokeStatic = new CountDownLatch(1);
+
+    private static native void setSingleSteppingMode(boolean enable);
+    private static native boolean didSingleStep();
+
+    public static void main(String args[]) throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishInvokeStatic.await();
+                } catch (InterruptedException e) {}
+            }
+            static void m() {
+            }
+        }
+
+        setSingleSteppingMode(true);
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                TestClass.m();
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishInvokeStatic.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+        setSingleSteppingMode(false);
+
+        if (!didSingleStep()) {
+            throw new RuntimeException("No SingleStep events");
+        }
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private static void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assert state != Thread.State.TERMINATED : "Thread has terminated";
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/libSingleStepKlassInit.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/libSingleStepKlassInit.cpp
new file mode 100644
index 00000000000..8acecd952e3
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SingleStepKlassInit/libSingleStepKlassInit.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+#include <jvmti.h>
+#include <stdio.h>
+#include <string.h>
+#include "jvmti_common.hpp"
+
+// set by Agent_OnLoad
+static jvmtiEnv* jvmti = nullptr;
+static jboolean did_single_step = false;
+
+extern "C" {
+
+static void JNICALL
+SingleStep(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread,
+           jmethodID method, jlocation location) {
+  did_single_step = true;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_SingleStepKlassInit_didSingleStep(JNIEnv* jni, jclass klass) {
+  return did_single_step;
+}
+
+JNIEXPORT void JNICALL
+Java_SingleStepKlassInit_setSingleSteppingMode(JNIEnv* jni, jclass klass, jboolean enable) {
+  jvmtiError err = jvmti->SetEventNotificationMode(enable ? JVMTI_ENABLE : JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, nullptr);
+  check_jvmti_status(jni, err, "setSingleSteppingMode: error in JVMTI SetEventNotificationMode for JVMTI_EVENT_SINGLE_STEP");
+}
+
+JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM* jvm, char* options, void* reserved) {
+  jvmtiEventCallbacks callbacks;
+  jvmtiCapabilities caps;
+  jvmtiError err;
+
+  LOG("Agent_OnLoad: started\n");
+  if (jvm->GetEnv((void **) (&jvmti), JVMTI_VERSION) != JNI_OK) {
+    LOG("Agent init: Failed in GetEnv\n");
+    return JNI_ERR;
+  }
+
+  memset(&caps, 0, sizeof(caps));
+  caps.can_generate_single_step_events = 1;
+  caps.can_support_virtual_threads = 1;
+
+  err = jvmti->AddCapabilities(&caps);
+  if (err != JVMTI_ERROR_NONE) {
+    LOG("Agent init: Failed in AddCapabilities: %s (%d)\n", TranslateError(err), err);
+    return JNI_ERR;
+  }
+
+  memset(&callbacks, 0, sizeof(callbacks));
+  callbacks.SingleStep  = &SingleStep;
+  err = jvmti->SetEventCallbacks(&callbacks, sizeof(jvmtiEventCallbacks));
+  if (err != JVMTI_ERROR_NONE) {
+    LOG("Agent init: Failed in SetEventCallbacks: %s (%d)\n", TranslateError(err), err);
+    return JNI_ERR;
+  }
+
+  LOG("Agent_OnLoad: finished\n");
+  return 0;
+}
+
+} // extern "C"
diff --git a/test/jdk/java/lang/Thread/virtual/JfrEvents.java b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
index 0c967811481..a0b2077a2aa 100644
--- a/test/jdk/java/lang/Thread/virtual/JfrEvents.java
+++ b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
@@ -302,10 +302,10 @@ class JfrEvents {
     }
 
     /**
-     * Test jdk.VirtualThreadPinned event when waiting for a class initializer.
+     * Test jdk.VirtualThreadPinned event when waiting for a class initializer while pinned.
      */
     @Test
-    void testWaitingForClassInitializer() throws Exception {
+    void testWaitingForClassInitializerWhenPinned() throws Exception {
         class TestClass {
             static {
                 LockSupport.park();
@@ -328,7 +328,9 @@ class JfrEvents {
             });
             Thread vthread2 = Thread.ofVirtual().unstarted(() -> {
                 started2.set(true);
-                TestClass.m();
+                VThreadPinner.runPinned(() -> {
+                    TestClass.m();
+                });
             });
 
             try {
@@ -341,7 +343,7 @@ class JfrEvents {
                 vthread2.start();
                 awaitTrue(started2);
 
-                // give time for second virtual thread to wait on the MutexLocker
+                // give time for second virtual thread to wait in VM
                 Thread.sleep(3000);
 
             } finally {
diff --git a/test/jdk/java/lang/Thread/virtual/KlassInit.java b/test/jdk/java/lang/Thread/virtual/KlassInit.java
new file mode 100644
index 00000000000..4f11d667a2b
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/KlassInit.java
@@ -0,0 +1,490 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=default
+ * @library /test/lib
+ * @requires vm.continuations
+ * @run junit/othervm/timeout=480 -XX:CompileCommand=exclude,KlassInit::lambda$testReleaseAtKlassInit*
+ *      -XX:CompileCommand=exclude,KlassInit$$Lambda*::run -XX:CompileCommand=exclude,KlassInit$1Driver::foo KlassInit
+ */
+
+/*
+ * @test id=Xint
+ * @library /test/lib
+ * @requires vm.continuations
+ * @run junit/othervm/timeout=480 -Xint -XX:CompileCommand=exclude,KlassInit::lambda$testReleaseAtKlassInit*
+ *      -XX:CompileCommand=exclude,KlassInit$$Lambda*::run -XX:CompileCommand=exclude,KlassInit$1Driver::foo KlassInit
+ */
+
+/*
+ * @test id=Xcomp
+ * @library /test/lib
+ * @requires vm.continuations
+ * @run junit/othervm/timeout=480 -Xcomp -XX:CompileCommand=exclude,KlassInit::lambda$testReleaseAtKlassInit*
+ *      -XX:CompileCommand=exclude,KlassInit$$Lambda*::run -XX:CompileCommand=exclude,KlassInit$1Driver::foo KlassInit
+ */
+
+/*
+ * @test id=Xcomp-TieredStopAtLevel1
+ * @library /test/lib
+ * @requires vm.continuations
+ * @run junit/othervm/timeout=480 -Xcomp -XX:TieredStopAtLevel=1 -XX:CompileCommand=exclude,KlassInit::lambda$testReleaseAtKlassInit*
+ *      -XX:CompileCommand=exclude,KlassInit$$Lambda*::run -XX:CompileCommand=exclude,KlassInit$1Driver::foo KlassInit
+ */
+
+/*
+ * @test id=Xcomp-noTieredCompilation
+ * @library /test/lib
+ * @requires vm.continuations
+ * @run junit/othervm/timeout=480 -Xcomp -XX:-TieredCompilation -XX:CompileCommand=exclude,KlassInit::lambda$testReleaseAtKlassInit*
+ *      -XX:CompileCommand=exclude,KlassInit$$Lambda*::run -XX:CompileCommand=exclude,KlassInit$1Driver::foo KlassInit
+ */
+
+/*
+ * @test id=gc
+ * @library /test/lib
+ * @requires vm.debug == true & vm.continuations
+ * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+FullGCALot -XX:FullGCALotInterval=1000
+ *      -XX:CompileCommand=exclude,KlassInit::lambda$testReleaseAtKlassInit* -XX:CompileCommand=exclude,KlassInit$$Lambda*::run
+ *      -XX:CompileCommand=exclude,KlassInit$1Driver::foo KlassInit
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CountDownLatch;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.Arguments;
+import static org.junit.jupiter.api.Assertions.*;
+
+class KlassInit {
+    private static final int MAX_VTHREAD_COUNT = 8 * Runtime.getRuntime().availableProcessors();
+
+    private static final CountDownLatch finishInvokeStatic1 = new CountDownLatch(1);
+    private static final CountDownLatch finishInvokeStatic2 = new CountDownLatch(1);
+    private static final CountDownLatch finishInvokeStatic3 = new CountDownLatch(1);
+    private static final CountDownLatch finishNew = new CountDownLatch(1);
+    private static final CountDownLatch finishGetStatic = new CountDownLatch(1);
+    private static final CountDownLatch finishPutStatic = new CountDownLatch(1);
+    private static final CountDownLatch finishFailedInit = new CountDownLatch(1);
+
+    /**
+     * Test that threads blocked waiting for klass to be initialized
+     * on invokestatic bytecode release the carrier.
+     */
+    @Test
+    void testReleaseAtKlassInitInvokeStatic1() throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishInvokeStatic1.await();
+                } catch (InterruptedException e) {}
+            }
+            static void m() {
+            }
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                TestClass.m();
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishInvokeStatic1.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+    }
+
+    /**
+     * Test with static method that takes arguments.
+     */
+    @Test
+    void testReleaseAtKlassInitInvokeStatic2() throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishInvokeStatic2.await();
+                } catch (InterruptedException e) {}
+            }
+            static void m(ArrayList<String> list, int id) {
+                String str = list.get(0);
+                if (str != null && str.equals("VThread#" + id)) {
+                    list.add("Success");
+                }
+            }
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        ArrayList<String>[] lists = new ArrayList[MAX_VTHREAD_COUNT];
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            lists[i] = new ArrayList<>(List.of("VThread#" + i));
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                TestClass.m(lists[id], id);
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        System.gc();
+        finishInvokeStatic2.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+            assertEquals(lists[i].get(1), "Success");
+        }
+    }
+
+    /**
+     * Test invokestatic as first bytecode in method.
+     */
+    @Test
+    void testReleaseAtKlassInitInvokeStatic3() throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishInvokeStatic3.await();
+                } catch (InterruptedException e) {}
+            }
+            static void m() {
+            }
+        }
+        class Driver {
+            static void foo() {
+                TestClass.m();
+            }
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        started[0] = new CountDownLatch(1);
+        vthreads[0] = Thread.ofVirtual().start(() -> {
+            started[0].countDown();
+            TestClass.m();
+        });
+        started[0].await();
+        await(vthreads[0], Thread.State.WAITING);
+
+        for (int i = 1; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                Driver.foo();
+            });
+        }
+        for (int i = 1; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishInvokeStatic3.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+    }
+
+    /**
+     * Test that threads blocked waiting for klass to be initialized
+     * on new bytecode release the carrier.
+     */
+    @Test
+    void testReleaseAtKlassInitNew() throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishNew.await();
+                } catch (InterruptedException e) {}
+            }
+            void m() {
+            }
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                TestClass x = new TestClass();
+                x.m();
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishNew.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+    }
+
+    /**
+     * Test that threads blocked waiting for klass to be initialized
+     * on getstatic bytecode release the carrier.
+     */
+    @Test
+    void testReleaseAtKlassInitGetStatic() throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishGetStatic.await();
+                } catch (InterruptedException e) {}
+            }
+            public static int NUMBER = 150;
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        AtomicInteger[] result = new AtomicInteger[MAX_VTHREAD_COUNT];
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            result[i] = new AtomicInteger();
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                result[id].set(TestClass.NUMBER);
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishGetStatic.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+            assertEquals(result[i].get(), TestClass.NUMBER);
+        }
+    }
+
+    /**
+     * Test that threads blocked waiting for klass to be initialized
+     * on putstatic release the carrier.
+     */
+    @Test
+    void testReleaseAtKlassInitPutStatic() throws Exception {
+        class TestClass {
+            static {
+                try {
+                    finishPutStatic.await();
+                } catch (InterruptedException e) {}
+            }
+            public static int NUMBER;
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                TestClass.NUMBER = id;
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishPutStatic.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+    }
+
+    /**
+     * Test that interruptions during preemption on klass init
+     * are preserved.
+     */
+    @ParameterizedTest
+    @MethodSource("interruptTestCases")
+    void testReleaseAtKlassInitPreserverInterrupt(int timeout, Runnable m, CountDownLatch finish) throws Exception {
+        // Start vthread1 and wait until it blocks in TestClassX initializer
+        var vthread1_started = new CountDownLatch(1);
+        var vthread1 = Thread.ofVirtual().start(() -> {
+                vthread1_started.countDown();
+                m.run();
+            });
+        vthread1_started.await();
+        await(vthread1, Thread.State.WAITING);
+
+        // Start vthread2 and wait until it gets preempted on TestClassX initialization
+        var lock = new Object();
+        var interruptedException = new AtomicBoolean();
+        var vthread2_started = new CountDownLatch(1);
+        var vthread2 = Thread.ofVirtual().start(() -> {
+                vthread2_started.countDown();
+                m.run();
+                synchronized (lock) {
+                    try {
+                        if (timeout > 0) {
+                            lock.wait(timeout);
+                        } else {
+                            lock.wait();
+                        }
+                    } catch (InterruptedException e) {
+                        // check stack trace has the expected frames
+                        Set<String> expected = Set.of("wait0", "wait", "run");
+                        Set<String> methods = Stream.of(e.getStackTrace())
+                                .map(StackTraceElement::getMethodName)
+                                .collect(Collectors.toSet());
+                        assertTrue(methods.containsAll(expected));
+                        interruptedException.set(true);
+                    }
+                }
+            });
+        vthread2_started.await();
+        await(vthread2, Thread.State.WAITING);
+
+        // Interrupt vthread2 and let initialization of TestClassX finish
+        vthread2.interrupt();
+        finish.countDown();
+        vthread1.join();
+        vthread2.join();
+        assertTrue(interruptedException.get());
+    }
+
+    static CountDownLatch finishInterrupt0 = new CountDownLatch(1);
+    class TestClass0 {
+        static {
+            try {
+                finishInterrupt0.await();
+            } catch (InterruptedException e) {}
+        }
+        static void m() {}
+    }
+
+    static CountDownLatch finishInterrupt30000 = new CountDownLatch(1);
+    class TestClass30000 {
+        static {
+            try {
+                finishInterrupt30000.await();
+            } catch (InterruptedException e) {}
+        }
+        static void m() {}
+    }
+
+    static CountDownLatch finishInterruptMax = new CountDownLatch(1);
+    class TestClassMax {
+        static {
+            try {
+                finishInterruptMax.await();
+            } catch (InterruptedException e) {}
+        }
+        static void m() {}
+    }
+
+    static Stream<Arguments> interruptTestCases() {
+        return Stream.of(
+            Arguments.of(0, (Runnable) TestClass0::m, finishInterrupt0),
+            Arguments.of(30000, (Runnable) TestClass30000::m, finishInterrupt30000),
+            Arguments.of(Integer.MAX_VALUE, (Runnable) TestClassMax::m, finishInterruptMax)
+        );
+    }
+
+    /**
+     * Test case of threads blocked waiting for klass to be initialized
+     * when the klass initialization fails.
+     */
+    @Test
+    void testReleaseAtKlassInitFailedInit() throws Exception {
+        class TestClass {
+            static int[] a = {1, 2, 3};
+            static {
+                try {
+                    finishFailedInit.await();
+                    a[3] = 4;
+                } catch (InterruptedException e) {}
+            }
+            static void m() {
+            }
+        }
+
+        Thread[] vthreads = new Thread[MAX_VTHREAD_COUNT];
+        CountDownLatch[] started = new CountDownLatch[MAX_VTHREAD_COUNT];
+        AtomicInteger failedCount = new AtomicInteger();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            final int id = i;
+            started[i] = new CountDownLatch(1);
+            vthreads[i] = Thread.ofVirtual().start(() -> {
+                started[id].countDown();
+                try {
+                    TestClass.m();
+                } catch (NoClassDefFoundError e) {
+                    failedCount.getAndIncrement();
+                } catch (ExceptionInInitializerError e) {
+                    failedCount.getAndIncrement();
+                }
+            });
+        }
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            started[i].await();
+            await(vthreads[i], Thread.State.WAITING);
+        }
+
+        finishFailedInit.countDown();
+        for (int i = 0; i < MAX_VTHREAD_COUNT; i++) {
+            vthreads[i].join();
+        }
+        assertEquals(MAX_VTHREAD_COUNT, failedCount.get());
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/YieldQueuing.java b/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
index edb0b6e9f74..7bd2320e2ab 100644
--- a/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
+++ b/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
@@ -28,16 +28,24 @@
  * @run junit/othervm -Djdk.virtualThreadScheduler.maxPoolSize=1 YieldQueuing
  */
 
+import java.lang.invoke.MethodHandles;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
 import static org.junit.jupiter.api.Assertions.*;
 
 class YieldQueuing {
 
+    @BeforeAll
+    static void setup() throws Exception {
+        // waiting for LockSupport to be initialized can change the scheduling
+        MethodHandles.lookup().ensureInitialized(LockSupport.class);
+    }
+
     /**
      * Test Thread.yield submits the task for the current virtual thread to a scheduler
      * submission queue when there are no tasks in the local queue.
diff --git a/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java b/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java
index da45c610e82..32d4e1b39d9 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/LotsOfContendedMonitorEnter.java
@@ -25,22 +25,34 @@
  * @test id=default
  * @summary Test virtual threads entering a lot of monitors with contention
  * @library /test/lib
- * @run main LotsOfContendedMonitorEnter
+ * @run main/timeout=480 LotsOfContendedMonitorEnter
  */
 
+import java.time.Instant;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.CountDownLatch;
 import jdk.test.lib.thread.VThreadRunner;
 
 public class LotsOfContendedMonitorEnter {
+    static int depth;
 
     public static void main(String[] args) throws Exception {
-        int depth;
         if (args.length > 0) {
             depth = Integer.parseInt(args[0]);
         } else {
             depth = 1024;
         }
-        VThreadRunner.run(() -> testContendedEnter(depth));
+
+        var exRef = new AtomicReference<Throwable>();
+        var thread = Thread.ofVirtual().start(() -> {
+            try {
+                testContendedEnter(depth);
+            } catch (Exception e) {
+                exRef.set(e);
+            }
+        });
+        thread.join();
+        assert exRef.get() == null;
     }
 
     /**
@@ -48,6 +60,7 @@ public class LotsOfContendedMonitorEnter {
      * attempts to enter around the same time, then repeat to the given depth.
      */
     private static void testContendedEnter(int depthRemaining) throws Exception {
+        boolean doLog = depthRemaining % 10 == 0;
         if (depthRemaining > 0) {
             var lock = new Object();
 
@@ -81,12 +94,18 @@ public class LotsOfContendedMonitorEnter {
                     // signal thread to enter monitor again, it should block
                     signal.countDown();
                     await(thread, Thread.State.BLOCKED);
+                    if (doLog) {
+                        System.out.println(Instant.now() + " => at depth: " + (depth - depthRemaining));
+                    }
                     testContendedEnter(depthRemaining - 1);
                 }
             } finally {
                 thread.join();
             }
         }
+        if (doLog) {
+            System.out.println(Instant.now() + " => returning from depth: " + (depth - depthRemaining));
+        }
     }
 
     /**

From 87c2091cd08e58304d0909ffaf9402ca2f0c3b7f Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Wed, 5 Nov 2025 00:25:16 +0000
Subject: [PATCH 029/512] 8371141: Shenandoah: Many test timeouts with
 -XX:-UseTLAB

Reviewed-by: xpeng, ysr, wkemper
---
 test/hotspot/jtreg/ProblemList.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 2065737c2a1..0b9630e9434 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -94,6 +94,9 @@ gc/TestAllocHumongousFragment.java#g1 8298781 generic-all
 gc/TestAllocHumongousFragment.java#static 8298781 generic-all
 gc/shenandoah/oom/TestAllocOutOfMemory.java#large 8344312 linux-ppc64le
 gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
+gc/shenandoah/TestRetainObjects.java#no-tlab 8361099 generic-all
+gc/shenandoah/TestSieveObjects.java#no-tlab 8361099 generic-all
+gc/shenandoah/TestSieveObjects.java#no-tlab-genshen 8361099 generic-all
 
 #############################################################################
 

From 4e6cadf4550c58b3ff97dfa0cead4b5b1399324c Mon Sep 17 00:00:00 2001
From: erifan <erfang@nvidia.com>
Date: Wed, 5 Nov 2025 02:19:29 +0000
Subject: [PATCH 030/512] 8369456: [TESTBUG] Fix the test failure of
 TestSelectFromTwoVectorOp.java on sve2 platforms

Reviewed-by: epeter, bkilambi, xgong, haosun
---
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp |   5 +-
 src/hotspot/cpu/x86/x86.ad                    |   2 +-
 .../vectorapi/TestSelectFromTwoVectorOp.java  | 130 +++++++++++++++---
 3 files changed, 115 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 328ef0c53e6..5f71222ed88 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -2722,9 +2722,8 @@ void C2_MacroAssembler::select_from_two_vectors(FloatRegister dst, FloatRegister
   assert_different_registers(dst, src1, src2, index, tmp);
 
   // The cases that can reach this method are -
-  // - UseSVE = 0, vector_length_in_bytes = 8 or 16
-  // - UseSVE = 1, vector_length_in_bytes = 8 or 16
-  // - UseSVE = 2, vector_length_in_bytes >= 8
+  // - UseSVE = 0/1, vector_length_in_bytes = 8 or 16, excluding double and long types
+  // - UseSVE = 2, vector_length_in_bytes >= 8, for all types
   //
   // SVE/SVE2 tbl instructions are generated when UseSVE = 1 with vector_length_in_bytes = 8
   // and UseSVE = 2 with vector_length_in_bytes >= 8
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 2f19e76baf2..064c52e658b 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -3467,7 +3467,7 @@ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
        if (size_in_bits < 128) {
          return false;
        }
-       if ((size_in_bits < 512 && !VM_Version::supports_avx512vl())) {
+       if (size_in_bits < 512 && !VM_Version::supports_avx512vl()) {
          return false;
        }
        if (bt == T_SHORT && !VM_Version::supports_avx512bw()) {
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestSelectFromTwoVectorOp.java b/test/hotspot/jtreg/compiler/vectorapi/TestSelectFromTwoVectorOp.java
index 3746578266c..1320b888ee6 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestSelectFromTwoVectorOp.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestSelectFromTwoVectorOp.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2025, Arm Limited. All rights reserved.
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,8 +186,14 @@ public class TestSelectFromTwoVectorOp {
 
     @Test
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_16, ">0"},
-        applyIfCPUFeature = {"asimd", "true"},
+        applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_16, ">0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_16, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_16, ">0"},
         applyIfCPUFeatureAnd = {"avx512_vbmi", "true", "avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=16"})
@@ -200,7 +207,10 @@ public class TestSelectFromTwoVectorOp {
         applyIf = {"MaxVectorSize", ">=32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_32, ">0"},
         applyIfCPUFeature = {"sve2", "true"},
-        applyIf = {"MaxVectorSize", ">=32"})
+        applyIf = {"MaxVectorSize", "32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_32, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_32, ">0"},
         applyIfCPUFeatureAnd = {"avx512_vbmi", "true", "avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=32"})
@@ -214,7 +224,10 @@ public class TestSelectFromTwoVectorOp {
         applyIf = {"MaxVectorSize", ">=64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_64, ">0"},
         applyIfCPUFeature = {"sve2", "true"},
-        applyIf = {"MaxVectorSize", ">=64"})
+        applyIf = {"MaxVectorSize", "64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_64, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_64, ">0"},
         applyIfCPUFeatureAnd = {"avx512_vbmi", "true", "avx512f", "true"},
         applyIf = {"MaxVectorSize", ">=64"})
@@ -248,7 +261,10 @@ public class TestSelectFromTwoVectorOp {
         applyIf = {"MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_8, ">0"},
         applyIfCPUFeature = {"sve2", "true"},
-        applyIf = {"MaxVectorSize", ">=16"})
+        applyIf = {"MaxVectorSize", "16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_8, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_8, ">0"},
         applyIfCPUFeatureAnd = {"avx512bw", "true", "avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=16"})
@@ -262,7 +278,10 @@ public class TestSelectFromTwoVectorOp {
         applyIf = {"MaxVectorSize", ">=32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_16, ">0"},
         applyIfCPUFeature = {"sve2", "true"},
-        applyIf = {"MaxVectorSize", ">=32"})
+        applyIf = {"MaxVectorSize", "32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_16, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_16, ">0"},
         applyIfCPUFeatureAnd = {"avx512bw", "true", "avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=32"})
@@ -276,7 +295,10 @@ public class TestSelectFromTwoVectorOp {
         applyIf = {"MaxVectorSize", ">=64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_32, ">0"},
         applyIfCPUFeature = {"sve2", "true"},
-        applyIf = {"MaxVectorSize", ">=64"})
+        applyIf = {"MaxVectorSize", "64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_32, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_32, ">0"},
         applyIfCPUFeatureAnd = {"avx512bw", "true", "avx512f", "true"},
         applyIf = {"MaxVectorSize", ">=64"})
@@ -309,7 +331,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_4, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_4, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_4, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=16"})
     public static void selectFromTwoVector_Int128() {
         IntSelectFromTwoVectorKernel(IntVector.SPECIES_128, ia, ib, iindex[1]);
@@ -320,7 +348,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_8, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_8, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_8, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=32"})
     public static void selectFromTwoVector_Int256() {
         IntSelectFromTwoVectorKernel(IntVector.SPECIES_256, ia, ib, iindex[2]);
@@ -331,7 +365,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_16, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512f", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_16, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VI, IRNode.VECTOR_SIZE_16, ">0"},
+        applyIfCPUFeature = {"avx512f", "true"},
         applyIf = {"MaxVectorSize", ">=64"})
     public static void selectFromTwoVector_Int512() {
         IntSelectFromTwoVectorKernel(IntVector.SPECIES_512, ia, ib, iindex[3]);
@@ -362,7 +402,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_4, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_4, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_4, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=16"})
     public static void selectFromTwoVector_Float128() {
         FloatSelectFromTwoVectorKernel(FloatVector.SPECIES_128, fa, fb, findex[1]);
@@ -373,7 +419,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_8, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_8, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_8, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=32"})
     public static void selectFromTwoVector_Float256() {
         FloatSelectFromTwoVectorKernel(FloatVector.SPECIES_256, fa, fb, findex[2]);
@@ -384,7 +436,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_16, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512f", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_16, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VF, IRNode.VECTOR_SIZE_16, ">0"},
+        applyIfCPUFeature = {"avx512f", "true"},
         applyIf = {"MaxVectorSize", ">=64"})
     public static void selectFromTwoVector_Float512() {
         FloatSelectFromTwoVectorKernel(FloatVector.SPECIES_512, fa, fb, findex[3]);
@@ -407,7 +465,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_2, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_2, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_2, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=16"})
     public static void selectFromTwoVector_Double128() {
         DoubleSelectFromTwoVectorKernel(DoubleVector.SPECIES_128, da, db, dindex[0]);
@@ -418,7 +482,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_4, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_4, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_4, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=32"})
     public static void selectFromTwoVector_Double256() {
         DoubleSelectFromTwoVectorKernel(DoubleVector.SPECIES_256, da, db, dindex[1]);
@@ -429,7 +499,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_8, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512f", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_8, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VD, IRNode.VECTOR_SIZE_8, ">0"},
+        applyIfCPUFeature = {"avx512f", "true"},
         applyIf = {"MaxVectorSize", ">=64"})
     public static void selectFromTwoVector_Double512() {
         DoubleSelectFromTwoVectorKernel(DoubleVector.SPECIES_512, da, db, dindex[2]);
@@ -452,7 +528,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_2, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_2, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">16"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_2, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=16"})
     public static void selectFromTwoVector_Long128() {
         LongSelectFromTwoVectorKernel(LongVector.SPECIES_128, la, lb, lindex[0]);
@@ -463,7 +545,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=32"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_4, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512vl", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_4, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">32"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_4, ">0"},
+        applyIfCPUFeature = {"avx512vl", "true"},
         applyIf = {"MaxVectorSize", ">=32"})
     public static void selectFromTwoVector_Long256() {
         LongSelectFromTwoVectorKernel(LongVector.SPECIES_256, la, lb, lindex[1]);
@@ -474,7 +562,13 @@ public class TestSelectFromTwoVectorOp {
         applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"},
         applyIf = {"MaxVectorSize", ">=64"})
     @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_8, ">0"},
-        applyIfCPUFeatureOr = {"sve2", "true", "avx512f", "true"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", "64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_8, "0"},
+        applyIfCPUFeature = {"sve2", "true"},
+        applyIf = {"MaxVectorSize", ">64"})
+    @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VL, IRNode.VECTOR_SIZE_8, ">0"},
+        applyIfCPUFeature = {"avx512f", "true"},
         applyIf = {"MaxVectorSize", ">=64"})
     public static void selectFromTwoVector_Long512() {
         LongSelectFromTwoVectorKernel(LongVector.SPECIES_512, la, lb, lindex[2]);

From d89c6a77f2bf3e0f820f8f631d82d5bec1b02399 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 5 Nov 2025 03:25:40 +0000
Subject: [PATCH 031/512] 8371304: mismatch in file name and class name for
 ByteInterleavedRasterOffsetsTest.java

Reviewed-by: psadhukhan
---
 test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java b/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java
index ec077c45ff1..59bc20789b6 100644
--- a/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java
+++ b/test/jdk/java/awt/image/ByteInterleavedRasterOffsetsTest.java
@@ -36,7 +36,7 @@ import java.awt.image.WritableRaster;
  * @summary Verify DataBuffer offsets are handled by ByteInterleavedRaster
  */
 
-public class ByteInterleavedOffsetsTest {
+public class ByteInterleavedRasterOffsetsTest {
 
     public static void main(String[] args) {
         byte[] data = { 0, -1, 0, 0 }; // only set the R sample.

From 8b536b5428d5bf087dc71f3559c3978b13acad16 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 5 Nov 2025 05:44:09 +0000
Subject: [PATCH 032/512] 8369489: Marker annotation on inner class access
 crashes javac compiler

Reviewed-by: vromero
---
 .../sun/tools/javac/parser/JavacParser.java   |  12 +-
 .../com/sun/tools/javac/tree/TreeInfo.java    |  22 +-
 .../TypeAnnosOnMemberReferenceTest.java       | 190 ++++++++++++++++++
 .../tools/javac/parser/JavacParserTest.java   |  29 ++-
 4 files changed, 244 insertions(+), 9 deletions(-)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnosOnMemberReferenceTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 098fbaf59f5..d3539b53541 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -1542,7 +1542,17 @@ public class JavacParser implements Parser {
                 switch (expr.getTag()) {
                 case REFERENCE: {
                     JCMemberReference mref = (JCMemberReference) expr;
-                    mref.expr = toP(F.at(pos).AnnotatedType(typeAnnos, mref.expr));
+                    if (TreeInfo.isType(mref.expr, names)) {
+                        mref.expr = insertAnnotationsToMostInner(mref.expr, typeAnnos, false);
+                    } else {
+                        //the selector is not a type, error recovery:
+                        JCAnnotatedType annotatedType =
+                                toP(F.at(pos).AnnotatedType(typeAnnos, mref.expr));
+                        int termStart = getStartPos(mref.expr);
+                        mref.expr = syntaxError(termStart, List.of(annotatedType),
+                                                Errors.IllegalStartOfType);
+                    }
+                    mref.pos = getStartPos(mref.expr);
                     t = mref;
                     break;
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index a66dcaad851..af823024fab 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -437,6 +437,19 @@ public class TreeInfo {
      * Return true if the AST corresponds to a static select of the kind A.B
      */
     public static boolean isStaticSelector(JCTree base, Names names) {
+        return isTypeSelector(base, names, TreeInfo::isStaticSym);
+    }
+    //where
+        private static boolean isStaticSym(JCTree tree) {
+            Symbol sym = symbol(tree);
+            return (sym.kind == TYP || sym.kind == PCK);
+        }
+
+    public static boolean isType(JCTree base, Names names) {
+        return isTypeSelector(base, names, _ -> true);
+    }
+
+    private static boolean isTypeSelector(JCTree base, Names names, Predicate<JCTree> checkStaticSym) {
         if (base == null)
             return false;
         switch (base.getTag()) {
@@ -444,9 +457,9 @@ public class TreeInfo {
                 JCIdent id = (JCIdent)base;
                 return id.name != names._this &&
                         id.name != names._super &&
-                        isStaticSym(base);
+                        checkStaticSym.test(base);
             case SELECT:
-                return isStaticSym(base) &&
+                return checkStaticSym.test(base) &&
                     isStaticSelector(((JCFieldAccess)base).selected, names);
             case TYPEAPPLY:
             case TYPEARRAY:
@@ -457,11 +470,6 @@ public class TreeInfo {
                 return false;
         }
     }
-    //where
-        private static boolean isStaticSym(JCTree tree) {
-            Symbol sym = symbol(tree);
-            return (sym.kind == TYP || sym.kind == PCK);
-        }
 
     /** Return true if a tree represents the null literal. */
     public static boolean isNull(JCTree tree) {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnosOnMemberReferenceTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnosOnMemberReferenceTest.java
new file mode 100644
index 00000000000..002b8d5bcb1
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnosOnMemberReferenceTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8369489
+ * @summary Verify annotations on member references work reasonably.
+ * @library /tools/lib /tools/javac/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run junit TypeAnnosOnMemberReferenceTest
+ */
+
+import com.sun.source.tree.IdentifierTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.util.TreePath;
+import com.sun.source.util.TreeScanner;
+import com.sun.source.util.Trees;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.util.ElementFilter;
+
+import org.junit.jupiter.api.Test;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class TypeAnnosOnMemberReferenceTest {
+    private ToolBox tb = new ToolBox();
+
+    @Test
+    public void testAnnoOnMemberRef() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        tb.writeJavaFiles(src,
+                """
+                import java.lang.annotation.Target;
+                import java.lang.annotation.ElementType;
+                import java.lang.annotation.Retention;
+                import java.lang.annotation.RetentionPolicy;
+
+                public class Test {
+                    interface I {
+                        void foo(int i);
+                    }
+
+                    @Target(ElementType.TYPE_USE)
+                    @interface Ann1 {}
+                    @Target(ElementType.TYPE_USE)
+                    @interface Ann2 {}
+                    I i = @Ann1 Test @Ann2 []::new;
+                }
+                """);
+
+        Path classDir = getClassDir();
+        new JavacTask(tb)
+                .classpath(classDir)
+                .outdir(classes)
+                .options("-processor", VerifyAnnotations.class.getName())
+                .files(tb.findJavaFiles(src))
+                .outdir(classes)
+                .run(Task.Expect.SUCCESS);
+    }
+
+    public Path getClassDir() {
+        String classes = ToolBox.testClasses;
+        if (classes == null) {
+            return Paths.get("build");
+        } else {
+            return Paths.get(classes);
+        }
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static final class VerifyAnnotations extends AbstractProcessor {
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latestSupported();
+        }
+
+        @Override
+        public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+            TypeElement testElement = processingEnv.getElementUtils().getTypeElement("Test");
+            VariableElement iElement = ElementFilter.fieldsIn(testElement.getEnclosedElements()).getFirst();
+            Trees trees = Trees.instance(processingEnv);
+            TreePath iPath = trees.getPath(iElement);
+            StringBuilder text = new StringBuilder();
+            new TreeScanner<>() {
+                int ident = 0;
+                @Override
+                public Object scan(Tree tree, Object p) {
+                    if (tree != null) {
+                        String indent =
+                                Stream.generate(() -> " ")
+                                      .limit(ident)
+                                      .collect(Collectors.joining());
+
+                        text.append("\n")
+                            .append(indent)
+                            .append("(")
+                            .append(tree.getKind());
+                        ident += 4;
+                        super.scan(tree, p);
+                        ident -= 4;
+                        text.append("\n")
+                            .append(indent)
+                            .append(")");
+                    }
+                    return null;
+                }
+
+                @Override
+                public Object visitIdentifier(IdentifierTree node, Object p) {
+                    text.append(" ").append(node.getName());
+                    return super.visitIdentifier(node, p);
+                }
+            }.scan(((VariableTree) iPath.getLeaf()).getInitializer(), null);
+            String expected =
+                    """
+
+                    (MEMBER_REFERENCE
+                        (ANNOTATED_TYPE
+                            (TYPE_ANNOTATION
+                                (IDENTIFIER Ann2
+                                )
+                            )
+                            (ARRAY_TYPE
+                                (ANNOTATED_TYPE
+                                    (TYPE_ANNOTATION
+                                        (IDENTIFIER Ann1
+                                        )
+                                    )
+                                    (IDENTIFIER Test
+                                    )
+                                )
+                            )
+                        )
+                    )""";
+
+            String actual = text.toString();
+
+            if (!expected.equals(actual)) {
+                throw new AssertionError("Expected: " + expected + "," +
+                                         "got: " + actual);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/parser/JavacParserTest.java b/test/langtools/tools/javac/parser/JavacParserTest.java
index 58d60d80ca9..25aeb19f1bb 100644
--- a/test/langtools/tools/javac/parser/JavacParserTest.java
+++ b/test/langtools/tools/javac/parser/JavacParserTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041 8253584 8246774 8256411 8256149 8259050 8266436 8267221 8271928 8275097 8293897 8295401 8304671 8310326 8312093 8312204 8315452 8337976 8324859 8344706 8351260 8370865
+ * @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041 8253584 8246774 8256411 8256149 8259050 8266436 8267221 8271928 8275097 8293897 8295401 8304671 8310326 8312093 8312204 8315452 8337976 8324859 8344706 8351260 8370865 8369489
  * @summary tests error and diagnostics positions
  * @author  Jan Lahoda
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -3124,6 +3124,33 @@ public class JavacParserTest extends TestCase {
                      codes);
     }
 
+    @Test //JDK-8369489
+    void testTypeAnnotationBrokenMethodRef() throws IOException {
+        String code = """
+                      public class Test {
+                          Object o1 = @Ann any()::test;
+                          Object o2 = @Ann any().field::test;
+                      }
+                      """;
+        DiagnosticCollector<JavaFileObject> coll =
+                new DiagnosticCollector<>();
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll,
+                null,
+                null, Arrays.asList(new MyFileObject(code)));
+        //no exceptions:
+        ct.parse().iterator().next();
+        List<String> codes = new LinkedList<>();
+
+        for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) {
+            codes.add(d.getLineNumber() + ":" + d.getColumnNumber() + ":" + d.getCode());
+        }
+
+        assertEquals("testTypeAnnotationBrokenMethodRef: " + codes,
+                     List.of("2:22:compiler.err.illegal.start.of.type",
+                             "3:22:compiler.err.illegal.start.of.type"),
+                     codes);
+    }
+
     void run(String[] args) throws Exception {
         int passed = 0, failed = 0;
         final Pattern p = (args != null && args.length > 0)

From a0e70c4e9489fc3d8f35c3aec9423fe0839ed0bd Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Wed, 5 Nov 2025 06:23:26 +0000
Subject: [PATCH 033/512] 8370175: State engine terminates when throwing
 self-caused exception

Reviewed-by: jlahoda, fandreuzzi
---
 .../execution/DirectExecutionControl.java     | 23 +++++++++++++++----
 test/langtools/jdk/jshell/ExceptionsTest.java | 12 +++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
index 1c40aa03e5f..b9424f762a5 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,9 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Set;
 import java.util.stream.IntStream;
 import jdk.jshell.spi.ExecutionControl;
 import jdk.jshell.spi.SPIResolutionException;
@@ -335,10 +338,15 @@ public class DirectExecutionControl implements ExecutionControl {
      * @throws ExecutionControl.InternalException for internal problems
      */
     protected String throwConvertedInvocationException(Throwable cause) throws RunException, InternalException {
-        throw asRunException(cause);
+        // Guard against recursive cause chains by
+        // using a Set with identity equality semantics.
+        Set<Throwable> dejaVu = Collections.newSetFromMap(new IdentityHashMap<>());
+        dejaVu.add(cause);
+
+        throw asRunException(cause, dejaVu);
     }
 
-    private RunException asRunException(Throwable ex) {
+    private RunException asRunException(Throwable ex, Set<Throwable> dejaVu) {
         if (ex instanceof SPIResolutionException) {
             SPIResolutionException spire = (SPIResolutionException) ex;
             return new ResolutionException(spire.id(), spire.getStackTrace());
@@ -347,7 +355,14 @@ public class DirectExecutionControl implements ExecutionControl {
                     ex.getClass().getName(),
                     ex.getStackTrace());
             Throwable cause = ex.getCause();
-            ue.initCause(cause == null ? null : asRunException(cause));
+            if (cause != null) {
+                Throwable throwable = dejaVu.add(cause)
+                        ? asRunException(cause, dejaVu)
+                        : new UserException("CIRCULAR REFERENCE!",
+                            cause.getClass().getName(),
+                            cause.getStackTrace());
+                ue.initCause(throwable);
+            }
             return ue;
         }
     }
diff --git a/test/langtools/jdk/jshell/ExceptionsTest.java b/test/langtools/jdk/jshell/ExceptionsTest.java
index f7273b2a6fc..6cca962acde 100644
--- a/test/langtools/jdk/jshell/ExceptionsTest.java
+++ b/test/langtools/jdk/jshell/ExceptionsTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests for exceptions
- * @bug 8198801 8212167 8210527
+ * @bug 8198801 8212167 8210527 8370175
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
@@ -320,6 +320,16 @@ public class ExceptionsTest extends KullaTesting {
         assertExecuteException("f();", StackOverflowError.class);
     }
 
+    @Test
+    public void recursiveCauses() {
+        assertEval("var one = new Throwable();");
+        assertEval("var two = new Error();");
+        assertEval("one.initCause(two);");
+        assertEval("two.initCause(one);");
+        assertExecuteException("throw one;", Throwable.class);
+        assertExecuteException("throw two;", Error.class);
+    }
+
     private StackTraceElement newStackTraceElement(String className, String methodName, Snippet key, int lineNumber) {
         return new StackTraceElement(className, methodName, "#" + key.id(), lineNumber);
     }

From dddfcd03aa30514d63eceff707d48bff35e93c56 Mon Sep 17 00:00:00 2001
From: Kerem Kat <krk@openjdk.org>
Date: Wed, 5 Nov 2025 08:33:14 +0000
Subject: [PATCH 034/512] 8334866: Improve Speed of ElfDecoder source search

Reviewed-by: shade, chagedorn
---
 src/hotspot/share/utilities/elfFile.cpp | 148 +++++++++++++++++++++++-
 src/hotspot/share/utilities/elfFile.hpp |  90 ++++++++++++--
 2 files changed, 225 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/utilities/elfFile.cpp b/src/hotspot/share/utilities/elfFile.cpp
index e3cbb5ac18e..9ea19b38276 100644
--- a/src/hotspot/share/utilities/elfFile.cpp
+++ b/src/hotspot/share/utilities/elfFile.cpp
@@ -684,9 +684,8 @@ bool ElfFile::create_new_dwarf_file(const char* filepath) {
 // Starting point of reading line number and filename information from the DWARF file.
 bool DwarfFile::get_filename_and_line_number(const uint32_t offset_in_library, char* filename, const size_t filename_len,
                                              int* line, const bool is_pc_after_call) {
-  DebugAranges debug_aranges(this);
   uint32_t compilation_unit_offset = 0; // 4-bytes for 32-bit DWARF
-  if (!debug_aranges.find_compilation_unit_offset(offset_in_library, &compilation_unit_offset)) {
+  if (!_debug_aranges.find_compilation_unit_offset(offset_in_library, &compilation_unit_offset)) {
     DWARF_LOG_ERROR("Failed to find .debug_info offset for the compilation unit.");
     return false;
   }
@@ -708,11 +707,87 @@ bool DwarfFile::get_filename_and_line_number(const uint32_t offset_in_library, c
   return true;
 }
 
+// Build sorted cache of all address ranges for binary search.
+DwarfFile::DebugAranges::CacheHint DwarfFile::DebugAranges::ensure_cached() {
+  if (_cache._failed) {
+    return CacheHint::FAILED;
+  }
+  if (_cache._initialized) {
+    return CacheHint::VALID;
+  }
+
+  assert(_cache._capacity == 0, "need fresh cache");
+  assert(_cache._count == 0, "need fresh cache");
+  const long pos = _reader.get_position();
+  if (!read_section_header()) {
+    _cache.destroy(true);
+    return CacheHint::FAILED;
+  }
+
+  // Start with reasonable initial capacity to minimize number of grow/realloc calls.
+  // Assume ~3% of the .debug_aranges is DebugArangesSetHeader and the rest is made up of AddressDescriptors.
+  const uintptr_t estimated_set_header_size = _size_bytes / 32;
+  const size_t initial_capacity = (_size_bytes - estimated_set_header_size) / sizeof(AddressDescriptor);
+  _cache._entries = NEW_C_HEAP_ARRAY_RETURN_NULL(ArangesEntry, initial_capacity, mtInternal);
+  if (_cache._entries == nullptr) {
+    _cache.destroy(true);
+    _reader.set_position(pos);
+    return CacheHint::TRY_LINEAR_SCAN;
+  }
+  _cache._capacity = initial_capacity;
+  _cache._count = 0;
+
+  // Read all sets and their descriptors
+  while (_reader.has_bytes_left()) {
+    DebugArangesSetHeader set_header;
+    if (!read_set_header(set_header)) {
+      break;
+    }
+
+    // Read all address descriptors for this set into the cache.
+    AddressDescriptor descriptor;
+    do {
+      if (!read_address_descriptor(descriptor)) {
+        _cache.destroy(true);
+        return CacheHint::FAILED;
+      }
+      if (!is_terminating_entry(set_header, descriptor) && descriptor.range_length > 0 &&
+          !_cache.add_entry(descriptor, set_header._debug_info_offset)) {
+        _cache.destroy(true);
+        _reader.set_position(pos);
+        return CacheHint::TRY_LINEAR_SCAN;
+      }
+    } while (!is_terminating_entry(set_header, descriptor) && _reader.has_bytes_left());
+  }
+
+  if (_cache._count == 0) {
+    _cache.destroy(false);
+    // No entries found, unusual but still valid.
+    return CacheHint::VALID;
+  }
+  _cache.sort();
+  _cache._initialized = true;
+  DWARF_LOG_INFO("Built .debug_aranges cache for '%s' with %zu entries", this->_dwarf_file->filepath(), _cache._count);
+  return CacheHint::VALID;
+}
+
 // (2) The .debug_aranges section contains a number of entries/sets. Each set contains one or multiple address range descriptors of the
 // form [beginning_address, beginning_address+length). Start reading these sets and their descriptors until we find one that contains
 // 'offset_in_library'. Read the debug_info_offset field from the header of this set which defines the offset for the compilation unit.
 // This process is described in section 6.1.2 of the DWARF 4 spec.
 bool DwarfFile::DebugAranges::find_compilation_unit_offset(const uint32_t offset_in_library, uint32_t* compilation_unit_offset) {
+  switch (ensure_cached()) {
+    case CacheHint::VALID:
+      return _cache.find_compilation_unit_offset(offset_in_library, compilation_unit_offset);
+    case CacheHint::TRY_LINEAR_SCAN:
+      break;
+    case CacheHint::FAILED:
+      return false;
+  }
+
+  // Fall back to linear scan if building of the cache failed, which can happen
+  // if there are C heap allocation errors.
+  DWARF_LOG_INFO("Falling back to linear scan of .debug_aranges for '%s'", _dwarf_file->filepath());
   if (!read_section_header()) {
     DWARF_LOG_ERROR("Failed to read a .debug_aranges header.");
     return false;
@@ -750,6 +825,7 @@ bool DwarfFile::DebugAranges::read_section_header() {
   }
 
   _section_start_address = shdr.sh_offset;
+  _size_bytes = shdr.sh_size;
   _reader.set_max_pos(shdr.sh_offset + shdr.sh_size);
   return _reader.set_position(shdr.sh_offset);
 }
@@ -829,6 +905,74 @@ bool DwarfFile::DebugAranges::is_terminating_entry(const DwarfFile::DebugAranges
   return is_terminating;
 }
 
+// Sort entries by beginning_address, when same then sort longest range first.
+int DwarfFile::ArangesCache::compare_aranges_entries(const ArangesEntry& a, const ArangesEntry& b) {
+  if (a.beginning_address < b.beginning_address) {
+    return -1;
+  } else if (a.beginning_address > b.beginning_address) {
+    return 1;
+  }
+
+  uintptr_t len_a = a.end_address - a.beginning_address;
+  uintptr_t len_b = b.end_address - b.beginning_address;
+  if (len_a < len_b) {
+    return 1;
+  } else if (len_a > len_b) {
+    return -1;
+  }
+  return 0;
+}
+
+void DwarfFile::ArangesCache::sort() {
+  QuickSort::sort(_entries, _count, compare_aranges_entries);
+}
+
+bool DwarfFile::ArangesCache::add_entry(const AddressDescriptor& descriptor, uint32_t debug_info_offset) {
+  if (_count >= _capacity && !grow()) {
+    return false;
+  }
+  _entries[_count] = ArangesEntry(
+    descriptor.beginning_address,
+    descriptor.beginning_address + descriptor.range_length,
+    debug_info_offset
+  );
+  _count++;
+  return true;
+}
+
+bool DwarfFile::ArangesCache::grow() {
+  size_t new_capacity = _capacity == 0 ? 128 : _capacity * 1.5;
+  ArangesEntry* new_entries = REALLOC_C_HEAP_ARRAY_RETURN_NULL(ArangesEntry, _entries, new_capacity, mtInternal);
+  if (new_entries == nullptr) {
+    return false;
+  }
+  _entries = new_entries;
+  _capacity = new_capacity;
+  return true;
+}
+
+bool DwarfFile::ArangesCache::find_compilation_unit_offset(uint32_t offset_in_library, uint32_t* compilation_unit_offset) const {
+  if (!_initialized || _entries == nullptr || _count == 0) {
+    return false;
+  }
+
+  size_t left = 0;
+  size_t right = _count;
+  while (left < right) {
+    size_t mid = left + (right - left) / 2;
+    const ArangesEntry& entry = _entries[mid];
+    if (offset_in_library < entry.beginning_address) {
+      right = mid;
+    } else if (offset_in_library >= entry.end_address) {
+      left = mid + 1;
+    } else {
+      *compilation_unit_offset = entry.debug_info_offset;
+      return true;
+    }
+  }
+  return false;
+}
+
 // Find the .debug_line offset for the line number program by reading from the .debug_abbrev and .debug_info section.
 bool DwarfFile::CompilationUnit::find_debug_line_offset(uint32_t* debug_line_offset) {
   // (3a,b)
diff --git a/src/hotspot/share/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp
index 979fac5edfc..1298892533e 100644
--- a/src/hotspot/share/utilities/elfFile.hpp
+++ b/src/hotspot/share/utilities/elfFile.hpp
@@ -72,6 +72,7 @@ typedef Elf32_Sym       Elf_Sym;
 #include "memory/allocation.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/decoder.hpp"
+#include "utilities/quickSort.hpp"
 
 #ifdef ASSERT
 // Helper macros to print different log levels during DWARF parsing
@@ -94,10 +95,10 @@ typedef Elf32_Sym       Elf_Sym;
 #define DWARF_LOG_TRACE(format, ...)
 #endif
 
+class DwarfFile;
+class ElfFuncDescTable;
 class ElfStringTable;
 class ElfSymbolTable;
-class ElfFuncDescTable;
-class DwarfFile;
 
 // ELF section, may or may not have cached data
 class ElfSection {
@@ -201,6 +202,7 @@ class ElfFile: public CHeapObj<mtInternal> {
 
   bool get_source_info(uint32_t offset_in_library, char* filename, size_t filename_len, int* line, bool is_pc_after_call);
 
+  DEBUG_ONLY(const char* filepath() const { return _filepath; })
  private:
   // sanity check, if the file is a real elf file
   static bool is_elf_file(Elf_Ehdr&);
@@ -397,7 +399,6 @@ class ElfFile: public CHeapObj<mtInternal> {
  *    - Complete information about intermediate states/results when parsing the DWARF file.
  */
 class DwarfFile : public ElfFile {
-
   static constexpr uint8_t ADDRESS_SIZE = NOT_LP64(4) LP64_ONLY(8);
   // We only support 32-bit DWARF (emitted by GCC) which uses 32-bit values for DWARF section lengths and offsets
   // relative to the beginning of a section.
@@ -435,6 +436,63 @@ class DwarfFile : public ElfFile {
     bool read_non_null_char(char* result);
   };
 
+  // Address descriptor defining a range that is covered by a compilation unit. It is defined in section 6.1.2 after
+  // the set header in the DWARF 4 spec.
+  struct AddressDescriptor {
+    uintptr_t beginning_address = 0;
+    uintptr_t range_length = 0;
+  };
+
+  // Entry in ArangesCache, corresponding to an entry in .debug_aranges section.
+  struct ArangesEntry {
+    uintptr_t beginning_address;
+    uintptr_t end_address;
+    uint32_t debug_info_offset;
+
+    ArangesEntry() : beginning_address(0), end_address(0), debug_info_offset(0) {}
+    ArangesEntry(uintptr_t begin, uintptr_t end, uint32_t offset)
+    : beginning_address(begin), end_address(end), debug_info_offset(offset) {}
+  };
+
+  // Cache for .debug_aranges to enable binary search for address lookup.
+  // DebugAranges uses this cache to resolve the compilation_unit_offset, rather than doing a linear scan on the files
+  // in each invocation of DebugAranges::find_compilation_unit_offset.
+  struct ArangesCache {
+    ArangesEntry* _entries;
+    size_t _count;
+    size_t _capacity;
+    bool _initialized;
+    bool _failed;
+
+    ArangesCache() : _entries(nullptr), _count(0), _capacity(0), _initialized(false), _failed(false) {}
+    ArangesCache(const ArangesCache&) = delete;
+    ArangesCache& operator=(const ArangesCache&) = delete;
+    ~ArangesCache() {
+      this->free();
+    }
+
+    void destroy(bool failed) {
+      this->free();
+      _count = 0;
+      _capacity = 0;
+      _failed = failed;
+    }
+    bool find_compilation_unit_offset(uint32_t offset_in_library, uint32_t* compilation_unit_offset) const;
+    bool valid() const { return _initialized && !_failed; }
+    bool add_entry(const AddressDescriptor& descriptor, uint32_t debug_info_offset);
+    void sort();
+
+   private:
+    static int compare_aranges_entries(const ArangesEntry& a, const ArangesEntry& b);
+    bool grow();
+    void free() {
+      if (_entries != nullptr) {
+        FREE_C_HEAP_ARRAY(ArangesEntry, _entries);
+        _entries = nullptr;
+      }
+    }
+  };
+
   // (2) Processing the .debug_aranges section to find the compilation unit which covers offset_in_library.
   // This is specified in section 6.1.2 of the DWARF 4 spec.
   //
@@ -475,16 +533,22 @@ class DwarfFile : public ElfFile {
       uint8_t _segment_size;
     };
 
-    // Address descriptor defining a range that is covered by a compilation unit. It is defined in section 6.1.2 after
-    // the set header in the DWARF 4 spec.
-    struct AddressDescriptor {
-      uintptr_t beginning_address = 0;
-      uintptr_t range_length = 0;
+    enum class CacheHint {
+      // Do not retry as linear scan won't be able to read this either.
+      FAILED,
+
+      // Cache is usable, no need to fall back to linear scan.
+      VALID,
+
+      // Cache is unusable, possible reasons are C heap allocation failures. Fall back to linear scan.
+      TRY_LINEAR_SCAN,
     };
 
     DwarfFile* _dwarf_file;
+    ArangesCache _cache;
     MarkedDwarfFileReader _reader;
     uintptr_t _section_start_address;
+    uintptr_t _size_bytes;
 
     // a calculated end position
     long _entry_end;
@@ -499,9 +563,9 @@ class DwarfFile : public ElfFile {
                               const AddressDescriptor& descriptor);
    public:
     DebugAranges(DwarfFile* dwarf_file) : _dwarf_file(dwarf_file), _reader(dwarf_file->fd()),
-                                          _section_start_address(0), _entry_end(0) {}
+                                          _section_start_address(0), _size_bytes(0), _entry_end(0) {}
     bool find_compilation_unit_offset(uint32_t offset_in_library, uint32_t* compilation_unit_offset);
-
+    CacheHint ensure_cached();
   };
 
   // (3a-c,e) The compilation unit is read from the .debug_info section. The structure of .debug_info is shown in the
@@ -884,7 +948,8 @@ class DwarfFile : public ElfFile {
   };
 
  public:
-  DwarfFile(const char* filepath) : ElfFile(filepath) {}
+  DwarfFile(const char* filepath) : ElfFile(filepath), _debug_aranges(this) {
+  }
 
   /*
    * Starting point of reading line number and filename information from the DWARF file.
@@ -897,6 +962,9 @@ class DwarfFile : public ElfFile {
    *  More details about the different phases can be found at the associated methods.
    */
   bool get_filename_and_line_number(uint32_t offset_in_library, char* filename, size_t filename_len, int* line, bool is_pc_after_call);
+
+ private:
+  DebugAranges _debug_aranges;
 };
 
 #endif // !_WINDOWS && !__APPLE__

From f5d8bd0dd50bcd963b4062997aecb4e15249e30d Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Wed, 5 Nov 2025 08:57:02 +0000
Subject: [PATCH 035/512] 8370874: [asan] ASAN build fails after JDK-8368365

Reviewed-by: haosun, dholmes, syan, stuefe
---
 src/hotspot/share/sanitizers/address.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/sanitizers/address.cpp b/src/hotspot/share/sanitizers/address.cpp
index b050039b1b8..7d129feab0a 100644
--- a/src/hotspot/share/sanitizers/address.cpp
+++ b/src/hotspot/share/sanitizers/address.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifdef ADDRESS_SANITIZER
 
 #include "logging/log.hpp"
+#include "runtime/globals_extension.hpp"
 #include "sanitizers/address.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/vmError.hpp"

From 0737a5625269773dcf70b95f8b8ac90b3b6cc444 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Wed, 5 Nov 2025 09:21:57 +0000
Subject: [PATCH 036/512] 8370708: RISC-V: Add VerifyStackAtCalls

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/riscv.ad                | 30 ++++++++++++++-----
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |  2 +-
 src/hotspot/share/opto/chaitin.cpp            |  2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 83c59af9113..4be408f6ca5 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1184,6 +1184,8 @@ bool is_CAS(int opcode, bool maybe_volatile)
   }
 }
 
+constexpr uint64_t MAJIK_DWORD = 0xabbaabbaabbaabbaull;
+
 // predicate controlling translation of CAS
 //
 // returns true if CAS needs to use an acquiring load otherwise false
@@ -1363,10 +1365,15 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
     st->print("# stack bang size=%d\n\t", framesize);
   }
 
-  st->print("sd  fp, [sp, #%d]\n\t", - 2 * wordSize);
-  st->print("sd  ra, [sp, #%d]\n\t", - wordSize);
-  if (PreserveFramePointer) { st->print("sub  fp, sp, #%d\n\t", 2 * wordSize); }
   st->print("sub sp, sp, #%d\n\t", framesize);
+  st->print("sd  fp, [sp, #%d]\n\t", framesize - 2 * wordSize);
+  st->print("sd  ra, [sp, #%d]\n\t", framesize - wordSize);
+  if (PreserveFramePointer) { st->print("add fp, sp, #%d\n\t", framesize); }
+
+  if (VerifyStackAtCalls) {
+    st->print("mv  t2, %ld\n\t", MAJIK_DWORD);
+    st->print("sd  t2, [sp, #%d]\n\t", framesize - 3 * wordSize);
+  }
 
   if (C->stub_function() == nullptr) {
     st->print("ld  t0, [guard]\n\t");
@@ -1408,6 +1415,11 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 
   __ build_frame(framesize);
 
+  if (VerifyStackAtCalls) {
+    __ mv(t2, MAJIK_DWORD);
+    __ sd(t2, Address(sp, framesize - 3 * wordSize));
+  }
+
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
     // Dummy labels for just measuring the code size
@@ -1429,10 +1441,6 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
     bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
   }
 
-  if (VerifyStackAtCalls) {
-    Unimplemented();
-  }
-
   C->output()->set_frame_complete(__ offset());
 
   if (C->has_mach_constant_base_node()) {
@@ -2431,7 +2439,13 @@ encode %{
   enc_class riscv_enc_call_epilog() %{
     if (VerifyStackAtCalls) {
       // Check that stack depth is unchanged: find majik cookie on stack
-      __ call_Unimplemented();
+      int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3 * VMRegImpl::slots_per_word));
+      Label stack_ok;
+      __ ld(t1, Address(sp, framesize));
+      __ mv(t2, MAJIK_DWORD);
+      __ beq(t2, t1, stack_ok);
+      __ stop("MAJIK_DWORD not found");
+      __ bind(stack_ok);
     }
   %}
 
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index b303178a666..e64fc2ffc80 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -2368,7 +2368,7 @@ void SharedRuntime::generate_deopt_blob() {
 // EPILOG must remove this many slots.
 // RISCV needs two words for RA (return address) and FP (frame pointer).
 uint SharedRuntime::in_preserve_stack_slots() {
-  return 2 * VMRegImpl::slots_per_word;
+  return 2 * VMRegImpl::slots_per_word + (VerifyStackAtCalls ? 0 : 2) ;
 }
 
 uint SharedRuntime::out_preserve_stack_slots() {
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 8c8c2b0ed4e..524dee6e06a 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -2408,7 +2408,7 @@ void PhaseChaitin::dump_frame() const {
         tty->print_cr("saved fp register");
       else if (return_addr == OptoReg::add(reg, 2*VMRegImpl::slots_per_word) &&
                VerifyStackAtCalls)
-        tty->print_cr("0xBADB100D   +VerifyStackAtCalls");
+        tty->print_cr("<Majik cookie>   +VerifyStackAtCalls");
       else
         tty->print_cr("in_preserve");
     } else if ((int)OptoReg::reg2stack(reg) < fixed_slots) {

From 6a51b51ba13167a15a637507a7fa5d6f988a39e7 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 5 Nov 2025 10:12:47 +0000
Subject: [PATCH 037/512] 8371197: G1: Use void for return type of
 G1RegionsOnNodes::add

Reviewed-by: tschatzl, iwalulya, fandreuzzi
---
 src/hotspot/share/gc/g1/g1EdenRegions.hpp     | 4 ++--
 src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp  | 5 +----
 src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp  | 4 ++--
 src/hotspot/share/gc/g1/g1SurvivorRegions.cpp | 4 ++--
 src/hotspot/share/gc/g1/g1SurvivorRegions.hpp | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
index c7ed9008ee7..a08cda97d4c 100644
--- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
@@ -41,10 +41,10 @@ private:
 public:
   G1EdenRegions() : _length(0), _used_bytes(0), _regions_on_node() { }
 
-  uint add(G1HeapRegion* hr) {
+  void add(G1HeapRegion* hr) {
     assert(hr->is_eden(), "must be");
     _length++;
-    return _regions_on_node.add(hr);
+    _regions_on_node.add(hr);
   }
 
   void clear() {
diff --git a/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp b/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp
index 91f6ee49095..c1c0d471796 100644
--- a/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionsOnNodes.cpp
@@ -35,16 +35,13 @@ G1RegionsOnNodes::~G1RegionsOnNodes() {
   FREE_C_HEAP_ARRAY(uint, _count_per_node);
 }
 
-uint G1RegionsOnNodes::add(G1HeapRegion* hr) {
+void G1RegionsOnNodes::add(G1HeapRegion* hr) {
   uint node_index = hr->node_index();
 
   // Update only if the node index is valid.
   if (node_index < _numa->num_active_nodes()) {
     *(_count_per_node + node_index) += 1;
-    return node_index;
   }
-
-  return G1NUMA::UnknownNodeIndex;
 }
 
 void G1RegionsOnNodes::clear() {
diff --git a/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp b/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
index d5318343399..5b8d6479833 100644
--- a/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
@@ -40,8 +40,8 @@ public:
 
   ~G1RegionsOnNodes();
 
-  // Increase _count_per_node for the node of given heap region and returns node index.
-  uint add(G1HeapRegion* hr);
+  // Increase _count_per_node for the node of given heap region.
+  void add(G1HeapRegion* hr);
 
   void clear();
 
diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
index 4aa752e5823..84609df4fc9 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
@@ -32,10 +32,10 @@ G1SurvivorRegions::G1SurvivorRegions() :
   _used_bytes(0),
   _regions_on_node() {}
 
-uint G1SurvivorRegions::add(G1HeapRegion* hr) {
+void G1SurvivorRegions::add(G1HeapRegion* hr) {
   assert(hr->is_survivor(), "should be flagged as survivor region");
   _regions.append(hr);
-  return _regions_on_node.add(hr);
+  _regions_on_node.add(hr);
 }
 
 uint G1SurvivorRegions::length() const {
diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
index 0532ee12162..65c20dfbf45 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
@@ -42,7 +42,7 @@ class G1SurvivorRegions {
 public:
   G1SurvivorRegions();
 
-  uint add(G1HeapRegion* hr);
+  void add(G1HeapRegion* hr);
 
   void convert_to_eden();
 

From 3e3822ad7eadbb3d86a3b94a6bd858f8c8ef9364 Mon Sep 17 00:00:00 2001
From: Ruben Ayrapetyan <ruben.ayrapetyan@arm.com>
Date: Wed, 5 Nov 2025 11:55:02 +0000
Subject: [PATCH 038/512] 8365047: Remove exception handler stub code in C2

Co-authored-by: Martin Doerr <mdoerr@openjdk.org>
Reviewed-by: mdoerr, dlong, dfenacci, adinn, fyang, aph
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  39 ++---
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |  12 +-
 .../cpu/aarch64/c1_LIRAssembler_aarch64.hpp   |   2 +-
 .../cpu/aarch64/nativeInst_aarch64.cpp        |   6 -
 .../cpu/aarch64/nativeInst_aarch64.hpp        |  22 ++-
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp   |   2 -
 src/hotspot/cpu/arm/arm.ad                    |  47 ++----
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |  10 +-
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp   |   2 +-
 src/hotspot/cpu/arm/runtime_arm.cpp           |   2 -
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |   7 +-
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp   |   2 +-
 src/hotspot/cpu/ppc/ppc.ad                    |  35 ++--
 src/hotspot/cpu/ppc/runtime_ppc.cpp           |   1 -
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  19 +--
 .../cpu/riscv/c1_LIRAssembler_riscv.cpp       |  12 +-
 .../cpu/riscv/c1_LIRAssembler_riscv.hpp       |   2 +-
 src/hotspot/cpu/riscv/riscv.ad                |  37 +---
 src/hotspot/cpu/riscv/runtime_riscv.cpp       |   2 -
 src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp |  15 +-
 src/hotspot/cpu/s390/runtime_s390.cpp         |   2 -
 src/hotspot/cpu/s390/s390.ad                  |  54 ++----
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |   6 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |  14 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp   |   2 +-
 src/hotspot/cpu/x86/runtime_x86_64.cpp        |   2 -
 src/hotspot/cpu/x86/x86.ad                    |  51 ++----
 src/hotspot/os/posix/signals_posix.cpp        |   2 +-
 src/hotspot/os/windows/os_windows.cpp         |   2 +-
 src/hotspot/share/ci/ciEnv.cpp                |   4 +-
 src/hotspot/share/code/nmethod.cpp            |  23 ++-
 src/hotspot/share/code/nmethod.hpp            |   4 +-
 src/hotspot/share/code/nmethod.inline.hpp     |   2 +-
 src/hotspot/share/opto/output.cpp             |   6 +-
 src/hotspot/share/runtime/deoptimization.cpp  |   3 +
 src/hotspot/share/runtime/frame.cpp           |   4 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   8 +
 src/hotspot/share/runtime/vmStructs.cpp       |   2 +-
 .../classes/sun/jvm/hotspot/code/NMethod.java |  28 +--
 .../sun/jvm/hotspot/runtime/Frame.java        |   2 +-
 .../jtreg/runtime/vthread/Deoptimization.java | 159 ++++++++++++++++++
 41 files changed, 354 insertions(+), 302 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/vthread/Deoptimization.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 5734519301e..1e506edb634 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1,6 +1,7 @@
 //
 // Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2014, 2024, Red Hat, Inc. All rights reserved.
+// Copyright 2025 Arm Limited and/or its affiliates.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -1194,15 +1195,10 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return MacroAssembler::far_codestub_branch_size();
-  }
-
   static uint size_deopt_handler() {
-    // count one adr and one far branch instruction
+    // count one branch instruction and one far call instruction sequence
     return NativeInstruction::instruction_size + MacroAssembler::far_codestub_branch_size();
   }
 };
@@ -2261,25 +2257,6 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 
 //=============================================================================
 
-// Emit exception handler code.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
-{
-  // mov rscratch1 #exception_blob_entry_point
-  // br rscratch1
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-  int offset = __ offset();
-  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-  __ end_a_stub();
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
@@ -2290,14 +2267,18 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
     ciEnv::current()->record_failure("CodeCache is full");
     return 0;  // CodeBuffer::expand failed
   }
-  int offset = __ offset();
 
-  __ adr(lr, __ pc());
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  int offset = __ offset();
+  Label start;
+  __ bind(start);
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ b(start);
 
   assert(__ offset() - offset == (int) size_deopt_handler(), "overflow");
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 // REQUIRED MATCHER CODE
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 9ab463125fe..2498a646e31 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -449,12 +449,18 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  __ adr(lr, pc());
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ b(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::add_debug_info_for_branch(address adr, CodeEmitInfo* info) {
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 12b941fc4f7..729cd2827b7 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -71,7 +71,7 @@ friend class ArrayCopyStub;
     //            CompiledDirectCall::to_trampoline_stub_size()
     _call_stub_size = 13 * NativeInstruction::instruction_size,
     _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
-    _deopt_handler_size = 7 * NativeInstruction::instruction_size
+    _deopt_handler_size = 4 * NativeInstruction::instruction_size
   };
 
 public:
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
index 5a7fececafa..f2003dd9b55 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -394,12 +394,6 @@ void NativePostCallNop::make_deopt() {
   NativeDeoptInstruction::insert(addr_at(0));
 }
 
-#ifdef ASSERT
-static bool is_movk_to_zr(uint32_t insn) {
-  return ((insn & 0xffe0001f) == 0xf280001f);
-}
-#endif
-
 bool NativePostCallNop::patch(int32_t oopmap_slot, int32_t cb_offset) {
   if (((oopmap_slot & 0xff) != oopmap_slot) || ((cb_offset & 0xffffff) != cb_offset)) {
     return false; // cannot encode
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index df5d97c2376..b7444347bf1 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -526,14 +526,24 @@ inline NativeLdSt* NativeLdSt_at(address addr) {
 // can store an offset from the initial nop to the nmethod.
 
 class NativePostCallNop: public NativeInstruction {
+private:
+  static bool is_movk_to_zr(uint32_t insn) {
+    return ((insn & 0xffe0001f) == 0xf280001f);
+  }
+
 public:
   bool check() const {
-    uint64_t insns = *(uint64_t*)addr_at(0);
-    // Check for two instructions: nop; movk zr, xx
-    // These instructions only ever appear together in a post-call
-    // NOP, so it's unnecessary to check that the third instruction is
-    // a MOVK as well.
-    return (insns & 0xffe0001fffffffff) == 0xf280001fd503201f;
+    // Check the first instruction is NOP.
+    if (is_nop()) {
+      uint32_t insn = *(uint32_t*)addr_at(4);
+      // Check next instruction is MOVK zr, xx.
+      // These instructions only ever appear together in a post-call
+      // NOP, so it's unnecessary to check that the third instruction is
+      // a MOVK as well.
+      return is_movk_to_zr(insn);
+    }
+
+    return false;
   }
 
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const {
diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index d45f9865bd2..e36aa21b567 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -260,8 +260,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in aarch64.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 31a442be624..eb9b0ed8fba 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -105,14 +105,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return ( 3 * 4 );
-  }
-
-
   static uint size_deopt_handler() {
     return ( 9 * 4 );
   }
@@ -876,26 +870,6 @@ uint MachUEPNode::size(PhaseRegAlloc *ra_) const {
 
 //=============================================================================
 
-// Emit exception handler code.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-
-  int offset = __ offset();
-
-  // OK to trash LR, because exception blob will kill it
-  __ jump(OptoRuntime::exception_blob()->entry_point(), relocInfo::runtime_call_type, LR_tmp);
-
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-
-  __ end_a_stub();
-
-  return offset;
-}
-
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   // Can't use any of the current frame's registers as we may have deopted
   // at a poll and everything can be live.
@@ -906,19 +880,26 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
 
   int offset = __ offset();
-  address deopt_pc = __ pc();
 
-  __ sub(SP, SP, wordSize); // make room for saved PC
-  __ push(LR); // save LR that may be live when we get here
-  __ mov_relative_address(LR, deopt_pc);
-  __ str(LR, Address(SP, wordSize)); // save deopt PC
-  __ pop(LR); // restore LR
+  Label start;
+  __ bind(start);
+
   __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
 
+  int entry_offset = __ offset();
+  address deopt_pc = __ pc();
+  // Preserve R0 and reserve space for the address of the entry point
+  __ push(RegisterSet(R0) | RegisterSet(R1));
+  // Store the entry point address
+  __ mov_relative_address(R0, deopt_pc);
+  __ str(R0, Address(SP, wordSize));
+  __ pop(R0); // restore R0
+  __ b(start);
+
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
 
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 bool Matcher::match_rule_supported(int opcode) {
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index 219c49d1f14..1d7c1579502 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -272,14 +272,20 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
+  Label start;
+  __ bind(start);
+
+  __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
+
+  int entry_offset = __ offset();
   __ mov_relative_address(LR, __ pc());
   __ push(LR); // stub expects LR to be saved
-  __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
+  __ b(start);
 
   assert(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
index 77d13532685..615d2f188ff 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
@@ -54,7 +54,7 @@
   enum {
     _call_stub_size = 16,
     _exception_handler_size = PRODUCT_ONLY(68) NOT_PRODUCT(68+60),
-    _deopt_handler_size = 16
+    _deopt_handler_size = 20
   };
 
  public:
diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index 8d48de5795a..29fd0aa0a10 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -182,8 +182,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------ generate_exception_blob ---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in sparc.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 108da2039f6..7898500cff2 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -264,12 +264,17 @@ int LIR_Assembler::emit_deopt_handler() {
   }
 
   int offset = code_offset();
+  Label start;
+
+  __ bind(start);
   __ bl64_patchable(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type);
+  int entry_offset = __ offset();
+  __ b(start);
 
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
index e4de2eb5c46..6a2f6264850 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
@@ -63,7 +63,7 @@ enum {
   _static_call_stub_size = 4 * BytesPerInstWord + MacroAssembler::b64_patchable_size, // or smaller
   _call_stub_size = _static_call_stub_size + MacroAssembler::trampoline_stub_size, // or smaller
   _exception_handler_size = MacroAssembler::b64_patchable_size, // or smaller
-  _deopt_handler_size = MacroAssembler::bl64_patchable_size
+  _deopt_handler_size = MacroAssembler::bl64_patchable_size + BytesPerInstWord
 };
 
   // '_static_call_stub_size' is only used on ppc (see LIR_Assembler::emit_static_call_stub()
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 75566b2dd80..5488dbdb8c0 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2088,17 +2088,11 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    // The exception_handler is a b64_patchable.
-    return MacroAssembler::b64_patchable_size;
-  }
-
   static uint size_deopt_handler() {
     // The deopt_handler is a bl64_patchable.
-    return MacroAssembler::bl64_patchable_size;
+    return MacroAssembler::bl64_patchable_size + BytesPerInstWord;
   }
 
 };
@@ -2114,22 +2108,6 @@ public:
 
 source %{
 
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-
-  int offset = __ offset();
-  __ b64_patchable((address)OptoRuntime::exception_blob()->content_begin(),
-                       relocInfo::runtime_call_type);
-  assert(__ offset() - offset == (int)size_exception_handler(), "must be fixed size");
-  __ end_a_stub();
-
-  return offset;
-}
-
 // The deopt_handler is like the exception handler, but it calls to
 // the deoptimization blob instead of jumping to the exception blob.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
@@ -2140,12 +2118,21 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
 
   int offset = __ offset();
+
+  Label start;
+  __ bind(start);
+
   __ bl64_patchable((address)SharedRuntime::deopt_blob()->unpack(),
                         relocInfo::runtime_call_type);
+
+  int entry_offset = __ offset();
+
+  __ b(start);
+
   assert(__ offset() - offset == (int) size_deopt_handler(), "must be fixed size");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 //=============================================================================
diff --git a/src/hotspot/cpu/ppc/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp
index 2654075f702..ab658e9de58 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -46,7 +46,6 @@
 
 //------------------------------generate_exception_blob---------------------------
 // Creates exception blob at the end.
-// Using exception blob, this code is jumped from a compiled method.
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 9fe7e1f22ff..4be3a0aee8b 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -83,7 +83,6 @@ class RegisterSaver {
   static OopMap* push_frame_reg_args_and_save_live_registers(MacroAssembler* masm,
                          int* out_frame_size_in_bytes,
                          bool generate_oop_map,
-                         int return_pc_adjustment,
                          ReturnPCLocation return_pc_location,
                          bool save_vectors = false);
   static void    restore_live_registers_and_pop_frame(MacroAssembler* masm,
@@ -262,7 +261,6 @@ static const RegisterSaver::LiveRegType RegisterSaver_LiveVecRegs[] = {
 OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssembler* masm,
                          int* out_frame_size_in_bytes,
                          bool generate_oop_map,
-                         int return_pc_adjustment,
                          ReturnPCLocation return_pc_location,
                          bool save_vectors) {
   // Push an abi_reg_args-frame and store all registers which may be live.
@@ -271,7 +269,6 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
   // propagated to the RegisterMap of the caller frame during
   // StackFrameStream construction (needed for deoptimization; see
   // compiledVFrame::create_stack_value).
-  // If return_pc_adjustment != 0 adjust the return pc by return_pc_adjustment.
   // Updated return pc is returned in R31 (if not return_pc_is_pre_saved).
 
   // calculate frame size
@@ -305,14 +302,11 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
   // Do the save_LR by hand and adjust the return pc if requested.
   switch (return_pc_location) {
     case return_pc_is_lr: __ mflr(R31); break;
-    case return_pc_is_pre_saved: assert(return_pc_adjustment == 0, "unsupported"); break;
+    case return_pc_is_pre_saved: break;
     case return_pc_is_thread_saved_exception_pc: __ ld(R31, thread_(saved_exception_pc)); break;
     default: ShouldNotReachHere();
   }
   if (return_pc_location != return_pc_is_pre_saved) {
-    if (return_pc_adjustment != 0) {
-      __ addi(R31, R31, return_pc_adjustment);
-    }
     __ std(R31, frame_size_in_bytes + _abi0(lr), R1_SP);
   }
 
@@ -2907,22 +2901,15 @@ void SharedRuntime::generate_deopt_blob() {
   //  deopt_handler:      call_deopt_stub
   //  cur. return pc  --> ...
   //
-  // So currently SR_LR points behind the call in the deopt handler.
-  // We adjust it such that it points to the start of the deopt handler.
   // The return_pc has been stored in the frame of the deoptee and
   // will replace the address of the deopt_handler in the call
   // to Deoptimization::fetch_unroll_info below.
-  // We can't grab a free register here, because all registers may
-  // contain live values, so let the RegisterSaver do the adjustment
-  // of the return pc.
-  const int return_pc_adjustment_no_exception = -MacroAssembler::bl64_patchable_size;
 
   // Push the "unpack frame"
   // Save everything in sight.
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &first_frame_size_in_bytes,
                                                                    /*generate_oop_map=*/ true,
-                                                                   return_pc_adjustment_no_exception,
                                                                    RegisterSaver::return_pc_is_lr);
   assert(map != nullptr, "OopMap must have been created");
 
@@ -2957,7 +2944,6 @@ void SharedRuntime::generate_deopt_blob() {
   RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                              &first_frame_size_in_bytes,
                                                              /*generate_oop_map=*/ false,
-                                                             /*return_pc_adjustment_exception=*/ 0,
                                                              RegisterSaver::return_pc_is_pre_saved);
 
   // Deopt during an exception. Save exec mode for unpack_frames.
@@ -2975,7 +2961,6 @@ void SharedRuntime::generate_deopt_blob() {
   RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                              &first_frame_size_in_bytes,
                                                              /*generate_oop_map=*/ false,
-                                                             /*return_pc_adjustment_reexecute=*/ 0,
                                                              RegisterSaver::return_pc_is_pre_saved);
   __ li(exec_mode_reg, Deoptimization::Unpack_reexecute);
 #endif
@@ -3266,7 +3251,6 @@ SafepointBlob* SharedRuntime::generate_handler_blob(StubId id, address call_ptr)
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &frame_size_in_bytes,
                                                                    /*generate_oop_map=*/ true,
-                                                                   /*return_pc_adjustment=*/0,
                                                                    return_pc_location, save_vectors);
 
   // The following is basically a call_VM. However, we need the precise
@@ -3367,7 +3351,6 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(StubId id, address destination
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &frame_size_in_bytes,
                                                                    /*generate_oop_map*/ true,
-                                                                   /*return_pc_adjustment*/ 0,
                                                                    RegisterSaver::return_pc_is_lr);
 
   // Use noreg as last_Java_pc, the return pc will be reconstructed
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index 9d8ae770ccf..b085dd7ac00 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -377,12 +377,18 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  __ auipc(ra, 0);
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ j(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index e4efb2c171d..ed2ab0c4861 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -72,7 +72,7 @@ private:
     // See emit_exception_handler for detail
     _exception_handler_size = DEBUG_ONLY(256) NOT_DEBUG(32), // or smaller
     // See emit_deopt_handler for detail
-    // auipc (1) + far_jump (2)
+    // far_call (2) + j (1)
     _deopt_handler_size = 1 * MacroAssembler::instruction_size +
                           2 * MacroAssembler::instruction_size
   };
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 4be408f6ca5..34177701900 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1049,15 +1049,10 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return MacroAssembler::far_branch_size();
-  }
-
   static uint size_deopt_handler() {
-    // count auipc + far branch
+    // count far call + j
     return NativeInstruction::instruction_size + MacroAssembler::far_branch_size();
   }
 };
@@ -1838,25 +1833,6 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 
 //=============================================================================
 
-// Emit exception handler code.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
-{
-  // auipc t1, #exception_blob_entry_point
-  // jr (offset)t1
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-  int offset = __ offset();
-  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-  __ end_a_stub();
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
@@ -1867,12 +1843,17 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
   }
   int offset = __ offset();
 
-  __ auipc(ra, 0);
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ j(start);
 
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 
 }
 // REQUIRED MATCHER CODE
diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
index e1add8dbb82..c52d5a31066 100644
--- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -249,8 +249,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in riscv.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index 298234156c3..ee6df63d21b 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -272,14 +272,25 @@ int LIR_Assembler::emit_deopt_handler() {
     // Not enough space left for the handler.
     bailout("deopt handler overflow");
     return -1;
-  }  int offset = code_offset();
+  }
+
+  int offset = code_offset();
+
+  Label start;
+  __ bind(start);
+
   // Size must be constant (see HandlerImpl::emit_deopt_handler).
   __ load_const(Z_R1_scratch, SharedRuntime::deopt_blob()->unpack());
   __ call(Z_R1_scratch);
+
+  int entry_offset = __ offset();
+
+  __ z_bru(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::jobject2reg(jobject o, Register reg) {
diff --git a/src/hotspot/cpu/s390/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp
index 314c407af91..658fba069b4 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -43,8 +43,6 @@
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in s390.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index ab991896b53..0c4939d8432 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1649,15 +1649,10 @@ source_hpp %{ // Header information of the source block.
 class HandlerImpl {
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return NativeJump::max_instruction_size();
-  }
-
   static uint size_deopt_handler() {
-    return NativeCall::max_instruction_size();
+    return NativeCall::max_instruction_size() + MacroAssembler::jump_pcrelative_size();
   }
 };
 
@@ -1672,43 +1667,6 @@ public:
 
 source %{
 
-// This exception handler code snippet is placed after the method's
-// code. It is the return point if an exception occurred. it jumps to
-// the exception blob.
-//
-// If the method gets deoptimized, the method and this code snippet
-// get patched.
-//
-// 1) Trampoline code gets patched into the end of this exception
-//   handler. the trampoline code jumps to the deoptimization blob.
-//
-// 2) The return address in the method's code will get patched such
-//   that it jumps to the trampoline.
-//
-// 3) The handler will get patched such that it does not jump to the
-//   exception blob, but to an entry in the deoptimization blob being
-//   aware of the exception.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
-  Register temp_reg = Z_R1;
-
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;          // CodeBuffer::expand failed
-  }
-
-  int offset = __ offset();
-  // Use unconditional pc-relative jump with 32-bit range here.
-  __ load_const_optimized(temp_reg, (address)OptoRuntime::exception_blob()->content_begin());
-  __ z_br(temp_reg);
-
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-
-  __ end_a_stub();
-
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   address        base = __ start_a_stub(size_deopt_handler());
@@ -1720,14 +1678,22 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
   int offset = __ offset();
 
+  Label start;
+  __ bind(start);
+
   // Size_deopt_handler() must be exact on zarch, so for simplicity
   // we do not use load_const_opt here.
   __ load_const(Z_R1, SharedRuntime::deopt_blob()->unpack());
   __ call(Z_R1);
+
+  int entry_offset = __ offset();
+
+  __ z_bru(start);
+
   assert(__ offset() - offset == (int) size_deopt_handler(), "must be fixed size");
 
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 //=============================================================================
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index db1ee8351ac..3a6e1bff8f4 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2544,14 +2544,10 @@ void SharedRuntime::generate_deopt_blob() {
   // Normal entry (non-exception case)
   //
   // We have been called from the deopt handler of the deoptee.
-  // Z_R14 points behind the call in the deopt handler. We adjust
-  // it such that it points to the start of the deopt handler.
+  // Z_R14 points to the entry point of the deopt handler.
   // The return_pc has been stored in the frame of the deoptee and
   // will replace the address of the deopt_handler in the call
   // to Deoptimization::fetch_unroll_info below.
-  // The (int) cast is necessary, because -((unsigned int)14)
-  // is an unsigned int.
-  __ add2reg(Z_R14, -(int)NativeCall::max_instruction_size());
 
   const Register   exec_mode_reg = Z_tmp_1;
 
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index edeb0baea0e..6600d841050 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -450,14 +450,20 @@ int LIR_Assembler::emit_deopt_handler() {
   }
 
   int offset = code_offset();
-  InternalAddress here(__ pc());
 
-  __ pushptr(here.addr(), rscratch1);
-  __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+
+  __ jmp(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
index 8524dc90276..7a8fbc75ba7 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
@@ -48,7 +48,7 @@
   enum {
     _call_stub_size = 28,
     _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
-    _deopt_handler_size = 17
+    _deopt_handler_size = 10
   };
 
 public:
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index 7b98cf4fad7..5bf65299a0c 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -242,8 +242,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in x86_64.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 064c52e658b..ca94b03a841 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -2767,21 +2767,11 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    // NativeCall instruction size is the same as NativeJump.
-    // exception handler starts out as jump and can be patched to
-    // a call be deoptimization.  (4932387)
-    // Note that this value is also credited (in output.cpp) to
-    // the size of the code section.
-    return NativeJump::instruction_size;
-  }
-
   static uint size_deopt_handler() {
-    // three 5 byte instructions plus one move for unreachable address.
-    return 15+3;
+    // one call and one jmp.
+    return 10;
   }
 };
 
@@ -2873,24 +2863,6 @@ int MachNode::compute_padding(int current_offset) const {
   }
 }
 
-// Emit exception handler code.
-// Stuff framesize into a register and call a VM stub routine.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
-
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-  int offset = __ offset();
-  __ jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-  __ end_a_stub();
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
@@ -2903,21 +2875,18 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
   int offset = __ offset();
 
-  address the_pc = (address) __ pc();
-  Label next;
-  // push a "the_pc" on the stack without destroying any registers
-  // as they all may be live.
+  Label start;
+  __ bind(start);
 
-  // push address of "next"
-  __ call(next, relocInfo::none); // reloc none is fine since it is a disp32
-  __ bind(next);
-  // adjust it so it matches "the_pc"
-  __ subptr(Address(rsp, 0), __ offset() - offset);
+  __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+
+  __ jmp(start);
 
-  __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow %d", (__ offset() - offset));
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 static Assembler::Width widthForType(BasicType bt) {
diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 5833e324070..625eb63445a 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -621,7 +621,7 @@ int JVM_HANDLE_XXX_SIGNAL(int sig, siginfo_t* info,
       if (cb != nullptr && cb->is_nmethod()) {
         nmethod* nm = cb->as_nmethod();
         assert(nm->insts_contains_inclusive(pc), "");
-        address deopt = nm->deopt_handler_begin();
+        address deopt = nm->deopt_handler_entry();
         assert(deopt != nullptr, "");
 
         frame fr = os::fetch_frame_from_context(uc);
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index ce2baeaf46c..4b84e2fdfdb 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2795,7 +2795,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
         if (cb != nullptr && cb->is_nmethod()) {
           nmethod* nm = cb->as_nmethod();
           frame fr = os::fetch_frame_from_context((void*)exceptionInfo->ContextRecord);
-          address deopt = nm->deopt_handler_begin();
+          address deopt = nm->deopt_handler_entry();
           assert(nm->insts_contains_inclusive(pc), "");
           nm->set_original_pc(&fr, pc);
           // Set pc to handler
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 79ab881e7f6..92bacc4c2c3 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1057,7 +1057,9 @@ void ciEnv::register_method(ciMethod* target,
     }
 
     assert(offsets->value(CodeOffsets::Deopt) != -1, "must have deopt entry");
-    assert(offsets->value(CodeOffsets::Exceptions) != -1, "must have exception entry");
+
+    assert(compiler->type() == compiler_c2 ||
+           offsets->value(CodeOffsets::Exceptions) != -1, "must have exception entry");
 
     nm =  nmethod::new_nmethod(method,
                                compile_id(),
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index d91af9b4991..c2f8b46f00e 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1302,7 +1302,7 @@ nmethod::nmethod(
     }
     // Native wrappers do not have deopt handlers. Make the values
     // something that will never match a pc like the nmethod vtable entry
-    _deopt_handler_offset    = 0;
+    _deopt_handler_entry_offset    = 0;
     _unwind_handler_offset   = 0;
 
     CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
@@ -1442,7 +1442,7 @@ nmethod::nmethod(const nmethod &nm) : CodeBlob(nm._name, nm._kind, nm._size, nm.
   _skipped_instructions_size    = nm._skipped_instructions_size;
   _stub_offset                  = nm._stub_offset;
   _exception_offset             = nm._exception_offset;
-  _deopt_handler_offset         = nm._deopt_handler_offset;
+  _deopt_handler_entry_offset   = nm._deopt_handler_entry_offset;
   _unwind_handler_offset        = nm._unwind_handler_offset;
   _num_stack_arg_slots          = nm._num_stack_arg_slots;
   _oops_size                    = nm._oops_size;
@@ -1704,19 +1704,26 @@ nmethod::nmethod(
         _exception_offset        = -1;
       }
       if (offsets->value(CodeOffsets::Deopt) != -1) {
-        _deopt_handler_offset    = code_offset() + offsets->value(CodeOffsets::Deopt);
+        _deopt_handler_entry_offset    = code_offset() + offsets->value(CodeOffsets::Deopt);
       } else {
-        _deopt_handler_offset    = -1;
+        _deopt_handler_entry_offset    = -1;
       }
     } else
 #endif
     {
       // Exception handler and deopt handler are in the stub section
-      assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set");
       assert(offsets->value(CodeOffsets::Deopt     ) != -1, "must be set");
 
-      _exception_offset          = _stub_offset + offsets->value(CodeOffsets::Exceptions);
-      _deopt_handler_offset      = _stub_offset + offsets->value(CodeOffsets::Deopt);
+      bool has_exception_handler = (offsets->value(CodeOffsets::Exceptions) != -1);
+      assert(has_exception_handler == (compiler->type() != compiler_c2),
+             "C2 compiler doesn't provide exception handler stub code.");
+      if (has_exception_handler) {
+        _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions);
+      } else {
+        _exception_offset = -1;
+      }
+
+      _deopt_handler_entry_offset = _stub_offset + offsets->value(CodeOffsets::Deopt);
     }
     if (offsets->value(CodeOffsets::UnwindHandler) != -1) {
       // C1 generates UnwindHandler at the end of instructions section.
@@ -4024,7 +4031,7 @@ const char* nmethod::nmethod_section_label(address pos) const {
   // Check stub_code before checking exception_handler or deopt_handler.
   if (pos == this->stub_begin())                                        label = "[Stub Code]";
   if (JVMCI_ONLY(_exception_offset >= 0 &&) pos == exception_begin())          label = "[Exception Handler]";
-  if (JVMCI_ONLY(_deopt_handler_offset != -1 &&) pos == deopt_handler_begin()) label = "[Deopt Handler Code]";
+  if (JVMCI_ONLY(_deopt_handler_entry_offset != -1 &&) pos == deopt_handler_entry()) label = "[Deopt Handler Entry Point]";
   return label;
 }
 
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 34accf428b6..0fa9d7fda9e 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -229,7 +229,7 @@ class nmethod : public CodeBlob {
   int _exception_offset;
   // All deoptee's will resume execution at this location described by
   // this offset.
-  int _deopt_handler_offset;
+  int _deopt_handler_entry_offset;
   // Offset (from insts_end) of the unwind handler if it exists
   int16_t  _unwind_handler_offset;
   // Number of arguments passed on the stack
@@ -617,7 +617,7 @@ public:
   address stub_begin            () const { return           header_begin() + _stub_offset             ; }
   address stub_end              () const { return           code_end()     ; }
   address exception_begin       () const { return           header_begin() + _exception_offset        ; }
-  address deopt_handler_begin   () const { return           header_begin() + _deopt_handler_offset    ; }
+  address deopt_handler_entry   () const { return           header_begin() + _deopt_handler_entry_offset    ; }
   address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (insts_end() - _unwind_handler_offset) : nullptr; }
   oop*    oops_begin            () const { return (oop*)    data_begin(); }
   oop*    oops_end              () const { return (oop*)    data_end(); }
diff --git a/src/hotspot/share/code/nmethod.inline.hpp b/src/hotspot/share/code/nmethod.inline.hpp
index 44331db669c..ecee3c0c31a 100644
--- a/src/hotspot/share/code/nmethod.inline.hpp
+++ b/src/hotspot/share/code/nmethod.inline.hpp
@@ -34,7 +34,7 @@
 inline bool nmethod::is_deopt_pc(address pc) { return is_deopt_entry(pc); }
 
 inline bool nmethod::is_deopt_entry(address pc) {
-  return pc == deopt_handler_begin();
+  return pc == deopt_handler_entry();
 }
 
 // class ExceptionCache methods
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 84c01c68e38..136fc8ac864 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1347,20 +1347,18 @@ CodeBuffer* PhaseOutput::init_buffer() {
 
   // nmethod and CodeBuffer count stubs & constants as part of method's code.
   // class HandlerImpl is platform-specific and defined in the *.ad files.
-  int exception_handler_req = HandlerImpl::size_exception_handler() + MAX_stubs_size; // add marginal slop for handler
   int deopt_handler_req     = HandlerImpl::size_deopt_handler()     + MAX_stubs_size; // add marginal slop for handler
   stub_req += MAX_stubs_size;   // ensure per-stub margin
   code_req += MAX_inst_size;    // ensure per-instruction margin
 
   if (StressCodeBuffers)
-    code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
+    code_req = const_req = stub_req = deopt_handler_req = 0x10;  // force expansion
 
   int total_req =
           const_req +
           code_req +
           pad_req +
           stub_req +
-          exception_handler_req +
           deopt_handler_req;               // deopt handler
 
   CodeBuffer* cb = code_buffer();
@@ -1789,8 +1787,6 @@ void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) {
   // Only java methods have exception handlers and deopt handlers
   // class HandlerImpl is platform-specific and defined in the *.ad files.
   if (C->method()) {
-    // Emit the exception handler code.
-    _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(masm));
     if (C->failing()) {
       return; // CodeBuffer::expand failed
     }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 144de698d85..35ccc92f90b 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -499,6 +499,9 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
                         RegisterMap::WalkContinuation::skip);
   // Now get the deoptee with a valid map
   frame deoptee = stub_frame.sender(&map);
+  if (exec_mode == Unpack_deopt) {
+    assert(deoptee.is_deoptimized_frame(), "frame is not marked for deoptimization");
+  }
   // Set the deoptee nmethod
   assert(current->deopt_compiled_method() == nullptr, "Pending deopt!");
   nmethod* nm = deoptee.cb()->as_nmethod_or_null();
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index b5cd4acc75d..8f969600ba8 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -206,7 +206,7 @@ address frame::raw_pc() const {
   if (is_deoptimized_frame()) {
     nmethod* nm = cb()->as_nmethod_or_null();
     assert(nm != nullptr, "only nmethod is expected here");
-    return nm->deopt_handler_begin() - pc_return_offset;
+    return nm->deopt_handler_entry() - pc_return_offset;
   } else {
     return (pc() - pc_return_offset);
   }
@@ -355,7 +355,7 @@ void frame::deoptimize(JavaThread* thread) {
 
   // If the call site is a MethodHandle call site use the MH deopt handler.
   nmethod* nm = _cb->as_nmethod();
-  address deopt = nm->deopt_handler_begin();
+  address deopt = nm->deopt_handler_entry();
 
   NativePostCallNop* inst = nativePostCallNop_at(pc());
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 35bc3f5f1be..a980838ed76 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -87,6 +87,9 @@
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
 #if INCLUDE_JFR
 #include "jfr/jfr.inline.hpp"
 #endif
@@ -601,6 +604,11 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
       // The deferred StackWatermarkSet::after_unwind check will be performed in
       // * OptoRuntime::handle_exception_C_helper for C2 code
       // * exception_handler_for_pc_helper via Runtime1::handle_exception_from_callee_id for C1 code
+#ifdef COMPILER2
+      if (nm->compiler_type() == compiler_c2) {
+        return OptoRuntime::exception_blob()->entry_point();
+      }
+#endif // COMPILER2
       return nm->exception_begin();
     }
   }
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index a7342448522..2ce6a6cac76 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -535,7 +535,7 @@
   nonstatic_field(nmethod,                     _osr_link,                                     nmethod*)                              \
   nonstatic_field(nmethod,                     _state,                                        volatile signed char)                  \
   nonstatic_field(nmethod,                     _exception_offset,                             int)                                   \
-  nonstatic_field(nmethod,                     _deopt_handler_offset,                         int)                                   \
+  nonstatic_field(nmethod,                     _deopt_handler_entry_offset,                   int)                                   \
   nonstatic_field(nmethod,                     _orig_pc_offset,                               int)                                   \
   nonstatic_field(nmethod,                     _stub_offset,                                  int)                                   \
   nonstatic_field(nmethod,                     _immutable_data_ref_count_offset,              int)                                   \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index 91302dba0f6..f935c56b536 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -48,7 +48,7 @@ public class NMethod extends CodeBlob {
 
   /** Offsets for different nmethod parts */
   private static CIntegerField exceptionOffsetField;
-  private static CIntegerField deoptHandlerOffsetField;
+  private static CIntegerField deoptHandlerEntryOffsetField;
   private static CIntegerField origPCOffsetField;
   private static CIntegerField stubOffsetField;
   private static CIntField     handlerTableOffsetField;
@@ -86,7 +86,7 @@ public class NMethod extends CodeBlob {
     immutableDataField                 = type.getAddressField("_immutable_data");
     immutableDataSizeField             = type.getCIntegerField("_immutable_data_size");
     exceptionOffsetField               = type.getCIntegerField("_exception_offset");
-    deoptHandlerOffsetField            = type.getCIntegerField("_deopt_handler_offset");
+    deoptHandlerEntryOffsetField       = type.getCIntegerField("_deopt_handler_entry_offset");
     origPCOffsetField                  = type.getCIntegerField("_orig_pc_offset");
     stubOffsetField                    = type.getCIntegerField("_stub_offset");
     scopesPCsOffsetField               = type.getCIntegerField("_scopes_pcs_offset");
@@ -121,16 +121,16 @@ public class NMethod extends CodeBlob {
   public boolean isOSRMethod()    { return getEntryBCI() != VM.getVM().getInvocationEntryBCI(); }
 
   /** Boundaries for different parts */
-  public Address constantsBegin()             { return contentBegin();                                     }
-  public Address constantsEnd()               { return codeBegin();                                        }
-  public Address instsBegin()                 { return codeBegin();                                        }
-  public Address instsEnd()                   { return headerBegin().addOffsetTo(getStubOffset());         }
-  public Address exceptionBegin()             { return headerBegin().addOffsetTo(getExceptionOffset());    }
-  public Address deoptHandlerBegin()          { return headerBegin().addOffsetTo(getDeoptHandlerOffset()); }
-  public Address stubBegin()                  { return headerBegin().addOffsetTo(getStubOffset());         }
-  public Address stubEnd()                    { return dataBegin();                                        }
-  public Address oopsBegin()                  { return dataBegin();                                        }
-  public Address oopsEnd()                    { return dataEnd();                                          }
+  public Address constantsBegin()             { return contentBegin();                                          }
+  public Address constantsEnd()               { return codeBegin();                                             }
+  public Address instsBegin()                 { return codeBegin();                                             }
+  public Address instsEnd()                   { return headerBegin().addOffsetTo(getStubOffset());              }
+  public Address exceptionBegin()             { return headerBegin().addOffsetTo(getExceptionOffset());         }
+  public Address deoptHandlerEntry()          { return headerBegin().addOffsetTo(getDeoptHandlerEntryOffset()); }
+  public Address stubBegin()                  { return headerBegin().addOffsetTo(getStubOffset());              }
+  public Address stubEnd()                    { return dataBegin();                                             }
+  public Address oopsBegin()                  { return dataBegin();                                             }
+  public Address oopsEnd()                    { return dataEnd();                                               }
 
   public Address immutableDataBegin()         { return immutableDataField.getValue(addr);                         }
   public Address immutableDataEnd()           { return immutableDataBegin().addOffsetTo(getImmutableDataSize());  }
@@ -262,7 +262,7 @@ public class NMethod extends CodeBlob {
   // Deopt
   // Return true is the PC is one would expect if the frame is being deopted.
   public boolean isDeoptPc      (Address pc) { return isDeoptEntry(pc); }
-  public boolean isDeoptEntry   (Address pc) { return pc == deoptHandlerBegin(); }
+  public boolean isDeoptEntry   (Address pc) { return pc == deoptHandlerEntry(); }
 
   /** Tells whether frames described by this nmethod can be
       deoptimized. Note: native wrappers cannot be deoptimized. */
@@ -490,7 +490,7 @@ public class NMethod extends CodeBlob {
 
   private int getEntryBCI()                     { return (int) entryBCIField                    .getValue(addr); }
   private int getExceptionOffset()              { return (int) exceptionOffsetField             .getValue(addr); }
-  private int getDeoptHandlerOffset()           { return (int) deoptHandlerOffsetField          .getValue(addr); }
+  private int getDeoptHandlerEntryOffset()      { return (int) deoptHandlerEntryOffsetField     .getValue(addr); }
   private int getStubOffset()                   { return (int) stubOffsetField                  .getValue(addr); }
   private int getScopesDataOffset()             { return (int) scopesDataOffsetField            .getValue(addr); }
   private int getScopesPCsOffset()              { return (int) scopesPCsOffsetField             .getValue(addr); }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
index 27efb631f79..ee9e0ecdafd 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
@@ -87,7 +87,7 @@ public abstract class Frame implements Cloneable {
       CodeBlob cb = VM.getVM().getCodeCache().findBlob(pc);
       if (cb != null && cb.isJavaMethod()) {
         NMethod nm = (NMethod) cb;
-        if (pc.equals(nm.deoptHandlerBegin())) {
+        if (pc.equals(nm.deoptHandlerEntry())) {
           if (Assert.ASSERTS_ENABLED) {
             Assert.that(this.getUnextendedSP() != null, "null SP in Java frame");
           }
diff --git a/test/hotspot/jtreg/runtime/vthread/Deoptimization.java b/test/hotspot/jtreg/runtime/vthread/Deoptimization.java
new file mode 100644
index 00000000000..050848c3a72
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/vthread/Deoptimization.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test id=vthread-deopt-c1
+ * @summary Deoptimization test for virtual threads (C1)
+ * @requires vm.continuations
+ * @requires vm.compiler1.enabled
+ * @requires vm.opt.TieredStopAtLevel != 0
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                   -XX:-BackgroundCompilation
+ *                   -XX:TieredStopAtLevel=1
+ *                   Deoptimization
+ */
+
+/**
+ * @test id=vthread-deopt-c2
+ * @summary Deoptimization test for virtual threads (C2)
+ * @requires vm.continuations
+ * @requires vm.compiler2.enabled
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                   -XX:-BackgroundCompilation
+ *                   -XX:-TieredCompilation
+ *                   Deoptimization
+ */
+
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.Objects;
+import jdk.test.whitebox.WhiteBox;
+
+public class Deoptimization {
+    static final WhiteBox white_box = WhiteBox.getWhiteBox();
+
+    static class TestTask implements Runnable {
+        CyclicBarrier start_barrier = null;
+        AtomicInteger completed_number = new AtomicInteger(0);
+
+        public void reset(int barrier_parties) {
+            start_barrier = new CyclicBarrier(barrier_parties);
+            completed_number.set(0);
+        }
+
+        public int getNumberWaiting() {
+            return start_barrier.getNumberWaiting();
+        }
+
+        public int getNumberCompleted() {
+            return completed_number.get();
+        }
+
+        public void await() throws BrokenBarrierException, InterruptedException {
+            start_barrier.await();
+        }
+
+        public void run() {
+            try {
+                await();
+            } catch(BrokenBarrierException e) {
+                return;
+            } catch(InterruptedException e) {
+                return;
+            }
+
+            completed_number.getAndIncrement();
+        }
+    }
+
+    static void test(TestTask task, Method method, int vthreads_num) throws Exception {
+        task.reset(vthreads_num + 1 /* 1 for the main thread */);
+
+        Thread[] vthreads = new Thread[vthreads_num];
+        for (int i = 0; i < vthreads_num; i++) {
+            vthreads[i] = Thread.startVirtualThread(task);
+        }
+
+        while (task.getNumberWaiting() != vthreads_num) {
+            Thread.onSpinWait();
+        }
+
+        if (method != null) {
+            if (!white_box.isMethodCompiled(method, false)) {
+                throw new Error("Unexpectedly, it is not compiled.");
+            }
+
+            white_box.deoptimizeMethod(method);
+
+            if (white_box.isMethodCompiled(method, false)) {
+                throw new Error("Unexpectedly, it is compiled.");
+            }
+        }
+
+        task.await();
+
+        for (int i = 0; i < vthreads_num; i++) {
+            vthreads[i].join();
+        }
+
+        if (task.getNumberCompleted() != vthreads_num) {
+            throw new Error("Some threads didn't reach completion");
+        }
+    }
+
+    static int getIntegerOption(String option_name) {
+        Object option_object = white_box.getVMFlag(option_name);
+        String option_string = Objects.toString(option_object);
+        return Integer.parseInt(option_string);
+    }
+
+    public static void main(String[] args) throws Exception {
+        int tiered_stop_at_level = getIntegerOption("TieredStopAtLevel");
+
+        Method method_run = TestTask.class.getMethod("run");
+        white_box.testSetDontInlineMethod(method_run, true);
+
+        Method method_await = TestTask.class.getMethod("await");
+        white_box.testSetDontInlineMethod(method_await, true);
+
+        TestTask task = new TestTask();
+
+        // Warm-up
+        test(task, null, 2);
+
+        white_box.enqueueMethodForCompilation(method_run, tiered_stop_at_level);
+
+        // Deoptimization test
+        test(task, method_run, 10000);
+    }
+}

From f6f87bb6759c86d941453a1776e8abfdffc48183 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Wed, 5 Nov 2025 13:01:51 +0000
Subject: [PATCH 039/512] 8371133: Clarify the purpose of
 "src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties"

Reviewed-by: jlahoda
---
 .../com/sun/tools/javac/resources/ct.properties       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties
index ba42e8e067c..a8fdd923e2c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,15 @@
 # questions.
 #
 
+# This file was originally used to produce the `proprietary` warning when
+# accessing non-APIs, and to hide some non-APIs in JDK <= 8. This has been
+# superseded by the module system and `--release`. But, when compiling with
+# `--source 8`, it is still used for this purpose by
+# `com.sun.tools.javac.file.JRTIndex`.
+#
+# The build generates `jdk.compiler/com/sun/tools/javac/resources/ct.java` from
+# this file, which is then used at runtime.
+
 apple.laf.*: hidden
 apple.security.*: hidden
 com.apple.eawt.*: hidden

From c9a98169cb79df235316cb38a804d539044ea57e Mon Sep 17 00:00:00 2001
From: Samuel Chee <samche01@arm.com>
Date: Wed, 5 Nov 2025 13:56:26 +0000
Subject: [PATCH 040/512] 8371205: AArch64: Remove unused cmpxchg* methods

Co-authored-by: Samuel Chee <samche01@arm.com>
Reviewed-by: aph, kbarrett, haosun
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    | 91 -------------------
 .../cpu/aarch64/macroAssembler_aarch64.hpp    | 10 --
 2 files changed, 101 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index e6dd29f105a..c83e6e12fa1 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -3315,97 +3315,6 @@ void MacroAssembler::reinit_heapbase()
   }
 }
 
-// this simulates the behaviour of the x86 cmpxchg instruction using a
-// load linked/store conditional pair. we use the acquire/release
-// versions of these instructions so that we flush pending writes as
-// per Java semantics.
-
-// n.b the x86 version assumes the old value to be compared against is
-// in rax and updates rax with the value located in memory if the
-// cmpxchg fails. we supply a register for the old value explicitly
-
-// the aarch64 load linked/store conditional instructions do not
-// accept an offset. so, unlike x86, we must provide a plain register
-// to identify the memory word to be compared/exchanged rather than a
-// register+offset Address.
-
-void MacroAssembler::cmpxchgptr(Register oldv, Register newv, Register addr, Register tmp,
-                                Label &succeed, Label *fail) {
-  // oldv holds comparison value
-  // newv holds value to write in exchange
-  // addr identifies memory word to compare against/update
-  if (UseLSE) {
-    mov(tmp, oldv);
-    casal(Assembler::xword, oldv, newv, addr);
-    cmp(tmp, oldv);
-    br(Assembler::EQ, succeed);
-    membar(AnyAny);
-  } else {
-    Label retry_load, nope;
-    prfm(Address(addr), PSTL1STRM);
-    bind(retry_load);
-    // flush and load exclusive from the memory location
-    // and fail if it is not what we expect
-    ldaxr(tmp, addr);
-    cmp(tmp, oldv);
-    br(Assembler::NE, nope);
-    // if we store+flush with no intervening write tmp will be zero
-    stlxr(tmp, newv, addr);
-    cbzw(tmp, succeed);
-    // retry so we only ever return after a load fails to compare
-    // ensures we don't return a stale value after a failed write.
-    b(retry_load);
-    // if the memory word differs we return it in oldv and signal a fail
-    bind(nope);
-    membar(AnyAny);
-    mov(oldv, tmp);
-  }
-  if (fail)
-    b(*fail);
-}
-
-void MacroAssembler::cmpxchg_obj_header(Register oldv, Register newv, Register obj, Register tmp,
-                                        Label &succeed, Label *fail) {
-  assert(oopDesc::mark_offset_in_bytes() == 0, "assumption");
-  cmpxchgptr(oldv, newv, obj, tmp, succeed, fail);
-}
-
-void MacroAssembler::cmpxchgw(Register oldv, Register newv, Register addr, Register tmp,
-                                Label &succeed, Label *fail) {
-  // oldv holds comparison value
-  // newv holds value to write in exchange
-  // addr identifies memory word to compare against/update
-  // tmp returns 0/1 for success/failure
-  if (UseLSE) {
-    mov(tmp, oldv);
-    casal(Assembler::word, oldv, newv, addr);
-    cmp(tmp, oldv);
-    br(Assembler::EQ, succeed);
-    membar(AnyAny);
-  } else {
-    Label retry_load, nope;
-    prfm(Address(addr), PSTL1STRM);
-    bind(retry_load);
-    // flush and load exclusive from the memory location
-    // and fail if it is not what we expect
-    ldaxrw(tmp, addr);
-    cmp(tmp, oldv);
-    br(Assembler::NE, nope);
-    // if we store+flush with no intervening write tmp will be zero
-    stlxrw(tmp, newv, addr);
-    cbzw(tmp, succeed);
-    // retry so we only ever return after a load fails to compare
-    // ensures we don't return a stale value after a failed write.
-    b(retry_load);
-    // if the memory word differs we return it in oldv and signal a fail
-    bind(nope);
-    membar(AnyAny);
-    mov(oldv, tmp);
-  }
-  if (fail)
-    b(*fail);
-}
-
 // A generic CAS; success or failure is in the EQ flag.  A weak CAS
 // doesn't retry and may fail spuriously.  If the oldval is wanted,
 // Pass a register for the result, otherwise pass noreg.
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 7bfc6c562e3..4468eaa40c5 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1200,16 +1200,6 @@ public:
 
   void cmpoop(Register obj1, Register obj2);
 
-  // Various forms of CAS
-
-  void cmpxchg_obj_header(Register oldv, Register newv, Register obj, Register tmp,
-                          Label &succeed, Label *fail);
-  void cmpxchgptr(Register oldv, Register newv, Register addr, Register tmp,
-                  Label &succeed, Label *fail);
-
-  void cmpxchgw(Register oldv, Register newv, Register addr, Register tmp,
-                  Label &succeed, Label *fail);
-
   void atomic_add(Register prev, RegisterOrConstant incr, Register addr);
   void atomic_addw(Register prev, RegisterOrConstant incr, Register addr);
   void atomic_addal(Register prev, RegisterOrConstant incr, Register addr);

From 2dd15cf5bf1614e4b74ad9675723562e14ced8ab Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 5 Nov 2025 13:57:18 +0000
Subject: [PATCH 041/512] 8346719: Add relaunchers to the static JDK image for
 missing executables

Reviewed-by: alanb, erikj
---
 make/Main.gmk                                 |   6 +-
 make/StaticLibs.gmk                           | 117 ++++++++-
 make/common/modules/LauncherCommon.gmk        |  60 ++++-
 make/modules/java.base/Launcher.gmk           |   2 +-
 make/modules/jdk.jpackage/Lib.gmk             |   1 -
 src/java.base/share/native/launcher/defines.h |  75 ------
 src/java.base/share/native/launcher/main.c    |  88 ++++++-
 .../unix/native/launcher/relauncher.c         | 113 ++++++++
 src/java.base/unix/native/libjli/java_md.c    |   6 +-
 .../windows/native/launcher/relauncher.c      | 246 ++++++++++++++++++
 test/hotspot/jtreg/ProblemList-StaticJdk.txt  |  35 ---
 test/jdk/ProblemList-StaticJdk.txt            |  38 ++-
 test/langtools/ProblemList-StaticJdk.txt      |  53 ++--
 test/lib-test/ProblemList-StaticJdk.txt       |  28 +-
 14 files changed, 678 insertions(+), 190 deletions(-)
 delete mode 100644 src/java.base/share/native/launcher/defines.h
 create mode 100644 src/java.base/unix/native/launcher/relauncher.c
 create mode 100644 src/java.base/windows/native/launcher/relauncher.c

diff --git a/make/Main.gmk b/make/Main.gmk
index e9f0b5bb9eb..22302cdea46 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -461,9 +461,9 @@ $(eval $(call SetupTarget, symbols-image, \
     TARGET := symbols, \
 ))
 
-$(eval $(call SetupTarget, static-launcher, \
+$(eval $(call SetupTarget, static-launchers, \
     MAKEFILE := StaticLibs, \
-    TARGET := static-launcher, \
+    TARGET := static-launchers, \
     DEPS := hotspot-static-libs static-libs, \
 ))
 
@@ -1290,7 +1290,7 @@ ifeq ($(call isTargetOs, macosx), true)
   legacy-images: mac-legacy-jre-bundle
 endif
 
-static-exploded-image: static-launcher exploded-image
+static-exploded-image: static-launchers exploded-image
 
 # These targets build the various documentation images
 docs-jdk-image: docs-jdk
diff --git a/make/StaticLibs.gmk b/make/StaticLibs.gmk
index 490180eb649..ca74590938d 100644
--- a/make/StaticLibs.gmk
+++ b/make/StaticLibs.gmk
@@ -48,8 +48,8 @@ ifneq ($(word 2, $(wildcard $(HOTSPOT_STATIC_LIB_PATH))), )
 endif
 
 # Find all modules with static libraries
-STATIC_LIB_MODULES := $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*))
+STATIC_LIB_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
+    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*)))
 
 # Filter out known broken libraries. This is a temporary measure until
 # proper support for these libraries can be provided.
@@ -123,13 +123,18 @@ else
   $(error Unsupported platform)
 endif
 
+################################################################################
+# Build the java static launcher
+################################################################################
 $(eval $(call SetupBuildLauncher, java, \
     ENABLE_ARG_FILES := true, \
     EXPAND_CLASSPATH_WILDCARDS := true, \
     EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
     OPTIMIZATION := HIGH, \
+    MACOSX_PRIVILEGED := true, \
     STATIC_LAUNCHER := true, \
+    CFLAGS := -DSTATIC_BUILD, \
     LDFLAGS := $(LDFLAGS_STATIC_JDK), \
     LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
     LINK_TYPE := C++, \
@@ -146,7 +151,53 @@ TARGETS += $(java)
 
 JAVA_LAUNCHER := $(BUILD_LAUNCHER_java_TARGET)
 
-static-launcher: $(java)
+static-launchers: $(java)
+
+################################################################################
+# Build relaunchers (thin wrappers calling the java binary) for all other
+# JDK launchers.
+################################################################################
+
+RELAUNCHER_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher
+
+# $1: The module name
+# $2: The launcher name
+define SetupRelauncher
+  $1_$2_LAUNCHER_ARGS_LINE := $$(call ReadFile, $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$1/$2-relauncher-arguments.txt)
+  # Restore |||| with space
+  $1_$2_LAUNCHER_ARGS := '{ $$(subst ||||,$(SPACE),$$(strip $$(foreach a, $$($1_$2_LAUNCHER_ARGS_LINE), "-J$$a"$$(COMMA) )) ) }'
+
+  $$(eval $$(call SetupJdkExecutable, BUILD_relauncher_$2, \
+      NAME := $2, \
+      EXTRA_FILES := $$(RELAUNCHER_SRC)/relauncher.c, \
+      CFLAGS := -DLAUNCHER_ARGS=$$($1_$2_LAUNCHER_ARGS), \
+      LIBS_windows := shlwapi.lib, \
+      OUTPUT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR), \
+      OBJECT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR)/relaunchers/$2, \
+  ))
+
+  TARGETS += $$(BUILD_relauncher_$2)
+
+  RELAUNCHERS += $$(BUILD_relauncher_$2_TARGET)
+  static-launchers: $$(BUILD_relauncher_$2)
+endef
+
+# Find all modules with launchers
+LAUNCHER_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-launchers/%, \
+    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-launchers/*)))
+
+# Find launchers for each module
+$(foreach module, $(LAUNCHER_MODULES), \
+    $(eval LAUNCHERS_$(module) := $(if $(wildcard \
+    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt), \
+    $(shell cat \
+    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt))) \
+)
+
+# For all launchers (except java and javaw), setup a relauncher build
+$(foreach module, $(LAUNCHER_MODULES), \
+    $(foreach launcher, $(filter-out java javaw, $(LAUNCHERS_$(module))), \
+    $(eval $(call SetupRelauncher,$(module),$(launcher)))))
 
 ################################################################################
 #
@@ -188,26 +239,72 @@ TARGETS += $(copy-from-jdk-image)
 
 $(copy-from-jdk-image): | static-jdk-info
 
-$(eval $(call SetupCopyFiles, copy-static-launcher, \
-    FILES := $(JAVA_LAUNCHER), \
+$(eval $(call SetupCopyFiles, copy-static-launchers, \
+    FILES := $(JAVA_LAUNCHER) $(RELAUNCHERS), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
 ))
 
-TARGETS += $(copy-static-launcher)
+TARGETS += $(copy-static-launchers)
 
-$(eval $(call SetupCopyFiles, copy-static-launcher-debuginfo, \
+$(eval $(call SetupCopyFiles, copy-static-launchers-debuginfo, \
     SRC := $(STATIC_LAUNCHER_OUTPUT_DIR), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
     FILES := $(call FindDebuginfoFiles, $(STATIC_LAUNCHER_OUTPUT_DIR)), \
 ))
 
-TARGETS += $(copy-static-launcher-debuginfo)
+TARGETS += $(copy-static-launchers-debuginfo)
 
-static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-launcher-debuginfo)
+# Copy the microsoft runtime libraries on windows
+ifeq ($(call isTargetOs, windows), true)
+  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
+  # Use separate macro calls in case the source files are not in the same
+  # directory.
+  $(eval $(call SetupCopyFiles, copy-windows-msvcr, \
+      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+      FILES := $(MSVCR_DLL), \
+      MACRO := copy-and-chmod-executable, \
+  ))
+
+  TARGETS += $(copy-windows-msvcr)
+
+  $(eval $(call SetupCopyFiles, copy-windows-vcruntime, \
+      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+      FILES := $(VCRUNTIME_1_DLL), \
+      MACRO := copy-and-chmod-executable, \
+  ))
+
+  TARGETS += $(copy-windows-vcruntime)
+
+  $(eval $(call SetupCopyFiles, copy-windows-msvcp, \
+      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+      FILES := $(MSVCP_DLL), \
+      MACRO := copy-and-chmod-executable, \
+  ))
+
+  TARGETS += $(copy-windows-msvcp)
+
+  copy-windows-libs := $(copy-windows-msvcr) $(copy-windows-vcruntime) $(copy-windows-msvcp)
+
+  ifneq ($(UCRT_DLL_DIR), )
+    $(eval $(call SetupCopyFiles, copy-windows-ucrt, \
+        DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+        SRC := $(UCRT_DLL_DIR), \
+        FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
+        MACRO := copy-and-chmod-executable, \
+    ))
+
+    TARGETS += $(copy-windows-ucrt)
+
+    copy-windows-libs += $(copy-windows-ucrt)
+  endif
+endif
+
+static-jdk-image: $(copy-from-jdk-image) $(copy-static-launchers) \
+    $(copy-static-launchers-debuginfo) $(copy-windows-libs)
 
 TARGETS += static-jdk-image
 
-.PHONY: static-launcher static-jdk-image
+.PHONY: static-launchers static-jdk-image
 
 ################################################################################
 
diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index 0b420df5684..7682ffbb95c 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -43,6 +43,9 @@ LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
 MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
 JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 
+INCLUDED_LAUNCHERS_FILE := $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(MODULE)/module-included-launchers.txt
+INCLUDED_LAUNCHERS :=
+
 ################################################################################
 # Build standard launcher.
 
@@ -74,19 +77,30 @@ define SetupBuildLauncherBody
 
   $1_MAIN_MODULE := $(MODULE)
 
+  $1_RELAUNCHER_ARGUMENTS :=
+
   ifneq ($$($1_MAIN_CLASS), )
     $1_JAVA_ARGS += -Xms8m
     $1_LAUNCHER_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
   endif
 
-  ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
-    $1_CFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
+  ifeq ($$($1_ENABLE_ARG_FILES), true)
+    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_FALSE
+  else
+    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_TRUE
+    # This must be the first argument given, if it should be present
+    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherArgFiles=false
   endif
 
-  ifeq ($$($1_ENABLE_ARG_FILES), true)
-    $1_CFLAGS += -DENABLE_ARG_FILES
+  ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
+    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_TRUE
+  else
+    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_FALSE
+    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherWildcards=false
   endif
 
+  $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherProgname=$1
+
   ifeq ($(call isTargetOs, windows), true)
     ifeq ($$($1_WINDOWS_JAVAW), true)
       $1_CFLAGS += -DJAVAW
@@ -94,9 +108,14 @@ define SetupBuildLauncherBody
   endif
 
   ifneq ($$($1_JAVA_ARGS), )
-    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
-        $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }'
+    $1_PREFIXED_JAVA_ARGS := $$(addprefix -J, $$($1_JAVA_ARGS)) \
+        $$($1_LAUNCHER_CLASS)
+    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, $$($1_PREFIXED_JAVA_ARGS), \
+        "$$a"$(COMMA) )) }'
     $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
+    # To preserve spaces, substitute them with a hopefully unique pattern
+    $1_RELAUNCHER_ARGUMENTS += \
+        -DjavaLauncherArgs=$$(subst $$(SPACE),||||,$$($1_PREFIXED_JAVA_ARGS))
   endif
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -172,8 +191,28 @@ define SetupBuildLauncherBody
   ))
 
   $1 += $$(BUILD_LAUNCHER_$1)
+
+  $1_RELAUNCHER_ARGUMENTS_FILE := \
+      $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$$(MODULE)/$1-relauncher-arguments.txt
+
+  $1_VARDEPS := $$($1_RELAUNCHER_ARGUMENTS)
+  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
+      $$($1_RELAUNCHER_ARGUMENTS_FILE).vardeps)
+
+  $$($1_RELAUNCHER_ARGUMENTS_FILE):
+	$$(call MakeDir, $$(@D))
+	$$(ECHO) '$$($1_RELAUNCHER_ARGUMENTS)' > $$@
+
+  $1 += $$($1_RELAUNCHER_ARGUMENTS_FILE)
+
   TARGETS += $$($1)
 
+  # Record the fact that this launcher is part of the current module.
+  INCLUDED_LAUNCHERS += $1
+
+  # Add a dependency from this launcher to the launcher list
+  $$(INCLUDED_LAUNCHERS_FILE): $$($1)
+
   $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -242,5 +281,14 @@ endif
 
 ################################################################################
 
+# We need to keep track of which launchers are created by this module. This
+# information is required for static builds, to know which relaunchers to
+# create. The file module-included-launchers.txt is then read in StaticLibs.gmk.
+$(INCLUDED_LAUNCHERS_FILE):
+	$(call MakeDir, $(@D))
+	$(ECHO) $(INCLUDED_LAUNCHERS) > $@
+
+TARGETS += $(INCLUDED_LAUNCHERS_FILE)
+
 endif # include guard
 include MakeIncludeEnd.gmk
diff --git a/make/modules/java.base/Launcher.gmk b/make/modules/java.base/Launcher.gmk
index c249656f188..3a3920acb12 100644
--- a/make/modules/java.base/Launcher.gmk
+++ b/make/modules/java.base/Launcher.gmk
@@ -73,7 +73,7 @@ ifeq ($(call isTargetOs, linux), true)
 
   $(eval $(call SetupJdkExecutable, BUILD_JEXEC, \
       NAME := jexec, \
-      SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \
+      EXTRA_FILES := $(TOPDIR)/src/$(MODULE)/unix/native/launcher/jexec.c, \
       OPTIMIZATION := LOW, \
       EXTRA_HEADER_DIRS := libjli, \
       CFLAGS_linux := -fPIC, \
diff --git a/make/modules/jdk.jpackage/Lib.gmk b/make/modules/jdk.jpackage/Lib.gmk
index 51d70c6d835..704436bbde6 100644
--- a/make/modules/jdk.jpackage/Lib.gmk
+++ b/make/modules/jdk.jpackage/Lib.gmk
@@ -25,7 +25,6 @@
 
 ################################################################################
 
-include LauncherCommon.gmk
 include LibCommon.gmk
 
 JPACKAGE_OUTPUT_DIR := \
diff --git a/src/java.base/share/native/launcher/defines.h b/src/java.base/share/native/launcher/defines.h
deleted file mode 100644
index a07a1db17a6..00000000000
--- a/src/java.base/share/native/launcher/defines.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#ifndef _DEFINES_H
-#define _DEFINES_H
-
-#include "java.h"
-
-#define STR_HELPER(x) #x
-#define STR(x) STR_HELPER(x)
-
-/*
- * This file contains commonly defined constants used only by main.c
- * and should not be included by another file.
- */
-#ifndef VERSION_STRING
-/* make sure the compilation fails */
-#error "VERSION_STRING must be defined"
-#endif
-
-/* Unused, but retained for JLI_Launch compatibility*/
-#define DOT_VERSION "0.0"
-
-#ifdef JAVA_ARGS
-#ifdef PROGNAME
-static const char* const_progname = PROGNAME;
-#else
-static char* const_progname = NULL;
-#endif
-static const char* const_jargs[] = JAVA_ARGS;
-#else  /* !JAVA_ARGS */
-static const char* const_progname = "java";
-static const char** const_jargs = NULL;
-#endif /* JAVA_ARGS */
-
-#ifdef LAUNCHER_NAME
-static const char* const_launcher = LAUNCHER_NAME;
-#else  /* LAUNCHER_NAME */
-static char* const_launcher = NULL;
-#endif /* LAUNCHER_NAME */
-
-#ifdef EXPAND_CLASSPATH_WILDCARDS
-static const jboolean const_cpwildcard = JNI_TRUE;
-#else
-static const jboolean const_cpwildcard = JNI_FALSE;
-#endif /* EXPAND_CLASSPATH_WILDCARDS */
-
-#ifdef ENABLE_ARG_FILES
-static const jboolean const_disable_argfile = JNI_FALSE;
-#else
-static const jboolean const_disable_argfile = JNI_TRUE;
-#endif
-#endif /*_DEFINES_H */
diff --git a/src/java.base/share/native/launcher/main.c b/src/java.base/share/native/launcher/main.c
index 4e42e03dfc7..6fa2a29dc7b 100644
--- a/src/java.base/share/native/launcher/main.c
+++ b/src/java.base/share/native/launcher/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,60 @@
  * tools. The rest of the files will be linked in.
  */
 
-#include "defines.h"
+#include "java.h"
 #include "jli_util.h"
 #include "jni.h"
 
+// Unused, but retained for JLI_Launch compatibility
+#define DOT_VERSION "0.0"
+
+// This is reported when requesting a full version
+static char* launcher = LAUNCHER_NAME;
+
+// This is used as the name of the executable in the help message
+static char* progname = PROGNAME;
+
+#ifdef JAVA_ARGS
+static const char* jargs[] = JAVA_ARGS;
+#else
+static const char** jargs = NULL;
+#endif
+static int jargc;
+
+static jboolean cpwildcard = CLASSPATH_WILDCARDS;
+static jboolean disable_argfile = DISABLE_ARGFILE;
+
+#ifdef STATIC_BUILD
+static void check_relauncher_argument(char* arg) {
+    if (strcmp(arg, "-J-DjavaLauncherWildcards=false") == 0) {
+        cpwildcard = JNI_FALSE;
+    }
+    const char *progname_prefix = "-J-DjavaLauncherProgname=";
+    size_t progname_prefix_len = strlen(progname_prefix);
+    if (strncmp(arg, progname_prefix, progname_prefix_len) == 0) {
+        progname = arg + progname_prefix_len;
+    }
+    const char *args_prefix = "-J-DjavaLauncherArgs=";
+    size_t args_prefix_len = strlen(args_prefix);
+    if (strncmp(arg, args_prefix, args_prefix_len) == 0) {
+        char* java_args_ptr = arg + args_prefix_len;
+        size_t java_args_len = strlen(arg) - args_prefix_len;
+
+        JLI_List java_args = JLI_List_new(java_args_len);
+        char* next_space;
+        while ((next_space = strchr(java_args_ptr, ' ')) != NULL) {
+            size_t next_arg_len = next_space - java_args_ptr;
+            JLI_List_addSubstring(java_args, java_args_ptr, next_arg_len);
+            java_args_ptr = next_space + 1;
+        }
+        JLI_List_add(java_args, java_args_ptr);
+
+        jargc = (int) java_args->size;
+        jargs = (const char**) java_args->elements;
+    }
+}
+#endif
+
 /*
  * Entry point.
  */
@@ -44,7 +94,7 @@ char **__initenv;
 int WINAPI
 WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow)
 {
-    const jboolean const_javaw = JNI_TRUE;
+    const jboolean javaw = JNI_TRUE;
 
     __initenv = _environ;
 
@@ -52,19 +102,25 @@ WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow)
 JNIEXPORT int
 main(int argc, char **argv)
 {
-    const jboolean const_javaw = JNI_FALSE;
+    const jboolean javaw = JNI_FALSE;
 #endif /* JAVAW */
 
     int margc;
     char** margv;
-    int jargc;
-    const char** jargv = const_jargs;
 
-    jargc = (sizeof(const_jargs) / sizeof(char *)) > 1
-        ? sizeof(const_jargs) / sizeof(char *)
+    jargc = (sizeof(jargs) / sizeof(char *)) > 1
+        ? sizeof(jargs) / sizeof(char *)
         : 0; // ignore the null terminator index
 
-    JLI_InitArgProcessing(jargc > 0, const_disable_argfile);
+#ifdef STATIC_BUILD
+        // Relaunchers always give -J-DjavaLauncherArgFiles as the first argument, if present
+        // We must check disable_argfile before calling JLI_InitArgProcessing.
+        if (argc > 1 && strcmp(argv[1], "-J-DjavaLauncherArgFiles=false") == 0) {
+            disable_argfile = JNI_TRUE;
+        }
+#endif
+
+    JLI_InitArgProcessing(jargc > 0, disable_argfile);
 
 #ifdef _WIN32
     {
@@ -103,6 +159,9 @@ main(int argc, char **argv)
         StdArg *stdargs = JLI_GetStdArgs();
         for (i = 0 ; i < margc ; i++) {
             margv[i] = stdargs[i].arg;
+#ifdef STATIC_BUILD
+            check_relauncher_argument(margv[i]);
+#endif
         }
         margv[i] = NULL;
     }
@@ -127,6 +186,9 @@ main(int argc, char **argv)
         }
         // Iterate the rest of command line
         for (i = 1; i < argc; i++) {
+#ifdef STATIC_BUILD
+            check_relauncher_argument(argv[i]);
+#endif
             JLI_List argsInFile = JLI_PreprocessArg(argv[i], JNI_TRUE);
             if (NULL == argsInFile) {
                 JLI_List_add(args, JLI_StringDup(argv[i]));
@@ -148,12 +210,12 @@ main(int argc, char **argv)
     }
 #endif /* WIN32 */
     return JLI_Launch(margc, margv,
-                   jargc, jargv,
+                   jargc, jargs,
                    0, NULL,
                    VERSION_STRING,
                    DOT_VERSION,
-                   (const_progname != NULL) ? const_progname : *margv,
-                   (const_launcher != NULL) ? const_launcher : *margv,
+                   progname,
+                   launcher,
                    jargc > 0,
-                   const_cpwildcard, const_javaw, 0);
+                   cpwildcard, javaw, 0);
 }
diff --git a/src/java.base/unix/native/launcher/relauncher.c b/src/java.base/unix/native/launcher/relauncher.c
new file mode 100644
index 00000000000..f95e3b38caa
--- /dev/null
+++ b/src/java.base/unix/native/launcher/relauncher.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define JAVA_EXECUTABLE_NAME "java"
+
+#ifndef LAUNCHER_ARGS
+#error LAUNCHER_ARGS must be defined
+#endif
+
+static char *launcher_args[] = LAUNCHER_ARGS;
+
+int main(int argc, char *argv[]) {
+    ////////////////////////////////////////////////////////////////////////////
+    // Create a fully qualified path to the java executable in the same
+    // directory as this file resides in.
+
+    char *our_full_path = realpath(argv[0], NULL);
+    if (our_full_path == NULL) {
+        perror("failed to get the full path of the executable");
+        return 1;
+    }
+
+    char *last_slash_pos = strrchr(our_full_path, '/');
+    if (last_slash_pos == NULL) {
+        fprintf(stderr, "no '/' found in the full path of the executable\n");
+        return 1;
+    }
+
+    size_t base_length = last_slash_pos - our_full_path + 1;
+    size_t java_path_length = base_length + strlen(JAVA_EXECUTABLE_NAME) + 1;
+
+    char *java_path = malloc(java_path_length);
+    if (java_path == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    memcpy(java_path, our_full_path, base_length);
+    strcpy(java_path + base_length, JAVA_EXECUTABLE_NAME);
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Build the argument list: our executable name + launcher args + users args
+
+    int launcher_argsc = sizeof(launcher_args) / sizeof(char *);
+
+    char **java_args = malloc((launcher_argsc + argc + 1) * sizeof(char *));
+    if (java_args == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    // Our executable name
+    java_args[0] = argv[0];
+
+    // Launcher arguments
+    for (int i = 0; i < launcher_argsc; i++) {
+        java_args[i + 1] = launcher_args[i];
+    }
+
+    // User arguments
+    for (int i = 1; i < argc; i++) {
+        java_args[launcher_argsc + i] = argv[i];
+    }
+
+    java_args[launcher_argsc + argc] = NULL;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Finally execute the real java process with the constructed arguments
+
+    if (getenv("_JAVA_LAUNCHER_DEBUG")) {
+        char *program_name = basename(argv[0]);
+
+        fprintf(stderr, "%s: executing: '%s'", program_name, java_path);
+        for (int i = 0; java_args[i] != NULL; i++) {
+            fprintf(stderr, " '%s' ", java_args[i]);
+        }
+        fprintf(stderr, "\n");
+    }
+
+    execv(java_path, java_args);
+
+    // Should not reach here, unless something went wrong
+    perror("execv failed");
+    return 1;
+}
diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c
index 0a61971b080..a75795af580 100644
--- a/src/java.base/unix/native/libjli/java_md.c
+++ b/src/java.base/unix/native/libjli/java_md.c
@@ -276,6 +276,9 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
                            char jdkroot[], jint so_jdkroot,
                            char jvmpath[], jint so_jvmpath,
                            char jvmcfg[],  jint so_jvmcfg) {
+    /* Compute/set the name of the executable */
+    SetExecname(*pargv);
+
     if (JLI_IsStaticallyLinked()) {
         // With static builds, all JDK and VM natives are statically linked
         // with the launcher executable. No need to manipulate LD_LIBRARY_PATH
@@ -297,9 +300,6 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
     size_t new_runpath_size;
 #endif  /* SETENV_REQUIRED */
 
-    /* Compute/set the name of the executable */
-    SetExecname(*pargv);
-
     /* Check to see if the jvmpath exists */
     /* Find out where the JDK is that we will be using. */
     if (!GetJDKInstallRoot(jdkroot, so_jdkroot, JNI_FALSE)) {
diff --git a/src/java.base/windows/native/launcher/relauncher.c b/src/java.base/windows/native/launcher/relauncher.c
new file mode 100644
index 00000000000..6487406c04e
--- /dev/null
+++ b/src/java.base/windows/native/launcher/relauncher.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <shlwapi.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <windows.h>
+
+#define JAVA_EXECUTABLE_NAME "java.exe"
+
+#ifndef LAUNCHER_ARGS
+#error LAUNCHER_ARGS must be defined
+#endif
+
+static char* launcher_args[] = LAUNCHER_ARGS;
+
+char* quote_argument(char* arg) {
+    // See https://learn.microsoft.com/en-us/archive/blogs/twistylittlepassagesallalike/everyone-quotes-command-line-arguments-the-wrong-way
+    // for an explanation of how to properly quote command lines for CreateProcess
+    size_t arg_length = strlen(arg);
+
+    if (strcspn(arg, " \t\n\v\"") == arg_length) {
+        // No quoting is needed
+        return arg;
+    }
+
+    // Worst-case buffer size: all characters need a backslash, and starting + end quotes
+    size_t buffer_size = arg_length * 2 + 3;
+    char* buffer = malloc(buffer_size);
+    if (buffer == NULL) {
+        return NULL;
+    }
+
+    int backslashes = 0;
+    char* write_pos = buffer;
+    char* read_pos = arg;
+
+    // Start with a quote character
+    *write_pos++ = '"';
+
+    while (*read_pos) {
+        while (*read_pos == '\\') {
+            read_pos++;
+            backslashes++;
+        }
+
+        if (*read_pos == '"') {
+            // Any potential backslashes before a quote needs to be doubled,
+            // and the quote needs to be escaped with an additional backslash
+            for (int i = 0; i < backslashes * 2 + 1; i++) {
+                *write_pos++ = '\\';
+            }
+            *write_pos++ = *read_pos++;
+            backslashes = 0;
+        } else {
+            // Backslashes not preceeding a quote are copied without escaping
+            for (int i = 0; i < backslashes; i++) {
+                *write_pos++ = '\\';
+            }
+            if (*read_pos) {
+                *write_pos++ = *read_pos++;
+                backslashes = 0;
+            }
+        }
+    }
+
+    // If the string ended with backslashes, they need to be doubled before
+    // the final quote character
+    for (int i = 0; i < backslashes; i++) {
+        *write_pos++ = '\\';
+    }
+    *write_pos++ = '"';
+    *write_pos = '\0';
+
+    return buffer;
+}
+
+int main(int argc, char* argv[]) {
+    ////////////////////////////////////////////////////////////////////////////
+    // Create a fully qualified path to the java executable in the same
+    // directory as this file resides in.
+
+    // Calculate path length first
+    DWORD our_full_path_len = GetFullPathName(argv[0], 0, NULL, NULL);
+    if (our_full_path_len == 0) {
+        fprintf(stderr, "failed to get the full path of the executable: %lu\n", GetLastError());
+        return 1;
+    }
+
+    char* our_full_path = malloc(our_full_path_len + 1);
+    if (our_full_path == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    if (GetFullPathName(argv[0], our_full_path_len + 1, our_full_path, NULL) == 0) {
+        fprintf(stderr, "failed to get the full path of the executable: %lu\n", GetLastError());
+        return 1;
+    }
+
+    char *last_slash_pos = strrchr(our_full_path, '\\');
+    if (last_slash_pos == NULL) {
+        fprintf(stderr, "no '\\' found in the full path of the executable\n");
+        return 1;
+    }
+
+    size_t base_length = last_slash_pos - our_full_path + 1;
+    size_t java_path_length = base_length + strlen(JAVA_EXECUTABLE_NAME) + 1;
+
+    char *java_path = malloc(java_path_length);
+    if (java_path == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    memcpy(java_path, our_full_path, base_length);
+    strcpy(java_path + base_length, JAVA_EXECUTABLE_NAME);
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Build the argument list: our executable name + launcher args + users args
+
+    int launcher_argsc = sizeof(launcher_args) / sizeof(char *);
+
+    char **java_args = malloc((launcher_argsc + argc + 1) * sizeof(char *));
+    if (java_args == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    // Our executable name
+    java_args[0] = quote_argument(argv[0]);
+    if (java_args[0] == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    // Launcher arguments
+    for (int i = 0; i < launcher_argsc; i++) {
+        char* quoted = quote_argument(launcher_args[i]);
+        if (quoted == NULL) {
+            perror("malloc failed");
+            return 1;
+        }
+        java_args[i + 1] = quoted;
+    }
+
+    // User arguments
+    for (int i = 1; i < argc; i++) {
+        char* quoted = quote_argument(argv[i]);
+        if (quoted == NULL) {
+            perror("malloc failed");
+            return 1;
+        }
+        java_args[launcher_argsc + i] = quoted;
+    }
+
+    java_args[launcher_argsc + argc] = NULL;
+
+    // Windows needs the command line as a single string, not as an array of char*
+    size_t total_length = 0;
+    for (int i = 0; java_args[i] != NULL; i++) {
+        char* arg = java_args[i];
+        total_length += strlen(java_args[i]) + 1;
+    }
+
+    char* command_line = malloc(total_length);
+    if (command_line == NULL) {
+        perror("malloc failed");
+        return 1;
+    }
+
+    // Concatenate the quoted arguments with a space between them
+    char* write_pos = command_line;
+    for (int i = 0; java_args[i] != NULL; i++) {
+        size_t arg_len = strlen(java_args[i]);
+        memcpy(write_pos, java_args[i], arg_len);
+        write_pos += arg_len;
+
+        // Append a space
+        *write_pos++ = ' ';
+    }
+
+    // Replace the last space with a null terminator
+    write_pos--;
+    *write_pos = '\0';
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Finally execute the real java process with the constructed arguments
+
+    if (GetEnvironmentVariable("_JAVA_LAUNCHER_DEBUG", NULL, 0)) {
+        char *program_name = PathFindFileName(argv[0]);
+
+        fprintf(stderr, "%s: executing: '%s' '%s'\n", program_name, java_path, command_line);
+    }
+
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+
+    memset(&si, 0, sizeof(si));
+    memset(&pi, 0, sizeof(pi));
+
+    // Windows has no equivalent of exec, so start the process and wait for it
+    // to finish, to be able to return the same exit code
+    if (!CreateProcess(java_path, command_line, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
+        fprintf(stderr, "CreateProcess failed: %lu\n", GetLastError());
+        return 1;
+    }
+
+    if (WaitForSingleObject(pi.hProcess, INFINITE) == WAIT_FAILED) {
+        fprintf(stderr, "WaitForSingleObject failed: %lu\n", GetLastError());
+        return 1;
+    }
+
+    DWORD exit_code;
+    if (!GetExitCodeProcess(pi.hProcess, &exit_code)) {
+        fprintf(stderr, "GetExitCodeProcess failed: %lu\n", GetLastError());
+        return 1;
+    }
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+
+    return exit_code;
+}
diff --git a/test/hotspot/jtreg/ProblemList-StaticJdk.txt b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
index 1681fb74634..1e5538ca5b9 100644
--- a/test/hotspot/jtreg/ProblemList-StaticJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
@@ -1,38 +1,3 @@
-# Require javac
-runtime/HiddenClasses/DefineHiddenClass.java            8346719 generic-all
-
-# Require jstack
-runtime/Thread/TestThreadDumpClassInitMonitor.java      8346719 generic-all
-runtime/Thread/TestThreadDumpSMRInfo.java               8346719 generic-all
-serviceability/tmtools/jstack/DaemonThreadTest.java     8346719 generic-all
-serviceability/tmtools/jstack/JstackThreadTest.java     8346719 generic-all
-serviceability/tmtools/jstack/SpreadLockTest.java       8346719 generic-all
-serviceability/tmtools/jstack/ThreadNamesTest.java      8346719 generic-all
-serviceability/tmtools/jstack/TraveledLockTest.java     8346719 generic-all
-serviceability/tmtools/jstack/WaitNotifyThreadTest.java 8346719 generic-all
-serviceability/tmtools/jstat/GcCapacityTest.java        8346719 generic-all
-serviceability/tmtools/jstat/GcCauseTest01.java         8346719 generic-all
-serviceability/tmtools/jstat/GcCauseTest02.java         8346719 generic-all
-serviceability/tmtools/jstat/GcCauseTest03.java         8346719 generic-all
-serviceability/tmtools/jstat/GcNewTest.java             8346719 generic-all
-serviceability/tmtools/jstat/GcTest01.java              8346719 generic-all
-serviceability/tmtools/jstat/GcTest02.java              8346719 generic-all
-
-# Require jcmd
-serviceability/HeapDump/DuplicateArrayClassesTest.java  8346719 generic-all
-serviceability/HeapDump/FieldsInInstanceTest.java       8346719 generic-all
-serviceability/attach/ConcAttachTest.java               8346719 generic-all
-serviceability/attach/RemovingUnixDomainSocketTest.java 8346719 generic-all
-serviceability/jvmti/vthread/HeapDump/VThreadInHeapDump.java#default            8346719 generic-all
-serviceability/jvmti/vthread/HeapDump/VThreadInHeapDump.java#no-vmcontinuations 8346719 generic-all
-
-# Require jhsdb
-serviceability/sa/ClhsdbCDSCore.java                    8346719 generic-all
-serviceability/sa/ClhsdbFindPC.java#no-xcomp-core       8346719 generic-all
-serviceability/sa/ClhsdbFindPC.java#xcomp-core          8346719 generic-all
-serviceability/sa/ClhsdbPmap.java#core                  8346719 generic-all
-serviceability/sa/ClhsdbPstack.java#core                8346719 generic-all
-
 # Dynamically link with JDK/VM native libraries
 gtest/GTestWrapper.java                                 8356201 generic-all
 gtest/LargePageGtests.java#use-large-pages              8356201 generic-all
diff --git a/test/jdk/ProblemList-StaticJdk.txt b/test/jdk/ProblemList-StaticJdk.txt
index 12ff29dbae9..70f0438c0c6 100644
--- a/test/jdk/ProblemList-StaticJdk.txt
+++ b/test/jdk/ProblemList-StaticJdk.txt
@@ -1,14 +1,26 @@
-# Require jarsigner
-java/lang/System/LoggerFinder/SignedLoggerFinderTest/SignedLoggerFinderTest.java 8346719 generic-all
-java/util/jar/JarFile/jarVerification/MultiProviderTest.java                     8346719 generic-all
+###########################################################################
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+###########################################################################
 
-# Require jar
-java/lang/System/MacEncoding/TestFileEncoding.java                               8346719 generic-all
-java/util/ResourceBundle/modules/basic/BasicTest.java                            8346719 generic-all
-
-# Require javac
-java/util/ResourceBundle/modules/layer/LayerTest.java                            8346719 generic-all
-java/util/ResourceBundle/modules/unnamed/UnNamedTest.java                        8346719 generic-all
-
-# Require jps
-java/util/concurrent/locks/Lock/TimedAcquireLeak.java                            8346719 generic-all
+# Currently empty
diff --git a/test/langtools/ProblemList-StaticJdk.txt b/test/langtools/ProblemList-StaticJdk.txt
index 85fa3a6e14d..70f0438c0c6 100644
--- a/test/langtools/ProblemList-StaticJdk.txt
+++ b/test/langtools/ProblemList-StaticJdk.txt
@@ -1,29 +1,26 @@
-# Requires javadoc
-jdk/javadoc/tool/6964914/TestStdDoclet.java                                8346719 generic-all
-jdk/javadoc/tool/6964914/TestUserDoclet.java                               8346719 generic-all
-jdk/javadoc/tool/AddOpensTest.java                                         8346719 generic-all
-jdk/javadoc/tool/EncodingTest.java                                         8346719 generic-all
-jdk/javadoc/tool/EnsureNewOldDoclet.java                                   8346719 generic-all
-jdk/javadoc/tool/QuietOption.java                                          8346719 generic-all
-jdk/javadoc/tool/testLocaleOption/TestLocaleOption.java                    8346719 generic-all
+###########################################################################
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+###########################################################################
 
-# Requires javac
-tools/javac/ClassPathTest/ClassPathTest.java                               8346719 generic-all
-tools/javac/Paths/ClassPath.java                                           8346719 generic-all
-tools/javac/Paths/WildcardMineField.java                                   8346719 generic-all
-tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java                    8346719 generic-all
-tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java                  8346719 generic-all
-tools/javac/modules/AllDefaultTest.java                                    8346719 generic-all
-tools/javac/modules/EnvVarTest.java                                        8346719 generic-all
-tools/javac/modules/InheritRuntimeEnvironmentTest.java                     8346719 generic-all
-tools/javac/modules/NPEEmptyFileTest.java                                  8346719 generic-all
-tools/javac/newlines/NewLineTest.java                                      8346719 generic-all
-tools/javac/options/smokeTests/OptionSmokeTest.java                        8346719 generic-all
-tools/javac/platform/PlatformProviderTest.java                             8346719 generic-all
-tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java 8346719 generic-all
-
-# Requires jar
-tools/jdeps/MultiReleaseJar.java                                           8346719 generic-all
-
-# Requires jimage
-tools/javac/Paths/MineField.java                                           8346719 generic-all
+# Currently empty
diff --git a/test/lib-test/ProblemList-StaticJdk.txt b/test/lib-test/ProblemList-StaticJdk.txt
index 3d151e07d41..70f0438c0c6 100644
--- a/test/lib-test/ProblemList-StaticJdk.txt
+++ b/test/lib-test/ProblemList-StaticJdk.txt
@@ -1,2 +1,26 @@
-# Requires jcmd
-jdk/test/lib/hprof/HprofTest.java   8346719 generic-all
+###########################################################################
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+###########################################################################
+
+# Currently empty

From 973dc3fc47b249bb392d277880dcac0940f62771 Mon Sep 17 00:00:00 2001
From: EunHyunsu <ehs208@naver.com>
Date: Wed, 5 Nov 2025 14:57:05 +0000
Subject: [PATCH 042/512] 8371009: HttpClient javadoc synchronous example
 missing HttpRequest variable declaration

Reviewed-by: dfuchs, michaelm
---
 .../share/classes/java/net/http/HttpClient.java             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java.net.http/share/classes/java/net/http/HttpClient.java b/src/java.net.http/share/classes/java/net/http/HttpClient.java
index 889ea56531e..a7a2171857d 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpClient.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpClient.java
@@ -102,13 +102,17 @@ import jdk.internal.net.http.HttpClientBuilderImpl;
  *        .proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
  *        .authenticator(Authenticator.getDefault())
  *        .build();
+ *
+ *   HttpRequest request = HttpRequest.newBuilder()
+ *       .uri(URI.create("https://foo.com/"))
+ *       .build();
  *   HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
  *   System.out.println(response.statusCode());
  *   System.out.println(response.body());  }
  *
  * <p><b>Asynchronous Example</b>
  * {@snippet :
- *    HttpRequest request = HttpRequest.newBuilder()
+ *   HttpRequest request = HttpRequest.newBuilder()
  *        .uri(URI.create("https://foo.com/"))
  *        .timeout(Duration.ofMinutes(2))
  *        .header("Content-Type", "application/json")

From b0536f9c2a6ddfa27be8fad8f53783c6b28d22c9 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 5 Nov 2025 15:56:08 +0000
Subject: [PATCH 043/512] 8370201: Test
 serviceability/sa/TestJhsdbJstackWithVirtualThread.java fails due to VM
 warnings

Reviewed-by: kevinw, amenkov, sspitsyn
---
 .../serviceability/attach/RemovingUnixDomainSocketTest.java   | 4 ++--
 .../jtreg/serviceability/sa/ClhsdbJstackXcompStress.java      | 2 +-
 test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java | 4 ++--
 test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java | 4 ++--
 .../serviceability/sa/TestJhsdbJstackWithVirtualThread.java   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/attach/RemovingUnixDomainSocketTest.java b/test/hotspot/jtreg/serviceability/attach/RemovingUnixDomainSocketTest.java
index 3e15b24b5d4..22083ee1334 100644
--- a/test/hotspot/jtreg/serviceability/attach/RemovingUnixDomainSocketTest.java
+++ b/test/hotspot/jtreg/serviceability/attach/RemovingUnixDomainSocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ public class RemovingUnixDomainSocketTest {
             "jcmd  exitValue = " + out.getExitValue());
 
         out.shouldHaveExitValue(0);
-        out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
+        out.stderrShouldBeEmptyIgnoreVMWarnings();
     }
 
     public static void main(String... args) throws Exception {
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java
index bb35e6c5aff..4b02c01119d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java
@@ -75,7 +75,7 @@ public class ClhsdbJstackXcompStress {
                 System.err.println(out.getStderr());
             }
 
-            out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
+            out.stderrShouldBeEmptyIgnoreVMWarnings();
             out.stdoutShouldNotContain("Error occurred during stack walking:");
             out.stdoutShouldContain(LingeredAppWithRecComputation.THREAD_NAME);
             List<String> stdoutList = Arrays.asList(out.getStdout().split("\\R"));
diff --git a/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java b/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
index 798de679d7c..75942f7113a 100644
--- a/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ public class JhsdbThreadInfoTest {
             out.shouldNotContain(" prio=0 ");
             out.shouldNotContain("   java.lang.Thread.State: UNKNOWN");
 
-            out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
+            out.stderrShouldBeEmptyIgnoreVMWarnings();
 
             System.out.println("Test Completed");
         } catch (Exception ex) {
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
index 8d5c95721d5..ac536523815 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public class TestJhsdbJstackLock {
             out.shouldMatch("^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for int\\)$");
             out.shouldMatch("^\\s+- waiting on (<0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)|<no object reference available>)$");
 
-            out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
+            out.stderrShouldBeEmptyIgnoreVMWarnings();
 
             System.out.println("Test Completed");
         } finally {
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackWithVirtualThread.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackWithVirtualThread.java
index 6d7921c7ed8..39b6e1ed609 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackWithVirtualThread.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackWithVirtualThread.java
@@ -58,7 +58,7 @@ public class TestJhsdbJstackWithVirtualThread {
         System.out.println(out.getStdout());
         System.err.println(out.getStderr());
 
-        out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
+        out.stderrShouldBeEmptyIgnoreVMWarnings();
         out.shouldNotContain("must have non-zero frame size");
     }
 

From cf45e09c388e95b5f11ad08ebdf7f277e968f90b Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 5 Nov 2025 18:03:22 +0000
Subject: [PATCH 044/512] 8371354: Problem list
 serviceability/sa/TestJhsdbJstackMixedWithXComp.java due to JDK-8371194

Reviewed-by: kevinw
---
 test/hotspot/jtreg/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 0b9630e9434..1e4ac9e2848 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -144,6 +144,7 @@ serviceability/sa/TestJmapCore.java               8318754 macosx-aarch64
 serviceability/sa/TestJmapCoreMetaspace.java      8318754 macosx-aarch64
 
 serviceability/sa/ClhsdbThreadContext.java        8356704 windows-x64
+serviceability/sa/TestJhsdbJstackMixedWithXComp.java 8371194 linux-x64
 
 serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java 8315980 linux-all,windows-x64
 

From 7d93cb73c45d393705504f0637b12512124923a1 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 5 Nov 2025 18:52:26 +0000
Subject: [PATCH 045/512] 8370637: [Windows] Crash if use Graphics after
 PrintJob.end

Reviewed-by: azvegint, psadhukhan, aivanov
---
 .../classes/sun/awt/windows/WPrinterJob.java  | 142 +++++++++---------
 .../native/libawt/windows/awt_PrintJob.cpp    | 128 +++++++++++++++-
 .../awt/PrintJob/PrintJobAfterEndTest.java    |  12 +-
 .../print/PrinterJob/PrintAfterEndTest.java   |   4 +-
 4 files changed, 206 insertions(+), 80 deletions(-)

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index 17d41036bcc..01be8587685 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -929,35 +929,35 @@ public final class WPrinterJob extends RasterPrinterJob
      * Return the Window's device context that we are printing
      * into.
      */
-    private long getPrintDC() {
+    private synchronized long getPrintDC() {
         return handleRecord.mPrintDC;
     }
 
-    private void setPrintDC(long mPrintDC) {
+    private synchronized void setPrintDC(long mPrintDC) {
         handleRecord.mPrintDC = mPrintDC;
     }
 
-    private long getDevMode() {
+    private synchronized long getDevMode() {
         return handleRecord.mPrintHDevMode;
     }
 
-    private void setDevMode(long mPrintHDevMode) {
+    private synchronized void setDevMode(long mPrintHDevMode) {
         handleRecord.mPrintHDevMode = mPrintHDevMode;
     }
 
-    private long getDevNames() {
+    private synchronized long getDevNames() {
         return handleRecord.mPrintHDevNames;
     }
 
-    private void setDevNames(long mPrintHDevNames) {
+    private synchronized void setDevNames(long mPrintHDevNames) {
         handleRecord.mPrintHDevNames = mPrintHDevNames;
     }
 
-    protected void beginPath() {
+    protected synchronized void beginPath() {
         beginPath(getPrintDC());
     }
 
-    protected void endPath() {
+    protected synchronized void endPath() {
         endPath(getPrintDC());
     }
 
@@ -972,23 +972,23 @@ public final class WPrinterJob extends RasterPrinterJob
         setGraphicsMode(graphicsMode);
     }
 
-    protected void closeFigure() {
+    protected synchronized void closeFigure() {
         closeFigure(getPrintDC());
     }
 
-    protected void fillPath() {
+    protected synchronized void fillPath() {
         fillPath(getPrintDC());
     }
 
-    protected void moveTo(float x, float y) {
+    protected synchronized void moveTo(float x, float y) {
         moveTo(getPrintDC(), x, y);
     }
 
-    protected void lineTo(float x, float y) {
+    protected synchronized void lineTo(float x, float y) {
         lineTo(getPrintDC(), x, y);
     }
 
-    protected void polyBezierTo(float control1x, float control1y,
+    protected synchronized void polyBezierTo(float control1x, float control1y,
                                 float control2x, float control2y,
                                 float endX, float endY) {
 
@@ -1003,14 +1003,14 @@ public final class WPrinterJob extends RasterPrinterJob
      * be one of the following Windows constants:
      * {@code ALTERNATE} or {@code WINDING}.
      */
-    protected void setPolyFillMode(int fillRule) {
+    protected synchronized void setPolyFillMode(int fillRule) {
         setPolyFillMode(getPrintDC(), fillRule);
     }
 
     /**
      * Set the GDI graphics mode to {@code GM_ADVANCED}.
      */
-    private int setAdvancedGraphicsMode() {
+    private synchronized int setAdvancedGraphicsMode() {
         return setAdvancedGraphicsMode(getPrintDC());
     }
 
@@ -1020,28 +1020,28 @@ public final class WPrinterJob extends RasterPrinterJob
      * be one of the following Windows constants:
      * {@code GM_COMPATIBLE} or {@code GM_ADVANCED}.
      */
-    private void setGraphicsMode(int mode) {
+    private synchronized void setGraphicsMode(int mode) {
         setGraphicsMode(getPrintDC(), mode);
     }
 
     /**
      * Scale the GDI World Transform.
      */
-    private void scale(double scaleX, double scaleY) {
+    private synchronized void scale(double scaleX, double scaleY) {
         scale(getPrintDC(), scaleX, scaleY);
     }
 
     /**
      * Get the GDI World Transform.
      */
-    private void getWorldTransform(double[] transform) {
+    private synchronized void getWorldTransform(double[] transform) {
         getWorldTransform(getPrintDC(), transform);
     }
 
     /**
      * Set the GDI World Transform.
      */
-    private void setWorldTransform(double[] transform) {
+    private synchronized void setWorldTransform(double[] transform) {
         setWorldTransform(getPrintDC(), transform);
     }
 
@@ -1051,7 +1051,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * is created, select it in the current printing device
      * context and free the old brush.
      */
-    protected void selectSolidBrush(Color color) {
+    protected synchronized void selectSolidBrush(Color color) {
 
         /* We only need to select a brush if the color has changed.
         */
@@ -1070,7 +1070,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Return the x coordinate of the current pen
      * position in the print device context.
      */
-    protected int getPenX() {
+    protected synchronized int getPenX() {
 
         return getPenX(getPrintDC());
     }
@@ -1080,7 +1080,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Return the y coordinate of the current pen
      * position in the print device context.
      */
-    protected int getPenY() {
+    protected synchronized int getPenY() {
 
         return getPenY(getPrintDC());
     }
@@ -1089,16 +1089,16 @@ public final class WPrinterJob extends RasterPrinterJob
      * Set the current path in the printer device's
      * context to be clipping path.
      */
-    protected void selectClipPath() {
+    protected synchronized void selectClipPath() {
         selectClipPath(getPrintDC());
     }
 
 
-    protected void frameRect(float x, float y, float width, float height) {
+    protected synchronized void frameRect(float x, float y, float width, float height) {
         frameRect(getPrintDC(), x, y, width, height);
     }
 
-    protected void fillRect(float x, float y, float width, float height,
+    protected synchronized void fillRect(float x, float y, float width, float height,
                             Color color) {
         float[] rgb = color.getRGBColorComponents(null);
 
@@ -1109,7 +1109,7 @@ public final class WPrinterJob extends RasterPrinterJob
     }
 
 
-    protected void selectPen(float width, Color color) {
+    protected synchronized void selectPen(float width, Color color) {
 
         float[] rgb = color.getRGBColorComponents(null);
 
@@ -1120,7 +1120,7 @@ public final class WPrinterJob extends RasterPrinterJob
     }
 
 
-    protected boolean selectStylePen(int cap, int join, float width,
+    protected synchronized boolean selectStylePen(int cap, int join, float width,
                                      Color color) {
 
         long endCap;
@@ -1152,7 +1152,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Set a GDI font capable of drawing the java Font
      * passed in.
      */
-    protected boolean setFont(String family, float size, int style,
+    protected synchronized boolean setFont(String family, float size, int style,
                               int rotation, float awScale) {
 
         if (family.isEmpty()) {
@@ -1187,7 +1187,7 @@ public final class WPrinterJob extends RasterPrinterJob
     /**
      * Set the GDI color for text drawing.
      */
-    protected void setTextColor(Color color) {
+    protected synchronized void setTextColor(Color color) {
 
         /* We only need to select a brush if the color has changed.
         */
@@ -1206,7 +1206,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Draw the string {@code text} to the printer's
      * device context at the specified position.
      */
-    protected void textOut(String str, float x, float y,
+    protected synchronized void textOut(String str, float x, float y,
                            float[] positions) {
         /* Don't leave handling of control chars to GDI.
          * If control chars are removed,  'positions' isn't valid.
@@ -1226,7 +1226,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Draw the glyphs {@code glyphs} to the printer's
      * device context at the specified position.
      */
-    protected void glyphsOut(int []glyphs, float x, float y,
+    protected synchronized void glyphsOut(int []glyphs, float x, float y,
                              float[] positions) {
 
         /* TrueType glyph codes are 16 bit values, so can be packed
@@ -1254,7 +1254,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * rendering so also remove them for measurement so that
      * this measurement can be properly compared with JDK measurement.
      */
-    protected int getGDIAdvance(String text) {
+    protected synchronized int getGDIAdvance(String text) {
         /* Don't leave handling of control chars to GDI. */
         text = removeControlChars(text);
         if (text.length() == 0) {
@@ -1275,7 +1275,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * by {@code srcX}, {@code srcY},
      * {@code srcWidth}, and srcHeight.
      */
-    protected void drawImage3ByteBGR(byte[] image,
+    protected synchronized void drawImage3ByteBGR(byte[] image,
                                      float destX, float destY,
                                      float destWidth, float destHeight,
                                      float srcX, float srcY,
@@ -1306,7 +1306,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * There's no alignment problem as GDI expects this to be packed
      * and each struct will start on a 4 byte boundary anyway.
      */
-    protected void drawDIBImage(byte[] image,
+    protected synchronized void drawDIBImage(byte[] image,
                                 float destX, float destY,
                                 float destWidth, float destHeight,
                                 float srcX, float srcY,
@@ -1338,7 +1338,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Begin a new page.
      */
     @Override
-    protected void startPage(PageFormat format, Printable painter,
+    protected synchronized void startPage(PageFormat format, Printable painter,
                              int index, boolean paperChanged) {
 
         /* Invalidate any device state caches we are
@@ -1355,7 +1355,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * End a page.
      */
     @Override
-    protected void endPage(PageFormat format, Printable painter,
+    protected synchronized void endPage(PageFormat format, Printable painter,
                            int index) {
 
         deviceEndPage(format, painter, index);
@@ -1402,7 +1402,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * is reflected back up to Java code
      */
     @Override
-    protected native void initPrinter();
+    protected synchronized native void initPrinter();
 
     /**
      * Call Window's StartDoc routine to begin a
@@ -1415,10 +1415,10 @@ public final class WPrinterJob extends RasterPrinterJob
      * user may cancel out of it. Note that the implementation of
      * cancel() throws PrinterAbortException to indicate the user cancelled.
      */
-    private native boolean _startDoc(String dest, String jobName)
+    private synchronized native boolean _startDoc(String dest, String jobName)
                                      throws PrinterException;
     @Override
-    protected void startDoc() throws PrinterException {
+    protected synchronized void startDoc() throws PrinterException {
         if (!_startDoc(mDestination, getJobName())) {
             cancel();
         }
@@ -1429,31 +1429,31 @@ public final class WPrinterJob extends RasterPrinterJob
      * print job.
      */
     @Override
-    protected native void endDoc();
+    protected synchronized native void endDoc();
 
     /**
      * Call Window's AbortDoc routine to abort a
      * print job.
      */
     @Override
-    protected native void abortDoc();
+    protected synchronized native void abortDoc();
 
     /**
      * Call Windows native resource freeing APIs
      */
-    private static native void deleteDC(long dc, long devmode, long devnames);
+    private static synchronized native void deleteDC(long dc, long devmode, long devnames);
 
     /**
      * Begin a new page. This call's Window's
      * StartPage routine.
      */
-    protected native void deviceStartPage(PageFormat format, Printable painter,
+    protected synchronized native void deviceStartPage(PageFormat format, Printable painter,
                                           int index, boolean paperChanged);
     /**
      * End a page. This call's Window's EndPage
      * routine.
      */
-    protected native void deviceEndPage(PageFormat format, Printable painter,
+    protected synchronized native void deviceEndPage(PageFormat format, Printable painter,
                                         int index);
 
     /**
@@ -1464,46 +1464,46 @@ public final class WPrinterJob extends RasterPrinterJob
      * specified by the caller.
      */
     @Override
-    protected native void printBand(byte[] data, int x, int y,
+    protected synchronized native void printBand(byte[] data, int x, int y,
                                     int width, int height);
 
     /**
      * Begin a Window's rendering path in the device
      * context {@code printDC}.
      */
-    protected native void beginPath(long printDC);
+    protected synchronized native void beginPath(long printDC);
 
     /**
      * End a Window's rendering path in the device
      * context {@code printDC}.
      */
-    protected native void endPath(long printDC);
+    protected synchronized native void endPath(long printDC);
 
     /**
      * Close a subpath in a Window's rendering path in the device
      * context {@code printDC}.
      */
-    protected native void closeFigure(long printDC);
+    protected synchronized native void closeFigure(long printDC);
 
     /**
      * Fill a defined Window's rendering path in the device
      * context {@code printDC}.
      */
-    protected native void fillPath(long printDC);
+    protected synchronized native void fillPath(long printDC);
 
     /**
      * Move the Window's pen position to {@code (x,y)}
      * in the device context {@code printDC}.
      */
-    protected native void moveTo(long printDC, float x, float y);
+    protected synchronized native void moveTo(long printDC, float x, float y);
 
     /**
      * Draw a line from the current pen position to
      * {@code (x,y)} in the device context {@code printDC}.
      */
-    protected native void lineTo(long printDC, float x, float y);
+    protected synchronized native void lineTo(long printDC, float x, float y);
 
-    protected native void polyBezierTo(long printDC,
+    protected synchronized native void polyBezierTo(long printDC,
                                        float control1x, float control1y,
                                        float control2x, float control2y,
                                        float endX, float endY);
@@ -1514,13 +1514,13 @@ public final class WPrinterJob extends RasterPrinterJob
      * be one of the following Windows constants:
      * {@code ALTERNATE} or {@code WINDING}.
      */
-    protected native void setPolyFillMode(long printDC, int fillRule);
+    protected synchronized native void setPolyFillMode(long printDC, int fillRule);
 
     /**
      * Set the GDI graphics mode to {@code GM_ADVANCED}
      * into the device context {@code printDC}.
      */
-    protected native int setAdvancedGraphicsMode(long printDC);
+    protected synchronized native int setAdvancedGraphicsMode(long printDC);
 
     /**
      * Set the GDI graphics {@code mode}
@@ -1529,25 +1529,25 @@ public final class WPrinterJob extends RasterPrinterJob
      * be one of the following Windows constants:
      * {@code GM_COMPATIBLE} or {@code GM_ADVANCED}.
      */
-    protected native void setGraphicsMode(long printDC, int mode);
+    protected synchronized native void setGraphicsMode(long printDC, int mode);
 
     /**
      * Scale the GDI World Transform
      * of the device context {@code printDC}.
      */
-    protected native void scale(long printDC, double scaleX, double scaleY);
+    protected synchronized native void scale(long printDC, double scaleX, double scaleY);
 
     /**
      * Get the GDI World Transform
      * from the device context {@code printDC}.
      */
-    protected native void getWorldTransform(long printDC, double[] transform);
+    protected synchronized native void getWorldTransform(long printDC, double[] transform);
 
     /**
      * Set the GDI World Transform
      * into the device context {@code printDC}.
      */
-    protected native void setWorldTransform(long printDC, double[] transform);
+    protected synchronized native void setWorldTransform(long printDC, double[] transform);
 
     /**
      * Create a Window's solid brush for the color specified
@@ -1555,7 +1555,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * is created, select it in the device
      * context {@code printDC} and free the old brush.
      */
-    protected native void selectSolidBrush(long printDC,
+    protected synchronized native void selectSolidBrush(long printDC,
                                            int red, int green, int blue);
 
     /**
@@ -1563,32 +1563,32 @@ public final class WPrinterJob extends RasterPrinterJob
      * position in the device context
      * {@code printDC}.
      */
-    protected native int getPenX(long printDC);
+    protected synchronized native int getPenX(long printDC);
 
     /**
      * Return the y coordinate of the current pen
      * position in the device context
      * {@code printDC}.
      */
-    protected native int getPenY(long printDC);
+    protected synchronized native int getPenY(long printDC);
 
     /**
      * Select the device context's current path
      * to be the clipping path.
      */
-    protected native void selectClipPath(long printDC);
+    protected synchronized native void selectClipPath(long printDC);
 
     /**
      * Draw a rectangle using specified brush.
      */
-    protected native void frameRect(long printDC, float x, float y,
+    protected synchronized native void frameRect(long printDC, float x, float y,
                                     float width, float height);
 
     /**
      * Fill a rectangle specified by the coordinates using
      * specified brush.
      */
-    protected native void fillRect(long printDC, float x, float y,
+    protected synchronized native void fillRect(long printDC, float x, float y,
                                    float width, float height,
                                    int red, int green, int blue);
 
@@ -1596,14 +1596,14 @@ public final class WPrinterJob extends RasterPrinterJob
      * Create a solid brush using the RG & B colors and width.
      * Select this brush and delete the old one.
      */
-    protected native void selectPen(long printDC, float width,
+    protected synchronized native void selectPen(long printDC, float width,
                                     int red, int green, int blue);
 
     /**
      * Create a solid brush using the RG & B colors and specified
      * pen styles.  Select this created brush and delete the old one.
      */
-    protected native boolean selectStylePen(long printDC, long cap,
+    protected synchronized native boolean selectStylePen(long printDC, long cap,
                                             long join, float width,
                                             int red, int green, int blue);
 
@@ -1611,7 +1611,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * Set a GDI font capable of drawing the java Font
      * passed in.
      */
-    protected native boolean setFont(long printDC, String familyName,
+    protected synchronized native boolean setFont(long printDC, String familyName,
                                      float fontSize,
                                      boolean bold,
                                      boolean italic,
@@ -1622,7 +1622,7 @@ public final class WPrinterJob extends RasterPrinterJob
     /**
      * Set the GDI color for text drawing.
      */
-    protected native void setTextColor(long printDC,
+    protected synchronized native void setTextColor(long printDC,
                                        int red, int green, int blue);
 
 
@@ -1631,12 +1631,12 @@ public final class WPrinterJob extends RasterPrinterJob
      * context {@code printDC} at the specified
      * position.
      */
-    protected native void textOut(long printDC, String text,
+    protected synchronized native void textOut(long printDC, String text,
                                   int strlen, boolean glyphs,
                                   float x, float y, float[] positions);
 
 
-    private native int getGDIAdvance(long printDC, String text);
+    private synchronized native int getGDIAdvance(long printDC, String text);
 
      /**
      * Draw the DIB compatible image buffer represented by
@@ -1653,7 +1653,7 @@ public final class WPrinterJob extends RasterPrinterJob
      * At the very least it needs to be padded so each scanline is
      * DWORD aligned. Also we "flip" the image to make it a bottom-up DIB.
      */
-    private native void drawDIBImage(long printDC, byte[] image,
+    private synchronized native void drawDIBImage(long printDC, byte[] image,
                                      float destX, float destY,
                                      float destWidth, float destHeight,
                                      float srcX, float srcY,
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
index 9abe32e0fcc..9d45c3f083b 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
@@ -1523,6 +1523,7 @@ Java_sun_awt_windows_WPrinterJob_endDoc(JNIEnv *env, jobject self) {
     if (printDC != NULL){
         SAVE_CONTROLWORD
         ::EndDoc(printDC);
+        AwtPrintControl::setPrintDC(env, self, (HDC)NULL);
         RESTORE_CONTROLWORD
     }
 
@@ -1583,7 +1584,9 @@ Java_sun_awt_windows_WPrinterJob_deleteDC
 
     TRY_NO_VERIFY;
 
-    DeletePrintDC((HDC)dc);
+    if ((HDC)dc != NULL) {
+        DeletePrintDC((HDC)dc);
+    }
 
     if ((HGLOBAL)devmode != NULL){
          ::GlobalFree((HGLOBAL)devmode);
@@ -1850,6 +1853,9 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_printBand
    jint width, jint height) {
 
     HDC printDC = AwtPrintControl::getPrintDC(env, self);
+    if ((HDC)printDC == NULL) {
+        return;
+    }
     doPrintBand(env, printDC, imageArray, x, y, width, height);
 }
 
@@ -1862,6 +1868,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_beginPath
 (JNIEnv *env , jobject self, jlong printDC) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::BeginPath((HDC)printDC);
 
     CATCH_BAD_ALLOC;
@@ -1876,6 +1886,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_endPath
 (JNIEnv *env, jobject self, jlong printDC) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::EndPath((HDC)printDC);
 
     CATCH_BAD_ALLOC;
@@ -1890,6 +1904,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_fillPath
 (JNIEnv *env, jobject self, jlong printDC) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::FillPath((HDC)printDC);
 
     CATCH_BAD_ALLOC;
@@ -1904,6 +1922,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_closeFigure
 (JNIEnv *env, jobject self, jlong printDC) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::CloseFigure((HDC)printDC);
 
     CATCH_BAD_ALLOC;
@@ -1918,6 +1940,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_lineTo
 (JNIEnv *env, jobject self, jlong printDC, jfloat x, jfloat y) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::LineTo((HDC)printDC, ROUND_TO_LONG(x), ROUND_TO_LONG(y));
 
     CATCH_BAD_ALLOC;
@@ -1933,6 +1959,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_moveTo
 (JNIEnv *env, jobject self, jlong printDC, jfloat x, jfloat y) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::MoveToEx((HDC)printDC, ROUND_TO_LONG(x), ROUND_TO_LONG(y), NULL);
 
     CATCH_BAD_ALLOC;
@@ -1951,6 +1981,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_polyBezierTo
 
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     POINT points[3];
 
     points[0].x = ROUND_TO_LONG(control1x);
@@ -1974,6 +2008,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setPolyFillMode
 (JNIEnv *env, jobject self, jlong printDC, jint fillRule) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::SetPolyFillMode((HDC)printDC, fillRule);
 
     CATCH_BAD_ALLOC;
@@ -1988,6 +2026,10 @@ JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_setAdvancedGraphicsMode
 (JNIEnv *env, jobject self, jlong printDC) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return 0;
+    }
+
     int oldGraphicsMode = ::SetGraphicsMode((HDC)printDC, GM_ADVANCED);
     DASSERT(oldGraphicsMode != 0);
     return (jint) oldGraphicsMode;
@@ -2004,6 +2046,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setGraphicsMode
 (JNIEnv *env, jobject self, jlong printDC, jint mode) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     int oldGraphicsMode = ::SetGraphicsMode((HDC)printDC, mode);
     DASSERT(oldGraphicsMode != 0);
 
@@ -2019,6 +2065,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_scale
 (JNIEnv *env, jobject self, jlong printDC, jdouble scaleX, jdouble scaleY) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     XFORM xForm;
 
     xForm.eM11 = (FLOAT) scaleX;
@@ -2043,6 +2093,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_getWorldTransform
 (JNIEnv* env, jobject self, jlong printDC, jdoubleArray transform) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     double elems[6];
     XFORM xForm;
 
@@ -2070,6 +2124,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setWorldTransform
 (JNIEnv* env, jobject self, jlong printDC, jdoubleArray transform) {
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     double *elems;
     XFORM xForm;
 
@@ -2100,6 +2158,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_selectSolidBrush
 
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     HBRUSH colorBrush = ::CreateSolidBrush(RGB(red, green, blue));
     HBRUSH oldBrush = (HBRUSH)::SelectObject((HDC)printDC, colorBrush);
     DeleteObject(oldBrush);
@@ -2117,6 +2179,10 @@ JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_getPenX
 
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return 0;
+    }
+
     POINT where;
     ::GetCurrentPositionEx((HDC)printDC, &where);
 
@@ -2135,6 +2201,10 @@ JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_getPenY
 
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return 0;
+    }
+
     POINT where;
     ::GetCurrentPositionEx((HDC)printDC, &where);
 
@@ -2153,6 +2223,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_selectClipPath
 
     TRY;
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     ::SelectClipPath((HDC)printDC, RGN_COPY);
 
     CATCH_BAD_ALLOC;
@@ -2170,6 +2244,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_frameRect
 
   TRY;
 
+  if ((HDC)printDC == NULL) {
+      return;
+  }
+
   POINT points[5];
 
   points[0].x = ROUND_TO_LONG(x);
@@ -2200,6 +2278,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_fillRect
 
   TRY;
 
+  if ((HDC)printDC == NULL) {
+      return;
+  }
+
   RECT rect;
   rect.left = ROUND_TO_LONG(x);
   rect.top = ROUND_TO_LONG(y);
@@ -2228,6 +2310,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_selectPen
 
   TRY;
 
+  if ((HDC)printDC == NULL) {
+       return;
+  }
+
   HPEN hpen =  ::CreatePen(PS_SOLID, ROUND_TO_LONG(width),
                            RGB(red, green, blue));
 
@@ -2254,6 +2340,10 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_windows_WPrinterJob_selectStylePen
 
   TRY;
 
+  if ((HDC)printDC == NULL) {
+      return JNI_FALSE;
+  }
+
   LOGBRUSH logBrush;
 
   logBrush.lbStyle = PS_SOLID ;
@@ -2287,6 +2377,10 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_windows_WPrinterJob_setFont
    jfloat fontSize, jboolean isBold, jboolean isItalic, jint rotation,
    jfloat awScale)
 {
+    if ((HDC)printDC == NULL) {
+        return JNI_FALSE;
+    }
+
     jboolean didSetFont = JNI_FALSE;
 
     didSetFont = jFontToWFontW(env, (HDC)printDC,
@@ -2317,6 +2411,10 @@ static jboolean jFontToWFontW(JNIEnv *env, HDC printDC, jstring fontName,
     LOGFONTW matchedLogFont;
     BOOL foundFont = false;     // Assume we didn't find a matching GDI font.
 
+    if ((HDC)printDC == NULL) {
+        return JNI_FALSE;
+    }
+
     memset(&matchedLogFont, 0, sizeof(matchedLogFont));
 
     LPCWSTR fontNameW = JNU_GetStringPlatformChars(env, fontName, NULL);
@@ -2478,6 +2576,10 @@ static int embolden(int currentWeight)
 JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setTextColor
 (JNIEnv *env, jobject self, jlong printDC, jint red, jint green, jint blue) {
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     (void) ::SetTextColor( (HDC)printDC, RGB(red, green, blue));
 
 }
@@ -2485,6 +2587,11 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_setTextColor
 JNIEXPORT jint JNICALL Java_sun_awt_windows_WPrinterJob_getGDIAdvance
     (JNIEnv *env, jobject self, jlong printDC, jstring text)
 {
+
+    if ((HDC)printDC == NULL) {
+        return 0;
+    }
+
     SIZE size;
     LPCWSTR wText = JNU_GetStringPlatformChars(env, text, NULL);
     CHECK_NULL_RETURN(wText, 0);
@@ -2538,6 +2645,9 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_textOut
 (JNIEnv *env, jobject self, jlong printDC, jstring text, jint strLen,
      jboolean glyphCodes, jfloat x, jfloat y, jfloatArray positions)
 {
+    if ((HDC)printDC == NULL) {
+        return;
+    }
 
     long posX = ROUND_TO_LONG(x);
     long posY = ROUND_TO_LONG(y);
@@ -2832,6 +2942,10 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WPrinterJob_drawDIBImage
    jfloat srcWidth, jfloat srcHeight,
    jint bitCount, jbyteArray bmiColorsArray) {
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     int result = 0;
 
     assert(printDC != NULL);
@@ -2922,6 +3036,10 @@ static void doPrintBand(JNIEnv *env, HDC printDC, jbyteArray imageArray,
 
     TRY;
 
+    if ((HDC)printDC == NULL) {
+         return;
+    }
+
     jbyte *image = NULL;
     try {
         long scanLineStride = J2DRasterBPP * width;
@@ -2966,6 +3084,10 @@ static int bitsToDevice(HDC printDC, jbyte *image, long destX, long destY,
                         long width, long height) {
     int result = 0;
 
+    if ((HDC)printDC == NULL) {
+        return result;
+    }
+
     assert(printDC != NULL);
     assert(image != NULL);
     assert(destX >= 0);
@@ -3707,6 +3829,10 @@ static double convertToPoints(long value, int units) {
  */
 void setCapabilities(JNIEnv *env, jobject self, HDC printDC) {
 
+    if ((HDC)printDC == NULL) {
+        return;
+    }
+
     jboolean err;
     // width of page in pixels
     jint pageWid = GetDeviceCaps(printDC, PHYSICALWIDTH);
diff --git a/test/jdk/java/awt/PrintJob/PrintJobAfterEndTest.java b/test/jdk/java/awt/PrintJob/PrintJobAfterEndTest.java
index e4ce07ac038..034866c4b3c 100644
--- a/test/jdk/java/awt/PrintJob/PrintJobAfterEndTest.java
+++ b/test/jdk/java/awt/PrintJob/PrintJobAfterEndTest.java
@@ -23,12 +23,12 @@
 
 
 /*
-  @test
-  @bug 8370141
-  @summary  Test no crash printing to Graphics after job is ended.
-  @key headful printer
-  @run main PrintJobAfterEndTest
-*/
+ * @test
+ * @bug 8370141 8370637
+ * @summary  Test no crash printing to Graphics after job is ended.
+ * @key headful printer
+ * @run main PrintJobAfterEndTest
+ */
 
 import java.awt.Frame;
 import java.awt.Graphics;
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintAfterEndTest.java b/test/jdk/java/awt/print/PrinterJob/PrintAfterEndTest.java
index a1d173681e7..b7232e93497 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintAfterEndTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintAfterEndTest.java
@@ -21,10 +21,10 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @key printer
- * @bug 8370141
+ * @bug 8370141 8370637
  * @summary No crash when printing after job completed.
  * @run main PrintAfterEndTest
  */

From 2872f815fdbe4a84bbec1cd910e81e2e21fffbdf Mon Sep 17 00:00:00 2001
From: Dmitry Kulikov <dmitry.kulikov@bell-sw.com>
Date: Wed, 5 Nov 2025 18:54:34 +0000
Subject: [PATCH 046/512] 8360120: Bundled macOS applications not receiving
 OpenURL events when launched as subprocess

Reviewed-by: kizune, prr
---
 .../classes/com/apple/eawt/Application.java   |  4 +-
 .../libawt_lwawt/awt/ApplicationDelegate.h    |  3 +-
 .../libawt_lwawt/awt/ApplicationDelegate.m    | 40 +++++++++++++++----
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/Application.java b/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
index c1daee47912..137aa864510 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/Application.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ import sun.lwawt.macosx.CPlatformWindow;
  */
 public final class Application {
     private static native void nativeInitializeApplicationDelegate();
+    private static native void nativeInstallOpenURLEventHandler();
 
     static Application sApplication = null;
 
@@ -211,6 +212,7 @@ public final class Application {
      * @since Java for Mac OS X 10.5 Update 8
      */
     public void setOpenURIHandler(final OpenURIHandler openURIHandler) {
+        nativeInstallOpenURLEventHandler();
         eventHandler.openURIDispatcher.setHandler(openURIHandler);
     }
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h
index 8d0723c555a..831bdeee603 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
 
     BOOL fHandlesDocumentTypes;
     BOOL fHandlesURLTypes;
+    BOOL fOpenURLHandlerInstalled;
 }
 
 @property (nonatomic, retain) NSMenuItem *fPreferencesMenu;
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
index b256c4121d4..d84fe9afa4a 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -243,11 +243,9 @@ AWT_ASSERT_APPKIT_THREAD;
     NSBundle *bundle = [NSBundle mainBundle];
     fHandlesDocumentTypes = [bundle objectForInfoDictionaryKey:@"CFBundleDocumentTypes"] != nil || [bundle _hasEAWTOverride:@"DocumentHandler"];
     fHandlesURLTypes = [bundle objectForInfoDictionaryKey:@"CFBundleURLTypes"] != nil || [bundle _hasEAWTOverride:@"URLHandler"];
+    fOpenURLHandlerInstalled = NO;
     if (fHandlesURLTypes) {
-        [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self
-                                                           andSelector:@selector(_handleOpenURLEvent:withReplyEvent:)
-                                                         forEventClass:kInternetEventClass
-                                                            andEventID:kAEGetURL];
+        [self _installOpenURLHandler];
     }
 
     // By HIG, Preferences are not available unless there is a handler. By default in Mac OS X,
@@ -302,9 +300,19 @@ static jclass sjc_AppEventHandler = NULL;
 #define GET_APPEVENTHANDLER_CLASS_RETURN(ret) \
     GET_CLASS_RETURN(sjc_AppEventHandler, "com/apple/eawt/_AppEventHandler", ret);
 
-- (void)_handleOpenURLEvent:(NSAppleEventDescriptor *)openURLEvent withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
-    if (!fHandlesURLTypes) return;
+- (void)_installOpenURLHandler {
+AWT_ASSERT_APPKIT_THREAD;
+    if (fOpenURLHandlerInstalled) return;
 
+    [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self
+                                                       andSelector:@selector(_handleOpenURLEvent:withReplyEvent:)
+                                                     forEventClass:kInternetEventClass
+                                                        andEventID:kAEGetURL];
+
+    fOpenURLHandlerInstalled = YES;
+}
+
+- (void)_handleOpenURLEvent:(NSAppleEventDescriptor *)openURLEvent withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
     NSString *url = [[openURLEvent paramDescriptorForKeyword:keyDirectObject] stringValue];
     [ApplicationDelegate _openURL:url];
 
@@ -626,6 +634,24 @@ JNI_COCOA_ENTER(env);
 JNI_COCOA_EXIT(env);
 }
 
+/*
+ * Class:     com_apple_eawt_Application
+ * Method:    nativeInstallOpenURLEventHandler
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_apple_eawt_Application_nativeInstallOpenURLEventHandler
+(JNIEnv *env, jclass clz)
+{
+JNI_COCOA_ENTER(env);
+    [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
+        ApplicationDelegate *delegate = [ApplicationDelegate sharedDelegate];
+            if (delegate != nil) {
+                [delegate _installOpenURLHandler];
+            }
+    }];
+JNI_COCOA_EXIT(env);
+}
+
 /*
  * Class:     com_apple_eawt__AppEventHandler
  * Method:    nativeOpenCocoaAboutWindow

From 5a37374dcaae0d3939570b33418f772a901df21a Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 5 Nov 2025 18:55:07 +0000
Subject: [PATCH 047/512] 8368576: PrintJob.getGraphics() does not specify
 behavior after PrintJob.end()

Reviewed-by: psadhukhan, tr, serb
---
 src/java.desktop/share/classes/java/awt/PrintJob.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java.desktop/share/classes/java/awt/PrintJob.java b/src/java.desktop/share/classes/java/awt/PrintJob.java
index f4ea24efd97..926de65608b 100644
--- a/src/java.desktop/share/classes/java/awt/PrintJob.java
+++ b/src/java.desktop/share/classes/java/awt/PrintJob.java
@@ -46,6 +46,8 @@ public abstract class PrintJob {
      * The page is sent to the printer when the graphics
      * object is disposed.  This graphics object will also implement
      * the PrintGraphics interface.
+     * If {@code PrintJob.end()} has been called, this method will
+     * return {@code null}.
      * @see PrintGraphics
      * @return the graphics context for printing the next page
      */

From acc8a76db2314211dd29a5b84c5bbe73d9055c76 Mon Sep 17 00:00:00 2001
From: Jeremy Wood <jwood@openjdk.org>
Date: Wed, 5 Nov 2025 18:57:03 +0000
Subject: [PATCH 048/512] 8357034: GifImageDecoder can produce wrong
 transparent pixels

Reviewed-by: jdv, prr
---
 .../sun/awt/image/GifImageDecoder.java        |  6 +-
 test/jdk/sun/awt/image/gif/GifBuilder.java    |  8 +-
 test/jdk/sun/awt/image/gif/GifComparison.java | 95 +++++++++++++------
 .../awt/image/gif/GifEmptyBackgroundTest.java | 16 +++-
 .../gif/GifSavedImageTransparentTest.java     | 53 +++++++++++
 5 files changed, 143 insertions(+), 35 deletions(-)
 create mode 100644 test/jdk/sun/awt/image/gif/GifSavedImageTransparentTest.java

diff --git a/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
index ae7ee6618bf..a8deaa71a4b 100644
--- a/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
+++ b/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java
@@ -343,6 +343,7 @@ public class GifImageDecoder extends ImageDecoder {
     private short[] prefix  = new short[4096];
     private byte[]  suffix  = new byte[4096];
     private byte[]  outCode = new byte[4097];
+    private boolean isSavedModelReliable = true;
 
     private static native void initIDs();
 
@@ -396,7 +397,7 @@ public class GifImageDecoder extends ImageDecoder {
         int off = y * global_width + x2;
         boolean save = (curframe.disposal_method == GifFrame.DISPOSAL_SAVE);
         if (trans_pixel >= 0 && !curframe.initialframe) {
-            if (saved_image != null && model.equals(saved_model)) {
+            if (saved_image != null && model.equals(saved_model) && isSavedModelReliable) {
                 for (int i = rasbeg; i < rasend; i++, off++) {
                     byte pixel = rasline[i];
                     if ((pixel & 0xff) == trans_pixel) {
@@ -406,6 +407,8 @@ public class GifImageDecoder extends ImageDecoder {
                     }
                 }
             } else {
+                isSavedModelReliable = false;
+
                 // We have to do this the hard way - only transmit
                 // the non-transparent sections of the line...
                 // Fix for 6301050: the interlacing is ignored in this case
@@ -597,6 +600,7 @@ public class GifImageDecoder extends ImageDecoder {
             }
             return false;
         }
+
         boolean ret = parseImage(x, y, width, height,
                                  interlace, initCodeSize,
                                  block, rasline, model);
diff --git a/test/jdk/sun/awt/image/gif/GifBuilder.java b/test/jdk/sun/awt/image/gif/GifBuilder.java
index 41eed6abeff..d118bdd0149 100644
--- a/test/jdk/sun/awt/image/gif/GifBuilder.java
+++ b/test/jdk/sun/awt/image/gif/GifBuilder.java
@@ -65,12 +65,16 @@ public class GifBuilder {
     /**
      * This creates a sample gif image based on a series of FrameDescriptions,
      * and the calls {@link GifComparison#run(URL)}
+     *
+     * @param frameDir an optional directory to write all frames as PNGs to.
+     *                 See {@link GifComparison#run(URL, File)}
      */
-    public static void test(FrameDescription... frameDescriptions)
+    public static void test(FrameDescription[] frameDescriptions,
+                            File frameDir)
             throws Throwable {
         File file = createTestFile(frameDescriptions);
         try {
-            GifComparison.run(file.toURI().toURL());
+            GifComparison.run(file.toURI().toURL(), frameDir);
         } finally {
             file.delete();
         }
diff --git a/test/jdk/sun/awt/image/gif/GifComparison.java b/test/jdk/sun/awt/image/gif/GifComparison.java
index d0ef3cc128d..a3deb38a810 100644
--- a/test/jdk/sun/awt/image/gif/GifComparison.java
+++ b/test/jdk/sun/awt/image/gif/GifComparison.java
@@ -38,6 +38,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageConsumer;
 import java.awt.image.IndexColorModel;
+import java.io.File;
 import java.net.URL;
 import java.util.Hashtable;
 import java.util.LinkedList;
@@ -59,13 +60,21 @@ public class GifComparison {
      * if ImageIO and ToolkitImage produce different BufferedImage renderings.
      *
      * @param srcURL the URL of the image to inspect
+     * @param frameDir an optional directory to write frames to as PNG images.
+     *                 The frames should render identically whether we use
+     *                 the ImageIO model or the ToolkitImage model. If they're
+     *                 identical, then we only output one image, such as
+     *                 "frame_0.png". If they're different then we'll
+     *                 output two images: "frame_0_iio.png" and
+     *                 "frame_0_awt.png".
      *
      * @return the last frame encoded as a TYPE_INT_ARGB image.
      *         <p>
      *         Unit tests may further inspect this image to make sure certain
      *         conditions are met.
      */
-    public static BufferedImage run(URL srcURL) throws Throwable {
+    public static BufferedImage run(URL srcURL, File frameDir)
+            throws Throwable {
         System.out.println("Comparing ImageIO vs ToolkitImage rendering of " +
                 srcURL);
         ImageIOModel ioModel = new ImageIOModel(srcURL);
@@ -73,41 +82,67 @@ public class GifComparison {
 
         BufferedImage lastImage = null;
 
-        int a = ioModel.frames.size() - 1;
-        BufferedImage ioImg = ioModel.getFrame(a);
-        BufferedImage awtImage = awtModel.getFrame(a);
+        // if frameDir exists: test & export all frames.
+        // Otherwise: only test the last frame
+        int startIndex = frameDir == null ? ioModel.frames.size() - 1 : 0;
 
-        lastImage = awtImage;
+        for (int a = startIndex; a < ioModel.frames.size(); a++) {
+            BufferedImage ioImg = ioModel.getFrame(a);
+            BufferedImage awtImage = awtModel.getFrame(a);
 
-        if (!(ioImg.getWidth() == awtImage.getWidth() &&
-                ioImg.getHeight() == awtImage.getHeight()))
-            throw new Error("These images are not the same size: " +
-                    ioImg.getWidth() + "x" + ioImg.getHeight() + " vs " +
-                    awtImage.getWidth() + "x" + awtImage.getHeight());
+            lastImage = awtImage;
 
-        for (int y = 0; y < ioImg.getHeight(); y++) {
-            for (int x = 0; x < ioImg.getWidth(); x++) {
-                int argb1 = ioImg.getRGB(x, y);
-                int argb2 = awtImage.getRGB(x, y);
+            try {
+                if (!(ioImg.getWidth() == awtImage.getWidth() &&
+                        ioImg.getHeight() == awtImage.getHeight()))
+                    throw new Error("These images are not the same size: " +
+                            ioImg.getWidth() + "x" + ioImg.getHeight() +
+                            " vs " +
+                            awtImage.getWidth() + "x" + awtImage.getHeight());
 
-                int alpha1 = (argb1 & 0xff000000) >> 24;
-                int alpha2 = (argb2 & 0xff000000) >> 24;
-                if (alpha1 == 0 && alpha2 == 0) {
-                    continue;
-                } else if (alpha1 == 0 || alpha2 == 0) {
-                    throw new Error("pixels at (" + x + ", " + y +
-                            ") have different opacities: " +
-                            Integer.toUnsignedString(argb1, 16) + " vs " +
-                            Integer.toUnsignedString(argb2, 16));
+                for (int y = 0; y < ioImg.getHeight(); y++) {
+                    for (int x = 0; x < ioImg.getWidth(); x++) {
+                        int argb1 = ioImg.getRGB(x, y);
+                        int argb2 = awtImage.getRGB(x, y);
+
+                        int alpha1 = (argb1 & 0xff000000) >> 24;
+                        int alpha2 = (argb2 & 0xff000000) >> 24;
+                        if (alpha1 == 0 && alpha2 == 0) {
+                            continue;
+                        } else if (alpha1 == 0 || alpha2 == 0) {
+                            throw new Error("pixels at (" + x + ", " + y +
+                                    ") have different opacities: " +
+                                    Integer.toUnsignedString(argb1, 16) +
+                                    " vs " +
+                                    Integer.toUnsignedString(argb2, 16));
+                        }
+                        int rgb1 = argb1 & 0xffffff;
+                        int rgb2 = argb2 & 0xffffff;
+                        if (rgb1 != rgb2) {
+                            throw new Error("pixels at (" + x + ", " + y +
+                                    ") have different opaque RGB values: " +
+                                    Integer.toUnsignedString(rgb1, 16) +
+                                    " vs " +
+                                    Integer.toUnsignedString(rgb2, 16));
+                        }
+                    }
                 }
-                int rgb1 = argb1 & 0xffffff;
-                int rgb2 = argb2 & 0xffffff;
-                if (rgb1 != rgb2) {
-                    throw new Error("pixels at (" + x + ", " + y +
-                            ") have different opaque RGB values: " +
-                            Integer.toUnsignedString(rgb1, 16) + " vs " +
-                            Integer.toUnsignedString(rgb2, 16));
+
+                if (frameDir != null) {
+                    // the two models are identical, so simply write one image:
+                    File pngFile = new File(frameDir, "frame_" + a + ".png");
+                    ImageIO.write(ioImg, "png", pngFile);
+                    System.out.println("\tWrote " + pngFile);
                 }
+            } catch (Throwable t) {
+                if (frameDir != null) {
+                    File f1 = new File(frameDir, "frame_" + + a + "_iio.png");
+                    File f2 = new File(frameDir, "frame_" + + a + "_awt.png");
+                    ImageIO.write(ioImg, "png", f1);
+                    ImageIO.write(awtImage, "png", f2);
+                    System.out.println("\tWrote " + f1 + " vs " + f2);
+                }
+                throw t;
             }
         }
         System.out.println("Passed");
diff --git a/test/jdk/sun/awt/image/gif/GifEmptyBackgroundTest.java b/test/jdk/sun/awt/image/gif/GifEmptyBackgroundTest.java
index 3adc2faa387..3b230cf3a57 100644
--- a/test/jdk/sun/awt/image/gif/GifEmptyBackgroundTest.java
+++ b/test/jdk/sun/awt/image/gif/GifEmptyBackgroundTest.java
@@ -28,14 +28,26 @@
  * the disposal method changes from 2 to 1
  */
 
+import java.io.File;
+
 public class GifEmptyBackgroundTest {
     public static void main(String[] args) throws Throwable {
-        GifBuilder.test(
+        GifBuilder.FrameDescription[] frames =
+            new GifBuilder.FrameDescription[] {
                 new GifBuilder.FrameDescription(
                         GifBuilder.Disposal.restoreToBackgroundColor, false),
                 new GifBuilder.FrameDescription(
                         GifBuilder.Disposal.doNotDispose, false),
                 new GifBuilder.FrameDescription(
-                        GifBuilder.Disposal.doNotDispose, false) );
+                        GifBuilder.Disposal.doNotDispose, false)
+        };
+
+        File dir = null;
+
+        // un-comment to visually inspect the frames:
+//        dir = new File("8356137-frames");
+//        dir.mkdir();
+
+        GifBuilder.test(frames, dir);
     }
 }
diff --git a/test/jdk/sun/awt/image/gif/GifSavedImageTransparentTest.java b/test/jdk/sun/awt/image/gif/GifSavedImageTransparentTest.java
new file mode 100644
index 00000000000..10db453bd63
--- /dev/null
+++ b/test/jdk/sun/awt/image/gif/GifSavedImageTransparentTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8357034
+ * @summary This test verifies that when the transparent pixel index changes
+ * and we're rendering on top of another frame we respect the new transparency.
+ */
+
+import java.io.File;
+
+public class GifSavedImageTransparentTest {
+    public static void main(String[] args) throws Throwable {
+        GifBuilder.FrameDescription[] frames =
+                new GifBuilder.FrameDescription[] {
+                        new GifBuilder.FrameDescription(
+                                GifBuilder.Disposal.doNotDispose, false),
+                        new GifBuilder.FrameDescription(
+                                GifBuilder.Disposal.doNotDispose, true),
+                        new GifBuilder.FrameDescription(
+                                GifBuilder.Disposal.doNotDispose, true)
+                };
+
+        File dir = null;
+
+        // un-comment to visually inspect the frames:
+//        dir = new File("8357034-frames");
+//        dir.mkdir();
+
+        GifBuilder.test(frames, dir);
+    }
+}

From 1357be98fc7aeb73655ed1a31d0b6fa7a7213c3e Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Wed, 5 Nov 2025 21:38:34 +0000
Subject: [PATCH 049/512] 8371178: Preserve fast version of getfield and
 putfield in AOTCache

Reviewed-by: adinn, iklam
---
 src/hotspot/share/cds/aotMetaspace.cpp   | 105 ++++++++++++++++++++---
 src/hotspot/share/cds/aotMetaspace.hpp   |   2 +-
 src/hotspot/share/cds/archiveBuilder.cpp |   2 +-
 3 files changed, 96 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index d80383be272..039c32a2bad 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -77,11 +77,13 @@
 #include "memory/universe.hpp"
 #include "nmt/memTracker.hpp"
 #include "oops/compressedKlass.hpp"
+#include "oops/constantPool.inline.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/oopHandle.hpp"
+#include "oops/resolvedFieldEntry.hpp"
 #include "oops/trainingData.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
@@ -519,21 +521,102 @@ void AOTMetaspace::serialize(SerializeClosure* soc) {
   soc->do_tag(666);
 }
 
-static void rewrite_nofast_bytecode(const methodHandle& method) {
+// In AOTCache workflow, when dumping preimage, the constant pool entries are stored in unresolved state.
+// So the fast version of getfield/putfield needs to be converted to nofast version.
+// When dumping the final image in the assembly phase, these nofast versions are converted back to fast versions
+// if the constant pool entry refered by these bytecodes is stored in resolved state.
+// Same principle applies to static and dynamic archives. If the constant pool entry is in resolved state, then
+// the fast version of the bytecodes can be preserved, else use the nofast version.
+//
+// The fast versions of aload_0 (i.e. _fast_Xaccess_0) merges the bytecode pair (aload_0, fast_Xgetfield).
+// If the fast version of aload_0 is preserved in AOTCache, then the JVMTI notifications for field access and
+// breakpoint events will be skipped for the second bytecode (fast_Xgetfield) in the pair.
+// Same holds for fast versions of iload_0. So for these bytecodes, nofast version is used.
+static void rewrite_bytecodes(const methodHandle& method) {
+  ConstantPool* cp = method->constants();
   BytecodeStream bcs(method);
+  Bytecodes::Code new_code;
+
+  LogStreamHandle(Trace, aot, resolve) lsh;
+  if (lsh.is_enabled()) {
+    lsh.print("Rewriting bytecodes for ");
+    method()->print_external_name(&lsh);
+    lsh.print("\n");
+  }
+
   while (!bcs.is_last_bytecode()) {
     Bytecodes::Code opcode = bcs.next();
-    switch (opcode) {
-    case Bytecodes::_getfield:      *bcs.bcp() = Bytecodes::_nofast_getfield;      break;
-    case Bytecodes::_putfield:      *bcs.bcp() = Bytecodes::_nofast_putfield;      break;
-    case Bytecodes::_aload_0:       *bcs.bcp() = Bytecodes::_nofast_aload_0;       break;
-    case Bytecodes::_iload: {
-      if (!bcs.is_wide()) {
-        *bcs.bcp() = Bytecodes::_nofast_iload;
+    // Use current opcode as the default value of new_code
+    new_code = opcode;
+    switch(opcode) {
+    case Bytecodes::_getfield: {
+      uint rfe_index = bcs.get_index_u2();
+      bool is_resolved = cp->is_resolved(rfe_index, opcode);
+      if (is_resolved) {
+        assert(!CDSConfig::is_dumping_preimage_static_archive(), "preimage should not have resolved field references");
+        ResolvedFieldEntry* rfe = cp->resolved_field_entry_at(bcs.get_index_u2());
+        switch(rfe->tos_state()) {
+        case btos:
+          // fallthrough
+        case ztos: new_code = Bytecodes::_fast_bgetfield; break;
+        case atos: new_code = Bytecodes::_fast_agetfield; break;
+        case itos: new_code = Bytecodes::_fast_igetfield; break;
+        case ctos: new_code = Bytecodes::_fast_cgetfield; break;
+        case stos: new_code = Bytecodes::_fast_sgetfield; break;
+        case ltos: new_code = Bytecodes::_fast_lgetfield; break;
+        case ftos: new_code = Bytecodes::_fast_fgetfield; break;
+        case dtos: new_code = Bytecodes::_fast_dgetfield; break;
+        default:
+          ShouldNotReachHere();
+          break;
+        }
+      } else {
+        new_code = Bytecodes::_nofast_getfield;
       }
       break;
     }
-    default: break;
+    case Bytecodes::_putfield: {
+      uint rfe_index = bcs.get_index_u2();
+      bool is_resolved = cp->is_resolved(rfe_index, opcode);
+      if (is_resolved) {
+        assert(!CDSConfig::is_dumping_preimage_static_archive(), "preimage should not have resolved field references");
+        ResolvedFieldEntry* rfe = cp->resolved_field_entry_at(bcs.get_index_u2());
+        switch(rfe->tos_state()) {
+        case btos: new_code = Bytecodes::_fast_bputfield; break;
+        case ztos: new_code = Bytecodes::_fast_zputfield; break;
+        case atos: new_code = Bytecodes::_fast_aputfield; break;
+        case itos: new_code = Bytecodes::_fast_iputfield; break;
+        case ctos: new_code = Bytecodes::_fast_cputfield; break;
+        case stos: new_code = Bytecodes::_fast_sputfield; break;
+        case ltos: new_code = Bytecodes::_fast_lputfield; break;
+        case ftos: new_code = Bytecodes::_fast_fputfield; break;
+        case dtos: new_code = Bytecodes::_fast_dputfield; break;
+        default:
+          ShouldNotReachHere();
+          break;
+        }
+      } else {
+        new_code = Bytecodes::_nofast_putfield;
+      }
+      break;
+    }
+    case Bytecodes::_aload_0:
+      // Revert _fast_Xaccess_0 or _aload_0 to _nofast_aload_0
+      new_code = Bytecodes::_nofast_aload_0;
+      break;
+    case Bytecodes::_iload:
+      if (!bcs.is_wide()) {
+        new_code = Bytecodes::_nofast_iload;
+      }
+      break;
+    default:
+      break;
+    }
+    if (opcode != new_code) {
+      *bcs.bcp() = new_code;
+      if (lsh.is_enabled()) {
+        lsh.print_cr("%d:%s -> %s", bcs.bci(), Bytecodes::name(opcode), Bytecodes::name(new_code));
+      }
     }
   }
 }
@@ -541,11 +624,11 @@ static void rewrite_nofast_bytecode(const methodHandle& method) {
 // [1] Rewrite all bytecodes as needed, so that the ConstMethod* will not be modified
 //     at run time by RewriteBytecodes/RewriteFrequentPairs
 // [2] Assign a fingerprint, so one doesn't need to be assigned at run-time.
-void AOTMetaspace::rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik) {
+void AOTMetaspace::rewrite_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik) {
   for (int i = 0; i < ik->methods()->length(); i++) {
     methodHandle m(thread, ik->methods()->at(i));
     if (ik->can_be_verified_at_dumptime() && ik->is_linked()) {
-      rewrite_nofast_bytecode(m);
+      rewrite_bytecodes(m);
     }
     Fingerprinter fp(m);
     // The side effect of this call sets method's fingerprint field.
diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp
index 379c684e939..c7b1578ec08 100644
--- a/src/hotspot/share/cds/aotMetaspace.hpp
+++ b/src/hotspot/share/cds/aotMetaspace.hpp
@@ -144,7 +144,7 @@ public:
   // (Heap region alignments are decided by GC).
   static size_t core_region_alignment();
   static size_t protection_zone_size();
-  static void rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik);
+  static void rewrite_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik);
   // print loaded classes names to file.
   static void dump_loaded_classes(const char* file_name, TRAPS);
 #endif
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index f5026339086..539c2672cf6 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -952,7 +952,7 @@ void ArchiveBuilder::make_klasses_shareable() {
         }
       }
 
-      AOTMetaspace::rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread::current(), ik);
+      AOTMetaspace::rewrite_bytecodes_and_calculate_fingerprints(Thread::current(), ik);
       ik->remove_unshareable_info();
     }
 

From d5831ed866cb3d1cf2c77d7a3e535afc9e2b688b Mon Sep 17 00:00:00 2001
From: Peyang <peyang@peya.tokyo>
Date: Wed, 5 Nov 2025 22:26:03 +0000
Subject: [PATCH 050/512] 8357880: Code formatting typo in
 Cipher.getMaxAllowedParameterSpec

Reviewed-by: fandreuzzi, mullan
---
 src/java.base/share/classes/javax/crypto/Cipher.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java
index f95917b5c86..6ff5a4e00ac 100644
--- a/src/java.base/share/classes/javax/crypto/Cipher.java
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java
@@ -263,7 +263,7 @@ public class Cipher {
     }
 
     /**
-     * Creates a {code Cipher} object. Called internally by {code NullCipher}.
+     * Creates a {@code Cipher} object. Called internally by {@code NullCipher}.
      *
      * @param cipherSpi the delegate
      * @param transformation the transformation
@@ -2690,7 +2690,7 @@ public class Cipher {
     }
 
     /**
-     * Returns an {code AlgorithmParameterSpec} object which contains
+     * Returns an {@code AlgorithmParameterSpec} object which contains
      * the maximum {@code Cipher} parameter value according to the
      * jurisdiction policy file. If JCE unlimited strength jurisdiction
      * policy files are installed or there is no maximum limit on the
@@ -2698,7 +2698,7 @@ public class Cipher {
      * {@code null} will be returned.
      *
      * @param transformation the cipher transformation
-     * @return an {code AlgorithmParameterSpec} object which holds the maximum
+     * @return an {@code AlgorithmParameterSpec} object which holds the maximum
      * value or {@code null}
      * @throws NullPointerException if {@code transformation}
      * is {@code null}

From 188da51f30e5ca3945fee91fe2e94f0466151c06 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 6 Nov 2025 04:42:20 +0000
Subject: [PATCH 051/512] 8365699: Remove
 jdk.internal.javac.PreviewFeature.Feature enum values for features finalized
 in Java 25 or earlier

Reviewed-by: vromero, liach
---
 .../jdk/internal/javac/PreviewFeature.java    | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index e6c994a12b1..eb0346c7397 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -64,18 +64,27 @@ public @interface PreviewFeature {
      * Values should be annotated with the feature's {@code JEP}.
      */
     public enum Feature {
-        // while building the interim javac, the ClassReader will produce a warning when loading a class
-        // keeping the constant of a feature that has been integrated or dropped, serves the purpose of muting such warnings.
+        // The JDK build process involves creating an interim javac which is then
+        // used to compile the rest of the JDK. The jdk.internal.javac.PreviewFeature
+        // annotation from the current sources is used when compiling interim javac.
+        // That's because the javac APIs of the current sources may be annotated with
+        // this annotation and they may be using the enum constants of the current sources.
+        // Furthermore, when compiling interim javac, the class files from the bootstrap JDK get
+        // used and those may also contain the PreviewFeature annotation. However, they may be
+        // using the enum constants of the bootstrap JDK's PreviewFeature annotation.
+        // If javac sees an annotation with an unknown enum constant, it produces a warning,
+        // and that in turn fails the build.
+        // So, in the current sources, we need to preserve the PreviewFeature enum constants
+        // for as long as the interim javac build needs it. As a result, we retain PreviewFeature
+        // enum constants for preview features that are present in the bootstrap JDK.
+        // Older constants can be removed.
+        //
+        // For example, Class-File API became final in JDK 24. As soon as JDK 23 was dropped as
+        // the bootstrap JDK, the CLASSFILE_API enum constant became eligible for removal.
 
         //---
-        IMPLICIT_CLASSES, //to be removed when boot JDK is 25
-        SCOPED_VALUES,
         @JEP(number=505, title="Structured Concurrency", status="Fifth Preview")
         STRUCTURED_CONCURRENCY,
-        CLASSFILE_API,
-        STREAM_GATHERERS,
-        MODULE_IMPORTS, //remove when the boot JDK is JDK 25
-        KEY_DERIVATION, //remove when the boot JDK is JDK 25
         @JEP(number = 502, title = "Stable Values", status = "Preview")
         STABLE_VALUES,
         @JEP(number=470, title="PEM Encodings of Cryptographic Objects", status="Preview")

From 3f40f4c362f6ff4d1ec7d513b4690ed5fade3e2a Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 6 Nov 2025 04:48:29 +0000
Subject: [PATCH 052/512] 8370975: OutputAnalyzer.matches() should use Matcher
 with Pattern.MULTILINE

Reviewed-by: stefank
---
 .../test/lib/process/OutputAnalyzerTest.java  | 70 ++++++++++++++++++-
 .../jdk/test/lib/process/OutputAnalyzer.java  | 52 ++++++++------
 2 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/test/lib-test/jdk/test/lib/process/OutputAnalyzerTest.java b/test/lib-test/jdk/test/lib/process/OutputAnalyzerTest.java
index 3426c7daab9..4d916f9b1fa 100644
--- a/test/lib-test/jdk/test/lib/process/OutputAnalyzerTest.java
+++ b/test/lib-test/jdk/test/lib/process/OutputAnalyzerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -217,6 +217,69 @@ public class OutputAnalyzerTest {
             }
         }
 
+        {
+            // Multi-line output: OutputAnalyzer uses MULTILINE but not DOTALL, so "." doesn't match newline, but
+            // "^" and "$" matches just after or just before, respectively, a newline.
+            stdout = "aaaaaa\nxxxxxx\n";
+            stderr = "bbbbbb\nyyyyyy\n";
+
+            OutputAnalyzer out = new OutputAnalyzer(stdout, stderr);
+
+            out.shouldMatch("aaa");
+            out.shouldMatch("xxx");
+            out.shouldMatch("bbb");
+            out.shouldMatch("yyy");
+
+            out.stdoutShouldMatch("aaaaaa");
+            out.stdoutShouldMatch("xxxxxx");
+            out.stderrShouldMatch("bbbbbb");
+            out.stderrShouldMatch("yyyyyy");
+
+            out.shouldMatch("^aaaaaa$");
+            out.shouldMatch("^xxxxxx$");
+            out.shouldMatch("^bbbbbb$");
+            out.shouldMatch("^yyyyyy$");
+
+            out.stdoutShouldMatch("^aaaaaa$");
+            out.stdoutShouldMatch("^xxxxxx$");
+            out.stderrShouldMatch("^bbbbbb$");
+            out.stderrShouldMatch("^yyyyyy$");
+
+            out.shouldMatch   ("a.*");
+            out.shouldNotMatch("a.*x");
+            out.shouldMatch   ("b.*");
+            out.shouldNotMatch("b.*y");
+            out.stdoutShouldMatch   ("a.*");
+            out.stdoutShouldNotMatch("a.*x");
+            out.stderrShouldMatch   ("b.*");
+            out.stderrShouldNotMatch("b.*y");
+
+            check(out.matches("^aaaaaa$"));
+            check(out.matches("^yyyyyy$"));
+            check(out.stdoutMatches("^aaaaaa$"));
+            check(out.stderrMatches("^yyyyyy$"));
+
+            check( out.matches("a.*"));
+            check(!out.matches("a.*x"));
+
+            check( out.stdoutMatches("a.*"));
+            check(!out.stdoutMatches("a.*x"));
+
+            check( out.stderrMatches("b.*"));
+            check(!out.stderrMatches("b.*y"));
+
+            // Test the "contains" methods as well
+            check(out.contains("aaa\nxxx"));
+            check(out.contains("bbb\nyyy"));
+            check(out.stdoutContains("aaa\nxxx"));
+            check(out.stderrContains("bbb\nyyy"));
+
+            check(!out.contains("X"));
+            check(!out.contains("X"));
+            check(!out.stdoutContains("X"));
+            check(!out.stderrContains("X"));
+        }
+
         {
             try {
                 // Verify the exception message
@@ -244,4 +307,9 @@ public class OutputAnalyzerTest {
         }
     }
 
+    private static void check(boolean b) {
+        if (!b) {
+            throw new RuntimeException("Check failed");
+        }
+    }
 }
diff --git a/test/lib/jdk/test/lib/process/OutputAnalyzer.java b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
index fa5e30dd815..d8b3f470260 100644
--- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
@@ -354,25 +354,44 @@ public final class OutputAnalyzer {
         return this;
     }
 
+    /**
+     * Returns true if the pattern can be found in the given string(s).
+     *
+     * NOTE: The meaning of "match" in OutputAnalyzer is NOT the same as String.matches().
+     * Rather it means "can the pattern be found in stdout and/or stderr".
+     *
+     * The pattern is comiled with MULTILINE but without DOTALL, so "." doesn't match newline, but
+     * "^" and "$" matches just after or just before, respectively, a newline.
+     */
+    private boolean findPattern(String regexp, String... strings) {
+        Pattern pattern = Pattern.compile(regexp, Pattern.MULTILINE);
+        for (String s : strings) {
+            if (pattern.matcher(s).find()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Returns true if stdout matches the given pattern
      */
     public boolean stdoutMatches(String regexp) {
-        return getStdout().matches(regexp);
+        return findPattern(regexp, getStdout());
     }
 
     /**
      * Returns true if stderr matches the given pattern
      */
     public boolean stderrMatches(String regexp) {
-        return getStderr().matches(regexp);
+        return findPattern(regexp, getStderr());
     }
 
     /**
      * Returns true if either stdout or stderr matches the given pattern
      */
     public boolean matches(String regexp) {
-        return stdoutMatches(regexp) || stderrMatches(regexp);
+        return findPattern(regexp, getStdout(), getStderr());
     }
 
     /**
@@ -383,12 +402,7 @@ public final class OutputAnalyzer {
      * @throws RuntimeException If the pattern was not found
      */
     public OutputAnalyzer shouldMatch(String regexp) {
-        String stdout = getStdout();
-        String stderr = getStderr();
-        Pattern pattern = Pattern.compile(regexp, Pattern.MULTILINE);
-        Matcher stdoutMatcher = pattern.matcher(stdout);
-        Matcher stderrMatcher = pattern.matcher(stderr);
-        if (!stdoutMatcher.find() && !stderrMatcher.find()) {
+        if (!matches(regexp)) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
                   + "' missing from stdout/stderr");
@@ -404,9 +418,7 @@ public final class OutputAnalyzer {
      * @throws RuntimeException If the pattern was not found
      */
     public OutputAnalyzer stdoutShouldMatch(String regexp) {
-        String stdout = getStdout();
-        Matcher matcher = Pattern.compile(regexp, Pattern.MULTILINE).matcher(stdout);
-        if (!matcher.find()) {
+        if (!stdoutMatches(regexp)) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
                   + "' missing from stdout");
@@ -421,12 +433,10 @@ public final class OutputAnalyzer {
      * @param pattern
      * @throws RuntimeException If the pattern was not found
      */
-    public OutputAnalyzer stderrShouldMatch(String pattern) {
-        String stderr = getStderr();
-        Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
-        if (!matcher.find()) {
+    public OutputAnalyzer stderrShouldMatch(String regexp) {
+        if (!stderrMatches(regexp)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + pattern
+            throw new RuntimeException("'" + regexp
                   + "' missing from stderr");
         }
         return this;
@@ -468,9 +478,7 @@ public final class OutputAnalyzer {
      * @throws RuntimeException If the pattern was found
      */
     public OutputAnalyzer stdoutShouldNotMatch(String regexp) {
-        String stdout = getStdout();
-        Matcher matcher = Pattern.compile(regexp, Pattern.MULTILINE).matcher(stdout);
-        if (matcher.find()) {
+        if (stdoutMatches(regexp)) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
                     + "' found in stdout");
@@ -486,9 +494,7 @@ public final class OutputAnalyzer {
      * @throws RuntimeException If the pattern was found
      */
     public OutputAnalyzer stderrShouldNotMatch(String regexp) {
-        String stderr = getStderr();
-        Matcher matcher = Pattern.compile(regexp, Pattern.MULTILINE).matcher(stderr);
-        if (matcher.find()) {
+        if (stderrMatches(regexp)) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
                     + "' found in stderr");

From c754e3e095cd367de9d3f69a4afb0c4be53a9342 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Thu, 6 Nov 2025 06:22:32 +0000
Subject: [PATCH 053/512] 8368528: HttpClient.Builder.connectTimeout should
 accept arbitrarily large values

Reviewed-by: dfuchs
---
 .../internal/net/http/HttpQuicConnection.java |  16 +-
 .../internal/net/http/common/Deadline.java    | 154 +++++---
 .../net/httpclient/DurationOverflowTest.java  | 349 ++++++++++++++++++
 .../whitebox/DeadlineOverflowTestDriver.java  |  30 ++
 .../net/http/common/DeadlineOverflowTest.java | 129 +++++++
 5 files changed, 621 insertions(+), 57 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/DurationOverflowTest.java
 create mode 100644 test/jdk/java/net/httpclient/whitebox/DeadlineOverflowTestDriver.java
 create mode 100644 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DeadlineOverflowTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java
index bbbe1157cdf..0a22256f6c6 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java
@@ -499,22 +499,28 @@ abstract class HttpQuicConnection extends HttpConnection {
                 }, exchange.parentExecutor.safeDelegate());
             }
 
-            Optional<Duration> timeout = client().connectTimeout();
             CompletableFuture<CompletableFuture<Void>> fxi = handshakeCfCf;
 
             // In case of connection timeout, set up a timeout on the handshakeCfCf.
             // Note: this is a different timeout than the direct connection timeout.
-            if (timeout.isPresent()) {
+            Duration timeout = client().connectTimeout().orElse(null);
+            if (timeout != null) {
                 // In case of timeout we need to close the quic connection
-                debug.log("setting up quic connect timeout: " + timeout.get().toMillis());
+                debug.log("setting up quic connect timeout: " + timeout);
+                long timeoutMillis;
+                try {
+                    timeoutMillis = timeout.toMillis();
+                } catch (ArithmeticException _) {
+                    timeoutMillis = Long.MAX_VALUE;
+                }
                 fxi = handshakeCfCf.completeOnTimeout(
                         MinimalFuture.failedFuture(new HttpConnectTimeoutException("quic connect timeout")),
-                        timeout.get().toMillis(), TimeUnit.MILLISECONDS);
+                        timeoutMillis, TimeUnit.MILLISECONDS);
             }
 
             // If we have set up any timeout, arrange to close the quicConnection
             // if one of the timeout expires
-            if (timeout.isPresent() || directTimeout.isPresent()) {
+            if (timeout != null || directTimeout.isPresent()) {
                 fxi = fxi.handleAsync(this::handleTimeout, exchange.parentExecutor.safeDelegate());
             }
             return fxi.thenCompose(Function.identity());
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Deadline.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Deadline.java
index 3ee334885a3..6a042fd7d0d 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Deadline.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Deadline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,22 @@ import java.time.DateTimeException;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalAmount;
 import java.time.temporal.TemporalUnit;
 import java.time.temporal.UnsupportedTemporalTypeException;
 
 /**
- * A Deadline represents an instant on a {@linkplain TimeLine time line}.
+ * An instantaneous point on the {@linkplain TimeLine time-line}.
+ * <p>
+ * This class is immutable and thread-safe.
+ * <p id="overflow">
+ * Operations that add or subtract durations to a {@code Deadline}, whether
+ * represented as a {@link Duration} or as a {@code long} time increment (such
+ * as seconds or nanoseconds) do not throw on numeric overflow if the resulting
+ * {@code Deadline} would exceed {@link #MAX} or be less than {@link #MIN}.
+ * Instead, {@code MAX} or {@code MIN} is returned, respectively. Similarly,
+ * methods that return a duration as a {@code long} will either return
+ * {@link Long#MAX_VALUE} or {@link Long#MIN_VALUE} if the returned quantity
+ * would exceed the capacity of a {@code long}.
  */
 public final class Deadline implements Comparable<Deadline> {
 
@@ -49,17 +57,24 @@ public final class Deadline implements Comparable<Deadline> {
 
 
     /**
-     * Returns a copy of this deadline with the specified duration in nanoseconds added.
+     * {@return a deadline with the specified duration in nanoseconds added}
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Deadline#MAX} if the provided duration is positive,
+     * {@link Deadline#MIN} otherwise.
      *
      * @param nanosToAdd  the nanoseconds to add, positive or negative
-     * @return a {@code Deadline} based on this deadline with the specified nanoseconds added, not null
-     * @throws DateTimeException if the result exceeds the maximum or minimum deadline
-     * @throws ArithmeticException if numeric overflow occurs
      */
     public Deadline plusNanos(long nanosToAdd) {
-        return new Deadline(deadline.plusNanos(nanosToAdd));
+        if (nanosToAdd == 0) return this;
+        try {
+            return new Deadline(deadline.plusNanos(nanosToAdd));
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            return nanosToAdd > 0 ? Deadline.MAX : Deadline.MIN;
+        }
     }
 
     /**
@@ -89,92 +104,116 @@ public final class Deadline implements Comparable<Deadline> {
     }
 
     /**
-     * Returns a copy of this deadline with the specified amount subtracted.
-     * <p>
-     * This returns a {@code Deadline}, based on this one, with the specified amount subtracted.
-     * The amount is typically {@link Duration} but may be any other type implementing
-     * the {@link TemporalAmount} interface.
+     * {@return a deadline with the specified amount subtracted from this deadline}
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Deadline#MIN} if the provided duration is positive,
+     * {@link Deadline#MAX} otherwise.
      *
-     * @param amountToSubtract  the amount to subtract, not null
-     * @return a {@code Deadline} based on this deadline with the subtraction made, not null
-     * @throws DateTimeException if the subtraction cannot be made
-     * @throws ArithmeticException if numeric overflow occurs
+     * @param duration the amount to subtract, not null
      */
-    public Deadline minus(TemporalAmount amountToSubtract) {
-        return Deadline.of(deadline.minus(amountToSubtract));
+    public Deadline minus(Duration duration) {
+        if (duration.isZero()) return this;
+        try {
+            return Deadline.of(deadline.minus(duration));
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            return duration.isPositive() ? Deadline.MIN : Deadline.MAX;
+        }
     }
 
     /**
-     * Returns a copy of this deadline with the specified amount added.
+     * {@return a deadline with the specified amount added to this deadline}
      * <p>
      * This returns a {@code Deadline}, based on this one, with the amount
      * in terms of the unit added. If it is not possible to add the amount, because the
      * unit is not supported or for some other reason, an exception is thrown.
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Deadline#MAX} if the provided amount is positive,
+     * {@link Deadline#MIN} otherwise.
      *
      * @see Instant#plus(long, TemporalUnit)
      *
      * @param amountToAdd  the amount of the unit to add to the result, may be negative
      * @param unit  the unit of the amount to add, not null
-     * @return a {@code Deadline} based on this deadline with the specified amount added, not null
-     * @throws DateTimeException if the addition cannot be made
      * @throws UnsupportedTemporalTypeException if the unit is not supported
-     * @throws ArithmeticException if numeric overflow occurs
      */
     public Deadline plus(long amountToAdd, TemporalUnit unit) {
         if (amountToAdd == 0) return this;
-        return Deadline.of(deadline.plus(amountToAdd, unit));
+        try {
+            return Deadline.of(deadline.plus(amountToAdd, unit));
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            return amountToAdd > 0 ? Deadline.MAX : Deadline.MIN;
+        }
     }
 
     /**
-     * Returns a copy of this deadline with the specified duration in seconds added.
+     * {@return a deadline with the specified duration in seconds added to this deadline}
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Deadline#MAX} if the provided duration is positive,
+     * {@link Deadline#MIN} otherwise.
      *
      * @param secondsToAdd  the seconds to add, positive or negative
-     * @return a {@code Deadline} based on this deadline with the specified seconds added, not null
-     * @throws DateTimeException if the result exceeds the maximum or minimum deadline
-     * @throws ArithmeticException if numeric overflow occurs
      */
     public Deadline plusSeconds(long secondsToAdd) {
         if (secondsToAdd == 0) return this;
-        return Deadline.of(deadline.plusSeconds(secondsToAdd));
+        try {
+            return Deadline.of(deadline.plusSeconds(secondsToAdd));
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            return secondsToAdd > 0 ? Deadline.MAX : Deadline.MIN;
+        }
     }
 
     /**
-     * Returns a copy of this deadline with the specified duration in milliseconds added.
+     * {@return a deadline with the specified duration in milliseconds added to this deadline}
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Deadline#MAX} if the provided duration is positive,
+     * {@link Deadline#MIN} otherwise.
      *
      * @param millisToAdd  the milliseconds to add, positive or negative
-     * @return a {@code Deadline} based on this deadline with the specified milliseconds added, not null
-     * @throws DateTimeException if the result exceeds the maximum or minimum deadline
-     * @throws ArithmeticException if numeric overflow occurs
      */
     public Deadline plusMillis(long millisToAdd) {
         if (millisToAdd ==  0) return this;
-        return Deadline.of(deadline.plusMillis(millisToAdd));
+        try {
+            return Deadline.of(deadline.plusMillis(millisToAdd));
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            return millisToAdd > 0 ? Deadline.MAX : Deadline.MIN;
+        }
     }
 
     /**
-     * Returns a copy of this deadline with the specified amount added.
-     * <p>
-     * This returns a {@code Deadline}, based on this one, with the specified amount added.
-     * The amount is typically {@link Duration} but may be any other type implementing
-     * the {@link TemporalAmount} interface.
+     * {@return a deadline with the specified duration added to this deadline}
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Deadline#MAX} if the provided duration is positive,
+     * {@link Deadline#MIN} otherwise.
      *
-     * @param amountToAdd  the amount to add, not null
-     * @return a {@code Deadline} based on this deadline with the addition made, not null
-     * @throws DateTimeException if the addition cannot be made
-     * @throws ArithmeticException if numeric overflow occurs
+     * @param duration the duration to add, not null
      */
-    public Deadline plus(TemporalAmount amountToAdd) {
-        return Deadline.of(deadline.plus(amountToAdd));
+    public Deadline plus(Duration duration) {
+        if (duration.isZero()) return this;
+        try {
+            return Deadline.of(deadline.plus(duration));
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            return duration.isPositive() ? Deadline.MAX : Deadline.MIN;
+        }
     }
 
     /**
@@ -188,16 +227,24 @@ public final class Deadline implements Comparable<Deadline> {
      * complete units between the two deadlines.
      * <p>
      * This instance is immutable and unaffected by this method call.
+     * <p>
+     * On {@linkplain ##overflow numeric overflows}, this method will return
+     * {@link Long#MAX_VALUE} if the current deadline is before the provided end
+     * deadline, {@link Long#MIN_VALUE} otherwise.
      *
      * @param endExclusive  the end deadline, exclusive
      * @param unit  the unit to measure the amount in, not null
      * @return the amount of time between this deadline and the end deadline
-     * @throws DateTimeException if the amount cannot be calculated
      * @throws UnsupportedTemporalTypeException if the unit is not supported
-     * @throws ArithmeticException if numeric overflow occurs
      */
     public long until(Deadline endExclusive, TemporalUnit unit) {
-        return deadline.until(endExclusive.deadline, unit);
+        try {
+            return deadline.until(endExclusive.deadline, unit);
+        } catch (DateTimeException |        // "Instant exceeds minimum or maximum instant"
+                 ArithmeticException _) {   // "long overflow"
+            int delta = compareTo(endExclusive);
+            return delta < 0 ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
     }
 
     /**
@@ -266,10 +313,13 @@ public final class Deadline implements Comparable<Deadline> {
      * @param startInclusive  the start deadline, inclusive, not null
      * @param endExclusive  the end deadline, exclusive, not null
      * @return a {@code Duration}, not null
-     * @throws DateTimeException if the seconds between the deadline cannot be obtained
-     * @throws ArithmeticException if the calculation exceeds the capacity of {@code Duration}
      */
     public static Duration between(Deadline startInclusive, Deadline endExclusive) {
+        if (startInclusive.equals(endExclusive)) return Duration.ZERO;
+        // `Deadline` works with `Instant` under the hood.
+        // Delta between `Instant.MIN` and `Instant.MAX` fits in a `Duration`.
+        // Hence, we should never receive a numeric overflow while calculating the delta between two deadlines.
         return Duration.between(startInclusive.deadline, endExclusive.deadline);
     }
+
 }
diff --git a/test/jdk/java/net/httpclient/DurationOverflowTest.java b/test/jdk/java/net/httpclient/DurationOverflowTest.java
new file mode 100644
index 00000000000..bc836a7c5dd
--- /dev/null
+++ b/test/jdk/java/net/httpclient/DurationOverflowTest.java
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestEchoHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import jdk.test.lib.net.SimpleSSLContext;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpOption;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static jdk.httpclient.test.lib.common.HttpServerAdapters.createClientBuilderFor;
+
+/*
+ * @test id=withoutPropertyConfig
+ * @bug 8368528
+ * @summary Verifies that `Duration`-accepting programmatic public APIs, either
+ *          individually, or in combination, work with arbitrarily large values
+ *
+ * @library /test/jdk/java/net/httpclient/lib
+ *          /test/lib
+ *
+ * @run junit DurationOverflowTest
+ */
+
+/*
+ * @test id=withPropertyConfig
+ * @bug 8368528
+ * @summary Verifies that `Duration`-accepting programmatic public APIs, either
+ *          individually, or in combination, work with arbitrarily large values
+ *          when combined with duration-accepting property-based public APIs.
+ *
+ * @library /test/jdk/java/net/httpclient/lib
+ *          /test/lib
+ *
+ * @comment 9223372036854775807 is the value of `Long.MAX_VALUE`
+ *
+ * @run junit/othervm
+ *      -Djdk.httpclient.keepalive.timeout=9223372036854775807
+ *      DurationOverflowTest
+ *
+ * @comment `h3` infra is also enabled for this test since `j.h.k.timeout.h3`
+ *          defaults to `j.h.k.timeout.h2`
+ * @run junit/othervm
+ *      -Djdk.httpclient.keepalive.timeout.h2=9223372036854775807
+ *      -DallowedInfras=h2,h2s,h3
+ *      DurationOverflowTest
+ *
+ * @run junit/othervm
+ *      -Djdk.httpclient.keepalive.timeout.h3=9223372036854775807
+ *      -DallowedInfras=h3
+ *      DurationOverflowTest
+ */
+
+public class DurationOverflowTest {
+
+    private static final String CLASS_NAME = DurationOverflowTest.class.getSimpleName();
+
+    private static final Logger LOGGER = Utils.getDebugLogger(CLASS_NAME::toString, Utils.DEBUG);
+
+    private static final SSLContext SSL_CONTEXT = createSslContext();
+
+    private static SSLContext createSslContext() {
+        try {
+            return new SimpleSSLContext().get();
+        } catch (IOException exception) {
+            throw new UncheckedIOException(exception);
+        }
+    }
+
+    private static final List<Infra> INFRAS = loadInfras();
+
+    private static final class Infra implements AutoCloseable {
+
+        private static final AtomicInteger SERVER_COUNTER = new AtomicInteger();
+
+        private final String serverId;
+
+        private final HttpTestServer server;
+
+        private final Supplier<HttpClient.Builder> clientBuilderSupplier;
+
+        private final Supplier<HttpRequest.Builder> requestBuilderSupplier;
+
+        private final boolean secure;
+
+        private Infra(
+                String serverId,
+                HttpTestServer server,
+                Supplier<HttpClient.Builder> clientBuilderSupplier,
+                Supplier<HttpRequest.Builder> requestBuilderSupplier,
+                boolean secure) {
+            this.serverId = serverId;
+            this.server = server;
+            this.clientBuilderSupplier = clientBuilderSupplier;
+            this.requestBuilderSupplier = requestBuilderSupplier;
+            this.secure = secure;
+        }
+
+        private static Infra of(Version version, boolean secure) {
+
+            // Create the server and the request URI
+            var sslContext = secure ? SSL_CONTEXT : null;
+            var server = createServer(version, sslContext);
+            server.getVersion();
+            var handlerPath = "/%s/".formatted(CLASS_NAME);
+            var requestUriScheme = secure ? "https" : "http";
+            var requestUri = URI.create("%s://%s%s-".formatted(requestUriScheme, server.serverAuthority(), handlerPath));
+
+            // Register the request handler
+            var serverId = "" + SERVER_COUNTER.getAndIncrement();
+            server.addHandler(
+                    // Intentionally opting for receiving a body to cover code paths associated with its retrieval
+                    new HttpTestEchoHandler(false),
+                    handlerPath);
+
+            // Create client & request builders
+            Supplier<HttpClient.Builder> clientBuilderSupplier =
+                    () -> createClientBuilderFor(version)
+                            .version(version)
+                            .sslContext(SSL_CONTEXT)
+                            .proxy(NO_PROXY);
+            Supplier<HttpRequest.Builder> requestBuilderSupplier =
+                    () -> createRequestBuilder(requestUri, version);
+
+            // Create the pair
+            var pair = new Infra(serverId, server, clientBuilderSupplier, requestBuilderSupplier, secure);
+            pair.server.start();
+            LOGGER.log("Server[%s] is started at `%s`", serverId, server.serverAuthority());
+            return pair;
+
+        }
+
+        private static HttpTestServer createServer(Version version, SSLContext sslContext) {
+            try {
+                return switch (version) {
+                    case HTTP_1_1, HTTP_2 -> HttpTestServer.create(version, sslContext, null);
+                    case HTTP_3 -> HttpTestServer.create(HTTP_3_URI_ONLY, sslContext, null);
+                };
+            } catch (IOException exception) {
+                throw new UncheckedIOException(exception);
+            }
+        }
+
+        private static HttpRequest.Builder createRequestBuilder(URI uri, Version version) {
+            var requestBuilder = HttpRequest.newBuilder(uri).version(version).HEAD();
+            if (Version.HTTP_3.equals(version)) {
+                requestBuilder.setOption(HttpOption.H3_DISCOVERY, HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY);
+            }
+            return requestBuilder;
+        }
+
+        @Override
+        public void close() {
+            LOGGER.log("Server[%s] is stopping", serverId);
+            server.stop();
+        }
+
+        @Override
+        public String toString() {
+            var version = server.getVersion();
+            var versionString = version.toString();
+            return switch (version) {
+                case HTTP_1_1, HTTP_2 -> secure ? versionString.replaceFirst("_", "S_") : versionString;
+                case HTTP_3 -> versionString;
+            };
+        }
+
+    }
+
+    private static List<Infra> loadInfras() {
+        return Stream
+                .of(System.getProperty("allowedInfras", "h1,h1s,h2,h2s,h3").split(","))
+                .map(infra -> {
+                    LOGGER.log("Loading test infrastructure: `%s`", infra);
+                    return switch (infra) {
+                        case "h1" -> Infra.of(Version.HTTP_1_1, false);
+                        case "h1s" -> Infra.of(Version.HTTP_1_1, true);
+                        case "h2" -> Infra.of(Version.HTTP_2, false);
+                        case "h2s" -> Infra.of(Version.HTTP_2, true);
+                        case "h3" -> Infra.of(Version.HTTP_3, true);
+                        default -> throw new IllegalArgumentException("Unknown test infrastructure: " + infra);
+                    };
+                })
+                .toList();
+    }
+
+    @AfterAll
+    static void tearDownInfras() {
+        LOGGER.log("Tearing down test infrastructure");
+        Exception[] exceptionRef = {null};
+        infras().forEach(infra -> {
+            try {
+                infra.close();
+            } catch (Exception exception) {
+                if (exceptionRef[0] == null) {
+                    exceptionRef[0] = exception;
+                } else {
+                    exceptionRef[0].addSuppressed(exception);
+                }
+            }
+        });
+        if (exceptionRef[0] != null) {
+            throw new RuntimeException("Failed tearing down one or more test infrastructures", exceptionRef[0]);
+        }
+    }
+
+    private static Stream<Infra> infras() {
+        return INFRAS.stream();
+    }
+
+    public static final Set<Duration> EXCESSIVE_DURATIONS = Set.of(
+            Duration.MAX,
+            // This triggers different exceptions than the ones triggered by `Duration.MAX`
+            Duration.ofMillis(Long.MAX_VALUE));
+
+    private static Stream<InfraDurationPair> infraDurationPairs() {
+        return infras().flatMap(infra -> EXCESSIVE_DURATIONS.stream()
+                .map(duration -> new InfraDurationPair(infra, duration)));
+    }
+
+    private record InfraDurationPair(Infra infra, Duration duration) {}
+
+    @ParameterizedTest
+    @MethodSource("infraDurationPairs")
+    void testClientConnectTimeout(InfraDurationPair pair) throws Exception {
+        testConfig(pair.infra, clientBuilder -> clientBuilder.connectTimeout(pair.duration), null);
+    }
+
+    @ParameterizedTest
+    @MethodSource("infraDurationPairs")
+    void testRequestTimeout(InfraDurationPair pair) throws Exception {
+        testConfig(pair.infra, null, requestBuilder -> requestBuilder.timeout(pair.duration));
+    }
+
+    private static Stream<InfraDurationDurationTriple> infraDurationDurationTriples() {
+        return infras().flatMap(infra -> EXCESSIVE_DURATIONS.stream()
+                .flatMap(duration1 -> EXCESSIVE_DURATIONS.stream()
+                        .map(duration2 -> new InfraDurationDurationTriple(infra, duration1, duration2))));
+    }
+
+    private record InfraDurationDurationTriple(Infra infra, Duration duration1, Duration duration2) {}
+
+    @ParameterizedTest
+    @MethodSource("infraDurationDurationTriples")
+    void testClientConnectTimeoutAndRequestTimeout(InfraDurationDurationTriple triple) throws Exception {
+        testConfig(
+                triple.infra,
+                clientBuilder -> clientBuilder.connectTimeout(triple.duration1),
+                requestBuilder -> requestBuilder.timeout(triple.duration2));
+    }
+
+    private static void testConfig(
+            Infra infra,
+            Consumer<HttpClient.Builder> clientBuilderConsumer,
+            Consumer<HttpRequest.Builder> requestBuilderConsumer)
+            throws Exception {
+
+        // Create the client
+        var clientBuilder = infra.clientBuilderSupplier.get();
+        if (clientBuilderConsumer != null) {
+            clientBuilderConsumer.accept(clientBuilder);
+        }
+        try (var client = clientBuilder.build()) {
+
+            // Create the request
+            byte[] expectedBytes = "abc".repeat(8192).getBytes(US_ASCII);
+            var requestBuilder = infra.requestBuilderSupplier.get()
+                    // Intentionally opting for sending a body to cover code paths associated with its delivery
+                    .POST(BodyPublishers.ofByteArray(expectedBytes));
+            if (requestBuilderConsumer != null) {
+                requestBuilderConsumer.accept(requestBuilder);
+            }
+            var request = requestBuilder.build();
+
+            // Execute the request.
+            // Doing it twice to touch code paths before & after a protocol upgrade, if present.
+            for (int requestIndex = 0; requestIndex < 2; requestIndex++) {
+                LOGGER.log("Executing request (attempt=%s)", requestIndex + 1);
+                var response = client.send(request, BodyHandlers.ofByteArray());
+
+                // Verify the response status code
+                if (response.statusCode() != 200) {
+                    var message = String.format(
+                            "Unexpected status code: %s (attempt=%s)",
+                            response.statusCode(), requestIndex + 1);
+                    throw new AssertionError(message);
+                }
+
+                // Verify the response body
+                int mismatchIndex = Arrays.mismatch(expectedBytes, response.body());
+                if (mismatchIndex > 0) {
+                    var message = String.format(
+                            "Body mismatch at index %s (attempt=%s)",
+                            mismatchIndex, requestIndex + 1);
+                    throw new AssertionError(message);
+                }
+
+            }
+
+        }
+
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/whitebox/DeadlineOverflowTestDriver.java b/test/jdk/java/net/httpclient/whitebox/DeadlineOverflowTestDriver.java
new file mode 100644
index 00000000000..a7270c2bfdb
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/DeadlineOverflowTestDriver.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8368528
+ * @summary Verifies that `Deadline` returns extremums on numeric overflows
+ * @modules java.net.http/jdk.internal.net.http.common:+open
+ * @run junit java.net.http/jdk.internal.net.http.common.DeadlineOverflowTest
+ */
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DeadlineOverflowTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DeadlineOverflowTest.java
new file mode 100644
index 00000000000..2d3d32b084d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DeadlineOverflowTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.net.http.common;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+
+import static java.time.temporal.ChronoUnit.NANOS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DeadlineOverflowTest {
+
+    @Test
+    void test_DeadlineOf_InstantMin() {
+        assertEquals(Instant.MIN, Deadline.of(Instant.MIN).asInstant());
+    }
+
+    @Test
+    void test_DeadlineOf_InstantMax() {
+        assertEquals(Instant.MAX, Deadline.of(Instant.MAX).asInstant());
+    }
+
+    @Test
+    void test_plusNanos_min() {
+        assertEquals(Deadline.MIN, Deadline.MIN.plusNanos(-1));
+    }
+
+    @Test
+    void test_plusNanos_max() {
+        assertEquals(Deadline.MAX, Deadline.MAX.plusNanos(1));
+    }
+
+    @Test
+    void test_minus_min() {
+        assertEquals(Deadline.MIN, Deadline.MIN.minus(Duration.ofNanos(1)));
+    }
+
+    @Test
+    void test_minus_max() {
+        assertEquals(Deadline.MAX, Deadline.MAX.minus(Duration.ofNanos(-1)));
+    }
+
+    @Test
+    void test_plusAmount_min() {
+        assertEquals(Deadline.MIN, Deadline.MIN.plus(-1, ChronoUnit.NANOS));
+    }
+
+    @Test
+    void test_plusAmount_max() {
+        assertEquals(Deadline.MAX, Deadline.MAX.plus(1, ChronoUnit.NANOS));
+    }
+
+    @Test
+    void test_plusSeconds_min() {
+        assertEquals(Deadline.MIN, Deadline.MIN.plusSeconds(-1));
+    }
+
+    @Test
+    void test_plusSeconds_max() {
+        assertEquals(Deadline.MAX, Deadline.MAX.plusSeconds(1));
+    }
+
+    @Test
+    void test_plusMillis_min() {
+        assertEquals(Deadline.MIN, Deadline.MIN.plusMillis(-1));
+    }
+
+    @Test
+    void test_plusMillis_max() {
+        assertEquals(Deadline.MAX, Deadline.MAX.plusMillis(1));
+    }
+
+    @Test
+    void test_plusDuration_min() {
+        assertEquals(Deadline.MIN, Deadline.MIN.plus(Duration.ofNanos(-1)));
+    }
+
+    @Test
+    void test_plusDuration_max() {
+        assertEquals(Deadline.MAX, Deadline.MAX.plus(Duration.ofNanos(1)));
+    }
+
+    @Test
+    void test_until_min() {
+        assertEquals(Long.MIN_VALUE, Deadline.MAX.until(Deadline.MIN, NANOS));
+    }
+
+    @Test
+    void test_until_max() {
+        assertEquals(Long.MAX_VALUE, Deadline.MIN.until(Deadline.MAX, NANOS));
+    }
+
+    @Test
+    void test_between_min() {
+        Duration delta = Duration.between(Instant.MAX, Instant.MIN);
+        assertEquals(delta, Deadline.between(Deadline.MAX, Deadline.MIN));
+    }
+
+    @Test
+    void test_between_max() {
+        Duration delta = Duration.between(Instant.MIN, Instant.MAX);
+        assertEquals(delta, Deadline.between(Deadline.MIN, Deadline.MAX));
+    }
+
+}

From ac9cf5d572f7504507117aa15e56c903e1400cf5 Mon Sep 17 00:00:00 2001
From: Zihao Lin <linzihao1999@outlook.com>
Date: Thu, 6 Nov 2025 07:19:14 +0000
Subject: [PATCH 054/512] 8370878: C1: Clean up unnecessary ConversionStub
 constructor

Reviewed-by: chagedorn
---
 src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp |  2 +-
 src/hotspot/share/c1/c1_CodeStubs.hpp       | 30 ---------------------
 src/hotspot/share/c1/c1_LIR.cpp             |  4 ---
 src/hotspot/share/c1/c1_LIR.hpp             | 11 +++-----
 4 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
index c8a3f79960b..4c339968f85 100644
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
@@ -924,7 +924,7 @@ void LIRGenerator::do_Convert(Convert* x) {
       LIRItem value(x->value(), this);
       value.load_item();
       LIR_Opr reg = rlock_result(x);
-      __ convert(x->op(), value.result(), reg, nullptr);
+      __ convert(x->op(), value.result(), reg);
       return;
     }
   }
diff --git a/src/hotspot/share/c1/c1_CodeStubs.hpp b/src/hotspot/share/c1/c1_CodeStubs.hpp
index 9a462006bcc..c8b29f91bb2 100644
--- a/src/hotspot/share/c1/c1_CodeStubs.hpp
+++ b/src/hotspot/share/c1/c1_CodeStubs.hpp
@@ -127,36 +127,6 @@ public:
 
 };
 
-class ConversionStub: public CodeStub {
- private:
-  Bytecodes::Code _bytecode;
-  LIR_Opr         _input;
-  LIR_Opr         _result;
-
-  static float float_zero;
-  static double double_zero;
- public:
-  ConversionStub(Bytecodes::Code bytecode, LIR_Opr input, LIR_Opr result)
-    : _bytecode(bytecode), _input(input), _result(result) {
-    ShouldNotReachHere();
-  }
-
-  Bytecodes::Code bytecode() { return _bytecode; }
-  LIR_Opr         input()    { return _input; }
-  LIR_Opr         result()   { return _result; }
-
-  virtual void emit_code(LIR_Assembler* e);
-  virtual void visit(LIR_OpVisitState* visitor) {
-    visitor->do_slow_case();
-    visitor->do_input(_input);
-    visitor->do_output(_result);
-  }
-#ifndef PRODUCT
-  virtual void print_name(outputStream* out) const { out->print("ConversionStub"); }
-#endif // PRODUCT
-};
-
-
 // Throws ArrayIndexOutOfBoundsException by default but can be
 // configured to throw IndexOutOfBoundsException in constructor
 class RangeCheckStub: public CodeStub {
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index 012c0f92f25..a67fa98f8f8 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -501,7 +501,6 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
       assert(opConvert->_info == nullptr, "must be");
       if (opConvert->_opr->is_valid())       do_input(opConvert->_opr);
       if (opConvert->_result->is_valid())    do_output(opConvert->_result);
-      do_stub(opConvert->_stub);
 
       break;
     }
@@ -1009,9 +1008,6 @@ void LIR_OpBranch::emit_code(LIR_Assembler* masm) {
 
 void LIR_OpConvert::emit_code(LIR_Assembler* masm) {
   masm->emit_opConvert(this);
-  if (stub() != nullptr) {
-    masm->append_code_stub(stub());
-  }
 }
 
 void LIR_Op2::emit_code(LIR_Assembler* masm) {
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index 847184731ce..80b0fd65bc1 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -1430,23 +1430,18 @@ class LIR_OpReturn: public LIR_Op1 {
   virtual LIR_OpReturn* as_OpReturn() { return this; }
 };
 
-class ConversionStub;
-
 class LIR_OpConvert: public LIR_Op1 {
  friend class LIR_OpVisitState;
 
  private:
    Bytecodes::Code _bytecode;
-   ConversionStub* _stub;
 
  public:
-   LIR_OpConvert(Bytecodes::Code code, LIR_Opr opr, LIR_Opr result, ConversionStub* stub)
+   LIR_OpConvert(Bytecodes::Code code, LIR_Opr opr, LIR_Opr result)
      : LIR_Op1(lir_convert, opr, result)
-     , _bytecode(code)
-     , _stub(stub)                               {}
+     , _bytecode(code)                           {}
 
   Bytecodes::Code bytecode() const               { return _bytecode; }
-  ConversionStub* stub() const                   { return _stub; }
 
   virtual void emit_code(LIR_Assembler* masm);
   virtual LIR_OpConvert* as_OpConvert() { return this; }
@@ -2171,7 +2166,7 @@ class LIR_List: public CompilationResourceObj {
   void safepoint(LIR_Opr tmp, CodeEmitInfo* info)  { append(new LIR_Op1(lir_safepoint, tmp, info)); }
   void return_op(LIR_Opr result)                   { append(new LIR_OpReturn(result)); }
 
-  void convert(Bytecodes::Code code, LIR_Opr left, LIR_Opr dst, ConversionStub* stub = nullptr/*, bool is_32bit = false*/) { append(new LIR_OpConvert(code, left, dst, stub)); }
+  void convert(Bytecodes::Code code, LIR_Opr left, LIR_Opr dst) { append(new LIR_OpConvert(code, left, dst)); }
 
   void logical_and (LIR_Opr left, LIR_Opr right, LIR_Opr dst) { append(new LIR_Op2(lir_logic_and,  left, right, dst)); }
   void logical_or  (LIR_Opr left, LIR_Opr right, LIR_Opr dst) { append(new LIR_Op2(lir_logic_or,   left, right, dst)); }

From db76479a105cda383f38f5f9857a8642ccf50cfd Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 6 Nov 2025 08:06:34 +0000
Subject: [PATCH 055/512] 8371316: Adjust assertion (GC pause time cannot be
 smaller than the sum of each phase) in G1GCPhaseTimes::print

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index b211b1e32fb..a5013ddbb40 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -567,8 +567,8 @@ void G1GCPhaseTimes::print(bool evacuation_failed) {
   accounted_ms += print_evacuate_optional_collection_set();
   accounted_ms += print_post_evacuate_collection_set(evacuation_failed);
 
-  assert(_gc_pause_time_ms >= accounted_ms, "GC pause time(%.3lfms) cannot be "
-         "smaller than the sum of each phase(%.3lfms).", _gc_pause_time_ms, accounted_ms);
+  assert(_gc_pause_time_ms >= accounted_ms, "GC pause time(%.15lf ms) cannot be "
+         "smaller than the sum of each phase(%.15lf ms).", _gc_pause_time_ms, accounted_ms);
 
   print_other(accounted_ms);
 

From 1b3889a47092e018ab9ecb6aaa922046d8d0e916 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 6 Nov 2025 08:27:32 +0000
Subject: [PATCH 056/512] 8354937: Cleanup some sparc related coding in
 os_linux

Reviewed-by: ayang, mdoerr, lucy
---
 src/hotspot/os/linux/os_linux.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index d1a7b7b82c8..69ef8ce7c33 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -486,13 +486,11 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu
 }
 
 #ifndef SYS_gettid
-// i386: 224, amd64: 186, sparc: 143
+// i386: 224, amd64: 186
   #if defined(__i386__)
     #define SYS_gettid 224
   #elif defined(__amd64__)
     #define SYS_gettid 186
-  #elif defined(__sparc__)
-    #define SYS_gettid 143
   #else
     #error "Define SYS_gettid for this architecture"
   #endif
@@ -2715,8 +2713,6 @@ const char* search_string = "CPU";
 const char* search_string = "cpu";
 #elif defined(S390)
 const char* search_string = "machine =";
-#elif defined(SPARC)
-const char* search_string = "cpu";
 #else
 const char* search_string = "Processor";
 #endif
@@ -2766,8 +2762,6 @@ void os::get_summary_cpu_info(char* cpuinfo, size_t length) {
   strncpy(cpuinfo, LP64_ONLY("RISCV64") NOT_LP64("RISCV32"), length);
 #elif defined(S390)
   strncpy(cpuinfo, "S390", length);
-#elif defined(SPARC)
-  strncpy(cpuinfo, "sparcv9", length);
 #elif defined(ZERO_LIBARCH)
   strncpy(cpuinfo, ZERO_LIBARCH, length);
 #else

From 913c973ca0ffdc19171a56550e8a8f03ac7f4771 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 6 Nov 2025 10:14:21 +0000
Subject: [PATCH 057/512] 8371104: gtests should use wrappers for <limits> and
 <type_traits>

Reviewed-by: jrose, tschatzl
---
 test/hotspot/gtest/metaprogramming/test_enableIf.cpp      | 3 +--
 test/hotspot/gtest/riscv/test_assembler_riscv.cpp         | 3 +--
 test/hotspot/gtest/utilities/test_align.cpp               | 3 +--
 test/hotspot/gtest/utilities/test_count_leading_zeros.cpp | 5 ++---
 test/hotspot/gtest/utilities/test_deferredStatic.cpp      | 3 +--
 test/hotspot/gtest/utilities/test_enumIterator.cpp        | 3 +--
 test/hotspot/gtest/utilities/test_globalDefinitions.cpp   | 3 +--
 test/hotspot/gtest/utilities/test_population_count.cpp    | 3 +--
 test/hotspot/gtest/utilities/test_powerOfTwo.cpp          | 5 ++---
 9 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/test/hotspot/gtest/metaprogramming/test_enableIf.cpp b/test/hotspot/gtest/metaprogramming/test_enableIf.cpp
index 39073309704..05603f01c64 100644
--- a/test/hotspot/gtest/metaprogramming/test_enableIf.cpp
+++ b/test/hotspot/gtest/metaprogramming/test_enableIf.cpp
@@ -22,13 +22,12 @@
  *
  */
 
+#include "cppstdlib/type_traits.hpp"
 #include "memory/allStatic.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "utilities/debug.hpp"
 #include "unittest.hpp"
 
-#include <type_traits>
-
 class EnableIfTest: AllStatic {
   class A: AllStatic {
   public:
diff --git a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
index c6754eacae6..55504c34b0f 100644
--- a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
+++ b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
@@ -26,14 +26,13 @@
 
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.hpp"
+#include "cppstdlib/limits.hpp"
 #include "memory/resourceArea.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "runtime/orderAccess.hpp"
 #include "threadHelper.inline.hpp"
 #include "unittest.hpp"
 
-#include <limits>
-
 typedef int64_t (*zicond_func)(int64_t cmp1, int64_t cmp2, int64_t dst, int64_t src);
 typedef void (MacroAssembler::*cmov_func)(Register cmp1, Register cmp2, Register dst, Register src);
 
diff --git a/test/hotspot/gtest/utilities/test_align.cpp b/test/hotspot/gtest/utilities/test_align.cpp
index 7413e58e7ab..3679a0b3e42 100644
--- a/test/hotspot/gtest/utilities/test_align.cpp
+++ b/test/hotspot/gtest/utilities/test_align.cpp
@@ -21,13 +21,12 @@
  * questions.
  */
 
+#include "cppstdlib/limits.hpp"
 #include "utilities/align.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
 
-#include <limits>
-
 // A few arbitrarily chosen values to test the align functions on.
 static constexpr uint64_t values[] = {1, 3, 10, 345, 1023, 1024, 1025, 23909034, INT_MAX, uint64_t(-1) / 2, uint64_t(-1) / 2 + 100, ~(uint64_t(1) << 62)};
 
diff --git a/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp b/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp
index 4d5fcc09999..8d8f0a6f5e4 100644
--- a/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp
+++ b/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp
@@ -22,13 +22,12 @@
  *
  */
 
+#include "cppstdlib/limits.hpp"
+#include "cppstdlib/type_traits.hpp"
 #include "utilities/count_leading_zeros.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
 
-#include <limits>
-#include <type_traits>
-
 template <typename T> void one_or_two_set_bits() {
   uint32_t bit1_pos = 0;
   uint32_t bits = sizeof(T) * BitsPerByte;
diff --git a/test/hotspot/gtest/utilities/test_deferredStatic.cpp b/test/hotspot/gtest/utilities/test_deferredStatic.cpp
index b41b1e4ee60..779c0d08b2c 100644
--- a/test/hotspot/gtest/utilities/test_deferredStatic.cpp
+++ b/test/hotspot/gtest/utilities/test_deferredStatic.cpp
@@ -22,12 +22,11 @@
  *
  */
 
+#include "cppstdlib/type_traits.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/deferredStatic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-#include <type_traits>
-
 #include "unittest.hpp"
 
 class DeferredStaticTestClass {
diff --git a/test/hotspot/gtest/utilities/test_enumIterator.cpp b/test/hotspot/gtest/utilities/test_enumIterator.cpp
index 2506e85e3d3..429efff7ede 100644
--- a/test/hotspot/gtest/utilities/test_enumIterator.cpp
+++ b/test/hotspot/gtest/utilities/test_enumIterator.cpp
@@ -21,11 +21,10 @@
  * questions.
  */
 
+#include "cppstdlib/type_traits.hpp"
 #include "utilities/enumIterator.hpp"
 #include "unittest.hpp"
 
-#include <type_traits>
-
 enum class ExplicitTest : int { value1, value2, value3 };
 ENUMERATOR_RANGE(ExplicitTest, ExplicitTest::value1, ExplicitTest::value3);
 constexpr int explicit_start = 0;
diff --git a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
index 4c04b77a51b..f24d74ea529 100644
--- a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
+++ b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "cppstdlib/type_traits.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
@@ -28,8 +29,6 @@
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
 
-#include <type_traits>
-
 static ::testing::AssertionResult testPageAddress(
   const char* expected_addr_expr,
   const char* addr_expr,
diff --git a/test/hotspot/gtest/utilities/test_population_count.cpp b/test/hotspot/gtest/utilities/test_population_count.cpp
index 1cb7c87f434..8494d9b593e 100644
--- a/test/hotspot/gtest/utilities/test_population_count.cpp
+++ b/test/hotspot/gtest/utilities/test_population_count.cpp
@@ -22,14 +22,13 @@
  *
  */
 
+#include "cppstdlib/limits.hpp"
 #include "runtime/os.hpp"
 #include "utilities/population_count.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
 
-#include <limits>
-
 #define BITS_IN_BYTE_ARRAY_SIZE 256
 
 const uint8_t test_popcnt_bitsInByte[BITS_IN_BYTE_ARRAY_SIZE] = {
diff --git a/test/hotspot/gtest/utilities/test_powerOfTwo.cpp b/test/hotspot/gtest/utilities/test_powerOfTwo.cpp
index a287036e6a0..9ead9952e73 100644
--- a/test/hotspot/gtest/utilities/test_powerOfTwo.cpp
+++ b/test/hotspot/gtest/utilities/test_powerOfTwo.cpp
@@ -22,13 +22,12 @@
  */
 
 
+#include "cppstdlib/limits.hpp"
+#include "cppstdlib/type_traits.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "unittest.hpp"
 
-#include <limits>
-#include <type_traits>
-
 struct StaticTestIsPowerOf2Result {
   uint64_t _value;
   int _status;            // 0: success, > 0 indicates which failure case

From 093e128771f3dc01f64a8572de068e9776e38b97 Mon Sep 17 00:00:00 2001
From: Qizheng Xing <qxing@openjdk.org>
Date: Thu, 6 Nov 2025 10:56:48 +0000
Subject: [PATCH 058/512] 8347499: C2: Make `PhaseIdealLoop` eliminate more
 redundant safepoints in loops

Reviewed-by: epeter, roland
---
 src/hotspot/share/opto/loopnode.cpp           |  65 ++++---
 .../TestRedundantSafepointElimination.java    | 177 ++++++++++++++++++
 .../bench/vm/compiler/LoopSafepoint.java      | 131 +++++++++++++
 3 files changed, 345 insertions(+), 28 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestRedundantSafepointElimination.java
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/LoopSafepoint.java

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index d04eb34acee..3b398b053a3 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4165,35 +4165,44 @@ void IdealLoopTree::allpaths_check_safepts(VectorSet &visited, Node_List &stack)
 // backedge (arc 3->2).  So it deletes the ncsfpt (non-call safepoint)
 // in block 2, _but_ this leaves the outer loop without a safepoint.
 //
-//          entry  0
-//                 |
-//                 v
-// outer 1,2    +->1
-//              |  |
-//              |  v
-//              |  2<---+  ncsfpt in 2
-//              |_/|\   |
-//                 | v  |
-// inner 2,3      /  3  |  call in 3
-//               /   |  |
-//              v    +--+
-//        exit  4
+//             entry  0
+//                    |
+//                    v
+//   outer 1,2,4  +-> 1
+//                |    \
+//                |     v
+//    inner 2,3   |     2 <---+  ncsfpt in 2
+//                |    / \    |
+//                |   v   v   |
+//                |  4     3  |  call in 3
+//                |_/ \     \_|
+//                     |
+//                     v
+//               exit  5
 //
+// This method maintains a list (_required_safept) of ncsfpts that must
+// be protected for each loop. It only marks ncsfpts for prevervation,
+// and does not actually delete any of them.
 //
-// This method creates a list (_required_safept) of ncsfpt nodes that must
-// be protected is created for each loop. When a ncsfpt maybe deleted, it
-// is first looked for in the lists for the outer loops of the current loop.
+// If some other method needs to delete a ncsfpt later, it will make sure
+// the ncsfpt is not in the list of all outer loops of the current loop.
+// See `PhaseIdealLoop::is_deleteable_safept`.
 //
 // The insights into the problem:
-//  A) counted loops are okay
-//  B) innermost loops are okay (only an inner loop can delete
-//     a ncsfpt needed by an outer loop)
-//  C) a loop is immune from an inner loop deleting a safepoint
-//     if the loop has a call on the idom-path
-//  D) a loop is also immune if it has a ncsfpt (non-call safepoint) on the
-//     idom-path that is not in a nested loop
-//  E) otherwise, an ncsfpt on the idom-path that is nested in an inner
-//     loop needs to be prevented from deletion by an inner loop
+//  A) Counted loops are okay (i.e. do not need to preserve ncsfpts),
+//     they will be handled in `IdealLoopTree::counted_loop`
+//  B) Innermost loops are okay because there's no inner loops that can
+//     delete their ncsfpts. Only outer loops need to mark safepoints for
+//     protection, because only loops further in can accidentally delete
+//     their ncsfpts
+//  C) If an outer loop has a call that's guaranteed to execute (on the
+//     idom-path), then that loop is okay. Because the call will always
+//     perform a safepoint poll, regardless of what safepoints are deleted
+//     from its inner loops
+//  D) Similarly, if an outer loop has a ncsfpt on the idom-path that isn't
+//     inside any nested loop, then that loop is okay
+//  E) Otherwise, if an outer loop's ncsfpt on the idom-path is nested in
+//     an inner loop, we need to prevent the inner loop from deleting it
 //
 // There are two analyses:
 //  1) The first, and cheaper one, scans the loop body from
@@ -4227,10 +4236,10 @@ void IdealLoopTree::check_safepts(VectorSet &visited, Node_List &stack) {
           break;
         } else if (n->Opcode() == Op_SafePoint) {
           if (_phase->get_loop(n) == this) {
+            // We found a local ncsfpt.
+            // Continue searching for a call that is guaranteed to be a safepoint.
             has_local_ncsfpt = true;
-            break;
-          }
-          if (nonlocal_ncsfpt == nullptr) {
+          } else if (nonlocal_ncsfpt == nullptr) {
             nonlocal_ncsfpt = n; // save the one closest to the tail
           }
         } else {
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestRedundantSafepointElimination.java b/test/hotspot/jtreg/compiler/loopopts/TestRedundantSafepointElimination.java
new file mode 100644
index 00000000000..69f86a2bf1d
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestRedundantSafepointElimination.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2025 Alibaba Group Holding Limited. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8347499
+ * @summary Tests that redundant safepoints can be eliminated in loops.
+ * @library /test/lib /
+ * @run main compiler.loopopts.TestRedundantSafepointElimination
+ */
+public class TestRedundantSafepointElimination {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    static int someInts0 = 1;
+    static int someInts1 = 2;
+
+    @DontInline
+    private void empty() {}
+
+    // Test for a top-level counted loop.
+    // There should be a non-call safepoint in the loop.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "1"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testTopLevelCountedLoop() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i++) {
+            sum += someInts0;
+        }
+        return sum;
+    }
+
+    // Test for a top-level counted loop with a call that dominates
+    // the tail of the loop.
+    // There should be no safepoint in the loop, because the call is
+    // guaranteed to have a safepoint.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "0"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testTopLevelCountedLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i++) {
+            empty();
+            sum += someInts0;
+        }
+        return sum;
+    }
+
+    // Test for a top-level uncounted loop.
+    // There should be a non-call safepoint in the loop.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "1"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testTopLevelUncountedLoop() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i += someInts0) {
+            sum += someInts1;
+        }
+        return sum;
+    }
+
+    // Test for a top-level uncounted loop with a call that dominates
+    // the tail of the loop.
+    // There should be no safepoint in the loop, because the call is
+    // guaranteed to have a safepoint.
+    // Before JDK-8347499, this test would fail due to C2 exiting
+    // prematurely when encountering the local non-call safepoint.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "0"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testTopLevelUncountedLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i += someInts0) {
+            empty();
+            sum += someInts1;
+        }
+        return sum;
+    }
+
+    // Test for nested loops, where the outer loop has a call that
+    // dominates its own tail.
+    // There should be only one safepoint in the inner loop.
+    // Before JDK-8347499, this test would fail due to C2 exiting
+    // prematurely when encountering the local non-call safepoint.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "1"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testOuterLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100; i += someInts0) {
+            empty();
+            for (int j = 0; j < 1000; j++) {
+                sum += someInts1;
+            }
+        }
+        return sum;
+    }
+
+    // Test for nested loops, where both the outer and inner loops
+    // have a call that dominates their tails.
+    // There should be no safepoint in both loops, because calls
+    // within them are guaranteed to have a safepoint.
+    // Before JDK-8347499, this test would fail due to C2 exiting
+    // prematurely when encountering the local non-call safepoint.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "0"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testOuterAndInnerLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100; i += someInts0) {
+            empty();
+            for (int j = 0; j < 1000; j++) {
+                empty();
+                sum += someInts1;
+            }
+        }
+        return sum;
+    }
+
+    // Test for nested loops, where the outer loop has a local
+    // non-call safepoint.
+    // There should be a safepoint in both loops.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "2"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public int testOuterLoopWithLocalNonCallSafepoint() {
+        int sum = 0;
+        for (int i = 0; i < 100; i += someInts0) {
+            for (int j = 0; j < 1000; j++) {
+                sum += someInts1;
+            }
+        }
+        return sum;
+    }
+
+    // Test for nested loops, where the outer loop has no local
+    // safepoints, and it must preserve a non-local safepoint.
+    // There should be two safepoints in the loop tree.
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "2"},
+        phase = CompilePhase.AFTER_LOOP_OPTS)
+    public void testLoopNeedsToPreserveSafepoint() {
+        int i = 0, stop;
+        while (i < 1000) {
+            stop = i + 10;
+            while (i < stop) {
+                i += 1;
+            }
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/LoopSafepoint.java b/test/micro/org/openjdk/bench/vm/compiler/LoopSafepoint.java
new file mode 100644
index 00000000000..fa69550948e
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/LoopSafepoint.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2025 Alibaba Group Holding Limited. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3)
+@Warmup(iterations = 5, time = 2)
+@Measurement(iterations = 5, time = 3)
+@State(Scope.Thread)
+public class LoopSafepoint {
+    static int someInts0 = 1;
+    static int someInts1 = 2;
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    private void empty() {}
+
+    // All benchmarks below are in sync with the IR test
+    // `compiler.loopopts.TestRedundantSafepointElimination.java`.
+    // Check the comments in the IR test for more details.
+
+    @Benchmark
+    public int topLevelCountedLoop() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i++) {
+            sum += someInts0;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int topLevelCountedLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i++) {
+            empty();
+            sum += someInts0;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int topLevelUncountedLoop() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i += someInts0) {
+            sum += someInts1;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int topLevelUncountedLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100000; i += someInts0) {
+            empty();
+            sum += someInts1;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int outerLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100; i += someInts0) {
+            empty();
+            for (int j = 0; j < 1000; j++) {
+                sum += someInts1;
+            }
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int outerAndInnerLoopWithDomCall() {
+        int sum = 0;
+        for (int i = 0; i < 100; i += someInts0) {
+            empty();
+            for (int j = 0; j < 1000; j++) {
+                empty();
+                sum += someInts1;
+            }
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int outerLoopWithLocalNonCallSafepoint() {
+        int sum = 0;
+        for (int i = 0; i < 100; i += someInts0) {
+            for (int j = 0; j < 1000; j++) {
+                sum += someInts1;
+            }
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public void loopNeedsToPreserveSafepoint() {
+        int i = 0, stop;
+        while (i < 1000) {
+            stop = i + 10;
+            while (i < stop) {
+                i += 1;
+            }
+        }
+    }
+}

From 3930b1d4ddda9d56d0fb3626421283c72f4ad7f9 Mon Sep 17 00:00:00 2001
From: Fredrik Bredberg <fbredberg@openjdk.org>
Date: Thu, 6 Nov 2025 12:16:19 +0000
Subject: [PATCH 059/512] 8367982: Unify ObjectSynchronizer and
 LightweightSynchronizer

Reviewed-by: pchilanomate, coleenp
---
 src/hotspot/cpu/aarch64/aarch64.ad            |    8 +-
 .../cpu/aarch64/c1_MacroAssembler_aarch64.cpp |    4 +-
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp |   14 +-
 .../cpu/aarch64/c2_MacroAssembler_aarch64.hpp |    6 +-
 .../cpu/aarch64/interp_masm_aarch64.cpp       |    6 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |   10 +-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |    4 +-
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     |    6 +-
 .../cpu/aarch64/vm_version_aarch64.hpp        |    2 +-
 src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp |    4 +-
 src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp |    8 +-
 src/hotspot/cpu/arm/interp_masm_arm.cpp       |    6 +-
 src/hotspot/cpu/arm/macroAssembler_arm.cpp    |    8 +-
 src/hotspot/cpu/arm/macroAssembler_arm.hpp    |   10 +-
 src/hotspot/cpu/arm/sharedRuntime_arm.cpp     |    8 +-
 src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp |    4 +-
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp |   12 +-
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp |   12 +-
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp    |    4 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    |   24 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.hpp    |   12 +-
 src/hotspot/cpu/ppc/ppc.ad                    |   16 +-
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |    4 +-
 src/hotspot/cpu/ppc/vm_version_ppc.hpp        |    2 +-
 .../cpu/riscv/c1_MacroAssembler_riscv.cpp     |    4 +-
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     |   12 +-
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |   10 +-
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   |    6 +-
 .../cpu/riscv/macroAssembler_riscv.cpp        |    8 +-
 .../cpu/riscv/macroAssembler_riscv.hpp        |    4 +-
 src/hotspot/cpu/riscv/riscv.ad                |   20 +-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |    6 +-
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |    4 +-
 .../cpu/s390/c1_MacroAssembler_s390.cpp       |    4 +-
 .../cpu/s390/c2_MacroAssembler_s390.cpp       |    8 +-
 .../cpu/s390/c2_MacroAssembler_s390.hpp       |    8 +-
 src/hotspot/cpu/s390/interp_masm_s390.cpp     |    4 +-
 src/hotspot/cpu/s390/macroAssembler_s390.cpp  |   32 +-
 src/hotspot/cpu/s390/macroAssembler_s390.hpp  |    8 +-
 src/hotspot/cpu/s390/s390.ad                  |    8 +-
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |    4 +-
 src/hotspot/cpu/s390/vm_version_s390.hpp      |    4 +-
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp |    4 +-
 src/hotspot/cpu/x86/c2_CodeStubs_x86.cpp      |    4 +-
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp |   14 +-
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |    6 +-
 src/hotspot/cpu/x86/interp_masm_x86.cpp       |    4 +-
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |   10 +-
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |    4 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |    4 +-
 src/hotspot/cpu/x86/vm_version_x86.hpp        |    2 +-
 src/hotspot/cpu/x86/x86.ad                    |    8 +-
 .../share/interpreter/interpreterRuntime.cpp  |    2 +-
 src/hotspot/share/oops/markWord.hpp           |    4 +-
 src/hotspot/share/opto/c2_CodeStubs.hpp       |    8 +-
 src/hotspot/share/prims/jvmtiEnvBase.cpp      |    2 +-
 src/hotspot/share/prims/whitebox.cpp          |    7 +-
 .../share/runtime/abstract_vm_version.hpp     |    4 +-
 src/hotspot/share/runtime/deoptimization.cpp  |    7 +-
 src/hotspot/share/runtime/globals.hpp         |   14 +-
 src/hotspot/share/runtime/javaThread.cpp      |    2 +-
 .../share/runtime/lightweightSynchronizer.cpp | 1231 ----------------
 .../share/runtime/lightweightSynchronizer.hpp |   80 -
 src/hotspot/share/runtime/lockStack.cpp       |    4 +-
 .../share/runtime/lockStack.inline.hpp        |   12 +-
 src/hotspot/share/runtime/objectMonitor.cpp   |    6 +-
 src/hotspot/share/runtime/objectMonitor.hpp   |    6 +-
 .../share/runtime/objectMonitor.inline.hpp    |    8 +-
 src/hotspot/share/runtime/serviceThread.cpp   |    6 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |    4 +-
 src/hotspot/share/runtime/synchronizer.cpp    | 1283 ++++++++++++++++-
 src/hotspot/share/runtime/synchronizer.hpp    |   51 +-
 .../share/runtime/synchronizer.inline.hpp     |   71 -
 src/hotspot/share/runtime/vframe.cpp          |    2 +-
 src/hotspot/share/services/threadService.cpp  |    2 +-
 test/hotspot/gtest/runtime/test_lockStack.cpp |    8 +-
 .../runtime/Monitor/TestRecursiveLocking.java |   11 +-
 .../lockStack/TestLockStackCapacity.java      |    6 +-
 test/jdk/com/sun/jdi/EATests.java             |   17 +-
 test/lib/jdk/test/whitebox/WhiteBox.java      |    2 +-
 80 files changed, 1551 insertions(+), 1717 deletions(-)
 delete mode 100644 src/hotspot/share/runtime/lightweightSynchronizer.cpp
 delete mode 100644 src/hotspot/share/runtime/lightweightSynchronizer.hpp
 delete mode 100644 src/hotspot/share/runtime/synchronizer.inline.hpp

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 1e506edb634..44d7bf1e0fa 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -16262,7 +16262,7 @@ instruct branchLoopEnd(cmpOp cmp, rFlagsReg cr, label lbl)
 // ============================================================================
 // inlined locking and unlocking
 
-instruct cmpFastLockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRegPNoSp tmp2, iRegPNoSp tmp3)
+instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRegPNoSp tmp2, iRegPNoSp tmp3)
 %{
   match(Set cr (FastLock object box));
   effect(TEMP tmp, TEMP tmp2, TEMP tmp3);
@@ -16271,13 +16271,13 @@ instruct cmpFastLockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp
   format %{ "fastlock $object,$box\t! kills $tmp,$tmp2,$tmp3" %}
 
   ins_encode %{
-    __ fast_lock_lightweight($object$$Register, $box$$Register, $tmp$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_lock($object$$Register, $box$$Register, $tmp$$Register, $tmp2$$Register, $tmp3$$Register);
   %}
 
   ins_pipe(pipe_serial);
 %}
 
-instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRegPNoSp tmp2, iRegPNoSp tmp3)
+instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRegPNoSp tmp2, iRegPNoSp tmp3)
 %{
   match(Set cr (FastUnlock object box));
   effect(TEMP tmp, TEMP tmp2, TEMP tmp3);
@@ -16286,7 +16286,7 @@ instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP box, iRegPNo
   format %{ "fastunlock $object,$box\t! kills $tmp, $tmp2, $tmp3" %}
 
   ins_encode %{
-    __ fast_unlock_lightweight($object$$Register, $box$$Register, $tmp$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_unlock($object$$Register, $box$$Register, $tmp$$Register, $tmp2$$Register, $tmp3$$Register);
   %}
 
   ins_pipe(pipe_serial);
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
index 31c36e749c5..e934632715c 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
@@ -70,7 +70,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register basic_lo
 
   null_check_offset = offset();
 
-  lightweight_lock(basic_lock, obj, hdr, temp, rscratch2, slow_case);
+  fast_lock(basic_lock, obj, hdr, temp, rscratch2, slow_case);
 
   return null_check_offset;
 }
@@ -83,7 +83,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register basic
   ldr(obj, Address(basic_lock, BasicObjectLock::obj_offset()));
   verify_oop(obj);
 
-  lightweight_unlock(obj, hdr, temp, rscratch2, slow_case);
+  fast_unlock(obj, hdr, temp, rscratch2, slow_case);
 }
 
 
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 5f71222ed88..ebb4a897906 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -147,8 +147,8 @@ address C2_MacroAssembler::arrays_hashcode(Register ary, Register cnt, Register
   return pc();
 }
 
-void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Register t1,
-                                              Register t2, Register t3) {
+void C2_MacroAssembler::fast_lock(Register obj, Register box, Register t1,
+                                  Register t2, Register t3) {
   assert_different_registers(obj, box, t1, t2, t3, rscratch2);
 
   // Handle inflated monitor.
@@ -173,7 +173,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
   const Register t1_mark = t1;
   const Register t3_t = t3;
 
-  { // Lightweight locking
+  { // Fast locking
 
     // Push lock to the lock stack and finish successfully. MUST branch to with flag == EQ
     Label push;
@@ -303,8 +303,8 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
   // C2 uses the value of Flags (NE vs EQ) to determine the continuation.
 }
 
-void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Register t1,
-                                                Register t2, Register t3) {
+void C2_MacroAssembler::fast_unlock(Register obj, Register box, Register t1,
+                                    Register t2, Register t3) {
   assert_different_registers(obj, box, t1, t2, t3);
 
   // Handle inflated monitor.
@@ -318,7 +318,7 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Regi
   const Register t2_top = t2;
   const Register t3_t = t3;
 
-  { // Lightweight unlock
+  { // Fast unlock
 
     Label push_and_slow_path;
 
@@ -2859,4 +2859,4 @@ void C2_MacroAssembler::vector_expand_sve(FloatRegister dst, FloatRegister src,
   sve_sub(dst, size, 1);
   // dst  = 00 87 00 65 00 43 00 21
   sve_tbl(dst, size, src, dst);
-}
\ No newline at end of file
+}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index 09850a60c64..ccd091938a3 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -51,9 +51,9 @@
                           FloatRegister vmul3, FloatRegister vpow, FloatRegister vpowm,
                           BasicType eltype);
 
-  // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in .ad file.
-  void fast_lock_lightweight(Register object, Register box, Register t1, Register t2, Register t3);
-  void fast_unlock_lightweight(Register object, Register box, Register t1, Register t2, Register t3);
+  // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
+  void fast_lock(Register object, Register box, Register t1, Register t2, Register t3);
+  void fast_unlock(Register object, Register box, Register t1, Register t2, Register t3);
 
   void string_compare(Register str1, Register str2,
                       Register cnt1, Register cnt2, Register result,
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index cf4d5a63496..957c2aee1c1 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -709,7 +709,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
   ldr(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset()));
 
   Label slow_case, done;
-  lightweight_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
+  fast_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
   b(done);
 
   bind(slow_case);
@@ -741,7 +741,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
   const Register swap_reg   = r0;
   const Register header_reg = c_rarg2;  // Will contain the old oopMark
   const Register obj_reg    = c_rarg3;  // Will contain the oop
-  const Register tmp_reg    = c_rarg4;  // Temporary used by lightweight_unlock
+  const Register tmp_reg    = c_rarg4;  // Temporary used by fast_unlock
 
   save_bcp(); // Save in case of exception
 
@@ -752,7 +752,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
   str(zr, Address(lock_reg, BasicObjectLock::obj_offset()));
 
   Label slow_case, done;
-  lightweight_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case);
+  fast_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case);
   b(done);
 
   bind(slow_case);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index c83e6e12fa1..ceedb4f1063 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -6934,12 +6934,12 @@ void MacroAssembler::double_move(VMRegPair src, VMRegPair dst, Register tmp) {
   }
 }
 
-// Implements lightweight-locking.
+// Implements fast-locking.
 //
 //  - obj: the object to be locked
 //  - t1, t2, t3: temporary registers, will be destroyed
 //  - slow: branched to if locking fails, absolute offset may larger than 32KB (imm14 encoding).
-void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Register t1, Register t2, Register t3, Label& slow) {
+void MacroAssembler::fast_lock(Register basic_lock, Register obj, Register t1, Register t2, Register t3, Label& slow) {
   assert_different_registers(basic_lock, obj, t1, t2, t3, rscratch1);
 
   Label push;
@@ -6993,12 +6993,12 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   strw(top, Address(rthread, JavaThread::lock_stack_top_offset()));
 }
 
-// Implements lightweight-unlocking.
+// Implements fast-unlocking.
 //
 // - obj: the object to be unlocked
 // - t1, t2, t3: temporary registers
 // - slow: branched to if unlocking fails, absolute offset may larger than 32KB (imm14 encoding).
-void MacroAssembler::lightweight_unlock(Register obj, Register t1, Register t2, Register t3, Label& slow) {
+void MacroAssembler::fast_unlock(Register obj, Register t1, Register t2, Register t3, Label& slow) {
   // cmpxchg clobbers rscratch1.
   assert_different_registers(obj, t1, t2, t3, rscratch1);
 
@@ -7044,7 +7044,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register t1, Register t2,
   // Check header not unlocked (0b01).
   Label not_unlocked;
   tbz(mark, log2i_exact(markWord::unlocked_value), not_unlocked);
-  stop("lightweight_unlock already unlocked");
+  stop("fast_unlock already unlocked");
   bind(not_unlocked);
 #endif
 
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 4468eaa40c5..4baa07d7d49 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1721,8 +1721,8 @@ public:
   // Code for java.lang.Thread::onSpinWait() intrinsic.
   void spin_wait();
 
-  void lightweight_lock(Register basic_lock, Register obj, Register t1, Register t2, Register t3, Label& slow);
-  void lightweight_unlock(Register obj, Register t1, Register t2, Register t3, Label& slow);
+  void fast_lock(Register basic_lock, Register obj, Register t1, Register t2, Register t3, Label& slow);
+  void fast_unlock(Register obj, Register t1, Register t2, Register t3, Label& slow);
 
 private:
   // Check the current thread doesn't need a cross modify fence.
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 39609cbe0ac..89ae6bc10e0 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1707,7 +1707,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   const Register obj_reg  = r19;  // Will contain the oop
   const Register lock_reg = r13;  // Address of compiler lock object (BasicLock)
   const Register old_hdr  = r13;  // value of old header at unlock time
-  const Register lock_tmp = r14;  // Temporary used by lightweight_lock/unlock
+  const Register lock_tmp = r14;  // Temporary used by fast_lock/unlock
   const Register tmp = lr;
 
   Label slow_path_lock;
@@ -1724,7 +1724,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     // Load the oop from the handle
     __ ldr(obj_reg, Address(oop_handle_reg, 0));
 
-    __ lightweight_lock(lock_reg, obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock);
+    __ fast_lock(lock_reg, obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock);
 
     // Slow path will re-enter here
     __ bind(lock_done);
@@ -1833,7 +1833,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       save_native_result(masm, ret_type, stack_slots);
     }
 
-    __ lightweight_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock);
+    __ fast_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock);
 
     // slow path re-enters here
     __ bind(unlock_done);
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 5a8642a285a..3f7ba683efc 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -195,7 +195,7 @@ enum Ampere_CPU_Model {
   // Aarch64 supports fast class initialization checks
   static bool supports_fast_class_init_checks() { return true; }
   constexpr static bool supports_stack_watermark_barrier() { return true; }
-  constexpr static bool supports_recursive_lightweight_locking() { return true; }
+  constexpr static bool supports_recursive_fast_locking() { return true; }
 
   constexpr static bool supports_secondary_supers_table() { return true; }
 
diff --git a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
index ca7711353d2..ad6c56186df 100644
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
@@ -201,7 +201,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register basic_lo
   Register t2 = hdr;        // blow
   Register t3 = Rtemp;      // blow
 
-  lightweight_lock(obj, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
+  fast_lock(obj, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
   // Success: fall through
   return null_check_offset;
 }
@@ -218,7 +218,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register basic
   Register t2 = hdr;        // blow
   Register t3 = Rtemp;      // blow
 
-  lightweight_unlock(obj, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
+  fast_unlock(obj, t1, t2, t3, 1 /* savemask - save t1 */, slow_case);
   // Success: fall through
 }
 
diff --git a/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
index 2d26b4f9a50..83e9cc672f2 100644
--- a/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c2_MacroAssembler_arm.cpp
@@ -90,8 +90,8 @@ void C2_MacroAssembler::fast_lock(Register Roop, Register Rbox, Register Rscratc
     b(done, ne);
   }
 
-  lightweight_lock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
-                   1 /* savemask (save t1) */, done);
+  MacroAssembler::fast_lock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
+                            1 /* savemask (save t1) */, done);
 
   cmp(Roop, Roop); // Success: set Z
   bind(done);
@@ -107,8 +107,8 @@ void C2_MacroAssembler::fast_unlock(Register Roop, Register Rbox, Register Rscra
 
   Label done;
 
-  lightweight_unlock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
-                     1 /* savemask (save t1) */, done);
+  MacroAssembler::fast_unlock(Roop /* obj */, Rbox /* t1 */, Rscratch /* t2 */, Rscratch2 /* t3 */,
+                              1 /* savemask (save t1) */, done);
 
   cmp(Roop, Roop); // Success: Set Z
   // Fall through
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.cpp b/src/hotspot/cpu/arm/interp_masm_arm.cpp
index 3f9130309e9..720413c9c5b 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp
@@ -904,7 +904,7 @@ void InterpreterMacroAssembler::lock_object(Register Rlock) {
     b(slow_case, ne);
   }
 
-  lightweight_lock(Robj, R0 /* t1 */, Rmark /* t2 */, Rtemp /* t3 */, 0 /* savemask */, slow_case);
+  fast_lock(Robj, R0 /* t1 */, Rmark /* t2 */, Rtemp /* t3 */, 0 /* savemask */, slow_case);
   b(done);
 
   bind(slow_case);
@@ -945,8 +945,8 @@ void InterpreterMacroAssembler::unlock_object(Register Rlock) {
   cmpoop(Rtemp, Robj);
   b(slow_case, ne);
 
-  lightweight_unlock(Robj /* obj */, Rlock /* t1 */, Rmark /* t2 */, Rtemp /* t3 */,
-                     1 /* savemask (save t1) */, slow_case);
+  fast_unlock(Robj /* obj */, Rlock /* t1 */, Rmark /* t2 */, Rtemp /* t3 */,
+              1 /* savemask (save t1) */, slow_case);
   b(done);
 
   bind(slow_case);
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.cpp b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
index 12462e1843c..935c9544620 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp
@@ -1750,14 +1750,14 @@ void MacroAssembler::read_polling_page(Register dest, relocInfo::relocType rtype
   POISON_REG(mask, 1, R2, poison)               \
   POISON_REG(mask, 2, R3, poison)
 
-// Attempt to lightweight-lock an object
+// Attempt to fast-lock an object
 // Registers:
 //  - obj: the object to be locked
 //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
 // Result:
 //  - Success: fallthrough
 //  - Error:   break to slow, Z cleared.
-void MacroAssembler::lightweight_lock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
+void MacroAssembler::fast_lock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
   assert_different_registers(obj, t1, t2, t3);
 
 #ifdef ASSERT
@@ -1807,14 +1807,14 @@ void MacroAssembler::lightweight_lock(Register obj, Register t1, Register t2, Re
   // Success: fall through
 }
 
-// Attempt to lightweight-unlock an object
+// Attempt to fast-unlock an object
 // Registers:
 //  - obj: the object to be unlocked
 //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
 // Result:
 //  - Success: fallthrough
 //  - Error:   break to slow, Z cleared.
-void MacroAssembler::lightweight_unlock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
+void MacroAssembler::fast_unlock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow) {
   assert_different_registers(obj, t1, t2, t3);
 
 #ifdef ASSERT
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
index d60b38e42db..8e80c5bcc6e 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1010,23 +1010,23 @@ public:
   void cas_for_lock_acquire(Register oldval, Register newval, Register base, Register tmp, Label &slow_case, bool allow_fallthrough_on_failure = false, bool one_shot = false);
   void cas_for_lock_release(Register oldval, Register newval, Register base, Register tmp, Label &slow_case, bool allow_fallthrough_on_failure = false, bool one_shot = false);
 
-  // Attempt to lightweight-lock an object
+  // Attempt to fast-lock an object
   // Registers:
   //  - obj: the object to be locked
   //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
   // Result:
   //  - Success: fallthrough
   //  - Error:   break to slow, Z cleared.
-  void lightweight_lock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
+  void fast_lock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
 
-  // Attempt to lightweight-unlock an object
+  // Attempt to fast-unlock an object
   // Registers:
   //  - obj: the object to be unlocked
   //  - t1, t2, t3: temp registers. If corresponding bit in savemask is set, they get saved, otherwise blown.
   // Result:
   //  - Success: fallthrough
   //  - Error:   break to slow, Z cleared.
-  void lightweight_unlock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
+  void fast_unlock(Register obj, Register t1, Register t2, Register t3, unsigned savemask, Label& slow);
 
 #ifndef PRODUCT
   // Preserves flags and all registers.
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 99d8773368d..76e38d29478 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -1139,8 +1139,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     __ mov(sync_handle, R1);
 
     log_trace(fastlock)("SharedRuntime lock fast");
-    __ lightweight_lock(sync_obj /* object */, basic_lock /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
-                        0x7 /* savemask */, slow_lock);
+    __ fast_lock(sync_obj /* object */, basic_lock /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
+                 0x7 /* savemask */, slow_lock);
       // Fall through to lock_done
     __ bind(lock_done);
   }
@@ -1195,8 +1195,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   Label slow_unlock, unlock_done;
   if (method->is_synchronized()) {
     log_trace(fastlock)("SharedRuntime unlock fast");
-    __ lightweight_unlock(sync_obj, R2 /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
-                          7 /* savemask */, slow_unlock);
+    __ fast_unlock(sync_obj, R2 /* t1 */, tmp /* t2 */, Rtemp /* t3 */,
+                   7 /* savemask */, slow_unlock);
     // Fall through
 
     __ bind(unlock_done);
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
index 04af473c99b..798451446e5 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
@@ -82,7 +82,7 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
   // Save object being locked into the BasicObjectLock...
   std(Roop, in_bytes(BasicObjectLock::obj_offset()), Rbox);
 
-  lightweight_lock(Rbox, Roop, Rmark, Rscratch, slow_int);
+  fast_lock(Rbox, Roop, Rmark, Rscratch, slow_int);
   b(done);
 
   bind(slow_int);
@@ -104,7 +104,7 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb
   ld(Roop, in_bytes(BasicObjectLock::obj_offset()), Rbox);
   verify_oop(Roop, FILE_AND_LINE);
 
-  lightweight_unlock(Roop, Rmark, slow_int);
+  fast_unlock(Roop, Rmark, slow_int);
   b(done);
   bind(slow_int);
   b(slow_case); // far
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index eab3df03fde..edf348fdc50 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -36,14 +36,14 @@
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
 
-void C2_MacroAssembler::fast_lock_lightweight(ConditionRegister flag, Register obj, Register box,
-                                              Register tmp1, Register tmp2, Register tmp3) {
-  compiler_fast_lock_lightweight_object(flag, obj, box, tmp1, tmp2, tmp3);
+void C2_MacroAssembler::fast_lock(ConditionRegister flag, Register obj, Register box,
+                                  Register tmp1, Register tmp2, Register tmp3) {
+  compiler_fast_lock_object(flag, obj, box, tmp1, tmp2, tmp3);
 }
 
-void C2_MacroAssembler::fast_unlock_lightweight(ConditionRegister flag, Register obj, Register box,
-                                                Register tmp1, Register tmp2, Register tmp3) {
-  compiler_fast_unlock_lightweight_object(flag, obj, box, tmp1, tmp2, tmp3);
+void C2_MacroAssembler::fast_unlock(ConditionRegister flag, Register obj, Register box,
+                                    Register tmp1, Register tmp2, Register tmp3) {
+  compiler_fast_unlock_object(flag, obj, box, tmp1, tmp2, tmp3);
 }
 
 void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Register obj, int disp) {
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
index 16b6d1935ba..5a114294c1f 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,11 @@
 // C2_MacroAssembler contains high-level macros for C2
 
  public:
-  // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in .ad file.
-  void fast_lock_lightweight(ConditionRegister flag, Register obj, Register box,
-                             Register tmp1, Register tmp2, Register tmp3);
-  void fast_unlock_lightweight(ConditionRegister flag, Register obj, Register box,
-                               Register tmp1, Register tmp2, Register tmp3);
+  // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
+  void fast_lock(ConditionRegister flag, Register obj, Register box,
+                 Register tmp1, Register tmp2, Register tmp3);
+  void fast_unlock(ConditionRegister flag, Register obj, Register box,
+                   Register tmp1, Register tmp2, Register tmp3);
 
   void load_narrow_klass_compact_c2(Register dst, Register obj, int disp);
 
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index 0d32ea8003e..fc865be015e 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -958,7 +958,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
 
   assert_different_registers(header, tmp);
 
-  lightweight_lock(monitor, object, header, tmp, slow_case);
+  fast_lock(monitor, object, header, tmp, slow_case);
   b(done);
 
   bind(slow_case);
@@ -987,7 +987,7 @@ void InterpreterMacroAssembler::unlock_object(Register monitor) {
   // The object address from the monitor is in object.
   ld(object, in_bytes(BasicObjectLock::obj_offset()), monitor);
 
-  lightweight_unlock(object, header, slow_case);
+  fast_unlock(object, header, slow_case);
 
   b(free_slot);
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 5a7e2172b29..5649ead2ea8 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -2671,8 +2671,8 @@ address MacroAssembler::emit_trampoline_stub(int destination_toc_offset,
 }
 
 // "The box" is the space on the stack where we copy the object mark.
-void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister flag, Register obj, Register box,
-                                                           Register tmp1, Register tmp2, Register tmp3) {
+void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register obj, Register box,
+                                               Register tmp1, Register tmp2, Register tmp3) {
   assert_different_registers(obj, box, tmp1, tmp2, tmp3);
   assert(UseObjectMonitorTable || tmp3 == noreg, "tmp3 not needed");
   assert(flag == CR0, "bad condition register");
@@ -2699,7 +2699,7 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
 
   Register mark = tmp1;
 
-  { // Lightweight locking
+  { // Fast locking
 
     // Push lock to the lock stack and finish successfully. MUST reach to with flag == EQ
     Label push;
@@ -2847,8 +2847,8 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
   // C2 uses the value of flag (NE vs EQ) to determine the continuation.
 }
 
-void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister flag, Register obj, Register box,
-                                                             Register tmp1, Register tmp2, Register tmp3) {
+void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Register obj, Register box,
+                                                 Register tmp1, Register tmp2, Register tmp3) {
   assert_different_registers(obj, tmp1, tmp2, tmp3);
   assert(flag == CR0, "bad condition register");
 
@@ -2863,7 +2863,7 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
   const Register top = tmp2;
   const Register t = tmp3;
 
-  { // Lightweight unlock
+  { // Fast unlock
     Label push_and_slow;
 
     // Check if obj is top of lock-stack.
@@ -2904,7 +2904,7 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
     Label not_unlocked;
     andi_(t, mark, markWord::unlocked_value);
     beq(CR0, not_unlocked);
-    stop("lightweight_unlock already unlocked");
+    stop("fast_unlock already unlocked");
     bind(not_unlocked);
 #endif
 
@@ -4588,11 +4588,11 @@ void MacroAssembler::atomically_flip_locked_state(bool is_unlock, Register obj,
   }
 }
 
-// Implements lightweight-locking.
+// Implements fast-locking.
 //
 //  - obj: the object to be locked
 //  - t1, t2: temporary register
-void MacroAssembler::lightweight_lock(Register box, Register obj, Register t1, Register t2, Label& slow) {
+void MacroAssembler::fast_lock(Register box, Register obj, Register t1, Register t2, Label& slow) {
   assert_different_registers(box, obj, t1, t2, R0);
 
   Label push;
@@ -4644,11 +4644,11 @@ void MacroAssembler::lightweight_lock(Register box, Register obj, Register t1, R
   stw(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread);
 }
 
-// Implements lightweight-unlocking.
+// Implements fast-unlocking.
 //
 // - obj: the object to be unlocked
 //  - t1: temporary register
-void MacroAssembler::lightweight_unlock(Register obj, Register t1, Label& slow) {
+void MacroAssembler::fast_unlock(Register obj, Register t1, Label& slow) {
   assert_different_registers(obj, t1);
 
 #ifdef ASSERT
@@ -4706,7 +4706,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register t1, Label& slow)
   Label not_unlocked;
   andi_(t, mark, markWord::unlocked_value);
   beq(CR0, not_unlocked);
-  stop("lightweight_unlock already unlocked");
+  stop("fast_unlock already unlocked");
   bind(not_unlocked);
 #endif
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 61e6a173823..875602cae58 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -698,8 +698,8 @@ class MacroAssembler: public Assembler {
   void push_cont_fastpath();
   void pop_cont_fastpath();
   void atomically_flip_locked_state(bool is_unlock, Register obj, Register tmp, Label& failed, int semantics);
-  void lightweight_lock(Register box, Register obj, Register t1, Register t2, Label& slow);
-  void lightweight_unlock(Register obj, Register t1, Label& slow);
+  void fast_lock(Register box, Register obj, Register t1, Register t2, Label& slow);
+  void fast_unlock(Register obj, Register t1, Label& slow);
 
   // allocation (for C1)
   void tlab_allocate(
@@ -713,11 +713,11 @@ class MacroAssembler: public Assembler {
   enum { trampoline_stub_size = 6 * 4 };
   address emit_trampoline_stub(int destination_toc_offset, int insts_call_instruction_offset, Register Rtoc = noreg);
 
-  void compiler_fast_lock_lightweight_object(ConditionRegister flag, Register oop, Register box,
-                                             Register tmp1, Register tmp2, Register tmp3);
+  void compiler_fast_lock_object(ConditionRegister flag, Register oop, Register box,
+                                 Register tmp1, Register tmp2, Register tmp3);
 
-  void compiler_fast_unlock_lightweight_object(ConditionRegister flag, Register oop, Register box,
-                                               Register tmp1, Register tmp2, Register tmp3);
+  void compiler_fast_unlock_object(ConditionRegister flag, Register oop, Register box,
+                                   Register tmp1, Register tmp2, Register tmp3);
 
   // Check if safepoint requested and if so branch
   void safepoint_poll(Label& slow_path, Register temp, bool at_return, bool in_nmethod);
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 5488dbdb8c0..5c44fc19704 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -11551,15 +11551,15 @@ instruct partialSubtypeCheckConstSuper(rarg3RegP sub, rarg2RegP super_reg, immP
 
 // inlined locking and unlocking
 
-instruct cmpFastLockLightweight(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2) %{
+instruct cmpFastLock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2) %{
   predicate(!UseObjectMonitorTable);
   match(Set crx (FastLock oop box));
   effect(TEMP tmp1, TEMP tmp2);
 
   format %{ "FASTLOCK  $oop, $box, $tmp1, $tmp2" %}
   ins_encode %{
-    __ fast_lock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register,
-                             $tmp1$$Register, $tmp2$$Register, noreg /*tmp3*/);
+    __ fast_lock($crx$$CondRegister, $oop$$Register, $box$$Register,
+                 $tmp1$$Register, $tmp2$$Register, noreg /*tmp3*/);
     // If locking was successful, crx should indicate 'EQ'.
     // The compiler generates a branch to the runtime call to
     // _complete_monitor_locking_Java for the case where crx is 'NE'.
@@ -11574,8 +11574,8 @@ instruct cmpFastLockMonitorTable(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iR
 
   format %{ "FASTLOCK  $oop, $box, $tmp1, $tmp2, $tmp3" %}
   ins_encode %{
-    __ fast_lock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register,
-                             $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_lock($crx$$CondRegister, $oop$$Register, $box$$Register,
+                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
     // If locking was successful, crx should indicate 'EQ'.
     // The compiler generates a branch to the runtime call to
     // _complete_monitor_locking_Java for the case where crx is 'NE'.
@@ -11583,14 +11583,14 @@ instruct cmpFastLockMonitorTable(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iR
   ins_pipe(pipe_class_compare);
 %}
 
-instruct cmpFastUnlockLightweight(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3) %{
+instruct cmpFastUnlock(flagsRegCR0 crx, iRegPdst oop, iRegPdst box, iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3) %{
   match(Set crx (FastUnlock oop box));
   effect(TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{ "FASTUNLOCK  $oop, $box, $tmp1, $tmp2" %}
   ins_encode %{
-    __ fast_unlock_lightweight($crx$$CondRegister, $oop$$Register, $box$$Register,
-                               $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_unlock($crx$$CondRegister, $oop$$Register, $box$$Register,
+                   $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
     // If unlocking was successful, crx should indicate 'EQ'.
     // The compiler generates a branch to the runtime call to
     // _complete_monitor_unlocking_Java for the case where crx is 'NE'.
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 4be3a0aee8b..4e427ace404 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -2381,7 +2381,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
     // Try fastpath for locking.
     // fast_lock kills r_temp_1, r_temp_2, r_temp_3.
     Register r_temp_3_or_noreg = UseObjectMonitorTable ? r_temp_3 : noreg;
-    __ compiler_fast_lock_lightweight_object(CR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3_or_noreg);
+    __ compiler_fast_lock_object(CR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3_or_noreg);
     __ beq(CR0, locked);
 
     // None of the above fast optimizations worked so we have to get into the
@@ -2600,7 +2600,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
     __ addi(r_box, R1_SP, lock_offset);
 
     // Try fastpath for unlocking.
-    __ compiler_fast_unlock_lightweight_object(CR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3);
+    __ compiler_fast_unlock_object(CR0, r_oop, r_box, r_temp_1, r_temp_2, r_temp_3);
     __ beq(CR0, done);
 
     // Save and restore any potential method result value around the unlocking operation.
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
index 9588edc4bf8..11dce83bed0 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
@@ -62,7 +62,7 @@ public:
   // PPC64 supports fast class initialization checks
   static bool supports_fast_class_init_checks() { return true; }
   constexpr static bool supports_stack_watermark_barrier() { return true; }
-  constexpr static bool supports_recursive_lightweight_locking() { return true; }
+  constexpr static bool supports_recursive_fast_locking() { return true; }
   constexpr static bool supports_secondary_supers_table() { return true; }
 
   static bool supports_float16() { return PowerArchitecturePPC64 >= 9; }
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
index 8e989de2665..aeb077ba0a0 100644
--- a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
@@ -59,7 +59,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register basic_lo
 
   null_check_offset = offset();
 
-  lightweight_lock(basic_lock, obj, hdr, temp, t1, slow_case);
+  fast_lock(basic_lock, obj, hdr, temp, t1, slow_case);
 
   return null_check_offset;
 }
@@ -71,7 +71,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register basic
   ld(obj, Address(basic_lock, BasicObjectLock::obj_offset()));
   verify_oop(obj);
 
-  lightweight_unlock(obj, hdr, temp, t1, slow_case);
+  fast_unlock(obj, hdr, temp, t1, slow_case);
 }
 
 // Defines obj, preserves var_size_in_bytes
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 154b62db47f..abbd7eedbba 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -43,8 +43,8 @@
 
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
-void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
-                                              Register tmp1, Register tmp2, Register tmp3, Register tmp4) {
+void C2_MacroAssembler::fast_lock(Register obj, Register box,
+                                  Register tmp1, Register tmp2, Register tmp3, Register tmp4) {
   // Flag register, zero for success; non-zero for failure.
   Register flag = t1;
 
@@ -74,7 +74,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
   const Register tmp1_mark = tmp1;
   const Register tmp3_t = tmp3;
 
-  { // Lightweight locking
+  { // Fast locking
 
     // Push lock to the lock stack and finish successfully. MUST branch to with flag == 0
     Label push;
@@ -205,8 +205,8 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
   // C2 uses the value of flag (0 vs !0) to determine the continuation.
 }
 
-void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box,
-                                                Register tmp1, Register tmp2, Register tmp3) {
+void C2_MacroAssembler::fast_unlock(Register obj, Register box,
+                                    Register tmp1, Register tmp2, Register tmp3) {
   // Flag register, zero for success; non-zero for failure.
   Register flag = t1;
 
@@ -225,7 +225,7 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box,
   const Register tmp2_top = tmp2;
   const Register tmp3_t = tmp3;
 
-  { // Lightweight unlock
+  { // Fast unlock
     Label push_and_slow_path;
 
     // Check if obj is top of lock-stack.
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index 2d5339dc153..f08e5e27c87 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -49,11 +49,11 @@
                                   const int STUB_THRESHOLD, Label *STUB, Label *DONE);
 
  public:
-  // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in .ad file.
-  void fast_lock_lightweight(Register object, Register box,
-                             Register tmp1, Register tmp2, Register tmp3, Register tmp4);
-  void fast_unlock_lightweight(Register object, Register box,
-                               Register tmp1, Register tmp2, Register tmp3);
+  // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
+  void fast_lock(Register object, Register box,
+                 Register tmp1, Register tmp2, Register tmp3, Register tmp4);
+  void fast_unlock(Register object, Register box,
+                   Register tmp1, Register tmp2, Register tmp3);
 
   void string_compare(Register str1, Register str2,
                       Register cnt1, Register cnt2, Register result,
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index 5af8ea1da37..189c7c93d07 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -751,7 +751,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
   ld(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset()));
 
   Label done, slow_case;
-  lightweight_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
+  fast_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
   j(done);
 
   bind(slow_case);
@@ -782,7 +782,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
   const Register swap_reg   = x10;
   const Register header_reg = c_rarg2;  // Will contain the old oopMark
   const Register obj_reg    = c_rarg3;  // Will contain the oop
-  const Register tmp_reg    = c_rarg4;  // Temporary used by lightweight_unlock
+  const Register tmp_reg    = c_rarg4;  // Temporary used by fast_unlock
 
   save_bcp(); // Save in case of exception
 
@@ -793,7 +793,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg)
   sd(zr, Address(lock_reg, BasicObjectLock::obj_offset()));
 
   Label done, slow_case;
-  lightweight_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case);
+  fast_unlock(obj_reg, header_reg, swap_reg, tmp_reg, slow_case);
   j(done);
 
   bind(slow_case);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 54304ec648d..7a8496ae42b 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -6435,12 +6435,12 @@ void MacroAssembler::test_bit(Register Rd, Register Rs, uint32_t bit_pos) {
   }
 }
 
-// Implements lightweight-locking.
+// Implements fast-locking.
 //
 //  - obj: the object to be locked
 //  - tmp1, tmp2, tmp3: temporary registers, will be destroyed
 //  - slow: branched to if locking fails
-void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow) {
+void MacroAssembler::fast_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow) {
   assert_different_registers(basic_lock, obj, tmp1, tmp2, tmp3, t0);
 
   Label push;
@@ -6499,7 +6499,7 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
 // - obj: the object to be unlocked
 // - tmp1, tmp2, tmp3: temporary registers
 // - slow: branched to if unlocking fails
-void MacroAssembler::lightweight_unlock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow) {
+void MacroAssembler::fast_unlock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow) {
   assert_different_registers(obj, tmp1, tmp2, tmp3, t0);
 
 #ifdef ASSERT
@@ -6546,7 +6546,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register tmp1, Register tm
   Label not_unlocked;
   test_bit(t, mark, exact_log2(markWord::unlocked_value));
   beqz(t, not_unlocked);
-  stop("lightweight_unlock already unlocked");
+  stop("fast_unlock already unlocked");
   bind(not_unlocked);
 #endif
 
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index e0e610ff49a..1908b9a9605 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -1639,8 +1639,8 @@ private:
   void store_conditional(Register dst, Register new_val, Register addr, Assembler::operand_size size, Assembler::Aqrl release);
 
 public:
-  void lightweight_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow);
-  void lightweight_unlock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow);
+  void fast_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow);
+  void fast_unlock(Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow);
 
 public:
   enum {
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 34177701900..e23adcf2488 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -11039,36 +11039,36 @@ instruct tlsLoadP(javaThread_RegP dst)
 
 // inlined locking and unlocking
 // using t1 as the 'flag' register to bridge the BoolNode producers and consumers
-instruct cmpFastLockLightweight(rFlagsReg cr, iRegP object, iRegP box,
-                                iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3, iRegPNoSp tmp4)
+instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box,
+                     iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3, iRegPNoSp tmp4)
 %{
   match(Set cr (FastLock object box));
   effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4);
 
   ins_cost(10 * DEFAULT_COST);
-  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3,$tmp4 #@cmpFastLockLightweight" %}
+  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2,$tmp3,$tmp4 #@cmpFastLock" %}
 
   ins_encode %{
-    __ fast_lock_lightweight($object$$Register, $box$$Register,
-                             $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register);
+    __ fast_lock($object$$Register, $box$$Register,
+                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register);
   %}
 
   ins_pipe(pipe_serial);
 %}
 
 // using t1 as the 'flag' register to bridge the BoolNode producers and consumers
-instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP box,
-                                  iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3)
+instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box,
+                       iRegPNoSp tmp1, iRegPNoSp tmp2, iRegPNoSp tmp3)
 %{
   match(Set cr (FastUnlock object box));
   effect(TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   ins_cost(10 * DEFAULT_COST);
-  format %{ "fastunlock $object,$box\t! kills $tmp1,$tmp2,$tmp3 #@cmpFastUnlockLightweight" %}
+  format %{ "fastunlock $object,$box\t! kills $tmp1,$tmp2,$tmp3 #@cmpFastUnlock" %}
 
   ins_encode %{
-    __ fast_unlock_lightweight($object$$Register, $box$$Register,
-                               $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ fast_unlock($object$$Register, $box$$Register,
+                   $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
   %}
 
   ins_pipe(pipe_serial);
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index e64fc2ffc80..eeb6fad1b59 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1642,7 +1642,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   const Register obj_reg  = x9;  // Will contain the oop
   const Register lock_reg = x30;  // Address of compiler lock object (BasicLock)
   const Register old_hdr  = x30;  // value of old header at unlock time
-  const Register lock_tmp = x31;  // Temporary used by lightweight_lock/unlock
+  const Register lock_tmp = x31;  // Temporary used by fast_lock/unlock
   const Register tmp      = ra;
 
   Label slow_path_lock;
@@ -1659,7 +1659,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     // Load the oop from the handle
     __ ld(obj_reg, Address(oop_handle_reg, 0));
 
-    __ lightweight_lock(lock_reg, obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock);
+    __ fast_lock(lock_reg, obj_reg, swap_reg, tmp, lock_tmp, slow_path_lock);
 
     // Slow path will re-enter here
     __ bind(lock_done);
@@ -1754,7 +1754,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       save_native_result(masm, ret_type, stack_slots);
     }
 
-    __ lightweight_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock);
+    __ fast_unlock(obj_reg, old_hdr, swap_reg, lock_tmp, slow_path_unlock);
 
     // slow path re-enters here
     __ bind(unlock_done);
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index f74992cbc37..16f2e5d8f5b 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * Copyright (c) 2023, Rivos Inc. All rights reserved.
@@ -498,7 +498,7 @@ private:
 
   constexpr static bool supports_stack_watermark_barrier() { return true; }
 
-  constexpr static bool supports_recursive_lightweight_locking() { return true; }
+  constexpr static bool supports_recursive_fast_locking() { return true; }
 
   constexpr static bool supports_secondary_supers_table() { return true; }
 
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
index 91d52def08d..993c1a1b552 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
@@ -67,7 +67,7 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
   // Save object being locked into the BasicObjectLock...
   z_stg(Roop, Address(Rbox, BasicObjectLock::obj_offset()));
 
-  lightweight_lock(Rbox, Roop, Rmark, tmp, slow_case);
+  fast_lock(Rbox, Roop, Rmark, tmp, slow_case);
 }
 
 void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rbox, Label& slow_case) {
@@ -77,7 +77,7 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb
   z_lg(Roop, Address(Rbox, BasicObjectLock::obj_offset()));
   verify_oop(Roop, FILE_AND_LINE);
 
-  lightweight_unlock(Roop, Rmark, Z_R1_scratch, slow_case);
+  fast_unlock(Roop, Rmark, Z_R1_scratch, slow_case);
 }
 
 void C1_MacroAssembler::try_allocate(
diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
index 485efec6b9b..957c89af3fc 100644
--- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
@@ -32,13 +32,13 @@
 #define BLOCK_COMMENT(str) block_comment(str)
 #define BIND(label)        bind(label); BLOCK_COMMENT(#label ":")
 
-void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Register temp1, Register temp2) {
-  compiler_fast_lock_lightweight_object(obj, box, temp1, temp2);
+void C2_MacroAssembler::fast_lock(Register obj, Register box, Register temp1, Register temp2) {
+  compiler_fast_lock_object(obj, box, temp1, temp2);
 }
 
 
-void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Register temp1, Register temp2) {
-  compiler_fast_unlock_lightweight_object(obj, box, temp1, temp2);
+void C2_MacroAssembler::fast_unlock(Register obj, Register box, Register temp1, Register temp2) {
+  compiler_fast_unlock_object(obj, box, temp1, temp2);
 }
 
 void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Address src) {
diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
index abf0db8e520..632cc31d492 100644
--- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,9 +29,9 @@
 // C2_MacroAssembler contains high-level macros for C2
 
  public:
-  // Code used by cmpFastLockLightweight and cmpFastUnlockLightweight mach instructions in s390.ad file.
-  void fast_lock_lightweight(Register obj, Register box, Register temp1, Register temp2);
-  void fast_unlock_lightweight(Register obj, Register box, Register temp1, Register temp2);
+  // Code used by cmpFastLock and cmpFastUnlock mach instructions in s390.ad file.
+  void fast_lock(Register obj, Register box, Register temp1, Register temp2);
+  void fast_unlock(Register obj, Register box, Register temp1, Register temp2);
 
   void load_narrow_klass_compact_c2(Register dst, Address src);
 
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index f62051c628e..a80ca26239b 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -1019,7 +1019,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
 
   NearLabel done, slow_case;
 
-  lightweight_lock(monitor, object, header, tmp, slow_case);
+  fast_lock(monitor, object, header, tmp, slow_case);
   z_bru(done);
 
   bind(slow_case);
@@ -1054,7 +1054,7 @@ void InterpreterMacroAssembler::unlock_object(Register monitor, Register object)
 
   clear_mem(obj_entry, sizeof(oop));
 
-  lightweight_unlock(object, header, current_header, slow_case);
+  fast_unlock(object, header, current_header, slow_case);
   z_bru(done);
 
   // The lock has been converted into a heavy lock and hence
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index b047ff00044..f35e18c7398 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -6138,11 +6138,11 @@ void MacroAssembler::zap_from_to(Register low, Register high, Register val, Regi
 }
 #endif // !PRODUCT
 
-// Implements lightweight-locking.
+// Implements fast-locking.
 //  - obj: the object to be locked, contents preserved.
 //  - temp1, temp2: temporary registers, contents destroyed.
 //  Note: make sure Z_R1 is not manipulated here when C2 compiler is in play
-void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Register temp1, Register temp2, Label& slow) {
+void MacroAssembler::fast_lock(Register basic_lock, Register obj, Register temp1, Register temp2, Label& slow) {
 
   assert_different_registers(basic_lock, obj, temp1, temp2);
 
@@ -6203,11 +6203,11 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   z_alsi(in_bytes(ls_top_offset), Z_thread, oopSize);
 }
 
-// Implements lightweight-unlocking.
+// Implements fast-unlocking.
 // - obj: the object to be unlocked
 // - temp1, temp2: temporary registers, will be destroyed
 // - Z_R1_scratch: will be killed in case of Interpreter & C1 Compiler
-void MacroAssembler::lightweight_unlock(Register obj, Register temp1, Register temp2, Label& slow) {
+void MacroAssembler::fast_unlock(Register obj, Register temp1, Register temp2, Label& slow) {
 
   assert_different_registers(obj, temp1, temp2);
 
@@ -6264,7 +6264,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register temp1, Register t
   NearLabel not_unlocked;
   z_tmll(mark, markWord::unlocked_value);
   z_braz(not_unlocked);
-  stop("lightweight_unlock already unlocked");
+  stop("fast_unlock already unlocked");
   bind(not_unlocked);
 #endif // ASSERT
 
@@ -6289,7 +6289,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register temp1, Register t
   bind(unlocked);
 }
 
-void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Register box, Register tmp1, Register tmp2) {
+void MacroAssembler::compiler_fast_lock_object(Register obj, Register box, Register tmp1, Register tmp2) {
   assert_different_registers(obj, box, tmp1, tmp2, Z_R0_scratch);
 
   // Handle inflated monitor.
@@ -6314,8 +6314,8 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
   const int mark_offset        = oopDesc::mark_offset_in_bytes();
   const ByteSize ls_top_offset = JavaThread::lock_stack_top_offset();
 
-  BLOCK_COMMENT("compiler_fast_lightweight_locking {");
-  { // lightweight locking
+  BLOCK_COMMENT("compiler_fast_locking {");
+  { // Fast locking
 
     // Push lock to the lock stack and finish successfully. MUST reach to with flag == EQ
     NearLabel push;
@@ -6362,9 +6362,9 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
     z_cgr(obj, obj); // set the CC to EQ, as it could be changed by alsi
     z_bru(locked);
   }
-  BLOCK_COMMENT("} compiler_fast_lightweight_locking");
+  BLOCK_COMMENT("} compiler_fast_locking");
 
-  BLOCK_COMMENT("handle_inflated_monitor_lightweight_locking {");
+  BLOCK_COMMENT("handle_inflated_monitor_locking {");
   { // Handle inflated monitor.
     bind(inflated);
 
@@ -6441,7 +6441,7 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
     // set the CC now
     z_cgr(obj, obj);
   }
-  BLOCK_COMMENT("} handle_inflated_monitor_lightweight_locking");
+  BLOCK_COMMENT("} handle_inflated_monitor_locking");
 
   bind(locked);
 
@@ -6464,7 +6464,7 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
   // C2 uses the value of flag (NE vs EQ) to determine the continuation.
 }
 
-void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Register box, Register tmp1, Register tmp2) {
+void MacroAssembler::compiler_fast_unlock_object(Register obj, Register box, Register tmp1, Register tmp2) {
   assert_different_registers(obj, box, tmp1, tmp2);
 
   // Handle inflated monitor.
@@ -6479,8 +6479,8 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
   const int mark_offset        = oopDesc::mark_offset_in_bytes();
   const ByteSize ls_top_offset = JavaThread::lock_stack_top_offset();
 
-  BLOCK_COMMENT("compiler_fast_lightweight_unlock {");
-  { // Lightweight Unlock
+  BLOCK_COMMENT("compiler_fast_unlock {");
+  { // Fast Unlock
     NearLabel push_and_slow_path;
 
     // Check if obj is top of lock-stack.
@@ -6525,7 +6525,7 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
     NearLabel not_unlocked;
     z_tmll(mark, markWord::unlocked_value);
     z_braz(not_unlocked);
-    stop("lightweight_unlock already unlocked");
+    stop("fast_unlock already unlocked");
     bind(not_unlocked);
 #endif // ASSERT
 
@@ -6546,7 +6546,7 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
     z_ltgr(obj, obj); // object is not null here
     z_bru(slow_path);
   }
-  BLOCK_COMMENT("} compiler_fast_lightweight_unlock");
+  BLOCK_COMMENT("} compiler_fast_unlock");
 
   { // Handle inflated monitor.
 
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
index 1c4da4d26eb..da24ae80d45 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
@@ -790,10 +790,10 @@ class MacroAssembler: public Assembler {
   // Kills registers tmp1_reg and tmp2_reg and preserves the condition code.
   void increment_counter_eq(address counter_address, Register tmp1_reg, Register tmp2_reg);
 
-  void lightweight_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Label& slow);
-  void lightweight_unlock(Register obj, Register tmp1, Register tmp2, Label& slow);
-  void compiler_fast_lock_lightweight_object(Register obj, Register box, Register tmp1, Register tmp2);
-  void compiler_fast_unlock_lightweight_object(Register obj, Register box, Register tmp1, Register tmp2);
+  void fast_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Label& slow);
+  void fast_unlock(Register obj, Register tmp1, Register tmp2, Label& slow);
+  void compiler_fast_lock_object(Register obj, Register box, Register tmp1, Register tmp2);
+  void compiler_fast_unlock_object(Register obj, Register box, Register tmp1, Register tmp2);
 
   void resolve_jobject(Register value, Register tmp1, Register tmp2);
   void resolve_global_jobject(Register value, Register tmp1, Register tmp2);
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 0c4939d8432..2f12aa4c03c 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -10123,14 +10123,14 @@ instruct partialSubtypeCheckConstSuper(rarg2RegP sub, rarg1RegP super, immP supe
 // ============================================================================
 // inlined locking and unlocking
 
-instruct cmpFastLockLightweight(flagsReg pcc, iRegP_N2P oop, iRegP_N2P box, iRegP tmp1, iRegP tmp2) %{
+instruct cmpFastLock(flagsReg pcc, iRegP_N2P oop, iRegP_N2P box, iRegP tmp1, iRegP tmp2) %{
   match(Set pcc (FastLock oop box));
   effect(TEMP tmp1, TEMP tmp2);
   ins_cost(100);
   // TODO: s390 port size(VARIABLE_SIZE);
   format %{ "FASTLOCK  $oop, $box; KILL Z_ARG4, Z_ARG5" %}
   ins_encode %{
-    __ fast_lock_lightweight($oop$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register);
+    __ fast_lock($oop$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register);
     // If locking was successful, cc should indicate 'EQ'.
     // The compiler generates a branch to the runtime call to
     // _complete_monitor_locking_Java for the case where cc is 'NE'.
@@ -10138,14 +10138,14 @@ instruct cmpFastLockLightweight(flagsReg pcc, iRegP_N2P oop, iRegP_N2P box, iReg
   ins_pipe(pipe_class_dummy);
 %}
 
-instruct cmpFastUnlockLightweight(flagsReg pcc, iRegP_N2P oop, iRegP_N2P box, iRegP tmp1, iRegP tmp2) %{
+instruct cmpFastUnlock(flagsReg pcc, iRegP_N2P oop, iRegP_N2P box, iRegP tmp1, iRegP tmp2) %{
   match(Set pcc (FastUnlock oop box));
   effect(TEMP tmp1, TEMP tmp2);
   ins_cost(100);
   // TODO: s390 port size(FIXED_SIZE);
   format %{ "FASTUNLOCK  $oop, $box; KILL Z_ARG4, Z_ARG5" %}
   ins_encode %{
-    __ fast_unlock_lightweight($oop$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register);
+    __ fast_unlock($oop$$Register, $box$$Register, $tmp1$$Register, $tmp2$$Register);
     // If unlocking was successful, cc should indicate 'EQ'.
     // The compiler generates a branch to the runtime call to
     // _complete_monitor_unlocking_Java for the case where cc is 'NE'.
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 3a6e1bff8f4..5b6f7dcd984 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -1765,7 +1765,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
 
     // Try fastpath for locking.
     // Fast_lock kills r_temp_1, r_temp_2.
-    __ compiler_fast_lock_lightweight_object(r_oop, r_box, r_tmp1, r_tmp2);
+    __ compiler_fast_lock_object(r_oop, r_box, r_tmp1, r_tmp2);
     __ z_bre(done);
 
     //-------------------------------------------------------------------------
@@ -1961,7 +1961,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
 
     // Try fastpath for unlocking.
     // Fast_unlock kills r_tmp1, r_tmp2.
-    __ compiler_fast_unlock_lightweight_object(r_oop, r_box, r_tmp1, r_tmp2);
+    __ compiler_fast_unlock_object(r_oop, r_box, r_tmp1, r_tmp2);
     __ z_bre(done);
 
     // Slow path for unlocking.
diff --git a/src/hotspot/cpu/s390/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp
index 04005ff2cf9..591d30c3a1c 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.hpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -425,7 +425,7 @@ class VM_Version: public Abstract_VM_Version {
 
   constexpr static bool supports_secondary_supers_table() { return true; }
 
-  constexpr static bool supports_recursive_lightweight_locking() { return true; }
+  constexpr static bool supports_recursive_fast_locking() { return true; }
 
   // CPU feature query functions
   static const char* get_model_string()       { return _model_string; }
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index c3d45f9d15d..88e2e6c8ba9 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -53,7 +53,7 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register basic_lo
 
   null_check_offset = offset();
 
-  lightweight_lock(basic_lock, obj, hdr, tmp, slow_case);
+  fast_lock(basic_lock, obj, hdr, tmp, slow_case);
 
   return null_check_offset;
 }
@@ -66,7 +66,7 @@ void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register basic
   movptr(obj, Address(basic_lock, BasicObjectLock::obj_offset()));
   verify_oop(obj);
 
-  lightweight_unlock(obj, rax, hdr, slow_case);
+  fast_unlock(obj, rax, hdr, slow_case);
 }
 
 
diff --git a/src/hotspot/cpu/x86/c2_CodeStubs_x86.cpp b/src/hotspot/cpu/x86/c2_CodeStubs_x86.cpp
index b4f8e9d9514..f73110f8660 100644
--- a/src/hotspot/cpu/x86/c2_CodeStubs_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_CodeStubs_x86.cpp
@@ -58,11 +58,11 @@ void C2EntryBarrierStub::emit(C2_MacroAssembler& masm) {
   __ jmp(continuation(), false /* maybe_short */);
 }
 
-int C2FastUnlockLightweightStub::max_size() const {
+int C2FastUnlockStub::max_size() const {
   return 128;
 }
 
-void C2FastUnlockLightweightStub::emit(C2_MacroAssembler& masm) {
+void C2FastUnlockStub::emit(C2_MacroAssembler& masm) {
   assert(_t == rax, "must be");
 
   { // Restore lock-stack and handle the unlock in runtime.
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 8386e57c389..51b2eff2cfb 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -222,8 +222,8 @@ inline Assembler::AvxVectorLen C2_MacroAssembler::vector_length_encoding(int vle
 // box: on-stack box address -- KILLED
 // rax: tmp -- KILLED
 // t  : tmp -- KILLED
-void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Register rax_reg,
-                                              Register t, Register thread) {
+void C2_MacroAssembler::fast_lock(Register obj, Register box, Register rax_reg,
+                                  Register t, Register thread) {
   assert(rax_reg == rax, "Used for CAS");
   assert_different_registers(obj, box, rax_reg, t, thread);
 
@@ -247,7 +247,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
 
   const Register mark = t;
 
-  { // Lightweight Lock
+  { // Fast Lock
 
     Label push;
 
@@ -415,7 +415,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
 // A perfectly viable alternative is to elide the owner check except when
 // Xcheck:jni is enabled.
 
-void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax, Register t, Register thread) {
+void C2_MacroAssembler::fast_unlock(Register obj, Register reg_rax, Register t, Register thread) {
   assert(reg_rax == rax, "Used for CAS");
   assert_different_registers(obj, reg_rax, t);
 
@@ -430,16 +430,16 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
   const Register box = reg_rax;
 
   Label dummy;
-  C2FastUnlockLightweightStub* stub = nullptr;
+  C2FastUnlockStub* stub = nullptr;
 
   if (!Compile::current()->output()->in_scratch_emit_size()) {
-    stub = new (Compile::current()->comp_arena()) C2FastUnlockLightweightStub(obj, mark, reg_rax, thread);
+    stub = new (Compile::current()->comp_arena()) C2FastUnlockStub(obj, mark, reg_rax, thread);
     Compile::current()->output()->add_stub(stub);
   }
 
   Label& push_and_slow_path = stub == nullptr ? dummy : stub->push_and_slow_path();
 
-  { // Lightweight Unlock
+  { // Fast Unlock
 
     // Load top.
     movl(top, Address(thread, JavaThread::lock_stack_top_offset()));
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index aaee25f440a..cd5f0ceb900 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -35,9 +35,9 @@ public:
 
   // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
   // See full description in c2_MacroAssembler_x86.cpp.
-  void fast_lock_lightweight(Register obj, Register box, Register rax_reg,
-                             Register t, Register thread);
-  void fast_unlock_lightweight(Register obj, Register reg_rax, Register t, Register thread);
+  void fast_lock(Register obj, Register box, Register rax_reg,
+                 Register t, Register thread);
+  void fast_unlock(Register obj, Register reg_rax, Register t, Register thread);
 
   void verify_int_in_range(uint idx, const TypeInt* t, Register val);
   void verify_long_in_range(uint idx, const TypeLong* t, Register val, Register tmp);
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 110dfab5808..36959ddfe1d 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1107,7 +1107,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
   // Load object pointer into obj_reg
   movptr(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset()));
 
-  lightweight_lock(lock_reg, obj_reg, swap_reg, tmp_reg, slow_case);
+  fast_lock(lock_reg, obj_reg, swap_reg, tmp_reg, slow_case);
   jmp(done);
 
   bind(slow_case);
@@ -1149,7 +1149,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg) {
   // Free entry
   movptr(Address(lock_reg, BasicObjectLock::obj_offset()), NULL_WORD);
 
-  lightweight_unlock(obj_reg, swap_reg, header_reg, slow_case);
+  fast_unlock(obj_reg, swap_reg, header_reg, slow_case);
   jmp(done);
 
   bind(slow_case);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 4f19b30b832..44f1a35d443 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -9653,13 +9653,13 @@ void MacroAssembler::check_stack_alignment(Register sp, const char* msg, unsigne
   bind(L_stack_ok);
 }
 
-// Implements lightweight-locking.
+// Implements fast-locking.
 //
 // obj: the object to be locked
 // reg_rax: rax
 // thread: the thread which attempts to lock obj
 // tmp: a temporary register
-void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Register reg_rax, Register tmp, Label& slow) {
+void MacroAssembler::fast_lock(Register basic_lock, Register obj, Register reg_rax, Register tmp, Label& slow) {
   Register thread = r15_thread;
 
   assert(reg_rax == rax, "");
@@ -9715,13 +9715,13 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   movl(Address(thread, JavaThread::lock_stack_top_offset()), top);
 }
 
-// Implements lightweight-unlocking.
+// Implements fast-unlocking.
 //
 // obj: the object to be unlocked
 // reg_rax: rax
 // thread: the thread
 // tmp: a temporary register
-void MacroAssembler::lightweight_unlock(Register obj, Register reg_rax, Register tmp, Label& slow) {
+void MacroAssembler::fast_unlock(Register obj, Register reg_rax, Register tmp, Label& slow) {
   Register thread = r15_thread;
 
   assert(reg_rax == rax, "");
@@ -9753,7 +9753,7 @@ void MacroAssembler::lightweight_unlock(Register obj, Register reg_rax, Register
   Label not_unlocked;
   testptr(reg_rax, markWord::unlocked_value);
   jcc(Assembler::zero, not_unlocked);
-  stop("lightweight_unlock already unlocked");
+  stop("fast_unlock already unlocked");
   bind(not_unlocked);
 #endif
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index ed1343d9c8c..4cecaa55345 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -2054,8 +2054,8 @@ public:
 
   void check_stack_alignment(Register sp, const char* msg, unsigned bias = 0, Register tmp = noreg);
 
-  void lightweight_lock(Register basic_lock, Register obj, Register reg_rax, Register tmp, Label& slow);
-  void lightweight_unlock(Register obj, Register reg_rax, Register tmp, Label& slow);
+  void fast_lock(Register basic_lock, Register obj, Register reg_rax, Register tmp, Label& slow);
+  void fast_unlock(Register obj, Register reg_rax, Register tmp, Label& slow);
 
   void save_legacy_gprs();
   void restore_legacy_gprs();
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index e702b587edd..5a4a5b1809e 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -2141,7 +2141,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     // Load the oop from the handle
     __ movptr(obj_reg, Address(oop_handle_reg, 0));
 
-    __ lightweight_lock(lock_reg, obj_reg, swap_reg, rscratch1, slow_path_lock);
+    __ fast_lock(lock_reg, obj_reg, swap_reg, rscratch1, slow_path_lock);
 
     // Slow path will re-enter here
     __ bind(lock_done);
@@ -2266,7 +2266,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
       save_native_result(masm, ret_type, stack_slots);
     }
 
-    __ lightweight_unlock(obj_reg, swap_reg, lock_reg, slow_path_unlock);
+    __ fast_unlock(obj_reg, swap_reg, lock_reg, slow_path_unlock);
 
     // slow path re-enters here
     __ bind(unlock_done);
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index aa9a527e0b7..cc93ee3564e 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -995,7 +995,7 @@ public:
     return true;
   }
 
-  constexpr static bool supports_recursive_lightweight_locking() {
+  constexpr static bool supports_recursive_fast_locking() {
     return true;
   }
 
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index ca94b03a841..783ed038858 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -16925,24 +16925,24 @@ instruct jmpConUCF2_short(cmpOpUCF2 cop, rFlagsRegUCF cmp, label labl) %{
 // ============================================================================
 // inlined locking and unlocking
 
-instruct cmpFastLockLightweight(rFlagsReg cr, rRegP object, rbx_RegP box, rax_RegI rax_reg, rRegP tmp) %{
+instruct cmpFastLock(rFlagsReg cr, rRegP object, rbx_RegP box, rax_RegI rax_reg, rRegP tmp) %{
   match(Set cr (FastLock object box));
   effect(TEMP rax_reg, TEMP tmp, USE_KILL box);
   ins_cost(300);
   format %{ "fastlock $object,$box\t! kills $box,$rax_reg,$tmp" %}
   ins_encode %{
-    __ fast_lock_lightweight($object$$Register, $box$$Register, $rax_reg$$Register, $tmp$$Register, r15_thread);
+    __ fast_lock($object$$Register, $box$$Register, $rax_reg$$Register, $tmp$$Register, r15_thread);
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct cmpFastUnlockLightweight(rFlagsReg cr, rRegP object, rax_RegP rax_reg, rRegP tmp) %{
+instruct cmpFastUnlock(rFlagsReg cr, rRegP object, rax_RegP rax_reg, rRegP tmp) %{
   match(Set cr (FastUnlock object rax_reg));
   effect(TEMP tmp, USE_KILL rax_reg);
   ins_cost(300);
   format %{ "fastunlock $object,$rax_reg\t! kills $rax_reg,$tmp" %}
   ins_encode %{
-    __ fast_unlock_lightweight($object$$Register, $rax_reg$$Register, $tmp$$Register, r15_thread);
+    __ fast_unlock($object$$Register, $rax_reg$$Register, $tmp$$Register, r15_thread);
   %}
   ins_pipe(pipe_slow);
 %}
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 5f4cc6c450d..b985d2af6ff 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -70,7 +70,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/oops/markWord.hpp b/src/hotspot/share/oops/markWord.hpp
index aa9cdd65ba9..6bcbcfe97a0 100644
--- a/src/hotspot/share/oops/markWord.hpp
+++ b/src/hotspot/share/oops/markWord.hpp
@@ -211,7 +211,7 @@ class markWord {
   }
   ObjectMonitor* monitor() const {
     assert(has_monitor(), "check");
-    assert(!UseObjectMonitorTable, "Lightweight locking with OM table does not use markWord for monitors");
+    assert(!UseObjectMonitorTable, "Locking with OM table does not use markWord for monitors");
     // Use xor instead of &~ to provide one extra tag-bit check.
     return (ObjectMonitor*) (value() ^ monitor_value);
   }
@@ -237,7 +237,7 @@ class markWord {
     return from_pointer(lock);
   }
   static markWord encode(ObjectMonitor* monitor) {
-    assert(!UseObjectMonitorTable, "Lightweight locking with OM table does not use markWord for monitors");
+    assert(!UseObjectMonitorTable, "Locking with OM table does not use markWord for monitors");
     uintptr_t tmp = (uintptr_t) monitor;
     return markWord(tmp | monitor_value);
   }
diff --git a/src/hotspot/share/opto/c2_CodeStubs.hpp b/src/hotspot/share/opto/c2_CodeStubs.hpp
index e778cfcde47..5664ee03e5c 100644
--- a/src/hotspot/share/opto/c2_CodeStubs.hpp
+++ b/src/hotspot/share/opto/c2_CodeStubs.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,7 @@ public:
   void emit(C2_MacroAssembler& masm);
 };
 
-class C2FastUnlockLightweightStub : public C2CodeStub {
+class C2FastUnlockStub : public C2CodeStub {
 private:
   Register _obj;
   Register _mark;
@@ -107,8 +107,8 @@ private:
   Label _push_and_slow_path;
   Label _unlocked_continuation;
 public:
-  C2FastUnlockLightweightStub(Register obj, Register mark, Register t, Register thread) : C2CodeStub(),
-    _obj(obj), _mark(mark), _t(t), _thread(thread) {}
+  C2FastUnlockStub(Register obj, Register mark, Register t, Register thread) : C2CodeStub(),
+                   _obj(obj), _mark(mark), _t(t), _thread(thread) {}
   int max_size() const;
   void emit(C2_MacroAssembler& masm);
   Label& slow_path() { return _slow_path; }
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 7450b079d18..2b17eddbe94 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -55,7 +55,7 @@
 #include "runtime/osThread.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stackWatermarkSet.inline.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/vframe.inline.hpp"
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 92f5356235a..f5d1edd28f4 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -87,7 +87,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
 #include "runtime/lockStack.hpp"
 #include "runtime/os.hpp"
 #include "runtime/stackFrameStream.inline.hpp"
@@ -1974,8 +1973,8 @@ WB_ENTRY(jint, WB_getLockStackCapacity(JNIEnv* env))
   return (jint) LockStack::CAPACITY;
 WB_END
 
-WB_ENTRY(jboolean, WB_supportsRecursiveLightweightLocking(JNIEnv* env))
-  return (jboolean) VM_Version::supports_recursive_lightweight_locking();
+WB_ENTRY(jboolean, WB_supportsRecursiveFastLocking(JNIEnv* env))
+  return (jboolean) VM_Version::supports_recursive_fast_locking();
 WB_END
 
 WB_ENTRY(jboolean, WB_DeflateIdleMonitors(JNIEnv* env, jobject wb))
@@ -2996,7 +2995,7 @@ static JNINativeMethod methods[] = {
   {CC"isUbsanEnabled", CC"()Z",                       (void*)&WB_IsUbsanEnabled },
   {CC"getInUseMonitorCount", CC"()J", (void*)&WB_getInUseMonitorCount  },
   {CC"getLockStackCapacity", CC"()I",                 (void*)&WB_getLockStackCapacity },
-  {CC"supportsRecursiveLightweightLocking", CC"()Z",  (void*)&WB_supportsRecursiveLightweightLocking },
+  {CC"supportsRecursiveFastLocking", CC"()Z",         (void*)&WB_supportsRecursiveFastLocking },
   {CC"forceSafepoint",     CC"()V",                   (void*)&WB_ForceSafepoint     },
   {CC"forceClassLoaderStatsSafepoint", CC"()V",       (void*)&WB_ForceClassLoaderStatsSafepoint },
   {CC"getConstantPool0",   CC"(Ljava/lang/Class;)J",  (void*)&WB_GetConstantPool    },
diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp
index b9c52b27182..5a6b41506c7 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.hpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.hpp
@@ -191,8 +191,8 @@ class Abstract_VM_Version: AllStatic {
   // Does platform support stack watermark barriers for concurrent stack processing?
   constexpr static bool supports_stack_watermark_barrier() { return false; }
 
-  // Is recursive lightweight locking implemented for this platform?
-  constexpr static bool supports_recursive_lightweight_locking() { return false; }
+  // Is recursive fast locking implemented for this platform?
+  constexpr static bool supports_recursive_fast_locking() { return false; }
 
   // Does platform support secondary supers table lookup?
   constexpr static bool supports_secondary_supers_table() { return false; }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 35ccc92f90b..e2029a26d37 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -74,7 +74,6 @@
 #include "runtime/javaThread.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/keepStackGCProcessed.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
 #include "runtime/lockStack.inline.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/osThread.hpp"
@@ -85,7 +84,7 @@
 #include "runtime/stackValue.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vframe.hpp"
@@ -1680,8 +1679,8 @@ bool Deoptimization::relock_objects(JavaThread* thread, GrowableArray<MonitorInf
         }
         ObjectSynchronizer::enter_for(obj, lock, deoptee_thread);
         if (deoptee_thread->lock_stack().contains(obj())) {
-            LightweightSynchronizer::inflate_fast_locked_object(obj(), ObjectSynchronizer::InflateCause::inflate_cause_vm_internal,
-                                                              deoptee_thread, thread);
+            ObjectSynchronizer::inflate_fast_locked_object(obj(), ObjectSynchronizer::InflateCause::inflate_cause_vm_internal,
+                                                           deoptee_thread, thread);
         }
         assert(mon_info->owner()->is_locked(), "object must be locked now");
         assert(obj->mark().has_monitor(), "must be");
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 238517197b2..d002edd48cd 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1954,14 +1954,14 @@ const int ObjectAlignmentInBytes = 8;
              "fence. Add cleanliness checks.")                              \
                                                                             \
   product(bool, UseObjectMonitorTable, false, DIAGNOSTIC,                   \
-          "With Lightweight Locking mode, use a table to record inflated "  \
-          "monitors rather than the first word of the object.")             \
+          "Use a table to record inflated monitors rather than the first "  \
+          "word of the object.")                                            \
                                                                             \
-  product(int, LightweightFastLockingSpins, 13, DIAGNOSTIC,                 \
-          "Specifies the number of times lightweight fast locking will "    \
-          "attempt to CAS the markWord before inflating. Between each "     \
-          "CAS it will spin for exponentially more time, resulting in "     \
-          "a total number of spins on the order of O(2^value)")             \
+  product(int, FastLockingSpins, 13, DIAGNOSTIC,                            \
+          "Specifies the number of times fast locking will attempt to "     \
+          "CAS the markWord before inflating. Between each CAS it will "    \
+          "spin for exponentially more time, resulting in a total number "  \
+          "of spins on the order of O(2^value)")                            \
           range(1, 30)                                                      \
                                                                             \
   product(uint, TrimNativeHeapInterval, 0,                                  \
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 838f8e4c581..f52be5d740e 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1409,7 +1409,7 @@ void JavaThread::oops_do_no_frames(OopClosure* f, NMethodClosure* cf) {
     entry = entry->parent();
   }
 
-  // Due to lightweight locking
+  // Due to fast locking
   lock_stack().oops_do(f);
 }
 
diff --git a/src/hotspot/share/runtime/lightweightSynchronizer.cpp b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
deleted file mode 100644
index ebb14490365..00000000000
--- a/src/hotspot/share/runtime/lightweightSynchronizer.cpp
+++ /dev/null
@@ -1,1231 +0,0 @@
-/*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "classfile/vmSymbols.hpp"
-#include "jfrfiles/jfrEventClasses.hpp"
-#include "logging/log.hpp"
-#include "memory/allStatic.hpp"
-#include "memory/resourceArea.hpp"
-#include "nmt/memTag.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
-#include "runtime/basicLock.inline.hpp"
-#include "runtime/globals_extension.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/javaThread.inline.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
-#include "runtime/lockStack.inline.hpp"
-#include "runtime/mutexLocker.hpp"
-#include "runtime/objectMonitor.inline.hpp"
-#include "runtime/os.hpp"
-#include "runtime/safepointMechanism.inline.hpp"
-#include "runtime/safepointVerifiers.hpp"
-#include "runtime/synchronizer.inline.hpp"
-#include "runtime/timerTrace.hpp"
-#include "runtime/trimNativeHeap.hpp"
-#include "utilities/concurrentHashTable.inline.hpp"
-#include "utilities/concurrentHashTableTasks.inline.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-// ConcurrentHashTable storing links from objects to ObjectMonitors
-class ObjectMonitorTable : AllStatic {
-  struct Config {
-    using Value = ObjectMonitor*;
-    static uintx get_hash(Value const& value, bool* is_dead) {
-      return (uintx)value->hash();
-    }
-    static void* allocate_node(void* context, size_t size, Value const& value) {
-      ObjectMonitorTable::inc_items_count();
-      return AllocateHeap(size, mtObjectMonitor);
-    };
-    static void free_node(void* context, void* memory, Value const& value) {
-      ObjectMonitorTable::dec_items_count();
-      FreeHeap(memory);
-    }
-  };
-  using ConcurrentTable = ConcurrentHashTable<Config, mtObjectMonitor>;
-
-  static ConcurrentTable* _table;
-  static volatile size_t _items_count;
-  static size_t _table_size;
-  static volatile bool _resize;
-
-  class Lookup : public StackObj {
-    oop _obj;
-
-   public:
-    explicit Lookup(oop obj) : _obj(obj) {}
-
-    uintx get_hash() const {
-      uintx hash = _obj->mark().hash();
-      assert(hash != 0, "should have a hash");
-      return hash;
-    }
-
-    bool equals(ObjectMonitor** value) {
-      assert(*value != nullptr, "must be");
-      return (*value)->object_refers_to(_obj);
-    }
-
-    bool is_dead(ObjectMonitor** value) {
-      assert(*value != nullptr, "must be");
-      return false;
-    }
-  };
-
-  class LookupMonitor : public StackObj {
-    ObjectMonitor* _monitor;
-
-   public:
-    explicit LookupMonitor(ObjectMonitor* monitor) : _monitor(monitor) {}
-
-    uintx get_hash() const {
-      return _monitor->hash();
-    }
-
-    bool equals(ObjectMonitor** value) {
-      return (*value) == _monitor;
-    }
-
-    bool is_dead(ObjectMonitor** value) {
-      assert(*value != nullptr, "must be");
-      return (*value)->object_is_dead();
-    }
-  };
-
-  static void inc_items_count() {
-    AtomicAccess::inc(&_items_count, memory_order_relaxed);
-  }
-
-  static void dec_items_count() {
-    AtomicAccess::dec(&_items_count, memory_order_relaxed);
-  }
-
-  static double get_load_factor() {
-    size_t count = AtomicAccess::load(&_items_count);
-    return (double)count / (double)_table_size;
-  }
-
-  static size_t table_size(Thread* current = Thread::current()) {
-    return ((size_t)1) << _table->get_size_log2(current);
-  }
-
-  static size_t max_log_size() {
-    // TODO[OMTable]: Evaluate the max size.
-    // TODO[OMTable]: Need to fix init order to use Universe::heap()->max_capacity();
-    //                Using MaxHeapSize directly this early may be wrong, and there
-    //                are definitely rounding errors (alignment).
-    const size_t max_capacity = MaxHeapSize;
-    const size_t min_object_size = CollectedHeap::min_dummy_object_size() * HeapWordSize;
-    const size_t max_objects = max_capacity / MAX2(MinObjAlignmentInBytes, checked_cast<int>(min_object_size));
-    const size_t log_max_objects = log2i_graceful(max_objects);
-
-    return MAX2(MIN2<size_t>(SIZE_BIG_LOG2, log_max_objects), min_log_size());
-  }
-
-  static size_t min_log_size() {
-    // ~= log(AvgMonitorsPerThreadEstimate default)
-    return 10;
-  }
-
-  template<typename V>
-  static size_t clamp_log_size(V log_size) {
-    return MAX2(MIN2(log_size, checked_cast<V>(max_log_size())), checked_cast<V>(min_log_size()));
-  }
-
-  static size_t initial_log_size() {
-    const size_t estimate = log2i(MAX2(os::processor_count(), 1)) + log2i(MAX2(AvgMonitorsPerThreadEstimate, size_t(1)));
-    return clamp_log_size(estimate);
-  }
-
-  static size_t grow_hint () {
-    return ConcurrentTable::DEFAULT_GROW_HINT;
-  }
-
- public:
-  static void create() {
-    _table = new ConcurrentTable(initial_log_size(), max_log_size(), grow_hint());
-    _items_count = 0;
-    _table_size = table_size();
-    _resize = false;
-  }
-
-  static void verify_monitor_get_result(oop obj, ObjectMonitor* monitor) {
-#ifdef ASSERT
-    if (SafepointSynchronize::is_at_safepoint()) {
-      bool has_monitor = obj->mark().has_monitor();
-      assert(has_monitor == (monitor != nullptr),
-          "Inconsistency between markWord and ObjectMonitorTable has_monitor: %s monitor: " PTR_FORMAT,
-          BOOL_TO_STR(has_monitor), p2i(monitor));
-    }
-#endif
-  }
-
-  static ObjectMonitor* monitor_get(Thread* current, oop obj) {
-    ObjectMonitor* result = nullptr;
-    Lookup lookup_f(obj);
-    auto found_f = [&](ObjectMonitor** found) {
-      assert((*found)->object_peek() == obj, "must be");
-      result = *found;
-    };
-    _table->get(current, lookup_f, found_f);
-    verify_monitor_get_result(obj, result);
-    return result;
-  }
-
-  static void try_notify_grow() {
-    if (!_table->is_max_size_reached() && !AtomicAccess::load(&_resize)) {
-      AtomicAccess::store(&_resize, true);
-      if (Service_lock->try_lock()) {
-        Service_lock->notify();
-        Service_lock->unlock();
-      }
-    }
-  }
-
-  static bool should_shrink() {
-    // Not implemented;
-    return false;
-  }
-
-  static constexpr double GROW_LOAD_FACTOR = 0.75;
-
-  static bool should_grow() {
-    return get_load_factor() > GROW_LOAD_FACTOR && !_table->is_max_size_reached();
-  }
-
-  static bool should_resize() {
-    return should_grow() || should_shrink() || AtomicAccess::load(&_resize);
-  }
-
-  template<typename Task, typename... Args>
-  static bool run_task(JavaThread* current, Task& task, const char* task_name, Args&... args) {
-    if (task.prepare(current)) {
-      log_trace(monitortable)("Started to %s", task_name);
-      TraceTime timer(task_name, TRACETIME_LOG(Debug, monitortable, perf));
-      while (task.do_task(current, args...)) {
-        task.pause(current);
-        {
-          ThreadBlockInVM tbivm(current);
-        }
-        task.cont(current);
-      }
-      task.done(current);
-      return true;
-    }
-    return false;
-  }
-
-  static bool grow(JavaThread* current) {
-    ConcurrentTable::GrowTask grow_task(_table);
-    if (run_task(current, grow_task, "Grow")) {
-      _table_size = table_size(current);
-      log_info(monitortable)("Grown to size: %zu", _table_size);
-      return true;
-    }
-    return false;
-  }
-
-  static bool clean(JavaThread* current) {
-    ConcurrentTable::BulkDeleteTask clean_task(_table);
-    auto is_dead = [&](ObjectMonitor** monitor) {
-      return (*monitor)->object_is_dead();
-    };
-    auto do_nothing = [&](ObjectMonitor** monitor) {};
-    NativeHeapTrimmer::SuspendMark sm("ObjectMonitorTable");
-    return run_task(current, clean_task, "Clean", is_dead, do_nothing);
-  }
-
-  static bool resize(JavaThread* current) {
-    LogTarget(Info, monitortable) lt;
-    bool success = false;
-
-    if (should_grow()) {
-      lt.print("Start growing with load factor %f", get_load_factor());
-      success = grow(current);
-    } else {
-      if (!_table->is_max_size_reached() && AtomicAccess::load(&_resize)) {
-        lt.print("WARNING: Getting resize hints with load factor %f", get_load_factor());
-      }
-      lt.print("Start cleaning with load factor %f", get_load_factor());
-      success = clean(current);
-    }
-
-    AtomicAccess::store(&_resize, false);
-
-    return success;
-  }
-
-  static ObjectMonitor* monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj) {
-    // Enter the monitor into the concurrent hashtable.
-    ObjectMonitor* result = monitor;
-    Lookup lookup_f(obj);
-    auto found_f = [&](ObjectMonitor** found) {
-      assert((*found)->object_peek() == obj, "must be");
-      result = *found;
-    };
-    bool grow;
-    _table->insert_get(current, lookup_f, monitor, found_f, &grow);
-    verify_monitor_get_result(obj, result);
-    if (grow) {
-      try_notify_grow();
-    }
-    return result;
-  }
-
-  static bool remove_monitor_entry(Thread* current, ObjectMonitor* monitor) {
-    LookupMonitor lookup_f(monitor);
-    return _table->remove(current, lookup_f);
-  }
-
-  static bool contains_monitor(Thread* current, ObjectMonitor* monitor) {
-    LookupMonitor lookup_f(monitor);
-    bool result = false;
-    auto found_f = [&](ObjectMonitor** found) {
-      result = true;
-    };
-    _table->get(current, lookup_f, found_f);
-    return result;
-  }
-
-  static void print_on(outputStream* st) {
-    auto printer = [&] (ObjectMonitor** entry) {
-       ObjectMonitor* om = *entry;
-       oop obj = om->object_peek();
-       st->print("monitor=" PTR_FORMAT ", ", p2i(om));
-       st->print("object=" PTR_FORMAT, p2i(obj));
-       assert(obj->mark().hash() == om->hash(), "hash must match");
-       st->cr();
-       return true;
-    };
-    if (SafepointSynchronize::is_at_safepoint()) {
-      _table->do_safepoint_scan(printer);
-    } else {
-      _table->do_scan(Thread::current(), printer);
-    }
-  }
-};
-
-ObjectMonitorTable::ConcurrentTable* ObjectMonitorTable::_table = nullptr;
-volatile size_t ObjectMonitorTable::_items_count = 0;
-size_t ObjectMonitorTable::_table_size = 0;
-volatile bool ObjectMonitorTable::_resize = false;
-
-ObjectMonitor* LightweightSynchronizer::get_or_insert_monitor_from_table(oop object, JavaThread* current, bool* inserted) {
-  ObjectMonitor* monitor = get_monitor_from_table(current, object);
-  if (monitor != nullptr) {
-    *inserted = false;
-    return monitor;
-  }
-
-  ObjectMonitor* alloced_monitor = new ObjectMonitor(object);
-  alloced_monitor->set_anonymous_owner();
-
-  // Try insert monitor
-  monitor = add_monitor(current, alloced_monitor, object);
-
-  *inserted = alloced_monitor == monitor;
-  if (!*inserted) {
-    delete alloced_monitor;
-  }
-
-  return monitor;
-}
-
-static void log_inflate(Thread* current, oop object, ObjectSynchronizer::InflateCause cause) {
-  if (log_is_enabled(Trace, monitorinflation)) {
-    ResourceMark rm(current);
-    log_trace(monitorinflation)("inflate: object=" INTPTR_FORMAT ", mark="
-                                INTPTR_FORMAT ", type='%s' cause=%s", p2i(object),
-                                object->mark().value(), object->klass()->external_name(),
-                                ObjectSynchronizer::inflate_cause_name(cause));
-  }
-}
-
-static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
-                                       const oop obj,
-                                       ObjectSynchronizer::InflateCause cause) {
-  assert(event != nullptr, "invariant");
-  const Klass* monitor_klass = obj->klass();
-  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
-    return;
-  }
-  event->set_monitorClass(monitor_klass);
-  event->set_address((uintptr_t)(void*)obj);
-  event->set_cause((u1)cause);
-  event->commit();
-}
-
-ObjectMonitor* LightweightSynchronizer::get_or_insert_monitor(oop object, JavaThread* current, ObjectSynchronizer::InflateCause cause) {
-  assert(UseObjectMonitorTable, "must be");
-
-  EventJavaMonitorInflate event;
-
-  bool inserted;
-  ObjectMonitor* monitor = get_or_insert_monitor_from_table(object, current, &inserted);
-
-  if (inserted) {
-    log_inflate(current, object, cause);
-    if (event.should_commit()) {
-      post_monitor_inflate_event(&event, object, cause);
-    }
-
-    // The monitor has an anonymous owner so it is safe from async deflation.
-    ObjectSynchronizer::_in_use_list.add(monitor);
-  }
-
-  return monitor;
-}
-
-// Add the hashcode to the monitor to match the object and put it in the hashtable.
-ObjectMonitor* LightweightSynchronizer::add_monitor(JavaThread* current, ObjectMonitor* monitor, oop obj) {
-  assert(UseObjectMonitorTable, "must be");
-  assert(obj == monitor->object(), "must be");
-
-  intptr_t hash = obj->mark().hash();
-  assert(hash != 0, "must be set when claiming the object monitor");
-  monitor->set_hash(hash);
-
-  return ObjectMonitorTable::monitor_put_get(current, monitor, obj);
-}
-
-bool LightweightSynchronizer::remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj) {
-  assert(UseObjectMonitorTable, "must be");
-  assert(monitor->object_peek() == obj, "must be, cleared objects are removed by is_dead");
-
-  return ObjectMonitorTable::remove_monitor_entry(current, monitor);
-}
-
-void LightweightSynchronizer::deflate_mark_word(oop obj) {
-  assert(UseObjectMonitorTable, "must be");
-
-  markWord mark = obj->mark_acquire();
-  assert(!mark.has_no_hash(), "obj with inflated monitor must have had a hash");
-
-  while (mark.has_monitor()) {
-    const markWord new_mark = mark.clear_lock_bits().set_unlocked();
-    mark = obj->cas_set_mark(new_mark, mark);
-  }
-}
-
-void LightweightSynchronizer::initialize() {
-  if (!UseObjectMonitorTable) {
-    return;
-  }
-  ObjectMonitorTable::create();
-}
-
-bool LightweightSynchronizer::needs_resize() {
-  if (!UseObjectMonitorTable) {
-    return false;
-  }
-  return ObjectMonitorTable::should_resize();
-}
-
-bool LightweightSynchronizer::resize_table(JavaThread* current) {
-  if (!UseObjectMonitorTable) {
-    return true;
-  }
-  return ObjectMonitorTable::resize(current);
-}
-
-class LightweightSynchronizer::LockStackInflateContendedLocks : private OopClosure {
- private:
-  oop _contended_oops[LockStack::CAPACITY];
-  int _length;
-
-  void do_oop(oop* o) final {
-    oop obj = *o;
-    if (obj->mark_acquire().has_monitor()) {
-      if (_length > 0 && _contended_oops[_length - 1] == obj) {
-        // Recursive
-        return;
-      }
-      _contended_oops[_length++] = obj;
-    }
-  }
-
-  void do_oop(narrowOop* o) final {
-    ShouldNotReachHere();
-  }
-
- public:
-  LockStackInflateContendedLocks() :
-    _contended_oops(),
-    _length(0) {};
-
-  void inflate(JavaThread* current) {
-    assert(current == JavaThread::current(), "must be");
-    current->lock_stack().oops_do(this);
-    for (int i = 0; i < _length; i++) {
-      LightweightSynchronizer::
-        inflate_fast_locked_object(_contended_oops[i], ObjectSynchronizer::inflate_cause_vm_internal, current, current);
-    }
-  }
-};
-
-void LightweightSynchronizer::ensure_lock_stack_space(JavaThread* current) {
-  assert(current == JavaThread::current(), "must be");
-  LockStack& lock_stack = current->lock_stack();
-
-  // Make room on lock_stack
-  if (lock_stack.is_full()) {
-    // Inflate contended objects
-    LockStackInflateContendedLocks().inflate(current);
-    if (lock_stack.is_full()) {
-      // Inflate the oldest object
-      inflate_fast_locked_object(lock_stack.bottom(), ObjectSynchronizer::inflate_cause_vm_internal, current, current);
-    }
-  }
-}
-
-class LightweightSynchronizer::CacheSetter : StackObj {
-  JavaThread* const _thread;
-  BasicLock* const _lock;
-  ObjectMonitor* _monitor;
-
-  NONCOPYABLE(CacheSetter);
-
- public:
-  CacheSetter(JavaThread* thread, BasicLock* lock) :
-    _thread(thread),
-    _lock(lock),
-    _monitor(nullptr) {}
-
-  ~CacheSetter() {
-    // Only use the cache if using the table.
-    if (UseObjectMonitorTable) {
-      if (_monitor != nullptr) {
-        // If the monitor is already in the BasicLock cache then it is most
-        // likely in the thread cache, do not set it again to avoid reordering.
-        if (_monitor != _lock->object_monitor_cache()) {
-          _thread->om_set_monitor_cache(_monitor);
-          _lock->set_object_monitor_cache(_monitor);
-        }
-      } else {
-        _lock->clear_object_monitor_cache();
-      }
-    }
-  }
-
-  void set_monitor(ObjectMonitor* monitor) {
-    assert(_monitor == nullptr, "only set once");
-    _monitor = monitor;
-  }
-
-};
-
-// Reads first from the BasicLock cache then from the OMCache in the current thread.
-// C2 fast-path may have put the monitor in the cache in the BasicLock.
-inline static ObjectMonitor* read_caches(JavaThread* current, BasicLock* lock, oop object) {
-  ObjectMonitor* monitor = lock->object_monitor_cache();
-  if (monitor == nullptr) {
-    monitor = current->om_get_from_monitor_cache(object);
-  }
-  return monitor;
-}
-
-class LightweightSynchronizer::VerifyThreadState {
-  bool _no_safepoint;
-
- public:
-  VerifyThreadState(JavaThread* locking_thread, JavaThread* current) : _no_safepoint(locking_thread != current) {
-    assert(current == Thread::current(), "must be");
-    assert(locking_thread == current || locking_thread->is_obj_deopt_suspend(), "locking_thread may not run concurrently");
-    if (_no_safepoint) {
-      DEBUG_ONLY(JavaThread::current()->inc_no_safepoint_count();)
-    }
-  }
-  ~VerifyThreadState() {
-    if (_no_safepoint){
-      DEBUG_ONLY(JavaThread::current()->dec_no_safepoint_count();)
-    }
-  }
-};
-
-inline bool LightweightSynchronizer::fast_lock_try_enter(oop obj, LockStack& lock_stack, JavaThread* current) {
-  markWord mark = obj->mark();
-  while (mark.is_unlocked()) {
-    ensure_lock_stack_space(current);
-    assert(!lock_stack.is_full(), "must have made room on the lock stack");
-    assert(!lock_stack.contains(obj), "thread must not already hold the lock");
-    // Try to swing into 'fast-locked' state.
-    markWord locked_mark = mark.set_fast_locked();
-    markWord old_mark = mark;
-    mark = obj->cas_set_mark(locked_mark, old_mark);
-    if (old_mark == mark) {
-      // Successfully fast-locked, push object to lock-stack and return.
-      lock_stack.push(obj);
-      return true;
-    }
-  }
-  return false;
-}
-
-bool LightweightSynchronizer::fast_lock_spin_enter(oop obj, LockStack& lock_stack, JavaThread* current, bool observed_deflation) {
-  assert(UseObjectMonitorTable, "must be");
-  // Will spin with exponential backoff with an accumulative O(2^spin_limit) spins.
-  const int log_spin_limit = os::is_MP() ? LightweightFastLockingSpins : 1;
-  const int log_min_safepoint_check_interval = 10;
-
-  markWord mark = obj->mark();
-  const auto should_spin = [&]() {
-    if (!mark.has_monitor()) {
-      // Spin while not inflated.
-      return true;
-    } else if (observed_deflation) {
-      // Spin while monitor is being deflated.
-      ObjectMonitor* monitor = ObjectSynchronizer::read_monitor(current, obj, mark);
-      return monitor == nullptr || monitor->is_being_async_deflated();
-    }
-    // Else stop spinning.
-    return false;
-  };
-  // Always attempt to lock once even when safepoint synchronizing.
-  bool should_process = false;
-  for (int i = 0; should_spin() && !should_process && i < log_spin_limit; i++) {
-    // Spin with exponential backoff.
-    const int total_spin_count = 1 << i;
-    const int inner_spin_count = MIN2(1 << log_min_safepoint_check_interval, total_spin_count);
-    const int outer_spin_count = total_spin_count / inner_spin_count;
-    for (int outer = 0; outer < outer_spin_count; outer++) {
-      should_process = SafepointMechanism::should_process(current);
-      if (should_process) {
-        // Stop spinning for safepoint.
-        break;
-      }
-      for (int inner = 1; inner < inner_spin_count; inner++) {
-        SpinPause();
-      }
-    }
-
-    if (fast_lock_try_enter(obj, lock_stack, current)) return true;
-  }
-  return false;
-}
-
-void LightweightSynchronizer::enter_for(Handle obj, BasicLock* lock, JavaThread* locking_thread) {
-  assert(!UseObjectMonitorTable || lock->object_monitor_cache() == nullptr, "must be cleared");
-  JavaThread* current = JavaThread::current();
-  VerifyThreadState vts(locking_thread, current);
-
-  if (obj->klass()->is_value_based()) {
-    ObjectSynchronizer::handle_sync_on_value_based_class(obj, locking_thread);
-  }
-
-  LockStack& lock_stack = locking_thread->lock_stack();
-
-  ObjectMonitor* monitor = nullptr;
-  if (lock_stack.contains(obj())) {
-    monitor = inflate_fast_locked_object(obj(), ObjectSynchronizer::inflate_cause_monitor_enter, locking_thread, current);
-    bool entered = monitor->enter_for(locking_thread);
-    assert(entered, "recursive ObjectMonitor::enter_for must succeed");
-  } else {
-    do {
-      // It is assumed that enter_for must enter on an object without contention.
-      monitor = inflate_and_enter(obj(), lock, ObjectSynchronizer::inflate_cause_monitor_enter, locking_thread, current);
-      // But there may still be a race with deflation.
-    } while (monitor == nullptr);
-  }
-
-  assert(monitor != nullptr, "LightweightSynchronizer::enter_for must succeed");
-  assert(!UseObjectMonitorTable || lock->object_monitor_cache() == nullptr, "unused. already cleared");
-}
-
-void LightweightSynchronizer::enter(Handle obj, BasicLock* lock, JavaThread* current) {
-  assert(current == JavaThread::current(), "must be");
-
-  if (obj->klass()->is_value_based()) {
-    ObjectSynchronizer::handle_sync_on_value_based_class(obj, current);
-  }
-
-  CacheSetter cache_setter(current, lock);
-
-  // Used when deflation is observed. Progress here requires progress
-  // from the deflator. After observing that the deflator is not
-  // making progress (after two yields), switch to sleeping.
-  SpinYield spin_yield(0, 2);
-  bool observed_deflation = false;
-
-  LockStack& lock_stack = current->lock_stack();
-
-  if (!lock_stack.is_full() && lock_stack.try_recursive_enter(obj())) {
-    // Recursively fast locked
-    return;
-  }
-
-  if (lock_stack.contains(obj())) {
-    ObjectMonitor* monitor = inflate_fast_locked_object(obj(), ObjectSynchronizer::inflate_cause_monitor_enter, current, current);
-    bool entered = monitor->enter(current);
-    assert(entered, "recursive ObjectMonitor::enter must succeed");
-    cache_setter.set_monitor(monitor);
-    return;
-  }
-
-  while (true) {
-    // Fast-locking does not use the 'lock' argument.
-    // Fast-lock spinning to avoid inflating for short critical sections.
-    // The goal is to only inflate when the extra cost of using ObjectMonitors
-    // is worth it.
-    // If deflation has been observed we also spin while deflation is ongoing.
-    if (fast_lock_try_enter(obj(), lock_stack, current)) {
-      return;
-    } else if (UseObjectMonitorTable && fast_lock_spin_enter(obj(), lock_stack, current, observed_deflation)) {
-      return;
-    }
-
-    if (observed_deflation) {
-      spin_yield.wait();
-    }
-
-    ObjectMonitor* monitor = inflate_and_enter(obj(), lock, ObjectSynchronizer::inflate_cause_monitor_enter, current, current);
-    if (monitor != nullptr) {
-      cache_setter.set_monitor(monitor);
-      return;
-    }
-
-    // If inflate_and_enter returns nullptr it is because a deflated monitor
-    // was encountered. Fallback to fast locking. The deflater is responsible
-    // for clearing out the monitor and transitioning the markWord back to
-    // fast locking.
-    observed_deflation = true;
-  }
-}
-
-void LightweightSynchronizer::exit(oop object, BasicLock* lock, JavaThread* current) {
-  assert(current == Thread::current(), "must be");
-
-  markWord mark = object->mark();
-  assert(!mark.is_unlocked(), "must be");
-
-  LockStack& lock_stack = current->lock_stack();
-  if (mark.is_fast_locked()) {
-    if (lock_stack.try_recursive_exit(object)) {
-      // This is a recursive exit which succeeded
-      return;
-    }
-    if (lock_stack.is_recursive(object)) {
-      // Must inflate recursive locks if try_recursive_exit fails
-      // This happens for un-structured unlocks, could potentially
-      // fix try_recursive_exit to handle these.
-      inflate_fast_locked_object(object, ObjectSynchronizer::inflate_cause_vm_internal, current, current);
-    }
-  }
-
-  while (mark.is_fast_locked()) {
-    markWord unlocked_mark = mark.set_unlocked();
-    markWord old_mark = mark;
-    mark = object->cas_set_mark(unlocked_mark, old_mark);
-    if (old_mark == mark) {
-      // CAS successful, remove from lock_stack
-      size_t recursion = lock_stack.remove(object) - 1;
-      assert(recursion == 0, "Should not have unlocked here");
-      return;
-    }
-  }
-
-  assert(mark.has_monitor(), "must be");
-  // The monitor exists
-  ObjectMonitor* monitor;
-  if (UseObjectMonitorTable) {
-    monitor = read_caches(current, lock, object);
-    if (monitor == nullptr) {
-      monitor = get_monitor_from_table(current, object);
-    }
-  } else {
-    monitor = ObjectSynchronizer::read_monitor(mark);
-  }
-  if (monitor->has_anonymous_owner()) {
-    assert(current->lock_stack().contains(object), "current must have object on its lock stack");
-    monitor->set_owner_from_anonymous(current);
-    monitor->set_recursions(current->lock_stack().remove(object) - 1);
-  }
-
-  monitor->exit(current);
-}
-
-// LightweightSynchronizer::inflate_locked_or_imse is used to get an
-// inflated ObjectMonitor* from contexts which require that, such as
-// notify/wait and jni_exit. Lightweight locking keeps the invariant that it
-// only inflates if it is already locked by the current thread or the current
-// thread is in the process of entering. To maintain this invariant we need to
-// throw a java.lang.IllegalMonitorStateException before inflating if the
-// current thread is not the owner.
-ObjectMonitor* LightweightSynchronizer::inflate_locked_or_imse(oop obj, ObjectSynchronizer::InflateCause cause, TRAPS) {
-  JavaThread* current = THREAD;
-
-  for (;;) {
-    markWord mark = obj->mark_acquire();
-    if (mark.is_unlocked()) {
-      // No lock, IMSE.
-      THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
-                 "current thread is not owner", nullptr);
-    }
-
-    if (mark.is_fast_locked()) {
-      if (!current->lock_stack().contains(obj)) {
-        // Fast locked by other thread, IMSE.
-        THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
-                   "current thread is not owner", nullptr);
-      } else {
-        // Current thread owns the lock, must inflate
-        return inflate_fast_locked_object(obj, cause, current, current);
-      }
-    }
-
-    assert(mark.has_monitor(), "must be");
-    ObjectMonitor* monitor = ObjectSynchronizer::read_monitor(current, obj, mark);
-    if (monitor != nullptr) {
-      if (monitor->has_anonymous_owner()) {
-        LockStack& lock_stack = current->lock_stack();
-        if (lock_stack.contains(obj)) {
-          // Current thread owns the lock but someone else inflated it.
-          // Fix owner and pop lock stack.
-          monitor->set_owner_from_anonymous(current);
-          monitor->set_recursions(lock_stack.remove(obj) - 1);
-        } else {
-          // Fast locked (and inflated) by other thread, or deflation in progress, IMSE.
-          THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
-                     "current thread is not owner", nullptr);
-        }
-      }
-      return monitor;
-    }
-  }
-}
-
-ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, Thread* current) {
-
-  // The JavaThread* locking parameter requires that the locking_thread == JavaThread::current,
-  // or is suspended throughout the call by some other mechanism.
-  // Even with lightweight locking the thread might be nullptr when called from a non
-  // JavaThread. (As may still be the case from FastHashCode). However it is only
-  // important for the correctness of the lightweight locking algorithm that the thread
-  // is set when called from ObjectSynchronizer::enter from the owning thread,
-  // ObjectSynchronizer::enter_for from any thread, or ObjectSynchronizer::exit.
-  EventJavaMonitorInflate event;
-
-  for (;;) {
-    const markWord mark = object->mark_acquire();
-
-    // The mark can be in one of the following states:
-    // *  inflated     - Just return if using stack-locking.
-    //                   If using fast-locking and the ObjectMonitor owner
-    //                   is anonymous and the locking_thread owns the
-    //                   object lock, then we make the locking_thread
-    //                   the ObjectMonitor owner and remove the lock from
-    //                   the locking_thread's lock stack.
-    // *  fast-locked  - Coerce it to inflated from fast-locked.
-    // *  unlocked     - Aggressively inflate the object.
-
-    // CASE: inflated
-    if (mark.has_monitor()) {
-      ObjectMonitor* inf = mark.monitor();
-      markWord dmw = inf->header();
-      assert(dmw.is_neutral(), "invariant: header=" INTPTR_FORMAT, dmw.value());
-      if (inf->has_anonymous_owner() &&
-          locking_thread != nullptr && locking_thread->lock_stack().contains(object)) {
-        inf->set_owner_from_anonymous(locking_thread);
-        size_t removed = locking_thread->lock_stack().remove(object);
-        inf->set_recursions(removed - 1);
-      }
-      return inf;
-    }
-
-    // CASE: fast-locked
-    // Could be fast-locked either by the locking_thread or by some other thread.
-    //
-    // Note that we allocate the ObjectMonitor speculatively, _before_
-    // attempting to set the object's mark to the new ObjectMonitor. If
-    // the locking_thread owns the monitor, then we set the ObjectMonitor's
-    // owner to the locking_thread. Otherwise, we set the ObjectMonitor's owner
-    // to anonymous. If we lose the race to set the object's mark to the
-    // new ObjectMonitor, then we just delete it and loop around again.
-    //
-    if (mark.is_fast_locked()) {
-      ObjectMonitor* monitor = new ObjectMonitor(object);
-      monitor->set_header(mark.set_unlocked());
-      bool own = locking_thread != nullptr && locking_thread->lock_stack().contains(object);
-      if (own) {
-        // Owned by locking_thread.
-        monitor->set_owner(locking_thread);
-      } else {
-        // Owned by somebody else.
-        monitor->set_anonymous_owner();
-      }
-      markWord monitor_mark = markWord::encode(monitor);
-      markWord old_mark = object->cas_set_mark(monitor_mark, mark);
-      if (old_mark == mark) {
-        // Success! Return inflated monitor.
-        if (own) {
-          size_t removed = locking_thread->lock_stack().remove(object);
-          monitor->set_recursions(removed - 1);
-        }
-        // Once the ObjectMonitor is configured and object is associated
-        // with the ObjectMonitor, it is safe to allow async deflation:
-        ObjectSynchronizer::_in_use_list.add(monitor);
-
-        log_inflate(current, object, cause);
-        if (event.should_commit()) {
-          post_monitor_inflate_event(&event, object, cause);
-        }
-        return monitor;
-      } else {
-        delete monitor;
-        continue;  // Interference -- just retry
-      }
-    }
-
-    // CASE: unlocked
-    // TODO-FIXME: for entry we currently inflate and then try to CAS _owner.
-    // If we know we're inflating for entry it's better to inflate by swinging a
-    // pre-locked ObjectMonitor pointer into the object header.   A successful
-    // CAS inflates the object *and* confers ownership to the inflating thread.
-    // In the current implementation we use a 2-step mechanism where we CAS()
-    // to inflate and then CAS() again to try to swing _owner from null to current.
-    // An inflateTry() method that we could call from enter() would be useful.
-
-    assert(mark.is_unlocked(), "invariant: header=" INTPTR_FORMAT, mark.value());
-    ObjectMonitor* m = new ObjectMonitor(object);
-    // prepare m for installation - set monitor to initial state
-    m->set_header(mark);
-
-    if (object->cas_set_mark(markWord::encode(m), mark) != mark) {
-      delete m;
-      m = nullptr;
-      continue;
-      // interference - the markword changed - just retry.
-      // The state-transitions are one-way, so there's no chance of
-      // live-lock -- "Inflated" is an absorbing state.
-    }
-
-    // Once the ObjectMonitor is configured and object is associated
-    // with the ObjectMonitor, it is safe to allow async deflation:
-    ObjectSynchronizer::_in_use_list.add(m);
-
-    log_inflate(current, object, cause);
-    if (event.should_commit()) {
-      post_monitor_inflate_event(&event, object, cause);
-    }
-    return m;
-  }
-}
-
-ObjectMonitor* LightweightSynchronizer::inflate_fast_locked_object(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current) {
-  VerifyThreadState vts(locking_thread, current);
-  assert(locking_thread->lock_stack().contains(object), "locking_thread must have object on its lock stack");
-
-  ObjectMonitor* monitor;
-
-  if (!UseObjectMonitorTable) {
-    return inflate_into_object_header(object, cause, locking_thread, current);
-  }
-
-  // Inflating requires a hash code
-  ObjectSynchronizer::FastHashCode(current, object);
-
-  markWord mark = object->mark_acquire();
-  assert(!mark.is_unlocked(), "Cannot be unlocked");
-
-  for (;;) {
-    // Fetch the monitor from the table
-    monitor = get_or_insert_monitor(object, current, cause);
-
-    // ObjectMonitors are always inserted as anonymously owned, this thread is
-    // the current holder of the monitor. So unless the entry is stale and
-    // contains a deflating monitor it must be anonymously owned.
-    if (monitor->has_anonymous_owner()) {
-      // The monitor must be anonymously owned if it was added
-      assert(monitor == get_monitor_from_table(current, object), "The monitor must be found");
-      // New fresh monitor
-      break;
-    }
-
-    // If the monitor was not anonymously owned then we got a deflating monitor
-    // from the table. We need to let the deflator make progress and remove this
-    // entry before we are allowed to add a new one.
-    os::naked_yield();
-    assert(monitor->is_being_async_deflated(), "Should be the reason");
-  }
-
-  // Set the mark word; loop to handle concurrent updates to other parts of the mark word
-  while (mark.is_fast_locked()) {
-    mark = object->cas_set_mark(mark.set_has_monitor(), mark);
-  }
-
-  // Indicate that the monitor now has a known owner
-  monitor->set_owner_from_anonymous(locking_thread);
-
-  // Remove the entry from the thread's lock stack
-  monitor->set_recursions(locking_thread->lock_stack().remove(object) - 1);
-
-  if (locking_thread == current) {
-    // Only change the thread local state of the current thread.
-    locking_thread->om_set_monitor_cache(monitor);
-  }
-
-  return monitor;
-}
-
-ObjectMonitor* LightweightSynchronizer::inflate_and_enter(oop object, BasicLock* lock, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current) {
-  VerifyThreadState vts(locking_thread, current);
-
-  // Note: In some paths (deoptimization) the 'current' thread inflates and
-  // enters the lock on behalf of the 'locking_thread' thread.
-
-  ObjectMonitor* monitor = nullptr;
-
-  if (!UseObjectMonitorTable) {
-    // Do the old inflate and enter.
-    monitor = inflate_into_object_header(object, cause, locking_thread, current);
-
-    bool entered;
-    if (locking_thread == current) {
-      entered = monitor->enter(locking_thread);
-    } else {
-      entered = monitor->enter_for(locking_thread);
-    }
-
-    // enter returns false for deflation found.
-    return entered ? monitor : nullptr;
-  }
-
-  NoSafepointVerifier nsv;
-
-  // Try to get the monitor from the thread-local cache.
-  // There's no need to use the cache if we are locking
-  // on behalf of another thread.
-  if (current == locking_thread) {
-    monitor = read_caches(current, lock, object);
-  }
-
-  // Get or create the monitor
-  if (monitor == nullptr) {
-    // Lightweight monitors require that hash codes are installed first
-    ObjectSynchronizer::FastHashCode(locking_thread, object);
-    monitor = get_or_insert_monitor(object, current, cause);
-  }
-
-  if (monitor->try_enter(locking_thread)) {
-    return monitor;
-  }
-
-  // Holds is_being_async_deflated() stable throughout this function.
-  ObjectMonitorContentionMark contention_mark(monitor);
-
-  /// First handle the case where the monitor from the table is deflated
-  if (monitor->is_being_async_deflated()) {
-    // The MonitorDeflation thread is deflating the monitor. The locking thread
-    // must spin until further progress has been made.
-
-    // Clear the BasicLock cache as it may contain this monitor.
-    lock->clear_object_monitor_cache();
-
-    const markWord mark = object->mark_acquire();
-
-    if (mark.has_monitor()) {
-      // Waiting on the deflation thread to remove the deflated monitor from the table.
-      os::naked_yield();
-
-    } else if (mark.is_fast_locked()) {
-      // Some other thread managed to fast-lock the lock, or this is a
-      // recursive lock from the same thread; yield for the deflation
-      // thread to remove the deflated monitor from the table.
-      os::naked_yield();
-
-    } else {
-      assert(mark.is_unlocked(), "Implied");
-      // Retry immediately
-    }
-
-    // Retry
-    return nullptr;
-  }
-
-  for (;;) {
-    const markWord mark = object->mark_acquire();
-    // The mark can be in one of the following states:
-    // *  inflated     - If the ObjectMonitor owner is anonymous
-    //                   and the locking_thread owns the object
-    //                   lock, then we make the locking_thread
-    //                   the ObjectMonitor owner and remove the
-    //                   lock from the locking_thread's lock stack.
-    // *  fast-locked  - Coerce it to inflated from fast-locked.
-    // *  neutral      - Inflate the object. Successful CAS is locked
-
-    // CASE: inflated
-    if (mark.has_monitor()) {
-      LockStack& lock_stack = locking_thread->lock_stack();
-      if (monitor->has_anonymous_owner() && lock_stack.contains(object)) {
-        // The lock is fast-locked by the locking thread,
-        // convert it to a held monitor with a known owner.
-        monitor->set_owner_from_anonymous(locking_thread);
-        monitor->set_recursions(lock_stack.remove(object) - 1);
-      }
-
-      break; // Success
-    }
-
-    // CASE: fast-locked
-    // Could be fast-locked either by locking_thread or by some other thread.
-    //
-    if (mark.is_fast_locked()) {
-      markWord old_mark = object->cas_set_mark(mark.set_has_monitor(), mark);
-      if (old_mark != mark) {
-        // CAS failed
-        continue;
-      }
-
-      // Success! Return inflated monitor.
-      LockStack& lock_stack = locking_thread->lock_stack();
-      if (lock_stack.contains(object)) {
-        // The lock is fast-locked by the locking thread,
-        // convert it to a held monitor with a known owner.
-        monitor->set_owner_from_anonymous(locking_thread);
-        monitor->set_recursions(lock_stack.remove(object) - 1);
-      }
-
-      break; // Success
-    }
-
-    // CASE: neutral (unlocked)
-
-    // Catch if the object's header is not neutral (not locked and
-    // not marked is what we care about here).
-    assert(mark.is_neutral(), "invariant: header=" INTPTR_FORMAT, mark.value());
-    markWord old_mark = object->cas_set_mark(mark.set_has_monitor(), mark);
-    if (old_mark != mark) {
-      // CAS failed
-      continue;
-    }
-
-    // Transitioned from unlocked to monitor means locking_thread owns the lock.
-    monitor->set_owner_from_anonymous(locking_thread);
-
-    return monitor;
-  }
-
-  if (current == locking_thread) {
-    // One round of spinning
-    if (monitor->spin_enter(locking_thread)) {
-      return monitor;
-    }
-
-    // Monitor is contended, take the time before entering to fix the lock stack.
-    LockStackInflateContendedLocks().inflate(current);
-  }
-
-  // enter can block for safepoints; clear the unhandled object oop
-  PauseNoSafepointVerifier pnsv(&nsv);
-  object = nullptr;
-
-  if (current == locking_thread) {
-    monitor->enter_with_contention_mark(locking_thread, contention_mark);
-  } else {
-    monitor->enter_for_with_contention_mark(locking_thread, contention_mark);
-  }
-
-  return monitor;
-}
-
-void LightweightSynchronizer::deflate_monitor(Thread* current, oop obj, ObjectMonitor* monitor) {
-  if (obj != nullptr) {
-    deflate_mark_word(obj);
-  }
-  bool removed = remove_monitor(current, monitor, obj);
-  if (obj != nullptr) {
-    assert(removed, "Should have removed the entry if obj was alive");
-  }
-}
-
-ObjectMonitor* LightweightSynchronizer::get_monitor_from_table(Thread* current, oop obj) {
-  assert(UseObjectMonitorTable, "must be");
-  return ObjectMonitorTable::monitor_get(current, obj);
-}
-
-bool LightweightSynchronizer::contains_monitor(Thread* current, ObjectMonitor* monitor) {
-  assert(UseObjectMonitorTable, "must be");
-  return ObjectMonitorTable::contains_monitor(current, monitor);
-}
-
-bool LightweightSynchronizer::quick_enter(oop obj, BasicLock* lock, JavaThread* current) {
-  assert(current->thread_state() == _thread_in_Java, "must be");
-  assert(obj != nullptr, "must be");
-  NoSafepointVerifier nsv;
-
-  LockStack& lock_stack = current->lock_stack();
-  if (lock_stack.is_full()) {
-    // Always go into runtime if the lock stack is full.
-    return false;
-  }
-
-  const markWord mark = obj->mark();
-
-#ifndef _LP64
-  // Only for 32bit which has limited support for fast locking outside the runtime.
-  if (lock_stack.try_recursive_enter(obj)) {
-    // Recursive lock successful.
-    return true;
-  }
-
-  if (mark.is_unlocked()) {
-    markWord locked_mark = mark.set_fast_locked();
-    if (obj->cas_set_mark(locked_mark, mark) == mark) {
-      // Successfully fast-locked, push object to lock-stack and return.
-      lock_stack.push(obj);
-      return true;
-    }
-  }
-#endif
-
-  if (mark.has_monitor()) {
-    ObjectMonitor* monitor;
-    if (UseObjectMonitorTable) {
-      monitor = read_caches(current, lock, obj);
-    } else {
-      monitor = ObjectSynchronizer::read_monitor(mark);
-    }
-
-    if (monitor == nullptr) {
-      // Take the slow-path on a cache miss.
-      return false;
-    }
-
-    if (UseObjectMonitorTable) {
-      // Set the monitor regardless of success.
-      // Either we successfully lock on the monitor, or we retry with the
-      // monitor in the slow path. If the monitor gets deflated, it will be
-      // cleared, either by the CacheSetter if we fast lock in enter or in
-      // inflate_and_enter when we see that the monitor is deflated.
-      lock->set_object_monitor_cache(monitor);
-    }
-
-    if (monitor->spin_enter(current)) {
-      return true;
-    }
-  }
-
-  // Slow-path.
-  return false;
-}
diff --git a/src/hotspot/share/runtime/lightweightSynchronizer.hpp b/src/hotspot/share/runtime/lightweightSynchronizer.hpp
deleted file mode 100644
index b10e639a67c..00000000000
--- a/src/hotspot/share/runtime/lightweightSynchronizer.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_RUNTIME_LIGHTWEIGHTSYNCHRONIZER_HPP
-#define SHARE_RUNTIME_LIGHTWEIGHTSYNCHRONIZER_HPP
-
-#include "memory/allStatic.hpp"
-#include "runtime/javaThread.hpp"
-#include "runtime/objectMonitor.hpp"
-#include "runtime/synchronizer.hpp"
-
-class ObjectMonitorTable;
-
-class LightweightSynchronizer : AllStatic {
- private:
-  static ObjectMonitor* get_or_insert_monitor_from_table(oop object, JavaThread* current, bool* inserted);
-  static ObjectMonitor* get_or_insert_monitor(oop object, JavaThread* current, ObjectSynchronizer::InflateCause cause);
-
-  static ObjectMonitor* add_monitor(JavaThread* current, ObjectMonitor* monitor, oop obj);
-  static bool remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj);
-
-  static void deflate_mark_word(oop object);
-
-  static void ensure_lock_stack_space(JavaThread* current);
-
-  class CacheSetter;
-  class LockStackInflateContendedLocks;
-  class VerifyThreadState;
-
- public:
-  static void initialize();
-
-  static bool needs_resize();
-  static bool resize_table(JavaThread* current);
-
- private:
-  static inline bool fast_lock_try_enter(oop obj, LockStack& lock_stack, JavaThread* current);
-  static bool fast_lock_spin_enter(oop obj, LockStack& lock_stack, JavaThread* current, bool observed_deflation);
-
- public:
-  static void enter_for(Handle obj, BasicLock* lock, JavaThread* locking_thread);
-  static void enter(Handle obj, BasicLock* lock, JavaThread* current);
-  static void exit(oop object, BasicLock* lock, JavaThread* current);
-
-  static ObjectMonitor* inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, Thread* current);
-  static ObjectMonitor* inflate_locked_or_imse(oop object, ObjectSynchronizer::InflateCause cause, TRAPS);
-  static ObjectMonitor* inflate_fast_locked_object(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current);
-  static ObjectMonitor* inflate_and_enter(oop object, BasicLock* lock, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current);
-
-  static void deflate_monitor(Thread* current, oop obj, ObjectMonitor* monitor);
-
-  static ObjectMonitor* get_monitor_from_table(Thread* current, oop obj);
-
-  static bool contains_monitor(Thread* current, ObjectMonitor* monitor);
-
-  static bool quick_enter(oop obj, BasicLock* Lock, JavaThread* current);
-};
-
-#endif // SHARE_RUNTIME_LIGHTWEIGHTSYNCHRONIZER_HPP
diff --git a/src/hotspot/share/runtime/lockStack.cpp b/src/hotspot/share/runtime/lockStack.cpp
index 95f72393d91..a88a84eb9f8 100644
--- a/src/hotspot/share/runtime/lockStack.cpp
+++ b/src/hotspot/share/runtime/lockStack.cpp
@@ -35,7 +35,7 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/stackWatermark.hpp"
 #include "runtime/stackWatermarkSet.inline.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
@@ -82,7 +82,7 @@ void LockStack::verify(const char* msg) const {
     int top = to_index(_top);
     for (int i = 0; i < top; i++) {
       assert(_base[i] != nullptr, "no zapped before top");
-      if (VM_Version::supports_recursive_lightweight_locking()) {
+      if (VM_Version::supports_recursive_fast_locking()) {
         oop o = _base[i];
         for (; i < top - 1; i++) {
           // Consecutive entries may be the same
diff --git a/src/hotspot/share/runtime/lockStack.inline.hpp b/src/hotspot/share/runtime/lockStack.inline.hpp
index 0516a85356d..27eb07fcec8 100644
--- a/src/hotspot/share/runtime/lockStack.inline.hpp
+++ b/src/hotspot/share/runtime/lockStack.inline.hpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2022, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,11 @@
 
 #include "memory/iterator.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/stackWatermark.hpp"
 #include "runtime/stackWatermarkSet.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -87,7 +87,7 @@ inline bool LockStack::is_empty() const {
 }
 
 inline bool LockStack::is_recursive(oop o) const {
-  if (!VM_Version::supports_recursive_lightweight_locking()) {
+  if (!VM_Version::supports_recursive_fast_locking()) {
     return false;
   }
   verify("pre-is_recursive");
@@ -119,7 +119,7 @@ inline bool LockStack::is_recursive(oop o) const {
 }
 
 inline bool LockStack::try_recursive_enter(oop o) {
-  if (!VM_Version::supports_recursive_lightweight_locking()) {
+  if (!VM_Version::supports_recursive_fast_locking()) {
     return false;
   }
   verify("pre-try_recursive_enter");
@@ -145,7 +145,7 @@ inline bool LockStack::try_recursive_enter(oop o) {
 }
 
 inline bool LockStack::try_recursive_exit(oop o) {
-  if (!VM_Version::supports_recursive_lightweight_locking()) {
+  if (!VM_Version::supports_recursive_fast_locking()) {
     return false;
   }
   verify("pre-try_recursive_exit");
@@ -254,7 +254,7 @@ inline void OMCache::set_monitor(ObjectMonitor *monitor) {
 
   oop obj = monitor->object_peek();
   assert(obj != nullptr, "must be alive");
-  assert(monitor == LightweightSynchronizer::get_monitor_from_table(JavaThread::current(), obj), "must exist in table");
+  assert(monitor == ObjectSynchronizer::get_monitor_from_table(JavaThread::current(), obj), "must exist in table");
 
   OMCacheEntry to_insert = {obj, monitor};
 
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 6a99568ba44..ee7629ec6f5 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -43,7 +43,6 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/orderAccess.hpp"
@@ -51,6 +50,7 @@
 #include "runtime/safefetch.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/threads.hpp"
 #include "services/threadService.hpp"
 #include "utilities/debug.hpp"
@@ -415,7 +415,7 @@ bool ObjectMonitor::try_lock_with_contention_mark(JavaThread* locking_thread, Ob
 }
 
 void ObjectMonitor::enter_for_with_contention_mark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark) {
-  // Used by LightweightSynchronizer::inflate_and_enter in deoptimization path to enter for another thread.
+  // Used by ObjectSynchronizer::inflate_and_enter in deoptimization path to enter for another thread.
   // The monitor is private to or already owned by locking_thread which must be suspended.
   // So this code may only contend with deflation.
   assert(locking_thread == Thread::current() || locking_thread->is_obj_deopt_suspend(), "must be");
@@ -856,7 +856,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
   }
 
   if (UseObjectMonitorTable) {
-    LightweightSynchronizer::deflate_monitor(current, obj, this);
+    ObjectSynchronizer::deflate_monitor(current, obj, this);
   } else if (obj != nullptr) {
     // Install the old mark word if nobody else has already done it.
     install_displaced_markword_in_object(obj);
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 2da41786309..53b64f1e8a5 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -160,10 +160,10 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
   // Because of frequent access, the metadata field is at offset zero (0).
   // Enforced by the assert() in metadata_addr().
-  // * Lightweight locking with UseObjectMonitorTable:
+  // * Locking with UseObjectMonitorTable:
   //   Contains the _object's hashCode.
-  // * * Lightweight locking without UseObjectMonitorTable:
-  // Contains the displaced object header word - mark
+  // * Locking without UseObjectMonitorTable:
+  //   Contains the displaced object header word - mark
   volatile uintptr_t _metadata;     // metadata
   WeakHandle _object;               // backward object pointer
   // Separate _metadata and _owner on different cache lines since both can
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index eeb451235dc..efdc33cd441 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -74,22 +74,22 @@ inline volatile uintptr_t* ObjectMonitor::metadata_addr() {
 }
 
 inline markWord ObjectMonitor::header() const {
-  assert(!UseObjectMonitorTable, "Lightweight locking with OM table does not use header");
+  assert(!UseObjectMonitorTable, "Locking with OM table does not use header");
   return markWord(metadata());
 }
 
 inline void ObjectMonitor::set_header(markWord hdr) {
-  assert(!UseObjectMonitorTable, "Lightweight locking with OM table does not use header");
+  assert(!UseObjectMonitorTable, "Locking with OM table does not use header");
   set_metadata(hdr.value());
 }
 
 inline intptr_t ObjectMonitor::hash() const {
-  assert(UseObjectMonitorTable, "Only used by lightweight locking with OM table");
+  assert(UseObjectMonitorTable, "Only used when locking with OM table");
   return metadata();
 }
 
 inline void ObjectMonitor::set_hash(intptr_t hash) {
-  assert(UseObjectMonitorTable, "Only used by lightweight locking with OM table");
+  assert(UseObjectMonitorTable, "Only used when locking with OM table");
   set_metadata(hash);
 }
 
diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp
index 03168842e36..27958885a7f 100644
--- a/src/hotspot/share/runtime/serviceThread.cpp
+++ b/src/hotspot/share/runtime/serviceThread.cpp
@@ -36,10 +36,10 @@
 #include "prims/resolvedMethodTable.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/serviceThread.hpp"
+#include "runtime/synchronizer.hpp"
 #include "services/finalizerService.hpp"
 #include "services/gcNotifier.hpp"
 #include "services/lowMemoryDetector.hpp"
@@ -113,7 +113,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
               (cldg_cleanup_work = ClassLoaderDataGraph::should_clean_metaspaces_and_reset()) |
               (jvmti_tagmap_work = JvmtiTagMap::has_object_free_events_and_reset()) |
               (oopmap_cache_work = OopMapCache::has_cleanup_work()) |
-              (object_monitor_table_work = LightweightSynchronizer::needs_resize())
+              (object_monitor_table_work = ObjectSynchronizer::needs_resize())
              ) == 0) {
         // Wait until notified that there is some work to do or timer expires.
         // Some cleanup requests don't notify the ServiceThread so work needs to be done at periodic intervals.
@@ -173,7 +173,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
     }
 
     if (object_monitor_table_work) {
-      LightweightSynchronizer::resize_table(jt);
+      ObjectSynchronizer::resize_table(jt);
     }
   }
 }
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index a980838ed76..afa4558c7ae 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -72,7 +72,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/timerTrace.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "runtime/vframeArray.hpp"
@@ -2029,7 +2029,7 @@ void SharedRuntime::monitor_exit_helper(oopDesc* obj, BasicLock* lock, JavaThrea
   ExceptionMark em(current);
 
   // Check if C2_MacroAssembler::fast_unlock() or
-  // C2_MacroAssembler::fast_unlock_lightweight() unlocked an inflated
+  // C2_MacroAssembler::fast_unlock() unlocked an inflated
   // monitor before going slow path.  Since there is no safepoint
   // polling when calling into the VM, we can be sure that the monitor
   // hasn't been deallocated.
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 36e38b4dd35..fe95320c574 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -41,7 +41,6 @@
 #include "runtime/handshake.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/lightweightSynchronizer.hpp"
 #include "runtime/lockStack.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.inline.hpp"
@@ -51,13 +50,16 @@
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
+#include "runtime/timerTrace.hpp"
 #include "runtime/trimNativeHeap.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/align.hpp"
+#include "utilities/concurrentHashTable.inline.hpp"
+#include "utilities/concurrentHashTableTasks.inline.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/globalCounter.inline.hpp"
@@ -281,7 +283,7 @@ void ObjectSynchronizer::initialize() {
   // Start the timer for deflations, so it does not trigger immediately.
   _last_async_deflation_time_ns = os::javaTimeNanos();
 
-  LightweightSynchronizer::initialize();
+  ObjectSynchronizer::create_om_table();
 }
 
 MonitorList ObjectSynchronizer::_in_use_list;
@@ -421,17 +423,6 @@ void ObjectSynchronizer::handle_sync_on_value_based_class(Handle obj, JavaThread
   }
 }
 
-// -----------------------------------------------------------------------------
-// Monitor Enter/Exit
-
-void ObjectSynchronizer::enter_for(Handle obj, BasicLock* lock, JavaThread* locking_thread) {
-  // When called with locking_thread != Thread::current() some mechanism must synchronize
-  // the locking_thread with respect to the current thread. Currently only used when
-  // deoptimizing and re-locking locks. See Deoptimization::relock_objects
-  assert(locking_thread == Thread::current() || locking_thread->is_obj_deopt_suspend(), "must be");
-  return LightweightSynchronizer::enter_for(obj, lock, locking_thread);
-}
-
 // -----------------------------------------------------------------------------
 // JNI locks on java objects
 // NOTE: must use heavy weight monitor to handle jni monitor enter
@@ -451,7 +442,7 @@ void ObjectSynchronizer::jni_enter(Handle obj, JavaThread* current) {
   // we have lost the race to async deflation and we simply try again.
   while (true) {
     BasicLock lock;
-    if (LightweightSynchronizer::inflate_and_enter(obj(), &lock, inflate_cause_jni_enter, current, current) != nullptr) {
+    if (ObjectSynchronizer::inflate_and_enter(obj(), &lock, inflate_cause_jni_enter, current, current) != nullptr) {
       break;
     }
   }
@@ -463,7 +454,7 @@ void ObjectSynchronizer::jni_exit(oop obj, TRAPS) {
   JavaThread* current = THREAD;
 
   ObjectMonitor* monitor;
-  monitor = LightweightSynchronizer::inflate_locked_or_imse(obj, inflate_cause_jni_exit, CHECK);
+  monitor = ObjectSynchronizer::inflate_locked_or_imse(obj, inflate_cause_jni_exit, CHECK);
   // If this thread has locked the object, exit the monitor. We
   // intentionally do not use CHECK on check_owner because we must exit the
   // monitor even if an exception was already pending.
@@ -526,7 +517,7 @@ int ObjectSynchronizer::wait(Handle obj, jlong millis, TRAPS) {
   }
 
   ObjectMonitor* monitor;
-  monitor = LightweightSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_wait, CHECK_0);
+  monitor = ObjectSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_wait, CHECK_0);
 
   DTRACE_MONITOR_WAIT_PROBE(monitor, obj(), current, millis);
   monitor->wait(millis, true, THREAD); // Not CHECK as we need following code
@@ -543,7 +534,7 @@ void ObjectSynchronizer::waitUninterruptibly(Handle obj, jlong millis, TRAPS) {
   assert(millis >= 0, "timeout value is negative");
 
   ObjectMonitor* monitor;
-  monitor = LightweightSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_wait, CHECK);
+  monitor = ObjectSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_wait, CHECK);
   monitor->wait(millis, false, THREAD);
 }
 
@@ -556,7 +547,7 @@ void ObjectSynchronizer::notify(Handle obj, TRAPS) {
     // Not inflated so there can't be any waiters to notify.
     return;
   }
-  ObjectMonitor* monitor = LightweightSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_notify, CHECK);
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_notify, CHECK);
   monitor->notify(CHECK);
 }
 
@@ -570,7 +561,7 @@ void ObjectSynchronizer::notifyall(Handle obj, TRAPS) {
     return;
   }
 
-  ObjectMonitor* monitor = LightweightSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_notify, CHECK);
+  ObjectMonitor* monitor = ObjectSynchronizer::inflate_locked_or_imse(obj(), inflate_cause_notify, CHECK);
   monitor->notifyAll(CHECK);
 }
 
@@ -647,40 +638,15 @@ static intptr_t get_next_hash(Thread* current, oop obj) {
   return value;
 }
 
-static intptr_t install_hash_code(Thread* current, oop obj) {
-  assert(UseObjectMonitorTable, "must be");
-
-  markWord mark = obj->mark_acquire();
-  for (;;) {
-    intptr_t hash = mark.hash();
-    if (hash != 0) {
-      return hash;
-    }
-
-    hash = get_next_hash(current, obj);
-    const markWord old_mark = mark;
-    const markWord new_mark = old_mark.copy_set_hash(hash);
-
-    mark = obj->cas_set_mark(new_mark, old_mark);
-    if (old_mark == mark) {
-      return hash;
-    }
-  }
-}
-
 intptr_t ObjectSynchronizer::FastHashCode(Thread* current, oop obj) {
-  if (UseObjectMonitorTable) {
-    // Since the monitor isn't in the object header, the hash can simply be
-    // installed in the object header.
-    return install_hash_code(current, obj);
-  }
-
   while (true) {
     ObjectMonitor* monitor = nullptr;
     markWord temp, test;
     intptr_t hash;
     markWord mark = obj->mark_acquire();
-    if (mark.is_unlocked() || mark.is_fast_locked()) {
+    // If UseObjectMonitorTable is set the hash can simply be installed in the
+    // object header, since the monitor isn't in the object header.
+    if (UseObjectMonitorTable || !mark.has_monitor()) {
       hash = mark.hash();
       if (hash != 0) {                     // if it has a hash, just return it
         return hash;
@@ -699,7 +665,8 @@ intptr_t ObjectSynchronizer::FastHashCode(Thread* current, oop obj) {
       // installed the hash just before our attempt or inflation has
       // occurred or... so we fall thru to inflate the monitor for
       // stability and then install the hash.
-    } else if (mark.has_monitor()) {
+    } else {
+      assert(!mark.is_unlocked() && !mark.is_fast_locked(), "invariant");
       monitor = mark.monitor();
       temp = monitor->header();
       assert(temp.is_neutral(), "invariant: header=" INTPTR_FORMAT, temp.value());
@@ -1230,7 +1197,7 @@ size_t ObjectSynchronizer::deflate_idle_monitors() {
 #ifdef ASSERT
     if (UseObjectMonitorTable) {
       for (ObjectMonitor* monitor : delete_list) {
-        assert(!LightweightSynchronizer::contains_monitor(current, monitor), "Should have been removed");
+        assert(!ObjectSynchronizer::contains_monitor(current, monitor), "Should have been removed");
       }
     }
 #endif
@@ -1502,3 +1469,1219 @@ void ObjectSynchronizer::log_in_use_monitor_details(outputStream* out, bool log_
 
   out->flush();
 }
+
+// -----------------------------------------------------------------------------
+// ConcurrentHashTable storing links from objects to ObjectMonitors
+class ObjectMonitorTable : AllStatic {
+  struct Config {
+    using Value = ObjectMonitor*;
+    static uintx get_hash(Value const& value, bool* is_dead) {
+      return (uintx)value->hash();
+    }
+    static void* allocate_node(void* context, size_t size, Value const& value) {
+      ObjectMonitorTable::inc_items_count();
+      return AllocateHeap(size, mtObjectMonitor);
+    };
+    static void free_node(void* context, void* memory, Value const& value) {
+      ObjectMonitorTable::dec_items_count();
+      FreeHeap(memory);
+    }
+  };
+  using ConcurrentTable = ConcurrentHashTable<Config, mtObjectMonitor>;
+
+  static ConcurrentTable* _table;
+  static volatile size_t _items_count;
+  static size_t _table_size;
+  static volatile bool _resize;
+
+  class Lookup : public StackObj {
+    oop _obj;
+
+   public:
+    explicit Lookup(oop obj) : _obj(obj) {}
+
+    uintx get_hash() const {
+      uintx hash = _obj->mark().hash();
+      assert(hash != 0, "should have a hash");
+      return hash;
+    }
+
+    bool equals(ObjectMonitor** value) {
+      assert(*value != nullptr, "must be");
+      return (*value)->object_refers_to(_obj);
+    }
+
+    bool is_dead(ObjectMonitor** value) {
+      assert(*value != nullptr, "must be");
+      return false;
+    }
+  };
+
+  class LookupMonitor : public StackObj {
+    ObjectMonitor* _monitor;
+
+   public:
+    explicit LookupMonitor(ObjectMonitor* monitor) : _monitor(monitor) {}
+
+    uintx get_hash() const {
+      return _monitor->hash();
+    }
+
+    bool equals(ObjectMonitor** value) {
+      return (*value) == _monitor;
+    }
+
+    bool is_dead(ObjectMonitor** value) {
+      assert(*value != nullptr, "must be");
+      return (*value)->object_is_dead();
+    }
+  };
+
+  static void inc_items_count() {
+    AtomicAccess::inc(&_items_count, memory_order_relaxed);
+  }
+
+  static void dec_items_count() {
+    AtomicAccess::dec(&_items_count, memory_order_relaxed);
+  }
+
+  static double get_load_factor() {
+    size_t count = AtomicAccess::load(&_items_count);
+    return (double)count / (double)_table_size;
+  }
+
+  static size_t table_size(Thread* current = Thread::current()) {
+    return ((size_t)1) << _table->get_size_log2(current);
+  }
+
+  static size_t max_log_size() {
+    // TODO[OMTable]: Evaluate the max size.
+    // TODO[OMTable]: Need to fix init order to use Universe::heap()->max_capacity();
+    //                Using MaxHeapSize directly this early may be wrong, and there
+    //                are definitely rounding errors (alignment).
+    const size_t max_capacity = MaxHeapSize;
+    const size_t min_object_size = CollectedHeap::min_dummy_object_size() * HeapWordSize;
+    const size_t max_objects = max_capacity / MAX2(MinObjAlignmentInBytes, checked_cast<int>(min_object_size));
+    const size_t log_max_objects = log2i_graceful(max_objects);
+
+    return MAX2(MIN2<size_t>(SIZE_BIG_LOG2, log_max_objects), min_log_size());
+  }
+
+  static size_t min_log_size() {
+    // ~= log(AvgMonitorsPerThreadEstimate default)
+    return 10;
+  }
+
+  template<typename V>
+  static size_t clamp_log_size(V log_size) {
+    return MAX2(MIN2(log_size, checked_cast<V>(max_log_size())), checked_cast<V>(min_log_size()));
+  }
+
+  static size_t initial_log_size() {
+    const size_t estimate = log2i(MAX2(os::processor_count(), 1)) + log2i(MAX2(AvgMonitorsPerThreadEstimate, size_t(1)));
+    return clamp_log_size(estimate);
+  }
+
+  static size_t grow_hint () {
+    return ConcurrentTable::DEFAULT_GROW_HINT;
+  }
+
+ public:
+  static void create() {
+    _table = new ConcurrentTable(initial_log_size(), max_log_size(), grow_hint());
+    _items_count = 0;
+    _table_size = table_size();
+    _resize = false;
+  }
+
+  static void verify_monitor_get_result(oop obj, ObjectMonitor* monitor) {
+#ifdef ASSERT
+    if (SafepointSynchronize::is_at_safepoint()) {
+      bool has_monitor = obj->mark().has_monitor();
+      assert(has_monitor == (monitor != nullptr),
+          "Inconsistency between markWord and ObjectMonitorTable has_monitor: %s monitor: " PTR_FORMAT,
+          BOOL_TO_STR(has_monitor), p2i(monitor));
+    }
+#endif
+  }
+
+  static ObjectMonitor* monitor_get(Thread* current, oop obj) {
+    ObjectMonitor* result = nullptr;
+    Lookup lookup_f(obj);
+    auto found_f = [&](ObjectMonitor** found) {
+      assert((*found)->object_peek() == obj, "must be");
+      result = *found;
+    };
+    _table->get(current, lookup_f, found_f);
+    verify_monitor_get_result(obj, result);
+    return result;
+  }
+
+  static void try_notify_grow() {
+    if (!_table->is_max_size_reached() && !AtomicAccess::load(&_resize)) {
+      AtomicAccess::store(&_resize, true);
+      if (Service_lock->try_lock()) {
+        Service_lock->notify();
+        Service_lock->unlock();
+      }
+    }
+  }
+
+  static bool should_shrink() {
+    // Not implemented;
+    return false;
+  }
+
+  static constexpr double GROW_LOAD_FACTOR = 0.75;
+
+  static bool should_grow() {
+    return get_load_factor() > GROW_LOAD_FACTOR && !_table->is_max_size_reached();
+  }
+
+  static bool should_resize() {
+    return should_grow() || should_shrink() || AtomicAccess::load(&_resize);
+  }
+
+  template<typename Task, typename... Args>
+  static bool run_task(JavaThread* current, Task& task, const char* task_name, Args&... args) {
+    if (task.prepare(current)) {
+      log_trace(monitortable)("Started to %s", task_name);
+      TraceTime timer(task_name, TRACETIME_LOG(Debug, monitortable, perf));
+      while (task.do_task(current, args...)) {
+        task.pause(current);
+        {
+          ThreadBlockInVM tbivm(current);
+        }
+        task.cont(current);
+      }
+      task.done(current);
+      return true;
+    }
+    return false;
+  }
+
+  static bool grow(JavaThread* current) {
+    ConcurrentTable::GrowTask grow_task(_table);
+    if (run_task(current, grow_task, "Grow")) {
+      _table_size = table_size(current);
+      log_info(monitortable)("Grown to size: %zu", _table_size);
+      return true;
+    }
+    return false;
+  }
+
+  static bool clean(JavaThread* current) {
+    ConcurrentTable::BulkDeleteTask clean_task(_table);
+    auto is_dead = [&](ObjectMonitor** monitor) {
+      return (*monitor)->object_is_dead();
+    };
+    auto do_nothing = [&](ObjectMonitor** monitor) {};
+    NativeHeapTrimmer::SuspendMark sm("ObjectMonitorTable");
+    return run_task(current, clean_task, "Clean", is_dead, do_nothing);
+  }
+
+  static bool resize(JavaThread* current) {
+    LogTarget(Info, monitortable) lt;
+    bool success = false;
+
+    if (should_grow()) {
+      lt.print("Start growing with load factor %f", get_load_factor());
+      success = grow(current);
+    } else {
+      if (!_table->is_max_size_reached() && AtomicAccess::load(&_resize)) {
+        lt.print("WARNING: Getting resize hints with load factor %f", get_load_factor());
+      }
+      lt.print("Start cleaning with load factor %f", get_load_factor());
+      success = clean(current);
+    }
+
+    AtomicAccess::store(&_resize, false);
+
+    return success;
+  }
+
+  static ObjectMonitor* monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj) {
+    // Enter the monitor into the concurrent hashtable.
+    ObjectMonitor* result = monitor;
+    Lookup lookup_f(obj);
+    auto found_f = [&](ObjectMonitor** found) {
+      assert((*found)->object_peek() == obj, "must be");
+      result = *found;
+    };
+    bool grow;
+    _table->insert_get(current, lookup_f, monitor, found_f, &grow);
+    verify_monitor_get_result(obj, result);
+    if (grow) {
+      try_notify_grow();
+    }
+    return result;
+  }
+
+  static bool remove_monitor_entry(Thread* current, ObjectMonitor* monitor) {
+    LookupMonitor lookup_f(monitor);
+    return _table->remove(current, lookup_f);
+  }
+
+  static bool contains_monitor(Thread* current, ObjectMonitor* monitor) {
+    LookupMonitor lookup_f(monitor);
+    bool result = false;
+    auto found_f = [&](ObjectMonitor** found) {
+      result = true;
+    };
+    _table->get(current, lookup_f, found_f);
+    return result;
+  }
+
+  static void print_on(outputStream* st) {
+    auto printer = [&] (ObjectMonitor** entry) {
+       ObjectMonitor* om = *entry;
+       oop obj = om->object_peek();
+       st->print("monitor=" PTR_FORMAT ", ", p2i(om));
+       st->print("object=" PTR_FORMAT, p2i(obj));
+       assert(obj->mark().hash() == om->hash(), "hash must match");
+       st->cr();
+       return true;
+    };
+    if (SafepointSynchronize::is_at_safepoint()) {
+      _table->do_safepoint_scan(printer);
+    } else {
+      _table->do_scan(Thread::current(), printer);
+    }
+  }
+};
+
+ObjectMonitorTable::ConcurrentTable* ObjectMonitorTable::_table = nullptr;
+volatile size_t ObjectMonitorTable::_items_count = 0;
+size_t ObjectMonitorTable::_table_size = 0;
+volatile bool ObjectMonitorTable::_resize = false;
+
+ObjectMonitor* ObjectSynchronizer::get_or_insert_monitor_from_table(oop object, JavaThread* current, bool* inserted) {
+  ObjectMonitor* monitor = get_monitor_from_table(current, object);
+  if (monitor != nullptr) {
+    *inserted = false;
+    return monitor;
+  }
+
+  ObjectMonitor* alloced_monitor = new ObjectMonitor(object);
+  alloced_monitor->set_anonymous_owner();
+
+  // Try insert monitor
+  monitor = add_monitor(current, alloced_monitor, object);
+
+  *inserted = alloced_monitor == monitor;
+  if (!*inserted) {
+    delete alloced_monitor;
+  }
+
+  return monitor;
+}
+
+static void log_inflate(Thread* current, oop object, ObjectSynchronizer::InflateCause cause) {
+  if (log_is_enabled(Trace, monitorinflation)) {
+    ResourceMark rm(current);
+    log_trace(monitorinflation)("inflate: object=" INTPTR_FORMAT ", mark="
+                                INTPTR_FORMAT ", type='%s' cause=%s", p2i(object),
+                                object->mark().value(), object->klass()->external_name(),
+                                ObjectSynchronizer::inflate_cause_name(cause));
+  }
+}
+
+static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
+                                       const oop obj,
+                                       ObjectSynchronizer::InflateCause cause) {
+  assert(event != nullptr, "invariant");
+  const Klass* monitor_klass = obj->klass();
+  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
+    return;
+  }
+  event->set_monitorClass(monitor_klass);
+  event->set_address((uintptr_t)(void*)obj);
+  event->set_cause((u1)cause);
+  event->commit();
+}
+
+ObjectMonitor* ObjectSynchronizer::get_or_insert_monitor(oop object, JavaThread* current, ObjectSynchronizer::InflateCause cause) {
+  assert(UseObjectMonitorTable, "must be");
+
+  EventJavaMonitorInflate event;
+
+  bool inserted;
+  ObjectMonitor* monitor = get_or_insert_monitor_from_table(object, current, &inserted);
+
+  if (inserted) {
+    log_inflate(current, object, cause);
+    if (event.should_commit()) {
+      post_monitor_inflate_event(&event, object, cause);
+    }
+
+    // The monitor has an anonymous owner so it is safe from async deflation.
+    ObjectSynchronizer::_in_use_list.add(monitor);
+  }
+
+  return monitor;
+}
+
+// Add the hashcode to the monitor to match the object and put it in the hashtable.
+ObjectMonitor* ObjectSynchronizer::add_monitor(JavaThread* current, ObjectMonitor* monitor, oop obj) {
+  assert(UseObjectMonitorTable, "must be");
+  assert(obj == monitor->object(), "must be");
+
+  intptr_t hash = obj->mark().hash();
+  assert(hash != 0, "must be set when claiming the object monitor");
+  monitor->set_hash(hash);
+
+  return ObjectMonitorTable::monitor_put_get(current, monitor, obj);
+}
+
+bool ObjectSynchronizer::remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj) {
+  assert(UseObjectMonitorTable, "must be");
+  assert(monitor->object_peek() == obj, "must be, cleared objects are removed by is_dead");
+
+  return ObjectMonitorTable::remove_monitor_entry(current, monitor);
+}
+
+void ObjectSynchronizer::deflate_mark_word(oop obj) {
+  assert(UseObjectMonitorTable, "must be");
+
+  markWord mark = obj->mark_acquire();
+  assert(!mark.has_no_hash(), "obj with inflated monitor must have had a hash");
+
+  while (mark.has_monitor()) {
+    const markWord new_mark = mark.clear_lock_bits().set_unlocked();
+    mark = obj->cas_set_mark(new_mark, mark);
+  }
+}
+
+void ObjectSynchronizer::create_om_table() {
+  if (!UseObjectMonitorTable) {
+    return;
+  }
+  ObjectMonitorTable::create();
+}
+
+bool ObjectSynchronizer::needs_resize() {
+  if (!UseObjectMonitorTable) {
+    return false;
+  }
+  return ObjectMonitorTable::should_resize();
+}
+
+bool ObjectSynchronizer::resize_table(JavaThread* current) {
+  if (!UseObjectMonitorTable) {
+    return true;
+  }
+  return ObjectMonitorTable::resize(current);
+}
+
+class ObjectSynchronizer::LockStackInflateContendedLocks : private OopClosure {
+ private:
+  oop _contended_oops[LockStack::CAPACITY];
+  int _length;
+
+  void do_oop(oop* o) final {
+    oop obj = *o;
+    if (obj->mark_acquire().has_monitor()) {
+      if (_length > 0 && _contended_oops[_length - 1] == obj) {
+        // Recursive
+        return;
+      }
+      _contended_oops[_length++] = obj;
+    }
+  }
+
+  void do_oop(narrowOop* o) final {
+    ShouldNotReachHere();
+  }
+
+ public:
+  LockStackInflateContendedLocks() :
+    _contended_oops(),
+    _length(0) {};
+
+  void inflate(JavaThread* current) {
+    assert(current == JavaThread::current(), "must be");
+    current->lock_stack().oops_do(this);
+    for (int i = 0; i < _length; i++) {
+      ObjectSynchronizer::
+        inflate_fast_locked_object(_contended_oops[i], ObjectSynchronizer::inflate_cause_vm_internal, current, current);
+    }
+  }
+};
+
+void ObjectSynchronizer::ensure_lock_stack_space(JavaThread* current) {
+  assert(current == JavaThread::current(), "must be");
+  LockStack& lock_stack = current->lock_stack();
+
+  // Make room on lock_stack
+  if (lock_stack.is_full()) {
+    // Inflate contended objects
+    LockStackInflateContendedLocks().inflate(current);
+    if (lock_stack.is_full()) {
+      // Inflate the oldest object
+      inflate_fast_locked_object(lock_stack.bottom(), ObjectSynchronizer::inflate_cause_vm_internal, current, current);
+    }
+  }
+}
+
+class ObjectSynchronizer::CacheSetter : StackObj {
+  JavaThread* const _thread;
+  BasicLock* const _lock;
+  ObjectMonitor* _monitor;
+
+  NONCOPYABLE(CacheSetter);
+
+ public:
+  CacheSetter(JavaThread* thread, BasicLock* lock) :
+    _thread(thread),
+    _lock(lock),
+    _monitor(nullptr) {}
+
+  ~CacheSetter() {
+    // Only use the cache if using the table.
+    if (UseObjectMonitorTable) {
+      if (_monitor != nullptr) {
+        // If the monitor is already in the BasicLock cache then it is most
+        // likely in the thread cache, do not set it again to avoid reordering.
+        if (_monitor != _lock->object_monitor_cache()) {
+          _thread->om_set_monitor_cache(_monitor);
+          _lock->set_object_monitor_cache(_monitor);
+        }
+      } else {
+        _lock->clear_object_monitor_cache();
+      }
+    }
+  }
+
+  void set_monitor(ObjectMonitor* monitor) {
+    assert(_monitor == nullptr, "only set once");
+    _monitor = monitor;
+  }
+
+};
+
+// Reads first from the BasicLock cache then from the OMCache in the current thread.
+// C2 fast-path may have put the monitor in the cache in the BasicLock.
+inline static ObjectMonitor* read_caches(JavaThread* current, BasicLock* lock, oop object) {
+  ObjectMonitor* monitor = lock->object_monitor_cache();
+  if (monitor == nullptr) {
+    monitor = current->om_get_from_monitor_cache(object);
+  }
+  return monitor;
+}
+
+class ObjectSynchronizer::VerifyThreadState {
+  bool _no_safepoint;
+
+ public:
+  VerifyThreadState(JavaThread* locking_thread, JavaThread* current) : _no_safepoint(locking_thread != current) {
+    assert(current == Thread::current(), "must be");
+    assert(locking_thread == current || locking_thread->is_obj_deopt_suspend(), "locking_thread may not run concurrently");
+    if (_no_safepoint) {
+      DEBUG_ONLY(JavaThread::current()->inc_no_safepoint_count();)
+    }
+  }
+  ~VerifyThreadState() {
+    if (_no_safepoint){
+      DEBUG_ONLY(JavaThread::current()->dec_no_safepoint_count();)
+    }
+  }
+};
+
+inline bool ObjectSynchronizer::fast_lock_try_enter(oop obj, LockStack& lock_stack, JavaThread* current) {
+  markWord mark = obj->mark();
+  while (mark.is_unlocked()) {
+    ensure_lock_stack_space(current);
+    assert(!lock_stack.is_full(), "must have made room on the lock stack");
+    assert(!lock_stack.contains(obj), "thread must not already hold the lock");
+    // Try to swing into 'fast-locked' state.
+    markWord locked_mark = mark.set_fast_locked();
+    markWord old_mark = mark;
+    mark = obj->cas_set_mark(locked_mark, old_mark);
+    if (old_mark == mark) {
+      // Successfully fast-locked, push object to lock-stack and return.
+      lock_stack.push(obj);
+      return true;
+    }
+  }
+  return false;
+}
+
+bool ObjectSynchronizer::fast_lock_spin_enter(oop obj, LockStack& lock_stack, JavaThread* current, bool observed_deflation) {
+  assert(UseObjectMonitorTable, "must be");
+  // Will spin with exponential backoff with an accumulative O(2^spin_limit) spins.
+  const int log_spin_limit = os::is_MP() ? FastLockingSpins : 1;
+  const int log_min_safepoint_check_interval = 10;
+
+  markWord mark = obj->mark();
+  const auto should_spin = [&]() {
+    if (!mark.has_monitor()) {
+      // Spin while not inflated.
+      return true;
+    } else if (observed_deflation) {
+      // Spin while monitor is being deflated.
+      ObjectMonitor* monitor = ObjectSynchronizer::read_monitor(current, obj, mark);
+      return monitor == nullptr || monitor->is_being_async_deflated();
+    }
+    // Else stop spinning.
+    return false;
+  };
+  // Always attempt to lock once even when safepoint synchronizing.
+  bool should_process = false;
+  for (int i = 0; should_spin() && !should_process && i < log_spin_limit; i++) {
+    // Spin with exponential backoff.
+    const int total_spin_count = 1 << i;
+    const int inner_spin_count = MIN2(1 << log_min_safepoint_check_interval, total_spin_count);
+    const int outer_spin_count = total_spin_count / inner_spin_count;
+    for (int outer = 0; outer < outer_spin_count; outer++) {
+      should_process = SafepointMechanism::should_process(current);
+      if (should_process) {
+        // Stop spinning for safepoint.
+        break;
+      }
+      for (int inner = 1; inner < inner_spin_count; inner++) {
+        SpinPause();
+      }
+    }
+
+    if (fast_lock_try_enter(obj, lock_stack, current)) return true;
+  }
+  return false;
+}
+
+void ObjectSynchronizer::enter_for(Handle obj, BasicLock* lock, JavaThread* locking_thread) {
+  // When called with locking_thread != Thread::current() some mechanism must synchronize
+  // the locking_thread with respect to the current thread. Currently only used when
+  // deoptimizing and re-locking locks. See Deoptimization::relock_objects
+  assert(locking_thread == Thread::current() || locking_thread->is_obj_deopt_suspend(), "must be");
+
+  assert(!UseObjectMonitorTable || lock->object_monitor_cache() == nullptr, "must be cleared");
+  JavaThread* current = JavaThread::current();
+  VerifyThreadState vts(locking_thread, current);
+
+  if (obj->klass()->is_value_based()) {
+    ObjectSynchronizer::handle_sync_on_value_based_class(obj, locking_thread);
+  }
+
+  LockStack& lock_stack = locking_thread->lock_stack();
+
+  ObjectMonitor* monitor = nullptr;
+  if (lock_stack.contains(obj())) {
+    monitor = inflate_fast_locked_object(obj(), ObjectSynchronizer::inflate_cause_monitor_enter, locking_thread, current);
+    bool entered = monitor->enter_for(locking_thread);
+    assert(entered, "recursive ObjectMonitor::enter_for must succeed");
+  } else {
+    do {
+      // It is assumed that enter_for must enter on an object without contention.
+      monitor = inflate_and_enter(obj(), lock, ObjectSynchronizer::inflate_cause_monitor_enter, locking_thread, current);
+      // But there may still be a race with deflation.
+    } while (monitor == nullptr);
+  }
+
+  assert(monitor != nullptr, "ObjectSynchronizer::enter_for must succeed");
+  assert(!UseObjectMonitorTable || lock->object_monitor_cache() == nullptr, "unused. already cleared");
+}
+
+void ObjectSynchronizer::enter(Handle obj, BasicLock* lock, JavaThread* current) {
+  assert(current == JavaThread::current(), "must be");
+
+  if (obj->klass()->is_value_based()) {
+    ObjectSynchronizer::handle_sync_on_value_based_class(obj, current);
+  }
+
+  CacheSetter cache_setter(current, lock);
+
+  // Used when deflation is observed. Progress here requires progress
+  // from the deflator. After observing that the deflator is not
+  // making progress (after two yields), switch to sleeping.
+  SpinYield spin_yield(0, 2);
+  bool observed_deflation = false;
+
+  LockStack& lock_stack = current->lock_stack();
+
+  if (!lock_stack.is_full() && lock_stack.try_recursive_enter(obj())) {
+    // Recursively fast locked
+    return;
+  }
+
+  if (lock_stack.contains(obj())) {
+    ObjectMonitor* monitor = inflate_fast_locked_object(obj(), ObjectSynchronizer::inflate_cause_monitor_enter, current, current);
+    bool entered = monitor->enter(current);
+    assert(entered, "recursive ObjectMonitor::enter must succeed");
+    cache_setter.set_monitor(monitor);
+    return;
+  }
+
+  while (true) {
+    // Fast-locking does not use the 'lock' argument.
+    // Fast-lock spinning to avoid inflating for short critical sections.
+    // The goal is to only inflate when the extra cost of using ObjectMonitors
+    // is worth it.
+    // If deflation has been observed we also spin while deflation is ongoing.
+    if (fast_lock_try_enter(obj(), lock_stack, current)) {
+      return;
+    } else if (UseObjectMonitorTable && fast_lock_spin_enter(obj(), lock_stack, current, observed_deflation)) {
+      return;
+    }
+
+    if (observed_deflation) {
+      spin_yield.wait();
+    }
+
+    ObjectMonitor* monitor = inflate_and_enter(obj(), lock, ObjectSynchronizer::inflate_cause_monitor_enter, current, current);
+    if (monitor != nullptr) {
+      cache_setter.set_monitor(monitor);
+      return;
+    }
+
+    // If inflate_and_enter returns nullptr it is because a deflated monitor
+    // was encountered. Fallback to fast locking. The deflater is responsible
+    // for clearing out the monitor and transitioning the markWord back to
+    // fast locking.
+    observed_deflation = true;
+  }
+}
+
+void ObjectSynchronizer::exit(oop object, BasicLock* lock, JavaThread* current) {
+  assert(current == Thread::current(), "must be");
+
+  markWord mark = object->mark();
+  assert(!mark.is_unlocked(), "must be");
+
+  LockStack& lock_stack = current->lock_stack();
+  if (mark.is_fast_locked()) {
+    if (lock_stack.try_recursive_exit(object)) {
+      // This is a recursive exit which succeeded
+      return;
+    }
+    if (lock_stack.is_recursive(object)) {
+      // Must inflate recursive locks if try_recursive_exit fails
+      // This happens for un-structured unlocks, could potentially
+      // fix try_recursive_exit to handle these.
+      inflate_fast_locked_object(object, ObjectSynchronizer::inflate_cause_vm_internal, current, current);
+    }
+  }
+
+  while (mark.is_fast_locked()) {
+    markWord unlocked_mark = mark.set_unlocked();
+    markWord old_mark = mark;
+    mark = object->cas_set_mark(unlocked_mark, old_mark);
+    if (old_mark == mark) {
+      // CAS successful, remove from lock_stack
+      size_t recursion = lock_stack.remove(object) - 1;
+      assert(recursion == 0, "Should not have unlocked here");
+      return;
+    }
+  }
+
+  assert(mark.has_monitor(), "must be");
+  // The monitor exists
+  ObjectMonitor* monitor;
+  if (UseObjectMonitorTable) {
+    monitor = read_caches(current, lock, object);
+    if (monitor == nullptr) {
+      monitor = get_monitor_from_table(current, object);
+    }
+  } else {
+    monitor = ObjectSynchronizer::read_monitor(mark);
+  }
+  if (monitor->has_anonymous_owner()) {
+    assert(current->lock_stack().contains(object), "current must have object on its lock stack");
+    monitor->set_owner_from_anonymous(current);
+    monitor->set_recursions(current->lock_stack().remove(object) - 1);
+  }
+
+  monitor->exit(current);
+}
+
+// ObjectSynchronizer::inflate_locked_or_imse is used to get an
+// inflated ObjectMonitor* from contexts which require that, such as
+// notify/wait and jni_exit. Fast locking keeps the invariant that it
+// only inflates if it is already locked by the current thread or the current
+// thread is in the process of entering. To maintain this invariant we need to
+// throw a java.lang.IllegalMonitorStateException before inflating if the
+// current thread is not the owner.
+ObjectMonitor* ObjectSynchronizer::inflate_locked_or_imse(oop obj, ObjectSynchronizer::InflateCause cause, TRAPS) {
+  JavaThread* current = THREAD;
+
+  for (;;) {
+    markWord mark = obj->mark_acquire();
+    if (mark.is_unlocked()) {
+      // No lock, IMSE.
+      THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
+                 "current thread is not owner", nullptr);
+    }
+
+    if (mark.is_fast_locked()) {
+      if (!current->lock_stack().contains(obj)) {
+        // Fast locked by other thread, IMSE.
+        THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
+                   "current thread is not owner", nullptr);
+      } else {
+        // Current thread owns the lock, must inflate
+        return inflate_fast_locked_object(obj, cause, current, current);
+      }
+    }
+
+    assert(mark.has_monitor(), "must be");
+    ObjectMonitor* monitor = ObjectSynchronizer::read_monitor(current, obj, mark);
+    if (monitor != nullptr) {
+      if (monitor->has_anonymous_owner()) {
+        LockStack& lock_stack = current->lock_stack();
+        if (lock_stack.contains(obj)) {
+          // Current thread owns the lock but someone else inflated it.
+          // Fix owner and pop lock stack.
+          monitor->set_owner_from_anonymous(current);
+          monitor->set_recursions(lock_stack.remove(obj) - 1);
+        } else {
+          // Fast locked (and inflated) by other thread, or deflation in progress, IMSE.
+          THROW_MSG_(vmSymbols::java_lang_IllegalMonitorStateException(),
+                     "current thread is not owner", nullptr);
+        }
+      }
+      return monitor;
+    }
+  }
+}
+
+ObjectMonitor* ObjectSynchronizer::inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, Thread* current) {
+
+  // The JavaThread* locking parameter requires that the locking_thread == JavaThread::current,
+  // or is suspended throughout the call by some other mechanism.
+  // Even with fast locking the thread might be nullptr when called from a non
+  // JavaThread. (As may still be the case from FastHashCode). However it is only
+  // important for the correctness of the fast locking algorithm that the thread
+  // is set when called from ObjectSynchronizer::enter from the owning thread,
+  // ObjectSynchronizer::enter_for from any thread, or ObjectSynchronizer::exit.
+  EventJavaMonitorInflate event;
+
+  for (;;) {
+    const markWord mark = object->mark_acquire();
+
+    // The mark can be in one of the following states:
+    // *  inflated     - Just return if using stack-locking.
+    //                   If using fast-locking and the ObjectMonitor owner
+    //                   is anonymous and the locking_thread owns the
+    //                   object lock, then we make the locking_thread
+    //                   the ObjectMonitor owner and remove the lock from
+    //                   the locking_thread's lock stack.
+    // *  fast-locked  - Coerce it to inflated from fast-locked.
+    // *  unlocked     - Aggressively inflate the object.
+
+    // CASE: inflated
+    if (mark.has_monitor()) {
+      ObjectMonitor* inf = mark.monitor();
+      markWord dmw = inf->header();
+      assert(dmw.is_neutral(), "invariant: header=" INTPTR_FORMAT, dmw.value());
+      if (inf->has_anonymous_owner() &&
+          locking_thread != nullptr && locking_thread->lock_stack().contains(object)) {
+        inf->set_owner_from_anonymous(locking_thread);
+        size_t removed = locking_thread->lock_stack().remove(object);
+        inf->set_recursions(removed - 1);
+      }
+      return inf;
+    }
+
+    // CASE: fast-locked
+    // Could be fast-locked either by the locking_thread or by some other thread.
+    //
+    // Note that we allocate the ObjectMonitor speculatively, _before_
+    // attempting to set the object's mark to the new ObjectMonitor. If
+    // the locking_thread owns the monitor, then we set the ObjectMonitor's
+    // owner to the locking_thread. Otherwise, we set the ObjectMonitor's owner
+    // to anonymous. If we lose the race to set the object's mark to the
+    // new ObjectMonitor, then we just delete it and loop around again.
+    //
+    if (mark.is_fast_locked()) {
+      ObjectMonitor* monitor = new ObjectMonitor(object);
+      monitor->set_header(mark.set_unlocked());
+      bool own = locking_thread != nullptr && locking_thread->lock_stack().contains(object);
+      if (own) {
+        // Owned by locking_thread.
+        monitor->set_owner(locking_thread);
+      } else {
+        // Owned by somebody else.
+        monitor->set_anonymous_owner();
+      }
+      markWord monitor_mark = markWord::encode(monitor);
+      markWord old_mark = object->cas_set_mark(monitor_mark, mark);
+      if (old_mark == mark) {
+        // Success! Return inflated monitor.
+        if (own) {
+          size_t removed = locking_thread->lock_stack().remove(object);
+          monitor->set_recursions(removed - 1);
+        }
+        // Once the ObjectMonitor is configured and object is associated
+        // with the ObjectMonitor, it is safe to allow async deflation:
+        ObjectSynchronizer::_in_use_list.add(monitor);
+
+        log_inflate(current, object, cause);
+        if (event.should_commit()) {
+          post_monitor_inflate_event(&event, object, cause);
+        }
+        return monitor;
+      } else {
+        delete monitor;
+        continue;  // Interference -- just retry
+      }
+    }
+
+    // CASE: unlocked
+    // TODO-FIXME: for entry we currently inflate and then try to CAS _owner.
+    // If we know we're inflating for entry it's better to inflate by swinging a
+    // pre-locked ObjectMonitor pointer into the object header.   A successful
+    // CAS inflates the object *and* confers ownership to the inflating thread.
+    // In the current implementation we use a 2-step mechanism where we CAS()
+    // to inflate and then CAS() again to try to swing _owner from null to current.
+    // An inflateTry() method that we could call from enter() would be useful.
+
+    assert(mark.is_unlocked(), "invariant: header=" INTPTR_FORMAT, mark.value());
+    ObjectMonitor* m = new ObjectMonitor(object);
+    // prepare m for installation - set monitor to initial state
+    m->set_header(mark);
+
+    if (object->cas_set_mark(markWord::encode(m), mark) != mark) {
+      delete m;
+      m = nullptr;
+      continue;
+      // interference - the markword changed - just retry.
+      // The state-transitions are one-way, so there's no chance of
+      // live-lock -- "Inflated" is an absorbing state.
+    }
+
+    // Once the ObjectMonitor is configured and object is associated
+    // with the ObjectMonitor, it is safe to allow async deflation:
+    ObjectSynchronizer::_in_use_list.add(m);
+
+    log_inflate(current, object, cause);
+    if (event.should_commit()) {
+      post_monitor_inflate_event(&event, object, cause);
+    }
+    return m;
+  }
+}
+
+ObjectMonitor* ObjectSynchronizer::inflate_fast_locked_object(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current) {
+  VerifyThreadState vts(locking_thread, current);
+  assert(locking_thread->lock_stack().contains(object), "locking_thread must have object on its lock stack");
+
+  ObjectMonitor* monitor;
+
+  if (!UseObjectMonitorTable) {
+    return inflate_into_object_header(object, cause, locking_thread, current);
+  }
+
+  // Inflating requires a hash code
+  ObjectSynchronizer::FastHashCode(current, object);
+
+  markWord mark = object->mark_acquire();
+  assert(!mark.is_unlocked(), "Cannot be unlocked");
+
+  for (;;) {
+    // Fetch the monitor from the table
+    monitor = get_or_insert_monitor(object, current, cause);
+
+    // ObjectMonitors are always inserted as anonymously owned, this thread is
+    // the current holder of the monitor. So unless the entry is stale and
+    // contains a deflating monitor it must be anonymously owned.
+    if (monitor->has_anonymous_owner()) {
+      // The monitor must be anonymously owned if it was added
+      assert(monitor == get_monitor_from_table(current, object), "The monitor must be found");
+      // New fresh monitor
+      break;
+    }
+
+    // If the monitor was not anonymously owned then we got a deflating monitor
+    // from the table. We need to let the deflator make progress and remove this
+    // entry before we are allowed to add a new one.
+    os::naked_yield();
+    assert(monitor->is_being_async_deflated(), "Should be the reason");
+  }
+
+  // Set the mark word; loop to handle concurrent updates to other parts of the mark word
+  while (mark.is_fast_locked()) {
+    mark = object->cas_set_mark(mark.set_has_monitor(), mark);
+  }
+
+  // Indicate that the monitor now has a known owner
+  monitor->set_owner_from_anonymous(locking_thread);
+
+  // Remove the entry from the thread's lock stack
+  monitor->set_recursions(locking_thread->lock_stack().remove(object) - 1);
+
+  if (locking_thread == current) {
+    // Only change the thread local state of the current thread.
+    locking_thread->om_set_monitor_cache(monitor);
+  }
+
+  return monitor;
+}
+
+ObjectMonitor* ObjectSynchronizer::inflate_and_enter(oop object, BasicLock* lock, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current) {
+  VerifyThreadState vts(locking_thread, current);
+
+  // Note: In some paths (deoptimization) the 'current' thread inflates and
+  // enters the lock on behalf of the 'locking_thread' thread.
+
+  ObjectMonitor* monitor = nullptr;
+
+  if (!UseObjectMonitorTable) {
+    // Do the old inflate and enter.
+    monitor = inflate_into_object_header(object, cause, locking_thread, current);
+
+    bool entered;
+    if (locking_thread == current) {
+      entered = monitor->enter(locking_thread);
+    } else {
+      entered = monitor->enter_for(locking_thread);
+    }
+
+    // enter returns false for deflation found.
+    return entered ? monitor : nullptr;
+  }
+
+  NoSafepointVerifier nsv;
+
+  // Try to get the monitor from the thread-local cache.
+  // There's no need to use the cache if we are locking
+  // on behalf of another thread.
+  if (current == locking_thread) {
+    monitor = read_caches(current, lock, object);
+  }
+
+  // Get or create the monitor
+  if (monitor == nullptr) {
+    // Lightweight monitors require that hash codes are installed first
+    ObjectSynchronizer::FastHashCode(locking_thread, object);
+    monitor = get_or_insert_monitor(object, current, cause);
+  }
+
+  if (monitor->try_enter(locking_thread)) {
+    return monitor;
+  }
+
+  // Holds is_being_async_deflated() stable throughout this function.
+  ObjectMonitorContentionMark contention_mark(monitor);
+
+  /// First handle the case where the monitor from the table is deflated
+  if (monitor->is_being_async_deflated()) {
+    // The MonitorDeflation thread is deflating the monitor. The locking thread
+    // must spin until further progress has been made.
+
+    // Clear the BasicLock cache as it may contain this monitor.
+    lock->clear_object_monitor_cache();
+
+    const markWord mark = object->mark_acquire();
+
+    if (mark.has_monitor()) {
+      // Waiting on the deflation thread to remove the deflated monitor from the table.
+      os::naked_yield();
+
+    } else if (mark.is_fast_locked()) {
+      // Some other thread managed to fast-lock the lock, or this is a
+      // recursive lock from the same thread; yield for the deflation
+      // thread to remove the deflated monitor from the table.
+      os::naked_yield();
+
+    } else {
+      assert(mark.is_unlocked(), "Implied");
+      // Retry immediately
+    }
+
+    // Retry
+    return nullptr;
+  }
+
+  for (;;) {
+    const markWord mark = object->mark_acquire();
+    // The mark can be in one of the following states:
+    // *  inflated     - If the ObjectMonitor owner is anonymous
+    //                   and the locking_thread owns the object
+    //                   lock, then we make the locking_thread
+    //                   the ObjectMonitor owner and remove the
+    //                   lock from the locking_thread's lock stack.
+    // *  fast-locked  - Coerce it to inflated from fast-locked.
+    // *  neutral      - Inflate the object. Successful CAS is locked
+
+    // CASE: inflated
+    if (mark.has_monitor()) {
+      LockStack& lock_stack = locking_thread->lock_stack();
+      if (monitor->has_anonymous_owner() && lock_stack.contains(object)) {
+        // The lock is fast-locked by the locking thread,
+        // convert it to a held monitor with a known owner.
+        monitor->set_owner_from_anonymous(locking_thread);
+        monitor->set_recursions(lock_stack.remove(object) - 1);
+      }
+
+      break; // Success
+    }
+
+    // CASE: fast-locked
+    // Could be fast-locked either by locking_thread or by some other thread.
+    //
+    if (mark.is_fast_locked()) {
+      markWord old_mark = object->cas_set_mark(mark.set_has_monitor(), mark);
+      if (old_mark != mark) {
+        // CAS failed
+        continue;
+      }
+
+      // Success! Return inflated monitor.
+      LockStack& lock_stack = locking_thread->lock_stack();
+      if (lock_stack.contains(object)) {
+        // The lock is fast-locked by the locking thread,
+        // convert it to a held monitor with a known owner.
+        monitor->set_owner_from_anonymous(locking_thread);
+        monitor->set_recursions(lock_stack.remove(object) - 1);
+      }
+
+      break; // Success
+    }
+
+    // CASE: neutral (unlocked)
+
+    // Catch if the object's header is not neutral (not locked and
+    // not marked is what we care about here).
+    assert(mark.is_neutral(), "invariant: header=" INTPTR_FORMAT, mark.value());
+    markWord old_mark = object->cas_set_mark(mark.set_has_monitor(), mark);
+    if (old_mark != mark) {
+      // CAS failed
+      continue;
+    }
+
+    // Transitioned from unlocked to monitor means locking_thread owns the lock.
+    monitor->set_owner_from_anonymous(locking_thread);
+
+    return monitor;
+  }
+
+  if (current == locking_thread) {
+    // One round of spinning
+    if (monitor->spin_enter(locking_thread)) {
+      return monitor;
+    }
+
+    // Monitor is contended, take the time before entering to fix the lock stack.
+    LockStackInflateContendedLocks().inflate(current);
+  }
+
+  // enter can block for safepoints; clear the unhandled object oop
+  PauseNoSafepointVerifier pnsv(&nsv);
+  object = nullptr;
+
+  if (current == locking_thread) {
+    monitor->enter_with_contention_mark(locking_thread, contention_mark);
+  } else {
+    monitor->enter_for_with_contention_mark(locking_thread, contention_mark);
+  }
+
+  return monitor;
+}
+
+void ObjectSynchronizer::deflate_monitor(Thread* current, oop obj, ObjectMonitor* monitor) {
+  if (obj != nullptr) {
+    deflate_mark_word(obj);
+  }
+  bool removed = remove_monitor(current, monitor, obj);
+  if (obj != nullptr) {
+    assert(removed, "Should have removed the entry if obj was alive");
+  }
+}
+
+ObjectMonitor* ObjectSynchronizer::get_monitor_from_table(Thread* current, oop obj) {
+  assert(UseObjectMonitorTable, "must be");
+  return ObjectMonitorTable::monitor_get(current, obj);
+}
+
+bool ObjectSynchronizer::contains_monitor(Thread* current, ObjectMonitor* monitor) {
+  assert(UseObjectMonitorTable, "must be");
+  return ObjectMonitorTable::contains_monitor(current, monitor);
+}
+
+ObjectMonitor* ObjectSynchronizer::read_monitor(markWord mark) {
+  return mark.monitor();
+}
+
+ObjectMonitor* ObjectSynchronizer::read_monitor(Thread* current, oop obj) {
+  return ObjectSynchronizer::read_monitor(current, obj, obj->mark());
+}
+
+ObjectMonitor* ObjectSynchronizer::read_monitor(Thread* current, oop obj, markWord mark) {
+  if (!UseObjectMonitorTable) {
+    return read_monitor(mark);
+  } else {
+    return ObjectSynchronizer::get_monitor_from_table(current, obj);
+  }
+}
+
+bool ObjectSynchronizer::quick_enter_internal(oop obj, BasicLock* lock, JavaThread* current) {
+  assert(current->thread_state() == _thread_in_Java, "must be");
+  assert(obj != nullptr, "must be");
+  NoSafepointVerifier nsv;
+
+  LockStack& lock_stack = current->lock_stack();
+  if (lock_stack.is_full()) {
+    // Always go into runtime if the lock stack is full.
+    return false;
+  }
+
+  const markWord mark = obj->mark();
+
+#ifndef _LP64
+  // Only for 32bit which has limited support for fast locking outside the runtime.
+  if (lock_stack.try_recursive_enter(obj)) {
+    // Recursive lock successful.
+    return true;
+  }
+
+  if (mark.is_unlocked()) {
+    markWord locked_mark = mark.set_fast_locked();
+    if (obj->cas_set_mark(locked_mark, mark) == mark) {
+      // Successfully fast-locked, push object to lock-stack and return.
+      lock_stack.push(obj);
+      return true;
+    }
+  }
+#endif
+
+  if (mark.has_monitor()) {
+    ObjectMonitor* monitor;
+    if (UseObjectMonitorTable) {
+      monitor = read_caches(current, lock, obj);
+    } else {
+      monitor = ObjectSynchronizer::read_monitor(mark);
+    }
+
+    if (monitor == nullptr) {
+      // Take the slow-path on a cache miss.
+      return false;
+    }
+
+    if (UseObjectMonitorTable) {
+      // Set the monitor regardless of success.
+      // Either we successfully lock on the monitor, or we retry with the
+      // monitor in the slow path. If the monitor gets deflated, it will be
+      // cleared, either by the CacheSetter if we fast lock in enter or in
+      // inflate_and_enter when we see that the monitor is deflated.
+      lock->set_object_monitor_cache(monitor);
+    }
+
+    if (monitor->spin_enter(current)) {
+      return true;
+    }
+  }
+
+  // Slow-path.
+  return false;
+}
+
+bool ObjectSynchronizer::quick_enter(oop obj, BasicLock* lock, JavaThread* current) {
+  assert(current->thread_state() == _thread_in_Java, "invariant");
+  NoSafepointVerifier nsv;
+  if (obj == nullptr) return false;       // Need to throw NPE
+
+  if (obj->klass()->is_value_based()) {
+    return false;
+  }
+
+  return ObjectSynchronizer::quick_enter_internal(obj, lock, current);
+}
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
index 2337569176e..a10e44b3092 100644
--- a/src/hotspot/share/runtime/synchronizer.hpp
+++ b/src/hotspot/share/runtime/synchronizer.hpp
@@ -94,8 +94,8 @@ public:
   // deoptimization at monitor exit. Hence, it does not take a Handle argument.
 
   // This is the "slow path" version of monitor enter and exit.
-  static inline void enter(Handle obj, BasicLock* lock, JavaThread* current);
-  static inline void exit(oop obj, BasicLock* lock, JavaThread* current);
+  static void enter(Handle obj, BasicLock* lock, JavaThread* current);
+  static void exit(oop obj, BasicLock* lock, JavaThread* current);
 
   // Used to enter a monitor for another thread. This requires that the
   // locking_thread is suspended, and that entering on a potential
@@ -115,7 +115,7 @@ public:
   static void notifyall(Handle obj, TRAPS);
 
   static bool quick_notify(oopDesc* obj, JavaThread* current, bool All);
-  static inline bool quick_enter(oop obj, BasicLock* Lock, JavaThread* current);
+  static bool quick_enter(oop obj, BasicLock* Lock, JavaThread* current);
 
   // Special internal-use-only method for use by JVM infrastructure
   // that needs to wait() on a java-level object but that can't risk
@@ -125,9 +125,9 @@ public:
 public:
   static const char* inflate_cause_name(const InflateCause cause);
 
-  inline static ObjectMonitor* read_monitor(markWord mark);
-  inline static ObjectMonitor* read_monitor(Thread* current, oop obj);
-  inline static ObjectMonitor* read_monitor(Thread* current, oop obj, markWord mark);
+  static ObjectMonitor* read_monitor(markWord mark);
+  static ObjectMonitor* read_monitor(Thread* current, oop obj);
+  static ObjectMonitor* read_monitor(Thread* current, oop obj, markWord mark);
 
   // Returns the identity hash value for an oop
   // NOTE: It may cause monitor inflation
@@ -195,7 +195,6 @@ public:
 
  private:
   friend class SynchronizerTest;
-  friend class LightweightSynchronizer;
 
   static MonitorList _in_use_list;
   static volatile bool _is_async_deflation_requested;
@@ -209,6 +208,44 @@ public:
   static u_char* get_gvars_stw_random_addr();
 
   static void handle_sync_on_value_based_class(Handle obj, JavaThread* locking_thread);
+
+  static ObjectMonitor* get_or_insert_monitor_from_table(oop object, JavaThread* current, bool* inserted);
+  static ObjectMonitor* get_or_insert_monitor(oop object, JavaThread* current, ObjectSynchronizer::InflateCause cause);
+
+  static ObjectMonitor* add_monitor(JavaThread* current, ObjectMonitor* monitor, oop obj);
+  static bool remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj);
+
+  static void deflate_mark_word(oop object);
+
+  static void ensure_lock_stack_space(JavaThread* current);
+
+  class CacheSetter;
+  class LockStackInflateContendedLocks;
+  class VerifyThreadState;
+
+  static void create_om_table();
+
+ public:
+  static bool needs_resize();
+  static bool resize_table(JavaThread* current);
+
+ private:
+  static inline bool fast_lock_try_enter(oop obj, LockStack& lock_stack, JavaThread* current);
+  static bool fast_lock_spin_enter(oop obj, LockStack& lock_stack, JavaThread* current, bool observed_deflation);
+
+ public:
+  static ObjectMonitor* inflate_into_object_header(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, Thread* current);
+  static ObjectMonitor* inflate_locked_or_imse(oop object, ObjectSynchronizer::InflateCause cause, TRAPS);
+  static ObjectMonitor* inflate_fast_locked_object(oop object, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current);
+  static ObjectMonitor* inflate_and_enter(oop object, BasicLock* lock, ObjectSynchronizer::InflateCause cause, JavaThread* locking_thread, JavaThread* current);
+
+  static void deflate_monitor(Thread* current, oop obj, ObjectMonitor* monitor);
+
+  static ObjectMonitor* get_monitor_from_table(Thread* current, oop obj);
+
+  static bool contains_monitor(Thread* current, ObjectMonitor* monitor);
+
+  static bool quick_enter_internal(oop obj, BasicLock* Lock, JavaThread* current);
 };
 
 // ObjectLocker enforces balanced locking and can never throw an
diff --git a/src/hotspot/share/runtime/synchronizer.inline.hpp b/src/hotspot/share/runtime/synchronizer.inline.hpp
deleted file mode 100644
index 7bcbd91eda7..00000000000
--- a/src/hotspot/share/runtime/synchronizer.inline.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_RUNTIME_SYNCHRONIZER_INLINE_HPP
-#define SHARE_RUNTIME_SYNCHRONIZER_INLINE_HPP
-
-#include "runtime/synchronizer.hpp"
-
-#include "runtime/lightweightSynchronizer.hpp"
-#include "runtime/safepointVerifiers.hpp"
-
-inline ObjectMonitor* ObjectSynchronizer::read_monitor(markWord mark) {
-  return mark.monitor();
-}
-
-inline ObjectMonitor* ObjectSynchronizer::read_monitor(Thread* current, oop obj) {
-  return ObjectSynchronizer::read_monitor(current, obj, obj->mark());
-}
-
-inline ObjectMonitor* ObjectSynchronizer::read_monitor(Thread* current, oop obj, markWord mark) {
-  if (!UseObjectMonitorTable) {
-    return read_monitor(mark);
-  } else {
-    return LightweightSynchronizer::get_monitor_from_table(current, obj);
-  }
-}
-
-inline void ObjectSynchronizer::enter(Handle obj, BasicLock* lock, JavaThread* current) {
-  assert(current == Thread::current(), "must be");
-
-  LightweightSynchronizer::enter(obj, lock, current);
-}
-
-inline bool ObjectSynchronizer::quick_enter(oop obj, BasicLock* lock, JavaThread* current) {
-  assert(current->thread_state() == _thread_in_Java, "invariant");
-  NoSafepointVerifier nsv;
-  if (obj == nullptr) return false;       // Need to throw NPE
-
-  if (obj->klass()->is_value_based()) {
-    return false;
-  }
-
-  return LightweightSynchronizer::quick_enter(obj, lock, current);
-}
-
-inline void ObjectSynchronizer::exit(oop object, BasicLock* lock, JavaThread* current) {
-  LightweightSynchronizer::exit(object, lock, current);
-}
-
-#endif // SHARE_RUNTIME_SYNCHRONIZER_INLINE_HPP
diff --git a/src/hotspot/share/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp
index 74d42b7dc9d..604ff1f751a 100644
--- a/src/hotspot/share/runtime/vframe.cpp
+++ b/src/hotspot/share/runtime/vframe.cpp
@@ -48,7 +48,7 @@
 #include "runtime/signature.hpp"
 #include "runtime/stackFrameStream.inline.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "runtime/vframe_hp.hpp"
 #include "runtime/vframeArray.hpp"
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index 547ca4e51d5..48f4eb16cf1 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -48,7 +48,7 @@
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/objectMonitor.inline.hpp"
-#include "runtime/synchronizer.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.inline.hpp"
diff --git a/test/hotspot/gtest/runtime/test_lockStack.cpp b/test/hotspot/gtest/runtime/test_lockStack.cpp
index 6755541adb0..c61b6db6023 100644
--- a/test/hotspot/gtest/runtime/test_lockStack.cpp
+++ b/test/hotspot/gtest/runtime/test_lockStack.cpp
@@ -63,7 +63,7 @@ public:
   } while (false)
 
 TEST_VM_F(LockStackTest, is_recursive) {
-  if (!VM_Version::supports_recursive_lightweight_locking()) {
+  if (!VM_Version::supports_recursive_fast_locking()) {
     return;
   }
 
@@ -130,7 +130,7 @@ TEST_VM_F(LockStackTest, is_recursive) {
 }
 
 TEST_VM_F(LockStackTest, try_recursive_enter) {
-  if (!VM_Version::supports_recursive_lightweight_locking()) {
+  if (!VM_Version::supports_recursive_fast_locking()) {
     return;
   }
 
@@ -197,7 +197,7 @@ TEST_VM_F(LockStackTest, try_recursive_enter) {
 }
 
 TEST_VM_F(LockStackTest, contains) {
-  const bool test_recursive = VM_Version::supports_recursive_lightweight_locking();
+  const bool test_recursive = VM_Version::supports_recursive_fast_locking();
 
   JavaThread* THREAD = JavaThread::current();
   // the thread should be in vm to use locks
@@ -259,7 +259,7 @@ TEST_VM_F(LockStackTest, contains) {
 }
 
 TEST_VM_F(LockStackTest, remove) {
-  const bool test_recursive = VM_Version::supports_recursive_lightweight_locking();
+  const bool test_recursive = VM_Version::supports_recursive_fast_locking();
 
   JavaThread* THREAD = JavaThread::current();
   // the thread should be in vm to use locks
diff --git a/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java b/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java
index bea7a41ae2b..9782824ef0f 100644
--- a/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java
+++ b/test/hotspot/jtreg/runtime/Monitor/TestRecursiveLocking.java
@@ -202,7 +202,7 @@ public class TestRecursiveLocking {
                 assertNotInflated();
             } else {
                 // Second time we want to lock A, the lock stack
-                // looks like this [A, B]. Lightweight locking
+                // looks like this [A, B]. Fast locking
                 // doesn't allow interleaving ([A, B, A]), instead
                 // it inflates A and removes it from the lock
                 // stack. Which leaves us with only [B] on the
@@ -220,11 +220,10 @@ public class TestRecursiveLocking {
             counter++;
 
 
-            // Legacy tolerates endless recursions. While testing
-            // lightweight we don't go deeper than the size of the
-            // lock stack, which in this test case will be filled
-            // with a number of B-elements. See comment in runA()
-            // above for more info.
+            // Legacy tolerates endless recursions. While testing we
+            // don't go deeper than the size of the lock stack, which
+            // in this test case will be filled with a number of
+            // B-elements. See comment in runA() above for more info.
             assertNotInflated();
 
             if (depth == 1) {
diff --git a/test/hotspot/jtreg/runtime/lockStack/TestLockStackCapacity.java b/test/hotspot/jtreg/runtime/lockStack/TestLockStackCapacity.java
index f3f1f9c91a6..37568fd3434 100644
--- a/test/hotspot/jtreg/runtime/lockStack/TestLockStackCapacity.java
+++ b/test/hotspot/jtreg/runtime/lockStack/TestLockStackCapacity.java
@@ -24,7 +24,7 @@
 
 /*
  * @test TestLockStackCapacity
- * @summary Tests the interaction between recursive lightweight locking and
+ * @summary Tests the interaction between recursive fast locking and
  *          when the lock stack capacity is exceeded.
  * @requires vm.flagless
  * @library /testlibrary /test/lib
@@ -93,8 +93,8 @@ public class TestLockStackCapacity {
     }
 
     public static void main(String... args) throws Exception {
-        if (!WB.supportsRecursiveLightweightLocking()) {
-            throw new SkippedException("Test only valid if lightweight locking supports recursion");
+        if (!WB.supportsRecursiveFastLocking()) {
+            throw new SkippedException("Test only valid if fast locking supports recursion");
         }
 
         SynchronizedObject.runTest();
diff --git a/test/jdk/com/sun/jdi/EATests.java b/test/jdk/com/sun/jdi/EATests.java
index 321855b4969..cb51e91021b 100644
--- a/test/jdk/com/sun/jdi/EATests.java
+++ b/test/jdk/com/sun/jdi/EATests.java
@@ -97,7 +97,7 @@
  *                 -Xlog:monitorinflation=trace:file=monitorinflation.log
  *
  * @bug 8341819
- * @comment Regression test for re-locking racing with deflation with lightweight locking.
+ * @comment Regression test for re-locking racing with deflation with fast locking.
  * @run driver EATests
  *                 -XX:+UnlockDiagnosticVMOptions
  *                 -Xms256m -Xmx256m
@@ -237,7 +237,7 @@ class EATestsTarget {
 
         // Relocking test cases
         new EARelockingSimpleTarget()                                                       .run();
-        new EARelockingWithManyLightweightLocksTarget()                                     .run();
+        new EARelockingWithManyFastLocksTarget()                                            .run();
         new EARelockingSimpleWithAccessInOtherThreadTarget()                                .run();
         new EARelockingSimpleWithAccessInOtherThread_02_DynamicCall_Target()                .run();
         new EARelockingRecursiveTarget()                                                    .run();
@@ -363,7 +363,7 @@ public class EATests extends TestScaffold {
 
         // Relocking test cases
         new EARelockingSimple()                                                       .run(this);
-        new EARelockingWithManyLightweightLocks()                                     .run(this);
+        new EARelockingWithManyFastLocks()                                            .run(this);
         new EARelockingSimpleWithAccessInOtherThread()                                .run(this);
         new EARelockingSimpleWithAccessInOtherThread_02_DynamicCall()                 .run(this);
         new EARelockingRecursive()                                                    .run(this);
@@ -1750,12 +1750,11 @@ class EARelockingSimpleTarget extends EATestCaseBaseTarget {
 
 /**
  * Like {@link EARelockingSimple}. The difference is that there are many
- * lightweight locked objects when the relocking is done. With
- * lightweight the lock stack of the thread will be full because of
- * this.
+ * fast locked objects when the relocking is done, which means that the
+ * lock stack of the thread will be full because of this.
  */
 
-class EARelockingWithManyLightweightLocks extends EATestCaseBaseDebugger {
+class EARelockingWithManyFastLocks extends EATestCaseBaseDebugger {
 
     public void runTestCase() throws Exception {
         BreakpointEvent bpe = resumeTo(TARGET_TESTCASE_BASE_NAME, "dontinline_brkpt", "()V");
@@ -1765,7 +1764,7 @@ class EARelockingWithManyLightweightLocks extends EATestCaseBaseDebugger {
     }
 }
 
-class EARelockingWithManyLightweightLocksTarget extends EATestCaseBaseTarget {
+class EARelockingWithManyFastLocksTarget extends EATestCaseBaseTarget {
 
     static class Lock {
     }
@@ -2260,7 +2259,7 @@ class EARelockingArgEscapeLWLockedInCalleeFrame_2Target extends EATestCaseBaseTa
 
 /**
  * Similar to {@link EARelockingArgEscapeLWLockedInCalleeFrame_2Target}. It does
- * not use recursive locking and exposed a bug in the lightweight-locking implementation.
+ * not use recursive locking and exposed a bug in the fast-locking implementation.
  */
 class EARelockingArgEscapeLWLockedInCalleeFrameNoRecursive extends EATestCaseBaseDebugger {
 
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index e989b0aca88..558feeec78f 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -124,7 +124,7 @@ public class WhiteBox {
 
   public native int getLockStackCapacity();
 
-  public native boolean supportsRecursiveLightweightLocking();
+  public native boolean supportsRecursiveFastLocking();
 
   public native void forceSafepoint();
 

From c173d416f749348bee42e1a9436a999700d0f0e8 Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Thu, 6 Nov 2025 12:56:37 +0000
Subject: [PATCH 060/512] 8359256: AArch64: Use SHA3 GPR intrinsic where it's
 faster

Reviewed-by: eastigeevich, phh
---
 src/hotspot/cpu/aarch64/globals_aarch64.hpp   |  2 +-
 .../cpu/aarch64/vm_version_aarch64.cpp        | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index 8e520314c8b..107919b2cbd 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
@@ -95,7 +95,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Use simplest and shortest implementation for array equals")  \
   product(bool, UseSIMDForBigIntegerShiftIntrinsics, true,              \
           "Use SIMD instructions for left/right shift of BigInteger")   \
-  product(bool, UseSIMDForSHA3Intrinsic, true,                          \
+  product(bool, UseSIMDForSHA3Intrinsic, false,                         \
           "Use SIMD SHA3 instructions for SHA3 intrinsic")              \
   product(bool, AvoidUnalignedAccesses, false,                          \
           "Avoid generating unaligned memory accesses")                 \
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index a04e9defa4b..b47bfe6a89f 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -375,18 +375,24 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
   }
 
-  if (UseSHA && VM_Version::supports_sha3()) {
-    // Auto-enable UseSHA3Intrinsics on hardware with performance benefit.
-    // Note that the evaluation of UseSHA3Intrinsics shows better performance
-    // on Apple silicon but worse performance on Neoverse V1 and N2.
-    if (_cpu == CPU_APPLE) {  // Apple silicon
-      if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
-        FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
-      }
-    }
-  } else if (UseSHA3Intrinsics && UseSIMDForSHA3Intrinsic) {
-    warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
-    FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
+  if (UseSHA && VM_Version::supports_sha3() && _cpu == CPU_APPLE && FLAG_IS_DEFAULT(UseSIMDForSHA3Intrinsic)) {
+    // Note: SIMD faster on Apple, worse on Neoverse V1, V2 and N2.
+    FLAG_SET_DEFAULT(UseSIMDForSHA3Intrinsic, true);
+  }
+
+  // Enable SHA-3 intrinsics (SIMD or GPR). The GPR path does not require SHA instructions.
+  if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
+    FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
+  }
+
+  if (!UseSHA3Intrinsics && UseSIMDForSHA3Intrinsic) {
+    // Keep flags consistent: if SHA3 intrinsics are off, disable the SHA3 SIMD variant.
+    FLAG_SET_DEFAULT(UseSIMDForSHA3Intrinsic, false);
+  }
+
+  if (!VM_Version::supports_sha3() && UseSIMDForSHA3Intrinsic) {
+    warning("SHA3 instructions are not available on this CPU");
+    FLAG_SET_DEFAULT(UseSIMDForSHA3Intrinsic, false);
   }
 
   if (UseSHA && VM_Version::supports_sha512()) {

From df414e0d19c1ed68f151d84dbb481a9dd6c65539 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 6 Nov 2025 13:39:57 +0000
Subject: [PATCH 061/512] 8370884: JFR: Overflow in aggregators

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/query/Function.java      | 70 +++++++++++++++----
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java
index f01105c698c..4c921ba4d87 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java
@@ -34,6 +34,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 abstract class Function {
+    private static final long NANOS_PER_SECOND = 1_000_000_000L;
 
     interface FunctionFactory {
         Function newFunction();
@@ -164,14 +165,30 @@ abstract class Function {
     private static final class AverageDuration extends Function {
         private long seconds;
         private long nanos;
-        private int count;
+        private long count;
+        private boolean hasOverflowed;
 
         @Override
         public void add(Object value) {
-            if (value instanceof Duration duration) {
-                seconds += duration.getSeconds();
-                nanos += duration.getNano();
-                count++;
+            if (hasOverflowed) {
+                return;
+            }
+            if (value instanceof Duration d) {
+                try {
+                    // Code copied from Duration::plus
+                    long secondsToAdd = d.getSeconds();
+                    long nanosToAdd = d.getNano();
+                    if ((secondsToAdd | nanosToAdd) == 0) {
+                        return;
+                    }
+                    long s = Math.addExact(seconds, secondsToAdd);
+                    seconds = Math.addExact(s, nanosToAdd / NANOS_PER_SECOND);
+                    nanos = nanos + nanosToAdd % NANOS_PER_SECOND;
+                    count++;
+                } catch (ArithmeticException ae) {
+                    hasOverflowed = true;
+                    count = 0;
+                }
             }
         }
 
@@ -345,13 +362,29 @@ abstract class Function {
         private long seconds;
         private long nanos;
         private boolean hasValue;
+        private boolean hasOverflowed;
 
         @Override
         public void add(Object value) {
+            if (hasOverflowed) {
+                return;
+            }
             if (value instanceof Duration n) {
-                seconds += n.getSeconds();
-                nanos += n.getNano();
-                hasValue = true;
+                try {
+                    // Code copied from Duration::plus
+                    long secondsToAdd = n.getSeconds();
+                    long nanosToAdd = n.getNano();
+                    if ((secondsToAdd | nanosToAdd) == 0) {
+                        return;
+                    }
+                    long s = Math.addExact(seconds, secondsToAdd);
+                    seconds = Math.addExact(s, nanosToAdd / NANOS_PER_SECOND);
+                    nanos = nanos + nanosToAdd % NANOS_PER_SECOND;
+                    hasValue = true;
+                } catch (ArithmeticException ae) {
+                    hasOverflowed = true;
+                    hasValue = false;
+                }
             }
         }
 
@@ -363,13 +396,22 @@ abstract class Function {
 
     private static final class SumLong extends Function {
         private boolean hasValue = false;
+        private boolean hasOverflowed;
         private long sum = 0;
 
         @Override
         public void add(Object value) {
+            if (hasOverflowed) {
+                return;
+            }
             if (value instanceof Number n) {
-                sum += n.longValue();
-                hasValue = true;
+                try {
+                    sum = Math.addExact(sum, n.longValue());
+                    hasValue = true;
+                } catch (ArithmeticException ae) {
+                    hasOverflowed = true;
+                    hasValue = false;
+                }
             }
         }
 
@@ -436,7 +478,11 @@ abstract class Function {
                 return null;
             }
             if (isIntegral(first) && isIntegral(last)) {
-                return last.longValue() - first.longValue();
+                try {
+                    return Math.subtractExact(last.longValue(), first.longValue());
+                } catch (ArithmeticException ae) {
+                    return null;
+                }
             }
             if (first instanceof Float f && last instanceof Float l) {
                 return l - f;
@@ -528,7 +574,7 @@ abstract class Function {
         @Override
         public void add(Object value) {
             if (value instanceof Duration duration) {
-                long nanos = 1_000_000_000L * duration.getSeconds() + duration.getNano();
+                double nanos = 1_000_000_000.0 * duration.getSeconds() + duration.getNano();
                 function.add(nanos);
             }
         }

From 2d924ad3584a0ea8682f47c742dcdfd3be14937d Mon Sep 17 00:00:00 2001
From: Kerem Kat <krk@openjdk.org>
Date: Thu, 6 Nov 2025 15:00:37 +0000
Subject: [PATCH 062/512] 8351194: Clean up Hotspot SA after 32-bit x86 removal

Reviewed-by: cjplummer, shade, ayang, dholmes
---
 src/jdk.hotspot.agent/doc/clhsdb.html         |   2 +-
 src/jdk.hotspot.agent/doc/hsdb.html           |   2 +-
 .../native/libsaproc/LinuxDebuggerLocal.cpp   |  34 +--
 .../linux/native/libsaproc/ps_core.c          |  12 -
 .../macosx/native/libsaproc/ps_core.c         |  12 -
 .../share/classes/sun/jvm/hotspot/HSDB.java   |   2 +-
 .../classes/sun/jvm/hotspot/HotSpotAgent.java |  17 +-
 .../sun/jvm/hotspot/debugger/Debugger.java    |   2 +-
 .../debugger/MachineDescriptionIntelX86.java  |  39 ---
 .../hotspot/debugger/bsd/BsdCDebugger.java    |  11 +-
 .../debugger/bsd/BsdThreadContextFactory.java |   5 +-
 .../debugger/bsd/x86/BsdX86CFrame.java        |  79 ------
 .../debugger/bsd/x86/BsdX86ThreadContext.java |  46 ----
 .../sun/jvm/hotspot/debugger/cdbg/CFrame.java |   2 +-
 .../debugger/linux/LinuxCDebugger.java        |  11 +-
 .../linux/LinuxThreadContextFactory.java      |   5 +-
 .../debugger/linux/x86/LinuxX86CFrame.java    |  92 -------
 .../linux/x86/LinuxX86ThreadContext.java      |  46 ----
 .../debugger/remote/RemoteDebuggerClient.java |   5 +-
 .../debugger/remote/x86/RemoteX86Thread.java  |  53 -----
 .../remote/x86/RemoteX86ThreadContext.java    |  50 ----
 .../remote/x86/RemoteX86ThreadFactory.java    |  44 ----
 .../win32/coff/DebugVC50X86RegisterEnums.java | 111 ---------
 .../debugger/windbg/WindbgDebugger.java       |   5 -
 .../debugger/windbg/WindbgDebuggerLocal.java  |   4 +-
 .../debugger/x86/X86ThreadContext.java        | 129 ----------
 .../hotspot/runtime/StackValueCollection.java |   2 +-
 .../sun/jvm/hotspot/runtime/Threads.java      |  10 +-
 .../classes/sun/jvm/hotspot/runtime/VM.java   |   4 +-
 .../runtime/amd64/AMD64CurrentFrameGuess.java |   6 +-
 .../X86Frame.java => amd64/AMD64Frame.java}   |  74 +++---
 .../AMD64RegisterMap.java}                    |  10 +-
 .../bsd_amd64/BsdAMD64JavaThreadPDAccess.java |  11 +-
 .../hotspot/runtime/bsd_x86/BsdSignals.java   |  70 ------
 .../bsd_x86/BsdX86JavaThreadPDAccess.java     | 133 -----------
 .../LinuxAMD64JavaThreadPDAccess.java         |  11 +-
 .../runtime/linux_x86/LinuxSignals.java       |  71 ------
 .../linux_x86/LinuxX86JavaThreadPDAccess.java | 133 -----------
 .../Win32AMD64JavaThreadPDAccess.java         |  13 +-
 .../runtime/x86/X86CurrentFrameGuess.java     | 225 ------------------
 .../runtime/x86/X86JavaCallWrapper.java       |  58 -----
 .../jvm/hotspot/ui/AnnotatedMemoryPanel.java  |   2 +-
 .../jvm/hotspot/utilities/PlatformInfo.java   |   9 +-
 43 files changed, 84 insertions(+), 1578 deletions(-)
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java
 rename src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/{x86/X86Frame.java => amd64/AMD64Frame.java} (88%)
 rename src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/{x86/X86RegisterMap.java => amd64/AMD64RegisterMap.java} (85%)
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java

diff --git a/src/jdk.hotspot.agent/doc/clhsdb.html b/src/jdk.hotspot.agent/doc/clhsdb.html
index a225530774f..bd436f1dfef 100644
--- a/src/jdk.hotspot.agent/doc/clhsdb.html
+++ b/src/jdk.hotspot.agent/doc/clhsdb.html
@@ -32,7 +32,7 @@ Available commands:
   class name <font color="red">find a Java class from debuggee and print oop</font>
   classes <font color="red">print all loaded Java classes with Klass*</font>
   detach <font color="red">detach SA from current target</font>
-  dis address [ length ]  <font color="red">disassemble (x86) specified number of instructions from given address</font>
+  dis address [ length ]  <font color="red">disassemble (requires hsdis) specified number of instructions from given address</font>
   dissemble address <font color="red">disassemble nmethod</font>
   dumpcfg -a | id <font color="red">Dump the PhaseCFG for every compiler thread that has one live</font>
   dumpclass { address | name } [ directory ] <font color="red">dump .class file for given Klass* or class name</font>
diff --git a/src/jdk.hotspot.agent/doc/hsdb.html b/src/jdk.hotspot.agent/doc/hsdb.html
index 3470d2806e0..ba47558cf6b 100644
--- a/src/jdk.hotspot.agent/doc/hsdb.html
+++ b/src/jdk.hotspot.agent/doc/hsdb.html
@@ -31,7 +31,7 @@ HSDB was launched without debuggee, empty screen is shown.
  <li> Object Histogram and inspection of objects and liveness analysis therein.
  <li> Class Browser - view Java classes, bytecode disassembly,
    or create .class files for selected classes
- <li> native disassembly (x86 only) and nmethod disassembly with annotations for safepoint details.
+ <li> native disassembly (requires hsdis) and nmethod disassembly with annotations for safepoint details.
  <li> view -XX flags, System properties, VM version of debuggee
  </ul>
 <p>Windows sub-menu options include:</p>
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
index bd696fd2a25..4b8c5e55f63 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
@@ -40,14 +40,6 @@
 #define amd64 1
 #endif
 
-#if defined(i386) && !defined(i586)
-#define i586 1
-#endif
-
-#ifdef i586
-#include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h"
-#endif
-
 #ifdef amd64
 #include "sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext.h"
 #endif
@@ -411,7 +403,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
   return (err == PS_OK)? array : 0;
 }
 
-#if defined(i586) || defined(amd64) || defined(ppc64) || defined(ppc64le) || defined(aarch64) || defined(riscv64)
+#if defined(amd64) || defined(ppc64) || defined(ppc64le) || defined(aarch64) || defined(riscv64)
 extern "C"
 JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLocal_getThreadIntegerRegisterSet0
   (JNIEnv *env, jobject this_obj, jint lwp_id) {
@@ -433,9 +425,6 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
   }
 
 #undef NPRGREG
-#ifdef i586
-#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
-#endif
 #ifdef amd64
 #define NPRGREG sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_NPRGREG
 #endif
@@ -456,27 +445,6 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
 
 #undef REG_INDEX
 
-#ifdef i586
-#define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg
-
-  regs[REG_INDEX(GS)]  = (uintptr_t) gregs.xgs;
-  regs[REG_INDEX(FS)]  = (uintptr_t) gregs.xfs;
-  regs[REG_INDEX(ES)]  = (uintptr_t) gregs.xes;
-  regs[REG_INDEX(DS)]  = (uintptr_t) gregs.xds;
-  regs[REG_INDEX(EDI)] = (uintptr_t) gregs.edi;
-  regs[REG_INDEX(ESI)] = (uintptr_t) gregs.esi;
-  regs[REG_INDEX(FP)] = (uintptr_t) gregs.ebp;
-  regs[REG_INDEX(SP)] = (uintptr_t) gregs.esp;
-  regs[REG_INDEX(EBX)] = (uintptr_t) gregs.ebx;
-  regs[REG_INDEX(EDX)] = (uintptr_t) gregs.edx;
-  regs[REG_INDEX(ECX)] = (uintptr_t) gregs.ecx;
-  regs[REG_INDEX(EAX)] = (uintptr_t) gregs.eax;
-  regs[REG_INDEX(PC)] = (uintptr_t) gregs.eip;
-  regs[REG_INDEX(CS)]  = (uintptr_t) gregs.xcs;
-  regs[REG_INDEX(SS)]  = (uintptr_t) gregs.xss;
-
-#endif /* i586 */
-
 #ifdef amd64
 #define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg
 
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
index 9c4f0b0d357..899d42152d1 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
@@ -200,18 +200,6 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size
 
    if (is_debug()) {
       print_debug("integer regset\n");
-#ifdef i386
-      // print the regset
-      print_debug("\teax = 0x%x\n", newthr->regs.eax);
-      print_debug("\tebx = 0x%x\n", newthr->regs.ebx);
-      print_debug("\tecx = 0x%x\n", newthr->regs.ecx);
-      print_debug("\tedx = 0x%x\n", newthr->regs.edx);
-      print_debug("\tesp = 0x%x\n", newthr->regs.esp);
-      print_debug("\tebp = 0x%x\n", newthr->regs.ebp);
-      print_debug("\tesi = 0x%x\n", newthr->regs.esi);
-      print_debug("\tedi = 0x%x\n", newthr->regs.edi);
-      print_debug("\teip = 0x%x\n", newthr->regs.eip);
-#endif
 
 #if defined(amd64) || defined(x86_64)
       // print the regset
diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c
index 149997dc4bb..20fe2ffb17e 100644
--- a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c
+++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c
@@ -814,18 +814,6 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size
 
    if (is_debug()) {
       print_debug("integer regset\n");
-#if defined(i586) || defined(i386)
-      // print the regset
-      print_debug("\teax = 0x%x\n", newthr->regs.r_eax);
-      print_debug("\tebx = 0x%x\n", newthr->regs.r_ebx);
-      print_debug("\tecx = 0x%x\n", newthr->regs.r_ecx);
-      print_debug("\tedx = 0x%x\n", newthr->regs.r_edx);
-      print_debug("\tesp = 0x%x\n", newthr->regs.r_esp);
-      print_debug("\tebp = 0x%x\n", newthr->regs.r_ebp);
-      print_debug("\tesi = 0x%x\n", newthr->regs.r_esi);
-      print_debug("\tedi = 0x%x\n", newthr->regs.r_edi);
-      print_debug("\teip = 0x%x\n", newthr->regs.r_eip);
-#endif
 
 #if defined(amd64) || defined(x86_64)
       // print the regset
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
index d8c4d1a781e..897ea5da85f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1007,7 +1007,7 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
                                                      curFrame.getFP(),
                                                      anno));
             } else {
-              // For C2, which has null frame pointers on x86/amd64/aarch64
+              // For C2, which has null frame pointers on amd64/aarch64
               CodeBlob cb = VM.getVM().getCodeCache().findBlob(curFrame.getPC());
               Address sp = curFrame.getSP();
               if (Assert.ASSERTS_ENABLED) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index ff14e99f3b9..4ffd0434e86 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
@@ -37,7 +37,6 @@ import sun.jvm.hotspot.debugger.MachineDescriptionAMD64;
 import sun.jvm.hotspot.debugger.MachineDescriptionPPC64;
 import sun.jvm.hotspot.debugger.MachineDescriptionAArch64;
 import sun.jvm.hotspot.debugger.MachineDescriptionRISCV64;
-import sun.jvm.hotspot.debugger.MachineDescriptionIntelX86;
 import sun.jvm.hotspot.debugger.NoSuchSymbolException;
 import sun.jvm.hotspot.debugger.bsd.BsdDebuggerLocal;
 import sun.jvm.hotspot.debugger.linux.LinuxDebuggerLocal;
@@ -522,14 +521,12 @@ public class HotSpotAgent {
     private void setupDebuggerWin32() {
         setupJVMLibNamesWin32();
 
-        if (cpu.equals("x86")) {
-            machDesc = new MachineDescriptionIntelX86();
-        } else if (cpu.equals("amd64")) {
+        if (cpu.equals("amd64")) {
             machDesc = new MachineDescriptionAMD64();
         } else if (cpu.equals("aarch64")) {
             machDesc = new MachineDescriptionAArch64();
         } else {
-            throw new DebuggerException("Win32 supported under x86, amd64 and aarch64 only");
+            throw new DebuggerException("Win32 supported under amd64 and aarch64 only");
         }
 
         // Note we do not use a cache for the local debugger in server
@@ -554,9 +551,7 @@ public class HotSpotAgent {
     private void setupDebuggerLinux() {
         setupJVMLibNamesLinux();
 
-        if (cpu.equals("x86")) {
-            machDesc = new MachineDescriptionIntelX86();
-        } else if (cpu.equals("amd64")) {
+        if (cpu.equals("amd64")) {
             machDesc = new MachineDescriptionAMD64();
         } else if (cpu.equals("ppc64")) {
             machDesc = new MachineDescriptionPPC64();
@@ -592,12 +587,10 @@ public class HotSpotAgent {
     private void setupDebuggerBsd() {
         setupJVMLibNamesBsd();
 
-        if (cpu.equals("x86")) {
-            machDesc = new MachineDescriptionIntelX86();
-        } else if (cpu.equals("amd64") || cpu.equals("x86_64")) {
+        if (cpu.equals("amd64") || cpu.equals("x86_64")) {
             machDesc = new MachineDescriptionAMD64();
         } else {
-            throw new DebuggerException("BSD only supported on x86/x86_64. Current arch: " + cpu);
+            throw new DebuggerException("BSD only supported on x86_64. Current arch: " + cpu);
         }
 
         BsdDebuggerLocal dbg = new BsdDebuggerLocal(machDesc, !isServer);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java
index 36b73d66a05..81e620ff1fb 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java
@@ -78,7 +78,7 @@ public interface Debugger extends SymbolLookup, ThreadAccess {
 
   /** Support for remote debugging. Get the name of the CPU type on
       which this debugger is running (to be able to properly configure
-      the local system). Typical return value is "x86"; see
+      the local system). Typical return value is "amd64"; see
       utilities/PlatformInfo.java. */
   public String getCPU() throws DebuggerException;
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java
deleted file mode 100644
index c74a37c05be..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger;
-
-public class MachineDescriptionIntelX86 extends MachineDescriptionTwosComplement implements MachineDescription {
-  public long getAddressSize() {
-    return 4;
-  }
-
-  public boolean isBigEndian() {
-    return false;
-  }
-
-  public boolean supports32bitAlignmentOf64bitTypes() {
-    return true;
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
index d8fb562bfcc..c119e374d66 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
@@ -29,10 +29,8 @@ import java.io.*;
 import java.util.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.x86.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.aarch64.*;
-import sun.jvm.hotspot.debugger.bsd.x86.*;
 import sun.jvm.hotspot.debugger.bsd.amd64.*;
 import sun.jvm.hotspot.debugger.bsd.aarch64.*;
 import sun.jvm.hotspot.utilities.*;
@@ -86,14 +84,7 @@ class BsdCDebugger implements CDebugger {
 
   public CFrame topFrameForThread(ThreadProxy thread) throws DebuggerException {
     String cpu = dbg.getCPU();
-    if (cpu.equals("x86")) {
-       X86ThreadContext context = (X86ThreadContext) thread.getContext();
-       Address ebp = context.getRegisterAsAddress(X86ThreadContext.EBP);
-       if (ebp == null) return null;
-       Address pc  = context.getRegisterAsAddress(X86ThreadContext.EIP);
-       if (pc == null) return null;
-       return new BsdX86CFrame(dbg, ebp, pc);
-    } else if (cpu.equals("amd64") || cpu.equals("x86_64")) {
+    if (cpu.equals("amd64") || cpu.equals("x86_64")) {
        AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
        Address rbp = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
        if (rbp == null) return null;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
index 48126ec6695..c4a3a4850ff 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
@@ -27,14 +27,11 @@ package sun.jvm.hotspot.debugger.bsd;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.bsd.aarch64.*;
 import sun.jvm.hotspot.debugger.bsd.amd64.*;
-import sun.jvm.hotspot.debugger.bsd.x86.*;
 
 class BsdThreadContextFactory {
    static ThreadContext createThreadContext(BsdDebugger dbg) {
       String cpu = dbg.getCPU();
-      if (cpu.equals("x86")) {
-         return new BsdX86ThreadContext(dbg);
-      } else if (cpu.equals("amd64") || cpu.equals("x86_64")) {
+      if (cpu.equals("amd64") || cpu.equals("x86_64")) {
          return new BsdAMD64ThreadContext(dbg);
       } else if (cpu.equals("aarch64")) {
          return new BsdAARCH64ThreadContext(dbg);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java
deleted file mode 100644
index 1e8d83b289f..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.bsd.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.bsd.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.cdbg.basic.*;
-import sun.jvm.hotspot.debugger.x86.*;
-
-public final class BsdX86CFrame extends BasicCFrame {
-   // package/class internals only
-   public BsdX86CFrame(BsdDebugger dbg, Address ebp, Address pc) {
-      super(dbg.getCDebugger());
-      this.ebp = ebp;
-      this.pc = pc;
-      this.dbg = dbg;
-   }
-
-   // override base class impl to avoid ELF parsing
-   public ClosestSymbol closestSymbolToPC() {
-      // try native lookup in debugger.
-      return dbg.lookup(dbg.getAddressValue(pc()));
-   }
-
-   public Address pc() {
-      return pc;
-   }
-
-   public Address localVariableBase() {
-      return ebp;
-   }
-
-   public CFrame sender(ThreadProxy thread) {
-      X86ThreadContext context = (X86ThreadContext) thread.getContext();
-      Address esp = context.getRegisterAsAddress(X86ThreadContext.ESP);
-
-      if ( (ebp == null) || ebp.lessThan(esp) ) {
-        return null;
-      }
-
-      Address nextEBP = ebp.getAddressAt( 0 * ADDRESS_SIZE);
-      if (nextEBP == null) {
-        return null;
-      }
-      Address nextPC  = ebp.getAddressAt( 1 * ADDRESS_SIZE);
-      if (nextPC == null) {
-        return null;
-      }
-      return new BsdX86CFrame(dbg, nextEBP, nextPC);
-   }
-
-   private static final int ADDRESS_SIZE = 4;
-   private Address pc;
-   private Address ebp;
-   private BsdDebugger dbg;
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java
deleted file mode 100644
index 8eaca2b7d79..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.bsd.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.debugger.bsd.*;
-
-public class BsdX86ThreadContext extends X86ThreadContext {
-  private BsdDebugger debugger;
-
-  public BsdX86ThreadContext(BsdDebugger debugger) {
-    super();
-    this.debugger = debugger;
-  }
-
-  public void setRegisterAsAddress(int index, Address value) {
-    setRegister(index, debugger.getAddressValue(value));
-  }
-
-  public Address getRegisterAsAddress(int index) {
-    return debugger.newAddress(getRegister(index));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java
index 13951447903..47f41fe1383 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java
@@ -64,7 +64,7 @@ public interface CFrame {
 
   /** Gets the base pointer in this frame from which local variable
       offsets in the debug info are based. Typically this is the
-      base-of-frame pointer (EBP on x86, FP/I6 on SPARC). */
+      base-of-frame pointer (RBP on amd64, FP/I6 on SPARC). */
   public Address localVariableBase();
 
   /** Visit all local variables in this frame if debug information is
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
index c100c160947..894e31949b2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
@@ -30,12 +30,10 @@ import java.util.*;
 
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.x86.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.aarch64.*;
 import sun.jvm.hotspot.debugger.riscv64.*;
 import sun.jvm.hotspot.debugger.ppc64.*;
-import sun.jvm.hotspot.debugger.linux.x86.*;
 import sun.jvm.hotspot.debugger.linux.amd64.*;
 import sun.jvm.hotspot.debugger.linux.ppc64.*;
 import sun.jvm.hotspot.debugger.linux.aarch64.*;
@@ -81,14 +79,7 @@ class LinuxCDebugger implements CDebugger {
 
   public CFrame topFrameForThread(ThreadProxy thread) throws DebuggerException {
     String cpu = dbg.getCPU();
-    if (cpu.equals("x86")) {
-       X86ThreadContext context = (X86ThreadContext) thread.getContext();
-       Address ebp = context.getRegisterAsAddress(X86ThreadContext.EBP);
-       if (ebp == null) return null;
-       Address pc  = context.getRegisterAsAddress(X86ThreadContext.EIP);
-       if (pc == null) return null;
-       return new LinuxX86CFrame(dbg, ebp, pc);
-    } else if (cpu.equals("amd64")) {
+    if (cpu.equals("amd64")) {
        AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
        Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
        if (pc == null) return null;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java
index 69a34fe2afa..88863e76285 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java
@@ -27,15 +27,12 @@ package sun.jvm.hotspot.debugger.linux;
 import java.lang.reflect.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.linux.amd64.*;
-import sun.jvm.hotspot.debugger.linux.x86.*;
 import sun.jvm.hotspot.debugger.linux.ppc64.*;
 
 class LinuxThreadContextFactory {
    static ThreadContext createThreadContext(LinuxDebugger dbg) {
       String cpu = dbg.getCPU();
-      if (cpu.equals("x86")) {
-         return new LinuxX86ThreadContext(dbg);
-      } else if (cpu.equals("amd64")) {
+      if (cpu.equals("amd64")) {
          return new LinuxAMD64ThreadContext(dbg);
       }  else if (cpu.equals("ppc64")) {
           return new LinuxPPC64ThreadContext(dbg);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java
deleted file mode 100644
index 3834eb41a36..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.linux.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.linux.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.cdbg.basic.*;
-import sun.jvm.hotspot.debugger.x86.*;
-
-public final class LinuxX86CFrame extends BasicCFrame {
-   // package/class internals only
-   public LinuxX86CFrame(LinuxDebugger dbg, Address ebp, Address pc) {
-      super(dbg.getCDebugger());
-      this.ebp = ebp;
-      this.pc = pc;
-      this.dbg = dbg;
-   }
-
-   // override base class impl to avoid ELF parsing
-   public ClosestSymbol closestSymbolToPC() {
-      // try native lookup in debugger.
-      return dbg.lookup(dbg.getAddressValue(pc()));
-   }
-
-   public Address pc() {
-      return pc;
-   }
-
-   public Address localVariableBase() {
-      return ebp;
-   }
-
-   public CFrame sender(ThreadProxy thread) {
-      X86ThreadContext context = (X86ThreadContext) thread.getContext();
-      /*
-       * Native code fills in the stack pointer register value using index
-       * X86ThreadContext.SP.
-       * See file LinuxDebuggerLocal.c macro REG_INDEX(reg).
-       *
-       * Be sure to use SP, or UESP which is aliased to SP in Java code,
-       * for the frame pointer validity check.
-       */
-      Address esp = context.getRegisterAsAddress(X86ThreadContext.SP);
-
-      if ( (ebp == null) || ebp.lessThan(esp) ) {
-        return null;
-      }
-
-      // Check alignment of ebp
-      if ( dbg.getAddressValue(ebp) % ADDRESS_SIZE != 0) {
-        return null;
-      }
-
-      Address nextEBP = ebp.getAddressAt( 0 * ADDRESS_SIZE);
-      if (nextEBP == null || nextEBP.lessThanOrEqual(ebp)) {
-        return null;
-      }
-      Address nextPC  = ebp.getAddressAt( 1 * ADDRESS_SIZE);
-      if (nextPC == null) {
-        return null;
-      }
-      return new LinuxX86CFrame(dbg, nextEBP, nextPC);
-   }
-
-   private static final int ADDRESS_SIZE = 4;
-   private Address pc;
-   private Address ebp;
-   private LinuxDebugger dbg;
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java
deleted file mode 100644
index 5ba323356fe..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.linux.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.debugger.linux.*;
-
-public class LinuxX86ThreadContext extends X86ThreadContext {
-  private LinuxDebugger debugger;
-
-  public LinuxX86ThreadContext(LinuxDebugger debugger) {
-    super();
-    this.debugger = debugger;
-  }
-
-  public void setRegisterAsAddress(int index, Address value) {
-    setRegister(index, debugger.getAddressValue(value));
-  }
-
-  public Address getRegisterAsAddress(int index) {
-    return debugger.newAddress(getRegister(index));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
index d4a7c17dc85..3833680d96c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
@@ -30,7 +30,6 @@ import java.lang.reflect.*;
 
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.remote.x86.*;
 import sun.jvm.hotspot.debugger.remote.amd64.*;
 import sun.jvm.hotspot.debugger.remote.ppc64.*;
 
@@ -55,9 +54,7 @@ public class RemoteDebuggerClient extends DebuggerBase implements JVMDebugger {
       int cachePageSize = 4096;
       int cacheNumPages = parseCacheNumPagesProperty(cacheSize / cachePageSize);
       String cpu = remoteDebugger.getCPU();
-      if (cpu.equals("x86")) {
-        threadFactory = new RemoteX86ThreadFactory(this);
-      } else if (cpu.equals("amd64") || cpu.equals("x86_64")) {
+      if (cpu.equals("amd64") || cpu.equals("x86_64")) {
         threadFactory = new RemoteAMD64ThreadFactory(this);
       } else if (cpu.equals("ppc64")) {
         threadFactory = new RemotePPC64ThreadFactory(this);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java
deleted file mode 100644
index f591900283c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.remote.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.debugger.remote.*;
-import sun.jvm.hotspot.utilities.*;
-
-public class RemoteX86Thread extends RemoteThread  {
-  public RemoteX86Thread(RemoteDebuggerClient debugger, Address addr) {
-     super(debugger, addr);
-  }
-
-  public RemoteX86Thread(RemoteDebuggerClient debugger, long id) {
-     super(debugger, id);
-  }
-
-  public ThreadContext getContext() throws IllegalThreadStateException {
-    RemoteX86ThreadContext context = new RemoteX86ThreadContext(debugger);
-    long[] regs = (addr != null)? debugger.getThreadIntegerRegisterSet(addr) :
-                                  debugger.getThreadIntegerRegisterSet(id);
-    if (Assert.ASSERTS_ENABLED) {
-      Assert.that(regs.length == X86ThreadContext.NPRGREG, "size of register set must match");
-    }
-    for (int i = 0; i < regs.length; i++) {
-      context.setRegister(i, regs[i]);
-    }
-    return context;
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java
deleted file mode 100644
index e5bbe9647a9..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.remote.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.debugger.remote.*;
-
-public class RemoteX86ThreadContext extends X86ThreadContext {
-  private RemoteDebuggerClient debugger;
-
-  public RemoteX86ThreadContext(RemoteDebuggerClient debugger) {
-    super();
-    this.debugger = debugger;
-  }
-
-  /** This can't be implemented in this class since we would have to
-      tie the implementation to, for example, the debugging system */
-  public void setRegisterAsAddress(int index, Address value) {
-    setRegister(index, debugger.getAddressValue(value));
-  }
-
-  /** This can't be implemented in this class since we would have to
-      tie the implementation to, for example, the debugging system */
-  public Address getRegisterAsAddress(int index) {
-    return debugger.newAddress(getRegister(index));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java
deleted file mode 100644
index f8a8f247318..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.remote.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.remote.*;
-
-public class RemoteX86ThreadFactory implements RemoteThreadFactory {
-  private RemoteDebuggerClient debugger;
-
-  public RemoteX86ThreadFactory(RemoteDebuggerClient debugger) {
-    this.debugger = debugger;
-  }
-
-  public ThreadProxy createThreadWrapper(Address threadIdentifierAddr) {
-    return new RemoteX86Thread(debugger, threadIdentifierAddr);
-  }
-
-  public ThreadProxy createThreadWrapper(long id) {
-    return new RemoteX86Thread(debugger, id);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java
deleted file mode 100644
index 9793f20deb8..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.win32.coff;
-
-public interface DebugVC50X86RegisterEnums {
-  /** 8-bit registers */
-  public static final int NONE = 0;
-  public static final int AL = 1;
-  public static final int CL = 2;
-  public static final int DL = 3;
-  public static final int BL = 4;
-  public static final int AH = 5;
-  public static final int CH = 6;
-  public static final int DH = 7;
-  public static final int BH = 8;
-
-  /** 16-bit registers */
-  public static final int AX = 9;
-  public static final int CX = 10;
-  public static final int DX = 11;
-  public static final int BX = 12;
-  public static final int SP = 13;
-  public static final int BP = 14;
-  public static final int SI = 15;
-  public static final int DI = 16;
-
-  /** 32-bit registers */
-  public static final int EAX = 17;
-  public static final int ECX = 18;
-  public static final int EDX = 19;
-  public static final int EBX = 20;
-  public static final int ESP = 21;
-  public static final int EBP = 22;
-  public static final int ESI = 23;
-  public static final int EDI = 24;
-
-  /** Segment registers */
-  public static final int ES = 25;
-  public static final int CS = 26;
-  public static final int SS = 27;
-  public static final int DS = 28;
-  public static final int FS = 29;
-  public static final int GS = 30;
-
-  /** Special cases */
-  public static final int IP = 31;
-  public static final int FLAGS = 32;
-  public static final int EIP = 33;
-  public static final int EFLAGS = 34;
-
-  /** PCODE Registers */
-  public static final int TEMP = 40;
-  public static final int TEMPH = 41;
-  public static final int QUOTE = 42;
-
-  /** System Registers */
-  public static final int CR0 = 80;
-  public static final int CR1 = 81;
-  public static final int CR2 = 82;
-  public static final int CR3 = 83;
-  public static final int DR0 = 90;
-  public static final int DR1 = 91;
-  public static final int DR2 = 92;
-  public static final int DR3 = 93;
-  public static final int DR4 = 94;
-  public static final int DR5 = 95;
-  public static final int DR6 = 96;
-  public static final int DR7 = 97;
-
-  /** Register extensions for 80x87 */
-  public static final int ST0 = 128;
-  public static final int ST1 = 129;
-  public static final int ST2 = 130;
-  public static final int ST3 = 131;
-  public static final int ST4 = 132;
-  public static final int ST5 = 133;
-  public static final int ST6 = 134;
-  public static final int ST7 = 135;
-  public static final int CONTROL = 136;
-  public static final int STATUS = 137;
-  public static final int TAG = 138;
-  public static final int FPIP = 139;
-  public static final int FPCS = 140;
-  public static final int FPDO = 141;
-  public static final int FPDS = 142;
-  public static final int ISEM = 143;
-  public static final int FPEIP = 144;
-  public static final int FPEDO = 145;
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
index 86ca82ea33f..6fbea538488 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
@@ -49,11 +49,6 @@ public interface WindbgDebugger extends JVMDebugger {
   public WindbgAddress readCompKlassAddress(long address) throws DebuggerException;
   public WindbgOopHandle readOopHandle(long address) throws DebuggerException;
   public WindbgOopHandle readCompOopHandle(long address) throws DebuggerException;
-
-  // The returned array of register contents is guaranteed to be in
-  // the same order as in the DbxDebugger for Solaris/x86 or amd64; that is,
-  // the indices match those in debugger/x86/X86ThreadContext.java or
-  // debugger/amd64/AMD64ThreadContext.java.
   public long[]       getThreadIntegerRegisterSet(long threadId) throws DebuggerException;
 
   public long         getThreadIdFromSysId(long sysId) throws DebuggerException;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
index 07704671fd4..b45dbd23405 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
@@ -523,9 +523,7 @@ public class WindbgDebuggerLocal extends DebuggerBase implements WindbgDebugger
 
       // Only add the search path for the current CPU architecture:
       String cpu = PlatformInfo.getCPU();
-      if (cpu.equals("x86")) {
-          searchList.add(DTFWHome + " (x86)");
-      } else if (cpu.equals("amd64")) {
+      if (cpu.equals("amd64")) {
           searchList.add(DTFWHome + " (x64)");
       }
       // The last place to search is the system directory:
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java
deleted file mode 100644
index e37e51cebbe..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.debugger.x86;
-
-import java.lang.annotation.Native;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
-
-/** Specifies the thread context on x86 platforms; only a sub-portion
-    of the context is guaranteed to be present on all operating
-    systems. */
-
-public abstract class X86ThreadContext implements ThreadContext {
-  // Taken from /usr/include/ia32/sys/reg.h on Solaris/x86
-
-  // NOTE: the indices for the various registers must be maintained as
-  // listed across various operating systems. However, only a small
-  // subset of the registers' values are guaranteed to be present (and
-  // must be present for the SA's stack walking to work): EAX, EBX,
-  // ECX, EDX, ESI, EDI, EBP, ESP, and EIP.
-
-  // One instance of the Native annotation is enough to trigger header generation
-  // for this file.
-  @Native
-  public static final int GS = 0;
-  public static final int FS = 1;
-  public static final int ES = 2;
-  public static final int DS = 3;
-  public static final int EDI = 4;
-  public static final int ESI = 5;
-  public static final int EBP = 6;
-  public static final int ESP = 7;
-  public static final int EBX = 8;
-  public static final int EDX = 9;
-  public static final int ECX = 10;
-  public static final int EAX = 11;
-  public static final int TRAPNO = 12;
-  public static final int ERR = 13;
-  public static final int EIP = 14;
-  public static final int CS = 15;
-  public static final int EFL = 16;
-  public static final int UESP = 17;
-  public static final int SS = 18;
-  // Additional state (not in reg.h) for debug registers
-  public static final int DR0 = 19;
-  public static final int DR1 = 20;
-  public static final int DR2 = 21;
-  public static final int DR3 = 22;
-  public static final int DR6 = 23;
-  public static final int DR7 = 24;
-
-
-  public static final int PC = EIP;
-  public static final int FP = EBP;
-  public static final int SP = UESP;
-  public static final int PS = EFL;
-  public static final int R0 = EAX;
-  public static final int R1 = EDX;
-
-  public static final int NPRGREG = 25;
-
-  private static final String[] regNames = {
-    "GS",     "FS",    "ES",    "DS",
-    "EDI",    "ESI",   "EBP",   "ESP",
-    "EBX",    "EDX",   "ECX",   "EAX",
-    "TRAPNO", "ERR",   "EIP",   "CS",
-    "EFLAGS", "UESP",  "SS",
-    "DR0",    "DR1",   "DR2",   "DR3",
-    "DR6",    "DR7"
-  };
-
-  // Ought to be int on x86 but we're stuck
-  private long[] data;
-
-  public X86ThreadContext() {
-    data = new long[NPRGREG];
-  }
-
-  public int getNumRegisters() {
-    return NPRGREG;
-  }
-
-  public String getRegisterName(int index) {
-    return regNames[index];
-  }
-
-  public void setRegister(int index, long value) {
-    data[index] = value;
-  }
-
-  public long getRegister(int index) {
-    return data[index];
-  }
-
-  public CFrame getTopFrame(Debugger dbg) {
-    return null;
-  }
-
-  /** This can't be implemented in this class since we would have to
-      tie the implementation to, for example, the debugging system */
-  public abstract void setRegisterAsAddress(int index, Address value);
-
-  /** This can't be implemented in this class since we would have to
-      tie the implementation to, for example, the debugging system */
-  public abstract Address getRegisterAsAddress(int index);
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java
index 566b527b88a..a2808bfff31 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java
@@ -41,7 +41,7 @@ public class StackValueCollection {
   public StackValue get(int i)    { return list.get(i); }
 
   // Get typed locals/expressions
-  // FIXME: must figure out whether word swapping is necessary on x86
+  // FIXME: must figure out whether word swapping is necessary on amd64
   public boolean   booleanAt(int slot)   { return (int)get(slot).getInteger() != 0; }
   public byte      byteAt(int slot)      { return (byte) get(slot).getInteger(); }
   public char      charAt(int slot)      { return (char) get(slot).getInteger(); }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
index 6acacc28722..04c4c944517 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
@@ -30,12 +30,10 @@ import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.runtime.win32_amd64.Win32AMD64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.win32_aarch64.Win32AARCH64JavaThreadPDAccess;
-import sun.jvm.hotspot.runtime.linux_x86.LinuxX86JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_aarch64.LinuxAARCH64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_riscv64.LinuxRISCV64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_ppc64.LinuxPPC64JavaThreadPDAccess;
-import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.bsd_amd64.BsdAMD64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.bsd_aarch64.BsdAARCH64JavaThreadPDAccess;
 import sun.jvm.hotspot.utilities.*;
@@ -101,9 +99,7 @@ public class Threads {
                 access =  new Win32AARCH64JavaThreadPDAccess();
             }
         } else if (os.equals("linux")) {
-            if (cpu.equals("x86")) {
-                access = new LinuxX86JavaThreadPDAccess();
-            } else if (cpu.equals("amd64")) {
+            if (cpu.equals("amd64")) {
                 access = new LinuxAMD64JavaThreadPDAccess();
             } else if (cpu.equals("ppc64")) {
                 access = new LinuxPPC64JavaThreadPDAccess();
@@ -123,9 +119,7 @@ public class Threads {
               }
             }
         } else if (os.equals("bsd")) {
-            if (cpu.equals("x86")) {
-                access = new BsdX86JavaThreadPDAccess();
-            } else if (cpu.equals("amd64") || cpu.equals("x86_64")) {
+            if (cpu.equals("amd64") || cpu.equals("x86_64")) {
                 access = new BsdAMD64JavaThreadPDAccess();
             }
         } else if (os.equals("darwin")) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
index c558374d23c..dc27a4fc59e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
@@ -879,9 +879,7 @@ public class VM {
   }
 
   /** Indicates whether a given program counter is in Java code. This
-      includes but is not spanned by the interpreter and code cache.
-      Only used in the debugging system, for implementing
-      JavaThread.currentFrameGuess() on x86. */
+      includes but is not spanned by the interpreter and code cache. */
   public boolean isJavaPCDbg(Address addr) {
     // FIXME: this is not a complete enough set: must include areas
     // like vtable stubs
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
index 29df979e13e..e85973773dc 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
@@ -30,7 +30,7 @@ import sun.jvm.hotspot.code.*;
 import sun.jvm.hotspot.interpreter.*;
 import sun.jvm.hotspot.oops.*;
 import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.runtime.x86.*;
+import sun.jvm.hotspot.runtime.amd64.*;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.*;
 
@@ -67,7 +67,7 @@ public class AMD64CurrentFrameGuess {
 
   private boolean validateInterpreterFrame(Address sp, Address fp, Address pc) {
     VM vm = VM.getVM();
-    X86Frame f = new X86Frame(sp, fp, pc);
+    AMD64Frame f = new AMD64Frame(sp, fp, pc);
 
     // First validate that frame->method is really a Method*
     Method method = null;
@@ -263,7 +263,7 @@ public class AMD64CurrentFrameGuess {
              offset += vm.getAddressSize()) {
           try {
             Address curSP = sp.addOffsetTo(offset);
-            Frame frame = new X86Frame(curSP, null, pc);
+            Frame frame = new AMD64Frame(curSP, null, pc);
             RegisterMap map = thread.newRegisterMap(false);
             while (frame != null) {
               if (frame.isEntryFrame() && frame.entryFrameIsFirst()) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java
similarity index 88%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java
rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java
index 2d972d3df17..360f62a253d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java
@@ -22,7 +22,7 @@
  *
  */
 
-package sun.jvm.hotspot.runtime.x86;
+package sun.jvm.hotspot.runtime.amd64;
 
 import java.util.*;
 import sun.jvm.hotspot.code.*;
@@ -36,12 +36,12 @@ import sun.jvm.hotspot.utilities.Observable;
 import sun.jvm.hotspot.utilities.Observer;
 
 /** Specialization of and implementation of abstract methods of the
-    Frame class for the x86 family of CPUs. */
+    Frame class for the x86_64 family of CPUs. */
 
-public class X86Frame extends Frame {
+public class AMD64Frame extends Frame {
   private static final boolean DEBUG;
   static {
-    DEBUG = System.getProperty("sun.jvm.hotspot.runtime.x86.X86Frame.DEBUG") != null;
+    DEBUG = System.getProperty("sun.jvm.hotspot.runtime.amd64.AMD64Frame.DEBUG") != null;
   }
 
   // All frames
@@ -99,7 +99,7 @@ public class X86Frame extends Frame {
   private Address raw_unextendedSP;
   private Address live_bcp;
 
-  private X86Frame() {
+  private AMD64Frame() {
   }
 
   private void initFrame(Address raw_sp, Address raw_fp, Address pc, Address raw_unextendedSp, Address live_bcp) {
@@ -122,44 +122,44 @@ public class X86Frame extends Frame {
   }
 
 
-  public X86Frame(Address raw_sp, Address raw_fp, Address pc) {
+  public AMD64Frame(Address raw_sp, Address raw_fp, Address pc) {
     initFrame(raw_sp, raw_fp, pc, null, null);
 
     if (DEBUG) {
-      System.out.println("X86Frame(sp, fp, pc): " + this);
+      System.out.println("AMD64Frame(sp, fp, pc): " + this);
       dumpStack();
     }
   }
 
-  public X86Frame(Address raw_sp, Address raw_fp) {
+  public AMD64Frame(Address raw_sp, Address raw_fp) {
     initFrame(raw_sp, raw_fp, null, null, null);
 
     if (DEBUG) {
-      System.out.println("X86Frame(sp, fp): " + this);
+      System.out.println("AMD64Frame(sp, fp): " + this);
       dumpStack();
     }
   }
 
-  public X86Frame(Address raw_sp, Address raw_unextendedSp, Address raw_fp, Address pc) {
+  public AMD64Frame(Address raw_sp, Address raw_unextendedSp, Address raw_fp, Address pc) {
     initFrame(raw_sp, raw_fp, pc, raw_unextendedSp, null);
 
     if (DEBUG) {
-      System.out.println("X86Frame(sp, unextendedSP, fp, pc): " + this);
+      System.out.println("AMD64Frame(sp, unextendedSP, fp, pc): " + this);
       dumpStack();
     }
   }
 
-  public X86Frame(Address raw_sp, Address raw_fp, Address pc, Address raw_unextendedSp, Address live_bcp) {
+  public AMD64Frame(Address raw_sp, Address raw_fp, Address pc, Address raw_unextendedSp, Address live_bcp) {
     initFrame(raw_sp, raw_fp, pc, raw_unextendedSp, live_bcp);
 
     if (DEBUG) {
-      System.out.println("X86Frame(sp, fp, pc, unextendedSP, live_bcp): " + this);
+      System.out.println("AMD64Frame(sp, fp, pc, unextendedSP, live_bcp): " + this);
       dumpStack();
     }
   }
 
   public Object clone() {
-    X86Frame frame = new X86Frame();
+    AMD64Frame frame = new AMD64Frame();
     frame.raw_sp = raw_sp;
     frame.raw_unextendedSP = raw_unextendedSP;
     frame.raw_fp = raw_fp;
@@ -174,11 +174,11 @@ public class X86Frame extends Frame {
       return false;
     }
 
-    if (!(arg instanceof X86Frame)) {
+    if (!(arg instanceof AMD64Frame)) {
       return false;
     }
 
-    X86Frame other = (X86Frame) arg;
+    AMD64Frame other = (AMD64Frame) arg;
 
     return (AddressOps.equal(getSP(), other.getSP()) &&
             AddressOps.equal(getUnextendedSP(), other.getUnextendedSP()) &&
@@ -206,7 +206,7 @@ public class X86Frame extends Frame {
   public Address getSP() { return raw_sp; }
   public Address getID() { return raw_sp; }
 
-  // FIXME: not implemented yet (should be done for Solaris/X86)
+  // FIXME: not implemented yet (should be done for Solaris)
   public boolean isSignalHandlerFrameDbg() { return false; }
   public int     getSignalNumberDbg()      { return 0;     }
   public String  getSignalNameDbg()        { return null;  }
@@ -248,7 +248,7 @@ public class X86Frame extends Frame {
   //  void    patch_pc(Thread* thread, address pc);
 
   public Frame sender(RegisterMap regMap, CodeBlob cb) {
-    X86RegisterMap map = (X86RegisterMap) regMap;
+    AMD64RegisterMap map = (AMD64RegisterMap) regMap;
 
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(map != null, "map must be set");
@@ -281,10 +281,10 @@ public class X86Frame extends Frame {
 
     // Must be native-compiled frame, i.e. the marshaling code for native
     // methods that exists in the core system.
-    return new X86Frame(getSenderSP(), getLink(), getSenderPC());
+    return new AMD64Frame(getSenderSP(), getLink(), getSenderPC());
   }
 
-  private Frame senderForEntryFrame(X86RegisterMap map) {
+  private Frame senderForEntryFrame(AMD64RegisterMap map) {
     if (DEBUG) {
       System.out.println("senderForEntryFrame");
     }
@@ -293,16 +293,16 @@ public class X86Frame extends Frame {
     }
     // Java frame called from C; skip all C frames and return top C
     // frame of that chunk as the sender
-    X86JavaCallWrapper jcw = (X86JavaCallWrapper) getEntryFrameCallWrapper();
+    AMD64JavaCallWrapper jcw = (AMD64JavaCallWrapper) getEntryFrameCallWrapper();
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(!entryFrameIsFirst(), "next Java fp must be non zero");
       Assert.that(jcw.getLastJavaSP().greaterThan(getSP()), "must be above this frame on stack");
     }
-    X86Frame fr;
+    AMD64Frame fr;
     if (jcw.getLastJavaPC() != null) {
-      fr = new X86Frame(jcw.getLastJavaSP(), jcw.getLastJavaFP(), jcw.getLastJavaPC());
+      fr = new AMD64Frame(jcw.getLastJavaSP(), jcw.getLastJavaFP(), jcw.getLastJavaPC());
     } else {
-      fr = new X86Frame(jcw.getLastJavaSP(), jcw.getLastJavaFP());
+      fr = new AMD64Frame(jcw.getLastJavaSP(), jcw.getLastJavaFP());
     }
     map.clear();
     if (Assert.ASSERTS_ENABLED) {
@@ -311,7 +311,7 @@ public class X86Frame extends Frame {
     return fr;
   }
 
-  private Frame senderForUpcallStub(X86RegisterMap map, UpcallStub stub) {
+  private Frame senderForUpcallStub(AMD64RegisterMap map, UpcallStub stub) {
     if (DEBUG) {
       System.out.println("senderForUpcallStub");
     }
@@ -326,11 +326,11 @@ public class X86Frame extends Frame {
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(lastJavaSP.greaterThan(getSP()), "must be above this frame on stack");
     }
-    X86Frame fr;
+    AMD64Frame fr;
     if (lastJavaPC != null) {
-      fr = new X86Frame(lastJavaSP, lastJavaFP, lastJavaPC);
+      fr = new AMD64Frame(lastJavaSP, lastJavaFP, lastJavaPC);
     } else {
-      fr = new X86Frame(lastJavaSP, lastJavaFP);
+      fr = new AMD64Frame(lastJavaSP, lastJavaFP);
     }
     map.clear();
     if (Assert.ASSERTS_ENABLED) {
@@ -339,7 +339,7 @@ public class X86Frame extends Frame {
     return fr;
   }
 
-  private Frame senderForInterpreterFrame(X86RegisterMap map) {
+  private Frame senderForInterpreterFrame(AMD64RegisterMap map) {
     if (DEBUG) {
       System.out.println("senderForInterpreterFrame");
     }
@@ -355,32 +355,28 @@ public class X86Frame extends Frame {
     if (map.getUpdateMap())
       updateMapWithSavedLink(map, addressOfStackSlot(LINK_OFFSET));
 
-    return new X86Frame(sp, unextendedSP, getLink(), getSenderPC());
+    return new AMD64Frame(sp, unextendedSP, getLink(), getSenderPC());
   }
 
   private void updateMapWithSavedLink(RegisterMap map, Address savedFPAddr) {
     map.setLocation(rbp, savedFPAddr);
   }
 
-  private Frame senderForContinuationStub(X86RegisterMap map, CodeBlob cb) {
+  private Frame senderForContinuationStub(AMD64RegisterMap map, CodeBlob cb) {
     var contEntry = map.getThread().getContEntry();
 
     Address senderSP = contEntry.getEntrySP();
     Address senderPC = contEntry.getEntryPC();
     Address senderFP = contEntry.getEntryFP();
 
-    return new X86Frame(senderSP, senderFP, senderPC);
+    return new AMD64Frame(senderSP, senderFP, senderPC);
   }
 
-  private Frame senderForCompiledFrame(X86RegisterMap map, CodeBlob cb) {
+  private Frame senderForCompiledFrame(AMD64RegisterMap map, CodeBlob cb) {
     if (DEBUG) {
       System.out.println("senderForCompiledFrame");
     }
 
-    //
-    // NOTE: some of this code is (unfortunately) duplicated in X86CurrentFrameGuess
-    //
-
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(map != null, "map must be set");
     }
@@ -414,7 +410,7 @@ public class X86Frame extends Frame {
       updateMapWithSavedLink(map, savedFPAddr);
     }
 
-    return new X86Frame(senderSP, savedFPAddr.getAddressAt(0), senderPC);
+    return new AMD64Frame(senderSP, savedFPAddr.getAddressAt(0), senderPC);
   }
 
   protected boolean hasSenderPD() {
@@ -545,7 +541,7 @@ public class X86Frame extends Frame {
 
   // Entry frames
   public JavaCallWrapper getEntryFrameCallWrapper() {
-    return new X86JavaCallWrapper(addressOfStackSlot(ENTRY_FRAME_CALL_WRAPPER_OFFSET).getAddressAt(0));
+    return new AMD64JavaCallWrapper(addressOfStackSlot(ENTRY_FRAME_CALL_WRAPPER_OFFSET).getAddressAt(0));
   }
 
   protected Address addressOfSavedOopResult() {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java
similarity index 85%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java
rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java
index 4cde2902043..b1ae1e8a001 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java
@@ -22,24 +22,24 @@
  *
  */
 
-package sun.jvm.hotspot.runtime.x86;
+package sun.jvm.hotspot.runtime.amd64;
 
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.runtime.*;
 
-public class X86RegisterMap extends RegisterMap {
+public class AMD64RegisterMap extends RegisterMap {
 
   /** This is the only public constructor */
-  public X86RegisterMap(JavaThread thread, boolean updateMap) {
+  public AMD64RegisterMap(JavaThread thread, boolean updateMap) {
     super(thread, updateMap);
   }
 
-  protected X86RegisterMap(RegisterMap map) {
+  protected AMD64RegisterMap(RegisterMap map) {
     super(map);
   }
 
   public Object clone() {
-    X86RegisterMap retval = new X86RegisterMap(this);
+    AMD64RegisterMap retval = new AMD64RegisterMap(this);
     return retval;
   }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
index 3f7d923a564..a2cdac72add 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
@@ -32,7 +32,6 @@ import sun.jvm.hotspot.debugger.bsd.BsdDebugger;
 import sun.jvm.hotspot.debugger.bsd.BsdDebuggerLocal;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.runtime.amd64.*;
-import sun.jvm.hotspot.runtime.x86.*;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.*;
 import sun.jvm.hotspot.utilities.Observable;
@@ -87,11 +86,11 @@ public class BsdAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
     if (fp == null) {
       return null; // no information
     }
-    return new X86Frame(thread.getLastJavaSP(), fp);
+    return new AMD64Frame(thread.getLastJavaSP(), fp);
   }
 
   public    RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
-    return new X86RegisterMap(thread, updateMap);
+    return new AMD64RegisterMap(thread, updateMap);
   }
 
   public    Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
@@ -102,13 +101,13 @@ public class BsdAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
       return null;
     }
     if (guesser.getPC() == null) {
-      return new X86Frame(guesser.getSP(), guesser.getFP());
+      return new AMD64Frame(guesser.getSP(), guesser.getFP());
     } else if (VM.getVM().getInterpreter().contains(guesser.getPC())) {
       // pass the value of R13 which contains the bcp for the top level frame
       Address bcp = context.getRegisterAsAddress(AMD64ThreadContext.R13);
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC(), null, bcp);
+      return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC(), null, bcp);
     } else {
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+      return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
     }
   }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
deleted file mode 100644
index 703a09747ae..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.bsd_x86;
-
-public class BsdSignals {
-  private static String[] signalNames = {
-    "",           /* No signal 0 */
-    "SIGHUP",     /* hangup */
-    "SIGINT",     /* interrupt */
-    "SIGQUIT",    /* quit */
-    "SIGILL",     /* illegal instr. (not reset when caught) */
-    "SIGTRAP",    /* trace trap (not reset when caught) */
-    "SIGABRT",    /* abort() */
-    "SIGEMT",     /* EMT instruction */
-    "SIGFPE",     /* floating point exception */
-    "SIGKILL",    /* kill (cannot be caught or ignored) */
-    "SIGBUS",     /* bus error */
-    "SIGSEGV",    /* segmentation violation */
-    "SIGSYS",     /* non-existent system call invoked */
-    "SIGPIPE",    /* write on a pipe with no one to read it */
-    "SIGALRM",    /* alarm clock */
-    "SIGTERM",    /* software termination signal from kill */
-    "SIGURG",     /* urgent condition on IO channel */
-    "SIGSTOP",    /* sendable stop signal not from tty */
-    "SIGTSTP",    /* stop signal from tty */
-    "SIGCONT",    /* continue a stopped process */
-    "SIGCHLD",    /* to parent on child stop or exit */
-    "SIGTTIN",    /* to readers pgrp upon background tty read */
-    "SIGTTOU",    /* like TTIN if (tp->t_local&LTOSTOP) */
-    "SIGIO",      /* input/output possible signal */
-    "SIGXCPU",    /* exceeded CPU time limit */
-    "SIGXFSZ",    /* exceeded file size limit */
-    "SIGVTALRM",  /* virtual time alarm */
-    "SIGPROF",    /* profiling time alarm */
-    "SIGWINCH",   /* window size changes */
-    "SIGINFO",    /* information request */
-    "SIGUSR1",    /* user defined signal 1 */
-    "SIGUSR2"     /* user defined signal 2 */
-  };
-
-  public static String getSignalName(int sigNum) {
-    if ((sigNum <= 0) || (sigNum >= signalNames.length)) {
-      // Probably best to fail in a non-destructive way
-      return "<Error: Illegal signal number " + sigNum + ">";
-    }
-    return signalNames[sigNum];
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java
deleted file mode 100644
index f4e2ab49f7e..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.bsd_x86;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.runtime.x86.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class BsdX86JavaThreadPDAccess implements JavaThreadPDAccess {
-  private static AddressField  lastJavaFPField;
-  private static AddressField  osThreadField;
-
-  // Field from OSThread
-  private static CIntegerField osThreadThreadIDField;
-
-  // This is currently unneeded but is being kept in case we change
-  // the currentFrameGuess algorithm
-  private static final long GUESS_SCAN_RANGE = 128 * 1024;
-
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) {
-    Type type = db.lookupType("JavaThread");
-    osThreadField           = type.getAddressField("_osthread");
-
-    Type anchorType = db.lookupType("JavaFrameAnchor");
-    lastJavaFPField         = anchorType.getAddressField("_last_Java_fp");
-
-    Type osThreadType = db.lookupType("OSThread");
-    osThreadThreadIDField   = osThreadType.getCIntegerField("_thread_id");
-  }
-
-  public    Address getLastJavaFP(Address addr) {
-    return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset()));
-  }
-
-  public    Address getLastJavaPC(Address addr) {
-    return null;
-  }
-
-  public    Address getBaseOfStackPointer(Address addr) {
-    return null;
-  }
-
-  public    Frame getLastFramePD(JavaThread thread, Address addr) {
-    Address fp = thread.getLastJavaFP();
-    if (fp == null) {
-      return null; // no information
-    }
-    return new X86Frame(thread.getLastJavaSP(), fp);
-  }
-
-  public    RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
-    return new X86RegisterMap(thread, updateMap);
-  }
-
-  public    Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
-    ThreadProxy t = getThreadProxy(addr);
-    X86ThreadContext context = (X86ThreadContext) t.getContext();
-    X86CurrentFrameGuess guesser = new X86CurrentFrameGuess(context, thread);
-    if (!guesser.run(GUESS_SCAN_RANGE)) {
-      return null;
-    }
-    if (guesser.getPC() == null) {
-      return new X86Frame(guesser.getSP(), guesser.getFP());
-    } else {
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
-    }
-  }
-
-  public    void printThreadIDOn(Address addr, PrintStream tty) {
-    tty.print(getThreadProxy(addr));
-  }
-
-  public    void printInfoOn(Address threadAddr, PrintStream tty) {
-    tty.print("Thread id: ");
-    printThreadIDOn(threadAddr, tty);
-//    tty.println("\nPostJavaState: " + getPostJavaState(threadAddr));
-  }
-
-  public    Address getLastSP(Address addr) {
-    ThreadProxy t = getThreadProxy(addr);
-    X86ThreadContext context = (X86ThreadContext) t.getContext();
-    return context.getRegisterAsAddress(X86ThreadContext.ESP);
-  }
-
-  public    ThreadProxy getThreadProxy(Address addr) {
-    // Addr is the address of the JavaThread.
-    // Fetch the OSThread (for now and for simplicity, not making a
-    // separate "OSThread" class in this package)
-    Address osThreadAddr = osThreadField.getValue(addr);
-    // Get the address of the _thread_id from the OSThread
-    Address threadIdAddr = osThreadAddr.addOffsetTo(osThreadThreadIDField.getOffset());
-
-    JVMDebugger debugger = VM.getVM().getDebugger();
-    return debugger.getThreadForIdentifierAddress(threadIdAddr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
index 2737cc84fe4..f8672066189 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
@@ -30,7 +30,6 @@ import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.runtime.amd64.*;
-import sun.jvm.hotspot.runtime.x86.*;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.*;
 import sun.jvm.hotspot.utilities.Observable;
@@ -83,11 +82,11 @@ public class LinuxAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
     if (fp == null) {
       return null; // no information
     }
-    return new X86Frame(thread.getLastJavaSP(), fp);
+    return new AMD64Frame(thread.getLastJavaSP(), fp);
   }
 
   public    RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
-    return new X86RegisterMap(thread, updateMap);
+    return new AMD64RegisterMap(thread, updateMap);
   }
 
   public    Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
@@ -98,13 +97,13 @@ public class LinuxAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
       return null;
     }
     if (guesser.getPC() == null) {
-      return new X86Frame(guesser.getSP(), guesser.getFP());
+      return new AMD64Frame(guesser.getSP(), guesser.getFP());
     } else if (VM.getVM().getInterpreter().contains(guesser.getPC())) {
       // pass the value of R13 which contains the bcp for the top level frame
       Address bcp = context.getRegisterAsAddress(AMD64ThreadContext.R13);
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC(), null, bcp);
+      return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC(), null, bcp);
     } else {
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+      return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
     }
   }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java
deleted file mode 100644
index 71854d58027..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.linux_x86;
-
-public class LinuxSignals {
-  private static String[] signalNames = {
-    "",           /* No signal 0 */
-    "SIGHUP",     /* hangup */
-    "SIGINT",     /* interrupt (rubout) */
-    "SIGQUIT",    /* quit (ASCII FS) */
-    "SIGILL",     /* illegal instruction (not reset when caught) */
-    "SIGTRAP",    /* trace trap (not reset when caught) */
-    "SIGABRT",    /* used by abort, replace SIGIOT in the future */
-    "SIGIOT",
-    "SIGBUS",
-    "SIGFPE",     /* floating point exception */
-    "SIGKILL",    /* kill (cannot be caught or ignored) */
-    "SIGUSR1",    /* user defined signal 1 */
-    "SIGSEGV",    /* segmentation violation */
-    "SIGUSR2",    /* user defined signal 2 */
-    "SIGPIPE",    /* write on a pipe with no one to read it */
-    "SIGALRM",    /* alarm clock */
-    "SIGTERM",    /* software termination signal from kill */
-    "SIGSTKFLT",
-    "SIGCHLD",    /* child status change alias */
-    "SIGCONT",    /* stopped process has been continued */
-    "SIGSTOP",    /* stop (cannot be caught or ignored) */
-    "SIGTSTP",    /* user stop requested from tty */
-    "SIGTTIN",    /* background tty read attempted */
-    "SIGTTOU",    /* background tty write attempted */
-    "SIGURG",     /* urgent socket condition */
-    "SIGXCPU",    /* exceeded cpu limit */
-    "SIGXFSZ",    /* exceeded file size limit */
-    "SIGVTALRM",  /* virtual timer expired */
-    "SIGPROF",    /* profiling timer expired */
-    "SIGWINCH",   /* window size change */
-    "SIGPOLL",    /* pollable event occurred */
-    "SIGPWR",     /* power-fail restart */
-    "SIGSYS"
-  };
-
-  public static String getSignalName(int sigNum) {
-    if ((sigNum <= 0) || (sigNum >= signalNames.length)) {
-      // Probably best to fail in a non-destructive way
-      return "<Error: Illegal signal number " + sigNum + ">";
-    }
-    return signalNames[sigNum];
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java
deleted file mode 100644
index 6224de03141..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.linux_x86;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.runtime.x86.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class LinuxX86JavaThreadPDAccess implements JavaThreadPDAccess {
-  private static AddressField  lastJavaFPField;
-  private static AddressField  osThreadField;
-
-  // Field from OSThread
-  private static CIntegerField osThreadThreadIDField;
-
-  // This is currently unneeded but is being kept in case we change
-  // the currentFrameGuess algorithm
-  private static final long GUESS_SCAN_RANGE = 128 * 1024;
-
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) {
-    Type type = db.lookupType("JavaThread");
-    osThreadField           = type.getAddressField("_osthread");
-
-    Type anchorType = db.lookupType("JavaFrameAnchor");
-    lastJavaFPField         = anchorType.getAddressField("_last_Java_fp");
-
-    Type osThreadType = db.lookupType("OSThread");
-    osThreadThreadIDField   = osThreadType.getCIntegerField("_thread_id");
-  }
-
-  public    Address getLastJavaFP(Address addr) {
-    return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset()));
-  }
-
-  public    Address getLastJavaPC(Address addr) {
-    return null;
-  }
-
-  public    Address getBaseOfStackPointer(Address addr) {
-    return null;
-  }
-
-  public    Frame getLastFramePD(JavaThread thread, Address addr) {
-    Address fp = thread.getLastJavaFP();
-    if (fp == null) {
-      return null; // no information
-    }
-    return new X86Frame(thread.getLastJavaSP(), fp);
-  }
-
-  public    RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
-    return new X86RegisterMap(thread, updateMap);
-  }
-
-  public    Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
-    ThreadProxy t = getThreadProxy(addr);
-    X86ThreadContext context = (X86ThreadContext) t.getContext();
-    X86CurrentFrameGuess guesser = new X86CurrentFrameGuess(context, thread);
-    if (!guesser.run(GUESS_SCAN_RANGE)) {
-      return null;
-    }
-    if (guesser.getPC() == null) {
-      return new X86Frame(guesser.getSP(), guesser.getFP());
-    } else {
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
-    }
-  }
-
-  public    void printThreadIDOn(Address addr, PrintStream tty) {
-    tty.print(getThreadProxy(addr));
-  }
-
-  public    void printInfoOn(Address threadAddr, PrintStream tty) {
-    tty.print("Thread id: ");
-    printThreadIDOn(threadAddr, tty);
-//    tty.println("\nPostJavaState: " + getPostJavaState(threadAddr));
-  }
-
-  public    Address getLastSP(Address addr) {
-    ThreadProxy t = getThreadProxy(addr);
-    X86ThreadContext context = (X86ThreadContext) t.getContext();
-    return context.getRegisterAsAddress(X86ThreadContext.SP);
-  }
-
-  public    ThreadProxy getThreadProxy(Address addr) {
-    // Addr is the address of the JavaThread.
-    // Fetch the OSThread (for now and for simplicity, not making a
-    // separate "OSThread" class in this package)
-    Address osThreadAddr = osThreadField.getValue(addr);
-    // Get the address of the _thread_id from the OSThread
-    Address threadIdAddr = osThreadAddr.addOffsetTo(osThreadThreadIDField.getOffset());
-
-    JVMDebugger debugger = VM.getVM().getDebugger();
-    return debugger.getThreadForIdentifierAddress(threadIdAddr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
index f6975d836c1..a573b9a383a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
@@ -30,7 +30,6 @@ import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.runtime.amd64.*;
-import sun.jvm.hotspot.runtime.x86.*;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.*;
 import sun.jvm.hotspot.utilities.Observable;
@@ -88,14 +87,14 @@ public class Win32AMD64JavaThreadPDAccess implements JavaThreadPDAccess {
     }
     Address pc =  thread.getLastJavaPC();
     if ( pc != null ) {
-      return new X86Frame(thread.getLastJavaSP(), fp, pc);
+      return new AMD64Frame(thread.getLastJavaSP(), fp, pc);
     } else {
-      return new X86Frame(thread.getLastJavaSP(), fp);
+      return new AMD64Frame(thread.getLastJavaSP(), fp);
     }
   }
 
   public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
-    return new X86RegisterMap(thread, updateMap);
+    return new AMD64RegisterMap(thread, updateMap);
   }
 
   public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
@@ -106,13 +105,13 @@ public class Win32AMD64JavaThreadPDAccess implements JavaThreadPDAccess {
       return null;
     }
     if (guesser.getPC() == null) {
-      return new X86Frame(guesser.getSP(), guesser.getFP());
+      return new AMD64Frame(guesser.getSP(), guesser.getFP());
     } else if (VM.getVM().getInterpreter().contains(guesser.getPC())) {
       // pass the value of R13 which contains the bcp for the top level frame
       Address bcp = context.getRegisterAsAddress(AMD64ThreadContext.R13);
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC(), null, bcp);
+      return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC(), null, bcp);
     } else {
-      return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+      return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
     }
   }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java
deleted file mode 100644
index 80d31c823cd..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.x86;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.x86.*;
-import sun.jvm.hotspot.code.*;
-import sun.jvm.hotspot.interpreter.*;
-import sun.jvm.hotspot.runtime.*;
-
-/** <P> Should be able to be used on all x86 platforms we support
-    (Win32, Solaris/x86, and soon Linux) to implement JavaThread's
-    "currentFrameGuess()" functionality. Input is an X86ThreadContext;
-    output is SP, FP, and PC for an X86Frame. Instantiation of the
-    X86Frame is left to the caller, since we may need to subclass
-    X86Frame to support signal handler frames on Unix platforms. </P>
-
-    <P> Algorithm is to walk up the stack within a given range (say,
-    512K at most) looking for a plausible PC and SP for a Java frame,
-    also considering those coming in from the context. If we find a PC
-    that belongs to the VM (i.e., in generated code like the
-    interpreter or CodeCache) then we try to find an associated EBP.
-    We repeat this until we either find a complete frame or run out of
-    stack to look at. </P> */
-
-public class X86CurrentFrameGuess {
-  private X86ThreadContext context;
-  private JavaThread       thread;
-  private Address          spFound;
-  private Address          fpFound;
-  private Address          pcFound;
-
-  private static final boolean DEBUG = System.getProperty("sun.jvm.hotspot.runtime.x86.X86Frame.DEBUG")
-                                       != null;
-
-  public X86CurrentFrameGuess(X86ThreadContext context,
-                              JavaThread thread) {
-    this.context = context;
-    this.thread  = thread;
-  }
-
-  /** Returns false if not able to find a frame within a reasonable range. */
-  public boolean run(long regionInBytesToSearch) {
-    Address sp  = context.getRegisterAsAddress(X86ThreadContext.SP);
-    Address pc  = context.getRegisterAsAddress(X86ThreadContext.PC);
-    Address fp  = context.getRegisterAsAddress(X86ThreadContext.FP);
-    if (sp == null) {
-      // Bail out if no last java frame eithe
-      if (thread.getLastJavaSP() != null) {
-        setValues(thread.getLastJavaSP(), thread.getLastJavaFP(), null);
-        return true;
-      }
-      // Bail out
-      return false;
-    }
-    Address end = sp.addOffsetTo(regionInBytesToSearch);
-    VM vm       = VM.getVM();
-
-    setValues(null, null, null); // Assume we're not going to find anything
-
-    if (vm.isJavaPCDbg(pc)) {
-      if (vm.isClientCompiler()) {
-        // If the topmost frame is a Java frame, we are (pretty much)
-        // guaranteed to have a viable EBP. We should be more robust
-        // than this (we have the potential for losing entire threads'
-        // stack traces) but need to see how much work we really have
-        // to do here. Searching the stack for an (SP, FP) pair is
-        // hard since it's easy to misinterpret inter-frame stack
-        // pointers as base-of-frame pointers; we also don't know the
-        // sizes of C1 frames (not registered in the nmethod) so can't
-        // derive them from ESP.
-
-        setValues(sp, fp, pc);
-        return true;
-      } else {
-        if (vm.getInterpreter().contains(pc)) {
-          if (DEBUG) {
-            System.out.println("CurrentFrameGuess: choosing interpreter frame: sp = " +
-                               sp + ", fp = " + fp + ", pc = " + pc);
-          }
-          setValues(sp, fp, pc);
-          return true;
-        }
-
-        // For the server compiler, EBP is not guaranteed to be valid
-        // for compiled code. In addition, an earlier attempt at a
-        // non-searching algorithm (see below) failed because the
-        // stack pointer from the thread context was pointing
-        // (considerably) beyond the ostensible end of the stack, into
-        // garbage; walking from the topmost frame back caused a crash.
-        //
-        // This algorithm takes the current PC as a given and tries to
-        // find the correct corresponding SP by walking up the stack
-        // and repeatedly performing stackwalks (very inefficient).
-        //
-        // FIXME: there is something wrong with stackwalking across
-        // adapter frames...this is likely to be the root cause of the
-        // failure with the simpler algorithm below.
-
-        for (long offset = 0;
-             offset < regionInBytesToSearch;
-             offset += vm.getAddressSize()) {
-          try {
-            Address curSP = sp.addOffsetTo(offset);
-            Frame frame = new X86Frame(curSP, null, pc);
-            RegisterMap map = thread.newRegisterMap(false);
-            while (frame != null) {
-              if (frame.isEntryFrame() && frame.entryFrameIsFirst()) {
-                // We were able to traverse all the way to the
-                // bottommost Java frame.
-                // This sp looks good. Keep it.
-                if (DEBUG) {
-                  System.out.println("CurrentFrameGuess: Choosing sp = " + curSP + ", pc = " + pc);
-                }
-                setValues(curSP, null, pc);
-                return true;
-              }
-              Frame oldFrame = frame;
-              frame = frame.sender(map);
-              if (frame.getSP().lessThanOrEqual(oldFrame.getSP())) {
-                  // Frame points to itself or to a location in the wrong direction.
-                  // Break the loop and move on to next offset.
-                  if (DEBUG) {
-                      System.out.println("X86CurrentFrameGuess.run: frame <= oldFrame: " + frame);
-                  }
-                  break;
-              }
-            }
-          } catch (Exception e) {
-            if (DEBUG) {
-              System.out.println("CurrentFrameGuess: Exception " + e + " at offset " + offset);
-            }
-            // Bad SP. Try another.
-          }
-        }
-
-        // Were not able to find a plausible SP to go with this PC.
-        // Bail out.
-        return false;
-
-        /*
-        // Original algorithm which does not work because SP was
-        // pointing beyond where it should have:
-
-        // For the server compiler, EBP is not guaranteed to be valid
-        // for compiled code. We see whether the PC is in the
-        // interpreter and take care of that, otherwise we run code
-        // (unfortunately) duplicated from X86Frame.senderForCompiledFrame.
-
-        CodeCache cc = vm.getCodeCache();
-        if (cc.contains(pc)) {
-          CodeBlob cb = cc.findBlob(pc);
-
-          // See if we can derive a frame pointer from SP and PC
-          // NOTE: This is the code duplicated from X86Frame
-          Address saved_fp = null;
-          int llink_offset = cb.getLinkOffset();
-          if (llink_offset >= 0) {
-            // Restore base-pointer, since next frame might be an interpreter frame.
-            Address fp_addr = sp.addOffsetTo(VM.getVM().getAddressSize() * llink_offset);
-            saved_fp = fp_addr.getAddressAt(0);
-          }
-
-          setValues(sp, saved_fp, pc);
-          return true;
-        }
-        */
-      }
-    } else {
-      // If the current program counter was not known to us as a Java
-      // PC, we currently assume that we are in the run-time system
-      // and attempt to look to thread-local storage for saved ESP and
-      // EBP. Note that if these are null (because we were, in fact,
-      // in Java code, i.e., vtable stubs or similar, and the SA
-      // didn't have enough insight into the target VM to understand
-      // that) then we are going to lose the entire stack trace for
-      // the thread, which is sub-optimal. FIXME.
-
-      if (DEBUG) {
-        System.out.println("CurrentFrameGuess: choosing last Java frame: sp = " +
-                           thread.getLastJavaSP() + ", fp = " + thread.getLastJavaFP());
-      }
-      if (thread.getLastJavaSP() == null) {
-        return false; // No known Java frames on stack
-      }
-      setValues(thread.getLastJavaSP(), thread.getLastJavaFP(), null);
-      return true;
-    }
-  }
-
-  public Address getSP() { return spFound; }
-  public Address getFP() { return fpFound; }
-  /** May be null if getting values from thread-local storage; take
-      care to call the correct X86Frame constructor to recover this if
-      necessary */
-  public Address getPC() { return pcFound; }
-
-  private void setValues(Address sp, Address fp, Address pc) {
-    spFound = sp;
-    fpFound = fp;
-    pcFound = pc;
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java
deleted file mode 100644
index 61a5a8415a7..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.runtime.x86;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class X86JavaCallWrapper extends JavaCallWrapper {
-  private static AddressField lastJavaFPField;
-
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) {
-    Type type = db.lookupType("JavaFrameAnchor");
-
-    lastJavaFPField  = type.getAddressField("_last_Java_fp");
-  }
-
-  public X86JavaCallWrapper(Address addr) {
-    super(addr);
-  }
-
-  public Address getLastJavaFP() {
-    return lastJavaFPField.getValue(addr.addOffsetTo(anchorField.getOffset()));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java
index dfe18d7b161..76b8595e3b2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java
@@ -626,7 +626,7 @@ public class AnnotatedMemoryPanel extends JPanel {
 
   public static void main(String[] args) {
     JFrame frame = new JFrame();
-    DummyDebugger debugger = new DummyDebugger(new MachineDescriptionIntelX86());
+    DummyDebugger debugger = new DummyDebugger(new MachineDescriptionAMD64());
     AnnotatedMemoryPanel anno = new AnnotatedMemoryPanel(debugger);
     frame.getContentPane().add(anno);
     anno.addAnnotation(new Annotation(debugger.parseAddress("0x80000000"),
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
index f4cd4873207..53fa5204349 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -50,7 +50,7 @@ public class PlatformInfo {
 
   public static boolean knownCPU(String cpu) {
     final String[] KNOWN =
-        new String[] {"i386", "x86", "x86_64", "amd64", "ppc64", "ppc64le", "aarch64", "riscv64"};
+        new String[] {"x86_64", "amd64", "ppc64", "ppc64le", "aarch64", "riscv64"};
 
     for(String s : KNOWN) {
       if(s.equals(cpu))
@@ -60,8 +60,8 @@ public class PlatformInfo {
     return false;
   }
 
-  /* Returns "x86" for x86 based platforms and x86_64 for 64bit x86
-     based platform. Otherwise returns the value of os.arch. If the
+  /* Returns "amd64" for x86_64 based platforms.
+     Otherwise returns the value of os.arch. If the
      value is not recognized as supported, an exception is thrown
      instead. */
 
@@ -74,9 +74,6 @@ public class PlatformInfo {
     }
 
     // Tweeks
-    if (cpu.equals("i386"))
-      return "x86";
-
     if (cpu.equals("x86_64"))
       return "amd64";
 

From a5864582da7e19b941bf55c294a414bc1a0c7a84 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Thu, 6 Nov 2025 15:28:01 +0000
Subject: [PATCH 063/512] 8155591: Misleading warning when not overriding close
 method in interface extending AutoCloseable

Reviewed-by: jlahoda
---
 .../com/sun/tools/javac/comp/Attr.java        |  18 +-
 .../tools/javac/resources/compiler.properties |   5 +
 .../InterruptedExceptionTest.java             |   3 +-
 .../InterruptedExceptionTest2.java            | 256 ++++++++++++++++++
 .../InterruptedExceptionTest2.out             |  23 ++
 .../TryResourceThrowsInterruptedExc.java      |   7 +
 6 files changed, 306 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.java
 create mode 100644 test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 617d8ca7077..1465ea652b1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1982,7 +1982,7 @@ public class Attr extends JCTree.Visitor {
                         twrResult.check(resource, resource.type);
 
                         //check that resource type cannot throw InterruptedException
-                        checkAutoCloseable(resource.pos(), localEnv, resource.type);
+                        checkAutoCloseable(localEnv, resource, true);
 
                         VarSymbol var = ((JCVariableDecl) resource).sym;
 
@@ -2031,7 +2031,9 @@ public class Attr extends JCTree.Visitor {
         }
     }
 
-    void checkAutoCloseable(DiagnosticPosition pos, Env<AttrContext> env, Type resource) {
+    void checkAutoCloseable(Env<AttrContext> env, JCTree tree, boolean useSite) {
+        DiagnosticPosition pos = tree.pos();
+        Type resource = tree.type;
         if (!resource.isErroneous() &&
             types.asSuper(resource, syms.autoCloseableType.tsym) != null &&
             !types.isSameType(resource, syms.autoCloseableType)) { // Don't emit warning for AutoCloseable itself
@@ -2049,9 +2051,15 @@ public class Attr extends JCTree.Visitor {
                 log.popDiagnosticHandler(discardHandler);
             }
             if (close.kind == MTH &&
-                    close.overrides(syms.autoCloseableClose, resource.tsym, types, true) &&
+                    (useSite || close.owner != syms.autoCloseableType.tsym) &&
+                    ((MethodSymbol)close).binaryOverrides(syms.autoCloseableClose, resource.tsym, types) &&
                     chk.isHandled(syms.interruptedExceptionType, types.memberType(resource, close).getThrownTypes())) {
-                log.warning(pos, LintWarnings.TryResourceThrowsInterruptedExc(resource));
+                if (!useSite && close.owner == resource.tsym) {
+                    log.warning(TreeInfo.diagnosticPositionFor(close, tree),
+                        LintWarnings.TryResourceCanThrowInterruptedExc(resource));
+                } else {
+                    log.warning(pos, LintWarnings.TryResourceThrowsInterruptedExc(resource));
+                }
             }
         }
     }
@@ -5649,7 +5657,7 @@ public class Attr extends JCTree.Visitor {
         chk.checkImplementations(tree);
 
         //check that a resource implementing AutoCloseable cannot throw InterruptedException
-        checkAutoCloseable(tree.pos(), env, c.type);
+        checkAutoCloseable(env, tree, false);
 
         for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
             // Attribute declaration
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index d6358f6075d..4e034ff1bc8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2368,6 +2368,11 @@ compiler.warn.try.resource.not.referenced=\
 compiler.warn.try.resource.throws.interrupted.exc=\
     auto-closeable resource {0} has a member method close() that could throw InterruptedException
 
+# 0: type
+# lint: try
+compiler.warn.try.resource.can.throw.interrupted.exc=\
+    close() method can throw InterruptedException in auto-closeable class {0}
+
 # lint: unchecked
 compiler.warn.unchecked.assign=\
     unchecked assignment: {0} to {1}
diff --git a/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java
index 25dae2cc668..05317b00492 100644
--- a/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java
+++ b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java
@@ -228,7 +228,8 @@ public class InterruptedExceptionTest {
 
         public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
             if (diagnostic.getKind() == Diagnostic.Kind.WARNING &&
-                    diagnostic.getCode().contains("try.resource.throws.interrupted.exc")) {
+                    (diagnostic.getCode().contains("try.resource.throws.interrupted.exc") ||
+                     diagnostic.getCode().contains("try.resource.can.throw.interrupted.exc"))) {
                 tryWarnFound++;
             }
         }
diff --git a/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.java b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.java
new file mode 100644
index 00000000000..396823789fd
--- /dev/null
+++ b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.java
@@ -0,0 +1,256 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8155591
+ * @summary Verify cases where no AutoCloseable InterruptedException warning should be generated
+ * @compile/ref=InterruptedExceptionTest2.out -XDrawDiagnostics -Xlint:try InterruptedExceptionTest2.java
+ */
+
+import java.util.function.Supplier;
+
+// Here's an interface and a class that we can inherit declaring offending close() methods
+
+interface HasClose {
+    void close() throws Exception;
+}
+
+class WithConcreteClose {
+    public void close() throws Exception { }
+}
+
+abstract class WithAbstractClose {
+    public abstract void close() throws Exception;
+}
+
+// Interface declaration tests
+
+interface InterruptedExceptionTest_I1 extends AutoCloseable {
+}
+
+interface InterruptedExceptionTest_I2 extends AutoCloseable {
+    @Override void close();
+}
+
+interface InterruptedExceptionTest_I3 extends AutoCloseable {
+    @Override void close() throws InterruptedException;                     // warning here
+}
+
+interface InterruptedExceptionTest_I4 extends AutoCloseable {
+    @Override void close() throws Exception;                                // warning here
+}
+
+interface InterruptedExceptionTest_I5 extends AutoCloseable {
+    @Override default void close() { }
+}
+
+interface InterruptedExceptionTest_I6 extends AutoCloseable {
+    @Override default void close() throws InterruptedException { }          // warning here
+}
+
+interface InterruptedExceptionTest_I7 extends AutoCloseable {
+    @Override default void close() throws Exception { }                     // warning here
+}
+
+interface InterruptedExceptionTest_I8 extends HasClose, AutoCloseable {
+}
+
+interface InterruptedExceptionTest_I9 extends HasClose, AutoCloseable {
+    @Override void close();
+}
+
+// Abstract class declaration tests
+
+abstract class InterruptedExceptionTest_C1 implements AutoCloseable {
+}
+
+abstract class InterruptedExceptionTest_C2 implements AutoCloseable {
+    @Override public abstract void close();
+}
+
+abstract class InterruptedExceptionTest_C3 implements AutoCloseable {
+    @Override public abstract void close() throws InterruptedException;     // warning here
+}
+
+abstract class InterruptedExceptionTest_C4 implements AutoCloseable {
+    @Override public abstract void close() throws Exception;                // warning here
+}
+
+abstract class InterruptedExceptionTest_C5 implements AutoCloseable {
+    @Override public void close() { }
+}
+
+abstract class InterruptedExceptionTest_C6 implements AutoCloseable {
+    @Override public void close() throws InterruptedException { }           // warning here
+}
+
+abstract class InterruptedExceptionTest_C7 implements AutoCloseable {
+    @Override public void close() throws Exception { }                      // warning here
+}
+
+abstract class InterruptedExceptionTest_C8 implements HasClose, AutoCloseable {
+}
+
+abstract class InterruptedExceptionTest_C9 implements HasClose, AutoCloseable {
+    @Override public void close() { }
+}
+
+abstract class InterruptedExceptionTest_C10 extends WithConcreteClose implements AutoCloseable { // warning here
+}
+
+abstract class InterruptedExceptionTest_C11 extends WithAbstractClose implements AutoCloseable {
+}
+
+// Interface use site tests
+
+class UseSite_I1 {
+    void m(Supplier<InterruptedExceptionTest_I1> s) throws Exception {
+        try (InterruptedExceptionTest_I1 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I2 {
+    void m(Supplier<InterruptedExceptionTest_I2> s) throws Exception {
+        try (InterruptedExceptionTest_I2 t = s.get()) {
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I3 {
+    void m(Supplier<InterruptedExceptionTest_I3> s) throws Exception {
+        try (InterruptedExceptionTest_I3 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I4 {
+    void m(Supplier<InterruptedExceptionTest_I4> s) throws Exception {
+        try (InterruptedExceptionTest_I4 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I5 {
+    void m(Supplier<InterruptedExceptionTest_I5> s) throws Exception {
+        try (InterruptedExceptionTest_I5 t = s.get()) {
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I6 {
+    void m(Supplier<InterruptedExceptionTest_I6> s) throws Exception {
+        try (InterruptedExceptionTest_I6 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I7 {
+    void m(Supplier<InterruptedExceptionTest_I7> s) throws Exception {
+        try (InterruptedExceptionTest_I7 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I8 {
+    void m(Supplier<InterruptedExceptionTest_I8> s) throws Exception {
+        try (InterruptedExceptionTest_I8 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_I9 {
+    void m(Supplier<InterruptedExceptionTest_I9> s) throws Exception {
+        try (InterruptedExceptionTest_I9 t = s.get()) {
+            t.hashCode();
+        }
+    }
+}
+
+// Abstract class use site tests
+
+class UseSite_C1 {
+    void m(Supplier<InterruptedExceptionTest_C1> s) throws Exception {
+        try (InterruptedExceptionTest_C1 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C2 {
+    void m(Supplier<InterruptedExceptionTest_C2> s) throws Exception {
+        try (InterruptedExceptionTest_C2 t = s.get()) {
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C3 {
+    void m(Supplier<InterruptedExceptionTest_C3> s) throws Exception {
+        try (InterruptedExceptionTest_C3 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C4 {
+    void m(Supplier<InterruptedExceptionTest_C4> s) throws Exception {
+        try (InterruptedExceptionTest_C4 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C5 {
+    void m(Supplier<InterruptedExceptionTest_C5> s) throws Exception {
+        try (InterruptedExceptionTest_C5 t = s.get()) {
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C6 {
+    void m(Supplier<InterruptedExceptionTest_C6> s) throws Exception {
+        try (InterruptedExceptionTest_C6 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C7 {
+    void m(Supplier<InterruptedExceptionTest_C7> s) throws Exception {
+        try (InterruptedExceptionTest_C7 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C8 {
+    void m(Supplier<InterruptedExceptionTest_C8> s) throws Exception {
+        try (InterruptedExceptionTest_C8 t = s.get()) {                     // warning here
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C9 {
+    void m(Supplier<InterruptedExceptionTest_C9> s) throws Exception {
+        try (InterruptedExceptionTest_C9 t = s.get()) {
+            t.hashCode();
+        }
+    }
+}
+
+class UseSite_C10 {
+    void m(Supplier<InterruptedExceptionTest_C10> s) throws Exception {
+        try (InterruptedExceptionTest_C10 t = s.get()) {                    // warning here
+            t.hashCode();
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.out b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.out
new file mode 100644
index 00000000000..9aae66cea5e
--- /dev/null
+++ b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest2.out
@@ -0,0 +1,23 @@
+InterruptedExceptionTest2.java:34:20: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_I3
+InterruptedExceptionTest2.java:38:20: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_I4
+InterruptedExceptionTest2.java:46:28: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_I6
+InterruptedExceptionTest2.java:50:28: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_I7
+InterruptedExceptionTest2.java:70:36: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_C3
+InterruptedExceptionTest2.java:74:36: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_C4
+InterruptedExceptionTest2.java:82:27: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_C6
+InterruptedExceptionTest2.java:86:27: compiler.warn.try.resource.can.throw.interrupted.exc: InterruptedExceptionTest_C7
+InterruptedExceptionTest2.java:96:10: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C10
+InterruptedExceptionTest2.java:106:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_I1
+InterruptedExceptionTest2.java:122:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_I3
+InterruptedExceptionTest2.java:130:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_I4
+InterruptedExceptionTest2.java:146:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_I6
+InterruptedExceptionTest2.java:154:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_I7
+InterruptedExceptionTest2.java:162:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_I8
+InterruptedExceptionTest2.java:180:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C1
+InterruptedExceptionTest2.java:196:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C3
+InterruptedExceptionTest2.java:204:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C4
+InterruptedExceptionTest2.java:220:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C6
+InterruptedExceptionTest2.java:228:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C7
+InterruptedExceptionTest2.java:236:42: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C8
+InterruptedExceptionTest2.java:252:43: compiler.warn.try.resource.throws.interrupted.exc: InterruptedExceptionTest_C10
+22 warnings
diff --git a/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java b/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java
index c22992c991e..6d24a6c2a83 100644
--- a/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java
+++ b/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java
@@ -22,8 +22,15 @@
  */
 
 // key: compiler.warn.try.resource.throws.interrupted.exc
+// key: compiler.warn.try.resource.can.throw.interrupted.exc
 // options: -Xlint:try
 
 class TryResourceThrowsInterruptedException implements AutoCloseable {
     public void close() throws InterruptedException {}
+    {
+        try (var t = new TryResourceThrowsInterruptedException()) {
+            t.hashCode();
+        } catch (InterruptedException e) {
+        }
+    }
 }

From 1321186547bddd3f8615cf5d110489ec383f47ab Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 6 Nov 2025 16:01:10 +0000
Subject: [PATCH 064/512] 8367943: PipedOutputStream write(0, 0) successful
 after close()

Reviewed-by: rriggs, jpai
---
 .../classes/java/io/PipedOutputStream.java    | 11 +++---
 .../io/PipedOutputStream/WriteAfterClose.java | 39 ++++++++++++-------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/java.base/share/classes/java/io/PipedOutputStream.java b/src/java.base/share/classes/java/io/PipedOutputStream.java
index bfa8f0bbb5a..4e33741721c 100644
--- a/src/java.base/share/classes/java/io/PipedOutputStream.java
+++ b/src/java.base/share/classes/java/io/PipedOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,16 +129,17 @@ public class PipedOutputStream extends OutputStream {
     /**
      * Writes {@code len} bytes from the specified byte array
      * starting at offset {@code off} to this piped output stream.
-     * This method blocks until all the bytes are written to the output
-     * stream.
+     * If {@code len} is not zero, this method blocks until all the
+     * bytes are written to the output stream.
      *
      * @param   b     {@inheritDoc}
      * @param   off   {@inheritDoc}
      * @param   len   {@inheritDoc}
+     * @throws  IndexOutOfBoundsException {@inheritDoc}
      * @throws  IOException if the pipe is <a href=#BROKEN> broken</a>,
      *          {@link #connect(java.io.PipedInputStream) unconnected},
-     *          closed, or if an I/O error occurs.
-     * @throws  IndexOutOfBoundsException {@inheritDoc}
+     *          closed and {@code len} is greater than zero,
+     *          or if an I/O error occurs.
      */
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
diff --git a/test/jdk/java/io/PipedOutputStream/WriteAfterClose.java b/test/jdk/java/io/PipedOutputStream/WriteAfterClose.java
index e0dfbcf169f..3314541bb97 100644
--- a/test/jdk/java/io/PipedOutputStream/WriteAfterClose.java
+++ b/test/jdk/java/io/PipedOutputStream/WriteAfterClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,25 +22,34 @@
  */
 
 /* @test
-   @bug 4143704
-   @summary Test if write throws exception after reader
-            closes the pipe.
-*/
+ * @bug 4143704 8367943
+ * @summary Test if write throws exception after reader closes the pipe.
+ */
 
-
-
-import java.io.*;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 
 public class WriteAfterClose {
     public static void main(String argv[]) throws Exception {
-        PipedInputStream in = new PipedInputStream();
-        PipedOutputStream out = new PipedOutputStream(in);
+        try (PipedInputStream in = new PipedInputStream();
+             PipedOutputStream out = new PipedOutputStream(in)) {
+            in.close();
+            try {
+                out.write('a');
+                throw new Exception("Should not allow write after close");
+            } catch (IOException e) {
+            }
+        }
 
-        in.close();
-        try {
-            out.write('a');
-            throw new Exception("Should not allow write after close");
-        } catch (IOException e) {
+        try (PipedInputStream in = new PipedInputStream();
+             PipedOutputStream out = new PipedOutputStream(in)) {
+            out.close();
+            try {
+                out.write(new byte[7], 3, 0);
+            } catch (IOException e) {
+                throw new Exception("Should not fail 0-length write after close");
+            }
         }
     }
 }

From 1f08a3ede2445fb05d9700a1293d681ca89cbf5b Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 6 Nov 2025 16:01:37 +0000
Subject: [PATCH 065/512] 8355342: File.getCanonicalPath on Java 24 resolves
 paths on network drives to UNC format

Reviewed-by: alanb
---
 .../classes/java/io/WinNTFileSystem.java      | 17 +---
 .../native/libjava/WinNTFileSystem_md.c       | 35 ++-----
 .../windows/native/libjava/canonicalize_md.c  | 97 ++++++++++++++++---
 test/jdk/java/io/File/GetCanonicalPath.java   | 51 +++++++++-
 4 files changed, 141 insertions(+), 59 deletions(-)

diff --git a/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index e053f7f004c..5066374c0c9 100644
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -482,27 +482,12 @@ final class WinNTFileSystem extends FileSystem {
                 return path;
             return "" + ((char) (c-32)) + ':' + '\\';
         }
-        String canonicalPath = canonicalize0(path);
-        String finalPath = null;
-        try {
-            finalPath = getFinalPath(canonicalPath);
-        } catch (IOException ignored) {
-            finalPath = canonicalPath;
-        }
-        return finalPath;
+        return canonicalize0(path);
     }
 
     private native String canonicalize0(String path)
             throws IOException;
 
-    private String getFinalPath(String path) throws IOException {
-        return getFinalPath0(path);
-    }
-
-    private native String getFinalPath0(String path)
-            throws IOException;
-
-
     /* -- Attribute accessors -- */
 
     @Override
diff --git a/src/java.base/windows/native/libjava/WinNTFileSystem_md.c b/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
index 974d5c11d7e..2834a449502 100644
--- a/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
+++ b/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
@@ -59,7 +59,7 @@ Java_java_io_WinNTFileSystem_initIDs(JNIEnv *env, jclass cls)
 
 /* -- Path operations -- */
 
-extern int wcanonicalize(const WCHAR *path, WCHAR *out, int len);
+extern WCHAR* wcanonicalize(const WCHAR *path, WCHAR *out, int len);
 
 /**
  * Retrieves the fully resolved (final) path for the given path or NULL
@@ -274,18 +274,23 @@ Java_java_io_WinNTFileSystem_canonicalize0(JNIEnv *env, jobject this,
          */
         int len = (int)wcslen(path);
         len += currentDirLength(path, len);
+        WCHAR* fp;
         if (len  > MAX_PATH_LENGTH - 1) {
             WCHAR *cp = (WCHAR*)malloc(len * sizeof(WCHAR));
             if (cp != NULL) {
-                if (wcanonicalize(path, cp, len) >= 0) {
-                    rv = (*env)->NewString(env, cp, (jsize)wcslen(cp));
+                if ((fp = wcanonicalize(path, cp, len)) != NULL) {
+                    rv = (*env)->NewString(env, fp, (jsize)wcslen(fp));
+                    if (fp != cp)
+                        free(fp);
                 }
                 free(cp);
             } else {
                 JNU_ThrowOutOfMemoryError(env, "native memory allocation failed");
             }
-        } else if (wcanonicalize(path, canonicalPath, MAX_PATH_LENGTH) >= 0) {
-            rv = (*env)->NewString(env, canonicalPath, (jsize)wcslen(canonicalPath));
+        } else if ((fp = wcanonicalize(path, canonicalPath, MAX_PATH_LENGTH)) != NULL) {
+            rv = (*env)->NewString(env, fp, (jsize)wcslen(fp));
+            if (fp != canonicalPath)
+                free(fp);
         }
     } END_UNICODE_STRING(env, path);
     if (rv == NULL && !(*env)->ExceptionCheck(env)) {
@@ -294,26 +299,6 @@ Java_java_io_WinNTFileSystem_canonicalize0(JNIEnv *env, jobject this,
     return rv;
 }
 
-
-JNIEXPORT jstring JNICALL
-Java_java_io_WinNTFileSystem_getFinalPath0(JNIEnv* env, jobject this, jstring pathname) {
-    jstring rv = NULL;
-
-    WITH_UNICODE_STRING(env, pathname, path) {
-        WCHAR* finalPath = getFinalPath(env, path);
-        if (finalPath != NULL) {
-            rv = (*env)->NewString(env, finalPath, (jsize)wcslen(finalPath));
-            free(finalPath);
-        }
-    } END_UNICODE_STRING(env, path);
-
-    if (rv == NULL && !(*env)->ExceptionCheck(env)) {
-        JNU_ThrowIOExceptionWithLastError(env, "Bad pathname");
-    }
-
-    return rv;
-}
-
 /* -- Attribute accessors -- */
 
 /* Check whether or not the file name in "path" is a Windows reserved
diff --git a/src/java.base/windows/native/libjava/canonicalize_md.c b/src/java.base/windows/native/libjava/canonicalize_md.c
index 3719ec75d11..8596521509c 100644
--- a/src/java.base/windows/native/libjava/canonicalize_md.c
+++ b/src/java.base/windows/native/libjava/canonicalize_md.c
@@ -36,6 +36,7 @@
 
 #include <windows.h>
 #include <winbase.h>
+#include <wchar.h>
 #include <errno.h>
 
 /* We should also include jdk_util.h here, for the prototype of JDK_Canonicalize.
@@ -82,9 +83,9 @@ wnextsep(WCHAR *start)
 
 /* Tell whether the given string contains any wildcard characters */
 static int
-wwild(WCHAR *start)
+wwild(const WCHAR *start)
 {
-    WCHAR *p = start;
+    WCHAR *p = (WCHAR*)start;
     int c;
     while (c = *p) {
         if ((c == L'*') || (c == L'?'))
@@ -146,12 +147,59 @@ lastErrorReportable()
     return 1;
 }
 
-/* Convert a pathname to canonical form.  The input orig_path is assumed to
-   have been converted to native form already, via JVM_NativePath().  This is
-   necessary because _fullpath() rejects duplicate separator characters on
-   Win95, though it accepts them on NT. */
-int
-wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
+//
+// Return the final path of 'path'. If 'finalPath' is long enough, the final
+// path is placed in it. If not, a new character array is allocated for the
+// return value. If the return value does not equal the original 'finalPath'
+// value, then the calling code might need to free the memory of the
+// parameter. Non-NULL is returned on success, NULL on error.
+//
+WCHAR* getFinalPath(WCHAR* path, WCHAR* finalPath, DWORD size)
+{
+    HANDLE h = CreateFileW(path,
+                           FILE_READ_ATTRIBUTES,
+                           FILE_SHARE_DELETE |
+                           FILE_SHARE_READ | FILE_SHARE_WRITE,
+                           NULL,
+                           OPEN_EXISTING,
+                           FILE_FLAG_BACKUP_SEMANTICS,
+                           NULL);
+
+    if (h != INVALID_HANDLE_VALUE) {
+        DWORD len = GetFinalPathNameByHandleW(h, finalPath, size, 0);
+        if (len >= size) {
+            if ((finalPath = (WCHAR*)malloc(len * sizeof(WCHAR))) == NULL)
+                return NULL;
+            len = GetFinalPathNameByHandleW(h, finalPath, len, 0);
+        }
+        CloseHandle(h);
+        if (len != 0) {
+            if (finalPath[0] == L'\\' && finalPath[1] == L'\\' &&
+                finalPath[2] == L'?' && finalPath[3] == L'\\')
+            {
+                // Strip prefix (should be \\?\ or \\?\UNC)
+                int isUnc = (finalPath[4] == L'U' &&
+                             finalPath[5] == L'N' &&
+                             finalPath[6] == L'C');
+                int prefixLen = (isUnc) ? 7 : 4;
+                // the amount to copy includes terminator
+                int amountToCopy = len - prefixLen + 1;
+                wmemmove(finalPath, finalPath + prefixLen, amountToCopy);
+            }
+
+            return finalPath;
+        }
+    }
+
+    return NULL;
+}
+
+/* Convert a pathname to canonical form.  If a reparse point is encountered
+   while traversing the path, then the final path is derived from the full path
+   and returned as the canonical pathname.
+ */
+WCHAR*
+wcanonicalize(const WCHAR *orig_path, WCHAR *result, int size)
 {
     WIN32_FIND_DATAW fd;
     HANDLE h;
@@ -161,11 +209,11 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
     /* Reject paths that contain wildcards */
     if (wwild(orig_path)) {
         errno = EINVAL;
-        return -1;
+        return NULL;
     }
 
     if ((path = (WCHAR*)malloc(size * sizeof(WCHAR))) == NULL)
-        return -1;
+        return NULL;
 
     /* Collapse instances of "foo\.." and ensure absoluteness.  Note that
        contrary to the documentation, the _fullpath procedure does not require
@@ -237,6 +285,18 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
         if (h != INVALID_HANDLE_VALUE) {
             /* Lookup succeeded; append true name to result and continue */
             FindClose(h);
+
+            // If a reparse point is encountered, get the final path.
+            if ((fd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
+                // Do not fail if the final path cannot be obtained as the
+                // canonicalization may still be otherwise correct
+                WCHAR* fp = NULL;
+                if ((fp = getFinalPath(path, result, size)) != NULL) {
+                    free(path);
+                    return fp;
+                }
+            }
+
             if (!(dst = wcp(dst, dend, L'\\', fd.cFileName,
                             fd.cFileName + wcslen(fd.cFileName)))){
                 goto err;
@@ -261,11 +321,11 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
     }
     *dst = L'\0';
     free(path);
-    return 0;
+    return result;
 
  err:
     free(path);
-    return -1;
+    return NULL;
 }
 
 /* Non-Wide character version of canonicalize.
@@ -274,6 +334,7 @@ JNIEXPORT int
 JDK_Canonicalize(const char *orig, char *out, int len) {
     wchar_t* wpath = NULL;
     wchar_t* wresult = NULL;
+    wchar_t* wcanon = NULL;
     int wpath_len;
     int ret = -1;
 
@@ -297,12 +358,12 @@ JDK_Canonicalize(const char *orig, char *out, int len) {
         goto finish;
     }
 
-    if (wcanonicalize(wpath, wresult, len) != 0) {
+    if ((wcanon = wcanonicalize(wpath, wresult, len)) == NULL) {
         goto finish;
     }
 
     if (WideCharToMultiByte(CP_ACP, 0,
-                            wresult, -1, out, len, NULL, NULL) == 0) {
+                            wcanon, -1, out, len, NULL, NULL) == 0) {
         goto finish;
     }
 
@@ -310,8 +371,12 @@ JDK_Canonicalize(const char *orig, char *out, int len) {
     ret = 0;
 
  finish:
-    free(wresult);
-    free(wpath);
+    if (wcanon != NULL && wcanon != wresult)
+        free(wcanon);
+    if (wresult != NULL)
+        free(wresult);
+    if (wpath != NULL)
+        free(wpath);
 
     return ret;
 }
diff --git a/test/jdk/java/io/File/GetCanonicalPath.java b/test/jdk/java/io/File/GetCanonicalPath.java
index d69e90fbbfc..14ef90260fc 100644
--- a/test/jdk/java/io/File/GetCanonicalPath.java
+++ b/test/jdk/java/io/File/GetCanonicalPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4899022 8003887
+ * @bug 4899022 8003887 8355342
  * @summary Look for erroneous representation of drive letter
  * @run junit GetCanonicalPath
  */
@@ -33,6 +33,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Assumptions;
@@ -127,6 +128,52 @@ public class GetCanonicalPath {
         assertFalse(path.length() > 3, "Drive letter incorrectly represented");
     }
 
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    void mappedDrive() throws IOException {
+        // find the first unused drive letter
+        char drive = '[';
+        var roots = Set.of(new File(".").listRoots());
+        for (int i = 4; i < 26; i++) {
+            char c = (char)('A' + i);
+            if (!roots.contains(new File(c + ":\\"))) {
+                drive = c;
+                break;
+            }
+        }
+        assertFalse(drive == '['); // '[' is next after 'Z'
+
+        // map the first unused drive letter to the cwd
+        String cwd = System.getProperty("user.dir");
+        Runtime rt = Runtime.getRuntime();
+        String share =
+            "\\\\localhost\\" + cwd.charAt(0) + "$" + cwd.substring(2);
+        try {
+            Process p = rt.exec(new String[] {"net", "use", drive + ":", share});
+            assertEquals(0, p.waitFor());
+        } catch (InterruptedException x) {
+            fail(x);
+        }
+
+        // check that the canonical path name and its content are as expected
+        try {
+            final String filename = "file.txt";
+            final String text = "This is some text";
+            Files.writeString(Path.of(share, filename), text);
+            File file = new File(drive + ":\\" + filename);
+            String canonicalPath = file.getCanonicalPath();
+            assertEquals(drive + ":\\" + filename, canonicalPath);
+            assertEquals(text, Files.readString(Path.of(canonicalPath)));
+        } finally {
+            try {
+                Process p = rt.exec(new String[] {"net", "use", drive + ":", "/Delete"});
+                assertEquals(0, p.waitFor());
+            } catch (InterruptedException x) {
+                fail(x);
+            }
+        }
+    }
+
     // Create a File with the given pathname and return the File as a Path
     private static Path createFile(String pathname) throws IOException {
         File file = new File(pathname);

From c272aca8a0a2720365159684bed35c0c31e8778f Mon Sep 17 00:00:00 2001
From: EunHyunsu <ehs208@naver.com>
Date: Thu, 6 Nov 2025 16:13:34 +0000
Subject: [PATCH 066/512] 8371091: Improve the exception message of
 NullPointerException thrown by the methods in the default implementation of
 HttpRequest.Builder

Reviewed-by: dfuchs
---
 .../net/http/HttpRequestBuilderImpl.java      |  8 ++--
 .../net/httpclient/RequestBuilderTest.java    | 37 +++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
index c68965626b7..ef0e2b152bb 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
@@ -203,7 +203,7 @@ public class HttpRequestBuilderImpl implements HttpRequest.Builder {
 
     @Override
     public HttpRequest.Builder POST(BodyPublisher body) {
-        return method0("POST", requireNonNull(body));
+        return method0("POST", requireNonNull(body, "BodyPublisher must be non-null"));
     }
 
     @Override
@@ -218,12 +218,12 @@ public class HttpRequestBuilderImpl implements HttpRequest.Builder {
 
     @Override
     public HttpRequest.Builder PUT(BodyPublisher body) {
-        return method0("PUT", requireNonNull(body));
+        return method0("PUT", requireNonNull(body, "BodyPublisher must be non-null"));
     }
 
     @Override
     public HttpRequest.Builder method(String method, BodyPublisher body) {
-        requireNonNull(method);
+        requireNonNull(method, "HTTP method must be non-null");
         if (method.isEmpty())
             throw newIAE("illegal method <empty string>");
         if (method.equals("CONNECT"))
@@ -234,7 +234,7 @@ public class HttpRequestBuilderImpl implements HttpRequest.Builder {
                     .replace("\r", "\\r")
                     .replace("\t", "\\t")
                     + "\"");
-        return method0(method, requireNonNull(body));
+        return method0(method, requireNonNull(body, "BodyPublisher must be non-null"));
     }
 
     private HttpRequest.Builder method0(String method, BodyPublisher body) {
diff --git a/test/jdk/java/net/httpclient/RequestBuilderTest.java b/test/jdk/java/net/httpclient/RequestBuilderTest.java
index 97f4793d63c..a83c12f592e 100644
--- a/test/jdk/java/net/httpclient/RequestBuilderTest.java
+++ b/test/jdk/java/net/httpclient/RequestBuilderTest.java
@@ -486,4 +486,41 @@ public class RequestBuilderTest {
         assertNotEquals(builder.build(), newBuilder(uri).header("x", "Z").build());
         assertNotEquals(builder.build(), newBuilder(uri).header("z", "y").build());
     }
+
+    @Test
+    public void testNullMessages() {
+        HttpRequest.Builder builder = HttpRequest.newBuilder();
+
+        try {
+            builder.method(null, null);
+            fail("builder.method(null, null) should have thrown NullPointerException");
+        } catch (NullPointerException e) {
+            assertTrue(e.getMessage().contains("HTTP method"),
+                "Expected exception message to contain 'HTTP method', but got: " + e.getMessage());
+        }
+
+        try {
+            builder.POST(null);
+            fail("builder.POST(null) should have thrown NullPointerException");
+        } catch (NullPointerException e) {
+            assertTrue(e.getMessage().contains("BodyPublisher"),
+                "Expected exception message to contain 'BodyPublisher', but got: " + e.getMessage());
+        }
+
+        try {
+            builder.PUT(null);
+            fail("builder.PUT(null) should have thrown NullPointerException");
+        } catch (NullPointerException e) {
+            assertTrue(e.getMessage().contains("BodyPublisher"),
+                "Expected exception message to contain 'BodyPublisher', but got: " + e.getMessage());
+        }
+
+        try {
+            builder.method("PATCH", null);
+            fail("builder.method(\"PATCH\", null) should have thrown NullPointerException");
+        } catch (NullPointerException e) {
+            assertTrue(e.getMessage().contains("BodyPublisher"),
+                "Expected exception message to contain 'BodyPublisher', but got: " + e.getMessage());
+        }
+    }
 }

From 0026967e030fd4557b5365870d55f863fe2a4512 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 6 Nov 2025 17:12:49 +0000
Subject: [PATCH 067/512] 8370420: HostLocaleProviderAdapter_md.c from libjava
 can use GetLocaleInfoEx, GetCalendarInfoEx, EnumCalendarInfoExEx directly

Reviewed-by: naoto, mbaesken, bpb
---
 .../HostLocaleProviderAdapterImpl.java        | 29 +++----
 .../libjava/HostLocaleProviderAdapter_md.c    | 82 ++++---------------
 2 files changed, 27 insertions(+), 84 deletions(-)

diff --git a/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
index abc62d79bb1..5aa8431d859 100644
--- a/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
+++ b/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,22 +116,18 @@ public class HostLocaleProviderAdapterImpl {
     private static final String nativeDisplayLanguage;
     static {
         Set<Locale> tmpSet = new HashSet<>();
-        if (initialize()) {
-            // Assuming the default locales do not include any extensions, so
-            // no stripping is needed here.
-            Control c = Control.getNoFallbackControl(Control.FORMAT_DEFAULT);
-            String displayLocale = getDefaultLocale(CAT_DISPLAY);
-            Locale l = Locale.forLanguageTag(displayLocale.replace('_', '-'));
-            tmpSet.addAll(c.getCandidateLocales("", l));
-            nativeDisplayLanguage = l.getLanguage();
+        // Assuming the default locales do not include any extensions, so
+        // no stripping is needed here.
+        Control c = Control.getNoFallbackControl(Control.FORMAT_DEFAULT);
+        String displayLocale = getDefaultLocale(CAT_DISPLAY);
+        Locale l = Locale.forLanguageTag(displayLocale.replace('_', '-'));
+        tmpSet.addAll(c.getCandidateLocales("", l));
+        nativeDisplayLanguage = l.getLanguage();
 
-            String formatLocale = getDefaultLocale(CAT_FORMAT);
-            if (!formatLocale.equals(displayLocale)) {
-                l = Locale.forLanguageTag(formatLocale.replace('_', '-'));
-                tmpSet.addAll(c.getCandidateLocales("", l));
-            }
-        } else {
-            nativeDisplayLanguage = "";
+        String formatLocale = getDefaultLocale(CAT_FORMAT);
+        if (!formatLocale.equals(displayLocale)) {
+            l = Locale.forLanguageTag(formatLocale.replace('_', '-'));
+            tmpSet.addAll(c.getCandidateLocales("", l));
         }
         supportedLocaleSet = Collections.unmodifiableSet(tmpSet);
     }
@@ -850,7 +846,6 @@ public class HostLocaleProviderAdapterImpl {
     // native methods
 
     // initialize
-    private static native boolean initialize();
     private static native String getDefaultLocale(int cat);
 
     // For DateFormatProvider
diff --git a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
index bf399a68894..b50dca85bf7 100644
--- a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
+++ b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,15 +39,6 @@
 #define CALENDAR_STYLE_SHORT_MASK       0x00000001  // Calendar.SHORT
 #define CALENDAR_STYLE_STANDALONE_MASK  0x00008000  // Calendar.STANDALONE
 
-// global variables
-typedef int (WINAPI *PGLIE)(const jchar *, LCTYPE, LPWSTR, int);
-typedef int (WINAPI *PGCIE)(const jchar *, CALID, LPCWSTR, CALTYPE, LPWSTR, int, LPDWORD);
-typedef int (WINAPI *PECIEE)(CALINFO_ENUMPROCEXEX, const jchar *, CALID, LPCWSTR, CALTYPE, LPARAM);
-PGLIE pGetLocaleInfoEx;
-PGCIE pGetCalendarInfoEx;
-PECIEE pEnumCalendarInfoExEx;
-BOOL initialized = FALSE;
-
 // prototypes
 int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen);
 int getCalendarInfoWrapper(const jchar *langtag, CALID id, LPCWSTR reserved, CALTYPE type, LPWSTR data, int buflen, LPDWORD val);
@@ -178,31 +169,6 @@ WCHAR * fixes[2][2][3][16] =
     }
 };
 
-/*
- * Class:     sun_util_locale_provider_HostLocaleProviderAdapterImpl
- * Method:    initialize
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_initialize
-  (JNIEnv *env, jclass cls) {
-    if (!initialized) {
-        pGetLocaleInfoEx = (PGLIE)GetProcAddress(
-            GetModuleHandle("kernel32.dll"),
-            "GetLocaleInfoEx");
-        pGetCalendarInfoEx = (PGCIE)GetProcAddress(
-            GetModuleHandle("kernel32.dll"),
-            "GetCalendarInfoEx");
-        pEnumCalendarInfoExEx = (PECIEE)GetProcAddress(
-            GetModuleHandle("kernel32.dll"),
-            "EnumCalendarInfoExEx");
-        initialized =TRUE;
-    }
-
-    return pGetLocaleInfoEx != NULL &&
-           pGetCalendarInfoEx != NULL &&
-           pEnumCalendarInfoExEx != NULL;
-}
-
 /*
  * Class:     sun_util_locale_provider_HostLocaleProviderAdapterImpl
  * Method:    getDefaultLocale
@@ -768,34 +734,20 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
 }
 
 int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen) {
-    if (pGetLocaleInfoEx) {
-        if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
-            // defaults to "en"
-            return pGetLocaleInfoEx(L"en", type, data, buflen);
-        } else {
-            return pGetLocaleInfoEx((LPWSTR)langtag, type, data, buflen);
-        }
+    if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
+        // defaults to "en"
+        return GetLocaleInfoEx(L"en", type, data, buflen);
     } else {
-        // If we ever wanted to support WinXP, we will need extra module from
-        // MS...
-        // return GetLocaleInfo(DownlevelLocaleNameToLCID(langtag, 0), type, data, buflen);
-        return 0;
+        return GetLocaleInfoEx((LPWSTR)langtag, type, data, buflen);
     }
 }
 
 int getCalendarInfoWrapper(const jchar *langtag, CALID id, LPCWSTR reserved, CALTYPE type, LPWSTR data, int buflen, LPDWORD val) {
-    if (pGetCalendarInfoEx) {
-        if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
-            // defaults to "en"
-            return pGetCalendarInfoEx(L"en", id, reserved, type, data, buflen, val);
-        } else {
-            return pGetCalendarInfoEx((LPWSTR)langtag, id, reserved, type, data, buflen, val);
-        }
+    if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
+        // defaults to "en"
+        return GetCalendarInfoEx(L"en", id, reserved, type, data, buflen, val);
     } else {
-        // If we ever wanted to support WinXP, we will need extra module from
-        // MS...
-        // return GetCalendarInfo(DownlevelLocaleNameToLCID(langtag, 0), ...);
-        return 0;
+        return GetCalendarInfoEx((LPWSTR)langtag, id, reserved, type, data, buflen, val);
     }
 }
 
@@ -1000,17 +952,13 @@ void getFixPart(const jchar * langtag, const jint numberStyle, BOOL positive, BO
 }
 
 int enumCalendarInfoWrapper(const jchar *langtag, CALID calid, CALTYPE type, LPWSTR buf, int buflen) {
-    if (pEnumCalendarInfoExEx) {
-        if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
-            // defaults to "en"
-            return pEnumCalendarInfoExEx(&EnumCalendarInfoProc, L"en",
-                calid, NULL, type, (LPARAM)buf);
-        } else {
-            return pEnumCalendarInfoExEx(&EnumCalendarInfoProc, langtag,
-                calid, NULL, type, (LPARAM)buf);
-        }
+    if (wcscmp(L"und", (LPWSTR)langtag) == 0) {
+        // defaults to "en"
+        return EnumCalendarInfoExEx(&EnumCalendarInfoProc, L"en",
+            calid, NULL, type, (LPARAM)buf);
     } else {
-        return 0;
+        return EnumCalendarInfoExEx(&EnumCalendarInfoProc, langtag,
+            calid, NULL, type, (LPARAM)buf);
     }
 }
 

From 4445a8e3f5cac6738b7984716c867dcf9780fe0a Mon Sep 17 00:00:00 2001
From: Nityanand Rai <nityanar@amazon.com>
Date: Thu, 6 Nov 2025 17:25:59 +0000
Subject: [PATCH 068/512] 8369323: Fix typos in vmTestbase/.../Concurrent.java

Reviewed-by: wkemper, phh, lmesnik, shade, syan
---
 .../vm/gc/concurrent/Concurrent.java           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/Concurrent.java b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/Concurrent.java
index 5fa7fe3e1d8..1ea07c8e4b2 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/Concurrent.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/gc/concurrent/Concurrent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ class Forest {
             treeHeight = Memory.balancedTreeHeightFromMemory(size / ntrees, (int) new TreeNode(nodeGarbageSize).getTotalSize());
         }
 
-        log.debug("The expected forest paramteres: tree height = " + treeHeight  + " number of trees = " + ntrees
+        log.debug("The expected forest parameters: tree height = " + treeHeight + " number of trees = " + ntrees
                 + " size = " +  new TreeNode(nodeGarbageSize).getTotalSize());
         Tree[] localTrees = new Tree[ntrees * 4];
         Lock[] localLocks = new Lock[ntrees * 4];
@@ -104,7 +104,7 @@ class Forest {
                     instance.where = new AtomicCycleInteger(instance.trees.length);
                     instance.nodeGarbageSize = nodeGarbageSize;
 
-                    log.debug("The forest real paramteres: tree height = " + treeHeight  + " number of trees = " + instance.trees.length
+                    log.debug("The forest real parameters: tree height = " + treeHeight + " number of trees = " + instance.trees.length
                             + " number of nodes = " + allNodesCount);
                     log.debug("Approximate node size = " + nodeSize + " calc = " + instance.trees[0].getRoot().getSize());
                     return instance;
@@ -140,12 +140,12 @@ class Forest {
         int h2 = root.getShortestPath();
         if ((h1 != treeHeight) || (h2 != treeHeight)) {
             throw new TestFailure("The tree is not balanced expected " + treeHeight
-                    + " value = " + h1 + " shortedtPath = " + h2);
+                    + " value = " + h1 + " shortestPath = " + h2);
         }
     }
 
     // Swap subtrees in 2 trees, the path is used
-    // as sequence of 1-0 to select subtree (left-reight sequence)
+    // as sequence of 1-0 to select subtree (left-right sequence)
     static void swapSubtrees(Tree t1, Tree t2, int depth, int path) {
         TreeNode tn1 = t1.getRoot();
         TreeNode tn2 = t2.getRoot();
@@ -210,7 +210,7 @@ class Forest {
         }
     }
 
-    // the index in tree array which should be chnaged during next regeneration
+    // the index in tree array which should be changed during next regeneration
     AtomicCycleInteger where = null;
 
     // generate new full and partial trees in our forest
@@ -276,10 +276,10 @@ public class Concurrent extends ThreadedGCTest implements GarbageProducerAware,
     // Heap as tree
     Forest forest;
 
-    // GP for old gargbage production
+    // GP for old garbage production
     GarbageProducer gpOld;
 
-    // GP for young gargbage production
+    // GP for young garbage production
     GarbageProducer gpYoung;
 
     MemoryStrategy ms;
@@ -322,7 +322,7 @@ public class Concurrent extends ThreadedGCTest implements GarbageProducerAware,
     // young garbage in percent and absolute
     private static int youngPercent = 0;
     long youngGarbageSize;
-    // mutation rate (parcent and absolute trees)
+    // mutation rate (percent and absolute trees)
     private static int ptrMutRate = 50;
     long mutateTrees;
     // percent of heap to occupy by forest (long live garbage)

From 9cc542ebcb81552fe8c32a8cc3c63332853e5127 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Thu, 6 Nov 2025 18:57:52 +0000
Subject: [PATCH 069/512] 8370850: Shenandoah: Simplify collector allocation to
 save unnecessary region iteration

Reviewed-by: wkemper
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 74 +++++++------------
 .../share/gc/shenandoah/shenandoahFreeSet.hpp | 17 ++---
 2 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 8dccf5a057c..0deb3b5ba4c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -1265,22 +1265,13 @@ void ShenandoahFreeSet::add_promoted_in_place_region_to_old_collector(Shenandoah
   _partitions.assert_bounds(true);
 }
 
-HeapWord* ShenandoahFreeSet::allocate_from_partition_with_affiliation(ShenandoahAffiliation affiliation,
-                                                                      ShenandoahAllocRequest& req, bool& in_new_region) {
-
-  shenandoah_assert_heaplocked();
-  ShenandoahFreeSetPartitionId which_partition = req.is_old()? ShenandoahFreeSetPartitionId::OldCollector: ShenandoahFreeSetPartitionId::Collector;
-  if (_partitions.alloc_from_left_bias(which_partition)) {
-    ShenandoahLeftRightIterator iterator(&_partitions, which_partition, affiliation == ShenandoahAffiliation::FREE);
-    return allocate_with_affiliation(iterator, affiliation, req, in_new_region);
-  } else {
-    ShenandoahRightLeftIterator iterator(&_partitions, which_partition, affiliation == ShenandoahAffiliation::FREE);
-    return allocate_with_affiliation(iterator, affiliation, req, in_new_region);
-  }
-}
-
 template<typename Iter>
-HeapWord* ShenandoahFreeSet::allocate_with_affiliation(Iter& iterator, ShenandoahAffiliation affiliation, ShenandoahAllocRequest& req, bool& in_new_region) {
+HeapWord* ShenandoahFreeSet::allocate_with_affiliation(Iter& iterator,
+                                                       ShenandoahAffiliation affiliation,
+                                                       ShenandoahAllocRequest& req,
+                                                       bool& in_new_region) {
+  assert(affiliation != ShenandoahAffiliation::FREE, "Must not");
+  ShenandoahHeapRegion* free_region = nullptr;
   for (idx_t idx = iterator.current(); iterator.has_next(); idx = iterator.next()) {
     ShenandoahHeapRegion* r = _heap->get_region(idx);
     if (r->affiliation() == affiliation) {
@@ -1288,8 +1279,16 @@ HeapWord* ShenandoahFreeSet::allocate_with_affiliation(Iter& iterator, Shenandoa
       if (result != nullptr) {
         return result;
       }
+    } else if (free_region == nullptr && r->affiliation() == FREE) {
+      free_region = r;
     }
   }
+  // Failed to allocate within any affiliated region, try the first free region in the partition.
+  if (free_region != nullptr) {
+    HeapWord* result = try_allocate_in(free_region, req, in_new_region);
+    assert(result != nullptr, "Allocate in free region in the partition always succeed.");
+    return result;
+  }
   log_debug(gc, free)("Could not allocate collector region with affiliation: %s for request " PTR_FORMAT,
                       shenandoah_affiliation_name(affiliation), p2i(&req));
   return nullptr;
@@ -1391,20 +1390,19 @@ HeapWord* ShenandoahFreeSet::allocate_from_regions(Iter& iterator, ShenandoahAll
 }
 
 HeapWord* ShenandoahFreeSet::allocate_for_collector(ShenandoahAllocRequest &req, bool &in_new_region) {
-  // Fast-path: try to allocate in the collector view first
-  HeapWord* result;
-  result = allocate_from_partition_with_affiliation(req.affiliation(), req, in_new_region);
-  if (result != nullptr) {
-    return result;
+  shenandoah_assert_heaplocked();
+  ShenandoahFreeSetPartitionId which_partition = req.is_old()? ShenandoahFreeSetPartitionId::OldCollector: ShenandoahFreeSetPartitionId::Collector;
+  HeapWord* result = nullptr;
+  if (_partitions.alloc_from_left_bias(which_partition)) {
+    ShenandoahLeftRightIterator iterator(&_partitions, which_partition);
+    result = allocate_with_affiliation(iterator, req.affiliation(), req, in_new_region);
+  } else {
+    ShenandoahRightLeftIterator iterator(&_partitions, which_partition);
+    result = allocate_with_affiliation(iterator, req.affiliation(), req, in_new_region);
   }
 
-  bool allow_new_region = can_allocate_in_new_region(req);
-  if (allow_new_region) {
-    // Try a free region that is dedicated to GC allocations.
-    result = allocate_from_partition_with_affiliation(ShenandoahAffiliation::FREE, req, in_new_region);
-    if (result != nullptr) {
-      return result;
-    }
+  if (result != nullptr) {
+    return result;
   }
 
   // No dice. Can we borrow space from mutator view?
@@ -1412,17 +1410,7 @@ HeapWord* ShenandoahFreeSet::allocate_for_collector(ShenandoahAllocRequest &req,
     return nullptr;
   }
 
-  if (!allow_new_region && req.is_old() && (_heap->young_generation()->free_unaffiliated_regions() > 0)) {
-    // This allows us to flip a mutator region to old_collector
-    allow_new_region = true;
-  }
-
-  // We should expand old-gen if this can prevent an old-gen evacuation failure.  We don't care so much about
-  // promotion failures since they can be mitigated in a subsequent GC pass.  Would be nice to know if this
-  // allocation request is for evacuation or promotion.  Individual threads limit their use of PLAB memory for
-  // promotions, so we already have an assurance that any additional memory set aside for old-gen will be used
-  // only for old-gen evacuations.
-  if (allow_new_region) {
+  if (_partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Mutator) > 0) {
     // Try to steal an empty region from the mutator view.
     result = try_allocate_from_mutator(req, in_new_region);
   }
@@ -1432,16 +1420,6 @@ HeapWord* ShenandoahFreeSet::allocate_for_collector(ShenandoahAllocRequest &req,
   return result;
 }
 
-bool ShenandoahFreeSet::can_allocate_in_new_region(const ShenandoahAllocRequest& req) {
-  if (!_heap->mode()->is_generational()) {
-    return true;
-  }
-
-  assert(req.is_old() || req.is_young(), "Should request affiliation");
-  return (req.is_old() && _heap->old_generation()->free_unaffiliated_regions() > 0)
-         || (req.is_young() && _heap->young_generation()->free_unaffiliated_regions() > 0);
-}
-
 HeapWord* ShenandoahFreeSet::try_allocate_from_mutator(ShenandoahAllocRequest& req, bool& in_new_region) {
   // The collector prefers to keep longer lived regions toward the right side of the heap, so it always
   // searches for regions from right to left here.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 11d93bf094a..5cc9eab7b4b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -446,11 +446,6 @@ private:
 
   HeapWord* allocate_aligned_plab(size_t size, ShenandoahAllocRequest& req, ShenandoahHeapRegion* r);
 
-  // Return the address of memory allocated, setting in_new_region to true iff the allocation is taken
-  // from a region that was previously empty.  Return nullptr if memory could not be allocated.
-  inline HeapWord* allocate_from_partition_with_affiliation(ShenandoahAffiliation affiliation,
-                                                            ShenandoahAllocRequest& req, bool& in_new_region);
-
   // We re-evaluate the left-to-right allocation bias whenever _alloc_bias_weight is less than zero.  Each time
   // we allocate an object, we decrement the count of this value.  Each time we re-evaluate whether to allocate
   // from right-to-left or left-to-right, we reset the value of this counter to _InitialAllocBiasWeight.
@@ -601,13 +596,13 @@ private:
   // Handle allocation for collector (for evacuation).
   HeapWord* allocate_for_collector(ShenandoahAllocRequest& req, bool& in_new_region);
 
-  // Search for allocation in region with same affiliation as request, using given iterator.
+  // Search for allocation in region with same affiliation as request, using given iterator,
+  // or affiliate the first usable FREE region with given affiliation and allocate in.
   template<typename Iter>
-  HeapWord* allocate_with_affiliation(Iter& iterator, ShenandoahAffiliation affiliation,
-                                      ShenandoahAllocRequest& req, bool& in_new_region);
-
-  // Return true if the respective generation for this request has free regions.
-  bool can_allocate_in_new_region(const ShenandoahAllocRequest& req);
+  HeapWord* allocate_with_affiliation(Iter& iterator,
+                                      ShenandoahAffiliation affiliation,
+                                      ShenandoahAllocRequest& req,
+                                      bool& in_new_region);
 
   // Attempt to allocate memory for an evacuation from the mutator's partition.
   HeapWord* try_allocate_from_mutator(ShenandoahAllocRequest& req, bool& in_new_region);

From cad73d39762974776dd6fda5efe4e2a271d69f14 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Thu, 6 Nov 2025 19:37:44 +0000
Subject: [PATCH 070/512] 8370041: GenShen: Filter young pointers from thread
 local SATB buffers when only marking old

Reviewed-by: ysr, kdnilsen
---
 .../gc/shenandoah/shenandoahClosures.hpp      |  12 +-
 .../shenandoah/shenandoahClosures.inline.hpp  |   4 +
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  |  92 +++++++-------
 .../shenandoah/shenandoahConcurrentMark.cpp   |  16 +--
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |  23 ++--
 .../shenandoah/shenandoahGenerationalHeap.cpp |   6 -
 .../share/gc/shenandoah/shenandoahHeap.cpp    |   4 +
 .../gc/shenandoah/shenandoahOldGeneration.cpp | 117 +-----------------
 .../gc/shenandoah/shenandoahOldGeneration.hpp |  37 +++---
 .../shenandoah/shenandoahSATBMarkQueueSet.cpp |  27 +++-
 .../shenandoah/shenandoahSATBMarkQueueSet.hpp |  20 ++-
 11 files changed, 134 insertions(+), 224 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
index 0c223ee3128..fefed0340c4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
@@ -24,7 +24,6 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP
 
-#include "code/nmethod.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shenandoah/shenandoahGenerationType.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.hpp"
@@ -230,6 +229,17 @@ public:
 };
 
 
+class ShenandoahFlushSATB : public ThreadClosure {
+private:
+  SATBMarkQueueSet& _satb_qset;
+
+public:
+  explicit ShenandoahFlushSATB(SATBMarkQueueSet& satb_qset) : _satb_qset(satb_qset) {}
+
+  inline void do_thread(Thread* thread) override;
+};
+
+
 //
 // ========= Utilities
 //
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
index 427eaad26ce..e8d25b1e5a9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
@@ -253,6 +253,10 @@ inline void ShenandoahConcUpdateRefsClosure::work(T* p) {
   _heap->conc_update_with_forwarded(p);
 }
 
+inline void ShenandoahFlushSATB::do_thread(Thread* thread) {
+  // Transfer any partial buffer to the qset for completed buffer processing.
+  _satb_qset.flush_queue(ShenandoahThreadLocalData::satb_mark_queue(thread));
+}
 
 //
 // ========= Utilities
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 9613422496a..cee8727a3f4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -279,21 +279,6 @@ bool ShenandoahConcurrentGC::complete_abbreviated_cycle() {
     heap->update_region_ages(_generation->complete_marking_context());
   }
 
-  if (!heap->is_concurrent_old_mark_in_progress()) {
-    heap->concurrent_final_roots();
-  } else {
-    // Since the cycle was shortened for having enough immediate garbage, this will be
-    // the last phase before concurrent marking of old resumes. We must be sure
-    // that old mark threads don't see any pointers to garbage in the SATB queues. Even
-    // though nothing was evacuated, overwriting unreachable weak roots with null may still
-    // put pointers to regions that become trash in the SATB queues. The following will
-    // piggyback flushing the thread local SATB queues on the same handshake that propagates
-    // the gc state change.
-    ShenandoahSATBMarkQueueSet& satb_queues = ShenandoahBarrierSet::satb_mark_queue_set();
-    ShenandoahFlushSATBHandshakeClosure complete_thread_local_satb_buffers(satb_queues);
-    heap->concurrent_final_roots(&complete_thread_local_satb_buffers);
-    heap->old_generation()->concurrent_transfer_pointers_from_satb();
-  }
   return true;
 }
 
@@ -684,16 +669,10 @@ void ShenandoahConcurrentGC::op_init_mark() {
   assert(!heap->has_forwarded_objects(), "No forwarded objects on this path");
 
   if (heap->mode()->is_generational()) {
-
     if (_generation->is_global()) {
       heap->old_generation()->cancel_gc();
-    } else if (heap->is_concurrent_old_mark_in_progress()) {
-      // Purge the SATB buffers, transferring any valid, old pointers to the
-      // old generation mark queue. Any pointers in a young region will be
-      // abandoned.
-      ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_transfer_satb);
-      heap->old_generation()->transfer_pointers_from_satb();
     }
+
     {
       // After we swap card table below, the write-table is all clean, and the read table holds
       // cards dirty prior to the start of GC. Young and bootstrap collection will update
@@ -1131,7 +1110,7 @@ private:
   ShenandoahNonConcUpdateRefsClosure _cl;
 public:
   ShenandoahUpdateThreadHandshakeClosure();
-  void do_thread(Thread* thread);
+  void do_thread(Thread* thread) override;
 };
 
 ShenandoahUpdateThreadHandshakeClosure::ShenandoahUpdateThreadHandshakeClosure() :
@@ -1146,9 +1125,49 @@ void ShenandoahUpdateThreadHandshakeClosure::do_thread(Thread* thread) {
   }
 }
 
+class ShenandoahUpdateThreadRootsAndFlushOldSatbBuffers final : public HandshakeClosure {
+  // When Shenandoah is marking the old generation, it is possible for the SATB barrier
+  // to pick up overwritten pointers that point into a cset region. If these pointers
+  // are accessed by mark threads, they will crash. Once update refs has completed, it is
+  // no longer possible for a mutator thread to overwrite a pointer into a cset region.
+  //
+  // Therefore, at the end of update refs, we use this closure to update the thread roots
+  // and 'complete' all the thread local SATB buffers. Completing these will filter out
+  // anything that has already been marked or anything that points to a region which is
+  // not old. We do not need to worry about ABA situations where a region may become old
+  // after the pointer is enqueued but before it is filtered. There are only two ways a
+  // region may become old:
+  //  1. The region is promoted in place. This is safe because such regions will never
+  //     be in the collection set. If this happens, the pointer will be preserved, essentially
+  //     becoming part of the old snapshot.
+  //  2. The region is allocated during evacuation of old. This is also not a concern because
+  //     we haven't yet finished marking old so no mixed evacuations will happen.
+  ShenandoahUpdateThreadHandshakeClosure _update_roots;
+  ShenandoahFlushSATB _flush_all_satb;
+
+public:
+  ShenandoahUpdateThreadRootsAndFlushOldSatbBuffers() :
+    HandshakeClosure("Shenandoah Update Thread Roots and Flush SATB"),
+    _flush_all_satb(ShenandoahBarrierSet::satb_mark_queue_set()) {
+    assert(ShenandoahBarrierSet::satb_mark_queue_set().get_filter_out_young(),
+           "Should be filtering pointers outside of old during old marking");
+  }
+
+  void do_thread(Thread* thread) override {
+    _update_roots.do_thread(thread);
+    _flush_all_satb.do_thread(thread);
+  }
+};
+
 void ShenandoahConcurrentGC::op_update_thread_roots() {
-  ShenandoahUpdateThreadHandshakeClosure cl;
-  Handshake::execute(&cl);
+  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+  if (heap->is_concurrent_old_mark_in_progress()) {
+    ShenandoahUpdateThreadRootsAndFlushOldSatbBuffers cl;
+    Handshake::execute(&cl);
+  } else {
+    ShenandoahUpdateThreadHandshakeClosure cl;
+    Handshake::execute(&cl);
+  }
 }
 
 void ShenandoahConcurrentGC::op_final_update_refs() {
@@ -1177,23 +1196,6 @@ void ShenandoahConcurrentGC::op_final_update_refs() {
   heap->set_has_forwarded_objects(false);
 
   if (heap->mode()->is_generational() && heap->is_concurrent_old_mark_in_progress()) {
-    // When the SATB barrier is left on to support concurrent old gen mark, it may pick up writes to
-    // objects in the collection set. After those objects are evacuated, the pointers in the
-    // SATB are no longer safe. Once we have finished update references, we are guaranteed that
-    // no more writes to the collection set are possible.
-    //
-    // This will transfer any old pointers in _active_ regions from the SATB to the old gen
-    // mark queues. All other pointers will be discarded. This would also discard any pointers
-    // in old regions that were included in a mixed evacuation. We aren't using the SATB filter
-    // methods here because we cannot control when they execute. If the SATB filter runs _after_
-    // a region has been recycled, we will not be able to detect the bad pointer.
-    //
-    // We are not concerned about skipping this step in abbreviated cycles because regions
-    // with no live objects cannot have been written to and so cannot have entries in the SATB
-    // buffers.
-    ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_update_refs_transfer_satb);
-    heap->old_generation()->transfer_pointers_from_satb();
-
     // Aging_cycle is only relevant during evacuation cycle for individual objects and during final mark for
     // entire regions.  Both of these relevant operations occur before final update refs.
     ShenandoahGenerationalHeap::heap()->set_aging_cycle(false);
@@ -1228,13 +1230,13 @@ bool ShenandoahConcurrentGC::entry_final_roots() {
                               ShenandoahWorkerPolicy::calc_workers_for_conc_evac(),
                               msg);
 
-  if (!heap->mode()->is_generational()) {
-    heap->concurrent_final_roots();
-  } else {
+  if (heap->mode()->is_generational()) {
     if (!complete_abbreviated_cycle()) {
       return false;
     }
   }
+
+  heap->concurrent_final_roots();
   return true;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 7a195f64cbd..367a15abfa4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -66,20 +66,6 @@ public:
   }
 };
 
-class ShenandoahSATBAndRemarkThreadsClosure : public ThreadClosure {
-private:
-  SATBMarkQueueSet& _satb_qset;
-
-public:
-  explicit ShenandoahSATBAndRemarkThreadsClosure(SATBMarkQueueSet& satb_qset) :
-    _satb_qset(satb_qset) {}
-
-  void do_thread(Thread* thread) override {
-    // Transfer any partial buffer to the qset for completed buffer processing.
-    _satb_qset.flush_queue(ShenandoahThreadLocalData::satb_mark_queue(thread));
-  }
-};
-
 template <ShenandoahGenerationType GENERATION>
 class ShenandoahFinalMarkingTask : public WorkerTask {
 private:
@@ -109,7 +95,7 @@ public:
       while (satb_mq_set.apply_closure_to_completed_buffer(&cl)) {}
       assert(!heap->has_forwarded_objects(), "Not expected");
 
-      ShenandoahSATBAndRemarkThreadsClosure tc(satb_mq_set);
+      ShenandoahFlushSATB tc(satb_mq_set);
       Threads::possibly_parallel_threads_do(true /* is_par */, &tc);
     }
     _cm->mark_loop(worker_id, _terminator, GENERATION, false /*not cancellable*/,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 53b83edd47b..cd079d29afe 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -101,12 +101,16 @@ void ShenandoahDegenGC::op_degenerated() {
     heap->old_generation()->card_scan()->mark_write_table_as_clean();
   }
 
-#ifdef ASSERT
   if (heap->mode()->is_generational()) {
-    ShenandoahOldGeneration* old_generation = heap->old_generation();
+    const ShenandoahOldGeneration* old_generation = heap->old_generation();
     if (!heap->is_concurrent_old_mark_in_progress()) {
       // If we are not marking the old generation, there should be nothing in the old mark queues
       assert(old_generation->task_queues()->is_empty(), "Old gen task queues should be empty");
+    } else {
+      // This is still necessary for degenerated cycles because the degeneration point may occur
+      // after final mark of the young generation. See ShenandoahConcurrentGC::op_final_update_refs for
+      // a more detailed explanation.
+      old_generation->transfer_pointers_from_satb();
     }
 
     if (_generation->is_global()) {
@@ -118,7 +122,6 @@ void ShenandoahDegenGC::op_degenerated() {
              "Old generation cannot be in state: %s", old_generation->state_name());
     }
   }
-#endif
 
   ShenandoahMetricsSnapshot metrics(heap->free_set());
 
@@ -166,15 +169,6 @@ void ShenandoahDegenGC::op_degenerated() {
           _generation->cancel_marking();
         }
 
-        if (heap->is_concurrent_mark_in_progress()) {
-          // If either old or young marking is in progress, the SATB barrier will be enabled.
-          // The SATB buffer may hold a mix of old and young pointers. The old pointers need to be
-          // transferred to the old generation mark queues and the young pointers are NOT part
-          // of this snapshot, so they must be dropped here. It is safe to drop them here because
-          // we will rescan the roots on this safepoint.
-          heap->old_generation()->transfer_pointers_from_satb();
-        }
-
         if (_degen_point == ShenandoahDegenPoint::_degenerated_roots) {
           // We only need this if the concurrent cycle has already swapped the card tables.
           // Marking will use the 'read' table, but interesting pointers may have been
@@ -193,8 +187,9 @@ void ShenandoahDegenGC::op_degenerated() {
     case _degenerated_mark:
       // No fallthrough. Continue mark, handed over from concurrent mark if
       // concurrent mark has yet completed
-      if (_degen_point == ShenandoahDegenPoint::_degenerated_mark &&
-          heap->is_concurrent_mark_in_progress()) {
+      if (_degen_point == ShenandoahDegenPoint::_degenerated_mark && heap->is_concurrent_mark_in_progress()) {
+        assert(!ShenandoahBarrierSet::satb_mark_queue_set().get_filter_out_young(),
+               "Should not be filtering out young pointers when concurrent mark degenerates");
         op_finish_mark();
       }
       assert(!heap->cancelled_gc(), "STW mark can not OOM");
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index 28053dffd5a..e582ea6b189 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -1040,12 +1040,6 @@ void ShenandoahGenerationalHeap::final_update_refs_update_region_states() {
 
 void ShenandoahGenerationalHeap::complete_degenerated_cycle() {
   shenandoah_assert_heaplocked_or_safepoint();
-  if (is_concurrent_old_mark_in_progress()) {
-    // This is still necessary for degenerated cycles because the degeneration point may occur
-    // after final mark of the young generation. See ShenandoahConcurrentGC::op_final_update_refs for
-    // a more detailed explanation.
-    old_generation()->transfer_pointers_from_satb();
-  }
   // In case degeneration interrupted concurrent evacuation or update references, we need to clean up
   // transient state. Otherwise, these actions have no effect.
   reset_generation_reserves();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 5b353ee2103..38f055c34b6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -2028,6 +2028,10 @@ void ShenandoahHeap::prepare_update_heap_references() {
 void ShenandoahHeap::propagate_gc_state_to_all_threads() {
   assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "Must be at Shenandoah safepoint");
   if (_gc_state_changed) {
+    // If we are only marking old, we do not need to process young pointers
+    ShenandoahBarrierSet::satb_mark_queue_set().set_filter_out_young(
+      is_concurrent_old_mark_in_progress() && !is_concurrent_young_mark_in_progress()
+    );
     ShenandoahGCStatePropagatorHandshakeClosure propagator(_gc_state.raw_value());
     Threads::threads_do(&propagator);
     _gc_state_changed = false;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index 1f474baef46..338c99c7c55 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -44,113 +44,17 @@
 #include "runtime/threads.hpp"
 #include "utilities/events.hpp"
 
-class ShenandoahFlushAllSATB : public ThreadClosure {
-private:
-  SATBMarkQueueSet& _satb_qset;
-
-public:
-  explicit ShenandoahFlushAllSATB(SATBMarkQueueSet& satb_qset) :
-    _satb_qset(satb_qset) {}
-
-  void do_thread(Thread* thread) override {
-    // Transfer any partial buffer to the qset for completed buffer processing.
-    _satb_qset.flush_queue(ShenandoahThreadLocalData::satb_mark_queue(thread));
-  }
-};
-
-class ShenandoahProcessOldSATB : public SATBBufferClosure {
-private:
-  ShenandoahObjToScanQueue*       _queue;
-  ShenandoahHeap*                 _heap;
-  ShenandoahMarkingContext* const _mark_context;
-  size_t                          _trashed_oops;
-
-public:
-  explicit ShenandoahProcessOldSATB(ShenandoahObjToScanQueue* q) :
-    _queue(q),
-    _heap(ShenandoahHeap::heap()),
-    _mark_context(_heap->marking_context()),
-    _trashed_oops(0) {}
-
-  void do_buffer(void** buffer, size_t size) override {
-    assert(size == 0 || !_heap->has_forwarded_objects() || _heap->is_concurrent_old_mark_in_progress(), "Forwarded objects are not expected here");
-    for (size_t i = 0; i < size; ++i) {
-      oop *p = (oop *) &buffer[i];
-      ShenandoahHeapRegion* region = _heap->heap_region_containing(*p);
-      if (region->is_old() && region->is_active()) {
-          ShenandoahMark::mark_through_ref<oop, OLD>(p, _queue, nullptr, _mark_context, false);
-      } else {
-        _trashed_oops++;
-      }
-    }
-  }
-
-  size_t trashed_oops() const {
-    return _trashed_oops;
-  }
-};
-
 class ShenandoahPurgeSATBTask : public WorkerTask {
-private:
-  ShenandoahObjToScanQueueSet* _mark_queues;
-  // Keep track of the number of oops that are not transferred to mark queues.
-  // This is volatile because workers update it, but the vm thread reads it.
-  volatile size_t             _trashed_oops;
-
 public:
-  explicit ShenandoahPurgeSATBTask(ShenandoahObjToScanQueueSet* queues) :
-    WorkerTask("Purge SATB"),
-    _mark_queues(queues),
-    _trashed_oops(0) {
+  explicit ShenandoahPurgeSATBTask() : WorkerTask("Purge SATB") {
     Threads::change_thread_claim_token();
   }
 
-  ~ShenandoahPurgeSATBTask() {
-    if (_trashed_oops > 0) {
-      log_debug(gc)("Purged %zu oops from old generation SATB buffers", _trashed_oops);
-    }
-  }
-
   void work(uint worker_id) override {
     ShenandoahParallelWorkerSession worker_session(worker_id);
     ShenandoahSATBMarkQueueSet &satb_queues = ShenandoahBarrierSet::satb_mark_queue_set();
-    ShenandoahFlushAllSATB flusher(satb_queues);
+    ShenandoahFlushSATB flusher(satb_queues);
     Threads::possibly_parallel_threads_do(true /* is_par */, &flusher);
-
-    ShenandoahObjToScanQueue* mark_queue = _mark_queues->queue(worker_id);
-    ShenandoahProcessOldSATB processor(mark_queue);
-    while (satb_queues.apply_closure_to_completed_buffer(&processor)) {}
-
-    AtomicAccess::add(&_trashed_oops, processor.trashed_oops());
-  }
-};
-
-class ShenandoahTransferOldSATBTask : public WorkerTask {
-  ShenandoahSATBMarkQueueSet&  _satb_queues;
-  ShenandoahObjToScanQueueSet* _mark_queues;
-  // Keep track of the number of oops that are not transferred to mark queues.
-  // This is volatile because workers update it, but the control thread reads it.
-  volatile size_t              _trashed_oops;
-
-public:
-  explicit ShenandoahTransferOldSATBTask(ShenandoahSATBMarkQueueSet& satb_queues, ShenandoahObjToScanQueueSet* mark_queues) :
-    WorkerTask("Transfer SATB"),
-    _satb_queues(satb_queues),
-    _mark_queues(mark_queues),
-    _trashed_oops(0) {}
-
-  ~ShenandoahTransferOldSATBTask() {
-    if (_trashed_oops > 0) {
-      log_debug(gc)("Purged %zu oops from old generation SATB buffers", _trashed_oops);
-    }
-  }
-
-  void work(uint worker_id) override {
-    ShenandoahObjToScanQueue* mark_queue = _mark_queues->queue(worker_id);
-    ShenandoahProcessOldSATB processor(mark_queue);
-    while (_satb_queues.apply_closure_to_completed_buffer(&processor)) {}
-
-    AtomicAccess::add(&_trashed_oops, processor.trashed_oops());
   }
 };
 
@@ -463,26 +367,11 @@ bool ShenandoahOldGeneration::coalesce_and_fill() {
   }
 }
 
-void ShenandoahOldGeneration::concurrent_transfer_pointers_from_satb() const {
-  const ShenandoahHeap* heap = ShenandoahHeap::heap();
-  assert(heap->is_concurrent_old_mark_in_progress(), "Only necessary during old marking.");
-  log_debug(gc)("Transfer SATB buffers");
-
-  // Step 1. All threads need to 'complete' partially filled, thread local SATB buffers. This
-  // is accomplished in ShenandoahConcurrentGC::complete_abbreviated_cycle using a Handshake
-  // operation.
-  // Step 2. Use worker threads to transfer oops from old, active regions in the completed
-  // SATB buffers to old generation mark queues.
-  ShenandoahSATBMarkQueueSet& satb_queues = ShenandoahBarrierSet::satb_mark_queue_set();
-  ShenandoahTransferOldSATBTask transfer_task(satb_queues, task_queues());
-  heap->workers()->run_task(&transfer_task);
-}
-
 void ShenandoahOldGeneration::transfer_pointers_from_satb() const {
   const ShenandoahHeap* heap = ShenandoahHeap::heap();
   assert(heap->is_concurrent_old_mark_in_progress(), "Only necessary during old marking.");
   log_debug(gc)("Transfer SATB buffers");
-  ShenandoahPurgeSATBTask purge_satb_task(task_queues());
+  ShenandoahPurgeSATBTask purge_satb_task;
   heap->workers()->run_task(&purge_satb_task);
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
index 028ee18554c..cd78ed4ef5e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
@@ -228,26 +228,27 @@ public:
   // Cancels old gc and transitions to the idle state
   void cancel_gc();
 
-  // We leave the SATB barrier on for the entirety of the old generation
-  // marking phase. In some cases, this can cause a write to a perfectly
-  // reachable oop to enqueue a pointer that later becomes garbage (because
-  // it points at an object that is later chosen for the collection set). There are
-  // also cases where the referent of a weak reference ends up in the SATB
-  // and is later collected. In these cases the oop in the SATB buffer becomes
-  // invalid and the _next_ cycle will crash during its marking phase. To
-  // avoid this problem, we "purge" the SATB buffers during the final update
-  // references phase if (and only if) an old generation mark is in progress.
-  // At this stage we can safely determine if any of the oops in the SATB
-  // buffer belong to trashed regions (before they are recycled). As it
-  // happens, flushing a SATB queue also filters out oops which have already
-  // been marked - which is the case for anything that is being evacuated
-  // from the collection set.
+  // The SATB barrier will be "enabled" until old marking completes. This means it is
+  // possible for an entire young collection cycle to execute while the SATB barrier is enabled.
+  // Consider a situation like this, where we have a pointer 'B' at an object 'A' which is in
+  // the young collection set:
   //
-  // Alternatively, we could inspect the state of the heap and the age of the
-  // object at the barrier, but we reject this approach because it is likely
-  // the performance impact would be too severe.
+  //      +--Young, CSet------+     +--Young, Regular----+
+  //      |                   |     |                    |
+  //      |                   |     |                    |
+  //      |       A <--------------------+ B             |
+  //      |                   |     |                    |
+  //      |                   |     |                    |
+  //      +-------------------+     +--------------------+
+  //
+  // If a mutator thread overwrites pointer B, the SATB barrier will dutifully enqueue
+  // object A. However, this object will be trashed when the young cycle completes. We must,
+  // therefore, filter this object from the SATB buffer before any old mark threads see it.
+  // We do this with a handshake before final-update-refs (see shenandoahConcurrentGC.cpp).
+  //
+  // This method is here only for degenerated cycles. A concurrent cycle may be cancelled before
+  // we have a chance to execute the handshake to flush the SATB in final-update-refs.
   void transfer_pointers_from_satb() const;
-  void concurrent_transfer_pointers_from_satb() const;
 
   // True if there are old regions waiting to be selected for a mixed collection
   bool has_unprocessed_collection_candidates();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp
index 547ebb1a229..c2ed575b438 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp
@@ -28,7 +28,7 @@
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
 
 ShenandoahSATBMarkQueueSet::ShenandoahSATBMarkQueueSet(BufferNode::Allocator* allocator) :
-  SATBMarkQueueSet(allocator)
+  SATBMarkQueueSet(allocator), _filter_out_young(false)
 {}
 
 SATBMarkQueue& ShenandoahSATBMarkQueueSet::satb_queue_for_thread(Thread* const t) const {
@@ -39,16 +39,33 @@ class ShenandoahSATBMarkQueueFilterFn {
   ShenandoahHeap* const _heap;
 
 public:
-  ShenandoahSATBMarkQueueFilterFn(ShenandoahHeap* heap) : _heap(heap) {}
+  explicit ShenandoahSATBMarkQueueFilterFn(ShenandoahHeap* heap) : _heap(heap) {}
 
-  // Return true if entry should be filtered out (removed), false if
-  // it should be retained.
+  // Return true if entry should be filtered out (removed), false if it should be retained.
   bool operator()(const void* entry) const {
     return !_heap->requires_marking(entry);
   }
 };
 
+class ShenandoahSATBOldMarkQueueFilterFn {
+  ShenandoahHeap* const _heap;
+
+public:
+  explicit ShenandoahSATBOldMarkQueueFilterFn(ShenandoahHeap* heap) : _heap(heap) {}
+
+  // Return true if entry should be filtered out (removed), false if it should be retained.
+  bool operator()(const void* entry) const {
+    assert(_heap->is_concurrent_old_mark_in_progress(), "Should only use this when old marking is in progress");
+    assert(!_heap->is_concurrent_young_mark_in_progress(), "Should only use this when young marking is not in progress");
+    return !_heap->requires_marking(entry) || !_heap->is_in_old(entry);
+  }
+};
+
 void ShenandoahSATBMarkQueueSet::filter(SATBMarkQueue& queue) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
-  apply_filter(ShenandoahSATBMarkQueueFilterFn(heap), queue);
+  if (_filter_out_young) {
+    apply_filter(ShenandoahSATBOldMarkQueueFilterFn(heap), queue);
+  } else {
+    apply_filter(ShenandoahSATBMarkQueueFilterFn(heap), queue);
+  }
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
index c30d2507676..dd4cdfebc17 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
@@ -27,15 +27,23 @@
 
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/satbMarkQueue.hpp"
-#include "runtime/javaThread.hpp"
-#include "runtime/mutex.hpp"
 
 class ShenandoahSATBMarkQueueSet : public SATBMarkQueueSet {
-public:
-  ShenandoahSATBMarkQueueSet(BufferNode::Allocator* allocator);
+private:
+  bool _filter_out_young;
 
-  virtual SATBMarkQueue& satb_queue_for_thread(Thread* const t) const;
-  virtual void filter(SATBMarkQueue& queue);
+public:
+  explicit ShenandoahSATBMarkQueueSet(BufferNode::Allocator* allocator);
+
+  SATBMarkQueue& satb_queue_for_thread(Thread* const t) const override;
+  void filter(SATBMarkQueue& queue) override;
+  void set_filter_out_young(bool filter_out_young) {
+    _filter_out_young = filter_out_young;
+  }
+
+  bool get_filter_out_young() const {
+    return _filter_out_young;
+  }
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP

From 90ccdf2986b0e3705997fe31a23fd53c88a1bfaf Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Thu, 6 Nov 2025 20:20:22 +0000
Subject: [PATCH 071/512] 8371367: Replace remaining
 JvmtiJavaThreadEventTransition with JVMTI_JAVA_THREAD_EVENT_CALLBACK_BLOCK

Reviewed-by: sspitsyn, cjplummer
---
 src/hotspot/share/prims/jvmtiExport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index d241ca6110a..96437882584 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -1774,7 +1774,7 @@ void JvmtiExport::post_object_free(JvmtiEnv* env, GrowableArray<jlong>* objects)
   EVT_TRACE(JVMTI_EVENT_OBJECT_FREE, ("[?] Evt Object Free sent"));
 
   JvmtiThreadEventMark jem(javaThread);
-  JvmtiJavaThreadEventTransition jet(javaThread);
+  JVMTI_JAVA_THREAD_EVENT_CALLBACK_BLOCK(javaThread)
   jvmtiEventObjectFree callback = env->callbacks()->ObjectFree;
   if (callback != nullptr) {
     for (int index = 0; index < objects->length(); index++) {

From 8a0c47d4ba4db523d94689b3ac347e9cd35183ce Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 6 Nov 2025 20:24:20 +0000
Subject: [PATCH 072/512] 8371225: Missing release of GDK lock in
 Java_sun_awt_X11_GtkFileDialogPeer_run()

Reviewed-by: aivanov, serb
---
 .../libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c b/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
index db6acc0f3d1..9e6fcd423ad 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -324,8 +324,6 @@ Java_sun_awt_X11_GtkFileDialogPeer_run(JNIEnv * env, jobject jpeer,
         JNU_CHECK_EXCEPTION(env);
     }
 
-    gtk->gdk_threads_enter();
-
     const char *title = jtitle == NULL? "": (*env)->GetStringUTFChars(env, jtitle, 0);
     if (title == NULL) {
         (*env)->ExceptionClear(env);
@@ -333,6 +331,8 @@ Java_sun_awt_X11_GtkFileDialogPeer_run(JNIEnv * env, jobject jpeer,
         return;
     }
 
+    gtk->gdk_threads_enter();
+
     if (mode == java_awt_FileDialog_SAVE) {
         /* Save action */
         dialog = gtk->gtk_file_chooser_dialog_new(title, NULL,
@@ -360,6 +360,7 @@ Java_sun_awt_X11_GtkFileDialogPeer_run(JNIEnv * env, jobject jpeer,
     if (jdir != NULL) {
         const char *dir = (*env)->GetStringUTFChars(env, jdir, 0);
         if (dir == NULL) {
+            gtk->gdk_threads_leave();
             (*env)->ExceptionClear(env);
             JNU_ThrowOutOfMemoryError(env, "Could not get dir");
             return;
@@ -372,6 +373,7 @@ Java_sun_awt_X11_GtkFileDialogPeer_run(JNIEnv * env, jobject jpeer,
     if (jfile != NULL) {
         const char *filename = (*env)->GetStringUTFChars(env, jfile, 0);
         if (filename == NULL) {
+            gtk->gdk_threads_leave();
             (*env)->ExceptionClear(env);
             JNU_ThrowOutOfMemoryError(env, "Could not get filename");
             return;

From 8796611206438c6fe8bf0cba87dca089d9da2e30 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Thu, 6 Nov 2025 21:03:54 +0000
Subject: [PATCH 073/512] 8272160: Avoid using 32-bit counters in CDS code

Reviewed-by: iklam, kvn
---
 src/hotspot/share/cds/aotMetaspace.cpp    |  6 ++--
 src/hotspot/share/cds/archiveUtils.hpp    |  4 +--
 src/hotspot/share/cds/cdsHeapVerifier.cpp |  2 +-
 src/hotspot/share/cds/cdsHeapVerifier.hpp |  2 +-
 src/hotspot/share/cds/filemap.cpp         |  2 +-
 src/hotspot/share/cds/heapShared.cpp      | 40 +++++++++++------------
 src/hotspot/share/cds/heapShared.hpp      | 21 +++++-------
 7 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index 039c32a2bad..e5c1700dbfb 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -2057,13 +2057,13 @@ void AOTMetaspace::unmap_archive(FileMapInfo* mapinfo) {
 // For -XX:PrintSharedArchiveAndExit
 class CountSharedSymbols : public SymbolClosure {
  private:
-   int _count;
+   size_t _count;
  public:
    CountSharedSymbols() : _count(0) {}
   void do_symbol(Symbol** sym) {
     _count++;
   }
-  int total() { return _count; }
+  size_t total() { return _count; }
 
 };
 
@@ -2137,7 +2137,7 @@ void AOTMetaspace::initialize_shared_spaces() {
     // collect shared symbols and strings
     CountSharedSymbols cl;
     SymbolTable::shared_symbols_do(&cl);
-    tty->print_cr("Number of shared symbols: %d", cl.total());
+    tty->print_cr("Number of shared symbols: %zu", cl.total());
     tty->print_cr("Number of shared strings: %zu", StringTable::shared_entry_count());
     tty->print_cr("VM version: %s\r\n", static_mapinfo->vm_version());
     if (FileMapInfo::current_info() == nullptr || _archive_loading_failed) {
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index be423881008..79d894f0144 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -324,14 +324,14 @@ private:
   size_t _base_offset;
   size_t _count;
   int _roots_count;
-  int _max_size_in_bytes;
+  size_t _max_size_in_bytes;
   int _max_size_in_elems;
 
 public:
   size_t base_offset() { return _base_offset; }
   size_t count() { return _count; }
   int roots_count() { return _roots_count; }
-  int max_size_in_bytes() { return _max_size_in_bytes; }
+  size_t max_size_in_bytes() { return _max_size_in_bytes; }
   int max_size_in_elems() { return _max_size_in_elems; }
 
   size_t size_in_bytes(size_t seg_idx);
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
index 59b07190c09..59c91c834d6 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.cpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -254,7 +254,7 @@ void CDSHeapVerifier::add_shared_secret_accessors() {
 
 CDSHeapVerifier::~CDSHeapVerifier() {
   if (_problems > 0) {
-    log_error(aot, heap)("Scanned %d objects. Found %d case(s) where "
+    log_error(aot, heap)("Scanned %zu objects. Found %d case(s) where "
                          "an object points to a static field that "
                          "may hold a different value at runtime.", _archived_objs, _problems);
     log_error(aot, heap)("Please see cdsHeapVerifier.cpp and aotClassInitializer.cpp for details");
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.hpp b/src/hotspot/share/cds/cdsHeapVerifier.hpp
index 88ef13c9e90..7f1bdb1d249 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.hpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.hpp
@@ -41,7 +41,7 @@ class CDSHeapVerifier : public KlassClosure {
   class SharedSecretsAccessorFinder;
   class TraceFields;
 
-  int _archived_objs;
+  size_t _archived_objs;
   int _problems;
 
   struct StaticFieldInfo {
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 050c1708efb..b52861cecef 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -309,7 +309,7 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- heap_root_segments.base_offset: 0x%zx", _heap_root_segments.base_offset());
   st->print_cr("- heap_root_segments.count:       %zu", _heap_root_segments.count());
   st->print_cr("- heap_root_segments.max_size_elems: %d", _heap_root_segments.max_size_in_elems());
-  st->print_cr("- heap_root_segments.max_size_bytes: %d", _heap_root_segments.max_size_in_bytes());
+  st->print_cr("- heap_root_segments.max_size_bytes: %zu", _heap_root_segments.max_size_in_bytes());
   st->print_cr("- _heap_oopmap_start_pos:         %zu", _heap_oopmap_start_pos);
   st->print_cr("- _heap_ptrmap_start_pos:         %zu", _heap_ptrmap_start_pos);
   st->print_cr("- _rw_ptrmap_start_pos:           %zu", _rw_ptrmap_start_pos);
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 146ee4af1e0..3f4d584b0f5 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -1049,7 +1049,7 @@ void HeapShared::write_subgraph_info_table() {
 
   _run_time_subgraph_info_table.reset();
 
-  CompactHashtableWriter writer(d_table->_count, &stats);
+  CompactHashtableWriter writer(d_table->number_of_entries(), &stats);
   CopyKlassSubGraphInfoToArchive copy(&writer);
   d_table->iterate(&copy);
   writer.dump(&_run_time_subgraph_info_table, "subgraphs");
@@ -1820,15 +1820,15 @@ void HeapShared::check_special_subgraph_classes() {
 
 HeapShared::SeenObjectsTable* HeapShared::_seen_objects_table = nullptr;
 HeapShared::PendingOop HeapShared::_object_being_archived;
-int HeapShared::_num_new_walked_objs;
-int HeapShared::_num_new_archived_objs;
-int HeapShared::_num_old_recorded_klasses;
+size_t HeapShared::_num_new_walked_objs;
+size_t HeapShared::_num_new_archived_objs;
+size_t HeapShared::_num_old_recorded_klasses;
 
-int HeapShared::_num_total_subgraph_recordings = 0;
-int HeapShared::_num_total_walked_objs = 0;
-int HeapShared::_num_total_archived_objs = 0;
-int HeapShared::_num_total_recorded_klasses = 0;
-int HeapShared::_num_total_verifications = 0;
+size_t HeapShared::_num_total_subgraph_recordings = 0;
+size_t HeapShared::_num_total_walked_objs = 0;
+size_t HeapShared::_num_total_archived_objs = 0;
+size_t HeapShared::_num_total_recorded_klasses = 0;
+size_t HeapShared::_num_total_verifications = 0;
 
 bool HeapShared::has_been_seen_during_subgraph_recording(oop obj) {
   return _seen_objects_table->get(obj) != nullptr;
@@ -1851,10 +1851,10 @@ void HeapShared::start_recording_subgraph(InstanceKlass *k, const char* class_na
 }
 
 void HeapShared::done_recording_subgraph(InstanceKlass *k, const char* class_name) {
-  int num_new_recorded_klasses = get_subgraph_info(k)->num_subgraph_object_klasses() -
+  size_t num_new_recorded_klasses = get_subgraph_info(k)->num_subgraph_object_klasses() -
     _num_old_recorded_klasses;
   log_info(aot, heap)("Done recording subgraph(s) for archived fields in %s: "
-                      "walked %d objs, archived %d new objs, recorded %d classes",
+                      "walked %zu objs, archived %zu new objs, recorded %zu classes",
                       class_name, _num_new_walked_objs, _num_new_archived_objs,
                       num_new_recorded_klasses);
 
@@ -2102,18 +2102,18 @@ void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
     done_recording_subgraph(info->klass, klass_name);
   }
 
-  log_info(aot, heap)("Archived subgraph records = %d",
+  log_info(aot, heap)("Archived subgraph records = %zu",
                       _num_total_subgraph_recordings);
-  log_info(aot, heap)("  Walked %d objects", _num_total_walked_objs);
-  log_info(aot, heap)("  Archived %d objects", _num_total_archived_objs);
-  log_info(aot, heap)("  Recorded %d klasses", _num_total_recorded_klasses);
+  log_info(aot, heap)("  Walked %zu objects", _num_total_walked_objs);
+  log_info(aot, heap)("  Archived %zu objects", _num_total_archived_objs);
+  log_info(aot, heap)("  Recorded %zu klasses", _num_total_recorded_klasses);
 
 #ifndef PRODUCT
   for (int i = 0; fields[i].valid(); i++) {
     ArchivableStaticFieldInfo* f = &fields[i];
     verify_subgraph_from_static_field(f->klass, f->offset);
   }
-  log_info(aot, heap)("  Verified %d references", _num_total_verifications);
+  log_info(aot, heap)("  Verified %zu references", _num_total_verifications);
 #endif
 }
 
@@ -2165,8 +2165,8 @@ void HeapShared::debug_trace() {
 class FindEmbeddedNonNullPointers: public BasicOopIterateClosure {
   void* _start;
   BitMap *_oopmap;
-  int _num_total_oops;
-  int _num_null_oops;
+  size_t _num_total_oops;
+  size_t _num_null_oops;
  public:
   FindEmbeddedNonNullPointers(void* start, BitMap* oopmap)
     : _start(start), _oopmap(oopmap), _num_total_oops(0),  _num_null_oops(0) {}
@@ -2192,8 +2192,8 @@ class FindEmbeddedNonNullPointers: public BasicOopIterateClosure {
       _num_null_oops ++;
     }
   }
-  int num_total_oops() const { return _num_total_oops; }
-  int num_null_oops()  const { return _num_null_oops; }
+  size_t num_total_oops() const { return _num_total_oops; }
+  size_t num_null_oops()  const { return _num_null_oops; }
 };
 #endif
 
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index c877748fe9c..cc41fb1dec7 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -217,10 +217,7 @@ private:
                                137, // prime number
                                AnyObj::C_HEAP,
                                mtClassShared,
-                               DumpTimeSharedClassTable_hash> {
-  public:
-    int _count;
-  };
+                               DumpTimeSharedClassTable_hash> {};
 
 public: // solaris compiler wants this for RunTimeKlassSubGraphInfoTable
   inline static bool record_equals_compact_hashtable_entry(
@@ -301,16 +298,16 @@ private:
   }
 
   // Statistics (for one round of start_recording_subgraph ... done_recording_subgraph)
-  static int _num_new_walked_objs;
-  static int _num_new_archived_objs;
-  static int _num_old_recorded_klasses;
+  static size_t _num_new_walked_objs;
+  static size_t _num_new_archived_objs;
+  static size_t _num_old_recorded_klasses;
 
   // Statistics (for all archived subgraphs)
-  static int _num_total_subgraph_recordings;
-  static int _num_total_walked_objs;
-  static int _num_total_archived_objs;
-  static int _num_total_recorded_klasses;
-  static int _num_total_verifications;
+  static size_t _num_total_subgraph_recordings;
+  static size_t _num_total_walked_objs;
+  static size_t _num_total_archived_objs;
+  static size_t _num_total_recorded_klasses;
+  static size_t _num_total_verifications;
 
   static void start_recording_subgraph(InstanceKlass *k, const char* klass_name,
                                        bool is_full_module_graph);

From e34a831814996be3e0a2df86b11b1718a76ea558 Mon Sep 17 00:00:00 2001
From: Rui Li <ruiamzn@amazon.com>
Date: Thu, 6 Nov 2025 23:46:50 +0000
Subject: [PATCH 074/512] 8261743: Shenandoah: enable String deduplication with
 compact heuristics

Reviewed-by: shade, wkemper
---
 .../gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
index 592bba67757..f8a77d95d51 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
@@ -38,6 +38,7 @@ ShenandoahCompactHeuristics::ShenandoahCompactHeuristics(ShenandoahSpaceInfo* sp
   SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
   SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahUncommit);
   SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahAlwaysClearSoftRefs);
+  SHENANDOAH_ERGO_ENABLE_FLAG(UseStringDeduplication);
   SHENANDOAH_ERGO_OVERRIDE_DEFAULT(ShenandoahAllocationThreshold,  10);
   SHENANDOAH_ERGO_OVERRIDE_DEFAULT(ShenandoahImmediateThreshold,   100);
   SHENANDOAH_ERGO_OVERRIDE_DEFAULT(ShenandoahUncommitDelay,        1000);

From 866faa9d40ab336e4c4861a55edc4c91d8aa0c74 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Fri, 7 Nov 2025 08:15:42 +0000
Subject: [PATCH 075/512] 8366577: Deprecate
 java.net.Socket::setPerformancePreferences

Reviewed-by: dfuchs, alanb, jpai
---
 src/java.base/share/classes/java/net/ServerSocket.java        | 4 ++++
 src/java.base/share/classes/java/net/Socket.java              | 4 ++++
 src/java.base/share/classes/java/net/SocketImpl.java          | 4 ++++
 .../share/classes/sun/security/ssl/BaseSSLSocketImpl.java     | 3 ++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java
index af7cedfd966..21061c2dae1 100644
--- a/src/java.base/share/classes/java/net/ServerSocket.java
+++ b/src/java.base/share/classes/java/net/ServerSocket.java
@@ -947,7 +947,11 @@ public class ServerSocket implements java.io.Closeable {
      *         bandwidth
      *
      * @since 1.5
+     *
+     * @deprecated This method was intended to allow for protocols that are now
+     *             obsolete.
      */
+    @Deprecated(since = "26", forRemoval = true)
     public void setPerformancePreferences(int connectionTime,
                                           int latency,
                                           int bandwidth)
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index a2aee2e45a1..42ca5314b78 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -1853,7 +1853,11 @@ public class Socket implements java.io.Closeable {
      *         bandwidth
      *
      * @since 1.5
+     *
+     * @deprecated This method was intended to allow for protocols that are now
+     *             obsolete.
      */
+    @Deprecated(since = "26", forRemoval = true)
     public void setPerformancePreferences(int connectionTime,
                                           int latency,
                                           int bandwidth)
diff --git a/src/java.base/share/classes/java/net/SocketImpl.java b/src/java.base/share/classes/java/net/SocketImpl.java
index 15c12457aac..27489aa9947 100644
--- a/src/java.base/share/classes/java/net/SocketImpl.java
+++ b/src/java.base/share/classes/java/net/SocketImpl.java
@@ -357,7 +357,11 @@ public abstract class SocketImpl implements SocketOptions {
      *         bandwidth
      *
      * @since 1.5
+     *
+     * @deprecated This method was intended to allow for protocols that are now
+     *             obsolete.
      */
+    @Deprecated(since = "26", forRemoval = true)
     protected void setPerformancePreferences(int connectionTime,
                                           int latency,
                                           int bandwidth)
diff --git a/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
index 20bb67c06d6..a24d6e5799c 100644
--- a/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -556,6 +556,7 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
      * @see java.net.Socket#setPerformancePreferences(int, int, int)
      */
     @Override
+    @SuppressWarnings("removal")
     public void setPerformancePreferences(int connectionTime,
             int latency, int bandwidth) {
         if (self == this) {

From 205a163a90bb263d403476c28203836189e337a7 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 7 Nov 2025 09:06:51 +0000
Subject: [PATCH 076/512] 8340840: jshell ClassFormatError when making inner
 class static 8368999: jshell crash when existing sealed class is updated to
 also be abstract

Reviewed-by: mcimadamore, asotona, liach
---
 .../com/sun/tools/javac/jvm/ClassReader.java  |  20 +-
 .../tools/javac/resources/compiler.properties |   6 +
 .../jshell/execution/JdiExecutionControl.java |   4 +-
 test/langtools/jdk/jshell/ReplaceTest.java    |  37 ++-
 .../InconsistentInnerClasses.java             |  30 ++
 .../classpath/p/Other.java                    |  25 ++
 .../classpath/p/Test.java                     |  25 ++
 .../SourceAndInnerClassInconsistency.java     | 277 ++++++++++++++++++
 8 files changed, 413 insertions(+), 11 deletions(-)
 create mode 100644 test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/InconsistentInnerClasses.java
 create mode 100644 test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Other.java
 create mode 100644 test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Test.java
 create mode 100644 test/langtools/tools/javac/recovery/SourceAndInnerClassInconsistency.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 6f1ad28586d..b7bf48b4a12 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -3152,14 +3152,18 @@ public class ClassReader {
                 if (name == names.empty)
                     name = names.one;
                 ClassSymbol member = enterClass(name, outer);
-                if ((flags & STATIC) == 0) {
-                    ((ClassType)member.type).setEnclosingType(outer.type);
-                    if (member.erasure_field != null)
-                        ((ClassType)member.erasure_field).setEnclosingType(types.erasure(outer.type));
-                }
-                if (c == outer && member.owner == c) {
-                    member.flags_field = flags;
-                    enterMember(c, member);
+                if ((member.flags_field & FROM_SOURCE) == 0) {
+                    if ((flags & STATIC) == 0) {
+                        ((ClassType)member.type).setEnclosingType(outer.type);
+                        if (member.erasure_field != null)
+                            ((ClassType)member.erasure_field).setEnclosingType(types.erasure(outer.type));
+                    }
+                    if (c == outer && member.owner == c) {
+                        member.flags_field = flags;
+                        enterMember(c, member);
+                    }
+                } else if ((flags & STATIC) != (member.flags_field & STATIC)) {
+                    log.warning(LintWarnings.InconsistentInnerClasses(member, currentClassFile));
                 }
             }
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 4e034ff1bc8..6318476fca4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2258,6 +2258,12 @@ compiler.warn.option.obsolete.suppression=\
 compiler.warn.future.attr=\
     {0} attribute introduced in version {1}.{2} class files is ignored in version {3}.{4} class files
 
+# 0: symbol, 1: file object
+# lint: classfile
+compiler.warn.inconsistent.inner.classes=\
+    InnerClasses attribute for {0} in {1} inconsistent with source code\n\
+    ({1} may need to be recompiled with {0})
+
 # lint: requires-automatic
 compiler.warn.requires.automatic=\
     requires directive for an automatic module
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java
index 3084c601cc5..176e3530f39 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,7 +90,7 @@ public abstract class JdiExecutionControl extends StreamingExecutionControl impl
             vm().redefineClasses(rmp);
         } catch (EngineTerminationException ex) {
             throw ex;
-        } catch (Exception ex) {
+        } catch (Exception | LinkageError ex) {
             throw new ClassInstallException("redefine: " + ex.getMessage(), new boolean[cbcs.length]);
         }
         // forward the redefine to remote-end to register the redefined bytecode
diff --git a/test/langtools/jdk/jshell/ReplaceTest.java b/test/langtools/jdk/jshell/ReplaceTest.java
index 02ebb27fcb9..6b9471b6bc4 100644
--- a/test/langtools/jdk/jshell/ReplaceTest.java
+++ b/test/langtools/jdk/jshell/ReplaceTest.java
@@ -22,7 +22,7 @@
  */
 
 /*
- * @test 8080069 8152925
+ * @test 8080069 8152925 8340840 8368999
  * @summary Test of Snippet redefinition and replacement.
  * @build KullaTesting TestingInputStream
  * @run junit ReplaceTest
@@ -282,4 +282,39 @@ public class ReplaceTest extends KullaTesting {
                 ste(MAIN_SNIPPET, VALID, VALID, true, null),
                 ste(xi2, VALID, OVERWRITTEN, false, MAIN_SNIPPET)));
     }
+
+    @Test //JDK-8368999
+    public void testLinkageErrorWhileRedefine() {
+        Snippet iKey = classKey(assertEval("sealed interface I permits C {}",
+                                           ste(MAIN_SNIPPET, NONEXISTENT, RECOVERABLE_NOT_DEFINED, false, null)));
+        Snippet cKey = classKey(assertEval("sealed class C implements I permits SubC {}",
+                                           ste(MAIN_SNIPPET, NONEXISTENT, RECOVERABLE_NOT_DEFINED, false, null)));
+        Snippet subCKey = classKey(assertEval("final class SubC extends C {}",
+                                              ste(MAIN_SNIPPET, NONEXISTENT, VALID, true, null),
+                                              ste(iKey, RECOVERABLE_NOT_DEFINED, VALID, true, null),
+                                              ste(cKey, RECOVERABLE_NOT_DEFINED, VALID, true, null)));
+        assertEval("sealed abstract class C implements I permits SubC {}",
+                   ste(MAIN_SNIPPET, VALID, VALID, true, null),
+                   ste(iKey, VALID, VALID, true, null),
+                   ste(subCKey, VALID, VALID, true, null),
+                   ste(cKey, VALID, OVERWRITTEN, false, null));
+    }
+
+    @Test //JDK-8340840
+    public void testStaticNonStatic() {
+        Snippet oKey = classKey(assertEval("class O { class I {} }"));
+        Snippet vKey = varKey(assertEval("var i = new O().new I();"));
+        assertEval("class O { static class I {} }",
+                   DiagCheck.DIAG_OK,
+                   DiagCheck.DIAG_ERROR,
+                   ste(MAIN_SNIPPET, VALID, VALID, true, null),
+                   ste(vKey, VALID, RECOVERABLE_NOT_DEFINED, true, null),
+                   ste(oKey, VALID, OVERWRITTEN, false, null));
+        assertEval("var i2 = new O.I();");
+        assertEval("var i = new O.I();",
+                   DiagCheck.DIAG_OK,
+                   DiagCheck.DIAG_IGNORE, //there are errors in the original (replaced) Snippet
+                   ste(MAIN_SNIPPET, RECOVERABLE_NOT_DEFINED, VALID, true, null),
+                   ste(vKey, RECOVERABLE_NOT_DEFINED, OVERWRITTEN, false, null));
+    }
 }
diff --git a/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/InconsistentInnerClasses.java b/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/InconsistentInnerClasses.java
new file mode 100644
index 00000000000..f3a0bc977cb
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/InconsistentInnerClasses.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.warn.inconsistent.inner.classes
+// options: -Xlint:classfile
+
+class Test {
+    Other o;
+    public class Nested {}
+}
diff --git a/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Other.java b/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Other.java
new file mode 100644
index 00000000000..c3de73058f6
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Other.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+class Other {
+    Test.Nested n;
+}
diff --git a/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Test.java b/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Test.java
new file mode 100644
index 00000000000..81638da2853
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/InconsistentInnerClasses/classpath/p/Test.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+class Test {
+    public static class Nested { }
+}
diff --git a/test/langtools/tools/javac/recovery/SourceAndInnerClassInconsistency.java b/test/langtools/tools/javac/recovery/SourceAndInnerClassInconsistency.java
new file mode 100644
index 00000000000..0dfda503288
--- /dev/null
+++ b/test/langtools/tools/javac/recovery/SourceAndInnerClassInconsistency.java
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8340840
+ * @summary Ensure InnerClasses attribute from a classfile won't overwrite properties
+ *          of a source-based class
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run junit SourceAndInnerClassInconsistency
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class SourceAndInnerClassInconsistency {
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testNonStaticToStatic() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public class Nested {}
+                          }
+                          """,
+                          """
+                          public class Other {
+                              Complex.Nested n;
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .files(tb.findJavaFiles(src))
+            .outdir(classes)
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public static class Nested {}
+                              private void t() {
+                                  Other o;
+                              }
+                          }
+                          """);
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll();
+        List<String> log = new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-Xlint:classfile")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.DIRECT);
+        List<String> expected = List.of(
+            "- compiler.warn.inconsistent.inner.classes: Complex.Nested, Other.class",
+            "1 warning"
+        );
+        if (!Objects.equals(expected, log)) {
+            throw new AssertionError("Wrong output, expected: " + expected +
+                                     ", got: " + log);
+        }
+    }
+
+    @Test
+    public void testStaticToNonStatic() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public static class Nested {}
+                          }
+                          """,
+                          """
+                          public class Other {
+                              Complex.Nested n;
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .files(tb.findJavaFiles(src))
+            .outdir(classes)
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public class Nested {}
+                              private void t() {
+                                  Other o;
+                              }
+                          }
+                          """);
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll();
+        List<String> log = new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-Xlint:classfile")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll()
+            .getOutputLines(Task.OutputKind.DIRECT);
+        List<String> expected = List.of(
+            "- compiler.warn.inconsistent.inner.classes: Complex.Nested, Other.class",
+            "1 warning"
+        );
+        if (!Objects.equals(expected, log)) {
+            throw new AssertionError("Wrong output, expected: " + expected +
+                                     ", got: " + log);
+        }
+    }
+
+    @Test
+    public void testNoWarning() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public static class Nested {}
+                          }
+                          """,
+                          """
+                          public class Other {
+                              Complex.Nested n;
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .files(tb.findJavaFiles(src))
+            .outdir(classes)
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public static class Nested {}
+                              private void t() {
+                                  Other o;
+                              }
+                          }
+                          """);
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll();
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-Xlint:classfile", "-Werror")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll();
+    }
+
+    @Test
+    public void testSuppress() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public static class Nested {}
+                          }
+                          """,
+                          """
+                          public class Other {
+                              Complex.Nested n;
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .files(tb.findJavaFiles(src))
+            .outdir(classes)
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          public class Complex {
+                              public class Nested {}
+                              private void t() {
+                                  Other o;
+                              }
+                          }
+                          """);
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-XDdev")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll();
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics", "-Xlint:-classfile", "-Werror")
+            .classpath(classes)
+            .files(src.resolve("Complex.java"))
+            .outdir(classes)
+            .run()
+            .writeAll();
+    }
+
+}

From 48bbc950f11113a57ea03f877bc3e526982c0eef Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 7 Nov 2025 09:17:21 +0000
Subject: [PATCH 077/512] 8371388: [BACKOUT] JDK-8365047: Remove exception
 handler stub code in C2

Reviewed-by: chagedorn, epeter
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  37 +++-
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |  12 +-
 .../cpu/aarch64/c1_LIRAssembler_aarch64.hpp   |   2 +-
 .../cpu/aarch64/nativeInst_aarch64.cpp        |   6 +
 .../cpu/aarch64/nativeInst_aarch64.hpp        |  22 +--
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp   |   2 +
 src/hotspot/cpu/arm/arm.ad                    |  49 ++++--
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |  10 +-
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp   |   2 +-
 src/hotspot/cpu/arm/runtime_arm.cpp           |   2 +
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |   7 +-
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp   |   2 +-
 src/hotspot/cpu/ppc/ppc.ad                    |  35 ++--
 src/hotspot/cpu/ppc/runtime_ppc.cpp           |   1 +
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  19 ++-
 .../cpu/riscv/c1_LIRAssembler_riscv.cpp       |  12 +-
 .../cpu/riscv/c1_LIRAssembler_riscv.hpp       |   2 +-
 src/hotspot/cpu/riscv/riscv.ad                |  37 +++-
 src/hotspot/cpu/riscv/runtime_riscv.cpp       |   2 +
 src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp |  15 +-
 src/hotspot/cpu/s390/runtime_s390.cpp         |   2 +
 src/hotspot/cpu/s390/s390.ad                  |  54 ++++--
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |   6 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |  14 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp   |   2 +-
 src/hotspot/cpu/x86/runtime_x86_64.cpp        |   2 +
 src/hotspot/cpu/x86/x86.ad                    |  51 ++++--
 src/hotspot/os/posix/signals_posix.cpp        |   2 +-
 src/hotspot/os/windows/os_windows.cpp         |   2 +-
 src/hotspot/share/ci/ciEnv.cpp                |   4 +-
 src/hotspot/share/code/nmethod.cpp            |  23 +--
 src/hotspot/share/code/nmethod.hpp            |   4 +-
 src/hotspot/share/code/nmethod.inline.hpp     |   2 +-
 src/hotspot/share/opto/output.cpp             |   6 +-
 src/hotspot/share/runtime/deoptimization.cpp  |   3 -
 src/hotspot/share/runtime/frame.cpp           |   4 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   8 -
 src/hotspot/share/runtime/vmStructs.cpp       |   2 +-
 .../classes/sun/jvm/hotspot/code/NMethod.java |  28 +--
 .../sun/jvm/hotspot/runtime/Frame.java        |   2 +-
 .../jtreg/runtime/vthread/Deoptimization.java | 159 ------------------
 41 files changed, 302 insertions(+), 354 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/vthread/Deoptimization.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 44d7bf1e0fa..e8f9733fe7e 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1,7 +1,6 @@
 //
 // Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2014, 2024, Red Hat, Inc. All rights reserved.
-// Copyright 2025 Arm Limited and/or its affiliates.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -1195,10 +1194,15 @@ class HandlerImpl {
 
  public:
 
+  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
+  static uint size_exception_handler() {
+    return MacroAssembler::far_codestub_branch_size();
+  }
+
   static uint size_deopt_handler() {
-    // count one branch instruction and one far call instruction sequence
+    // count one adr and one far branch instruction
     return NativeInstruction::instruction_size + MacroAssembler::far_codestub_branch_size();
   }
 };
@@ -2257,6 +2261,25 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 
 //=============================================================================
 
+// Emit exception handler code.
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
+{
+  // mov rscratch1 #exception_blob_entry_point
+  // br rscratch1
+  // Note that the code buffer's insts_mark is always relative to insts.
+  // That's why we must use the macroassembler to generate a handler.
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == nullptr) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+  int offset = __ offset();
+  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
+  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
+  __ end_a_stub();
+  return offset;
+}
+
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
@@ -2267,18 +2290,14 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
     ciEnv::current()->record_failure("CodeCache is full");
     return 0;  // CodeBuffer::expand failed
   }
-
   int offset = __ offset();
-  Label start;
-  __ bind(start);
-  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
 
-  int entry_offset = __ offset();
-  __ b(start);
+  __ adr(lr, __ pc());
+  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
 
   assert(__ offset() - offset == (int) size_deopt_handler(), "overflow");
   __ end_a_stub();
-  return entry_offset;
+  return offset;
 }
 
 // REQUIRED MATCHER CODE
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 2498a646e31..9ab463125fe 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -449,18 +449,12 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  Label start;
-  __ bind(start);
-
-  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
-
-  int entry_offset = __ offset();
-  __ b(start);
-
+  __ adr(lr, pc());
+  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 void LIR_Assembler::add_debug_info_for_branch(address adr, CodeEmitInfo* info) {
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 729cd2827b7..12b941fc4f7 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -71,7 +71,7 @@ friend class ArrayCopyStub;
     //            CompiledDirectCall::to_trampoline_stub_size()
     _call_stub_size = 13 * NativeInstruction::instruction_size,
     _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
-    _deopt_handler_size = 4 * NativeInstruction::instruction_size
+    _deopt_handler_size = 7 * NativeInstruction::instruction_size
   };
 
 public:
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
index f2003dd9b55..5a7fececafa 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -394,6 +394,12 @@ void NativePostCallNop::make_deopt() {
   NativeDeoptInstruction::insert(addr_at(0));
 }
 
+#ifdef ASSERT
+static bool is_movk_to_zr(uint32_t insn) {
+  return ((insn & 0xffe0001f) == 0xf280001f);
+}
+#endif
+
 bool NativePostCallNop::patch(int32_t oopmap_slot, int32_t cb_offset) {
   if (((oopmap_slot & 0xff) != oopmap_slot) || ((cb_offset & 0xffffff) != cb_offset)) {
     return false; // cannot encode
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index b7444347bf1..df5d97c2376 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -526,24 +526,14 @@ inline NativeLdSt* NativeLdSt_at(address addr) {
 // can store an offset from the initial nop to the nmethod.
 
 class NativePostCallNop: public NativeInstruction {
-private:
-  static bool is_movk_to_zr(uint32_t insn) {
-    return ((insn & 0xffe0001f) == 0xf280001f);
-  }
-
 public:
   bool check() const {
-    // Check the first instruction is NOP.
-    if (is_nop()) {
-      uint32_t insn = *(uint32_t*)addr_at(4);
-      // Check next instruction is MOVK zr, xx.
-      // These instructions only ever appear together in a post-call
-      // NOP, so it's unnecessary to check that the third instruction is
-      // a MOVK as well.
-      return is_movk_to_zr(insn);
-    }
-
-    return false;
+    uint64_t insns = *(uint64_t*)addr_at(0);
+    // Check for two instructions: nop; movk zr, xx
+    // These instructions only ever appear together in a post-call
+    // NOP, so it's unnecessary to check that the third instruction is
+    // a MOVK as well.
+    return (insns & 0xffe0001fffffffff) == 0xf280001fd503201f;
   }
 
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const {
diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index e36aa21b567..d45f9865bd2 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -260,6 +260,8 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in aarch64.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index eb9b0ed8fba..31a442be624 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -105,8 +105,14 @@ class HandlerImpl {
 
  public:
 
+  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
+  static uint size_exception_handler() {
+    return ( 3 * 4 );
+  }
+
+
   static uint size_deopt_handler() {
     return ( 9 * 4 );
   }
@@ -870,6 +876,26 @@ uint MachUEPNode::size(PhaseRegAlloc *ra_) const {
 
 //=============================================================================
 
+// Emit exception handler code.
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == nullptr) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+
+  int offset = __ offset();
+
+  // OK to trash LR, because exception blob will kill it
+  __ jump(OptoRuntime::exception_blob()->entry_point(), relocInfo::runtime_call_type, LR_tmp);
+
+  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
+
+  __ end_a_stub();
+
+  return offset;
+}
+
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   // Can't use any of the current frame's registers as we may have deopted
   // at a poll and everything can be live.
@@ -880,26 +906,19 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
 
   int offset = __ offset();
-
-  Label start;
-  __ bind(start);
-
-  __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
-
-  int entry_offset = __ offset();
   address deopt_pc = __ pc();
-  // Preserve R0 and reserve space for the address of the entry point
-  __ push(RegisterSet(R0) | RegisterSet(R1));
-  // Store the entry point address
-  __ mov_relative_address(R0, deopt_pc);
-  __ str(R0, Address(SP, wordSize));
-  __ pop(R0); // restore R0
-  __ b(start);
+
+  __ sub(SP, SP, wordSize); // make room for saved PC
+  __ push(LR); // save LR that may be live when we get here
+  __ mov_relative_address(LR, deopt_pc);
+  __ str(LR, Address(SP, wordSize)); // save deopt PC
+  __ pop(LR); // restore LR
+  __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
 
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
 
   __ end_a_stub();
-  return entry_offset;
+  return offset;
 }
 
 bool Matcher::match_rule_supported(int opcode) {
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index 1d7c1579502..219c49d1f14 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -272,20 +272,14 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  Label start;
-  __ bind(start);
-
-  __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
-
-  int entry_offset = __ offset();
   __ mov_relative_address(LR, __ pc());
   __ push(LR); // stub expects LR to be saved
-  __ b(start);
+  __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
 
   assert(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
index 615d2f188ff..77d13532685 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
@@ -54,7 +54,7 @@
   enum {
     _call_stub_size = 16,
     _exception_handler_size = PRODUCT_ONLY(68) NOT_PRODUCT(68+60),
-    _deopt_handler_size = 20
+    _deopt_handler_size = 16
   };
 
  public:
diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index 29fd0aa0a10..8d48de5795a 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -182,6 +182,8 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------ generate_exception_blob ---------------------------
 // creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in sparc.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 7898500cff2..108da2039f6 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -264,17 +264,12 @@ int LIR_Assembler::emit_deopt_handler() {
   }
 
   int offset = code_offset();
-  Label start;
-
-  __ bind(start);
   __ bl64_patchable(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type);
-  int entry_offset = __ offset();
-  __ b(start);
 
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
index 6a2f6264850..e4de2eb5c46 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
@@ -63,7 +63,7 @@ enum {
   _static_call_stub_size = 4 * BytesPerInstWord + MacroAssembler::b64_patchable_size, // or smaller
   _call_stub_size = _static_call_stub_size + MacroAssembler::trampoline_stub_size, // or smaller
   _exception_handler_size = MacroAssembler::b64_patchable_size, // or smaller
-  _deopt_handler_size = MacroAssembler::bl64_patchable_size + BytesPerInstWord
+  _deopt_handler_size = MacroAssembler::bl64_patchable_size
 };
 
   // '_static_call_stub_size' is only used on ppc (see LIR_Assembler::emit_static_call_stub()
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 5c44fc19704..36326e5fdb7 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2088,11 +2088,17 @@ class HandlerImpl {
 
  public:
 
+  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
+  static uint size_exception_handler() {
+    // The exception_handler is a b64_patchable.
+    return MacroAssembler::b64_patchable_size;
+  }
+
   static uint size_deopt_handler() {
     // The deopt_handler is a bl64_patchable.
-    return MacroAssembler::bl64_patchable_size + BytesPerInstWord;
+    return MacroAssembler::bl64_patchable_size;
   }
 
 };
@@ -2108,6 +2114,22 @@ public:
 
 source %{
 
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == nullptr) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+
+  int offset = __ offset();
+  __ b64_patchable((address)OptoRuntime::exception_blob()->content_begin(),
+                       relocInfo::runtime_call_type);
+  assert(__ offset() - offset == (int)size_exception_handler(), "must be fixed size");
+  __ end_a_stub();
+
+  return offset;
+}
+
 // The deopt_handler is like the exception handler, but it calls to
 // the deoptimization blob instead of jumping to the exception blob.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
@@ -2118,21 +2140,12 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
 
   int offset = __ offset();
-
-  Label start;
-  __ bind(start);
-
   __ bl64_patchable((address)SharedRuntime::deopt_blob()->unpack(),
                         relocInfo::runtime_call_type);
-
-  int entry_offset = __ offset();
-
-  __ b(start);
-
   assert(__ offset() - offset == (int) size_deopt_handler(), "must be fixed size");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 //=============================================================================
diff --git a/src/hotspot/cpu/ppc/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp
index ab658e9de58..2654075f702 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -46,6 +46,7 @@
 
 //------------------------------generate_exception_blob---------------------------
 // Creates exception blob at the end.
+// Using exception blob, this code is jumped from a compiled method.
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 4e427ace404..db45a2fa4c8 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -83,6 +83,7 @@ class RegisterSaver {
   static OopMap* push_frame_reg_args_and_save_live_registers(MacroAssembler* masm,
                          int* out_frame_size_in_bytes,
                          bool generate_oop_map,
+                         int return_pc_adjustment,
                          ReturnPCLocation return_pc_location,
                          bool save_vectors = false);
   static void    restore_live_registers_and_pop_frame(MacroAssembler* masm,
@@ -261,6 +262,7 @@ static const RegisterSaver::LiveRegType RegisterSaver_LiveVecRegs[] = {
 OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssembler* masm,
                          int* out_frame_size_in_bytes,
                          bool generate_oop_map,
+                         int return_pc_adjustment,
                          ReturnPCLocation return_pc_location,
                          bool save_vectors) {
   // Push an abi_reg_args-frame and store all registers which may be live.
@@ -269,6 +271,7 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
   // propagated to the RegisterMap of the caller frame during
   // StackFrameStream construction (needed for deoptimization; see
   // compiledVFrame::create_stack_value).
+  // If return_pc_adjustment != 0 adjust the return pc by return_pc_adjustment.
   // Updated return pc is returned in R31 (if not return_pc_is_pre_saved).
 
   // calculate frame size
@@ -302,11 +305,14 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
   // Do the save_LR by hand and adjust the return pc if requested.
   switch (return_pc_location) {
     case return_pc_is_lr: __ mflr(R31); break;
-    case return_pc_is_pre_saved: break;
+    case return_pc_is_pre_saved: assert(return_pc_adjustment == 0, "unsupported"); break;
     case return_pc_is_thread_saved_exception_pc: __ ld(R31, thread_(saved_exception_pc)); break;
     default: ShouldNotReachHere();
   }
   if (return_pc_location != return_pc_is_pre_saved) {
+    if (return_pc_adjustment != 0) {
+      __ addi(R31, R31, return_pc_adjustment);
+    }
     __ std(R31, frame_size_in_bytes + _abi0(lr), R1_SP);
   }
 
@@ -2901,15 +2907,22 @@ void SharedRuntime::generate_deopt_blob() {
   //  deopt_handler:      call_deopt_stub
   //  cur. return pc  --> ...
   //
+  // So currently SR_LR points behind the call in the deopt handler.
+  // We adjust it such that it points to the start of the deopt handler.
   // The return_pc has been stored in the frame of the deoptee and
   // will replace the address of the deopt_handler in the call
   // to Deoptimization::fetch_unroll_info below.
+  // We can't grab a free register here, because all registers may
+  // contain live values, so let the RegisterSaver do the adjustment
+  // of the return pc.
+  const int return_pc_adjustment_no_exception = -MacroAssembler::bl64_patchable_size;
 
   // Push the "unpack frame"
   // Save everything in sight.
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &first_frame_size_in_bytes,
                                                                    /*generate_oop_map=*/ true,
+                                                                   return_pc_adjustment_no_exception,
                                                                    RegisterSaver::return_pc_is_lr);
   assert(map != nullptr, "OopMap must have been created");
 
@@ -2944,6 +2957,7 @@ void SharedRuntime::generate_deopt_blob() {
   RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                              &first_frame_size_in_bytes,
                                                              /*generate_oop_map=*/ false,
+                                                             /*return_pc_adjustment_exception=*/ 0,
                                                              RegisterSaver::return_pc_is_pre_saved);
 
   // Deopt during an exception. Save exec mode for unpack_frames.
@@ -2961,6 +2975,7 @@ void SharedRuntime::generate_deopt_blob() {
   RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                              &first_frame_size_in_bytes,
                                                              /*generate_oop_map=*/ false,
+                                                             /*return_pc_adjustment_reexecute=*/ 0,
                                                              RegisterSaver::return_pc_is_pre_saved);
   __ li(exec_mode_reg, Deoptimization::Unpack_reexecute);
 #endif
@@ -3251,6 +3266,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(StubId id, address call_ptr)
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &frame_size_in_bytes,
                                                                    /*generate_oop_map=*/ true,
+                                                                   /*return_pc_adjustment=*/0,
                                                                    return_pc_location, save_vectors);
 
   // The following is basically a call_VM. However, we need the precise
@@ -3351,6 +3367,7 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(StubId id, address destination
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &frame_size_in_bytes,
                                                                    /*generate_oop_map*/ true,
+                                                                   /*return_pc_adjustment*/ 0,
                                                                    RegisterSaver::return_pc_is_lr);
 
   // Use noreg as last_Java_pc, the return pc will be reconstructed
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index b085dd7ac00..9d8ae770ccf 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -377,18 +377,12 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  Label start;
-  __ bind(start);
-
-  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
-
-  int entry_offset = __ offset();
-  __ j(start);
-
+  __ auipc(ra, 0);
+  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index ed2ab0c4861..e4efb2c171d 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -72,7 +72,7 @@ private:
     // See emit_exception_handler for detail
     _exception_handler_size = DEBUG_ONLY(256) NOT_DEBUG(32), // or smaller
     // See emit_deopt_handler for detail
-    // far_call (2) + j (1)
+    // auipc (1) + far_jump (2)
     _deopt_handler_size = 1 * MacroAssembler::instruction_size +
                           2 * MacroAssembler::instruction_size
   };
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index e23adcf2488..7acbb5a478b 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1049,10 +1049,15 @@ class HandlerImpl {
 
  public:
 
+  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
+  static uint size_exception_handler() {
+    return MacroAssembler::far_branch_size();
+  }
+
   static uint size_deopt_handler() {
-    // count far call + j
+    // count auipc + far branch
     return NativeInstruction::instruction_size + MacroAssembler::far_branch_size();
   }
 };
@@ -1833,6 +1838,25 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 
 //=============================================================================
 
+// Emit exception handler code.
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
+{
+  // auipc t1, #exception_blob_entry_point
+  // jr (offset)t1
+  // Note that the code buffer's insts_mark is always relative to insts.
+  // That's why we must use the macroassembler to generate a handler.
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == nullptr) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+  int offset = __ offset();
+  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
+  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
+  __ end_a_stub();
+  return offset;
+}
+
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
@@ -1843,17 +1867,12 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
   }
   int offset = __ offset();
 
-  Label start;
-  __ bind(start);
-
-  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
-
-  int entry_offset = __ offset();
-  __ j(start);
+  __ auipc(ra, 0);
+  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
 
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
   __ end_a_stub();
-  return entry_offset;
+  return offset;
 
 }
 // REQUIRED MATCHER CODE
diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
index c52d5a31066..e1add8dbb82 100644
--- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -249,6 +249,8 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in riscv.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index ee6df63d21b..298234156c3 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -272,25 +272,14 @@ int LIR_Assembler::emit_deopt_handler() {
     // Not enough space left for the handler.
     bailout("deopt handler overflow");
     return -1;
-  }
-
-  int offset = code_offset();
-
-  Label start;
-  __ bind(start);
-
+  }  int offset = code_offset();
   // Size must be constant (see HandlerImpl::emit_deopt_handler).
   __ load_const(Z_R1_scratch, SharedRuntime::deopt_blob()->unpack());
   __ call(Z_R1_scratch);
-
-  int entry_offset = __ offset();
-
-  __ z_bru(start);
-
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 void LIR_Assembler::jobject2reg(jobject o, Register reg) {
diff --git a/src/hotspot/cpu/s390/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp
index 658fba069b4..314c407af91 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -43,6 +43,8 @@
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in s390.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 2f12aa4c03c..2b2ce713491 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1649,10 +1649,15 @@ source_hpp %{ // Header information of the source block.
 class HandlerImpl {
  public:
 
+  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
+  static uint size_exception_handler() {
+    return NativeJump::max_instruction_size();
+  }
+
   static uint size_deopt_handler() {
-    return NativeCall::max_instruction_size() + MacroAssembler::jump_pcrelative_size();
+    return NativeCall::max_instruction_size();
   }
 };
 
@@ -1667,6 +1672,43 @@ public:
 
 source %{
 
+// This exception handler code snippet is placed after the method's
+// code. It is the return point if an exception occurred. it jumps to
+// the exception blob.
+//
+// If the method gets deoptimized, the method and this code snippet
+// get patched.
+//
+// 1) Trampoline code gets patched into the end of this exception
+//   handler. the trampoline code jumps to the deoptimization blob.
+//
+// 2) The return address in the method's code will get patched such
+//   that it jumps to the trampoline.
+//
+// 3) The handler will get patched such that it does not jump to the
+//   exception blob, but to an entry in the deoptimization blob being
+//   aware of the exception.
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
+  Register temp_reg = Z_R1;
+
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == nullptr) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;          // CodeBuffer::expand failed
+  }
+
+  int offset = __ offset();
+  // Use unconditional pc-relative jump with 32-bit range here.
+  __ load_const_optimized(temp_reg, (address)OptoRuntime::exception_blob()->content_begin());
+  __ z_br(temp_reg);
+
+  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
+
+  __ end_a_stub();
+
+  return offset;
+}
+
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   address        base = __ start_a_stub(size_deopt_handler());
@@ -1678,22 +1720,14 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
   int offset = __ offset();
 
-  Label start;
-  __ bind(start);
-
   // Size_deopt_handler() must be exact on zarch, so for simplicity
   // we do not use load_const_opt here.
   __ load_const(Z_R1, SharedRuntime::deopt_blob()->unpack());
   __ call(Z_R1);
-
-  int entry_offset = __ offset();
-
-  __ z_bru(start);
-
   assert(__ offset() - offset == (int) size_deopt_handler(), "must be fixed size");
 
   __ end_a_stub();
-  return entry_offset;
+  return offset;
 }
 
 //=============================================================================
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 5b6f7dcd984..a3605f649cc 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2544,10 +2544,14 @@ void SharedRuntime::generate_deopt_blob() {
   // Normal entry (non-exception case)
   //
   // We have been called from the deopt handler of the deoptee.
-  // Z_R14 points to the entry point of the deopt handler.
+  // Z_R14 points behind the call in the deopt handler. We adjust
+  // it such that it points to the start of the deopt handler.
   // The return_pc has been stored in the frame of the deoptee and
   // will replace the address of the deopt_handler in the call
   // to Deoptimization::fetch_unroll_info below.
+  // The (int) cast is necessary, because -((unsigned int)14)
+  // is an unsigned int.
+  __ add2reg(Z_R14, -(int)NativeCall::max_instruction_size());
 
   const Register   exec_mode_reg = Z_tmp_1;
 
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index 6600d841050..edeb0baea0e 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -450,20 +450,14 @@ int LIR_Assembler::emit_deopt_handler() {
   }
 
   int offset = code_offset();
+  InternalAddress here(__ pc());
 
-  Label start;
-  __ bind(start);
-
-  __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
-
-  int entry_offset = __ offset();
-
-  __ jmp(start);
-
+  __ pushptr(here.addr(), rscratch1);
+  __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
   __ end_a_stub();
 
-  return entry_offset;
+  return offset;
 }
 
 void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
index 7a8fbc75ba7..8524dc90276 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
@@ -48,7 +48,7 @@
   enum {
     _call_stub_size = 28,
     _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
-    _deopt_handler_size = 10
+    _deopt_handler_size = 17
   };
 
 public:
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index 5bf65299a0c..7b98cf4fad7 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -242,6 +242,8 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in x86_64.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 783ed038858..9a0bbdc27a0 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -2767,11 +2767,21 @@ class HandlerImpl {
 
  public:
 
+  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
+  static uint size_exception_handler() {
+    // NativeCall instruction size is the same as NativeJump.
+    // exception handler starts out as jump and can be patched to
+    // a call be deoptimization.  (4932387)
+    // Note that this value is also credited (in output.cpp) to
+    // the size of the code section.
+    return NativeJump::instruction_size;
+  }
+
   static uint size_deopt_handler() {
-    // one call and one jmp.
-    return 10;
+    // three 5 byte instructions plus one move for unreachable address.
+    return 15+3;
   }
 };
 
@@ -2863,6 +2873,24 @@ int MachNode::compute_padding(int current_offset) const {
   }
 }
 
+// Emit exception handler code.
+// Stuff framesize into a register and call a VM stub routine.
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
+
+  // Note that the code buffer's insts_mark is always relative to insts.
+  // That's why we must use the macroassembler to generate a handler.
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == nullptr) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+  int offset = __ offset();
+  __ jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
+  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
+  __ end_a_stub();
+  return offset;
+}
+
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
@@ -2875,18 +2903,21 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
   int offset = __ offset();
 
-  Label start;
-  __ bind(start);
+  address the_pc = (address) __ pc();
+  Label next;
+  // push a "the_pc" on the stack without destroying any registers
+  // as they all may be live.
 
-  __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
-
-  int entry_offset = __ offset();
-
-  __ jmp(start);
+  // push address of "next"
+  __ call(next, relocInfo::none); // reloc none is fine since it is a disp32
+  __ bind(next);
+  // adjust it so it matches "the_pc"
+  __ subptr(Address(rsp, 0), __ offset() - offset);
 
+  __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow %d", (__ offset() - offset));
   __ end_a_stub();
-  return entry_offset;
+  return offset;
 }
 
 static Assembler::Width widthForType(BasicType bt) {
diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 625eb63445a..5833e324070 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -621,7 +621,7 @@ int JVM_HANDLE_XXX_SIGNAL(int sig, siginfo_t* info,
       if (cb != nullptr && cb->is_nmethod()) {
         nmethod* nm = cb->as_nmethod();
         assert(nm->insts_contains_inclusive(pc), "");
-        address deopt = nm->deopt_handler_entry();
+        address deopt = nm->deopt_handler_begin();
         assert(deopt != nullptr, "");
 
         frame fr = os::fetch_frame_from_context(uc);
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 4b84e2fdfdb..ce2baeaf46c 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2795,7 +2795,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
         if (cb != nullptr && cb->is_nmethod()) {
           nmethod* nm = cb->as_nmethod();
           frame fr = os::fetch_frame_from_context((void*)exceptionInfo->ContextRecord);
-          address deopt = nm->deopt_handler_entry();
+          address deopt = nm->deopt_handler_begin();
           assert(nm->insts_contains_inclusive(pc), "");
           nm->set_original_pc(&fr, pc);
           // Set pc to handler
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 92bacc4c2c3..79ab881e7f6 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1057,9 +1057,7 @@ void ciEnv::register_method(ciMethod* target,
     }
 
     assert(offsets->value(CodeOffsets::Deopt) != -1, "must have deopt entry");
-
-    assert(compiler->type() == compiler_c2 ||
-           offsets->value(CodeOffsets::Exceptions) != -1, "must have exception entry");
+    assert(offsets->value(CodeOffsets::Exceptions) != -1, "must have exception entry");
 
     nm =  nmethod::new_nmethod(method,
                                compile_id(),
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index c2f8b46f00e..d91af9b4991 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1302,7 +1302,7 @@ nmethod::nmethod(
     }
     // Native wrappers do not have deopt handlers. Make the values
     // something that will never match a pc like the nmethod vtable entry
-    _deopt_handler_entry_offset    = 0;
+    _deopt_handler_offset    = 0;
     _unwind_handler_offset   = 0;
 
     CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
@@ -1442,7 +1442,7 @@ nmethod::nmethod(const nmethod &nm) : CodeBlob(nm._name, nm._kind, nm._size, nm.
   _skipped_instructions_size    = nm._skipped_instructions_size;
   _stub_offset                  = nm._stub_offset;
   _exception_offset             = nm._exception_offset;
-  _deopt_handler_entry_offset   = nm._deopt_handler_entry_offset;
+  _deopt_handler_offset         = nm._deopt_handler_offset;
   _unwind_handler_offset        = nm._unwind_handler_offset;
   _num_stack_arg_slots          = nm._num_stack_arg_slots;
   _oops_size                    = nm._oops_size;
@@ -1704,26 +1704,19 @@ nmethod::nmethod(
         _exception_offset        = -1;
       }
       if (offsets->value(CodeOffsets::Deopt) != -1) {
-        _deopt_handler_entry_offset    = code_offset() + offsets->value(CodeOffsets::Deopt);
+        _deopt_handler_offset    = code_offset() + offsets->value(CodeOffsets::Deopt);
       } else {
-        _deopt_handler_entry_offset    = -1;
+        _deopt_handler_offset    = -1;
       }
     } else
 #endif
     {
       // Exception handler and deopt handler are in the stub section
+      assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set");
       assert(offsets->value(CodeOffsets::Deopt     ) != -1, "must be set");
 
-      bool has_exception_handler = (offsets->value(CodeOffsets::Exceptions) != -1);
-      assert(has_exception_handler == (compiler->type() != compiler_c2),
-             "C2 compiler doesn't provide exception handler stub code.");
-      if (has_exception_handler) {
-        _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions);
-      } else {
-        _exception_offset = -1;
-      }
-
-      _deopt_handler_entry_offset = _stub_offset + offsets->value(CodeOffsets::Deopt);
+      _exception_offset          = _stub_offset + offsets->value(CodeOffsets::Exceptions);
+      _deopt_handler_offset      = _stub_offset + offsets->value(CodeOffsets::Deopt);
     }
     if (offsets->value(CodeOffsets::UnwindHandler) != -1) {
       // C1 generates UnwindHandler at the end of instructions section.
@@ -4031,7 +4024,7 @@ const char* nmethod::nmethod_section_label(address pos) const {
   // Check stub_code before checking exception_handler or deopt_handler.
   if (pos == this->stub_begin())                                        label = "[Stub Code]";
   if (JVMCI_ONLY(_exception_offset >= 0 &&) pos == exception_begin())          label = "[Exception Handler]";
-  if (JVMCI_ONLY(_deopt_handler_entry_offset != -1 &&) pos == deopt_handler_entry()) label = "[Deopt Handler Entry Point]";
+  if (JVMCI_ONLY(_deopt_handler_offset != -1 &&) pos == deopt_handler_begin()) label = "[Deopt Handler Code]";
   return label;
 }
 
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 0fa9d7fda9e..34accf428b6 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -229,7 +229,7 @@ class nmethod : public CodeBlob {
   int _exception_offset;
   // All deoptee's will resume execution at this location described by
   // this offset.
-  int _deopt_handler_entry_offset;
+  int _deopt_handler_offset;
   // Offset (from insts_end) of the unwind handler if it exists
   int16_t  _unwind_handler_offset;
   // Number of arguments passed on the stack
@@ -617,7 +617,7 @@ public:
   address stub_begin            () const { return           header_begin() + _stub_offset             ; }
   address stub_end              () const { return           code_end()     ; }
   address exception_begin       () const { return           header_begin() + _exception_offset        ; }
-  address deopt_handler_entry   () const { return           header_begin() + _deopt_handler_entry_offset    ; }
+  address deopt_handler_begin   () const { return           header_begin() + _deopt_handler_offset    ; }
   address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (insts_end() - _unwind_handler_offset) : nullptr; }
   oop*    oops_begin            () const { return (oop*)    data_begin(); }
   oop*    oops_end              () const { return (oop*)    data_end(); }
diff --git a/src/hotspot/share/code/nmethod.inline.hpp b/src/hotspot/share/code/nmethod.inline.hpp
index ecee3c0c31a..44331db669c 100644
--- a/src/hotspot/share/code/nmethod.inline.hpp
+++ b/src/hotspot/share/code/nmethod.inline.hpp
@@ -34,7 +34,7 @@
 inline bool nmethod::is_deopt_pc(address pc) { return is_deopt_entry(pc); }
 
 inline bool nmethod::is_deopt_entry(address pc) {
-  return pc == deopt_handler_entry();
+  return pc == deopt_handler_begin();
 }
 
 // class ExceptionCache methods
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 136fc8ac864..84c01c68e38 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1347,18 +1347,20 @@ CodeBuffer* PhaseOutput::init_buffer() {
 
   // nmethod and CodeBuffer count stubs & constants as part of method's code.
   // class HandlerImpl is platform-specific and defined in the *.ad files.
+  int exception_handler_req = HandlerImpl::size_exception_handler() + MAX_stubs_size; // add marginal slop for handler
   int deopt_handler_req     = HandlerImpl::size_deopt_handler()     + MAX_stubs_size; // add marginal slop for handler
   stub_req += MAX_stubs_size;   // ensure per-stub margin
   code_req += MAX_inst_size;    // ensure per-instruction margin
 
   if (StressCodeBuffers)
-    code_req = const_req = stub_req = deopt_handler_req = 0x10;  // force expansion
+    code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
 
   int total_req =
           const_req +
           code_req +
           pad_req +
           stub_req +
+          exception_handler_req +
           deopt_handler_req;               // deopt handler
 
   CodeBuffer* cb = code_buffer();
@@ -1787,6 +1789,8 @@ void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) {
   // Only java methods have exception handlers and deopt handlers
   // class HandlerImpl is platform-specific and defined in the *.ad files.
   if (C->method()) {
+    // Emit the exception handler code.
+    _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(masm));
     if (C->failing()) {
       return; // CodeBuffer::expand failed
     }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index e2029a26d37..0aa7b392b17 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -498,9 +498,6 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
                         RegisterMap::WalkContinuation::skip);
   // Now get the deoptee with a valid map
   frame deoptee = stub_frame.sender(&map);
-  if (exec_mode == Unpack_deopt) {
-    assert(deoptee.is_deoptimized_frame(), "frame is not marked for deoptimization");
-  }
   // Set the deoptee nmethod
   assert(current->deopt_compiled_method() == nullptr, "Pending deopt!");
   nmethod* nm = deoptee.cb()->as_nmethod_or_null();
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 8f969600ba8..b5cd4acc75d 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -206,7 +206,7 @@ address frame::raw_pc() const {
   if (is_deoptimized_frame()) {
     nmethod* nm = cb()->as_nmethod_or_null();
     assert(nm != nullptr, "only nmethod is expected here");
-    return nm->deopt_handler_entry() - pc_return_offset;
+    return nm->deopt_handler_begin() - pc_return_offset;
   } else {
     return (pc() - pc_return_offset);
   }
@@ -355,7 +355,7 @@ void frame::deoptimize(JavaThread* thread) {
 
   // If the call site is a MethodHandle call site use the MH deopt handler.
   nmethod* nm = _cb->as_nmethod();
-  address deopt = nm->deopt_handler_entry();
+  address deopt = nm->deopt_handler_begin();
 
   NativePostCallNop* inst = nativePostCallNop_at(pc());
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index afa4558c7ae..8ede4d1082a 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -87,9 +87,6 @@
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
 #if INCLUDE_JFR
 #include "jfr/jfr.inline.hpp"
 #endif
@@ -604,11 +601,6 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
       // The deferred StackWatermarkSet::after_unwind check will be performed in
       // * OptoRuntime::handle_exception_C_helper for C2 code
       // * exception_handler_for_pc_helper via Runtime1::handle_exception_from_callee_id for C1 code
-#ifdef COMPILER2
-      if (nm->compiler_type() == compiler_c2) {
-        return OptoRuntime::exception_blob()->entry_point();
-      }
-#endif // COMPILER2
       return nm->exception_begin();
     }
   }
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 2ce6a6cac76..a7342448522 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -535,7 +535,7 @@
   nonstatic_field(nmethod,                     _osr_link,                                     nmethod*)                              \
   nonstatic_field(nmethod,                     _state,                                        volatile signed char)                  \
   nonstatic_field(nmethod,                     _exception_offset,                             int)                                   \
-  nonstatic_field(nmethod,                     _deopt_handler_entry_offset,                   int)                                   \
+  nonstatic_field(nmethod,                     _deopt_handler_offset,                         int)                                   \
   nonstatic_field(nmethod,                     _orig_pc_offset,                               int)                                   \
   nonstatic_field(nmethod,                     _stub_offset,                                  int)                                   \
   nonstatic_field(nmethod,                     _immutable_data_ref_count_offset,              int)                                   \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index f935c56b536..91302dba0f6 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -48,7 +48,7 @@ public class NMethod extends CodeBlob {
 
   /** Offsets for different nmethod parts */
   private static CIntegerField exceptionOffsetField;
-  private static CIntegerField deoptHandlerEntryOffsetField;
+  private static CIntegerField deoptHandlerOffsetField;
   private static CIntegerField origPCOffsetField;
   private static CIntegerField stubOffsetField;
   private static CIntField     handlerTableOffsetField;
@@ -86,7 +86,7 @@ public class NMethod extends CodeBlob {
     immutableDataField                 = type.getAddressField("_immutable_data");
     immutableDataSizeField             = type.getCIntegerField("_immutable_data_size");
     exceptionOffsetField               = type.getCIntegerField("_exception_offset");
-    deoptHandlerEntryOffsetField       = type.getCIntegerField("_deopt_handler_entry_offset");
+    deoptHandlerOffsetField            = type.getCIntegerField("_deopt_handler_offset");
     origPCOffsetField                  = type.getCIntegerField("_orig_pc_offset");
     stubOffsetField                    = type.getCIntegerField("_stub_offset");
     scopesPCsOffsetField               = type.getCIntegerField("_scopes_pcs_offset");
@@ -121,16 +121,16 @@ public class NMethod extends CodeBlob {
   public boolean isOSRMethod()    { return getEntryBCI() != VM.getVM().getInvocationEntryBCI(); }
 
   /** Boundaries for different parts */
-  public Address constantsBegin()             { return contentBegin();                                          }
-  public Address constantsEnd()               { return codeBegin();                                             }
-  public Address instsBegin()                 { return codeBegin();                                             }
-  public Address instsEnd()                   { return headerBegin().addOffsetTo(getStubOffset());              }
-  public Address exceptionBegin()             { return headerBegin().addOffsetTo(getExceptionOffset());         }
-  public Address deoptHandlerEntry()          { return headerBegin().addOffsetTo(getDeoptHandlerEntryOffset()); }
-  public Address stubBegin()                  { return headerBegin().addOffsetTo(getStubOffset());              }
-  public Address stubEnd()                    { return dataBegin();                                             }
-  public Address oopsBegin()                  { return dataBegin();                                             }
-  public Address oopsEnd()                    { return dataEnd();                                               }
+  public Address constantsBegin()             { return contentBegin();                                     }
+  public Address constantsEnd()               { return codeBegin();                                        }
+  public Address instsBegin()                 { return codeBegin();                                        }
+  public Address instsEnd()                   { return headerBegin().addOffsetTo(getStubOffset());         }
+  public Address exceptionBegin()             { return headerBegin().addOffsetTo(getExceptionOffset());    }
+  public Address deoptHandlerBegin()          { return headerBegin().addOffsetTo(getDeoptHandlerOffset()); }
+  public Address stubBegin()                  { return headerBegin().addOffsetTo(getStubOffset());         }
+  public Address stubEnd()                    { return dataBegin();                                        }
+  public Address oopsBegin()                  { return dataBegin();                                        }
+  public Address oopsEnd()                    { return dataEnd();                                          }
 
   public Address immutableDataBegin()         { return immutableDataField.getValue(addr);                         }
   public Address immutableDataEnd()           { return immutableDataBegin().addOffsetTo(getImmutableDataSize());  }
@@ -262,7 +262,7 @@ public class NMethod extends CodeBlob {
   // Deopt
   // Return true is the PC is one would expect if the frame is being deopted.
   public boolean isDeoptPc      (Address pc) { return isDeoptEntry(pc); }
-  public boolean isDeoptEntry   (Address pc) { return pc == deoptHandlerEntry(); }
+  public boolean isDeoptEntry   (Address pc) { return pc == deoptHandlerBegin(); }
 
   /** Tells whether frames described by this nmethod can be
       deoptimized. Note: native wrappers cannot be deoptimized. */
@@ -490,7 +490,7 @@ public class NMethod extends CodeBlob {
 
   private int getEntryBCI()                     { return (int) entryBCIField                    .getValue(addr); }
   private int getExceptionOffset()              { return (int) exceptionOffsetField             .getValue(addr); }
-  private int getDeoptHandlerEntryOffset()      { return (int) deoptHandlerEntryOffsetField     .getValue(addr); }
+  private int getDeoptHandlerOffset()           { return (int) deoptHandlerOffsetField          .getValue(addr); }
   private int getStubOffset()                   { return (int) stubOffsetField                  .getValue(addr); }
   private int getScopesDataOffset()             { return (int) scopesDataOffsetField            .getValue(addr); }
   private int getScopesPCsOffset()              { return (int) scopesPCsOffsetField             .getValue(addr); }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
index ee9e0ecdafd..27efb631f79 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
@@ -87,7 +87,7 @@ public abstract class Frame implements Cloneable {
       CodeBlob cb = VM.getVM().getCodeCache().findBlob(pc);
       if (cb != null && cb.isJavaMethod()) {
         NMethod nm = (NMethod) cb;
-        if (pc.equals(nm.deoptHandlerEntry())) {
+        if (pc.equals(nm.deoptHandlerBegin())) {
           if (Assert.ASSERTS_ENABLED) {
             Assert.that(this.getUnextendedSP() != null, "null SP in Java frame");
           }
diff --git a/test/hotspot/jtreg/runtime/vthread/Deoptimization.java b/test/hotspot/jtreg/runtime/vthread/Deoptimization.java
deleted file mode 100644
index 050848c3a72..00000000000
--- a/test/hotspot/jtreg/runtime/vthread/Deoptimization.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2025 Arm Limited and/or its affiliates.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test id=vthread-deopt-c1
- * @summary Deoptimization test for virtual threads (C1)
- * @requires vm.continuations
- * @requires vm.compiler1.enabled
- * @requires vm.opt.TieredStopAtLevel != 0
- * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:.
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:-BackgroundCompilation
- *                   -XX:TieredStopAtLevel=1
- *                   Deoptimization
- */
-
-/**
- * @test id=vthread-deopt-c2
- * @summary Deoptimization test for virtual threads (C2)
- * @requires vm.continuations
- * @requires vm.compiler2.enabled
- * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:.
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:-BackgroundCompilation
- *                   -XX:-TieredCompilation
- *                   Deoptimization
- */
-
-import java.lang.reflect.Method;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
-import java.util.Objects;
-import jdk.test.whitebox.WhiteBox;
-
-public class Deoptimization {
-    static final WhiteBox white_box = WhiteBox.getWhiteBox();
-
-    static class TestTask implements Runnable {
-        CyclicBarrier start_barrier = null;
-        AtomicInteger completed_number = new AtomicInteger(0);
-
-        public void reset(int barrier_parties) {
-            start_barrier = new CyclicBarrier(barrier_parties);
-            completed_number.set(0);
-        }
-
-        public int getNumberWaiting() {
-            return start_barrier.getNumberWaiting();
-        }
-
-        public int getNumberCompleted() {
-            return completed_number.get();
-        }
-
-        public void await() throws BrokenBarrierException, InterruptedException {
-            start_barrier.await();
-        }
-
-        public void run() {
-            try {
-                await();
-            } catch(BrokenBarrierException e) {
-                return;
-            } catch(InterruptedException e) {
-                return;
-            }
-
-            completed_number.getAndIncrement();
-        }
-    }
-
-    static void test(TestTask task, Method method, int vthreads_num) throws Exception {
-        task.reset(vthreads_num + 1 /* 1 for the main thread */);
-
-        Thread[] vthreads = new Thread[vthreads_num];
-        for (int i = 0; i < vthreads_num; i++) {
-            vthreads[i] = Thread.startVirtualThread(task);
-        }
-
-        while (task.getNumberWaiting() != vthreads_num) {
-            Thread.onSpinWait();
-        }
-
-        if (method != null) {
-            if (!white_box.isMethodCompiled(method, false)) {
-                throw new Error("Unexpectedly, it is not compiled.");
-            }
-
-            white_box.deoptimizeMethod(method);
-
-            if (white_box.isMethodCompiled(method, false)) {
-                throw new Error("Unexpectedly, it is compiled.");
-            }
-        }
-
-        task.await();
-
-        for (int i = 0; i < vthreads_num; i++) {
-            vthreads[i].join();
-        }
-
-        if (task.getNumberCompleted() != vthreads_num) {
-            throw new Error("Some threads didn't reach completion");
-        }
-    }
-
-    static int getIntegerOption(String option_name) {
-        Object option_object = white_box.getVMFlag(option_name);
-        String option_string = Objects.toString(option_object);
-        return Integer.parseInt(option_string);
-    }
-
-    public static void main(String[] args) throws Exception {
-        int tiered_stop_at_level = getIntegerOption("TieredStopAtLevel");
-
-        Method method_run = TestTask.class.getMethod("run");
-        white_box.testSetDontInlineMethod(method_run, true);
-
-        Method method_await = TestTask.class.getMethod("await");
-        white_box.testSetDontInlineMethod(method_await, true);
-
-        TestTask task = new TestTask();
-
-        // Warm-up
-        test(task, null, 2);
-
-        white_box.enqueueMethodForCompilation(method_run, tiered_stop_at_level);
-
-        // Deoptimization test
-        test(task, method_run, 10000);
-    }
-}

From 3d6824e802bda6efed40f7613eda7c8c0d84e673 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 7 Nov 2025 09:19:18 +0000
Subject: [PATCH 078/512] 8371432: [BACKOUT] 8359256: AArch64: Use SHA3 GPR
 intrinsic where it's faster

Reviewed-by: mchevalier, epeter, syan
---
 src/hotspot/cpu/aarch64/globals_aarch64.hpp   |  2 +-
 .../cpu/aarch64/vm_version_aarch64.cpp        | 30 ++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index 107919b2cbd..8e520314c8b 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
@@ -95,7 +95,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Use simplest and shortest implementation for array equals")  \
   product(bool, UseSIMDForBigIntegerShiftIntrinsics, true,              \
           "Use SIMD instructions for left/right shift of BigInteger")   \
-  product(bool, UseSIMDForSHA3Intrinsic, false,                         \
+  product(bool, UseSIMDForSHA3Intrinsic, true,                          \
           "Use SIMD SHA3 instructions for SHA3 intrinsic")              \
   product(bool, AvoidUnalignedAccesses, false,                          \
           "Avoid generating unaligned memory accesses")                 \
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index b47bfe6a89f..a04e9defa4b 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -375,24 +375,18 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
   }
 
-  if (UseSHA && VM_Version::supports_sha3() && _cpu == CPU_APPLE && FLAG_IS_DEFAULT(UseSIMDForSHA3Intrinsic)) {
-    // Note: SIMD faster on Apple, worse on Neoverse V1, V2 and N2.
-    FLAG_SET_DEFAULT(UseSIMDForSHA3Intrinsic, true);
-  }
-
-  // Enable SHA-3 intrinsics (SIMD or GPR). The GPR path does not require SHA instructions.
-  if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
-    FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
-  }
-
-  if (!UseSHA3Intrinsics && UseSIMDForSHA3Intrinsic) {
-    // Keep flags consistent: if SHA3 intrinsics are off, disable the SHA3 SIMD variant.
-    FLAG_SET_DEFAULT(UseSIMDForSHA3Intrinsic, false);
-  }
-
-  if (!VM_Version::supports_sha3() && UseSIMDForSHA3Intrinsic) {
-    warning("SHA3 instructions are not available on this CPU");
-    FLAG_SET_DEFAULT(UseSIMDForSHA3Intrinsic, false);
+  if (UseSHA && VM_Version::supports_sha3()) {
+    // Auto-enable UseSHA3Intrinsics on hardware with performance benefit.
+    // Note that the evaluation of UseSHA3Intrinsics shows better performance
+    // on Apple silicon but worse performance on Neoverse V1 and N2.
+    if (_cpu == CPU_APPLE) {  // Apple silicon
+      if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
+        FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
+      }
+    }
+  } else if (UseSHA3Intrinsics && UseSIMDForSHA3Intrinsic) {
+    warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
   }
 
   if (UseSHA && VM_Version::supports_sha512()) {

From 4233178af20f07ade32322fad931c68e1c4251cf Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Fri, 7 Nov 2025 09:45:48 +0000
Subject: [PATCH 079/512] 8368729: Add appropriate checks in
 java.awt.image.Kernel constructor

Reviewed-by: azvegint, prr, kizune
---
 .../share/classes/java/awt/image/Kernel.java  | 29 +++++++--
 .../ConvolveOp/KernelInitialisationTest.java  | 60 +++++++++++++++++++
 2 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java

diff --git a/src/java.desktop/share/classes/java/awt/image/Kernel.java b/src/java.desktop/share/classes/java/awt/image/Kernel.java
index d8ebc501db6..d2b9760aba5 100644
--- a/src/java.desktop/share/classes/java/awt/image/Kernel.java
+++ b/src/java.desktop/share/classes/java/awt/image/Kernel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,21 +59,38 @@ public class Kernel implements Cloneable {
      * @param width         width of the kernel
      * @param height        height of the kernel
      * @param data          kernel data in row major order
+     * @throws IllegalArgumentException if {@code data} is null
+     * @throws IllegalArgumentException if {@code width} or {@code height}
+     *         is not positive
+     * @throws IllegalArgumentException if product of {@code width} and
+     *         {@code height} overflows an int
      * @throws IllegalArgumentException if the length of {@code data}
      *         is less than the product of {@code width} and
      *         {@code height}
      */
     public Kernel(int width, int height, float[] data) {
-        this.width  = width;
-        this.height = height;
-        this.xOrigin  = (width-1)>>1;
-        this.yOrigin  = (height-1)>>1;
-        int len = width*height;
+        if (data == null) {
+            throw new IllegalArgumentException("Data must not be null");
+        }
+        if ((width <= 0) || (height <= 0)) {
+            throw new IllegalArgumentException("Invalid width or height");
+        }
+        int len = 0;
+        try {
+            len = Math.multiplyExact(width, height);
+        } catch (ArithmeticException e) {
+            throw new IllegalArgumentException("width * height results in" +
+                " integer overflow");
+        }
         if (data.length < len) {
             throw new IllegalArgumentException("Data array too small "+
                                                "(is "+data.length+
                                                " and should be "+len);
         }
+        this.width  = width;
+        this.height = height;
+        this.xOrigin  = (width - 1) >> 1;
+        this.yOrigin  = (height - 1) >> 1;
         this.data = new float[len];
         System.arraycopy(data, 0, this.data, 0, len);
 
diff --git a/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java b/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java
new file mode 100644
index 00000000000..607f0a7a8dc
--- /dev/null
+++ b/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug     8368729
+ * @summary Tests that passing invalid values to Kernel constructor
+ *          throws only IllegalArgumentException
+ */
+
+import java.awt.image.Kernel;
+
+public class KernelInitialisationTest {
+    private static void expectIllegalArgumentException(Runnable code) {
+        try {
+            code.run();
+            throw new RuntimeException("Expected IllegalArgumentException" +
+                " but no exception was thrown");
+        } catch (IllegalArgumentException e) {
+            // we expect IllegalArgumentException
+        }
+    }
+
+    private static void testKernel(int width, int height, float[] data) {
+        System.out.println("Testing for width: " + width + ", height: "
+            + height + ", data: " + (data == null ? "null" : "not null"));
+        expectIllegalArgumentException(() -> new Kernel(width, height, data));
+    }
+
+    public static void main(String[] args) {
+        testKernel(-1, 1, new float[100]);
+        testKernel(1, -1, new float[100]);
+        testKernel(-1, -1, new float[100]);
+        testKernel(1, 1, null);
+
+        int width = 50;
+        int height = Integer.MAX_VALUE;
+        testKernel(width, height, new float[100]);
+    }
+}

From 428b553ad4ee79e5d56f51232c27ed0b003abe18 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Fri, 7 Nov 2025 09:55:16 +0000
Subject: [PATCH 080/512] 8278856: javac documentation does not mention use of
 Manifest class-path attribute

Reviewed-by: jlahoda
---
 src/jdk.compiler/share/man/javac.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/jdk.compiler/share/man/javac.md b/src/jdk.compiler/share/man/javac.md
index 46246624e53..1822931bf40 100644
--- a/src/jdk.compiler/share/man/javac.md
+++ b/src/jdk.compiler/share/man/javac.md
@@ -1311,6 +1311,12 @@ although some module-related path options allow a package hierarchy to be
 specified on a per-module basis. All other path options are used to specify
 package hierarchies.
 
+When a JAR file in the user class path has a `Class-Path` manifest attribute,
+and the specified JAR file(s) exist, they are automatically inserted into the
+user class path after the JAR file. This rule also applies recursively to any
+new JAR files found. Consult the [JAR File Specification](../jar/jar.html#class-path-attribute)
+for details.
+
 ### Package Hierarchy
 
 In a package hierarchy, directories and subdirectories are used

From 59d23095789bbb6d4e466bcbeb82089b17d78eae Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Fri, 7 Nov 2025 10:10:14 +0000
Subject: [PATCH 081/512] 8371385:
 compiler/escapeAnalysis/TestRematerializeObjects.java fails in case of
 -XX:-UseUnalignedAccesses

Reviewed-by: chagedorn, dfenacci
---
 .../compiler/escapeAnalysis/TestRematerializeObjects.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java
index 4f88dcb6a82..d2fdf47b060 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestRematerializeObjects.java
@@ -79,12 +79,12 @@ public class TestRematerializeObjects {
                   IRNode.UNSTABLE_IF_TRAP, "1",
                   IRNode.STORE_L_OF_CLASS, "int\\[int:4\\]", "1",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "0"},
-        applyIf = {"EliminateAllocations", "false"})
+        applyIfAnd = {"EliminateAllocations", "false", "UseUnalignedAccesses", "true"})
     @IR(counts = {IRNode.ALLOC_ARRAY, "0",
                   IRNode.UNSTABLE_IF_TRAP, "1",
                   IRNode.STORE_L_OF_CLASS, "int\\[int:4\\]", "0",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "2"},
-        applyIf = {"EliminateAllocations", "true"})
+        applyIfAnd = {"EliminateAllocations", "true", "UseUnalignedAccesses", "true"})
     static int test1(boolean flag) {
         int[] arr = new int[4];
         arr[0] = 0x0001_0000; // these slip into Initialize
@@ -124,12 +124,12 @@ public class TestRematerializeObjects {
                   IRNode.UNSTABLE_IF_TRAP, "1",
                   IRNode.STORE_I_OF_CLASS, "short\\[int:4\\]", "1",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "0"},
-        applyIf = {"EliminateAllocations", "false"})
+        applyIfAnd = {"EliminateAllocations", "false", "UseUnalignedAccesses", "true"})
     @IR(counts = {IRNode.ALLOC_ARRAY, "0",
                   IRNode.UNSTABLE_IF_TRAP, "1",
                   IRNode.STORE_I_OF_CLASS, "short\\[int:4\\]", "0",
                   IRNode.SAFEPOINT_SCALAROBJECT_OF, "fields@\\[0..3\\]", "2"},
-        applyIf = {"EliminateAllocations", "true"})
+        applyIfAnd = {"EliminateAllocations", "true", "UseUnalignedAccesses", "true"})
     static int test2(boolean flag) {
         short[] arr = new short[4];
         arr[0] = 1;

From 167c952bb0fefb5acc9782f4f4474d92097c93f8 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 7 Nov 2025 10:48:07 +0000
Subject: [PATCH 082/512] 8371369: Parallel: Relax precondition of
 PSOldGen::expand_and_allocate

Reviewed-by: eosterlund, fandreuzzi
---
 src/hotspot/share/gc/parallel/mutableSpace.cpp | 11 +++++------
 src/hotspot/share/gc/parallel/psOldGen.cpp     |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index a8f47a387e3..6d30c5a8d1f 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -182,12 +182,11 @@ bool MutableSpace::cas_deallocate(HeapWord *obj, size_t size) {
 
 // Only used by oldgen allocation.
 bool MutableSpace::needs_expand(size_t word_size) const {
-#ifdef ASSERT
-  // If called by VM thread, locking is not needed.
-  if (!Thread::current()->is_VM_thread()) {
-    assert_lock_strong(PSOldGenExpand_lock);
-  }
-#endif
+  // This method can be invoked either outside of safepoint by java threads or
+  // in safepoint by gc workers. Such accesses are synchronized by holding one
+  // of the following locks.
+  assert(Heap_lock->is_locked() || PSOldGenExpand_lock->is_locked(), "precondition");
+
   // Holding the lock means end is stable.  So while top may be advancing
   // via concurrent allocations, there is no need to order the reads of top
   // and end here, unlike in cas_allocate.
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 2d4b0698ad0..4e614c53447 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -118,8 +118,8 @@ void PSOldGen::initialize_performance_counters() {
 }
 
 HeapWord* PSOldGen::expand_and_allocate(size_t word_size) {
-  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
-  assert(Thread::current()->is_VM_thread(), "precondition");
+  assert(Heap_lock->is_locked(), "precondition");
+
   if (object_space()->needs_expand(word_size)) {
     expand(word_size*HeapWordSize);
   }

From d5803aa78a84caccd5c3f14ac788817c5a3b4725 Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Fri, 7 Nov 2025 14:06:37 +0000
Subject: [PATCH 083/512] 8371315:
 java/foreign/sharedclosejfr/TestSharedCloseJFR.java failed with
 -XX:-TieredCompilation

Reviewed-by: mcimadamore, syan
---
 test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java b/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java
index b59373b5b4e..913be05ac50 100644
--- a/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java
+++ b/test/jdk/java/foreign/sharedclosejfr/TestSharedCloseJFR.java
@@ -35,6 +35,7 @@
  * @run main jdk.test.lib.FileInstaller sharedCloseJfr.jfc sharedCloseJfr.jfc
  * @run main/othervm
  *   -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *   -XX:CompileCommand=exclude,*TestSharedCloseJFR.main
  *   -XX:StartFlightRecording:filename=recording.jfr,dumponexit=true,settings=sharedCloseJfr.jfc
  *   TestSharedCloseJFR
  */

From c8656449c28581ae9c3d815105e338e42253bb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Fri, 7 Nov 2025 15:28:51 +0000
Subject: [PATCH 084/512] 8365932: Implementation of JEP 516: Ahead-of-Time
 Object Caching with Any GC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org>
Co-authored-by: Joel Sikström <jsikstro@openjdk.org>
Co-authored-by: Stefan Karlsson <stefank@openjdk.org>
Reviewed-by: aboldtch, iklam, kvn
---
 make/Images.gmk                               |    1 -
 src/hotspot/share/cds/aotMapLogger.cpp        |  264 ++--
 src/hotspot/share/cds/aotMapLogger.hpp        |   53 +-
 src/hotspot/share/cds/aotMappedHeapLoader.cpp |  847 ++++++++++++
 ...HeapLoader.hpp => aotMappedHeapLoader.hpp} |   43 +-
 ...ine.hpp => aotMappedHeapLoader.inline.hpp} |   14 +-
 ...HeapWriter.cpp => aotMappedHeapWriter.cpp} |  320 +++--
 ...HeapWriter.hpp => aotMappedHeapWriter.hpp} |   65 +-
 src/hotspot/share/cds/aotMetaspace.cpp        |   80 +-
 src/hotspot/share/cds/aotMetaspace.hpp        |    8 +-
 .../share/cds/aotReferenceObjSupport.cpp      |    3 +
 .../share/cds/aotStreamedHeapLoader.cpp       | 1190 +++++++++++++++++
 .../share/cds/aotStreamedHeapLoader.hpp       |  245 ++++
 .../share/cds/aotStreamedHeapWriter.cpp       |  614 +++++++++
 .../share/cds/aotStreamedHeapWriter.hpp       |  162 +++
 src/hotspot/share/cds/aotThread.cpp           |  114 ++
 src/hotspot/share/cds/aotThread.hpp           |   52 +
 src/hotspot/share/cds/archiveBuilder.cpp      |   38 +-
 src/hotspot/share/cds/archiveBuilder.hpp      |   14 +-
 src/hotspot/share/cds/archiveHeapLoader.cpp   |  468 -------
 src/hotspot/share/cds/archiveUtils.cpp        |    1 -
 src/hotspot/share/cds/cdsConfig.cpp           |   12 +-
 src/hotspot/share/cds/cdsEnumKlass.cpp        |    9 +-
 src/hotspot/share/cds/cdsHeapVerifier.cpp     |    3 +-
 src/hotspot/share/cds/cds_globals.hpp         |    6 +
 src/hotspot/share/cds/dynamicArchive.cpp      |    5 +-
 src/hotspot/share/cds/filemap.cpp             |  506 +++----
 src/hotspot/share/cds/filemap.hpp             |   64 +-
 src/hotspot/share/cds/heapShared.cpp          |  559 +++++---
 src/hotspot/share/cds/heapShared.hpp          |  210 ++-
 src/hotspot/share/cds/heapShared.inline.hpp   |  114 ++
 .../share/classfile/classLoaderDataGraph.cpp  |    4 +-
 .../share/classfile/classLoaderDataShared.cpp |   31 +-
 .../share/classfile/classLoaderDataShared.hpp |    1 +
 src/hotspot/share/classfile/javaClasses.cpp   |    5 +-
 src/hotspot/share/classfile/moduleEntry.cpp   |    4 +
 src/hotspot/share/classfile/moduleEntry.hpp   |    1 +
 src/hotspot/share/classfile/modules.cpp       |    2 +
 src/hotspot/share/classfile/stringTable.cpp   |   45 +-
 src/hotspot/share/classfile/stringTable.hpp   |    3 +-
 .../share/classfile/systemDictionary.cpp      |    2 +-
 src/hotspot/share/classfile/vmClasses.cpp     |   41 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp |    4 +
 src/hotspot/share/gc/shared/collectedHeap.hpp |    1 +
 .../shared/stringdedup/stringDedupConfig.cpp  |    1 +
 .../shared/stringdedup/stringDedupTable.cpp   |    7 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |    4 +-
 src/hotspot/share/gc/z/zArguments.cpp         |    7 +
 src/hotspot/share/gc/z/zCollectedHeap.cpp     |    5 +
 src/hotspot/share/gc/z/zCollectedHeap.hpp     |    2 +
 src/hotspot/share/gc/z/zDirector.cpp          |    7 +
 .../share/jfr/support/jfrThreadLocal.cpp      |    9 +-
 src/hotspot/share/memory/universe.cpp         |   28 +-
 src/hotspot/share/oops/constantPool.cpp       |    8 +-
 src/hotspot/share/oops/klass.cpp              |    5 +-
 src/hotspot/share/oops/objArrayOop.hpp        |    2 +-
 src/hotspot/share/oops/oopsHierarchy.cpp      |    2 -
 src/hotspot/share/prims/jni.cpp               |    4 +
 src/hotspot/share/prims/jvmtiExport.cpp       |    8 +
 src/hotspot/share/prims/jvmtiRawMonitor.cpp   |   13 +-
 src/hotspot/share/prims/whitebox.cpp          |   26 +-
 src/hotspot/share/runtime/javaThread.cpp      |    4 +-
 src/hotspot/share/runtime/mutexLocker.cpp     |    6 +-
 src/hotspot/share/runtime/mutexLocker.hpp     |    1 +
 .../share/runtime/safepointVerifiers.cpp      |    8 +-
 .../share/runtime/safepointVerifiers.hpp      |    3 +-
 src/hotspot/share/runtime/thread.hpp          |    1 +
 src/hotspot/share/runtime/threads.cpp         |   26 +-
 src/hotspot/share/utilities/exceptions.cpp    |    3 +-
 src/hotspot/share/utilities/macros.hpp        |    2 +-
 test/hotspot/jtreg/ProblemList-AotJdk.txt     |    1 +
 test/hotspot/jtreg/TEST.ROOT                  |    2 +
 test/hotspot/jtreg/TEST.groups                |    3 +-
 .../jtreg/gc/TestPLABAdaptToMinTLABSize.java  |    4 +-
 .../gc/stress/gcbasher/TestGCBasherWithZ.java |    4 +-
 .../hotspot/jtreg/runtime/cds/AOTMapTest.java |   14 +-
 .../jtreg/runtime/cds/SharedStrings.java      |    2 +-
 .../jtreg/runtime/cds/SharedStringsDedup.java |    2 +-
 .../runtime/cds/SharedStringsRunAuto.java     |    2 +-
 .../cds/SharedSymbolTableBucketSize.java      |    5 +-
 .../cds/TestDefaultArchiveLoading.java        |    2 +
 .../cds/appcds/TestParallelGCWithCDS.java     |   35 +-
 .../cds/appcds/TestSerialGCWithCDS.java       |    5 +-
 .../cds/appcds/TestZGCWithAOTHeap.java        |  159 +++
 .../aotClassLinking/AOTCacheWithZGC.java      |   59 -
 .../aotCode/AOTCodeCompressedOopsTest.java    |    2 +
 .../cacheObject/ArchivedIntegerCacheTest.java |   12 +-
 .../PrintSharedArchiveAndExit.java            |   10 +-
 .../PrintSharedArchiveAndExit.java            |   10 +-
 .../cds/appcds/sharedStrings/ExerciseGC.java  |    3 +-
 .../cds/appcds/sharedStrings/FlagCombo.java   |    8 +-
 .../sharedStrings/IncompatibleOptions.java    |   68 +-
 .../sharedStrings/InternSharedString.java     |    6 +-
 .../cds/appcds/sharedStrings/LargePages.java  |    3 +-
 .../sharedStrings/SharedStringsBasic.java     |    6 +-
 .../sharedStrings/SharedStringsBasicPlus.java |    7 +-
 .../sharedStrings/SharedStringsHumongous.java |    7 +-
 .../sharedStrings/SharedStringsStress.java    |    7 +-
 .../sharedStrings/SharedStringsUtils.java     |    7 +-
 .../sharedStrings/SharedStringsWbTest.java    |    7 +-
 .../serviceability/sa/ClhsdbPrintAll.java     |    2 +-
 test/jdk/TEST.ROOT                            |    2 +
 test/jtreg-ext/requires/VMProps.java          |   50 +-
 test/lib/jdk/test/whitebox/WhiteBox.java      |    2 +
 104 files changed, 5281 insertions(+), 1657 deletions(-)
 create mode 100644 src/hotspot/share/cds/aotMappedHeapLoader.cpp
 rename src/hotspot/share/cds/{archiveHeapLoader.hpp => aotMappedHeapLoader.hpp} (79%)
 rename src/hotspot/share/cds/{archiveHeapLoader.inline.hpp => aotMappedHeapLoader.inline.hpp} (82%)
 rename src/hotspot/share/cds/{archiveHeapWriter.cpp => aotMappedHeapWriter.cpp} (69%)
 rename src/hotspot/share/cds/{archiveHeapWriter.hpp => aotMappedHeapWriter.hpp} (86%)
 create mode 100644 src/hotspot/share/cds/aotStreamedHeapLoader.cpp
 create mode 100644 src/hotspot/share/cds/aotStreamedHeapLoader.hpp
 create mode 100644 src/hotspot/share/cds/aotStreamedHeapWriter.cpp
 create mode 100644 src/hotspot/share/cds/aotStreamedHeapWriter.hpp
 create mode 100644 src/hotspot/share/cds/aotThread.cpp
 create mode 100644 src/hotspot/share/cds/aotThread.hpp
 delete mode 100644 src/hotspot/share/cds/archiveHeapLoader.cpp
 create mode 100644 src/hotspot/share/cds/heapShared.inline.hpp
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithAOTHeap.java
 delete mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java

diff --git a/make/Images.gmk b/make/Images.gmk
index 34d81081d29..c5877e44c22 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -148,7 +148,6 @@ define CreateCDSArchive
   $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_COH_OPTION)
   $1_$2_DUMP_TYPE      := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _coh, $2),-COH,)
 
-  # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
   $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
diff --git a/src/hotspot/share/cds/aotMapLogger.cpp b/src/hotspot/share/cds/aotMapLogger.cpp
index 151c15048c2..d0a63c56093 100644
--- a/src/hotspot/share/cds/aotMapLogger.cpp
+++ b/src/hotspot/share/cds/aotMapLogger.cpp
@@ -23,7 +23,10 @@
  */
 
 #include "cds/aotMapLogger.hpp"
-#include "cds/archiveHeapWriter.hpp"
+#include "cds/aotMappedHeapLoader.hpp"
+#include "cds/aotMappedHeapWriter.hpp"
+#include "cds/aotStreamedHeapLoader.hpp"
+#include "cds/aotStreamedHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/filemap.hpp"
 #include "classfile/systemDictionaryShared.hpp"
@@ -45,10 +48,7 @@ bool AOTMapLogger::_is_logging_at_bootstrap;
 bool AOTMapLogger::_is_runtime_logging;
 intx AOTMapLogger::_buffer_to_requested_delta;
 intx AOTMapLogger::_requested_to_mapped_metadata_delta;
-size_t AOTMapLogger::_num_root_segments;
-size_t AOTMapLogger::_num_obj_arrays_logged;
 GrowableArrayCHeap<AOTMapLogger::FakeOop, mtClass>* AOTMapLogger::_roots;
-ArchiveHeapInfo* AOTMapLogger::_dumptime_heap_info;
 
 class AOTMapLogger::RequestedMetadataAddr {
   address _raw_addr;
@@ -86,12 +86,10 @@ void AOTMapLogger::ergo_initialize() {
 }
 
 void AOTMapLogger::dumptime_log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
-                                ArchiveHeapInfo* heap_info,
+                                ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info,
                                 char* bitmap, size_t bitmap_size_in_bytes) {
   _is_runtime_logging = false;
   _buffer_to_requested_delta =  ArchiveBuilder::current()->buffer_to_requested_delta();
-  _num_root_segments = mapinfo->heap_root_segments().count();
-  _dumptime_heap_info = heap_info;
 
   log_file_header(mapinfo);
 
@@ -106,8 +104,11 @@ void AOTMapLogger::dumptime_log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
   log_as_hex((address)bitmap, bitmap_end, nullptr);
 
 #if INCLUDE_CDS_JAVA_HEAP
-  if (heap_info->is_used()) {
-    dumptime_log_heap_region(heap_info);
+  if (mapped_heap_info != nullptr && mapped_heap_info->is_used()) {
+    dumptime_log_mapped_heap_region(mapped_heap_info);
+  }
+  if (streamed_heap_info != nullptr && streamed_heap_info->is_used()) {
+    dumptime_log_streamed_heap_region(streamed_heap_info);
   }
 #endif
 
@@ -192,7 +193,6 @@ void AOTMapLogger::runtime_log(FileMapInfo* mapinfo, GrowableArrayCHeap<Archived
 
 #if INCLUDE_CDS_JAVA_HEAP
   if (mapinfo->has_heap_region() && CDSConfig::is_loading_heap()) {
-    _num_root_segments = mapinfo->heap_root_segments().count();
     runtime_log_heap_region(mapinfo);
   }
 #endif
@@ -501,62 +501,38 @@ void AOTMapLogger::log_as_hex(address base, address top, address requested_base,
 // Hence, in general, we cannot use regular oop API (such as oopDesc::obj_field()) on these objects. There
 // are a few rare case where regular oop API work, but these are all guarded with the raw_oop() method and
 // should be used with care.
+//
+// Each AOT heap reader and writer has its own oop_iterator() API that retrieves all the data required to build
+// fake oops for logging.
 class AOTMapLogger::FakeOop {
-  static int _requested_shift;
-  static intx _buffer_to_requested_delta;
-  static address _buffer_start;
-  static address _buffer_end;
-  static uint64_t _buffer_start_narrow_oop; // The encoded narrow oop for the objects at _buffer_start
+  OopDataIterator* _iter;
+  OopData _data;
 
-  address _buffer_addr;
-
-  static void assert_range(address buffer_addr) {
-    assert(_buffer_start <= buffer_addr && buffer_addr < _buffer_end, "range check");
+  address* buffered_field_addr(int field_offset) {
+    return (address*)(buffered_addr() + field_offset);
   }
 
-  address* field_addr(int field_offset) {
-    return (address*)(_buffer_addr + field_offset);
-  }
-
-protected:
+public:
   RequestedMetadataAddr metadata_field(int field_offset) {
-    return RequestedMetadataAddr(*(address*)(field_addr(field_offset)));
+    return RequestedMetadataAddr(*(address*)(buffered_field_addr(field_offset)));
+  }
+
+  address buffered_addr() {
+    return _data._buffered_addr;
   }
 
   // Return an "oop" pointer so we can use APIs that accept regular oops. This
   // must be used with care, as only a limited number of APIs can work with oops that
   // live outside of the range of the heap.
-  oop raw_oop() { return cast_to_oop(_buffer_addr); }
+  oop raw_oop() { return _data._raw_oop; }
 
-public:
-  static void init_globals(address requested_base, address requested_start, int requested_shift,
-                           address buffer_start, address buffer_end) {
-    _requested_shift = requested_shift;
-    _buffer_to_requested_delta = requested_start - buffer_start;
-    _buffer_start = buffer_start;
-    _buffer_end = buffer_end;
+  FakeOop() : _data() {}
+  FakeOop(OopDataIterator* iter, OopData data) : _iter(iter), _data(data) {}
 
-    precond(requested_start >= requested_base);
-    if (UseCompressedOops) {
-      _buffer_start_narrow_oop = (uint64_t)(pointer_delta(requested_start, requested_base, 1)) >> _requested_shift;
-      assert(_buffer_start_narrow_oop < 0xffffffff, "sanity");
-    } else {
-      _buffer_start_narrow_oop = 0xdeadbeed;
-    }
-  }
-
-  FakeOop() : _buffer_addr(nullptr) {}
-
-  FakeOop(address buffer_addr) : _buffer_addr(buffer_addr) {
-    if (_buffer_addr != nullptr) {
-      assert_range(_buffer_addr);
-    }
-  }
-
-  FakeMirror& as_mirror();
-  FakeObjArray& as_obj_array();
-  FakeString& as_string();
-  FakeTypeArray& as_type_array();
+  FakeMirror as_mirror();
+  FakeObjArray as_obj_array();
+  FakeString as_string();
+  FakeTypeArray as_type_array();
 
   RequestedMetadataAddr klass() {
     address rk = (address)real_klass();
@@ -570,61 +546,45 @@ public:
 
   Klass* real_klass() {
     assert(UseCompressedClassPointers, "heap archiving requires UseCompressedClassPointers");
-    if (_is_runtime_logging) {
-      return raw_oop()->klass();
-    } else {
-      return ArchiveHeapWriter::real_klass_of_buffered_oop(_buffer_addr);
-    }
+    return _data._klass;
   }
 
   // in heap words
   size_t size() {
-    if (_is_runtime_logging) {
-      return raw_oop()->size_given_klass(real_klass());
-    } else {
-      return ArchiveHeapWriter::size_of_buffered_oop(_buffer_addr);
-    }
+    return _data._size;
+  }
+
+  bool is_root_segment() {
+    return _data._is_root_segment;
   }
 
   bool is_array() { return real_klass()->is_array_klass(); }
-  bool is_null() { return _buffer_addr == nullptr; }
+  bool is_null() { return buffered_addr() == nullptr; }
 
   int array_length() {
     precond(is_array());
     return arrayOop(raw_oop())->length();
   }
 
+  intptr_t target_location() {
+    return _data._target_location;
+  }
+
   address requested_addr() {
-    return _buffer_addr + _buffer_to_requested_delta;
+    return _data._requested_addr;
   }
 
   uint32_t as_narrow_oop_value() {
     precond(UseCompressedOops);
-    if (_buffer_addr == nullptr) {
-      return 0;
-    }
-    uint64_t pd = (uint64_t)(pointer_delta(_buffer_addr, _buffer_start, 1));
-    return checked_cast<uint32_t>(_buffer_start_narrow_oop + (pd >> _requested_shift));
+    return _data._narrow_location;
   }
 
   FakeOop read_oop_at(narrowOop* addr) { // +UseCompressedOops
-    uint64_t n = (uint64_t)(*addr);
-    if (n == 0) {
-      return FakeOop(nullptr);
-    } else {
-      precond(n >= _buffer_start_narrow_oop);
-      address value = _buffer_start + ((n - _buffer_start_narrow_oop) << _requested_shift);
-      return FakeOop(value);
-    }
+    return FakeOop(_iter, _iter->obj_at(addr));
   }
 
   FakeOop read_oop_at(oop* addr) { // -UseCompressedOops
-    address requested_value = cast_from_oop<address>(*addr);
-    if (requested_value == nullptr) {
-      return FakeOop(nullptr);
-    } else {
-      return FakeOop(requested_value - _buffer_to_requested_delta);
-    }
+    return FakeOop(_iter, _iter->obj_at(addr));
   }
 
   FakeOop obj_field(int field_offset) {
@@ -644,6 +604,8 @@ public:
 
 class AOTMapLogger::FakeMirror : public AOTMapLogger::FakeOop {
 public:
+  FakeMirror(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
+
   void print_class_signature_on(outputStream* st);
 
   Klass* real_mirrored_klass() {
@@ -662,6 +624,8 @@ class AOTMapLogger::FakeObjArray : public AOTMapLogger::FakeOop {
   }
 
 public:
+  FakeObjArray(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
+
   int length() {
     return raw_objArrayOop()->length();
   }
@@ -676,6 +640,8 @@ public:
 
 class AOTMapLogger::FakeString : public AOTMapLogger::FakeOop {
 public:
+  FakeString(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
+
   bool is_latin1() {
     jbyte coder = raw_oop()->byte_field(java_lang_String::coder_offset());
     assert(CompactStrings || coder == java_lang_String::CODER_UTF16, "Must be UTF16 without CompactStrings");
@@ -694,6 +660,8 @@ class AOTMapLogger::FakeTypeArray : public AOTMapLogger::FakeOop {
   }
 
 public:
+  FakeTypeArray(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
+
   void print_elements_on(outputStream* st) {
     TypeArrayKlass::cast(real_klass())->oop_print_elements_on(raw_typeArrayOop(), st);
   }
@@ -703,24 +671,24 @@ public:
   jchar char_at(int i) { return raw_typeArrayOop()->char_at(i); }
 }; // AOTMapLogger::FakeTypeArray
 
-AOTMapLogger::FakeMirror& AOTMapLogger::FakeOop::as_mirror() {
+AOTMapLogger::FakeMirror AOTMapLogger::FakeOop::as_mirror() {
   precond(real_klass() == vmClasses::Class_klass());
-  return (FakeMirror&)*this;
+  return FakeMirror(_iter, _data);
 }
 
-AOTMapLogger::FakeObjArray& AOTMapLogger::FakeOop::as_obj_array() {
+AOTMapLogger::FakeObjArray AOTMapLogger::FakeOop::as_obj_array() {
   precond(real_klass()->is_objArray_klass());
-  return (FakeObjArray&)*this;
+  return FakeObjArray(_iter, _data);
 }
 
-AOTMapLogger::FakeTypeArray& AOTMapLogger::FakeOop::as_type_array() {
+AOTMapLogger::FakeTypeArray AOTMapLogger::FakeOop::as_type_array() {
   precond(real_klass()->is_typeArray_klass());
-  return (FakeTypeArray&)*this;
+  return FakeTypeArray(_iter, _data);
 }
 
-AOTMapLogger::FakeString& AOTMapLogger::FakeOop::as_string() {
+AOTMapLogger::FakeString AOTMapLogger::FakeOop::as_string() {
   precond(real_klass() == vmClasses::String_klass());
-  return (FakeString&)*this;
+  return FakeString(_iter, _data);
 }
 
 void AOTMapLogger::FakeMirror::print_class_signature_on(outputStream* st) {
@@ -823,90 +791,104 @@ public:
   }
 }; // AOTMapLogger::ArchivedFieldPrinter
 
-int AOTMapLogger::FakeOop::_requested_shift;
-intx AOTMapLogger::FakeOop::_buffer_to_requested_delta;
-address AOTMapLogger::FakeOop::_buffer_start;
-address AOTMapLogger::FakeOop::_buffer_end;
-uint64_t AOTMapLogger::FakeOop::_buffer_start_narrow_oop;
-
-void AOTMapLogger::dumptime_log_heap_region(ArchiveHeapInfo* heap_info) {
+void AOTMapLogger::dumptime_log_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) {
   MemRegion r = heap_info->buffer_region();
   address buffer_start = address(r.start()); // start of the current oop inside the buffer
   address buffer_end = address(r.end());
 
-  address requested_base = UseCompressedOops ? (address)CompressedOops::base() : (address)ArchiveHeapWriter::NOCOOPS_REQUESTED_BASE;
-  address requested_start = UseCompressedOops ? ArchiveHeapWriter::buffered_addr_to_requested_addr(buffer_start) : requested_base;
-  int requested_shift =  CompressedOops::shift();
-
-  FakeOop::init_globals(requested_base, requested_start, requested_shift, buffer_start, buffer_end);
+  address requested_base = UseCompressedOops ? (address)CompressedOops::base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
+  address requested_start = UseCompressedOops ? AOTMappedHeapWriter::buffered_addr_to_requested_addr(buffer_start) : requested_base;
 
   log_region_range("heap", buffer_start, buffer_end, requested_start);
-  log_oops(buffer_start, buffer_end);
+  log_archived_objects(AOTMappedHeapWriter::oop_iterator(heap_info));
+}
+
+void AOTMapLogger::dumptime_log_streamed_heap_region(ArchiveStreamedHeapInfo* heap_info) {
+  MemRegion r = heap_info->buffer_region();
+  address buffer_start = address(r.start()); // start of the current oop inside the buffer
+  address buffer_end = address(r.end());
+
+  log_region_range("heap", buffer_start, buffer_end, nullptr);
+  log_archived_objects(AOTStreamedHeapWriter::oop_iterator(heap_info));
 }
 
 void AOTMapLogger::runtime_log_heap_region(FileMapInfo* mapinfo) {
   ResourceMark rm;
+
   int heap_region_index = AOTMetaspace::hp;
   FileMapRegion* r = mapinfo->region_at(heap_region_index);
-  size_t alignment = ObjectAlignmentInBytes;
+  size_t alignment = (size_t)ObjectAlignmentInBytes;
 
-  // Allocate a buffer and read the image of the archived heap region. This buffer is outside
-  // of the real Java heap, so we must use FakeOop to access the contents of the archived heap objects.
-  char* buffer = resource_allocate_bytes(r->used() + alignment);
-  address buffer_start = (address)align_up(buffer, alignment);
-  address buffer_end = buffer_start + r->used();
-  if (!mapinfo->read_region(heap_region_index, (char*)buffer_start, r->used(), /* do_commit = */ false)) {
-    log_error(aot)("Cannot read heap region; AOT map logging of heap objects failed");
-    return;
+  if (mapinfo->object_streaming_mode()) {
+    address buffer_start = (address)r->mapped_base();
+    address buffer_end = buffer_start + r->used();
+    log_region_range("heap", buffer_start, buffer_end, nullptr);
+    log_archived_objects(AOTStreamedHeapLoader::oop_iterator(mapinfo, buffer_start, buffer_end));
+  } else {
+    // Allocate a buffer and read the image of the archived heap region. This buffer is outside
+    // of the real Java heap, so we must use FakeOop to access the contents of the archived heap objects.
+    char* buffer = resource_allocate_bytes(r->used() + alignment);
+    address buffer_start = (address)align_up(buffer, alignment);
+    address buffer_end = buffer_start + r->used();
+    if (!mapinfo->read_region(heap_region_index, (char*)buffer_start, r->used(), /* do_commit = */ false)) {
+      log_error(aot)("Cannot read heap region; AOT map logging of heap objects failed");
+      return;
+    }
+
+    address requested_base = UseCompressedOops ? (address)mapinfo->narrow_oop_base() : AOTMappedHeapLoader::heap_region_requested_address(mapinfo);
+    address requested_start = requested_base + r->mapping_offset();
+    log_region_range("heap", buffer_start, buffer_end, requested_start);
+    log_archived_objects(AOTMappedHeapLoader::oop_iterator(mapinfo, buffer_start, buffer_end));
   }
-
-  address requested_base = UseCompressedOops ? (address)mapinfo->narrow_oop_base() : mapinfo->heap_region_requested_address();
-  address requested_start = requested_base + r->mapping_offset();
-  int requested_shift = mapinfo->narrow_oop_shift();
-
-  FakeOop::init_globals(requested_base, requested_start, requested_shift, buffer_start, buffer_end);
-
-  log_region_range("heap", buffer_start, buffer_end, requested_start);
-  log_oops(buffer_start, buffer_end);
 }
 
-void AOTMapLogger::log_oops(address buffer_start, address buffer_end) {
+void AOTMapLogger::log_archived_objects(OopDataIterator* iter) {
   LogStreamHandle(Debug, aot, map) st;
   if (!st.is_enabled()) {
     return;
   }
 
   _roots = new GrowableArrayCHeap<FakeOop, mtClass>();
-  _num_obj_arrays_logged = 0;
 
-  for (address fop = buffer_start; fop < buffer_end; ) {
-    FakeOop fake_oop(fop);
-    st.print(PTR_FORMAT ": @@ Object ", p2i(fake_oop.requested_addr()));
-    print_oop_info_cr(&st, fake_oop, /*print_requested_addr=*/false);
+  // Roots that are not segmented
+  GrowableArrayCHeap<OopData, mtClass>* normal_roots = iter->roots();
+  for (int i = 0; i < normal_roots->length(); ++i) {
+    OopData data = normal_roots->at(i);
+    FakeOop fop(iter, data);
+    _roots->append(fop);
+    st.print(" root[%4d]: ", i);
+    print_oop_info_cr(&st, fop);
+  }
+
+  while (iter->has_next()) {
+    FakeOop fake_oop(iter, iter->next());
+    st.print(PTR_FORMAT ": @@ Object ", fake_oop.target_location());
+    print_oop_info_cr(&st, fake_oop, /*print_location=*/false);
 
     LogStreamHandle(Trace, aot, map, oops) trace_st;
     if (trace_st.is_enabled()) {
       print_oop_details(fake_oop, &trace_st);
     }
 
-    address next_fop = fop + fake_oop.size() * BytesPerWord;
-    log_as_hex(fop, next_fop, fake_oop.requested_addr(), /*is_heap=*/true);
-
-    fop = next_fop;
+    address fop = fake_oop.buffered_addr();
+    address end_fop = fop + fake_oop.size() * BytesPerWord;
+    log_as_hex(fop, end_fop, fake_oop.requested_addr(), /*is_heap=*/true);
   }
 
   delete _roots;
+  delete iter;
+  delete normal_roots;
 }
 
-void AOTMapLogger::print_oop_info_cr(outputStream* st, FakeOop fake_oop, bool print_requested_addr) {
+void AOTMapLogger::print_oop_info_cr(outputStream* st, FakeOop fake_oop, bool print_location) {
   if (fake_oop.is_null()) {
     st->print_cr("null");
   } else {
     ResourceMark rm;
     Klass* real_klass = fake_oop.real_klass();
-    address requested_addr = fake_oop.requested_addr();
-    if (print_requested_addr) {
-      st->print(PTR_FORMAT " ", p2i(requested_addr));
+    intptr_t target_location = fake_oop.target_location();
+    if (print_location) {
+      st->print(PTR_FORMAT " ", target_location);
     }
     if (UseCompressedOops) {
       st->print("(0x%08x) ", fake_oop.as_narrow_oop_value());
@@ -919,7 +901,8 @@ void AOTMapLogger::print_oop_info_cr(outputStream* st, FakeOop fake_oop, bool pr
 
       if (real_klass == vmClasses::String_klass()) {
         st->print(" ");
-        fake_oop.as_string().print_on(st);
+        FakeString fake_str = fake_oop.as_string();
+        fake_str.print_on(st);
       } else if (real_klass == vmClasses::Class_klass()) {
         fake_oop.as_mirror().print_class_signature_on(st);
       }
@@ -942,7 +925,7 @@ void AOTMapLogger::print_oop_details(FakeOop fake_oop, outputStream* st) {
     fake_oop.as_type_array().print_elements_on(st);
   } else if (real_klass->is_objArray_klass()) {
     FakeObjArray fake_obj_array = fake_oop.as_obj_array();
-    bool is_logging_root_segment = _num_obj_arrays_logged < _num_root_segments;
+    bool is_logging_root_segment = fake_oop.is_root_segment();
 
     for (int i = 0; i < fake_obj_array.length(); i++) {
       FakeOop elm = fake_obj_array.obj_at(i);
@@ -954,7 +937,6 @@ void AOTMapLogger::print_oop_details(FakeOop fake_oop, outputStream* st) {
       }
       print_oop_info_cr(st, elm);
     }
-    _num_obj_arrays_logged ++;
   } else {
     st->print_cr(" - fields (%zu words):", fake_oop.size());
 
diff --git a/src/hotspot/share/cds/aotMapLogger.hpp b/src/hotspot/share/cds/aotMapLogger.hpp
index dce857b0850..ba188514861 100644
--- a/src/hotspot/share/cds/aotMapLogger.hpp
+++ b/src/hotspot/share/cds/aotMapLogger.hpp
@@ -32,7 +32,8 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
 
-class ArchiveHeapInfo;
+class ArchiveMappedHeapInfo;
+class ArchiveStreamedHeapInfo;
 class CompileTrainingData;
 class DumpRegion;
 class FileMapInfo;
@@ -64,6 +65,7 @@ class AOTMapLogger : AllStatic {
     MetaspaceObj::Type _type;
   };
 
+public:
   // FakeOop and subtypes
   class FakeOop;
   class   FakeMirror;
@@ -71,15 +73,48 @@ class AOTMapLogger : AllStatic {
   class   FakeString;
   class   FakeTypeArray;
 
+#if INCLUDE_CDS_JAVA_HEAP
+  struct OopData {
+    address _buffered_addr;
+    address _requested_addr;
+    intptr_t _target_location;
+    uint32_t _narrow_location;
+    oopDesc* _raw_oop;
+    Klass* _klass;
+    size_t _size;
+    bool _is_root_segment;
+  };
+
+  class OopDataIterator : public CHeapObj<mtClassShared> {
+  protected:
+    OopData null_data() {
+      return { nullptr,
+               nullptr,
+               0,
+               0,
+               nullptr,
+               nullptr,
+               0,
+               false };
+    }
+
+  public:
+    virtual bool has_next() = 0;
+    virtual OopData next() = 0;
+    virtual OopData obj_at(narrowOop* p) = 0;
+    virtual OopData obj_at(oop* p) = 0;
+    virtual GrowableArrayCHeap<OopData, mtClass>* roots() = 0;
+    virtual ~OopDataIterator() {}
+  };
+#endif
+
+private:
   class RequestedMetadataAddr;
   class RuntimeGatherArchivedMetaspaceObjs;
 
   static bool _is_logging_at_bootstrap;
   static bool _is_runtime_logging;
-  static size_t _num_root_segments;
-  static size_t _num_obj_arrays_logged;
   static GrowableArrayCHeap<FakeOop, mtClass>* _roots;
-  static ArchiveHeapInfo* _dumptime_heap_info;
 
   static intx _buffer_to_requested_delta;
   static intx _requested_to_mapped_metadata_delta;
@@ -114,12 +149,14 @@ class AOTMapLogger : AllStatic {
 
 
 #if INCLUDE_CDS_JAVA_HEAP
-  static void dumptime_log_heap_region(ArchiveHeapInfo* heap_info);
+  static void dumptime_log_mapped_heap_region(ArchiveMappedHeapInfo* mapped_heap_info);
+  static void dumptime_log_streamed_heap_region(ArchiveStreamedHeapInfo* streamed_heap_info);
   static void runtime_log_heap_region(FileMapInfo* mapinfo);
 
-  static void print_oop_info_cr(outputStream* st, FakeOop fake_oop, bool print_requested_addr = true);
+  static void print_oop_info_cr(outputStream* st, FakeOop fake_oop, bool print_location = true);
   static void print_oop_details(FakeOop fake_oop, outputStream* st);
-  static void log_oops(address buf_start, address buf_end);
+  static void log_mapped_oops(address buf_start, address buf_end);
+  static void log_archived_objects(OopDataIterator* iter);
   class ArchivedFieldPrinter; // to be replaced by ArchivedFieldPrinter2
 #endif
 
@@ -128,7 +165,7 @@ public:
   static bool is_logging_at_bootstrap() { return _is_logging_at_bootstrap; }
 
   static void dumptime_log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
-                           ArchiveHeapInfo* heap_info,
+                           ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info,
                            char* bitmap, size_t bitmap_size_in_bytes);
   static void runtime_log(FileMapInfo* static_mapinfo, FileMapInfo* dynamic_mapinfo);
 };
diff --git a/src/hotspot/share/cds/aotMappedHeapLoader.cpp b/src/hotspot/share/cds/aotMappedHeapLoader.cpp
new file mode 100644
index 00000000000..84051cbd9e5
--- /dev/null
+++ b/src/hotspot/share/cds/aotMappedHeapLoader.cpp
@@ -0,0 +1,847 @@
+/*
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotLogging.hpp"
+#include "cds/aotMappedHeapLoader.inline.hpp"
+#include "cds/aotMappedHeapWriter.hpp"
+#include "cds/aotMetaspace.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "classfile/classLoaderDataShared.hpp"
+#include "classfile/stringTable.hpp"
+#include "classfile/systemDictionaryShared.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "logging/log.hpp"
+#include "logging/logMessage.hpp"
+#include "logging/logStream.hpp"
+#include "logging/logTag.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/iterator.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "sanitizers/ub.hpp"
+#include "utilities/bitMap.inline.hpp"
+#include "utilities/copy.hpp"
+#if INCLUDE_G1GC
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
+#endif
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+bool AOTMappedHeapLoader::_is_mapped = false;
+bool AOTMappedHeapLoader::_is_loaded = false;
+
+bool    AOTMappedHeapLoader::_narrow_oop_base_initialized = false;
+address AOTMappedHeapLoader::_narrow_oop_base;
+int     AOTMappedHeapLoader::_narrow_oop_shift;
+
+// Support for loaded heap.
+uintptr_t AOTMappedHeapLoader::_loaded_heap_bottom = 0;
+uintptr_t AOTMappedHeapLoader::_loaded_heap_top = 0;
+uintptr_t AOTMappedHeapLoader::_dumptime_base = UINTPTR_MAX;
+uintptr_t AOTMappedHeapLoader::_dumptime_top = 0;
+intx AOTMappedHeapLoader::_runtime_offset = 0;
+bool AOTMappedHeapLoader::_loading_failed = false;
+
+// Support for mapped heap.
+uintptr_t AOTMappedHeapLoader::_mapped_heap_bottom = 0;
+bool      AOTMappedHeapLoader::_mapped_heap_relocation_initialized = false;
+ptrdiff_t AOTMappedHeapLoader::_mapped_heap_delta = 0;
+
+// Heap roots
+GrowableArrayCHeap<OopHandle, mtClassShared>* AOTMappedHeapLoader::_root_segments = nullptr;
+int AOTMappedHeapLoader::_root_segment_max_size_elems;
+
+MemRegion AOTMappedHeapLoader::_mapped_heap_memregion;
+bool AOTMappedHeapLoader::_heap_pointers_need_patching;
+
+// Every mapped region is offset by _mapped_heap_delta from its requested address.
+// See FileMapInfo::heap_region_requested_address().
+ATTRIBUTE_NO_UBSAN
+void AOTMappedHeapLoader::init_mapped_heap_info(address mapped_heap_bottom, ptrdiff_t delta, int dumptime_oop_shift) {
+  assert(!_mapped_heap_relocation_initialized, "only once");
+  if (!UseCompressedOops) {
+    assert(dumptime_oop_shift == 0, "sanity");
+  }
+  assert(can_map(), "sanity");
+  init_narrow_oop_decoding(CompressedOops::base() + delta, dumptime_oop_shift);
+  _mapped_heap_bottom = (intptr_t)mapped_heap_bottom;
+  _mapped_heap_delta = delta;
+  _mapped_heap_relocation_initialized = true;
+}
+
+void AOTMappedHeapLoader::init_narrow_oop_decoding(address base, int shift) {
+  assert(!_narrow_oop_base_initialized, "only once");
+  _narrow_oop_base_initialized = true;
+  _narrow_oop_base = base;
+  _narrow_oop_shift = shift;
+}
+
+void AOTMappedHeapLoader::fixup_region() {
+  FileMapInfo* mapinfo = FileMapInfo::current_info();
+  if (is_mapped()) {
+    fixup_mapped_heap_region(mapinfo);
+  } else if (_loading_failed) {
+    fill_failed_loaded_heap();
+  }
+}
+
+// ------------------ Support for Region MAPPING -----------------------------------------
+
+// Patch all the embedded oop pointers inside an archived heap region,
+// to be consistent with the runtime oop encoding.
+class PatchCompressedEmbeddedPointers: public BitMapClosure {
+  narrowOop* _start;
+
+ public:
+  PatchCompressedEmbeddedPointers(narrowOop* start) : _start(start) {}
+
+  bool do_bit(size_t offset) {
+    narrowOop* p = _start + offset;
+    narrowOop v = *p;
+    assert(!CompressedOops::is_null(v), "null oops should have been filtered out at dump time");
+    oop o = AOTMappedHeapLoader::decode_from_mapped_archive(v);
+    RawAccess<IS_NOT_NULL>::oop_store(p, o);
+    return true;
+  }
+};
+
+class PatchCompressedEmbeddedPointersQuick: public BitMapClosure {
+  narrowOop* _start;
+  uint32_t _delta;
+
+ public:
+  PatchCompressedEmbeddedPointersQuick(narrowOop* start, uint32_t delta) : _start(start), _delta(delta) {}
+
+  bool do_bit(size_t offset) {
+    narrowOop* p = _start + offset;
+    narrowOop v = *p;
+    assert(!CompressedOops::is_null(v), "null oops should have been filtered out at dump time");
+    narrowOop new_v = CompressedOops::narrow_oop_cast(CompressedOops::narrow_oop_value(v) + _delta);
+    assert(!CompressedOops::is_null(new_v), "should never relocate to narrowOop(0)");
+#ifdef ASSERT
+    oop o1 = AOTMappedHeapLoader::decode_from_mapped_archive(v);
+    oop o2 = CompressedOops::decode_not_null(new_v);
+    assert(o1 == o2, "quick delta must work");
+#endif
+    RawAccess<IS_NOT_NULL>::oop_store(p, new_v);
+    return true;
+  }
+};
+
+class PatchUncompressedEmbeddedPointers: public BitMapClosure {
+  oop* _start;
+  intptr_t _delta;
+
+ public:
+  PatchUncompressedEmbeddedPointers(oop* start, intx runtime_offset) :
+    _start(start),
+    _delta(runtime_offset) {}
+
+  PatchUncompressedEmbeddedPointers(oop* start) :
+    _start(start),
+    _delta(AOTMappedHeapLoader::mapped_heap_delta()) {}
+
+  bool do_bit(size_t offset) {
+    oop* p = _start + offset;
+    intptr_t dumptime_oop = (intptr_t)((void*)*p);
+    assert(dumptime_oop != 0, "null oops should have been filtered out at dump time");
+    intptr_t runtime_oop = dumptime_oop + _delta;
+    RawAccess<IS_NOT_NULL>::oop_store(p, cast_to_oop(runtime_oop));
+    return true;
+  }
+};
+
+void AOTMappedHeapLoader::patch_compressed_embedded_pointers(BitMapView bm,
+                                                             FileMapInfo* info,
+                                                             MemRegion region) {
+  narrowOop dt_encoded_bottom = encoded_heap_region_dumptime_address(info);
+  narrowOop rt_encoded_bottom = CompressedOops::encode_not_null(cast_to_oop(region.start()));
+  log_info(aot)("patching heap embedded pointers: narrowOop 0x%8x -> 0x%8x",
+                  (uint)dt_encoded_bottom, (uint)rt_encoded_bottom);
+
+  // Optimization: if dumptime shift is the same as runtime shift, we can perform a
+  // quick conversion from "dumptime narrowOop" -> "runtime narrowOop".
+  narrowOop* patching_start = (narrowOop*)region.start() + FileMapInfo::current_info()->mapped_heap()->oopmap_start_pos();
+  if (_narrow_oop_shift == CompressedOops::shift()) {
+    uint32_t quick_delta = (uint32_t)rt_encoded_bottom - (uint32_t)dt_encoded_bottom;
+    log_info(aot)("heap data relocation quick delta = 0x%x", quick_delta);
+    if (quick_delta == 0) {
+      log_info(aot)("heap data relocation unnecessary, quick_delta = 0");
+    } else {
+      PatchCompressedEmbeddedPointersQuick patcher(patching_start, quick_delta);
+      bm.iterate(&patcher);
+    }
+  } else {
+    log_info(aot)("heap data quick relocation not possible");
+    PatchCompressedEmbeddedPointers patcher(patching_start);
+    bm.iterate(&patcher);
+  }
+}
+
+// Patch all the non-null pointers that are embedded in the archived heap objects
+// in this (mapped) region
+void AOTMappedHeapLoader::patch_embedded_pointers(FileMapInfo* info,
+                                                  MemRegion region, address oopmap,
+                                                  size_t oopmap_size_in_bits) {
+  BitMapView bm((BitMap::bm_word_t*)oopmap, oopmap_size_in_bits);
+  if (UseCompressedOops) {
+    patch_compressed_embedded_pointers(bm, info, region);
+  } else {
+    PatchUncompressedEmbeddedPointers patcher((oop*)region.start() + FileMapInfo::current_info()->mapped_heap()->oopmap_start_pos());
+    bm.iterate(&patcher);
+  }
+}
+
+// ------------------ Support for Region LOADING -----------------------------------------
+
+// The CDS archive remembers each heap object by its address at dump time, but
+// the heap object may be loaded at a different address at run time. This structure is used
+// to translate the dump time addresses for all objects in FileMapInfo::space_at(region_index)
+// to their runtime addresses.
+struct LoadedArchiveHeapRegion {
+  int       _region_index;   // index for FileMapInfo::space_at(index)
+  size_t    _region_size;    // number of bytes in this region
+  uintptr_t _dumptime_base;  // The dump-time (decoded) address of the first object in this region
+  intx      _runtime_offset; // If an object's dump time address P is within in this region, its
+                             // runtime address is P + _runtime_offset
+  uintptr_t top() {
+    return _dumptime_base + _region_size;
+  }
+};
+
+void AOTMappedHeapLoader::init_loaded_heap_relocation(LoadedArchiveHeapRegion* loaded_region) {
+  _dumptime_base = loaded_region->_dumptime_base;
+  _dumptime_top = loaded_region->top();
+  _runtime_offset = loaded_region->_runtime_offset;
+}
+
+bool AOTMappedHeapLoader::can_load() {
+  return Universe::heap()->can_load_archived_objects();
+}
+
+class AOTMappedHeapLoader::PatchLoadedRegionPointers: public BitMapClosure {
+  narrowOop* _start;
+  intx _offset;
+  uintptr_t _base;
+  uintptr_t _top;
+
+ public:
+  PatchLoadedRegionPointers(narrowOop* start, LoadedArchiveHeapRegion* loaded_region)
+    : _start(start),
+      _offset(loaded_region->_runtime_offset),
+      _base(loaded_region->_dumptime_base),
+      _top(loaded_region->top()) {}
+
+  bool do_bit(size_t offset) {
+    assert(UseCompressedOops, "PatchLoadedRegionPointers for uncompressed oops is unimplemented");
+    narrowOop* p = _start + offset;
+    narrowOop v = *p;
+    assert(!CompressedOops::is_null(v), "null oops should have been filtered out at dump time");
+    uintptr_t o = cast_from_oop<uintptr_t>(AOTMappedHeapLoader::decode_from_archive(v));
+    assert(_base <= o && o < _top, "must be");
+
+    o += _offset;
+    AOTMappedHeapLoader::assert_in_loaded_heap(o);
+    RawAccess<IS_NOT_NULL>::oop_store(p, cast_to_oop(o));
+    return true;
+  }
+};
+
+bool AOTMappedHeapLoader::init_loaded_region(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
+                                             MemRegion& archive_space) {
+  size_t total_bytes = 0;
+  FileMapRegion* r = mapinfo->region_at(AOTMetaspace::hp);
+  r->assert_is_heap_region();
+  if (r->used() == 0) {
+    return false;
+  }
+
+  assert(is_aligned(r->used(), HeapWordSize), "must be");
+  total_bytes += r->used();
+  loaded_region->_region_index = AOTMetaspace::hp;
+  loaded_region->_region_size = r->used();
+  loaded_region->_dumptime_base = (uintptr_t)heap_region_dumptime_address(mapinfo);
+
+  assert(is_aligned(total_bytes, HeapWordSize), "must be");
+  size_t word_size = total_bytes / HeapWordSize;
+  HeapWord* buffer = Universe::heap()->allocate_loaded_archive_space(word_size);
+  if (buffer == nullptr) {
+    return false;
+  }
+
+  archive_space = MemRegion(buffer, word_size);
+  _loaded_heap_bottom = (uintptr_t)archive_space.start();
+  _loaded_heap_top    = _loaded_heap_bottom + total_bytes;
+
+  loaded_region->_runtime_offset = _loaded_heap_bottom - loaded_region->_dumptime_base;
+
+  return true;
+}
+
+bool AOTMappedHeapLoader::load_heap_region_impl(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
+                                                uintptr_t load_address) {
+  uintptr_t bitmap_base = (uintptr_t)mapinfo->map_bitmap_region();
+  if (bitmap_base == 0) {
+    _loading_failed = true;
+    return false; // OOM or CRC error
+  }
+
+  FileMapRegion* r = mapinfo->region_at(loaded_region->_region_index);
+  if (!mapinfo->read_region(loaded_region->_region_index, (char*)load_address, r->used(), /* do_commit = */ false)) {
+    // There's no easy way to free the buffer, so we will fill it with zero later
+    // in fill_failed_loaded_heap(), and it will eventually be GC'ed.
+    log_warning(aot)("Loading of heap region %d has failed. Archived objects are disabled", loaded_region->_region_index);
+    _loading_failed = true;
+    return false;
+  }
+  assert(r->mapped_base() == (char*)load_address, "sanity");
+  log_info(aot)("Loaded heap    region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT
+                " size %6zu delta %zd",
+                loaded_region->_region_index, load_address, load_address + loaded_region->_region_size,
+                loaded_region->_region_size, loaded_region->_runtime_offset);
+
+  uintptr_t oopmap = bitmap_base + r->oopmap_offset();
+  BitMapView bm((BitMap::bm_word_t*)oopmap, r->oopmap_size_in_bits());
+
+  if (UseCompressedOops) {
+    PatchLoadedRegionPointers patcher((narrowOop*)load_address + FileMapInfo::current_info()->mapped_heap()->oopmap_start_pos(), loaded_region);
+    bm.iterate(&patcher);
+  } else {
+    PatchUncompressedEmbeddedPointers patcher((oop*)load_address + FileMapInfo::current_info()->mapped_heap()->oopmap_start_pos(), loaded_region->_runtime_offset);
+    bm.iterate(&patcher);
+  }
+  return true;
+}
+
+bool AOTMappedHeapLoader::load_heap_region(FileMapInfo* mapinfo) {
+  assert(can_load(), "loaded heap for must be supported");
+  init_narrow_oop_decoding(mapinfo->narrow_oop_base(), mapinfo->narrow_oop_shift());
+
+  LoadedArchiveHeapRegion loaded_region;
+  memset(&loaded_region, 0, sizeof(loaded_region));
+
+  MemRegion archive_space;
+  if (!init_loaded_region(mapinfo, &loaded_region, archive_space)) {
+    return false;
+  }
+
+  if (!load_heap_region_impl(mapinfo, &loaded_region, (uintptr_t)archive_space.start())) {
+    assert(_loading_failed, "must be");
+    return false;
+  }
+
+  init_loaded_heap_relocation(&loaded_region);
+  _is_loaded = true;
+
+  return true;
+}
+
+objArrayOop AOTMappedHeapLoader::root_segment(int segment_idx) {
+  if (CDSConfig::is_dumping_heap()) {
+    assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
+  } else {
+    assert(CDSConfig::is_using_archive(), "must be");
+  }
+
+  objArrayOop segment = (objArrayOop)_root_segments->at(segment_idx).resolve();
+  assert(segment != nullptr, "should have been initialized");
+  return segment;
+}
+
+void AOTMappedHeapLoader::get_segment_indexes(int idx, int& seg_idx, int& int_idx) {
+  assert(_root_segment_max_size_elems > 0, "sanity");
+
+  // Try to avoid divisions for the common case.
+  if (idx < _root_segment_max_size_elems) {
+    seg_idx = 0;
+    int_idx = idx;
+  } else {
+    seg_idx = idx / _root_segment_max_size_elems;
+    int_idx = idx % _root_segment_max_size_elems;
+  }
+
+  assert(idx == seg_idx * _root_segment_max_size_elems + int_idx,
+         "sanity: %d index maps to %d segment and %d internal", idx, seg_idx, int_idx);
+}
+
+void AOTMappedHeapLoader::add_root_segment(objArrayOop segment_oop) {
+  assert(segment_oop != nullptr, "must be");
+  assert(is_in_use(), "must be");
+  if (_root_segments == nullptr) {
+    _root_segments = new GrowableArrayCHeap<OopHandle, mtClassShared>(10);
+  }
+  _root_segments->push(OopHandle(Universe::vm_global(), segment_oop));
+}
+
+void AOTMappedHeapLoader::init_root_segment_sizes(int max_size_elems) {
+  _root_segment_max_size_elems = max_size_elems;
+}
+
+oop AOTMappedHeapLoader::get_root(int index) {
+  assert(!_root_segments->is_empty(), "must have loaded shared heap");
+  int seg_idx, int_idx;
+  get_segment_indexes(index, seg_idx, int_idx);
+  objArrayOop result = objArrayOop(root_segment(seg_idx));
+  return result->obj_at(int_idx);
+}
+
+void AOTMappedHeapLoader::clear_root(int index) {
+  int seg_idx, int_idx;
+  get_segment_indexes(index, seg_idx, int_idx);
+  root_segment(seg_idx)->obj_at_put(int_idx, nullptr);
+}
+
+class VerifyLoadedHeapEmbeddedPointers: public BasicOopIterateClosure {
+  HashTable<uintptr_t, bool>* _table;
+
+ public:
+  VerifyLoadedHeapEmbeddedPointers(HashTable<uintptr_t, bool>* table) : _table(table) {}
+
+  virtual void do_oop(narrowOop* p) {
+    // This should be called before the loaded region is modified, so all the embedded pointers
+    // must be null, or must point to a valid object in the loaded region.
+    narrowOop v = *p;
+    if (!CompressedOops::is_null(v)) {
+      oop o = CompressedOops::decode_not_null(v);
+      uintptr_t u = cast_from_oop<uintptr_t>(o);
+      AOTMappedHeapLoader::assert_in_loaded_heap(u);
+      guarantee(_table->contains(u), "must point to beginning of object in loaded archived region");
+    }
+  }
+  virtual void do_oop(oop* p) {
+    oop v = *p;
+    if(v != nullptr) {
+      uintptr_t u = cast_from_oop<uintptr_t>(v);
+      AOTMappedHeapLoader::assert_in_loaded_heap(u);
+      guarantee(_table->contains(u), "must point to beginning of object in loaded archived region");
+    }
+  }
+};
+
+void AOTMappedHeapLoader::finish_initialization(FileMapInfo* info) {
+  patch_heap_embedded_pointers(info);
+
+  if (is_loaded()) {
+    // These operations are needed only when the heap is loaded (not mapped).
+    finish_loaded_heap();
+    if (VerifyArchivedFields > 0) {
+      verify_loaded_heap();
+    }
+  }
+  if (is_in_use()) {
+    patch_native_pointers();
+    intptr_t bottom = is_loaded() ? _loaded_heap_bottom : _mapped_heap_bottom;
+
+    // The heap roots are stored in one or more segments that are laid out consecutively.
+    // The size of each segment (except for the last one) is max_size_in_{elems,bytes}.
+    HeapRootSegments segments = FileMapInfo::current_info()->mapped_heap()->root_segments();
+    init_root_segment_sizes(segments.max_size_in_elems());
+    intptr_t first_segment_addr = bottom + segments.base_offset();
+    for (size_t c = 0; c < segments.count(); c++) {
+      oop segment_oop = cast_to_oop(first_segment_addr + (c * segments.max_size_in_bytes()));
+      assert(segment_oop->is_objArray(), "Must be");
+      add_root_segment((objArrayOop)segment_oop);
+    }
+
+    StringTable::load_shared_strings_array();
+  }
+}
+
+void AOTMappedHeapLoader::finish_loaded_heap() {
+  HeapWord* bottom = (HeapWord*)_loaded_heap_bottom;
+  HeapWord* top    = (HeapWord*)_loaded_heap_top;
+
+  MemRegion archive_space = MemRegion(bottom, top);
+  Universe::heap()->complete_loaded_archive_space(archive_space);
+}
+
+void AOTMappedHeapLoader::verify_loaded_heap() {
+  log_info(aot, heap)("Verify all oops and pointers in loaded heap");
+
+  ResourceMark rm;
+  HashTable<uintptr_t, bool> table;
+  VerifyLoadedHeapEmbeddedPointers verifier(&table);
+  HeapWord* bottom = (HeapWord*)_loaded_heap_bottom;
+  HeapWord* top    = (HeapWord*)_loaded_heap_top;
+
+  for (HeapWord* p = bottom; p < top; ) {
+    oop o = cast_to_oop(p);
+    table.put(cast_from_oop<uintptr_t>(o), true);
+    p += o->size();
+  }
+
+  for (HeapWord* p = bottom; p < top; ) {
+    oop o = cast_to_oop(p);
+    o->oop_iterate(&verifier);
+    p += o->size();
+  }
+}
+
+void AOTMappedHeapLoader::fill_failed_loaded_heap() {
+  assert(_loading_failed, "must be");
+  if (_loaded_heap_bottom != 0) {
+    assert(_loaded_heap_top != 0, "must be");
+    HeapWord* bottom = (HeapWord*)_loaded_heap_bottom;
+    HeapWord* top = (HeapWord*)_loaded_heap_top;
+    Universe::heap()->fill_with_objects(bottom, top - bottom);
+  }
+}
+
+class PatchNativePointers: public BitMapClosure {
+  Metadata** _start;
+
+ public:
+  PatchNativePointers(Metadata** start) : _start(start) {}
+
+  bool do_bit(size_t offset) {
+    Metadata** p = _start + offset;
+    *p = (Metadata*)(address(*p) + AOTMetaspace::relocation_delta());
+    return true;
+  }
+};
+
+void AOTMappedHeapLoader::patch_native_pointers() {
+  if (AOTMetaspace::relocation_delta() == 0) {
+    return;
+  }
+
+  FileMapRegion* r = FileMapInfo::current_info()->region_at(AOTMetaspace::hp);
+  if (r->mapped_base() != nullptr && r->has_ptrmap()) {
+    log_info(aot, heap)("Patching native pointers in heap region");
+    BitMapView bm = FileMapInfo::current_info()->ptrmap_view(AOTMetaspace::hp);
+    PatchNativePointers patcher((Metadata**)r->mapped_base() + FileMapInfo::current_info()->mapped_heap()->ptrmap_start_pos());
+    bm.iterate(&patcher);
+  }
+}
+
+// The actual address of this region during dump time.
+address AOTMappedHeapLoader::heap_region_dumptime_address(FileMapInfo* info) {
+  FileMapRegion* r = info->region_at(AOTMetaspace::hp);
+  assert(CDSConfig::is_using_archive(), "runtime only");
+  assert(is_aligned(r->mapping_offset(), sizeof(HeapWord)), "must be");
+  if (UseCompressedOops) {
+    return /*dumptime*/ (address)((uintptr_t)info->narrow_oop_base() + r->mapping_offset());
+  } else {
+    return heap_region_requested_address(info);
+  }
+}
+
+// The address where this region can be mapped into the runtime heap without
+// patching any of the pointers that are embedded in this region.
+address AOTMappedHeapLoader::heap_region_requested_address(FileMapInfo* info) {
+  assert(CDSConfig::is_using_archive(), "runtime only");
+  FileMapRegion* r = info->region_at(AOTMetaspace::hp);
+  assert(is_aligned(r->mapping_offset(), sizeof(HeapWord)), "must be");
+  assert(can_use(), "cannot be used by AOTMappedHeapLoader::can_load() mode");
+  if (UseCompressedOops) {
+    // We can avoid relocation if each region's offset from the runtime CompressedOops::base()
+    // is the same as its offset from the CompressedOops::base() during dumptime.
+    // Note that CompressedOops::base() may be different between dumptime and runtime.
+    //
+    // Example:
+    // Dumptime base = 0x1000 and shift is 0. We have a region at address 0x2000. There's a
+    // narrowOop P stored in this region that points to an object at address 0x2200.
+    // P's encoded value is 0x1200.
+    //
+    // Runtime base = 0x4000 and shift is also 0. If we map this region at 0x5000, then
+    // the value P can remain 0x1200. The decoded address = (0x4000 + (0x1200 << 0)) = 0x5200,
+    // which is the runtime location of the referenced object.
+    return /*runtime*/ (address)((uintptr_t)CompressedOops::base() + r->mapping_offset());
+  } else {
+    // This was the hard-coded requested base address used at dump time. With uncompressed oops,
+    // the heap range is assigned by the OS so we will most likely have to relocate anyway, no matter
+    // what base address was picked at duump time.
+    return (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
+  }
+}
+
+bool AOTMappedHeapLoader::map_heap_region(FileMapInfo* info) {
+  if (map_heap_region_impl(info)) {
+#ifdef ASSERT
+    // The "old" regions must be parsable -- we cannot have any unused space
+    // at the start of the lowest G1 region that contains archived objects.
+    assert(is_aligned(_mapped_heap_memregion.start(), G1HeapRegion::GrainBytes), "must be");
+
+    // Make sure we map at the very top of the heap - see comments in
+    // init_heap_region_relocation().
+    MemRegion heap_range = G1CollectedHeap::heap()->reserved();
+    assert(heap_range.contains(_mapped_heap_memregion), "must be");
+
+    address heap_end = (address)heap_range.end();
+    address mapped_heap_region_end = (address)_mapped_heap_memregion.end();
+    assert(heap_end >= mapped_heap_region_end, "must be");
+    assert(heap_end - mapped_heap_region_end < (intx)(G1HeapRegion::GrainBytes),
+           "must be at the top of the heap to avoid fragmentation");
+#endif
+
+    set_mapped();
+    return true;
+  } else {
+    return false;
+  }
+}
+
+bool AOTMappedHeapLoader::map_heap_region_impl(FileMapInfo* info) {
+  assert(UseG1GC, "the following code assumes G1");
+
+  FileMapRegion* r = info->region_at(AOTMetaspace::hp);
+  size_t size = r->used();
+  if (size == 0) {
+    return false; // no archived java heap data
+  }
+
+  size_t word_size = size / HeapWordSize;
+  address requested_start = heap_region_requested_address(info);
+
+  aot_log_info(aot)("Preferred address to map heap data (to avoid relocation) is " INTPTR_FORMAT, p2i(requested_start));
+
+  // allocate from java heap
+  HeapWord* start = G1CollectedHeap::heap()->alloc_archive_region(word_size, (HeapWord*)requested_start);
+  if (start == nullptr) {
+    AOTMetaspace::report_loading_error("UseSharedSpaces: Unable to allocate java heap region for archive heap.");
+    return false;
+  }
+
+  _mapped_heap_memregion = MemRegion(start, word_size);
+
+  // Map the archived heap data. No need to call MemTracker::record_virtual_memory_tag()
+  // for mapped region as it is part of the reserved java heap, which is already recorded.
+  char* addr = (char*)_mapped_heap_memregion.start();
+  char* base;
+
+  if (AOTMetaspace::use_windows_memory_mapping() || UseLargePages) {
+    // With UseLargePages, memory mapping may fail on some OSes if the size is not
+    // large page aligned, so let's use read() instead. In this case, the memory region
+    // is already commited by G1 so we don't need to commit it again.
+    if (!info->read_region(AOTMetaspace::hp, addr,
+                           align_up(_mapped_heap_memregion.byte_size(), os::vm_page_size()),
+                           /* do_commit = */ !UseLargePages)) {
+      dealloc_heap_region(info);
+      aot_log_error(aot)("Failed to read archived heap region into " INTPTR_FORMAT, p2i(addr));
+      return false;
+    }
+    // Checks for VerifySharedSpaces is already done inside read_region()
+    base = addr;
+  } else {
+    base = info->map_heap_region(r, addr, _mapped_heap_memregion.byte_size());
+    if (base == nullptr || base != addr) {
+      dealloc_heap_region(info);
+      AOTMetaspace::report_loading_error("UseSharedSpaces: Unable to map at required address in java heap. "
+                                            INTPTR_FORMAT ", size = %zu bytes",
+                                            p2i(addr), _mapped_heap_memregion.byte_size());
+      return false;
+    }
+
+    if (VerifySharedSpaces && !r->check_region_crc(base)) {
+      dealloc_heap_region(info);
+      AOTMetaspace::report_loading_error("UseSharedSpaces: mapped heap region is corrupt");
+      return false;
+    }
+  }
+
+  r->set_mapped_base(base);
+
+  // If the requested range is different from the range allocated by GC, then
+  // the pointers need to be patched.
+  address mapped_start = (address) _mapped_heap_memregion.start();
+  ptrdiff_t delta = mapped_start - requested_start;
+  if (UseCompressedOops &&
+      (info->narrow_oop_mode() != CompressedOops::mode() ||
+       info->narrow_oop_shift() != CompressedOops::shift())) {
+    _heap_pointers_need_patching = true;
+  }
+  if (delta != 0) {
+    _heap_pointers_need_patching = true;
+  }
+  init_mapped_heap_info(mapped_start, delta, info->narrow_oop_shift());
+
+  if (_heap_pointers_need_patching) {
+    char* bitmap_base = info->map_bitmap_region();
+    if (bitmap_base == nullptr) {
+      AOTMetaspace::report_loading_error("CDS heap cannot be used because bitmap region cannot be mapped");
+      dealloc_heap_region(info);
+      _heap_pointers_need_patching = false;
+      return false;
+    }
+  }
+  aot_log_info(aot)("Heap data mapped at " INTPTR_FORMAT ", size = %8zu bytes",
+                p2i(mapped_start), _mapped_heap_memregion.byte_size());
+  aot_log_info(aot)("CDS heap data relocation delta = %zd bytes", delta);
+  return true;
+}
+
+narrowOop AOTMappedHeapLoader::encoded_heap_region_dumptime_address(FileMapInfo* info) {
+  assert(CDSConfig::is_using_archive(), "runtime only");
+  assert(UseCompressedOops, "sanity");
+  FileMapRegion* r = info->region_at(AOTMetaspace::hp);
+  return CompressedOops::narrow_oop_cast(r->mapping_offset() >> info->narrow_oop_shift());
+}
+
+void AOTMappedHeapLoader::patch_heap_embedded_pointers(FileMapInfo* info) {
+  if (!info->is_mapped() || !_heap_pointers_need_patching) {
+    return;
+  }
+
+  char* bitmap_base = info->map_bitmap_region();
+  assert(bitmap_base != nullptr, "must have already been mapped");
+
+  FileMapRegion* r = info->region_at(AOTMetaspace::hp);
+  patch_embedded_pointers(
+      info, _mapped_heap_memregion,
+      (address)(info->region_at(AOTMetaspace::bm)->mapped_base()) + r->oopmap_offset(),
+      r->oopmap_size_in_bits());
+}
+
+void AOTMappedHeapLoader::fixup_mapped_heap_region(FileMapInfo* info) {
+  if (is_mapped()) {
+    assert(!_mapped_heap_memregion.is_empty(), "sanity");
+
+    // Populate the archive regions' G1BlockOffsetTables. That ensures
+    // fast G1BlockOffsetTable::block_start operations for any given address
+    // within the archive regions when trying to find start of an object
+    // (e.g. during card table scanning).
+    G1CollectedHeap::heap()->populate_archive_regions_bot(_mapped_heap_memregion);
+  }
+}
+
+// dealloc the archive regions from java heap
+void AOTMappedHeapLoader::dealloc_heap_region(FileMapInfo* info) {
+  G1CollectedHeap::heap()->dealloc_archive_regions(_mapped_heap_memregion);
+}
+
+AOTMapLogger::OopDataIterator* AOTMappedHeapLoader::oop_iterator(FileMapInfo* info, address buffer_start, address buffer_end) {
+  class MappedLoaderOopIterator : public AOTMapLogger::OopDataIterator {
+  private:
+    address _current;
+    address _next;
+
+    address _buffer_start;
+    address _buffer_end;
+    uint64_t _buffer_start_narrow_oop;
+    intptr_t _buffer_to_requested_delta;
+    int _requested_shift;
+
+    size_t _num_root_segments;
+    size_t _num_obj_arrays_logged;
+
+  public:
+    MappedLoaderOopIterator(address buffer_start,
+                            address buffer_end,
+                            uint64_t buffer_start_narrow_oop,
+                            intptr_t buffer_to_requested_delta,
+                            int requested_shift,
+                            size_t num_root_segments)
+      : _current(nullptr),
+        _next(buffer_start),
+        _buffer_start(buffer_start),
+        _buffer_end(buffer_end),
+        _buffer_start_narrow_oop(buffer_start_narrow_oop),
+        _buffer_to_requested_delta(buffer_to_requested_delta),
+        _requested_shift(requested_shift),
+        _num_root_segments(num_root_segments),
+        _num_obj_arrays_logged(0) {
+    }
+
+
+    AOTMapLogger::OopData capture(address buffered_addr) {
+      oopDesc* raw_oop = (oopDesc*)buffered_addr;
+      size_t size = raw_oop->size();
+      address requested_addr = buffered_addr + _buffer_to_requested_delta;
+      intptr_t target_location = intptr_t(requested_addr);
+      uint64_t pd = (uint64_t)(pointer_delta(buffered_addr, _buffer_start, 1));
+      uint32_t narrow_location = checked_cast<uint32_t>(_buffer_start_narrow_oop + (pd >> _requested_shift));
+      Klass* klass = raw_oop->klass();
+
+      return { buffered_addr,
+               requested_addr,
+               target_location,
+               narrow_location,
+               raw_oop,
+               klass,
+               size,
+               false };
+    }
+
+    bool has_next() override {
+      return _next < _buffer_end;
+    }
+
+    AOTMapLogger::OopData next() override {
+      _current = _next;
+      AOTMapLogger::OopData result = capture(_current);
+      if (result._klass->is_objArray_klass()) {
+        result._is_root_segment = _num_obj_arrays_logged++ < _num_root_segments;
+      }
+      _next = _current + result._size * BytesPerWord;
+      return result;
+    }
+
+    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
+      uint64_t n = (uint64_t)(*addr);
+      if (n == 0) {
+        return null_data();
+      } else {
+        precond(n >= _buffer_start_narrow_oop);
+        address buffer_addr = _buffer_start + ((n - _buffer_start_narrow_oop) << _requested_shift);
+        return capture(buffer_addr);
+      }
+    }
+
+    AOTMapLogger::OopData obj_at(oop* addr) override {
+      address requested_value = cast_from_oop<address>(*addr);
+      if (requested_value == nullptr) {
+        return null_data();
+      } else {
+        address buffer_addr = requested_value - _buffer_to_requested_delta;
+        return capture(buffer_addr);
+      }
+    }
+
+    GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
+      return new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
+    }
+  };
+
+  FileMapRegion* r = info->region_at(AOTMetaspace::hp);
+  address requested_base = UseCompressedOops ? (address)info->narrow_oop_base() : heap_region_requested_address(info);
+  address requested_start = requested_base + r->mapping_offset();
+  int requested_shift = info->narrow_oop_shift();
+  intptr_t buffer_to_requested_delta = requested_start - buffer_start;
+  uint64_t buffer_start_narrow_oop = 0xdeadbeed;
+  if (UseCompressedOops) {
+    buffer_start_narrow_oop = (uint64_t)(pointer_delta(requested_start, requested_base, 1)) >> requested_shift;
+    assert(buffer_start_narrow_oop < 0xffffffff, "sanity");
+  }
+
+  return new MappedLoaderOopIterator(buffer_start,
+                                     buffer_end,
+                                     buffer_start_narrow_oop,
+                                     buffer_to_requested_delta,
+                                     requested_shift,
+                                     info->mapped_heap()->root_segments().count());
+}
+
+#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/archiveHeapLoader.hpp b/src/hotspot/share/cds/aotMappedHeapLoader.hpp
similarity index 79%
rename from src/hotspot/share/cds/archiveHeapLoader.hpp
rename to src/hotspot/share/cds/aotMappedHeapLoader.hpp
index e559b447ebf..d344d7b0b0a 100644
--- a/src/hotspot/share/cds/archiveHeapLoader.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapLoader.hpp
@@ -22,22 +22,27 @@
  *
  */
 
-#ifndef SHARE_CDS_ARCHIVEHEAPLOADER_HPP
-#define SHARE_CDS_ARCHIVEHEAPLOADER_HPP
+#ifndef SHARE_CDS_AOTMAPPEDHEAPLOADER_HPP
+#define SHARE_CDS_AOTMAPPEDHEAPLOADER_HPP
 
+#include "cds/aotMapLogger.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
 #include "memory/memRegion.hpp"
+#include "oops/oopHandle.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/bitMap.hpp"
+#include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 
 class  FileMapInfo;
 struct LoadedArchiveHeapRegion;
 
-class ArchiveHeapLoader : AllStatic {
+class AOTMappedHeapLoader : AllStatic {
+  friend class AOTMapLogger;
+
 public:
   // At runtime, the heap region in the CDS archive can be used in two different ways,
   // depending on the GC type:
@@ -55,7 +60,6 @@ public:
 
   // Can this VM load the objects from archived heap region into the heap at start-up?
   static bool can_load()  NOT_CDS_JAVA_HEAP_RETURN_(false);
-  static void finish_initialization() NOT_CDS_JAVA_HEAP_RETURN;
   static bool is_loaded() {
     CDS_JAVA_HEAP_ONLY(return _is_loaded;)
     NOT_CDS_JAVA_HEAP(return false;)
@@ -81,6 +85,8 @@ public:
     NOT_CDS_JAVA_HEAP_RETURN_(false);
   }
 
+  static void finish_initialization(FileMapInfo* info) NOT_CDS_JAVA_HEAP_RETURN;
+
   // NarrowOops stored in the CDS archive may use a different encoding scheme
   // than CompressedOops::{base,shift} -- see FileMapInfo::map_heap_region_impl.
   // To decode them, do not use CompressedOops::decode_not_null. Use this
@@ -127,6 +133,13 @@ private:
   static ptrdiff_t _mapped_heap_delta;
   static bool      _mapped_heap_relocation_initialized;
 
+  // Heap roots
+  static GrowableArrayCHeap<OopHandle, mtClassShared>* _root_segments;
+  static int _root_segment_max_size_elems;
+
+  static MemRegion _mapped_heap_memregion;
+  static bool _heap_pointers_need_patching;
+
   static void init_narrow_oop_decoding(address base, int shift);
   static bool init_loaded_region(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
                                  MemRegion& archive_space);
@@ -141,20 +154,40 @@ private:
     return (_loaded_heap_bottom <= o && o < _loaded_heap_top);
   }
 
+  static objArrayOop root_segment(int segment_idx);
+  static void get_segment_indexes(int idx, int& seg_idx, int& int_idx);
+  static void add_root_segment(objArrayOop segment_oop);
+  static void init_root_segment_sizes(int max_size_elems);
+
   template<bool IS_MAPPED>
   inline static oop decode_from_archive_impl(narrowOop v) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
 
   class PatchLoadedRegionPointers;
   class PatchUncompressedLoadedRegionPointers;
 
+  static address heap_region_dumptime_address(FileMapInfo* info);
+  static address heap_region_requested_address(FileMapInfo* info);
+  static bool map_heap_region_impl(FileMapInfo* info);
+  static narrowOop encoded_heap_region_dumptime_address(FileMapInfo* info);
+  static void patch_heap_embedded_pointers(FileMapInfo* info);
+  static void fixup_mapped_heap_region(FileMapInfo* info);
+  static void dealloc_heap_region(FileMapInfo* info);
+
 public:
 
+  static bool map_heap_region(FileMapInfo* info);
   static bool load_heap_region(FileMapInfo* mapinfo);
   static void assert_in_loaded_heap(uintptr_t o) {
     assert(is_in_loaded_heap(o), "must be");
   }
+
+  static oop get_root(int index);
+  static void clear_root(int index);
+
+  static AOTMapLogger::OopDataIterator* oop_iterator(FileMapInfo* info, address buffer_start, address buffer_end);
+
 #endif // INCLUDE_CDS_JAVA_HEAP
 
 };
 
-#endif // SHARE_CDS_ARCHIVEHEAPLOADER_HPP
+#endif // SHARE_CDS_AOTMAPPEDHEAPLOADER_HPP
diff --git a/src/hotspot/share/cds/archiveHeapLoader.inline.hpp b/src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp
similarity index 82%
rename from src/hotspot/share/cds/archiveHeapLoader.inline.hpp
rename to src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp
index 9efd39b8d26..0e50fefdf0f 100644
--- a/src/hotspot/share/cds/archiveHeapLoader.inline.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_CDS_ARCHIVEHEAPLOADER_INLINE_HPP
-#define SHARE_CDS_ARCHIVEHEAPLOADER_INLINE_HPP
+#ifndef SHARE_CDS_AOTMAPPEDHEAPLOADER_INLINE_HPP
+#define SHARE_CDS_AOTMAPPEDHEAPLOADER_INLINE_HPP
 
-#include "cds/archiveHeapLoader.hpp"
+#include "cds/aotMappedHeapLoader.hpp"
 
 #include "oops/compressedOops.inline.hpp"
 #include "utilities/align.hpp"
@@ -33,7 +33,7 @@
 #if INCLUDE_CDS_JAVA_HEAP
 
 template<bool IS_MAPPED>
-inline oop ArchiveHeapLoader::decode_from_archive_impl(narrowOop v) {
+inline oop AOTMappedHeapLoader::decode_from_archive_impl(narrowOop v) {
   assert(!CompressedOops::is_null(v), "narrow oop value can never be zero");
   assert(_narrow_oop_base_initialized, "relocation information must have been initialized");
   uintptr_t p = ((uintptr_t)_narrow_oop_base) + ((uintptr_t)v << _narrow_oop_shift);
@@ -49,14 +49,14 @@ inline oop ArchiveHeapLoader::decode_from_archive_impl(narrowOop v) {
   return result;
 }
 
-inline oop ArchiveHeapLoader::decode_from_archive(narrowOop v) {
+inline oop AOTMappedHeapLoader::decode_from_archive(narrowOop v) {
   return decode_from_archive_impl<false>(v);
 }
 
-inline oop ArchiveHeapLoader::decode_from_mapped_archive(narrowOop v) {
+inline oop AOTMappedHeapLoader::decode_from_mapped_archive(narrowOop v) {
   return decode_from_archive_impl<true>(v);
 }
 
 #endif
 
-#endif // SHARE_CDS_ARCHIVEHEAPLOADER_INLINE_HPP
+#endif // SHARE_CDS_AOTMAPPEDHEAPLOADER_INLINE_HPP
diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
similarity index 69%
rename from src/hotspot/share/cds/archiveHeapWriter.cpp
rename to src/hotspot/share/cds/aotMappedHeapWriter.cpp
index d1a8772874a..ff9319d266b 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
@@ -22,16 +22,18 @@
  *
  */
 
+#include "cds/aotMappedHeapLoader.hpp"
+#include "cds/aotMappedHeapWriter.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/filemap.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/modules.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "memory/allocation.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.hpp"
@@ -51,24 +53,25 @@
 
 #if INCLUDE_CDS_JAVA_HEAP
 
-GrowableArrayCHeap<u1, mtClassShared>* ArchiveHeapWriter::_buffer = nullptr;
+GrowableArrayCHeap<u1, mtClassShared>* AOTMappedHeapWriter::_buffer = nullptr;
 
 // The following are offsets from buffer_bottom()
-size_t ArchiveHeapWriter::_buffer_used;
+size_t AOTMappedHeapWriter::_buffer_used;
 
 // Heap root segments
-HeapRootSegments ArchiveHeapWriter::_heap_root_segments;
+HeapRootSegments AOTMappedHeapWriter::_heap_root_segments;
 
-address ArchiveHeapWriter::_requested_bottom;
-address ArchiveHeapWriter::_requested_top;
+address AOTMappedHeapWriter::_requested_bottom;
+address AOTMappedHeapWriter::_requested_top;
 
-GrowableArrayCHeap<ArchiveHeapWriter::NativePointerInfo, mtClassShared>* ArchiveHeapWriter::_native_pointers;
-GrowableArrayCHeap<oop, mtClassShared>* ArchiveHeapWriter::_source_objs;
-GrowableArrayCHeap<ArchiveHeapWriter::HeapObjOrder, mtClassShared>* ArchiveHeapWriter::_source_objs_order;
+GrowableArrayCHeap<AOTMappedHeapWriter::NativePointerInfo, mtClassShared>* AOTMappedHeapWriter::_native_pointers;
+GrowableArrayCHeap<oop, mtClassShared>* AOTMappedHeapWriter::_source_objs;
+GrowableArrayCHeap<AOTMappedHeapWriter::HeapObjOrder, mtClassShared>* AOTMappedHeapWriter::_source_objs_order;
 
-ArchiveHeapWriter::BufferOffsetToSourceObjectTable*
-  ArchiveHeapWriter::_buffer_offset_to_source_obj_table = nullptr;
+AOTMappedHeapWriter::BufferOffsetToSourceObjectTable*
+AOTMappedHeapWriter::_buffer_offset_to_source_obj_table = nullptr;
 
+DumpedInternedStrings *AOTMappedHeapWriter::_dumped_interned_strings = nullptr;
 
 typedef HashTable<
       size_t,    // offset of a filler from ArchiveHeapWriter::buffer_bottom()
@@ -79,11 +82,12 @@ typedef HashTable<
 static FillersTable* _fillers;
 static int _num_native_ptrs = 0;
 
-void ArchiveHeapWriter::init() {
+void AOTMappedHeapWriter::init() {
   if (CDSConfig::is_dumping_heap()) {
     Universe::heap()->collect(GCCause::_java_lang_system_gc);
 
     _buffer_offset_to_source_obj_table = new BufferOffsetToSourceObjectTable(/*size (prime)*/36137, /*max size*/1 * M);
+    _dumped_interned_strings = new (mtClass)DumpedInternedStrings(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE);
     _fillers = new FillersTable();
     _requested_bottom = nullptr;
     _requested_top = nullptr;
@@ -95,17 +99,20 @@ void ArchiveHeapWriter::init() {
   }
 }
 
-void ArchiveHeapWriter::delete_tables_with_raw_oops() {
+void AOTMappedHeapWriter::delete_tables_with_raw_oops() {
   delete _source_objs;
   _source_objs = nullptr;
+
+  delete _dumped_interned_strings;
+  _dumped_interned_strings = nullptr;
 }
 
-void ArchiveHeapWriter::add_source_obj(oop src_obj) {
+void AOTMappedHeapWriter::add_source_obj(oop src_obj) {
   _source_objs->append(src_obj);
 }
 
-void ArchiveHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
-                              ArchiveHeapInfo* heap_info) {
+void AOTMappedHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
+                                ArchiveMappedHeapInfo* heap_info) {
   assert(CDSConfig::is_dumping_heap(), "sanity");
   allocate_buffer();
   copy_source_objs_to_buffer(roots);
@@ -113,16 +120,16 @@ void ArchiveHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
   relocate_embedded_oops(roots, heap_info);
 }
 
-bool ArchiveHeapWriter::is_too_large_to_archive(oop o) {
+bool AOTMappedHeapWriter::is_too_large_to_archive(oop o) {
   return is_too_large_to_archive(o->size());
 }
 
-bool ArchiveHeapWriter::is_string_too_large_to_archive(oop string) {
+bool AOTMappedHeapWriter::is_string_too_large_to_archive(oop string) {
   typeArrayOop value = java_lang_String::value_no_keepalive(string);
   return is_too_large_to_archive(value);
 }
 
-bool ArchiveHeapWriter::is_too_large_to_archive(size_t size) {
+bool AOTMappedHeapWriter::is_too_large_to_archive(size_t size) {
   assert(size > 0, "no zero-size object");
   assert(size * HeapWordSize > size, "no overflow");
   static_assert(MIN_GC_REGION_ALIGNMENT > 0, "must be positive");
@@ -135,20 +142,39 @@ bool ArchiveHeapWriter::is_too_large_to_archive(size_t size) {
   }
 }
 
+// Keep track of the contents of the archived interned string table. This table
+// is used only by CDSHeapVerifier.
+void AOTMappedHeapWriter::add_to_dumped_interned_strings(oop string) {
+  assert_at_safepoint(); // DumpedInternedStrings uses raw oops
+  assert(!is_string_too_large_to_archive(string), "must be");
+  bool created;
+  _dumped_interned_strings->put_if_absent(string, true, &created);
+  if (created) {
+    // Prevent string deduplication from changing the value field to
+    // something not in the archive.
+    java_lang_String::set_deduplication_forbidden(string);
+    _dumped_interned_strings->maybe_grow();
+  }
+}
+
+bool AOTMappedHeapWriter::is_dumped_interned_string(oop o) {
+  return _dumped_interned_strings->get(o) != nullptr;
+}
+
 // Various lookup functions between source_obj, buffered_obj and requested_obj
-bool ArchiveHeapWriter::is_in_requested_range(oop o) {
+bool AOTMappedHeapWriter::is_in_requested_range(oop o) {
   assert(_requested_bottom != nullptr, "do not call before _requested_bottom is initialized");
   address a = cast_from_oop<address>(o);
   return (_requested_bottom <= a && a < _requested_top);
 }
 
-oop ArchiveHeapWriter::requested_obj_from_buffer_offset(size_t offset) {
+oop AOTMappedHeapWriter::requested_obj_from_buffer_offset(size_t offset) {
   oop req_obj = cast_to_oop(_requested_bottom + offset);
   assert(is_in_requested_range(req_obj), "must be");
   return req_obj;
 }
 
-oop ArchiveHeapWriter::source_obj_to_requested_obj(oop src_obj) {
+oop AOTMappedHeapWriter::source_obj_to_requested_obj(oop src_obj) {
   assert(CDSConfig::is_dumping_heap(), "dump-time only");
   HeapShared::CachedOopInfo* p = HeapShared::get_cached_oop_info(src_obj);
   if (p != nullptr) {
@@ -158,7 +184,7 @@ oop ArchiveHeapWriter::source_obj_to_requested_obj(oop src_obj) {
   }
 }
 
-oop ArchiveHeapWriter::buffered_addr_to_source_obj(address buffered_addr) {
+oop AOTMappedHeapWriter::buffered_addr_to_source_obj(address buffered_addr) {
   OopHandle* oh = _buffer_offset_to_source_obj_table->get(buffered_address_to_offset(buffered_addr));
   if (oh != nullptr) {
     return oh->resolve();
@@ -167,7 +193,7 @@ oop ArchiveHeapWriter::buffered_addr_to_source_obj(address buffered_addr) {
   }
 }
 
-Klass* ArchiveHeapWriter::real_klass_of_buffered_oop(address buffered_addr) {
+Klass* AOTMappedHeapWriter::real_klass_of_buffered_oop(address buffered_addr) {
   oop p = buffered_addr_to_source_obj(buffered_addr);
   if (p != nullptr) {
     return p->klass();
@@ -179,7 +205,7 @@ Klass* ArchiveHeapWriter::real_klass_of_buffered_oop(address buffered_addr) {
   }
 }
 
-size_t ArchiveHeapWriter::size_of_buffered_oop(address buffered_addr) {
+size_t AOTMappedHeapWriter::size_of_buffered_oop(address buffered_addr) {
   oop p = buffered_addr_to_source_obj(buffered_addr);
   if (p != nullptr) {
     return p->size();
@@ -205,29 +231,29 @@ size_t ArchiveHeapWriter::size_of_buffered_oop(address buffered_addr) {
   return 0;
 }
 
-address ArchiveHeapWriter::buffered_addr_to_requested_addr(address buffered_addr) {
+address AOTMappedHeapWriter::buffered_addr_to_requested_addr(address buffered_addr) {
   return _requested_bottom + buffered_address_to_offset(buffered_addr);
 }
 
-address ArchiveHeapWriter::requested_address() {
+address AOTMappedHeapWriter::requested_address() {
   assert(_buffer != nullptr, "must be initialized");
   return _requested_bottom;
 }
 
-void ArchiveHeapWriter::allocate_buffer() {
+void AOTMappedHeapWriter::allocate_buffer() {
   int initial_buffer_size = 100000;
   _buffer = new GrowableArrayCHeap<u1, mtClassShared>(initial_buffer_size);
   _buffer_used = 0;
   ensure_buffer_space(1); // so that buffer_bottom() works
 }
 
-void ArchiveHeapWriter::ensure_buffer_space(size_t min_bytes) {
+void AOTMappedHeapWriter::ensure_buffer_space(size_t min_bytes) {
   // We usually have very small heaps. If we get a huge one it's probably caused by a bug.
   guarantee(min_bytes <= max_jint, "we dont support archiving more than 2G of objects");
   _buffer->at_grow(to_array_index(min_bytes));
 }
 
-objArrayOop ArchiveHeapWriter::allocate_root_segment(size_t offset, int element_count) {
+objArrayOop AOTMappedHeapWriter::allocate_root_segment(size_t offset, int element_count) {
   HeapWord* mem = offset_to_buffered_address<HeapWord *>(offset);
   memset(mem, 0, objArrayOopDesc::object_size(element_count));
 
@@ -242,7 +268,7 @@ objArrayOop ArchiveHeapWriter::allocate_root_segment(size_t offset, int element_
   return objArrayOop(cast_to_oop(mem));
 }
 
-void ArchiveHeapWriter::root_segment_at_put(objArrayOop segment, int index, oop root) {
+void AOTMappedHeapWriter::root_segment_at_put(objArrayOop segment, int index, oop root) {
   // Do not use arrayOop->obj_at_put(i, o) as arrayOop is outside the real heap!
   if (UseCompressedOops) {
     *segment->obj_at_addr<narrowOop>(index) = CompressedOops::encode(root);
@@ -251,7 +277,7 @@ void ArchiveHeapWriter::root_segment_at_put(objArrayOop segment, int index, oop
   }
 }
 
-void ArchiveHeapWriter::copy_roots_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
+void AOTMappedHeapWriter::copy_roots_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
   // Depending on the number of classes we are archiving, a single roots array may be
   // larger than MIN_GC_REGION_ALIGNMENT. Roots are allocated first in the buffer, which
   // allows us to chop the large array into a series of "segments". Current layout
@@ -324,7 +350,7 @@ static int oop_sorting_rank(oop o) {
   }
 }
 
-int ArchiveHeapWriter::compare_objs_by_oop_fields(HeapObjOrder* a, HeapObjOrder* b) {
+int AOTMappedHeapWriter::compare_objs_by_oop_fields(HeapObjOrder* a, HeapObjOrder* b) {
   int rank_a = a->_rank;
   int rank_b = b->_rank;
 
@@ -336,7 +362,7 @@ int ArchiveHeapWriter::compare_objs_by_oop_fields(HeapObjOrder* a, HeapObjOrder*
   }
 }
 
-void ArchiveHeapWriter::sort_source_objs() {
+void AOTMappedHeapWriter::sort_source_objs() {
   log_info(aot)("sorting heap objects");
   int len = _source_objs->length();
   _source_objs_order = new GrowableArrayCHeap<HeapObjOrder, mtClassShared>(len);
@@ -352,7 +378,7 @@ void ArchiveHeapWriter::sort_source_objs() {
   log_info(aot)("sorting heap objects done");
 }
 
-void ArchiveHeapWriter::copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
+void AOTMappedHeapWriter::copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
   // There could be multiple root segments, which we want to be aligned by region.
   // Putting them ahead of objects makes sure we waste no space.
   copy_roots_to_buffer(roots);
@@ -379,12 +405,12 @@ void ArchiveHeapWriter::copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtCla
                 _buffer_used, _source_objs->length() + 1, roots->length(), _num_native_ptrs);
 }
 
-size_t ArchiveHeapWriter::filler_array_byte_size(int length) {
+size_t AOTMappedHeapWriter::filler_array_byte_size(int length) {
   size_t byte_size = objArrayOopDesc::object_size(length) * HeapWordSize;
   return byte_size;
 }
 
-int ArchiveHeapWriter::filler_array_length(size_t fill_bytes) {
+int AOTMappedHeapWriter::filler_array_length(size_t fill_bytes) {
   assert(is_object_aligned(fill_bytes), "must be");
   size_t elemSize = (UseCompressedOops ? sizeof(narrowOop) : sizeof(oop));
 
@@ -400,7 +426,7 @@ int ArchiveHeapWriter::filler_array_length(size_t fill_bytes) {
   return -1;
 }
 
-HeapWord* ArchiveHeapWriter::init_filler_array_at_buffer_top(int array_length, size_t fill_bytes) {
+HeapWord* AOTMappedHeapWriter::init_filler_array_at_buffer_top(int array_length, size_t fill_bytes) {
   assert(UseCompressedClassPointers, "Archived heap only supported for compressed klasses");
   Klass* oak = Universe::objectArrayKlass(); // already relocated to point to archived klass
   HeapWord* mem = offset_to_buffered_address<HeapWord*>(_buffer_used);
@@ -416,7 +442,7 @@ HeapWord* ArchiveHeapWriter::init_filler_array_at_buffer_top(int array_length, s
   return mem;
 }
 
-void ArchiveHeapWriter::maybe_fill_gc_region_gap(size_t required_byte_size) {
+void AOTMappedHeapWriter::maybe_fill_gc_region_gap(size_t required_byte_size) {
   // We fill only with arrays (so we don't need to use a single HeapWord filler if the
   // leftover space is smaller than a zero-sized array object). Therefore, we need to
   // make sure there's enough space of min_filler_byte_size in the current region after
@@ -449,7 +475,7 @@ void ArchiveHeapWriter::maybe_fill_gc_region_gap(size_t required_byte_size) {
   }
 }
 
-size_t ArchiveHeapWriter::get_filler_size_at(address buffered_addr) {
+size_t AOTMappedHeapWriter::get_filler_size_at(address buffered_addr) {
   size_t* p = _fillers->get(buffered_address_to_offset(buffered_addr));
   if (p != nullptr) {
     assert(*p > 0, "filler must be larger than zero bytes");
@@ -465,7 +491,7 @@ void update_buffered_object_field(address buffered_obj, int field_offset, T valu
   *field_addr = value;
 }
 
-size_t ArchiveHeapWriter::copy_one_source_obj_to_buffer(oop src_obj) {
+size_t AOTMappedHeapWriter::copy_one_source_obj_to_buffer(oop src_obj) {
   assert(!is_too_large_to_archive(src_obj), "already checked");
   size_t byte_size = src_obj->size() * HeapWordSize;
   assert(byte_size > 0, "no zero-size objects");
@@ -510,7 +536,7 @@ size_t ArchiveHeapWriter::copy_one_source_obj_to_buffer(oop src_obj) {
   return buffered_obj_offset;
 }
 
-void ArchiveHeapWriter::set_requested_address(ArchiveHeapInfo* info) {
+void AOTMappedHeapWriter::set_requested_address(ArchiveMappedHeapInfo* info) {
   assert(!info->is_used(), "only set once");
 
   size_t heap_region_byte_size = _buffer_used;
@@ -541,12 +567,12 @@ void ArchiveHeapWriter::set_requested_address(ArchiveHeapInfo* info) {
 
   info->set_buffer_region(MemRegion(offset_to_buffered_address<HeapWord*>(0),
                                     offset_to_buffered_address<HeapWord*>(_buffer_used)));
-  info->set_heap_root_segments(_heap_root_segments);
+  info->set_root_segments(_heap_root_segments);
 }
 
 // Oop relocation
 
-template <typename T> T* ArchiveHeapWriter::requested_addr_to_buffered_addr(T* p) {
+template <typename T> T* AOTMappedHeapWriter::requested_addr_to_buffered_addr(T* p) {
   assert(is_in_requested_range(cast_to_oop(p)), "must be");
 
   address addr = address(p);
@@ -555,56 +581,44 @@ template <typename T> T* ArchiveHeapWriter::requested_addr_to_buffered_addr(T* p
   return offset_to_buffered_address<T*>(offset);
 }
 
-template <typename T> oop ArchiveHeapWriter::load_source_oop_from_buffer(T* buffered_addr) {
+template <typename T> oop AOTMappedHeapWriter::load_source_oop_from_buffer(T* buffered_addr) {
   oop o = load_oop_from_buffer(buffered_addr);
   assert(!in_buffer(cast_from_oop<address>(o)), "must point to source oop");
   return o;
 }
 
-template <typename T> void ArchiveHeapWriter::store_requested_oop_in_buffer(T* buffered_addr,
-                                                                            oop request_oop) {
-  assert(is_in_requested_range(request_oop), "must be");
+template <typename T> void AOTMappedHeapWriter::store_requested_oop_in_buffer(T* buffered_addr,
+                                                                                   oop request_oop) {
+  assert(request_oop == nullptr || is_in_requested_range(request_oop), "must be");
   store_oop_in_buffer(buffered_addr, request_oop);
 }
 
-inline void ArchiveHeapWriter::store_oop_in_buffer(oop* buffered_addr, oop requested_obj) {
+inline void AOTMappedHeapWriter::store_oop_in_buffer(oop* buffered_addr, oop requested_obj) {
   *buffered_addr = requested_obj;
 }
 
-inline void ArchiveHeapWriter::store_oop_in_buffer(narrowOop* buffered_addr, oop requested_obj) {
-  narrowOop val = CompressedOops::encode_not_null(requested_obj);
+inline void AOTMappedHeapWriter::store_oop_in_buffer(narrowOop* buffered_addr, oop requested_obj) {
+  narrowOop val = CompressedOops::encode(requested_obj);
   *buffered_addr = val;
 }
 
-oop ArchiveHeapWriter::load_oop_from_buffer(oop* buffered_addr) {
+oop AOTMappedHeapWriter::load_oop_from_buffer(oop* buffered_addr) {
   return *buffered_addr;
 }
 
-oop ArchiveHeapWriter::load_oop_from_buffer(narrowOop* buffered_addr) {
+oop AOTMappedHeapWriter::load_oop_from_buffer(narrowOop* buffered_addr) {
   return CompressedOops::decode(*buffered_addr);
 }
 
-template <typename T> void ArchiveHeapWriter::relocate_field_in_buffer(T* field_addr_in_buffer, CHeapBitMap* oopmap) {
-  oop source_referent = load_source_oop_from_buffer<T>(field_addr_in_buffer);
-  if (source_referent != nullptr) {
-    if (java_lang_Class::is_instance(source_referent)) {
-      Klass* k = java_lang_Class::as_Klass(source_referent);
-      if (RegeneratedClasses::has_been_regenerated(k)) {
-        source_referent = RegeneratedClasses::get_regenerated_object(k)->java_mirror();
-      }
-      // When the source object points to a "real" mirror, the buffered object should point
-      // to the "scratch" mirror, which has all unarchivable fields scrubbed (to be reinstated
-      // at run time).
-      source_referent = HeapShared::scratch_java_mirror(source_referent);
-      assert(source_referent != nullptr, "must be");
-    }
-    oop request_referent = source_obj_to_requested_obj(source_referent);
-    store_requested_oop_in_buffer<T>(field_addr_in_buffer, request_referent);
+template <typename T> void AOTMappedHeapWriter::relocate_field_in_buffer(T* field_addr_in_buffer, oop source_referent, CHeapBitMap* oopmap) {
+  oop request_referent = source_obj_to_requested_obj(source_referent);
+  store_requested_oop_in_buffer<T>(field_addr_in_buffer, request_referent);
+  if (request_referent != nullptr) {
     mark_oop_pointer<T>(field_addr_in_buffer, oopmap);
   }
 }
 
-template <typename T> void ArchiveHeapWriter::mark_oop_pointer(T* buffered_addr, CHeapBitMap* oopmap) {
+template <typename T> void AOTMappedHeapWriter::mark_oop_pointer(T* buffered_addr, CHeapBitMap* oopmap) {
   T* request_p = (T*)(buffered_addr_to_requested_addr((address)buffered_addr));
   address requested_region_bottom;
 
@@ -620,7 +634,7 @@ template <typename T> void ArchiveHeapWriter::mark_oop_pointer(T* buffered_addr,
   oopmap->set_bit(idx);
 }
 
-void ArchiveHeapWriter::update_header_for_requested_obj(oop requested_obj, oop src_obj,  Klass* src_klass) {
+void AOTMappedHeapWriter::update_header_for_requested_obj(oop requested_obj, oop src_obj,  Klass* src_klass) {
   assert(UseCompressedClassPointers, "Archived heap only supported for compressed klasses");
   narrowKlass nk = ArchiveBuilder::current()->get_requested_narrow_klass(src_klass);
   address buffered_addr = requested_addr_to_buffered_addr(cast_from_oop<address>(requested_obj));
@@ -653,7 +667,7 @@ void ArchiveHeapWriter::update_header_for_requested_obj(oop requested_obj, oop s
   fake_oop->set_mark(fake_oop->mark().set_age(0));
 }
 
-class ArchiveHeapWriter::EmbeddedOopRelocator: public BasicOopIterateClosure {
+class AOTMappedHeapWriter::EmbeddedOopRelocator: public BasicOopIterateClosure {
   oop _src_obj;
   address _buffered_obj;
   CHeapBitMap* _oopmap;
@@ -672,12 +686,9 @@ private:
   template <class T> void do_oop_work(T *p) {
     int field_offset = pointer_delta_as_int((char*)p, cast_from_oop<char*>(_src_obj));
     T* field_addr = (T*)(_buffered_obj + field_offset);
-    if (_is_java_lang_ref && AOTReferenceObjSupport::skip_field(field_offset)) {
-      // Do not copy these fields. Set them to null
-      *field_addr = (T)0x0;
-    } else {
-      ArchiveHeapWriter::relocate_field_in_buffer<T>(field_addr, _oopmap);
-    }
+    oop referent = load_source_oop_from_buffer<T>(field_addr);
+    referent = HeapShared::maybe_remap_referent(_is_java_lang_ref, field_offset, referent);
+    AOTMappedHeapWriter::relocate_field_in_buffer<T>(field_addr, referent, _oopmap);
   }
 };
 
@@ -693,8 +704,8 @@ static void log_bitmap_usage(const char* which, BitMap* bitmap, size_t total_bit
 }
 
 // Update all oop fields embedded in the buffered objects
-void ArchiveHeapWriter::relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots,
-                                               ArchiveHeapInfo* heap_info) {
+void AOTMappedHeapWriter::relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots,
+                                                      ArchiveMappedHeapInfo* heap_info) {
   size_t oopmap_unit = (UseCompressedOops ? sizeof(narrowOop) : sizeof(oop));
   size_t heap_region_byte_size = _buffer_used;
   heap_info->oopmap()->resize(heap_region_byte_size   / oopmap_unit);
@@ -709,6 +720,7 @@ void ArchiveHeapWriter::relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassSh
     address buffered_obj = offset_to_buffered_address<address>(info->buffer_offset());
     EmbeddedOopRelocator relocator(src_obj, buffered_obj, heap_info->oopmap());
     src_obj->oop_iterate(&relocator);
+    mark_native_pointers(src_obj);
   };
 
   // Relocate HeapShared::roots(), which is created in copy_roots_to_buffer() and
@@ -721,15 +733,19 @@ void ArchiveHeapWriter::relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassSh
     address buffered_obj = offset_to_buffered_address<address>(seg_offset);
     int length = _heap_root_segments.size_in_elems(seg_idx);
 
-    if (UseCompressedOops) {
-      for (int i = 0; i < length; i++) {
-        narrowOop* addr = (narrowOop*)(buffered_obj + objArrayOopDesc::obj_at_offset<narrowOop>(i));
-        relocate_field_in_buffer<narrowOop>(addr, heap_info->oopmap());
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        oop* addr = (oop*)(buffered_obj + objArrayOopDesc::obj_at_offset<oop>(i));
-        relocate_field_in_buffer<oop>(addr, heap_info->oopmap());
+    size_t elem_size = UseCompressedOops ? sizeof(narrowOop) : sizeof(oop);
+
+    for (int i = 0; i < length; i++) {
+      // There is no source object; these are native oops - load, translate and
+      // write back
+      size_t elem_offset = objArrayOopDesc::base_offset_in_bytes() + elem_size * i;
+      HeapWord* elem_addr = (HeapWord*)(buffered_obj + elem_offset);
+      oop obj = NativeAccess<>::oop_load(elem_addr);
+      obj = HeapShared::maybe_remap_referent(false /* is_reference_field */, elem_offset, obj);
+      if (UseCompressedOops) {
+        relocate_field_in_buffer<narrowOop>((narrowOop*)elem_addr, obj, heap_info->oopmap());
+      } else {
+        relocate_field_in_buffer<oop>((oop*)elem_addr, obj, heap_info->oopmap());
       }
     }
   }
@@ -741,7 +757,7 @@ void ArchiveHeapWriter::relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassSh
   log_bitmap_usage("ptrmap", heap_info->ptrmap(), total_bytes / sizeof(address));
 }
 
-void ArchiveHeapWriter::mark_native_pointer(oop src_obj, int field_offset) {
+void AOTMappedHeapWriter::mark_native_pointer(oop src_obj, int field_offset) {
   Metadata* ptr = src_obj->metadata_field_acquire(field_offset);
   if (ptr != nullptr) {
     NativePointerInfo info;
@@ -753,7 +769,13 @@ void ArchiveHeapWriter::mark_native_pointer(oop src_obj, int field_offset) {
   }
 }
 
-void ArchiveHeapWriter::compute_ptrmap(ArchiveHeapInfo* heap_info) {
+void AOTMappedHeapWriter::mark_native_pointers(oop orig_obj) {
+  HeapShared::do_metadata_offsets(orig_obj, [&](int offset) {
+    mark_native_pointer(orig_obj, offset);
+  });
+}
+
+void AOTMappedHeapWriter::compute_ptrmap(ArchiveMappedHeapInfo* heap_info) {
   int num_non_null_ptrs = 0;
   Metadata** bottom = (Metadata**) _requested_bottom;
   Metadata** top = (Metadata**) _requested_top; // exclusive
@@ -800,4 +822,118 @@ void ArchiveHeapWriter::compute_ptrmap(ArchiveHeapInfo* heap_info) {
                       num_non_null_ptrs, size_t(heap_info->ptrmap()->size()));
 }
 
+AOTMapLogger::OopDataIterator* AOTMappedHeapWriter::oop_iterator(ArchiveMappedHeapInfo* heap_info) {
+  class MappedWriterOopIterator : public AOTMapLogger::OopDataIterator {
+  private:
+    address _current;
+    address _next;
+
+    address _buffer_start;
+    address _buffer_end;
+    uint64_t _buffer_start_narrow_oop;
+    intptr_t _buffer_to_requested_delta;
+    int _requested_shift;
+
+    size_t _num_root_segments;
+    size_t _num_obj_arrays_logged;
+
+  public:
+    MappedWriterOopIterator(address buffer_start,
+                            address buffer_end,
+                            uint64_t buffer_start_narrow_oop,
+                            intptr_t buffer_to_requested_delta,
+                            int requested_shift,
+                            size_t num_root_segments)
+      : _current(nullptr),
+        _next(buffer_start),
+        _buffer_start(buffer_start),
+        _buffer_end(buffer_end),
+        _buffer_start_narrow_oop(buffer_start_narrow_oop),
+        _buffer_to_requested_delta(buffer_to_requested_delta),
+        _requested_shift(requested_shift),
+        _num_root_segments(num_root_segments),
+        _num_obj_arrays_logged(0) {
+    }
+
+    AOTMapLogger::OopData capture(address buffered_addr) {
+      oopDesc* raw_oop = (oopDesc*)buffered_addr;
+      size_t size = size_of_buffered_oop(buffered_addr);
+      address requested_addr = buffered_addr_to_requested_addr(buffered_addr);
+      intptr_t target_location = (intptr_t)requested_addr;
+      uint64_t pd = (uint64_t)(pointer_delta(buffered_addr, _buffer_start, 1));
+      uint32_t narrow_location = checked_cast<uint32_t>(_buffer_start_narrow_oop + (pd >> _requested_shift));
+      Klass* klass = real_klass_of_buffered_oop(buffered_addr);
+
+      return { buffered_addr,
+               requested_addr,
+               target_location,
+               narrow_location,
+               raw_oop,
+               klass,
+               size,
+               false };
+    }
+
+    bool has_next() override {
+      return _next < _buffer_end;
+    }
+
+    AOTMapLogger::OopData next() override {
+      _current = _next;
+      AOTMapLogger::OopData result = capture(_current);
+      if (result._klass->is_objArray_klass()) {
+        result._is_root_segment = _num_obj_arrays_logged++ < _num_root_segments;
+      }
+      _next = _current + result._size * BytesPerWord;
+      return result;
+    }
+
+    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
+      uint64_t n = (uint64_t)(*addr);
+      if (n == 0) {
+        return null_data();
+      } else {
+        precond(n >= _buffer_start_narrow_oop);
+        address buffer_addr = _buffer_start + ((n - _buffer_start_narrow_oop) << _requested_shift);
+        return capture(buffer_addr);
+      }
+    }
+
+    AOTMapLogger::OopData obj_at(oop* addr) override {
+      address requested_value = cast_from_oop<address>(*addr);
+      if (requested_value == nullptr) {
+        return null_data();
+      } else {
+        address buffer_addr = requested_value - _buffer_to_requested_delta;
+        return capture(buffer_addr);
+      }
+    }
+
+    GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
+      return new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
+    }
+  };
+
+  MemRegion r = heap_info->buffer_region();
+  address buffer_start = address(r.start());
+  address buffer_end = address(r.end());
+
+  address requested_base = UseCompressedOops ? (address)CompressedOops::base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
+  address requested_start = UseCompressedOops ? buffered_addr_to_requested_addr(buffer_start) : requested_base;
+  int requested_shift =  CompressedOops::shift();
+  intptr_t buffer_to_requested_delta = requested_start - buffer_start;
+  uint64_t buffer_start_narrow_oop = 0xdeadbeed;
+  if (UseCompressedOops) {
+    buffer_start_narrow_oop = (uint64_t)(pointer_delta(requested_start, requested_base, 1)) >> requested_shift;
+    assert(buffer_start_narrow_oop < 0xffffffff, "sanity");
+  }
+
+  return new MappedWriterOopIterator(buffer_start,
+                                     buffer_end,
+                                     buffer_start_narrow_oop,
+                                     buffer_to_requested_delta,
+                                     requested_shift,
+                                     heap_info->root_segments().count());
+}
+
 #endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/archiveHeapWriter.hpp b/src/hotspot/share/cds/aotMappedHeapWriter.hpp
similarity index 86%
rename from src/hotspot/share/cds/archiveHeapWriter.hpp
rename to src/hotspot/share/cds/aotMappedHeapWriter.hpp
index 80e72c12e7e..9a85b83d3d1 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.hpp
@@ -22,9 +22,10 @@
  *
  */
 
-#ifndef SHARE_CDS_ARCHIVEHEAPWRITER_HPP
-#define SHARE_CDS_ARCHIVEHEAPWRITER_HPP
+#ifndef SHARE_CDS_AOTMAPPEDHEAPWRITER_HPP
+#define SHARE_CDS_AOTMAPPEDHEAPWRITER_HPP
 
+#include "cds/aotMapLogger.hpp"
 #include "cds/heapShared.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
@@ -37,32 +38,25 @@
 
 class MemRegion;
 
-class ArchiveHeapInfo {
-  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
-  CHeapBitMap _oopmap;
-  CHeapBitMap _ptrmap;
-  HeapRootSegments _heap_root_segments;
-
+#if INCLUDE_CDS_JAVA_HEAP
+class DumpedInternedStrings :
+  public ResizeableHashTable<oop, bool,
+                           AnyObj::C_HEAP,
+                           mtClassShared,
+                           HeapShared::string_oop_hash>
+{
 public:
-  ArchiveHeapInfo() : _buffer_region(), _oopmap(128, mtClassShared), _ptrmap(128, mtClassShared) {}
-  bool is_used() { return !_buffer_region.is_empty(); }
-
-  MemRegion buffer_region() { return _buffer_region; }
-  void set_buffer_region(MemRegion r) { _buffer_region = r; }
-
-  char* buffer_start() { return (char*)_buffer_region.start(); }
-  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
-
-  CHeapBitMap* oopmap() { return &_oopmap; }
-  CHeapBitMap* ptrmap() { return &_ptrmap; }
-
-  void set_heap_root_segments(HeapRootSegments segments) { _heap_root_segments = segments; };
-  HeapRootSegments heap_root_segments() { return _heap_root_segments; }
+  DumpedInternedStrings(unsigned size, unsigned max_size) :
+    ResizeableHashTable<oop, bool,
+                                AnyObj::C_HEAP,
+                                mtClassShared,
+                                HeapShared::string_oop_hash>(size, max_size) {}
 };
 
-#if INCLUDE_CDS_JAVA_HEAP
-class ArchiveHeapWriter : AllStatic {
-  // ArchiveHeapWriter manipulates three types of addresses:
+class AOTMappedHeapWriter : AllStatic {
+  friend class HeapShared;
+  friend class AOTMappedHeapLoader;
+  // AOTMappedHeapWriter manipulates three types of addresses:
   //
   //     "source" vs "buffered" vs "requested"
   //
@@ -117,6 +111,9 @@ public:
   // Shenandoah heap region size can never be smaller than 256K.
   static constexpr int MIN_GC_REGION_ALIGNMENT = 256 * K;
 
+  static const int INITIAL_TABLE_SIZE = 15889; // prime number
+  static const int MAX_TABLE_SIZE     = 1000000;
+
 private:
   class EmbeddedOopRelocator;
   struct NativePointerInfo {
@@ -138,6 +135,7 @@ private:
 
   static GrowableArrayCHeap<NativePointerInfo, mtClassShared>* _native_pointers;
   static GrowableArrayCHeap<oop, mtClassShared>* _source_objs;
+  static DumpedInternedStrings *_dumped_interned_strings;
 
   // We sort _source_objs_order to minimize the number of bits in ptrmap and oopmap.
   // See comments near the body of ArchiveHeapWriter::compare_objs_by_oop_fields().
@@ -202,9 +200,10 @@ private:
   static int filler_array_length(size_t fill_bytes);
   static HeapWord* init_filler_array_at_buffer_top(int array_length, size_t fill_bytes);
 
-  static void set_requested_address(ArchiveHeapInfo* info);
-  static void relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots, ArchiveHeapInfo* info);
-  static void compute_ptrmap(ArchiveHeapInfo *info);
+  static void set_requested_address(ArchiveMappedHeapInfo* info);
+  static void mark_native_pointers(oop orig_obj);
+  static void relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots, ArchiveMappedHeapInfo* info);
+  static void compute_ptrmap(ArchiveMappedHeapInfo *info);
   static bool is_in_requested_range(oop o);
   static oop requested_obj_from_buffer_offset(size_t offset);
 
@@ -217,7 +216,7 @@ private:
   template <typename T> static void store_requested_oop_in_buffer(T* buffered_addr, oop request_oop);
 
   template <typename T> static T* requested_addr_to_buffered_addr(T* p);
-  template <typename T> static void relocate_field_in_buffer(T* field_addr_in_buffer, CHeapBitMap* oopmap);
+  template <typename T> static void relocate_field_in_buffer(T* field_addr_in_buffer, oop source_referent, CHeapBitMap* oopmap);
   template <typename T> static void mark_oop_pointer(T* buffered_addr, CHeapBitMap* oopmap);
 
   static void update_header_for_requested_obj(oop requested_obj, oop src_obj, Klass* src_klass);
@@ -232,7 +231,9 @@ public:
   static bool is_too_large_to_archive(size_t size);
   static bool is_too_large_to_archive(oop obj);
   static bool is_string_too_large_to_archive(oop string);
-  static void write(GrowableArrayCHeap<oop, mtClassShared>*, ArchiveHeapInfo* heap_info);
+  static bool is_dumped_interned_string(oop o);
+  static void add_to_dumped_interned_strings(oop string);
+  static void write(GrowableArrayCHeap<oop, mtClassShared>*, ArchiveMappedHeapInfo* heap_info);
   static address requested_address();  // requested address of the lowest achived heap object
   static size_t get_filler_size_at(address buffered_addr);
 
@@ -242,6 +243,8 @@ public:
   static address buffered_addr_to_requested_addr(address buffered_addr);
   static Klass* real_klass_of_buffered_oop(address buffered_addr);
   static size_t size_of_buffered_oop(address buffered_addr);
+
+  static AOTMapLogger::OopDataIterator* oop_iterator(ArchiveMappedHeapInfo* heap_info);
 };
 #endif // INCLUDE_CDS_JAVA_HEAP
-#endif // SHARE_CDS_ARCHIVEHEAPWRITER_HPP
+#endif // SHARE_CDS_AOTMAPPEDHEAPWRITER_HPP
diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index e5c1700dbfb..8642b1a6de8 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -30,11 +30,10 @@
 #include "cds/aotLinkedClassBulkLoader.hpp"
 #include "cds/aotLogging.hpp"
 #include "cds/aotMapLogger.hpp"
+#include "cds/aotMappedHeapLoader.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsProtectionDomain.hpp"
@@ -45,7 +44,7 @@
 #include "cds/dynamicArchive.hpp"
 #include "cds/filemap.hpp"
 #include "cds/finalImageRecipes.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "cds/lambdaFormInvokers.hpp"
 #include "cds/lambdaProxyClassDictionary.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
@@ -339,7 +338,10 @@ void AOTMetaspace::post_initialize(TRAPS) {
 
     // Close any open file descriptors. However, mmap'ed pages will remain in memory.
     static_mapinfo->close();
-    static_mapinfo->unmap_region(AOTMetaspace::bm);
+
+    if (HeapShared::is_loading() && HeapShared::is_loading_mapping_mode()) {
+      static_mapinfo->unmap_region(AOTMetaspace::bm);
+    }
 
     if (dynamic_mapinfo != nullptr) {
       dynamic_mapinfo->close();
@@ -395,7 +397,7 @@ void AOTMetaspace::read_extra_data(JavaThread* current, const char* filename) {
         CLEAR_PENDING_EXCEPTION;
       } else {
 #if INCLUDE_CDS_JAVA_HEAP
-        if (ArchiveHeapWriter::is_string_too_large_to_archive(str)) {
+        if (HeapShared::is_string_too_large_to_archive(str)) {
           log_warning(aot, heap)("[line %d] extra interned string ignored; size too large: %d",
                                  reader.last_line_no(), utf8_length);
           continue;
@@ -638,7 +640,8 @@ void AOTMetaspace::rewrite_bytecodes_and_calculate_fingerprints(Thread* thread,
 
 class VM_PopulateDumpSharedSpace : public VM_Operation {
 private:
-  ArchiveHeapInfo _heap_info;
+  ArchiveMappedHeapInfo _mapped_heap_info;
+  ArchiveStreamedHeapInfo _streamed_heap_info;
   FileMapInfo* _map_info;
   StaticArchiveBuilder& _builder;
 
@@ -653,12 +656,13 @@ private:
 public:
 
   VM_PopulateDumpSharedSpace(StaticArchiveBuilder& b) :
-    VM_Operation(), _heap_info(), _map_info(nullptr), _builder(b) {}
+    VM_Operation(), _mapped_heap_info(), _streamed_heap_info(), _map_info(nullptr), _builder(b) {}
 
   bool skip_operation() const { return false; }
 
   VMOp_Type type() const { return VMOp_PopulateDumpSharedSpace; }
-  ArchiveHeapInfo* heap_info()  { return &_heap_info; }
+  ArchiveMappedHeapInfo* mapped_heap_info()  { return &_mapped_heap_info; }
+  ArchiveStreamedHeapInfo* streamed_heap_info()  { return &_streamed_heap_info; }
   FileMapInfo* map_info() const { return _map_info; }
   void doit();   // outline because gdb sucks
   bool allow_nested_vm_operations() const { return true; }
@@ -1100,8 +1104,7 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
 
 #if INCLUDE_CDS_JAVA_HEAP
   if (CDSConfig::is_dumping_heap()) {
-    ArchiveHeapWriter::init();
-
+    HeapShared::init_heap_writer();
     if (CDSConfig::is_dumping_full_module_graph()) {
       ClassLoaderDataShared::ensure_module_entry_tables_exist();
       HeapShared::reset_archived_object_states(CHECK);
@@ -1124,9 +1127,11 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
       // See discussion in JDK-8342481.
     }
 
-    // Do this at the very end, when no Java code will be executed. Otherwise
-    // some new strings may be added to the intern table.
-    StringTable::allocate_shared_strings_array(CHECK);
+    if (HeapShared::is_writing_mapping_mode()) {
+      // Do this at the very end, when no Java code will be executed. Otherwise
+      // some new strings may be added to the intern table.
+      StringTable::allocate_shared_strings_array(CHECK);
+    }
   } else {
     log_info(aot)("Not dumping heap, reset CDSConfig::_is_using_optimized_module_handling");
     CDSConfig::stop_using_optimized_module_handling();
@@ -1147,7 +1152,7 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
     CDSConfig::disable_dumping_aot_code();
   }
 
-  bool status = write_static_archive(&builder, op.map_info(), op.heap_info());
+  bool status = write_static_archive(&builder, op.map_info(), op.mapped_heap_info(), op.streamed_heap_info());
   if (status && CDSConfig::is_dumping_preimage_static_archive()) {
     tty->print_cr("%s AOTConfiguration recorded: %s",
                   CDSConfig::has_temp_aot_config_file() ? "Temporary" : "", AOTConfiguration);
@@ -1161,7 +1166,10 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
   }
 }
 
-bool AOTMetaspace::write_static_archive(ArchiveBuilder* builder, FileMapInfo* map_info, ArchiveHeapInfo* heap_info) {
+bool AOTMetaspace::write_static_archive(ArchiveBuilder* builder,
+                                        FileMapInfo* map_info,
+                                        ArchiveMappedHeapInfo* mapped_heap_info,
+                                        ArchiveStreamedHeapInfo* streamed_heap_info) {
   // relocate the data so that it can be mapped to AOTMetaspace::requested_base_address()
   // without runtime relocation.
   builder->relocate_to_requested();
@@ -1170,7 +1178,7 @@ bool AOTMetaspace::write_static_archive(ArchiveBuilder* builder, FileMapInfo* ma
   if (!map_info->is_open()) {
     return false;
   }
-  builder->write_archive(map_info, heap_info);
+  builder->write_archive(map_info, mapped_heap_info, streamed_heap_info);
   return true;
 }
 
@@ -1344,7 +1352,7 @@ bool AOTMetaspace::try_link_class(JavaThread* current, InstanceKlass* ik) {
 
 void VM_PopulateDumpSharedSpace::dump_java_heap_objects() {
   if (CDSConfig::is_dumping_heap()) {
-    HeapShared::write_heap(&_heap_info);
+    HeapShared::write_heap(&_mapped_heap_info, &_streamed_heap_info);
   } else {
     CDSConfig::log_reasons_for_not_dumping_heap();
   }
@@ -1746,9 +1754,29 @@ MapArchiveResult AOTMetaspace::map_archives(FileMapInfo* static_mapinfo, FileMap
         CompressedKlassPointers::establish_protection_zone(klass_range_start, prot_zone_size);
       }
 
-      // map_or_load_heap_region() compares the current narrow oop and klass encodings
-      // with the archived ones, so it must be done after all encodings are determined.
-      static_mapinfo->map_or_load_heap_region();
+      if (static_mapinfo->can_use_heap_region()) {
+        if (static_mapinfo->object_streaming_mode()) {
+          HeapShared::initialize_loading_mode(HeapArchiveMode::_streaming);
+        } else {
+          // map_or_load_heap_region() compares the current narrow oop and klass encodings
+          // with the archived ones, so it must be done after all encodings are determined.
+          static_mapinfo->map_or_load_heap_region();
+          HeapShared::initialize_loading_mode(HeapArchiveMode::_mapping);
+        }
+      } else {
+        FileMapRegion* r = static_mapinfo->region_at(AOTMetaspace::hp);
+        if (r->used() > 0) {
+          if (static_mapinfo->object_streaming_mode()) {
+            AOTMetaspace::report_loading_error("Cannot use CDS heap data.");
+          } else {
+            if (!UseCompressedOops && !AOTMappedHeapLoader::can_map()) {
+              AOTMetaspace::report_loading_error("Cannot use CDS heap data. Selected GC not compatible -XX:-UseCompressedOops");
+            } else {
+              AOTMetaspace::report_loading_error("Cannot use CDS heap data. UseEpsilonGC, UseG1GC, UseSerialGC, UseParallelGC, or UseShenandoahGC are required.");
+            }
+          }
+        }
+      }
     }
 #endif // _LP64
     log_info(aot)("initial optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
@@ -2081,11 +2109,11 @@ void AOTMetaspace::initialize_shared_spaces() {
   ReadClosure rc(&array, (intptr_t)SharedBaseAddress);
   serialize(&rc);
 
-  // Finish up archived heap initialization. These must be
-  // done after ReadClosure.
-  static_mapinfo->patch_heap_embedded_pointers();
-  ArchiveHeapLoader::finish_initialization();
+  // Finish initializing the heap dump mode used in the archive
+  // Heap initialization can be done only after vtables are initialized by ReadClosure.
+  HeapShared::finalize_initialization(static_mapinfo);
   Universe::load_archived_object_instances();
+
   AOTCodeCache::initialize();
 
   if (dynamic_mapinfo != nullptr) {
@@ -2138,7 +2166,9 @@ void AOTMetaspace::initialize_shared_spaces() {
     CountSharedSymbols cl;
     SymbolTable::shared_symbols_do(&cl);
     tty->print_cr("Number of shared symbols: %zu", cl.total());
-    tty->print_cr("Number of shared strings: %zu", StringTable::shared_entry_count());
+    if (HeapShared::is_loading_mapping_mode()) {
+      tty->print_cr("Number of shared strings: %zu", StringTable::shared_entry_count());
+    }
     tty->print_cr("VM version: %s\r\n", static_mapinfo->vm_version());
     if (FileMapInfo::current_info() == nullptr || _archive_loading_failed) {
       tty->print_cr("archive is invalid");
diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp
index c7b1578ec08..bfd9f4bcc75 100644
--- a/src/hotspot/share/cds/aotMetaspace.hpp
+++ b/src/hotspot/share/cds/aotMetaspace.hpp
@@ -33,7 +33,8 @@
 #include "utilities/macros.hpp"
 
 class ArchiveBuilder;
-class ArchiveHeapInfo;
+class ArchiveMappedHeapInfo;
+class ArchiveStreamedHeapInfo;
 class FileMapInfo;
 class Method;
 class outputStream;
@@ -184,7 +185,10 @@ public:
 private:
   static void read_extra_data(JavaThread* current, const char* filename) NOT_CDS_RETURN;
   static void fork_and_dump_final_static_archive(TRAPS);
-  static bool write_static_archive(ArchiveBuilder* builder, FileMapInfo* map_info, ArchiveHeapInfo* heap_info);
+  static bool write_static_archive(ArchiveBuilder* builder,
+                                   FileMapInfo* map_info,
+                                   ArchiveMappedHeapInfo* mapped_heap_info,
+                                   ArchiveStreamedHeapInfo* streamed_heap_info);
   static FileMapInfo* open_static_archive();
   static FileMapInfo* open_dynamic_archive();
   // use_requested_addr: If true (default), attempt to map at the address the
diff --git a/src/hotspot/share/cds/aotReferenceObjSupport.cpp b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
index e1598035d15..aa7cc875533 100644
--- a/src/hotspot/share/cds/aotReferenceObjSupport.cpp
+++ b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
@@ -153,6 +153,9 @@ void AOTReferenceObjSupport::stabilize_cached_reference_objects(TRAPS) {
 
       _keep_alive_objs_array = OopHandle(Universe::vm_global(), result.get_oop());
     }
+
+    // Trigger a GC to prune eligible referents that were not kept alive
+    Universe::heap()->collect(GCCause::_java_lang_system_gc);
   }
 }
 
diff --git a/src/hotspot/share/cds/aotStreamedHeapLoader.cpp b/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
new file mode 100644
index 00000000000..9b6974bb48d
--- /dev/null
+++ b/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
@@ -0,0 +1,1190 @@
+/*
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotMetaspace.hpp"
+#include "cds/aotStreamedHeapLoader.hpp"
+#include "cds/aotThread.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "classfile/classLoaderDataShared.hpp"
+#include "classfile/javaClasses.inline.hpp"
+#include "classfile/stringTable.hpp"
+#include "classfile/vmClasses.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/oopStorage.inline.hpp"
+#include "gc/shared/oopStorageSet.inline.hpp"
+#include "logging/log.hpp"
+#include "memory/iterator.inline.hpp"
+#include "memory/oopFactory.hpp"
+#include "oops/access.inline.hpp"
+#include "oops/objArrayOop.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/globals_extension.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/java.hpp"
+#include "runtime/mutex.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/bitMap.inline.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/stack.inline.hpp"
+#include "utilities/ticks.hpp"
+
+#include <type_traits>
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+FileMapRegion* AOTStreamedHeapLoader::_heap_region;
+FileMapRegion* AOTStreamedHeapLoader::_bitmap_region;
+int* AOTStreamedHeapLoader::_roots_archive;
+OopHandle AOTStreamedHeapLoader::_roots;
+BitMapView AOTStreamedHeapLoader::_oopmap;
+bool AOTStreamedHeapLoader::_is_in_use;
+int AOTStreamedHeapLoader::_previous_batch_last_object_index;
+int AOTStreamedHeapLoader::_current_batch_last_object_index;
+int AOTStreamedHeapLoader::_current_root_index;
+size_t AOTStreamedHeapLoader::_allocated_words;
+bool AOTStreamedHeapLoader::_allow_gc;
+bool AOTStreamedHeapLoader::_objects_are_handles;
+size_t AOTStreamedHeapLoader::_num_archived_objects;
+int AOTStreamedHeapLoader::_num_roots;
+size_t AOTStreamedHeapLoader::_heap_region_used;
+bool AOTStreamedHeapLoader::_loading_all_objects;
+
+size_t* AOTStreamedHeapLoader::_object_index_to_buffer_offset_table;
+void** AOTStreamedHeapLoader::_object_index_to_heap_object_table;
+int* AOTStreamedHeapLoader::_root_highest_object_index_table;
+
+bool AOTStreamedHeapLoader::_waiting_for_iterator;
+bool AOTStreamedHeapLoader::_swapping_root_format;
+
+static uint64_t _early_materialization_time_ns = 0;
+static uint64_t _late_materialization_time_ns = 0;
+static uint64_t _final_materialization_time_ns = 0;
+static uint64_t _cleanup_materialization_time_ns = 0;
+static volatile uint64_t _accumulated_lazy_materialization_time_ns = 0;
+static Ticks _materialization_start_ticks;
+
+int AOTStreamedHeapLoader::object_index_for_root_index(int root_index) {
+  return _roots_archive[root_index];
+}
+
+int AOTStreamedHeapLoader::highest_object_index_for_root_index(int root_index) {
+  return _root_highest_object_index_table[root_index];
+}
+
+size_t AOTStreamedHeapLoader::buffer_offset_for_object_index(int object_index) {
+  return _object_index_to_buffer_offset_table[object_index];
+}
+
+oopDesc* AOTStreamedHeapLoader::archive_object_for_object_index(int object_index) {
+  size_t buffer_offset = buffer_offset_for_object_index(object_index);
+  address bottom = (address)_heap_region->mapped_base();
+  return (oopDesc*)(bottom + buffer_offset);
+}
+
+size_t AOTStreamedHeapLoader::buffer_offset_for_archive_object(oopDesc* archive_object) {
+  address bottom = (address)_heap_region->mapped_base();
+  return size_t(archive_object) - size_t(bottom);
+}
+
+template <bool use_coops>
+BitMap::idx_t AOTStreamedHeapLoader::obj_bit_idx_for_buffer_offset(size_t buffer_offset) {
+  if constexpr (use_coops) {
+    return BitMap::idx_t(buffer_offset / sizeof(narrowOop));
+  } else {
+    return BitMap::idx_t(buffer_offset / sizeof(HeapWord));
+  }
+}
+
+oop AOTStreamedHeapLoader::heap_object_for_object_index(int object_index) {
+  assert(object_index >= 0 && object_index <= (int)_num_archived_objects,
+         "Heap object reference out of index: %d", object_index);
+
+  if (_objects_are_handles) {
+    oop* handle = (oop*)_object_index_to_heap_object_table[object_index];
+    if (handle == nullptr) {
+      return nullptr;
+    }
+    return NativeAccess<>::oop_load(handle);
+  } else {
+    return cast_to_oop(_object_index_to_heap_object_table[object_index]);
+  }
+}
+
+void AOTStreamedHeapLoader::set_heap_object_for_object_index(int object_index, oop heap_object) {
+  assert(heap_object_for_object_index(object_index) == nullptr, "Should only set once with this API");
+  if (_objects_are_handles) {
+    oop* handle = Universe::vm_global()->allocate();
+    NativeAccess<>::oop_store(handle, heap_object);
+    _object_index_to_heap_object_table[object_index] = (void*)handle;
+  } else {
+    _object_index_to_heap_object_table[object_index] = cast_from_oop<void*>(heap_object);
+  }
+}
+
+int AOTStreamedHeapLoader::archived_string_value_object_index(oopDesc* archive_object) {
+    assert(archive_object->klass() == vmClasses::String_klass(), "Must be an archived string");
+    address archive_string_value_addr = (address)archive_object + java_lang_String::value_offset();
+    return UseCompressedOops ? *(int*)archive_string_value_addr : (int)*(int64_t*)archive_string_value_addr;
+}
+
+static int archive_array_length(oopDesc* archive_array) {
+  return *(int*)(address(archive_array) + arrayOopDesc::length_offset_in_bytes());
+}
+
+static size_t archive_object_size(oopDesc* archive_object) {
+  Klass* klass = archive_object->klass();
+  int lh = klass->layout_helper();
+
+  if (Klass::layout_helper_is_instance(lh)) {
+    // Instance
+    if (Klass::layout_helper_needs_slow_path(lh)) {
+      return ((size_t*)(archive_object))[-1];
+    } else {
+      return (size_t)Klass::layout_helper_size_in_bytes(lh) >> LogHeapWordSize;
+    }
+  } else if (Klass::layout_helper_is_array(lh)) {
+    // Array
+    size_t size_in_bytes;
+    size_t array_length = (size_t)archive_array_length(archive_object);
+    size_in_bytes = array_length << Klass::layout_helper_log2_element_size(lh);
+    size_in_bytes += (size_t)Klass::layout_helper_header_size(lh);
+
+    return align_up(size_in_bytes, (size_t)MinObjAlignmentInBytes) / HeapWordSize;
+  } else {
+    // Other
+    return ((size_t*)(archive_object))[-1];
+  }
+}
+
+oop AOTStreamedHeapLoader::allocate_object(oopDesc* archive_object, markWord mark, size_t size, TRAPS) {
+  assert(!archive_object->is_stackChunk(), "no such objects are archived");
+
+  oop heap_object;
+
+  Klass* klass = archive_object->klass();
+  if (klass->is_mirror_instance_klass()) {
+    heap_object = Universe::heap()->class_allocate(klass, size, CHECK_NULL);
+  } else if (klass->is_instance_klass()) {
+    heap_object = Universe::heap()->obj_allocate(klass, size, CHECK_NULL);
+  } else {
+    assert(klass->is_array_klass(), "must be");
+    int length = archive_array_length(archive_object);
+    bool do_zero = klass->is_objArray_klass();
+    heap_object = Universe::heap()->array_allocate(klass, size, length, do_zero, CHECK_NULL);
+  }
+
+  heap_object->set_mark(mark);
+
+  return heap_object;
+}
+
+void AOTStreamedHeapLoader::install_root(int root_index, oop heap_object) {
+  objArrayOop roots = objArrayOop(_roots.resolve());
+  OrderAccess::release(); // Once the store below publishes an object, it can be concurrently picked up by another thread without using the lock
+  roots->obj_at_put(root_index, heap_object);
+}
+
+void AOTStreamedHeapLoader::TracingObjectLoader::wait_for_iterator() {
+  if (JavaThread::current()->is_active_Java_thread()) {
+    // When the main thread has bootstrapped past the point of allowing safepoints,
+    // we can and indeed have to use safepoint checking waiting.
+    AOTHeapLoading_lock->wait();
+  } else {
+    // If we have no bootstrapped the main thread far enough, then we cannot and
+    // indeed also don't need to perform safepoint checking waiting.
+    AOTHeapLoading_lock->wait_without_safepoint_check();
+  }
+}
+
+// Link object after copying in-place
+template <typename LinkerT>
+class AOTStreamedHeapLoader::InPlaceLinkingOopClosure : public BasicOopIterateClosure {
+private:
+  oop _obj;
+  LinkerT _linker;
+
+public:
+  InPlaceLinkingOopClosure(oop obj, LinkerT linker)
+    : _obj(obj),
+      _linker(linker) {
+  }
+
+  virtual void do_oop(oop* p) { do_oop_work(p, (int)*(intptr_t*)p); }
+  virtual void do_oop(narrowOop* p) { do_oop_work(p, *(int*)p); }
+
+  template <typename T>
+  void do_oop_work(T* p, int object_index) {
+    int p_offset = pointer_delta_as_int((address)p, cast_from_oop<address>(_obj));
+    oop pointee = _linker(p_offset, object_index);
+    if (pointee != nullptr) {
+      _obj->obj_field_put_access<IS_DEST_UNINITIALIZED>((int)p_offset, pointee);
+    }
+  }
+};
+
+template <bool use_coops, typename LinkerT>
+void AOTStreamedHeapLoader::copy_payload_carefully(oopDesc* archive_object,
+                                                   oop heap_object,
+                                                   BitMap::idx_t header_bit,
+                                                   BitMap::idx_t start_bit,
+                                                   BitMap::idx_t end_bit,
+                                                   LinkerT linker) {
+  using RawElementT = std::conditional_t<use_coops, int32_t, int64_t>;
+  using OopElementT = std::conditional_t<use_coops, narrowOop, oop>;
+
+  BitMap::idx_t unfinished_bit = start_bit;
+  BitMap::idx_t next_reference_bit = _oopmap.find_first_set_bit(unfinished_bit, end_bit);
+
+  // Fill in heap object bytes
+  while (unfinished_bit < end_bit) {
+    assert(unfinished_bit >= start_bit && unfinished_bit < end_bit, "out of bounds copying");
+
+    // This is the address of the pointee inside the input stream
+    size_t payload_offset = unfinished_bit - header_bit;
+    RawElementT* archive_payload_addr = ((RawElementT*)archive_object) + payload_offset;
+    RawElementT* heap_payload_addr = cast_from_oop<RawElementT*>(heap_object) + payload_offset;
+
+    assert(heap_payload_addr >= cast_from_oop<RawElementT*>(heap_object) &&
+           (HeapWord*)heap_payload_addr < cast_from_oop<HeapWord*>(heap_object) + heap_object->size(),
+           "Out of bounds copying");
+
+    if (next_reference_bit > unfinished_bit) {
+      // Primitive bytes available
+      size_t primitive_elements = next_reference_bit - unfinished_bit;
+      size_t primitive_bytes = primitive_elements * sizeof(RawElementT);
+      ::memcpy(heap_payload_addr, archive_payload_addr, primitive_bytes);
+
+      unfinished_bit = next_reference_bit;
+    } else {
+      // Encountered reference
+      RawElementT* archive_p = (RawElementT*)archive_payload_addr;
+      OopElementT* heap_p = (OopElementT*)heap_payload_addr;
+      int pointee_object_index = (int)*archive_p;
+      int heap_p_offset = pointer_delta_as_int((address)heap_p, cast_from_oop<address>(heap_object));
+
+      // The object index is retrieved from the archive, not the heap object. This is
+      // important after GC is enabled. Concurrent GC threads may scan references in the
+      // heap for various reasons after this point. Therefore, it is not okay to first copy
+      // the object index from a reference location in the archived object payload to a
+      // corresponding location in the heap object payload, and then fix it up afterwards to
+      // refer to a heap object. This is why this code iterates carefully over object references
+      // in the archived object, linking them one by one, without clobbering the reference
+      // locations in the heap objects with anything other than transitions from null to the
+      // intended linked object.
+      oop obj = linker(heap_p_offset, pointee_object_index);
+      if (obj != nullptr) {
+        heap_object->obj_field_put(heap_p_offset, obj);
+      }
+
+      unfinished_bit++;
+      next_reference_bit = _oopmap.find_first_set_bit(unfinished_bit, end_bit);
+    }
+  }
+}
+
+template <bool use_coops, typename LinkerT>
+void AOTStreamedHeapLoader::copy_object_impl(oopDesc* archive_object,
+                                             oop heap_object,
+                                             size_t size,
+                                             LinkerT linker) {
+  if (!_allow_gc) {
+    // Without concurrent GC running, we can copy incorrect object references
+    // and metadata references into the heap object and then fix them up in-place.
+    size_t payload_size = size - 1;
+    HeapWord* archive_start = ((HeapWord*)archive_object) + 1;
+    HeapWord* heap_start = cast_from_oop<HeapWord*>(heap_object) + 1;
+
+    Copy::disjoint_words(archive_start, heap_start, payload_size);
+
+    // In-place linking fixes up object indices from references of the heap object,
+    // and patches them up to refer to objects. This can be done because we just copied
+    // the payload of the object from the archive to the heap object, including the
+    // reference object indices. However, this is only okay to do before the GC can run.
+    // A concurrent GC thread might racingly read the object payload after GC is enabled.
+    InPlaceLinkingOopClosure cl(heap_object, linker);
+    heap_object->oop_iterate(&cl);
+    HeapShared::remap_loaded_metadata(heap_object);
+    return;
+  }
+
+  // When a concurrent GC may be running, we take care not to copy incorrect oops,
+  // narrowOops or Metadata* into the heap objects. Transitions go from 0 to the
+  // intended runtime linked values only.
+  size_t word_scale = use_coops ? 2 : 1;
+  using RawElementT = std::conditional_t<use_coops, int32_t, int64_t>;
+
+  // Skip the markWord; it is set at allocation time
+  size_t header_size = word_scale;
+
+  size_t buffer_offset = buffer_offset_for_archive_object(archive_object);
+  const BitMap::idx_t header_bit = obj_bit_idx_for_buffer_offset<use_coops>(buffer_offset);
+  const BitMap::idx_t start_bit = header_bit + header_size;
+  const BitMap::idx_t end_bit = header_bit + size * word_scale;
+
+  BitMap::idx_t curr_bit = start_bit;
+
+  // We are a bit paranoid about GC or other safepointing operations observing
+  // shady metadata fields from the archive that do not point at real metadata.
+  // We deal with this by explicitly reading the requested address from the
+  // archive and fixing it to real Metadata before writing it into the heap object.
+  HeapShared::do_metadata_offsets(heap_object, [&](int metadata_offset) {
+    BitMap::idx_t metadata_field_idx = header_bit + (size_t)metadata_offset / sizeof(RawElementT);
+    BitMap::idx_t skip = word_scale;
+    assert(metadata_field_idx >= start_bit && metadata_field_idx + skip <= end_bit,
+           "Metadata field out of bounds");
+
+    // Copy payload before metadata field
+    copy_payload_carefully<use_coops>(archive_object,
+                                      heap_object,
+                                      header_bit,
+                                      curr_bit,
+                                      metadata_field_idx,
+                                      linker);
+
+    // Copy metadata field
+    Metadata* const archive_metadata = *(Metadata**)(uintptr_t(archive_object) + (size_t)metadata_offset);
+    Metadata* const runtime_metadata = archive_metadata != nullptr
+        ? (Metadata*)(address(archive_metadata) + AOTMetaspace::relocation_delta())
+        : nullptr;
+    assert(runtime_metadata == nullptr || AOTMetaspace::in_aot_cache(runtime_metadata), "Invalid metadata pointer");
+    DEBUG_ONLY(Metadata* const previous_metadata = heap_object->metadata_field(metadata_offset);)
+    assert(previous_metadata == nullptr || previous_metadata == runtime_metadata, "Should not observe transient values");
+    heap_object->metadata_field_put(metadata_offset, runtime_metadata);
+    curr_bit = metadata_field_idx + skip;
+  });
+
+  // Copy trailing metadata after the last metadata word. This is usually doing
+  // all the copying.
+  copy_payload_carefully<use_coops>(archive_object,
+                                    heap_object,
+                                    header_bit,
+                                    curr_bit,
+                                    end_bit,
+                                    linker);
+}
+
+void AOTStreamedHeapLoader::copy_object_eager_linking(oopDesc* archive_object, oop heap_object, size_t size) {
+  auto linker = [&](int p_offset, int pointee_object_index) {
+    oop obj = AOTStreamedHeapLoader::heap_object_for_object_index(pointee_object_index);
+    assert(pointee_object_index == 0 || obj != nullptr, "Eager object loading should only encounter already allocated links");
+    return obj;
+  };
+  if (UseCompressedOops) {
+    copy_object_impl<true>(archive_object, heap_object, size, linker);
+  } else {
+    copy_object_impl<false>(archive_object, heap_object, size, linker);
+  }
+}
+
+void AOTStreamedHeapLoader::TracingObjectLoader::copy_object_lazy_linking(int object_index,
+                                                                          oopDesc* archive_object,
+                                                                          oop heap_object,
+                                                                          size_t size,
+                                                                          Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack) {
+  auto linker = [&](int p_offset, int pointee_object_index) {
+    dfs_stack.push({pointee_object_index, object_index, p_offset});
+
+    // The tracing linker is a bit lazy and mutates the reference fields in its traversal.
+    // Returning null means don't link now.
+    return oop(nullptr);
+  };
+  if (UseCompressedOops) {
+    copy_object_impl<true>(archive_object, heap_object, size, linker);
+  } else {
+    copy_object_impl<false>(archive_object, heap_object, size, linker);
+  }
+}
+
+oop AOTStreamedHeapLoader::TracingObjectLoader::materialize_object_inner(int object_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS) {
+  // Allocate object
+  oopDesc* archive_object = archive_object_for_object_index(object_index);
+  size_t size = archive_object_size(archive_object);
+  markWord mark = archive_object->mark();
+
+  // The markWord is marked if the object is a String and it should be interned,
+  // make sure to unmark it before allocating memory for the object.
+  bool string_intern = mark.is_marked();
+  mark = mark.set_unmarked();
+
+  oop heap_object;
+
+  if (string_intern) {
+    int value_object_index = archived_string_value_object_index(archive_object);
+
+    // Materialize the value object.
+    (void)materialize_object(value_object_index, dfs_stack, CHECK_NULL);
+
+    // Allocate and link the string.
+    heap_object = allocate_object(archive_object, mark, size, CHECK_NULL);
+    copy_object_eager_linking(archive_object, heap_object, size);
+
+    assert(java_lang_String::value(heap_object) == heap_object_for_object_index(value_object_index), "Linker should have linked this correctly");
+
+    // Replace the string with interned string
+    heap_object = StringTable::intern(heap_object, CHECK_NULL);
+  } else {
+    heap_object = allocate_object(archive_object, mark, size, CHECK_NULL);
+
+    // Fill in object contents
+    copy_object_lazy_linking(object_index, archive_object, heap_object, size, dfs_stack);
+  }
+
+  // Install forwarding
+  set_heap_object_for_object_index(object_index, heap_object);
+
+  return heap_object;
+}
+
+oop AOTStreamedHeapLoader::TracingObjectLoader::materialize_object(int object_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS) {
+  if (object_index <= _previous_batch_last_object_index) {
+    // The transitive closure of this object has been materialized; no need to do anything
+    return heap_object_for_object_index(object_index);
+  }
+
+  if (object_index <= _current_batch_last_object_index) {
+    // The AOTThread is currently materializing this object and its transitive closure; only need to wait for it to complete
+    _waiting_for_iterator = true;
+    while (object_index > _previous_batch_last_object_index) {
+      wait_for_iterator();
+    }
+    _waiting_for_iterator = false;
+
+    // Notify the AOT thread if it is waiting for tracing to finish
+    AOTHeapLoading_lock->notify_all();
+    return heap_object_for_object_index(object_index);;
+  }
+
+  oop heap_object = heap_object_for_object_index(object_index);
+  if (heap_object != nullptr) {
+    // Already materialized by mutator
+    return heap_object;
+  }
+
+  return materialize_object_inner(object_index, dfs_stack, THREAD);
+}
+
+void AOTStreamedHeapLoader::TracingObjectLoader::drain_stack(Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS) {
+  while (!dfs_stack.is_empty()) {
+    AOTHeapTraversalEntry entry = dfs_stack.pop();
+    int pointee_object_index = entry._pointee_object_index;
+    oop pointee_heap_object = materialize_object(pointee_object_index, dfs_stack, CHECK);
+    oop heap_object = heap_object_for_object_index(entry._base_object_index);
+    if (_allow_gc) {
+      heap_object->obj_field_put(entry._heap_field_offset_bytes, pointee_heap_object);
+    } else {
+      heap_object->obj_field_put_access<IS_DEST_UNINITIALIZED>(entry._heap_field_offset_bytes, pointee_heap_object);
+    }
+  }
+}
+
+oop AOTStreamedHeapLoader::TracingObjectLoader::materialize_object_transitive(int object_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS) {
+  assert_locked_or_safepoint(AOTHeapLoading_lock);
+  while (_waiting_for_iterator) {
+    wait_for_iterator();
+  }
+
+  auto handlized_materialize_object = [&](TRAPS) {
+    oop obj = materialize_object(object_index, dfs_stack, CHECK_(Handle()));
+    return Handle(THREAD, obj);
+  };
+
+  Handle result = handlized_materialize_object(CHECK_NULL);
+  drain_stack(dfs_stack, CHECK_NULL);
+
+  return result();
+}
+
+oop AOTStreamedHeapLoader::TracingObjectLoader::materialize_root(int root_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS) {
+  int root_object_index = object_index_for_root_index(root_index);
+  oop root = materialize_object_transitive(root_object_index, dfs_stack, CHECK_NULL);
+  install_root(root_index, root);
+
+  return root;
+}
+
+int oop_handle_cmp(const void* left, const void* right) {
+  oop* left_handle = *(oop**)left;
+  oop* right_handle = *(oop**)right;
+
+  if (right_handle > left_handle) {
+    return -1;
+  } else if (left_handle > right_handle) {
+    return 1;
+  }
+
+  return 0;
+}
+
+// The range is inclusive
+void AOTStreamedHeapLoader::IterativeObjectLoader::initialize_range(int first_object_index, int last_object_index, TRAPS) {
+  for (int i = first_object_index; i <= last_object_index; ++i) {
+    oopDesc* archive_object = archive_object_for_object_index(i);
+    markWord mark = archive_object->mark();
+    bool string_intern = mark.is_marked();
+    if (string_intern) {
+      int value_object_index = archived_string_value_object_index(archive_object);
+      if (value_object_index == i + 1) {
+        // Interned strings are eagerly materialized in the allocation phase, so there is
+        // nothing else to do for interned strings here for the string nor its value array.
+        i++;
+      }
+      continue;
+    }
+    size_t size = archive_object_size(archive_object);
+    oop heap_object = heap_object_for_object_index(i);
+    copy_object_eager_linking(archive_object, heap_object, size);
+  }
+}
+
+// The range is inclusive
+size_t AOTStreamedHeapLoader::IterativeObjectLoader::materialize_range(int first_object_index, int last_object_index, TRAPS) {
+  GrowableArrayCHeap<int, mtClassShared> lazy_object_indices(0);
+  size_t materialized_words = 0;
+
+  for (int i = first_object_index; i <= last_object_index; ++i) {
+    oopDesc* archive_object = archive_object_for_object_index(i);
+    markWord mark = archive_object->mark();
+
+    // The markWord is marked if the object is a String and it should be interned,
+    // make sure to unmark it before allocating memory for the object.
+    bool string_intern = mark.is_marked();
+    mark = mark.set_unmarked();
+
+    size_t size = archive_object_size(archive_object);
+    materialized_words += size;
+
+    oop heap_object = heap_object_for_object_index(i);
+    if (heap_object != nullptr) {
+      // Lazy loading has already initialized the object; we must not mutate it
+      lazy_object_indices.append(i);
+      continue;
+    }
+
+    if (!string_intern) {
+     // The normal case; no lazy loading have loaded the object yet
+      heap_object = allocate_object(archive_object, mark, size, CHECK_0);
+      set_heap_object_for_object_index(i, heap_object);
+      continue;
+    }
+
+    // Eagerly materialize interned strings to ensure that objects earlier than the string
+    // in a batch get linked to the intended interned string, and not a copy.
+    int value_object_index = archived_string_value_object_index(archive_object);
+
+    bool is_normal_interned_string = value_object_index == i + 1;
+
+    if (value_object_index < first_object_index) {
+      // If materialized in a previous batch, the value should already be allocated and initialized.
+      assert(heap_object_for_object_index(value_object_index) != nullptr, "should be materialized");
+    } else {
+      // Materialize the value object.
+      oopDesc* archive_value_object = archive_object_for_object_index(value_object_index);
+      markWord value_mark = archive_value_object->mark();
+      size_t value_size = archive_object_size(archive_value_object);
+      oop value_heap_object;
+
+      if (is_normal_interned_string) {
+        // The common case: the value is next to the string. This happens when only the interned
+        // string points to its value character array.
+        assert(value_object_index <= last_object_index, "Must be within this batch: %d <= %d", value_object_index, last_object_index);
+        value_heap_object = allocate_object(archive_value_object, value_mark, value_size, CHECK_0);
+        set_heap_object_for_object_index(value_object_index, value_heap_object);
+        materialized_words += value_size;
+      } else {
+        // In the uncommon case, multiple strings point to the value of an interned string.
+        // The string can then be earlier in the batch.
+        assert(value_object_index < i, "surprising index");
+        value_heap_object = heap_object_for_object_index(value_object_index);
+      }
+
+      copy_object_eager_linking(archive_value_object, value_heap_object, value_size);
+    }
+    // Allocate and link the string.
+    heap_object = allocate_object(archive_object, mark, size, CHECK_0);
+    copy_object_eager_linking(archive_object, heap_object, size);
+
+    assert(java_lang_String::value(heap_object) == heap_object_for_object_index(value_object_index), "Linker should have linked this correctly");
+
+    // Replace the string with interned string
+    heap_object = StringTable::intern(heap_object, CHECK_0);
+    set_heap_object_for_object_index(i, heap_object);
+
+    if (is_normal_interned_string) {
+      // Skip over the string value, already materialized
+      i++;
+    }
+  }
+
+  if (lazy_object_indices.is_empty()) {
+    // Normal case; no sprinkled lazy objects in the root subgraph
+    initialize_range(first_object_index, last_object_index, CHECK_0);
+  } else {
+    // The user lazy initialized some objects that are already initialized; we have to initialize around them
+    // to make sure they are not mutated.
+    int previous_object_index = first_object_index - 1; // Exclusive start of initialization slice
+    for (int i = 0; i < lazy_object_indices.length(); ++i) {
+      int lazy_object_index = lazy_object_indices.at(i);
+      int slice_start_object_index = previous_object_index;
+      int slice_end_object_index = lazy_object_index;
+
+      if (slice_end_object_index - slice_start_object_index > 1) { // Both markers are exclusive
+        initialize_range(slice_start_object_index + 1, slice_end_object_index - 1, CHECK_0);
+      }
+      previous_object_index = lazy_object_index;
+    }
+    // Process tail range
+    if (last_object_index - previous_object_index > 0) {
+      initialize_range(previous_object_index + 1, last_object_index, CHECK_0);
+    }
+  }
+
+  return materialized_words;
+}
+
+bool AOTStreamedHeapLoader::IterativeObjectLoader::has_more() {
+  return _current_root_index < _num_roots;
+}
+
+void AOTStreamedHeapLoader::IterativeObjectLoader::materialize_next_batch(TRAPS) {
+  assert(has_more(), "only materialize if there is something to materialize");
+
+  int min_batch_objects = 128;
+  int from_root_index = _current_root_index;
+  int max_to_root_index = _num_roots - 1;
+  int until_root_index = from_root_index;
+  int highest_object_index;
+
+  // Expand the batch size from one root, to N roots until we cross 128 objects in total
+  for (;;) {
+    highest_object_index = highest_object_index_for_root_index(until_root_index);
+    if (highest_object_index - _previous_batch_last_object_index >= min_batch_objects) {
+      break;
+    }
+    if (until_root_index == max_to_root_index) {
+      break;
+    }
+    until_root_index++;
+  }
+
+  oop root = nullptr;
+
+  // Materialize objects of necessary, representing the transitive closure of the root
+  if (highest_object_index > _previous_batch_last_object_index) {
+    while (_swapping_root_format) {
+      // When the roots are being upgraded to use handles, it is not safe to racingly
+      // iterate over the object; we must wait. Setting the current batch last object index
+      // to something other than the previous batch last object index indicates to the
+      // root swapping that there is current iteration ongoing.
+      AOTHeapLoading_lock->wait();
+    }
+    int first_object_index = _previous_batch_last_object_index + 1;
+    _current_batch_last_object_index = highest_object_index;
+    size_t allocated_words;
+    {
+      MutexUnlocker ml(AOTHeapLoading_lock, Mutex::_safepoint_check_flag);
+      allocated_words = materialize_range(first_object_index, highest_object_index, CHECK);
+    }
+    _allocated_words += allocated_words;
+    _previous_batch_last_object_index = _current_batch_last_object_index;
+    if (_waiting_for_iterator) {
+      // If tracer is waiting, let it know at the next point of unlocking that the root
+      // set it waited for has been processed now.
+      AOTHeapLoading_lock->notify_all();
+    }
+  }
+
+  // Install the root
+  for (int i = from_root_index; i <= until_root_index; ++i) {
+    int root_object_index = object_index_for_root_index(i);
+    root = heap_object_for_object_index(root_object_index);
+    install_root(i, root);
+    ++_current_root_index;
+  }
+}
+
+bool AOTStreamedHeapLoader::materialize_early(TRAPS) {
+  Ticks start = Ticks::now();
+
+  // Only help with early materialization from the AOT thread if the heap archive can be allocated
+  // without the need for a GC. Otherwise, do lazy loading until GC is enabled later in the bootstrapping.
+  size_t bootstrap_max_memory = Universe::heap()->bootstrap_max_memory();
+  size_t bootstrap_min_memory = MAX2(_heap_region_used, 2 * M);
+
+  size_t before_gc_materialize_budget_bytes = (bootstrap_max_memory > bootstrap_min_memory) ? bootstrap_max_memory - bootstrap_min_memory : 0;
+  size_t before_gc_materialize_budget_words = before_gc_materialize_budget_bytes / HeapWordSize;
+
+  log_info(aot, heap)("Max bootstrapping memory: %zuM, min bootstrapping memory: %zuM, selected budget: %zuM",
+                      bootstrap_max_memory / M, bootstrap_min_memory / M, before_gc_materialize_budget_bytes / M);
+
+  while (IterativeObjectLoader::has_more()) {
+    if (_allow_gc || _allocated_words > before_gc_materialize_budget_words) {
+      log_info(aot, heap)("Early object materialization interrupted at root %d", _current_root_index);
+      break;
+    }
+
+    IterativeObjectLoader::materialize_next_batch(CHECK_false);
+  }
+
+  _early_materialization_time_ns = (Ticks::now() - start).nanoseconds();
+
+  bool finished_before_gc_allowed = !_allow_gc && !IterativeObjectLoader::has_more();
+
+  return finished_before_gc_allowed;
+}
+
+void AOTStreamedHeapLoader::materialize_late(TRAPS) {
+  Ticks start = Ticks::now();
+
+  // Continue materializing with GC allowed
+
+  while (IterativeObjectLoader::has_more()) {
+    IterativeObjectLoader::materialize_next_batch(CHECK);
+  }
+
+  _late_materialization_time_ns = (Ticks::now() - start).nanoseconds();
+}
+
+void AOTStreamedHeapLoader::cleanup() {
+  // First ensure there is no concurrent tracing going on
+  while (_waiting_for_iterator) {
+    AOTHeapLoading_lock->wait();
+  }
+
+  Ticks start = Ticks::now();
+
+  // Remove OopStorage roots
+  if (_objects_are_handles) {
+    size_t num_handles = _num_archived_objects;
+    // Skip the null entry
+    oop** handles = ((oop**)_object_index_to_heap_object_table) + 1;
+    // Sort the handles so that oop storage can release them faster
+    qsort(handles, num_handles, sizeof(oop*), (int (*)(const void*, const void*))oop_handle_cmp);
+    size_t num_null_handles = 0;
+    for (size_t handles_remaining = num_handles; handles_remaining != 0; --handles_remaining) {
+      oop* handle = handles[handles_remaining - 1];
+      if (handle == nullptr) {
+        num_null_handles = handles_remaining;
+        break;
+      }
+      NativeAccess<>::oop_store(handle, nullptr);
+    }
+    Universe::vm_global()->release(&handles[num_null_handles], num_handles - num_null_handles);
+  }
+
+  FREE_C_HEAP_ARRAY(void*, _object_index_to_heap_object_table);
+
+  // Unmap regions
+  FileMapInfo::current_info()->unmap_region(AOTMetaspace::hp);
+  FileMapInfo::current_info()->unmap_region(AOTMetaspace::bm);
+
+  _cleanup_materialization_time_ns = (Ticks::now() - start).nanoseconds();
+
+  log_statistics();
+}
+
+void AOTStreamedHeapLoader::log_statistics() {
+  uint64_t total_duration_us = (Ticks::now() - _materialization_start_ticks).microseconds();
+  const bool is_async = _loading_all_objects && !AOTEagerlyLoadObjects;
+  const char* const async_or_sync = is_async ? "async" : "sync";
+  log_info(aot, heap)("start to finish materialization time: " UINT64_FORMAT "us",
+                      total_duration_us);
+  log_info(aot, heap)("early object materialization time (%s): " UINT64_FORMAT "us",
+                      async_or_sync, _early_materialization_time_ns / 1000);
+  log_info(aot, heap)("late object materialization time (%s): " UINT64_FORMAT "us",
+                      async_or_sync, _late_materialization_time_ns / 1000);
+  log_info(aot, heap)("object materialization cleanup time (%s): " UINT64_FORMAT "us",
+                      async_or_sync, _cleanup_materialization_time_ns / 1000);
+  log_info(aot, heap)("final object materialization time stall (sync): " UINT64_FORMAT "us",
+                      _final_materialization_time_ns / 1000);
+  log_info(aot, heap)("bootstrapping lazy materialization time (sync): " UINT64_FORMAT "us",
+                      _accumulated_lazy_materialization_time_ns / 1000);
+
+  uint64_t sync_time = _final_materialization_time_ns + _accumulated_lazy_materialization_time_ns;
+  uint64_t async_time = _early_materialization_time_ns + _late_materialization_time_ns + _cleanup_materialization_time_ns;
+
+  if (!is_async) {
+    sync_time += async_time;
+    async_time = 0;
+  }
+
+  log_info(aot, heap)("sync materialization time: " UINT64_FORMAT "us",
+                      sync_time / 1000);
+
+  log_info(aot, heap)("async materialization time: " UINT64_FORMAT "us",
+                      async_time / 1000);
+
+  uint64_t iterative_time = (uint64_t)(is_async ? async_time : sync_time);
+  uint64_t materialized_bytes = _allocated_words * HeapWordSize;
+  log_info(aot, heap)("%s materialized " UINT64_FORMAT "K (" UINT64_FORMAT "M/s)", async_or_sync,
+                      materialized_bytes / 1024, uint64_t(materialized_bytes * UCONST64(1'000'000'000) / M / iterative_time));
+}
+
+void AOTStreamedHeapLoader::materialize_objects() {
+  // We cannot handle any exception when materializing roots. Exits the VM.
+  EXCEPTION_MARK
+
+  // Objects are laid out in DFS order; DFS traverse the roots by linearly walking all objects
+  HandleMark hm(THREAD);
+
+  // Early materialization with a budget before GC is allowed
+  MutexLocker ml(AOTHeapLoading_lock, Mutex::_safepoint_check_flag);
+
+  materialize_early(CHECK);
+  await_gc_enabled();
+  materialize_late(CHECK);
+  // Notify materialization is done
+  AOTHeapLoading_lock->notify_all();
+  cleanup();
+}
+
+void AOTStreamedHeapLoader::switch_object_index_to_handle(int object_index) {
+  oop heap_object = cast_to_oop(_object_index_to_heap_object_table[object_index]);
+  if (heap_object == nullptr) {
+    return;
+  }
+
+  oop* handle = Universe::vm_global()->allocate();
+  NativeAccess<>::oop_store(handle, heap_object);
+  _object_index_to_heap_object_table[object_index] = handle;
+}
+
+void AOTStreamedHeapLoader::enable_gc() {
+  if (AOTEagerlyLoadObjects && !IterativeObjectLoader::has_more()) {
+    // Everything was loaded eagerly at early startup
+    return;
+  }
+
+  // We cannot handle any exception when materializing roots. Exits the VM.
+  EXCEPTION_MARK
+
+  MutexLocker ml(AOTHeapLoading_lock, Mutex::_safepoint_check_flag);
+
+  // First wait until no tracing is active
+  while (_waiting_for_iterator) {
+    AOTHeapLoading_lock->wait();
+  }
+
+  // Lock further tracing from starting
+  _waiting_for_iterator = true;
+
+  // Record iterator progress
+  int num_handles = (int)_num_archived_objects;
+
+  // Lock further iteration from starting
+  _swapping_root_format = true;
+
+  // Then wait for the iterator to stop
+  while (_previous_batch_last_object_index != _current_batch_last_object_index) {
+    AOTHeapLoading_lock->wait();
+  }
+
+  if (IterativeObjectLoader::has_more()) {
+    // If there is more to be materialized, we have to upgrade the object index
+    // to object mapping to use handles. If there isn't more to materialize, the
+    // handle will no longer e used; they are only used to materialize objects.
+
+    for (int i = 1; i <= num_handles; ++i) {
+      // Upgrade the roots to use handles
+      switch_object_index_to_handle(i);
+    }
+
+    // From now on, accessing the object table must be done through a handle.
+    _objects_are_handles = true;
+  }
+
+  // Unlock tracing
+  _waiting_for_iterator = false;
+
+  // Unlock iteration
+  _swapping_root_format = false;
+
+  _allow_gc = true;
+
+  AOTHeapLoading_lock->notify_all();
+
+  if (AOTEagerlyLoadObjects && IterativeObjectLoader::has_more()) {
+    materialize_late(CHECK);
+    cleanup();
+  }
+}
+
+void AOTStreamedHeapLoader::materialize_thread_object() {
+  AOTThread::materialize_thread_object();
+}
+
+void AOTStreamedHeapLoader::finish_materialize_objects() {
+  Ticks start = Ticks::now();
+
+  if (_loading_all_objects) {
+    MutexLocker ml(AOTHeapLoading_lock, Mutex::_safepoint_check_flag);
+    // Wait for the AOT thread to finish
+    while (IterativeObjectLoader::has_more()) {
+      AOTHeapLoading_lock->wait();
+    }
+  } else {
+    assert(!AOTEagerlyLoadObjects, "sanity");
+    assert(_current_root_index == 0, "sanity");
+    // Without the full module graph we have done only lazy tracing materialization.
+    // Ensure all roots are processed here by triggering root loading on every root.
+    for (int i = 0; i < _num_roots; ++i) {
+      get_root(i);
+    }
+    cleanup();
+  }
+
+  _final_materialization_time_ns = (Ticks::now() - start).nanoseconds();
+}
+
+void account_lazy_materialization_time_ns(uint64_t time, const char* description, int index) {
+  AtomicAccess::add(&_accumulated_lazy_materialization_time_ns, time);
+  log_debug(aot, heap)("Lazy materialization of %s: %d end (" UINT64_FORMAT " us of " UINT64_FORMAT " us)", description, index, time / 1000, _accumulated_lazy_materialization_time_ns / 1000);
+}
+
+// Initialize an empty array of AOT heap roots; materialize them lazily
+void AOTStreamedHeapLoader::initialize() {
+  EXCEPTION_MARK
+
+  _materialization_start_ticks = Ticks::now();
+
+  FileMapInfo::current_info()->map_bitmap_region();
+
+  _heap_region = FileMapInfo::current_info()->region_at(AOTMetaspace::hp);
+  _bitmap_region = FileMapInfo::current_info()->region_at(AOTMetaspace::bm);
+
+  assert(_heap_region->used() > 0, "empty heap archive?");
+
+  _is_in_use = true;
+
+  // archived roots are at this offset in the stream.
+  size_t roots_offset = FileMapInfo::current_info()->streamed_heap()->roots_offset();
+  size_t forwarding_offset = FileMapInfo::current_info()->streamed_heap()->forwarding_offset();
+  size_t root_highest_object_index_table_offset = FileMapInfo::current_info()->streamed_heap()->root_highest_object_index_table_offset();
+  _num_archived_objects = FileMapInfo::current_info()->streamed_heap()->num_archived_objects();
+
+  // The first int is the length of the array
+  _roots_archive = ((int*)(((address)_heap_region->mapped_base()) + roots_offset)) + 1;
+  _num_roots = _roots_archive[-1];
+  _heap_region_used = _heap_region->used();
+
+  // We can't retire a TLAB until the filler klass is set; set it to the archived object klass.
+  CollectedHeap::set_filler_object_klass(vmClasses::Object_klass());
+
+  objArrayOop roots = oopFactory::new_objectArray(_num_roots, CHECK);
+  _roots = OopHandle(Universe::vm_global(), roots);
+
+  _object_index_to_buffer_offset_table = (size_t*)(((address)_heap_region->mapped_base()) + forwarding_offset);
+  // We allocate the first entry for "null"
+  _object_index_to_heap_object_table = NEW_C_HEAP_ARRAY(void*, _num_archived_objects + 1, mtClassShared);
+  Copy::zero_to_bytes(_object_index_to_heap_object_table, (_num_archived_objects + 1) * sizeof(void*));
+
+  _root_highest_object_index_table = (int*)(((address)_heap_region->mapped_base()) + root_highest_object_index_table_offset);
+
+  address start = (address)(_bitmap_region->mapped_base()) + _heap_region->oopmap_offset();
+  _oopmap = BitMapView((BitMap::bm_word_t*)start, _heap_region->oopmap_size_in_bits());
+
+
+  if (FLAG_IS_DEFAULT(AOTEagerlyLoadObjects)) {
+    // Concurrency will not help much if there are no extra cores available.
+    FLAG_SET_ERGO(AOTEagerlyLoadObjects, os::initial_active_processor_count() <= 1);
+  }
+
+  // If the full module graph is not available or the JVMTI class file load hook is on, we
+  // will prune the object graph to not include cached objects in subgraphs that are not intended
+  // to be loaded.
+  _loading_all_objects = CDSConfig::is_using_full_module_graph() && !JvmtiExport::should_post_class_file_load_hook();
+  if (!_loading_all_objects) {
+    // When not using FMG, fall back to tracing materialization
+    FLAG_SET_ERGO(AOTEagerlyLoadObjects, false);
+    return;
+  }
+
+  if (AOTEagerlyLoadObjects) {
+    // Objects are laid out in DFS order; DFS traverse the roots by linearly walking all objects
+    HandleMark hm(THREAD);
+
+    // Early materialization with a budget before GC is allowed
+    MutexLocker ml(AOTHeapLoading_lock, Mutex::_safepoint_check_flag);
+
+    bool finished_before_gc_allowed = materialize_early(CHECK);
+    if (finished_before_gc_allowed) {
+      cleanup();
+    }
+  } else {
+    AOTThread::initialize();
+  }
+}
+
+oop AOTStreamedHeapLoader::materialize_root(int root_index) {
+  Ticks start = Ticks::now();
+  // We cannot handle any exception when materializing a root. Exits the VM.
+  EXCEPTION_MARK
+  Stack<AOTHeapTraversalEntry, mtClassShared> dfs_stack;
+  HandleMark hm(THREAD);
+
+  oop result;
+  {
+    MutexLocker ml(AOTHeapLoading_lock, Mutex::_safepoint_check_flag);
+
+    oop root = objArrayOop(_roots.resolve())->obj_at(root_index);
+
+    if (root != nullptr) {
+      // The root has already been materialized
+      result = root;
+    } else {
+      // The root has not been materialized, start tracing materialization
+      result = TracingObjectLoader::materialize_root(root_index, dfs_stack, CHECK_NULL);
+    }
+  }
+
+  uint64_t duration = (Ticks::now() - start).nanoseconds();
+
+  account_lazy_materialization_time_ns(duration, "root", root_index);
+
+  return result;
+}
+
+oop AOTStreamedHeapLoader::get_root(int index) {
+  oop result = objArrayOop(_roots.resolve())->obj_at(index);
+  if (result == nullptr) {
+    // Materialize root
+    result = materialize_root(index);
+  }
+  if (result == _roots.resolve()) {
+    // A self-reference to the roots array acts as a sentinel object for null,
+    // indicating that the root has been cleared.
+    result = nullptr;
+  }
+  // Acquire the root transitive object payload
+  OrderAccess::acquire();
+  return result;
+}
+
+void AOTStreamedHeapLoader::clear_root(int index) {
+  // Self-reference to the roots array acts as a sentinel object for null,
+  // indicating that the root has been cleared.
+  objArrayOop(_roots.resolve())->obj_at_put(index, _roots.resolve());
+}
+
+void AOTStreamedHeapLoader::await_gc_enabled() {
+  while (!_allow_gc) {
+    AOTHeapLoading_lock->wait();
+  }
+}
+
+void AOTStreamedHeapLoader::finish_initialization(FileMapInfo* static_mapinfo) {
+  static_mapinfo->stream_heap_region();
+}
+
+AOTMapLogger::OopDataIterator* AOTStreamedHeapLoader::oop_iterator(FileMapInfo* info, address buffer_start, address buffer_end) {
+  class StreamedLoaderOopIterator : public AOTMapLogger::OopDataIterator {
+  private:
+    int _current;
+    int _next;
+
+    address _buffer_start;
+
+    int _num_archived_objects;
+
+  public:
+    StreamedLoaderOopIterator(address buffer_start,
+                              int num_archived_objects)
+      : _current(0),
+        _next(1),
+        _buffer_start(buffer_start),
+        _num_archived_objects(num_archived_objects) {
+    }
+
+    AOTMapLogger::OopData capture(int dfs_index) {
+      size_t buffered_offset = buffer_offset_for_object_index(dfs_index);
+      address buffered_addr = _buffer_start + buffered_offset;
+      oopDesc* raw_oop = (oopDesc*)buffered_addr;
+      size_t size = archive_object_size(raw_oop);
+
+      intptr_t target_location = (intptr_t)buffered_offset;
+      uint32_t narrow_location = checked_cast<uint32_t>(dfs_index);
+      Klass* klass = raw_oop->klass();
+
+      address requested_addr = (address)buffered_offset;
+
+      return { buffered_addr,
+               requested_addr,
+               target_location,
+               narrow_location,
+               raw_oop,
+               klass,
+               size,
+               false };
+    }
+
+    bool has_next() override {
+      return _next <= _num_archived_objects;
+    }
+
+    AOTMapLogger::OopData next() override {
+      _current = _next;
+      AOTMapLogger::OopData result = capture(_current);
+      _next = _current + 1;
+      return result;
+    }
+
+    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
+      int dfs_index = (int)(*addr);
+      if (dfs_index == 0) {
+        return null_data();
+      } else {
+        return capture(dfs_index);
+      }
+    }
+
+    AOTMapLogger::OopData obj_at(oop* addr) override {
+      int dfs_index = (int)cast_from_oop<uintptr_t>(*addr);
+      if (dfs_index == 0) {
+        return null_data();
+      } else {
+        return capture(dfs_index);
+      }
+    }
+
+    GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
+      GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* result = new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
+
+      for (int i = 0; i < _num_roots; ++i) {
+        int object_index = object_index_for_root_index(i);
+        result->append(capture(object_index));
+      }
+
+      return result;
+    }
+  };
+
+  assert(_is_in_use, "printing before initializing?");
+
+  return new StreamedLoaderOopIterator(buffer_start, (int)info->streamed_heap()->num_archived_objects());
+}
+
+#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/aotStreamedHeapLoader.hpp b/src/hotspot/share/cds/aotStreamedHeapLoader.hpp
new file mode 100644
index 00000000000..d436af35dd0
--- /dev/null
+++ b/src/hotspot/share/cds/aotStreamedHeapLoader.hpp
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_AOTSTREAMEDHEAPLOADER_HPP
+#define SHARE_CDS_AOTSTREAMEDHEAPLOADER_HPP
+
+#include "cds/aotMapLogger.hpp"
+#include "cds/filemap.hpp"
+#include "memory/allocation.hpp"
+#include "memory/allStatic.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/stack.hpp"
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+// The streaming archive heap loader loads Java objects using normal allocations. It requires the objects
+// to be ordered in DFS order already at dump time, given the set of roots into the archived heap.
+// Since the objects are ordered in DFS order, that means that walking them linearly through the archive
+// is equivalent to performing a DFS traversal, but without pushing and popping anything.
+//
+// The advantage of this pre-ordering, other than the obvious locality improvement, is that we can have
+// a separate thread, the AOTThread, perform this walk, in a way that allows us to split the archived
+// heap into three separate zones. The first zone contains objects that have been transitively materialized,
+// the second zone contains objects that are currently being materialized, and the last zone contains
+// objects that have not and are not about to be touched by the AOT thread.
+// Whenever a new root is traversed by the AOT thread, the zones are shifted atomically under a lock.
+//
+// Visualization of the three zones:
+//
+// +--------------------------------------+-------------------------+----------------------------------+
+// |      transitively materialized       | currently materializing |        not yet materialized      |
+// +--------------------------------------+-------------------------+----------------------------------+
+//
+// Being able to split the memory into these three zones, allows the bootstrapping thread and potential
+// other threads to be able to, under a lock, traverse a root, and know how to coordinate with the
+// concurrent AOT thread. Whenever the traversal finds an object in the "transitively materialized"
+// zone, then we know such objects don't need any processing at all. As for "currently materializing",
+// we know that if we just stay out of the way and let the AOT thread finish its current root, then
+// the transitive closure of such objects will be materialized. And the AOT thread can materialize faster
+// then the rest as it doesn't need to perform any traversal. Finally, as for objects in the "not yet
+// materialized" zone, we know that we can trace through it without stepping on the feed of the AOT thread
+// which has published it won't be tracing anything in there.
+//
+// What we get from this, is fast iterative traversal from the AOT thread (IterativeObjectLoader)
+// while allowing lazyness and concurrency with the rest of the program (TracingObjectLoader).
+// This way the AOT thread can remove the bulk of the work of materializing the Java objects from
+// the critical bootstrapping thread.
+//
+// When we start materializing objects, we have not yet come to the point in the bootstrapping where
+// GC is allowed. This is a two edged sword. On the one hand side, we can materialize objects faster
+// when we know there is no GC to coordinate with, but on the other hand side, if we need to perform
+// a GC when allocating memory for archived objects, we will bring down the entire JVM. To deal with this,
+// the AOT thread asks the GC for a budget of bytes it is allowed to allocate before GC is allowed.
+// When we get to the point in the bootstrapping where GC is allowed, we resume materializing objects
+// that didn't fit in the budget. Before we let the application run, we force materialization of any
+// remaining objects that have not been materialized by the AOT thread yet, so that we don't get
+// surprising OOMs due to object materialization while the program is running.
+//
+// The object format of the archived heap is similar to a normal object. However, references are encoded
+// as DFS indices, which in the end map to what index the object is in the buffer, as they are laid out
+// in DFS order. The DFS indices start at 1 for the first object, and hence the number 0 represents
+// null. The DFS index of objects is a core identifier of objects in this approach. From this index
+// it is possible to find out what offset the archived object has into the buffer, as well as finding
+// mappings to Java heap objects that have been materialized.
+//
+// The table mapping DFS indices to Java heap objects is filled in when an object is allocated.
+// Materializing objects involves allocating the object, initializing it, and linking it with other
+// objects. Since linking the object requires whatever is being referenced to be at least allocated,
+// the iterative traversal will first allocate all of the objects in its zone being worked on, and then
+// perform initialization and linking in a second pass. What these passes have in common is that they
+// are trivially parallelizable, should we ever need to do that. The tracing materialization links
+// objects when going "back" in the DFS traversal.
+//
+// The forwarding information for the mechanism contains raw oops before GC is allowed, and as we
+// enable GC in the bootstrapping, all raw oops are handleified using OopStorage. All handles are
+// handed back from the AOT thread when materialization has finished. The switch from raw oops to
+// using OopStorage handles, happens under a lock while no iteration nor tracing is allowed.
+//
+// The initialization code is also performed in a faster way when the GC is not allowed. In particular,
+// before GC is allowed, we perform raw memcpy of the archived object into the Java heap. Then the
+// object is initialized with IS_DEST_UNINITIALIZED stores. The assumption made here is that before
+// any GC activity is allowed, we shouldn't have to worry about concurrent GC threads scanning the
+// memory and getting tripped up by that. Once GC is enabled, we revert to a bit more careful approach
+// that uses a pre-computed bitmap to find the holes where oops go, and carefully copy only the
+// non-oop information with memcpy, while the oops are set separately with HeapAccess stores that
+// should be able to cope well with concurrent activity.
+//
+// The marked bit pattern of the mark word of archived heap objects is used for signalling which string
+// objects should be interned. From the dump, some referenced strings were interned. This is
+// really an identity property. We don't need to dump the entire string table as a way of communicating
+// this identity property. Instead we intern strings on-the-fly, exploiting the dynamic object
+// level linking that this approach has chosen to our advantage.
+
+class FileMapInfo;
+class OopStorage;
+class Thread;
+struct AOTHeapTraversalEntry;
+
+struct alignas(AOTHeapTraversalEntry* /* Requirement of Stack<AOTHeapTraversalEntry> */) AOTHeapTraversalEntry {
+  int _pointee_object_index;
+  int _base_object_index;
+  int _heap_field_offset_bytes;
+};
+
+class AOTStreamedHeapLoader {
+  friend class InflateReferenceOopClosure;
+private:
+  static FileMapRegion* _heap_region;
+  static FileMapRegion* _bitmap_region;
+  static OopStorage* _oop_storage;
+  static int* _roots_archive;
+  static OopHandle _roots;
+  static BitMapView _oopmap;
+  static bool _is_in_use;
+  static bool _allow_gc;
+  static bool _objects_are_handles;
+  static int _previous_batch_last_object_index;
+  static int _current_batch_last_object_index;
+  static size_t _allocated_words;
+  static int _current_root_index;
+  static size_t _num_archived_objects;
+  static int _num_roots;
+  static size_t _heap_region_used;
+  static bool _loading_all_objects;
+
+  static size_t* _object_index_to_buffer_offset_table;
+  static void** _object_index_to_heap_object_table;
+  static int* _root_highest_object_index_table;
+
+  static bool _waiting_for_iterator;
+  static bool _swapping_root_format;
+
+
+  template <typename LinkerT>
+  class InPlaceLinkingOopClosure;
+
+  static oop allocate_object(oopDesc* archive_object, markWord mark, size_t size, TRAPS);
+  static int object_index_for_root_index(int root_index);
+  static int highest_object_index_for_root_index(int root_index);
+  static size_t buffer_offset_for_object_index(int object_index);
+  static oopDesc* archive_object_for_object_index(int object_index);
+  static size_t buffer_offset_for_archive_object(oopDesc* archive_object);
+  template <bool use_coops>
+  static BitMap::idx_t obj_bit_idx_for_buffer_offset(size_t buffer_offset);
+
+  template <bool use_coops, typename LinkerT>
+  static void copy_payload_carefully(oopDesc* archive_object,
+                                     oop heap_object,
+                                     BitMap::idx_t header_bit,
+                                     BitMap::idx_t start_bit,
+                                     BitMap::idx_t end_bit,
+                                     LinkerT linker);
+
+  template <bool use_coops, typename LinkerT>
+  static void copy_object_impl(oopDesc* archive_object,
+                               oop heap_object,
+                               size_t size,
+                               LinkerT linker);
+
+  static void copy_object_eager_linking(oopDesc* archive_object, oop heap_object, size_t size);
+
+  static void switch_object_index_to_handle(int object_index);
+  static oop heap_object_for_object_index(int object_index);
+  static void set_heap_object_for_object_index(int object_index, oop heap_object);
+
+  static int archived_string_value_object_index(oopDesc* archive_object);
+
+  static bool materialize_early(TRAPS);
+  static void materialize_late(TRAPS);
+  static void cleanup();
+  static void log_statistics();
+
+  class TracingObjectLoader {
+    static oop materialize_object(int object_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS);
+    static oop materialize_object_inner(int object_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS);
+    static void copy_object_lazy_linking(int object_index,
+                                         oopDesc* archive_object,
+                                         oop heap_object,
+                                         size_t size,
+                                         Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack);
+    static void drain_stack(Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS);
+    static oop materialize_object_transitive(int object_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS);
+
+    static void wait_for_iterator();
+
+  public:
+    static oop materialize_root(int root_index, Stack<AOTHeapTraversalEntry, mtClassShared>& dfs_stack, TRAPS);
+  };
+
+  class IterativeObjectLoader {
+    static void initialize_range(int first_object_index, int last_object_index, TRAPS);
+    static size_t materialize_range(int first_object_index, int last_object_index, TRAPS);
+
+  public:
+    static bool has_more();
+    static void materialize_next_batch(TRAPS);
+  };
+
+  static void install_root(int root_index, oop heap_object);
+
+  static void await_gc_enabled();
+  static void await_finished_processing();
+
+public:
+  static void initialize();
+  static void enable_gc();
+  static void materialize_thread_object();
+  static oop materialize_root(int root_index);
+  static oop get_root(int root_index);
+  static void clear_root(int index);
+  static void materialize_objects();
+  static void finish_materialize_objects();
+  static bool is_in_use() { return _is_in_use; }
+  static void finish_initialization(FileMapInfo* info);
+
+  static AOTMapLogger::OopDataIterator* oop_iterator(FileMapInfo* info, address buffer_start, address buffer_end);
+};
+
+#endif // SHARE_CDS_AOTSTREAMEDHEAPLOADER_HPP
+#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/aotStreamedHeapWriter.cpp b/src/hotspot/share/cds/aotStreamedHeapWriter.cpp
new file mode 100644
index 00000000000..16acebc7d8d
--- /dev/null
+++ b/src/hotspot/share/cds/aotStreamedHeapWriter.cpp
@@ -0,0 +1,614 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotReferenceObjSupport.hpp"
+#include "cds/aotStreamedHeapWriter.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.inline.hpp"
+#include "cds/regeneratedClasses.hpp"
+#include "classfile/modules.hpp"
+#include "classfile/stringTable.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "memory/iterator.inline.hpp"
+#include "memory/oopFactory.hpp"
+#include "memory/universe.hpp"
+#include "oops/compressedOops.hpp"
+#include "oops/objArrayOop.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "oops/oopHandle.inline.hpp"
+#include "oops/typeArrayKlass.hpp"
+#include "oops/typeArrayOop.hpp"
+#include "runtime/java.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "utilities/bitMap.inline.hpp"
+#include "utilities/stack.inline.hpp"
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+GrowableArrayCHeap<u1, mtClassShared>* AOTStreamedHeapWriter::_buffer = nullptr;
+
+// The following are offsets from buffer_bottom()
+size_t AOTStreamedHeapWriter::_buffer_used;
+size_t AOTStreamedHeapWriter::_roots_offset;
+size_t AOTStreamedHeapWriter::_forwarding_offset;
+size_t AOTStreamedHeapWriter::_root_highest_object_index_table_offset;
+
+GrowableArrayCHeap<oop, mtClassShared>* AOTStreamedHeapWriter::_source_objs;
+
+AOTStreamedHeapWriter::BufferOffsetToSourceObjectTable* AOTStreamedHeapWriter::_buffer_offset_to_source_obj_table;
+AOTStreamedHeapWriter::SourceObjectToDFSOrderTable* AOTStreamedHeapWriter::_dfs_order_table;
+
+int* AOTStreamedHeapWriter::_roots_highest_dfs;
+size_t* AOTStreamedHeapWriter::_dfs_to_archive_object_table;
+
+static const int max_table_capacity = 0x3fffffff;
+
+void AOTStreamedHeapWriter::init() {
+  if (CDSConfig::is_dumping_heap()) {
+    _buffer_offset_to_source_obj_table = new (mtClassShared) BufferOffsetToSourceObjectTable(8, max_table_capacity);
+
+    int initial_source_objs_capacity = 10000;
+    _source_objs = new GrowableArrayCHeap<oop, mtClassShared>(initial_source_objs_capacity);
+  }
+}
+
+void AOTStreamedHeapWriter::delete_tables_with_raw_oops() {
+  delete _source_objs;
+  _source_objs = nullptr;
+
+  delete _dfs_order_table;
+  _dfs_order_table = nullptr;
+}
+
+void AOTStreamedHeapWriter::add_source_obj(oop src_obj) {
+  _source_objs->append(src_obj);
+}
+
+class FollowOopIterateClosure: public BasicOopIterateClosure {
+  Stack<oop, mtClassShared>* _dfs_stack;
+  oop _src_obj;
+  bool _is_java_lang_ref;
+
+public:
+  FollowOopIterateClosure(Stack<oop, mtClassShared>* dfs_stack, oop src_obj, bool is_java_lang_ref) :
+    _dfs_stack(dfs_stack),
+    _src_obj(src_obj),
+    _is_java_lang_ref(is_java_lang_ref) {}
+
+  void do_oop(narrowOop *p) { do_oop_work(p); }
+  void do_oop(      oop *p) { do_oop_work(p); }
+
+private:
+  template <class T> void do_oop_work(T *p) {
+    size_t field_offset = pointer_delta(p, _src_obj, sizeof(char));
+    oop obj = HeapShared::maybe_remap_referent(_is_java_lang_ref, field_offset, HeapAccess<>::oop_load(p));
+    if (obj != nullptr) {
+      _dfs_stack->push(obj);
+    }
+  }
+};
+
+int AOTStreamedHeapWriter::cmp_dfs_order(oop* o1, oop* o2) {
+  int* o1_dfs = _dfs_order_table->get(*o1);
+  int* o2_dfs = _dfs_order_table->get(*o2);
+  return *o1_dfs - *o2_dfs;
+}
+
+void AOTStreamedHeapWriter::order_source_objs(GrowableArrayCHeap<oop, mtClassShared>* roots) {
+  Stack<oop, mtClassShared> dfs_stack;
+  _dfs_order_table = new (mtClassShared) SourceObjectToDFSOrderTable(8, max_table_capacity);
+  _roots_highest_dfs = NEW_C_HEAP_ARRAY(int, (size_t)roots->length(), mtClassShared);
+  _dfs_to_archive_object_table = NEW_C_HEAP_ARRAY(size_t, (size_t)_source_objs->length() + 1, mtClassShared);
+
+  for (int i = 0; i < _source_objs->length(); ++i) {
+    oop obj = _source_objs->at(i);
+    _dfs_order_table->put(cast_from_oop<void*>(obj), -1);
+    _dfs_order_table->maybe_grow();
+  }
+
+  int dfs_order = 0;
+
+  for (int i = 0; i < roots->length(); ++i) {
+    oop root = roots->at(i);
+
+    if (root == nullptr) {
+      log_info(aot, heap)("null root at %d", i);
+      continue;
+    }
+
+    dfs_stack.push(root);
+
+    while (!dfs_stack.is_empty()) {
+      oop obj = dfs_stack.pop();
+      assert(obj != nullptr, "null root");
+      int* dfs_number = _dfs_order_table->get(cast_from_oop<void*>(obj));
+      if (*dfs_number != -1) {
+        // Already visited in the traversal
+        continue;
+      }
+      _dfs_order_table->put(cast_from_oop<void*>(obj), ++dfs_order);
+      _dfs_order_table->maybe_grow();
+
+      FollowOopIterateClosure cl(&dfs_stack, obj, AOTReferenceObjSupport::check_if_ref_obj(obj));
+      obj->oop_iterate(&cl);
+    }
+
+    _roots_highest_dfs[i] = dfs_order;
+  }
+
+  _source_objs->sort(cmp_dfs_order);
+}
+
+void AOTStreamedHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
+                                  ArchiveStreamedHeapInfo* heap_info) {
+  assert(CDSConfig::is_dumping_heap(), "sanity");
+  allocate_buffer();
+  order_source_objs(roots);
+  copy_source_objs_to_buffer(roots);
+  map_embedded_oops(heap_info);
+  populate_archive_heap_info(heap_info);
+}
+
+void AOTStreamedHeapWriter::allocate_buffer() {
+  int initial_buffer_size = 100000;
+  _buffer = new GrowableArrayCHeap<u1, mtClassShared>(initial_buffer_size);
+  _buffer_used = 0;
+  ensure_buffer_space(1); // so that buffer_bottom() works
+}
+
+void AOTStreamedHeapWriter::ensure_buffer_space(size_t min_bytes) {
+  // We usually have very small heaps. If we get a huge one it's probably caused by a bug.
+  guarantee(min_bytes <= max_jint, "we dont support archiving more than 2G of objects");
+  _buffer->at_grow(to_array_index(min_bytes));
+}
+
+void AOTStreamedHeapWriter::copy_roots_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
+  int length = roots->length();
+  size_t byte_size = align_up(sizeof(int) + sizeof(int) * (size_t)length, (size_t)HeapWordSize);
+
+  size_t new_used = _buffer_used + byte_size;
+  ensure_buffer_space(new_used);
+
+  int* mem = offset_to_buffered_address<int*>(_buffer_used);
+  memset(mem, 0, byte_size);
+  *mem = length;
+
+  for (int i = 0; i < length; i++) {
+    // Do not use arrayOop->obj_at_put(i, o) as arrayOop is outside of the real heap!
+    oop o = roots->at(i);
+    int dfs_index = o == nullptr ? 0 : *_dfs_order_table->get(cast_from_oop<void*>(o));
+    mem[i + 1] = dfs_index;
+  }
+  log_info(aot, heap)("archived obj roots[%d] = %zu bytes, mem = %p", length, byte_size, mem);
+
+  _roots_offset = _buffer_used;
+  _buffer_used = new_used;
+}
+
+template <typename T>
+void AOTStreamedHeapWriter::write(T value) {
+  size_t new_used = _buffer_used + sizeof(T);
+  ensure_buffer_space(new_used);
+  T* mem = offset_to_buffered_address<T*>(_buffer_used);
+  *mem = value;
+  _buffer_used = new_used;
+}
+
+void AOTStreamedHeapWriter::copy_forwarding_to_buffer() {
+  _forwarding_offset = _buffer_used;
+
+  write<size_t>(0); // The first entry is the null entry
+
+  // Write a mapping from object index to buffer offset
+  for (int i = 1; i <= _source_objs->length(); i++) {
+    size_t buffer_offset = _dfs_to_archive_object_table[i];
+    write(buffer_offset);
+  }
+}
+
+void AOTStreamedHeapWriter::copy_roots_max_dfs_to_buffer(int roots_length) {
+  _root_highest_object_index_table_offset = _buffer_used;
+
+  for (int i = 0; i < roots_length; ++i) {
+    int highest_dfs = _roots_highest_dfs[i];
+    write(highest_dfs);
+  }
+
+  if ((roots_length % 2) != 0) {
+    write(-1); // Align up to a 64 bit word
+  }
+}
+
+static bool is_interned_string(oop obj) {
+  if (!java_lang_String::is_instance(obj)) {
+    return false;
+  }
+
+  ResourceMark rm;
+  int len;
+  jchar* name = java_lang_String::as_unicode_string_or_null(obj, len);
+  if (name == nullptr) {
+    fatal("Insufficient memory for dumping");
+  }
+  return StringTable::lookup(name, len) == obj;
+}
+
+static BitMap::idx_t bit_idx_for_buffer_offset(size_t buffer_offset) {
+  if (UseCompressedOops) {
+    return BitMap::idx_t(buffer_offset / sizeof(narrowOop));
+  } else {
+    return BitMap::idx_t(buffer_offset / sizeof(HeapWord));
+  }
+}
+
+bool AOTStreamedHeapWriter::is_dumped_interned_string(oop obj) {
+  return is_interned_string(obj) && HeapShared::get_cached_oop_info(obj) != nullptr;
+}
+
+void AOTStreamedHeapWriter::copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
+  for (int i = 0; i < _source_objs->length(); i++) {
+    oop src_obj = _source_objs->at(i);
+    HeapShared::CachedOopInfo* info = HeapShared::get_cached_oop_info(src_obj);
+    assert(info != nullptr, "must be");
+    size_t buffer_offset = copy_one_source_obj_to_buffer(src_obj);
+    info->set_buffer_offset(buffer_offset);
+
+    OopHandle handle(Universe::vm_global(), src_obj);
+    _buffer_offset_to_source_obj_table->put_when_absent(buffer_offset, handle);
+    _buffer_offset_to_source_obj_table->maybe_grow();
+
+    int dfs_order = i + 1;
+    _dfs_to_archive_object_table[dfs_order] = buffer_offset;
+  }
+
+  copy_roots_to_buffer(roots);
+  copy_forwarding_to_buffer();
+  copy_roots_max_dfs_to_buffer(roots->length());
+
+  log_info(aot)("Size of heap region = %zu bytes, %d objects, %d roots",
+                _buffer_used, _source_objs->length() + 1, roots->length());
+}
+
+template <typename T>
+void update_buffered_object_field(address buffered_obj, int field_offset, T value) {
+  T* field_addr = cast_to_oop(buffered_obj)->field_addr<T>(field_offset);
+  *field_addr = value;
+}
+
+static bool needs_explicit_size(oop src_obj) {
+  Klass* klass = src_obj->klass();
+  int lh = klass->layout_helper();
+
+  // Simple instances or arrays don't need explicit size
+  if (Klass::layout_helper_is_instance(lh)) {
+    return Klass::layout_helper_needs_slow_path(lh);
+  }
+
+  return !Klass::layout_helper_is_array(lh);
+}
+
+size_t AOTStreamedHeapWriter::copy_one_source_obj_to_buffer(oop src_obj) {
+  if (needs_explicit_size(src_obj)) {
+    // Explicitly write object size for more complex objects, to avoid having to
+    // pretend the buffer objects are objects when loading the objects, in order
+    // to read the size. Most of the time, the layout helper of the class is enough.
+    write<size_t>(src_obj->size());
+  }
+  size_t byte_size = src_obj->size() * HeapWordSize;
+  assert(byte_size > 0, "no zero-size objects");
+
+  size_t new_used = _buffer_used + byte_size;
+  assert(new_used > _buffer_used, "no wrap around");
+
+  ensure_buffer_space(new_used);
+
+  if (is_interned_string(src_obj)) {
+    java_lang_String::hash_code(src_obj);                   // Sets the hash code field(s)
+    java_lang_String::set_deduplication_forbidden(src_obj); // Allows faster interning at runtime
+    assert(java_lang_String::hash_is_set(src_obj), "hash must be set");
+  }
+
+  address from = cast_from_oop<address>(src_obj);
+  address to = offset_to_buffered_address<address>(_buffer_used);
+  assert(is_object_aligned(_buffer_used), "sanity");
+  assert(is_object_aligned(byte_size), "sanity");
+  memcpy(to, from, byte_size);
+
+  if (java_lang_Module::is_instance(src_obj)) {
+    // These native pointers will be restored explicitly at run time.
+    Modules::check_archived_module_oop(src_obj);
+    update_buffered_object_field<ModuleEntry*>(to, java_lang_Module::module_entry_offset(), nullptr);
+  } else if (java_lang_ClassLoader::is_instance(src_obj)) {
+#ifdef ASSERT
+    // We only archive these loaders
+    if (src_obj != SystemDictionary::java_platform_loader() &&
+        src_obj != SystemDictionary::java_system_loader()) {
+      assert(src_obj->klass()->name()->equals("jdk/internal/loader/ClassLoaders$BootClassLoader"), "must be");
+    }
+#endif
+    update_buffered_object_field<ClassLoaderData*>(to, java_lang_ClassLoader::loader_data_offset(), nullptr);
+  }
+
+  size_t buffered_obj_offset = _buffer_used;
+  _buffer_used = new_used;
+
+  return buffered_obj_offset;
+}
+
+// Oop mapping
+
+inline void AOTStreamedHeapWriter::store_oop_in_buffer(oop* buffered_addr, int dfs_index) {
+  *(ssize_t*)buffered_addr = dfs_index;
+}
+
+inline void AOTStreamedHeapWriter::store_oop_in_buffer(narrowOop* buffered_addr, int dfs_index) {
+  *(int32_t*)buffered_addr = (int32_t)dfs_index;
+}
+
+template <typename T> void AOTStreamedHeapWriter::mark_oop_pointer(T* buffered_addr, CHeapBitMap* oopmap) {
+  // Mark the pointer in the oopmap
+  size_t buffered_offset = buffered_address_to_offset((address)buffered_addr);
+  BitMap::idx_t idx = bit_idx_for_buffer_offset(buffered_offset);
+  oopmap->set_bit(idx);
+}
+
+template <typename T> void AOTStreamedHeapWriter::map_oop_field_in_buffer(oop obj, T* field_addr_in_buffer, CHeapBitMap* oopmap) {
+  if (obj == nullptr) {
+    store_oop_in_buffer(field_addr_in_buffer, 0);
+  } else {
+    int dfs_index = *_dfs_order_table->get(obj);
+    store_oop_in_buffer(field_addr_in_buffer, dfs_index);
+  }
+
+  mark_oop_pointer<T>(field_addr_in_buffer, oopmap);
+}
+
+void AOTStreamedHeapWriter::update_header_for_buffered_addr(address buffered_addr, oop src_obj,  Klass* src_klass) {
+  assert(UseCompressedClassPointers, "Archived heap only supported for compressed klasses");
+  narrowKlass nk = ArchiveBuilder::current()->get_requested_narrow_klass(src_klass);
+
+  markWord mw = markWord::prototype();
+  oopDesc* fake_oop = (oopDesc*)buffered_addr;
+
+  // We need to retain the identity_hash, because it may have been used by some hashtables
+  // in the shared heap. This also has the side effect of pre-initializing the
+  // identity_hash for all shared objects, so they are less likely to be written
+  // into during run time, increasing the potential of memory sharing.
+  if (src_obj != nullptr) {
+    intptr_t src_hash = src_obj->identity_hash();
+    mw = mw.copy_set_hash(src_hash);
+  }
+
+  if (is_interned_string(src_obj)) {
+    // Mark the mark word of interned string so the loader knows to link these to
+    // the string table at runtime.
+    mw = mw.set_marked();
+  }
+
+  if (UseCompactObjectHeaders) {
+    fake_oop->set_mark(mw.set_narrow_klass(nk));
+  } else {
+    fake_oop->set_mark(mw);
+    fake_oop->set_narrow_klass(nk);
+  }
+}
+
+class AOTStreamedHeapWriter::EmbeddedOopMapper: public BasicOopIterateClosure {
+  oop _src_obj;
+  address _buffered_obj;
+  CHeapBitMap* _oopmap;
+  bool _is_java_lang_ref;
+
+public:
+  EmbeddedOopMapper(oop src_obj, address buffered_obj, CHeapBitMap* oopmap)
+    : _src_obj(src_obj),
+      _buffered_obj(buffered_obj),
+      _oopmap(oopmap),
+      _is_java_lang_ref(AOTReferenceObjSupport::check_if_ref_obj(src_obj)) {}
+
+  void do_oop(narrowOop *p) { EmbeddedOopMapper::do_oop_work(p); }
+  void do_oop(      oop *p) { EmbeddedOopMapper::do_oop_work(p); }
+
+private:
+  template <typename T>
+  void do_oop_work(T *p) {
+    size_t field_offset = pointer_delta(p, _src_obj, sizeof(char));
+    oop obj = HeapShared::maybe_remap_referent(_is_java_lang_ref, field_offset, HeapAccess<>::oop_load(p));
+    AOTStreamedHeapWriter::map_oop_field_in_buffer<T>(obj, (T*)(_buffered_obj + field_offset), _oopmap);
+  }
+};
+
+static void log_bitmap_usage(const char* which, BitMap* bitmap, size_t total_bits) {
+  // The whole heap is covered by total_bits, but there are only non-zero bits within [start ... end).
+  size_t start = bitmap->find_first_set_bit(0);
+  size_t end = bitmap->size();
+  log_info(aot)("%s = %7zu ... %7zu (%3zu%% ... %3zu%% = %3zu%%)", which,
+                start, end,
+                start * 100 / total_bits,
+                end * 100 / total_bits,
+                (end - start) * 100 / total_bits);
+}
+
+// Update all oop fields embedded in the buffered objects
+void AOTStreamedHeapWriter::map_embedded_oops(ArchiveStreamedHeapInfo* heap_info) {
+  size_t oopmap_unit = (UseCompressedOops ? sizeof(narrowOop) : sizeof(oop));
+  size_t heap_region_byte_size = _buffer_used;
+  heap_info->oopmap()->resize(heap_region_byte_size / oopmap_unit);
+
+  for (int i = 0; i < _source_objs->length(); i++) {
+    oop src_obj = _source_objs->at(i);
+    HeapShared::CachedOopInfo* info = HeapShared::get_cached_oop_info(src_obj);
+    assert(info != nullptr, "must be");
+    address buffered_obj = offset_to_buffered_address<address>(info->buffer_offset());
+
+    update_header_for_buffered_addr(buffered_obj, src_obj, src_obj->klass());
+
+    EmbeddedOopMapper mapper(src_obj, buffered_obj, heap_info->oopmap());
+    src_obj->oop_iterate(&mapper);
+    HeapShared::remap_dumped_metadata(src_obj, buffered_obj);
+  };
+
+  size_t total_bytes = (size_t)_buffer->length();
+  log_bitmap_usage("oopmap", heap_info->oopmap(), total_bytes / oopmap_unit);
+}
+
+size_t AOTStreamedHeapWriter::source_obj_to_buffered_offset(oop src_obj) {
+  HeapShared::CachedOopInfo* p = HeapShared::get_cached_oop_info(src_obj);
+  return p->buffer_offset();
+}
+
+address AOTStreamedHeapWriter::source_obj_to_buffered_addr(oop src_obj) {
+  return offset_to_buffered_address<address>(source_obj_to_buffered_offset(src_obj));
+}
+
+oop AOTStreamedHeapWriter::buffered_offset_to_source_obj(size_t buffered_offset) {
+  OopHandle* oh = _buffer_offset_to_source_obj_table->get(buffered_offset);
+  if (oh != nullptr) {
+    return oh->resolve();
+  } else {
+    return nullptr;
+  }
+}
+
+oop AOTStreamedHeapWriter::buffered_addr_to_source_obj(address buffered_addr) {
+  return buffered_offset_to_source_obj(buffered_address_to_offset(buffered_addr));
+}
+
+void AOTStreamedHeapWriter::populate_archive_heap_info(ArchiveStreamedHeapInfo* info) {
+  assert(!info->is_used(), "only set once");
+
+  size_t heap_region_byte_size = _buffer_used;
+  assert(heap_region_byte_size > 0, "must archived at least one object!");
+
+  info->set_buffer_region(MemRegion(offset_to_buffered_address<HeapWord*>(0),
+                                    offset_to_buffered_address<HeapWord*>(_buffer_used)));
+  info->set_roots_offset(_roots_offset);
+  info->set_num_roots((size_t)HeapShared::pending_roots()->length());
+  info->set_forwarding_offset(_forwarding_offset);
+  info->set_root_highest_object_index_table_offset(_root_highest_object_index_table_offset);
+  info->set_num_archived_objects((size_t)_source_objs->length());
+}
+
+AOTMapLogger::OopDataIterator* AOTStreamedHeapWriter::oop_iterator(ArchiveStreamedHeapInfo* heap_info) {
+  class StreamedWriterOopIterator : public AOTMapLogger::OopDataIterator {
+  private:
+    int _current;
+    int _next;
+
+    address _buffer_start;
+
+    int _num_archived_objects;
+    int _num_archived_roots;
+    int* _roots;
+
+  public:
+    StreamedWriterOopIterator(address buffer_start,
+                              int num_archived_objects,
+                              int num_archived_roots,
+                              int* roots)
+      : _current(0),
+        _next(1),
+        _buffer_start(buffer_start),
+        _num_archived_objects(num_archived_objects),
+        _num_archived_roots(num_archived_roots),
+        _roots(roots) {
+    }
+
+    AOTMapLogger::OopData capture(int dfs_index) {
+      size_t buffered_offset = _dfs_to_archive_object_table[dfs_index];
+      address buffered_addr = _buffer_start + buffered_offset;
+      oop src_obj = AOTStreamedHeapWriter::buffered_offset_to_source_obj(buffered_offset);
+      assert(src_obj != nullptr, "why is this null?");
+      oopDesc* raw_oop = (oopDesc*)buffered_addr;
+      Klass* klass = src_obj->klass();
+      size_t size = src_obj->size();
+
+      intptr_t target_location = (intptr_t)buffered_offset;
+      uint32_t narrow_location = checked_cast<uint32_t>(dfs_index);
+
+      address requested_addr = (address)buffered_offset;
+
+      return { buffered_addr,
+               requested_addr,
+               target_location,
+               narrow_location,
+               raw_oop,
+               klass,
+               size,
+               false };
+    }
+
+    bool has_next() override {
+      return _next <= _num_archived_objects;
+    }
+
+    AOTMapLogger::OopData next() override {
+      _current = _next;
+      AOTMapLogger::OopData result = capture(_current);
+      _next = _current + 1;
+      return result;
+    }
+
+    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
+      int dfs_index = (int)(*addr);
+      if (dfs_index == 0) {
+        return null_data();
+      } else {
+        return capture(dfs_index);
+      }
+    }
+
+    AOTMapLogger::OopData obj_at(oop* addr) override {
+      int dfs_index = (int)cast_from_oop<uintptr_t>(*addr);
+      if (dfs_index == 0) {
+        return null_data();
+      } else {
+        return capture(dfs_index);
+      }
+    }
+
+    GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
+      GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* result = new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
+
+      for (int i = 0; i < _num_archived_roots; ++i) {
+        int object_index = _roots[i];
+        result->append(capture(object_index));
+      }
+
+      return result;
+    }
+  };
+
+  MemRegion r = heap_info->buffer_region();
+  address buffer_start = address(r.start());
+
+  size_t roots_offset = heap_info->roots_offset();
+  int* roots = ((int*)(buffer_start + roots_offset)) + 1;
+
+  return new StreamedWriterOopIterator(buffer_start, (int)heap_info->num_archived_objects(), (int)heap_info->num_roots(), roots);
+}
+
+#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/aotStreamedHeapWriter.hpp b/src/hotspot/share/cds/aotStreamedHeapWriter.hpp
new file mode 100644
index 00000000000..bde82f8ce29
--- /dev/null
+++ b/src/hotspot/share/cds/aotStreamedHeapWriter.hpp
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_AOTSTREAMEDHEAPWRITER_HPP
+#define SHARE_CDS_AOTSTREAMEDHEAPWRITER_HPP
+
+#include "cds/aotMapLogger.hpp"
+#include "cds/heapShared.hpp"
+#include "memory/allocation.hpp"
+#include "memory/allStatic.hpp"
+#include "oops/oopHandle.hpp"
+#include "utilities/bitMap.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/resizableHashTable.hpp"
+
+class MemRegion;
+
+#if INCLUDE_CDS_JAVA_HEAP
+class AOTStreamedHeapWriter : AllStatic {
+  class EmbeddedOopMapper;
+  static GrowableArrayCHeap<u1, mtClassShared>* _buffer;
+
+  // The number of bytes that have written into _buffer (may be smaller than _buffer->length()).
+  static size_t _buffer_used;
+
+  // The bottom of the copy of Heap::roots() inside this->_buffer.
+  static size_t _roots_offset;
+
+  // Offset to the forwarding information
+  static size_t _forwarding_offset;
+
+  // Offset to dfs bounds information
+  static size_t _root_highest_object_index_table_offset;
+
+  static GrowableArrayCHeap<oop, mtClassShared>* _source_objs;
+
+  typedef ResizeableHashTable<size_t, OopHandle,
+                              AnyObj::C_HEAP,
+                              mtClassShared> BufferOffsetToSourceObjectTable;
+
+  static BufferOffsetToSourceObjectTable* _buffer_offset_to_source_obj_table;
+
+  typedef ResizeableHashTable<void*, int,
+                              AnyObj::C_HEAP,
+                              mtClassShared> SourceObjectToDFSOrderTable;
+  static SourceObjectToDFSOrderTable* _dfs_order_table;
+
+  static int* _roots_highest_dfs;
+  static size_t* _dfs_to_archive_object_table;
+
+  static int cmp_dfs_order(oop* o1, oop* o2);
+
+  static void allocate_buffer();
+  static void ensure_buffer_space(size_t min_bytes);
+
+  // Both Java bytearray and GrowableArraty use int indices and lengths. Do a safe typecast with range check
+  static int to_array_index(size_t i) {
+    assert(i <= (size_t)max_jint, "must be");
+    return (int)i;
+  }
+  static int to_array_length(size_t n) {
+    return to_array_index(n);
+  }
+
+  template <typename T> static T offset_to_buffered_address(size_t offset) {
+    return (T)(_buffer->adr_at(to_array_index(offset)));
+  }
+
+  static address buffer_bottom() {
+    return offset_to_buffered_address<address>(0);
+  }
+
+  // The exclusive end of the last object that was copied into the buffer.
+  static address buffer_top() {
+    return buffer_bottom() + _buffer_used;
+  }
+
+  static bool in_buffer(address buffered_addr) {
+    return (buffer_bottom() <= buffered_addr) && (buffered_addr < buffer_top());
+  }
+
+  static size_t buffered_address_to_offset(address buffered_addr) {
+    assert(in_buffer(buffered_addr), "sanity");
+    return buffered_addr - buffer_bottom();
+  }
+
+  static void order_source_objs(GrowableArrayCHeap<oop, mtClassShared>* roots);
+  static void copy_roots_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots);
+  static void copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots);
+  static size_t copy_one_source_obj_to_buffer(oop src_obj);
+
+  template <typename T>
+  static void write(T value);
+  static void copy_forwarding_to_buffer();
+  static void copy_roots_max_dfs_to_buffer(int roots_length);
+
+  static void map_embedded_oops(ArchiveStreamedHeapInfo* info);
+  static bool is_in_requested_range(oop o);
+  static oop requested_obj_from_buffer_offset(size_t offset);
+
+  static oop load_oop_from_buffer(oop* buffered_addr);
+  static oop load_oop_from_buffer(narrowOop* buffered_addr);
+  inline static void store_oop_in_buffer(oop* buffered_addr, int dfs_index);
+  inline static void store_oop_in_buffer(narrowOop* buffered_addr, int dfs_index);
+
+  template <typename T> static void mark_oop_pointer(T* buffered_addr, CHeapBitMap* oopmap);
+  template <typename T> static void map_oop_field_in_buffer(oop obj, T* field_addr_in_buffer, CHeapBitMap* oopmap);
+
+  static void update_header_for_buffered_addr(address buffered_addr, oop src_obj, Klass* src_klass);
+
+  static void populate_archive_heap_info(ArchiveStreamedHeapInfo* info);
+
+public:
+  static void init() NOT_CDS_JAVA_HEAP_RETURN;
+
+  static void delete_tables_with_raw_oops();
+  static void add_source_obj(oop src_obj);
+  static void write(GrowableArrayCHeap<oop, mtClassShared>*, ArchiveStreamedHeapInfo* heap_info);
+  static address buffered_heap_roots_addr() {
+    return offset_to_buffered_address<address>(_roots_offset);
+  }
+
+  static size_t buffered_addr_to_buffered_offset(address buffered_addr) {
+    assert(buffered_addr != nullptr, "should not be null");
+    return size_t(buffered_addr) - size_t(buffer_bottom());
+  }
+
+  static bool is_dumped_interned_string(oop obj);
+
+  static size_t source_obj_to_buffered_offset(oop src_obj);
+  static address source_obj_to_buffered_addr(oop src_obj);
+
+  static oop buffered_offset_to_source_obj(size_t buffered_offset);
+  static oop buffered_addr_to_source_obj(address buffered_addr);
+
+  static AOTMapLogger::OopDataIterator* oop_iterator(ArchiveStreamedHeapInfo* heap_info);
+};
+#endif // INCLUDE_CDS_JAVA_HEAP
+#endif // SHARE_CDS_AOTSTREAMEDHEAPWRITER_HPP
diff --git a/src/hotspot/share/cds/aotThread.cpp b/src/hotspot/share/cds/aotThread.cpp
new file mode 100644
index 00000000000..26a6f4291cd
--- /dev/null
+++ b/src/hotspot/share/cds/aotThread.cpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotStreamedHeapLoader.hpp"
+#include "cds/aotThread.hpp"
+#include "cds/heapShared.hpp"
+#include "classfile/javaClasses.hpp"
+#include "classfile/javaThreadStatus.hpp"
+#include "classfile/vmClasses.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "jfr/jfr.hpp"
+#include "runtime/javaThread.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/thread.hpp"
+#include "runtime/threads.hpp"
+#include "utilities/exceptions.hpp"
+
+AOTThread* AOTThread::_aot_thread;
+bool AOTThread::_started;
+
+// Starting the AOTThread is tricky. We wish to start it as early as possible, as
+// that increases the amount of curling this thread can do for the application thread
+// that is concurrently starting. But there are complications starting a thread this
+// early. The java.lang.Thread class is not initialized and we may not execute any
+// Java bytecodes yet. This is an internal thread, so we try to keep the bookkeeping
+// minimal and use a logical ThreadIdentifier for JFR and monitor identity. The real
+// thread object is created just after the main thread creates its Thread object, after
+// the Thread class has been initialized.
+void AOTThread::initialize() {
+#if INCLUDE_CDS_JAVA_HEAP
+  EXCEPTION_MARK;
+
+  // Spin up a thread without thread oop, because the java.lang classes
+  // have not yet been initialized, and hence we can't allocate the Thread
+  // object yet.
+  AOTThread* thread = new AOTThread(&aot_thread_entry);
+  _aot_thread = thread;
+
+#if INCLUDE_JVMTI
+  // The line below hides JVMTI events from this thread (cf. should_hide_jvmti_events())
+  // This is important because this thread runs before JVMTI monitors are set up appropriately.
+  // Therefore, callbacks would not work as intended. JVMTI has no business peeking at how we
+  // materialize primordial objects from the AOT cache.
+  thread->toggle_is_disable_suspend();
+#endif
+
+  JavaThread::vm_exit_on_osthread_failure(thread);
+  _started = true;
+
+  // Note that the Thread class is not initialized yet at this point. We
+  // can run a bit concurrently until the Thread class is initialized; then
+  // materialize_thread_object is called to inflate the thread object.
+
+  // The thread needs an identifier. This thread is fine with a temporary ID
+  // assignment; it will terminate soon anyway.
+  int64_t tid = ThreadIdentifier::next();
+  thread->set_monitor_owner_id(tid);
+
+  {
+    MutexLocker mu(THREAD, Threads_lock);
+    Threads::add(thread);
+  }
+
+  JFR_ONLY(Jfr::on_java_thread_start(THREAD, thread);)
+
+  os::start_thread(thread);
+#endif
+}
+
+void AOTThread::materialize_thread_object() {
+#if INCLUDE_CDS_JAVA_HEAP
+  if (!_started) {
+    // No thread object to materialize
+    return;
+  }
+
+  EXCEPTION_MARK;
+
+  HandleMark hm(THREAD);
+  Handle thread_oop = JavaThread::create_system_thread_object("AOTThread", CHECK);
+
+  java_lang_Thread::release_set_thread(thread_oop(), _aot_thread);
+  _aot_thread->set_threadOopHandles(thread_oop());
+#endif
+}
+
+void AOTThread::aot_thread_entry(JavaThread* jt, TRAPS) {
+#if INCLUDE_CDS_JAVA_HEAP
+  AOTStreamedHeapLoader::materialize_objects();
+  _aot_thread = nullptr; // AOT thread will get destroyed after this point
+#endif
+}
diff --git a/src/hotspot/share/cds/aotThread.hpp b/src/hotspot/share/cds/aotThread.hpp
new file mode 100644
index 00000000000..644363e685b
--- /dev/null
+++ b/src/hotspot/share/cds/aotThread.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_AOTTHREAD_HPP
+#define SHARE_CDS_AOTTHREAD_HPP
+
+#include "runtime/javaThread.hpp"
+#include "utilities/macros.hpp"
+
+// A hidden from external view JavaThread for materializing archived objects
+
+class AOTThread : public JavaThread {
+private:
+  static bool _started;
+  static AOTThread* _aot_thread;
+  static void aot_thread_entry(JavaThread* thread, TRAPS);
+  AOTThread(ThreadFunction entry_point) : JavaThread(entry_point) {};
+
+public:
+  static void initialize();
+
+  // Hide this thread from external view.
+  virtual bool is_hidden_from_external_view() const { return true; }
+
+  static void materialize_thread_object();
+
+  static bool aot_thread_initialized() { return _started; };
+  bool is_aot_thread() const { return true; };
+};
+
+#endif // SHARE_CDS_AOTTHREAD_HPP
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 539c2672cf6..3c7f25a950b 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -28,7 +28,6 @@
 #include "cds/aotMapLogger.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cppVtables.hpp"
@@ -1175,11 +1174,13 @@ void ArchiveBuilder::print_stats() {
   _alloc_stats.print_stats(int(_ro_region.used()), int(_rw_region.used()));
 }
 
-void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_info) {
+void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info) {
   // Make sure NUM_CDS_REGIONS (exported in cds.h) agrees with
   // AOTMetaspace::n_regions (internal to hotspot).
   assert(NUM_CDS_REGIONS == AOTMetaspace::n_regions, "sanity");
 
+  ResourceMark rm;
+
   write_region(mapinfo, AOTMetaspace::rw, &_rw_region, /*read_only=*/false,/*allow_exec=*/false);
   write_region(mapinfo, AOTMetaspace::ro, &_ro_region, /*read_only=*/true, /*allow_exec=*/false);
   write_region(mapinfo, AOTMetaspace::ac, &_ac_region, /*read_only=*/false,/*allow_exec=*/false);
@@ -1188,14 +1189,19 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
   ArchivePtrMarker::initialize_rw_ro_maps(&_rw_ptrmap, &_ro_ptrmap);
 
   size_t bitmap_size_in_bytes;
-  char* bitmap = mapinfo->write_bitmap_region(ArchivePtrMarker::rw_ptrmap(), ArchivePtrMarker::ro_ptrmap(), heap_info,
+  char* bitmap = mapinfo->write_bitmap_region(ArchivePtrMarker::rw_ptrmap(),
+                                              ArchivePtrMarker::ro_ptrmap(),
+                                              mapped_heap_info,
+                                              streamed_heap_info,
                                               bitmap_size_in_bytes);
 
-  if (heap_info->is_used()) {
-    _total_heap_region_size = mapinfo->write_heap_region(heap_info);
+  if (mapped_heap_info != nullptr && mapped_heap_info->is_used()) {
+    _total_heap_region_size = mapinfo->write_mapped_heap_region(mapped_heap_info);
+  } else if (streamed_heap_info != nullptr && streamed_heap_info->is_used()) {
+    _total_heap_region_size = mapinfo->write_streamed_heap_region(streamed_heap_info);
   }
 
-  print_region_stats(mapinfo, heap_info);
+  print_region_stats(mapinfo, mapped_heap_info, streamed_heap_info);
 
   mapinfo->set_requested_base((char*)AOTMetaspace::requested_base_address());
   mapinfo->set_header_crc(mapinfo->compute_header_crc());
@@ -1210,7 +1216,7 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
   }
 
   if (log_is_enabled(Info, aot, map)) {
-    AOTMapLogger::dumptime_log(this, mapinfo, heap_info, bitmap, bitmap_size_in_bytes);
+    AOTMapLogger::dumptime_log(this, mapinfo, mapped_heap_info, streamed_heap_info, bitmap, bitmap_size_in_bytes);
   }
   CDS_JAVA_HEAP_ONLY(HeapShared::destroy_archived_object_cache());
   FREE_C_HEAP_ARRAY(char, bitmap);
@@ -1226,7 +1232,9 @@ void ArchiveBuilder::count_relocated_pointer(bool tagged, bool nulled) {
   _relocated_ptr_info._num_nulled_ptrs += nulled ? 1 : 0;
 }
 
-void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo, ArchiveHeapInfo* heap_info) {
+void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo,
+                                        ArchiveMappedHeapInfo* mapped_heap_info,
+                                        ArchiveStreamedHeapInfo* streamed_heap_info) {
   // Print statistics of all the regions
   const size_t bitmap_used = mapinfo->region_at(AOTMetaspace::bm)->used();
   const size_t bitmap_reserved = mapinfo->region_at(AOTMetaspace::bm)->used_aligned();
@@ -1244,22 +1252,22 @@ void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo, ArchiveHeapInfo* h
 
   print_bitmap_region_stats(bitmap_used, total_reserved);
 
-  if (heap_info->is_used()) {
-    print_heap_region_stats(heap_info, total_reserved);
+  if (mapped_heap_info != nullptr && mapped_heap_info->is_used()) {
+    print_heap_region_stats(mapped_heap_info->buffer_start(), mapped_heap_info->buffer_byte_size(), total_reserved);
+  } else if (streamed_heap_info != nullptr && streamed_heap_info->is_used()) {
+    print_heap_region_stats(streamed_heap_info->buffer_start(), streamed_heap_info->buffer_byte_size(), total_reserved);
   }
 
   aot_log_debug(aot)("total   : %9zu [100.0%% of total] out of %9zu bytes [%5.1f%% used]",
-                 total_bytes, total_reserved, total_u_perc);
+                     total_bytes, total_reserved, total_u_perc);
 }
 
 void ArchiveBuilder::print_bitmap_region_stats(size_t size, size_t total_size) {
   aot_log_debug(aot)("bm space: %9zu [ %4.1f%% of total] out of %9zu bytes [100.0%% used]",
-                 size, size/double(total_size)*100.0, size);
+                     size, size/double(total_size)*100.0, size);
 }
 
-void ArchiveBuilder::print_heap_region_stats(ArchiveHeapInfo *info, size_t total_size) {
-  char* start = info->buffer_start();
-  size_t size = info->buffer_byte_size();
+void ArchiveBuilder::print_heap_region_stats(char* start, size_t size, size_t total_size) {
   char* top = start + size;
   aot_log_debug(aot)("hp space: %9zu [ %4.1f%% of total] out of %9zu bytes [100.0%% used] at " INTPTR_FORMAT,
                      size, size/double(total_size)*100.0, size, p2i(start));
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 815a6f07273..9a628439039 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -39,7 +39,8 @@
 #include "utilities/hashTable.hpp"
 #include "utilities/resizableHashTable.hpp"
 
-class ArchiveHeapInfo;
+class ArchiveMappedHeapInfo;
+class ArchiveStreamedHeapInfo;
 class CHeapBitMap;
 class FileMapInfo;
 class Klass;
@@ -245,9 +246,11 @@ private:
     size_t _num_nulled_ptrs;
   } _relocated_ptr_info;
 
-  void print_region_stats(FileMapInfo *map_info, ArchiveHeapInfo* heap_info);
+  void print_region_stats(FileMapInfo *map_info,
+                          ArchiveMappedHeapInfo* mapped_heap_info,
+                          ArchiveStreamedHeapInfo* streamed_heap_info);
   void print_bitmap_region_stats(size_t size, size_t total_size);
-  void print_heap_region_stats(ArchiveHeapInfo* heap_info, size_t total_size);
+  void print_heap_region_stats(char* start, size_t size, size_t total_size);
 
   // For global access.
   static ArchiveBuilder* _current;
@@ -434,7 +437,9 @@ public:
   void make_klasses_shareable();
   void make_training_data_shareable();
   void relocate_to_requested();
-  void write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_info);
+  void write_archive(FileMapInfo* mapinfo,
+                     ArchiveMappedHeapInfo* mapped_heap_info,
+                     ArchiveStreamedHeapInfo* streamed_heap_info);
   void write_region(FileMapInfo* mapinfo, int region_idx, DumpRegion* dump_region,
                     bool read_only,  bool allow_exec);
 
@@ -502,6 +507,7 @@ public:
     return (Symbol*)current()->get_buffered_addr((address)src_symbol);
   }
 
+  static void log_as_hex(address base, address top, address requested_base, bool is_heap = false);
   void print_stats();
   void report_out_of_space(const char* name, size_t needed_bytes);
 
diff --git a/src/hotspot/share/cds/archiveHeapLoader.cpp b/src/hotspot/share/cds/archiveHeapLoader.cpp
deleted file mode 100644
index 6efc8f6fe1e..00000000000
--- a/src/hotspot/share/cds/archiveHeapLoader.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "cds/aotMetaspace.hpp"
-#include "cds/archiveHeapLoader.inline.hpp"
-#include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
-#include "classfile/classLoaderDataShared.hpp"
-#include "classfile/systemDictionaryShared.hpp"
-#include "gc/shared/collectedHeap.hpp"
-#include "logging/log.hpp"
-#include "memory/iterator.inline.hpp"
-#include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
-#include "sanitizers/ub.hpp"
-#include "utilities/bitMap.inline.hpp"
-#include "utilities/copy.hpp"
-
-#if INCLUDE_CDS_JAVA_HEAP
-
-bool ArchiveHeapLoader::_is_mapped = false;
-bool ArchiveHeapLoader::_is_loaded = false;
-
-bool    ArchiveHeapLoader::_narrow_oop_base_initialized = false;
-address ArchiveHeapLoader::_narrow_oop_base;
-int     ArchiveHeapLoader::_narrow_oop_shift;
-
-// Support for loaded heap.
-uintptr_t ArchiveHeapLoader::_loaded_heap_bottom = 0;
-uintptr_t ArchiveHeapLoader::_loaded_heap_top = 0;
-uintptr_t ArchiveHeapLoader::_dumptime_base = UINTPTR_MAX;
-uintptr_t ArchiveHeapLoader::_dumptime_top = 0;
-intx ArchiveHeapLoader::_runtime_offset = 0;
-bool ArchiveHeapLoader::_loading_failed = false;
-
-// Support for mapped heap.
-uintptr_t ArchiveHeapLoader::_mapped_heap_bottom = 0;
-bool      ArchiveHeapLoader::_mapped_heap_relocation_initialized = false;
-ptrdiff_t ArchiveHeapLoader::_mapped_heap_delta = 0;
-
-// Every mapped region is offset by _mapped_heap_delta from its requested address.
-// See FileMapInfo::heap_region_requested_address().
-ATTRIBUTE_NO_UBSAN
-void ArchiveHeapLoader::init_mapped_heap_info(address mapped_heap_bottom, ptrdiff_t delta, int dumptime_oop_shift) {
-  assert(!_mapped_heap_relocation_initialized, "only once");
-  if (!UseCompressedOops) {
-    assert(dumptime_oop_shift == 0, "sanity");
-  }
-  assert(can_map(), "sanity");
-  init_narrow_oop_decoding(CompressedOops::base() + delta, dumptime_oop_shift);
-  _mapped_heap_bottom = (intptr_t)mapped_heap_bottom;
-  _mapped_heap_delta = delta;
-  _mapped_heap_relocation_initialized = true;
-}
-
-void ArchiveHeapLoader::init_narrow_oop_decoding(address base, int shift) {
-  assert(!_narrow_oop_base_initialized, "only once");
-  _narrow_oop_base_initialized = true;
-  _narrow_oop_base = base;
-  _narrow_oop_shift = shift;
-}
-
-void ArchiveHeapLoader::fixup_region() {
-  FileMapInfo* mapinfo = FileMapInfo::current_info();
-  if (is_mapped()) {
-    mapinfo->fixup_mapped_heap_region();
-  } else if (_loading_failed) {
-    fill_failed_loaded_heap();
-  }
-  if (is_in_use()) {
-    if (!CDSConfig::is_using_full_module_graph()) {
-      // Need to remove all the archived java.lang.Module objects from HeapShared::roots().
-      ClassLoaderDataShared::clear_archived_oops();
-    }
-  }
-}
-
-// ------------------ Support for Region MAPPING -----------------------------------------
-
-// Patch all the embedded oop pointers inside an archived heap region,
-// to be consistent with the runtime oop encoding.
-class PatchCompressedEmbeddedPointers: public BitMapClosure {
-  narrowOop* _start;
-
- public:
-  PatchCompressedEmbeddedPointers(narrowOop* start) : _start(start) {}
-
-  bool do_bit(size_t offset) {
-    narrowOop* p = _start + offset;
-    narrowOop v = *p;
-    assert(!CompressedOops::is_null(v), "null oops should have been filtered out at dump time");
-    oop o = ArchiveHeapLoader::decode_from_mapped_archive(v);
-    RawAccess<IS_NOT_NULL>::oop_store(p, o);
-    return true;
-  }
-};
-
-class PatchCompressedEmbeddedPointersQuick: public BitMapClosure {
-  narrowOop* _start;
-  uint32_t _delta;
-
- public:
-  PatchCompressedEmbeddedPointersQuick(narrowOop* start, uint32_t delta) : _start(start), _delta(delta) {}
-
-  bool do_bit(size_t offset) {
-    narrowOop* p = _start + offset;
-    narrowOop v = *p;
-    assert(!CompressedOops::is_null(v), "null oops should have been filtered out at dump time");
-    narrowOop new_v = CompressedOops::narrow_oop_cast(CompressedOops::narrow_oop_value(v) + _delta);
-    assert(!CompressedOops::is_null(new_v), "should never relocate to narrowOop(0)");
-#ifdef ASSERT
-    oop o1 = ArchiveHeapLoader::decode_from_mapped_archive(v);
-    oop o2 = CompressedOops::decode_not_null(new_v);
-    assert(o1 == o2, "quick delta must work");
-#endif
-    RawAccess<IS_NOT_NULL>::oop_store(p, new_v);
-    return true;
-  }
-};
-
-class PatchUncompressedEmbeddedPointers: public BitMapClosure {
-  oop* _start;
-  intptr_t _delta;
-
- public:
-  PatchUncompressedEmbeddedPointers(oop* start, intx runtime_offset) :
-    _start(start),
-    _delta(runtime_offset) {}
-
-  PatchUncompressedEmbeddedPointers(oop* start) :
-    _start(start),
-    _delta(ArchiveHeapLoader::mapped_heap_delta()) {}
-
-  bool do_bit(size_t offset) {
-    oop* p = _start + offset;
-    intptr_t dumptime_oop = (intptr_t)((void*)*p);
-    assert(dumptime_oop != 0, "null oops should have been filtered out at dump time");
-    intptr_t runtime_oop = dumptime_oop + _delta;
-    RawAccess<IS_NOT_NULL>::oop_store(p, cast_to_oop(runtime_oop));
-    return true;
-  }
-};
-
-void ArchiveHeapLoader::patch_compressed_embedded_pointers(BitMapView bm,
-                                                  FileMapInfo* info,
-                                                  MemRegion region) {
-  narrowOop dt_encoded_bottom = info->encoded_heap_region_dumptime_address();
-  narrowOop rt_encoded_bottom = CompressedOops::encode_not_null(cast_to_oop(region.start()));
-  log_info(aot)("patching heap embedded pointers: narrowOop 0x%8x -> 0x%8x",
-                  (uint)dt_encoded_bottom, (uint)rt_encoded_bottom);
-
-  // Optimization: if dumptime shift is the same as runtime shift, we can perform a
-  // quick conversion from "dumptime narrowOop" -> "runtime narrowOop".
-  narrowOop* patching_start = (narrowOop*)region.start() + FileMapInfo::current_info()->heap_oopmap_start_pos();
-  if (_narrow_oop_shift == CompressedOops::shift()) {
-    uint32_t quick_delta = (uint32_t)rt_encoded_bottom - (uint32_t)dt_encoded_bottom;
-    log_info(aot)("heap data relocation quick delta = 0x%x", quick_delta);
-    if (quick_delta == 0) {
-      log_info(aot)("heap data relocation unnecessary, quick_delta = 0");
-    } else {
-      PatchCompressedEmbeddedPointersQuick patcher(patching_start, quick_delta);
-      bm.iterate(&patcher);
-    }
-  } else {
-    log_info(aot)("heap data quick relocation not possible");
-    PatchCompressedEmbeddedPointers patcher(patching_start);
-    bm.iterate(&patcher);
-  }
-}
-
-// Patch all the non-null pointers that are embedded in the archived heap objects
-// in this (mapped) region
-void ArchiveHeapLoader::patch_embedded_pointers(FileMapInfo* info,
-                                                MemRegion region, address oopmap,
-                                                size_t oopmap_size_in_bits) {
-  BitMapView bm((BitMap::bm_word_t*)oopmap, oopmap_size_in_bits);
-  if (UseCompressedOops) {
-    patch_compressed_embedded_pointers(bm, info, region);
-  } else {
-    PatchUncompressedEmbeddedPointers patcher((oop*)region.start() + FileMapInfo::current_info()->heap_oopmap_start_pos());
-    bm.iterate(&patcher);
-  }
-}
-
-// ------------------ Support for Region LOADING -----------------------------------------
-
-// The CDS archive remembers each heap object by its address at dump time, but
-// the heap object may be loaded at a different address at run time. This structure is used
-// to translate the dump time addresses for all objects in FileMapInfo::space_at(region_index)
-// to their runtime addresses.
-struct LoadedArchiveHeapRegion {
-  int       _region_index;   // index for FileMapInfo::space_at(index)
-  size_t    _region_size;    // number of bytes in this region
-  uintptr_t _dumptime_base;  // The dump-time (decoded) address of the first object in this region
-  intx      _runtime_offset; // If an object's dump time address P is within in this region, its
-                             // runtime address is P + _runtime_offset
-  uintptr_t top() {
-    return _dumptime_base + _region_size;
-  }
-};
-
-void ArchiveHeapLoader::init_loaded_heap_relocation(LoadedArchiveHeapRegion* loaded_region) {
-  _dumptime_base = loaded_region->_dumptime_base;
-  _dumptime_top = loaded_region->top();
-  _runtime_offset = loaded_region->_runtime_offset;
-}
-
-bool ArchiveHeapLoader::can_load() {
-  return Universe::heap()->can_load_archived_objects();
-}
-
-class ArchiveHeapLoader::PatchLoadedRegionPointers: public BitMapClosure {
-  narrowOop* _start;
-  intx _offset;
-  uintptr_t _base;
-  uintptr_t _top;
-
- public:
-  PatchLoadedRegionPointers(narrowOop* start, LoadedArchiveHeapRegion* loaded_region)
-    : _start(start),
-      _offset(loaded_region->_runtime_offset),
-      _base(loaded_region->_dumptime_base),
-      _top(loaded_region->top()) {}
-
-  bool do_bit(size_t offset) {
-    assert(UseCompressedOops, "PatchLoadedRegionPointers for uncompressed oops is unimplemented");
-    narrowOop* p = _start + offset;
-    narrowOop v = *p;
-    assert(!CompressedOops::is_null(v), "null oops should have been filtered out at dump time");
-    uintptr_t o = cast_from_oop<uintptr_t>(ArchiveHeapLoader::decode_from_archive(v));
-    assert(_base <= o && o < _top, "must be");
-
-    o += _offset;
-    ArchiveHeapLoader::assert_in_loaded_heap(o);
-    RawAccess<IS_NOT_NULL>::oop_store(p, cast_to_oop(o));
-    return true;
-  }
-};
-
-bool ArchiveHeapLoader::init_loaded_region(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
-                                           MemRegion& archive_space) {
-  size_t total_bytes = 0;
-  FileMapRegion* r = mapinfo->region_at(AOTMetaspace::hp);
-  r->assert_is_heap_region();
-  if (r->used() == 0) {
-    return false;
-  }
-
-  assert(is_aligned(r->used(), HeapWordSize), "must be");
-  total_bytes += r->used();
-  loaded_region->_region_index = AOTMetaspace::hp;
-  loaded_region->_region_size = r->used();
-  loaded_region->_dumptime_base = (uintptr_t)mapinfo->heap_region_dumptime_address();
-
-  assert(is_aligned(total_bytes, HeapWordSize), "must be");
-  size_t word_size = total_bytes / HeapWordSize;
-  HeapWord* buffer = Universe::heap()->allocate_loaded_archive_space(word_size);
-  if (buffer == nullptr) {
-    return false;
-  }
-
-  archive_space = MemRegion(buffer, word_size);
-  _loaded_heap_bottom = (uintptr_t)archive_space.start();
-  _loaded_heap_top    = _loaded_heap_bottom + total_bytes;
-
-  loaded_region->_runtime_offset = _loaded_heap_bottom - loaded_region->_dumptime_base;
-
-  return true;
-}
-
-bool ArchiveHeapLoader::load_heap_region_impl(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
-                                              uintptr_t load_address) {
-  uintptr_t bitmap_base = (uintptr_t)mapinfo->map_bitmap_region();
-  if (bitmap_base == 0) {
-    _loading_failed = true;
-    return false; // OOM or CRC error
-  }
-
-  FileMapRegion* r = mapinfo->region_at(loaded_region->_region_index);
-  if (!mapinfo->read_region(loaded_region->_region_index, (char*)load_address, r->used(), /* do_commit = */ false)) {
-    // There's no easy way to free the buffer, so we will fill it with zero later
-    // in fill_failed_loaded_heap(), and it will eventually be GC'ed.
-    log_warning(aot)("Loading of heap region %d has failed. Archived objects are disabled", loaded_region->_region_index);
-    _loading_failed = true;
-    return false;
-  }
-  assert(r->mapped_base() == (char*)load_address, "sanity");
-  log_info(aot)("Loaded heap    region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT
-                " size %6zu delta %zd",
-                loaded_region->_region_index, load_address, load_address + loaded_region->_region_size,
-                loaded_region->_region_size, loaded_region->_runtime_offset);
-
-  uintptr_t oopmap = bitmap_base + r->oopmap_offset();
-  BitMapView bm((BitMap::bm_word_t*)oopmap, r->oopmap_size_in_bits());
-
-  if (UseCompressedOops) {
-    PatchLoadedRegionPointers patcher((narrowOop*)load_address + FileMapInfo::current_info()->heap_oopmap_start_pos(), loaded_region);
-    bm.iterate(&patcher);
-  } else {
-    PatchUncompressedEmbeddedPointers patcher((oop*)load_address + FileMapInfo::current_info()->heap_oopmap_start_pos(), loaded_region->_runtime_offset);
-    bm.iterate(&patcher);
-  }
-  return true;
-}
-
-bool ArchiveHeapLoader::load_heap_region(FileMapInfo* mapinfo) {
-  assert(can_load(), "loaded heap for must be supported");
-  init_narrow_oop_decoding(mapinfo->narrow_oop_base(), mapinfo->narrow_oop_shift());
-
-  LoadedArchiveHeapRegion loaded_region;
-  memset(&loaded_region, 0, sizeof(loaded_region));
-
-  MemRegion archive_space;
-  if (!init_loaded_region(mapinfo, &loaded_region, archive_space)) {
-    return false;
-  }
-
-  if (!load_heap_region_impl(mapinfo, &loaded_region, (uintptr_t)archive_space.start())) {
-    assert(_loading_failed, "must be");
-    return false;
-  }
-
-  init_loaded_heap_relocation(&loaded_region);
-  _is_loaded = true;
-
-  return true;
-}
-
-class VerifyLoadedHeapEmbeddedPointers: public BasicOopIterateClosure {
-  HashTable<uintptr_t, bool>* _table;
-
- public:
-  VerifyLoadedHeapEmbeddedPointers(HashTable<uintptr_t, bool>* table) : _table(table) {}
-
-  virtual void do_oop(narrowOop* p) {
-    // This should be called before the loaded region is modified, so all the embedded pointers
-    // must be null, or must point to a valid object in the loaded region.
-    narrowOop v = *p;
-    if (!CompressedOops::is_null(v)) {
-      oop o = CompressedOops::decode_not_null(v);
-      uintptr_t u = cast_from_oop<uintptr_t>(o);
-      ArchiveHeapLoader::assert_in_loaded_heap(u);
-      guarantee(_table->contains(u), "must point to beginning of object in loaded archived region");
-    }
-  }
-  virtual void do_oop(oop* p) {
-    oop v = *p;
-    if(v != nullptr) {
-      uintptr_t u = cast_from_oop<uintptr_t>(v);
-      ArchiveHeapLoader::assert_in_loaded_heap(u);
-      guarantee(_table->contains(u), "must point to beginning of object in loaded archived region");
-    }
-  }
-};
-
-void ArchiveHeapLoader::finish_initialization() {
-  if (is_loaded()) {
-    // These operations are needed only when the heap is loaded (not mapped).
-    finish_loaded_heap();
-    if (VerifyArchivedFields > 0) {
-      verify_loaded_heap();
-    }
-  }
-  if (is_in_use()) {
-    patch_native_pointers();
-    intptr_t bottom = is_loaded() ? _loaded_heap_bottom : _mapped_heap_bottom;
-
-    // The heap roots are stored in one or more segments that are laid out consecutively.
-    // The size of each segment (except for the last one) is max_size_in_{elems,bytes}.
-    HeapRootSegments segments = FileMapInfo::current_info()->heap_root_segments();
-    HeapShared::init_root_segment_sizes(segments.max_size_in_elems());
-    intptr_t first_segment_addr = bottom + segments.base_offset();
-    for (size_t c = 0; c < segments.count(); c++) {
-      oop segment_oop = cast_to_oop(first_segment_addr + (c * segments.max_size_in_bytes()));
-      assert(segment_oop->is_objArray(), "Must be");
-      HeapShared::add_root_segment((objArrayOop)segment_oop);
-    }
-  }
-}
-
-void ArchiveHeapLoader::finish_loaded_heap() {
-  HeapWord* bottom = (HeapWord*)_loaded_heap_bottom;
-  HeapWord* top    = (HeapWord*)_loaded_heap_top;
-
-  MemRegion archive_space = MemRegion(bottom, top);
-  Universe::heap()->complete_loaded_archive_space(archive_space);
-}
-
-void ArchiveHeapLoader::verify_loaded_heap() {
-  log_info(aot, heap)("Verify all oops and pointers in loaded heap");
-
-  ResourceMark rm;
-  HashTable<uintptr_t, bool> table;
-  VerifyLoadedHeapEmbeddedPointers verifier(&table);
-  HeapWord* bottom = (HeapWord*)_loaded_heap_bottom;
-  HeapWord* top    = (HeapWord*)_loaded_heap_top;
-
-  for (HeapWord* p = bottom; p < top; ) {
-    oop o = cast_to_oop(p);
-    table.put(cast_from_oop<uintptr_t>(o), true);
-    p += o->size();
-  }
-
-  for (HeapWord* p = bottom; p < top; ) {
-    oop o = cast_to_oop(p);
-    o->oop_iterate(&verifier);
-    p += o->size();
-  }
-}
-
-void ArchiveHeapLoader::fill_failed_loaded_heap() {
-  assert(_loading_failed, "must be");
-  if (_loaded_heap_bottom != 0) {
-    assert(_loaded_heap_top != 0, "must be");
-    HeapWord* bottom = (HeapWord*)_loaded_heap_bottom;
-    HeapWord* top = (HeapWord*)_loaded_heap_top;
-    Universe::heap()->fill_with_objects(bottom, top - bottom);
-  }
-}
-
-class PatchNativePointers: public BitMapClosure {
-  Metadata** _start;
-
- public:
-  PatchNativePointers(Metadata** start) : _start(start) {}
-
-  bool do_bit(size_t offset) {
-    Metadata** p = _start + offset;
-    *p = (Metadata*)(address(*p) + AOTMetaspace::relocation_delta());
-    return true;
-  }
-};
-
-void ArchiveHeapLoader::patch_native_pointers() {
-  if (AOTMetaspace::relocation_delta() == 0) {
-    return;
-  }
-
-  FileMapRegion* r = FileMapInfo::current_info()->region_at(AOTMetaspace::hp);
-  if (r->mapped_base() != nullptr && r->has_ptrmap()) {
-    log_info(aot, heap)("Patching native pointers in heap region");
-    BitMapView bm = FileMapInfo::current_info()->ptrmap_view(AOTMetaspace::hp);
-    PatchNativePointers patcher((Metadata**)r->mapped_base() + FileMapInfo::current_info()->heap_ptrmap_start_pos());
-    bm.iterate(&patcher);
-  }
-}
-#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 43da3cf9da8..842668509cf 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -25,7 +25,6 @@
 #include "cds/aotLogging.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.inline.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/classListParser.hpp"
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index a5d1f78b76f..7976f690b8b 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -24,11 +24,10 @@
 
 #include "cds/aotLogging.hpp"
 #include "cds/aotMapLogger.hpp"
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/classListWriter.hpp"
 #include "cds/filemap.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "code/aotCodeCache.hpp"
@@ -893,11 +892,6 @@ static const char* check_options_incompatible_with_dumping_heap() {
     return "UseCompressedClassPointers must be true";
   }
 
-  // Almost all GCs support heap region dump, except ZGC (so far).
-  if (UseZGC) {
-    return "ZGC is not supported";
-  }
-
   return nullptr;
 #else
   return "JVM not configured for writing Java heap objects";
@@ -969,7 +963,7 @@ bool CDSConfig::is_dumping_heap() {
 }
 
 bool CDSConfig::is_loading_heap() {
-  return ArchiveHeapLoader::is_in_use();
+  return HeapShared::is_archived_heap_in_use();
 }
 
 bool CDSConfig::is_using_full_module_graph() {
@@ -981,7 +975,7 @@ bool CDSConfig::is_using_full_module_graph() {
     return false;
   }
 
-  if (is_using_archive() && ArchiveHeapLoader::can_use()) {
+  if (is_using_archive() && HeapShared::can_use_archived_heap()) {
     // Classes used by the archived full module graph are loaded in JVMTI early phase.
     assert(!(JvmtiExport::should_post_class_file_load_hook() && JvmtiExport::has_early_class_hook_env()),
            "CDS should be disabled if early class hooks are enabled");
diff --git a/src/hotspot/share/cds/cdsEnumKlass.cpp b/src/hotspot/share/cds/cdsEnumKlass.cpp
index f771eeec3d7..1bf6ba4eba8 100644
--- a/src/hotspot/share/cds/cdsEnumKlass.cpp
+++ b/src/hotspot/share/cds/cdsEnumKlass.cpp
@@ -22,9 +22,8 @@
  *
  */
 
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsEnumKlass.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
 #include "memory/resourceArea.hpp"
@@ -109,7 +108,7 @@ void CDSEnumKlass::archive_static_field(int level, KlassSubGraphInfo* subgraph_i
 }
 
 bool CDSEnumKlass::initialize_enum_klass(InstanceKlass* k, TRAPS) {
-  if (!ArchiveHeapLoader::is_in_use()) {
+  if (!HeapShared::is_archived_heap_in_use()) {
     return false;
   }
 
@@ -121,14 +120,14 @@ bool CDSEnumKlass::initialize_enum_klass(InstanceKlass* k, TRAPS) {
     log_info(aot, heap)("Initializing Enum class: %s", k->external_name());
   }
 
-  oop mirror = k->java_mirror();
   int i = 0;
   for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
     if (fs.access_flags().is_static()) {
       int root_index = info->enum_klass_static_field_root_index_at(i++);
       fieldDescriptor& fd = fs.field_descriptor();
       assert(fd.field_type() == T_OBJECT || fd.field_type() == T_ARRAY, "must be");
-      mirror->obj_field_put(fd.offset(), HeapShared::get_root(root_index, /*clear=*/true));
+      oop root_object = HeapShared::get_root(root_index, /*clear=*/true);
+      k->java_mirror()->obj_field_put(fd.offset(), root_object);
     }
   }
   return true;
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
index 59c91c834d6..65063b4b005 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.cpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -28,6 +28,7 @@
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
+#include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
@@ -386,7 +387,7 @@ inline bool CDSHeapVerifier::do_entry(OopHandle& orig_obj_handle, HeapShared::Ca
   if (java_lang_String::is_instance(orig_obj) && HeapShared::is_dumped_interned_string(orig_obj)) {
     // It's quite often for static fields to have interned strings. These are most likely not
     // problematic (and are hard to filter). So we will ignore them.
-    return true; /* keep on iterating */
+    return true;
   }
 
   StaticFieldInfo* info = _table.get(orig_obj);
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index 3e3062097f9..447914b3101 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -76,6 +76,12 @@
           "Dump the names all loaded classes, that could be stored into "   \
           "the CDS archive, in the specified file")                         \
                                                                             \
+  product(bool, AOTStreamableObjects, false, DIAGNOSTIC,                    \
+          "Archive the Java heap in a generic streamable object format")    \
+                                                                            \
+  product(bool, AOTEagerlyLoadObjects, false, DIAGNOSTIC,                   \
+          "Load streamable objects synchronously without concurrency")      \
+                                                                            \
   product(ccstr, SharedClassListFile, nullptr,                              \
           "Override the default CDS class list")                            \
                                                                             \
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index 6fac1676b9f..85e59e23f8c 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -28,11 +28,11 @@
 #include "cds/aotLogging.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.inline.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
+#include "cds/heapShared.hpp"
 #include "cds/lambdaFormInvokers.hpp"
 #include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/regeneratedClasses.hpp"
@@ -353,8 +353,7 @@ void DynamicArchiveBuilder::write_archive(char* serialized_data, AOTClassLocatio
   assert(dynamic_info != nullptr, "Sanity");
 
   dynamic_info->open_as_output();
-  ArchiveHeapInfo no_heap_for_dynamic_dump;
-  ArchiveBuilder::write_archive(dynamic_info, &no_heap_for_dynamic_dump);
+  ArchiveBuilder::write_archive(dynamic_info, nullptr, nullptr);
 
   address base = _requested_dynamic_archive_bottom;
   address top  = _requested_dynamic_archive_top;
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index b52861cecef..ae92ce31058 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -24,16 +24,16 @@
 
 #include "cds/aotClassLocation.hpp"
 #include "cds/aotLogging.hpp"
+#include "cds/aotMappedHeapLoader.hpp"
+#include "cds/aotMappedHeapWriter.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.inline.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.inline.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
 #include "cds/filemap.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.hpp"
@@ -217,6 +217,7 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   _compact_strings = CompactStrings;
   _compact_headers = UseCompactObjectHeaders;
   if (CDSConfig::is_dumping_heap()) {
+    _object_streaming_mode = HeapShared::is_writing_streaming_mode();
     _narrow_oop_mode = CompressedOops::mode();
     _narrow_oop_base = CompressedOops::base();
     _narrow_oop_shift = CompressedOops::shift();
@@ -283,40 +284,51 @@ void FileMapHeader::print(outputStream* st) {
   }
   st->print_cr("============ end regions ======== ");
 
-  st->print_cr("- core_region_alignment:          %zu", _core_region_alignment);
-  st->print_cr("- obj_alignment:                  %d", _obj_alignment);
-  st->print_cr("- narrow_oop_base:                " INTPTR_FORMAT, p2i(_narrow_oop_base));
-  st->print_cr("- narrow_oop_shift                %d", _narrow_oop_shift);
-  st->print_cr("- compact_strings:                %d", _compact_strings);
-  st->print_cr("- compact_headers:                %d", _compact_headers);
-  st->print_cr("- max_heap_size:                  %zu", _max_heap_size);
-  st->print_cr("- narrow_oop_mode:                %d", _narrow_oop_mode);
-  st->print_cr("- compressed_oops:                %d", _compressed_oops);
-  st->print_cr("- compressed_class_ptrs:          %d", _compressed_class_ptrs);
-  st->print_cr("- narrow_klass_pointer_bits:      %d", _narrow_klass_pointer_bits);
-  st->print_cr("- narrow_klass_shift:             %d", _narrow_klass_shift);
-  st->print_cr("- cloned_vtables_offset:          0x%zx", _cloned_vtables_offset);
-  st->print_cr("- early_serialized_data_offset:   0x%zx", _early_serialized_data_offset);
-  st->print_cr("- serialized_data_offset:         0x%zx", _serialized_data_offset);
-  st->print_cr("- jvm_ident:                      %s", _jvm_ident);
-  st->print_cr("- class_location_config_offset:   0x%zx", _class_location_config_offset);
-  st->print_cr("- verify_local:                   %d", _verify_local);
-  st->print_cr("- verify_remote:                  %d", _verify_remote);
-  st->print_cr("- has_platform_or_app_classes:    %d", _has_platform_or_app_classes);
-  st->print_cr("- requested_base_address:         " INTPTR_FORMAT, p2i(_requested_base_address));
-  st->print_cr("- mapped_base_address:            " INTPTR_FORMAT, p2i(_mapped_base_address));
-  st->print_cr("- heap_root_segments.roots_count: %d" , _heap_root_segments.roots_count());
-  st->print_cr("- heap_root_segments.base_offset: 0x%zx", _heap_root_segments.base_offset());
-  st->print_cr("- heap_root_segments.count:       %zu", _heap_root_segments.count());
-  st->print_cr("- heap_root_segments.max_size_elems: %d", _heap_root_segments.max_size_in_elems());
-  st->print_cr("- heap_root_segments.max_size_bytes: %zu", _heap_root_segments.max_size_in_bytes());
-  st->print_cr("- _heap_oopmap_start_pos:         %zu", _heap_oopmap_start_pos);
-  st->print_cr("- _heap_ptrmap_start_pos:         %zu", _heap_ptrmap_start_pos);
-  st->print_cr("- _rw_ptrmap_start_pos:           %zu", _rw_ptrmap_start_pos);
-  st->print_cr("- _ro_ptrmap_start_pos:           %zu", _ro_ptrmap_start_pos);
-  st->print_cr("- use_optimized_module_handling:  %d", _use_optimized_module_handling);
-  st->print_cr("- has_full_module_graph           %d", _has_full_module_graph);
-  st->print_cr("- has_aot_linked_classes          %d", _has_aot_linked_classes);
+  st->print_cr("- core_region_alignment:                    %zu", _core_region_alignment);
+  st->print_cr("- obj_alignment:                            %d", _obj_alignment);
+  st->print_cr("- narrow_oop_base:                          " INTPTR_FORMAT, p2i(_narrow_oop_base));
+  st->print_cr("- narrow_oop_shift                          %d", _narrow_oop_shift);
+  st->print_cr("- compact_strings:                          %d", _compact_strings);
+  st->print_cr("- compact_headers:                          %d", _compact_headers);
+  st->print_cr("- max_heap_size:                            %zu", _max_heap_size);
+  st->print_cr("- narrow_oop_mode:                          %d", _narrow_oop_mode);
+  st->print_cr("- compressed_oops:                          %d", _compressed_oops);
+  st->print_cr("- compressed_class_ptrs:                    %d", _compressed_class_ptrs);
+  st->print_cr("- narrow_klass_pointer_bits:                %d", _narrow_klass_pointer_bits);
+  st->print_cr("- narrow_klass_shift:                       %d", _narrow_klass_shift);
+  st->print_cr("- cloned_vtables_offset:                    0x%zx", _cloned_vtables_offset);
+  st->print_cr("- early_serialized_data_offset:             0x%zx", _early_serialized_data_offset);
+  st->print_cr("- serialized_data_offset:                   0x%zx", _serialized_data_offset);
+  st->print_cr("- jvm_ident:                                %s", _jvm_ident);
+  st->print_cr("- class_location_config_offset:             0x%zx", _class_location_config_offset);
+  st->print_cr("- verify_local:                             %d", _verify_local);
+  st->print_cr("- verify_remote:                            %d", _verify_remote);
+  st->print_cr("- has_platform_or_app_classes:              %d", _has_platform_or_app_classes);
+  st->print_cr("- requested_base_address:                   " INTPTR_FORMAT, p2i(_requested_base_address));
+  st->print_cr("- mapped_base_address:                      " INTPTR_FORMAT, p2i(_mapped_base_address));
+
+  st->print_cr("- object_streaming_mode:                    %d", _object_streaming_mode);
+  st->print_cr("- mapped_heap_header");
+  st->print_cr("  - root_segments");
+  st->print_cr("    - roots_count:                          %d", _mapped_heap_header.root_segments().roots_count());
+  st->print_cr("    - base_offset:                          0x%zx", _mapped_heap_header.root_segments().base_offset());
+  st->print_cr("    - count:                                %zu", _mapped_heap_header.root_segments().count());
+  st->print_cr("    - max_size_elems:                       %d", _mapped_heap_header.root_segments().max_size_in_elems());
+  st->print_cr("    - max_size_bytes:                       %zu", _mapped_heap_header.root_segments().max_size_in_bytes());
+  st->print_cr("  - oopmap_start_pos:                       %zu", _mapped_heap_header.oopmap_start_pos());
+  st->print_cr("  - oopmap_ptrmap_pos:                      %zu", _mapped_heap_header.ptrmap_start_pos());
+  st->print_cr("- streamed_heap_header");
+  st->print_cr("  - forwarding_offset:                      %zu", _streamed_heap_header.forwarding_offset());
+  st->print_cr("  - roots_offset:                           %zu", _streamed_heap_header.roots_offset());
+  st->print_cr("  - num_roots:                              %zu", _streamed_heap_header.num_roots());
+  st->print_cr("  - root_highest_object_index_table_offset: %zu", _streamed_heap_header.root_highest_object_index_table_offset());
+  st->print_cr("  - num_archived_objects:                   %zu", _streamed_heap_header.num_archived_objects());
+
+  st->print_cr("- _rw_ptrmap_start_pos:                     %zu", _rw_ptrmap_start_pos);
+  st->print_cr("- _ro_ptrmap_start_pos:                     %zu", _ro_ptrmap_start_pos);
+  st->print_cr("- use_optimized_module_handling:            %d", _use_optimized_module_handling);
+  st->print_cr("- has_full_module_graph                     %d", _has_full_module_graph);
+  st->print_cr("- has_aot_linked_classes                    %d", _has_aot_linked_classes);
 }
 
 bool FileMapInfo::validate_class_location() {
@@ -896,12 +908,14 @@ void FileMapInfo::write_region(int region, char* base, size_t size,
     assert(CDSConfig::is_dumping_heap(), "sanity");
 #if INCLUDE_CDS_JAVA_HEAP
     assert(!CDSConfig::is_dumping_dynamic_archive(), "must be");
-    requested_base = (char*)ArchiveHeapWriter::requested_address();
-    if (UseCompressedOops) {
-      mapping_offset = (size_t)((address)requested_base - CompressedOops::base());
-      assert((mapping_offset >> CompressedOops::shift()) << CompressedOops::shift() == mapping_offset, "must be");
+    if (HeapShared::is_writing_mapping_mode()) {
+      requested_base = (char*)AOTMappedHeapWriter::requested_address();
+      if (UseCompressedOops) {
+        mapping_offset = (size_t)((address)requested_base - CompressedOops::base());
+        assert((mapping_offset >> CompressedOops::shift()) << CompressedOops::shift() == mapping_offset, "must be");
+      }
     } else {
-      mapping_offset = 0; // not used with !UseCompressedOops
+      requested_base = nullptr;
     }
 #endif // INCLUDE_CDS_JAVA_HEAP
   } else {
@@ -954,7 +968,10 @@ size_t FileMapInfo::remove_bitmap_zeros(CHeapBitMap* map) {
   return first_set;
 }
 
-char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
+char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap,
+                                       CHeapBitMap* ro_ptrmap,
+                                       ArchiveMappedHeapInfo* mapped_heap_info,
+                                       ArchiveStreamedHeapInfo* streamed_heap_info,
                                        size_t &size_in_bytes) {
   size_t removed_rw_leading_zeros = remove_bitmap_zeros(rw_ptrmap);
   size_t removed_ro_leading_zeros = remove_bitmap_zeros(ro_ptrmap);
@@ -962,22 +979,27 @@ char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_p
   header()->set_ro_ptrmap_start_pos(removed_ro_leading_zeros);
   size_in_bytes = rw_ptrmap->size_in_bytes() + ro_ptrmap->size_in_bytes();
 
-  if (heap_info->is_used()) {
+  if (mapped_heap_info != nullptr && mapped_heap_info->is_used()) {
     // Remove leading and trailing zeros
-    size_t removed_oop_leading_zeros = remove_bitmap_zeros(heap_info->oopmap());
-    size_t removed_ptr_leading_zeros = remove_bitmap_zeros(heap_info->ptrmap());
-    header()->set_heap_oopmap_start_pos(removed_oop_leading_zeros);
-    header()->set_heap_ptrmap_start_pos(removed_ptr_leading_zeros);
+    assert(HeapShared::is_writing_mapping_mode(), "unexpected dumping mode");
+    size_t removed_oop_leading_zeros = remove_bitmap_zeros(mapped_heap_info->oopmap());
+    size_t removed_ptr_leading_zeros = remove_bitmap_zeros(mapped_heap_info->ptrmap());
+    mapped_heap_info->set_oopmap_start_pos(removed_oop_leading_zeros);
+    mapped_heap_info->set_ptrmap_start_pos(removed_ptr_leading_zeros);
 
-    size_in_bytes += heap_info->oopmap()->size_in_bytes();
-    size_in_bytes += heap_info->ptrmap()->size_in_bytes();
+    size_in_bytes += mapped_heap_info->oopmap()->size_in_bytes();
+    size_in_bytes += mapped_heap_info->ptrmap()->size_in_bytes();
+  } else if (streamed_heap_info != nullptr && streamed_heap_info->is_used()) {
+    assert(HeapShared::is_writing_streaming_mode(), "unexpected dumping mode");
+
+    size_in_bytes += streamed_heap_info->oopmap()->size_in_bytes();
   }
 
   // The bitmap region contains up to 4 parts:
-  // rw_ptrmap:           metaspace pointers inside the read-write region
-  // ro_ptrmap:           metaspace pointers inside the read-only region
-  // heap_info->oopmap(): Java oop pointers in the heap region
-  // heap_info->ptrmap(): metaspace pointers in the heap region
+  // rw_ptrmap:                  metaspace pointers inside the read-write region
+  // ro_ptrmap:                  metaspace pointers inside the read-only region
+  // *_heap_info->oopmap():      Java oop pointers in the heap region
+  // mapped_heap_info->ptrmap(): metaspace pointers in the heap region
   char* buffer = NEW_C_HEAP_ARRAY(char, size_in_bytes, mtClassShared);
   size_t written = 0;
 
@@ -987,28 +1009,45 @@ char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_p
   region_at(AOTMetaspace::ro)->init_ptrmap(written, ro_ptrmap->size());
   written = write_bitmap(ro_ptrmap, buffer, written);
 
-  if (heap_info->is_used()) {
+  if (mapped_heap_info != nullptr && mapped_heap_info->is_used()) {
+    assert(HeapShared::is_writing_mapping_mode(), "unexpected dumping mode");
     FileMapRegion* r = region_at(AOTMetaspace::hp);
 
-    r->init_oopmap(written, heap_info->oopmap()->size());
-    written = write_bitmap(heap_info->oopmap(), buffer, written);
+    r->init_oopmap(written, mapped_heap_info->oopmap()->size());
+    written = write_bitmap(mapped_heap_info->oopmap(), buffer, written);
 
-    r->init_ptrmap(written, heap_info->ptrmap()->size());
-    written = write_bitmap(heap_info->ptrmap(), buffer, written);
+    r->init_ptrmap(written, mapped_heap_info->ptrmap()->size());
+    written = write_bitmap(mapped_heap_info->ptrmap(), buffer, written);
+  } else if (streamed_heap_info != nullptr && streamed_heap_info->is_used()) {
+    assert(HeapShared::is_writing_streaming_mode(), "unexpected dumping mode");
+    FileMapRegion* r = region_at(AOTMetaspace::hp);
+
+    r->init_oopmap(written, streamed_heap_info->oopmap()->size());
+    written = write_bitmap(streamed_heap_info->oopmap(), buffer, written);
   }
 
   write_region(AOTMetaspace::bm, (char*)buffer, size_in_bytes, /*read_only=*/true, /*allow_exec=*/false);
   return buffer;
 }
 
-size_t FileMapInfo::write_heap_region(ArchiveHeapInfo* heap_info) {
+#if INCLUDE_CDS_JAVA_HEAP
+size_t FileMapInfo::write_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) {
   char* buffer_start = heap_info->buffer_start();
   size_t buffer_size = heap_info->buffer_byte_size();
   write_region(AOTMetaspace::hp, buffer_start, buffer_size, false, false);
-  header()->set_heap_root_segments(heap_info->heap_root_segments());
+  header()->set_mapped_heap_header(heap_info->create_header());
   return buffer_size;
 }
 
+size_t FileMapInfo::write_streamed_heap_region(ArchiveStreamedHeapInfo* heap_info) {
+  char* buffer_start = heap_info->buffer_start();
+  size_t buffer_size = heap_info->buffer_byte_size();
+  write_region(AOTMetaspace::hp, buffer_start, buffer_size, true, false);
+  header()->set_streamed_heap_header(heap_info->create_header());
+  return buffer_size;
+}
+#endif // INCLUDE_CDS_JAVA_HEAP
+
 // Dump bytes to file -- at the current file position.
 
 void FileMapInfo::write_bytes(const void* buffer, size_t nbytes) {
@@ -1076,7 +1115,7 @@ void FileMapInfo::close() {
  * Same as os::map_memory() but also pretouches if AlwaysPreTouch is enabled.
  */
 static char* map_memory(int fd, const char* file_name, size_t file_offset,
-                        char *addr, size_t bytes, bool read_only,
+                        char* addr, size_t bytes, bool read_only,
                         bool allow_exec, MemTag mem_tag) {
   char* mem = os::map_memory(fd, file_name, file_offset, addr, bytes,
                              mem_tag, AlwaysPreTouch ? false : read_only,
@@ -1087,6 +1126,17 @@ static char* map_memory(int fd, const char* file_name, size_t file_offset,
   return mem;
 }
 
+char* FileMapInfo::map_heap_region(FileMapRegion* r, char* addr, size_t bytes) {
+  return ::map_memory(_fd,
+                    _full_path,
+                    r->file_offset(),
+                    addr,
+                    bytes,
+                    r->read_only(),
+                    r->allow_exec(),
+                    mtJavaHeap);
+}
+
 // JVM/TI RedefineClasses() support:
 // Remap the shared readonly space to shared readwrite, private.
 bool FileMapInfo::remap_shared_readonly_as_readwrite() {
@@ -1254,35 +1304,40 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
 }
 
 // The return value is the location of the archive relocation bitmap.
-char* FileMapInfo::map_bitmap_region() {
-  FileMapRegion* r = region_at(AOTMetaspace::bm);
+char* FileMapInfo::map_auxiliary_region(int region_index, bool read_only) {
+  FileMapRegion* r = region_at(region_index);
   if (r->mapped_base() != nullptr) {
     return r->mapped_base();
   }
-  bool read_only = true, allow_exec = false;
+  const char* region_name = shared_region_name[region_index];
+  bool allow_exec = false;
   char* requested_addr = nullptr; // allow OS to pick any location
-  char* bitmap_base = map_memory(_fd, _full_path, r->file_offset(),
+  char* mapped_base = map_memory(_fd, _full_path, r->file_offset(),
                                  requested_addr, r->used_aligned(), read_only, allow_exec, mtClassShared);
-  if (bitmap_base == nullptr) {
-    AOTMetaspace::report_loading_error("failed to map relocation bitmap");
+  if (mapped_base == nullptr) {
+    AOTMetaspace::report_loading_error("failed to map %d region", region_index);
     return nullptr;
   }
 
-  if (VerifySharedSpaces && !r->check_region_crc(bitmap_base)) {
-    aot_log_error(aot)("relocation bitmap CRC error");
-    if (!os::unmap_memory(bitmap_base, r->used_aligned())) {
-      fatal("os::unmap_memory of relocation bitmap failed");
+  if (VerifySharedSpaces && !r->check_region_crc(mapped_base)) {
+    aot_log_error(aot)("region %d CRC error", region_index);
+    if (!os::unmap_memory(mapped_base, r->used_aligned())) {
+      fatal("os::unmap_memory of region %d failed", region_index);
     }
     return nullptr;
   }
 
   r->set_mapped_from_file(true);
-  r->set_mapped_base(bitmap_base);
-  aot_log_info(aot)("Mapped %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
+  r->set_mapped_base(mapped_base);
+  aot_log_info(aot)("Mapped %s region #%d at base %zu top %zu (%s)",
                 is_static() ? "static " : "dynamic",
-                AOTMetaspace::bm, p2i(r->mapped_base()), p2i(r->mapped_end()),
-                shared_region_name[AOTMetaspace::bm]);
-  return bitmap_base;
+                region_index, p2i(r->mapped_base()), p2i(r->mapped_end()),
+                region_name);
+  return mapped_base;
+}
+
+char* FileMapInfo::map_bitmap_region() {
+  return map_auxiliary_region(AOTMetaspace::bm, false);
 }
 
 bool FileMapInfo::map_aot_code_region(ReservedSpace rs) {
@@ -1429,59 +1484,48 @@ size_t FileMapInfo::readonly_total() {
 }
 
 #if INCLUDE_CDS_JAVA_HEAP
-MemRegion FileMapInfo::_mapped_heap_memregion;
 
 bool FileMapInfo::has_heap_region() {
   return (region_at(AOTMetaspace::hp)->used() > 0);
 }
 
-// Returns the address range of the archived heap region computed using the
-// current oop encoding mode. This range may be different than the one seen at
-// dump time due to encoding mode differences. The result is used in determining
-// if/how these regions should be relocated at run time.
-MemRegion FileMapInfo::get_heap_region_requested_range() {
-  FileMapRegion* r = region_at(AOTMetaspace::hp);
-  size_t size = r->used();
-  assert(size > 0, "must have non-empty heap region");
+static void on_heap_region_loading_error() {
+  if (CDSConfig::is_using_aot_linked_classes()) {
+    // It's too late to recover -- we have already committed to use the archived metaspace objects, but
+    // the archived heap objects cannot be loaded, so we don't have the archived FMG to guarantee that
+    // all AOT-linked classes are visible.
+    //
+    // We get here because the heap is too small. The app will fail anyway. So let's quit.
+    aot_log_error(aot)("%s has aot-linked classes but the archived "
+                       "heap objects cannot be loaded. Try increasing your heap size.",
+                       CDSConfig::type_of_archive_being_loaded());
+    AOTMetaspace::unrecoverable_loading_error();
+  }
+  CDSConfig::stop_using_full_module_graph();
+}
 
-  address start = heap_region_requested_address();
-  address end = start + size;
-  aot_log_info(aot)("Requested heap region [" INTPTR_FORMAT " - " INTPTR_FORMAT "] = %8zu bytes",
-                p2i(start), p2i(end), size);
+void FileMapInfo::stream_heap_region() {
+  assert(object_streaming_mode(), "This should only be done for the streaming approach");
 
-  return MemRegion((HeapWord*)start, (HeapWord*)end);
+  if (map_auxiliary_region(AOTMetaspace::hp, /*readonly=*/true) != nullptr) {
+    HeapShared::initialize_streaming();
+  } else {
+    on_heap_region_loading_error();
+  }
 }
 
 void FileMapInfo::map_or_load_heap_region() {
+  assert(!object_streaming_mode(), "This should only be done for the mapping approach");
   bool success = false;
 
-  if (can_use_heap_region()) {
-    if (ArchiveHeapLoader::can_map()) {
-      success = map_heap_region();
-    } else if (ArchiveHeapLoader::can_load()) {
-      success = ArchiveHeapLoader::load_heap_region(this);
-    } else {
-      if (!UseCompressedOops && !ArchiveHeapLoader::can_map()) {
-        AOTMetaspace::report_loading_error("Cannot use CDS heap data. Selected GC not compatible -XX:-UseCompressedOops");
-      } else {
-        AOTMetaspace::report_loading_error("Cannot use CDS heap data. UseEpsilonGC, UseG1GC, UseSerialGC, UseParallelGC, or UseShenandoahGC are required.");
-      }
-    }
+  if (AOTMappedHeapLoader::can_map()) {
+    success = AOTMappedHeapLoader::map_heap_region(this);
+  } else if (AOTMappedHeapLoader::can_load()) {
+    success = AOTMappedHeapLoader::load_heap_region(this);
   }
 
   if (!success) {
-    if (CDSConfig::is_using_aot_linked_classes()) {
-      // It's too late to recover -- we have already committed to use the archived metaspace objects, but
-      // the archived heap objects cannot be loaded, so we don't have the archived FMG to guarantee that
-      // all AOT-linked classes are visible.
-      //
-      // We get here because the heap is too small. The app will fail anyway. So let's quit.
-      aot_log_error(aot)("%s has aot-linked classes but the archived "
-                     "heap objects cannot be loaded. Try increasing your heap size.",
-                     CDSConfig::type_of_archive_being_loaded());
-      AOTMetaspace::unrecoverable_loading_error();
-    }
-    CDSConfig::stop_using_full_module_graph("archive heap loading failed");
+    on_heap_region_loading_error();
   }
 }
 
@@ -1489,6 +1533,10 @@ bool FileMapInfo::can_use_heap_region() {
   if (!has_heap_region()) {
     return false;
   }
+  if (!object_streaming_mode() && !Universe::heap()->can_load_archived_objects() && !UseG1GC) {
+    // Incompatible object format
+    return false;
+  }
   if (JvmtiExport::should_post_class_file_load_hook() && JvmtiExport::has_early_class_hook_env()) {
     ShouldNotReachHere(); // CDS should have been disabled.
     // The archived objects are mapped at JVM start-up, but we don't know if
@@ -1503,7 +1551,7 @@ bool FileMapInfo::can_use_heap_region() {
   }
 
   // We pre-compute narrow Klass IDs with the runtime mapping start intended to be the base, and a shift of
-  // ArchiveBuilder::precomputed_narrow_klass_shift. We enforce this encoding at runtime (see
+  // HeapShared::precomputed_narrow_klass_shift. We enforce this encoding at runtime (see
   // CompressedKlassPointers::initialize_for_given_encoding()). Therefore, the following assertions must
   // hold:
   address archive_narrow_klass_base = (address)header()->mapped_base_address();
@@ -1512,21 +1560,28 @@ bool FileMapInfo::can_use_heap_region() {
 
   aot_log_info(aot)("CDS archive was created with max heap size = %zuM, and the following configuration:",
                 max_heap_size()/M);
+
   aot_log_info(aot)("    narrow_klass_base at mapping start address, narrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
                 archive_narrow_klass_pointer_bits, archive_narrow_klass_shift);
-  aot_log_info(aot)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
-                narrow_oop_mode(), p2i(narrow_oop_base()), narrow_oop_shift());
+  if (UseCompressedOops) {
+    aot_log_info(aot)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
+                      narrow_oop_mode(), p2i(narrow_oop_base()), narrow_oop_shift());
+  }
   aot_log_info(aot)("The current max heap size = %zuM, G1HeapRegion::GrainBytes = %zu",
                 MaxHeapSize/M, G1HeapRegion::GrainBytes);
   aot_log_info(aot)("    narrow_klass_base = " PTR_FORMAT ", arrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
                 p2i(CompressedKlassPointers::base()), CompressedKlassPointers::narrow_klass_pointer_bits(), CompressedKlassPointers::shift());
-  aot_log_info(aot)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
-                CompressedOops::mode(), p2i(CompressedOops::base()), CompressedOops::shift());
-  aot_log_info(aot)("    heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
-                UseCompressedOops ? p2i(CompressedOops::begin()) :
-                                    UseG1GC ? p2i((address)G1CollectedHeap::heap()->reserved().start()) : 0L,
-                UseCompressedOops ? p2i(CompressedOops::end()) :
-                                    UseG1GC ? p2i((address)G1CollectedHeap::heap()->reserved().end()) : 0L);
+  if (UseCompressedOops) {
+    aot_log_info(aot)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
+                      CompressedOops::mode(), p2i(CompressedOops::base()), CompressedOops::shift());
+  }
+  if (!object_streaming_mode()) {
+    aot_log_info(aot)("    heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
+                      UseCompressedOops ? p2i(CompressedOops::begin()) :
+                      UseG1GC ? p2i((address)G1CollectedHeap::heap()->reserved().start()) : 0L,
+                      UseCompressedOops ? p2i(CompressedOops::end()) :
+                      UseG1GC ? p2i((address)G1CollectedHeap::heap()->reserved().end()) : 0L);
+  }
 
   int err = 0;
   if ( archive_narrow_klass_base != CompressedKlassPointers::base() ||
@@ -1570,204 +1625,10 @@ bool FileMapInfo::can_use_heap_region() {
   return true;
 }
 
-// The actual address of this region during dump time.
-address FileMapInfo::heap_region_dumptime_address() {
-  FileMapRegion* r = region_at(AOTMetaspace::hp);
-  assert(CDSConfig::is_using_archive(), "runtime only");
-  assert(is_aligned(r->mapping_offset(), sizeof(HeapWord)), "must be");
-  if (UseCompressedOops) {
-    return /*dumptime*/ (address)((uintptr_t)narrow_oop_base() + r->mapping_offset());
-  } else {
-    return heap_region_requested_address();
-  }
-}
-
-// The address where this region can be mapped into the runtime heap without
-// patching any of the pointers that are embedded in this region.
-address FileMapInfo::heap_region_requested_address() {
-  assert(CDSConfig::is_using_archive(), "runtime only");
-  FileMapRegion* r = region_at(AOTMetaspace::hp);
-  assert(is_aligned(r->mapping_offset(), sizeof(HeapWord)), "must be");
-  assert(ArchiveHeapLoader::can_use(), "GC must support mapping or loading");
-  if (UseCompressedOops) {
-    // We can avoid relocation if each region's offset from the runtime CompressedOops::base()
-    // is the same as its offset from the CompressedOops::base() during dumptime.
-    // Note that CompressedOops::base() may be different between dumptime and runtime.
-    //
-    // Example:
-    // Dumptime base = 0x1000 and shift is 0. We have a region at address 0x2000. There's a
-    // narrowOop P stored in this region that points to an object at address 0x2200.
-    // P's encoded value is 0x1200.
-    //
-    // Runtime base = 0x4000 and shift is also 0. If we map this region at 0x5000, then
-    // the value P can remain 0x1200. The decoded address = (0x4000 + (0x1200 << 0)) = 0x5200,
-    // which is the runtime location of the referenced object.
-    return /*runtime*/ (address)((uintptr_t)CompressedOops::base() + r->mapping_offset());
-  } else {
-    // This was the hard-coded requested base address used at dump time. With uncompressed oops,
-    // the heap range is assigned by the OS so we will most likely have to relocate anyway, no matter
-    // what base address was picked at duump time.
-    return (address)ArchiveHeapWriter::NOCOOPS_REQUESTED_BASE;
-  }
-}
-
-bool FileMapInfo::map_heap_region() {
-  if (map_heap_region_impl()) {
-#ifdef ASSERT
-    // The "old" regions must be parsable -- we cannot have any unused space
-    // at the start of the lowest G1 region that contains archived objects.
-    assert(is_aligned(_mapped_heap_memregion.start(), G1HeapRegion::GrainBytes), "must be");
-
-    // Make sure we map at the very top of the heap - see comments in
-    // init_heap_region_relocation().
-    MemRegion heap_range = G1CollectedHeap::heap()->reserved();
-    assert(heap_range.contains(_mapped_heap_memregion), "must be");
-
-    address heap_end = (address)heap_range.end();
-    address mapped_heap_region_end = (address)_mapped_heap_memregion.end();
-    assert(heap_end >= mapped_heap_region_end, "must be");
-    assert(heap_end - mapped_heap_region_end < (intx)(G1HeapRegion::GrainBytes),
-           "must be at the top of the heap to avoid fragmentation");
-#endif
-
-    ArchiveHeapLoader::set_mapped();
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool FileMapInfo::map_heap_region_impl() {
-  assert(UseG1GC, "the following code assumes G1");
-
-  FileMapRegion* r = region_at(AOTMetaspace::hp);
-  size_t size = r->used();
-  if (size == 0) {
-    return false; // no archived java heap data
-  }
-
-  size_t word_size = size / HeapWordSize;
-  address requested_start = heap_region_requested_address();
-
-  aot_log_info(aot)("Preferred address to map heap data (to avoid relocation) is " INTPTR_FORMAT, p2i(requested_start));
-
-  // allocate from java heap
-  HeapWord* start = G1CollectedHeap::heap()->alloc_archive_region(word_size, (HeapWord*)requested_start);
-  if (start == nullptr) {
-    AOTMetaspace::report_loading_error("UseSharedSpaces: Unable to allocate java heap region for archive heap.");
-    return false;
-  }
-
-  _mapped_heap_memregion = MemRegion(start, word_size);
-
-  // Map the archived heap data. No need to call MemTracker::record_virtual_memory_tag()
-  // for mapped region as it is part of the reserved java heap, which is already recorded.
-  char* addr = (char*)_mapped_heap_memregion.start();
-  char* base;
-
-  if (AOTMetaspace::use_windows_memory_mapping() || UseLargePages) {
-    // With UseLargePages, memory mapping may fail on some OSes if the size is not
-    // large page aligned, so let's use read() instead. In this case, the memory region
-    // is already commited by G1 so we don't need to commit it again.
-    if (!read_region(AOTMetaspace::hp, addr,
-                     align_up(_mapped_heap_memregion.byte_size(), os::vm_page_size()),
-                     /* do_commit = */ !UseLargePages)) {
-      dealloc_heap_region();
-      aot_log_error(aot)("Failed to read archived heap region into " INTPTR_FORMAT, p2i(addr));
-      return false;
-    }
-    // Checks for VerifySharedSpaces is already done inside read_region()
-    base = addr;
-  } else {
-    base = map_memory(_fd, _full_path, r->file_offset(),
-                      addr, _mapped_heap_memregion.byte_size(), r->read_only(),
-                      r->allow_exec(), mtJavaHeap);
-    if (base == nullptr || base != addr) {
-      dealloc_heap_region();
-      AOTMetaspace::report_loading_error("UseSharedSpaces: Unable to map at required address in java heap. "
-                                            INTPTR_FORMAT ", size = %zu bytes",
-                                            p2i(addr), _mapped_heap_memregion.byte_size());
-      return false;
-    }
-
-    if (VerifySharedSpaces && !r->check_region_crc(base)) {
-      dealloc_heap_region();
-      AOTMetaspace::report_loading_error("UseSharedSpaces: mapped heap region is corrupt");
-      return false;
-    }
-  }
-
-  r->set_mapped_base(base);
-
-  // If the requested range is different from the range allocated by GC, then
-  // the pointers need to be patched.
-  address mapped_start = (address) _mapped_heap_memregion.start();
-  ptrdiff_t delta = mapped_start - requested_start;
-  if (UseCompressedOops &&
-      (narrow_oop_mode() != CompressedOops::mode() ||
-       narrow_oop_shift() != CompressedOops::shift())) {
-    _heap_pointers_need_patching = true;
-  }
-  if (delta != 0) {
-    _heap_pointers_need_patching = true;
-  }
-  ArchiveHeapLoader::init_mapped_heap_info(mapped_start, delta, narrow_oop_shift());
-
-  if (_heap_pointers_need_patching) {
-    char* bitmap_base = map_bitmap_region();
-    if (bitmap_base == nullptr) {
-      AOTMetaspace::report_loading_error("CDS heap cannot be used because bitmap region cannot be mapped");
-      dealloc_heap_region();
-      _heap_pointers_need_patching = false;
-      return false;
-    }
-  }
-  aot_log_info(aot)("Heap data mapped at " INTPTR_FORMAT ", size = %8zu bytes",
-                p2i(mapped_start), _mapped_heap_memregion.byte_size());
-  aot_log_info(aot)("CDS heap data relocation delta = %zd bytes", delta);
-  return true;
-}
-
-narrowOop FileMapInfo::encoded_heap_region_dumptime_address() {
-  assert(CDSConfig::is_using_archive(), "runtime only");
-  assert(UseCompressedOops, "sanity");
-  FileMapRegion* r = region_at(AOTMetaspace::hp);
-  return CompressedOops::narrow_oop_cast(r->mapping_offset() >> narrow_oop_shift());
-}
-
-void FileMapInfo::patch_heap_embedded_pointers() {
-  if (!ArchiveHeapLoader::is_mapped() || !_heap_pointers_need_patching) {
-    return;
-  }
-
-  char* bitmap_base = map_bitmap_region();
-  assert(bitmap_base != nullptr, "must have already been mapped");
-
-  FileMapRegion* r = region_at(AOTMetaspace::hp);
-  ArchiveHeapLoader::patch_embedded_pointers(
-      this, _mapped_heap_memregion,
-      (address)(region_at(AOTMetaspace::bm)->mapped_base()) + r->oopmap_offset(),
-      r->oopmap_size_in_bits());
-}
-
-void FileMapInfo::fixup_mapped_heap_region() {
-  if (ArchiveHeapLoader::is_mapped()) {
-    assert(!_mapped_heap_memregion.is_empty(), "sanity");
-
-    // Populate the archive regions' G1BlockOffsetTables. That ensures
-    // fast G1BlockOffsetTable::block_start operations for any given address
-    // within the archive regions when trying to find start of an object
-    // (e.g. during card table scanning).
-    G1CollectedHeap::heap()->populate_archive_regions_bot(_mapped_heap_memregion);
-  }
-}
-
-// dealloc the archive regions from java heap
-void FileMapInfo::dealloc_heap_region() {
-  G1CollectedHeap::heap()->dealloc_archive_regions(_mapped_heap_memregion);
-}
 #endif // INCLUDE_CDS_JAVA_HEAP
 
+// Unmap a memory region in the address space.
+
 void FileMapInfo::unmap_regions(int regions[], int num_regions) {
   for (int r = 0; r < num_regions; r++) {
     int idx = regions[r];
@@ -1775,8 +1636,6 @@ void FileMapInfo::unmap_regions(int regions[], int num_regions) {
   }
 }
 
-// Unmap a memory region in the address space.
-
 void FileMapInfo::unmap_region(int i) {
   FileMapRegion* r = region_at(i);
   char* mapped_base = r->mapped_base();
@@ -1808,7 +1667,6 @@ void FileMapInfo::assert_mark(bool check) {
 
 FileMapInfo* FileMapInfo::_current_info = nullptr;
 FileMapInfo* FileMapInfo::_dynamic_archive_info = nullptr;
-bool FileMapInfo::_heap_pointers_need_patching = false;
 bool FileMapInfo::_memory_mapping_failed = false;
 
 // Open the shared archive file, read and validate the header
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index a58271eefc7..b97b46a7c26 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -27,12 +27,14 @@
 
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveUtils.hpp"
+#include "cds/heapShared.hpp"
 #include "include/cds.h"
 #include "logging/logLevel.hpp"
 #include "memory/allocation.hpp"
 #include "oops/array.hpp"
 #include "oops/compressedOops.hpp"
 #include "utilities/align.hpp"
+#include "utilities/bitMap.hpp"
 
 // To understand the layout of the CDS archive file:
 //
@@ -43,7 +45,6 @@
 static const int JVM_IDENT_MAX = 256;
 
 class AOTClassLocationConfig;
-class ArchiveHeapInfo;
 class BitMapView;
 class CHeapBitMap;
 class ClassFileStream;
@@ -114,6 +115,7 @@ private:
   bool   _compact_headers;                        // value of UseCompactObjectHeaders
   uintx  _max_heap_size;                          // java max heap size during dumping
   CompressedOops::Mode _narrow_oop_mode;          // compressed oop encoding mode
+  bool    _object_streaming_mode;                 // dump was created for object streaming
   bool    _compressed_oops;                       // save the flag UseCompressedOops
   bool    _compressed_class_ptrs;                 // save the flag UseCompressedClassPointers
   int     _narrow_klass_pointer_bits;             // save number of bits in narrowKlass
@@ -139,12 +141,12 @@ private:
                                         // some expensive operations.
   bool   _has_aot_linked_classes;       // Was the CDS archive created with -XX:+AOTClassLinking
   bool   _has_full_module_graph;        // Does this CDS archive contain the full archived module graph?
-  HeapRootSegments _heap_root_segments; // Heap root segments info
-  size_t _heap_oopmap_start_pos;        // The first bit in the oopmap corresponds to this position in the heap.
-  size_t _heap_ptrmap_start_pos;        // The first bit in the ptrmap corresponds to this position in the heap.
   size_t _rw_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the rw region
   size_t _ro_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the ro region
 
+  ArchiveMappedHeapHeader _mapped_heap_header;
+  ArchiveStreamedHeapHeader _streamed_heap_header;
+
   // The following are parameters that affect MethodData layout.
   u1      _compiler_type;
   uint    _type_profile_level;
@@ -192,6 +194,7 @@ public:
   char* cloned_vtables()                   const { return from_mapped_offset<char*>(_cloned_vtables_offset); }
   char* early_serialized_data()            const { return from_mapped_offset<char*>(_early_serialized_data_offset); }
   char* serialized_data()                  const { return from_mapped_offset<char*>(_serialized_data_offset); }
+  bool object_streaming_mode()             const { return _object_streaming_mode; }
   const char* jvm_ident()                  const { return _jvm_ident; }
   char* requested_base_address()           const { return _requested_base_address; }
   char* mapped_base_address()              const { return _mapped_base_address; }
@@ -201,23 +204,25 @@ public:
   bool compressed_class_pointers()         const { return _compressed_class_ptrs; }
   int narrow_klass_pointer_bits()          const { return _narrow_klass_pointer_bits; }
   int narrow_klass_shift()                 const { return _narrow_klass_shift; }
-  HeapRootSegments heap_root_segments()    const { return _heap_root_segments; }
   bool has_full_module_graph()             const { return _has_full_module_graph; }
-  size_t heap_oopmap_start_pos()           const { return _heap_oopmap_start_pos; }
-  size_t heap_ptrmap_start_pos()           const { return _heap_ptrmap_start_pos; }
   size_t rw_ptrmap_start_pos()             const { return _rw_ptrmap_start_pos; }
   size_t ro_ptrmap_start_pos()             const { return _ro_ptrmap_start_pos; }
 
+  // Heap archiving
+  const ArchiveMappedHeapHeader*   mapped_heap()   const { return &_mapped_heap_header; }
+  const ArchiveStreamedHeapHeader* streamed_heap() const { return &_streamed_heap_header; }
+
+  void set_streamed_heap_header(ArchiveStreamedHeapHeader header) { _streamed_heap_header = header; }
+  void set_mapped_heap_header(ArchiveMappedHeapHeader header) { _mapped_heap_header = header; }
+
   void set_has_platform_or_app_classes(bool v)   { _has_platform_or_app_classes = v; }
   void set_cloned_vtables(char* p)               { set_as_offset(p, &_cloned_vtables_offset); }
   void set_early_serialized_data(char* p)        { set_as_offset(p, &_early_serialized_data_offset); }
   void set_serialized_data(char* p)              { set_as_offset(p, &_serialized_data_offset); }
   void set_mapped_base_address(char* p)          { _mapped_base_address = p; }
-  void set_heap_root_segments(HeapRootSegments segments) { _heap_root_segments = segments; }
-  void set_heap_oopmap_start_pos(size_t n)       { _heap_oopmap_start_pos = n; }
-  void set_heap_ptrmap_start_pos(size_t n)       { _heap_ptrmap_start_pos = n; }
   void set_rw_ptrmap_start_pos(size_t n)         { _rw_ptrmap_start_pos = n; }
   void set_ro_ptrmap_start_pos(size_t n)         { _ro_ptrmap_start_pos = n; }
+
   void copy_base_archive_name(const char* name);
 
   void set_class_location_config(AOTClassLocationConfig* table) {
@@ -273,7 +278,6 @@ private:
 
   static FileMapInfo* _current_info;
   static FileMapInfo* _dynamic_archive_info;
-  static bool _heap_pointers_need_patching;
   static bool _memory_mapping_failed;
 
 public:
@@ -303,11 +307,12 @@ public:
   address narrow_oop_base()    const { return header()->narrow_oop_base(); }
   int     narrow_oop_shift()   const { return header()->narrow_oop_shift(); }
   uintx   max_heap_size()      const { return header()->max_heap_size(); }
-  HeapRootSegments heap_root_segments() const { return header()->heap_root_segments(); }
   size_t  core_region_alignment() const { return header()->core_region_alignment(); }
-  size_t  heap_oopmap_start_pos() const { return header()->heap_oopmap_start_pos(); }
-  size_t  heap_ptrmap_start_pos() const { return header()->heap_ptrmap_start_pos(); }
 
+  const ArchiveMappedHeapHeader*   mapped_heap()   const { return header()->mapped_heap(); }
+  const ArchiveStreamedHeapHeader* streamed_heap() const { return header()->streamed_heap(); }
+
+  bool object_streaming_mode()                const { return header()->object_streaming_mode(); }
   CompressedOops::Mode narrow_oop_mode()      const { return header()->narrow_oop_mode(); }
 
   char* cloned_vtables()                      const { return header()->cloned_vtables(); }
@@ -324,6 +329,7 @@ public:
   bool is_mapped()                            const { return _is_mapped; }
   void set_is_mapped(bool v)                        { _is_mapped = v; }
   const char* full_path()                     const { return _full_path; }
+  char* map_heap_region(FileMapRegion* r, char* addr, size_t bytes);
 
   void set_requested_base(char* b)                  { header()->set_requested_base(b); }
   char* requested_base_address()           const    { return header()->requested_base_address(); }
@@ -363,23 +369,29 @@ public:
   void  write_region(int region, char* base, size_t size,
                      bool read_only, bool allow_exec);
   size_t remove_bitmap_zeros(CHeapBitMap* map);
-  char* write_bitmap_region(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
+  char* write_bitmap_region(CHeapBitMap* rw_ptrmap,
+                            CHeapBitMap* ro_ptrmap,
+                            ArchiveMappedHeapInfo* mapped_heap_info,
+                            ArchiveStreamedHeapInfo* streamed_heap_info,
                             size_t &size_in_bytes);
-  size_t write_heap_region(ArchiveHeapInfo* heap_info);
+  size_t write_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN_(0);
+  size_t write_streamed_heap_region(ArchiveStreamedHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN_(0);
   void  write_bytes(const void* buffer, size_t count);
   void  write_bytes_aligned(const void* buffer, size_t count);
   size_t  read_bytes(void* buffer, size_t count);
   static size_t readonly_total();
   MapArchiveResult map_regions(int regions[], int num_regions, char* mapped_base_address, ReservedSpace rs);
   void  unmap_regions(int regions[], int num_regions);
+
+  // Object loading support
+  void  stream_heap_region() NOT_CDS_JAVA_HEAP_RETURN;
   void  map_or_load_heap_region() NOT_CDS_JAVA_HEAP_RETURN;
-  void  fixup_mapped_heap_region() NOT_CDS_JAVA_HEAP_RETURN;
-  void  patch_heap_embedded_pointers() NOT_CDS_JAVA_HEAP_RETURN;
+
   bool  has_heap_region()  NOT_CDS_JAVA_HEAP_RETURN_(false);
-  MemRegion get_heap_region_requested_range() NOT_CDS_JAVA_HEAP_RETURN_(MemRegion());
   bool  read_region(int i, char* base, size_t size, bool do_commit);
   char* map_bitmap_region();
   bool  map_aot_code_region(ReservedSpace rs);
+  char* map_forwarding_region();
   void  unmap_region(int i);
   void  close();
   bool  is_open() { return _file_open; }
@@ -434,25 +446,17 @@ public:
   const char* vm_version() {
     return header()->jvm_ident();
   }
+  bool  can_use_heap_region();
 
  private:
   bool  open_for_read();
   void  seek_to_position(size_t pos);
-  bool  map_heap_region_impl() NOT_CDS_JAVA_HEAP_RETURN_(false);
-  void  dealloc_heap_region() NOT_CDS_JAVA_HEAP_RETURN;
-  bool  can_use_heap_region();
-  bool  load_heap_region() NOT_CDS_JAVA_HEAP_RETURN_(false);
-  bool  map_heap_region() NOT_CDS_JAVA_HEAP_RETURN_(false);
-  void  init_heap_region_relocation();
+
   MapArchiveResult map_region(int i, intx addr_delta, char* mapped_base_address, ReservedSpace rs);
   bool  relocate_pointers_in_core_regions(intx addr_delta);
-
-  static MemRegion _mapped_heap_memregion;
+  char* map_auxiliary_region(int region_index, bool read_only);
 
 public:
-  address heap_region_dumptime_address() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
-  address heap_region_requested_address() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
-  narrowOop encoded_heap_region_dumptime_address();
 
 private:
 
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 3f4d584b0f5..357b317ee49 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -26,17 +26,20 @@
 #include "cds/aotClassInitializer.hpp"
 #include "cds/aotClassLocation.hpp"
 #include "cds/aotLogging.hpp"
+#include "cds/aotMappedHeapLoader.hpp"
+#include "cds/aotMappedHeapWriter.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/aotOopChecker.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
+#include "cds/aotStreamedHeapLoader.hpp"
+#include "cds/aotStreamedHeapWriter.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.hpp"
+#include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsEnumKlass.hpp"
 #include "cds/cdsHeapVerifier.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -64,6 +67,7 @@
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
+#include "runtime/globals_extension.hpp"
 #include "runtime/init.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -91,7 +95,57 @@ struct ArchivableStaticFieldInfo {
   }
 };
 
-DumpedInternedStrings *HeapShared::_dumped_interned_strings = nullptr;
+// Anything that goes in the header must be thoroughly purged from uninitialized memory
+// as it will be written to disk. Therefore, the constructors memset the memory to 0.
+// This is not the prettiest thing, but we need to know every byte is initialized,
+// including potential padding between fields.
+
+ArchiveMappedHeapHeader::ArchiveMappedHeapHeader(size_t ptrmap_start_pos,
+                                                 size_t oopmap_start_pos,
+                                                 HeapRootSegments root_segments) {
+  memset((char*)this, 0, sizeof(*this));
+  _ptrmap_start_pos = ptrmap_start_pos;
+  _oopmap_start_pos = oopmap_start_pos;
+  _root_segments = root_segments;
+}
+
+ArchiveMappedHeapHeader::ArchiveMappedHeapHeader() {
+  memset((char*)this, 0, sizeof(*this));
+}
+
+ArchiveMappedHeapHeader ArchiveMappedHeapInfo::create_header() {
+  return ArchiveMappedHeapHeader{_ptrmap_start_pos,
+                                 _oopmap_start_pos,
+                                 _root_segments};
+}
+
+ArchiveStreamedHeapHeader::ArchiveStreamedHeapHeader(size_t forwarding_offset,
+                                                     size_t roots_offset,
+                                                     size_t num_roots,
+                                                     size_t root_highest_object_index_table_offset,
+                                                     size_t num_archived_objects) {
+  memset((char*)this, 0, sizeof(*this));
+  _forwarding_offset = forwarding_offset;
+  _roots_offset = roots_offset;
+  _num_roots = num_roots;
+  _root_highest_object_index_table_offset = root_highest_object_index_table_offset;
+  _num_archived_objects = num_archived_objects;
+}
+
+ArchiveStreamedHeapHeader::ArchiveStreamedHeapHeader() {
+  memset((char*)this, 0, sizeof(*this));
+}
+
+ArchiveStreamedHeapHeader ArchiveStreamedHeapInfo::create_header() {
+  return ArchiveStreamedHeapHeader{_forwarding_offset,
+                                   _roots_offset,
+                                   _num_roots,
+                                   _root_highest_object_index_table_offset,
+                                   _num_archived_objects};
+}
+
+HeapArchiveMode HeapShared::_heap_load_mode = HeapArchiveMode::_uninitialized;
+HeapArchiveMode HeapShared::_heap_write_mode = HeapArchiveMode::_uninitialized;
 
 size_t HeapShared::_alloc_count[HeapShared::ALLOC_STAT_SLOTS];
 size_t HeapShared::_alloc_size[HeapShared::ALLOC_STAT_SLOTS];
@@ -142,8 +196,6 @@ static ArchivableStaticFieldInfo fmg_archive_subgraph_entry_fields[] = {
 KlassSubGraphInfo* HeapShared::_dump_time_special_subgraph;
 ArchivedKlassSubGraphInfoRecord* HeapShared::_run_time_special_subgraph;
 GrowableArrayCHeap<oop, mtClassShared>* HeapShared::_pending_roots = nullptr;
-GrowableArrayCHeap<OopHandle, mtClassShared>* HeapShared::_root_segments = nullptr;
-int HeapShared::_root_segment_max_size_elems;
 OopHandle HeapShared::_scratch_basic_type_mirrors[T_VOID+1];
 MetaspaceObjToOopHandleTable* HeapShared::_scratch_objects_table = nullptr;
 
@@ -239,10 +291,147 @@ void HeapShared::reset_archived_object_states(TRAPS) {
 
 HeapShared::ArchivedObjectCache* HeapShared::_archived_object_cache = nullptr;
 
+bool HeapShared::is_archived_heap_in_use() {
+  if (HeapShared::is_loading()) {
+    if (HeapShared::is_loading_streaming_mode()) {
+      return AOTStreamedHeapLoader::is_in_use();
+    } else {
+      return AOTMappedHeapLoader::is_in_use();
+    }
+  }
+
+  return false;
+}
+
+bool HeapShared::can_use_archived_heap() {
+  FileMapInfo* static_mapinfo = FileMapInfo::current_info();
+  if (static_mapinfo == nullptr) {
+    return false;
+  }
+  if (!static_mapinfo->has_heap_region()) {
+    return false;
+  }
+  if (!static_mapinfo->object_streaming_mode() &&
+      !Universe::heap()->can_load_archived_objects() &&
+      !UseG1GC) {
+    // Incompatible object format
+    return false;
+  }
+
+  return true;
+}
+
+bool HeapShared::is_too_large_to_archive(size_t size) {
+  if (HeapShared::is_writing_streaming_mode()) {
+    return false;
+  } else {
+    return AOTMappedHeapWriter::is_too_large_to_archive(size);
+  }
+}
+
+bool HeapShared::is_too_large_to_archive(oop obj) {
+  if (HeapShared::is_writing_streaming_mode()) {
+    return false;
+  } else {
+    return AOTMappedHeapWriter::is_too_large_to_archive(obj);
+  }
+}
+
+bool HeapShared::is_string_too_large_to_archive(oop string) {
+  typeArrayOop value = java_lang_String::value_no_keepalive(string);
+  return is_too_large_to_archive(value);
+}
+
+void HeapShared::initialize_loading_mode(HeapArchiveMode mode) {
+  assert(_heap_load_mode == HeapArchiveMode::_uninitialized, "already set?");
+  assert(mode != HeapArchiveMode::_uninitialized, "sanity");
+  _heap_load_mode = mode;
+};
+
+void HeapShared::initialize_writing_mode() {
+  assert(!FLAG_IS_ERGO(AOTStreamableObjects), "Should not have been ergonomically set yet");
+
+  if (!CDSConfig::is_dumping_archive()) {
+    // We use FLAG_IS_CMDLINE below because we are specifically looking to warn
+    // a user that explicitly sets the flag on the command line for a JVM that is
+    // not dumping an archive.
+    if (FLAG_IS_CMDLINE(AOTStreamableObjects)) {
+      log_warning(cds)("-XX:%cAOTStreamableObjects was specified, "
+                       "AOTStreamableObjects is only used for writing "
+                       "the AOT cache.",
+                       AOTStreamableObjects ? '+' : '-');
+    }
+  }
+
+  // The below checks use !FLAG_IS_DEFAULT instead of FLAG_IS_CMDLINE
+  // because the one step AOT cache creation transfers the AOTStreamableObjects
+  // flag value from the training JVM to the assembly JVM using an environment
+  // variable that sets the flag as ERGO in the assembly JVM.
+  if (FLAG_IS_DEFAULT(AOTStreamableObjects)) {
+    // By default, the value of AOTStreamableObjects should match !UseCompressedOops.
+    FLAG_SET_DEFAULT(AOTStreamableObjects, !UseCompressedOops);
+  } else if (!AOTStreamableObjects && UseZGC) {
+    // Never write mapped heap with ZGC
+    if (CDSConfig::is_dumping_archive()) {
+      log_warning(cds)("Heap archiving without streaming not supported for -XX:+UseZGC");
+    }
+    FLAG_SET_ERGO(AOTStreamableObjects, true);
+  }
+
+  if (CDSConfig::is_dumping_archive()) {
+    // Select default mode
+    assert(_heap_write_mode == HeapArchiveMode::_uninitialized, "already initialized?");
+    _heap_write_mode = AOTStreamableObjects ? HeapArchiveMode::_streaming : HeapArchiveMode::_mapping;
+  }
+}
+
+void HeapShared::initialize_streaming() {
+  assert(is_loading_streaming_mode(), "shouldn't call this");
+  if (can_use_archived_heap()) {
+    AOTStreamedHeapLoader::initialize();
+  }
+}
+
+void HeapShared::enable_gc() {
+  if (AOTStreamedHeapLoader::is_in_use()) {
+    AOTStreamedHeapLoader::enable_gc();
+  }
+}
+
+void HeapShared::materialize_thread_object() {
+  if (AOTStreamedHeapLoader::is_in_use()) {
+    AOTStreamedHeapLoader::materialize_thread_object();
+  }
+}
+
+void HeapShared::add_to_dumped_interned_strings(oop string) {
+  assert(HeapShared::is_writing_mapping_mode(), "Only used by this mode");
+  AOTMappedHeapWriter::add_to_dumped_interned_strings(string);
+}
+
+void HeapShared::finalize_initialization(FileMapInfo* static_mapinfo) {
+  if (HeapShared::is_loading()) {
+    if (HeapShared::is_loading_streaming_mode()) {
+      // Heap initialization can be done only after vtables are initialized by ReadClosure.
+      AOTStreamedHeapLoader::finish_initialization(static_mapinfo);
+    } else {
+      // Finish up archived heap initialization. These must be
+      // done after ReadClosure.
+      AOTMappedHeapLoader::finish_initialization(static_mapinfo);
+    }
+  }
+}
+
+HeapShared::CachedOopInfo* HeapShared::get_cached_oop_info(oop obj) {
+  OopHandle oh(Universe::vm_global(), obj);
+  CachedOopInfo* result = _archived_object_cache->get(oh);
+  oh.release(Universe::vm_global());
+  return result;
+}
+
 bool HeapShared::has_been_archived(oop obj) {
   assert(CDSConfig::is_dumping_heap(), "dump-time only");
-  OopHandle oh(&obj);
-  return archived_object_cache()->get(oh) != nullptr;
+  return get_cached_oop_info(obj) != nullptr;
 }
 
 int HeapShared::append_root(oop obj) {
@@ -256,59 +445,45 @@ int HeapShared::append_root(oop obj) {
   return _pending_roots->append(obj);
 }
 
-objArrayOop HeapShared::root_segment(int segment_idx) {
-  if (CDSConfig::is_dumping_heap()) {
-    assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
-  } else {
-    assert(CDSConfig::is_using_archive(), "must be");
-  }
-
-  objArrayOop segment = (objArrayOop)_root_segments->at(segment_idx).resolve();
-  assert(segment != nullptr, "should have been initialized");
-  return segment;
-}
-
-void HeapShared::get_segment_indexes(int idx, int& seg_idx, int& int_idx) {
-  assert(_root_segment_max_size_elems > 0, "sanity");
-
-  // Try to avoid divisions for the common case.
-  if (idx < _root_segment_max_size_elems) {
-    seg_idx = 0;
-    int_idx = idx;
-  } else {
-    seg_idx = idx / _root_segment_max_size_elems;
-    int_idx = idx % _root_segment_max_size_elems;
-  }
-
-  assert(idx == seg_idx * _root_segment_max_size_elems + int_idx,
-         "sanity: %d index maps to %d segment and %d internal", idx, seg_idx, int_idx);
-}
-
-// Returns an objArray that contains all the roots of the archived objects
 oop HeapShared::get_root(int index, bool clear) {
   assert(index >= 0, "sanity");
   assert(!CDSConfig::is_dumping_heap() && CDSConfig::is_using_archive(), "runtime only");
-  assert(!_root_segments->is_empty(), "must have loaded shared heap");
-  int seg_idx, int_idx;
-  get_segment_indexes(index, seg_idx, int_idx);
-  oop result = root_segment(seg_idx)->obj_at(int_idx);
+  assert(is_archived_heap_in_use(), "getting roots into heap that is not used");
+
+  oop result;
+  if (HeapShared::is_loading_streaming_mode()) {
+    result = AOTStreamedHeapLoader::get_root(index);
+  } else {
+    assert(HeapShared::is_loading_mapping_mode(), "must be");
+    result = AOTMappedHeapLoader::get_root(index);
+  }
+
   if (clear) {
     clear_root(index);
   }
+
   return result;
 }
 
+void HeapShared::finish_materialize_objects() {
+  if (AOTStreamedHeapLoader::is_in_use()) {
+    AOTStreamedHeapLoader::finish_materialize_objects();
+  }
+}
+
 void HeapShared::clear_root(int index) {
   assert(index >= 0, "sanity");
   assert(CDSConfig::is_using_archive(), "must be");
-  if (ArchiveHeapLoader::is_in_use()) {
-    int seg_idx, int_idx;
-    get_segment_indexes(index, seg_idx, int_idx);
+  if (is_archived_heap_in_use()) {
     if (log_is_enabled(Debug, aot, heap)) {
-      oop old = root_segment(seg_idx)->obj_at(int_idx);
-      log_debug(aot, heap)("Clearing root %d: was " PTR_FORMAT, index, p2i(old));
+      log_debug(aot, heap)("Clearing root %d: was %zu", index, p2i(get_root(index, false /* clear */)));
+    }
+    if (HeapShared::is_loading_streaming_mode()) {
+      AOTStreamedHeapLoader::clear_root(index);
+    } else {
+      assert(HeapShared::is_loading_mapping_mode(), "must be");
+      AOTMappedHeapLoader::clear_root(index);
     }
-    root_segment(seg_idx)->obj_at_put(int_idx, nullptr);
   }
 }
 
@@ -320,81 +495,84 @@ bool HeapShared::archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgra
     return true;
   }
 
-  if (ArchiveHeapWriter::is_too_large_to_archive(obj->size())) {
+  if (is_too_large_to_archive(obj)) {
     log_debug(aot, heap)("Cannot archive, object (" PTR_FORMAT ") is too large: %zu",
                          p2i(obj), obj->size());
     debug_trace();
     return false;
-  } else {
-    AOTOopChecker::check(obj); // Make sure contents of this oop are safe.
-
-    count_allocation(obj->size());
-    ArchiveHeapWriter::add_source_obj(obj);
-    CachedOopInfo info = make_cached_oop_info(obj, referrer);
-
-    OopHandle oh(Universe::vm_global(), obj);
-    archived_object_cache()->put_when_absent(oh, info);
-    archived_object_cache()->maybe_grow();
-    mark_native_pointers(obj);
-
-    Klass* k = obj->klass();
-    if (k->is_instance_klass()) {
-      // Whenever we see a non-array Java object of type X, we mark X to be aot-initialized.
-      // This ensures that during the production run, whenever Java code sees a cached object
-      // of type X, we know that X is already initialized. (see TODO comment below ...)
-
-      if (InstanceKlass::cast(k)->is_enum_subclass()
-          // We can't rerun <clinit> of enum classes (see cdsEnumKlass.cpp) so
-          // we must store them as AOT-initialized.
-          || (subgraph_info == _dump_time_special_subgraph))
-          // TODO: we do this only for the special subgraph for now. Extending this to
-          // other subgraphs would require more refactoring of the core library (such as
-          // move some initialization logic into runtimeSetup()).
-          //
-          // For the other subgraphs, we have a weaker mechanism to ensure that
-          // all classes in a subgraph are initialized before the subgraph is programmatically
-          // returned from jdk.internal.misc.CDS::initializeFromArchive().
-          // See HeapShared::initialize_from_archived_subgraph().
-      {
-        AOTArtifactFinder::add_aot_inited_class(InstanceKlass::cast(k));
-      }
-
-      if (java_lang_Class::is_instance(obj)) {
-        Klass* mirror_k = java_lang_Class::as_Klass(obj);
-        if (mirror_k != nullptr) {
-          AOTArtifactFinder::add_cached_class(mirror_k);
-        }
-      } else if (java_lang_invoke_ResolvedMethodName::is_instance(obj)) {
-        Method* m = java_lang_invoke_ResolvedMethodName::vmtarget(obj);
-        if (m != nullptr) {
-          if (RegeneratedClasses::has_been_regenerated(m)) {
-            m = RegeneratedClasses::get_regenerated_object(m);
-          }
-          InstanceKlass* method_holder = m->method_holder();
-          AOTArtifactFinder::add_cached_class(method_holder);
-        }
-      }
-    }
-
-    if (log_is_enabled(Debug, aot, heap)) {
-      ResourceMark rm;
-      LogTarget(Debug, aot, heap) log;
-      LogStream out(log);
-      out.print("Archived heap object " PTR_FORMAT " : %s ",
-                p2i(obj), obj->klass()->external_name());
-      if (java_lang_Class::is_instance(obj)) {
-        Klass* k = java_lang_Class::as_Klass(obj);
-        if (k != nullptr) {
-          out.print("%s", k->external_name());
-        } else {
-          out.print("primitive");
-        }
-      }
-      out.cr();
-    }
-
-    return true;
   }
+
+  AOTOopChecker::check(obj); // Make sure contents of this oop are safe.
+  count_allocation(obj->size());
+
+  if (HeapShared::is_writing_streaming_mode()) {
+    AOTStreamedHeapWriter::add_source_obj(obj);
+  } else {
+    AOTMappedHeapWriter::add_source_obj(obj);
+  }
+
+  OopHandle oh(Universe::vm_global(), obj);
+  CachedOopInfo info = make_cached_oop_info(obj, referrer);
+  archived_object_cache()->put_when_absent(oh, info);
+  archived_object_cache()->maybe_grow();
+
+  Klass* k = obj->klass();
+  if (k->is_instance_klass()) {
+    // Whenever we see a non-array Java object of type X, we mark X to be aot-initialized.
+    // This ensures that during the production run, whenever Java code sees a cached object
+    // of type X, we know that X is already initialized. (see TODO comment below ...)
+
+    if (InstanceKlass::cast(k)->is_enum_subclass()
+        // We can't rerun <clinit> of enum classes (see cdsEnumKlass.cpp) so
+        // we must store them as AOT-initialized.
+        || (subgraph_info == _dump_time_special_subgraph))
+        // TODO: we do this only for the special subgraph for now. Extending this to
+        // other subgraphs would require more refactoring of the core library (such as
+        // move some initialization logic into runtimeSetup()).
+        //
+        // For the other subgraphs, we have a weaker mechanism to ensure that
+        // all classes in a subgraph are initialized before the subgraph is programmatically
+        // returned from jdk.internal.misc.CDS::initializeFromArchive().
+        // See HeapShared::initialize_from_archived_subgraph().
+    {
+      AOTArtifactFinder::add_aot_inited_class(InstanceKlass::cast(k));
+    }
+
+    if (java_lang_Class::is_instance(obj)) {
+      Klass* mirror_k = java_lang_Class::as_Klass(obj);
+      if (mirror_k != nullptr) {
+        AOTArtifactFinder::add_cached_class(mirror_k);
+      }
+    } else if (java_lang_invoke_ResolvedMethodName::is_instance(obj)) {
+      Method* m = java_lang_invoke_ResolvedMethodName::vmtarget(obj);
+      if (m != nullptr) {
+        if (RegeneratedClasses::has_been_regenerated(m)) {
+          m = RegeneratedClasses::get_regenerated_object(m);
+        }
+        InstanceKlass* method_holder = m->method_holder();
+        AOTArtifactFinder::add_cached_class(method_holder);
+      }
+    }
+  }
+
+  if (log_is_enabled(Debug, aot, heap)) {
+    ResourceMark rm;
+    LogTarget(Debug, aot, heap) log;
+    LogStream out(log);
+    out.print("Archived heap object " PTR_FORMAT " : %s ",
+              p2i(obj), obj->klass()->external_name());
+    if (java_lang_Class::is_instance(obj)) {
+      Klass* k = java_lang_Class::as_Klass(obj);
+      if (k != nullptr) {
+        out.print("%s", k->external_name());
+      } else {
+        out.print("primitive");
+      }
+    }
+    out.cr();
+  }
+
+  return true;
 }
 
 class MetaspaceObjToOopHandleTable: public HashTable<MetaspaceObj*, OopHandle,
@@ -437,9 +615,9 @@ objArrayOop HeapShared::scratch_resolved_references(ConstantPool* src) {
   return (objArrayOop)_scratch_objects_table->get_oop(src);
 }
 
-void HeapShared::init_dumping() {
-  _scratch_objects_table = new (mtClass)MetaspaceObjToOopHandleTable();
-  _pending_roots = new GrowableArrayCHeap<oop, mtClassShared>(500);
+ void HeapShared::init_dumping() {
+   _scratch_objects_table = new (mtClass)MetaspaceObjToOopHandleTable();
+   _pending_roots = new GrowableArrayCHeap<oop, mtClassShared>(500);
 }
 
 void HeapShared::init_scratch_objects_for_basic_type_mirrors(TRAPS) {
@@ -641,7 +819,7 @@ void HeapShared::copy_java_mirror(oop orig_mirror, oop scratch_m) {
 static objArrayOop get_archived_resolved_references(InstanceKlass* src_ik) {
   if (SystemDictionaryShared::is_builtin_loader(src_ik->class_loader_data())) {
     objArrayOop rr = src_ik->constants()->resolved_references_or_null();
-    if (rr != nullptr && !ArchiveHeapWriter::is_too_large_to_archive(rr)) {
+    if (rr != nullptr && !HeapShared::is_too_large_to_archive(rr)) {
       return HeapShared::scratch_resolved_references(src_ik->constants());
     }
   }
@@ -649,6 +827,7 @@ static objArrayOop get_archived_resolved_references(InstanceKlass* src_ik) {
 }
 
 void HeapShared::archive_strings() {
+  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
   oop shared_strings_array = StringTable::init_shared_strings_array();
   bool success = archive_reachable_objects_from(1, _dump_time_special_subgraph, shared_strings_array);
   assert(success, "shared strings array must not point to arrays or strings that are too large to archive");
@@ -661,15 +840,6 @@ int HeapShared::archive_exception_instance(oop exception) {
   return append_root(exception);
 }
 
-void HeapShared::mark_native_pointers(oop orig_obj) {
-  if (java_lang_Class::is_instance(orig_obj)) {
-    ArchiveHeapWriter::mark_native_pointer(orig_obj, java_lang_Class::klass_offset());
-    ArchiveHeapWriter::mark_native_pointer(orig_obj, java_lang_Class::array_klass_offset());
-  } else if (java_lang_invoke_ResolvedMethodName::is_instance(orig_obj)) {
-    ArchiveHeapWriter::mark_native_pointer(orig_obj, java_lang_invoke_ResolvedMethodName::vmtarget_offset());
-  }
-}
-
 void HeapShared::get_pointer_info(oop src_obj, bool& has_oop_pointers, bool& has_native_pointers) {
   OopHandle oh(&src_obj);
   CachedOopInfo* info = archived_object_cache()->get(oh);
@@ -698,7 +868,7 @@ void HeapShared::start_scanning_for_oops() {
     // Cache for recording where the archived objects are copied to
     create_archived_object_cache();
 
-    if (UseCompressedOops || UseG1GC) {
+    if (HeapShared::is_writing_mapping_mode() && (UseG1GC || UseCompressedOops)) {
       aot_log_info(aot)("Heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
                     UseCompressedOops ? p2i(CompressedOops::begin()) :
                                         p2i((address)G1CollectedHeap::heap()->reserved().start()),
@@ -714,19 +884,26 @@ void HeapShared::start_scanning_for_oops() {
 }
 
 void HeapShared::end_scanning_for_oops() {
-  archive_strings();
+  if (is_writing_mapping_mode()) {
+    archive_strings();
+  }
   delete_seen_objects_table();
 }
 
-void HeapShared::write_heap(ArchiveHeapInfo *heap_info) {
+void HeapShared::write_heap(ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info) {
   {
     NoSafepointVerifier nsv;
     CDSHeapVerifier::verify();
     check_special_subgraph_classes();
   }
 
-  StringTable::write_shared_table();
-  ArchiveHeapWriter::write(_pending_roots, heap_info);
+  if (HeapShared::is_writing_mapping_mode()) {
+    StringTable::write_shared_table();
+    AOTMappedHeapWriter::write(_pending_roots, mapped_heap_info);
+  } else {
+    assert(HeapShared::is_writing_streaming_mode(), "are there more modes?");
+    AOTStreamedHeapWriter::write(_pending_roots, streamed_heap_info);
+  }
 
   ArchiveBuilder::OtherROAllocMark mark;
   write_subgraph_info_table();
@@ -1067,19 +1244,6 @@ void HeapShared::write_subgraph_info_table() {
   }
 }
 
-void HeapShared::add_root_segment(objArrayOop segment_oop) {
-  assert(segment_oop != nullptr, "must be");
-  assert(ArchiveHeapLoader::is_in_use(), "must be");
-  if (_root_segments == nullptr) {
-    _root_segments = new GrowableArrayCHeap<OopHandle, mtClassShared>(10);
-  }
-  _root_segments->push(OopHandle(Universe::vm_global(), segment_oop));
-}
-
-void HeapShared::init_root_segment_sizes(int max_size_elems) {
-  _root_segment_max_size_elems = max_size_elems;
-}
-
 void HeapShared::serialize_tables(SerializeClosure* soc) {
 
 #ifndef PRODUCT
@@ -1100,10 +1264,10 @@ static void verify_the_heap(Klass* k, const char* which) {
     log_info(aot, heap)("Verify heap %s initializing static field(s) in %s",
                         which, k->external_name());
 
-    VM_Verify verify_op;
-    VMThread::execute(&verify_op);
-
-    if (VerifyArchivedFields > 1 && is_init_completed()) {
+    if (VerifyArchivedFields == 1) {
+      VM_Verify verify_op;
+      VMThread::execute(&verify_op);
+    } else if (VerifyArchivedFields == 2 && is_init_completed()) {
       // At this time, the oop->klass() of some archived objects in the heap may not
       // have been loaded into the system dictionary yet. Nevertheless, oop->klass() should
       // have enough information (object size, oop maps, etc) so that a GC can be safely
@@ -1129,7 +1293,7 @@ static void verify_the_heap(Klass* k, const char* which) {
 // this case, we will not load the ArchivedKlassSubGraphInfoRecord and will clear its roots.
 void HeapShared::resolve_classes(JavaThread* current) {
   assert(CDSConfig::is_using_archive(), "runtime only!");
-  if (!ArchiveHeapLoader::is_in_use()) {
+  if (!is_archived_heap_in_use()) {
     return; // nothing to do
   }
   resolve_classes_for_subgraphs(current, archive_subgraph_entry_fields);
@@ -1188,7 +1352,7 @@ void HeapShared::initialize_java_lang_invoke(TRAPS) {
 // should be initialized before any Java code can access the Fruit class. Note that
 // HashSet itself doesn't necessary need to be an aot-initialized class.
 void HeapShared::init_classes_for_special_subgraph(Handle class_loader, TRAPS) {
-  if (!ArchiveHeapLoader::is_in_use()) {
+  if (!is_archived_heap_in_use()) {
     return;
   }
 
@@ -1220,7 +1384,7 @@ void HeapShared::init_classes_for_special_subgraph(Handle class_loader, TRAPS) {
 
 void HeapShared::initialize_from_archived_subgraph(JavaThread* current, Klass* k) {
   JavaThread* THREAD = current;
-  if (!ArchiveHeapLoader::is_in_use()) {
+  if (!is_archived_heap_in_use()) {
     return; // nothing to do
   }
 
@@ -1356,9 +1520,6 @@ void HeapShared::resolve_or_init(Klass* k, bool do_init, TRAPS) {
 void HeapShared::init_archived_fields_for(Klass* k, const ArchivedKlassSubGraphInfoRecord* record) {
   verify_the_heap(k, "before");
 
-  // Load the subgraph entry fields from the record and store them back to
-  // the corresponding fields within the mirror.
-  oop m = k->java_mirror();
   Array<int>* entry_field_records = record->entry_field_records();
   if (entry_field_records != nullptr) {
     int efr_len = entry_field_records->length();
@@ -1366,7 +1527,10 @@ void HeapShared::init_archived_fields_for(Klass* k, const ArchivedKlassSubGraphI
     for (int i = 0; i < efr_len; i += 2) {
       int field_offset = entry_field_records->at(i);
       int root_index = entry_field_records->at(i+1);
+      // Load the subgraph entry fields from the record and store them back to
+      // the corresponding fields within the mirror.
       oop v = get_root(root_index, /*clear=*/true);
+      oop m = k->java_mirror();
       if (k->has_aot_initialized_mirror()) {
         assert(v == m->obj_field(field_offset), "must be aot-initialized");
       } else {
@@ -1445,7 +1609,7 @@ class HeapShared::OopFieldPusher: public BasicOopIterateClosure {
   template <class T> void do_oop_work(T *p) {
     int field_offset = pointer_delta_as_int((char*)p, cast_from_oop<char*>(_referencing_obj));
     oop obj = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(_referencing_obj, field_offset);
-    if (!CompressedOops::is_null(obj)) {
+    if (obj != nullptr) {
       if (_is_java_lang_ref && AOTReferenceObjSupport::skip_field(field_offset)) {
         // Do not follow these fields. They will be cleared to null.
         return;
@@ -1494,7 +1658,7 @@ HeapShared::CachedOopInfo HeapShared::make_cached_oop_info(oop obj, oop referrer
 }
 
 void HeapShared::init_box_classes(TRAPS) {
-  if (ArchiveHeapLoader::is_in_use()) {
+  if (is_archived_heap_in_use()) {
     vmClasses::Boolean_klass()->initialize(CHECK);
     vmClasses::Character_klass()->initialize(CHECK);
     vmClasses::Float_klass()->initialize(CHECK);
@@ -1739,8 +1903,8 @@ class VerifySharedOopClosure: public BasicOopIterateClosure {
 
  protected:
   template <class T> void do_oop_work(T *p) {
-    oop obj = RawAccess<>::oop_load(p);
-    if (!CompressedOops::is_null(obj)) {
+    oop obj = HeapAccess<>::oop_load(p);
+    if (obj != nullptr) {
       HeapShared::verify_reachable_objects_from(obj);
     }
   }
@@ -2041,7 +2205,7 @@ bool HeapShared::is_a_test_class_in_unnamed_module(Klass* ik) {
 
 void HeapShared::initialize_test_class_from_archive(JavaThread* current) {
   Klass* k = _test_class;
-  if (k != nullptr && ArchiveHeapLoader::is_in_use()) {
+  if (k != nullptr && is_archived_heap_in_use()) {
     JavaThread* THREAD = current;
     ExceptionMark em(THREAD);
     const ArchivedKlassSubGraphInfoRecord* record =
@@ -2062,11 +2226,18 @@ void HeapShared::initialize_test_class_from_archive(JavaThread* current) {
 void HeapShared::init_for_dumping(TRAPS) {
   if (CDSConfig::is_dumping_heap()) {
     setup_test_class(ArchiveHeapTestClass);
-    _dumped_interned_strings = new (mtClass)DumpedInternedStrings(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE);
     init_subgraph_entry_fields(CHECK);
   }
 }
 
+void HeapShared::init_heap_writer() {
+  if (HeapShared::is_writing_streaming_mode()) {
+    AOTStreamedHeapWriter::init();
+  } else {
+    AOTMappedHeapWriter::init();
+  }
+}
+
 void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
                                           bool is_full_module_graph) {
   _num_total_subgraph_recordings = 0;
@@ -2117,23 +2288,12 @@ void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
 #endif
 }
 
-// Keep track of the contents of the archived interned string table. This table
-// is used only by CDSHeapVerifier.
-void HeapShared::add_to_dumped_interned_strings(oop string) {
-  assert_at_safepoint(); // DumpedInternedStrings uses raw oops
-  assert(!ArchiveHeapWriter::is_string_too_large_to_archive(string), "must be");
-  bool created;
-  _dumped_interned_strings->put_if_absent(string, true, &created);
-  if (created) {
-    // Prevent string deduplication from changing the value field to
-    // something not in the archive.
-    java_lang_String::set_deduplication_forbidden(string);
-    _dumped_interned_strings->maybe_grow();
-  }
-}
-
 bool HeapShared::is_dumped_interned_string(oop o) {
-  return _dumped_interned_strings->get(o) != nullptr;
+  if (is_writing_mapping_mode()) {
+    return AOTMappedHeapWriter::is_dumped_interned_string(o);
+  } else {
+    return AOTStreamedHeapWriter::is_dumped_interned_string(o);
+  }
 }
 
 // These tables should be used only within the CDS safepoint, so
@@ -2142,10 +2302,12 @@ bool HeapShared::is_dumped_interned_string(oop o) {
 void HeapShared::delete_tables_with_raw_oops() {
   assert(_seen_objects_table == nullptr, "should have been deleted");
 
-  delete _dumped_interned_strings;
-  _dumped_interned_strings = nullptr;
-
-  ArchiveHeapWriter::delete_tables_with_raw_oops();
+  if (is_writing_mapping_mode()) {
+    AOTMappedHeapWriter::delete_tables_with_raw_oops();
+  } else {
+    assert(is_writing_streaming_mode(), "what other mode?");
+    AOTStreamedHeapWriter::delete_tables_with_raw_oops();
+  }
 }
 
 void HeapShared::debug_trace() {
@@ -2242,6 +2404,35 @@ void HeapShared::print_stats() {
                       avg_size(_total_obj_size, _total_obj_count));
 }
 
+bool HeapShared::is_metadata_field(oop src_obj, int offset) {
+  bool result = false;
+  do_metadata_offsets(src_obj, [&](int metadata_offset) {
+    if (metadata_offset == offset) {
+      result = true;
+    }
+  });
+  return result;
+}
+
+void HeapShared::remap_dumped_metadata(oop src_obj, address archived_object) {
+  do_metadata_offsets(src_obj, [&](int offset) {
+    Metadata** buffered_field_addr = (Metadata**)(archived_object + offset);
+    Metadata* native_ptr = *buffered_field_addr;
+
+    if (native_ptr == nullptr) {
+      return;
+    }
+
+    if (RegeneratedClasses::has_been_regenerated(native_ptr)) {
+      native_ptr = RegeneratedClasses::get_regenerated_object(native_ptr);
+    }
+
+    address buffered_native_ptr = ArchiveBuilder::current()->get_buffered_addr((address)native_ptr);
+    address requested_native_ptr = ArchiveBuilder::current()->to_requested(buffered_native_ptr);
+    *buffered_field_addr = (Metadata*)requested_native_ptr;
+  });
+}
+
 bool HeapShared::is_archived_boot_layer_available(JavaThread* current) {
   TempNewSymbol klass_name = SymbolTable::new_symbol(ARCHIVED_BOOT_LAYER_CLASS);
   InstanceKlass* k = SystemDictionary::find_instance_klass(current, klass_name, Handle());
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index cc41fb1dec7..2c782f7231b 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -47,7 +47,6 @@ class MetaspaceObjToOopHandleTable;
 class ResourceBitMap;
 
 struct ArchivableStaticFieldInfo;
-class ArchiveHeapInfo;
 
 #define ARCHIVED_BOOT_LAYER_CLASS "jdk/internal/module/ArchivedBootLayer"
 #define ARCHIVED_BOOT_LAYER_FIELD "archivedBootLayer"
@@ -137,12 +136,152 @@ class ArchivedKlassSubGraphInfoRecord {
 };
 #endif // INCLUDE_CDS_JAVA_HEAP
 
-struct LoadedArchiveHeapRegion;
+enum class HeapArchiveMode {
+  _uninitialized,
+  _mapping,
+  _streaming
+};
+
+class ArchiveMappedHeapHeader {
+  size_t           _ptrmap_start_pos; // The first bit in the ptrmap corresponds to this position in the heap.
+  size_t           _oopmap_start_pos; // The first bit in the oopmap corresponds to this position in the heap.
+  HeapRootSegments _root_segments;    // Heap root segments info
+
+public:
+  ArchiveMappedHeapHeader();
+  ArchiveMappedHeapHeader(size_t ptrmap_start_pos,
+                          size_t oopmap_start_pos,
+                          HeapRootSegments root_segments);
+
+  size_t ptrmap_start_pos() const { return _ptrmap_start_pos; }
+  size_t oopmap_start_pos() const { return _oopmap_start_pos; }
+  HeapRootSegments root_segments() const { return _root_segments; }
+
+  // This class is trivially copyable and assignable.
+  ArchiveMappedHeapHeader(const ArchiveMappedHeapHeader&) = default;
+  ArchiveMappedHeapHeader& operator=(const ArchiveMappedHeapHeader&) = default;
+};
+
+
+class ArchiveStreamedHeapHeader {
+  size_t _forwarding_offset;                      // Offset of forwarding information in the heap region.
+  size_t _roots_offset;                           // Start position for the roots
+  size_t _root_highest_object_index_table_offset; // Offset of root dfs depth information
+  size_t _num_roots;                              // Number of embedded roots
+  size_t _num_archived_objects;                   // The number of archived heap objects
+
+public:
+  ArchiveStreamedHeapHeader();
+  ArchiveStreamedHeapHeader(size_t forwarding_offset,
+                            size_t roots_offset,
+                            size_t num_roots,
+                            size_t root_highest_object_index_table_offset,
+                            size_t num_archived_objects);
+
+  size_t forwarding_offset() const { return _forwarding_offset; }
+  size_t roots_offset() const { return _roots_offset; }
+  size_t num_roots() const { return _num_roots; }
+  size_t root_highest_object_index_table_offset() const { return _root_highest_object_index_table_offset; }
+  size_t num_archived_objects() const { return _num_archived_objects; }
+
+  // This class is trivially copyable and assignable.
+  ArchiveStreamedHeapHeader(const ArchiveStreamedHeapHeader&) = default;
+  ArchiveStreamedHeapHeader& operator=(const ArchiveStreamedHeapHeader&) = default;
+};
+
+class ArchiveMappedHeapInfo {
+  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
+  CHeapBitMap _oopmap;
+  CHeapBitMap _ptrmap;
+  HeapRootSegments _root_segments;
+  size_t _oopmap_start_pos;             // How many zeros were removed from the beginning of the bit map?
+  size_t _ptrmap_start_pos;             // How many zeros were removed from the beginning of the bit map?
+
+public:
+  ArchiveMappedHeapInfo() :
+    _buffer_region(),
+    _oopmap(128, mtClassShared),
+    _ptrmap(128, mtClassShared),
+    _root_segments(),
+    _oopmap_start_pos(),
+    _ptrmap_start_pos() {}
+  bool is_used() { return !_buffer_region.is_empty(); }
+
+  MemRegion buffer_region() { return _buffer_region; }
+  void set_buffer_region(MemRegion r) { _buffer_region = r; }
+
+  char* buffer_start() { return (char*)_buffer_region.start(); }
+  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
+
+  CHeapBitMap* oopmap() { return &_oopmap; }
+  CHeapBitMap* ptrmap() { return &_ptrmap; }
+
+  void set_oopmap_start_pos(size_t start_pos) { _oopmap_start_pos = start_pos; }
+  void set_ptrmap_start_pos(size_t start_pos) { _ptrmap_start_pos = start_pos; }
+
+  void set_root_segments(HeapRootSegments segments) { _root_segments = segments; };
+  HeapRootSegments root_segments() { return _root_segments; }
+
+  ArchiveMappedHeapHeader create_header();
+};
+
+class ArchiveStreamedHeapInfo {
+  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
+  CHeapBitMap _oopmap;
+  size_t _roots_offset;                 // Offset of the HeapShared::roots() object, from the bottom
+                                        // of the archived heap objects, in bytes.
+  size_t _num_roots;
+
+  size_t _forwarding_offset;            // Offset of forwarding information from the bottom
+  size_t _root_highest_object_index_table_offset; // Offset to root dfs depth information
+  size_t _num_archived_objects;         // The number of archived objects written into the CDS archive.
+
+public:
+  ArchiveStreamedHeapInfo()
+    : _buffer_region(),
+      _oopmap(128, mtClassShared),
+      _roots_offset(),
+      _forwarding_offset(),
+      _root_highest_object_index_table_offset(),
+      _num_archived_objects() {}
+
+  bool is_used() { return !_buffer_region.is_empty(); }
+
+  void set_buffer_region(MemRegion r) { _buffer_region = r; }
+  MemRegion buffer_region() { return _buffer_region; }
+  char* buffer_start() { return (char*)_buffer_region.start(); }
+  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
+
+  CHeapBitMap* oopmap() { return &_oopmap; }
+  void set_roots_offset(size_t n) { _roots_offset = n; }
+  size_t roots_offset() { return _roots_offset; }
+  void set_num_roots(size_t n) { _num_roots = n; }
+  size_t num_roots() { return _num_roots; }
+  void set_forwarding_offset(size_t n) { _forwarding_offset = n; }
+  void set_root_highest_object_index_table_offset(size_t n) { _root_highest_object_index_table_offset = n; }
+  void set_num_archived_objects(size_t n) { _num_archived_objects = n; }
+  size_t num_archived_objects() { return _num_archived_objects; }
+
+  ArchiveStreamedHeapHeader create_header();
+};
 
 class HeapShared: AllStatic {
   friend class VerifySharedOopClosure;
 
 public:
+  static void initialize_loading_mode(HeapArchiveMode mode) NOT_CDS_JAVA_HEAP_RETURN;
+  static void initialize_writing_mode() NOT_CDS_JAVA_HEAP_RETURN;
+
+  inline static bool is_loading() NOT_CDS_JAVA_HEAP_RETURN_(false);
+
+  inline static bool is_loading_streaming_mode() NOT_CDS_JAVA_HEAP_RETURN_(false);
+  inline static bool is_loading_mapping_mode() NOT_CDS_JAVA_HEAP_RETURN_(false);
+
+  inline static bool is_writing() NOT_CDS_JAVA_HEAP_RETURN_(false);
+
+  inline static bool is_writing_streaming_mode() NOT_CDS_JAVA_HEAP_RETURN_(false);
+  inline static bool is_writing_mapping_mode() NOT_CDS_JAVA_HEAP_RETURN_(false);
+
   static bool is_subgraph_root_class(InstanceKlass* ik);
 
   // Scratch objects for archiving Klass::java_mirror()
@@ -151,9 +290,22 @@ public:
   static oop scratch_java_mirror(oop java_mirror) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
   static bool is_archived_boot_layer_available(JavaThread* current) NOT_CDS_JAVA_HEAP_RETURN_(false);
 
+  static bool is_archived_heap_in_use() NOT_CDS_JAVA_HEAP_RETURN_(false);
+  static bool can_use_archived_heap() NOT_CDS_JAVA_HEAP_RETURN_(false);
+  static bool is_too_large_to_archive(size_t size);
+  static bool is_string_too_large_to_archive(oop string);
+  static bool is_too_large_to_archive(oop obj);
+
+  static void initialize_streaming() NOT_CDS_JAVA_HEAP_RETURN;
+  static void enable_gc() NOT_CDS_JAVA_HEAP_RETURN;
+  static void materialize_thread_object() NOT_CDS_JAVA_HEAP_RETURN;
+  static void add_to_dumped_interned_strings(oop string) NOT_CDS_JAVA_HEAP_RETURN;
+  static void finalize_initialization(FileMapInfo* static_mapinfo) NOT_CDS_JAVA_HEAP_RETURN;
+
 private:
 #if INCLUDE_CDS_JAVA_HEAP
-  static DumpedInternedStrings *_dumped_interned_strings;
+  static HeapArchiveMode _heap_load_mode;
+  static HeapArchiveMode _heap_write_mode;
 
   // statistics
   constexpr static int ALLOC_STAT_SLOTS = 16;
@@ -282,8 +434,6 @@ private:
   static ArchivedKlassSubGraphInfoRecord* _run_time_special_subgraph; // for initializing classes during run time.
 
   static GrowableArrayCHeap<oop, mtClassShared>* _pending_roots;
-  static GrowableArrayCHeap<OopHandle, mtClassShared>* _root_segments;
-  static int _root_segment_max_size_elems;
   static OopHandle _scratch_basic_type_mirrors[T_VOID+1];
   static MetaspaceObjToOopHandleTable* _scratch_objects_table;
 
@@ -326,16 +476,6 @@ private:
   static void resolve_or_init(Klass* k, bool do_init, TRAPS);
   static void init_archived_fields_for(Klass* k, const ArchivedKlassSubGraphInfoRecord* record);
 
-  static int init_loaded_regions(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_regions,
-                                 MemRegion& archive_space);
-  static void sort_loaded_regions(LoadedArchiveHeapRegion* loaded_regions, int num_loaded_regions,
-                                  uintptr_t buffer);
-  static bool load_regions(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_regions,
-                           int num_loaded_regions, uintptr_t buffer);
-  static void init_loaded_heap_relocation(LoadedArchiveHeapRegion* reloc_info,
-                                          int num_loaded_regions);
-  static void fill_failed_loaded_region();
-  static void mark_native_pointers(oop orig_obj);
   static bool has_been_archived(oop orig_obj);
   static void prepare_resolved_references();
   static void archive_strings();
@@ -380,10 +520,7 @@ private:
     return _archived_object_cache;
   }
 
-  static CachedOopInfo* get_cached_oop_info(oop orig_obj) {
-    OopHandle oh(&orig_obj);
-    return _archived_object_cache->get(oh);
-  }
+  static CachedOopInfo* get_cached_oop_info(oop orig_obj);
 
   static int archive_exception_instance(oop exception);
 
@@ -391,14 +528,19 @@ private:
                                              KlassSubGraphInfo* subgraph_info,
                                              oop orig_obj);
 
-  static void add_to_dumped_interned_strings(oop string);
   static bool is_dumped_interned_string(oop o);
 
   // Scratch objects for archiving Klass::java_mirror()
   static void set_scratch_java_mirror(Klass* k, oop mirror);
   static void remove_scratch_objects(Klass* k);
+  static bool is_metadata_field(oop src_obj, int offset);
+  template <typename T> static void do_metadata_offsets(oop src_obj, T callback);
+  static void remap_dumped_metadata(oop src_obj, address archived_object);
+  inline static void remap_loaded_metadata(oop obj);
+  inline static oop maybe_remap_referent(bool is_java_lang_ref, size_t field_offset, oop referent);
   static void get_pointer_info(oop src_obj, bool& has_oop_pointers, bool& has_native_pointers);
   static void set_has_native_pointers(oop src_obj);
+  static uintptr_t archive_location(oop src_obj);
 
   // We use the HeapShared::roots() array to make sure that objects stored in the
   // archived heap region are not prematurely collected. These roots include:
@@ -432,7 +574,9 @@ private:
 #endif // INCLUDE_CDS_JAVA_HEAP
 
  public:
-  static void write_heap(ArchiveHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN;
+  static void finish_materialize_objects() NOT_CDS_JAVA_HEAP_RETURN;
+
+  static void write_heap(ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info) NOT_CDS_JAVA_HEAP_RETURN;
   static objArrayOop scratch_resolved_references(ConstantPool* src);
   static void add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) NOT_CDS_JAVA_HEAP_RETURN;
   static void init_dumping() NOT_CDS_JAVA_HEAP_RETURN;
@@ -448,9 +592,8 @@ private:
   static void initialize_from_archived_subgraph(JavaThread* current, Klass* k) NOT_CDS_JAVA_HEAP_RETURN;
 
   static void init_for_dumping(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
+  static void init_heap_writer() NOT_CDS_JAVA_HEAP_RETURN;
   static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN;
-  static void add_root_segment(objArrayOop segment_oop) NOT_CDS_JAVA_HEAP_RETURN;
-  static void init_root_segment_sizes(int max_size_elems) NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_tables(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
 
 #ifndef PRODUCT
@@ -472,22 +615,13 @@ private:
   static void scan_java_class(Klass* k);
   static void scan_java_mirror(oop orig_mirror);
   static void copy_and_rescan_aot_inited_mirror(InstanceKlass* ik);
-};
 
-#if INCLUDE_CDS_JAVA_HEAP
-class DumpedInternedStrings :
-  public ResizeableHashTable<oop, bool,
-                           AnyObj::C_HEAP,
-                           mtClassShared,
-                           HeapShared::string_oop_hash>
-{
-public:
-  DumpedInternedStrings(unsigned size, unsigned max_size) :
-    ResizeableHashTable<oop, bool,
-                                AnyObj::C_HEAP,
-                                mtClassShared,
-                                HeapShared::string_oop_hash>(size, max_size) {}
+  static void log_heap_roots();
+
+  static intptr_t log_target_location(oop source_oop);
+  static void log_oop_info(outputStream* st, oop source_oop, address archived_object_start, address archived_object_end);
+  static void log_oop_info(outputStream* st, oop source_oop);
+  static void log_oop_details(oop source_oop, address buffered_addr);
 };
-#endif
 
 #endif // SHARE_CDS_HEAPSHARED_HPP
diff --git a/src/hotspot/share/cds/heapShared.inline.hpp b/src/hotspot/share/cds/heapShared.inline.hpp
new file mode 100644
index 00000000000..8b323b067d7
--- /dev/null
+++ b/src/hotspot/share/cds/heapShared.inline.hpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_HEAPSHARED_INLINE_HPP
+#define SHARE_CDS_HEAPSHARED_INLINE_HPP
+
+#include "cds/heapShared.hpp"
+
+#include "cds/aotReferenceObjSupport.hpp"
+#include "cds/regeneratedClasses.hpp"
+#include "classfile/javaClasses.hpp"
+#include "utilities/macros.hpp"
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+inline bool HeapShared::is_loading() {
+  return _heap_load_mode != HeapArchiveMode::_uninitialized;
+}
+
+inline bool HeapShared::is_loading_streaming_mode() {
+  assert(_heap_load_mode != HeapArchiveMode::_uninitialized, "not initialized yet");
+  return _heap_load_mode == HeapArchiveMode::_streaming;
+}
+
+inline bool HeapShared::is_loading_mapping_mode() {
+  assert(_heap_load_mode != HeapArchiveMode::_uninitialized, "not initialized yet");
+  return _heap_load_mode == HeapArchiveMode::_mapping;
+}
+
+inline bool HeapShared::is_writing() {
+  return _heap_write_mode != HeapArchiveMode::_uninitialized;
+}
+
+inline bool HeapShared::is_writing_streaming_mode() {
+  assert(_heap_write_mode != HeapArchiveMode::_uninitialized, "not initialized yet");
+  return _heap_write_mode == HeapArchiveMode::_streaming;
+}
+
+inline bool HeapShared::is_writing_mapping_mode() {
+  assert(_heap_write_mode != HeapArchiveMode::_uninitialized, "not initialized yet");
+  return _heap_write_mode == HeapArchiveMode::_mapping;
+}
+
+// Keep the knowledge about which objects have what metadata in one single place
+template <typename T>
+void HeapShared::do_metadata_offsets(oop src_obj, T callback) {
+  if (java_lang_Class::is_instance(src_obj)) {
+    assert(java_lang_Class::klass_offset() < java_lang_Class::array_klass_offset(),
+           "metadata offsets must be sorted");
+    callback(java_lang_Class::klass_offset());
+    callback(java_lang_Class::array_klass_offset());
+  } else if (java_lang_invoke_ResolvedMethodName::is_instance(src_obj)) {
+    callback(java_lang_invoke_ResolvedMethodName::vmtarget_offset());
+  }
+}
+
+inline void HeapShared::remap_loaded_metadata(oop src_obj) {
+  do_metadata_offsets(src_obj, [&](int offset) {
+    Metadata* metadata = src_obj->metadata_field(offset);
+    if (metadata != nullptr) {
+      metadata = (Metadata*)(address(metadata) + AOTMetaspace::relocation_delta());
+      src_obj->metadata_field_put(offset, metadata);
+    }
+  });
+}
+
+inline oop HeapShared::maybe_remap_referent(bool is_java_lang_ref, size_t field_offset, oop referent) {
+  if (referent == nullptr) {
+    return nullptr;
+  }
+
+  if (is_java_lang_ref && AOTReferenceObjSupport::skip_field((int)field_offset)) {
+    return nullptr;
+  }
+
+  if (java_lang_Class::is_instance(referent)) {
+    Klass* k = java_lang_Class::as_Klass(referent);
+    if (RegeneratedClasses::has_been_regenerated(k)) {
+      referent = RegeneratedClasses::get_regenerated_object(k)->java_mirror();
+    }
+    // When the source object points to a "real" mirror, the buffered object should point
+    // to the "scratch" mirror, which has all unarchivable fields scrubbed (to be reinstated
+    // at run time).
+    referent = HeapShared::scratch_java_mirror(referent);
+    assert(referent != nullptr, "must be");
+  }
+
+  return referent;
+}
+
+#endif // INCLUDE_CDS_JAVA_HEAP
+
+#endif // SHARE_CDS_HEAPSHARED_INLINE_HPP
diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
index 61404fdf9db..b6f7915db71 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
@@ -38,6 +38,7 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/init.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointVerifiers.hpp"
@@ -149,7 +150,8 @@ ClassLoaderData* ClassLoaderDataGraph::add_to_graph(Handle loader, bool has_clas
   // We mustn't GC until we've installed the ClassLoaderData in the Graph since the CLD
   // contains oops in _handles that must be walked.  GC doesn't walk CLD from the
   // loader oop in all collections, particularly young collections.
-  NoSafepointVerifier no_safepoints;
+  // Before is_init_completed(), GC is not allowed to run.
+  NoSafepointVerifier no_safepoints(is_init_completed());
 
   cld = new ClassLoaderData(loader, has_class_mirror_holder);
 
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.cpp b/src/hotspot/share/classfile/classLoaderDataShared.cpp
index 2a59a3339b6..7a7743edd03 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.cpp
@@ -24,7 +24,7 @@
 
 #include "cds/aotLogging.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "cds/serializeClosure.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataShared.hpp"
@@ -152,6 +152,35 @@ void ArchivedClassLoaderData::clear_archived_oops() {
 
 // ------------------------------
 
+void ClassLoaderDataShared::load_archived_platform_and_system_class_loaders() {
+#if INCLUDE_CDS_JAVA_HEAP
+  // The streaming object loader prefers loading the class loader related objects before
+  //  the CLD constructor which has a NoSafepointVerifier.
+  if (!HeapShared::is_loading_streaming_mode()) {
+    return;
+  }
+
+  // Ensure these class loaders are eagerly materialized before their CLDs are created.
+  HeapShared::get_root(_platform_loader_root_index, false /* clear */);
+  HeapShared::get_root(_system_loader_root_index, false /* clear */);
+
+  if (Universe::is_module_initialized() || !CDSConfig::is_using_full_module_graph()) {
+    return;
+  }
+
+  // When using the full module graph, we need to load unnamed modules too.
+  ModuleEntry* platform_loader_module_entry = _archived_platform_loader_data.unnamed_module();
+  if (platform_loader_module_entry != nullptr) {
+    platform_loader_module_entry->preload_archived_oops();
+  }
+
+  ModuleEntry* system_loader_module_entry = _archived_system_loader_data.unnamed_module();
+  if (system_loader_module_entry != nullptr) {
+    system_loader_module_entry->preload_archived_oops();
+  }
+#endif
+}
+
 static ClassLoaderData* null_class_loader_data() {
   ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
   assert(loader_data != nullptr, "must be");
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.hpp b/src/hotspot/share/classfile/classLoaderDataShared.hpp
index 944d415af5c..39d0a89418f 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.hpp
@@ -38,6 +38,7 @@ class ClassLoaderDataShared : AllStatic {
   static bool _full_module_graph_loaded;
   CDS_JAVA_HEAP_ONLY(static void ensure_module_entry_table_exists(oop class_loader);)
 public:
+  static void load_archived_platform_and_system_class_loaders() NOT_CDS_JAVA_HEAP_RETURN;
   static void restore_archived_modules_for_preloading_classes(JavaThread* current) NOT_CDS_JAVA_HEAP_RETURN;
 #if INCLUDE_CDS_JAVA_HEAP
   static void ensure_module_entry_tables_exist();
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index ac701e8364f..e41af702601 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -25,9 +25,8 @@
 #include "cds/aotMetaspace.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -978,7 +977,7 @@ void java_lang_Class::fixup_mirror(Klass* k, TRAPS) {
   }
 
   if (k->in_aot_cache() && k->has_archived_mirror_index()) {
-    if (ArchiveHeapLoader::is_in_use()) {
+    if (HeapShared::is_archived_heap_in_use()) {
       bool present = restore_archived_mirror(k, Handle(), Handle(), Handle(), CHECK);
       assert(present, "Missing archived mirror for %s", k->external_name());
       return;
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index 88b59540d04..5fb3d6f2d13 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -546,6 +546,10 @@ void ModuleEntry::load_from_archive(ClassLoaderData* loader_data) {
   JFR_ONLY(INIT_ID(this);)
 }
 
+void ModuleEntry::preload_archived_oops() {
+  (void)HeapShared::get_root(_archived_module_index, false /* clear */);
+}
+
 void ModuleEntry::restore_archived_oops(ClassLoaderData* loader_data) {
   assert(CDSConfig::is_using_archive(), "runtime only");
   Handle module_handle(Thread::current(), HeapShared::get_root(_archived_module_index, /*clear=*/true));
diff --git a/src/hotspot/share/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp
index 1074c88f010..2e1852c5369 100644
--- a/src/hotspot/share/classfile/moduleEntry.hpp
+++ b/src/hotspot/share/classfile/moduleEntry.hpp
@@ -206,6 +206,7 @@ public:
   static Array<ModuleEntry*>* write_growable_array(GrowableArray<ModuleEntry*>* array);
   static GrowableArray<ModuleEntry*>* restore_growable_array(Array<ModuleEntry*>* archived_array);
   void load_from_archive(ClassLoaderData* loader_data);
+  void preload_archived_oops();
   void restore_archived_oops(ClassLoaderData* loader_data);
   void clear_archived_oops();
   static void verify_archived_module_entries() PRODUCT_RETURN;
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 522d1d0842d..baf2acfb78c 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -739,6 +739,8 @@ void Modules::init_archived_modules(JavaThread* current, Handle h_platform_loade
     ModuleEntryTable::patch_javabase_entries(current, java_base_module);
   }
 
+  ClassLoaderDataShared::load_archived_platform_and_system_class_loaders();
+
   ClassLoaderData* platform_loader_data = SystemDictionary::register_loader(h_platform_loader);
   SystemDictionary::set_platform_loader(platform_loader_data);
   ClassLoaderDataShared::restore_java_platform_loader_from_archive(platform_loader_data);
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index c6c1c7a31bd..6f9d5d11562 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -22,11 +22,10 @@
  *
  */
 
+#include "cds/aotMappedHeapLoader.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.inline.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -80,7 +79,7 @@ OopHandle StringTable::_shared_strings_array;
 int StringTable::_shared_strings_array_root_index;
 
 inline oop StringTable::read_string_from_compact_hashtable(address base_address, u4 index) {
-  assert(ArchiveHeapLoader::is_in_use(), "sanity");
+  assert(AOTMappedHeapLoader::is_in_use(), "sanity");
   objArrayOop array = (objArrayOop)(_shared_strings_array.resolve());
   oop s;
 
@@ -316,13 +315,13 @@ void StringTable::create_table() {
   _local_table = new StringTableHash(start_size_log_2, END_SIZE, REHASH_LEN, true);
   _oop_storage = OopStorageSet::create_weak("StringTable Weak", mtSymbol);
   _oop_storage->register_num_dead_callback(&gc_notification);
+}
 
 #if INCLUDE_CDS_JAVA_HEAP
-  if (ArchiveHeapLoader::is_in_use()) {
-    _shared_strings_array = OopHandle(Universe::vm_global(), HeapShared::get_root(_shared_strings_array_root_index));
-  }
-#endif
+void StringTable::load_shared_strings_array() {
+  _shared_strings_array = OopHandle(Universe::vm_global(), HeapShared::get_root(_shared_strings_array_root_index));
 }
+#endif
 
 void StringTable::item_added() {
   AtomicAccess::inc(&_items_count);
@@ -932,10 +931,14 @@ void StringtableDCmd::execute(DCmdSource source, TRAPS) {
 // Sharing
 #if INCLUDE_CDS_JAVA_HEAP
 size_t StringTable::shared_entry_count() {
+  assert(HeapShared::is_loading_mapping_mode(), "should not reach here");
   return _shared_table.entry_count();
 }
 
 oop StringTable::lookup_shared(const StringWrapper& name, unsigned int hash) {
+  if (!AOTMappedHeapLoader::is_in_use()) {
+    return nullptr;
+  }
   assert(hash == hash_wrapped_string(name),
          "hash must be computed using java_lang_String::hash_code");
   // len is required but is already part of StringWrapper, so 0 is used
@@ -943,6 +946,9 @@ oop StringTable::lookup_shared(const StringWrapper& name, unsigned int hash) {
 }
 
 oop StringTable::lookup_shared(const jchar* name, int len) {
+  if (!AOTMappedHeapLoader::is_in_use()) {
+    return nullptr;
+  }
   StringWrapper wrapped_name(name, len);
   // len is required but is already part of StringWrapper, so 0 is used
   return _shared_table.lookup(wrapped_name, java_lang_String::hash_code(name, len), 0);
@@ -955,6 +961,8 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
     return;
   }
 
+  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
+
   CompileBroker::wait_for_no_active_tasks();
 
   precond(CDSConfig::allow_only_single_java_thread());
@@ -977,7 +985,7 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
 
   log_info(aot)("allocated string table for %d strings", total);
 
-  if (!ArchiveHeapWriter::is_too_large_to_archive(single_array_size)) {
+  if (!HeapShared::is_too_large_to_archive(single_array_size)) {
     // The entire table can fit in a single array
     objArrayOop array = oopFactory::new_objArray(vmClasses::Object_klass(), total, CHECK);
     _shared_strings_array = OopHandle(Universe::vm_global(), array);
@@ -988,7 +996,7 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
     size_t primary_array_size = objArrayOopDesc::object_size(primary_array_length);
     size_t secondary_array_size = objArrayOopDesc::object_size(_secondary_array_max_length);
 
-    if (ArchiveHeapWriter::is_too_large_to_archive(secondary_array_size)) {
+    if (HeapShared::is_too_large_to_archive(secondary_array_size)) {
       // This can only happen if you have an extremely large number of classes that
       // refer to more than 16384 * 16384 = 26M interned strings! Not a practical concern
       // but bail out for safety.
@@ -1014,7 +1022,7 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
       primaryHandle()->obj_at_put(i, secondary);
 
       log_info(aot)("string table array (secondary)[%d] length = %d", i, len);
-      assert(!ArchiveHeapWriter::is_too_large_to_archive(secondary), "sanity");
+      assert(!HeapShared::is_too_large_to_archive(secondary), "sanity");
     }
 
     assert(total == 0, "must be");
@@ -1024,10 +1032,11 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
 
 #ifndef PRODUCT
 void StringTable::verify_secondary_array_index_bits() {
+  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
   int max;
   for (max = 1; ; max++) {
     size_t next_size = objArrayOopDesc::object_size(1 << (max + 1));
-    if (ArchiveHeapWriter::is_too_large_to_archive(next_size)) {
+    if (HeapShared::is_too_large_to_archive(next_size)) {
       break;
     }
   }
@@ -1050,6 +1059,7 @@ void StringTable::verify_secondary_array_index_bits() {
 // [2] Store the index and hashcode into _shared_table.
 oop StringTable::init_shared_strings_array() {
   assert(CDSConfig::is_dumping_heap(), "must be");
+  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
   objArrayOop array = (objArrayOop)(_shared_strings_array.resolve());
 
   verify_secondary_array_index_bits();
@@ -1057,11 +1067,11 @@ oop StringTable::init_shared_strings_array() {
   int index = 0;
   auto copy_into_array = [&] (WeakHandle* val) {
     oop string = val->peek();
-    if (string != nullptr && !ArchiveHeapWriter::is_string_too_large_to_archive(string)) {
+    if (string != nullptr && !HeapShared::is_string_too_large_to_archive(string)) {
       // If string is too large, don't put it into the string table.
-      // - If there are no other refernences to it, it won't be stored into the archive,
+      // - If there are no other references to it, it won't be stored into the archive,
       //   so we are all good.
-      // - If there's a referece to it, we will report an error inside HeapShared.cpp and
+      // - If there's a reference to it, we will report an error inside HeapShared.cpp and
       //   dumping will fail.
       HeapShared::add_to_dumped_interned_strings(string);
       if (!_is_two_dimensional_shared_strings_array) {
@@ -1095,7 +1105,7 @@ void StringTable::write_shared_table() {
   int index = 0;
   auto copy_into_shared_table = [&] (WeakHandle* val) {
     oop string = val->peek();
-    if (string != nullptr && !ArchiveHeapWriter::is_string_too_large_to_archive(string)) {
+    if (string != nullptr && !HeapShared::is_string_too_large_to_archive(string)) {
       unsigned int hash = java_lang_String::hash_code(string);
       writer.add(hash, index);
       index ++;
@@ -1109,6 +1119,7 @@ void StringTable::write_shared_table() {
 }
 
 void StringTable::set_shared_strings_array_index(int root_index) {
+  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
   _shared_strings_array_root_index = root_index;
 }
 
@@ -1118,7 +1129,7 @@ void StringTable::serialize_shared_table_header(SerializeClosure* soc) {
   if (soc->writing()) {
     // Sanity. Make sure we don't use the shared table at dump time
     _shared_table.reset();
-  } else if (!ArchiveHeapLoader::is_in_use()) {
+  } else if (!AOTMappedHeapLoader::is_in_use()) {
     _shared_table.reset();
   }
 
diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp
index 9194d0b8002..839e9d9053d 100644
--- a/src/hotspot/share/classfile/stringTable.hpp
+++ b/src/hotspot/share/classfile/stringTable.hpp
@@ -128,7 +128,7 @@ private:
   // [2] _is_two_dimensional_shared_strings_array = true: _shared_strings_array is an Object[][]
   //     This happens when there are too many elements in the shared table. We store them
   //     using two levels of objArrays, such that none of the arrays are too big for
-  //     ArchiveHeapWriter::is_too_large_to_archive(). In this case, the index is splited into two
+  //     AOTMappedHeapWriter::is_too_large_to_archive(). In this case, the index is splited into two
   //     parts. Each shared string is stored as _shared_strings_array[primary_index][secondary_index]:
   //
   //           [bits 31 .. 14][ bits 13 .. 0  ]
@@ -147,6 +147,7 @@ private:
   static oop lookup_shared(const jchar* name, int len) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
   static size_t shared_entry_count() NOT_CDS_JAVA_HEAP_RETURN_(0);
   static void allocate_shared_strings_array(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
+  static void load_shared_strings_array() NOT_CDS_JAVA_HEAP_RETURN;
   static oop init_shared_strings_array() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
   static void write_shared_table() NOT_CDS_JAVA_HEAP_RETURN;
   static void set_shared_strings_array_index(int root_index) NOT_CDS_JAVA_HEAP_RETURN;
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 2f7001c86b3..5c49a32b8d0 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1185,6 +1185,7 @@ void SystemDictionary::preload_class(Handle class_loader, InstanceKlass* ik, TRA
   ClassLoaderData* loader_data = ClassLoaderData::class_loader_data(class_loader());
   oop java_mirror = ik->archived_java_mirror();
   precond(java_mirror != nullptr);
+  assert(java_lang_Class::module(java_mirror) != nullptr, "must have been archived");
 
   Handle pd(THREAD, java_lang_Class::protection_domain(java_mirror));
   PackageEntry* pkg_entry = ik->package();
@@ -1202,7 +1203,6 @@ void SystemDictionary::preload_class(Handle class_loader, InstanceKlass* ik, TRA
     update_dictionary(THREAD, ik, loader_data);
   }
 
-  assert(java_lang_Class::module(java_mirror) != nullptr, "must have been archived");
   assert(ik->is_loaded(), "Must be in at least loaded state");
 }
 
diff --git a/src/hotspot/share/classfile/vmClasses.cpp b/src/hotspot/share/classfile/vmClasses.cpp
index fbb234d95c0..0a3d33f4c5b 100644
--- a/src/hotspot/share/classfile/vmClasses.cpp
+++ b/src/hotspot/share/classfile/vmClasses.cpp
@@ -23,10 +23,12 @@
  */
 
 #include "cds/aotLinkedClassBulkLoader.hpp"
-#include "cds/archiveHeapLoader.hpp"
+#include "cds/aotMappedHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataShared.hpp"
 #include "classfile/dictionary.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -132,21 +134,28 @@ void vmClasses::resolve_all(TRAPS) {
   CollectedHeap::set_filler_object_klass(vmClasses::Object_klass());
 #if INCLUDE_CDS
   if (CDSConfig::is_using_archive()) {
-    // It's unsafe to access the archived heap regions before they
-    // are fixed up, so we must do the fixup as early as possible
-    // before the archived java objects are accessed by functions
-    // such as java_lang_Class::restore_archived_mirror and
-    // ConstantPool::restore_unshareable_info (restores the archived
-    // resolved_references array object).
-    //
-    // ArchiveHeapLoader::fixup_regions fills the empty
-    // spaces in the archived heap regions and may use
-    // vmClasses::Object_klass(), so we can do this only after
-    // Object_klass is resolved. See the above resolve_through()
-    // call. No mirror objects are accessed/restored in the above call.
-    // Mirrors are restored after java.lang.Class is loaded.
-    ArchiveHeapLoader::fixup_region();
-
+#if INCLUDE_CDS_JAVA_HEAP
+    if (HeapShared::is_loading() && HeapShared::is_loading_mapping_mode()) {
+      // It's unsafe to access the archived heap regions before they
+      // are fixed up, so we must do the fixup as early as possible
+      // before the archived java objects are accessed by functions
+      // such as java_lang_Class::restore_archived_mirror and
+      // ConstantPool::restore_unshareable_info (restores the archived
+      // resolved_references array object).
+      //
+      // AOTMappedHeapLoader::fixup_regions fills the empty
+      // spaces in the archived heap regions and may use
+      // vmClasses::Object_klass(), so we can do this only after
+      // Object_klass is resolved. See the above resolve_through()
+      // call. No mirror objects are accessed/restored in the above call.
+      // Mirrors are restored after java.lang.Class is loaded.
+      AOTMappedHeapLoader::fixup_region();
+    }
+    if (HeapShared::is_archived_heap_in_use() && !CDSConfig::is_using_full_module_graph()) {
+      // Need to remove all the archived java.lang.Module objects from HeapShared::roots().
+      ClassLoaderDataShared::clear_archived_oops();
+    }
+#endif // INCLUDE_CDS_JAVA_HEAP
     // Initialize the constant pool for the Object_class
     assert(Object_klass()->in_aot_cache(), "must be");
     Object_klass()->constants()->restore_unshareable_info(CHECK);
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index bed6a2f22e6..c8dd39e72be 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -631,6 +631,10 @@ void CollectedHeap::before_exit() {
   stop();
 }
 
+size_t CollectedHeap::bootstrap_max_memory() const {
+  return MaxNewSize;
+}
+
 #ifndef PRODUCT
 
 bool CollectedHeap::promotion_should_fail(volatile size_t* count) {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 3b5865e0001..659106f9c19 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -500,6 +500,7 @@ protected:
   virtual bool can_load_archived_objects() const { return false; }
   virtual HeapWord* allocate_loaded_archive_space(size_t size) { return nullptr; }
   virtual void complete_loaded_archive_space(MemRegion archive_space) { }
+  virtual size_t bootstrap_max_memory() const;
 
   virtual bool is_oop(oop object) const;
   // Non product verification and debugging.
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupConfig.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupConfig.cpp
index 50155a66951..128ba4152dc 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupConfig.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupConfig.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/cdsConfig.hpp"
 #include "classfile/altHashing.hpp"
 #include "gc/shared/stringdedup/stringDedupConfig.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
index 5f04be97b74..cfa276c0de0 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include "cds/aotMappedHeapLoader.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/stringTable.hpp"
@@ -514,6 +516,7 @@ void StringDedup::Table::install(typeArrayOop obj, uint hash_code) {
 // access to a String that is incompletely constructed; the value could be
 // set before the coder.
 bool StringDedup::Table::try_deduplicate_shared(oop java_string) {
+  assert(!HeapShared::is_loading_streaming_mode(), "should not reach here");
   typeArrayOop value = java_lang_String::value(java_string);
   assert(value != nullptr, "precondition");
   assert(TypeArrayKlass::cast(value->klass())->element_type() == T_BYTE, "precondition");
@@ -559,6 +562,7 @@ bool StringDedup::Table::try_deduplicate_shared(oop java_string) {
 }
 
 bool StringDedup::Table::try_deduplicate_found_shared(oop java_string, oop found) {
+  assert(!HeapShared::is_loading_streaming_mode(), "should not reach here");
   _cur_stat.inc_known_shared();
   typeArrayOop found_value = java_lang_String::value(found);
   if (found_value == java_lang_String::value(java_string)) {
@@ -609,7 +613,8 @@ bool StringDedup::Table::deduplicate_if_permitted(oop java_string,
 void StringDedup::Table::deduplicate(oop java_string) {
   assert(java_lang_String::is_instance(java_string), "precondition");
   _cur_stat.inc_inspected();
-  if ((StringTable::shared_entry_count() > 0) &&
+  if (AOTMappedHeapLoader::is_in_use() &&
+      (StringTable::shared_entry_count() > 0) &&
       try_deduplicate_shared(java_string)) {
     return;                     // Done if deduplicated against shared StringTable.
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 38f055c34b6..22a59b5ac18 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -25,7 +25,7 @@
  */
 
 
-#include "cds/archiveHeapWriter.hpp"
+#include "cds/aotMappedHeapWriter.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/fullGCForwarding.hpp"
@@ -2770,7 +2770,7 @@ HeapWord* ShenandoahHeap::allocate_loaded_archive_space(size_t size) {
   //
   // CDS would guarantee no objects straddle multiple regions, as long as regions are as large
   // as MIN_GC_REGION_ALIGNMENT.
-  guarantee(ShenandoahHeapRegion::region_size_bytes() >= ArchiveHeapWriter::MIN_GC_REGION_ALIGNMENT, "Must be");
+  guarantee(ShenandoahHeapRegion::region_size_bytes() >= AOTMappedHeapWriter::MIN_GC_REGION_ALIGNMENT, "Must be");
 
   ShenandoahAllocRequest req = ShenandoahAllocRequest::for_cds(size);
   return allocate_memory(req);
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index 2435c6fb31f..f2ff35a6a43 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -208,6 +208,13 @@ void ZArguments::initialize() {
     FLAG_SET_DEFAULT(LogEventsBufferEntries, 250);
   }
 
+  if (VerifyArchivedFields > 0) {
+    // ZGC doesn't support verifying at arbitrary points as our normal state is that everything in the
+    // heap looks completely insane. Only at some particular points does the heap look sort of sane.
+    // So instead of verifying we trigger a GC that does its own verification when it's suitable.
+    FLAG_SET_DEFAULT(VerifyArchivedFields, 2);
+  }
+
   // Verification before startup and after exit not (yet) supported
   FLAG_SET_DEFAULT(VerifyDuringStartup, false);
   FLAG_SET_DEFAULT(VerifyBeforeExit, false);
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index 1fbb4b25e2d..db55fff673a 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -34,6 +34,7 @@
 #include "gc/z/zGeneration.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeap.inline.hpp"
+#include "gc/z/zHeuristics.hpp"
 #include "gc/z/zJNICritical.hpp"
 #include "gc/z/zNMethod.hpp"
 #include "gc/z/zObjArrayAllocator.hpp"
@@ -298,6 +299,10 @@ void ZCollectedHeap::unregister_nmethod(nmethod* nm) {
   ZNMethod::purge_nmethod(nm);
 }
 
+size_t ZCollectedHeap::bootstrap_max_memory() const {
+  return MaxHeapSize - ZHeuristics::significant_young_overhead();
+}
+
 void ZCollectedHeap::verify_nmethod(nmethod* nm) {
   // Does nothing
 }
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp
index 07366b35d30..19c9ab1bbdf 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.hpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp
@@ -115,6 +115,8 @@ public:
   void pin_object(JavaThread* thread, oop obj) override;
   void unpin_object(JavaThread* thread, oop obj) override;
 
+  size_t bootstrap_max_memory() const override;
+
   void print_heap_on(outputStream* st) const override;
   void print_gc_on(outputStream* st) const override;
   bool print_location(outputStream* st, void* addr) const override;
diff --git a/src/hotspot/share/gc/z/zDirector.cpp b/src/hotspot/share/gc/z/zDirector.cpp
index a85d3df6a81..9ff56ce74bb 100644
--- a/src/hotspot/share/gc/z/zDirector.cpp
+++ b/src/hotspot/share/gc/z/zDirector.cpp
@@ -32,6 +32,7 @@
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zStat.hpp"
 #include "logging/log.hpp"
+#include "runtime/init.hpp"
 
 ZDirector* ZDirector::_director;
 
@@ -916,6 +917,12 @@ void ZDirector::run_thread() {
   // Main loop
   while (wait_for_tick()) {
     ZDirectorStats stats = sample_stats();
+
+    if (!is_init_completed()) {
+      // Not allowed to start GCs yet
+      continue;
+    }
+
     if (!start_gc(stats)) {
       adjust_gc(stats);
     }
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 480d28f8c55..5fe5546e0a9 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -477,11 +477,10 @@ traceid JfrThreadLocal::external_thread_id(const Thread* t) {
   return JfrRecorder::is_recording() ? thread_id(t) : jvm_thread_id(t);
 }
 
-static inline traceid load_java_thread_id(const Thread* t) {
+static inline traceid load_java_thread_id(const JavaThread* t) {
   assert(t != nullptr, "invariant");
-  assert(t->is_Java_thread(), "invariant");
-  oop threadObj = JavaThread::cast(t)->threadObj();
-  return threadObj != nullptr ? AccessThreadTraceId::id(threadObj) : 0;
+  oop threadObj = t->threadObj();
+  return threadObj != nullptr ? AccessThreadTraceId::id(threadObj) : static_cast<traceid>(t->monitor_owner_id());
 }
 
 #ifdef ASSERT
@@ -502,7 +501,7 @@ traceid JfrThreadLocal::assign_thread_id(const Thread* t, JfrThreadLocal* tl) {
   if (tid == 0) {
     assert(can_assign(t), "invariant");
     if (t->is_Java_thread()) {
-      tid = load_java_thread_id(t);
+      tid = load_java_thread_id(JavaThread::cast(t));
       tl->_jvm_thread_id = tid;
       AtomicAccess::store(&tl->_vthread_id, tid);
       return tid;
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 69afe5c6450..db0435044ca 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -23,10 +23,9 @@
  */
 
 #include "cds/aotMetaspace.hpp"
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderDataShared.hpp"
@@ -323,7 +322,7 @@ void Universe::archive_exception_instances() {
 }
 
 void Universe::load_archived_object_instances() {
-  if (ArchiveHeapLoader::is_in_use()) {
+  if (HeapShared::is_archived_heap_in_use()) {
     for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
       int index = _archived_basic_type_mirror_indices[i];
       if (!is_reference_type((BasicType)i) && index >= 0) {
@@ -559,10 +558,8 @@ void Universe::genesis(TRAPS) {
 void Universe::initialize_basic_type_mirrors(TRAPS) {
 #if INCLUDE_CDS_JAVA_HEAP
     if (CDSConfig::is_using_archive() &&
-        ArchiveHeapLoader::is_in_use() &&
+        HeapShared::is_archived_heap_in_use() &&
         _basic_type_mirrors[T_INT].resolve() != nullptr) {
-      assert(ArchiveHeapLoader::can_use(), "Sanity");
-
       // check that all basic type mirrors are mapped also
       for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
         if (!is_reference_type((BasicType)i)) {
@@ -571,7 +568,7 @@ void Universe::initialize_basic_type_mirrors(TRAPS) {
         }
       }
     } else
-      // _basic_type_mirrors[T_INT], etc, are null if archived heap is not mapped.
+      // _basic_type_mirrors[T_INT], etc, are null if not using an archived heap
 #endif
     {
       for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
@@ -911,6 +908,21 @@ jint universe_init() {
     return JNI_EINVAL;
   }
 
+  // Add main_thread to threads list to finish barrier setup with
+  // on_thread_attach.  Should be before starting to build Java objects in
+  // the AOT heap loader, which invokes barriers.
+  {
+    JavaThread* main_thread = JavaThread::current();
+    MutexLocker mu(Threads_lock);
+    Threads::add(main_thread);
+  }
+
+  HeapShared::initialize_writing_mode();
+
+  // Create the string table before the AOT object archive is loaded,
+  // as it might need to access the string table.
+  StringTable::create_table();
+
 #if INCLUDE_CDS
   if (CDSConfig::is_using_archive()) {
     // Read the data structures supporting the shared spaces (shared
@@ -933,7 +945,6 @@ jint universe_init() {
 #endif
 
   SymbolTable::create_table();
-  StringTable::create_table();
 
   if (strlen(VerifySubSet) > 0) {
     Universe::initialize_verify_flags();
@@ -1178,6 +1189,7 @@ bool universe_post_init() {
   MemoryService::add_metaspace_memory_pools();
 
   MemoryService::set_universe_heap(Universe::heap());
+
 #if INCLUDE_CDS
   AOTMetaspace::post_initialize(CHECK_false);
 #endif
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index b072c7f26ec..95a43b07bd7 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -24,10 +24,8 @@
 
 #include "cds/aotConstantPoolResolver.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.hpp"
-#include "cds/archiveHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -358,7 +356,7 @@ objArrayOop ConstantPool::prepare_resolved_references_for_archiving() {
           int index = object_to_cp_index(i);
           if (tag_at(index).is_string()) {
             assert(java_lang_String::is_instance(obj), "must be");
-            if (!ArchiveHeapWriter::is_string_too_large_to_archive(obj)) {
+            if (!HeapShared::is_string_too_large_to_archive(obj)) {
               scratch_rr->obj_at_put(i, obj);
             }
             continue;
@@ -398,7 +396,7 @@ void ConstantPool::restore_unshareable_info(TRAPS) {
   if (vmClasses::Object_klass_is_loaded()) {
     ClassLoaderData* loader_data = pool_holder()->class_loader_data();
 #if INCLUDE_CDS_JAVA_HEAP
-    if (ArchiveHeapLoader::is_in_use() &&
+    if (HeapShared::is_archived_heap_in_use() &&
         _cache->archived_references() != nullptr) {
       oop archived = _cache->archived_references();
       // Create handle for the archived resolved reference array object
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index d9041cc54f4..b30ec2f4887 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -22,9 +22,8 @@
  *
  */
 
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataGraph.inline.hpp"
@@ -900,7 +899,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
   if (this->has_archived_mirror_index()) {
     ResourceMark rm(THREAD);
     log_debug(aot, mirror)("%s has raw archived mirror", external_name());
-    if (ArchiveHeapLoader::is_in_use()) {
+    if (HeapShared::is_archived_heap_in_use()) {
       bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle,
                                                               protection_domain,
                                                               CHECK);
diff --git a/src/hotspot/share/oops/objArrayOop.hpp b/src/hotspot/share/oops/objArrayOop.hpp
index 27042b22e7e..82bb41b5fd1 100644
--- a/src/hotspot/share/oops/objArrayOop.hpp
+++ b/src/hotspot/share/oops/objArrayOop.hpp
@@ -35,7 +35,7 @@ class Klass;
 // Evaluating "String arg[10]" will create an objArrayOop.
 
 class objArrayOopDesc : public arrayOopDesc {
-  friend class ArchiveHeapWriter;
+  friend class AOTMappedHeapWriter;
   friend class ObjArrayKlass;
   friend class Runtime1;
   friend class psPromotionManager;
diff --git a/src/hotspot/share/oops/oopsHierarchy.cpp b/src/hotspot/share/oops/oopsHierarchy.cpp
index a62d37ce2ba..21b8a57795d 100644
--- a/src/hotspot/share/oops/oopsHierarchy.cpp
+++ b/src/hotspot/share/oops/oopsHierarchy.cpp
@@ -33,7 +33,6 @@ CheckOopFunctionPointer check_oop_function = nullptr;
 
 void oop::register_oop() {
   assert (CheckUnhandledOops, "should only call when CheckUnhandledOops");
-  if (!Universe::is_fully_initialized()) return;
   // This gets expensive, which is why checking unhandled oops is on a switch.
   Thread* t = Thread::current_or_null();
   if (t != nullptr && t->is_Java_thread()) {
@@ -43,7 +42,6 @@ void oop::register_oop() {
 
 void oop::unregister_oop() {
   assert (CheckUnhandledOops, "should only call when CheckUnhandledOops");
-  if (!Universe::is_fully_initialized()) return;
   // This gets expensive, which is why checking unhandled oops is on a switch.
   Thread* t = Thread::current_or_null();
   if (t != nullptr && t->is_Java_thread()) {
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 34d2d614d22..5af8edbb758 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -3491,6 +3491,10 @@ enum VM_Creation_State {
 
 volatile VM_Creation_State vm_created = NOT_CREATED;
 
+bool is_vm_created() {
+  return AtomicAccess::load(&vm_created) == COMPLETE;
+}
+
 // Indicate whether it is safe to recreate VM. Recreation is only
 // possible after a failed initial creation attempt in some cases.
 volatile int safe_to_recreate_vm = 1;
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 96437882584..69d1fa2c974 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotThread.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "classfile/vmClasses.hpp"
@@ -1485,6 +1486,13 @@ void JvmtiExport::post_thread_start(JavaThread *thread) {
   }
   assert(thread->thread_state() == _thread_in_vm, "must be in vm state");
 
+  if (thread->is_aot_thread()) {
+    // The AOT thread is hidden from view but has no thread oop when it starts due
+    // to bootstrapping complexity, so we check for it before checking for bound
+    // virtual threads. When exiting it is filtered out due to being hidden.
+    return;
+  }
+
   EVT_TRIG_TRACE(JVMTI_EVENT_THREAD_START, ("[%s] Trg Thread Start event triggered",
                       JvmtiTrace::safe_get_thread_name(thread)));
 
diff --git a/src/hotspot/share/prims/jvmtiRawMonitor.cpp b/src/hotspot/share/prims/jvmtiRawMonitor.cpp
index 85a7714fb29..df8a0fb0275 100644
--- a/src/hotspot/share/prims/jvmtiRawMonitor.cpp
+++ b/src/hotspot/share/prims/jvmtiRawMonitor.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotThread.hpp"
 #include "memory/allocation.inline.hpp"
 #include "prims/jvmtiRawMonitor.hpp"
 #include "runtime/atomicAccess.hpp"
@@ -29,6 +30,7 @@
 #include "runtime/javaThread.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/threads.hpp"
+#include "runtime/threadSMR.hpp"
 
 JvmtiRawMonitor::QNode::QNode(Thread* thread) : _next(nullptr), _prev(nullptr),
                                                 _event(thread->_ParkEvent),
@@ -39,10 +41,15 @@ GrowableArray<JvmtiRawMonitor*>* JvmtiPendingMonitors::_monitors =
   new (mtServiceability) GrowableArray<JvmtiRawMonitor*>(1, mtServiceability);
 
 void JvmtiPendingMonitors::transition_raw_monitors() {
-  assert((Threads::number_of_threads()==1),
-         "Java thread has not been created yet or more than one java thread "
-         "is running. Raw monitor transition will not work");
   JavaThread* current_java_thread = JavaThread::current();
+
+#ifdef ASSERT
+  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) {
+    assert(thread == current_java_thread || thread->is_aot_thread(),
+           "Didn't expect concurrent application threads at this point");
+  }
+#endif
+
   {
     ThreadToNativeFromVM ttnfvm(current_java_thread);
     for (int i = 0; i < count(); i++) {
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index f5d1edd28f4..8f0a2320288 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -23,11 +23,11 @@
  */
 
 #include "cds.h"
+#include "cds/aotMappedHeapLoader.hpp"
 #include "cds/aotMetaspace.hpp"
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConstants.hpp"
 #include "cds/filemap.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderStats.hpp"
@@ -2205,6 +2205,9 @@ WB_ENTRY(jboolean, WB_CDSMemoryMappingFailed(JNIEnv* env, jobject wb))
 WB_END
 
 WB_ENTRY(jboolean, WB_IsSharedInternedString(JNIEnv* env, jobject wb, jobject str))
+  if (!HeapShared::is_loading_mapping_mode()) {
+    return false;
+  }
   ResourceMark rm(THREAD);
   oop str_oop = JNIHandles::resolve(str);
   int length;
@@ -2217,7 +2220,7 @@ WB_ENTRY(jboolean, WB_IsSharedClass(JNIEnv* env, jobject wb, jclass clazz))
 WB_END
 
 WB_ENTRY(jboolean, WB_AreSharedStringsMapped(JNIEnv* env))
-  return ArchiveHeapLoader::is_mapped();
+  return AOTMappedHeapLoader::is_mapped();
 WB_END
 
 WB_ENTRY(void, WB_LinkClass(JNIEnv* env, jobject wb, jclass clazz))
@@ -2230,7 +2233,7 @@ WB_ENTRY(void, WB_LinkClass(JNIEnv* env, jobject wb, jclass clazz))
 WB_END
 
 WB_ENTRY(jboolean, WB_AreOpenArchiveHeapObjectsMapped(JNIEnv* env))
-  return ArchiveHeapLoader::is_mapped();
+  return AOTMappedHeapLoader::is_mapped();
 WB_END
 
 WB_ENTRY(jboolean, WB_IsCDSIncluded(JNIEnv* env))
@@ -2260,10 +2263,21 @@ WB_ENTRY(jboolean, WB_IsJVMCISupportedByGC(JNIEnv* env))
 #endif
 WB_END
 
-WB_ENTRY(jboolean, WB_CanWriteJavaHeapArchive(JNIEnv* env))
+static bool canWriteJavaHeapArchive() {
   return !CDSConfig::are_vm_options_incompatible_with_dumping_heap();
+}
+
+WB_ENTRY(jboolean, WB_CanWriteJavaHeapArchive(JNIEnv* env))
+  return canWriteJavaHeapArchive();
 WB_END
 
+WB_ENTRY(jboolean, WB_CanWriteMappedJavaHeapArchive(JNIEnv* env))
+  return canWriteJavaHeapArchive() && !AOTStreamableObjects;
+WB_END
+
+WB_ENTRY(jboolean, WB_CanWriteStreamedJavaHeapArchive(JNIEnv* env))
+  return canWriteJavaHeapArchive() && AOTStreamableObjects;
+WB_END
 
 WB_ENTRY(jboolean, WB_IsJFRIncluded(JNIEnv* env))
 #if INCLUDE_JFR
@@ -3040,6 +3054,8 @@ static JNINativeMethod methods[] = {
   {CC"isC2OrJVMCIIncluded",               CC"()Z",    (void*)&WB_isC2OrJVMCIIncluded },
   {CC"isJVMCISupportedByGC",              CC"()Z",    (void*)&WB_IsJVMCISupportedByGC},
   {CC"canWriteJavaHeapArchive",           CC"()Z",    (void*)&WB_CanWriteJavaHeapArchive },
+  {CC"canWriteMappedJavaHeapArchive",     CC"()Z",    (void*)&WB_CanWriteMappedJavaHeapArchive },
+  {CC"canWriteStreamedJavaHeapArchive",   CC"()Z",    (void*)&WB_CanWriteStreamedJavaHeapArchive },
   {CC"cdsMemoryMappingFailed",            CC"()Z",    (void*)&WB_CDSMemoryMappingFailed },
 
   {CC"clearInlineCaches0",  CC"(Z)V",                 (void*)&WB_ClearInlineCaches },
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index f52be5d740e..28bc47c4c74 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -121,7 +121,7 @@ size_t      JavaThread::_stack_size_at_create = 0;
   #define HOTSPOT_THREAD_PROBE_stop HOTSPOT_THREAD_STOP
 
   #define DTRACE_THREAD_PROBE(probe, javathread)                           \
-    {                                                                      \
+    if (!javathread->is_aot_thread()) {                                    \
       ResourceMark rm(this);                                               \
       int len = 0;                                                         \
       const char* name = (javathread)->name();                             \
@@ -763,7 +763,7 @@ void JavaThread::run() {
 
 void JavaThread::thread_main_inner() {
   assert(JavaThread::current() == this, "sanity check");
-  assert(_threadObj.peek() != nullptr, "just checking");
+  assert(_threadObj.peek() != nullptr || is_aot_thread(), "just checking");
 
   // Execute thread entry point unless this thread has a pending exception.
   // Note: Due to JVMTI StopThread we can have pending exceptions already!
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 8274d767e4e..e4707a342a7 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -79,6 +79,7 @@ Monitor* CompileThread_lock           = nullptr;
 Monitor* Compilation_lock             = nullptr;
 Mutex*   CompileStatistics_lock       = nullptr;
 Mutex*   DirectivesStack_lock         = nullptr;
+Monitor* AOTHeapLoading_lock          = nullptr;
 Monitor* Terminator_lock              = nullptr;
 Monitor* InitCompleted_lock           = nullptr;
 Monitor* BeforeExit_lock              = nullptr;
@@ -330,7 +331,9 @@ void mutex_init() {
 
   MUTEX_DEFL(Threads_lock                   , PaddedMonitor, CompileThread_lock, true);
   MUTEX_DEFL(Compile_lock                   , PaddedMutex  , MethodCompileQueue_lock);
-  MUTEX_DEFL(JNICritical_lock               , PaddedMonitor, AdapterHandlerLibrary_lock); // used for JNI critical regions
+  MUTEX_DEFL(Module_lock                    , PaddedMutex  , AdapterHandlerLibrary_lock);
+  MUTEX_DEFL(AOTHeapLoading_lock            , PaddedMonitor, Module_lock);
+  MUTEX_DEFL(JNICritical_lock               , PaddedMonitor, AOTHeapLoading_lock); // used for JNI critical regions
   MUTEX_DEFL(Heap_lock                      , PaddedMonitor, JNICritical_lock);
 
   MUTEX_DEFL(PerfDataMemAlloc_lock          , PaddedMutex  , Heap_lock);
@@ -353,7 +356,6 @@ void mutex_init() {
     MUTEX_DEFL(PSOldGenExpand_lock          , PaddedMutex  , Heap_lock, true);
   }
 #endif
-  MUTEX_DEFL(Module_lock                    , PaddedMutex  ,  ClassLoaderDataGraph_lock);
   MUTEX_DEFL(SystemDictionary_lock          , PaddedMonitor, Module_lock);
 #if INCLUDE_JVMCI
   // JVMCIRuntime_lock must be acquired before JVMCI_lock to avoid deadlock
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 8cd408c99c9..74fe4650b7c 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -81,6 +81,7 @@ extern Monitor* TrainingReplayQueue_lock;        // a lock held when class are a
 extern Monitor* CompileTaskWait_lock;            // a lock held when CompileTasks are waited/notified
 extern Mutex*   CompileStatistics_lock;          // a lock held when updating compilation statistics
 extern Mutex*   DirectivesStack_lock;            // a lock held when mutating the dirstack and ref counting directives
+extern Monitor* AOTHeapLoading_lock;             // a lock used to guard materialization of AOT heap objects
 extern Monitor* Terminator_lock;                 // a lock used to guard termination of the vm
 extern Monitor* InitCompleted_lock;              // a lock used to signal threads waiting on init completed
 extern Monitor* BeforeExit_lock;                 // a lock used to guard cleanups and shutdown hooks
diff --git a/src/hotspot/share/runtime/safepointVerifiers.cpp b/src/hotspot/share/runtime/safepointVerifiers.cpp
index 00b55e7d25f..6eb61efe0ca 100644
--- a/src/hotspot/share/runtime/safepointVerifiers.cpp
+++ b/src/hotspot/share/runtime/safepointVerifiers.cpp
@@ -30,13 +30,19 @@
 
 #ifdef ASSERT
 
-NoSafepointVerifier::NoSafepointVerifier() : _thread(Thread::current()) {
+NoSafepointVerifier::NoSafepointVerifier(bool active) : _thread(Thread::current()), _active(active) {
+  if (!_active) {
+    return;
+  }
   if (_thread->is_Java_thread()) {
     JavaThread::cast(_thread)->inc_no_safepoint_count();
   }
 }
 
 NoSafepointVerifier::~NoSafepointVerifier() {
+  if (!_active) {
+    return;
+  }
   if (_thread->is_Java_thread()) {
     JavaThread::cast(_thread)->dec_no_safepoint_count();
   }
diff --git a/src/hotspot/share/runtime/safepointVerifiers.hpp b/src/hotspot/share/runtime/safepointVerifiers.hpp
index 62a1732803f..8d309a973d8 100644
--- a/src/hotspot/share/runtime/safepointVerifiers.hpp
+++ b/src/hotspot/share/runtime/safepointVerifiers.hpp
@@ -38,8 +38,9 @@ class NoSafepointVerifier : public StackObj {
 
  private:
   Thread *_thread;
+  bool _active;
  public:
-  NoSafepointVerifier()  NOT_DEBUG_RETURN;
+  explicit NoSafepointVerifier(bool active = true)  NOT_DEBUG_RETURN;
   ~NoSafepointVerifier() NOT_DEBUG_RETURN;
 };
 
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 4aa8c14056a..240821e90bd 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -313,6 +313,7 @@ class Thread: public ThreadShadow {
   virtual bool is_JfrRecorder_thread() const         { return false; }
   virtual bool is_AttachListener_thread() const      { return false; }
   virtual bool is_monitor_deflation_thread() const   { return false; }
+  virtual bool is_aot_thread() const                 { return false; }
 
   // Convenience cast functions
   CompilerThread* as_Compiler_thread() const {
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 10c3636273d..f7f755a37b3 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -27,7 +27,7 @@
 #include "cds/aotMetaspace.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/heapShared.hpp"
+#include "cds/heapShared.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/javaThreadStatus.hpp"
@@ -102,6 +102,7 @@
 #include "services/management.hpp"
 #include "services/threadIdTable.hpp"
 #include "services/threadService.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/macros.hpp"
@@ -383,6 +384,8 @@ void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) {
   initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK);
   initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK);
 
+  HeapShared::materialize_thread_object();
+
   // Phase 1 of the system initialization in the library, java.lang.System class initialization
   call_initPhase1(CHECK);
 
@@ -563,7 +566,8 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   // Initialize OopStorage for threadObj
   JavaThread::_thread_oop_storage = OopStorageSet::create_strong("Thread OopStorage", mtThread);
 
-  // Attach the main thread to this os thread
+  // Attach the main thread to this os thread. It is added to the threads list inside
+  // universe_init(), within init_globals().
   JavaThread* main_thread = new JavaThread();
   main_thread->set_thread_state(_thread_in_vm);
   main_thread->initialize_thread_current();
@@ -577,7 +581,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 
   // Set the _monitor_owner_id now since we will run Java code before the Thread instance
   // is even created. The same value will be assigned to the Thread instance on init.
-  main_thread->set_monitor_owner_id(ThreadIdentifier::next());
+  const int64_t main_thread_tid = ThreadIdentifier::next();
+  guarantee(main_thread_tid == 3, "Must equal the PRIMORDIAL_TID used in Threads.java");
+  main_thread->set_monitor_owner_id(main_thread_tid);
 
   if (!Thread::set_as_starting_thread(main_thread)) {
     vm_shutdown_during_initialization(
@@ -613,14 +619,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   // of hangs during error reporting.
   WatcherThread::start();
 
-  // Add main_thread to threads list to finish barrier setup with
-  // on_thread_attach.  Should be before starting to build Java objects in
-  // init_globals2, which invokes barriers.
-  {
-    MutexLocker mu(Threads_lock);
-    Threads::add(main_thread);
-  }
-
   status = init_globals2();
   if (status != JNI_OK) {
     Threads::remove(main_thread, false);
@@ -704,6 +702,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   // No more stub generation allowed after that point.
   StubCodeDesc::freeze();
 
+  // Prepare AOT heap loader for GC.
+  HeapShared::enable_gc();
+
 #ifdef ADDRESS_SANITIZER
   Asan::initialize();
 #endif
@@ -899,6 +900,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   //   take a while to process their first tick).
   WatcherThread::run_all_tasks();
 
+  // Finish materializing AOT objects
+  HeapShared::finish_materialize_objects();
+
   create_vm_timer.end();
 #ifdef ASSERT
   _vm_complete = true;
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index 22a8cd6e0ef..b54474ea6d6 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -581,12 +581,13 @@ inline void ExceptionMark::check_no_pending_exception() {
   }
 }
 
+extern bool is_vm_created();
 
 ExceptionMark::~ExceptionMark() {
   if (_thread->has_pending_exception()) {
     Handle exception(_thread, _thread->pending_exception());
     _thread->clear_pending_exception(); // Needed to avoid infinite recursion
-    if (is_init_completed()) {
+    if (is_vm_created()) {
       ResourceMark rm;
       exception->print();
       fatal("ExceptionMark destructor expects no pending exceptions");
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 1d2e651d674..9bdf4c2dd1f 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -615,7 +615,7 @@
 #define COMPILER_HEADER(basename)        XSTR(COMPILER_HEADER_STEM(basename).hpp)
 #define COMPILER_HEADER_INLINE(basename) XSTR(COMPILER_HEADER_STEM(basename).inline.hpp)
 
-#if INCLUDE_CDS && INCLUDE_G1GC && defined(_LP64)
+#if INCLUDE_CDS && defined(_LP64)
 #define INCLUDE_CDS_JAVA_HEAP 1
 #define CDS_JAVA_HEAP_ONLY(x) x
 #define NOT_CDS_JAVA_HEAP(x)
diff --git a/test/hotspot/jtreg/ProblemList-AotJdk.txt b/test/hotspot/jtreg/ProblemList-AotJdk.txt
index 8be9a73359d..af3994289df 100644
--- a/test/hotspot/jtreg/ProblemList-AotJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-AotJdk.txt
@@ -7,6 +7,7 @@ runtime/symbols/TestSharedArchiveConfigFile.java      0000000 generic-all
 gc/arguments/TestG1HeapSizeFlags.java                 0000000 generic-all
 gc/arguments/TestParallelHeapSizeFlags.java           0000000 generic-all
 gc/arguments/TestSerialHeapSizeFlags.java             0000000 generic-all
+gc/arguments/TestVerifyBeforeAndAfterGCFlags.java     0000000 generic-all
 
 gc/arguments/TestCompressedClassFlags.java            0000000 generic-all
 gc/TestAllocateHeapAtMultiple.java                    0000000 generic-all
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index df8c0183b33..c298a74dc25 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -85,6 +85,8 @@ requires.properties= \
     vm.cds.supports.aot.class.linking \
     vm.cds.supports.aot.code.caching \
     vm.cds.write.archived.java.heap \
+    vm.cds.write.mapped.java.heap \
+    vm.cds.write.streamed.java.heap \
     vm.continuations \
     vm.jvmti \
     vm.graal.enabled \
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 2f58670b90e..d4f1470aea5 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -313,7 +313,8 @@ tier3_gc_gcold = \
 tier1_gc_gcbasher = \
   gc/stress/gcbasher/TestGCBasherWithG1.java \
   gc/stress/gcbasher/TestGCBasherWithSerial.java \
-  gc/stress/gcbasher/TestGCBasherWithParallel.java
+  gc/stress/gcbasher/TestGCBasherWithParallel.java \
+  gc/stress/gcbasher/TestGCBasherWithZ.java
 
 tier1_gc_shenandoah = \
   gc/shenandoah/options/ \
diff --git a/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java b/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
index e1e29432f53..8e201fb6e8a 100644
--- a/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
+++ b/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
@@ -24,7 +24,7 @@
 package gc;
 
 /*
- * @test TestPLABAdaptToMinTLABSizeG1
+ * @test id=G1
  * @bug 8289137
  * @summary Make sure that Young/OldPLABSize adapt to MinTLABSize setting.
  * @requires vm.gc.G1
@@ -35,7 +35,7 @@ package gc;
  */
 
 /*
- * @test TestPLABAdaptToMinTLABSizeParallel
+ * @test id=Parallel
  * @bug 8289137
  * @summary Make sure that Young/OldPLABSize adapt to MinTLABSize setting.
  * @requires vm.gc.Parallel
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
index 4057dc0b9e8..310c090d017 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
@@ -33,7 +33,7 @@ import java.io.IOException;
  * @requires vm.gc.Z
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress ZGC
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx384m -server -XX:+UseZGC gc.stress.gcbasher.TestGCBasherWithZ 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx384m -XX:+UseZGC gc.stress.gcbasher.TestGCBasherWithZ 120000
  */
 
 /*
@@ -43,7 +43,7 @@ import java.io.IOException;
  * @requires vm.gc.Z
  * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
  * @summary Stress ZGC with nmethod barrier forced deoptimization enabled.
- * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx384m -server -XX:+UseZGC
+ * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx384m -XX:+UseZGC
  *   -XX:+UnlockDiagnosticVMOptions -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
  *   gc.stress.gcbasher.TestGCBasherWithZ 120000
  */
diff --git a/test/hotspot/jtreg/runtime/cds/AOTMapTest.java b/test/hotspot/jtreg/runtime/cds/AOTMapTest.java
index dff98090859..101e2ccc5d1 100644
--- a/test/hotspot/jtreg/runtime/cds/AOTMapTest.java
+++ b/test/hotspot/jtreg/runtime/cds/AOTMapTest.java
@@ -39,19 +39,27 @@ import java.util.ArrayList;
 
 public class AOTMapTest {
     public static void main(String[] args) throws Exception {
-        doTest(false);
+        doTest(false, false);
+        doTest(false, true);
 
         if (Platform.is64bit()) {
             // There's no oop/klass compression on 32-bit.
-            doTest(true);
+            doTest(true, false);
+            doTest(true, true);
         }
     }
 
-    public static void doTest(boolean compressed) throws Exception {
+    public static void doTest(boolean compressed, boolean streamHeap) throws Exception {
         ArrayList<String> vmArgs = new ArrayList<>();
 
         // Use the same heap size as make/Images.gmk
         vmArgs.add("-Xmx128M");
+        vmArgs.add("-XX:+UnlockDiagnosticVMOptions");
+        if (streamHeap) {
+            vmArgs.add("-XX:+AOTStreamableObjects");
+        } else {
+            vmArgs.add("-XX:-AOTStreamableObjects");
+        }
 
         if (Platform.is64bit()) {
             // These options are available only on 64-bit.
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStrings.java b/test/hotspot/jtreg/runtime/cds/SharedStrings.java
index d6741790ff3..db0bc3264b2 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedStrings.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedStrings.java
@@ -25,7 +25,7 @@
  * @test
  * @summary Check to make sure that shared strings in the bootstrap CDS archive
  *          are actually shared
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.write.mapped.java.heap
  * @requires vm.flagless
  * @library /test/lib
  * @build SharedStringsWb jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java
index c555268026d..da5025b07b5 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java
@@ -24,7 +24,7 @@
 /**
  * @test SharedStringsDedup
  * @summary Test -Xshare:auto with shared strings and -XX:+UseStringDeduplication
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/lib
  * @run driver SharedStringsDedup
  */
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java
index 271fb2ec255..5774d71d089 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java
@@ -24,7 +24,7 @@
 /**
  * @test SharedStringsAuto
  * @summary Test -Xshare:auto with shared strings.
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/lib
  * @run driver SharedStringsRunAuto
  */
diff --git a/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java b/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java
index e29bf18eb96..2db4ab2df23 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java
@@ -43,8 +43,9 @@ public class SharedSymbolTableBucketSize {
                                                + Integer.valueOf(bucket_size));
         CDSTestUtils.checkMappingFailure(output);
 
-        String s = output.firstMatch("Average bucket size     : .*");
-        Float f = Float.parseFloat(s.substring(25));
+        String regex = "Average bucket size     :     ([0-9]+\\.[0-9]+).*";
+        String s = output.firstMatch(regex, 1);
+        Float f = Float.parseFloat(s);
         int size = Math.round(f);
         if (size != bucket_size) {
             throw new Exception("FAILED: incorrect bucket size " + size +
diff --git a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
index 4bca1ed4581..acff3191300 100644
--- a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
+++ b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
@@ -55,6 +55,7 @@
  * @requires vm.cds.default.archive.available
  * @requires vm.cds.write.archived.java.heap
  * @requires vm.bits == 64
+ * @requires !vm.gc.Z
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -68,6 +69,7 @@
  * @requires vm.cds.default.archive.available
  * @requires vm.cds.write.archived.java.heap
  * @requires vm.bits == 64
+ * @requires !vm.gc.Z
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java
index be7e69b076c..1730b569548 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java
@@ -121,24 +121,23 @@ public class TestParallelGCWithCDS {
         out.shouldNotContain(errMsg);
         out.shouldHaveExitValue(0);
 
-        if (!dumpWithParallel && execWithParallel) {
-            // We dumped with G1, so we have an archived heap. At exec time, try to load them into
-            // a small ParallelGC heap that may be too small.
-            System.out.println("2. Exec with " + execGC);
-            out = TestCommon.exec(helloJar,
-                                    execGC,
-                                    small1,
-                                    small2,
-                                    "-Xmx4m",
-                                    coops,
-                                    "-Xlog:cds",
-                                    "Hello");
-            if (out.getExitValue() == 0) {
-                out.shouldContain(HELLO);
-                out.shouldNotContain(errMsg);
-            } else {
-                out.shouldNotHaveFatalError();
-            }
+        // Regardless of which GC dumped the heap, there will be an object archive, either
+        // created with mapping if dumped with G1, or streaming if dumped with parallel GC.
+        // At exec time, try to load them into a small ParallelGC heap that may be too small.
+        System.out.println("2. Exec with " + execGC);
+        out = TestCommon.exec(helloJar,
+                              execGC,
+                              small1,
+                              small2,
+                              "-Xmx4m",
+                              coops,
+                              "-Xlog:cds",
+                              "Hello");
+        if (out.getExitValue() == 0) {
+            out.shouldContain(HELLO);
+            out.shouldNotContain(errMsg);
+        } else {
+            out.shouldNotHaveFatalError();
         }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java
index 402ad0b8744..87fa01956c8 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java
@@ -140,9 +140,8 @@ public class TestSerialGCWithCDS {
         out.shouldNotContain(errMsg);
 
         int n = 2;
-        if (dumpWithSerial == false && execWithSerial == true) {
-            // We dumped with G1, so we have an archived heap. At exec time, try to load them into
-            // a small SerialGC heap that may be too small.
+        if (execWithSerial == true) {
+            // At exec time, try to load archived objects into a small SerialGC heap that may be too small.
             String[] sizes = {
                 "4m",   // usually this will success load the archived heap
                 "2m",   // usually this will fail to load the archived heap, but app can launch
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithAOTHeap.java b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithAOTHeap.java
new file mode 100644
index 00000000000..567c8da73cb
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithAOTHeap.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test Loading and writing AOT archived heap objects with ZGC
+ * @requires vm.cds
+ * @requires vm.gc.Z
+ * @requires vm.gc.G1
+ *
+ * @comment don't run this test if any -XX::+Use???GC options are specified, since they will
+ *          interfere with the test.
+ * @requires vm.gc == null
+ *
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile test-classes/Hello.java
+ * @run driver TestZGCWithAOTHeap
+ */
+
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestZGCWithAOTHeap {
+    public final static String HELLO = "Hello World";
+    static String helloJar;
+
+    public static void main(String... args) throws Exception {
+        helloJar = JarBuilder.build("hello", "Hello");
+
+        // Check if we can use ZGC during dump time, or run time, or both.
+        test(false, true, true, true);
+        test(true,  false, true, true);
+        test(true, true, true, true);
+        test(false, true, false, true);
+        test(false, true, true, false);
+        test(true,  false, true, false);
+        test(true, true, true, false);
+        test(false, true, false, false);
+    }
+
+    final static String G1 = "-XX:+UseG1GC";
+    final static String Z = "-XX:+UseZGC";
+
+    static void test(boolean dumpWithZ, boolean execWithZ, boolean shouldStream, boolean shouldUseCOH) throws Exception {
+        String unlockDiagnostic = "-XX:+UnlockDiagnosticVMOptions";
+        String dumpGC = dumpWithZ ? Z : G1;
+        String execGC = execWithZ ? Z : G1;
+        String generalErrMsg = "Cannot use CDS heap data.";
+        String coopsErrMsg = generalErrMsg + " Selected GC not compatible -XX:-UseCompressedOops";
+        String coops = "-XX:-UseCompressedOops";
+        String coh = shouldUseCOH ? "-XX:+UseCompactObjectHeaders" : "-XX:-UseCompactObjectHeaders";
+        String stream = shouldStream ? "-XX:+AOTStreamableObjects" : "-XX:-AOTStreamableObjects";
+        String eagerLoading = "-XX:+AOTEagerlyLoadObjects";
+        OutputAnalyzer out;
+
+        System.out.println("0. Dump with " + dumpGC + ", " + coops + ", " + coh + ", " + stream);
+        out = TestCommon.dump(helloJar,
+                              new String[] {"Hello"},
+                              dumpGC,
+                              coops,
+                              coh,
+                              "-XX:+UnlockDiagnosticVMOptions",
+                              stream,
+                              "-Xlog:cds,aot,aot+heap");
+        out.shouldContain("Dumping shared data to file:");
+        out.shouldHaveExitValue(0);
+
+        System.out.println("1. Exec with " + execGC + ", " + coops + ", " + coh);
+        out = TestCommon.exec(helloJar,
+                              unlockDiagnostic,
+                              execGC,
+                              coops,
+                              coh,
+                              "-Xlog:cds,aot,aot+heap",
+                              "Hello");
+        if (!shouldStream && execWithZ) {
+            // Only when dumping without streaming and executing with ZGC do we expect there
+            // to be a problem. With -XX:+AOTClassLinking, the problem is worse.
+            if (out.getExitValue() == 0) {
+                out.shouldContain(HELLO);
+                out.shouldContain(generalErrMsg);
+            } else {
+                out.shouldHaveExitValue(1);
+            }
+        } else {
+            out.shouldContain(HELLO);
+            out.shouldNotContain(generalErrMsg);
+            out.shouldHaveExitValue(0);
+        }
+
+        // Regardless of which GC dumped the heap, there will be an object archive, either
+        // created with mapping if dumped with G1, or streaming if dumped with parallel GC.
+        // At exec time, try to load them into a small ZGC heap that may be too small.
+        System.out.println("2. Exec with " + execGC + ", " + coops + ", " + coh);
+        out = TestCommon.exec(helloJar,
+                              unlockDiagnostic,
+                              execGC,
+                              "-Xmx4m",
+                              coops,
+                              coh,
+                              "-Xlog:cds,aot,aot+heap",
+                              "Hello");
+        if (out.getExitValue() == 0) {
+            if (!shouldStream && execWithZ) {
+                out.shouldContain(coopsErrMsg);
+            } else {
+                out.shouldNotContain(generalErrMsg);
+            }
+        } else {
+            out.shouldHaveExitValue(1);
+        }
+        out.shouldNotHaveFatalError();
+
+        if (shouldStream) {
+            System.out.println("3. Exec with " + execGC + ", " + coops + ", " + coh + ", " + eagerLoading);
+            out = TestCommon.exec(helloJar,
+                                  unlockDiagnostic,
+                                  execGC,
+                                  coops,
+                                  coh,
+                                  eagerLoading,
+                                  "-Xlog:cds,aot,aot+heap",
+                                  "Hello");
+            if (!shouldStream && execWithZ) {
+                // Only when dumping without streaming and executing with ZGC do we expect there
+                // to be a problem. With -XX:+AOTClassLinking, the problem is worse.
+                if (out.getExitValue() == 0) {
+                    out.shouldContain(HELLO);
+                    out.shouldContain(generalErrMsg);
+                } else {
+                    out.shouldHaveExitValue(1);
+                }
+            } else {
+                out.shouldContain(HELLO);
+                out.shouldNotContain(generalErrMsg);
+                out.shouldHaveExitValue(0);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java
deleted file mode 100644
index a7c7362b845..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * @test
- * @summary -XX:AOTMode=create should be compatible with ZGC
- * @bug 8352775
- * @requires vm.cds
- * @requires vm.gc.Z
- * @library /test/lib
- * @build AOTCacheWithZGC
- * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar AOTCacheWithZGCApp
- * @run driver AOTCacheWithZGC
- */
-
-import jdk.test.lib.cds.SimpleCDSAppTester;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class AOTCacheWithZGC {
-    public static void main(String... args) throws Exception {
-        SimpleCDSAppTester.of("AOTCacheWithZGC")
-            .addVmArgs("-XX:+UseZGC", "-Xlog:cds", "-Xlog:aot")
-            .classpath("app.jar")
-            .appCommandLine("AOTCacheWithZGCApp")
-            .setProductionChecker((OutputAnalyzer out) -> {
-                    // AOT-linked classes required cached Java heap objects, which is not
-                    // yet supported by ZGC.
-                    out.shouldContain("Using AOT-linked classes: false");
-                })
-            .runAOTWorkflow();
-    }
-}
-
-class AOTCacheWithZGCApp {
-    public static void main(String[] args) {
-
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
index e1d132dd984..09290960d2f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
@@ -27,6 +27,8 @@
  * @summary Sanity test of AOT Code Cache with compressed oops configurations
  * @requires vm.cds.supports.aot.code.caching
  * @requires vm.compMode != "Xcomp"
+ * @requires vm.bits == 64
+ * @requires vm.opt.final.UseCompressedOops
  * @comment The test verifies AOT checks during VM startup and not code generation.
  *          No need to run it with -Xcomp. It takes a lot of time to complete all
  *          subtests with this flag.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
index b92940c7f5e..8b18876aeb4 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
@@ -28,9 +28,11 @@
  * @requires vm.cds.write.archived.java.heap
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @compile --add-exports java.base/jdk.internal.misc=ALL-UNNAMED CheckIntegerCacheApp.java ArchivedIntegerHolder.java
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar WhiteBox.jar jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boxCache.jar CheckIntegerCacheApp
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boxCache-boot.jar ArchivedIntegerHolder
- * @run driver ArchivedIntegerCacheTest
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:./WhiteBox.jar ArchivedIntegerCacheTest
  */
 
 import java.nio.file.Files;
@@ -39,8 +41,10 @@ import java.nio.file.Paths;
 import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.whitebox.WhiteBox;
 
 public class ArchivedIntegerCacheTest {
+    private static WhiteBox WB = WhiteBox.getWhiteBox();
 
     public static String[] mixArgs(String... args) {
         String bootJar = ClassFileInstaller.getJarPath("boxCache-boot.jar");
@@ -133,7 +137,9 @@ public class ArchivedIntegerCacheTest {
                         "-Xlog:cds+heap=info",
                         "-Xlog:gc+region+cds",
                         "-Xlog:gc+region=trace"));
-        TestCommon.checkDump(output,
-            "Cannot archive the sub-graph referenced from [Ljava.lang.Integer; object");
+        if (WB.canWriteMappedJavaHeapArchive()) {
+            // The mapping AOT heap archiving mechanism is unable to cache larger objects.
+            TestCommon.checkDump(output, "Cannot archive the sub-graph referenced from [Ljava.lang.Integer; object");
+        }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java
index e44d02118c9..bc208fd3df9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java
@@ -37,7 +37,7 @@
  *                 jdk.test.lib.classloader.ClassUnloadCommon$TestFailure
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello_custom.jar CustomLoadee
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar WhiteBox.jar jdk.test.whitebox.WhiteBox
- * @run driver PrintSharedArchiveAndExit
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:./WhiteBox.jar PrintSharedArchiveAndExit
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
@@ -45,6 +45,8 @@ import jdk.test.lib.helpers.ClassFileInstaller;
 import jdk.test.whitebox.WhiteBox;
 
 public class PrintSharedArchiveAndExit {
+    private static WhiteBox WB = WhiteBox.getWhiteBox();
+
     public static void main(String[] args) throws Exception {
         run();
     }
@@ -82,7 +84,11 @@ public class PrintSharedArchiveAndExit {
               .shouldContain("Shared Builtin Dictionary")
               .shouldContain("Shared Unregistered Dictionary")
               .shouldMatch("Number of shared symbols: \\d+")
-              .shouldMatch("Number of shared strings: \\d+")
               .shouldMatch("VM version: .*");
+
+        if (WB.canWriteMappedJavaHeapArchive()) {
+            // With the mapping object dumper, the string table is dumped.
+            output.shouldMatch("Number of shared strings: \\d+");
+        }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java
index a9e616021da..13fa84ac205 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java
@@ -43,8 +43,11 @@ import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.helpers.ClassFileInstaller;
 
+import jdk.test.whitebox.WhiteBox;
+
 public class PrintSharedArchiveAndExit extends DynamicArchiveTestBase {
     private static final String ARCHIVE_NAME = CDSTestUtils.getOutputFileName("top.jsa");
+    private static final WhiteBox WB = WhiteBox.getWhiteBox();
 
     public static void main(String... args) throws Exception {
         runTest(PrintSharedArchiveAndExit::testPrtNExit);
@@ -92,8 +95,11 @@ public class PrintSharedArchiveAndExit extends DynamicArchiveTestBase {
                       .shouldContain("Shared Builtin Dictionary")
                       .shouldContain("Shared Unregistered Dictionary")
                       .shouldMatch("Number of shared symbols: \\d+")
-                      .shouldMatch("Number of shared strings: \\d+")
                       .shouldMatch("VM version: .*");
-                });
+                if (WB.canWriteMappedJavaHeapArchive()) {
+                      // With the mapping object archiving mechanism, the string table is dumped
+                      output.shouldMatch("Number of shared strings: \\d+");
+                }
+            });
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
index 0668ebfa300..7cad887a5d9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
@@ -25,8 +25,7 @@
 /*
  * @test
  * @summary Exercise GC with shared strings
- * @requires vm.cds.write.archived.java.heap
- * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
  * @build HelloStringGC jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
index 18bcf6da79c..0f0820aaa34 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
@@ -25,8 +25,7 @@
 /**
  * @test
  * @summary Test relevant combinations of command line flags with shared strings
- * @requires vm.cds.write.archived.java.heap & vm.hasJFR
- * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap & vm.hasJFR
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @build HelloString
  * @run driver FlagCombo
@@ -36,8 +35,7 @@
  * @test
  * @summary Test relevant combinations of command line flags with shared strings
  * @comment A special test excluding the case that requires JFR
- * @requires vm.cds.write.archived.java.heap & !vm.hasJFR
- * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap & !vm.hasJFR
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @build HelloString
  * @run driver FlagCombo noJfr
@@ -53,7 +51,7 @@ public class FlagCombo {
         SharedStringsUtils.dump(TestCommon.list("HelloString"),
             "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
 
-        SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseG1GC");
+        SharedStringsUtils.runWithArchive("HelloString");
 
         if (args.length == 0) {
             SharedStringsUtils.runWithArchiveAuto("HelloString",
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
index 527c0043a6f..ddbfe2ed862 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
@@ -100,8 +100,12 @@ public class IncompatibleOptions {
 
         // Uncompressed OOPs
         testDump(1, "-XX:+UseG1GC", "-XX:-UseCompressedOops", null, false);
+        testExec(1, "-XX:+UseG1GC", "-XX:-UseCompressedOops", null, false);
+
+        // Try with ZGC
         if (GC.Z.isSupported()) {
-            testDump(1, "-XX:+UseZGC", "-XX:-UseCompressedOops", null, false);
+            testDump(2, "-XX:+UseZGC", "-XX:-UseCompressedOops", null, false);
+            testExec(2, "-XX:+UseZGC", "-XX:-UseCompressedOops", null, false);
         }
 
         // Dump heap objects with Parallel, Serial, Shenandoah GC
@@ -112,39 +116,62 @@ public class IncompatibleOptions {
         }
 
         // Explicitly archive with compressed oops, run without.
-        testDump(5, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, false);
-        testExec(5, "-XX:+UseG1GC", "-XX:-UseCompressedOops",
-                 COMPRESSED_OOPS_NOT_CONSISTENT, true);
+        testDump(3, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, false);
+        testExec(3, "-XX:+UseG1GC", "-XX:-UseCompressedOops", COMPRESSED_OOPS_NOT_CONSISTENT, true);
 
         // NOTE: No warning is displayed, by design
         // Still run, to ensure no crash or exception
-        testExec(6, "-XX:+UseParallelGC", "", "", false);
-        testExec(7, "-XX:+UseSerialGC", "", "", false);
+        testExec(3, "-XX:+UseParallelGC", "", "", false);
+        testExec(3, "-XX:+UseSerialGC", "", "", false);
+
+        // Explicitly archive with object streaming with one GC, run with other GCs.
+        testDump(4, "-XX:+UseG1GC", "-XX:+AOTStreamableObjects", null, false);
+        testExec(4, "-XX:+UseParallelGC", "", "", false);
+        testExec(4, "-XX:+UseSerialGC", "", "", false);
+
+        if (GC.Z.isSupported()) {
+            testExec(4, "-XX:+UseZGC", "", COMPRESSED_OOPS_NOT_CONSISTENT, true);
+        }
+
+        // Explicitly archive with object streaming and COOPs with one GC, run with other GCs.
+        testDump(4, "-XX:-UseCompressedOops", "-XX:+AOTStreamableObjects", null, false);
+        testExec(4, "-XX:+UseG1GC", "", COMPRESSED_OOPS_NOT_CONSISTENT, true);
+        testExec(4, "-XX:+UseParallelGC", "", COMPRESSED_OOPS_NOT_CONSISTENT, true);
+        testExec(4, "-XX:+UseSerialGC", "", COMPRESSED_OOPS_NOT_CONSISTENT, true);
+
+        testExec(4, "-XX:+UseParallelGC", "-XX:-UseCompressedOops", "", false);
+        testExec(4, "-XX:+UseSerialGC", "-XX:-UseCompressedOops", "", false);
+        testExec(4, "-XX:+UseG1GC", "-XX:-UseCompressedOops", "", false);
 
         // Test various oops encodings, by varying ObjectAlignmentInBytes and heap sizes
-        testDump(9, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=8", null, false);
-        testExec(9, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=16",
-                 OBJ_ALIGNMENT_MISMATCH, true);
+        testDump(5, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=8", null, false);
+        testExec(5, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=16", OBJ_ALIGNMENT_MISMATCH, true);
+
+        testDump(6, "-XX:+AOTStreamableObjects", "-XX:ObjectAlignmentInBytes=8", null, false);
+        testExec(6, "-XX:+AOTStreamableObjects", "-XX:ObjectAlignmentInBytes=16", OBJ_ALIGNMENT_MISMATCH, true);
 
         // Implicitly archive with compressed oops, run without.
         // Max heap size for compressed oops is around 31G.
         // UseCompressedOops is turned on by default when heap
         // size is under 31G, but will be turned off when heap
         // size is greater than that.
-        testDump(10, "-XX:+UseG1GC", "-Xmx1g", null, false);
-        testExec(10, "-XX:+UseG1GC", "-Xmx32g", null, true);
+        testDump(7, "-XX:+UseG1GC", "-Xmx1g", null, false);
+        testExec(7, "-XX:+UseG1GC", "-Xmx32g", null, true);
         // Explicitly archive without compressed oops and run with.
-        testDump(11, "-XX:+UseG1GC", "-XX:-UseCompressedOops", null, false);
-        testExec(11, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, true);
+        testDump(8, "-XX:+UseG1GC", "-XX:-UseCompressedOops", null, false);
+        testExec(8, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, true);
         // Implicitly archive without compressed oops and run with.
-        testDump(12, "-XX:+UseG1GC", "-Xmx32G", null, false);
-        testExec(12, "-XX:+UseG1GC", "-Xmx1G", null, true);
+        testDump(9, "-XX:+UseG1GC", "-Xmx32G", null, false);
+        testExec(9, "-XX:+UseG1GC", "-Xmx1G", null, true);
         // CompactStrings must match between dump time and run time
-        testDump(13, "-XX:+UseG1GC", "-XX:-CompactStrings", null, false);
-        testExec(13, "-XX:+UseG1GC", "-XX:+CompactStrings",
+        testDump(10, "-XX:+UseG1GC", "-XX:-CompactStrings", null, false);
+        testExec(10, "-XX:+UseG1GC", "-XX:+CompactStrings",
                  COMPACT_STRING_MISMATCH, true);
-        testDump(14, "-XX:+UseG1GC", "-XX:+CompactStrings", null, false);
-        testExec(14, "-XX:+UseG1GC", "-XX:-CompactStrings",
+        testDump(11, "-XX:+UseG1GC", "-XX:+CompactStrings", null, false);
+        testExec(11, "-XX:+UseG1GC", "-XX:-CompactStrings",
+                 COMPACT_STRING_MISMATCH, true);
+        testDump(11, "-XX:+AOTStreamableObjects", "-XX:+CompactStrings", null, false);
+        testExec(11, "-XX:+AOTStreamableObjects", "-XX:-CompactStrings",
                  COMPACT_STRING_MISMATCH, true);
     }
 
@@ -154,6 +181,7 @@ public class IncompatibleOptions {
         System.out.println("Testcase: " + testCaseNr);
         OutputAnalyzer output = TestCommon.dump(appJar, TestCommon.list("Hello"),
             TestCommon.concat(vmOptionsPrefix,
+                "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:+UseCompressedOops",
                 collectorOption,
                 "-XX:SharedArchiveConfigFile=" + TestCommon.getSourceFile("SharedStringsBasic.txt"),
@@ -181,11 +209,13 @@ public class IncompatibleOptions {
         if (!extraOption.isEmpty()) {
             output = TestCommon.exec(appJar,
                 TestCommon.concat(vmOptionsPrefix,
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UseCompressedOops",
                     collectorOption, "-Xlog:cds", extraOption, "HelloString"));
         } else {
             output = TestCommon.exec(appJar,
                 TestCommon.concat(vmOptionsPrefix,
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UseCompressedOops",
                     collectorOption, "-Xlog:cds", "HelloString"));
         }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
index ed8e582b213..89136ebdc4d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
@@ -25,8 +25,8 @@
 /*
  * @test
  * @summary Test shared strings together with string intern operation
- * @requires vm.cds.write.archived.java.heap
  * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
  * @compile InternStringTest.java
  * @build jdk.test.whitebox.WhiteBox
@@ -34,6 +34,10 @@
  * @run driver InternSharedString
  */
 
+// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
+// about using the mechanism for dumping the entire string table, which the streaming solution
+// does not do.
+
 public class InternSharedString {
     public static void main(String[] args) throws Exception {
         SharedStringsUtils.run(args, InternSharedString::test);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
index f431dd6e807..bab63d099c9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
@@ -25,8 +25,7 @@
 /*
  * @test
  * @summary Basic shared string test with large pages
- * @requires vm.cds.write.archived.java.heap
- * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @build HelloString
  * @run driver LargePages
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java
index f746e2c0e73..7de1c48df2a 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java
@@ -25,7 +25,7 @@
 /*
  * @test
  * @summary Basic test for shared strings
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
  * @build HelloString
  * @run driver SharedStringsBasic
@@ -33,6 +33,10 @@
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;
 
+// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
+// about using the mechanism for dumping the entire string table, which the streaming solution
+// does not do.
+
 // This test does not use SharedStringsUtils.dumpXXX()
 // and SharedStringsUtils.runWithXXX() intentionally:
 // - in order to demonstrate the basic use of the functionality
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
index dacf74ebe3a..6145ea7719b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
@@ -25,14 +25,17 @@
 /*
  * @test
  * @summary Basic plus test for shared strings
- * @requires vm.cds.write.archived.java.heap
- * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
  * @build HelloStringPlus jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver SharedStringsBasicPlus
  */
 
+// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
+// about using the mechanism for dumping the entire string table, which the streaming solution
+// does not do.
+
 public class SharedStringsBasicPlus {
     public static void main(String[] args) throws Exception {
         SharedStringsUtils.run(args, SharedStringsBasicPlus::test);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
index 05519e1f4dd..cc470eb68d0 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
@@ -26,7 +26,7 @@
  * @test
  * @summary Use a shared string allocated in a humongous G1 region.
  * @comment -- the following implies that G1 is used (by command-line or by default)
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.write.mapped.java.heap
  * @requires vm.gc.G1
  *
  * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
@@ -35,6 +35,11 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. SharedStringsHumongous
  */
+
+// The problem with humongous strings, or humongous objects in general, does not
+// exist with the streaming heap loader. Therefore, this test requres the mapping mode.
+// Further more, humongous regions are a bit specific to G1, so G1 is needed.
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
index 1114870d1d3..c51a67c445b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
@@ -25,11 +25,16 @@
 /*
  * @test
  * @summary Write a lots of shared strings.
- * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
  * @build HelloString
  * @run driver/timeout=2600 SharedStringsStress
  */
+
+// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
+// about using the mechanism for dumping the entire string table, which the streaming solution
+// does not do.
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
index 181f23d8396..2b2e1194c63 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
@@ -96,7 +96,7 @@ public class SharedStringsUtils {
 
         String appJar = TestCommon.getTestJar(TEST_JAR_NAME_FULL);
         String[] args =
-            TestCommon.concat(extraOptions, "-XX:+UseCompressedOops",
+            TestCommon.concat(extraOptions,
             "-XX:SharedArchiveConfigFile=" +
             TestCommon.getSourceFile(sharedDataFile));
         args = TestCommon.concat(childVMOptionsPrefix, args);
@@ -124,7 +124,7 @@ public class SharedStringsUtils {
 
         String appJar = TestCommon.getTestJar(TEST_JAR_NAME_FULL);
         String[] args = TestCommon.concat(extraOptions,
-            "-cp", appJar, "-XX:+UseCompressedOops", className);
+            "-cp", appJar, className);
         args = TestCommon.concat(childVMOptionsPrefix, args);
 
         OutputAnalyzer output = TestCommon.execAuto(args);
@@ -142,8 +142,7 @@ public class SharedStringsUtils {
         String className, String... extraOptions) throws Exception {
 
         String appJar = TestCommon.getTestJar(TEST_JAR_NAME_FULL);
-        String[] args = TestCommon.concat(extraOptions,
-            "-XX:+UseCompressedOops", className);
+        String[] args = TestCommon.concat(extraOptions, className);
         args = TestCommon.concat(childVMOptionsPrefix, args);
 
         OutputAnalyzer output = TestCommon.exec(appJar, args);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
index 95ea1cf9bb0..20dbad30441 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
@@ -25,14 +25,17 @@
 /*
  * @test
  * @summary White box test for shared strings
- * @requires vm.cds.write.archived.java.heap
- * @requires vm.gc == null
+ * @requires vm.cds.write.mapped.java.heap
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @build jdk.test.whitebox.WhiteBox SharedStringsWb
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver SharedStringsWbTest
  */
 
+// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
+// about using the mechanism for dumping the entire string table, which the streaming solution
+// does not do.
+
 import java.io.*;
 import jdk.test.whitebox.WhiteBox;
 
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
index 4452abe3cc0..2c74eab945e 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
@@ -34,7 +34,7 @@ import jtreg.SkippedException;
  * @requires vm.hasSA
  * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
- * @run main/othervm/timeout=2400 -Xmx1g ClhsdbPrintAll
+ * @run main/othervm/timeout=2400 -Xmx2g ClhsdbPrintAll
  */
 
 public class ClhsdbPrintAll {
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index c7605946a5f..f22b316e19a 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -100,6 +100,8 @@ requires.properties= \
     vm.compiler2.enabled \
     vm.cds \
     vm.cds.write.archived.java.heap \
+    vm.cds.write.mapped.java.heap \
+    vm.cds.write.streamed.java.heap \
     vm.continuations \
     vm.musl \
     vm.asan \
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 3c06c97b37a..dbc7a916885 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -126,6 +126,8 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("vm.cds.supports.aot.class.linking", this::vmCDSSupportsAOTClassLinking);
         map.put("vm.cds.supports.aot.code.caching", this::vmCDSSupportsAOTCodeCaching);
         map.put("vm.cds.write.archived.java.heap", this::vmCDSCanWriteArchivedJavaHeap);
+        map.put("vm.cds.write.mapped.java.heap", this::vmCDSCanWriteMappedArchivedJavaHeap);
+        map.put("vm.cds.write.streamed.java.heap", this::vmCDSCanWriteStreamedArchivedJavaHeap);
         map.put("vm.continuations", this::vmContinuations);
         // vm.graal.enabled is true if Graal is used as JIT
         map.put("vm.graal.enabled", this::isGraalEnabled);
@@ -485,11 +487,28 @@ public class VMProps implements Callable<Map<String, String>> {
     /**
      * @return true if it's possible for "java -Xshare:dump" to write Java heap objects
      *         with the current set of jtreg VM options. For example, false will be returned
-     *         if -XX:-UseCompressedClassPointers is specified,
+     *         if -XX:-UseCompressedClassPointers is specified.
      */
     protected String vmCDSCanWriteArchivedJavaHeap() {
-        return "" + ("true".equals(vmCDS()) && WB.canWriteJavaHeapArchive()
-                     && isCDSRuntimeOptionsCompatible());
+        return "" + ("true".equals(vmCDS()) && WB.canWriteJavaHeapArchive());
+    }
+
+    /**
+     * @return true if it's possible for "java -Xshare:dump" to write Java heap objects
+     *         with the current set of jtreg VM options. For example, false will be returned
+     *         if -XX:-UseCompressedClassPointers is specified.
+     */
+    protected String vmCDSCanWriteMappedArchivedJavaHeap() {
+        return "" + ("true".equals(vmCDS()) && WB.canWriteMappedJavaHeapArchive());
+    }
+
+    /**
+     * @return true if it's possible for "java -Xshare:dump" to write Java heap objects
+     *         with the current set of jtreg VM options. For example, false will be returned
+     *         if -XX:-UseCompressedClassPointers is specified.
+     */
+    protected String vmCDSCanWriteStreamedArchivedJavaHeap() {
+        return "" + ("true".equals(vmCDS()) && WB.canWriteStreamedJavaHeapArchive());
     }
 
     /**
@@ -514,31 +533,6 @@ public class VMProps implements Callable<Map<String, String>> {
       }
     }
 
-    /**
-     * @return true if the VM options specified via the "test.cds.runtime.options"
-     * property is compatible with writing Java heap objects into the CDS archive
-     */
-    protected boolean isCDSRuntimeOptionsCompatible() {
-        String jtropts = System.getProperty("test.cds.runtime.options");
-        if (jtropts == null) {
-            return true;
-        }
-        String CCP_DISABLED = "-XX:-UseCompressedClassPointers";
-        String G1GC_ENABLED = "-XX:+UseG1GC";
-        String PARALLELGC_ENABLED = "-XX:+UseParallelGC";
-        String SERIALGC_ENABLED = "-XX:+UseSerialGC";
-        for (String opt : jtropts.split(",")) {
-            if (opt.equals(CCP_DISABLED)) {
-                return false;
-            }
-            if (opt.startsWith(GC_PREFIX) && opt.endsWith(GC_SUFFIX) &&
-                !opt.equals(G1GC_ENABLED) && !opt.equals(PARALLELGC_ENABLED) && !opt.equals(SERIALGC_ENABLED)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     /**
      * @return "true" if this VM supports continuations.
      */
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 558feeec78f..5741745e064 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -799,6 +799,8 @@ public class WhiteBox {
   public native boolean isJFRIncluded();
   public native boolean isDTraceIncluded();
   public native boolean canWriteJavaHeapArchive();
+  public native boolean canWriteMappedJavaHeapArchive();
+  public native boolean canWriteStreamedJavaHeapArchive();
   public native void    linkClass(Class<?> c);
   public native boolean areOpenArchiveHeapObjectsMapped();
 

From 354910381a9319723d43a6182269b5449c02a527 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 7 Nov 2025 17:48:27 +0000
Subject: [PATCH 085/512] 8353755: Add a helper method to Util -
 findComponent()

Reviewed-by: aivanov, tr
---
 test/jdk/javax/swing/regtesthelpers/Util.java | 68 ++++++++++++++-----
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/test/jdk/javax/swing/regtesthelpers/Util.java b/test/jdk/javax/swing/regtesthelpers/Util.java
index 5f81384028e..ddbf32f938d 100644
--- a/test/jdk/javax/swing/regtesthelpers/Util.java
+++ b/test/jdk/javax/swing/regtesthelpers/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,32 @@
  * questions.
  */
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.function.Predicate;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+
+import static javax.swing.SwingUtilities.isEventDispatchThread;
 
 /**
  * <p>This class contains utilities useful for regression testing.
@@ -123,26 +141,44 @@ public class Util {
     }
 
     /**
-     * Find a sub component by class name.
-     * Always run this method on the EDT thread
+     * Find a subcomponent by class name.
      */
     public static Component findSubComponent(Component parent, String className) {
-        String parentClassName = parent.getClass().getName();
+        return findComponent((Container) parent,
+                             c -> c.getClass()
+                                   .getName()
+                                   .contains(className));
+    }
 
-        if (parentClassName.contains(className)) {
-            return parent;
+    /**
+     * Find a component based on predicate.
+     */
+    public static Component findComponent(final Container container,
+                                          final Predicate<Component> predicate) {
+        try {
+            if (isEventDispatchThread()) {
+                return findComponentImpl(container, predicate);
+            } else {
+                return Util.invokeOnEDT(() -> findComponentImpl(container, predicate));
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Error occurred while finding component", e);
         }
+    }
 
-        if (parent instanceof Container) {
-            for (Component child : ((Container) parent).getComponents()) {
-                Component subComponent = findSubComponent(child, className);
-
-                if (subComponent != null) {
-                    return subComponent;
+    private static Component findComponentImpl(final Container container,
+                                               final Predicate<Component> predicate) {
+        for (Component child : container.getComponents()) {
+            if (predicate.test(child)) {
+                return child;
+            }
+            if (child instanceof Container cont && cont.getComponentCount() > 0) {
+                Component result = findComponentImpl(cont, predicate);
+                if (result != null) {
+                    return result;
                 }
             }
         }
-
         return null;
     }
 

From a90fc2661a7c11077ea17d37563dfb3dfba28016 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Fri, 7 Nov 2025 17:48:49 +0000
Subject: [PATCH 086/512] 8371421: [AIX] new test ProcessCloseTest fails

Reviewed-by: mdoerr
---
 test/jdk/java/lang/Process/ProcessCloseTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/lang/Process/ProcessCloseTest.java b/test/jdk/java/lang/Process/ProcessCloseTest.java
index 3e4040b62f1..13fe8446f46 100644
--- a/test/jdk/java/lang/Process/ProcessCloseTest.java
+++ b/test/jdk/java/lang/Process/ProcessCloseTest.java
@@ -117,8 +117,8 @@ public class ProcessCloseTest {
                                 ProcessCommand.STDOUT_CLOSE,
                                 ExitStatus.NORMAL),
                         List.of(ExitStatus.NORMAL)),
-                Arguments.of(List.of(CAT_PROGRAM, "NoSuchFile.txt"),
-                        List.of(ProcessCommand.STDERR_PRINT_ALL_LINES,
+                Arguments.of(javaArgs(ChildCommand.STDERR_MARCO, ChildCommand.PROCESS_EXIT1),
+                        List.of(ProcessCommand.STDERR_EXPECT_POLO,
                                 ProcessCommand.STDOUT_EXPECT_EMPTY),
                         List.of(ExitStatus.FAIL)),
                 Arguments.of(javaArgs(ChildCommand.STDOUT_MARCO),

From 9bc23608fb5719c3e977b5839efed5bc3f64a268 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 7 Nov 2025 18:41:43 +0000
Subject: [PATCH 087/512] 8371364: Refactor
 javax/swing/JFileChooser/FileSizeCheck.java to use Util.findComponent()

Reviewed-by: aivanov
---
 .../swing/JFileChooser/FileSizeCheck.java     | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/test/jdk/javax/swing/JFileChooser/FileSizeCheck.java b/test/jdk/javax/swing/JFileChooser/FileSizeCheck.java
index 056ce38a098..6d92032e0d1 100644
--- a/test/jdk/javax/swing/JFileChooser/FileSizeCheck.java
+++ b/test/jdk/javax/swing/JFileChooser/FileSizeCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Predicate;
 
 import javax.swing.AbstractButton;
 import javax.swing.JFileChooser;
@@ -52,6 +51,8 @@ import javax.swing.WindowConstants;
  * @requires (os.family == "linux")
  * @summary Verifies if the size of an empty file is shown as 0.0 KB
  *          as well as checks the displayed file sizes are rounded up
+ * @library /javax/swing/regtesthelpers
+ * @build Util
  * @run main FileSizeCheck
  */
 public class FileSizeCheck {
@@ -228,31 +229,15 @@ public class FileSizeCheck {
     }
 
     private static AbstractButton findDetailsButton(final Container container) {
-        Component result = findComponent(container,
+        Component result = Util.findComponent(container,
                 c -> c instanceof JToggleButton button
                      && "Details".equals(button.getToolTipText()));
         return (AbstractButton) result;
     }
 
     private static JTable findTable(final Container container) {
-        Component result = findComponent(container,
-                                         c -> c instanceof JTable);
+        Component result = Util.findComponent(container,
+                                              c -> c instanceof JTable);
         return (JTable) result;
     }
-
-    private static Component findComponent(final Container container,
-                                           final Predicate<Component> predicate) {
-        for (Component child : container.getComponents()) {
-            if (predicate.test(child)) {
-                return child;
-            }
-            if (child instanceof Container cont && cont.getComponentCount() > 0) {
-                Component result = findComponent(cont, predicate);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
 }

From 2c3c4707c0ac7f4432ada9621f4b2e5fe4aef51f Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 7 Nov 2025 19:33:21 +0000
Subject: [PATCH 088/512] 8354548: Update CLDR to Version 48.0

Reviewed-by: joehw, jlu
---
 make/data/cldr/LICENSE                        |     2 +-
 make/data/cldr/common/bcp47/calendar.xml      |     2 +
 make/data/cldr/common/bcp47/number.xml        |     1 +
 make/data/cldr/common/bcp47/timezone.xml      |    21 +-
 make/data/cldr/common/dtd/cldrTest.dtd        |    14 +-
 make/data/cldr/common/dtd/ldml.dtd            |    55 +-
 make/data/cldr/common/dtd/ldml.xsd            |   131 +-
 make/data/cldr/common/dtd/ldmlBCP47.dtd       |     5 +-
 make/data/cldr/common/dtd/ldmlBCP47.xsd       |     7 +-
 make/data/cldr/common/dtd/ldmlOpenOffice.dtd  |    13 +-
 .../data/cldr/common/dtd/ldmlSupplemental.dtd |    15 +-
 .../data/cldr/common/dtd/ldmlSupplemental.xsd |    11 +-
 make/data/cldr/common/main/ab.xml             |    15 +-
 make/data/cldr/common/main/af.xml             |   624 +-
 make/data/cldr/common/main/ak.xml             |  1164 +-
 make/data/cldr/common/main/am.xml             |   551 +-
 make/data/cldr/common/main/an.xml             |     3 +
 make/data/cldr/common/main/ar.xml             |   797 +-
 make/data/cldr/common/main/ar_SA.xml          |     4 +-
 make/data/cldr/common/main/as.xml             |   451 +-
 make/data/cldr/common/main/asa.xml            |     4 +
 make/data/cldr/common/main/ast.xml            |    41 +-
 make/data/cldr/common/main/az.xml             |   428 +-
 make/data/cldr/common/main/az_Cyrl.xml        |     4 +
 make/data/cldr/common/main/ba.xml             | 12361 ++++++++++-
 make/data/cldr/common/main/bal.xml            |     5 +
 make/data/cldr/common/main/bal_Latn.xml       |    11 +-
 make/data/cldr/common/main/bas.xml            |     4 +
 make/data/cldr/common/main/be.xml             |   490 +-
 make/data/cldr/common/main/be_TARASK.xml      |    12 +-
 make/data/cldr/common/main/bew.xml            |    24 +-
 make/data/cldr/common/main/bg.xml             |   304 +-
 make/data/cldr/common/main/blo.xml            |   677 +-
 make/data/cldr/common/main/bm_Nkoo.xml        |     2 +
 make/data/cldr/common/main/bn.xml             |   596 +-
 make/data/cldr/common/main/bn_IN.xml          |     1 +
 make/data/cldr/common/main/bqi.xml            |   342 +
 make/data/cldr/common/main/bqi_IR.xml         |    14 +
 make/data/cldr/common/main/br.xml             |   549 +-
 make/data/cldr/common/main/brx.xml            |    81 +-
 make/data/cldr/common/main/bs.xml             |  1309 +-
 make/data/cldr/common/main/bs_Cyrl.xml        |    25 +-
 make/data/cldr/common/main/bua.xml            |   198 +
 make/data/cldr/common/main/bua_RU.xml         |    14 +
 make/data/cldr/common/main/ca.xml             |   457 +-
 make/data/cldr/common/main/ca_ES_VALENCIA.xml |     2 -
 make/data/cldr/common/main/ccp.xml            |    29 +-
 make/data/cldr/common/main/ce.xml             |    16 +-
 make/data/cldr/common/main/ceb.xml            |   506 +-
 make/data/cldr/common/main/chr.xml            |   230 +-
 make/data/cldr/common/main/ckb.xml            |   204 +-
 make/data/cldr/common/main/co.xml             |   299 +-
 make/data/cldr/common/main/cop.xml            |  4190 ++++
 make/data/cldr/common/main/cs.xml             |   397 +-
 make/data/cldr/common/main/csw.xml            |     4 -
 make/data/cldr/common/main/cu.xml             |     4 +
 make/data/cldr/common/main/cv.xml             | 17246 +++++++++++-----
 make/data/cldr/common/main/cy.xml             |   474 +-
 make/data/cldr/common/main/da.xml             |   317 +-
 make/data/cldr/common/main/de.xml             |   422 +-
 make/data/cldr/common/main/de_AT.xml          |     4 +
 make/data/cldr/common/main/de_CH.xml          |   144 +-
 make/data/cldr/common/main/de_LI.xml          |     6 +-
 make/data/cldr/common/main/de_LU.xml          |     5 -
 make/data/cldr/common/main/doi.xml            |     6 +-
 make/data/cldr/common/main/dsb.xml            |   337 +-
 make/data/cldr/common/main/dua.xml            |     4 +
 make/data/cldr/common/main/dv.xml             |     6 +
 make/data/cldr/common/main/dyo.xml            |     4 +
 make/data/cldr/common/main/dz.xml             |    11 +-
 make/data/cldr/common/main/ee.xml             |    25 +-
 make/data/cldr/common/main/el.xml             |   272 +-
 make/data/cldr/common/main/en.xml             |  1167 +-
 make/data/cldr/common/main/en_001.xml         |   148 +-
 make/data/cldr/common/main/en_150.xml         |     2 +
 make/data/cldr/common/main/en_AE.xml          |    12 +-
 make/data/cldr/common/main/en_AT.xml          |     2 +
 make/data/cldr/common/main/en_AU.xml          |   114 +-
 make/data/cldr/common/main/en_CA.xml          |   237 +-
 make/data/cldr/common/main/en_CH.xml          |     4 +-
 make/data/cldr/common/main/en_EE.xml          |    20 +
 make/data/cldr/common/main/en_GB.xml          |   197 +-
 make/data/cldr/common/main/en_GE.xml          |    25 +
 make/data/cldr/common/main/en_IN.xml          |    75 +-
 make/data/cldr/common/main/en_JP.xml          |   458 +
 make/data/cldr/common/main/en_LT.xml          |    20 +
 make/data/cldr/common/main/en_LV.xml          |    20 +
 make/data/cldr/common/main/en_MH.xml          |    12 +-
 make/data/cldr/common/main/en_MP.xml          |    12 +-
 make/data/cldr/common/main/en_MV.xml          |     1 +
 make/data/cldr/common/main/en_NL.xml          |     3 +
 make/data/cldr/common/main/en_PL.xml          |     2 +
 make/data/cldr/common/main/en_PT.xml          |     2 +
 make/data/cldr/common/main/en_RO.xml          |     2 +
 make/data/cldr/common/main/en_SI.xml          |     2 +
 make/data/cldr/common/main/en_SK.xml          |     2 +
 make/data/cldr/common/main/en_Shaw.xml        |  1462 ++
 make/data/cldr/common/main/en_UA.xml          |    20 +
 make/data/cldr/common/main/en_US_POSIX.xml    |     2 +
 make/data/cldr/common/main/eo.xml             |  6906 ++++---
 make/data/cldr/common/main/es.xml             |   352 +-
 make/data/cldr/common/main/es_419.xml         |   248 +-
 make/data/cldr/common/main/es_AR.xml          |     7 +-
 make/data/cldr/common/main/es_BO.xml          |     2 -
 make/data/cldr/common/main/es_CL.xml          |     8 +-
 make/data/cldr/common/main/es_CO.xml          |     6 +-
 make/data/cldr/common/main/es_CR.xml          |     2 -
 make/data/cldr/common/main/es_DO.xml          |     4 +-
 make/data/cldr/common/main/es_EC.xml          |     8 +-
 make/data/cldr/common/main/es_GQ.xml          |     4 +
 make/data/cldr/common/main/es_GT.xml          |     2 -
 make/data/cldr/common/main/es_HN.xml          |     2 -
 make/data/cldr/common/main/es_MX.xml          |    83 +-
 make/data/cldr/common/main/es_NI.xml          |     2 -
 make/data/cldr/common/main/es_PA.xml          |     2 -
 make/data/cldr/common/main/es_PE.xml          |     2 -
 make/data/cldr/common/main/es_PY.xml          |     8 +-
 make/data/cldr/common/main/es_US.xml          |   189 +-
 make/data/cldr/common/main/es_UY.xml          |     1 +
 make/data/cldr/common/main/es_VE.xml          |     8 +-
 make/data/cldr/common/main/et.xml             |   408 +-
 make/data/cldr/common/main/eu.xml             |   714 +-
 make/data/cldr/common/main/ewo.xml            |     4 +
 make/data/cldr/common/main/fa.xml             |   634 +-
 make/data/cldr/common/main/fa_AF.xml          |    10 +
 make/data/cldr/common/main/ff.xml             |     4 +
 make/data/cldr/common/main/ff_Adlm.xml        |    82 +-
 make/data/cldr/common/main/fi.xml             |   430 +-
 make/data/cldr/common/main/fil.xml            |   311 +-
 make/data/cldr/common/main/fo.xml             |    52 +-
 make/data/cldr/common/main/fr.xml             |   450 +-
 make/data/cldr/common/main/fr_CA.xml          |  1352 +-
 make/data/cldr/common/main/frr.xml            |   439 +-
 make/data/cldr/common/main/fur.xml            |     2 -
 make/data/cldr/common/main/fy.xml             |    14 +-
 make/data/cldr/common/main/ga.xml             |   945 +-
 make/data/cldr/common/main/gaa.xml            |    22 +-
 make/data/cldr/common/main/gd.xml             |   749 +-
 make/data/cldr/common/main/gl.xml             |   494 +-
 make/data/cldr/common/main/gsw.xml            |    12 +-
 make/data/cldr/common/main/gu.xml             |   286 +-
 make/data/cldr/common/main/ha.xml             |  1064 +-
 make/data/cldr/common/main/haw.xml            |    14 +-
 make/data/cldr/common/main/he.xml             |  1120 +-
 make/data/cldr/common/main/hi.xml             |   330 +-
 make/data/cldr/common/main/hi_Latn.xml        |    69 +-
 make/data/cldr/common/main/hr.xml             |   451 +-
 make/data/cldr/common/main/hsb.xml            |   331 +-
 make/data/cldr/common/main/hu.xml             |   336 +-
 make/data/cldr/common/main/hy.xml             |   453 +-
 make/data/cldr/common/main/ia.xml             |   247 +-
 make/data/cldr/common/main/id.xml             |   323 +-
 make/data/cldr/common/main/ie.xml             |   905 +-
 make/data/cldr/common/main/ig.xml             |  1149 +-
 make/data/cldr/common/main/ii.xml             |     2 +-
 make/data/cldr/common/main/is.xml             |   283 +-
 make/data/cldr/common/main/it.xml             |   442 +-
 make/data/cldr/common/main/it_CH.xml          |     8 +-
 make/data/cldr/common/main/ja.xml             |   372 +-
 make/data/cldr/common/main/jgo.xml            |     2 +-
 make/data/cldr/common/main/jv.xml             |   314 +-
 make/data/cldr/common/main/ka.xml             |   541 +-
 make/data/cldr/common/main/kaa.xml            |    44 +-
 make/data/cldr/common/main/kab.xml            |   196 +-
 make/data/cldr/common/main/kea.xml            |    51 +-
 make/data/cldr/common/main/kek.xml            |    78 +
 make/data/cldr/common/main/kek_GT.xml         |    14 +
 make/data/cldr/common/main/kgp.xml            |    18 +-
 make/data/cldr/common/main/kk.xml             |   510 +-
 make/data/cldr/common/main/kk_Arab.xml        |  9843 ++++-----
 make/data/cldr/common/main/kl.xml             |    14 +-
 make/data/cldr/common/main/km.xml             |   228 +-
 make/data/cldr/common/main/kn.xml             |   348 +-
 make/data/cldr/common/main/ko.xml             |   393 +-
 make/data/cldr/common/main/kok.xml            |  2962 ++-
 make/data/cldr/common/main/kok_Latn.xml       |  1460 +-
 make/data/cldr/common/main/ks.xml             |    20 +-
 make/data/cldr/common/main/ks_Deva.xml        |     2 +-
 make/data/cldr/common/main/ksf.xml            |     4 +
 make/data/cldr/common/main/ksh.xml            |    10 +-
 make/data/cldr/common/main/ku.xml             |  3691 +++-
 make/data/cldr/common/main/ku_Arab.xml        |    27 +
 make/data/cldr/common/main/ku_Arab_IQ.xml     |    15 +
 make/data/cldr/common/main/ku_Arab_IR.xml     |    15 +
 make/data/cldr/common/main/ku_Latn.xml        |    14 +
 make/data/cldr/common/main/ku_Latn_IQ.xml     |    15 +
 make/data/cldr/common/main/ku_Latn_SY.xml     |    15 +
 make/data/cldr/common/main/ku_Latn_TR.xml     |    15 +
 make/data/cldr/common/main/kxv.xml            |    61 +-
 make/data/cldr/common/main/kxv_Deva.xml       |    29 +-
 make/data/cldr/common/main/kxv_Orya.xml       |    29 +-
 make/data/cldr/common/main/kxv_Telu.xml       |    29 +-
 make/data/cldr/common/main/ky.xml             |   207 +-
 make/data/cldr/common/main/la.xml             |    30 +
 make/data/cldr/common/main/lb.xml             |    15 +-
 make/data/cldr/common/main/lij.xml            |    15 +-
 make/data/cldr/common/main/lld.xml            |   177 +-
 make/data/cldr/common/main/lmo.xml            |     2 +-
 make/data/cldr/common/main/ln.xml             |     4 +
 make/data/cldr/common/main/lo.xml             |   346 +-
 make/data/cldr/common/main/lt.xml             |   462 +-
 make/data/cldr/common/main/luy.xml            |     6 +
 make/data/cldr/common/main/lv.xml             |   371 +-
 make/data/cldr/common/main/lzz.xml            |    24 +
 make/data/cldr/common/main/lzz_TR.xml         |    14 +
 make/data/cldr/common/main/mai.xml            |    23 +-
 make/data/cldr/common/main/mg.xml             |     4 +-
 make/data/cldr/common/main/mgo.xml            |     2 +-
 make/data/cldr/common/main/mi.xml             |    93 +-
 make/data/cldr/common/main/mk.xml             |   438 +-
 make/data/cldr/common/main/ml.xml             |   761 +-
 make/data/cldr/common/main/mn.xml             |   773 +-
 make/data/cldr/common/main/mr.xml             |   573 +-
 make/data/cldr/common/main/ms.xml             |   285 +-
 make/data/cldr/common/main/ms_Arab.xml        |     2 +
 make/data/cldr/common/main/mt.xml             |     5 -
 make/data/cldr/common/main/mww.xml            |   101 +
 make/data/cldr/common/main/mww_Hmnp.xml       |    14 +
 make/data/cldr/common/main/mww_Hmnp_US.xml    |    15 +
 make/data/cldr/common/main/my.xml             |   257 +-
 make/data/cldr/common/main/nds.xml            |    10 +-
 make/data/cldr/common/main/ne.xml             |   469 +-
 make/data/cldr/common/main/nl.xml             |  1056 +-
 make/data/cldr/common/main/nmg.xml            |     4 +
 make/data/cldr/common/main/nn.xml             |    80 +-
 make/data/cldr/common/main/no.xml             |   571 +-
 make/data/cldr/common/main/nqo.xml            |    11 +-
 make/data/cldr/common/main/nso.xml            |    66 +-
 make/data/cldr/common/main/oc.xml             |   291 +-
 make/data/cldr/common/main/oc_ES.xml          |   158 +-
 make/data/cldr/common/main/oka.xml            |    23 +
 make/data/cldr/common/main/oka_CA.xml         |    14 +
 make/data/cldr/common/main/oka_US.xml         |    14 +
 make/data/cldr/common/main/om.xml             |   210 +-
 make/data/cldr/common/main/or.xml             |   349 +-
 make/data/cldr/common/main/pa.xml             |   783 +-
 make/data/cldr/common/main/pap.xml            |   453 +-
 make/data/cldr/common/main/pcm.xml            |   274 +-
 make/data/cldr/common/main/pi.xml             |    16 +
 make/data/cldr/common/main/pi_Latn.xml        |    14 +
 make/data/cldr/common/main/pi_Latn_GB.xml     |    15 +
 make/data/cldr/common/main/pl.xml             |   329 +-
 make/data/cldr/common/main/pms.xml            |   120 +
 make/data/cldr/common/main/pms_IT.xml         |    14 +
 make/data/cldr/common/main/prg.xml            |     4 +
 make/data/cldr/common/main/ps.xml             |   543 +-
 make/data/cldr/common/main/ps_PK.xml          |     5 +
 make/data/cldr/common/main/pt.xml             |   335 +-
 make/data/cldr/common/main/pt_PT.xml          |   171 +-
 make/data/cldr/common/main/qu.xml             |    89 +-
 make/data/cldr/common/main/rif.xml            |  1534 +-
 make/data/cldr/common/main/rm.xml             |  6027 +++++-
 make/data/cldr/common/main/ro.xml             |   396 +-
 make/data/cldr/common/main/root.xml           |   689 +-
 make/data/cldr/common/main/ru.xml             |   654 +-
 make/data/cldr/common/main/rw.xml             |   171 +-
 make/data/cldr/common/main/sa.xml             |    10 +
 make/data/cldr/common/main/sah.xml            |     4 +
 make/data/cldr/common/main/sat.xml            |     7 +-
 make/data/cldr/common/main/sc.xml             |  1007 +-
 make/data/cldr/common/main/scn.xml            |  4231 ++--
 make/data/cldr/common/main/sd.xml             |   546 +-
 make/data/cldr/common/main/sd_Deva.xml        |    32 +-
 make/data/cldr/common/main/se.xml             |     4 +
 make/data/cldr/common/main/se_FI.xml          |     9 +-
 make/data/cldr/common/main/sg.xml             |     6 +
 make/data/cldr/common/main/sgs.xml            |    39 +
 make/data/cldr/common/main/sgs_LT.xml         |    14 +
 make/data/cldr/common/main/shn.xml            | 11104 +++++++++-
 make/data/cldr/common/main/si.xml             |   569 +-
 make/data/cldr/common/main/sk.xml             |   288 +-
 make/data/cldr/common/main/sl.xml             |   404 +-
 make/data/cldr/common/main/smn.xml            |     4 +
 make/data/cldr/common/main/so.xml             |   356 +-
 make/data/cldr/common/main/sq.xml             |   270 +-
 make/data/cldr/common/main/sr.xml             |   300 +-
 make/data/cldr/common/main/sr_Cyrl_BA.xml     |    23 +-
 make/data/cldr/common/main/sr_Cyrl_ME.xml     |     8 +-
 make/data/cldr/common/main/sr_Latn.xml        |   310 +-
 make/data/cldr/common/main/sr_Latn_BA.xml     |    23 +-
 make/data/cldr/common/main/sr_Latn_ME.xml     |     8 +-
 make/data/cldr/common/main/st.xml             |     4 +-
 make/data/cldr/common/main/su.xml             |     4 -
 make/data/cldr/common/main/suz.xml            |    19 +
 make/data/cldr/common/main/suz_Deva.xml       |    14 +
 make/data/cldr/common/main/suz_Deva_NP.xml    |    15 +
 make/data/cldr/common/main/suz_Sunu.xml       |    20 +
 make/data/cldr/common/main/suz_Sunu_NP.xml    |    15 +
 make/data/cldr/common/main/sv.xml             |   513 +-
 make/data/cldr/common/main/sv_AX.xml          |    59 +
 make/data/cldr/common/main/sv_FI.xml          |   162 +-
 make/data/cldr/common/main/sw.xml             |   407 +-
 make/data/cldr/common/main/sw_KE.xml          |    65 +-
 make/data/cldr/common/main/syr.xml            |   758 +-
 make/data/cldr/common/main/szl.xml            |    18 +-
 make/data/cldr/common/main/ta.xml             |   893 +-
 make/data/cldr/common/main/ta_MY.xml          |     2 +
 make/data/cldr/common/main/ta_SG.xml          |     2 +
 make/data/cldr/common/main/te.xml             |   470 +-
 make/data/cldr/common/main/tg.xml             |   178 +-
 make/data/cldr/common/main/th.xml             |   349 +-
 make/data/cldr/common/main/ti.xml             |   404 +-
 make/data/cldr/common/main/ti_ER.xml          |     5 -
 make/data/cldr/common/main/tk.xml             |   435 +-
 make/data/cldr/common/main/tn.xml             |    22 +-
 make/data/cldr/common/main/to.xml             |   243 +-
 make/data/cldr/common/main/tok.xml            |   669 +-
 make/data/cldr/common/main/tpi.xml            |     4 +
 make/data/cldr/common/main/tr.xml             |   315 +-
 make/data/cldr/common/main/trv.xml            |     2 +-
 make/data/cldr/common/main/trw.xml            |    13 +-
 make/data/cldr/common/main/tt.xml             |  1086 +-
 make/data/cldr/common/main/tyv.xml            |   708 +
 make/data/cldr/common/main/tzm.xml            |     4 +
 make/data/cldr/common/main/ug.xml             |    11 +-
 make/data/cldr/common/main/uk.xml             |   707 +-
 make/data/cldr/common/main/ur.xml             |   478 +-
 make/data/cldr/common/main/ur_IN.xml          |     3 +-
 make/data/cldr/common/main/uz.xml             |   366 +-
 make/data/cldr/common/main/uz_Arab.xml        |     4 +
 make/data/cldr/common/main/uz_Cyrl.xml        |    71 +-
 make/data/cldr/common/main/vec.xml            |    87 +-
 make/data/cldr/common/main/vi.xml             |   431 +-
 make/data/cldr/common/main/vmw.xml            |     6 +-
 make/data/cldr/common/main/vo.xml             |     2 +-
 make/data/cldr/common/main/wae.xml            |     2 +-
 make/data/cldr/common/main/wal.xml            |     2 +-
 make/data/cldr/common/main/wo.xml             |    69 +-
 make/data/cldr/common/main/xh.xml             |   475 +-
 make/data/cldr/common/main/xnr.xml            |    47 +-
 make/data/cldr/common/main/xog.xml            |     4 +
 make/data/cldr/common/main/yav.xml            |     2 +
 make/data/cldr/common/main/yo.xml             |   391 +-
 make/data/cldr/common/main/yo_BJ.xml          |   163 +-
 make/data/cldr/common/main/yrl.xml            |    18 +-
 make/data/cldr/common/main/yrl_CO.xml         |     6 +-
 make/data/cldr/common/main/yrl_VE.xml         |     6 +-
 make/data/cldr/common/main/yue.xml            |   385 +-
 make/data/cldr/common/main/yue_Hans.xml       |  1146 +-
 make/data/cldr/common/main/zh.xml             |   412 +-
 make/data/cldr/common/main/zh_Hans_MY.xml     |    27 +-
 make/data/cldr/common/main/zh_Hant.xml        |   410 +-
 make/data/cldr/common/main/zh_Hant_HK.xml     |   203 +-
 make/data/cldr/common/main/zu.xml             |   108 +-
 .../cldr/common/properties/coverageLevels.txt |    23 +-
 .../supplemental/attributeValueValidity.xml   |    19 +-
 .../common/supplemental/coverageLevels.xml    |   418 +-
 .../cldr/common/supplemental/dayPeriods.xml   |   518 +-
 .../common/supplemental/languageGroup.xml     |   102 +-
 .../cldr/common/supplemental/languageInfo.xml |     5 +
 .../common/supplemental/likelySubtags.xml     |   175 +-
 .../cldr/common/supplemental/metaZones.xml    |    87 +-
 .../common/supplemental/numberingSystems.xml  |     1 +
 .../cldr/common/supplemental/ordinals.xml     |    10 +-
 .../data/cldr/common/supplemental/plurals.xml |    20 +-
 .../data/cldr/common/supplemental/rgScope.xml |    32 +-
 .../cldr/common/supplemental/subdivisions.xml |     2 +-
 .../common/supplemental/supplementalData.xml  |  1032 +-
 .../supplemental/supplementalMetadata.xml     |    25 +-
 make/data/cldr/common/supplemental/units.xml  |    27 +-
 .../cldr/common/supplemental/windowsZones.xml |     2 +-
 .../build/tools/cldrconverter/Bundle.java     |    42 +-
 .../tools/cldrconverter/CopyrightHeaders.java |    84 +-
 .../tools/cldrconverter/LDMLParseHandler.java |     8 +-
 .../share/classes/java/util/Locale.java       |    33 +-
 .../java/util/spi/LocaleServiceProvider.java  |     2 +
 src/java.base/share/legal/cldr.md             |     2 +-
 src/jdk.localedata/share/legal/cldr.md        |     2 +-
 .../TestCompactNumber.java                    |   293 +-
 .../text/Format/NumberFormat/Bug8132125.java  |     8 +-
 .../java/time/chrono/TestEraDisplayName.java  |     6 +-
 .../time/format/Skeletons_en_US.properties    |    27 +-
 .../java/time/format/Skeletons_ja.properties  |    27 +-
 .../time/format/TestLocalizedPattern.java     |     4 +-
 .../time/format/TestUnicodeExtension.java     |   140 +-
 .../java/util/Calendar/CalendarDataTest.java  |     7 +-
 .../util/Calendar/CldrFormatNamesTest.java    |    62 +-
 .../util/Locale/bcp47u/DisplayNameTests.java  |    12 +-
 .../java/util/Locale/bcp47u/FormatTests.java  |     4 +-
 .../bcp47u/spi/LocaleNameProviderTests.java   |     6 +-
 .../provider/foo/LocaleNameProviderImpl.java  |     4 +-
 .../util/TimeZone/CLDRDisplayNamesTest.java   |    22 +-
 test/jdk/sun/text/resources/LocaleData.cldr   |    89 +-
 .../sun/text/resources/LocaleDataTest.java    |     1 +
 .../util/resources/TimeZone/Bug6317929.java   |    69 +-
 .../util/resources/TimeZone/Bug6442006.java   |     8 +-
 .../util/resources/TimeZone/Bug8139107.java   |    14 +-
 .../resources/cldr/DateTimeRoundTripTest.java |    62 +
 .../resources/cldr/TimeZoneNamesTest.java     |   112 +-
 .../plugins/IncludeLocalesPluginTest.java     |    26 +-
 390 files changed, 116085 insertions(+), 37257 deletions(-)
 create mode 100644 make/data/cldr/common/main/bqi.xml
 create mode 100644 make/data/cldr/common/main/bqi_IR.xml
 create mode 100644 make/data/cldr/common/main/bua.xml
 create mode 100644 make/data/cldr/common/main/bua_RU.xml
 create mode 100644 make/data/cldr/common/main/en_EE.xml
 create mode 100644 make/data/cldr/common/main/en_GE.xml
 create mode 100644 make/data/cldr/common/main/en_JP.xml
 create mode 100644 make/data/cldr/common/main/en_LT.xml
 create mode 100644 make/data/cldr/common/main/en_LV.xml
 create mode 100644 make/data/cldr/common/main/en_UA.xml
 create mode 100644 make/data/cldr/common/main/kek.xml
 create mode 100644 make/data/cldr/common/main/kek_GT.xml
 create mode 100644 make/data/cldr/common/main/ku_Arab.xml
 create mode 100644 make/data/cldr/common/main/ku_Arab_IQ.xml
 create mode 100644 make/data/cldr/common/main/ku_Arab_IR.xml
 create mode 100644 make/data/cldr/common/main/ku_Latn.xml
 create mode 100644 make/data/cldr/common/main/ku_Latn_IQ.xml
 create mode 100644 make/data/cldr/common/main/ku_Latn_SY.xml
 create mode 100644 make/data/cldr/common/main/ku_Latn_TR.xml
 create mode 100644 make/data/cldr/common/main/lzz.xml
 create mode 100644 make/data/cldr/common/main/lzz_TR.xml
 create mode 100644 make/data/cldr/common/main/mww.xml
 create mode 100644 make/data/cldr/common/main/mww_Hmnp.xml
 create mode 100644 make/data/cldr/common/main/mww_Hmnp_US.xml
 create mode 100644 make/data/cldr/common/main/oka.xml
 create mode 100644 make/data/cldr/common/main/oka_CA.xml
 create mode 100644 make/data/cldr/common/main/oka_US.xml
 create mode 100644 make/data/cldr/common/main/pi.xml
 create mode 100644 make/data/cldr/common/main/pi_Latn.xml
 create mode 100644 make/data/cldr/common/main/pi_Latn_GB.xml
 create mode 100644 make/data/cldr/common/main/pms.xml
 create mode 100644 make/data/cldr/common/main/pms_IT.xml
 create mode 100644 make/data/cldr/common/main/sgs.xml
 create mode 100644 make/data/cldr/common/main/sgs_LT.xml
 create mode 100644 make/data/cldr/common/main/suz.xml
 create mode 100644 make/data/cldr/common/main/suz_Deva.xml
 create mode 100644 make/data/cldr/common/main/suz_Deva_NP.xml
 create mode 100644 make/data/cldr/common/main/suz_Sunu.xml
 create mode 100644 make/data/cldr/common/main/suz_Sunu_NP.xml
 create mode 100644 test/jdk/sun/util/resources/cldr/DateTimeRoundTripTest.java

diff --git a/make/data/cldr/LICENSE b/make/data/cldr/LICENSE
index ca907d75617..9065fe54d8b 100644
--- a/make/data/cldr/LICENSE
+++ b/make/data/cldr/LICENSE
@@ -1,4 +1,4 @@
-UNICODE LICENSE V3
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
diff --git a/make/data/cldr/common/bcp47/calendar.xml b/make/data/cldr/common/bcp47/calendar.xml
index 33640c1c1db..9b8bc3e9c1b 100644
--- a/make/data/cldr/common/bcp47/calendar.xml
+++ b/make/data/cldr/common/bcp47/calendar.xml
@@ -45,6 +45,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
 			<type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
 			<type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
+			<type name="c12" description="Best 12-hour cycle for locale (h11 or h12)" since="48" deprecated="true" /> <!-- Technical Preview -->
+			<type name="c24" description="Best 24-hour cycle for locale (h23 or h24)" since="48" deprecated="true" /> <!-- Technical Preview -->
 		</key>
     </keyword>
 </ldmlBCP47>
diff --git a/make/data/cldr/common/bcp47/number.xml b/make/data/cldr/common/bcp47/number.xml
index 7d242ac07e1..b74bb44f574 100644
--- a/make/data/cldr/common/bcp47/number.xml
+++ b/make/data/cldr/common/bcp47/number.xml
@@ -105,6 +105,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="thai" description="Thai digits"/>
             <type name="tirh" description="Tirhuta digits" since="28"/>
             <type name="tibt" description="Tibetan digits"/>
+            <type name="tols" description="Tolong Siki digits" since="48"/>
             <type name="traditio" description="Traditional numerals — may be algorithmic" alias="traditional" since="21"/>
             <type name="vaii" description="Vai digits" since="21"/>
             <type name="wara" description="Warang Citi digits" since="28"/>
diff --git a/make/data/cldr/common/bcp47/timezone.xml b/make/data/cldr/common/bcp47/timezone.xml
index b173ad4c80d..c0bb0793473 100644
--- a/make/data/cldr/common/bcp47/timezone.xml
+++ b/make/data/cldr/common/bcp47/timezone.xml
@@ -17,14 +17,14 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aiaxa" description="Anguilla" alias="America/Anguilla"/>
             <type name="altia" description="Tirane, Albania" alias="Europe/Tirane"/>
             <type name="amevn" description="Yerevan, Armenia" alias="Asia/Yerevan"/>
-            <type name="ancur" description="Curaçao" alias="America/Curacao"/>
+            <type name="ancur" description="Curaçao" alias="America/Curacao" region="CW"/>
             <type name="aolad" description="Luanda, Angola" alias="Africa/Luanda"/>
-            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="nzakl"/>
+            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="aqmcm"/>
             <type name="aqcas" description="Casey Station, Bailey Peninsula" alias="Antarctica/Casey"/>
             <type name="aqdav" description="Davis Station, Vestfold Hills" alias="Antarctica/Davis"/>
             <type name="aqddu" description="Dumont d'Urville Station, Terre Adélie" alias="Antarctica/DumontDUrville"/>
             <type name="aqmaw" description="Mawson Station, Holme Bay" alias="Antarctica/Mawson"/>
-            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo"/>
+            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo Antarctica/South_Pole"/>
             <type name="aqplm" description="Palmer Station, Anvers Island" alias="Antarctica/Palmer"/>
             <type name="aqrot" description="Rothera Station, Adelaide Island" alias="Antarctica/Rothera"/>
             <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
@@ -130,6 +130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="chzrh" description="Zurich, Switzerland" alias="Europe/Zurich"/>
             <type name="ciabj" description="Abidjan, Côte d'Ivoire" alias="Africa/Abidjan"/>
             <type name="ckrar" description="Rarotonga, Cook Islands" alias="Pacific/Rarotonga"/>
+            <type name="clcxq" description="Aysén Region, Chile" alias="America/Coyhaique" since="48"/>
             <type name="clipc" description="Easter Island, Chile" alias="Pacific/Easter Chile/EasterIsland"/>
             <type name="clpuq" description="Punta Arenas, Chile" alias="America/Punta_Arenas" since="31"/>
             <type name="clscl" description="Santiago, Chile" alias="America/Santiago Chile/Continental"/>
@@ -167,7 +168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="est5edt" description="POSIX style time zone for US Eastern Time" deprecated="true" preferred="usnyc"/>
             <type name="etadd" description="Addis Ababa, Ethiopia" alias="Africa/Addis_Ababa"/>
             <type name="fihel" description="Helsinki, Finland" alias="Europe/Helsinki"/>
-            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn"/>
+            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn" region="AX"/>
             <type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/>
             <type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/>
             <type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/>
@@ -177,7 +178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
             <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
             <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
-            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
+            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40" region="PS"/>
             <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
             <type name="gdgnd" description="Grenada" alias="America/Grenada"/>
             <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -193,8 +194,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
             <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
             <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
-            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
-            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy"/>
+            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot" region="MF"/>
+            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy" region="BL"/>
             <type name="gqssg" description="Malabo, Equatorial Guinea" alias="Africa/Malabo"/>
             <type name="grath" description="Athens, Greece" alias="Europe/Athens EET"/>
             <type name="gsgrv" description="South Georgia and the South Sandwich Islands" alias="Atlantic/South_Georgia"/>
@@ -202,7 +203,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gugum" description="Guam" alias="Pacific/Guam"/>
             <type name="gwoxb" description="Bissau, Guinea-Bissau" alias="Africa/Bissau"/>
             <type name="gygeo" description="Guyana" alias="America/Guyana"/>
-            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21"/>
+            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21" region="PS"/>
             <type name="hkhkg" description="Hong Kong SAR China" alias="Asia/Hong_Kong Hongkong"/>
             <type name="hntgu" description="Tegucigalpa, Honduras" alias="America/Tegucigalpa"/>
             <type name="hrzag" description="Zagreb, Croatia" alias="Europe/Zagreb"/>
@@ -220,7 +221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
             <type name="isrey" description="Reykjavik, Iceland" alias="Atlantic/Reykjavik Iceland"/>
             <type name="itrom" description="Rome, Italy" alias="Europe/Rome"/>
-            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel"/>
+            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel" region="IL"/>
             <type name="jesth" description="Jersey" alias="Europe/Jersey"/>
             <type name="jmkin" description="Jamaica" alias="America/Jamaica Jamaica"/>
             <type name="joamm" description="Amman, Jordan" alias="Asia/Amman"/>
@@ -305,7 +306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu" iana="Asia/Kathmandu"/>
             <type name="nrinu" description="Nauru" alias="Pacific/Nauru"/>
             <type name="nuiue" description="Niue" alias="Pacific/Niue"/>
-            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/>
+            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland NZ"/>
             <type name="nzcht" description="Chatham Islands, New Zealand" alias="Pacific/Chatham NZ-CHAT"/>
             <type name="ommct" description="Muscat, Oman" alias="Asia/Muscat"/>
             <type name="papty" description="Panama" alias="America/Panama EST"/>
diff --git a/make/data/cldr/common/dtd/cldrTest.dtd b/make/data/cldr/common/dtd/cldrTest.dtd
index 456c842c735..b2111d754b0 100644
--- a/make/data/cldr/common/dtd/cldrTest.dtd
+++ b/make/data/cldr/common/dtd/cldrTest.dtd
@@ -1,13 +1,12 @@
 <!--
-Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
+<!-- This is only referenced by the deprecated GenerateLikelySubtagTests.java - see CLDR-17535 -->
+
 <!ELEMENT cldrTest ((number | date | zoneFields | collation | likelySubtags)*) >
 <!ATTLIST cldrTest version CDATA #REQUIRED>
 <!ATTLIST cldrTest base CDATA #REQUIRED>
@@ -48,4 +47,3 @@ Except as contained in this notice, the name of a copyright holder shall not be
 <!-- likelySubtags result attributes -->
 <!ATTLIST result add NMTOKEN #IMPLIED>
 <!ATTLIST result remove NMTOKEN #IMPLIED>
-
diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd
index 4ef94ba67ca..aebedd33a43 100644
--- a/make/data/cldr/common/dtd/ldml.dtd
+++ b/make/data/cldr/common/dtd/ldml.dtd
@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "47" >
+<!ATTLIST version cldrVersion CDATA #FIXED "48" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -64,6 +64,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:validity/locale-for-names-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/long, secondary, short, variant, menu, official-->
+<!ATTLIST language menu NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/core, extension-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -277,6 +279,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:bcp47/anykey-->
 <!ATTLIST type type NMTOKEN #REQUIRED >
     <!--@MATCH:bcp47/anyvalue-->
+<!ATTLIST type scope NMTOKEN #IMPLIED >
+    <!--@MATCH:literal/core-->
 <!ATTLIST type alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/short, variant-->
 <!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -456,7 +460,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@DEPRECATED-->
 
 <!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
-<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
+<!ATTLIST exemplarCharacters type (standard | auxiliary | numbers | numbers-auxiliary | punctuation | punctuation-auxiliary | punctuation-person | index | currencySymbol) #IMPLIED >
     <!--@DEPRECATED:currencySymbol-->
 <!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -1528,7 +1532,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateTimeFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard, atTime-->
+    <!--@MATCH:literal/standard, atTime, relative-->
 <!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -1718,7 +1722,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
+<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, gmtUnknownFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
 <!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1765,6 +1769,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
+<!ELEMENT gmtUnknownFormat ( #PCDATA ) >
+<!ATTLIST gmtUnknownFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST gmtUnknownFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST gmtUnknownFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
 <!ELEMENT regionFormat ( #PCDATA ) >
 <!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
 <!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
@@ -1963,7 +1976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!-- ######################################################### -->
 
-<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
+<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, rationalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
 <!ATTLIST numbers alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -2267,6 +2280,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
+<!ELEMENT rationalFormats ( alias | ( rationalPattern*, integerAndRationalPattern*, rationalUsage*, special* ) ) >
+<!ATTLIST rationalFormats numberSystem CDATA #REQUIRED >
+    <!--@MATCH:bcp47/nu-->
+
+<!ELEMENT rationalPattern ( #PCDATA ) >
+<!ATTLIST rationalPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST rationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT integerAndRationalPattern ( #PCDATA ) >
+<!ATTLIST integerAndRationalPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/superSub-->
+<!ATTLIST integerAndRationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT rationalUsage ( #PCDATA ) >
+<!ATTLIST rationalUsage alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST rationalUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
 <!ELEMENT scientificFormats ( alias | ( default*, scientificFormatLength*, special* ) ) >
 <!ATTLIST scientificFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -3100,12 +3135,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT rbnf ( alias | ( rulesetGrouping*, special* ) ) >
 
-<!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
+<!ELEMENT rulesetGrouping ( alias | ( rbnfRules?, ruleset*, special* ) ) >
 <!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
     <!--@MATCH:literal/NumberingSystemRules, OrdinalRules, SpelloutRules-->
 <!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 
+<!ELEMENT rbnfRules ( #PCDATA ) >
+    <!--@CDATA-->
+<!ATTLIST rbnfRules alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST rbnfRules draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
 <!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
     <!--@ORDERED-->
 <!ATTLIST ruleset type NMTOKEN #REQUIRED >
diff --git a/make/data/cldr/common/dtd/ldml.xsd b/make/data/cldr/common/dtd/ldml.xsd
index 973251f2f69..3ee2c75ed75 100644
--- a/make/data/cldr/common/dtd/ldml.xsd
+++ b/make/data/cldr/common/dtd/ldml.xsd
@@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="47" name="cldrVersion">
+      <xs:attribute default="48" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="47"/>
+            <xs:enumeration value="48"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -182,6 +182,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
     <xs:complexType mixed="true">
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="menu" type="xs:NMTOKENS"/>
       <xs:attribute name="draft">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -203,6 +204,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
   <xs:element name="script">
     <xs:complexType mixed="true">
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
@@ -696,6 +698,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
     <xs:complexType mixed="true">
       <xs:attribute name="key" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="scope" type="xs:NMTOKEN"/>
       <xs:attribute name="alt" type="xs:NMTOKENS"/>
       <xs:attribute name="draft">
         <xs:simpleType>
@@ -718,6 +721,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
   <xs:element name="transformNames">
     <xs:complexType>
       <xs:choice>
@@ -1196,12 +1200,15 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="type">
         <xs:simpleType>
           <xs:restriction base="xs:token">
-            <xs:enumeration value="auxiliary"/>
             <xs:enumeration value="standard"/>
-            <xs:enumeration value="punctuation"/>
-            <xs:enumeration value="currencySymbol"/>
-            <xs:enumeration value="index"/>
+            <xs:enumeration value="auxiliary"/>
             <xs:enumeration value="numbers"/>
+            <xs:enumeration value="numbers-auxiliary"/>
+            <xs:enumeration value="punctuation"/>
+            <xs:enumeration value="punctuation-auxiliary"/>
+            <xs:enumeration value="punctuation-person"/>
+            <xs:enumeration value="index"/>
+            <xs:enumeration value="currencySymbol"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -4512,6 +4519,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="hoursFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtZeroFormat"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtUnknownFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="regionFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="fallbackFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="fallbackRegionFormat"/>
@@ -4634,6 +4642,28 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="gmtUnknownFormat">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="references"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
   <xs:element name="regionFormat">
     <xs:complexType mixed="true">
       <xs:attribute name="type">
@@ -5099,6 +5129,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="minimumGroupingDigits"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="symbols"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="decimalFormats"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="scientificFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="percentFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="currencyFormats"/>
@@ -5830,6 +5861,72 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="rationalFormats">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref="alias"/>
+        <xs:sequence>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalPattern"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="integerAndRationalPattern"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalUsage"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
+        </xs:sequence>
+      </xs:choice>
+      <xs:attribute name="numberSystem" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="rationalPattern">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  <xs:element name="integerAndRationalPattern">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  <xs:element name="rationalUsage">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
   <xs:element name="scientificFormats">
     <xs:complexType>
       <xs:choice>
@@ -8049,6 +8146,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:choice>
         <xs:element ref="alias"/>
         <xs:sequence>
+          <xs:element minOccurs="0" ref="rbnfRules"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="ruleset"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
         </xs:sequence>
@@ -8070,6 +8168,27 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   </xs:element>
   
   
+  <xs:element name="rbnfRules">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
   <xs:element name="ruleset">
     <xs:complexType>
       <xs:choice>
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.dtd b/make/data/cldr/common/dtd/ldmlBCP47.dtd
index 21ab9e836b7..f379972009c 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.dtd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.dtd
@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "47" >
+<!ATTLIST version cldrVersion CDATA #FIXED "48" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
@@ -72,6 +72,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST type iana CDATA #IMPLIED >
     <!--@MATCH:regex/^[A-Za-z]+(/[A-Za-z_\-]+)+$-->
     <!--@VALUE-->
+<!ATTLIST type region CDATA #IMPLIED >
+    <!--@MATCH:regex/^[A-Z]{2}$-->
+    <!--@VALUE-->
 
 <!ELEMENT attribute EMPTY >
 <!ATTLIST attribute name NMTOKEN #REQUIRED >
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.xsd b/make/data/cldr/common/dtd/ldmlBCP47.xsd
index 3abe9785334..6ba36d5feb6 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.xsd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.xsd
@@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="47" name="cldrVersion">
+      <xs:attribute default="48" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="47"/>
+            <xs:enumeration value="48"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -120,6 +120,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="alias"/>
       <xs:attribute name="since"/>
       <xs:attribute name="iana"/>
+      <xs:attribute name="region"/>
     </xs:complexType>
   </xs:element>
   
@@ -134,6 +135,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
+  
   <xs:element name="attribute">
     <xs:complexType>
       <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
diff --git a/make/data/cldr/common/dtd/ldmlOpenOffice.dtd b/make/data/cldr/common/dtd/ldmlOpenOffice.dtd
index a643b80f392..557d0250a6e 100644
--- a/make/data/cldr/common/dtd/ldmlOpenOffice.dtd
+++ b/make/data/cldr/common/dtd/ldmlOpenOffice.dtd
@@ -1,11 +1,8 @@
 <!--
-Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
 <!--  OpenOffice.org Specific elements                         -->
@@ -60,7 +57,7 @@ openOffice:quarter4Abbreviation?)>
 <!ELEMENT openOffice:belowWord (#PCDATA)>
 
 <!-- START_DEPRECATED -->
-<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>   
+<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter2Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter3Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter4Abbreviation (#PCDATA)>
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.dtd b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
index 6667ea902b9..271e50dbfcf 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.dtd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "47" >
+<!ATTLIST version cldrVersion CDATA #FIXED "48" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "16.0.0" >
@@ -147,6 +147,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST language territories NMTOKENS #IMPLIED >
     <!--@MATCH:set/validity/region-->
     <!--@VALUE-->
+    <!--@DEPRECATED-->
 <!ATTLIST language variants NMTOKENS #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -274,7 +275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:time/yyyy-MM-dd-->
     <!--@VALUE-->
 <!ATTLIST era code NMTOKEN #IMPLIED >
-    <!--@MATCH:regex/[a-z0-9]{3,8}(\-[a-z0-9]{3,8})*-->
+    <!--@MATCH:regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
     <!--@VALUE-->
 <!ATTLIST era aliases NMTOKENS #IMPLIED >
     <!--@MATCH:set/regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
@@ -770,7 +771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST unitAlias type NMTOKEN #REQUIRED >
     <!--@MATCH:validity/short-unit/deprecated-->
 <!ATTLIST unitAlias replacement NMTOKEN #REQUIRED >
-    <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+    <!--@MATCH:regex/[A-Za-z0-9][-A-Za-z0-9]*-->
     <!--@VALUE-->
 <!ATTLIST unitAlias reason (deprecated) #IMPLIED >
     <!--@VALUE-->
@@ -996,6 +997,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
     <!--@MATCH:metazone-->
     <!--@VALUE-->
+<!ATTLIST usesMetazone stdOffset CDATA #IMPLIED >
+    <!--@MATCH:regex/[+-][0-9]{2}(:[0-9]{2})?-->
+    <!--@VALUE-->
+<!ATTLIST usesMetazone dstOffset CDATA #IMPLIED >
+    <!--@MATCH:regex/[+-][0-9]{2}(:[0-9]{2})?-->
+    <!--@VALUE-->
 
 <!ELEMENT plurals ( pluralRules*, pluralRanges* ) >
 <!ATTLIST plurals type (ordinal | cardinal) #IMPLIED >
@@ -1090,7 +1097,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST numberingSystem digits CDATA #IMPLIED >
-    <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U00010D40-\U00010D49\U000116D0-\U000116E3\U00011BF0-\U00011BF9\U00016130-\U00016139\U00016D70-\U00016D79\U0001CCF0-\U0001CCF9\U0001E5F1-\U0001E5FA]]-->
+    <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U00011DE0-\U00011DE9]]-->
     <!--@VALUE-->
 <!ATTLIST numberingSystem rules CDATA #IMPLIED >
     <!--@MATCH:any-->
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.xsd b/make/data/cldr/common/dtd/ldmlSupplemental.xsd
index b7c64ddb38d..17445fc07b0 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.xsd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.xsd
@@ -65,10 +65,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="47" name="cldrVersion">
+      <xs:attribute default="48" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="47"/>
+            <xs:enumeration value="48"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -374,6 +374,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
   <xs:element name="scriptData">
     <xs:complexType>
       <xs:sequence>
@@ -2183,12 +2184,18 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="from"/>
       <xs:attribute name="to"/>
       <xs:attribute name="mzone" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="stdOffset"/>
+      <xs:attribute name="dstOffset"/>
     </xs:complexType>
   </xs:element>
   
   
   
   
+  
+  
+  
+  
   <xs:element name="plurals">
     <xs:complexType>
       <xs:sequence>
diff --git a/make/data/cldr/common/main/ab.xml b/make/data/cldr/common/main/ab.xml
index 07e0dfa4fae..a2348a2f634 100644
--- a/make/data/cldr/common/main/ab.xml
+++ b/make/data/cldr/common/main/ab.xml
@@ -2072,7 +2072,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity draft="unconfirmed">Пномпен</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity draft="unconfirmed">Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2746,9 +2746,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Мраҭашәаратәи Африка</generic>
-					<standard draft="unconfirmed">Мраҭашәаратәи Африка, астандартә аамҭа</standard>
-					<daylight draft="unconfirmed">Мраҭашәаратәи Африка, аԥхынтәи аамҭа</daylight>
+					<standard draft="unconfirmed">Мраҭашәаратәи Африка</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3136,6 +3134,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="unconfirmed">Гаиана</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Ҳаваи-алеуттәи астандартә аамҭа</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Ҳаваи-алеуттәи аамҭа</generic>
@@ -3686,6 +3689,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/af.xml b/make/data/cldr/common/main/af.xml
index 17355745ca1..269c1767e37 100644
--- a/make/data/cldr/common/main/af.xml
+++ b/make/data/cldr/common/main/af.xml
@@ -46,6 +46,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">Azerbeidjans</language>
 			<language type="az" alt="short">Azeri</language>
 			<language type="ba">Baskir</language>
+			<language type="bal">Baloetsji</language>
 			<language type="ban">Balinees</language>
 			<language type="bas">Basaa</language>
 			<language type="be">Belarussies</language>
@@ -118,8 +119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="eka">Ekajuk</language>
 			<language type="el">Grieks</language>
 			<language type="en">Engels</language>
-			<language type="en_GB">Engels (VK)</language>
-			<language type="en_US">Engels (VSA)</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">Spaans</language>
 			<language type="et">Estnies</language>
@@ -230,6 +229,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Keuls</language>
 			<language type="ku">Koerdies</language>
+			<language type="ku" menu="core">Koerdies</language>
+			<language type="ku" menu="extension">Koermandji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Kornies</language>
@@ -328,7 +329,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ojw">Wes-Ojibwa</language>
 			<language type="oka">Okanagan</language>
 			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
+			<language type="or">Odia</language>
 			<language type="os">Osseties</language>
 			<language type="pa">Pandjabi</language>
 			<language type="pag">Pangasinan</language>
@@ -522,7 +523,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Mymr">Mianmar</script>
 			<script type="Nkoo">N’Ko</script>
 			<script type="Olck">Ol Chiki</script>
-			<script type="Orya">Oriya</script>
+			<script type="Orya">Odia</script>
 			<script type="Phnx" draft="unconfirmed">Fenisieses</script>
 			<script type="Rohg">Hanifi</script>
 			<script type="Sinh">Sinhala</script>
@@ -629,6 +630,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombië</territory>
 			<territory type="CP">Clippertoneiland</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kaap Verde</territory>
@@ -874,33 +876,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numeriese rangskikking</key>
 			<key type="colStrength">Rangskiksterkte</key>
 			<key type="currency">Geldeenheid</key>
-			<key type="hc">Uursiklus (12 vs 24)</key>
+			<key type="em">Emoji-voorstelling</key>
+			<key type="hc">Uursiklus (12 vs. 24)</key>
 			<key type="lb">Reëlafbreek-styl</key>
+			<key type="lw">Lynafbrekingsteken in woorde</key>
 			<key type="ms">Maatstelsel</key>
 			<key type="numbers">Syfers</key>
+			<key type="ss">Afbrekingsteken ná afkorting</key>
 			<key type="timezone">Tydsone</key>
 			<key type="va">Lokaalvariant</key>
 			<key type="x">Privaat gebruik</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Boeddhistiese kalender</type>
+			<type key="calendar" type="buddhist" scope="core">Boeddhis</type>
 			<type key="calendar" type="chinese">Chinese kalender</type>
+			<type key="calendar" type="chinese" scope="core">Chinees</type>
 			<type key="calendar" type="coptic">Koptiese kalender</type>
+			<type key="calendar" type="coptic" scope="core">Kopties</type>
 			<type key="calendar" type="dangi">Dangi-kalender</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Etiopiese kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiopies</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiopiese Amete Alem-kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etiopiese Amete Alem</type>
 			<type key="calendar" type="gregorian">Gregoriaanse kalender</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriaans</type>
 			<type key="calendar" type="hebrew">Hebreeuse kalender</type>
+			<type key="calendar" type="hebrew" scope="core">Hebreeus</type>
 			<type key="calendar" type="indian">Indiese nasionale kalender</type>
 			<type key="calendar" type="islamic">Islamitiese kalender</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Islamitiese siviele kalender</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabelvormige burgerlike kalender)</type>
 			<type key="calendar" type="islamic-umalqura">Islamitiese kalender (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601-kalender</type>
 			<type key="calendar" type="japanese">Japannese kalender</type>
+			<type key="calendar" type="japanese" scope="core">Japannees</type>
 			<type key="calendar" type="persian">Persiese kalender</type>
+			<type key="calendar" type="persian" scope="core">Persies</type>
 			<type key="calendar" type="roc">Minguo-kalender</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Rekeningkundige geldeenheidformaat</type>
+			<type key="cf" type="account" scope="core">Rekeningkunde</type>
 			<type key="cf" type="standard">Standaard geldeenheidformaat</type>
+			<type key="cf" type="standard" scope="core">Standaard</type>
 			<type key="colAlternate" type="non-ignorable">Sorteer simbole</type>
 			<type key="colAlternate" type="shifted">Sorteer ignoreersimbole</type>
 			<type key="colBackwards" type="no">Sorteer aksente gewoonweg</type>
@@ -910,16 +931,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Sorteer hoofletters eerste</type>
 			<type key="colCaseLevel" type="no">Sorteer nie kassensitief nie</type>
 			<type key="colCaseLevel" type="yes">Sorteer kassensitief</type>
-			<type key="collation" type="big5han">Tradisionele Chinese sorteervolgorde - Groot5</type>
 			<type key="collation" type="dictionary">Woordeboek-sorteervolgorde</type>
 			<type key="collation" type="ducet">Verstek Unicode-rangskikvolgorde</type>
-			<type key="collation" type="gb2312han">Vereenvoudigde Chinese sorteervolgorde - GB2312</type>
+			<type key="collation" type="ducet" scope="core">Verstek Unicode</type>
 			<type key="collation" type="phonebook">Foonboek-sorteervolgorde</type>
 			<type key="collation" type="phonetic">Fonetiese sorteerorde</type>
 			<type key="collation" type="pinyin">Pinyin-sorteervolgorde</type>
 			<type key="collation" type="search">Algemenedoel-soektog</type>
+			<type key="collation" type="search" scope="core">Soektog</type>
 			<type key="collation" type="searchjl">Soek volgens Hangul-beginkonsonant</type>
 			<type key="collation" type="standard">Standaard rangskikvolgorde</type>
+			<type key="collation" type="standard" scope="core">Standaard</type>
 			<type key="collation" type="stroke">Slag-sorteervolgorde</type>
 			<type key="collation" type="traditional">Tradisionele sorteervolgorde</type>
 			<type key="collation" type="unihan">Radikale-slag-sorteervolgorde</type>
@@ -935,18 +957,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Vollewydte</type>
 			<type key="d0" type="hwidth">Halfwydte</type>
 			<type key="d0" type="npinyin">Numeries</type>
+			<type key="em" type="default" scope="core">Verstek</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Teks</type>
 			<type key="hc" type="h11">12-uur-stelsel (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-uur-stelsel (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-uur-stelsel (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-uur-stelsel (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Losse reëlafbreek-styl</type>
+			<type key="lb" type="loose" scope="core">Los</type>
 			<type key="lb" type="normal">Normale reëlafbreek-styl</type>
+			<type key="lb" type="normal" scope="core">Normaal</type>
 			<type key="lb" type="strict">Streng reëlafbreek-styl</type>
+			<type key="lb" type="strict" scope="core">Streng</type>
+			<type key="lw" type="breakall" scope="core">Breek als</type>
+			<type key="lw" type="keepall" scope="core">Hou als</type>
+			<type key="lw" type="normal" scope="core">Normaal</type>
+			<type key="lw" type="phrase" scope="core">Hou in frases</type>
 			<type key="m0" type="bgn">BGN-transliterasie</type>
 			<type key="m0" type="ungegn">UNGEGN-transliterasie</type>
 			<type key="ms" type="metric">Metrieke stelsel</type>
+			<type key="ms" type="metric" scope="core">Metriek</type>
 			<type key="ms" type="uksystem">Imperiale maatstelsel</type>
+			<type key="ms" type="uksystem" scope="core">VK</type>
 			<type key="ms" type="ussystem">VSA-maatstelsel</type>
+			<type key="ms" type="ussystem" scope="core">VSA</type>
 			<type key="numbers" type="arab">Arabies-Indiese syfers</type>
 			<type key="numbers" type="arabext">Uitgebreide Arabies-Indiese syfers</type>
 			<type key="numbers" type="armn">Armeense syfers</type>
@@ -991,6 +1030,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Tibettaanse syfers</type>
 			<type key="numbers" type="traditional">Tradisionele syfers</type>
 			<type key="numbers" type="vaii">Vai-syfers</type>
+			<type key="ss" type="none" scope="core">Af</type>
+			<type key="ss" type="standard" scope="core">Aan</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrieke stelsel</measurementSystemName>
@@ -1007,7 +1048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[aáâ b c d eéèêë f g h iîï j k l m n oôö p q r s t uû v w x y z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[àåäã æ ç íì óò úùü ý]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<dates>
@@ -1046,6 +1086,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1054,6 +1097,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1071,18 +1117,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EBhm">E hh:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E hh:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="Ehm">E hh:mm a</dateFormatItem>
-						<dateFormatItem id="Ehms">E hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
@@ -1100,9 +1145,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
@@ -1335,10 +1377,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="midnight">mn</dayPeriod>
 							<dayPeriod type="am">v</dayPeriod>
 							<dayPeriod type="pm">n</dayPeriod>
-							<dayPeriod type="morning1">o</dayPeriod>
-							<dayPeriod type="afternoon1">m</dayPeriod>
-							<dayPeriod type="evening1">a</dayPeriod>
-							<dayPeriod type="night1">n</dayPeriod>
+							<dayPeriod type="morning1">die oggend</dayPeriod>
+							<dayPeriod type="afternoon1">in die middag</dayPeriod>
+							<dayPeriod type="evening1">in die aand</dayPeriod>
+							<dayPeriod type="night1">in die nag</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
@@ -1348,15 +1390,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">aand</dayPeriod>
 							<dayPeriod type="night1">nag</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight">mn</dayPeriod>
-							<dayPeriod type="am">v</dayPeriod>
-							<dayPeriod type="pm">n</dayPeriod>
-							<dayPeriod type="morning1">o</dayPeriod>
-							<dayPeriod type="afternoon1">m</dayPeriod>
-							<dayPeriod type="evening1">a</dayPeriod>
-							<dayPeriod type="night1">n</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -1432,6 +1465,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1440,6 +1476,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1463,7 +1502,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">dd MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E dd MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1488,9 +1526,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">'week' w 'van' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
 							<greatestDifference id="B">hh:mm B – hh:mm B</greatestDifference>
 							<greatestDifference id="h">hh:mm B – hh:mm B</greatestDifference>
@@ -1535,7 +1570,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1552,7 +1586,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">h:mm a – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
@@ -2072,7 +2105,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Onbekende stad</exemplarCity>
+				<exemplarCity>Onbekende ligging</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
 				<exemplarCity>Doebai</exemplarCity>
@@ -2080,8 +2113,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kabul">
 				<exemplarCity>Kaboel</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Rothera-navorsingstasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Troll-stasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Syowa-stasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Mawson-stasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Davis-stasie</exemplarCity>
+			</zone>
 			<zone type="Antarctica/Vostok">
-				<exemplarCity>Wostok</exemplarCity>
+				<exemplarCity>Wostok-stasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Casey-stasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dumont d’Urville-stasie</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>McMurdo-stasie</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wene</exemplarCity>
@@ -2120,7 +2177,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity>Paas</exemplarCity>
+				<exemplarCity>Paaseiland</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kaap Verde</exemplarCity>
@@ -2194,7 +2251,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bisjkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kantoneiland</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Comore</exemplarCity>
@@ -2223,36 +2280,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxemburg</exemplarCity>
 			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Kwajalein Atoll</exemplarCity>
+			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macau</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maledive</exemplarCity>
 			</zone>
-			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bahia Banderas</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Meksikostad</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
 				<exemplarCity>Koeala-Loempoer</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Katmandoe</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
 				<exemplarCity>Muskat</exemplarCity>
 			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Marquesas-eilande</exemplarCity>
+			</zone>
 			<zone type="Asia/Karachi">
 				<exemplarCity>Karatsji</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity>Warskou</exemplarCity>
 			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitcairn-eilande</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Azores">
 				<exemplarCity>Asore</exemplarCity>
 			</zone>
@@ -2316,6 +2376,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiëf</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Wake-eiland</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Noord-Dakota</exemplarCity>
 			</zone>
@@ -2337,9 +2400,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Tsji Minhstad</exemplarCity>
 			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Mata-Utu</exemplarCity>
-			</zone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>Afganistan-tyd</standard>
@@ -2371,14 +2431,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Wes-Afrika-tyd</generic>
-					<standard>Wes-Afrika-standaardtyd</standard>
-					<daylight>Wes-Afrika-somertyd</daylight>
+					<standard>Wes-Afrika-tyd</standard>
 				</long>
 				<short>
-					<generic>WAT</generic>
 					<standard>WAT</standard>
-					<daylight>WAST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Alaska">
@@ -2502,9 +2558,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic>Aserbeidjan-tyd</generic>
-					<standard>Aserbeidjan-standaardtyd</standard>
-					<daylight>Aserbeidjan-somertyd</daylight>
+					<generic>Azerbeidjan-tyd</generic>
+					<standard>Azerbeidjan-standaardtyd</standard>
+					<daylight>Azerbeidjan-somertyd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
@@ -2614,7 +2670,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Dumont-d’Urville-tyd</standard>
+					<standard>Dumont d’Urville-tyd</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -2735,6 +2791,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guiana-tyd</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleoete-standaardtyd</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleoete-tyd</generic>
@@ -3316,7 +3377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -3327,34 +3387,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="one">¤0 k</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0 k</pattern>
 					<pattern type="1000" count="other">¤0 k</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 k</pattern>
 					<pattern type="10000" count="one">¤00 k</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 k</pattern>
 					<pattern type="10000" count="other">¤00 k</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 k</pattern>
 					<pattern type="100000" count="one">¤000 k</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000 k</pattern>
 					<pattern type="100000" count="other">¤000 k</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 k</pattern>
 					<pattern type="1000000" count="one">¤0 m</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0 m</pattern>
 					<pattern type="1000000" count="other">¤0 m</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0 m</pattern>
 					<pattern type="10000000" count="one">¤00 m</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00 m</pattern>
 					<pattern type="10000000" count="other">¤00 m</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00 m</pattern>
 					<pattern type="100000000" count="one">¤000 m</pattern>
 					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000 m</pattern>
 					<pattern type="100000000" count="other">¤000 m</pattern>
 					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000 m</pattern>
 					<pattern type="1000000000" count="one">¤0 mjd</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0 mjd</pattern>
 					<pattern type="1000000000" count="other">¤0 mjd</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 mjd</pattern>
 					<pattern type="10000000000" count="one">¤00 mjd</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 mjd</pattern>
 					<pattern type="10000000000" count="other">¤00 mjd</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 mjd</pattern>
 					<pattern type="100000000000" count="one">¤000 mjd</pattern>
 					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000 mjd</pattern>
 					<pattern type="100000000000" count="other">¤000 mjd</pattern>
 					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 mjd</pattern>
 					<pattern type="1000000000000" count="one">¤0 bn</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0 bn</pattern>
 					<pattern type="1000000000000" count="other">¤0 bn</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 bn</pattern>
 					<pattern type="10000000000000" count="one">¤00 bn</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00 bn</pattern>
 					<pattern type="10000000000000" count="other">¤00 bn</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 bn</pattern>
 					<pattern type="100000000000000" count="one">¤000 bn</pattern>
 					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000 bn</pattern>
-					<pattern type="100000000000000" count="other">¤ 000 bn</pattern>
+					<pattern type="100000000000000" count="other">¤000 bn</pattern>
 					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 bn</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -3434,7 +3512,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Botswana-pula</displayName>
 			</currency>
 			<currency type="BYN">
-				<displayName>Belarusiese roebel</displayName>
+				<displayName>Belarussiese roebel</displayName>
+				<displayName count="one">Belarussiese roebel</displayName>
+				<displayName count="other">Belarussiese roebel</displayName>
 				<symbol alt="narrow">р.</symbol>
 			</currency>
 			<currency type="BYR">
@@ -3502,7 +3582,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Etiopiese birr</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName>Euro</displayName>
+				<displayName>euro</displayName>
 				<displayName count="one">euro</displayName>
 				<displayName count="other">euro</displayName>
 			</currency>
@@ -3538,8 +3618,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="GTQ">
 				<displayName>Guatemalaanse kwetsal</displayName>
-				<displayName count="one">Guatemalaanse kwetsal</displayName>
-				<displayName count="other">Guatemalaanse kwetsal</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName>Guyanese dollar</displayName>
@@ -3567,8 +3645,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="INR">
 				<displayName>Indiese roepee</displayName>
-				<displayName count="one">Indiese rupee</displayName>
-				<displayName count="other">Indiese rupee</displayName>
+				<displayName count="one">Indiese roepee</displayName>
+				<displayName count="other">Indiese roepee</displayName>
 			</currency>
 			<currency type="IQD">
 				<displayName>Irakse dinar</displayName>
@@ -3631,7 +3709,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Liberiese dollar</displayName>
 			</currency>
 			<currency type="LSL">
-				<displayName>Lesotho loti</displayName>
+				<displayName>Lesotho-loti</displayName>
+				<displayName count="one">Lesotho-loti</displayName>
+				<displayName count="other">Lesotho-loti</displayName>
 			</currency>
 			<currency type="LTL">
 				<displayName>Litause litas</displayName>
@@ -3781,7 +3861,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Sierra Leoniese leone</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Sierra Leoniese leone (1964—2022)</displayName>
+				<displayName>Sierra Leoniese leone (1964–2022)</displayName>
+				<displayName count="one">Sierra Leoniese leone (1964–2022)</displayName>
+				<displayName count="other">Sierra Leoniese leone (1964–2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>Somaliese sjieling</displayName>
@@ -3875,6 +3957,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Oos-Karibiese dollar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karibiese gulde</displayName>
+				<displayName count="one">Karibiese gulde</displayName>
+				<displayName count="other">Karibiese gulde</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Wes-Afrikaanse CFA-frank</displayName>
 			</currency>
@@ -3902,6 +3989,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Zimbabwiese dollar</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwiese goud</displayName>
+				<displayName count="one">Zimbabwiese goud</displayName>
+				<displayName count="other">Zimbabwiese goud</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4098,7 +4190,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0} items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dele</displayName>
+				<unitPattern count="one">{0} deel</unitPattern>
+				<unitPattern count="other">{0} dele</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>dele per miljoen</displayName>
 				<unitPattern count="one">{0} deel per miljoen</unitPattern>
 				<unitPattern count="other">{0} dele per miljoen</unitPattern>
@@ -4116,6 +4213,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} per tienduisend</unitPattern>
 				<unitPattern count="other">{0} per tienduisend</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukose</displayName>
+				<unitPattern count="one">{0} glukose</unitPattern>
+				<unitPattern count="other">{0} glukose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
@@ -4316,6 +4418,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} newton</unitPattern>
 				<unitPattern count="other">{0} newton</unitPattern>
 			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>kilowattuur per 100 kilometer</displayName>
+				<unitPattern count="one">{0} kilowattuur per 100 kilometer</unitPattern>
+				<unitPattern count="other">{0} kilowattuur per 100 kilometer</unitPattern>
+			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>gigahertz</displayName>
 				<unitPattern count="one">{0} gigahertz</unitPattern>
@@ -4583,6 +4690,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimeter kwik</unitPattern>
 				<unitPattern count="other">{0} millimeter kwik</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>kwik</displayName>
+				<unitPattern count="one">{0} kwik</unitPattern>
+				<unitPattern count="other">{0} kwik</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pond per vierkante duim</displayName>
 				<unitPattern count="one">{0} pond per vierkante duim</unitPattern>
@@ -4667,7 +4779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} kelvin</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
-				<displayName>pondvoet</displayName>
+				<displayName>pondvoetkrag</displayName>
 				<unitPattern count="one">{0} pondvoetkrag</unitPattern>
 				<unitPattern count="other">{0} pondvoet</unitPattern>
 			</unit>
@@ -4677,20 +4789,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} newtonmeter</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName>kubieke kilometers</displayName>
+				<displayName>kubieke kilometer</displayName>
 				<unitPattern count="one">{0} kubieke kilometer</unitPattern>
-				<unitPattern count="other">{0} kubieke kilometers</unitPattern>
+				<unitPattern count="other">{0} kubieke kilometer</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>kubieke meters</displayName>
+				<displayName>kubieke meter</displayName>
 				<unitPattern count="one">{0} kubieke meter</unitPattern>
-				<unitPattern count="other">{0} kubieke meters</unitPattern>
+				<unitPattern count="other">{0} kubieke meter</unitPattern>
 				<perUnitPattern>{0} per kubieke meter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<displayName>kubieke sentimeters</displayName>
+				<displayName>kubieke sentimeter</displayName>
 				<unitPattern count="one">{0} kubieke sentimeter</unitPattern>
-				<unitPattern count="other">{0} kubieke sentimeters</unitPattern>
+				<unitPattern count="other">{0} kubieke sentimeter</unitPattern>
 				<perUnitPattern>{0} per kubieke sentimeter</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
@@ -4714,18 +4826,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} kubieke duim</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName>megaliters</displayName>
+				<displayName>megaliter</displayName>
 				<unitPattern count="one">{0} megaliter</unitPattern>
-				<unitPattern count="other">{0} megaliters</unitPattern>
+				<unitPattern count="other">{0} megaliter</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
-				<displayName>hektoliters</displayName>
+				<displayName>hektoliter</displayName>
 				<unitPattern count="one">{0} hektoliter</unitPattern>
-				<unitPattern count="other">{0} hektoliters</unitPattern>
+				<unitPattern count="other">{0} hektoliter</unitPattern>
 			</unit>
 			<unit type="volume-liter">
+				<displayName>liter</displayName>
 				<unitPattern count="one">{0} liter</unitPattern>
-				<unitPattern count="other">{0} liters</unitPattern>
+				<unitPattern count="other">{0} liter</unitPattern>
 				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
@@ -4753,6 +4866,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} metrieke koppie</unitPattern>
 				<unitPattern count="other">{0} metrieke koppies</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. vl. ons</displayName>
+				<unitPattern count="one">{0} m. vl. ons</unitPattern>
+				<unitPattern count="other">{0} m. vl. ons</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} acre-voet</unitPattern>
 				<unitPattern count="other">{0} acre-voet</unitPattern>
@@ -4765,7 +4883,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>Britse gelling</displayName>
-				<unitPattern count="one">{0} Britse gelling</unitPattern>
+				<unitPattern count="one">{0} Br. gelling</unitPattern>
 				<unitPattern count="other">{0} Britse gelling</unitPattern>
 			</unit>
 			<unit type="volume-quart">
@@ -4788,9 +4906,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} vloeistofons</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName>Imp. vloeistofonse</displayName>
-				<unitPattern count="one">{0} Imp. vloeistofons</unitPattern>
-				<unitPattern count="other">{0} Imp. vloeistofonse</unitPattern>
+				<displayName>Br. vloeistofonse</displayName>
+				<unitPattern count="one">{0} Br. vloeistofons</unitPattern>
+				<unitPattern count="other">{0} Br. vloeistofonse</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>eetlepels</displayName>
@@ -4808,11 +4926,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-dessert-spoon">
 				<displayName>dessertlepel</displayName>
 				<unitPattern count="one">{0} dessertlepel</unitPattern>
-				<unitPattern count="other">{0} dessertlepel</unitPattern>
+				<unitPattern count="other">{0} dessertlepels</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>Engelse dessertlepel</displayName>
-				<unitPattern count="one">{0} Engelse dessertlepel</unitPattern>
+				<unitPattern count="one">{0} Br. dessertlepel</unitPattern>
 				<unitPattern count="other">{0} Engelse dessertlepel</unitPattern>
 			</unit>
 			<unit type="volume-dram">
@@ -4825,20 +4943,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Engelse kwartgelling</unitPattern>
 				<unitPattern count="other">{0} Engelse kwartgelling</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>lig</displayName>
-				<unitPattern count="one">{0} lig</unitPattern>
-				<unitPattern count="other">{0} lig</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradiaal</displayName>
+				<unitPattern count="one">{0} steradiaal</unitPattern>
+				<unitPattern count="other">{0} steradiaal</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henries</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henries</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>IT-kalorie</displayName>
+				<unitPattern count="one">{0} IT-kalorie</unitPattern>
+				<unitPattern count="other">{0} IT-kalorieë</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramkrag</displayName>
+				<unitPattern count="one">{0} kilogramkrag</unitPattern>
+				<unitPattern count="other">{0} kilogramkrag</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>deeltjies per miljard</displayName>
 				<unitPattern count="one">{0} deeltjie per miljard</unitPattern>
 				<unitPattern count="other">{0} deeltjies per miljard</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>nagte</displayName>
-				<unitPattern count="one">{0} nag</unitPattern>
-				<unitPattern count="other">{0} nagte</unitPattern>
 				<perUnitPattern>{0} per nag</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -4927,7 +5102,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmol/l</unitPattern>
 				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>deel</displayName>
+				<unitPattern count="one">{0} deel</unitPattern>
+				<unitPattern count="other">{0} deel</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>dele/miljoen</displayName>
 				<unitPattern count="one">{0} d.p.m.</unitPattern>
 				<unitPattern count="other">{0} d.p.m.</unitPattern>
@@ -4941,6 +5121,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>per tienduisend</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -5087,8 +5272,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-megapixel">
 				<displayName>megapieksels</displayName>
-				<unitPattern count="one">{0} MP</unitPattern>
-				<unitPattern count="other">{0} MP</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>dpcm</displayName>
@@ -5102,6 +5285,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>stippels</displayName>
+				<unitPattern count="one">{0} stippel</unitPattern>
+				<unitPattern count="other">{0} stippels</unitPattern>
 			</unit>
 			<unit type="length-mile">
 				<displayName>myl</displayName>
@@ -5297,9 +5482,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} hl</unitPattern>
 				<unitPattern count="other">{0} hl</unitPattern>
 			</unit>
-			<unit type="volume-liter">
-				<displayName>liters</displayName>
-			</unit>
 			<unit type="volume-deciliter">
 				<displayName>dl</displayName>
 				<unitPattern count="one">{0} dl</unitPattern>
@@ -5325,6 +5507,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} m. kop</unitPattern>
 				<unitPattern count="other">{0} m. kop</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. vl. ons</displayName>
+				<unitPattern count="one">{0} m. vl. ons</unitPattern>
+				<unitPattern count="other">{0} m. vl. ons</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-voet</displayName>
 				<unitPattern count="one">{0} acre-vt.</unitPattern>
@@ -5368,9 +5555,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} vl.oz.</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName>Imp. vl.oz.</displayName>
-				<unitPattern count="one">{0} Imp. vl.oz.</unitPattern>
-				<unitPattern count="other">{0} Imp. vl.oz.</unitPattern>
+				<displayName>Br. vl. oz.</displayName>
+				<unitPattern count="one">{0} Br. vl. oz.</unitPattern>
+				<unitPattern count="other">{0} Br. vl. oz.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>e.</displayName>
@@ -5378,7 +5565,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} e.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName>tl.</displayName>
+				<displayName>t.</displayName>
 				<unitPattern count="one">{0} tl.</unitPattern>
 				<unitPattern count="other">{0} tl.</unitPattern>
 			</unit>
@@ -5393,9 +5580,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} dstlpl.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<displayName>dstlpl. Eng.</displayName>
-				<unitPattern count="one">{0} dstlpl. Eng.</unitPattern>
-				<unitPattern count="other">{0} dstlpl. Eng.</unitPattern>
+				<displayName>Br. dessertlepels</displayName>
+				<unitPattern count="one">{0} Br. dl.</unitPattern>
+				<unitPattern count="other">{0} Br. dl.</unitPattern>
 			</unit>
 			<unit type="volume-drop">
 				<displayName>druppel</displayName>
@@ -5404,7 +5591,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-dram">
 				<displayName>dragme vloeistof</displayName>
-				<unitPattern count="one">{0} dr. vl.</unitPattern>
+				<unitPattern count="one">{0} dragme</unitPattern>
 				<unitPattern count="other">{0} dr. vl.</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
@@ -5422,12 +5609,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} kwart Eng.</unitPattern>
 				<unitPattern count="other">{0} kwart Eng.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>IT-kal.</displayName>
+				<unitPattern count="one">{0} IT-kal.</unitPattern>
+				<unitPattern count="other">{0} IT-kal.</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>lig</displayName>
 				<unitPattern count="one">{0} lig</unitPattern>
 				<unitPattern count="other">{0} lig</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>deeltjies/miljard</displayName>
 				<unitPattern count="one">{0} deeltjie/miljard</unitPattern>
 				<unitPattern count="other">{0} deeltjies/miljard</unitPattern>
@@ -5479,22 +5671,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0}km²</unitPattern>
-				<unitPattern count="other">{0}km²</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one">{0}ha</unitPattern>
-				<unitPattern count="other">{0}ha</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
-				<displayName>meters²</displayName>
-				<unitPattern count="one">{0}m²</unitPattern>
-				<unitPattern count="other">{0}m²</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<unitPattern count="one">{0}cm²</unitPattern>
-				<unitPattern count="other">{0}cm²</unitPattern>
+				<displayName>meter²</displayName>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0}myl²</unitPattern>
@@ -5505,20 +5683,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ac</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<unitPattern count="one">{0}jt.²</unitPattern>
-				<unitPattern count="other">{0}jt.²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0}vt.²</unitPattern>
-				<unitPattern count="other">{0}vt.²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<unitPattern count="one">{0}dm.²</unitPattern>
-				<unitPattern count="other">{0}dm.²</unitPattern>
-			</unit>
-			<unit type="area-dunam">
-				<unitPattern count="one">{0}donum</unitPattern>
-				<unitPattern count="other">{0}donum</unitPattern>
+				<displayName>jt.²</displayName>
 			</unit>
 			<unit type="concentr-karat">
 				<unitPattern count="one">{0}kar.</unitPattern>
@@ -5537,10 +5702,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}item</unitPattern>
 				<unitPattern count="other">{0}item</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>deel</displayName>
+				<unitPattern count="one">{0} deel</unitPattern>
+				<unitPattern count="other">{0} deel</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>d.p.m.</displayName>
-				<unitPattern count="one">{0}d.p.m.</unitPattern>
-				<unitPattern count="other">{0} d.p.m.</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
@@ -5555,6 +5723,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0}l/km</unitPattern>
@@ -5611,8 +5784,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}kb</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<unitPattern count="one">{0}greep</unitPattern>
-				<unitPattern count="other">{0}greep</unitPattern>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
 			</unit>
 			<unit type="digital-bit">
 				<unitPattern count="one">{0}bis</unitPattern>
@@ -5716,10 +5889,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}N</unitPattern>
 				<unitPattern count="other">{0}N</unitPattern>
 			</unit>
-			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<unitPattern count="one">{0}kWh/100km</unitPattern>
-				<unitPattern count="other">{0}kWh/100km</unitPattern>
-			</unit>
 			<unit type="frequency-gigahertz">
 				<unitPattern count="one">{0}GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
@@ -5745,10 +5914,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}px</unitPattern>
 				<unitPattern count="other">{0}px</unitPattern>
 			</unit>
-			<unit type="graphics-megapixel">
-				<unitPattern count="one">{0} MP</unitPattern>
-				<unitPattern count="other">{0} MP</unitPattern>
-			</unit>
 			<unit type="graphics-pixel-per-centimeter">
 				<unitPattern count="one">{0}ppcm</unitPattern>
 				<unitPattern count="other">{0}ppcm</unitPattern>
@@ -5763,8 +5928,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>stippel</displayName>
-				<unitPattern count="one">{0}stippel</unitPattern>
-				<unitPattern count="other">{0}stippel</unitPattern>
+				<unitPattern count="one">{0} stippel</unitPattern>
+				<unitPattern count="other">{0} stippels</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
 				<unitPattern count="one">{0}R⊕</unitPattern>
@@ -5781,69 +5946,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}μm</unitPattern>
 				<unitPattern count="other">{0}μm</unitPattern>
 			</unit>
-			<unit type="length-nanometer">
-				<unitPattern count="one">{0}nm</unitPattern>
-				<unitPattern count="other">{0}nm</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0}pm</unitPattern>
-				<unitPattern count="other">{0}pm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0}myl</unitPattern>
-				<unitPattern count="other">{0}myl</unitPattern>
-			</unit>
 			<unit type="length-yard">
-				<unitPattern count="one">{0}jt.</unitPattern>
-				<unitPattern count="other">{0}jt.</unitPattern>
+				<displayName>jt.</displayName>
 			</unit>
 			<unit type="length-foot">
 				<displayName>vt.</displayName>
-				<unitPattern count="one">{0}vt.</unitPattern>
-				<unitPattern count="other">{0}vt.</unitPattern>
 			</unit>
 			<unit type="length-inch">
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0}pc</unitPattern>
-				<unitPattern count="other">{0}pc</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<displayName>lj</displayName>
-				<unitPattern count="one">{0} lj</unitPattern>
-				<unitPattern count="other">{0} lj</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<unitPattern count="one">{0}AE</unitPattern>
 				<unitPattern count="other">{0}AE</unitPattern>
 			</unit>
-			<unit type="length-furlong">
-				<unitPattern count="one">{0}fur</unitPattern>
-				<unitPattern count="other">{0}fur</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<unitPattern count="one">{0}vaam</unitPattern>
-				<unitPattern count="other">{0}vaam</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0}sm.</unitPattern>
-				<unitPattern count="other">{0}sm.</unitPattern>
-			</unit>
-			<unit type="length-mile-scandinavian">
-				<unitPattern count="one">{0}smi</unitPattern>
-				<unitPattern count="other">{0}smi</unitPattern>
-			</unit>
 			<unit type="length-point">
 				<displayName>pte.</displayName>
-				<unitPattern count="one">{0}pt.</unitPattern>
-				<unitPattern count="other">{0}pt.</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
 				<displayName>R☉</displayName>
-				<unitPattern count="one">{0}R☉</unitPattern>
-				<unitPattern count="other">{0}R☉</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one">{0}lx</unitPattern>
@@ -5951,6 +6075,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}lb./vk.dm</unitPattern>
 				<unitPattern count="other">{0}lb./vk.dm</unitPattern>
@@ -6021,14 +6149,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}Nm</unitPattern>
 				<unitPattern count="other">{0}Nm</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0}km³</unitPattern>
-				<unitPattern count="other">{0}km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0}cm³</unitPattern>
-				<unitPattern count="other">{0}cm³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-mile">
 				<unitPattern count="one">{0}myl³</unitPattern>
 				<unitPattern count="other">{0}myl³</unitPattern>
@@ -6047,39 +6167,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}dm³</unitPattern>
 				<unitPattern count="other">{0}dm³</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0}ML</unitPattern>
-				<unitPattern count="other">{0}ML</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<unitPattern count="one">{0}hl</unitPattern>
-				<unitPattern count="other">{0}hl</unitPattern>
-			</unit>
 			<unit type="volume-liter">
 				<displayName>liter</displayName>
-				<unitPattern count="one">{0}l</unitPattern>
-				<unitPattern count="other">{0}l</unitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<unitPattern count="one">{0}dl</unitPattern>
-				<unitPattern count="other">{0}dl</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one">{0}cl</unitPattern>
-				<unitPattern count="other">{0}cl</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<unitPattern count="one">{0}ml</unitPattern>
-				<unitPattern count="other">{0}ml</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
 				<displayName>pt.</displayName>
-				<unitPattern count="one">{0}mpt.</unitPattern>
-				<unitPattern count="other">{0}mpt.</unitPattern>
 			</unit>
-			<unit type="volume-cup-metric">
-				<unitPattern count="one">{0}m.kop</unitPattern>
-				<unitPattern count="other">{0}m.kop</unitPattern>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. vl. ons</displayName>
+				<unitPattern count="one">{0} m. vl. ons</unitPattern>
+				<unitPattern count="other">{0} m. vl. ons</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0}ac.-vt.</unitPattern>
@@ -6116,15 +6213,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}vl.oz.</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName>Imp vl.oz.</displayName>
-				<unitPattern count="one">{0}Im.vl.oz.</unitPattern>
-				<unitPattern count="other">{0}Im.vl.oz.</unitPattern>
+				<displayName>Br. vl. oz.</displayName>
+				<unitPattern count="one">{0} Br. vl. oz.</unitPattern>
+				<unitPattern count="other">{0} Br. vl. oz.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one">{0}e.</unitPattern>
 				<unitPattern count="other">{0}e.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
+				<displayName>t.</displayName>
 				<unitPattern count="one">{0}tl.</unitPattern>
 				<unitPattern count="other">{0}tl.</unitPattern>
 			</unit>
@@ -6137,14 +6235,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}dstlpl.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<unitPattern count="one">{0}dlpl.Eng</unitPattern>
-				<unitPattern count="other">{0}dlpl.Eng</unitPattern>
+				<displayName>Br. dl.</displayName>
+				<unitPattern count="one">{0} Br. dl.</unitPattern>
+				<unitPattern count="other">{0} Br. dl.</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<unitPattern count="one">{0}dr</unitPattern>
-				<unitPattern count="other">{0}dr</unitPattern>
+				<unitPattern count="one">{0} dr.</unitPattern>
+				<unitPattern count="other">{0} dr.</unitPattern>
 			</unit>
 			<unit type="volume-dram">
+				<displayName>vl. dr.</displayName>
 				<unitPattern count="one">{0}dr.vl.</unitPattern>
 				<unitPattern count="other">{0}dr.vl.</unitPattern>
 			</unit>
@@ -6161,22 +6261,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}kw.Eng.</unitPattern>
 				<unitPattern count="other">{0}kw.Eng</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>lig</displayName>
-				<unitPattern count="one">{0} lig</unitPattern>
-				<unitPattern count="other">{0} lig</unitPattern>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>deeltjies/miljard</displayName>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>IT-kal.</displayName>
+				<unitPattern count="one">{0} IT-kal.</unitPattern>
+				<unitPattern count="other">{0} IT-kal.</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 				<unitPattern count="one">{0}deeltjie/miljard</unitPattern>
 				<unitPattern count="other">{0}deeltjies/miljard</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>nagte</displayName>
-				<unitPattern count="one">{0} nag</unitPattern>
-				<unitPattern count="other">{0} nagte</unitPattern>
-				<perUnitPattern>{0}/nag</perUnitPattern>
-			</unit>
 		</unitLength>
 		<durationUnit type="hm">
 			<durationUnitPattern>hh:mm</durationUnitPattern>
@@ -6200,10 +6322,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<listPattern type="standard-narrow">
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
 			<listPatternPart type="middle">{0} {1}</listPatternPart>
@@ -6536,7 +6654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<nameField type="surname">Müller</nameField>
 		</sampleName>
 		<sampleName item="foreignGGS">
-			<nameField type="given">Zalta</nameField>
+			<nameField type="given">Zelda</nameField>
 			<nameField type="given2">Herman</nameField>
 			<nameField type="surname">Stander</nameField>
 		</sampleName>
diff --git a/make/data/cldr/common/main/ak.xml b/make/data/cldr/common/main/ak.xml
index f2417e895de..773fdfc5530 100644
--- a/make/data/cldr/common/main/ak.xml
+++ b/make/data/cldr/common/main/ak.xml
@@ -14,12 +14,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languages>
 			<language type="af">Afrikaans</language>
 			<language type="ak">Akan</language>
-			<language type="am">Amarik</language>
+			<language type="am">Amariki</language>
 			<language type="ar">Arabeke</language>
 			<language type="ar_001">Arabeke Kasa Nhyehyɛeɛ Foforɔ</language>
 			<language type="as">Asamese</language>
 			<language type="ast">Asturiani</language>
 			<language type="az">Asabegyanni</language>
+			<language type="bal">Balukyi</language>
 			<language type="be">Belarus kasa</language>
 			<language type="bg">Bɔlgeria kasa</language>
 			<language type="bgc">Harianvi</language>
@@ -42,13 +43,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="de_CH">Swisalande Gyaaman</language>
 			<language type="doi">Dɔgri</language>
 			<language type="dsb">Sɔɔbia a ɛwɔ fam</language>
+			<language type="ee">Ayigbe</language>
 			<language type="el">Greek kasa</language>
 			<language type="en">Borɔfo</language>
 			<language type="en_GB">Ngresi Borɔfo</language>
 			<language type="en_US">Amɛrika Borɔfo</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">Spain kasa</language>
-			<language type="es_419">Spain kasa (Laaten Amɛrika)</language>
 			<language type="et">Estonia kasa</language>
 			<language type="eu">Baske</language>
 			<language type="fa">Pɛɛhyia kasa</language>
@@ -306,7 +307,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BO">Bolivia</territory>
 			<territory type="BQ">Caribbean Netherlands</territory>
 			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahama</territory>
+			<territory type="BS">Bahamase</territory>
 			<territory type="BT">Butan</territory>
 			<territory type="BV">Bouvet Island</territory>
 			<territory type="BW">Bɔtswana</territory>
@@ -327,8 +328,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Kyaena</territory>
 			<territory type="CO">Kolombia</territory>
 			<territory type="CP">Klepatin Aeland</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kɔsta Rika</territory>
-			<territory type="CU">Kuba</territory>
+			<territory type="CU">Kiuba</territory>
 			<territory type="CV">Kepvɛdfo Islands</territory>
 			<territory type="CW">Kurakaw</territory>
 			<territory type="CX">Buronya Supɔ</territory>
@@ -349,7 +351,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="EH">Sahara Atɔeɛ</territory>
 			<territory type="ER">Ɛritrea</territory>
 			<territory type="ES">Spain</territory>
-			<territory type="ET">Ithiopia</territory>
+			<territory type="ET">Yitiopia</territory>
 			<territory type="EU">Yuropu Nkabomkuo</territory>
 			<territory type="EZ">Yuropu Fam</territory>
 			<territory type="FI">Finland</territory>
@@ -386,7 +388,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="HT">Heiti</territory>
 			<territory type="HU">Hangari</territory>
 			<territory type="IC">Canary Islands</territory>
-			<territory type="ID">Indɔnehyia</territory>
+			<territory type="ID">Ndoniihyia</territory>
 			<territory type="IE">Aereland</territory>
 			<territory type="IL">Israe</territory>
 			<territory type="IM">Isle of Man</territory>
@@ -394,7 +396,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IO">Britenfo Man Wɔ India Po No Mu</territory>
 			<territory type="IO" alt="chagos">Kyagɔso Akyipalego</territory>
 			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
+			<territory type="IR">Yiran</territory>
 			<territory type="IS">Aesland</territory>
 			<territory type="IT">Itali</territory>
 			<territory type="JE">Gyɛsi</territory>
@@ -406,7 +408,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="KH">Kambodia</territory>
 			<territory type="KI">Kiribati</territory>
 			<territory type="KM">Kɔmɔrɔs</territory>
-			<territory type="KN">Saint Kitts ne Nɛves</territory>
+			<territory type="KN">Saint Kitts ne Nevis</territory>
 			<territory type="KP">Korea Atifi</territory>
 			<territory type="KR">Korea Anaafoɔ</territory>
 			<territory type="KW">Kuweti</territory>
@@ -489,7 +491,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SE">Sweden</territory>
 			<territory type="SG">Singapɔ</territory>
 			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovinia</territory>
+			<territory type="SI">Slovenia</territory>
 			<territory type="SJ">Svalbard ne Jan Mayen</territory>
 			<territory type="SK">Slovakia</territory>
 			<territory type="SL">Sɛra Liɔn</territory>
@@ -553,9 +555,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="collation">Nyiyie Kwan</key>
 			<key type="currency">Sika</key>
 			<key type="hc">Dɔnhwere Nkɔmmaeɛ (12 anaa 24)</key>
-			<key type="lb">Line Break Nhyehyɛeɛ</key>
+			<key type="lb">Line Break Nhyehyɛeɛ Ketee</key>
 			<key type="ms">Nsusudeɛ Sestɛm</key>
-			<key type="numbers">Nɛma</key>
+			<key type="numbers">Nɔma</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Budafoɔ Kalɛnna</type>
@@ -565,12 +567,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="ethiopic">Yitiopia Kalɛnna</type>
 			<type key="calendar" type="ethiopic-amete-alem">Yitiopia Amete Alɛm Kalɛnna</type>
 			<type key="calendar" type="gregorian">Gregorian Kalɛnna</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Hibri Kalɛnda</type>
 			<type key="calendar" type="islamic">Higyiri Kalɛnda</type>
 			<type key="calendar" type="islamic-civil">Higyiri Kalɛnda (tabula, sivil epokyi</type>
 			<type key="calendar" type="islamic-umalqura">Higyiri Kalɛnda (Ummm al-Kura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 Kalɛnna</type>
-			<type key="calendar" type="japanese">Gyapanfoɔ Kalɛnda</type>
+			<type key="calendar" type="japanese">Gyapanfoɔ Kalɛnna</type>
 			<type key="calendar" type="persian">Pɛɛsiafoɔ Kalɛnda</type>
 			<type key="calendar" type="roc">Minguo Kalɛnda</type>
 			<type key="cf" type="account">Sika Nkotabuo Fɔmate</type>
@@ -578,6 +581,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="ducet">Koodu Korɔ Nyiyie Kwan a ɛdi Kan</type>
 			<type key="collation" type="search">Daa-Botaeɛ Adehwehwɛ</type>
 			<type key="collation" type="standard">Nyiyie Kwan Susudua</type>
+			<type key="collation" type="standard" scope="core">Susudua</type>
 			<type key="hc" type="h11">Nnɔnhwere 12 Sestɛm (0–11)</type>
 			<type key="hc" type="h12">Nnɔnhwere 12 Sestɛm (1–12</type>
 			<type key="hc" type="h23">Nnɔnhwere 24 Sestɛm (0–23)</type>
@@ -713,33 +717,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ɔpɛpɔn</month>
-							<month type="2">Ɔgyefoɔ</month>
-							<month type="3">Ɔbɛnem</month>
-							<month type="4">Oforisuo</month>
-							<month type="5">Kɔtɔnimma</month>
-							<month type="6">Ayɛwohomumu</month>
-							<month type="7">Kutawonsa</month>
-							<month type="8">Ɔsanaa</month>
-							<month type="9">Ɛbɔ</month>
-							<month type="10">Ahinime</month>
-							<month type="11">Obubuo</month>
-							<month type="12">Ɔpɛnimma</month>
-						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1">Ɔ</month>
-							<month type="2">Ɔ</month>
-							<month type="3">Ɔ</month>
+							<month type="1">Ɔp</month>
+							<month type="2">Ɔg</month>
+							<month type="3">Ɔb</month>
 							<month type="4">O</month>
 							<month type="5">K</month>
 							<month type="6">A</month>
-							<month type="7">K</month>
-							<month type="8">Ɔ</month>
-							<month type="9">Ɛ</month>
-							<month type="10">A</month>
-							<month type="11">O</month>
-							<month type="12">Ɔ</month>
+							<month type="7">Ku</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Ɔpɛpɔn</month>
@@ -757,20 +747,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Ɔpɛpɔn</month>
-							<month type="2">Ɔgyefoɔ</month>
-							<month type="3">Ɔbɛnem</month>
-							<month type="4">Oforisuo</month>
-							<month type="5">Kɔtɔnimma</month>
-							<month type="6">Ayɛwohomumu</month>
-							<month type="7">Kutawonsa</month>
-							<month type="8">Ɔsanaa</month>
-							<month type="9">Ɛbɔ</month>
-							<month type="10">Ahinime</month>
-							<month type="11">Obubuo</month>
-							<month type="12">Ɔpɛnimma</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">Ɔ</month>
 							<month type="2">Ɔ</month>
@@ -785,26 +761,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">O</month>
 							<month type="12">Ɔ</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ɔpɛpɔn</month>
-							<month type="2">Ɔgyefoɔ</month>
-							<month type="3">Ɔbɛnem</month>
-							<month type="4">Oforisuo</month>
-							<month type="5">Kɔtɔnimma</month>
-							<month type="6">Ayɛwohomumu</month>
-							<month type="7">Kutawonsa</month>
-							<month type="8">Ɔsanaa</month>
-							<month type="9">Ɛbɔ</month>
-							<month type="10">Ahinime</month>
-							<month type="11">Obubuo</month>
-							<month type="12">Ɔpɛnimma</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">Kwe</day>
+							<day type="sun">Kwa</day>
+							<day type="mon">Dwo</day>
+							<day type="tue">Ben</day>
+							<day type="wed">Wuk</day>
+							<day type="thu">Yaw</day>
+							<day type="fri">Fia</day>
+							<day type="sat">Mem</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Kwa</day>
 							<day type="mon">Dwo</day>
 							<day type="tue">Ben</day>
 							<day type="wed">Wuk</day>
@@ -813,7 +784,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="sat">Mem</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Kwasiada</day>
+							<day type="sun">Sun</day>
 							<day type="mon">Dwoada</day>
 							<day type="tue">Benada</day>
 							<day type="wed">Wukuada</day>
@@ -823,6 +794,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">Kwa</day>
+							<day type="mon">Dwo</day>
+							<day type="tue">Ben</day>
+							<day type="wed">Wuk</day>
+							<day type="thu">Yaw</day>
+							<day type="fri">Fia</day>
+							<day type="sat">Mem</day>
+						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">K</day>
 							<day type="mon">D</day>
@@ -832,8 +812,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">F</day>
 							<day type="sat">M</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">Kwa</day>
+							<day type="mon">Dwo</day>
+							<day type="tue">Ben</day>
+							<day type="wed">Wuk</day>
+							<day type="thu">Yaw</day>
+							<day type="fri">Fia</day>
+							<day type="sat">Mem</day>
+						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Kwasiada</day>
+							<day type="sun">Sun</day>
 							<day type="mon">Dwoada</day>
 							<day type="tue">Benada</day>
 							<day type="wed">Wukuada</day>
@@ -858,29 +847,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">Kɔta a ɛtɔ so nnan</quarter>
 						</quarterWidth>
 					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Kɔta1</quarter>
-							<quarter type="2">Kɔta2</quarter>
-							<quarter type="3">Kɔta3</quarter>
-							<quarter type="4">Kɔta4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Kɔta a ɛdi kan</quarter>
-							<quarter type="2">kɔta a ɛtɔ so mmienu</quarter>
-							<quarter type="3">Kɔta a ɛtɔ so mmiɛnsa</quarter>
-							<quarter type="4">Kɔta a ɛtɔ so nnan</quarter>
-						</quarterWidth>
-					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="am">AN</dayPeriod>
-							<dayPeriod type="pm">EW</dayPeriod>
+							<dayPeriod type="pm">ANW</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">an</dayPeriod>
+							<dayPeriod type="pm">anw</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AN</dayPeriod>
+							<dayPeriod type="pm">ANW</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AN</dayPeriod>
+							<dayPeriod type="pm">ANW</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AN</dayPeriod>
+							<dayPeriod type="pm">ANW</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">AN</dayPeriod>
 							<dayPeriod type="pm">ANW</dayPeriod>
@@ -903,23 +894,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEE, MMMM d, y</pattern>
+							<pattern>EEE, d, MMMM, y</pattern>
 							<datetimeSkeleton>yMMMMEEEEdd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>MMMM d, y</pattern>
+							<pattern>d, MMMM, y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>MMM d, y</pattern>
+							<pattern>d, MMM, y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>M/d/yy</pattern>
+							<pattern>d/M/yy</pattern>
 							<datetimeSkeleton>yyMMdd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -976,9 +967,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
@@ -1045,9 +1033,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
 							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
@@ -1087,12 +1072,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="era">
 				<displayName>berɛ</displayName>
 			</field>
-			<field type="era-short">
-				<displayName>berɛ</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName>berɛ</displayName>
-			</field>
 			<field type="year">
 				<displayName>Afe</displayName>
 				<relative type="-1">afe a atwam</relative>
@@ -1107,32 +1086,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">mfeɛ {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="year-short">
-				<relative type="-1">afe a atwam</relative>
-				<relative type="0">afe yi</relative>
-				<relative type="1">afe a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">afe {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">mfeɛ {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">afe {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">mfeɛ {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-narrow">
-				<relative type="-1">afe a atwam</relative>
-				<relative type="0">afe yi</relative>
-				<relative type="1">afe a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">afe {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">mfeɛ {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">afe {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">mfeɛ {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="quarter">
 				<displayName>kɔta</displayName>
 				<relative type="-1">kɔta a atwam</relative>
@@ -1147,19 +1100,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">kɔta ahodoɔ {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="quarter-short">
-				<displayName>kɔta</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">kɔta {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">kɔta ahodoɔ {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">kɔta {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">kɔta ahodoɔ {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="quarter-narrow">
-				<displayName>kɔta</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">kɔta {0} mu</relativeTimePattern>
 					<relativeTimePattern count="other">kɔta {0} mu</relativeTimePattern>
@@ -1184,22 +1125,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<relative type="-1">bosome a atwam</relative>
-				<relative type="0">bosome yi</relative>
-				<relative type="1">bosome a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">bosome {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">abosome{0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">bosome {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">abosome{0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-narrow">
-				<relative type="-1">bosome a atwam</relative>
-				<relative type="0">bosome yi</relative>
-				<relative type="1">bosome a ɛdi hɔ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">bosome {0} mu</relativeTimePattern>
 					<relativeTimePattern count="other">abosome{0} mu</relativeTimePattern>
@@ -1224,26 +1149,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 				<relativePeriod>nnawɔtwe a ɛtɔ so {0}mu</relativePeriod>
 			</field>
-			<field type="week-short">
-				<displayName>Nnawɔtwe</displayName>
-				<relative type="-1">nnawɔtwe a atwam</relative>
-				<relative type="0">nnawɔtwe yi</relative>
-				<relative type="1">nnawɔtwe a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">nnawɔtwe {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nnawɔtwe {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">nnawɔtwe{0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nnawɔtwe{0} a atwam</relativeTimePattern>
-				</relativeTime>
-				<relativePeriod>nnawɔtwe a ɛtɔ so {0}mu</relativePeriod>
-			</field>
 			<field type="week-narrow">
-				<displayName>Nnawɔtwe</displayName>
-				<relative type="-1">nnawɔtwe a atwam</relative>
-				<relative type="0">nnawɔtwe yi</relative>
-				<relative type="1">nnawɔtwe a ɛdi hɔ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">nnawɔtwe {0} mu.</relativeTimePattern>
 					<relativeTimePattern count="other">nnawɔtwe {0} mu</relativeTimePattern>
@@ -1252,17 +1158,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="one">nnawɔtwe{0} a atwam</relativeTimePattern>
 					<relativeTimePattern count="other">nnawɔtwe {0} a atwam</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod>nnawɔtwe a ɛtɔ so {0}mu</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>bosome mu nnawɔtwe</displayName>
 			</field>
-			<field type="weekOfMonth-short">
-				<displayName>bosome mu nnawɔtwe</displayName>
-			</field>
-			<field type="weekOfMonth-narrow">
-				<displayName>bosome mu nnawɔtwe</displayName>
-			</field>
 			<field type="day">
 				<displayName>Da</displayName>
 				<relative type="-1">nnora</relative>
@@ -1277,59 +1176,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">nna{0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="day-short">
-				<relative type="-1">Ndeda ɛnnora</relative>
-				<relative type="0">Ndɛ ɛnnɛ</relative>
-				<relative type="1">Ɔkyena</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">da {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nna {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">da{0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nna{0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="day-narrow">
 				<relative type="-1">ɛnnora</relative>
 				<relative type="0">ɛnnɛ</relative>
 				<relative type="1">Ɔkyena</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">da {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nna {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">da{0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nna{0} a atwam</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="dayOfYear">
 				<displayName>afe mu da</displayName>
 			</field>
-			<field type="dayOfYear-short">
-				<displayName>afe mu da</displayName>
-			</field>
-			<field type="dayOfYear-narrow">
-				<displayName>afe mu da</displayName>
-			</field>
 			<field type="weekday">
 				<displayName>nnawɔtwe mu da</displayName>
 			</field>
-			<field type="weekday-short">
-				<displayName>nnawɔtwe mu da</displayName>
-			</field>
-			<field type="weekday-narrow">
-				<displayName>nnawɔtwe mu da</displayName>
-			</field>
 			<field type="weekdayOfMonth">
 				<displayName>nnawɔtwe mu da wɔ bosome mu</displayName>
 			</field>
-			<field type="weekdayOfMonth-short">
-				<displayName>nnawɔtwe mu da wɔ bosome mu</displayName>
-			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName>nnawɔtwe mu da wɔ bosome mu</displayName>
-			</field>
 			<field type="sun">
 				<relative type="-1">Kwasiada a atwam</relative>
 				<relative type="0">Kwasiada yi</relative>
@@ -1343,32 +1203,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Kwasiada {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sun-short">
-				<relative type="-1">Kwasiada a atwam</relative>
-				<relative type="0">Kwasiada yi</relative>
-				<relative type="1">Kwasiada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Kwasiada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Kwasiada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Kwasiada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Kwasiada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sun-narrow">
-				<relative type="-1">Kwasiada a atwam</relative>
-				<relative type="0">Kwasiada yi</relative>
-				<relative type="1">Kwasiada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Kwasiada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Kwasiada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Kwasiada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Kwasiada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="mon">
 				<relative type="-1">Dwoada a atwam</relative>
 				<relative type="0">Dwoada yi</relative>
@@ -1382,32 +1216,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Dwoada {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="mon-short">
-				<relative type="-1">Dwoada a atwam</relative>
-				<relative type="0">Dwoada yi</relative>
-				<relative type="1">Dwoada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Dwoada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Dwoada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Dwoada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Dwoada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="mon-narrow">
-				<relative type="-1">Dwoada a atwam</relative>
-				<relative type="0">Dwoada yi</relative>
-				<relative type="1">Dwoada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Dwoada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Dwoada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Dwoada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Dwoada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="tue">
 				<relative type="-1">Benada a atwam</relative>
 				<relative type="0">Benada yi</relative>
@@ -1421,32 +1229,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Benada {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="tue-short">
-				<relative type="-1">Benada a atwam</relative>
-				<relative type="0">Benada yi</relative>
-				<relative type="1">Benada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Benada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Benada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Benada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Benada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="tue-narrow">
-				<relative type="-1">Benada a atwam</relative>
-				<relative type="0">Benada yi</relative>
-				<relative type="1">Benada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Benada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Benada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Benada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Benada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="wed">
 				<relative type="-1">Wukuada a atwam</relative>
 				<relative type="0">Wukuada yi</relative>
@@ -1460,32 +1242,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Wukuada {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="wed-short">
-				<relative type="-1">Wukuada a atwam</relative>
-				<relative type="0">Wukuada yi</relative>
-				<relative type="1">Wukuada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Wukuada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Wukuada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Wukuada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Wukuada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="wed-narrow">
-				<relative type="-1">Wukuada a atwam</relative>
-				<relative type="0">Wukuada yi</relative>
-				<relative type="1">Wukuada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Wukuada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Wukuada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Wukuada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Wukuada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu">
 				<relative type="-1">Yawoada a atwam</relative>
 				<relative type="0">Yawoada yi</relative>
@@ -1499,32 +1255,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Yawoada {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="thu-short">
-				<relative type="-1">Yawoada a atwam</relative>
-				<relative type="0">Yawoada yi</relative>
-				<relative type="1">Yawoada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Yawoada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Yawoada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Yawoada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Yawoada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="thu-narrow">
-				<relative type="-1">Yawoada a atwam</relative>
-				<relative type="0">Yawoada yi</relative>
-				<relative type="1">Yawoada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Yawoada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Yawoada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Yawoada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Yawoada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="fri">
 				<relative type="-1">Fiada a atwam</relative>
 				<relative type="0">Fiada yi</relative>
@@ -1538,49 +1268,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Fiada {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="fri-short">
-				<relative type="-1">Fiada a atwam</relative>
-				<relative type="0">Fiada yi</relative>
-				<relative type="1">Fiada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Fiada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Fiada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Fiada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Fiada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="fri-narrow">
-				<relative type="-1">Fiada a atwam</relative>
-				<relative type="0">Fiada yi</relative>
-				<relative type="1">Fiada a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Fiada {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Fiada {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Fiada {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Fiada {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="sat">
 				<relative type="-1">Memeneda a atwam</relative>
 				<relative type="0">Memeneda yi</relative>
-				<relative type="1">Memeneda a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Memeneda {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Memeneda {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Memeneda {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Memeneda {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sat-short">
-				<relative type="-1">Memeneda a atwam</relative>
-				<relative type="0">Memeneda yi</relative>
-				<relative type="1">Memeneda a ɛdi hɔ</relative>
+				<relative type="1">next Saturday</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">Memeneda {0} mu</relativeTimePattern>
 					<relativeTimePattern count="other">Memeneda {0} mu</relativeTimePattern>
@@ -1593,25 +1284,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="sat-narrow">
 				<relative type="-1">Memeneda a atwam</relative>
 				<relative type="0">Memeneda yi</relative>
-				<relative type="1">Memeneda a ɛdi hɔ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">Memeneda {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">Memeneda {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Memeneda {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">Memeneda {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="dayperiod-short">
-				<displayName>anɔpa/anwummerɛ</displayName>
+				<relative type="1">next Saturday</relative>
 			</field>
 			<field type="dayperiod">
 				<displayName>anɔpa/anwummerɛ</displayName>
 			</field>
-			<field type="dayperiod-narrow">
-				<displayName>anɔpa/anwummerɛ</displayName>
-			</field>
 			<field type="hour">
 				<displayName>dɔnhwere</displayName>
 				<relative type="0">dɔnhwere yi</relative>
@@ -1624,28 +1301,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">nnɔnhwere {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="hour-short">
-				<displayName>dɔnhwere</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">dɔnhwere {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nnɔnhwere {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">dɔnhwere {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nnɔnhwere {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="hour-narrow">
-				<displayName>dɔnhwere</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">dɔnhwere {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nnɔnhwere {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">dɔnhwere {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nnɔnhwere {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="minute">
 				<displayName>sima</displayName>
 				<relative type="0">sima yi</relative>
@@ -1658,60 +1313,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">sima {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="minute-short">
-				<displayName>sima</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">sima {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">sima {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">sima {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">sima {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-narrow">
-				<displayName>sima</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">sima {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">sima {0} mu</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">sima {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">sima {0} a atwam</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="second">
 				<displayName>Simasin</displayName>
 				<relative type="0">seesei</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">anibuo {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nnibuo {0} mu</relativeTimePattern>
+					<relativeTimePattern count="one">simasin {0} mu</relativeTimePattern>
+					<relativeTimePattern count="other">simasin {0} mu</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">anibuo {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nnibuo {0} a atwam</relativeTimePattern>
+					<relativeTimePattern count="one">simasin {0} a atwam</relativeTimePattern>
+					<relativeTimePattern count="other">simasin {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName>Simasin</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">anibuo {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nnibuo {0} mu</relativeTimePattern>
+					<relativeTimePattern count="one">simasin {0} mu</relativeTimePattern>
+					<relativeTimePattern count="other">simasin {0} mu</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">anibuo {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nnibuo {0} a atwam</relativeTimePattern>
+					<relativeTimePattern count="one">simasin {0} a atwam</relativeTimePattern>
+					<relativeTimePattern count="other">simasin {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>Simasin</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">anibuo {0} mu</relativeTimePattern>
-					<relativeTimePattern count="other">nnibuo {0} mu</relativeTimePattern>
+					<relativeTimePattern count="one">simasin {0} mu</relativeTimePattern>
+					<relativeTimePattern count="other">simasin {0} mu</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">anibuo {0} a atwam</relativeTimePattern>
-					<relativeTimePattern count="other">nnibuo {0} a atwam</relativeTimePattern>
+					<relativeTimePattern count="one">simasin {0} a atwam</relativeTimePattern>
+					<relativeTimePattern count="other">simasin {0} a atwam</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
@@ -1720,9 +1351,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="zone-short">
 				<displayName>nkyekyɛmu</displayName>
 			</field>
-			<field type="zone-narrow">
-				<displayName>nkyekyɛmu</displayName>
-			</field>
 		</fields>
 		<timeZoneNames>
 			<regionFormat>Berɛ {0}</regionFormat>
@@ -1829,9 +1457,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Ouagadougou">
 				<exemplarCity>Wagadugu</exemplarCity>
 			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sɔfia</exemplarCity>
-			</zone>
 			<zone type="Africa/Bujumbura">
 				<exemplarCity>Budwumbura</exemplarCity>
 			</zone>
@@ -1949,6 +1574,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Nicosia">
 				<exemplarCity>Nikosia</exemplarCity>
 			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Prage</exemplarCity>
+			</zone>
 			<zone type="Europe/Busingen">
 				<exemplarCity>Busingye</exemplarCity>
 			</zone>
@@ -1959,7 +1587,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Gyibuuti</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kɔpɛhangɛne</exemplarCity>
+				<exemplarCity>Kopehegan</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
 				<exemplarCity>Dɔmeneka</exemplarCity>
@@ -1980,7 +1608,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Kanari</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity>Kyuta</exemplarCity>
+				<exemplarCity>kiweta</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
 				<exemplarCity>Hɛlsinki</exemplarCity>
@@ -1997,9 +1625,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Ponape">
 				<exemplarCity>Pɔnpei</exemplarCity>
 			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Farosu</exemplarCity>
+			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>Ingresi Awia Berɛ</daylight>
+					<daylight>Engresi Awia Berɛ</daylight>
 				</long>
 				<exemplarCity>Lɔndɔn</exemplarCity>
 			</zone>
@@ -2063,9 +1694,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Jerusalem">
 				<exemplarCity>Yerusalem</exemplarCity>
 			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Kɔɔkata</exemplarCity>
-			</zone>
 			<zone type="Indian/Chagos">
 				<exemplarCity>Kyagɔs</exemplarCity>
 			</zone>
@@ -2075,9 +1703,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Atlantic/Reykjavik">
 				<exemplarCity>Rɛɛkgyavik</exemplarCity>
 			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
 			<zone type="Europe/Jersey">
 				<exemplarCity>Jɛɛsi</exemplarCity>
 			</zone>
@@ -2090,14 +1715,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Indian/Comoro">
 				<exemplarCity>Kɔmɔrɔ</exemplarCity>
 			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kemanfo</exemplarCity>
-			</zone>
 			<zone type="Asia/Aqtau">
 				<exemplarCity>Aktau</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktopɛ</exemplarCity>
+				<exemplarCity>Aatobe</exemplarCity>
 			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
@@ -2117,12 +1739,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Lɛsembɛg</exemplarCity>
 			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Kasablanka</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
 			<zone type="Europe/Chisinau">
 				<exemplarCity>Kyisinau</exemplarCity>
 			</zone>
@@ -2136,7 +1752,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Kwagyaleene</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
-				<exemplarCity>Magyuro</exemplarCity>
+				<exemplarCity>Madwuro</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
 				<exemplarCity>Skɔpgye</exemplarCity>
@@ -2183,6 +1799,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Matamoros">
 				<exemplarCity>Matamɔrɔso</exemplarCity>
 			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Kankun</exemplarCity>
+			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>Kukyin</exemplarCity>
 			</zone>
@@ -2208,7 +1827,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Muskat</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity>Maakesase</exemplarCity>
+				<exemplarCity>Maakesase Supᴐ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Pɔt Morɛsbi</exemplarCity>
@@ -2246,15 +1865,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Yekaterinburg">
 				<exemplarCity>Yɛkatɛrinbɛg</exemplarCity>
 			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Yiikusk</exemplarCity>
+			</zone>
 			<zone type="Asia/Chita">
 				<exemplarCity>Kyita</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamkyatka</exemplarCity>
 			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Guadaakanaa</exemplarCity>
-			</zone>
 			<zone type="Europe/Stockholm">
 				<exemplarCity>Stɔkhɔm</exemplarCity>
 			</zone>
@@ -2279,9 +1898,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Lower_Princes">
 				<exemplarCity>Lowa Prinse Kɔta</exemplarCity>
 			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskɔso</exemplarCity>
-			</zone>
 			<zone type="America/Grand_Turk">
 				<exemplarCity>Grand Tuk</exemplarCity>
 			</zone>
@@ -2297,6 +1913,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Spain Pɔɔto</exemplarCity>
 			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiivu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Wake Supᴐ</exemplarCity>
+			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankɔragyi</exemplarCity>
 			</zone>
@@ -2388,9 +2010,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Afrika Atɔeɛ Berɛ</generic>
-					<standard>Afrika Atɔeɛ Susudua Berɛ</standard>
-					<daylight>Afrika Atɔeɛ Awia Berɛ</daylight>
+					<standard>Afrika Atɔeɛ Berɛ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2545,7 +2165,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Brunei Darusalam Berɛ</standard>
+					<standard>Brunei Berɛ</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -2740,6 +2360,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Gayana Berɛ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutian Susudua Berɛ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutian Berɛ</generic>
@@ -2800,9 +2425,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic>Irkutsk Berɛ</generic>
-					<standard>Irkutsk Susudua Berɛ</standard>
-					<daylight>Irkutsk Awia Berɛ</daylight>
+					<generic>Yiikusk Berɛ</generic>
+					<standard>Yiikusk Susudua Berɛ</standard>
+					<daylight>Yiikusk Awia Berɛ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
@@ -3275,7 +2900,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -3309,11 +2933,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="100000000" count="other">¤000M</pattern>
 					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
+					<pattern type="1000000000" count="one">¤0G</pattern>
 					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0G</pattern>
+					<pattern type="1000000000" count="other">¤0G</pattern>
 					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0G</pattern>
-					<pattern type="10000000000" count="one">¤00B</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="10000000000" count="one">¤00G</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00G</pattern>
+					<pattern type="10000000000" count="other">¤00G</pattern>
 					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00G</pattern>
 					<pattern type="100000000000" count="one">¤000G</pattern>
 					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000G</pattern>
@@ -3340,8 +2966,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="AFN">
 				<displayName>Afghanfoɔ Afghani</displayName>
-				<displayName count="one">Afghanfoɔ Afghani</displayName>
-				<displayName count="other">Afghanfoɔ Afghani</displayName>
 			</currency>
 			<currency type="ALL">
 				<displayName>Albania Lek</displayName>
@@ -3350,49 +2974,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="AMD">
 				<displayName>Amɛnia dram</displayName>
-				<displayName count="one">Amɛnia dram</displayName>
-				<displayName count="other">Amɛnia dram</displayName>
 			</currency>
 			<currency type="ANG">
 				<displayName>Nɛdɛlande Antɛlia guuda</displayName>
-				<displayName count="one">Nɛdɛlande Antɛlia guuda</displayName>
-				<displayName count="other">Nɛdɛlande Antɛlia guuda</displayName>
 			</currency>
 			<currency type="AOA">
 				<displayName>Angola Kwanza</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>Agɛntina peso</displayName>
-				<displayName count="one">Agɛntina peso</displayName>
-				<displayName count="other">Agɛntina peso</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>Ɔstrelia Dɔla</displayName>
 			</currency>
 			<currency type="AWG">
 				<displayName>Aruba flɔrin</displayName>
-				<displayName count="one">Aruba flɔrin</displayName>
-				<displayName count="other">Aruba flɔrin</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>Azɛbagyan manat</displayName>
-				<displayName count="one">Azɛbagyan manat</displayName>
-				<displayName count="other">Azɛbagyan manat</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>Bɔsnia-Hɛzegɔvina nsesa maake</displayName>
-				<displayName count="one">Bɔsnia-Hɛzegɔvina nsesa maake</displayName>
-				<displayName count="other">Bɔsnia-Hɛzegɔvina nsesa maake</displayName>
 			</currency>
 			<currency type="BBD">
 				<displayName>Babadɔso dɔla</displayName>
-				<displayName count="one">Babadɔso dɔla</displayName>
-				<displayName count="other">Babadɔso dɔla</displayName>
 			</currency>
 			<currency type="BDT">
 				<displayName>Bangladehye taka</displayName>
-				<displayName count="one">Bangladehye taka</displayName>
-				<displayName count="other">Bangladehye taka</displayName>
 			</currency>
 			<currency type="BGN">
 				<displayName>Bɔɔgaria lɛv</displayName>
@@ -3407,46 +3015,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BMD">
 				<displayName>Bɛɛmuda dɔla</displayName>
-				<displayName count="one">Bɛɛmuda dɔla</displayName>
-				<displayName count="other">Bɛɛmuda dɔla</displayName>
 			</currency>
 			<currency type="BND">
 				<displayName>Brunei dɔla</displayName>
-				<displayName count="one">Brunei dɔla</displayName>
-				<displayName count="other">Brunei dɔla</displayName>
 			</currency>
 			<currency type="BOB">
 				<displayName>Bolivia boliviano</displayName>
-				<displayName count="one">Bolivia boliviano</displayName>
-				<displayName count="other">Bolivia boliviano</displayName>
 			</currency>
 			<currency type="BRL">
 				<displayName>Brazil reale</displayName>
-				<displayName count="one">Brazil reale</displayName>
-				<displayName count="other">Brazil reale</displayName>
 			</currency>
 			<currency type="BSD">
 				<displayName>Bahama dɔla</displayName>
-				<displayName count="one">Bahama dɔla</displayName>
-				<displayName count="other">Bahama dɔla</displayName>
 			</currency>
 			<currency type="BTN">
 				<displayName>Butanfoɔ ngutrum</displayName>
-				<displayName count="one">Butanfoɔ ngutrum</displayName>
-				<displayName count="other">Butanfoɔ ngutrum</displayName>
 			</currency>
 			<currency type="BWP">
 				<displayName>Botswana Pula</displayName>
 			</currency>
 			<currency type="BYN">
 				<displayName>Bɛlaruhyia ruble</displayName>
-				<displayName count="one">Bɛlaruhyia ruble</displayName>
-				<displayName count="other">Bɛlaruhyia ruble</displayName>
 			</currency>
 			<currency type="BZD">
 				<displayName>Belize Dɔla</displayName>
-				<displayName count="one">Belize Dɔla</displayName>
-				<displayName count="other">Belize Dɔla</displayName>
 			</currency>
 			<currency type="CAD">
 				<displayName>Kanada Dɔla</displayName>
@@ -3461,59 +3053,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="CLP">
 				<displayName>Kyili Peso</displayName>
-				<displayName count="one">Kyili Peso</displayName>
-				<displayName count="other">Kyili Peso</displayName>
 			</currency>
 			<currency type="CNH">
 				<displayName>kyaena yuan (offshore)</displayName>
-				<displayName count="one">kyaena yuan (offshore)</displayName>
-				<displayName count="other">kyaena yuan (offshore)</displayName>
 			</currency>
 			<currency type="CNY">
-				<displayName>kyaena yuan</displayName>
-				<displayName count="one">kyaena yuan</displayName>
-				<displayName count="other">kyaena yuan</displayName>
+				<displayName>Kyaena yuan</displayName>
+				<displayName count="one">Kyaena yuan</displayName>
+				<displayName count="other">Kyaena yuan</displayName>
 			</currency>
 			<currency type="COP">
 				<displayName>Kolombia peso</displayName>
-				<displayName count="one">Kolombia peso</displayName>
-				<displayName count="other">Kolombia peso</displayName>
 			</currency>
 			<currency type="CRC">
 				<displayName>Kɔsta Rika kɔlɔn</displayName>
-				<displayName count="one">Kɔsta Rika kɔlɔn</displayName>
-				<displayName count="other">Kɔsta Rika kɔlɔn</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName>Kuba nsesa peso</displayName>
-				<displayName count="one">Kuba nsesa peso</displayName>
-				<displayName count="other">Kuba nsesa peso</displayName>
 			</currency>
 			<currency type="CUP">
 				<displayName>Kuba peso</displayName>
-				<displayName count="one">Kuba peso</displayName>
-				<displayName count="other">Kuba peso</displayName>
 			</currency>
 			<currency type="CVE">
 				<displayName>Ɛskudo</displayName>
 			</currency>
 			<currency type="CZK">
 				<displayName>Kyɛk koruna</displayName>
-				<displayName count="one">Kyɛk koruna</displayName>
-				<displayName count="other">Kyɛk koruna</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName>Gyebuti Frank</displayName>
 			</currency>
 			<currency type="DKK">
 				<displayName>Danefoɔ krone</displayName>
-				<displayName count="one">Danefoɔ krone</displayName>
-				<displayName count="other">Danefoɔ krone</displayName>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dɔmenika peso</displayName>
-				<displayName count="one">Dɔmenika peso</displayName>
-				<displayName count="other">Dɔmenika peso</displayName>
 			</currency>
 			<currency type="DZD">
 				<displayName>Ɔlgyeria Dina</displayName>
@@ -3528,25 +3102,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Itiopia Bir</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName>Iro</displayName>
+				<displayName>yuro</displayName>
+				<displayName count="one">yuro</displayName>
+				<displayName count="other">yuro</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>Figyi Dɔla</displayName>
-				<displayName count="one">Figyi Dɔla</displayName>
-				<displayName count="other">Figyi Dɔla</displayName>
 			</currency>
 			<currency type="FKP">
 				<displayName>Fɔkland Aelande Pɔn</displayName>
-				<displayName count="one">Fɔkland Aelande Pɔn</displayName>
-				<displayName count="other">Fɔkland Aelande Pɔn</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>Breten Pɔn</displayName>
 			</currency>
 			<currency type="GEL">
 				<displayName>Gyɔɔgyia lari</displayName>
-				<displayName count="one">Gyɔɔgyia lari</displayName>
-				<displayName count="other">Gyɔɔgyia lari</displayName>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghana Sidi (1979–2007)</displayName>
@@ -3557,39 +3127,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="GIP">
 				<displayName>Gyebrotaa pɔn</displayName>
-				<displayName count="one">Gyebrotaa pɔn</displayName>
-				<displayName count="other">Gyebrotaa pɔn</displayName>
 			</currency>
 			<currency type="GMD">
 				<displayName>Gambia Dalasi</displayName>
 			</currency>
 			<currency type="GNF">
 				<displayName>Gini franke</displayName>
-				<displayName count="one">Gini franke</displayName>
-				<displayName count="other">Gini franke</displayName>
 			</currency>
 			<currency type="GNS">
 				<displayName>Gini Frank</displayName>
 			</currency>
 			<currency type="GTQ">
 				<displayName>Guatemala kwɛtsaa</displayName>
-				<displayName count="one">Guatemala kwɛtsaa</displayName>
-				<displayName count="other">Guatemala kwɛtsaa</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName>Gayana dɔla</displayName>
-				<displayName count="one">Gayana dɔla</displayName>
-				<displayName count="other">Gayana dɔla</displayName>
 			</currency>
 			<currency type="HKD">
 				<displayName>Hɔnkɔn Dɔla</displayName>
-				<displayName count="one">Hɔnkɔn Dɔla</displayName>
-				<displayName count="other">Hɔnkɔn Dɔla</displayName>
 			</currency>
 			<currency type="HNL">
 				<displayName>Hɔndura lɛmpira</displayName>
-				<displayName count="one">Hɔndura lɛmpira</displayName>
-				<displayName count="other">Hɔndura lɛmpira</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName>Krohyia kuna</displayName>
@@ -3598,52 +3156,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="HTG">
 				<displayName>Haiti gɔɔde</displayName>
-				<displayName count="one">Haiti gɔɔde</displayName>
-				<displayName count="other">Haiti gɔɔde</displayName>
 			</currency>
 			<currency type="HUF">
 				<displayName>Hangari fɔrint</displayName>
-				<displayName count="one">Hangari fɔrint</displayName>
-				<displayName count="other">Hangari fɔrint</displayName>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indɔnihyia rupia</displayName>
-				<displayName count="one">Indɔnihyia rupia</displayName>
-				<displayName count="other">Indɔnihyia rupia</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>Israel hyekel foforɔ</displayName>
-				<displayName count="one">Israel hyekel foforɔ</displayName>
-				<displayName count="other">Israel hyekel foforɔ</displayName>
 			</currency>
 			<currency type="INR">
 				<displayName>India Rupi</displayName>
 			</currency>
 			<currency type="IQD">
 				<displayName>Irak dinaa</displayName>
-				<displayName count="one">Irak dinaa</displayName>
-				<displayName count="other">Irak dinaa</displayName>
 				<symbol draft="contributed">Irak dinaa</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>Yiranfoɔ rial</displayName>
-				<displayName count="one">Yiranfoɔ rial</displayName>
-				<displayName count="other">Yiranfoɔ rial</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>Icelandfoɔ Króna</displayName>
-				<displayName count="one">Icelandfoɔ króna</displayName>
+				<displayName count="one">Icelandfoɔ krónur</displayName>
 				<displayName count="other">Icelandfoɔ krónur</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName>Gyameka dɔla</displayName>
-				<displayName count="one">Gyameka dɔla</displayName>
-				<displayName count="other">Gyameka dɔla</displayName>
 			</currency>
 			<currency type="JOD">
 				<displayName>Gyɔɔdan dinaa</displayName>
-				<displayName count="one">Gyɔɔdan dinaa</displayName>
-				<displayName count="other">Gyɔɔdan dinaa</displayName>
 			</currency>
 			<currency type="JPY">
 				<displayName>Gyapan Yɛn</displayName>
@@ -3653,56 +3195,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="KGS">
 				<displayName>Kagyɛstan som</displayName>
-				<displayName count="one">Kagyɛstan som</displayName>
-				<displayName count="other">Kagyɛstan som</displayName>
 			</currency>
 			<currency type="KHR">
 				<displayName>Kambodia riel</displayName>
-				<displayName count="one">Kambodia riel</displayName>
-				<displayName count="other">Kambodia riel</displayName>
 			</currency>
 			<currency type="KMF">
 				<displayName>Komoro Frank</displayName>
 			</currency>
 			<currency type="KPW">
 				<displayName>Korea Atifi won</displayName>
-				<displayName count="one">Korea Atifi won</displayName>
-				<displayName count="other">Korea Atifi won</displayName>
 			</currency>
 			<currency type="KRW">
 				<displayName>Korea Anaafoɔ won</displayName>
-				<displayName count="one">Korea Anaafoɔ won</displayName>
-				<displayName count="other">Korea Anaafoɔ won</displayName>
 			</currency>
 			<currency type="KWD">
 				<displayName>Kuwait dinaa</displayName>
-				<displayName count="one">Kuwait dinaa</displayName>
-				<displayName count="other">Kuwait dinaa</displayName>
 			</currency>
 			<currency type="KYD">
 				<displayName>Kayemanfo Aelande dɔla</displayName>
-				<displayName count="one">Kayemanfo Aelande dɔla</displayName>
-				<displayName count="other">Kayemanfo Aelande dɔla</displayName>
 			</currency>
 			<currency type="KZT">
 				<displayName>Kagyastan tenge</displayName>
-				<displayName count="one">Kagyastan tenge</displayName>
-				<displayName count="other">Kagyastan tenge</displayName>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laohyia kip</displayName>
-				<displayName count="one">Laohyia kip</displayName>
-				<displayName count="other">Laohyia kip</displayName>
 			</currency>
 			<currency type="LBP">
 				<displayName>Lɛbanon pɔn</displayName>
-				<displayName count="one">Lɛbanon pɔn</displayName>
-				<displayName count="other">Lɛbanon pɔn</displayName>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankafoɔ rupee</displayName>
-				<displayName count="one">Sri Lankafoɔ rupee</displayName>
-				<displayName count="other">Sri Lankafoɔ rupee</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName>Laeberia Dɔla</displayName>
@@ -3731,18 +3253,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="MMK">
 				<displayName>Mayamaa kyat</displayName>
-				<displayName count="one">Mayamaa kyat</displayName>
-				<displayName count="other">Mayamaa kyat</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongoliafoɔ tugrike</displayName>
-				<displayName count="one">Mongoliafoɔ tugrike</displayName>
-				<displayName count="other">Mongoliafoɔ tugrike</displayName>
 			</currency>
 			<currency type="MOP">
 				<displayName>Makaw pataka</displayName>
-				<displayName count="one">Makaw pataka</displayName>
-				<displayName count="other">Makaw pataka</displayName>
 			</currency>
 			<currency type="MRO">
 				<displayName>Mɔretenia Ouguiya (1973–2017)</displayName>
@@ -3755,31 +3271,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="MVR">
 				<displayName>Maldivefoɔ rufiyaa</displayName>
-				<displayName count="one">Maldivefoɔ rufiyaa</displayName>
-				<displayName count="other">Maldivefoɔ rufiyaa</displayName>
 			</currency>
 			<currency type="MWK">
 				<displayName>Malawi Kwakya</displayName>
-				<displayName count="one">Malawi Kwakya</displayName>
-				<displayName count="other">Malawi Kwakya</displayName>
 			</currency>
 			<currency type="MXN">
 				<displayName>Mɛksiko pɛso</displayName>
-				<displayName count="one">Mɛksiko pɛso</displayName>
-				<displayName count="other">Mɛksiko pɛso</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName>Malaahyia ringgit</displayName>
-				<displayName count="one">Malaahyia ringgit</displayName>
-				<displayName count="other">Malaahyia ringgit</displayName>
 			</currency>
 			<currency type="MZM">
 				<displayName>Mozambik Metical</displayName>
 			</currency>
 			<currency type="MZN">
 				<displayName>Mozambik mɛtikaa</displayName>
-				<displayName count="one">Mozambik mɛtikaa</displayName>
-				<displayName count="other">Mozambik mɛtikaa</displayName>
 			</currency>
 			<currency type="NAD">
 				<displayName>Namibia Dɔla</displayName>
@@ -3789,8 +3295,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="NIO">
 				<displayName>Nikaragua kɔɔdɔba</displayName>
-				<displayName count="one">Nikaragua kɔɔdɔba</displayName>
-				<displayName count="other">Nikaragua kɔɔdɔba</displayName>
 			</currency>
 			<currency type="NOK">
 				<displayName>Nɔɔwee Krone</displayName>
@@ -3799,58 +3303,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalfoɔ rupee</displayName>
-				<displayName count="one">Nepalfoɔ rupee</displayName>
-				<displayName count="other">Nepalfoɔ rupee</displayName>
 			</currency>
 			<currency type="NZD">
 				<displayName>New Zealand Dɔla</displayName>
-				<displayName count="one">New Zealand Dɔla</displayName>
-				<displayName count="other">New Zealand Dɔla</displayName>
 			</currency>
 			<currency type="OMR">
 				<displayName>Oman rial</displayName>
-				<displayName count="one">Oman rial</displayName>
-				<displayName count="other">Oman rial</displayName>
 			</currency>
 			<currency type="PAB">
 				<displayName>Panama baaboa</displayName>
-				<displayName count="one">Panama baaboa</displayName>
-				<displayName count="other">Panama baaboa</displayName>
 			</currency>
 			<currency type="PEN">
 				<displayName>Pɛruvia sol</displayName>
-				<displayName count="one">Pɛruvia sol</displayName>
-				<displayName count="other">Pɛruvia sol</displayName>
 			</currency>
 			<currency type="PGK">
 				<displayName>Papua New Gini kina</displayName>
-				<displayName count="one">Papua New Gini kina</displayName>
-				<displayName count="other">Papua New Gini kina</displayName>
 			</currency>
 			<currency type="PHP">
 				<displayName>Filipine peso</displayName>
-				<displayName count="one">Filipine peso</displayName>
-				<displayName count="other">Filipine peso</displayName>
 			</currency>
 			<currency type="PKR">
 				<displayName>Pakistanfoɔ rupee</displayName>
-				<displayName count="one">Pakistanfoɔ rupee</displayName>
-				<displayName count="other">Pakistanfoɔ rupee</displayName>
 			</currency>
 			<currency type="PLN">
 				<displayName>Pɔlihye zloty</displayName>
-				<displayName count="one">Pɔlihye zloty</displayName>
-				<displayName count="other">Pɔlihye zloty</displayName>
 			</currency>
 			<currency type="PYG">
 				<displayName>Paragayana guarani</displayName>
-				<displayName count="one">Paragayana guarani</displayName>
-				<displayName count="other">Paragayana guarani</displayName>
 			</currency>
 			<currency type="QAR">
 				<displayName>Kata riyaa</displayName>
-				<displayName count="one">Kata riyaa</displayName>
-				<displayName count="other">Kata riyaa</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName>Romania Leu</displayName>
@@ -3859,13 +3341,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="RSD">
 				<displayName>Sɛɛbia dinaa</displayName>
-				<displayName count="one">Sɛɛbia dinaa</displayName>
-				<displayName count="other">Sɛɛbia dinaa</displayName>
 			</currency>
 			<currency type="RUB">
 				<displayName>Rɔhyia rubuu</displayName>
-				<displayName count="one">Rɔhyia rubuu</displayName>
-				<displayName count="other">Rɔhyia rubuu</displayName>
 			</currency>
 			<currency type="RWF">
 				<displayName>Rewanda Frank</displayName>
@@ -3875,8 +3353,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SBD">
 				<displayName>Solomon Aeland Dɔla</displayName>
-				<displayName count="one">Solomon Aeland Dɔla</displayName>
-				<displayName count="other">Solomon Aeland Dɔla</displayName>
 			</currency>
 			<currency type="SCR">
 				<displayName>Seyhyɛls Rupi</displayName>
@@ -3894,8 +3370,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapɔɔ dɔla</displayName>
-				<displayName count="one">Singapɔɔ dɔla</displayName>
-				<displayName count="other">Singapɔɔ dɔla</displayName>
 			</currency>
 			<currency type="SHP">
 				<displayName>St Helena Pɔn</displayName>
@@ -3911,13 +3385,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SRD">
 				<displayName>Suriname dɔla</displayName>
-				<displayName count="one">Suriname dɔla</displayName>
-				<displayName count="other">Suriname dɔla</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName>Sudan Anaafoɔ Pɔn</displayName>
-				<displayName count="one">Sudan Anaafoɔ Pɔn</displayName>
-				<displayName count="other">Sudan Anaafoɔ Pɔn</displayName>
 			</currency>
 			<currency type="STD">
 				<displayName>Sao Tome ne Principe Dobra (1977–2017)</displayName>
@@ -3927,26 +3397,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SYP">
 				<displayName>Siria pɔn</displayName>
-				<displayName count="one">Siria pɔn</displayName>
-				<displayName count="other">Siria pɔn</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName>Lilangeni</displayName>
+				<displayName>Swazi lilangeni</displayName>
+				<displayName count="one">Swazi lilangeni</displayName>
+				<displayName count="other">Swazi lilangeni</displayName>
 			</currency>
 			<currency type="THB">
 				<displayName>Tai bat</displayName>
-				<displayName count="one">Tai bat</displayName>
-				<displayName count="other">Tai bat</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tagyikistan somoni</displayName>
-				<displayName count="one">Tagyikistan somoni</displayName>
-				<displayName count="other">Tagyikistan somoni</displayName>
 			</currency>
 			<currency type="TMT">
 				<displayName>Tɛkmɛstan manat</displayName>
-				<displayName count="one">Tɛkmɛstan manat</displayName>
-				<displayName count="other">Tɛkmɛstan manat</displayName>
 			</currency>
 			<currency type="TND">
 				<displayName>Tunisia Dina</displayName>
@@ -3958,13 +3422,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="TRY">
 				<displayName>Tɛki lira</displayName>
-				<displayName count="one">Tɛki lira</displayName>
-				<displayName count="other">Tɛki lira</displayName>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad ne Tobago dɔla</displayName>
-				<displayName count="one">Trinidad ne Tobago dɔla</displayName>
-				<displayName count="other">Trinidad ne Tobago dɔla</displayName>
 			</currency>
 			<currency type="TWD">
 				<displayName>Taewanfoɔ dɔla foforɔ</displayName>
@@ -3976,8 +3436,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="UAH">
 				<displayName>Yukren hryvnia</displayName>
-				<displayName count="one">Yukren hryvnia</displayName>
-				<displayName count="other">Yukren hryvnia</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName>Uganda Hyelen</displayName>
@@ -3987,13 +3445,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="UYU">
 				<displayName>Yurugueɛ peso</displayName>
-				<displayName count="one">Yurugueɛ peso</displayName>
-				<displayName count="other">Yurugueɛ peso</displayName>
 			</currency>
 			<currency type="UZS">
 				<displayName>Yusbɛkistan som</displayName>
-				<displayName count="one">Yusbɛkistan som</displayName>
-				<displayName count="other">Yusbɛkistan som</displayName>
 			</currency>
 			<currency type="VES">
 				<displayName>Venezuelan bolívar</displayName>
@@ -4002,13 +3456,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="VND">
 				<displayName>Viɛtnamfoɔ dɔn</displayName>
-				<displayName count="one">Viɛtnamfoɔ dɔn</displayName>
-				<displayName count="other">Viɛtnamfoɔ dɔn</displayName>
 			</currency>
 			<currency type="VUV">
 				<displayName>Vanuatu vatu</displayName>
-				<displayName count="one">Vanuatu vatu</displayName>
-				<displayName count="other">Vanuatu vatu</displayName>
 			</currency>
 			<currency type="WST">
 				<displayName>Samoa Tala</displayName>
@@ -4017,18 +3467,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="XAF">
 				<displayName>Afrika Mfinimfini Sefa</displayName>
-				<displayName count="one">Afrika Mfinimfini Sefa</displayName>
-				<displayName count="other">Afrika Mfinimfini Sefa</displayName>
 			</currency>
 			<currency type="XCD">
 				<displayName>Karibine Apueeɛ dɔla</displayName>
-				<displayName count="one">Karibine Apueeɛ dɔla</displayName>
-				<displayName count="other">Karibine Apueeɛ dɔla</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>Karibiafoᴐ giida</displayName>
+				<displayName count="one">Karibiafoᴐ giida</displayName>
+				<displayName count="other">Karibiafoᴐ giida ahodoᴐ</displayName>
 			</currency>
 			<currency type="XOF">
 				<displayName>Afrika Atɔeɛ Sefa</displayName>
-				<displayName count="one">Afrika Atɔeɛ Sefa</displayName>
-				<displayName count="other">Afrika Atɔeɛ Sefa</displayName>
 				<symbol draft="contributed">AAS</symbol>
 			</currency>
 			<currency type="XPF">
@@ -4043,8 +3492,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="YER">
 				<displayName>Yɛmɛn rial</displayName>
-				<displayName count="one">Yɛmɛn rial</displayName>
-				<displayName count="other">Yɛmɛn rial</displayName>
 			</currency>
 			<currency type="ZAR">
 				<displayName>Afrika Anaafo Rand</displayName>
@@ -4054,12 +3501,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="ZMW">
 				<displayName>Zambia Kwakya</displayName>
-				<displayName count="one">Zambia Kwakya</displayName>
-				<displayName count="other">Zambia Kwakya</displayName>
 			</currency>
 			<currency type="ZWD">
 				<displayName>Zimbabwe Dɔla</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe sika kᴐkᴐᴐ</displayName>
+				<displayName count="one">Zimbabwe sika kᴐkᴐᴐ</displayName>
+				<displayName count="other">Zimbabwe sika kᴐkᴐᴐ</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">da {0}</pluralMinimalPairs>
@@ -4072,9 +3522,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="10p-1">
 				<unitPrefixPattern>dɛci{0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="10p-2">
-				<unitPrefixPattern>sɛnti{0}</unitPrefixPattern>
-			</compoundUnit>
 			<compoundUnit type="10p-3">
 				<unitPrefixPattern>mili{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -4135,32 +3582,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">ntwaho {0}</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName>radian</displayName>
 				<unitPattern count="one">{0} radian</unitPattern>
 				<unitPattern count="other">{0} radian</unitPattern>
 			</unit>
 			<unit type="angle-degree">
-				<displayName>digrii</displayName>
 				<unitPattern count="one">digrii {0}</unitPattern>
 				<unitPattern count="other">digrii {0}</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName>aakesima</displayName>
 				<unitPattern count="one">aakesima {0}</unitPattern>
 				<unitPattern count="other">aakesima {0}</unitPattern>
 			</unit>
-			<unit type="angle-arc-second">
-				<displayName>aakesɛkɛnse</displayName>
-				<unitPattern count="one">{0} aakesɛkɛnse</unitPattern>
-				<unitPattern count="other">{0} aakesɛkɛnse</unitPattern>
-			</unit>
 			<unit type="area-acre">
-				<displayName>Eka</displayName>
 				<unitPattern count="one">{0} eka</unitPattern>
 				<unitPattern count="other">{0} eka</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName>karat</displayName>
 				<unitPattern count="one">{0} karat</unitPattern>
 				<unitPattern count="other">{0} karat</unitPattern>
 			</unit>
@@ -4174,18 +3611,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">milimole lita biara {0}</unitPattern>
 				<unitPattern count="other">milimole lita biara {0}</unitPattern>
 			</unit>
-			<unit type="concentr-item">
-				<displayName>adeɛ</displayName>
-				<unitPattern count="one">adeɛ {0}</unitPattern>
-				<unitPattern count="other">adeɛ {0}</unitPattern>
-			</unit>
-			<unit type="concentr-permillion">
-				<displayName>paat ɔpepem biara</displayName>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">paat ɔpepem biara {0}</unitPattern>
 				<unitPattern count="other">paat ɔpepem biara {0}</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
-				<displayName>ɔha nkyɛmu</displayName>
 				<unitPattern count="one">ɔha nkyɛmu {0}</unitPattern>
 				<unitPattern count="other">ɔha nkyɛmu {0}</unitPattern>
 			</unit>
@@ -4195,17 +3625,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">pɛɛmile {0}</unitPattern>
 			</unit>
 			<unit type="concentr-permyriad">
-				<displayName>pɛɛmiride</displayName>
 				<unitPattern count="one">pɛɛmiride {0}</unitPattern>
 				<unitPattern count="other">pɛɛmiride {0}</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
-				<displayName>mole</displayName>
 				<unitPattern count="one">{0} mole</unitPattern>
 				<unitPattern count="other">{0} mole</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName>lita kilomita biara</displayName>
 				<unitPattern count="one">lita kilomita biara {0}</unitPattern>
 				<unitPattern count="other">lita kilomita biara {0}</unitPattern>
 			</unit>
@@ -4215,12 +3642,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">lita kilomita 100 biara {0}</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName>mile galɔn biara</displayName>
 				<unitPattern count="one">mile galɔn biara {0}</unitPattern>
-				<unitPattern count="other">mile galɔn biara {0}</unitPattern>
+				<unitPattern count="other">{0} mpg US</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName>mile Imp. galɔn biara</displayName>
 				<unitPattern count="one">mile Imp. galɔn biara {0}</unitPattern>
 				<unitPattern count="other">mile Imp. galɔn biara {0}</unitPattern>
 			</unit>
@@ -4280,7 +3705,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} dec</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName>mfeɛ</displayName>
 				<unitPattern count="one">mfeɛ {0}</unitPattern>
 				<unitPattern count="other">mfeɛ {0}</unitPattern>
 				<perUnitPattern>mfeɛ biara {0}</perUnitPattern>
@@ -4291,24 +3715,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} q</unitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName>bosome</displayName>
 				<unitPattern count="one">Bosome {0}</unitPattern>
 				<unitPattern count="other">Bosome {0}</unitPattern>
 				<perUnitPattern>bosome biara {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName>nnawɔtwe</displayName>
 				<unitPattern count="one">nnawɔtwe {0}</unitPattern>
 				<unitPattern count="other">nnawɔtwe {0}</unitPattern>
 				<perUnitPattern>nnawɔtwe biara {0}</perUnitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>nna</displayName>
-				<unitPattern count="one">da {0}</unitPattern>
-				<unitPattern count="other">nna {0}</unitPattern>
-			</unit>
 			<unit type="duration-hour">
-				<displayName>dɔnhwere</displayName>
 				<unitPattern count="one">dɔnhwere {0}</unitPattern>
 				<unitPattern count="other">dɔnhwere {0}</unitPattern>
 			</unit>
@@ -4319,9 +3735,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-second">
 				<displayName>sima sini</displayName>
-				<unitPattern count="one">sima sini {0}</unitPattern>
+				<unitPattern count="one">{0} s</unitPattern>
 				<unitPattern count="other">sima sini {0}</unitPattern>
-				<perUnitPattern>sima sini biara {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>millisɛkɛns</displayName>
@@ -4329,22 +3744,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} millisɛkɛns</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
 				<unitPattern count="one">{0} mikrosɛkɛn</unitPattern>
 				<unitPattern count="other">{0} mikrosɛkɛns</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName>nanosɛkɛns</displayName>
 				<unitPattern count="one">{0} nanosɛkɛn</unitPattern>
-				<unitPattern count="other">{0} nanosɛkɛns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
-				<displayName>fɔs mu pɔn</displayName>
 				<unitPattern count="one">fɔs mu pɔn {0}</unitPattern>
 				<unitPattern count="other">fɔs mu pɔn {0}</unitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName>newton</displayName>
 				<unitPattern count="one">{0} newton</unitPattern>
 				<unitPattern count="other">{0} newton</unitPattern>
 			</unit>
@@ -4357,7 +3768,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>taipografik ems</displayName>
 			</unit>
 			<unit type="graphics-pixel">
-				<displayName>pixels</displayName>
 				<unitPattern count="one">{0} pixel</unitPattern>
 				<unitPattern count="other">{0} pixels</unitPattern>
 			</unit>
@@ -4371,12 +3781,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">pixels sɛntimita biara{0}</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<displayName>pixels inkye biara</displayName>
 				<unitPattern count="one">pixels inkye biara{0}</unitPattern>
 				<unitPattern count="other">pixels inkye biara{0}</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName>asaase radiɔs</displayName>
 				<unitPattern count="one">asaase radiɔs {0}</unitPattern>
 				<unitPattern count="other">asaase radiɔs{0}</unitPattern>
 			</unit>
@@ -4406,7 +3814,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="length-millimeter">
 				<displayName>milimita</displayName>
 				<unitPattern count="one">milimita {0}</unitPattern>
-				<unitPattern count="other">milimita {0}</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>mikromita</displayName>
@@ -4424,40 +3832,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">pikomita {0}</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName>kwansini</displayName>
 				<unitPattern count="one">kwansini {0}</unitPattern>
 				<unitPattern count="other">kwansini {0}</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName>yaase</displayName>
 				<unitPattern count="one">yaase {0}</unitPattern>
 				<unitPattern count="other">yaase {0}</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName>ananmɔn</displayName>
 				<unitPattern count="one">ananmɔn {0}</unitPattern>
 				<unitPattern count="other">{0} ft</unitPattern>
 				<perUnitPattern>ananmɔn biara {0}</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName>inkyisi</displayName>
 				<unitPattern count="one">inkyisi {0}</unitPattern>
 				<unitPattern count="other">inkyisi {0}</unitPattern>
 				<perUnitPattern>inkyisi biara {0}</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName>paasɛk</displayName>
 				<unitPattern count="one">paasɛk {0}</unitPattern>
 				<unitPattern count="other">paasɛk {0}</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName>kanea mfeɛ</displayName>
 				<unitPattern count="one">kanea mfeɛ {0}</unitPattern>
 				<unitPattern count="other">kanea mfeɛ {0}</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName>astrɔnɔmikaa winit</displayName>
-				<unitPattern count="one">astrɔnɔmikaa winit {0}</unitPattern>
+				<unitPattern count="one">{0} au</unitPattern>
 				<unitPattern count="other">astrɔnɔmikaa winit {0}</unitPattern>
 			</unit>
 			<unit type="length-furlong">
@@ -4481,35 +3883,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">miaase-skandinavian {0}</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<displayName>pɔnse</displayName>
 				<unitPattern count="one">pɔnse {0}</unitPattern>
 				<unitPattern count="other">pɔnse {0}</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName>sola radii</displayName>
 				<unitPattern count="one">sola radii {0}</unitPattern>
 				<unitPattern count="other">sola radii {0}</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName>lux</displayName>
 				<unitPattern count="one">{0} lux</unitPattern>
 				<unitPattern count="other">{0} lux</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName>kandela</displayName>
 				<unitPattern count="one">{0} kandela</unitPattern>
 				<unitPattern count="other">{0} kandela</unitPattern>
 			</unit>
-			<unit type="light-lumen">
-				<displayName>lumen</displayName>
-			</unit>
 			<unit type="light-solar-luminosity">
-				<displayName>sola luminɔsitise</displayName>
 				<unitPattern count="one">sola luminɔsitise {0}</unitPattern>
 				<unitPattern count="other">sola luminɔsitise {0}</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName>mɛtreke tons</displayName>
 				<unitPattern count="one">mɛtreke tons {0}</unitPattern>
 				<unitPattern count="other">mɛtreke tons {0}</unitPattern>
 			</unit>
@@ -4520,7 +3913,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>kilograme biara {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName>grame</displayName>
 				<unitPattern count="one">grame {0}</unitPattern>
 				<unitPattern count="other">{0} g</unitPattern>
 				<perUnitPattern>grame biara {0}</perUnitPattern>
@@ -4533,14 +3925,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="mass-microgram">
 				<displayName>mikrograme</displayName>
 				<unitPattern count="one">mikrograme {0}</unitPattern>
-				<unitPattern count="other">mikrograme {0}</unitPattern>
+				<unitPattern count="other">{0} μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<unitPattern count="one">{0} ton</unitPattern>
 				<unitPattern count="other">{0} tons</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName>pɔns</displayName>
 				<unitPattern count="one">pɔns {0}</unitPattern>
 				<unitPattern count="other">pɔns {0}</unitPattern>
 				<perUnitPattern>pɔns biara {0}</perUnitPattern>
@@ -4557,30 +3948,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">troy awnse {0}</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName>karat</displayName>
-				<unitPattern count="one">karat {0}</unitPattern>
+				<unitPattern count="one">{0} CD</unitPattern>
 				<unitPattern count="other">karat {0}</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
-				<displayName>daatin</displayName>
 				<unitPattern count="one">daatin {0}</unitPattern>
 				<unitPattern count="other">daatin {0}</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName>Asaase mass</displayName>
 				<unitPattern count="one">Asaase mass {0}</unitPattern>
 				<unitPattern count="other">Asaase mass {0}</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
-				<displayName>sola mass</displayName>
 				<unitPattern count="one">sola mass {0}</unitPattern>
 				<unitPattern count="other">sola mass {0}</unitPattern>
 			</unit>
+			<unit type="pressure-bar">
+				<displayName>poma</displayName>
+				<unitPattern count="one">{0}poma</unitPattern>
+				<unitPattern count="other">{0}poma</unitPattern>
+			</unit>
 			<unit type="speed-knot">
-				<displayName>Pɔ</displayName>
-				<unitPattern count="one">Pɔ {0}</unitPattern>
+				<unitPattern count="one">{0} kn</unitPattern>
 				<unitPattern count="other">Pɔ {0}</unitPattern>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName>hyew°</displayName>
+				<unitPattern count="one">{0} hyew digrii</unitPattern>
+				<unitPattern count="other">{0} hyew digrii</unitPattern>
+			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName>pɔn-fɔs-ananmɔn</displayName>
 				<unitPattern count="one">pɔn-fɔs-ananmɔn {0}</unitPattern>
@@ -4592,15 +3988,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} newton-mita</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>lita</displayName>
 				<unitPattern count="one">{0} l</unitPattern>
 				<unitPattern count="other">{0} lita</unitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>pints</displayName>
-			</unit>
 			<unit type="volume-cup">
-				<displayName>kuruwa</displayName>
 				<unitPattern count="one">kuruwa {0}</unitPattern>
 				<unitPattern count="other">kuruwa {0}</unitPattern>
 			</unit>
@@ -4615,42 +4006,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">atere fa {0}</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
-				<displayName>bare</displayName>
 				<unitPattern count="one">bare {0}</unitPattern>
 				<unitPattern count="other">bare {0}</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName>atere</displayName>
 				<unitPattern count="one">atere {0}</unitPattern>
 				<unitPattern count="other">atere {0}</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<displayName>koko</displayName>
 				<unitPattern count="one">ko {0}</unitPattern>
 				<unitPattern count="other">koko {0}</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName>drɔm</displayName>
 				<unitPattern count="one">drɔm fl {0}</unitPattern>
 				<unitPattern count="other">drɔm fl {0}</unitPattern>
 			</unit>
-			<unit type="volume-jigger">
-				<displayName>gyega</displayName>
-				<unitPattern count="one">gyega {0}</unitPattern>
-				<unitPattern count="other">gyega {0}</unitPattern>
-			</unit>
-			<unit type="speed-light-speed">
-				<displayName>kanea</displayName>
-				<unitPattern count="one">kanea {0}</unitPattern>
-				<unitPattern count="other">kanea {0}</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>paat ɔpepepem biara</displayName>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">paat ɔpepepem biara {0}</unitPattern>
 				<unitPattern count="other">paat ɔpepepem biara {0}</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>anadwo</displayName>
 				<unitPattern count="one">{0} anadwo</unitPattern>
 				<unitPattern count="other">anadwo{0}</unitPattern>
 				<perUnitPattern>anadwo biara{0}</perUnitPattern>
@@ -4658,7 +4033,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<coordinateUnit>
 				<displayName>kadinaa akwankyerɛ</displayName>
 				<coordinateUnitPattern type="east">{0} apueɛ</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} atifi</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0} anaafoɔ</coordinateUnitPattern>
 				<coordinateUnitPattern type="west">{0} atɔeɛ</coordinateUnitPattern>
 			</coordinateUnit>
@@ -4692,7 +4066,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">adeɛ {0}</unitPattern>
 				<unitPattern count="other">adeɛ {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>paat ɔpepem biara</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -4760,8 +4134,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-hour">
 				<displayName>dɔnhwere</displayName>
 			</unit>
-			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
+			<unit type="duration-second">
+				<displayName>simasini</displayName>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosɛkɛns</displayName>
@@ -4848,10 +4222,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} gr</unitPattern>
 				<unitPattern count="other">{0} gr</unitPattern>
 			</unit>
+			<unit type="pressure-bar">
+				<displayName>poma</displayName>
+				<unitPattern count="one">{0}poma</unitPattern>
+				<unitPattern count="other">{0}poma</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName>hyew°</displayName>
+			</unit>
 			<unit type="volume-liter">
 				<displayName>lita</displayName>
 			</unit>
@@ -4875,7 +4257,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">ko {0}</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName>drɔm</displayName>
 				<unitPattern count="one">drɔm {0}</unitPattern>
 				<unitPattern count="other">drɔm {0}</unitPattern>
 			</unit>
@@ -4893,7 +4274,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">kanea {0}</unitPattern>
 				<unitPattern count="other">kanea {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>paat ɔpepepem biara</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -4907,106 +4288,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<unit type="angle-radian">
-				<displayName>radian</displayName>
-			</unit>
-			<unit type="angle-degree">
-				<displayName>digrii</displayName>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>aakesima</displayName>
-			</unit>
 			<unit type="angle-arc-second">
-				<displayName>aakesɛkɛnse</displayName>
-			</unit>
-			<unit type="area-acre">
-				<displayName>Eka</displayName>
-			</unit>
-			<unit type="concentr-karat">
-				<displayName>karat</displayName>
-			</unit>
-			<unit type="concentr-millimole-per-liter">
-				<displayName>milimol/lita</displayName>
-			</unit>
-			<unit type="concentr-item">
-				<displayName>adeɛ</displayName>
-				<unitPattern count="one">adeɛ {0}</unitPattern>
-				<unitPattern count="other">adeɛ {0}</unitPattern>
-			</unit>
-			<unit type="concentr-permillion">
-				<displayName>paat ɔpepem biara</displayName>
-			</unit>
-			<unit type="concentr-percent">
-				<displayName>ɔha nkyɛmu</displayName>
-			</unit>
-			<unit type="concentr-permyriad">
-				<displayName>pɛɛmiride</displayName>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName>lita kilomita biara</displayName>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName>mile galɔn biara</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>mpg UK</displayName>
 			</unit>
-			<unit type="digital-petabyte">
-				<displayName>PByte</displayName>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>B</displayName>
 				<unitPattern count="one">{0}B</unitPattern>
 				<unitPattern count="other">{0}B</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>mfeɛ</displayName>
-			</unit>
-			<unit type="duration-month">
-				<displayName>bosome</displayName>
-			</unit>
-			<unit type="duration-week">
-				<displayName>nnawɔtwe</displayName>
-			</unit>
 			<unit type="duration-day">
 				<displayName>da</displayName>
-				<unitPattern count="one">da {0}</unitPattern>
-				<unitPattern count="other">nna {0}</unitPattern>
 			</unit>
-			<unit type="duration-hour">
-				<displayName>dɔnhwere</displayName>
+			<unit type="duration-second">
+				<displayName>simasini</displayName>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>μsec</displayName>
 			</unit>
-			<unit type="force-pound-force">
-				<displayName>fɔs mu pɔn</displayName>
-			</unit>
-			<unit type="length-earth-radius">
-				<displayName>asaase radiɔs</displayName>
-			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-			</unit>
-			<unit type="length-yard">
-				<displayName>yaase</displayName>
-			</unit>
 			<unit type="length-foot">
-				<displayName>ananmɔn</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName>inkyisi</displayName>
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>paasɛk</displayName>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>kanea mfeɛ</displayName>
-			</unit>
 			<unit type="length-furlong">
 				<displayName>fɛɛlɔɔne</displayName>
 			</unit>
@@ -5016,47 +4329,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="length-point">
 				<displayName>pts</displayName>
 			</unit>
-			<unit type="length-solar-radius">
-				<displayName>sola radii</displayName>
-			</unit>
-			<unit type="light-lux">
-				<displayName>lux</displayName>
-			</unit>
-			<unit type="light-solar-luminosity">
-				<displayName>sola luminɔsitise</displayName>
-			</unit>
-			<unit type="mass-gram">
-				<displayName>grame</displayName>
-			</unit>
-			<unit type="mass-pound">
-				<displayName>pɔns</displayName>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName>oz troy</displayName>
-			</unit>
-			<unit type="mass-carat">
-				<displayName>karat</displayName>
-			</unit>
-			<unit type="mass-dalton">
-				<displayName>daatin</displayName>
-			</unit>
-			<unit type="mass-earth-mass">
-				<displayName>Asaase mass</displayName>
-			</unit>
-			<unit type="mass-solar-mass">
-				<displayName>sola mass</displayName>
-			</unit>
 			<unit type="mass-grain">
 				<displayName>gr</displayName>
 				<unitPattern count="one">{0}gr</unitPattern>
 				<unitPattern count="other">{0}gr</unitPattern>
 			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="one">{0} mph</unitPattern>
-				<unitPattern count="other">{0} mph</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>lita</displayName>
+			<unit type="pressure-bar">
+				<displayName>poma</displayName>
+				<unitPattern count="one">{0}poma</unitPattern>
+				<unitPattern count="other">{0}poma</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
 				<displayName>pt</displayName>
@@ -5064,51 +4345,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-gallon">
 				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
-			<unit type="volume-cup">
-				<displayName>kuruwa</displayName>
-			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName>dsp</displayName>
-				<unitPattern count="one">{0}dsp</unitPattern>
+				<unitPattern count="one">{0} dsp</unitPattern>
 				<unitPattern count="other">{0}dsp</unitPattern>
 			</unit>
 			<unit type="volume-drop">
 				<displayName>dr</displayName>
-				<unitPattern count="one">ko {0}</unitPattern>
-				<unitPattern count="other">ko {0}</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>fl.dr.</displayName>
-				<unitPattern count="one">drɔm fl {0}</unitPattern>
+				<unitPattern count="one">drɔm {0}</unitPattern>
 				<unitPattern count="other">drɔm fl {0}</unitPattern>
 			</unit>
-			<unit type="volume-jigger">
-				<displayName>gyega</displayName>
-				<unitPattern count="one">gyega {0}</unitPattern>
-				<unitPattern count="other">gyega {0}</unitPattern>
-			</unit>
 			<unit type="volume-pinch">
 				<displayName>pn</displayName>
-				<unitPattern count="one">{0} pn</unitPattern>
-				<unitPattern count="other">{0} pn</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>kanea</displayName>
-				<unitPattern count="one">kanea {0}</unitPattern>
-				<unitPattern count="other">kanea {0}</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>paat ɔpepepem biara</displayName>
-			</unit>
-			<unit type="duration-night">
-				<displayName>anadwo</displayName>
-				<unitPattern count="one">anadwo{0}</unitPattern>
-				<unitPattern count="other">anadwo{0}</unitPattern>
-				<perUnitPattern>{0}/anadwo</perUnitPattern>
-			</unit>
-			<coordinateUnit>
-				<displayName>akwankyerɛ</displayName>
-			</coordinateUnit>
 		</unitLength>
 	</units>
 	<listPatterns>
@@ -5120,35 +4371,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0}, anaa {1}</listPatternPart>
 			<listPatternPart type="2">{0} anaa {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end">{0}, anaa {1}</listPatternPart>
-			<listPatternPart type="2">{0} anaa {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end">{0}, anaa {1}</listPatternPart>
-			<listPatternPart type="2">{0} anaa {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-narrow">
-			<listPatternPart type="end">{0}, ne {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="end">{0}, ne {1}</listPatternPart>
-			<listPatternPart type="2">{0} ne {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="end">{0}, ne {1}</listPatternPart>
-			<listPatternPart type="2">{0} ne {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
 			<listPatternPart type="middle">{0} {1}</listPatternPart>
 			<listPatternPart type="end">{0} {1}</listPatternPart>
 			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="end">{0}, ne {1}</listPatternPart>
-			<listPatternPart type="2">{0} ne {1}</listPatternPart>
-		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
@@ -5160,7 +4388,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabelPattern type="compatibility">{0} — kɔmpatebiliti</characterLabelPattern>
 		<characterLabelPattern type="enclosed">{0} — ɛnkloso</characterLabelPattern>
 		<characterLabelPattern type="extended">{0} — ɛstɛndɛde</characterLabelPattern>
-		<characterLabelPattern type="facing-left">{0} rehwɛ bɛnkum</characterLabelPattern>
 		<characterLabelPattern type="facing-right">{0} rehwɛ nifa</characterLabelPattern>
 		<characterLabelPattern type="historic">{0} — histɔrike</characterLabelPattern>
 		<characterLabelPattern type="miscellaneous">{0} — mɛsɛleniɔso</characterLabelPattern>
@@ -5290,7 +4517,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<featureName type="onum">tete nɔma deɛ</featureName>
 		<featureName type="ordn">ɔdinaafoɔ</featureName>
 		<featureName type="pnum">prɔpɔɔhyen nɔma</featureName>
-		<featureName type="smcp">atwerɛdeɛ akɛseɛ nkumaa</featureName>
 		<featureName type="tnum">pono so nɔma</featureName>
 		<featureName type="zero">ziro a yɛapae mu</featureName>
 	</typographicNames>
@@ -5317,7 +4543,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<nameField type="surname-prefix">∅∅∅</nameField>
 			<nameField type="surname-core">Wooster</nameField>
 			<nameField type="surname2">∅∅∅</nameField>
-			<nameField type="generation">Jr</nameField>
+			<nameField type="generation">Ketewa</nameField>
 			<nameField type="credentials">MP</nameField>
 		</sampleName>
 		<sampleName item="foreignG">
diff --git a/make/data/cldr/common/main/am.xml b/make/data/cldr/common/main/am.xml
index aa3e9dbded4..c3ddab8d741 100644
--- a/make/data/cldr/common/main/am.xml
+++ b/make/data/cldr/common/main/am.xml
@@ -215,7 +215,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hax">ደቡባዊ ሃይዳ</language>
 			<language type="he">ዕብራይስጥ</language>
 			<language type="hi">ሕንድኛ</language>
-			<language type="hi_Latn">ሕንድኛ (ላቲን)</language>
 			<language type="hil">ሂሊጋይኖን</language>
 			<language type="hmn">ህሞንግ</language>
 			<language type="hr">ክሮሽያንኛ</language>
@@ -283,6 +282,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ባፊያ</language>
 			<language type="ksh">ኮሎኝኛ</language>
 			<language type="ku">ኩርድሽ</language>
+			<language type="ku" menu="core">ኩርድሽ</language>
+			<language type="ku" menu="extension">ኩርድሽ</language>
 			<language type="kum">ኩማይክ</language>
 			<language type="kv">ኮሚ</language>
 			<language type="kw">ኮርኒሽ</language>
@@ -711,6 +712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ቻይና</territory>
 			<territory type="CO">ኮሎምቢያ</territory>
 			<territory type="CP">ክሊፐርቶን ደሴት</territory>
+			<territory type="CQ">ሳርክ</territory>
 			<territory type="CR">ኮስታሪካ</territory>
 			<territory type="CU">ኩባ</territory>
 			<territory type="CV">ኬፕቨርዴ</territory>
@@ -952,33 +954,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">የቁጥር ድርደራ</key>
 			<key type="colStrength">የድርደራ አቅም</key>
 			<key type="currency">ምንዛሪ</key>
+			<key type="em">ስሜት ገላጭ ምስል አቀራረብ</key>
 			<key type="hc">የሰዓት ዑደት (12 ወይም 24)</key>
 			<key type="lb">መስመር መስበሪያ ቅጥ</key>
+			<key type="lw">የመስመር መሰባበር በቃላት ውስጥ</key>
 			<key type="ms">የመለኪያ ስርዓት</key>
 			<key type="numbers">ቁጥሮች</key>
+			<key type="ss">ከአህጽሮተ ቃል በኋላ የዐረፍተ ነገር መቋረጥ</key>
 			<key type="timezone">የሰዓት ሰቅ</key>
 			<key type="va">የአካባቢ አይነት</key>
 			<key type="x">ለግል ጥቅም</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">የቡዲስት ቀን አቆጣጠር</type>
+			<type key="calendar" type="buddhist" scope="core">ቡዲስት</type>
 			<type key="calendar" type="chinese">የቻይና የቀን አቆጣጠር</type>
+			<type key="calendar" type="chinese" scope="core">ቻይንኛ</type>
 			<type key="calendar" type="coptic">የኮፕቲክ የቀን አቆጣጠር</type>
+			<type key="calendar" type="coptic" scope="core">ኮፕቲክ</type>
 			<type key="calendar" type="dangi">የዳንጊ የቀን አቆጣጠር</type>
+			<type key="calendar" type="dangi" scope="core">ዳንጊ</type>
 			<type key="calendar" type="ethiopic">የኢትዮጵያ የቀን አቆጣጠር</type>
+			<type key="calendar" type="ethiopic" scope="core">ኢትዮፒክ</type>
 			<type key="calendar" type="ethiopic-amete-alem">የኢትዮፒክ አመተ አለም የቀን አቆጣጠር</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ኢትዮፒክ ዓመተ ዓለም</type>
 			<type key="calendar" type="gregorian">የግሪጎሪያን የቀን አቆጣጠር</type>
+			<type key="calendar" type="gregorian" scope="core">ግሪጎሪያን</type>
 			<type key="calendar" type="hebrew">የእብራዊያን የቀን አቆጣጠር</type>
+			<type key="calendar" type="hebrew" scope="core">ሂብሩ</type>
 			<type key="calendar" type="indian">የህንድ ብሔራዊ የቀን አቆጣጠር</type>
 			<type key="calendar" type="islamic">የሂጅራ የቀን አቆጣጠር</type>
+			<type key="calendar" type="islamic" scope="core">ሂጅራ</type>
 			<type key="calendar" type="islamic-civil">የሂጅራ የቀን አቆጣጠር (ታቡላር፣ ሲቪል አፖች)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ሂጅራ (ታቡላር፣ የሲቪል ዘመን)</type>
 			<type key="calendar" type="islamic-umalqura">የሂጅራ የቀን አቆጣጠር (ኡም አል-ቁራ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ሂጅራ (ኡሙ አል-ቁራ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 የቀን አቆጣጠር</type>
 			<type key="calendar" type="japanese">የጃፓን የቀን አቆጣጠር</type>
+			<type key="calendar" type="japanese" scope="core">ጃፓንኛ</type>
 			<type key="calendar" type="persian">የፐርሽያ የቀን አቆጣጠር</type>
+			<type key="calendar" type="persian" scope="core">ፐርሽያን</type>
 			<type key="calendar" type="roc">የሚንጉ የቀን አቆጣጠር</type>
+			<type key="calendar" type="roc" scope="core">ሚንጉ</type>
 			<type key="cf" type="account">የሂሳብ ምንዛሪ ቅርጸት</type>
+			<type key="cf" type="account" scope="core">የሂሳብ አያያዝ</type>
 			<type key="cf" type="standard">መደበኛ የምንዛሪ ቅርጸት</type>
+			<type key="cf" type="standard" scope="core">መደበኛ</type>
 			<type key="colAlternate" type="non-ignorable">ምልክቶችን ደርድር</type>
 			<type key="colAlternate" type="shifted">ችላ ባይ ምልክቶችን ደርድር</type>
 			<type key="colBackwards" type="no">የፊደል ጭረቶችን እንደመደበኛ ደርድር</type>
@@ -988,16 +1009,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">አቢይ ሆሄ መጀመሪያ ደርድር</type>
 			<type key="colCaseLevel" type="no">ያለመልከፊደል ትብ ደርድር</type>
 			<type key="colCaseLevel" type="yes">በመልከፊደል ትብ ደርድር</type>
-			<type key="collation" type="big5han">የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5</type>
 			<type key="collation" type="dictionary">የመዝገበ ቃላት የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="ducet">የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል</type>
-			<type key="collation" type="gb2312han">የቀለለ የቻይንኛ የድርደራ ቅደም ተከተል - GB2312</type>
+			<type key="collation" type="ducet" scope="core">ነባሪ ዩኒኮድ</type>
 			<type key="collation" type="phonebook">የስልክ ደብተር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="phonetic">የፎነቲክ ድርደራ ቅደም ተከተል</type>
 			<type key="collation" type="pinyin">ፒንይን የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="search">ለጠቅላላ ጉዳይ ፍለጋ</type>
+			<type key="collation" type="search" scope="core">ፍለጋ</type>
 			<type key="collation" type="searchjl">በሃንጉል የመጀመሪያ ተነባቢ ፈልግ</type>
 			<type key="collation" type="standard">መደበኛ የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="standard" scope="core">መደበኛ</type>
 			<type key="collation" type="stroke">የበትር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="traditional">ባህላዊ የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="unihan">የመሰረታዊ በትር ድርድር ቅደም ተከተል</type>
@@ -1013,18 +1035,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ሙሉ ወርድ</type>
 			<type key="d0" type="hwidth">ግማሽ ወርድ</type>
 			<type key="d0" type="npinyin">አሃዛዊ</type>
+			<type key="em" type="default" scope="core">ነባሪ</type>
+			<type key="em" type="emoji" scope="core">ስሜት ገላጭ ምስል</type>
+			<type key="em" type="text" scope="core">ጽሑፍ</type>
 			<type key="hc" type="h11">የ12 ሰዓት ስርዓት (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">የ12 ሰዓት ስርዓት (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">የ24 ሰዓት ስርዓት (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">የ24 ሰዓት ስርዓት (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ላላ ያለ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="loose" scope="core">ልቅ</type>
 			<type key="lb" type="normal">መደበኛ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="normal" scope="core">መደበኛ</type>
 			<type key="lb" type="strict">ጠበቅ ያለ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="strict" scope="core">ጥብቅ</type>
+			<type key="lw" type="breakall" scope="core">ሁሉንም ሰብረው</type>
+			<type key="lw" type="keepall" scope="core">ሁሉንም አቆይ</type>
+			<type key="lw" type="normal" scope="core">መደበኛ</type>
+			<type key="lw" type="phrase" scope="core">በዓረፍተ ነገሮች ውስጥ ያስቀምጡ</type>
 			<type key="m0" type="bgn">ዩኤስ ቢጂኤን ትራንስሊትሬሽን</type>
 			<type key="m0" type="ungegn">ዩኤን ጂኢጂኤን ትራንስሊትሬሽን</type>
 			<type key="ms" type="metric">ሜትሪክ ስርዓት</type>
+			<type key="ms" type="metric" scope="core">መለኪያ</type>
 			<type key="ms" type="uksystem">ኢምፔሪያል የመለኪያ ስርዓት</type>
+			<type key="ms" type="uksystem" scope="core">ዩኬ</type>
 			<type key="ms" type="ussystem">የአሜሪካ መለኪያ ስርዓት</type>
+			<type key="ms" type="ussystem" scope="core">ዩኤስ</type>
 			<type key="numbers" type="arab">የአረቢክ-ኢንዲክ አሃዞች</type>
 			<type key="numbers" type="arabext">የተራዘሙ የአረቢክ-ኢንዲክ አሃዞች</type>
 			<type key="numbers" type="armn">የአርመንኛ ቁጥሮች</type>
@@ -1069,6 +1108,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">የቲቤት አሃዞች</type>
 			<type key="numbers" type="traditional">ተለምዷዊ ቁጥሮች</type>
 			<type key="numbers" type="vaii">የቫይ አሃዞች</type>
+			<type key="ss" type="none" scope="core">ጠፍቷል</type>
+			<type key="ss" type="standard" scope="core">በርቷል</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ሜትሪክ</measurementSystemName>
@@ -1098,13 +1139,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="coptic">
 				<eras>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">ዓ/ዓ</era>
 						<era type="1" draft="unconfirmed">ዓ/ም</era>
 					</eraAbbr>
 				</eras>
@@ -1133,7 +1184,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="generic">
@@ -1164,21 +1226,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
@@ -1415,10 +1489,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">ጠ</dayPeriod>
 							<dayPeriod type="pm">ከ</dayPeriod>
-							<dayPeriod type="morning1">ጥዋት</dayPeriod>
-							<dayPeriod type="afternoon1">ከሰዓት</dayPeriod>
-							<dayPeriod type="evening1">ማታ</dayPeriod>
-							<dayPeriod type="night1">ሌሊት</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1426,7 +1496,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<eraNames>
 						<era type="0">ዓመተ ዓለም</era>
 						<era type="1">ዓመተ ምሕረት</era>
-						<era type="1" alt="variant">ዓ/ም</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ዓ/ዓ</era>
@@ -1506,13 +1575,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E MMM d y G</dateFormatItem>
@@ -1520,6 +1593,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">a h v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E፣ d/M</dateFormatItem>
 						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
@@ -1538,6 +1612,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG M/y – GGGGG M/y</greatestDifference>
 							<greatestDifference id="M">GGGGG M/y – M/y</greatestDifference>
@@ -1681,14 +1758,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">ይህ ሩብ</relative>
 				<relative type="1">የሚቀጥለው ሩብ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ሩብ በፊት</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ሩብ በፊት</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="month">
 				<displayName>ወር</displayName>
 				<relative type="-1">ያለፈው ወር</relative>
@@ -1990,6 +2079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HHmm;-HHmm</hourFormat>
 			<gmtFormat>ጂ ኤም ቲ{0}</gmtFormat>
 			<gmtZeroFormat>ጂ ኤም ቲ</gmtZeroFormat>
+			<gmtUnknownFormat>ጂ ኤም ቲ+</gmtUnknownFormat>
 			<regionFormat>{0} ሰዓት</regionFormat>
 			<regionFormat type="daylight">{0} የቀን ብርሃን ሰዓት</regionFormat>
 			<regionFormat type="standard">{0} መደበኛ ሰዓት</regionFormat>
@@ -2611,9 +2701,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ፍኖም ፔንህ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ኢንደርበሪ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ካንቶን</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3283,9 +3370,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>የምዕራብ አፍሪካ ሰዓት</generic>
-					<standard>የምዕራብ አፍሪካ መደበኛ ሰዓት</standard>
-					<daylight>የምዕራብ አፍሪካ ክረምት ሰዓት</daylight>
+					<standard>የምዕራብ አፍሪካ ሰዓት</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3642,6 +3727,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>የጉያና ሰዓት</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>የሃዋይ አሌኡት መደበኛ ሰዓት አቆጣጠር</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>የሃዋይ አሌኡት ሰዓት አቆጣጠር</generic>
@@ -4225,7 +4315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4775,6 +4864,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>የምዕራብ ካሪብያን ዶላር</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>የካሪቢያን ጊልደር</displayName>
+				<displayName count="one">የካሪቢያን ጊልደር</displayName>
+				<displayName count="other">የካሪቢያን ጊልደር</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>የምዕራብ አፍሪካ ሴፋ ፍራንክ</displayName>
 			</currency>
@@ -4799,6 +4893,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>የዚምቧቡዌ ዶላር</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>የዚምባብዌ ወርቅ</displayName>
+				<displayName count="one">የዚምባብዌ ወርቅ</displayName>
+				<displayName count="other">የዚምባብዌ ወርቅ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4822,9 +4921,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p-3">
 				<unitPrefixPattern>ሚሊ{0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
-			</compoundUnit>
 			<compoundUnit type="10p-9">
 				<unitPrefixPattern>ናኖ{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -4861,18 +4957,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p18">
 				<unitPrefixPattern>ኤክሳ {0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="10p21">
-				<unitPrefixPattern>ዜታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p24">
-				<unitPrefixPattern>ዮታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p27">
-				<unitPrefixPattern>ሮና {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p8">
-				<unitPrefixPattern>ዮቢ {0}</unitPrefixPattern>
-			</compoundUnit>
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0} በ{1}</compoundUnitPattern>
 			</compoundUnit>
@@ -4891,14 +4975,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ጂ-ኃይል</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>ኡደት</displayName>
 				<unitPattern count="one">{0} ኡደት</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኡደት</unitPattern>
 				<unitPattern count="other">{0} ኡደት</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ኡደቶች</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName>ራዲ</displayName>
 				<unitPattern count="one">{0} ራዲ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ራዲያን</unitPattern>
 				<unitPattern count="other">{0} ራዲ</unitPattern>
@@ -4922,11 +5004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ካሬ ሜትር</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ካሬ ሜትር</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<displayName>ስኴር ያርድ</displayName>
-				<unitPattern count="one">{0} ስኴር ያርድ</unitPattern>
-				<unitPattern count="other">{0} ስኴር ያርድ</unitPattern>
-			</unit>
 			<unit type="area-dunam">
 				<displayName>ጋሻ</displayName>
 			</unit>
@@ -4940,7 +5017,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ንጥሎች</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ንጥሎች</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ክፍል</displayName>
+				<unitPattern count="one">{0} ክፍል</unitPattern>
+				<unitPattern count="other">{0} ክፍል</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ክፍል በየሚሊዮን</unitPattern>
 				<unitPattern count="other">{0} ppm</unitPattern>
@@ -4964,6 +5046,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mol</unitPattern>
 				<unitPattern count="other" case="accusative">{0} moles</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ሊትሮች በ100 ኪሎሜትሮች</displayName>
 				<unitPattern count="one">{0} ሊትር በ100 ኪሎሜትሮች</unitPattern>
@@ -5031,7 +5118,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ማይክሮሰከንድ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>አምፒር</displayName>
 				<unitPattern count="one">{0} አምፒር</unitPattern>
 				<unitPattern count="one" case="accusative">{0} አምፒር</unitPattern>
 				<unitPattern count="other">{0} አምፒር</unitPattern>
@@ -5044,33 +5130,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ohms</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName>ቮልት</displayName>
 				<unitPattern count="one">{0} ቮልት</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ቮልት</unitPattern>
 				<unitPattern count="other">{0} ቮልት</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ቮልቶች</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ኪሎ ካሎሪ</displayName>
-				<unitPattern count="one">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="other">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኪሎ ካሎሪ</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>ኪጁ</displayName>
-				<unitPattern count="one">{0} ኪጁ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኪጁ</unitPattern>
-				<unitPattern count="other">{0} ኪጁ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኪጁ</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>ጁልስ</displayName>
-				<unitPattern count="one">{0} ጁልስ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ጁልስ</unitPattern>
-				<unitPattern count="other">{0} ጁልስ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ጁልስ</unitPattern>
-			</unit>
 			<unit type="force-newton">
 				<unitPattern count="one">{0} ኒ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኒውተን</unitPattern>
@@ -5084,34 +5148,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ኪሎዋት-ሰዓታት በየ 100 ኪሎሜትሮች</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ኪሎዋት-ሰዓታት በየ 100 ኪሎሜትሮች</unitPattern>
 			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName>ጊጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ጊጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ሜጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሜጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>ኪሎኸርዝ</displayName>
-				<unitPattern count="one">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኪሎኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ኸርዝ</displayName>
-				<unitPattern count="one">{0} ኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኸርዝ</unitPattern>
-			</unit>
 			<unit type="graphics-em">
 				<displayName>ታይፖግራፊክ em</displayName>
 			</unit>
@@ -5202,15 +5238,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ግራም</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ግራም</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>ሚግ</displayName>
-				<unitPattern count="one">{0} ሚግ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሚግ</unitPattern>
-				<unitPattern count="other">{0} ሚግ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሚግ</unitPattern>
-			</unit>
 			<unit type="mass-microgram">
-				<displayName>ማግ</displayName>
 				<unitPattern count="one">{0} ማግ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ማይክሮ ግራም</unitPattern>
 				<unitPattern count="other">{0} ማግ</unitPattern>
@@ -5223,11 +5251,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} CD</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ካራቶች</unitPattern>
 			</unit>
-			<unit type="mass-dalton">
-				<displayName>ዳልተንስ</displayName>
-				<unitPattern count="one">{0} ዳልተንስ</unitPattern>
-				<unitPattern count="other">{0} ዳልተንስ</unitPattern>
-			</unit>
 			<unit type="mass-earth-mass">
 				<unitPattern count="one">{0} ኤርዝማስስ</unitPattern>
 				<unitPattern count="other">{0} ኤርዝማስስ</unitPattern>
@@ -5236,19 +5259,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሶላር ማስስ</unitPattern>
 				<unitPattern count="other">{0} ሶላር ማስስ</unitPattern>
 			</unit>
-			<unit type="power-gigawatt">
-				<displayName>ጊጋ ዋት</displayName>
-				<unitPattern count="one">{0} ጊዋ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ጊዋ</unitPattern>
-				<unitPattern count="other">{0} ጊዋ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ጊዋ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ሜጋ ዋት</displayName>
-				<unitPattern count="one">{0} ሜዋ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሜዋ</unitPattern>
-				<unitPattern count="other">{0} ሜዋ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሜዋ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} ኪሎዋት</unitPattern>
@@ -5264,10 +5276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>ሚሊ ዋት</displayName>
-				<unitPattern count="one">{0} ሚዋ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሚዋ</unitPattern>
-				<unitPattern count="other">{0} ሚዋ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሚዋ</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
@@ -5316,7 +5324,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ዲግሪ ፋራንሃይት</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>ኬ</displayName>
 				<unitPattern count="one">{0} ኬ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኬልቪን</unitPattern>
 				<unitPattern count="other">{0} ኬ</unitPattern>
@@ -5332,24 +5339,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ኩቢክ ማይል</unitPattern>
 				<unitPattern count="other">{0} ኩቢክ ማይል</unitPattern>
 			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>ኪዩቢክ ያርድ</displayName>
-				<unitPattern count="one">{0} ኪዩቢክ ያርድ</unitPattern>
-				<unitPattern count="other">{0} ኪዩቢክ ያርድ</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ሜጋሊትር</displayName>
-				<unitPattern count="one">{0} ሜሊ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሜሊ</unitPattern>
-				<unitPattern count="other">{0} ሜሊ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሜሊ</unitPattern>
-			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ሄክቶሊትር</displayName>
-				<unitPattern count="one">{0} ሄሊ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሄሊ</unitPattern>
-				<unitPattern count="other">{0} ሄሊ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሄሊ</unitPattern>
 			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one">{0} ሊትር</unitPattern>
@@ -5378,46 +5369,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ሜትሪክ ፒንቶች</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName>ጋሎን</displayName>
 				<unitPattern count="one">{0}/ጋሎን</unitPattern>
 				<unitPattern count="other">{0}/ጋሎን</unitPattern>
-				<perUnitPattern>{0}/ጋሎን</perUnitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<displayName>ኳርትስ</displayName>
-				<unitPattern count="one">{0} ኳርትስ</unitPattern>
-				<unitPattern count="other">{0} ኳርትስ</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>ኩባያ</displayName>
-				<unitPattern count="one">{0} ኩባያ</unitPattern>
-				<unitPattern count="other">{0} ኩባያ</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>Imp. fluid ኦንስስ</displayName>
 				<unitPattern count="one">{0} Imp. fluid ኦንስስ</unitPattern>
 				<unitPattern count="other">{0} Imp. fluid ኦንስስ</unitPattern>
 			</unit>
-			<unit type="volume-tablespoon">
-				<displayName>የሻይ ማንኪያ</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያ</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያ</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>የሻይ ማንኪያዎች</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያዎች</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያዎች</unitPattern>
-			</unit>
 			<unit type="volume-barrel">
 				<unitPattern count="one">{0} በርሜል</unitPattern>
 				<unitPattern count="other">{0} በርሜሎች</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ብርሃን</displayName>
-				<unitPattern count="one">{0} ብርሃን</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ብርሃን</unitPattern>
-				<unitPattern count="other">{0} ብርሃን</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ብርሃን</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>ካታልስ</displayName>
+				<unitPattern count="one">{0} ካት</unitPattern>
+				<unitPattern count="other">{0} ካት</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄነሪስ</displayName>
+				<unitPattern count="one">{0} ሄ</unitPattern>
+				<unitPattern count="other">{0} ሄ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ [IT]</displayName>
+				<unitPattern count="one">{0} ካሎሪ [IT]</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ [IT]</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪሎግራም - ኃይል</displayName>
+				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
+				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴስላስ</displayName>
+				<unitPattern count="one">{0} ቴ</unitPattern>
+				<unitPattern count="other">{0} ቴ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበርስ</displayName>
+				<unitPattern count="one">{0} ዌበ</unitPattern>
+				<unitPattern count="other">{0} ዌበ</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>ለሊት</displayName>
@@ -5425,7 +5417,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="accusative">{0}/ለሊት</unitPattern>
 				<unitPattern count="other">{0}/ለሊት</unitPattern>
 				<unitPattern count="other" case="accusative">{0}/ለሊት</unitPattern>
-				<perUnitPattern>{0}/ለሊት</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>ዓቢይ አቅጣጫ</displayName>
@@ -5613,12 +5604,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ንጥል</unitPattern>
 				<unitPattern count="other">{0} ንጥል</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ክፍል</displayName>
+				<unitPattern count="one">{0} ክፍል</unitPattern>
+				<unitPattern count="other">{0} ክፍል</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>ፐርሰንት</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>በማይል</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊ/ኪሜ</displayName>
 				<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
@@ -6284,6 +6285,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} የፈሳሽ መለኪያ</unitPattern>
 				<unitPattern count="other">{0} የፈሳሽ መለኪያ</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<displayName>ካት</displayName>
+				<unitPattern count="one">{0} ካት</unitPattern>
+				<unitPattern count="other">{0} ካት</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄ</displayName>
+				<unitPattern count="one">{0} ሄ</unitPattern>
+				<unitPattern count="other">{0} ሄ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ-IT</displayName>
+				<unitPattern count="one">{0} ካሎሪ-IT</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪግ-ኃይል</displayName>
+				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
+				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴ</displayName>
+				<unitPattern count="one">{0} ቴ</unitPattern>
+				<unitPattern count="other">{0} ቴ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበ</displayName>
+				<unitPattern count="one">{0} ዌበ</unitPattern>
+				<unitPattern count="other">{0} ዌበ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ብርሃን</displayName>
 				<unitPattern count="one">{0} ብርሃን</unitPattern>
@@ -6304,28 +6335,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p21">
-				<unitPrefixPattern>ዜታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p24">
-				<unitPrefixPattern>ዮታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p27">
-				<unitPrefixPattern>ሮና {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p8">
-				<unitPrefixPattern>ዮቢ {0}</unitPrefixPattern>
-			</compoundUnit>
 			<unit type="angle-revolution">
 				<displayName>ኡደ</displayName>
 				<unitPattern count="one">{0} ኡደ</unitPattern>
 				<unitPattern count="other">{0}ኡደ</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName>ራዲ</displayName>
 				<unitPattern count="one">{0}ራዲ</unitPattern>
 				<unitPattern count="other">{0}ራዲ</unitPattern>
 			</unit>
@@ -6345,17 +6360,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ማይል²</unitPattern>
 				<unitPattern count="other">{0} ማይል²</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one">{0} ስኴር ያርድ</unitPattern>
-				<unitPattern count="other">{0} ስኴር ያርድ</unitPattern>
-			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0} ጫማ²</unitPattern>
 				<unitPattern count="other">{0} ጫማ²</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ክፍል</displayName>
+				<unitPattern count="one">{0} ክፍል</unitPattern>
+				<unitPattern count="other">{0} ክፍል</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}ሊበ100ኪሜ</unitPattern>
 				<unitPattern count="other">{0}ሊበ100ኪሜ</unitPattern>
@@ -6403,51 +6424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሰ</unitPattern>
 				<unitPattern count="other">{0} ሰ</unitPattern>
 			</unit>
-			<unit type="electric-ampere">
-				<displayName>አምፒር</displayName>
-				<unitPattern count="one">{0} አምፒር</unitPattern>
-				<unitPattern count="other">{0} አምፒር</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<displayName>ቮልት</displayName>
-				<unitPattern count="one">{0} ቮልት</unitPattern>
-				<unitPattern count="other">{0} ቮልት</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ኪሎ ካሎሪ</displayName>
-				<unitPattern count="one">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="other">{0} ኪሎ ካሎሪ</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>ኪጁ</displayName>
-				<unitPattern count="one">{0} ኪጁ</unitPattern>
-				<unitPattern count="other">{0} ኪጁ</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>ጁልስ</displayName>
-				<unitPattern count="one">{0} ጁልስ</unitPattern>
-				<unitPattern count="other">{0} ጁልስ</unitPattern>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName>ጊጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ጊጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ሜጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ሜጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>ኪሎኸርዝ</displayName>
-				<unitPattern count="one">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኪሎኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ኸርዝ</displayName>
-				<unitPattern count="one">{0} ኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኸርዝ</unitPattern>
-			</unit>
 			<unit type="graphics-megapixel">
 				<unitPattern count="one">{0} ሜፒ</unitPattern>
 				<unitPattern count="other">{0} ሜፒ</unitPattern>
@@ -6465,33 +6441,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሚሊግራም</unitPattern>
 				<unitPattern count="other">{0} ሚሊግራም</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>ማግ</displayName>
-				<unitPattern count="one">{0} ማግ</unitPattern>
-				<unitPattern count="other">{0} ማግ</unitPattern>
-			</unit>
 			<unit type="mass-carat">
 				<displayName>ካራት</displayName>
 			</unit>
-			<unit type="mass-dalton">
-				<displayName>ዳልተንስ</displayName>
-				<unitPattern count="one">{0} ዳልተንስ</unitPattern>
-				<unitPattern count="other">{0} ዳልተንስ</unitPattern>
-			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ጊዋ</displayName>
-				<unitPattern count="one">{0} ጊዋ</unitPattern>
-				<unitPattern count="other">{0} ጊዋ</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>ሜዋ</displayName>
-				<unitPattern count="one">{0} ሜዋ</unitPattern>
-				<unitPattern count="other">{0} ሜዋ</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ሚዋ</displayName>
-				<unitPattern count="one">{0} ሚዋ</unitPattern>
-				<unitPattern count="other">{0} ሚዋ</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} የፈረስ ኃይል</unitPattern>
@@ -6521,26 +6475,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>ኬ</displayName>
-				<unitPattern count="one">{0} ኬ</unitPattern>
-				<unitPattern count="other">{0} ኬ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>ኪዩቢክ ያርድ</displayName>
-				<unitPattern count="one">{0} ኪዩቢክ ያርድ</unitPattern>
-				<unitPattern count="other">{0} ኪዩቢክ ያርድ</unitPattern>
-			</unit>
 			<unit type="volume-megaliter">
-				<displayName>ሜጋሊትር</displayName>
 				<unitPattern count="one">{0} ሜጋሊትር</unitPattern>
 				<unitPattern count="other">{0} ሜጋሊትር</unitPattern>
 			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>ሄሊ</displayName>
-				<unitPattern count="one">{0} ሄሊ</unitPattern>
-				<unitPattern count="other">{0} ሄሊ</unitPattern>
-			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0} ሚሊ</unitPattern>
 				<unitPattern count="other">{0} ሚሊ</unitPattern>
@@ -6550,30 +6488,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ኤጫ</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName>ጋሎን</displayName>
 				<unitPattern count="one">{0} ጋሎን</unitPattern>
 				<unitPattern count="other">{0} ጋሎን</unitPattern>
-				<perUnitPattern>{0}/ጋሎን</perUnitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<displayName>ኳርትስ</displayName>
-				<unitPattern count="one">{0} ኳርትስ</unitPattern>
-				<unitPattern count="other">{0} ኳርትስ</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>ኩባያ</displayName>
-				<unitPattern count="one">{0} ኩባያ</unitPattern>
-				<unitPattern count="other">{0} ኩባያ</unitPattern>
-			</unit>
-			<unit type="volume-tablespoon">
-				<displayName>የሻይ ማንኪያ</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያ</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያ</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>የሻይ ማንኪያዎች</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያዎች</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያዎች</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<unitPattern count="one">{0} ክመ</unitPattern>
@@ -6583,16 +6499,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ፈመ</unitPattern>
 				<unitPattern count="other">{0} ፈመ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ብርሃን</displayName>
-				<unitPattern count="one">{0} ብርሃን</unitPattern>
-				<unitPattern count="other">{0} ብርሃን</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>ካት</displayName>
+				<unitPattern count="one">{0} ካት</unitPattern>
+				<unitPattern count="other">{0} ካት</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ለሊቶች</displayName>
-				<unitPattern count="one">{0} ለሊት</unitPattern>
-				<unitPattern count="other">{0} ለሊት</unitPattern>
-				<perUnitPattern>{0}/ለሊት</perUnitPattern>
+			<unit type="electric-henry">
+				<displayName>ሄ</displayName>
+				<unitPattern count="one">{0} ሄ</unitPattern>
+				<unitPattern count="other">{0} ሄ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ-IT</displayName>
+				<unitPattern count="one">{0} ካሎሪ-IT</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪግ-ኃይል</displayName>
+				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
+				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴ</displayName>
+				<unitPattern count="one">{0} ቴ</unitPattern>
+				<unitPattern count="other">{0} ቴ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበ</displayName>
+				<unitPattern count="one">{0} ዌበ</unitPattern>
+				<unitPattern count="other">{0} ዌበ</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -6609,22 +6544,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
 			<listPatternPart type="2">{0} ወይም {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="end">{0} እና {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="end">{0} እና {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-narrow">
-			<listPatternPart type="end">{0} እና {1}</listPatternPart>
-			<listPatternPart type="2">{0} እና {1}</listPatternPart>
-		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
diff --git a/make/data/cldr/common/main/an.xml b/make/data/cldr/common/main/an.xml
index 6349366dec4..cd6d6405d07 100644
--- a/make/data/cldr/common/main/an.xml
+++ b/make/data/cldr/common/main/an.xml
@@ -1066,9 +1066,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/ar.xml b/make/data/cldr/common/main/ar.xml
index a17155fcd2e..63ae709d94b 100644
--- a/make/data/cldr/common/main/ar.xml
+++ b/make/data/cldr/common/main/ar.xml
@@ -291,6 +291,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">لغة البافيا</language>
 			<language type="ksh">لغة الكولونيان</language>
 			<language type="ku">الكردية</language>
+			<language type="ku" menu="core">الكردية</language>
+			<language type="ku" menu="extension">الكرمانجية</language>
 			<language type="kum">القموقية</language>
 			<language type="kut">الكتيناي</language>
 			<language type="kv">الكومي</language>
@@ -478,7 +480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="slh">لوشوتسيد الجنوبية</language>
 			<language type="sm">الساموائية</language>
 			<language type="sma">السامي الجنوبي</language>
-			<language type="smj">اللول سامي</language>
+			<language type="smj">السامي لولي</language>
 			<language type="smn">الإيناري سامي</language>
 			<language type="sms">السكولت سامي</language>
 			<language type="sn">الشونا</language>
@@ -555,7 +557,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ve">الفيندا</language>
 			<language type="vec">البندقية</language>
 			<language type="vi">الفيتنامية</language>
-			<language type="vmw" draft="contributed">الماكوا</language>
+			<language type="vmw">الماكوا</language>
 			<language type="vo">لغة الفولابوك</language>
 			<language type="vot">الفوتيك</language>
 			<language type="vun">الفونجو</language>
@@ -809,6 +811,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">الصين</territory>
 			<territory type="CO">كولومبيا</territory>
 			<territory type="CP">جزيرة كليبيرتون</territory>
+			<territory type="CQ">سارك</territory>
 			<territory type="CR">كوستاريكا</territory>
 			<territory type="CU">كوبا</territory>
 			<territory type="CV">الرأس الأخضر</territory>
@@ -1067,35 +1070,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">الفرز الرقمي</key>
 			<key type="colStrength">قوة الفرز</key>
 			<key type="currency">العملة</key>
+			<key type="em" draft="contributed">عرض الرموز التعبيرية</key>
 			<key type="hc">نظام التوقيت (12 مقابل 24)</key>
 			<key type="lb">نمط فصل السطور</key>
+			<key type="lw" draft="contributed">فصل السطور وسط الكلمات</key>
 			<key type="ms">نظام القياس</key>
 			<key type="numbers">الأرقام</key>
+			<key type="ss" draft="contributed">فاصل الجملة بعد الاختصار</key>
 			<key type="timezone">المنطقة الزمنية</key>
 			<key type="va">متغيرات اللغة</key>
 			<key type="x">استخدام خاص</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">التقويم البوذي</type>
+			<type key="calendar" type="buddhist" scope="core" draft="contributed">البوذي</type>
 			<type key="calendar" type="chinese">التقويم الصيني</type>
+			<type key="calendar" type="chinese" scope="core" draft="contributed">الصيني</type>
 			<type key="calendar" type="coptic">التقويم القبطي</type>
+			<type key="calendar" type="coptic" scope="core" draft="contributed">القبطي</type>
 			<type key="calendar" type="dangi">تقويم دانجي</type>
+			<type key="calendar" type="dangi" scope="core" draft="contributed">دانجي</type>
 			<type key="calendar" type="ethiopic">التقويم الإثيوبي</type>
+			<type key="calendar" type="ethiopic" scope="core">الإثيوبي</type>
 			<type key="calendar" type="ethiopic-amete-alem">تقويم أميتي أليم الإثيوبي</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">أميتي أليم الإثيوبي</type>
 			<type key="calendar" type="gregorian">التقويم الميلادي</type>
+			<type key="calendar" type="gregorian" scope="core">الميلادي</type>
 			<type key="calendar" type="hebrew">التقويم العبري</type>
+			<type key="calendar" type="hebrew" scope="core" draft="contributed">العبري</type>
 			<type key="calendar" type="indian">التقويم القومي الهندي</type>
 			<type key="calendar" type="islamic">التقويم الهجري</type>
+			<type key="calendar" type="islamic" scope="core">الهجري</type>
 			<type key="calendar" type="islamic-civil">التقويم الهجري المدني</type>
+			<type key="calendar" type="islamic-civil" scope="core">الهجري المدني</type>
 			<type key="calendar" type="islamic-rgsa">التقويم الهجري (السعودية - الرؤية)</type>
 			<type key="calendar" type="islamic-tbla">التقويم الهجري (الحسابات الفلكية)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">الهجري (الحسابات الفلكية)</type>
 			<type key="calendar" type="islamic-umalqura">التقويم الهجري (أم القرى)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">الهجري (أم القرى)</type>
 			<type key="calendar" type="iso8601">تقويم ISO-8601</type>
 			<type key="calendar" type="japanese">التقويم الياباني</type>
+			<type key="calendar" type="japanese" scope="core">الياباني</type>
 			<type key="calendar" type="persian">التقويم الفارسي</type>
+			<type key="calendar" type="persian" scope="core">الفارسي</type>
 			<type key="calendar" type="roc">تقويم مينجو</type>
+			<type key="calendar" type="roc" scope="core">مينجو</type>
 			<type key="cf" type="account">تنسيق العملة للحسابات</type>
+			<type key="cf" type="account" scope="core">حسابات</type>
 			<type key="cf" type="standard">تنسيق العملة القياسي</type>
+			<type key="cf" type="standard" scope="core">قياسي</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">تصنيف الرموز</type>
 			<type key="colAlternate" type="shifted" draft="contributed">تصنيف تجاهل الرموز</type>
 			<type key="colBackwards" type="no" draft="contributed">تصنيف اللكنات بشكل عادي</type>
@@ -1105,21 +1128,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">تصنيف الأحرف الكبيرة أولاً</type>
 			<type key="colCaseLevel" type="no" draft="contributed">تصنيف بحسب الأحرف غير الحساسة لحالة الأحرف</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">تصنيف بحسب حساسية الأحرف</type>
-			<type key="collation" type="big5han">الترتيب حسب اللغة الصينية التقليدية (Big5)</type>
 			<type key="collation" type="compat">ترتيب الفرز السابق: للتوافق</type>
+			<type key="collation" type="compat" scope="core">التوافق</type>
 			<type key="collation" type="dictionary">الترتيب حسب القاموس</type>
+			<type key="collation" type="dictionary" scope="core">القاموس</type>
 			<type key="collation" type="ducet">ترتيب فرز Unicode الافتراضي</type>
-			<type key="collation" type="gb2312han">الترتيب حسب اللغة الصينية المبسّطة (GB2312)</type>
+			<type key="collation" type="ducet" scope="core">Unicode افتراضي</type>
 			<type key="collation" type="phonebook">الترتيب حسب دليل الهاتف</type>
+			<type key="collation" type="phonebook" scope="core">دليل الهاتف</type>
 			<type key="collation" type="phonetic">الترتيب حسب اللفظ</type>
+			<type key="collation" type="phonetic" scope="core">حسب اللفظ</type>
 			<type key="collation" type="pinyin">الترتيب حسب نظام بنيين الصيني</type>
+			<type key="collation" type="pinyin" scope="core" draft="contributed">بنيين الصيني</type>
 			<type key="collation" type="search">بحث لأغراض عامة</type>
+			<type key="collation" type="search" scope="core">بحث</type>
 			<type key="collation" type="searchjl" draft="contributed">بحث باستخدام حرف الهانغول الساكن الأول</type>
 			<type key="collation" type="standard">ترتيب الفرز القياسي</type>
+			<type key="collation" type="standard" scope="core">قياسي</type>
 			<type key="collation" type="stroke">الترتيب حسب نظام كتابة المجموع الصيني</type>
+			<type key="collation" type="stroke" scope="core" draft="contributed">نظام كتابة المجموع الصيني</type>
 			<type key="collation" type="traditional">ترتيب تقليدي</type>
+			<type key="collation" type="traditional" scope="core">تقليدي</type>
 			<type key="collation" type="unihan">الترتيب حسب نظام الكتابة بالجذر والمجموع</type>
+			<type key="collation" type="unihan" scope="core" draft="contributed">نظام الكتابة بالجذر والمجموع</type>
 			<type key="collation" type="zhuyin">الترتيب حسب نظام بوبوموفو</type>
+			<type key="collation" type="zhuyin" scope="core" draft="contributed">نظام بوبوموفو</type>
 			<type key="colNormalization" type="no" draft="contributed">التصفية بدون تسوية</type>
 			<type key="colNormalization" type="yes" draft="contributed">تصنيف Unicode طبيعي</type>
 			<type key="colNumeric" type="no" draft="contributed">تصنيف الأرقام على حدة</type>
@@ -1132,18 +1165,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">عرض كامل</type>
 			<type key="d0" type="hwidth">نصف العرض</type>
 			<type key="d0" type="npinyin" draft="contributed">رقمي</type>
+			<type key="em" type="default" scope="core">افتراضي</type>
+			<type key="em" type="emoji" scope="core">رمز تعبيري</type>
+			<type key="em" type="text" scope="core">نص</type>
 			<type key="hc" type="h11">نظام 12 ساعة (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">نظام 12 ساعة (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">نظام 24 ساعة (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">نظام 24 ساعة (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">نمط فصل السطور: متباعد</type>
+			<type key="lb" type="loose" scope="core">متباعد</type>
 			<type key="lb" type="normal">نمط فصل السطور: عادي</type>
+			<type key="lb" type="normal" scope="core">عادي</type>
 			<type key="lb" type="strict">نمط فصل السطور: متقارب</type>
+			<type key="lb" type="strict" scope="core">متقارب</type>
+			<type key="lw" type="breakall" scope="core">فصل الكل</type>
+			<type key="lw" type="keepall" scope="core">الاحتفاظ بالكل</type>
+			<type key="lw" type="normal" scope="core">عادي</type>
+			<type key="lw" type="phrase" scope="core" draft="contributed">عدم فصل العبارات</type>
 			<type key="m0" type="bgn">بي جي إن</type>
 			<type key="m0" type="ungegn">يو إن جي إي جي إن</type>
 			<type key="ms" type="metric">النظام المتري</type>
+			<type key="ms" type="metric" scope="core" draft="contributed">متري</type>
 			<type key="ms" type="uksystem">نظام القياس البريطاني</type>
+			<type key="ms" type="uksystem" scope="core" draft="contributed">بريطاني</type>
 			<type key="ms" type="ussystem">نظام القياس الأمريكي</type>
+			<type key="ms" type="ussystem" scope="core" draft="contributed">أمريكي</type>
 			<type key="numbers" type="arab">الأرقام العربية الهندية</type>
 			<type key="numbers" type="arabext">الأرقام العربية الهندية الممتدة</type>
 			<type key="numbers" type="armn">الأرقام الأرمينية</type>
@@ -1188,6 +1238,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">الأرقام التبتية</type>
 			<type key="numbers" type="traditional" draft="contributed">أرقام تقليدية</type>
 			<type key="numbers" type="vaii">أرقام فاي</type>
+			<type key="ss" type="none" scope="core">غير مفعّل</type>
+			<type key="ss" type="standard" scope="core">مفعّل</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">النظام المتري</measurementSystemName>
@@ -1211,6 +1263,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="index">[ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — ، ؛ \: ! ؟ . … ' &quot; « » ( ) \[ \]]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person" draft="contributed">[\- ‐‑ ، . /]</exemplarCharacters>
 		<moreInformation>؟</moreInformation>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
@@ -1344,11 +1397,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}، {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E، d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d‏/M‏/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E، M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E، d MMM y G</dateFormatItem>
@@ -1694,6 +1751,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} في {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} في {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1702,6 +1762,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} في {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} في {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1716,7 +1779,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">E، d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">MM، y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E، d MMM y G</dateFormatItem>
@@ -1954,6 +2019,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM" draft="contributed">y-MM G</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E، y/M/d G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
 				<eras>
@@ -2812,6 +2883,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<gmtFormat>غرينتش{0}</gmtFormat>
 			<gmtZeroFormat>غرينتش</gmtZeroFormat>
+			<gmtUnknownFormat>غرينتش+?</gmtUnknownFormat>
 			<regionFormat>توقيت {0}</regionFormat>
 			<regionFormat type="daylight">توقيت {0} الصيفي</regionFormat>
 			<regionFormat type="standard">توقيت {0} الرسمي</regionFormat>
@@ -3168,6 +3240,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>استر</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">كويهايكيو</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>بونتا أريناز</exemplarCity>
 			</zone>
@@ -3433,9 +3508,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>بنوم بنه</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>اندربيرج</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>كانتون</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4105,9 +4177,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>توقيت غرب أفريقيا</generic>
-					<standard>توقيت غرب أفريقيا الرسمي</standard>
-					<daylight>توقيت غرب أفريقيا الصيفي</daylight>
+					<standard>توقيت غرب أفريقيا</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4463,15 +4533,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<standard>توقيت الخليج</standard>
 				</long>
-				<short>
-					<standard>GST</standard>
-				</short>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
 					<standard>توقيت غيانا</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>توقيت هاواي ألوتيان الرسمي</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>توقيت هاواي ألوتيان</generic>
@@ -5128,6 +5200,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="arab">
+			<rationalPattern draft="contributed">{1}⁄{0}</rationalPattern>
+			<integerAndRationalPattern draft="contributed">{1} {0}</integerAndRationalPattern>
+			<integerAndRationalPattern alt="superSub" draft="contributed">{1} {0}⁠</integerAndRationalPattern>
+		</rationalFormats>
+		<rationalFormats numberSystem="arabext">
+			<rationalPattern draft="contributed">{1}⁄{0}</rationalPattern>
+			<integerAndRationalPattern draft="contributed">{1} {0}</integerAndRationalPattern>
+			<integerAndRationalPattern alt="superSub" draft="contributed">{1} {0}⁠</integerAndRationalPattern>
+		</rationalFormats>
+		<rationalFormats numberSystem="latn">
+			<integerAndRationalPattern alt="superSub" draft="contributed">{1} {0}⁠</integerAndRationalPattern>
+		</rationalFormats>
 		<currencyFormats numberSystem="arab">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
@@ -5142,92 +5227,103 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unitPattern count="many">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">‏#,##0.00 ¤;‏-#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="noCurrency">؜#,##0.00;(؜#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‏#,##0.00 ¤;‏-#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">‏#,##0.00;‏-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">‏#,##0.00 ¤;‏-#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="contributed">‏#,##0.00;‏-#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>؜#,##0.00¤;(؜#,##0.00¤)</pattern>
 					<pattern alt="alphaNextToNumber">؜#,##0.00 ¤;(؜#,##0.00 ¤)</pattern>
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="noCurrency">؜#,##0.00;(؜#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="zero">0 ألف ¤</pattern>
-					<pattern type="1000" count="one">0 ألف ¤</pattern>
-					<pattern type="1000" count="two">0 ألف ¤</pattern>
-					<pattern type="1000" count="few">0 ألف ¤</pattern>
-					<pattern type="1000" count="many">0 ألف ¤</pattern>
-					<pattern type="1000" count="other">0 ألف ¤</pattern>
-					<pattern type="10000" count="zero">00 ألف ¤</pattern>
-					<pattern type="10000" count="one">00 ألف ¤</pattern>
-					<pattern type="10000" count="two">00 ألف ¤</pattern>
-					<pattern type="10000" count="few">00 ألف ¤</pattern>
-					<pattern type="10000" count="many">00 ألف ¤</pattern>
-					<pattern type="10000" count="other">00 ألف ¤</pattern>
-					<pattern type="100000" count="zero">000 ألف ¤</pattern>
-					<pattern type="100000" count="one">000 ألف ¤</pattern>
-					<pattern type="100000" count="two">000 ألف ¤</pattern>
-					<pattern type="100000" count="few">000 ألف ¤</pattern>
-					<pattern type="100000" count="many">000 ألف ¤</pattern>
-					<pattern type="100000" count="other">000 ألف ¤</pattern>
-					<pattern type="1000000" count="zero">0 مليون ¤</pattern>
-					<pattern type="1000000" count="one">0 مليون ¤</pattern>
-					<pattern type="1000000" count="two">0 مليون ¤</pattern>
-					<pattern type="1000000" count="few">0 مليون ¤</pattern>
-					<pattern type="1000000" count="many">0 مليون ¤</pattern>
-					<pattern type="1000000" count="other">0 مليون ¤</pattern>
-					<pattern type="10000000" count="zero">00 مليون ¤</pattern>
-					<pattern type="10000000" count="one">00 مليون ¤</pattern>
-					<pattern type="10000000" count="two">00 مليون ¤</pattern>
-					<pattern type="10000000" count="few">00 مليون ¤</pattern>
-					<pattern type="10000000" count="many">00 مليون ¤</pattern>
-					<pattern type="10000000" count="other">00 مليون ¤</pattern>
-					<pattern type="100000000" count="zero">000 مليون ¤</pattern>
-					<pattern type="100000000" count="one">000 مليون ¤</pattern>
-					<pattern type="100000000" count="two">000 مليون ¤</pattern>
-					<pattern type="100000000" count="few">000 مليون ¤</pattern>
-					<pattern type="100000000" count="many">000 مليون ¤</pattern>
-					<pattern type="100000000" count="other">000 مليون ¤</pattern>
-					<pattern type="1000000000" count="zero">0 مليار ¤</pattern>
-					<pattern type="1000000000" count="one">0 مليار ¤</pattern>
-					<pattern type="1000000000" count="two">0 مليار ¤</pattern>
-					<pattern type="1000000000" count="few">0 مليار ¤</pattern>
-					<pattern type="1000000000" count="many">0 مليار ¤</pattern>
-					<pattern type="1000000000" count="other">0 مليار ¤</pattern>
-					<pattern type="10000000000" count="zero">00 مليار ¤</pattern>
-					<pattern type="10000000000" count="one">00 مليار ¤</pattern>
-					<pattern type="10000000000" count="two">00 مليار ¤</pattern>
-					<pattern type="10000000000" count="few">00 مليار ¤</pattern>
-					<pattern type="10000000000" count="many">00 مليار ¤</pattern>
-					<pattern type="10000000000" count="other">00 مليار ¤</pattern>
-					<pattern type="100000000000" count="zero">000 مليار ¤</pattern>
-					<pattern type="100000000000" count="one">000 مليار ¤</pattern>
-					<pattern type="100000000000" count="two">000 مليار ¤</pattern>
-					<pattern type="100000000000" count="few">000 مليار ¤</pattern>
-					<pattern type="100000000000" count="many">000 مليار ¤</pattern>
-					<pattern type="100000000000" count="other">000 مليار ¤</pattern>
-					<pattern type="1000000000000" count="zero">0 ترليون ¤</pattern>
-					<pattern type="1000000000000" count="one">0 ترليون ¤</pattern>
-					<pattern type="1000000000000" count="two">0 ترليون ¤</pattern>
-					<pattern type="1000000000000" count="few">0 ترليون ¤</pattern>
-					<pattern type="1000000000000" count="many">0 ترليون ¤</pattern>
-					<pattern type="1000000000000" count="other">0 ترليون ¤</pattern>
-					<pattern type="10000000000000" count="zero">00 ترليون ¤</pattern>
-					<pattern type="10000000000000" count="one">00 ترليون ¤</pattern>
-					<pattern type="10000000000000" count="two">00 ترليون ¤</pattern>
-					<pattern type="10000000000000" count="few">00 ترليون ¤</pattern>
-					<pattern type="10000000000000" count="many">00 ترليون ¤</pattern>
-					<pattern type="10000000000000" count="other">00 ترليون ¤</pattern>
-					<pattern type="100000000000000" count="zero">000 ترليون ¤</pattern>
-					<pattern type="100000000000000" count="one">000 ترليون ¤</pattern>
-					<pattern type="100000000000000" count="two">000 ترليون ¤</pattern>
-					<pattern type="100000000000000" count="few">000 ترليون ¤</pattern>
-					<pattern type="100000000000000" count="many">000 ترليون ¤</pattern>
-					<pattern type="100000000000000" count="other">000 ترليون ¤</pattern>
+					<pattern type="1000" count="zero">‏0 ألف ¤</pattern>
+					<pattern type="1000" count="one">‏0 ألف ¤</pattern>
+					<pattern type="1000" count="two">‏0 ألف ¤</pattern>
+					<pattern type="1000" count="few">‏0 آلاف ¤</pattern>
+					<pattern type="1000" count="many">‏0 ألف ¤</pattern>
+					<pattern type="1000" count="other">‏0 ألف ¤</pattern>
+					<pattern type="10000" count="zero">‏00 ألف ¤</pattern>
+					<pattern type="10000" count="one">‏00 ألف ¤</pattern>
+					<pattern type="10000" count="two">‏00 ألف ¤</pattern>
+					<pattern type="10000" count="few">‏00 ألف ¤</pattern>
+					<pattern type="10000" count="many">‏00 ألف ¤</pattern>
+					<pattern type="10000" count="other">‏00 ألف ¤</pattern>
+					<pattern type="100000" count="zero">‏000 ألف ¤</pattern>
+					<pattern type="100000" count="one">‏000 ألف ¤</pattern>
+					<pattern type="100000" count="two">‏000 ألف ¤</pattern>
+					<pattern type="100000" count="few">‏000 ألف ¤</pattern>
+					<pattern type="100000" count="many">‏000 ألف ¤</pattern>
+					<pattern type="100000" count="other">‏000 ألف ¤</pattern>
+					<pattern type="1000000" count="zero">‏0 مليون ¤</pattern>
+					<pattern type="1000000" count="one">‏0 مليون ¤</pattern>
+					<pattern type="1000000" count="two">‏0 مليون ¤</pattern>
+					<pattern type="1000000" count="few">‏0 مليون ¤</pattern>
+					<pattern type="1000000" count="many">‏0 مليون ¤</pattern>
+					<pattern type="1000000" count="other">‏0 مليون ¤</pattern>
+					<pattern type="10000000" count="zero">‏00 مليون ¤</pattern>
+					<pattern type="10000000" count="one">‏00 مليون ¤</pattern>
+					<pattern type="10000000" count="two">‏00 مليون ¤</pattern>
+					<pattern type="10000000" count="few">‏00 مليون ¤</pattern>
+					<pattern type="10000000" count="many">‏00 مليون ¤</pattern>
+					<pattern type="10000000" count="other">‏00 مليون ¤</pattern>
+					<pattern type="100000000" count="zero">‏000 مليون ¤</pattern>
+					<pattern type="100000000" count="one">‏000 مليون ¤</pattern>
+					<pattern type="100000000" count="two">‏000 مليون ¤</pattern>
+					<pattern type="100000000" count="few">‏000 مليون ¤</pattern>
+					<pattern type="100000000" count="many">‏000 مليون ¤</pattern>
+					<pattern type="100000000" count="other">‏000 مليون ¤</pattern>
+					<pattern type="1000000000" count="zero">‏0 مليار ¤</pattern>
+					<pattern type="1000000000" count="one">‏0 مليار ¤</pattern>
+					<pattern type="1000000000" count="two">‏0 مليار ¤</pattern>
+					<pattern type="1000000000" count="few">‏0 مليار ¤</pattern>
+					<pattern type="1000000000" count="many">‏0 مليار ¤</pattern>
+					<pattern type="1000000000" count="other">‏0 مليار ¤</pattern>
+					<pattern type="10000000000" count="zero">‏00 مليار ¤</pattern>
+					<pattern type="10000000000" count="one">‏00 مليار ¤</pattern>
+					<pattern type="10000000000" count="two">‏00 مليار ¤</pattern>
+					<pattern type="10000000000" count="few">‏00 مليار ¤</pattern>
+					<pattern type="10000000000" count="many">‏00 مليار ¤</pattern>
+					<pattern type="10000000000" count="other">‏00 مليار ¤</pattern>
+					<pattern type="100000000000" count="zero">‏000 مليار ¤</pattern>
+					<pattern type="100000000000" count="one">‏000 مليار ¤</pattern>
+					<pattern type="100000000000" count="two">‏000 مليار ¤</pattern>
+					<pattern type="100000000000" count="few">‏000 مليار ¤</pattern>
+					<pattern type="100000000000" count="many">‏000 مليار ¤</pattern>
+					<pattern type="100000000000" count="other">‏000 مليار ¤</pattern>
+					<pattern type="1000000000000" count="zero">‏0 ترليون ¤</pattern>
+					<pattern type="1000000000000" count="one">‏0 ترليون ¤</pattern>
+					<pattern type="1000000000000" count="two">‏0 ترليون ¤</pattern>
+					<pattern type="1000000000000" count="few">‏0 ترليون ¤</pattern>
+					<pattern type="1000000000000" count="many">‏0 ترليون ¤</pattern>
+					<pattern type="1000000000000" count="other">‏0 ترليون ¤</pattern>
+					<pattern type="10000000000000" count="zero">‏00 ترليون ¤</pattern>
+					<pattern type="10000000000000" count="one">‏00 ترليون ¤</pattern>
+					<pattern type="10000000000000" count="two">‏00 ترليون ¤</pattern>
+					<pattern type="10000000000000" count="few">‏00 ترليون ¤</pattern>
+					<pattern type="10000000000000" count="many">‏00 ترليون ¤</pattern>
+					<pattern type="10000000000000" count="other">‏00 ترليون ¤</pattern>
+					<pattern type="100000000000000" count="zero">‏000 ترليون ¤</pattern>
+					<pattern type="100000000000000" count="one">‏000 ترليون ¤</pattern>
+					<pattern type="100000000000000" count="two">‏000 ترليون ¤</pattern>
+					<pattern type="100000000000000" count="few">‏000 ترليون ¤</pattern>
+					<pattern type="100000000000000" count="many">‏000 ترليون ¤</pattern>
+					<pattern type="100000000000000" count="other">‏000 ترليون ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -6132,6 +6228,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>دولار شرق الكاريبي</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>غيلدر كاريبي</displayName>
+				<displayName count="zero" draft="contributed">غيلدر كاريبي</displayName>
+				<displayName count="one" draft="contributed">غيلدر كاريبي</displayName>
+				<displayName count="two" draft="contributed">غيلدر كاريبي</displayName>
+				<displayName count="few" draft="contributed">غيلدر كاريبي</displayName>
+				<displayName count="many" draft="contributed">غيلدر كاريبي</displayName>
+				<displayName count="other" draft="contributed">غيلدر كاريبي</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>حقوق السحب الخاصة</displayName>
 			</currency>
@@ -6202,6 +6307,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>دولار زمبابوي</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">ذهب زيمبابوي</displayName>
+				<displayName count="zero" draft="contributed">ذهب زيمبابوي</displayName>
+				<displayName count="one" draft="contributed">ذهب زيمبابوي</displayName>
+				<displayName count="two" draft="contributed">ذهب زيمبابوي</displayName>
+				<displayName count="few" draft="contributed">ذهب زيمبابوي</displayName>
+				<displayName count="many" draft="contributed">ذهب زيمبابوي</displayName>
+				<displayName count="other" draft="contributed">ذهب زيمبابوي</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>دولار زمبابوي 2009</displayName>
 			</currency>
@@ -6492,7 +6606,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} عنصرًا</unitPattern>
 				<unitPattern count="other">{0} عنصر</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">جزء</displayName>
+				<unitPattern count="zero" draft="contributed">{0} جزء</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جزء</unitPattern>
+				<unitPattern count="two" draft="contributed">جزآن</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أجزاء</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جزءًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جزء</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<displayName>جزء في المليون</displayName>
 				<unitPattern count="zero">{0} جزء في المليون</unitPattern>
@@ -6526,6 +6649,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<gender>masculine</gender>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">سكّري</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سكّري</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>لتر لكل كيلومتر</displayName>
@@ -7147,6 +7279,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} مليمتر زئبقي</unitPattern>
 				<unitPattern count="other">{0} مليمتر زئبقي</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">زئبقي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} زئبقي</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>رطل لكل بوصة مربعة</displayName>
 				<unitPattern count="zero">{0} رطل لكل بوصة مربعة</unitPattern>
@@ -7367,6 +7508,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<gender>masculine</gender>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">أونصة سائلة مترية</displayName>
+				<unitPattern count="zero" draft="contributed">{0} أونصة سائلة مترية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} أونصة سائلة مترية</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} أونصة سائلة مترية</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أونصة سائلة مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} أونصة سائلة مترية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} أونصة سائلة مترية</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>{0} لكل غالون</perUnitPattern>
 			</unit>
@@ -7461,7 +7611,133 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} رشّة</unitPattern>
 				<unitPattern count="other">{0} رشّة</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ستراديان</displayName>
+				<unitPattern count="zero">{0} ستراديان</unitPattern>
+				<unitPattern count="one">{0} ستراديان</unitPattern>
+				<unitPattern count="two">{0} ستراديان</unitPattern>
+				<unitPattern count="few">{0} ستراديان</unitPattern>
+				<unitPattern count="many">{0} ستراديان</unitPattern>
+				<unitPattern count="other">{0} ستراديان</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">كاتال</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كاتال</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كاتال</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كاتال</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كاتال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كاتال</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كاتال</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">كولوم</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كولوم</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كولوم</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كولوم</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كولوم</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كولوم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كولوم</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">فاراد</displayName>
+				<unitPattern count="zero" draft="contributed">{0} فاراد</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} فاراد</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} فاراد</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} فاراد</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} فاراد</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} فاراد</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">هنري</displayName>
+				<unitPattern count="zero" draft="contributed">{0} هنري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} هنري</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} هنري</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} هنري</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} هنري</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} هنري</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">سيمنز</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سيمنز</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سيمنز</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سيمنز</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سيمنز</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سيمنز</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سيمنز</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">سعرة-it</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سعرة-it</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سعرة-it</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سعرة-it</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سعرة-it</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سعرة-it</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سعرة-it</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">بيكريل</displayName>
+				<unitPattern count="zero" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بيكريل</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">زيفرت</displayName>
+				<unitPattern count="zero" draft="contributed">{0} زيفرت</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} زيفرت</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} زيفرت</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} زيفرت</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} زيفرت</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} زيفرت</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">جراي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جراي</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">كيلوغرام ثقلي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كيلوغرام ثقلي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلوغرام ثقلي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كيلوغرام ثقلي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلوغرام ثقلي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلوغرام ثقلي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلوغرام ثقلي</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">تسلا</displayName>
+				<unitPattern count="zero" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} تسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">ويبر</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ويبر</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ضوئي</displayName>
+				<unitPattern count="zero">{0} ضوئي</unitPattern>
+				<unitPattern count="one">{0} ضوئي</unitPattern>
+				<unitPattern count="two">{0} ضوئي</unitPattern>
+				<unitPattern count="few">{0} ضوئية</unitPattern>
+				<unitPattern count="many">{0} ضوئي</unitPattern>
+				<unitPattern count="other">{0} ضوئي</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>جزء بالمليار</displayName>
 				<unitPattern count="zero">{0} جزء بالمليار</unitPattern>
@@ -7474,12 +7750,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-night">
 				<gender>feminine</gender>
 				<displayName>ليالي</displayName>
-				<unitPattern count="zero">{0} ليلة</unitPattern>
-				<unitPattern count="one">ليلة</unitPattern>
-				<unitPattern count="two">ليلتان</unitPattern>
-				<unitPattern count="few">{0} ليالٍ</unitPattern>
-				<unitPattern count="many">{0} ليلةً</unitPattern>
-				<unitPattern count="other">{0} ليلة</unitPattern>
 				<perUnitPattern>{0} في الليلة</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7781,7 +8051,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} عنصرًا</unitPattern>
 				<unitPattern count="other">{0} عنصر</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">جزء</displayName>
+				<unitPattern count="zero" draft="contributed">{0} جزء</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جزء</unitPattern>
+				<unitPattern count="two" draft="contributed">جزآن</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أجزاء</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جزءًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جزء</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>جزء/مليون</displayName>
 				<unitPattern count="zero">{0} جزء/مليون</unitPattern>
 				<unitPattern count="one">{0} جزء/مليون</unitPattern>
@@ -7817,6 +8096,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مول</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">سكّري</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سكّري</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>لتر/كم</displayName>
 				<unitPattern count="zero">{0} لتر/كم</unitPattern>
@@ -8761,6 +9049,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ملم زئبقي</unitPattern>
 				<unitPattern count="other">{0} ملم زئبقي</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">زئبقي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} زئبقي</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>رطل/بوصة مربعة</displayName>
 				<unitPattern count="zero">{0} رطل/بوصة²</unitPattern>
@@ -9070,6 +9367,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} كوب متري</unitPattern>
 				<unitPattern count="other">{0} كوب متري</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">أونصة س مترية</displayName>
+				<unitPattern count="zero" draft="contributed">{0} أونصة س مترية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} أونصة س مترية</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} أونصة س مترية</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أونصة س مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} أونصة س مترية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} أونصة س مترية</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>فدان قدم</displayName>
 				<unitPattern count="zero">{0} فدان قدم</unitPattern>
@@ -9243,7 +9549,133 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ربع غالون إمبراطوري</unitPattern>
 				<unitPattern count="other">{0} ربع غالون إمبراطوري</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ستراديان</displayName>
+				<unitPattern count="zero">{0} ستراديان</unitPattern>
+				<unitPattern count="one">{0} ستراديان</unitPattern>
+				<unitPattern count="two">{0} ستراديان</unitPattern>
+				<unitPattern count="few">{0} ستراديان</unitPattern>
+				<unitPattern count="many">{0} ستراديان</unitPattern>
+				<unitPattern count="other">{0} ستراديان</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">كات</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كات</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">كول</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كول</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">ف</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ف</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">ه</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ه</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">س</displayName>
+				<unitPattern count="zero" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} س</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">سع-it</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سع-it</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">بيكريل</displayName>
+				<unitPattern count="zero" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بيكريل</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">زيف</displayName>
+				<unitPattern count="zero" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} زيف</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">جراي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جراي</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">كغ ث</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كغ ث</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">تسلا</displayName>
+				<unitPattern count="zero" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} تسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">ويبر</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ويبر</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ضوئي</displayName>
+				<unitPattern count="zero">{0} ضوئي</unitPattern>
+				<unitPattern count="one">{0} ضوئي</unitPattern>
+				<unitPattern count="two">{0} ضوئي</unitPattern>
+				<unitPattern count="few">{0} ضوئية</unitPattern>
+				<unitPattern count="many">{0} ضوئي</unitPattern>
+				<unitPattern count="other">{0} ضوئي</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>جزء/مليار</displayName>
 				<unitPattern count="zero">{0} جزء/مليار</unitPattern>
 				<unitPattern count="one">{0} جزء/مليار</unitPattern>
@@ -9326,6 +9758,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} عنصر</unitPattern>
 				<unitPattern count="other">{0} عنصر</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName draft="contributed">جزء</displayName>
+				<unitPattern count="zero" draft="contributed">{0} جزء</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جزء</unitPattern>
+				<unitPattern count="two" draft="contributed">جزآن</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أجزاء</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جزءًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جزء</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>٪</displayName>
 			</unit>
@@ -9341,6 +9782,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ؊</unitPattern>
 				<unitPattern count="other">{0} ؊</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">سكّري</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سكّري</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سكّري</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ل/كم</displayName>
 				<unitPattern count="zero">{0} ل/كم</unitPattern>
@@ -9596,6 +10046,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ك واط</unitPattern>
 				<unitPattern count="other">{0} ك واط</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">زئبقي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} زئبقي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} زئبقي</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>رطل/بوصة²</displayName>
 			</unit>
@@ -9640,6 +10099,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ل</unitPattern>
 				<unitPattern count="other">{0} ل</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">أونصة س م</displayName>
+				<unitPattern count="zero" draft="contributed">{0} أونصة س م</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} أونصة س م</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} أونصة س م</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أونصة س م</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} أونصة س م</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} أونصة س م</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>أونصة س</displayName>
 				<unitPattern count="zero">{0} أونصة س</unitPattern>
@@ -9683,24 +10151,139 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} قدح</unitPattern>
 				<unitPattern count="other">{0} قدح</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>جزء/مليار</displayName>
-				<unitPattern count="zero">{0} جزء/مليار</unitPattern>
-				<unitPattern count="one">{0} جزء/مليار</unitPattern>
-				<unitPattern count="two">جزآن/مليار</unitPattern>
-				<unitPattern count="few">{0} أجزاء/مليار</unitPattern>
-				<unitPattern count="many">{0} جزءًا/مليار</unitPattern>
-				<unitPattern count="other">{0} جزء/مليار</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ستراديان</displayName>
+				<unitPattern count="zero">{0} ستراديان</unitPattern>
+				<unitPattern count="one">{0} ستراديان</unitPattern>
+				<unitPattern count="two">{0} ستراديان</unitPattern>
+				<unitPattern count="few">{0} ستراديان</unitPattern>
+				<unitPattern count="many">{0} ستراديان</unitPattern>
+				<unitPattern count="other">{0} ستراديان</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">كات</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كات</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كات</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">كول</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كول</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كول</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">ف</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ف</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ف</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">ه</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ه</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ه</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">س</displayName>
+				<unitPattern count="zero" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} س</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} س</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">سع-it</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سع-it</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سع-it</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">بيكريل</displayName>
+				<unitPattern count="zero" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بيكريل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بيكريل</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">زيف</displayName>
+				<unitPattern count="zero" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} زيف</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} زيف</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">جراي</displayName>
+				<unitPattern count="zero" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جراي</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جراي</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">كغ ث</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كغ ث</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كغ ث</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">تسلا</displayName>
+				<unitPattern count="zero" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} تسلا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} تسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">ويبر</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ويبر</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ويبر</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ضوئي</displayName>
+				<unitPattern count="zero">{0} ضوئي</unitPattern>
+				<unitPattern count="one">{0} ضوئي</unitPattern>
+				<unitPattern count="two">{0} ضوئي</unitPattern>
+				<unitPattern count="few">{0} ضوئية</unitPattern>
+				<unitPattern count="many">{0} ضوئي</unitPattern>
+				<unitPattern count="other">{0} ضوئي</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ليلة</displayName>
 				<unitPattern count="zero">{0} ل</unitPattern>
 				<unitPattern count="one">{0} ل</unitPattern>
 				<unitPattern count="two">{0} ل</unitPattern>
 				<unitPattern count="few">{0} ل</unitPattern>
 				<unitPattern count="many">{0} ل</unitPattern>
 				<unitPattern count="other">{0} ل</unitPattern>
-				<perUnitPattern>{0}/ل</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ar_SA.xml b/make/data/cldr/common/main/ar_SA.xml
index aafe7e5e7c7..db79c9ea1c8 100644
--- a/make/data/cldr/common/main/ar_SA.xml
+++ b/make/data/cldr/common/main/ar_SA.xml
@@ -133,7 +133,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} بوصة مربعة</unitPattern>
 				<unitPattern count="other">{0} بوصة مربعة</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="zero" draft="contributed">{0} جزء في المليون</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} جزء في المليون</unitPattern>
 				<unitPattern count="two" draft="contributed">جزءان في المليون</unitPattern>
@@ -367,7 +367,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} قيراطًا</unitPattern>
 				<unitPattern count="other">{0} قيراط</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="zero" draft="contributed">{0} جزء/مليون</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} جزء/مليون</unitPattern>
 				<unitPattern count="two" draft="contributed">جزءان/مليون</unitPattern>
diff --git a/make/data/cldr/common/main/as.xml b/make/data/cldr/common/main/as.xml
index 1eeb5591b56..b02fb84beea 100644
--- a/make/data/cldr/common/main/as.xml
+++ b/make/data/cldr/common/main/as.xml
@@ -42,8 +42,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="awa">অৱধী</language>
 			<language type="ay">আয়মাৰা</language>
 			<language type="az">আজেৰবাইজানী</language>
-			<language type="az" alt="short">আজেৰি</language>
 			<language type="ba">বাছখিৰ</language>
+			<language type="bal">বালুচী</language>
 			<language type="ban">বালিনীজ</language>
 			<language type="bas">বাছা</language>
 			<language type="be">বেলাৰুছীয়</language>
@@ -226,6 +226,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">বাফিয়া</language>
 			<language type="ksh">কোলোগনিয়ান</language>
 			<language type="ku">কুৰ্ডিচ</language>
+			<language type="ku" menu="core">কুৰ্ডিশ্ব</language>
+			<language type="ku" menu="extension">কুৰ্ডিশ্ব</language>
 			<language type="kum">কুমিক</language>
 			<language type="kv">কোমি</language>
 			<language type="kw">কোৰ্নিচ</language>
@@ -619,6 +621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">চীন</territory>
 			<territory type="CO">কলম্বিয়া</territory>
 			<territory type="CP">ক্লিপাৰটোন দ্বীপ</territory>
+			<territory type="CQ">চাৰ্ক</territory>
 			<territory type="CR">কোষ্টা ৰিকা</territory>
 			<territory type="CU">কিউবা</territory>
 			<territory type="CV">কেপ ভার্দে</territory>
@@ -852,49 +855,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">মুদ্ৰা সজ্জা</key>
 			<key type="collation">সজোৱা ক্ৰম</key>
 			<key type="currency">মুদ্ৰা</key>
+			<key type="em">ইম’জীৰ উপস্থাপনা</key>
 			<key type="hc">ঘণ্টীয়া চক্ৰ (১২ বনাম ২৪)</key>
 			<key type="lb">পংক্তি বিচ্ছেদ শৈলী</key>
+			<key type="lw">শব্দৰ মাজত শাৰীৰ বিভাজন</key>
 			<key type="ms">জোখ-মাখৰ প্ৰণালী</key>
 			<key type="numbers">সংখ্যা</key>
+			<key type="ss">ঃ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">বৌদ্ধ কেলেণ্ডাৰ</type>
+			<type key="calendar" type="buddhist" scope="core">বৌদ্ধ</type>
 			<type key="calendar" type="chinese">চীনা কেলেণ্ডাৰ</type>
+			<type key="calendar" type="chinese" scope="core">চীনা</type>
 			<type key="calendar" type="coptic">ক’প্টিক কেলেণ্ডাৰ</type>
+			<type key="calendar" type="coptic" scope="core">ক’প্টিক</type>
 			<type key="calendar" type="dangi">দাংগি কেলেণ্ডাৰ</type>
+			<type key="calendar" type="dangi" scope="core">দাংগি</type>
 			<type key="calendar" type="ethiopic">ইথিঅ’পিক কেলেণ্ডাৰ</type>
+			<type key="calendar" type="ethiopic" scope="core">ইথিঅ’পিক</type>
 			<type key="calendar" type="ethiopic-amete-alem">ইথিঅ’পিক এমিটি এলেম কেলেণ্ডাৰ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ইথিঅ’পিক এমিটি এলেম</type>
 			<type key="calendar" type="gregorian">গ্ৰেগোৰিয়ান কেলেণ্ডাৰ</type>
+			<type key="calendar" type="gregorian" scope="core">গ্ৰেগোৰিয়ান</type>
 			<type key="calendar" type="hebrew">হিব্ৰু কেলেণ্ডাৰ</type>
+			<type key="calendar" type="hebrew" scope="core">হিব্ৰু</type>
 			<type key="calendar" type="indian">ভাৰতীয় ৰাষ্ট্ৰীয় পঞ্জিকা</type>
+			<type key="calendar" type="indian" scope="core">ভাৰতীয় ৰাষ্ট্ৰীয়</type>
 			<type key="calendar" type="islamic">হিজৰি কেলেণ্ডাৰ</type>
+			<type key="calendar" type="islamic" scope="core">হিজৰি</type>
 			<type key="calendar" type="islamic-civil">হিজৰি কেলেণ্ডাৰ (টেবুলাৰ, নাগৰিক যুগ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">হিজৰি (টেবুলাৰ, নাগৰিক যুগ)</type>
 			<type key="calendar" type="islamic-umalqura">হিজৰি কেলেণ্ডাৰ (উম অল-কুৰা)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">হিজৰি (উম অল-কুৰা)</type>
 			<type key="calendar" type="iso8601">আই. এছ. অ’.-৮৬০১ কেলেণ্ডাৰ</type>
 			<type key="calendar" type="japanese">জাপানী কেলেণ্ডাৰ</type>
+			<type key="calendar" type="japanese" scope="core">জাপানী</type>
 			<type key="calendar" type="persian">ফাৰ্চী কেলেণ্ডাৰ</type>
+			<type key="calendar" type="persian" scope="core">ফাৰ্চী</type>
 			<type key="calendar" type="roc">চীনা প্ৰজাতন্ত্ৰৰ কেলেণ্ডাৰ</type>
+			<type key="calendar" type="roc" scope="core">চীনা প্ৰজাতন্ত্ৰ</type>
 			<type key="cf" type="account">গাণনিক মুদ্ৰা সজ্জা</type>
+			<type key="cf" type="account" scope="core">গাণনিক</type>
 			<type key="cf" type="standard">মান্য মুদ্ৰা সজ্জা</type>
-			<type key="collation" type="big5han" draft="contributed">পৰম্পৰাগত চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - Big5</type>
+			<type key="cf" type="standard" scope="core">মান্য</type>
 			<type key="collation" type="ducet">ডিফ’ল্ট ইউনিকোড সজোৱা ক্ৰম</type>
-			<type key="collation" type="gb2312han" draft="contributed">সৰল চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - GB2312</type>
+			<type key="collation" type="ducet" scope="core">ডিফ’ল্ট ইউনিকোড</type>
 			<type key="collation" type="phonebook" draft="contributed">টেলিফোন বহিৰ মতেশৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
 			<type key="collation" type="pinyin" draft="contributed">পিন্‌য়িন শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
-			<type key="collation" type="search">সাধাৰণ উদ্দেশ্যে অনুসন্ধান</type>
+			<type key="collation" type="search">সাধাৰণ উদ্দেশ্যে সন্ধান</type>
+			<type key="collation" type="search" scope="core">সন্ধান</type>
 			<type key="collation" type="standard">মান্য সজোৱা ক্ৰম</type>
+			<type key="collation" type="standard" scope="core">মান্য</type>
 			<type key="collation" type="stroke" draft="contributed">স্ট্ৰোক শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
 			<type key="collation" type="traditional" draft="contributed">পৰম্পৰাগতভাবে শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
+			<type key="em" type="default" scope="core">ডিফ’ল্ট</type>
+			<type key="em" type="emoji" scope="core">ইম’জী</type>
+			<type key="em" type="text" scope="core">পাঠ্য</type>
 			<type key="hc" type="h11">১২ ঘণ্টীয়া প্ৰণালী (০–১১)</type>
+			<type key="hc" type="h11" scope="core">১২ (০–১১) ১২ (০–১১)</type>
 			<type key="hc" type="h12">১২ ঘণ্টীয়া প্ৰণালী (১–১২)</type>
+			<type key="hc" type="h12" scope="core">১২ (১–১২) ১২ (১–১২)</type>
 			<type key="hc" type="h23">২৪ ঘণ্টীয়া প্ৰণালী (০–২৩)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23) Hour Cycle (12 vs 24) others… ২৪ (০–২৩) …অন্য ঘণ্টীয়া প্ৰণালী(১২ বনাম ২৪): ২৪ (০–২৩) ৩ (০–২৩)</type>
 			<type key="hc" type="h24">২৪ ঘণ্টীয়া প্ৰণালী (১–২৪)</type>
+			<type key="hc" type="h24" scope="core">২৪ (১–২৪) ২৪ (১–২৪)</type>
 			<type key="lb" type="loose">ঢিলা পংক্তি বিচ্ছেদ শৈলী</type>
+			<type key="lb" type="loose" scope="core">ঢিলা</type>
 			<type key="lb" type="normal">সাধাৰণ পংক্তি বিচ্ছেদ শৈলী</type>
+			<type key="lb" type="normal" scope="core">সাধাৰণ</type>
 			<type key="lb" type="strict">কঠোৰ পংক্তি বিচ্ছেদ শৈলী</type>
+			<type key="lb" type="strict" scope="core">পংক্তি বিচ্ছেদ</type>
+			<type key="lw" type="breakall" scope="core">আটাইবোৰ বিভাজন কৰক</type>
+			<type key="lw" type="keepall" scope="core">আটাইবোৰ ৰাখক</type>
+			<type key="lw" type="normal" scope="core">সাধাৰণ</type>
+			<type key="lw" type="phrase" scope="core">ব্যাক্যাংশত ৰাখক</type>
 			<type key="ms" type="metric">মেট্ৰিক প্ৰণালী</type>
+			<type key="ms" type="metric" scope="core">মেট্ৰিক</type>
 			<type key="ms" type="uksystem">ইম্পেৰিয়েল জোখ-মাখৰ প্ৰণালী</type>
+			<type key="ms" type="uksystem" scope="core">ইম্পেৰিয়েল</type>
 			<type key="ms" type="ussystem">মাৰ্কিন যুক্তৰাষ্ট্ৰৰ জোখ-মাখৰ প্ৰণালী</type>
+			<type key="ms" type="ussystem" scope="core">মাৰ্কিন</type>
 			<type key="numbers" type="arab">আৰবী-ভাৰতীয় অংক</type>
 			<type key="numbers" type="arabext">বিস্তাৰিত আৰবী-ভাৰতীয় অংক</type>
 			<type key="numbers" type="armn">আৰ্মেনীয় সংখ্যা</type>
@@ -935,6 +976,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">থাই অংক</type>
 			<type key="numbers" type="tibt">তিব্বতী অংক</type>
 			<type key="numbers" type="vaii">ভেই সংখ্যা</type>
+			<type key="ss" type="none" scope="core">ঃ</type>
+			<type key="ss" type="standard" scope="core">ঃ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">মেট্ৰিক</measurementSystemName>
@@ -982,7 +1025,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -991,9 +1034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0} বজাত</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1} 'at' {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1201,27 +1241,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="pm">pm</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="am">পূৰ্বাহ্ন</dayPeriod>
+							<dayPeriod type="pm">অপৰাহ্ন</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2158,6 +2180,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ইষ্টাৰ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>কোইহাইক</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>পুণ্টা এৰিনাছ</exemplarCity>
 			</zone>
@@ -2423,9 +2448,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>নোম পেন্‌হ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>এণ্ডৰবাৰী</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>কেণ্টন</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3095,9 +3117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>পশ্চিম আফ্ৰিকাৰ সময়</generic>
-					<standard>পশ্চিম আফ্ৰিকাৰ মান সময়</standard>
-					<daylight>পশ্চিম আফ্ৰিকাৰ গ্ৰীষ্মকালীন সময়</daylight>
+					<standard>পশ্চিম আফ্ৰিকাৰ সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3447,6 +3467,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>গায়ানাৰ সময়</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>হাৱাই-এলিউশ্বনৰ মান সময়</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>হাৱাই-এলিউশ্বনৰ সময়</generic>
@@ -3955,6 +3980,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<otherNumberingSystems>
 			<native>beng</native>
 		</otherNumberingSystems>
+		<symbols numberSystem="beng">
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<timeSeparator draft="unconfirmed">.</timeSeparator>
 		</symbols>
@@ -4004,8 +4032,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000000" count="other">0 নিযুত</pattern>
 					<pattern type="10000000" count="one">00 নিযুত</pattern>
 					<pattern type="10000000" count="other">00 নিযুত</pattern>
-					<pattern type="100000000" count="one">000 নিঃ</pattern>
-					<pattern type="100000000" count="other">000 নিঃ</pattern>
+					<pattern type="100000000" count="one">0 নিঃ</pattern>
+					<pattern type="100000000" count="other">0 নিঃ</pattern>
 					<pattern type="1000000000" count="one">0 শঃ কোঃ</pattern>
 					<pattern type="1000000000" count="other">0 শঃ কোঃ</pattern>
 					<pattern type="10000000000" count="one">00 শঃ কোঃ</pattern>
@@ -4021,6 +4049,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="beng">
+			<rationalUsage>never</rationalUsage>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -4031,7 +4062,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencyFormats numberSystem="beng">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern alt="noCurrency">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4039,10 +4074,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4052,26 +4089,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000" count="other">¤ 0 হাজাৰ</pattern>
 					<pattern type="10000" count="one">¤ 00 হাজাৰ</pattern>
 					<pattern type="10000" count="other">¤ 00 হাজাৰ</pattern>
-					<pattern type="100000" count="one">¤ 000 লাখ</pattern>
-					<pattern type="100000" count="other">¤ 000 লাখ</pattern>
+					<pattern type="100000" count="one">¤ 0 লাখ</pattern>
+					<pattern type="100000" count="other">¤ 0 লাখ</pattern>
 					<pattern type="1000000" count="one">¤ 0 নিযুত</pattern>
 					<pattern type="1000000" count="other">¤ 0 নিযুত</pattern>
 					<pattern type="10000000" count="one">¤ 00 নিযুত</pattern>
 					<pattern type="10000000" count="other">¤ 00 নিযুত</pattern>
-					<pattern type="100000000" count="one">¤ 000 নিযুত</pattern>
-					<pattern type="100000000" count="other">¤ 000 নিযুত</pattern>
-					<pattern type="1000000000" count="one">¤ 0 শত কোটি</pattern>
-					<pattern type="1000000000" count="other">¤ 0 শত কোটি</pattern>
-					<pattern type="10000000000" count="one">¤ 00 শত কোটি</pattern>
-					<pattern type="10000000000" count="other">¤ 00 শত কোটি</pattern>
-					<pattern type="100000000000" count="one">¤ 000 শত কোটি</pattern>
-					<pattern type="100000000000" count="other">¤ 000 শত কোটি</pattern>
-					<pattern type="1000000000000" count="one">¤ 0 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="1000000000000" count="other">¤ 0 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="10000000000000" count="one">¤ 00 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="10000000000000" count="other">¤ 00 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="100000000000000" count="one">¤ 000 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="100000000000000" count="other">¤ 000 শত পৰাৰ্দ্ধ</pattern>
+					<pattern type="100000000" count="one">¤ 0 নিঃ</pattern>
+					<pattern type="100000000" count="other">¤ 0 নিঃ</pattern>
+					<pattern type="1000000000" count="one">¤ 0 শঃ কোঃ</pattern>
+					<pattern type="1000000000" count="other">¤ 0 শঃ কোঃ</pattern>
+					<pattern type="10000000000" count="one">¤ 00 শঃ কোঃ</pattern>
+					<pattern type="10000000000" count="other">¤ 00 শঃ কোঃ</pattern>
+					<pattern type="100000000000" count="one">¤ 000 শঃ কঃ</pattern>
+					<pattern type="100000000000" count="other">¤ 000 শঃ কঃ</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 শঃ পঃ</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 শঃ পঃ</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 শঃ পঃ</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 শঃ পঃ</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 শঃ পঃ</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 শঃ পঃ</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -4079,8 +4116,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencies>
 			<currency type="AED">
 				<displayName>সংযুক্ত আৰব আমিৰাত ডিৰহেম</displayName>
-				<displayName count="one">UAE ডিৰহেম</displayName>
-				<displayName count="other">UAE ডিৰহেম</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>আফগান আফগানী</displayName>
@@ -4563,6 +4598,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ইষ্ট কেৰিবিয়ান ডলাৰ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>কেৰিবীয়ান গিল্ডাৰ</displayName>
+				<displayName count="one">কেৰিবীয়ান গিল্ডাৰ</displayName>
+				<displayName count="other">কেৰিবীয়ান গিল্ডাৰ</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক</displayName>
 			</currency>
@@ -4583,6 +4623,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>জাম্বিয়ান কোৱাচা</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>জিম্বাৱীয় সোণ</displayName>
+				<displayName count="one">জিম্বাৱীয় সোণ</displayName>
+				<displayName count="other">জিম্বাৱীয় সোণ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4754,7 +4799,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<displayName>আইটেমসমূহ</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>অংশ</displayName>
+				<unitPattern count="one">{0} অংশ</unitPattern>
+				<unitPattern count="other">{0} অংশ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>প্ৰতি মিলিয়নত ভাগ</displayName>
 				<unitPattern count="one">প্ৰতি মিলিয়নত {0} ভাগ</unitPattern>
 				<unitPattern count="other">প্ৰতি মিলিয়নত {0} ভাগ</unitPattern>
@@ -4772,6 +4822,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} পাৰমিৰেইড</unitPattern>
 				<unitPattern count="other">{0} পাৰমিৰেইড</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুক’জ</displayName>
+				<unitPattern count="one">{0} গ্লুঃ</unitPattern>
+				<unitPattern count="other">{0}গ্লুঃ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>প্ৰতি কিলোমিটাৰত লিটাৰ</displayName>
 				<unitPattern count="one">প্ৰতি কিলোমিটাৰত {0} লিটাৰ</unitPattern>
@@ -5131,6 +5186,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মিলিমিটাৰ মাৰ্কিউৰী</unitPattern>
 				<unitPattern count="other">{0} মিলিমিটাৰ মাৰ্কিউৰী</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>মাৰ্কিঃ</displayName>
+				<unitPattern count="one">{0} মাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0} মাৰ্কিঃ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড</displayName>
 				<unitPattern count="one">{0} প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড</unitPattern>
@@ -5283,6 +5343,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মেট্ৰিক কাপ</unitPattern>
 				<unitPattern count="other">{0} মেট্ৰিক কাপ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ফ্লুঃ আঃ মেঃ</displayName>
+				<unitPattern count="one">{0} ফ্লুঃ আঃ মেঃ</unitPattern>
+				<unitPattern count="other">{0}ফ্লুঃ আঃ মেঃ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} একৰ-ফুট</unitPattern>
 				<unitPattern count="other">{0} একৰ-ফুট</unitPattern>
@@ -5334,22 +5399,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ইম্পেৰিয়েল কুৱাৰ্ট</unitPattern>
 				<unitPattern count="other">{0} ইম্পেৰিয়েল কুৱাৰ্ট</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>আলোক</displayName>
-				<unitPattern count="one">{0} আলোক</unitPattern>
-				<unitPattern count="other">{0} আলোক</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ষ্টেৰাডিয়ান</displayName>
+				<unitPattern count="one">{0} ষ্টেৰাঃ</unitPattern>
+				<unitPattern count="other">{0} ষ্টেৰাঃ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>কাটাল</displayName>
+				<unitPattern count="one">{0} কাটাঃ</unitPattern>
+				<unitPattern count="other">{0} কাটাঃ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>কুলম্ব</displayName>
+				<unitPattern count="one">{0} কুঃ</unitPattern>
+				<unitPattern count="other">{0} কুঃ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ফাৰাড</displayName>
+				<unitPattern count="one">{0}ফাঃ</unitPattern>
+				<unitPattern count="other">{0} ফাঃ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>হেনৰী</displayName>
+				<unitPattern count="one">{0} হেনঃ</unitPattern>
+				<unitPattern count="other">{0}হেনঃ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ছিয়েমেন</displayName>
+				<unitPattern count="one">{0} ছিয়েঃ</unitPattern>
+				<unitPattern count="other">{0} ছিয়েঃ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>কেল’ৰি-আইটি</displayName>
+				<unitPattern count="one">{0}কেল-আইটি</unitPattern>
+				<unitPattern count="other">{0} কেল-আইটি</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>বেকাৰেল</displayName>
+				<unitPattern count="one">{0} বেঃ</unitPattern>
+				<unitPattern count="other">{0} বেঃ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>চিয়েভাৰ্ট</displayName>
+				<unitPattern count="one">{0} এচভিঃ</unitPattern>
+				<unitPattern count="other">{0} এচভিঃ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>গ্ৰে</displayName>
+				<unitPattern count="one">{0} গ্ৰে</unitPattern>
+				<unitPattern count="other">{0} গ্ৰে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>কিলোগ্ৰাম-বল</displayName>
+				<unitPattern count="one">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+				<unitPattern count="other">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>টেচলা</displayName>
+				<unitPattern count="one">{0} টেঃ</unitPattern>
+				<unitPattern count="other">{0} টেঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ৱেবাৰ</displayName>
+				<unitPattern count="one">{0} ৱেঃ</unitPattern>
+				<unitPattern count="other">{0} ৱেঃ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>প্ৰতি বিলিয়নত অংশ</displayName>
 				<unitPattern count="one">{0} প্ৰতি বিলিয়নত অংশ</unitPattern>
 				<unitPattern count="other">{0} প্ৰতি বিলিয়নত অংশ</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>নিশা</displayName>
-				<unitPattern count="one">{0} নিশা</unitPattern>
-				<unitPattern count="other">{0} নিশা</unitPattern>
-				<perUnitPattern>{0}/নিশা</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>প্ৰধান দিক্-নিৰ্দেশনা</displayName>
 				<coordinateUnitPattern type="east">{0} পূব</coordinateUnitPattern>
@@ -5542,7 +5661,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} টা আইটেম</unitPattern>
 				<unitPattern count="other">{0} টা আইটেম</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>অংশ</displayName>
+				<unitPattern count="one">{0} অংশ</unitPattern>
+				<unitPattern count="other">{0} অংশ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ভাগ/মিলিয়ন</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -5559,6 +5683,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ম’ল</unitPattern>
 				<unitPattern count="other">{0} ম’ল</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুঃ</displayName>
+				<unitPattern count="one">{0} গ্লুঃ</unitPattern>
+				<unitPattern count="other">{0} গ্লুঃ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>লিটাৰ/কিঃ মিঃ</displayName>
 				<unitPattern count="one">{0} লিঃ/কিঃ মিঃ</unitPattern>
@@ -6056,8 +6185,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>mmHg</displayName>
-				<unitPattern count="one">{0} mmHg</unitPattern>
-				<unitPattern count="other">{0} mmHg</unitPattern>
+				<unitPattern count="one">{0} মিঃমিঃমাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0}মিঃমিঃমাৰ্কিঃ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>মাৰ্কিঃ</displayName>
+				<unitPattern count="one">{0} মাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0} মাৰ্কিঃ</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<displayName>বাৰ</displayName>
@@ -6181,6 +6315,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মেঃ কাঃ</unitPattern>
 				<unitPattern count="other">{0} মেঃ কাঃ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ফ্লুঃ আঃ মেঃ</displayName>
+				<unitPattern count="one">{0}ফ্লুঃ আঃ মেঃ</unitPattern>
+				<unitPattern count="other">{0} ফ্লুঃ আঃ মেঃ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>একৰ-ফুট</displayName>
 				<unitPattern count="one">{0} এঃ-ফুঃ</unitPattern>
@@ -6259,12 +6398,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} পিঞ্চ</unitPattern>
 				<unitPattern count="other">{0} পিঞ্চ</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ষ্টেৰাঃ</displayName>
+				<unitPattern count="one">{0} ষ্টেৰাঃ</unitPattern>
+				<unitPattern count="other">{0}ষ্টেৰাঃ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>কাটাঃ</displayName>
+				<unitPattern count="one">{0} কাটাঃ</unitPattern>
+				<unitPattern count="other">{0} কাটাঃ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>কুঃ</displayName>
+				<unitPattern count="one">{0} কুঃ</unitPattern>
+				<unitPattern count="other">{0} কুঃ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ফাঃ</displayName>
+				<unitPattern count="one">{0} ফাঃ</unitPattern>
+				<unitPattern count="other">{0} ফাঃ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>হেনঃ</displayName>
+				<unitPattern count="one">{0} হেনঃ</unitPattern>
+				<unitPattern count="other">{0} হেনঃ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ছিয়েঃ</displayName>
+				<unitPattern count="one">{0} ছিয়েঃ</unitPattern>
+				<unitPattern count="other">{0} ছিয়েঃ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>কেল’ৰি-আইটি</displayName>
+				<unitPattern count="one">{0} কেল-আইটি</unitPattern>
+				<unitPattern count="other">{0} কেল-আইটি</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>বেঃ</displayName>
+				<unitPattern count="one">{0}বেঃ</unitPattern>
+				<unitPattern count="other">{0}বেঃ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>এচভিঃ</displayName>
+				<unitPattern count="one">{0} এচভিঃ</unitPattern>
+				<unitPattern count="other">{0} এচভিঃ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>গ্ৰে</displayName>
+				<unitPattern count="one">{0}গ্ৰে</unitPattern>
+				<unitPattern count="other">{0} গ্ৰে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>কিঃগ্ৰাঃবঃ</displayName>
+				<unitPattern count="one">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+				<unitPattern count="other">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>টেঃ</displayName>
+				<unitPattern count="one">{0} টেঃ</unitPattern>
+				<unitPattern count="other">{0} টেঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ৱেঃ</displayName>
+				<unitPattern count="one">{0} ৱেঃ</unitPattern>
+				<unitPattern count="other">{0} ৱেঃ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>আলোক</displayName>
 				<unitPattern count="one">{0} আলোক</unitPattern>
 				<unitPattern count="other">{0} আলোক</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>অংশ/বিলিয়ন</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6367,7 +6571,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>অংশ</displayName>
+				<unitPattern count="one">{0} অংশ</unitPattern>
+				<unitPattern count="other">{0} অংশ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -6381,6 +6590,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুঃ</displayName>
+				<unitPattern count="one">{0} গ্লুঃ</unitPattern>
+				<unitPattern count="other">{0} গ্লুঃ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ল/১০০ ক.ম.</displayName>
 			</unit>
@@ -6435,9 +6649,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}কেলৰি</unitPattern>
 				<unitPattern count="other">{0}কেলৰি</unitPattern>
 			</unit>
-			<unit type="force-newton">
-				<displayName>N</displayName>
-			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<unitPattern count="one">{0}kWh/100km</unitPattern>
 				<unitPattern count="other">{0} kWh/100km</unitPattern>
@@ -6477,6 +6688,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="light-solar-luminosity">
 				<displayName>L☉</displayName>
 			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<unitPattern count="one">{0} মিঃমিঃমাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0}মিঃমিঃমাৰ্কিঃ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>মাৰ্কিঃ</displayName>
+				<unitPattern count="one">{0} মাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0} মাৰ্কিঃ</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ Hg</displayName>
 				<unitPattern count="one">{0}″ Hg</unitPattern>
@@ -6502,6 +6722,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ফ্লুঃ আঃ মেঃ</displayName>
+				<unitPattern count="one">{0}ফ্লুঃ আঃ মেঃ</unitPattern>
+				<unitPattern count="other">{0} ফ্লুঃ আঃ মেঃ</unitPattern>
+			</unit>
 			<unit type="volume-teaspoon">
 				<unitPattern count="one">{0}টিস্পুন</unitPattern>
 				<unitPattern count="other">{0}টিস্পুন</unitPattern>
@@ -6515,21 +6740,79 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}dsp-Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ষ্টেৰাঃ</displayName>
+				<unitPattern count="one">{0} ষ্টেৰাঃ</unitPattern>
+				<unitPattern count="other">{0}ষ্টেৰাঃ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>কাটাঃ</displayName>
+				<unitPattern count="one">{0} কাটাঃ</unitPattern>
+				<unitPattern count="other">{0} কাটাঃ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>কুঃ</displayName>
+				<unitPattern count="one">{0} কুঃ</unitPattern>
+				<unitPattern count="other">{0} কুঃ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ফাঃ</displayName>
+				<unitPattern count="one">{0} ফাঃ</unitPattern>
+				<unitPattern count="other">{0} ফাঃ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>হেনঃ</displayName>
+				<unitPattern count="one">{0} হেনঃ</unitPattern>
+				<unitPattern count="other">{0} হেনঃ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ছিয়েঃ</displayName>
+				<unitPattern count="one">{0} ছিয়েঃ</unitPattern>
+				<unitPattern count="other">{0} ছিয়েঃ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>কেল’ৰি-আইটি</displayName>
+				<unitPattern count="one">{0} কেল-আইটি</unitPattern>
+				<unitPattern count="other">{0} কেল-আইটি</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>বেঃ</displayName>
+				<unitPattern count="one">{0}বেঃ</unitPattern>
+				<unitPattern count="other">{0}বেঃ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>এচভিঃ</displayName>
+				<unitPattern count="one">{0} এচভিঃ</unitPattern>
+				<unitPattern count="other">{0} এচভিঃ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>গ্ৰে</displayName>
+				<unitPattern count="one">{0} গ্ৰে</unitPattern>
+				<unitPattern count="other">{0}গ্ৰে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>কিঃগ্ৰাঃবঃ</displayName>
+				<unitPattern count="one">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+				<unitPattern count="other">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>টেঃ</displayName>
+				<unitPattern count="one">{0} টেঃ</unitPattern>
+				<unitPattern count="other">{0} টেঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ৱেঃ</displayName>
+				<unitPattern count="one">{0} ৱেঃ</unitPattern>
+				<unitPattern count="other">{0} ৱেঃ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>আলোক</displayName>
 				<unitPattern count="one">{0}আলোক</unitPattern>
 				<unitPattern count="other">{0}আলোক</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>নিশা</displayName>
-				<unitPattern count="one">{0} নিশা</unitPattern>
-				<unitPattern count="other">{0} নিশা</unitPattern>
-				<perUnitPattern>{0}/নিশা</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/asa.xml b/make/data/cldr/common/main/asa.xml
index 1e8e9139baf..7830fb83ecd 100644
--- a/make/data/cldr/common/main/asa.xml
+++ b/make/data/cldr/common/main/asa.xml
@@ -556,6 +556,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ast.xml b/make/data/cldr/common/main/ast.xml
index bf948f4bead..f7b55524bed 100644
--- a/make/data/cldr/common/main/ast.xml
+++ b/make/data/cldr/common/main/ast.xml
@@ -1198,13 +1198,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">calendariu de la República de China</type>
 			<type key="cf" type="account">formatu monetariu contable</type>
 			<type key="cf" type="standard">formatu monetariu estándar</type>
-			<type key="collation" type="big5han">orde de clasificación chinu tradicional - Big5</type>
 			<type key="collation" type="compat">orde de clasificación anterior, por compatibilidá</type>
 			<type key="collation" type="dictionary">orde de clasificación de diccionariu</type>
 			<type key="collation" type="ducet">orde de clasificación Unicode predetermináu</type>
 			<type key="collation" type="emoji">orde de clasificación Emoji</type>
 			<type key="collation" type="eor">regles d’ordenamientu europees</type>
-			<type key="collation" type="gb2312han">orde de clasificación chinu simplificáu - GB2312</type>
 			<type key="collation" type="phonebook">orde de clasificación de llista telefónica</type>
 			<type key="collation" type="pinyin">orde de clasificación pinyin</type>
 			<type key="collation" type="search">gueta xeneral</type>
@@ -1705,20 +1703,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0">antes de la Encarnación</era>
-						<era type="1">después de la Encarnación</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a. E.</era>
-						<era type="1">d. E.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">aE</era>
-						<era type="1">dE</era>
-					</eraNarrow>
-				</eras>
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="yMMMd">
@@ -3376,11 +3360,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat type="daylight">Hora braniega de {0}</regionFormat>
 			<regionFormat type="standard">Hora estándar de {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3556,9 +3535,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tokiu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pyong Yang</exemplarCity>
 			</zone>
@@ -3768,9 +3744,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Hora d’África del oeste</generic>
-					<standard>Hora estándar d’África del oeste</standard>
-					<daylight>Hora braniega d’África del oeste</daylight>
+					<standard>Hora d’África del oeste</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4206,6 +4180,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora de La Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hora estándar de Hawaii-Aleutianes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hora de Hawaii-Aleutianes</generic>
@@ -4772,6 +4751,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -6431,7 +6414,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} milimol per llitru</unitPattern>
 				<unitPattern count="other">{0} milimoles per llitru</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes per millón</displayName>
 				<unitPattern count="one">{0} parte per millón</unitPattern>
 				<unitPattern count="other">{0} partes per millón</unitPattern>
@@ -7343,7 +7326,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mmol/L</unitPattern>
 				<unitPattern count="other">{0}mmol/L</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/az.xml b/make/data/cldr/common/main/az.xml
index c349944c7a5..d7d104f7a97 100644
--- a/make/data/cldr/common/main/az.xml
+++ b/make/data/cldr/common/main/az.xml
@@ -124,7 +124,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="dav">taita</language>
 			<language type="de">alman</language>
 			<language type="de_AT">Avstriya almancası</language>
-			<language type="de_CH">İsveçrə yüksək almancası</language>
 			<language type="del">delaver</language>
 			<language type="den">slavey</language>
 			<language type="dgr">doqrib</language>
@@ -257,10 +256,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kbd">kabarda-çərkəz</language>
 			<language type="kcg">tiyap</language>
 			<language type="kde">makond</language>
-			<language type="kea">kabuverdian</language>
+			<language type="kea">kabuverdianu</language>
 			<language type="kfo">koro</language>
 			<language type="kg">konqo</language>
-			<language type="kgp">kaiqanq</language>
+			<language type="kgp">kaynqanq</language>
 			<language type="kha">xazi</language>
 			<language type="kho">xotan</language>
 			<language type="khq">koyra çiini</language>
@@ -287,6 +286,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">köln</language>
 			<language type="ku">kürd</language>
+			<language type="ku" menu="core">kürd dili</language>
+			<language type="ku" menu="extension">kurmanci (kürd dili) dialekti</language>
 			<language type="kum">kumık</language>
 			<language type="kut">kutenay</language>
 			<language type="kv">komi</language>
@@ -805,6 +806,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Çin</territory>
 			<territory type="CO">Kolumbiya</territory>
 			<territory type="CP">Klipperton adası</territory>
+			<territory type="CQ">sark (ingilis dili) dialekti</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kabo-Verde</territory>
@@ -1039,45 +1041,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Valyuta Formatı</key>
 			<key type="collation">Sıralama</key>
 			<key type="currency">Valyuta</key>
+			<key type="em">Emojilərin təqdim edilməsi</key>
 			<key type="hc">Saat Sikli (12 / 24)</key>
 			<key type="lb">Sətirdən sətrə keçirmə üslubu</key>
+			<key type="lw">Sözlərin bölünərək sətirdən-sətrə keçirilməsi</key>
 			<key type="ms">Ölçü Sistemi</key>
 			<key type="numbers">Rəqəmlər</key>
+			<key type="ss">Abreviaturadan sonra cümlə kəsintisi</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddist təqvimi</type>
+			<type key="calendar" type="buddhist" scope="core">Buddist</type>
 			<type key="calendar" type="chinese">Çin təqvimi</type>
+			<type key="calendar" type="chinese" scope="core">Çin</type>
 			<type key="calendar" type="coptic">Kopt təqvimi</type>
+			<type key="calendar" type="coptic" scope="core">Qibti</type>
 			<type key="calendar" type="dangi">Dangi təqvimi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Efiop təqvimi</type>
+			<type key="calendar" type="ethiopic" scope="core">Efiop</type>
 			<type key="calendar" type="ethiopic-amete-alem">Efiop amet-alem təqvimi</type>
-			<type key="calendar" type="gregorian">Qreqorian təqvimi</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Efiop Amete Alem</type>
+			<type key="calendar" type="gregorian">Qriqori təqvimi</type>
+			<type key="calendar" type="gregorian" scope="core">Qriqori</type>
 			<type key="calendar" type="hebrew">Yəhudi Təqvimi</type>
+			<type key="calendar" type="hebrew" scope="core">Yəhudi</type>
 			<type key="calendar" type="indian" draft="contributed">Hindi təqvimi</type>
 			<type key="calendar" type="islamic">Hicri təqvimi</type>
+			<type key="calendar" type="islamic" scope="core">Hicri</type>
 			<type key="calendar" type="islamic-civil">Hicri təqvimi (tabulyar, vətəndaşlıq dövrü)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hicri (cədvəl, mülki dövr)</type>
 			<type key="calendar" type="islamic-tbla">Hicri təqvim (tabulyar, astromonik dövr)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hicri (cədvəl, astronomik dövr)</type>
 			<type key="calendar" type="islamic-umalqura">Hicri təqvim (Umm əl-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hicri (Umm əl-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 Təqvimi</type>
 			<type key="calendar" type="japanese">Yapon Təqvimi</type>
+			<type key="calendar" type="japanese" scope="core">Yapon</type>
 			<type key="calendar" type="persian">İran Təqvimi</type>
+			<type key="calendar" type="persian" scope="core">İran</type>
 			<type key="calendar" type="roc">Minquo Təqvimi</type>
+			<type key="calendar" type="roc" scope="core">Minquo</type>
 			<type key="cf" type="account">Uçot Valyuta Formatı</type>
+			<type key="cf" type="account" scope="core">Valyuta formatı: Uçot</type>
 			<type key="cf" type="standard">Standart Valyuta Formatı</type>
+			<type key="cf" type="standard" scope="core">Valyuta formatı: Standart</type>
 			<type key="collation" type="ducet">Standart Unicode Sıralama</type>
+			<type key="collation" type="ducet" scope="core">Defolt unikod</type>
 			<type key="collation" type="pinyin" draft="contributed">Pinyin təqvimi</type>
 			<type key="collation" type="search">Ümumi Məqsədli Axtarış</type>
+			<type key="collation" type="search" scope="core">Axtarış</type>
 			<type key="collation" type="standard">Standart Sıralama</type>
+			<type key="collation" type="standard" scope="core">Standart</type>
+			<type key="em" type="default" scope="core">Emojilərin təqdim edilməsi: Standart</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Mətn</type>
 			<type key="hc" type="h11">12 Saatlıq Sistem (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Saatlıq Sistem (0–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 Saatlıq Sistem (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 Saatlıq Sistem (0–23)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Sərbəst sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="loose" scope="core">Sərbəst</type>
 			<type key="lb" type="normal">Normal sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Sərt sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="strict" scope="core">Ciddi</type>
+			<type key="lw" type="breakall" scope="core">Hamısını böl</type>
+			<type key="lw" type="keepall" scope="core">Hamısını saxla</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">İfadələrdə saxla</type>
 			<type key="ms" type="metric">Metrik Sistem</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">İmperial Ölçü Sistemi</type>
+			<type key="ms" type="uksystem" scope="core">Birləşmiş Krallıq</type>
 			<type key="ms" type="ussystem">ABŞ Ölçü Sistemi</type>
+			<type key="ms" type="ussystem" scope="core">Birləşmiş Ştatlar</type>
 			<type key="numbers" type="arab">Ərəb-Hind Rəqəmləri</type>
 			<type key="numbers" type="arabext">Genişlənmiş Ərəb-Hind Rəqəmləri</type>
 			<type key="numbers" type="armn">Erməni Rəqəmləri</type>
@@ -1118,6 +1160,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">Tay Rəqəmləri</type>
 			<type key="numbers" type="tibt">Tibet Rəqəmləri</type>
 			<type key="numbers" type="vaii">Vai rəqəmləri</type>
+			<type key="ss" type="none" scope="core">Deaktiv</type>
+			<type key="ss" type="standard" scope="core">Aktiv</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1138,9 +1182,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1210,11 +1251,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="GyM">G MM/y</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG d M y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd/MM/y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
@@ -1230,6 +1272,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyMMMM">G MMMM y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h – h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm – h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm – h:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG MM/y– GGGGG MM/y</greatestDifference>
 							<greatestDifference id="M">GGGGG MM/y – MM/y</greatestDifference>
@@ -1264,10 +1315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
 							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1278,10 +1325,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
 							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
@@ -1291,11 +1334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="d">d – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">GGGGG MM/y – MM/y</greatestDifference>
@@ -1316,8 +1355,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">G d–d MMM y</greatestDifference>
-							<greatestDifference id="M">G d MMM y – d MMM</greatestDifference>
+							<greatestDifference id="d">G MMM d – d, y</greatestDifference>
+							<greatestDifference id="M">G MMM d – MMM d, y</greatestDifference>
 							<greatestDifference id="y">G d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
@@ -1525,13 +1564,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}/{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}/{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{1} 'at' {0}</pattern>
+							<pattern>{1}/{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}/{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1541,6 +1586,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1549,6 +1597,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">B h</dateFormatItem>
@@ -1559,11 +1610,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG d MMM y</dateFormatItem>
+						<dateFormatItem id="GyM">G M y</dateFormatItem>
+						<dateFormatItem id="GyMd">G d M y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d M y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1586,6 +1638,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">Y, w 'həftə'</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm–B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG MM.y – GGGGG MM.y</greatestDifference>
 							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
@@ -1615,15 +1676,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="d">G d MMM, E – d MMM, E, y</greatestDifference>
 							<greatestDifference id="G">G d MMM y, E – d MMM y, E</greatestDifference>
 							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
 							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1634,10 +1691,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
 							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
@@ -1673,12 +1726,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">d MMM y – d MMM</greatestDifference>
+							<greatestDifference id="d">d – d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
 							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">d MMM y, E – d MMM, E</greatestDifference>
-							<greatestDifference id="M">d MMM y, E – d MMM, E</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
 							<greatestDifference id="y">d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
@@ -1721,6 +1775,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">G MM/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd/MM/y, E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="persian">
 				<months>
@@ -1843,7 +1903,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>hft. günü</displayName>
 			</field>
 			<field type="weekdayOfMonth">
-				<displayName>ayın həftə günü</displayName>
+				<displayName>ayın həftəiçi günü</displayName>
 			</field>
 			<field type="weekdayOfMonth-short">
 				<displayName>ay hft. günü</displayName>
@@ -1899,9 +1959,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">keçən ÇƏ</relative>
+				<relative type="-1">keçən Ç.ax.</relative>
 				<relative type="0">bu ÇƏ</relative>
 				<relative type="1">gələn ÇƏ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} çərşənbə axşamı sonra</relativeTimePattern>
+					<relativeTimePattern count="other">{0} çərşənbə axşamı ərzində</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="wed">
 				<relative type="-1">keçən çərşənbə</relative>
@@ -2057,9 +2121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angilya</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Antarctica/Syowa">
 				<exemplarCity>Syova</exemplarCity>
 			</zone>
@@ -2300,6 +2361,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pasxa</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Koyayke</exemplarCity>
+			</zone>
 			<zone type="America/Santiago">
 				<exemplarCity>Santyaqo</exemplarCity>
 			</zone>
@@ -2512,7 +2576,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Pnom Pen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderböri</exemplarCity>
+				<exemplarCity>Kanton</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kirimati</exemplarCity>
@@ -2977,9 +3041,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Qərbi Afrika Vaxtı</generic>
-					<standard>Qərbi Afrika Standart Vaxtı</standard>
-					<daylight>Qərbi Afrika Yay Vaxtı</daylight>
+					<standard>Qərbi Afrika Vaxtı</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2998,9 +3060,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Şimali Mərkəzi Amerika Vaxtı</generic>
-					<standard>Şimali Mərkəzi Amerika Standart Vaxtı</standard>
-					<daylight>Şimali Mərkəzi Amerika Yay Vaxtı</daylight>
+					<generic>Mərkəzi Amerika saat qurşağı</generic>
+					<standard>Mərkəzi Amerika Standart Vaxtı</standard>
+					<daylight>Mərkəzi Amerika yay vaxtı</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
@@ -3061,7 +3123,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>Atlantik Vaxt</generic>
+					<generic>Atlantik saat qurşağı</generic>
 					<standard>Atlantik Standart Vaxt</standard>
 					<daylight>Atlantik Yay Vaxtı</daylight>
 				</long>
@@ -3329,6 +3391,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Qayana Vaxtı</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havay-Aleut Standart Vaxtı</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havay-Aleut Vaxtı</generic>
@@ -3748,6 +3815,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Çuuk Vaxtı</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Türkiya vaxtı</generic>
+					<standard>Türkiya standart vaxtı</standard>
+					<daylight>Türkiya yay vaxtı</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Türkmənistan Vaxtı</generic>
@@ -3926,13 +4000,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -3943,24 +4030,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000" count="other">00K ¤</pattern>
 					<pattern type="100000" count="one">000K ¤</pattern>
 					<pattern type="100000" count="other">000K ¤</pattern>
-					<pattern type="1000000" count="one">0M ¤</pattern>
-					<pattern type="1000000" count="other">0M ¤</pattern>
-					<pattern type="10000000" count="one">00M ¤</pattern>
-					<pattern type="10000000" count="other">00M ¤</pattern>
-					<pattern type="100000000" count="one">000M ¤</pattern>
-					<pattern type="100000000" count="other">000M ¤</pattern>
-					<pattern type="1000000000" count="one">0G ¤</pattern>
-					<pattern type="1000000000" count="other">0G ¤</pattern>
-					<pattern type="10000000000" count="one">00G ¤</pattern>
-					<pattern type="10000000000" count="other">00G ¤</pattern>
-					<pattern type="100000000000" count="one">000G ¤</pattern>
-					<pattern type="100000000000" count="other">000G ¤</pattern>
-					<pattern type="1000000000000" count="one">0T ¤</pattern>
-					<pattern type="1000000000000" count="other">0T ¤</pattern>
-					<pattern type="10000000000000" count="one">00T ¤</pattern>
-					<pattern type="10000000000000" count="other">00T ¤</pattern>
-					<pattern type="100000000000000" count="one">000T ¤</pattern>
-					<pattern type="100000000000000" count="other">000T ¤</pattern>
+					<pattern type="1000000" count="one">0 mln ¤</pattern>
+					<pattern type="1000000" count="other">0 mln ¤</pattern>
+					<pattern type="10000000" count="one">00 mln ¤</pattern>
+					<pattern type="10000000" count="other">00 mln ¤</pattern>
+					<pattern type="100000000" count="one">000 mln ¤</pattern>
+					<pattern type="100000000" count="other">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one">0 mlrd ¤</pattern>
+					<pattern type="1000000000" count="other">0 mlrd ¤</pattern>
+					<pattern type="10000000000" count="one">00 mlrd ¤</pattern>
+					<pattern type="10000000000" count="other">00 mlrd ¤</pattern>
+					<pattern type="100000000000" count="one">000 mlrd ¤</pattern>
+					<pattern type="100000000000" count="other">000 mlrd ¤</pattern>
+					<pattern type="1000000000000" count="one">0 trln ¤</pattern>
+					<pattern type="1000000000000" count="other">0 trln ¤</pattern>
+					<pattern type="10000000000000" count="one">00 trln ¤</pattern>
+					<pattern type="10000000000000" count="other">00 trln ¤</pattern>
+					<pattern type="100000000000000" count="one">000 trln ¤</pattern>
+					<pattern type="100000000000000" count="other">000 trln ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5183,6 +5270,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Şərqi Karib dolları</displayName>
 				<displayName count="other">Şərqi Karib dolları</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karib gilderi</displayName>
+				<displayName count="one">Karib gilderi</displayName>
+				<displayName count="other">Karib gilderi</displayName>
+			</currency>
 			<currency type="XFO">
 				<displayName>Fransız Gızıl Frankı</displayName>
 				<displayName count="one">Fransız gızıl frankı</displayName>
@@ -5276,6 +5368,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Zimbabve dolları (1980–2008)</displayName>
 				<displayName count="other">Zimbabve dolları (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabve Qızılı</displayName>
+				<displayName count="one">Zimbabve qızılı</displayName>
+				<displayName count="other">Zimbabve qızılı</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabve Dolları (2009)</displayName>
 				<displayName count="one">Zimbabve dolları (2009)</displayName>
@@ -5486,7 +5583,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimol/litr</unitPattern>
 				<unitPattern count="other">{0} millimol/litr</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hissə</displayName>
+				<unitPattern count="one">{0} hissə</unitPattern>
+				<unitPattern count="other">{0} hissə</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>milyonda hissəcik</displayName>
 				<unitPattern count="one">{0} milyonda hissəcik</unitPattern>
 				<unitPattern count="other">{0} milyonda hissəcik</unitPattern>
@@ -5503,6 +5605,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} permiriada</unitPattern>
 				<unitPattern count="other">{0} permiriada</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>qlükoza</displayName>
+				<unitPattern count="one">{0} qlükoza</unitPattern>
+				<unitPattern count="other">{0} qlükoza</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/kilometr</displayName>
 				<unitPattern count="one">{0} litr/kilometr</unitPattern>
@@ -5890,6 +5997,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimetr civə sütunu</unitPattern>
 				<unitPattern count="other">{0} millimetr civə sütunu</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>civə</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funt/kvadrat düym</displayName>
 				<unitPattern count="one">{0} funt/kvadrat düym</unitPattern>
@@ -6021,6 +6131,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millilitr</unitPattern>
 				<unitPattern count="other">{0} millilitr</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrik maye unsiyası</displayName>
+				<unitPattern count="one">{0} metrik maye unsiyası</unitPattern>
+				<unitPattern count="other">{0} metrik maye unsiyası</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akr-fut</displayName>
 				<unitPattern count="one">{0} akr-fut</unitPattern>
@@ -6088,21 +6203,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} İmp. kvarta</unitPattern>
 				<unitPattern count="other">{0} İmp. kvarta</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>işıq</displayName>
-				<unitPattern count="one">{0} işıq</unitPattern>
-				<unitPattern count="other">{0} işıq</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>bir milyarda düşən hissə sayı</displayName>
-				<unitPattern count="one">bir milyarda düşən {0} hissə</unitPattern>
-				<unitPattern count="other">bir milyarda düşən {0} hissə</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>gecə</displayName>
-				<unitPattern count="one">{0} gecə</unitPattern>
-				<unitPattern count="other">{0} gecə</unitPattern>
-				<perUnitPattern>{0}/gecə</perUnitPattern>
+			<unit type="electric-coulomb">
+				<displayName>kulomb</displayName>
+				<unitPattern count="one">{0} kulomb</unitPattern>
+				<unitPattern count="other">{0} kulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henri</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simen</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori-IT</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekkerel</displayName>
+				<unitPattern count="one">{0} bekkerel</unitPattern>
+				<unitPattern count="other">{0} bekkerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>zivert</displayName>
+				<unitPattern count="one">{0} zivert</unitPattern>
+				<unitPattern count="other">{0} zivert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>qrey</displayName>
+				<unitPattern count="one">{0} Qy</unitPattern>
+				<unitPattern count="other">{0} Qy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kiloqram qüvvə</displayName>
+				<unitPattern count="one">{0} kqq</unitPattern>
+				<unitPattern count="other">{0} kqq</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veber</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>milyardda hissə</displayName>
+				<unitPattern count="one">milyardda {0} hissə</unitPattern>
+				<unitPattern count="other">milyardda {0} hissə</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>kardinal istiqamət</displayName>
@@ -6220,7 +6375,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} element</unitPattern>
 				<unitPattern count="other">{0} element</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hissə</displayName>
+				<unitPattern count="one">{0} hissə</unitPattern>
+				<unitPattern count="other">{0} hissə</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>hissəcik/milyon</displayName>
 				<unitPattern count="one">{0} hs/mln</unitPattern>
 				<unitPattern count="other">{0} hs/mln</unitPattern>
@@ -6234,6 +6394,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>permiriada</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Qlk</displayName>
+				<unitPattern count="one">{0} Qlk</unitPattern>
+				<unitPattern count="other">{0} Qlk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6585,6 +6750,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} sL</unitPattern>
 				<unitPattern count="other">{0} sL</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>mmu</displayName>
+				<unitPattern count="one">{0} mmu</unitPattern>
+				<unitPattern count="other">{0} mmu</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>buşel</displayName>
 				<unitPattern count="one">{0} buşel</unitPattern>
@@ -6657,13 +6827,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} kvarta İmp.</unitPattern>
 				<unitPattern count="other">{0} kvarta İmp.</unitPattern>
 			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kulomb</displayName>
+				<unitPattern count="one">{0} kulomb</unitPattern>
+				<unitPattern count="other">{0} kulomb</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">{0} Bk</unitPattern>
+				<unitPattern count="other">{0} Bk</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Zv</displayName>
+				<unitPattern count="one">{0} Zv</unitPattern>
+				<unitPattern count="other">{0} Zv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Qy</displayName>
+				<unitPattern count="one">{0} Qy</unitPattern>
+				<unitPattern count="other">{0} Qy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kqq</displayName>
+				<unitPattern count="one">{0} kqq</unitPattern>
+				<unitPattern count="other">{0} kqq</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>işıq</displayName>
 				<unitPattern count="one">{0} işıq</unitPattern>
 				<unitPattern count="other">{0} işıq</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>hissə/milyard</displayName>
+				<unitPattern count="one">{0} hissə/milyard</unitPattern>
+				<unitPattern count="other">{0} hissə/milyard</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>gecə</displayName>
@@ -6707,9 +6909,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<unitPattern count="one">{0} hs/mln</unitPattern>
-				<unitPattern count="other">{0}ppm</unitPattern>
+			<unit type="concentr-part">
+				<displayName>hissə</displayName>
+				<unitPattern count="one">{0} hissə</unitPattern>
+				<unitPattern count="other">{0} hissə</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
@@ -6720,6 +6923,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Qlk</displayName>
+				<unitPattern count="one">{0} Qlk</unitPattern>
+				<unitPattern count="other">{0} Qlk</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0} mil/imq</unitPattern>
 				<unitPattern count="other">{0} mil/imq</unitPattern>
@@ -6893,6 +7101,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mf</unitPattern>
 				<unitPattern count="other">{0} mf</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>mmu</displayName>
+				<unitPattern count="one">{0} mmu</unitPattern>
+				<unitPattern count="other">{0} mmu</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ak-ft</displayName>
 				<unitPattern count="one">{0} ak-ft</unitPattern>
@@ -6924,16 +7137,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="electric-coulomb">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">{0} Bk</unitPattern>
+				<unitPattern count="other">{0} Bk</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Zv</displayName>
+				<unitPattern count="one">{0} Zv</unitPattern>
+				<unitPattern count="other">{0} Zv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Qy</displayName>
+				<unitPattern count="one">{0} Qy</unitPattern>
+				<unitPattern count="other">{0} Qy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kqq</displayName>
+				<unitPattern count="one">{0} kqq</unitPattern>
+				<unitPattern count="other">{0} kqq</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>işıq</displayName>
 				<unitPattern count="one">{0}işıq</unitPattern>
 				<unitPattern count="other">{0}işıq</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} hissə/milyard</unitPattern>
+				<unitPattern count="other">{0} hissə/milyard</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>gecə</displayName>
 				<unitPattern count="one">{0}gecə</unitPattern>
 				<unitPattern count="other">{0}gecə</unitPattern>
-				<perUnitPattern>{0}/gecə</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/az_Cyrl.xml b/make/data/cldr/common/main/az_Cyrl.xml
index 64b3e0669f3..dc96f5cacd7 100644
--- a/make/data/cldr/common/main/az_Cyrl.xml
+++ b/make/data/cldr/common/main/az_Cyrl.xml
@@ -1070,6 +1070,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ba.xml b/make/data/cldr/common/main/ba.xml
index 468134a046d..72ba3e243ad 100644
--- a/make/data/cldr/common/main/ba.xml
+++ b/make/data/cldr/common/main/ba.xml
@@ -12,11 +12,12370 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="ba" draft="contributed">башҡорт теле</language>
+			<language type="aa">афар</language>
+			<language type="ab">абхаз</language>
+			<language type="af">африкаанс</language>
+			<language type="agq">агем</language>
+			<language type="ak">акан</language>
+			<language type="am">амхар</language>
+			<language type="an">арагон</language>
+			<language type="ann">оболо</language>
+			<language type="apc">левант ғәрәп</language>
+			<language type="ar">ғәрәп</language>
+			<language type="ar_001">әҙәби ғәрәп</language>
+			<language type="arn">мапуче</language>
+			<language type="as">ассам</language>
+			<language type="asa">асу</language>
+			<language type="ast">астурий</language>
+			<language type="az">әзербайжан</language>
+			<language type="az" alt="short">әзери</language>
+			<language type="ba">башҡорт</language>
+			<language type="bal">балудж</language>
+			<language type="bas">басаа</language>
+			<language type="be">белорус</language>
+			<language type="bem">бемба</language>
+			<language type="bew">бетави</language>
+			<language type="bez">бена</language>
+			<language type="bg">болгар</language>
+			<language type="bgc">харьянви</language>
+			<language type="bgn">көнбайыш белудж</language>
+			<language type="bho">бходжпури</language>
+			<language type="blo">ании</language>
+			<language type="blt">тай дам</language>
+			<language type="bm">бамбара</language>
+			<language type="bn">бенгал</language>
+			<language type="bo">тибет</language>
+			<language type="bqi">бәхтиәр</language>
+			<language type="br">бретон</language>
+			<language type="brx">бодо</language>
+			<language type="bs">босний</language>
+			<language type="bss">акоосе</language>
+			<language type="bua">бүрәт</language>
+			<language type="byn">блин</language>
+			<language type="ca">каталан</language>
+			<language type="cad">каддо</language>
+			<language type="cch">атсам</language>
+			<language type="ccp">чакма</language>
+			<language type="ce">чечен</language>
+			<language type="ceb">себуано</language>
+			<language type="cgg">чига</language>
+			<language type="cho">чоктав</language>
+			<language type="chr">чероки</language>
+			<language type="cic">чикасо</language>
+			<language type="ckb">үҙәк курд</language>
+			<language type="ckb" alt="menu">курд, үҙәк</language>
+			<language type="ckb" alt="variant">курд, сорани</language>
+			<language type="co">корсика</language>
+			<language type="cop">копт</language>
+			<language type="cs">чех</language>
+			<language type="csw">һаҙлыҡлы кри</language>
+			<language type="cu">сиркәү славян</language>
+			<language type="cv">сыуаш</language>
+			<language type="cy">валлий</language>
+			<language type="da">дат</language>
+			<language type="dav">таита</language>
+			<language type="de">немец</language>
+			<language type="de_AT">немец (Австрия)</language>
+			<language type="de_CH">немец (Швейцария)</language>
+			<language type="dje">зарма</language>
+			<language type="doi">догри</language>
+			<language type="dsb">түбәнге лужиц</language>
+			<language type="dua">дуала</language>
+			<language type="dv">дивехи</language>
+			<language type="dyo">джола фоньи</language>
+			<language type="dz">дзонг-кэ</language>
+			<language type="ebu">эмбу</language>
+			<language type="ee">эве</language>
+			<language type="el">грек</language>
+			<language type="en">инглиз</language>
+			<language type="en_AU">инглиз (Австралия)</language>
+			<language type="en_CA">инглиз (Канада)</language>
+			<language type="en_GB">инглиз (Британия)</language>
+			<language type="en_US">инглиз (АҠШ)</language>
+			<language type="eo">эсперанто</language>
+			<language type="es">испан</language>
+			<language type="es_419">испан (Латин Америкаһы)</language>
+			<language type="es_ES">испан (Европа)</language>
+			<language type="es_MX">испан (Мексика)</language>
+			<language type="et">эстон</language>
+			<language type="eu">баск</language>
+			<language type="ewo">эвондо</language>
+			<language type="fa">фарсы</language>
+			<language type="fa_AF">дари</language>
+			<language type="ff">фула</language>
+			<language type="fi">фин</language>
+			<language type="fil">филиппин</language>
+			<language type="fo">фарер</language>
+			<language type="fr">француз</language>
+			<language type="fr_CA">француз (Канада)</language>
+			<language type="fr_CH">француз (Швейцария)</language>
+			<language type="frc">каджун француз</language>
+			<language type="frr">төньяҡ фриз</language>
+			<language type="fur">фриул</language>
+			<language type="fy">көнбайыш фриз</language>
+			<language type="ga">ирланд</language>
+			<language type="gaa">га</language>
+			<language type="gd">шотланд гэл</language>
+			<language type="gez">геэз</language>
+			<language type="gl">галисий</language>
+			<language type="gn">гуарани</language>
+			<language type="gsw">швейцария немец</language>
+			<language type="gu">гуджарати</language>
+			<language type="guz">гусии</language>
+			<language type="gv">мэн</language>
+			<language type="ha">хауса</language>
+			<language type="haw">гавай</language>
+			<language type="he">иврит</language>
+			<language type="hi">һинди</language>
+			<language type="hi_Latn">һинди (латиница)</language>
+			<language type="hi_Latn" alt="variant">һинглиш</language>
+			<language type="hnj">хмонг нджуа</language>
+			<language type="hr">хорват</language>
+			<language type="hsb">үрге лужи</language>
+			<language type="ht">гаити креол</language>
+			<language type="hu">венгр</language>
+			<language type="hy">әрмән</language>
+			<language type="ia">интерлингва</language>
+			<language type="id">индонез</language>
+			<language type="ie">интерлингве</language>
+			<language type="ig">игбо</language>
+			<language type="ii">сычуань и</language>
+			<language type="io">идо</language>
+			<language type="is">исланд</language>
+			<language type="it">итальян</language>
+			<language type="iu">инуктитут</language>
+			<language type="ja">япон</language>
+			<language type="jbo">ложбан</language>
+			<language type="jgo">нгомба</language>
+			<language type="jmc">мачаме</language>
+			<language type="jv">ява</language>
+			<language type="ka">грузин</language>
+			<language type="kaa">ҡарағалпаҡ</language>
+			<language type="kab">кабил</language>
+			<language type="kaj">джу</language>
+			<language type="kam">камба</language>
+			<language type="kcg">тьяп</language>
+			<language type="kde">маконде</language>
+			<language type="kea">кабувердьяну</language>
+			<language type="kek">кекчи</language>
+			<language type="ken">кеньянг</language>
+			<language type="kgp">каинганг</language>
+			<language type="khq">койра Чиини</language>
+			<language type="ki">кикуйю</language>
+			<language type="kk">ҡаҙаҡ</language>
+			<language type="kkj">како</language>
+			<language type="kl">калааллисут</language>
+			<language type="kln">календжин</language>
+			<language type="km">кхмер</language>
+			<language type="kn">каннада</language>
+			<language type="ko">корей</language>
+			<language type="kok">конкани</language>
+			<language type="kpe">кпелле</language>
+			<language type="ks">кашмири</language>
+			<language type="ksb">шамбала</language>
+			<language type="ksf">бафия</language>
+			<language type="ksh">кёльн</language>
+			<language type="ku">курд</language>
+			<language type="ku" menu="core">курд</language>
+			<language type="ku" menu="extension">курманджи</language>
+			<language type="kw">корн</language>
+			<language type="kxv">куви</language>
+			<language type="ky">ҡырғыҙ</language>
+			<language type="la">латин</language>
+			<language type="lag">ланги</language>
+			<language type="lb">люксембург</language>
+			<language type="lg">ганда</language>
+			<language type="lij">лигур</language>
+			<language type="lkt">лакота</language>
+			<language type="lld">ладин</language>
+			<language type="lmo">ломбард</language>
+			<language type="ln">лингала</language>
+			<language type="lo">лаос</language>
+			<language type="lou">луизиана креол</language>
+			<language type="lrc">төньяҡ лури</language>
+			<language type="lt">литва</language>
+			<language type="ltg">латгал</language>
+			<language type="lu">луба-катанга</language>
+			<language type="luo">луо</language>
+			<language type="luy">лухья</language>
+			<language type="lv">латыш</language>
+			<language type="lzz">лаз</language>
+			<language type="mai">майтхили</language>
+			<language type="mas">масаи</language>
+			<language type="mdf">мокша</language>
+			<language type="mer">меру</language>
+			<language type="mfe">морисьен</language>
+			<language type="mg">малагаси</language>
+			<language type="mgh">макуа-меетто</language>
+			<language type="mgo">мета</language>
+			<language type="mhn">мокено</language>
+			<language type="mi">маори</language>
+			<language type="mic">микмау</language>
+			<language type="mk">македон</language>
+			<language type="ml">малаялам</language>
+			<language type="mn">монгол</language>
+			<language type="mni">манипури</language>
+			<language type="moh">мохаук</language>
+			<language type="mr">маратхи</language>
+			<language type="ms">малай</language>
+			<language type="mt">мальта</language>
+			<language type="mua">мунданг</language>
+			<language type="mul">бер нисә тел</language>
+			<language type="mus">мускоги</language>
+			<language type="mww">хмонг дав</language>
+			<language type="my">бирма</language>
+			<language type="myv">эрзә</language>
+			<language type="mzn">мазандеран</language>
+			<language type="nan">мин нан ҡытай</language>
+			<language type="naq">нама</language>
+			<language type="nb">норвег букмол</language>
+			<language type="nd">төньяҡ ндебеле</language>
+			<language type="nds">түбәнге немец</language>
+			<language type="nds_NL">түбәнге саксон</language>
+			<language type="ne">непал</language>
+			<language type="nl">нидерланд</language>
+			<language type="nl_BE">фламанд</language>
+			<language type="nmg">квасио</language>
+			<language type="nn">норвег нюнорск</language>
+			<language type="nnh">нгиембун</language>
+			<language type="no">норвег</language>
+			<language type="nqo">н’ко</language>
+			<language type="nr">көньяҡ ндебеле</language>
+			<language type="nso">төньяҡ сото</language>
+			<language type="nus">нуэр</language>
+			<language type="nv">навахо</language>
+			<language type="ny">ньянджа</language>
+			<language type="nyn">ньянколе</language>
+			<language type="oc">окситан</language>
+			<language type="oka">оканаган</language>
+			<language type="om">оромо</language>
+			<language type="or">одия</language>
+			<language type="os">осетин</language>
+			<language type="osa">осейдж</language>
+			<language type="pa">панджаби</language>
+			<language type="pap">папьяменто</language>
+			<language type="pcm">нигерия пиджины</language>
+			<language type="pi">пали</language>
+			<language type="pis">пиджин</language>
+			<language type="pl">поляк</language>
+			<language type="pms">пьемонт</language>
+			<language type="prg">прус</language>
+			<language type="ps">пушту</language>
+			<language type="pt">португал</language>
+			<language type="pt_BR">португал (Бразилия)</language>
+			<language type="pt_PT">португал (Европа)</language>
+			<language type="qu">кечуа</language>
+			<language type="quc">киче</language>
+			<language type="raj">раджастхани</language>
+			<language type="rhg">рохинджа</language>
+			<language type="rif">риф</language>
+			<language type="rm">романш</language>
+			<language type="rn">рунди</language>
+			<language type="ro">румын</language>
+			<language type="ro_MD">молдов</language>
+			<language type="rof">ромбо</language>
+			<language type="ru">урыҫ</language>
+			<language type="rw">киньяруанда</language>
+			<language type="rwk">руа</language>
+			<language type="sa">санскрит</language>
+			<language type="sah">саха</language>
+			<language type="saq">самбуру</language>
+			<language type="sat">сантали</language>
+			<language type="sbp">сангу</language>
+			<language type="sc">сардин</language>
+			<language type="scn">сицилия</language>
+			<language type="sd">синдхи</language>
+			<language type="sdh">көньяҡ курд</language>
+			<language type="se">төньяҡ саам</language>
+			<language type="seh">сена</language>
+			<language type="ses">койраборо Сенни</language>
+			<language type="sg">санго</language>
+			<language type="sgs">самогит</language>
+			<language type="shi">ташельхит</language>
+			<language type="shn">шан</language>
+			<language type="si">сингал</language>
+			<language type="sid">сидамо</language>
+			<language type="sk">словак</language>
+			<language type="skr">сараиики</language>
+			<language type="sl">словен</language>
+			<language type="sma">көньяҡ саам</language>
+			<language type="smj">луле саам</language>
+			<language type="smn">инари саам</language>
+			<language type="sms">сколт саам</language>
+			<language type="sn">шона</language>
+			<language type="so">сомали</language>
+			<language type="sq">албан</language>
+			<language type="sr">серб</language>
+			<language type="ss">свати</language>
+			<language type="ssy">сахо</language>
+			<language type="st">көньяҡ сото</language>
+			<language type="su">сундан</language>
+			<language type="suz">сунвар</language>
+			<language type="sv">швед</language>
+			<language type="sw">суахили</language>
+			<language type="sw_CD">конго суахили</language>
+			<language type="syr">сүриә</language>
+			<language type="szl">силез</language>
+			<language type="ta">тамил</language>
+			<language type="te">телугу</language>
+			<language type="teo">тесо</language>
+			<language type="tg">тажик</language>
+			<language type="th">тай</language>
+			<language type="ti">тигринья</language>
+			<language type="tig">тигре</language>
+			<language type="tk">төркмән</language>
+			<language type="tn">тсвана</language>
+			<language type="to">тонга</language>
+			<language type="tok">токи пона</language>
+			<language type="tpi">ток писин</language>
+			<language type="tr">төрөк</language>
+			<language type="trv">тароко</language>
+			<language type="trw">торвали</language>
+			<language type="ts">тсонга</language>
+			<language type="tt">татар</language>
+			<language type="twq">тасавак</language>
+			<language type="tyv">тува</language>
+			<language type="tzm">үҙәк атлас тамазигхт</language>
+			<language type="ug">уйғыр</language>
+			<language type="uk">украин</language>
+			<language type="und">билдәһеҙ тел</language>
+			<language type="ur">урду</language>
+			<language type="uz">үзбәк</language>
+			<language type="vai">ваи</language>
+			<language type="ve">венда</language>
+			<language type="vec">венет</language>
+			<language type="vi">вьетнам</language>
+			<language type="vmw">макуа</language>
+			<language type="vo">волапюк</language>
+			<language type="vun">вунджо</language>
+			<language type="wa">валлон</language>
+			<language type="wae">вальзер</language>
+			<language type="wal">волайтта</language>
+			<language type="wbp">вальпири</language>
+			<language type="wo">волоф</language>
+			<language type="xh">коса</language>
+			<language type="xnr">кангри</language>
+			<language type="xog">сога</language>
+			<language type="yav">янгбен</language>
+			<language type="yi">идиш</language>
+			<language type="yo">йоруба</language>
+			<language type="yrl">ньенгату</language>
+			<language type="yue">кантональ</language>
+			<language type="yue" alt="menu">кантональ ҡытай</language>
+			<language type="za">чжуан</language>
+			<language type="zgh">стандарт марокко тамазигхт</language>
+			<language type="zh">ҡытай</language>
+			<language type="zh" alt="menu">мандарин ҡытай</language>
+			<language type="zh_Hans">ҡытай (ябайлаштырылған)</language>
+			<language type="zh_Hans" alt="long">мандарин ҡытай (ябайлаштырылған)</language>
+			<language type="zh_Hant">ҡытай (традицион)</language>
+			<language type="zh_Hant" alt="long">мандарин ҡытай (традицион)</language>
+			<language type="zu">зулу</language>
+			<language type="zxx">лингвистик йөкмәткеһеҙ</language>
 		</languages>
+		<scripts>
+			<script type="Adlm">адлам</script>
+			<script type="Aghb">кавказ албан</script>
+			<script type="Ahom">ахом</script>
+			<script type="Arab">ғәрәп</script>
+			<script type="Aran">насталик</script>
+			<script type="Armi">император арамей</script>
+			<script type="Armn">әрмән</script>
+			<script type="Avst">авестий</script>
+			<script type="Bali">бали</script>
+			<script type="Bamu">бамум</script>
+			<script type="Bass">басса Вах</script>
+			<script type="Batk">батак</script>
+			<script type="Beng">бенгал</script>
+			<script type="Berf">берия эрфе</script>
+			<script type="Bhks">бхаиксуки</script>
+			<script type="Bopo">бопомофо</script>
+			<script type="Brah">брахми</script>
+			<script type="Brai">брайль шрифты</script>
+			<script type="Bugi">буги</script>
+			<script type="Buhd">бухид</script>
+			<script type="Cakm">чакма</script>
+			<script type="Cans">берҙәм Канада аборигендарҙың ижектәре</script>
+			<script type="Cari">кари</script>
+			<script type="Cham">чам</script>
+			<script type="Cher">чероки</script>
+			<script type="Chrs">хәрәзм</script>
+			<script type="Copt">копт</script>
+			<script type="Cpmn">кипр-миной</script>
+			<script type="Cprt">кипр</script>
+			<script type="Cyrl">кириллица</script>
+			<script type="Cyrs">иҫке сиркәү славян кириллицаһы</script>
+			<script type="Deva">деванагари</script>
+			<script type="Diak">дивес акуру</script>
+			<script type="Dogr">догра</script>
+			<script type="Dsrt">дезерет</script>
+			<script type="Dupl">дюплойе ҡыҫҡа</script>
+			<script type="Egyp">мысыр иероглифтары</script>
+			<script type="Elba">эльбасан</script>
+			<script type="Elym">элимай</script>
+			<script type="Ethi">эфиоп</script>
+			<script type="Gara">гараи</script>
+			<script type="Geor">грузин</script>
+			<script type="Glag">глаголица</script>
+			<script type="Gong">гуньджала гонди</script>
+			<script type="Gonm">масарам гонди</script>
+			<script type="Goth">гот</script>
+			<script type="Gran">грантха</script>
+			<script type="Grek">грек</script>
+			<script type="Gujr">гуджарати</script>
+			<script type="Gukh">гурунг кхема</script>
+			<script type="Guru">гурмукхи</script>
+			<script type="Hanb">бопомофо менән хань</script>
+			<script type="Hang">хангыль</script>
+			<script type="Hani">хань (ҡытай иероглифтары)</script>
+			<script type="Hano">хануну</script>
+			<script type="Hans">ябайлаштырылған</script>
+			<script type="Hans" alt="stand-alone">ябайл. хан</script>
+			<script type="Hant">традицион</script>
+			<script type="Hant" alt="stand-alone">традицион хан</script>
+			<script type="Hatr">хатра</script>
+			<script type="Hebr">йәһүд</script>
+			<script type="Hira">хирагана</script>
+			<script type="Hluw">анатолия иероглифтары</script>
+			<script type="Hmng">пахау хмонг</script>
+			<script type="Hmnp">ньякенг пуачуэ хмонг</script>
+			<script type="Hrkt">япон ижектәре</script>
+			<script type="Hung">иҫке венгр</script>
+			<script type="Ital">иҫке итал</script>
+			<script type="Jamo">джамо</script>
+			<script type="Java">ява</script>
+			<script type="Jpan">япон</script>
+			<script type="Kali">кайа Ли</script>
+			<script type="Kana">катакана</script>
+			<script type="Kawi">кави</script>
+			<script type="Khar">кхароштхи</script>
+			<script type="Khmr">кхмер</script>
+			<script type="Khoj">ходжки</script>
+			<script type="Kits">кесе кидань</script>
+			<script type="Knda">каннада</script>
+			<script type="Kore">корей</script>
+			<script type="Krai">кират раи</script>
+			<script type="Kthi">кайтхи</script>
+			<script type="Lana">ланна</script>
+			<script type="Laoo">лаос</script>
+			<script type="Latf">фрактура латин</script>
+			<script type="Latg">гэль латин</script>
+			<script type="Latn">латиница</script>
+			<script type="Lepc">лепча</script>
+			<script type="Limb">лимбу</script>
+			<script type="Lina">һыҙыҡлы А яҙмаһы</script>
+			<script type="Linb">һыҙыҡлы Б яҙмаһы</script>
+			<script type="Lisu">лису</script>
+			<script type="Lyci">лики</script>
+			<script type="Lydi">лидия</script>
+			<script type="Mahj">махаджани</script>
+			<script type="Maka">макасар</script>
+			<script type="Mand">мандей</script>
+			<script type="Mani">манихей</script>
+			<script type="Marc">марсен</script>
+			<script type="Medf">медефаидрин</script>
+			<script type="Mend">менде</script>
+			<script type="Merc">мероит курсивы</script>
+			<script type="Mero">мероит</script>
+			<script type="Mlym">малаялам</script>
+			<script type="Modi">моди</script>
+			<script type="Mong">монгол</script>
+			<script type="Mroo">мро</script>
+			<script type="Mtei">мейтей майек</script>
+			<script type="Mult">мултани</script>
+			<script type="Mymr">мьянма</script>
+			<script type="Nagm">наг мундари</script>
+			<script type="Nand">нандинагари</script>
+			<script type="Narb">иҫке төньяҡ ғәрәп</script>
+			<script type="Nbat">набатей</script>
+			<script type="Newa">нева</script>
+			<script type="Nkoo">н’ко</script>
+			<script type="Nshu">нюй-шу</script>
+			<script type="Ogam">огам</script>
+			<script type="Olck">ол чики</script>
+			<script type="Onao">ол онал</script>
+			<script type="Orkh">орхон</script>
+			<script type="Orya">ория</script>
+			<script type="Osge">осейдж</script>
+			<script type="Osma">осман</script>
+			<script type="Ougr">боронғо уйғыр</script>
+			<script type="Palm">пальмира</script>
+			<script type="Pauc">пау чин хау</script>
+			<script type="Perm">боронғо пермь</script>
+			<script type="Phag">пагспа</script>
+			<script type="Phli">пәһләүи</script>
+			<script type="Phlp">псалтирь пәһләүи</script>
+			<script type="Phnx">финикия</script>
+			<script type="Plrd">поллард фонетикаһы</script>
+			<script type="Prti">парфия</script>
+			<script type="Qaag">завги</script>
+			<script type="Rjng">реджанг</script>
+			<script type="Rohg">ханифи</script>
+			<script type="Runr">рун</script>
+			<script type="Samr">самаритян</script>
+			<script type="Sarb">иҫке Көньяҡ ғәрәп</script>
+			<script type="Saur">саураштра</script>
+			<script type="Sgnw">ым-ишара яҙыуы</script>
+			<script type="Shaw">шавиан</script>
+			<script type="Shrd">шарада</script>
+			<script type="Sidd">сиддхам</script>
+			<script type="Sidt">сидет</script>
+			<script type="Sind">кхудавади</script>
+			<script type="Sinh">сингал</script>
+			<script type="Sogd">соғҙи</script>
+			<script type="Sogo">боронғо соғҙи</script>
+			<script type="Sora">сора Сомпенг</script>
+			<script type="Soyo">соёмбо</script>
+			<script type="Sund">сундан</script>
+			<script type="Sunu">сунувар</script>
+			<script type="Sylo">силоти Нагри</script>
+			<script type="Syrc">сүриә</script>
+			<script type="Syre">эстрангело сүриә</script>
+			<script type="Syrj">көнбайыш сүриә</script>
+			<script type="Syrn">көнсығыш сүриә</script>
+			<script type="Tagb">тагбанва</script>
+			<script type="Takr">такри</script>
+			<script type="Tale">тай Ле</script>
+			<script type="Talu">яңы тай ле</script>
+			<script type="Taml">тамил</script>
+			<script type="Tang">тангут</script>
+			<script type="Tavt">тай Вьет</script>
+			<script type="Tayo">тай йо</script>
+			<script type="Telu">телугу</script>
+			<script type="Tfng">тифинаг</script>
+			<script type="Tglg">тагалог</script>
+			<script type="Thaa">таана</script>
+			<script type="Thai">тай</script>
+			<script type="Tibt">тибет</script>
+			<script type="Tirh">тирхута</script>
+			<script type="Tnsa">тангса</script>
+			<script type="Todr">тодри</script>
+			<script type="Tols">толонг сики</script>
+			<script type="Toto">тото</script>
+			<script type="Tutg">тулу-тигалари</script>
+			<script type="Ugar">угарит</script>
+			<script type="Vaii">ваи</script>
+			<script type="Vith">виткучи</script>
+			<script type="Wara">варанг кшити</script>
+			<script type="Wcho">ванчо</script>
+			<script type="Xpeo">иҫке фарсы</script>
+			<script type="Xsux">шумер-аккад шына</script>
+			<script type="Yezi">йәзид</script>
+			<script type="Yiii">и</script>
+			<script type="Zanb">занабазар</script>
+			<script type="Zinh">вариҫләнгән</script>
+			<script type="Zmth">математик билдәләү</script>
+			<script type="Zsye">эмодзи</script>
+			<script type="Zsym">символдар</script>
+			<script type="Zxxx">яҙыуһыҙ</script>
+			<script type="Zyyy">дөйөм</script>
+			<script type="Zzzz">билдәһеҙ яҙыу</script>
+		</scripts>
+		<territories>
+			<territory type="001">донъя</territory>
+			<territory type="002">Африка</territory>
+			<territory type="003">Төньяҡ Америка</territory>
+			<territory type="005">Көньяҡ Америка</territory>
+			<territory type="009">Океания</territory>
+			<territory type="011">Көнбайыш Африка</territory>
+			<territory type="013">Үҙәк Америка</territory>
+			<territory type="014">Көнсығыш Африка</territory>
+			<territory type="015">Төньяҡ Африка</territory>
+			<territory type="017">Үҙәк Африка</territory>
+			<territory type="018">Көньяҡ Африка</territory>
+			<territory type="019">Америка</territory>
+			<territory type="021">Төньяҡ Америка төбәге</territory>
+			<territory type="029">Кариб бассейны</territory>
+			<territory type="030">Көнсығыш Азия</territory>
+			<territory type="034">Көньяҡ Азия</territory>
+			<territory type="035">Көньяҡ-Көнсығыш Азия</territory>
+			<territory type="039">Көньяҡ Европа</territory>
+			<territory type="053">Австралазия</territory>
+			<territory type="054">Меланезия</territory>
+			<territory type="057">Микронезия төбәге</territory>
+			<territory type="061">Полинезия</territory>
+			<territory type="142">Азия</territory>
+			<territory type="143">Үҙәк Азия</territory>
+			<territory type="145">Көнбайыш Азия</territory>
+			<territory type="150">Европа</territory>
+			<territory type="151">Көнсығыш Европа</territory>
+			<territory type="154">Төньяҡ Европа</territory>
+			<territory type="155">Көнбайыш Европа</territory>
+			<territory type="202">Тропик Африка</territory>
+			<territory type="419">Латин Америка</territory>
+			<territory type="AC">Асеншен утрауы</territory>
+			<territory type="AD">Андорра</territory>
+			<territory type="AE">Берләшкән Ғәрәп Әмирлектәре</territory>
+			<territory type="AF">Афғанстан</territory>
+			<territory type="AG">Антигуа һәм Барбуда</territory>
+			<territory type="AI">Ангилья</territory>
+			<territory type="AL">Албания</territory>
+			<territory type="AM">Әрмәнстан</territory>
+			<territory type="AO">Ангола</territory>
+			<territory type="AQ">Антарктида</territory>
+			<territory type="AR">Аргентина</territory>
+			<territory type="AS">Америка Самоаһы</territory>
+			<territory type="AT">Австрия</territory>
+			<territory type="AU">Австралия</territory>
+			<territory type="AW">Аруба</territory>
+			<territory type="AX">Аланд утрауҙары</territory>
+			<territory type="AZ">Әзербайжан</territory>
+			<territory type="BA">Босния һәм Герцеговина</territory>
+			<territory type="BB">Барбадос</territory>
+			<territory type="BD">Бангладеш</territory>
+			<territory type="BE">Бельгия</territory>
+			<territory type="BF">Буркина-Фасо</territory>
+			<territory type="BG">Болгария</territory>
+			<territory type="BH">Бәхрәйн</territory>
+			<territory type="BI">Бурунди</territory>
+			<territory type="BJ">Бенин</territory>
+			<territory type="BL">Сен-Бартелеми</territory>
+			<territory type="BM">Бермуд утрауҙары</territory>
+			<territory type="BN">Бруней</territory>
+			<territory type="BO">Боливия</territory>
+			<territory type="BQ">Карибтағы Нидерланд</territory>
+			<territory type="BR">Бразилия</territory>
+			<territory type="BS">Багам утрауҙары</territory>
+			<territory type="BT">Бутан</territory>
+			<territory type="BV">Буве утрауы</territory>
+			<territory type="BW">Ботсвана</territory>
+			<territory type="BY">Беларусь</territory>
+			<territory type="BZ">Белиз</territory>
+			<territory type="CA">Канада</territory>
+			<territory type="CC">Кокос утрауҙары</territory>
+			<territory type="CD">Конго - Киншаса</territory>
+			<territory type="CD" alt="variant">Конго (КДР)</territory>
+			<territory type="CF">Үҙәк Африка Республикаһы</territory>
+			<territory type="CG">Конго - Браззавиль</territory>
+			<territory type="CG" alt="variant">Конго Республикаһы</territory>
+			<territory type="CH">Швейцария</territory>
+			<territory type="CI">Кот-д’Ивуар</territory>
+			<territory type="CK">Кук утрауҙары</territory>
+			<territory type="CL">Чили</territory>
+			<territory type="CM">Камерун</territory>
+			<territory type="CN">Ҡытай</territory>
+			<territory type="CO">Колумбия</territory>
+			<territory type="CP">Клиппертон утрауы</territory>
+			<territory type="CQ">Сарк</territory>
+			<territory type="CR">Коста-Рика</territory>
+			<territory type="CU">Куба</territory>
+			<territory type="CV">Кабо-Верде</territory>
+			<territory type="CW">Кюрасао</territory>
+			<territory type="CX">Раштыуа Утрауы</territory>
+			<territory type="CY">Кипр</territory>
+			<territory type="CZ">Чехия</territory>
+			<territory type="CZ" alt="variant">Чех Республикаһы</territory>
+			<territory type="DE">Германия</territory>
+			<territory type="DG">Диего-Гарсия</territory>
+			<territory type="DJ">Джибути</territory>
+			<territory type="DK">Дания</territory>
+			<territory type="DM">Доминика</territory>
+			<territory type="DO">Доминикан Республикаһы</territory>
+			<territory type="DZ">Алжир</territory>
+			<territory type="EA">Сеута һәм Мелилья</territory>
+			<territory type="EC">Эквадор</territory>
+			<territory type="EE">Эстония</territory>
+			<territory type="EG">Мысыр</territory>
+			<territory type="EH">Көнбайыш Сахара</territory>
+			<territory type="ER">Эритрея</territory>
+			<territory type="ES">Испания</territory>
+			<territory type="ET">Эфиопия</territory>
+			<territory type="EU">Европа Берлеге</territory>
+			<territory type="EZ">Еврозона</territory>
+			<territory type="FI">Финляндия</territory>
+			<territory type="FJ">Фиджи</territory>
+			<territory type="FK">Фолкленд утрауҙары</territory>
+			<territory type="FK" alt="variant">Фолкленд (Мальвин) утрауҙары</territory>
+			<territory type="FM">Микронезия</territory>
+			<territory type="FO">Фарер утрауҙары</territory>
+			<territory type="FR">Франция</territory>
+			<territory type="GA">Габон</territory>
+			<territory type="GB">Бөйөк Британия</territory>
+			<territory type="GB" alt="short">Британия</territory>
+			<territory type="GD">Гренада</territory>
+			<territory type="GE">Грузия</territory>
+			<territory type="GF">Француз Гвианаһы</territory>
+			<territory type="GG">Гернси</territory>
+			<territory type="GH">Гана</territory>
+			<territory type="GI">Гибралтар</territory>
+			<territory type="GL">Гренландия</territory>
+			<territory type="GM">Гамбия</territory>
+			<territory type="GN">Гвинея</territory>
+			<territory type="GP">Гваделупа</territory>
+			<territory type="GQ">Экваториаль Гвинея</territory>
+			<territory type="GR">Греция</territory>
+			<territory type="GS">Көньяҡ Георгия һәм Көньяҡ Сандвич утрауҙары</territory>
+			<territory type="GT">Гватемала</territory>
+			<territory type="GU">Гуам</territory>
+			<territory type="GW">Гвинея-Бисау</territory>
+			<territory type="GY">Гайана</territory>
+			<territory type="HK">Гонконг, Ҡытай МАР-ы</territory>
+			<territory type="HK" alt="short">Гонконг</territory>
+			<territory type="HM">Херд һәм Макдональд утрауҙары</territory>
+			<territory type="HN">Гондурас</territory>
+			<territory type="HR">Хорватия</territory>
+			<territory type="HT">Гаити</territory>
+			<territory type="HU">Венгрия</territory>
+			<territory type="IC">Канар утрауҙары</territory>
+			<territory type="ID">Индонезия</territory>
+			<territory type="IE">Ирландия</territory>
+			<territory type="IL">Израиль</territory>
+			<territory type="IM">Мэн утрауы</territory>
+			<territory type="IN">Һиндостан</territory>
+			<territory type="IO">Британияның Һинд океанындағы биләмәһе</territory>
+			<territory type="IO" alt="chagos">Чагос архипелагы</territory>
+			<territory type="IQ">Ираҡ</territory>
+			<territory type="IR">Иран</territory>
+			<territory type="IS">Исландия</territory>
+			<territory type="IT">Италия</territory>
+			<territory type="JE">Джерси</territory>
+			<territory type="JM">Ямайка</territory>
+			<territory type="JO">Иордания</territory>
+			<territory type="JP">Япония</territory>
+			<territory type="KE">Кения</territory>
+			<territory type="KG">Ҡырғыҙстан</territory>
+			<territory type="KH">Камбоджа</territory>
+			<territory type="KI">Кирибати</territory>
+			<territory type="KM">Комор утрауҙары</territory>
+			<territory type="KN">Сент-Китс һәм Невис</territory>
+			<territory type="KP">Төньяҡ Корея</territory>
+			<territory type="KR">Көньяҡ Корея</territory>
+			<territory type="KW">Кувейт</territory>
+			<territory type="KY">Кайман утрауҙары</territory>
+			<territory type="KZ">Ҡаҙағстан</territory>
+			<territory type="LA">Лаос</territory>
+			<territory type="LB">Ливан</territory>
+			<territory type="LC">Сент-Люсия</territory>
+			<territory type="LI">Лихтенштейн</territory>
+			<territory type="LK">Шри-Ланка</territory>
+			<territory type="LR">Либерия</territory>
+			<territory type="LS">Лесото</territory>
+			<territory type="LT">Литва</territory>
+			<territory type="LU">Люксембург</territory>
+			<territory type="LV">Латвия</territory>
+			<territory type="LY">Ливия</territory>
+			<territory type="MA">Марокко</territory>
+			<territory type="MC">Монако</territory>
+			<territory type="MD">Молдова</territory>
+			<territory type="ME">Черногория</territory>
+			<territory type="MF">Сен-Мартен</territory>
+			<territory type="MG">Мадагаскар</territory>
+			<territory type="MH">Маршалл утрауҙары</territory>
+			<territory type="MK">Төньяҡ Македония</territory>
+			<territory type="ML">Мали</territory>
+			<territory type="MM">Мьянма (Бирма)</territory>
+			<territory type="MN">Монголия</territory>
+			<territory type="MO">Макао, Ҡытай МАР-ы</territory>
+			<territory type="MO" alt="short">Макао</territory>
+			<territory type="MP">Төньяҡ Мариан утрауҙары</territory>
+			<territory type="MQ">Мартиника</territory>
+			<territory type="MR">Мавритания</territory>
+			<territory type="MS">Монтсеррат</territory>
+			<territory type="MT">Мальта</territory>
+			<territory type="MU">Маврикий</territory>
+			<territory type="MV">Мальдив утрауҙары</territory>
+			<territory type="MW">Малави</territory>
+			<territory type="MX">Мексика</territory>
+			<territory type="MY">Малайзия</territory>
+			<territory type="MZ">Мозамбик</territory>
+			<territory type="NA">Намибия</territory>
+			<territory type="NC">Яңы Каледония</territory>
+			<territory type="NE">Нигер</territory>
+			<territory type="NF">Норфолк утрауы</territory>
+			<territory type="NG">Нигерия</territory>
+			<territory type="NI">Никарагуа</territory>
+			<territory type="NL">Нидерланд</territory>
+			<territory type="NO">Норвегия</territory>
+			<territory type="NP">Непал</territory>
+			<territory type="NR">Науру</territory>
+			<territory type="NU">Ниуэ</territory>
+			<territory type="NZ">Яңы Зеландия</territory>
+			<territory type="NZ" alt="variant">Аотеароа (Яңы Зеландия)</territory>
+			<territory type="OM">Оман</territory>
+			<territory type="PA">Панама</territory>
+			<territory type="PE">Перу</territory>
+			<territory type="PF">Француз Полинезияһы</territory>
+			<territory type="PG">Папуа – Яңы Гвинея</territory>
+			<territory type="PH">Филиппин</territory>
+			<territory type="PK">Пакистан</territory>
+			<territory type="PL">Польша</territory>
+			<territory type="PM">Сен-Пьер һәм Микелон</territory>
+			<territory type="PN">Питкэрн утрауҙары</territory>
+			<territory type="PR">Пуэрто-Рико</territory>
+			<territory type="PS">Фәләстин территориялары</territory>
+			<territory type="PS" alt="short">Фәләстин</territory>
+			<territory type="PT">Португалия</territory>
+			<territory type="PW">Палау</territory>
+			<territory type="PY">Парагвай</territory>
+			<territory type="QA">Катар</territory>
+			<territory type="QO">Тышҡы Океания</territory>
+			<territory type="RE">Реюньон</territory>
+			<territory type="RO">Румыния</territory>
+			<territory type="RS">Сербия</territory>
+			<territory type="RU">Рәсәй</territory>
+			<territory type="RW">Руанда</territory>
+			<territory type="SA">Сәғүд Ғәрәбстаны</territory>
+			<territory type="SB">Соломон утрауҙары</territory>
+			<territory type="SC">Сейшель утрауҙары</territory>
+			<territory type="SD">Судан</territory>
+			<territory type="SE">Швеция</territory>
+			<territory type="SG">Сингапур</territory>
+			<territory type="SH">Изге Елена утрауы</territory>
+			<territory type="SI">Словения</territory>
+			<territory type="SJ">Шпицберген һәм Ян-Майен</territory>
+			<territory type="SK">Словакия</territory>
+			<territory type="SL">Сьерра-Леоне</territory>
+			<territory type="SM">Сан-Марино</territory>
+			<territory type="SN">Сенегал</territory>
+			<territory type="SO">Сомали</territory>
+			<territory type="SR">Суринам</territory>
+			<territory type="SS">Көньяҡ Судан</territory>
+			<territory type="ST">Сан-Томе һәм Принсипи</territory>
+			<territory type="SV">Сальвадор</territory>
+			<territory type="SX">Синт-Мартен</territory>
+			<territory type="SY">Сүриә</territory>
+			<territory type="SZ">Эсватини</territory>
+			<territory type="SZ" alt="variant">Свазиленд</territory>
+			<territory type="TA">Тристан-да-Кунья</territory>
+			<territory type="TC">Төркс һәм Кайкос утрауҙары</territory>
+			<territory type="TD">Чад</territory>
+			<territory type="TF">Францияның Көньяҡ Биләмәләре</territory>
+			<territory type="TG">Того</territory>
+			<territory type="TH">Тайланд</territory>
+			<territory type="TJ">Тажикстан</territory>
+			<territory type="TK">Токелау</territory>
+			<territory type="TL">Тимор-Лесте</territory>
+			<territory type="TL" alt="variant">Көнсығыш Тимор</territory>
+			<territory type="TM">Төркмәнстан</territory>
+			<territory type="TN">Тунис</territory>
+			<territory type="TO">Тонга</territory>
+			<territory type="TR">Төркиә</territory>
+			<territory type="TT">Тринидад һәм Тобаго</territory>
+			<territory type="TV">Тувалу</territory>
+			<territory type="TW">Тайвань</territory>
+			<territory type="TZ">Танзания</territory>
+			<territory type="UA">Украина</territory>
+			<territory type="UG">Уганда</territory>
+			<territory type="UM">АҠШ-ның ситтәге утрауҙары</territory>
+			<territory type="UN">Берләшкән Милләттәр Ойошмаһы</territory>
+			<territory type="US">Америка Ҡушма Штаттары</territory>
+			<territory type="US" alt="short">АҠШ</territory>
+			<territory type="UY">Уругвай</territory>
+			<territory type="UZ">Үзбәкстан</territory>
+			<territory type="VA">Ватикан</territory>
+			<territory type="VC">Сент-Винсент һәм Гренадиндар</territory>
+			<territory type="VE">Венесуэла</territory>
+			<territory type="VG">Британия Виргин утрауҙары</territory>
+			<territory type="VI">АҠШ Виргин утрауҙары</territory>
+			<territory type="VN">Вьетнам</territory>
+			<territory type="VU">Вануату</territory>
+			<territory type="WF">Уоллис һәм Футуна</territory>
+			<territory type="WS">Самоа</territory>
+			<territory type="XA">псевдоакценттар</territory>
+			<territory type="XB">псевдо ике яҡлы</territory>
+			<territory type="XK">Косово</territory>
+			<territory type="YE">Йәмән</territory>
+			<territory type="YT">Майотта</territory>
+			<territory type="ZA">Көньяҡ Африка Республикаһы</territory>
+			<territory type="ZM">Замбия</territory>
+			<territory type="ZW">Зимбабве</territory>
+			<territory type="ZZ">Билдәһеҙ төбәк</territory>
+		</territories>
+		<variants>
+			<variant type="1901">традицион немец орфографияһы</variant>
+			<variant type="1994">Стандартлаштырылған резия орфографияһы</variant>
+			<variant type="1996">1996 йылғы немец орфографияһы</variant>
+			<variant type="1606NICT">1606 йылға тиклемге һуңғы урта быуат француз теле</variant>
+			<variant type="1694ACAD">Иртә яңы француз</variant>
+			<variant type="1959ACAD">академик</variant>
+			<variant type="ABL1943">1943 йылғы орфографик формулировка</variant>
+			<variant type="ALALC97" draft="unconfirmed">ALA-LC романлаштырыуы, 1997 йылғы баҫма</variant>
+			<variant type="ALUKU" draft="unconfirmed">Алуку диалекты</variant>
+			<variant type="AO1990" draft="unconfirmed">1990 йылғы португал теле орфография килешеүе</variant>
+			<variant type="BAKU1926">берҙәм төрки латин алфавиты</variant>
+			<variant type="BALANKA">Ании (баланка диалекты)</variant>
+			<variant type="BARLA">Кабувердьяну (барлавенто диалект төркөмө)</variant>
+			<variant type="BISKE">Сан-Джорджио/Била диалекты</variant>
+			<variant type="BOHORIC">Богорич алфавиты</variant>
+			<variant type="BOONT">Бунтлинг</variant>
+			<variant type="COLB1945" draft="unconfirmed">1945 йылғы португал-бразил орфография конвенцияһы</variant>
+			<variant type="DAJNKO" draft="unconfirmed">Дайнко алфавиты</variant>
+			<variant type="EKAVSK" draft="unconfirmed">Серб (экав әйтелеше)</variant>
+			<variant type="EMODENG" draft="unconfirmed">Иртә яңы инглиз</variant>
+			<variant type="FONIPA" draft="unconfirmed">Халыҡ-ара фонетик алфавит</variant>
+			<variant type="FONUPA" draft="unconfirmed">Урал фонетик алфавиты</variant>
+			<variant type="HEPBURN">Хепбёрн романлаштырыуы</variant>
+			<variant type="IJEKAVSK">Серб (иекав әйтелеше)</variant>
+			<variant type="KKCOR">дөйөм орфография</variant>
+			<variant type="KSCOR">Стандарт орфография</variant>
+			<variant type="LIPAW">Резия (липоваз диалекты)</variant>
+			<variant type="METELKO">Метелько алфавиты</variant>
+			<variant type="MONOTON">Монотоник</variant>
+			<variant type="NDYUKA">Ндьюка диалекты</variant>
+			<variant type="NEDIS">Натисоне диалекты</variant>
+			<variant type="NJIVA">Гнива/Нива диалекты</variant>
+			<variant type="NULIK">Хәҙерге волапюк</variant>
+			<variant type="OSOJS">Осеакко/Осояне диалекты</variant>
+			<variant type="OXENDICT">Оксфорд инглиз һүҙлеге орфографияһы</variant>
+			<variant type="PAMAKA">Памака диалекты</variant>
+			<variant type="PINYIN">пиньинь романизацияһы</variant>
+			<variant type="POLYTON">Политоник</variant>
+			<variant type="POSIX">компьютер</variant>
+			<variant type="REVISED">Үҙгәртелгән орфография</variant>
+			<variant type="RIGIK">Классик волапюк</variant>
+			<variant type="ROZAJ">Резия</variant>
+			<variant type="SAAHO">Сахо</variant>
+			<variant type="SCOTLAND">шотланд стандарт инглиз теле</variant>
+			<variant type="SCOUSE">скаус</variant>
+			<variant type="SOLBA">столвиццо/солбица диалекты</variant>
+			<variant type="SOTAV">Кабувердьяну (сотавенто диалект төркөмө)</variant>
+			<variant type="TARASK">тарашкевица орфографияһы</variant>
+			<variant type="UCCOR">берҙәм орфография</variant>
+			<variant type="UCRCOR">берҙәм үҙгәртелгән орфография</variant>
+			<variant type="UNIFON">унифон фонетик алфавиты</variant>
+			<variant type="VALENCIA">Валенсия</variant>
+			<variant type="WADEGILE">Уэйд-Джайлз романлаштырыуы</variant>
+		</variants>
+		<keys>
+			<key type="calendar">календарь</key>
+			<key type="cf">валюта форматы</key>
+			<key type="collation">теҙеү тәртибе</key>
+			<key type="currency">валюта</key>
+			<key type="em">эмодзи күренеше</key>
+			<key type="hc">сәғәт форматы (12 йәки 24 сәғәтлек)</key>
+			<key type="lb">юл күсереү стиле</key>
+			<key type="lw">һүҙҙәрҙе күсереү стиле</key>
+			<key type="ms">үлсәү системаһы</key>
+			<key type="numbers">һандар</key>
+			<key type="ss">ҡыҫҡартманан һуң һөйләмде бүлеү</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">будда календары</type>
+			<type key="calendar" type="buddhist" scope="core">будда</type>
+			<type key="calendar" type="chinese">ҡытай календары</type>
+			<type key="calendar" type="chinese" scope="core">ҡытай</type>
+			<type key="calendar" type="coptic">копт календары</type>
+			<type key="calendar" type="coptic" scope="core">копт</type>
+			<type key="calendar" type="dangi">данги календары</type>
+			<type key="calendar" type="dangi" scope="core">данги</type>
+			<type key="calendar" type="ethiopic">эфиоп календары</type>
+			<type key="calendar" type="ethiopic" scope="core">эфиоп</type>
+			<type key="calendar" type="ethiopic-amete-alem">эфиоп амете-алем календары</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">эфиоп (амете-алем)</type>
+			<type key="calendar" type="gregorian">григориан календары</type>
+			<type key="calendar" type="gregorian" scope="core">григориан</type>
+			<type key="calendar" type="hebrew">йәһүд календары</type>
+			<type key="calendar" type="hebrew" scope="core">йәһүд</type>
+			<type key="calendar" type="indian">Һиндостан милли календары</type>
+			<type key="calendar" type="indian" scope="core">Һиндостан милли</type>
+			<type key="calendar" type="islamic">һижри календарь</type>
+			<type key="calendar" type="islamic" scope="core">һижри</type>
+			<type key="calendar" type="islamic-civil">һижри календарь (таблицалы, граждандар эпохаһы)</type>
+			<type key="calendar" type="islamic-civil" scope="core">һижри (таблицалы, граждандар дәүере)</type>
+			<type key="calendar" type="islamic-rgsa">Һижри календарь (Сәғүд Ғәрәбстаны)</type>
+			<type key="calendar" type="islamic-tbla">һижри календарь (таблицалы, астрономик эпоха)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">һижри (таблицалы, астрономик дәүер)</type>
+			<type key="calendar" type="islamic-umalqura">һижри календарь (Үмм әл-Ҡура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">һижри (Үмм әл-Ҡура)</type>
+			<type key="calendar" type="iso8601">ISO-8601 календары</type>
+			<type key="calendar" type="japanese">япон календары</type>
+			<type key="calendar" type="japanese" scope="core">япон</type>
+			<type key="calendar" type="persian">фарсы календары</type>
+			<type key="calendar" type="persian" scope="core">фарсы</type>
+			<type key="calendar" type="roc">минго календары</type>
+			<type key="calendar" type="roc" scope="core">минго</type>
+			<type key="cf" type="account">бухгалтер валюта форматы</type>
+			<type key="cf" type="account" scope="core">бухгалтер</type>
+			<type key="cf" type="standard">стандарт валюта форматы</type>
+			<type key="cf" type="standard" scope="core">стандарт</type>
+			<type key="collation" type="compat">элекке теҙеү тәртибе (ярашлылыҡ өсөн)</type>
+			<type key="collation" type="compat" scope="core">ярашлылыҡ</type>
+			<type key="collation" type="dictionary">һүҙлексә теҙеү тәртибе</type>
+			<type key="collation" type="dictionary" scope="core">һүҙлексә</type>
+			<type key="collation" type="ducet">Стандарт Unicode теҙеү тәртибе</type>
+			<type key="collation" type="ducet" scope="core">Стандарт Unicode</type>
+			<type key="collation" type="emoji">эмодзи</type>
+			<type key="collation" type="eor">европа теҙеү ҡағиҙәләре</type>
+			<type key="collation" type="phonebook">телефон китабыса теҙеү тәртибе</type>
+			<type key="collation" type="phonebook" scope="core">телефон китабы</type>
+			<type key="collation" type="phonetic" scope="core">фонетик</type>
+			<type key="collation" type="pinyin">пиньинь теҙеү тәртибе</type>
+			<type key="collation" type="pinyin" scope="core">пиньинь</type>
+			<type key="collation" type="search">дөйөм маҡсатлы эҙләү</type>
+			<type key="collation" type="search" scope="core">эҙләү</type>
+			<type key="collation" type="searchjl">хангыль буйынса (баш тартынҡы менән) эҙләү</type>
+			<type key="collation" type="standard">ғәҙәти тәртип</type>
+			<type key="collation" type="standard" scope="core">ғәҙәти</type>
+			<type key="collation" type="stroke">һыҙыҡтар буйынса теҙеү тәртибе</type>
+			<type key="collation" type="stroke" scope="core">һыҙыҡтар буйынса</type>
+			<type key="collation" type="traditional">традицион теҙеү тәртибе</type>
+			<type key="collation" type="traditional" scope="core">традицион</type>
+			<type key="collation" type="unihan">радикал-һыҙыҡ теҙеү тәртибе</type>
+			<type key="collation" type="unihan" scope="core">радикал-һыҙыҡ</type>
+			<type key="collation" type="zhuyin">чжуинь теҙеү тәртибе</type>
+			<type key="collation" type="zhuyin" scope="core">чжуинь</type>
+			<type key="em" type="default" scope="core">стандарт</type>
+			<type key="em" type="emoji" scope="core">эмодзи</type>
+			<type key="em" type="text" scope="core">текст</type>
+			<type key="hc" type="h11">12 сәғәтлек формат (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 сәғәтлек (0–11)</type>
+			<type key="hc" type="h12">12 сәғәтлек формат (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 сәғәтлек (1–12)</type>
+			<type key="hc" type="h23">24 сәғәтлек формат (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 сәғәтлек (0–23)</type>
+			<type key="hc" type="h24">24 сәғәтлек формат (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 сәғәтлек (1–24)</type>
+			<type key="lb" type="loose">йомшаҡ юл күсереү</type>
+			<type key="lb" type="loose" scope="core">йомшаҡ</type>
+			<type key="lb" type="normal">ғәҙәти юл күсереү</type>
+			<type key="lb" type="normal" scope="core">ғәҙәти</type>
+			<type key="lb" type="strict">ҡаты юл күсереү</type>
+			<type key="lb" type="strict" scope="core">ҡаты</type>
+			<type key="lw" type="breakall" scope="core">барыһын да күсереү</type>
+			<type key="lw" type="keepall" scope="core">барыһын да һаҡлау</type>
+			<type key="lw" type="normal" scope="core">ғәҙәти стиль</type>
+			<type key="lw" type="phrase" scope="core">фразаларҙа һаҡлау</type>
+			<type key="ms" type="metric">метрик система</type>
+			<type key="ms" type="metric" scope="core">метрик</type>
+			<type key="ms" type="uksystem">Британия үлсәмдәр системаһы</type>
+			<type key="ms" type="uksystem" scope="core">Бөйөк Британия</type>
+			<type key="ms" type="ussystem">АҠШ үлсәү системаһы</type>
+			<type key="ms" type="ussystem" scope="core">АҠШ</type>
+			<type key="numbers" type="ahom">ахом цифрҙары</type>
+			<type key="numbers" type="arab">ғәрәп-һинд цифрҙары</type>
+			<type key="numbers" type="arabext">киңәйтелгән ғәрәп-һинд цифрҙары</type>
+			<type key="numbers" type="armn">әрмән һандары</type>
+			<type key="numbers" type="armnlow">әрмән бәләкәй һандары</type>
+			<type key="numbers" type="bali">бали цифрҙары</type>
+			<type key="numbers" type="beng">бенгал цифрҙары</type>
+			<type key="numbers" type="brah">брахми цифрҙары</type>
+			<type key="numbers" type="cakm">чакма цифрҙары</type>
+			<type key="numbers" type="cham">чам цифрҙары</type>
+			<type key="numbers" type="cyrl">кириллица һандары</type>
+			<type key="numbers" type="deva">деванагари цифрҙары</type>
+			<type key="numbers" type="diak">дивес акуру цифрҙары</type>
+			<type key="numbers" type="ethi">эфиоп һандары</type>
+			<type key="numbers" type="fullwide">тулы киңлектәге һандар</type>
+			<type key="numbers" type="gara">гарай цифрҙары</type>
+			<type key="numbers" type="geor">грузин цифрҙары</type>
+			<type key="numbers" type="gong">гунжала гонди цифрҙары</type>
+			<type key="numbers" type="gonm">масарам гонди цифрҙары</type>
+			<type key="numbers" type="grek">грек цифрҙары</type>
+			<type key="numbers" type="greklow">грек бәләкәй һандары</type>
+			<type key="numbers" type="gujr">гуджарати цифрҙары</type>
+			<type key="numbers" type="gukh">гурунг кхема цифрҙары</type>
+			<type key="numbers" type="guru">гурмукхи цифрҙары</type>
+			<type key="numbers" type="hanidec">ҡытай унлы цифрҙары</type>
+			<type key="numbers" type="hans">ябайлаштырылған ҡытай цифрҙары</type>
+			<type key="numbers" type="hansfin">ябайлаштырылған ҡытай финанс һандары</type>
+			<type key="numbers" type="hant">традицион ҡытай һандары</type>
+			<type key="numbers" type="hantfin">традицион ҡытай финанс һандары</type>
+			<type key="numbers" type="hebr">йәһүд һандары</type>
+			<type key="numbers" type="hmng">пахавх хмонг цифрҙары</type>
+			<type key="numbers" type="hmnp">ньякенг пуачуэ хмонг цифрҙары</type>
+			<type key="numbers" type="java">ява цифрҙары</type>
+			<type key="numbers" type="jpan">япон һандары</type>
+			<type key="numbers" type="jpanfin">япон финанс һандары</type>
+			<type key="numbers" type="kali">кайа ли цифрҙары</type>
+			<type key="numbers" type="kawi">кави цифрҙары</type>
+			<type key="numbers" type="khmr">кхмер цифрҙары</type>
+			<type key="numbers" type="knda">каннада цифрҙары</type>
+			<type key="numbers" type="krai">кират рай цифрҙары</type>
+			<type key="numbers" type="lana">тай тхам хора цифрҙары</type>
+			<type key="numbers" type="lanatham">тай тхам тхам цифрҙары</type>
+			<type key="numbers" type="laoo">лаос цифрҙары</type>
+			<type key="numbers" type="latn">ғәрәп цифрҙары</type>
+			<type key="numbers" type="lepc">лепча цифрҙары</type>
+			<type key="numbers" type="limb">лимбу цифрҙары</type>
+			<type key="numbers" type="mathbold">математик ҡалын цифрҙар</type>
+			<type key="numbers" type="mathdbl">математик ике һыҙыҡлы цифрҙар</type>
+			<type key="numbers" type="mathmono">математик монокиңлектәге цифрҙар</type>
+			<type key="numbers" type="mathsanb">математик ҡырҡылмаған ҡалын цифрҙар</type>
+			<type key="numbers" type="mathsans">математик ҡырҡылмаған цифрҙар</type>
+			<type key="numbers" type="mlym">малаялам цифрҙары</type>
+			<type key="numbers" type="modi">моди цифрҙары</type>
+			<type key="numbers" type="mong">монгол цифрҙары</type>
+			<type key="numbers" type="mroo">мро цифрҙары</type>
+			<type key="numbers" type="mtei">мейтей майек цифрҙары</type>
+			<type key="numbers" type="mymr">мьянма цифрҙары</type>
+			<type key="numbers" type="mymrepka">мьянма көнсығыш пво карен цифрҙары</type>
+			<type key="numbers" type="mymrpao">мьянма пао цифрҙары</type>
+			<type key="numbers" type="mymrshan">мьянма шан цифрҙары</type>
+			<type key="numbers" type="mymrtlng">мьянма тай лаинг цифрҙары</type>
+			<type key="numbers" type="nagm">наг мундари цифрҙары</type>
+			<type key="numbers" type="nkoo">н’ко цифрҙары</type>
+			<type key="numbers" type="olck">ол чики цифрҙары</type>
+			<type key="numbers" type="onao">ол онал цифрҙары</type>
+			<type key="numbers" type="orya">одиа цифрҙары</type>
+			<type key="numbers" type="osma">османия цифрҙары</type>
+			<type key="numbers" type="outlined">контурлы цифрҙар</type>
+			<type key="numbers" type="rohg">ханифи рохинджа цифрҙары</type>
+			<type key="numbers" type="roman">рим һандары</type>
+			<type key="numbers" type="romanlow">рим бәләкәй һандары</type>
+			<type key="numbers" type="saur">саураштра цифрҙары</type>
+			<type key="numbers" type="shrd">шарада цифрҙары</type>
+			<type key="numbers" type="sind">худавади цифрҙары</type>
+			<type key="numbers" type="sinh">сингал лит цифрҙары</type>
+			<type key="numbers" type="sora">сора сомпенг цифрҙары</type>
+			<type key="numbers" type="sund">сундан цифрҙары</type>
+			<type key="numbers" type="sunu">сунувар цифрҙары</type>
+			<type key="numbers" type="takr">такри цифрҙары</type>
+			<type key="numbers" type="talu">яңы тай луэ цифрҙары</type>
+			<type key="numbers" type="taml">традицион тамил цифрҙары</type>
+			<type key="numbers" type="tamldec">тамил цифрҙары</type>
+			<type key="numbers" type="telu">телугу цифрҙары</type>
+			<type key="numbers" type="thai">тай цифрҙары</type>
+			<type key="numbers" type="tibt">тибет цифрҙары</type>
+			<type key="numbers" type="tirh">тирхута цифрҙары</type>
+			<type key="numbers" type="tnsa">тангса цифрҙары</type>
+			<type key="numbers" type="tols">толонг сики цифрҙары</type>
+			<type key="numbers" type="vaii">ваи цифрҙары</type>
+			<type key="numbers" type="wara">варанг сити цифрҙары</type>
+			<type key="numbers" type="wcho">ванчо цифрҙары</type>
+			<type key="ss" type="none" scope="core">һүндерелгән</type>
+			<type key="ss" type="standard" scope="core">ҡабыҙылған</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">метрик</measurementSystemName>
+			<measurementSystemName type="UK">Бөйөк Британия</measurementSystemName>
+			<measurementSystemName type="US">АҠШ</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Тел: {0}</codePattern>
+			<codePattern type="script">Яҙыу: {0}</codePattern>
+			<codePattern type="territory">Төбәк: {0}</codePattern>
+		</codePatterns>
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[а ә б в г ғ д ҙ её ж з и й к ҡ л м н ң о ө п р с ҫ т у ү ф х һ ц ч ш щ ъ ы ь э ю я]</exemplarCharacters>
 		<exemplarCharacters type="index">[А Ә Б В Г Ғ Д Ҙ ЕЁ Ж З И Й К Ҡ Л М Н Ң О Ө П Р С Ҫ Т У Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
 	</characters>
+	<dates>
+		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">будда эраһы</era>
+					</eraNames>
+					<eraNarrow>
+						<era type="0" draft="unconfirmed">бэ</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, d MMMM y 'й'. G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMMM y 'й'. G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMM y 'й'. G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd.MM.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Gy" draft="unconfirmed">y 'й'. G</dateFormatItem>
+						<dateFormatItem id="GyMd" draft="unconfirmed">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E, dd.MM</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyM" draft="unconfirmed">MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd" draft="unconfirmed">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" draft="unconfirmed">E, dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM" draft="unconfirmed">MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd" draft="unconfirmed">E, d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">MMMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ" draft="unconfirmed">QQQ y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ" draft="unconfirmed">QQQQ y 'й'. G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G" draft="unconfirmed">MM.y GGGGG – MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">MM.y – MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM.y – MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">dd.MM.y GGGGG – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, dd.MM.y – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E, dd.MM.y G – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, dd.MM.y G – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, dd.MM.y G – E, dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G" draft="unconfirmed">MMM y 'й'. G – MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y 'йй'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">d MMM y 'й'. G – d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y 'йй'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E, d MMM y 'й'. G – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y 'йй'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">HH–HH 'сәғ'.</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="coptic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Тут</month>
+							<month type="2" draft="unconfirmed">Баба</month>
+							<month type="3" draft="unconfirmed">Хатор</month>
+							<month type="4" draft="unconfirmed">Киахк</month>
+							<month type="5" draft="unconfirmed">Тоба</month>
+							<month type="6" draft="unconfirmed">Амшир</month>
+							<month type="7" draft="unconfirmed">Барамхат</month>
+							<month type="8" draft="unconfirmed">Барамуда</month>
+							<month type="9" draft="unconfirmed">Башанс</month>
+							<month type="10" draft="unconfirmed">Паона</month>
+							<month type="11" draft="unconfirmed">Эпеп</month>
+							<month type="12" draft="unconfirmed">Месра</month>
+							<month type="13" draft="unconfirmed">Наси</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Тут</month>
+							<month type="2" draft="unconfirmed">Баба</month>
+							<month type="3" draft="unconfirmed">Хатор</month>
+							<month type="4" draft="unconfirmed">Киахк</month>
+							<month type="5" draft="unconfirmed">Тоба</month>
+							<month type="6" draft="unconfirmed">Амшир</month>
+							<month type="7" draft="unconfirmed">Барамхат</month>
+							<month type="8" draft="unconfirmed">Барамуда</month>
+							<month type="9" draft="unconfirmed">Башанс</month>
+							<month type="10" draft="unconfirmed">Паона</month>
+							<month type="11" draft="unconfirmed">Эпеп</month>
+							<month type="12" draft="unconfirmed">Месра</month>
+							<month type="13" draft="unconfirmed">Наси</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Тут</month>
+							<month type="2" draft="unconfirmed">Баба</month>
+							<month type="3" draft="unconfirmed">Хатор</month>
+							<month type="4" draft="unconfirmed">Киахк</month>
+							<month type="5" draft="unconfirmed">Тоба</month>
+							<month type="6" draft="unconfirmed">Амшир</month>
+							<month type="7" draft="unconfirmed">Барамхат</month>
+							<month type="8" draft="unconfirmed">Барамуда</month>
+							<month type="9" draft="unconfirmed">Башанс</month>
+							<month type="10" draft="unconfirmed">Паона</month>
+							<month type="11" draft="unconfirmed">Эпеп</month>
+							<month type="12" draft="unconfirmed">Месра</month>
+							<month type="13" draft="unconfirmed">Наси</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Тут</month>
+							<month type="2" draft="unconfirmed">Баба</month>
+							<month type="3" draft="unconfirmed">Хатор</month>
+							<month type="4" draft="unconfirmed">Киахк</month>
+							<month type="5" draft="unconfirmed">Тоба</month>
+							<month type="6" draft="unconfirmed">Амшир</month>
+							<month type="7" draft="unconfirmed">Барамхат</month>
+							<month type="8" draft="unconfirmed">Барамуда</month>
+							<month type="9" draft="unconfirmed">Башанс</month>
+							<month type="10" draft="unconfirmed">Паона</month>
+							<month type="11" draft="unconfirmed">Эпеп</month>
+							<month type="12" draft="unconfirmed">Месра</month>
+							<month type="13" draft="unconfirmed">Наси</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+			<calendar type="ethiopic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">мескерем</month>
+							<month type="2" draft="unconfirmed">текемт</month>
+							<month type="3" draft="unconfirmed">хедар</month>
+							<month type="4" draft="unconfirmed">тахсас</month>
+							<month type="5" draft="unconfirmed">тер</month>
+							<month type="6" draft="unconfirmed">йекатит</month>
+							<month type="7" draft="unconfirmed">мегабит</month>
+							<month type="8" draft="unconfirmed">миазиа</month>
+							<month type="9" draft="unconfirmed">генбот</month>
+							<month type="10" draft="unconfirmed">сене</month>
+							<month type="11" draft="unconfirmed">хамле</month>
+							<month type="12" draft="unconfirmed">нехассе</month>
+							<month type="13" draft="unconfirmed">пагумен</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">мескерем</month>
+							<month type="2" draft="unconfirmed">текемт</month>
+							<month type="3" draft="unconfirmed">хедар</month>
+							<month type="4" draft="unconfirmed">тахсас</month>
+							<month type="5" draft="unconfirmed">тер</month>
+							<month type="6" draft="unconfirmed">йекатит</month>
+							<month type="7" draft="unconfirmed">мегабит</month>
+							<month type="8" draft="unconfirmed">миазиа</month>
+							<month type="9" draft="unconfirmed">генбот</month>
+							<month type="10" draft="unconfirmed">сене</month>
+							<month type="11" draft="unconfirmed">хамле</month>
+							<month type="12" draft="unconfirmed">нехассе</month>
+							<month type="13" draft="unconfirmed">пагумен</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">мескерем</month>
+							<month type="2" draft="unconfirmed">текемт</month>
+							<month type="3" draft="unconfirmed">хедар</month>
+							<month type="4" draft="unconfirmed">тахсас</month>
+							<month type="5" draft="unconfirmed">тер</month>
+							<month type="6" draft="unconfirmed">йекатит</month>
+							<month type="7" draft="unconfirmed">мегабит</month>
+							<month type="8" draft="unconfirmed">миазиа</month>
+							<month type="9" draft="unconfirmed">генбот</month>
+							<month type="10" draft="unconfirmed">сене</month>
+							<month type="11" draft="unconfirmed">хамле</month>
+							<month type="12" draft="unconfirmed">нехассе</month>
+							<month type="13" draft="unconfirmed">пагумен</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">мескерем</month>
+							<month type="2" draft="unconfirmed">текемт</month>
+							<month type="3" draft="unconfirmed">хедар</month>
+							<month type="4" draft="unconfirmed">тахсас</month>
+							<month type="5" draft="unconfirmed">тер</month>
+							<month type="6" draft="unconfirmed">йекатит</month>
+							<month type="7" draft="unconfirmed">мегабит</month>
+							<month type="8" draft="unconfirmed">миазиа</month>
+							<month type="9" draft="unconfirmed">генбот</month>
+							<month type="10" draft="unconfirmed">сене</month>
+							<month type="11" draft="unconfirmed">хамле</month>
+							<month type="12" draft="unconfirmed">нехассе</month>
+							<month type="13" draft="unconfirmed">пагумен</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">Инкарнация эраһына тиклем</era>
+						<era type="1" draft="unconfirmed">Инкарнация эраһы</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">И.Э.Т.</era>
+						<era type="1" draft="unconfirmed">И.Э.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="unconfirmed">И.Э.Т.</era>
+						<era type="1" draft="unconfirmed">И.Э.</era>
+					</eraNarrow>
+				</eras>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y 'й'. G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y 'й'. G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y 'й'. G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd.MM.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">y 'й'. G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="H">HH 'сәғ'.</dateFormatItem>
+						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
+						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'сәғ'. v</dateFormatItem>
+						<dateFormatItem id="Md">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyM">MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y 'й'. G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y 'й'. G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">MM.y GGGGG – MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">MM.y – MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">MM.y – MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="G">dd.MM.y GGGGG – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, dd.MM.y G – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, dd.MM.y G – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, dd.MM.y G – E, dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y 'й'. G – MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y 'йй'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="G">d MMM y 'й'. G – d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y 'йй'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y 'й'. G – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y 'йй'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сәғ'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сәғ'. v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM.y – MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">MM.y – MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">dd.MM.y – dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, dd.MM.y – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, dd.MM.y – E, dd.MM.y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, dd.MM.y – E, dd.MM.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM – MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">MMM y 'й'. – MMM y 'й'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">d MMM y 'й'. – d MMM y 'й'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y 'й'. – E, d MMM y 'й'. G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM – MMMM y 'й'. G</greatestDifference>
+							<greatestDifference id="y">MMMM y 'й'. – MMMM y 'й'. G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ғин.</month>
+							<month type="2">фев.</month>
+							<month type="3">мар.</month>
+							<month type="4">апр.</month>
+							<month type="5">май</month>
+							<month type="6">июн.</month>
+							<month type="7">июл.</month>
+							<month type="8">авг.</month>
+							<month type="9">сент.</month>
+							<month type="10">окт.</month>
+							<month type="11">нояб.</month>
+							<month type="12">дек.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">Ғ</month>
+							<month type="2">Ф</month>
+							<month type="3">М</month>
+							<month type="4">А</month>
+							<month type="5">М</month>
+							<month type="6">И</month>
+							<month type="7">И</month>
+							<month type="8">А</month>
+							<month type="9">С</month>
+							<month type="10">О</month>
+							<month type="11">Н</month>
+							<month type="12">Д</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ғинуар</month>
+							<month type="2">февраль</month>
+							<month type="3">март</month>
+							<month type="4">апрель</month>
+							<month type="5">май</month>
+							<month type="6">июнь</month>
+							<month type="7">июль</month>
+							<month type="8">август</month>
+							<month type="9">сентябрь</month>
+							<month type="10">октябрь</month>
+							<month type="11">ноябрь</month>
+							<month type="12">декабрь</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ғин.</month>
+							<month type="2">фев.</month>
+							<month type="3">мар.</month>
+							<month type="4">апр.</month>
+							<month type="5">май</month>
+							<month type="6">июн.</month>
+							<month type="7">июл.</month>
+							<month type="8">авг.</month>
+							<month type="9">сент.</month>
+							<month type="10">окт.</month>
+							<month type="11">нояб.</month>
+							<month type="12">дек.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">Ғ</month>
+							<month type="2">Ф</month>
+							<month type="3">М</month>
+							<month type="4">А</month>
+							<month type="5">М</month>
+							<month type="6">И</month>
+							<month type="7">И</month>
+							<month type="8">А</month>
+							<month type="9">С</month>
+							<month type="10">О</month>
+							<month type="11">Н</month>
+							<month type="12">Д</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ғинуар</month>
+							<month type="2">февраль</month>
+							<month type="3">март</month>
+							<month type="4">апрель</month>
+							<month type="5">май</month>
+							<month type="6">июнь</month>
+							<month type="7">июль</month>
+							<month type="8">август</month>
+							<month type="9">сентябрь</month>
+							<month type="10">октябрь</month>
+							<month type="11">ноябрь</month>
+							<month type="12">декабрь</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">йәк.</day>
+							<day type="mon">дүш.</day>
+							<day type="tue">шиш.</day>
+							<day type="wed">шар.</day>
+							<day type="thu">кес.</day>
+							<day type="fri">йом.</day>
+							<day type="sat">шәм.</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">Й</day>
+							<day type="mon">Д</day>
+							<day type="tue">Ш</day>
+							<day type="wed">Ш</day>
+							<day type="thu">К</day>
+							<day type="fri">Й</day>
+							<day type="sat">Ш</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">йш</day>
+							<day type="mon">дш</day>
+							<day type="tue">шш</day>
+							<day type="wed">шр</day>
+							<day type="thu">кс</day>
+							<day type="fri">йм</day>
+							<day type="sat">шб</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">йәкшәмбе</day>
+							<day type="mon">дүшәмбе</day>
+							<day type="tue">шишәмбе</day>
+							<day type="wed">шаршамбы</day>
+							<day type="thu">кесаҙна</day>
+							<day type="fri">йома</day>
+							<day type="sat">шәмбе</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">йәк.</day>
+							<day type="mon">дүш.</day>
+							<day type="tue">шиш.</day>
+							<day type="wed">шар.</day>
+							<day type="thu">кес.</day>
+							<day type="fri">йом.</day>
+							<day type="sat">шәм.</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">Й</day>
+							<day type="mon">Д</day>
+							<day type="tue">Ш</day>
+							<day type="wed">Ш</day>
+							<day type="thu">К</day>
+							<day type="fri">Й</day>
+							<day type="sat">Ш</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">йш</day>
+							<day type="mon">дш</day>
+							<day type="tue">шш</day>
+							<day type="wed">шр</day>
+							<day type="thu">кс</day>
+							<day type="fri">йм</day>
+							<day type="sat">шб</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">йәкшәмбе</day>
+							<day type="mon">дүшәмбе</day>
+							<day type="tue">шишәмбе</day>
+							<day type="wed">шаршамбы</day>
+							<day type="thu">кесаҙна</day>
+							<day type="fri">йома</day>
+							<day type="sat">шәмбе</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1-се кв.</quarter>
+							<quarter type="2">2-се кв.</quarter>
+							<quarter type="3">3-сө кв.</quarter>
+							<quarter type="4">4-се кв.</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1-се квартал</quarter>
+							<quarter type="2">2-се квартал</quarter>
+							<quarter type="3">3-сө квартал</quarter>
+							<quarter type="4">4-се квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1-се кв.</quarter>
+							<quarter type="2">2-се кв.</quarter>
+							<quarter type="3">3-сө кв.</quarter>
+							<quarter type="4">4-се кв.</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1-се квартал</quarter>
+							<quarter type="2">2-се квартал</quarter>
+							<quarter type="3">3-сө квартал</quarter>
+							<quarter type="4">4-се квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<eras>
+					<eraNames>
+						<era type="0">беҙҙең эраға тиклем</era>
+						<era type="0" alt="variant">беҙҙең эраға тиклем</era>
+						<era type="1">беҙҙең эра</era>
+						<era type="1" alt="variant">беҙҙең эра</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">б.э.т.</era>
+						<era type="1">б.э.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">б.э.т.</era>
+						<era type="0" alt="variant">б.э.т.</era>
+						<era type="1">б.э.</era>
+						<era type="1" alt="variant">б.э.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>d MMMM, EEEE, y 'й'.</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM, y 'й'.</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM, y 'й'.</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">G y 'й'.</dateFormatItem>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM, G y 'й'.</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM, G y 'й'.</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">d MMM, E, G y 'й'.</dateFormatItem>
+						<dateFormatItem id="H">HH 'сәғ'.</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'сәғ'. v</dateFormatItem>
+						<dateFormatItem id="Md">dd.MM</dateFormatItem>
+						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM 'айының' W 'аҙнаһы'</dateFormatItem>
+						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMEd">dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM, y 'й'.</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM, y 'й'.</dateFormatItem>
+						<dateFormatItem id="yMMMEd">d MMM, E, y 'й'.</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM, y 'й'.</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ, y 'й'.</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ, y 'й'.</dateFormatItem>
+						<dateFormatItem id="yw" count="other">Y 'йылдың' w 'аҙнаһы'</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y 'й'. – G y 'й'.</greatestDifference>
+							<greatestDifference id="y">G y – y 'йй'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y – G dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y, E – G dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM, G y 'й'. – MMM, G y 'й'.</greatestDifference>
+							<greatestDifference id="M">MMM–MMM, G y 'й'.</greatestDifference>
+							<greatestDifference id="y">MMM, G y 'й'. – MMM, G y 'й'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM, G y 'й'.</greatestDifference>
+							<greatestDifference id="G">d MMM, G y 'й'. – d MMM, G y 'й'.</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, G y 'й'.</greatestDifference>
+							<greatestDifference id="y">d MMM, G y 'й'. – d MMM, G y 'й'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">d MMM, E, G y 'й'. – d MMM, E, G y 'й'.</greatestDifference>
+							<greatestDifference id="G">d MMM, E, G y 'й'. – d MMM, E, G y 'й'.</greatestDifference>
+							<greatestDifference id="M">d MMM, E – d MMM, E, G y 'й'.</greatestDifference>
+							<greatestDifference id="y">d MMM, E, G y 'й'. – d MMM, E, G y 'й'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="M">d MMM, E – d MMM, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">MMM–MMM, y 'й'.</greatestDifference>
+							<greatestDifference id="y">y 'й'., MMM – y 'й'., MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM, y 'й'.</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y 'й'.</greatestDifference>
+							<greatestDifference id="y">d MMM, y 'й'. – d MMM, y 'й'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">d MMM, E – d MMM, E, y 'й'.</greatestDifference>
+							<greatestDifference id="M">d MMM, E, – d MMM, E, y 'й'.</greatestDifference>
+							<greatestDifference id="y">d MMM, E, y 'й'. – d MMM, E, y 'й'.</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM–MMMM, y 'й'.</greatestDifference>
+							<greatestDifference id="y">MMMM, y 'й'. – MMMM, y 'й'.</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="hebrew">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">тишрей</month>
+							<month type="2" draft="unconfirmed">хешван</month>
+							<month type="3" draft="unconfirmed">кислев</month>
+							<month type="4" draft="unconfirmed">тевет</month>
+							<month type="5" draft="unconfirmed">шват</month>
+							<month type="6" draft="unconfirmed">адар I</month>
+							<month type="7" draft="unconfirmed">адар</month>
+							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
+							<month type="8" draft="unconfirmed">нисан</month>
+							<month type="9" draft="unconfirmed">ияр</month>
+							<month type="10" draft="unconfirmed">сиван</month>
+							<month type="11" draft="unconfirmed">таммуз</month>
+							<month type="12" draft="unconfirmed">ав</month>
+							<month type="13" draft="unconfirmed">элул</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">тишрей</month>
+							<month type="2" draft="unconfirmed">хешван</month>
+							<month type="3" draft="unconfirmed">кислев</month>
+							<month type="4" draft="unconfirmed">тевет</month>
+							<month type="5" draft="unconfirmed">шват</month>
+							<month type="6" draft="unconfirmed">адар I</month>
+							<month type="7" draft="unconfirmed">адар</month>
+							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
+							<month type="8" draft="unconfirmed">нисан</month>
+							<month type="9" draft="unconfirmed">ияр</month>
+							<month type="10" draft="unconfirmed">сиван</month>
+							<month type="11" draft="unconfirmed">таммуз</month>
+							<month type="12" draft="unconfirmed">ав</month>
+							<month type="13" draft="unconfirmed">элул</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">тишрей</month>
+							<month type="2" draft="unconfirmed">хешван</month>
+							<month type="3" draft="unconfirmed">кислев</month>
+							<month type="4" draft="unconfirmed">тевет</month>
+							<month type="5" draft="unconfirmed">шват</month>
+							<month type="6" draft="unconfirmed">адар I</month>
+							<month type="7" draft="unconfirmed">адар</month>
+							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
+							<month type="8" draft="unconfirmed">нисан</month>
+							<month type="9" draft="unconfirmed">ияр</month>
+							<month type="10" draft="unconfirmed">сиван</month>
+							<month type="11" draft="unconfirmed">таммуз</month>
+							<month type="12" draft="unconfirmed">ав</month>
+							<month type="13" draft="unconfirmed">элул</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">тишрей</month>
+							<month type="2" draft="unconfirmed">хешван</month>
+							<month type="3" draft="unconfirmed">кислев</month>
+							<month type="4" draft="unconfirmed">тевет</month>
+							<month type="5" draft="unconfirmed">шват</month>
+							<month type="6" draft="unconfirmed">адар I</month>
+							<month type="7" draft="unconfirmed">адар</month>
+							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
+							<month type="8" draft="unconfirmed">нисан</month>
+							<month type="9" draft="unconfirmed">ияр</month>
+							<month type="10" draft="unconfirmed">сиван</month>
+							<month type="11" draft="unconfirmed">таммуз</month>
+							<month type="12" draft="unconfirmed">ав</month>
+							<month type="13" draft="unconfirmed">элул</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">донъя яратылышынан</era>
+					</eraNames>
+				</eras>
+			</calendar>
+			<calendar type="indian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Чайтра</month>
+							<month type="2" draft="unconfirmed">Вайшакха</month>
+							<month type="3" draft="unconfirmed">Джьештха</month>
+							<month type="4" draft="unconfirmed">Ашадха</month>
+							<month type="5" draft="unconfirmed">Сравана</month>
+							<month type="6" draft="unconfirmed">Бхадра</month>
+							<month type="7" draft="unconfirmed">Асвина</month>
+							<month type="8" draft="unconfirmed">Картика</month>
+							<month type="9" draft="unconfirmed">Аграхаяна</month>
+							<month type="10" draft="unconfirmed">Пауша</month>
+							<month type="11" draft="unconfirmed">Магха</month>
+							<month type="12" draft="unconfirmed">Пхалгуна</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Чайтра</month>
+							<month type="2" draft="unconfirmed">Вайшакха</month>
+							<month type="3" draft="unconfirmed">Джьештха</month>
+							<month type="4" draft="unconfirmed">Ашадха</month>
+							<month type="5" draft="unconfirmed">Сравана</month>
+							<month type="6" draft="unconfirmed">Бхадра</month>
+							<month type="7" draft="unconfirmed">Асвина</month>
+							<month type="8" draft="unconfirmed">Картика</month>
+							<month type="9" draft="unconfirmed">Аграхаяна</month>
+							<month type="10" draft="unconfirmed">Пауша</month>
+							<month type="11" draft="unconfirmed">Магха</month>
+							<month type="12" draft="unconfirmed">Пхалгуна</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Чайтра</month>
+							<month type="2" draft="unconfirmed">Вайшакха</month>
+							<month type="3" draft="unconfirmed">Джьештха</month>
+							<month type="4" draft="unconfirmed">Ашадха</month>
+							<month type="5" draft="unconfirmed">Сравана</month>
+							<month type="6" draft="unconfirmed">Бхадра</month>
+							<month type="7" draft="unconfirmed">Асвина</month>
+							<month type="8" draft="unconfirmed">Картика</month>
+							<month type="9" draft="unconfirmed">Аграхаяна</month>
+							<month type="10" draft="unconfirmed">Пауша</month>
+							<month type="11" draft="unconfirmed">Магха</month>
+							<month type="12" draft="unconfirmed">Пхалгуна</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Чайтра</month>
+							<month type="2" draft="unconfirmed">Вайшакха</month>
+							<month type="3" draft="unconfirmed">Джьештха</month>
+							<month type="4" draft="unconfirmed">Ашадха</month>
+							<month type="5" draft="unconfirmed">Сравана</month>
+							<month type="6" draft="unconfirmed">Бхадра</month>
+							<month type="7" draft="unconfirmed">Асвина</month>
+							<month type="8" draft="unconfirmed">Картика</month>
+							<month type="9" draft="unconfirmed">Аграхаяна</month>
+							<month type="10" draft="unconfirmed">Пауша</month>
+							<month type="11" draft="unconfirmed">Магха</month>
+							<month type="12" draft="unconfirmed">Пхалгуна</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">Сака</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">Сака</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0" draft="unconfirmed">Сака</era>
+					</eraNarrow>
+				</eras>
+			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">мөх.</month>
+							<month type="2">сәф.</month>
+							<month type="3">раб. I</month>
+							<month type="4">раб. II</month>
+							<month type="5">йом. I</month>
+							<month type="6">йом. II</month>
+							<month type="7">рәж.</month>
+							<month type="8">шәғ.</month>
+							<month type="9">рам.</month>
+							<month type="10">шәү.</month>
+							<month type="11">зөлҡ.</month>
+							<month type="12">зөлх.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">мөхәррәм</month>
+							<month type="2">сәфәр</month>
+							<month type="3">рабиғүл әүүәл</month>
+							<month type="4">рабиғүл ахыр</month>
+							<month type="5">йомадиәл әүүәл</month>
+							<month type="6">йомадиәл ахыр</month>
+							<month type="7">рәжәб</month>
+							<month type="8">шәғбан</month>
+							<month type="9">рамаҙан</month>
+							<month type="10">шәүүәл</month>
+							<month type="11">зөлҡәғиҙә</month>
+							<month type="12">зөлхизә</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">мөх.</month>
+							<month type="2">сәф.</month>
+							<month type="3">раб. I</month>
+							<month type="4">раб. II</month>
+							<month type="5">йом. I</month>
+							<month type="6">йом. II</month>
+							<month type="7">рәж.</month>
+							<month type="8">шәғ.</month>
+							<month type="9">рам.</month>
+							<month type="10">шәү.</month>
+							<month type="11">зөлҡ.</month>
+							<month type="12">зөлх.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">мөхәррәм</month>
+							<month type="2">сәфәр</month>
+							<month type="3">рабиғүл әүүәл</month>
+							<month type="4">рабиғүл ахыр</month>
+							<month type="5">йомадиәл әүүәл</month>
+							<month type="6">йомадиәл ахыр</month>
+							<month type="7">рәжәб</month>
+							<month type="8">шәғбан</month>
+							<month type="9">рамаҙан</month>
+							<month type="10">шәүүәл</month>
+							<month type="11">зөлҡәғиҙә</month>
+							<month type="12">зөлхизә</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">Һижрәттән һуң</era>
+						<era type="1">Һижрәткә тиклем</era>
+					</eraNames>
+				</eras>
+			</calendar>
+			<calendar type="japanese">
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">Тайка (645–650)</era>
+						<era type="1" draft="unconfirmed">Хакути (650–671)</era>
+						<era type="2" draft="unconfirmed">Хакухо (672–686)</era>
+						<era type="3" draft="unconfirmed">Сючё (686–701)</era>
+						<era type="4" draft="unconfirmed">Тайхо (701–704)</era>
+						<era type="5" draft="unconfirmed">Кэйун (704–708)</era>
+						<era type="6" draft="unconfirmed">Вадо (708–715)</era>
+						<era type="7" draft="unconfirmed">Рэйки (715–717)</era>
+						<era type="8" draft="unconfirmed">Йоро (717–724)</era>
+						<era type="9" draft="unconfirmed">Дзинки (724–729)</era>
+						<era type="10" draft="unconfirmed">Тэмпьё (729–749)</era>
+						<era type="11" draft="unconfirmed">Тэмпьё-кампо (749–749)</era>
+						<era type="12" draft="unconfirmed">Тэмпьё-сёхо (749–757)</era>
+						<era type="13" draft="unconfirmed">Тэмпьё-ходзи (757–765)</era>
+						<era type="14" draft="unconfirmed">Тэмпьё-дзинго (765–767)</era>
+						<era type="15" draft="unconfirmed">Дзинго-кэйун (767–770)</era>
+						<era type="16" draft="unconfirmed">Хоки (770–780)</era>
+						<era type="17" draft="unconfirmed">Тэн-о (781–782)</era>
+						<era type="18" draft="unconfirmed">Энряку (782–806)</era>
+						<era type="19" draft="unconfirmed">Дайдо (806–810)</era>
+						<era type="20" draft="unconfirmed">Конин (810–824)</era>
+						<era type="21" draft="unconfirmed">Тэнтё (824–834)</era>
+						<era type="22" draft="unconfirmed">Дзёва (834–848)</era>
+						<era type="23" draft="unconfirmed">Кадзё (848–851)</era>
+						<era type="24" draft="unconfirmed">Ниндзю (851–854)</era>
+						<era type="25" draft="unconfirmed">Сайко (854–857)</era>
+						<era type="26" draft="unconfirmed">Тэн-ан (857–859)</era>
+						<era type="27" draft="unconfirmed">Дзёган (859–877)</era>
+						<era type="28" draft="unconfirmed">Гангё (877–885)</era>
+						<era type="29" draft="unconfirmed">Нинна (885–889)</era>
+						<era type="30" draft="unconfirmed">Кампё (889–898)</era>
+						<era type="31" draft="unconfirmed">Сётай (898–901)</era>
+						<era type="32" draft="unconfirmed">Энги (901–923)</era>
+						<era type="33" draft="unconfirmed">Энтё (923–931)</era>
+						<era type="34" draft="unconfirmed">Дзёхэй (931–938)</era>
+						<era type="35" draft="unconfirmed">Тэнгё (938–947)</era>
+						<era type="36" draft="unconfirmed">Тэнряку (947–957)</era>
+						<era type="37" draft="unconfirmed">Тэнтоку (957–961)</era>
+						<era type="38" draft="unconfirmed">Ова (961–964)</era>
+						<era type="39" draft="unconfirmed">Кохо (964–968)</era>
+						<era type="40" draft="unconfirmed">Анна (968–970)</era>
+						<era type="41" draft="unconfirmed">Тэнроку (970–973)</era>
+						<era type="42" draft="unconfirmed">Тэнъэн (973–976)</era>
+						<era type="43" draft="unconfirmed">Дзёген (976–978)</era>
+						<era type="44" draft="unconfirmed">Тэнгэн (978–983)</era>
+						<era type="45" draft="unconfirmed">Эйкан (983–985)</era>
+						<era type="46" draft="unconfirmed">Канна (985–987)</era>
+						<era type="47" draft="unconfirmed">Эйэн (987–989)</era>
+						<era type="48" draft="unconfirmed">Эйсо (989–990)</era>
+						<era type="49" draft="unconfirmed">Сёряку (990–995)</era>
+						<era type="50" draft="unconfirmed">Тётоку (995–999)</era>
+						<era type="51" draft="unconfirmed">Тёхо (999–1004)</era>
+						<era type="52" draft="unconfirmed">Канко (1004–1012)</era>
+						<era type="53" draft="unconfirmed">Тёва (1012–1017)</era>
+						<era type="54" draft="unconfirmed">Каннин (1017–1021)</era>
+						<era type="55" draft="unconfirmed">Дзиан (1021–1024)</era>
+						<era type="56" draft="unconfirmed">Мандзю (1024–1028)</era>
+						<era type="57" draft="unconfirmed">Тёген (1028–1037)</era>
+						<era type="58" draft="unconfirmed">Тёряку (1037–1040)</era>
+						<era type="59" draft="unconfirmed">Тёкю (1040–1044)</era>
+						<era type="60" draft="unconfirmed">Кантоку (1044–1046)</era>
+						<era type="61" draft="unconfirmed">Эйсё (1046–1053)</era>
+						<era type="62" draft="unconfirmed">Тэнги (1053–1058)</era>
+					</eraNames>
+				</eras>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>эра</displayName>
+			</field>
+			<field type="era-short">
+				<displayName>эра</displayName>
+			</field>
+			<field type="era-narrow">
+				<displayName>эра</displayName>
+			</field>
+			<field type="year">
+				<displayName>йыл</displayName>
+				<relative type="-1">былтыр</relative>
+				<relative type="0">быйыл</relative>
+				<relative type="1">киләһе йылда</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йылдан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йыл элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>й.</displayName>
+				<relative type="-1">былтыр</relative>
+				<relative type="0">быйыл</relative>
+				<relative type="1">киләһе йылда</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йылдан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йыл элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>й.</displayName>
+				<relative type="-1">былтыр</relative>
+				<relative type="0">быйыл</relative>
+				<relative type="1">киләһе йылда</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йылдан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йыл элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>квартал</displayName>
+				<relative type="-1">үткән кварталда</relative>
+				<relative type="0">был кварталда</relative>
+				<relative type="1">киләһе кварталда</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} кварталдан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} квартал элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>кв.</displayName>
+				<relative type="-1">үткән кв.</relative>
+				<relative type="0">был кв.</relative>
+				<relative type="1">киләһе кв.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} кв. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} кв. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>кв.</displayName>
+				<relative type="-1">үткән кв.</relative>
+				<relative type="0">был кв.</relative>
+				<relative type="1">киләһе кв.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} кв. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} кв. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>ай</displayName>
+				<relative type="-1">үткән айҙа</relative>
+				<relative type="0">был айҙа</relative>
+				<relative type="1">киләһе айҙа</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} айҙан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ай элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>ай</displayName>
+				<relative type="-1">үткән айҙа</relative>
+				<relative type="0">был айҙа</relative>
+				<relative type="1">киләһе айҙа</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} айҙан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ай элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>ай</displayName>
+				<relative type="-1">үткән айҙа</relative>
+				<relative type="0">был айҙа</relative>
+				<relative type="1">киләһе айҙа</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} айҙан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ай элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>аҙна</displayName>
+				<relative type="-1">үткән аҙнала</relative>
+				<relative type="0">был аҙнала</relative>
+				<relative type="1">киләһе аҙнала</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} аҙнанан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} аҙна элек</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>{0} аҙнаһында</relativePeriod>
+			</field>
+			<field type="week-short">
+				<displayName>аҙна</displayName>
+				<relative type="-1">үткән аҙнала</relative>
+				<relative type="0">был аҙнала</relative>
+				<relative type="1">киләһе аҙнала</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} аҙнанан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} аҙн. элек</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>{0} аҙнаһында</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<displayName>аҙна</displayName>
+				<relative type="-1">үткән аҙнала</relative>
+				<relative type="0">был аҙнала</relative>
+				<relative type="1">киләһе аҙнала</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} аҙнанан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} аҙна элек</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>{0} аҙнаһында</relativePeriod>
+			</field>
+			<field type="weekOfMonth">
+				<displayName>ай аҙнаһы</displayName>
+			</field>
+			<field type="weekOfMonth-short">
+				<displayName>ай аҙн.</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName>ай аҙн.</displayName>
+			</field>
+			<field type="day">
+				<displayName>көн</displayName>
+				<relative type="-1">кисә</relative>
+				<relative type="0">бөгөн</relative>
+				<relative type="1">иртәгә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} көндән</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} көн элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>көн</displayName>
+				<relative type="-1">кисә</relative>
+				<relative type="0">бөгөн</relative>
+				<relative type="1">иртәгә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} көндән</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} көн элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>көн</displayName>
+				<relative type="-1">кисә</relative>
+				<relative type="0">бөгөн</relative>
+				<relative type="1">иртәгә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} көндән</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} көн элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayOfYear">
+				<displayName>йыл көнө</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName>йыл көнө</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName>йыл көнө</displayName>
+			</field>
+			<field type="weekday">
+				<displayName>аҙна көнө</displayName>
+			</field>
+			<field type="weekday-short">
+				<displayName>аҙна көнө</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName>аҙна көнө</displayName>
+			</field>
+			<field type="weekdayOfMonth">
+				<displayName>айҙың аҙна көнө</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName>айҙ. аҙн. к.</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName>айҙ. аҙн. к.</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">үткән йәкшәмбелә</relative>
+				<relative type="0">был йәкшәмбелә</relative>
+				<relative type="1">киләһе йәкшәмбелә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йәкшәмбенән һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йәкшәмбе элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">үткән йәк.</relative>
+				<relative type="0">был йәк.</relative>
+				<relative type="1">киләһе йәк.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йәк. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йәк. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">үткән йш</relative>
+				<relative type="0">был йш</relative>
+				<relative type="1">киләһе йш</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йш һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йш элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon">
+				<relative type="-1">үткән дүшәмбелә</relative>
+				<relative type="0">был дүшәмбелә</relative>
+				<relative type="1">киләһе дүшәмбелә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} дүшәмбенән һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} дүшәмбе элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">үткән дүш.</relative>
+				<relative type="0">был дүш.</relative>
+				<relative type="1">киләһе дүш.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} дүш. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} дүш. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">үткән дш</relative>
+				<relative type="0">был дш</relative>
+				<relative type="1">киләһе дш</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} дш һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} дш элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue">
+				<relative type="-1">үткән шишәмбелә</relative>
+				<relative type="0">был шишәмбелә</relative>
+				<relative type="1">киләһе шишәмбелә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шишәмбенән һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шишәмбелә элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">үткән шиш.</relative>
+				<relative type="0">был шиш.</relative>
+				<relative type="1">киләһе шиш.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шиш. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шиш. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">үткән шш</relative>
+				<relative type="0">был шш</relative>
+				<relative type="1">киләһе шш</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шш һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шш элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed">
+				<relative type="-1">үткән шаршамбыла</relative>
+				<relative type="0">был шаршамбыла</relative>
+				<relative type="1">киләһе шаршамбыла</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шаршамбынан һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шаршамбы элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">үткән шар.</relative>
+				<relative type="0">был шар.</relative>
+				<relative type="1">киләһе шар.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шар. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шар. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">үткән шр</relative>
+				<relative type="0">был шр</relative>
+				<relative type="1">киләһе шр</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шр һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шр элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu">
+				<relative type="-1">үткән кесаҙнала</relative>
+				<relative type="0">был кесаҙнала</relative>
+				<relative type="1">киләһе кесаҙнала</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} кесаҙнанан һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} кесаҙна элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">үткән кес.</relative>
+				<relative type="0">был кес.</relative>
+				<relative type="1">киләһе кес.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} кес. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} кес. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">үткән кс</relative>
+				<relative type="0">был кс</relative>
+				<relative type="1">киләһе кс</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} кс һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} кс элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri">
+				<relative type="-1">үткән йомала</relative>
+				<relative type="0">был йомала</relative>
+				<relative type="1">киләһе йомала</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йоманан һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йома элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">үткән йом.</relative>
+				<relative type="0">был йом.</relative>
+				<relative type="1">киләһе йом.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йом. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йом. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">үткән йм</relative>
+				<relative type="0">был йм</relative>
+				<relative type="1">киләһе йм</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} йм һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} йм элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat">
+				<relative type="-1">үткән шәмбелә</relative>
+				<relative type="0">был шәмбелә</relative>
+				<relative type="1">киләһе шәмбелә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шәмбенән һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шәмбе элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">үткән шәм.</relative>
+				<relative type="0">был шәм.</relative>
+				<relative type="1">киләһе шәм.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шәм. һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шәм. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">үткән шб</relative>
+				<relative type="0">был шб</relative>
+				<relative type="1">киләһе шб</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} шб һуң</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} шб элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayperiod-short">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="hour">
+				<displayName>сәғәт</displayName>
+				<relative type="0">был сәғәттә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} сәғәттән</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} сәғәт элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>сәғ.</displayName>
+				<relative type="0">был сәғәттә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} сәғәттән</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} сәғ. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>сәғ</displayName>
+				<relative type="0">был сәғәттә</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} сәғәттән</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} сәғ. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>минут</displayName>
+				<relative type="0">был минутта</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} минуттан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} минут элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>мин.</displayName>
+				<relative type="0">был минутта</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} минуттан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} мин. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>мин</displayName>
+				<relative type="0">был минутта</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} минуттан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} мин. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>секунд</displayName>
+				<relative type="0">хәҙер</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} секундтан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} секунд элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>сек.</displayName>
+				<relative type="0">хәҙер</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} секундтан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} сек. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>сек</displayName>
+				<relative type="0">хәҙер</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">{0} секундтан</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} сек. элек</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>сәғәт бүлкәте</displayName>
+			</field>
+			<field type="zone-short">
+				<displayName>бүлкәт</displayName>
+			</field>
+			<field type="zone-narrow">
+				<displayName>бүлкәт</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat>{0} ваҡыты</regionFormat>
+			<regionFormat type="daylight">{0} йәйге ваҡыты</regionFormat>
+			<regionFormat type="standard">{0} стандарт ваҡыты</regionFormat>
+			<zone type="Etc/UTC">
+				<long>
+					<standard>Координацияланған универсаль ваҡыт</standard>
+				</long>
+			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Билдәһеҙ урын</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>Андорра</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Дубай</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Кабул</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>Антигуа</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>Ангилья</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Тирана</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>Ереван</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>Луанда</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Ротера станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Палмер</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Тролль станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Сёва станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Моусон станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>Дейвис</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Восток станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Кейси станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Дюмон-д’Юрвиль станцияһы</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Мак-Мердо станцияһы</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Рио-Гальегос</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>Мендоса</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>Сан-Хуан</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>Ушуая</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>Ла-Риоха</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>Сан-Луис</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>Катамарка</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Сальта</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>Жужуй</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Тукуман</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Кордова</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>Буэнос-Айрес</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>Паго-Паго</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>Вена</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>Перт</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>Юкла</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>Дарвин</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>Аделаида</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>Брокен-Хилл</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>Мельбурн</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>Хобарт</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>Линдеман</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>Сидней</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>Брисбен</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Маккуори утрауы</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Лорд-Хау утрауы</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>Аруба</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>Мариехамн</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>Баҡы</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>Сараево</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>Барбадос</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>Дакка</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>Брюссель</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>Уагадугу</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>София</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>Бәхрәйн</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>Бужумбура</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>Порто-Ново</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Сен-Бартелеми</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>Бермуд</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>Бруней</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>Ла-Пас</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>Кралендейк</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Эйрунепе</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>Риу-Бранку</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>Порту-Велью</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>Боа-Виста</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>Манаус</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Куяба</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Сантарен</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>Кампу-Гранди</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Белен</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Арагуаина</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>Сан-Паулу</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>Баия</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>Форталеза</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Масейо</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>Ресифи</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Фернанду-ди-Норонья</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>Нассау</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>Тхимпху</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Габороне</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>Минск</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>Белиз</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>Доусон</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>Уайтхорс</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>Инувик</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>Ванкувер</exemplarCity>
+			</zone>
+			<zone type="America/Fort_Nelson">
+				<exemplarCity>Форт Нельсон</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>Доусон-Крик</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>Крестон</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>Эдмонтон</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>Свифт-Керрент</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>Кеймбридж-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>Регина</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>Виннипег</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>Резольют</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>Ранкин-Инлет</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Атикокан</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>Торонто</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>Икалуит</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>Монктон</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>Галифакс</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>Гус-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>Глейс-Бей</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>Блан-Саблон</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>Сент-Джонс</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Кокос утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>Киншаса</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>Лубумбаши</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>Банги</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>Браззавиль</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>Цюрих</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>Абиджан</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>Раротонга</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Пасха утрауы</exemplarCity>
+			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Койхайке</exemplarCity>
+			</zone>
+			<zone type="America/Punta_Arenas">
+				<exemplarCity>Пунта-Аренас</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>Сантьяго</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>Дуала</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Өрөмсө</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Шанхай</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Богота</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>Коста-Рика</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Гавана</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>Кабо-Верде</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Кюрасао</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Раштыуа утрауы</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>Никосия</exemplarCity>
+			</zone>
+			<zone type="Asia/Famagusta">
+				<exemplarCity>Фамагуста</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Прага</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Бүзинген</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>Берлин</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>Джибути</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>Копенгаген</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>Доминика</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>Санто-Доминго</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>Алжир</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Галапагос утрауҙары</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>Гуаякиль</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>Таллин</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>Ҡаһирә</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>Эль-Аюн</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Асмэра</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Канар утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>Сеута</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Мадрид</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>Аддис-Абеба</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>Хельсинки</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>Фиджи</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>Стэнли</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Трук</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Понпеи</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>Косрае</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Фарер утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>Париж</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>Либревиль</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>Бөйөк Британия йәйге ваҡыты</daylight>
+				</long>
+				<exemplarCity>Лондон</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>Гренада</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Тбилиси</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>Кайенна</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>Гернси</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>Аккра</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>Гибралтар</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>Туле</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Нуук</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Скорсбисунн</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>Денмарксхавн</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Банжул</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>Конакри</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>Гваделупа</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>Малабо</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>Афина</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>Көньяҡ Георгия</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>Гватемала</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>Гуам</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>Бисау</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>Гайана</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>Гонконг</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>Тегусигальпа</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>Загреб</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>Порт-о-Пренс</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>Будапешт</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>Джакарта</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>Понтианак</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>Макасар</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>Джаяпура</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>Ирландия стандарт ваҡыты</daylight>
+				</long>
+				<exemplarCity>Дублин</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>Иерусалим</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>Мэн утрауы</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Калькутта</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Чагос</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>Бағдад</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>Тәһран</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Рейкьявик</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>Рим</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>Джерси</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>Ямайка</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>Амман</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Токио</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>Найроби</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>Бешкәк</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>Пномпень</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Кантон утрауы</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>Киритимати</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>Тарава</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Комор утрауҙары</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>Сент-Китс</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Пхеньян</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Сеул</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>Кувейт</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>Кайман утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Аҡтау</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>Уральск</exemplarCity>
+			</zone>
+			<zone type="Asia/Atyrau">
+				<exemplarCity>Атырау</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>Аҡтүбә</exemplarCity>
+			</zone>
+			<zone type="Asia/Qostanay">
+				<exemplarCity>Ҡостанай</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Ҡыҙылурҙа</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>Алматы</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>Вьентьян</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>Бейрут</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>Сент-Люсия</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>Вадуц</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>Коломбо</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>Монровия</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>Масеру</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Вильнюс</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>Люксембург</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>Рига</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Триполи</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>Касабланка</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>Монако</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Кишинев</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>Подгорица</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>Мариго</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>Антананариву</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Кваджалейн</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>Маджуро</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>Скопье</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>Бамако</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>Янгон</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Ховд</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Улан-Батор</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Макао</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>Сайпан</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Мартиника</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>Нуакшот</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>Монтсеррат</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>Мальта</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>Маврикий</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>Мальдив утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>Блантайр</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>Тихуана</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>Эрмосильо</exemplarCity>
+			</zone>
+			<zone type="America/Ciudad_Juarez">
+				<exemplarCity>Сьюдад-Хуарес</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Масатлан</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>Чиуауа</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>Баия-де-Бандерас</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>Охинага</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>Монтеррей</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Мехико</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>Матаморос</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>Мерида</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>Канкун</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>Куала-Лумпур</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>Кучинг</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>Мапуту</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>Виндхук</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Нумеа</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>Ниамей</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Норфолк утрауы</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>Лагос</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>Манагуа</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>Амстердам</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>Осло</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Катманду</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>Науру</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>Ниуэ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Чатем утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>Окленд</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>Маскат</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>Панама</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>Лима</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>Таити</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Маркиз утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>Гамбье утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>Порт-Морсби</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>Бугенвиль</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>Манила</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>Карачи</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>Варшава</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Сен-Пьер</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Питкэрн утрауҙары</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>Пуэрто-Рико</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>Газа</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>Хеврон</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>Азор утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Мадейра</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>Лиссабон</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>Палау</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Асунсьон</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>Катар</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Реюньон</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>Бухарест</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Белград</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>Калининград</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>Мәскәү</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>Волгоград</exemplarCity>
+			</zone>
+			<zone type="Europe/Saratov">
+				<exemplarCity>Һарытау</exemplarCity>
+			</zone>
+			<zone type="Europe/Astrakhan">
+				<exemplarCity>Әстерхан</exemplarCity>
+			</zone>
+			<zone type="Europe/Ulyanovsk">
+				<exemplarCity>Ульяновск</exemplarCity>
+			</zone>
+			<zone type="Europe/Kirov">
+				<exemplarCity>Киров</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>Һамар</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>Екатеринбург</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>Омск</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>Новосибирск</exemplarCity>
+			</zone>
+			<zone type="Asia/Barnaul">
+				<exemplarCity>Барнаул</exemplarCity>
+			</zone>
+			<zone type="Asia/Tomsk">
+				<exemplarCity>Томск</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>Новокузнецк</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>Красноярск</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>Иркутск</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Чита</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>Якутск</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>Владивосток</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Хандыга</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Сахалин</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>Усть-Нера</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>Магадан</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>Среднеколымск</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>Камчатка</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>Анадырь</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>Кигали</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>Эр-Рияд</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>Гуадалканал</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Маэ</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>Хартум</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>Стокгольм</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>Сингапур</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>Изге Елена утрауы</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Любляна</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>Лонгйир</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>Братислава</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>Фритаун</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>Сан-Марино</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>Дакар</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>Могадишо</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>Парамарибо</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>Джуба</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>Сан-Томе</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>Сальвадор</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Лоуэр-Принс-Куотер</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>Дәмәшк</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>Мбабане</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>Гранд-Терк</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>Нджамена</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Кергулен утрауҙары</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Ломе</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>Бангкок</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>Дүшәнбе</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>Факаофо</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>Дили</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>Ашхабад</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>Тунис</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>Тонгатапу</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>Истанбул</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>Порт-оф-Спейн</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>Фунафути</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>Тайпей</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>Дар-эс-Салам</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Киев</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Симферополь</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>Кампала</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Мидуэй атоллы</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Уэйк утрауы</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>Адак</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Ном</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>Анкоридж</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Якутат</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>Ситка</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>Джуно</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>Метлакатла</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>Лос-Анджелес</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>Бойсе</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>Финикс</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>Денвер</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Бойла, Төньяҡ Дакота</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>Нью-Салем, Төньяк Дакота</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>Үҙәк, Төньяҡ Дакота</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>Чикаго</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>Меномини</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>Винсеннес, Индиана</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>Питерсберг, Индиана</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>Телл-Сити</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>Нокс, Индиана</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>Уинамак, Индиана</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>Маренго, Индиана</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>Индианаполис</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>Луисвилл</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>Вевей, Индиана</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>Монтиселло, Кентукки</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>Детройт</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>Нью-Йорк</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>Монтевидео</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>Сәмәрҡәнд</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>Ташкент</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>Ватикан</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>Сент-Винсент</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>Каракас</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>Тортола</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>Сент-Томас</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Хошимин</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>Эфате</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Уоллис һәм Футуна</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>Апиа</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>Аден</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>Майотта</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>Йоханнесбург</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>Лусака</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>Хараре</exemplarCity>
+			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>Акри ваҡыты</generic>
+					<standard>Акри стандарт ваҡыты</standard>
+					<daylight>Акри йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>Афғанстан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>Үҙәк Африка ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>Көнсығыш Африка ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>Көньяҡ Африка стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<standard>Көнбайыш Африка ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>Аляска ваҡыты</generic>
+					<standard>Аляска стандарт ваҡыты</standard>
+					<daylight>Аляска йәйге ваҡыты</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">AKT</generic>
+					<standard draft="contributed">AKST</standard>
+					<daylight draft="contributed">AKST</daylight>
+				</short>
+			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>Алматы ваҡыты</generic>
+					<standard>Алматы стандарт ваҡыты</standard>
+					<daylight>Алматы йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>Амазон ваҡыты</generic>
+					<standard>Амазон стандарт ваҡыты</standard>
+					<daylight>Амазон йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>Үҙәк Америка ваҡыты</generic>
+					<standard>Үҙәк Америка стандарт ваҡыты</standard>
+					<daylight>Үҙәк Америка йәйге ваҡыты</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">CT</generic>
+					<standard draft="contributed">CST</standard>
+					<daylight draft="contributed">CDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>Көнсығыш Америка ваҡыты</generic>
+					<standard>Көнсығыш Америка стандарт ваҡыты</standard>
+					<daylight>Көнсығыш Америка йәйге ваҡыты</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">ET</generic>
+					<standard draft="contributed">EST</standard>
+					<daylight draft="contributed">EDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>Төньяҡ Америка Тау ваҡыты</generic>
+					<standard>Төньяҡ Америка Тау стандарт ваҡыты</standard>
+					<daylight>Төньяҡ Америка Тау йәйге ваҡыты</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">MT</generic>
+					<standard draft="contributed">MST</standard>
+					<daylight draft="contributed">MDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>Тымыҡ океан ваҡыты</generic>
+					<standard>Тымыҡ океан стандарт ваҡыты</standard>
+					<daylight>Тымыҡ океан йәйге ваҡыты</daylight>
+				</long>
+				<short>
+					<generic draft="contributed">PT</generic>
+					<standard draft="contributed">PST</standard>
+					<daylight draft="contributed">PDT</daylight>
+				</short>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>Анадырь ваҡыты</generic>
+					<standard>Анадырь стандарт ваҡыты</standard>
+					<daylight>Анадырь йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>Самоа ваҡыты</generic>
+					<standard>Самоа стандарт ваҡыты</standard>
+					<daylight>Самоа йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>Аҡтау ваҡыты</generic>
+					<standard>Аҡтау стандарт ваҡыты</standard>
+					<daylight>Аҡтау йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>Аҡтүбә ваҡыты</generic>
+					<standard>Аҡтүбә стандарт ваҡыты</standard>
+					<daylight>Аҡтүбә йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>Сәғүд Ғәрәбстаны ваҡыты</generic>
+					<standard>Сәғүд Ғәрәбстаны стандарт ваҡыты</standard>
+					<daylight>Сәғүд Ғәрәбстаны йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>Аргентина ваҡыты</generic>
+					<standard>Аргентина стандарт ваҡыты</standard>
+					<daylight>Аргентина йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>Көнбайыш Аргентина ваҡыты</generic>
+					<standard>Көнбайыш Аргентина стандарт ваҡыты</standard>
+					<daylight>Көнбайыш Аргентина йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>Әрмәнстан ваҡыты</generic>
+					<standard>Әрмәнстан стандарт ваҡыты</standard>
+					<daylight>Әрмәнстан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>Атлантик ваҡыты</generic>
+					<standard>Атлантик стандарт ваҡыты</standard>
+					<daylight>Атлантик йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>Үҙәк Австралия ваҡыты</generic>
+					<standard>Үҙәк Австралия стандарт ваҡыты</standard>
+					<daylight>Үҙәк Австралия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>Үҙәк Австралия көнбайыш ваҡыты</generic>
+					<standard>Үҙәк Австралия көнбайыш стандарт ваҡыты</standard>
+					<daylight>Үҙәк Австралия көнбайыш йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>Көнсығыш Австралия ваҡыты</generic>
+					<standard>Көнсығыш Австралия стандарт ваҡыты</standard>
+					<daylight>Көнсығыш Австралия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>Көнбайыш Австралия ваҡыты</generic>
+					<standard>Көнбайыш Австралия стандарт ваҡыты</standard>
+					<daylight>Көнбайыш Австралия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>Әзербайжан ваҡыты</generic>
+					<standard>Әзербайжан стандарт ваҡыты</standard>
+					<daylight>Әзербайжан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>Азор утрауҙары ваҡыты</generic>
+					<standard>Азор утрауҙары стандарт ваҡыты</standard>
+					<daylight>Азор утрауҙары йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>Бангладеш ваҡыты</generic>
+					<standard>Бангладеш стандарт ваҡыты</standard>
+					<daylight>Бангладеш йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>Бутан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>Боливия ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>Бразилия ваҡыты</generic>
+					<standard>Бразилия стандарт ваҡыты</standard>
+					<daylight>Бразилия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>Бруней ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>Кабо-Верде ваҡыты</generic>
+					<standard>Кабо-Верде стандарт ваҡыты</standard>
+					<daylight>Кабо-Верде йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard>Кейси ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>Чаморро стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>Чатем ваҡыты</generic>
+					<standard>Чатем стандарт ваҡыты</standard>
+					<daylight>Чатем йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>Чили ваҡыты</generic>
+					<standard>Чили стандарт ваҡыты</standard>
+					<daylight>Чили йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>Ҡытай ваҡыты</generic>
+					<standard>Ҡытай стандарт ваҡыты</standard>
+					<daylight>Ҡытай йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>Раштыуа утрауы ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>Кокос утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>Колумбия ваҡыты</generic>
+					<standard>Колумбия стандарт ваҡыты</standard>
+					<daylight>Колумбия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>Кук утрауҙары ваҡыты</generic>
+					<standard>Кук утрауҙары стандарт ваҡыты</standard>
+					<daylight>Кук утрауҙары йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>Куба ваҡыты</generic>
+					<standard>Куба стандарт ваҡыты</standard>
+					<daylight>Куба йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>Дейвис ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>Дюмон-д’Юрвиль ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>Көнсығыш Тимор ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>Пасха утрауы ваҡыты</generic>
+					<standard>Пасха утрауы стандарт ваҡыты</standard>
+					<daylight>Пасха утрауы йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>Эквадор ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>Үҙәк Европа ваҡыты</generic>
+					<standard>Үҙәк Европа стандарт ваҡыты</standard>
+					<daylight>Үҙәк Европа йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>Көнсығыш Европа ваҡыты</generic>
+					<standard>Көнсығыш Европа стандарт ваҡыты</standard>
+					<daylight>Көнсығыш Европа йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>Мәскәү ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>Көнбайыш Европа ваҡыты</generic>
+					<standard>Көнбайыш Европа стандарт ваҡыты</standard>
+					<daylight>Көнбайыш Европа йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>Фолкленд утрауҙары ваҡыты</generic>
+					<standard>Фолкленд утрауҙары стандарт ваҡыты</standard>
+					<daylight>Фолкленд утрауҙары йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>Фиджи ваҡыты</generic>
+					<standard>Фиджи стандарт ваҡыты</standard>
+					<daylight>Фиджи йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>Француз Гвианаһы ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>Француз Көньяҡ һәм Антарктика ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>Галапагос ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>Гамбье ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>Грузия ваҡыты</generic>
+					<standard>Грузия стандарт ваҡыты</standard>
+					<daylight>Грузия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>Гилберт утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>Гринвич буйынса уртаса ваҡыт</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic>Гренландия ваҡыты</generic>
+					<standard>Гренландия стандарт ваҡыты</standard>
+					<daylight>Гренландия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>Көнсығыш Гренландия ваҡыты</generic>
+					<standard>Көнсығыш Гренландия стандарт ваҡыты</standard>
+					<daylight>Көнсығыш Гренландия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>Көнбайыш Гренландия ваҡыты</generic>
+					<standard>Көнбайыш Гренландия стандарт ваҡыты</standard>
+					<daylight>Көнбайыш Гренландия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>Гуам стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>Фарсы ҡултығы стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>Гайана ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавай-Алеут стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>Гавай-Алеут ваҡыты</generic>
+					<standard>Гавай-Алеут стандарт ваҡыты</standard>
+					<daylight>Гавай-Алеут йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>Гонконг ваҡыты</generic>
+					<standard>Гонконг стандарт ваҡыты</standard>
+					<daylight>Гонконг йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>Ховд ваҡыты</generic>
+					<standard>Ховд стандарт ваҡыты</standard>
+					<daylight>Ховд йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>Һиндостан стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>Һинд океаны ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>Һинд-Ҡытай ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>Үҙәк Индонезия ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>Көнсығыш Индонезия</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>Көнбайыш Индонезия</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>Иран ваҡыты</generic>
+					<standard>Иран стандарт ваҡыты</standard>
+					<daylight>Иран йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>Иркутск ваҡыты</generic>
+					<standard>Иркутск стандарт ваҡыты</standard>
+					<daylight>Иркутск йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>Израиль ваҡыты</generic>
+					<standard>Израиль стандарт ваҡыты</standard>
+					<daylight>Израиль йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>Япония ваҡыты</generic>
+					<standard>Япония стандарт ваҡыты</standard>
+					<daylight>Япония йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kamchatka">
+				<long>
+					<generic>Камчатка ваҡыты</generic>
+					<standard>Камчатка стандарт ваҡыты</standard>
+					<daylight>Камчатка йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard>Ҡаҙағстан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>Көнсығыш Ҡаҙағстан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>Көнбайыш Ҡаҙағстан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>Корея ваҡыты</generic>
+					<standard>Корея стандарт ваҡыты</standard>
+					<daylight>Корея йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>Косрае ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>Красноярск ваҡыты</generic>
+					<standard>Красноярск стандарт ваҡыты</standard>
+					<daylight>Красноярск йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>Ҡырғыҙстан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Lanka">
+				<long>
+					<standard>Ланка ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>Лайн утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>Лорд-Хау ваҡыты</generic>
+					<standard>Лорд-Хау стандарт ваҡыты</standard>
+					<daylight>Лорд-Хау йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macau">
+				<long>
+					<generic>Макао ваҡыты</generic>
+					<standard>Макао стандарт ваҡыты</standard>
+					<daylight>Макао йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>Магадан ваҡыты</generic>
+					<standard>Магадан стандарт ваҡыты</standard>
+					<daylight>Магадан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>Малайзия ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>Мальдив утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>Маркиз утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>Маршалл Утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>Маврикий ваҡыты</generic>
+					<standard>Маврикий стандарт ваҡыты</standard>
+					<daylight>Маврикий йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>Моусон ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>Мексика Тымыҡ океан ваҡыты</generic>
+					<standard>Мексика Тымыҡ океан стандарт ваҡыты</standard>
+					<daylight>Мексика Тымыҡ океан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>Улан-Батор ваҡыты</generic>
+					<standard>Улан-Батор стандарт ваҡыты</standard>
+					<daylight>Улан-Батор йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>Мәскәү ваҡыты</generic>
+					<standard>Мәскәү стандарт ваҡыты</standard>
+					<daylight>Мәскәү йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>Мьянма ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>Науру ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>Непал ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>Яңы Каледония ваҡыты</generic>
+					<standard>Яңы Каледония стандарт ваҡыты</standard>
+					<daylight>Яңы Каледония йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>Яңы Зеландия ваҡыты</generic>
+					<standard>Яңы Зеландия стандарт ваҡыты</standard>
+					<daylight>Яңы Зеландия йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>Ньюфаундленд ваҡыты</generic>
+					<standard>Ньюфаундленд стандарт ваҡыты</standard>
+					<daylight>Ньюфаундленд йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>Ниуэ ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<generic>Норфолк ваҡыты</generic>
+					<standard>Норфолк стандарт ваҡыты</standard>
+					<daylight>Норфолк йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>Фернанду-ди-Норонья ваҡыты</generic>
+					<standard>Фернанду-ди-Норонья стандарт ваҡыты</standard>
+					<daylight>Фернанду-ди-Норонья йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>Новосибирск ваҡыты</generic>
+					<standard>Новосибирск стандарт ваҡыты</standard>
+					<daylight>Новосибирск йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>Омск ваҡыты</generic>
+					<standard>Омск стандарт ваҡыты</standard>
+					<daylight>Омск йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>Пакистан ваҡыты</generic>
+					<standard>Пакистан стандарт ваҡыты</standard>
+					<daylight>Пакистан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>Палау ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>Папуа – Яңы Гвинея</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>Парагвай ваҡыты</generic>
+					<standard>Парагвай стандарт ваҡыты</standard>
+					<daylight>Парагвай йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>Перу ваҡыты</generic>
+					<standard>Перу стандарт ваҡыты</standard>
+					<daylight>Перу йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>Филиппин ваҡыты</generic>
+					<standard>Филиппин стандарт ваҡыты</standard>
+					<daylight>Филиппин йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>Феникс утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>Сен-Пьер һәм Микелон ваҡыты</generic>
+					<standard>Сен-Пьер һәм Микелон стандарт ваҡыты</standard>
+					<daylight>Сен-Пьер һәм Микелон йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>Питкэрн ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>Понпеи ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Pyongyang">
+				<long>
+					<standard>Төньяҡ Корея ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>Ҡыҙылурҙа ваҡыты</generic>
+					<standard>Ҡыҙылурҙа стандарт ваҡыты</standard>
+					<daylight>Ҡыҙылурҙа йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>Реюньон ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>Ротера ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>Сахалин ваҡыты</generic>
+					<standard>Сахалин стандарт ваҡыты</standard>
+					<daylight>Сахалин йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samara">
+				<long>
+					<generic>Һамар ваҡыты</generic>
+					<standard>Һамар стандарт ваҡыты</standard>
+					<daylight>Һамар йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>Америка Самоаһы ваҡыты</generic>
+					<standard>Америка Самоаһы стандарт ваҡыты</standard>
+					<daylight>Америка Самоаһы йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>Сейшел утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>Сингапур стандарт ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>Соломон утрауҙары ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>Көньяҡ Георгия ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>Суринам ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>Сёва ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>Таити ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>Тайвань ваҡыты</generic>
+					<standard>Тайвань стандарт ваҡыты</standard>
+					<daylight>Тайвань йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>Тажикстан ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>Токелау ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>Тонга ваҡыты</generic>
+					<standard>Тонга стандарт ваҡыты</standard>
+					<daylight>Тонга йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>Чуук ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>Төркмәнстан ваҡыты</generic>
+					<standard>Төркмәнстан стандарт ваҡыты</standard>
+					<daylight>Төркмәнстан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>Тувалу ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>Уругвай ваҡыты</generic>
+					<standard>Уругвай стандарт ваҡыты</standard>
+					<daylight>Уругвай йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>Үзбәкстан ваҡыты</generic>
+					<standard>Үзбәкстан стандарт ваҡыты</standard>
+					<daylight>Үзбәкстан йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>Вануату ваҡыты</generic>
+					<standard>Вануату стандарт ваҡыты</standard>
+					<daylight>Вануату йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>Венесуэла ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>Владивосток ваҡыты</generic>
+					<standard>Владивосток стандарт ваҡыты</standard>
+					<daylight>Владивосток йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>Волгоград ваҡыты</generic>
+					<standard>Волгоград стандарт ваҡыты</standard>
+					<daylight>Волгоград йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>Восток ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>Уэйк утрауы ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>Уоллис һәм Футуна ваҡыты</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>Якутск ваҡыты</generic>
+					<standard>Якутск стандарт ваҡыты</standard>
+					<daylight>Якутск йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>Екатеринбург ваҡыты</generic>
+					<standard>Екатеринбург стандарт ваҡыты</standard>
+					<daylight>Екатеринбург йәйге ваҡыты</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yukon">
+				<long>
+					<standard>Юкон ваҡыты</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="adlm">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="ahom">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="bali">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="beng">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="bhks">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="brah">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="cakm">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="cham">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="deva">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="diak">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="fullwide">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="gara">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="gong">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="gonm">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="gujr">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="gukh">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="guru">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="hanidec">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="hmng">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="hmnp">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="java">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="kali">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="kawi">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="khmr">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="knda">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="krai">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="lana">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="lanatham">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="laoo">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="latn">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="lepc">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="limb">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mathbold">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mathdbl">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mathmono">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mathsanb">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mathsans">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mlym">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="modi">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mong">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mroo">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mtei">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mymr">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mymrepka">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mymrpao">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mymrshan">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="mymrtlng">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="nagm">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="newa">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="nkoo">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="olck">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="onao">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="orya">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="osma">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="outlined">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="rohg">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="saur">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="segment">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="shrd">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="sind">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="sinh">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="sora">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="sund">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="sunu">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="takr">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="talu">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="tamldec">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="telu">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="thai">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="tibt">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="tirh">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="tnsa">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="tols">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="vaii">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="wara">
+			<group> </group>
+		</symbols>
+		<symbols numberSystem="wcho">
+			<group> </group>
+		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="other">0 мең</pattern>
+					<pattern type="10000" count="other">00 мең</pattern>
+					<pattern type="100000" count="other">000 мең</pattern>
+					<pattern type="1000000" count="other">0 миллион</pattern>
+					<pattern type="10000000" count="other">00 миллион</pattern>
+					<pattern type="100000000" count="other">000 миллион</pattern>
+					<pattern type="1000000000" count="other">0 миллиард</pattern>
+					<pattern type="10000000000" count="other">00 миллиард</pattern>
+					<pattern type="100000000000" count="other">000 миллиард</pattern>
+					<pattern type="1000000000000" count="other">0 триллион</pattern>
+					<pattern type="10000000000000" count="other">00 триллион</pattern>
+					<pattern type="100000000000000" count="other">000 триллион</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="other">0 мең</pattern>
+					<pattern type="10000" count="other">00 мең</pattern>
+					<pattern type="100000" count="other">000 мең</pattern>
+					<pattern type="1000000" count="other">0 млн</pattern>
+					<pattern type="10000000" count="other">00 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
+					<pattern type="1000000000" count="other">0 млрд</pattern>
+					<pattern type="10000000000" count="other">00 млрд</pattern>
+					<pattern type="100000000000" count="other">000 млрд</pattern>
+					<pattern type="1000000000000" count="other">0 трлн</pattern>
+					<pattern type="10000000000000" count="other">00 трлн</pattern>
+					<pattern type="100000000000000" count="other">000 трлн</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="ahom">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bhks">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="diak">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gara">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gukh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmnp">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kawi">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="krai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathbold">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathdbl">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathmono">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsanb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsans">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="modi">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mroo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrepka">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrpao">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrtlng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nagm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="newa">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="onao">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="outlined">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="segment">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sind">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sinh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sunu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tirh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tnsa">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wara">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wcho">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="ADP">
+				<displayName>Андорра песетаһы</displayName>
+				<displayName count="other">Андорра песетаһы</displayName>
+			</currency>
+			<currency type="AED">
+				<displayName>Берләшкән Ғәрәп Әмирлектәре дирһәме</displayName>
+				<displayName count="other">Берләшкән Ғәрәп Әмирлектәре дирһамы</displayName>
+			</currency>
+			<currency type="AFA">
+				<displayName>Афған афғаниһы (1927–2002)</displayName>
+				<displayName count="other">Афған афғаниһы (1927–2002)</displayName>
+			</currency>
+			<currency type="AFN">
+				<displayName>Афған афғаниһы</displayName>
+				<displayName count="other">Афған афғаниһы</displayName>
+			</currency>
+			<currency type="ALK">
+				<displayName>Албания лекы (1946–1965)</displayName>
+				<displayName count="other">Албания лекы (1946–1965)</displayName>
+			</currency>
+			<currency type="ALL">
+				<displayName>Албания лекы</displayName>
+				<displayName count="other">Албания лекы</displayName>
+			</currency>
+			<currency type="AMD">
+				<displayName>Әрмән драмы</displayName>
+				<displayName count="other">Әрмән драмы</displayName>
+			</currency>
+			<currency type="ANG">
+				<displayName>Нидерланд Антил гульдены</displayName>
+				<displayName count="other">Нидерланд Антил гульдены</displayName>
+			</currency>
+			<currency type="AOA">
+				<displayName>Ангола кванзаһы</displayName>
+				<displayName count="other">Ангола кванзаһы</displayName>
+			</currency>
+			<currency type="AOK">
+				<displayName>Ангола кванзаһы (1977–1991)</displayName>
+				<displayName count="other">Ангола кванзаһы (1977–1991)</displayName>
+			</currency>
+			<currency type="AON">
+				<displayName>Ангола яңы кванзаһы (1990–2000)</displayName>
+				<displayName count="other">Ангола яңы кванзаһы (1990–2000)</displayName>
+			</currency>
+			<currency type="AOR">
+				<displayName>Ангола көйләнгән кванзаһы (1995–1999)</displayName>
+				<displayName count="other">Ангола көйләнгән кванзаһы (1995–1999)</displayName>
+			</currency>
+			<currency type="ARA">
+				<displayName>Аргентина аустралы</displayName>
+				<displayName count="other">Аргентина аустралы</displayName>
+			</currency>
+			<currency type="ARL">
+				<displayName>Аргентина песоһы (1970–1983)</displayName>
+				<displayName count="other">Аргентина песоһы (1970–1983)</displayName>
+			</currency>
+			<currency type="ARM">
+				<displayName>Аргентина песоһы (1881–1970)</displayName>
+				<displayName count="other">Аргентина песоһы (1881–1970)</displayName>
+			</currency>
+			<currency type="ARP">
+				<displayName>Аргентина песоһы (1983–1985)</displayName>
+				<displayName count="other">Аргентина песоһы (1983–1985)</displayName>
+			</currency>
+			<currency type="ARS">
+				<displayName>Аргентина песоһы</displayName>
+				<displayName count="other">Аргентина песоһы</displayName>
+			</currency>
+			<currency type="ATS">
+				<displayName>Австрия шиллингы</displayName>
+				<displayName count="other">Австрия шиллингы</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName>Австралия доллары</displayName>
+				<displayName count="other">Австралия доллары</displayName>
+			</currency>
+			<currency type="AWG">
+				<displayName>Аруба флорины</displayName>
+				<displayName count="other">Аруба флорины</displayName>
+			</currency>
+			<currency type="AZM">
+				<displayName>Әзербайжан манаты (1993–2006)</displayName>
+				<displayName count="other">Әзербайжан манаты (1993–2006)</displayName>
+			</currency>
+			<currency type="AZN">
+				<displayName>Әзербайжан манаты</displayName>
+				<displayName count="other">Әзербайжан манаты</displayName>
+			</currency>
+			<currency type="BAD">
+				<displayName>Босния һәм Герцеговина динары (1992–1994)</displayName>
+				<displayName count="other">Босния һәм Герцеговина динары (1992–1994)</displayName>
+			</currency>
+			<currency type="BAM">
+				<displayName>Босния һәм Герцеговина алмашынмалы маркаһы</displayName>
+				<displayName count="other">Босния һәм Герцеговина алмашынмалы маркаһы</displayName>
+			</currency>
+			<currency type="BAN">
+				<displayName>Босния һәм Герцеговина яңы динары (1994–1997)</displayName>
+				<displayName count="other">Босния һәм Герцеговина яңы динары (1994–1997)</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName>Барбадос доллары</displayName>
+				<displayName count="other">Барбадос доллары</displayName>
+			</currency>
+			<currency type="BDT">
+				<displayName>Бангладеш такаһы</displayName>
+				<displayName count="other">Бангладеш такаһы</displayName>
+			</currency>
+			<currency type="BEC">
+				<displayName>Бельгия франкы (алмашынмалы)</displayName>
+				<displayName count="other">Бельгия франкы (алмашынмалы)</displayName>
+			</currency>
+			<currency type="BEF">
+				<displayName>Бельгия франкы</displayName>
+				<displayName count="other">Бельгия франкы</displayName>
+			</currency>
+			<currency type="BEL">
+				<displayName>Бельгия франкы (финанс)</displayName>
+				<displayName count="other">Бельгия франкы (финанс)</displayName>
+			</currency>
+			<currency type="BGL">
+				<displayName>Болгар ҡаты левы</displayName>
+				<displayName count="other">Болгар ҡаты левы</displayName>
+			</currency>
+			<currency type="BGM">
+				<displayName>Болгар социалистик левы</displayName>
+				<displayName count="other">Болгар социалистик левы</displayName>
+			</currency>
+			<currency type="BGN">
+				<displayName>Болгария левы</displayName>
+				<displayName count="other">Болгария левы</displayName>
+			</currency>
+			<currency type="BGO">
+				<displayName>Болгар левы (1879–1952)</displayName>
+				<displayName count="other">Болгар левы (1879–1952)</displayName>
+			</currency>
+			<currency type="BHD">
+				<displayName>Бәхрәйн динары</displayName>
+				<displayName count="other">Бәхрәйн динары</displayName>
+			</currency>
+			<currency type="BIF">
+				<displayName>Бурунди франкы</displayName>
+				<displayName count="other">Бурунди франкы</displayName>
+			</currency>
+			<currency type="BMD">
+				<displayName>Бермуд доллары</displayName>
+				<displayName count="other">Бермуд доллары</displayName>
+			</currency>
+			<currency type="BND">
+				<displayName>Бруней доллары</displayName>
+				<displayName count="other">Бруней доллары</displayName>
+			</currency>
+			<currency type="BOB">
+				<displayName>Боливия боливианоһы</displayName>
+				<displayName count="other">Боливия боливианоһы</displayName>
+			</currency>
+			<currency type="BOL">
+				<displayName>Боливия боливианоһы (1863–1963)</displayName>
+				<displayName count="other">Боливия боливианоһы (1863–1963)</displayName>
+			</currency>
+			<currency type="BOP">
+				<displayName>Боливия песоһы</displayName>
+				<displayName count="other">Боливия песоһы</displayName>
+			</currency>
+			<currency type="BOV">
+				<displayName>Боливия мвдолы</displayName>
+				<displayName count="other">Боливия мвдолы</displayName>
+			</currency>
+			<currency type="BRB">
+				<displayName>Бразилия яңы крузейроһы (1967–1986)</displayName>
+				<displayName count="other">Бразилия яңы крузейроһы (1967–1986)</displayName>
+			</currency>
+			<currency type="BRC">
+				<displayName>Бразилия крузадоһы (1986–1989)</displayName>
+				<displayName count="other">Бразилия крузадоһы (1986–1989)</displayName>
+			</currency>
+			<currency type="BRE">
+				<displayName>Бразилия крузейроһы (1990–1993)</displayName>
+				<displayName count="other">Бразилия крузейроһы (1990–1993)</displayName>
+			</currency>
+			<currency type="BRL">
+				<displayName>Бразилия реалы</displayName>
+				<displayName count="other">Бразилия реалы</displayName>
+			</currency>
+			<currency type="BRN">
+				<displayName>Бразилия яңы крузадоһы (1989–1990)</displayName>
+				<displayName count="other">Бразилия яңы крузадоһы (1989–1990)</displayName>
+			</currency>
+			<currency type="BRR">
+				<displayName>Бразилия крузейроһы (1993–1994)</displayName>
+				<displayName count="other">Бразилия крузейроһы (1993–1994)</displayName>
+			</currency>
+			<currency type="BRZ">
+				<displayName>Бразилия крузейроһы (1942–1967)</displayName>
+				<displayName count="other">Бразилия крузейроһы (1942–1967)</displayName>
+			</currency>
+			<currency type="BSD">
+				<displayName>Багам доллары</displayName>
+				<displayName count="other">Багам доллары</displayName>
+			</currency>
+			<currency type="BTN">
+				<displayName>Бутан нгултрумы</displayName>
+				<displayName count="other">Бутан нгултрумы</displayName>
+			</currency>
+			<currency type="BUK">
+				<displayName>Бирма кьяты</displayName>
+				<displayName count="other">Бирма кьяты</displayName>
+			</currency>
+			<currency type="BWP">
+				<displayName>Ботсвана пулаһы</displayName>
+				<displayName count="other">Ботсвана пулаһы</displayName>
+			</currency>
+			<currency type="BYB">
+				<displayName>Беларусь рубле (1994–1999)</displayName>
+				<displayName count="other">Беларусь рубле (1994–1999)</displayName>
+			</currency>
+			<currency type="BYN">
+				<displayName>Беларусь рубле</displayName>
+				<displayName count="other">Беларусь рубле</displayName>
+			</currency>
+			<currency type="BYR">
+				<displayName>Беларусь рубле (2000–2016)</displayName>
+				<displayName count="other">Беларусь рубле (2000–2016)</displayName>
+			</currency>
+			<currency type="BZD">
+				<displayName>Белиз доллары</displayName>
+				<displayName count="other">Белиз доллары</displayName>
+			</currency>
+			<currency type="CAD">
+				<displayName>Канада доллары</displayName>
+				<displayName count="other">Канада доллары</displayName>
+			</currency>
+			<currency type="CDF">
+				<displayName>Конго франкы</displayName>
+				<displayName count="other">Конго франкы</displayName>
+			</currency>
+			<currency type="CHE">
+				<displayName>WIR евроһы</displayName>
+				<displayName count="other">WIR евроһы</displayName>
+			</currency>
+			<currency type="CHF">
+				<displayName>Швейцария франкы</displayName>
+				<displayName count="other">Швейцария франкы</displayName>
+			</currency>
+			<currency type="CHW">
+				<displayName>WIR франкы</displayName>
+				<displayName count="other">WIR франкы</displayName>
+			</currency>
+			<currency type="CLE">
+				<displayName>Чили эскудоһы</displayName>
+				<displayName count="other">Чили эскудоһы</displayName>
+			</currency>
+			<currency type="CLF">
+				<displayName>Чили иҫәп берәмеге (UF)</displayName>
+				<displayName count="other">Чили иҫәп берәмеге (UF)</displayName>
+			</currency>
+			<currency type="CLP">
+				<displayName>Чили песоһы</displayName>
+				<displayName count="other">Чили песоһы</displayName>
+			</currency>
+			<currency type="CNH">
+				<displayName>Ҡытай юане (офшор)</displayName>
+				<displayName count="other">Ҡытай юане (офшор)</displayName>
+			</currency>
+			<currency type="CNX">
+				<displayName>Ҡытай Халыҡ Банкы доллары</displayName>
+				<displayName count="other">Ҡытай Халыҡ Банкы доллары</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName>Ҡытай юане</displayName>
+				<displayName count="other">Ҡытай юане</displayName>
+			</currency>
+			<currency type="COP">
+				<displayName>Колумбия песоһы</displayName>
+				<displayName count="other">Колумбия песоһы</displayName>
+			</currency>
+			<currency type="COU">
+				<displayName>Колумбия реаль хаҡ берәмеге</displayName>
+				<displayName count="other">Колумбия реаль хаҡ берәмеге</displayName>
+			</currency>
+			<currency type="CRC">
+				<displayName>Коста-Рика колоны</displayName>
+				<displayName count="other">Коста-Рика колоны</displayName>
+			</currency>
+			<currency type="CSD">
+				<displayName>Сербия динары (2002–2006)</displayName>
+				<displayName count="other">Сербия динары (2002–2006)</displayName>
+			</currency>
+			<currency type="CSK">
+				<displayName>Чехословакия ҡаты кронаһы</displayName>
+				<displayName count="other">Чехословакия ҡаты кронаһы</displayName>
+			</currency>
+			<currency type="CUC">
+				<displayName>Куба алмашынмалы песоһы</displayName>
+				<displayName count="other">Куба алмашынмалы песоһы</displayName>
+			</currency>
+			<currency type="CUP">
+				<displayName>Куба песоһы</displayName>
+				<displayName count="other">Куба песоһы</displayName>
+			</currency>
+			<currency type="CVE">
+				<displayName>Кабо-Верде эскудоһы</displayName>
+				<displayName count="other">Кабо-Верде эскудоһы</displayName>
+			</currency>
+			<currency type="CYP">
+				<displayName>Кипр фунты</displayName>
+				<displayName count="other">Кипр фунты</displayName>
+			</currency>
+			<currency type="CZK">
+				<displayName>Чехия кронаһы</displayName>
+				<displayName count="other">Чехия кронаһы</displayName>
+			</currency>
+			<currency type="DDM">
+				<displayName>Көнсығыш Германия маркаһы</displayName>
+				<displayName count="other">Көнсығыш Германия маркаһы</displayName>
+			</currency>
+			<currency type="DEM">
+				<displayName>Германия маркаһы</displayName>
+				<displayName count="other">Германия маркаһы</displayName>
+			</currency>
+			<currency type="DJF">
+				<displayName>Джибути франкы</displayName>
+				<displayName count="other">Джибути франкы</displayName>
+			</currency>
+			<currency type="DKK">
+				<displayName>Дания кронаһы</displayName>
+				<displayName count="other">Дания кронаһы</displayName>
+			</currency>
+			<currency type="DOP">
+				<displayName>Доминикан песоһы</displayName>
+				<displayName count="other">Доминикан песоһы</displayName>
+			</currency>
+			<currency type="DZD">
+				<displayName>Алжир динары</displayName>
+				<displayName count="other">Алжир динары</displayName>
+			</currency>
+			<currency type="ECS">
+				<displayName>Эквадор сукреһы</displayName>
+				<displayName count="other">Эквадор сукреһы</displayName>
+			</currency>
+			<currency type="ECV">
+				<displayName>Эквадор даими хаҡ берәмеге</displayName>
+				<displayName count="other">Эквадор даими хаҡ берәмеге</displayName>
+			</currency>
+			<currency type="EEK">
+				<displayName>Эстония кронаһы</displayName>
+				<displayName count="other">Эстония кронаһы</displayName>
+			</currency>
+			<currency type="EGP">
+				<displayName>Мысыр фунты</displayName>
+				<displayName count="other">Мысыр фунты</displayName>
+			</currency>
+			<currency type="ERN">
+				<displayName>Эритрея накфаһы</displayName>
+				<displayName count="other">Эритрея накфаһы</displayName>
+			</currency>
+			<currency type="ESA">
+				<displayName>Испания песетаһы (A иҫәбе)</displayName>
+				<displayName count="other">Испания песетаһы (A иҫәбе)</displayName>
+			</currency>
+			<currency type="ESB">
+				<displayName>Испания песетаһы (алмашынмалы иҫәп)</displayName>
+				<displayName count="other">Испания песетаһы (алмашынмалы иҫәп)</displayName>
+			</currency>
+			<currency type="ESP">
+				<displayName>Испания песетаһы</displayName>
+				<displayName count="other">Испания песетаһы</displayName>
+			</currency>
+			<currency type="ETB">
+				<displayName>Эфиопия быры</displayName>
+				<displayName count="other">Эфиопия быры</displayName>
+			</currency>
+			<currency type="EUR">
+				<displayName>Евро</displayName>
+				<displayName count="other">Евро</displayName>
+			</currency>
+			<currency type="FIM">
+				<displayName>Финляндия маркаһы</displayName>
+				<displayName count="other">Финляндия маркаһы</displayName>
+			</currency>
+			<currency type="FJD">
+				<displayName>Фиджи доллары</displayName>
+				<displayName count="other">Фиджи доллары</displayName>
+			</currency>
+			<currency type="FKP">
+				<displayName>Фолкленд утрауҙары фунты</displayName>
+				<displayName count="other">Фолкленд утрауҙары фунты</displayName>
+			</currency>
+			<currency type="FRF">
+				<displayName>Франция франкы</displayName>
+				<displayName count="other">Франция франкы</displayName>
+			</currency>
+			<currency type="GBP">
+				<displayName>Британия фунт стерлингы</displayName>
+				<displayName count="other">Британия фунт стерлингы</displayName>
+			</currency>
+			<currency type="GEK">
+				<displayName>Грузия купон лариты</displayName>
+				<displayName count="other">Грузия купон лариты</displayName>
+			</currency>
+			<currency type="GEL">
+				<displayName>Грузия лариһы</displayName>
+				<displayName count="other">Грузия лариһы</displayName>
+			</currency>
+			<currency type="GHC">
+				<displayName>Гана седиһы (1979–2007)</displayName>
+				<displayName count="other">Гана седиһы (1979–2007)</displayName>
+			</currency>
+			<currency type="GHS">
+				<displayName>Гана седиһы</displayName>
+				<displayName count="other">Гана седиһы</displayName>
+			</currency>
+			<currency type="GIP">
+				<displayName>Гибралтар фунты</displayName>
+				<displayName count="other">Гибралтар фунты</displayName>
+			</currency>
+			<currency type="GMD">
+				<displayName>Гамбия даласиһы</displayName>
+				<displayName count="other">Гамбия даласиһы</displayName>
+			</currency>
+			<currency type="GNF">
+				<displayName>Гвинея франкы</displayName>
+				<displayName count="other">Гвинея франкы</displayName>
+			</currency>
+			<currency type="GNS">
+				<displayName>Гвинея силиһы</displayName>
+				<displayName count="other">Гвинея силиһы</displayName>
+			</currency>
+			<currency type="GQE">
+				<displayName>Экваториаль Гвинея эквелеһы</displayName>
+				<displayName count="other">Экваториаль Гвинея эквелеһы</displayName>
+			</currency>
+			<currency type="GRD">
+				<displayName>Греция драхмаһы</displayName>
+				<displayName count="other">Греция драхмаһы</displayName>
+			</currency>
+			<currency type="GTQ">
+				<displayName>Гватемала кетсале</displayName>
+				<displayName count="other">Гватемала кетсале</displayName>
+			</currency>
+			<currency type="GWE">
+				<displayName>Португал Гвинея эскудоһы</displayName>
+				<displayName count="other">Португал Гвинея эскудоһы</displayName>
+			</currency>
+			<currency type="GWP">
+				<displayName>Гвинея-Бисау песоһы</displayName>
+				<displayName count="other">Гвинея-Бисау песоһы</displayName>
+			</currency>
+			<currency type="GYD">
+				<displayName>Гайана доллары</displayName>
+				<displayName count="other">Гайана доллары</displayName>
+			</currency>
+			<currency type="HKD">
+				<displayName>Гонконг доллары</displayName>
+				<displayName count="other">Гонконг доллары</displayName>
+			</currency>
+			<currency type="HNL">
+				<displayName>Гондурас лемпираһы</displayName>
+				<displayName count="other">Гондурас лемпираһы</displayName>
+			</currency>
+			<currency type="HRD">
+				<displayName>Хорватия динары</displayName>
+				<displayName count="other">Хорватия динары</displayName>
+			</currency>
+			<currency type="HRK">
+				<displayName>Хорватия кунаһы</displayName>
+				<displayName count="other">Хорватия кунаһы</displayName>
+			</currency>
+			<currency type="HTG">
+				<displayName>Гаити гурды</displayName>
+				<displayName count="other">Гаити гурды</displayName>
+			</currency>
+			<currency type="HUF">
+				<displayName>Венгрия форинты</displayName>
+				<displayName count="other">Венгрия форинты</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName>Индонезия рупияһы</displayName>
+				<displayName count="other">Индонезия рупияһы</displayName>
+			</currency>
+			<currency type="IEP">
+				<displayName>Ирландия фунты</displayName>
+				<displayName count="other">Ирландия фунты</displayName>
+			</currency>
+			<currency type="ILP">
+				<displayName>Израиль фунты</displayName>
+				<displayName count="other">Израиль фунты</displayName>
+			</currency>
+			<currency type="ILR">
+				<displayName>Израиль шекеле (1980–1985)</displayName>
+				<displayName count="other">Израиль шекеле (1980–1985)</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName>Израиль яңы шекеле</displayName>
+				<displayName count="other">Израиль яңы шекеле</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName>Һиндостан рупияһы</displayName>
+				<displayName count="other">Һиндостан рупияһы</displayName>
+			</currency>
+			<currency type="IQD">
+				<displayName>Ираҡ динары</displayName>
+				<displayName count="other">Ираҡ динары</displayName>
+			</currency>
+			<currency type="IRR">
+				<displayName>Иран риалы</displayName>
+				<displayName count="other">Иран риалы</displayName>
+			</currency>
+			<currency type="ISJ">
+				<displayName>Исландия кронаһы (1918–1981)</displayName>
+				<displayName count="other">Исландия кронаһы (1918–1981)</displayName>
+			</currency>
+			<currency type="ISK">
+				<displayName>Исландия кронаһы</displayName>
+				<displayName count="other">Исландия кронаһы</displayName>
+			</currency>
+			<currency type="ITL">
+				<displayName>Италия лираһы</displayName>
+				<displayName count="other">Италия лираһы</displayName>
+			</currency>
+			<currency type="JMD">
+				<displayName>Ямайка доллары</displayName>
+				<displayName count="other">Ямайка доллары</displayName>
+			</currency>
+			<currency type="JOD">
+				<displayName>Иордания динары</displayName>
+				<displayName count="other">Иордания динары</displayName>
+			</currency>
+			<currency type="JPY">
+				<displayName>Япон иенаһы</displayName>
+				<displayName count="other">Япон иенаһы</displayName>
+			</currency>
+			<currency type="KES">
+				<displayName>Кения шиллингы</displayName>
+				<displayName count="other">Кения шиллингы</displayName>
+			</currency>
+			<currency type="KGS">
+				<displayName>Ҡырғыҙстан һумы</displayName>
+				<displayName count="other">Ҡырғыҙстан сомы</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName>Камбоджа риеле</displayName>
+				<displayName count="other">Камбоджа риеле</displayName>
+			</currency>
+			<currency type="KMF">
+				<displayName>Комор франкы</displayName>
+				<displayName count="other">Комор франкы</displayName>
+			</currency>
+			<currency type="KPW">
+				<displayName>Төньяҡ Корея воны</displayName>
+				<displayName count="other">Төньяҡ Корея воны</displayName>
+			</currency>
+			<currency type="KRH">
+				<displayName>Көньяҡ Корея хваны (1953–1962)</displayName>
+				<displayName count="other">Көньяҡ Корея хваны (1953–1962)</displayName>
+			</currency>
+			<currency type="KRO">
+				<displayName>Көньяҡ Корея воны (1945–1953)</displayName>
+				<displayName count="other">Көньяҡ Корея воны (1945–1953)</displayName>
+			</currency>
+			<currency type="KRW">
+				<displayName>Көньяҡ Корея воны</displayName>
+				<displayName count="other">Көньяҡ Корея воны</displayName>
+			</currency>
+			<currency type="KWD">
+				<displayName>Кувейт динары</displayName>
+				<displayName count="other">Кувейт динары</displayName>
+			</currency>
+			<currency type="KYD">
+				<displayName>Кайман утрауҙары доллары</displayName>
+				<displayName count="other">Кайман утрауҙары доллары</displayName>
+			</currency>
+			<currency type="KZT">
+				<displayName>Ҡаҙағстан тәңкәһе</displayName>
+				<displayName count="other">Ҡаҙағстан тәңкәһе</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName>Лаос кипы</displayName>
+				<displayName count="other">Лаос кипы</displayName>
+			</currency>
+			<currency type="LBP">
+				<displayName>Ливан фунты</displayName>
+				<displayName count="other">Ливан фунты</displayName>
+			</currency>
+			<currency type="LKR">
+				<displayName>Шри-Ланка рупияһы</displayName>
+				<displayName count="other">Шри-Ланка рупияһы</displayName>
+			</currency>
+			<currency type="LRD">
+				<displayName>Либерия доллары</displayName>
+				<displayName count="other">Либерия доллары</displayName>
+			</currency>
+			<currency type="LSL">
+				<displayName>Лесото лотиһы</displayName>
+				<displayName count="other">Лесото лотиһы</displayName>
+			</currency>
+			<currency type="LTL">
+				<displayName>Латвия литы</displayName>
+				<displayName count="other">Латвия литы</displayName>
+			</currency>
+			<currency type="LTT">
+				<displayName>Литва талоны</displayName>
+				<displayName count="other">Литва талоны</displayName>
+			</currency>
+			<currency type="LUC">
+				<displayName>Люксембург алмашынмалы франкы</displayName>
+				<displayName count="other">Люксембург алмашынмалы франкы</displayName>
+			</currency>
+			<currency type="LUF">
+				<displayName>Люксембург франкы</displayName>
+				<displayName count="other">Люксембург франкы</displayName>
+			</currency>
+			<currency type="LUL">
+				<displayName>Люксембург финанс франкы</displayName>
+				<displayName count="other">Люксембург финанс франкы</displayName>
+			</currency>
+			<currency type="LVL">
+				<displayName>Латвия латы</displayName>
+				<displayName count="other">Латвия латы</displayName>
+			</currency>
+			<currency type="LVR">
+				<displayName>Латвия рубле</displayName>
+				<displayName count="other">Латвия рубле</displayName>
+			</currency>
+			<currency type="LYD">
+				<displayName>Ливия динары</displayName>
+				<displayName count="other">Ливия динары</displayName>
+			</currency>
+			<currency type="MAD">
+				<displayName>Марокко дирһәме</displayName>
+				<displayName count="other">Марокко дирһәме</displayName>
+			</currency>
+			<currency type="MAF">
+				<displayName>Марокко франкы</displayName>
+				<displayName count="other">Марокко франкы</displayName>
+			</currency>
+			<currency type="MCF">
+				<displayName>Монако франкы</displayName>
+				<displayName count="other">Монако франкы</displayName>
+			</currency>
+			<currency type="MDC">
+				<displayName>Молдова купоны</displayName>
+				<displayName count="other">Молдова купоны</displayName>
+			</currency>
+			<currency type="MDL">
+				<displayName>Молдова лейе</displayName>
+				<displayName count="other">Молдова лейе</displayName>
+			</currency>
+			<currency type="MGA">
+				<displayName>Мадагаскар ариариһы</displayName>
+				<displayName count="other">Мадагаскар ариариһы</displayName>
+			</currency>
+			<currency type="MGF">
+				<displayName>Мадагаскар франкы</displayName>
+				<displayName count="other">Мадагаскар франкы</displayName>
+			</currency>
+			<currency type="MKD">
+				<displayName>Македония денары</displayName>
+				<displayName count="other">Македония денары</displayName>
+			</currency>
+			<currency type="MKN">
+				<displayName>Македония денары (1992–1993)</displayName>
+				<displayName count="other">Македония денары (1992–1993)</displayName>
+			</currency>
+			<currency type="MLF">
+				<displayName>Мали франкы</displayName>
+				<displayName count="other">Мали франкы</displayName>
+			</currency>
+			<currency type="MMK">
+				<displayName>Мьянма кьяты</displayName>
+				<displayName count="other">Мьянма кьяты</displayName>
+			</currency>
+			<currency type="MNT">
+				<displayName>Монголия тугригы</displayName>
+				<displayName count="other">Монголия тугригы</displayName>
+			</currency>
+			<currency type="MOP">
+				<displayName>Макао патакаһы</displayName>
+				<displayName count="other">Макао патакаһы</displayName>
+			</currency>
+			<currency type="MRO">
+				<displayName>Мавритания угияһы (1973–2017)</displayName>
+				<displayName count="other">Мавритания угияһы (1973–2017)</displayName>
+			</currency>
+			<currency type="MRU">
+				<displayName>Мавритания угияһы</displayName>
+				<displayName count="other">Мавритания угияһы</displayName>
+			</currency>
+			<currency type="MTL">
+				<displayName>Мальта лираһы</displayName>
+				<displayName count="other">Мальта лираһы</displayName>
+			</currency>
+			<currency type="MTP">
+				<displayName>Мальта фунты</displayName>
+				<displayName count="other">Мальта фунты</displayName>
+			</currency>
+			<currency type="MUR">
+				<displayName>Маврикий рупияһы</displayName>
+				<displayName count="other">Маврикий рупияһы</displayName>
+			</currency>
+			<currency type="MVP">
+				<displayName>Мальдив рупияһы (1947–1981)</displayName>
+				<displayName count="other">Мальдив рупияһы (1947–1981)</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName>Мальдив руфияһы</displayName>
+				<displayName count="other">Мальдив руфияһы</displayName>
+			</currency>
+			<currency type="MWK">
+				<displayName>Малави квачаһы</displayName>
+				<displayName count="other">Малави квачаһы</displayName>
+			</currency>
+			<currency type="MXN">
+				<displayName>Мексика песоһы</displayName>
+				<displayName count="other">Мексика песоһы</displayName>
+			</currency>
+			<currency type="MXP">
+				<displayName>Мексика көмөш песоһы (1861–1992)</displayName>
+				<displayName count="other">Мексика көмөш песоһы (1861–1992)</displayName>
+			</currency>
+			<currency type="MXV">
+				<displayName>Мексика инвестиция берәмеге</displayName>
+				<displayName count="other">Мексика инвестиция берәмеге</displayName>
+			</currency>
+			<currency type="MYR">
+				<displayName>Малайзия ринггиты</displayName>
+				<displayName count="other">Малайзия ринггиты</displayName>
+			</currency>
+			<currency type="MZE">
+				<displayName>Мозамбик эскудоһы</displayName>
+				<displayName count="other">Мозамбик эскудоһы</displayName>
+			</currency>
+			<currency type="MZM">
+				<displayName>Мозамбик метикалы (1980–2006)</displayName>
+				<displayName count="other">Мозамбик метикалы (1980–2006)</displayName>
+			</currency>
+			<currency type="MZN">
+				<displayName>Мозамбик метикалы</displayName>
+				<displayName count="other">Мозамбик метикалы</displayName>
+			</currency>
+			<currency type="NAD">
+				<displayName>Намибия доллары</displayName>
+				<displayName count="other">Намибия доллары</displayName>
+			</currency>
+			<currency type="NGN">
+				<displayName>Нигерия найраһы</displayName>
+				<displayName count="other">Нигерия найраһы</displayName>
+			</currency>
+			<currency type="NIC">
+				<displayName>Никарагуа кордобаһы (1988–1991)</displayName>
+				<displayName count="other">Никарагуа кордобаһы (1988–1991)</displayName>
+			</currency>
+			<currency type="NIO">
+				<displayName>Никарагуа кордобаһы</displayName>
+				<displayName count="other">Никарагуа кордобаһы</displayName>
+			</currency>
+			<currency type="NLG">
+				<displayName>Нидерланд гульдены</displayName>
+				<displayName count="other">Нидерланд гульдены</displayName>
+			</currency>
+			<currency type="NOK">
+				<displayName>Норвегия кронаһы</displayName>
+				<displayName count="other">Норвегия кронаһы</displayName>
+			</currency>
+			<currency type="NPR">
+				<displayName>Непал рупияһы</displayName>
+				<displayName count="other">Непал рупияһы</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName>Яңы Зеландия доллары</displayName>
+				<displayName count="other">Яңы Зеландия доллары</displayName>
+			</currency>
+			<currency type="OMR">
+				<displayName>Оман риалы</displayName>
+				<displayName count="other">Оман риалы</displayName>
+			</currency>
+			<currency type="PAB">
+				<displayName>Панама бальбоаһы</displayName>
+				<displayName count="other">Панама бальбоаһы</displayName>
+			</currency>
+			<currency type="PEI">
+				<displayName>Перу интиһы</displayName>
+				<displayName count="other">Перу интиһы</displayName>
+			</currency>
+			<currency type="PEN">
+				<displayName>Перу соле</displayName>
+				<displayName count="other">Перу соле</displayName>
+			</currency>
+			<currency type="PES">
+				<displayName>Перу солеһы (1863–1965)</displayName>
+				<displayName count="other">Перу солеһы (1863–1965)</displayName>
+			</currency>
+			<currency type="PGK">
+				<displayName>Папуа - Яңы Гвинея кинаһы</displayName>
+				<displayName count="other">Папуа - Яңы Гвинея кинаһы</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName>Филиппин песоһы</displayName>
+				<displayName count="other">Филиппин песоһы</displayName>
+			</currency>
+			<currency type="PKR">
+				<displayName>Пакистан рупияһы</displayName>
+				<displayName count="other">Пакистан рупияһы</displayName>
+			</currency>
+			<currency type="PLN">
+				<displayName>Польша злотыйы</displayName>
+				<displayName count="other">Польша злотыйы</displayName>
+			</currency>
+			<currency type="PLZ">
+				<displayName>Польша злотыйы (1950–1995)</displayName>
+				<displayName count="other">Польша злотыйы (1950–1995)</displayName>
+			</currency>
+			<currency type="PTE">
+				<displayName>Португалия эскудоһы</displayName>
+				<displayName count="other">Португалия эскудоһы</displayName>
+			</currency>
+			<currency type="PYG">
+				<displayName>Парагвай гуараниһы</displayName>
+				<displayName count="other">Парагвай гуараниһы</displayName>
+			</currency>
+			<currency type="QAR">
+				<displayName>Катар риалы</displayName>
+				<displayName count="other">Катар риалы</displayName>
+			</currency>
+			<currency type="RHD">
+				<displayName>Родезия доллары</displayName>
+				<displayName count="other">Родезия доллары</displayName>
+			</currency>
+			<currency type="ROL">
+				<displayName>Румын лейе (1952–2006)</displayName>
+				<displayName count="other">Румын лейе (1952–2006)</displayName>
+			</currency>
+			<currency type="RON">
+				<displayName>Румын лейе</displayName>
+				<displayName count="other">Румын лейе</displayName>
+			</currency>
+			<currency type="RSD">
+				<displayName>Сербия динары</displayName>
+				<displayName count="other">Сербия динары</displayName>
+			</currency>
+			<currency type="RUB">
+				<displayName>Рәсәй рубле</displayName>
+				<displayName count="other">Рәсәй рубле</displayName>
+			</currency>
+			<currency type="RUR">
+				<displayName>Рәсәй рубле (1991–1998)</displayName>
+				<displayName count="other">Рәсәй рубле (1991–1998)</displayName>
+				<symbol draft="contributed">р.</symbol>
+			</currency>
+			<currency type="RWF">
+				<displayName>Руанда франкы</displayName>
+				<displayName count="other">Руанда франкы</displayName>
+			</currency>
+			<currency type="SAR">
+				<displayName>Сәғүд риалы</displayName>
+				<displayName count="other">Сәғүд риалы</displayName>
+			</currency>
+			<currency type="SBD">
+				<displayName>Соломон утрауҙары доллары</displayName>
+				<displayName count="other">Соломон утрауҙары доллары</displayName>
+			</currency>
+			<currency type="SCR">
+				<displayName>Сейшел рупияһы</displayName>
+				<displayName count="other">Сейшел рупияһы</displayName>
+			</currency>
+			<currency type="SDD">
+				<displayName>Судан динары (1992–2007)</displayName>
+				<displayName count="other">Судан динары (1992–2007)</displayName>
+			</currency>
+			<currency type="SDG">
+				<displayName>Судан фунты</displayName>
+				<displayName count="other">Судан фунты</displayName>
+			</currency>
+			<currency type="SDP">
+				<displayName>Судан фунты (1957–1998)</displayName>
+				<displayName count="other">Судан фунты (1957–1998)</displayName>
+			</currency>
+			<currency type="SEK">
+				<displayName>Швеция кронаһы</displayName>
+				<displayName count="other">Швеция кронаһы</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName>Сингапур доллары</displayName>
+				<displayName count="other">Сингапур доллары</displayName>
+			</currency>
+			<currency type="SHP">
+				<displayName>Изге Елена утрауы фунты</displayName>
+				<displayName count="other">Изге Елена утрауы фунты</displayName>
+			</currency>
+			<currency type="SIT">
+				<displayName>Словения толары</displayName>
+				<displayName count="other">Словения толары</displayName>
+			</currency>
+			<currency type="SKK">
+				<displayName>Словакия кронаһы</displayName>
+				<displayName count="other">Словакия кронаһы</displayName>
+			</currency>
+			<currency type="SLE">
+				<displayName>Сьерра-Леоне леонеһы</displayName>
+				<displayName count="other">Сьерра-Леоне леонеһы</displayName>
+			</currency>
+			<currency type="SLL">
+				<displayName>Сьерра-Леоне леонеһы (1964–2022)</displayName>
+				<displayName count="other">Сьерра-Леоне леонеһы (1964–2022)</displayName>
+			</currency>
+			<currency type="SOS">
+				<displayName>Сомали шиллингы</displayName>
+				<displayName count="other">Сомали шиллингы</displayName>
+			</currency>
+			<currency type="SRD">
+				<displayName>Суринам доллары</displayName>
+				<displayName count="other">Суринам доллары</displayName>
+			</currency>
+			<currency type="SRG">
+				<displayName>Суринам гульдены</displayName>
+				<displayName count="other">Суринам гульдены</displayName>
+			</currency>
+			<currency type="SSP">
+				<displayName>Көньяҡ Судан фунты</displayName>
+				<displayName count="other">Көньяҡ Судан фунты</displayName>
+			</currency>
+			<currency type="STD">
+				<displayName>Сан-Томе һәм Принсипи добраһы (1977–2017)</displayName>
+				<displayName count="other">Сан-Томе һәм Принсипи добраһы (1977–2017)</displayName>
+			</currency>
+			<currency type="STN">
+				<displayName>Сан-Томе һәм Принсипи добраһы</displayName>
+				<displayName count="other">Сан-Томе һәм Принсипи добраһы</displayName>
+			</currency>
+			<currency type="SUR">
+				<displayName>СССР рубле</displayName>
+				<displayName count="other">СССР рубле</displayName>
+			</currency>
+			<currency type="SVC">
+				<displayName>Сальвадор колоны</displayName>
+				<displayName count="other">Сальвадор колоны</displayName>
+			</currency>
+			<currency type="SYP">
+				<displayName>Сүриә фунты</displayName>
+				<displayName count="other">Сүриә фунты</displayName>
+			</currency>
+			<currency type="SZL">
+				<displayName>Свазиленд лилангениһы</displayName>
+				<displayName count="other">Свазиленд лилангениһы</displayName>
+			</currency>
+			<currency type="THB">
+				<displayName>Таиланд баты</displayName>
+				<displayName count="other">Таиланд баты</displayName>
+			</currency>
+			<currency type="TJR">
+				<displayName>Тажикстан рубле</displayName>
+				<displayName count="other">Тажикстан рубле</displayName>
+			</currency>
+			<currency type="TJS">
+				<displayName>Тажикстан сомониһы</displayName>
+				<displayName count="other">Тажикстан сомониһы</displayName>
+			</currency>
+			<currency type="TMM">
+				<displayName>Төркмәнстан манаты (1993–2009)</displayName>
+				<displayName count="other">Төркмәнстан манаты (1993–2009)</displayName>
+			</currency>
+			<currency type="TMT">
+				<displayName>Төркмәнстан манаты</displayName>
+				<displayName count="other">Төркмәнстан манаты</displayName>
+			</currency>
+			<currency type="TND">
+				<displayName>Тунис динары</displayName>
+				<displayName count="other">Тунис динары</displayName>
+			</currency>
+			<currency type="TOP">
+				<displayName>Тонга паангаһы</displayName>
+				<displayName count="other">Тонга паангаһы</displayName>
+			</currency>
+			<currency type="TPE">
+				<displayName>Тимор эскудоһы</displayName>
+				<displayName count="other">Тимор эскудоһы</displayName>
+			</currency>
+			<currency type="TRL">
+				<displayName>Төрөк лираһы (1922–2005)</displayName>
+				<displayName count="other">Төрөк лираһы (1922–2005)</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName>Төрөк лираһы</displayName>
+				<displayName count="other">Төрөк лираһы</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName>Тринидад һәм Тобаго доллары</displayName>
+				<displayName count="other">Тринидад һәм Тобаго доллары</displayName>
+			</currency>
+			<currency type="TWD">
+				<displayName>Яңы Тайвань доллары</displayName>
+				<displayName count="other">Яңы Тайвань доллары</displayName>
+			</currency>
+			<currency type="TZS">
+				<displayName>Танзания шиллингы</displayName>
+				<displayName count="other">Танзания шиллингы</displayName>
+			</currency>
+			<currency type="UAH">
+				<displayName>Украина гривнаһы</displayName>
+				<displayName count="other">Украина гривнаһы</displayName>
+			</currency>
+			<currency type="UAK">
+				<displayName>Украина карбованецы</displayName>
+				<displayName count="other">Украина карбованецы</displayName>
+			</currency>
+			<currency type="UGS">
+				<displayName>Уганда шиллингы (1966–1987)</displayName>
+				<displayName count="other">Уганда шиллингы (1966–1987)</displayName>
+			</currency>
+			<currency type="UGX">
+				<displayName>Уганда шиллингы</displayName>
+				<displayName count="other">Уганда шиллингы</displayName>
+			</currency>
+			<currency type="USD">
+				<displayName>АҠШ доллары</displayName>
+				<displayName count="other">АҠШ доллары</displayName>
+				<symbol draft="contributed">$</symbol>
+			</currency>
+			<currency type="USN">
+				<displayName>АҠШ доллары (киләһе көн)</displayName>
+				<displayName count="other">АҠШ доллары (киләһе көн)</displayName>
+			</currency>
+			<currency type="USS">
+				<displayName>АҠШ доллары (шул уҡ көн)</displayName>
+				<displayName count="other">АҠШ доллары (шул уҡ көн)</displayName>
+			</currency>
+			<currency type="UYI">
+				<displayName>Уругвай песоһы (индексланған берәмектәр)</displayName>
+				<displayName count="other">Уругвай песоһы (индексланған берәмектәр)</displayName>
+			</currency>
+			<currency type="UYP">
+				<displayName>Уругвай песоһы (1975–1993)</displayName>
+				<displayName count="other">Уругвай песоһы (1975–1993)</displayName>
+			</currency>
+			<currency type="UYU">
+				<displayName>Уругвай песоһы</displayName>
+				<displayName count="other">Уругвай песоһы</displayName>
+			</currency>
+			<currency type="UYW">
+				<displayName>Уругвай номиналь эш хаҡы индексы берәмеге</displayName>
+				<displayName count="other">Уругвай номиналь эш хаҡы индексы берәмеге</displayName>
+			</currency>
+			<currency type="UZS">
+				<displayName>Үзбәкстан һумы</displayName>
+				<displayName count="other">Үзбәкстан һумы</displayName>
+			</currency>
+			<currency type="VEB">
+				<displayName>Венесуэла боливары (1871–2008)</displayName>
+				<displayName count="other">Венесуэла боливары (1871–2008)</displayName>
+			</currency>
+			<currency type="VED">
+				<displayName>суверенлы боливар</displayName>
+				<displayName count="other">суверенлы боливар</displayName>
+			</currency>
+			<currency type="VEF">
+				<displayName>Венесуэла боливары (2008–2018)</displayName>
+				<displayName count="other">Венесуэла боливары (2008–2018)</displayName>
+			</currency>
+			<currency type="VES">
+				<displayName>Венесуэла боливары</displayName>
+				<displayName count="other">Венесуэла боливары</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName>Вьетнам донгы</displayName>
+				<displayName count="other">Вьетнам донгы</displayName>
+			</currency>
+			<currency type="VNN">
+				<displayName>Вьетнам донгы (1978–1985)</displayName>
+				<displayName count="other">Вьетнам донгы (1978–1985)</displayName>
+			</currency>
+			<currency type="VUV">
+				<displayName>Вануату ватуһы</displayName>
+				<displayName count="other">Вануату ватуһы</displayName>
+			</currency>
+			<currency type="WST">
+				<displayName>Самоа талаһы</displayName>
+				<displayName count="other">Самоа талаһы</displayName>
+			</currency>
+			<currency type="XAF">
+				<displayName>Үҙәк Африка КФА франкы</displayName>
+				<displayName count="other">Үҙәк Африка КФА франкы</displayName>
+			</currency>
+			<currency type="XAG">
+				<displayName>көмөш</displayName>
+				<displayName count="other">труа унция көмөш</displayName>
+			</currency>
+			<currency type="XAU">
+				<displayName>алтын</displayName>
+				<displayName count="other">труа унция алтын</displayName>
+			</currency>
+			<currency type="XBA">
+				<displayName>Европа композит берәмеге</displayName>
+				<displayName count="other">Европа композит берәмеге</displayName>
+			</currency>
+			<currency type="XBB">
+				<displayName>Европа аҡса берәмеге</displayName>
+				<displayName count="other">Европа аҡса берәмеге</displayName>
+			</currency>
+			<currency type="XBC">
+				<displayName>Европа иҫәп берәмеге (XBC)</displayName>
+				<displayName count="other">Европа иҫәп берәмеге (XBC)</displayName>
+			</currency>
+			<currency type="XBD">
+				<displayName>Европа иҫәп берәмеге (XBD)</displayName>
+				<displayName count="other">Европа иҫәп берәмеге (XBD)</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName>Көнсығыш Кариб доллары</displayName>
+				<displayName count="other">Көнсығыш Кариб доллары</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>Кариб гульдены</displayName>
+				<displayName count="other">Кариб гульдены</displayName>
+			</currency>
+			<currency type="XDR">
+				<displayName>Махсус үтес алыу хоҡуҡтары</displayName>
+				<displayName count="other">Махсус үтес алыу хоҡуҡтары</displayName>
+			</currency>
+			<currency type="XEU">
+				<displayName>Европа валюта берәмеге</displayName>
+				<displayName count="other">Европа валюта берәмеге</displayName>
+			</currency>
+			<currency type="XFO">
+				<displayName>Франция алтын франкы</displayName>
+				<displayName count="other">Франция алтын франкы</displayName>
+			</currency>
+			<currency type="XFU">
+				<displayName>Франция UIC-франкы</displayName>
+				<displayName count="other">Франция UIC-франкы</displayName>
+			</currency>
+			<currency type="XOF">
+				<displayName>Көнбайыш Африка КФА франкы</displayName>
+				<displayName count="other">Көнбайыш Африка КФА франкы</displayName>
+				<symbol draft="contributed">F CFA</symbol>
+			</currency>
+			<currency type="XPD">
+				<displayName>палладий</displayName>
+				<displayName count="other">труа унция палладий</displayName>
+			</currency>
+			<currency type="XPF">
+				<displayName>Француз Тымыҡ океан франкы</displayName>
+				<displayName count="other">Француз Тымыҡ океан франкы</displayName>
+			</currency>
+			<currency type="XPT">
+				<displayName>ағалтын</displayName>
+				<displayName count="other">труа унция ағалтын</displayName>
+			</currency>
+			<currency type="XRE">
+				<displayName>RINET фондтары</displayName>
+				<displayName count="other">RINET фондтары</displayName>
+			</currency>
+			<currency type="XSU">
+				<displayName>Сукре</displayName>
+				<displayName count="other">Сукре</displayName>
+			</currency>
+			<currency type="XTS">
+				<displayName>тест валюта берәмеге</displayName>
+				<displayName count="other">тест валюта берәмеге</displayName>
+			</currency>
+			<currency type="XUA">
+				<displayName>АБР иҫәп берәмеге</displayName>
+				<displayName count="other">АБР иҫәп берәмеге</displayName>
+			</currency>
+			<currency type="XXX">
+				<displayName>Билдәһеҙ валюта</displayName>
+				<displayName count="other">Билдәһеҙ валюта</displayName>
+			</currency>
+			<currency type="YDD">
+				<displayName>Йәмән динары</displayName>
+				<displayName count="other">Йәмән динары</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName>Йәмән риалы</displayName>
+				<displayName count="other">Йәмән риалы</displayName>
+			</currency>
+			<currency type="YUD">
+				<displayName>Югославия ҡаты динары (1966–1990)</displayName>
+				<displayName count="other">Югославия ҡаты динары (1966–1990)</displayName>
+			</currency>
+			<currency type="YUM">
+				<displayName>Югославия яңы динары (1994–2002)</displayName>
+				<displayName count="other">Югославия яңы динары (1994–2002)</displayName>
+			</currency>
+			<currency type="YUN">
+				<displayName>Югославия алмашынмалы динары (1990–1992)</displayName>
+				<displayName count="other">Югославия алмашынмалы динары (1990–1992)</displayName>
+			</currency>
+			<currency type="YUR">
+				<displayName>Югославия реформаланған динары (1992–1993)</displayName>
+				<displayName count="other">Югославия реформаланған динары (1992–1993)</displayName>
+			</currency>
+			<currency type="ZAL">
+				<displayName>Көньяҡ Африка рэнды (финанс)</displayName>
+				<displayName count="other">Көньяҡ Африка рэнды (финанс)</displayName>
+			</currency>
+			<currency type="ZAR">
+				<displayName>Көньяҡ Африка рэнды</displayName>
+				<displayName count="other">Көньяҡ Африка рэнды</displayName>
+			</currency>
+			<currency type="ZMK">
+				<displayName>Замбия квачаһы (1968–2012)</displayName>
+				<displayName count="other">Замбия квачаһы (1968–2012)</displayName>
+			</currency>
+			<currency type="ZMW">
+				<displayName>Замбия квачаһы</displayName>
+				<displayName count="other">Замбия квачаһы</displayName>
+			</currency>
+			<currency type="ZRN">
+				<displayName>Заир яңы заиры (1993–1998)</displayName>
+				<displayName count="other">Заир яңы заиры (1993–1998)</displayName>
+			</currency>
+			<currency type="ZRZ">
+				<displayName>Заир заиры (1971–1993)</displayName>
+				<displayName count="other">Заир заиры (1971–1993)</displayName>
+			</currency>
+			<currency type="ZWD">
+				<displayName>Зимбабве доллары (1980–2008)</displayName>
+				<displayName count="other">Зимбабве доллары (1980–2008)</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабве алтыны</displayName>
+				<displayName count="other">Зимбабве алтыны</displayName>
+			</currency>
+			<currency type="ZWL">
+				<displayName>Зимбабве доллары (2009–2024)</displayName>
+				<displayName count="other">Зимбабве доллары (2009–2024)</displayName>
+			</currency>
+			<currency type="ZWR">
+				<displayName>Зимбабве доллары (2008)</displayName>
+				<displayName count="other">Зимбабве доллары (2008)</displayName>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="adlm">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="ahom">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="arab">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="arabext">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="bali">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="beng">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="bhks">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="brah">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="cakm">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="cham">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="deva">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="diak">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="fullwide">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="gara">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="gong">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="gonm">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="gujr">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="gukh">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="guru">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="hanidec">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="hmng">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="hmnp">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="java">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="kali">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="kawi">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="khmr">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="knda">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="krai">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="lana">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="lanatham">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="laoo">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="lepc">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="limb">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mathbold">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mathdbl">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mathmono">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mathsanb">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mathsans">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mlym">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="modi">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mong">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mroo">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mtei">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymr">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymrepka">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymrpao">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymrshan">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymrtlng">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="nagm">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="newa">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="nkoo">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="olck">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="onao">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="orya">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="osma">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="outlined">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="rohg">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="saur">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="segment">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="shrd">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="sind">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="sinh">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="sora">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="sund">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="sunu">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="takr">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="talu">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="tamldec">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="telu">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="thai">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="tibt">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="tirh">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="tnsa">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="vaii">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="wara">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="wcho">
+			<pattern type="atLeast">{0}+</pattern>
+		</miscPatterns>
+		<minimalPairs>
+			<pluralMinimalPairs count="other" draft="contributed">{0} көн</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">{0} уңға боролоғоҙ.</ordinalMinimalPairs>
+		</minimalPairs>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>деци{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>санти{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>милли{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>микро{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>нано{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>пико{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>фемто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>атто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>зепто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>иокто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>ронто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>квекто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>дека{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>гекто{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>кило{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>мега{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>гига{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>тера{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>пета{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>экса{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>зетта{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>иотта{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ронна{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>кветта{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>киби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>меби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>гиби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>теби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>пеби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>эксби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>зеби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>йоби{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="power2">
+				<compoundUnitPattern1 count="other">квадрат {0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="other">куб {0}</compoundUnitPattern1>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>g-көс</displayName>
+				<unitPattern count="other">{0} g-көс</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>квадрат секундҡа метр</displayName>
+				<unitPattern count="other">{0} квадрат секундҡа метр</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>әйләнештәр</displayName>
+				<unitPattern count="other">{0} әйләнеш</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радиандар</displayName>
+				<unitPattern count="other">{0} радиан</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градустар</displayName>
+				<unitPattern count="other">{0} градус</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>минуттар</displayName>
+				<unitPattern count="other">{0} минут</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>секундтар</displayName>
+				<unitPattern count="other">{0} секунд</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>квадрат километрҙар</displayName>
+				<unitPattern count="other">{0} квадрат километр</unitPattern>
+				<perUnitPattern>квадрат километрға {0}</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>гектарҙар</displayName>
+				<unitPattern count="other">{0} гектар</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>квадрат метрҙар</displayName>
+				<unitPattern count="other">{0} квадрат метр</unitPattern>
+				<perUnitPattern>квадрат метрға {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>квадрат сантиметрҙар</displayName>
+				<unitPattern count="other">{0} квадрат сантиметр</unitPattern>
+				<perUnitPattern>квадрат сантиметрға {0}</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>квадрат милдәр</displayName>
+				<unitPattern count="other">{0} квадрат миль</unitPattern>
+				<perUnitPattern>квадрат милгә {0}</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акрҙар</displayName>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>квадрат ярдтар</displayName>
+				<unitPattern count="other">{0} квадрат ярд</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>квадрат футтар</displayName>
+				<unitPattern count="other">{0} квадрат фут</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>квадрат дюймдар</displayName>
+				<unitPattern count="other">{0} квадрат дюйм</unitPattern>
+				<perUnitPattern>{0} квадрат дюймға</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>дунамдар</displayName>
+				<unitPattern count="other">{0} дунам</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>караттар</displayName>
+				<unitPattern count="other">{0} карат</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>децилитрға миллиграмм</displayName>
+				<unitPattern count="other">{0} миллиграмм децилитрға</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>литрға миллимоль</displayName>
+				<unitPattern count="other">{0} миллимоль литрға</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>әйберҙәр</displayName>
+				<unitPattern count="other">{0} әйбер</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>өлөштәр</displayName>
+				<unitPattern count="other">{0} өлөш</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>миллионға өлөш</displayName>
+				<unitPattern count="other">{0} өлөш/млн</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>процент</displayName>
+				<unitPattern count="other">{0} процент</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>промилле</displayName>
+				<unitPattern count="other">{0} промилле</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>промириад</displayName>
+				<unitPattern count="other">{0} промириад</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>молдәр</displayName>
+				<unitPattern count="other">{0} моль</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="other">{0} глюкоза</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>километрға литр</displayName>
+				<unitPattern count="other">{0} литр километрға</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>100 километрға литр</displayName>
+				<unitPattern count="other">{0} литр 100 километрға</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>галлонға милдәр</displayName>
+				<unitPattern count="other">{0} галлонға миль</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>Империя галлонына милдәр</displayName>
+				<unitPattern count="other">{0} Империя галлонына миль</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>петабайттар</displayName>
+				<unitPattern count="other">{0} петабайт</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>терабайттар</displayName>
+				<unitPattern count="other">{0} терабайт</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>терабиттар</displayName>
+				<unitPattern count="other">{0} терабит</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>гигабайттар</displayName>
+				<unitPattern count="other">{0} гигабайт</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>гигабиттар</displayName>
+				<unitPattern count="other">{0} гигабит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>мегабайттар</displayName>
+				<unitPattern count="other">{0} мегабайт</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>мегабиттар</displayName>
+				<unitPattern count="other">{0} мегабит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>килобайттар</displayName>
+				<unitPattern count="other">{0} килобайт</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>килобиттар</displayName>
+				<unitPattern count="other">{0} килобит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байттар</displayName>
+				<unitPattern count="other">{0} байт</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>биттар</displayName>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>быуаттар</displayName>
+				<unitPattern count="other">{0} быуат</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>йыл тиҫтәләре</displayName>
+				<unitPattern count="other">{0} йыл тиҫтәһе</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>йылдар</displayName>
+				<unitPattern count="other">{0} йыл</unitPattern>
+				<perUnitPattern>{0}/йыл</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>кварталдар</displayName>
+				<unitPattern count="other">{0} квартал</unitPattern>
+				<perUnitPattern>{0}/квартал</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>айҙар</displayName>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>{0} айына</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>аҙналар</displayName>
+				<unitPattern count="other">{0} аҙна</unitPattern>
+				<perUnitPattern>{0}/аҙна</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>көндәр</displayName>
+				<unitPattern count="other">{0} көн</unitPattern>
+				<perUnitPattern>{0}/көн</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сәғәт</displayName>
+				<unitPattern count="other">{0} сәғәт</unitPattern>
+				<perUnitPattern>{0}/сәғәт</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>минуттар</displayName>
+				<unitPattern count="other">{0} минут</unitPattern>
+				<perUnitPattern>{0}/минут</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>секундтар</displayName>
+				<unitPattern count="other">{0} секунд</unitPattern>
+				<perUnitPattern>{0}/секунд</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>миллисекундтар</displayName>
+				<unitPattern count="other">{0} миллисекунд</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>микросекундтар</displayName>
+				<unitPattern count="other">{0} микросекунд</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>наносекундтар</displayName>
+				<unitPattern count="other">{0} наносекунд</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>амперҙар</displayName>
+				<unitPattern count="other">{0} ампер</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>миллиамперҙар</displayName>
+				<unitPattern count="other">{0} миллиампер</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>омдар</displayName>
+				<unitPattern count="other">{0} Ом</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>вольттар</displayName>
+				<unitPattern count="other">{0} вольт</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>килокалориялар</displayName>
+				<unitPattern count="other">{0} килокалория</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>калориялар</displayName>
+				<unitPattern count="other">{0} калория</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>килоджоулдәр</displayName>
+				<unitPattern count="other">{0} килоджоуль</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>джоулдәр</displayName>
+				<unitPattern count="other">{0} джоуль</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>киловатт-сәғәттәр</displayName>
+				<unitPattern count="other">{0} киловатт-сәғәт</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>электронвольттар</displayName>
+				<unitPattern count="other">{0} электронвольт</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>Британия йылылыҡ берәмектәре</displayName>
+				<unitPattern count="other">{0} Британия йылылыҡ берәмеге</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>АҠШ термдары</displayName>
+				<unitPattern count="other">{0} АҠШ термы</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>фунт-көс</displayName>
+				<unitPattern count="other">{0} фунт-көс</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>ньютондар</displayName>
+				<unitPattern count="other">{0} ньютон</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>100 километрға киловатт-сәғәт</displayName>
+				<unitPattern count="other">{0} киловатт-сәғәт 100 километрға</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>гигагерцтар</displayName>
+				<unitPattern count="other">{0} гигагерц</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>мегагерцтар</displayName>
+				<unitPattern count="other">{0} мегагерц</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>килогерцтар</displayName>
+				<unitPattern count="other">{0} килогерц</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>герцтар</displayName>
+				<unitPattern count="other">{0} герц</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName>типографик эм</displayName>
+				<unitPattern count="other">{0} эм</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName>пикселдәр</displayName>
+				<unitPattern count="other">{0} пиксел</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>мегапикселдәр</displayName>
+				<unitPattern count="other">{0} мегапиксел</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName>сантиметрға пикселдар</displayName>
+				<unitPattern count="other">{0} пиксел сантиметрға</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>дюймға пикселдар</displayName>
+				<unitPattern count="other">{0} пиксел дюймға</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName>ер радиусы</displayName>
+				<unitPattern count="other">{0} ер радиусы</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>километрҙар</displayName>
+				<unitPattern count="other">{0} километр</unitPattern>
+				<perUnitPattern>километрға {0}</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>метрҙар</displayName>
+				<unitPattern count="other">{0} метр</unitPattern>
+				<perUnitPattern>метрға {0}</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дециметрҙар</displayName>
+				<unitPattern count="other">{0} дециметр</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>сантиметрҙар</displayName>
+				<unitPattern count="other">{0} сантиметр</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>миллиметрҙар</displayName>
+				<unitPattern count="other">{0} миллиметр</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>микрометрҙар</displayName>
+				<unitPattern count="other">{0} микрометр</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нанометрҙар</displayName>
+				<unitPattern count="other">{0} нанометр</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пикометрҙар</displayName>
+				<unitPattern count="other">{0} пикометр</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>милдәр</displayName>
+				<unitPattern count="other">{0} миль</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярдтар</displayName>
+				<unitPattern count="other">{0} ярд</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>футтар</displayName>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>футҡа {0}</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюймдар</displayName>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>дюймға {0}</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсектар</displayName>
+				<unitPattern count="other">{0} парсек</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>яҡтылыҡ йылдары</displayName>
+				<unitPattern count="other">{0} яҡтылыҡ йылы</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>астрономик берәмектәр</displayName>
+				<unitPattern count="other">{0} астрономик берәмек</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<unitPattern count="other">{0} сажин</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>диңгеҙ милдәре</displayName>
+				<unitPattern count="other">{0} диңгеҙ миле</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>скандинав милдәре</displayName>
+				<unitPattern count="other">{0} скандинав миле</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>пункттар</displayName>
+				<unitPattern count="other">{0} пункт</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>ҡояш радиустары</displayName>
+				<unitPattern count="other">{0} ҡояш радиусы</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>люкстар</displayName>
+				<unitPattern count="other">{0} люкс</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>канделалар</displayName>
+				<unitPattern count="other">{0} кандела</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>люмен</displayName>
+				<unitPattern count="other">{0} люмен</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>ҡояш яҡтылыҡтары</displayName>
+				<unitPattern count="other">{0} ҡояш яҡтылығы</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>тонналар</displayName>
+				<unitPattern count="other">{0} т</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>килограммдар</displayName>
+				<unitPattern count="other">{0} килограмм</unitPattern>
+				<perUnitPattern>{0} килограммға</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>граммдар</displayName>
+				<unitPattern count="other">{0} грамм</unitPattern>
+				<perUnitPattern>{0} граммға</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>миллиграммдар</displayName>
+				<unitPattern count="other">{0} миллиграмм</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>микрограммдар</displayName>
+				<unitPattern count="other">{0} микрограмм</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>тонналар</displayName>
+				<unitPattern count="other">{0} тонна</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>стоундар</displayName>
+				<unitPattern count="other">{0} стоун</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунттар</displayName>
+				<unitPattern count="other">{0} фунт</unitPattern>
+				<perUnitPattern>{0} фунтҡа</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унциялар</displayName>
+				<unitPattern count="other">{0} унция</unitPattern>
+				<perUnitPattern>{0} унцияға</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>трой унциялары</displayName>
+				<unitPattern count="other">{0} трой унцияһы</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>караттар</displayName>
+				<unitPattern count="other">{0} карат</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>дальтондар</displayName>
+				<unitPattern count="other">{0} дальтон</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Ер массалары</displayName>
+				<unitPattern count="other">{0} Ер массаһы</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>ҡояш массалары</displayName>
+				<unitPattern count="other">{0} ҡояш массаһы</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>грандар</displayName>
+				<unitPattern count="other">{0} гран</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>гигаваттар</displayName>
+				<unitPattern count="other">{0} гигаватт</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>мегаваттар</displayName>
+				<unitPattern count="other">{0} мегаватт</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>киловаттар</displayName>
+				<unitPattern count="other">{0} киловатт</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>ватттар</displayName>
+				<unitPattern count="other">{0} ватт</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>милливаттар</displayName>
+				<unitPattern count="other">{0} милливатт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ат көсө</displayName>
+				<unitPattern count="other">{0} ат көсө</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>терегөмөш бағанаһы миллиметрҙары</displayName>
+				<unitPattern count="other">{0} терегөмөш бағанаһы миллиметры</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>терегөмөш бағанаһы</displayName>
+				<unitPattern count="other">{0} тер. бағ.</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>квадрат дюймға фунт-көс</displayName>
+				<unitPattern count="other">{0} квадрат дюймға фунт-көс</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>терегөмөш бағанаһы дюймдары</displayName>
+				<unitPattern count="other">{0} терегөмөш бағанаһы дюймдары</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>барҙар</displayName>
+				<unitPattern count="other">{0} бар</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>миллибарҙар</displayName>
+				<unitPattern count="other">{0} миллибар</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>атмосфералар</displayName>
+				<unitPattern count="other">{0} атмосфера</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>паскалдәр</displayName>
+				<unitPattern count="other">{0} паскаль</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>гектопаскалдәр</displayName>
+				<unitPattern count="other">{0} гектопаскаль</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>килопаскалдәр</displayName>
+				<unitPattern count="other">{0} килопаскаль</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>мегапаскалдәр</displayName>
+				<unitPattern count="other">{0} мегапаскаль</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>сәғәтенә километр</displayName>
+				<unitPattern count="other">{0} сәғәтенә километр</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>секундҡа метр</displayName>
+				<unitPattern count="other">{0} секундҡа метр</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>сәғәтенә миль</displayName>
+				<unitPattern count="other">{0} сәғәтенә миль</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>төйөндәр</displayName>
+				<unitPattern count="other">{0} төйөн</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>Бофорт</displayName>
+				<unitPattern count="other">Бофорт {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>температура градустары</displayName>
+				<unitPattern count="other">{0} градус</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>Цельсий градустары</displayName>
+				<unitPattern count="other">{0} Цельсий градусы</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>Фаренгейт градустары</displayName>
+				<unitPattern count="other">{0} Фаренгейт градусы</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>кельвиндар</displayName>
+				<unitPattern count="other">{0} кельвин</unitPattern>
+			</unit>
+			<unit type="torque-pound-force-foot">
+				<displayName>фунт-фут</displayName>
+				<unitPattern count="other">{0} фунт-фут</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>ньютон-метрҙар</displayName>
+				<unitPattern count="other">{0} ньютон-метр</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>куб километрҙар</displayName>
+				<unitPattern count="other">{0} куб километр</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>куб метрҙар</displayName>
+				<unitPattern count="other">{0} куб метр</unitPattern>
+				<perUnitPattern>{0} куб метрға</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>куб сантиметрҙар</displayName>
+				<unitPattern count="other">{0} куб сантиметр</unitPattern>
+				<perUnitPattern>{0} куб сантиметрға</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>куб милдәр</displayName>
+				<unitPattern count="other">{0} куб миль</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>куб ярдтар</displayName>
+				<unitPattern count="other">{0} куб ярд</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>куб футтар</displayName>
+				<unitPattern count="other">{0} куб фут</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>куб дюймдар</displayName>
+				<unitPattern count="other">{0} куб дюйм</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>мегалитрҙар</displayName>
+				<unitPattern count="other">{0} мегалитр</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>гектолитрҙар</displayName>
+				<unitPattern count="other">{0} гектолитр</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>литрҙар</displayName>
+				<unitPattern count="other">{0} литр</unitPattern>
+				<perUnitPattern>{0} литрға</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>децилитрҙар</displayName>
+				<unitPattern count="other">{0} децилитр</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сантилитрҙар</displayName>
+				<unitPattern count="other">{0} сантилитр</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>миллилитрҙар</displayName>
+				<unitPattern count="other">{0} миллилитр</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>метрик пинталар</displayName>
+				<unitPattern count="other">{0} метрик пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>метрик сынаяҡтар</displayName>
+				<unitPattern count="other">{0} метрик сынаяҡ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрик шыйыҡ унциялар</displayName>
+				<unitPattern count="other">{0} метрик шыйыҡ унция</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-футтар</displayName>
+				<unitPattern count="other">{0} акр-фут</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>бушелдәр</displayName>
+				<unitPattern count="other">{0} бушель</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галлондар</displayName>
+				<unitPattern count="other">{0} галлон</unitPattern>
+				<perUnitPattern>галлонға {0}</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>империя галлондары</displayName>
+				<unitPattern count="other">{0} империя галлоны</unitPattern>
+				<perUnitPattern>{0} империя галлонына</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>кварталар</displayName>
+				<unitPattern count="other">{0} кварта</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>пинталар</displayName>
+				<unitPattern count="other">{0} пинта</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>Империя пинталары</displayName>
+				<unitPattern count="other">{0} Империя пинтаһы</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>сынаяҡтар</displayName>
+				<unitPattern count="other">{0} сынаяҡ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>шыйыҡ унциялар</displayName>
+				<unitPattern count="other">{0} шыйыҡ унция</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>империя шыйыҡ унциялары</displayName>
+				<unitPattern count="other">{0} империя шыйыҡ унцияһы</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>аш ҡалаҡтары</displayName>
+				<unitPattern count="other">{0} аш ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>сәй ҡалаҡтары</displayName>
+				<unitPattern count="other">{0} сәй ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>баррелдәр</displayName>
+				<unitPattern count="other">{0} баррель</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>десерт ҡалаҡтары</displayName>
+				<unitPattern count="other">{0} десерт ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>империя десерт ҡалаҡтары</displayName>
+				<unitPattern count="other">{0} империя десерт ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>тамсылар</displayName>
+				<unitPattern count="other">{0} тамсы</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>драхмалар</displayName>
+				<unitPattern count="other">{0} драхма</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>джиггерҙар</displayName>
+				<unitPattern count="other">{0} джиггер</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>семтемдәр</displayName>
+				<unitPattern count="other">{0} семтем</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>Империя кварталары</displayName>
+				<unitPattern count="other">{0} империя квартаһы</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>стерадиандар</displayName>
+				<unitPattern count="other">{0} стерадиан</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>каталдар</displayName>
+				<unitPattern count="other">{0} катал</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулондар</displayName>
+				<unitPattern count="other">{0} кулон</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарадтар</displayName>
+				<unitPattern count="other">{0} фарад</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генри</displayName>
+				<unitPattern count="other">{0} генри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сименстар</displayName>
+				<unitPattern count="other">{0} сименс</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>халыҡ-ара калориялар</displayName>
+				<unitPattern count="other">{0} халыҡ-ара калория</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>Британия йылылыҡ берәмектәре [IT]</displayName>
+				<unitPattern count="other">{0} Британия йылылыҡ берәмеге [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>беккерелдәр</displayName>
+				<unitPattern count="other">{0} беккерель</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зиверттар</displayName>
+				<unitPattern count="other">{0} зиверт</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>грейҙар</displayName>
+				<unitPattern count="other">{0} грей</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограмм-көс</displayName>
+				<unitPattern count="other">{0} килограмм-көс</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>родтар</displayName>
+				<unitPattern count="other">{0} род</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>сылбырҙар</displayName>
+				<unitPattern count="other">{0} сылбыр</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>теслалар</displayName>
+				<unitPattern count="other">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>веберҙар</displayName>
+				<unitPattern count="other">{0} вебер</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>ранкиндар</displayName>
+				<unitPattern count="other">{0} ранкин</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>фортнайттар</displayName>
+				<unitPattern count="other">{0} фортнайт</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>слагтар</displayName>
+				<unitPattern count="other">{0} слаг</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>бензин эквиваленты</displayName>
+				<unitPattern count="other">{0} бензин эквиваленты</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>рин [JP]</displayName>
+			</unit>
+			<unit type="length-sun">
+				<displayName>сун [JP]</displayName>
+				<unitPattern count="other">{0} сун [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>шаку [JP]</displayName>
+				<unitPattern count="other">{0} шаку [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>шаку [туҡыма, JP]</displayName>
+				<unitPattern count="other">{0} шаку [туҡыма, JP]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>кен [JP]</displayName>
+				<unitPattern count="other">{0} кен [JP]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>джо [JP]</displayName>
+				<unitPattern count="other">{0} джо [JP]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ри [JP]</displayName>
+				<unitPattern count="other">{0} ри [JP]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>бу [JP]</displayName>
+				<unitPattern count="other">{0} бу [JP]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>се [JP]</displayName>
+				<unitPattern count="other">{0} се [JP]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>чо [JP]</displayName>
+				<unitPattern count="other">{0} чо [JP]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>косажи [JP]</displayName>
+				<unitPattern count="other">{0} косажи [JP]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>осажи [JP]</displayName>
+				<unitPattern count="other">{0} осажи [JP]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>сынаяҡ [JP]</displayName>
+				<unitPattern count="other">{0} сынаяҡ [JP]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>шаку [күләм, JP]</displayName>
+				<unitPattern count="other">{0} шаку [күләм, JP]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>сай [JP]</displayName>
+				<unitPattern count="other">{0} сай [JP]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>то [JP]</displayName>
+				<unitPattern count="other">{0} то [JP]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>коку [JP]</displayName>
+				<unitPattern count="other">{0} коку [JP]</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>яҡтылыҡ</displayName>
+				<unitPattern count="other">{0} яҡтылыҡ</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>фун [JP]</displayName>
+				<unitPattern count="other">{0} фун [JP]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>миллиардҡа өлөш</displayName>
+				<unitPattern count="other">{0} өлөш миллиардҡа</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>төндәр</displayName>
+				<unitPattern count="other">{0} төн</unitPattern>
+				<perUnitPattern>{0}/төн</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>кардиналь йүнәлеш</displayName>
+				<coordinateUnitPattern type="east">{0} көнсығыш оҙонлоҡ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} төньяҡ киңлек</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} көньяҡ киңлек</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} көнбайыш оҙонлоҡ</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>д{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>с{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>м{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>мк{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>н{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>п{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>ф{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>а{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>з{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>и{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>р{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>кв{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>да{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>г{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>к{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>М{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>Г{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>Т{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>П{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>Э{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>З{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>И{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>Р{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>Кв{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>Ки{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>Ми{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>Ги{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>Ти{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>Пи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>Эи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>Зи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>Йи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>g-көс</displayName>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>м/с²</displayName>
+				<unitPattern count="other">{0} м/с²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>әйләнеш</displayName>
+				<unitPattern count="other">{0} әйләнеш</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>радиан</displayName>
+				<unitPattern count="other">{0} рад</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>градустар</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>мин</displayName>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>сек</displayName>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="other">{0} км²</unitPattern>
+				<perUnitPattern>{0}/км²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>гектарҙар</displayName>
+				<unitPattern count="other">{0} гектар</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>м²</displayName>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>см²</displayName>
+				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>кв. милдәр</displayName>
+				<unitPattern count="other">{0} кв. миль</unitPattern>
+				<perUnitPattern>{0}/ми²</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярд²</displayName>
+				<unitPattern count="other">{0} ярд²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>фут²</displayName>
+				<unitPattern count="other">{0} фут²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>дюйм²</displayName>
+				<unitPattern count="other">{0} дюйм²</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>дунамдар</displayName>
+				<unitPattern count="other">{0} дунам</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>кар</displayName>
+				<unitPattern count="other">{0} кар</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>мг/дл</displayName>
+				<unitPattern count="other">{0} мг/дл</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>ммоль/л</displayName>
+				<unitPattern count="other">{0} ммоль/л</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>әйбер</displayName>
+				<unitPattern count="other">{0} әйбер</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>өлөш</displayName>
+				<unitPattern count="other">{0} өлөш</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>өлөш/миллион</displayName>
+				<unitPattern count="other">{0} өлөш/млн</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>моль</displayName>
+				<unitPattern count="other">{0} моль</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>л/км</displayName>
+				<unitPattern count="other">{0} л/км</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>милдәр/галлон</displayName>
+				<unitPattern count="other">{0} галлонға миль</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>милдәр/имп. галлон</displayName>
+				<unitPattern count="other">{0} миль/имп. гал</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>ПБ</displayName>
+				<unitPattern count="other">{0} ПБ</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>ТБ</displayName>
+				<unitPattern count="other">{0} ТБ</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Тбит</displayName>
+				<unitPattern count="other">{0} Тбит</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ГБ</displayName>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбит</displayName>
+				<unitPattern count="other">{0} Гбит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>МБ</displayName>
+				<unitPattern count="other">{0} МБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбит</displayName>
+				<unitPattern count="other">{0} Мбит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кБ</displayName>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбит</displayName>
+				<unitPattern count="other">{0} кбит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>байт</displayName>
+				<unitPattern count="other">{0} Б</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>б.</displayName>
+				<unitPattern count="other">{0} б.</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>йый тиҫт.</displayName>
+				<unitPattern count="other">{0} йыл тиҫтәһе</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>йылдар</displayName>
+				<unitPattern count="other">{0} йыл</unitPattern>
+				<perUnitPattern>{0}/й</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>кварт.</displayName>
+				<unitPattern count="other">{0} кварт.</unitPattern>
+				<perUnitPattern>{0}/кв</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>айҙар</displayName>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>{0}/ай</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>аҙн.</displayName>
+				<unitPattern count="other">{0} аҙна</unitPattern>
+				<perUnitPattern>{0}/аҙна</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>көндәр</displayName>
+				<unitPattern count="other">{0} көн</unitPattern>
+				<perUnitPattern>{0}/көн</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сәғәт</displayName>
+				<unitPattern count="other">{0} сәғәт</unitPattern>
+				<perUnitPattern>{0}/сәғ</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин</displayName>
+				<unitPattern count="other">{0} мин</unitPattern>
+				<perUnitPattern>{0}/мин</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>сек</displayName>
+				<unitPattern count="other">{0} с</unitPattern>
+				<perUnitPattern>{0}/с</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="other">{0} мс</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>мкс</displayName>
+				<unitPattern count="other">{0} мкс</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>нс</displayName>
+				<unitPattern count="other">{0} нс</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>А</displayName>
+				<unitPattern count="other">{0} А</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>мА</displayName>
+				<unitPattern count="other">{0} мА</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>Ом</displayName>
+				<unitPattern count="other">{0} Ом</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>В</displayName>
+				<unitPattern count="other">{0} В</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>кал</displayName>
+				<unitPattern count="other">{0} кал</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>килоджоуль</displayName>
+				<unitPattern count="other">{0} кДж</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>джоуль</displayName>
+				<unitPattern count="other">{0} Дж</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>кВт⋅сәғ</displayName>
+				<unitPattern count="other">{0} кВт⋅сәғ</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>эВ</displayName>
+				<unitPattern count="other">{0} эВ</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>БТЕ</displayName>
+				<unitPattern count="other">{0} БТЕ</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>АҠШ термаһы</displayName>
+				<unitPattern count="other">{0} АҠШ термы</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>фунт-көс</displayName>
+				<unitPattern count="other">{0} фнт-көс</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>ньютон</displayName>
+				<unitPattern count="other">{0} Н</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>кВт⋅сәғ/100 км</displayName>
+				<unitPattern count="other">{0} кВт⋅сәғ/100 км</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>ГГц</displayName>
+				<unitPattern count="other">{0} ГГц</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="other">{0} МГц</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>кГц</displayName>
+				<unitPattern count="other">{0} кГц</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="other">{0} Гц</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName>эм</displayName>
+				<unitPattern count="other">{0} эм</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName>пкс</displayName>
+				<unitPattern count="other">{0} пкс</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>Мпкс</displayName>
+				<unitPattern count="other">{0} Мпкс</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName>пкс/см</displayName>
+				<unitPattern count="other">{0} пкс/см</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>пкс/дюйм</displayName>
+				<unitPattern count="other">{0} пкс/дюйм</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName>ер радиусы</displayName>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>м</displayName>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дм</displayName>
+				<unitPattern count="other">{0} дм</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="other">{0} мм</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>мкм</displayName>
+				<unitPattern count="other">{0} мкм</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нм</displayName>
+				<unitPattern count="other">{0} нм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пм</displayName>
+				<unitPattern count="other">{0} пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>милдәр</displayName>
+				<unitPattern count="other">{0} миль</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярд</displayName>
+				<unitPattern count="other">{0} ярд</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>парсек</displayName>
+				<unitPattern count="other">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>яҡтылыҡ йылдары</displayName>
+				<unitPattern count="other">{0} яҡт. й.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. б.</displayName>
+				<unitPattern count="other">{0} а. б.</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>фурлонг</displayName>
+				<unitPattern count="other">{0} фурлонг</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>диңгеҙ милдәре</displayName>
+				<unitPattern count="other">{0} диңгеҙ миле</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ск. ми</displayName>
+				<unitPattern count="other">{0} ск. ми</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>пкт</displayName>
+				<unitPattern count="other">{0} пкт</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>ҡояш радиустары</displayName>
+			</unit>
+			<unit type="light-lux">
+				<displayName>лк</displayName>
+				<unitPattern count="other">{0} лк</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>кд</displayName>
+				<unitPattern count="other">{0} кд</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>лм</displayName>
+				<unitPattern count="other">{0} лм</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>ҡояш яҡтылыҡтары</displayName>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>т</displayName>
+				<unitPattern count="other">{0} т</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>грам</displayName>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>мг</displayName>
+				<unitPattern count="other">{0} мг</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="other">{0} мкг</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>АҠШ тоннаһы</displayName>
+				<unitPattern count="other">{0} амер. т</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>стоун</displayName>
+				<unitPattern count="other">{0} стоун</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фунттар</displayName>
+				<unitPattern count="other">{0} фнт</unitPattern>
+				<perUnitPattern>{0}/фнт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="other">{0} унция</unitPattern>
+				<perUnitPattern>{0}/унц.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>карат</displayName>
+				<unitPattern count="other">{0} кар</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>дальтон</displayName>
+				<unitPattern count="other">{0} Да</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Ер массалары</displayName>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>ҡояш массалары</displayName>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>гран</displayName>
+				<unitPattern count="other">{0} гран</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ГВт</displayName>
+				<unitPattern count="other">{0} ГВт</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>МВт</displayName>
+				<unitPattern count="other">{0} МВт</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>кВт</displayName>
+				<unitPattern count="other">{0} кВт</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>ватттар</displayName>
+				<unitPattern count="other">{0} Вт</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мВт</displayName>
+				<unitPattern count="other">{0} мВт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ат көсө</displayName>
+				<unitPattern count="other">{0} ат көсө</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>тер. бағ. мм</displayName>
+				<unitPattern count="other">{0} тер. бағ. мм</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>тер. бағ.</displayName>
+				<unitPattern count="other">{0} тер. бағ.</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ф/дюйм²</displayName>
+				<unitPattern count="other">{0} ф/дюйм²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>тер. бағ. дюймдары</displayName>
+				<unitPattern count="other">{0} тер. бағ. д.</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>бар</displayName>
+				<unitPattern count="other">{0} бар</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="other">{0} мбар</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>атм</displayName>
+				<unitPattern count="other">{0} атм</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>Па</displayName>
+				<unitPattern count="other">{0} Па</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>гПа</displayName>
+				<unitPattern count="other">{0} гПа</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>кПа</displayName>
+				<unitPattern count="other">{0} кПа</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>МПа</displayName>
+				<unitPattern count="other">{0} МПа</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>км/сәғ</displayName>
+				<unitPattern count="other">{0} км/сәғ</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>м/с</displayName>
+				<unitPattern count="other">{0} м/с</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>миль/сәғ.</displayName>
+				<unitPattern count="other">{0} миль/сәғ</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>төйөн</displayName>
+				<unitPattern count="other">{0} төйөн</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>Бфт</displayName>
+				<unitPattern count="other">{0} Бфт</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>градустар</displayName>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>К</displayName>
+				<unitPattern count="other">{0} К</unitPattern>
+			</unit>
+			<unit type="torque-pound-force-foot">
+				<displayName>фунт-фут</displayName>
+				<unitPattern count="other">{0} фунт-фут</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>Н⋅м</displayName>
+				<unitPattern count="other">{0} Н⋅м</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>км³</displayName>
+				<unitPattern count="other">{0} км³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>м³</displayName>
+				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>миль³</displayName>
+				<unitPattern count="other">{0} миль³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ярд³</displayName>
+				<unitPattern count="other">{0} ярд³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>фут³</displayName>
+				<unitPattern count="other">{0} фут³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>дюйм³</displayName>
+				<unitPattern count="other">{0} дюйм³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Мл</displayName>
+				<unitPattern count="other">{0} Мл</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>гл</displayName>
+				<unitPattern count="other">{0} гл</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>литрҙар</displayName>
+				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сл</displayName>
+				<unitPattern count="other">{0} сл</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>мл</displayName>
+				<unitPattern count="other">{0} мл</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>мпт</displayName>
+				<unitPattern count="other">{0} мпт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>м. сынаяҡтар</displayName>
+				<unitPattern count="other">{0} м. сынаяҡ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м.ш.у.</displayName>
+				<unitPattern count="other">{0} м.ш.у.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акрофут</displayName>
+				<unitPattern count="other">{0} акрофут</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>бушель</displayName>
+				<unitPattern count="other">{0} буш.</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>галлон</displayName>
+				<unitPattern count="other">{0} галлон</unitPattern>
+				<perUnitPattern>{0}/галлон</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>империя галлондары</displayName>
+				<unitPattern count="other">{0} имп. галл.</unitPattern>
+				<perUnitPattern>{0}/имп. галл.</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>кварталар</displayName>
+				<unitPattern count="other">{0} кварта</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>пинта</displayName>
+				<unitPattern count="other">{0} пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>сынаяҡ</displayName>
+				<unitPattern count="other">{0} сынаяҡ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>шыйыҡ унциялар</displayName>
+				<unitPattern count="other">{0} шыйыҡ унция</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>империя ш. унциялары</displayName>
+				<unitPattern count="other">{0} имп. шыйыҡ унция</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>аш ҡалағы</displayName>
+				<unitPattern count="other">{0} аш ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>сәй ҡалағы</displayName>
+				<unitPattern count="other">{0} сәй ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>баррель</displayName>
+				<unitPattern count="other">{0} барр.</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>десерт ҡалағы</displayName>
+				<unitPattern count="other">{0} десерт ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>имп. десерт ҡалағы</displayName>
+				<unitPattern count="other">{0} имп. десерт ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>тамсы</displayName>
+				<unitPattern count="other">{0} тамсы</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>драхмалар</displayName>
+				<unitPattern count="other">{0} драхма</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>джиггер</displayName>
+				<unitPattern count="other">{0} джиггер</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>семтем</displayName>
+				<unitPattern count="other">{0} семтем</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>имп. кварта</displayName>
+				<unitPattern count="other">{0} имп. кварт.</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>халыҡ-ара кал.</displayName>
+				<unitPattern count="other">{0} х.а.кал.</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгк</displayName>
+				<unitPattern count="other">{0} кгк</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>род</displayName>
+				<unitPattern count="other">{0} род</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<unitPattern count="other">{0} сылбыр</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>фртнт.</displayName>
+				<unitPattern count="other">{0} фортнайт</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>слаг</displayName>
+				<unitPattern count="other">{0} слаг</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>газ эквиваленты</displayName>
+				<unitPattern count="other">{0} газ эквиваленты</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>яҡтылыҡ</displayName>
+				<unitPattern count="other">{0} яҡтылыҡ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>өлөш/млрд</displayName>
+				<unitPattern count="other">{0} өлөш/млрд</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>төндәр</displayName>
+				<unitPattern count="other">{0} төн</unitPattern>
+				<perUnitPattern>{0}/төн</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>йүнәлеш</displayName>
+				<coordinateUnitPattern type="east">{0} көнсығыш</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} төньяҡ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} көньяҡ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} көнбайыш</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>д{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>с{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>м{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>мк{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>н{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>п{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>ф{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>а{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>з{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>и{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>р{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>кв{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>да{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>г{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>к{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>М{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>Г{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>Т{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>П{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>Э{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>З{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>И{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>Р{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>Кв{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>Ки{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>Ми{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>Ги{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>Ти{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>Пи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>Эи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>Зи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>Йи{0}</unitPrefixPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>g-көс</displayName>
+				<unitPattern count="other">{0}Gs</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>м/с²</displayName>
+				<unitPattern count="other">{0} м/с²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>әйләнеш</displayName>
+				<unitPattern count="other">{0} әйләнеш</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>рад</displayName>
+				<unitPattern count="other">{0} рад</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>гр.</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>мин</displayName>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>сек</displayName>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>км²</displayName>
+				<unitPattern count="other">{0} км²</unitPattern>
+				<perUnitPattern>{0}/км²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>га</displayName>
+				<unitPattern count="other">{0} гектар</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>м²</displayName>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>см²</displayName>
+				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>ми²</displayName>
+				<unitPattern count="other">{0} ми²</unitPattern>
+				<perUnitPattern>{0}/ми²</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>акр</displayName>
+				<unitPattern count="other">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ярд²</displayName>
+				<unitPattern count="other">{0} ярд²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>фут²</displayName>
+				<unitPattern count="other">{0} фут²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>дюйм²</displayName>
+				<unitPattern count="other">{0} дюйм²</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>дун.</displayName>
+				<unitPattern count="other">{0} дунам</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>кар</displayName>
+				<unitPattern count="other">{0} карат</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>мг/дл</displayName>
+				<unitPattern count="other">{0} мг/дл</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>ммоль/л</displayName>
+				<unitPattern count="other">{0} ммоль/л</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>әйбер</displayName>
+				<unitPattern count="other">{0} әйбер</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>өлөш</displayName>
+				<unitPattern count="other">{0} өлөш</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>өлөш/млн</displayName>
+				<unitPattern count="other">{0} өлөш/млн</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>моль</displayName>
+				<unitPattern count="other">{0} моль</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>л/км</displayName>
+				<unitPattern count="other">{0} л/км</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>л/100 км</displayName>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>миль/гал</displayName>
+				<unitPattern count="other">{0} галлонға миль</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>миль/имп. гал</displayName>
+				<unitPattern count="other">{0} миль/имп. гал</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>ПБ</displayName>
+				<unitPattern count="other">{0} ПБ</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>ТБ</displayName>
+				<unitPattern count="other">{0} ТБ</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Тбит</displayName>
+				<unitPattern count="other">{0} Тбит</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ГБ</displayName>
+				<unitPattern count="other">{0} ГБ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Гбит</displayName>
+				<unitPattern count="other">{0} Гбит</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>МБ</displayName>
+				<unitPattern count="other">{0} МБ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Мбит</displayName>
+				<unitPattern count="other">{0} Мбит</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>кБ</displayName>
+				<unitPattern count="other">{0} кБ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>кбит</displayName>
+				<unitPattern count="other">{0} кбит</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>Б</displayName>
+				<unitPattern count="other">{0} Б</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>бит</displayName>
+				<unitPattern count="other">{0} бит</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>б.</displayName>
+				<unitPattern count="other">{0} б.</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>й. тиҫт.</displayName>
+				<unitPattern count="other">{0} йыл тиҫтәһе</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>й.</displayName>
+				<unitPattern count="other">{0} й.</unitPattern>
+				<perUnitPattern>{0}/й</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>кварт.</displayName>
+				<unitPattern count="other">{0} кварт.</unitPattern>
+				<perUnitPattern>{0}/кв</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>ай.</displayName>
+				<unitPattern count="other">{0} ай</unitPattern>
+				<perUnitPattern>{0}/ай</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>аҙн.</displayName>
+				<unitPattern count="other">{0} аҙна</unitPattern>
+				<perUnitPattern>{0}/аҙна</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>көн.</displayName>
+				<unitPattern count="other">{0} көн</unitPattern>
+				<perUnitPattern>{0}/көн</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>сәғ.</displayName>
+				<unitPattern count="other">{0} сәғ.</unitPattern>
+				<perUnitPattern>{0}/сәғ</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>мин</displayName>
+				<unitPattern count="other">{0} мин.</unitPattern>
+				<perUnitPattern>{0}/мин</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>с</displayName>
+				<unitPattern count="other">{0} с</unitPattern>
+				<perUnitPattern>{0}/с</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>мс</displayName>
+				<unitPattern count="other">{0} мс</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>мкс</displayName>
+				<unitPattern count="other">{0} мкс</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>нс</displayName>
+				<unitPattern count="other">{0} нс</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>А</displayName>
+				<unitPattern count="other">{0} А</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>мА</displayName>
+				<unitPattern count="other">{0} мА</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>Ом</displayName>
+				<unitPattern count="other">{0} Ом</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>В</displayName>
+				<unitPattern count="other">{0} В</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ккал</displayName>
+				<unitPattern count="other">{0} ккал</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>кал</displayName>
+				<unitPattern count="other">{0} кал</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>кДж</displayName>
+				<unitPattern count="other">{0} кДж</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>Дж</displayName>
+				<unitPattern count="other">{0} Дж</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>кВт⋅сәғ</displayName>
+				<unitPattern count="other">{0} кВт⋅сәғ</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>эВ</displayName>
+				<unitPattern count="other">{0} эВ</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>БТЕ</displayName>
+				<unitPattern count="other">{0} БТЕ</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>АҠШ термы</displayName>
+				<unitPattern count="other">{0} АҠШ термы</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>фунт-көс</displayName>
+				<unitPattern count="other">{0} фунт-көс</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>Н</displayName>
+				<unitPattern count="other">{0}Н</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>кВт⋅сәғ/100 км</displayName>
+				<unitPattern count="other">{0} кВт⋅сәғ/100 км</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>ГГц</displayName>
+				<unitPattern count="other">{0} ГГц</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>МГц</displayName>
+				<unitPattern count="other">{0} МГц</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>кГц</displayName>
+				<unitPattern count="other">{0} кГц</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Гц</displayName>
+				<unitPattern count="other">{0} Гц</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName>эм</displayName>
+				<unitPattern count="other">{0} эм</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName>пкс</displayName>
+				<unitPattern count="other">{0} пкс</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>Мпкс</displayName>
+				<unitPattern count="other">{0} Мпкс</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName>пкс/см</displayName>
+				<unitPattern count="other">{0} пкс/см</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>пкс/дюйм</displayName>
+				<unitPattern count="other">{0} пкс/дюйм</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName>ер радиусы</displayName>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>км</displayName>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>м</displayName>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>дм</displayName>
+				<unitPattern count="other">{0} дм</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>см</displayName>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>мм</displayName>
+				<unitPattern count="other">{0} мм</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>мкм</displayName>
+				<unitPattern count="other">{0} мкм</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>нм</displayName>
+				<unitPattern count="other">{0} нм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>пм</displayName>
+				<unitPattern count="other">{0} пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>миль</displayName>
+				<unitPattern count="other">{0} миля</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ярд</displayName>
+				<unitPattern count="other">{0} ярд</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>фут</displayName>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>дюйм</displayName>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>пк</displayName>
+				<unitPattern count="other">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>яҡт. й.</displayName>
+				<unitPattern count="other">{0} яҡт. й.</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>а. е.</displayName>
+				<unitPattern count="other">{0} а. б.</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>фрл</displayName>
+				<unitPattern count="other">{0} фрл</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>саж.</displayName>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>диңгеҙ миле</displayName>
+				<unitPattern count="other">{0} диңгеҙ миле</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>ск. ми</displayName>
+				<unitPattern count="other">{0} ск. ми</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>пкт</displayName>
+				<unitPattern count="other">{0} пкт</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>ҡояш радиустары</displayName>
+			</unit>
+			<unit type="light-lux">
+				<displayName>лк</displayName>
+				<unitPattern count="other">{0}лк</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>кд</displayName>
+				<unitPattern count="other">{0}кд</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>лм</displayName>
+				<unitPattern count="other">{0}лм</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>ҡояш яҡтылыҡтары</displayName>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>т</displayName>
+				<unitPattern count="other">{0} т</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>кг</displayName>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>г</displayName>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>мг</displayName>
+				<unitPattern count="other">{0} мг</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>мкг</displayName>
+				<unitPattern count="other">{0} мкг</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>т</displayName>
+				<unitPattern count="other">{0} амер. тонна</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>стн</displayName>
+				<unitPattern count="other">{0} стоун</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>фнт</displayName>
+				<unitPattern count="other">{0} фнт</unitPattern>
+				<perUnitPattern>{0}/фнт</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>унц.</displayName>
+				<unitPattern count="other">{0} унция</unitPattern>
+				<perUnitPattern>{0}/унц.</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>тр. унц.</displayName>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>кар</displayName>
+				<unitPattern count="other">{0} карат</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>дальтон</displayName>
+				<unitPattern count="other">{0} Да</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Ер массалары</displayName>
+				<unitPattern count="other">{0}M⊕</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>ҡояш массалары</displayName>
+				<unitPattern count="other">{0}M☉</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>гран</displayName>
+				<unitPattern count="other">{0} гран</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ГВт</displayName>
+				<unitPattern count="other">{0} ГВт</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>МВт</displayName>
+				<unitPattern count="other">{0} МВт</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>кВт</displayName>
+				<unitPattern count="other">{0} кВт</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>Вт</displayName>
+				<unitPattern count="other">{0} Вт</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>мВт</displayName>
+				<unitPattern count="other">{0} мВт</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ат көсө</displayName>
+				<unitPattern count="other">{0} ат көсө</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>тер. бағ. мм</displayName>
+				<unitPattern count="other">{0} тер. бағ. мм</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>тер. бағ.</displayName>
+				<unitPattern count="other">{0} тер. бағ.</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ф/дюйм²</displayName>
+				<unitPattern count="other">{0} ф/дюйм²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>тер. бағ. д.</displayName>
+				<unitPattern count="other">{0} тер. бағ. д.</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>бар</displayName>
+				<unitPattern count="other">{0} бар</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>мбар</displayName>
+				<unitPattern count="other">{0} мбар</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>атм</displayName>
+				<unitPattern count="other">{0} атм</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>Па</displayName>
+				<unitPattern count="other">{0} Па</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>гПа</displayName>
+				<unitPattern count="other">{0} гПа</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>кПа</displayName>
+				<unitPattern count="other">{0} кПа</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>МПа</displayName>
+				<unitPattern count="other">{0} МПа</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>км/сәғ</displayName>
+				<unitPattern count="other">{0} км/сәғ</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>м/с</displayName>
+				<unitPattern count="other">{0} м/с</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>ми/сәғ.</displayName>
+				<unitPattern count="other">{0} ми/сәғ</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>төйөн</displayName>
+				<unitPattern count="other">{0} төйөн</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>Бфт</displayName>
+				<unitPattern count="other">{0} Бфт</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>градустар</displayName>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="other">{0} °C</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>К</displayName>
+				<unitPattern count="other">{0} К</unitPattern>
+			</unit>
+			<unit type="torque-pound-force-foot">
+				<displayName>фунт-фут</displayName>
+				<unitPattern count="other">{0} фунт-фут</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>Н⋅м</displayName>
+				<unitPattern count="other">{0}Н⋅м</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>км³</displayName>
+				<unitPattern count="other">{0} км³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>м³</displayName>
+				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>см³</displayName>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>миль³</displayName>
+				<unitPattern count="other">{0} миль³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ярд³</displayName>
+				<unitPattern count="other">{0} ярд³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>фут³</displayName>
+				<unitPattern count="other">{0} фут³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>дюйм³</displayName>
+				<unitPattern count="other">{0} дюйм³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Мл</displayName>
+				<unitPattern count="other">{0} Мл</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>гл</displayName>
+				<unitPattern count="other">{0} гл</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>л</displayName>
+				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>дл</displayName>
+				<unitPattern count="other">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>сл</displayName>
+				<unitPattern count="other">{0} сл</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>мл</displayName>
+				<unitPattern count="other">{0} мл</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>мпт</displayName>
+				<unitPattern count="other">{0} мпт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>м. сынаяҡ</displayName>
+				<unitPattern count="other">{0} м. сынаяҡ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м.ш.у.</displayName>
+				<unitPattern count="other">{0} м.ш.у.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>акр-фут</displayName>
+				<unitPattern count="other">{0} акрофут</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>буш.</displayName>
+				<unitPattern count="other">{0} бушель</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>гал.</displayName>
+				<unitPattern count="other">{0} галлон</unitPattern>
+				<perUnitPattern>{0}/галлон</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>имп. галл.</displayName>
+				<unitPattern count="other">{0} имп. галл.</unitPattern>
+				<perUnitPattern>{0}/имп. галл.</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>кварт.</displayName>
+				<unitPattern count="other">{0} кварта</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>пинт.</displayName>
+				<unitPattern count="other">{0} пинта</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>сынаяҡ</displayName>
+				<unitPattern count="other">{0} сынаяҡ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>шыйыҡ унция</displayName>
+				<unitPattern count="other">{0} шыйыҡ унция</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>имп. ш. унцияһы</displayName>
+				<unitPattern count="other">{0} имп. ш. унция</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>аш ҡ.</displayName>
+				<unitPattern count="other">{0} аш ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>сәй ҡ.</displayName>
+				<unitPattern count="other">{0} сәй ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>барр.</displayName>
+				<unitPattern count="other">{0} баррель</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>дес. ҡ.</displayName>
+				<unitPattern count="other">{0} десерт ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>империя дес. ҡ.</displayName>
+				<unitPattern count="other">{0} имп. десерт ҡалағы</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>тамсы</displayName>
+				<unitPattern count="other">{0} тамсы</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>шыйыҡ драхма</displayName>
+				<unitPattern count="other">{0} шыйыҡ драхма</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>джиггер</displayName>
+				<unitPattern count="other">{0} джиггер</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>семтем</displayName>
+				<unitPattern count="other">{0} семтем</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>имп. кварта</displayName>
+				<unitPattern count="other">{0} имп. кварта</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="other">{0}ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="other">{0}кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>х.а.кал.</displayName>
+				<unitPattern count="other">{0} х.а.кал.</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгк</displayName>
+				<unitPattern count="other">{0} кгк</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>род</displayName>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>фртнт.</displayName>
+				<unitPattern count="other">{0} фортнайт</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>слаг</displayName>
+				<unitPattern count="other">{0} слаг</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>бензин эквиваленты</displayName>
+				<unitPattern count="other">{0} газ эквиваленты</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>рин [JP]</displayName>
+			</unit>
+			<unit type="length-sun">
+				<displayName>сун [JP]</displayName>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>шаку [JP]</displayName>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>шаку [туҡыма, JP]</displayName>
+			</unit>
+			<unit type="length-ken">
+				<displayName>кен [JP]</displayName>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>джо [JP]</displayName>
+				<unitPattern count="other">{0} jo [JP]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>косажи [JP]</displayName>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>осажи [JP]</displayName>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>шаку [күләм, JP]</displayName>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>сай [JP]</displayName>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>то [JP]</displayName>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>коку [JP]</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>яҡтылыҡ</displayName>
+				<unitPattern count="other">{0} яҡтылыҡ</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>фун [JP]</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>өлөш/млрд</displayName>
+				<unitPattern count="other">{0} өлөш/млрд</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>төндәр</displayName>
+				<unitPattern count="other">{0} төн</unitPattern>
+				<perUnitPattern>{0}/төн</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>йүн.</displayName>
+				<coordinateUnitPattern type="east">{0} көнсығыш</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} төньяҡ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} көньяҡ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} көнбайыш</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>hh:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>hh:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>mm:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end">{0} һәм {1}</listPatternPart>
+			<listPatternPart type="2">{0} һәм {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or">
+			<listPatternPart type="end">{0} йәки {1}</listPatternPart>
+			<listPatternPart type="2">{0} йәки {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-narrow">
+			<listPatternPart type="end">{0} йәки {1}</listPatternPart>
+			<listPatternPart type="2">{0} йәки {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="end">{0} йәки {1}</listPatternPart>
+			<listPatternPart type="2">{0} йәки {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-narrow">
+			<listPatternPart type="end">{0} һәм {1}</listPatternPart>
+			<listPatternPart type="2">{0} һәм {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="end">{0} һәм {1}</listPatternPart>
+			<listPatternPart type="2">{0} һәм {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="end">{0} һәм {1}</listPatternPart>
+			<listPatternPart type="2">{0} һәм {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="end">{0} һәм {1}</listPatternPart>
+			<listPatternPart type="2">{0} һәм {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="end">{0} һәм {1}</listPatternPart>
+			<listPatternPart type="2">{0} һәм {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>эйе:э</yesstr>
+			<nostr>юҡ:ю</nostr>
+		</messages>
+	</posix>
+	<characterLabels>
+		<characterLabelPattern type="all">{0} — бөтәһе</characterLabelPattern>
+		<characterLabelPattern type="compatibility">{0} — ярашлылыҡ</characterLabelPattern>
+		<characterLabelPattern type="enclosed">{0} — эсендә</characterLabelPattern>
+		<characterLabelPattern type="extended">{0} — киңәйтелгән</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} һулға ҡарай</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} уңға ҡарай</characterLabelPattern>
+		<characterLabelPattern type="historic">{0} — тарихи</characterLabelPattern>
+		<characterLabelPattern type="miscellaneous">{0} — төрлө</characterLabelPattern>
+		<characterLabelPattern type="other">{0} — башҡа</characterLabelPattern>
+		<characterLabelPattern type="scripts">яҙмалар — {0}</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="other">{0} һыҙыҡтар</characterLabelPattern>
+		<characterLabelPattern type="subscript">аҫҡы индекс {0}</characterLabelPattern>
+		<characterLabelPattern type="superscript">өҫкө индекс {0}</characterLabelPattern>
+		<characterLabel type="activities">эшмәкәрлек</characterLabel>
+		<characterLabel type="african_scripts">Африка яҙмаһы</characterLabel>
+		<characterLabel type="american_scripts">Америка яҙмаһы</characterLabel>
+		<characterLabel type="animal">хайуан</characterLabel>
+		<characterLabel type="animals_nature">хайуан йәки тәбиғәт</characterLabel>
+		<characterLabel type="arrows">уҡтар</characterLabel>
+		<characterLabel type="body">тән</characterLabel>
+		<characterLabel type="box_drawing">ҡумта һыҙмаһы</characterLabel>
+		<characterLabel type="braille">Брайль шрифты</characterLabel>
+		<characterLabel type="building">бина</characterLabel>
+		<characterLabel type="bullets_stars">маркер йәки йондоҙ</characterLabel>
+		<characterLabel type="consonantal_jamo">тартынҡы джамо</characterLabel>
+		<characterLabel type="currency_symbols">валюта символы</characterLabel>
+		<characterLabel type="dash_connector">һыҙыҡ йәки тоташтырғыс</characterLabel>
+		<characterLabel type="digits">һан</characterLabel>
+		<characterLabel type="dingbats">дингбат</characterLabel>
+		<characterLabel type="divination_symbols">күрәҙәлек символы</characterLabel>
+		<characterLabel type="downwards_arrows">аҫҡа табан уҡ</characterLabel>
+		<characterLabel type="downwards_upwards_arrows">аҫҡа-өҫкә табан уҡ</characterLabel>
+		<characterLabel type="east_asian_scripts">Көнсығыш Азия яҙмаһы</characterLabel>
+		<characterLabel type="emoji">эмодзи</characterLabel>
+		<characterLabel type="european_scripts">Европа яҙмаһы</characterLabel>
+		<characterLabel type="female">ҡатын-ҡыҙ</characterLabel>
+		<characterLabel type="flag">флаг</characterLabel>
+		<characterLabel type="flags">флагтар</characterLabel>
+		<characterLabel type="food_drink">аҙыҡ-түлек һәм эсемлектәр</characterLabel>
+		<characterLabel type="format">формат</characterLabel>
+		<characterLabel type="format_whitespace">формат һәм буш урындар</characterLabel>
+		<characterLabel type="full_width_form_variant">тулы киңлектәге вариант</characterLabel>
+		<characterLabel type="geometric_shapes">геометрик форма</characterLabel>
+		<characterLabel type="half_width_form_variant">ярты киңлектәге вариант</characterLabel>
+		<characterLabel type="han_characters">Хан иероглифы</characterLabel>
+		<characterLabel type="han_radicals">Хан радикалдары</characterLabel>
+		<characterLabel type="hanja">ханча</characterLabel>
+		<characterLabel type="hanzi_simplified">Ханзи (ябайлаштырылған)</characterLabel>
+		<characterLabel type="hanzi_traditional">Ханзи (традицион)</characterLabel>
+		<characterLabel type="heart">йөрәк</characterLabel>
+		<characterLabel type="historic_scripts">тарихи яҙма</characterLabel>
+		<characterLabel type="ideographic_desc_characters">идеографик тасуирлау символы</characterLabel>
+		<characterLabel type="japanese_kana">япон канаһы</characterLabel>
+		<characterLabel type="kanbun">канбун</characterLabel>
+		<characterLabel type="kanji">кандзи</characterLabel>
+		<characterLabel type="keycap">клавиша</characterLabel>
+		<characterLabel type="leftwards_arrows">һулға табан уҡ</characterLabel>
+		<characterLabel type="leftwards_rightwards_arrows">һулға-уңға табан уҡ</characterLabel>
+		<characterLabel type="letterlike_symbols">хәрефкә оҡшаш символ</characterLabel>
+		<characterLabel type="limited_use">сикләнгән ҡулланыу</characterLabel>
+		<characterLabel type="male">ир-ат</characterLabel>
+		<characterLabel type="math_symbols">математик символ</characterLabel>
+		<characterLabel type="middle_eastern_scripts">Урта Көнсығыш яҙмаһы</characterLabel>
+		<characterLabel type="miscellaneous">төрлө</characterLabel>
+		<characterLabel type="modern_scripts">заманса яҙма</characterLabel>
+		<characterLabel type="modifier">модификаторҙар</characterLabel>
+		<characterLabel type="musical_symbols">музыкаль символ</characterLabel>
+		<characterLabel type="nature">тәбиғәт</characterLabel>
+		<characterLabel type="nonspacing">арауыҡһыҙ символдар</characterLabel>
+		<characterLabel type="numbers">һандар</characterLabel>
+		<characterLabel type="objects">объект</characterLabel>
+		<characterLabel type="other">башҡа</characterLabel>
+		<characterLabel type="paired">парлы</characterLabel>
+		<characterLabel type="person">кеше</characterLabel>
+		<characterLabel type="phonetic_alphabet">фонетик алфавит</characterLabel>
+		<characterLabel type="pictographs">пиктограмма</characterLabel>
+		<characterLabel type="place">урын</characterLabel>
+		<characterLabel type="plant">үҫемлек</characterLabel>
+		<characterLabel type="punctuation">тыныш билдәләре</characterLabel>
+		<characterLabel type="rightwards_arrows">уңға табан уҡ</characterLabel>
+		<characterLabel type="sign_standard_symbols">билдә йәки символ</characterLabel>
+		<characterLabel type="small_form_variant">бәләкәй варианттар</characterLabel>
+		<characterLabel type="smiley">смайлик</characterLabel>
+		<characterLabel type="smileys_people">смайлик йәки кеше</characterLabel>
+		<characterLabel type="south_asian_scripts">Көньяҡ Азия яҙмаһы</characterLabel>
+		<characterLabel type="southeast_asian_scripts">Көньяҡ-Көнсығыш Азия яҙмаһы</characterLabel>
+		<characterLabel type="spacing">арауыҡтар</characterLabel>
+		<characterLabel type="sport">спорт</characterLabel>
+		<characterLabel type="symbols">символ</characterLabel>
+		<characterLabel type="technical_symbols">техник символ</characterLabel>
+		<characterLabel type="tone_marks">тон билдәһе</characterLabel>
+		<characterLabel type="travel">сәйәхәт</characterLabel>
+		<characterLabel type="travel_places">сәйәхәт йәки урын</characterLabel>
+		<characterLabel type="upwards_arrows">өҫкә табан уҡтар</characterLabel>
+		<characterLabel type="variant_forms">вариант</characterLabel>
+		<characterLabel type="vocalic_jamo">һуҙынҡы джамо</characterLabel>
+		<characterLabel type="weather">һауа торошо</characterLabel>
+		<characterLabel type="western_asian_scripts">Көнбайыш Азия яҙмаһы</characterLabel>
+		<characterLabel type="whitespace">буш урындар</characterLabel>
+	</characterLabels>
+	<typographicNames>
+		<axisName type="ital">курсив</axisName>
+		<axisName type="opsz">оптик ҙурлыҡ</axisName>
+		<axisName type="slnt">ҡыялыҡ</axisName>
+		<axisName type="wdth">киңлек</axisName>
+		<axisName type="wght">ауырлыҡ</axisName>
+		<styleName type="ital" subtype="1">ҡулъяҙма</styleName>
+		<styleName type="opsz" subtype="8">яҙыу</styleName>
+		<styleName type="opsz" subtype="12">текст</styleName>
+		<styleName type="opsz" subtype="18">исем</styleName>
+		<styleName type="opsz" subtype="72">дисплей</styleName>
+		<styleName type="opsz" subtype="144">плакат</styleName>
+		<styleName type="slnt" subtype="-12">артҡа ҡыя</styleName>
+		<styleName type="slnt" subtype="0">тура</styleName>
+		<styleName type="slnt" subtype="12">ҡыя</styleName>
+		<styleName type="slnt" subtype="24">артыҡ ҡыя</styleName>
+		<styleName type="wdth" subtype="50">ультраҡыҫҡартылған</styleName>
+		<styleName type="wdth" subtype="62.5">артыҡ ҡыҫҡартылған</styleName>
+		<styleName type="wdth" subtype="75">ҡыҫҡартылған</styleName>
+		<styleName type="wdth" subtype="87.5">ярым ҡыҫҡартылған</styleName>
+		<styleName type="wdth" subtype="100">нормаль</styleName>
+		<styleName type="wdth" subtype="112.5">ярым киңәйтелгән</styleName>
+		<styleName type="wdth" subtype="125">киңәйтелгән</styleName>
+		<styleName type="wdth" subtype="150">артыҡ киңәйтелгән</styleName>
+		<styleName type="wdth" subtype="200">ультракиңәйтелгән</styleName>
+		<styleName type="wght" subtype="100">нәҙек</styleName>
+		<styleName type="wght" subtype="200">үтә нәҙек</styleName>
+		<styleName type="wght" subtype="300">нәҙек</styleName>
+		<styleName type="wght" subtype="350">ярым нәҙек</styleName>
+		<styleName type="wght" subtype="380">китап</styleName>
+		<styleName type="wght" subtype="400">ғәҙәти</styleName>
+		<styleName type="wght" subtype="500">уртаса</styleName>
+		<styleName type="wght" subtype="600">ярым ҡалын</styleName>
+		<styleName type="wght" subtype="700">ҡалын</styleName>
+		<styleName type="wght" subtype="800">үтә ҡалын</styleName>
+		<styleName type="wght" subtype="900">ҡара</styleName>
+		<styleName type="wght" subtype="950">артыҡ ҡара</styleName>
+		<featureName type="afrc">вертикаль кәсерҙәр</featureName>
+		<featureName type="cpsp">баш хәреф аралығы</featureName>
+		<featureName type="dlig">өҫтәмә лигатуралар</featureName>
+		<featureName type="frac">диагональ кәсерҙәр</featureName>
+		<featureName type="lnum">һыҙыҡлы һандар</featureName>
+		<featureName type="onum">иҫке стиль һандары</featureName>
+		<featureName type="ordn">рәт һандары</featureName>
+		<featureName type="pnum">пропорциональ һандар</featureName>
+		<featureName type="smcp">бәләкәй баш хәрефтәр</featureName>
+		<featureName type="tnum">таблица һандары</featureName>
+		<featureName type="zero">һыҙылған нуль</featureName>
+	</typographicNames>
+	<personNames>
+		<nameOrderLocales order="givenFirst">und ba</nameOrderLocales>
+		<initialPattern type="initialSequence">{0}{1}</initialPattern>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{title} {given} {given2} {surname} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{given} {given2-initial} {surname} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{given-initial}{given2-initial} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname-initial}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{surname} {title} {given} {given2} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{surname} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname} {given} {given2-initial} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{surname} {given-initial}{given2-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{surname} {given-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given-initial}{given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<sampleName item="nativeG">
+			<nameField type="given">Урал</nameField>
+		</sampleName>
+		<sampleName item="nativeGS">
+			<nameField type="given">Ирина</nameField>
+			<nameField type="surname">Яҡупова</nameField>
+		</sampleName>
+		<sampleName item="nativeGGS">
+			<nameField type="given">Азамат</nameField>
+			<nameField type="given2">Салауат улы</nameField>
+			<nameField type="surname">Фаттахов</nameField>
+		</sampleName>
+		<sampleName item="nativeFull">
+			<nameField type="title">∅∅∅</nameField>
+			<nameField type="given">Азамат</nameField>
+			<nameField type="given-informal">∅∅∅</nameField>
+			<nameField type="given2">Салауат улы</nameField>
+			<nameField type="surname-prefix">∅∅∅</nameField>
+			<nameField type="surname-core">Фаттахов</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
+			<nameField type="generation">∅∅∅</nameField>
+			<nameField type="credentials">∅∅∅</nameField>
+		</sampleName>
+		<sampleName item="foreignG">
+			<nameField type="given">Синдбад</nameField>
+		</sampleName>
+		<sampleName item="foreignGS">
+			<nameField type="given">Кете</nameField>
+			<nameField type="surname">Мюллер</nameField>
+		</sampleName>
+		<sampleName item="foreignGGS">
+			<nameField type="given">Цецилия</nameField>
+			<nameField type="given2">Хэмиш</nameField>
+			<nameField type="surname">Штёбер</nameField>
+		</sampleName>
+		<sampleName item="foreignFull">
+			<nameField type="title">проф., д-р</nameField>
+			<nameField type="given">Ада Корнелия</nameField>
+			<nameField type="given-informal">Неле</nameField>
+			<nameField type="given2">Сезар Мартин</nameField>
+			<nameField type="surname-prefix">фон</nameField>
+			<nameField type="surname-core">Брюль</nameField>
+			<nameField type="surname2">Гонсалес Доминго</nameField>
+			<nameField type="generation">кесе</nameField>
+			<nameField type="credentials">м. ф. д.</nameField>
+		</sampleName>
+	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/bal.xml b/make/data/cldr/common/main/bal.xml
index c8dec39faaa..99aa704a43c 100644
--- a/make/data/cldr/common/main/bal.xml
+++ b/make/data/cldr/common/main/bal.xml
@@ -385,6 +385,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>گرین‌وِچ مین ٹائم</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="provisional">هئواییئے گیشّتگێن ساهت</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="provisional">هئواییئے ساهت</generic>
diff --git a/make/data/cldr/common/main/bal_Latn.xml b/make/data/cldr/common/main/bal_Latn.xml
index 576ae907516..99b83dd9327 100644
--- a/make/data/cldr/common/main/bal_Latn.xml
+++ b/make/data/cldr/common/main/bal_Latn.xml
@@ -997,13 +997,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">Mingu-Chini sáldar</type>
 			<type key="cf" type="account">Hesáb, Zarr Káleb</type>
 			<type key="cf" type="standard">Zarray anjárén káleb</type>
-			<type key="collation" type="big5han">Chini Rabyati Red o band</type>
 			<type key="collation" type="compat">Pésari Red o band, pa hamdapiá</type>
 			<type key="collation" type="dictionary">Labzbaladi Red o band</type>
 			<type key="collation" type="ducet">Aslén Yunikodi Red o band</type>
 			<type key="collation" type="emoji">Emóji Red o band</type>
 			<type key="collation" type="eor">Yuropi Red o bandi Rahband</type>
-			<type key="collation" type="gb2312han">Sádah kortagén Chini Red o band - GB2312</type>
 			<type key="collation" type="phonebook">Pawnbokki Red o band</type>
 			<type key="collation" type="pinyin">Pinyi Red o band</type>
 			<type key="collation" type="search">Ám Kári Shóház</type>
@@ -2955,9 +2953,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Rónendi Aprikáay wahd</generic>
-					<standard>Rónendi Aprikáay anjári wahd</standard>
-					<daylight>Rónendi Aprikáay garmági wahd</daylight>
+					<standard>Rónendi Aprikáay wahd</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3307,6 +3303,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyánáay wahd</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawái/Alushiay anjári wahd</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawái/Alushiay wahd</generic>
diff --git a/make/data/cldr/common/main/bas.xml b/make/data/cldr/common/main/bas.xml
index ddba778be4d..533f61c67d7 100644
--- a/make/data/cldr/common/main/bas.xml
+++ b/make/data/cldr/common/main/bas.xml
@@ -583,6 +583,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/be.xml b/make/data/cldr/common/main/be.xml
index 3e074c52d8d..88a333804ad 100644
--- a/make/data/cldr/common/main/be.xml
+++ b/make/data/cldr/common/main/be.xml
@@ -46,6 +46,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ay">аймара</language>
 			<language type="az">азербайджанская</language>
 			<language type="ba">башкірская</language>
+			<language type="bal">белуджская</language>
 			<language type="ban">балійская</language>
 			<language type="bas">басаа</language>
 			<language type="be">беларуская</language>
@@ -239,6 +240,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафія</language>
 			<language type="ksh">кёльнская</language>
 			<language type="ku">курдская</language>
+			<language type="ku" menu="core">курдская</language>
+			<language type="ku" menu="extension">курманджы</language>
 			<language type="kum">кумыцкая</language>
 			<language type="kv">комі</language>
 			<language type="kw">корнская</language>
@@ -646,6 +649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Кітай</territory>
 			<territory type="CO">Калумбія</territory>
 			<territory type="CP">Востраў Кліпертан</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рыка</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Каба-Вердэ</territory>
@@ -879,42 +883,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">фармат валюты</key>
 			<key type="collation">парадак сартавання</key>
 			<key type="currency">валюта</key>
+			<key type="em">прэзентацыя эмодзі</key>
 			<key type="hc">гадзінны цыкл (12 або 24)</key>
 			<key type="lb">правілы разрыву радка</key>
+			<key type="lw">стыль пераносу слоў</key>
 			<key type="ms">сістэма мер</key>
 			<key type="numbers">лічбы</key>
+			<key type="ss">разрыў сказа пасля скарачэння</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">будыйскі каляндар</type>
+			<type key="calendar" type="buddhist" scope="core">будыйскі</type>
 			<type key="calendar" type="chinese">кітайскі каляндар</type>
+			<type key="calendar" type="chinese" scope="core">кітайскі</type>
 			<type key="calendar" type="coptic">копцкі каляндар</type>
+			<type key="calendar" type="coptic" scope="core">копцкі</type>
 			<type key="calendar" type="dangi">каляндар дангі</type>
+			<type key="calendar" type="dangi" scope="core">дангі</type>
 			<type key="calendar" type="ethiopic">эфіопскі каляндар</type>
+			<type key="calendar" type="ethiopic" scope="core">эфіопскі</type>
 			<type key="calendar" type="ethiopic-amete-alem">эфіопскі каляндар Аметэ Алем</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">эфіопскі (Аметэ Алем)</type>
 			<type key="calendar" type="gregorian">грыгарыянскі каляндар</type>
+			<type key="calendar" type="gregorian" scope="core">грыгарыянскі</type>
 			<type key="calendar" type="hebrew">яўрэйскі каляндар</type>
+			<type key="calendar" type="hebrew" scope="core">яўрэйскі</type>
 			<type key="calendar" type="islamic">каляндар хіджры</type>
+			<type key="calendar" type="islamic" scope="core">хіджра</type>
 			<type key="calendar" type="islamic-civil">свецкі каляндар хіджры (таблічны)</type>
+			<type key="calendar" type="islamic-civil" scope="core">хіджра (свецкі, таблічны)</type>
 			<type key="calendar" type="islamic-umalqura">каляндар хіджры (Ум аль-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">хіджра (Ум аль-Кура)</type>
 			<type key="calendar" type="iso8601">каляндар ISO-8601</type>
 			<type key="calendar" type="japanese">японскі каляндар</type>
+			<type key="calendar" type="japanese" scope="core">японскі</type>
 			<type key="calendar" type="persian">персідскі каляндар</type>
+			<type key="calendar" type="persian" scope="core">персідскі</type>
 			<type key="calendar" type="roc">каляндар Міньго</type>
+			<type key="calendar" type="roc" scope="core">Міньго</type>
 			<type key="cf" type="account">бухгалтарскі фармат валюты</type>
+			<type key="cf" type="account" scope="core">бухгалтарскі</type>
 			<type key="cf" type="standard">стандартны фармат валюты</type>
+			<type key="cf" type="standard" scope="core">стандартны</type>
 			<type key="collation" type="ducet">стандартны парадак сартавання Унікод</type>
+			<type key="collation" type="ducet" scope="core">стандартны (Унікод)</type>
 			<type key="collation" type="search">універсальны пошук</type>
+			<type key="collation" type="search" scope="core">пошук</type>
 			<type key="collation" type="standard">стандартны парадак сартавання</type>
+			<type key="collation" type="standard" scope="core">стандартны</type>
+			<type key="em" type="default" scope="core">стандартныя сімвалы</type>
+			<type key="em" type="emoji" scope="core">эмодзі</type>
+			<type key="em" type="text" scope="core">тэкставыя сімвалы</type>
 			<type key="hc" type="h11">12-гадзінны фармат часу (0-11)</type>
+			<type key="hc" type="h11" scope="core">12-гадзінны (0–11)</type>
 			<type key="hc" type="h12">12-гадзінны фармат часу (1-12)</type>
+			<type key="hc" type="h12" scope="core">12-гадзінны (1–12)</type>
 			<type key="hc" type="h23">24-гадзінны фармат часу (0-23)</type>
+			<type key="hc" type="h23" scope="core">24-гадзінны (0–23)</type>
 			<type key="hc" type="h24">24-гадзінны фармат часу (1-24)</type>
+			<type key="hc" type="h24" scope="core">24-гадзінны (1–24)</type>
 			<type key="lb" type="loose">нястрогія правілы разрыву радка</type>
+			<type key="lb" type="loose" scope="core">нястрогія</type>
 			<type key="lb" type="normal">звычайныя правілы разрыву радка</type>
+			<type key="lb" type="normal" scope="core">звычайныя</type>
 			<type key="lb" type="strict">строгія правілы разрыву радка</type>
+			<type key="lb" type="strict" scope="core">строгія</type>
+			<type key="lw" type="breakall" scope="core">пераносіць усё</type>
+			<type key="lw" type="keepall" scope="core">захаваць усё</type>
+			<type key="lw" type="normal" scope="core">звычайны</type>
+			<type key="lw" type="phrase" scope="core">захоўваць у фразах</type>
 			<type key="ms" type="metric">метрычная сістэма мер</type>
+			<type key="ms" type="metric" scope="core">метрычная</type>
 			<type key="ms" type="uksystem">брытанская сістэма мер</type>
+			<type key="ms" type="uksystem" scope="core">брытанская</type>
 			<type key="ms" type="ussystem">амерыканская сістэма мер</type>
+			<type key="ms" type="ussystem" scope="core">амерыканская</type>
 			<type key="numbers" type="arab">арабска-індыйскія лічбы</type>
 			<type key="numbers" type="arabext">пашыраная сістэма арабска-індыйскіх лічбаў</type>
 			<type key="numbers" type="armn">армянскія лічбы</type>
@@ -955,6 +998,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">тайскія лічбы</type>
 			<type key="numbers" type="tibt">тыбецкія лічбы</type>
 			<type key="numbers" type="vaii">лічбы ваі</type>
+			<type key="ss" type="none" scope="core">выключана</type>
+			<type key="ss" type="standard" scope="core">уключана</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрычная</measurementSystemName>
@@ -1126,7 +1171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
@@ -1500,10 +1544,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'г' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1578,7 +1624,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1600,7 +1645,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1663,8 +1707,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="year">
 				<displayName>год</displayName>
-				<relative type="-1">у мінулым годзе</relative>
-				<relative type="0">у гэтым годзе</relative>
+				<relative type="-1">летась</relative>
+				<relative type="0">сёлета</relative>
 				<relative type="1">у наступным годзе</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">праз {0} год</relativeTimePattern>
@@ -1682,7 +1726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="year-short">
 				<displayName>г.</displayName>
 				<relative type="-1">у мін. годзе</relative>
-				<relative type="0">у гэтым годзе</relative>
+				<relative type="0">сёлета</relative>
 				<relative type="1">у наст. годзе</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">праз {0} г.</relativeTimePattern>
@@ -2075,9 +2119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} сб таму</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="dayperiod">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="hour">
 				<displayName>гадзіна</displayName>
 				<relative type="0">у гэту гадзіну</relative>
@@ -2532,6 +2573,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Вялікадня востраў</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Кайайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Арэнас</exemplarCity>
 			</zone>
@@ -2797,9 +2841,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пнампень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндэрберы</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3469,9 +3510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Заходнеафрыканскі час</generic>
-					<standard>Заходнеафрыканскі стандартны час</standard>
-					<daylight>Заходнеафрыканскі летні час</daylight>
+					<standard>Заходнеафрыканскі час</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3821,6 +3860,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Час Гаяны</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайска-Алеуцкі стандартны час</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавайска-Алеуцкі час</generic>
@@ -4421,6 +4465,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5590,6 +5638,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">усходнекарыбскага долара</displayName>
 				<symbol alt="narrow">EC$</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>карыбскі гульдэн</displayName>
+				<displayName count="one">карыбскі гульдэн</displayName>
+				<displayName count="few">карыбскія гульдэны</displayName>
+				<displayName count="many">карыбскіх гульдэнаў</displayName>
+				<displayName count="other">карыбскага гульдэна</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>заходнеафрыканскі франк КФА</displayName>
 				<displayName count="one">заходнеафрыканскі франк КФА</displayName>
@@ -5632,6 +5687,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">замбійскіх квач</displayName>
 				<displayName count="other">замбійскай квачы</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>зімбабвійскі залаты</displayName>
+				<displayName count="one">зімбабвійскі залаты</displayName>
+				<displayName count="few">зімбабвійскія залатыя</displayName>
+				<displayName count="many">зімбабвійскіх залатых</displayName>
+				<displayName count="other">зімбабвійскага залатога</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
@@ -5893,7 +5955,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} элементаў</unitPattern>
 				<unitPattern count="other">{0} элемента</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>часткі</displayName>
+				<unitPattern count="one">{0} частка</unitPattern>
+				<unitPattern count="few">{0} часткі</unitPattern>
+				<unitPattern count="many">{0} частак</unitPattern>
+				<unitPattern count="other">{0} часткі</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>часткі на мільён</displayName>
 				<unitPattern count="one">{0} частка на мільён</unitPattern>
 				<unitPattern count="few">{0} часткі на мільён</unitPattern>
@@ -5924,6 +5993,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>молі</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>літры на кіламетр</displayName>
 				<unitPattern count="one">{0} літр на кіламетр</unitPattern>
@@ -6619,6 +6695,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} міліметраў ртутнага слупа</unitPattern>
 				<unitPattern count="other">{0} міліметра ртутнага слупа</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ртутнага слупка</displayName>
+				<unitPattern count="one">{0} ртутнага слупка</unitPattern>
+				<unitPattern count="few">{0} ртутнага слупка</unitPattern>
+				<unitPattern count="many">{0} ртутнага слупка</unitPattern>
+				<unitPattern count="other">{0} ртутнага слупка</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунты на квадратную цалю</displayName>
 				<unitPattern count="one">{0} фунт на квадратную цалю</unitPattern>
@@ -6849,6 +6932,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} метрычных кубкаў</unitPattern>
 				<unitPattern count="other">{0} метрычнага кубка</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрычныя вадкія унцыі</displayName>
+				<unitPattern count="one">{0} метрычная вадкая унцыя</unitPattern>
+				<unitPattern count="few">{0} метрычныя вадкія унцыі</unitPattern>
+				<unitPattern count="many">{0} метрычных вадкіх унцый</unitPattern>
+				<unitPattern count="other">{0} метрычнай вадкай унцыі</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>бушалі</displayName>
 				<unitPattern count="one">{0} бушаль</unitPattern>
@@ -6932,7 +7022,105 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>брыт. кварты</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>стэрадыяны</displayName>
+				<unitPattern count="one">{0} стэрадыян</unitPattern>
+				<unitPattern count="few">{0} стэрадыяны</unitPattern>
+				<unitPattern count="many">{0} стэрадыянаў</unitPattern>
+				<unitPattern count="other">{0} стэрадыяна</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>каталы</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="few">{0} каталы</unitPattern>
+				<unitPattern count="many">{0} каталаў</unitPattern>
+				<unitPattern count="other">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулоны</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="few">{0} кулоны</unitPattern>
+				<unitPattern count="many">{0} кулонаў</unitPattern>
+				<unitPattern count="other">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарады</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="few">{0} фарады</unitPattern>
+				<unitPattern count="many">{0} фарадаў</unitPattern>
+				<unitPattern count="other">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генры</displayName>
+				<unitPattern count="one">{0} генры</unitPattern>
+				<unitPattern count="few">{0} генры</unitPattern>
+				<unitPattern count="many">{0} генры</unitPattern>
+				<unitPattern count="other">{0} генры</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сіменсы</displayName>
+				<unitPattern count="one">{0} сіменс</unitPattern>
+				<unitPattern count="few">{0} сіменсы</unitPattern>
+				<unitPattern count="many">{0} сіменсаў</unitPattern>
+				<unitPattern count="other">{0} сіменса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>міжнародныя калорыі</displayName>
+				<unitPattern count="one">{0} міжнародная калорыя</unitPattern>
+				<unitPattern count="few">{0} міжнародныя калорыі</unitPattern>
+				<unitPattern count="many">{0} міжнародных калорый</unitPattern>
+				<unitPattern count="other">{0} міжнароднай калорыі</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерэлі</displayName>
+				<unitPattern count="one">{0} бекерэль</unitPattern>
+				<unitPattern count="few">{0} бекерэлі</unitPattern>
+				<unitPattern count="many">{0} бекерэляў</unitPattern>
+				<unitPattern count="other">{0} бекерэля</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зіверты</displayName>
+				<unitPattern count="one">{0} зіверт</unitPattern>
+				<unitPattern count="few">{0} зіверты</unitPattern>
+				<unitPattern count="many">{0} зівертаў</unitPattern>
+				<unitPattern count="other">{0} зіверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>грэі</displayName>
+				<unitPattern count="one">{0} грэй</unitPattern>
+				<unitPattern count="few">{0} грэі</unitPattern>
+				<unitPattern count="many">{0} грэяў</unitPattern>
+				<unitPattern count="other">{0} грэя</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кілаграм-сілы</displayName>
+				<unitPattern count="one">{0} кілаграм-сіла</unitPattern>
+				<unitPattern count="few">{0} кілаграм-сілы</unitPattern>
+				<unitPattern count="many">{0} кілаграм-сіл</unitPattern>
+				<unitPattern count="other">{0} кілаграм-сілы</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тэслы</displayName>
+				<unitPattern count="one">{0} тэсла</unitPattern>
+				<unitPattern count="few">{0} тэслы</unitPattern>
+				<unitPattern count="many">{0} тэслаў</unitPattern>
+				<unitPattern count="other">{0} тэслы</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>веберы</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="few">{0} веберы</unitPattern>
+				<unitPattern count="many">{0} вебераў</unitPattern>
+				<unitPattern count="other">{0} вебера</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>скорасць святла</displayName>
+				<unitPattern count="one">{0} скорасць святла</unitPattern>
+				<unitPattern count="few">{0} скорасці святла</unitPattern>
+				<unitPattern count="many">{0} скарасцей святла</unitPattern>
+				<unitPattern count="other">{0} скорасці святла</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>частак на мільярд</displayName>
 				<unitPattern count="one">{0} частка на мільярд</unitPattern>
 				<unitPattern count="few">{0} часткі на мільярд</unitPattern>
@@ -6940,7 +7128,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} часткі на мільярд</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ночы</displayName>
 				<unitPattern count="one">{0} ноч</unitPattern>
 				<unitPattern count="few">{0} ночы</unitPattern>
 				<unitPattern count="many">{0} начэй</unitPattern>
@@ -6998,6 +7185,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p2">
 				<unitPrefixPattern>г{0}</unitPrefixPattern>
 			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>к{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="10p6">
 				<unitPrefixPattern>М{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -7189,6 +7379,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} элем.</unitPattern>
 				<unitPattern count="other">{0} элем.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ч.</displayName>
+				<unitPattern count="one">{0} ч.</unitPattern>
+				<unitPattern count="few">{0} ч.</unitPattern>
+				<unitPattern count="many">{0} ч.</unitPattern>
+				<unitPattern count="other">{0} ч.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="few">{0} %</unitPattern>
@@ -7214,6 +7411,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} моль</unitPattern>
 				<unitPattern count="other">{0} молі</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -7920,6 +8124,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мм рт. сл.</unitPattern>
 				<unitPattern count="other">{0} мм рт. сл.</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. сл.</displayName>
+				<unitPattern count="one">{0} рт. сл.</unitPattern>
+				<unitPattern count="few">{0} рт. сл.</unitPattern>
+				<unitPattern count="many">{0} рт. сл.</unitPattern>
+				<unitPattern count="other">{0} рт. сл.</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунты на кв. цалю</displayName>
 				<unitPattern count="one">{0} фунт на кв. цалю</unitPattern>
@@ -8165,6 +8376,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мет. кубкаў</unitPattern>
 				<unitPattern count="other">{0} мет. кубка</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м. вадк. унц.</displayName>
+				<unitPattern count="one">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="few">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="many">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="other">{0} м. вадк. унц.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акр-футы</displayName>
 				<unitPattern count="one">{0} акр-фут</unitPattern>
@@ -8300,7 +8518,105 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} брыт. кварт</unitPattern>
 				<unitPattern count="other">{0} брыт. кварты</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="few">{0} ср</unitPattern>
+				<unitPattern count="many">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="few">{0} кат</unitPattern>
+				<unitPattern count="many">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="few">{0} Кл</unitPattern>
+				<unitPattern count="many">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="few">{0} Ф</unitPattern>
+				<unitPattern count="many">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="few">{0} Гн</unitPattern>
+				<unitPattern count="many">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="few">{0} См</unitPattern>
+				<unitPattern count="many">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калм</displayName>
+				<unitPattern count="one">{0} калм</unitPattern>
+				<unitPattern count="few">{0} калм</unitPattern>
+				<unitPattern count="many">{0} калм</unitPattern>
+				<unitPattern count="other">{0} калм</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="few">{0} Бк</unitPattern>
+				<unitPattern count="many">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="few">{0} Зв</unitPattern>
+				<unitPattern count="many">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="few">{0} Гр</unitPattern>
+				<unitPattern count="many">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="few">{0} Тл</unitPattern>
+				<unitPattern count="many">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="few">{0} Вб</unitPattern>
+				<unitPattern count="many">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ск. святла</displayName>
+				<unitPattern count="one">{0} ск. святла</unitPattern>
+				<unitPattern count="few">{0} ск. святла</unitPattern>
+				<unitPattern count="many">{0} ск. святла</unitPattern>
+				<unitPattern count="other">{0} ск. святла</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>частак/мільярд</displayName>
 				<unitPattern count="one">{0} ч/млрд</unitPattern>
 				<unitPattern count="few">{0} ч/млрд</unitPattern>
@@ -8310,7 +8626,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-night">
 				<displayName>ночы</displayName>
 				<unitPattern count="one">{0} ноч</unitPattern>
-				<unitPattern count="few">{0} ноч</unitPattern>
+				<unitPattern count="few">{0} ночы</unitPattern>
 				<unitPattern count="many">{0} начэй</unitPattern>
 				<unitPattern count="other">{0} ночы</unitPattern>
 				<perUnitPattern>{0}/ноч</perUnitPattern>
@@ -8330,12 +8646,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="times">
 				<compoundUnitPattern>{0}{1}</compoundUnitPattern>
 			</compoundUnit>
+			<unit type="concentr-part">
+				<displayName>ч.</displayName>
+				<unitPattern count="one">{0} ч.</unitPattern>
+				<unitPattern count="few">{0} ч.</unitPattern>
+				<unitPattern count="many">{0} ч.</unitPattern>
+				<unitPattern count="other">{0} ч.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0}%</unitPattern>
 				<unitPattern count="few">{0}%</unitPattern>
 				<unitPattern count="many">{0}%</unitPattern>
 				<unitPattern count="other">{0}%</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="energy-therm-us">
 				<unitPattern count="one">{0} амер. тэрм</unitPattern>
 				<unitPattern count="few">{0} амер. тэрмы</unitPattern>
@@ -8348,26 +8678,132 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} фунт-сіл</unitPattern>
 				<unitPattern count="other">{0} фунт-сілы</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. сл.</displayName>
+				<unitPattern count="one">{0} рт. сл.</unitPattern>
+				<unitPattern count="few">{0} рт. сл.</unitPattern>
+				<unitPattern count="many">{0} рт. сл.</unitPattern>
+				<unitPattern count="other">{0} рт. сл.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м. вадк. унц.</displayName>
+				<unitPattern count="one">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="few">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="many">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="other">{0} м. вадк. унц.</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon">
 				<unitPattern count="one">{0} дэс. лыжка</unitPattern>
 				<unitPattern count="few">{0} дэс. лыжкі</unitPattern>
 				<unitPattern count="many">{0} дэс. лыжак</unitPattern>
 				<unitPattern count="other">{0} дэс. лыжкі</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="few">{0} ср</unitPattern>
+				<unitPattern count="many">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="few">{0} кат</unitPattern>
+				<unitPattern count="many">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="few">{0} Кл</unitPattern>
+				<unitPattern count="many">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="few">{0} Ф</unitPattern>
+				<unitPattern count="many">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="few">{0} Гн</unitPattern>
+				<unitPattern count="many">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="few">{0} См</unitPattern>
+				<unitPattern count="many">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калм</displayName>
+				<unitPattern count="one">{0} калм</unitPattern>
+				<unitPattern count="few">{0} калм</unitPattern>
+				<unitPattern count="many">{0} калм</unitPattern>
+				<unitPattern count="other">{0} калм</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="few">{0} Бк</unitPattern>
+				<unitPattern count="many">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="few">{0} Зв</unitPattern>
+				<unitPattern count="many">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="few">{0} Гр</unitPattern>
+				<unitPattern count="many">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="few">{0} Тл</unitPattern>
+				<unitPattern count="many">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="few">{0} Вб</unitPattern>
+				<unitPattern count="many">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0} с</unitPattern>
+				<unitPattern count="few">{0} с</unitPattern>
+				<unitPattern count="many">{0} с</unitPattern>
+				<unitPattern count="other">{0} с</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ч/млрд</displayName>
-				<unitPattern count="one">{0} ч/млрд</unitPattern>
-				<unitPattern count="few">{0} ч/млрд</unitPattern>
-				<unitPattern count="many">{0} ч/млрд</unitPattern>
-				<unitPattern count="other">{0} ч/млрд</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ночы</displayName>
 				<unitPattern count="one">{0} ноч</unitPattern>
 				<unitPattern count="few">{0} ночы</unitPattern>
 				<unitPattern count="many">{0} начэй</unitPattern>
 				<unitPattern count="other">{0} ночы</unitPattern>
-				<perUnitPattern>{0}/ноч</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} У</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/be_TARASK.xml b/make/data/cldr/common/main/be_TARASK.xml
index ff9db1f909d..fd293dec873 100644
--- a/make/data/cldr/common/main/be_TARASK.xml
+++ b/make/data/cldr/common/main/be_TARASK.xml
@@ -1361,13 +1361,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="provisional">Аўганістанскі час</standard>
 				</long>
 			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic draft="provisional">Заходнеафрыканскі час</generic>
-					<standard draft="provisional">Заходнеафрыканскі змоўчны час</standard>
-					<daylight draft="provisional">Заходнеафрыканскі летні час</daylight>
-				</long>
-			</metazone>
 			<metazone type="Alaska">
 				<long>
 					<generic draft="provisional">Час Аляскі</generic>
@@ -1670,6 +1663,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="provisional">Час Пэрсыдзкага заліву</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="provisional">Гавайска-Алэвуцкі змоўчны час</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="provisional">Гавайска-Алевуцкі час</generic>
diff --git a/make/data/cldr/common/main/bew.xml b/make/data/cldr/common/main/bew.xml
index 2c39d42b48b..0c6f4c0a49c 100644
--- a/make/data/cldr/common/main/bew.xml
+++ b/make/data/cldr/common/main/bew.xml
@@ -62,10 +62,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bm" draft="unconfirmed">Bambara</language>
 			<language type="bn" draft="unconfirmed">Benggala</language>
 			<language type="bo" draft="unconfirmed">Tibèt</language>
+			<language type="bqi" draft="unconfirmed">Bahtiar</language>
 			<language type="br" draft="unconfirmed">Brèton</language>
 			<language type="brx" draft="unconfirmed">Boro</language>
 			<language type="bs" draft="unconfirmed">Bosni</language>
 			<language type="bss" draft="unconfirmed">Akosé</language>
+			<language type="bua" draft="unconfirmed">Buriat</language>
 			<language type="bug" draft="unconfirmed">Bugis</language>
 			<language type="byn" draft="unconfirmed">Belin</language>
 			<language type="ca" draft="unconfirmed">Katalan</language>
@@ -89,6 +91,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ckb" alt="variant" draft="unconfirmed">Kurdi, Tenga</language>
 			<language type="clc" draft="unconfirmed">Cilkotin</language>
 			<language type="co" draft="unconfirmed">Korsikan</language>
+			<language type="cop" draft="unconfirmed">Gibti</language>
 			<language type="crg" draft="unconfirmed">Micip</language>
 			<language type="crj" draft="unconfirmed">Kri Wètan Kidul</language>
 			<language type="crk" draft="unconfirmed">Kri Dataran</language>
@@ -228,6 +231,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf" draft="unconfirmed">Bapia</language>
 			<language type="ksh" draft="unconfirmed">Kèl</language>
 			<language type="ku" draft="unconfirmed">Kurdi</language>
+			<language type="ku" menu="core" draft="unconfirmed">Kurdi</language>
 			<language type="kum" draft="unconfirmed">Kumuk</language>
 			<language type="kv" draft="unconfirmed">Komi</language>
 			<language type="kw" draft="unconfirmed">Kornis</language>
@@ -278,7 +282,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mi" draft="unconfirmed">Maori</language>
 			<language type="mic" draft="unconfirmed">Mikmak</language>
 			<language type="min" draft="unconfirmed">Minangkabo</language>
-			<language type="mk" draft="unconfirmed">Makèdoni</language>
+			<language type="mk" draft="unconfirmed">Makédoni</language>
 			<language type="ml" draft="unconfirmed">Malayalam</language>
 			<language type="mn" draft="unconfirmed">Monggol</language>
 			<language type="mni" draft="unconfirmed">Manipur</language>
@@ -337,6 +341,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pap" draft="unconfirmed">Papiamèn</language>
 			<language type="pau" draft="unconfirmed">Palau</language>
 			<language type="pcm" draft="unconfirmed">Pijin Nigéria</language>
+			<language type="pi" draft="unconfirmed">Pali</language>
 			<language type="pis" draft="unconfirmed">Pijin</language>
 			<language type="pl" draft="unconfirmed">Pol</language>
 			<language type="pqm" draft="unconfirmed">Malisèt-Pasamakuodi</language>
@@ -850,7 +855,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MF" draft="unconfirmed">Sint-Martèn (Prasman)</territory>
 			<territory type="MG" draft="unconfirmed">Madagaskar</territory>
 			<territory type="MH" draft="unconfirmed">Pulo Marsal</territory>
-			<territory type="MK" draft="unconfirmed">Makèdoni Lor</territory>
+			<territory type="MK" draft="unconfirmed">Makédoni Lor</territory>
 			<territory type="ML" draft="unconfirmed">Mali</territory>
 			<territory type="MM" draft="unconfirmed">Mianmar (Birma)</territory>
 			<territory type="MN" draft="unconfirmed">Monggoli</territory>
@@ -1099,13 +1104,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc" draft="unconfirmed">Almenak Bingkok</type>
 			<type key="cf" type="account" draft="unconfirmed">Pormat Mata Uang Pembukuan</type>
 			<type key="cf" type="standard" draft="unconfirmed">Pormat Mata Uang Pakem</type>
-			<type key="collation" type="big5han" draft="unconfirmed">Rèntètan Sortir Tionghoa Terdisionil - Big5</type>
 			<type key="collation" type="compat" draft="unconfirmed">Rèntètan Sortir Sebelonnya, bakal kecocokan</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">Rèntètan Sortir Kamus</type>
 			<type key="collation" type="ducet" draft="unconfirmed">Rèntètan Sortir Bawaan Unicode</type>
 			<type key="collation" type="emoji" draft="unconfirmed">Rèntètan Sortir Émoji</type>
 			<type key="collation" type="eor" draft="unconfirmed">Aturan Pengrèntètan Èropa</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">Rèntètan Sortir Tionghoa Ringkes - GB2312</type>
 			<type key="collation" type="phonebook" draft="unconfirmed">Rèntètan Sortir Buku Telepon</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">Rèntètan Sortir Pin-in</type>
 			<type key="collation" type="reformed" draft="unconfirmed">Rèntètan Sortir Kerobah</type>
@@ -3119,9 +3122,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Waktu Aprika Kulon</generic>
-					<standard draft="unconfirmed">Waktu Pakem Aprika Kulon</standard>
-					<daylight draft="unconfirmed">Waktu Musim Pentèr Aprika Kulon</daylight>
+					<standard draft="unconfirmed">Waktu Aprika Kulon</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3504,6 +3505,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Waktu Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Waktu Pakem Hawai-Aléut</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Waktu Hawai-Aléut</generic>
@@ -4939,7 +4945,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">milimol per lèter</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} milimol per lèter</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">bagèan per juta</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} bagèan per juta</unitPattern>
 			</unit>
@@ -5567,7 +5573,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">biji</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} biji</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">bagèan/juta</displayName>
 			</unit>
 			<unit type="concentr-percent">
diff --git a/make/data/cldr/common/main/bg.xml b/make/data/cldr/common/main/bg.xml
index e7a63e3da12..71aee54bb15 100644
--- a/make/data/cldr/common/main/bg.xml
+++ b/make/data/cldr/common/main/bg.xml
@@ -276,6 +276,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафия</language>
 			<language type="ksh">кьолнски</language>
 			<language type="ku">кюрдски</language>
+			<language type="ku" menu="core">кюрдски</language>
+			<language type="ku" menu="extension">курманджи</language>
 			<language type="kum">кумикски</language>
 			<language type="kut">кутенай</language>
 			<language type="kv">коми</language>
@@ -792,6 +794,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Китай</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">остров Клипертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо Верде</territory>
@@ -1065,33 +1068,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Сортиране на цифрите</key>
 			<key type="colStrength">Сила на сортиране</key>
 			<key type="currency">валута</key>
+			<key type="em">Представяне на емотикон</key>
 			<key type="hc">Часови формат (12- или 24-часов)</key>
 			<key type="lb">Стил за нов ред</key>
+			<key type="lw">Нов ред в средата на думите</key>
 			<key type="ms">Мерна система</key>
 			<key type="numbers">цифри</key>
+			<key type="ss">прекъсване на изречение след съкращение</key>
 			<key type="timezone">Часова зона</key>
 			<key type="va">Вариант на локала</key>
 			<key type="x">Собствена употреба</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">будистки календар</type>
+			<type key="calendar" type="buddhist" scope="core">будистки</type>
 			<type key="calendar" type="chinese">китайски календар</type>
+			<type key="calendar" type="chinese" scope="core">китайски</type>
 			<type key="calendar" type="coptic">коптски календар</type>
+			<type key="calendar" type="coptic" scope="core">коптски</type>
 			<type key="calendar" type="dangi">корейски календар</type>
+			<type key="calendar" type="dangi" scope="core">корейски</type>
 			<type key="calendar" type="ethiopic">етиопски календар</type>
+			<type key="calendar" type="ethiopic" scope="core">етиопски</type>
 			<type key="calendar" type="ethiopic-amete-alem">етиопски календар Амит Алем</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">етиопски Амит Алем</type>
 			<type key="calendar" type="gregorian">григориански календар</type>
+			<type key="calendar" type="gregorian" scope="core">григориански</type>
 			<type key="calendar" type="hebrew">еврейски календар</type>
+			<type key="calendar" type="hebrew" scope="core">еврейски</type>
 			<type key="calendar" type="indian">Индийски граждански календар</type>
 			<type key="calendar" type="islamic">ислямски календар</type>
-			<type key="calendar" type="islamic-civil">ислямски цивилен календар</type>
-			<type key="calendar" type="islamic-umalqura">ислямски календар (Ум ал-Кура)</type>
+			<type key="calendar" type="islamic" scope="core">Хиджра</type>
+			<type key="calendar" type="islamic-civil">ислямски календар Хиджра</type>
+			<type key="calendar" type="islamic-civil" scope="core">календар Хиджра</type>
+			<type key="calendar" type="islamic-umalqura">ислямски календар Хиджра (Ум ал-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Хиджра (Ум ал-Кура)</type>
 			<type key="calendar" type="iso8601">календар съгласно ISO 8601</type>
 			<type key="calendar" type="japanese">японски календар</type>
+			<type key="calendar" type="japanese" scope="core">японски</type>
 			<type key="calendar" type="persian">персийски календар</type>
+			<type key="calendar" type="persian" scope="core">персийски</type>
 			<type key="calendar" type="roc">календар на Република Китай</type>
+			<type key="calendar" type="roc" scope="core">календар Мингуо</type>
 			<type key="cf" type="account">формат на валута за счетоводни цели</type>
+			<type key="cf" type="account" scope="core">счетоводен</type>
 			<type key="cf" type="standard">стандартен формат на валута</type>
+			<type key="cf" type="standard" scope="core">стандартен</type>
 			<type key="colAlternate" type="non-ignorable">Сортиране по символи</type>
 			<type key="colAlternate" type="shifted">Сортиране с пренебрегване на символи</type>
 			<type key="colBackwards" type="no">Нормално сортиране по диакритични знаци</type>
@@ -1101,21 +1123,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Сортиране първо по горен регистър</type>
 			<type key="colCaseLevel" type="no">Сортиране без различаване на регистъра на буквите</type>
 			<type key="colCaseLevel" type="yes">Сортиране с различаване на регистъра на буквите</type>
-			<type key="collation" type="big5han">Традиционен китайски (Big5)</type>
 			<type key="collation" type="compat">предишен ред на сортиране, за съвместимост</type>
+			<type key="collation" type="compat" scope="core">съвместимост</type>
 			<type key="collation" type="dictionary">Речников ред на сортиране</type>
+			<type key="collation" type="dictionary" scope="core">речник</type>
 			<type key="collation" type="ducet">ред на сортиране в Unicode по подразбиране</type>
-			<type key="collation" type="gb2312han">Опростен китайски (GB2312)</type>
+			<type key="collation" type="ducet" scope="core">по подразбиране Unicode</type>
 			<type key="collation" type="phonebook">Азбучен ред</type>
+			<type key="collation" type="phonebook" scope="core">азбучен</type>
 			<type key="collation" type="phonetic">Фонетичен ред на сортиране</type>
+			<type key="collation" type="phonetic" scope="core">фонетичен</type>
 			<type key="collation" type="pinyin">Сортиране Пинин</type>
+			<type key="collation" type="pinyin" scope="core">Пинин</type>
 			<type key="collation" type="search">търсене с общо предназначение</type>
+			<type key="collation" type="search" scope="core">търсене</type>
 			<type key="collation" type="searchjl">Търсене по първоначални съгласни в хангул</type>
 			<type key="collation" type="standard">стандартен ред на сортиране</type>
+			<type key="collation" type="standard" scope="core">стандартен</type>
 			<type key="collation" type="stroke">Сортиране по щрих</type>
+			<type key="collation" type="stroke" scope="core">щрих</type>
 			<type key="collation" type="traditional">Традиционно сортиране</type>
+			<type key="collation" type="traditional" scope="core">традиционно</type>
 			<type key="collation" type="unihan">Ред на сортиране по ключове и черти</type>
+			<type key="collation" type="unihan" scope="core">ключове и черти</type>
 			<type key="collation" type="zhuyin">ред на сортиране Бопомофо</type>
+			<type key="collation" type="zhuyin" scope="core">Бопомофо</type>
 			<type key="colNormalization" type="no">Сортиране без нормализиране</type>
 			<type key="colNormalization" type="yes">Нормализирано сортиране в Уникод</type>
 			<type key="colNumeric" type="no">Сортиране на цифрите индивидуално</type>
@@ -1128,18 +1160,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">С пълна ширина</type>
 			<type key="d0" type="hwidth">С половин ширина</type>
 			<type key="d0" type="npinyin" draft="contributed">Цифрови</type>
+			<type key="em" type="default" scope="core">по подразбиране</type>
+			<type key="em" type="emoji" scope="core">емоджи</type>
+			<type key="em" type="text" scope="core">текст</type>
 			<type key="hc" type="h11">12-часова система (0 – 11)</type>
+			<type key="hc" type="h11" scope="core">12 (0 – 11)</type>
 			<type key="hc" type="h12">12-часова система (1 – 12)</type>
+			<type key="hc" type="h12" scope="core">12 (1 – 12)</type>
 			<type key="hc" type="h23">24-часова система (0 – 23)</type>
+			<type key="hc" type="h23" scope="core">24 (0 – 23)</type>
 			<type key="hc" type="h24">24-часова система (1 – 24)</type>
+			<type key="hc" type="h24" scope="core">24 (1 – 24)</type>
 			<type key="lb" type="loose">Свободен стил за нов ред</type>
+			<type key="lb" type="loose" scope="core">Свободен</type>
 			<type key="lb" type="normal">Нормален стил за нов ред</type>
+			<type key="lb" type="normal" scope="core">Нормален</type>
 			<type key="lb" type="strict">Строг стил за нов ред</type>
+			<type key="lb" type="strict" scope="core">Строг</type>
+			<type key="lw" type="breakall" scope="core">Разделяне на всички</type>
+			<type key="lw" type="keepall" scope="core">Запазване на всички</type>
+			<type key="lw" type="normal" scope="core">Нормално</type>
+			<type key="lw" type="phrase" scope="core">Запазване във фразите</type>
 			<type key="m0" type="bgn">АКГН (BGN)</type>
 			<type key="m0" type="ungegn">ГЕСГИ ООН (UNGEGN)</type>
 			<type key="ms" type="metric">Метрична система</type>
+			<type key="ms" type="metric" scope="core">Метрична</type>
 			<type key="ms" type="uksystem">Имперска мерна система</type>
+			<type key="ms" type="uksystem" scope="core">Обединено кралство</type>
 			<type key="ms" type="ussystem">Мерна система на САЩ</type>
+			<type key="ms" type="ussystem" scope="core">САЩ</type>
 			<type key="numbers" type="arab">арабско-индийски цифри</type>
 			<type key="numbers" type="arabext">разширени арабско-индийски цифри</type>
 			<type key="numbers" type="armn">арменски цифри</type>
@@ -1184,6 +1233,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">тибетски цифри</type>
 			<type key="numbers" type="traditional">Традиционни цифри</type>
 			<type key="numbers" type="vaii">цифри във ваи</type>
+			<type key="ss" type="none" scope="core">изкл.</type>
+			<type key="ss" type="standard" scope="core">вкл.</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрична</measurementSystemName>
@@ -1248,6 +1299,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1256,6 +1310,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1292,6 +1349,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">HH:mm 'ч'.</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss 'ч'. a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss 'ч'.</dateFormatItem>
+						<dateFormatItem id="Hv" draft="contributed">HH 'ч' v</dateFormatItem>
 						<dateFormatItem id="M">M</dateFormatItem>
 						<dateFormatItem id="Md">d.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.MM</dateFormatItem>
@@ -1652,6 +1710,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0} 'ч'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1660,11 +1721,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0} 'ч'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'ч'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1675,15 +1742,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">h 'ч'. B</dateFormatItem>
 						<dateFormatItem id="Bhm">h:mm 'ч'. B</dateFormatItem>
 						<dateFormatItem id="Bhms">h:mm:ss 'ч'. B</dateFormatItem>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E, h:mm 'ч'. B</dateFormatItem>
 						<dateFormatItem id="EBhms">E, h:mm:ss 'ч'. B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm 'ч'. a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm 'ч'.</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss 'ч'. a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss 'ч'.</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y 'г'. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MM.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d.MM.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d.MM.y 'г'. G</dateFormatItem>
@@ -1700,6 +1771,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">HH:mm:ss 'ч'. v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm 'ч'. a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm 'ч'. v</dateFormatItem>
+						<dateFormatItem id="hv">h 'ч'. a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'ч' v</dateFormatItem>
 						<dateFormatItem id="Md">d.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.MM</dateFormatItem>
 						<dateFormatItem id="MMM">MM</dateFormatItem>
@@ -2558,6 +2631,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<gmtFormat>Гринуич{0}</gmtFormat>
 			<gmtZeroFormat>Гринуич</gmtZeroFormat>
+			<gmtUnknownFormat draft="contributed">Гринуич+?</gmtUnknownFormat>
 			<regionFormat type="daylight">{0} – лятно часово време</regionFormat>
 			<regionFormat type="standard">{0} – стандартно време</regionFormat>
 			<zone type="Pacific/Honolulu">
@@ -2913,6 +2987,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Великденски остров</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">Койайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта Аренас</exemplarCity>
 			</zone>
@@ -3178,9 +3255,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пном Пен</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендърбъри</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3850,9 +3924,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западноафриканско време</generic>
-					<standard>Западноафриканско стандартно време</standard>
-					<daylight>Западноафриканско лятно часово време</daylight>
+					<standard>Западноафриканско време</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4209,6 +4281,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гаяна</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавайско-алеутско стандартно време</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавайско-алеутско време</generic>
@@ -4791,9 +4868,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -6079,6 +6159,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">източнокарибски долара</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">Карибски гулден</displayName>
+				<displayName count="one">Карибски гулден</displayName>
+				<displayName count="other">Карибски гулден</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Специални права на тираж</displayName>
 			</currency>
@@ -6172,6 +6257,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">зимбабвийски долар</displayName>
 				<displayName count="other">зимбабвийски долара</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">Зимбабвийско злато</displayName>
+				<displayName count="one">Зимбабвийско злато</displayName>
+				<displayName count="other">Зимбабвийско злато</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Зимбабвийски долар (2009)</displayName>
 				<displayName count="one">зимбабвийски долар (2009)</displayName>
@@ -6306,7 +6396,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} метра за секунда на квадрат</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>оборот</displayName>
+				<displayName>обороти</displayName>
 				<unitPattern count="one">{0} оборот</unitPattern>
 				<unitPattern count="other">{0} оборота</unitPattern>
 			</unit>
@@ -6395,7 +6485,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} единица</unitPattern>
 				<unitPattern count="other">{0} единици</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">части</displayName>
+				<unitPattern count="one">{0} част</unitPattern>
+				<unitPattern count="other">{0} части</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>части на милион</displayName>
 				<unitPattern count="one">{0} част на милион</unitPattern>
 				<unitPattern count="other">{0} части на милион</unitPattern>
@@ -6415,9 +6510,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>молове</displayName>
-				<unitPattern count="one">{0} мол</unitPattern>
+				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} мола</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="one">{0} глюкоза</unitPattern>
+				<unitPattern count="other">{0} глюкоза</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри на километър</displayName>
 				<unitPattern count="one">{0} литър на километър</unitPattern>
@@ -6935,6 +7035,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} милиметър живачен стълб</unitPattern>
 				<unitPattern count="other">{0} милиметра живачен стълб</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">живачен стълб</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунтове на квадратен инч</displayName>
 				<unitPattern count="one">{0} фунт на квадратен инч</unitPattern>
@@ -7108,6 +7211,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} метрична чаша</unitPattern>
 				<unitPattern count="other">{0} метрични чаши</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">метрични течни унции</displayName>
+				<unitPattern count="one" draft="contributed">{0} метрична течна унция</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} метрични течни унции</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акър-футове</displayName>
 				<unitPattern count="one">{0} акър-фут</unitPattern>
@@ -7190,20 +7298,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} имперска кварта</unitPattern>
 				<unitPattern count="other">{0} имперски кварти</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлина</unitPattern>
+			<unit type="angle-steradian">
+				<displayName draft="contributed">стерадиани</displayName>
+				<unitPattern count="one" draft="contributed">{0} стерадиан</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} стерадиана</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>катали</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="other">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">кулони</displayName>
+				<unitPattern count="one" draft="contributed">{0} кулон</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">фаради</displayName>
+				<unitPattern count="one" draft="contributed">{0} фарад</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">хенри</displayName>
+				<unitPattern count="one" draft="contributed">{0} хенри</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} хенри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">сименс</displayName>
+				<unitPattern count="one" draft="contributed">{0} сименс</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} сименса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калории [IT]</displayName>
+				<unitPattern count="one">{0} калория [IT]</unitPattern>
+				<unitPattern count="other">{0} калории [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерели</displayName>
+				<unitPattern count="one">{0} бекерел</unitPattern>
+				<unitPattern count="other">{0} бекерела</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>сиверти</displayName>
+				<unitPattern count="one">{0} сиверт</unitPattern>
+				<unitPattern count="other">{0} сиверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>грей</displayName>
+				<unitPattern count="one">{0} грей</unitPattern>
+				<unitPattern count="other">{0} грея</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограм-сила</displayName>
+				<unitPattern count="one">{0} килограм-сила</unitPattern>
+				<unitPattern count="other">{0} килограма-сила</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">тесла</displayName>
+				<unitPattern count="one" draft="contributed">{0} тесла</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">вебери</displayName>
+				<unitPattern count="one" draft="contributed">{0} вебер</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} вебера</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>части на милиард</displayName>
 				<unitPattern count="one">{0} част на милиард</unitPattern>
 				<unitPattern count="other">{0} части на милиард</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>нощи</displayName>
-				<unitPattern count="one">{0} нощ</unitPattern>
-				<unitPattern count="other">{0} нощи</unitPattern>
 				<perUnitPattern>{0} на нощ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7250,6 +7415,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ед.</unitPattern>
 				<unitPattern count="other">{0} ед.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName draft="contributed">част</displayName>
+				<unitPattern count="one">{0} част</unitPattern>
+				<unitPattern count="other">{0} част</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>процент</displayName>
 			</unit>
@@ -7258,8 +7428,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>мол</displayName>
-				<unitPattern count="one">{0} мол</unitPattern>
-				<unitPattern count="other">{0} мол</unitPattern>
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -7554,12 +7729,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} имп. кварта</unitPattern>
 				<unitPattern count="other">{0} имп. кварти</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>светлина</displayName>
 				<unitPattern count="one">{0} светлина</unitPattern>
 				<unitPattern count="other">{0} светлина</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>части/милиард</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7584,12 +7792,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} кв. миля</unitPattern>
 				<unitPattern count="other">{0} кв. мили</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>част</displayName>
+				<unitPattern count="one">{0} част</unitPattern>
+				<unitPattern count="other">{0} част</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-mole">
+				<displayName>mol</displayName>
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="digital-petabyte">
 				<displayName>PB</displayName>
 			</unit>
@@ -7661,16 +7882,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} брит. дес. лъж.</unitPattern>
 				<unitPattern count="other">{0} брит. дес. лъж.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлина</unitPattern>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>нощи</displayName>
-				<unitPattern count="one">{0} нощ</unitPattern>
-				<unitPattern count="other">{0} нощи</unitPattern>
-				<perUnitPattern>{0}/нощ</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one" draft="contributed">{0} cal-IT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/blo.xml b/make/data/cldr/common/main/blo.xml
index a19f37f2d06..d4ca17e28be 100644
--- a/make/data/cldr/common/main/blo.xml
+++ b/make/data/cldr/common/main/blo.xml
@@ -15,36 +15,350 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<localeKeyTypePattern>{0} : {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
+			<language type="aa">Afaar kagɩja</language>
+			<language type="ab">Abkhase kagɩja</language>
+			<language type="af">Saʊtafrɩka kagɩja</language>
+			<language type="agq">Agem kagɩja</language>
+			<language type="ak">Akan kagɩja</language>
+			<language type="am">Amhariiki kagɩja</language>
+			<language type="an">Aragonɛs kagɩja</language>
+			<language type="ann">oboloo kagɩja</language>
+			<language type="apc">gjakalaŋ kagɩlaarɩbuja</language>
 			<language type="ar">gɩlaaribuja</language>
 			<language type="ar_001">gɩlaaribuja ŋgɩɖee kǝ ba na fʊba na</language>
+			<language type="arn">mapushi kagɩja</language>
+			<language type="as">Assamɛs kagɩja</language>
+			<language type="asa">Asuu kagɩja</language>
+			<language type="ast">Asturiya kagɩja</language>
+			<language type="az">Asɛrbayijanii kagɩja</language>
+			<language type="az" alt="short">Aserii kagɩja</language>
+			<language type="ba">Bashikiiri kagɩja</language>
+			<language type="bal">Balushii kagɩja</language>
+			<language type="bas">Basaa kagɩja</language>
+			<language type="be">Belarusiya kagɩja</language>
+			<language type="bem">Bɛmba kagɩja</language>
+			<language type="bew">Betawii kagɩja</language>
+			<language type="bez">Bena kagɩja</language>
+			<language type="bg">Bulgariya kagɩja</language>
+			<language type="bgc">Haryaŋfiki kagɩja</language>
+			<language type="bgn">Gɩbaloshiija</language>
+			<language type="bho">Bojpuri kagɩja</language>
 			<language type="blo">anii kagɩja</language>
-			<language type="bn">baŋglaa kagɩja</language>
+			<language type="blt">Taii Ɖam kagɩja</language>
+			<language type="bm">Bambaraa kagɩja</language>
+			<language type="bn">Baŋgǝla kagɩja</language>
+			<language type="bo">Tibetaŋ kagɩja (Gɩtibetaŋja)</language>
+			<language type="bqi">Baktiyarii kagɩja</language>
+			<language type="br">Bretɔn kagɩja</language>
+			<language type="brx">Boɖo kagɩja</language>
+			<language type="bs">Bosniya kagɩja</language>
+			<language type="bss">Akoose kagɩja</language>
+			<language type="bua">Buriyaat kagɩja</language>
+			<language type="byn">Bliin kagɩja</language>
+			<language type="ca">Katalan kagɩja</language>
+			<language type="cad">Canaɖo kagɩja</language>
+			<language type="cch">Atsam kagɩja</language>
+			<language type="ccp">Shakma kagɩja</language>
+			<language type="ce">Sheshɛn kagɩja</language>
+			<language type="ceb">Sebuwanoo kagɩja</language>
+			<language type="cgg">Shiga kagɩja</language>
+			<language type="cho">Shɔktaʊ kagɩja</language>
+			<language type="chr">Sherokee kagɩja</language>
+			<language type="cic">Shikasawʊ kagɩja</language>
+			<language type="ckb">Kurɖish gɩcɩɩca kagɩja</language>
+			<language type="ckb" alt="menu">Kurɖish, gɩcɩɩca kagɩja</language>
+			<language type="ckb" alt="variant">Kurɖish, Sorani kagɩja</language>
+			<language type="co">Kɔrsikan kagɩja</language>
+			<language type="cop">Kɔptik kagɩja</language>
+			<language type="cs">Cɛk kagɩja</language>
+			<language type="csw">sʊwampii kree kagɩja</language>
+			<language type="cu">Shʊrshʊ kagɩja</language>
+			<language type="cv">Shufash kagɩja</language>
+			<language type="cy">Gɩwɛlshja</language>
+			<language type="da">Ɖanǝmaakɩ kagɩja</language>
+			<language type="dav">Tayɩta kagɩja (Gɩtayɩtaja)</language>
 			<language type="de">gɩjaamaja</language>
+			<language type="dje">Gɩsarmaja</language>
+			<language type="doi">Ɖogri kagɩja</language>
+			<language type="dsb">sɔrabɩyan atǝntǝn kagɩja</language>
+			<language type="dua">Ɖuwala kagɩja</language>
+			<language type="dv">Ɖifehii kagɩja</language>
+			<language type="dyo">jola-fonyii kagɩja</language>
+			<language type="dz">Ɖsɔŋgkha kagɩja</language>
+			<language type="ebu">ɛmbuu kagɩja</language>
+			<language type="ee">gɩyigbeja</language>
+			<language type="el">grɛɛkɩ kagɩja</language>
 			<language type="en">gɛɛshɩ</language>
 			<language type="en_US">gɛɛshɩ (Ganɔ gaɖɔŋkɔnɔ kabʊtǝna Amalɩka nɩ)</language>
 			<language type="en_US" alt="short">gɛɛshɩ (GKA)</language>
+			<language type="eo">Ɛspɛrnatoo kagɩja</language>
 			<language type="es">gɩspaŋja</language>
 			<language type="es_419">gɩspaŋja (latɛŋ kaAmalɩkatǝna)</language>
+			<language type="et">Ɛstonia kagɩja</language>
+			<language type="eu">Baske kagɩja</language>
+			<language type="ewo">Ɛwonɖoo kagɩja</language>
+			<language type="fa">pɛrsɩaŋ kagɩja</language>
+			<language type="fa_AF">ɖaarii kagɩja</language>
+			<language type="ff">gɩfǝlanɖɩja</language>
+			<language type="fi">finiish kagɩja</language>
+			<language type="fil">filipinoo kagɩja</language>
+			<language type="fo">faroɛsi kagɩja</language>
 			<language type="fr">gɩfɔnɔ</language>
+			<language type="frc">Kajun kagɩfɔnɔ</language>
+			<language type="frr">friisɔŋ gʊnyɩpɛnɛlaŋ kagɩja</language>
+			<language type="fur">friula kagɩja</language>
+			<language type="fy">Gɩfrisianja</language>
+			<language type="ga">irlanɖɛɛ kagɩja</language>
+			<language type="gaa">gaa kagɩja</language>
+			<language type="gd">skɔtiishɩ kagɩja</language>
+			<language type="gez">gɛɛsɩ kagɩja</language>
+			<language type="gl">galisiaŋ kagɩja</language>
+			<language type="gn">gaaranii kagɩja</language>
+			<language type="gsw">suisi jaama kagɩja</language>
+			<language type="gu">gujaratii kagɩja</language>
+			<language type="guz">gusii kagɩja</language>
+			<language type="gv">mansɩ kagɩja</language>
+			<language type="ha">gɩgambrɩja</language>
+			<language type="haw">hawahiyaŋ kagɩja</language>
+			<language type="he">hebree kagɩja</language>
+			<language type="hi">hinɖii kagɩja</language>
 			<language type="hi_Latn">hinɖii kagɩja (latɛŋ kʊja)</language>
 			<language type="hi_Latn" alt="variant">hiŋgliishɩ kagɩja</language>
+			<language type="hnj">Hmoŋg ŋjʊwaa kagɩja</language>
+			<language type="hr">Kʊrwasiya kagɩja</language>
+			<language type="hsb">Upɛr Sɔrbɩyaŋ kagɩja</language>
+			<language type="ht">haɩtiɛŋ kreɔlɩ kagɩja</language>
+			<language type="hu">hɔŋgrii kagɩja</language>
+			<language type="hy">Armeniya kagɩja</language>
+			<language type="ia">ɛntɛrliŋgua kagɩja</language>
 			<language type="id">Ɛnɖonosii kagɩja</language>
+			<language type="ie">ɛntɛrliŋguɩ kagɩja</language>
+			<language type="ig">ibo kagɩja</language>
+			<language type="ii">sishuaŋ yii kagɩja</language>
+			<language type="io">iɖoo kagɩja</language>
+			<language type="is">islanɖii kagɩja</language>
 			<language type="it">gɩtaliija</language>
+			<language type="iu">inuktituu kagɩja</language>
 			<language type="ja">gɩjapaŋja</language>
+			<language type="jbo">lɔbaŋ kagɩja</language>
+			<language type="jgo">ŋgomba kagɩja</language>
+			<language type="jmc">masham kagɩja</language>
+			<language type="jv">jafanɛɛ kagɩja</language>
+			<language type="ka">jɔrjia kagɩja</language>
+			<language type="kaa">Karaa Kalpaakɩ kagɩja</language>
+			<language type="kab">kabil kagɩja</language>
+			<language type="kaj">juu kagɩja</language>
+			<language type="kam">kambaa kagɩja</language>
+			<language type="kcg">Gɩtɩyapja</language>
+			<language type="kde">makɔnɖee kagɩja</language>
+			<language type="kea">kapfɛɛ kagɩja</language>
+			<language type="kek">Kekshii kagɩja</language>
+			<language type="ken">Keniyaa kagɩja</language>
+			<language type="kgp">kaɩŋgan kagɩja</language>
+			<language type="khq">koyira-shiinii kagɩja</language>
+			<language type="ki">kikuyuu kagɩja</language>
+			<language type="kk">kasaakɩ kagɩja</language>
+			<language type="kkj">kakoo kagɩja</language>
+			<language type="kl">kalaalisut kagɩja</language>
+			<language type="kln">kalaŋjɩn kagɩja</language>
+			<language type="km">kamɛr kagɩja</language>
+			<language type="kn">kananɖa kagɩja</language>
 			<language type="ko">Koree kagɩja</language>
+			<language type="kok">koŋkanii kagɩja</language>
+			<language type="kpe">kpɛl kagɩja</language>
+			<language type="ks">kashimirii kagɩja</language>
+			<language type="ksb">shambalaa kagɩja</language>
+			<language type="ksf">Bafiya kagɩja</language>
+			<language type="ksh">Kolonyiya kagɩja</language>
+			<language type="ku">kurɖikɩ kagɩja</language>
+			<language type="ku" menu="core">Kʊrɖiishi kagɩja</language>
+			<language type="ku" menu="extension">Kʊrmanjii kagɩja</language>
+			<language type="kw">Kɔrnish kagɩja</language>
+			<language type="kxv">Kʊfii kagɩja</language>
+			<language type="ky">kirgis kagɩja</language>
+			<language type="la">latɛŋ kagɩja</language>
+			<language type="lag">Laŋgii kagɩja</language>
+			<language type="lb">Lʊsɛŋburgiishi kagɩja</language>
+			<language type="lg">ganɖaa kagɩja</language>
+			<language type="lij">Liguriaŋ kagɩja</language>
+			<language type="lkt">Lakotaa kagɩja</language>
+			<language type="lld">Laɖɛŋ kagɩja</language>
+			<language type="lmo">Lɔmbaarɩ kagɩja</language>
+			<language type="ln">liŋgalaa kagɩja</language>
+			<language type="lo">lawo kagɩja</language>
+			<language type="lou">luwisaana kreyɔl kagɩja</language>
+			<language type="lrc">lorii gʊnyɩpɛnɛlaŋ kagɩja</language>
+			<language type="lt">lituyanii kagɩja</language>
+			<language type="ltg">Latɩgalɩyaŋ Kagɩja</language>
+			<language type="lu">luba-kataŋgaa kagɩja</language>
+			<language type="luo">luwo kagɩja</language>
+			<language type="luy">luyaa kagɩja</language>
+			<language type="lv">latɩfɩyaŋ kagɩja</language>
+			<language type="lzz">Laas kagɩja</language>
+			<language type="mai">mayitilii kagɩja</language>
+			<language type="mas">Masaɩ kagɩja</language>
+			<language type="mdf">moshaa kagɩja</language>
+			<language type="mer">meruu kagɩja</language>
+			<language type="mfe">kreyol-morisi kagɩja</language>
+			<language type="mg">malagaasɩ kagɩja</language>
+			<language type="mgh">Makuwa-meeto kagɩja</language>
+			<language type="mgo">metaa kagɩja</language>
+			<language type="mhn">Moshenoo kagɩja</language>
+			<language type="mi">maworii kagɩja</language>
+			<language type="mic">Mikmaawʊ kagɩja</language>
+			<language type="mk">maseɖoniya kagɩja</language>
+			<language type="ml">maalayalam kagɩja</language>
+			<language type="mn">moŋgolii kagɩja</language>
+			<language type="mni">manipurii kagɩja</language>
+			<language type="moh">mowak kagɩja</language>
+			<language type="mr">maratii kagɩja</language>
+			<language type="ms">malɛɛ kagɩja</language>
+			<language type="mt">maltɛsɩ kagɩja</language>
+			<language type="mua">manɖaŋgɩ kagɩja</language>
+			<language type="mul">ɩkrǝ tuutuuma</language>
+			<language type="mus">kriki kagɩja</language>
+			<language type="my">Burmɛs kagɩja</language>
+			<language type="myv">Ɛrsia kagɩja</language>
+			<language type="mzn">masanɖarii kɩja</language>
+			<language type="naq">namaa kagɩja</language>
+			<language type="nb">nɔrfɛɛjɩ bokimalɩ kagɩja</language>
+			<language type="nd">nɖebelee gʊnyɩpɛnɛlaŋ kagɩja</language>
+			<language type="nds">jaama atǝntǝn kagɩja</language>
+			<language type="nds_NL">jaama atǝntǝn kagɩja (Holanɖ)</language>
+			<language type="ne">nepal kagɩja</language>
 			<language type="nl">Holanɖ kagɩja</language>
+			<language type="nmg">kʊwasiyo kagɩja</language>
+			<language type="nn">nɔrfɛɛjɩ ninɔrisikɩ kagɩja</language>
+			<language type="nnh">ŋgiyembuu kagɩja</language>
+			<language type="no">nɔrfɛɛjɩ kagɩja</language>
+			<language type="nqo">ŋkoo kagɩja</language>
+			<language type="nr">nɖebelee gʊnyɩsonolaŋ kagɩja</language>
+			<language type="nso">sotoo gʊnyɩpɛnɛlaŋ kagɩja</language>
+			<language type="nus">nuyɛr kagɩja</language>
+			<language type="nv">nafaɖo kagɩja</language>
+			<language type="ny">shewa kagɩja</language>
+			<language type="nyn">niyaŋkolee kagɩja</language>
+			<language type="oc">oksitaŋ kagɩja</language>
+			<language type="om">oromoo kagɩja</language>
+			<language type="or">oɖia kagɩja</language>
+			<language type="os">osɛtiiki kagɩja</language>
+			<language type="osa">Osage kagɩja</language>
+			<language type="pa">Pʊŋjabii kagɩja</language>
+			<language type="pap">papiamantoo kagɩja</language>
+			<language type="pcm">piɖijin nanjiriya kagɩja</language>
+			<language type="pis">Pijiŋ kagɩja</language>
 			<language type="pl">Polanɖ kagɩja</language>
+			<language type="pms">Piyeɖmɔŋtɛsɩ kagɩja</language>
+			<language type="prg">Prʊsiaŋ kagɩja</language>
+			<language type="ps">pashɩtoo kagɩja</language>
 			<language type="pt">gɩpɔrtigalja</language>
+			<language type="qu">Keshʊwaa kagɩja</language>
+			<language type="quc">Kishee kagɩja</language>
+			<language type="raj">Rajastanii kagɩja</language>
+			<language type="rhg">Rɔhiŋgiyaa kagɩja</language>
+			<language type="rif">Rifiyaŋ kagɩja</language>
+			<language type="rm">Romaŋshɩ kagɩja</language>
+			<language type="rn">Rʊnɖii kagɩja</language>
+			<language type="ro">Romaniaŋ kagɩja</language>
+			<language type="ro_MD">Romaniaŋ kagɩja (Mɔlɖafiya)</language>
+			<language type="rof">Rɔŋboo kagɩja</language>
 			<language type="ru">gɩrɔɔshɩyaja</language>
+			<language type="rw">kiŋyarwan kagɩja</language>
+			<language type="rwk">rʊwaa kagɩja</language>
+			<language type="sa">saŋskriitɩ kagɩja</language>
+			<language type="sah">Gɩyakutuja</language>
+			<language type="saq">samburu</language>
+			<language type="sat">santalii kagɩja</language>
+			<language type="sbp">saŋguu kagɩja</language>
+			<language type="sc">sarɖiniaŋ kagɩja</language>
+			<language type="scn">sisiliaŋ kagɩja</language>
+			<language type="sd">sɛnɖii kagɩja</language>
+			<language type="sdh">Kʊrɖish gʊnyɩsonolaŋ kaja kagɩja</language>
+			<language type="se">samee</language>
+			<language type="seh">senaa kagɩja</language>
+			<language type="ses">koyirabɔrɔ-senii kagɩja</language>
+			<language type="sg">saŋgoo kagɩja</language>
+			<language type="sgs">samburuu kagɩja</language>
+			<language type="shi">Tashelhiiti kagɩja (Gɩtashelhiitija)</language>
+			<language type="shn">Shaŋ kagɩja</language>
+			<language type="si">sɛnhalaa kagɩja</language>
+			<language type="sid">Siɖamoo kagɩja</language>
+			<language type="sk">slofaakɩ kagɩja</language>
+			<language type="skr">Gɩsarayikiija</language>
+			<language type="sl">slofenia kagɩja</language>
+			<language type="sma">Samii gʊnyɩsonolaŋ kaja kagɩja</language>
+			<language type="smj">Lʊl Samii kagɩja</language>
+			<language type="smn">inarii samii kagɩja</language>
+			<language type="sms">skɔltɩ samii kagɩja</language>
+			<language type="sn">shonaa kagɩja</language>
+			<language type="so">somalii kagɩja</language>
+			<language type="sq">Albaniya kagɩja</language>
+			<language type="sr">sɛrbiaŋ kagɩja</language>
+			<language type="ss">sʊwatii kagɩja</language>
+			<language type="ssy">Sawoo kagɩja</language>
+			<language type="st">sotoo gʊnyɩsonolaŋ kaja kagɩja</language>
+			<language type="su">sunɖanɛsɩ kagɩja</language>
+			<language type="sv">sʊwɛɛɖɩ kagɩja</language>
+			<language type="sw">sʊwahilii kagɩja</language>
+			<language type="sw_CD">Ccŋgoo sʊwahilii kagɩja</language>
+			<language type="syr">siriyaakɩ kagɩja</language>
+			<language type="szl">Sisiliyaŋ kagɩja</language>
+			<language type="ta">Tamil kagɩja (Gɩtamilja)</language>
+			<language type="te">Telugu kagɩja (Gɩteluguja)</language>
+			<language type="teo">Teso kagɩja (Gɩtesoja)</language>
+			<language type="tg">Tajiik kagɩja</language>
 			<language type="th">taɩ kagɩja</language>
+			<language type="ti">Tigrinyaa kagɩja</language>
+			<language type="tig">Tiigr kagɩja</language>
+			<language type="tk">Tirkmɛn kagɩja</language>
+			<language type="tn">Cʊwanaa kagɩja (Gɩcʊwanaja)</language>
+			<language type="to">Tɔŋgaŋ kagɩja (Gɩtɔŋgaŋja)</language>
+			<language type="tok">Toki Ponaa kagɩja</language>
+			<language type="tpi">TɔkPisin kagɩja</language>
 			<language type="tr">gɩturkiija</language>
+			<language type="trv">Taroko kagɩja (Gɩtarokoja)</language>
+			<language type="trw">Tɔɔrwalii kagɩja</language>
+			<language type="ts">Sɔŋgaa kagɩja (Gɩsɔŋgaja)</language>
+			<language type="tt">Tatar kagɩja</language>
+			<language type="twq">Tasawak kagɩja (Gɩtasawakǝja)</language>
+			<language type="tyv">Tufiniyaŋ kagɩja</language>
+			<language type="tzm">Tamaasit Atlas kagɩcɩɩca kagɩja</language>
+			<language type="ug">gɩwigurja</language>
+			<language type="uk">Ukraɩnɩya kagɩja</language>
 			<language type="und">gɩkrǝ ŋgɩɖee kʊyɔʊ ʊ mana ma</language>
+			<language type="ur">Gɩurɖuja</language>
+			<language type="uz">Usbɛkɩ kagɩja</language>
+			<language type="vai">Gɩfayɩja</language>
+			<language type="ve">Fanɖa kagɩja</language>
+			<language type="vec">Fenɛsiaŋ kagɩja</language>
+			<language type="vi">Gɩfɩɛtɩnamɛɛsɩja</language>
+			<language type="vmw">Makʊwa kagɩja</language>
+			<language type="vo">Folapuku kagɩja</language>
+			<language type="vun">Gɩfunjoja</language>
+			<language type="wa">Gɩwalɔnja</language>
+			<language type="wae">Gɩwalsaja</language>
+			<language type="wal">Gɩwolaɩtaja</language>
+			<language type="wbp">Gɩwarpurija</language>
+			<language type="wo">Gɩwolofja</language>
+			<language type="xh">Gɩsoosaja</language>
+			<language type="xnr">Kaŋgrii kagɩja</language>
+			<language type="xog">sogaa kagɩja</language>
+			<language type="yav">Gɩyaŋgbɛnja</language>
+			<language type="yi">Gɩyiɖiishija</language>
+			<language type="yo">Gɩyorubaja</language>
+			<language type="yrl">ŋyeeŋgatuu kagɩja</language>
+			<language type="yue">Kantonɛs kagɩja</language>
+			<language type="yue" alt="menu">Kantonɛs kagɩcaɩnaja</language>
+			<language type="za">Gɩsʊaŋja</language>
+			<language type="zgh">morooko tamsiik ka (tututu) kagɩja</language>
 			<language type="zh">gɩcaɩnaja manɖarɛŋ</language>
 			<language type="zh" alt="menu">gɩcaɩnaja, manɖarɛŋ</language>
 			<language type="zh_Hans">gɩcaɩnaja gɩburoka</language>
 			<language type="zh_Hans" alt="long">gɩcaɩnaja manɖarɛŋ gɩburoka</language>
 			<language type="zh_Hant">gɩcaɩnaja tututu</language>
 			<language type="zh_Hant" alt="long">gɩcaɩnaja manɖarɛŋ tututu</language>
+			<language type="zu">Gɩsuluja</language>
+			<language type="zxx">gɩkrǝ kakoɖǝn ɩ mana</language>
 		</languages>
 		<scripts>
 			<script type="Arab">laaribu kʊja</script>
@@ -385,6 +699,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="ethiopic">Etiyopii kɩshilé na kɩŋɔrɔ ɩtʊrka</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiyopii kɩshilé na kɩŋɔrɔ ɩtʊrka (Amete Alɛm)</type>
 			<type key="calendar" type="gregorian">Gregɔɔ ‘ɩshilé n’‘ɩŋɔrɔ ɩtʊrka</type>
+			<type key="calendar" type="gregorian" scope="core">Gregɔɔ kaja</type>
 			<type key="calendar" type="hebrew">Yahuuɖi kǝbaja bɩshilé na bɩŋɔrɔ ɩtʊrka</type>
 			<type key="calendar" type="indian">Inɖiya kɩshilé na kɩŋɔrɔ ɩtʊrka</type>
 			<type key="calendar" type="islamic">gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka</type>
@@ -392,11 +707,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="islamic-rgsa">gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka akʊn aŋɔrɔ (Sauɖiya)</type>
 			<type key="calendar" type="islamic-tbla">gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka aɖʊ (ɩŋɔripi ɩceuka katam)</type>
 			<type key="calendar" type="islamic-umalqura">gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka (Um al-Kra)</type>
-			<type key="calendar" type="iso8601">ISO-8601 kɩshilé na kɩŋɔrɔ ɩtʊrka</type>
+			<type key="calendar" type="iso8601">Gregɔɔ ‘ɩshilé n’‘ɩŋɔrɔ ɩtʊrka (asǝba na gaja)</type>
 			<type key="calendar" type="japanese">Japaŋ kɩshilé na kɩŋɔrɔ ɩtʊrka</type>
 			<type key="calendar" type="persian">Pɛrs kǝbaja bɩshilé na kɩŋɔrɔ ɩtʊrka</type>
 			<type key="calendar" type="roc">miŋguwo kɩshilé na kɩŋɔrɔ ɩtʊrka</type>
 			<type key="collation" type="standard">ɩbii kʊnyaʊ ɖeiɖei</type>
+			<type key="collation" type="standard" scope="core">ɖeiɖei</type>
 			<type key="ms" type="metric">mɛta kʊfaŋʊ kayaashɩ</type>
 			<type key="ms" type="uksystem">Gɛɛshɩ kʊfaŋʊ kayaashɩ</type>
 			<type key="ms" type="ussystem">Amalɩka kʊfaŋʊ kayaashɩ</type>
@@ -414,8 +730,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[aáàâ b c ɖ eéèê ǝ{ǝ́}{ǝ̀}{ǝ̂} ɛ{ɛ́}{ɛ̀}{ɛ̂} f g {gb} h iíìî ɩ{ɩ́}{ɩ̀}{ɩ̂} j k {kp} l mḿ{m̀} nńǹ {ny} ŋ{ŋ́}{ŋ̀} {ŋm} oóòô ɔ{ɔ́}{ɔ̀}{ɔ̂} p r s {sh} t uúùû ʊ{ʊ́}{ʊ̀}{ʊ̂} w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ăǎåäãā{a̰} æ ɓ ćç d ɗ ĕěëẽēḛ {ǝ̃}{ǝ̄}{ǝ̰} {ə̌} {ɛ̌}{ɛ̃}{ɛ̄}{ɛ̰} ƒ ɣ {hw} ĭǐïĩīḭ ij {ɩ̃}{ɩ̄}{ɩ̰} {m̌}{m̄} ňñ{n̄} {ŋw} ŏǒöõøō{o̰} œ {ɔ̌}{ɔ̃}{ɔ̄}{ɔ̰} ř šſ ß ŭǔüūṵ {̃ũ} {ʊ̌}{ʊ̃}{ʊ̄}{ʊ̰} v ʋ x {xw} ÿ ƴ z ʒ {̃ʼ}]</exemplarCharacters>
+		<exemplarCharacters>[aáàâ ǝ{ǝ́}{ǝ̀}{ǝ̂} b c ɖ eéèê ɛ{ɛ́}{ɛ̀}{ɛ̂} f g {gb} h iíìî ɩ{ɩ́}{ɩ̀}{ɩ̂} j k {kp} l mḿ{m̀} nńǹ {ny} ŋ{ŋ́}{ŋ̀} {ŋm} oóòô ɔ{ɔ́}{ɔ̀}{ɔ̂} p r s {sh} t uúùû ʊ{ʊ́}{ʊ̀}{ʊ̂} w y]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ăǎåäãā{a̰} æ {ǝ̃}{ǝ̄}{ǝ̰} ɓ ćç d ɗ ĕěëẽēḛ {ə̌} {ɛ̌}{ɛ̃}{ɛ̄}{ɛ̰} ƒ ɣ {hw} ĭǐïĩīḭ ij {ɩ̃}{ɩ̄}{ɩ̰} {m̌}{m̄} ňñ{n̄} {ŋw} ŏǒöõøō{o̰} œ {ɔ̌}{ɔ̃}{ɔ̄}{ɔ̰} q ř šſ ß ŭǔüūṵ {̃ũ} {ʊ̌}{ʊ̃}{ʊ̄}{ʊ̰} v ʋ x {xw} ÿ ƴ z ʒ {̃ʼ}]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[   \- ‑ , . % ‰ ‱ + 0 1 2² 3³ 4 5 6 7 8 9 {ʲᵃ} {ᵏᵃ}]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[_ \- ‐‑ – — ― , ; \: ! ? . … '‘’ ‹ › &quot;“” « » ( ) \[ \] \{ \} § @ * / \\ \&amp; # % ‰ ‱ † ‡ • ‣ ‧ ′ ″ ° &lt; = &gt; | ¦ ~]</exemplarCharacters>
 	</characters>
@@ -446,7 +762,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>M/d/y GGGGG</pattern>
+							<pattern>M/d/y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -473,12 +789,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h a mm</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h a mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d y G</dateFormatItem>
@@ -489,9 +808,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd">M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d y G</dateFormatItem>
@@ -558,7 +877,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
@@ -762,17 +1080,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, MMMM d y</pattern>
+							<pattern>EEEE, MMMM d/y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>MMMM d y</pattern>
+							<pattern>y MMMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>MMM d y</pattern>
+							<pattern>MMM d/y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -825,22 +1143,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Bhm">h B mm</dateFormatItem>
-						<dateFormatItem id="Bhms">h B mm:ss</dateFormatItem>
-						<dateFormatItem id="EBhm">E h B mm</dateFormatItem>
-						<dateFormatItem id="EBhms">E h B mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="Ehm">E h a mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E h a mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d y G</dateFormatItem>
-						<dateFormatItem id="hm">h a mm</dateFormatItem>
-						<dateFormatItem id="hms">h a mm:ss</dateFormatItem>
-						<dateFormatItem id="hmsv">h a mm:ss v</dateFormatItem>
-						<dateFormatItem id="hmv">h a mm v</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
@@ -851,8 +1167,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMd">M/d/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd">MMM d y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, MMM d y</dateFormatItem>
+						<dateFormatItem id="yMMMd">MMM d/y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, MMM d/y</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
@@ -910,25 +1226,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="H">HH – HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h a mm – h a mm</greatestDifference>
-							<greatestDifference id="h">h a mm – h a mm</greatestDifference>
-							<greatestDifference id="m">h a mm – h a mm</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm a – h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
 							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
 							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h a mm a – h a mm v</greatestDifference>
-							<greatestDifference id="h">h a mm – h a mm v</greatestDifference>
-							<greatestDifference id="m">h a mm – h a mm v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h a – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -950,7 +1265,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
@@ -1244,7 +1558,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</short>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>mpá nɖee kʊyɔʊ ʊ mana ma</exemplarCity>
+				<exemplarCity>gaɖu ŋgaɖee kʊyɔʊ ʊ mana ma</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Anɖɔraa</exemplarCity>
@@ -1252,6 +1566,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Dubai">
 				<exemplarCity>Ɖubaɩ</exemplarCity>
 			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>Kabuul</exemplarCity>
+			</zone>
 			<zone type="America/Antigua">
 				<exemplarCity>Antiguwaa</exemplarCity>
 			</zone>
@@ -1318,6 +1635,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Catamarca">
 				<exemplarCity>Katamarkaa</exemplarCity>
 			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>Saltaa</exemplarCity>
+			</zone>
 			<zone type="America/Jujuy">
 				<exemplarCity>Huhuyi</exemplarCity>
 			</zone>
@@ -1477,6 +1797,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Thimphu">
 				<exemplarCity>Timfu</exemplarCity>
 			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>Gaboronee</exemplarCity>
+			</zone>
 			<zone type="Europe/Minsk">
 				<exemplarCity>Mɩns</exemplarCity>
 			</zone>
@@ -1525,6 +1848,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Raŋkɩn Ɩnlɛɛtɩ</exemplarCity>
 			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokaan</exemplarCity>
+			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Torɔntoo</exemplarCity>
 			</zone>
@@ -1576,6 +1902,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Ista</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Koihaiik</exemplarCity>
+			</zone>
+			<zone type="America/Punta_Arenas">
+				<exemplarCity>Punta Arenaasɩ</exemplarCity>
+			</zone>
 			<zone type="America/Santiago">
 				<exemplarCity>Santiyagoo</exemplarCity>
 			</zone>
@@ -1588,6 +1920,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Shaŋgaɩ</exemplarCity>
 			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogotaa</exemplarCity>
+			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Kɔsta Rikaa</exemplarCity>
 			</zone>
@@ -1714,12 +2049,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Thule">
 				<exemplarCity>Tuule</exemplarCity>
 			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuuku</exemplarCity>
+			</zone>
 			<zone type="America/Scoresbysund">
 				<exemplarCity>Itokɔrtoomiiti</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
 				<exemplarCity>Ɖanǝmarkɩhaʊn</exemplarCity>
 			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>Banjuul</exemplarCity>
+			</zone>
 			<zone type="Africa/Conakry">
 				<exemplarCity>Konakrii</exemplarCity>
 			</zone>
@@ -1825,7 +2166,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Nɔm Pɛn</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>Kantɔn</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2323,6 +2664,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiyɛf</exemplarCity>
 			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>Simferopool</exemplarCity>
+			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kampalaa</exemplarCity>
 			</zone>
@@ -2335,9 +2679,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Adak">
 				<exemplarCity>Aɖak</exemplarCity>
 			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>Noome</exemplarCity>
+			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Aŋkɔraajɩ</exemplarCity>
 			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>Yakutaatɩ</exemplarCity>
+			</zone>
 			<zone type="America/Sitka">
 				<exemplarCity>Sitkaa</exemplarCity>
 			</zone>
@@ -2480,9 +2830,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Garɩɖontǝna gɩteŋshilelaŋ kaakɔŋkɔŋɔ̀</generic>
-					<standard>Garɩɖontǝna gɩteŋshilelaŋ kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
-					<daylight>Garɩɖontǝna gɩteŋshilelaŋ kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
+					<standard>Garɩɖontǝna gɩteŋshilelaŋ kaakɔŋkɔŋɔ̀</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2529,9 +2877,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Apiya kaakɔŋkɔŋɔ̀</generic>
-					<standard>Apiya kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
-					<daylight>Apiya kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
+					<generic>Samowa kaakɔŋkɔŋɔ̀</generic>
+					<standard>Samowa kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
+					<daylight>Samowa kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -2637,7 +2985,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Brunɛɩ Ɖarusalaam kaakɔŋkɔŋɔ̀</standard>
+					<standard>Brunɛɩ kaakɔŋkɔŋɔ̀</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -2840,6 +3188,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyanaa kaakɔŋkɔŋɔ̀</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Awayɩɩ n’Alewutii kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Awayɩɩ n’Alewutii kaakɔŋkɔŋɔ̀</generic>
@@ -2856,9 +3209,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Hɔfɖǝ kaakɔŋkɔŋɔ̀</generic>
-					<standard>Hɔfɖǝ kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
-					<daylight>Hɔfɖǝ kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
+					<generic>Kɔfɖǝ kaakɔŋkɔŋɔ̀</generic>
+					<standard>Kɔfɖǝ kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
+					<daylight>Kɔfɖǝ kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -3173,12 +3526,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Ponapee kaakɔŋkɔŋɔ̀</standard>
+					<standard>Poonpei kaakɔŋkɔŋɔ̀</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>Pɩyɔŋyaŋ kaakɔŋkɔŋɔ̀</standard>
+					<standard>Koree gʊnyɩpɛnɛlaŋ kaakɔŋkɔŋɔ̀</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -3200,9 +3553,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Samowa kaakɔŋkɔŋɔ̀</generic>
-					<standard>Samowa kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
-					<daylight>Samowa kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
+					<generic>Samowa Amalɩka kaja kaakɔŋkɔŋɔ̀</generic>
+					<standard>Samowa Amalɩka kaja kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
+					<daylight>Samowa Amalɩka kaja kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -3242,9 +3595,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Taɩpei kaakɔŋkɔŋɔ̀</generic>
-					<standard>Taɩpei kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
-					<daylight>Taɩpei kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
+					<generic>Taɩwan kaakɔŋkɔŋɔ̀</generic>
+					<standard>Taɩwan kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
+					<daylight>Taɩwan kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -3362,6 +3715,88 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<decimal>,</decimal>
 			<group> </group>
 		</symbols>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="zero">baa kotoku 0</pattern>
+					<pattern type="1000" count="one">kotoku 0</pattern>
+					<pattern type="1000" count="other">ɩkotoku 0</pattern>
+					<pattern type="10000" count="zero">baa kotoku 00</pattern>
+					<pattern type="10000" count="one">kotoku 00</pattern>
+					<pattern type="10000" count="other">ɩkotoku 00</pattern>
+					<pattern type="100000" count="zero">baa kotoku 000</pattern>
+					<pattern type="100000" count="one">kotoku 000</pattern>
+					<pattern type="100000" count="other">ɩkotoku 000</pattern>
+					<pattern type="1000000" count="zero">baa gakuli 0</pattern>
+					<pattern type="1000000" count="one">gakuli 0</pattern>
+					<pattern type="1000000" count="other">bʊkuli 0</pattern>
+					<pattern type="10000000" count="zero">baa gakuli 00</pattern>
+					<pattern type="10000000" count="one">gakuli 00</pattern>
+					<pattern type="10000000" count="other">bʊkuli 00</pattern>
+					<pattern type="100000000" count="zero">baa gakuli 000</pattern>
+					<pattern type="100000000" count="one">gakuli 000</pattern>
+					<pattern type="100000000" count="other">bʊkuli 000</pattern>
+					<pattern type="1000000000" count="zero">baa ŋkulo 0</pattern>
+					<pattern type="1000000000" count="one">ŋkulo 0</pattern>
+					<pattern type="1000000000" count="other">akulo 0</pattern>
+					<pattern type="10000000000" count="zero">baa ŋkulo 00</pattern>
+					<pattern type="10000000000" count="one">ŋkulo 00</pattern>
+					<pattern type="10000000000" count="other">akulo 00</pattern>
+					<pattern type="100000000000" count="zero">baa ŋkulo 000</pattern>
+					<pattern type="100000000000" count="one">ŋkulo 000</pattern>
+					<pattern type="100000000000" count="other">akulo 000</pattern>
+					<pattern type="1000000000000" count="zero">baa ŋkrǝ 0</pattern>
+					<pattern type="1000000000000" count="one">ŋkrǝ 0</pattern>
+					<pattern type="1000000000000" count="other">akrǝ 0</pattern>
+					<pattern type="10000000000000" count="zero">baa ŋkrǝ 00</pattern>
+					<pattern type="10000000000000" count="one">ŋkrǝ 00</pattern>
+					<pattern type="10000000000000" count="other">akrǝ 00</pattern>
+					<pattern type="100000000000000" count="zero">baa ŋkrǝ 000</pattern>
+					<pattern type="100000000000000" count="one">ŋkrǝ 000</pattern>
+					<pattern type="100000000000000" count="other">akrǝ 000</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="zero">kt 0</pattern>
+					<pattern type="1000" count="one">kt 0</pattern>
+					<pattern type="1000" count="other">ɩkt 0</pattern>
+					<pattern type="10000" count="zero">kt 00</pattern>
+					<pattern type="10000" count="one">kt 00</pattern>
+					<pattern type="10000" count="other">ɩkt 00</pattern>
+					<pattern type="100000" count="zero">kt 000</pattern>
+					<pattern type="100000" count="one">kt 000</pattern>
+					<pattern type="100000" count="other">ɩkt 000</pattern>
+					<pattern type="1000000" count="zero">gkl 0</pattern>
+					<pattern type="1000000" count="one">gkl 0</pattern>
+					<pattern type="1000000" count="other">bkl 0</pattern>
+					<pattern type="10000000" count="zero">gkl 00</pattern>
+					<pattern type="10000000" count="one">gkl 00</pattern>
+					<pattern type="10000000" count="other">bkl 00</pattern>
+					<pattern type="100000000" count="zero">gkl 000</pattern>
+					<pattern type="100000000" count="one">gkl 000</pattern>
+					<pattern type="100000000" count="other">bkl 000</pattern>
+					<pattern type="1000000000" count="zero">ŋkl 0</pattern>
+					<pattern type="1000000000" count="one">ŋkl 0</pattern>
+					<pattern type="1000000000" count="other">akl 0</pattern>
+					<pattern type="10000000000" count="zero">ŋkl 00</pattern>
+					<pattern type="10000000000" count="one">ŋkl 00</pattern>
+					<pattern type="10000000000" count="other">akl 00</pattern>
+					<pattern type="100000000000" count="zero">ŋkl 000</pattern>
+					<pattern type="100000000000" count="one">ŋkl 000</pattern>
+					<pattern type="100000000000" count="other">akl 000</pattern>
+					<pattern type="1000000000000" count="zero">ŋkr 0</pattern>
+					<pattern type="1000000000000" count="one">ŋkr 0</pattern>
+					<pattern type="1000000000000" count="other">akr 0</pattern>
+					<pattern type="10000000000000" count="zero">ŋkr 00</pattern>
+					<pattern type="10000000000000" count="one">ŋkr 00</pattern>
+					<pattern type="10000000000000" count="other">akr 00</pattern>
+					<pattern type="100000000000000" count="zero">ŋkr 000</pattern>
+					<pattern type="100000000000000" count="one">ŋkr 000</pattern>
+					<pattern type="100000000000000" count="other">akr 000</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -3373,6 +3808,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="zero">¤ kt 0</pattern>
+					<pattern type="1000" count="one">¤ kt 0</pattern>
+					<pattern type="1000" count="other">¤ ɩkt 0</pattern>
+					<pattern type="10000" count="zero">¤ kt 00</pattern>
+					<pattern type="10000" count="one">¤ kt 00</pattern>
+					<pattern type="10000" count="other">¤ ɩkt 00</pattern>
+					<pattern type="100000" count="zero">¤ kt 000</pattern>
+					<pattern type="100000" count="one">¤ kt 000</pattern>
+					<pattern type="100000" count="other">¤ ɩkt 000</pattern>
+					<pattern type="1000000" count="zero">¤ gkl 0</pattern>
+					<pattern type="1000000" count="one">¤ gkl 0</pattern>
+					<pattern type="1000000" count="other">¤ bkl 0</pattern>
+					<pattern type="10000000" count="zero">¤ gkl 00</pattern>
+					<pattern type="10000000" count="one">¤ gkl 00</pattern>
+					<pattern type="10000000" count="other">¤ bkl 00</pattern>
+					<pattern type="100000000" count="zero">¤ gkl 000</pattern>
+					<pattern type="100000000" count="one">¤ gkl 000</pattern>
+					<pattern type="100000000" count="other">¤ bkl 000</pattern>
+					<pattern type="1000000000" count="zero">¤ ŋkl 0</pattern>
+					<pattern type="1000000000" count="one">¤ ŋkl 0</pattern>
+					<pattern type="1000000000" count="other">¤ akl 0</pattern>
+					<pattern type="10000000000" count="zero">¤ ŋkl 00</pattern>
+					<pattern type="10000000000" count="one">¤ ŋkl 00</pattern>
+					<pattern type="10000000000" count="other">¤ akl 00</pattern>
+					<pattern type="100000000000" count="zero">¤ ŋkl 000</pattern>
+					<pattern type="100000000000" count="one">¤ ŋkl 000</pattern>
+					<pattern type="100000000000" count="other">¤ akl 000</pattern>
+					<pattern type="1000000000000" count="zero">¤ ŋkr 0</pattern>
+					<pattern type="1000000000000" count="one">¤ ŋkr 0</pattern>
+					<pattern type="1000000000000" count="other">¤ akr 0</pattern>
+					<pattern type="10000000000000" count="zero">¤ ŋkr 00</pattern>
+					<pattern type="10000000000000" count="one">¤ ŋkr 00</pattern>
+					<pattern type="10000000000000" count="other">¤ akr 00</pattern>
+					<pattern type="100000000000000" count="zero">¤ ŋkr 000</pattern>
+					<pattern type="100000000000000" count="one">¤ ŋkr 000</pattern>
+					<pattern type="100000000000000" count="other">¤ akr 000</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="zero">{1} {0}</unitPattern>
@@ -4292,6 +4773,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">Karayiib gajakalaŋ kaɖala</displayName>
 				<displayName count="other">Karayiib gajakalaŋ kɩɖala</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karayiib kafɔlɔrɛŋ</displayName>
+				<displayName count="zero">baa Karayiib kafɔlɔrɛŋ</displayName>
+				<displayName count="one">Karayiib kafɔlɔrɛŋ</displayName>
+				<displayName count="other">Karayiib kɩfɔlɔrɛŋ</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Garɩɖontǝna gɩteŋshilelaŋ kasɛɛfa</displayName>
 				<displayName count="zero">baa Garɩɖontǝna gɩteŋshilelaŋ kasɛɛfa</displayName>
@@ -4328,6 +4815,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">Sambii kakʊwaasha</displayName>
 				<displayName count="other">Sambii kɩkʊwaasha</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Simbabʊwee kawura</displayName>
+				<displayName count="zero">baa Simbabʊwee kawura</displayName>
+				<displayName count="one">Simbabʊwee kawura</displayName>
+				<displayName count="other">Simbabʊwee kɩwura</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="zero" draft="contributed">baa ʊshilé {0}</pluralMinimalPairs>
@@ -4560,6 +5053,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">bʊkɔ {0}</unitPattern>
 				<unitPattern count="other">ayɔkɔ {0}</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ɩpaartɩ</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>ɩshɩnʊn nɩ</displayName>
 				<unitPattern count="zero">ɩshɩnʊn nɩ {0}</unitPattern>
@@ -4578,6 +5074,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mol {0}</unitPattern>
 				<unitPattern count="other">ɩmol {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gulukoos kaja</displayName>
+				<unitPattern count="zero">baa gulukoos {0}</unitPattern>
+				<unitPattern count="one">gulukoos kaja {0}</unitPattern>
+				<unitPattern count="other">gulukoos kaja {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ɩlitri kiloomɛta nɩ</displayName>
 				<unitPattern count="zero">baa litri kiloomɛta nɩ {0}</unitPattern>
@@ -5020,6 +5522,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mɛrkiir kamilimɛta {0}</unitPattern>
 				<unitPattern count="other">mɛrkiir kɩmilimɛta {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>mɛrkiir kaja</displayName>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>mɛrkiir kasǝkǝmǝ</displayName>
 				<unitPattern count="zero">baa mɛrkiir kansǝkǝmǝ {0}</unitPattern>
@@ -5265,6 +5770,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">ʊkɩtɩʊ {0}</unitPattern>
 				<unitPattern count="other">ɩkɩtɩʊ {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ɩsɩteraɖiyaan</displayName>
+				<unitPattern count="zero">baa sɩteraɖiyaan {0}</unitPattern>
+				<unitPattern count="one">sɩteraɖiyaan {0}</unitPattern>
+				<unitPattern count="other">ɩsɩteraɖiyaan {0}</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ɩkataal</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ɩkʊlɔɔm</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ɩfaraaɖɩ</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ɩhɛnrii</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ɩsimɛɛnsɩ</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ɩbɛkɛrɛɛl</displayName>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ɩsɩfɛɛrtɩ</displayName>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ɩgrɛɛ</displayName>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ɩtɛsɩlaa</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ɩwɛbaasɩ</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>pɔɩɩ</displayName>
 				<unitPattern count="zero">pɔɩɩ {0}</unitPattern>
@@ -5385,7 +5926,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">item {0}</unitPattern>
 				<unitPattern count="other">item {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="zero">ppm {0}</unitPattern>
 				<unitPattern count="one">ppm {0}</unitPattern>
 				<unitPattern count="other">ppm {0}</unitPattern>
@@ -5410,6 +5951,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mol {0}</unitPattern>
 				<unitPattern count="other">mol {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="zero">L/km {0}</unitPattern>
 				<unitPattern count="one">L/km {0}</unitPattern>
@@ -6020,7 +6564,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">light {0}</unitPattern>
 				<unitPattern count="other">light {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="zero">ppb {0}</unitPattern>
 				<unitPattern count="one">ppb {0}</unitPattern>
 				<unitPattern count="other">ppb {0}</unitPattern>
@@ -6140,7 +6684,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">item{0}</unitPattern>
 				<unitPattern count="other">item{0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="zero">ppm{0}</unitPattern>
 				<unitPattern count="one">ppm{0}</unitPattern>
 				<unitPattern count="other">ppm{0}</unitPattern>
@@ -6165,6 +6709,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mol{0}</unitPattern>
 				<unitPattern count="other">mol{0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="zero">L/km{0}</unitPattern>
 				<unitPattern count="one">L/km{0}</unitPattern>
@@ -6768,7 +7315,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">light{0}</unitPattern>
 				<unitPattern count="other">light{0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="zero">ppb{0}</unitPattern>
 				<unitPattern count="one">ppb{0}</unitPattern>
 				<unitPattern count="other">ppb{0}</unitPattern>
@@ -6932,13 +7479,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</sampleName>
 		<sampleName item="nativeGGS">
 			<nameField type="given">Abɖu-Tɔyib</nameField>
+			<nameField type="given2">MUSA</nameField>
 			<nameField type="surname">GOMINA</nameField>
 		</sampleName>
 		<sampleName item="nativeFull">
 			<nameField type="title">ʊŋono</nameField>
 			<nameField type="given">Mustafa</nameField>
 			<nameField type="given-informal">Tafa</nameField>
+			<nameField type="given2">Alɛ</nameField>
+			<nameField type="surname-prefix">∅∅∅</nameField>
 			<nameField type="surname-core">KALAM</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
 			<nameField type="generation">ajala</nameField>
 			<nameField type="credentials">Alaaji</nameField>
 		</sampleName>
@@ -6951,7 +7502,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</sampleName>
 		<sampleName item="foreignGGS">
 			<nameField type="given">Alfɔns</nameField>
+			<nameField type="given2">Rolanɖ</nameField>
 			<nameField type="surname">MANƉELA</nameField>
 		</sampleName>
+		<sampleName item="foreignFull">
+			<nameField type="title">Prof. Ɖr.</nameField>
+			<nameField type="given">Samʊwɛl</nameField>
+			<nameField type="given-informal">Sam</nameField>
+			<nameField type="given2">Fostɛɛŋ</nameField>
+			<nameField type="surname-prefix">fan</nameField>
+			<nameField type="surname-core">ƉAM</nameField>
+			<nameField type="surname2">ƉOMIŊGO</nameField>
+			<nameField type="generation">Jr</nameField>
+			<nameField type="credentials">MƉ</nameField>
+		</sampleName>
 	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/bm_Nkoo.xml b/make/data/cldr/common/main/bm_Nkoo.xml
index fa4ebf3626c..9973eca7e1b 100644
--- a/make/data/cldr/common/main/bm_Nkoo.xml
+++ b/make/data/cldr/common/main/bm_Nkoo.xml
@@ -156,6 +156,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/bn.xml b/make/data/cldr/common/main/bn.xml
index fea3fe71eb0..5609b377a70 100644
--- a/make/data/cldr/common/main/bn.xml
+++ b/make/data/cldr/common/main/bn.xml
@@ -54,7 +54,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bal">বেলুচী</language>
 			<language type="ban">বালিনীয়</language>
 			<language type="bas">বাসা</language>
-			<language type="be">বেলারুশিয়</language>
+			<language type="be">বেলারুশীয়</language>
 			<language type="bej">বেজা</language>
 			<language type="bem">বেম্বা</language>
 			<language type="bez">বেনা</language>
@@ -94,7 +94,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="chn">চিনুক জার্গন</language>
 			<language type="cho">চকটাও</language>
 			<language type="chp">চিপেওয়ান</language>
-			<language type="chr">চেরোকী</language>
+			<language type="chr">চেরোকি</language>
 			<language type="chy">চেইয়েন</language>
 			<language type="ckb">মধ্য কুর্দিশ</language>
 			<language type="ckb" alt="menu">কুর্দিশ, মধ্য</language>
@@ -128,7 +128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="din">ডিংকা</language>
 			<language type="dje">জার্মা</language>
 			<language type="doi">ডোগরি</language>
-			<language type="dsb">নিম্নতর সোর্বিয়ান</language>
+			<language type="dsb">সোর্বিয়ান (নিম্নতর)</language>
 			<language type="dua">দুয়ালা</language>
 			<language type="dum">মধ্য ডাচ</language>
 			<language type="dv">দিবেহি</language>
@@ -145,8 +145,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="elx">এলামাইট</language>
 			<language type="en">ইংরেজি</language>
 			<language type="en_GB" alt="short">ইংরেজি (যুক্তরাজ্য)</language>
-			<language type="en_US">ইংরেজি (আমেরিকা)</language>
-			<language type="en_US" alt="short">ইংরেজি (যুক্তরাষ্ট্র)</language>
+			<language type="en_US" alt="short">ইংরেজি (মার্কিন যুক্তরাষ্ট্র)</language>
 			<language type="enm">মধ্য ইংরেজি</language>
 			<language type="eo">এস্পেরান্তো</language>
 			<language type="es">স্প্যানিশ</language>
@@ -158,7 +157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="fa_AF">দারি</language>
 			<language type="fan">ফ্যাঙ্গ</language>
 			<language type="fat">ফান্তি</language>
-			<language type="ff">ফুলাহ্</language>
+			<language type="ff">ফুলা</language>
 			<language type="fi">ফিনিশ</language>
 			<language type="fil">ফিলিপিনো</language>
 			<language type="fj">ফিজিয়ান</language>
@@ -181,7 +180,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="gd">স্কটিশ-গ্যেলিক</language>
 			<language type="gez">গীজ</language>
 			<language type="gil">গিলবার্টিজ</language>
-			<language type="gl">গ্যালিশিয়</language>
+			<language type="gl">গ্যালিশীয়</language>
 			<language type="gmh">মধ্য-উচ্চ জার্মানি</language>
 			<language type="gn">গুয়ারানি</language>
 			<language type="goh">প্রাচীন উচ্চ জার্মানি</language>
@@ -207,7 +206,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hmn">হ্‌মোঙ</language>
 			<language type="ho">হিরি মোতু</language>
 			<language type="hr">ক্রোয়েশীয়</language>
-			<language type="hsb">উচ্চ সোর্বিয়ান</language>
+			<language type="hsb">সোর্বিয়ান (উচ্চ)</language>
 			<language type="hsn">Xiang চীনা</language>
 			<language type="ht">হাইতিয়ান ক্রেওল</language>
 			<language type="hu">হাঙ্গেরীয়</language>
@@ -220,7 +219,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ibb">ইবিবিও</language>
 			<language type="id">ইন্দোনেশীয়</language>
 			<language type="ie">ইন্টারলিঙ্গ</language>
-			<language type="ig">ইগ্‌বো</language>
+			<language type="ig">ইগবো</language>
 			<language type="ii">সিচুয়ান য়ি</language>
 			<language type="ik">ইনুপিয়াক</language>
 			<language type="ikt">পশ্চিম কানাডিয় ইনুক্টিটুট</language>
@@ -228,7 +227,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="inh">ইঙ্গুশ</language>
 			<language type="io">ইডো</language>
 			<language type="is">আইসল্যান্ডীয়</language>
-			<language type="it">ইতালিয়</language>
+			<language type="it">ইতালীয়</language>
 			<language type="iu">ইনুক্টিটুট</language>
 			<language type="ja">জাপানি</language>
 			<language type="jbo">লোজবান</language>
@@ -265,7 +264,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kn">কন্নড়</language>
 			<language type="ko">কোরিয়ান</language>
 			<language type="koi">কমি-পারমিআক</language>
-			<language type="kok">কোঙ্কানি</language>
+			<language type="kok">কোঙ্কণী</language>
 			<language type="kos">কোস্রাইন</language>
 			<language type="kpe">ক্‌পেল্লে</language>
 			<language type="kr">কানুরি</language>
@@ -277,13 +276,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">বাফিয়া</language>
 			<language type="ksh">কলোগনিয়ান</language>
 			<language type="ku">কুর্দিশ</language>
+			<language type="ku" menu="core">কুর্দিশ</language>
+			<language type="ku" menu="extension">কুরমাঞ্জি</language>
 			<language type="kum">কুমিয়াক</language>
 			<language type="kut">কুটেনাই</language>
 			<language type="kv">কোমি</language>
 			<language type="kw">কর্ণিশ</language>
 			<language type="kwk">কোয়াক’ওয়ালা</language>
 			<language type="kxv">কুভি</language>
-			<language type="ky">কির্গিজ</language>
+			<language type="ky">কিরগিজ</language>
 			<language type="la">লাতিন</language>
 			<language type="lad">লাদিনো</language>
 			<language type="lag">লাঙ্গি</language>
@@ -304,7 +305,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="loz">লোজি</language>
 			<language type="lrc">উত্তরাঞ্চলীয় লুরি</language>
 			<language type="lsm">সামিয়া</language>
-			<language type="lt">লিথুয়েনীয়</language>
+			<language type="lt">লিথুয়ানীয়</language>
 			<language type="lu">লুবা-কাটাঙ্গা</language>
 			<language type="lua">লুবা-লুলুয়া</language>
 			<language type="lui">লুইসেনো</language>
@@ -312,7 +313,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="luo">লুয়ো</language>
 			<language type="lus">মিজো</language>
 			<language type="luy">লুইয়া</language>
-			<language type="lv">লাত্‌ভীয়</language>
+			<language type="lv">লাটভিয়</language>
 			<language type="mad">মাদুরেজ</language>
 			<language type="mag">মাগাহি</language>
 			<language type="mai">মৈথিলি</language>
@@ -332,9 +333,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mi">মাওরি</language>
 			<language type="mic">মিকম্যাক</language>
 			<language type="min">মিনাংকাবাউ</language>
-			<language type="mk">ম্যাসিডোনীয়</language>
-			<language type="ml">মালায়ালাম</language>
-			<language type="mn">মঙ্গোলিয়</language>
+			<language type="mk">ম্যাসেডোনিয়া</language>
+			<language type="ml">মালয়ালম</language>
+			<language type="mn">মোঙ্গোলীয়</language>
 			<language type="mnc">মাঞ্চু</language>
 			<language type="mni">মণিপুরী</language>
 			<language type="moe">ইন্নু-এমুন</language>
@@ -342,7 +343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mos">মসি</language>
 			<language type="mr">মারাঠি</language>
 			<language type="ms">মালয়</language>
-			<language type="mt">মল্টিয়</language>
+			<language type="mt">মল্টীয়</language>
 			<language type="mua">মুদাঙ্গ</language>
 			<language type="mul">একাধিক ভাষা</language>
 			<language type="mus">মুস্কোগী</language>
@@ -356,9 +357,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="naq">নামা</language>
 			<language type="nb">নরওয়েজিয়ান বোকমাল</language>
 			<language type="nd">উত্তর এন্দেবেলে</language>
-			<language type="nds">নিম্ন জার্মানি</language>
+			<language type="nds">জার্মান (নিম্ন)</language>
 			<language type="nds_NL">লো স্যাক্সন</language>
-			<language type="ne">নেপালী</language>
+			<language type="ne">নেপালি</language>
 			<language type="new">নেওয়ারি</language>
 			<language type="ng">এন্দোঙ্গা</language>
 			<language type="nia">নিয়াস</language>
@@ -389,18 +390,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ojs">ওজি-ক্রী</language>
 			<language type="ojw">পশ্চিম ওজিবোয়া</language>
 			<language type="oka">ওকানাগান</language>
-			<language type="om">অরোমো</language>
+			<language type="om">ওরোমো</language>
 			<language type="or">ওড়িয়া</language>
 			<language type="os">ওসেটিক</language>
 			<language type="osa">ওসেজ</language>
 			<language type="ota">অটোমান তুর্কি</language>
-			<language type="pa">পাঞ্জাবী</language>
+			<language type="pa">পাঞ্জাবি</language>
 			<language type="pag">পাঙ্গাসিনান</language>
 			<language type="pal">পাহ্লাভি</language>
 			<language type="pam">পাম্পাঙ্গা</language>
 			<language type="pap">পাপিয়ামেন্টো</language>
 			<language type="pau">পালায়ুয়ান</language>
-			<language type="pcm">নাইজেরিয় পিজিন</language>
+			<language type="pcm">নাইজেরীয় পিজিন</language>
 			<language type="peo">প্রাচীন ফার্সি</language>
 			<language type="phn">ফোনিশীয়ান</language>
 			<language type="pi">পালি</language>
@@ -411,9 +412,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="prg">প্রুশিয়ান</language>
 			<language type="pro">প্রাচীন প্রোভেনসাল</language>
 			<language type="ps">পাশতু</language>
-			<language type="ps" alt="variant">পুশতো</language>
-			<language type="pt">পর্তুগীজ</language>
-			<language type="pt_PT">পর্তুগীজ (ইউরোপ)</language>
+			<language type="pt">পর্তুগিজ</language>
+			<language type="pt_BR">পর্তুগিজ (ব্রাজিল)</language>
+			<language type="pt_PT">পর্তুগিজ (ইউরোপ)</language>
 			<language type="qu">কেচুয়া</language>
 			<language type="quc">কি‘চে</language>
 			<language type="raj">রাজস্থানী</language>
@@ -432,7 +433,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="rwk">রাওয়া</language>
 			<language type="sa">সংস্কৃত</language>
 			<language type="sad">সান্দাওয়ে</language>
-			<language type="sah">শাখা</language>
+			<language type="sah">ইয়াকুট</language>
 			<language type="sam">সামারিটান আরামিক</language>
 			<language type="saq">সামবুরু</language>
 			<language type="sas">সাসাক</language>
@@ -453,7 +454,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="sh">সার্বো-ক্রোয়েশিয়</language>
 			<language type="shi">তাচেলহিত</language>
 			<language type="shn">শান</language>
-			<language type="si">সিংহলী</language>
+			<language type="si">সিংহলি</language>
 			<language type="sid">সিডামো</language>
 			<language type="sk">স্লোভাক</language>
 			<language type="sl">স্লোভেনীয়</language>
@@ -511,7 +512,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="tog">নায়াসা টোঙ্গা</language>
 			<language type="tok">টোকি পোনা</language>
 			<language type="tpi">টোক পিসিন</language>
-			<language type="tr">তুর্কী</language>
+			<language type="tr">তুর্কি</language>
 			<language type="trv">তারোকো</language>
 			<language type="ts">সঙ্গা</language>
 			<language type="tsi">সিমশিয়ান</language>
@@ -549,7 +550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="wo">ওলোফ</language>
 			<language type="wuu">উ চীনা</language>
 			<language type="xal">কাল্মাইক</language>
-			<language type="xh">জোসা</language>
+			<language type="xh">খোসা</language>
 			<language type="xnr">কাংরি</language>
 			<language type="xog">সোগা</language>
 			<language type="yao">ইয়াও</language>
@@ -560,15 +561,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="yo">ইওরুবা</language>
 			<language type="yrl">নহিংগাটু</language>
 			<language type="yue">ক্যান্টোনিজ</language>
-			<language type="yue" alt="menu">চীনা, ক্যানটোনীজ</language>
-			<language type="za">ঝু্য়াঙ</language>
+			<language type="yue" alt="menu">চীনা, ক্যান্টোনিজ</language>
+			<language type="za">ঝুয়াং</language>
 			<language type="zap">জাপোটেক</language>
 			<language type="zbl">চিত্র ভাষা</language>
 			<language type="zen">জেনাগা</language>
 			<language type="zgh">আদর্শ মরক্কোন তামাজিগাত</language>
 			<language type="zh">চীনা</language>
 			<language type="zh" alt="menu">চীনা, ম্যান্ডারিন</language>
-			<language type="zh_Hans" alt="long">চীনা ম্যান্ডারিন সরলীকৃত</language>
+			<language type="zh_Hans" alt="long">চীনা ম্যান্ডারিন (সরলীকৃত)</language>
 			<language type="zh_Hant" alt="long">ম্যান্ডারিন চীনা (ঐতিহ্যবাহী)</language>
 			<language type="zu">জুলু</language>
 			<language type="zun">জুনি</language>
@@ -602,14 +603,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Cprt" draft="contributed">সাইপ্রোয়েট</script>
 			<script type="Cyrl">সিরিলিক</script>
 			<script type="Cyrs">প্রাচীন চার্চ স্লাভোনিক সিরিলিক</script>
-			<script type="Deva">দেবনগরি</script>
+			<script type="Deva">দেবনাগরী</script>
 			<script type="Dsrt">দেসেরাত</script>
 			<script type="Egyd" draft="contributed">মিশরীয় ডেমোটিক</script>
 			<script type="Egyh" draft="contributed">মিশরীয় হায়রেটিক</script>
 			<script type="Egyp" draft="contributed">মিশরীয় হায়ারোগ্লিপ</script>
 			<script type="Ethi">ইথিওপিয়</script>
 			<script type="Geok" draft="contributed">জর্জিয় খুৎসুরি</script>
-			<script type="Geor">জর্জিয়ান</script>
+			<script type="Geor">জর্জীয়</script>
 			<script type="Glag">গ্লাগোলিটিক</script>
 			<script type="Goth">গোথিক</script>
 			<script type="Grek">গ্রিক</script>
@@ -658,11 +659,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Mlym">মালায়ালাম</script>
 			<script type="Mong">মোঙ্গোলীয়</script>
 			<script type="Moon">মুন</script>
-			<script type="Mtei">মেইটেই মায়েক</script>
+			<script type="Mtei">মেইতেই মায়েক</script>
 			<script type="Mymr">মায়ানমার</script>
 			<script type="Nkoo">এন’কো</script>
 			<script type="Ogam">ওঘাম</script>
-			<script type="Olck">ওল চিকি</script>
+			<script type="Olck">অলচিকি</script>
 			<script type="Orkh">অর্খোন</script>
 			<script type="Orya">ওড়িয়া</script>
 			<script type="Osma" draft="contributed">ওসমানিয়</script>
@@ -686,7 +687,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Sinh">সিংহলি</script>
 			<script type="Sund">সুন্দানিজ</script>
 			<script type="Sylo">সিলেটি নাগরি</script>
-			<script type="Syrc">সিরিয়াক</script>
+			<script type="Syrc">সিরীয়</script>
 			<script type="Syre" draft="contributed">এস্ট্রেঙ্গেলো সিরিয়াক</script>
 			<script type="Syrj" draft="contributed">পশ্চিমাঞ্চলীয় সিরিয়াক</script>
 			<script type="Syrn" draft="contributed">পূর্বাঞ্চলীয় সিরিয়াক</script>
@@ -790,7 +791,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CC">কোকোস (কিলিং) দ্বীপপুঞ্জ</territory>
 			<territory type="CD">কঙ্গো-কিনশাসা</territory>
 			<territory type="CD" alt="variant">কঙ্গো(DRC)</territory>
-			<territory type="CF">মধ্য আফ্রিকার প্রজাতন্ত্র</territory>
+			<territory type="CF">মধ্য আফ্রিকান প্রজাতন্ত্র</territory>
 			<territory type="CG">কঙ্গো - ব্রাজাভিল</territory>
 			<territory type="CG" alt="variant">কঙ্গো (প্রজাতন্ত্র)</territory>
 			<territory type="CH">সুইজারল্যান্ড</territory>
@@ -802,6 +803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">চীন</territory>
 			<territory type="CO">কলম্বিয়া</territory>
 			<territory type="CP">ক্লিপারটন দ্বীপপুঞ্জ</territory>
+			<territory type="CQ" draft="contributed">সার্ক দ্বীপ</territory>
 			<territory type="CR">কোস্টারিকা</territory>
 			<territory type="CU">কিউবা</territory>
 			<territory type="CV">কেপ ভার্দে</territory>
@@ -899,7 +901,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="LU">লাক্সেমবার্গ</territory>
 			<territory type="LV">লাটভিয়া</territory>
 			<territory type="LY">লিবিয়া</territory>
-			<territory type="MA">মোরক্কো</territory>
+			<territory type="MA">মরক্কো</territory>
 			<territory type="MC">মোনাকো</territory>
 			<territory type="MD">মলডোভা</territory>
 			<territory type="ME">মন্টিনিগ্রো</territory>
@@ -995,7 +997,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="TN">তিউনিসিয়া</territory>
 			<territory type="TO">টোঙ্গা</territory>
 			<territory type="TR">তুরস্ক</territory>
-			<territory type="TT">ত্রিনিনাদ ও টোব্যাগো</territory>
+			<territory type="TT">ত্রিনিদাদ ও টোবাগো</territory>
 			<territory type="TV">টুভালু</territory>
 			<territory type="TW">তাইওয়ান</territory>
 			<territory type="TZ">তাঞ্জানিয়া</territory>
@@ -1037,7 +1039,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</variants>
 		<keys>
 			<key type="calendar">ক্যালেন্ডার</key>
-			<key type="cf">মুদ্র্যা ফরম্যাট</key>
+			<key type="cf">মুদ্রা বিন্যাস</key>
 			<key type="colAlternate">প্রতীক বাছাইকরণ উপেক্ষা করুন</key>
 			<key type="colBackwards">বিপরীত করা স্বরাঘাত বাছাইকরণ</key>
 			<key type="colCaseFirst">বড়হাতের/ছোটহাতের অক্ষর ক্রম</key>
@@ -1047,35 +1049,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">সংখ্যাসূচক বাছাইকরণ</key>
 			<key type="colStrength">বাছাইকরণ শক্তি</key>
 			<key type="currency">মুদ্রা</key>
+			<key type="em">ইমোজি উপস্থাপনা</key>
 			<key type="hc">সময়ের হিসাব (১২ বা ২৪)</key>
 			<key type="lb">লাইন বিভাজক শৈলী</key>
-			<key type="ms">পরিমাপ সিস্টেম</key>
+			<key type="lw" draft="contributed">শব্দদ্বয়ের মধ্যে লাইন বিভাজক</key>
+			<key type="ms">পরিমাপ পদ্ধতি</key>
 			<key type="numbers">সংখ্যা</key>
-			<key type="timezone">সময় জোন</key>
+			<key type="ss">শব্দ সংক্ষেপণের পর বাক্য ভাঙা</key>
+			<key type="timezone">সময় অঞ্চল</key>
 			<key type="va">স্থানীয় ভিন্নতা</key>
 			<key type="x">বক্তিগত- ব্যবহার</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">বৌদ্ধ ক্যালেন্ডার</type>
+			<type key="calendar" type="buddhist" scope="core">বৌদ্ধ</type>
 			<type key="calendar" type="chinese">চীনা ক্যালেন্ডার</type>
+			<type key="calendar" type="chinese" scope="core">চীনা</type>
 			<type key="calendar" type="coptic">কপটিক ক্যালেন্ডার</type>
-			<type key="calendar" type="dangi">দাঙ্গী ক্যালেন্ডার</type>
+			<type key="calendar" type="coptic" scope="core">কপটিক</type>
+			<type key="calendar" type="dangi">দাঙ্গি ক্যালেন্ডার</type>
+			<type key="calendar" type="dangi" scope="core">দাঙ্গি</type>
 			<type key="calendar" type="ethiopic">ইথিওপিক ক্যালেন্ডার</type>
+			<type key="calendar" type="ethiopic" scope="core">ইথিওপীয়</type>
 			<type key="calendar" type="ethiopic-amete-alem">ইথিওপিও আমেতে আলেম ক্যালেন্ডার</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ইথিওপীয় আমেতে আলেম</type>
 			<type key="calendar" type="gregorian">গ্রিগোরিয়ান ক্যালেন্ডার</type>
+			<type key="calendar" type="gregorian" scope="core">গ্রেগরীয়</type>
 			<type key="calendar" type="hebrew">হিব্রু ক্যালেন্ডার</type>
+			<type key="calendar" type="hebrew" scope="core">হিব্রু</type>
 			<type key="calendar" type="indian">ভারতীয় জাতীয় বর্ষপঞ্জী</type>
+			<type key="calendar" type="indian" scope="core">ভারতীয় জাতীয়</type>
 			<type key="calendar" type="islamic">ইসলামিক ক্যালেন্ডার</type>
-			<type key="calendar" type="islamic-civil">ইসলামিক-সিভিল বর্ষপঞ্জী</type>
+			<type key="calendar" type="islamic" scope="core">হিজরি</type>
+			<type key="calendar" type="islamic-civil">ইসলামিক ক্যালেন্ডার (ছকবদ্ধ, নাগরিক বর্ষপঞ্জি)</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="contributed">হিজরি (ছকবদ্ধ, নাগরিক বর্ষপঞ্জি)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ইসলামিক বর্ষপঞ্জী (সৌদি আরব, দৃশ্যমান)</type>
 			<type key="calendar" type="islamic-tbla">ইসলামিক বর্ষপঞ্জী (ছকবদ্ধ, জ্যোতির্বিদ্যীয় যুগ)</type>
+			<type key="calendar" type="islamic-tbla" scope="core" draft="contributed">হিজরি (ছকবদ্ধ, জ্যোতির্বিদ্যীয় যুগ)</type>
 			<type key="calendar" type="islamic-umalqura">ইসলামিক বর্ষপঞ্জী (উম্মা আল-কুরআ)</type>
-			<type key="calendar" type="iso8601">ISO-861 ক্যালেন্ডার</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">হিজরি (উম্মা আল-কুরআ)</type>
+			<type key="calendar" type="iso8601">গ্রেগরীয় ক্যালেন্ডার (প্রথম বর্ষ)</type>
 			<type key="calendar" type="japanese">জাপানি ক্যালেন্ডার</type>
+			<type key="calendar" type="japanese" scope="core">জাপানি</type>
 			<type key="calendar" type="persian">ফারসি ক্যালেন্ডার</type>
+			<type key="calendar" type="persian" scope="core">ফারসি</type>
 			<type key="calendar" type="roc">মিঙ্গুও ক্যালেন্ডার</type>
+			<type key="calendar" type="roc" scope="core">মিঙ্গুও</type>
 			<type key="cf" type="account">হিসাবের মুদ্রা বিন্যাস</type>
+			<type key="cf" type="account" scope="core" draft="contributed">অ্যাকাউন্টিং</type>
 			<type key="cf" type="standard">মানক মুদ্রা বিন্যাস</type>
+			<type key="cf" type="standard" scope="core">মানক</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">প্রতীক বাছাই করুন</type>
 			<type key="colAlternate" type="shifted" draft="contributed">উপেক্ষা প্রতীক বাছাই করুন</type>
 			<type key="colBackwards" type="no" draft="contributed">স্বরাঘাত সাধারণতভাবে বাছাই করুন</type>
@@ -1085,22 +1108,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">প্রথমে বড়হাতের অক্ষর বাছাই করুন</type>
 			<type key="colCaseLevel" type="no" draft="contributed">কেস অসংবেদী বাছাই করুন</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">কেস সংবেদী বাছাই করুন</type>
-			<type key="collation" type="big5han">প্রথাগত চীনা সজ্জাক্রম - বিগ৫</type>
 			<type key="collation" type="compat" draft="contributed">আগের বাছাইয়ের ক্রম, সামঞ্জস্যের জন্য</type>
 			<type key="collation" type="dictionary" draft="contributed">অভিধান বাছাই বিন্যাস</type>
 			<type key="collation" type="ducet">ডিফল্ট ইউনিকোড বাছাই বিন্যাস</type>
+			<type key="collation" type="ducet" scope="core">ডিফল্ট ইউনিকোড</type>
 			<type key="collation" type="emoji" draft="contributed">ইমোজি বাছাই ক্রম</type>
 			<type key="collation" type="eor" draft="contributed">ইউরোপীয় ক্রম বিন্যাসের নিয়মাবলী</type>
-			<type key="collation" type="gb2312han">সাধারণ চীনা সজ্জাক্রম - জিবি২৩১২</type>
 			<type key="collation" type="phonebook">ফোনবুক সজ্জাক্রম</type>
 			<type key="collation" type="phonetic" draft="contributed">ধ্বনি নির্দেশক বাছাই ক্রম</type>
 			<type key="collation" type="pinyin" draft="contributed">পিনিন সজ্জাক্রম</type>
 			<type key="collation" type="reformed" draft="contributed">রিফর্মড বাছাই বিন্যাস</type>
 			<type key="collation" type="search">সাধারণ-উদ্দেশ্যে অনুসন্ধান</type>
+			<type key="collation" type="search" scope="core">সার্চ</type>
 			<type key="collation" type="searchjl" draft="contributed">হাঙ্গুল প্রাথমিক ব্যঞ্জনবর্ণ দ্বারা অনুসন্ধান করুন</type>
 			<type key="collation" type="standard">আদর্শ বাছাই বিন্যাস</type>
+			<type key="collation" type="standard" scope="core">মানক</type>
 			<type key="collation" type="stroke" draft="contributed">আবর্তিত সজ্জাক্রম</type>
 			<type key="collation" type="traditional">প্রথাগত বাছাই বিন্যাস</type>
+			<type key="collation" type="traditional" scope="core">প্রথাগত</type>
 			<type key="collation" type="unihan" draft="contributed">রাডিকেল স্ট্রোক বাছাই বিন্যাস</type>
 			<type key="collation" type="zhuyin" draft="contributed">ঝুইন সজ্জাক্রম</type>
 			<type key="colNormalization" type="no" draft="contributed">স্বাভাবিক ছাড়া বাছাই করুন</type>
@@ -1115,18 +1140,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">পূর্ণপ্রস্থ পর্যন্ত</type>
 			<type key="d0" type="hwidth">অর্ধপ্রস্থ পর্যন্ত</type>
 			<type key="d0" type="npinyin" draft="contributed">সাংখিক</type>
+			<type key="em" type="default" scope="core">ডিফল্ট</type>
+			<type key="em" type="emoji" scope="core">ইমোজি</type>
+			<type key="em" type="text" scope="core">টেক্সট</type>
 			<type key="hc" type="h11">১২ ঘণ্টার হিসাবে (০–১১)</type>
+			<type key="hc" type="h11" scope="core">১২ (০–১১)</type>
 			<type key="hc" type="h12">১২ ঘণ্টার হিসাবে (১–১২)</type>
+			<type key="hc" type="h12" scope="core">১২ (১–১২)</type>
 			<type key="hc" type="h23">২৪ ঘণ্টার হিসাবে (০–২৩)</type>
+			<type key="hc" type="h23" scope="core">২৪ (০–২৩)</type>
 			<type key="hc" type="h24">২৪ ঘণ্টার হিসাবে (১–২৪)</type>
+			<type key="hc" type="h24" scope="core">২৪ (১–২৪)</type>
 			<type key="lb" type="loose">আলগা লাইন বিভাজক শৈলী</type>
+			<type key="lb" type="loose" scope="core" draft="contributed">আলগা</type>
 			<type key="lb" type="normal">সাধারণ লাইন বিভাজক শৈলী</type>
+			<type key="lb" type="normal" scope="core" draft="contributed">সাধারণ</type>
 			<type key="lb" type="strict">টাইট লাইন বিভাজক শৈলী</type>
+			<type key="lb" type="strict" scope="core" draft="contributed">টাইট</type>
+			<type key="lw" type="breakall" scope="core" draft="contributed">সবেতেই বিভাজক রাখুন</type>
+			<type key="lw" type="keepall" scope="core" draft="contributed">সব রেখে দিন</type>
+			<type key="lw" type="normal" scope="core" draft="contributed">স্বাভাবিক</type>
+			<type key="lw" type="phrase" scope="core" draft="contributed">ব্যাক্যাংশে বিভাজক</type>
 			<type key="m0" type="bgn">ইউএস বিজিএন বর্ণান্তরণ</type>
 			<type key="m0" type="ungegn">ইউএন জিইজিএন বর্ণান্তরণ</type>
-			<type key="ms" type="metric">মেট্রিক সিস্টেম</type>
+			<type key="ms" type="metric">মেট্রিক পদ্ধতি</type>
+			<type key="ms" type="metric" scope="core">মেট্রিক</type>
 			<type key="ms" type="uksystem">ইম্পেরিয়াল পরিমাপ সিস্টেম</type>
+			<type key="ms" type="uksystem" scope="core">যুক্তরাজ্য</type>
 			<type key="ms" type="ussystem">মার্কিন যুক্তরাষ্ট্রের পরিমাপ সিস্টেম</type>
+			<type key="ms" type="ussystem" scope="core">মার্কিন যুক্তরাষ্ট্র</type>
 			<type key="numbers" type="ahom" draft="contributed">অহম সংখ্যা</type>
 			<type key="numbers" type="arab">আরবি-ভারতীয় সংখ্যা</type>
 			<type key="numbers" type="arabext">প্রসারিত আরবি -ভারতীয় সংখ্যা</type>
@@ -1182,7 +1224,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="mymrtlng" draft="contributed">মায়ানমার থাই লেয়িং সংখ্যা</type>
 			<type key="numbers" type="native">স্থানীয় সংখ্যা</type>
 			<type key="numbers" type="nkoo" draft="contributed">এন’কো সংখ্যা</type>
-			<type key="numbers" type="olck">ওল চিকি সংখ্যা</type>
+			<type key="numbers" type="olck">অলচিকি সংখ্যা</type>
 			<type key="numbers" type="orya">ওড়িয়া সংখ্যা</type>
 			<type key="numbers" type="osma" draft="contributed">ওসমানিয় সংখ্যা</type>
 			<type key="numbers" type="roman">রোমান সংখ্যা</type>
@@ -1204,6 +1246,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="traditional" draft="contributed">ঐতিহ্যগত সংখ্যাসূচক</type>
 			<type key="numbers" type="vaii">ভাই সংখ্যা</type>
 			<type key="numbers" type="wara" draft="contributed">ওয়ারেং সিটি সংখ্যা</type>
+			<type key="ss" type="none" scope="core">বন্ধ</type>
+			<type key="ss" type="standard" scope="core">চালু</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">মেট্রিক</measurementSystemName>
@@ -1219,18 +1263,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	<characters>
 		<exemplarCharacters>[় ৺ অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ং ঃ ঁ ক {ক্ষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড{ড়} ঢ{ঢ়} ণ ত ৎ থ দ ধ ন প ফ ব ভ ম য{য়} র ল শ ষ স হ ঽ া ি ী ু ূ ৃ ৄ ৢ ৣ ে ৈ ো ৌ ্ ৗ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200C\u200D ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ]</exemplarCharacters>
-		<exemplarCharacters type="index">[অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক {ক্ষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ]</exemplarCharacters>
+		<exemplarCharacters type="index">[অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক {ক্ষ} খ গ ঘ চ ছ জ ঝ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … । ॥ '‘’ &quot;“” ( ) \[ \] § @ * / # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary" draft="contributed">[। ॥]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‑ , . /]</exemplarCharacters>
 		<ellipsis type="final">{0} …</ellipsis>
 		<ellipsis type="initial">… {0}</ellipsis>
 		<ellipsis type="medial">{0} … {1}</ellipsis>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1278,12 +1321,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">যুগ ০</era>
-						<era type="1" draft="contributed">যুগ ১</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1322,12 +1359,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">যুগ ০</era>
-						<era type="1" draft="contributed">যুগ ১</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1361,6 +1392,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} এ {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}: {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1369,21 +1403,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} এ {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}: {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh" draft="contributed">E B h</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
@@ -1525,8 +1571,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="12">ডিসে</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">জানুয়ারী</month>
-							<month type="2">ফেব্রুয়ারী</month>
+							<month type="1">জানুয়ারি</month>
+							<month type="2">ফেব্রুয়ারি</month>
 							<month type="3">মার্চ</month>
 							<month type="4">এপ্রিল</month>
 							<month type="5">মে</month>
@@ -1549,10 +1595,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="6">জুন</month>
 							<month type="7">জুলাই</month>
 							<month type="8">আগস্ট</month>
-							<month type="9">সেপ্টেম্বর</month>
-							<month type="10">অক্টোবর</month>
+							<month type="9">সেপ্ট</month>
+							<month type="10">অক্টো</month>
 							<month type="11">নভেম্বর</month>
-							<month type="12">ডিসেম্বর</month>
+							<month type="12">ডিসে</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">জা</month>
@@ -1568,6 +1614,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">ন</month>
 							<month type="12">ডি</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">জানুয়ারি</month>
+							<month type="2">ফেব্রুয়ারি</month>
+							<month type="3">মার্চ</month>
+							<month type="4">এপ্রিল</month>
+							<month type="5">মে</month>
+							<month type="6">জুন</month>
+							<month type="7">জুলাই</month>
+							<month type="8">আগস্ট</month>
+							<month type="9">সেপ্টেম্বর</month>
+							<month type="10">অক্টোবর</month>
+							<month type="11">নভেম্বর</month>
+							<month type="12">ডিসেম্বর</month>
+						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -1658,7 +1718,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="1">খ্রীষ্টাব্দ</era>
+						<era type="0" alt="variant">খ্রিস্টপূর্বাব্দ</era>
+						<era type="1">খ্রিস্টাব্দ</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">খ্রিস্টপূর্ব</era>
@@ -1724,6 +1785,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} এ {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}-এ</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1740,6 +1804,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1748,11 +1815,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh" draft="contributed">E B h</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
@@ -1918,10 +1991,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<calendar type="indian">
 				<months>
 					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">চৈত্র</month>
+							<month type="2">বৈশাখ</month>
+							<month type="3">জ্যৈষ্ঠ</month>
+							<month type="4">আষাঢ়</month>
+							<month type="5">শ্রাবণ</month>
+							<month type="6">ভাদ্র</month>
+							<month type="7">আশ্বিন</month>
+							<month type="8">কার্তিক</month>
+							<month type="9">অগ্রহায়ণ</month>
+							<month type="10">পৌষ</month>
+							<month type="11">মাঘ</month>
+							<month type="12">ফাল্গুন</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">চৈত্র</month>
 							<month type="2">বৈশাখ</month>
-							<month type="3">জৈষ্ঠ্য</month>
+							<month type="3">জ্যৈষ্ঠ</month>
 							<month type="4">আষাঢ়</month>
 							<month type="5">শ্রাবণ</month>
 							<month type="6">ভাদ্র</month>
@@ -1934,6 +2021,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">চৈত্র</month>
+							<month type="2">বৈশাখ</month>
+							<month type="3">জ্যৈষ্ঠ</month>
+							<month type="4">আষাঢ়</month>
+							<month type="5">শ্রাবণ</month>
+							<month type="6">ভাদ্র</month>
+							<month type="7">আশ্বিন</month>
+							<month type="8">কার্তিক</month>
+							<month type="9">অগ্রহায়ণ</month>
+							<month type="10">পৌষ</month>
+							<month type="11">মাঘ</month>
+							<month type="12">ফাল্গুন</month>
+						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">১</month>
 							<month type="2">২</month>
@@ -1948,6 +2049,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">১১</month>
 							<month type="12">১২</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">চৈত্র</month>
+							<month type="2">বৈশাখ</month>
+							<month type="3">জ্যৈষ্ঠ</month>
+							<month type="4">আষাঢ়</month>
+							<month type="5">শ্রাবণ</month>
+							<month type="6">ভাদ্র</month>
+							<month type="7">আশ্বিন</month>
+							<month type="8">কার্তিক</month>
+							<month type="9">অগ্রহায়ণ</month>
+							<month type="10">পৌষ</month>
+							<month type="11">মাঘ</month>
+							<month type="12">ফাল্গুন</month>
+						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
@@ -1960,7 +2075,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">মহররম</month>
+							<month type="1">মুহররম</month>
 							<month type="2">সফর</month>
 							<month type="3">রবিউল আউয়াল</month>
 							<month type="4">রবিউস সানি</month>
@@ -1974,7 +2089,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="12">জ্বিলহজ্জ</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">মহররম</month>
+							<month type="1">মুহররম</month>
 							<month type="2">সফর</month>
 							<month type="3">রবিউল আউয়াল</month>
 							<month type="4">রবিউস সানি</month>
@@ -1989,6 +2104,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">মুহররম</month>
+							<month type="2">সফর</month>
+							<month type="3">রবিউল আউয়াল</month>
+							<month type="4">রবিউস সানি</month>
+							<month type="5">জমাদিউল আউয়াল</month>
+							<month type="6">জমাদিউস সানি</month>
+							<month type="7">রজব</month>
+							<month type="8">শা‘বান</month>
+							<month type="9">রমজান</month>
+							<month type="10">শাওয়াল</month>
+							<month type="11">জ্বিলকদ</month>
+							<month type="12">জ্বিলহজ্জ</month>
+						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">১</month>
 							<month type="2">২</month>
@@ -2003,6 +2132,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">১১</month>
 							<month type="12">১২</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">মুহররম</month>
+							<month type="2">সফর</month>
+							<month type="3">রবিউল আউয়াল</month>
+							<month type="4">রবিউস সানি</month>
+							<month type="5">জমাদিউল আউয়াল</month>
+							<month type="6">জমাদিউস সানি</month>
+							<month type="7">রজব</month>
+							<month type="8">শা‘বান</month>
+							<month type="9">রমজান</month>
+							<month type="10">শাওয়াল</month>
+							<month type="11">জ্বিলকদ</month>
+							<month type="12">জ্বিলহজ্জ</month>
+						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
@@ -2010,6 +2153,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="0">যুগ</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="persian">
 				<months>
@@ -2260,12 +2409,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ঘণ্টা</displayName>
 				<relative type="0">এই ঘণ্টায়</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ঘন্টায়</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ঘন্টায়</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ঘণ্টায়</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ঘণ্টায়</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} ঘন্টা আগে</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ঘন্টা আগে</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ঘণ্টা আগে</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ঘণ্টা আগে</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ঘণ্টায়</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ঘণ্টায়</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ঘণ্টা আগে</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ঘণ্টা আগে</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ঘণ্টায়</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ঘণ্টায়</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ঘণ্টা আগে</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ঘণ্টা আগে</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
@@ -2298,12 +2467,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} সেকেন্ড আগে</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="second-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} সেকেন্ড আগে</relativeTimePattern>
-					<relativeTimePattern count="other">{0} সেকেন্ড আগে</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="zone">
 				<displayName>সময় অঞ্চল</displayName>
 			</field>
@@ -2669,6 +2832,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ইস্টার</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">কোয়আইকে</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>পুন্টা আরেনাস</exemplarCity>
 			</zone>
@@ -2934,9 +3100,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>নম পেন</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>এন্ডারবারি</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ক্যান্টন</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3613,9 +3776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>পশ্চিম আফ্রিকা সময়</generic>
-					<standard>পশ্চিম আফ্রিকা মানক সময়</standard>
-					<daylight>পশ্চিম আফ্রিকা গ্রীষ্মকালীন সময়</daylight>
+					<standard>পশ্চিম আফ্রিকা সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3846,9 +4007,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic>কোলোম্বিয়া সময়</generic>
+					<generic>কলম্বিয়া সময়</generic>
 					<standard>কোলোম্বিয়া মানক সময়</standard>
-					<daylight>কোলোম্বিয়া গ্রীষ্মকালীন সময়</daylight>
+					<daylight>কলম্বিয়া গ্রীষ্মকালীন সময়</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
@@ -3998,6 +4159,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>গুয়ানা সময়</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>হাওয়াই-আলেউত মানক সময়</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>হাওয়াই-আলেউত সময়</generic>
@@ -4451,6 +4617,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>চুক সময়</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="provisional">তুর্কী সময়</generic>
+					<standard draft="provisional">তুর্কী মান সময়</standard>
+					<daylight draft="provisional">তুর্কী গ্রীষ্মকাল সময়</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>তুর্কমেনিস্তান সময়</generic>
@@ -4594,10 +4767,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="100000000" count="other">00 কো</pattern>
 					<pattern type="1000000000" count="one">000 কো</pattern>
 					<pattern type="1000000000" count="other">000 কো</pattern>
-					<pattern type="10000000000" count="one">00 শত কো</pattern>
-					<pattern type="10000000000" count="other">00শত কো</pattern>
-					<pattern type="100000000000" count="one">000কো</pattern>
-					<pattern type="100000000000" count="other">000কো</pattern>
+					<pattern type="10000000000" count="one">0 শত কো</pattern>
+					<pattern type="10000000000" count="other">0শত কো</pattern>
+					<pattern type="100000000000" count="one">0কো</pattern>
+					<pattern type="100000000000" count="other">0কো</pattern>
 					<pattern type="1000000000000" count="one">0 লা'.'কো'.'</pattern>
 					<pattern type="1000000000000" count="other">0 লা'.'কো'.'</pattern>
 					<pattern type="10000000000000" count="one">00 লা'.'কো'.'</pattern>
@@ -4625,8 +4798,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##,##0.00¤</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">#,##,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##,##0.00¤;(#,##,##0.00¤)</pattern>
@@ -4664,14 +4837,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000000000" count="one" alt="alphaNextToNumber">000 কো ¤</pattern>
 					<pattern type="1000000000" count="other">000 কো¤</pattern>
 					<pattern type="1000000000" count="other" alt="alphaNextToNumber">000 কো ¤</pattern>
-					<pattern type="10000000000" count="one">0000 কো¤</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">0000 কো ¤</pattern>
-					<pattern type="10000000000" count="other">0000 কো¤</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">0000 কো ¤</pattern>
-					<pattern type="100000000000" count="one">00000 কো¤</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">00000 কো ¤</pattern>
-					<pattern type="100000000000" count="other">00000 কো¤</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">00000 কো ¤</pattern>
+					<pattern type="10000000000" count="one">0 শত কো¤</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">0 শত কো ¤</pattern>
+					<pattern type="10000000000" count="other">0শত কো¤</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">0শত কো ¤</pattern>
+					<pattern type="100000000000" count="one">0কো¤</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">0কো ¤</pattern>
+					<pattern type="100000000000" count="other">0কো¤</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">0কো ¤</pattern>
 					<pattern type="1000000000000" count="one">0 লা'.'কো'.'¤</pattern>
 					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">0 লা'.'কো'.' ¤</pattern>
 					<pattern type="1000000000000" count="other">0 লা'.'কো'.'¤</pattern>
@@ -5321,13 +5494,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="SLE">
 				<displayName>সিয়েরা লিয়নের লিয়ন</displayName>
-				<displayName count="one">সিয়েরা লিয়নের লিয়ন</displayName>
-				<displayName count="other">সিয়েরা লিয়নের লিয়ন</displayName>
 			</currency>
 			<currency type="SLL">
 				<displayName>সিয়েরা লিয়নের লিয়ন (1964—2022)</displayName>
-				<displayName count="one">সিয়েরা লিয়নের লিয়ন (1964—2022)</displayName>
-				<displayName count="other">সিয়েরা লিয়নের লিয়ন (1964—2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>সোমালি শিলিং</displayName>
@@ -5466,6 +5635,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>পূর্ব ক্যারাবিয়ান ডলার</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">ক্যারিবিয়ান গিল্ডার</displayName>
+				<displayName count="one">ক্যারিবিয়ান গিল্ডার</displayName>
+				<displayName count="other">ক্যারিবিয়ান গিল্ডার</displayName>
+			</currency>
 			<currency type="XEU">
 				<displayName>ইউরোপীয় মুদ্রা একক</displayName>
 			</currency>
@@ -5528,6 +5702,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>জিম্বাবুয়ে ডলার (১৯৮০–২০০৮)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">জিম্বাবায়েন গোল্ড</displayName>
+				<displayName count="one">জিম্বাবোয়েন গোল্ড</displayName>
+				<displayName count="other" draft="contributed">জিম্বাবোয়েন গোল্ড</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>জিম্বাবুয়ে ডলার (২০০৯)</displayName>
 			</currency>
@@ -5721,7 +5900,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মিলিমোল, প্রতি লিটারে</unitPattern>
 				<unitPattern count="other">{0} মিলিমোল, প্রতি লিটারে</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>পার্ট</displayName>
+				<unitPattern count="one">{0} পার্ট</unitPattern>
+				<unitPattern count="other">{0} পার্ট</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ভাগ, প্রতি মিলিয়নে</displayName>
 				<unitPattern count="one">{0} ভাগ, প্রতি মিলিয়নে</unitPattern>
 				<unitPattern count="other">{0} ভাগ, প্রতি মিলিয়নে</unitPattern>
@@ -5738,10 +5922,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} পারমিরিয়াড</unitPattern>
 				<unitPattern count="other">{0} পারমিরিয়াড</unitPattern>
 			</unit>
-			<unit type="concentr-mole">
-				<displayName>মোল্স</displayName>
-				<unitPattern count="one">{0} মোল</unitPattern>
-				<unitPattern count="other">{0} মোল্স</unitPattern>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুকোজ</displayName>
+				<unitPattern count="one">{0} গ্লুকোজ</unitPattern>
+				<unitPattern count="other">{0} গ্লুকোজ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>লিটার, প্রতি কিলোমিটারে</displayName>
@@ -5813,6 +5997,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} শতাব্দী</unitPattern>
 				<unitPattern count="other">{0} শতাব্দী</unitPattern>
 			</unit>
+			<unit type="duration-hour">
+				<displayName>ঘণ্টা</displayName>
+				<unitPattern count="one">{0} ঘণ্টা</unitPattern>
+				<unitPattern count="other">{0} ঘণ্টা</unitPattern>
+				<perUnitPattern>{0} প্রতি ঘণ্টা</perUnitPattern>
+			</unit>
 			<unit type="duration-millisecond">
 				<unitPattern count="one">{0} মিলিসেকেন্ড</unitPattern>
 				<unitPattern count="other">{0} মিলিসেকেন্ড</unitPattern>
@@ -5870,7 +6060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>কিলোওয়াট ঘন্টা</displayName>
-				<unitPattern count="one">{0} কিলোওয়াট ঘন্টা</unitPattern>
+				<unitPattern count="one">{0} কিলোওয়াট ঘণ্টা</unitPattern>
 				<unitPattern count="other">{0} কিলোওয়াট ঘন্টা</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
@@ -5883,9 +6073,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ব্রিটিশ থার্মাল ইউনিট</unitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName>নিউটন্স</displayName>
 				<unitPattern count="one">{0} নিউটন</unitPattern>
-				<unitPattern count="other">{0} নিউটন্স</unitPattern>
+				<unitPattern count="other">{0} নিউটন</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>কিলোওয়াট-ঘণ্টা প্রতি 100 কিলোমিটার</displayName>
@@ -5992,8 +6181,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} পিকোমিটার</unitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
+				<displayName>পারসেক</displayName>
+				<unitPattern count="one">{0} পারসেক</unitPattern>
+				<unitPattern count="other">{0} পারসেক</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName>জ্যোতির্বিজ্ঞান একক</displayName>
@@ -6159,17 +6349,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} মেগাপাস্কাল</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>ঘন্টা প্রতি কিলোমিটার</displayName>
-				<unitPattern count="one">{0} ঘন্টা প্রতি কিলোমিটার</unitPattern>
-				<unitPattern count="other">{0} ঘন্টা প্রতি কিলোমিটার</unitPattern>
+				<displayName>ঘণ্টা প্রতি কিলোমিটার</displayName>
+				<unitPattern count="one">{0} কিলোমিটার প্রতি ঘণ্টা</unitPattern>
+				<unitPattern count="other">{0} কিলোমিটার প্রতি ঘণ্টা</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="one">{0} মিটার প্রতি সেকেন্ড</unitPattern>
 				<unitPattern count="other">{0} মিটার প্রতি সেকেন্ড</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<unitPattern count="one">{0} ঘন্টা প্রতি মাইল</unitPattern>
-				<unitPattern count="other">{0} ঘন্টা প্রতি মাইল</unitPattern>
+				<displayName>ঘণ্টা প্রতি মাইল</displayName>
+				<unitPattern count="one">{0} মাইল প্রতি ঘণ্টা</unitPattern>
+				<unitPattern count="other">{0} মাইল প্রতি ঘণ্টা</unitPattern>
 			</unit>
 			<unit type="speed-knot">
 				<displayName>নট</displayName>
@@ -6276,6 +6467,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মেট্রিক কাপ</unitPattern>
 				<unitPattern count="other">{0} মেট্রিক কাপ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">মেট্রিক ফ্লুইড আউন্স</displayName>
+				<unitPattern count="one" draft="contributed">{0} মেট্রিক ফ্লুইড আউন্স</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} মেট্রিক ফ্লুইড আউন্স</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>একর-ফুট</displayName>
 				<unitPattern count="one">{0} একর-ফুট</unitPattern>
@@ -6355,17 +6551,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Imp. quart</unitPattern>
 				<unitPattern count="other">{0} Imp. quart</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName draft="contributed">স্টেরেডিয়ান</displayName>
+				<unitPattern count="one" draft="contributed">{0} স্টেরেডিয়ান</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} স্টেরেডিয়ান</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">ক্যাটাল</displayName>
+				<unitPattern count="one" draft="contributed">{0} ক্যাটাল</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ক্যাটাল</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">কুলম্ব</displayName>
+				<unitPattern count="one" draft="contributed">{0} কুলম্ব</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} কুলম্ব</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">ফ্যারাড</displayName>
+				<unitPattern count="one" draft="contributed">{0} ফ্যারাড</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ফ্যারাড</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">হেনরি</displayName>
+				<unitPattern count="one" draft="contributed">{0} হেনরি</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} হেনরি</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">সিমেন্স</displayName>
+				<unitPattern count="one" draft="contributed">{0} সিমেন্স</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} সিমেন্স</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">ক্যালোরি [IT]</displayName>
+				<unitPattern count="one">{0} ক্যালোরি [IT]</unitPattern>
+				<unitPattern count="other">{0} ক্যালোরি [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">বেকেরেল</displayName>
+				<unitPattern count="one" draft="contributed">{0} বেকেরেল</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} বেকেরেল</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">সিভার্ট</displayName>
+				<unitPattern count="one" draft="contributed">{0} সিভার্ট</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} সিভার্ট</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">গ্রে</displayName>
+				<unitPattern count="one" draft="contributed">{0} গ্রে</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} গ্রে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">কিলোগ্রাম-ফোর্স</displayName>
+				<unitPattern count="one" draft="contributed">{0} কিলোগ্রাম-ফোর্স</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} কিলোগ্রাম-ফোর্স</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">টেসলা</displayName>
+				<unitPattern count="one" draft="contributed">{0} টেসলা</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} টেসলা</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">ওয়েবার</displayName>
+				<unitPattern count="one" draft="contributed">{0} ওয়েবার</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ওয়েবার</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>আলোক</displayName>
+				<unitPattern count="one">{0} আলোক</unitPattern>
+				<unitPattern count="other">{0} আলোক</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>পার্ট প্রতি বিলিয়ন</displayName>
 				<unitPattern count="one">{0} পার্ট প্রতি বিলিয়ন</unitPattern>
 				<unitPattern count="other">{0} পার্ট প্রতি বিলিয়ন</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>রাত্রি</displayName>
-				<unitPattern count="one">{0} রাত্রি</unitPattern>
-				<unitPattern count="other">{0} রাত্রি</unitPattern>
-				<perUnitPattern>{0}/রাত্রি</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>প্রধান দিকনির্দেশ</displayName>
 				<coordinateUnitPattern type="east">{0} পূর্ব</coordinateUnitPattern>
@@ -6521,6 +6781,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} আইটেম</unitPattern>
 				<unitPattern count="other">{0} আইটেম</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>পার্ট</displayName>
+				<unitPattern count="one">{0} পার্ট</unitPattern>
+				<unitPattern count="other">{0} পার্ট</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>শতাংশ</displayName>
 			</unit>
@@ -6535,6 +6800,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মোল</unitPattern>
 				<unitPattern count="other">{0} মোল</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>লিটার/কিমি</displayName>
 			</unit>
@@ -6611,9 +6881,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/দিন</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>ঘন্টা</displayName>
-				<unitPattern count="one">{0} ঘন্টা</unitPattern>
-				<unitPattern count="other">{0} ঘন্টা</unitPattern>
+				<displayName>ঘণ্টা</displayName>
+				<unitPattern count="one">{0} ঘণ্টা</unitPattern>
+				<unitPattern count="other">{0} ঘণ্টা</unitPattern>
 				<perUnitPattern>{0} প্রতি ঘন্টা</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
@@ -6742,7 +7012,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0} প্রতি ইঞ্চি</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName>parsecs</displayName>
+				<displayName>পারসেক</displayName>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>আলোকবর্ষ</displayName>
@@ -6757,6 +7027,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="length-solar-radius">
 				<displayName>সৌর রেডি</displayName>
 			</unit>
+			<unit type="light-candela">
+				<displayName>ক্যান্ডেলা</displayName>
+			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>সৌর ঔজ্জ্বল্য</displayName>
 			</unit>
@@ -6811,7 +7084,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>মিটার প্রতি সেকেন্ড</displayName>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>ঘন্টা প্রতি মাইল</displayName>
+				<displayName>মাইল/ঘণ্টা</displayName>
 				<unitPattern count="one">{0} mph</unitPattern>
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
@@ -6862,7 +7135,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} চিমটে</unitPattern>
 				<unitPattern count="other">{0} চিমটে</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>আলোক</displayName>
+				<unitPattern count="one">{0} আলোক</unitPattern>
+				<unitPattern count="other">{0} আলোক</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>পার্ট/ বিলিয়ন</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6971,9 +7254,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} দুনাম</unitPattern>
 				<unitPattern count="other">{0} দুনাম</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>পার্ট</displayName>
+				<unitPattern count="one">{0} পার্ট</unitPattern>
+				<unitPattern count="other">{0} পার্ট</unitPattern>
+			</unit>
 			<unit type="concentr-permille">
 				<displayName>‰</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>mpg UK</displayName>
 				<unitPattern count="one">{0}m/gUK</unitPattern>
@@ -6992,10 +7283,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-week">
 				<perUnitPattern>{0}/সপ্তাহ</perUnitPattern>
 			</unit>
-			<unit type="duration-day">
-				<perUnitPattern>{0}/দিন</perUnitPattern>
-			</unit>
 			<unit type="duration-hour">
+				<displayName>ঘণ্টা</displayName>
 				<unitPattern count="one">{0} ঘঃ</unitPattern>
 				<unitPattern count="other">{0} ঘঃ</unitPattern>
 				<perUnitPattern>{0}/ঘ:</perUnitPattern>
@@ -7053,6 +7342,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="length-inch">
 				<perUnitPattern>{0}/ইঞ্চি</perUnitPattern>
 			</unit>
+			<unit type="length-parsec">
+				<displayName>পারসেক</displayName>
+			</unit>
 			<unit type="length-point">
 				<displayName>pts</displayName>
 			</unit>
@@ -7109,7 +7401,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}m/s</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>মাইল/ঘ:</displayName>
+				<displayName>মাইল/ঘণ্টা</displayName>
 				<unitPattern count="one">{0}mph</unitPattern>
 				<unitPattern count="other">{0}mph</unitPattern>
 			</unit>
@@ -7165,15 +7457,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}fl.dr.</unitPattern>
 				<unitPattern count="other">{0}fl.dr.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>আলোক</displayName>
+				<unitPattern count="one">{0} আলোক</unitPattern>
+				<unitPattern count="other">{0} আলোক</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0} ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>রাত্রি</displayName>
 				<unitPattern count="one">{0}রাত্রি</unitPattern>
 				<unitPattern count="other">{0}রাত্রি</unitPattern>
-				<perUnitPattern>{0}/রাত্রি</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="north">{0}উ</coordinateUnitPattern>
@@ -7428,7 +7726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<nameField type="given">জেনদায়া</nameField>
 		</sampleName>
 		<sampleName item="nativeGS">
-			<nameField type="given">আইরিন</nameField>
+			<nameField type="given">শ্রেয়া</nameField>
 			<nameField type="surname">চৌধুরী</nameField>
 		</sampleName>
 		<sampleName item="nativeGGS">
diff --git a/make/data/cldr/common/main/bn_IN.xml b/make/data/cldr/common/main/bn_IN.xml
index 9bb515a431a..5d32b4dd124 100644
--- a/make/data/cldr/common/main/bn_IN.xml
+++ b/make/data/cldr/common/main/bn_IN.xml
@@ -143,6 +143,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##,##0.00;(¤#,##,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/bqi.xml b/make/data/cldr/common/main/bqi.xml
new file mode 100644
index 00000000000..71989380cbd
--- /dev/null
+++ b/make/data/cldr/common/main/bqi.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bqi"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localeSeparator draft="unconfirmed">{0}، {1}</localeSeparator>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ar" draft="unconfirmed">عروی</language>
+			<language type="ar_001" draft="unconfirmed">عروی استاندارد مودرن</language>
+			<language type="bn" draft="unconfirmed">بنگلا</language>
+			<language type="bqi" draft="unconfirmed">لوری بختیاری</language>
+			<language type="de" draft="unconfirmed">آلمانی</language>
+			<language type="de_AT" draft="unconfirmed">آلمانی اوتریشی</language>
+			<language type="de_CH" draft="unconfirmed">آلمانی روء سوییس</language>
+			<language type="en" draft="unconfirmed">اینگیلیسی</language>
+			<language type="en_AU" draft="unconfirmed">اینگیلیسی اوستورولیایی</language>
+			<language type="en_CA" draft="unconfirmed">اینگیلیسی کانادایی</language>
+			<language type="en_GB" draft="unconfirmed">اینگیلیسی بیریتانیایی</language>
+			<language type="en_US" draft="unconfirmed">اینگیلیسی آمریکایی</language>
+			<language type="es" draft="unconfirmed">اسپانیایی</language>
+			<language type="es_419" draft="unconfirmed">اسپانیایی آمریکای لاتین</language>
+			<language type="es_ES" draft="unconfirmed">اسپانیایی اوروپایی</language>
+			<language type="es_MX" draft="unconfirmed">اسپانیایی مکزیکی</language>
+			<language type="fr" draft="unconfirmed">فرانسوی</language>
+			<language type="fr_CA" draft="unconfirmed">فرانسوی کانادایی</language>
+			<language type="fr_CH" draft="unconfirmed">فرانسوی سوییسی</language>
+			<language type="hi_Latn" draft="unconfirmed">هیندی لاتین</language>
+			<language type="id" draft="unconfirmed">اندونزیایی</language>
+			<language type="it" draft="unconfirmed">ایتالیایی</language>
+			<language type="ja" draft="unconfirmed">ژاپونی</language>
+			<language type="ko" draft="unconfirmed">کوره ای</language>
+			<language type="nl" draft="unconfirmed">هولندی</language>
+			<language type="nl_BE" draft="unconfirmed">فلاندری</language>
+			<language type="pl" draft="unconfirmed">لهستووی</language>
+			<language type="pt" draft="unconfirmed">پورتقالی</language>
+			<language type="pt_BR" draft="unconfirmed">پورتقالی بریزیلی</language>
+			<language type="pt_PT" draft="unconfirmed">پورتقالی اوروپایی</language>
+			<language type="ru" draft="unconfirmed">روسی</language>
+			<language type="th" draft="unconfirmed">تایلندی</language>
+			<language type="tr" draft="unconfirmed">تورکی</language>
+			<language type="und" draft="unconfirmed">زوون نشناخته</language>
+			<language type="zh" draft="unconfirmed">چینی</language>
+			<language type="zh" alt="menu" draft="unconfirmed">چینی، ماندارین</language>
+			<language type="zh_Hans" draft="unconfirmed">چینی ساده وابیده</language>
+			<language type="zh_Hans" alt="long" draft="unconfirmed">چینی ماندارین ساده وابیده</language>
+			<language type="zh_Hant" draft="unconfirmed">چینی سونتی</language>
+			<language type="zh_Hant" alt="long" draft="unconfirmed">چینی سونتی ماندارین</language>
+		</languages>
+		<scripts>
+			<script type="Arab" draft="unconfirmed">عروی</script>
+			<script type="Cyrl" draft="unconfirmed">سیریلیک</script>
+			<script type="Hans" draft="unconfirmed">ساده وابیده</script>
+			<script type="Hans" alt="stand-alone" draft="unconfirmed">هان ساده وابیده</script>
+			<script type="Hant" draft="unconfirmed">سونتی</script>
+			<script type="Hant" alt="stand-alone" draft="unconfirmed">هان سونتی</script>
+			<script type="Jpan" draft="unconfirmed">ژاپونی</script>
+			<script type="Kore" draft="unconfirmed">کوره ای</script>
+			<script type="Latn" draft="unconfirmed">لاتین</script>
+			<script type="Zxxx" draft="unconfirmed">ننوشته</script>
+			<script type="Zzzz" draft="unconfirmed">اسکریپت نشناخته</script>
+		</scripts>
+		<territories>
+			<territory type="IR" draft="unconfirmed">ایران</territory>
+		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="metric" draft="unconfirmed">متریک</measurementSystemName>
+			<measurementSystemName type="UK" draft="unconfirmed">بریتانیایی</measurementSystemName>
+			<measurementSystemName type="US" draft="unconfirmed">امریکایی</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">زوون: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">تور: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">ناحیه: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>right-to-left</characterOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<!-- Using the Persian orthography -->
+		<exemplarCharacters>[ً ٌ ٍ ّ ٔ ء آ أ ؤ ئ ا ب پ ة ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ـ\u200C\u200D\u200E\u200F َ ُ ِ ْ ٖ ٰ إ ك ى ي]</exemplarCharacters>
+		<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart draft="unconfirmed">«</quotationStart>
+		<quotationEnd draft="unconfirmed">»</quotationEnd>
+		<alternateQuotationStart draft="unconfirmed">‹</alternateQuotationStart>
+		<alternateQuotationEnd draft="unconfirmed">›</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">ژانویه</month>
+							<month type="2" draft="unconfirmed">فوریه</month>
+							<month type="3" draft="unconfirmed">مارس</month>
+							<month type="4" draft="unconfirmed">آوریل</month>
+							<month type="5" draft="unconfirmed">مهٔ</month>
+							<month type="6" draft="unconfirmed">ژوئن</month>
+							<month type="7" draft="unconfirmed">ژوئیه</month>
+							<month type="8" draft="unconfirmed">اوت</month>
+							<month type="9" draft="unconfirmed">سپتامبر</month>
+							<month type="10" draft="unconfirmed">اکتبر</month>
+							<month type="11" draft="unconfirmed">نوامبر</month>
+							<month type="12" draft="unconfirmed">دسامبر</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">یه شمبه</day>
+							<day type="mon" draft="unconfirmed">دوشمبه</day>
+							<day type="tue" draft="unconfirmed">سه شمبه</day>
+							<day type="wed" draft="unconfirmed">چار شمبه</day>
+							<day type="thu" draft="unconfirmed">پنجشمبه</day>
+							<day type="fri" draft="unconfirmed">جومه</day>
+							<day type="sat" draft="unconfirmed">شمبه</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">پیش ز ظهر</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">بعد ز ظهر</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMd" draft="unconfirmed">y/M/d</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} تا {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="unconfirmed">دوران</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="unconfirmed">سال</displayName>
+				<relative type="-1" draft="unconfirmed">سال گوذشته</relative>
+				<relative type="0" draft="unconfirmed">امسال</relative>
+				<relative type="1" draft="unconfirmed">سال نیایی</relative>
+			</field>
+			<field type="year-short">
+				<displayName draft="unconfirmed">سال</displayName>
+				<relative type="-1" draft="unconfirmed">سال گوذشته</relative>
+				<relative type="0" draft="unconfirmed">امسال</relative>
+				<relative type="1" draft="unconfirmed">سال نیایی</relative>
+			</field>
+			<field type="year-narrow">
+				<displayName draft="unconfirmed">سال</displayName>
+				<relative type="-1" draft="unconfirmed">سال گوذشته</relative>
+				<relative type="0" draft="unconfirmed">امسال</relative>
+				<relative type="1" draft="unconfirmed">سال نیایی</relative>
+			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">سه ماهه</displayName>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">سه ماهه</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">سه ماهه</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">ما</displayName>
+				<relative type="-1" draft="unconfirmed">ما گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای ما</relative>
+				<relative type="1" draft="unconfirmed">ما نیایی</relative>
+			</field>
+			<field type="month-short">
+				<displayName draft="unconfirmed">ما</displayName>
+				<relative type="-1" draft="unconfirmed">ما گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای ما</relative>
+				<relative type="1" draft="unconfirmed">ما نیایی</relative>
+			</field>
+			<field type="month-narrow">
+				<displayName draft="unconfirmed">ما</displayName>
+				<relative type="-1" draft="unconfirmed">ما گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای ما</relative>
+				<relative type="1" draft="unconfirmed">ما نیایی</relative>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">هفته</displayName>
+				<relative type="-1" draft="unconfirmed">هفته گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای هفته</relative>
+				<relative type="1" draft="unconfirmed">هفته نیایی</relative>
+				<relativePeriod draft="unconfirmed">هفته {0}</relativePeriod>
+			</field>
+			<field type="week-short">
+				<displayName draft="unconfirmed">هفته</displayName>
+				<relative type="-1" draft="unconfirmed">هفته گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای هفته</relative>
+				<relative type="1" draft="unconfirmed">هفته نیایی</relative>
+				<relativePeriod draft="unconfirmed">هفته {0}</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<displayName draft="unconfirmed">هفته</displayName>
+				<relative type="-1" draft="unconfirmed">هفته گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای هفته</relative>
+				<relative type="1" draft="unconfirmed">هفته نیایی</relative>
+				<relativePeriod draft="unconfirmed">هفته {0}</relativePeriod>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">روز</displayName>
+				<relative type="-1" draft="unconfirmed">دوش</relative>
+				<relative type="0" draft="unconfirmed">امروز</relative>
+				<relative type="1" draft="unconfirmed">صوه</relative>
+			</field>
+			<field type="day-short">
+				<displayName draft="unconfirmed">روز</displayName>
+				<relative type="-1" draft="unconfirmed">دوش</relative>
+				<relative type="0" draft="unconfirmed">امروز</relative>
+				<relative type="1" draft="unconfirmed">صوه</relative>
+			</field>
+			<field type="day-narrow">
+				<displayName draft="unconfirmed">روز</displayName>
+				<relative type="-1" draft="unconfirmed">دوش</relative>
+				<relative type="0" draft="unconfirmed">امروز</relative>
+				<relative type="1" draft="unconfirmed">صوه</relative>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">روز هفته</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName draft="unconfirmed">پ.ظ/ب.ظ</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">ساعت</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName draft="unconfirmed">ساعت</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName draft="unconfirmed">ساعت</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">دیقه</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName draft="unconfirmed">دیقه</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="unconfirmed">دیقه</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">ثانیه</displayName>
+			</field>
+			<field type="second-short">
+				<displayName draft="unconfirmed">ثانیه</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="unconfirmed">ثانیه</displayName>
+			</field>
+			<field type="zone">
+				<displayName draft="unconfirmed">جاگه زمووی</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat draft="unconfirmed">‎+HH:mm;‎−HH:mm</hourFormat>
+			<gmtFormat draft="unconfirmed">{0} گرینویچ</gmtFormat>
+			<gmtZeroFormat draft="unconfirmed">گرینویچ</gmtZeroFormat>
+			<regionFormat draft="unconfirmed">مجال {0}</regionFormat>
+			<regionFormat type="daylight" draft="unconfirmed">مجال توستووی {0}</regionFormat>
+			<regionFormat type="standard" draft="unconfirmed">مجال عادی {0}</regionFormat>
+			<metazone type="GMT">
+				<long>
+					<standard draft="unconfirmed">مجال گرینویچ</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="arab">
+			<percentSign draft="unconfirmed">٪</percentSign>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<plusSign draft="unconfirmed">+‎</plusSign>
+			<minusSign draft="unconfirmed">‎−</minusSign>
+		</symbols>
+		<symbols numberSystem="latn">
+			<plusSign draft="unconfirmed">‎+</plusSign>
+			<minusSign draft="unconfirmed">‎−</minusSign>
+		</symbols>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">‎#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">‎#,##0.00;‎(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="unconfirmed">‎¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">‎#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern draft="unconfirmed">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">‎#,##0.00;‎(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="unconfirmed">0 هزار ¤</pattern>
+					<pattern type="10000" count="other" draft="unconfirmed">00 هزار ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/bqi_IR.xml b/make/data/cldr/common/main/bqi_IR.xml
new file mode 100644
index 00000000000..0367e273a8c
--- /dev/null
+++ b/make/data/cldr/common/main/bqi_IR.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bqi"/>
+		<territory type="IR"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/br.xml b/make/data/cldr/common/main/br.xml
index b42fcdbb756..d3d70a0621b 100644
--- a/make/data/cldr/common/main/br.xml
+++ b/make/data/cldr/common/main/br.xml
@@ -23,11 +23,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ady">adygeieg</language>
 			<language type="ae">avesteg</language>
 			<language type="aeb">arabeg Tunizia</language>
-			<language type="af">afrikaans</language>
+			<language type="af">afrikaaneg</language>
 			<language type="afh">afrihili</language>
 			<language type="agq">aghem</language>
 			<language type="ain">ainoueg</language>
-			<language type="ak">akan</language>
+			<language type="ak">akaneg</language>
 			<language type="akk">akadeg</language>
 			<language type="akz">alabamaeg</language>
 			<language type="ale">aleouteg</language>
@@ -60,7 +60,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">azerbaidjaneg</language>
 			<language type="az" alt="short">azeri</language>
 			<language type="ba">bachkir</language>
-			<language type="bal">baloutchi</language>
+			<language type="bal">baloutcheg</language>
 			<language type="ban">balineg</language>
 			<language type="bar">bavarieg</language>
 			<language type="bas">basaa</language>
@@ -70,13 +70,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bez">bena</language>
 			<language type="bg">bulgareg</language>
 			<language type="bgn">baloutchi ar Cʼhornôg</language>
-			<language type="bho">bhojpuri</language>
+			<language type="bho">bhojpureg</language>
 			<language type="bi">bislama</language>
 			<language type="bik">bikol</language>
 			<language type="bin">bini</language>
 			<language type="bla">siksika</language>
+			<language type="blo">aniieg</language>
 			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
+			<language type="bn">bengaleg</language>
 			<language type="bo">tibetaneg</language>
 			<language type="br">brezhoneg</language>
 			<language type="bra">braj</language>
@@ -94,7 +95,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="cch">atsam</language>
 			<language type="ccp">chakmaeg</language>
 			<language type="ce">tchetcheneg</language>
-			<language type="ceb">cebuano</language>
+			<language type="ceb">cebuanoeg</language>
 			<language type="cgg">chigaeg</language>
 			<language type="ch">chamorru</language>
 			<language type="chb">chibcha</language>
@@ -102,7 +103,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="chm">marieg</language>
 			<language type="cho">choktaw</language>
 			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
+			<language type="chr">cherokieg</language>
 			<language type="chy">cheyenne</language>
 			<language type="ckb">kurdeg sorani</language>
 			<language type="ckb" alt="menu">kurdeg kreiz</language>
@@ -122,7 +123,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="csb">kachoubeg</language>
 			<language type="csw">krieg ar gwernioù</language>
 			<language type="cu">slavoneg iliz</language>
-			<language type="cv">tchouvatch</language>
+			<language type="cv">tchouvatcheg</language>
 			<language type="cy">kembraeg</language>
 			<language type="da">daneg</language>
 			<language type="dak">dakota</language>
@@ -171,7 +172,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fa_AF">dareg</language>
 			<language type="fan">fang</language>
 			<language type="fat">fanti</language>
-			<language type="ff">fula</language>
+			<language type="ff">fulaeg</language>
 			<language type="fi">finneg</language>
 			<language type="fil">filipineg</language>
 			<language type="fit">finneg traoñienn an Torne</language>
@@ -190,7 +191,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fur">frioulaneg</language>
 			<language type="fy">frizeg ar Cʼhornôg</language>
 			<language type="ga">iwerzhoneg</language>
-			<language type="gaa">ga</language>
+			<language type="gaa">gaeg</language>
 			<language type="gag">gagaouzeg</language>
 			<language type="gan">sinaeg Gan</language>
 			<language type="gay">gayo</language>
@@ -207,17 +208,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="grb">grebo</language>
 			<language type="grc">hencʼhresianeg</language>
 			<language type="gsw">alamaneg Suis</language>
-			<language type="gu">gujarati</language>
+			<language type="gu">gujarateg</language>
 			<language type="guz">gusiieg</language>
 			<language type="gv">manaveg</language>
 			<language type="gwi">gwich’in</language>
-			<language type="ha">haousa</language>
+			<language type="ha">haousaeg</language>
 			<language type="hai">haideg</language>
 			<language type="hak">sinaeg Hakka</language>
 			<language type="haw">hawaieg</language>
 			<language type="hax">haideg ar Su</language>
 			<language type="he">hebraeg</language>
-			<language type="hi">hindi</language>
+			<language type="hi">hindieg</language>
+			<language type="hi_Latn">hindieg (latin)</language>
+			<language type="hi_Latn" alt="variant">Hinglish</language>
 			<language type="hil">hiligaynon</language>
 			<language type="hmn">hmong</language>
 			<language type="ho">hiri motu</language>
@@ -230,12 +233,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hur">halkomelemeg</language>
 			<language type="hy">armenianeg</language>
 			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
+			<language type="ia">interlinguaeg</language>
 			<language type="iba">iban</language>
 			<language type="ibb">ibibio</language>
 			<language type="id">indonezeg</language>
 			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
+			<language type="ig">igboeg</language>
 			<language type="ii">yieg Sichuan</language>
 			<language type="ik">inupiaq</language>
 			<language type="ikt">inuktitut Kanada ar Cʼhornôg</language>
@@ -271,11 +274,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="khq">koyra chiini</language>
 			<language type="ki">kikuyu</language>
 			<language type="kj">kwanyama</language>
-			<language type="kk">kazak</language>
+			<language type="kk">kazakeg</language>
 			<language type="kkj">kakoeg</language>
 			<language type="kl">greunlandeg</language>
 			<language type="kln">kalendjineg</language>
-			<language type="km">khmer</language>
+			<language type="km">khmereg</language>
 			<language type="kmb">kimbundu</language>
 			<language type="kn">kanareg</language>
 			<language type="ko">koreaneg</language>
@@ -287,17 +290,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kri">krio</language>
 			<language type="krl">karelieg</language>
 			<language type="kru">kurukh</language>
-			<language type="ks">kashmiri</language>
+			<language type="ks">kashmireg</language>
 			<language type="ksb">shambala</language>
 			<language type="ksf">bafiaeg</language>
 			<language type="ksh">koluneg</language>
 			<language type="ku">kurdeg</language>
+			<language type="ku" menu="core">kurdeg</language>
+			<language type="ku" menu="extension">kurmandji</language>
 			<language type="kum">koumikeg</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komieg</language>
 			<language type="kw">kerneveureg</language>
 			<language type="kwk">kwakwaleg</language>
-			<language type="ky">kirgiz</language>
+			<language type="ky">kirgizeg</language>
 			<language type="la">latin</language>
 			<language type="lad">ladino</language>
 			<language type="lag">langi</language>
@@ -346,14 +351,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mic">mikmakeg</language>
 			<language type="min">minangkabau</language>
 			<language type="mk">makedoneg</language>
-			<language type="ml">malayalam</language>
+			<language type="ml">malayalameg</language>
 			<language type="mn">mongoleg</language>
 			<language type="mnc">manchou</language>
 			<language type="mni">manipuri</language>
 			<language type="moe">montagneg</language>
 			<language type="moh">mohawk</language>
 			<language type="mos">more</language>
-			<language type="mr">marathi</language>
+			<language type="mr">maratheg</language>
 			<language type="mrj">marieg ar Cʼhornôg</language>
 			<language type="ms">malayseg</language>
 			<language type="mt">malteg</language>
@@ -389,7 +394,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nov">novial</language>
 			<language type="nqo">nkoeg</language>
 			<language type="nr">ndebele ar Su</language>
-			<language type="nso">sotho an Norzh</language>
+			<language type="nso">sothoeg an Norzh</language>
 			<language type="nus">nouereg</language>
 			<language type="nv">navacʼho</language>
 			<language type="nwc">newari klasel</language>
@@ -405,11 +410,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ojw">ojibweg ar Cʼhornôg</language>
 			<language type="oka">okanaganeg</language>
 			<language type="om">oromoeg</language>
-			<language type="or">oriya</language>
+			<language type="or">oriyaeg</language>
 			<language type="os">oseteg</language>
 			<language type="osa">osage</language>
 			<language type="ota">turkeg otoman</language>
-			<language type="pa">punjabi</language>
+			<language type="pa">punjabeg</language>
 			<language type="pag">pangasinan</language>
 			<language type="pal">pahlavi</language>
 			<language type="pam">pampanga</language>
@@ -429,14 +434,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pqm">malisiteg-pasamawkodieg</language>
 			<language type="prg">henbruseg</language>
 			<language type="pro">henbrovañseg</language>
-			<language type="ps">pachto</language>
+			<language type="ps">pachtoeg</language>
 			<language type="pt">portugaleg</language>
 			<language type="pt_BR">portugaleg Brazil</language>
 			<language type="pt_PT">portugaleg Europa</language>
 			<language type="qu">kechuaeg</language>
 			<language type="quc">kʼicheʼ</language>
 			<language type="qug">kichuaeg Chimborazo</language>
-			<language type="raj">rajasthani</language>
+			<language type="raj">rajasthaneg</language>
 			<language type="rap">rapanui</language>
 			<language type="rar">rarotonga</language>
 			<language type="rgn">romagnoleg</language>
@@ -486,7 +491,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sms">sámi Skolt</language>
 			<language type="sn">shona</language>
 			<language type="snk">soninke</language>
-			<language type="so">somali</language>
+			<language type="so">somalieg</language>
 			<language type="sog">sogdieg</language>
 			<language type="sq">albaneg</language>
 			<language type="sr">serbeg</language>
@@ -494,12 +499,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="srr">serer</language>
 			<language type="ss">swati</language>
 			<language type="ssy">sahoeg</language>
-			<language type="st">sotho ar Su</language>
+			<language type="st">sothoeg ar Su</language>
 			<language type="su">sundaneg</language>
 			<language type="suk">sukuma</language>
 			<language type="sux">sumereg</language>
 			<language type="sv">svedeg</language>
-			<language type="sw">swahili</language>
+			<language type="sw">swahilieg</language>
 			<language type="sw_CD">swahili Kongo</language>
 			<language type="swb">komoreg</language>
 			<language type="syc">sirieg klasel</language>
@@ -513,9 +518,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="teo">tesoeg</language>
 			<language type="ter">tereno</language>
 			<language type="tet">tetum</language>
-			<language type="tg">tadjik</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrigna</language>
+			<language type="tg">tadjikeg</language>
+			<language type="th">thaieg</language>
+			<language type="ti">tigrignaeg</language>
 			<language type="tig">tigreaneg</language>
 			<language type="tiv">tiv</language>
 			<language type="tk">turkmeneg</language>
@@ -524,8 +529,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="tlh">klingon</language>
 			<language type="tli">tinglit</language>
 			<language type="tmh">tamacheg</language>
-			<language type="tn">tswana</language>
-			<language type="to">tonga</language>
+			<language type="tn">tswanaeg</language>
+			<language type="to">tongaeg</language>
 			<language type="tog">nyasa tonga</language>
 			<language type="tok">toki pona</language>
 			<language type="tpi">tok pisin</language>
@@ -534,7 +539,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="trv">taroko</language>
 			<language type="ts">tsonga</language>
 			<language type="tsi">tsimshian</language>
-			<language type="tt">tatar</language>
+			<language type="tt">tatareg</language>
 			<language type="ttm">tutchoneg an Norzh</language>
 			<language type="tum">tumbuka</language>
 			<language type="tvl">tuvalu</language>
@@ -549,7 +554,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="uk">ukraineg</language>
 			<language type="umb">umbundu</language>
 			<language type="und">yezh dianav</language>
-			<language type="ur">ourdou</language>
+			<language type="ur">ourdoueg</language>
 			<language type="uz">ouzbekeg</language>
 			<language type="vai">vai</language>
 			<language type="ve">venda</language>
@@ -566,10 +571,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="wal">walamo</language>
 			<language type="war">waray</language>
 			<language type="was">washo</language>
-			<language type="wo">wolof</language>
+			<language type="wo">wolofeg</language>
 			<language type="wuu">sinaeg Wu</language>
 			<language type="xal">kalmouk</language>
-			<language type="xh">xhosa</language>
+			<language type="xh">xhosaeg</language>
 			<language type="xmf">megreleg</language>
 			<language type="xog">sogaeg</language>
 			<language type="yao">yao</language>
@@ -577,7 +582,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="yav">yangben</language>
 			<language type="ybb">yemba</language>
 			<language type="yi">yiddish</language>
-			<language type="yo">yorouba</language>
+			<language type="yo">yoroubaeg</language>
 			<language type="yrl">nengatoueg</language>
 			<language type="yue">kantoneg</language>
 			<language type="yue" alt="menu">sinaeg, kantoneg</language>
@@ -660,6 +665,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Mong">mongolek</script>
 			<script type="Mymr">myanmar</script>
 			<script type="Narb">henarabek an Norzh</script>
+			<script type="Nkoo">nkoek</script>
 			<script type="Ogam">ogam</script>
 			<script type="Orya">oriya</script>
 			<script type="Phnx">fenikianek</script>
@@ -691,7 +697,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Zzzz">skritur dianav</script>
 		</scripts>
 		<territories>
-			<territory type="001">Bed</territory>
+			<territory type="001">bed</territory>
 			<territory type="002">Afrika</territory>
 			<territory type="003">Norzhamerika</territory>
 			<territory type="005">Suamerika</territory>
@@ -724,9 +730,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="419">Amerika Latin</territory>
 			<territory type="AC">Enez Ascension</territory>
 			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emirelezhioù Arab Unanet</territory>
+			<territory type="AE">Emirelezhioù-Arab-Unanet</territory>
 			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua ha Barbuda</territory>
+			<territory type="AG">Antigua-ha-Barbuda</territory>
 			<territory type="AI">Anguilla</territory>
 			<territory type="AL">Albania</territory>
 			<territory type="AM">Armenia</territory>
@@ -739,7 +745,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AW">Aruba</territory>
 			<territory type="AX">Inizi Åland</territory>
 			<territory type="AZ">Azerbaidjan</territory>
-			<territory type="BA">Bosnia ha Herzegovina</territory>
+			<territory type="BA">Bosnia-ha-Herzegovina</territory>
 			<territory type="BB">Barbados</territory>
 			<territory type="BD">Bangladesh</territory>
 			<territory type="BE">Belgia</territory>
@@ -748,8 +754,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BH">Bahrein</territory>
 			<territory type="BI">Burundi</territory>
 			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
+			<territory type="BL">Sant-Bertele</territory>
+			<territory type="BM">Bermudez</territory>
 			<territory type="BN">Brunei</territory>
 			<territory type="BO">Bolivia</territory>
 			<territory type="BQ">Karib Nederlandat</territory>
@@ -768,7 +774,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CG">Kongo - Brazzaville</territory>
 			<territory type="CG" alt="variant">Kongo (Republik)</territory>
 			<territory type="CH">Suis</territory>
-			<territory type="CI">Aod an Olifant</territory>
+			<territory type="CI">Aod-an-Olifant</territory>
 			<territory type="CI" alt="variant">Aod Olifant</territory>
 			<territory type="CK">Inizi Cook</territory>
 			<territory type="CL">Chile</territory>
@@ -776,6 +782,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Sina</territory>
 			<territory type="CO">Kolombia</territory>
 			<territory type="CP">Enez Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kab-Glas</territory>
@@ -800,7 +807,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ES">Spagn</territory>
 			<territory type="ET">Etiopia</territory>
 			<territory type="EU">Unaniezh Europa</territory>
-			<territory type="EZ">takad an euro</territory>
+			<territory type="EZ">Takad an euro</territory>
 			<territory type="FI">Finland</territory>
 			<territory type="FJ">Fidji</territory>
 			<territory type="FK">Inizi Falkland</territory>
@@ -821,7 +828,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GM">Gambia</territory>
 			<territory type="GN">Ginea</territory>
 			<territory type="GP">Gwadeloup</territory>
-			<territory type="GQ">Ginea ar Cʼheheder</territory>
+			<territory type="GQ">Ginea-ar-Cʼheheder</territory>
 			<territory type="GR">Gres</territory>
 			<territory type="GS">Inizi Georgia ar Su hag Inizi Sandwich ar Su</territory>
 			<territory type="GT">Guatemala</territory>
@@ -830,7 +837,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GY">Guyana</territory>
 			<territory type="HK">Hong Kong RMD Sina</territory>
 			<territory type="HK" alt="short">Hong Kong</territory>
-			<territory type="HM">Inizi Heard ha McDonald</territory>
+			<territory type="HM">Inizi Heard-ha-McDonald</territory>
 			<territory type="HN">Honduras</territory>
 			<territory type="HR">Kroatia</territory>
 			<territory type="HT">Haiti</territory>
@@ -839,9 +846,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ID">Indonezia</territory>
 			<territory type="IE">Iwerzhon</territory>
 			<territory type="IL">Israel</territory>
-			<territory type="IM">Enez Vanav</territory>
+			<territory type="IM">Enez-Vanav</territory>
 			<territory type="IN">India</territory>
-			<territory type="IO" draft="provisional">Tiriad breizhveurat Meurvor Indez</territory>
+			<territory type="IO">Tiriad breizhveurat Meurvor Indez</territory>
+			<territory type="IO" alt="chagos">Enezeg Chagos</territory>
 			<territory type="IQ">Iraq</territory>
 			<territory type="IR">Iran</territory>
 			<territory type="IS">Island</territory>
@@ -855,9 +863,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="KH">Kambodja</territory>
 			<territory type="KI">Kiribati</territory>
 			<territory type="KM">Komorez</territory>
-			<territory type="KN">Saint Kitts ha Nevis</territory>
-			<territory type="KP">Korea an Norzh</territory>
-			<territory type="KR">Korea ar Su</territory>
+			<territory type="KN">Saint Kitts-ha-Nevis</territory>
+			<territory type="KP">Norzhkorea</territory>
+			<territory type="KR">Sukorea</territory>
 			<territory type="KW">Koweit</territory>
 			<territory type="KY">Inizi Cayman</territory>
 			<territory type="KZ">Kazakstan</territory>
@@ -876,15 +884,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MC">Monaco</territory>
 			<territory type="MD">Moldova</territory>
 			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
+			<territory type="MF">Sant-Martin</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Inizi Marshall</territory>
 			<territory type="MK">Makedonia an Norzh</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Birmania)</territory>
 			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macau RMD Sina</territory>
-			<territory type="MO" alt="short">Macau</territory>
+			<territory type="MO">Makao RMD Sina</territory>
+			<territory type="MO" alt="short">Makao</territory>
 			<territory type="MP">Inizi Mariana an Norzh</territory>
 			<territory type="MQ">Martinik</territory>
 			<territory type="MR">Maouritania</territory>
@@ -897,7 +905,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MY">Malaysia</territory>
 			<territory type="MZ">Mozambik</territory>
 			<territory type="NA">Namibia</territory>
-			<territory type="NC">Kaledonia Nevez</territory>
+			<territory type="NC">Kaledonia-Nevez</territory>
 			<territory type="NE">Niger</territory>
 			<territory type="NF">Enez Norfolk</territory>
 			<territory type="NG">Nigeria</territory>
@@ -937,7 +945,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SC">Sechelez</territory>
 			<territory type="SD">Soudan</territory>
 			<territory type="SE">Sveden</territory>
-			<territory type="SG">Singapour</territory>
+			<territory type="SG">Singapoura</territory>
 			<territory type="SH">Saint-Helena</territory>
 			<territory type="SI">Slovenia</territory>
 			<territory type="SJ">Svalbard</territory>
@@ -947,15 +955,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SN">Senegal</territory>
 			<territory type="SO">Somalia</territory>
 			<territory type="SR">Surinam</territory>
-			<territory type="SS">Susoudan</territory>
-			<territory type="ST">São Tomé ha Príncipe</territory>
+			<territory type="SS">Soudan ar Su</territory>
+			<territory type="ST">São-Tomé-ha-Príncipe</territory>
 			<territory type="SV">Salvador</territory>
 			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Siria</territory>
 			<territory type="SZ">Eswatini</territory>
 			<territory type="SZ" alt="variant">Swaziland</territory>
 			<territory type="TA">Tristan da Cunha</territory>
-			<territory type="TC">Inizi Turks ha Caicos</territory>
+			<territory type="TC">Inizi Turks-ha-Caicos</territory>
 			<territory type="TD">Tchad</territory>
 			<territory type="TF">Douaroù aostral Frañs</territory>
 			<territory type="TG">Togo</territory>
@@ -968,7 +976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TN">Tunizia</territory>
 			<territory type="TO">Tonga</territory>
 			<territory type="TR">Turkia</territory>
-			<territory type="TT">Trinidad ha Tobago</territory>
+			<territory type="TT">Trinidad-ha-Tobago</territory>
 			<territory type="TV">Tuvalu</territory>
 			<territory type="TW">Taiwan</territory>
 			<territory type="TZ">Tanzania</territory>
@@ -981,16 +989,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Ouzbekistan</territory>
 			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Sant Visant hag ar Grenadinez</territory>
+			<territory type="VC">Sant-Visant hag ar Grenadinez</territory>
 			<territory type="VE">Venezuela</territory>
 			<territory type="VG">Inizi Gwercʼh Breizh-Veur</territory>
 			<territory type="VI">Inizi Gwercʼh ar Stadoù-Unanet</territory>
 			<territory type="VN">Viêt Nam</territory>
 			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis ha Futuna</territory>
+			<territory type="WF">Wallis-ha-Futuna</territory>
 			<territory type="WS">Samoa</territory>
-			<territory type="XA">pouez-mouezh gaou</territory>
-			<territory type="XB">BiDi gaou</territory>
+			<territory type="XA">Falstiredoù</territory>
+			<territory type="XB">Falsdaoudu</territory>
 			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Yemen</territory>
 			<territory type="YT">Mayotte</territory>
@@ -1128,13 +1136,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">deiziadur boudaat</type>
+			<type key="calendar" type="buddhist" scope="core">boudaat</type>
 			<type key="calendar" type="chinese">deiziadur sinaat</type>
+			<type key="calendar" type="chinese" scope="core">sinaat</type>
 			<type key="calendar" type="coptic">deiziadur kopt</type>
+			<type key="calendar" type="coptic" scope="core">kopt</type>
 			<type key="calendar" type="dangi">deiziadur dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">deiziadur etiopiat</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopiat</type>
 			<type key="calendar" type="ethiopic-amete-alem">deiziadur etiopiat Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopiat Amete Alem</type>
 			<type key="calendar" type="gregorian">deiziadur gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
 			<type key="calendar" type="hebrew">deiziadur hebraek</type>
+			<type key="calendar" type="hebrew" scope="core">hebraek</type>
 			<type key="calendar" type="indian">deiziadur indian</type>
 			<type key="calendar" type="islamic" draft="provisional">deiziadur islamek</type>
 			<type key="calendar" type="islamic-civil" draft="provisional">deiziadur islamek keodedel</type>
@@ -1143,34 +1159,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="islamic-umalqura" draft="provisional">deiziadur islamek (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">deiziadur ISO-8601</type>
 			<type key="calendar" type="japanese">deiziadur japanat</type>
+			<type key="calendar" type="japanese" scope="core">japanat</type>
 			<type key="calendar" type="persian">deiziadur persek</type>
+			<type key="calendar" type="persian" scope="core">persek</type>
 			<type key="calendar" type="roc">deiziadur Republik Sina</type>
+			<type key="calendar" type="roc" scope="core">Republik Sina</type>
 			<type key="cf" type="account">furmad unanenn jediñ</type>
 			<type key="cf" type="standard">furmad moneiz standart</type>
-			<type key="collation" type="big5han">urzh rummañ sinaek hengounel - Big5</type>
+			<type key="cf" type="standard" scope="core">standart</type>
 			<type key="collation" type="dictionary">urzh rummañ ar geriadur</type>
 			<type key="collation" type="ducet">urzh rummañ Unicode dre ziouer</type>
+			<type key="collation" type="ducet" scope="core">Unicode dre ziouer</type>
 			<type key="collation" type="emoji">urzh rummañ ar fromlunioù</type>
 			<type key="collation" type="eor">reolennoù urzhiañ europat</type>
-			<type key="collation" type="gb2312han">urzh rummañ sinaek eeunaet - GB2312</type>
 			<type key="collation" type="phonebook">urzh rummañ al levr-pellgomz</type>
 			<type key="collation" type="pinyin">urzh rummañ pinyin</type>
 			<type key="collation" type="search">enklask hollek</type>
 			<type key="collation" type="standard">urzh rummañ standart</type>
+			<type key="collation" type="standard" scope="core">standart</type>
 			<type key="collation" type="stroke">urzh rummañ an tresoù</type>
 			<type key="collation" type="traditional">urzh rummañ hengounel</type>
 			<type key="collation" type="unihan">urzh rummañ UniHan</type>
 			<type key="collation" type="zhuyin">urzh rummañ Zhuyin</type>
+			<type key="em" type="default" scope="core">dre ziouer</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">skrid</type>
 			<type key="hc" type="h11">reizhiad 12 eurvezh (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">reizhiad 12 eurvezh (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">reizhiad 24 eurvezh (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">reizhiad 24 eurvezh (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">stil torr linenn lezober</type>
+			<type key="lb" type="loose" scope="core">lezober</type>
 			<type key="lb" type="normal">stil torr linenn boas</type>
+			<type key="lb" type="normal" scope="core">boas</type>
 			<type key="lb" type="strict">stil torr linenn strizh</type>
+			<type key="lb" type="strict" scope="core">strizh</type>
 			<type key="ms" type="metric">reizhiad vetrek</type>
+			<type key="ms" type="metric" scope="core">metrek</type>
 			<type key="ms" type="uksystem">reizhiad vuzuliañ RU</type>
+			<type key="ms" type="uksystem" scope="core">muzuliañ RU</type>
 			<type key="ms" type="ussystem">reizhiad vuzuliañ SU</type>
+			<type key="ms" type="ussystem" scope="core">muzuliañ SU</type>
 			<type key="numbers" type="ahom">sifroù ahomek</type>
 			<type key="numbers" type="arab">sifroù arabek indian</type>
 			<type key="numbers" type="arabext">sifroù arabek indian astennet</type>
@@ -1550,6 +1583,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'da' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'da' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1558,6 +1594,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'da' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'da' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1574,6 +1613,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -1884,6 +1926,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'da' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'da' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1892,6 +1937,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'da' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'da' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1902,12 +1950,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -1916,6 +1973,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'e' v</dateFormatItem>
 						<dateFormatItem id="M">MM</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
@@ -1948,21 +2006,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">MM/y GGGGG – MM/y GGGGG</greatestDifference>
-							<greatestDifference id="M">MM/y – MM/y GGGGG</greatestDifference>
-							<greatestDifference id="y">MM/y – MM/y GGGGG</greatestDifference>
+							<greatestDifference id="G">MM/y G – MM/y G</greatestDifference>
+							<greatestDifference id="M">MM/y – MM/y G</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="G">dd/MM/y GGGGG – dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="M">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="y">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="d">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="G">dd/MM/y G – dd/MM/y G</greatestDifference>
+							<greatestDifference id="M">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="y">dd/MM/y – dd/MM/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E dd/MM/y – E dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="G">E dd/MM/y GGGGG – E dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E dd/MM/y – E dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E dd/MM/y – E dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E dd/MM/y – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="G">E dd/MM/y G – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="M">E dd/MM/y – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="y">E dd/MM/y – E dd/MM/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
@@ -2868,6 +2926,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 		</fields>
 		<timeZoneNames>
+			<gmtFormat>UTC{0}</gmtFormat>
+			<gmtZeroFormat>UTC</gmtZeroFormat>
+			<gmtUnknownFormat>UTC+?</gmtUnknownFormat>
 			<regionFormat>eur {0}</regionFormat>
 			<regionFormat type="daylight">eur hañv {0}</regionFormat>
 			<regionFormat type="standard">eur cʼhoañv {0}</regionFormat>
@@ -2880,7 +2941,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>kêr dianav</exemplarCity>
+				<exemplarCity>Lecʼhiadur dianav</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
 				<exemplarCity>Kaboul</exemplarCity>
@@ -2901,17 +2962,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Bahrein</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>Saint Barthélemy</exemplarCity>
+				<exemplarCity>Sant-Bertele</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermudez</exemplarCity>
 			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="Europe/Minsk">
 				<exemplarCity>Mensk</exemplarCity>
 			</zone>
@@ -2924,17 +2979,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Enez Pask</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>La Habana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kab Glas</exemplarCity>
+				<exemplarCity>Kab-Glas</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
 				<exemplarCity>Levkosía</exemplarCity>
@@ -2985,7 +3034,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Jibraltar</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity>Qânâq</exemplarCity>
+				<exemplarCity>Qaanaaq</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
 				<exemplarCity>Nuuk (Godthåb)</exemplarCity>
@@ -3011,9 +3060,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Isle_of_Man">
 				<exemplarCity>Manav</exemplarCity>
 			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Calcutta</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Reykjavik">
 				<exemplarCity>Reykjavík</exemplarCity>
 			</zone>
@@ -3035,9 +3081,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint Kitts</exemplarCity>
 			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pʼyongyang</exemplarCity>
-			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Koweit</exemplarCity>
 			</zone>
@@ -3063,7 +3106,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Dar el Beida (Casablanca)</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
-				<exemplarCity>Macau</exemplarCity>
+				<exemplarCity>Makao</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
 				<exemplarCity>Martinik</exemplarCity>
@@ -3077,6 +3120,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Mexico_City">
 				<exemplarCity>Kêr Vecʼhiko</exemplarCity>
 			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Noumea</exemplarCity>
+			</zone>
 			<zone type="Asia/Muscat">
 				<exemplarCity>Masqat</exemplarCity>
 			</zone>
@@ -3084,7 +3130,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Panamá</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markiz</exemplarCity>
+				<exemplarCity>Inizi Markiz</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity>Varsovia</exemplarCity>
@@ -3092,6 +3138,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Miquelon">
 				<exemplarCity>Mikelon</exemplarCity>
 			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Inizi Pitcairn</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Azores">
 				<exemplarCity>Azorez</exemplarCity>
 			</zone>
@@ -3129,14 +3178,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Singapour</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Saint Helena</exemplarCity>
+				<exemplarCity>Saint-Helena</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
 				<exemplarCity>Muqdisho</exemplarCity>
 			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
 			<zone type="America/El_Salvador">
 				<exemplarCity>Salvador</exemplarCity>
 			</zone>
@@ -3149,14 +3195,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kergelenn</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity>Tuniz</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity>Kiev</exemplarCity>
+				<exemplarCity>Kyyiv</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Inizi Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Enez Wake</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Toshkent</exemplarCity>
@@ -3165,11 +3214,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Vatikan</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>Sant Visant</exemplarCity>
+				<exemplarCity>Sant-Visant</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Kêr Hô-Chi-Minh</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis-ha-Futuna</exemplarCity>
+			</zone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>eur Afghanistan</standard>
@@ -3192,9 +3244,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>eur Afrika ar Cʼhornôg</generic>
-					<standard>eur cʼhoañv Afrika ar Cʼhornôg</standard>
-					<daylight>eur hañv Afrika ar Cʼhornôg</daylight>
+					<standard>eur Afrika ar Cʼhornôg</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3255,9 +3305,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>eur Apia</generic>
-					<standard>eur cʼhoañv Apia</standard>
-					<daylight>eur hañv Apia</daylight>
+					<generic>eur Samoa</generic>
+					<standard>eur cʼhoañv Samoa</standard>
+					<daylight>eur hañv Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -3363,7 +3413,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>eur Brunei Darussalam</standard>
+					<standard>eur Brunei</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -3531,7 +3581,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Amzer keitat Greenwich (AKG)</standard>
+					<standard>amzer keitat Greenwich (AKG)</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
@@ -3563,6 +3613,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>eur Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>eur cʼhoañv Hawaii hag an Aleouted</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>eur Hawaii hag an Aleouted</generic>
@@ -3579,9 +3634,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>eur Hovd</generic>
-					<standard>eur cʼhoañv Hovd</standard>
-					<daylight>eur hañv Hovd</daylight>
+					<generic>eur Khovd</generic>
+					<standard>eur cʼhoañv Khovd</standard>
+					<daylight>eur hañv Khovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -3642,6 +3697,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>eur hañv Japan</daylight>
 				</long>
 			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard>eur Kazakstan</standard>
+				</long>
+			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
 					<standard>eur Kazakstan ar Reter</standard>
@@ -3777,9 +3837,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic>eur Kaledonia Nevez</generic>
-					<standard>eur cʼhoañv Kaledonia Nevez</standard>
-					<daylight>eur hañv Kaledonia Nevez</daylight>
+					<generic>eur Kaledonia-Nevez</generic>
+					<standard>eur cʼhoañv Kaledonia-Nevez</standard>
+					<daylight>eur hañv Kaledonia-Nevez</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -3848,7 +3908,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard>eur Papoua-Ginea-Nevez</standard>
+					<standard>eur Papoua Ginea-Nevez</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
@@ -3896,7 +3956,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>eur Pʼyongyang</standard>
+					<standard>eur Norzhkorea</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -3918,9 +3978,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>eur Samoa</generic>
-					<standard>eur cʼhoañv Samoa</standard>
-					<daylight>eur hañv Samoa</daylight>
+					<generic>eur Samoa Amerikan</generic>
+					<standard>eur cʼhoañv Samoa Amerikan</standard>
+					<daylight>eur hañv Samoa Amerikan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -3960,9 +4020,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>eur Taipei</generic>
-					<standard>eur cʼhoañv Taipei</standard>
-					<daylight>eur hañv Taipei</daylight>
+					<generic>eur Taiwan</generic>
+					<standard>eur cʼhoañv Taiwan</standard>
+					<daylight>eur hañv Taiwan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -4046,12 +4106,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard>eur Wake Island</standard>
+					<standard>eur Enez Wake</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard>eur Wallis ha Futuna</standard>
+					<standard>eur Wallis-ha-Futuna</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
@@ -4068,6 +4128,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>eur hañv Yekaterinbourg</daylight>
 				</long>
 			</metazone>
+			<metazone type="Yukon">
+				<long>
+					<standard>eur Yukon</standard>
+				</long>
+			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
@@ -4165,134 +4230,90 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 k¤</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber" draft="provisional">0 k ¤</pattern>
-					<pattern type="1000" count="two">0 k¤</pattern>
-					<pattern type="1000" count="two" alt="alphaNextToNumber" draft="provisional">0 k ¤</pattern>
-					<pattern type="1000" count="few">0 k¤</pattern>
-					<pattern type="1000" count="few" alt="alphaNextToNumber" draft="provisional">0 k ¤</pattern>
-					<pattern type="1000" count="many">0 k¤</pattern>
-					<pattern type="1000" count="many" alt="alphaNextToNumber" draft="provisional">0 k ¤</pattern>
-					<pattern type="1000" count="other">0 k¤</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber" draft="provisional">0 k ¤</pattern>
-					<pattern type="10000" count="one">00 k¤</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber" draft="provisional">00 k ¤</pattern>
-					<pattern type="10000" count="two">00 k¤</pattern>
-					<pattern type="10000" count="two" alt="alphaNextToNumber" draft="provisional">00 k ¤</pattern>
-					<pattern type="10000" count="few">00 k¤</pattern>
-					<pattern type="10000" count="few" alt="alphaNextToNumber" draft="provisional">00 k ¤</pattern>
-					<pattern type="10000" count="many">00 k¤</pattern>
-					<pattern type="10000" count="many" alt="alphaNextToNumber" draft="provisional">00 k ¤</pattern>
-					<pattern type="10000" count="other">00 k¤</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber" draft="provisional">00 k ¤</pattern>
-					<pattern type="100000" count="one">000 k¤</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber" draft="provisional">000 k ¤</pattern>
-					<pattern type="100000" count="two">000 k¤</pattern>
-					<pattern type="100000" count="two" alt="alphaNextToNumber" draft="provisional">000 k ¤</pattern>
-					<pattern type="100000" count="few">000 k¤</pattern>
-					<pattern type="100000" count="few" alt="alphaNextToNumber" draft="provisional">000 k ¤</pattern>
-					<pattern type="100000" count="many">000 k¤</pattern>
-					<pattern type="100000" count="many" alt="alphaNextToNumber" draft="provisional">000 k ¤</pattern>
-					<pattern type="100000" count="other">000 k¤</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber" draft="provisional">000 k ¤</pattern>
-					<pattern type="1000000" count="one">0 M¤</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber" draft="provisional">0 M ¤</pattern>
-					<pattern type="1000000" count="two">0 M¤</pattern>
-					<pattern type="1000000" count="two" alt="alphaNextToNumber" draft="provisional">0 M ¤</pattern>
-					<pattern type="1000000" count="few">0 M¤</pattern>
-					<pattern type="1000000" count="few" alt="alphaNextToNumber" draft="provisional">0 M ¤</pattern>
-					<pattern type="1000000" count="many">0 M¤</pattern>
-					<pattern type="1000000" count="many" alt="alphaNextToNumber" draft="provisional">0 M ¤</pattern>
-					<pattern type="1000000" count="other">0 M¤</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber" draft="provisional">0 M ¤</pattern>
-					<pattern type="10000000" count="one">00 M¤</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber" draft="provisional">00 M ¤</pattern>
-					<pattern type="10000000" count="two">00 M¤</pattern>
-					<pattern type="10000000" count="two" alt="alphaNextToNumber" draft="provisional">00 M ¤</pattern>
-					<pattern type="10000000" count="few">00 M¤</pattern>
-					<pattern type="10000000" count="few" alt="alphaNextToNumber" draft="provisional">00 M ¤</pattern>
-					<pattern type="10000000" count="many">00 M¤</pattern>
-					<pattern type="10000000" count="many" alt="alphaNextToNumber" draft="provisional">00 M ¤</pattern>
-					<pattern type="10000000" count="other">00 M¤</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber" draft="provisional">00 M ¤</pattern>
-					<pattern type="100000000" count="one">000 M¤</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber" draft="provisional">000 M ¤</pattern>
-					<pattern type="100000000" count="two">000 M¤</pattern>
-					<pattern type="100000000" count="two" alt="alphaNextToNumber" draft="provisional">000 M ¤</pattern>
-					<pattern type="100000000" count="few">000 M¤</pattern>
-					<pattern type="100000000" count="few" alt="alphaNextToNumber" draft="provisional">000 M ¤</pattern>
-					<pattern type="100000000" count="many">000 M¤</pattern>
-					<pattern type="100000000" count="many" alt="alphaNextToNumber" draft="provisional">000 M ¤</pattern>
-					<pattern type="100000000" count="other">000 M¤</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber" draft="provisional">000 M ¤</pattern>
-					<pattern type="1000000000" count="one">0 G¤</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber" draft="provisional">0 G ¤</pattern>
-					<pattern type="1000000000" count="two">0 G¤</pattern>
-					<pattern type="1000000000" count="two" alt="alphaNextToNumber" draft="provisional">0 G ¤</pattern>
-					<pattern type="1000000000" count="few">0 G¤</pattern>
-					<pattern type="1000000000" count="few" alt="alphaNextToNumber" draft="provisional">0 G ¤</pattern>
-					<pattern type="1000000000" count="many">0 G¤</pattern>
-					<pattern type="1000000000" count="many" alt="alphaNextToNumber" draft="provisional">0 G ¤</pattern>
-					<pattern type="1000000000" count="other">0 G¤</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber" draft="provisional">0 G ¤</pattern>
-					<pattern type="10000000000" count="one">00 G¤</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber" draft="provisional">00 G ¤</pattern>
-					<pattern type="10000000000" count="two">00 G¤</pattern>
-					<pattern type="10000000000" count="two" alt="alphaNextToNumber" draft="provisional">00 G ¤</pattern>
-					<pattern type="10000000000" count="few">00 G¤</pattern>
-					<pattern type="10000000000" count="few" alt="alphaNextToNumber" draft="provisional">00 G ¤</pattern>
-					<pattern type="10000000000" count="many">00 G¤</pattern>
-					<pattern type="10000000000" count="many" alt="alphaNextToNumber" draft="provisional">00 G ¤</pattern>
-					<pattern type="10000000000" count="other">00 G¤</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber" draft="provisional">00 G ¤</pattern>
-					<pattern type="100000000000" count="one">000 G¤</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber" draft="provisional">000 G ¤</pattern>
-					<pattern type="100000000000" count="two">000 G¤</pattern>
-					<pattern type="100000000000" count="two" alt="alphaNextToNumber" draft="provisional">000 G ¤</pattern>
-					<pattern type="100000000000" count="few">000 G¤</pattern>
-					<pattern type="100000000000" count="few" alt="alphaNextToNumber" draft="provisional">000 G ¤</pattern>
-					<pattern type="100000000000" count="many">000 G¤</pattern>
-					<pattern type="100000000000" count="many" alt="alphaNextToNumber" draft="provisional">000 G ¤</pattern>
-					<pattern type="100000000000" count="other">000 G¤</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber" draft="provisional">000 G ¤</pattern>
-					<pattern type="1000000000000" count="one">0 T¤</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber" draft="provisional">0 T ¤</pattern>
-					<pattern type="1000000000000" count="two">0 T¤</pattern>
-					<pattern type="1000000000000" count="two" alt="alphaNextToNumber" draft="provisional">0 T ¤</pattern>
-					<pattern type="1000000000000" count="few">0 T¤</pattern>
-					<pattern type="1000000000000" count="few" alt="alphaNextToNumber" draft="provisional">0 T ¤</pattern>
-					<pattern type="1000000000000" count="many">0 T¤</pattern>
-					<pattern type="1000000000000" count="many" alt="alphaNextToNumber" draft="provisional">0 T ¤</pattern>
-					<pattern type="1000000000000" count="other">0 T¤</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber" draft="provisional">0 T ¤</pattern>
-					<pattern type="10000000000000" count="one">00 T¤</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber" draft="provisional">00 T ¤</pattern>
-					<pattern type="10000000000000" count="two">00 T¤</pattern>
-					<pattern type="10000000000000" count="two" alt="alphaNextToNumber" draft="provisional">00 T ¤</pattern>
-					<pattern type="10000000000000" count="few">00 T¤</pattern>
-					<pattern type="10000000000000" count="few" alt="alphaNextToNumber" draft="provisional">00 T ¤</pattern>
-					<pattern type="10000000000000" count="many">00 T¤</pattern>
-					<pattern type="10000000000000" count="many" alt="alphaNextToNumber" draft="provisional">00 T ¤</pattern>
-					<pattern type="10000000000000" count="other">00 T¤</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber" draft="provisional">00 T ¤</pattern>
-					<pattern type="100000000000000" count="one">000 T¤</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber" draft="provisional">000 T ¤</pattern>
-					<pattern type="100000000000000" count="two">000 T¤</pattern>
-					<pattern type="100000000000000" count="two" alt="alphaNextToNumber" draft="provisional">000 T ¤</pattern>
-					<pattern type="100000000000000" count="few">000 T¤</pattern>
-					<pattern type="100000000000000" count="few" alt="alphaNextToNumber" draft="provisional">000 T ¤</pattern>
-					<pattern type="100000000000000" count="many">000 T¤</pattern>
-					<pattern type="100000000000000" count="many" alt="alphaNextToNumber" draft="provisional">000 T ¤</pattern>
-					<pattern type="100000000000000" count="other">000 T¤</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber" draft="provisional">000 T ¤</pattern>
+					<pattern type="1000" count="one">0k ¤</pattern>
+					<pattern type="1000" count="two">0k ¤</pattern>
+					<pattern type="1000" count="few">0k ¤</pattern>
+					<pattern type="1000" count="many">0k ¤</pattern>
+					<pattern type="1000" count="other">0k ¤</pattern>
+					<pattern type="10000" count="one">00k ¤</pattern>
+					<pattern type="10000" count="two">00k ¤</pattern>
+					<pattern type="10000" count="few">00k ¤</pattern>
+					<pattern type="10000" count="many">00k ¤</pattern>
+					<pattern type="10000" count="other">00k ¤</pattern>
+					<pattern type="100000" count="one">000k ¤</pattern>
+					<pattern type="100000" count="two">000k ¤</pattern>
+					<pattern type="100000" count="few">000k ¤</pattern>
+					<pattern type="100000" count="many">000k ¤</pattern>
+					<pattern type="100000" count="other">000k ¤</pattern>
+					<pattern type="1000000" count="one">0M ¤</pattern>
+					<pattern type="1000000" count="two">0M ¤</pattern>
+					<pattern type="1000000" count="few">0M ¤</pattern>
+					<pattern type="1000000" count="many">0M ¤</pattern>
+					<pattern type="1000000" count="other">0M ¤</pattern>
+					<pattern type="10000000" count="one">00M ¤</pattern>
+					<pattern type="10000000" count="two">00M ¤</pattern>
+					<pattern type="10000000" count="few">00M ¤</pattern>
+					<pattern type="10000000" count="many">00M ¤</pattern>
+					<pattern type="10000000" count="other">00M ¤</pattern>
+					<pattern type="100000000" count="one">000M ¤</pattern>
+					<pattern type="100000000" count="two">000M ¤</pattern>
+					<pattern type="100000000" count="few">000M ¤</pattern>
+					<pattern type="100000000" count="many">000M ¤</pattern>
+					<pattern type="100000000" count="other">000M ¤</pattern>
+					<pattern type="1000000000" count="one">0G ¤</pattern>
+					<pattern type="1000000000" count="two">0G ¤</pattern>
+					<pattern type="1000000000" count="few">0G ¤</pattern>
+					<pattern type="1000000000" count="many">0G ¤</pattern>
+					<pattern type="1000000000" count="other">0G ¤</pattern>
+					<pattern type="10000000000" count="one">00G ¤</pattern>
+					<pattern type="10000000000" count="two">00G ¤</pattern>
+					<pattern type="10000000000" count="few">00G ¤</pattern>
+					<pattern type="10000000000" count="many">00G ¤</pattern>
+					<pattern type="10000000000" count="other">00G ¤</pattern>
+					<pattern type="100000000000" count="one">000G ¤</pattern>
+					<pattern type="100000000000" count="two">000G ¤</pattern>
+					<pattern type="100000000000" count="few">000G ¤</pattern>
+					<pattern type="100000000000" count="many">000G ¤</pattern>
+					<pattern type="100000000000" count="other">000G ¤</pattern>
+					<pattern type="1000000000000" count="one">0T ¤</pattern>
+					<pattern type="1000000000000" count="two">0T ¤</pattern>
+					<pattern type="1000000000000" count="few">0T ¤</pattern>
+					<pattern type="1000000000000" count="many">0T ¤</pattern>
+					<pattern type="1000000000000" count="other">0T ¤</pattern>
+					<pattern type="10000000000000" count="one">00T ¤</pattern>
+					<pattern type="10000000000000" count="two">00T ¤</pattern>
+					<pattern type="10000000000000" count="few">00T ¤</pattern>
+					<pattern type="10000000000000" count="many">00T ¤</pattern>
+					<pattern type="10000000000000" count="other">00T ¤</pattern>
+					<pattern type="100000000000000" count="one">000T ¤</pattern>
+					<pattern type="100000000000000" count="two">000T ¤</pattern>
+					<pattern type="100000000000000" count="few">000T ¤</pattern>
+					<pattern type="100000000000000" count="many">000T ¤</pattern>
+					<pattern type="100000000000000" count="other">000T ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -8651,7 +8672,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0}mmol/l</unitPattern>
 				<unitPattern count="other">{0}mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="two">{0}ppm</unitPattern>
 				<unitPattern count="few">{0}ppm</unitPattern>
@@ -9916,16 +9937,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<nameOrderLocales order="givenFirst">und br</nameOrderLocales>
 		<nameOrderLocales order="surnameFirst">ko vi yue zh</nameOrderLocales>
 		<sampleName item="nativeG">
-			<nameField type="given" draft="provisional">Yann</nameField>
+			<nameField type="given">Yann</nameField>
 		</sampleName>
 		<sampleName item="nativeGS">
-			<nameField type="given" draft="provisional">Katell</nameField>
-			<nameField type="surname" draft="provisional">ar Gall</nameField>
+			<nameField type="given">Katell</nameField>
+			<nameField type="surname">ar Gall</nameField>
 		</sampleName>
 		<sampleName item="nativeGGS">
-			<nameField type="given" draft="provisional">Yann</nameField>
-			<nameField type="given2" draft="provisional">Erwan</nameField>
-			<nameField type="surname" draft="provisional">ar Go</nameField>
+			<nameField type="given">Yann</nameField>
+			<nameField type="given2">Erwan</nameField>
+			<nameField type="surname">ar Go</nameField>
 		</sampleName>
 		<sampleName item="foreignFull">
 			<nameField type="title" draft="provisional">Prof. Dr.</nameField>
diff --git a/make/data/cldr/common/main/brx.xml b/make/data/cldr/common/main/brx.xml
index 2181aaefd8d..32484232b61 100644
--- a/make/data/cldr/common/main/brx.xml
+++ b/make/data/cldr/common/main/brx.xml
@@ -1059,9 +1059,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">मिंगुव’ फान्जामुथि</type>
 			<type key="cf" type="account">मुद्रानि नुथायखौ हिसाब लाखिनाय</type>
 			<type key="cf" type="standard">थाखोआरि मुद्रानि नुथाय</type>
-			<type key="collation" type="big5han">पारम्पारिक चीनी वर्गीकरण बीग फ़ाईव</type>
 			<type key="collation" type="ducet">गरहाजिर इउनिकड रान्नायनि फारि</type>
-			<type key="collation" type="gb2312han">सरलीकृत चीनी वर्गीकरण जीबी2312</type>
 			<type key="collation" type="phonebook">दूरभाष निर्देशिका वर्गीकरण</type>
 			<type key="collation" type="pinyin">पिनयीन वर्गीकरण</type>
 			<type key="collation" type="search">सादारन-जाहोननि नायगिरनाय</type>
@@ -1551,13 +1549,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMd">GGGGG dd-MM-y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y MMM E d</dateFormatItem>
 						<dateFormatItem id="h">a नि h</dateFormatItem>
-						<dateFormatItem id="hmsv">a नि h:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
 						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
@@ -1648,7 +1644,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M –/dM</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">d/M, E –d/M, E</greatestDifference>
@@ -2575,9 +2571,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>नॉम पेन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>एन्डारबारी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>केन्ट’न</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3251,9 +3244,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>सोनाब आफ्रिकानि सम</generic>
-					<standard>सोनाब आफ्रिकानि थाखोआरि सम</standard>
-					<daylight>सोनाब आफ्रिकानि दैज्लां सम</daylight>
+					<standard>सोनाब आफ्रिकानि सम</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3636,6 +3627,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>गुयाना सम</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हावाई-एल्युतियान थाखोआरि सम</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हावाई-एल्युतियान सम</generic>
@@ -4084,6 +4080,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>चूक सम</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>तुर्की टाईम</generic>
+					<standard>तुर्की स्टैंडर्ड टाईम</standard>
+					<daylight>तुर्की समर टाईम</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>तुर्कमेनीस्तान सम</generic>
@@ -4249,39 +4252,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="100000" count="one">¤000K</pattern>
-					<pattern type="100000" count="other">¤000K</pattern>
-					<pattern type="1000000" count="one">¤0M</pattern>
-					<pattern type="1000000" count="other">¤0M</pattern>
-					<pattern type="10000000" count="one">¤00M</pattern>
-					<pattern type="10000000" count="other">¤00M</pattern>
-					<pattern type="100000000" count="one">¤000M</pattern>
-					<pattern type="100000000" count="other">¤000M</pattern>
-					<pattern type="1000000000" count="one">¤0B</pattern>
-					<pattern type="1000000000" count="other">¤0B</pattern>
-					<pattern type="10000000000" count="one">¤00B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="100000000000" count="one">¤000B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="1000000000000" count="one">¤0T</pattern>
-					<pattern type="1000000000000" count="other">¤0T</pattern>
-					<pattern type="10000000000000" count="one">¤00T</pattern>
-					<pattern type="10000000000000" count="other">¤00T</pattern>
-					<pattern type="100000000000000" count="one">¤000T</pattern>
-					<pattern type="100000000000000" count="other">¤000T</pattern>
+					<pattern type="1000" count="one">¤ 0के</pattern>
+					<pattern type="1000" count="other">¤ 0के</pattern>
+					<pattern type="10000" count="one">¤ 00के</pattern>
+					<pattern type="10000" count="other">¤ 00के</pattern>
+					<pattern type="100000" count="one">¤ 000के</pattern>
+					<pattern type="100000" count="other">¤ 000के</pattern>
+					<pattern type="1000000" count="one">¤ 0एम</pattern>
+					<pattern type="1000000" count="other">¤ 0एम</pattern>
+					<pattern type="10000000" count="one">¤ 00एम</pattern>
+					<pattern type="10000000" count="other">¤ 00एम</pattern>
+					<pattern type="100000000" count="one">¤ 000एम</pattern>
+					<pattern type="100000000" count="other">¤ 000एम</pattern>
+					<pattern type="1000000000" count="one">¤ 0बि</pattern>
+					<pattern type="1000000000" count="other">¤ 0बि</pattern>
+					<pattern type="10000000000" count="one">¤ 00बि</pattern>
+					<pattern type="10000000000" count="other">¤ 00बि</pattern>
+					<pattern type="100000000000" count="one">¤ 000बि</pattern>
+					<pattern type="100000000000" count="other">¤ 000बि</pattern>
+					<pattern type="1000000000000" count="one">¤ 0ति</pattern>
+					<pattern type="1000000000000" count="other">¤ 0ति</pattern>
+					<pattern type="10000000000000" count="one">¤ 00ति</pattern>
+					<pattern type="10000000000000" count="other">¤ 00ति</pattern>
+					<pattern type="100000000000000" count="one">¤ 000ति</pattern>
+					<pattern type="100000000000000" count="other">¤ 000ति</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
diff --git a/make/data/cldr/common/main/bs.xml b/make/data/cldr/common/main/bs.xml
index 2ef4a63d10e..0a0b8821719 100644
--- a/make/data/cldr/common/main/bs.xml
+++ b/make/data/cldr/common/main/bs.xml
@@ -279,6 +279,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kelnski</language>
 			<language type="ku">kurdski</language>
+			<language type="ku" menu="core">kurdski</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kumik</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -872,6 +874,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kina</territory>
 			<territory type="CO">Kolumbija</territory>
 			<territory type="CP">Ostrvo Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Zelenortska Ostrva</territory>
@@ -1224,35 +1227,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numeričko sortiranje</key>
 			<key type="colStrength">Jačina sortiranja</key>
 			<key type="currency">Valuta</key>
+			<key type="em">Emoji prezentacija</key>
 			<key type="hc">Format vremena (12 ili 24)</key>
 			<key type="lb">Stil prijeloma reda</key>
+			<key type="lw">Prelom reda u riječi</key>
 			<key type="ms">Mjerni sistem</key>
 			<key type="numbers">Brojevi</key>
+			<key type="ss">Prelom rečenice nakon skraćenice</key>
 			<key type="timezone">Vremenska zona</key>
 			<key type="va">Varijanta zemlje/jezika</key>
 			<key type="x">Privatna upotreba</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistički kalendar</type>
+			<type key="calendar" type="buddhist" scope="core">budistički</type>
 			<type key="calendar" type="chinese">kineski kalendar</type>
+			<type key="calendar" type="chinese" scope="core">kineski</type>
 			<type key="calendar" type="coptic">koptski kalendar</type>
+			<type key="calendar" type="coptic" scope="core">koptski</type>
 			<type key="calendar" type="dangi">dangi kalendar</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">etiopski kalendar</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopski</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopski kalendar &quot;Amete Alem&quot;</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopski Amete Alem</type>
 			<type key="calendar" type="gregorian">gregorijanski kalendar</type>
+			<type key="calendar" type="gregorian" scope="core">gregorijanski</type>
 			<type key="calendar" type="hebrew">hebrejski kalendar</type>
+			<type key="calendar" type="hebrew" scope="core">hebrejski</type>
 			<type key="calendar" type="indian">indijski nacionalni kalendar</type>
 			<type key="calendar" type="islamic">islamski kalendar</type>
+			<type key="calendar" type="islamic" scope="core">islamski</type>
 			<type key="calendar" type="islamic-civil">islamski građanski kalendar, tabelarni</type>
+			<type key="calendar" type="islamic-civil" scope="core">islamski (tabelarni, građanski)</type>
 			<type key="calendar" type="islamic-rgsa">islamski kalendar za Saudijsku Arabiju</type>
 			<type key="calendar" type="islamic-tbla">islamski kalendar, tabelarni, astronomska epoha</type>
 			<type key="calendar" type="islamic-umalqura">islamski kalendar, Umm al-Qura</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islamski (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">kalendar ISO-8601</type>
 			<type key="calendar" type="japanese">japanski kalendar</type>
+			<type key="calendar" type="japanese" scope="core">japanski</type>
 			<type key="calendar" type="persian">perzijski kalendar</type>
+			<type key="calendar" type="persian" scope="core">perzijski</type>
 			<type key="calendar" type="roc">kalendar Republike Kine</type>
+			<type key="calendar" type="roc" scope="core">Republika Kina</type>
 			<type key="cf" type="account">računovodstveni format valute</type>
+			<type key="cf" type="account" scope="core">Računovodstvo</type>
 			<type key="cf" type="standard">standardni format valute</type>
+			<type key="cf" type="standard" scope="core">Standardno</type>
 			<type key="colAlternate" type="non-ignorable">Poredaj simbole</type>
 			<type key="colAlternate" type="shifted">Poredaj zanemarujući simbole</type>
 			<type key="colBackwards" type="no">Poredaj naglaske normalno</type>
@@ -1262,19 +1284,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Poredaj prvo velika slova</type>
 			<type key="colCaseLevel" type="no">Poredaj zanemarujući veličinu</type>
 			<type key="colCaseLevel" type="yes">Poredaj u skladu s veličinom slova</type>
-			<type key="collation" type="big5han">Tradicionalno kinesko sortiranje</type>
 			<type key="collation" type="compat">Prethodno sortiranje radi usklađenosti</type>
 			<type key="collation" type="dictionary">Rječničko sortiranje</type>
 			<type key="collation" type="ducet">standardno Unicode sortiranje</type>
+			<type key="collation" type="ducet" scope="core">standardni Unicode</type>
 			<type key="collation" type="emoji">Sortiranje po emoji sličicama</type>
 			<type key="collation" type="eor">Evropska pravila sortiranja</type>
-			<type key="collation" type="gb2312han">Pojednostavljeno kinesko sortiranje - GB2312</type>
 			<type key="collation" type="phonebook">Sortiranje kao telefonski imenik</type>
 			<type key="collation" type="phonetic">Fonetsko sortiranje</type>
 			<type key="collation" type="pinyin">Pinjin sortiranje</type>
 			<type key="collation" type="search">općenito pretraživanje</type>
+			<type key="collation" type="search" scope="core">pretraga</type>
 			<type key="collation" type="searchjl">Pretraživanje po početnom suglasniku hangula</type>
 			<type key="collation" type="standard">standardno sortiranje</type>
+			<type key="collation" type="standard" scope="core">standardno</type>
 			<type key="collation" type="stroke">Sortiranje po broju crta</type>
 			<type key="collation" type="traditional">Tradicionalno sortiranje</type>
 			<type key="collation" type="unihan">sortiranje prema korijenu i potezu</type>
@@ -1291,18 +1314,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Široki</type>
 			<type key="d0" type="hwidth">Uski</type>
 			<type key="d0" type="npinyin">Numerički</type>
+			<type key="em" type="default" scope="core">Zadano</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Tekst</type>
 			<type key="hc" type="h11">12-satni format (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-satni format (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-satni format (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-satni format (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Slobodni stil prijeloma reda</type>
+			<type key="lb" type="loose" scope="core">Slobodni</type>
 			<type key="lb" type="normal">Normalni stil prijeloma reda</type>
+			<type key="lb" type="normal" scope="core">Normalni</type>
 			<type key="lb" type="strict">Strogi stil prijeloma reda</type>
+			<type key="lb" type="strict" scope="core">Strogi</type>
+			<type key="lw" type="breakall" scope="core">podijeli sve</type>
+			<type key="lw" type="keepall" scope="core">zadrži sve</type>
+			<type key="lw" type="normal" scope="core">normalno</type>
+			<type key="lw" type="phrase" scope="core">zadrži u fazama</type>
 			<type key="m0" type="bgn">US BGN transliteracija</type>
 			<type key="m0" type="ungegn">UN GEGN transliteracija</type>
 			<type key="ms" type="metric">metrički sistem</type>
+			<type key="ms" type="metric" scope="core">Metrički</type>
 			<type key="ms" type="uksystem">britanski mjerni sistem</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">američki mjerni sistem</type>
+			<type key="ms" type="ussystem" scope="core">američki</type>
 			<type key="numbers" type="ahom">ahom cifre</type>
 			<type key="numbers" type="arab">arapsko-indijski brojevi</type>
 			<type key="numbers" type="arabext">prošireni arapsko-indijski brojevi</type>
@@ -1388,6 +1428,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Vai cifre</type>
 			<type key="numbers" type="wara">warang citi cifre</type>
 			<type key="numbers" type="wcho">vančo cifre</type>
+			<type key="ss" type="none" scope="core">Uključeno</type>
+			<type key="ss" type="standard" scope="core">Isključeno</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrički</measurementSystemName>
@@ -1578,16 +1620,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<calendar type="dangi">
 				<dateTimeFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1598,54 +1630,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">U MMM – U MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">U MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">U MMM d – U MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">U MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">U MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">U MMM d, E – U MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">U MMMM – U MMMM</greatestDifference>
-						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1683,6 +1667,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1691,6 +1678,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1711,7 +1701,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
@@ -1733,54 +1722,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d. – d.</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h'h' a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1797,7 +1748,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h 'h' a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1846,7 +1796,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d. – d. MMM y. G</greatestDifference>
 							<greatestDifference id="M">d. MMM – d. MMM y. G</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, dd. – E, dd. MMM y. G</greatestDifference>
@@ -1877,6 +1826,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">nov</month>
 							<month type="12">dec</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">jan</month>
+							<month type="2">feb</month>
+							<month type="3">mar</month>
+							<month type="4">apr</month>
+							<month type="5">may</month>
+							<month type="6">jun</month>
+							<month type="7">jul</month>
+							<month type="8">aug</month>
+							<month type="9">sep</month>
+							<month type="10">okt</month>
+							<month type="11">nov</month>
+							<month type="12">dec</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">januar</month>
 							<month type="2">februar</month>
@@ -1987,20 +1950,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">navečer</dayPeriod>
 							<dayPeriod type="night1">po noći</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">a. m.</dayPeriod>
-							<dayPeriod type="pm">p. m.</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">prijepodne</dayPeriod>
 							<dayPeriod type="pm">popodne</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">a. m.</dayPeriod>
-							<dayPeriod type="pm">p. m.</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">prijepodne</dayPeriod>
 							<dayPeriod type="pm">popodne</dayPeriod>
@@ -2078,6 +2033,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2086,6 +2044,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2113,7 +2074,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a (v)</dateFormatItem>
@@ -2147,11 +2107,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -2192,12 +2150,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
 							<greatestDifference id="d">E, d. MMM – E, d. MMM y. G</greatestDifference>
-							<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH – HH'h'</greatestDifference>
@@ -2221,7 +2173,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h 'h' a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2499,6 +2450,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="month-short">
 				<displayName>mj.</displayName>
+				<relative type="-1">prošli mj.</relative>
+				<relative type="0">ovaj mj.</relative>
+				<relative type="1">sljedeći mj.</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} mj.</relativeTimePattern>
 					<relativeTimePattern count="few">za {0} mj.</relativeTimePattern>
@@ -2528,26 +2482,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relativePeriod>sedmica u kojoj je {0}</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName>sed.</displayName>
+				<displayName>sedm.</displayName>
+				<relative type="-1">prošle sedm.</relative>
+				<relative type="0">ove sedm.</relative>
+				<relative type="1">sljedeće sedm.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">za {0} sed.</relativeTimePattern>
-					<relativeTimePattern count="few">za {0} sed.</relativeTimePattern>
-					<relativeTimePattern count="other">za {0} sed.</relativeTimePattern>
+					<relativeTimePattern count="one">za {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} sedm.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">prije {0} sed.</relativeTimePattern>
-					<relativeTimePattern count="few">prije {0} sed.</relativeTimePattern>
-					<relativeTimePattern count="other">prije {0} sed.</relativeTimePattern>
+					<relativeTimePattern count="one">prije {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} sedm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<displayName>sedm.</displayName>
+				<relative type="-1">prošle sedm.</relative>
+				<relative type="0">ove sedm.</relative>
+				<relative type="1">sljedeće sedm.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} sedm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} sedm.</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} sedm.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>sedmica u mjesecu</displayName>
 			</field>
 			<field type="weekOfMonth-short">
-				<displayName>sed. u mj.</displayName>
+				<displayName>sedm. u mj.</displayName>
 			</field>
 			<field type="weekOfMonth-narrow">
-				<displayName>s. u mj.</displayName>
+				<displayName>sedm. u mj.</displayName>
 			</field>
 			<field type="day">
 				<displayName>dan</displayName>
@@ -2567,16 +2540,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">prije {0} dana</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="day-short">
+			<field type="day-narrow">
 				<relativeTime type="future">
-					<relativeTimePattern count="one">za {0} d.</relativeTimePattern>
-					<relativeTimePattern count="few">za {0} d.</relativeTimePattern>
-					<relativeTimePattern count="other">za {0} d.</relativeTimePattern>
+					<relativeTimePattern count="one">za {0} dan</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} dana</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} dana</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">prije {0} d.</relativeTimePattern>
-					<relativeTimePattern count="few">prije {0} d.</relativeTimePattern>
-					<relativeTimePattern count="other">prije {0} d.</relativeTimePattern>
+					<relativeTimePattern count="one">prije {0} dan</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} dana</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} dana</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayOfYear">
@@ -2600,9 +2573,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekdayOfMonth-short">
 				<displayName>dan u mj.</displayName>
 			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName>d. u mj.</displayName>
-			</field>
 			<field type="sun">
 				<relative type="-1">prošla nedjelja</relative>
 				<relative type="0">ova nedjelja</relative>
@@ -2619,9 +2589,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="sun-short">
-				<relative type="-1">prošla ned.</relative>
-				<relative type="0">ova ned.</relative>
-				<relative type="1">sljedeća ned.</relative>
+				<relative type="-1">prošla ned</relative>
+				<relative type="0">ova ned</relative>
+				<relative type="1">sljedeća ned</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} ned</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} ned</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} ned</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} ned</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} ned</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} ned</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">prošla ned</relative>
+				<relative type="0">ova ned</relative>
+				<relative type="1">sljedeća ned</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} ned</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} ned</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} ned</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} ned</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} ned</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} ned</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="mon">
 				<relative type="-1">prošli ponedjeljak</relative>
@@ -2639,7 +2634,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">prošli pon.</relative>
+				<relative type="-1">prošli pon</relative>
 				<relative type="0">ovaj pon.</relative>
 				<relative type="1">sljedeći pon</relative>
 				<relativeTime type="future">
@@ -2653,21 +2648,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">prije {0} pon</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="mon-narrow">
-				<relative type="-1">prošli pon.</relative>
-				<relative type="0">ovaj pon.</relative>
-				<relative type="1">sljedeći pon.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">za {0} pon</relativeTimePattern>
-					<relativeTimePattern count="few">za {0} pon</relativeTimePattern>
-					<relativeTimePattern count="other">za {0} pon</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">prije {0} pon</relativeTimePattern>
-					<relativeTimePattern count="few">prije {0} pon</relativeTimePattern>
-					<relativeTimePattern count="other">prije {0} pon</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="tue">
 				<relative type="-1">prošli utorak</relative>
 				<relative type="0">ovaj utorak</relative>
@@ -2684,14 +2664,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">prošli uto.</relative>
-				<relative type="0">ovaj uto.</relative>
-				<relative type="1">sljedeći uto.</relative>
+				<relative type="-1">prošli uto</relative>
+				<relative type="0">ovaj uto</relative>
+				<relative type="1">sljedeći uto</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} uto</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} uto</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} uto</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} uto</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} uto</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} uto</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="tue-narrow">
 				<relative type="-1">prošli uto</relative>
 				<relative type="0">ovaj uto</relative>
 				<relative type="1">sljedeći uto</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} uto</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} uto</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} uto</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} uto</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} uto</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} uto</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="wed">
 				<relative type="-1">prošla srijeda</relative>
@@ -2709,14 +2709,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="wed-short">
-				<relative type="-1">prošla sri.</relative>
-				<relative type="0">ova sri.</relative>
-				<relative type="1">sljedeća sri.</relative>
+				<relative type="-1">prošla sri</relative>
+				<relative type="0">ova sri</relative>
+				<relative type="1">sljedeća sri</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} sri</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} sri</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} sri</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} sri</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} sri</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} sri</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="wed-narrow">
 				<relative type="-1">prošla sri</relative>
 				<relative type="0">ova sri</relative>
 				<relative type="1">sljedeća sri</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} sri</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} sri</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} sri</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} sri</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} sri</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} sri</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="thu">
 				<relative type="-1">prošli četvrtak</relative>
@@ -2734,14 +2754,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="thu-short">
-				<relative type="-1">prošli čet.</relative>
-				<relative type="0">ovaj čet.</relative>
-				<relative type="1">sljedeći čet.</relative>
+				<relative type="-1">prošli čet</relative>
+				<relative type="0">ovaj čet</relative>
+				<relative type="1">sljedeći čet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} čet</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} čet</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} čet</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} čet</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} čet</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} čet</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="thu-narrow">
 				<relative type="-1">prošli čet</relative>
 				<relative type="0">ovaj čet</relative>
 				<relative type="1">sljedeći čet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} čet</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} čet</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} čet</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} čet</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} čet</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} čet</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="fri">
 				<relative type="-1">prošli petak</relative>
@@ -2759,9 +2799,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">prošli pet.</relative>
-				<relative type="0">ovaj pet.</relative>
-				<relative type="1">sljedeći pet.</relative>
+				<relative type="-1">prošli pet</relative>
+				<relative type="0">ovaj pet</relative>
+				<relative type="1">sljedeći pet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} pet</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} pet</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} pet</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} pet</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} pet</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} pet</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">prošli pet</relative>
+				<relative type="0">ovaj pet</relative>
+				<relative type="1">sljedeći pet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} pet</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} pet</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} pet</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} pet</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} pet</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} pet</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="sat">
 				<relative type="-1">prošla subota</relative>
@@ -2779,9 +2844,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="sat-short">
-				<relative type="-1">prošla sub.</relative>
-				<relative type="0">ova sub.</relative>
-				<relative type="1">sljedeća sub.</relative>
+				<relative type="-1">prošla sub</relative>
+				<relative type="0">ova sub</relative>
+				<relative type="1">sljedeća sub</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} sub</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} sub</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} sub</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} sub</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} sub</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} sub</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">prošla sub</relative>
+				<relative type="0">ova sub</relative>
+				<relative type="1">sljedeća sub</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} sub</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} sub</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} sub</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} sub</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} sub</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} sub</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="dayperiod">
 				<displayName>prijepodne/poslijepodne</displayName>
@@ -2821,13 +2911,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>min</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">za {0} min</relativeTimePattern>
-					<relativeTimePattern count="few">za {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">za {0} min.</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">prije {0} min.</relativeTimePattern>
-					<relativeTimePattern count="few">prije {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other">prije {0} min.</relativeTimePattern>
+					<relativeTimePattern count="one">prije {0} min</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} min</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">za {0} min</relativeTimePattern>
+					<relativeTimePattern count="few">za {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">za {0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">prije {0} min</relativeTimePattern>
+					<relativeTimePattern count="few">prije {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">prije {0} min</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
@@ -2857,9 +2959,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">prije {0} sek.</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="second-narrow">
-				<displayName>s</displayName>
-			</field>
 			<field type="zone">
 				<displayName>vremenska zona</displayName>
 			</field>
@@ -2892,9 +2991,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angvila</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
@@ -3050,9 +3146,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Pnom Pen</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pjongjang</exemplarCity>
 			</zone>
@@ -3289,9 +3382,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Zapadnoafričko vrijeme</generic>
-					<standard>Zapadnoafričko standardno vrijeme</standard>
-					<daylight>Zapadnoafričko ljetno vrijeme</daylight>
+					<standard>Zapadnoafričko vrijeme</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3692,6 +3783,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Gvajansko vrijeme</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havajsko-aleućansko standardno vrijeme</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havajsko-aleućansko vrijeme</generic>
@@ -4142,6 +4238,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Čučko vrijeme</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turska vreme</generic>
+					<standard>Turska standardno vreme</standard>
+					<daylight>Turska letnje računanje vremena</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>turkmenistansko vrijeme</generic>
@@ -4614,10 +4717,224 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4661,6 +4978,236 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
 				<displayName>Andorska pezeta</displayName>
@@ -6008,13 +6555,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">slovačkih kuna</displayName>
 			</currency>
 			<currency type="SLE">
-				<displayName>Sijeraleonski leone</displayName>
+				<displayName>sijeraleonski leone</displayName>
 				<displayName count="one">sijeraleonski leone</displayName>
 				<displayName count="few">sijeraleonska leona</displayName>
 				<displayName count="other">sijeraleonskih leona</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Sijeraleonski leone (1964—2022)</displayName>
+				<displayName>sijeraleonski leone (1964—2022)</displayName>
 				<displayName count="one">sijeraleonski leone (1964—2022)</displayName>
 				<displayName count="few">sijeraleonska leona (1964—2022)</displayName>
 				<displayName count="other">sijeraleonskih leona (1964—2022)</displayName>
@@ -6317,6 +6864,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">istočnokaripskih dolara</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>karipski gulden</displayName>
+				<displayName count="one">karipski gulden</displayName>
+				<displayName count="few">karipska guldena</displayName>
+				<displayName count="other">karipskih guldena</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Posebna prava</displayName>
 				<displayName count="one">posebno crtaće pravo</displayName>
@@ -6462,6 +7015,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="few">zimbabvejska dolara (1980–2008)</displayName>
 				<displayName count="other">zimbabvejski dolari (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabveansko zlato</displayName>
+				<displayName count="one">zimbabveansko zlato</displayName>
+				<displayName count="few">zimbabveanska zlata</displayName>
+				<displayName count="other">zimbabveanskih zlata</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabvejski dolar (2009)</displayName>
 				<displayName count="one">zimbabvejski dolaz (2009)</displayName>
@@ -6488,17 +7047,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>femto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>ato{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>zepto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>jokto{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="10p-27">
 				<unitPrefixPattern>ronto{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-30">
-				<unitPrefixPattern>kuekto{0}</unitPrefixPattern>
+				<unitPrefixPattern>kvekto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>deka{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>eksa{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>zeta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>jota{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p27">
-				<unitPrefixPattern>ronna{0}</unitPrefixPattern>
+				<unitPrefixPattern>rona{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p30">
-				<unitPrefixPattern>quetta{0}</unitPrefixPattern>
+				<unitPrefixPattern>kveta{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p1">
 				<unitPrefixPattern>kibi{0}</unitPrefixPattern>
@@ -6516,13 +7099,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPrefixPattern>pebi{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p6">
-				<unitPrefixPattern>exbi{0}</unitPrefixPattern>
+				<unitPrefixPattern>eksbi{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p7">
 				<unitPrefixPattern>zebi{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p8">
-				<unitPrefixPattern>yobe{0}</unitPrefixPattern>
+				<unitPrefixPattern>jobi{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="power2">
 				<compoundUnitPattern1 count="one">kvadratni {0}</compoundUnitPattern1>
@@ -6640,7 +7223,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} milimola po litru</unitPattern>
 				<unitPattern count="other">{0} milimola po litru</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dijelovi</displayName>
+				<unitPattern count="one">{0} dio</unitPattern>
+				<unitPattern count="few">{0} dijela</unitPattern>
+				<unitPattern count="other">{0} dijelova</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>dijelovi na milion</displayName>
 				<unitPattern count="one">{0} dio na milion</unitPattern>
 				<unitPattern count="few">{0} dijela na milion</unitPattern>
@@ -6670,6 +7259,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} mola</unitPattern>
 				<unitPattern count="other">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoze</displayName>
+				<unitPattern count="one">{0} glukoze</unitPattern>
+				<unitPattern count="few">{0} glukoze</unitPattern>
+				<unitPattern count="other">{0} glukoze</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litri po kilometru</displayName>
 				<unitPattern count="one">{0} litar po kilometru</unitPattern>
@@ -6983,6 +7578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0} po kilometru</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
+				<displayName>metri</displayName>
 				<unitPattern count="one">{0} metar</unitPattern>
 				<unitPattern count="few">{0} metra</unitPattern>
 				<unitPattern count="other">{0} metara</unitPattern>
@@ -7237,6 +7833,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} milimetra živinog stuba</unitPattern>
 				<unitPattern count="other">{0} milimetara živinog stuba</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>žive</displayName>
+				<unitPattern count="one">{0} žive</unitPattern>
+				<unitPattern count="few">{0} žive</unitPattern>
+				<unitPattern count="other">{0} žive</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funte po kvadratnom inču</displayName>
 				<unitPattern count="one">{0} funta po kvadratnom inču</unitPattern>
@@ -7317,7 +7919,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="speed-beaufort">
 				<displayName>Beafort</displayName>
 				<unitPattern count="one">Beafort {0}</unitPattern>
-				<unitPattern count="few">B {0}</unitPattern>
+				<unitPattern count="few">Beafort {0}</unitPattern>
 				<unitPattern count="other">Beafort {0}</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
@@ -7442,6 +8044,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} metričke šolje</unitPattern>
 				<unitPattern count="other">{0} metričkih šolja</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>tekuće unce</displayName>
+				<unitPattern count="one">{0} tekuća unca</unitPattern>
+				<unitPattern count="few">{0} tekuće unce</unitPattern>
+				<unitPattern count="other">{0} tekućih unci</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>jutar-stope</displayName>
 				<unitPattern count="one">{0} jutar-stopa</unitPattern>
@@ -7497,7 +8105,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} imp. tekućih unci</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName>kašike</displayName>
 				<unitPattern count="one">{0} kašika</unitPattern>
 				<unitPattern count="few">{0} kašike</unitPattern>
 				<unitPattern count="other">{0} kašika</unitPattern>
@@ -7538,11 +8145,97 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} imperijalna kvarca</unitPattern>
 				<unitPattern count="other">{0} imperijalnih kvarca</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradijani</displayName>
+				<unitPattern count="one">{0} steradijan</unitPattern>
+				<unitPattern count="few">{0} steradijana</unitPattern>
+				<unitPattern count="other">{0} steradijana</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katali</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} katala</unitPattern>
+				<unitPattern count="other">{0} katala</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kuloni</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="few">{0} kulona</unitPattern>
+				<unitPattern count="other">{0} kulona</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradi</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farada</unitPattern>
+				<unitPattern count="other">{0} farada</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henriji</displayName>
+				<unitPattern count="one">{0} henri</unitPattern>
+				<unitPattern count="few">{0} henrija</unitPattern>
+				<unitPattern count="other">{0} henrija</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simensi</displayName>
+				<unitPattern count="one">{0} simens</unitPattern>
+				<unitPattern count="few">{0} simensa</unitPattern>
+				<unitPattern count="other">{0} simensa</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorije [IT]</displayName>
+				<unitPattern count="one">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="few">{0} kalorije [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorija [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereli</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="few">{0} bekerela</unitPattern>
+				<unitPattern count="other">{0} bekerela</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>siverti</displayName>
+				<unitPattern count="one">{0} sivert</unitPattern>
+				<unitPattern count="few">{0} siverta</unitPattern>
+				<unitPattern count="other">{0} siverta</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greji</displayName>
+				<unitPattern count="one">{0} grej</unitPattern>
+				<unitPattern count="few">{0} greja</unitPattern>
+				<unitPattern count="other">{0} grejeva</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram-sile</displayName>
+				<unitPattern count="one">{0} kilogram-sila</unitPattern>
+				<unitPattern count="few">{0} kilogram-sile</unitPattern>
+				<unitPattern count="other">{0} kilogram-sila</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesle</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesle</unitPattern>
+				<unitPattern count="other">{0} tesle</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veberi</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="few">{0} vebera</unitPattern>
+				<unitPattern count="other">{0} vebera</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>svjetlo</displayName>
+				<unitPattern count="one">{0} svjetlo</unitPattern>
+				<unitPattern count="few">{0} svjetla</unitPattern>
+				<unitPattern count="other">{0} svjetala</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>dijelovi na milijardu</displayName>
+				<unitPattern count="one">{0} dio na milijardu</unitPattern>
+				<unitPattern count="few">{0} dijela na milijardu</unitPattern>
+				<unitPattern count="other">{0} dijelova na milijardu</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>noći</displayName>
-				<unitPattern count="one">{0} noć</unitPattern>
-				<unitPattern count="few">{0} noći</unitPattern>
-				<unitPattern count="other">{0} noći</unitPattern>
 				<perUnitPattern>{0} po noći</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7580,9 +8273,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="area-acre">
 				<displayName>katastarska jutra</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
 			</unit>
 			<unit type="area-dunam">
 				<displayName>dunumi</displayName>
@@ -7602,9 +8292,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} stavke</unitPattern>
 				<unitPattern count="other">{0} stavki</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dio</displayName>
+				<unitPattern count="one">{0} dio</unitPattern>
+				<unitPattern count="few">{0} dijela</unitPattern>
+				<unitPattern count="other">{0} dijelova</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>dijelovi/milion</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>L/100 km</displayName>
 				<unitPattern count="one">{0} L/100 km</unitPattern>
@@ -7722,9 +8424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="energy-joule">
 				<displayName>džuli</displayName>
 			</unit>
-			<unit type="energy-kilowatt-hour">
-				<displayName>kW-sat</displayName>
-			</unit>
 			<unit type="energy-british-thermal-unit">
 				<displayName>BTU</displayName>
 				<unitPattern count="one">{0} BTU</unitPattern>
@@ -7838,6 +8537,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="few">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-knot">
 				<displayName>čv</displayName>
 				<unitPattern count="one">{0} čv</unitPattern>
@@ -7979,6 +8683,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} imp. kvarta</unitPattern>
 				<unitPattern count="other">{0} imp. kvarata</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal IT</unitPattern>
+				<unitPattern count="few">{0} cal IT</unitPattern>
+				<unitPattern count="other">{0} cal IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>svjetlo</displayName>
+				<unitPattern count="one">{0} svjetlo</unitPattern>
+				<unitPattern count="few">{0} svjetla</unitPattern>
+				<unitPattern count="other">{0} svjetala</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>noći</displayName>
 				<unitPattern count="one">{0} noć</unitPattern>
@@ -7997,13 +8758,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<unitLength type="narrow">
 			<unit type="area-acre">
 				<displayName>aker</displayName>
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="few">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dio</displayName>
+				<unitPattern count="one">{0} dio</unitPattern>
+				<unitPattern count="few">{0} dijela</unitPattern>
+				<unitPattern count="other">{0} dijelova</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="digital-byte">
 				<unitPattern count="one">{0} B</unitPattern>
 				<unitPattern count="few">{0} B</unitPattern>
@@ -8068,11 +8838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} kWh/100 km</unitPattern>
 				<unitPattern count="other">{0}kWh/100 km</unitPattern>
 			</unit>
-			<unit type="graphics-pixel-per-centimeter">
-				<unitPattern count="one">{0}ppcm</unitPattern>
-				<unitPattern count="few">{0} ppcm</unitPattern>
-				<unitPattern count="other">{0}ppcm</unitPattern>
-			</unit>
 			<unit type="graphics-pixel-per-inch">
 				<unitPattern count="one">{0}ppi</unitPattern>
 				<unitPattern count="few">{0} ppi</unitPattern>
@@ -8091,9 +8856,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="graphics-dot">
 				<displayName>tačka</displayName>
 			</unit>
-			<unit type="length-meter">
-				<displayName>m</displayName>
-			</unit>
 			<unit type="length-mile">
 				<displayName>mi</displayName>
 			</unit>
@@ -8129,6 +8891,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} gr</unitPattern>
 				<unitPattern count="other">{0} gr</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="few">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<unitPattern count="one">{0} mb</unitPattern>
 				<unitPattern count="few">{0} mbar</unitPattern>
@@ -8139,65 +8906,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
-			<unit type="temperature-fahrenheit">
-				<unitPattern count="one">{0}°F</unitPattern>
-				<unitPattern count="few">{0} °F</unitPattern>
-				<unitPattern count="other">{0}°F</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName>Ml</displayName>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>hl</displayName>
-			</unit>
 			<unit type="volume-liter">
 				<displayName>litar</displayName>
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="few">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
-			<unit type="volume-deciliter">
-				<displayName>dl</displayName>
-				<unitPattern count="one">{0} dl</unitPattern>
-				<unitPattern count="few">{0} dl</unitPattern>
-				<unitPattern count="other">{0} dl</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName>cl</displayName>
-				<unitPattern count="one">{0} cl</unitPattern>
-				<unitPattern count="few">{0} cl</unitPattern>
-				<unitPattern count="other">{0} cl</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName>ml</displayName>
-				<unitPattern count="one">{0} ml</unitPattern>
-				<unitPattern count="few">{0} ml</unitPattern>
-				<unitPattern count="other">{0} ml</unitPattern>
-			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>kšk.</displayName>
-				<unitPattern count="one">{0} kšk.</unitPattern>
-				<unitPattern count="few">{0} kšk.</unitPattern>
-				<unitPattern count="other">{0} kšk.</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>kšč.</displayName>
-				<unitPattern count="one">{0} kšč.</unitPattern>
-				<unitPattern count="few">{0} kšč.</unitPattern>
-				<unitPattern count="other">{0} kšč.</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>imp. kvart</displayName>
-				<unitPattern count="one">{0} imp. kvart</unitPattern>
-				<unitPattern count="few">{0} imp. kvarta</unitPattern>
-				<unitPattern count="other">{0} imp. kvarata</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>noći</displayName>
-				<unitPattern count="one">{0} noć</unitPattern>
-				<unitPattern count="few">{0} noći</unitPattern>
-				<unitPattern count="other">{0} noći</unitPattern>
-				<perUnitPattern>{0}/noć</perUnitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal IT</unitPattern>
+				<unitPattern count="few">{0} cal IT</unitPattern>
+				<unitPattern count="other">{0} cal IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>svjetlo</displayName>
+				<unitPattern count="one">{0} svjetlo</unitPattern>
+				<unitPattern count="few">{0} svjetla</unitPattern>
+				<unitPattern count="other">{0} svjetala</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}I</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/bs_Cyrl.xml b/make/data/cldr/common/main/bs_Cyrl.xml
index dda7b7539b8..204c0826069 100644
--- a/make/data/cldr/common/main/bs_Cyrl.xml
+++ b/make/data/cldr/common/main/bs_Cyrl.xml
@@ -1144,10 +1144,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">Календар Републике Кине</type>
 			<type key="cf" type="account">рачуноводствени формат валуте</type>
 			<type key="cf" type="standard">стандардни формат валуте</type>
-			<type key="collation" type="big5han">Традиционално кинеско сортирање</type>
 			<type key="collation" type="dictionary" draft="contributed">Редослед сортирања у речнику</type>
 			<type key="collation" type="ducet">задани Unicode редослијед сортирања</type>
-			<type key="collation" type="gb2312han">Поједностављено кинеско сортирање</type>
 			<type key="collation" type="phonebook">Сортирање као телефонски именик</type>
 			<type key="collation" type="pinyin">Пињин сортирање</type>
 			<type key="collation" type="reformed" draft="contributed">Реформисани редослед сортирања</type>
@@ -3145,9 +3143,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Пном Пен</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербери</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Киритимати</exemplarCity>
 			</zone>
@@ -3819,9 +3814,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западно-афричко вријеме</generic>
-					<standard>Западно-афричко стандардно вријеме</standard>
-					<daylight>Западно-афричко љетње рачунање времена</daylight>
+					<standard>Западно-афричко вријеме</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4204,6 +4197,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гвајана вријеме</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавајско-алеутско стандардно вријеме</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавајско-алеутско вријеме</generic>
@@ -4654,6 +4652,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Трук вријеме</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Турска време</generic>
+					<standard>Турска стандардно време</standard>
+					<daylight>Турска летње рачунање времена</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Туркменистан вријеме</generic>
@@ -4821,6 +4826,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/bua.xml b/make/data/cldr/common/main/bua.xml
new file mode 100644
index 00000000000..190524d1e3e
--- /dev/null
+++ b/make/data/cldr/common/main/bua.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bua"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="bua">буряад</language>
+			<language type="en">англи</language>
+		</languages>
+		<scripts>
+			<script type="Cyrl">кирил</script>
+		</scripts>
+		<territories>
+			<territory type="RU">Ород Улас</territory>
+		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Мэтрик</measurementSystemName>
+			<measurementSystemName type="UK">ЕБ</measurementSystemName>
+			<measurementSystemName type="US">АНУ</measurementSystemName>
+		</measurementSystemNames>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[а б в г д её ж з и й к л м н о ө п р с т у ү ф х һ ц ч ш щ ъ ы ь э ю я]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary" draft="contributed">[{а́} {е́} {и́} {о́} {у́} {ы́} {э́} {ю́} {я́}]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>„</alternateQuotationStart>
+		<alternateQuotationEnd>“</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">нэгэдүгээр һара</month>
+							<month type="2">хоёрдугаар һара</month>
+							<month type="3">гурбадугаар һара</month>
+							<month type="4">дүрбэдүгээр һара</month>
+							<month type="5">табадугаар һара</month>
+							<month type="6">зургадугаар һара</month>
+							<month type="7">долодугаар һара</month>
+							<month type="8">наймадугаар һара</month>
+							<month type="9">юһэдүгээр һара</month>
+							<month type="10">арбадугаар һара</month>
+							<month type="11">арбан нэгэдүгээр һара</month>
+							<month type="12">арбан хоёрдугаар һара</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="narrow">
+							<day type="sun">Ни</day>
+							<day type="mon">Да</day>
+							<day type="tue">Ми</day>
+							<day type="wed">Һа</day>
+							<day type="thu">Пү</day>
+							<day type="fri">Ба</day>
+							<day type="sat">Би</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">нима</day>
+							<day type="mon">дабаа</day>
+							<day type="tue">мигмар</day>
+							<day type="wed">һарба</day>
+							<day type="thu">пүрбэ</day>
+							<day type="fri">баасан</day>
+							<day type="sat">бимба</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyMMMd">G y MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MM 'һарын' d, E</dateFormatItem>
+						<dateFormatItem id="MMMd">MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMMMd">y 'оной' MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y 'оной' MM 'һарын' d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y 'оной' MMMM</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y MM 'һарын' d–d</greatestDifference>
+							<greatestDifference id="G">G y MM 'һарын' d – G y MM 'һарын' d</greatestDifference>
+							<greatestDifference id="M">G y MM 'һарын' d – MM 'һарын' d</greatestDifference>
+							<greatestDifference id="y">G y MM 'һарын' d – y MM 'һарын' d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="G">G y MM 'һарын' d, E – G y MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="M">G y MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="y">G y MM 'һарын' d, E – y MM 'һарын' d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MM 'һарын' d – d</greatestDifference>
+							<greatestDifference id="M">MM 'һарын' d – MM 'һарын' d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="M">MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">y MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">y 'оной' MMM d – d</greatestDifference>
+							<greatestDifference id="M">y 'оной' MM 'һарын' d – MM 'һарын' d</greatestDifference>
+							<greatestDifference id="y">y 'оной' MMMM d – y 'оной' MMMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">y 'оной' MM 'һарын' d, E – y 'оной' MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="M">E, MM 'һарын' d – E, MM 'һарын' d, y</greatestDifference>
+							<greatestDifference id="y">E, MM 'һарын' d, y – E, MM 'һарын' d, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">y 'оной' MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">y 'оной' MMMM – y 'оной' MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="year">
+				<relative type="-1">үнгэрэгшэ жэл</relative>
+				<relative type="0">энэ жэл</relative>
+				<relative type="1">хойто жэл</relative>
+			</field>
+			<field type="month">
+				<relative type="-1">үнгэрэгшэ һара</relative>
+				<relative type="0">энэ һара</relative>
+				<relative type="1">хойто һара</relative>
+			</field>
+			<field type="week">
+				<relative type="-1">үнгэрэгшэ долоон хоног</relative>
+				<relative type="0">энэ долоон хоног</relative>
+				<relative type="1">хойто долоон хоног</relative>
+			</field>
+			<field type="day">
+				<relative type="-1">үсэгэлдэр</relative>
+				<relative type="0">мүнөө</relative>
+				<relative type="1">үглөөдэр</relative>
+			</field>
+			<field type="sun">
+				<relative type="-1">үнгэрэгшэ нима</relative>
+				<relative type="0">энэ нима</relative>
+				<relative type="1">хойто нима</relative>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<metazone type="GMT">
+				<long>
+					<standard>Гринвичын саг</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/bua_RU.xml b/make/data/cldr/common/main/bua_RU.xml
new file mode 100644
index 00000000000..e17cd74dc1f
--- /dev/null
+++ b/make/data/cldr/common/main/bua_RU.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bua"/>
+		<territory type="RU"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/ca.xml b/make/data/cldr/common/main/ca.xml
index ddcab9cdd02..6ab5971a512 100644
--- a/make/data/cldr/common/main/ca.xml
+++ b/make/data/cldr/common/main/ca.xml
@@ -314,6 +314,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurd</language>
+			<language type="ku" menu="core">kurd</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kúmik</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -905,7 +907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Xina</territory>
 			<territory type="CO">Colòmbia</territory>
 			<territory type="CP">Illa Clipperton</territory>
-			<territory type="CQ" draft="unconfirmed">Sark</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cap Verd</territory>
@@ -1206,33 +1208,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">ordre numèric</key>
 			<key type="colStrength">força de l’ordre</key>
 			<key type="currency">moneda</key>
+			<key type="em">presentació de l’emoji</key>
 			<key type="hc">sistema horari (12 h o 24 h)</key>
 			<key type="lb">estil de salt de línia</key>
+			<key type="lw">salt de línia entre paraules</key>
 			<key type="ms">sistema de mesures</key>
 			<key type="numbers">xifres</key>
+			<key type="ss">pausa després de les abreviatures</key>
 			<key type="timezone">zona horària</key>
 			<key type="va">variant local</key>
 			<key type="x">ús privat</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">calendari budista</type>
+			<type key="calendar" type="buddhist" scope="core">budista</type>
 			<type key="calendar" type="chinese">calendari xinès</type>
+			<type key="calendar" type="chinese" scope="core">xinès</type>
 			<type key="calendar" type="coptic">calendari copte</type>
+			<type key="calendar" type="coptic" scope="core">copte</type>
 			<type key="calendar" type="dangi">calendari dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">calendari etíop</type>
+			<type key="calendar" type="ethiopic" scope="core">etíop</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendari etíop amete-alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etíop amete-alem</type>
 			<type key="calendar" type="gregorian">calendari gregorià</type>
+			<type key="calendar" type="gregorian" scope="core">gregorià</type>
 			<type key="calendar" type="hebrew">calendari hebreu</type>
+			<type key="calendar" type="hebrew" scope="core">hebreu</type>
 			<type key="calendar" type="indian">calendari hindú</type>
 			<type key="calendar" type="islamic">calendari islàmic</type>
+			<type key="calendar" type="islamic" scope="core">civil islàmic</type>
 			<type key="calendar" type="islamic-civil">calendari civil islàmic</type>
+			<type key="calendar" type="islamic-civil" scope="core">civil islàmic</type>
 			<type key="calendar" type="islamic-umalqura">calendari islàmic (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islàmic (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">calendari ISO-8601</type>
 			<type key="calendar" type="japanese">calendari japonès</type>
+			<type key="calendar" type="japanese" scope="core">japonès</type>
 			<type key="calendar" type="persian">calendari persa</type>
+			<type key="calendar" type="persian" scope="core">persa</type>
 			<type key="calendar" type="roc">calendari de la República de Xina</type>
+			<type key="calendar" type="roc" scope="core">de la República de Xina</type>
 			<type key="cf" type="account">format de moneda comptable</type>
+			<type key="cf" type="account" scope="core">comptable</type>
 			<type key="cf" type="standard">format de moneda estàndard</type>
+			<type key="cf" type="standard" scope="core">estàndard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordena els símbols</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Ordena sense tenir en compte els símbols</type>
 			<type key="colBackwards" type="no" draft="contributed">Ordena els accents de manera normal</type>
@@ -1242,22 +1263,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Ordena amb majúscules primer</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ordena sense distingir majúscules i minúscules</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Ordena amb detecció de majúscules i minúscules</type>
-			<type key="collation" type="big5han">ordre del xinès tradicional - Big5</type>
 			<type key="collation" type="compat">ordre anterior, per a compatibilitat</type>
+			<type key="collation" type="compat" scope="core">compatibilitat</type>
 			<type key="collation" type="dictionary">ordre de diccionari</type>
+			<type key="collation" type="dictionary" scope="core">diccionari</type>
 			<type key="collation" type="ducet">ordre Unicode predeterminat</type>
+			<type key="collation" type="ducet" scope="core">unicode predeterminat</type>
 			<type key="collation" type="eor" draft="contributed">normes europees d’ordenació</type>
-			<type key="collation" type="gb2312han">ordre del xinès simplificat - GB2312</type>
 			<type key="collation" type="phonebook">ordre de la guia telefònica</type>
+			<type key="collation" type="phonebook" scope="core">guia telefònica</type>
 			<type key="collation" type="phonetic">ordre fonètic</type>
+			<type key="collation" type="phonetic" scope="core">fonètic</type>
 			<type key="collation" type="pinyin">ordre pinyin</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">cerca de propòsit general</type>
+			<type key="collation" type="search" scope="core">cerca</type>
 			<type key="collation" type="searchjl" draft="contributed">cerca per consonant inicial del hangul</type>
 			<type key="collation" type="standard">ordre estàndard</type>
+			<type key="collation" type="standard" scope="core">estàndard</type>
 			<type key="collation" type="stroke">ordre dels traços</type>
+			<type key="collation" type="stroke" scope="core">traços</type>
 			<type key="collation" type="traditional">ordre tradicional</type>
+			<type key="collation" type="traditional" scope="core">tradicional</type>
 			<type key="collation" type="unihan">ordre de traços radicals</type>
+			<type key="collation" type="unihan" scope="core">traços radicals</type>
 			<type key="collation" type="zhuyin">ordre zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Ordena sense normalització</type>
 			<type key="colNormalization" type="yes" draft="contributed">Ordena per caràcters Unicode normalitzats</type>
 			<type key="colNumeric" type="no" draft="contributed">Ordena els dígits individualment</type>
@@ -1270,18 +1301,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">amplada completa</type>
 			<type key="d0" type="hwidth">amplada mitjana</type>
 			<type key="d0" type="npinyin" draft="contributed">Numèric</type>
+			<type key="em" type="default" scope="core">predeterminada</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">text</type>
 			<type key="hc" type="h11">sistema de 12 hores (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">sistema de 12 hores (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">sistema de 24 hores (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">sistema de 24 hores (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">salt de línia flexible</type>
+			<type key="lb" type="loose" scope="core">flexible</type>
 			<type key="lb" type="normal">salt de línia normal</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">salt de línia estricte</type>
+			<type key="lb" type="strict" scope="core">estricte</type>
+			<type key="lw" type="breakall" scope="core">divideix-ho tot</type>
+			<type key="lw" type="keepall" scope="core">conserva-ho tot</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">conserva en sintagmes</type>
 			<type key="m0" type="bgn">sistema de transliteració BGN</type>
 			<type key="m0" type="ungegn">sistema de transliteració UNGEGN</type>
 			<type key="ms" type="metric">sistema mètric</type>
+			<type key="ms" type="metric" scope="core">mètric</type>
 			<type key="ms" type="uksystem">sistema imperial d’unitats</type>
+			<type key="ms" type="uksystem" scope="core">imperial</type>
 			<type key="ms" type="ussystem">sistema d’unitats dels EUA</type>
+			<type key="ms" type="ussystem" scope="core">EUA</type>
 			<type key="numbers" type="arab">xifres indoaràbigues</type>
 			<type key="numbers" type="arabext">xifres indoaràbigues ampliades</type>
 			<type key="numbers" type="armn">nombres armenis</type>
@@ -1338,6 +1386,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">dígits tibetans</type>
 			<type key="numbers" type="traditional" draft="contributed">Numerals tradicionals</type>
 			<type key="numbers" type="vaii">dígits vai</type>
+			<type key="ss" type="none" scope="core">desactivada</type>
+			<type key="ss" type="standard" scope="core">activada</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">mètric</measurementSystemName>
@@ -1363,9 +1413,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ¡ ? ¿ . … '‘’ &quot;“” « » ( ) \[ \] § @ * / \\ \&amp; # † ‡ ′ ″]</exemplarCharacters>
 		<ellipsis type="word-final">{0}…</ellipsis>
 		<ellipsis type="word-medial">{0}… {1}</ellipsis>
-		<parseLenients scope="date" level="lenient">
-			<parseLenient sample=":">[\: ∶]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1518,6 +1565,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'les' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1526,35 +1576,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'les' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMM">LLLL 'del' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d MMMM 'del' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d MMMM 'del' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1576,12 +1637,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">y G – y G</greatestDifference>
 							<greatestDifference id="y">y – y G</greatestDifference>
@@ -1928,6 +1983,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, 'a' 'les' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1936,6 +1994,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, 'a' 'les' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, 'a' 'les' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1954,14 +2015,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM 'del' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM 'del' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMM">LLLL 'del' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d MMMM 'del' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d MMMM 'del' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
@@ -1975,6 +2037,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
 						<dateFormatItem id="hmvvvv">h:mm a (vvvv)</dateFormatItem>
 						<dateFormatItem id="Hmvvvv">H:mm (vvvv)</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -2036,10 +2099,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d MMM – E, d MMM, y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -2061,10 +2120,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">H:mm–H:mm v</greatestDifference>
 							<greatestDifference id="m">H:mm–H:mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -2579,18 +2634,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Ciutat desconeguda</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
@@ -2606,27 +2649,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermudes</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/Blanc-Sablon">
 				<exemplarCity>Blanc Sablon</exemplarCity>
 			</zone>
@@ -2663,9 +2685,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Algiers">
 				<exemplarCity>Alger</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Caire, el</exemplarCity>
 			</zone>
@@ -2735,12 +2754,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tòquio</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>Canton</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint Kitts</exemplarCity>
 			</zone>
@@ -2780,9 +2793,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Monaco">
 				<exemplarCity>Mònaco</exemplarCity>
 			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Khovd</exemplarCity>
-			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macau</exemplarCity>
 			</zone>
@@ -2792,18 +2802,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Mauritius">
 				<exemplarCity>Maurici</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Ciutat de Mèxic</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
 				<exemplarCity>Cancun</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Katmandú</exemplarCity>
 			</zone>
@@ -2906,9 +2910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damasc</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Duixanbé</exemplarCity>
 			</zone>
@@ -2973,9 +2974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Hora de l’Àfrica occidental</generic>
-					<standard>Hora estàndard de l’Àfrica occidental</standard>
-					<daylight>Hora d’estiu de l’Àfrica occidental</daylight>
+					<standard>Hora de l’Àfrica occidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3274,9 +3273,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic>Hora de les illes Malvines</generic>
-					<standard>Hora estàndard de les illes Malvines</standard>
-					<daylight>Hora d’estiu de les illes Malvines</daylight>
+					<generic>Hora de les illes Falkland</generic>
+					<standard>Hora estàndard de les illes Falkland</standard>
+					<daylight>Hora d’estiu de les illes Falkland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
@@ -3357,6 +3356,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora de Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hora estàndard de Hawaii-Aleutianes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hora de Hawaii-Aleutianes</generic>
@@ -3790,6 +3794,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora de Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Hora de Turquia</generic>
+					<standard>Hora estàndard de Turquia</standard>
+					<daylight>Hora d’estiu de Turquia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Hora del Turkmenistan</generic>
@@ -3948,42 +3959,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 k¤</pattern>
-					<pattern type="1000" count="other">0 k¤</pattern>
-					<pattern type="10000" count="one">00 k¤</pattern>
-					<pattern type="10000" count="other">00 k¤</pattern>
-					<pattern type="100000" count="one">000 k¤</pattern>
-					<pattern type="100000" count="other">000 k¤</pattern>
-					<pattern type="1000000" count="one">0 M¤</pattern>
-					<pattern type="1000000" count="other">0 M¤</pattern>
-					<pattern type="10000000" count="one">00 M¤</pattern>
-					<pattern type="10000000" count="other">00 M¤</pattern>
-					<pattern type="100000000" count="one">000 M¤</pattern>
-					<pattern type="100000000" count="other">000 M¤</pattern>
-					<pattern type="1000000000" count="one">0000 M¤</pattern>
-					<pattern type="1000000000" count="other">0000 M¤</pattern>
-					<pattern type="10000000000" count="one">00 kM¤</pattern>
-					<pattern type="10000000000" count="other">00 kM¤</pattern>
-					<pattern type="100000000000" count="one">000 kM¤</pattern>
-					<pattern type="100000000000" count="other">000 kM¤</pattern>
-					<pattern type="1000000000000" count="one">0 B¤</pattern>
-					<pattern type="1000000000000" count="other">0 B¤</pattern>
-					<pattern type="10000000000000" count="one">00 B¤</pattern>
-					<pattern type="10000000000000" count="other">00 B¤</pattern>
-					<pattern type="100000000000000" count="one">000 B¤</pattern>
-					<pattern type="100000000000000" count="other">000 B¤</pattern>
+					<pattern type="1000" count="one">0 k ¤</pattern>
+					<pattern type="1000" count="other">0 k ¤</pattern>
+					<pattern type="10000" count="one">00 k ¤</pattern>
+					<pattern type="10000" count="other">00 k ¤</pattern>
+					<pattern type="100000" count="one">000 k ¤</pattern>
+					<pattern type="100000" count="other">000 k ¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0000 M ¤</pattern>
+					<pattern type="1000000000" count="other">0000 M ¤</pattern>
+					<pattern type="10000000000" count="one">00 kM ¤</pattern>
+					<pattern type="10000000000" count="other">00 kM ¤</pattern>
+					<pattern type="100000000000" count="one">000 kM ¤</pattern>
+					<pattern type="100000000000" count="other">000 kM ¤</pattern>
+					<pattern type="1000000000000" count="one">0 B ¤</pattern>
+					<pattern type="1000000000000" count="other">0 B ¤</pattern>
+					<pattern type="10000000000000" count="one">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other">000 B ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5365,6 +5388,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">dòlars del Carib Oriental</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>florí de les Antilles</displayName>
+				<displayName count="one">florí de les Antilles</displayName>
+				<displayName count="other">florins de les Antilles</displayName>
+				<symbol>XCG</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>drets especials de gir</displayName>
 			</currency>
@@ -5476,6 +5505,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dòlar zimbabuès (1980–2008)</displayName>
 				<displayName count="other">dòlars zimbabuesos (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>or de Zimbàbue</displayName>
+				<displayName count="one">or de Zimbàbue</displayName>
+				<displayName count="other">or de Zimbàbue</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>dòlar zimbabuès (2009)</displayName>
 				<displayName count="one">dòlar zimbabuès (2009)</displayName>
@@ -5730,8 +5764,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<gender>masculine</gender>
 			</unit>
-			<unit type="concentr-permillion">
-				<gender>masculine</gender>
+			<unit type="concentr-part">
+				<displayName>parts</displayName>
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<gender>feminine</gender>
 				<displayName>parts per milió</displayName>
 				<unitPattern count="one">{0} part per milió</unitPattern>
 				<unitPattern count="other">{0} parts per milió</unitPattern>
@@ -5757,6 +5796,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} mols</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de glucosa</displayName>
+				<unitPattern count="one">{0} de glucosa</unitPattern>
+				<unitPattern count="other">{0} de glucosa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litres per quilòmetre</displayName>
@@ -6007,7 +6051,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<gender>masculine</gender>
-				<displayName>kilowatt hora per 100 quilòmetres</displayName>
+				<displayName>kilowatts hora per 100 quilòmetres</displayName>
 				<unitPattern count="one">{0} kilowatt hora per 100 quilòmetres</unitPattern>
 				<unitPattern count="other">{0} kilowatts hora per 100 quilòmetres</unitPattern>
 			</unit>
@@ -6336,6 +6380,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mil·límetre de mercuri</unitPattern>
 				<unitPattern count="other">{0} mil·límetres de mercuri</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de mercuri</displayName>
+				<unitPattern count="one">{0} de mercuri</unitPattern>
+				<unitPattern count="other">{0} de mercuri</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>lliures per polzada quadrada</displayName>
 				<unitPattern count="one">{0} lliura per polzada quadrada</unitPattern>
@@ -6536,6 +6585,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} tassa mètrica</unitPattern>
 				<unitPattern count="other">{0} tasses mètriques</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>unces líquides mètriques</displayName>
+				<unitPattern count="one">{0} unça líquida mètrica</unitPattern>
+				<unitPattern count="other">{0} unces líquides mètriques</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-peu</displayName>
 				<unitPattern count="one">{0} acre-peu</unitPattern>
@@ -6624,23 +6678,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>quarts imperials</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>estereoradians</displayName>
+				<unitPattern count="one">{0} estereoradian</unitPattern>
+				<unitPattern count="other">{0} estereoradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calories [IT]</displayName>
+				<unitPattern count="one">{0} caloria [IT]</unitPattern>
+				<unitPattern count="other">{0} calories [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>quilograms força</displayName>
+				<unitPattern count="one">{0} quilogram força</unitPattern>
+				<unitPattern count="other">{0} quilograms força</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesles</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesles</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>llum</displayName>
-				<unitPattern count="one">{0} llum</unitPattern>
-				<unitPattern count="other">{0} llum</unitPattern>
+				<unitPattern count="one">{0} llums</unitPattern>
+				<unitPattern count="other">{0} llums</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<gender>masculine</gender>
-				<displayName>part per mil milions</displayName>
+			<unit type="concentr-part-per-1e9">
+				<gender>feminine</gender>
+				<displayName>parts per mil milions</displayName>
 				<unitPattern count="one">{0} part per mil milions</unitPattern>
 				<unitPattern count="other">{0} parts per mil milions</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>nits</displayName>
-				<unitPattern count="one">{0} nit</unitPattern>
-				<unitPattern count="other">{0} nits</unitPattern>
 				<perUnitPattern>{0} per nit</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6700,7 +6815,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ítem</unitPattern>
 				<unitPattern count="other">{0} ítems</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts/milió</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6718,6 +6833,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6930,8 +7048,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="mass-grain">
 				<displayName>gra</displayName>
-				<unitPattern count="one">{0} gra</unitPattern>
-				<unitPattern count="other">{0} grans</unitPattern>
+				<unitPattern count="one">{0} gr</unitPattern>
+				<unitPattern count="other">{0} gr</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>W</displayName>
@@ -6946,6 +7064,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>d‘Hg</displayName>
+				<unitPattern count="one">{0} d‘Hg</unitPattern>
+				<unitPattern count="other">{0} d‘Hg</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<unitPattern count="one">{0} bar</unitPattern>
 				<unitPattern count="other">{0} bars</unitPattern>
@@ -7066,13 +7189,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} quart imperial</unitPattern>
 				<unitPattern count="other">{0} quarts imperials</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>llum</displayName>
-				<unitPattern count="one">{0} llum</unitPattern>
-				<unitPattern count="other">{0} llum</unitPattern>
+				<unitPattern count="one">{0} llums</unitPattern>
+				<unitPattern count="other">{0} llums</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>part/mil milions</displayName>
+			<unit type="concentr-part-per-1e9">
+				<displayName>parts/mil milions</displayName>
 			</unit>
 			<unit type="duration-night">
 				<displayName>nits</displayName>
@@ -7118,7 +7268,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mM/l</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -7130,6 +7280,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="duration-century">
 				<displayName>s.</displayName>
 				<unitPattern count="one">{0} s.</unitPattern>
@@ -7213,13 +7366,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="mass-gram">
 				<displayName>g</displayName>
 			</unit>
+			<unit type="mass-grain">
+				<displayName>gr</displayName>
+				<unitPattern count="one">{0} gr</unitPattern>
+				<unitPattern count="other">{0} gr</unitPattern>
+			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0}kW</unitPattern>
 				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>d‘Hg</displayName>
+				<unitPattern count="one">{0} d‘Hg</unitPattern>
+				<unitPattern count="other">{0} d‘Hg</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
-				<unitPattern count="one">{0} mb</unitPattern>
-				<unitPattern count="other">{0} mb</unitPattern>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbars</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one">{0}°F</unitPattern>
@@ -7247,16 +7410,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt imp</unitPattern>
 				<unitPattern count="other">{0} qt imp</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>llum</displayName>
-				<unitPattern count="one">{0} llum</unitPattern>
-				<unitPattern count="other">{0} llum</unitPattern>
+				<unitPattern count="one">{0} llums</unitPattern>
+				<unitPattern count="other">{0} llums</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 			<unit type="duration-night">
 				<displayName>nit</displayName>
 				<unitPattern count="one">{0}/nit</unitPattern>
-				<unitPattern count="other">{0}/nit</unitPattern>
-				<perUnitPattern>{0}/nit</perUnitPattern>
+				<unitPattern count="other">{0}/nits</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ca_ES_VALENCIA.xml b/make/data/cldr/common/main/ca_ES_VALENCIA.xml
index 0a0c226a32b..6ecb1bdbf1d 100644
--- a/make/data/cldr/common/main/ca_ES_VALENCIA.xml
+++ b/make/data/cldr/common/main/ca_ES_VALENCIA.xml
@@ -99,8 +99,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<types>
 			<type key="calendar" type="chinese" draft="unconfirmed">calendari xinés</type>
 			<type key="calendar" type="japanese" draft="unconfirmed">calendari japonés</type>
-			<type key="collation" type="big5han" draft="unconfirmed">ordre del xinés tradicional - Big5</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">ordre del xinés simplificat - GB2312</type>
 		</types>
 	</localeDisplayNames>
 	<dates>
diff --git a/make/data/cldr/common/main/ccp.xml b/make/data/cldr/common/main/ccp.xml
index c0f2ad0b8bd..7a1aeabd71a 100644
--- a/make/data/cldr/common/main/ccp.xml
+++ b/make/data/cldr/common/main/ccp.xml
@@ -1035,10 +1035,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="colCaseFirst" type="upper">𑄜𑄪𑄣𑄴𑄣𑄳𑄠𑄬 𑄝𑄧𑄢𑄧𑄦𑄘𑄧𑄢𑄴 𑄦𑄧𑄢𑄧𑄇𑄴 𑄝𑄬𑄭𑄣𑄧𑄚</type>
 			<type key="colCaseLevel" type="no">𑄇𑄬𑄥𑄴 𑄃𑄧𑄥𑄧𑄁𑄝𑄬𑄘𑄩 𑄝𑄬𑄭𑄣𑄧𑄚</type>
 			<type key="colCaseLevel" type="yes">𑄇𑄬𑄥𑄴 𑄥𑄧𑄁𑄝𑄘𑄩 𑄝𑄬𑄭𑄣𑄧𑄚</type>
-			<type key="collation" type="big5han">𑄛𑄳𑄢𑄧𑄗𑄉𑄧𑄖𑄧 𑄌𑄩𑄚 𑄥𑄧𑄎𑄴𑄎𑄇𑄳𑄢𑄟𑄴-𑄝𑄨𑄉𑄴𑄻</type>
 			<type key="collation" type="dictionary">𑄇𑄧𑄙𑄖𑄢 𑄝𑄬𑄭𑄣𑄧𑄚𑄢𑄴 𑄚𑄨𑄠𑄮𑄟𑄴</type>
 			<type key="collation" type="ducet">𑄓𑄨𑄜𑄧𑄣𑄴𑄑𑄴 𑄃𑄨𑄃𑄪𑄚𑄨𑄇𑄮𑄓𑄴 𑄝𑄬𑄭𑄣𑄧𑄚</type>
-			<type key="collation" type="gb2312han">𑄃𑄧𑄎𑄬𑄃𑄧𑄌𑄴 𑄌𑄩𑄚 𑄥𑄎𑄚-𑄎𑄨𑄝𑄨𑄸𑄹𑄷𑄸</type>
 			<type key="collation" type="phonebook">𑄜𑄮𑄚𑄴𑄝𑄪𑄇𑄴 𑄥𑄎𑄚</type>
 			<type key="collation" type="phonetic">𑄢𑄳𑄦𑄧 𑄝𑄬𑄭𑄣𑄧𑄚</type>
 			<type key="collation" type="pinyin">𑄛𑄨𑄚𑄨𑄚𑄴 𑄥𑄎𑄚</type>
@@ -3207,9 +3205,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>𑄛𑄧𑄏𑄨𑄟𑄬𑄘𑄨 𑄃𑄜𑄳𑄢𑄨𑄇 𑄃𑄧𑄇𑄴𑄖𑄧</generic>
-					<standard>𑄛𑄧𑄏𑄨𑄟𑄬𑄘𑄨 𑄃𑄜𑄳𑄢𑄨𑄇 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
-					<daylight>𑄛𑄧𑄏𑄨𑄟𑄬𑄘𑄨 𑄃𑄜𑄳𑄢𑄨𑄇 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</daylight>
+					<standard>𑄛𑄧𑄏𑄨𑄟𑄬𑄘𑄨 𑄃𑄜𑄳𑄢𑄨𑄇 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3585,6 +3581,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>𑄉𑄪𑄠𑄚 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>𑄦𑄧𑄃𑄮𑄠𑄭-𑄃𑄣𑄬𑄃𑄪𑄖𑄴 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>𑄦𑄃𑄮𑄠𑄭 𑄃𑄳𑄠𑄣𑄨𑄃𑄪𑄑𑄨𑄠𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</generic>
@@ -4155,6 +4156,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern alt="noCurrency" draft="provisional">#,##,##0.00;(#,##,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000000000" count="other">0G¤</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0G ¤</pattern>
+					<pattern type="10000000000" count="other">00G¤</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00G ¤</pattern>
+					<pattern type="100000000000" count="other">000G¤</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000G ¤</pattern>
+					<pattern type="1000000000000" count="other">0T¤</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0T ¤</pattern>
+					<pattern type="10000000000000" count="other">00T¤</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00T ¤</pattern>
+					<pattern type="100000000000000" count="other">000T¤</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
@@ -5070,7 +5087,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬</unitPattern>
 				<unitPattern count="other">{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>𑄞𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄬𑄉</displayName>
 				<unitPattern count="one">{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬</unitPattern>
 				<unitPattern count="other">{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬</unitPattern>
diff --git a/make/data/cldr/common/main/ce.xml b/make/data/cldr/common/main/ce.xml
index 90a35254b99..ac301facbbd 100644
--- a/make/data/cldr/common/main/ce.xml
+++ b/make/data/cldr/common/main/ce.xml
@@ -1862,9 +1862,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндерберин, гӀ-е</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Киритимати</exemplarCity>
 			</zone>
@@ -2526,9 +2523,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Малхбузен Африка</generic>
-					<standard>Малхбузен Африка, стандартан хан</standard>
-					<daylight>Малхбузен Африка, аьхкенан хан</daylight>
+					<standard>Малхбузен Африка</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2878,6 +2873,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гайана</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайн-алеутийн стандартан хан</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавайн-алеутийн хан</generic>
@@ -3441,6 +3441,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ceb.xml b/make/data/cldr/common/main/ceb.xml
index 89746056e89..7c184eb46cf 100644
--- a/make/data/cldr/common/main/ceb.xml
+++ b/make/data/cldr/common/main/ceb.xml
@@ -22,18 +22,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<language type="de">German</language>
 			<language type="de_CH">Swiss High German</language>
 			<language type="en">English</language>
-			<language type="en_GB">Britanikong English</language>
+			<language type="en_GB">English (British)</language>
 			<language type="en_GB" alt="short">English (UK)</language>
 			<language type="en_US">English (America)</language>
 			<language type="en_US" alt="short">English (US)</language>
 			<language type="es">Espanyol</language>
-			<language type="es_ES">Espanyol (Europa)</language>
-			<language type="fr">Pranses</language>
+			<language type="es_419">Spanish (Latin America)</language>
+			<language type="es_ES">Spanish (Europe)</language>
+			<language type="es_MX">Spanish (Mexico)</language>
+			<language type="fr">French</language>
+			<language type="fr_CA">French (Canada)</language>
+			<language type="fr_CH">French (Switzerland)</language>
 			<language type="hi">Hindi</language>
 			<language type="hi_Latn" alt="variant">Hinglish</language>
 			<language type="id">Indonesian</language>
-			<language type="it">Italyano</language>
-			<language type="ja">Hinapon</language>
+			<language type="it">Italian</language>
+			<language type="ja">Japanese</language>
 			<language type="ko">Korean</language>
 			<language type="nl">Dutch</language>
 			<language type="nl_BE">Flemish</language>
@@ -42,8 +46,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<language type="ru">Russian</language>
 			<language type="th">Thai</language>
 			<language type="tr">Turkish</language>
-			<language type="und">Wala Mailhing Pinulongan</language>
-			<language type="zh">Inintsik</language>
+			<language type="und">Wala mailhi nga pinulongan</language>
+			<language type="zh">Chinese</language>
 			<language type="zh" alt="menu">Chinese, Mandarin</language>
 			<language type="zh_Hans">Pinasimple nga Chinese</language>
 			<language type="zh_Hans" alt="long">Pinasimple nga Mandarin Chinese</language>
@@ -51,7 +55,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<language type="zh_Hant" alt="long">Tradisyonal nga Mandarin Chinese</language>
 		</languages>
 		<scripts>
-			<script type="Arab">Arabiko</script>
+			<script type="Arab">Arabic</script>
 			<script type="Cyrl">Cyrillic</script>
 			<script type="Hans">Pinasimple</script>
 			<script type="Hans" alt="stand-alone">Pinasimple nga Han</script>
@@ -64,7 +68,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<script type="Zzzz">Wala Mailhing Script</script>
 		</scripts>
 		<territories>
-			<territory type="001">kalibutan</territory>
+			<territory type="001">kalibotan</territory>
 			<territory type="002">Africa</territory>
 			<territory type="003">North America</territory>
 			<territory type="005">South America</territory>
@@ -149,6 +153,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clipperton Island</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cape Verde</territory>
@@ -288,7 +293,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<territory type="PE">Peru</territory>
 			<territory type="PF">French Polynesia</territory>
 			<territory type="PG">Papua New Guinea</territory>
-			<territory type="PH">Pilipinas</territory>
+			<territory type="PH">Philippines</territory>
 			<territory type="PK">Pakistan</territory>
 			<territory type="PL">Poland</territory>
 			<territory type="PM">St. Pierre &amp; Miquelon</territory>
@@ -342,6 +347,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
 			<territory type="TR">Turkiye</territory>
+			<territory type="TR" alt="variant">Turkey</territory>
 			<territory type="TT">Trinidad &amp; Tobago</territory>
 			<territory type="TV">Tuvalu</territory>
 			<territory type="TW">Taiwan</territory>
@@ -349,8 +355,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<territory type="UA">Ukraine</territory>
 			<territory type="UG">Uganda</territory>
 			<territory type="UM">U.S. Outlying Islands</territory>
-			<territory type="UN">Hiniusang Kanasoran</territory>
-			<territory type="US">Estados Unidos</territory>
+			<territory type="UN">United Nations</territory>
+			<territory type="US">United States</territory>
 			<territory type="US" alt="short">US</territory>
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Uzbekistan</territory>
@@ -380,8 +386,10 @@ the LDML specification (http://unicode.org/reports/tr35/)
 		</subdivisions>
 		<types>
 			<type key="calendar" type="gregorian">Gregorian nga Kalendaryo</type>
-			<type key="calendar" type="iso8601">Kalendaryo sa ISO-8601</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
+			<type key="calendar" type="iso8601">Gregorian nga Kalendaryo (Tuig Una)</type>
 			<type key="collation" type="standard">Standard nga Paagi sa Paghan-ay</type>
+			<type key="collation" type="standard" scope="core">Standard</type>
 			<type key="numbers" type="latn">Mga Western Digit</type>
 		</types>
 		<codePatterns>
@@ -507,6 +515,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							<greatestDifference id="d">MMM d – d, y G</greatestDifference>
 							<greatestDifference id="G">MMM d, y G – MMM d, y G</greatestDifference>
 							<greatestDifference id="M">MMM d – MMM d, y G</greatestDifference>
+							<greatestDifference id="y">MMM d, y – MMM d, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d, y G</greatestDifference>
@@ -599,7 +608,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							<month type="6">Hunyo</month>
 							<month type="7">Hulyo</month>
 							<month type="8">Agosto</month>
-							<month type="9">Septyembre</month>
+							<month type="9">Septiyembre</month>
 							<month type="10">Oktubre</month>
 							<month type="11">Nobyembre</month>
 							<month type="12">Disyembre</month>
@@ -629,7 +638,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							<month type="6">Hunyo</month>
 							<month type="7">Hulyo</month>
 							<month type="8">Agosto</month>
-							<month type="9">Septyembre</month>
+							<month type="9">Septiyembre</month>
 							<month type="10">Oktubre</month>
 							<month type="11">Nobyembre</month>
 							<month type="12">Disyembre</month>
@@ -678,7 +687,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							<quarter type="4">Q4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">unang quarter</quarter>
+							<quarter type="1">ika-1 nga quarter</quarter>
+							<quarter type="2">ika-2 nga quarter</quarter>
+							<quarter type="3">ika-3 nga quarter</quarter>
+							<quarter type="4">ika-4 nga quarter</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1">ika-1 nga quarter</quarter>
 							<quarter type="2">ika-2 nga quarter</quarter>
 							<quarter type="3">ika-3 nga quarter</quarter>
 							<quarter type="4">ika-4 nga quarter</quarter>
@@ -696,9 +713,9 @@ the LDML specification (http://unicode.org/reports/tr35/)
 				<eras>
 					<eraNames>
 						<era type="0">Sa Wala Pa Si Kristo</era>
-						<era type="0" alt="variant">Wala Pa ang Common Era</era>
+						<era type="0" alt="variant">Wala Pa ang Komon nga Panahon</era>
 						<era type="1">Anno Domini</era>
-						<era type="1" alt="variant">Komong Panahon</era>
+						<era type="1" alt="variant">Komon nga Panahon</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">BC</era>
@@ -788,11 +805,10 @@ the LDML specification (http://unicode.org/reports/tr35/)
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -823,21 +839,21 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G">M/d/y GGGGG – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="G">M/d/y G – M/d/y G</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G">E, M/d/y GGGGG – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="G">E, M/d/y G – E, M/d/y G</greatestDifference>
+							<greatestDifference id="M">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="y">E, M/d/y – E, M/d/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
@@ -971,7 +987,13 @@ the LDML specification (http://unicode.org/reports/tr35/)
 				<relative type="-1">miaging semana</relative>
 				<relative type="0">karong semanaha</relative>
 				<relative type="1">sunod nga semana</relative>
-				<relativePeriod>ang semana sa {0}</relativePeriod>
+				<relativePeriod>sa semana sa {0}</relativePeriod>
+			</field>
+			<field type="week-short">
+				<relativePeriod>sa semana sa {0}</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<relativePeriod>sa seman sa {0}</relativePeriod>
 			</field>
 			<field type="day">
 				<displayName>adlaw</displayName>
@@ -1015,14 +1037,13 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<regionFormat>Oras sa {0}</regionFormat>
 			<regionFormat type="daylight">Daylight nga Oras sa {0}</regionFormat>
 			<regionFormat type="standard">Standard nga Oras sa {0}</regionFormat>
-			<fallbackFormat>{1} {0}</fallbackFormat>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Coordinated Universal Time</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Wala Mailhing Lungsod</exemplarCity>
+				<exemplarCity>Wala Mailhing Lokasyon</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
@@ -1034,11 +1055,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					<daylight>Irish Standard Time</daylight>
 				</long>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity>Siyudad sa Ho Chi Minh</exemplarCity>
+				<exemplarCity>Ho Chi Minh City</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
@@ -1057,14 +1075,12 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>Standard nga Oras sa South Africa</standard>
+					<standard>South Africa Standard Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Oras sa West Africa</generic>
-					<standard>Standard nga Oras sa West Africa</standard>
-					<daylight>Oras sa Ting-init sa West Africa</daylight>
+					<standard>Oras sa West Africa</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1077,8 +1093,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Amazon">
 				<long>
 					<generic>Oras sa Amazon</generic>
-					<standard>Standard nga Oras sa Amazon</standard>
-					<daylight>Oras sa Ting-init sa Amazon</daylight>
+					<standard>Amazon Standard Time</standard>
+					<daylight>Amazon Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
@@ -1112,36 +1128,36 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Apia">
 				<long>
 					<generic>Oras sa Apia</generic>
-					<standard>Standard nga Oras sa Apia</standard>
-					<daylight>Daylight nga Oras sa Apia</daylight>
+					<standard>Samoa Standard Time</standard>
+					<daylight>Samoa Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
 					<generic>Oras sa Arabia</generic>
-					<standard>Standard nga Oras sa Arabia</standard>
-					<daylight>Daylight nga Oras sa Arabia</daylight>
+					<standard>Arabian Standard Time</standard>
+					<daylight>Arabian Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
 					<generic>Oras sa Argentina</generic>
-					<standard>Standard nga Oras sa Argentina</standard>
-					<daylight>Oras sa Ting-init sa Argentina</daylight>
+					<standard>Argentina Standard Time</standard>
+					<daylight>Argentina Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
 					<generic>Oras sa Western Argentina</generic>
-					<standard>Standard nga Oras sa Western Argentina</standard>
-					<daylight>Oras sa Ting-init sa Western Argentina</daylight>
+					<standard>Western Argentina Standard Time</standard>
+					<daylight>Western Argentina Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
 					<generic>Oras sa Armenia</generic>
-					<standard>Standard nga Oras sa Armenia</standard>
-					<daylight>Oras sa Ting-init sa Armenia</daylight>
+					<standard>Armenia Standard Time</standard>
+					<daylight>Armenia Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
@@ -1154,50 +1170,50 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Australia_Central">
 				<long>
 					<generic>Oras sa Central Australia</generic>
-					<standard>Standard nga Oras sa Central Australia</standard>
-					<daylight>Daylight nga Oras sa Central Australia</daylight>
+					<standard>Australian Central Standard Time</standard>
+					<daylight>Australian Central Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
 					<generic>Oras sa Central Western Australia</generic>
-					<standard>Standard nga Oras sa Central Western Australia</standard>
-					<daylight>Daylight nga Oras sa Central Western Australia</daylight>
+					<standard>Australian Central Western Standard Time</standard>
+					<daylight>Australian Central Western Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
 					<generic>Oras sa Eastern Australia</generic>
-					<standard>Standard nga Oras sa Eastern Australia</standard>
-					<daylight>Daylight nga Oras sa Eastern Australia</daylight>
+					<standard>Australian Eastern Standard Time</standard>
+					<daylight>Australian Eastern Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
 					<generic>Oras sa Western Australia</generic>
-					<standard>Standard nga Oras sa Western Australia</standard>
-					<daylight>Daylight nga Oras sa Western Australia</daylight>
+					<standard>Australian Western Standard Time</standard>
+					<daylight>Australian Western Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
 					<generic>Oras sa Azerbaijan</generic>
-					<standard>Standard nga Oras sa Azerbaijan</standard>
-					<daylight>Oras sa Ting-init sa Azerbaijan</daylight>
+					<standard>Azerbaijan Standard Time</standard>
+					<daylight>Azerbaijan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
 					<generic>Oras sa Azores</generic>
-					<standard>Standard nga Oras sa Azores</standard>
-					<daylight>Oras sa Ting-init sa Azores</daylight>
+					<standard>Azores Standard Time</standard>
+					<daylight>Azores Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
 					<generic>Oras sa Bangladesh</generic>
-					<standard>Standard nga Oras sa Bangladesh</standard>
-					<daylight>Oras sa Ting-init sa Bangladesh</daylight>
+					<standard>Bangladesh Standard Time</standard>
+					<daylight>Bangladesh Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
@@ -1213,8 +1229,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Brasilia">
 				<long>
 					<generic>Oras sa Brasilia</generic>
-					<standard>Standard nga Oras sa Brasilia</standard>
-					<daylight>Oras sa Ting-init sa Brasilia</daylight>
+					<standard>Brasilia Standard Time</standard>
+					<daylight>Brasilia Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
@@ -1225,34 +1241,34 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Cape_Verde">
 				<long>
 					<generic>Oras sa Cape Verde</generic>
-					<standard>Standard nga Oras sa Cape Verde</standard>
-					<daylight>Oras sa Ting-init sa Cape Verde</daylight>
+					<standard>Cape Verde Standard Time</standard>
+					<daylight>Cape Verde Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Standard nga Oras sa Chamorro</standard>
+					<standard>Chamorro Standard Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
 					<generic>Oras sa Chatham</generic>
-					<standard>Standard nga Oras sa Chatham</standard>
-					<daylight>Daylight nga Oras sa Chatham</daylight>
+					<standard>Chatham Standard Time</standard>
+					<daylight>Chatham Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
 					<generic>Oras sa Chile</generic>
-					<standard>Standard nga Oras sa Chile</standard>
-					<daylight>Oras sa Ting-init sa Chile</daylight>
+					<standard>Chile Standard Time</standard>
+					<daylight>Chile Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
 					<generic>Oras sa China</generic>
-					<standard>Standard nga Oras sa China</standard>
-					<daylight>Daylight nga Oras sa China</daylight>
+					<standard>China Standard Time</standard>
+					<daylight>China Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
@@ -1268,22 +1284,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Colombia">
 				<long>
 					<generic>Oras sa Colombia</generic>
-					<standard>Standard nga Oras sa Colombia</standard>
-					<daylight>Oras sa Ting-init sa Colombia</daylight>
+					<standard>Colombia Standard Time</standard>
+					<daylight>Colombia Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
 					<generic>Oras sa Cook Islands</generic>
-					<standard>Standard nga Oras sa Cook Islands</standard>
-					<daylight>Katungang Oras sa Ting-init sa Cook Islands</daylight>
+					<standard>Cook Islands Standard Time</standard>
+					<daylight>Cook Islands Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
 					<generic>Oras sa Cuba</generic>
-					<standard>Standard nga Oras sa Cuba</standard>
-					<daylight>Daylight nga Oras sa Cuba</daylight>
+					<standard>Cuba Standard Time</standard>
+					<daylight>Cuba Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -1304,8 +1320,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Easter">
 				<long>
 					<generic>Oras sa Easter Island</generic>
-					<standard>Standard nga Oras sa Easter Island</standard>
-					<daylight>Oras sa Ting-init sa Easter Island</daylight>
+					<standard>Easter Island Standard Time</standard>
+					<daylight>Easter Island Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
@@ -1316,15 +1332,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Europe_Central">
 				<long>
 					<generic>Oras sa Central Europe</generic>
-					<standard>Standard nga Oras sa Central Europe</standard>
-					<daylight>Oras sa Ting-init sa Central Europe</daylight>
+					<standard>Central European Standard Time</standard>
+					<daylight>Central European Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
 					<generic>Oras sa Eastern Europe</generic>
-					<standard>Standard nga Oras sa Eastern Europe</standard>
-					<daylight>Oras sa Ting-init sa Eastern Europe</daylight>
+					<standard>Eastern European Standard Time</standard>
+					<daylight>Eastern European Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
@@ -1335,22 +1351,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Europe_Western">
 				<long>
 					<generic>Oras sa Western Europe</generic>
-					<standard>Standard nga Oras sa Western Europe</standard>
-					<daylight>Oras sa Ting-init sa Western Europe</daylight>
+					<standard>Western European Standard Time</standard>
+					<daylight>Western European Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
 					<generic>Oras sa Falkland Islands</generic>
-					<standard>Standard nga Oras sa Falkland Islands</standard>
-					<daylight>Oras sa Ting-init sa Falkland Islands</daylight>
+					<standard>Falkland Islands Standard Time</standard>
+					<daylight>Falkland Islands Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
 					<generic>Oras sa Fiji</generic>
-					<standard>Standard nga Oras sa Fiji</standard>
-					<daylight>Oras sa Ting-init sa Fiji</daylight>
+					<standard>Fiji Standard Time</standard>
+					<daylight>Fiji Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
@@ -1376,8 +1392,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Georgia">
 				<long>
 					<generic>Oras sa Georgia</generic>
-					<standard>Standard nga Oras sa Georgia</standard>
-					<daylight>Oras sa Ting-init sa Georgia</daylight>
+					<standard>Georgia Standard Time</standard>
+					<daylight>Georgia Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
@@ -1393,20 +1409,20 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>Oras sa East Greenland</generic>
-					<standard>Standard nga Oras sa East Greenland</standard>
-					<daylight>Oras sa Ting-init sa East Greenland</daylight>
+					<standard>East Greenland Standard Time</standard>
+					<daylight>East Greenland Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
 					<generic>Oras sa West Greenland</generic>
-					<standard>Standard nga Oras sa West Greenland</standard>
-					<daylight>Oras sa Ting-init sa West Greenland</daylight>
+					<standard>West Greenland Standard Time</standard>
+					<daylight>West Greenland Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Standard nga Oras sa Gulf</standard>
+					<standard>Gulf Standard Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -1414,30 +1430,35 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					<standard>Oras sa Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutian Standard Time</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Oras sa Hawaii-Aleutian</generic>
-					<standard>Standard nga Oras sa Hawaii-Aleutian</standard>
-					<daylight>Daylight nga Oras sa Hawaii-Aleutian</daylight>
+					<standard>Hawaii-Aleutian Standard Time</standard>
+					<daylight>Hawaii-Aleutian Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
 					<generic>Oras sa Hong Kong</generic>
-					<standard>Standard nga Oras sa Hong Kong</standard>
-					<daylight>Oras sa Ting-init sa Hong Kong</daylight>
+					<standard>Hong Kong Standard Time</standard>
+					<daylight>Hong Kong Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
 					<generic>Oras sa Hovd</generic>
-					<standard>Standard nga Oras sa Hovd</standard>
-					<daylight>Oras sa Ting-init sa Hovd</daylight>
+					<standard>Khovd Standard Time</standard>
+					<daylight>Khovd Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Standard nga Oras sa India</standard>
+					<standard>India Standard Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -1468,29 +1489,29 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Iran">
 				<long>
 					<generic>Oras sa Iran</generic>
-					<standard>Standard nga Oras sa Iran</standard>
-					<daylight>Daylight nga Oras sa Iran</daylight>
+					<standard>Iran Standard Time</standard>
+					<daylight>Iran Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
 					<generic>Oras sa Irkutsk</generic>
-					<standard>Standard nga Oras sa Irkutsk</standard>
-					<daylight>Oras sa Ting-init sa Irkutsk</daylight>
+					<standard>Irkutsk Standard Time</standard>
+					<daylight>Irkutsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
 					<generic>Oras sa Israel</generic>
-					<standard>Standard nga Oras sa Israel</standard>
-					<daylight>Daylight nga Oras sa Israel</daylight>
+					<standard>Israel Standard Time</standard>
+					<daylight>Israel Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Oras sa Japan</generic>
-					<standard>Standard nga Oras sa Japan</standard>
-					<daylight>Daylight nga Oras sa Japan</daylight>
+					<standard>Japan Standard Time</standard>
+					<daylight>Japan Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
@@ -1511,8 +1532,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Korea">
 				<long>
 					<generic>Oras sa Korea</generic>
-					<standard>Standard nga Oras sa Korea</standard>
-					<daylight>Daylight nga Oras sa Korea</daylight>
+					<standard>Korean Standard Time</standard>
+					<daylight>Korean Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -1523,8 +1544,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Krasnoyarsk">
 				<long>
 					<generic>Oras sa Krasnoyarsk</generic>
-					<standard>Standard nga Oras sa Krasnoyarsk</standard>
-					<daylight>Oras sa Ting-init sa Krasnoyarsk</daylight>
+					<standard>Krasnoyarsk Standard Time</standard>
+					<daylight>Krasnoyarsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
@@ -1540,15 +1561,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Lord_Howe">
 				<long>
 					<generic>Oras sa Lord Howe</generic>
-					<standard>Standard nga Oras sa Lord Howe</standard>
-					<daylight>Daylight nga Oras sa Lord Howe</daylight>
+					<standard>Lord Howe Standard Time</standard>
+					<daylight>Lord Howe Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Oras sa Magadan</generic>
-					<standard>Standard nga Oras sa Magadan</standard>
-					<daylight>Oras sa Ting-init sa Magadan</daylight>
+					<standard>Magadan Standard Time</standard>
+					<daylight>Magadan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
@@ -1574,8 +1595,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Mauritius">
 				<long>
 					<generic>Oras sa Mauritius</generic>
-					<standard>Standard nga Oras sa Mauritius</standard>
-					<daylight>Oras sa Ting-init sa Mauritius</daylight>
+					<standard>Mauritius Standard Time</standard>
+					<daylight>Mauritius Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
@@ -1586,22 +1607,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Oras sa Mexican Pacific</generic>
-					<standard>Standard nga Oras sa Mexican Pacific</standard>
-					<daylight>Daylight nga Oras sa Mexican Pacific</daylight>
+					<standard>Mexican Pacific Standard Time</standard>
+					<daylight>Mexican Pacific Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
 					<generic>Oras sa Ulaanbaatar</generic>
-					<standard>Standard nga Oras sa Ulaanbaatar</standard>
-					<daylight>Oras sa Ting-init sa Ulaanbaatar</daylight>
+					<standard>Ulaanbaatar Standard Time</standard>
+					<daylight>Ulaanbaatar Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
 					<generic>Oras sa Moscow</generic>
-					<standard>Standard nga Oras sa Moscow</standard>
-					<daylight>Oras sa Ting-init sa Moscow</daylight>
+					<standard>Moscow Standard Time</standard>
+					<daylight>Moscow Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
@@ -1622,22 +1643,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="New_Caledonia">
 				<long>
 					<generic>Oras sa New Caledonia</generic>
-					<standard>Standard nga Oras sa New Caledonia</standard>
-					<daylight>Oras sa Ting-init sa New Caledonia</daylight>
+					<standard>New Caledonia Standard Time</standard>
+					<daylight>New Caledonia Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
 					<generic>Oras sa New Zealand</generic>
-					<standard>Standard nga Oras sa New Zealand</standard>
-					<daylight>Daylight nga Oras sa New Zealand</daylight>
+					<standard>New Zealand Standard Time</standard>
+					<daylight>New Zealand Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
 					<generic>Oras sa Newfoundland</generic>
-					<standard>Standard nga Oras sa Newfoundland</standard>
-					<daylight>Daylight nga Oras sa Newfoundland</daylight>
+					<standard>Newfoundland Standard Time</standard>
+					<daylight>Newfoundland Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -1648,36 +1669,36 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Norfolk">
 				<long>
 					<generic>Oras sa Norfolk Island</generic>
-					<standard>Standard nga Oras sa Norfolk Island</standard>
-					<daylight>Daylight nga Oras sa Norfolk Island</daylight>
+					<standard>Norfolk Island Standard Time</standard>
+					<daylight>Norfolk Island Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
 					<generic>Oras sa Fernando de Noronha</generic>
-					<standard>Standard nga Oras sa Fernando de Noronha</standard>
-					<daylight>Oras sa Ting-init sa Fernando de Noronha</daylight>
+					<standard>Fernando de Noronha Standard Time</standard>
+					<daylight>Fernando de Noronha Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
 					<generic>Oras sa Novosibirsk</generic>
-					<standard>Standard nga Oras sa Novosibirsk</standard>
-					<daylight>Oras sa Ting-init sa Novosibirsk</daylight>
+					<standard>Novosibirsk Standard Time</standard>
+					<daylight>Novosibirsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
 					<generic>Oras sa Omsk</generic>
-					<standard>Standard nga Oras sa Omsk</standard>
-					<daylight>Oras sa Ting-init sa Omsk</daylight>
+					<standard>Omsk Standard Time</standard>
+					<daylight>Omsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
 					<generic>Oras sa Pakistan</generic>
-					<standard>Standard nga Oras sa Pakistan</standard>
-					<daylight>Oras sa Ting-init sa Pakistan</daylight>
+					<standard>Pakistan Standard Time</standard>
+					<daylight>Pakistan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
@@ -1693,22 +1714,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Paraguay">
 				<long>
 					<generic>Oras sa Paraguay</generic>
-					<standard>Standard nga Oras sa Paraguay</standard>
-					<daylight>Oras sa Ting-init sa Paraguay</daylight>
+					<standard>Paraguay Standard Time</standard>
+					<daylight>Paraguay Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
 					<generic>Oras sa Peru</generic>
-					<standard>Standard nga Oras sa Peru</standard>
-					<daylight>Oras sa Ting-init sa Peru</daylight>
+					<standard>Peru Standard Time</standard>
+					<daylight>Peru Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
 					<generic>Oras sa Pilipinas</generic>
-					<standard>Standard nga Oras sa Pilipinas</standard>
-					<daylight>Oras sa Ting-init sa Pilipinas</daylight>
+					<standard>Philippine Standard Time</standard>
+					<daylight>Philippine Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
@@ -1719,8 +1740,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Pierre_Miquelon">
 				<long>
 					<generic>Oras sa St. Pierre &amp; Miquelon</generic>
-					<standard>Standard nga Oras sa St. Pierre &amp; Miquelon</standard>
-					<daylight>Daylight nga Oras sa St. Pierre &amp; Miquelon</daylight>
+					<standard>St. Pierre &amp; Miquelon Standard Time</standard>
+					<daylight>St. Pierre &amp; Miquelon Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -1751,15 +1772,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Sakhalin">
 				<long>
 					<generic>Oras sa Sakhalin</generic>
-					<standard>Standard nga Oras sa Sakhalin</standard>
-					<daylight>Oras sa Ting-init sa Sakhalin</daylight>
+					<standard>Sakhalin Standard Time</standard>
+					<daylight>Sakhalin Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samoa">
 				<long>
 					<generic>Oras sa Samoa</generic>
-					<standard>Standard nga Oras sa Samoa</standard>
-					<daylight>Daylight nga Oras sa Samoa</daylight>
+					<standard>American Samoa Standard Time</standard>
+					<daylight>American Samoa Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -1769,7 +1790,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard>Standard nga Oras sa Singapore</standard>
+					<standard>Singapore Standard Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
@@ -1799,9 +1820,9 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Oras sa Taipei</generic>
-					<standard>Standard nga Oras sa Taipei</standard>
-					<daylight>Daylight nga Oras sa Taipei</daylight>
+					<generic>Oras sa Taiwan</generic>
+					<standard>Taiwan Standard Time</standard>
+					<daylight>Taiwan Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -1817,8 +1838,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Tonga">
 				<long>
 					<generic>Oras sa Tonga</generic>
-					<standard>Standard nga Oras sa Tonga</standard>
-					<daylight>Oras sa Ting-init sa Tonga</daylight>
+					<standard>Tonga Standard Time</standard>
+					<daylight>Tonga Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
@@ -1829,8 +1850,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Oras sa Turkmenistan</generic>
-					<standard>Standard nga Oras sa Turkmenistan</standard>
-					<daylight>Oras sa Ting-init sa Turkmenistan</daylight>
+					<standard>Turkmenistan Standard Time</standard>
+					<daylight>Turkmenistan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
@@ -1841,22 +1862,22 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Uruguay">
 				<long>
 					<generic>Oras sa Uruguay</generic>
-					<standard>Standard nga Oras sa Uruguay</standard>
-					<daylight>Oras sa Ting-init sa Uruguay</daylight>
+					<standard>Uruguay Standard Time</standard>
+					<daylight>Uruguay Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
 					<generic>Oras sa Uzbekistan</generic>
-					<standard>Standard nga Oras sa Uzbekistan</standard>
-					<daylight>Oras sa Ting-init sa Uzbekistan</daylight>
+					<standard>Uzbekistan Standard Time</standard>
+					<daylight>Uzbekistan Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
 					<generic>Oras sa Vanuatu</generic>
-					<standard>Standard nga Oras sa Vanuatu</standard>
-					<daylight>Oras sa Ting-init sa Vanuatu</daylight>
+					<standard>Vanuatu Standard Time</standard>
+					<daylight>Vanuatu Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
@@ -1867,15 +1888,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Vladivostok">
 				<long>
 					<generic>Oras sa Vladivostok</generic>
-					<standard>Standard nga Oras sa Vladivostok</standard>
-					<daylight>Oras sa Ting-init sa Vladivostok</daylight>
+					<standard>Vladivostok Standard Time</standard>
+					<daylight>Vladivostok Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
 					<generic>Oras sa Volgograd</generic>
-					<standard>Standard nga Oras sa Volgograd</standard>
-					<daylight>Oras sa Ting-init sa Volgograd</daylight>
+					<standard>Volgograd Standard Time</standard>
+					<daylight>Volgograd Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
@@ -1896,15 +1917,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<metazone type="Yakutsk">
 				<long>
 					<generic>Oras sa Yakutsk</generic>
-					<standard>Standard nga Oras sa Yakutsk</standard>
-					<daylight>Oras sa Ting-init sa Yakutsk</daylight>
+					<standard>Yakutsk Standard Time</standard>
+					<daylight>Yakutsk Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
 					<generic>Oras sa Yekaterinburg</generic>
-					<standard>Standard nga Oras sa Yekaterinburg</standard>
-					<daylight>Oras sa Ting-init sa Yekaterinburg</daylight>
+					<standard>Yekaterinburg Standard Time</standard>
+					<daylight>Yekaterinburg Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yukon">
@@ -1915,11 +1936,50 @@ the LDML specification (http://unicode.org/reports/tr35/)
 		</timeZoneNames>
 	</dates>
 	<numbers>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0 ka libo</pattern>
+					<pattern type="1000" count="other">0 ka libo</pattern>
+					<pattern type="10000" count="one">00 ka libo</pattern>
+					<pattern type="10000" count="other">00 ka libo</pattern>
+					<pattern type="100000" count="one">000 ka libo</pattern>
+					<pattern type="100000" count="other">000 ka libo</pattern>
+					<pattern type="1000000" count="one">0 ka milyon</pattern>
+					<pattern type="1000000" count="other">0 ka milyon</pattern>
+					<pattern type="10000000" count="one">00 ka milyon</pattern>
+					<pattern type="10000000" count="other">00 ka milyon</pattern>
+					<pattern type="100000000" count="one">000 ka milyon</pattern>
+					<pattern type="100000000" count="other">000 ka milyon</pattern>
+					<pattern type="1000000000" count="one">0 ka bilyon</pattern>
+					<pattern type="1000000000" count="other">0 ka bilyon</pattern>
+					<pattern type="10000000000" count="one">00 ka bilyon</pattern>
+					<pattern type="10000000000" count="other">00 ka bilyon</pattern>
+					<pattern type="100000000000" count="one">000 ka bilyon</pattern>
+					<pattern type="100000000000" count="other">000 ka bilyon</pattern>
+					<pattern type="1000000000000" count="one">0 ka trilyon</pattern>
+					<pattern type="1000000000000" count="other">0 ka trilyon</pattern>
+					<pattern type="10000000000000" count="one">00 ka trilyon</pattern>
+					<pattern type="10000000000000" count="other">00 ka trilyon</pattern>
+					<pattern type="100000000000000" count="one">000 ka trilyon</pattern>
+					<pattern type="100000000000000" count="other">000 ka trilyon</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000000000" count="one">0B</pattern>
+					<pattern type="1000000000" count="other">0B</pattern>
+					<pattern type="10000000000" count="one">00B</pattern>
+					<pattern type="10000000000" count="other">00B</pattern>
+					<pattern type="100000000000" count="one">000B</pattern>
+					<pattern type="100000000000" count="other">000B</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -1927,6 +1987,58 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
+					<pattern type="1000000000" count="one">¤0B</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0B</pattern>
+					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B</pattern>
+					<pattern type="10000000000" count="one">¤00B</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00B</pattern>
+					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B</pattern>
+					<pattern type="100000000000" count="one">¤000B</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000B</pattern>
+					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="other">{1} {0}</unitPattern>
 		</currencyFormats>
@@ -2094,7 +2206,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<currency type="CRC">
 				<displayName>Costa Rican Colon</displayName>
 				<displayName count="one">Costa Rican colon</displayName>
-				<displayName count="other">Costa Rican colóns</displayName>
+				<displayName count="other">Costa Rican colons</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName>Cuban Convertible Peso</displayName>
@@ -2434,7 +2546,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<currency type="NIO">
 				<displayName>Nicaraguan Cordoba</displayName>
 				<displayName count="one">Nicaraguan cordoba</displayName>
-				<displayName count="other">Nicaraguan córdobas</displayName>
+				<displayName count="other">Nicaraguan cordobas</displayName>
 			</currency>
 			<currency type="NOK">
 				<displayName>Norwegian Krone</displayName>
@@ -2579,7 +2691,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<currency type="STN">
 				<displayName>Sao Tome &amp; Principe Dobra</displayName>
 				<displayName count="one">Sao Tome &amp; Principe dobra</displayName>
-				<displayName count="other">São Tomé &amp; Príncipe dobras</displayName>
+				<displayName count="other">Sao Tome &amp; Principe dobras</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName>Syrian Pound</displayName>
@@ -2665,7 +2777,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<currency type="VES">
 				<displayName>Venezuelan Bolivar</displayName>
 				<displayName count="one">Venezuelan bolivar</displayName>
-				<displayName count="other">Venezuelan bolívars</displayName>
+				<displayName count="other">Venezuelan bolivars</displayName>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamese Dong</displayName>
@@ -2692,6 +2804,11 @@ the LDML specification (http://unicode.org/reports/tr35/)
 				<displayName count="one">East Caribbean dollar</displayName>
 				<displayName count="other">East Caribbean dollars</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Carribean guilder</displayName>
+				<displayName count="one">Carribean guilder</displayName>
+				<displayName count="other">Carribean guilder</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>West African CFA Franc</displayName>
 				<displayName count="one">West African CFA franc</displayName>
@@ -2722,6 +2839,11 @@ the LDML specification (http://unicode.org/reports/tr35/)
 				<displayName count="one">Zambian kwacha</displayName>
 				<displayName count="other">Zambian kwachas</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwean Gold</displayName>
+				<displayName count="one">Zimbabwean Gold</displayName>
+				<displayName count="other">Zimbabwean Gold</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -2928,7 +3050,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 				<unitPattern count="one">{0} ka millimole kada litro</unitPattern>
 				<unitPattern count="other">{0} ka mga millimole kada litro</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>mga part per million</displayName>
 				<unitPattern count="one">{0} ka part per million</unitPattern>
 				<unitPattern count="other">{0} ka mga part per million</unitPattern>
@@ -3736,7 +3858,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			<unit type="concentr-millimole-per-liter">
 				<displayName>millimol/litro</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>mga part/million</displayName>
 			</unit>
 			<unit type="concentr-percent">
diff --git a/make/data/cldr/common/main/chr.xml b/make/data/cldr/common/main/chr.xml
index 64fdcf84734..492f616e627 100644
--- a/make/data/cldr/common/main/chr.xml
+++ b/make/data/cldr/common/main/chr.xml
@@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">ᎠᏎᏆᏣᏂ</language>
 			<language type="az" alt="short">ᎠᏎᎵ</language>
 			<language type="ba">ᏆᏍᎯᎩᎠ</language>
+			<language type="bal">ᏆᎷᏥ</language>
 			<language type="ban">ᏆᎵᏁᏏ</language>
 			<language type="bas">ᏆᏌᎠ</language>
 			<language type="be">ᏇᎳᎷᏏ</language>
@@ -224,6 +225,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">ᏆᏫᎠ</language>
 			<language type="ksh">ᎪᎶᏂᎠᏂ</language>
 			<language type="ku">ᎫᏗᏏ</language>
+			<language type="ku" menu="core">ᎫᏗᏍᎯ</language>
+			<language type="ku" menu="extension">ᎫᎹᏥ</language>
 			<language type="kum">ᎫᎻᎧ</language>
 			<language type="kv">ᎪᎻ</language>
 			<language type="kw">ᏎᎷᎭ</language>
@@ -619,6 +622,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">ᏓᎶᏂᎨᏍᏛ</territory>
 			<territory type="CO">ᎪᎸᎻᏈᎢᎠ</territory>
 			<territory type="CP">ᎦᏂᏴᏔᏅᎣᏓᎸ ᎤᎦᏚᏛᎢ</territory>
+			<territory type="CQ">ᏌᎬ</territory>
 			<territory type="CR">ᎪᏍᏓ ᎵᎧ</territory>
 			<territory type="CU">ᎫᏆ</territory>
 			<territory type="CV">ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ</territory>
@@ -847,42 +851,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">ᎠᏕᎳ ᏱᎬᏁᎸᎯ</key>
 			<key type="collation">ᏗᎦᏅᏃᏙᏗ ᏕᎦᏅᏃᏛᎢ</key>
 			<key type="currency">ᎠᏕᎳ</key>
+			<key type="em">ᎢᎼᏥ ᏓᎾᏓᏁᎲᎢ</key>
 			<key type="hc">ᏑᏟᎶᏓ ᎠᏓᏁᏟᏴᏎᎬ (12 vs 24)</key>
 			<key type="lb">ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ</key>
+			<key type="lw">ᎠᏍᏓᏅᏅ ᎠᏍᏆᎵᏍᏗ ᎪᏪᎵ</key>
 			<key type="ms">ᎠᏟᎶᏛ ᏄᏍᏗᏓᏅᎢ</key>
 			<key type="numbers">ᏗᏎᏍᏗ</key>
+			<key type="ss">ᏗᏒᏍᏙᏗ ᎠᏍᏆᎵᏍᏗ ᎠᏂᏬ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ᏊᏗᏍᏘ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="buddhist" scope="core">ᏊᏗᏍᏘ</type>
 			<type key="calendar" type="chinese">ᏓᎶᏂᎨᏍᏛ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="chinese" scope="core">ᏓᎶᏂᎨᏍᏛ</type>
 			<type key="calendar" type="coptic">ᎧᏘ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="coptic" scope="core">ᎧᏘ</type>
 			<type key="calendar" type="dangi">ᏓᏂᎩ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="dangi" scope="core">ᏓᏂᎩ</type>
 			<type key="calendar" type="ethiopic">ᎢᏗᏯᏈᎩ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="ethiopic" scope="core">ᎡᏘᎣᏈᎠ</type>
 			<type key="calendar" type="ethiopic-amete-alem">ᎡᏘᎣᏈᎠ ᎠᎺᏖ ᎠᎴᎻ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ᎡᏘᎣᏈᎠ ᎠᎺᏖ ᎠᎴᎻ</type>
 			<type key="calendar" type="gregorian">ᎩᎴᎪᎵᎠᏂ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="gregorian" scope="core">ᎩᎴᎪᎵᎠᏂ</type>
 			<type key="calendar" type="hebrew">ᎠᏂᏈᎷ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="hebrew" scope="core">ᎠᏂᏈᎷ</type>
 			<type key="calendar" type="islamic">ᎢᏍᎳᎻᎩ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="islamic" scope="core">ᎢᏌᎳᎻᎩ</type>
 			<type key="calendar" type="islamic-civil">ᎢᏌᎳᎻᎩ ᏅᏙ ᏗᏎᏍᏗ (ᏴᏫ ᎡᏆᎩ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ᎢᏌᎳᎻᎩ (ᏴᏫ ᎡᏆᎩ)</type>
 			<type key="calendar" type="islamic-umalqura">ᎢᏌᎳᎻᎩ ᏅᏙ ᏗᏎᏍᏗ (ᎥᎻ ᎠᎵ-ᏊᎳ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ᎢᏌᎳᎻᎩ (ᎥᎻ ᎠᎵ-ᏊᎳ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 ᏅᏙ ᏗᏎᏍᏗ</type>
 			<type key="calendar" type="japanese">ᏣᏆᏂᏏ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="japanese" scope="core">ᏣᏆᏂᏏ</type>
 			<type key="calendar" type="persian">ᏇᏏᎠᏂ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="persian" scope="core">ᏇᏏᎠᏂ</type>
 			<type key="calendar" type="roc">ᏍᎦᏚᎩ ᎾᎿ ᏓᎶᏂᎨᏍᏛ ᏅᏙ ᏗᏎᏍᏗ</type>
+			<type key="calendar" type="roc" scope="core">ᏍᎦᏚᎩ ᎾᎿ ᏓᎶᏂᎨᏍᏛ</type>
 			<type key="cf" type="account">ᎠᏕᎳ ᏗᏎᎯᎯ ᎠᏕᎳ ᏱᎬᏁᎸᎯ</type>
+			<type key="cf" type="account" scope="core">ᎠᏕᎳ ᏗᏎᎯᎯ</type>
 			<type key="cf" type="standard">ᎠᏟᎶᏍᏗ ᎠᏕᎳ ᏱᎬᏁᎸᎯ</type>
+			<type key="cf" type="standard" scope="core">ᎠᏟᎶᏍᏗ</type>
 			<type key="collation" type="ducet">ᎠᏓᏁᏟᏴᏗᏍᎩ Unicode ᏗᎦᏅᏃᏙᏗ ᏕᎦᏅᏃᏛᎢ</type>
+			<type key="collation" type="ducet" scope="core">ᎠᏓᏁᏟᏴᏗᏍᎩ Unicode</type>
 			<type key="collation" type="search">ᏂᎦᎥ-ᎢᏳᏱᎸᏗ ᎠᏱᏍᏗ</type>
+			<type key="collation" type="search" scope="core">ᎠᏱᏍᏗ</type>
 			<type key="collation" type="standard">ᎠᏟᎶᏍᏗ ᏗᎦᏅᏃᏙᏗ ᏕᎦᏅᏃᏛᎢ</type>
+			<type key="collation" type="standard" scope="core">ᎠᏟᎶᏍᏗ</type>
+			<type key="em" type="default" scope="core">ᎠᏓᏁᏟᏴᏗᏍᎩ</type>
+			<type key="em" type="emoji" scope="core">ᎢᎼᏥ</type>
+			<type key="em" type="text" scope="core">ᏕᎪᏪᎸ</type>
 			<type key="hc" type="h11">12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ᏩᎾᎢ ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ</type>
+			<type key="lb" type="loose" scope="core">ᏩᎾᎢ ᎠᏍᏓᏅᏅ</type>
 			<type key="lb" type="normal">ᏱᎬᏍᏗᎭᏊ ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ</type>
+			<type key="lb" type="normal" scope="core">ᏱᎬᏍᏗᎭᏊ</type>
 			<type key="lb" type="strict">ᎤᎶᏒᏍᏔᏅᎯ ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ</type>
+			<type key="lb" type="strict" scope="core">ᎤᎶᏒᏍᏔᏅᎯ</type>
+			<type key="lw" type="breakall" scope="core">ᎠᏍᏆᎵᏍᏗ ᏂᎦᏓ</type>
+			<type key="lw" type="keepall" scope="core">ᎠᏍᏆᏂᎪᏙᏗ ᏂᎦᏓ</type>
+			<type key="lw" type="normal" scope="core">ᏱᎬᏍᏗᎭᏊ</type>
+			<type key="lw" type="phrase" scope="core">ᎠᏍᏆᏂᎪᏙᏗ ᎾᎿ ᎪᏪᎵ</type>
 			<type key="ms" type="metric">ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏄᏍᏗᏓᏅᎢ</type>
+			<type key="ms" type="metric" scope="core">ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ</type>
 			<type key="ms" type="uksystem">ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎠᏟᎶᏛ ᏄᏍᏗᏓᏅᎢ</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">US ᎠᏟᎶᏛ ᏄᏍᏗᏓᏅᎢ</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">ᎠᎳᏈ-ᎡᏂᏗᎩ ᏗᏎᏍᏗ</type>
 			<type key="numbers" type="arabext">ᎦᏅᎯᏛ ᎠᎳᏈ-ᎡᏂᏗᎩ ᏗᏎᏍᏗ</type>
 			<type key="numbers" type="armn">ᎠᎳᎻᎠᏂ ᏗᏎᏍᏗ</type>
@@ -923,6 +966,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">ᏔᏱ ᏗᏎᏍᏗ</type>
 			<type key="numbers" type="tibt">ᏘᏇᏔᏂ ᏗᏎᏍᏗ</type>
 			<type key="numbers" type="vaii">ᏩᏱ ᏗᏎᏍᏗ</type>
+			<type key="ss" type="none" scope="core">ᎤᏣᏘᎾ</type>
+			<type key="ss" type="standard" scope="core">ᎾᎿ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ</measurementSystemName>
@@ -940,9 +985,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":" draft="contributed">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£" draft="contributed">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-" draft="contributed">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample="," draft="contributed">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1007,7 +1049,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -1343,6 +1387,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} ᎤᎾᎢ {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} ᎤᎾᎢ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1351,6 +1398,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} ᎤᎾᎢ {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} ᎤᎾᎢ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1365,7 +1415,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -2038,11 +2090,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat type="daylight">{0} ᎪᎯ ᎢᎦ ᎠᏟᎢᎵᏒ</regionFormat>
 			<regionFormat type="standard">{0} ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
 				<exemplarCity>ᎭᏃᎷᎷ</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2395,6 +2442,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>ᏥᏌᏕᎴᎯᏌᏅ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ᎪᎭᎢᏇ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ᏊᏔ ᎡᏫᎾᏍ</exemplarCity>
 			</zone>
@@ -2660,9 +2710,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ᎿᎻ ᏇᏂ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ᎡᏂᏇᎵ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ᎧᏛᏂ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3332,9 +3379,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ ᎠᏟᎢᎵᏒ</generic>
-					<standard>ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ</standard>
-					<daylight>ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ ᎪᎩ ᎠᏟᎢᎵᏒ</daylight>
+					<standard>ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ ᎠᏟᎢᎵᏒ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3714,6 +3759,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ᎦᏯᎾ ᎠᏟᎢᎵᏒ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ᎭᏩᏱ-ᎠᎵᏳᏏᎠᏂ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ</standard>
+				</long>
+				<short>
+					<standard>HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ᎭᏩᏱ-ᎠᎵᏳᏏᎠᏂ ᎠᏟᎢᎵᏒ</generic>
@@ -4264,7 +4317,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4803,6 +4855,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>ᏗᎧᎸᎬ ᎨᏆᏙᏯ ᎠᏕᎳ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ᎧᏈᏇᎠᎾ</displayName>
+				<displayName count="one">ᎧᏈᏇᎠᎾ ᎠᏕᎳ</displayName>
+				<displayName count="other">ᎧᏈᏇᎠᎾ ᎠᏕᎳ</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ</displayName>
 			</currency>
@@ -4823,6 +4880,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZMW">
 				<displayName>ᏏᎻᏆᏇ ᎠᏕᎳ</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ᏏᎻᏆᏇᎠᏂ</displayName>
+				<displayName count="one">ᏏᎻᏆᏇᎠᏂ ᎠᏕᎳ</displayName>
+				<displayName count="other">ᏏᎻᏆᏇᎠᏂ ᎠᏕᎳ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5042,7 +5104,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎼᎵ ᎵᏔᎢ ᎢᏳᏓᎵ</unitPattern>
 				<unitPattern count="other">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏂᎼᎵ ᎵᏔᎢ ᎢᏳᏓᎵ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ᎢᎦᏛ</displayName>
+				<unitPattern count="one">{0} ᎢᎦᏛ</unitPattern>
+				<unitPattern count="other">{0} ᎢᎦᏛᎭ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ</displayName>
 				<unitPattern count="one">{0} ᎤᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ</unitPattern>
 				<unitPattern count="other">{0} ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ</unitPattern>
@@ -5064,6 +5131,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᎼᎴ</unitPattern>
 				<unitPattern count="other">{0} ᎼᎴᏍ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ᎾᎿ ᎦᎷᎪᏏ</displayName>
+				<unitPattern count="one">{0} ᎾᎿ ᎦᎷᎪᏏ</unitPattern>
+				<unitPattern count="other">{0} ᎾᎿ ᎦᎷᎪᏏ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ᏗᎵᏔᎢ ᎠᎦᏴᎵ ᎠᏟᎶᏍᏗ ᎢᏳᏓᎵ</displayName>
 				<unitPattern count="one">{0} ᎵᏔᎢ ᎠᎦᏴᎵ ᎠᏟᎶᏍᏗ ᎢᏳᏓᎵ</unitPattern>
@@ -5547,6 +5619,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏟᎶᏗ ᎾᎿ ᎹᎫᎢ</unitPattern>
 				<unitPattern count="other">{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏗ ᎾᎿ ᎹᎫᎢ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ᎾᎿ ᎹᎫᎢ</displayName>
+				<unitPattern count="one">{0} ᎾᎿ ᎹᎫᎢ</unitPattern>
+				<unitPattern count="other">{0} ᎾᎿ ᎹᎫᎢ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ᎢᏧᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ</displayName>
 				<unitPattern count="one">{0} ᏑᏓᎨᏓ ᏅᎩ ᏧᏅᏏᎩ ᎢᏏᏔᏗᏍᏗ ᎢᏳᏓᎵ</unitPattern>
@@ -5719,6 +5796,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᎵᏍᏈᏗ</unitPattern>
 				<unitPattern count="other">{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏧᎵᏍᏈᏗ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎢᏯᎣᏂᏏ</displayName>
+				<unitPattern count="one">ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎣᏂᏏ</unitPattern>
+				<unitPattern count="other">{0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎢᏯᎣᏂᏏ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} ᏑᏟᎶᏛ-ᎢᎳᏏᏗ</unitPattern>
 				<unitPattern count="other">{0} ᏑᏟᎶᏛ-ᎢᏗᎳᏏᏗ</unitPattern>
@@ -5796,22 +5878,76 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ</unitPattern>
 				<unitPattern count="other">{0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ᎠᏨᏍᏗ</displayName>
-				<unitPattern count="one">{0} ᎠᏨᏍᏗ</unitPattern>
-				<unitPattern count="other">{0} ᎠᏨᏍᏗ</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ᏍᏘᏇᏗᎠᏂᏍ</displayName>
+				<unitPattern count="one">{0} ᏍᏘᏇᏗᎠᏂ</unitPattern>
+				<unitPattern count="other">{0} ᏍᏘᏇᏗᎠᏂᏍ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>ᎧᏔᎵᏍ</displayName>
+				<unitPattern count="one">{0} ᎧᏔᎵ</unitPattern>
+				<unitPattern count="other">{0} ᎧᏔᎵᏍ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ᎠᏂᎪᎶᎻᏍ</displayName>
+				<unitPattern count="one">{0} ᎪᎶᎻᏍ</unitPattern>
+				<unitPattern count="other">{0} ᎠᏂᎪᎶᎻᏍ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ᏆᏇᏗᏍ</displayName>
+				<unitPattern count="one">{0} ᏆᏇᏗ</unitPattern>
+				<unitPattern count="other">{0} ᏆᏇᏗᏍ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ᎯᏂᏫᏍ</displayName>
+				<unitPattern count="one">{0} ᎯᏂᏫ</unitPattern>
+				<unitPattern count="other">{0} ᎯᏂᏫᏍ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ᏏᎺᏂᏍ</displayName>
+				<unitPattern count="one">{0} ᏏᎺᏂᏍ</unitPattern>
+				<unitPattern count="other">{0} ᏏᎺᏂᏍ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ᏗᏓᎵᏥᏍᏗᏍᎩ [IT]</displayName>
+				<unitPattern count="one">{0} ᎠᏓᎵᏥᏍᏗᏍᎩ [IT]</unitPattern>
+				<unitPattern count="other">{0} ᏗᏓᎵᏥᏍᏗᏍᎩ [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ᏘᎯ ᎠᎩᎪᏍᎦ</displayName>
+				<unitPattern count="one">{0} ᏘᎯ ᎠᎩᎪᏍᎦ</unitPattern>
+				<unitPattern count="other">{0} ᏘᎯ ᏗᎩᎪᏍᎦ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ᏗᏏᏇᏘ</displayName>
+				<unitPattern count="one">{0} ᏏᏇᏘ</unitPattern>
+				<unitPattern count="other">{0} ᏗᏏᏇᏘ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ᎤᏍᎪᎸ ᎠᏂᏌᎪᏂᎨ</displayName>
+				<unitPattern count="one">{0} ᎤᏍᎪᎸ ᏌᎪᏂᎨ</unitPattern>
+				<unitPattern count="other">{0} ᎤᏍᎪᎸ ᎠᏂᏌᎪᏂᎨ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ᎠᎦᏴᎵ ᎤᏍᏗ ᏂᏚᏓᎨᏒ-ᎦᏌᏙᏯᏍᏗ</displayName>
+				<unitPattern count="one">{0} ᎠᏍᏴᎵ ᎤᏍᏗ ᏗᏚᏓᎨᏒ-ᎦᏌᏙᏯᏍᏗ</unitPattern>
+				<unitPattern count="other">{0} ᎠᏍᏴᎵ ᎤᏍᏗ ᏂᏚᏓᎨᏒ-ᎦᏌᏙᏯᏍᏗ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ᏖᏍᎳᏍ</displayName>
+				<unitPattern count="one">{0} ᏖᏍᎳ</unitPattern>
+				<unitPattern count="other">{0} ᏖᏍᎳᏍ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ᏪᏆᏍ</displayName>
+				<unitPattern count="one">{0} ᏪᏆ</unitPattern>
+				<unitPattern count="other">{0} ᏪᏆᏍ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ᏚᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ</displayName>
 				<unitPattern count="one">{0} ᎤᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ</unitPattern>
 				<unitPattern count="other">{0} ᏚᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ᏚᎵᏏᏂᏒ</displayName>
-				<unitPattern count="one">{0} ᎤᏒ</unitPattern>
-				<unitPattern count="other">{0} ᏚᎵᏏᏂᏒ</unitPattern>
-				<perUnitPattern>{0}/ᎤᏒ</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>ᏅᎩ ᏫᏂᏚᏳᎪᏛᎢ</displayName>
 				<coordinateUnitPattern type="east">{0} ᏗᎧᎸᎬ</coordinateUnitPattern>
@@ -5893,7 +6029,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᏑᏓᎴᎩ</unitPattern>
 				<unitPattern count="other">{0} ᎢᏳᏓᎴᎩ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ᎢᎦᏛ</displayName>
+				<unitPattern count="one">{0} ᎢᎦᏛ</unitPattern>
+				<unitPattern count="other">{0} ᎢᎦᏛ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ᏚᏙᏢᏒ/ᎢᏳᏆᏗᏅᏛ</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6278,12 +6419,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ᏗᏓᏇᏄᎩᏍᏗ</unitPattern>
 				<unitPattern count="other">{0} ᏗᏓᏇᏄᎩᏍᏗ</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ᎠᏨᏍᏗ</displayName>
 				<unitPattern count="one">{0} ᎠᏨᏍᏗ</unitPattern>
 				<unitPattern count="other">{0} ᎠᏨᏍᏗ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ᏚᏙᏢᏒ/ᎢᏳᏔᎵᎳᏗᏅᏛ</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6394,7 +6544,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mmol/L</unitPattern>
 				<unitPattern count="other">{0}mmol/L</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ᎢᎦᏛ</displayName>
+				<unitPattern count="one">{0} ᎢᎦᏛ</unitPattern>
+				<unitPattern count="other">{0} ᎢᎦᏛ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -7108,20 +7263,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ᎠᏨᏍᏗ</displayName>
 				<unitPattern count="one">{0}ᎠᏨᏍᏗ</unitPattern>
 				<unitPattern count="other">{0}ᎠᏨᏍᏗ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ᏚᎵᏏᏂᏒ</displayName>
 				<unitPattern count="one">{0}ᎤᏒ</unitPattern>
 				<unitPattern count="other">{0}ᏚᎵᏏᏂᏒ</unitPattern>
-				<perUnitPattern>{0}/ᎤᏒ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}Ꮧ</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/ckb.xml b/make/data/cldr/common/main/ckb.xml
index a52891df344..a39ca3d5054 100644
--- a/make/data/cldr/common/main/ckb.xml
+++ b/make/data/cldr/common/main/ckb.xml
@@ -71,6 +71,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="chr">چێرۆکی</language>
 			<language type="chy">شایان</language>
 			<language type="ckb">کوردیی ناوەندی</language>
+			<language type="ckb" alt="variant" draft="unconfirmed">کوردیی، سۆرانی</language>
 			<language type="co">کۆرسیکی</language>
 			<language type="crs">فەرەنسیی سیشێلی</language>
 			<language type="cs">چێکی</language>
@@ -193,9 +194,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">بافیا</language>
 			<language type="ksh">کۆلۆنی</language>
 			<language type="ku">کوردی</language>
+			<language type="ku" menu="core" draft="unconfirmed">کوردی</language>
+			<language type="ku" menu="extension" draft="unconfirmed">کرمانجی</language>
 			<language type="kum">کوومیک</language>
 			<language type="kv">کۆمی</language>
 			<language type="kw">کۆڕنی</language>
+			<language type="kxv" draft="unconfirmed">کوڤی</language>
 			<language type="ky">كرگیزی</language>
 			<language type="la">لاتینی</language>
 			<language type="lad">لادینۆ</language>
@@ -387,6 +391,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="wo">وۆلۆف</language>
 			<language type="xal">کالمیک</language>
 			<language type="xh">سسوسا</language>
+			<language type="xnr" draft="unconfirmed">کانگری</language>
 			<language type="xog">سۆگا</language>
 			<language type="yav">یانگبێن</language>
 			<language type="ybb">یێمبا</language>
@@ -395,6 +400,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="yue">کانتۆنی</language>
 			<language type="zgh">ئەمازیغیی مەغریب</language>
 			<language type="zh">چینی</language>
+			<language type="zh" alt="menu" draft="unconfirmed">جینی، مەنداری</language>
 			<language type="zh_Hans">چینی (چینیی ئاسانکراو)</language>
 			<language type="zh_Hant">چینی (چینیی دێرین)</language>
 			<language type="zu">زوولوو</language>
@@ -535,6 +541,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">چین</territory>
 			<territory type="CO">کۆلۆمبیا</territory>
 			<territory type="CP">دوورگەی کلیپێرتۆن</territory>
+			<territory type="CQ" draft="unconfirmed">سارک</territory>
 			<territory type="CR">کۆستاریکا</territory>
 			<territory type="CU">کووبا</territory>
 			<territory type="CV">کەیپڤەرد</territory>
@@ -597,6 +604,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IM">دوورگەی مان</territory>
 			<territory type="IN">ھیندستان</territory>
 			<territory type="IO" draft="provisional">ھەرێمی بەریتانی لە ئۆقیانووسی ھیند</territory>
+			<territory type="IO" alt="biot" draft="unconfirmed">ھەرێمی بەریتانی لە ئۆقیانووسی ھیندی</territory>
 			<territory type="IQ">عێراق</territory>
 			<territory type="IR">ئێران</territory>
 			<territory type="IS">ئایسلەند</territory>
@@ -662,6 +670,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="NR">نائوروو</territory>
 			<territory type="NU">نیووئی</territory>
 			<territory type="NZ">نیوزیلاند</territory>
+			<territory type="NZ" alt="variant" draft="unconfirmed">نیوزلەندا</territory>
 			<territory type="OM">عومان</territory>
 			<territory type="PA">پاناما</territory>
 			<territory type="PE">پێروو</territory>
@@ -715,6 +724,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TJ">تاجیکستان</territory>
 			<territory type="TK">تۆکێلاو</territory>
 			<territory type="TL">تیمۆری ڕۆژھەڵات</territory>
+			<territory type="TL" alt="variant" draft="unconfirmed">تەیموری ڕۆژهەڵات</territory>
 			<territory type="TM">تورکمانستان</territory>
 			<territory type="TN">توونس</territory>
 			<territory type="TO">تۆنگا</territory>
@@ -761,12 +771,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<types>
 			<type key="calendar" type="chinese" draft="unconfirmed">ڕۆژژمێری چینی</type>
 			<type key="calendar" type="gregorian" draft="unconfirmed">ڕۆژژمێری زاینیی</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">زاینی</type>
 			<type key="calendar" type="hebrew" draft="unconfirmed">ڕۆژژمێری عیبری</type>
 			<type key="calendar" type="indian" draft="unconfirmed">ڕۆژژمێری نەتەوەیی ھیندی</type>
-			<type key="calendar" type="islamic" draft="unconfirmed">ڕۆژژمێری کۆچیی مانگی</type>
+			<type key="calendar" type="islamic" draft="unconfirmed">ڕۆژژمێری کۆچیی</type>
+			<type key="calendar" type="islamic" scope="core" draft="unconfirmed">هیجری</type>
 			<type key="calendar" type="iso8601" draft="unconfirmed">ISO-8601 ڕۆژژمێری</type>
 			<type key="calendar" type="persian" draft="unconfirmed">ڕۆژژمێری کۆچیی ھەتاوی</type>
+			<type key="calendar" type="persian" scope="core" draft="unconfirmed">فارسی</type>
 			<type key="collation" type="standard" draft="unconfirmed">ڕیزکردنی داواکری ستاندارد</type>
+			<type key="collation" type="standard" scope="core" draft="unconfirmed">ستاندارد</type>
 			<type key="numbers" type="arab" draft="unconfirmed">ژمارە عەربی-ھیندییەکان</type>
 			<type key="numbers" type="gujr" draft="unconfirmed">ژمارە گوجەراتییەکان</type>
 			<type key="numbers" type="khmr" draft="unconfirmed">ژمارە خمێرییەکان</type>
@@ -818,7 +832,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1124,6 +1138,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">موحەرەم</month>
+							<month type="2" draft="unconfirmed">سەفەر</month>
+							<month type="3" draft="unconfirmed">رەبیعی یەکەم</month>
+							<month type="4" draft="unconfirmed">ڕەبیعی دووەم</month>
+							<month type="5" draft="unconfirmed">جەمادی یەکەم</month>
+							<month type="6" draft="unconfirmed">جەمادی دووەم</month>
+							<month type="7" draft="unconfirmed">ڕەجەب</month>
+							<month type="8" draft="unconfirmed">شەعبان</month>
+							<month type="9" draft="unconfirmed">ڕەمەزان</month>
+							<month type="10" draft="unconfirmed">شەوال</month>
+							<month type="11" draft="unconfirmed">زولقەعدە</month>
+							<month type="12" draft="unconfirmed">زولحجە</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">موحەرەم</month>
+							<month type="2" draft="unconfirmed">سەفەر</month>
+							<month type="3" draft="unconfirmed">رەبیعی یەکەم</month>
+							<month type="4" draft="unconfirmed">ڕەبیعی دووەم</month>
+							<month type="5" draft="unconfirmed">جەمادی یەکەم</month>
+							<month type="6" draft="unconfirmed">جەمادی دووەم</month>
+							<month type="7" draft="unconfirmed">ڕەجەب</month>
+							<month type="8" draft="unconfirmed">شەعبان</month>
+							<month type="9" draft="unconfirmed">ڕەمەزان</month>
+							<month type="10" draft="unconfirmed">شەوال</month>
+							<month type="11" draft="unconfirmed">زولقەعدە</month>
+							<month type="12" draft="unconfirmed">زولحجە</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">کۆچیی</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
 			<calendar type="persian">
 				<months>
 					<monthContext type="format">
@@ -1172,7 +1227,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relativePeriod draft="unconfirmed">هەفتەی {0}</relativePeriod>
 			</field>
 			<field type="day">
-				<displayName draft="unconfirmed">ڕۆژ</displayName>
 				<relative type="-1" draft="unconfirmed">دوێنێ</relative>
 				<relative type="0" draft="unconfirmed">ئەمڕۆ</relative>
 				<relative type="1" draft="unconfirmed">سبەی</relative>
@@ -1202,6 +1256,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>بەکاتی {0}</regionFormat>
 			<regionFormat type="daylight">کاتی {0} هاوینە</regionFormat>
 			<regionFormat type="standard">کاتی {0} فەرمی</regionFormat>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="unconfirmed">شوێنی نەناسراو</exemplarCity>
+			</zone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
@@ -1229,24 +1286,75 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
+			<currency type="AED">
+				<displayName draft="unconfirmed">درهەمی ئیماڕاتی</displayName>
+			</currency>
 			<currency type="AFN">
 				<displayName draft="unconfirmed">ئەفغانیی ئەفغانستان</displayName>
 			</currency>
+			<currency type="AMD">
+				<displayName draft="unconfirmed">درامی ئەرمینیایی</displayName>
+			</currency>
+			<currency type="ARS">
+				<displayName draft="unconfirmed">پێسۆی ئەرجەنتینی</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName draft="unconfirmed">دۆلاری ئوسترالی</displayName>
+			</currency>
+			<currency type="AZN">
+				<displayName draft="unconfirmed">مەنەتی ئازەربایجانی</displayName>
+			</currency>
+			<currency type="BDT">
+				<displayName draft="unconfirmed">تەکەی بەنگالی</displayName>
+			</currency>
 			<currency type="BHD">
 				<displayName draft="unconfirmed">دیناری بەحرەینی</displayName>
 			</currency>
+			<currency type="BND">
+				<displayName draft="unconfirmed">دۆلاری بروونایی</displayName>
+			</currency>
 			<currency type="BZD">
 				<displayName draft="unconfirmed">دۆلاری بەلیزی</displayName>
 			</currency>
 			<currency type="CAD">
 				<displayName draft="unconfirmed">دۆلاری کەنەدی</displayName>
 			</currency>
+			<currency type="CHF">
+				<displayName draft="unconfirmed">فرانکی سویسری</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName draft="unconfirmed">یەننی چینی</displayName>
+			</currency>
+			<currency type="DKK">
+				<displayName draft="unconfirmed">کرۆنی دانیمارکی</displayName>
+			</currency>
 			<currency type="DZD">
 				<displayName draft="unconfirmed">دیناری جەزائیری</displayName>
 			</currency>
+			<currency type="EGP">
+				<displayName draft="unconfirmed">جونەی میسڕی</displayName>
+			</currency>
 			<currency type="EUR">
 				<displayName draft="unconfirmed">یورۆ</displayName>
 			</currency>
+			<currency type="FJD">
+				<displayName draft="unconfirmed">دۆلاری فیجیی</displayName>
+			</currency>
+			<currency type="GBP">
+				<displayName draft="unconfirmed">پاوەنی بەریتانی</displayName>
+			</currency>
+			<currency type="GEL">
+				<displayName draft="unconfirmed">لاری جۆرجیی</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName draft="unconfirmed">ڕوپیەی ئیندۆنیزی</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName draft="unconfirmed">شەخەلی ئیسرائیلی</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName draft="unconfirmed">ڕوپیەی هیندی</displayName>
+			</currency>
 			<currency type="IQD">
 				<displayName draft="unconfirmed">دیناری عێراقی</displayName>
 				<symbol>د.ع.‏</symbol>
@@ -1257,18 +1365,90 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="JOD">
 				<displayName draft="unconfirmed">دیناری ئوردنی</displayName>
 			</currency>
+			<currency type="JPY">
+				<displayName draft="unconfirmed">یەنی یابانی</displayName>
+			</currency>
+			<currency type="KGS">
+				<displayName draft="unconfirmed">سۆمی قیڕغستانی</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName draft="unconfirmed">ڕیالی کەمبۆدی</displayName>
+			</currency>
 			<currency type="KWD">
 				<displayName draft="unconfirmed">دیناری کووەیتی</displayName>
 			</currency>
+			<currency type="KZT">
+				<displayName draft="unconfirmed">تەنگەی کازاخستانی</displayName>
+			</currency>
+			<currency type="LBP">
+				<displayName draft="unconfirmed">لیرەی کوبنانی</displayName>
+			</currency>
+			<currency type="LKR">
+				<displayName draft="unconfirmed">ڕوپیەی سریلانکی</displayName>
+			</currency>
+			<currency type="LYD">
+				<displayName draft="unconfirmed">دیناری لیبی</displayName>
+			</currency>
+			<currency type="MAD">
+				<displayName draft="unconfirmed">درهەمی مەغریبی</displayName>
+			</currency>
+			<currency type="MNT">
+				<displayName draft="unconfirmed">توگریکی مەنگۆلی</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName draft="unconfirmed">ڕوفیەی ماڵدیڤی</displayName>
+			</currency>
+			<currency type="MYR">
+				<displayName draft="unconfirmed">ڕینگەی مالیزی</displayName>
+			</currency>
+			<currency type="NOK">
+				<displayName draft="unconfirmed">کرۆنی نەرویجی</displayName>
+			</currency>
+			<currency type="NPR">
+				<displayName draft="unconfirmed">ڕوپیەی نیپاڵی</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName draft="unconfirmed">دۆلاری نیوزیکلەندی</displayName>
+			</currency>
 			<currency type="OMR">
 				<displayName draft="unconfirmed">ڕیاڵی عومانی</displayName>
 			</currency>
+			<currency type="PGK">
+				<displayName draft="unconfirmed">کینای پاپوا گینیایی نوێ</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName draft="unconfirmed">پێسۆی فلیپینی</displayName>
+			</currency>
+			<currency type="PKR">
+				<displayName draft="unconfirmed">ڕوپیەی پاکستانی</displayName>
+			</currency>
 			<currency type="QAR">
 				<displayName draft="unconfirmed">ڕیاڵی قەتەری</displayName>
 			</currency>
+			<currency type="RUB">
+				<displayName draft="unconfirmed">ڕوبڵی ڕووسی</displayName>
+			</currency>
 			<currency type="SAR">
 				<displayName draft="unconfirmed">ڕیاڵی سەعوودی</displayName>
 			</currency>
+			<currency type="SBD">
+				<displayName draft="unconfirmed">دۆلاری دورگەی سۆلۆمۆن</displayName>
+			</currency>
+			<currency type="SDG">
+				<displayName draft="unconfirmed">جونەی سودانی</displayName>
+			</currency>
+			<currency type="SEK">
+				<displayName draft="unconfirmed">کرۆنی سویدی</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName draft="unconfirmed">دۆلاری سینگاپووری</displayName>
+			</currency>
+			<currency type="TJS">
+				<displayName draft="unconfirmed">سۆمۆنی تاجیکستانی</displayName>
+			</currency>
+			<currency type="TMT">
+				<displayName draft="unconfirmed">مەنەتی تورکمانستانی</displayName>
+			</currency>
 			<currency type="TND">
 				<displayName draft="unconfirmed">دیناری توونس</displayName>
 			</currency>
@@ -1278,9 +1458,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="TTD">
 				<displayName draft="unconfirmed">دۆلاری ترینیداد و تۆباگۆ</displayName>
 			</currency>
+			<currency type="TWD">
+				<displayName draft="unconfirmed">دۆلاری تایوانی نوێ</displayName>
+			</currency>
+			<currency type="UZS">
+				<displayName draft="unconfirmed">سۆمی ئۆزبەکستانی</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName draft="unconfirmed">دۆنگی ڤێتنامی</displayName>
+			</currency>
+			<currency type="WST">
+				<displayName draft="unconfirmed">تەلەی ساموایی</displayName>
+			</currency>
 			<currency type="XAU">
 				<displayName draft="unconfirmed">زێڕ</displayName>
 			</currency>
+			<currency type="XXX">
+				<displayName draft="unconfirmed">پارەی نەناسراو</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName draft="unconfirmed">ڕیالی یەمەنی</displayName>
+			</currency>
 		</currencies>
 	</numbers>
 	<posix>
diff --git a/make/data/cldr/common/main/co.xml b/make/data/cldr/common/main/co.xml
index b102b74c2bd..2110dece8a3 100644
--- a/make/data/cldr/common/main/co.xml
+++ b/make/data/cldr/common/main/co.xml
@@ -27,13 +27,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en" draft="unconfirmed">inglese</language>
 			<language type="en_AU" draft="unconfirmed">inglese australianu</language>
 			<language type="en_CA" draft="unconfirmed">inglese canadianu</language>
-			<language type="en_US" draft="unconfirmed">inglese americanu</language>
 			<language type="en_US" alt="short" draft="unconfirmed">inglese (S.U.)</language>
 			<language type="es" draft="unconfirmed">spagnolu</language>
+			<language type="et" draft="unconfirmed">estone</language>
 			<language type="fi" draft="unconfirmed">finlandese</language>
 			<language type="fr" draft="unconfirmed">francese</language>
 			<language type="fr_CA" draft="unconfirmed">francese canadianu</language>
 			<language type="fr_CH" draft="unconfirmed">francese sguizzeru</language>
+			<language type="hi_Latn" draft="unconfirmed">hindì (latinu)</language>
 			<language type="hu" draft="unconfirmed">ungarese</language>
 			<language type="id" draft="unconfirmed">indunesianu</language>
 			<language type="it" draft="unconfirmed">talianu</language>
@@ -63,6 +64,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</languages>
 		<scripts>
 			<script type="Arab" draft="unconfirmed">arabu</script>
+			<script type="Hans" draft="unconfirmed">simplificatu</script>
+			<script type="Hant" draft="unconfirmed">tradiziunale</script>
 			<script type="Jpan" draft="unconfirmed">giappunese</script>
 			<script type="Kore" draft="unconfirmed">cureanu</script>
 			<script type="Latn" draft="unconfirmed">latinu</script>
@@ -73,67 +76,178 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="001" draft="unconfirmed">Mondu</territory>
 			<territory type="002" draft="unconfirmed">Africa</territory>
 			<territory type="009" draft="unconfirmed">Oceania</territory>
+			<territory type="013" draft="unconfirmed">America Centrale</territory>
 			<territory type="019" draft="unconfirmed">Americhe</territory>
+			<territory type="053" draft="unconfirmed">Australasia</territory>
+			<territory type="054" draft="unconfirmed">Melanesia</territory>
+			<territory type="057" draft="unconfirmed">Regione Micronesiana</territory>
+			<territory type="061" draft="unconfirmed">Pulinesia</territory>
 			<territory type="142" draft="unconfirmed">Asia</territory>
 			<territory type="150" draft="unconfirmed">Europa</territory>
 			<territory type="419" draft="unconfirmed">America latina</territory>
+			<territory type="AC" draft="unconfirmed">Isula Ascension</territory>
+			<territory type="AD" draft="unconfirmed">Andorra</territory>
+			<territory type="AE" draft="unconfirmed">Emirati Arabi Uniti</territory>
+			<territory type="AG" draft="unconfirmed">Antigua è Barbuda</territory>
+			<territory type="AI" draft="unconfirmed">Anguilla</territory>
+			<territory type="AL" draft="unconfirmed">Albania</territory>
+			<territory type="AM" draft="unconfirmed">Armenia</territory>
+			<territory type="AO" draft="unconfirmed">Angola</territory>
 			<territory type="AQ" draft="unconfirmed">Antarticu</territory>
+			<territory type="AR" draft="unconfirmed">Argentina</territory>
+			<territory type="AS" draft="unconfirmed">Samoa Americana</territory>
 			<territory type="AT" draft="unconfirmed">Austria</territory>
 			<territory type="AU" draft="unconfirmed">Australia</territory>
+			<territory type="AW" draft="unconfirmed">Aruba</territory>
+			<territory type="BA" draft="unconfirmed">Bosnia è Herzegovina</territory>
+			<territory type="BB" draft="unconfirmed">Barbados</territory>
 			<territory type="BE" draft="unconfirmed">Belgica</territory>
+			<territory type="BG" draft="unconfirmed">Bulgaria</territory>
+			<territory type="BI" draft="unconfirmed">Burundi</territory>
+			<territory type="BL" draft="unconfirmed">San Bartulumeu</territory>
+			<territory type="BM" draft="unconfirmed">Bermuda</territory>
+			<territory type="BO" draft="unconfirmed">Bolivia</territory>
+			<territory type="BR" draft="unconfirmed">Brasile</territory>
+			<territory type="BZ" draft="unconfirmed">Belize</territory>
 			<territory type="CA" draft="unconfirmed">Canada</territory>
+			<territory type="CC" draft="unconfirmed">Isule Cocos (Keeling)</territory>
+			<territory type="CD" draft="unconfirmed">Congo - Kinshasa</territory>
+			<territory type="CD" alt="variant" draft="unconfirmed">Congo (DRC)</territory>
+			<territory type="CF" draft="unconfirmed">Republica d’Africa Centrale</territory>
+			<territory type="CG" draft="unconfirmed">Congo - Brazzaville</territory>
+			<territory type="CG" alt="variant" draft="unconfirmed">Republica di u Congo</territory>
 			<territory type="CH" draft="unconfirmed">Svizzera</territory>
+			<territory type="CK" draft="unconfirmed">Isule Cook</territory>
+			<territory type="CL" draft="unconfirmed">Cile</territory>
 			<territory type="CN" draft="unconfirmed">China</territory>
+			<territory type="CP" draft="unconfirmed">Isula Clipperton</territory>
 			<territory type="CR" draft="unconfirmed">Costa Rica</territory>
 			<territory type="CU" draft="unconfirmed">Cuba</territory>
-			<territory type="CZ" draft="unconfirmed">Republica cecca</territory>
+			<territory type="CX" draft="unconfirmed">Isula Christmas</territory>
+			<territory type="CZ" draft="unconfirmed">Cecchia</territory>
 			<territory type="DE" draft="unconfirmed">Alemagna</territory>
+			<territory type="DG" draft="unconfirmed">Diego Garcia</territory>
 			<territory type="DK" draft="unconfirmed">Danimarca</territory>
+			<territory type="DM" draft="unconfirmed">Dominica</territory>
 			<territory type="DO" draft="unconfirmed">Republica Duminicana</territory>
+			<territory type="DZ" draft="unconfirmed">Algeria</territory>
+			<territory type="EE" draft="unconfirmed">Estonia</territory>
+			<territory type="EG" draft="unconfirmed">Egittu</territory>
 			<territory type="ES" draft="unconfirmed">Spagna</territory>
 			<territory type="EU" draft="unconfirmed">Unione europea</territory>
+			<territory type="EZ" draft="unconfirmed">Eurozona</territory>
 			<territory type="FI" draft="unconfirmed">Finlandia</territory>
+			<territory type="FK" draft="unconfirmed">Isule Falkland</territory>
+			<territory type="FM" draft="unconfirmed">Micronesia</territory>
+			<territory type="FO" draft="unconfirmed">Isule Faroe</territory>
 			<territory type="FR" draft="unconfirmed">Francia</territory>
 			<territory type="GB" draft="unconfirmed">Reame Unitu</territory>
 			<territory type="GB" alt="short" draft="unconfirmed">R.U.</territory>
+			<territory type="GD" draft="unconfirmed">Grenada</territory>
+			<territory type="GE" draft="unconfirmed">Georgia</territory>
+			<territory type="GF" draft="unconfirmed">Guiana francese</territory>
+			<territory type="GM" draft="unconfirmed">Gambia</territory>
+			<territory type="GP" draft="unconfirmed">Guadalupe</territory>
 			<territory type="GR" draft="unconfirmed">Grecia</territory>
 			<territory type="GT" draft="unconfirmed">Guatemala</territory>
+			<territory type="GY" draft="unconfirmed">Guiana</territory>
+			<territory type="HM" draft="unconfirmed">Isule Heard è McDonald</territory>
+			<territory type="HR" draft="unconfirmed">Croazia</territory>
 			<territory type="HU" draft="unconfirmed">Ungheria</territory>
 			<territory type="IE" draft="unconfirmed">Irlanda</territory>
 			<territory type="IL" draft="unconfirmed">Israele</territory>
+			<territory type="IM" draft="unconfirmed">Isula di Man</territory>
 			<territory type="IN" draft="unconfirmed">India</territory>
 			<territory type="IR" draft="unconfirmed">Iran</territory>
 			<territory type="IS" draft="unconfirmed">Islanda</territory>
 			<territory type="IT" draft="unconfirmed">Italia</territory>
+			<territory type="JM" draft="unconfirmed">Jamaica</territory>
 			<territory type="JP" draft="unconfirmed">Giappone</territory>
+			<territory type="KM" draft="unconfirmed">Comore</territory>
+			<territory type="KN" draft="unconfirmed">St. Kitts è Nevis</territory>
 			<territory type="LB" draft="unconfirmed">Libanu</territory>
 			<territory type="LC" draft="unconfirmed">Santa Lucia</territory>
+			<territory type="LR" draft="unconfirmed">Liberia</territory>
+			<territory type="LT" draft="unconfirmed">Lituania</territory>
+			<territory type="LV" draft="unconfirmed">Lettonia</territory>
+			<territory type="LY" draft="unconfirmed">LIbia</territory>
+			<territory type="MC" draft="unconfirmed">Monaco</territory>
+			<territory type="ME" draft="unconfirmed">Montenegro</territory>
 			<territory type="MF" draft="unconfirmed">San Martinu</territory>
+			<territory type="MH" draft="unconfirmed">Isule Marshall</territory>
+			<territory type="ML" draft="unconfirmed">Mali</territory>
 			<territory type="MN" draft="unconfirmed">Mungulia</territory>
+			<territory type="MO" draft="unconfirmed">Macao SAR China</territory>
+			<territory type="MO" alt="short" draft="unconfirmed">Macao</territory>
 			<territory type="MQ" draft="unconfirmed">Martinica</territory>
+			<territory type="MR" draft="unconfirmed">Mauritania</territory>
+			<territory type="MT" draft="unconfirmed">Malta</territory>
 			<territory type="MX" draft="unconfirmed">Messicu</territory>
 			<territory type="MY" draft="unconfirmed">Malesia</territory>
+			<territory type="NA" draft="unconfirmed">Namibia</territory>
+			<territory type="NC" draft="unconfirmed">Nova Caledunia</territory>
+			<territory type="NF" draft="unconfirmed">Isula Norfolk</territory>
+			<territory type="NG" draft="unconfirmed">Nigeria</territory>
 			<territory type="NI" draft="unconfirmed">Nicaragua</territory>
 			<territory type="NL" draft="unconfirmed">Nederlanda</territory>
 			<territory type="NO" draft="unconfirmed">Nurvegia</territory>
+			<territory type="NR" draft="unconfirmed">Nauru</territory>
+			<territory type="NU" draft="unconfirmed">Niue</territory>
 			<territory type="NZ" draft="unconfirmed">Nova Zelanda</territory>
+			<territory type="NZ" alt="variant" draft="unconfirmed">Nova Zelanda Aotearoa</territory>
 			<territory type="PA" draft="unconfirmed">Panama</territory>
 			<territory type="PE" draft="unconfirmed">Perù</territory>
+			<territory type="PF" draft="unconfirmed">Pulinesia Francese</territory>
+			<territory type="PG" draft="unconfirmed">Papuasia Nova Guinea</territory>
 			<territory type="PH" draft="unconfirmed">Filippine</territory>
+			<territory type="PM" draft="unconfirmed">St. Pierre è Miquelon</territory>
+			<territory type="PN" draft="unconfirmed">Isule Pitcairn</territory>
+			<territory type="PR" draft="unconfirmed">Puerto Rico</territory>
 			<territory type="PS" draft="unconfirmed">Palestina</territory>
 			<territory type="PT" draft="unconfirmed">Portugallu</territory>
+			<territory type="PW" draft="unconfirmed">Palau</territory>
+			<territory type="RO" draft="unconfirmed">Rumania</territory>
 			<territory type="RS" draft="unconfirmed">Serbia</territory>
 			<territory type="RU" draft="unconfirmed">Russia</territory>
+			<territory type="SB" draft="unconfirmed">Isule Solomon</territory>
+			<territory type="SE" draft="unconfirmed">Svezia</territory>
+			<territory type="SI" draft="unconfirmed">Slovenia</territory>
 			<territory type="SK" draft="unconfirmed">Sluvacchia</territory>
+			<territory type="SL" draft="unconfirmed">Sierra Leone</territory>
+			<territory type="SM" draft="unconfirmed">San Marino</territory>
+			<territory type="SO" draft="unconfirmed">Somalia</territory>
+			<territory type="SR" draft="unconfirmed">Suriname</territory>
+			<territory type="SV" draft="unconfirmed">El Salvadore</territory>
 			<territory type="SY" draft="unconfirmed">Siria</territory>
+			<territory type="TA" draft="unconfirmed">Tristan da Cunha</territory>
+			<territory type="TC" draft="unconfirmed">Isule Turks è Caicos</territory>
+			<territory type="TG" draft="unconfirmed">Togo</territory>
+			<territory type="TN" draft="unconfirmed">Tunisia</territory>
+			<territory type="TO" draft="unconfirmed">Tonga</territory>
 			<territory type="TR" draft="unconfirmed">Turchia</territory>
+			<territory type="TT" draft="unconfirmed">Trinidad è Tobago</territory>
+			<territory type="TV" draft="unconfirmed">Tuvalu</territory>
+			<territory type="TZ" draft="unconfirmed">Tanzania</territory>
+			<territory type="UA" draft="unconfirmed">Ucrania</territory>
+			<territory type="UG" draft="unconfirmed">Uganda</territory>
+			<territory type="UM" draft="unconfirmed">Isule U.S. Outlying</territory>
 			<territory type="UN" draft="unconfirmed">Nazioni Unite</territory>
 			<territory type="US" draft="unconfirmed">Stati Uniti</territory>
 			<territory type="US" alt="short" draft="unconfirmed">S.U.</territory>
+			<territory type="VA" draft="unconfirmed">Cità di u Vaticanu</territory>
+			<territory type="VE" draft="unconfirmed">Venezuela</territory>
+			<territory type="VG" draft="unconfirmed">Isule Vergine Britaniche</territory>
+			<territory type="VI" draft="unconfirmed">Isule Vergine Americane</territory>
+			<territory type="VU" draft="unconfirmed">Vanuatu</territory>
+			<territory type="WF" draft="unconfirmed">Wallis è Futuna</territory>
+			<territory type="WS" draft="unconfirmed">Samoa</territory>
+			<territory type="XK" draft="unconfirmed">Kosovo</territory>
+			<territory type="ZM" draft="unconfirmed">Zambia</territory>
 			<territory type="ZZ" draft="unconfirmed">regione scunnisciuta</territory>
 		</territories>
 		<types>
 			<type key="calendar" type="gregorian" draft="unconfirmed">calendariu gregurianu</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">gregorianu</type>
 			<type key="calendar" type="iso8601" draft="unconfirmed">calendariu ISO 8601</type>
 			<type key="collation" type="standard" draft="unconfirmed">ordine di classificazione standardizatu</type>
 			<type key="numbers" type="latn" draft="unconfirmed">cifri occidentale</type>
@@ -153,8 +267,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[aà b c {chj} d eè f g {ghj} h iìï j l m n oò p q r s {sc} {sg} t uùü v z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[â æ ç éêë î k ñ ô œ úû w x yÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C {CHJ} D E F G {GHJ} H I J L M N O P Q R S {SC} {SG} T U V Z]</exemplarCharacters>
-		<exemplarCharacters type="punctuation" draft="unconfirmed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
-		<ellipsis type="word-final" draft="unconfirmed">{0}…</ellipsis>
+		<exemplarCharacters type="punctuation" draft="unconfirmed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” « » ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<moreInformation draft="unconfirmed">?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart draft="unconfirmed">«</quotationStart>
@@ -168,12 +282,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="unconfirmed">EEEE d MMMM 'di' 'u' y G</pattern>
+							<pattern draft="unconfirmed">EEEE d LLLL 'di' 'u' y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern draft="unconfirmed">d MMMM 'di' 'u' y G</pattern>
+							<pattern draft="unconfirmed">d LLLL 'di' 'u' y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -200,7 +314,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
@@ -208,6 +322,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern draft="unconfirmed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
+						<dateFormatItem id="Eh" draft="unconfirmed">E h 'ore'</dateFormatItem>
+						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="unconfirmed">MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMd" draft="unconfirmed">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="unconfirmed">E dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">dd-MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E dd/MM</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyM" draft="unconfirmed">MM/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd" draft="unconfirmed">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" draft="unconfirmed">E dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd" draft="unconfirmed">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ" draft="unconfirmed">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ" draft="unconfirmed">QQQQ y G</dateFormatItem>
+					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
@@ -392,12 +530,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -407,7 +557,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'à' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
@@ -416,39 +572,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm" draft="unconfirmed">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms" draft="unconfirmed">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="unconfirmed">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd" draft="unconfirmed">dd/MM/y G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h" draft="unconfirmed">h a</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="unconfirmed">E dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM 'di' 'u' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM 'di' 'u' y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E d MMM 'di' 'u' y G</dateFormatItem>
+						<dateFormatItem id="H" draft="unconfirmed">HH'o'</dateFormatItem>
 						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv" draft="unconfirmed">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv" draft="unconfirmed">HH'o' v</dateFormatItem>
 						<dateFormatItem id="Md" draft="unconfirmed">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd" draft="unconfirmed">E dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d 'di' MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd" draft="unconfirmed">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">'settimana' W MMMM</dateFormatItem>
 						<dateFormatItem id="yM" draft="unconfirmed">MM/y</dateFormatItem>
 						<dateFormatItem id="yMd" draft="unconfirmed">dd/MM/y</dateFormatItem>
 						<dateFormatItem id="yMEd" draft="unconfirmed">E dd/MM/y</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="unconfirmed">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="unconfirmed">E d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">MMM 'di' 'u' y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">d 'di' MMM 'di' 'u' y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">E d 'di' MMM 'di' 'u' y</dateFormatItem>
 						<dateFormatItem id="yMMMM" draft="unconfirmed">LLLL 'di' 'u' y</dateFormatItem>
 						<dateFormatItem id="yQQQ" draft="unconfirmed">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ" draft="unconfirmed">QQQQ 'di' 'u' y</dateFormatItem>
 						<dateFormatItem id="yw" count="other" draft="unconfirmed">'settimana' w 'di' 'u' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G" draft="unconfirmed">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">M/y – M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">dd/MM/y G – dd/MM/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E dd/MM/y G – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G" draft="unconfirmed">MMM 'di' 'u' y G – MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">MMM – MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMM 'di' 'u' y – MMM 'di' 'u' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">d MMM 'di' 'u' y G – d MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM 'di' 'u' y – d MMM 'di' 'u' y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E d MMM 'di' 'u' y G – E d MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM 'di' 'u' y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E d MMM 'di' 'u' y – E d MMM 'di' 'u' y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
 							<greatestDifference id="h" draft="unconfirmed">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">HH – HH</greatestDifference>
+							<greatestDifference id="H" draft="unconfirmed">HH – HH 'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
@@ -480,22 +677,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E dd/MM – dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">LLL – LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–d 'di' LLL</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d 'di' LLL – d 'di' LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E d 'di' MMM – E d 'di' MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E d 'di' MMM – E d 'di' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E dd/MM/y – E dd/MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">MMM – MMM 'di' 'u' y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MMM 'di' 'u' y – MMM 'di' 'u' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM 'di' 'u' y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM 'di' 'u' y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM – d MMM 'di' 'u' y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E d 'di' LLL – E d 'di' LLL 'di' 'u' y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E d 'di' LLL – E d 'di' LLL 'di' 'u' y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E d 'di' LLL 'di' 'u' y – E d 'di' LLL 'di' 'u' y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">LLLL–LLLL y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">LLLL y – LLLL y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">LLLL–LLLL 'di' 'u' y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">LLLL 'di' 'u' y – LLLL 'di' 'u' y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -544,9 +770,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="week-short">
 				<displayName draft="unconfirmed">sett.</displayName>
+				<relative type="-1" draft="unconfirmed">settim. scorsa</relative>
+				<relative type="0" draft="unconfirmed">sta settim.</relative>
+				<relative type="1" draft="unconfirmed">settim. chì vene</relative>
 			</field>
 			<field type="week-narrow">
 				<displayName draft="unconfirmed">st.</displayName>
+				<relative type="-1" draft="unconfirmed">settim. scorsa</relative>
+				<relative type="0" draft="unconfirmed">sta settim.</relative>
+				<relative type="1" draft="unconfirmed">settim. chì vene</relative>
 			</field>
 			<field type="day">
 				<displayName draft="unconfirmed">ghjornu</displayName>
@@ -613,7 +845,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<symbols numberSystem="latn">
 			<decimal draft="unconfirmed">,</decimal>
 			<group draft="unconfirmed"> </group>
-			<approximatelySign draft="unconfirmed">≈</approximatelySign>
 		</symbols>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
@@ -622,13 +853,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00) ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">#,##0.00 ¤;(#,##0.00) ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00) ¤</pattern>
 					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
diff --git a/make/data/cldr/common/main/cop.xml b/make/data/cldr/common/main/cop.xml
index fe7f39e1517..1cfec40e8cc 100644
--- a/make/data/cldr/common/main/cop.xml
+++ b/make/data/cldr/common/main/cop.xml
@@ -10,9 +10,4199 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<version number="$Revision$"/>
 		<language type="cop"/>
 	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="af" draft="unconfirmed">ϯⲙⲉⲧⲁϥⲣⲓⲕⲁⲛⲍ</language>
+			<language type="ak" draft="unconfirmed">ϯⲙⲉⲧⲁⲕⲁⲛ</language>
+			<language type="am" draft="unconfirmed">ϯⲙⲉⲧⲁⲙϩⲁⲣⲓ</language>
+			<language type="ar" draft="unconfirmed">ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ</language>
+			<language type="ar_001" draft="unconfirmed">ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ</language>
+			<language type="as" draft="unconfirmed">ϯⲙⲉⲧⲁⲥⲥⲁⲙⲉⲥ</language>
+			<language type="ast" draft="unconfirmed">ϯⲙⲉⲧⲁⲥⲧⲟⲩⲣⲓ</language>
+			<language type="az" draft="unconfirmed">ϯⲙⲉⲧⲁⲍⲉⲣⲃⲁϫⲁⲛⲓ</language>
+			<language type="az" alt="short" draft="unconfirmed">ϯⲙⲉⲧⲁⲍⲉⲣⲓ</language>
+			<language type="bal" draft="unconfirmed">ϯⲙⲉⲧⲃⲁⲗⲟⲩϣⲓ</language>
+			<language type="be" draft="unconfirmed">ϯⲙⲉⲧⲃⲉⲗⲁⲣⲟⲩⲥⲓ</language>
+			<language type="bg" draft="unconfirmed">ϯⲙⲉⲧⲃⲟⲩⲗⲅⲁⲣⲓ</language>
+			<language type="bgc" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲣⲓⲁⲛⲃⲓ</language>
+			<language type="bho" draft="unconfirmed">ϯⲙⲉⲧⲃⲟϫⲡⲟⲩⲣⲓ</language>
+			<language type="blo" draft="unconfirmed">ϯⲙⲉⲧⲁⲛⲓⲓ</language>
+			<language type="bn" draft="unconfirmed">ϯⲙⲉⲧⲃⲁⲛⲅⲗⲓ</language>
+			<language type="br" draft="unconfirmed">ϯⲙⲉⲧⲃⲣⲉⲧⲟⲛ</language>
+			<language type="brx" draft="unconfirmed">ϯⲙⲉⲧⲃⲟⲇⲟ</language>
+			<language type="bs" draft="unconfirmed">ϯⲙⲉⲧⲃⲟⲥⲛⲓ</language>
+			<language type="ca" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲧⲁⲗⲁⲛ</language>
+			<language type="ceb" draft="unconfirmed">ϯⲙⲉⲧⲥⲉⲃⲟⲩⲁⲛ</language>
+			<language type="chr" draft="unconfirmed">ϯⲙⲉⲧϭⲉⲣⲟⲩⲕⲓ</language>
+			<language type="cop" draft="unconfirmed">ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲭⲏⲙⲓ</language>
+			<language type="cs" draft="unconfirmed">ϯⲙⲉⲧϭⲉⲕⲓ</language>
+			<language type="csw" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲩⲁⲙⲡⲓ ⲕⲣⲓ</language>
+			<language type="cv" draft="unconfirmed">ϯⲙⲉⲧϭⲟⲩⲃⲁϣ</language>
+			<language type="cy" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲉⲗϣⲓ</language>
+			<language type="da" draft="unconfirmed">ϯⲙⲉⲧⲇⲁⲛⲙⲁⲣⲕ</language>
+			<language type="de" draft="unconfirmed">ϯⲙⲉⲧϫⲉⲣⲙⲁⲛⲓⲟⲥ</language>
+			<language type="de_AT" draft="unconfirmed">ϯⲙⲉⲧⲁⲗⲙⲁⲛⲓ ⲛ̀ⲁⲩⲥⲑⲣⲓⲁ</language>
+			<language type="de_CH" draft="unconfirmed">ϯⲙⲉⲧⲁⲗⲙⲁⲛⲓ ⲛ̀ⲥⲟⲩⲓⲥⲣⲁ ⲉⲧϭⲟⲥⲓ</language>
+			<language type="doi" draft="unconfirmed">ϯⲙⲉⲧⲇⲟⲣⲓ</language>
+			<language type="dsb" draft="unconfirmed">ϯⲙⲉⲧⲥⲏⲧⲥⲟⲣⲃⲓ</language>
+			<language type="ee" draft="unconfirmed">ϯⲙⲉⲧⲉⲩⲉ</language>
+			<language type="el" draft="unconfirmed">ⲙⲉⲧⲟⲩⲉⲓⲛⲓⲛ</language>
+			<language type="en" draft="unconfirmed">ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ</language>
+			<language type="en_AU" draft="unconfirmed">ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ</language>
+			<language type="en_CA" draft="unconfirmed">ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ⲕⲁⲛⲁⲇⲁ</language>
+			<language type="en_GB" draft="unconfirmed">ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲙ̀ⲃⲣⲓⲑⲁⲛⲓⲁ</language>
+			<language type="en_GB" alt="short" draft="unconfirmed">ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ϯⲙⲉⲧⲟⲩⲣⲟ ⲉⲧϩⲱⲧⲡ</language>
+			<language type="en_US" draft="unconfirmed">ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁ</language>
+			<language type="eo" draft="unconfirmed">ϯⲙⲉⲧⲉⲥⲡⲉⲣⲁⲛⲑⲟ</language>
+			<language type="es" draft="unconfirmed">ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ</language>
+			<language type="es_419" draft="unconfirmed">ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲁⲙⲣⲓⲕⲁ ⲗⲁⲑⲓⲛⲓ</language>
+			<language type="es_ES" draft="unconfirmed">ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲛ̀ⲉⲩⲣⲟⲡⲁ</language>
+			<language type="es_MX" draft="unconfirmed">ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲙ̀ⲙⲉⲝⲓⲕⲟ</language>
+			<language type="et" draft="unconfirmed">ϯⲙⲉⲧⲉⲥⲑⲟⲛⲓⲁ</language>
+			<language type="eu" draft="unconfirmed">ϯⲙⲉⲧⲃⲁⲥⲕ</language>
+			<language type="fa" draft="unconfirmed">ϯⲙⲉⲧⲡⲉⲣⲥⲓⲥ</language>
+			<language type="ff" draft="unconfirmed">ϯⲙⲉⲧϥⲟⲩⲗⲁ</language>
+			<language type="fi" draft="unconfirmed">ϯⲙⲉⲧϥⲓⲛⲗⲁⲛⲇ</language>
+			<language type="fil" draft="unconfirmed">ϯⲙⲉⲧⲫⲓⲗⲓⲡⲓⲛ</language>
+			<language type="fo" draft="unconfirmed">ϯⲙⲉⲧϥⲁⲣⲟⲥⲉ</language>
+			<language type="fr" draft="unconfirmed">ϯⲙⲉⲧϥⲉⲣⲉⲛⲥⲉⲟⲥ</language>
+			<language type="fr_CA" draft="unconfirmed">ϯⲙⲉⲧϥⲉⲣⲉⲛⲥⲉⲟⲥ ⲛ̀ⲕⲁⲛⲁⲇⲁ</language>
+			<language type="fr_CH" draft="unconfirmed">ϯⲙⲉⲧϥⲉⲣⲉⲛⲥⲉⲟⲥ ⲛ̀ⲥⲟⲩⲓⲥⲣⲁ</language>
+			<language type="fy" draft="unconfirmed">ϯⲙⲉⲧϥⲣⲓⲍⲓ ⲛ̀ⲉⲙⲉⲛⲧ</language>
+			<language type="ga" draft="unconfirmed">ϯⲙⲉⲧⲁⲓⲉⲣⲗⲁⲛⲇⲓ</language>
+			<language type="gaa" draft="unconfirmed">ϯⲙⲉⲧϫⲁ</language>
+			<language type="gd" draft="unconfirmed">ϯⲙⲉⲧⲥⲕⲟⲧⲗⲁⲛⲇ ⲅⲁⲗⲓⲕⲓ</language>
+			<language type="gl" draft="unconfirmed">ϯⲙⲉⲧⲅⲁⲗⲉⲕⲟⲥ</language>
+			<language type="gu" draft="unconfirmed">ϯⲙⲉⲧⲅⲟⲩϫⲁⲣⲁⲑⲓ</language>
+			<language type="ha" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲩⲍⲁ</language>
+			<language type="he" draft="unconfirmed">ϯⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ</language>
+			<language type="hi" draft="unconfirmed">ϯⲙⲉⲧϩⲉⲛⲧⲟⲩ</language>
+			<language type="hi_Latn" draft="unconfirmed">ϯⲙⲉⲧϩⲉⲛⲧⲟⲩ ⲛ̀ⲗⲁⲧⲓⲛⲓ</language>
+			<language type="hi_Latn" alt="variant" draft="unconfirmed">ϯⲙⲉⲧϩⲓⲛⲅⲗⲓϣ</language>
+			<language type="hr" draft="unconfirmed">ϯⲙⲉⲧⲕⲣⲟⲩⲁⲑⲓ</language>
+			<language type="hsb" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲣⲃⲓ ⲛ̀ϣⲱⲓ</language>
+			<language type="hu" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲛⲅⲁⲣⲓ</language>
+			<language type="hy" draft="unconfirmed">ϯⲙⲉⲧⲁⲣⲙⲉⲛⲓⲟⲥ</language>
+			<language type="ia" draft="unconfirmed">ϯⲙⲉⲧⲓⲛⲑⲉⲣⲗⲓⲛⲅⲟⲩⲓ</language>
+			<language type="id" draft="unconfirmed">ϯⲙⲉⲧⲓⲛⲇⲟⲛⲓⲥⲓ</language>
+			<language type="ie" draft="unconfirmed">ϯⲙⲉⲧⲓⲛⲑⲉⲣⲗⲓⲛⲅⲟⲩⲓ</language>
+			<language type="ig" draft="unconfirmed">ϯⲙⲉⲧⲓⲅⲃⲟ</language>
+			<language type="ii" draft="unconfirmed">ϯⲙⲉⲧⲥⲓϣⲟⲩⲁⲛ</language>
+			<language type="is" draft="unconfirmed">ϯⲙⲉⲧⲁⲓⲥⲗⲁⲛⲇ</language>
+			<language type="it" draft="unconfirmed">ϯⲙⲉⲧϩⲓⲧⲁⲗⲓⲕⲟⲥ</language>
+			<language type="ja" draft="unconfirmed">ϯⲙⲉⲧⲓⲁⲡⲁⲛⲓ</language>
+			<language type="jv" draft="unconfirmed">ϯⲙⲉⲧϫⲁⲃⲁⲛⲓ</language>
+			<language type="ka" draft="unconfirmed">ϯⲙⲉⲧⲅⲉⲟⲣⲅⲓⲟⲥ</language>
+			<language type="kea" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲃⲟⲩⲃⲉⲣⲇⲓⲁⲛⲟⲩ</language>
+			<language type="kgp" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲓⲛⲅⲁⲛⲅⲓ</language>
+			<language type="kk" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲍⲁϧⲓ</language>
+			<language type="km" draft="unconfirmed">ϯⲙⲉⲧϧⲙⲉⲣⲓ</language>
+			<language type="kn" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲛⲛⲁⲇⲓ</language>
+			<language type="ko" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲣⲓ</language>
+			<language type="kok" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲛⲕⲁⲛⲓ</language>
+			<language type="ks" draft="unconfirmed">ϯⲙⲉⲧⲕⲁϣⲙⲓⲣⲓ</language>
+			<language type="ku" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲩⲣⲇⲓ</language>
+			<language type="ku" menu="core" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲩⲣⲇⲓ</language>
+			<language type="ku" menu="extension" draft="unconfirmed">ϯⲙⲉⲧⲕⲩⲣⲙⲁⲛϫⲓ</language>
+			<language type="kxv" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲩⲓ</language>
+			<language type="ky" draft="unconfirmed">ϯⲙⲉⲧⲕⲩⲣⲅⲩⲍⲓ</language>
+			<language type="lb" draft="unconfirmed">ϯⲙⲉⲧⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲓ</language>
+			<language type="lij" draft="unconfirmed">ϯⲙⲉⲧⲗⲓⲅⲟⲩⲣⲓ</language>
+			<language type="lmo" draft="unconfirmed">ϯⲙⲉⲧⲗⲟⲙⲃⲁⲣⲇⲓ</language>
+			<language type="lo" draft="unconfirmed">ϯⲙⲉⲧⲗⲁⲟ</language>
+			<language type="lt" draft="unconfirmed">ϯⲙⲉⲧⲗⲓⲑⲟⲩⲁⲛⲓ</language>
+			<language type="lv" draft="unconfirmed">ϯⲙⲉⲧⲗⲁⲧⲃⲓ</language>
+			<language type="mai" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲓⲑⲓⲗⲓ</language>
+			<language type="mi" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲟⲣⲓ</language>
+			<language type="mk" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲕⲉⲇⲟⲛⲓ</language>
+			<language type="ml" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲗⲁⲓⲁⲗⲁⲙ</language>
+			<language type="mn" draft="unconfirmed">ϯⲙⲉⲧⲙⲟⲛⲅⲟⲗⲓ</language>
+			<language type="mni" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲛⲓⲡⲟⲩⲣⲓ</language>
+			<language type="mr" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲣⲁⲑⲓ</language>
+			<language type="ms" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲗⲁⲓ</language>
+			<language type="mt" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲗⲑⲓ</language>
+			<language type="mul" draft="unconfirmed">ϩⲁⲛⲙⲏϣ ⲛ̀ⲁⲥⲡⲓ</language>
+			<language type="my" draft="unconfirmed">ϯⲙⲉⲧⲃⲟⲩⲣⲙⲓ</language>
+			<language type="nds" draft="unconfirmed">ϯⲙⲉⲧⲥⲏⲧϫⲉⲣⲙⲁⲛⲓ</language>
+			<language type="ne" draft="unconfirmed">ϯⲙⲉⲧⲛⲉⲡⲁⲗⲓ</language>
+			<language type="nl" draft="unconfirmed">ϯⲙⲉⲧϩⲟⲗⲁⲛⲇ</language>
+			<language type="nl_BE" draft="unconfirmed">ϯⲙⲉϥⲗⲁⲙⲁⲛⲕ</language>
+			<language type="nn" draft="unconfirmed">ϯⲙⲉⲧⲛⲟⲣⲟⲩⲓⲅⲓ ⲛⲩⲛⲟⲣⲥⲕ</language>
+			<language type="no" draft="unconfirmed">ϯⲙⲉⲧⲛⲟⲣⲟⲩⲓⲅⲓ</language>
+			<language type="nqo" draft="unconfirmed">ϯⲙⲉⲧⲛ̀ⲕⲟ</language>
+			<language type="nso" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲑⲟⲛ̀ϩⲏⲧ</language>
+			<language type="oc" draft="unconfirmed">ϯⲙⲉⲧⲟⲕⲥⲓⲧⲁⲛ</language>
+			<language type="om" draft="unconfirmed">ϯⲙⲉⲧⲟⲣⲟⲙⲟ</language>
+			<language type="or" draft="unconfirmed">ϯⲙⲉⲧⲟⲇⲓ</language>
+			<language type="pa" draft="unconfirmed">ϯⲙⲉⲧⲡⲟⲩⲛϫⲁⲃⲓ</language>
+			<language type="pcm" draft="unconfirmed">ϯⲙⲉⲧⲛⲁⲓϫⲓⲣⲓ</language>
+			<language type="pl" draft="unconfirmed">ϯⲙⲉⲧⲡⲟⲗⲁⲛⲇⲓ</language>
+			<language type="prg" draft="unconfirmed">ϯⲙⲉⲧⲡⲣⲟⲩⲥⲓ</language>
+			<language type="ps" draft="unconfirmed">ϯⲙⲉⲧⲡⲁϣⲑⲟ</language>
+			<language type="pt" draft="unconfirmed">ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ</language>
+			<language type="pt_BR" draft="unconfirmed">ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ ⲙ̀ⲃⲣⲁⲍⲓⲗ</language>
+			<language type="pt_PT" draft="unconfirmed">ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ ⲛ̀ⲉⲩⲣⲟⲡⲁ</language>
+			<language type="qu" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲩⲉϣⲟⲩⲁ</language>
+			<language type="raj" draft="unconfirmed">ϯⲙⲉⲧⲣⲁϫⲁⲥⲑⲁⲛⲓ</language>
+			<language type="rm" draft="unconfirmed">ϯⲙⲉⲧⲣⲟⲙⲁⲛϣⲓ</language>
+			<language type="ro" draft="unconfirmed">ϯⲙⲉⲧⲣⲟⲙⲁⲛⲓ</language>
+			<language type="ru" draft="unconfirmed">ϯⲙⲉⲧⲣⲟⲩⲥⲓ</language>
+			<language type="rw" draft="unconfirmed">ϯⲙⲉⲧⲕⲓⲛⲓⲁⲣⲟⲩⲁⲛⲇⲓ</language>
+			<language type="sa" draft="unconfirmed">ϯⲙⲉⲧⲥⲁⲛⲥⲕⲣⲓⲑ</language>
+			<language type="sah" draft="unconfirmed">ϯⲙⲉⲧⲓⲁⲕⲟⲩⲧ</language>
+			<language type="sat" draft="unconfirmed">ϯⲙⲉⲧⲥⲁⲛⲑⲁⲗⲓ</language>
+			<language type="sc" draft="unconfirmed">ϯⲙⲉⲧⲥⲁⲣⲇⲓⲛⲓ</language>
+			<language type="sd" draft="unconfirmed">ϯⲙⲉⲧⲥⲓⲛⲇⲓ</language>
+			<language type="si" draft="unconfirmed">ϯⲙⲉⲧⲥⲓⲛϩⲁⲗⲁ</language>
+			<language type="sk" draft="unconfirmed">ϯⲙⲉⲧⲥⲗⲟⲃⲁⲕ</language>
+			<language type="sl" draft="unconfirmed">ϯⲙⲉⲧⲥⲗⲟⲃⲉⲛⲓ</language>
+			<language type="so" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲙⲁⲗⲓ</language>
+			<language type="sq" draft="unconfirmed">ϯⲙⲉⲧⲁⲗⲃⲁⲛⲓⲁ</language>
+			<language type="sr" draft="unconfirmed">ϯⲙⲉⲧⲥⲉⲣⲃⲓ</language>
+			<language type="st" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲑⲟ ⲛ̀ⲣⲏⲥ</language>
+			<language type="su" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲩⲇⲁⲛⲓ</language>
+			<language type="sv" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲩⲓⲇⲓ</language>
+			<language type="sw" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲩⲁϩⲓⲗⲓ</language>
+			<language type="syr" draft="unconfirmed">ϯⲙⲉⲧⲁⲥⲥⲩⲣⲟⲥ</language>
+			<language type="szl" draft="unconfirmed">ϯⲙⲉⲧⲥⲓⲗⲉⲥⲓⲁⲛ</language>
+			<language type="ta" draft="unconfirmed">ϯⲙⲉⲧⲑⲁⲙⲓⲗⲓ</language>
+			<language type="te" draft="unconfirmed">ϯⲙⲉⲧⲑⲉⲗⲟⲩⲅⲟⲩ</language>
+			<language type="tg" draft="unconfirmed">ϯⲙⲉⲧⲑⲁϫⲓⲕⲓ</language>
+			<language type="th" draft="unconfirmed">ϯⲙⲉⲧⲑⲁⲓⲗⲁⲛⲇⲓ</language>
+			<language type="ti" draft="unconfirmed">ϯⲙⲉⲧⲑⲓⲅⲣⲓⲛⲓ</language>
+			<language type="tk" draft="unconfirmed">ϯⲙⲉⲧⲑⲟⲩⲣⲕⲙⲁⲛⲓ</language>
+			<language type="tn" draft="unconfirmed">ϯⲙⲉⲧⲑ̀ⲥⲟⲩⲁⲛⲓ</language>
+			<language type="to" draft="unconfirmed">ϯⲙⲉⲧⲑⲟⲛⲅⲁⲛⲓ</language>
+			<language type="tr" draft="unconfirmed">ϯⲙⲉⲧⲭⲟⲝⲓⲥ</language>
+			<language type="tt" draft="unconfirmed">ϯⲙⲉⲧⲑⲁⲣⲑⲁⲣ</language>
+			<language type="ug" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲏⲅⲟⲩⲣ</language>
+			<language type="uk" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲕⲣⲁⲛⲓ</language>
+			<language type="und" draft="unconfirmed">ⲟⲩⲁⲥⲡⲓ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ</language>
+			<language type="ur" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲣⲇⲟⲩ</language>
+			<language type="uz" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲍⲃⲉⲕⲓ</language>
+			<language type="vec" draft="unconfirmed">ϯⲙⲉⲧⲃⲉⲛⲉⲑⲓ</language>
+			<language type="vi" draft="unconfirmed">ϯⲙⲉⲧⲃⲓⲉⲑⲛⲁⲙⲓ</language>
+			<language type="vmw" draft="unconfirmed">ϯⲙⲉⲧⲙⲁϧⲟⲩⲁ</language>
+			<language type="wo" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲟⲗⲟϥ</language>
+			<language type="xh" draft="unconfirmed">ϯⲙⲉⲧⲝⲟⲍⲁ</language>
+			<language type="xnr" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲛⲅⲣⲓ</language>
+			<language type="yo" draft="unconfirmed">ϯⲙⲉⲧⲓⲟⲣⲟⲩⲃⲁ</language>
+			<language type="yrl" draft="unconfirmed">ϯⲙⲉⲧⲛⲓⲛⲅⲁⲧⲟⲩ</language>
+			<language type="yue" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲛⲑⲟⲛⲓ</language>
+			<language type="yue" alt="menu" draft="unconfirmed">ϯⲙⲉⲧϭⲓⲛⲁ, ϯⲙⲉⲧⲕⲁⲛⲑⲟⲛⲓ</language>
+			<language type="za" draft="unconfirmed">ϯⲙⲉⲧⲍⲟⲩⲁⲛⲅ</language>
+			<language type="zh" draft="unconfirmed">ϯⲙⲉⲧϭⲓⲛⲁ</language>
+			<language type="zh" alt="menu" draft="unconfirmed">ϯⲙⲉⲧϭⲓⲛⲁ, ⲙⲁⲛⲇⲁⲣⲓⲛ</language>
+			<language type="zh_Hans" draft="unconfirmed">ϯⲙⲉⲧϭⲓⲛⲁ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ</language>
+			<language type="zh_Hans" alt="long" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲛⲇⲁⲣⲓⲛ ⲛ̀ϭⲓⲛⲁ ⲛ̀ⲁⲡⲗⲟⲩⲥ</language>
+			<language type="zh_Hant" draft="unconfirmed">ϯⲙⲉⲧϭⲛⲓⲁ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ</language>
+			<language type="zh_Hant" alt="long" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲛⲇⲁⲣⲓⲛ ⲛ̀ϭⲓⲛⲁ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ</language>
+			<language type="zu" draft="unconfirmed">ϯⲙⲉⲧⲍⲟⲩⲗⲟⲩ</language>
+			<language type="zxx" draft="unconfirmed">ⲙ̀ⲙⲟⲛ ⲁⲥⲡⲓ</language>
+		</languages>
+		<scripts>
+			<script type="Adlm" draft="unconfirmed">ϯⲙⲉⲧⲁⲇⲗⲁⲙ</script>
+			<script type="Arab" draft="unconfirmed">ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ</script>
+			<script type="Aran" draft="unconfirmed">ϯⲙⲉⲧⲛⲁⲥⲑⲁⲗⲓⲕ</script>
+			<script type="Armn" draft="unconfirmed">ϯⲙⲉⲧⲁⲣⲙⲉⲛⲓⲟⲥ</script>
+			<script type="Beng" draft="unconfirmed">ϯⲙⲉⲧⲃⲁⲛⲅⲗⲁ</script>
+			<script type="Bopo" draft="unconfirmed">ϯⲙⲉⲧⲃⲟⲡⲟⲙⲟϥⲟ</script>
+			<script type="Brai" draft="unconfirmed">ϯⲙⲉⲧⲃⲣⲁⲓⲗ</script>
+			<script type="Cakm" draft="unconfirmed">ϯⲙⲉⲧϭⲁⲕⲙⲁ</script>
+			<script type="Cans" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲛⲁⲇⲁ ⲁⲃⲟⲣⲓϫⲓⲛ ⲉⲧϩⲱⲧⲡ</script>
+			<script type="Cher" draft="unconfirmed">ϯⲙⲉⲧϭⲉⲣⲟⲩⲕⲓ</script>
+			<script type="Cyrl" draft="unconfirmed">ϯⲙⲉⲧⲕⲩⲣⲓⲗⲗⲓ</script>
+			<script type="Deva" draft="unconfirmed">ϯⲙⲉⲧⲇⲉⲃⲁⲛⲁⲅⲁⲣⲓ</script>
+			<script type="Ethi" draft="unconfirmed">ϯⲙⲉⲧⲉⲑⲱϣⲓ</script>
+			<script type="Geor" draft="unconfirmed">ϯⲙⲉⲧⲅⲉⲟⲣⲅⲓ</script>
+			<script type="Grek" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲉⲓⲛⲓⲛ</script>
+			<script type="Gujr" draft="unconfirmed">ϯⲙⲉⲧⲅⲟⲩϫⲁⲣⲁⲑⲓ</script>
+			<script type="Guru" draft="unconfirmed">ϯⲙⲉⲧⲅⲟⲩⲣⲙⲟⲩϧⲓ</script>
+			<script type="Hanb" draft="unconfirmed">ϩⲁⲛ ⲛⲉⲙ ⲃⲟⲡⲟⲙⲟϥⲟ</script>
+			<script type="Hang" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲛⲅⲟⲩⲗ</script>
+			<script type="Hani" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲛ</script>
+			<script type="Hans" draft="unconfirmed">ϩⲁⲡⲗⲟⲩⲥ</script>
+			<script type="Hans" alt="stand-alone" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲛ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ</script>
+			<script type="Hant" draft="unconfirmed">ⲙⲉⲧⲣⲉⲙⲕⲁϩⲥ</script>
+			<script type="Hant" alt="stand-alone" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲛ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ</script>
+			<script type="Hebr" draft="unconfirmed">ϯⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ</script>
+			<script type="Hira" draft="unconfirmed">ϯⲙⲉⲧϩⲓⲣⲁⲅⲁⲛⲁ</script>
+			<script type="Hrkt" draft="unconfirmed">ϯⲙⲉⲧⲓⲁⲡⲁⲛⲓ ⲛ̀ⲥⲩⲗⲗⲁⲃⲁⲣⲓⲥ</script>
+			<script type="Jamo" draft="unconfirmed">ϯⲙⲉⲧϫⲁⲙⲟ</script>
+			<script type="Jpan" draft="unconfirmed">ϯⲙⲉⲧⲓⲁⲡⲁⲛⲓ</script>
+			<script type="Kana" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲧⲁⲕⲁⲛⲁ</script>
+			<script type="Khmr" draft="unconfirmed">ϯⲙⲉⲧϧⲙⲉⲣ</script>
+			<script type="Knda" draft="unconfirmed">ϯⲙⲉⲧⲕⲁⲛⲛⲁⲇⲁ</script>
+			<script type="Kore" draft="unconfirmed">ϯⲙⲉⲧⲕⲟⲣⲓ</script>
+			<script type="Laoo" draft="unconfirmed">ϯⲙⲉⲧⲗⲁⲟ</script>
+			<script type="Latn" draft="unconfirmed">ϯⲙⲉⲧⲗⲁⲑⲓⲛⲓ</script>
+			<script type="Mlym" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲗⲁⲓⲁⲗⲁⲙⲓ</script>
+			<script type="Mong" draft="unconfirmed">ϯⲙⲉⲧⲙⲟⲛⲅⲟⲗⲓ</script>
+			<script type="Mtei" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲓⲑⲉⲓ ⲙⲁⲓⲉⲕ</script>
+			<script type="Mymr" draft="unconfirmed">ϯⲙⲉⲧⲙⲁⲓⲁⲛⲙⲁⲣⲓ</script>
+			<script type="Nkoo" draft="unconfirmed">ϯⲙⲉⲧⲛ̀ⲕⲟ</script>
+			<script type="Olck" draft="unconfirmed">ϯⲙⲉⲧⲟⲗ ϭⲓⲕⲓ</script>
+			<script type="Orya" draft="unconfirmed">ϯⲙⲉⲧⲟⲇⲓⲁ</script>
+			<script type="Rohg" draft="unconfirmed">ϯⲙⲉⲧϩⲁⲛⲓϥⲓ</script>
+			<script type="Sinh" draft="unconfirmed">ϯⲙⲉⲧⲥⲓⲛϩⲁⲗⲁ</script>
+			<script type="Sund" draft="unconfirmed">ϯⲙⲉⲧⲥⲟⲩⲇⲁⲛⲓ</script>
+			<script type="Syrc" draft="unconfirmed">ϯⲙⲉⲧⲁⲥⲥⲩⲣⲟⲥ</script>
+			<script type="Taml" draft="unconfirmed">ϯⲙⲉⲧⲑⲁⲙⲓⲗⲓ</script>
+			<script type="Telu" draft="unconfirmed">ϯⲙⲉⲧⲑⲉⲗⲟⲩⲅⲟⲩ</script>
+			<script type="Tfng" draft="unconfirmed">ϯⲙⲉⲧⲑⲓϥⲓⲛⲁⲅ</script>
+			<script type="Thaa" draft="unconfirmed">ϯⲙⲉⲧⲑⲁⲛⲁ</script>
+			<script type="Thai" draft="unconfirmed">ϯⲙⲉⲧⲑⲁⲓ</script>
+			<script type="Tibt" draft="unconfirmed">ϯⲙⲉⲧⲑⲓⲃⲉⲑⲓ</script>
+			<script type="Vaii" draft="unconfirmed">ϯⲙⲉⲧⲃⲁⲓ</script>
+			<script type="Yiii" draft="unconfirmed">ϯⲙⲉⲧⲩⲓ</script>
+			<script type="Zmth" draft="unconfirmed">ⲡⲓϫⲓⲛⲱⲡ ⲛ̀ⲥϧⲁⲓ</script>
+			<script type="Zsye" draft="unconfirmed">ⲉⲙⲟϫⲓ</script>
+			<script type="Zsym" draft="unconfirmed">ⲛⲓⲥⲩⲙⲃⲟⲗⲟⲛ</script>
+			<script type="Zxxx" draft="unconfirmed">ⲁⲧⲥ̀ϧⲏⲟⲩⲧ</script>
+			<script type="Zyyy" draft="unconfirmed">ⲛ̀ⲉⲣⲏⲟⲩ</script>
+			<script type="Zzzz" draft="unconfirmed">ⲟⲩⲥ̀ϧⲁⲓ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ</script>
+		</scripts>
+		<territories>
+			<territory type="001" draft="unconfirmed">ⲡⲓⲑⲟ</territory>
+			<territory type="002" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ</territory>
+			<territory type="003" draft="unconfirmed">ϯⲁⲙⲉⲣⲓⲕⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</territory>
+			<territory type="005" draft="unconfirmed">ϯⲁⲙⲉⲣⲓⲕⲁ ⲙ̀ⲡⲓⲣⲏⲥ</territory>
+			<territory type="009" draft="unconfirmed">ϯⲟⲥⲉⲁⲛⲓⲁ</territory>
+			<territory type="011" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ</territory>
+			<territory type="013" draft="unconfirmed">ϯⲁⲙⲉⲣⲓⲕⲁ ⲛ̀ⲑⲙⲏϯ</territory>
+			<territory type="014" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ</territory>
+			<territory type="015" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</territory>
+			<territory type="017" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲛ̀ⲑⲙⲏϯ</territory>
+			<territory type="018" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ</territory>
+			<territory type="019" draft="unconfirmed">ⲛⲓⲁⲙⲉⲣⲓⲕⲁ</territory>
+			<territory type="021" draft="unconfirmed">ϯⲁⲙⲉⲣⲓⲕⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</territory>
+			<territory type="029" draft="unconfirmed">ϯⲕⲁⲣⲓⲃⲓ</territory>
+			<territory type="030" draft="unconfirmed">ϯⲁⲥⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ</territory>
+			<territory type="034" draft="unconfirmed">ϯⲁⲥⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ</territory>
+			<territory type="035" draft="unconfirmed">ϯⲁⲥⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ ⲓⲉⲃⲧ</territory>
+			<territory type="039" draft="unconfirmed">ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲓⲣⲏⲥ</territory>
+			<territory type="053" draft="unconfirmed">ϯⲁⲩⲥⲧⲣⲁⲗⲁⲍⲓⲁ</territory>
+			<territory type="054" draft="unconfirmed">ϯⲙⲁⲉⲗⲁⲛⲉⲍⲓⲁ</territory>
+			<territory type="057" draft="unconfirmed">ϯⲙⲓⲕⲣⲟⲛⲉⲍⲓⲁ</territory>
+			<territory type="061" draft="unconfirmed">ϯⲡⲟⲗⲩⲛⲉⲍⲓⲁ</territory>
+			<territory type="142" draft="unconfirmed">ϯⲁⲥⲓⲁ</territory>
+			<territory type="143" draft="unconfirmed">ϯⲁⲥⲓⲁ ⲛ̀ⲑⲙⲏϯ</territory>
+			<territory type="145" draft="unconfirmed">ϯⲁⲥⲓⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ</territory>
+			<territory type="150" draft="unconfirmed">ϯⲉⲩⲣⲟⲡⲁ</territory>
+			<territory type="151" draft="unconfirmed">ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ</territory>
+			<territory type="154" draft="unconfirmed">ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</territory>
+			<territory type="155" draft="unconfirmed">ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ</territory>
+			<territory type="202" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲉⲧⲥⲏⲧ ⲙ̀ⲡϣⲁϥⲉ</territory>
+			<territory type="419" draft="unconfirmed">ϯⲁⲙⲉⲣⲓⲕⲁ ⲛ̀ⲗⲁⲑⲓⲛⲓ</territory>
+			<territory type="AC" draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛ̀ⲁⲥⲉⲛϣⲓⲟⲛ</territory>
+			<territory type="AD" draft="unconfirmed">ϯⲁⲛⲇⲟⲣⲁ</territory>
+			<territory type="AE" draft="unconfirmed">ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ</territory>
+			<territory type="AF" draft="unconfirmed">ϯⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ</territory>
+			<territory type="AG" draft="unconfirmed">ⲁⲛⲧⲓⲅⲟⲩⲁ &amp; ⲃⲁⲣⲃⲟⲩⲇⲁ</territory>
+			<territory type="AI" draft="unconfirmed">ϯⲁⲛⲅⲟⲩⲓⲗⲗⲁ</territory>
+			<territory type="AL" draft="unconfirmed">ϯⲁⲗⲃⲁⲛⲓⲁ</territory>
+			<territory type="AM" draft="unconfirmed">ϯⲁⲣⲙⲉⲛⲓⲁ</territory>
+			<territory type="AO" draft="unconfirmed">ϯⲁⲛⲅⲟⲗⲁ</territory>
+			<territory type="AQ" draft="unconfirmed">ⲁⲛⲑⲁⲣⲕⲧⲓⲕⲁ</territory>
+			<territory type="AR" draft="unconfirmed">ϯⲁⲣϫⲉⲛⲧⲓⲛ</territory>
+			<territory type="AS" draft="unconfirmed">ⲥⲁⲙⲟⲩⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ</territory>
+			<territory type="AT" draft="unconfirmed">ϯⲁⲩⲥⲑⲣⲓⲁ</territory>
+			<territory type="AU" draft="unconfirmed">ϯⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ</territory>
+			<territory type="AW" draft="unconfirmed">ϯⲁⲣⲟⲩⲃⲁ</territory>
+			<territory type="AX" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲁⲗⲁⲛⲇ</territory>
+			<territory type="AZ" draft="unconfirmed">ⲁⲇⲟⲩⲣⲃⲁⲇⲁⲅⲁⲛ</territory>
+			<territory type="BA" draft="unconfirmed">ϯⲃⲟⲥⲛⲓⲁ &amp; ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ</territory>
+			<territory type="BB" draft="unconfirmed">ϯⲃⲁⲣⲃⲁⲇⲟⲥ</territory>
+			<territory type="BD" draft="unconfirmed">ϯⲃⲁⲛⲅⲗⲁⲇⲉϣ</territory>
+			<territory type="BE" draft="unconfirmed">ϯⲃⲉⲗϫⲓⲕⲁ</territory>
+			<territory type="BF" draft="unconfirmed">ⲃⲟⲩⲣⲕⲓⲛⲁ ϥⲁⲥⲟ</territory>
+			<territory type="BG" draft="unconfirmed">ϯⲃⲟⲩⲗⲅⲁⲣⲓⲁ</territory>
+			<territory type="BH" draft="unconfirmed">ϯⲃⲁϩⲣⲉⲛ</territory>
+			<territory type="BI" draft="unconfirmed">ϯⲃⲟⲩⲣⲟⲩⲛⲇⲓ</territory>
+			<territory type="BJ" draft="unconfirmed">ϯⲃⲉⲛⲓⲛ</territory>
+			<territory type="BL" draft="unconfirmed">ⲥⲁⲛⲧ ⲃⲁⲣⲑⲉⲗⲉⲙⲓ</territory>
+			<territory type="BM" draft="unconfirmed">ϯⲃⲉⲣⲙⲟⲩⲇⲁ</territory>
+			<territory type="BN" draft="unconfirmed">ϯⲃⲣⲟⲩⲛⲉⲓ</territory>
+			<territory type="BO" draft="unconfirmed">ϯⲃⲟⲗⲓⲃⲓⲁ</territory>
+			<territory type="BQ" draft="unconfirmed">ϯⲕⲁⲣⲓⲃⲓ ⲛ̀ϩⲟⲗⲗⲁⲛⲇⲁ</territory>
+			<territory type="BR" draft="unconfirmed">ϯⲃⲣⲁⲍⲓⲗ</territory>
+			<territory type="BS" draft="unconfirmed">ϯⲃⲁϩⲁⲙⲁ</territory>
+			<territory type="BT" draft="unconfirmed">ϯⲃϩⲟⲩⲑⲁⲛ</territory>
+			<territory type="BV" draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛ̀ⲃⲟⲩⲃⲉⲧ</territory>
+			<territory type="BW" draft="unconfirmed">ϯⲃⲟⲑⲥⲟⲩⲁⲛⲁ</territory>
+			<territory type="BY" draft="unconfirmed">ϯⲃⲉⲗⲁⲣⲟⲩⲥ</territory>
+			<territory type="BZ" draft="unconfirmed">ϯⲃⲉⲗⲓⲍⲉ</territory>
+			<territory type="CA" draft="unconfirmed">ϯⲕⲁⲛⲁⲇⲁ</territory>
+			<territory type="CC" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ</territory>
+			<territory type="CD" draft="unconfirmed">ⲕⲟⲛⲅⲟ ⲕⲓⲛϣⲁⲥⲁ</territory>
+			<territory type="CD" alt="variant" draft="unconfirmed">ⲕⲟⲛⲅⲟ ⲇⲣⲥ</territory>
+			<territory type="CF" draft="unconfirmed">ϯⲙⲉⲧϣ̀ⲗⲟⲗ ⲙ̀ⲫⲣⲓⲕⲓⲁ ⲛ̀ⲑⲙⲏϯ</territory>
+			<territory type="CG" draft="unconfirmed">ⲕⲟⲛⲅⲟ - ⲃⲣⲁⲍⲁⲃⲓⲗ</territory>
+			<territory type="CG" alt="variant" draft="unconfirmed">ϯⲕⲟⲛⲅⲟ</territory>
+			<territory type="CH" draft="unconfirmed">ϯⲥⲟⲩⲓⲥⲣⲁ</territory>
+			<territory type="CI" draft="unconfirmed">ϯⲕⲟⲧ ⲇⲓⲃⲟⲩⲁⲣ</territory>
+			<territory type="CK" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ</territory>
+			<territory type="CL" draft="unconfirmed">ϯϭⲓⲗⲉ</territory>
+			<territory type="CM" draft="unconfirmed">ϯⲕⲁⲙⲉⲣⲟⲩⲛ</territory>
+			<territory type="CN" draft="unconfirmed">ϯϭⲓⲛⲁ</territory>
+			<territory type="CO" draft="unconfirmed">ϯⲕⲟⲗⲟⲙⲃⲓⲁ</territory>
+			<territory type="CP" draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛ̀ⲕⲗⲓⲡⲉⲣⲑⲟⲛ</territory>
+			<territory type="CQ" draft="unconfirmed">ⲥⲁⲣⲕ</territory>
+			<territory type="CR" draft="unconfirmed">ⲕⲟⲥⲑⲁ ⲣⲓⲕⲁ</territory>
+			<territory type="CU" draft="unconfirmed">ϯⲕⲟⲩⲃⲁ</territory>
+			<territory type="CV" draft="unconfirmed">ϯⲕⲁⲡ ⲃⲉⲣⲇⲉ</territory>
+			<territory type="CW" draft="unconfirmed">ϯⲕⲟⲩⲣⲁⲥⲁⲟ</territory>
+			<territory type="CX" draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛ̀ⲭⲣⲓⲥⲧⲙⲁⲥ</territory>
+			<territory type="CY" draft="unconfirmed">ⲕⲩⲡⲣⲟⲥ</territory>
+			<territory type="CZ" draft="unconfirmed">ϯϭⲉⲕⲓⲁ</territory>
+			<territory type="CZ" alt="variant" draft="unconfirmed">ϯⲙⲉⲧϣ̀ⲗⲟⲗ ⲛ̀ϭⲉⲕ</territory>
+			<territory type="DE" draft="unconfirmed">ϯⲁⲗⲙⲁⲛⲓⲁ</territory>
+			<territory type="DG" draft="unconfirmed">ⲇⲓⲉⲅⲟ ⲅⲁⲣⲥⲓⲁ</territory>
+			<territory type="DJ" draft="unconfirmed">ϯⲇϫⲓⲃⲟⲩⲑⲓ</territory>
+			<territory type="DK" draft="unconfirmed">ϯⲇⲉⲛⲙⲁⲣⲕ</territory>
+			<territory type="DM" draft="unconfirmed">ϯⲇⲟⲙⲓⲛⲓⲕⲁ</territory>
+			<territory type="DO" draft="unconfirmed">ϯⲇⲟⲙⲓⲛⲓⲕⲁⲛ</territory>
+			<territory type="DZ" draft="unconfirmed">ϯⲁⲗϫⲉⲣⲓⲁ</territory>
+			<territory type="EA" draft="unconfirmed">ⲥⲉⲩⲑⲁ &amp; ⲙⲉⲗⲓⲗⲗⲁ</territory>
+			<territory type="EC" draft="unconfirmed">ϯⲉⲕⲟⲩⲁⲇⲟⲣ</territory>
+			<territory type="EE" draft="unconfirmed">ϯⲉⲥⲑⲟⲛⲓⲁ</territory>
+			<territory type="EG" draft="unconfirmed">ⲭⲏⲙⲓ</territory>
+			<territory type="EH" draft="unconfirmed">ⲡⲓϣⲁϥⲉ ⲙ̀ⲡⲉⲙⲉⲛⲧ</territory>
+			<territory type="ER" draft="unconfirmed">ϯⲉⲣⲓⲑⲣⲓⲁ</territory>
+			<territory type="ES" draft="unconfirmed">ⲉⲥⲡⲁⲛⲓⲁ</territory>
+			<territory type="ET" draft="unconfirmed">ⲉⲑⲁⲩϣ</territory>
+			<territory type="EU" draft="unconfirmed">ϯⲙⲉⲧⲣⲉⲙⲉⲩⲣⲟⲡⲁ ⲉⲧϩⲱⲧⲡ</territory>
+			<territory type="EZ" draft="unconfirmed">ϯⲉⲩⲣⲟⲍⲟⲛ</territory>
+			<territory type="FI" draft="unconfirmed">ϯϥⲓⲛⲗⲁⲛⲇ</territory>
+			<territory type="FJ" draft="unconfirmed">ϥⲓⲇϫⲓ</territory>
+			<territory type="FK" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ</territory>
+			<territory type="FK" alt="variant" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ (ⲓⲥⲗⲁⲥ ⲙⲁⲗⲃⲓⲛⲁⲥ)</territory>
+			<territory type="FM" draft="unconfirmed">ⲙⲓⲕⲣⲟⲛⲉⲍⲓⲁ</territory>
+			<territory type="FO" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲁⲣⲟⲉ</territory>
+			<territory type="FR" draft="unconfirmed">ϯϥⲉⲣⲉⲛⲥⲁ</territory>
+			<territory type="GA" draft="unconfirmed">ϯⲅⲁⲃⲟⲛ</territory>
+			<territory type="GB" draft="unconfirmed">ϯⲙⲉⲧⲟⲩⲣⲟ ⲉⲧϩⲱⲧⲡ</territory>
+			<territory type="GD" draft="unconfirmed">ϯⲅⲣⲉⲛⲁⲇⲁ</territory>
+			<territory type="GE" draft="unconfirmed">ϯⲅⲉⲟⲣⲅⲓⲁ</territory>
+			<territory type="GF" draft="unconfirmed">ϯⲅⲟⲩⲓⲁⲛⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲉⲟⲥ</territory>
+			<territory type="GG" draft="unconfirmed">ϯⲅⲟⲩⲉⲣⲛⲉⲥⲓ</territory>
+			<territory type="GH" draft="unconfirmed">ϯⲅⲁⲛⲁ</territory>
+			<territory type="GI" draft="unconfirmed">ϯϫⲓⲃⲣⲁⲗⲑⲁⲣ</territory>
+			<territory type="GL" draft="unconfirmed">ϯⲅⲣⲓⲛⲗⲁⲛⲇ</territory>
+			<territory type="GM" draft="unconfirmed">ϯⲅⲁⲙⲃⲓⲁ</territory>
+			<territory type="GN" draft="unconfirmed">ϯⲅⲓⲛⲉⲁ</territory>
+			<territory type="GP" draft="unconfirmed">ϯⲅⲟⲩⲁⲇⲉⲗⲟⲩⲡ</territory>
+			<territory type="GQ" draft="unconfirmed">ⲅⲓⲛⲉⲁ ⲛ̀ⲉⲕⲟⲩⲁⲑⲱⲣ</territory>
+			<territory type="GR" draft="unconfirmed">ϯⲉⲗⲗⲁⲥ</territory>
+			<territory type="GS" draft="unconfirmed">ϫⲉⲟⲣϫⲓⲁ ⲛ̀ⲣⲏⲥ &amp; ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲁⲛⲇⲟⲩⲓϭ</territory>
+			<territory type="GT" draft="unconfirmed">ϯⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ</territory>
+			<territory type="GU" draft="unconfirmed">ⲅⲟⲩⲁⲙ</territory>
+			<territory type="GW" draft="unconfirmed">ϯⲅⲓⲛⲉⲁ ⲃⲓⲥⲁⲩ</territory>
+			<territory type="GY" draft="unconfirmed">ϯⲅⲩⲁⲛⲁ</territory>
+			<territory type="HK" draft="unconfirmed">ϩⲟⲛⲅ ⲕⲟⲛⲅ ⲥⲁⲣ ϭⲓⲛⲁ</territory>
+			<territory type="HK" alt="short" draft="unconfirmed">ϯϩⲟⲛⲅ ⲕⲟⲛⲅ</territory>
+			<territory type="HM" draft="unconfirmed">ϩⲉⲣⲇ &amp; ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲕⲇⲟⲛⲁⲗⲇ</territory>
+			<territory type="HN" draft="unconfirmed">ϯϩⲟⲛⲇⲟⲩⲣⲁⲥ</territory>
+			<territory type="HR" draft="unconfirmed">ϯⲕⲣⲟⲁⲑⲓⲁ</territory>
+			<territory type="HT" draft="unconfirmed">ϯϩⲁⲓⲑⲓ</territory>
+			<territory type="HU" draft="unconfirmed">ϯϩⲁⲛⲅⲁⲣⲓⲁ</territory>
+			<territory type="IC" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲛⲁⲣⲓ</territory>
+			<territory type="ID" draft="unconfirmed">ϯⲓⲛⲇⲟⲛⲉⲥⲓⲁ</territory>
+			<territory type="IE" draft="unconfirmed">ϯⲁⲓⲉⲣⲗⲁⲛⲇⲁ</territory>
+			<territory type="IL" draft="unconfirmed">ⲡⲓⲥⲣⲁⲏⲗ</territory>
+			<territory type="IM" draft="unconfirmed">ⲅⲟⲩⲉⲣⲛⲥⲓ</territory>
+			<territory type="IN" draft="unconfirmed">ϯϩⲉⲛⲧⲟⲩ</territory>
+			<territory type="IO" draft="unconfirmed">ⲛⲓⲑⲱϣ ⲙⲃⲣⲓⲑⲁⲛⲓⲁ ⲛ̀ⲱⲕⲉⲁⲛⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ</territory>
+			<territory type="IO" alt="chagos" draft="unconfirmed">ⲡⲓⲁⲣⲭⲏⲡⲉⲗⲁⲅⲟ ⲛ̀ϭⲁⲅⲟⲥ</territory>
+			<territory type="IQ" draft="unconfirmed">ⲓⲣⲁⲕ</territory>
+			<territory type="IR" draft="unconfirmed">ϯⲡⲉⲣⲥⲓⲁ</territory>
+			<territory type="IS" draft="unconfirmed">ϯⲁⲓⲥⲗⲁⲛⲇⲁ</territory>
+			<territory type="IT" draft="unconfirmed">ϯϩⲩⲧⲁⲗⲓⲁ</territory>
+			<territory type="JE" draft="unconfirmed">ϯϫⲉⲣⲥⲓ</territory>
+			<territory type="JM" draft="unconfirmed">ϯϫⲁⲙⲁⲓⲕⲁ</territory>
+			<territory type="JO" draft="unconfirmed">ⲡⲓⲓⲟⲣⲇⲁⲛⲏⲥ</territory>
+			<territory type="JP" draft="unconfirmed">ϯⲓⲁⲡⲁⲛ</territory>
+			<territory type="KE" draft="unconfirmed">ϯⲕⲉⲛⲓⲁ</territory>
+			<territory type="KG" draft="unconfirmed">ϯⲕⲩⲣⲅⲩⲥⲑⲁⲛ</territory>
+			<territory type="KH" draft="unconfirmed">ϯⲕⲁⲙⲃⲟⲇⲓⲁ</territory>
+			<territory type="KI" draft="unconfirmed">ⲕⲓⲣⲓⲃⲁⲑⲓ</territory>
+			<territory type="KM" draft="unconfirmed">ϯⲕⲟⲙⲟⲣⲟⲥ</territory>
+			<territory type="KN" draft="unconfirmed">ⲥⲁⲛⲧ ⲕⲓⲧⲥ &amp; ⲛⲉⲃⲓⲥ</territory>
+			<territory type="KP" draft="unconfirmed">ϯⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</territory>
+			<territory type="KR" draft="unconfirmed">ϯⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ</territory>
+			<territory type="KW" draft="unconfirmed">ⲕⲟⲩⲉⲧ</territory>
+			<territory type="KY" draft="unconfirmed">ϯⲕⲁⲓⲙⲁⲛ ⲙⲟⲩⲓ</territory>
+			<territory type="KZ" draft="unconfirmed">ϯⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ</territory>
+			<territory type="LA" draft="unconfirmed">ϯⲗⲁⲟⲥ</territory>
+			<territory type="LB" draft="unconfirmed">ⲡⲓⲖⲓⲃⲁⲛⲟⲥ</territory>
+			<territory type="LC" draft="unconfirmed">ⲥⲁⲛⲧ ⲗⲟⲩϭⲓⲁ</territory>
+			<territory type="LI" draft="unconfirmed">ϯⲗⲓϣⲑⲉⲛϣⲑⲁⲓⲛ</territory>
+			<territory type="LK" draft="unconfirmed">ϯⲥⲣⲓⲗⲁⲛⲕⲁ</territory>
+			<territory type="LR" draft="unconfirmed">ϯⲗⲓⲃⲉⲣⲓⲁ</territory>
+			<territory type="LS" draft="unconfirmed">ϯⲗⲉⲥⲟⲑⲟ</territory>
+			<territory type="LT" draft="unconfirmed">ϯⲗⲓⲑⲟⲩⲁⲛⲓⲁ</territory>
+			<territory type="LU" draft="unconfirmed">ϯⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲅ</territory>
+			<territory type="LV" draft="unconfirmed">ϯⲗⲁⲑⲃⲓⲁ</territory>
+			<territory type="LY" draft="unconfirmed">ⲗⲩⲃⲓⲏ</territory>
+			<territory type="MA" draft="unconfirmed">ϯⲙⲁⲣⲁⲕⲉϣ</territory>
+			<territory type="MC" draft="unconfirmed">ϯⲙⲟⲛⲁⲕⲟ</territory>
+			<territory type="MD" draft="unconfirmed">ϯⲙⲟⲗⲇⲟⲃⲁ</territory>
+			<territory type="ME" draft="unconfirmed">ϯⲙⲟⲛⲑⲉⲛⲉⲅⲣⲟ</territory>
+			<territory type="MF" draft="unconfirmed">ⲥⲁⲛⲧ ⲙⲁⲣⲑⲓⲛ</territory>
+			<territory type="MG" draft="unconfirmed">ϯⲙⲁⲇⲁⲅⲁⲥⲕⲁⲣ</territory>
+			<territory type="MH" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲙⲁⲣϣⲁⲗ</territory>
+			<territory type="MK" draft="unconfirmed">ϯⲙⲁⲕⲉⲇⲟⲛⲓⲁ ⲛ̀ⲉⲙϩⲓⲧ</territory>
+			<territory type="ML" draft="unconfirmed">ϯⲙⲁⲗⲓ</territory>
+			<territory type="MM" draft="unconfirmed">ϯⲙⲩⲁⲛⲙⲁⲣ</territory>
+			<territory type="MN" draft="unconfirmed">ϯⲙⲁⲛⲅⲟⲗⲓⲁ</territory>
+			<territory type="MO" draft="unconfirmed">ⲙⲁⲕⲁⲟ ⲥⲁⲣ ϭⲓⲛⲁ</territory>
+			<territory type="MO" alt="short" draft="unconfirmed">ϯⲙⲁⲕⲁⲟ</territory>
+			<territory type="MP" draft="unconfirmed">ⲛⲓⲙⲟⲓ ⲙ̀ⲡⲉⲙϩⲓⲧ ⲙ̀ⲙⲁⲣⲓⲁⲛⲁ</territory>
+			<territory type="MQ" draft="unconfirmed">ϯⲙⲁⲣⲑⲓⲛⲓⲕ</territory>
+			<territory type="MR" draft="unconfirmed">ϯⲙⲁⲩⲣⲓⲑⲁⲛⲓⲁ</territory>
+			<territory type="MS" draft="unconfirmed">ϯⲙⲟⲛⲥⲉⲣⲁⲧ</territory>
+			<territory type="MT" draft="unconfirmed">ϯⲙⲁⲗⲑⲁ</territory>
+			<territory type="MU" draft="unconfirmed">ϯⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ</territory>
+			<territory type="MV" draft="unconfirmed">ⲙⲁⲗⲇⲓⲃ</territory>
+			<territory type="MW" draft="unconfirmed">ϯⲙⲁⲗⲁⲩⲓ</territory>
+			<territory type="MX" draft="unconfirmed">ϯⲙⲉⲝⲓⲕⲟ</territory>
+			<territory type="MY" draft="unconfirmed">ϯⲙⲁⲗⲉⲍⲓⲁ</territory>
+			<territory type="MZ" draft="unconfirmed">ϯⲙⲟⲍⲁⲙⲃⲓⲕ</territory>
+			<territory type="NA" draft="unconfirmed">ϯⲛⲁⲙⲓⲃⲓⲁ</territory>
+			<territory type="NC" draft="unconfirmed">ⲛⲓⲟⲩ ⲕⲁⲗⲉⲇⲟⲛⲓⲁ</territory>
+			<territory type="NE" draft="unconfirmed">ϯⲛⲓϫⲉⲣ</territory>
+			<territory type="NF" draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛⲛ̀ⲟⲣϥⲟⲕ</territory>
+			<territory type="NG" draft="unconfirmed">ϯⲛⲓϫⲉⲣⲓⲁ</territory>
+			<territory type="NI" draft="unconfirmed">ϯⲛⲓⲕⲁⲣⲁⲅⲩⲟⲁ</territory>
+			<territory type="NL" draft="unconfirmed">ϯϩⲟⲗⲁⲛⲇⲁ</territory>
+			<territory type="NO" draft="unconfirmed">ϯⲛⲟⲣⲟⲩⲓϫⲓⲁ</territory>
+			<territory type="NP" draft="unconfirmed">ϯⲛⲉⲡⲁⲗ</territory>
+			<territory type="NR" draft="unconfirmed">ⲛⲁⲩⲣⲟⲩ</territory>
+			<territory type="NU" draft="unconfirmed">ⲛⲓⲟⲩⲉ</territory>
+			<territory type="NZ" draft="unconfirmed">ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ</territory>
+			<territory type="NZ" alt="variant" draft="unconfirmed">ⲁⲟⲑⲉⲁⲣⲟⲁ ⲛⲓⲟⲩ ⲍⲓⲗⲁⲛⲇⲁ</territory>
+			<territory type="OM" draft="unconfirmed">ⲟⲙⲁⲛ</territory>
+			<territory type="PA" draft="unconfirmed">ϯⲡⲁⲛⲁⲙⲁ</territory>
+			<territory type="PE" draft="unconfirmed">ϯⲡⲉⲣⲟⲩ</territory>
+			<territory type="PF" draft="unconfirmed">ⲡⲟⲗⲓⲛⲉⲍⲓⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ</territory>
+			<territory type="PG" draft="unconfirmed">ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ</territory>
+			<territory type="PH" draft="unconfirmed">ϯⲫⲓⲗⲓⲡⲡⲓⲛ</territory>
+			<territory type="PK" draft="unconfirmed">ϯⲡⲁⲕⲓⲥⲑⲁⲛ</territory>
+			<territory type="PL" draft="unconfirmed">ϯⲡⲟⲗⲁⲛⲇⲁ</territory>
+			<territory type="PM" draft="unconfirmed">ⲥⲁⲛⲧ ⲡⲓⲉⲣ &amp; ⲙⲓⲕⲉⲗⲟⲛ</territory>
+			<territory type="PN" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲡⲓⲑⲕⲉⲣⲛ</territory>
+			<territory type="PR" draft="unconfirmed">ⲡⲟⲩⲉⲣⲑⲟ ⲣⲓⲕⲟ</territory>
+			<territory type="PS" draft="unconfirmed">ⲫⲩⲗⲓⲥⲧⲓⲓⲙ</territory>
+			<territory type="PT" draft="unconfirmed">ϯⲡⲟⲣⲑⲟⲩⲅⲁⲗ</territory>
+			<territory type="PW" draft="unconfirmed">ⲡⲁⲗⲁⲩ</territory>
+			<territory type="PY" draft="unconfirmed">ϯⲡⲁⲣⲁⲅⲟⲩⲁⲓ</territory>
+			<territory type="QA" draft="unconfirmed">ⲕⲁⲑⲁⲣ</territory>
+			<territory type="QO" draft="unconfirmed">ϯⲟⲥⲉⲁⲛⲓⲁ</territory>
+			<territory type="RE" draft="unconfirmed">ϯⲣⲉⲓⲟⲩⲛⲓⲟⲛ</territory>
+			<territory type="RO" draft="unconfirmed">ϯⲣⲟⲙⲁⲛⲓⲁ</territory>
+			<territory type="RS" draft="unconfirmed">ϯⲥⲉⲣⲃⲓⲁ</territory>
+			<territory type="RU" draft="unconfirmed">ϯⲣⲟⲩⲥⲓⲁ</territory>
+			<territory type="RW" draft="unconfirmed">ϯⲣⲟⲩⲁⲛⲇⲁ</territory>
+			<territory type="SA" draft="unconfirmed">ϯⲥⲁⲟⲩⲇⲓ ⲛ̀ⲁⲣⲁⲃⲟⲥ</territory>
+			<territory type="SB" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ</territory>
+			<territory type="SC" draft="unconfirmed">ϯⲥⲓϭⲉⲗ</territory>
+			<territory type="SD" draft="unconfirmed">ϯⲥⲟⲩⲇⲁⲛ</territory>
+			<territory type="SE" draft="unconfirmed">ϯⲥⲟⲩⲉⲇ</territory>
+			<territory type="SG" draft="unconfirmed">ϯⲥⲓⲛⲅⲁⲡⲟⲣ</territory>
+			<territory type="SH" draft="unconfirmed">ⲥⲁⲛⲧ ϩⲉⲗⲁⲛⲁ</territory>
+			<territory type="SI" draft="unconfirmed">ϯⲥⲗⲟⲃⲉⲛⲓⲁ</territory>
+			<territory type="SJ" draft="unconfirmed">ⲥⲃⲁⲗⲃⲁⲣⲇ &amp; ⲓⲁⲛ ⲙⲁⲩⲉⲛ</territory>
+			<territory type="SK" draft="unconfirmed">ϯⲥⲗⲟⲃⲁⲕⲓⲁ</territory>
+			<territory type="SL" draft="unconfirmed">ϯⲥⲓⲉⲣⲁ ⲗⲉⲟⲛ</territory>
+			<territory type="SM" draft="unconfirmed">ⲥⲁⲛ ⲙⲁⲣⲓⲛⲟ</territory>
+			<territory type="SN" draft="unconfirmed">ϯⲥⲉⲛⲉⲅⲁⲗ</territory>
+			<territory type="SO" draft="unconfirmed">ϯⲥⲟⲙⲁⲗⲓⲁ</territory>
+			<territory type="SR" draft="unconfirmed">ϯⲥⲟⲩⲣⲓⲛⲁⲙ</territory>
+			<territory type="SS" draft="unconfirmed">ϯⲥⲟⲩⲇⲁⲛ ⲛ̀ⲣⲏⲥ</territory>
+			<territory type="ST" draft="unconfirmed">ⲥⲁⲟ ⲑⲟⲙⲉ &amp; ⲡⲣⲓⲛⲥⲓⲡ</territory>
+			<territory type="SV" draft="unconfirmed">ⲉⲗ ⲥⲁⲗⲃⲁⲇⲟⲣ</territory>
+			<territory type="SX" draft="unconfirmed">ⲥⲓⲛⲧ ⲙⲁⲁⲣⲑⲉⲛ</territory>
+			<territory type="SY" draft="unconfirmed">ϯⲥⲩⲣⲓⲁ</territory>
+			<territory type="SZ" draft="unconfirmed">ϯⲉⲥⲟⲩⲁⲑⲓⲛⲓ</territory>
+			<territory type="SZ" alt="variant" draft="unconfirmed">ϯⲥⲟⲩⲁⲍⲓⲗⲁⲛⲇ</territory>
+			<territory type="TA" draft="unconfirmed">ⲑⲣⲓⲥⲑⲁⲛ ⲇⲁ ⲕⲟⲩⲛϩⲁ</territory>
+			<territory type="TC" draft="unconfirmed">ⲑⲟⲩⲣⲕϣ &amp; ⲕⲁⲓⲕⲟⲥ</territory>
+			<territory type="TD" draft="unconfirmed">ϯϭⲁⲇ</territory>
+			<territory type="TF" draft="unconfirmed">ⲛⲓⲑⲱϣ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ ⲙ̀ⲙⲁⲣⲏⲥ</territory>
+			<territory type="TG" draft="unconfirmed">ϯⲑⲟⲅⲟ</territory>
+			<territory type="TH" draft="unconfirmed">ϯⲑⲁⲓⲗⲁⲛⲇ</territory>
+			<territory type="TJ" draft="unconfirmed">ϯⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ</territory>
+			<territory type="TK" draft="unconfirmed">ⲑⲟⲕⲉⲗⲁⲩ</territory>
+			<territory type="TL" draft="unconfirmed">ϯⲑⲙⲟⲣ - ⲗⲉⲥⲑⲉ</territory>
+			<territory type="TL" alt="variant" draft="unconfirmed">ϯⲑⲓⲙⲟⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ</territory>
+			<territory type="TM" draft="unconfirmed">ϯⲑⲟⲩⲣⲕⲙⲁⲛⲓⲥⲑⲁⲛ</territory>
+			<territory type="TN" draft="unconfirmed">ϯⲑⲟⲩⲛⲓⲥ</territory>
+			<territory type="TO" draft="unconfirmed">ⲑⲟⲛⲅⲁ</territory>
+			<territory type="TR" draft="unconfirmed">ϯⲑⲟⲩⲣⲕⲓⲁ</territory>
+			<territory type="TT" draft="unconfirmed">ⲧⲣⲓⲛⲓⲇⲁⲇ &amp; ⲧⲟⲃⲁⲅⲟ</territory>
+			<territory type="TV" draft="unconfirmed">ⲑⲟⲩⲃⲁⲗⲟⲩ</territory>
+			<territory type="TW" draft="unconfirmed">ϯⲑⲁⲓⲟⲩⲁⲛ</territory>
+			<territory type="TZ" draft="unconfirmed">ϯⲑⲁⲛⲍⲁⲛⲓⲁ</territory>
+			<territory type="UA" draft="unconfirmed">ϯⲟⲩⲕⲣⲁⲛⲓⲁ</territory>
+			<territory type="UG" draft="unconfirmed">ϯⲟⲩⲅⲁⲛⲇⲁ</territory>
+			<territory type="UM" draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲁⲩⲑⲗⲁⲓⲛⲅ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁ</territory>
+			<territory type="UN" draft="unconfirmed">ⲛⲓϣ̀ⲗⲟⲗ ⲉⲧϩⲱⲧⲡ</territory>
+			<territory type="US" draft="unconfirmed">ⲛⲓⲑⲱϣ ⲉⲧϩⲱⲧⲡ</territory>
+			<territory type="UY" draft="unconfirmed">ϯⲟⲩⲣⲟⲅⲟⲩⲁⲓ</territory>
+			<territory type="UZ" draft="unconfirmed">ϯⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ</territory>
+			<territory type="VA" draft="unconfirmed">ϯⲃⲁⲧⲓⲕⲁⲛ</territory>
+			<territory type="VC" draft="unconfirmed">ⲥⲁⲛ ⲃⲓⲛⲥⲉⲛⲧ &amp; ⲅⲣⲉⲛⲁⲇⲓⲛⲍ</territory>
+			<territory type="VE" draft="unconfirmed">ϯⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ</territory>
+			<territory type="VG" draft="unconfirmed">ⲃⲓⲣϫⲓⲛ ⲙⲟⲩⲓ ⲃⲣⲓⲑⲁⲛⲓⲁ</territory>
+			<territory type="VI" draft="unconfirmed">ⲃⲓⲣϫⲓⲛ ⲙⲟⲩⲓ ⲁⲙⲉⲣⲓⲕⲁ</territory>
+			<territory type="VN" draft="unconfirmed">ϯⲃⲓⲉⲑⲛⲁⲙ</territory>
+			<territory type="VU" draft="unconfirmed">ⲃⲁⲛⲁⲑⲟⲩ</territory>
+			<territory type="WF" draft="unconfirmed">ⲟⲩⲁⲗⲗⲓⲥ &amp; ϥⲟⲩⲧⲟⲩⲛⲁ</territory>
+			<territory type="WS" draft="unconfirmed">ⲥⲁⲙⲟⲁ</territory>
+			<territory type="XA" draft="unconfirmed">ⲯⲉⲩⲇⲟ ϫⲓⲛⲧⲁⲟⲩⲟ</territory>
+			<territory type="XB" draft="unconfirmed">ⲯⲉⲩⲇⲟ ⲃⲓⲇⲓ</territory>
+			<territory type="XK" draft="unconfirmed">ϯⲕⲟⲥⲟⲃⲟ</territory>
+			<territory type="YE" draft="unconfirmed">ⲓⲉⲙⲉⲛ</territory>
+			<territory type="YT" draft="unconfirmed">ϯⲙⲁⲓⲟⲧ</territory>
+			<territory type="ZA" draft="unconfirmed">ϯⲫⲣⲓⲕⲓⲁ ⲛ̀ⲣⲏⲥ</territory>
+			<territory type="ZM" draft="unconfirmed">ϯⲍⲁⲙⲃⲓⲁ</territory>
+			<territory type="ZW" draft="unconfirmed">ϯⲍⲓⲙⲃⲁⲃⲟⲩⲉ</territory>
+			<territory type="ZZ" draft="unconfirmed">ⲟⲩⲙⲁ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ</territory>
+		</territories>
+		<keys>
+			<key type="calendar" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲇⲁ</type>
+			<type key="calendar" type="buddhist" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲃⲟⲩⲇⲁ</type>
+			<type key="calendar" type="chinese" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ</type>
+			<type key="calendar" type="chinese" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ϭⲓⲛⲁ</type>
+			<type key="calendar" type="coptic" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ</type>
+			<type key="calendar" type="coptic" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ</type>
+			<type key="calendar" type="dangi" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲅⲓ</type>
+			<type key="calendar" type="dangi" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲇⲁⲛⲅⲓ</type>
+			<type key="calendar" type="ethiopic" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ</type>
+			<type key="calendar" type="ethiopic" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ ⲛ̀ⲁⲙⲉⲑⲉ ⲁⲗⲉⲙ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ ⲛ̀ⲁⲙⲉⲑⲉ ⲁⲗⲉⲙ</type>
+			<type key="calendar" type="gregorian" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ</type>
+			<type key="calendar" type="hebrew" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲉⲃⲣⲉⲟⲥ</type>
+			<type key="calendar" type="hebrew" scope="core" draft="unconfirmed">ⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ</type>
+			<type key="calendar" type="islamic" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ</type>
+			<type key="calendar" type="islamic" scope="core" draft="unconfirmed">ϯⲙⲉⲧϩⲓϫⲣⲓ</type>
+			<type key="calendar" type="islamic-civil" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲁ (ⲑⲁⲃⲩⲗⲁⲣ, ⲉⲡⲟϧ)</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="unconfirmed">ⲣⲉⲙⲛⲛ̀ϩⲓϫⲣⲓ (ⲑⲁⲃⲩⲗⲁⲣ, ⲉⲡⲟϧ)</type>
+			<type key="calendar" type="islamic-tbla" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ</type>
+			<type key="calendar" type="islamic-tbla" scope="core" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ</type>
+			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ</type>
+			<type key="calendar" type="islamic-umalqura" scope="core" draft="unconfirmed">ϯⲙⲉⲧϩⲓϫⲣⲓ (ⲟⲩⲙ ⲁⲗ ⲕⲟⲩⲣⲁ)</type>
+			<type key="calendar" type="iso8601" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ (ⲣⲟⲙⲡⲓ ⲛ̀ϣⲱⲣⲡ)</type>
+			<type key="calendar" type="japanese" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛⲓ</type>
+			<type key="calendar" type="japanese" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛⲓ</type>
+			<type key="calendar" type="persian" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲥⲟⲥ</type>
+			<type key="calendar" type="persian" scope="core" draft="unconfirmed">ⲣⲉⲙⲛ̀ⲡⲉⲣⲥⲟⲥ</type>
+			<type key="calendar" type="roc" draft="unconfirmed">ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲓⲛⲅⲟⲩⲟ</type>
+			<type key="calendar" type="roc" scope="core" draft="unconfirmed">ⲙⲓⲛⲅⲟⲩⲟ</type>
+		</types>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">ϯⲁⲥⲡⲓ: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">ⲡ̀ϫⲓⲛⲥ̀ϧⲁⲓ: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">ϯⲭⲱⲣⲁ: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[ⲁ ⲃ ⲅ ⲇ ⲉ ⲋ ⲍ ⲏ ⲑ ⲓ ⲕ ⲗ ⲙ ⲛ ⲝ ⲟ ⲡ ⲣ ⲥ ⲧ ⲩ ⲫ ⲭ ⲯ ⲱ ϣ ϥ ϧ ϩ ϫ ϭ ϯ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[⳥ ⳦ ⳧ ⳨ ⳩ ⳪ ⳤ]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[– ⸗ , ; \: . ⳹ ⳾ ⳼ ⳿ ( )]</exemplarCharacters>
 	</characters>
+	<dates>
+		<calendars>
+			<calendar type="coptic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Ⲑⲱⲟⲩⲧ</month>
+							<month type="2" draft="unconfirmed">Ⲡⲁⲟⲡⲓ</month>
+							<month type="3" draft="unconfirmed">Ⲁⲑⲱⲣ</month>
+							<month type="4" draft="unconfirmed">Ⲭⲟⲓⲁⲕ</month>
+							<month type="5" draft="unconfirmed">Ⲧⲱⲃⲓ</month>
+							<month type="6" draft="unconfirmed">Ⲙⲉϣⲓⲣ</month>
+							<month type="7" draft="unconfirmed">Ⲡⲁⲣⲉⲙϩⲁⲧ</month>
+							<month type="8" draft="unconfirmed">Ⲫⲁⲣⲙⲟⲩⲑⲓ</month>
+							<month type="9" draft="unconfirmed">Ⲡⲁϣⲟⲛⲥ</month>
+							<month type="10" draft="unconfirmed">Ⲡⲁⲱⲛⲓ</month>
+							<month type="11" draft="unconfirmed">Ⲉⲡⲓⲡ</month>
+							<month type="12" draft="unconfirmed">Ⲙⲉⲥⲱⲣⲓ</month>
+							<month type="13" draft="unconfirmed">Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">ⲁ̅</month>
+							<month type="2" draft="unconfirmed">ⲃ̅</month>
+							<month type="3" draft="unconfirmed">ⲅ̅</month>
+							<month type="4" draft="unconfirmed">ⲇ̅</month>
+							<month type="5" draft="unconfirmed">ⲉ̅</month>
+							<month type="6" draft="unconfirmed">ⲋ̅</month>
+							<month type="7" draft="unconfirmed">ⲍ̅</month>
+							<month type="8" draft="unconfirmed">ⲏ̅</month>
+							<month type="9" draft="unconfirmed">ⲑ̅</month>
+							<month type="10" draft="unconfirmed">ⲓ̅</month>
+							<month type="11" draft="unconfirmed">ⲓ̅ⲁ̅</month>
+							<month type="12" draft="unconfirmed">ⲓ̅ⲃ̅</month>
+							<month type="13" draft="unconfirmed">ⲓ̅ⲅ̅</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Ⲑⲱⲟⲩⲧ</month>
+							<month type="2" draft="unconfirmed">Ⲡⲁⲟⲡⲓ</month>
+							<month type="3" draft="unconfirmed">Ⲁⲑⲱⲣ</month>
+							<month type="4" draft="unconfirmed">Ⲭⲟⲓⲁⲕ</month>
+							<month type="5" draft="unconfirmed">Ⲧⲱⲃⲓ</month>
+							<month type="6" draft="unconfirmed">Ⲙⲉϣⲓⲣ</month>
+							<month type="7" draft="unconfirmed">Ⲡⲁⲣⲉⲙϩⲁⲧ</month>
+							<month type="8" draft="unconfirmed">Ⲫⲁⲣⲙⲟⲩⲑⲓ</month>
+							<month type="9" draft="unconfirmed">Ⲡⲁϣⲟⲛⲥ</month>
+							<month type="10" draft="unconfirmed">Ⲡⲁⲱⲛⲓ</month>
+							<month type="11" draft="unconfirmed">Ⲉⲡⲓⲡ</month>
+							<month type="12" draft="unconfirmed">Ⲙⲉⲥⲱⲣⲓ</month>
+							<month type="13" draft="unconfirmed">Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Ⲑⲱⲟⲩⲧ</month>
+							<month type="2" draft="unconfirmed">Ⲡⲁⲟⲡⲓ</month>
+							<month type="3" draft="unconfirmed">Ⲁⲑⲱⲣ</month>
+							<month type="4" draft="unconfirmed">Ⲭⲟⲓⲁⲕ</month>
+							<month type="5" draft="unconfirmed">Ⲧⲱⲃⲓ</month>
+							<month type="6" draft="unconfirmed">Ⲙⲉϣⲓⲣ</month>
+							<month type="7" draft="unconfirmed">Ⲡⲁⲣⲉⲙϩⲁⲧ</month>
+							<month type="8" draft="unconfirmed">Ⲫⲁⲣⲙⲟⲩⲑⲓ</month>
+							<month type="9" draft="unconfirmed">Ⲡⲁϣⲟⲛⲥ</month>
+							<month type="10" draft="unconfirmed">Ⲡⲁⲱⲛⲓ</month>
+							<month type="11" draft="unconfirmed">Ⲉⲡⲓⲡ</month>
+							<month type="12" draft="unconfirmed">Ⲙⲉⲥⲱⲣⲓ</month>
+							<month type="13" draft="unconfirmed">Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">ⲁ̅</month>
+							<month type="2" draft="unconfirmed">ⲃ̅</month>
+							<month type="3" draft="unconfirmed">ⲅ̅</month>
+							<month type="4" draft="unconfirmed">ⲇ̅</month>
+							<month type="5" draft="unconfirmed">ⲉ̅</month>
+							<month type="6" draft="unconfirmed">ⲋ̅</month>
+							<month type="7" draft="unconfirmed">ⲍ̅</month>
+							<month type="8" draft="unconfirmed">ⲏ̅</month>
+							<month type="9" draft="unconfirmed">ⲑ̅</month>
+							<month type="10" draft="unconfirmed">ⲓ̅</month>
+							<month type="11" draft="unconfirmed">ⲓ̅ⲁ̅</month>
+							<month type="12" draft="unconfirmed">ⲓ̅ⲃ̅</month>
+							<month type="13" draft="unconfirmed">ⲓ̅ⲅ̅</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Ⲑⲱⲟⲩⲧ</month>
+							<month type="2" draft="unconfirmed">Ⲡⲁⲟⲡⲓ</month>
+							<month type="3" draft="unconfirmed">Ⲁⲑⲱⲣ</month>
+							<month type="4" draft="unconfirmed">Ⲭⲟⲓⲁⲕ</month>
+							<month type="5" draft="unconfirmed">Ⲧⲱⲃⲓ</month>
+							<month type="6" draft="unconfirmed">Ⲙⲉϣⲓⲣ</month>
+							<month type="7" draft="unconfirmed">Ⲡⲁⲣⲉⲙϩⲁⲧ</month>
+							<month type="8" draft="unconfirmed">Ⲫⲁⲣⲙⲟⲩⲑⲓ</month>
+							<month type="9" draft="unconfirmed">Ⲡⲁϣⲟⲛⲥ</month>
+							<month type="10" draft="unconfirmed">Ⲡⲁⲱⲛⲓ</month>
+							<month type="11" draft="unconfirmed">Ⲉⲡⲓⲡ</month>
+							<month type="12" draft="unconfirmed">Ⲙⲉⲥⲱⲣⲓ</month>
+							<month type="13" draft="unconfirmed">Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">ⲓⲁⲛⲟⲩⲁⲣⲓ</month>
+							<month type="2" draft="unconfirmed">ⲫⲉⲃⲣⲟⲩⲁⲣⲓ</month>
+							<month type="3" draft="unconfirmed">ⲙⲁⲣⲧⲓ</month>
+							<month type="4" draft="unconfirmed">ⲁⲡⲣⲓⲗⲓ</month>
+							<month type="5" draft="unconfirmed">ⲙⲁⲓⲟ</month>
+							<month type="6" draft="unconfirmed">ⲓⲟⲩⲛⲓⲟⲩ</month>
+							<month type="7" draft="unconfirmed">ⲓⲟⲩⲗⲓⲟⲩ</month>
+							<month type="8" draft="unconfirmed">ⲁⲩⲅⲟⲩⲥⲑⲟⲩ</month>
+							<month type="9" draft="unconfirmed">ⲥⲉⲡⲧⲉⲙⲃⲣⲓ</month>
+							<month type="10" draft="unconfirmed">ⲟⲕⲧⲱⲃⲣⲓ</month>
+							<month type="11" draft="unconfirmed">ⲛⲟⲉⲙⲃⲣⲓ</month>
+							<month type="12" draft="unconfirmed">ⲇⲉⲕⲉⲙⲃⲣⲓ</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">Ⲓ</month>
+							<month type="2" draft="unconfirmed">Ⲫ</month>
+							<month type="3" draft="unconfirmed">Ⲙ</month>
+							<month type="4" draft="unconfirmed">Ⲁ</month>
+							<month type="5" draft="unconfirmed">Ⲙ</month>
+							<month type="6" draft="unconfirmed">Ⲓ</month>
+							<month type="7" draft="unconfirmed">Ⲓ</month>
+							<month type="8" draft="unconfirmed">Ⲁ</month>
+							<month type="9" draft="unconfirmed">Ⲥ</month>
+							<month type="10" draft="unconfirmed">Ⲟ</month>
+							<month type="11" draft="unconfirmed">Ⲛ</month>
+							<month type="12" draft="unconfirmed">Ⲇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">ⲓⲁⲛⲟⲩⲁⲣⲓ</month>
+							<month type="2" draft="unconfirmed">ⲫⲉⲃⲣⲟⲩⲁⲣⲓ</month>
+							<month type="3" draft="unconfirmed">ⲙⲁⲣⲧⲓ</month>
+							<month type="4" draft="unconfirmed">ⲁⲡⲣⲓⲗⲓ</month>
+							<month type="5" draft="unconfirmed">ⲙⲁⲓⲟ</month>
+							<month type="6" draft="unconfirmed">ⲓⲟⲩⲛⲓⲟⲩ</month>
+							<month type="7" draft="unconfirmed">ⲓⲟⲩⲗⲓⲟⲩ</month>
+							<month type="8" draft="unconfirmed">ⲁⲩⲅⲟⲩⲥⲑⲟⲩ</month>
+							<month type="9" draft="unconfirmed">ⲥⲉⲡⲧⲉⲙⲃⲣⲓ</month>
+							<month type="10" draft="unconfirmed">ⲟⲕⲧⲱⲃⲣⲓ</month>
+							<month type="11" draft="unconfirmed">ⲛⲟⲉⲙⲃⲣⲓ</month>
+							<month type="12" draft="unconfirmed">ⲇⲉⲕⲉⲙⲃⲣⲓ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">ⲓⲁⲛⲟⲩⲁⲣⲓ</month>
+							<month type="2" draft="unconfirmed">ⲫⲉⲃⲣⲟⲩⲁⲣⲓ</month>
+							<month type="3" draft="unconfirmed">ⲙⲁⲣⲧⲓ</month>
+							<month type="4" draft="unconfirmed">ⲁⲡⲣⲓⲗⲓ</month>
+							<month type="5" draft="unconfirmed">ⲙⲁⲓⲟ</month>
+							<month type="6" draft="unconfirmed">ⲓⲟⲩⲛⲓⲟⲩ</month>
+							<month type="7" draft="unconfirmed">ⲓⲟⲩⲗⲓⲟⲩ</month>
+							<month type="8" draft="unconfirmed">ⲁⲩⲅⲟⲩⲥⲑⲟⲩ</month>
+							<month type="9" draft="unconfirmed">ⲥⲉⲡⲧⲉⲙⲃⲣⲓ</month>
+							<month type="10" draft="unconfirmed">ⲟⲕⲧⲱⲃⲣⲓ</month>
+							<month type="11" draft="unconfirmed">ⲛⲟⲉⲙⲃⲣⲓ</month>
+							<month type="12" draft="unconfirmed">ⲇⲉⲕⲉⲙⲃⲣⲓ</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">Ⲓ</month>
+							<month type="2" draft="unconfirmed">Ⲫ</month>
+							<month type="3" draft="unconfirmed">Ⲙ</month>
+							<month type="4" draft="unconfirmed">Ⲁ</month>
+							<month type="5" draft="unconfirmed">Ⲙ</month>
+							<month type="6" draft="unconfirmed">Ⲓ</month>
+							<month type="7" draft="unconfirmed">Ⲓ</month>
+							<month type="8" draft="unconfirmed">Ⲁ</month>
+							<month type="9" draft="unconfirmed">Ⲥ</month>
+							<month type="10" draft="unconfirmed">Ⲟ</month>
+							<month type="11" draft="unconfirmed">Ⲛ</month>
+							<month type="12" draft="unconfirmed">Ⲇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">ⲓⲁⲛⲟⲩⲁⲣⲓ</month>
+							<month type="2" draft="unconfirmed">ⲫⲉⲃⲣⲟⲩⲁⲣⲓ</month>
+							<month type="3" draft="unconfirmed">ⲙⲁⲣⲧⲓ</month>
+							<month type="4" draft="unconfirmed">ⲁⲡⲣⲓⲗⲓ</month>
+							<month type="5" draft="unconfirmed">ⲙⲁⲓⲟ</month>
+							<month type="6" draft="unconfirmed">ⲓⲟⲩⲛⲓⲟⲩ</month>
+							<month type="7" draft="unconfirmed">ⲓⲟⲩⲗⲓⲟⲩ</month>
+							<month type="8" draft="unconfirmed">ⲁⲩⲅⲟⲩⲥⲑⲟⲩ</month>
+							<month type="9" draft="unconfirmed">ⲥⲉⲡⲧⲉⲙⲃⲣⲓ</month>
+							<month type="10" draft="unconfirmed">ⲟⲕⲧⲱⲃⲣⲓ</month>
+							<month type="11" draft="unconfirmed">ⲛⲟⲉⲙⲃⲣⲓ</month>
+							<month type="12" draft="unconfirmed">ⲇⲉⲕⲉⲙⲃⲣⲓ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲁ̅</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲃ̅</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓⲅ̅</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓⲇ̅</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲉ̅</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲋ̅</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓⲍ̅</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲁ̅</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲃ̅</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓⲅ̅</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓⲇ̅</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲉ̅</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲋ̅</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓⲍ̅</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲁ̅</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲃ̅</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓⲅ̅</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓⲇ̅</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲉ̅</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲋ̅</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓⲍ̅</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲟⲩⲁⲓ</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲥ̀ⲛⲁⲩ</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓϣⲟⲙⲧ</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓϥ̀ⲧⲟⲩ</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲧ̀ⲓⲟⲩ</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲥⲟⲟⲩ</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓϣⲁϣϥ</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲁ̅</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲃ̅</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓⲅ̅</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓⲇ̅</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲉ̅</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲋ̅</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓⲍ̅</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲁ̅</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲃ̅</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓⲅ̅</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓⲇ̅</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲉ̅</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲋ̅</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓⲍ̅</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲁ̅</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲃ̅</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓⲅ̅</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓⲇ̅</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲉ̅</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲋ̅</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓⲍ̅</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">ⲡⲓⲟⲩⲁⲓ</day>
+							<day type="mon" draft="unconfirmed">ⲡⲓⲥ̀ⲛⲁⲩ</day>
+							<day type="tue" draft="unconfirmed">ⲡⲓϣⲟⲙⲧ</day>
+							<day type="wed" draft="unconfirmed">ⲡⲓϥ̀ⲧⲟⲩ</day>
+							<day type="thu" draft="unconfirmed">ⲡⲓⲧ̀ⲓⲟⲩ</day>
+							<day type="fri" draft="unconfirmed">ⲡⲓⲥⲟⲟⲩ</day>
+							<day type="sat" draft="unconfirmed">ⲡⲓϣⲁϣϥ</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">ⲡⲓⲁ̅ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="2" draft="unconfirmed">ⲡⲓⲙⲁϩⲃ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="3" draft="unconfirmed">ⲡⲓⲙⲁϩⲅ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="4" draft="unconfirmed">ⲡⲓⲙⲁϩⲇ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">ⲁ̅</quarter>
+							<quarter type="2" draft="unconfirmed">ⲃ̅</quarter>
+							<quarter type="3" draft="unconfirmed">ⲅ̅</quarter>
+							<quarter type="4" draft="unconfirmed">ⲇ̅</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">ⲡⲓϩⲟⲩⲓⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="2" draft="unconfirmed">ⲡⲓⲙⲁϩⲥ̀ⲛⲁⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="3" draft="unconfirmed">ⲡⲓⲙⲁϩϣⲟⲙⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="4" draft="unconfirmed">ⲡⲓⲙⲁϩϥ̀ⲧⲟⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1" draft="unconfirmed">ⲡⲓⲁ̅ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="2" draft="unconfirmed">ⲡⲓⲙⲁϩⲃ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="3" draft="unconfirmed">ⲡⲓⲙⲁϩⲅ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="4" draft="unconfirmed">ⲡⲓⲙⲁϩⲇ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+						</quarterWidth>
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">ⲁ̅</quarter>
+							<quarter type="2" draft="unconfirmed">ⲃ̅</quarter>
+							<quarter type="3" draft="unconfirmed">ⲅ̅</quarter>
+							<quarter type="4" draft="unconfirmed">ⲇ̅</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1" draft="unconfirmed">ⲡⲓϩⲟⲩⲓⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="2" draft="unconfirmed">ⲡⲓⲙⲁϩⲥ̀ⲛⲁⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="3" draft="unconfirmed">ⲡⲓⲙⲁϩϣⲟⲙⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+							<quarter type="4" draft="unconfirmed">ⲡⲓⲙⲁϩϥ̀ⲧⲟⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">Ϧ︦Ⲙ︦</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">Ⲙ︦Ⲙ︦</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="unconfirmed">Ϧ︦Ⲙ︦</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">Ⲙ︦Ⲙ︦</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ϧⲁϫⲉⲛ ⲙⲉⲣⲓ</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">Ϧ︦Ⲙ︦</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">Ⲙ︦Ⲙ︦</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am" draft="unconfirmed">Ϧ︦Ⲙ︦</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">Ⲙ︦Ⲙ︦</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">ϧⲁϫⲉⲛ ⲙⲉⲣⲓ</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">ϧⲁϫⲉⲛ ⲡⲓⲭⲣⲓⲥⲧⲟⲥ</era>
+						<era type="0" alt="variant" draft="unconfirmed">ϧⲁϫⲉⲛ ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲓⲛⲟⲛ</era>
+						<era type="1" draft="unconfirmed">ⲙⲉⲛⲉⲛⲥⲁ ⲡⲓⲭⲣⲓⲥⲧⲟⲥ</era>
+						<era type="1" alt="variant" draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲓⲛⲟⲛ</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">ϧⲁϫⲉⲛ ⲡⲭ︦ⲥ︦</era>
+						<era type="0" alt="variant" draft="unconfirmed">Ϧ︦Ⲥ︦Ⲕ︦</era>
+						<era type="1" draft="unconfirmed">ⲙⲉⲛⲉⲛⲥⲁ ⲡⲭ︦ⲥ︦</era>
+						<era type="1" alt="variant" draft="unconfirmed">Ⲥ︦Ⲕ︦</era>
+					</eraAbbr>
+				</eras>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ehm" draft="unconfirmed">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms" draft="unconfirmed">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv" draft="unconfirmed">h:mm a v</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">ⲙⲟⲩϩ.</month>
+							<month type="2" draft="unconfirmed">ⲥⲁϥ.</month>
+							<month type="3" draft="unconfirmed">ⲣⲁⲃ. I</month>
+							<month type="4" draft="unconfirmed">ⲣⲁⲃ. II</month>
+							<month type="5" draft="unconfirmed">ϫⲟⲩⲙ. I</month>
+							<month type="6" draft="unconfirmed">ϫⲟⲩⲙ. II</month>
+							<month type="7" draft="unconfirmed">ⲣⲁϫ.</month>
+							<month type="8" draft="unconfirmed">ϣⲁ.</month>
+							<month type="9" draft="unconfirmed">ⲣⲁⲙ.</month>
+							<month type="10" draft="unconfirmed">ϣⲁⲩ.</month>
+							<month type="11" draft="unconfirmed">ⲇⲟⲩⲗ-ⲕ.</month>
+							<month type="12" draft="unconfirmed">ⲇⲟⲩⲗ-ϩ.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">ⲁ̅</month>
+							<month type="2" draft="unconfirmed">ⲃ̅</month>
+							<month type="3" draft="unconfirmed">ⲅ̅</month>
+							<month type="4" draft="unconfirmed">ⲇ̅</month>
+							<month type="5" draft="unconfirmed">ⲉ̅</month>
+							<month type="6" draft="unconfirmed">ⲋ̅</month>
+							<month type="7" draft="unconfirmed">ⲍ̅</month>
+							<month type="8" draft="unconfirmed">ⲏ̅</month>
+							<month type="9" draft="unconfirmed">ⲑ̅</month>
+							<month type="10" draft="unconfirmed">ⲓ̅</month>
+							<month type="11" draft="unconfirmed">ⲓ̅ⲁ̅</month>
+							<month type="12" draft="unconfirmed">ⲓ̅ⲃ̅</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">ⲙⲟⲩϩⲁⲣⲣⲁⲙ</month>
+							<month type="2" draft="unconfirmed">ⲥⲁϥⲁⲣ</month>
+							<month type="3" draft="unconfirmed">ⲣⲁⲃⲓʻ I</month>
+							<month type="4" draft="unconfirmed">ⲣⲁⲃⲓʻ II</month>
+							<month type="5" draft="unconfirmed">ϫⲟⲩⲙⲁⲇⲁ I</month>
+							<month type="6" draft="unconfirmed">ϫⲟⲩⲙⲁⲇⲁ II</month>
+							<month type="7" draft="unconfirmed">ⲣⲁϫⲁⲃ</month>
+							<month type="8" draft="unconfirmed">ϣⲁʻⲃⲁⲛ</month>
+							<month type="9" draft="unconfirmed">ⲣⲁⲙⲁⲇⲁⲛ</month>
+							<month type="10" draft="unconfirmed">ϣⲁⲟⲩⲁⲗ</month>
+							<month type="11" draft="unconfirmed">ⲇⲟⲩⲗ-ⲕⲓʻⲇⲁϩ</month>
+							<month type="12" draft="unconfirmed">ⲇⲟⲩⲗ-ϩⲓϫϫⲁ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">ⲙⲟⲩϩ.</month>
+							<month type="2" draft="unconfirmed">ⲥⲁϥ.</month>
+							<month type="3" draft="unconfirmed">ⲣⲁⲃ. I</month>
+							<month type="4" draft="unconfirmed">ⲣⲁⲃ. II</month>
+							<month type="5" draft="unconfirmed">ϫⲟⲩⲙ. I</month>
+							<month type="6" draft="unconfirmed">ϫⲟⲩⲙ. II</month>
+							<month type="7" draft="unconfirmed">ⲣⲁϫ.</month>
+							<month type="8" draft="unconfirmed">ϣⲁ.</month>
+							<month type="9" draft="unconfirmed">ⲣⲁⲙ.</month>
+							<month type="10" draft="unconfirmed">ϣⲁⲩ.</month>
+							<month type="11" draft="unconfirmed">ⲇⲟⲩⲗ-ⲕ.</month>
+							<month type="12" draft="unconfirmed">ⲇⲟⲩⲗ-ϩ.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">ⲁ̅</month>
+							<month type="2" draft="unconfirmed">ⲃ̅</month>
+							<month type="3" draft="unconfirmed">ⲅ̅</month>
+							<month type="4" draft="unconfirmed">ⲇ̅</month>
+							<month type="5" draft="unconfirmed">ⲉ̅</month>
+							<month type="6" draft="unconfirmed">ⲋ̅</month>
+							<month type="7" draft="unconfirmed">ⲍ̅</month>
+							<month type="8" draft="unconfirmed">ⲏ̅</month>
+							<month type="9" draft="unconfirmed">ⲑ̅</month>
+							<month type="10" draft="unconfirmed">ⲓ̅</month>
+							<month type="11" draft="unconfirmed">ⲓ̅ⲁ̅</month>
+							<month type="12" draft="unconfirmed">ⲓ̅ⲃ̅</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">ⲙⲟⲩϩⲁⲣⲣⲁⲙ</month>
+							<month type="2" draft="unconfirmed">ⲥⲁϥⲁⲣ</month>
+							<month type="3" draft="unconfirmed">ⲣⲁⲃⲓʻ I</month>
+							<month type="4" draft="unconfirmed">ⲣⲁⲃⲓʻ II</month>
+							<month type="5" draft="unconfirmed">ϫⲟⲩⲙⲁⲇⲁ I</month>
+							<month type="6" draft="unconfirmed">ϫⲟⲩⲙⲁⲇⲁ II</month>
+							<month type="7" draft="unconfirmed">ⲣⲁϫⲁⲃ</month>
+							<month type="8" draft="unconfirmed">ϣⲁʻⲃⲁⲛ</month>
+							<month type="9" draft="unconfirmed">ⲣⲁⲙⲁⲇⲁⲛ</month>
+							<month type="10" draft="unconfirmed">ϣⲁⲟⲩⲁⲗ</month>
+							<month type="11" draft="unconfirmed">ⲇⲟⲩⲗ-ⲕⲓʻⲇⲁϩ</month>
+							<month type="12" draft="unconfirmed">ⲇⲟⲩⲗ-ϩⲓϫϫⲁ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">ⲁϩ</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ</displayName>
+			</field>
+			<field type="era-short">
+				<displayName draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ</displayName>
+			</field>
+			<field type="era-narrow">
+				<displayName draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="unconfirmed">ⲣⲟⲙⲡⲓ</displayName>
+				<relative type="-1" draft="unconfirmed">ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="year-short">
+				<displayName draft="unconfirmed">ⲣⲟⲙⲡⲓ</displayName>
+				<relative type="-1" draft="unconfirmed">ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="year-narrow">
+				<displayName draft="unconfirmed">ⲣⲟⲙⲡⲓ</displayName>
+				<relative type="-1" draft="unconfirmed">ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">ⲣⲉϥⲧⲟⲩ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲣⲉϥⲧⲟⲩ ⲛ̀ϧⲁⲉ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲣⲉϥⲧⲟⲩ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲣⲉϥⲧⲟⲩ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">ⲣⲉϥⲧⲟⲩ</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">ⲣⲉϥⲧⲟⲩ</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">ⲁⲃⲟⲧ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="month-short">
+				<displayName draft="unconfirmed">ⲁⲃⲟⲧ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="month-narrow">
+				<displayName draft="unconfirmed">ⲁⲃⲟⲧ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">ⲁⲛϣⲁϣϥ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁⲛϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁⲛϣⲁϣϥ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁⲛϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="week-short">
+				<displayName draft="unconfirmed">ⲁⲛϣⲁϣϥ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁⲛϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁⲛϣⲁϣϥ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁⲛϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="week-narrow">
+				<displayName draft="unconfirmed">ⲁⲛϣⲁϣϥ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁⲛϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁⲛϣⲁϣϥ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁⲛϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="weekOfMonth">
+				<displayName draft="unconfirmed">ⲁⲛϣⲁϣϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ</displayName>
+			</field>
+			<field type="weekOfMonth-short">
+				<displayName draft="unconfirmed">ⲁⲛϣⲁϣϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName draft="unconfirmed">ⲁⲛϣⲁϣϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ</displayName>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲛ̀ⲥⲁϥ</relative>
+				<relative type="0" draft="unconfirmed">ⲙ̀ⲫⲟⲟⲩ</relative>
+				<relative type="1" draft="unconfirmed">ⲛ̀ⲣⲁⲥϯ</relative>
+			</field>
+			<field type="day-short">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲛ̀ⲥⲁϥ</relative>
+				<relative type="0" draft="unconfirmed">ⲙ̀ⲫⲟⲟⲩ</relative>
+				<relative type="1" draft="unconfirmed">ⲛ̀ⲣⲁⲥϯ</relative>
+			</field>
+			<field type="day-narrow">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ</displayName>
+				<relative type="-1" draft="unconfirmed">ⲛ̀ⲥⲁϥ</relative>
+				<relative type="0" draft="unconfirmed">ⲙ̀ⲫⲟⲟⲩ</relative>
+				<relative type="1" draft="unconfirmed">ⲛ̀ⲣⲁⲥϯ</relative>
+			</field>
+			<field type="dayOfYear">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ ⲛ̀ϯⲣⲟⲙⲡⲓ</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ ⲛ̀ϯⲣⲟⲙⲡⲓ</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ ⲛ̀ϯⲣⲟⲙⲡⲓ</displayName>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϣϥ</displayName>
+			</field>
+			<field type="weekday-short">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϣϥ</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName draft="unconfirmed">ⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϣϥ</displayName>
+			</field>
+			<field type="weekdayOfMonth">
+				<displayName draft="unconfirmed">ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName draft="unconfirmed">ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName draft="unconfirmed">ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲟⲩⲁⲓ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲟⲩⲁⲓ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲟⲩⲁⲓ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲁ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲁ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲁ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲥ̀ⲛⲁⲩ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲥⲛⲁⲩ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲥ̀ⲛⲁⲩ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲃ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲃ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲃ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲃ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲃ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲃ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1" draft="unconfirmed">ⲡⲓϣⲟⲙⲧ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓϣⲟⲙⲧ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓϣⲟⲙⲧ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲅ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲅ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲅ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲅ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲅ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲅ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1" draft="unconfirmed">ⲡⲓϥ̀ⲧⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓϥ̀ⲧⲟⲩ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓϥ̀ⲧⲟⲩ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲇ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲇ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲇ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲇ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲇ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲇ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲧ̀ⲓⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲧ̀ⲓⲟⲩ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲧ̀ⲓⲟⲩ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲉ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲉ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲉ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲉ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲉ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲉ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲥⲟⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲥⲟⲟⲩ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲥⲟⲟⲩ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲋ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲋ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲋ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲋ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲋ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲋ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1" draft="unconfirmed">ⲡⲓϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓϣⲁϣϥ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲍ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲍ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲍ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1" draft="unconfirmed">ⲡⲓⲍ̅ ⲉⲧⲁϥⲥⲓⲛⲓ</relative>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲍ̅ ⲫⲁⲓ</relative>
+				<relative type="1" draft="unconfirmed">ⲡⲓⲍ̅ ⲉⲑⲛⲏⲟⲩ</relative>
+			</field>
+			<field type="dayperiod-short">
+				<displayName draft="unconfirmed">ϧⲁϫⲉⲛ ⲙⲉⲣⲓ/ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName draft="unconfirmed">ϧⲁϫⲉⲛ ⲙⲉⲣⲓ/ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName draft="unconfirmed">ϧⲁϫⲉⲛ ⲙⲉⲣⲓ/ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">ⲟⲩⲛⲟⲩ</displayName>
+				<relative type="0" draft="unconfirmed">ⲧⲁⲓⲟⲩⲛⲟⲩ ⲑⲁⲓ</relative>
+			</field>
+			<field type="hour-short">
+				<displayName draft="unconfirmed">ⲟⲩⲛⲟⲩ</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName draft="unconfirmed">ⲟⲩⲛⲟⲩ</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">ⲥⲟⲩⲥⲟⲩ</displayName>
+				<relative type="0" draft="unconfirmed">ⲡⲁⲓⲥⲟⲩⲥⲟⲩ ⲫⲁⲓ</relative>
+			</field>
+			<field type="minute-short">
+				<displayName draft="unconfirmed">ⲥⲟⲩⲥⲟⲩ</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="unconfirmed">ⲥⲟⲩⲥⲟⲩ</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">ⲙⲁϩⲥ̀ⲛⲁⲩ</displayName>
+				<relative type="0" draft="unconfirmed">ϯⲛⲟⲩ</relative>
+			</field>
+			<field type="second-short">
+				<displayName draft="unconfirmed">ⲙⲁϩⲥ̀ⲛⲁⲩ</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="unconfirmed">ⲙⲁϩⲥ̀ⲛⲁⲩ</displayName>
+			</field>
+			<field type="zone">
+				<displayName draft="unconfirmed">ϯⲍⲱⲛⲏ ⲙ̀ⲡⲓⲥⲏⲟⲩ</displayName>
+			</field>
+			<field type="zone-short">
+				<displayName draft="unconfirmed">ϯⲍⲱⲛⲏ</displayName>
+			</field>
+			<field type="zone-narrow">
+				<displayName draft="unconfirmed">ϯⲍⲱⲛⲏ</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ {0}</regionFormat>
+			<regionFormat type="daylight" draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ {0}</regionFormat>
+			<regionFormat type="standard" draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ {0}</regionFormat>
+			<zone type="Etc/UTC">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲁⲑⲟⲗⲓⲕⲟⲛ</standard>
+				</long>
+			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="unconfirmed">ⲁⲧⲥⲱⲟⲩⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity draft="unconfirmed">ⲁⲛⲇⲟⲣⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity draft="unconfirmed">ⲇⲟⲩⲃⲁⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲃⲟⲩⲗ</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity draft="unconfirmed">ⲁⲛⲑⲓⲅⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity draft="unconfirmed">ⲁⲛⲅⲓⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity draft="unconfirmed">ⲑⲓⲣⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity draft="unconfirmed">ⲓⲉⲣⲉⲃⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲩⲁⲛⲇⲁ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲣⲟⲑⲉⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity draft="unconfirmed">ⲡⲁⲗⲙⲉⲣ ⲗⲁⲛⲇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲑⲣⲟⲗⲗ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ϣⲟⲩⲁ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲙⲁⲩⲥⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲃⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲃⲟⲥⲑⲟⲕ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲕⲁⲍⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲇⲟⲩⲙⲟⲛⲧ ⲇⲟⲩⲣⲃⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲙⲕⲙⲟⲩⲣⲇⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity draft="unconfirmed">ⲣⲓⲟ ⲅⲁⲗⲗⲉⲅⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity draft="unconfirmed">ⲙⲉⲛⲇⲟⲍⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛ ⲓⲟⲩⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity draft="unconfirmed">ⲟⲩϣⲟⲩⲟⲩⲁⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity draft="unconfirmed">ⲗⲁ ⲣⲓⲟϫⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛ ⲗⲟⲩⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲑⲁⲙⲁⲣⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲗⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity draft="unconfirmed">ϫⲟⲩϫⲟⲩⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲩⲕⲟⲩⲙⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲣⲇⲟⲃⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲩⲉⲛⲟⲥ ⲁⲓⲣⲉⲥ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity draft="unconfirmed">ⲡⲁⲅⲟ ⲡⲁⲅⲟ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity draft="unconfirmed">ⲃⲓⲉⲛⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity draft="unconfirmed">ⲡⲉⲣⲑ</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity draft="unconfirmed">ⲉⲩⲕⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲣⲟⲩⲓⲛ</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity draft="unconfirmed">ⲁⲇⲉⲗⲁⲓⲇ</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity draft="unconfirmed">ⲃⲣⲟⲕⲉⲛ ϩⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity draft="unconfirmed">ⲙⲉⲗⲃⲟⲩⲣⲛ</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity draft="unconfirmed">ϩⲟⲃⲁⲣⲧ</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity draft="unconfirmed">ⲗⲓⲛⲇⲉⲙⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity draft="unconfirmed">ⲥⲓⲇⲛⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity draft="unconfirmed">ⲃⲣⲓⲥⲃⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity draft="unconfirmed">ϯⲙⲟⲩⲓ ⲙ̀ⲙⲁⲕⲟⲩⲁⲣⲓ</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity draft="unconfirmed">ⲁⲣⲟⲩⲃⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲣⲓⲉϩⲁⲙⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲕⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲣⲁⲓⲉⲃⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲣⲃⲁⲇⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity draft="unconfirmed">ⲃⲣⲟⲩⲝⲉⲗ</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲁⲅⲁⲇⲟⲩⲅⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity draft="unconfirmed">ⲥⲟϥⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity draft="unconfirmed">ⲃⲁϩⲣⲁⲓⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲩϫⲟⲩⲙⲃⲟⲩⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲣⲑⲟ-ⲛⲟⲃⲟ</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ⲃⲁⲣⲑⲉⲗⲉⲙⲓ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲣⲙⲟⲩⲇⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity draft="unconfirmed">ⲃⲣⲟⲩⲛⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity draft="unconfirmed">ⲗⲁ ⲡⲁⲍ</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity draft="unconfirmed">ⲕⲣⲁⲗⲉⲛⲇⲓⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity draft="unconfirmed">ⲉⲓⲣⲟⲩⲛⲉⲡⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity draft="unconfirmed">ⲣⲓⲟ ⲃⲣⲁⲛⲕⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲣⲑⲟ ⲃⲉⲗϩⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲁ ⲃⲓⲥⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲛⲁⲩⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩⲓⲁⲃⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲑⲁⲣⲉⲙ</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲙⲡⲟ ⲅⲣⲁⲛⲇⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲗⲉⲙ</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity draft="unconfirmed">ⲁⲣⲁⲅⲟⲩⲁⲓⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲟ ⲡⲁⲩⲗⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity draft="unconfirmed">ⲃⲁϩⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity draft="unconfirmed">ϥⲟⲣⲑⲁⲗⲉⲍⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲥⲉⲓⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity draft="unconfirmed">ⲣⲉⲥⲓϥⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity draft="unconfirmed">ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity draft="unconfirmed">ⲛⲁⲥⲥⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity draft="unconfirmed">ⲑⲓⲙⲫⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity draft="unconfirmed">ⲅⲁⲃⲟⲣⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity draft="unconfirmed">ⲙⲓⲛⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲗⲓⲍⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲩⲥⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲁⲓⲑϩⲱⲣⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity draft="unconfirmed">ⲓⲛⲟⲩⲃⲓⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲛⲕⲟⲩⲃⲉⲣ</exemplarCity>
+			</zone>
+			<zone type="America/Fort_Nelson">
+				<exemplarCity draft="unconfirmed">ϥⲟⲣⲧ ⲛⲉⲗⲥⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲩⲥⲟⲛ ⲕⲣⲓⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity draft="unconfirmed">ⲕⲣⲉⲥⲑⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity draft="unconfirmed">ⲉⲇⲙⲟⲛⲑⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity draft="unconfirmed">ⲥⲟⲩⲓϥⲧ ⲕⲁⲣⲉⲛⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity draft="unconfirmed">ⲧ̀ⲕⲟⲧⲥⲓ ⲛ̀ⲕⲁⲙⲃⲣⲓⲇϫ</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity draft="unconfirmed">ⲣⲉϫⲓⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲓⲛⲛⲓⲡⲉⲅ</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity draft="unconfirmed">ⲣⲉⲍⲟⲗⲟⲩⲑⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity draft="unconfirmed">ⲣⲁⲛⲕⲓⲛ ⲓⲛⲗⲉⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity draft="unconfirmed">ⲁⲑⲓⲕⲟⲕⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲣⲟⲛⲑⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity draft="unconfirmed">ⲓⲕⲁⲗⲟⲩⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲕⲑⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity draft="unconfirmed">ϩⲁⲗⲓϥⲁⲝ</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲥ ⲃⲁⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity draft="unconfirmed">ⲅⲗⲁⲥ ⲃⲁⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity draft="unconfirmed">ⲃⲗⲁⲛⲕ-ⲥⲁⲃⲗⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ϫⲟⲛⲍ</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity draft="unconfirmed">ⲕⲓⲛϣⲁⲥⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲩⲃⲟⲩⲙⲃⲁϣⲓ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲛⲅⲟⲩⲓ</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity draft="unconfirmed">ⲃⲣⲁⲍⲁⲃⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity draft="unconfirmed">ⲍⲟⲩⲣⲓϧ</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity draft="unconfirmed">ⲁⲃⲓϫⲓⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity draft="unconfirmed">ⲣⲁⲣⲟⲑⲟⲛⲅⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲩⲓ ⲛ̀ⲓⲥⲑⲉⲣ</exemplarCity>
+			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩϩⲁⲓⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Punta_Arenas">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲩⲛⲑⲁ ⲁⲣⲉⲛⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲑⲓⲁⲅⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity draft="unconfirmed">ⲇⲟⲩⲁⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲣⲟⲩⲙⲕⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity draft="unconfirmed">ϣⲁⲛⲅⲁⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲅⲟⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲥⲑⲁ ⲣⲓⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity draft="unconfirmed">ϩⲁⲃⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲡ ⲃⲉⲣⲇ</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩⲣⲁⲕⲁⲟ</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲣⲓⲥⲧⲙⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲕⲟⲥⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Famagusta">
+				<exemplarCity draft="unconfirmed">ϥⲁⲙⲁⲅⲟⲩⲥⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity draft="unconfirmed">ⲡⲣⲁⲅ</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲩⲍⲓⲛⲅⲉⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲣⲗⲓⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity draft="unconfirmed">ϫⲓⲃⲟⲩⲑⲓ</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲡⲉⲛϩⲁⲅⲉⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity draft="unconfirmed">ⲇⲟⲙⲓⲛⲓⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲑⲟ ⲇⲟⲙⲓⲛⲅⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity draft="unconfirmed">ⲁⲗϫⲓⲉⲣ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲩⲓ ⲛ̀ⲅⲁⲗⲁⲡⲁⲅⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲁⲓⲁⲕⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity draft="unconfirmed">ⲑⲁⲗⲗⲓⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity draft="unconfirmed">ⲕⲁϩⲓⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity draft="unconfirmed">ⲉⲗ ⲁⲓⲟⲩⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity draft="unconfirmed">ⲁⲥⲙⲁⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲛⲁⲣⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity draft="unconfirmed">ⲥⲉⲩⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲇⲣⲓⲇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity draft="unconfirmed">ⲁⲇⲓⲥ ⲁⲃⲁⲃⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity draft="unconfirmed">ϩⲉⲗⲥⲉⲛⲕⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity draft="unconfirmed">ϥⲓϫⲓ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity draft="unconfirmed">ⲥⲑⲁⲛⲗⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity draft="unconfirmed">ϭⲟⲩⲕ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲛϩⲡⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲥⲣⲁⲉ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity draft="unconfirmed">ϥⲁⲣⲟⲉⲥ</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity draft="unconfirmed">ⲡⲁⲣⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity draft="unconfirmed">ⲗⲓⲃⲣⲉⲃⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲃⲣⲓⲑⲁⲛⲓⲁ</daylight>
+				</long>
+				<exemplarCity draft="unconfirmed">ⲗⲟⲛⲇⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity draft="unconfirmed">ⲅⲣⲉⲛⲁⲇⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity draft="unconfirmed">ⲑⲉⲃⲗⲓⲥⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲓⲉⲛⲛⲉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲉⲣⲛⲥⲓ</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity draft="unconfirmed">ⲁⲕⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity draft="unconfirmed">ϫⲓⲃⲣⲁⲗⲑⲁⲣ</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲩⲗⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲩⲟⲩⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity draft="unconfirmed">ⲓⲑⲟⲕⲟⲣⲧⲟⲣⲙⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲛⲙⲁⲣⲕϣⲁⲃⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲛϫⲟⲩⲗ</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲛⲁⲕⲣⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲁⲇⲉⲗⲟⲩⲡ</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲗⲁⲃⲟ</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity draft="unconfirmed">ⲁⲑⲏⲛⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity draft="unconfirmed">ⲅⲉⲟⲣⲅⲓⲁ ⲙ̀ⲙⲁⲣⲏⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲁⲙ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity draft="unconfirmed">ⲃⲓⲥⲥⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity draft="unconfirmed">ⲅⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity draft="unconfirmed">ϩⲟⲛⲅ ⲕⲟⲛⲅ</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity draft="unconfirmed">ⲑⲉⲅⲟⲩⲥⲓⲅⲁⲗⲡⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity draft="unconfirmed">ⲍⲁⲅⲣⲉⲃ</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲣⲧ-ⲁⲩ-ⲡⲣⲓⲛⲥ</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲩⲇⲁⲡⲉⲥⲧ</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity draft="unconfirmed">ϫⲁⲕⲁⲣⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲛⲑⲓⲁⲛⲁⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲕⲁⲥⲥⲁⲣ</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity draft="unconfirmed">ϫⲁⲓⲁⲡⲟⲩⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲓⲉⲣⲗⲁⲛⲇⲁ</daylight>
+				</long>
+				<exemplarCity draft="unconfirmed">ⲇⲟⲩⲃⲗⲓⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity draft="unconfirmed">ⲓⲉⲣⲟⲩⲥⲁⲗⲏⲙ</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity draft="unconfirmed">ⲁⲓⲥⲉⲗ ⲛ̀ⲙⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲗⲕⲟⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity draft="unconfirmed">ϣⲁⲅⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲅⲇⲁⲇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity draft="unconfirmed">ⲑⲉϩⲣⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity draft="unconfirmed">ⲣⲉⲕⲓⲁⲃⲓⲕ</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity draft="unconfirmed">ⲣⲱⲙⲏ</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity draft="unconfirmed">ϫⲉⲣⲥⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity draft="unconfirmed">ϫⲁⲙⲁⲓⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity draft="unconfirmed">ⲁⲙⲙⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲕⲓⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity draft="unconfirmed">ⲛⲁⲓⲣⲟⲃⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity draft="unconfirmed">ⲃⲓϣⲕⲉⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity draft="unconfirmed">ⲫⲛⲟⲙ ⲡⲉⲛϩ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲛⲑⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity draft="unconfirmed">ⲕⲓⲣⲓⲑⲙⲁⲑⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity draft="unconfirmed">ⲑⲁⲣⲁⲟⲩⲁ</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲙⲟⲣⲉⲥ</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ⲕⲓⲑⲥ</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity draft="unconfirmed">ⲡⲓⲟⲛⲅⲓⲁⲛⲅ</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity draft="unconfirmed">ⲥⲉⲟⲩⲗ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩⲁⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲓⲙⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity draft="unconfirmed">ⲁⲕⲑⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity draft="unconfirmed">ⲟⲣⲁⲗ</exemplarCity>
+			</zone>
+			<zone type="Asia/Atyrau">
+				<exemplarCity draft="unconfirmed">ⲁⲑⲓⲣⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity draft="unconfirmed">ⲁⲕⲑⲟⲃ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qostanay">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲥⲑⲁⲛⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity draft="unconfirmed">ⲕⲓⲍⲓⲗⲟⲣⲇⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity draft="unconfirmed">ⲁⲗⲙⲁⲑⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity draft="unconfirmed">ⲃⲓⲉⲛⲑⲓⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲓⲣⲟⲩⲧ</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ⲗⲟⲩϭⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲇⲟⲩⲍ</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲗⲟⲙⲃⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲣⲟⲃⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲥⲉⲣⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity draft="unconfirmed">ⲃⲓⲗⲛⲓⲟⲩⲥ</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲅ</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity draft="unconfirmed">ⲣⲓⲅⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity draft="unconfirmed">ⲑⲣⲓⲡⲟⲗⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲍⲁⲃⲗⲁⲛⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲁⲕⲟ</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity draft="unconfirmed">ϭⲓⲍⲓⲛⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲇⲅⲟⲣⲓⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲣⲓⲅⲟⲧ</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity draft="unconfirmed">ⲁⲛⲑⲁⲛⲁⲛⲁⲣⲓⲃⲟ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩⲁϫⲁⲗⲉⲓⲛ ⲁⲑⲟⲗⲗ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity draft="unconfirmed">ⲙⲁϫⲟⲩⲣⲟ</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity draft="unconfirmed">ⲥⲕⲟⲡⲓⲉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲙⲁⲕⲟ</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity draft="unconfirmed">ⲓⲁⲛⲅⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity draft="unconfirmed">ϧⲟⲃⲇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲗⲁⲛⲃⲁⲑⲁⲣ</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲕⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲓⲡⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲣⲑⲓⲛⲓⲕ</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲩⲁⲕϣⲟⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲑⲥⲉⲣⲁⲧ</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲗⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲗⲇⲓⲃ</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity draft="unconfirmed">ⲃⲗⲁⲛⲑⲓⲣ</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity draft="unconfirmed">ⲑⲓϫⲟⲩⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity draft="unconfirmed">ϩⲉⲣⲙⲟⲍⲓⲗⲗⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Ciudad_Juarez">
+				<exemplarCity draft="unconfirmed">ⲥⲓⲟⲩⲇⲁⲇ ⲓⲟⲩⲁⲣⲉⲍ</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲍⲁⲑⲗⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity draft="unconfirmed">ϣⲓϩⲟⲩⲁϩⲟⲩⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲓⲁ ⲇⲉ ⲃⲁⲛⲇⲉⲣⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity draft="unconfirmed">ⲟϫⲓⲛⲁⲅⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲑⲉⲣⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity draft="unconfirmed">ⲙⲉⲝⲓⲕⲟ ⲡⲟⲗⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲑⲁⲙⲟⲣⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity draft="unconfirmed">ⲙⲉⲣⲓⲇⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲛⲕⲟⲩⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩⲁⲗⲁ ⲗⲟⲩⲙⲡⲟⲩⲣ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity draft="unconfirmed">ⲕⲟⲩϭⲓⲛⲅ</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲡⲟⲩⲑⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲓⲛⲇϩⲟⲕ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲩⲙⲉⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲁⲙⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛⲛ̀ⲟⲣϥⲟⲗⲕ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity draft="unconfirmed">ⲗⲁⲅⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲛⲁⲅⲟⲩⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity draft="unconfirmed">ⲁⲙⲥⲑⲉⲣⲇⲁⲙ</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity draft="unconfirmed">ⲟⲥⲗⲟ</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲑⲙⲁⲛⲇⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity draft="unconfirmed">ⲛⲁⲩⲣⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲟⲩⲉ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲛ̀ϭⲁⲑⲁⲙ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity draft="unconfirmed">ⲁⲩⲕⲗⲁⲛⲇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲥⲕⲁⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity draft="unconfirmed">ⲡⲁⲛⲁⲙⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity draft="unconfirmed">ⲗⲓⲙⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity draft="unconfirmed">ⲑⲁϩⲓⲑⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲣⲕⲉⲥⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity draft="unconfirmed">ⲅⲁⲙⲃⲓⲉⲣ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲣⲑ ⲙⲟⲣⲉⲥⲃⲓ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲩⲅⲁⲓⲛⲃⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲛⲓⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲣⲁϭⲓ</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲁⲣⲥⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛ-ⲡⲓⲉⲣ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲡⲓⲑⲕⲉⲣⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲩⲉⲣⲑⲟ ⲣⲓⲕⲟ</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity draft="unconfirmed">ⲅⲁⲍⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity draft="unconfirmed">ϩⲉⲃⲣⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity draft="unconfirmed">ⲁⲍⲟⲣⲉⲥ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲇⲉⲓⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity draft="unconfirmed">ⲗⲓϣⲃⲟⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity draft="unconfirmed">ⲡⲁⲗⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity draft="unconfirmed">ⲁⲥⲟⲩⲛⲥⲓⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲑⲁⲣ</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity draft="unconfirmed">ⲣⲉⲓⲟⲩⲛⲓⲟⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲩϧⲁⲣⲉⲥⲧ</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲗⲅⲣⲁⲇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲗⲓⲛⲓⲛⲅⲣⲁⲇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲥⲕⲟ</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲗⲅⲟⲅⲣⲁⲇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Saratov">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲣⲁⲑⲟⲃ</exemplarCity>
+			</zone>
+			<zone type="Europe/Astrakhan">
+				<exemplarCity draft="unconfirmed">ⲁⲥⲑⲣⲁϧⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/Ulyanovsk">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲗⲓⲁⲛⲟⲃⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Europe/Kirov">
+				<exemplarCity draft="unconfirmed">ⲕⲓⲣⲟⲃ</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲙⲁⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity draft="unconfirmed">ⲓⲉⲕⲁⲑⲣⲓⲛⲃⲟⲩⲣⲅ</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity draft="unconfirmed">ⲟⲙⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Barnaul">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲣⲛⲁⲩⲗ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tomsk">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲙⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲃⲟⲕⲟⲩⲍⲛⲉⲑⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity draft="unconfirmed">ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity draft="unconfirmed">ⲓⲣⲕⲟⲩⲑⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity draft="unconfirmed">ϭⲓⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity draft="unconfirmed">ⲓⲁⲕⲟⲩⲑⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity draft="unconfirmed">ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity draft="unconfirmed">ϧⲁⲛⲇⲓⲅⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity draft="unconfirmed">ⲥⲁϧⲁⲗⲓⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲥⲧ-ⲛⲉⲣⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲅⲁⲇⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity draft="unconfirmed">ⲥⲣⲉⲇⲛⲉⲕⲟⲗⲓⲙⲥⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲙϭⲁⲑⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity draft="unconfirmed">ⲁⲛⲁⲇⲓⲣ</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity draft="unconfirmed">ⲕⲓⲅⲁⲗⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity draft="unconfirmed">ⲣⲓⲁⲇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity draft="unconfirmed">ⲅⲟⲩⲁⲇⲁⲗⲕⲁⲛⲁⲗ</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity draft="unconfirmed">ⲙⲁϩⲉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity draft="unconfirmed">ϧⲁⲣⲑⲟⲩⲙ</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity draft="unconfirmed">ⲥⲑⲟⲕϩⲟⲗⲙ</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity draft="unconfirmed">ⲥⲓⲛⲅⲁⲡⲟⲣ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ϩⲉⲗⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity draft="unconfirmed">ⲗϫⲟⲩⲃⲗϫⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲛⲅⲓⲏⲣⲃⲁⲓⲉⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity draft="unconfirmed">ⲃⲣⲁⲑⲓⲥⲗⲁⲃⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity draft="unconfirmed">ϥⲣⲓⲑⲁⲩⲛ</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛ ⲙⲁⲣⲓⲛⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲕⲁⲣ</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲅⲁⲇⲓϣⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity draft="unconfirmed">ⲡⲁⲣⲁⲙⲁⲣⲓⲃⲟ</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity draft="unconfirmed">ϫⲟⲩⲃⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲟ ⲑⲟⲙⲉ</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity draft="unconfirmed">ⲉⲗ ⲥⲁⲗⲃⲁⲇⲟⲣ</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲩⲉⲣ ⲡⲣⲓⲛⲥ</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲙⲁⲥⲕⲟⲥ</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity draft="unconfirmed">ⲙⲃⲁⲃⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity draft="unconfirmed">ⲅⲣⲁⲛⲇ ⲑⲟⲩⲣⲕ</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity draft="unconfirmed">ⲛϫⲁⲙⲉⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲩⲓ ⲛ̀ⲕⲉⲣⲅⲉⲗⲉⲛ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲙⲉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲛⲕⲟⲕ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity draft="unconfirmed">ⲇⲟⲩϣⲁⲛⲃ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity draft="unconfirmed">ϥⲁⲕⲁⲟϥⲟ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity draft="unconfirmed">ⲇⲓⲗⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity draft="unconfirmed">ⲁϣⲅⲁⲃⲁⲧ</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲩⲛⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲛⲅⲁⲑⲁⲡⲟⲩ</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity draft="unconfirmed">ⲓⲥⲑⲁⲙⲃⲟⲩⲗ</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity draft="unconfirmed">ⲡⲟⲣⲧ ⲛ̀ⲉⲥⲡⲁⲛⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity draft="unconfirmed">ϥⲟⲩⲛⲁϥⲟⲩⲑⲓ</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity draft="unconfirmed">ⲑⲁⲓⲡⲉⲓ</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity draft="unconfirmed">ⲇⲁⲣ ⲉⲥ ⲥⲁⲗⲁⲙ</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity draft="unconfirmed">ⲕⲓⲉⲃ</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity draft="unconfirmed">ⲥⲓⲙϥⲉⲣⲟⲡⲟⲗ</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲙⲡⲁⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity draft="unconfirmed">ⲙⲓⲇⲟⲩⲁⲓ ⲁⲑⲟⲗⲗ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity draft="unconfirmed">ϯⲙⲟⲩⲓ ⲛ̀ⲟⲩⲁⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity draft="unconfirmed">ⲁⲇⲁⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲙⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity draft="unconfirmed">ⲁⲛⲕⲟⲣⲁϫ</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity draft="unconfirmed">ⲓⲁⲕⲟⲩⲑⲁⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity draft="unconfirmed">ⲥⲓⲑⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity draft="unconfirmed">ϫⲟⲩⲛⲉⲁⲩ</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity draft="unconfirmed">ⲙⲉⲧⲗⲁⲕⲁⲗⲑⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲥ ⲁⲅⲅⲉⲗⲉⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity draft="unconfirmed">ⲃⲟⲓⲍⲉ</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity draft="unconfirmed">ⲫⲓⲛⲓⲝ</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity draft="unconfirmed">ⲇⲉⲛⲃⲉⲣ</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲩⲗⲁ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲟⲩ ⲥⲁⲗⲉⲙ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity draft="unconfirmed">ⲥⲉⲛⲑⲉⲣ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity draft="unconfirmed">ϣⲓⲕⲁⲅⲟ</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity draft="unconfirmed">ⲙⲉⲛⲟⲙⲓⲛⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity draft="unconfirmed">ⲃⲓⲛⲥⲉⲛⲛⲉⲥ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity draft="unconfirmed">ⲡⲉⲑⲉⲣⲥⲃⲟⲩⲣⲅ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity draft="unconfirmed">ⲑⲉⲗ ⲥⲓⲑⲓ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity draft="unconfirmed">ⲛⲟⲝ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲓⲛⲁⲙⲁⲕ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲣⲉⲛⲅⲟ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity draft="unconfirmed">ⲓⲛⲇⲓⲁⲛⲁⲡⲟⲗⲓⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲓⲥⲃⲓⲗ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity draft="unconfirmed">ⲃⲉⲃⲉⲁⲓ, ⲓⲛⲇⲓⲁⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲑⲓⲥⲉⲗⲗⲟ, ⲕⲉⲛⲧⲁⲕⲓ</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity draft="unconfirmed">ⲇⲉⲑⲣⲟⲓⲧ</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity draft="unconfirmed">ⲛⲓⲟⲩ ⲓⲟⲣⲕ</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity draft="unconfirmed">ⲙⲟⲛⲑⲉⲃⲓⲇⲉⲟ</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲙⲁⲣⲕⲁⲛⲇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity draft="unconfirmed">ⲑⲁϣⲕⲉⲛⲧ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity draft="unconfirmed">ⲃⲁⲑⲓⲕⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ⲃⲓⲛⲥⲉⲛⲧ</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity draft="unconfirmed">ⲕⲁⲣⲁⲕⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity draft="unconfirmed">ⲑⲟⲣⲟⲗⲁ</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity draft="unconfirmed">ⲥⲁⲛⲧ ⲑⲟⲙⲁⲥ</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity draft="unconfirmed">ϩⲟ ϭⲓ ⲙⲓⲛϩ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity draft="unconfirmed">ⲉϥⲁⲧ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity draft="unconfirmed">ⲟⲩⲁⲗⲗⲓⲥ &amp; ϥⲟⲩⲑⲟⲩⲛⲁ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity draft="unconfirmed">ⲁⲡⲓⲁ</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity draft="unconfirmed">ⲁⲇⲁⲛ</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity draft="unconfirmed">ⲙⲁⲓⲟⲧ</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity draft="unconfirmed">ⲓⲟϩⲁⲛⲥⲃⲟⲩⲣⲅ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity draft="unconfirmed">ⲗⲟⲩⲍⲁⲕⲁ</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity draft="unconfirmed">ϩⲁⲣⲁⲣⲉ</exemplarCity>
+			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟϩⲣⲟⲥ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲗⲁⲥⲕⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲗⲁⲥⲕⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲗⲁⲥⲕⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲙⲁⲍⲟⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲙⲁⲍⲟⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲙⲁⲍⲟⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲙⲏϯ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲙⲏϯ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲓⲉⲃⲧ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲧⲱⲟⲩ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲓⲧⲱⲟⲩ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲓⲧⲱⲟⲩ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲟⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲙⲟⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲙⲟⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲣⲁⲃⲟⲥ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣⲁⲃⲟⲥ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲣⲁⲃⲟⲥ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲍⲟⲣⲉⲥ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲍⲟⲣⲉⲥ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲍⲟⲣⲉⲥ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲟⲩⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲟⲗⲓⲃⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲣⲁⲍⲓⲗ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲣⲁⲍⲓⲗ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲣⲁⲍⲓⲗ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲣⲟⲩⲛⲉⲓ</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲁⲙⲟⲣⲟ</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲁⲑⲁⲙ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϣⲁⲑⲁⲙ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ϣⲁⲑⲁⲙ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϭⲓⲗⲉ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲓⲗⲉ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϭⲓⲗⲉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϭⲓⲛⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲓⲛⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛⲧⲟⲟⲩⲓ ⲛ̀ϭⲓⲛⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲙⲟⲩⲓ ⲛ̀ⲭⲣⲓⲥⲧⲙⲁⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲇⲁⲩⲓⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲇⲟⲩⲣⲙⲟⲛⲧ ⲇⲟⲩⲣⲃⲓⲗ</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲓⲙⲟⲣ-ⲗⲉⲥⲧ</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲉⲕⲟⲩⲁⲇⲟⲣ</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard draft="unconfirmed">ⲟⲩⲕⲉ ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic draft="unconfirmed">ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</generic>
+					<standard draft="unconfirmed">ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</standard>
+					<daylight draft="unconfirmed">ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϥⲓⲇϫⲓ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϥⲓⲇϫⲓ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϥⲓⲇϫⲓ</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲩⲁⲛⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ ⲙ̀ⲡⲓⲣⲏⲥ &amp; ⲁⲛⲧⲁⲣⲕⲑⲓⲕⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲁⲗⲁⲡⲁⲅⲟⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard draft="unconfirmed">̀ⲡⲥⲟⲏⲩ ⲛ̀ⲅⲁⲙⲃⲓⲉⲣ</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϫⲓⲗⲃⲉⲣⲧ</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲅⲣⲓⲛⲓϭ</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡϣⲱⲙ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ</standard>
+					<daylight draft="unconfirmed">̀ⲡⲥⲏⲟⲩ ⲙ̀̀ⲡϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲅⲟⲗϥ</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲩⲁⲛⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϧⲟⲃⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϧⲟⲃⲇ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϧⲟⲃⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲱⲕⲉⲁⲛⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲛⲇⲟϭⲓⲛⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲣⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲣⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲓⲣⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲁⲡⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲁⲡⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲓⲁⲡⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲣⲉⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲟⲣⲉⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲕⲟⲣⲉⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲥⲣⲁⲉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲗⲓⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲗⲉⲍⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲗⲇⲓⲃ</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲣⲕⲉⲥⲁⲥ</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲣϣⲁⲗ</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲩⲥⲟⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲟⲥⲕⲟ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲟⲥⲕⲟ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲟⲥⲕⲟ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲓⲁⲛⲙⲁⲣ</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲩⲣⲟⲩ</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲉⲡⲁⲗ</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲟⲩⲉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲙⲥⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲙⲥⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲙⲥⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲡⲁⲗⲁⲩ</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩⲅⲓⲛⲉⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲣⲟⲩ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲣⲟⲩ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲣⲟⲩ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲫⲓⲛⲓⲝ</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ &amp; ⲙⲓⲕⲉⲗⲟⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ &amp; ⲙⲓⲕⲉⲗⲟⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ &amp; ⲙⲓⲕⲉⲗⲟⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲑⲕⲁⲓⲣⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲟϩⲛⲡⲉⲓ</standard>
+				</long>
+			</metazone>
+			<metazone type="Pyongyang">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲣⲉⲓⲟⲩⲛⲓⲟⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲣⲟⲑⲉⲣⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲟⲣⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲙⲟⲣⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲙⲟⲣⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲩϣⲉⲗ</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲣⲏⲥ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲩⲟⲩⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲁϩⲓⲑⲓ</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲕⲉⲗⲁⲩ</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲛⲅⲁ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲟⲛⲅⲁ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲟⲛⲅⲁ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϭⲟⲩⲕ</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲩⲃⲁⲗⲟⲩ</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲣⲟⲩⲅⲩⲟⲁⲓ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲃⲟⲥⲑⲟⲕ</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲙⲟⲩⲓ ⲛ̀ⲟⲩⲁⲕ</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲁⲗⲓⲥ &amp; ϥⲟⲩⲑⲟⲩⲛⲁ</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ</generic>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ</standard>
+					<daylight draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yukon">
+				<long>
+					<standard draft="unconfirmed">ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲟⲩⲕⲟⲛ</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="AED">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲉⲣϩⲁⲙ ⲛ̀ⲧⲉ ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ</displayName>
+				<displayName count="other" draft="unconfirmed">nⲓⲇⲉⲣϩⲁⲙ ⲛ̀ⲧⲉ ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ</displayName>
+			</currency>
+			<currency type="AFN">
+				<displayName draft="unconfirmed">ⲡⲓⲁϥⲅⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲁϥⲅⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="ALL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗⲃⲁⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲗⲉⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗⲃⲁⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="AMD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲣⲁⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲙⲉⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲣⲁⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲙⲉⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="ANG">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲗⲁⲛⲇⲁ ⲁⲛⲑⲓⲗⲉⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲗⲁⲛⲇⲁ ⲁⲛⲑⲓⲗⲉⲁ</displayName>
+			</currency>
+			<currency type="AOA">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲩⲁⲛⲍⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲛⲅⲟⲗⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲩⲁⲛⲍⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲛⲅⲟⲗⲁ</displayName>
+			</currency>
+			<currency type="ARS">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ</displayName>
+			</currency>
+			<currency type="AWG">
+				<displayName draft="unconfirmed">ⲡⲓϥⲗⲟⲣⲓⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲟⲩⲃⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲗⲟⲣⲓⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲟⲩⲃⲁ</displayName>
+			</currency>
+			<currency type="AZN">
+				<displayName draft="unconfirmed">ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ</displayName>
+			</currency>
+			<currency type="BAM">
+				<displayName draft="unconfirmed">ⲡⲓⲙⲁⲣⲕ ⲛ̀ⲧⲉ ⲃⲟⲥⲛⲓⲁ-ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲙⲁⲣⲕ ⲛ̀ⲧⲉ ⲃⲟⲥⲛⲓⲁ-ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲣⲃⲁⲇⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲣⲃⲁⲇⲓⲁ</displayName>
+			</currency>
+			<currency type="BDT">
+				<displayName draft="unconfirmed">ⲡⲓⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ</displayName>
+			</currency>
+			<currency type="BGN">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲗⲅⲁⲣⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲗⲉⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲗⲅⲁⲣⲓⲁ</displayName>
+			</currency>
+			<currency type="BHD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲣⲁⲓⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲣⲁⲓⲛ</displayName>
+			</currency>
+			<currency type="BIF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲣⲟⲩⲛⲇⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲣⲟⲩⲛⲇⲓ</displayName>
+			</currency>
+			<currency type="BMD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲣⲙⲟⲩⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲣⲙⲟⲩⲇⲁ</displayName>
+			</currency>
+			<currency type="BND">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲃⲣⲟⲩⲛⲉⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲃⲣⲟⲩⲛⲉⲓ</displayName>
+			</currency>
+			<currency type="BOB">
+				<displayName draft="unconfirmed">ⲡⲓⲃⲟⲗⲓⲃⲓⲁⲛⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲗⲓⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲃⲟⲗⲓⲃⲓⲁⲛⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲗⲓⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="BRL">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲉⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲁⲍⲓⲗ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲉⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲁⲍⲓⲗ</displayName>
+			</currency>
+			<currency type="BSD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲁⲙⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲁⲙⲁ</displayName>
+			</currency>
+			<currency type="BTN">
+				<displayName draft="unconfirmed">ⲡⲓⲛⲅⲟⲩⲗⲑⲣⲟⲩⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲑⲁⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲛⲅⲟⲩⲗⲑⲣⲟⲩⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲑⲁⲛⲁ</displayName>
+			</currency>
+			<currency type="BWP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲟⲩⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲑⲥⲟⲩⲁⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲟⲩⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲑⲥⲟⲩⲁⲛⲁ</displayName>
+			</currency>
+			<currency type="BYN">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲗⲁⲣⲟⲩⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲗⲁⲣⲟⲩⲥ</displayName>
+			</currency>
+			<currency type="BZD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲃⲉⲗⲓⲍⲉ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲃⲉⲗⲓⲍⲉ</displayName>
+			</currency>
+			<currency type="CAD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲛⲁⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲛⲁⲇⲁ</displayName>
+			</currency>
+			<currency type="CDF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲛⲅⲟ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲛⲅⲟ</displayName>
+			</currency>
+			<currency type="CHF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲥⲣⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲥⲣⲁ</displayName>
+			</currency>
+			<currency type="CLP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲗⲉ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲗⲉ</displayName>
+			</currency>
+			<currency type="CNH">
+				<displayName draft="unconfirmed">ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName draft="unconfirmed">ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ</displayName>
+			</currency>
+			<currency type="COP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="CRC">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲗⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲥⲑⲁⲣⲓⲕⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲗⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲥⲑⲁⲣⲓⲕⲁ</displayName>
+			</currency>
+			<currency type="CUC">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ ̀ⲛⲣⲉϥϣⲓⲃϯ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ ̀ⲛⲣⲉϥϣⲓⲃϯ</displayName>
+			</currency>
+			<currency type="CUP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ</displayName>
+			</currency>
+			<currency type="CVE">
+				<displayName draft="unconfirmed">ⲡⲓⲉⲥⲕⲟⲩⲇⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲡⲃⲉⲣⲇⲉ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲉⲥⲕⲟⲩⲇⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲡⲃⲉⲣⲇⲉ</displayName>
+			</currency>
+			<currency type="CZK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲣⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ϭⲉⲕ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲣⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ϭⲉⲕ</displayName>
+			</currency>
+			<currency type="DJF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲉⲣⲉⲙⲛ̀ⲇϫⲓⲃⲟⲩⲑⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲉⲣⲉⲙⲛ̀ⲇϫⲓⲃⲟⲩⲑⲓ</displayName>
+			</currency>
+			<currency type="DKK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲙⲁⲣⲕ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲙⲁⲣⲕ</displayName>
+			</currency>
+			<currency type="DOP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲟⲙⲓⲛⲓⲕⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲟⲙⲓⲛⲓⲕⲁⲛ</displayName>
+			</currency>
+			<currency type="DZD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗϫⲉⲣⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗϫⲉⲣⲓⲁ</displayName>
+			</currency>
+			<currency type="EGP">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ</displayName>
+			</currency>
+			<currency type="ERN">
+				<displayName draft="unconfirmed">ⲡⲓⲛⲁⲕϥⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲣⲓⲑⲣⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲛⲁⲕϥⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲣⲓⲑⲣⲓⲁ</displayName>
+			</currency>
+			<currency type="ETB">
+				<displayName draft="unconfirmed">ⲡⲓⲃⲓⲣⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲃⲓⲣⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ</displayName>
+			</currency>
+			<currency type="EUR">
+				<displayName draft="unconfirmed">ⲉⲩⲣⲟ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲉⲩⲣⲟ</displayName>
+			</currency>
+			<currency type="FJD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϥⲓⲇϫⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϥⲓⲇϫⲓ</displayName>
+			</currency>
+			<currency type="FKP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲛⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲛⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ</displayName>
+			</currency>
+			<currency type="GBP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲓⲑⲁⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲓⲑⲁⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="GEL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲉⲟⲣⲅⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲗⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲉⲟⲣⲅⲓⲁ</displayName>
+			</currency>
+			<currency type="GHS">
+				<displayName draft="unconfirmed">ⲡⲓⲥⲉⲇⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲥⲉⲇⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲛⲁ</displayName>
+			</currency>
+			<currency type="GIP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲅⲓⲃⲣⲁⲗⲑⲁⲣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲅⲓⲃⲣⲁⲗⲑⲁⲣ</displayName>
+			</currency>
+			<currency type="GMD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲁⲗⲁⲥⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲙⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲁⲗⲁⲥⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲙⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="GNF">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲓⲛⲉⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲓⲛⲉⲁ</displayName>
+			</currency>
+			<currency type="GTQ">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲉⲑⲍⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲉⲑⲍⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ</displayName>
+			</currency>
+			<currency type="GYD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲩⲁⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲩⲁⲛⲁ</displayName>
+			</currency>
+			<currency type="HKD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ϩⲟⲛⲅ ⲕⲟⲛⲅ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ϩⲟⲛⲅ ⲕⲟⲛⲅ</displayName>
+			</currency>
+			<currency type="HNL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲙⲡⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲛⲇⲟⲩⲣⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲗⲉⲙⲡⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲛⲇⲟⲩⲣⲁ</displayName>
+			</currency>
+			<currency type="HRK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲣⲟⲩⲁⲑⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲣⲟⲩⲁⲑⲓⲁ</displayName>
+			</currency>
+			<currency type="HTG">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲟⲩⲣⲇ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲓⲑⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲟⲩⲣⲇ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲓⲑⲓ</displayName>
+			</currency>
+			<currency type="HUF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲟⲣⲓⲛⲧ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲛⲅⲁⲣⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲟⲣⲓⲛⲧ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲛⲅⲁⲣⲓⲁ</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓⲁϩ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓⲁϩ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName draft="unconfirmed">ⲡⲓϣⲉⲕⲉⲗ ⲙ̀ⲃⲉⲣⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϣⲉⲕⲉⲗ ⲙ̀ⲃⲉⲣⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙ̀ⲛ̀ϩⲉⲛⲧⲟⲩ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙ̀ⲛ̀ϩⲉⲛⲧⲟⲩ</displayName>
+			</currency>
+			<currency type="IQD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲕ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲕ</displayName>
+			</currency>
+			<currency type="IRR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲛ</displayName>
+			</currency>
+			<currency type="ISK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲓⲥⲗⲁⲛⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲓⲥⲗⲁⲛⲇⲁ</displayName>
+			</currency>
+			<currency type="JMD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϫⲁⲙⲁⲓⲕⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϫⲁⲙⲁⲓⲕⲁ</displayName>
+			</currency>
+			<currency type="JOD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲟⲣⲇⲁⲛⲏⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲟⲣⲇⲁⲛⲏⲥ</displayName>
+			</currency>
+			<currency type="JPY">
+				<displayName draft="unconfirmed">ⲡⲓⲓⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲓⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛ</displayName>
+			</currency>
+			<currency type="KES">
+				<displayName draft="unconfirmed">ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲉⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲉⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="KGS">
+				<displayName draft="unconfirmed">ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲙⲃⲟⲩⲇⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲙⲃⲟⲩⲇⲓⲁ</displayName>
+			</currency>
+			<currency type="KMF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲙⲟⲣⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲙⲟⲣⲓ</displayName>
+			</currency>
+			<currency type="KPW">
+				<displayName draft="unconfirmed">ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ</displayName>
+			</currency>
+			<currency type="KRW">
+				<displayName draft="unconfirmed">ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ</displayName>
+			</currency>
+			<currency type="KWD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲁⲓⲧ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲁⲓⲧ</displayName>
+			</currency>
+			<currency type="KYD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ</displayName>
+			</currency>
+			<currency type="KZT">
+				<displayName draft="unconfirmed">ⲡⲓⲑⲉⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲑⲉⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲓⲡ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲟ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲓⲡ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲟ</displayName>
+			</currency>
+			<currency type="LBP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲁⲛⲟⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲁⲛⲟⲛ</displayName>
+			</currency>
+			<currency type="LKR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲣⲓⲗⲁⲛⲕⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲣⲓⲗⲁⲛⲕⲁ</displayName>
+			</currency>
+			<currency type="LRD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲓⲃⲉⲣⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲓⲃⲉⲣⲓⲁ</displayName>
+			</currency>
+			<currency type="LSL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ</displayName>
+			</currency>
+			<currency type="LYD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="MAD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲣⲁⲕⲉϣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲣⲁⲕⲉϣ</displayName>
+			</currency>
+			<currency type="MDL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲗⲇⲟⲃⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲗⲇⲟⲃⲁ</displayName>
+			</currency>
+			<currency type="MGA">
+				<displayName draft="unconfirmed">ⲡⲓⲁⲣⲓⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲁⲅⲁⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲁⲣⲓⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲁⲅⲁⲥ</displayName>
+			</currency>
+			<currency type="MKD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲉⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲉⲇⲟⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲇⲉⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲉⲇⲟⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="MMK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲩⲁⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲩⲁⲛⲙⲁⲣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲩⲁⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲩⲁⲛⲙⲁⲣ</displayName>
+			</currency>
+			<currency type="MNT">
+				<displayName draft="unconfirmed">ⲡⲓⲑⲟⲩⲅⲣⲓⲕ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲛⲅⲟⲗⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲑⲟⲩⲅⲣⲓⲕ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲛⲅⲟⲗⲓⲁ</displayName>
+			</currency>
+			<currency type="MOP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲁⲛⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲁⲛⲓ</displayName>
+			</currency>
+			<currency type="MRU">
+				<displayName draft="unconfirmed">ⲡⲓⲟⲩⲅⲟⲩⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲁⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲟⲩⲅⲟⲩⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲁⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="MUR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲓⲟⲩⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲓⲟⲩⲥ</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩϥⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲇⲓⲃ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩϥⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲇⲓⲃ</displayName>
+			</currency>
+			<currency type="MWK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲙⲁⲗⲁⲩⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲙⲁⲗⲁⲩⲓ</displayName>
+			</currency>
+			<currency type="MXN">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲙⲉⲝⲓⲕⲟ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲙⲉⲝⲓⲕⲟ</displayName>
+			</currency>
+			<currency type="MYR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲛⲅⲓⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲉⲍⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲛⲅⲓⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲉⲍⲓⲁ</displayName>
+			</currency>
+			<currency type="MZN">
+				<displayName draft="unconfirmed">ⲡⲓⲙⲉⲑⲓⲕⲁⲗ ⲛ̀ⲣⲉⲛⲙ̀ⲟⲍⲁⲙⲃⲓⲕ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲙⲉⲑⲓⲕⲁⲗ ⲛ̀ⲣⲉⲛⲙ̀ⲟⲍⲁⲙⲃⲓⲕ</displayName>
+			</currency>
+			<currency type="NAD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲙⲓⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲙⲓⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="NGN">
+				<displayName draft="unconfirmed">ⲡⲓⲛⲁⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲓⲅⲉⲣⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲛⲁⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲓⲅⲉⲣⲓⲁ</displayName>
+			</currency>
+			<currency type="NIO">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲣⲇⲟⲃⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲕⲁⲣⲁⲅⲟⲩⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲣⲇⲟⲃⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲕⲁⲣⲁⲅⲟⲩⲁ</displayName>
+			</currency>
+			<currency type="NOK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲟⲣⲟⲩⲓⲅ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲟⲣⲟⲩⲓⲅ</displayName>
+			</currency>
+			<currency type="NPR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲉⲡⲁⲗ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲉⲡⲁⲗ</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ</displayName>
+			</currency>
+			<currency type="OMR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲙⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲙⲁⲛ</displayName>
+			</currency>
+			<currency type="PAB">
+				<displayName draft="unconfirmed">ⲡⲓⲃⲁⲗⲃⲟⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲛⲁⲙⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲃⲁⲗⲃⲟⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲛⲁⲙⲁ</displayName>
+			</currency>
+			<currency type="PEN">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲟⲩⲁⲣⲁⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲟⲩⲁⲣⲁⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ</displayName>
+			</currency>
+			<currency type="PGK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲓⲛⲁ ⲛ̀ⲧⲉ ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲓⲛⲁ ⲛ̀ⲧⲉ ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲫⲓⲗⲓⲡⲡⲓⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲫⲓⲗⲓⲡⲡⲓⲛ</displayName>
+			</currency>
+			<currency type="PKR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲕⲓⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲕⲓⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="PLN">
+				<displayName draft="unconfirmed">ⲡⲓⲍⲗⲟⲑⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲟⲗⲁⲛⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲍⲗⲟⲑⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲟⲗⲁⲛⲇⲁ</displayName>
+			</currency>
+			<currency type="PYG">
+				<displayName draft="unconfirmed">ⲡⲓⲥⲟⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲟⲩ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲥⲟⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲟⲩ</displayName>
+			</currency>
+			<currency type="QAR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲑⲁⲣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲑⲁⲣ</displayName>
+			</currency>
+			<currency type="RON">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲙⲁⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲙⲁⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="RSD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲉⲣⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲉⲣⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="RUB">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲣⲟⲩⲥⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲣⲟⲩⲥⲓⲁ</displayName>
+			</currency>
+			<currency type="RWF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲩⲁⲛⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲩⲁⲛⲇⲁ</displayName>
+			</currency>
+			<currency type="SAR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲟⲩⲇⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲟⲩⲇⲓ</displayName>
+			</currency>
+			<currency type="SBD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ</displayName>
+			</currency>
+			<currency type="SCR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲟⲩⲡⲓ ⲣ̀ⲉⲙⲛ̀ⲥⲓϣⲉⲗ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲟⲩⲡⲓ ⲣ̀ⲉⲙⲛ̀ⲥⲓϣⲉⲗ</displayName>
+			</currency>
+			<currency type="SDG">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ</displayName>
+			</currency>
+			<currency type="SEK">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲇ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲇ</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ</displayName>
+			</currency>
+			<currency type="SHP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲧⲉ ⲥⲁⲛⲧ ϩⲉⲗⲉⲛⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲧⲉ ⲥⲁⲛⲧ ϩⲉⲗⲉⲛⲁ</displayName>
+			</currency>
+			<currency type="SLE">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ</displayName>
+			</currency>
+			<currency type="SLL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ (1964—2022)</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ (1964—2022)</displayName>
+			</currency>
+			<currency type="SOS">
+				<displayName draft="unconfirmed">ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲙⲁⲗⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲙⲁⲗⲓⲁ</displayName>
+			</currency>
+			<currency type="SRD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ</displayName>
+			</currency>
+			<currency type="SSP">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲡⲓⲣⲏⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲡⲓⲣⲏⲥ</displayName>
+			</currency>
+			<currency type="STN">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲃⲣⲁ ⲛ̀ⲧⲉ ⲥⲁⲟ ⲑⲟⲙⲉ &amp; ⲡⲣⲓⲛⲥⲓⲡ ⲇⲟⲃⲣⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲃⲣⲁ ⲛ̀ⲧⲉ ⲥⲁⲟ ⲑⲟⲙⲉ &amp; ⲡⲣⲓⲛⲥⲓⲡ ⲇⲟⲃⲣⲁ</displayName>
+			</currency>
+			<currency type="SYP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲁⲥⲥⲩⲣⲟⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲁⲥⲥⲩⲣⲟⲥ</displayName>
+			</currency>
+			<currency type="SZL">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲉ̀ⲙⲁⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ</displayName>
+			</currency>
+			<currency type="THB">
+				<displayName draft="unconfirmed">ⲡⲓⲃⲁϩⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲓⲗⲁⲛⲇ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲃⲁϩⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲓⲗⲁⲛⲇ</displayName>
+			</currency>
+			<currency type="TJS">
+				<displayName draft="unconfirmed">ⲡⲓⲥⲟⲙⲟⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲥⲟⲙⲟⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="TMT">
+				<displayName draft="unconfirmed">ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="TND">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲛⲓⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲛⲓⲥ</displayName>
+			</currency>
+			<currency type="TOP">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲁʻⲁⲛⲅⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲛⲅⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲡⲁʻⲁⲛⲅⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲛⲅⲁ</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName draft="unconfirmed">ⲡⲓⲗⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲗⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲓⲁ</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲑⲣⲓⲛⲓⲇⲁⲇ &amp; ⲑⲟⲃⲁⲅⲟ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲑⲣⲓⲛⲓⲇⲁⲇ &amp; ⲑⲟⲃⲁⲅⲟ</displayName>
+			</currency>
+			<currency type="TWD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲟⲩ ⲑⲁⲓⲟⲩⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲟⲩ ⲑⲁⲓⲟⲩⲁⲛ</displayName>
+			</currency>
+			<currency type="TZS">
+				<displayName draft="unconfirmed">ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲛⲍⲁⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲛⲍⲁⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="UAH">
+				<displayName draft="unconfirmed">ⲡⲓϩⲣⲩⲃⲛⲓⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲕⲣⲁⲛⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϩⲣⲩⲃⲛⲓⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲕⲣⲁⲛⲓⲁ</displayName>
+			</currency>
+			<currency type="UGX">
+				<displayName draft="unconfirmed">ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲅⲁⲛⲇⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲅⲁⲛⲇⲁ</displayName>
+			</currency>
+			<currency type="USD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ</displayName>
+			</currency>
+			<currency type="UYU">
+				<displayName draft="unconfirmed">ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ</displayName>
+			</currency>
+			<currency type="UZS">
+				<displayName draft="unconfirmed">ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ</displayName>
+			</currency>
+			<currency type="VES">
+				<displayName draft="unconfirmed">ⲡⲓⲃⲟⲗⲓⲃⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲃⲟⲗⲓⲃⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲓⲉⲑⲛⲁⲙ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲇⲟⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲓⲉⲑⲛⲁⲙ</displayName>
+			</currency>
+			<currency type="VUV">
+				<displayName draft="unconfirmed">ⲡⲓⲃⲁⲑⲟⲩ ⲛ̀ⲧⲉ ⲃⲁⲛⲁⲑⲟⲩ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲃⲁⲑⲟⲩ ⲛ̀ⲧⲉ ⲃⲁⲛⲁⲑⲟⲩ</displayName>
+			</currency>
+			<currency type="WST">
+				<displayName draft="unconfirmed">ⲡⲓⲑⲁⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲙⲟⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲑⲁⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲙⲟⲁ</displayName>
+			</currency>
+			<currency type="XAF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName draft="unconfirmed">ⲡⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲣⲓⲃⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲣⲓⲃⲓ</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName draft="unconfirmed">ⲡⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲣⲓⲃⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲣⲓⲃⲓ</displayName>
+			</currency>
+			<currency type="XOF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ</displayName>
+			</currency>
+			<currency type="XPF">
+				<displayName draft="unconfirmed">ⲡⲓϥⲣⲁⲛⲕ ⲥϥⲡ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓϥⲣⲁⲛⲕ ⲥϥⲡ</displayName>
+			</currency>
+			<currency type="XXX">
+				<displayName draft="unconfirmed">ⲟⲩϩⲁⲧ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">(ⲟⲩϩⲁⲧ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ)</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲉⲙⲉⲛ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲉⲙⲉⲛ</displayName>
+			</currency>
+			<currency type="ZAR">
+				<displayName draft="unconfirmed">ⲡⲓⲣⲁⲛⲇ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲣⲁⲛⲇ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ</displayName>
+			</currency>
+			<currency type="ZMW">
+				<displayName draft="unconfirmed">ⲡⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲁⲙⲃⲓⲁ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲛⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲁⲙⲃⲓⲁ</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName draft="unconfirmed">ⲡⲓⲛⲟⲩⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲓⲙⲃⲁⲃⲟⲩⲉⲓ</displayName>
+				<displayName count="other" draft="unconfirmed">ⲡⲓⲛⲟⲩⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲓⲙⲃⲁⲃⲟⲩⲉⲓ</displayName>
+			</currency>
+		</currencies>
+		<minimalPairs>
+			<pluralMinimalPairs count="other" draft="unconfirmed">{0} ⲛⲓⲉϩⲟⲟⲩ</pluralMinimalPairs>
+		</minimalPairs>
+	</numbers>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end" draft="unconfirmed">{0}, ⲛⲉⲙ {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ⲛⲉⲙ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or">
+			<listPatternPart type="end" draft="unconfirmed">{0}, ⲓⲉ {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ⲓⲉ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-narrow">
+			<listPatternPart type="end" draft="unconfirmed">{0}, ⲓⲉ {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ⲓⲉ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="end" draft="unconfirmed">{0}, ⲓⲉ {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ⲓⲉ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="end" draft="unconfirmed">{0}, &amp; {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} &amp; {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
 </ldml>
diff --git a/make/data/cldr/common/main/cs.xml b/make/data/cldr/common/main/cs.xml
index 47b0c97a132..a4685374342 100644
--- a/make/data/cldr/common/main/cs.xml
+++ b/make/data/cldr/common/main/cs.xml
@@ -120,6 +120,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="chp">čipevajština</language>
 			<language type="chr">čerokézština</language>
 			<language type="chy">čejenština</language>
+			<language type="cic" draft="contributed">čikasavština</language>
 			<language type="ckb">kurdština (sorání)</language>
 			<language type="ckb" alt="menu">kurdština (centrální)</language>
 			<language type="clc">čilkotinština</language>
@@ -323,6 +324,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kolínština</language>
 			<language type="ku">kurdština</language>
+			<language type="ku" menu="core">kurdština</language>
+			<language type="ku" menu="extension">kurmándží</language>
 			<language type="kum">kumyčtina</language>
 			<language type="kut">kutenajština</language>
 			<language type="kv">komijština</language>
@@ -344,6 +347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lil">lillooetština</language>
 			<language type="liv">livonština</language>
 			<language type="lkt">lakotština</language>
+			<language type="lld" draft="contributed">ladinština</language>
 			<language type="lmo">lombardština</language>
 			<language type="ln">lingalština</language>
 			<language type="lo">laoština</language>
@@ -930,6 +934,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Čína</territory>
 			<territory type="CO">Kolumbie</territory>
 			<territory type="CP">Clippertonův ostrov</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kapverdy</territory>
@@ -1177,33 +1182,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Číselné řazení</key>
 			<key type="colStrength">Míra řazení</key>
 			<key type="currency">Měna</key>
+			<key type="em">Zobrazení emodži</key>
 			<key type="hc">Hodinový cyklus (12 vs. 24)</key>
 			<key type="lb">Styl zalamování řádků</key>
+			<key type="lw">Zalamování řádků uprostřed slova</key>
 			<key type="ms">Měrná soustava</key>
 			<key type="numbers">Čísla</key>
+			<key type="ss">Zlom věty za zkratkou</key>
 			<key type="timezone">Časové pásmo</key>
 			<key type="va">Varianta národního prostředí</key>
 			<key type="x">Soukromé použití</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddhistický kalendář</type>
+			<type key="calendar" type="buddhist" scope="core">Buddhistický</type>
 			<type key="calendar" type="chinese">Čínský kalendář</type>
+			<type key="calendar" type="chinese" scope="core">Čínský</type>
 			<type key="calendar" type="coptic">Koptský kalendář</type>
+			<type key="calendar" type="coptic" scope="core">Koptský</type>
 			<type key="calendar" type="dangi">Korejský kalendář Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Korejský Dangi</type>
 			<type key="calendar" type="ethiopic">Etiopský kalendář</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiopský</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiopský kalendář (amete alem)</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etiopský (amete alem)</type>
 			<type key="calendar" type="gregorian">Gregoriánský kalendář</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriánský</type>
 			<type key="calendar" type="hebrew">Hebrejský kalendář</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrejský</type>
 			<type key="calendar" type="indian">Indický národní kalendář</type>
 			<type key="calendar" type="islamic">Kalendář podle hidžry</type>
+			<type key="calendar" type="islamic" scope="core">Podle hidžry</type>
 			<type key="calendar" type="islamic-civil">Kalendář podle hidžry (občanský)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Podle hidždy (občanský)</type>
 			<type key="calendar" type="islamic-umalqura">Kalendář podle hidžry (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Podle hidžry (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Kalendář ISO-8601</type>
 			<type key="calendar" type="japanese">Japonský kalendář</type>
+			<type key="calendar" type="japanese" scope="core">Japonský</type>
 			<type key="calendar" type="persian">Perský kalendář</type>
+			<type key="calendar" type="persian" scope="core">Perský</type>
 			<type key="calendar" type="roc">Kalendář Čínské republiky</type>
+			<type key="calendar" type="roc" scope="core">Čínské republiky</type>
 			<type key="cf" type="account">Účetní měnový formát</type>
+			<type key="cf" type="account" scope="core">Účetní</type>
 			<type key="cf" type="standard">Standardní měnový formát</type>
+			<type key="cf" type="standard" scope="core">Standardní</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Řadit symboly</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Při řazení ignorovat symboly</type>
 			<type key="colBackwards" type="no" draft="contributed">Normální řazení akcentů</type>
@@ -1213,22 +1237,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Nejdříve řadit velká písmena</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Nerozlišovat při řazení velká a malá písmena</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Rozlišovat při řazení velká a malá písmena</type>
-			<type key="collation" type="big5han">Řazení pro tradiční čínštinu – Big5</type>
 			<type key="collation" type="compat">Předchozí řazení, kompatibilita</type>
+			<type key="collation" type="compat" scope="core">Kompatibilita</type>
 			<type key="collation" type="dictionary">Slovníkové řazení</type>
+			<type key="collation" type="dictionary" scope="core">Slovník</type>
 			<type key="collation" type="ducet">Výchozí řazení Unicode</type>
+			<type key="collation" type="ducet" scope="core">Výchozí Unicode</type>
 			<type key="collation" type="eor">Evropské řazení</type>
-			<type key="collation" type="gb2312han">Řazení pro zjednodušenou čínštinu – GB2312</type>
 			<type key="collation" type="phonebook">Řazení telefonního seznamu</type>
+			<type key="collation" type="phonebook" scope="core">Telefonní seznam</type>
 			<type key="collation" type="phonetic">Fonetické řazení</type>
+			<type key="collation" type="phonetic" scope="core">Fonetické</type>
 			<type key="collation" type="pinyin">Řazení podle pchin-jinu</type>
+			<type key="collation" type="pinyin" scope="core">Podle pchin-jinu</type>
 			<type key="collation" type="search">Obecné hledání</type>
+			<type key="collation" type="search" scope="core">Hledání</type>
 			<type key="collation" type="searchjl" draft="contributed">Vyhledávat podle počáteční souhlásky písma hangul</type>
 			<type key="collation" type="standard">Standardní řazení</type>
+			<type key="collation" type="standard" scope="core">Standardní</type>
 			<type key="collation" type="stroke">Řazení podle tahů</type>
+			<type key="collation" type="stroke" scope="core">Podle tahů</type>
 			<type key="collation" type="traditional">Tradiční řazení</type>
+			<type key="collation" type="traditional" scope="core">Tradiční</type>
 			<type key="collation" type="unihan">Řazení podle radikálů</type>
+			<type key="collation" type="unihan" scope="core">Podle radikálů</type>
 			<type key="collation" type="zhuyin">Řazení podle ču-jinu</type>
+			<type key="collation" type="zhuyin" scope="core">Podle ču-jinu</type>
 			<type key="colNormalization" type="no" draft="contributed">Řadit bez normalizace</type>
 			<type key="colNormalization" type="yes">Řadit podle normalizovaného kódování Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Řadit číslice jednotlivě</type>
@@ -1241,18 +1275,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Plná šířka</type>
 			<type key="d0" type="hwidth">Poloviční šířka</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerický</type>
+			<type key="em" type="default" scope="core">Výchozí</type>
+			<type key="em" type="emoji" scope="core">Emodži</type>
+			<type key="em" type="text" scope="core">Text</type>
 			<type key="hc" type="h11">12hodinový systém (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12hodinový systém (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24hodinový systém (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24hodinový systém (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Volný styl zalamování řádků</type>
+			<type key="lb" type="loose" scope="core">Volný</type>
 			<type key="lb" type="normal">Běžný styl zalamování řádků</type>
+			<type key="lb" type="normal" scope="core">Běžný</type>
 			<type key="lb" type="strict">Striktní styl zalamování řádků</type>
+			<type key="lb" type="strict" scope="core">Striktní</type>
+			<type key="lw" type="breakall" scope="core">Zalamovat vše</type>
+			<type key="lw" type="keepall" scope="core">Ponechat vše</type>
+			<type key="lw" type="normal" scope="core">Normální</type>
+			<type key="lw" type="phrase" scope="core">Ponechat ve frázích</type>
 			<type key="m0" type="bgn">Transliterace podle BGN</type>
 			<type key="m0" type="ungegn">Transliterace podle UNGEGN</type>
 			<type key="ms" type="metric">Metrická soustava</type>
+			<type key="ms" type="metric" scope="core">Metrická</type>
 			<type key="ms" type="uksystem">Britská měrná soustava</type>
+			<type key="ms" type="uksystem" scope="core">Britská</type>
 			<type key="ms" type="ussystem">Americká měrná soustava</type>
+			<type key="ms" type="ussystem" scope="core">Americká</type>
 			<type key="numbers" type="arab">Arabsko-indické číslice</type>
 			<type key="numbers" type="arabext">Rozšířené arabsko-indické číslice</type>
 			<type key="numbers" type="armn">Arménské číslice</type>
@@ -1301,6 +1352,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Tibetské číslice</type>
 			<type key="numbers" type="traditional">Tradiční číslovky</type>
 			<type key="numbers" type="vaii">Vaiské číslice</type>
+			<type key="ss" type="none" scope="core">Ne</type>
+			<type key="ss" type="standard" scope="core">Ano</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrický</measurementSystemName>
@@ -1565,6 +1618,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'v' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'v' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1573,6 +1629,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'v' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'v' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1592,18 +1651,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d. M. y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d. MMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E d. MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d. M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. M.</dateFormatItem>
@@ -1625,12 +1686,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d.–d.</greatestDifference>
 						</intervalFormatItem>
@@ -1672,10 +1727,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d. M. – E d. M. y G</greatestDifference>
 							<greatestDifference id="y">E d. M. y – E d. M. y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -1706,10 +1757,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H" draft="contributed">H:mm–H:mm, vvvv</greatestDifference>
 							<greatestDifference id="m" draft="contributed">H:mm–H:mm, vvvv</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -2032,13 +2079,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d. M. y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d. MMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E d. MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
@@ -2052,6 +2100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
 						<dateFormatItem id="hmvvvv">h:mm a, vvvv</dateFormatItem>
 						<dateFormatItem id="Hmvvvv">H:mm, vvvv</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d. M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. M.</dateFormatItem>
@@ -2079,12 +2128,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">w. 'týden' 'roku' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d.–d.</greatestDifference>
 						</intervalFormatItem>
@@ -2126,10 +2169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d. M. – E d. M. y G</greatestDifference>
 							<greatestDifference id="y">E d. M. y – E d. M. y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -2160,10 +2199,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H" draft="contributed">H:mm–H:mm, vvvv</greatestDifference>
 							<greatestDifference id="m" draft="contributed">H:mm–H:mm, vvvv</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -2841,11 +2876,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+H:mm;-H:mm</hourFormat>
 			<regionFormat>časové pásmo {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="contributed">HST</generic>
-					<standard draft="contributed">HST</standard>
-					<daylight draft="contributed">HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2862,15 +2892,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kabul">
 				<exemplarCity>Kábul</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vídeň</exemplarCity>
 			</zone>
@@ -2895,15 +2919,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brunej</exemplarCity>
 			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Bahía</exemplarCity>
 			</zone>
@@ -2928,9 +2943,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Šanghaj</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Kostarika</exemplarCity>
 			</zone>
@@ -3051,7 +3063,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Phnompenh</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kanton (ostrov)</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komory</exemplarCity>
@@ -3125,24 +3137,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maledivy</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahia Banderas</exemplarCity>
 			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Ciudad de México</exemplarCity>
-			</zone>
 			<zone type="America/Merida">
 				<exemplarCity>Merida</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
 				<exemplarCity>Kučing</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Káthmándú</exemplarCity>
 			</zone>
@@ -3224,9 +3227,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Rijád</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Chartúm</exemplarCity>
 			</zone>
@@ -3257,9 +3257,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kerguelenovy ostrovy</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
@@ -3328,9 +3325,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>západoafrický čas</generic>
-					<standard>západoafrický standardní čas</standard>
-					<daylight>západoafrický letní čas</daylight>
+					<standard>západoafrický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3753,6 +3748,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>guyanský čas</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>havajsko-aleutský standardní čas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>havajsko-aleutský čas</generic>
@@ -4203,6 +4203,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>chuukský čas</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turecký čas</generic>
+					<standard>Turecký standardní čas</standard>
+					<daylight>Turecký letní čas</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>turkmenský čas</generic>
@@ -4389,7 +4396,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -6383,6 +6393,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">východokaribského dolaru</displayName>
 				<displayName count="other">východokaribských dolarů</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibský gulden</displayName>
+				<displayName count="one">karibský gulden</displayName>
+				<displayName count="few">karibské guldeny</displayName>
+				<displayName count="many">karibského guldenu</displayName>
+				<displayName count="other">karibských guldenů</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>SDR</displayName>
 			</currency>
@@ -6544,6 +6561,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">zimbabwského dolaru (1980–2008)</displayName>
 				<displayName count="other">zimbabwských dolarů (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabwský zlatý</displayName>
+				<displayName count="one">zimbabwský zlatý</displayName>
+				<displayName count="few">zimbabwské zlaté</displayName>
+				<displayName count="many">zimbabwského zlatého</displayName>
+				<displayName count="other">zimbabwských zlatých</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>zimbabwský dolar (2009)</displayName>
 				<displayName count="one">zimbabwský dolar (2009)</displayName>
@@ -7288,7 +7312,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} položkami</unitPattern>
 				<unitPattern count="other" case="locative">{0} položkách</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>díly</displayName>
+				<unitPattern count="one">{0} díl</unitPattern>
+				<unitPattern count="few">{0} díly</unitPattern>
+				<unitPattern count="many">{0} dílu</unitPattern>
+				<unitPattern count="other">{0} dílů</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>inanimate</gender>
 				<displayName>díly z milionu</displayName>
 				<unitPattern count="one">{0} díl z milionu</unitPattern>
@@ -7428,6 +7459,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} moly</unitPattern>
 				<unitPattern count="other" case="locative">{0} molech</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukózy</displayName>
+				<unitPattern count="one">{0} glukózy</unitPattern>
+				<unitPattern count="few">{0} glukózy</unitPattern>
+				<unitPattern count="many">{0} glukózy</unitPattern>
+				<unitPattern count="other">{0} glukózy</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>inanimate</gender>
 				<displayName>litry na kilometr</displayName>
@@ -9126,7 +9164,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-point">
 				<gender>inanimate</gender>
-				<displayName>body</displayName>
 				<unitPattern count="one">{0} bod</unitPattern>
 				<unitPattern count="one" case="accusative">{0} bod</unitPattern>
 				<unitPattern count="one" case="dative">{0} bodu</unitPattern>
@@ -9648,11 +9685,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few" case="instrumental">{0} milimetry rtuťového sloupce</unitPattern>
 				<unitPattern count="few" case="locative">{0} milimetrech rtuťového sloupce</unitPattern>
 				<unitPattern count="many">{0} milimetru rtuťového sloupce</unitPattern>
-				<unitPattern count="many" case="accusative">{0} milimetrů rtuťového sloupce</unitPattern>
-				<unitPattern count="many" case="dative">{0} milimetrům rtuťového sloupce</unitPattern>
-				<unitPattern count="many" case="genitive">{0} milimetrů rtuťového sloupce</unitPattern>
-				<unitPattern count="many" case="instrumental">{0} milimetry rtuťového sloupce</unitPattern>
-				<unitPattern count="many" case="locative">{0} milimetrech rtuťového sloupce</unitPattern>
+				<unitPattern count="many" case="accusative">{0} milimetru rtuťového sloupce</unitPattern>
+				<unitPattern count="many" case="dative">{0} milimetru rtuťového sloupce</unitPattern>
+				<unitPattern count="many" case="genitive">{0} milimetru rtuťového sloupce</unitPattern>
+				<unitPattern count="many" case="instrumental">{0} milimetru rtuťového sloupce</unitPattern>
+				<unitPattern count="many" case="locative">{0} milimetru rtuťového sloupce</unitPattern>
 				<unitPattern count="other">{0} milimetrů rtuťového sloupce</unitPattern>
 				<unitPattern count="other" case="accusative">{0} milimetrů rtuťového sloupce</unitPattern>
 				<unitPattern count="other" case="dative">{0} milimetrům rtuťového sloupce</unitPattern>
@@ -9660,6 +9697,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} milimetry rtuťového sloupce</unitPattern>
 				<unitPattern count="other" case="locative">{0} milimetrech rtuťového sloupce</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>rtuťový sloupec</displayName>
+				<unitPattern count="one">{0} rtuťového sloupce</unitPattern>
+				<unitPattern count="few">{0} rtuťového sloupce</unitPattern>
+				<unitPattern count="many">{0} rtuťového sloupce</unitPattern>
+				<unitPattern count="other">{0} rtuťového sloupce</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libry na čtvereční palec</displayName>
 				<unitPattern count="one">{0} libra na čtvereční palec</unitPattern>
@@ -10412,6 +10456,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} metrickými šálky</unitPattern>
 				<unitPattern count="other" case="locative">{0} metrických šálcích</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrické duté unce</displayName>
+				<unitPattern count="one">{0} metrická dutá unce</unitPattern>
+				<unitPattern count="few">{0} metrické duté unce</unitPattern>
+				<unitPattern count="many">{0} metrické duté unce</unitPattern>
+				<unitPattern count="other">{0} metrických dutých uncí</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akro-stopy</displayName>
 				<unitPattern count="one">{0} akro-stopa</unitPattern>
@@ -10533,9 +10584,99 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} britského kvartu</unitPattern>
 				<unitPattern count="other">{0} britských kvartů</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiány</displayName>
+				<unitPattern count="one">{0} steradián</unitPattern>
+				<unitPattern count="few">{0} steradiány</unitPattern>
+				<unitPattern count="many">{0} steradiánu</unitPattern>
+				<unitPattern count="other">{0} steradiánů</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>kataly</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} kataly</unitPattern>
+				<unitPattern count="many">{0} katalu</unitPattern>
+				<unitPattern count="other">{0} katalů</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomby</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="few">{0} coulomby</unitPattern>
+				<unitPattern count="many">{0} coulombu</unitPattern>
+				<unitPattern count="other">{0} coulombů</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farady</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farady</unitPattern>
+				<unitPattern count="many">{0} faradu</unitPattern>
+				<unitPattern count="other">{0} faradů</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="few">{0} henry</unitPattern>
+				<unitPattern count="many">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensy</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="few">{0} siemensy</unitPattern>
+				<unitPattern count="many">{0} siemensu</unitPattern>
+				<unitPattern count="other">{0} siemensů</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorie-IT</displayName>
+				<unitPattern count="one">{0} kalorie-IT</unitPattern>
+				<unitPattern count="few">{0} kalorie-IT</unitPattern>
+				<unitPattern count="many">{0} kalorie-IT</unitPattern>
+				<unitPattern count="other">{0} kalorií-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerely</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="few">{0} becquerely</unitPattern>
+				<unitPattern count="many">{0} becquerelu</unitPattern>
+				<unitPattern count="other">{0} becquerelů</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverty</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="few">{0} sievert</unitPattern>
+				<unitPattern count="many">{0} sieverty</unitPattern>
+				<unitPattern count="other">{0} sievertu</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>graye</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="few">{0} graye</unitPattern>
+				<unitPattern count="many">{0} graye</unitPattern>
+				<unitPattern count="other">{0} grayů</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramy síly</displayName>
+				<unitPattern count="one">{0} kilogram síly</unitPattern>
+				<unitPattern count="few">{0} kilogramy síly</unitPattern>
+				<unitPattern count="many">{0} kilogramu síly</unitPattern>
+				<unitPattern count="other">{0} kilogramů síly</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesly</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesly</unitPattern>
+				<unitPattern count="many">{0} tesly</unitPattern>
+				<unitPattern count="other">{0} tesel</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webery</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="few">{0} webery</unitPattern>
+				<unitPattern count="many">{0} weberu</unitPattern>
+				<unitPattern count="other">{0} weberů</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>světlo</displayName>
 				<unitPattern count="one">{0} světlo</unitPattern>
 				<unitPattern count="one" case="accusative">{0} světlo</unitPattern>
 				<unitPattern count="one" case="dative">{0} světlu</unitPattern>
@@ -10561,7 +10702,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} světly</unitPattern>
 				<unitPattern count="other" case="locative">{0} světlech</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>částice na miliardu</displayName>
 				<unitPattern count="one">{0} částice na miliardu</unitPattern>
@@ -10591,7 +10732,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noci</displayName>
 				<unitPattern count="one">{0} noc</unitPattern>
 				<unitPattern count="one" case="accusative">{0} noc</unitPattern>
 				<unitPattern count="one" case="dative">{0} noci</unitPattern>
@@ -10680,6 +10820,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} položky</unitPattern>
 				<unitPattern count="other">{0} položek</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>díl</displayName>
+				<unitPattern count="one">{0} díl</unitPattern>
+				<unitPattern count="few">{0} díly</unitPattern>
+				<unitPattern count="many">{0} dílu</unitPattern>
+				<unitPattern count="other">{0} dílů</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="few">{0} %</unitPattern>
@@ -10698,6 +10845,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -11015,6 +11165,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>qt Imp.</displayName>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="many">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="many">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="many">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} sievertů</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="many">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>světlo</displayName>
 				<unitPattern count="one">{0} světlo</unitPattern>
@@ -11022,11 +11197,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} světla</unitPattern>
 				<unitPattern count="other">{0} světel</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>částic/mld.</displayName>
 				<unitPattern count="one">{0} částice na mld</unitPattern>
 				<unitPattern count="few">{0} částice na mld</unitPattern>
-				<unitPattern count="many">{0} částic na mld</unitPattern>
+				<unitPattern count="many">{0} částice na mld</unitPattern>
 				<unitPattern count="other">{0} částic na mld</unitPattern>
 			</unit>
 			<unit type="duration-night">
@@ -11053,6 +11228,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} pol.</unitPattern>
 				<unitPattern count="other">{0} pol.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>díl</displayName>
+				<unitPattern count="one">{0} díl</unitPattern>
+				<unitPattern count="few">{0} díly</unitPattern>
+				<unitPattern count="many">{0} dílu</unitPattern>
+				<unitPattern count="other">{0} dílů</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>l/100km</displayName>
 				<unitPattern count="one">{0} l/100km</unitPattern>
@@ -11190,20 +11375,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} šp.</unitPattern>
 				<unitPattern count="other">{0} šp.</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="many">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="many">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="many">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="many">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>světlo</displayName>
 				<unitPattern count="one">{0} sv.</unitPattern>
 				<unitPattern count="few">{0} sv.</unitPattern>
 				<unitPattern count="many">{0} sv.</unitPattern>
 				<unitPattern count="other">{0} sv.</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>noci</displayName>
-				<unitPattern count="one">{0} noc</unitPattern>
-				<unitPattern count="few">{0} noci</unitPattern>
-				<unitPattern count="many">{0} noci</unitPattern>
-				<unitPattern count="other">{0} nocí</unitPattern>
-				<perUnitPattern>{0}/noc</perUnitPattern>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} částice na mld</unitPattern>
+				<unitPattern count="few">{0} částice na mld</unitPattern>
+				<unitPattern count="many">{0} částice na mld</unitPattern>
+				<unitPattern count="other">{0} částic na mld</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/csw.xml b/make/data/cldr/common/main/csw.xml
index 2ee952b51c6..df2831a0543 100644
--- a/make/data/cldr/common/main/csw.xml
+++ b/make/data/cldr/common/main/csw.xml
@@ -256,28 +256,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<timeFormatLength type="full">
 						<timeFormat>
 							<pattern>h:mm:ss a zzzz</pattern>
-							<pattern alt="ascii" draft="contributed">h:mm:ss a zzzz</pattern>
 							<datetimeSkeleton draft="contributed">ahmmsszzzz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
 							<pattern>h:mm:ss a z</pattern>
-							<pattern alt="ascii" draft="contributed">h:mm:ss a z</pattern>
 							<datetimeSkeleton draft="contributed">ahmmssz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
 							<pattern>h:mm:ss a</pattern>
-							<pattern alt="ascii" draft="contributed">h:mm:ss a</pattern>
 							<datetimeSkeleton draft="contributed">ahmmss</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
 							<pattern>h:mm a</pattern>
-							<pattern alt="ascii" draft="contributed">h:mm a</pattern>
 							<datetimeSkeleton draft="contributed">ahmm</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
diff --git a/make/data/cldr/common/main/cu.xml b/make/data/cldr/common/main/cu.xml
index 45f45dd1f36..fb7ba399694 100644
--- a/make/data/cldr/common/main/cu.xml
+++ b/make/data/cldr/common/main/cu.xml
@@ -677,6 +677,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/cv.xml b/make/data/cldr/common/main/cv.xml
index 69207a5c275..d4d1aeb7925 100644
--- a/make/data/cldr/common/main/cv.xml
+++ b/make/data/cldr/common/main/cv.xml
@@ -12,591 +12,608 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="aa" draft="unconfirmed">афар</language>
-			<language type="ab" draft="unconfirmed">абхаз</language>
-			<language type="af" draft="unconfirmed">африканс</language>
-			<language type="agq" draft="unconfirmed">агем</language>
-			<language type="ak" draft="unconfirmed">акан</language>
-			<language type="am" draft="unconfirmed">амхар</language>
-			<language type="an" draft="unconfirmed">арагон</language>
-			<language type="ann" draft="unconfirmed">оболо</language>
-			<language type="apc" draft="unconfirmed">левант араб</language>
-			<language type="ar">арап</language>
-			<language type="ar_001">арап литератури</language>
-			<language type="arn" draft="unconfirmed">мапуче</language>
-			<language type="as" draft="unconfirmed">ассам</language>
-			<language type="asa" draft="unconfirmed">асу</language>
-			<language type="ast" draft="unconfirmed">астури</language>
-			<language type="az" draft="unconfirmed">азербайджан</language>
-			<language type="ba" draft="unconfirmed">пушкӑрт</language>
-			<language type="bal" draft="unconfirmed">белудж</language>
-			<language type="bas" draft="unconfirmed">бас</language>
-			<language type="be" draft="unconfirmed">белорусси</language>
-			<language type="bem" draft="unconfirmed">бемба</language>
-			<language type="bew" draft="unconfirmed">батав</language>
-			<language type="bez" draft="unconfirmed">бен</language>
-			<language type="bg" draft="unconfirmed">пӑлхар</language>
-			<language type="bgc" draft="unconfirmed">харианви</language>
-			<language type="bgn" draft="unconfirmed">хӗвеланӑҫ балочи</language>
-			<language type="bho" draft="unconfirmed">бохжпури</language>
-			<language type="blo" draft="unconfirmed">ания</language>
-			<language type="blt" draft="unconfirmed">хура таи</language>
-			<language type="bm" draft="unconfirmed">бамбар</language>
-			<language type="bn">бенгал</language>
-			<language type="bo" draft="unconfirmed">тибет</language>
-			<language type="br" draft="unconfirmed">бретань</language>
-			<language type="brx" draft="unconfirmed">бодо</language>
-			<language type="bs" draft="unconfirmed">босни</language>
-			<language type="bss" draft="unconfirmed">акоос</language>
-			<language type="byn" draft="unconfirmed">билин</language>
-			<language type="ca" draft="unconfirmed">каталан</language>
-			<language type="cad" draft="unconfirmed">каддо</language>
-			<language type="cch" draft="unconfirmed">атсам</language>
-			<language type="ccp" draft="unconfirmed">чакма</language>
-			<language type="ce" draft="unconfirmed">чеченец</language>
-			<language type="ceb" draft="unconfirmed">себуано</language>
-			<language type="cgg" draft="unconfirmed">кига</language>
-			<language type="cho" draft="unconfirmed">чоктав</language>
-			<language type="chr" draft="unconfirmed">чероки</language>
-			<language type="cic" draft="unconfirmed">чикасав</language>
-			<language type="ckb" draft="unconfirmed">вăтаçĕр курд</language>
-			<language type="ckb" alt="menu" draft="unconfirmed">тӗп курд</language>
-			<language type="ckb" alt="variant" draft="unconfirmed">курд (соран)</language>
-			<language type="co" draft="unconfirmed">корсикан</language>
-			<language type="cs" draft="unconfirmed">чех</language>
-			<language type="csw" draft="unconfirmed">шурлӑх кри</language>
-			<language type="cu" draft="unconfirmed">чиркӳ-славян</language>
-			<language type="cv">чӑваш</language>
-			<language type="cy" draft="unconfirmed">валлий</language>
-			<language type="da" draft="unconfirmed">датчан</language>
-			<language type="dav" draft="unconfirmed">тайта</language>
-			<language type="de">нимӗҫ</language>
-			<language type="de_AT">австрин нимӗҫ</language>
-			<language type="de_CH">швейцарин нимӗҫ</language>
-			<language type="dje" draft="unconfirmed">зарма</language>
-			<language type="doi" draft="unconfirmed">догри</language>
-			<language type="dsb" draft="unconfirmed">аялти серб</language>
-			<language type="dua" draft="unconfirmed">дуал</language>
-			<language type="dv" draft="unconfirmed">мальдив</language>
-			<language type="dyo" draft="unconfirmed">диола-фоньи</language>
-			<language type="dz" draft="unconfirmed">дзонг-кэ</language>
-			<language type="ebu" draft="unconfirmed">эмбу</language>
-			<language type="ee" draft="unconfirmed">эве</language>
-			<language type="el" draft="unconfirmed">грек</language>
-			<language type="en">акӑлчан</language>
-			<language type="en_AU">австралин акӑлчан</language>
-			<language type="en_CA">канадӑн акӑлчан</language>
-			<language type="en_GB">британин акӑлчан</language>
-			<language type="en_US">америкӑн акӑлчан</language>
-			<language type="eo" draft="unconfirmed">эсперанто</language>
-			<language type="es">испани</language>
-			<language type="es_419">латинла америкӑн испани</language>
-			<language type="es_ES">европӑн испани</language>
-			<language type="es_MX">мексикӑн испани</language>
-			<language type="et" draft="unconfirmed">эстон</language>
-			<language type="eu" draft="unconfirmed">баск</language>
-			<language type="ewo" draft="unconfirmed">эвондо</language>
-			<language type="fa" draft="unconfirmed">фарси</language>
-			<language type="fa_AF" draft="unconfirmed">фарси (Афганистан)</language>
-			<language type="ff" draft="unconfirmed">фул</language>
-			<language type="fi" draft="unconfirmed">фин</language>
-			<language type="fil" draft="unconfirmed">филиппин</language>
-			<language type="fo" draft="unconfirmed">фарер</language>
-			<language type="fr">франци</language>
-			<language type="fr_CA">канадӑн франци</language>
-			<language type="fr_CH">швейцарӗн франци</language>
-			<language type="frc" draft="unconfirmed">каджун француз</language>
-			<language type="frr" draft="unconfirmed">ҫурҫӗр фризӗ</language>
-			<language type="fur" draft="unconfirmed">фриул</language>
-			<language type="fy" draft="unconfirmed">хӗвеланӑҫ фриз</language>
-			<language type="ga" draft="unconfirmed">ирланд</language>
-			<language type="gaa" draft="unconfirmed">га</language>
-			<language type="gd" draft="unconfirmed">гэль</language>
-			<language type="gez" draft="unconfirmed">геэз</language>
-			<language type="gl" draft="unconfirmed">галис</language>
-			<language type="gn" draft="unconfirmed">гуаран</language>
-			<language type="gsw" draft="unconfirmed">швейцари нимӗҫ</language>
-			<language type="gu" draft="unconfirmed">гуджарат</language>
-			<language type="guz" draft="unconfirmed">гусии</language>
-			<language type="gv" draft="unconfirmed">мэн</language>
-			<language type="ha" draft="unconfirmed">хауса</language>
-			<language type="haw" draft="unconfirmed">гавай</language>
-			<language type="he" draft="unconfirmed">иврит</language>
-			<language type="hi">хинди</language>
-			<language type="hi_Latn" draft="unconfirmed">хинди чӗлхи (латин)</language>
-			<language type="hi_Latn" alt="variant" draft="unconfirmed">хинди (латин)</language>
-			<language type="hnj" draft="unconfirmed">монг</language>
-			<language type="hr" draft="unconfirmed">хорват</language>
-			<language type="hsb" draft="unconfirmed">тури сорбиан</language>
-			<language type="hu" draft="unconfirmed">венгер</language>
-			<language type="hy" draft="unconfirmed">армян</language>
-			<language type="ia" draft="unconfirmed">интерлинг</language>
-			<language type="id">индонези</language>
-			<language type="ie" draft="unconfirmed">интерлингве</language>
-			<language type="ig" draft="unconfirmed">игбо</language>
-			<language type="ii" draft="unconfirmed">носу (сичуан)</language>
-			<language type="io" draft="unconfirmed">идо</language>
-			<language type="is" draft="unconfirmed">исланди</language>
-			<language type="it">итали</language>
-			<language type="iu" draft="unconfirmed">инуктитут</language>
-			<language type="ja">япони</language>
-			<language type="jbo" draft="unconfirmed">ложбан</language>
-			<language type="jgo" draft="unconfirmed">нгомба</language>
-			<language type="jmc" draft="unconfirmed">мачам</language>
-			<language type="jv" draft="unconfirmed">яван</language>
-			<language type="ka" draft="unconfirmed">грузин</language>
-			<language type="kaa" draft="unconfirmed">каракалпак</language>
-			<language type="kab" draft="unconfirmed">кабиль</language>
-			<language type="kaj" draft="unconfirmed">каджи</language>
-			<language type="kam" draft="unconfirmed">камба</language>
-			<language type="kcg" draft="unconfirmed">туар</language>
-			<language type="kde" draft="unconfirmed">маконде</language>
-			<language type="kea" draft="unconfirmed">кабувердьян</language>
-			<language type="ken" draft="unconfirmed">камерун</language>
-			<language type="kgp" draft="unconfirmed">каинганг</language>
-			<language type="khq" draft="unconfirmed">койра чиини</language>
-			<language type="ki" draft="unconfirmed">куикуй</language>
-			<language type="kk" draft="unconfirmed">казах</language>
-			<language type="kkj" draft="unconfirmed">како</language>
-			<language type="kl" draft="unconfirmed">гренланди</language>
-			<language type="kln" draft="unconfirmed">календжин</language>
-			<language type="km" draft="unconfirmed">кхмер</language>
-			<language type="kn" draft="unconfirmed">каннада</language>
-			<language type="ko">корей</language>
-			<language type="kok" draft="unconfirmed">конкани</language>
-			<language type="kpe" draft="unconfirmed">кпелле</language>
-			<language type="ks" draft="unconfirmed">кашмир</language>
-			<language type="ksb" draft="unconfirmed">шамбала</language>
-			<language type="ksf" draft="unconfirmed">бафи</language>
-			<language type="ksh" draft="unconfirmed">кельн</language>
-			<language type="ku" draft="unconfirmed">курд</language>
-			<language type="kw" draft="unconfirmed">корн</language>
-			<language type="kxv" draft="unconfirmed">куви</language>
-			<language type="ky" draft="unconfirmed">киргиз</language>
-			<language type="la" draft="unconfirmed">латин</language>
-			<language type="lag" draft="unconfirmed">ланго</language>
-			<language type="lb" draft="unconfirmed">люксембург</language>
-			<language type="lg" draft="unconfirmed">ганда</language>
-			<language type="lij" draft="unconfirmed">лигур</language>
-			<language type="lkt" draft="unconfirmed">лакота</language>
-			<language type="lld" draft="unconfirmed">тироль</language>
-			<language type="lmo" draft="unconfirmed">ломбард</language>
-			<language type="ln" draft="unconfirmed">лингал</language>
-			<language type="lo" draft="unconfirmed">лаос</language>
-			<language type="lou" draft="unconfirmed">луизиан креоль</language>
-			<language type="lrc" draft="unconfirmed">ҫурҫӗр лури</language>
-			<language type="lt" draft="unconfirmed">литва</language>
-			<language type="ltg" draft="unconfirmed">латгал латыш</language>
-			<language type="lu" draft="unconfirmed">луба-катанга</language>
-			<language type="luo" draft="unconfirmed">луо</language>
-			<language type="luy" draft="unconfirmed">лухья</language>
-			<language type="lv" draft="unconfirmed">латыш</language>
-			<language type="mai" draft="unconfirmed">майтхили</language>
-			<language type="mas" draft="unconfirmed">масайсем</language>
-			<language type="mdf" draft="unconfirmed">мокшан</language>
-			<language type="mer" draft="unconfirmed">меру</language>
-			<language type="mfe" draft="unconfirmed">маврика креолӗ</language>
-			<language type="mg" draft="unconfirmed">малагас</language>
-			<language type="mgh" draft="unconfirmed">макуа-мето</language>
-			<language type="mgo" draft="unconfirmed">мета</language>
-			<language type="mhn" draft="unconfirmed">мотено</language>
-			<language type="mi" draft="unconfirmed">маори</language>
-			<language type="mic" draft="unconfirmed">микмак</language>
-			<language type="mk" draft="unconfirmed">македон</language>
-			<language type="ml" draft="unconfirmed">малаялам</language>
-			<language type="mn" draft="unconfirmed">монгол</language>
-			<language type="mni" draft="unconfirmed">манипур</language>
-			<language type="moh" draft="unconfirmed">мохук</language>
-			<language type="mr" draft="unconfirmed">маратхи</language>
-			<language type="ms" draft="unconfirmed">малай</language>
-			<language type="mt" draft="unconfirmed">мальтисем</language>
-			<language type="mua" draft="unconfirmed">мундир</language>
-			<language type="mul" draft="unconfirmed">тӗрлӗ ҫемье чӗлхисем</language>
-			<language type="mus" draft="unconfirmed">крик</language>
-			<language type="my" draft="unconfirmed">бирман</language>
-			<language type="myv" draft="unconfirmed">эрзян</language>
-			<language type="mzn" draft="unconfirmed">мазандеран</language>
-			<language type="naq" draft="unconfirmed">нама</language>
-			<language type="nb" draft="unconfirmed">норвег букмол</language>
-			<language type="nd" draft="unconfirmed">ҫурҫӗр ндебеле</language>
-			<language type="nds" draft="unconfirmed">аялти нимĕç</language>
-			<language type="nds_NL" draft="unconfirmed">аялти нимĕç (Нидерланд)</language>
-			<language type="ne" draft="unconfirmed">непал</language>
-			<language type="nl">голланди</language>
-			<language type="nl_BE">фламанди</language>
-			<language type="nmg" draft="unconfirmed">квасио</language>
-			<language type="nn" draft="unconfirmed">норвег нюнорск</language>
-			<language type="nnh" draft="unconfirmed">нгиембунд</language>
-			<language type="no" draft="unconfirmed">норвег</language>
-			<language type="nqo" draft="unconfirmed">нко (манинка)</language>
-			<language type="nr" draft="unconfirmed">кӑнтӑр ндебеле</language>
-			<language type="nso" draft="unconfirmed">ҫурҫӗр сото</language>
-			<language type="nus" draft="unconfirmed">нуэр</language>
-			<language type="nv" draft="unconfirmed">навахо</language>
-			<language type="ny" draft="unconfirmed">ньяндж</language>
-			<language type="nyn" draft="unconfirmed">ньянколе</language>
-			<language type="oc" draft="unconfirmed">окситан</language>
-			<language type="om" draft="unconfirmed">оромо</language>
-			<language type="or" draft="unconfirmed">оди (ори)</language>
-			<language type="os" draft="unconfirmed">осетин</language>
-			<language type="osa" draft="unconfirmed">оседжи</language>
-			<language type="pa" draft="unconfirmed">панджаби</language>
-			<language type="pap" draft="unconfirmed">папьяменто</language>
-			<language type="pcm" draft="unconfirmed">нигер креоль</language>
-			<language type="pis" draft="unconfirmed">пиджин</language>
-			<language type="pl">поляк</language>
-			<language type="prg" draft="unconfirmed">прусси</language>
-			<language type="ps" draft="unconfirmed">пушту</language>
-			<language type="pt">португали</language>
-			<language type="pt_BR">бразилин португали</language>
-			<language type="pt_PT">европӑн португали</language>
-			<language type="qu" draft="unconfirmed">кечуа</language>
-			<language type="quc" draft="unconfirmed">киче</language>
-			<language type="raj" draft="unconfirmed">раджастан</language>
-			<language type="rhg" draft="unconfirmed">рохиндж</language>
-			<language type="rif" draft="unconfirmed">риффиан (бербер)</language>
-			<language type="rm" draft="unconfirmed">романш</language>
-			<language type="rn" draft="unconfirmed">рунди</language>
-			<language type="ro" draft="unconfirmed">румын</language>
-			<language type="ro_MD" draft="unconfirmed">молдаван</language>
-			<language type="rof" draft="unconfirmed">ромбо</language>
-			<language type="ru">вырӑс</language>
-			<language type="rw" draft="unconfirmed">киньяруанд</language>
-			<language type="rwk" draft="unconfirmed">руанда</language>
-			<language type="sa" draft="unconfirmed">санскрит</language>
-			<language type="sah" draft="unconfirmed">якут</language>
-			<language type="saq" draft="unconfirmed">самбуру</language>
-			<language type="sat" draft="unconfirmed">сантали</language>
-			<language type="sbp" draft="unconfirmed">сангу</language>
-			<language type="sc" draft="unconfirmed">сардин</language>
-			<language type="scn" draft="unconfirmed">сицил</language>
-			<language type="sd" draft="unconfirmed">синдхи</language>
-			<language type="sdh" draft="unconfirmed">кӑнтӑр алтай</language>
-			<language type="se" draft="unconfirmed">ҫурҫӗр саам</language>
-			<language type="seh" draft="unconfirmed">сена</language>
-			<language type="ses" draft="unconfirmed">койраборо сенни</language>
-			<language type="sg" draft="unconfirmed">санго</language>
-			<language type="shi" draft="unconfirmed">тахелхит (бербер)</language>
-			<language type="shn" draft="unconfirmed">шан</language>
-			<language type="si" draft="unconfirmed">сингал</language>
-			<language type="sid" draft="unconfirmed">сидама</language>
-			<language type="sk" draft="unconfirmed">словак</language>
-			<language type="skr" draft="unconfirmed">сирайки</language>
-			<language type="sl" draft="unconfirmed">словен</language>
-			<language type="sma" draft="unconfirmed">кӑнтӑр саам</language>
-			<language type="smj" draft="unconfirmed">луле-саам</language>
-			<language type="smn" draft="unconfirmed">инар-саам</language>
-			<language type="sms" draft="unconfirmed">колтта-саам</language>
-			<language type="sn" draft="unconfirmed">шона</language>
-			<language type="so" draft="unconfirmed">сомали</language>
-			<language type="sq" draft="unconfirmed">албан</language>
-			<language type="sr" draft="unconfirmed">серб</language>
-			<language type="ss" draft="unconfirmed">свази</language>
-			<language type="ssy" draft="unconfirmed">сахо</language>
-			<language type="st" draft="unconfirmed">кӑнтӑр сото</language>
-			<language type="su" draft="unconfirmed">сундан</language>
-			<language type="sv" draft="unconfirmed">швед</language>
-			<language type="sw" draft="unconfirmed">суахили</language>
-			<language type="sw_CD" draft="unconfirmed">суахили (Конго - Киншаса)</language>
-			<language type="syr" draft="unconfirmed">сири</language>
-			<language type="szl" draft="unconfirmed">силез</language>
-			<language type="ta" draft="unconfirmed">тамил</language>
-			<language type="te" draft="unconfirmed">телугу</language>
-			<language type="teo" draft="unconfirmed">тесо</language>
-			<language type="tg" draft="unconfirmed">таджик</language>
-			<language type="th">тай</language>
-			<language type="ti" draft="unconfirmed">тигринья</language>
-			<language type="tig" draft="unconfirmed">тигре</language>
-			<language type="tk" draft="unconfirmed">туркмен</language>
-			<language type="tn" draft="unconfirmed">тсвана</language>
-			<language type="to" draft="unconfirmed">тонган</language>
-			<language type="tok" draft="unconfirmed">токи пона</language>
-			<language type="tpi" draft="unconfirmed">ток писин</language>
-			<language type="tr">турккӑ</language>
-			<language type="trv" draft="unconfirmed">тароко</language>
-			<language type="trw" draft="unconfirmed">торвали</language>
-			<language type="ts" draft="unconfirmed">тсонга</language>
-			<language type="tt" draft="unconfirmed">тутар</language>
-			<language type="twq" draft="unconfirmed">тасавак</language>
-			<language type="tyv" draft="unconfirmed">тува</language>
-			<language type="tzm" draft="unconfirmed">Вӑтам Атлас тамазигт</language>
-			<language type="ug" draft="unconfirmed">уйгур</language>
-			<language type="uk" draft="unconfirmed">украина</language>
+			<language type="aa">афар чӗлхи</language>
+			<language type="ab">абхаз чӗлхи</language>
+			<language type="af">африкаанс чӗлхи</language>
+			<language type="agq">агем чӗлхи</language>
+			<language type="ak">акан чӗлхи</language>
+			<language type="am">амхар чӗлхи</language>
+			<language type="an">арагон чӗлхи</language>
+			<language type="ann">оболо чӗлхи</language>
+			<language type="apc">левант арап чӗлхи</language>
+			<language type="ar">араб чӗлхи</language>
+			<language type="ar_001">хальхи стандартлӑ араб чӗлхи</language>
+			<language type="arn">мапуче чӗлхи</language>
+			<language type="as">ассам чӗлхи</language>
+			<language type="asa">асу чӗлхи</language>
+			<language type="ast">астури чӗлхи</language>
+			<language type="az">азербайджан чӗлхи</language>
+			<language type="ba">пушкӑрт чӗлхи</language>
+			<language type="bal">белудж чӗлхи</language>
+			<language type="bas">баса чӗлхи</language>
+			<language type="be">беларус чӗлхи</language>
+			<language type="bem">бемба чӗлхи</language>
+			<language type="bew">батав чӗлхи</language>
+			<language type="bez">бена чӗлхи</language>
+			<language type="bg">болгар чӗлхи</language>
+			<language type="bgc">харианви чӗлхи</language>
+			<language type="bgn">анӑҫ белудж чӗлхи</language>
+			<language type="bho">бходжпури чӗлхи</language>
+			<language type="blo">ании чӗлхи</language>
+			<language type="blt">тай-дам чӗлхи</language>
+			<language type="bm">бамбара чӗлхи</language>
+			<language type="bn">бенгал чӗлхи</language>
+			<language type="bo">тибет чӗлхи</language>
+			<language type="bqi">бахтияр чӗлхи</language>
+			<language type="br">бретон чӗлхи</language>
+			<language type="brx">бодо чӗлхи</language>
+			<language type="bs">босни чӗлхи</language>
+			<language type="bss">акоосе чӗлхи</language>
+			<language type="bua">бурят чӗлхи</language>
+			<language type="byn">билин чӗлхи</language>
+			<language type="ca">каталан чӗлхи</language>
+			<language type="cad">каддо чӗлхи</language>
+			<language type="cch">атсам чӗлхи</language>
+			<language type="ccp">чакма чӗлхи</language>
+			<language type="ce">чечен чӗлхи</language>
+			<language type="ceb">себуано чӗлхи</language>
+			<language type="cgg">кига чӗлхи</language>
+			<language type="cho">чоктав чӗлхи</language>
+			<language type="chr">чероки чӗлхи</language>
+			<language type="cic">чикасав чӗлхи</language>
+			<language type="ckb">вӑта курд чӗлхи</language>
+			<language type="ckb" alt="variant">курд (сорани) чӗлхи</language>
+			<language type="co">корсикан чӗлхи</language>
+			<language type="cop">копт чӗлхи</language>
+			<language type="cs">чех чӗлхи</language>
+			<language type="csw">шурти кри чӗлхи</language>
+			<language type="cu">чиркӳ славян чӗлхи</language>
+			<language type="cv">чӑваш чӗлхи</language>
+			<language type="cy">валли чӗлхи</language>
+			<language type="da">датчан чӗлхи</language>
+			<language type="dav">таита чӗлхи</language>
+			<language type="de">нимӗҫ чӗлхи</language>
+			<language type="de_AT">австри нимӗҫ чӗлхи</language>
+			<language type="de_CH">швейцари тури нимӗҫ чӗлхи</language>
+			<language type="dje">джерма чӗлхи</language>
+			<language type="doi">догри чӗлхи</language>
+			<language type="dsb">анатри лужица чӗлхи</language>
+			<language type="dua">дуала чӗлхи</language>
+			<language type="dv">мальдив чӗлхи</language>
+			<language type="dyo">диола-фоньи чӗлхи</language>
+			<language type="dz">дзонг-кэ чӗлхи</language>
+			<language type="ebu">эмбу чӗлхи</language>
+			<language type="ee">эве чӗлхи</language>
+			<language type="el">грек чӗлхи</language>
+			<language type="en">акӑлчан чӗлхи</language>
+			<language type="en_AU">австрали акӑлчан чӗлхи</language>
+			<language type="en_CA">канада акӑлчан чӗлхи</language>
+			<language type="en_GB">британи акӑлчан чӗлхи</language>
+			<language type="en_US">америка акӑлчан чӗлхи</language>
+			<language type="eo">эсперанто чӗлхи</language>
+			<language type="es">испан чӗлхи</language>
+			<language type="es_419">латинла америка испан чӗлхи</language>
+			<language type="es_ES">европа испан чӗлхи</language>
+			<language type="es_MX">мексика испан чӗлхи</language>
+			<language type="et">эстон чӗлхи</language>
+			<language type="eu">баск чӗлхи</language>
+			<language type="ewo">эвондо чӗлхи</language>
+			<language type="fa">перс чӗлхи</language>
+			<language type="fa_AF">дари чӗлхи</language>
+			<language type="ff">фула чӗлхи</language>
+			<language type="fi">финн чӗлхи</language>
+			<language type="fil">филиппин чӗлхи</language>
+			<language type="fo">фарер чӗлхи</language>
+			<language type="fr">француз чӗлхи</language>
+			<language type="fr_CA">канада француз чӗлхи</language>
+			<language type="fr_CH">швейцари француз чӗлхи</language>
+			<language type="frc">каджун француз чӗлхи</language>
+			<language type="frr">ҫур ҫӗр фриз чӗлхи</language>
+			<language type="fur">фриу чӗлхи</language>
+			<language type="fy">анӑҫ фриз чӗлхи</language>
+			<language type="ga">ирланд чӗлхи</language>
+			<language type="gaa">га чӗлхи</language>
+			<language type="gd">гэл чӗлхи</language>
+			<language type="gez">геэз чӗлхи</language>
+			<language type="gl">галиси чӗлхи</language>
+			<language type="gn">гуарани чӗлхи</language>
+			<language type="gsw">швейцари нимӗҫ чӗлхи</language>
+			<language type="gu">гуджарати чӗлхи</language>
+			<language type="guz">гуси чӗлхи</language>
+			<language type="gv">мэн чӗлхи</language>
+			<language type="ha">хауса чӗлхи</language>
+			<language type="haw">гавай чӗлхи</language>
+			<language type="he">иврит чӗлхи</language>
+			<language type="hi">хинди чӗлхи</language>
+			<language type="hi_Latn">хинди чӗлхи (латин ҫырулӑхӗ)</language>
+			<language type="hi_Latn" alt="variant">хинглиш чӗлхи</language>
+			<language type="hnj">хмонг-ну чӗлхи</language>
+			<language type="hr">хорват чӗлхи</language>
+			<language type="hsb">тури лужица чӗлхи</language>
+			<language type="ht">гаитян чӗлхи</language>
+			<language type="hu">венгер чӗлхи</language>
+			<language type="hy">эрмен чӗлхи</language>
+			<language type="ia">интерлингва чӗлхи</language>
+			<language type="id">индонези чӗлхи</language>
+			<language type="ie">интерлингве чӗлхи</language>
+			<language type="ig">игбо чӗлхи</language>
+			<language type="ii">носу чӗлхи</language>
+			<language type="io">идо чӗлхи</language>
+			<language type="is">исланд чӗлхи</language>
+			<language type="it">итальян чӗлхи</language>
+			<language type="iu">инуктитут чӗлхи</language>
+			<language type="ja">япон чӗлхи</language>
+			<language type="jbo">ложбан чӗлхи</language>
+			<language type="jgo">нгомба чӗлхи</language>
+			<language type="jmc">мачаме чӗлхи</language>
+			<language type="jv">яван чӗлхи</language>
+			<language type="ka">грузин чӗлхи</language>
+			<language type="kaa">каракалпак чӗлхи</language>
+			<language type="kab">кабил чӗлхи</language>
+			<language type="kaj">каджи чӗлхи</language>
+			<language type="kam">камба чӗлхи</language>
+			<language type="kcg">тьяп чӗлхи</language>
+			<language type="kde">маконде чӗлхи</language>
+			<language type="kea">кабувердьяну чӗлхи</language>
+			<language type="kek">кекчи чӗлхи</language>
+			<language type="ken">ньянг чӗлхи</language>
+			<language type="kgp">каинганг чӗлхи</language>
+			<language type="khq">койра-чиини чӗлхи</language>
+			<language type="ki">кикуйю чӗлхи</language>
+			<language type="kk">казах чӗлхи</language>
+			<language type="kkj">како чӗлхи</language>
+			<language type="kl">гренланд чӗлхи</language>
+			<language type="kln">календжин чӗлхи</language>
+			<language type="km">кхмер чӗлхи</language>
+			<language type="kn">каннада чӗлхи</language>
+			<language type="ko">корей чӗлхи</language>
+			<language type="kok">конкани чӗлхи</language>
+			<language type="kpe">кпелле чӗлхи</language>
+			<language type="ks">кашмири чӗлхи</language>
+			<language type="ksb">шамбала чӗлхи</language>
+			<language type="ksf">бафи чӗлхи</language>
+			<language type="ksh">кёльн чӗлхи</language>
+			<language type="ku">курд чӗлхи</language>
+			<language type="ku" menu="core">курд чӗлхи</language>
+			<language type="ku" menu="extension">курманджи чӗлхи</language>
+			<language type="kw">корн чӗлхи</language>
+			<language type="kxv">куви чӗлхи</language>
+			<language type="ky">кӑркӑс чӗлхи</language>
+			<language type="la">латин чӗлхи</language>
+			<language type="lag">ланго чӗлхи</language>
+			<language type="lb">люксембург чӗлхи</language>
+			<language type="lg">ганда чӗлхи</language>
+			<language type="lij">лигур чӗлхи</language>
+			<language type="lkt">лакота чӗлхи</language>
+			<language type="lld">ладин чӗлхи</language>
+			<language type="lmo">ломбард чӗлхи</language>
+			<language type="ln">лингала чӗлхи</language>
+			<language type="lo">лаос чӗлхи</language>
+			<language type="lou">луизиан креол чӗлхи</language>
+			<language type="lrc">ҫур ҫӗр лур чӗлхи</language>
+			<language type="lt">литва чӗлхи</language>
+			<language type="ltg">латгал чӗлхи</language>
+			<language type="lu">луба-катанга чӗлхи</language>
+			<language type="luo">луо чӗлхи</language>
+			<language type="luy">лухья чӗлхи</language>
+			<language type="lv">латыш чӗлхи</language>
+			<language type="lzz">лаз чӗлхи</language>
+			<language type="mai">майтхили чӗлхи</language>
+			<language type="mas">масаи чӗлхи</language>
+			<language type="mdf">мӑкшӑ чӗлхи</language>
+			<language type="mer">меру чӗлхи</language>
+			<language type="mfe">маврики креол чӗлхи</language>
+			<language type="mg">малагас чӗлхи</language>
+			<language type="mgh">макуа-меетто чӗлхи</language>
+			<language type="mgo">мета чӗлхи</language>
+			<language type="mhn">мокен чӗлхи</language>
+			<language type="mi">маори чӗлхи</language>
+			<language type="mic">микмак чӗлхи</language>
+			<language type="mk">македон чӗлхи</language>
+			<language type="ml">малаялам чӗлхи</language>
+			<language type="mn">монгол чӗлхи</language>
+			<language type="mni">манипур чӗлхи</language>
+			<language type="moh">мохаук чӗлхи</language>
+			<language type="mr">маратхи чӗлхи</language>
+			<language type="ms">малай чӗлхи</language>
+			<language type="mt">мальта чӗлхи</language>
+			<language type="mua">мунданг чӗлхи</language>
+			<language type="mul">тӗрлӗ ҫемьеллӗ чӗлхе</language>
+			<language type="mus">крик чӗлхи</language>
+			<language type="mww">хмонг-доу чӗлхи</language>
+			<language type="my">бирман чӗлхи</language>
+			<language type="myv">ирҫе чӗлхи</language>
+			<language type="mzn">мазандеран чӗлхи</language>
+			<language type="nan">миньнань чӗлхи</language>
+			<language type="naq">нама чӗлхи</language>
+			<language type="nb">букмол норвег чӗлхи</language>
+			<language type="nd">ҫур ҫӗр ндебеле чӗлхи</language>
+			<language type="nds">анатри нимӗҫ чӗлхи</language>
+			<language type="nds_NL">анатри саксон чӗлхи</language>
+			<language type="ne">непал чӗлхи</language>
+			<language type="nl">нидерланд чӗлхи</language>
+			<language type="nl_BE">фламанд чӗлхи</language>
+			<language type="nmg">квасио чӗлхи</language>
+			<language type="nn">нюнорск норвег чӗлхи</language>
+			<language type="nnh">нгиембунд чӗлхи</language>
+			<language type="no">норвег чӗлхи</language>
+			<language type="nqo">нко чӗлхи</language>
+			<language type="nr">кӑнтӑр ндебеле чӗлхи</language>
+			<language type="nso">ҫур ҫӗр сото чӗлхи</language>
+			<language type="nus">нуэр чӗлхи</language>
+			<language type="nv">навахо чӗлхи</language>
+			<language type="ny">ньянджа чӗлхи</language>
+			<language type="nyn">ньянколе чӗлхи</language>
+			<language type="oc">окситан чӗлхи</language>
+			<language type="oka">оканаган чӗлхи</language>
+			<language type="om">оромо чӗлхи</language>
+			<language type="or">ори чӗлхи</language>
+			<language type="os">осетин чӗлхи</language>
+			<language type="osa">оседжи чӗлхи</language>
+			<language type="pa">панджаби чӗлхи</language>
+			<language type="pap">папьяменто чӗлхи</language>
+			<language type="pcm">нигери креол чӗлхи</language>
+			<language type="pi">пали чӗлхи</language>
+			<language type="pis">соломон пиджин чӗлхи</language>
+			<language type="pl">поляк чӗлхи</language>
+			<language type="pms">пьемонт чӗлхи</language>
+			<language type="prg">прусс чӗлхи</language>
+			<language type="ps">пушту чӗлхи</language>
+			<language type="pt">португал чӗлхи</language>
+			<language type="pt_BR">бразили португал чӗлхи</language>
+			<language type="pt_PT">португали португал чӗлхи</language>
+			<language type="qu">кечуа чӗлхи</language>
+			<language type="quc">киче чӗлхи</language>
+			<language type="raj">раджастхани чӗлхи</language>
+			<language type="rhg">рохинджа чӗлхи</language>
+			<language type="rif">риф чӗлхи</language>
+			<language type="rm">романш чӗлхи</language>
+			<language type="rn">рунди чӗлхи</language>
+			<language type="ro">румын чӗлхи</language>
+			<language type="ro_MD">молдаван чӗлхи</language>
+			<language type="rof">ромбо чӗлхи</language>
+			<language type="ru">вырӑс чӗлхи</language>
+			<language type="rw">киньяруанда чӗлхи</language>
+			<language type="rwk">руанда чӗлхи</language>
+			<language type="sa">санскрит чӗлхи</language>
+			<language type="sah">саха чӗлхи</language>
+			<language type="saq">самбуру чӗлхи</language>
+			<language type="sat">сантали чӗлхи</language>
+			<language type="sbp">сангу чӗлхи</language>
+			<language type="sc">сардин чӗлхи</language>
+			<language type="scn">сицил чӗлхи</language>
+			<language type="sd">синдхи чӗлхи</language>
+			<language type="sdh">кӑнтӑр алтай чӗлхи</language>
+			<language type="se">ҫур ҫӗр саам чӗлхи</language>
+			<language type="seh">сена чӗлхи</language>
+			<language type="ses">койраборо-сенни чӗлхи</language>
+			<language type="sg">санго чӗлхи</language>
+			<language type="sgs">жемайт чӗлхи</language>
+			<language type="shi">ташельхит чӗлхи</language>
+			<language type="shn">шан чӗлхи</language>
+			<language type="si">сингал чӗлхи</language>
+			<language type="sid">сидама чӗлхи</language>
+			<language type="sk">словак чӗлхи</language>
+			<language type="skr">сирайки чӗлхи</language>
+			<language type="sl">словен чӗлхи</language>
+			<language type="sma">кӑнтӑр саам чӗлхи</language>
+			<language type="smj">луле-саам чӗлхи</language>
+			<language type="smn">инари саам чӗлхи</language>
+			<language type="sms">колтта-саам чӗлхи</language>
+			<language type="sn">шона чӗлхи</language>
+			<language type="so">сомали чӗлхи</language>
+			<language type="sq">албан чӗлхи</language>
+			<language type="sr">серб чӗлхи</language>
+			<language type="ss">свази чӗлхи</language>
+			<language type="ssy">сахо чӗлхи</language>
+			<language type="st">кӑнтӑр сото чӗлхи</language>
+			<language type="su">сундан чӗлхи</language>
+			<language type="suz">сунвар чӗлхи</language>
+			<language type="sv">швед чӗлхи</language>
+			<language type="sw">суахили чӗлхи</language>
+			<language type="sw_CD">конго суахили чӗлхи</language>
+			<language type="syr">сири чӗлхи</language>
+			<language type="szl">силез чӗлхи</language>
+			<language type="ta">тамил чӗлхи</language>
+			<language type="te">телугу чӗлхи</language>
+			<language type="teo">тесо чӗлхи</language>
+			<language type="tg">таджик чӗлхи</language>
+			<language type="th">тай чӗлхи</language>
+			<language type="ti">тигринья чӗлхи</language>
+			<language type="tig">тигре чӗлхи</language>
+			<language type="tk">туркмен чӗлхи</language>
+			<language type="tn">тсвана чӗлхи</language>
+			<language type="to">тонган чӗлхи</language>
+			<language type="tok">токипона чӗлхи</language>
+			<language type="tpi">ток-писин чӗлхи</language>
+			<language type="tr">турккӑ чӗлхи</language>
+			<language type="trv">седек чӗлхи</language>
+			<language type="trw">торвали чӗлхи</language>
+			<language type="ts">тсонга чӗлхи</language>
+			<language type="tt">тутар чӗлхи</language>
+			<language type="twq">тасавак чӗлхи</language>
+			<language type="tyv">тува чӗлхи</language>
+			<language type="tzm">вӑта атлас тамазигхт чӗлхи</language>
+			<language type="ug">уйгур чӗлхи</language>
+			<language type="uk">украин чӗлхи</language>
 			<language type="und">паллӑ мар чӗлхе</language>
-			<language type="ur" draft="unconfirmed">урду</language>
-			<language type="uz" draft="unconfirmed">узбек</language>
-			<language type="vai" draft="unconfirmed">ваи</language>
-			<language type="ve" draft="unconfirmed">венда</language>
-			<language type="vec" draft="unconfirmed">венециан</language>
-			<language type="vi" draft="unconfirmed">вьетнам</language>
-			<language type="vmw" draft="unconfirmed">макуа</language>
-			<language type="vo" draft="unconfirmed">воляпюк</language>
-			<language type="vun" draft="unconfirmed">вунджо</language>
-			<language type="wa" draft="unconfirmed">валлон (бельги)</language>
-			<language type="wae" draft="unconfirmed">вальзер (нимӗҫ)</language>
-			<language type="wal" draft="unconfirmed">воламо</language>
-			<language type="wbp" draft="unconfirmed">вальбири</language>
-			<language type="wo" draft="unconfirmed">волоф</language>
-			<language type="xh" draft="unconfirmed">кхоса</language>
-			<language type="xnr" draft="unconfirmed">кангри</language>
-			<language type="xog" draft="unconfirmed">сога</language>
-			<language type="yav" draft="unconfirmed">янгбен</language>
-			<language type="yi" draft="unconfirmed">идиш</language>
-			<language type="yo" draft="unconfirmed">йоруба</language>
-			<language type="yrl" draft="unconfirmed">ньенгату</language>
-			<language type="yue" draft="unconfirmed">кантон</language>
-			<language type="za" draft="unconfirmed">чжуан</language>
-			<language type="zgh" draft="unconfirmed">тамазигт</language>
-			<language type="zh">китай</language>
-			<language type="zh" alt="menu">ҫурҫӗр китай</language>
-			<language type="zh_Hans">китай, ҫӑмӑллатнӑ ҫыру</language>
-			<language type="zh_Hans" alt="long">ҫурҫӗр китай, ҫӑмӑллатнӑ ҫыру</language>
-			<language type="zh_Hant">китай, традициллӗ ҫыру</language>
-			<language type="zh_Hant" alt="long">ҫурҫӗр китай, традициллӗ ҫыру</language>
-			<language type="zu" draft="unconfirmed">зулу</language>
-			<language type="zxx" draft="unconfirmed">чӗлхе материал ҫук</language>
+			<language type="ur">урду чӗлхи</language>
+			<language type="uz">узбек чӗлхи</language>
+			<language type="vai">ваи чӗлхи</language>
+			<language type="ve">венда чӗлхи</language>
+			<language type="vec">венет чӗлхи</language>
+			<language type="vi">вьетнам чӗлхи</language>
+			<language type="vmw">макуа чӗлхи</language>
+			<language type="vo">волапюк чӗлхи</language>
+			<language type="vun">вунджо чӗлхи</language>
+			<language type="wa">валлон чӗлхи</language>
+			<language type="wae">валлис чӗлхи</language>
+			<language type="wal">воламо чӗлхи</language>
+			<language type="wbp">вальбири чӗлхи</language>
+			<language type="wo">волоф чӗлхи</language>
+			<language type="xh">коса чӗлхи</language>
+			<language type="xnr">кангри чӗлхи</language>
+			<language type="xog">сога чӗлхи</language>
+			<language type="yav">янгбен чӗлхи</language>
+			<language type="yi">идиш чӗлхи</language>
+			<language type="yo">йоруба чӗлхи</language>
+			<language type="yrl">ньенгату чӗлхи</language>
+			<language type="yue">кантон чӗлхи</language>
+			<language type="za">чжуань чӗлхи</language>
+			<language type="zgh">тамазигхт чӗлхи</language>
+			<language type="zh">китай чӗлхи</language>
+			<language type="zh" alt="menu">ҫур ҫӗр китай чӗлхи</language>
+			<language type="zh_Hans">ҫӑмӑллатнӑ китай чӗлхи</language>
+			<language type="zh_Hans" alt="long">ҫӑмӑллатнӑ ҫур ҫӗр китай чӗлхи</language>
+			<language type="zh_Hant">йӑлана кӗнӗ китай чӗлхи</language>
+			<language type="zh_Hant" alt="long">йӑлана кӗнӗ ҫур ҫӗр китай чӗлхи</language>
+			<language type="zu">зулу чӗлхи</language>
+			<language type="zxx">чӗлхе материалӗ ҫук</language>
 		</languages>
 		<scripts>
-			<script type="Adlm" draft="unconfirmed">адлам</script>
-			<script type="Aghb" draft="unconfirmed">кавказ албан</script>
-			<script type="Ahom" draft="unconfirmed">ахом</script>
-			<script type="Arab">арап</script>
-			<script type="Aran" draft="unconfirmed">насталик</script>
-			<script type="Armi" draft="unconfirmed">империри арамей</script>
-			<script type="Armn" draft="unconfirmed">армян</script>
-			<script type="Avst" draft="unconfirmed">авеста</script>
-			<script type="Bali" draft="unconfirmed">бали</script>
-			<script type="Bamu" draft="unconfirmed">бамум</script>
-			<script type="Bass" draft="unconfirmed">басса</script>
-			<script type="Batk" draft="unconfirmed">батак</script>
-			<script type="Beng" draft="unconfirmed">бангла</script>
-			<script type="Bhks" draft="unconfirmed">бхайксук</script>
-			<script type="Bopo" draft="unconfirmed">бопомофо</script>
-			<script type="Brah" draft="unconfirmed">брахми</script>
-			<script type="Brai" draft="unconfirmed">брайль</script>
-			<script type="Bugi" draft="unconfirmed">бугин</script>
-			<script type="Buhd" draft="unconfirmed">бухид</script>
-			<script type="Cakm" draft="unconfirmed">чакма</script>
-			<script type="Cans" draft="unconfirmed">канада аборигенӗсен пӗрлехи системи</script>
-			<script type="Cari" draft="unconfirmed">кари</script>
-			<script type="Cham" draft="unconfirmed">чам</script>
-			<script type="Cher" draft="unconfirmed">чероки</script>
-			<script type="Chrs" draft="unconfirmed">хорезм</script>
-			<script type="Copt" draft="unconfirmed">копт</script>
-			<script type="Cpmn" draft="unconfirmed">кипро-миной</script>
-			<script type="Cprt" draft="unconfirmed">кипр</script>
-			<script type="Cyrl">кириллица</script>
-			<script type="Cyrs" draft="unconfirmed">авалхи славян</script>
-			<script type="Deva" draft="unconfirmed">деванагари</script>
-			<script type="Diak" draft="unconfirmed">дивес акуру</script>
-			<script type="Dogr" draft="unconfirmed">догра</script>
-			<script type="Dsrt" draft="unconfirmed">дезерет</script>
-			<script type="Dupl" draft="unconfirmed">дюплой стенографийӗ</script>
-			<script type="Egyp" draft="unconfirmed">египет иероглифӗсем</script>
-			<script type="Elba" draft="unconfirmed">эльбасан</script>
-			<script type="Elym" draft="unconfirmed">элимей</script>
-			<script type="Ethi" draft="unconfirmed">эфиоп</script>
-			<script type="Gara" draft="unconfirmed">гарай</script>
-			<script type="Geor" draft="unconfirmed">грузин</script>
-			<script type="Glag" draft="unconfirmed">глаголица</script>
-			<script type="Gong" draft="unconfirmed">гунджала гонди</script>
-			<script type="Gonm" draft="unconfirmed">масарам гонди</script>
-			<script type="Goth" draft="unconfirmed">готика</script>
-			<script type="Gran" draft="unconfirmed">грантха</script>
-			<script type="Grek" draft="unconfirmed">грек</script>
-			<script type="Gujr" draft="unconfirmed">гуджарат</script>
-			<script type="Gukh" draft="unconfirmed">гурунг кхема</script>
-			<script type="Guru" draft="unconfirmed">гурмукхи</script>
-			<script type="Hanb" draft="unconfirmed">хэн пĕрле бопомофо</script>
-			<script type="Hang" draft="unconfirmed">хангыл</script>
-			<script type="Hani" draft="unconfirmed">хэн</script>
-			<script type="Hano" draft="unconfirmed">хануну</script>
-			<script type="Hans">ҫӑмӑллатнӑн китай</script>
-			<script type="Hans" alt="stand-alone">ҫӑмӑллатнӑ китай</script>
-			<script type="Hant">традициллӗн китай</script>
-			<script type="Hatr" draft="unconfirmed">хатран</script>
-			<script type="Hebr" draft="unconfirmed">еврей</script>
-			<script type="Hira" draft="unconfirmed">хирагана</script>
-			<script type="Hluw" draft="unconfirmed">анатолий иероглифӗсем</script>
-			<script type="Hmng" draft="unconfirmed">пахау хмонг</script>
-			<script type="Hmnp" draft="unconfirmed">ньякенг пуачуэ-хмонг</script>
-			<script type="Hrkt" draft="unconfirmed">япони слог</script>
-			<script type="Hung" draft="unconfirmed">авалхи венгер</script>
-			<script type="Ital" draft="unconfirmed">кивӗ чалăш</script>
-			<script type="Jamo" draft="unconfirmed">джамо</script>
-			<script type="Java" draft="unconfirmed">яван</script>
-			<script type="Jpan">япони</script>
-			<script type="Kali" draft="unconfirmed">кайя ли</script>
-			<script type="Kana" draft="unconfirmed">катакана</script>
-			<script type="Kawi" draft="unconfirmed">кави</script>
-			<script type="Khar" draft="unconfirmed">кхароштхи</script>
-			<script type="Khmr" draft="unconfirmed">кхмер</script>
-			<script type="Khoj" draft="unconfirmed">ходжки</script>
-			<script type="Kits" draft="unconfirmed">кидани вӗтӗ шрифт</script>
-			<script type="Knda" draft="unconfirmed">каннада</script>
-			<script type="Kore">корей</script>
-			<script type="Krai" draft="unconfirmed">кирата раи</script>
-			<script type="Kthi" draft="unconfirmed">кайтхи</script>
-			<script type="Lana" draft="unconfirmed">ланна</script>
-			<script type="Laoo" draft="unconfirmed">лаос</script>
-			<script type="Latf" draft="unconfirmed">фрактура латин</script>
-			<script type="Latg" draft="unconfirmed">гэль латин</script>
-			<script type="Latn">латин</script>
-			<script type="Lepc" draft="unconfirmed">лепча</script>
-			<script type="Limb" draft="unconfirmed">лимбу</script>
-			<script type="Lina" draft="unconfirmed">вăрăмăш А</script>
-			<script type="Linb" draft="unconfirmed">вăрăмăш Б</script>
-			<script type="Lisu" draft="unconfirmed">фрейзер</script>
-			<script type="Lyci" draft="unconfirmed">лики</script>
-			<script type="Lydi" draft="unconfirmed">лиди</script>
-			<script type="Mahj" draft="unconfirmed">махаджани</script>
-			<script type="Maka" draft="unconfirmed">макасар</script>
-			<script type="Mand" draft="unconfirmed">мандей</script>
-			<script type="Mani" draft="unconfirmed">манихей</script>
-			<script type="Marc" draft="unconfirmed">мархен</script>
-			<script type="Medf" draft="unconfirmed">обэри окаимэ</script>
-			<script type="Mend" draft="unconfirmed">менде</script>
-			<script type="Merc" draft="unconfirmed">мероит чалăш</script>
-			<script type="Mero" draft="unconfirmed">мероит</script>
-			<script type="Mlym" draft="unconfirmed">малаялам</script>
-			<script type="Modi" draft="unconfirmed">моди</script>
-			<script type="Mong" draft="unconfirmed">монгол</script>
-			<script type="Mroo" draft="unconfirmed">мро</script>
-			<script type="Mtei" draft="unconfirmed">мейтей-майек</script>
-			<script type="Mult" draft="unconfirmed">мултан</script>
-			<script type="Mymr" draft="unconfirmed">мьянма</script>
-			<script type="Nagm" draft="unconfirmed">мундар</script>
-			<script type="Nand" draft="unconfirmed">нандинагари</script>
-			<script type="Narb" draft="unconfirmed">авалхи ҫурҫӗр-араб</script>
-			<script type="Nbat" draft="unconfirmed">набатейсем</script>
-			<script type="Newa" draft="unconfirmed">нева</script>
-			<script type="Nkoo" draft="unconfirmed">нко</script>
-			<script type="Nshu" draft="unconfirmed">нюй-шу</script>
-			<script type="Ogam" draft="unconfirmed">огам</script>
-			<script type="Olck" draft="unconfirmed">ол-чики</script>
-			<script type="Onao" draft="unconfirmed">ол онал</script>
-			<script type="Orkh" draft="unconfirmed">орхон</script>
-			<script type="Orya" draft="unconfirmed">оди (ори)</script>
-			<script type="Osge" draft="unconfirmed">осейдж</script>
-			<script type="Osma" draft="unconfirmed">исмани</script>
-			<script type="Ougr" draft="unconfirmed">ватӑ уйгур</script>
-			<script type="Palm" draft="unconfirmed">пальмир</script>
-			<script type="Pauc" draft="unconfirmed">пау-синь-хау</script>
-			<script type="Perm" draft="unconfirmed">ватӑ перм</script>
-			<script type="Phag" draft="unconfirmed">Пагба (монгол тӑваткал)</script>
-			<script type="Phli" draft="unconfirmed">пехлеви (вӑтам перс)</script>
-			<script type="Phlp" draft="unconfirmed">пехлеви псалтирӗ</script>
-			<script type="Phnx" draft="unconfirmed">финик</script>
-			<script type="Plrd" draft="unconfirmed">поллард фонетики</script>
-			<script type="Prti" draft="unconfirmed">парфян</script>
-			<script type="Qaag" draft="unconfirmed">зоги (бирман)</script>
-			<script type="Rjng" draft="unconfirmed">реджанг</script>
-			<script type="Rohg" draft="unconfirmed">ханифи</script>
-			<script type="Runr" draft="unconfirmed">рун</script>
-			<script type="Samr" draft="unconfirmed">самаритян</script>
-			<script type="Sarb" draft="unconfirmed">авалхи кӑнтӑр-араб</script>
-			<script type="Saur" draft="unconfirmed">саураштра</script>
-			<script type="Sgnw" draft="unconfirmed">паллă</script>
-			<script type="Shaw" draft="unconfirmed">шовиан</script>
-			<script type="Shrd" draft="unconfirmed">шарада</script>
-			<script type="Sidd" draft="unconfirmed">сиддхам</script>
-			<script type="Sind" draft="unconfirmed">худабади</script>
-			<script type="Sinh" draft="unconfirmed">cингал</script>
-			<script type="Sogd" draft="unconfirmed">согдиан</script>
-			<script type="Sogo" draft="unconfirmed">авалхи согдиан</script>
-			<script type="Sora" draft="unconfirmed">соранг сомпенг</script>
-			<script type="Soyo" draft="unconfirmed">сойомбо</script>
-			<script type="Sund" draft="unconfirmed">сундан</script>
-			<script type="Sunu" draft="unconfirmed">сунувар</script>
-			<script type="Sylo" draft="unconfirmed">силоти нагри</script>
-			<script type="Syrc" draft="unconfirmed">сири</script>
-			<script type="Syre" draft="unconfirmed">эстранджело сири</script>
-			<script type="Syrj" draft="unconfirmed">хӗвеланӑҫ сири</script>
-			<script type="Syrn" draft="unconfirmed">хӗвелтухӑҫ сири</script>
-			<script type="Tagb" draft="unconfirmed">тагбанва</script>
-			<script type="Takr" draft="unconfirmed">такри</script>
-			<script type="Tale" draft="unconfirmed">тай-ныа</script>
-			<script type="Talu" draft="unconfirmed">лы ҫӗнӗ ҫыру</script>
-			<script type="Taml" draft="unconfirmed">тамиль</script>
-			<script type="Tang" draft="unconfirmed">тангут</script>
-			<script type="Tavt" draft="unconfirmed">тайвьет</script>
-			<script type="Telu" draft="unconfirmed">телугу</script>
-			<script type="Tfng" draft="unconfirmed">тифинаг</script>
-			<script type="Tglg" draft="unconfirmed">тагаль</script>
-			<script type="Thaa" draft="unconfirmed">таана</script>
-			<script type="Thai" draft="unconfirmed">тай</script>
-			<script type="Tibt" draft="unconfirmed">тибет</script>
-			<script type="Tirh" draft="unconfirmed">тирхута</script>
-			<script type="Tnsa" draft="unconfirmed">тасе-нага</script>
-			<script type="Todr" draft="unconfirmed">тодри</script>
-			<script type="Toto" draft="unconfirmed">тото</script>
-			<script type="Tutg" draft="unconfirmed">тулу</script>
-			<script type="Ugar" draft="unconfirmed">угарит</script>
-			<script type="Vaii" draft="unconfirmed">вай</script>
-			<script type="Vith" draft="unconfirmed">виткути</script>
-			<script type="Wara" draft="unconfirmed">варанг-кшити</script>
-			<script type="Wcho" draft="unconfirmed">ванчо</script>
-			<script type="Xpeo" draft="unconfirmed">авалхи перс</script>
-			<script type="Xsux" draft="unconfirmed">шумер-аккад савăл</script>
-			<script type="Yezi" draft="unconfirmed">езид</script>
-			<script type="Yiii" draft="unconfirmed">носу</script>
-			<script type="Zanb" draft="unconfirmed">тӑваткал забазар</script>
-			<script type="Zinh" draft="unconfirmed">еткер</script>
-			<script type="Zmth" draft="unconfirmed">математика паллисем</script>
-			<script type="Zsye" draft="unconfirmed">эмодзи</script>
-			<script type="Zsym" draft="unconfirmed">символсем</script>
-			<script type="Zxxx">ҫырусӑр</script>
-			<script type="Zyyy" draft="unconfirmed">пӗтӗмӗшле</script>
-			<script type="Zzzz">паллӑ мар ҫырулах</script>
+			<script type="Adlm">адлам ҫырулӑхӗ</script>
+			<script type="Aghb">агван ҫырулӑхӗ</script>
+			<script type="Ahom">ахом ҫырулӑхӗ</script>
+			<script type="Arab">араб ҫырулӑхӗ</script>
+			<script type="Aran">насталик ҫырулӑхӗ</script>
+			<script type="Armi">арамей ҫырулӑхӗ</script>
+			<script type="Armn">эрмен ҫырулӑхӗ</script>
+			<script type="Avst">авести ҫырулӑхӗ</script>
+			<script type="Bali">бали ҫырулӑхӗ</script>
+			<script type="Bamu">бамум ҫырулӑхӗ</script>
+			<script type="Bass">басса (вах) ҫырулӑхӗ</script>
+			<script type="Batk">батак ҫырулӑхӗ</script>
+			<script type="Beng">бенгал ҫырулӑхӗ</script>
+			<script type="Berf">бэри ҫырулӑхӗ</script>
+			<script type="Bhks">бхайксуки ҫырулӑхӗ</script>
+			<script type="Bopo">бопомофо ҫырулӑхӗ</script>
+			<script type="Brah">брахми ҫырулӑхӗ</script>
+			<script type="Brai">брайль ҫырулӑхӗ</script>
+			<script type="Bugi">бугинизи ҫырулӑхӗ</script>
+			<script type="Buhd">бухид ҫырулӑхӗ</script>
+			<script type="Cakm">чакма ҫырулӑхӗ</script>
+			<script type="Cans">канада сыпӑклӑ ҫырулӑхӗ</script>
+			<script type="Cari">кари ҫырулӑхӗ</script>
+			<script type="Cham">чам ҫырулӑхӗ</script>
+			<script type="Cher">чероки ҫырулӑхӗ</script>
+			<script type="Chrs">хорезм ҫырулӑхӗ</script>
+			<script type="Copt">копт ҫырулӑхӗ</script>
+			<script type="Cpmn">кипр-миной ҫырулӑхӗ</script>
+			<script type="Cprt">кипр ҫырулӑхӗ</script>
+			<script type="Cyrl">кирилл ҫырулӑхӗ</script>
+			<script type="Cyrs">авалхи славян ҫырулӑхӗ</script>
+			<script type="Deva">деванагари ҫырулӑхӗ</script>
+			<script type="Diak">дивехи-акуру ҫырулӑхӗ</script>
+			<script type="Dogr">догри ҫырулӑхӗ</script>
+			<script type="Dsrt">дезерет ҫырулӑхӗ</script>
+			<script type="Dupl">дюплойе ҫырулӑхӗ</script>
+			<script type="Egyp">египет ҫырулӑхӗ</script>
+			<script type="Elba">эльбасан ҫырулӑхӗ</script>
+			<script type="Elym">элам ҫырулӑхӗ</script>
+			<script type="Ethi">эфиоп ҫырулӑхӗ</script>
+			<script type="Gara">гарай ҫырулӑхӗ</script>
+			<script type="Geor">грузин ҫырулӑхӗ</script>
+			<script type="Glag">глагол ҫырулӑхӗ</script>
+			<script type="Gong">гунджала-гонди ҫырулӑхӗ</script>
+			<script type="Gonm">масарам-гонди ҫырулӑхӗ</script>
+			<script type="Goth">гот ҫырулӑхӗ</script>
+			<script type="Gran">грантха ҫырулӑхӗ</script>
+			<script type="Grek">грек ҫырулӑхӗ</script>
+			<script type="Gujr">гуджарати ҫырулӑхӗ</script>
+			<script type="Gukh">кхема ҫырулӑхӗ</script>
+			<script type="Guru">гурмукхи ҫырулӑхӗ</script>
+			<script type="Hanb">ханьпа бопомофо ҫырулӑхӗ</script>
+			<script type="Hang">хангыль ҫырулӑхӗ</script>
+			<script type="Hani">китай ҫырулӑхӗ</script>
+			<script type="Hano">хануну ҫырулӑхӗ</script>
+			<script type="Hans">ҫӑмӑллатнӑ китай ҫырулӑхӗ</script>
+			<script type="Hant">йӑлана кӗнӗ китай ҫырулӑхӗ</script>
+			<script type="Hatr">хатра ҫырулӑхӗ</script>
+			<script type="Hebr">еврей ҫырулӑхӗ</script>
+			<script type="Hira">хирагана ҫырулӑхӗ</script>
+			<script type="Hluw">луви ҫырулӑхӗ</script>
+			<script type="Hmng">пахау ҫырулӑхӗ</script>
+			<script type="Hmnp">ньякенг-пуачуэ ҫырулӑхӗ</script>
+			<script type="Hrkt">катаканапа хирагана ҫырулӑхӗ</script>
+			<script type="Hung">авалхи венгр ҫырулӑхӗ</script>
+			<script type="Ital">авалхи итальян ҫырулӑхӗ</script>
+			<script type="Jamo">джамо ҫырулӑхӗ</script>
+			<script type="Java">яван ҫырулӑхӗ</script>
+			<script type="Jpan">япон ҫырулӑхӗ</script>
+			<script type="Kali">кая-ли ҫырулӑхӗ</script>
+			<script type="Kana">катакана ҫырулӑхӗ</script>
+			<script type="Kawi">кави ҫырулӑхӗ</script>
+			<script type="Khar">кхароштхи ҫырулӑхӗ</script>
+			<script type="Khmr">кхмер ҫырулӑхӗ</script>
+			<script type="Khoj">ходжики ҫырулӑхӗ</script>
+			<script type="Kits">пӗчӗк кидань ҫырулӑхӗ</script>
+			<script type="Knda">каннада ҫырулӑхӗ</script>
+			<script type="Kore">корей ҫырулӑхӗ</script>
+			<script type="Krai">кират-рай ҫырулӑхӗ</script>
+			<script type="Kthi">кайтхи ҫырулӑхӗ</script>
+			<script type="Lana">ланна ҫырулӑхӗ</script>
+			<script type="Laoo">лаос ҫырулӑхӗ</script>
+			<script type="Latf">латин фрактура ҫырулӑхӗ</script>
+			<script type="Latg">гэл латин ҫырулӑхӗ</script>
+			<script type="Latn">латин ҫырулӑхӗ</script>
+			<script type="Lepc">лепча ҫырулӑхӗ</script>
+			<script type="Limb">лимбу ҫырулӑхӗ</script>
+			<script type="Lina">А йӗрлӗ ҫырулӑх</script>
+			<script type="Linb">Ӑ йӗрлӗ ҫырулӑх</script>
+			<script type="Lisu">лису ҫырулӑхӗ</script>
+			<script type="Lyci">лики ҫырулӑхӗ</script>
+			<script type="Lydi">лиди ҫырулӑхӗ</script>
+			<script type="Mahj">махаджани ҫырулӑхӗ</script>
+			<script type="Maka">макасар ҫырулӑхӗ</script>
+			<script type="Mand">мандей ҫырулӑхӗ</script>
+			<script type="Mani">манихей ҫырулӑхӗ</script>
+			<script type="Marc">марчхен ҫырулӑхӗ</script>
+			<script type="Medf">обэри-окаимэ ҫырулӑхӗ</script>
+			<script type="Mend">менде ҫырулӑхӗ</script>
+			<script type="Merc">чалӑш мероит ҫырулӑхӗ</script>
+			<script type="Mero">мероит ҫырулӑхӗ</script>
+			<script type="Mlym">малаялам ҫырулӑхӗ</script>
+			<script type="Modi">моди ҫырулӑхӗ</script>
+			<script type="Mong">монгол ҫырулӑхӗ</script>
+			<script type="Mroo">мро ҫырулӑхӗ</script>
+			<script type="Mtei">манипури ҫырулӑхӗ</script>
+			<script type="Mult">мултани ҫырулӑхӗ</script>
+			<script type="Mymr">мьянма ҫырулӑхӗ</script>
+			<script type="Nagm">наг-мундари ҫырулӑхӗ</script>
+			<script type="Nand">нандинагари ҫырулӑхӗ</script>
+			<script type="Narb">авалхи ҫур ҫӗр араб ҫырулӑхӗ</script>
+			<script type="Nbat">набатей ҫырулӑхӗ</script>
+			<script type="Newa">нева ҫырулӑхӗ</script>
+			<script type="Nkoo">нко ҫырулӑхӗ</script>
+			<script type="Nshu">нюй-шу ҫырулӑхӗ</script>
+			<script type="Ogam">огам ҫырулӑхӗ</script>
+			<script type="Olck">ол-чики ҫырулӑхӗ</script>
+			<script type="Onao">ол-онал ҫырулӑхӗ</script>
+			<script type="Orkh">авалхи тӗрӗк ҫырулӑхӗ</script>
+			<script type="Orya">ори ҫырулӑхӗ</script>
+			<script type="Osge">осейдж ҫырулӑхӗ</script>
+			<script type="Osma">осман ҫырулӑхӗ</script>
+			<script type="Ougr">авалхи уйгур ҫырулӑхӗ</script>
+			<script type="Palm">пальмир ҫырулӑхӗ</script>
+			<script type="Pauc">паун-чжин-хаук ҫырулӑхӗ</script>
+			<script type="Perm">авалхи пермь ҫырулӑхӗ</script>
+			<script type="Phag">пагспа ҫырулӑхӗ</script>
+			<script type="Phli">пехлеви ҫырулӑхӗ</script>
+			<script type="Phlp">пехлеви псалтырь ҫырулӑхӗ</script>
+			<script type="Phnx">финики ҫырулӑхӗ</script>
+			<script type="Plrd">мяо ҫырулӑхӗ</script>
+			<script type="Prti">парфян ҫырулӑхӗ</script>
+			<script type="Qaag">зоджи ҫырулӑхӗ</script>
+			<script type="Rjng">реджанг ҫырулӑхӗ</script>
+			<script type="Rohg">ханифи ҫырулӑхӗ</script>
+			<script type="Runr">руна ҫырулӑхӗ</script>
+			<script type="Samr">самаритян ҫырулӑхӗ</script>
+			<script type="Sarb">авалхи кӑнтӑр араб ҫырулӑхӗ</script>
+			<script type="Saur">саураштра ҫырулӑхӗ</script>
+			<script type="Sgnw">паллӑ ҫырулӑхӗ</script>
+			<script type="Shaw">шоу ҫырулӑхӗ</script>
+			<script type="Shrd">шарада ҫырулӑхӗ</script>
+			<script type="Sidd">сиддхам ҫырулӑхӗ</script>
+			<script type="Sidt">сидет ҫырулӑхӗ</script>
+			<script type="Sind">кхудавади ҫырулӑхӗ</script>
+			<script type="Sinh">сингал ҫырулӑхӗ</script>
+			<script type="Sogd">согди ҫырулӑхӗ</script>
+			<script type="Sogo">авалхи согди ҫырулӑхӗ</script>
+			<script type="Sora">сора-сонпенг ҫырулӑхӗ</script>
+			<script type="Soyo">соёмбо ҫырулӑхӗ</script>
+			<script type="Sund">сундан ҫырулӑхӗ</script>
+			<script type="Sunu">сунвар ҫырулӑхӗ</script>
+			<script type="Sylo">силоти-нагри ҫырулӑхӗ</script>
+			<script type="Syrc">сири ҫырулӑхӗ</script>
+			<script type="Syre">сири эстрангело ҫырулӑхӗ</script>
+			<script type="Syrj">анӑҫ сири ҫырулӑхӗ</script>
+			<script type="Syrn">тухӑҫ сири ҫырулӑхӗ</script>
+			<script type="Tagb">тагбанва ҫырулӑхӗ</script>
+			<script type="Takr">такри ҫырулӑхӗ</script>
+			<script type="Tale">тай-ныа ҫырулӑхӗ</script>
+			<script type="Talu">ҫӗнӗ тай-ныа ҫырулӑхӗ</script>
+			<script type="Taml">тамил ҫырулӑхӗ</script>
+			<script type="Tang">тангут ҫырулӑхӗ</script>
+			<script type="Tavt">тай-вьет ҫырулӑхӗ</script>
+			<script type="Tayo">тай-йо ҫырулӑхӗ</script>
+			<script type="Telu">телугу ҫырулӑхӗ</script>
+			<script type="Tfng">тифинаг ҫырулӑхӗ</script>
+			<script type="Tglg">тагалог ҫырулӑхӗ</script>
+			<script type="Thaa">таана ҫырулӑхӗ</script>
+			<script type="Thai">тай ҫырулӑхӗ</script>
+			<script type="Tibt">тибет ҫырулӑхӗ</script>
+			<script type="Tirh">тирхута ҫырулӑхӗ</script>
+			<script type="Tnsa">тангса ҫырулӑхӗ</script>
+			<script type="Todr">тодри ҫырулӑхӗ</script>
+			<script type="Tols">толонг-сики ҫырулӑхӗ</script>
+			<script type="Toto">тото ҫырулӑхӗ</script>
+			<script type="Tutg">тулу-тигалари ҫырулӑхӗ</script>
+			<script type="Ugar">угарит ҫырулӑхӗ</script>
+			<script type="Vaii">вай ҫырулӑхӗ</script>
+			<script type="Vith">виткути ҫырулӑхӗ</script>
+			<script type="Wara">варанг-кшити ҫырулӑхӗ</script>
+			<script type="Wcho">ванчо ҫырулӑхӗ</script>
+			<script type="Xpeo">авалхи перс ҫырулӑхӗ</script>
+			<script type="Xsux">шумер-аккад савӑл ҫырулӑхӗ</script>
+			<script type="Yezi">езид ҫырулӑхӗ</script>
+			<script type="Yiii">и ҫырулӑхӗ</script>
+			<script type="Zanb">тӑваткал забазар ҫырулӑхӗ</script>
+			<script type="Zinh">еткерленӗ ҫырулӑх</script>
+			<script type="Zmth">математика паллисем</script>
+			<script type="Zsye">эмодзи</script>
+			<script type="Zsym">паллӑсем</script>
+			<script type="Zxxx">ҫырулӑхсӑр</script>
+			<script type="Zyyy">пӗтӗмӗшле йышӑннӑ ҫырулӑх</script>
+			<script type="Zzzz">паллӑ мар ҫырулӑх</script>
 		</scripts>
 		<territories>
 			<territory type="001">тӗнче</territory>
 			<territory type="002">Африка</territory>
-			<territory type="003">Ҫурҫӗр Америка</territory>
+			<territory type="003">Ҫур ҫӗр Америка</territory>
 			<territory type="005">Кӑнтӑр Америка</territory>
 			<territory type="009">Океани</territory>
 			<territory type="011">Анӑҫ Африка</territory>
-			<territory type="013">Тӗп Америка</territory>
-			<territory type="014">Хӗвелтухӑҫ Африка</territory>
-			<territory type="015">Ҫурҫӗр Африка</territory>
-			<territory type="017">Тӗп Африка</territory>
+			<territory type="013">Вӑта Америка</territory>
+			<territory type="014">Тухӑҫ Африка</territory>
+			<territory type="015">Ҫур ҫӗр Африка</territory>
+			<territory type="017">Вӑта Африка</territory>
 			<territory type="018">Кӑнтӑр Африка</territory>
 			<territory type="019">Америка</territory>
-			<territory type="021">Ҫурҫӗр Америка регион</territory>
-			<territory type="029">Карибсем</territory>
-			<territory type="030">Хӗвелтухӑҫ Ази</territory>
+			<territory type="021">Ҫур ҫӗр Америка регионӗ</territory>
+			<territory type="029">Кариб</territory>
+			<territory type="030">Тухӑҫ Ази</territory>
 			<territory type="034">Кӑнтӑр Ази</territory>
-			<territory type="035">Кӑнтӑр хӗвелтухӑҫ Ази</territory>
+			<territory type="035">Кӑнтӑр тухӑҫ Ази</territory>
 			<territory type="039">Кӑнтӑр Европа</territory>
 			<territory type="053">Австралази</territory>
 			<territory type="054">Меланези</territory>
-			<territory type="057">Микронези регион</territory>
+			<territory type="057">Микронези</territory>
 			<territory type="061">Полинези</territory>
 			<territory type="142">Ази</territory>
-			<territory type="143">Тӗп Ази</territory>
+			<territory type="143">Вӑта Ази</territory>
 			<territory type="145">Анӑҫ Ази</territory>
 			<territory type="150">Европа</territory>
-			<territory type="151">Хӗвелтухӑҫ Европа</territory>
-			<territory type="154">Ҫурҫӗр Европа</territory>
+			<territory type="151">Тухӑҫ Европа</territory>
+			<territory type="154">Ҫур ҫӗр Европа</territory>
 			<territory type="155">Анӑҫ Европа</territory>
-			<territory type="202">Тропик Африка</territory>
+			<territory type="202">Сахара ҫум Африка</territory>
 			<territory type="419">Латинла Америка</territory>
 			<territory type="AC">Вознесени утравӗ</territory>
 			<territory type="AD">Андорра</territory>
-			<territory type="AE">Арапсен Пӗрлешӳллӗ Эмирачӗ</territory>
+			<territory type="AE">Пӗрлешнӗ Араб Эмирачӗсем</territory>
 			<territory type="AF">Афганистан</territory>
-			<territory type="AG">Антигуа тата Барбуда</territory>
+			<territory type="AG">Антигуапа Барбуда</territory>
 			<territory type="AI">Ангилья</territory>
 			<territory type="AL">Албани</territory>
 			<territory type="AM">Армени</territory>
 			<territory type="AO">Ангола</territory>
 			<territory type="AQ">Антарктида</territory>
 			<territory type="AR">Аргентина</territory>
-			<territory type="AS">Америка Самоа</territory>
+			<territory type="AS">Америка Самойи</territory>
 			<territory type="AT">Австри</territory>
 			<territory type="AU">Австрали</territory>
 			<territory type="AW">Аруба</territory>
-			<territory type="AX">Аланди утравӗсем</territory>
+			<territory type="AX">Аланд утравӗсем</territory>
 			<territory type="AZ">Азербайджан</territory>
 			<territory type="BA">Боснипе Герцеговина</territory>
 			<territory type="BB">Барбадос</territory>
@@ -609,22 +626,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BJ">Бенин</territory>
 			<territory type="BL">Сен-Бартелеми</territory>
 			<territory type="BM">Бермуд утравӗсем</territory>
-			<territory type="BN">Бруней-Даруссалам</territory>
+			<territory type="BN">Бруней</territory>
 			<territory type="BO">Боливи</territory>
-			<territory type="BQ">Бонэйр, Синт-Эстатиус тата Саба</territory>
+			<territory type="BQ">Бонэйр, Синт-Эстатиуспа Саба</territory>
 			<territory type="BR">Бразили</territory>
-			<territory type="BS">Пахам утравӗсем</territory>
+			<territory type="BS">Багама утравӗсем</territory>
 			<territory type="BT">Бутан</territory>
 			<territory type="BV">Буве утравӗ</territory>
 			<territory type="BW">Ботсвана</territory>
-			<territory type="BY">Беларуҫ</territory>
+			<territory type="BY">Беларусь</territory>
 			<territory type="BZ">Белиз</territory>
 			<territory type="CA">Канада</territory>
 			<territory type="CC">Кокос утравӗсем</territory>
-			<territory type="CD">Конго - Киншаса</territory>
-			<territory type="CD" alt="variant">Конго (КДР)</territory>
-			<territory type="CF">Тӗп Африка Республики</territory>
-			<territory type="CG">Конго - Браззавиль</territory>
+			<territory type="CD">Конго</territory>
+			<territory type="CD" alt="variant">Конго Демократиллӗ Республики</territory>
+			<territory type="CF">Вӑта Африка Республики</territory>
+			<territory type="CG">Конго-Браззавиль</territory>
 			<territory type="CG" alt="variant">Конго Республики</territory>
 			<territory type="CH">Швейцари</territory>
 			<territory type="CI">Кот-д’Ивуар</territory>
@@ -634,7 +651,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Китай</territory>
 			<territory type="CO">Колумби</territory>
 			<territory type="CP">Клиппертон утравӗ</territory>
-			<territory type="CQ" draft="unconfirmed">Сарк</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -644,13 +661,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CZ">Чехи</territory>
 			<territory type="CZ" alt="variant">Чех Республики</territory>
 			<territory type="DE">Германи</territory>
-			<territory type="DG">Диего-Гарсия</territory>
+			<territory type="DG">Диего-Гарси</territory>
 			<territory type="DJ">Джибути</territory>
 			<territory type="DK">Дани</territory>
 			<territory type="DM">Доминика</territory>
-			<territory type="DO">Доминикан Республики</territory>
+			<territory type="DO">Доминика Республики</territory>
 			<territory type="DZ">Алжир</territory>
-			<territory type="EA">Сеута тата Мелилья</territory>
+			<territory type="EA">Сеутӑпа Мелили</territory>
 			<territory type="EC">Эквадор</territory>
 			<territory type="EE">Эстони</territory>
 			<territory type="EG">Египет</territory>
@@ -658,12 +675,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ER">Эритрей</territory>
 			<territory type="ES">Испани</territory>
 			<territory type="ET">Эфиопи</territory>
-			<territory type="EU">Европа пӗрлешӗвӗ</territory>
-			<territory type="EZ">Еврозон</territory>
+			<territory type="EU">Европа Пӗрлешӗвӗ</territory>
+			<territory type="EZ">Еврозона</territory>
 			<territory type="FI">Финлянди</territory>
 			<territory type="FJ">Фиджи</territory>
 			<territory type="FK">Фолкленд утравӗсем</territory>
-			<territory type="FK" alt="variant">Фолкленд (Мальвински) утравӗсем</territory>
+			<territory type="FK" alt="variant">Фолкленд утравӗсем (Мальвина утравӗсем)</territory>
 			<territory type="FM">Микронези</territory>
 			<territory type="FO">Фарер утравӗсем</territory>
 			<territory type="FR">Франци</territory>
@@ -672,7 +689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GB" alt="short">Британи</territory>
 			<territory type="GD">Гренада</territory>
 			<territory type="GE">Грузи</territory>
-			<territory type="GF">Франци Гвиана</territory>
+			<territory type="GF">Франци Гвиани</territory>
 			<territory type="GG">Гернси</territory>
 			<territory type="GH">Гана</territory>
 			<territory type="GI">Гибралтар</territory>
@@ -680,16 +697,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GM">Гамби</territory>
 			<territory type="GN">Гвиней</territory>
 			<territory type="GP">Гваделупа</territory>
-			<territory type="GQ">Экваториаллӑ Гвиней</territory>
+			<territory type="GQ">Экваторти Гвинея</territory>
 			<territory type="GR">Греци</territory>
-			<territory type="GS">Кӑнтӑр Георги тата Сандвичев утравӗсем</territory>
+			<territory type="GS">Кӑнтӑр Георгипе Кӑнтӑр Сандвич утравӗсем</territory>
 			<territory type="GT">Гватемала</territory>
 			<territory type="GU">Гуам</territory>
 			<territory type="GW">Гвиней-Бисау</territory>
 			<territory type="GY">Гайана</territory>
-			<territory type="HK">Гонконг (САР)</territory>
+			<territory type="HK">Гонконг (ЯАР)</territory>
 			<territory type="HK" alt="short">Гонконг</territory>
-			<territory type="HM">Херд тата Макдональд утравӗ</territory>
+			<territory type="HM">Хердпа Макдональд утравӗсем</territory>
 			<territory type="HN">Гондурас</territory>
 			<territory type="HR">Хорвати</territory>
 			<territory type="HT">Гаити</territory>
@@ -700,9 +717,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IL">Израиль</territory>
 			<territory type="IM">Мэн утравӗ</territory>
 			<territory type="IN">Инди</territory>
-			<territory type="IO" draft="provisional">Британин территори Инди океанӗре</territory>
-			<territory type="IO" alt="biot" draft="unconfirmed">Британи территори Инди океанӗре</territory>
-			<territory type="IO" alt="chagos" draft="unconfirmed">Чагос архипелаге</territory>
+			<territory type="IO">Инди океанӗнчи Британи территорийӗ</territory>
+			<territory type="IO" alt="chagos">Чагос архипелагӗ</territory>
 			<territory type="IQ">Ирак</territory>
 			<territory type="IR">Иран</territory>
 			<territory type="IS">Исланди</territory>
@@ -712,19 +728,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="JO">Иордани</territory>
 			<territory type="JP">Япони</territory>
 			<territory type="KE">Кени</territory>
-			<territory type="KG">Киргизи</territory>
+			<territory type="KG">Кӑркӑсстан</territory>
 			<territory type="KH">Камбоджа</territory>
 			<territory type="KI">Кирибати</territory>
 			<territory type="KM">Комор утравӗсем</territory>
-			<territory type="KN">Сент-Китс тата Невис</territory>
-			<territory type="KP">КХДР</territory>
-			<territory type="KR">Корей Республики</territory>
+			<territory type="KN">Сент-Китспа Невис</territory>
+			<territory type="KP">Ҫур ҫӗр Корея</territory>
+			<territory type="KR">Кӑнтӑр Корея</territory>
 			<territory type="KW">Кувейт</territory>
 			<territory type="KY">Кайман утравӗсем</territory>
 			<territory type="KZ">Казахстан</territory>
 			<territory type="LA">Лаос</territory>
 			<territory type="LB">Ливан</territory>
-			<territory type="LC">Сент-Люсия</territory>
+			<territory type="LC">Сент-Люси</territory>
 			<territory type="LI">Лихтенштейн</territory>
 			<territory type="LK">Шри-Ланка</territory>
 			<territory type="LR">Либери</territory>
@@ -739,20 +755,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ME">Черногори</territory>
 			<territory type="MF">Сен-Мартен</territory>
 			<territory type="MG">Мадагаскар</territory>
-			<territory type="MH">Маршаллов утравӗсем</territory>
-			<territory type="MK">Ҫурҫӗр Македони</territory>
+			<territory type="MH">Маршалл утравӗсем</territory>
+			<territory type="MK">Ҫур ҫӗр Македони</territory>
 			<territory type="ML">Мали</territory>
 			<territory type="MM">Мьянма (Бирма)</territory>
 			<territory type="MN">Монголи</territory>
-			<territory type="MO">Макао (САР)</territory>
+			<territory type="MO">Макао (ЯАР)</territory>
 			<territory type="MO" alt="short">Макао</territory>
-			<territory type="MP">Ҫурҫӗр Мариан утравӗсем</territory>
+			<territory type="MP">Ҫур ҫӗр Мариан утравӗсем</territory>
 			<territory type="MQ">Мартиника</territory>
 			<territory type="MR">Мавритани</territory>
 			<territory type="MS">Монтсеррат</territory>
 			<territory type="MT">Мальта</territory>
 			<territory type="MU">Маврики</territory>
-			<territory type="MV">Мальдивсем</territory>
+			<territory type="MV">Мальдив</territory>
 			<territory type="MW">Малави</territory>
 			<territory type="MX">Мексика</territory>
 			<territory type="MY">Малайзи</territory>
@@ -773,15 +789,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="OM">Оман</territory>
 			<territory type="PA">Панама</territory>
 			<territory type="PE">Перу</territory>
-			<territory type="PF">Франци Полинези</territory>
-			<territory type="PG">Папуа — Ҫӗнӗ Гвиней</territory>
-			<territory type="PH">Филиппинсем</territory>
+			<territory type="PF">Франци Полинезийӗ</territory>
+			<territory type="PG">Папуа — Ҫӗнӗ Гвинея</territory>
+			<territory type="PH">Филиппин</territory>
 			<territory type="PK">Пакистан</territory>
 			<territory type="PL">Польша</territory>
-			<territory type="PM">Сен-Пьер &amp; Микелон</territory>
+			<territory type="PM">Сен-Пьерпа Микелон</territory>
 			<territory type="PN">Питкэрн утравӗсем</territory>
 			<territory type="PR">Пуэрто-Рико</territory>
-			<territory type="PS">Палестинӑн территорийӗсем</territory>
+			<territory type="PS">Палестина территорийӗсем</territory>
 			<territory type="PS" alt="short">Палестина</territory>
 			<territory type="PT">Португали</territory>
 			<territory type="PW">Палау</territory>
@@ -801,7 +817,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SG">Сингапур</territory>
 			<territory type="SH">Сӑваплӑ Елена утравӗ</territory>
 			<territory type="SI">Словени</territory>
-			<territory type="SJ">Шпицберген тата Ян-Майен</territory>
+			<territory type="SJ">Шпицбергенпа Ян-Майен</territory>
 			<territory type="SK">Словаки</territory>
 			<territory type="SL">Сьерра-Леоне</territory>
 			<territory type="SM">Сан-Марино</territory>
@@ -809,49 +825,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SO">Сомали</territory>
 			<territory type="SR">Суринам</territory>
 			<territory type="SS">Кӑнтӑр Судан</territory>
-			<territory type="ST">Сан-Томе тата Принсипи</territory>
+			<territory type="ST">Сан-Томепе Принсипи</territory>
 			<territory type="SV">Сальвадор</territory>
 			<territory type="SX">Синт-Мартен</territory>
 			<territory type="SY">Сири</territory>
 			<territory type="SZ">Эсватини</territory>
 			<territory type="SZ" alt="variant">Свазиленд</territory>
-			<territory type="TA">Тристан-да-Кунья</territory>
-			<territory type="TC">Тёркс тата Кайкос утравӗсем</territory>
+			<territory type="TA">Тристан-да-Куни</territory>
+			<territory type="TC">Тёркспа Кайкос утравӗсем</territory>
 			<territory type="TD">Чад</territory>
-			<territory type="TF">Франци Кӑнтӑр территорийӗсем</territory>
+			<territory type="TF">Францин Кӑнтӑр территорийӗсем</territory>
 			<territory type="TG">Того</territory>
 			<territory type="TH">Таиланд</territory>
 			<territory type="TJ">Таджикистан</territory>
 			<territory type="TK">Токелау</territory>
-			<territory type="TL">Хӗвелтухӑҫ Тимор</territory>
+			<territory type="TL">Тухӑҫ Тимор</territory>
 			<territory type="TL" alt="variant">Тимор-Лесте</territory>
 			<territory type="TM">Туркменистан</territory>
 			<territory type="TN">Тунис</territory>
 			<territory type="TO">Тонга</territory>
 			<territory type="TR">Турци</territory>
-			<territory type="TT">Тринидад тата Тобаго</territory>
+			<territory type="TT">Тринидадпа Тобаго</territory>
 			<territory type="TV">Тувалу</territory>
 			<territory type="TW">Тайвань</territory>
 			<territory type="TZ">Танзани</territory>
 			<territory type="UA">Украина</territory>
 			<territory type="UG">Уганда</territory>
-			<territory type="UM">Тулашӗнчи утравӗсем (АПШ)</territory>
-			<territory type="UN">Пӗрлешӳллӗ Нацисен Организацийӗ</territory>
-			<territory type="US">Пӗрлешӗннӗ Штатсем</territory>
+			<territory type="UM">АПШ-н тулаш пӗчӗк утравӗсем</territory>
+			<territory type="UN">Пӗрлешнӗ Нацисен Организацийӗ</territory>
+			<territory type="US">Пӗрлешнӗ Штатсем</territory>
 			<territory type="US" alt="short">АПШ</territory>
 			<territory type="UY">Уругвай</territory>
 			<territory type="UZ">Узбекистан</territory>
 			<territory type="VA">Ватикан</territory>
-			<territory type="VC">Сент-Винсент тата Гренадины</territory>
+			<territory type="VC">Сент-Винсентпа Гренада</territory>
 			<territory type="VE">Венесуэла</territory>
-			<territory type="VG">Британин Виргини утравӗсем</territory>
-			<territory type="VI">Виргини утравӗсем (АПШ)</territory>
+			<territory type="VG">Виргин утравӗсем (Британи)</territory>
+			<territory type="VI">Виргин утравӗсем (АПШ)</territory>
 			<territory type="VN">Вьетнам</territory>
 			<territory type="VU">Вануату</territory>
-			<territory type="WF">Уоллис тата Футуна</territory>
+			<territory type="WF">Уоллиспа Футуна</territory>
 			<territory type="WS">Самоа</territory>
-			<territory type="XA">псевдакцентсем</territory>
-			<territory type="XB">псевд-Bidi</territory>
+			<territory type="XA">суя акцент</territory>
+			<territory type="XB">суя биди</territory>
 			<territory type="XK">Косово</territory>
 			<territory type="YE">Йемен</territory>
 			<territory type="YT">Майотта</territory>
@@ -861,279 +877,337 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ZZ">паллӑ мар регион</territory>
 		</territories>
 		<variants>
-			<variant type="1901" draft="unconfirmed">Нимӗҫ йӑлана кӗнӗ орфографийӗ</variant>
-			<variant type="1994" draft="unconfirmed">Стандартизациленӗ резьян орфографийӗ</variant>
-			<variant type="1996" draft="unconfirmed">1996 ҫултан пуҫласа нимӗҫ орфографийӗн правилисем</variant>
-			<variant type="1606NICT" draft="unconfirmed">Француз каярахпа вӑтам ӗмӗрӗ 1606 ҫулччен</variant>
-			<variant type="1694ACAD" draft="unconfirmed">Француз ирхи çĕнĕ вăхăт</variant>
-			<variant type="1959ACAD" draft="unconfirmed">Академи</variant>
-			<variant type="ABL1943" draft="unconfirmed">1943 ҫулхи орфографийӗ</variant>
-			<variant type="AKUAPEM" draft="unconfirmed">AKUAPEM локализаци</variant>
-			<variant type="ALALC97" draft="unconfirmed">ALALC97 локализаци</variant>
-			<variant type="ALUKU" draft="unconfirmed">Алукулу диалекчӗ</variant>
-			<variant type="ANPEZO" draft="unconfirmed">ANPEZO локализаци</variant>
-			<variant type="AO1990" draft="unconfirmed">AO1990 орфографийӗ</variant>
-			<variant type="ARANES" draft="unconfirmed">ARANES локализаци</variant>
-			<variant type="ARKAIKA" draft="unconfirmed">ARKAIKA локализаци</variant>
-			<variant type="ASANTE" draft="unconfirmed">ASANTE локализаци</variant>
-			<variant type="AUVERN" draft="unconfirmed">AUVERN локализаци</variant>
-			<variant type="BAKU1926" draft="unconfirmed">Унификациленӗ тӗрӗк-латин алфавичӗ</variant>
-			<variant type="BALANKA" draft="unconfirmed">BALANKA локализаци</variant>
-			<variant type="BARLA" draft="unconfirmed">BARLA локализаци</variant>
-			<variant type="BASICENG" draft="unconfirmed">BASICENG локализаци</variant>
-			<variant type="BAUDDHA" draft="unconfirmed">BAUDDHA локализаци</variant>
-			<variant type="BCIAV" draft="unconfirmed">BCIAV локализаци</variant>
-			<variant type="BCIZBL" draft="unconfirmed">BCIZBL локализаци</variant>
-			<variant type="BISCAYAN" draft="unconfirmed">BISCAYAN локализаци</variant>
-			<variant type="BISKE" draft="unconfirmed">Сан-Гиоргио диалекчӗ</variant>
-			<variant type="BLASL" draft="unconfirmed">BLASL локализаци</variant>
-			<variant type="BOHORIC" draft="unconfirmed">Бохорич алфавичӗ</variant>
-			<variant type="BOONT" draft="unconfirmed">Бунтлинг</variant>
-			<variant type="BORNHOLM" draft="unconfirmed">BORNHOLM локализаци</variant>
-			<variant type="CISAUP" draft="unconfirmed">CISAUP локализаци</variant>
-			<variant type="COLB1945" draft="unconfirmed">COLB1945 локализаци</variant>
-			<variant type="CORNU" draft="unconfirmed">CORNU локализаци</variant>
-			<variant type="CREISS" draft="unconfirmed">CREISS локализаци</variant>
-			<variant type="DAJNKO" draft="unconfirmed">DAJNKO локализаци</variant>
-			<variant type="EKAVSK" draft="unconfirmed">EKAVSK локализаци</variant>
-			<variant type="EMODENG" draft="unconfirmed">EMODENG локализаци</variant>
-			<variant type="FASCIA" draft="unconfirmed">FASCIA локализаци</variant>
-			<variant type="FODOM" draft="unconfirmed">FODOM локализаци</variant>
-			<variant type="FONIPA" draft="unconfirmed">Тӗнчери фонетика алфавичӗ</variant>
-			<variant type="FONKIRSH" draft="unconfirmed">FONKIRSH локализаци</variant>
-			<variant type="FONNAPA" draft="unconfirmed">FONNAPA локализаци</variant>
-			<variant type="FONUPA" draft="unconfirmed">Урал чӗлхисен фонетика алфавичӗ</variant>
-			<variant type="FONXSAMP" draft="unconfirmed">FONXSAMP локализаци</variant>
-			<variant type="GALLO" draft="unconfirmed">GALLO локализаци</variant>
-			<variant type="GASCON" draft="unconfirmed">GASCON локализаци</variant>
-			<variant type="GHERD" draft="unconfirmed">GHERD локализаци</variant>
-			<variant type="GRCLASS" draft="unconfirmed">GRCLASS локализаци</variant>
-			<variant type="GRITAL" draft="unconfirmed">GRITAL локализаци</variant>
-			<variant type="GRMISTR" draft="unconfirmed">GRMISTR локализаци</variant>
-			<variant type="HEPBURN" draft="unconfirmed">HEPBURN локализаци</variant>
-			<variant type="HOGNORSK" draft="unconfirmed">HOGNORSK локализаци</variant>
-			<variant type="HSISTEMO" draft="unconfirmed">HSISTEMO локализаци</variant>
-			<variant type="IJEKAVSK" draft="unconfirmed">IJEKAVSK локализаци</variant>
-			<variant type="ITIHASA" draft="unconfirmed">ITIHASA локализаци</variant>
-			<variant type="IVANCHOV" draft="unconfirmed">IVANCHOV локализаци</variant>
-			<variant type="JAUER" draft="unconfirmed">JAUER локализаци</variant>
-			<variant type="JYUTPING" draft="unconfirmed">JYUTPING локализаци</variant>
-			<variant type="KKCOR" draft="unconfirmed">Пӗтӗмӗшле орфографийӗ</variant>
-			<variant type="KOCIEWIE" draft="unconfirmed">KOCIEWIE локализаци</variant>
-			<variant type="KSCOR" draft="unconfirmed">KSCOR локализаци</variant>
-			<variant type="LAUKIKA" draft="unconfirmed">LAUKIKA локализаци</variant>
-			<variant type="LEMOSIN" draft="unconfirmed">LEMOSIN локализаци</variant>
-			<variant type="LENGADOC" draft="unconfirmed">LENGADOC локализаци</variant>
-			<variant type="LIPAW" draft="unconfirmed">Резьян чӗлхин липовецла диалекчӗ</variant>
-			<variant type="LTG1929" draft="unconfirmed">LTG1929 локализаци</variant>
-			<variant type="LTG2007" draft="unconfirmed">LTG2007 локализаци</variant>
-			<variant type="LUNA1918" draft="unconfirmed">LUNA1918 локализаци</variant>
-			<variant type="METELKO" draft="unconfirmed">METELKO локализаци</variant>
-			<variant type="MONOTON" draft="unconfirmed">Пӗр кĕвĕллĕ</variant>
-			<variant type="NDYUKA" draft="unconfirmed">NDYUKA локализаци</variant>
-			<variant type="NEDIS" draft="unconfirmed">Надиж диалекчӗ</variant>
-			<variant type="NEWFOUND" draft="unconfirmed">NEWFOUND локализаци</variant>
-			<variant type="NICARD" draft="unconfirmed">NICARD локализаци</variant>
-			<variant type="NJIVA" draft="unconfirmed">Гнива-нжив диалекчӗ</variant>
-			<variant type="NULIK" draft="unconfirmed">NULIK локализаци</variant>
-			<variant type="OSOJS" draft="unconfirmed">Осеакла-осоянла диалект</variant>
-			<variant type="OXENDICT" draft="unconfirmed">OXENDICT локализаци</variant>
-			<variant type="PAHAWH2" draft="unconfirmed">PAHAWH2 локализаци</variant>
-			<variant type="PAHAWH3" draft="unconfirmed">PAHAWH3 локализаци</variant>
-			<variant type="PAHAWH4" draft="unconfirmed">PAHAWH4 локализаци</variant>
-			<variant type="PAMAKA" draft="unconfirmed">PAMAKA локализаци</variant>
-			<variant type="PEANO" draft="unconfirmed">PEANO локализаци</variant>
-			<variant type="PEHOEJI" draft="unconfirmed">PEHOEJI локализаци</variant>
-			<variant type="PETR1708" draft="unconfirmed">PETR1708 локализаци</variant>
-			<variant type="PINYIN" draft="unconfirmed">Пиньинь локализаци</variant>
-			<variant type="POLYTON" draft="unconfirmed">Нумай тонлӑ</variant>
-			<variant type="POSIX" draft="unconfirmed">Компьютер</variant>
-			<variant type="PROVENC" draft="unconfirmed">PROVENC локализаци</variant>
-			<variant type="PUTER" draft="unconfirmed">PUTER локализаци</variant>
-			<variant type="REVISED" draft="unconfirmed">Ҫӗнӗрен пӑхса тухнӑ орфографийӗ</variant>
-			<variant type="RIGIK" draft="unconfirmed">RIGIK локализаци</variant>
-			<variant type="ROZAJ" draft="unconfirmed">Резьян</variant>
-			<variant type="RUMGR" draft="unconfirmed">RUMGR локализаци</variant>
-			<variant type="SAAHO" draft="unconfirmed">Сахо</variant>
-			<variant type="SCOTLAND" draft="unconfirmed">Англо-шотланди</variant>
-			<variant type="SCOUSE" draft="unconfirmed">Ливерпуль</variant>
-			<variant type="SIMPLE" draft="unconfirmed">Ансат</variant>
-			<variant type="SOLBA" draft="unconfirmed">Столици-солбицки диалект</variant>
-			<variant type="SOTAV" draft="unconfirmed">SOTAV локализаци</variant>
-			<variant type="SPANGLIS" draft="unconfirmed">SPANGLIS локализаци</variant>
-			<variant type="SURMIRAN" draft="unconfirmed">SURMIRAN локализаци</variant>
-			<variant type="SURSILV" draft="unconfirmed">SURSILV локализаци</variant>
-			<variant type="SUTSILV" draft="unconfirmed">SUTSILV локализаци</variant>
-			<variant type="SYNNEJYL" draft="unconfirmed">SYNNEJYL локализаци</variant>
-			<variant type="TAILO" draft="unconfirmed">TAILO локализаци</variant>
-			<variant type="TARASK" draft="unconfirmed">Тарашкевиц</variant>
-			<variant type="TONGYONG" draft="unconfirmed">TONGYONG локализаци</variant>
-			<variant type="TUNUMIIT" draft="unconfirmed">TUNUMIIT локализаци</variant>
-			<variant type="UCCOR" draft="unconfirmed">Пӗрлешӳллӗ орфографийӗ</variant>
-			<variant type="UCRCOR" draft="unconfirmed">Пӗрлешӳллӗ ҫӗнӗрен пӑхса тухнӑ орфографийӗ</variant>
-			<variant type="ULSTER" draft="unconfirmed">ULSTER локализаци</variant>
-			<variant type="UNIFON" draft="unconfirmed">UNIFON локализаци</variant>
-			<variant type="VAIDIKA" draft="unconfirmed">VAIDIKA локализаци</variant>
-			<variant type="VALBADIA" draft="unconfirmed">VALBADIA локализаци</variant>
-			<variant type="VALENCIA" draft="unconfirmed">Валенси</variant>
-			<variant type="VALLADER" draft="unconfirmed">VALLADER локализаци</variant>
-			<variant type="VECDRUKA" draft="unconfirmed">VECDRUKA локализаци</variant>
-			<variant type="VIVARAUP" draft="unconfirmed">VIVARAUP локализаци</variant>
-			<variant type="WADEGILE" draft="unconfirmed">Уэйд – Джайлз системи</variant>
-			<variant type="XSISTEMO" draft="unconfirmed">XSISTEMO локализаци</variant>
+			<variant type="1901">Нимӗҫ йӑлана кӗнӗ орфографийӗ</variant>
+			<variant type="1994">Стандартизациленӗ резьян орфографийӗ</variant>
+			<variant type="1996">1996 ҫултан пуҫласа нимӗҫ орфографийӗн правилисем</variant>
+			<variant type="1606NICT">Француз каярахпа вӑтам ӗмӗрӗ 1606 ҫулччен</variant>
+			<variant type="1694ACAD">Француз ирхи çĕнĕ вăхăт</variant>
+			<variant type="1959ACAD">Академи</variant>
+			<variant type="ABL1943">1943 ҫулхи орфографийӗ</variant>
+			<variant type="AKUAPEM">AKUAPEM локализаци</variant>
+			<variant type="ALALC97">ALALC97 локализаци</variant>
+			<variant type="ALUKU">Алукулу диалекчӗ</variant>
+			<variant type="ANPEZO">ANPEZO локализаци</variant>
+			<variant type="AO1990">AO1990 орфографийӗ</variant>
+			<variant type="ARANES">ARANES локализаци</variant>
+			<variant type="ARKAIKA">ARKAIKA локализаци</variant>
+			<variant type="ASANTE">ASANTE локализаци</variant>
+			<variant type="AUVERN">AUVERN локализаци</variant>
+			<variant type="BAKU1926">Унификациленӗ тӗрӗк-латин алфавичӗ</variant>
+			<variant type="BALANKA">BALANKA локализаци</variant>
+			<variant type="BARLA">BARLA локализаци</variant>
+			<variant type="BASICENG">BASICENG локализаци</variant>
+			<variant type="BAUDDHA">BAUDDHA локализаци</variant>
+			<variant type="BCIAV">BCIAV локализаци</variant>
+			<variant type="BCIZBL">BCIZBL локализаци</variant>
+			<variant type="BISCAYAN">BISCAYAN локализаци</variant>
+			<variant type="BISKE">Сан-Гиоргио диалекчӗ</variant>
+			<variant type="BLASL">BLASL локализаци</variant>
+			<variant type="BOHORIC">Бохорич алфавичӗ</variant>
+			<variant type="BOONT">Бунтлинг</variant>
+			<variant type="BORNHOLM">BORNHOLM локализаци</variant>
+			<variant type="CISAUP">CISAUP локализаци</variant>
+			<variant type="COLB1945">COLB1945 локализаци</variant>
+			<variant type="CORNU">CORNU локализаци</variant>
+			<variant type="CREISS">CREISS локализаци</variant>
+			<variant type="DAJNKO">DAJNKO локализаци</variant>
+			<variant type="EKAVSK">EKAVSK локализаци</variant>
+			<variant type="EMODENG">EMODENG локализаци</variant>
+			<variant type="FASCIA">FASCIA локализаци</variant>
+			<variant type="FODOM">FODOM локализаци</variant>
+			<variant type="FONIPA">Тӗнчери фонетика алфавичӗ</variant>
+			<variant type="FONKIRSH">FONKIRSH локализаци</variant>
+			<variant type="FONNAPA">FONNAPA локализаци</variant>
+			<variant type="FONUPA">Урал чӗлхисен фонетика алфавичӗ</variant>
+			<variant type="FONXSAMP">FONXSAMP локализаци</variant>
+			<variant type="GALLO">GALLO локализаци</variant>
+			<variant type="GASCON">GASCON локализаци</variant>
+			<variant type="GHERD">GHERD локализаци</variant>
+			<variant type="GRCLASS">GRCLASS локализаци</variant>
+			<variant type="GRITAL">GRITAL локализаци</variant>
+			<variant type="GRMISTR">GRMISTR локализаци</variant>
+			<variant type="HANOI">HANOI локализаци</variant>
+			<variant type="HEPBURN">HEPBURN локализаци</variant>
+			<variant type="HOGNORSK">HOGNORSK локализаци</variant>
+			<variant type="HSISTEMO">HSISTEMO локализаци</variant>
+			<variant type="HUETT">HUETT локализаци</variant>
+			<variant type="IJEKAVSK">IJEKAVSK локализаци</variant>
+			<variant type="ITIHASA">ITIHASA локализаци</variant>
+			<variant type="IVANCHOV">IVANCHOV локализаци</variant>
+			<variant type="JAUER">JAUER локализаци</variant>
+			<variant type="JYUTPING">JYUTPING локализаци</variant>
+			<variant type="KKCOR">Пӗтӗмӗшле орфографийӗ</variant>
+			<variant type="KLEINSCH">KLEINSCH локализаци</variant>
+			<variant type="KOCIEWIE">KOCIEWIE локализаци</variant>
+			<variant type="KSCOR">KSCOR локализаци</variant>
+			<variant type="LAUKIKA">LAUKIKA локализаци</variant>
+			<variant type="LEIDENTR">LEIDENTR локализаци</variant>
+			<variant type="LEMOSIN">LEMOSIN локализаци</variant>
+			<variant type="LENGADOC">LENGADOC локализаци</variant>
+			<variant type="LIPAW">Резьян чӗлхин липовецла диалекчӗ</variant>
+			<variant type="LTG1929">LTG1929 локализаци</variant>
+			<variant type="LTG2007">LTG2007 локализаци</variant>
+			<variant type="LUNA1918">LUNA1918 локализаци</variant>
+			<variant type="MDCEGYP">MDCEGYP локализаци</variant>
+			<variant type="MDCTRANS">MDCTRANS локализаци</variant>
+			<variant type="METELKO">METELKO локализаци</variant>
+			<variant type="MONOTON">Пӗр кĕвĕллĕ</variant>
+			<variant type="NDYUKA">NDYUKA локализаци</variant>
+			<variant type="NEDIS">Надиж диалекчӗ</variant>
+			<variant type="NEWFOUND">NEWFOUND локализаци</variant>
+			<variant type="NICARD">NICARD локализаци</variant>
+			<variant type="NJIVA">Гнива-нжив диалекчӗ</variant>
+			<variant type="NULIK">NULIK локализаци</variant>
+			<variant type="OSOJS">Осеакла-осоянла диалект</variant>
+			<variant type="OXENDICT">OXENDICT локализаци</variant>
+			<variant type="PAHAWH2">PAHAWH2 локализаци</variant>
+			<variant type="PAHAWH3">PAHAWH3 локализаци</variant>
+			<variant type="PAHAWH4">PAHAWH4 локализаци</variant>
+			<variant type="PAMAKA">PAMAKA локализаци</variant>
+			<variant type="PEANO">PEANO локализаци</variant>
+			<variant type="PEHOEJI">PEHOEJI локализаци</variant>
+			<variant type="PETR1708">PETR1708 локализаци</variant>
+			<variant type="PINYIN">Пиньинь локализаци</variant>
+			<variant type="POLYTON">Нумай тонлӑ</variant>
+			<variant type="POSIX">Компьютер</variant>
+			<variant type="PROVENC">PROVENC локализаци</variant>
+			<variant type="PUTER">PUTER локализаци</variant>
+			<variant type="REVISED">Ҫӗнӗрен пӑхса тухнӑ орфографийӗ</variant>
+			<variant type="RIGIK">Классикӑлла Волапюк</variant>
+			<variant type="ROZAJ">Резьян</variant>
+			<variant type="RUMGR">RUMGR локализаци</variant>
+			<variant type="SAAHO">Сахо</variant>
+			<variant type="SAIGON">SAIGON локализаци</variant>
+			<variant type="SCOTLAND">Англо-шотланди</variant>
+			<variant type="SCOUSE">Ливерпуль</variant>
+			<variant type="SIMPLE">Ансат</variant>
+			<variant type="SOLBA">Столици-солбицки диалект</variant>
+			<variant type="SOTAV">Кабуредиан Сотавенто-диалектлӑ ушкӑнӗ</variant>
+			<variant type="SPANGLIS">SPANGLIS локализаци</variant>
+			<variant type="SURMIRAN">SURMIRAN локализаци</variant>
+			<variant type="SURSILV">SURSILV локализаци</variant>
+			<variant type="SUTSILV">SUTSILV локализаци</variant>
+			<variant type="SYNNEJYL">SYNNEJYL локализаци</variant>
+			<variant type="TAILO">TAILO локализаци</variant>
+			<variant type="TARASK">Тарашкевиц</variant>
+			<variant type="TONGYONG">TONGYONG локализаци</variant>
+			<variant type="TUNUMIIT">TUNUMIIT локализаци</variant>
+			<variant type="UCCOR">Пӗрлешӳллӗ орфографийӗ</variant>
+			<variant type="UCRCOR">Пӗрлешӳллӗ ҫӗнӗрен пӑхса тухнӑ орфографийӗ</variant>
+			<variant type="ULSTER">ULSTER локализаци</variant>
+			<variant type="UNIFON">UNIFON локализаци</variant>
+			<variant type="VAIDIKA">VAIDIKA локализаци</variant>
+			<variant type="VALBADIA">VALBADIA локализаци</variant>
+			<variant type="VALENCIA">Валенси</variant>
+			<variant type="VALLADER">VALLADER локализаци</variant>
+			<variant type="VECDRUKA">VECDRUKA локализаци</variant>
+			<variant type="VIVARAUP">VIVARAUP локализаци</variant>
+			<variant type="WADEGILE">Уэйд – Джайлз системи</variant>
+			<variant type="XSISTEMO">XSISTEMO локализаци</variant>
 		</variants>
 		<keys>
-			<key type="calendar" draft="unconfirmed">çулталăк кĕнеки</key>
-			<key type="cf" draft="unconfirmed">валюта формачӗ</key>
-			<key type="collation" draft="unconfirmed">сортировка йӗрки</key>
-			<key type="currency" draft="unconfirmed">валюта</key>
-			<key type="hc" draft="unconfirmed">вӑхӑт формачӗ (12- е 24-сехет)</key>
-			<key type="lb" draft="unconfirmed">çĕнĕ йĕркерен пуçла стилӗ</key>
-			<key type="ms" draft="unconfirmed">виҫев системи</key>
-			<key type="numbers" draft="unconfirmed">цифрисем</key>
+			<key type="calendar">календарь</key>
+			<key type="cf">валюта формачӗ</key>
+			<key type="collation">сортлав йӗрки</key>
+			<key type="currency">валюта</key>
+			<key type="em">эмодзи кӑтартӑвӗ</key>
+			<key type="hc">вӑхӑт формачӗ (12 е 24 сехетлӗ)</key>
+			<key type="lb">йӗрке куҫарӑвӗн стилӗ</key>
+			<key type="lw">сӑмах куҫарӑвӗн стилӗ</key>
+			<key type="ms">виҫе системи</key>
+			<key type="numbers">хисеп паллисем</key>
+			<key type="ss">кӗсекетӳ хыҫҫӑнхи предложени татӑлӑвӗ</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist" draft="unconfirmed">будда çулталăк кĕнеки</type>
-			<type key="calendar" type="chinese" draft="unconfirmed">китай çулталăк кĕнеки</type>
-			<type key="calendar" type="coptic" draft="unconfirmed">копт çулталăк кĕнеки</type>
-			<type key="calendar" type="dangi" draft="unconfirmed">данги çулталăк кĕнеки</type>
-			<type key="calendar" type="ethiopic" draft="unconfirmed">эфиопи çулталăк кĕнеки</type>
-			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">амете-алем эфиопи çулталăк кĕнеки</type>
+			<type key="calendar" type="buddhist">буддистсен календарӗ</type>
+			<type key="calendar" type="buddhist" scope="core">буддистсен</type>
+			<type key="calendar" type="chinese">китай календарӗ</type>
+			<type key="calendar" type="chinese" scope="core">китай</type>
+			<type key="calendar" type="coptic">копт календарӗ</type>
+			<type key="calendar" type="coptic" scope="core">копт</type>
+			<type key="calendar" type="dangi">данги календарӗ</type>
+			<type key="calendar" type="dangi" scope="core">данги</type>
+			<type key="calendar" type="ethiopic">эфиоп календарӗ</type>
+			<type key="calendar" type="ethiopic" scope="core">эфиоп</type>
+			<type key="calendar" type="ethiopic-amete-alem">эфиоп амете-алем календарӗ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">эфиоп амете-алем</type>
 			<type key="calendar" type="gregorian">грегориан календарӗ</type>
-			<type key="calendar" type="hebrew" draft="unconfirmed">еврей çулталăк кĕнеки</type>
-			<type key="calendar" type="indian" draft="unconfirmed">инди наци çулталăк кĕнеки</type>
-			<type key="calendar" type="islamic" draft="unconfirmed">хиджра çулталăк кĕнеки</type>
-			<type key="calendar" type="islamic-civil" draft="unconfirmed">хиджра граждан çулталăк кĕнеки (таблици)</type>
-			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">хиджра çулталăк кĕнеки (Сауд Аравийӗ)</type>
-			<type key="calendar" type="islamic-tbla" draft="unconfirmed">хиджра çулталăк кĕнеки (таблица, астрономи тапхӑрӗ)</type>
-			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">хиджра çулталăк кĕнеки (Умм аль-Кура)</type>
-			<type key="calendar" type="iso8601">календарӗ ISO-8601</type>
-			<type key="calendar" type="japanese" draft="unconfirmed">япони çулталăк кĕнеки</type>
-			<type key="calendar" type="persian" draft="unconfirmed">перси çулталăк кĕнеки</type>
-			<type key="calendar" type="roc" draft="unconfirmed">Миньго çулталăк кĕнеки</type>
-			<type key="cf" type="account" draft="unconfirmed">финанс формачӗ</type>
-			<type key="cf" type="standard" draft="unconfirmed">валюта стандартлӑ формачӗ</type>
-			<type key="collation" type="big5han" draft="unconfirmed">йӑлана кӗнӗ китай - big5</type>
-			<type key="collation" type="compat" draft="unconfirmed">иртнĕ сортировка йӗрки</type>
-			<type key="collation" type="dictionary" draft="unconfirmed">сортировка йӗрки словарĕ</type>
-			<type key="collation" type="ducet" draft="unconfirmed">Юникодри яланхи сортировка йӗрки</type>
-			<type key="collation" type="emoji" draft="unconfirmed">эмодзи сортировка йӗрки</type>
-			<type key="collation" type="eor" draft="unconfirmed">Европа сортировка правилисем</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">китай сортировкӑн ансат йӗрки - GB2312</type>
-			<type key="collation" type="phonebook" draft="unconfirmed">телефон кӗнекине сортировка йӗрке</type>
-			<type key="collation" type="pinyin" draft="unconfirmed">пиньинь сортировка йӗрки</type>
-			<type key="collation" type="search" draft="unconfirmed">шырани</type>
-			<type key="collation" type="searchjl" draft="unconfirmed">хангыльти пуҫламӑш килӗшӳпе шырав</type>
-			<type key="collation" type="standard">стандартлӑ сортировка</type>
-			<type key="collation" type="stroke" draft="unconfirmed">йĕр сортировка йӗрке</type>
-			<type key="collation" type="traditional" draft="unconfirmed">йӑлана кӗнӗ сортировка йӗрки</type>
-			<type key="collation" type="unihan" draft="unconfirmed">уҫҫисем тӑрӑх, унтан йӗрсем тӑрӑх сортировка</type>
-			<type key="collation" type="zhuyin" draft="unconfirmed">чжуинь сортировка йӗрки</type>
-			<type key="hc" type="h11" draft="unconfirmed">12-сехет (0-11) вӑхӑт формачӗ</type>
-			<type key="hc" type="h12" draft="unconfirmed">12-сехет (1-12) вӑхӑт формачӗ</type>
-			<type key="hc" type="h23" draft="unconfirmed">24-сехет (0-23) вӑхӑт формачӗ</type>
-			<type key="hc" type="h24" draft="unconfirmed">24-сехет (1-24) вӑхӑт формачӗ</type>
-			<type key="lb" type="loose" draft="unconfirmed">çĕнĕ йĕркерен пуçла ирӗклӗ стилӗ</type>
-			<type key="lb" type="normal" draft="unconfirmed">çĕнĕ йĕркерен пуçла яланхи стилӗ</type>
-			<type key="lb" type="strict" draft="unconfirmed">çĕнĕ йĕркерен пуçла хаяр стилӗ</type>
-			<type key="ms" type="metric" draft="unconfirmed">метрикăлла виçев пĕрчисем</type>
-			<type key="ms" type="uksystem" draft="unconfirmed">британи виҫев системи</type>
-			<type key="ms" type="ussystem" draft="unconfirmed">америка виҫев системи</type>
-			<type key="numbers" type="ahom" draft="unconfirmed">ахом цифрисем</type>
-			<type key="numbers" type="arab" draft="unconfirmed">араб-инди цифрисем</type>
-			<type key="numbers" type="arabext" draft="unconfirmed">араб-инди цифрисем анлӑ системи</type>
-			<type key="numbers" type="armn" draft="unconfirmed">армян цифрисем</type>
-			<type key="numbers" type="armnlow" draft="unconfirmed">аялти регистрти армян цифрисем</type>
-			<type key="numbers" type="bali" draft="unconfirmed">бали цифрисем</type>
-			<type key="numbers" type="beng" draft="unconfirmed">бенгали цифрисем</type>
-			<type key="numbers" type="brah" draft="unconfirmed">брахмӑллӑ цифрӑсем</type>
-			<type key="numbers" type="cakm" draft="unconfirmed">чакма цифрисем</type>
-			<type key="numbers" type="cham" draft="unconfirmed">чам цифрисем</type>
-			<type key="numbers" type="cyrl" draft="unconfirmed">çырулăхе славян цифрисем</type>
-			<type key="numbers" type="deva" draft="unconfirmed">деванагари цифрисем</type>
-			<type key="numbers" type="diak" draft="unconfirmed">дайвз акуру цифрисем</type>
-			<type key="numbers" type="ethi" draft="unconfirmed">эфиопи цифрисем</type>
-			<type key="numbers" type="fullwide" draft="unconfirmed">тулли сарлакăш цифрисем</type>
-			<type key="numbers" type="gara" draft="unconfirmed">гарай цифрисем</type>
-			<type key="numbers" type="geor" draft="unconfirmed">грузин цифрисем</type>
-			<type key="numbers" type="gong" draft="unconfirmed">гунджала гонди цифрисем</type>
-			<type key="numbers" type="gonm" draft="unconfirmed">масарам гонди цифрисем</type>
-			<type key="numbers" type="grek" draft="unconfirmed">грек цифрисем</type>
-			<type key="numbers" type="greklow" draft="unconfirmed">аялти регистрти грек цифрисем</type>
-			<type key="numbers" type="gujr" draft="unconfirmed">гуджарати цифрисем</type>
-			<type key="numbers" type="gukh" draft="unconfirmed">гурунги кхема цифрисем</type>
-			<type key="numbers" type="guru" draft="unconfirmed">гурмукхи цифрисем</type>
-			<type key="numbers" type="hanidec" draft="unconfirmed">китай вуншарлă цифрисем</type>
-			<type key="numbers" type="hans" draft="unconfirmed">китай ансат цифрисем</type>
-			<type key="numbers" type="hansfin" draft="unconfirmed">китай ансат финанс цифрисем</type>
-			<type key="numbers" type="hant" draft="unconfirmed">китай йăлана кĕнĕ цифрисем</type>
-			<type key="numbers" type="hantfin" draft="unconfirmed">китай йăлана кĕнĕ финанс цифрисем</type>
-			<type key="numbers" type="hebr" draft="unconfirmed">иврит цифрисем</type>
-			<type key="numbers" type="hmng" draft="unconfirmed">пахау цифрисем</type>
-			<type key="numbers" type="hmnp" draft="unconfirmed">наякинг пуачу хмонг цифрисем</type>
-			<type key="numbers" type="java" draft="unconfirmed">яван цифрисем</type>
-			<type key="numbers" type="jpan" draft="unconfirmed">япони цифрисем</type>
-			<type key="numbers" type="jpanfin" draft="unconfirmed">япони финанс цифрисем</type>
-			<type key="numbers" type="kali" draft="unconfirmed">кайя ли цифрисем</type>
-			<type key="numbers" type="kawi" draft="unconfirmed">кави цифрисем</type>
-			<type key="numbers" type="khmr" draft="unconfirmed">кхмер цифрисем</type>
-			<type key="numbers" type="knda" draft="unconfirmed">каннад цифрисем</type>
-			<type key="numbers" type="krai" draft="unconfirmed">кират рай цифрисем</type>
-			<type key="numbers" type="lana" draft="unconfirmed">ланна цифрисем</type>
-			<type key="numbers" type="lanatham" draft="unconfirmed">тай тхам цифрисем</type>
-			<type key="numbers" type="laoo" draft="unconfirmed">лаос цифрисем</type>
-			<type key="numbers" type="latn">хальхи араб цифрисем</type>
-			<type key="numbers" type="lepc" draft="unconfirmed">лепча цифрисем</type>
-			<type key="numbers" type="limb" draft="unconfirmed">лимб цифрисем</type>
-			<type key="numbers" type="mathbold" draft="unconfirmed">математика самăр цифрисем</type>
-			<type key="numbers" type="mathdbl" draft="unconfirmed">математика хăвăл цифрисене</type>
-			<type key="numbers" type="mathmono" draft="unconfirmed">математика цифрисем</type>
-			<type key="numbers" type="mathsanb" draft="unconfirmed">математика самăр сан-сериф цифрисем</type>
-			<type key="numbers" type="mathsans" draft="unconfirmed">математика сан-сериф цифрисем</type>
-			<type key="numbers" type="mlym" draft="unconfirmed">малаялам цифрисем</type>
-			<type key="numbers" type="modi" draft="unconfirmed">моди цифрисем</type>
-			<type key="numbers" type="mong" draft="unconfirmed">монгол цифрисем</type>
-			<type key="numbers" type="mroo" draft="unconfirmed">мро цифрисем</type>
-			<type key="numbers" type="mtei" draft="unconfirmed">манипури цифрисем</type>
-			<type key="numbers" type="mymr" draft="unconfirmed">бирман цифрисем</type>
-			<type key="numbers" type="mymrepka" draft="unconfirmed">бирман тухӑҫӗнчи пво карен цифрисем</type>
-			<type key="numbers" type="mymrpao" draft="unconfirmed">бирман пао цифрисем</type>
-			<type key="numbers" type="mymrshan" draft="unconfirmed">бирман шан цифрисем</type>
-			<type key="numbers" type="mymrtlng" draft="unconfirmed">бирман таи лаи цифрисем</type>
-			<type key="numbers" type="nagm" draft="unconfirmed">наг мундари цифрисем</type>
-			<type key="numbers" type="nkoo" draft="unconfirmed">нко цифрисем</type>
-			<type key="numbers" type="olck" draft="unconfirmed">ол-чики цифрисем</type>
-			<type key="numbers" type="onao" draft="unconfirmed">ол онал цифрисем</type>
-			<type key="numbers" type="orya" draft="unconfirmed">ория цифрисем</type>
-			<type key="numbers" type="osma" draft="unconfirmed">исмания цифрисем</type>
-			<type key="numbers" type="outlined" draft="unconfirmed">самăр цифрисем</type>
-			<type key="numbers" type="rohg" draft="unconfirmed">ханифи цифрисем</type>
-			<type key="numbers" type="roman" draft="unconfirmed">рим цифрисем</type>
-			<type key="numbers" type="romanlow" draft="unconfirmed">аялти регистрти рим цифрисем</type>
-			<type key="numbers" type="saur" draft="unconfirmed">саураштра цифрисем</type>
-			<type key="numbers" type="shrd" draft="unconfirmed">шарада цифрисем</type>
-			<type key="numbers" type="sind" draft="unconfirmed">худавади цифрисем</type>
-			<type key="numbers" type="sinh" draft="unconfirmed">синхала цифрисем</type>
-			<type key="numbers" type="sora" draft="unconfirmed">сора-сомпенг цифрисем</type>
-			<type key="numbers" type="sund" draft="unconfirmed">судан цифрисем</type>
-			<type key="numbers" type="sunu" draft="unconfirmed">сунвари цифрисем</type>
-			<type key="numbers" type="takr" draft="unconfirmed">такри цифрисем</type>
-			<type key="numbers" type="talu" draft="unconfirmed">ҫӗнӗ тай-лю цифрисем</type>
-			<type key="numbers" type="taml" draft="unconfirmed">тамильти йӑлана кӗнӗ цифрисем</type>
-			<type key="numbers" type="tamldec" draft="unconfirmed">тамиль цифрисем</type>
-			<type key="numbers" type="telu" draft="unconfirmed">телугу цифрисем</type>
-			<type key="numbers" type="thai" draft="unconfirmed">тай цифрисем</type>
-			<type key="numbers" type="tibt" draft="unconfirmed">тибет цифрисем</type>
-			<type key="numbers" type="tirh" draft="unconfirmed">тирхута цифрисем</type>
-			<type key="numbers" type="tnsa" draft="unconfirmed">тангса цифрисем</type>
-			<type key="numbers" type="vaii" draft="unconfirmed">вай цифрисем</type>
-			<type key="numbers" type="wara" draft="unconfirmed">варанг-кшити цифрисем</type>
-			<type key="numbers" type="wcho" draft="unconfirmed">ванчо цифрисем</type>
+			<type key="calendar" type="gregorian" scope="core">грегориан</type>
+			<type key="calendar" type="hebrew">еврей календарӗ</type>
+			<type key="calendar" type="hebrew" scope="core">еврей</type>
+			<type key="calendar" type="indian">Инди наци календарӗ</type>
+			<type key="calendar" type="indian" scope="core">Инди наци</type>
+			<type key="calendar" type="islamic">хиджра календарӗ</type>
+			<type key="calendar" type="islamic" scope="core">хиджра</type>
+			<type key="calendar" type="islamic-civil">хиджра календарӗ (таблицӑллӑ, граждан)</type>
+			<type key="calendar" type="islamic-civil" scope="core">хиджра (таблицӑллӑ, граждан)</type>
+			<type key="calendar" type="islamic-rgsa">хиджра календарӗ (Сауд Аравийӗ)</type>
+			<type key="calendar" type="islamic-tbla">хиджра календарӗ (таблицӑллӑ, астрономи тапхӑрӗ)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">хиджра (таблицӑллӑ, астрономи тапхӑрӗ)</type>
+			<type key="calendar" type="islamic-umalqura">хиджра календарӗ (Умм аль-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">хиджра (Умм аль-Кура)</type>
+			<type key="calendar" type="iso8601">ISO-8601 календарӗ</type>
+			<type key="calendar" type="japanese">япон календарӗ</type>
+			<type key="calendar" type="japanese" scope="core">япон</type>
+			<type key="calendar" type="persian">перс календарӗ</type>
+			<type key="calendar" type="persian" scope="core">перс</type>
+			<type key="calendar" type="roc">Миньго календарӗ</type>
+			<type key="calendar" type="roc" scope="core">Миньго</type>
+			<type key="cf" type="account">финанс формачӗ</type>
+			<type key="cf" type="account" scope="core">финанс</type>
+			<type key="cf" type="standard">стандартлӑ валюта формачӗ</type>
+			<type key="cf" type="standard" scope="core">стандартлӑ</type>
+			<type key="collation" type="compat">килӗшӳллӗ сортлав йӗрки</type>
+			<type key="collation" type="compat" scope="core">килӗшӳллӗ</type>
+			<type key="collation" type="dictionary">словарь сортлав йӗрки</type>
+			<type key="collation" type="dictionary" scope="core">словарь</type>
+			<type key="collation" type="ducet">стандартлӑ Юникод сортлав йӗрки</type>
+			<type key="collation" type="ducet" scope="core">стандартлӑ Юникод</type>
+			<type key="collation" type="emoji">эмодзи сортлав йӗрки</type>
+			<type key="collation" type="eor">европа сортлав правилисем</type>
+			<type key="collation" type="phonebook">телефон кӗнеки сортлав йӗрки</type>
+			<type key="collation" type="phonebook" scope="core">телефон кӗнеки</type>
+			<type key="collation" type="phonetic" scope="core">фонетика</type>
+			<type key="collation" type="pinyin">пиньинь сортлав йӗрки</type>
+			<type key="collation" type="pinyin" scope="core">пиньинь</type>
+			<type key="collation" type="search">шырав</type>
+			<type key="collation" type="search" scope="core">шырав</type>
+			<type key="collation" type="searchjl">хангылӗн пӗрремӗш хупӑ сас палли тӑрӑх шырав</type>
+			<type key="collation" type="standard">стандартлӑ сортлав йӗрки</type>
+			<type key="collation" type="standard" scope="core">стандартлӑ</type>
+			<type key="collation" type="stroke">йӗрсемпе сортлав йӗрки</type>
+			<type key="collation" type="stroke" scope="core">йӗрсемпе</type>
+			<type key="collation" type="traditional">йӑлана кӗнӗ сортлав йӗрки</type>
+			<type key="collation" type="traditional" scope="core">йӑлана кӗнӗ</type>
+			<type key="collation" type="unihan">уҫӑ-йӗрпе сортлав йӗрки</type>
+			<type key="collation" type="unihan" scope="core">уҫӑ-йӗрпе</type>
+			<type key="collation" type="zhuyin">чжуинь сортлав йӗрки</type>
+			<type key="collation" type="zhuyin" scope="core">чжуинь</type>
+			<type key="em" type="default" scope="core">яланхилле</type>
+			<type key="em" type="emoji" scope="core">эмодзи</type>
+			<type key="em" type="text" scope="core">текст</type>
+			<type key="hc" type="h11">12 сехетлӗ вӑхӑт формачӗ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
+			<type key="hc" type="h12">12 сехетлӗ вӑхӑт формачӗ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
+			<type key="hc" type="h23">24 сехетлӗ вӑхӑт формачӗ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
+			<type key="hc" type="h24">24 сехетлӗ вӑхӑт формачӗ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">йӗрке куҫарӑвӗн ирӗклӗ стилӗ</type>
+			<type key="lb" type="loose" scope="core">ирӗклӗ</type>
+			<type key="lb" type="normal">йӗрке куҫарӑвӗн йӗркеллӗ стилӗ</type>
+			<type key="lb" type="normal" scope="core">йӗркеллӗ</type>
+			<type key="lb" type="strict">йӗрке куҫарӑвӗн ҫирӗп стилӗ</type>
+			<type key="lb" type="strict" scope="core">ҫирӗп</type>
+			<type key="lw" type="breakall" scope="core">пурне те куҫармалла</type>
+			<type key="lw" type="keepall" scope="core">пурне те упрамалла</type>
+			<type key="lw" type="normal" scope="core">йӗркеллӗ</type>
+			<type key="lw" type="phrase" scope="core">сӑмах ҫаврӑнӑшӗсенче упрамалла</type>
+			<type key="ms" type="metric">метрла виҫе системи</type>
+			<type key="ms" type="metric" scope="core">метрла</type>
+			<type key="ms" type="uksystem">акӑлчанла виҫе системи</type>
+			<type key="ms" type="uksystem" scope="core">акӑлчанла</type>
+			<type key="ms" type="ussystem">америкӑлла виҫе системи</type>
+			<type key="ms" type="ussystem" scope="core">америкӑлла</type>
+			<type key="numbers" type="ahom">ахом хисеп паллисем</type>
+			<type key="numbers" type="arab">араб-инди хисеп паллисем</type>
+			<type key="numbers" type="arabext">анлӑ араб-инди хисеп паллисем</type>
+			<type key="numbers" type="armn">эрмен хисеп паллисем</type>
+			<type key="numbers" type="armnlow">эрмен пӗчӗк хисеп паллисем</type>
+			<type key="numbers" type="bali">бали хисеп паллисем</type>
+			<type key="numbers" type="beng">бенгал хисеп паллисем</type>
+			<type key="numbers" type="brah">брахма хисеп паллисем</type>
+			<type key="numbers" type="cakm">чакма хисеп паллисем</type>
+			<type key="numbers" type="cham">чам хисеп паллисем</type>
+			<type key="numbers" type="cyrl">кирилл хисеп паллисем</type>
+			<type key="numbers" type="deva">деванагари хисеп паллисем</type>
+			<type key="numbers" type="diak">дивехи-акуру хисеп паллисем</type>
+			<type key="numbers" type="ethi">эфиоп хисеп паллисем</type>
+			<type key="numbers" type="fullwide">тулли сарлакӑш хисеп паллисем</type>
+			<type key="numbers" type="gara">гарай хисеп паллисем</type>
+			<type key="numbers" type="geor">грузин хисеп паллисем</type>
+			<type key="numbers" type="gong">гунджала-гонди хисеп паллисем</type>
+			<type key="numbers" type="gonm">масарам-гонди хисеп паллисем</type>
+			<type key="numbers" type="grek">грек хисеп паллисем</type>
+			<type key="numbers" type="greklow">грек пӗчӗк хисеп паллисем</type>
+			<type key="numbers" type="gujr">гуджарати хисеп паллисем</type>
+			<type key="numbers" type="gukh">кхема хисеп паллисем</type>
+			<type key="numbers" type="guru">гурмукхи хисеп паллисем</type>
+			<type key="numbers" type="hanidec">китай вуншарлӑ хисеп паллисем</type>
+			<type key="numbers" type="hans">ҫӑмӑлатнӑ китай хисеп паллисем</type>
+			<type key="numbers" type="hansfin">ҫӑмӑлатнӑ китай финанс хисеп паллисем</type>
+			<type key="numbers" type="hant">йӑлана кӗнӗ китай хисеп паллисем</type>
+			<type key="numbers" type="hantfin">йӑлана кӗнӗ китай финанс хисеп паллисем</type>
+			<type key="numbers" type="hebr">иврит хисеп паллисем</type>
+			<type key="numbers" type="hmng">пахау хисеп паллисем</type>
+			<type key="numbers" type="hmnp">ньякенг-пуачуэ хисеп паллисем</type>
+			<type key="numbers" type="java">яван хисеп паллисем</type>
+			<type key="numbers" type="jpan">япон хисеп паллисем</type>
+			<type key="numbers" type="jpanfin">япон финанс хисеп паллисем</type>
+			<type key="numbers" type="kali">кая-ли хисеп паллисем</type>
+			<type key="numbers" type="kawi">кави хисеп паллисем</type>
+			<type key="numbers" type="khmr">кхмер хисеп паллисем</type>
+			<type key="numbers" type="knda">каннада хисеп паллисем</type>
+			<type key="numbers" type="krai">кират-рай хисеп паллисем</type>
+			<type key="numbers" type="lana">ланна хисеп паллисем</type>
+			<type key="numbers" type="lanatham">тхам хисеп паллисем</type>
+			<type key="numbers" type="laoo">лаос хисеп паллисем</type>
+			<type key="numbers" type="latn">хальхи араб хисеп паллисем</type>
+			<type key="numbers" type="lepc">лепча хисеп паллисем</type>
+			<type key="numbers" type="limb">лимбу хисеп паллисем</type>
+			<type key="numbers" type="mathbold">хулӑн математика хисеп паллисем</type>
+			<type key="numbers" type="mathdbl">чӗнтӗрлӗ математика хисеп паллисем</type>
+			<type key="numbers" type="mathmono">пӗр сарлакӑшлӑ математика хисеп паллисем</type>
+			<type key="numbers" type="mathsanb">гротеск математика хисеп паллисем</type>
+			<type key="numbers" type="mathsans">хулӑн гротеск математика хисеп паллисем</type>
+			<type key="numbers" type="mlym">малаялам хисеп паллисем</type>
+			<type key="numbers" type="modi">моди хисеп паллисем</type>
+			<type key="numbers" type="mong">монгол хисеп паллисем</type>
+			<type key="numbers" type="mroo">мро хисеп паллисем</type>
+			<type key="numbers" type="mtei">манипури хисеп паллисем</type>
+			<type key="numbers" type="mymr">мьянма хисеп паллисем</type>
+			<type key="numbers" type="mymrepka">тухӑҫ пво-карен мьянма хисеп паллисем</type>
+			<type key="numbers" type="mymrpao">пао мьянма хисеп паллисем</type>
+			<type key="numbers" type="mymrshan">шан мьянма хисеп паллисем</type>
+			<type key="numbers" type="mymrtlng">тай-лаи мьянма хисеп паллисем</type>
+			<type key="numbers" type="nagm">наг-мундари хисеп паллисем</type>
+			<type key="numbers" type="nkoo">нко хисеп паллисем</type>
+			<type key="numbers" type="olck">ол-чики хисеп паллисем</type>
+			<type key="numbers" type="onao">ол-онал хисеп паллисем</type>
+			<type key="numbers" type="orya">ори хисеп паллисем</type>
+			<type key="numbers" type="osma">осман хисеп паллисем</type>
+			<type key="numbers" type="outlined">ӗлкеллӗ хисеп паллисем</type>
+			<type key="numbers" type="rohg">ханифи хисеп паллисем</type>
+			<type key="numbers" type="roman">рим хисеп паллисем</type>
+			<type key="numbers" type="romanlow">рим пӗчӗк хисеп паллисем</type>
+			<type key="numbers" type="saur">саураштра хисеп паллисем</type>
+			<type key="numbers" type="shrd">шарада хисеп паллисем</type>
+			<type key="numbers" type="sind">худавади хисеп паллисем</type>
+			<type key="numbers" type="sinh">сингал хисеп паллисем</type>
+			<type key="numbers" type="sora">сора-сонпенг хисеп паллисем</type>
+			<type key="numbers" type="sund">судан хисеп паллисем</type>
+			<type key="numbers" type="sunu">сунвар хисеп паллисем</type>
+			<type key="numbers" type="takr">такри хисеп паллисем</type>
+			<type key="numbers" type="talu">ҫӗнӗ тай-ныа хисеп паллисем</type>
+			<type key="numbers" type="taml">йӑлана кӗнӗ тамил хисеп паллисем</type>
+			<type key="numbers" type="tamldec">тамил хисеп паллисем</type>
+			<type key="numbers" type="telu">телугу хисеп паллисем</type>
+			<type key="numbers" type="thai">тай хисеп паллисем</type>
+			<type key="numbers" type="tibt">тибет хисеп паллисем</type>
+			<type key="numbers" type="tirh">тирхута хисеп паллисем</type>
+			<type key="numbers" type="tnsa">тангса хисеп паллисем</type>
+			<type key="numbers" type="tols">толонг-сики хисеп паллисем</type>
+			<type key="numbers" type="vaii">ваи хисеп паллисем</type>
+			<type key="numbers" type="wara">варанг-кшити хисеп паллисем</type>
+			<type key="numbers" type="wcho">ванчо хисеп паллисем</type>
+			<type key="ss" type="none" scope="core">сӳнтернӗ</type>
+			<type key="ss" type="standard" scope="core">ҫутнӑ</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric">Метрикӑлла</measurementSystemName>
-			<measurementSystemName type="UK">Акӑлчан</measurementSystemName>
-			<measurementSystemName type="US">Америка</measurementSystemName>
+			<measurementSystemName type="metric">Метрла</measurementSystemName>
+			<measurementSystemName type="UK">Акӑлчанла</measurementSystemName>
+			<measurementSystemName type="US">Америкӑлла</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Чӗлхе: {0}</codePattern>
@@ -1146,13 +1220,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="auxiliary" draft="contributed">[{а́} {е́} {и́} {о́} {у́} {ы́} {э́} {ю́} {я́}]</exemplarCharacters>
 		<exemplarCharacters type="index">[АӐ Б В Г Д ЕӖЁ Ж З И Й К Л М Н О П Р С Ҫ Т УӲ Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]</exemplarCharacters>
 		<exemplarCharacters type="numbers" draft="contributed">[\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":" draft="contributed">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£" draft="contributed">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-" draft="contributed">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample="," draft="contributed">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1161,508 +1232,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<delimiters>
 		<quotationStart>«</quotationStart>
 		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>“</alternateQuotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
 			<calendar type="buddhist">
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">будда эра</era>
+						<era type="0">буддизм саманири</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">бэ</era>
+						<era type="0">б. с.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">бэ</era>
+						<era type="0">б. с.</era>
 					</eraNarrow>
 				</eras>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="chinese">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">кăрлач</month>
-							<month type="2" draft="unconfirmed">на­рăс</month>
-							<month type="3" draft="unconfirmed">пуш</month>
-							<month type="4" draft="unconfirmed">ака</month>
-							<month type="5" draft="unconfirmed">çу</month>
-							<month type="6" draft="unconfirmed">çĕртме</month>
-							<month type="7" draft="unconfirmed">утă</month>
-							<month type="8" draft="unconfirmed">çурла</month>
-							<month type="9" draft="unconfirmed">авăн</month>
-							<month type="10" draft="unconfirmed">юпа</month>
-							<month type="11" draft="unconfirmed">чÿк</month>
-							<month type="12" draft="unconfirmed">раштав</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">тот</month>
-							<month type="2" draft="unconfirmed">бабэ</month>
-							<month type="3" draft="unconfirmed">хатур</month>
-							<month type="4" draft="unconfirmed">кихак</month>
-							<month type="5" draft="unconfirmed">тубэ</month>
-							<month type="6" draft="unconfirmed">амшир</month>
-							<month type="7" draft="unconfirmed">барамхат</month>
-							<month type="8" draft="unconfirmed">бармуда</month>
-							<month type="9" draft="unconfirmed">башнас</month>
-							<month type="10" draft="unconfirmed">бауна</month>
-							<month type="11" draft="unconfirmed">абиб</month>
-							<month type="12" draft="unconfirmed">мисра</month>
-							<month type="13" draft="unconfirmed">наси</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">тот</month>
-							<month type="2" draft="unconfirmed">бабэ</month>
-							<month type="3" draft="unconfirmed">хатур</month>
-							<month type="4" draft="unconfirmed">кихак</month>
-							<month type="5" draft="unconfirmed">тубэ</month>
-							<month type="6" draft="unconfirmed">амшир</month>
-							<month type="7" draft="unconfirmed">барамхат</month>
-							<month type="8" draft="unconfirmed">бармуда</month>
-							<month type="9" draft="unconfirmed">башнас</month>
-							<month type="10" draft="unconfirmed">бауна</month>
-							<month type="11" draft="unconfirmed">абиб</month>
-							<month type="12" draft="unconfirmed">мисра</month>
-							<month type="13" draft="unconfirmed">наси</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">тот</month>
-							<month type="2" draft="unconfirmed">бабэ</month>
-							<month type="3" draft="unconfirmed">хатур</month>
-							<month type="4" draft="unconfirmed">кихак</month>
-							<month type="5" draft="unconfirmed">тубэ</month>
-							<month type="6" draft="unconfirmed">амшир</month>
-							<month type="7" draft="unconfirmed">барамхат</month>
-							<month type="8" draft="unconfirmed">бармуда</month>
-							<month type="9" draft="unconfirmed">башнас</month>
-							<month type="10" draft="unconfirmed">бауна</month>
-							<month type="11" draft="unconfirmed">абиб</month>
-							<month type="12" draft="unconfirmed">мисра</month>
-							<month type="13" draft="unconfirmed">наси</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">тот</month>
-							<month type="2" draft="unconfirmed">бабэ</month>
-							<month type="3" draft="unconfirmed">хатур</month>
-							<month type="4" draft="unconfirmed">кихак</month>
-							<month type="5" draft="unconfirmed">тубэ</month>
-							<month type="6" draft="unconfirmed">амшир</month>
-							<month type="7" draft="unconfirmed">барамхат</month>
-							<month type="8" draft="unconfirmed">бармуда</month>
-							<month type="9" draft="unconfirmed">башнас</month>
-							<month type="10" draft="unconfirmed">бауна</month>
-							<month type="11" draft="unconfirmed">абиб</month>
-							<month type="12" draft="unconfirmed">мисра</month>
-							<month type="13" draft="unconfirmed">наси</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="unconfirmed">Диоклетиан ҫитиччен</era>
-						<era type="1" draft="unconfirmed">Диоклетиан хыҫҫӑн</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="unconfirmed">Диокл.ҫтчн</era>
-						<era type="1" draft="unconfirmed">Диокл.хҫн</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="unconfirmed">Дкл.ҫтчн</era>
-						<era type="1" draft="unconfirmed">Дкл.хҫн</era>
-					</eraNarrow>
-				</eras>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="dangi">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">кăрлач</month>
-							<month type="2" draft="unconfirmed">на­рăс</month>
-							<month type="3" draft="unconfirmed">пуш</month>
-							<month type="4" draft="unconfirmed">ака</month>
-							<month type="5" draft="unconfirmed">çу</month>
-							<month type="6" draft="unconfirmed">çĕртме</month>
-							<month type="7" draft="unconfirmed">утă</month>
-							<month type="8" draft="unconfirmed">çурла</month>
-							<month type="9" draft="unconfirmed">авăн</month>
-							<month type="10" draft="unconfirmed">юпа</month>
-							<month type="11" draft="unconfirmed">чÿк</month>
-							<month type="12" draft="unconfirmed">раштав</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<cyclicNameSets>
-					<cyclicNameSet type="solarTerms">
-						<cyclicNameContext type="format">
-							<cyclicNameWidth type="abbreviated">
-								<cyclicName type="1" draft="unconfirmed">ҫуркунне пуҫланать</cyclicName>
-								<cyclicName type="2" draft="unconfirmed">ҫумӑр шывӗ</cyclicName>
-								<cyclicName type="3" draft="unconfirmed">хурт-кӑпшанкӑ вӑранать</cyclicName>
-								<cyclicName type="4" draft="unconfirmed">çурхи кунпа çĕр танлашăвĕ</cyclicName>
-								<cyclicName type="5" draft="unconfirmed">йăлтăр та янкӑр уяр</cyclicName>
-								<cyclicName type="6" draft="unconfirmed">тӗштырӑ ҫумӑр</cyclicName>
-								<cyclicName type="7" draft="unconfirmed">ҫу пуҫланать</cyclicName>
-								<cyclicName type="8" draft="unconfirmed">тулли тырӑ</cyclicName>
-								<cyclicName type="9" draft="unconfirmed">пучахри тырӑ</cyclicName>
-								<cyclicName type="10" draft="unconfirmed">кун таврӑнни</cyclicName>
-								<cyclicName type="11" draft="unconfirmed">лĕп ăшă</cyclicName>
-								<cyclicName type="12" draft="unconfirmed">шăрăх</cyclicName>
-								<cyclicName type="13" draft="unconfirmed">кӗркунне пуҫланать</cyclicName>
-								<cyclicName type="14" draft="unconfirmed">шӑрӑх вӗҫленни</cyclicName>
-								<cyclicName type="15" draft="unconfirmed">шурӑ сывлӑм</cyclicName>
-								<cyclicName type="16" draft="unconfirmed">кӗркунне кунпа ҫӗр танлашни</cyclicName>
-								<cyclicName type="17" draft="unconfirmed">сивӗ сывлӑм</cyclicName>
-								<cyclicName type="18" draft="unconfirmed">сивӗтет</cyclicName>
-								<cyclicName type="19" draft="unconfirmed">хӗл пуҫланать</cyclicName>
-								<cyclicName type="20" draft="unconfirmed">юр ҫуни</cyclicName>
-								<cyclicName type="21" draft="unconfirmed">вӑйлӑ юр ҫӑвать</cyclicName>
-								<cyclicName type="22" draft="unconfirmed">кун хутшӑнни</cyclicName>
-								<cyclicName type="23" draft="unconfirmed">вӑйсӑр сивӗ</cyclicName>
-								<cyclicName type="24" draft="unconfirmed">хаяр сивĕ</cyclicName>
-							</cyclicNameWidth>
-							<cyclicNameWidth type="narrow">
-								<cyclicName type="1" draft="unconfirmed">ҫуркунне пуҫланать</cyclicName>
-								<cyclicName type="2" draft="unconfirmed">ҫумӑр шывӗ</cyclicName>
-								<cyclicName type="3" draft="unconfirmed">хурт-кӑпшанкӑ вӑранать</cyclicName>
-								<cyclicName type="4" draft="unconfirmed">çурхи кунпа çĕр танлашăвĕ</cyclicName>
-								<cyclicName type="5" draft="unconfirmed">йăлтăр та янкӑр уяр</cyclicName>
-								<cyclicName type="6" draft="unconfirmed">тӗштырӑ ҫумӑр</cyclicName>
-								<cyclicName type="7" draft="unconfirmed">ҫу пуҫланать</cyclicName>
-								<cyclicName type="8" draft="unconfirmed">тулли тырӑ</cyclicName>
-								<cyclicName type="9" draft="unconfirmed">пучахри тырӑ</cyclicName>
-								<cyclicName type="10" draft="unconfirmed">кун таврӑнни</cyclicName>
-								<cyclicName type="11" draft="unconfirmed">лĕп ăшă</cyclicName>
-								<cyclicName type="12" draft="unconfirmed">шăрăх</cyclicName>
-								<cyclicName type="13" draft="unconfirmed">кӗркунне пуҫланать</cyclicName>
-								<cyclicName type="14" draft="unconfirmed">шӑрӑх вӗҫленни</cyclicName>
-								<cyclicName type="15" draft="unconfirmed">шурӑ сывлӑм</cyclicName>
-								<cyclicName type="16" draft="unconfirmed">кӗркунне кунпа ҫӗр танлашни</cyclicName>
-								<cyclicName type="17" draft="unconfirmed">сивӗ сывлӑм</cyclicName>
-								<cyclicName type="18" draft="unconfirmed">сивӗтет</cyclicName>
-								<cyclicName type="19" draft="unconfirmed">хӗл пуҫланать</cyclicName>
-								<cyclicName type="20" draft="unconfirmed">юр ҫуни</cyclicName>
-								<cyclicName type="21" draft="unconfirmed">вӑйлӑ юр ҫӑвать</cyclicName>
-								<cyclicName type="22" draft="unconfirmed">кун хутшӑнни</cyclicName>
-								<cyclicName type="23" draft="unconfirmed">вӑйсӑр сивӗ</cyclicName>
-								<cyclicName type="24" draft="unconfirmed">хаяр сивĕ</cyclicName>
-							</cyclicNameWidth>
-							<cyclicNameWidth type="wide">
-								<cyclicName type="1" draft="unconfirmed">ҫуркунне пуҫланать</cyclicName>
-								<cyclicName type="2" draft="unconfirmed">ҫумӑр шывӗ</cyclicName>
-								<cyclicName type="3" draft="unconfirmed">хурт-кӑпшанкӑ вӑранать</cyclicName>
-								<cyclicName type="4" draft="unconfirmed">çурхи кунпа çĕр танлашăвĕ</cyclicName>
-								<cyclicName type="5" draft="unconfirmed">йăлтăр та янкӑр уяр</cyclicName>
-								<cyclicName type="6" draft="unconfirmed">тӗштырӑ ҫумӑр</cyclicName>
-								<cyclicName type="7" draft="unconfirmed">ҫу пуҫланать</cyclicName>
-								<cyclicName type="8" draft="unconfirmed">тулли тырӑ</cyclicName>
-								<cyclicName type="9" draft="unconfirmed">пучахри тырӑ</cyclicName>
-								<cyclicName type="10" draft="unconfirmed">кун таврӑнни</cyclicName>
-								<cyclicName type="11" draft="unconfirmed">лĕп ăшă</cyclicName>
-								<cyclicName type="12" draft="unconfirmed">шăрăх</cyclicName>
-								<cyclicName type="13" draft="unconfirmed">кӗркунне пуҫланать</cyclicName>
-								<cyclicName type="14" draft="unconfirmed">шӑрӑх вӗҫленни</cyclicName>
-								<cyclicName type="15" draft="unconfirmed">шурӑ сывлӑм</cyclicName>
-								<cyclicName type="16" draft="unconfirmed">кӗркунне кунпа ҫӗр танлашни</cyclicName>
-								<cyclicName type="17" draft="unconfirmed">сивӗ сывлӑм</cyclicName>
-								<cyclicName type="18" draft="unconfirmed">сивӗтет</cyclicName>
-								<cyclicName type="19" draft="unconfirmed">хӗл пуҫланать</cyclicName>
-								<cyclicName type="20" draft="unconfirmed">юр ҫуни</cyclicName>
-								<cyclicName type="21" draft="unconfirmed">вӑйлӑ юр ҫӑвать</cyclicName>
-								<cyclicName type="22" draft="unconfirmed">кун хутшӑнни</cyclicName>
-								<cyclicName type="23" draft="unconfirmed">вӑйсӑр сивӗ</cyclicName>
-								<cyclicName type="24" draft="unconfirmed">хаяр сивĕ</cyclicName>
-							</cyclicNameWidth>
-						</cyclicNameContext>
-					</cyclicNameSet>
-				</cyclicNameSets>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">мескерем</month>
-							<month type="2" draft="unconfirmed">текемт</month>
-							<month type="3" draft="unconfirmed">хедар</month>
-							<month type="4" draft="unconfirmed">тахсас</month>
-							<month type="5" draft="unconfirmed">тер</month>
-							<month type="6" draft="unconfirmed">якатит</month>
-							<month type="7" draft="unconfirmed">магабит</month>
-							<month type="8" draft="unconfirmed">миазия</month>
-							<month type="9" draft="unconfirmed">генбот</month>
-							<month type="10" draft="unconfirmed">сэнэ</month>
-							<month type="11" draft="unconfirmed">хамлэ</month>
-							<month type="12" draft="unconfirmed">нахасэ</month>
-							<month type="13" draft="unconfirmed">эпагомен</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">мескерем</month>
-							<month type="2" draft="unconfirmed">текемт</month>
-							<month type="3" draft="unconfirmed">хедар</month>
-							<month type="4" draft="unconfirmed">тахсас</month>
-							<month type="5" draft="unconfirmed">тер</month>
-							<month type="6" draft="unconfirmed">якатит</month>
-							<month type="7" draft="unconfirmed">магабит</month>
-							<month type="8" draft="unconfirmed">миазия</month>
-							<month type="9" draft="unconfirmed">генбот</month>
-							<month type="10" draft="unconfirmed">сэнэ</month>
-							<month type="11" draft="unconfirmed">хамлэ</month>
-							<month type="12" draft="unconfirmed">нахасэ</month>
-							<month type="13" draft="unconfirmed">эпагомен</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">мескерем</month>
-							<month type="2" draft="unconfirmed">текемт</month>
-							<month type="3" draft="unconfirmed">хедар</month>
-							<month type="4" draft="unconfirmed">тахсас</month>
-							<month type="5" draft="unconfirmed">тер</month>
-							<month type="6" draft="unconfirmed">якатит</month>
-							<month type="7" draft="unconfirmed">магабит</month>
-							<month type="8" draft="unconfirmed">миазия</month>
-							<month type="9" draft="unconfirmed">генбот</month>
-							<month type="10" draft="unconfirmed">сэнэ</month>
-							<month type="11" draft="unconfirmed">хамлэ</month>
-							<month type="12" draft="unconfirmed">нахасэ</month>
-							<month type="13" draft="unconfirmed">эпагомен</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">мескерем</month>
-							<month type="2" draft="unconfirmed">текемт</month>
-							<month type="3" draft="unconfirmed">хедар</month>
-							<month type="4" draft="unconfirmed">тахсас</month>
-							<month type="5" draft="unconfirmed">тер</month>
-							<month type="6" draft="unconfirmed">якатит</month>
-							<month type="7" draft="unconfirmed">магабит</month>
-							<month type="8" draft="unconfirmed">миазия</month>
-							<month type="9" draft="unconfirmed">генбот</month>
-							<month type="10" draft="unconfirmed">сэнэ</month>
-							<month type="11" draft="unconfirmed">хамлэ</month>
-							<month type="12" draft="unconfirmed">нахасэ</month>
-							<month type="13" draft="unconfirmed">эпагомен</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="unconfirmed">пирĕн эрăчченхи (Христус пурнăçланничен)</era>
-						<era type="1" draft="unconfirmed">пирĕн самана</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="unconfirmed">прн.эрчнх.</era>
-						<era type="1" draft="unconfirmed">прн.смн.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="unconfirmed">прн.эрчнх.</era>
-						<era type="1" draft="unconfirmed">прн.смн.</era>
-					</eraNarrow>
-				</eras>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y 'ҫ'. G</pattern>
+							<pattern>G y, MMMM, d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>d MMMM y 'ҫ'. G</pattern>
+							<pattern>G y, MMMM, d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d MMM y 'ҫ'. G</pattern>
+							<pattern>G y, MMM, d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd.MM.y G</pattern>
+							<pattern>G y.MM.dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1688,125 +1293,2931 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed">E, d</dateFormatItem>
-						<dateFormatItem id="Ehm">ccc, h:mm a</dateFormatItem>
-						<dateFormatItem id="EHm">ccc HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">ccc, h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="EHms">ccc HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">LLL y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="Md">dd.MM</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">ccc, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="y">y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyy">y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyyM">MM.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMd">dd.MM.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, dd.MM.y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">LLL y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">d MMM y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">E, d MMM y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">LLLL y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQ y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y 'ҫ'. G</dateFormatItem>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">y 'ҫ'. G – y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">y–y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">MM.y G – MM.y G</greatestDifference>
-							<greatestDifference id="M">MM.y – MM.y G</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y G</greatestDifference>
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="G">dd.MM.y G – dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="G">ccc, dd.MM.y G – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">LLL y 'ҫ'. G – LLL y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">LLL – LLL y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">d–d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="G">d MMM y 'ҫ'. G – d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="G">ccc, d MMM y 'ҫ'. G – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">ccc, d MMM y – ccc, d MMM y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">1-мӗш уйӑх</month>
+							<month type="2">2-мӗш уйӑх</month>
+							<month type="3">3-мӗш уйӑх</month>
+							<month type="4">4-мӗш уйӑх</month>
+							<month type="5">5-мӗш уйӑх</month>
+							<month type="6">6-мӗш уйӑх</month>
+							<month type="7">7-мӗш уйӑх</month>
+							<month type="8">8-мӗш уйӑх</month>
+							<month type="9">9-мӗш уйӑх</month>
+							<month type="10">10-мӗш уйӑх</month>
+							<month type="11">11-мӗш уйӑх</month>
+							<month type="12">12-мӗш уйӑх</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">пӗрремӗш уйӑх</month>
+							<month type="2">иккӗмӗш уйӑх</month>
+							<month type="3">виҫҫӗмӗш уйӑх</month>
+							<month type="4">тӑваттӑмӗш уйӑх</month>
+							<month type="5">пиллӗкмӗш уйӑх</month>
+							<month type="6">улттӑмӗш уйӑх</month>
+							<month type="7">ҫиччӗмӗш уйӑх</month>
+							<month type="8">саккӑрмӗш уйӑх</month>
+							<month type="9">тӑххӑрмӗш уйӑх</month>
+							<month type="10">вуннӑмӗш уйӑх</month>
+							<month type="11">вун пӗрмӗш уйӑх</month>
+							<month type="12">вун иккӗмӗш уйӑх</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">1-мӗш уйӑх</month>
+							<month type="2">2-мӗш уйӑх</month>
+							<month type="3">3-мӗш уйӑх</month>
+							<month type="4">4-мӗш уйӑх</month>
+							<month type="5">5-мӗш уйӑх</month>
+							<month type="6">6-мӗш уйӑх</month>
+							<month type="7">7-мӗш уйӑх</month>
+							<month type="8">8-мӗш уйӑх</month>
+							<month type="9">9-мӗш уйӑх</month>
+							<month type="10">10-мӗш уйӑх</month>
+							<month type="11">11-мӗш уйӑх</month>
+							<month type="12">12-мӗш уйӑх</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">пӗрремӗш уйӑх</month>
+							<month type="2">иккӗмӗш уйӑх</month>
+							<month type="3">виҫҫӗмӗш уйӑх</month>
+							<month type="4">тӑваттӑмӗш уйӑх</month>
+							<month type="5">пиллӗкмӗш уйӑх</month>
+							<month type="6">улттӑмӗш уйӑх</month>
+							<month type="7">ҫиччӗмӗш уйӑх</month>
+							<month type="8">саккӑрмӗш уйӑх</month>
+							<month type="9">тӑххӑрмӗш уйӑх</month>
+							<month type="10">вуннӑмӗш уйӑх</month>
+							<month type="11">вун пӗрмӗш уйӑх</month>
+							<month type="12">вун иккӗмӗш уйӑх</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<monthPatterns>
+					<monthPatternContext type="format">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="numeric">
+						<monthPatternWidth type="all">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="stand-alone">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+				</monthPatterns>
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">цзы</cyclicName>
+								<cyclicName type="2">чоу</cyclicName>
+								<cyclicName type="3">инь</cyclicName>
+								<cyclicName type="4">мао</cyclicName>
+								<cyclicName type="5">чэнь</cyclicName>
+								<cyclicName type="6">сы</cyclicName>
+								<cyclicName type="7">у</cyclicName>
+								<cyclicName type="8">вэй</cyclicName>
+								<cyclicName type="9">шэнь</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">сюй</cyclicName>
+								<cyclicName type="12">хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">цзы</cyclicName>
+								<cyclicName type="2">чоу</cyclicName>
+								<cyclicName type="3">инь</cyclicName>
+								<cyclicName type="4">мао</cyclicName>
+								<cyclicName type="5">чэнь</cyclicName>
+								<cyclicName type="6">сы</cyclicName>
+								<cyclicName type="7">у</cyclicName>
+								<cyclicName type="8">вэй</cyclicName>
+								<cyclicName type="9">шэнь</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">сюй</cyclicName>
+								<cyclicName type="12">хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">цзы</cyclicName>
+								<cyclicName type="2">чоу</cyclicName>
+								<cyclicName type="3">инь</cyclicName>
+								<cyclicName type="4">мао</cyclicName>
+								<cyclicName type="5">чэнь</cyclicName>
+								<cyclicName type="6">сы</cyclicName>
+								<cyclicName type="7">у</cyclicName>
+								<cyclicName type="8">вэй</cyclicName>
+								<cyclicName type="9">шэнь</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">сюй</cyclicName>
+								<cyclicName type="12">хай</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="days">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="months">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">личунь</cyclicName>
+								<cyclicName type="2">юйшуй</cyclicName>
+								<cyclicName type="3">цзинчжэ</cyclicName>
+								<cyclicName type="4">чуньфэнь</cyclicName>
+								<cyclicName type="5">цинмин</cyclicName>
+								<cyclicName type="6">гуюй</cyclicName>
+								<cyclicName type="7">лися</cyclicName>
+								<cyclicName type="8">сяомань</cyclicName>
+								<cyclicName type="9">манчжун</cyclicName>
+								<cyclicName type="10">сячжи</cyclicName>
+								<cyclicName type="11">сяошу</cyclicName>
+								<cyclicName type="12">дашу</cyclicName>
+								<cyclicName type="13">лицю</cyclicName>
+								<cyclicName type="14">чушу</cyclicName>
+								<cyclicName type="15">байлу</cyclicName>
+								<cyclicName type="16">цюфэнь</cyclicName>
+								<cyclicName type="17">ханьлу</cyclicName>
+								<cyclicName type="18">шуанцзян</cyclicName>
+								<cyclicName type="19">лидун</cyclicName>
+								<cyclicName type="20">сяосюэ</cyclicName>
+								<cyclicName type="21">дасюэ</cyclicName>
+								<cyclicName type="22">дунчжи</cyclicName>
+								<cyclicName type="23">сяохань</cyclicName>
+								<cyclicName type="24">дахань</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">личунь</cyclicName>
+								<cyclicName type="2">юйшуй</cyclicName>
+								<cyclicName type="3">цзинчжэ</cyclicName>
+								<cyclicName type="4">чуньфэнь</cyclicName>
+								<cyclicName type="5">цинмин</cyclicName>
+								<cyclicName type="6">гуюй</cyclicName>
+								<cyclicName type="7">лися</cyclicName>
+								<cyclicName type="8">сяомань</cyclicName>
+								<cyclicName type="9">манчжун</cyclicName>
+								<cyclicName type="10">сячжи</cyclicName>
+								<cyclicName type="11">сяошу</cyclicName>
+								<cyclicName type="12">дашу</cyclicName>
+								<cyclicName type="13">лицю</cyclicName>
+								<cyclicName type="14">чушу</cyclicName>
+								<cyclicName type="15">байлу</cyclicName>
+								<cyclicName type="16">цюфэнь</cyclicName>
+								<cyclicName type="17">ханьлу</cyclicName>
+								<cyclicName type="18">шуанцзян</cyclicName>
+								<cyclicName type="19">лидун</cyclicName>
+								<cyclicName type="20">сяосюэ</cyclicName>
+								<cyclicName type="21">дасюэ</cyclicName>
+								<cyclicName type="22">дунчжи</cyclicName>
+								<cyclicName type="23">сяохань</cyclicName>
+								<cyclicName type="24">дахань</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">личунь</cyclicName>
+								<cyclicName type="2">юйшуй</cyclicName>
+								<cyclicName type="3">цзинчжэ</cyclicName>
+								<cyclicName type="4">чуньфэнь</cyclicName>
+								<cyclicName type="5">цинмин</cyclicName>
+								<cyclicName type="6">гуюй</cyclicName>
+								<cyclicName type="7">лися</cyclicName>
+								<cyclicName type="8">сяомань</cyclicName>
+								<cyclicName type="9">манчжун</cyclicName>
+								<cyclicName type="10">сячжи</cyclicName>
+								<cyclicName type="11">сяошу</cyclicName>
+								<cyclicName type="12">дашу</cyclicName>
+								<cyclicName type="13">лицю</cyclicName>
+								<cyclicName type="14">чушу</cyclicName>
+								<cyclicName type="15">байлу</cyclicName>
+								<cyclicName type="16">цюфэнь</cyclicName>
+								<cyclicName type="17">ханьлу</cyclicName>
+								<cyclicName type="18">шуанцзян</cyclicName>
+								<cyclicName type="19">лидун</cyclicName>
+								<cyclicName type="20">сяосюэ</cyclicName>
+								<cyclicName type="21">дасюэ</cyclicName>
+								<cyclicName type="22">дунчжи</cyclicName>
+								<cyclicName type="23">сяохань</cyclicName>
+								<cyclicName type="24">дахань</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">цзя-цзы</cyclicName>
+								<cyclicName type="2">и-чоу</cyclicName>
+								<cyclicName type="3">бин-инь</cyclicName>
+								<cyclicName type="4">дин-мао</cyclicName>
+								<cyclicName type="5">у-чэнь</cyclicName>
+								<cyclicName type="6">цзи-сы</cyclicName>
+								<cyclicName type="7">гэн-у</cyclicName>
+								<cyclicName type="8">синь-вэй</cyclicName>
+								<cyclicName type="9">жэнь-шэнь</cyclicName>
+								<cyclicName type="10">гуй-ю</cyclicName>
+								<cyclicName type="11">цзя-сюй</cyclicName>
+								<cyclicName type="12">и-хай</cyclicName>
+								<cyclicName type="13">бин-цзы</cyclicName>
+								<cyclicName type="14">дин-чоу</cyclicName>
+								<cyclicName type="15">у-инь</cyclicName>
+								<cyclicName type="16">цзи-мао</cyclicName>
+								<cyclicName type="17">гэн-чэнь</cyclicName>
+								<cyclicName type="18">синь-сы</cyclicName>
+								<cyclicName type="19">жэнь-у</cyclicName>
+								<cyclicName type="20">гуй-вэй</cyclicName>
+								<cyclicName type="21">цзя-шэнь</cyclicName>
+								<cyclicName type="22">и-ю</cyclicName>
+								<cyclicName type="23">бин-сюй</cyclicName>
+								<cyclicName type="24">дин-хай</cyclicName>
+								<cyclicName type="25">у-цзы</cyclicName>
+								<cyclicName type="26">цзи-чоу</cyclicName>
+								<cyclicName type="27">гэн-инь</cyclicName>
+								<cyclicName type="28">синь-мао</cyclicName>
+								<cyclicName type="29">жэнь-чэнь</cyclicName>
+								<cyclicName type="30">гуй-сы</cyclicName>
+								<cyclicName type="31">цзя-у</cyclicName>
+								<cyclicName type="32">и-вэй</cyclicName>
+								<cyclicName type="33">бин-шэнь</cyclicName>
+								<cyclicName type="34">дин-ю</cyclicName>
+								<cyclicName type="35">у-сюй</cyclicName>
+								<cyclicName type="36">цзи-хай</cyclicName>
+								<cyclicName type="37">гэн-цзы</cyclicName>
+								<cyclicName type="38">синь-чоу</cyclicName>
+								<cyclicName type="39">жэнь-инь</cyclicName>
+								<cyclicName type="40">гуй-мао</cyclicName>
+								<cyclicName type="41">цзя-чэнь</cyclicName>
+								<cyclicName type="42">и-сы</cyclicName>
+								<cyclicName type="43">бин-у</cyclicName>
+								<cyclicName type="44">дин-вэй</cyclicName>
+								<cyclicName type="45">у-шэнь</cyclicName>
+								<cyclicName type="46">цзи-ю</cyclicName>
+								<cyclicName type="47">гэн-сюй</cyclicName>
+								<cyclicName type="48">синь-хай</cyclicName>
+								<cyclicName type="49">жэнь-цзы</cyclicName>
+								<cyclicName type="50">гуй-чоу</cyclicName>
+								<cyclicName type="51">цзя-инь</cyclicName>
+								<cyclicName type="52">и-мао</cyclicName>
+								<cyclicName type="53">бин-чэнь</cyclicName>
+								<cyclicName type="54">дин-сы</cyclicName>
+								<cyclicName type="55">у-у</cyclicName>
+								<cyclicName type="56">цзи-вэй</cyclicName>
+								<cyclicName type="57">гэн-шэнь</cyclicName>
+								<cyclicName type="58">синь-ю</cyclicName>
+								<cyclicName type="59">жэнь-сюй</cyclicName>
+								<cyclicName type="60">гуй-хай</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">цзы</cyclicName>
+								<cyclicName type="2">чоу</cyclicName>
+								<cyclicName type="3">инь</cyclicName>
+								<cyclicName type="4">мао</cyclicName>
+								<cyclicName type="5">чэнь</cyclicName>
+								<cyclicName type="6">сы</cyclicName>
+								<cyclicName type="7">у</cyclicName>
+								<cyclicName type="8">вэй</cyclicName>
+								<cyclicName type="9">шэнь</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">сюй</cyclicName>
+								<cyclicName type="12">хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">цзы</cyclicName>
+								<cyclicName type="2">чоу</cyclicName>
+								<cyclicName type="3">инь</cyclicName>
+								<cyclicName type="4">мао</cyclicName>
+								<cyclicName type="5">чэнь</cyclicName>
+								<cyclicName type="6">сы</cyclicName>
+								<cyclicName type="7">у</cyclicName>
+								<cyclicName type="8">вэй</cyclicName>
+								<cyclicName type="9">шэнь</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">сюй</cyclicName>
+								<cyclicName type="12">хай</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">цзы</cyclicName>
+								<cyclicName type="2">чоу</cyclicName>
+								<cyclicName type="3">инь</cyclicName>
+								<cyclicName type="4">мао</cyclicName>
+								<cyclicName type="5">чэнь</cyclicName>
+								<cyclicName type="6">сы</cyclicName>
+								<cyclicName type="7">у</cyclicName>
+								<cyclicName type="8">вэй</cyclicName>
+								<cyclicName type="9">шэнь</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">сюй</cyclicName>
+								<cyclicName type="12">хай</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>r (U), MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>r (U), MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>r, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>r.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
+						<dateFormatItem id="EBhm">E, B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">E, B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">r (U)</dateFormatItem>
+						<dateFormatItem id="GyMMM">r, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">r, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">r, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="GyMMMM">r (U), MMMM</dateFormatItem>
+						<dateFormatItem id="GyMMMMd">r (U), MMMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMMEd">r (U), MMMM, d, E</dateFormatItem>
+						<dateFormatItem id="h">a h</dateFormatItem>
+						<dateFormatItem id="H">HH 'сех'</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">a h (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'сех' (v)</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="UM">U, MM</dateFormatItem>
+						<dateFormatItem id="UMd">U, MM.dd</dateFormatItem>
+						<dateFormatItem id="UMMM">U, MMM</dateFormatItem>
+						<dateFormatItem id="UMMMd">U, MMM, d</dateFormatItem>
+						<dateFormatItem id="y">r (U)</dateFormatItem>
+						<dateFormatItem id="yyyy">r (U)</dateFormatItem>
+						<dateFormatItem id="yyyyM">r.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">r.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">r.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">r, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">r, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">r, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">r (U), MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMd">r (U), MMMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMEd">r (U), MMMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">r (U), QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">r (U), QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM</greatestDifference>
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="y">U – U</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.y – MM.y G</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y G</greatestDifference>
+							<greatestDifference id="M">y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">y.MM – y.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">y.MM.dd – y.MM.dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">LLL y 'ҫ'. – LLL y 'ҫ'. G</greatestDifference>
+							<greatestDifference id="M">U, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">U, MMM – U, MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">d MMM y 'ҫ'. – d MMM y 'ҫ'. G</greatestDifference>
+							<greatestDifference id="d">U, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">U, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">U, MMM, d – U, MMM, d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">ccc, d MMM y 'ҫ'. – ccc, d MMM y 'ҫ'. G</greatestDifference>
+							<greatestDifference id="d">U, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">U, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">U, MMM, d, E – U, MMM, d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL – LLLL y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">LLLL y 'ҫ'. – LLLL y 'ҫ'. G</greatestDifference>
+							<greatestDifference id="M">U, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">U, MMMM – U, MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="coptic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">тот</month>
+							<month type="2">бабэ</month>
+							<month type="3">хатур</month>
+							<month type="4">кихак</month>
+							<month type="5">тубэ</month>
+							<month type="6">амшир</month>
+							<month type="7">барамхат</month>
+							<month type="8">бармуда</month>
+							<month type="9">башнас</month>
+							<month type="10">бауна</month>
+							<month type="11">абиб</month>
+							<month type="12">мисра</month>
+							<month type="13">наси</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="1">Диоклетиантан</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="1">Диокл-т.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="1">Д-т.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="dangi">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">1-мӗш уйӑх</month>
+							<month type="2">2-мӗш уйӑх</month>
+							<month type="3">3-мӗш уйӑх</month>
+							<month type="4">4-мӗш уйӑх</month>
+							<month type="5">5-мӗш уйӑх</month>
+							<month type="6">6-мӗш уйӑх</month>
+							<month type="7">7-мӗш уйӑх</month>
+							<month type="8">8-мӗш уйӑх</month>
+							<month type="9">9-мӗш уйӑх</month>
+							<month type="10">10-мӗш уйӑх</month>
+							<month type="11">11-мӗш уйӑх</month>
+							<month type="12">12-мӗш уйӑх</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">пӗрремӗш уйӑх</month>
+							<month type="2">иккӗмӗш уйӑх</month>
+							<month type="3">виҫҫӗмӗш уйӑх</month>
+							<month type="4">тӑваттӑмӗш уйӑх</month>
+							<month type="5">пиллӗкмӗш уйӑх</month>
+							<month type="6">улттӑмӗш уйӑх</month>
+							<month type="7">ҫиччӗмӗш уйӑх</month>
+							<month type="8">саккӑрмӗш уйӑх</month>
+							<month type="9">тӑххӑрмӗш уйӑх</month>
+							<month type="10">вуннӑмӗш уйӑх</month>
+							<month type="11">вун пӗрмӗш уйӑх</month>
+							<month type="12">вун иккӗмӗш уйӑх</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">1-мӗш уйӑх</month>
+							<month type="2">2-мӗш уйӑх</month>
+							<month type="3">3-мӗш уйӑх</month>
+							<month type="4">4-мӗш уйӑх</month>
+							<month type="5">5-мӗш уйӑх</month>
+							<month type="6">6-мӗш уйӑх</month>
+							<month type="7">7-мӗш уйӑх</month>
+							<month type="8">8-мӗш уйӑх</month>
+							<month type="9">9-мӗш уйӑх</month>
+							<month type="10">10-мӗш уйӑх</month>
+							<month type="11">11-мӗш уйӑх</month>
+							<month type="12">12-мӗш уйӑх</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">пӗрремӗш уйӑх</month>
+							<month type="2">иккӗмӗш уйӑх</month>
+							<month type="3">виҫҫӗмӗш уйӑх</month>
+							<month type="4">тӑваттӑмӗш уйӑх</month>
+							<month type="5">пиллӗкмӗш уйӑх</month>
+							<month type="6">улттӑмӗш уйӑх</month>
+							<month type="7">ҫиччӗмӗш уйӑх</month>
+							<month type="8">саккӑрмӗш уйӑх</month>
+							<month type="9">тӑххӑрмӗш уйӑх</month>
+							<month type="10">вуннӑмӗш уйӑх</month>
+							<month type="11">вун пӗрмӗш уйӑх</month>
+							<month type="12">вун иккӗмӗш уйӑх</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<monthPatterns>
+					<monthPatternContext type="format">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="numeric">
+						<monthPatternWidth type="all">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="stand-alone">
+						<monthPatternWidth type="abbreviated">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">йӗкӗр {0}</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+				</monthPatterns>
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">ча</cyclicName>
+								<cyclicName type="2">чхук</cyclicName>
+								<cyclicName type="3">ин</cyclicName>
+								<cyclicName type="4">мё</cyclicName>
+								<cyclicName type="5">чин</cyclicName>
+								<cyclicName type="6">са</cyclicName>
+								<cyclicName type="7">о</cyclicName>
+								<cyclicName type="8">ми</cyclicName>
+								<cyclicName type="9">син</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">суль</cyclicName>
+								<cyclicName type="12">хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">ча</cyclicName>
+								<cyclicName type="2">чхук</cyclicName>
+								<cyclicName type="3">ин</cyclicName>
+								<cyclicName type="4">мё</cyclicName>
+								<cyclicName type="5">чин</cyclicName>
+								<cyclicName type="6">са</cyclicName>
+								<cyclicName type="7">о</cyclicName>
+								<cyclicName type="8">ми</cyclicName>
+								<cyclicName type="9">син</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">суль</cyclicName>
+								<cyclicName type="12">хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">ча</cyclicName>
+								<cyclicName type="2">чхук</cyclicName>
+								<cyclicName type="3">ин</cyclicName>
+								<cyclicName type="4">мё</cyclicName>
+								<cyclicName type="5">чин</cyclicName>
+								<cyclicName type="6">са</cyclicName>
+								<cyclicName type="7">о</cyclicName>
+								<cyclicName type="8">ми</cyclicName>
+								<cyclicName type="9">син</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">суль</cyclicName>
+								<cyclicName type="12">хэ</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="days">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="months">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">ипчхун</cyclicName>
+								<cyclicName type="2">усу</cyclicName>
+								<cyclicName type="3">кёнъчхип</cyclicName>
+								<cyclicName type="4">чхунбун</cyclicName>
+								<cyclicName type="5">чхёнъмён</cyclicName>
+								<cyclicName type="6">когу</cyclicName>
+								<cyclicName type="7">ипха</cyclicName>
+								<cyclicName type="8">соман</cyclicName>
+								<cyclicName type="9">манъджон</cyclicName>
+								<cyclicName type="10">хачи</cyclicName>
+								<cyclicName type="11">сосо</cyclicName>
+								<cyclicName type="12">дэсо</cyclicName>
+								<cyclicName type="13">ипхчху</cyclicName>
+								<cyclicName type="14">чхосо</cyclicName>
+								<cyclicName type="15">пэкхро</cyclicName>
+								<cyclicName type="16">чхупун</cyclicName>
+								<cyclicName type="17">халло</cyclicName>
+								<cyclicName type="18">санъган</cyclicName>
+								<cyclicName type="19">ипдон</cyclicName>
+								<cyclicName type="20">сосоль</cyclicName>
+								<cyclicName type="21">дэсоль</cyclicName>
+								<cyclicName type="22">тонъджи</cyclicName>
+								<cyclicName type="23">сохан</cyclicName>
+								<cyclicName type="24">дэхан</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">ипчхун</cyclicName>
+								<cyclicName type="2">усу</cyclicName>
+								<cyclicName type="3">кёнъчхип</cyclicName>
+								<cyclicName type="4">чхунбун</cyclicName>
+								<cyclicName type="5">чхёнъмён</cyclicName>
+								<cyclicName type="6">когу</cyclicName>
+								<cyclicName type="7">ипха</cyclicName>
+								<cyclicName type="8">соман</cyclicName>
+								<cyclicName type="9">манъджон</cyclicName>
+								<cyclicName type="10">хачи</cyclicName>
+								<cyclicName type="11">сосо</cyclicName>
+								<cyclicName type="12">дэсо</cyclicName>
+								<cyclicName type="13">ипхчху</cyclicName>
+								<cyclicName type="14">чхосо</cyclicName>
+								<cyclicName type="15">пэкхро</cyclicName>
+								<cyclicName type="16">чхупун</cyclicName>
+								<cyclicName type="17">халло</cyclicName>
+								<cyclicName type="18">санъган</cyclicName>
+								<cyclicName type="19">ипдон</cyclicName>
+								<cyclicName type="20">сосоль</cyclicName>
+								<cyclicName type="21">дэсоль</cyclicName>
+								<cyclicName type="22">тонъджи</cyclicName>
+								<cyclicName type="23">сохан</cyclicName>
+								<cyclicName type="24">дэхан</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">ипчхун</cyclicName>
+								<cyclicName type="2">усу</cyclicName>
+								<cyclicName type="3">кёнъчхип</cyclicName>
+								<cyclicName type="4">чхунбун</cyclicName>
+								<cyclicName type="5">чхёнъмён</cyclicName>
+								<cyclicName type="6">когу</cyclicName>
+								<cyclicName type="7">ипха</cyclicName>
+								<cyclicName type="8">соман</cyclicName>
+								<cyclicName type="9">манъджон</cyclicName>
+								<cyclicName type="10">хачи</cyclicName>
+								<cyclicName type="11">сосо</cyclicName>
+								<cyclicName type="12">дэсо</cyclicName>
+								<cyclicName type="13">ипхчху</cyclicName>
+								<cyclicName type="14">чхосо</cyclicName>
+								<cyclicName type="15">пэкхро</cyclicName>
+								<cyclicName type="16">чхупун</cyclicName>
+								<cyclicName type="17">халло</cyclicName>
+								<cyclicName type="18">санъган</cyclicName>
+								<cyclicName type="19">ипдон</cyclicName>
+								<cyclicName type="20">сосоль</cyclicName>
+								<cyclicName type="21">дэсоль</cyclicName>
+								<cyclicName type="22">тонъджи</cyclicName>
+								<cyclicName type="23">сохан</cyclicName>
+								<cyclicName type="24">дэхан</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">кап-ча</cyclicName>
+								<cyclicName type="2">ыль-чхук</cyclicName>
+								<cyclicName type="3">пёнъ-ин</cyclicName>
+								<cyclicName type="4">чонъ-мё</cyclicName>
+								<cyclicName type="5">му-чин</cyclicName>
+								<cyclicName type="6">ки-са</cyclicName>
+								<cyclicName type="7">кёнъ-о</cyclicName>
+								<cyclicName type="8">син-ми</cyclicName>
+								<cyclicName type="9">им-син</cyclicName>
+								<cyclicName type="10">ке-ю</cyclicName>
+								<cyclicName type="11">кап-суль</cyclicName>
+								<cyclicName type="12">ыль-хэ</cyclicName>
+								<cyclicName type="13">пёнъ-ча</cyclicName>
+								<cyclicName type="14">чонъ-чхук</cyclicName>
+								<cyclicName type="15">му-ин</cyclicName>
+								<cyclicName type="16">ки-мё</cyclicName>
+								<cyclicName type="17">кёнъ-чин</cyclicName>
+								<cyclicName type="18">син-са</cyclicName>
+								<cyclicName type="19">им-о</cyclicName>
+								<cyclicName type="20">ке-ми</cyclicName>
+								<cyclicName type="21">кап-син</cyclicName>
+								<cyclicName type="22">ыль-ю</cyclicName>
+								<cyclicName type="23">пёнъ-суль</cyclicName>
+								<cyclicName type="24">чонъ-хэ</cyclicName>
+								<cyclicName type="25">му-ча</cyclicName>
+								<cyclicName type="26">ки-чхук</cyclicName>
+								<cyclicName type="27">кёнъ-ин</cyclicName>
+								<cyclicName type="28">син-мё</cyclicName>
+								<cyclicName type="29">им-чин</cyclicName>
+								<cyclicName type="30">ке-са</cyclicName>
+								<cyclicName type="31">кап-о</cyclicName>
+								<cyclicName type="32">ыль-ми</cyclicName>
+								<cyclicName type="33">пёнъ-син</cyclicName>
+								<cyclicName type="34">чонъ-ю</cyclicName>
+								<cyclicName type="35">му-суль</cyclicName>
+								<cyclicName type="36">ки-хэ</cyclicName>
+								<cyclicName type="37">кёнъ-ча</cyclicName>
+								<cyclicName type="38">син-чхук</cyclicName>
+								<cyclicName type="39">им-ин</cyclicName>
+								<cyclicName type="40">ке-мё</cyclicName>
+								<cyclicName type="41">кап-чин</cyclicName>
+								<cyclicName type="42">ыль-са</cyclicName>
+								<cyclicName type="43">пёнъ-о</cyclicName>
+								<cyclicName type="44">чонъ-ми</cyclicName>
+								<cyclicName type="45">му-син</cyclicName>
+								<cyclicName type="46">ки-ю</cyclicName>
+								<cyclicName type="47">кёнъ-суль</cyclicName>
+								<cyclicName type="48">син-хэ</cyclicName>
+								<cyclicName type="49">им-ча</cyclicName>
+								<cyclicName type="50">ке-чхук</cyclicName>
+								<cyclicName type="51">кап-ин</cyclicName>
+								<cyclicName type="52">ыль-мё</cyclicName>
+								<cyclicName type="53">пёнъ-чин</cyclicName>
+								<cyclicName type="54">чонъ-са</cyclicName>
+								<cyclicName type="55">му-о</cyclicName>
+								<cyclicName type="56">ки-ми</cyclicName>
+								<cyclicName type="57">кёнъ-син</cyclicName>
+								<cyclicName type="58">син-ю</cyclicName>
+								<cyclicName type="59">им-суль</cyclicName>
+								<cyclicName type="60">ке-хэ</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">ча</cyclicName>
+								<cyclicName type="2">чхук</cyclicName>
+								<cyclicName type="3">ин</cyclicName>
+								<cyclicName type="4">мё</cyclicName>
+								<cyclicName type="5">чин</cyclicName>
+								<cyclicName type="6">са</cyclicName>
+								<cyclicName type="7">о</cyclicName>
+								<cyclicName type="8">ми</cyclicName>
+								<cyclicName type="9">син</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">суль</cyclicName>
+								<cyclicName type="12">хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">ча</cyclicName>
+								<cyclicName type="2">чхук</cyclicName>
+								<cyclicName type="3">ин</cyclicName>
+								<cyclicName type="4">мё</cyclicName>
+								<cyclicName type="5">чин</cyclicName>
+								<cyclicName type="6">са</cyclicName>
+								<cyclicName type="7">о</cyclicName>
+								<cyclicName type="8">ми</cyclicName>
+								<cyclicName type="9">син</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">суль</cyclicName>
+								<cyclicName type="12">хэ</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">ча</cyclicName>
+								<cyclicName type="2">чхук</cyclicName>
+								<cyclicName type="3">ин</cyclicName>
+								<cyclicName type="4">мё</cyclicName>
+								<cyclicName type="5">чин</cyclicName>
+								<cyclicName type="6">са</cyclicName>
+								<cyclicName type="7">о</cyclicName>
+								<cyclicName type="8">ми</cyclicName>
+								<cyclicName type="9">син</cyclicName>
+								<cyclicName type="10">ю</cyclicName>
+								<cyclicName type="11">суль</cyclicName>
+								<cyclicName type="12">хэ</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>r (U), MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>r (U), MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>r, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>r.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Gy">r (U)</dateFormatItem>
+						<dateFormatItem id="GyMMM">r, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">r, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">r, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="GyMMMM">r (U), MMMM</dateFormatItem>
+						<dateFormatItem id="GyMMMMd">r (U), MMMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMMEd">r (U), MMMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="UM">U, MM</dateFormatItem>
+						<dateFormatItem id="UMd">U, MM.dd</dateFormatItem>
+						<dateFormatItem id="UMMM">U, MMM</dateFormatItem>
+						<dateFormatItem id="UMMMd">U, MMM, d</dateFormatItem>
+						<dateFormatItem id="y">r (U)</dateFormatItem>
+						<dateFormatItem id="yyyy">r (U)</dateFormatItem>
+						<dateFormatItem id="yyyyM">r.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">r.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">r.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">r, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">r, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">r, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">r (U), MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMd">r (U), MMMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMEd">r (U), MMMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">r (U), QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">r (U), QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">U – U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">U, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">U, MMM – U, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">U, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">U, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">U, MMM, d – U, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">U, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">U, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">U, MMM, d, E – U, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">U, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">U, MMMM – U, MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="ethiopic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">мескерем</month>
+							<month type="2">текемт</month>
+							<month type="3">хедар</month>
+							<month type="4">тахсас</month>
+							<month type="5">тер</month>
+							<month type="6">якатит</month>
+							<month type="7">магабит</month>
+							<month type="8">миазия</month>
+							<month type="9">генбот</month>
+							<month type="10">сэнэ</month>
+							<month type="11">хамлэ</month>
+							<month type="12">нахасэ</month>
+							<month type="13">эпагомен</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">тӗнче пуҫланнӑран</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">т. п-р.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">т. п-р.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="ethiopic-amete-alem">
+				<eras>
+					<eraNames>
+						<era type="0">тӗнче пуҫланнӑран</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">т. п-р.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">т. п-р.</era>
+					</eraNarrow>
+				</eras>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
+						<dateFormatItem id="EBhm">E, B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">E, B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Eh">E, a h</dateFormatItem>
+						<dateFormatItem id="Ehm">E, a h:mm</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="h">a h</dateFormatItem>
+						<dateFormatItem id="H">HH 'сех'</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">a h (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'сех' (v)</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1820,7 +4231,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="3">пуш</month>
 							<month type="4">ака</month>
 							<month type="5">ҫу</month>
-							<month type="6">ҫӗр.</month>
+							<month type="6">ҫӗрт.</month>
 							<month type="7">утӑ</month>
 							<month type="8">ҫур.</month>
 							<month type="9">авӑн</month>
@@ -1844,6 +4255,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">кӑр.</month>
+							<month type="2">нар.</month>
+							<month type="3">пуш</month>
+							<month type="4">ака</month>
+							<month type="5">ҫу</month>
+							<month type="6">ҫӗрт.</month>
+							<month type="7">утӑ</month>
+							<month type="8">ҫур.</month>
+							<month type="9">авӑн</month>
+							<month type="10">юпа</month>
+							<month type="11">чӳк</month>
+							<month type="12">раш.</month>
+						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">К</month>
 							<month type="2">Н</month>
@@ -1863,25 +4288,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">выр.</day>
-							<day type="mon">тун.</day>
-							<day type="tue">ытл.</day>
-							<day type="wed">юн.</day>
-							<day type="thu">кӗҫ.</day>
-							<day type="fri">эр.</day>
-							<day type="sat">шӑм.</day>
+							<day type="sun">вр</day>
+							<day type="mon">тн</day>
+							<day type="tue">ыт</day>
+							<day type="wed">юн</day>
+							<day type="thu">кҫ</day>
+							<day type="fri">эр</day>
+							<day type="sat">шм</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">вр</day>
+							<day type="mon">тн</day>
+							<day type="tue">ыт</day>
+							<day type="wed">юн</day>
+							<day type="thu">кҫ</day>
+							<day type="fri">эр</day>
+							<day type="sat">шм</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">вырсарникун</day>
-							<day type="mon">тунтикун</day>
-							<day type="tue">ытларикун</day>
-							<day type="wed">юнкун</day>
-							<day type="thu">кӗҫнерникун</day>
-							<day type="fri">эрнекун</day>
-							<day type="sat">шӑматкун</day>
+							<day type="sun">вырсарни кун</day>
+							<day type="mon">тунти кун</day>
+							<day type="tue">ытлари кун</day>
+							<day type="wed">юн кун</day>
+							<day type="thu">кӗҫнерни кун</day>
+							<day type="fri">эрне кун</day>
+							<day type="sat">шӑмат кун</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">вр</day>
+							<day type="mon">тн</day>
+							<day type="tue">ыт</day>
+							<day type="wed">юн</day>
+							<day type="thu">кҫ</day>
+							<day type="fri">эр</day>
+							<day type="sat">шм</day>
+						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">В</day>
 							<day type="mon">Т</day>
@@ -1891,67 +4334,135 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Э</day>
 							<day type="sat">Ш</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">вр</day>
+							<day type="mon">тн</day>
+							<day type="tue">ыт</day>
+							<day type="wed">юн</day>
+							<day type="thu">кҫ</day>
+							<day type="fri">эр</day>
+							<day type="sat">шм</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">вырсарни кун</day>
+							<day type="mon">тунти кун</day>
+							<day type="tue">ытлари кун</day>
+							<day type="wed">юн кун</day>
+							<day type="thu">кӗҫнерни кун</day>
+							<day type="fri">эрне кун</day>
+							<day type="sat">шӑмат кун</day>
+						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">1-мӗш кв.</quarter>
-							<quarter type="2">2-мӗш кв.</quarter>
-							<quarter type="3">3-мӗш кв.</quarter>
-							<quarter type="4">4-мӗш кв.</quarter>
+							<quarter type="1">1-мӗш чӗр.</quarter>
+							<quarter type="2">2-мӗш чӗр.</quarter>
+							<quarter type="3">3-мӗш чӗр.</quarter>
+							<quarter type="4">4-мӗш чӗр.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">1-мӗш квартал</quarter>
-							<quarter type="2">2-мӗш квартал</quarter>
-							<quarter type="3">3-мӗш квартал</quarter>
-							<quarter type="4">4-мӗш квартал</quarter>
+							<quarter type="1">1-мӗш чӗрӗк</quarter>
+							<quarter type="2">2-мӗш чӗрӗк</quarter>
+							<quarter type="3">3-мӗш чӗрӗк</quarter>
+							<quarter type="4">4-мӗш чӗрӗк</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1-мӗш чӗр.</quarter>
+							<quarter type="2">2-мӗш чӗр.</quarter>
+							<quarter type="3">3-мӗш чӗр.</quarter>
+							<quarter type="4">4-мӗш чӗр.</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1-мӗш чӗрӗк</quarter>
+							<quarter type="2">2-мӗш чӗрӗк</quarter>
+							<quarter type="3">3-мӗш чӗрӗк</quarter>
+							<quarter type="4">4-мӗш чӗрӗк</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">к. у.</dayPeriod>
+							<dayPeriod type="pm">к. х.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">к. у.</dayPeriod>
+							<dayPeriod type="pm">к. х.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">к. у.</dayPeriod>
+							<dayPeriod type="pm">к. х.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">к. у.</dayPeriod>
+							<dayPeriod type="pm">к. х.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">к. у.</dayPeriod>
+							<dayPeriod type="pm">к. х.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">к. у.</dayPeriod>
+							<dayPeriod type="pm">к. х.</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">Христос ҫуралнӑ кунччен</era>
-						<era type="0" alt="variant">пирӗн эрӑччен</era>
-						<era type="1">Христос ҫуралнӑ кунран</era>
-						<era type="1" alt="variant">хальхи эрӑ</era>
+						<era type="0">хальхи саманачченхи</era>
+						<era type="0" alt="variant">хальхи саманачченхи</era>
+						<era type="1">хальхи саманари</era>
+						<era type="1" alt="variant">хальхи саманари</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">п. э.</era>
-						<era type="1">х. э.</era>
+						<era type="0">х. с-ч.</era>
+						<era type="1">х. с.</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0">х. с-ч.</era>
+						<era type="0" alt="variant">х. с-ч.</era>
+						<era type="1">х. с.</era>
+						<era type="1" alt="variant">х. с.</era>
+					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y 'ҫ'.</pattern>
+							<pattern>y, MMMM, d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>d MMMM y 'ҫ'.</pattern>
+							<pattern>y, MMMM, d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d MMM y 'ҫ'.</pattern>
+							<pattern>y, MMM, d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd.MM.y</pattern>
+							<pattern>y.MM.dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
+							<pattern>HH:mm:ss (zzzz)</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
+							<pattern>HH:mm:ss (z)</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
@@ -1987,124 +4498,183 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="EBhm">ccc, h:mm B</dateFormatItem>
-						<dateFormatItem id="EBhms">ccc, h:mm:ss B</dateFormatItem>
-						<dateFormatItem id="Ed">ccc, d</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Gy">y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMM">LLL y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM y 'ҫ'. G</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
-						<dateFormatItem id="Md">dd.MM</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">ccc, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">MMMM W-'мӗш' 'эрни'</dateFormatItem>
-						<dateFormatItem id="yM">MM.y</dateFormatItem>
-						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
-						<dateFormatItem id="yMEd">ccc, dd.MM.y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yMMMd">d MMM y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yQQQQ">QQQQ y 'ҫ'.</dateFormatItem>
-						<dateFormatItem id="yw" count="other">w-'мӗш' 'эрни' Y 'ҫ'.</dateFormatItem>
+						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
+						<dateFormatItem id="EBhm">ccc, B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">ccc, B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ed">d, ccc</dateFormatItem>
+						<dateFormatItem id="Eh">E, a h</dateFormatItem>
+						<dateFormatItem id="Ehm">E, a h:mm</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="h">a h</dateFormatItem>
+						<dateFormatItem id="H">HH 'сех'</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">a h:mm:ss (v)</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss (v)</dateFormatItem>
+						<dateFormatItem id="hmv">a h:mm (v)</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm (v)</dateFormatItem>
+						<dateFormatItem id="hv">a h (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'сех' (v)</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="zero">MMMM, W-'мӗш' 'эрне'</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">MMMM, W-'мӗш' 'эрне'</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM, W-'мӗш' 'эрне'</dateFormatItem>
+						<dateFormatItem id="yM">y.MM</dateFormatItem>
+						<dateFormatItem id="yMd">y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yMEd">y.MM.dd (ccc)</dateFormatItem>
+						<dateFormatItem id="yMMM">y, MMM</dateFormatItem>
+						<dateFormatItem id="yMMMd">y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y, MMMM</dateFormatItem>
+						<dateFormatItem id="yQQQ">y, QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">y, QQQQ</dateFormatItem>
+						<dateFormatItem id="yw" count="zero">Y, w-'мӗш' 'эрне'</dateFormatItem>
+						<dateFormatItem id="yw" count="one">Y, w-'мӗш' 'эрне'</dateFormatItem>
+						<dateFormatItem id="yw" count="other">Y, w-'мӗш' 'эрне'</dateFormatItem>
 					</availableFormats>
+					<appendItems>
+						<appendItem request="Timezone">{0} ({1})</appendItem>
+					</appendItems>
 					<intervalFormats>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">y 'ҫ'. G – y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">y–y 'ҫҫ'. G</greatestDifference>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">MM.y G – MM.y G</greatestDifference>
-							<greatestDifference id="M">MM.y – MM.y G</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y G</greatestDifference>
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="G">dd.MM.y G – dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="G">ccc, dd.MM.y G – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">LLL y 'ҫ'. G – LLL y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">LLL – LLL y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">d–d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="G">d MMM y 'ҫ'. G – d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="G">ccc, d MMM y 'ҫ'. G – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM y 'ҫ'. G</greatestDifference>
-							<greatestDifference id="y">ccc, d MMM y – ccc, d MMM y 'ҫҫ'. G</greatestDifference>
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="M">y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">y.MM – y.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">y.MM.dd – y.MM.dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">ccc, dd.MM.y – ccc, dd.MM.y</greatestDifference>
-							<greatestDifference id="M">ccc, dd.MM.y – ccc, dd.MM.y</greatestDifference>
-							<greatestDifference id="y">ccc, dd.MM.y – ccc, dd.MM.y</greatestDifference>
+							<greatestDifference id="d">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y 'ҫ'.</greatestDifference>
-							<greatestDifference id="y">LLL y 'ҫ'. – LLL y 'ҫ'.</greatestDifference>
+							<greatestDifference id="M">y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">y, MMM – y, MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y 'ҫ'.</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'ҫ'.</greatestDifference>
-							<greatestDifference id="y">d MMM y 'ҫ'. – d MMM y 'ҫ'.</greatestDifference>
+							<greatestDifference id="d">y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">y, MMM, d – y, MMM, d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">ccc, d – ccc, d MMM y 'ҫ'.</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM y 'ҫ'.</greatestDifference>
-							<greatestDifference id="y">ccc, d MMM y 'ҫ'. – ccc, d MMM y 'ҫ'.</greatestDifference>
+							<greatestDifference id="d">y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">y, MMM, d, E – y, MMM, d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL – LLLL y 'ҫ'.</greatestDifference>
-							<greatestDifference id="y">LLLL y 'ҫ'. – LLLL y 'ҫ'.</greatestDifference>
+							<greatestDifference id="M">y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2112,98 +4682,251 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="hebrew">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">тишрей</month>
-							<month type="2" draft="unconfirmed">хешван</month>
-							<month type="3" draft="unconfirmed">кислев</month>
-							<month type="4" draft="unconfirmed">тевет</month>
-							<month type="5" draft="unconfirmed">шеват</month>
-							<month type="6" draft="unconfirmed">адар I</month>
-							<month type="7" draft="unconfirmed">адар</month>
-							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
-							<month type="8" draft="unconfirmed">нисан</month>
-							<month type="9" draft="unconfirmed">ияр</month>
-							<month type="10" draft="unconfirmed">сиван</month>
-							<month type="11" draft="unconfirmed">таммуз</month>
-							<month type="12" draft="unconfirmed">ав</month>
-							<month type="13" draft="unconfirmed">элул</month>
-						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">тишрей</month>
-							<month type="2" draft="unconfirmed">хешван</month>
-							<month type="3" draft="unconfirmed">кислев</month>
-							<month type="4" draft="unconfirmed">тевет</month>
-							<month type="5" draft="unconfirmed">шеват</month>
-							<month type="6" draft="unconfirmed">адар I</month>
-							<month type="7" draft="unconfirmed">адар</month>
-							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
-							<month type="8" draft="unconfirmed">нисан</month>
-							<month type="9" draft="unconfirmed">ияр</month>
-							<month type="10" draft="unconfirmed">сиван</month>
-							<month type="11" draft="unconfirmed">таммуз</month>
-							<month type="12" draft="unconfirmed">ав</month>
-							<month type="13" draft="unconfirmed">элул</month>
+							<month type="1">тишрей</month>
+							<month type="2">хешван</month>
+							<month type="3">кислев</month>
+							<month type="4">тевет</month>
+							<month type="5">шеват</month>
+							<month type="6">адар-алеф</month>
+							<month type="7">адар</month>
+							<month type="7" yeartype="leap">адар-бет</month>
+							<month type="8">нисан</month>
+							<month type="9">ияр</month>
+							<month type="10">сиван</month>
+							<month type="11">таммуз</month>
+							<month type="12">ав</month>
+							<month type="13">элул</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">тишрей</month>
-							<month type="2" draft="unconfirmed">хешван</month>
-							<month type="3" draft="unconfirmed">кислев</month>
-							<month type="4" draft="unconfirmed">тевет</month>
-							<month type="5" draft="unconfirmed">шеват</month>
-							<month type="6" draft="unconfirmed">адар I</month>
-							<month type="7" draft="unconfirmed">адар</month>
-							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
-							<month type="8" draft="unconfirmed">нисан</month>
-							<month type="9" draft="unconfirmed">ияр</month>
-							<month type="10" draft="unconfirmed">сиван</month>
-							<month type="11" draft="unconfirmed">таммуз</month>
-							<month type="12" draft="unconfirmed">ав</month>
-							<month type="13" draft="unconfirmed">элул</month>
-						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">тишрей</month>
-							<month type="2" draft="unconfirmed">хешван</month>
-							<month type="3" draft="unconfirmed">кислев</month>
-							<month type="4" draft="unconfirmed">тевет</month>
-							<month type="5" draft="unconfirmed">шеват</month>
-							<month type="6" draft="unconfirmed">адар I</month>
-							<month type="7" draft="unconfirmed">адар</month>
-							<month type="7" yeartype="leap" draft="unconfirmed">адар II</month>
-							<month type="8" draft="unconfirmed">нисан</month>
-							<month type="9" draft="unconfirmed">ияр</month>
-							<month type="10" draft="unconfirmed">сиван</month>
-							<month type="11" draft="unconfirmed">таммуз</month>
-							<month type="12" draft="unconfirmed">ав</month>
-							<month type="13" draft="unconfirmed">элул</month>
+							<month type="1">тишрей</month>
+							<month type="2">хешван</month>
+							<month type="3">кислев</month>
+							<month type="4">тевет</month>
+							<month type="5">шеват</month>
+							<month type="6">адар-алеф</month>
+							<month type="7">адар</month>
+							<month type="7" yeartype="leap">адар-бет</month>
+							<month type="8">нисан</month>
+							<month type="9">ияр</month>
+							<month type="10">сиван</month>
+							<month type="11">таммуз</month>
+							<month type="12">ав</month>
+							<month type="13">элул</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">çут тĕнче пулса кайни</era>
+						<era type="0">тӗнче пуҫланнӑран</era>
 					</eraNames>
+					<eraAbbr>
+						<era type="0">т. п-р.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">т. п-р.</era>
+					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2211,96 +4934,231 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="indian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">чайтра</month>
-							<month type="2" draft="unconfirmed">ваисакха</month>
-							<month type="3" draft="unconfirmed">джанштха</month>
-							<month type="4" draft="unconfirmed">асадха</month>
-							<month type="5" draft="unconfirmed">сравана</month>
-							<month type="6" draft="unconfirmed">бхадра</month>
-							<month type="7" draft="unconfirmed">азвина</month>
-							<month type="8" draft="unconfirmed">картика</month>
-							<month type="9" draft="unconfirmed">аграхайана</month>
-							<month type="10" draft="unconfirmed">пауза</month>
-							<month type="11" draft="unconfirmed">магха</month>
-							<month type="12" draft="unconfirmed">пхалгуна</month>
-						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">чайтра</month>
-							<month type="2" draft="unconfirmed">ваисакха</month>
-							<month type="3" draft="unconfirmed">джанштха</month>
-							<month type="4" draft="unconfirmed">асадха</month>
-							<month type="5" draft="unconfirmed">сравана</month>
-							<month type="6" draft="unconfirmed">бхадра</month>
-							<month type="7" draft="unconfirmed">азвина</month>
-							<month type="8" draft="unconfirmed">картика</month>
-							<month type="9" draft="unconfirmed">аграхайана</month>
-							<month type="10" draft="unconfirmed">пауза</month>
-							<month type="11" draft="unconfirmed">магха</month>
-							<month type="12" draft="unconfirmed">пхалгуна</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">чайтра</month>
-							<month type="2" draft="unconfirmed">ваисакха</month>
-							<month type="3" draft="unconfirmed">джанштха</month>
-							<month type="4" draft="unconfirmed">асадха</month>
-							<month type="5" draft="unconfirmed">сравана</month>
-							<month type="6" draft="unconfirmed">бхадра</month>
-							<month type="7" draft="unconfirmed">азвина</month>
-							<month type="8" draft="unconfirmed">картика</month>
-							<month type="9" draft="unconfirmed">аграхайана</month>
-							<month type="10" draft="unconfirmed">пауза</month>
-							<month type="11" draft="unconfirmed">магха</month>
-							<month type="12" draft="unconfirmed">пхалгуна</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">чайтра</month>
-							<month type="2" draft="unconfirmed">ваисакха</month>
-							<month type="3" draft="unconfirmed">джанштха</month>
-							<month type="4" draft="unconfirmed">асадха</month>
-							<month type="5" draft="unconfirmed">сравана</month>
-							<month type="6" draft="unconfirmed">бхадра</month>
-							<month type="7" draft="unconfirmed">азвина</month>
-							<month type="8" draft="unconfirmed">картика</month>
-							<month type="9" draft="unconfirmed">аграхайана</month>
-							<month type="10" draft="unconfirmed">пауза</month>
-							<month type="11" draft="unconfirmed">магха</month>
-							<month type="12" draft="unconfirmed">пхалгуна</month>
+							<month type="1">чайтра</month>
+							<month type="2">ваисакха</month>
+							<month type="3">джанштха</month>
+							<month type="4">асадха</month>
+							<month type="5">сравана</month>
+							<month type="6">бхадра</month>
+							<month type="7">азвина</month>
+							<month type="8">картика</month>
+							<month type="9">аграхайана</month>
+							<month type="10">пауза</month>
+							<month type="11">магха</month>
+							<month type="12">пхалгуна</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">Сака</era>
+						<era type="0">Сака саманари</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">Сака</era>
+						<era type="0">Сака с.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">Сака</era>
+						<era type="0">Сака с.</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2309,95 +5167,247 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">мух.</month>
-							<month type="2" draft="unconfirmed">саф.</month>
-							<month type="3" draft="unconfirmed">раб. I</month>
-							<month type="4" draft="unconfirmed">раб. II</month>
-							<month type="5" draft="unconfirmed">джум. I</month>
-							<month type="6" draft="unconfirmed">джум. II</month>
-							<month type="7" draft="unconfirmed">радж.</month>
-							<month type="8" draft="unconfirmed">шааб.</month>
-							<month type="9" draft="unconfirmed">рам.</month>
-							<month type="10" draft="unconfirmed">шав.</month>
-							<month type="11" draft="unconfirmed">зуль-к.</month>
-							<month type="12" draft="unconfirmed">зуль-х.</month>
+							<month type="1">мух.</month>
+							<month type="2">саф.</month>
+							<month type="3">раб. I</month>
+							<month type="4">раб. II</month>
+							<month type="5">джум. I</month>
+							<month type="6">джум. II</month>
+							<month type="7">радж.</month>
+							<month type="8">шааб.</month>
+							<month type="9">рам.</month>
+							<month type="10">шав.</month>
+							<month type="11">зуль-к.</month>
+							<month type="12">зуль-х.</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">мухаррам</month>
-							<month type="2" draft="unconfirmed">сафар</month>
-							<month type="3" draft="unconfirmed">раби-уль-авваль</month>
-							<month type="4" draft="unconfirmed">раби-уль-ахир</month>
-							<month type="5" draft="unconfirmed">джумад-уль-авваль</month>
-							<month type="6" draft="unconfirmed">джумад-уль-ахир</month>
-							<month type="7" draft="unconfirmed">раджаб</month>
-							<month type="8" draft="unconfirmed">шаабан</month>
-							<month type="9" draft="unconfirmed">рамадан</month>
-							<month type="10" draft="unconfirmed">шавваль</month>
-							<month type="11" draft="unconfirmed">зуль-каада</month>
-							<month type="12" draft="unconfirmed">зуль-хиджжа</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">мух.</month>
-							<month type="2" draft="unconfirmed">саф.</month>
-							<month type="3" draft="unconfirmed">раб. I</month>
-							<month type="4" draft="unconfirmed">раб. II</month>
-							<month type="5" draft="unconfirmed">джум. I</month>
-							<month type="6" draft="unconfirmed">джум. II</month>
-							<month type="7" draft="unconfirmed">радж.</month>
-							<month type="8" draft="unconfirmed">шааб.</month>
-							<month type="9" draft="unconfirmed">рам.</month>
-							<month type="10" draft="unconfirmed">шав.</month>
-							<month type="11" draft="unconfirmed">зуль-к.</month>
-							<month type="12" draft="unconfirmed">зуль-х.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">мухаррам</month>
-							<month type="2" draft="unconfirmed">сафар</month>
-							<month type="3" draft="unconfirmed">раби-уль-авваль</month>
-							<month type="4" draft="unconfirmed">раби-уль-ахир</month>
-							<month type="5" draft="unconfirmed">джумад-уль-авваль</month>
-							<month type="6" draft="unconfirmed">джумад-уль-ахир</month>
-							<month type="7" draft="unconfirmed">раджаб</month>
-							<month type="8" draft="unconfirmed">шаабан</month>
-							<month type="9" draft="unconfirmed">рамадан</month>
-							<month type="10" draft="unconfirmed">шавваль</month>
-							<month type="11" draft="unconfirmed">зуль-каада</month>
-							<month type="12" draft="unconfirmed">зуль-хиджжа</month>
+							<month type="1">мухаррам</month>
+							<month type="2">сафар</month>
+							<month type="3">раби-уль-авваль</month>
+							<month type="4">раби-уль-ахир</month>
+							<month type="5">джумад-уль-авваль</month>
+							<month type="6">джумад-уль-ахир</month>
+							<month type="7">раджаб</month>
+							<month type="8">шаабан</month>
+							<month type="9">рамадан</month>
+							<month type="10">шавваль</month>
+							<month type="11">зуль-каада</month>
+							<month type="12">зуль-хиджжа</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">хиджра хыҫҫӑн</era>
+						<era type="0">хиджра хыҫҫӑнхи</era>
+						<era type="1">хиджрӑччен</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">хиджра хҫн</era>
+						<era type="0">х. х.</era>
+						<era type="1">х-ч.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">х-ра хҫн</era>
+						<era type="0">х. х.</era>
+						<era type="1">х-ч.</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2405,742 +5415,921 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="japanese">
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">Тайка тапхăрĕ (645–650)</era>
-						<era type="1" draft="unconfirmed">Хакути тапхăрĕ (650–671)</era>
-						<era type="2" draft="unconfirmed">Хакухо тапхăрĕ (672–686)</era>
-						<era type="3" draft="unconfirmed">Сючё тапхăрĕ (686–701)</era>
-						<era type="4" draft="unconfirmed">Тайхо тапхăрĕ (701–704)</era>
-						<era type="5" draft="unconfirmed">Кёюн тапхăрĕ (704–708)</era>
-						<era type="6" draft="unconfirmed">Вадо тапхăрĕ (708–715)</era>
-						<era type="7" draft="unconfirmed">Рэйки тапхăрĕ (715–717)</era>
-						<era type="8" draft="unconfirmed">Ёро тапхăрĕ (717–724)</era>
-						<era type="9" draft="unconfirmed">Дзинки тапхăрĕ (724–729)</era>
-						<era type="10" draft="unconfirmed">Темпьё тапхăрĕ (729–749)</era>
-						<era type="11" draft="unconfirmed">Темпьё тапхăрĕ (749–749)</era>
-						<era type="12" draft="unconfirmed">Темпьё-Сьохо тапхăрĕ (749-757)</era>
-						<era type="13" draft="unconfirmed">Темпьё-Ходзи тапхăрĕ (757-765)</era>
-						<era type="14" draft="unconfirmed">Темпьё-Ходзи тапхăрĕ (765-767)</era>
-						<era type="15" draft="unconfirmed">Джинго-Кёюн тапхăрĕ (767-770)</era>
-						<era type="16" draft="unconfirmed">Хоки тапхăрĕ (770–780)</era>
-						<era type="17" draft="unconfirmed">Теньё тапхăрĕ (781–782)</era>
-						<era type="18" draft="unconfirmed">Енряку тапхăрĕ (782–806)</era>
-						<era type="19" draft="unconfirmed">Дайдо тапхăрĕ (806–810)</era>
-						<era type="20" draft="unconfirmed">Конин тапхăрĕ (810–824)</era>
-						<era type="21" draft="unconfirmed">Тентьо тапхăрĕ (824–834)</era>
-						<era type="22" draft="unconfirmed">Шова тапхăрĕ (834–848)</era>
-						<era type="23" draft="unconfirmed">Кайо тапхăрĕ (848–851)</era>
-						<era type="24" draft="unconfirmed">Ниндзю тапхăрĕ (851–854)</era>
-						<era type="25" draft="unconfirmed">Сайко тапхăрĕ (854–857)</era>
-						<era type="26" draft="unconfirmed">Теннан тапхăрĕ (857–859)</era>
-						<era type="27" draft="unconfirmed">Йоган тапхăрĕ (859–877)</era>
-						<era type="28" draft="unconfirmed">Генкей тапхăрĕ (877–885)</era>
-						<era type="29" draft="unconfirmed">Нинна тапхăрĕ (885–889)</era>
-						<era type="30" draft="unconfirmed">Кампьё тапхăрĕ (889–898)</era>
-						<era type="31" draft="unconfirmed">Сьотай тапхăрĕ (898–901)</era>
-						<era type="32" draft="unconfirmed">Энги тапхăрĕ (901–923)</era>
-						<era type="33" draft="unconfirmed">Ентьо тапхăрĕ (923–931)</era>
-						<era type="34" draft="unconfirmed">Сьёхэй тапхăрĕ (931–938)</era>
-						<era type="35" draft="unconfirmed">Тенгьо тапхăрĕ (938–947)</era>
-						<era type="36" draft="unconfirmed">Тенрияку тапхăрĕ (947–957)</era>
-						<era type="37" draft="unconfirmed">Тентоку тапхăрĕ (957–961)</era>
-						<era type="38" draft="unconfirmed">Ова тапхăрĕ (961–964)</era>
-						<era type="39" draft="unconfirmed">Кохо тапхăрĕ (964–968)</era>
-						<era type="40" draft="unconfirmed">Анна тапхăрĕ (968–970)</era>
-						<era type="41" draft="unconfirmed">Тенроку тапхăрĕ (970–973)</era>
-						<era type="42" draft="unconfirmed">Теньен тапхăрĕ (973–976)</era>
-						<era type="43" draft="unconfirmed">Дзьоген тапхăрĕ (976–978)</era>
-						<era type="44" draft="unconfirmed">Тенген тапхăрĕ (978–983)</era>
-						<era type="45" draft="unconfirmed">Ейкан тапхăрĕ (983–985)</era>
-						<era type="46" draft="unconfirmed">Канна тапхăрĕ (985–987)</era>
-						<era type="47" draft="unconfirmed">Ейен тапхăрĕ (987–989)</era>
-						<era type="48" draft="unconfirmed">Ейсо тапхăрĕ (989–990)</era>
-						<era type="49" draft="unconfirmed">Сёряку тапхăрĕ (990–995)</era>
-						<era type="50" draft="unconfirmed">Тётоку тапхăрĕ (995–999)</era>
-						<era type="51" draft="unconfirmed">Тёхо тапхăрĕ (999–1004)</era>
-						<era type="52" draft="unconfirmed">Канко тапхăрĕ (1004–1012)</era>
-						<era type="53" draft="unconfirmed">Тёва тапхăрĕ (1012–1017)</era>
-						<era type="54" draft="unconfirmed">Каннин тапхăрĕ (1017–1021)</era>
-						<era type="55" draft="unconfirmed">Дзиан тапхăрĕ (1021–1024)</era>
-						<era type="56" draft="unconfirmed">Мандзю тапхăрĕ (1024–1028)</era>
-						<era type="57" draft="unconfirmed">Тёгэн тапхăрĕ (1028–1037)</era>
-						<era type="58" draft="unconfirmed">Тёряку тапхăрĕ (1037–1040)</era>
-						<era type="59" draft="unconfirmed">Тёкю тапхăрĕ (1040–1044)</era>
-						<era type="60" draft="unconfirmed">Катоку тапхăрĕ (1044–1046)</era>
-						<era type="61" draft="unconfirmed">Эйсо тапхăрĕ (1046–1053)</era>
-						<era type="62" draft="unconfirmed">Тэнги тапхăрĕ (1053–1058)</era>
-						<era type="63" draft="unconfirmed">Кохэй тапхăрĕ (1058–1065)</era>
-						<era type="64" draft="unconfirmed">Дзиряку тапхăрĕ (1065–1069)</era>
-						<era type="65" draft="unconfirmed">Энкю тапхăрĕ (1069–1074)</era>
-						<era type="66" draft="unconfirmed">Сёхо тапхăрĕ (1074–1077)</era>
-						<era type="67" draft="unconfirmed">Сёряку тапхăрĕ (1077–1081)</era>
-						<era type="68" draft="unconfirmed">Эйхо тапхăрĕ (1081–1084)</era>
-						<era type="69" draft="unconfirmed">Отоку тапхăрĕ (1084–1087)</era>
-						<era type="70" draft="unconfirmed">Кандзи тапхăрĕ (1087–1094)</era>
-						<era type="71" draft="unconfirmed">Кахо тапхăрĕ (1094–1096)</era>
-						<era type="72" draft="unconfirmed">Эйтё тапхăрĕ (1096–1097)</era>
-						<era type="73" draft="unconfirmed">Сётоку тапхăрĕ (1097–1099)</era>
-						<era type="74" draft="unconfirmed">Кова тапхăрĕ (1099–1104)</era>
-						<era type="75" draft="unconfirmed">Тёдзи тапхăрĕ (1104–1106)</era>
-						<era type="76" draft="unconfirmed">Касё тапхăрĕ (1106–1108)</era>
-						<era type="77" draft="unconfirmed">Тэннин тапхăрĕ (1108–1110)</era>
-						<era type="78" draft="unconfirmed">Тэнъэй тапхăрĕ (1110–1113)</era>
-						<era type="79" draft="unconfirmed">Эйкю тапхăрĕ (1113–1118)</era>
-						<era type="80" draft="unconfirmed">Гэнъэй тапхăрĕ (1118–1120)</era>
-						<era type="81" draft="unconfirmed">Хоан тапхăрĕ (1120–1124)</era>
-						<era type="82" draft="unconfirmed">Тэндзи тапхăрĕ (1124–1126)</era>
-						<era type="83" draft="unconfirmed">Дайдзи тапхăрĕ (1126–1131)</era>
-						<era type="84" draft="unconfirmed">Тэнсё тапхăрĕ (1131–1132)</era>
-						<era type="85" draft="unconfirmed">Тёсё тапхăрĕ (1132–1135)</era>
-						<era type="86" draft="unconfirmed">Хоэн тапхăрĕ (1135–1141)</era>
-						<era type="87" draft="unconfirmed">Эйдзи тапхăрĕ (1141–1142)</era>
-						<era type="88" draft="unconfirmed">Кодзи тапхăрĕ (1142–1144)</era>
-						<era type="89" draft="unconfirmed">Тэнё тапхăрĕ (1144–1145)</era>
-						<era type="90" draft="unconfirmed">Кюан тапхăрĕ (1145–1151)</era>
-						<era type="91" draft="unconfirmed">Нимпэй тапхăрĕ (1151–1154)</era>
-						<era type="92" draft="unconfirmed">Кюдзю тапхăрĕ (1154–1156)</era>
-						<era type="93" draft="unconfirmed">Хогэн тапхăрĕ (1156–1159)</era>
-						<era type="94" draft="unconfirmed">Хэйдзи тапхăрĕ (1159–1160)</era>
-						<era type="95" draft="unconfirmed">Эйряку тапхăрĕ (1160–1161)</era>
-						<era type="96" draft="unconfirmed">Охо тапхăрĕ (1161–1163)</era>
-						<era type="97" draft="unconfirmed">Тёкан тапхăрĕ (1163–1165)</era>
-						<era type="98" draft="unconfirmed">Эйман тапхăрĕ (1165–1166)</era>
-						<era type="99" draft="unconfirmed">Нинъан тапхăрĕ (1166–1169)</era>
-						<era type="100" draft="unconfirmed">Као тапхăрĕ (1169–1171)</era>
-						<era type="101" draft="unconfirmed">Сёан тапхăрĕ (1171–1175)</era>
-						<era type="102" draft="unconfirmed">Ангэн тапхăрĕ (1175–1177)</era>
-						<era type="103" draft="unconfirmed">Дзисё тапхăрĕ (1177–1181)</era>
-						<era type="104" draft="unconfirmed">Ёва тапхăрĕ (1181–1182)</era>
-						<era type="105" draft="unconfirmed">Дзюэй тапхăрĕ (1182–1184)</era>
-						<era type="106" draft="unconfirmed">Гэнрюку тапхăрĕ (1184–1185)</era>
-						<era type="107" draft="unconfirmed">Бундзи тапхăрĕ (1185–1190)</era>
-						<era type="108" draft="unconfirmed">Кэнкю тапхăрĕ (1190–1199)</era>
-						<era type="109" draft="unconfirmed">Сёдзи тапхăрĕ (1199–1201)</era>
-						<era type="110" draft="unconfirmed">Кэннин тапхăрĕ (1201–1204)</era>
-						<era type="111" draft="unconfirmed">Гэнкю тапхăрĕ (1204–1206)</era>
-						<era type="112" draft="unconfirmed">Кэнъэй тапхăрĕ (1206–1207)</era>
-						<era type="113" draft="unconfirmed">Сёгэн тапхăрĕ (1207–1211)</era>
-						<era type="114" draft="unconfirmed">Кэнряку тапхăрĕ (1211–1213)</era>
-						<era type="115" draft="unconfirmed">Кэмпо тапхăрĕ (1213–1219)</era>
-						<era type="116" draft="unconfirmed">Сёкю тапхăрĕ (1219–1222)</era>
-						<era type="117" draft="unconfirmed">Дзёо тапхăрĕ (1222–1224)</era>
-						<era type="118" draft="unconfirmed">Гэннин тапхăрĕ (1224–1225)</era>
-						<era type="119" draft="unconfirmed">Кароку тапхăрĕ (1225–1227)</era>
-						<era type="120" draft="unconfirmed">Антэй тапхăрĕ (1227–1229)</era>
-						<era type="121" draft="unconfirmed">Канки тапхăрĕ (1229–1232)</era>
-						<era type="122" draft="unconfirmed">Дзёэй тапхăрĕ (1232–1233)</era>
-						<era type="123" draft="unconfirmed">Тэмпуку тапхăрĕ (1233–1234)</era>
-						<era type="124" draft="unconfirmed">Бунряку тапхăрĕ (1234–1235)</era>
-						<era type="125" draft="unconfirmed">Катэй тапхăрĕ (1235–1238)</era>
-						<era type="126" draft="unconfirmed">Рякунин тапхăрĕ (1238–1239)</era>
-						<era type="127" draft="unconfirmed">Энъо тапхăрĕ (1239–1240)</era>
-						<era type="128" draft="unconfirmed">Ниндзи тапхăрĕ (1240–1243)</era>
-						<era type="129" draft="unconfirmed">Кангэн тапхăрĕ (1243–1247)</era>
-						<era type="130" draft="unconfirmed">Ходзи тапхăрĕ (1247–1249)</era>
-						<era type="131" draft="unconfirmed">Кэнтё тапхăрĕ (1249–1256)</era>
-						<era type="132" draft="unconfirmed">Когэн тапхăрĕ (1256–1257)</era>
-						<era type="133" draft="unconfirmed">Сёка тапхăрĕ (1257–1259)</era>
-						<era type="134" draft="unconfirmed">Сёгэн тапхăрĕ (1259–1260)</era>
-						<era type="135" draft="unconfirmed">Бунъо тапхăрĕ (1260–1261)</era>
-						<era type="136" draft="unconfirmed">Котё тапхăрĕ (1261–1264)</era>
-						<era type="137" draft="unconfirmed">Бунъэй тапхăрĕ (1264–1275)</era>
-						<era type="138" draft="unconfirmed">Кэндзи тапхăрĕ (1275–1278)</era>
-						<era type="139" draft="unconfirmed">Коан тапхăрĕ (1278–1288)</era>
-						<era type="140" draft="unconfirmed">Сёо тапхăрĕ (1288–1293)</era>
-						<era type="141" draft="unconfirmed">Эйнин тапхăрĕ (1293–1299)</era>
-						<era type="142" draft="unconfirmed">Сёан тапхăрĕ (1299–1302)</era>
-						<era type="143" draft="unconfirmed">Кэнгэн тапхăрĕ (1302–1303)</era>
-						<era type="144" draft="unconfirmed">Кагэн тапхăрĕ (1303–1306)</era>
-						<era type="145" draft="unconfirmed">Токудзи тапхăрĕ (1306–1308)</era>
-						<era type="146" draft="unconfirmed">Энкэй тапхăрĕ (1308–1311)</era>
-						<era type="147" draft="unconfirmed">Отё тапхăрĕ (1311–1312)</era>
-						<era type="148" draft="unconfirmed">Сёва тапхăрĕ (1312–1317)</era>
-						<era type="149" draft="unconfirmed">Бумпо тапхăрĕ (1317–1319)</era>
-						<era type="150" draft="unconfirmed">Гэно тапхăрĕ (1319–1321)</era>
-						<era type="151" draft="unconfirmed">Гэнкё тапхăрĕ (1321–1324)</era>
-						<era type="152" draft="unconfirmed">Сётю тапхăрĕ (1324–1326)</era>
-						<era type="153" draft="unconfirmed">Карэки тапхăрĕ (1326–1329)</era>
-						<era type="154" draft="unconfirmed">Гэнтоку тапхăрĕ (1329–1331)</era>
-						<era type="155" draft="unconfirmed">Гэнко тапхăрĕ (1331–1334)</era>
-						<era type="156" draft="unconfirmed">Кэмму тапхăрĕ (1334–1336)</era>
-						<era type="157" draft="unconfirmed">Энгэн тапхăрĕ (1336–1340)</era>
-						<era type="158" draft="unconfirmed">Кококу тапхăрĕ (1340–1346)</era>
-						<era type="159" draft="unconfirmed">Сёхэй тапхăрĕ (1346–1370)</era>
-						<era type="160" draft="unconfirmed">Кэнтоку тапхăрĕ (1370–1372)</era>
-						<era type="161" draft="unconfirmed">Бунтю тапхăрĕ (1372–1375)</era>
-						<era type="162" draft="unconfirmed">Иэндзю тапхăрĕ (1375–1379)</era>
-						<era type="163" draft="unconfirmed">Коряку тапхăрĕ (1379–1381)</era>
-						<era type="164" draft="unconfirmed">Кова тапхăрĕ (1381–1384)</era>
-						<era type="165" draft="unconfirmed">Гэнтю тапхăрĕ (1384–1392)</era>
-						<era type="166" draft="unconfirmed">Мэйтоку тапхăрĕ (1384–1387)</era>
-						<era type="167" draft="unconfirmed">Какэй тапхăрĕ (1387–1389)</era>
-						<era type="168" draft="unconfirmed">Коо тапхăрĕ (1389–1390)</era>
-						<era type="169" draft="unconfirmed">Мэйтоку тапхăрĕ (1390–1394)</era>
-						<era type="170" draft="unconfirmed">Оэй тапхăрĕ (1394–1428)</era>
-						<era type="171" draft="unconfirmed">Сётё тапхăрĕ (1428–1429)</era>
-						<era type="172" draft="unconfirmed">Эйкё тапхăрĕ (1429–1441)</era>
-						<era type="173" draft="unconfirmed">Какицу тапхăрĕ (1441–1444)</era>
-						<era type="174" draft="unconfirmed">Банъан тапхăрĕ (1444–1449)</era>
-						<era type="175" draft="unconfirmed">Хотоку тапхăрĕ (1449–1452)</era>
-						<era type="176" draft="unconfirmed">Кётоку тапхăрĕ (1452–1455)</era>
-						<era type="177" draft="unconfirmed">Косё тапхăрĕ (1455–1457)</era>
-						<era type="178" draft="unconfirmed">Тёроку тапхăрĕ (1457–1460)</era>
-						<era type="179" draft="unconfirmed">Кансё тапхăрĕ (1460–1466)</era>
-						<era type="180" draft="unconfirmed">Бунсё тапхăрĕ (1466–1467)</era>
-						<era type="181" draft="unconfirmed">Онин тапхăрĕ (1467–1469)</era>
-						<era type="182" draft="unconfirmed">Буммэй тапхăрĕ (1469–1487)</era>
-						<era type="183" draft="unconfirmed">Тёкё тапхăрĕ (1487–1489)</era>
-						<era type="184" draft="unconfirmed">Энтоку тапхăрĕ (1489–1492)</era>
-						<era type="185" draft="unconfirmed">Мэйо тапхăрĕ (1492–1501)</era>
-						<era type="186" draft="unconfirmed">Бунки тапхăрĕ (1501–1504)</era>
-						<era type="187" draft="unconfirmed">Эйсё тапхăрĕ (1504–1521)</era>
-						<era type="188" draft="unconfirmed">Тайэй тапхăрĕ (1521–1528)</era>
-						<era type="189" draft="unconfirmed">Кёроку тапхăрĕ (1528–1532)</era>
-						<era type="190" draft="unconfirmed">Тэммон тапхăрĕ (1532–1555)</era>
-						<era type="191" draft="unconfirmed">Кодзи тапхăрĕ (1555–1558)</era>
-						<era type="192" draft="unconfirmed">Эйроку тапхăрĕ (1558–1570)</era>
-						<era type="193" draft="unconfirmed">Гэнки тапхăрĕ (1570–1573)</era>
-						<era type="194" draft="unconfirmed">Тэнсё тапхăрĕ (1573–1592)</era>
-						<era type="195" draft="unconfirmed">Бунроку тапхăрĕ (1592–1596)</era>
-						<era type="196" draft="unconfirmed">Кэйтё тапхăрĕ (1596–1615)</era>
-						<era type="197" draft="unconfirmed">Гэнва тапхăрĕ (1615–1624)</era>
-						<era type="198" draft="unconfirmed">Канъэй тапхăрĕ (1624–1644)</era>
-						<era type="199" draft="unconfirmed">Сёхо тапхăрĕ (1644–1648)</era>
-						<era type="200" draft="unconfirmed">Кэйан тапхăрĕ (1648–1652)</era>
-						<era type="201" draft="unconfirmed">Сё тапхăрĕ (1652–1655)</era>
-						<era type="202" draft="unconfirmed">Мэйряку тапхăрĕ (1655–1658)</era>
-						<era type="203" draft="unconfirmed">Мандзи тапхăрĕ (1658–1661)</era>
-						<era type="204" draft="unconfirmed">Камбун тапхăрĕ (1661–1673)</era>
-						<era type="205" draft="unconfirmed">Эмпо тапхăрĕ (1673–1681)</era>
-						<era type="206" draft="unconfirmed">Тэнва тапхăрĕ (1681–1684)</era>
-						<era type="207" draft="unconfirmed">Дзёкё тапхăрĕ (1684–1688)</era>
-						<era type="208" draft="unconfirmed">Гэнроку тапхăрĕ (1688–1704)</era>
-						<era type="209" draft="unconfirmed">Хоэй тапхăрĕ (1704–1711)</era>
-						<era type="210" draft="unconfirmed">Сётоку тапхăрĕ (1711–1716)</era>
-						<era type="211" draft="unconfirmed">Кёхо тапхăрĕ (1716–1736)</era>
-						<era type="212" draft="unconfirmed">Гэмбун тапхăрĕ (1736–1741)</era>
-						<era type="213" draft="unconfirmed">Кампо тапхăрĕ (1741–1744)</era>
-						<era type="214" draft="unconfirmed">Энкё тапхăрĕ (1744–1748)</era>
-						<era type="215" draft="unconfirmed">Канъэн тапхăрĕ (1748–1751)</era>
-						<era type="216" draft="unconfirmed">Хоряку тапхăрĕ (1751–1764)</era>
-						<era type="217" draft="unconfirmed">Мэйва тапхăрĕ (1764–1772)</era>
-						<era type="218" draft="unconfirmed">Анъэй тапхăрĕ (1772–1781)</era>
-						<era type="219" draft="unconfirmed">Тэммэй тапхăрĕ (1781–1789)</era>
-						<era type="220" draft="unconfirmed">Кансэй тапхăрĕ (1789–1801)</era>
-						<era type="221" draft="unconfirmed">Кёва тапхăрĕ (1801–1804)</era>
-						<era type="222" draft="unconfirmed">Бунка тапхăрĕ (1804–1818)</era>
-						<era type="223" draft="unconfirmed">Бунсэй тапхăрĕ (1818–1830)</era>
-						<era type="224" draft="unconfirmed">Тэмпо тапхăрĕ (1830–1844)</era>
-						<era type="225" draft="unconfirmed">Кока тапхăрĕ (1844–1848)</era>
-						<era type="226" draft="unconfirmed">Каэй тапхăрĕ (1848–1854)</era>
-						<era type="227" draft="unconfirmed">Ансэй тапхăрĕ (1854–1860)</era>
-						<era type="228" draft="unconfirmed">Манъэн тапхăрĕ (1860–1861)</era>
-						<era type="229" draft="unconfirmed">Бункю тапхăрĕ (1861–1864)</era>
-						<era type="230" draft="unconfirmed">Гендзи тапхăрĕ (1864–1865)</era>
-						<era type="231" draft="unconfirmed">Кейо тапхăрĕ (1865–1868)</era>
-						<era type="232" draft="unconfirmed">Мэйдзи тапхăрĕ</era>
-						<era type="233" draft="unconfirmed">Тайсьо тапхăрĕ</era>
-						<era type="234" draft="unconfirmed">Сьова тапхăрĕ</era>
-						<era type="235" draft="unconfirmed">Хэйсэй тапхăрĕ</era>
-						<era type="236" draft="unconfirmed">Рэйва тапхăрĕ</era>
+						<era type="0">Тайка (645–650)</era>
+						<era type="1">Хакути (650–671)</era>
+						<era type="2">Хакухо (672–686)</era>
+						<era type="3">Сютё (686–701)</era>
+						<era type="4">Тайхо (701–704)</era>
+						<era type="5">Кёун (704–708)</era>
+						<era type="6">Вадо (708–715)</era>
+						<era type="7">Рэйки (715–717)</era>
+						<era type="8">Ёро (717–724)</era>
+						<era type="9">Дзинки (724–729)</era>
+						<era type="10">Тэмпьё (729–749)</era>
+						<era type="11">Тэмпьё-Канпо (749–749)</era>
+						<era type="12">Тэмпьё-Сёхо (749-757)</era>
+						<era type="13">Тэмпьё-Ходзи (757-765)</era>
+						<era type="14">Тэмпьё-Дзинго (765-767)</era>
+						<era type="15">Дзинго-Кёун (767-770)</era>
+						<era type="16">Хоки (770–781)</era>
+						<era type="17">Тэнъо (781–782)</era>
+						<era type="18">Энряку (782–806)</era>
+						<era type="19">Дайдо (806–810)</era>
+						<era type="20">Конин (810–824)</era>
+						<era type="21">Тэнтьё (824–834)</era>
+						<era type="22">Дзёва (834–848)</era>
+						<era type="23">Касё (848–851)</era>
+						<era type="24">Ниндзю (851–854)</era>
+						<era type="25">Сайко (854–857)</era>
+						<era type="26">Тэнъан (857–859)</era>
+						<era type="27">Дзёган (859–877)</era>
+						<era type="28">Гангё (877–885)</era>
+						<era type="29">Нинна (885–889)</era>
+						<era type="30">Канпё (889–898)</era>
+						<era type="31">Сётай (898–901)</era>
+						<era type="32">Энги (901–923)</era>
+						<era type="33">Энтё (923–931)</era>
+						<era type="34">Дзёхей (931–938)</era>
+						<era type="35">Тэнгё (938–947)</era>
+						<era type="36">Тэнряку (947–957)</era>
+						<era type="37">Тэнтоку (957–961)</era>
+						<era type="38">Ова (961–964)</era>
+						<era type="39">Кохо (964–968)</era>
+						<era type="40">Анна (968–970)</era>
+						<era type="41">Тэнроку (970–973)</era>
+						<era type="42">Тэнъэн (973–976)</era>
+						<era type="43">Дзёгэн (976–978)</era>
+						<era type="44">Тэнгэн (978–983)</era>
+						<era type="45">Эйкан (983–985)</era>
+						<era type="46">Канна (985–987)</era>
+						<era type="47">Эйэн (987–989)</era>
+						<era type="48">Эйсо (989–990)</era>
+						<era type="49">Сёряку (990–995)</era>
+						<era type="50">Тётоку (995–999)</era>
+						<era type="51">Тёхо (999–1004)</era>
+						<era type="52">Канко (1004–1012)</era>
+						<era type="53">Тёва (1012–1017)</era>
+						<era type="54">Каннин (1017–1021)</era>
+						<era type="55">Дзиан (1021–1024)</era>
+						<era type="56">Мандзю (1024–1028)</era>
+						<era type="57">Тёгэн (1028–1037)</era>
+						<era type="58">Тёряку (1037–1040)</era>
+						<era type="59">Тёкю (1040–1044)</era>
+						<era type="60">Кантоку (1044–1046)</era>
+						<era type="61">Эйсё (1046–1053)</era>
+						<era type="62">Тэнги (1053–1058)</era>
+						<era type="63">Кохэй (1058–1065)</era>
+						<era type="64">Дзиряку (1065–1069)</era>
+						<era type="65">Энкю (1069–1074)</era>
+						<era type="66">Дзюхо (1074–1077)</era>
+						<era type="67">Дзёряку (1077–1081)</era>
+						<era type="68">Эйхо (1081–1084)</era>
+						<era type="69">Отоку (1084–1087)</era>
+						<era type="70">Кандзи (1087–1094)</era>
+						<era type="71">Кахо (1094–1096)</era>
+						<era type="72">Эйтё (1096–1097)</era>
+						<era type="73">Дзётоку (1097–1099)</era>
+						<era type="74">Кова (1099–1104)</era>
+						<era type="75">Тёдзи (1104–1106)</era>
+						<era type="76">Кадзё (1106–1108)</era>
+						<era type="77">Тэннин (1108–1110)</era>
+						<era type="78">Тэнъэй (1110–1113)</era>
+						<era type="79">Эйкю (1113–1118)</era>
+						<era type="80">Гэнъэй (1118–1120)</era>
+						<era type="81">Хоан (1120–1124)</era>
+						<era type="82">Тэндзи (1124–1126)</era>
+						<era type="83">Дайдзи (1126–1131)</era>
+						<era type="84">Тэнсё (1131–1132)</era>
+						<era type="85">Тёсё (1132–1135)</era>
+						<era type="86">Хоэн (1135–1141)</era>
+						<era type="87">Эйдзи (1141–1142)</era>
+						<era type="88">Кодзи (1142–1144)</era>
+						<era type="89">Тэнъё (1144–1145)</era>
+						<era type="90">Кюан (1145–1151)</era>
+						<era type="91">Нимпэй (1151–1154)</era>
+						<era type="92">Кюдзю (1154–1156)</era>
+						<era type="93">Хогэн (1156–1159)</era>
+						<era type="94">Хэйдзи (1159–1160)</era>
+						<era type="95">Эйряку (1160–1161)</era>
+						<era type="96">Охо (1161–1163)</era>
+						<era type="97">Тёкан (1163–1165)</era>
+						<era type="98">Эйман (1165–1166)</era>
+						<era type="99">Нинъан (1166–1169)</era>
+						<era type="100">Као (1169–1171)</era>
+						<era type="101">Дзёан (1171–1175)</era>
+						<era type="102">Ангэн (1175–1177)</era>
+						<era type="103">Дзисё (1177–1181)</era>
+						<era type="104">Ёва (1181–1182)</era>
+						<era type="105">Дзюэй (1182–1184)</era>
+						<era type="106">Гэнрюку (1184–1185)</era>
+						<era type="107">Бундзи (1185–1190)</era>
+						<era type="108">Кэнкю (1190–1199)</era>
+						<era type="109">Сёдзи (1199–1201)</era>
+						<era type="110">Кэннин (1201–1204)</era>
+						<era type="111">Гэнкю (1204–1206)</era>
+						<era type="112">Кэнъэй (1206–1207)</era>
+						<era type="113">Дзёгэн (1207–1211)</era>
+						<era type="114">Кэнряку (1211–1213)</era>
+						<era type="115">Кэмпо (1213–1219)</era>
+						<era type="116">Дзёкю (1219–1222)</era>
+						<era type="117">Дзёо (1222–1224)</era>
+						<era type="118">Гэннин (1224–1225)</era>
+						<era type="119">Кароку (1225–1227)</era>
+						<era type="120">Антэй (1227–1229)</era>
+						<era type="121">Канги (1229–1232)</era>
+						<era type="122">Дзёэй (1232–1233)</era>
+						<era type="123">Тэмпуку (1233–1234)</era>
+						<era type="124">Бунряку (1234–1235)</era>
+						<era type="125">Катэй (1235–1238)</era>
+						<era type="126">Рякунин (1238–1239)</era>
+						<era type="127">Энъо (1239–1240)</era>
+						<era type="128">Ниндзи (1240–1243)</era>
+						<era type="129">Кангэн (1243–1247)</era>
+						<era type="130">Ходзи (1247–1249)</era>
+						<era type="131">Кэнтё (1249–1256)</era>
+						<era type="132">Когэн (1256–1257)</era>
+						<era type="133">Сёка (1257–1259)</era>
+						<era type="134">Сёгэн (1259–1260)</era>
+						<era type="135">Бунъо (1260–1261)</era>
+						<era type="136">Котё (1261–1264)</era>
+						<era type="137">Бунъэй (1264–1275)</era>
+						<era type="138">Кэндзи (1275–1278)</era>
+						<era type="139">Коан (1278–1288)</era>
+						<era type="140">Сёо (1288–1293)</era>
+						<era type="141">Эйнин (1293–1299)</era>
+						<era type="142">Сёан (1299–1302)</era>
+						<era type="143">Кэнгэн (1302–1303)</era>
+						<era type="144">Кагэн (1303–1306)</era>
+						<era type="145">Токудзи (1306–1308)</era>
+						<era type="146">Энкё (1308–1311)</era>
+						<era type="147">Отё (1311–1312)</era>
+						<era type="148">Сёва (1312–1317)</era>
+						<era type="149">Бумпо (1317–1319)</era>
+						<era type="150">Гэнъо (1319–1321)</era>
+						<era type="151">Гэнко (1321–1324)</era>
+						<era type="152">Сётю (1324–1326)</era>
+						<era type="153">Каряку (1326–1329)</era>
+						<era type="154">Гэнтоку (1329–1331)</era>
+						<era type="155">Гэнко (1331–1334)</era>
+						<era type="156">Кэнму (1334–1336)</era>
+						<era type="157">Энгэн (1336–1340)</era>
+						<era type="158">Кококу (1340–1346)</era>
+						<era type="159">Сёхэй (1346–1370)</era>
+						<era type="160">Кэнтоку (1370–1372)</era>
+						<era type="161">Бунтю (1372–1375)</era>
+						<era type="162">Тэндзю (1375–1379)</era>
+						<era type="163">Коряку (1379–1381)</era>
+						<era type="164">Кова (1381–1384)</era>
+						<era type="165">Гэнтю (1384–1392)</era>
+						<era type="166">Ситоку (1384–1387)</era>
+						<era type="167">Какэй (1387–1389)</era>
+						<era type="168">Коо (1389–1390)</era>
+						<era type="169">Мэйтоку (1390–1394)</era>
+						<era type="170">Оэй (1394–1428)</era>
+						<era type="171">Сётё (1428–1429)</era>
+						<era type="172">Эйкё (1429–1441)</era>
+						<era type="173">Какицу (1441–1444)</era>
+						<era type="174">Бунъан (1444–1449)</era>
+						<era type="175">Хотоку (1449–1452)</era>
+						<era type="176">Кётоку (1452–1455)</era>
+						<era type="177">Кёсё (1455–1457)</era>
+						<era type="178">Тёроку (1457–1460)</era>
+						<era type="179">Кансё (1460–1466)</era>
+						<era type="180">Бунсё (1466–1467)</era>
+						<era type="181">Онин (1467–1469)</era>
+						<era type="182">Бунмэй (1469–1487)</era>
+						<era type="183">Тёкё (1487–1489)</era>
+						<era type="184">Энтоку (1489–1492)</era>
+						<era type="185">Мэйо (1492–1501)</era>
+						<era type="186">Бунки (1501–1504)</era>
+						<era type="187">Эйсё (1504–1521)</era>
+						<era type="188">Дайэй (1521–1528)</era>
+						<era type="189">Кёроку (1528–1532)</era>
+						<era type="190">Тэнбун (1532–1555)</era>
+						<era type="191">Кодзи (1555–1558)</era>
+						<era type="192">Эйроку (1558–1570)</era>
+						<era type="193">Гэнки (1570–1573)</era>
+						<era type="194">Тэнсё (1573–1592)</era>
+						<era type="195">Бунроку (1592–1596)</era>
+						<era type="196">Кэйтё (1596–1615)</era>
+						<era type="197">Гэнна (1615–1624)</era>
+						<era type="198">Канъэй (1624–1644)</era>
+						<era type="199">Сёхё (1644–1648)</era>
+						<era type="200">Кэйан (1648–1652)</era>
+						<era type="201">Дзёо (1652–1655)</era>
+						<era type="202">Мэйрэки (1655–1658)</era>
+						<era type="203">Мандзи (1658–1661)</era>
+						<era type="204">Камбун (1661–1673)</era>
+						<era type="205">Эмпо (1673–1681)</era>
+						<era type="206">Тэнна (1681–1684)</era>
+						<era type="207">Дзёкё (1684–1688)</era>
+						<era type="208">Гэнроку (1688–1704)</era>
+						<era type="209">Хоэй (1704–1711)</era>
+						<era type="210">Сётоку (1711–1716)</era>
+						<era type="211">Кёхо (1716–1736)</era>
+						<era type="212">Гэмбун (1736–1741)</era>
+						<era type="213">Кампо (1741–1744)</era>
+						<era type="214">Энкё (1744–1748)</era>
+						<era type="215">Канъэн (1748–1751)</era>
+						<era type="216">Хореки (1751–1764)</era>
+						<era type="217">Мэйва (1764–1772)</era>
+						<era type="218">Анъэй (1772–1781)</era>
+						<era type="219">Тэнмэй (1781–1789)</era>
+						<era type="220">Кансэй (1789–1801)</era>
+						<era type="221">Кёва (1801–1804)</era>
+						<era type="222">Бунка (1804–1818)</era>
+						<era type="223">Бунсэй (1818–1830)</era>
+						<era type="224">Тэнпо (1830–1844)</era>
+						<era type="225">Кока (1844–1848)</era>
+						<era type="226">Каэй (1848–1854)</era>
+						<era type="227">Ансэй (1854–1860)</era>
+						<era type="228">Манъэн (1860–1861)</era>
+						<era type="229">Бункю (1861–1864)</era>
+						<era type="230">Гэндзи (1864–1865)</era>
+						<era type="231">Кейо (1865–1868)</era>
+						<era type="232">Мэйдзи</era>
+						<era type="233">Тайсё</era>
+						<era type="234">Сёва</era>
+						<era type="235">Хэйсэй</era>
+						<era type="236">Рэйва</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">Тайка тпхр. (645–650)</era>
-						<era type="1" draft="unconfirmed">Хакути тпхр. (650–671)</era>
-						<era type="2" draft="unconfirmed">Хакухо тпхр. (672–686)</era>
-						<era type="3" draft="unconfirmed">Сючё тпхр. (686–701)</era>
-						<era type="4" draft="unconfirmed">Тайхо тпхр. (701–704)</era>
-						<era type="5" draft="unconfirmed">Кёюн тпхр. (704–708)</era>
-						<era type="6" draft="unconfirmed">Вадо тпхр. (708–715)</era>
-						<era type="7" draft="unconfirmed">Рэйки тпхр. (715–717)</era>
-						<era type="8" draft="unconfirmed">Ёро тпхр. (717–724)</era>
-						<era type="9" draft="unconfirmed">Дзинки тпхр. (724–729)</era>
-						<era type="10" draft="unconfirmed">Темпьё тпхр. (729–749)</era>
-						<era type="11" draft="unconfirmed">Т.-кампо тпхр. (749–749)</era>
-						<era type="12" draft="unconfirmed">Темпьё-Сьохо тпхр. (749-757)</era>
-						<era type="13" draft="unconfirmed">Темпьё-Ходзи тпхр. (757-765)</era>
-						<era type="14" draft="unconfirmed">Темпьё-Ходзи тпхр. (765-767)</era>
-						<era type="15" draft="unconfirmed">Джинго-Кёюн тпхр. (767-770)</era>
-						<era type="16" draft="unconfirmed">Хоки тпхр. (770–780)</era>
-						<era type="17" draft="unconfirmed">Теньё тпхр. (781–782)</era>
-						<era type="18" draft="unconfirmed">Енряку тпхр. (782–806)</era>
-						<era type="19" draft="unconfirmed">Дайдо тпхр. (806–810)</era>
-						<era type="20" draft="unconfirmed">Конин тпхр. (810–824)</era>
-						<era type="21" draft="unconfirmed">Тентьо тпхр. (824–834)</era>
-						<era type="22" draft="unconfirmed">Шова тпхр. (834–848)</era>
-						<era type="23" draft="unconfirmed">Кайо тпхр. (848–851)</era>
-						<era type="24" draft="unconfirmed">Ниндзю тпхр. (851–854)</era>
-						<era type="25" draft="unconfirmed">Сайко тпхр. (854–857)</era>
-						<era type="26" draft="unconfirmed">Теннан тпхр. (857–859)</era>
-						<era type="27" draft="unconfirmed">Йоган тпхр. (859–877)</era>
-						<era type="28" draft="unconfirmed">Генкей тпхр. (877–885)</era>
-						<era type="29" draft="unconfirmed">Нинна тпхр. (885–889)</era>
-						<era type="30" draft="unconfirmed">Кампьё тпхр. (889–898)</era>
-						<era type="31" draft="unconfirmed">Сьотай тпхр. (898–901)</era>
-						<era type="32" draft="unconfirmed">Энги тпхр. (901–923)</era>
-						<era type="33" draft="unconfirmed">Ентьо тпхр. (923–931)</era>
-						<era type="34" draft="unconfirmed">Сьёхэй тпхр. (931–938)</era>
-						<era type="35" draft="unconfirmed">Тенгьо тпхр. (938–947)</era>
-						<era type="36" draft="unconfirmed">Тенрияку тпхр. (947–957)</era>
-						<era type="37" draft="unconfirmed">Тентоку тпхр. (957–961)</era>
-						<era type="38" draft="unconfirmed">Ова тпхр. (961–964)</era>
-						<era type="39" draft="unconfirmed">Кохо тпхр. (964–968)</era>
-						<era type="40" draft="unconfirmed">Анна тпхр. (968–970)</era>
-						<era type="41" draft="unconfirmed">Тенроку тпхр. (970–973)</era>
-						<era type="42" draft="unconfirmed">Теньен тпхр. (973–976)</era>
-						<era type="43" draft="unconfirmed">Дзьоген тпхр. (976–978)</era>
-						<era type="44" draft="unconfirmed">Тенген тпхр. (978–983)</era>
-						<era type="45" draft="unconfirmed">Ейкан тпхр. (983–985)</era>
-						<era type="46" draft="unconfirmed">Канна тпхр. (985–987)</era>
-						<era type="47" draft="unconfirmed">Ейен тпхр. (987–989)</era>
-						<era type="48" draft="unconfirmed">Ейсо тпхр. (989–990)</era>
-						<era type="49" draft="unconfirmed">Сёряку тпхр. (990–995)</era>
-						<era type="50" draft="unconfirmed">Тётоку тпхр. (995–999)</era>
-						<era type="51" draft="unconfirmed">Тёхо тпхр. (999–1004)</era>
-						<era type="52" draft="unconfirmed">Канко тпхр. (1004–1012)</era>
-						<era type="53" draft="unconfirmed">Тёва тпхр. (1012–1017)</era>
-						<era type="54" draft="unconfirmed">Каннин тпхр. (1017–1021)</era>
-						<era type="55" draft="unconfirmed">Дзиан тпхр. (1021–1024)</era>
-						<era type="56" draft="unconfirmed">Мандзю тпхр. (1024–1028)</era>
-						<era type="57" draft="unconfirmed">Тёгэн тпхр. (1028–1037)</era>
-						<era type="58" draft="unconfirmed">Тёряку тпхр. (1037–1040)</era>
-						<era type="59" draft="unconfirmed">Тёкю тпхр. (1040–1044)</era>
-						<era type="60" draft="unconfirmed">Катоку тпхр. (1044–1046)</era>
-						<era type="61" draft="unconfirmed">Эйсо тпхр. (1046–1053)</era>
-						<era type="62" draft="unconfirmed">Тэнги тпхр. (1053–1058)</era>
-						<era type="63" draft="unconfirmed">Кохэй тпхр. (1058–1065)</era>
-						<era type="64" draft="unconfirmed">Дзиряку тпхр. (1065–1069)</era>
-						<era type="65" draft="unconfirmed">Энкю тпхр. (1069–1074)</era>
-						<era type="66" draft="unconfirmed">Сёхо тпхр. (1074–1077)</era>
-						<era type="67" draft="unconfirmed">Сёряку тпхр. (1077–1081)</era>
-						<era type="68" draft="unconfirmed">Эйхо тпхр. (1081–1084)</era>
-						<era type="69" draft="unconfirmed">Отоку тпхр. (1084–1087)</era>
-						<era type="70" draft="unconfirmed">Кандзи тпхр. (1087–1094)</era>
-						<era type="71" draft="unconfirmed">Кахо тпхр. (1094–1096)</era>
-						<era type="72" draft="unconfirmed">Эйтё тпхр. (1096–1097)</era>
-						<era type="73" draft="unconfirmed">Сётоку тпхр. (1097–1099)</era>
-						<era type="74" draft="unconfirmed">Кова тпхр. (1099–1104)</era>
-						<era type="75" draft="unconfirmed">Тёдзи тпхр. (1104–1106)</era>
-						<era type="76" draft="unconfirmed">Касё тпхр. (1106–1108)</era>
-						<era type="77" draft="unconfirmed">Тэннин тпхр. (1108–1110)</era>
-						<era type="78" draft="unconfirmed">Тэнъэй тпхр. (1110–1113)</era>
-						<era type="79" draft="unconfirmed">Эйкю тпхр. (1113–1118)</era>
-						<era type="80" draft="unconfirmed">Гэнъэй тпхр. (1118–1120)</era>
-						<era type="81" draft="unconfirmed">Хоан тпхр. (1120–1124)</era>
-						<era type="82" draft="unconfirmed">Тэндзи тпхр. (1124–1126)</era>
-						<era type="83" draft="unconfirmed">Дайдзи тпхр. (1126–1131)</era>
-						<era type="84" draft="unconfirmed">Тэнсё тпхр. (1131–1132)</era>
-						<era type="85" draft="unconfirmed">Тёсё тпхр. (1132–1135)</era>
-						<era type="86" draft="unconfirmed">Хоэн тпхр. (1135–1141)</era>
-						<era type="87" draft="unconfirmed">Эйдзи тпхр. (1141–1142)</era>
-						<era type="88" draft="unconfirmed">Кодзи тпхр. (1142–1144)</era>
-						<era type="89" draft="unconfirmed">Тэнё тпхр. (1144–1145)</era>
-						<era type="90" draft="unconfirmed">Кюан тпхр. (1145–1151)</era>
-						<era type="91" draft="unconfirmed">Нимпэй тпхр. (1151–1154)</era>
-						<era type="92" draft="unconfirmed">Кюдзю тпхр. (1154–1156)</era>
-						<era type="93" draft="unconfirmed">Хогэн тпхр. (1156–1159)</era>
-						<era type="94" draft="unconfirmed">Хэйдзи тпхр. (1159–1160)</era>
-						<era type="95" draft="unconfirmed">Эйряку тпхр. (1160–1161)</era>
-						<era type="96" draft="unconfirmed">Охо тпхр. (1161–1163)</era>
-						<era type="97" draft="unconfirmed">Тёкан тпхр. (1163–1165)</era>
-						<era type="98" draft="unconfirmed">Эйман тпхр. (1165–1166)</era>
-						<era type="99" draft="unconfirmed">Нинъан тпхр. (1166–1169)</era>
-						<era type="100" draft="unconfirmed">Као тпхр. (1169–1171)</era>
-						<era type="101" draft="unconfirmed">Сёан тпхр. (1171–1175)</era>
-						<era type="102" draft="unconfirmed">Ангэн тпхр. (1175–1177)</era>
-						<era type="103" draft="unconfirmed">Дзисё тпхр. (1177–1181)</era>
-						<era type="104" draft="unconfirmed">Ёва тпхр. (1181–1182)</era>
-						<era type="105" draft="unconfirmed">Дзюэй тпхр. (1182–1184)</era>
-						<era type="106" draft="unconfirmed">Гэнрюку тпхр. (1184–1185)</era>
-						<era type="107" draft="unconfirmed">Бундзи тпхр. (1185–1190)</era>
-						<era type="108" draft="unconfirmed">Кэнкю тпхр. (1190–1199)</era>
-						<era type="109" draft="unconfirmed">Сёдзи тпхр. (1199–1201)</era>
-						<era type="110" draft="unconfirmed">Кэннин тпхр. (1201–1204)</era>
-						<era type="111" draft="unconfirmed">Гэнкю тпхр. (1204–1206)</era>
-						<era type="112" draft="unconfirmed">Кэнъэй тпхр. (1206–1207)</era>
-						<era type="113" draft="unconfirmed">Сёгэн тпхр. (1207–1211)</era>
-						<era type="114" draft="unconfirmed">Кэнряку тпхр. (1211–1213)</era>
-						<era type="115" draft="unconfirmed">Кэмпо тпхр. (1213–1219)</era>
-						<era type="116" draft="unconfirmed">Сёкю тпхр. (1219–1222)</era>
-						<era type="117" draft="unconfirmed">Дзёо тпхр. (1222–1224)</era>
-						<era type="118" draft="unconfirmed">Гэннин тпхр. (1224–1225)</era>
-						<era type="119" draft="unconfirmed">Кароку тпхр. (1225–1227)</era>
-						<era type="120" draft="unconfirmed">Антэй тпхр. (1227–1229)</era>
-						<era type="121" draft="unconfirmed">Канки тпхр. (1229–1232)</era>
-						<era type="122" draft="unconfirmed">Дзёэй тпхр. (1232–1233)</era>
-						<era type="123" draft="unconfirmed">Тэмпуку тпхр. (1233–1234)</era>
-						<era type="124" draft="unconfirmed">Бунряку тпхр. (1234–1235)</era>
-						<era type="125" draft="unconfirmed">Катэй тпхр. (1235–1238)</era>
-						<era type="126" draft="unconfirmed">Рякунин тпхр. (1238–1239)</era>
-						<era type="127" draft="unconfirmed">Энъо тпхр. (1239–1240)</era>
-						<era type="128" draft="unconfirmed">Ниндзи тпхр. (1240–1243)</era>
-						<era type="129" draft="unconfirmed">Кангэн тпхр. (1243–1247)</era>
-						<era type="130" draft="unconfirmed">Ходзи тпхр. (1247–1249)</era>
-						<era type="131" draft="unconfirmed">Кэнтё тпхр. (1249–1256)</era>
-						<era type="132" draft="unconfirmed">Когэн тпхр. (1256–1257)</era>
-						<era type="133" draft="unconfirmed">Сёка тпхр. (1257–1259)</era>
-						<era type="134" draft="unconfirmed">Сёгэн тпхр. (1259–1260)</era>
-						<era type="135" draft="unconfirmed">Бунъо тпхр. (1260–1261)</era>
-						<era type="136" draft="unconfirmed">Котё тпхр. (1261–1264)</era>
-						<era type="137" draft="unconfirmed">Бунъэй тпхр. (1264–1275)</era>
-						<era type="138" draft="unconfirmed">Кэндзи тпхр. (1275–1278)</era>
-						<era type="139" draft="unconfirmed">Коан тпхр. (1278–1288)</era>
-						<era type="140" draft="unconfirmed">Сёо тпхр. (1288–1293)</era>
-						<era type="141" draft="unconfirmed">Эйнин тпхр. (1293–1299)</era>
-						<era type="142" draft="unconfirmed">Сёан тпхр. (1299–1302)</era>
-						<era type="143" draft="unconfirmed">Кэнгэн тпхр. (1302–1303)</era>
-						<era type="144" draft="unconfirmed">Кагэн тпхр. (1303–1306)</era>
-						<era type="145" draft="unconfirmed">Токудзи тпхр. (1306–1308)</era>
-						<era type="146" draft="unconfirmed">Энкэй тпхр. (1308–1311)</era>
-						<era type="147" draft="unconfirmed">Отё тпхр. (1311–1312)</era>
-						<era type="148" draft="unconfirmed">Сёва тпхр. (1312–1317)</era>
-						<era type="149" draft="unconfirmed">Бумпо тпхр. (1317–1319)</era>
-						<era type="150" draft="unconfirmed">Гэно тпхр. (1319–1321)</era>
-						<era type="151" draft="unconfirmed">Гэнкё тпхр. (1321–1324)</era>
-						<era type="152" draft="unconfirmed">Сётю тпхр. (1324–1326)</era>
-						<era type="153" draft="unconfirmed">Карэки тпхр. (1326–1329)</era>
-						<era type="154" draft="unconfirmed">Гэнтоку тпхр. (1329–1331)</era>
-						<era type="155" draft="unconfirmed">Гэнко тпхр. (1331–1334)</era>
-						<era type="156" draft="unconfirmed">Кэмму тпхр. (1334–1336)</era>
-						<era type="157" draft="unconfirmed">Энгэн тпхр. (1336–1340)</era>
-						<era type="158" draft="unconfirmed">Кококу тпхр. (1340–1346)</era>
-						<era type="159" draft="unconfirmed">Сёхэй тпхр. (1346–1370)</era>
-						<era type="160" draft="unconfirmed">Кэнтоку тпхр. (1370–1372)</era>
-						<era type="161" draft="unconfirmed">Бунтю тпхр. (1372–1375)</era>
-						<era type="162" draft="unconfirmed">Иэндзю тпхр. (1375–1379)</era>
-						<era type="163" draft="unconfirmed">Коряку тпхр. (1379–1381)</era>
-						<era type="164" draft="unconfirmed">Кова тпхр. (1381–1384)</era>
-						<era type="165" draft="unconfirmed">Гэнтю тпхр. (1384–1392)</era>
-						<era type="166" draft="unconfirmed">Мэйтоку тпхр. (1384–1387)</era>
-						<era type="167" draft="unconfirmed">Какэй тпхр. (1387–1389)</era>
-						<era type="168" draft="unconfirmed">Коо тпхр. (1389–1390)</era>
-						<era type="169" draft="unconfirmed">Мэйтоку тпхр. (1390–1394)</era>
-						<era type="170" draft="unconfirmed">Оэй тпхр. (1394–1428)</era>
-						<era type="171" draft="unconfirmed">Сётё тпхр. (1428–1429)</era>
-						<era type="172" draft="unconfirmed">Эйкё тпхр. (1429–1441)</era>
-						<era type="173" draft="unconfirmed">Какицу тпхр. (1441–1444)</era>
-						<era type="174" draft="unconfirmed">Банъан тпхр. (1444–1449)</era>
-						<era type="175" draft="unconfirmed">Хотоку тпхр. (1449–1452)</era>
-						<era type="176" draft="unconfirmed">Кётоку тпхр. (1452–1455)</era>
-						<era type="177" draft="unconfirmed">Косё тпхр. (1455–1457)</era>
-						<era type="178" draft="unconfirmed">Тёроку тпхр. (1457–1460)</era>
-						<era type="179" draft="unconfirmed">Кансё тпхр. (1460–1466)</era>
-						<era type="180" draft="unconfirmed">Бунсё тпхр. (1466–1467)</era>
-						<era type="181" draft="unconfirmed">Онин тпхр. (1467–1469)</era>
-						<era type="182" draft="unconfirmed">Буммэй тпхр. (1469–1487)</era>
-						<era type="183" draft="unconfirmed">Тёкё тпхр. (1487–1489)</era>
-						<era type="184" draft="unconfirmed">Энтоку тпхр. (1489–1492)</era>
-						<era type="185" draft="unconfirmed">Мэйо тпхр. (1492–1501)</era>
-						<era type="186" draft="unconfirmed">Бунки тпхр. (1501–1504)</era>
-						<era type="187" draft="unconfirmed">Эйсё тпхр. (1504–1521)</era>
-						<era type="188" draft="unconfirmed">Тайэй тпхр. (1521–1528)</era>
-						<era type="189" draft="unconfirmed">Кёроку тпхр. (1528–1532)</era>
-						<era type="190" draft="unconfirmed">Тэммон тпхр. (1532–1555)</era>
-						<era type="191" draft="unconfirmed">Кодзи тпхр. (1555–1558)</era>
-						<era type="192" draft="unconfirmed">Эйроку тпхр. (1558–1570)</era>
-						<era type="193" draft="unconfirmed">Гэнки тпхр. (1570–1573)</era>
-						<era type="194" draft="unconfirmed">Тэнсё тпхр. (1573–1592)</era>
-						<era type="195" draft="unconfirmed">Бунроку тпхр. (1592–1596)</era>
-						<era type="196" draft="unconfirmed">Кэйтё тпхр. (1596–1615)</era>
-						<era type="197" draft="unconfirmed">Гэнва тпхр. (1615–1624)</era>
-						<era type="198" draft="unconfirmed">Канъэй тпхр. (1624–1644)</era>
-						<era type="199" draft="unconfirmed">Сёхо тпхр. (1644–1648)</era>
-						<era type="200" draft="unconfirmed">Кэйан тпхр. (1648–1652)</era>
-						<era type="201" draft="unconfirmed">Сё тпхр. (1652–1655)</era>
-						<era type="202" draft="unconfirmed">Мэйряку тпхр. (1655–1658)</era>
-						<era type="203" draft="unconfirmed">Мандзи тпхр. (1658–1661)</era>
-						<era type="204" draft="unconfirmed">Камбун тпхр. (1661–1673)</era>
-						<era type="205" draft="unconfirmed">Эмпо тпхр. (1673–1681)</era>
-						<era type="206" draft="unconfirmed">Тэнва тпхр. (1681–1684)</era>
-						<era type="207" draft="unconfirmed">Дзёкё тпхр. (1684–1688)</era>
-						<era type="208" draft="unconfirmed">Гэнроку тпхр. (1688–1704)</era>
-						<era type="209" draft="unconfirmed">Хоэй тпхр. (1704–1711)</era>
-						<era type="210" draft="unconfirmed">Сётоку тпхр. (1711–1716)</era>
-						<era type="211" draft="unconfirmed">Кёхо тпхр. (1716–1736)</era>
-						<era type="212" draft="unconfirmed">Гэмбун тпхр. (1736–1741)</era>
-						<era type="213" draft="unconfirmed">Кампо тпхр. (1741–1744)</era>
-						<era type="214" draft="unconfirmed">Энкё тпхр. (1744–1748)</era>
-						<era type="215" draft="unconfirmed">Канъэн тпхр. (1748–1751)</era>
-						<era type="216" draft="unconfirmed">Хоряку тпхр. (1751–1764)</era>
-						<era type="217" draft="unconfirmed">Мэйва тпхр. (1764–1772)</era>
-						<era type="218" draft="unconfirmed">Анъэй тпхр. (1772–1781)</era>
-						<era type="219" draft="unconfirmed">Тэммэй тпхр. (1781–1789)</era>
-						<era type="220" draft="unconfirmed">Кансэй тпхр. (1789–1801)</era>
-						<era type="221" draft="unconfirmed">Кёва тпхр. (1801–1804)</era>
-						<era type="222" draft="unconfirmed">Бунка тпхр. (1804–1818)</era>
-						<era type="223" draft="unconfirmed">Бунсэй тпхр. (1818–1830)</era>
-						<era type="224" draft="unconfirmed">Тэмпо тпхр. (1830–1844)</era>
-						<era type="225" draft="unconfirmed">Кока тпхр. (1844–1848)</era>
-						<era type="226" draft="unconfirmed">Каэй тпхр. (1848–1854)</era>
-						<era type="227" draft="unconfirmed">Ансэй тпхр. (1854–1860)</era>
-						<era type="228" draft="unconfirmed">Манъэн тпхр. (1860–1861)</era>
-						<era type="229" draft="unconfirmed">Бункю тпхр. (1861–1864)</era>
-						<era type="230" draft="unconfirmed">Гендзи тпхр. (1864–1865)</era>
-						<era type="231" draft="unconfirmed">Кейо тпхр. (1865–1868)</era>
-						<era type="232" draft="unconfirmed">Мэйдзи тпхр.</era>
-						<era type="233" draft="unconfirmed">Тайсьо тпхр.</era>
-						<era type="234" draft="unconfirmed">Сьова тпхр.</era>
-						<era type="235" draft="unconfirmed">Хэйсэй тпхр.</era>
-						<era type="236" draft="unconfirmed">Рэйва тпхр.</era>
+						<era type="0">Тайка (645–650)</era>
+						<era type="1">Хакути (650–671)</era>
+						<era type="2">Хакухо (672–686)</era>
+						<era type="3">Сютё (686–701)</era>
+						<era type="4">Тайхо (701–704)</era>
+						<era type="5">Кёун (704–708)</era>
+						<era type="6">Вадо (708–715)</era>
+						<era type="7">Рэйки (715–717)</era>
+						<era type="8">Ёро (717–724)</era>
+						<era type="9">Дзинки (724–729)</era>
+						<era type="10">Тэмпьё (729–749)</era>
+						<era type="11">Тэмпьё-Канпо (749–749)</era>
+						<era type="12">Тэмпьё-Сёхо (749-757)</era>
+						<era type="13">Тэмпьё-Ходзи (757-765)</era>
+						<era type="14">Тэмпьё-Дзинго (765-767)</era>
+						<era type="15">Дзинго-Кёун (767-770)</era>
+						<era type="16">Хоки (770–781)</era>
+						<era type="17">Тэнъо (781–782)</era>
+						<era type="18">Энряку (782–806)</era>
+						<era type="19">Дайдо (806–810)</era>
+						<era type="20">Конин (810–824)</era>
+						<era type="21">Тэнтьё (824–834)</era>
+						<era type="22">Дзёва (834–848)</era>
+						<era type="23">Касё (848–851)</era>
+						<era type="24">Ниндзю (851–854)</era>
+						<era type="25">Сайко (854–857)</era>
+						<era type="26">Тэнъан (857–859)</era>
+						<era type="27">Дзёган (859–877)</era>
+						<era type="28">Гангё (877–885)</era>
+						<era type="29">Нинна (885–889)</era>
+						<era type="30">Канпё (889–898)</era>
+						<era type="31">Сётай (898–901)</era>
+						<era type="32">Энги (901–923)</era>
+						<era type="33">Энтё (923–931)</era>
+						<era type="34">Дзёхей (931–938)</era>
+						<era type="35">Тэнгё (938–947)</era>
+						<era type="36">Тэнряку (947–957)</era>
+						<era type="37">Тэнтоку (957–961)</era>
+						<era type="38">Ова (961–964)</era>
+						<era type="39">Кохо (964–968)</era>
+						<era type="40">Анна (968–970)</era>
+						<era type="41">Тэнроку (970–973)</era>
+						<era type="42">Тэнъэн (973–976)</era>
+						<era type="43">Дзёгэн (976–978)</era>
+						<era type="44">Тэнгэн (978–983)</era>
+						<era type="45">Эйкан (983–985)</era>
+						<era type="46">Канна (985–987)</era>
+						<era type="47">Эйэн (987–989)</era>
+						<era type="48">Эйсо (989–990)</era>
+						<era type="49">Сёряку (990–995)</era>
+						<era type="50">Тётоку (995–999)</era>
+						<era type="51">Тёхо (999–1004)</era>
+						<era type="52">Канко (1004–1012)</era>
+						<era type="53">Тёва (1012–1017)</era>
+						<era type="54">Каннин (1017–1021)</era>
+						<era type="55">Дзиан (1021–1024)</era>
+						<era type="56">Мандзю (1024–1028)</era>
+						<era type="57">Тёгэн (1028–1037)</era>
+						<era type="58">Тёряку (1037–1040)</era>
+						<era type="59">Тёкю (1040–1044)</era>
+						<era type="60">Кантоку (1044–1046)</era>
+						<era type="61">Эйсё (1046–1053)</era>
+						<era type="62">Тэнги (1053–1058)</era>
+						<era type="63">Кохэй (1058–1065)</era>
+						<era type="64">Дзиряку (1065–1069)</era>
+						<era type="65">Энкю (1069–1074)</era>
+						<era type="66">Дзюхо (1074–1077)</era>
+						<era type="67">Дзёряку (1077–1081)</era>
+						<era type="68">Эйхо (1081–1084)</era>
+						<era type="69">Отоку (1084–1087)</era>
+						<era type="70">Кандзи (1087–1094)</era>
+						<era type="71">Кахо (1094–1096)</era>
+						<era type="72">Эйтё (1096–1097)</era>
+						<era type="73">Дзётоку (1097–1099)</era>
+						<era type="74">Кова (1099–1104)</era>
+						<era type="75">Тёдзи (1104–1106)</era>
+						<era type="76">Кадзё (1106–1108)</era>
+						<era type="77">Тэннин (1108–1110)</era>
+						<era type="78">Тэнъэй (1110–1113)</era>
+						<era type="79">Эйкю (1113–1118)</era>
+						<era type="80">Гэнъэй (1118–1120)</era>
+						<era type="81">Хоан (1120–1124)</era>
+						<era type="82">Тэндзи (1124–1126)</era>
+						<era type="83">Дайдзи (1126–1131)</era>
+						<era type="84">Тэнсё (1131–1132)</era>
+						<era type="85">Тёсё (1132–1135)</era>
+						<era type="86">Хоэн (1135–1141)</era>
+						<era type="87">Эйдзи (1141–1142)</era>
+						<era type="88">Кодзи (1142–1144)</era>
+						<era type="89">Тэнъё (1144–1145)</era>
+						<era type="90">Кюан (1145–1151)</era>
+						<era type="91">Нимпэй (1151–1154)</era>
+						<era type="92">Кюдзю (1154–1156)</era>
+						<era type="93">Хогэн (1156–1159)</era>
+						<era type="94">Хэйдзи (1159–1160)</era>
+						<era type="95">Эйряку (1160–1161)</era>
+						<era type="96">Охо (1161–1163)</era>
+						<era type="97">Тёкан (1163–1165)</era>
+						<era type="98">Эйман (1165–1166)</era>
+						<era type="99">Нинъан (1166–1169)</era>
+						<era type="100">Као (1169–1171)</era>
+						<era type="101">Дзёан (1171–1175)</era>
+						<era type="102">Ангэн (1175–1177)</era>
+						<era type="103">Дзисё (1177–1181)</era>
+						<era type="104">Ёва (1181–1182)</era>
+						<era type="105">Дзюэй (1182–1184)</era>
+						<era type="106">Гэнрюку (1184–1185)</era>
+						<era type="107">Бундзи (1185–1190)</era>
+						<era type="108">Кэнкю (1190–1199)</era>
+						<era type="109">Сёдзи (1199–1201)</era>
+						<era type="110">Кэннин (1201–1204)</era>
+						<era type="111">Гэнкю (1204–1206)</era>
+						<era type="112">Кэнъэй (1206–1207)</era>
+						<era type="113">Дзёгэн (1207–1211)</era>
+						<era type="114">Кэнряку (1211–1213)</era>
+						<era type="115">Кэмпо (1213–1219)</era>
+						<era type="116">Дзёкю (1219–1222)</era>
+						<era type="117">Дзёо (1222–1224)</era>
+						<era type="118">Гэннин (1224–1225)</era>
+						<era type="119">Кароку (1225–1227)</era>
+						<era type="120">Антэй (1227–1229)</era>
+						<era type="121">Канги (1229–1232)</era>
+						<era type="122">Дзёэй (1232–1233)</era>
+						<era type="123">Тэмпуку (1233–1234)</era>
+						<era type="124">Бунряку (1234–1235)</era>
+						<era type="125">Катэй (1235–1238)</era>
+						<era type="126">Рякунин (1238–1239)</era>
+						<era type="127">Энъо (1239–1240)</era>
+						<era type="128">Ниндзи (1240–1243)</era>
+						<era type="129">Кангэн (1243–1247)</era>
+						<era type="130">Ходзи (1247–1249)</era>
+						<era type="131">Кэнтё (1249–1256)</era>
+						<era type="132">Когэн (1256–1257)</era>
+						<era type="133">Сёка (1257–1259)</era>
+						<era type="134">Сёгэн (1259–1260)</era>
+						<era type="135">Бунъо (1260–1261)</era>
+						<era type="136">Котё (1261–1264)</era>
+						<era type="137">Бунъэй (1264–1275)</era>
+						<era type="138">Кэндзи (1275–1278)</era>
+						<era type="139">Коан (1278–1288)</era>
+						<era type="140">Сёо (1288–1293)</era>
+						<era type="141">Эйнин (1293–1299)</era>
+						<era type="142">Сёан (1299–1302)</era>
+						<era type="143">Кэнгэн (1302–1303)</era>
+						<era type="144">Кагэн (1303–1306)</era>
+						<era type="145">Токудзи (1306–1308)</era>
+						<era type="146">Энкё (1308–1311)</era>
+						<era type="147">Отё (1311–1312)</era>
+						<era type="148">Сёва (1312–1317)</era>
+						<era type="149">Бумпо (1317–1319)</era>
+						<era type="150">Гэнъо (1319–1321)</era>
+						<era type="151">Гэнко (1321–1324)</era>
+						<era type="152">Сётю (1324–1326)</era>
+						<era type="153">Каряку (1326–1329)</era>
+						<era type="154">Гэнтоку (1329–1331)</era>
+						<era type="155">Гэнко (1331–1334)</era>
+						<era type="156">Кэнму (1334–1336)</era>
+						<era type="157">Энгэн (1336–1340)</era>
+						<era type="158">Кококу (1340–1346)</era>
+						<era type="159">Сёхэй (1346–1370)</era>
+						<era type="160">Кэнтоку (1370–1372)</era>
+						<era type="161">Бунтю (1372–1375)</era>
+						<era type="162">Тэндзю (1375–1379)</era>
+						<era type="163">Коряку (1379–1381)</era>
+						<era type="164">Кова (1381–1384)</era>
+						<era type="165">Гэнтю (1384–1392)</era>
+						<era type="166">Ситоку (1384–1387)</era>
+						<era type="167">Какэй (1387–1389)</era>
+						<era type="168">Коо (1389–1390)</era>
+						<era type="169">Мэйтоку (1390–1394)</era>
+						<era type="170">Оэй (1394–1428)</era>
+						<era type="171">Сётё (1428–1429)</era>
+						<era type="172">Эйкё (1429–1441)</era>
+						<era type="173">Какицу (1441–1444)</era>
+						<era type="174">Бунъан (1444–1449)</era>
+						<era type="175">Хотоку (1449–1452)</era>
+						<era type="176">Кётоку (1452–1455)</era>
+						<era type="177">Кёсё (1455–1457)</era>
+						<era type="178">Тёроку (1457–1460)</era>
+						<era type="179">Кансё (1460–1466)</era>
+						<era type="180">Бунсё (1466–1467)</era>
+						<era type="181">Онин (1467–1469)</era>
+						<era type="182">Бунмэй (1469–1487)</era>
+						<era type="183">Тёкё (1487–1489)</era>
+						<era type="184">Энтоку (1489–1492)</era>
+						<era type="185">Мэйо (1492–1501)</era>
+						<era type="186">Бунки (1501–1504)</era>
+						<era type="187">Эйсё (1504–1521)</era>
+						<era type="188">Дайэй (1521–1528)</era>
+						<era type="189">Кёроку (1528–1532)</era>
+						<era type="190">Тэнбун (1532–1555)</era>
+						<era type="191">Кодзи (1555–1558)</era>
+						<era type="192">Эйроку (1558–1570)</era>
+						<era type="193">Гэнки (1570–1573)</era>
+						<era type="194">Тэнсё (1573–1592)</era>
+						<era type="195">Бунроку (1592–1596)</era>
+						<era type="196">Кэйтё (1596–1615)</era>
+						<era type="197">Гэнна (1615–1624)</era>
+						<era type="198">Канъэй (1624–1644)</era>
+						<era type="199">Сёхё (1644–1648)</era>
+						<era type="200">Кэйан (1648–1652)</era>
+						<era type="201">Дзёо (1652–1655)</era>
+						<era type="202">Мэйрэки (1655–1658)</era>
+						<era type="203">Мандзи (1658–1661)</era>
+						<era type="204">Камбун (1661–1673)</era>
+						<era type="205">Эмпо (1673–1681)</era>
+						<era type="206">Тэнна (1681–1684)</era>
+						<era type="207">Дзёкё (1684–1688)</era>
+						<era type="208">Гэнроку (1688–1704)</era>
+						<era type="209">Хоэй (1704–1711)</era>
+						<era type="210">Сётоку (1711–1716)</era>
+						<era type="211">Кёхо (1716–1736)</era>
+						<era type="212">Гэмбун (1736–1741)</era>
+						<era type="213">Кампо (1741–1744)</era>
+						<era type="214">Энкё (1744–1748)</era>
+						<era type="215">Канъэн (1748–1751)</era>
+						<era type="216">Хореки (1751–1764)</era>
+						<era type="217">Мэйва (1764–1772)</era>
+						<era type="218">Анъэй (1772–1781)</era>
+						<era type="219">Тэнмэй (1781–1789)</era>
+						<era type="220">Кансэй (1789–1801)</era>
+						<era type="221">Кёва (1801–1804)</era>
+						<era type="222">Бунка (1804–1818)</era>
+						<era type="223">Бунсэй (1818–1830)</era>
+						<era type="224">Тэнпо (1830–1844)</era>
+						<era type="225">Кока (1844–1848)</era>
+						<era type="226">Каэй (1848–1854)</era>
+						<era type="227">Ансэй (1854–1860)</era>
+						<era type="228">Манъэн (1860–1861)</era>
+						<era type="229">Бункю (1861–1864)</era>
+						<era type="230">Гэндзи (1864–1865)</era>
+						<era type="231">Кейо (1865–1868)</era>
+						<era type="232">Мэйдзи</era>
+						<era type="233">Тайсё</era>
+						<era type="234">Сёва</era>
+						<era type="235">Хэйсэй</era>
+						<era type="236">Рэйва</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">Тайка (645–650)</era>
-						<era type="1" draft="unconfirmed">Хакути (650–671)</era>
-						<era type="2" draft="unconfirmed">Хакухо (672–686)</era>
-						<era type="3" draft="unconfirmed">Сючё (686–701)</era>
-						<era type="4" draft="unconfirmed">Тайхо (701–704)</era>
-						<era type="5" draft="unconfirmed">Кёюн (704–708)</era>
-						<era type="6" draft="unconfirmed">Вадо (708–715)</era>
-						<era type="7" draft="unconfirmed">Рэйки (715–717)</era>
-						<era type="8" draft="unconfirmed">Ёро (717–724)</era>
-						<era type="9" draft="unconfirmed">Дзинки (724–729)</era>
-						<era type="10" draft="unconfirmed">Темпьё (729–749)</era>
-						<era type="11" draft="unconfirmed">Темпьё-кампо (749–749)</era>
-						<era type="12" draft="unconfirmed">Темпьё-Сьохо (749-757)</era>
-						<era type="13" draft="unconfirmed">Темпьё-Ходзи (757-765)</era>
-						<era type="14" draft="unconfirmed">Темпьё-Ходзи (765-767)</era>
-						<era type="15" draft="unconfirmed">Джинго-Кёюн (767-770)</era>
-						<era type="16" draft="unconfirmed">Хоки (770–780)</era>
-						<era type="17" draft="unconfirmed">Теньё (781–782)</era>
-						<era type="18" draft="unconfirmed">Енряку (782–806)</era>
-						<era type="19" draft="unconfirmed">Дайдо (806–810)</era>
-						<era type="20" draft="unconfirmed">Конин (810–824)</era>
-						<era type="21" draft="unconfirmed">Тентьо (824–834)</era>
-						<era type="22" draft="unconfirmed">Шова (834–848)</era>
-						<era type="23" draft="unconfirmed">Кайо (848–851)</era>
-						<era type="24" draft="unconfirmed">Ниндзю (851–854)</era>
-						<era type="25" draft="unconfirmed">Сайко (854–857)</era>
-						<era type="26" draft="unconfirmed">Теннан (857–859)</era>
-						<era type="27" draft="unconfirmed">Йоган (859–877)</era>
-						<era type="28" draft="unconfirmed">Генкей (877–885)</era>
-						<era type="29" draft="unconfirmed">Нинна (885–889)</era>
-						<era type="30" draft="unconfirmed">Кампьё (889–898)</era>
-						<era type="31" draft="unconfirmed">Сьотай (898–901)</era>
-						<era type="32" draft="unconfirmed">Энги (901–923)</era>
-						<era type="33" draft="unconfirmed">Ентьо (923–931)</era>
-						<era type="34" draft="unconfirmed">Сьёхэй (931–938)</era>
-						<era type="35" draft="unconfirmed">Тенгьо (938–947)</era>
-						<era type="36" draft="unconfirmed">Тенрияку (947–957)</era>
-						<era type="37" draft="unconfirmed">Тентоку (957–961)</era>
-						<era type="38" draft="unconfirmed">Ова (961–964)</era>
-						<era type="39" draft="unconfirmed">Кохо (964–968)</era>
-						<era type="40" draft="unconfirmed">Анна (968–970)</era>
-						<era type="41" draft="unconfirmed">Тенроку (970–973)</era>
-						<era type="42" draft="unconfirmed">Теньен (973–976)</era>
-						<era type="43" draft="unconfirmed">Дзьоген (976–978)</era>
-						<era type="44" draft="unconfirmed">Тенген (978–983)</era>
-						<era type="45" draft="unconfirmed">Ейкан (983–985)</era>
-						<era type="46" draft="unconfirmed">Канна (985–987)</era>
-						<era type="47" draft="unconfirmed">Ейен (987–989)</era>
-						<era type="48" draft="unconfirmed">Ейсо (989–990)</era>
-						<era type="49" draft="unconfirmed">Сёряку (990–995)</era>
-						<era type="50" draft="unconfirmed">Тётоку (995–999)</era>
-						<era type="51" draft="unconfirmed">Тёхо (999–1004)</era>
-						<era type="52" draft="unconfirmed">Канко (1004–1012)</era>
-						<era type="53" draft="unconfirmed">Тёва (1012–1017)</era>
-						<era type="54" draft="unconfirmed">Каннин (1017–1021)</era>
-						<era type="55" draft="unconfirmed">Дзиан (1021–1024)</era>
-						<era type="56" draft="unconfirmed">Мандзю (1024–1028)</era>
-						<era type="57" draft="unconfirmed">Тёгэн (1028–1037)</era>
-						<era type="58" draft="unconfirmed">Тёряку (1037–1040)</era>
-						<era type="59" draft="unconfirmed">Тёкю (1040–1044)</era>
-						<era type="60" draft="unconfirmed">Катоку (1044–1046)</era>
-						<era type="61" draft="unconfirmed">Эйсо (1046–1053)</era>
-						<era type="62" draft="unconfirmed">Тэнги (1053–1058)</era>
-						<era type="63" draft="unconfirmed">Кохэй (1058–1065)</era>
-						<era type="64" draft="unconfirmed">Дзиряку (1065–1069)</era>
-						<era type="65" draft="unconfirmed">Энкю (1069–1074)</era>
-						<era type="66" draft="unconfirmed">Сёхо (1074–1077)</era>
-						<era type="67" draft="unconfirmed">Сёряку (1077–1081)</era>
-						<era type="68" draft="unconfirmed">Эйхо (1081–1084)</era>
-						<era type="69" draft="unconfirmed">Отоку (1084–1087)</era>
-						<era type="70" draft="unconfirmed">Кандзи (1087–1094)</era>
-						<era type="71" draft="unconfirmed">Кахо (1094–1096)</era>
-						<era type="72" draft="unconfirmed">Эйтё (1096–1097)</era>
-						<era type="73" draft="unconfirmed">Сётоку (1097–1099)</era>
-						<era type="74" draft="unconfirmed">Кова (1099–1104)</era>
-						<era type="75" draft="unconfirmed">Тёдзи (1104–1106)</era>
-						<era type="76" draft="unconfirmed">Касё (1106–1108)</era>
-						<era type="77" draft="unconfirmed">Тэннин (1108–1110)</era>
-						<era type="78" draft="unconfirmed">Тэнъэй (1110–1113)</era>
-						<era type="79" draft="unconfirmed">Эйкю (1113–1118)</era>
-						<era type="80" draft="unconfirmed">Гэнъэй (1118–1120)</era>
-						<era type="81" draft="unconfirmed">Хоан (1120–1124)</era>
-						<era type="82" draft="unconfirmed">Тэндзи (1124–1126)</era>
-						<era type="83" draft="unconfirmed">Дайдзи (1126–1131)</era>
-						<era type="84" draft="unconfirmed">Тэнсё (1131–1132)</era>
-						<era type="85" draft="unconfirmed">Тёсё (1132–1135)</era>
-						<era type="86" draft="unconfirmed">Хоэн (1135–1141)</era>
-						<era type="87" draft="unconfirmed">Эйдзи (1141–1142)</era>
-						<era type="88" draft="unconfirmed">Кодзи (1142–1144)</era>
-						<era type="89" draft="unconfirmed">Тэнё (1144–1145)</era>
-						<era type="90" draft="unconfirmed">Кюан (1145–1151)</era>
-						<era type="91" draft="unconfirmed">Нимпэй (1151–1154)</era>
-						<era type="92" draft="unconfirmed">Кюдзю (1154–1156)</era>
-						<era type="93" draft="unconfirmed">Хогэн (1156–1159)</era>
-						<era type="94" draft="unconfirmed">Хэйдзи (1159–1160)</era>
-						<era type="95" draft="unconfirmed">Эйряку (1160–1161)</era>
-						<era type="96" draft="unconfirmed">Охо (1161–1163)</era>
-						<era type="97" draft="unconfirmed">Тёкан (1163–1165)</era>
-						<era type="98" draft="unconfirmed">Эйман (1165–1166)</era>
-						<era type="99" draft="unconfirmed">Нинъан (1166–1169)</era>
-						<era type="100" draft="unconfirmed">Као (1169–1171)</era>
-						<era type="101" draft="unconfirmed">Сёан (1171–1175)</era>
-						<era type="102" draft="unconfirmed">Ангэн (1175–1177)</era>
-						<era type="103" draft="unconfirmed">Дзисё (1177–1181)</era>
-						<era type="104" draft="unconfirmed">Ёва (1181–1182)</era>
-						<era type="105" draft="unconfirmed">Дзюэй (1182–1184)</era>
-						<era type="106" draft="unconfirmed">Гэнрюку (1184–1185)</era>
-						<era type="107" draft="unconfirmed">Бундзи (1185–1190)</era>
-						<era type="108" draft="unconfirmed">Кэнкю (1190–1199)</era>
-						<era type="109" draft="unconfirmed">Сёдзи (1199–1201)</era>
-						<era type="110" draft="unconfirmed">Кэннин (1201–1204)</era>
-						<era type="111" draft="unconfirmed">Гэнкю (1204–1206)</era>
-						<era type="112" draft="unconfirmed">Кэнъэй (1206–1207)</era>
-						<era type="113" draft="unconfirmed">Сёгэн (1207–1211)</era>
-						<era type="114" draft="unconfirmed">Кэнряку (1211–1213)</era>
-						<era type="115" draft="unconfirmed">Кэмпо (1213–1219)</era>
-						<era type="116" draft="unconfirmed">Сёкю (1219–1222)</era>
-						<era type="117" draft="unconfirmed">Дзёо (1222–1224)</era>
-						<era type="118" draft="unconfirmed">Гэннин (1224–1225)</era>
-						<era type="119" draft="unconfirmed">Кароку (1225–1227)</era>
-						<era type="120" draft="unconfirmed">Антэй (1227–1229)</era>
-						<era type="121" draft="unconfirmed">Канки (1229–1232)</era>
-						<era type="122" draft="unconfirmed">Дзёэй (1232–1233)</era>
-						<era type="123" draft="unconfirmed">Тэмпуку (1233–1234)</era>
-						<era type="124" draft="unconfirmed">Бунряку (1234–1235)</era>
-						<era type="125" draft="unconfirmed">Катэй (1235–1238)</era>
-						<era type="126" draft="unconfirmed">Рякунин (1238–1239)</era>
-						<era type="127" draft="unconfirmed">Энъо (1239–1240)</era>
-						<era type="128" draft="unconfirmed">Ниндзи (1240–1243)</era>
-						<era type="129" draft="unconfirmed">Кангэн (1243–1247)</era>
-						<era type="130" draft="unconfirmed">Ходзи (1247–1249)</era>
-						<era type="131" draft="unconfirmed">Кэнтё (1249–1256)</era>
-						<era type="132" draft="unconfirmed">Когэн (1256–1257)</era>
-						<era type="133" draft="unconfirmed">Сёка (1257–1259)</era>
-						<era type="134" draft="unconfirmed">Сёгэн (1259–1260)</era>
-						<era type="135" draft="unconfirmed">Бунъо (1260–1261)</era>
-						<era type="136" draft="unconfirmed">Котё (1261–1264)</era>
-						<era type="137" draft="unconfirmed">Бунъэй (1264–1275)</era>
-						<era type="138" draft="unconfirmed">Кэндзи (1275–1278)</era>
-						<era type="139" draft="unconfirmed">Коан (1278–1288)</era>
-						<era type="140" draft="unconfirmed">Сёо (1288–1293)</era>
-						<era type="141" draft="unconfirmed">Эйнин (1293–1299)</era>
-						<era type="142" draft="unconfirmed">Сёан (1299–1302)</era>
-						<era type="143" draft="unconfirmed">Кэнгэн (1302–1303)</era>
-						<era type="144" draft="unconfirmed">Кагэн (1303–1306)</era>
-						<era type="145" draft="unconfirmed">Токудзи (1306–1308)</era>
-						<era type="146" draft="unconfirmed">Энкэй (1308–1311)</era>
-						<era type="147" draft="unconfirmed">Отё (1311–1312)</era>
-						<era type="148" draft="unconfirmed">Сёва (1312–1317)</era>
-						<era type="149" draft="unconfirmed">Бумпо (1317–1319)</era>
-						<era type="150" draft="unconfirmed">Гэно (1319–1321)</era>
-						<era type="151" draft="unconfirmed">Гэнкё (1321–1324)</era>
-						<era type="152" draft="unconfirmed">Сётю (1324–1326)</era>
-						<era type="153" draft="unconfirmed">Карэки (1326–1329)</era>
-						<era type="154" draft="unconfirmed">Гэнтоку (1329–1331)</era>
-						<era type="155" draft="unconfirmed">Гэнко (1331–1334)</era>
-						<era type="156" draft="unconfirmed">Кэмму (1334–1336)</era>
-						<era type="157" draft="unconfirmed">Энгэн (1336–1340)</era>
-						<era type="158" draft="unconfirmed">Кококу (1340–1346)</era>
-						<era type="159" draft="unconfirmed">Сёхэй (1346–1370)</era>
-						<era type="160" draft="unconfirmed">Кэнтоку (1370–1372)</era>
-						<era type="161" draft="unconfirmed">Бунтю (1372–1375)</era>
-						<era type="162" draft="unconfirmed">Иэндзю (1375–1379)</era>
-						<era type="163" draft="unconfirmed">Коряку (1379–1381)</era>
-						<era type="164" draft="unconfirmed">Кова (1381–1384)</era>
-						<era type="165" draft="unconfirmed">Гэнтю (1384–1392)</era>
-						<era type="166" draft="unconfirmed">Мэйтоку (1384–1387)</era>
-						<era type="167" draft="unconfirmed">Какэй (1387–1389)</era>
-						<era type="168" draft="unconfirmed">Коо (1389–1390)</era>
-						<era type="169" draft="unconfirmed">Мэйтоку (1390–1394)</era>
-						<era type="170" draft="unconfirmed">Оэй (1394–1428)</era>
-						<era type="171" draft="unconfirmed">Сётё (1428–1429)</era>
-						<era type="172" draft="unconfirmed">Эйкё (1429–1441)</era>
-						<era type="173" draft="unconfirmed">Какицу (1441–1444)</era>
-						<era type="174" draft="unconfirmed">Банъан (1444–1449)</era>
-						<era type="175" draft="unconfirmed">Хотоку (1449–1452)</era>
-						<era type="176" draft="unconfirmed">Кётоку (1452–1455)</era>
-						<era type="177" draft="unconfirmed">Косё (1455–1457)</era>
-						<era type="178" draft="unconfirmed">Тёроку (1457–1460)</era>
-						<era type="179" draft="unconfirmed">Кансё (1460–1466)</era>
-						<era type="180" draft="unconfirmed">Бунсё (1466–1467)</era>
-						<era type="181" draft="unconfirmed">Онин (1467–1469)</era>
-						<era type="182" draft="unconfirmed">Буммэй (1469–1487)</era>
-						<era type="183" draft="unconfirmed">Тёкё (1487–1489)</era>
-						<era type="184" draft="unconfirmed">Энтоку (1489–1492)</era>
-						<era type="185" draft="unconfirmed">Мэйо (1492–1501)</era>
-						<era type="186" draft="unconfirmed">Бунки (1501–1504)</era>
-						<era type="187" draft="unconfirmed">Эйсё (1504–1521)</era>
-						<era type="188" draft="unconfirmed">Тайэй (1521–1528)</era>
-						<era type="189" draft="unconfirmed">Кёроку (1528–1532)</era>
-						<era type="190" draft="unconfirmed">Тэммон (1532–1555)</era>
-						<era type="191" draft="unconfirmed">Кодзи (1555–1558)</era>
-						<era type="192" draft="unconfirmed">Эйроку (1558–1570)</era>
-						<era type="193" draft="unconfirmed">Гэнки (1570–1573)</era>
-						<era type="194" draft="unconfirmed">Тэнсё (1573–1592)</era>
-						<era type="195" draft="unconfirmed">Бунроку (1592–1596)</era>
-						<era type="196" draft="unconfirmed">Кэйтё (1596–1615)</era>
-						<era type="197" draft="unconfirmed">Гэнва (1615–1624)</era>
-						<era type="198" draft="unconfirmed">Канъэй (1624–1644)</era>
-						<era type="199" draft="unconfirmed">Сёхо (1644–1648)</era>
-						<era type="200" draft="unconfirmed">Кэйан (1648–1652)</era>
-						<era type="201" draft="unconfirmed">Сё (1652–1655)</era>
-						<era type="202" draft="unconfirmed">Мэйряку (1655–1658)</era>
-						<era type="203" draft="unconfirmed">Мандзи (1658–1661)</era>
-						<era type="204" draft="unconfirmed">Камбун (1661–1673)</era>
-						<era type="205" draft="unconfirmed">Эмпо (1673–1681)</era>
-						<era type="206" draft="unconfirmed">Тэнва (1681–1684)</era>
-						<era type="207" draft="unconfirmed">Дзёкё (1684–1688)</era>
-						<era type="208" draft="unconfirmed">Гэнроку (1688–1704)</era>
-						<era type="209" draft="unconfirmed">Хоэй (1704–1711)</era>
-						<era type="210" draft="unconfirmed">Сётоку (1711–1716)</era>
-						<era type="211" draft="unconfirmed">Кёхо (1716–1736)</era>
-						<era type="212" draft="unconfirmed">Гэмбун (1736–1741)</era>
-						<era type="213" draft="unconfirmed">Кампо (1741–1744)</era>
-						<era type="214" draft="unconfirmed">Энкё (1744–1748)</era>
-						<era type="215" draft="unconfirmed">Канъэн (1748–1751)</era>
-						<era type="216" draft="unconfirmed">Хоряку (1751–1764)</era>
-						<era type="217" draft="unconfirmed">Мэйва (1764–1772)</era>
-						<era type="218" draft="unconfirmed">Анъэй (1772–1781)</era>
-						<era type="219" draft="unconfirmed">Бунка (1804–1818)</era>
-						<era type="220" draft="unconfirmed">Кансэй (1789–1801)</era>
-						<era type="221" draft="unconfirmed">Кёва (1801–1804)</era>
-						<era type="222" draft="unconfirmed">Бунка (1804–1818)</era>
-						<era type="223" draft="unconfirmed">Бунсэй (1818–1830)</era>
-						<era type="224" draft="unconfirmed">Тэмпо (1830–1844)</era>
-						<era type="225" draft="unconfirmed">Кока (1844–1848)</era>
-						<era type="226" draft="unconfirmed">Каэй (1848–1854)</era>
-						<era type="227" draft="unconfirmed">Ансэй (1854–1860)</era>
-						<era type="228" draft="unconfirmed">Манъэн (1860–1861)</era>
-						<era type="229" draft="unconfirmed">Бункю (1861–1864)</era>
-						<era type="230" draft="unconfirmed">Гендзи (1864–1865)</era>
-						<era type="231" draft="unconfirmed">Кейо (1865–1868)</era>
-						<era type="232" draft="unconfirmed">Мэйдзи</era>
-						<era type="233" draft="unconfirmed">Тайсьо</era>
-						<era type="234" draft="unconfirmed">Сьова</era>
-						<era type="235" draft="unconfirmed">Хэйсэй</era>
-						<era type="236" draft="unconfirmed">Рэйва</era>
+						<era type="0">Тайка</era>
+						<era type="1">Хакути</era>
+						<era type="2">Хакухо</era>
+						<era type="3">Сютё</era>
+						<era type="4">Тайхо</era>
+						<era type="5">Кэйун</era>
+						<era type="6">Вадо</era>
+						<era type="7">Рэйки</era>
+						<era type="8">Ёро</era>
+						<era type="9">Дзинки</era>
+						<era type="10">Тэмпьё</era>
+						<era type="11">Тэмпьё-Канпо</era>
+						<era type="12">Тэмпьё-Сёхо</era>
+						<era type="13">Тэмпьё-Ходзи</era>
+						<era type="14">Тэмпьё-Дзинго</era>
+						<era type="15">Дзинго-Кэйун</era>
+						<era type="16">Хоки</era>
+						<era type="17">Тэнъо</era>
+						<era type="18">Энряку</era>
+						<era type="19">Дайдо</era>
+						<era type="20">Конин</era>
+						<era type="21">Тэнтьё</era>
+						<era type="22">Дзёва</era>
+						<era type="23">Касё</era>
+						<era type="24">Ниндзю</era>
+						<era type="25">Сайко</era>
+						<era type="26">Тэнъан</era>
+						<era type="27">Дзёган</era>
+						<era type="28">Гангё</era>
+						<era type="29">Нинна</era>
+						<era type="30">Канпё</era>
+						<era type="31">Сётай</era>
+						<era type="32">Энги</era>
+						<era type="33">Энтё</era>
+						<era type="34">Дзёхей</era>
+						<era type="35">Тэнгё</era>
+						<era type="36">Тэнряку</era>
+						<era type="37">Тэнтоку</era>
+						<era type="38">Ова</era>
+						<era type="39">Кохо</era>
+						<era type="40">Анна</era>
+						<era type="41">Тэнроку</era>
+						<era type="42">Тэнъэн</era>
+						<era type="43">Дзёгэн</era>
+						<era type="44">Тэнгэн</era>
+						<era type="45">Эйкан</era>
+						<era type="46">Канна</era>
+						<era type="47">Эйэн</era>
+						<era type="48">Эйсо</era>
+						<era type="49">Сёряку</era>
+						<era type="50">Тётоку</era>
+						<era type="51">Тёхо</era>
+						<era type="52">Канко</era>
+						<era type="53">Тёва</era>
+						<era type="54">Каннин</era>
+						<era type="55">Дзиан</era>
+						<era type="56">Мандзю</era>
+						<era type="57">Тёгэн</era>
+						<era type="58">Тёряку</era>
+						<era type="59">Тёкю</era>
+						<era type="60">Кантоку</era>
+						<era type="61">Эйсё</era>
+						<era type="62">Тэнги</era>
+						<era type="63">Кохэй</era>
+						<era type="64">Дзиряку</era>
+						<era type="65">Энкю</era>
+						<era type="66">Дзюхо</era>
+						<era type="67">Дзёряку</era>
+						<era type="68">Эйхо</era>
+						<era type="69">Отоку</era>
+						<era type="70">Кандзи</era>
+						<era type="71">Кахо</era>
+						<era type="72">Эйтё</era>
+						<era type="73">Дзётоку</era>
+						<era type="74">Кова</era>
+						<era type="75">Тёдзи</era>
+						<era type="76">Кадзё</era>
+						<era type="77">Тэннин</era>
+						<era type="78">Тэнъэй</era>
+						<era type="79">Эйкю</era>
+						<era type="80">Гэнъэй</era>
+						<era type="81">Хоан</era>
+						<era type="82">Тэндзи</era>
+						<era type="83">Дайдзи</era>
+						<era type="84">Тэнсё</era>
+						<era type="85">Тёсё</era>
+						<era type="86">Хоэн</era>
+						<era type="87">Эйдзи</era>
+						<era type="88">Кодзи</era>
+						<era type="89">Тэнъё</era>
+						<era type="90">Кюан</era>
+						<era type="91">Нимпэй</era>
+						<era type="92">Кюдзю</era>
+						<era type="93">Хогэн</era>
+						<era type="94">Хэйдзи</era>
+						<era type="95">Эйряку</era>
+						<era type="96">Охо</era>
+						<era type="97">Тёкан</era>
+						<era type="98">Эйман</era>
+						<era type="99">Нинъан</era>
+						<era type="100">Као</era>
+						<era type="101">Дзёан</era>
+						<era type="102">Ангэн</era>
+						<era type="103">Дзисё</era>
+						<era type="104">Ёва</era>
+						<era type="105">Дзюэй</era>
+						<era type="106">Гэнрюку</era>
+						<era type="107">Бундзи</era>
+						<era type="108">Кэнкю</era>
+						<era type="109">Сёдзи</era>
+						<era type="110">Кэннин</era>
+						<era type="111">Гэнкю</era>
+						<era type="112">Кэнъэй</era>
+						<era type="113">Дзёгэн</era>
+						<era type="114">Кэнряку</era>
+						<era type="115">Кэмпо</era>
+						<era type="116">Дзёкю</era>
+						<era type="117">Дзёо</era>
+						<era type="118">Гэннин</era>
+						<era type="119">Кароку</era>
+						<era type="120">Антэй</era>
+						<era type="121">Канги</era>
+						<era type="122">Дзёэй</era>
+						<era type="123">Тэмпуку</era>
+						<era type="124">Бунряку</era>
+						<era type="125">Катэй</era>
+						<era type="126">Рякунин</era>
+						<era type="127">Энъо</era>
+						<era type="128">Ниндзи</era>
+						<era type="129">Кангэн</era>
+						<era type="130">Ходзи</era>
+						<era type="131">Кэнтё</era>
+						<era type="132">Когэн</era>
+						<era type="133">Сёка</era>
+						<era type="134">Сёгэн</era>
+						<era type="135">Бунъо</era>
+						<era type="136">Котё</era>
+						<era type="137">Бунъэй</era>
+						<era type="138">Кэндзи</era>
+						<era type="139">Коан</era>
+						<era type="140">Сёо</era>
+						<era type="141">Эйнин</era>
+						<era type="142">Сёан</era>
+						<era type="143">Кэнгэн</era>
+						<era type="144">Кагэн</era>
+						<era type="145">Токудзи</era>
+						<era type="146">Энкё</era>
+						<era type="147">Отё</era>
+						<era type="148">Сёва</era>
+						<era type="149">Бумпо</era>
+						<era type="150">Гэнъо</era>
+						<era type="151">Гэнко</era>
+						<era type="152">Сётю</era>
+						<era type="153">Каряку</era>
+						<era type="154">Гэнтоку</era>
+						<era type="155">Гэнко</era>
+						<era type="156">Кэнму</era>
+						<era type="157">Энгэн</era>
+						<era type="158">Кококу</era>
+						<era type="159">Сёхэй</era>
+						<era type="160">Кэнтоку</era>
+						<era type="161">Бунтю</era>
+						<era type="162">Тэндзю</era>
+						<era type="163">Коряку</era>
+						<era type="164">Кова</era>
+						<era type="165">Гэнтю</era>
+						<era type="166">Ситоку</era>
+						<era type="167">Какэй</era>
+						<era type="168">Коо</era>
+						<era type="169">Мэйтоку</era>
+						<era type="170">Оэй</era>
+						<era type="171">Сётё</era>
+						<era type="172">Эйкё</era>
+						<era type="173">Какицу</era>
+						<era type="174">Бунъан</era>
+						<era type="175">Хотоку</era>
+						<era type="176">Кётоку</era>
+						<era type="177">Кёсё</era>
+						<era type="178">Тёроку</era>
+						<era type="179">Кансё</era>
+						<era type="180">Бунсё</era>
+						<era type="181">Онин</era>
+						<era type="182">Бунмэй</era>
+						<era type="183">Тёкё</era>
+						<era type="184">Энтоку</era>
+						<era type="185">Мэйо</era>
+						<era type="186">Бунки</era>
+						<era type="187">Эйсё</era>
+						<era type="188">Дайэй</era>
+						<era type="189">Кёроку</era>
+						<era type="190">Тэнбун</era>
+						<era type="191">Кодзи</era>
+						<era type="192">Эйроку</era>
+						<era type="193">Гэнки</era>
+						<era type="194">Тэнсё</era>
+						<era type="195">Бунроку</era>
+						<era type="196">Кэйтё</era>
+						<era type="197">Гэнна</era>
+						<era type="198">Канъэй</era>
+						<era type="199">Сёхё</era>
+						<era type="200">Кэйан</era>
+						<era type="201">Дзёо</era>
+						<era type="202">Мэйрэки</era>
+						<era type="203">Мандзи</era>
+						<era type="204">Камбун</era>
+						<era type="205">Эмпо</era>
+						<era type="206">Тэнна</era>
+						<era type="207">Дзёкё</era>
+						<era type="208">Гэнроку</era>
+						<era type="209">Хоэй</era>
+						<era type="210">Сётоку</era>
+						<era type="211">Кёхо</era>
+						<era type="212">Гэмбун</era>
+						<era type="213">Кампо</era>
+						<era type="214">Энкё</era>
+						<era type="215">Канъэн</era>
+						<era type="216">Хореки</era>
+						<era type="217">Мэйва</era>
+						<era type="218">Анъэй</era>
+						<era type="219">Тэнмэй</era>
+						<era type="220">Кансэй</era>
+						<era type="221">Кёва</era>
+						<era type="222">Бунка</era>
+						<era type="223">Бунсэй</era>
+						<era type="224">Тэнпо</era>
+						<era type="225">Кока</era>
+						<era type="226">Каэй</era>
+						<era type="227">Ансэй</era>
+						<era type="228">Манъэн</era>
+						<era type="229">Бункю</era>
+						<era type="230">Гэндзи</era>
+						<era type="231">Кейо</era>
+						<era type="232">Мэйдзи</era>
+						<era type="233">Тайсё</era>
+						<era type="234">Сёва</era>
+						<era type="235">Хэйсэй</era>
+						<era type="236">Рэйва</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G, y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G, y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G, y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG, y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G, y</dateFormatItem>
+						<dateFormatItem id="GyM">G, y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G, y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G, y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G, y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G, y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G, y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G, y</dateFormatItem>
+						<dateFormatItem id="yyyy">G, y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G, y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G, y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G, y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G, y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G, y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G, y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G, y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G, y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G, y, QQQQ</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G, y – G, y</greatestDifference>
+							<greatestDifference id="y">G, y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G, y.MM – G, y.MM</greatestDifference>
+							<greatestDifference id="M">G, y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G, y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G, y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G, y.MM.dd – G, y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G, y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G, y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G, y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G, y.MM.dd (E) – G, y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G, y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G, y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G, y, MMM – G, y, MMM</greatestDifference>
+							<greatestDifference id="M">G, y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G, y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G, y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G, y, MMM, d – G, y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G, y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G, y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G, y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G, y, MMM, d, E – G, y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G, y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G, y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G, y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G, y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G, y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G, y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G, y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G, y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G, y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G, y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G, y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G, y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G, y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G, y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G, y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G, y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G, y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G, y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G, y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G, y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G, y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -3148,96 +6337,231 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="persian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">фарвардин</month>
-							<month type="2" draft="unconfirmed">ордибехешт</month>
-							<month type="3" draft="unconfirmed">хордад</month>
-							<month type="4" draft="unconfirmed">тир</month>
-							<month type="5" draft="unconfirmed">мордад</month>
-							<month type="6" draft="unconfirmed">шахривер</month>
-							<month type="7" draft="unconfirmed">мехр</month>
-							<month type="8" draft="unconfirmed">абан</month>
-							<month type="9" draft="unconfirmed">азер</month>
-							<month type="10" draft="unconfirmed">дей</month>
-							<month type="11" draft="unconfirmed">бахман</month>
-							<month type="12" draft="unconfirmed">эсфанд</month>
-						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">фарвардин</month>
-							<month type="2" draft="unconfirmed">ордибехешт</month>
-							<month type="3" draft="unconfirmed">хордад</month>
-							<month type="4" draft="unconfirmed">тир</month>
-							<month type="5" draft="unconfirmed">мордад</month>
-							<month type="6" draft="unconfirmed">шахривер</month>
-							<month type="7" draft="unconfirmed">мехр</month>
-							<month type="8" draft="unconfirmed">абан</month>
-							<month type="9" draft="unconfirmed">азер</month>
-							<month type="10" draft="unconfirmed">дей</month>
-							<month type="11" draft="unconfirmed">бахман</month>
-							<month type="12" draft="unconfirmed">эсфанд</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">фарвардин</month>
-							<month type="2" draft="unconfirmed">ордибехешт</month>
-							<month type="3" draft="unconfirmed">хордад</month>
-							<month type="4" draft="unconfirmed">тир</month>
-							<month type="5" draft="unconfirmed">мордад</month>
-							<month type="6" draft="unconfirmed">шахривер</month>
-							<month type="7" draft="unconfirmed">мехр</month>
-							<month type="8" draft="unconfirmed">абан</month>
-							<month type="9" draft="unconfirmed">азер</month>
-							<month type="10" draft="unconfirmed">дей</month>
-							<month type="11" draft="unconfirmed">бахман</month>
-							<month type="12" draft="unconfirmed">эсфанд</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">фарвардин</month>
-							<month type="2" draft="unconfirmed">ордибехешт</month>
-							<month type="3" draft="unconfirmed">хордад</month>
-							<month type="4" draft="unconfirmed">тир</month>
-							<month type="5" draft="unconfirmed">мордад</month>
-							<month type="6" draft="unconfirmed">шахривер</month>
-							<month type="7" draft="unconfirmed">мехр</month>
-							<month type="8" draft="unconfirmed">абан</month>
-							<month type="9" draft="unconfirmed">азер</month>
-							<month type="10" draft="unconfirmed">дей</month>
-							<month type="11" draft="unconfirmed">бахман</month>
-							<month type="12" draft="unconfirmed">эсфанд</month>
+							<month type="1">фарвардин</month>
+							<month type="2">ордибехешт</month>
+							<month type="3">хордад</month>
+							<month type="4">тир</month>
+							<month type="5">мордад</month>
+							<month type="6">шахривер</month>
+							<month type="7">мехр</month>
+							<month type="8">абан</month>
+							<month type="9">азер</month>
+							<month type="10">дей</month>
+							<month type="11">бахман</month>
+							<month type="12">эсфанд</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">перси ҫулӗ</era>
+						<era type="0">хиджра хыҫҫӑнхи</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">перс ҫулӗ</era>
+						<era type="0">х. х.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">перс ҫ.</era>
+						<era type="0">х. х.</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'сех'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'сех' (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -3245,37 +6569,216 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="roc">
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">Китай республикин никӗсӗ таран</era>
-						<era type="1" draft="unconfirmed">Миньго</era>
+						<era type="0">Китай Республики йӗркеличченхи</era>
+						<era type="1">Китай Республики йӗркеленӗрен</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">К.р-ки нкс.трн.</era>
-						<era type="1" draft="unconfirmed">Миньго</era>
+						<era type="0">респ. й-ч.</era>
+						<era type="1">респ. й-р.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">Миньго ҫтчн</era>
-						<era type="1" draft="unconfirmed">Миньго</era>
+						<era type="0">р. й-ч.</era>
+						<era type="1">р. й-р.</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y, MMMM, d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y, MMMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y, MMM, d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y.MM.dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="Md">MM.dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM, d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM, d, E</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM, d</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y.MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y.MM.dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y.MM.dd (E)</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y, MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y, MMM, d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y, MMM, d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y, MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y, QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y, QQQQ</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y.MM – G y.MM</greatestDifference>
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd – G y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="G">G y.MM.dd (E) – G y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y, MMM – G y, MMM</greatestDifference>
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d – G y, MMM, d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="G">G y, MMM, d, E – G y, MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">a h:mm – a h:mm (v)</greatestDifference>
+							<greatestDifference id="h">a h:mm–h:mm (v)</greatestDifference>
+							<greatestDifference id="m">a h:mm–h:mm (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm (v)</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm (v)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
+							<greatestDifference id="a">a h – a h (v)</greatestDifference>
+							<greatestDifference id="h">a h–h (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH (v)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM.dd – MM.dd</greatestDifference>
+							<greatestDifference id="M">MM.dd – MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM.dd (E) – MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">MM.dd (E) – MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM, d–d</greatestDifference>
+							<greatestDifference id="M">MMM, d – MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">MMM, d, E – MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G y.MM – y.MM</greatestDifference>
+							<greatestDifference id="y">G y.MM – y.MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd – y.MM.dd</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd – y.MM.dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="M">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+							<greatestDifference id="y">G y.MM.dd (E) – y.MM.dd (E)</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y, MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y, MMM – y, MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y, MMM, d–d</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d – MMM, d</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d – y, MMM, d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="M">G y, MMM, d, E – MMM, d, E</greatestDifference>
+							<greatestDifference id="y">G y, MMM, d, E – y, MMM, d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y, MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">G y, MMMM – y, MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -3283,73 +6786,107 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>эра</displayName>
+				<displayName>самана</displayName>
+			</field>
+			<field type="era-short">
+				<displayName>сам.</displayName>
+			</field>
+			<field type="era-narrow">
+				<displayName>сам.</displayName>
 			</field>
 			<field type="year">
 				<displayName>ҫул</displayName>
 				<relative type="-1">пӗлтӗр</relative>
 				<relative type="0">кӑҫал</relative>
-				<relative type="1">ҫитес ҫул</relative>
+				<relative type="1">ҫитес ҫулта</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫултан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫул каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName>ҫ.</displayName>
 				<relative type="-1">пӗлтӗр</relative>
 				<relative type="0">кӑҫал</relative>
-				<relative type="1">ҫитес ҫ.</relative>
+				<relative type="1">ҫитес ҫулта</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ҫ.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫултан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ҫ. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫул каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
+				<displayName>ҫул</displayName>
+				<relative type="-1">пӗлтӗр</relative>
+				<relative type="0">кӑҫал</relative>
+				<relative type="1">ҫитес ҫулта</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ҫ.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫултан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫултан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ҫ. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫул каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫул каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>квартал</displayName>
-				<relative type="-1" draft="unconfirmed">иртнӗ квартал</relative>
-				<relative type="0" draft="unconfirmed">ку квартал</relative>
-				<relative type="1" draft="unconfirmed">ҫитес квартал</relative>
+				<displayName>чӗрӗк</displayName>
+				<relative type="-1">иртнӗ чӗрӗкре</relative>
+				<relative type="0">ку чӗрӗкре</relative>
+				<relative type="1">ҫитес чӗрӗкре</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">урлӑ +{0} кварталтан</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} чӗрӗкрен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} чӗрӗкрен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} чӗрӗкрен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} квартал каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} чӗрӗк каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} чӗрӗк каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} чӗрӗк каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>кв.</displayName>
-				<relative type="-1" draft="unconfirmed">иртнӗ кв.</relative>
-				<relative type="0" draft="unconfirmed">ку кв.</relative>
-				<relative type="1" draft="unconfirmed">ҫитес кв.</relative>
+				<displayName>чӗр.</displayName>
+				<relative type="-1">иртнӗ чӗр.</relative>
+				<relative type="0">ку чӗр.</relative>
+				<relative type="1">ҫитес чӗр.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">урлӑ +{0} кв.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} чӗрӗкрен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} чӗрӗкрен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} чӗрӗкрен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} кв. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} чӗрӗк каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} чӗрӗк каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} чӗр. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<relative type="-1" draft="unconfirmed">и-нӗ кв.</relative>
-				<relative type="0" draft="unconfirmed">ку кв.</relative>
-				<relative type="1" draft="unconfirmed">ҫ-с кв.</relative>
+				<displayName>чӗр.</displayName>
+				<relative type="-1">иртнӗ чӗр.</relative>
+				<relative type="0">ку чӗр.</relative>
+				<relative type="1">ҫитес чӗр.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">урлӑ +{0} кв.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} чӗрӗкрен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} чӗрӗкрен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} чӗрӗкрен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} кв. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} чӗрӗк каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} чӗрӗк каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} чӗр. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -3358,73 +6895,93 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ку уйӑхра</relative>
 				<relative type="1">ҫитес уйӑхра</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} уйӑхран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} уйӑх каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName>уй.</displayName>
-				<relative type="-1">иртнӗ уй.</relative>
-				<relative type="0">ку уй.</relative>
-				<relative type="1">ҫитес уй.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} уй.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} уйӑхран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} уй. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} уй. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
+				<displayName>уйӑх</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} уй.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} уйӑхран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} уйӑхран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} уй. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} уйӑх каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} уй. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>эрне</displayName>
 				<relative type="-1">иртнӗ эрнере</relative>
-				<relative type="0">ҫак эрнере</relative>
+				<relative type="0">ку эрнере</relative>
 				<relative type="1">ҫитес эрнере</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрнерен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрне каялла</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod>эрнере {0}</relativePeriod>
+				<relativePeriod>{0} эрнинче</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName>эр.</displayName>
-				<relative type="-1">иртнӗ эр.</relative>
-				<relative type="0">ҫак эр.</relative>
-				<relative type="1">ҫитес эр.</relative>
+				<relative type="-1">иртнӗ эрн.</relative>
+				<relative type="0">ку эрн.</relative>
+				<relative type="1">ҫитес эрн.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} эр.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрнерен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} эр. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрн. каялла</relativeTimePattern>
 				</relativeTime>
+				<relativePeriod>{0} эрнинче</relativePeriod>
 			</field>
 			<field type="week-narrow">
+				<displayName>эрне</displayName>
+				<relative type="-1">иртнӗ эрн.</relative>
+				<relative type="0">ку эрн.</relative>
+				<relative type="1">ҫитес эрн.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} эр.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрнерен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрнерен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} эр. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрн. каялла</relativeTimePattern>
 				</relativeTime>
+				<relativePeriod>{0} эрнинче</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
-				<displayName draft="unconfirmed">уйӑхӑн эрни</displayName>
-			</field>
-			<field type="weekOfMonth-short">
-				<displayName draft="unconfirmed">уй. эрни</displayName>
-			</field>
-			<field type="weekOfMonth-narrow">
-				<displayName draft="unconfirmed">уй. эр.</displayName>
+				<displayName>уйӑхӑн эрни</displayName>
 			</field>
 			<field type="day">
 				<displayName>кун</displayName>
@@ -3432,395 +6989,530 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">паян</relative>
 				<relative type="1">ыран</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>кн.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} к.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} к. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
+				<displayName>кун</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} к.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} к. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayOfYear">
-				<displayName draft="unconfirmed">ҫулталӑкӑн кунӗ</displayName>
+				<displayName>ҫулталӑкӑн кунӗ</displayName>
 			</field>
 			<field type="dayOfYear-short">
-				<displayName draft="unconfirmed">ҫул. кунӗ</displayName>
-			</field>
-			<field type="dayOfYear-narrow">
-				<displayName draft="unconfirmed">ҫул. кн.</displayName>
+				<displayName>ҫул. кунӗ</displayName>
 			</field>
 			<field type="weekday">
-				<displayName>эрнери кун</displayName>
+				<displayName>эрнен кунӗ</displayName>
+			</field>
+			<field type="weekday-short">
+				<displayName>эрн. кунӗ</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName>эрн. кунӗ</displayName>
 			</field>
 			<field type="weekdayOfMonth">
-				<displayName draft="unconfirmed">эрнен кунӗ</displayName>
+				<displayName>уйӑхӑн кунӗ</displayName>
 			</field>
 			<field type="weekdayOfMonth-short">
-				<displayName draft="unconfirmed">эр. кунӗ</displayName>
+				<displayName>уйӑхӑн кунӗ</displayName>
 			</field>
 			<field type="weekdayOfMonth-narrow">
-				<displayName draft="unconfirmed">эр. кн.</displayName>
+				<displayName>уй. кунӗ</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1" draft="unconfirmed">иртнӗ вырсарникун</relative>
-				<relative type="0" draft="unconfirmed">ку вырсарникун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес вырсарникун</relative>
+				<relative type="-1">иртнӗ вырсарни кун</relative>
+				<relative type="0">ку вырсарни кун</relative>
+				<relative type="1">ҫитес вырсарни кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} вырсарникун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} вырсарни кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} вырсарни кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} вырсарни кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} вырсарникун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} вырсарни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} вырсарни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} вырсарни кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sun-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ вырсарни</relative>
-				<relative type="0" draft="unconfirmed">ку вырсарни</relative>
-				<relative type="1" draft="unconfirmed">ҫитес вырсарни</relative>
+				<relative type="-1">иртнӗ вр</relative>
+				<relative type="0">ку вр</relative>
+				<relative type="1">ҫитес вр</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} вырсарни</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} вырсарни кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} вырсарни кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} вр-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} вырсарни</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} вырсарни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} вырсарни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} вр каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1" draft="unconfirmed">иртнӗ Вр</relative>
-				<relative type="0" draft="unconfirmed">ку Вр</relative>
-				<relative type="1" draft="unconfirmed">ҫитес Вр</relative>
+				<relative type="-1">иртнӗ вр</relative>
+				<relative type="0">ку вр</relative>
+				<relative type="1">ҫитес вр</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} Вр</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} вырсарни кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} вырсарни кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} вр-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} Вр</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} вырсарни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} вырсарни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} вр каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon">
-				<relative type="-1" draft="unconfirmed">иртнӗ тунтикун</relative>
-				<relative type="0" draft="unconfirmed">ку тунтикун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес тунтикун</relative>
+				<relative type="-1">иртнӗ тунти кун</relative>
+				<relative type="0">ку тунти кун</relative>
+				<relative type="1">ҫитес тунти кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} тунтикун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} тунти кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} тунти кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тунти кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} тунтикун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} тунти кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} тунти кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тунти кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ тунти</relative>
-				<relative type="0" draft="unconfirmed">ку тунти</relative>
-				<relative type="1" draft="unconfirmed">ҫитес тунти</relative>
+				<relative type="-1">иртнӗ тн</relative>
+				<relative type="0">ку тн</relative>
+				<relative type="1">ҫитес тн</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} тунти</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} тунти кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} тунти кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тн-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} тунти</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} тунти кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} тунти кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тн каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="unconfirmed">иртнӗ Тн</relative>
-				<relative type="0" draft="unconfirmed">ку Тн</relative>
-				<relative type="1" draft="unconfirmed">ҫитес Тн</relative>
+				<relative type="-1">иртнӗ тн</relative>
+				<relative type="0">ку тн</relative>
+				<relative type="1">ҫитес тн</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} Тн</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} тунти кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} тунти кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тн-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} Тн</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} тунти кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} тунти кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} тн каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue">
-				<relative type="-1" draft="unconfirmed">иртнӗ ытларикун</relative>
-				<relative type="0" draft="unconfirmed">ку ытларикун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес ытларикун</relative>
+				<relative type="-1">иртнӗ ытлари кун</relative>
+				<relative type="0">ку ытлари кун</relative>
+				<relative type="1">ҫитес ытлари кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ытларикун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ытлари кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ытлари кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ытлари кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ытларикун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ытлари кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ытлари кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ытлари кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ ытлари</relative>
-				<relative type="0" draft="unconfirmed">ку ытлари</relative>
-				<relative type="1" draft="unconfirmed">ҫитес ытлари</relative>
+				<relative type="-1">иртнӗ ыт</relative>
+				<relative type="0">ку ыт</relative>
+				<relative type="1">ҫитес ыт</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ытлари</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ытлари кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ытлари кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ыт-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ытлари</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ытлари кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ытлари кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ыт каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1" draft="unconfirmed">иртнӗ Ыт</relative>
-				<relative type="0" draft="unconfirmed">ку Ыт</relative>
-				<relative type="1" draft="unconfirmed">ҫитес Ыт</relative>
+				<relative type="-1">иртнӗ ыт</relative>
+				<relative type="0">ку ыт</relative>
+				<relative type="1">ҫитес ыт</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} Ыт</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ытлари кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ытлари кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ыт-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} Ыт</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ытлари кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ытлари кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ыт каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed">
-				<relative type="-1" draft="unconfirmed">иртнӗ юнкун</relative>
-				<relative type="0" draft="unconfirmed">ку юнкун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес юнкун</relative>
+				<relative type="-1">иртнӗ юн кун</relative>
+				<relative type="0">ку юн кун</relative>
+				<relative type="1">ҫитес юн кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} юнкун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} юн кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} юн кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} юн кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} юнкун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} юн кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} юн кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} юн кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ юн</relative>
-				<relative type="0" draft="unconfirmed">ку юн</relative>
-				<relative type="1" draft="unconfirmed">ҫитес юн</relative>
+				<relative type="-1">иртнӗ юн</relative>
+				<relative type="0">ку юн</relative>
+				<relative type="1">ҫитес юн</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} юн</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} юн кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} юн кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} юн-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} юн</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} юн кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} юн кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} юн каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1" draft="unconfirmed">иртнӗ Юн</relative>
-				<relative type="0" draft="unconfirmed">ҫитес Юн</relative>
-				<relative type="1" draft="unconfirmed">ҫитес Юн</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} Юн</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} юн кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} юн кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} юн-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} Юн</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} юн кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} юн кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} юн каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu">
-				<relative type="-1" draft="unconfirmed">иртнӗ кӗҫнерникун</relative>
-				<relative type="0" draft="unconfirmed">ку кӗҫнерникун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес кӗҫнерникун</relative>
+				<relative type="-1">иртнӗ кӗҫнерни кун</relative>
+				<relative type="0">ку кӗҫнерни кун</relative>
+				<relative type="1">ҫитес кӗҫнерни кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} кӗҫнерникун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кӗҫнерни кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кӗҫнерни кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӗҫнерни кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} кӗҫнерникун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кӗҫнерни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кӗҫнерни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кӗҫнерни кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ кӗҫнерни</relative>
-				<relative type="0" draft="unconfirmed">ку кӗҫнерни</relative>
-				<relative type="1" draft="unconfirmed">ҫитес кӗҫнерни</relative>
+				<relative type="-1">иртнӗ кҫ</relative>
+				<relative type="0">ку кҫ</relative>
+				<relative type="1">ҫитес кҫ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} кӗҫнерни</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кӗҫнерни кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кӗҫнерни кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кҫ-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} кӗҫнерни</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кӗҫнерни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кӗҫнерни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кҫ каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="unconfirmed">иртнӗ Кҫ</relative>
-				<relative type="0" draft="unconfirmed">ку Кҫ</relative>
-				<relative type="1" draft="unconfirmed">ҫитес Кҫ</relative>
+				<relative type="-1">иртнӗ кҫ</relative>
+				<relative type="0">ку кҫ</relative>
+				<relative type="1">ҫитес кҫ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} Кҫ</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кӗҫнерни кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кӗҫнерни кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кҫ-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} Кҫ</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} кӗҫнерни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} кӗҫнерни кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} кҫ каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri">
-				<relative type="-1" draft="unconfirmed">иртнӗ эрнекун</relative>
-				<relative type="0" draft="unconfirmed">ку эрнекун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес эрнекун</relative>
+				<relative type="-1">иртнӗ эрне кун</relative>
+				<relative type="0">ку эрне кун</relative>
+				<relative type="1">ҫитес эрне кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} эрнекун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрне кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} эрнекун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эрне кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ эрнекун</relative>
-				<relative type="0" draft="unconfirmed">ку эрнекун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес эрнекун</relative>
+				<relative type="-1">иртнӗ эр</relative>
+				<relative type="0">ку эр</relative>
+				<relative type="1">ҫитес эр</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} эрнекун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эр-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} эрнекун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эр каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1" draft="unconfirmed">иртн.эрнекун</relative>
-				<relative type="0" draft="unconfirmed">ҫк.эрнекун</relative>
-				<relative type="1" draft="unconfirmed">ҫтс.эрнекун</relative>
+				<relative type="-1">иртнӗ эр</relative>
+				<relative type="0">ку эр</relative>
+				<relative type="1">ҫитес эр</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} эрнекун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эр-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} эрнекун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} эрне кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} эрне кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} эр каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat">
-				<relative type="-1" draft="unconfirmed">иртнӗ шӑматкун</relative>
-				<relative type="0" draft="unconfirmed">ку шӑматкун</relative>
-				<relative type="1" draft="unconfirmed">ҫитес шӑматкун</relative>
+				<relative type="-1">иртнӗ шӑмат кун</relative>
+				<relative type="0">ку шӑмат кун</relative>
+				<relative type="1">ҫитес шӑмат кун</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} шӑматкун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} шӑмат кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} шӑмат кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шӑмат кунтан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} шӑматкун</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} шӑмат кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} шӑмат кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шӑмат кун каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-short">
-				<relative type="-1" draft="unconfirmed">иртнӗ шӑмат</relative>
-				<relative type="0" draft="unconfirmed">ку шӑмат</relative>
-				<relative type="1" draft="unconfirmed">ҫитес шӑмат</relative>
+				<relative type="-1">иртнӗ шм</relative>
+				<relative type="0">ку шм</relative>
+				<relative type="1">ҫитес шм</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} шӑмат</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} шӑмат кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} шӑмат кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шм-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} шӑмат</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} шӑмат кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} шӑмат кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шм каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1" draft="unconfirmed">иртнӗ Шм</relative>
-				<relative type="0" draft="unconfirmed">ку Шм</relative>
-				<relative type="1" draft="unconfirmed">ҫитес Шм</relative>
+				<relative type="-1">иртнӗ шм</relative>
+				<relative type="0">ку шм</relative>
+				<relative type="1">ҫитес шм</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} Шм</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} шӑмат кунтан</relativeTimePattern>
+					<relativeTimePattern count="one">{0} шӑмат кунтан</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шм-тан</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} Шм</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} шӑмат кун каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} шӑмат кун каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} шм каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="dayperiod-short">
+				<displayName>к. у./к. х.</displayName>
+			</field>
 			<field type="dayperiod">
-				<displayName>AM/PM</displayName>
+				<displayName>к. у./к. х.</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>КУ/КХ</displayName>
 			</field>
 			<field type="hour">
 				<displayName>сехет</displayName>
-				<relative type="0" draft="unconfirmed">ҫак сехетре</relative>
+				<relative type="0">ку сехетре</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сехетрен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сехет каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>с.</displayName>
-				<relative type="0" draft="unconfirmed">ҫак сех.</relative>
+				<displayName>сех.</displayName>
+				<relative type="0">ку сех.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} сех.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сехетрен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} сех. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сех. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>с</displayName>
-				<relative type="0" draft="unconfirmed">ҫак сех.</relative>
+				<displayName>сех</displayName>
+				<relative type="0">ку сех.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} сех.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сехетрен</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сехетрен</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} сех. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} сехет каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} сех. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>минут</displayName>
-				<relative type="0" draft="unconfirmed">ҫак минутра</relative>
+				<relative type="0">ку минутра</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} минутран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} минут каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>мин.</displayName>
-				<relative type="0" draft="unconfirmed">ҫак мин.</relative>
+				<relative type="0">ку мин.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} мин.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} минутран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} мин. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
 				<displayName>мин</displayName>
-				<relative type="0" draft="unconfirmed">ҫак мин.</relative>
+				<relative type="0">ку мин.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} мин.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} минутран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} минутран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} мин. к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} минут каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} мин. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName>секунд</displayName>
-				<relative type="0" draft="unconfirmed">халӗ</relative>
+				<displayName>ҫеккунт</displayName>
+				<relative type="0">халь</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ҫекундран</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫеккунтран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫеккунтран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫеккунтран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫеккунт каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName>сек.</displayName>
-				<relative type="0" draft="unconfirmed">халӗ</relative>
+				<displayName>ҫек.</displayName>
+				<relative type="0">халь</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ҫек.</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫеккунтран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫеккунтран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫеккунтран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ҫек. каялла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫек. каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName>сек</displayName>
-				<relative type="0" draft="unconfirmed">халӗ</relative>
+				<displayName>ҫ</displayName>
+				<relative type="0">халь</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">+{0} ҫ</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫеккунтран</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫеккунтран</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫ-ран</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">-{0} ҫ к-ла</relativeTimePattern>
+					<relativeTimePattern count="zero">{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ҫеккунт каялла</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ҫ каялла</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>пӗр сехетри зона</displayName>
+				<displayName>вӑхӑт тӑрӑхӗ</displayName>
+			</field>
+			<field type="zone-short">
+				<displayName>вӑх. тӑрӑхӗ</displayName>
+			</field>
+			<field type="zone-narrow">
+				<displayName>вӑх. тӑрӑхӗ</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
+			<regionFormat>{0} вӑхӑчӗ</regionFormat>
 			<regionFormat type="daylight">{0} ҫуллахи вӑхӑчӗ</regionFormat>
 			<regionFormat type="standard">{0} стандартлӑ вӑхӑчӗ</regionFormat>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="unconfirmed">Гавай стандартлӑ вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Гавай стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Гавай ҫуллахи вӑхӑчӗ</daylight>
-				</short>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
-					<standard>Пӗтӗм тӗнчери координацилене вӑхӑчӗ</standard>
+					<standard>Пӗтӗм тӗнчери килӗштернӗ вӑхӑт</standard>
 				</long>
-				<short>
-					<standard draft="unconfirmed">ПТКВ (UTC)</standard>
-				</short>
 			</zone>
 			<zone type="Etc/Unknown">
 				<exemplarCity>Паллӑ мар хула</exemplarCity>
@@ -3874,7 +7566,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Кейси</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Дюмон-д’Юрвиль Дюмон-д’Юрвиль</exemplarCity>
+				<exemplarCity>Дюмон-д’Юрвиль</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
 				<exemplarCity>Мак-Мердо</exemplarCity>
@@ -3895,7 +7587,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Ла-Риоха</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан-Луис Сан-Луис</exemplarCity>
+				<exemplarCity>Сан-Луис</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
 				<exemplarCity>Катамарка</exemplarCity>
@@ -3997,7 +7689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Сен-Бартелеми</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Бермуд утравӗсем</exemplarCity>
+				<exemplarCity>Бермуда</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
 				<exemplarCity>Бруней</exemplarCity>
@@ -4039,7 +7731,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Арагуаина</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сан-Паулу Сан-Паулу</exemplarCity>
+				<exemplarCity>Сан-Паулу</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Баия</exemplarCity>
@@ -4084,7 +7776,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Ванкувер</exemplarCity>
 			</zone>
 			<zone type="America/Fort_Nelson">
-				<exemplarCity>Форт Нельсон</exemplarCity>
+				<exemplarCity>Форт-Нельсон</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
 				<exemplarCity>Доусон-Крик</exemplarCity>
@@ -4165,7 +7857,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Раротонга</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity>Мӑнкун утравӗ</exemplarCity>
+				<exemplarCity>Мӑн кун утравӗ</exemplarCity>
+			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Койхик</exemplarCity>
 			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Аренас</exemplarCity>
@@ -4270,7 +7965,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Стэнли</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity>Трук</exemplarCity>
+				<exemplarCity>Чуук</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
 				<exemplarCity>Понпеи</exemplarCity>
@@ -4336,7 +8031,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Малабо</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
-				<exemplarCity>Афинсем</exemplarCity>
+				<exemplarCity>Афина</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
 				<exemplarCity>Кӑнтӑр Георги</exemplarCity>
@@ -4431,7 +8126,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4441,7 +8136,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Тарава</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity>Коморсем</exemplarCity>
+				<exemplarCity>Комор утравӗсем</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Сент-Китс</exemplarCity>
@@ -4519,7 +8214,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Монако</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
-				<exemplarCity>Кишинев</exemplarCity>
+				<exemplarCity>Кишинёв</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
 				<exemplarCity>Подгорица</exemplarCity>
@@ -4570,10 +8265,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Мальта</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity>Маврикий</exemplarCity>
+				<exemplarCity>Маврики</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity>Мальдивсем</exemplarCity>
+				<exemplarCity>Мальдива</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
 				<exemplarCity>Блантайр</exemplarCity>
@@ -4585,7 +8280,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Эрмосильо</exemplarCity>
 			</zone>
 			<zone type="America/Ciudad_Juarez">
-				<exemplarCity draft="unconfirmed">Сьюдад-Хуарес</exemplarCity>
+				<exemplarCity>Сьюдад-Хуарес</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
 				<exemplarCity>Масатлан</exemplarCity>
@@ -4678,7 +8373,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Маркизас утравӗсем</exemplarCity>
 			</zone>
 			<zone type="Pacific/Gambier">
-				<exemplarCity>Гамбье утравӗсем</exemplarCity>
+				<exemplarCity>Гамбье</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
 				<exemplarCity>Порт-Морсби</exemplarCity>
@@ -4747,19 +8442,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Волгоград</exemplarCity>
 			</zone>
 			<zone type="Europe/Saratov">
-				<exemplarCity>Саратов</exemplarCity>
+				<exemplarCity>Сарӑту</exemplarCity>
 			</zone>
 			<zone type="Europe/Astrakhan">
-				<exemplarCity>Астрахань</exemplarCity>
+				<exemplarCity>Аҫтӑрхан</exemplarCity>
 			</zone>
 			<zone type="Europe/Ulyanovsk">
-				<exemplarCity>Ульяновск</exemplarCity>
+				<exemplarCity>Чӗмпӗр</exemplarCity>
 			</zone>
 			<zone type="Europe/Kirov">
 				<exemplarCity>Киров</exemplarCity>
 			</zone>
 			<zone type="Europe/Samara">
-				<exemplarCity>Самара</exemplarCity>
+				<exemplarCity>Самар</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
 				<exemplarCity>Екатеринбург</exemplarCity>
@@ -4798,7 +8493,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Хандыга</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
-				<exemplarCity>Сахалин утравӗ</exemplarCity>
+				<exemplarCity>Сахалин</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
 				<exemplarCity>Усть-Нера</exemplarCity>
@@ -4810,7 +8505,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Среднеколымск</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
-				<exemplarCity>Петропавловск-Камчатски</exemplarCity>
+				<exemplarCity>Петропавловск-Камчатский</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
 				<exemplarCity>Анадырь</exemplarCity>
@@ -4867,7 +8562,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Джуба</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Сан-Томе Сан-Томе</exemplarCity>
+				<exemplarCity>Сан-Томе</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
 				<exemplarCity>Сальвадор</exemplarCity>
@@ -4930,7 +8625,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity>Киев</exemplarCity>
+				<exemplarCity>Кийӳ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
@@ -4942,7 +8637,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Мидуэй</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity>Уэйк</exemplarCity>
+				<exemplarCity>Уэйк утравӗ</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
 				<exemplarCity>Адак</exemplarCity>
@@ -4978,13 +8673,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Денвер</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity>Бойла, Ҫурҫӗр Дакота</exemplarCity>
+				<exemplarCity>Бойла, Ҫур ҫӗр Дакота</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Нью-Сейлем, Ҫурҫӗр Дакота</exemplarCity>
+				<exemplarCity>Нью-Сейлем, Ҫур ҫӗр Дакота</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Центр, Ҫурҫӗр Дакота</exemplarCity>
+				<exemplarCity>Сентер, Ҫурҫӗр Дакота</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
 				<exemplarCity>Чикаго</exemplarCity>
@@ -5059,7 +8754,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Эфате</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity>Уоллис</exemplarCity>
+				<exemplarCity>Уоллиспа Футуна</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
 				<exemplarCity>Апиа</exemplarCity>
@@ -5081,14 +8776,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</zone>
 			<metazone type="Acre">
 				<long>
-					<generic draft="unconfirmed">Акри вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Акри стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Акри ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Акри вӑхӑчӗ</generic>
+					<standard>Акри стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Акри ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ACT Acre</generic>
-					<standard draft="unconfirmed">ACT Acre</standard>
-					<daylight draft="unconfirmed">ACST Acre</daylight>
+					<generic draft="contributed">ACT Acre</generic>
+					<standard draft="contributed">ACT Acre</standard>
+					<daylight draft="contributed">ACST Acre</daylight>
 				</short>
 			</metazone>
 			<metazone type="Afghanistan">
@@ -5096,23 +8791,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Афганистан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">AFT</standard>
+					<standard draft="contributed">AFT</standard>
 				</short>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard>Тӗп Африка вӑхӑчӗ</standard>
+					<standard>Вӑта Африка вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">CAT</standard>
+					<standard draft="contributed">CAT</standard>
 				</short>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard>Хӗвелтухӑҫ Африка вӑхӑчӗ</standard>
+					<standard>Тухӑҫ Африка вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">EAT</standard>
+					<standard draft="contributed">EAT</standard>
 				</short>
 			</metazone>
 			<metazone type="Africa_Southern">
@@ -5120,19 +8815,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Кӑнтӑр Африка вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SAST</standard>
+					<standard draft="contributed">SAST</standard>
 				</short>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Анӑҫ Африка вӑхӑчӗ</generic>
-					<standard>Анӑҫ Африка стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Анӑҫ Африка ҫуллахи вӑхӑчӗ</daylight>
+					<standard>Анӑҫ Африка вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<generic draft="unconfirmed">WAT</generic>
-					<standard draft="unconfirmed">WAT</standard>
-					<daylight draft="unconfirmed">WAST</daylight>
+					<standard draft="contributed">WAT</standard>
 				</short>
 			</metazone>
 			<metazone type="Alaska">
@@ -5142,21 +8833,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Аляска ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AKT</generic>
-					<standard draft="unconfirmed">AKST</standard>
-					<daylight draft="unconfirmed">AKDT</daylight>
+					<generic draft="contributed">AKT</generic>
+					<standard draft="contributed">AKST</standard>
+					<daylight draft="contributed">AKDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Almaty">
 				<long>
-					<generic draft="unconfirmed">Алматы вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Алматы стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Алматы ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Алматы вӑхӑчӗ</generic>
+					<standard>Алматы стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Алматы ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ALMT</generic>
-					<standard draft="unconfirmed">ALMT</standard>
-					<daylight draft="unconfirmed">ALMT DST</daylight>
+					<generic draft="contributed">ALMT</generic>
+					<standard draft="contributed">ALMT</standard>
+					<daylight draft="contributed">ALMT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Amazon">
@@ -5166,45 +8857,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Амазонка ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AMT</generic>
-					<standard draft="unconfirmed">AMT</standard>
-					<daylight draft="unconfirmed">AMST</daylight>
+					<generic draft="contributed">AMT</generic>
+					<standard draft="contributed">AMT</standard>
+					<daylight draft="contributed">AMST</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Тӗп Америка вӑхӑчӗ</generic>
-					<standard>Тӗп Америка стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Тӗп Америка ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Вӑта Америка вӑхӑчӗ</generic>
+					<standard>Вӑта Америка стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Вӑта Америка ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CT</generic>
-					<standard draft="unconfirmed">CST</standard>
-					<daylight draft="unconfirmed">CDT</daylight>
+					<generic draft="contributed">CT</generic>
+					<standard draft="contributed">CST</standard>
+					<daylight draft="contributed">CDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Хӗвелтухӑҫ Америка вӑхӑчӗ</generic>
-					<standard>Хӗвелтухӑҫ Америка стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Хӗвелтухӑҫ Америка ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Тухӑҫ Америка вӑхӑчӗ</generic>
+					<standard>Тухӑҫ Америка стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Тухӑҫ Америка ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ET</generic>
-					<standard draft="unconfirmed">EST</standard>
-					<daylight draft="unconfirmed">EDT</daylight>
+					<generic draft="contributed">ET</generic>
+					<standard draft="contributed">EST</standard>
+					<daylight draft="contributed">EDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Ту вӑхӑчӗ (Ҫурҫӗр Америка)</generic>
-					<standard>Стандартлӑ ту вӑхӑчӗ (Ҫурҫӗр Америка)</standard>
-					<daylight>Ҫуллахи ту вӑхӑчӗ (Ҫурҫӗр Америка)</daylight>
+					<generic>Ту вӑхӑчӗ</generic>
+					<standard>Ту стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Ту ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">MT</generic>
-					<standard draft="unconfirmed">MST</standard>
-					<daylight draft="unconfirmed">MDT</daylight>
+					<generic draft="contributed">MT</generic>
+					<standard draft="contributed">MST</standard>
+					<daylight draft="contributed">MDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Pacific">
@@ -5214,21 +8905,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Лӑпкӑ океан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PT</generic>
-					<standard draft="unconfirmed">PST</standard>
-					<daylight draft="unconfirmed">PDT</daylight>
+					<generic draft="contributed">PT</generic>
+					<standard draft="contributed">PST</standard>
+					<daylight draft="contributed">PDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
-					<generic draft="unconfirmed">Анадырь вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Анадырь стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Анадырь ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Анадырь вӑхӑчӗ</generic>
+					<standard>Анадырь стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Анадырь ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ANAT</generic>
-					<standard draft="unconfirmed">ANAT</standard>
-					<daylight draft="unconfirmed">ANAST</daylight>
+					<generic draft="contributed">ANAT</generic>
+					<standard draft="contributed">ANAT</standard>
+					<daylight draft="contributed">ANAST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Apia">
@@ -5238,45 +8929,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Апиа ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">SST Samoa Apia</generic>
-					<standard draft="unconfirmed">SST Samoa Apia</standard>
-					<daylight draft="unconfirmed">SST Samoa Apia DST</daylight>
+					<generic draft="contributed">SST Samoa Apia</generic>
+					<standard draft="contributed">SST Samoa Apia</standard>
+					<daylight draft="contributed">SST Samoa Apia DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Aqtau">
 				<long>
-					<generic draft="unconfirmed">Актау вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Актау стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Актау ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Актау вӑхӑчӗ</generic>
+					<standard>Актау стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Актау ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ALMT Aktau</generic>
-					<standard draft="unconfirmed">ALMT Aktau</standard>
-					<daylight draft="unconfirmed">ALMT Aktau DST</daylight>
+					<generic draft="contributed">ALMT Aktau</generic>
+					<standard draft="contributed">ALMT Aktau</standard>
+					<daylight draft="contributed">ALMT Aktau DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Aqtobe">
 				<long>
-					<generic draft="unconfirmed">Актобе вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Актобе стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Актобе ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Актобе вӑхӑчӗ</generic>
+					<standard>Актобе стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Актобе ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AQTT</generic>
-					<standard draft="unconfirmed">AQTT</standard>
-					<daylight draft="unconfirmed">AQTT DST</daylight>
+					<generic draft="contributed">AQTT</generic>
+					<standard draft="contributed">AQTT</standard>
+					<daylight draft="contributed">AQTT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic>Арап вӑхӑчӗ</generic>
-					<standard>Арап стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Арап ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Сауд Аравийӗ вӑхӑчӗ</generic>
+					<standard>Сауд Аравийӗ стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Сауд Аравийӗ ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AST Arabia</generic>
-					<standard draft="unconfirmed">AST Arabia</standard>
-					<daylight draft="unconfirmed">ADT Arabia</daylight>
+					<generic draft="contributed">AST Arabia</generic>
+					<standard draft="contributed">AST Arabia</standard>
+					<daylight draft="contributed">ADT Arabia</daylight>
 				</short>
 			</metazone>
 			<metazone type="Argentina">
@@ -5286,9 +8977,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Аргентина ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ART</generic>
-					<standard draft="unconfirmed">ART</standard>
-					<daylight draft="unconfirmed">ARST</daylight>
+					<generic draft="contributed">ART</generic>
+					<standard draft="contributed">ART</standard>
+					<daylight draft="contributed">ARST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Argentina_Western">
@@ -5298,9 +8989,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Анӑҫ Аргентина ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">WART</generic>
-					<standard draft="unconfirmed">WART</standard>
-					<daylight draft="unconfirmed">WARST</daylight>
+					<generic draft="contributed">WART</generic>
+					<standard draft="contributed">WART</standard>
+					<daylight draft="contributed">WARST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Armenia">
@@ -5310,9 +9001,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Армени ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AMT Armenia</generic>
-					<standard draft="unconfirmed">AMT Armenia</standard>
-					<daylight draft="unconfirmed">AMST Armenia</daylight>
+					<generic draft="contributed">AMT Armenia</generic>
+					<standard draft="contributed">AMT Armenia</standard>
+					<daylight draft="contributed">AMST Armenia</daylight>
 				</short>
 			</metazone>
 			<metazone type="Atlantic">
@@ -5322,45 +9013,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Атлантика ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AT</generic>
-					<standard draft="unconfirmed">AST</standard>
-					<daylight draft="unconfirmed">ADT</daylight>
+					<generic draft="contributed">AT</generic>
+					<standard draft="contributed">AST</standard>
+					<daylight draft="contributed">ADT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic>Тӗп Австрали вӑхӑчӗ</generic>
-					<standard>Тӗп Австрали стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Тӗп Австрали ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Вӑта Австрали вӑхӑчӗ</generic>
+					<standard>Вӑта Австрали стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Вӑта Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ACST</generic>
-					<standard draft="unconfirmed">ACST</standard>
-					<daylight draft="unconfirmed">ACDT</daylight>
+					<generic draft="contributed">ACST</generic>
+					<standard draft="contributed">ACST</standard>
+					<daylight draft="contributed">ACDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>Тӗп Австрали анӑҫ вӑхӑчӗ</generic>
-					<standard>Тӗп Австрали анӑҫ стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Тӗп Австрали анӑҫ ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Анӑҫ Вӑта Австрали вӑхӑчӗ</generic>
+					<standard>Анӑҫ Вӑта Австрали стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Анӑҫ Вӑта Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ACWST</generic>
-					<standard draft="unconfirmed">ACWST</standard>
-					<daylight draft="unconfirmed">ACWDT</daylight>
+					<generic draft="contributed">ACWST</generic>
+					<standard draft="contributed">ACWST</standard>
+					<daylight draft="contributed">ACWDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>Хӗвелтухӑҫ Австрали вӑхӑчӗ</generic>
-					<standard>Хӗвелтухӑҫ Австрали стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Хӗвелтухӑҫ Австрали ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Тухӑҫ Австрали вӑхӑчӗ</generic>
+					<standard>Тухӑҫ Австрали стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Тухӑҫ Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AEST</generic>
-					<standard draft="unconfirmed">AEST</standard>
-					<daylight draft="unconfirmed">AEDT</daylight>
+					<generic draft="contributed">AEST</generic>
+					<standard draft="contributed">AEST</standard>
+					<daylight draft="contributed">AEDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Australia_Western">
@@ -5370,9 +9061,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Анӑҫ Австрали ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AWST</generic>
-					<standard draft="unconfirmed">AWST</standard>
-					<daylight draft="unconfirmed">AWDT</daylight>
+					<generic draft="contributed">AWST</generic>
+					<standard draft="contributed">AWST</standard>
+					<daylight draft="contributed">AWDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -5382,9 +9073,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Азербайджан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AZT</generic>
-					<standard draft="unconfirmed">AZT</standard>
-					<daylight draft="unconfirmed">AZST</daylight>
+					<generic draft="contributed">AZT</generic>
+					<standard draft="contributed">AZT</standard>
+					<daylight draft="contributed">AZST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Azores">
@@ -5394,9 +9085,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Азор утравӗсен ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AZOT</generic>
-					<standard draft="unconfirmed">AZOT</standard>
-					<daylight draft="unconfirmed">AZOST</daylight>
+					<generic draft="contributed">AZOT</generic>
+					<standard draft="contributed">AZOT</standard>
+					<daylight draft="contributed">AZOST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Bangladesh">
@@ -5406,9 +9097,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Бангладеш ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">BST Bangladesh</generic>
-					<standard draft="unconfirmed">BST Bangladesh</standard>
-					<daylight draft="unconfirmed">BDT Bangladesh</daylight>
+					<generic draft="contributed">BST Bangladesh</generic>
+					<standard draft="contributed">BST Bangladesh</standard>
+					<daylight draft="contributed">BDT Bangladesh</daylight>
 				</short>
 			</metazone>
 			<metazone type="Bhutan">
@@ -5416,7 +9107,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Бутан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">BTT</standard>
+					<standard draft="contributed">BTT</standard>
 				</short>
 			</metazone>
 			<metazone type="Bolivia">
@@ -5424,7 +9115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Боливи вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">BOT</standard>
+					<standard draft="contributed">BOT</standard>
 				</short>
 			</metazone>
 			<metazone type="Brasilia">
@@ -5434,17 +9125,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Бразили ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">BRT</generic>
-					<standard draft="unconfirmed">BRT</standard>
-					<daylight draft="unconfirmed">BRST</daylight>
+					<generic draft="contributed">BRT</generic>
+					<standard draft="contributed">BRT</standard>
+					<daylight draft="contributed">BRST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Бруней-Даруссалам вӑхӑчӗ</standard>
+					<standard>Бруней вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">BNT</standard>
+					<standard draft="contributed">BNT</standard>
 				</short>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -5454,17 +9145,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Кабо-Верде ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CVT</generic>
-					<standard draft="unconfirmed">CVT</standard>
-					<daylight draft="unconfirmed">CVST</daylight>
+					<generic draft="contributed">CVT</generic>
+					<standard draft="contributed">CVT</standard>
+					<daylight draft="contributed">CVST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Casey">
 				<long>
-					<standard draft="unconfirmed">Кейси вӑхӑчӗ</standard>
+					<standard>Кейси вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">CAST</standard>
+					<standard draft="contributed">CAST</standard>
 				</short>
 			</metazone>
 			<metazone type="Chamorro">
@@ -5472,7 +9163,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Чаморро вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">ChST</standard>
+					<standard draft="contributed">ChST</standard>
 				</short>
 			</metazone>
 			<metazone type="Chatham">
@@ -5482,9 +9173,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Чатем ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CHAST</generic>
-					<standard draft="unconfirmed">CHAST</standard>
-					<daylight draft="unconfirmed">CHADT</daylight>
+					<generic draft="contributed">CHAST</generic>
+					<standard draft="contributed">CHAST</standard>
+					<daylight draft="contributed">CHADT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Chile">
@@ -5494,9 +9185,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Чили ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CLT</generic>
-					<standard draft="unconfirmed">CLT</standard>
-					<daylight draft="unconfirmed">CLST</daylight>
+					<generic draft="contributed">CLT</generic>
+					<standard draft="contributed">CLT</standard>
+					<daylight draft="contributed">CLST</daylight>
 				</short>
 			</metazone>
 			<metazone type="China">
@@ -5506,17 +9197,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Китай ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CST China</generic>
-					<standard draft="unconfirmed">CST China</standard>
-					<daylight draft="unconfirmed">CST China DST</daylight>
+					<generic draft="contributed">CST China</generic>
+					<standard draft="contributed">CST China</standard>
+					<daylight draft="contributed">CST China DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard>Раштав утравӗн вӑхӑчӗ</standard>
+					<standard>Раштав утравӗ вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">CXT</standard>
+					<standard draft="contributed">CXT</standard>
 				</short>
 			</metazone>
 			<metazone type="Cocos">
@@ -5524,7 +9215,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Кокос утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">CCT</standard>
+					<standard draft="contributed">CCT</standard>
 				</short>
 			</metazone>
 			<metazone type="Colombia">
@@ -5534,21 +9225,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Колумби ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">COT</generic>
-					<standard draft="unconfirmed">COT</standard>
-					<daylight draft="unconfirmed">COST</daylight>
+					<generic draft="contributed">COT</generic>
+					<standard draft="contributed">COT</standard>
+					<daylight draft="contributed">COST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic>Кукӑн утравӗсен вӑхӑчӗ</generic>
-					<standard>Кукӑн утравӗсен стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Кукӑн утравӗсен ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Кук утравӗсен вӑхӑчӗ</generic>
+					<standard>Кук утравӗсен стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Кук утравӗсен ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CKT</generic>
-					<standard draft="unconfirmed">CKT</standard>
-					<daylight draft="unconfirmed">CKT DST</daylight>
+					<generic draft="contributed">CKT</generic>
+					<standard draft="contributed">CKT</standard>
+					<daylight draft="contributed">CKT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Cuba">
@@ -5558,9 +9249,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Куба ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CST Cuba</generic>
-					<standard draft="unconfirmed">CST Cuba</standard>
-					<daylight draft="unconfirmed">CDT Cuba</daylight>
+					<generic draft="contributed">CST Cuba</generic>
+					<standard draft="contributed">CST Cuba</standard>
+					<daylight draft="contributed">CDT Cuba</daylight>
 				</short>
 			</metazone>
 			<metazone type="Davis">
@@ -5568,7 +9259,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Дейвис вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">DAVT</standard>
+					<standard draft="contributed">DAVT</standard>
 				</short>
 			</metazone>
 			<metazone type="DumontDUrville">
@@ -5576,27 +9267,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Дюмон-д’Юрвиль вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">DDUT</standard>
+					<standard draft="contributed">DDUT</standard>
 				</short>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>Хӗвелтухӑҫ Тимор вӑхӑчӗ</standard>
+					<standard>Тухӑҫ Тимор вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">TLT</standard>
+					<standard draft="contributed">TLT</standard>
 				</short>
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic>Мӑнкун утравӗн вӑхӑчӗ</generic>
-					<standard>Мӑнкун утравӗн стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Мӑнкун утравӗн ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Мӑн кун утравӗн вӑхӑчӗ</generic>
+					<standard>Мӑн кун утравӗн стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Мӑн кун утравӗн ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">EAST</generic>
-					<standard draft="unconfirmed">EAST</standard>
-					<daylight draft="unconfirmed">EASST</daylight>
+					<generic draft="contributed">EAST</generic>
+					<standard draft="contributed">EAST</standard>
+					<daylight draft="contributed">EASST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Ecuador">
@@ -5604,39 +9295,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Эквадор вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">ECT Ecuador</standard>
+					<standard draft="contributed">ECT Ecuador</standard>
 				</short>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic>Тӗп Европа вӑхӑчӗ</generic>
-					<standard>Тӗп Европа стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Тӗп Европа ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Вӑта Европа вӑхӑчӗ</generic>
+					<standard>Вӑта Европа стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Вӑта Европа ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CET</generic>
-					<standard draft="unconfirmed">CET</standard>
-					<daylight draft="unconfirmed">CEST</daylight>
+					<generic draft="contributed">CET</generic>
+					<standard draft="contributed">CET</standard>
+					<daylight draft="contributed">CEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic>Хӗвелтухӑҫ Европа вӑхӑчӗ</generic>
-					<standard>Хӗвелтухӑҫ Европа стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Хӗвелтухӑҫ Европа ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Тухӑҫ Европа вӑхӑчӗ</generic>
+					<standard>Тухӑҫ Европа стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Тухӑҫ Европа ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">EET</generic>
-					<standard draft="unconfirmed">EET</standard>
-					<daylight draft="unconfirmed">EEST</daylight>
+					<generic draft="contributed">EET</generic>
+					<standard draft="contributed">EET</standard>
+					<daylight draft="contributed">EEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard>Инҫет-хӗвелтухӑҫ Европа вӑхӑчӗ</standard>
+					<standard>Инҫет Тухӑҫ Европа вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">FEET</standard>
+					<standard draft="contributed">FEET</standard>
 				</short>
 			</metazone>
 			<metazone type="Europe_Western">
@@ -5646,9 +9337,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Анӑҫ Европа ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">WET</generic>
-					<standard draft="unconfirmed">WET</standard>
-					<daylight draft="unconfirmed">WEST</daylight>
+					<generic draft="contributed">WET</generic>
+					<standard draft="contributed">WET</standard>
+					<daylight draft="contributed">WEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Falkland">
@@ -5658,9 +9349,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Фолкленд утравӗсен ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">FKT</generic>
-					<standard draft="unconfirmed">FKT</standard>
-					<daylight draft="unconfirmed">FKST</daylight>
+					<generic draft="contributed">FKT</generic>
+					<standard draft="contributed">FKT</standard>
+					<daylight draft="contributed">FKST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Fiji">
@@ -5670,17 +9361,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Фиджи ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">FJT</generic>
-					<standard draft="unconfirmed">FJT</standard>
-					<daylight draft="unconfirmed">FJT Summer</daylight>
+					<generic draft="contributed">FJT</generic>
+					<standard draft="contributed">FJT</standard>
+					<daylight draft="contributed">FJT Summer</daylight>
 				</short>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard>Франци Гвиана вӑхӑчӗ</standard>
+					<standard>Франци Гвианин вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GFT</standard>
+					<standard draft="contributed">GFT</standard>
 				</short>
 			</metazone>
 			<metazone type="French_Southern">
@@ -5688,15 +9379,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Франци Кӑнтӑрпа Антарктика территорийӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">TAAF</standard>
+					<standard draft="contributed">TAAF</standard>
 				</short>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard>Галапагос утравӗсен вӑхӑчӗ</standard>
+					<standard>Галапагос вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GALT</standard>
+					<standard draft="contributed">GALT</standard>
 				</short>
 			</metazone>
 			<metazone type="Gambier">
@@ -5704,7 +9395,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гамбье вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GAMT</standard>
+					<standard draft="contributed">GAMT</standard>
 				</short>
 			</metazone>
 			<metazone type="Georgia">
@@ -5714,49 +9405,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Грузи ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">GET</generic>
-					<standard draft="unconfirmed">GET</standard>
-					<daylight draft="unconfirmed">GEST</daylight>
+					<generic draft="contributed">GET</generic>
+					<standard draft="contributed">GET</standard>
+					<daylight draft="contributed">GEST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard>Гилбертӑн утравӗсен вӑхӑчӗ</standard>
+					<standard>Гилберт утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GIT</standard>
+					<standard draft="contributed">GIT</standard>
 				</short>
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Гринвичпа вӑтам вӑхӑчӗ</standard>
+					<standard>Гринвич вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GMT</standard>
+					<standard draft="contributed">GMT</standard>
 				</short>
 			</metazone>
 			<metazone type="Greenland">
 				<long>
-					<generic draft="unconfirmed">Гренланди вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Гренланди стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Гренланди ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Гренланди вӑхӑчӗ</generic>
+					<standard>Гренланди стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Гренланди ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">GNST</generic>
-					<standard draft="unconfirmed">GNST</standard>
-					<daylight draft="unconfirmed">GNSST</daylight>
+					<generic draft="contributed">GNST</generic>
+					<standard draft="contributed">GNST</standard>
+					<daylight draft="contributed">GNSST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>Хӗвелтухӑҫ Гринланди вӑхӑчӗ</generic>
-					<standard>Хӗвелтухӑҫ Гринланди стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Хӗвелтухӑҫ Гринланди ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Тухӑҫ Гренланди вӑхӑчӗ</generic>
+					<standard>Тухӑҫ Гренланди стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Тухӑҫ Гренланди ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">EGT</generic>
-					<standard draft="unconfirmed">EGT</standard>
-					<daylight draft="unconfirmed">EGST</daylight>
+					<generic draft="contributed">EGT</generic>
+					<standard draft="contributed">EGT</standard>
+					<daylight draft="contributed">EGST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Greenland_Western">
@@ -5766,25 +9457,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Анӑҫ ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">WGT</generic>
-					<standard draft="unconfirmed">WGT</standard>
-					<daylight draft="unconfirmed">WGST</daylight>
+					<generic draft="contributed">WGT</generic>
+					<standard draft="contributed">WGT</standard>
+					<daylight draft="contributed">WGST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Guam">
 				<long>
-					<standard draft="unconfirmed">Гуам стандартлӑ вӑхӑчӗ</standard>
+					<standard>Гуам стандартлӑ вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GST Guam</standard>
+					<standard draft="contributed">GST Guam</standard>
 				</short>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Перси залив вӑхӑчӗ</standard>
+					<standard>Перс кӳлмекӗн вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GST Gulf</standard>
+					<standard draft="contributed">GST Gulf</standard>
 				</short>
 			</metazone>
 			<metazone type="Guyana">
@@ -5792,19 +9483,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гайана вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GYT</standard>
+					<standard draft="contributed">GYT</standard>
+				</short>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайи-Алеут стандартлӑ вӑхӑчӗ</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HST</standard>
 				</short>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Гавайи Алеут вӑхӑчӗ</generic>
-					<standard>Гавайи Алеут стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Гавайи Алеут ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Гавайи-Алеут вӑхӑчӗ</generic>
+					<standard>Гавайи-Алеут стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Гавайи-Алеут ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">HST</generic>
-					<standard draft="unconfirmed">HST</standard>
-					<daylight draft="unconfirmed">HDT</daylight>
+					<generic draft="contributed">HST</generic>
+					<standard draft="contributed">HST</standard>
+					<daylight draft="contributed">HDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -5814,9 +9513,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Гонконг ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">HKT</generic>
-					<standard draft="unconfirmed">HKT</standard>
-					<daylight draft="unconfirmed">HKT DST</daylight>
+					<generic draft="contributed">HKT</generic>
+					<standard draft="contributed">HKT</standard>
+					<daylight draft="contributed">HKT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Hovd">
@@ -5826,9 +9525,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ховд ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">HOVT</generic>
-					<standard draft="unconfirmed">HOVT</standard>
-					<daylight draft="unconfirmed">HOVST</daylight>
+					<generic draft="contributed">HOVT</generic>
+					<standard draft="contributed">HOVT</standard>
+					<daylight draft="contributed">HOVST</daylight>
 				</short>
 			</metazone>
 			<metazone type="India">
@@ -5836,7 +9535,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Инди вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">IST Indian</standard>
+					<standard draft="contributed">IST Indian</standard>
 				</short>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -5844,7 +9543,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Инди океанӗ вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">IOT</standard>
+					<standard draft="contributed">IOT</standard>
 				</short>
 			</metazone>
 			<metazone type="Indochina">
@@ -5852,23 +9551,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Индокитай вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">ICT</standard>
+					<standard draft="contributed">ICT</standard>
 				</short>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard>Тӗп Индонези вӑхӑчӗ</standard>
+					<standard>Вӑта Индонези вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">CIT</standard>
+					<standard draft="contributed">CIT</standard>
 				</short>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard>Хӗвелтухӑҫ Индонези вӑхӑчӗ</standard>
+					<standard>Тухӑҫ Индонези вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">EIT</standard>
+					<standard draft="contributed">EIT</standard>
 				</short>
 			</metazone>
 			<metazone type="Indonesia_Western">
@@ -5876,7 +9575,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Анӑҫ Индонези вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">WIT</standard>
+					<standard draft="contributed">WIT</standard>
 				</short>
 			</metazone>
 			<metazone type="Iran">
@@ -5886,9 +9585,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Иран ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">IRST</generic>
-					<standard draft="unconfirmed">IRST</standard>
-					<daylight draft="unconfirmed">IRST DST</daylight>
+					<generic draft="contributed">IRST</generic>
+					<standard draft="contributed">IRST</standard>
+					<daylight draft="contributed">IRST DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Irkutsk">
@@ -5898,9 +9597,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Иркутск ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">IRKT</generic>
-					<standard draft="unconfirmed">IRKT</standard>
-					<daylight draft="unconfirmed">IRKST</daylight>
+					<generic draft="contributed">IRKT</generic>
+					<standard draft="contributed">IRKT</standard>
+					<daylight draft="contributed">IRKST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Israel">
@@ -5910,9 +9609,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Израиль ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">IST Israel</generic>
-					<standard draft="unconfirmed">IST Israel</standard>
-					<daylight draft="unconfirmed">IDT</daylight>
+					<generic draft="contributed">IST Israel</generic>
+					<standard draft="contributed">IST Israel</standard>
+					<daylight draft="contributed">IDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Japan">
@@ -5922,37 +9621,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Япони ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">JST</generic>
-					<standard draft="unconfirmed">JST</standard>
-					<daylight draft="unconfirmed">JST DST</daylight>
+					<generic draft="contributed">JST</generic>
+					<standard draft="contributed">JST</standard>
+					<daylight draft="contributed">JST DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Kamchatka">
 				<long>
-					<generic draft="unconfirmed">Петропавловск-Камчаткăри вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Петропавловск-Камчаткăри стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Петропавловск-Камчаткăри ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Петропавловск-Камчатский вӑхӑчӗ</generic>
+					<standard>Петропавловск-Камчатский стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Петропавловск-Камчатский ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PETT</generic>
-					<standard draft="unconfirmed">PETST</standard>
-					<daylight draft="unconfirmed">PETDT</daylight>
+					<generic draft="contributed">PETT</generic>
+					<standard draft="contributed">PETST</standard>
+					<daylight draft="contributed">PETDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Kazakhstan">
 				<long>
-					<standard draft="unconfirmed">Казахстан вӑхӑчӗ</standard>
+					<standard>Казахстан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">Казахстан вхч</standard>
+					<standard draft="contributed">Казахстан вхч</standard>
 				</short>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard>Хӗвелтухӑҫ Казахстан вӑхӑчӗ</standard>
+					<standard>Тухӑҫ Казахстан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">Хӗвелтухӑҫ Казахстан вхч</standard>
+					<standard draft="contributed">Хӗвелтухӑҫ Казахстан вхч</standard>
 				</short>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
@@ -5960,19 +9659,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Анӑҫ Казахстан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">Анӑҫ Казахстан вхч</standard>
+					<standard draft="contributed">Анӑҫ Казахстан вхч</standard>
 				</short>
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic>Корей вӑхӑчӗ</generic>
-					<standard>Корей стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Корей ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Корея вӑхӑчӗ</generic>
+					<standard>Корея стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Корея ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">KST</generic>
-					<standard draft="unconfirmed">KST</standard>
-					<daylight draft="unconfirmed">KST DST</daylight>
+					<generic draft="contributed">KST</generic>
+					<standard draft="contributed">KST</standard>
+					<daylight draft="contributed">KST DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Kosrae">
@@ -5980,7 +9679,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Косрае вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">KOST</standard>
+					<standard draft="contributed">KOST</standard>
 				</short>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -5990,25 +9689,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Красноярск ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">KRAT</generic>
-					<standard draft="unconfirmed">KRAT</standard>
-					<daylight draft="unconfirmed">KRAST</daylight>
+					<generic draft="contributed">KRAT</generic>
+					<standard draft="contributed">KRAT</standard>
+					<daylight draft="contributed">KRAST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard>Киргизи вӑхӑчӗ</standard>
+					<standard>Кӑркӑстан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">KGT</standard>
+					<standard draft="contributed">KGT</standard>
 				</short>
 			</metazone>
 			<metazone type="Lanka">
 				<long>
-					<standard draft="unconfirmed">Ланка вӑхӑчӗ</standard>
+					<standard>Шри-Ланка вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SLST</standard>
+					<standard draft="contributed">SLST</standard>
 				</short>
 			</metazone>
 			<metazone type="Line_Islands">
@@ -6016,7 +9715,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Лайн утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">LINT</standard>
+					<standard draft="contributed">LINT</standard>
 				</short>
 			</metazone>
 			<metazone type="Lord_Howe">
@@ -6026,21 +9725,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Лорд-Хау ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">LHST</generic>
-					<standard draft="unconfirmed">LHST</standard>
-					<daylight draft="unconfirmed">LHST Summer</daylight>
+					<generic draft="contributed">LHST</generic>
+					<standard draft="contributed">LHST</standard>
+					<daylight draft="contributed">LHST Summer</daylight>
 				</short>
 			</metazone>
 			<metazone type="Macau">
 				<long>
-					<generic draft="unconfirmed">Макао вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Макао стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Макао ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Макао вӑхӑчӗ</generic>
+					<standard>Макао стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Макао ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">MST Macao</generic>
-					<standard draft="unconfirmed">MST Macao</standard>
-					<daylight draft="unconfirmed">MST Macao DST</daylight>
+					<generic draft="contributed">MST Macao</generic>
+					<standard draft="contributed">MST Macao</standard>
+					<daylight draft="contributed">MST Macao DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Magadan">
@@ -6050,9 +9749,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Магадан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">MAGT</generic>
-					<standard draft="unconfirmed">MAGT</standard>
-					<daylight draft="unconfirmed">MAGST</daylight>
+					<generic draft="contributed">MAGT</generic>
+					<standard draft="contributed">MAGT</standard>
+					<daylight draft="contributed">MAGST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Malaysia">
@@ -6060,15 +9759,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Малайзи вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">MYT</standard>
+					<standard draft="contributed">MYT</standard>
 				</short>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard>Мальдивсем вӑхӑчӗ</standard>
+					<standard>Мальдива вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">MVT</standard>
+					<standard draft="contributed">MVT</standard>
 				</short>
 			</metazone>
 			<metazone type="Marquesas">
@@ -6076,7 +9775,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Маркизас утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">MART</standard>
+					<standard draft="contributed">MART</standard>
 				</short>
 			</metazone>
 			<metazone type="Marshall_Islands">
@@ -6084,19 +9783,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Маршалл утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">MHT</standard>
+					<standard draft="contributed">MHT</standard>
 				</short>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic>Маврикий вӑхӑчӗ</generic>
-					<standard>Маврикий стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Маврикий ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Маврики вӑхӑчӗ</generic>
+					<standard>Маврики стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Маврики ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">MUT</generic>
-					<standard draft="unconfirmed">MUT</standard>
-					<daylight draft="unconfirmed">MUST</daylight>
+					<generic draft="contributed">MUT</generic>
+					<standard draft="contributed">MUT</standard>
+					<daylight draft="contributed">MUST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Mawson">
@@ -6104,7 +9803,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Моусон вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">MAWT</standard>
+					<standard draft="contributed">MAWT</standard>
 				</short>
 			</metazone>
 			<metazone type="Mexico_Pacific">
@@ -6114,9 +9813,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Мексика Лӑпкӑ океан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PSTM</generic>
-					<standard draft="unconfirmed">PSTM</standard>
-					<daylight draft="unconfirmed">PDTM</daylight>
+					<generic draft="contributed">PSTM</generic>
+					<standard draft="contributed">PSTM</standard>
+					<daylight draft="contributed">PDTM</daylight>
 				</short>
 			</metazone>
 			<metazone type="Mongolia">
@@ -6126,9 +9825,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Улан-Батор ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ULAT</generic>
-					<standard draft="unconfirmed">ULAT</standard>
-					<daylight draft="unconfirmed">ULAST</daylight>
+					<generic draft="contributed">ULAT</generic>
+					<standard draft="contributed">ULAT</standard>
+					<daylight draft="contributed">ULAST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Moscow">
@@ -6138,9 +9837,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Мускав ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">MSK</generic>
-					<standard draft="unconfirmed">МСК</standard>
-					<daylight draft="unconfirmed">MSD</daylight>
+					<generic draft="contributed">MSK</generic>
+					<standard draft="contributed">МСК</standard>
+					<daylight draft="contributed">MSD</daylight>
 				</short>
 			</metazone>
 			<metazone type="Myanmar">
@@ -6148,7 +9847,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Мьянма вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">MMT</standard>
+					<standard draft="contributed">MMT</standard>
 				</short>
 			</metazone>
 			<metazone type="Nauru">
@@ -6156,7 +9855,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Науру вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">NRT</standard>
+					<standard draft="contributed">NRT</standard>
 				</short>
 			</metazone>
 			<metazone type="Nepal">
@@ -6164,7 +9863,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Непал вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">NPT</standard>
+					<standard draft="contributed">NPT</standard>
 				</short>
 			</metazone>
 			<metazone type="New_Caledonia">
@@ -6174,9 +9873,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ҫӗнӗ Каледони ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">NCT</generic>
-					<standard draft="unconfirmed">NCT</standard>
-					<daylight draft="unconfirmed">NDT New Caledonia</daylight>
+					<generic draft="contributed">NCT</generic>
+					<standard draft="contributed">NCT</standard>
+					<daylight draft="contributed">NDT New Caledonia</daylight>
 				</short>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -6186,9 +9885,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ҫӗнӗ Зеланди ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">NZST</generic>
-					<standard draft="unconfirmed">NZST</standard>
-					<daylight draft="unconfirmed">NZDT</daylight>
+					<generic draft="contributed">NZST</generic>
+					<standard draft="contributed">NZST</standard>
+					<daylight draft="contributed">NZDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Newfoundland">
@@ -6198,9 +9897,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ньюфаундленд ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">NST</generic>
-					<standard draft="unconfirmed">NST</standard>
-					<daylight draft="unconfirmed">NDT</daylight>
+					<generic draft="contributed">NST</generic>
+					<standard draft="contributed">NST</standard>
+					<daylight draft="contributed">NDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Niue">
@@ -6208,7 +9907,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ниуэ вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">NUT</standard>
+					<standard draft="contributed">NUT</standard>
 				</short>
 			</metazone>
 			<metazone type="Norfolk">
@@ -6218,9 +9917,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Норфолк ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">NFT</generic>
-					<standard draft="unconfirmed">NFT</standard>
-					<daylight draft="unconfirmed">NFDT</daylight>
+					<generic draft="contributed">NFT</generic>
+					<standard draft="contributed">NFT</standard>
+					<daylight draft="contributed">NFDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Noronha">
@@ -6230,17 +9929,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Фернанду-ди-Норонья ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">FNT</generic>
-					<standard draft="unconfirmed">FNT</standard>
-					<daylight draft="unconfirmed">FNST</daylight>
+					<generic draft="contributed">FNT</generic>
+					<standard draft="contributed">FNT</standard>
+					<daylight draft="contributed">FNST</daylight>
 				</short>
 			</metazone>
 			<metazone type="North_Mariana">
 				<long>
-					<standard draft="unconfirmed">Мариансен ҫурҫӗрти утравӗсем вӑхӑчӗ</standard>
+					<standard>Ҫур ҫӗр Мариана утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">ChST NMI</standard>
+					<standard draft="contributed">ChST NMI</standard>
 				</short>
 			</metazone>
 			<metazone type="Novosibirsk">
@@ -6250,9 +9949,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Новосибирск ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">NOVT</generic>
-					<standard draft="unconfirmed">NOVT</standard>
-					<daylight draft="unconfirmed">NOVST</daylight>
+					<generic draft="contributed">NOVT</generic>
+					<standard draft="contributed">NOVT</standard>
+					<daylight draft="contributed">NOVST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Omsk">
@@ -6262,9 +9961,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Омск ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">OMST</generic>
-					<standard draft="unconfirmed">OMST</standard>
-					<daylight draft="unconfirmed">OMSST</daylight>
+					<generic draft="contributed">OMST</generic>
+					<standard draft="contributed">OMST</standard>
+					<daylight draft="contributed">OMSST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Pakistan">
@@ -6274,9 +9973,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Пакистан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PKT</generic>
-					<standard draft="unconfirmed">PKT</standard>
-					<daylight draft="unconfirmed">PKT DST</daylight>
+					<generic draft="contributed">PKT</generic>
+					<standard draft="contributed">PKT</standard>
+					<daylight draft="contributed">PKT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Palau">
@@ -6284,15 +9983,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Палау вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">PWT</standard>
+					<standard draft="contributed">PWT</standard>
 				</short>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard>Папуа — Ҫӗнӗ Гвиней вӑхӑчӗ</standard>
+					<standard>Папуа — Ҫӗнӗ Гвинея вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">PGT</standard>
+					<standard draft="contributed">PGT</standard>
 				</short>
 			</metazone>
 			<metazone type="Paraguay">
@@ -6302,9 +10001,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Парагвай ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PYT</generic>
-					<standard draft="unconfirmed">PYT</standard>
-					<daylight draft="unconfirmed">PYST</daylight>
+					<generic draft="contributed">PYT</generic>
+					<standard draft="contributed">PYT</standard>
+					<daylight draft="contributed">PYST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Peru">
@@ -6314,41 +10013,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Перу ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PET</generic>
-					<standard draft="unconfirmed">PET</standard>
-					<daylight draft="unconfirmed">EDT Peru</daylight>
+					<generic draft="contributed">PET</generic>
+					<standard draft="contributed">PET</standard>
+					<daylight draft="contributed">EDT Peru</daylight>
 				</short>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic>Филиппинсем вӑхӑчӗ</generic>
-					<standard>Филиппинсем стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Филиппинсем ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Филиппин вӑхӑчӗ</generic>
+					<standard>Филиппин стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Филиппин ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PST Philippine</generic>
-					<standard draft="unconfirmed">PST Philippine</standard>
-					<daylight draft="unconfirmed">PST Philippine DST</daylight>
+					<generic draft="contributed">PST Philippine</generic>
+					<standard draft="contributed">PST Philippine</standard>
+					<daylight draft="contributed">PST Philippine DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard>Феникс вӑхӑчӗ</standard>
+					<standard>Феникс утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">PHOT</standard>
+					<standard draft="contributed">PHOT</standard>
 				</short>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>Сен-Пьер тата Микелон вӑхӑчӗ</generic>
-					<standard>Сен-Пьер тата Микелон стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Сен-Пьер тата Микелон ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Сен-Пьерпа Микелон вӑхӑчӗ</generic>
+					<standard>Сен-Пьерпа Микелон стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Сен-Пьерпа Микелон ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PMST</generic>
-					<standard draft="unconfirmed">PMST</standard>
-					<daylight draft="unconfirmed">PMDT</daylight>
+					<generic draft="contributed">PMST</generic>
+					<standard draft="contributed">PMST</standard>
+					<daylight draft="contributed">PMDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -6356,7 +10055,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Питкэрн вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">PST Pitcairn</standard>
+					<standard draft="contributed">PST Pitcairn</standard>
 				</short>
 			</metazone>
 			<metazone type="Ponape">
@@ -6364,27 +10063,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Понпеи вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">PONT</standard>
+					<standard draft="contributed">PONT</standard>
 				</short>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>Пхеньян</standard>
+					<standard>Ҫур ҫӗр Корея вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">PYT Korea</standard>
+					<standard draft="contributed">PYT Korea</standard>
 				</short>
 			</metazone>
 			<metazone type="Qyzylorda">
 				<long>
-					<generic draft="unconfirmed">Кызылорда вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Кызылорда стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Кызылорда ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Кызылорда вӑхӑчӗ</generic>
+					<standard>Кызылорда стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Кызылорда ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">QYZT</generic>
-					<standard draft="unconfirmed">QYZT</standard>
-					<daylight draft="unconfirmed">QYZT DST</daylight>
+					<generic draft="contributed">QYZT</generic>
+					<standard draft="contributed">QYZT</standard>
+					<daylight draft="contributed">QYZT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Reunion">
@@ -6392,7 +10091,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Реюньон вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">RET</standard>
+					<standard draft="contributed">RET</standard>
 				</short>
 			</metazone>
 			<metazone type="Rothera">
@@ -6400,7 +10099,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ротера вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">ROTT</standard>
+					<standard draft="contributed">ROTT</standard>
 				</short>
 			</metazone>
 			<metazone type="Sakhalin">
@@ -6410,21 +10109,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Сахалин ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">SAKT</generic>
-					<standard draft="unconfirmed">SAKT</standard>
-					<daylight draft="unconfirmed">SAKST</daylight>
+					<generic draft="contributed">SAKT</generic>
+					<standard draft="contributed">SAKT</standard>
+					<daylight draft="contributed">SAKST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Samara">
 				<long>
-					<generic draft="unconfirmed">Самар вӑхӑчӗ</generic>
-					<standard draft="unconfirmed">Самар стандартлӑ вӑхӑчӗ</standard>
-					<daylight draft="unconfirmed">Самар ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Самар вӑхӑчӗ</generic>
+					<standard>Самар стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Самар ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">SAMT</generic>
-					<standard draft="unconfirmed">SAMT</standard>
-					<daylight draft="unconfirmed">SAMST</daylight>
+					<generic draft="contributed">SAMT</generic>
+					<standard draft="contributed">SAMT</standard>
+					<daylight draft="contributed">SAMST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Samoa">
@@ -6434,9 +10133,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Самоа ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">SST Samoa</generic>
-					<standard draft="unconfirmed">SST Samoa</standard>
-					<daylight draft="unconfirmed">SST Samoa DST</daylight>
+					<generic draft="contributed">SST Samoa</generic>
+					<standard draft="contributed">SST Samoa</standard>
+					<daylight draft="contributed">SST Samoa DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Seychelles">
@@ -6444,7 +10143,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Сейшел утравӗсен вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SCT</standard>
+					<standard draft="contributed">SCT</standard>
 				</short>
 			</metazone>
 			<metazone type="Singapore">
@@ -6452,7 +10151,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Сингапур вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SGT</standard>
+					<standard draft="contributed">SGT</standard>
 				</short>
 			</metazone>
 			<metazone type="Solomon">
@@ -6460,7 +10159,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Соломон вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SBT</standard>
+					<standard draft="contributed">SBT</standard>
 				</short>
 			</metazone>
 			<metazone type="South_Georgia">
@@ -6468,7 +10167,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Кӑнтӑр Георги вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">GST</standard>
+					<standard draft="contributed">GST</standard>
 				</short>
 			</metazone>
 			<metazone type="Suriname">
@@ -6476,7 +10175,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Суринам вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SRT</standard>
+					<standard draft="contributed">SRT</standard>
 				</short>
 			</metazone>
 			<metazone type="Syowa">
@@ -6484,7 +10183,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Сёва вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">SYOT</standard>
+					<standard draft="contributed">SYOT</standard>
 				</short>
 			</metazone>
 			<metazone type="Tahiti">
@@ -6492,19 +10191,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Таити вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">TAHT</standard>
+					<standard draft="contributed">TAHT</standard>
 				</short>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Тайпей вӑхӑчӗ</generic>
-					<standard>Тайпей стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Тайпей ҫуллахи вӑхӑчӗ</daylight>
+					<generic>Тайвань вӑхӑчӗ</generic>
+					<standard>Тайвань стандартлӑ вӑхӑчӗ</standard>
+					<daylight>Тайвань ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">TWT</generic>
-					<standard draft="unconfirmed">TWT</standard>
-					<daylight draft="unconfirmed">TWT DST</daylight>
+					<generic draft="contributed">TWT</generic>
+					<standard draft="contributed">TWT</standard>
+					<daylight draft="contributed">TWT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -6512,7 +10211,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Таджикистан вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">TJT</standard>
+					<standard draft="contributed">TJT</standard>
 				</short>
 			</metazone>
 			<metazone type="Tokelau">
@@ -6520,7 +10219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Токелау вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">TKT</standard>
+					<standard draft="contributed">TKT</standard>
 				</short>
 			</metazone>
 			<metazone type="Tonga">
@@ -6530,17 +10229,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Тонга ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">TOT</generic>
-					<standard draft="unconfirmed">TOT</standard>
-					<daylight draft="unconfirmed">TOST</daylight>
+					<generic draft="contributed">TOT</generic>
+					<standard draft="contributed">TOT</standard>
+					<daylight draft="contributed">TOST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard>Трук вӑхӑчӗ</standard>
+					<standard>Чуук вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">CHUT</standard>
+					<standard draft="contributed">CHUT</standard>
 				</short>
 			</metazone>
 			<metazone type="Turkmenistan">
@@ -6550,9 +10249,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Туркменистан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">TMT</generic>
-					<standard draft="unconfirmed">TMT</standard>
-					<daylight draft="unconfirmed">TMT DST</daylight>
+					<generic draft="contributed">TMT</generic>
+					<standard draft="contributed">TMT</standard>
+					<daylight draft="contributed">TMT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Tuvalu">
@@ -6560,7 +10259,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Тувалу вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">TVT</standard>
+					<standard draft="contributed">TVT</standard>
 				</short>
 			</metazone>
 			<metazone type="Uruguay">
@@ -6570,9 +10269,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Уругвай ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">UYT</generic>
-					<standard draft="unconfirmed">UYT</standard>
-					<daylight draft="unconfirmed">UYST</daylight>
+					<generic draft="contributed">UYT</generic>
+					<standard draft="contributed">UYT</standard>
+					<daylight draft="contributed">UYST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Uzbekistan">
@@ -6582,9 +10281,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Узбекистан ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">UZT</generic>
-					<standard draft="unconfirmed">UZT</standard>
-					<daylight draft="unconfirmed">UZT DST</daylight>
+					<generic draft="contributed">UZT</generic>
+					<standard draft="contributed">UZT</standard>
+					<daylight draft="contributed">UZT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Vanuatu">
@@ -6594,9 +10293,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Вануату ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">VUT</generic>
-					<standard draft="unconfirmed">VUT</standard>
-					<daylight draft="unconfirmed">VUT DST</daylight>
+					<generic draft="contributed">VUT</generic>
+					<standard draft="contributed">VUT</standard>
+					<daylight draft="contributed">VUT DST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Venezuela">
@@ -6604,7 +10303,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Венесуэла вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">VnzlT</standard>
+					<standard draft="contributed">VnzlT</standard>
 				</short>
 			</metazone>
 			<metazone type="Vladivostok">
@@ -6614,9 +10313,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Владивосток ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">VLAT</generic>
-					<standard draft="unconfirmed">VLAT</standard>
-					<daylight draft="unconfirmed">VLAST</daylight>
+					<generic draft="contributed">VLAT</generic>
+					<standard draft="contributed">VLAT</standard>
+					<daylight draft="contributed">VLAST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Volgograd">
@@ -6626,9 +10325,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Волгоград ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">VOLT</generic>
-					<standard draft="unconfirmed">VOLT</standard>
-					<daylight draft="unconfirmed">VOLST</daylight>
+					<generic draft="contributed">VOLT</generic>
+					<standard draft="contributed">VOLT</standard>
+					<daylight draft="contributed">VOLST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Vostok">
@@ -6636,23 +10335,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Восток вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">VOST</standard>
+					<standard draft="contributed">VOST</standard>
 				</short>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard>Уэйк вӑхӑчӗ</standard>
+					<standard>Уэйк утравӗ вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">WAKT</standard>
+					<standard draft="contributed">WAKT</standard>
 				</short>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard>Уоллис тата Футуна вӑхӑчӗ</standard>
+					<standard>Уоллиспа Футуна вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">WFT</standard>
+					<standard draft="contributed">WFT</standard>
 				</short>
 			</metazone>
 			<metazone type="Yakutsk">
@@ -6662,9 +10361,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Якутск ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">YAKT</generic>
-					<standard draft="unconfirmed">YAKT</standard>
-					<daylight draft="unconfirmed">YAKST</daylight>
+					<generic draft="contributed">YAKT</generic>
+					<standard draft="contributed">YAKT</standard>
+					<daylight draft="contributed">YAKST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Yekaterinburg">
@@ -6674,9 +10373,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Екатеринбург ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">YEKT</generic>
-					<standard draft="unconfirmed">YEKT</standard>
-					<daylight draft="unconfirmed">YEKST</daylight>
+					<generic draft="contributed">YEKT</generic>
+					<standard draft="contributed">YEKT</standard>
+					<daylight draft="contributed">YEKST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Yukon">
@@ -6684,50 +10383,325 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Юкон вӑхӑчӗ</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">YST</standard>
+					<standard draft="contributed">YST</standard>
 				</short>
 			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
+		<symbols numberSystem="adlm">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="ahom">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="arab">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="bali">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="beng">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="bhks">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="brah">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="cakm">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="cham">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="deva">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="diak">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="fullwide">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="gara">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="gong">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="gonm">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="gujr">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="gukh">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="guru">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="hanidec">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="hmng">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="hmnp">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="java">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="kali">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="kawi">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="khmr">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="knda">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="krai">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="lana">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="lanatham">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="laoo">
+			<nan>хисеп мар</nan>
+		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="lepc">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="limb">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mathbold">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mathdbl">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mathmono">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mathsanb">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mathsans">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mlym">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="modi">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mong">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mroo">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mtei">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mymr">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mymrepka">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mymrpao">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mymrshan">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="mymrtlng">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="nagm">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="newa">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="nkoo">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="olck">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="onao">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="orya">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="osma">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="outlined">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="rohg">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="saur">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="segment">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="shrd">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="sind">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="sinh">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="sora">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="sund">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="sunu">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="takr">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="talu">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="tamldec">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="telu">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="thai">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="tibt">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="tirh">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="tnsa">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="tols">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="vaii">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="wara">
+			<nan>хисеп мар</nan>
+		</symbols>
+		<symbols numberSystem="wcho">
+			<nan>хисеп мар</nan>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="other" draft="unconfirmed">0 пин</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 пин</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 пин</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 миллион</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 миллион</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 миллион</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 миллиард</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 миллиард</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 миллиард</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 триллион</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 триллион</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 триллион</pattern>
+					<pattern type="1000" count="zero">0 пин</pattern>
+					<pattern type="1000" count="one">0 пин</pattern>
+					<pattern type="1000" count="other">0 пин</pattern>
+					<pattern type="10000" count="zero">00 пин</pattern>
+					<pattern type="10000" count="one">00 пин</pattern>
+					<pattern type="10000" count="other">00 пин</pattern>
+					<pattern type="100000" count="zero">000 пин</pattern>
+					<pattern type="100000" count="one">000 пин</pattern>
+					<pattern type="100000" count="other">000 пин</pattern>
+					<pattern type="1000000" count="zero">0 млн</pattern>
+					<pattern type="1000000" count="one">0 млн</pattern>
+					<pattern type="1000000" count="other">0 млн</pattern>
+					<pattern type="10000000" count="zero">00 млн</pattern>
+					<pattern type="10000000" count="one">00 млн</pattern>
+					<pattern type="10000000" count="other">00 млн</pattern>
+					<pattern type="100000000" count="zero">000 млн</pattern>
+					<pattern type="100000000" count="one">000 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
+					<pattern type="1000000000" count="zero">0 млрд</pattern>
+					<pattern type="1000000000" count="one">0 млрд</pattern>
+					<pattern type="1000000000" count="other">0 млрд</pattern>
+					<pattern type="10000000000" count="zero">00 млрд</pattern>
+					<pattern type="10000000000" count="one">00 млрд</pattern>
+					<pattern type="10000000000" count="other">00 млрд</pattern>
+					<pattern type="100000000000" count="zero">000 млрд</pattern>
+					<pattern type="100000000000" count="one">000 млрд</pattern>
+					<pattern type="100000000000" count="other">000 млрд</pattern>
+					<pattern type="1000000000000" count="zero">0 трлн</pattern>
+					<pattern type="1000000000000" count="one">0 трлн</pattern>
+					<pattern type="1000000000000" count="other">0 трлн</pattern>
+					<pattern type="10000000000000" count="zero">00 трлн</pattern>
+					<pattern type="10000000000000" count="one">00 трлн</pattern>
+					<pattern type="10000000000000" count="other">00 трлн</pattern>
+					<pattern type="100000000000000" count="zero">000 трлн</pattern>
+					<pattern type="100000000000000" count="one">000 трлн</pattern>
+					<pattern type="100000000000000" count="other">000 трлн</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="other" draft="unconfirmed">0 пин</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 пин</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 пин</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 млн</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 млн</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 млн</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 млрд</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 млрд</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 млрд</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 трлн</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 трлн</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 трлн</pattern>
+					<pattern type="1000" count="one">0 пин</pattern>
+					<pattern type="1000" count="other">0 пин</pattern>
+					<pattern type="10000" count="one">00 пин</pattern>
+					<pattern type="10000" count="other">00 пин</pattern>
+					<pattern type="100000" count="one">000 пин</pattern>
+					<pattern type="100000" count="other">000 пин</pattern>
+					<pattern type="1000000" count="one">0 млн</pattern>
+					<pattern type="1000000" count="other">0 млн</pattern>
+					<pattern type="10000000" count="one">00 млн</pattern>
+					<pattern type="10000000" count="other">00 млн</pattern>
+					<pattern type="100000000" count="one">000 млн</pattern>
+					<pattern type="100000000" count="other">000 млн</pattern>
+					<pattern type="1000000000" count="one">0 млрд</pattern>
+					<pattern type="1000000000" count="other">0 млрд</pattern>
+					<pattern type="10000000000" count="one">00 млрд</pattern>
+					<pattern type="10000000000" count="other">00 млрд</pattern>
+					<pattern type="100000000000" count="one">000 млрд</pattern>
+					<pattern type="100000000000" count="other">000 млрд</pattern>
+					<pattern type="1000000000000" count="one">0 трлн</pattern>
+					<pattern type="1000000000000" count="other">0 трлн</pattern>
+					<pattern type="10000000000000" count="one">00 трлн</pattern>
+					<pattern type="10000000000000" count="other">00 трлн</pattern>
+					<pattern type="100000000000000" count="one">000 трлн</pattern>
+					<pattern type="100000000000000" count="other">000 трлн</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<percentFormats numberSystem="arab">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -6735,94 +10709,1085 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="ahom">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arab">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bhks">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="diak">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gara">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gukh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmnp">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kawi">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="krai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other" draft="unconfirmed">0 пин ¤</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 пин ¤</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 пин ¤</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 млн ¤</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 млн ¤</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 млн ¤</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 млрд ¤</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 млрд ¤</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 млрд ¤</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 трлн ¤</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 трлн ¤</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 трлн ¤</pattern>
+					<pattern type="1000" count="zero">0 пин ¤</pattern>
+					<pattern type="1000" count="one">0 пин ¤</pattern>
+					<pattern type="1000" count="other">0 пин ¤</pattern>
+					<pattern type="10000" count="zero">00 пин ¤</pattern>
+					<pattern type="10000" count="one">00 пин ¤</pattern>
+					<pattern type="10000" count="other">00 пин ¤</pattern>
+					<pattern type="100000" count="zero">000 пин ¤</pattern>
+					<pattern type="100000" count="one">000 пин ¤</pattern>
+					<pattern type="100000" count="other">000 пин ¤</pattern>
+					<pattern type="1000000" count="zero">0 млн ¤</pattern>
+					<pattern type="1000000" count="one">0 млн ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="zero">00 млн ¤</pattern>
+					<pattern type="10000000" count="one">00 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="zero">000 млн ¤</pattern>
+					<pattern type="100000000" count="one">000 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="zero">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="one">0 млрд ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="zero">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="one">00 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="zero">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000 млрд ¤</pattern>
+					<pattern type="1000000000000" count="zero">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="one">0 трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="zero">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="zero">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathbold">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathdbl">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathmono">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsanb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsans">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="modi">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mroo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrepka">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrpao">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrtlng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nagm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="newa">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="onao">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="outlined">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="segment">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sind">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sinh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sunu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tirh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tnsa">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tols">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wara">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wcho">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
-				<displayName draft="unconfirmed">Андорра песийӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Андорра песийӗ</displayName>
+				<displayName>Андорра песи</displayName>
+				<displayName count="zero">Андорра песи</displayName>
+				<displayName count="one">Андорра песи</displayName>
+				<displayName count="other">Андорра песи</displayName>
 			</currency>
 			<currency type="AED">
-				<displayName>АПЭ дирхамӗ</displayName>
+				<displayName>Пӗрлешнӗ Араб Эмирачӗсен дирхамӗ</displayName>
+				<displayName count="zero">ПАЭ дирхамӗ</displayName>
+				<displayName count="one">ПАЭ дирхамӗ</displayName>
+				<displayName count="other">ПАЭ дирхамӗ</displayName>
 			</currency>
 			<currency type="AFA">
-				<displayName draft="unconfirmed">Афган афганийӗ (1927–2002)</displayName>
-				<displayName count="other" draft="unconfirmed">Афган афганийӗ (1927–2002)</displayName>
+				<displayName>Афганистан афганийӗ (1927–2002)</displayName>
+				<displayName count="zero">Афганистан афганийӗ (1927–2002)</displayName>
+				<displayName count="one">Афганистан афганийӗ (1927–2002)</displayName>
+				<displayName count="other">Афганистан афганийӗ (1927–2002)</displayName>
 			</currency>
 			<currency type="AFN">
-				<displayName>афганийӗ</displayName>
+				<displayName>Афганистан афганийӗ</displayName>
+				<displayName count="zero">Афганистан афганийӗ</displayName>
+				<displayName count="one">Афганистан афганийӗ</displayName>
+				<displayName count="other">Афганистан афганийӗ</displayName>
 			</currency>
 			<currency type="ALK">
-				<displayName draft="unconfirmed">Албани лек</displayName>
-				<displayName count="other" draft="unconfirmed">Албани лек</displayName>
+				<displayName>Албани лекӗ (1946–1965)</displayName>
+				<displayName count="zero">Албани лекӗ (1946–1965)</displayName>
+				<displayName count="one">Албани лекӗ (1946–1965)</displayName>
+				<displayName count="other">Албани лекӗ (1946–1965)</displayName>
 			</currency>
 			<currency type="ALL">
 				<displayName>Албани лекӗ</displayName>
 			</currency>
 			<currency type="AMD">
-				<displayName>Армяни драмӗ</displayName>
+				<displayName>Армени драмӗ</displayName>
+				<displayName count="zero">Армени драмӗ</displayName>
+				<displayName count="one">Армени драмӗ</displayName>
+				<displayName count="other">Армени драмӗ</displayName>
 			</currency>
 			<currency type="ANG">
-				<displayName>Нидерланд Антиллиан гульденӗ</displayName>
+				<displayName>Нидерланд Антилӗн гульденӗ</displayName>
+				<displayName count="zero">Нидерланд Антилӗн гульденӗ</displayName>
+				<displayName count="one">Нидерланд Антилӗн гульденӗ</displayName>
+				<displayName count="other">Нидерланд Антилӗн гульденӗ</displayName>
 			</currency>
 			<currency type="AOA">
-				<displayName>Ангола кванзӗ</displayName>
+				<displayName>Ангола кванзи</displayName>
+				<displayName count="zero">Ангола кванзи</displayName>
+				<displayName count="one">Ангола кванзи</displayName>
+				<displayName count="other">Ангола кванзи</displayName>
 			</currency>
 			<currency type="AOK">
-				<displayName draft="unconfirmed">Ангола кванзӗ (1977–1991)</displayName>
-				<displayName count="other" draft="unconfirmed">Ангола кванзӗ (1977–1991)</displayName>
+				<displayName>Ангола кванзи (1977–1991)</displayName>
+				<displayName count="zero">Ангола кванзи (1977–1991)</displayName>
+				<displayName count="one">Ангола кванзи (1977–1991)</displayName>
+				<displayName count="other">Ангола кванзи (1977–1991)</displayName>
 			</currency>
 			<currency type="AON">
-				<displayName draft="unconfirmed">Ангола ҫӗнӗ кванзӗ (1990–2000)</displayName>
-				<displayName count="other" draft="unconfirmed">Ангола ҫӗнӗ кванзӗ (1990–2000)</displayName>
+				<displayName>Ангола ҫӗнӗ кванзи (1990–2000)</displayName>
+				<displayName count="zero">Ангола ҫӗнӗ кванзи (1990–2000)</displayName>
+				<displayName count="one">Ангола ҫӗнӗ кванзи (1990–2000)</displayName>
+				<displayName count="other">Ангола ҫӗнӗ кванзи (1990–2000)</displayName>
 			</currency>
 			<currency type="AOR">
-				<displayName draft="unconfirmed">Ангола деноминаци хыҫҫӑн кванзӗ (1995–1999)</displayName>
-				<displayName count="other" draft="unconfirmed">Ангола деноминаци хыҫҫӑн кванзӗ (1995–1999)</displayName>
+				<displayName>Ангола реюстадо кванзӗ (1995–1999)</displayName>
+				<displayName count="zero">Ангола реюстадо кванзӗ (1995–1999)</displayName>
+				<displayName count="one">Ангола реюстадо кванзӗ (1995–1999)</displayName>
+				<displayName count="other">Ангола реюстадо кванзӗ (1995–1999)</displayName>
 			</currency>
 			<currency type="ARA">
-				<displayName draft="unconfirmed">Аргентин аусталӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Аргентин аусталӗ</displayName>
+				<displayName>Аргентина аустралӗ</displayName>
+				<displayName count="zero">Аргентина аустралӗ</displayName>
+				<displayName count="one">Аргентина аустралӗ</displayName>
+				<displayName count="other">Аргентина аустралӗ</displayName>
 			</currency>
 			<currency type="ARL">
-				<displayName draft="unconfirmed">Аргентин песийӗ лей (1970–1983)</displayName>
-				<displayName count="other" draft="unconfirmed">Аргентин песийӗ лей (1970–1983)</displayName>
+				<displayName>Аргентина песо-лейӗ (1970–1983)</displayName>
+				<displayName count="zero">Аргентина песо-лейӗ (1970–1983)</displayName>
+				<displayName count="one">Аргентина песо-лейӗ (1970–1983)</displayName>
+				<displayName count="other">Аргентина песо-лейӗ (1970–1983)</displayName>
 			</currency>
 			<currency type="ARM">
-				<displayName draft="unconfirmed">Аргентин песийӗ (1881–1970)</displayName>
-				<displayName count="other" draft="unconfirmed">Аргентин песийӗ (1881–1970)</displayName>
+				<displayName>Аргентина песи (1881–1970)</displayName>
+				<displayName count="zero">Аргентина песи (1881–1970)</displayName>
+				<displayName count="one">Аргентина песи (1881–1970)</displayName>
+				<displayName count="other">Аргентина песи (1881–1970)</displayName>
 			</currency>
 			<currency type="ARP">
-				<displayName draft="unconfirmed">Аргентин песийӗ (1983–1985)</displayName>
-				<displayName count="other" draft="unconfirmed">Аргентин песийӗ (1983–1985)</displayName>
+				<displayName>Аргентина песи (1983–1985)</displayName>
+				<displayName count="zero">Аргентина песи (1983–1985)</displayName>
+				<displayName count="one">Аргентина песи (1983–1985)</displayName>
+				<displayName count="other">Аргентина песи (1983–1985)</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName>Аргентина песийӗ</displayName>
+				<displayName>Аргентина песи</displayName>
+				<displayName count="zero">Аргентина песи</displayName>
+				<displayName count="one">Аргентина песи</displayName>
+				<displayName count="other">Аргентина песи</displayName>
 			</currency>
 			<currency type="ATS">
-				<displayName draft="unconfirmed">Австри шиллинг</displayName>
-				<displayName count="other" draft="unconfirmed">Австри шиллинг</displayName>
+				<displayName>Австри шиллингӗ</displayName>
+				<displayName count="zero">Австри шиллингӗ</displayName>
+				<displayName count="one">Австри шиллингӗ</displayName>
+				<displayName count="other">Австри шиллингӗ</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>Австрали долларӗ</displayName>
@@ -6831,22 +11796,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Аруба флоринӗ</displayName>
 			</currency>
 			<currency type="AZM">
-				<displayName draft="unconfirmed">Азербайджан маначӗ (1993–2006)</displayName>
-				<displayName count="other" draft="unconfirmed">Азербайджан маначӗ (1993–2006)</displayName>
+				<displayName>Азербайджан маначӗ (1993–2006)</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>Азербайджан маначӗ</displayName>
 			</currency>
 			<currency type="BAD">
-				<displayName draft="unconfirmed">Боснипе Герцеговина динар (1992–1994)</displayName>
-				<displayName count="other" draft="unconfirmed">Боснипе Герцеговина динар (1992–1994)</displayName>
+				<displayName>Боснипе Герцеговина динарӗ (1992–1994)</displayName>
+				<displayName count="zero">Боснипе Герцеговина динарӗ (1992–1994)</displayName>
+				<displayName count="one">Боснипе Герцеговина динарӗ (1992–1994)</displayName>
+				<displayName count="other">Боснипе Герцеговина динарӗ (1992–1994)</displayName>
 			</currency>
 			<currency type="BAM">
-				<displayName>Боснипе Герцеговина конвертланакан марки</displayName>
+				<displayName>Боснипе Герцеговина конверсиленекен марки</displayName>
+				<displayName count="zero">Боснипе Герцеговина конверсиленекен марки</displayName>
+				<displayName count="one">Боснипе Герцеговина конверсиленекен марки</displayName>
+				<displayName count="other">Боснипе Герцеговина конверсиленекен марки</displayName>
 			</currency>
 			<currency type="BAN">
-				<displayName draft="unconfirmed">Боснипе Герцеговина ҫӗнӗ динар (1994–1997)</displayName>
-				<displayName count="other" draft="unconfirmed">Боснипе Герцеговина ҫӗнӗ динар (1994–1997)</displayName>
+				<displayName>Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997)</displayName>
+				<displayName count="zero">Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997)</displayName>
+				<displayName count="one">Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997)</displayName>
+				<displayName count="other">Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997)</displayName>
 			</currency>
 			<currency type="BBD">
 				<displayName>Барбадос долларӗ</displayName>
@@ -6855,31 +11826,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Бангладеш таки</displayName>
 			</currency>
 			<currency type="BEC">
-				<displayName draft="unconfirmed">Бельги конвертланакан франк</displayName>
-				<displayName count="other" draft="unconfirmed">Бельги конвертланакан франк</displayName>
+				<displayName>Бельги конверсиленекен франкӗ</displayName>
+				<displayName count="zero">Бельги конверсиленекен франкӗ</displayName>
+				<displayName count="one">Бельги конверсиленекен франкӗ</displayName>
+				<displayName count="other">Бельги конверсиленекен франкӗ</displayName>
 			</currency>
 			<currency type="BEF">
-				<displayName draft="unconfirmed">Бельги франк</displayName>
-				<displayName count="other" draft="unconfirmed">Бельги франк</displayName>
+				<displayName>Бельги франкӗ</displayName>
+				<displayName count="zero">Бельги франкӗ</displayName>
+				<displayName count="one">Бельги франкӗ</displayName>
+				<displayName count="other">Бельги франкӗ</displayName>
 			</currency>
 			<currency type="BEL">
-				<displayName draft="unconfirmed">Бельги франк (финанс)</displayName>
-				<displayName count="other" draft="unconfirmed">Бельги франк (финанс)</displayName>
+				<displayName>Бельги франкӗ (финанс)</displayName>
+				<displayName count="zero">Бельги франкӗ (финанс)</displayName>
+				<displayName count="one">Бельги франкӗ (финанс)</displayName>
+				<displayName count="other">Бельги франкӗ (финанс)</displayName>
 			</currency>
 			<currency type="BGL">
-				<displayName draft="unconfirmed">Болгари хытӑ левӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Болгари хытӑ левӗ</displayName>
+				<displayName>Болгари хытӑ левӗ</displayName>
 			</currency>
 			<currency type="BGM">
-				<displayName draft="unconfirmed">Болгари социалистсен левӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Болгари социалистсен левӗ</displayName>
+				<displayName>Болгари социалистсен левӗ</displayName>
 			</currency>
 			<currency type="BGN">
 				<displayName>Болгари левӗ</displayName>
 			</currency>
 			<currency type="BGO">
-				<displayName draft="unconfirmed">Болгари левӗ (1879–1952)</displayName>
-				<displayName count="other" draft="unconfirmed">Болгари левӗ (1879–1952)</displayName>
+				<displayName>Болгари левӗ (1879–1952)</displayName>
 			</currency>
 			<currency type="BHD">
 				<displayName>Бахрейн динарӗ</displayName>
@@ -6897,68 +11871,94 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Боливи боливианӗ</displayName>
 			</currency>
 			<currency type="BOL">
-				<displayName draft="unconfirmed">Боливи боливианӗ (1863–1963)</displayName>
-				<displayName count="other" draft="unconfirmed">Боливи боливианӗ (1863–1963)</displayName>
+				<displayName>Боливи боливианӗ (1863–1963)</displayName>
 			</currency>
 			<currency type="BOP">
-				<displayName draft="unconfirmed">Боливи песийӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Боливи песийӗ</displayName>
+				<displayName>Боливи песи</displayName>
+				<displayName count="zero">Боливи песи</displayName>
+				<displayName count="one">Боливи песи</displayName>
+				<displayName count="other">Боливи песи</displayName>
 			</currency>
 			<currency type="BOV">
-				<displayName draft="unconfirmed">Боливи мвдол</displayName>
-				<displayName count="other" draft="unconfirmed">Боливи мвдол</displayName>
+				<displayName>Боливи мвдолӗ</displayName>
+				<displayName count="zero">Боливи мвдолӗ</displayName>
+				<displayName count="one">Боливи мвдолӗ</displayName>
+				<displayName count="other">Боливи мвдолӗ</displayName>
 			</currency>
 			<currency type="BRB">
-				<displayName draft="unconfirmed">Бразили ҫӗнӗ крузейро (1967–1986)</displayName>
-				<displayName count="other" draft="unconfirmed">Бразили ҫӗнӗ крузейро (1967–1986)</displayName>
+				<displayName>Бразили ҫӗнӗ крузейри (1967–1986)</displayName>
+				<displayName count="zero">Бразили ҫӗнӗ крузейри (1967–1986)</displayName>
+				<displayName count="one">Бразили ҫӗнӗ крузейри (1967–1986)</displayName>
+				<displayName count="other">Бразили ҫӗнӗ крузейри (1967–1986)</displayName>
 			</currency>
 			<currency type="BRC">
-				<displayName draft="unconfirmed">Бразили крузадо</displayName>
-				<displayName count="other" draft="unconfirmed">Бразили крузадо</displayName>
+				<displayName>Бразили крузади (1986–1989)</displayName>
+				<displayName count="zero">Бразили крузади (1986–1989)</displayName>
+				<displayName count="one">Бразили крузади (1986–1989)</displayName>
+				<displayName count="other">Бразили крузади (1986–1989)</displayName>
 			</currency>
 			<currency type="BRE">
-				<displayName draft="unconfirmed">Бразили крузейро (1990–1993)</displayName>
-				<displayName count="other" draft="unconfirmed">Бразили крузейро (1990–1993)</displayName>
+				<displayName>Бразили крузейри (1990–1993)</displayName>
+				<displayName count="zero">Бразили крузейри (1990–1993)</displayName>
+				<displayName count="one">Бразили крузейри (1990–1993)</displayName>
+				<displayName count="other">Бразили крузейри (1990–1993)</displayName>
 			</currency>
 			<currency type="BRL">
 				<displayName>Бразили реалӗ</displayName>
 			</currency>
 			<currency type="BRN">
-				<displayName draft="unconfirmed">Бразили ҫӗнӗ крузадо (1989–1990)</displayName>
-				<displayName count="other" draft="unconfirmed">Бразили ҫӗнӗ крузадо (1989–1990)</displayName>
+				<displayName>Бразили ҫӗнӗ крузади (1989–1990)</displayName>
+				<displayName count="zero">Бразили ҫӗнӗ крузади (1989–1990)</displayName>
+				<displayName count="one">Бразили ҫӗнӗ крузади (1989–1990)</displayName>
+				<displayName count="other">Бразили ҫӗнӗ крузади (1989–1990)</displayName>
 			</currency>
 			<currency type="BRR">
-				<displayName draft="unconfirmed">Бразили крузейро (1993–1994)</displayName>
-				<displayName count="other" draft="unconfirmed">Бразили крузейро (1993–1994)</displayName>
+				<displayName>Бразили крузейри (1993–1994)</displayName>
+				<displayName count="zero">Бразили крузейри (1993–1994)</displayName>
+				<displayName count="one">Бразили крузейри (1993–1994)</displayName>
+				<displayName count="other">Бразили крузейри (1993–1994)</displayName>
 			</currency>
 			<currency type="BRZ">
-				<displayName draft="unconfirmed">Бразили крузейро (1942–1967)</displayName>
-				<displayName count="other" draft="unconfirmed">Бразили крузейро (1942–1967)</displayName>
+				<displayName>Бразили крузейри (1942–1967)</displayName>
+				<displayName count="zero">Бразили крузейри (1942–1967)</displayName>
+				<displayName count="one">Бразили крузейри (1942–1967)</displayName>
+				<displayName count="other">Бразили крузейри (1942–1967)</displayName>
 			</currency>
 			<currency type="BSD">
-				<displayName>Багам долларӗ</displayName>
+				<displayName>Багама долларӗ</displayName>
+				<displayName count="zero">Багама долларӗ</displayName>
+				<displayName count="one">Багама долларӗ</displayName>
+				<displayName count="other">Багама долларӗ</displayName>
 			</currency>
 			<currency type="BTN">
 				<displayName>Бутан нгултрумӗ</displayName>
 			</currency>
 			<currency type="BUK">
-				<displayName draft="unconfirmed">Бирман кьят</displayName>
-				<displayName count="other" draft="unconfirmed">Бирман кьят</displayName>
+				<displayName>Бирман кьячӗ</displayName>
+				<displayName count="zero">Бирман кьячӗ</displayName>
+				<displayName count="one">Бирман кьячӗ</displayName>
+				<displayName count="other">Бирман кьячӗ</displayName>
 			</currency>
 			<currency type="BWP">
 				<displayName>Ботсвана пули</displayName>
 			</currency>
 			<currency type="BYB">
-				<displayName draft="unconfirmed">Белорусси тенкӗ (1994–1999)</displayName>
-				<displayName count="other" draft="unconfirmed">Белорусси тенкӗ (1994–1999)</displayName>
+				<displayName>Беларусь рублӗ (1994–1999)</displayName>
+				<displayName count="zero">Беларусь рублӗ (1994–1999)</displayName>
+				<displayName count="one">Беларусь рублӗ (1994–1999)</displayName>
+				<displayName count="other">Беларусь рублӗ (1994–1999)</displayName>
 			</currency>
 			<currency type="BYN">
-				<displayName>Беларуҫ тенкӗ</displayName>
-				<displayName count="other">Беларуҫ тенки</displayName>
+				<displayName>Беларусь рублӗ</displayName>
+				<displayName count="zero">Беларусь рублӗ</displayName>
+				<displayName count="one">Беларусь рублӗ</displayName>
+				<displayName count="other">Беларусь рублӗ</displayName>
 			</currency>
 			<currency type="BYR">
-				<displayName draft="unconfirmed">Белорусси тенкӗ (2000–2016)</displayName>
-				<displayName count="other" draft="unconfirmed">Белорусси тенкӗ (2000–2016)</displayName>
+				<displayName>Беларусь рублӗ (2000–2016)</displayName>
+				<displayName count="zero">Беларусь рублӗ (2000–2016)</displayName>
+				<displayName count="one">Беларусь рублӗ (2000–2016)</displayName>
+				<displayName count="other">Беларусь рублӗ (2000–2016)</displayName>
 			</currency>
 			<currency type="BZD">
 				<displayName>Белиз долларӗ</displayName>
@@ -6967,123 +11967,181 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Канада долларӗ</displayName>
 			</currency>
 			<currency type="CDF">
-				<displayName>Конголези франкӗ</displayName>
+				<displayName>Конго франкӗ</displayName>
+				<displayName count="zero">Конго франкӗ</displayName>
+				<displayName count="one">Конго франкӗ</displayName>
+				<displayName count="other">Конго франкӗ</displayName>
 			</currency>
 			<currency type="CHE">
-				<displayName draft="unconfirmed">WIR евро</displayName>
-				<displayName count="other" draft="unconfirmed">WIR евро</displayName>
+				<displayName>WIR еври</displayName>
+				<displayName count="zero">WIR еври</displayName>
+				<displayName count="one">WIR еври</displayName>
+				<displayName count="other">WIR еври</displayName>
 			</currency>
 			<currency type="CHF">
 				<displayName>Швейцари франкӗ</displayName>
 			</currency>
 			<currency type="CHW">
-				<displayName draft="unconfirmed">WIR франк</displayName>
-				<displayName count="other" draft="unconfirmed">WIR франк</displayName>
+				<displayName>WIR франкӗ</displayName>
+				<displayName count="zero">WIR франкӗ</displayName>
+				<displayName count="one">WIR франкӗ</displayName>
+				<displayName count="other">WIR франкӗ</displayName>
 			</currency>
 			<currency type="CLE">
-				<displayName draft="unconfirmed">Чили эскудо</displayName>
-				<displayName count="other" draft="unconfirmed">Чили эскудо</displayName>
+				<displayName>Чили эскуди</displayName>
+				<displayName count="zero">Чили эскуди</displayName>
+				<displayName count="one">Чили эскуди</displayName>
+				<displayName count="other">Чили эскуди</displayName>
 			</currency>
 			<currency type="CLF">
-				<displayName draft="unconfirmed">Чили расчет единици (UF)</displayName>
-				<displayName count="other" draft="unconfirmed">Чили расчет единици (UF)</displayName>
+				<displayName>Чили татӑлу единици (UF)</displayName>
+				<displayName count="zero">Чили татӑлу единици (UF)</displayName>
+				<displayName count="one">Чили татӑлу единици (UF)</displayName>
+				<displayName count="other">Чили татӑлу единици (UF)</displayName>
 			</currency>
 			<currency type="CLP">
-				<displayName>Чили песийӗ</displayName>
+				<displayName>Чили песи</displayName>
+				<displayName count="zero">Чили песи</displayName>
+				<displayName count="one">Чили песи</displayName>
+				<displayName count="other">Чили песи</displayName>
 			</currency>
 			<currency type="CNH">
-				<displayName>Китай офшор юанӗ</displayName>
+				<displayName>Китай юанӗ (офшор)</displayName>
+				<displayName count="zero">Китай юанӗ (офшор)</displayName>
+				<displayName count="one">Китай юанӗ (офшор)</displayName>
+				<displayName count="other">Китай юанӗ (офшор)</displayName>
 			</currency>
 			<currency type="CNX">
-				<displayName draft="unconfirmed">Китай халӑх банкӗн доллар</displayName>
-				<displayName count="other" draft="unconfirmed">Китай халӑх банкӗн доллар</displayName>
+				<displayName>Китай халӑх банкӗн долларӗ</displayName>
+				<displayName count="zero">Китай халӑх банкӗн долларӗ</displayName>
+				<displayName count="one">Китай халӑх банкӗн долларӗ</displayName>
+				<displayName count="other">Китай халӑх банкӗн долларӗ</displayName>
 			</currency>
 			<currency type="CNY">
 				<displayName>Китай юанӗ</displayName>
 			</currency>
 			<currency type="COP">
-				<displayName>Колумби песийӗ</displayName>
+				<displayName>Колумби песи</displayName>
+				<displayName count="zero">Колумби песи</displayName>
+				<displayName count="one">Колумби песи</displayName>
+				<displayName count="other">Колумби песи</displayName>
 			</currency>
 			<currency type="COU">
-				<displayName draft="unconfirmed">Колумби чӑн тивĕçлĕ единици</displayName>
-				<displayName count="other" draft="unconfirmed">Колумби чӑн тивĕçлĕ единици</displayName>
+				<displayName>Колумби чӑн хаклӑх единици</displayName>
+				<displayName count="zero">Колумби чӑн хаклӑх единици</displayName>
+				<displayName count="one">Колумби чӑн хаклӑх единици</displayName>
+				<displayName count="other">Колумби чӑн хаклӑх единици</displayName>
 			</currency>
 			<currency type="CRC">
 				<displayName>Коста-Рика колонӗ</displayName>
 			</currency>
 			<currency type="CSD">
-				<displayName draft="unconfirmed">Серби динарӗ (2002–2006)</displayName>
-				<displayName count="other" draft="unconfirmed">Серби динарӗ (2002–2006)</displayName>
+				<displayName>Серби динарӗ (2002–2006)</displayName>
 			</currency>
 			<currency type="CSK">
-				<displayName draft="unconfirmed">Чехословак хытӑ кронӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Чехословак хытӑ кронӗ</displayName>
+				<displayName>Чехословаки хытӑ кронӗ</displayName>
+				<displayName count="zero">Чехословаки хытӑ кронӗ</displayName>
+				<displayName count="one">Чехословаки хытӑ кронӗ</displayName>
+				<displayName count="other">Чехословаки хытӑ кронӗ</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName>Куба конвертланакан песийӗ</displayName>
+				<displayName>Куба конверсиленекен песи</displayName>
+				<displayName count="zero">Куба конверсиленекен песи</displayName>
+				<displayName count="one">Куба конверсиленекен песи</displayName>
+				<displayName count="other">Куба конверсиленекен песи</displayName>
 			</currency>
 			<currency type="CUP">
-				<displayName>Куба песийӗ</displayName>
+				<displayName>Куба песи</displayName>
+				<displayName count="zero">Куба песи</displayName>
+				<displayName count="one">Куба песи</displayName>
+				<displayName count="other">Куба песи</displayName>
 			</currency>
 			<currency type="CVE">
-				<displayName>Кабо-Верде эскудӗ</displayName>
+				<displayName>Кабо-Верде эскуди</displayName>
+				<displayName count="zero">Кабо-Верде эскуди</displayName>
+				<displayName count="one">Кабо-Верде эскуди</displayName>
+				<displayName count="other">Кабо-Верде эскуди</displayName>
 			</currency>
 			<currency type="CYP">
-				<displayName draft="unconfirmed">Кипр фунчӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Кипр фунчӗ</displayName>
+				<displayName>Кипр фунчӗ</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName>Чехи кронӗ</displayName>
+				<displayName>Чехи крони</displayName>
+				<displayName count="zero">Чехи крони</displayName>
+				<displayName count="one">Чехи крони</displayName>
+				<displayName count="other">Чехи крони</displayName>
 			</currency>
 			<currency type="DDM">
-				<displayName draft="unconfirmed">Хӗвелтухӑҫ Германи марки</displayName>
-				<displayName count="other" draft="unconfirmed">Хӗвелтухӑҫ Германи марки</displayName>
+				<displayName>Тухӑҫ Германи марки</displayName>
+				<displayName count="zero">Тухӑҫ Германи марки</displayName>
+				<displayName count="one">Тухӑҫ Германи марки</displayName>
+				<displayName count="other">Тухӑҫ Германи марки</displayName>
 			</currency>
 			<currency type="DEM">
-				<displayName draft="unconfirmed">Германи марки</displayName>
-				<displayName count="other" draft="unconfirmed">Германи марки</displayName>
+				<displayName>Германи марки</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName>Джибути франкӗ</displayName>
 			</currency>
 			<currency type="DKK">
-				<displayName>Дани кронӗ</displayName>
+				<displayName>Дани крони</displayName>
+				<displayName count="zero">Дани крони</displayName>
+				<displayName count="one">Дани крони</displayName>
+				<displayName count="other">Дани крони</displayName>
 			</currency>
 			<currency type="DOP">
-				<displayName>Доминикан песийӗ</displayName>
+				<displayName>Доминика песи</displayName>
+				<displayName count="zero">Доминика песи</displayName>
+				<displayName count="one">Доминика песи</displayName>
+				<displayName count="other">Доминика песи</displayName>
 			</currency>
 			<currency type="DZD">
 				<displayName>Алжир динарӗ</displayName>
 			</currency>
 			<currency type="ECS">
-				<displayName draft="unconfirmed">Эквадор сукре</displayName>
-				<displayName count="other" draft="unconfirmed">Эквадор сукре</displayName>
+				<displayName>Эквадор сукри</displayName>
+				<displayName count="zero">Эквадор сукри</displayName>
+				<displayName count="one">Эквадор сукри</displayName>
+				<displayName count="other">Эквадор сукри</displayName>
 			</currency>
 			<currency type="ECV">
-				<displayName draft="unconfirmed">Эквадор яланхи хаклӑхӑн единици</displayName>
-				<displayName count="other" draft="unconfirmed">Эквадор яланхи хаклӑхӑн единици</displayName>
+				<displayName>Эквадор яланхи хаклӑх единици</displayName>
+				<displayName count="zero">Эквадор яланхи хаклӑх единици</displayName>
+				<displayName count="one">Эквадор яланхи хаклӑх единици</displayName>
+				<displayName count="other">Эквадор яланхи хаклӑх единици</displayName>
 			</currency>
 			<currency type="EEK">
-				<displayName draft="unconfirmed">Эстон кронӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Эстон кронӗ</displayName>
+				<displayName>Эстон крони</displayName>
+				<displayName count="zero">Эстон крони</displayName>
+				<displayName count="one">Эстон крони</displayName>
+				<displayName count="other">Эстон крони</displayName>
 			</currency>
 			<currency type="EGP">
 				<displayName>Египет фунчӗ</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName>Эритрей накфӗ</displayName>
+				<displayName>Эритрей накфи</displayName>
+				<displayName count="zero">Эритрей накфи</displayName>
+				<displayName count="one">Эритрей накфи</displayName>
+				<displayName count="other">Эритрей накфи</displayName>
 			</currency>
 			<currency type="ESA">
-				<displayName draft="unconfirmed">Испани песета (А)</displayName>
-				<displayName count="other" draft="unconfirmed">Испани песета (А)</displayName>
+				<displayName>Испани песети (А)</displayName>
+				<displayName count="zero">Испани песети (А)</displayName>
+				<displayName count="one">Испани песети (А)</displayName>
+				<displayName count="other">Испани песети (А)</displayName>
 			</currency>
 			<currency type="ESB">
-				<displayName draft="unconfirmed">Испани конвертланакан песета</displayName>
-				<displayName count="other" draft="unconfirmed">Испани конвертланакан песета</displayName>
+				<displayName>Испани конверсиленекен песети</displayName>
+				<displayName count="zero">Испани конверсиленекен песети</displayName>
+				<displayName count="one">Испани конверсиленекен песети</displayName>
+				<displayName count="other">Испани конверсиленекен песети</displayName>
 			</currency>
 			<currency type="ESP">
-				<displayName draft="unconfirmed">Испани песета</displayName>
-				<displayName count="other" draft="unconfirmed">Испани песета</displayName>
+				<displayName>Испани песети</displayName>
+				<displayName count="zero">Испани песети</displayName>
+				<displayName count="one">Испани песети</displayName>
+				<displayName count="other">Испани песети</displayName>
 			</currency>
 			<currency type="ETB">
 				<displayName>Эфиопи бырӗ</displayName>
@@ -7092,32 +12150,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>евро</displayName>
 			</currency>
 			<currency type="FIM">
-				<displayName draft="unconfirmed">Фин марка</displayName>
-				<displayName count="other" draft="unconfirmed">Фин марка</displayName>
+				<displayName>Финлянди марки</displayName>
+				<displayName count="zero">Финлянди марки</displayName>
+				<displayName count="one">Финлянди марки</displayName>
+				<displayName count="other">Финлянди марки</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>Фиджи долларӗ</displayName>
 			</currency>
 			<currency type="FKP">
-				<displayName>Факланд утравӗсен фунчӗ</displayName>
+				<displayName>Фолкленд утравӗсен фунчӗ</displayName>
+				<displayName count="zero">Фолкленд утравӗсен фунчӗ</displayName>
+				<displayName count="one">Фолкленд утравӗсен фунчӗ</displayName>
+				<displayName count="other">Фолкленд утравӗсен фунчӗ</displayName>
 			</currency>
 			<currency type="FRF">
-				<displayName draft="unconfirmed">Француз франк</displayName>
-				<displayName count="other" draft="unconfirmed">Француз франк</displayName>
+				<displayName>Франци франкӗ</displayName>
+				<displayName count="zero">Франци франкӗ</displayName>
+				<displayName count="one">Франци франкӗ</displayName>
+				<displayName count="other">Франци франкӗ</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>Британи фунчӗ</displayName>
 			</currency>
 			<currency type="GEK">
-				<displayName draft="unconfirmed">Грузин купон</displayName>
-				<displayName count="other" draft="unconfirmed">Грузин купон</displayName>
+				<displayName>Грузи купонӗ</displayName>
+				<displayName count="zero">Грузи купонӗ</displayName>
+				<displayName count="one">Грузи купонӗ</displayName>
+				<displayName count="other">Грузи купонӗ</displayName>
 			</currency>
 			<currency type="GEL">
 				<displayName>Грузи ларийӗ</displayName>
 			</currency>
 			<currency type="GHC">
-				<displayName draft="unconfirmed">Гана седи (1979–2007)</displayName>
-				<displayName count="other" draft="unconfirmed">Гана седи (1979–2007)</displayName>
+				<displayName>Гана седийӗ (1979–2007)</displayName>
+				<displayName count="zero">Гана седийӗ (1979–2007)</displayName>
+				<displayName count="one">Гана седийӗ (1979–2007)</displayName>
+				<displayName count="other">Гана седийӗ (1979–2007)</displayName>
 			</currency>
 			<currency type="GHS">
 				<displayName>Гана седийӗ</displayName>
@@ -7132,27 +12201,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Гвиней франкӗ</displayName>
 			</currency>
 			<currency type="GNS">
-				<displayName draft="unconfirmed">Гвиней сили</displayName>
-				<displayName count="other" draft="unconfirmed">Гвиней сили</displayName>
+				<displayName>Гвиней силийӗ</displayName>
+				<displayName count="zero">Гвиней силийӗ</displayName>
+				<displayName count="one">Гвиней силийӗ</displayName>
+				<displayName count="other">Гвиней силийӗ</displayName>
 			</currency>
 			<currency type="GQE">
-				<displayName draft="unconfirmed">Экваториаллă Гвиней эквель</displayName>
-				<displayName count="other" draft="unconfirmed">Экваториаллă Гвиней эквель</displayName>
+				<displayName>Экваторти Гвиней эквелӗ</displayName>
+				<displayName count="zero">Экваторти Гвиней эквелӗ</displayName>
+				<displayName count="one">Экваторти Гвиней эквелӗ</displayName>
+				<displayName count="other">Экваторти Гвиней эквелӗ</displayName>
 			</currency>
 			<currency type="GRD">
-				<displayName draft="unconfirmed">Грек драхми</displayName>
-				<displayName count="other" draft="unconfirmed">Грек драхма</displayName>
+				<displayName>Греци драхми</displayName>
+				<displayName count="zero">Греци драхми</displayName>
+				<displayName count="one">Греци драхми</displayName>
+				<displayName count="other">Греци драхми</displayName>
 			</currency>
 			<currency type="GTQ">
-				<displayName>Гватемала кетсалӗ</displayName>
+				<displayName>Гватемала кетцалӗ</displayName>
+				<displayName count="zero">Гватемала кетцалӗ</displayName>
+				<displayName count="one">Гватемала кетцалӗ</displayName>
+				<displayName count="other">Гватемала кетцалӗ</displayName>
 			</currency>
 			<currency type="GWE">
-				<displayName draft="unconfirmed">Гвиней-Бисау эскудо</displayName>
-				<displayName count="other" draft="unconfirmed">Гвиней-Бисау эскудо</displayName>
+				<displayName>Гвиней-Бисау эскуди</displayName>
+				<displayName count="zero">Гвиней-Бисау эскуди</displayName>
+				<displayName count="one">Гвиней-Бисау эскуди</displayName>
+				<displayName count="other">Гвиней-Бисау эскуди</displayName>
 			</currency>
 			<currency type="GWP">
-				<displayName draft="unconfirmed">Гвиней-Бисау песийӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Гвиней-Бисау песийӗ</displayName>
+				<displayName>Гвиней-Бисау песи</displayName>
+				<displayName count="zero">Гвиней-Бисау песи</displayName>
+				<displayName count="one">Гвиней-Бисау песи</displayName>
+				<displayName count="other">Гвиней-Бисау песи</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName>Гайана долларӗ</displayName>
@@ -7161,11 +12243,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Гонконг долларӗ</displayName>
 			</currency>
 			<currency type="HNL">
-				<displayName>Гондурас лемпирӗ</displayName>
+				<displayName>Гондурас лемпири</displayName>
+				<displayName count="zero">Гондурас лемпири</displayName>
+				<displayName count="one">Гондурас лемпири</displayName>
+				<displayName count="other">Гондурас лемпири</displayName>
 			</currency>
 			<currency type="HRD">
-				<displayName draft="unconfirmed">Хорват динар</displayName>
-				<displayName count="other" draft="unconfirmed">Хорват динар</displayName>
+				<displayName>Хорвати динарӗ</displayName>
+				<displayName count="zero">Хорвати динарӗ</displayName>
+				<displayName count="one">Хорвати динарӗ</displayName>
+				<displayName count="other">Хорвати динарӗ</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName>Хорвати куни</displayName>
@@ -7180,19 +12267,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Индонези рупийӗ</displayName>
 			</currency>
 			<currency type="IEP">
-				<displayName draft="unconfirmed">Ирланди фунчӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Ирланди фунчӗ</displayName>
+				<displayName>Ирланди фунчӗ</displayName>
 			</currency>
 			<currency type="ILP">
-				<displayName draft="unconfirmed">Израиль фунчӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Израиль фунчӗ</displayName>
+				<displayName>Израиль фунчӗ</displayName>
 			</currency>
 			<currency type="ILR">
-				<displayName draft="unconfirmed">Израиль шекель (1980–1985)</displayName>
-				<displayName count="other" draft="unconfirmed">Израиль шекель (1980–1985)</displayName>
+				<displayName>Израиль шекелӗ (1980–1985)</displayName>
+				<displayName count="zero">Израиль шекелӗ (1980–1985)</displayName>
+				<displayName count="one">Израиль шекелӗ (1980–1985)</displayName>
+				<displayName count="other">Израиль шекелӗ (1980–1985)</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName>Ҫӗнӗ Израиль шекелӗ</displayName>
+				<displayName>Израиль ҫӗнӗ шекелӗ</displayName>
+				<displayName count="zero">Израиль ҫӗнӗ шекелӗ</displayName>
+				<displayName count="one">Израиль ҫӗнӗ шекелӗ</displayName>
+				<displayName count="other">Израиль ҫӗнӗ шекелӗ</displayName>
 			</currency>
 			<currency type="INR">
 				<displayName>Инди рупийӗ</displayName>
@@ -7204,15 +12294,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Иран риалӗ</displayName>
 			</currency>
 			<currency type="ISJ">
-				<displayName draft="unconfirmed">Исланди кронӗ (1918–1981)</displayName>
-				<displayName count="other" draft="unconfirmed">Исланди кронӗ (1918–1981)</displayName>
+				<displayName>Исланди крони (1918–1981)</displayName>
+				<displayName count="zero">Исланди крони (1918–1981)</displayName>
+				<displayName count="one">Исланди крони (1918–1981)</displayName>
+				<displayName count="other">Исланди крони (1918–1981)</displayName>
 			</currency>
 			<currency type="ISK">
-				<displayName>Исланди кронӗ</displayName>
+				<displayName>Исланди крони</displayName>
+				<displayName count="zero">Исланди крони</displayName>
+				<displayName count="one">Исланди крони</displayName>
+				<displayName count="other">Исланди крони</displayName>
 			</currency>
 			<currency type="ITL">
-				<displayName draft="unconfirmed">Итали лира</displayName>
-				<displayName count="other" draft="unconfirmed">Итали лира</displayName>
+				<displayName>Итали лири</displayName>
+				<displayName count="zero">Итали лири</displayName>
+				<displayName count="one">Итали лири</displayName>
+				<displayName count="other">Итали лири</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName>Ямайка долларӗ</displayName>
@@ -7227,27 +12324,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Кени шиллингӗ</displayName>
 			</currency>
 			<currency type="KGS">
-				<displayName>Киргиз сомӗ</displayName>
+				<displayName>Кӑркӑсстан сомӗ</displayName>
+				<displayName count="zero">Кӑркӑсстан сомӗ</displayName>
+				<displayName count="one">Кӑркӑсстан сомӗ</displayName>
+				<displayName count="other">Кӑркӑсстан сомӗ</displayName>
 			</currency>
 			<currency type="KHR">
 				<displayName>Камбоджа риелӗ</displayName>
 			</currency>
 			<currency type="KMF">
-				<displayName>Комора франкӗ</displayName>
+				<displayName>Комор франкӗ</displayName>
+				<displayName count="zero">Комор франкӗ</displayName>
+				<displayName count="one">Комор франкӗ</displayName>
+				<displayName count="other">Комор франкӗ</displayName>
 			</currency>
 			<currency type="KPW">
-				<displayName>КХДР вони</displayName>
+				<displayName>Ҫур ҫӗр Корей вони</displayName>
+				<displayName count="zero">Ҫур ҫӗр Корей вони</displayName>
+				<displayName count="one">Ҫур ҫӗр Корей вони</displayName>
+				<displayName count="other">Ҫур ҫӗр Корей вони</displayName>
 			</currency>
 			<currency type="KRH">
-				<displayName draft="unconfirmed">Корей хван</displayName>
-				<displayName count="other" draft="unconfirmed">Корей хван</displayName>
+				<displayName>Кӑнтӑр Корея хванӗ (1953–1962)</displayName>
+				<displayName count="zero">Кӑнтӑр Корея хванӗ (1953–1962)</displayName>
+				<displayName count="one">Кӑнтӑр Корея хванӗ (1953–1962)</displayName>
+				<displayName count="other">Кӑнтӑр Корея хванӗ (1953–1962)</displayName>
 			</currency>
 			<currency type="KRO">
-				<displayName draft="unconfirmed">Корей вони (1945–1953)</displayName>
-				<displayName count="other" draft="unconfirmed">Корей вони (1945–1953)</displayName>
+				<displayName>Кӑнтӑр Корей вони (1945–1953)</displayName>
+				<displayName count="zero">Кӑнтӑр Корей вони (1945–1953)</displayName>
+				<displayName count="one">Кӑнтӑр Корей вони (1945–1953)</displayName>
+				<displayName count="other">Кӑнтӑр Корей вони (1945–1953)</displayName>
 			</currency>
 			<currency type="KRW">
-				<displayName>Корей вони</displayName>
+				<displayName>Кӑнтӑр Корей вони</displayName>
+				<displayName count="zero">Кӑнтӑр Корей вони</displayName>
+				<displayName count="one">Кӑнтӑр Корей вони</displayName>
+				<displayName count="other">Кӑнтӑр Корей вони</displayName>
 			</currency>
 			<currency type="KWD">
 				<displayName>Кувейт динарӗ</displayName>
@@ -7256,7 +12369,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Кайман утравӗсен долларӗ</displayName>
 			</currency>
 			<currency type="KZT">
-				<displayName>Казах тенгейӗ</displayName>
+				<displayName>Казахстан тенги</displayName>
+				<displayName count="zero">Казахстан тенги</displayName>
+				<displayName count="one">Казахстан тенги</displayName>
+				<displayName count="other">Казахстан тенги</displayName>
 			</currency>
 			<currency type="LAK">
 				<displayName>Лаос кипӗ</displayName>
@@ -7265,7 +12381,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Ливан фунчӗ</displayName>
 			</currency>
 			<currency type="LKR">
-				<displayName>Шри-ланка рупийӗ</displayName>
+				<displayName>Шри-Ланка рупийӗ</displayName>
+				<displayName count="zero">Шри-Ланка рупийӗ</displayName>
+				<displayName count="one">Шри-Ланка рупийӗ</displayName>
+				<displayName count="other">Шри-Ланка рупийӗ</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName>Либери долларӗ</displayName>
@@ -7274,32 +12393,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Лесото лотийӗ</displayName>
 			</currency>
 			<currency type="LTL">
-				<displayName draft="unconfirmed">Литва лит</displayName>
-				<displayName count="other" draft="unconfirmed">Литва лит</displayName>
+				<displayName>Литва личӗ</displayName>
+				<displayName count="zero">Литва личӗ</displayName>
+				<displayName count="one">Литва личӗ</displayName>
+				<displayName count="other">Литва личӗ</displayName>
 			</currency>
 			<currency type="LTT">
-				<displayName draft="unconfirmed">Литва талон</displayName>
-				<displayName count="other" draft="unconfirmed">Литва талон</displayName>
+				<displayName>Литва талонӗ</displayName>
+				<displayName count="zero">Литва талонӗ</displayName>
+				<displayName count="one">Литва талонӗ</displayName>
+				<displayName count="other">Литва талонӗ</displayName>
 			</currency>
 			<currency type="LUC">
-				<displayName draft="unconfirmed">Люксембург конвертланакан франк</displayName>
-				<displayName count="other" draft="unconfirmed">Люксембург конвертланакан франк</displayName>
+				<displayName>Люксембург конверсиленекен франкӗ</displayName>
+				<displayName count="zero">Люксембург конверсиленекен франкӗ</displayName>
+				<displayName count="one">Люксембург конверсиленекен франкӗ</displayName>
+				<displayName count="other">Люксембург конверсиленекен франкӗ</displayName>
 			</currency>
 			<currency type="LUF">
-				<displayName draft="unconfirmed">Люксембург франк</displayName>
-				<displayName count="other" draft="unconfirmed">Люксембург франк</displayName>
+				<displayName>Люксембург франкӗ</displayName>
+				<displayName count="zero">Люксембург франкӗ</displayName>
+				<displayName count="one">Люксембург франкӗ</displayName>
+				<displayName count="other">Люксембург франкӗ</displayName>
 			</currency>
 			<currency type="LUL">
-				<displayName draft="unconfirmed">Люксембург финанс франк</displayName>
-				<displayName count="other" draft="unconfirmed">Люксембург финанс франк</displayName>
+				<displayName>Люксембург финанс франкӗ</displayName>
+				<displayName count="zero">Люксембург финанс франкӗ</displayName>
+				<displayName count="one">Люксембург финанс франкӗ</displayName>
+				<displayName count="other">Люксембург финанс франкӗ</displayName>
 			</currency>
 			<currency type="LVL">
-				<displayName draft="unconfirmed">Латви лат</displayName>
-				<displayName count="other" draft="unconfirmed">Латви лат</displayName>
+				<displayName>Латви лачӗ</displayName>
+				<displayName count="zero">Латви лачӗ</displayName>
+				<displayName count="one">Латви лачӗ</displayName>
+				<displayName count="other">Латви лачӗ</displayName>
 			</currency>
 			<currency type="LVR">
-				<displayName draft="unconfirmed">Латви тенкĕ</displayName>
-				<displayName count="other" draft="unconfirmed">Латви тенкĕ</displayName>
+				<displayName>Латви рублӗ</displayName>
+				<displayName count="zero">Латви рублӗ</displayName>
+				<displayName count="one">Латви рублӗ</displayName>
+				<displayName count="other">Латви рублӗ</displayName>
 			</currency>
 			<currency type="LYD">
 				<displayName>Ливи динарӗ</displayName>
@@ -7308,40 +12441,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Марокко дирхамӗ</displayName>
 			</currency>
 			<currency type="MAF">
-				<displayName draft="unconfirmed">Марокко франк</displayName>
-				<displayName count="other" draft="unconfirmed">Марокко франк</displayName>
+				<displayName>Марокко франкӗ</displayName>
+				<displayName count="zero">Марокко франкӗ</displayName>
+				<displayName count="one">Марокко франкӗ</displayName>
+				<displayName count="other">Марокко франкӗ</displayName>
 			</currency>
 			<currency type="MCF">
-				<displayName draft="unconfirmed">Монако франк</displayName>
-				<displayName count="other" draft="unconfirmed">Монако франк</displayName>
+				<displayName>Монако франкӗ</displayName>
+				<displayName count="zero">Монако франкӗ</displayName>
+				<displayName count="one">Монако франкӗ</displayName>
+				<displayName count="other">Монако франкӗ</displayName>
 			</currency>
 			<currency type="MDC">
-				<displayName draft="unconfirmed">Молдова купон</displayName>
-				<displayName count="other" draft="unconfirmed">Молдова купон</displayName>
+				<displayName>Молдова купонӗ</displayName>
+				<displayName count="zero">Молдова купонӗ</displayName>
+				<displayName count="one">Молдова купонӗ</displayName>
+				<displayName count="other">Молдова купонӗ</displayName>
 			</currency>
 			<currency type="MDL">
 				<displayName>Молдова лайӗ</displayName>
 			</currency>
 			<currency type="MGA">
-				<displayName>Малагаси ариарийӗ</displayName>
+				<displayName>Мадагаскар ариарийӗ</displayName>
+				<displayName count="zero">Мадагаскар ариарийӗ</displayName>
+				<displayName count="one">Мадагаскар ариарийӗ</displayName>
+				<displayName count="other">Мадагаскар ариарийӗ</displayName>
 			</currency>
 			<currency type="MGF">
-				<displayName draft="unconfirmed">Малагаси франк</displayName>
-				<displayName count="other" draft="unconfirmed">Малагаси франк</displayName>
+				<displayName>Мадагаскар франкӗ</displayName>
+				<displayName count="zero">Мадагаскар франкӗ</displayName>
+				<displayName count="one">Мадагаскар франкӗ</displayName>
+				<displayName count="other">Мадагаскар франкӗ</displayName>
 			</currency>
 			<currency type="MKD">
 				<displayName>Македони денарӗ</displayName>
 			</currency>
 			<currency type="MKN">
-				<displayName draft="unconfirmed">Македони динар (1992–1993)</displayName>
-				<displayName count="other" draft="unconfirmed">Македони динар (1992–1993)</displayName>
+				<displayName>Македони денарӗ (1992–1993)</displayName>
+				<displayName count="zero">Македони денарӗ (1992–1993)</displayName>
+				<displayName count="one">Македони денарӗ (1992–1993)</displayName>
+				<displayName count="other">Македони денарӗ (1992–1993)</displayName>
 			</currency>
 			<currency type="MLF">
-				<displayName draft="unconfirmed">Мали франк</displayName>
-				<displayName count="other" draft="unconfirmed">Мали франк</displayName>
+				<displayName>Мали франкӗ</displayName>
+				<displayName count="zero">Мали франкӗ</displayName>
+				<displayName count="one">Мали франкӗ</displayName>
+				<displayName count="other">Мали франкӗ</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName>Мьянман кьятӗ</displayName>
+				<displayName>Мьянма кьячӗ</displayName>
+				<displayName count="zero">Мьянма кьячӗ</displayName>
+				<displayName count="one">Мьянма кьячӗ</displayName>
+				<displayName count="other">Мьянма кьячӗ</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>Монголи тугрикӗ</displayName>
@@ -7350,54 +12501,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Макао патаки</displayName>
 			</currency>
 			<currency type="MRO">
-				<displayName draft="unconfirmed">Мавритани угийӗ (1973–2017)</displayName>
-				<displayName count="other" draft="unconfirmed">Мавритани угийӗ (1973–2017)</displayName>
+				<displayName>Мавритани угийӗ (1973–2017)</displayName>
 			</currency>
 			<currency type="MRU">
 				<displayName>Мавритани угийӗ</displayName>
 			</currency>
 			<currency type="MTL">
-				<displayName draft="unconfirmed">Мальта лира</displayName>
-				<displayName count="other" draft="unconfirmed">Мальта лира</displayName>
+				<displayName>Мальта лири</displayName>
+				<displayName count="zero">Мальта лири</displayName>
+				<displayName count="one">Мальта лири</displayName>
+				<displayName count="other">Мальта лири</displayName>
 			</currency>
 			<currency type="MTP">
-				<displayName draft="unconfirmed">Мальта фунчӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Мальта фунчӗ</displayName>
+				<displayName>Мальта фунчӗ</displayName>
 			</currency>
 			<currency type="MUR">
 				<displayName>Маврики рупийӗ</displayName>
 			</currency>
 			<currency type="MVP">
-				<displayName draft="unconfirmed">Мальдив рупийӗ (1947–1981)</displayName>
-				<displayName count="other" draft="unconfirmed">Мальдив рупийӗ (1947–1981)</displayName>
+				<displayName>Мальдив рупийӗ (1947–1981)</displayName>
 			</currency>
 			<currency type="MVR">
-				<displayName>Мальдивсен руфийӗ</displayName>
+				<displayName>Мальдив руфийӗ</displayName>
+				<displayName count="zero">Мальдив руфийӗ</displayName>
+				<displayName count="one">Мальдив руфийӗ</displayName>
+				<displayName count="other">Мальдив руфийӗ</displayName>
 			</currency>
 			<currency type="MWK">
-				<displayName>Малави квачӗ</displayName>
+				<displayName>Малави квачи</displayName>
+				<displayName count="zero">Малави квачи</displayName>
+				<displayName count="one">Малави квачи</displayName>
+				<displayName count="other">Малави квачи</displayName>
 			</currency>
 			<currency type="MXN">
-				<displayName>Мексика песийӗ</displayName>
+				<displayName>Мексика песи</displayName>
+				<displayName count="zero">Мексика песи</displayName>
+				<displayName count="one">Мексика песи</displayName>
+				<displayName count="other">Мексика песи</displayName>
 			</currency>
 			<currency type="MXP">
-				<displayName draft="unconfirmed">Мексика кӗмӗл песийӗ (1861–1992)</displayName>
-				<displayName count="other" draft="unconfirmed">Мексика кӗмӗл песийӗ (1861–1992)</displayName>
+				<displayName>Мексика кӗмӗл песи (1861–1992)</displayName>
+				<displayName count="zero">Мексика кӗмӗл песи (1861–1992)</displayName>
+				<displayName count="one">Мексика кӗмӗл песи (1861–1992)</displayName>
+				<displayName count="other">Мексика кӗмӗл песи (1861–1992)</displayName>
 			</currency>
 			<currency type="MXV">
-				<displayName draft="unconfirmed">Мексика инвестици единици (UDI)</displayName>
-				<displayName count="other" draft="unconfirmed">Мексика инвестици единици (UDI)</displayName>
+				<displayName>Мексика инвестици единици</displayName>
+				<displayName count="zero">Мексика инвестици единици</displayName>
+				<displayName count="one">Мексика инвестици единици</displayName>
+				<displayName count="other">Мексика инвестици единици</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName>Малайзи ринггичӗ</displayName>
 			</currency>
 			<currency type="MZE">
-				<displayName draft="unconfirmed">Мозамбик эскудо</displayName>
-				<displayName count="other" draft="unconfirmed">Мозамбик эскудо</displayName>
+				<displayName>Мозамбик эскуди</displayName>
+				<displayName count="zero">Мозамбик эскуди</displayName>
+				<displayName count="one">Мозамбик эскуди</displayName>
+				<displayName count="other">Мозамбик эскуди</displayName>
 			</currency>
 			<currency type="MZM">
-				<displayName draft="unconfirmed">Мозамбик метикал (1980–2006)</displayName>
-				<displayName count="other" draft="unconfirmed">Мозамбик метикал (1980–2006)</displayName>
+				<displayName>Мозамбик метикалӗ (1980–2006)</displayName>
+				<displayName count="zero">Мозамбик метикалӗ (1980–2006)</displayName>
+				<displayName count="one">Мозамбик метикалӗ (1980–2006)</displayName>
+				<displayName count="other">Мозамбик метикалӗ (1980–2006)</displayName>
 			</currency>
 			<currency type="MZN">
 				<displayName>Мозамбик метикалӗ</displayName>
@@ -7406,21 +12573,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Намиби долларӗ</displayName>
 			</currency>
 			<currency type="NGN">
-				<displayName>Нигери найрӗ</displayName>
+				<displayName>Нигери найри</displayName>
+				<displayName count="zero">Нигери найри</displayName>
+				<displayName count="one">Нигери найри</displayName>
+				<displayName count="other">Нигери найри</displayName>
 			</currency>
 			<currency type="NIC">
-				<displayName draft="unconfirmed">Никарагуа кордобӗ (1988–1991)</displayName>
-				<displayName count="other" draft="unconfirmed">Никарагуа кордобӗ (1988–1991)</displayName>
+				<displayName>Никарагуа кордоби (1988–1991)</displayName>
+				<displayName count="zero">Никарагуа кордоби (1988–1991)</displayName>
+				<displayName count="one">Никарагуа кордоби (1988–1991)</displayName>
+				<displayName count="other">Никарагуа кордоби (1988–1991)</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName>Никарагуа кордобӗ</displayName>
+				<displayName>Никарагуа кордоби</displayName>
+				<displayName count="zero">Никарагуа кордоби</displayName>
+				<displayName count="one">Никарагуа кордоби</displayName>
+				<displayName count="other">Никарагуа кордоби</displayName>
 			</currency>
 			<currency type="NLG">
-				<displayName draft="unconfirmed">Нидерланд гульден</displayName>
-				<displayName count="other" draft="unconfirmed">Нидерланд гульден</displayName>
+				<displayName>Нидерланд гульденӗ</displayName>
+				<displayName count="zero">Нидерланд гульденӗ</displayName>
+				<displayName count="one">Нидерланд гульденӗ</displayName>
+				<displayName count="other">Нидерланд гульденӗ</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName>Норвеги кронӗ</displayName>
+				<displayName>Норвеги крони</displayName>
+				<displayName count="zero">Норвеги крони</displayName>
+				<displayName count="one">Норвеги крони</displayName>
+				<displayName count="other">Норвеги крони</displayName>
 			</currency>
 			<currency type="NPR">
 				<displayName>Непал рупийӗ</displayName>
@@ -7432,38 +12612,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Оман риалӗ</displayName>
 			</currency>
 			<currency type="PAB">
-				<displayName>Панама бальбоа</displayName>
+				<displayName>Панама бальбойи</displayName>
+				<displayName count="zero">Панама бальбойи</displayName>
+				<displayName count="one">Панама бальбойи</displayName>
+				<displayName count="other">Панама бальбойи</displayName>
 			</currency>
 			<currency type="PEI">
-				<displayName draft="unconfirmed">Перу инти</displayName>
-				<displayName count="other" draft="unconfirmed">Перу инти</displayName>
+				<displayName>Перу интийӗ</displayName>
+				<displayName count="zero">Перу интийӗ</displayName>
+				<displayName count="one">Перу интийӗ</displayName>
+				<displayName count="other">Перу интийӗ</displayName>
 			</currency>
 			<currency type="PEN">
 				<displayName>Перу солӗ</displayName>
 			</currency>
 			<currency type="PES">
-				<displayName draft="unconfirmed">Перу соль (1863–1965)</displayName>
-				<displayName count="other" draft="unconfirmed">Перу соль (1863–1965)</displayName>
+				<displayName>Перу солӗ (1863–1965)</displayName>
+				<displayName count="zero">Перу солӗ (1863–1965)</displayName>
+				<displayName count="one">Перу солӗ (1863–1965)</displayName>
+				<displayName count="other">Перу солӗ (1863–1965)</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName>Папуа – Ҫӗнӗ Гвиней кини</displayName>
+				<displayName>Папуа – Ҫӗнӗ Гвинея кини</displayName>
+				<displayName count="zero">Папуа – Ҫӗнӗ Гвинея кини</displayName>
+				<displayName count="one">Папуа – Ҫӗнӗ Гвинея кини</displayName>
+				<displayName count="other">Папуа – Ҫӗнӗ Гвинея кини</displayName>
 			</currency>
 			<currency type="PHP">
-				<displayName>Филиппин песийӗ</displayName>
+				<displayName>Филиппин песи</displayName>
+				<displayName count="zero">Филиппин песи</displayName>
+				<displayName count="one">Филиппин песи</displayName>
+				<displayName count="other">Филиппин песи</displayName>
 			</currency>
 			<currency type="PKR">
-				<displayName>пакистан рупийӗ</displayName>
+				<displayName>Пакистан рупийӗ</displayName>
+				<displayName count="zero">Пакистан рупийӗ</displayName>
+				<displayName count="one">Пакистан рупийӗ</displayName>
+				<displayName count="other">Пакистан рупийӗ</displayName>
 			</currency>
 			<currency type="PLN">
-				<displayName>Польша злотыйӗ</displayName>
+				<displayName>Польша злотӑйӗ</displayName>
+				<displayName count="zero">Польша злотӑйӗ</displayName>
+				<displayName count="one">Польша злотӑйӗ</displayName>
+				<displayName count="other">Польша злотӑйӗ</displayName>
 			</currency>
 			<currency type="PLZ">
-				<displayName draft="unconfirmed">Польша злотыйӗ (1950–1995)</displayName>
-				<displayName count="other" draft="unconfirmed">Польша злотыйӗ (1950–1995)</displayName>
+				<displayName>Польша злотӑйӗ (1950–1995)</displayName>
+				<displayName count="zero">Польша злотӑйӗ (1950–1995)</displayName>
+				<displayName count="one">Польша злотӑйӗ (1950–1995)</displayName>
+				<displayName count="other">Польша злотӑйӗ (1950–1995)</displayName>
 			</currency>
 			<currency type="PTE">
-				<displayName draft="unconfirmed">Португали эскудо</displayName>
-				<displayName count="other" draft="unconfirmed">Португали эскудо</displayName>
+				<displayName>Португали эскуди</displayName>
+				<displayName count="zero">Португали эскуди</displayName>
+				<displayName count="one">Португали эскуди</displayName>
+				<displayName count="other">Португали эскуди</displayName>
 			</currency>
 			<currency type="PYG">
 				<displayName>Парагвай гуаранӗ</displayName>
@@ -7472,12 +12675,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Катар риалӗ</displayName>
 			</currency>
 			<currency type="RHD">
-				<displayName draft="unconfirmed">Родези доллар</displayName>
-				<displayName count="other" draft="unconfirmed">Родези доллар</displayName>
+				<displayName>Родези долларӗ</displayName>
+				<displayName count="zero">Родези долларӗ</displayName>
+				<displayName count="one">Родези долларӗ</displayName>
+				<displayName count="other">Родези долларӗ</displayName>
 			</currency>
 			<currency type="ROL">
-				<displayName draft="unconfirmed">Румыни лейӗ (1952–2006)</displayName>
-				<displayName count="other" draft="unconfirmed">Румыни лейӗ (1952–2006)</displayName>
+				<displayName>Румыни лейӗ (1952–2006)</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName>Румыни лейӗ</displayName>
@@ -7486,19 +12690,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Серби динарӗ</displayName>
 			</currency>
 			<currency type="RUB">
-				<displayName>Раҫҫей тенкӗ</displayName>
-				<displayName count="other">Раҫҫей тенки</displayName>
+				<displayName>Раҫҫей рублӗ</displayName>
+				<displayName count="zero">Раҫҫей рублӗ</displayName>
+				<displayName count="one">Раҫҫей рублӗ</displayName>
+				<displayName count="other">Раҫҫей рублӗ</displayName>
 				<symbol draft="contributed">₽</symbol>
 			</currency>
 			<currency type="RUR">
-				<displayName draft="unconfirmed">Раҫҫей тенкӗ (1991–1998)</displayName>
-				<displayName count="other" draft="unconfirmed">Раҫҫей тенки (1991–1998)</displayName>
+				<displayName>Раҫҫей рублӗ (1991–1998)</displayName>
+				<displayName count="zero">Раҫҫей рублӗ (1991–1998)</displayName>
+				<displayName count="one">Раҫҫей рублӗ (1991–1998)</displayName>
+				<displayName count="other">Раҫҫей рублӗ (1991–1998)</displayName>
 			</currency>
 			<currency type="RWF">
 				<displayName>Руанда франкӗ</displayName>
 			</currency>
 			<currency type="SAR">
-				<displayName>Сауд риялӗ</displayName>
+				<displayName>Сауд Аравийӗ риялӗ</displayName>
+				<displayName count="zero">Сауд Аравийӗ риялӗ</displayName>
+				<displayName count="one">Сауд Аравийӗ риялӗ</displayName>
+				<displayName count="other">Сауд Аравийӗ риялӗ</displayName>
 			</currency>
 			<currency type="SBD">
 				<displayName>Соломон утравӗсен долларӗ</displayName>
@@ -7507,18 +12718,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Сейшел рупийӗ</displayName>
 			</currency>
 			<currency type="SDD">
-				<displayName draft="unconfirmed">Судан динар (1992–2007)</displayName>
-				<displayName count="other" draft="unconfirmed">Судан динар (1992–2007)</displayName>
+				<displayName>Судан динарӗ (1992–2007)</displayName>
+				<displayName count="zero">Судан динарӗ (1992–2007)</displayName>
+				<displayName count="one">Судан динарӗ (1992–2007)</displayName>
+				<displayName count="other">Судан динарӗ (1992–2007)</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>Судан фунчӗ</displayName>
 			</currency>
 			<currency type="SDP">
-				<displayName draft="unconfirmed">Судан фунчӗ (1957–1998)</displayName>
-				<displayName count="other" draft="unconfirmed">Судан фунчӗ (1957–1998)</displayName>
+				<displayName>Судан фунчӗ (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName>Швеци кронӗ</displayName>
+				<displayName>Швеци крони</displayName>
+				<displayName count="zero">Швеци крони</displayName>
+				<displayName count="one">Швеци крони</displayName>
+				<displayName count="other">Швеци крони</displayName>
 			</currency>
 			<currency type="SGD">
 				<displayName>Сингапур долларӗ</displayName>
@@ -7527,18 +12742,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Сӑваплӑ Елена утравӗн фунчӗ</displayName>
 			</currency>
 			<currency type="SIT">
-				<displayName draft="unconfirmed">Словени толар</displayName>
-				<displayName count="other" draft="unconfirmed">Словени толар</displayName>
+				<displayName>Словени толарӗ</displayName>
+				<displayName count="zero">Словени толарӗ</displayName>
+				<displayName count="one">Словени толарӗ</displayName>
+				<displayName count="other">Словени толарӗ</displayName>
 			</currency>
 			<currency type="SKK">
-				<displayName draft="unconfirmed">Словак кронӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Словак кронӗ</displayName>
+				<displayName>Словаки крони</displayName>
+				<displayName count="zero">Словаки крони</displayName>
+				<displayName count="one">Словаки крони</displayName>
+				<displayName count="other">Словаки крони</displayName>
 			</currency>
 			<currency type="SLE">
-				<displayName>леонӗ</displayName>
+				<displayName>Сьерра-Леоне леони</displayName>
+				<displayName count="zero">Сьерра-Леоне леони</displayName>
+				<displayName count="one">Сьерра-Леоне леони</displayName>
+				<displayName count="other">Сьерра-Леоне леони</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>леонӗ (1964—2022)</displayName>
+				<displayName>Сьерра-Леоне леони (1964–2022)</displayName>
+				<displayName count="zero">Сьерра-Леоне леони (1964–2022)</displayName>
+				<displayName count="one">Сьерра-Леоне леони (1964–2022)</displayName>
+				<displayName count="other">Сьерра-Леоне леони (1964–2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>Сомали шиллингӗ</displayName>
@@ -7547,72 +12772,115 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Суринам долларӗ</displayName>
 			</currency>
 			<currency type="SRG">
-				<displayName draft="unconfirmed">Суринам гульден</displayName>
-				<displayName count="other" draft="unconfirmed">Суринам гульден</displayName>
+				<displayName>Суринам гульденӗ</displayName>
+				<displayName count="zero">Суринам гульденӗ</displayName>
+				<displayName count="one">Суринам гульденӗ</displayName>
+				<displayName count="other">Суринам гульденӗ</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName>Кӑнтӑр Судан фунчӗ</displayName>
 			</currency>
 			<currency type="STD">
-				<displayName draft="unconfirmed">Сан-Томе и Принсипи добра</displayName>
-				<displayName count="other" draft="unconfirmed">Сан-Томе и Принсипи добра</displayName>
+				<displayName>Сан-Томепе Принсипи добри (1977–2017)</displayName>
+				<displayName count="zero">Сан-Томепе Принсипи добри (1977–2017)</displayName>
+				<displayName count="one">Сан-Томепе Принсипи добри (1977–2017)</displayName>
+				<displayName count="other">Сан-Томепе Принсипи добри (1977–2017)</displayName>
 			</currency>
 			<currency type="STN">
-				<displayName>Сан-Томе тата Принсипи добрӗ</displayName>
+				<displayName>Сан-Томепе Принсипи добри</displayName>
+				<displayName count="zero">Сан-Томепе Принсипи добри</displayName>
+				<displayName count="one">Сан-Томепе Принсипи добри</displayName>
+				<displayName count="other">Сан-Томепе Принсипи добри</displayName>
 			</currency>
 			<currency type="SUR">
-				<displayName draft="unconfirmed">Совет тенкӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Совет тенки</displayName>
+				<displayName>ССРП рублӗ</displayName>
+				<displayName count="zero">ССРП рублӗ</displayName>
+				<displayName count="one">ССРП рублӗ</displayName>
+				<displayName count="other">ССРП рублӗ</displayName>
 			</currency>
 			<currency type="SVC">
-				<displayName draft="unconfirmed">Сальвадор колон</displayName>
-				<displayName count="other" draft="unconfirmed">Сальвадор колон</displayName>
+				<displayName>Сальвадор колонӗ</displayName>
+				<displayName count="zero">Сальвадор колонӗ</displayName>
+				<displayName count="one">Сальвадор колонӗ</displayName>
+				<displayName count="other">Сальвадор колонӗ</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName>Сири фунчӗ</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName>Свази лилангенийӗ</displayName>
+				<displayName>Эсватини лилангенийӗ</displayName>
+				<displayName count="zero">Эсватини лилангенийӗ</displayName>
+				<displayName count="one">Эсватини лилангенийӗ</displayName>
+				<displayName count="other">Эсватини лилангенийӗ</displayName>
 			</currency>
 			<currency type="THB">
-				<displayName>Таиланд барӗ</displayName>
+				<displayName>Таиланд бачӗ</displayName>
+				<displayName count="zero">Таиланд бачӗ</displayName>
+				<displayName count="one">Таиланд бачӗ</displayName>
+				<displayName count="other">Таиланд бачӗ</displayName>
 			</currency>
 			<currency type="TJR">
-				<displayName draft="unconfirmed">Таджик тенкӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Таджик тенки</displayName>
+				<displayName>Таджикистан рублӗ</displayName>
+				<displayName count="zero">Таджикистан рублӗ</displayName>
+				<displayName count="one">Таджикистан рублӗ</displayName>
+				<displayName count="other">Таджикистан рублӗ</displayName>
 			</currency>
 			<currency type="TJS">
-				<displayName>Таджик сомонийӗ</displayName>
+				<displayName>Таджикистан сомонийӗ</displayName>
+				<displayName count="zero">Таджикистан сомонийӗ</displayName>
+				<displayName count="one">Таджикистан сомонийӗ</displayName>
+				<displayName count="other">Таджикистан сомонийӗ</displayName>
 			</currency>
 			<currency type="TMM">
-				<displayName draft="unconfirmed">Туркмен маначӗ (1993–2009)</displayName>
-				<displayName count="other" draft="unconfirmed">Туркмен маначӗ (1993–2009)</displayName>
+				<displayName>Туркменистан маначӗ (1993–2009)</displayName>
+				<displayName count="zero">Туркменистан маначӗ (1993–2009)</displayName>
+				<displayName count="one">Туркменистан маначӗ (1993–2009)</displayName>
+				<displayName count="other">Туркменистан маначӗ (1993–2009)</displayName>
 			</currency>
 			<currency type="TMT">
-				<displayName>Туркмен маначӗ</displayName>
+				<displayName>Туркменистан маначӗ</displayName>
+				<displayName count="zero">Туркменистан маначӗ</displayName>
+				<displayName count="one">Туркменистан маначӗ</displayName>
+				<displayName count="other">Туркменистан маначӗ</displayName>
 			</currency>
 			<currency type="TND">
-				<displayName>Тунези динарӗ</displayName>
+				<displayName>Тунис динарӗ</displayName>
+				<displayName count="zero">Тунис динарӗ</displayName>
+				<displayName count="one">Тунис динарӗ</displayName>
+				<displayName count="other">Тунис динарӗ</displayName>
 			</currency>
 			<currency type="TOP">
-				<displayName>Тонган паанги</displayName>
+				<displayName>Тонга паанги</displayName>
+				<displayName count="zero">Тонга паанги</displayName>
+				<displayName count="one">Тонга паанги</displayName>
+				<displayName count="other">Тонга паанги</displayName>
 			</currency>
 			<currency type="TPE">
-				<displayName draft="unconfirmed">Тимор эскудо</displayName>
-				<displayName count="other" draft="unconfirmed">Тимор эскудо</displayName>
+				<displayName>Тимор эскуди</displayName>
+				<displayName count="zero">Тимор эскуди</displayName>
+				<displayName count="one">Тимор эскуди</displayName>
+				<displayName count="other">Тимор эскуди</displayName>
 			</currency>
 			<currency type="TRL">
-				<displayName draft="unconfirmed">Турци лира (1922–2005)</displayName>
-				<displayName count="other" draft="unconfirmed">Турци лира (1922–2005)</displayName>
+				<displayName>Турци лири (1922–2005)</displayName>
+				<displayName count="zero">Турци лири (1922–2005)</displayName>
+				<displayName count="one">Турци лири (1922–2005)</displayName>
+				<displayName count="other">Турци лири (1922–2005)</displayName>
 			</currency>
 			<currency type="TRY">
 				<displayName>Турци лири</displayName>
 			</currency>
 			<currency type="TTD">
-				<displayName>Тринидад тата Тобаго долларӗ</displayName>
+				<displayName>Тринидадпа Тобаго долларӗ</displayName>
+				<displayName count="zero">Тринидадпа Тобаго долларӗ</displayName>
+				<displayName count="one">Тринидадпа Тобаго долларӗ</displayName>
+				<displayName count="other">Тринидадпа Тобаго долларӗ</displayName>
 			</currency>
 			<currency type="TWD">
-				<displayName>Ҫӗнӗ Тайван долларӗ</displayName>
+				<displayName>Тайвань ҫӗнӗ долларӗ</displayName>
+				<displayName count="zero">Тайвань ҫӗнӗ долларӗ</displayName>
+				<displayName count="one">Тайвань ҫӗнӗ долларӗ</displayName>
+				<displayName count="other">Тайвань ҫӗнӗ долларӗ</displayName>
 			</currency>
 			<currency type="TZS">
 				<displayName>Танзани шиллингӗ</displayName>
@@ -7621,12 +12889,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Украина гривни</displayName>
 			</currency>
 			<currency type="UAK">
-				<displayName draft="unconfirmed">Украина карбованец</displayName>
-				<displayName count="other" draft="unconfirmed">Украина карбованец</displayName>
+				<displayName>Украина карбованецӗ</displayName>
+				<displayName count="zero">Украина карбованецӗ</displayName>
+				<displayName count="one">Украина карбованецӗ</displayName>
+				<displayName count="other">Украина карбованецӗ</displayName>
 			</currency>
 			<currency type="UGS">
-				<displayName draft="unconfirmed">Уганда шиллинг (1966–1987)</displayName>
-				<displayName count="other" draft="unconfirmed">Уганда шиллинг (1966–1987)</displayName>
+				<displayName>Уганда шиллингӗ (1966–1987)</displayName>
+				<displayName count="zero">Уганда шиллингӗ (1966–1987)</displayName>
+				<displayName count="one">Уганда шиллингӗ (1966–1987)</displayName>
+				<displayName count="other">Уганда шиллингӗ (1966–1987)</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName>Уганда шиллингӗ</displayName>
@@ -7636,42 +12908,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<symbol draft="contributed">$</symbol>
 			</currency>
 			<currency type="USN">
-				<displayName draft="unconfirmed">АПШ долларӗ ыранхи кун</displayName>
-				<displayName count="other" draft="unconfirmed">АПШ долларӗ ыранхи кун</displayName>
+				<displayName>АПШ долларӗ (ҫитес кун)</displayName>
+				<displayName count="zero">АПШ долларӗ (ҫитес кун)</displayName>
+				<displayName count="one">АПШ долларӗ (ҫитес кун)</displayName>
+				<displayName count="other">АПШ долларӗ (ҫитес кун)</displayName>
 			</currency>
 			<currency type="USS">
-				<displayName draft="unconfirmed">АПШ долларӗ паянхи кун</displayName>
-				<displayName count="other" draft="unconfirmed">АПШ долларӗ паянхи кун</displayName>
+				<displayName>АПШ долларӗ (ҫак кун)</displayName>
+				<displayName count="zero">АПШ долларӗ (ҫак кун)</displayName>
+				<displayName count="one">АПШ долларӗ (ҫак кун)</displayName>
+				<displayName count="other">АПШ долларӗ (ҫак кун)</displayName>
 			</currency>
 			<currency type="UYI">
-				<displayName draft="unconfirmed">Уругвай песийӗ (индексаци хыҫҫӑн единици)</displayName>
-				<displayName count="other" draft="unconfirmed">Уругвай песийӗ (индексаци хыҫҫӑн единици)</displayName>
+				<displayName>Уругвай песи (индексациленӗ единица)</displayName>
+				<displayName count="zero">Уругвай песи (индексациленӗ единица)</displayName>
+				<displayName count="one">Уругвай песи (индексациленӗ единица)</displayName>
+				<displayName count="other">Уругвай песи (индексациленӗ единица)</displayName>
 			</currency>
 			<currency type="UYP">
-				<displayName draft="unconfirmed">Уругвай песийӗ (1975–1993)</displayName>
-				<displayName count="other" draft="unconfirmed">Уругвай песийӗ (1975–1993)</displayName>
+				<displayName>Уругвай песи (1975–1993)</displayName>
+				<displayName count="zero">Уругвай песи (1975–1993)</displayName>
+				<displayName count="one">Уругвай песи (1975–1993)</displayName>
+				<displayName count="other">Уругвай песи (1975–1993)</displayName>
 			</currency>
 			<currency type="UYU">
-				<displayName>Уругвай песийӗ</displayName>
+				<displayName>Уругвай песи</displayName>
+				<displayName count="zero">Уругвай песи</displayName>
+				<displayName count="one">Уругвай песи</displayName>
+				<displayName count="other">Уругвай песи</displayName>
 			</currency>
 			<currency type="UYW">
-				<displayName draft="unconfirmed">Уругвай номиналлӑ индексаци единици</displayName>
-				<displayName count="other" draft="unconfirmed">Уругвай номиналлӑ индексаци единици</displayName>
+				<displayName>Уругвай номинал ӗҫ хакӗн индексӗн единици</displayName>
+				<displayName count="zero">Уругвай номинал ӗҫ хакӗн индексӗн единици</displayName>
+				<displayName count="one">Уругвай номинал ӗҫ хакӗн индексӗн единици</displayName>
+				<displayName count="other">Уругвай номинал ӗҫ хакӗн индексӗн единици</displayName>
 			</currency>
 			<currency type="UZS">
-				<displayName>Узбек сумӗ</displayName>
+				<displayName>Узбекистан сумӗ</displayName>
+				<displayName count="zero">Узбекистан сумӗ</displayName>
+				<displayName count="one">Узбекистан сумӗ</displayName>
+				<displayName count="other">Узбекистан сумӗ</displayName>
 			</currency>
 			<currency type="VEB">
-				<displayName draft="unconfirmed">Венесуэла боливарӗ (1871–2008)</displayName>
-				<displayName count="other" draft="unconfirmed">Венесуэла боливарӗ (1871–2008)</displayName>
+				<displayName>Венесуэла боливарӗ (1871–2008)</displayName>
 			</currency>
 			<currency type="VED">
-				<displayName draft="unconfirmed">Суверенлă боливарӗ</displayName>
-				<displayName count="other" draft="unconfirmed">Суверенлă боливарӗ</displayName>
+				<displayName>Венесуэла суверенлӑ боливарӗ</displayName>
+				<displayName count="zero">Венесуэла суверенлӑ боливарӗ</displayName>
+				<displayName count="one">Венесуэла суверенлӑ боливарӗ</displayName>
+				<displayName count="other">Венесуэла суверенлӑ боливарӗ</displayName>
 			</currency>
 			<currency type="VEF">
-				<displayName draft="unconfirmed">Венесуэль боливарӗ (2008–2018)</displayName>
-				<displayName count="other" draft="unconfirmed">Венесуэль боливарӗ (2008–2018)</displayName>
+				<displayName>Венесуэла боливарӗ (2008–2018)</displayName>
+				<displayName count="zero">Венесуэла боливарӗ (2008–2018)</displayName>
+				<displayName count="one">Венесуэла боливарӗ (2008–2018)</displayName>
+				<displayName count="other">Венесуэла боливарӗ (2008–2018)</displayName>
 			</currency>
 			<currency type="VES">
 				<displayName>Венесуэла боливарӗ</displayName>
@@ -7680,2680 +12971,3824 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Вьетнам донгӗ</displayName>
 			</currency>
 			<currency type="VNN">
-				<displayName draft="unconfirmed">Вьетнам донг (1978–1985)</displayName>
-				<displayName count="other" draft="unconfirmed">Вьетнам донг (1978–1985)</displayName>
+				<displayName>Вьетнам донгӗ (1978–1985)</displayName>
+				<displayName count="zero">Вьетнам донгӗ (1978–1985)</displayName>
+				<displayName count="one">Вьетнам донгӗ (1978–1985)</displayName>
+				<displayName count="other">Вьетнам донгӗ (1978–1985)</displayName>
 			</currency>
 			<currency type="VUV">
-				<displayName>Вануату ватуйӗ</displayName>
+				<displayName>Вануату ватувӗ</displayName>
+				<displayName count="zero">Вануату ватувӗ</displayName>
+				<displayName count="one">Вануату ватувӗ</displayName>
+				<displayName count="other">Вануату ватувӗ</displayName>
 			</currency>
 			<currency type="WST">
 				<displayName>Самоа тали</displayName>
 			</currency>
 			<currency type="XAF">
-				<displayName>Тӗп Африка КФА франкӗ</displayName>
+				<displayName>Вӑта Африка КФА франкӗ</displayName>
+				<displayName count="zero">Вӑта Африка КФА франкӗ</displayName>
+				<displayName count="one">Вӑта Африка КФА франкӗ</displayName>
+				<displayName count="other">Вӑта Африка КФА франкӗ</displayName>
 			</currency>
 			<currency type="XAG">
-				<displayName draft="unconfirmed">кӗмӗл</displayName>
-				<displayName count="other" draft="unconfirmed">Трой унци кӗмӗл</displayName>
+				<displayName>кӗмӗл</displayName>
+				<displayName count="zero">Троя унцийӗ кӗмӗлпе</displayName>
+				<displayName count="one">Троя унцийӗ кӗмӗлпе</displayName>
+				<displayName count="other">Троя унцийӗ кӗмӗлпе</displayName>
 			</currency>
 			<currency type="XAU">
-				<displayName draft="unconfirmed">ылтӑн</displayName>
-				<displayName count="other" draft="unconfirmed">Трой унци ылтӑн</displayName>
+				<displayName>ылтӑн</displayName>
+				<displayName count="zero">Троя унцийӗ ылтӑнпа</displayName>
+				<displayName count="one">Троя унцийӗ ылтӑнпа</displayName>
+				<displayName count="other">Троя унцийӗ ылтӑнпа</displayName>
 			</currency>
 			<currency type="XBA">
-				<displayName draft="unconfirmed">Европа хутлă единици</displayName>
-				<displayName count="other" draft="unconfirmed">Европа хутлă единици</displayName>
+				<displayName>Европа сыпӑнчӑк единици</displayName>
+				<displayName count="zero">Европа сыпӑнчӑк единици</displayName>
+				<displayName count="one">Европа сыпӑнчӑк единици</displayName>
+				<displayName count="other">Европа сыпӑнчӑк единици</displayName>
 			</currency>
 			<currency type="XBB">
-				<displayName draft="unconfirmed">Европа укҫа единици</displayName>
-				<displayName count="other" draft="unconfirmed">Европа укҫа единици</displayName>
+				<displayName>Европа укҫа единици</displayName>
 			</currency>
 			<currency type="XBC">
-				<displayName draft="unconfirmed">Европа расчет единицисем (XBС)</displayName>
-				<displayName count="other" draft="unconfirmed">Европа расчет единицисем (XBС)</displayName>
+				<displayName>Европа тӳлев единици (XBС)</displayName>
+				<displayName count="zero">Европа тӳлев единици (XBС)</displayName>
+				<displayName count="one">Европа тӳлев единици (XBС)</displayName>
+				<displayName count="other">Европа тӳлев единици (XBС)</displayName>
 			</currency>
 			<currency type="XBD">
-				<displayName draft="unconfirmed">Европа расчет единицисем (XBD)</displayName>
-				<displayName count="other" draft="unconfirmed">Европа расчет единицисем (XBD)</displayName>
+				<displayName>Европа тӳлев единици (XBD)</displayName>
+				<displayName count="zero">Европа тӳлев единици (XBD)</displayName>
+				<displayName count="one">Европа тӳлев единици (XBD)</displayName>
+				<displayName count="other">Европа тӳлев единици (XBD)</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName>Хӗвелтухӑҫ Карибсем долларӗ</displayName>
+				<displayName>Тухӑҫ Кариб долларӗ</displayName>
+				<displayName count="zero">Тухӑҫ Кариб долларӗ</displayName>
+				<displayName count="one">Тухӑҫ Кариб долларӗ</displayName>
+				<displayName count="other">Тухӑҫ Кариб долларӗ</displayName>
 			</currency>
 			<currency type="XCG">
-				<displayName draft="unconfirmed">Кариб гульден</displayName>
-				<displayName count="other" draft="unconfirmed">Кариб гульден</displayName>
+				<displayName>Кариб гульденӗ</displayName>
+				<displayName count="zero">Кариб гульденӗ</displayName>
+				<displayName count="one">Кариб гульденӗ</displayName>
+				<displayName count="other">Кариб гульденӗ</displayName>
 			</currency>
 			<currency type="XDR">
-				<displayName draft="unconfirmed">ятарлӑ заемлени прависем (СДР)</displayName>
-				<displayName count="other" draft="unconfirmed">ятарлӑ заемлени прависем (СДР)</displayName>
+				<displayName>ятарлӑ йышӑну прависем (СДР)</displayName>
+				<displayName count="zero">ятарлӑ йышӑну прависем (СДР)</displayName>
+				<displayName count="one">ятарлӑ йышӑну прависем (СДР)</displayName>
+				<displayName count="other">ятарлӑ йышӑну прависем (СДР)</displayName>
 			</currency>
 			<currency type="XEU">
-				<displayName draft="unconfirmed">Европа валюта единици</displayName>
-				<displayName count="other" draft="unconfirmed">Европа валюта единици</displayName>
+				<displayName>Европа валюта единици</displayName>
 			</currency>
 			<currency type="XFO">
-				<displayName draft="unconfirmed">Франци ылтӑн франк</displayName>
-				<displayName count="other" draft="unconfirmed">Франци ылтӑн франк</displayName>
+				<displayName>Франци ылтӑн франкӗ</displayName>
+				<displayName count="zero">Франци ылтӑн франкӗ</displayName>
+				<displayName count="one">Франци ылтӑн франкӗ</displayName>
+				<displayName count="other">Франци ылтӑн франкӗ</displayName>
 			</currency>
 			<currency type="XFU">
-				<displayName draft="unconfirmed">Франци UIC-франк</displayName>
-				<displayName count="other" draft="unconfirmed">Франци UIC-франк</displayName>
+				<displayName>Франци UIC франкӗ</displayName>
+				<displayName count="zero">Франци UIC франкӗ</displayName>
+				<displayName count="one">Франци UIC франкӗ</displayName>
+				<displayName count="other">Франци UIC франкӗ</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>КФА ВСЕАО франкӗ</displayName>
+				<displayName>Анӑҫ Африка КФА франкӗ</displayName>
+				<displayName count="zero">Анӑҫ Африка КФА франкӗ</displayName>
+				<displayName count="one">Анӑҫ Африка КФА франкӗ</displayName>
+				<displayName count="other">Анӑҫ Африка КФА франкӗ</displayName>
 			</currency>
 			<currency type="XPD">
-				<displayName draft="unconfirmed">паллади</displayName>
-				<displayName count="other" draft="unconfirmed">Трой унци паллади</displayName>
+				<displayName>паллади</displayName>
+				<displayName count="zero">Троя унцийӗ палладипе</displayName>
+				<displayName count="one">Троя унцийӗ палладипе</displayName>
+				<displayName count="other">Троя унцийӗ палладипе</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName>Франци Лӑпкӑ океан франкӗ</displayName>
+				<displayName>КФП франкӗ</displayName>
+				<displayName count="zero">КФП франкӗ</displayName>
+				<displayName count="one">КФП франкӗ</displayName>
+				<displayName count="other">КФП франкӗ</displayName>
 			</currency>
 			<currency type="XPT">
-				<displayName draft="unconfirmed">платина</displayName>
-				<displayName count="other" draft="unconfirmed">Трой унци платина</displayName>
+				<displayName>платина</displayName>
+				<displayName count="zero">Троя унцийӗ платинӑпа</displayName>
+				<displayName count="one">Троя унцийӗ платинӑпа</displayName>
+				<displayName count="other">Троя унцийӗ платинӑпа</displayName>
 			</currency>
 			<currency type="XRE">
-				<displayName draft="unconfirmed">RINET фонд единици</displayName>
-				<displayName count="other" draft="unconfirmed">RINET фонд единици</displayName>
+				<displayName>RINET фонд единици</displayName>
 			</currency>
 			<currency type="XSU">
-				<displayName draft="unconfirmed">сукре</displayName>
-				<displayName count="other" draft="unconfirmed">сукре</displayName>
+				<displayName>сукре</displayName>
 			</currency>
 			<currency type="XTS">
-				<displayName draft="unconfirmed">тĕрĕслев валют код</displayName>
-				<displayName count="other" draft="unconfirmed">тĕрĕслев валют код</displayName>
+				<displayName>тӗрӗслев валют кочӗ</displayName>
+				<displayName count="zero">тӗрӗслев валют кочӗ</displayName>
+				<displayName count="one">тӗрӗслев валют кочӗ</displayName>
+				<displayName count="other">тӗрӗслев валют кочӗ</displayName>
 			</currency>
 			<currency type="XUA">
-				<displayName draft="unconfirmed">ADB расчет единици</displayName>
-				<displayName count="other" draft="unconfirmed">ADB расчет единици</displayName>
+				<displayName>ADB тӳлев единици</displayName>
+				<displayName count="zero">ADB тӳлев единици</displayName>
+				<displayName count="one">ADB тӳлев единици</displayName>
+				<displayName count="other">ADB тӳлев единици</displayName>
 			</currency>
 			<currency type="XXX">
 				<displayName>паллӑ мар валюта</displayName>
 			</currency>
 			<currency type="YDD">
-				<displayName draft="unconfirmed">Йемен динар</displayName>
-				<displayName count="other" draft="unconfirmed">Йемен динар</displayName>
+				<displayName>Йемен динарӗ</displayName>
+				<displayName count="zero">Йемен динарӗ</displayName>
+				<displayName count="one">Йемен динарӗ</displayName>
+				<displayName count="other">Йемен динарӗ</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Йемен риалӗ</displayName>
 			</currency>
 			<currency type="YUD">
-				<displayName draft="unconfirmed">Югослави хытӑ динарӗ (1966–1990)</displayName>
-				<displayName count="other" draft="unconfirmed">Югослави хытӑ динарӗ (1966–1990)</displayName>
+				<displayName>Югослави хытӑ динарӗ (1966–1990)</displayName>
 			</currency>
 			<currency type="YUM">
-				<displayName draft="unconfirmed">Югослави ҫӗнӗ динарӗ (1994–2002)</displayName>
-				<displayName count="other" draft="unconfirmed">Югослави ҫӗнӗ динарӗ (1994–2002)</displayName>
+				<displayName>Югослави ҫӗнӗ динарӗ (1994–2002)</displayName>
 			</currency>
 			<currency type="YUN">
-				<displayName draft="unconfirmed">Югослави конвертланакан динарӗ (1990–1992)</displayName>
-				<displayName count="other" draft="unconfirmed">Югослави конвертланакан динарӗ (1990–1992)</displayName>
+				<displayName>Югослави конверсиленекен динарӗ (1990–1992)</displayName>
+				<displayName count="zero">Югослави конверсиленекен динарӗ (1990–1992)</displayName>
+				<displayName count="one">Югослави конверсиленекен динарӗ (1990–1992)</displayName>
+				<displayName count="other">Югослави конверсиленекен динарӗ (1990–1992)</displayName>
 			</currency>
 			<currency type="YUR">
-				<displayName draft="unconfirmed">Югослави реформӑланӑ динарӗ (1992–1993)</displayName>
-				<displayName count="other" draft="unconfirmed">Югослави реформӑланӑ динарӗ (1992–1993)</displayName>
+				<displayName>Югослави реформӑланӑ динарӗ (1992–1993)</displayName>
 			</currency>
 			<currency type="ZAL">
-				<displayName draft="unconfirmed">Кӑнтӑр Африка рэндӗ (финанс)</displayName>
-				<displayName count="other" draft="unconfirmed">Кӑнтӑр Африка рэндӗ (финанс)</displayName>
+				<displayName>Кӑнтӑр Африка рэнчӗ (финанс)</displayName>
+				<displayName count="zero">Кӑнтӑр Африка рэнчӗ (финанс)</displayName>
+				<displayName count="one">Кӑнтӑр Африка рэнчӗ (финанс)</displayName>
+				<displayName count="other">Кӑнтӑр Африка рэнчӗ (финанс)</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName>Кӑнтӑр Африка рэндӗ</displayName>
+				<displayName>Кӑнтӑр Африка рэнчӗ</displayName>
+				<displayName count="zero">Кӑнтӑр Африка рэнчӗ</displayName>
+				<displayName count="one">Кӑнтӑр Африка рэнчӗ</displayName>
+				<displayName count="other">Кӑнтӑр Африка рэнчӗ</displayName>
 			</currency>
 			<currency type="ZMK">
-				<displayName draft="unconfirmed">Замби квачи (1968–2012)</displayName>
-				<displayName count="other" draft="unconfirmed">Замби квачи (1968–2012)</displayName>
+				<displayName>Замби квачи (1968–2012)</displayName>
 			</currency>
 			<currency type="ZMW">
 				<displayName>Замби квачи</displayName>
 			</currency>
 			<currency type="ZRN">
-				<displayName draft="unconfirmed">Ҫӗнӗ заир (1993–1998)</displayName>
-				<displayName count="other" draft="unconfirmed">Ҫӗнӗ заир (1993–1998)</displayName>
+				<displayName>Заир ҫӗнӗ заирӗ (1993–1998)</displayName>
+				<displayName count="zero">Заир ҫӗнӗ заирӗ (1993–1998)</displayName>
+				<displayName count="one">Заир ҫӗнӗ заирӗ (1993–1998)</displayName>
+				<displayName count="other">Заир ҫӗнӗ заирӗ (1993–1998)</displayName>
 			</currency>
 			<currency type="ZRZ">
-				<displayName draft="unconfirmed">Заир (1971–1993)</displayName>
-				<displayName count="other" draft="unconfirmed">Заир (1971–1993)</displayName>
+				<displayName>Заир заирӗ (1971–1993)</displayName>
+				<displayName count="zero">Заир заирӗ (1971–1993)</displayName>
+				<displayName count="one">Заир заирӗ (1971–1993)</displayName>
+				<displayName count="other">Заир заирӗ (1971–1993)</displayName>
 			</currency>
 			<currency type="ZWD">
-				<displayName draft="unconfirmed">Зимбабве доллар (1980–2008)</displayName>
-				<displayName count="other" draft="unconfirmed">Зимбабве доллар (1980–2008)</displayName>
+				<displayName>Зимбабве долларӗ (1980–2008)</displayName>
+				<displayName count="zero">Зимбабве долларӗ (1980–2008)</displayName>
+				<displayName count="one">Зимбабве долларӗ (1980–2008)</displayName>
+				<displayName count="other">Зимбабве долларӗ (1980–2008)</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабве ылтӑнӗ</displayName>
+				<displayName count="zero">Зимбабве ылтӑнӗ</displayName>
+				<displayName count="one">Зимбабве ылтӑнӗ</displayName>
+				<displayName count="other">Зимбабве ылтӑнӗ</displayName>
 			</currency>
 			<currency type="ZWL">
-				<displayName draft="unconfirmed">Зимбабве доллар (2009)</displayName>
-				<displayName count="other" draft="unconfirmed">Зимбабве доллар (2009)</displayName>
+				<displayName>Зимбабве долларӗ (2009–2024)</displayName>
+				<displayName count="zero">Зимбабве долларӗ (2009–2024)</displayName>
+				<displayName count="one">Зимбабве долларӗ (2009–2024)</displayName>
+				<displayName count="other">Зимбабве долларӗ (2009–2024)</displayName>
 			</currency>
 			<currency type="ZWR">
-				<displayName draft="unconfirmed">Зимбабве доллар (2008)</displayName>
-				<displayName count="other" draft="unconfirmed">Зимбабве доллар (2008)</displayName>
+				<displayName>Зимбабве долларӗ (2008)</displayName>
+				<displayName count="zero">Зимбабве долларӗ (2008)</displayName>
+				<displayName count="one">Зимбабве долларӗ (2008)</displayName>
+				<displayName count="other">Зимбабве долларӗ (2008)</displayName>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
 		</miscPatterns>
 		<minimalPairs>
-			<pluralMinimalPairs count="other" draft="contributed">{0} кунсем</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other">{0}-мӗш хӗреслӗ урамран сылтӑм енне пӑрӑнӑр</ordinalMinimalPairs>
+			<pluralMinimalPairs count="zero">Пан улми ҫук.</pluralMinimalPairs>
+			<pluralMinimalPairs count="one">{0} пан улми пур. Ӑна илесшӗн-и?</pluralMinimalPairs>
+			<pluralMinimalPairs count="other">{0} пан улми пур. Вӗсене илесшӗн-и?</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">{0}-мӗш пан улми выртать.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">деци{0}</unitPrefixPattern>
+				<unitPrefixPattern>деци{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-2">
-				<unitPrefixPattern draft="unconfirmed">санти{0}</unitPrefixPattern>
+				<unitPrefixPattern>санти{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-3">
-				<unitPrefixPattern draft="unconfirmed">милли{0}</unitPrefixPattern>
+				<unitPrefixPattern>милли{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-6">
-				<unitPrefixPattern draft="unconfirmed">микро{0}</unitPrefixPattern>
+				<unitPrefixPattern>микро{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-9">
-				<unitPrefixPattern draft="unconfirmed">нано{0}</unitPrefixPattern>
+				<unitPrefixPattern>нано{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-12">
-				<unitPrefixPattern draft="unconfirmed">пико{0}</unitPrefixPattern>
+				<unitPrefixPattern>пико{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-15">
-				<unitPrefixPattern draft="unconfirmed">фемто{0}</unitPrefixPattern>
+				<unitPrefixPattern>фемто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-18">
-				<unitPrefixPattern draft="unconfirmed">атто{0}</unitPrefixPattern>
+				<unitPrefixPattern>атто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-21">
-				<unitPrefixPattern draft="unconfirmed">зепто{0}</unitPrefixPattern>
+				<unitPrefixPattern>зепто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-24">
-				<unitPrefixPattern draft="unconfirmed">иокто{0}</unitPrefixPattern>
+				<unitPrefixPattern>иокто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-27">
-				<unitPrefixPattern draft="unconfirmed">ронто{0}</unitPrefixPattern>
+				<unitPrefixPattern>ронто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-30">
-				<unitPrefixPattern draft="unconfirmed">квекто{0}</unitPrefixPattern>
+				<unitPrefixPattern>квекто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p1">
-				<unitPrefixPattern draft="unconfirmed">дека{0}</unitPrefixPattern>
+				<unitPrefixPattern>дека{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p2">
-				<unitPrefixPattern draft="unconfirmed">гекто{0}</unitPrefixPattern>
+				<unitPrefixPattern>гекто{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p3">
-				<unitPrefixPattern draft="unconfirmed">кило{0}</unitPrefixPattern>
+				<unitPrefixPattern>кило{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p6">
-				<unitPrefixPattern draft="unconfirmed">мега{0}</unitPrefixPattern>
+				<unitPrefixPattern>мега{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p9">
-				<unitPrefixPattern draft="unconfirmed">гига{0}</unitPrefixPattern>
+				<unitPrefixPattern>гига{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p12">
-				<unitPrefixPattern draft="unconfirmed">тера{0}</unitPrefixPattern>
+				<unitPrefixPattern>тера{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p15">
-				<unitPrefixPattern draft="unconfirmed">пета{0}</unitPrefixPattern>
+				<unitPrefixPattern>пета{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p18">
-				<unitPrefixPattern draft="unconfirmed">экса{0}</unitPrefixPattern>
+				<unitPrefixPattern>экса{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p21">
-				<unitPrefixPattern draft="unconfirmed">зетта{0}</unitPrefixPattern>
+				<unitPrefixPattern>зетта{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p24">
-				<unitPrefixPattern draft="unconfirmed">иотта{0}</unitPrefixPattern>
+				<unitPrefixPattern>иотта{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p27">
-				<unitPrefixPattern draft="unconfirmed">ронна{0}</unitPrefixPattern>
+				<unitPrefixPattern>ронна{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p30">
-				<unitPrefixPattern draft="unconfirmed">кветта{0}</unitPrefixPattern>
+				<unitPrefixPattern>кветта{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p1">
-				<unitPrefixPattern draft="unconfirmed">киби{0}</unitPrefixPattern>
+				<unitPrefixPattern>киби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p2">
-				<unitPrefixPattern draft="unconfirmed">меби{0}</unitPrefixPattern>
+				<unitPrefixPattern>меби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p3">
-				<unitPrefixPattern draft="unconfirmed">гиби{0}</unitPrefixPattern>
+				<unitPrefixPattern>гиби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p4">
-				<unitPrefixPattern draft="unconfirmed">теби{0}</unitPrefixPattern>
+				<unitPrefixPattern>теби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p5">
-				<unitPrefixPattern draft="unconfirmed">пеби{0}</unitPrefixPattern>
+				<unitPrefixPattern>пеби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p6">
-				<unitPrefixPattern draft="unconfirmed">эксби{0}</unitPrefixPattern>
+				<unitPrefixPattern>эксби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p7">
-				<unitPrefixPattern draft="unconfirmed">зеби{0}</unitPrefixPattern>
+				<unitPrefixPattern>зеби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p8">
-				<unitPrefixPattern draft="unconfirmed">йоби{0}</unitPrefixPattern>
+				<unitPrefixPattern>йоби{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="power2">
-				<compoundUnitPattern1 count="other" draft="unconfirmed">тӑваткал {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="zero">тӑваткал {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one">тӑваткал {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">тӑваткал {0}</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="power3">
-				<compoundUnitPattern1 count="other" draft="unconfirmed">кубла {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="zero">куб {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one">куб {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">куб {0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="times">
+				<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="unconfirmed">ирĕклĕн ӳкнин хăвăртланăвĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ирĕклĕн ӳкнин хăвăртланăвĕ</unitPattern>
+				<displayName>ирӗклӗ ӳкни хӑвӑртланӑвӗ</displayName>
+				<unitPattern count="zero">{0} g</unitPattern>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} ирӗклӗ ӳкни хӑвӑртланӑвӗ</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
-				<displayName draft="unconfirmed">тӑваткал ҫеккунтра метр</displayName>
-				<unitPattern count="other" draft="unconfirmed">тӑваткал ҫеккунтра {0} метр</unitPattern>
-			</unit>
-			<unit type="angle-revolution">
-				<displayName draft="unconfirmed">çавра</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çавра</unitPattern>
+				<displayName>метр/тӑваткал ҫеккунт</displayName>
+				<unitPattern count="zero">{0} м/ҫ²</unitPattern>
+				<unitPattern count="one">{0} м/ҫ²</unitPattern>
+				<unitPattern count="other">{0} метр/тӑваткал ҫеккунт</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="unconfirmed">радиан</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} радиан</unitPattern>
+				<unitPattern count="zero">{0} рад</unitPattern>
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
 			</unit>
 			<unit type="angle-degree">
-				<displayName draft="unconfirmed">градус</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} градус</unitPattern>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName draft="unconfirmed">кĕтесле минут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕтесле минут</unitPattern>
+				<displayName>пӗкӗ минучӗ</displayName>
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0} пӗкӗ минучӗ</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName draft="unconfirmed">кĕтесле çеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕтесле çеккунт</unitPattern>
+				<displayName>пӗкӗ ҫеккунчӗ</displayName>
+				<unitPattern count="zero">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0} пӗкӗ ҫеккунчӗ</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">тӑваткал километр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал километр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/тӑваткал километр</perUnitPattern>
+				<displayName>тӑваткал километр</displayName>
+				<unitPattern count="zero">{0} км²</unitPattern>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал километр</unitPattern>
+				<perUnitPattern>{0}/тӑваткал километр</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName draft="unconfirmed">гектар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гектар</unitPattern>
+				<displayName>гектар</displayName>
+				<unitPattern count="zero">{0} га</unitPattern>
+				<unitPattern count="one">{0} га</unitPattern>
+				<unitPattern count="other">{0} гектар</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">тӑваткал метр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал метр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/тӑваткал метр</perUnitPattern>
+				<displayName>тӑваткал метр</displayName>
+				<unitPattern count="zero">{0} м²</unitPattern>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал метр</unitPattern>
+				<perUnitPattern>{0}/тӑваткал метр</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">тӑваткал сантиметр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал сантиметр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/тӑваткал сантиметр</perUnitPattern>
+				<displayName>тӑваткал сантиметр</displayName>
+				<unitPattern count="zero">{0} см²</unitPattern>
+				<unitPattern count="one">{0} см²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал сантиметр</unitPattern>
+				<perUnitPattern>{0}/тӑваткал сантиметр</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">тӑваткал миля</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал миля</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/тӑваткал миля</perUnitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="unconfirmed">акр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} акр</unitPattern>
+				<displayName>тӑваткал миля</displayName>
+				<unitPattern count="zero">{0} ми²</unitPattern>
+				<unitPattern count="one">{0} ми²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал миля</unitPattern>
+				<perUnitPattern>{0}/тӑваткал миля</perUnitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">тӑваткал ярд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал ярд</unitPattern>
+				<displayName>тӑваткал ярд</displayName>
+				<unitPattern count="zero">{0} ярд²</unitPattern>
+				<unitPattern count="one">{0} ярд²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал ярд</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">тӑваткал фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал фут</unitPattern>
+				<displayName>тӑваткал фут</displayName>
+				<unitPattern count="zero">{0} фт²</unitPattern>
+				<unitPattern count="one">{0} фт²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал фут</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">тӑваткал дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тӑваткал дюйм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/тӑваткал дюйм</perUnitPattern>
-			</unit>
-			<unit type="area-dunam">
-				<displayName draft="unconfirmed">дунам</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дунам</unitPattern>
+				<displayName>тӑваткал дюйм</displayName>
+				<unitPattern count="zero">{0} дюйм²</unitPattern>
+				<unitPattern count="one">{0} дюйм²</unitPattern>
+				<unitPattern count="other">{0} тӑваткал дюйм</unitPattern>
+				<perUnitPattern>{0}/тӑваткал дюйм</perUnitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">карат</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} карат</unitPattern>
+				<unitPattern count="zero">{0} кар</unitPattern>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<displayName draft="unconfirmed">децилитрӑ миллиграмм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} децилитрӑ миллиграмм</unitPattern>
+				<displayName>миллиграмм/децилитр</displayName>
+				<unitPattern count="zero">{0} мг/дл</unitPattern>
+				<unitPattern count="one">{0} мг/дл</unitPattern>
+				<unitPattern count="other">{0} миллиграмм/децилитр</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
-				<displayName draft="unconfirmed">литрлӑх миллимоль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} литрлӑх миллимоль</unitPattern>
+				<displayName>миллимоль/литр</displayName>
+				<unitPattern count="zero">{0} ммоль/л</unitPattern>
+				<unitPattern count="one">{0} ммоль/л</unitPattern>
+				<unitPattern count="other">{0} миллимоль/литр</unitPattern>
 			</unit>
 			<unit type="concentr-item">
-				<displayName draft="unconfirmed">объект</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} объект</unitPattern>
+				<displayName>япала</displayName>
+				<unitPattern count="zero">{0} япала</unitPattern>
+				<unitPattern count="one">{0} япала</unitPattern>
+				<unitPattern count="other">{0} япала</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName draft="unconfirmed">миллионмĕш пайĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллионмĕш пайĕ</unitPattern>
+			<unit type="concentr-part">
+				<displayName>пай</displayName>
+				<unitPattern count="zero">{0} пай</unitPattern>
+				<unitPattern count="one">{0} пай</unitPattern>
+				<unitPattern count="other">{0} пай</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>миллионмĕш пайĕ</displayName>
+				<unitPattern count="zero">{0} млн⁻¹</unitPattern>
+				<unitPattern count="one">{0} млн⁻¹</unitPattern>
+				<unitPattern count="other">{0} миллионмĕш пайĕ</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
-				<displayName draft="unconfirmed">процент</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} процент</unitPattern>
+				<displayName>процент</displayName>
+				<unitPattern count="zero">{0} %</unitPattern>
+				<unitPattern count="one">{0} %</unitPattern>
+				<unitPattern count="other">{0} процент</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
-				<displayName draft="unconfirmed">промиллĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} промиллĕ</unitPattern>
+				<displayName>промилле</displayName>
+				<unitPattern count="zero">{0} ‰</unitPattern>
+				<unitPattern count="one">{0} ‰</unitPattern>
+				<unitPattern count="other">{0} промилле</unitPattern>
 			</unit>
 			<unit type="concentr-permyriad">
-				<displayName draft="unconfirmed">промириад</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} промириад</unitPattern>
+				<displayName>промириад</displayName>
+				<unitPattern count="zero">{0} ‱</unitPattern>
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} промириад</unitPattern>
 			</unit>
-			<unit type="concentr-mole">
-				<displayName draft="unconfirmed">моль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} моль</unitPattern>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="zero">{0} Глк</unitPattern>
+				<unitPattern count="one">{0} Глк</unitPattern>
+				<unitPattern count="other">{0} глюкоза</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="unconfirmed">километрлӑх литр</displayName>
-				<unitPattern count="other" draft="unconfirmed">километрлӑх {0} литр</unitPattern>
+				<displayName>литр/километр</displayName>
+				<unitPattern count="zero">{0} л/км</unitPattern>
+				<unitPattern count="one">{0} л/км</unitPattern>
+				<unitPattern count="other">{0} литр/километр</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
-				<displayName draft="unconfirmed">çĕр километрах литр</displayName>
-				<unitPattern count="other" draft="unconfirmed">çĕр километрах {0} литр</unitPattern>
+				<displayName>литр/100 километр</displayName>
+				<unitPattern count="zero">{0} л/100 км</unitPattern>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} литр/100 километр</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">галлон ҫине миля</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} галлон ҫине миля</unitPattern>
+				<displayName>миля/галлон</displayName>
+				<unitPattern count="zero">{0} ми/гал</unitPattern>
+				<unitPattern count="one">{0} ми/гал</unitPattern>
+				<unitPattern count="other">{0} миля/галлон</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName draft="unconfirmed">импери галлон ҫинче миля</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери галлон ҫинче миля</unitPattern>
+				<displayName>миля/империлле галлон</displayName>
+				<unitPattern count="zero">{0} ми/имп. гал</unitPattern>
+				<unitPattern count="one">{0} ми/имп. гал</unitPattern>
+				<unitPattern count="other">{0} миля/империлле галлон</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName draft="unconfirmed">петабайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} петабайт</unitPattern>
+				<displayName>петабайт</displayName>
+				<unitPattern count="zero">{0} Пбайт</unitPattern>
+				<unitPattern count="one">{0} Пбайт</unitPattern>
+				<unitPattern count="other">{0} петабайт</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">терабайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} терабайт</unitPattern>
+				<displayName>терабайт</displayName>
+				<unitPattern count="zero">{0} Тбайт</unitPattern>
+				<unitPattern count="one">{0} Тбайт</unitPattern>
+				<unitPattern count="other">{0} терабайт</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">терабит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} терабит</unitPattern>
+				<displayName>терабит</displayName>
+				<unitPattern count="zero">{0} Тбит</unitPattern>
+				<unitPattern count="one">{0} Тбит</unitPattern>
+				<unitPattern count="other">{0} терабит</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">гигабайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гигабайт</unitPattern>
+				<displayName>гигабайт</displayName>
+				<unitPattern count="zero">{0} Гбайт</unitPattern>
+				<unitPattern count="one">{0} Гбайт</unitPattern>
+				<unitPattern count="other">{0} гигабайт</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">гигабит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гигабит</unitPattern>
+				<displayName>гигабит</displayName>
+				<unitPattern count="zero">{0} Гбит</unitPattern>
+				<unitPattern count="one">{0} Гбит</unitPattern>
+				<unitPattern count="other">{0} гигабит</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">мегабайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегабайт</unitPattern>
+				<displayName>мегабайт</displayName>
+				<unitPattern count="zero">{0} Мбайт</unitPattern>
+				<unitPattern count="one">{0} Мбайт</unitPattern>
+				<unitPattern count="other">{0} мегабайт</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">мегабит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегабит</unitPattern>
+				<displayName>мегабит</displayName>
+				<unitPattern count="zero">{0} Мбит</unitPattern>
+				<unitPattern count="one">{0} Мбит</unitPattern>
+				<unitPattern count="other">{0} мегабит</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">килобайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килобайт</unitPattern>
+				<displayName>килобайт</displayName>
+				<unitPattern count="zero">{0} кбайт</unitPattern>
+				<unitPattern count="one">{0} кбайт</unitPattern>
+				<unitPattern count="other">{0} килобайт</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">килобит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килобит</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<displayName draft="unconfirmed">байт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} байт</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="unconfirmed">бит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бит</unitPattern>
-			</unit>
-			<unit type="duration-century">
-				<displayName draft="unconfirmed">ӗмӗрсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ӗмӗрсем</unitPattern>
+				<displayName>килобит</displayName>
+				<unitPattern count="zero">{0} кбит</unitPattern>
+				<unitPattern count="one">{0} кбит</unitPattern>
+				<unitPattern count="other">{0} килобит</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">вунҫуллӑх</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} вунҫуллӑх</unitPattern>
+				<displayName>вунӑ ҫуллӑх</displayName>
+				<unitPattern count="zero">{0} вунӑ ҫ.</unitPattern>
+				<unitPattern count="one">{0} вунӑ ҫ.</unitPattern>
+				<unitPattern count="other">{0} вунӑ ҫуллӑх</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">ҫулталӑксем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫулталӑксем</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} ҫулталӑкра</perUnitPattern>
+				<displayName>ҫул</displayName>
+				<unitPattern count="zero">{0} ҫул</unitPattern>
+				<unitPattern count="one">{0} ҫул</unitPattern>
+				<unitPattern count="other">{0} ҫул</unitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName draft="unconfirmed">чӗрӗк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чӗрӗк</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/чӗрӗк</perUnitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">уйăхсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} уйӑхсем</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/уйӑх</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">эрне</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эрне</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/эрнере</perUnitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">кун</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кун</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} кунне</perUnitPattern>
+				<unitPattern count="zero">{0} чӗр.</unitPattern>
+				<unitPattern count="one">{0} чӗр.</unitPattern>
+				<unitPattern count="other">{0} чӗр.</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сехет</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} сехетре</perUnitPattern>
+				<unitPattern count="zero">{0} сех</unitPattern>
+				<unitPattern count="one">{0} сех</unitPattern>
+				<unitPattern count="other">{0} сех</unitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">минут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} минут</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} минутра</perUnitPattern>
+				<displayName>минут</displayName>
+				<unitPattern count="zero">{0} мин</unitPattern>
+				<unitPattern count="one">{0} мин</unitPattern>
+				<unitPattern count="other">{0} минут</unitPattern>
+				<perUnitPattern>{0}/минут</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">ҫеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫеккунт</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫеккунтра</perUnitPattern>
+				<displayName>ҫеккунт</displayName>
+				<unitPattern count="zero">{0} ҫ</unitPattern>
+				<unitPattern count="one">{0} ҫ</unitPattern>
+				<unitPattern count="other">{0} ҫеккунт</unitPattern>
+				<perUnitPattern>{0}/ҫеккунт</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">миллиҫеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллиҫеккунт</unitPattern>
+				<displayName>миллиҫеккунт</displayName>
+				<unitPattern count="zero">{0} мҫ</unitPattern>
+				<unitPattern count="one">{0} мҫ</unitPattern>
+				<unitPattern count="other">{0} миллиҫеккунт</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">микроҫеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} микроҫеккунт</unitPattern>
+				<displayName>микроҫеккунт</displayName>
+				<unitPattern count="zero">{0} мкҫ</unitPattern>
+				<unitPattern count="one">{0} мкҫ</unitPattern>
+				<unitPattern count="other">{0} микроҫеккунт</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">наноҫеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} наноҫеккунт</unitPattern>
+				<displayName>наноҫеккунт</displayName>
+				<unitPattern count="zero">{0} нҫ</unitPattern>
+				<unitPattern count="one">{0} нҫ</unitPattern>
+				<unitPattern count="other">{0} наноҫеккунт</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">ампер</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ампер</unitPattern>
+				<displayName>ампер</displayName>
+				<unitPattern count="zero">{0} А</unitPattern>
+				<unitPattern count="one">{0} А</unitPattern>
+				<unitPattern count="other">{0} ампер</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">миллиампер</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллиампер</unitPattern>
+				<displayName>миллиампер</displayName>
+				<unitPattern count="zero">{0} мА</unitPattern>
+				<unitPattern count="one">{0} мА</unitPattern>
+				<unitPattern count="other">{0} миллиампер</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="unconfirmed">ом</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ом</unitPattern>
+				<displayName>ом</displayName>
+				<unitPattern count="zero">{0} Ом</unitPattern>
+				<unitPattern count="one">{0} Ом</unitPattern>
+				<unitPattern count="other">{0} ом</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="unconfirmed">вольт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} вольт</unitPattern>
+				<displayName>вольт</displayName>
+				<unitPattern count="zero">{0} В</unitPattern>
+				<unitPattern count="one">{0} В</unitPattern>
+				<unitPattern count="other">{0} вольт</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<displayName draft="unconfirmed">килокалори</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килокалори</unitPattern>
+				<displayName>килокалори</displayName>
+				<unitPattern count="zero">{0} ккал</unitPattern>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} килокалори</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
-				<displayName draft="unconfirmed">калори</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} калори</unitPattern>
+				<displayName>калори</displayName>
+				<unitPattern count="zero">{0} кал</unitPattern>
+				<unitPattern count="one">{0} кал</unitPattern>
+				<unitPattern count="other">{0} калори</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="unconfirmed">килоджоуль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килоджоуль</unitPattern>
+				<displayName>килоджоуль</displayName>
+				<unitPattern count="zero">{0} кДж</unitPattern>
+				<unitPattern count="one">{0} кДж</unitPattern>
+				<unitPattern count="other">{0} килоджоуль</unitPattern>
 			</unit>
 			<unit type="energy-joule">
-				<displayName draft="unconfirmed">джоуль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} джоуль</unitPattern>
+				<displayName>джоуль</displayName>
+				<unitPattern count="zero">{0} Дж</unitPattern>
+				<unitPattern count="one">{0} Дж</unitPattern>
+				<unitPattern count="other">{0} джоуль</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">киловатт-сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} киловатт-сехет</unitPattern>
+				<displayName>киловатт-сехет</displayName>
+				<unitPattern count="zero">{0} кВт⋅сех</unitPattern>
+				<unitPattern count="one">{0} кВт⋅сех</unitPattern>
+				<unitPattern count="other">{0} киловатт-сехет</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
-				<displayName draft="unconfirmed">электронвольт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} электронвольт</unitPattern>
+				<displayName>электронвольт</displayName>
+				<unitPattern count="zero">{0} эВ</unitPattern>
+				<unitPattern count="one">{0} эВ</unitPattern>
+				<unitPattern count="other">{0} электронвольт</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
-				<displayName draft="unconfirmed">британи ӑшӑ единици</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} британи ӑшӑ единици</unitPattern>
+				<displayName>Британи ӑшӑ виҫи</displayName>
+				<unitPattern count="zero">{0} БӐВ</unitPattern>
+				<unitPattern count="one">{0} БӐВ</unitPattern>
+				<unitPattern count="other">{0} Британи ӑшӑ виҫи</unitPattern>
 			</unit>
 			<unit type="energy-therm-us">
-				<displayName draft="unconfirmed">америка терм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} америка терм</unitPattern>
+				<displayName>АПШ термӗ</displayName>
+				<unitPattern count="zero">{0} АПШ термӗ</unitPattern>
+				<unitPattern count="one">{0} АПШ термӗ</unitPattern>
+				<unitPattern count="other">{0} АПШ термӗ</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
-				<displayName draft="unconfirmed">кĕренке-вăй</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕренке-вăй</unitPattern>
+				<displayName>фунт-вӑй</displayName>
+				<unitPattern count="zero">{0} фнтв</unitPattern>
+				<unitPattern count="one">{0} фнтв</unitPattern>
+				<unitPattern count="other">{0} фунт-вӑй</unitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName draft="unconfirmed">ньютон</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ньютон</unitPattern>
+				<displayName>ньютон</displayName>
+				<unitPattern count="zero">{0} Н</unitPattern>
+				<unitPattern count="one">{0} Н</unitPattern>
+				<unitPattern count="other">{0} ньютон</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName draft="unconfirmed">çĕр километрах киловатт-сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">çĕр километрах {0} киловатт-сехет</unitPattern>
+				<displayName>киловатт-сехет/100 километр</displayName>
+				<unitPattern count="zero">{0} кВт⋅сех/100 км</unitPattern>
+				<unitPattern count="one">{0} кВт⋅сех/100 км</unitPattern>
+				<unitPattern count="other">{0} киловатт-сехет/100 километр</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">гигагерц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гигагерц</unitPattern>
+				<displayName>гигагерц</displayName>
+				<unitPattern count="zero">{0} ГГц</unitPattern>
+				<unitPattern count="one">{0} ГГц</unitPattern>
+				<unitPattern count="other">{0} гигагерц</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">мегагерц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегагерц</unitPattern>
+				<displayName>мегагерц</displayName>
+				<unitPattern count="zero">{0} МГц</unitPattern>
+				<unitPattern count="one">{0} МГц</unitPattern>
+				<unitPattern count="other">{0} мегагерц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">килогерц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килогерц</unitPattern>
+				<displayName>килогерц</displayName>
+				<unitPattern count="zero">{0} кГц</unitPattern>
+				<unitPattern count="one">{0} кГц</unitPattern>
+				<unitPattern count="other">{0} килогерц</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<displayName draft="unconfirmed">герц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} герц</unitPattern>
-			</unit>
-			<unit type="graphics-em">
-				<displayName draft="unconfirmed">эм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эм</unitPattern>
+				<displayName>герц</displayName>
+				<unitPattern count="zero">{0} Гц</unitPattern>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} герц</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
-				<displayName draft="unconfirmed">пиксельсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пиксельсем</unitPattern>
+				<displayName>пиксель</displayName>
+				<unitPattern count="zero">{0} пкс</unitPattern>
+				<unitPattern count="one">{0} пкс</unitPattern>
+				<unitPattern count="other">{0} пиксель</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName draft="unconfirmed">мегапиксельсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мпкс</unitPattern>
+				<displayName>мегапиксель</displayName>
+				<unitPattern count="zero">{0} Мпкс</unitPattern>
+				<unitPattern count="one">{0} Мпкс</unitPattern>
+				<unitPattern count="other">{0} мегапиксель</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
-				<displayName draft="unconfirmed">сантиметрпалан пиксель тачӑлӑхӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сантиметрпалан пиксель тачӑлӑхӗ</unitPattern>
+				<displayName>пиксель/сантиметр</displayName>
+				<unitPattern count="zero">{0} пкс/см</unitPattern>
+				<unitPattern count="one">{0} пкс/см</unitPattern>
+				<unitPattern count="other">{0} пиксель/сантиметр</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<displayName draft="unconfirmed">дюймпалан пиксель тачӑлӑхӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюймпалан пиксель тачӑлӑхӗ</unitPattern>
+				<displayName>пиксель/дюйм</displayName>
+				<unitPattern count="zero">{0} пкс/дюйм</unitPattern>
+				<unitPattern count="one">{0} пкс/дюйм</unitPattern>
+				<unitPattern count="other">{0} пиксель/дюйм</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName draft="unconfirmed">ҫӗр радиусӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫӗр радиусӗ</unitPattern>
+				<displayName>Ҫӗр радиусӗ</displayName>
+				<unitPattern count="zero">{0} R⊕</unitPattern>
+				<unitPattern count="one">{0} R⊕</unitPattern>
+				<unitPattern count="other">{0} Ҫӗр радиусӗ</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">километр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/километр</perUnitPattern>
+				<displayName>километр</displayName>
+				<unitPattern count="zero">{0} км</unitPattern>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} километр</unitPattern>
+				<perUnitPattern>{0}/километр</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="unconfirmed">метр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} метр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/метр</perUnitPattern>
+				<displayName>метр</displayName>
+				<unitPattern count="zero">{0} м</unitPattern>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} метр</unitPattern>
+				<perUnitPattern>{0}/метр</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">дециметр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дециметр</unitPattern>
+				<displayName>дециметр</displayName>
+				<unitPattern count="zero">{0} дм</unitPattern>
+				<unitPattern count="one">{0} дм</unitPattern>
+				<unitPattern count="other">{0} дециметр</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">сантиметр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сантиметр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/сантиметр</perUnitPattern>
+				<displayName>сантиметр</displayName>
+				<unitPattern count="zero">{0} см</unitPattern>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} сантиметр</unitPattern>
+				<perUnitPattern>{0}/сантиметр</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">миллиметр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллиметр</unitPattern>
+				<displayName>миллиметр</displayName>
+				<unitPattern count="zero">{0} мм</unitPattern>
+				<unitPattern count="one">{0} мм</unitPattern>
+				<unitPattern count="other">{0} миллиметр</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">микрометр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}микрометр</unitPattern>
+				<displayName>микрометр</displayName>
+				<unitPattern count="zero">{0} мкм</unitPattern>
+				<unitPattern count="one">{0} мкм</unitPattern>
+				<unitPattern count="other">{0} микрометр</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">нанометр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} нанометр</unitPattern>
+				<displayName>нанометр</displayName>
+				<unitPattern count="zero">{0} нм</unitPattern>
+				<unitPattern count="one">{0} нм</unitPattern>
+				<unitPattern count="other">{0} нанометр</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="unconfirmed">пикометр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пикометр</unitPattern>
+				<displayName>пикометр</displayName>
+				<unitPattern count="zero">{0} пм</unitPattern>
+				<unitPattern count="one">{0} пм</unitPattern>
+				<unitPattern count="other">{0} пикометр</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName draft="unconfirmed">миля</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миля</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="unconfirmed">ярд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд</unitPattern>
+				<displayName>миля</displayName>
+				<unitPattern count="zero">{0} ми</unitPattern>
+				<unitPattern count="one">{0} ми</unitPattern>
+				<unitPattern count="other">{0} миля</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName draft="unconfirmed">фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фут</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/фут</perUnitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/дюйм</perUnitPattern>
+				<displayName>фут</displayName>
+				<unitPattern count="zero">{0} фт</unitPattern>
+				<unitPattern count="one">{0} фт</unitPattern>
+				<unitPattern count="other">{0} фут</unitPattern>
+				<perUnitPattern>{0}/фут</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName draft="unconfirmed">парçек</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} парçек</unitPattern>
+				<displayName>парсек</displayName>
+				<unitPattern count="zero">{0} пк</unitPattern>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="other">{0} парсек</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName draft="unconfirmed">çуттăн çулĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çуттăн çулĕ</unitPattern>
+				<displayName>ҫутӑ ҫулӗ</displayName>
+				<unitPattern count="zero">{0} ҫутӑ ҫулӗ</unitPattern>
+				<unitPattern count="one">{0} ҫутӑ ҫулӗ</unitPattern>
+				<unitPattern count="other">{0} ҫутӑ ҫулӗ</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">астрономилле пĕрчĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} астрономилле пĕрчĕ</unitPattern>
+				<displayName>астрономи виҫи</displayName>
+				<unitPattern count="zero">{0} а. в.</unitPattern>
+				<unitPattern count="one">{0} а. в.</unitPattern>
+				<unitPattern count="other">{0} астрономи виҫи</unitPattern>
 			</unit>
 			<unit type="length-furlong">
-				<displayName draft="unconfirmed">фурлонгсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фурлонгсем</unitPattern>
+				<displayName>фурлонг</displayName>
+				<unitPattern count="zero">{0} фрл</unitPattern>
+				<unitPattern count="one">{0} фрл</unitPattern>
+				<unitPattern count="other">{0} фурлонг</unitPattern>
 			</unit>
 			<unit type="length-fathom">
-				<displayName draft="unconfirmed">тинӗс чалӑш</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тинӗс чалӑш</unitPattern>
+				<displayName>тинӗс хӑлаҫӗ</displayName>
+				<unitPattern count="zero">{0} тинӗс хӑл.</unitPattern>
+				<unitPattern count="one">{0} тинӗс хӑл.</unitPattern>
+				<unitPattern count="other">{0} тинӗс хӑлаҫӗ</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">тинӗс милли</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тинӗс милли</unitPattern>
+				<displayName>тинӗс мили</displayName>
+				<unitPattern count="zero">{0} тинӗс ми</unitPattern>
+				<unitPattern count="one">{0} тинӗс ми</unitPattern>
+				<unitPattern count="other">{0} тинӗс мили</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<displayName draft="unconfirmed">скандинави милли</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} скандинави милли</unitPattern>
+				<displayName>скандинави мили</displayName>
+				<unitPattern count="zero">{0} ск. ми</unitPattern>
+				<unitPattern count="one">{0} ск. ми</unitPattern>
+				<unitPattern count="other">{0} скандинави мили</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<displayName draft="unconfirmed">типографи пункчӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} типографи пункчӗ</unitPattern>
+				<displayName>пункт</displayName>
+				<unitPattern count="zero">{0} пкт</unitPattern>
+				<unitPattern count="one">{0} пкт</unitPattern>
+				<unitPattern count="other">{0} пункт</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName draft="unconfirmed">хӗвел радиусӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} хӗвел радиусӗ</unitPattern>
+				<displayName>Хӗвел радиусӗ</displayName>
+				<unitPattern count="zero">{0} R☉</unitPattern>
+				<unitPattern count="one">{0} R☉</unitPattern>
+				<unitPattern count="other">{0} Хӗвел радиусӗ</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="unconfirmed">люкс</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} люкс</unitPattern>
+				<displayName>люкс</displayName>
+				<unitPattern count="zero">{0} лк</unitPattern>
+				<unitPattern count="one">{0} лк</unitPattern>
+				<unitPattern count="other">{0} люкс</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName draft="unconfirmed">кандела</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кандела</unitPattern>
+				<displayName>кандела</displayName>
+				<unitPattern count="zero">{0} кд</unitPattern>
+				<unitPattern count="one">{0} кд</unitPattern>
+				<unitPattern count="other">{0} кандела</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<displayName draft="unconfirmed">люмен</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} люмен</unitPattern>
+				<displayName>люмен</displayName>
+				<unitPattern count="zero">{0} лм</unitPattern>
+				<unitPattern count="one">{0} лм</unitPattern>
+				<unitPattern count="other">{0} люмен</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
-				<displayName draft="unconfirmed">хĕвел çутатаслăхĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} хĕвел çутатаслăхĕ</unitPattern>
+				<displayName>Хӗвел ҫутатаслӑхӗ</displayName>
+				<unitPattern count="zero">{0} L☉</unitPattern>
+				<unitPattern count="one">{0} L☉</unitPattern>
+				<unitPattern count="other">{0} Хӗвел ҫутатаслӑхӗ</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName draft="unconfirmed">метрикăлла тонна</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} метрикăлла тонна</unitPattern>
+				<unitPattern count="zero">{0} т</unitPattern>
+				<unitPattern count="one">{0} т</unitPattern>
+				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">килограмм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килограмм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/килограмм</perUnitPattern>
+				<displayName>килограмм</displayName>
+				<unitPattern count="zero">{0} кг</unitPattern>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} килограмм</unitPattern>
+				<perUnitPattern>{0}/килограмм</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">грамм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} грамм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/грамм</perUnitPattern>
+				<displayName>грамм</displayName>
+				<unitPattern count="zero">{0} г</unitPattern>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} грамм</unitPattern>
+				<perUnitPattern>{0}/грамм</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName draft="unconfirmed">миллиграмм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллиграмм</unitPattern>
+				<displayName>миллиграмм</displayName>
+				<unitPattern count="zero">{0} мг</unitPattern>
+				<unitPattern count="one">{0} мг</unitPattern>
+				<unitPattern count="other">{0} миллиграмм</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">микрограмм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} микрограмм</unitPattern>
+				<displayName>микрограмм</displayName>
+				<unitPattern count="zero">{0} мкг</unitPattern>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} микрограмм</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<displayName draft="unconfirmed">америка тонна</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} америка тонна</unitPattern>
+				<displayName>америкӑлла тонна</displayName>
+				<unitPattern count="zero">{0} ам. тонна</unitPattern>
+				<unitPattern count="one">{0} ам. тонна</unitPattern>
+				<unitPattern count="other">{0} америкӑлла тонна</unitPattern>
 			</unit>
 			<unit type="mass-stone">
-				<displayName draft="unconfirmed">стоун</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} стоун</unitPattern>
+				<unitPattern count="zero">{0} стн</unitPattern>
+				<unitPattern count="one">{0} стн</unitPattern>
+				<unitPattern count="other">{0} стн</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName draft="unconfirmed">кĕренке</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕренке</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кĕренке</perUnitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} унци</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/унци</perUnitPattern>
+				<displayName>фунт</displayName>
+				<unitPattern count="zero">{0} фнт</unitPattern>
+				<unitPattern count="one">{0} фнт</unitPattern>
+				<unitPattern count="other">{0} фунт</unitPattern>
+				<perUnitPattern>{0}/фунт</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">трой унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} трой унци</unitPattern>
+				<displayName>троя унцийӗ</displayName>
+				<unitPattern count="zero">{0} тр. унц.</unitPattern>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} троя унцийӗ</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName draft="unconfirmed">метрикăлла карат</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} метрикăлла карат</unitPattern>
+				<unitPattern count="zero">{0} кар</unitPattern>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
-				<displayName draft="unconfirmed">массăн атомла пĕрчи</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} массăн атомла пĕрчи</unitPattern>
+				<unitPattern count="zero">{0} Да</unitPattern>
+				<unitPattern count="one">{0} Да</unitPattern>
+				<unitPattern count="other">{0} Да</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName draft="unconfirmed">Ҫӗр масси</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Ҫӗр масси</unitPattern>
+				<unitPattern count="zero">{0} M⊕</unitPattern>
+				<unitPattern count="one">{0} M⊕</unitPattern>
+				<unitPattern count="other">{0} M⊕</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
-				<displayName draft="unconfirmed">Хӗвел масси</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Хӗвел масси</unitPattern>
-			</unit>
-			<unit type="mass-grain">
-				<displayName draft="unconfirmed">гран</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гран</unitPattern>
+				<unitPattern count="zero">{0} M☉</unitPattern>
+				<unitPattern count="one">{0} M☉</unitPattern>
+				<unitPattern count="other">{0} M☉</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="unconfirmed">гигаватт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гигаватт</unitPattern>
+				<displayName>гигаватт</displayName>
+				<unitPattern count="zero">{0} ГВт</unitPattern>
+				<unitPattern count="one">{0} ГВт</unitPattern>
+				<unitPattern count="other">{0} гигаватт</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="unconfirmed">мегаватт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегаватт</unitPattern>
+				<displayName>мегаватт</displayName>
+				<unitPattern count="zero">{0} МВт</unitPattern>
+				<unitPattern count="one">{0} МВт</unitPattern>
+				<unitPattern count="other">{0} мегаватт</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName draft="unconfirmed">киловатт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} киловатт</unitPattern>
+				<displayName>киловатт</displayName>
+				<unitPattern count="zero">{0} кВт</unitPattern>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} киловатт</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="unconfirmed">ватт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ватт</unitPattern>
+				<displayName>ватт</displayName>
+				<unitPattern count="zero">{0} Вт</unitPattern>
+				<unitPattern count="one">{0} Вт</unitPattern>
+				<unitPattern count="other">{0} ватт</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<displayName draft="unconfirmed">милливатт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} милливатт</unitPattern>
+				<displayName>милливатт</displayName>
+				<unitPattern count="zero">{0} мВт</unitPattern>
+				<unitPattern count="one">{0} мВт</unitPattern>
+				<unitPattern count="other">{0} милливатт</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<displayName draft="unconfirmed">лаша вӑйӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} лаша вӑйӗ</unitPattern>
+				<displayName>лаша вӑйӗ</displayName>
+				<unitPattern count="zero">{0} л. в.</unitPattern>
+				<unitPattern count="one">{0} л. в.</unitPattern>
+				<unitPattern count="other">{0} лаша вӑйӗ</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName draft="unconfirmed">чĕркĕмĕл юпи миллиметр</displayName>
-				<unitPattern count="other" draft="unconfirmed">чĕркĕмĕл юпи {0} миллиметр</unitPattern>
+				<displayName>миллиметр чĕр кĕмĕл юпипе</displayName>
+				<unitPattern count="zero">{0} мм ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} мм ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} миллиметр чĕр кĕмĕл юпипе</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>чĕр кĕмĕл юпипе</displayName>
+				<unitPattern count="zero">{0} ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} чĕр кĕмĕл юпипе</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName draft="unconfirmed">тӑваткал дюйм кӗренке</displayName>
-				<unitPattern count="other" draft="unconfirmed">тӑваткал дюйм {0} кӗренке</unitPattern>
+				<displayName>фунт-вӑй/тӑваткал дюйм</displayName>
+				<unitPattern count="zero">{0} фнтв/дюйм²</unitPattern>
+				<unitPattern count="one">{0} фнтв/дюйм²</unitPattern>
+				<unitPattern count="other">{0} фунт-вӑй/тӑваткал дюйм</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName draft="unconfirmed">чĕркĕмĕл юпи дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">чĕркĕмĕл юпи {0} дюйм</unitPattern>
-			</unit>
-			<unit type="pressure-bar">
-				<displayName draft="unconfirmed">бар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бар</unitPattern>
+				<displayName>дюйм чĕр кĕмĕл юпипе</displayName>
+				<unitPattern count="zero">{0} дюйм ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} дюйм ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} дюйм чĕр кĕмĕл юпипе</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">миллибар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллибар</unitPattern>
+				<displayName>миллибар</displayName>
+				<unitPattern count="zero">{0} мбар</unitPattern>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="other">{0} миллибар</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
-				<displayName draft="unconfirmed">физикăлла атмосфера</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} физикăлла атмосфера</unitPattern>
+				<unitPattern count="zero">{0} атм</unitPattern>
+				<unitPattern count="one">{0} атм</unitPattern>
+				<unitPattern count="other">{0} атм</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
-				<displayName draft="unconfirmed">паскаль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} паскаль</unitPattern>
+				<displayName>паскаль</displayName>
+				<unitPattern count="zero">{0} Па</unitPattern>
+				<unitPattern count="one">{0} Па</unitPattern>
+				<unitPattern count="other">{0} паскаль</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="unconfirmed">гектопаскаль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гектопаскаль</unitPattern>
+				<displayName>гектопаскаль</displayName>
+				<unitPattern count="zero">{0} гПа</unitPattern>
+				<unitPattern count="one">{0} гПа</unitPattern>
+				<unitPattern count="other">{0} гектопаскаль</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
-				<displayName draft="unconfirmed">килопаскаль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} килопаскаль</unitPattern>
+				<displayName>килопаскаль</displayName>
+				<unitPattern count="zero">{0} кПа</unitPattern>
+				<unitPattern count="one">{0} кПа</unitPattern>
+				<unitPattern count="other">{0} килопаскаль</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
-				<displayName draft="unconfirmed">мегапаскаль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегапаскаль</unitPattern>
+				<displayName>мегапаскаль</displayName>
+				<unitPattern count="zero">{0} МПа</unitPattern>
+				<unitPattern count="one">{0} МПа</unitPattern>
+				<unitPattern count="other">{0} мегапаскаль</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">сехетре километр</displayName>
-				<unitPattern count="other" draft="unconfirmed">сехетре {0} километр</unitPattern>
+				<displayName>километр/сехет</displayName>
+				<unitPattern count="zero">{0} км/сех</unitPattern>
+				<unitPattern count="one">{0} км/сех</unitPattern>
+				<unitPattern count="other">{0} километр/сехет</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="unconfirmed">ҫеккунтра метр</displayName>
-				<unitPattern count="other" draft="unconfirmed">ҫеккунтра {0} метр</unitPattern>
+				<displayName>метр/ҫеккунт</displayName>
+				<unitPattern count="zero">{0} м/ҫ</unitPattern>
+				<unitPattern count="one">{0} м/ҫ</unitPattern>
+				<unitPattern count="other">{0} метр/ҫеккунт</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">сехетре миля</displayName>
-				<unitPattern count="other" draft="unconfirmed">сехетре {0} миля</unitPattern>
+				<displayName>миля/сехет</displayName>
+				<unitPattern count="zero">{0} ми/сех</unitPattern>
+				<unitPattern count="one">{0} ми/сех</unitPattern>
+				<unitPattern count="other">{0} миля/сехет</unitPattern>
 			</unit>
 			<unit type="speed-knot">
-				<displayName draft="unconfirmed">тĕвĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тĕвĕ</unitPattern>
+				<displayName>узел</displayName>
+				<unitPattern count="zero">{0} уз</unitPattern>
+				<unitPattern count="one">{0} уз</unitPattern>
+				<unitPattern count="other">{0} узел</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName draft="unconfirmed">Бофорт шкали ҫинчи балл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Бофорт шкали ҫинчи балл</unitPattern>
+				<displayName>Бофорт балӗ</displayName>
+				<unitPattern count="zero">{0} Бфт</unitPattern>
+				<unitPattern count="one">{0} Бфт</unitPattern>
+				<unitPattern count="other">{0} Бофорт балӗ</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">Цельсий градусĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Цельсий градусĕ</unitPattern>
+				<displayName>Цельсий градусĕ</displayName>
+				<unitPattern count="zero">{0}°C</unitPattern>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0} Цельсий градусĕ</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="unconfirmed">Фаренгейт градусĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Фаренгейт градусĕ</unitPattern>
+				<displayName>Фаренгейт градусĕ</displayName>
+				<unitPattern count="zero">{0}°F</unitPattern>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0} Фаренгейт градусĕ</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">Кельвин</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Кельвин</unitPattern>
+				<displayName>кельвин</displayName>
+				<unitPattern count="zero">{0} К</unitPattern>
+				<unitPattern count="one">{0} К</unitPattern>
+				<unitPattern count="other">{0} кельвин</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
-				<displayName draft="unconfirmed">кĕренке-фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕренке-фут</unitPattern>
+				<displayName>фунт-вӑй-фут</displayName>
+				<unitPattern count="zero">{0} фнтв⋅фт</unitPattern>
+				<unitPattern count="one">{0} фнтв⋅фт</unitPattern>
+				<unitPattern count="other">{0} фунт-вӑй-фут</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<displayName draft="unconfirmed">ньютон-метр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ньютон-метр</unitPattern>
+				<displayName>ньютон-метр</displayName>
+				<unitPattern count="zero">{0} Н⋅м</unitPattern>
+				<unitPattern count="one">{0} Н⋅м</unitPattern>
+				<unitPattern count="other">{0} ньютон-метр</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName draft="unconfirmed">кубла километр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла километр</unitPattern>
+				<displayName>куб километр</displayName>
+				<unitPattern count="zero">{0} км³</unitPattern>
+				<unitPattern count="one">{0} км³</unitPattern>
+				<unitPattern count="other">{0} куб километр</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName draft="unconfirmed">кубла метр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла метр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кубла метр</perUnitPattern>
+				<displayName>куб метр</displayName>
+				<unitPattern count="zero">{0} м³</unitPattern>
+				<unitPattern count="one">{0} м³</unitPattern>
+				<unitPattern count="other">{0} куб метр</unitPattern>
+				<perUnitPattern>{0}/куб метр</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<displayName draft="unconfirmed">кубла сантиметр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла сантиметр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кубла сантиметр</perUnitPattern>
+				<displayName>куб сантиметр</displayName>
+				<unitPattern count="zero">{0} см³</unitPattern>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="other">{0} куб сантиметр</unitPattern>
+				<perUnitPattern>{0}/куб сантиметр</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="unconfirmed">кубла милли</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла милли</unitPattern>
+				<displayName>куб миля</displayName>
+				<unitPattern count="zero">{0} ми³</unitPattern>
+				<unitPattern count="one">{0} ми³</unitPattern>
+				<unitPattern count="other">{0} куб миля</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="unconfirmed">кубла ярд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла ярд</unitPattern>
+				<displayName>куб ярд</displayName>
+				<unitPattern count="zero">{0} ярд³</unitPattern>
+				<unitPattern count="one">{0} ярд³</unitPattern>
+				<unitPattern count="other">{0} куб ярд</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
-				<displayName draft="unconfirmed">кубла фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла фут</unitPattern>
+				<displayName>куб фут</displayName>
+				<unitPattern count="zero">{0} фт³</unitPattern>
+				<unitPattern count="one">{0} фт³</unitPattern>
+				<unitPattern count="other">{0} куб фут</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
-				<displayName draft="unconfirmed">кубла дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кубла дюйм</unitPattern>
+				<displayName>куб дюйм</displayName>
+				<unitPattern count="zero">{0} дюйм³</unitPattern>
+				<unitPattern count="one">{0} дюйм³</unitPattern>
+				<unitPattern count="other">{0} куб дюйм</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="unconfirmed">мегалитр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегалитр</unitPattern>
+				<unitPattern count="zero">{0} Мл</unitPattern>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
-				<displayName draft="unconfirmed">гектолитр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гектолитр</unitPattern>
+				<displayName>гектолитр</displayName>
+				<unitPattern count="zero">{0} гл</unitPattern>
+				<unitPattern count="one">{0} гл</unitPattern>
+				<unitPattern count="other">{0} гектолитр</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="unconfirmed">литр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} литр</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/литр</perUnitPattern>
+				<displayName>литр</displayName>
+				<unitPattern count="zero">{0} л</unitPattern>
+				<unitPattern count="one">{0} л</unitPattern>
+				<unitPattern count="other">{0} литр</unitPattern>
+				<perUnitPattern>{0}/литр</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">децилитр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} децилитр</unitPattern>
+				<displayName>децилитр</displayName>
+				<unitPattern count="zero">{0} дл</unitPattern>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="other">{0} децилитр</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
-				<displayName draft="unconfirmed">сантилитр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сантилитр</unitPattern>
+				<displayName>сантилитр</displayName>
+				<unitPattern count="zero">{0} сл</unitPattern>
+				<unitPattern count="one">{0} сл</unitPattern>
+				<unitPattern count="other">{0} сантилитр</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName draft="unconfirmed">миллилитр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллилитр</unitPattern>
+				<displayName>миллилитр</displayName>
+				<unitPattern count="zero">{0} мл</unitPattern>
+				<unitPattern count="one">{0} мл</unitPattern>
+				<unitPattern count="other">{0} миллилитр</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
-				<displayName draft="unconfirmed">пинт-метрлӑ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пинт-метрлӑ</unitPattern>
+				<displayName>метрла пинт</displayName>
+				<unitPattern count="zero">{0} мпт</unitPattern>
+				<unitPattern count="one">{0} мпт</unitPattern>
+				<unitPattern count="other">{0} метрла пинт</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
-				<displayName draft="unconfirmed">курка-метрлӑ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} курка-метрлӑ</unitPattern>
+				<displayName>метрла курка</displayName>
+				<unitPattern count="zero">{0} м. курка</unitPattern>
+				<unitPattern count="one">{0} м. курка</unitPattern>
+				<unitPattern count="other">{0} метрла курка</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрла шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} м. шӗвӗ унци</unitPattern>
+				<unitPattern count="one">{0} м. шӗвӗ унци</unitPattern>
+				<unitPattern count="other">{0} метрла шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">акр-фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} акр-фут</unitPattern>
+				<unitPattern count="zero">{0} акр-фт</unitPattern>
+				<unitPattern count="one">{0} акр-фт</unitPattern>
+				<unitPattern count="other">{0} акр-фт</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">бушел</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бушел</unitPattern>
+				<displayName>бушель</displayName>
+				<unitPattern count="zero">{0} бушель</unitPattern>
+				<unitPattern count="one">{0} бушель</unitPattern>
+				<unitPattern count="other">{0} бушель</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="unconfirmed">галлон</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} галлон</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/галлон</perUnitPattern>
+				<displayName>америкӑлла галлон</displayName>
+				<unitPattern count="zero">{0} ам. гал.</unitPattern>
+				<unitPattern count="one">{0} ам. гал.</unitPattern>
+				<unitPattern count="other">{0} америкӑлла галлон</unitPattern>
+				<perUnitPattern>{0}/америкӑлла галлон</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<displayName draft="unconfirmed">импери галлон</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери галлон</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/импери галлон</perUnitPattern>
+				<displayName>империлле галлон</displayName>
+				<unitPattern count="zero">{0} имп. гал.</unitPattern>
+				<unitPattern count="one">{0} имп. гал.</unitPattern>
+				<unitPattern count="other">{0} империлле галлон</unitPattern>
+				<perUnitPattern>{0}/империлле галлон</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="unconfirmed">кварт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кварт</unitPattern>
+				<displayName>америкӑлла кварт</displayName>
+				<unitPattern count="zero">{0} ам. кварт</unitPattern>
+				<unitPattern count="one">{0} ам. кварт</unitPattern>
+				<unitPattern count="other">{0} америкӑлла кварт</unitPattern>
 			</unit>
 			<unit type="volume-pint">
-				<displayName draft="unconfirmed">пинт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пинт</unitPattern>
+				<displayName>америкӑлла пинт</displayName>
+				<unitPattern count="zero">{0} ам. пинт</unitPattern>
+				<unitPattern count="one">{0} ам. пинт</unitPattern>
+				<unitPattern count="other">{0} америкӑлла пинт</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>империлле пинт</displayName>
+				<unitPattern count="zero">{0} имп. пинт</unitPattern>
+				<unitPattern count="one">{0} имп. пинт</unitPattern>
+				<unitPattern count="other">{0} империлле пинт</unitPattern>
 			</unit>
 			<unit type="volume-cup">
-				<displayName draft="unconfirmed">чашӑк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чашӑк</unitPattern>
+				<displayName>америкӑлла курка</displayName>
+				<unitPattern count="zero">{0} ам. курка</unitPattern>
+				<unitPattern count="one">{0} ам. курка</unitPattern>
+				<unitPattern count="other">{0} америкӑлла курка</unitPattern>
+			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>империлле курка</displayName>
+				<unitPattern count="zero">{0} имп. курка</unitPattern>
+				<unitPattern count="one">{0} имп. курка</unitPattern>
+				<unitPattern count="other">{0} империлле курка</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
-				<displayName draft="unconfirmed">шӗвӗ унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} шӗвӗ унци</unitPattern>
+				<displayName>америкӑлла шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} ам. шӗвӗ унци</unitPattern>
+				<unitPattern count="one">{0} ам. шӗвӗ унци</unitPattern>
+				<unitPattern count="other">{0} америкӑлла шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName draft="unconfirmed">импери шӗвӗ унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери шӗвӗ унци</unitPattern>
+				<displayName>империлле шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} имп. шӗвӗ унц.</unitPattern>
+				<unitPattern count="one">{0} имп. шӗвӗ унц.</unitPattern>
+				<unitPattern count="other">{0} империлле шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="unconfirmed">апат кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} апат кашӑкӗ</unitPattern>
+				<unitPattern count="zero">{0} апат каш.</unitPattern>
+				<unitPattern count="one">{0} апат каш.</unitPattern>
+				<unitPattern count="other">{0} апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="unconfirmed">чей кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чей кашӑкӗ</unitPattern>
+				<unitPattern count="zero">{0} чей каш.</unitPattern>
+				<unitPattern count="one">{0} чей каш.</unitPattern>
+				<unitPattern count="other">{0} чей каш.</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
-				<displayName draft="unconfirmed">баррель</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} баррель</unitPattern>
+				<displayName>баррель</displayName>
+				<unitPattern count="zero">{0} барр.</unitPattern>
+				<unitPattern count="one">{0} барр.</unitPattern>
+				<unitPattern count="other">{0} баррель</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName draft="unconfirmed">пылак апат кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пылак апат кашӑкӗ</unitPattern>
+				<displayName>пылак апат кашӑкӗ</displayName>
+				<unitPattern count="zero">{0} пыл. апат каш.</unitPattern>
+				<unitPattern count="one">{0} пыл. апат каш.</unitPattern>
+				<unitPattern count="other">{0} пылак апат кашӑкӗ</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<displayName draft="unconfirmed">импери пылак апат кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери пылак апат кашӑкӗ</unitPattern>
+				<displayName>империлле пылак апат кашӑкӗ</displayName>
+				<unitPattern count="zero">{0} имп. пыл. апат каш.</unitPattern>
+				<unitPattern count="one">{0} имп. пыл. апат каш.</unitPattern>
+				<unitPattern count="other">{0} империлле пылак апат кашӑкӗ</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<displayName draft="unconfirmed">тумлам</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тумлам</unitPattern>
+				<unitPattern count="zero">{0} тумл.</unitPattern>
+				<unitPattern count="one">{0} тумл.</unitPattern>
+				<unitPattern count="other">{0} тумл.</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName draft="unconfirmed">шĕвĕ драхма</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} шĕвĕ драхма</unitPattern>
-			</unit>
-			<unit type="volume-jigger">
-				<displayName draft="unconfirmed">чӗркке</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чӗркке</unitPattern>
+				<unitPattern count="zero">{0} шӗвӗ др.</unitPattern>
+				<unitPattern count="one">{0} шӗвӗ др.</unitPattern>
+				<unitPattern count="other">{0} шӗвӗ драхма</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
-				<displayName draft="unconfirmed">чĕптĕм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чĕптĕм</unitPattern>
+				<unitPattern count="zero">{0} чӗпт.</unitPattern>
+				<unitPattern count="one">{0} чӗпт.</unitPattern>
+				<unitPattern count="other">{0} чӗптӗм</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
-				<displayName draft="unconfirmed">импери кварт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери кварт</unitPattern>
+				<displayName>империлле кварт</displayName>
+				<unitPattern count="zero">{0} имп. кварт</unitPattern>
+				<unitPattern count="one">{0} имп. кварт</unitPattern>
+				<unitPattern count="other">{0} империлле кварт</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>стерадиан</displayName>
+				<unitPattern count="zero">{0} ср</unitPattern>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="other">{0} стерадиан</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>катал</displayName>
+				<unitPattern count="zero">{0} кат</unitPattern>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} катал</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулон</displayName>
+				<unitPattern count="zero">{0} Кл</unitPattern>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} кулон</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарад</displayName>
+				<unitPattern count="zero">{0} Ф</unitPattern>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} фарад</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генри</displayName>
+				<unitPattern count="zero">{0} Гн</unitPattern>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} генри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сименс</displayName>
+				<unitPattern count="zero">{0} См</unitPattern>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="other">{0} сименс</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калори-IT</displayName>
+				<unitPattern count="zero">{0} кал-IT</unitPattern>
+				<unitPattern count="one">{0} кал-IT</unitPattern>
+				<unitPattern count="other">{0} калори-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>Британи ӑшӑ виҫи-IT</displayName>
+				<unitPattern count="zero">{0} БӐВ-IT</unitPattern>
+				<unitPattern count="one">{0} БӐВ-IT</unitPattern>
+				<unitPattern count="other">{0} Британи ӑшӑ виҫи-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>беккерель</displayName>
+				<unitPattern count="zero">{0} Бк</unitPattern>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} беккерель</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зиверт</displayName>
+				<unitPattern count="zero">{0} Зв</unitPattern>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} зиверт</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>грей</displayName>
+				<unitPattern count="zero">{0} Гр</unitPattern>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} грей</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограмм-вӑй</displayName>
+				<unitPattern count="zero">{0} кгв</unitPattern>
+				<unitPattern count="one">{0} кгв</unitPattern>
+				<unitPattern count="other">{0} килограмм-вӑй</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>род</displayName>
+				<unitPattern count="zero">{0} род</unitPattern>
+				<unitPattern count="one">{0} род</unitPattern>
+				<unitPattern count="other">{0} род</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>чейн</displayName>
+				<unitPattern count="zero">{0} чейн</unitPattern>
+				<unitPattern count="one">{0} чейн</unitPattern>
+				<unitPattern count="other">{0} чейн</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесла</displayName>
+				<unitPattern count="zero">{0} Тл</unitPattern>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебер</displayName>
+				<unitPattern count="zero">{0} Вб</unitPattern>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} вебер</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>Ранкин градусӗ</displayName>
+				<unitPattern count="zero">{0} °R</unitPattern>
+				<unitPattern count="one">{0} °R</unitPattern>
+				<unitPattern count="other">{0} Ранкин градусӗ</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>икӗ эрнелӗх</displayName>
+				<unitPattern count="zero">{0} икӗ эрн.</unitPattern>
+				<unitPattern count="one">{0} икӗ эрн.</unitPattern>
+				<unitPattern count="other">{0} икӗ эрнелӗх</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>слаг</displayName>
+				<unitPattern count="zero">{0} слаг</unitPattern>
+				<unitPattern count="one">{0} слаг</unitPattern>
+				<unitPattern count="other">{0} слаг</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>бензин танлӑхӗпе</displayName>
+				<unitPattern count="zero">{0} бенз. тан.</unitPattern>
+				<unitPattern count="one">{0} бенз. тан.</unitPattern>
+				<unitPattern count="other">{0} бензин танлӑхӗпе</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>рин</displayName>
+				<unitPattern count="zero">{0} рин</unitPattern>
+				<unitPattern count="one">{0} рин</unitPattern>
+				<unitPattern count="other">{0} рин</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>сун</displayName>
+				<unitPattern count="zero">{0} сун</unitPattern>
+				<unitPattern count="one">{0} сун</unitPattern>
+				<unitPattern count="other">{0} сун</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>сяку</displayName>
+				<unitPattern count="zero">{0} сяку</unitPattern>
+				<unitPattern count="one">{0} сяку</unitPattern>
+				<unitPattern count="other">{0} сяку</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>кудзирадзяку</displayName>
+				<unitPattern count="zero">{0} кудзирадзяку</unitPattern>
+				<unitPattern count="one">{0} кудзирадзяку</unitPattern>
+				<unitPattern count="other">{0} кудзирадзяку</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>кэн</displayName>
+				<unitPattern count="zero">{0} кэн</unitPattern>
+				<unitPattern count="one">{0} кэн</unitPattern>
+				<unitPattern count="other">{0} кэн</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>дзё</displayName>
+				<unitPattern count="zero">{0} дзё</unitPattern>
+				<unitPattern count="one">{0} дзё</unitPattern>
+				<unitPattern count="other">{0} дзё</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ри</displayName>
+				<unitPattern count="zero">{0} ри</unitPattern>
+				<unitPattern count="one">{0} ри</unitPattern>
+				<unitPattern count="other">{0} ри</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>бу</displayName>
+				<unitPattern count="zero">{0} бу</unitPattern>
+				<unitPattern count="one">{0} бу</unitPattern>
+				<unitPattern count="other">{0} бу</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>сэ</displayName>
+				<unitPattern count="zero">{0} сэ</unitPattern>
+				<unitPattern count="one">{0} сэ</unitPattern>
+				<unitPattern count="other">{0} сэ</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>тё</displayName>
+				<unitPattern count="zero">{0} тё</unitPattern>
+				<unitPattern count="one">{0} тё</unitPattern>
+				<unitPattern count="other">{0} тё</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>косадзи</displayName>
+				<unitPattern count="zero">{0} косадзи</unitPattern>
+				<unitPattern count="one">{0} косадзи</unitPattern>
+				<unitPattern count="other">{0} косадзи</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>осадзи</displayName>
+				<unitPattern count="zero">{0} осадзи</unitPattern>
+				<unitPattern count="one">{0} осадзи</unitPattern>
+				<unitPattern count="other">{0} осадзи</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>каппу</displayName>
+				<unitPattern count="zero">{0} каппу</unitPattern>
+				<unitPattern count="one">{0} каппу</unitPattern>
+				<unitPattern count="other">{0} каппу</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>секи</displayName>
+				<unitPattern count="zero">{0} секи</unitPattern>
+				<unitPattern count="one">{0} секи</unitPattern>
+				<unitPattern count="other">{0} секи</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>сай</displayName>
+				<unitPattern count="zero">{0} сай</unitPattern>
+				<unitPattern count="one">{0} сай</unitPattern>
+				<unitPattern count="other">{0} сай</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>то</displayName>
+				<unitPattern count="zero">{0} то</unitPattern>
+				<unitPattern count="one">{0} то</unitPattern>
+				<unitPattern count="other">{0} то</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>коку</displayName>
+				<unitPattern count="zero">{0} коку</unitPattern>
+				<unitPattern count="one">{0} коку</unitPattern>
+				<unitPattern count="other">{0} коку</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName draft="unconfirmed">ҫутӑ хӑвӑртлӑхӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫутӑ хӑвӑртлӑхӗ</unitPattern>
+				<displayName>ҫутӑ</displayName>
+				<unitPattern count="zero">{0} ҫутӑ</unitPattern>
+				<unitPattern count="one">{0} ҫутӑ</unitPattern>
+				<unitPattern count="other">{0} ҫутӑ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName draft="unconfirmed">миллиардмĕш пайĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} миллиардмĕш пайĕ</unitPattern>
+			<unit type="mass-fun">
+				<displayName>фун</displayName>
+				<unitPattern count="zero">{0} фун</unitPattern>
+				<unitPattern count="one">{0} фун</unitPattern>
+				<unitPattern count="other">{0} фун</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>миллиардмĕш пайĕ</displayName>
+				<unitPattern count="zero">{0} млрд⁻¹</unitPattern>
+				<unitPattern count="one">{0} млрд⁻¹</unitPattern>
+				<unitPattern count="other">{0} миллиардмĕш пайĕ</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName draft="unconfirmed">ҫӗрсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫӗрсем</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫӗр</perUnitPattern>
+				<displayName>каҫ</displayName>
+				<unitPattern count="zero">{0} каҫ</unitPattern>
+				<unitPattern count="one">{0} каҫ</unitPattern>
+				<unitPattern count="other">{0} каҫ</unitPattern>
+				<perUnitPattern>{0}/каҫ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<coordinateUnitPattern type="east">{0} хӗвелтухӑҫ тӑрӑхӗ</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} ҫурҫӗр тӑрӑхӗ</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} кӑнтӑр тӑрӑхӗ</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} анăҫ тӑрӑхӗ</coordinateUnitPattern>
+				<displayName>ен</displayName>
+				<coordinateUnitPattern type="east">тухӑҫ еннелле {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">ҫур ҫӗр еннелле {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">кӑнтӑр еннелле {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">анӑҫ еннелле {0}</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">д{0}</unitPrefixPattern>
+				<unitPrefixPattern>д{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-2">
-				<unitPrefixPattern draft="unconfirmed">с{0}</unitPrefixPattern>
+				<unitPrefixPattern>с{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-3">
-				<unitPrefixPattern draft="unconfirmed">м{0}</unitPrefixPattern>
+				<unitPrefixPattern>м{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-6">
-				<unitPrefixPattern draft="unconfirmed">мк{0}</unitPrefixPattern>
+				<unitPrefixPattern>мк{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-9">
-				<unitPrefixPattern draft="unconfirmed">н{0}</unitPrefixPattern>
+				<unitPrefixPattern>н{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-12">
-				<unitPrefixPattern draft="unconfirmed">п{0}</unitPrefixPattern>
+				<unitPrefixPattern>п{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-15">
-				<unitPrefixPattern draft="unconfirmed">ф{0}</unitPrefixPattern>
+				<unitPrefixPattern>ф{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-18">
-				<unitPrefixPattern draft="unconfirmed">а{0}</unitPrefixPattern>
+				<unitPrefixPattern>а{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-21">
-				<unitPrefixPattern draft="unconfirmed">з{0}</unitPrefixPattern>
+				<unitPrefixPattern>з{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-24">
-				<unitPrefixPattern draft="unconfirmed">и{0}</unitPrefixPattern>
+				<unitPrefixPattern>и{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-27">
-				<unitPrefixPattern draft="unconfirmed">р{0}</unitPrefixPattern>
+				<unitPrefixPattern>р{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-30">
-				<unitPrefixPattern draft="unconfirmed">кв{0}</unitPrefixPattern>
+				<unitPrefixPattern>кв{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p1">
-				<unitPrefixPattern draft="unconfirmed">да{0}</unitPrefixPattern>
+				<unitPrefixPattern>да{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p2">
-				<unitPrefixPattern draft="unconfirmed">г{0}</unitPrefixPattern>
+				<unitPrefixPattern>г{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p3">
-				<unitPrefixPattern draft="unconfirmed">к{0}</unitPrefixPattern>
+				<unitPrefixPattern>к{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p6">
-				<unitPrefixPattern draft="unconfirmed">М{0}</unitPrefixPattern>
+				<unitPrefixPattern>М{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p9">
-				<unitPrefixPattern draft="unconfirmed">Г{0}</unitPrefixPattern>
+				<unitPrefixPattern>Г{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p12">
-				<unitPrefixPattern draft="unconfirmed">Т{0}</unitPrefixPattern>
+				<unitPrefixPattern>Т{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p15">
-				<unitPrefixPattern draft="unconfirmed">П{0}</unitPrefixPattern>
+				<unitPrefixPattern>П{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p18">
-				<unitPrefixPattern draft="unconfirmed">Э{0}</unitPrefixPattern>
+				<unitPrefixPattern>Э{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p21">
-				<unitPrefixPattern draft="unconfirmed">З{0}</unitPrefixPattern>
+				<unitPrefixPattern>З{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p24">
-				<unitPrefixPattern draft="unconfirmed">И{0}</unitPrefixPattern>
+				<unitPrefixPattern>И{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p27">
-				<unitPrefixPattern draft="unconfirmed">Р{0}</unitPrefixPattern>
+				<unitPrefixPattern>Р{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p30">
-				<unitPrefixPattern draft="unconfirmed">Кв{0}</unitPrefixPattern>
+				<unitPrefixPattern>Кв{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p1">
-				<unitPrefixPattern draft="unconfirmed">Ки{0}</unitPrefixPattern>
+				<unitPrefixPattern>Ки{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p2">
-				<unitPrefixPattern draft="unconfirmed">Ми{0}</unitPrefixPattern>
+				<unitPrefixPattern>Ми{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p3">
-				<unitPrefixPattern draft="unconfirmed">Ги{0}</unitPrefixPattern>
+				<unitPrefixPattern>Ги{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p4">
-				<unitPrefixPattern draft="unconfirmed">Ти{0}</unitPrefixPattern>
+				<unitPrefixPattern>Ти{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p5">
-				<unitPrefixPattern draft="unconfirmed">Пи{0}</unitPrefixPattern>
+				<unitPrefixPattern>Пи{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p6">
-				<unitPrefixPattern draft="unconfirmed">Эи{0}</unitPrefixPattern>
+				<unitPrefixPattern>Эи{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p7">
-				<unitPrefixPattern draft="unconfirmed">Зи{0}</unitPrefixPattern>
+				<unitPrefixPattern>Зи{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p8">
-				<unitPrefixPattern draft="unconfirmed">Йи{0}</unitPrefixPattern>
+				<unitPrefixPattern>Йи{0}</unitPrefixPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="unconfirmed">g</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+				<displayName>g</displayName>
+				<unitPattern count="zero">{0} g</unitPattern>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
-				<displayName draft="unconfirmed">м/ҫ²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м/ҫ²</unitPattern>
+				<displayName>м/ҫ²</displayName>
+				<unitPattern count="zero">{0} м/ҫ²</unitPattern>
+				<unitPattern count="one">{0} м/ҫ²</unitPattern>
+				<unitPattern count="other">{0} м/ҫ²</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName draft="unconfirmed">çавра</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çавра</unitPattern>
+				<displayName>çавра</displayName>
+				<unitPattern count="zero">{0} çавра</unitPattern>
+				<unitPattern count="one">{0} çавра</unitPattern>
+				<unitPattern count="other">{0} çавра</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="unconfirmed">радиан</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} радиан</unitPattern>
+				<displayName>рад</displayName>
+				<unitPattern count="zero">{0} рад</unitPattern>
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
 			</unit>
 			<unit type="angle-degree">
-				<displayName draft="unconfirmed">градус</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} градус</unitPattern>
+				<displayName>градус</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName draft="unconfirmed">минут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} минут</unitPattern>
+				<displayName>′</displayName>
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName draft="unconfirmed">çеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çеккунт</unitPattern>
+				<displayName>″</displayName>
+				<unitPattern count="zero">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">км²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/км²</perUnitPattern>
+				<displayName>км²</displayName>
+				<unitPattern count="zero">{0} км²</unitPattern>
+				<unitPattern count="one">{0} км²</unitPattern>
+				<unitPattern count="other">{0} км²</unitPattern>
+				<perUnitPattern>{0}/км²</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName draft="unconfirmed">га</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} га</unitPattern>
+				<displayName>га</displayName>
+				<unitPattern count="zero">{0} га</unitPattern>
+				<unitPattern count="one">{0} га</unitPattern>
+				<unitPattern count="other">{0} га</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">м²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/м²</perUnitPattern>
+				<displayName>м²</displayName>
+				<unitPattern count="zero">{0} м²</unitPattern>
+				<unitPattern count="one">{0} м²</unitPattern>
+				<unitPattern count="other">{0} м²</unitPattern>
+				<perUnitPattern>{0}/м²</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">см²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} см²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/см²</perUnitPattern>
+				<displayName>см²</displayName>
+				<unitPattern count="zero">{0} см²</unitPattern>
+				<unitPattern count="one">{0} см²</unitPattern>
+				<unitPattern count="other">{0} см²</unitPattern>
+				<perUnitPattern>{0}/см²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">ми²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ми²</perUnitPattern>
+				<displayName>ми²</displayName>
+				<unitPattern count="zero">{0} ми²</unitPattern>
+				<unitPattern count="one">{0} ми²</unitPattern>
+				<unitPattern count="other">{0} ми²</unitPattern>
+				<perUnitPattern>{0}/ми²</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
-				<displayName draft="unconfirmed">акр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} акр</unitPattern>
+				<displayName>акр</displayName>
+				<unitPattern count="zero">{0} акр</unitPattern>
+				<unitPattern count="one">{0} акр</unitPattern>
+				<unitPattern count="other">{0} акр</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">ярд²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд²</unitPattern>
+				<displayName>ярд²</displayName>
+				<unitPattern count="zero">{0} ярд²</unitPattern>
+				<unitPattern count="one">{0} ярд²</unitPattern>
+				<unitPattern count="other">{0} ярд²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">фт²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фт²</unitPattern>
+				<displayName>фт²</displayName>
+				<unitPattern count="zero">{0} фт²</unitPattern>
+				<unitPattern count="one">{0} фт²</unitPattern>
+				<unitPattern count="other">{0} фт²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">дюйм²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/дюйм²</perUnitPattern>
+				<displayName>дюйм²</displayName>
+				<unitPattern count="zero">{0} дюйм²</unitPattern>
+				<unitPattern count="one">{0} дюйм²</unitPattern>
+				<unitPattern count="other">{0} дюйм²</unitPattern>
+				<perUnitPattern>{0}/дюйм²</perUnitPattern>
 			</unit>
 			<unit type="area-dunam">
-				<displayName draft="unconfirmed">дунам</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дунам</unitPattern>
+				<displayName>дунам</displayName>
+				<unitPattern count="zero">{0} дунам</unitPattern>
+				<unitPattern count="one">{0} дунам</unitPattern>
+				<unitPattern count="other">{0} дунам</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">карат</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} карат</unitPattern>
+				<displayName>кар</displayName>
+				<unitPattern count="zero">{0} кар</unitPattern>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<displayName draft="unconfirmed">мг/дл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мг/дл</unitPattern>
+				<displayName>мг/дл</displayName>
+				<unitPattern count="zero">{0} мг/дл</unitPattern>
+				<unitPattern count="one">{0} мг/дл</unitPattern>
+				<unitPattern count="other">{0} мг/дл</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
-				<displayName draft="unconfirmed">ммоль/л</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ммоль/л</unitPattern>
+				<displayName>ммоль/л</displayName>
+				<unitPattern count="zero">{0} ммоль/л</unitPattern>
+				<unitPattern count="one">{0} ммоль/л</unitPattern>
+				<unitPattern count="other">{0} ммоль/л</unitPattern>
 			</unit>
 			<unit type="concentr-item">
-				<displayName draft="unconfirmed">объект</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} объект</unitPattern>
+				<displayName>япала</displayName>
+				<unitPattern count="zero">{0} япала</unitPattern>
+				<unitPattern count="one">{0} япала</unitPattern>
+				<unitPattern count="other">{0} япала</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>пай</displayName>
+				<unitPattern count="zero">{0} пай</unitPattern>
+				<unitPattern count="one">{0} пай</unitPattern>
+				<unitPattern count="other">{0} пай</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>млн⁻¹</displayName>
+				<unitPattern count="zero">{0} млн⁻¹</unitPattern>
+				<unitPattern count="one">{0} млн⁻¹</unitPattern>
+				<unitPattern count="other">{0} млн⁻¹</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<unitPattern count="zero">{0} %</unitPattern>
+				<unitPattern count="one">{0} %</unitPattern>
+				<unitPattern count="other">{0} %</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<unitPattern count="zero">{0} ‰</unitPattern>
+				<unitPattern count="one">{0} ‰</unitPattern>
+				<unitPattern count="other">{0} ‰</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<unitPattern count="zero">{0} ‱</unitPattern>
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
-				<displayName draft="unconfirmed">моль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} моль</unitPattern>
+				<displayName>моль</displayName>
+				<unitPattern count="zero">{0} моль</unitPattern>
+				<unitPattern count="one">{0} моль</unitPattern>
+				<unitPattern count="other">{0} моль</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Глк</displayName>
+				<unitPattern count="zero">{0} Глк</unitPattern>
+				<unitPattern count="one">{0} Глк</unitPattern>
+				<unitPattern count="other">{0} Глк</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="unconfirmed">л/км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л/км</unitPattern>
+				<displayName>л/км</displayName>
+				<unitPattern count="zero">{0} л/км</unitPattern>
+				<unitPattern count="one">{0} л/км</unitPattern>
+				<unitPattern count="other">{0} л/км</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
-				<displayName draft="unconfirmed">л/100 км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л/100 км</unitPattern>
+				<displayName>л/100 км</displayName>
+				<unitPattern count="zero">{0} л/100 км</unitPattern>
+				<unitPattern count="one">{0} л/100 км</unitPattern>
+				<unitPattern count="other">{0} л/100 км</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">ми/гал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми/гал</unitPattern>
+				<displayName>ми/гал</displayName>
+				<unitPattern count="zero">{0} ми/гал</unitPattern>
+				<unitPattern count="one">{0} ми/гал</unitPattern>
+				<unitPattern count="other">{0} ми/гал</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName draft="unconfirmed">мили/имп. гал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми/имп. гал</unitPattern>
+				<displayName>ми/имп. гал</displayName>
+				<unitPattern count="zero">{0} ми/имп. гал</unitPattern>
+				<unitPattern count="one">{0} ми/имп. гал</unitPattern>
+				<unitPattern count="other">{0} ми/имп. гал</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName draft="unconfirmed">Пбайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Пбайт</unitPattern>
+				<displayName>Пбайт</displayName>
+				<unitPattern count="zero">{0} Пбайт</unitPattern>
+				<unitPattern count="one">{0} Пбайт</unitPattern>
+				<unitPattern count="other">{0} Пбайт</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">Тбайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Тбайт</unitPattern>
+				<displayName>Тбайт</displayName>
+				<unitPattern count="zero">{0} Тбайт</unitPattern>
+				<unitPattern count="one">{0} Тбайт</unitPattern>
+				<unitPattern count="other">{0} Тбайт</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">Тбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Тбит</unitPattern>
+				<displayName>Тбит</displayName>
+				<unitPattern count="zero">{0} Тбит</unitPattern>
+				<unitPattern count="one">{0} Тбит</unitPattern>
+				<unitPattern count="other">{0} Тбит</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">Гбайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Гбайт</unitPattern>
+				<displayName>Гбайт</displayName>
+				<unitPattern count="zero">{0} Гбайт</unitPattern>
+				<unitPattern count="one">{0} Гбайт</unitPattern>
+				<unitPattern count="other">{0} Гбайт</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">Гбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Гбит</unitPattern>
+				<displayName>Гбит</displayName>
+				<unitPattern count="zero">{0} Гбит</unitPattern>
+				<unitPattern count="one">{0} Гбит</unitPattern>
+				<unitPattern count="other">{0} Гбит</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">Мбайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мбайт</unitPattern>
+				<displayName>Мбайт</displayName>
+				<unitPattern count="zero">{0} Мбайт</unitPattern>
+				<unitPattern count="one">{0} Мбайт</unitPattern>
+				<unitPattern count="other">{0} Мбайт</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">Мбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мбит</unitPattern>
+				<displayName>Мбит</displayName>
+				<unitPattern count="zero">{0} Мбит</unitPattern>
+				<unitPattern count="one">{0} Мбит</unitPattern>
+				<unitPattern count="other">{0} Мбит</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">Кбайт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Кбайт</unitPattern>
+				<displayName>кбайт</displayName>
+				<unitPattern count="zero">{0} кбайт</unitPattern>
+				<unitPattern count="one">{0} кбайт</unitPattern>
+				<unitPattern count="other">{0} кбайт</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">кбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кбит</unitPattern>
+				<displayName>кбит</displayName>
+				<unitPattern count="zero">{0} кбит</unitPattern>
+				<unitPattern count="one">{0} кбит</unitPattern>
+				<unitPattern count="other">{0} кбит</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<displayName draft="unconfirmed">байт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} байт</unitPattern>
+				<displayName>байт</displayName>
+				<unitPattern count="zero">{0} байт</unitPattern>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} байт</unitPattern>
 			</unit>
 			<unit type="digital-bit">
-				<displayName draft="unconfirmed">бит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бит</unitPattern>
+				<displayName>бит</displayName>
+				<unitPattern count="zero">{0} бит</unitPattern>
+				<unitPattern count="one">{0} бит</unitPattern>
+				<unitPattern count="other">{0} бит</unitPattern>
 			</unit>
 			<unit type="duration-century">
-				<displayName draft="unconfirmed">ӗмӗр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ӗмӗр</unitPattern>
+				<displayName>ӗмӗр</displayName>
+				<unitPattern count="zero">{0} ӗмӗр</unitPattern>
+				<unitPattern count="one">{0} ӗмӗр</unitPattern>
+				<unitPattern count="other">{0} ӗмӗр</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">вунҫул</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} вунҫул</unitPattern>
+				<displayName>вунӑ ҫ.</displayName>
+				<unitPattern count="zero">{0} вунӑ ҫ.</unitPattern>
+				<unitPattern count="one">{0} вунӑ ҫ.</unitPattern>
+				<unitPattern count="other">{0} вунӑ ҫ.</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">ҫулсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫулсем</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫул</perUnitPattern>
+				<displayName>ҫул</displayName>
+				<unitPattern count="zero">{0} ҫул</unitPattern>
+				<unitPattern count="one">{0} ҫул</unitPattern>
+				<unitPattern count="other">{0} ҫул</unitPattern>
+				<perUnitPattern>{0}/ҫул</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName draft="unconfirmed">чӗрӗк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чӗрӗк</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/чӗрӗк</perUnitPattern>
+				<displayName>чӗр.</displayName>
+				<unitPattern count="zero">{0} чӗр.</unitPattern>
+				<unitPattern count="one">{0} чӗр.</unitPattern>
+				<unitPattern count="other">{0} чӗр.</unitPattern>
+				<perUnitPattern>{0}/чӗр.</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName draft="unconfirmed">уйӑх</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} уйӑх</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/уйӑх</perUnitPattern>
+				<displayName>уйӑх</displayName>
+				<unitPattern count="zero">{0} уйӑх</unitPattern>
+				<unitPattern count="one">{0} уйӑх</unitPattern>
+				<unitPattern count="other">{0} уйӑх</unitPattern>
+				<perUnitPattern>{0}/уйӑх</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName draft="unconfirmed">эрне</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эрне</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/эрне</perUnitPattern>
+				<displayName>эрне</displayName>
+				<unitPattern count="zero">{0} эрне</unitPattern>
+				<unitPattern count="one">{0} эрне</unitPattern>
+				<unitPattern count="other">{0} эрне</unitPattern>
+				<perUnitPattern>{0}/эрне</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="unconfirmed">кун</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кун</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кун</perUnitPattern>
+				<displayName>кун</displayName>
+				<unitPattern count="zero">{0} кун</unitPattern>
+				<unitPattern count="one">{0} кун</unitPattern>
+				<unitPattern count="other">{0} кун</unitPattern>
+				<perUnitPattern>{0}/кун</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сехет</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/сехет</perUnitPattern>
+				<displayName>сех</displayName>
+				<unitPattern count="zero">{0} сех</unitPattern>
+				<unitPattern count="one">{0} сех</unitPattern>
+				<unitPattern count="other">{0} сех</unitPattern>
+				<perUnitPattern>{0}/сех</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">мин</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мин</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/мин</perUnitPattern>
+				<displayName>мин</displayName>
+				<unitPattern count="zero">{0} мин</unitPattern>
+				<unitPattern count="one">{0} мин</unitPattern>
+				<unitPattern count="other">{0} мин</unitPattern>
+				<perUnitPattern>{0}/мин</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">ҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫ</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫ</perUnitPattern>
+				<displayName>ҫ</displayName>
+				<unitPattern count="zero">{0} ҫ</unitPattern>
+				<unitPattern count="one">{0} ҫ</unitPattern>
+				<unitPattern count="other">{0} ҫ</unitPattern>
+				<perUnitPattern>{0}/ҫ</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">мҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мҫ</unitPattern>
+				<displayName>мҫ</displayName>
+				<unitPattern count="zero">{0} мҫ</unitPattern>
+				<unitPattern count="one">{0} мҫ</unitPattern>
+				<unitPattern count="other">{0} мҫ</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">мкҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мкҫ</unitPattern>
+				<displayName>мкҫ</displayName>
+				<unitPattern count="zero">{0} мкҫ</unitPattern>
+				<unitPattern count="one">{0} мкҫ</unitPattern>
+				<unitPattern count="other">{0} мкҫ</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">нҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} нҫ</unitPattern>
+				<displayName>нҫ</displayName>
+				<unitPattern count="zero">{0} нҫ</unitPattern>
+				<unitPattern count="one">{0} нҫ</unitPattern>
+				<unitPattern count="other">{0} нҫ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">А</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} А</unitPattern>
+				<displayName>А</displayName>
+				<unitPattern count="zero">{0} А</unitPattern>
+				<unitPattern count="one">{0} А</unitPattern>
+				<unitPattern count="other">{0} А</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">мА</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мА</unitPattern>
+				<displayName>мА</displayName>
+				<unitPattern count="zero">{0} мА</unitPattern>
+				<unitPattern count="one">{0} мА</unitPattern>
+				<unitPattern count="other">{0} мА</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="unconfirmed">Ом</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Ом</unitPattern>
+				<displayName>Ом</displayName>
+				<unitPattern count="zero">{0} Ом</unitPattern>
+				<unitPattern count="one">{0} Ом</unitPattern>
+				<unitPattern count="other">{0} Ом</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="unconfirmed">В</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} В</unitPattern>
+				<displayName>В</displayName>
+				<unitPattern count="zero">{0} В</unitPattern>
+				<unitPattern count="one">{0} В</unitPattern>
+				<unitPattern count="other">{0} В</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<displayName draft="unconfirmed">ккал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ккал</unitPattern>
+				<displayName>ккал</displayName>
+				<unitPattern count="zero">{0} ккал</unitPattern>
+				<unitPattern count="one">{0} ккал</unitPattern>
+				<unitPattern count="other">{0} ккал</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
-				<displayName draft="unconfirmed">кал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кал</unitPattern>
+				<displayName>кал</displayName>
+				<unitPattern count="zero">{0} кал</unitPattern>
+				<unitPattern count="one">{0} кал</unitPattern>
+				<unitPattern count="other">{0} кал</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="unconfirmed">кДж</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кДж</unitPattern>
+				<displayName>кДж</displayName>
+				<unitPattern count="zero">{0} кДж</unitPattern>
+				<unitPattern count="one">{0} кДж</unitPattern>
+				<unitPattern count="other">{0} кДж</unitPattern>
 			</unit>
 			<unit type="energy-joule">
-				<displayName draft="unconfirmed">Дж</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Дж</unitPattern>
+				<displayName>Дж</displayName>
+				<unitPattern count="zero">{0} Дж</unitPattern>
+				<unitPattern count="one">{0} Дж</unitPattern>
+				<unitPattern count="other">{0} Дж</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">КВт⋅сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} КВт⋅сехет</unitPattern>
+				<displayName>кВт⋅сех</displayName>
+				<unitPattern count="zero">{0} кВт⋅сех</unitPattern>
+				<unitPattern count="one">{0} кВт⋅сех</unitPattern>
+				<unitPattern count="other">{0} кВт⋅сех</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
-				<displayName draft="unconfirmed">эВ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эВ</unitPattern>
+				<displayName>эВ</displayName>
+				<unitPattern count="zero">{0} эВ</unitPattern>
+				<unitPattern count="one">{0} эВ</unitPattern>
+				<unitPattern count="other">{0} эВ</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
-				<displayName draft="unconfirmed">БӐЕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} БӐЕ</unitPattern>
+				<displayName>БӐВ</displayName>
+				<unitPattern count="zero">{0} БӐВ</unitPattern>
+				<unitPattern count="one">{0} БӐВ</unitPattern>
+				<unitPattern count="other">{0} БӐВ</unitPattern>
 			</unit>
 			<unit type="energy-therm-us">
-				<displayName draft="unconfirmed">АПШ терм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} АПШ терм</unitPattern>
+				<displayName>АПШ термӗ</displayName>
+				<unitPattern count="zero">{0} АПШ термӗ</unitPattern>
+				<unitPattern count="one">{0} АПШ термӗ</unitPattern>
+				<unitPattern count="other">{0} АПШ термӗ</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
-				<displayName draft="unconfirmed">кĕренке-вăй</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕренке-вăй</unitPattern>
+				<displayName>фнтв</displayName>
+				<unitPattern count="zero">{0} фнтв</unitPattern>
+				<unitPattern count="one">{0} фнтв</unitPattern>
+				<unitPattern count="other">{0} фнтв</unitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName draft="unconfirmed">Н</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Н</unitPattern>
+				<displayName>Н</displayName>
+				<unitPattern count="zero">{0} Н</unitPattern>
+				<unitPattern count="one">{0} Н</unitPattern>
+				<unitPattern count="other">{0} Н</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName draft="unconfirmed">кВт⋅ч/100 км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кВт⋅ч/100 км</unitPattern>
+				<displayName>кВт⋅сех/100 км</displayName>
+				<unitPattern count="zero">{0} кВт⋅сех/100 км</unitPattern>
+				<unitPattern count="one">{0} кВт⋅сех/100 км</unitPattern>
+				<unitPattern count="other">{0} кВт⋅сех/100 км</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">ГГц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ГГц</unitPattern>
+				<displayName>ГГц</displayName>
+				<unitPattern count="zero">{0} ГГц</unitPattern>
+				<unitPattern count="one">{0} ГГц</unitPattern>
+				<unitPattern count="other">{0} ГГц</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">МГц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} МГц</unitPattern>
+				<displayName>МГц</displayName>
+				<unitPattern count="zero">{0} МГц</unitPattern>
+				<unitPattern count="one">{0} МГц</unitPattern>
+				<unitPattern count="other">{0} МГц</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">кГц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кГц</unitPattern>
+				<displayName>кГц</displayName>
+				<unitPattern count="zero">{0} кГц</unitPattern>
+				<unitPattern count="one">{0} кГц</unitPattern>
+				<unitPattern count="other">{0} кГц</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<displayName draft="unconfirmed">Гц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Гц</unitPattern>
+				<displayName>Гц</displayName>
+				<unitPattern count="zero">{0} Гц</unitPattern>
+				<unitPattern count="one">{0} Гц</unitPattern>
+				<unitPattern count="other">{0} Гц</unitPattern>
 			</unit>
 			<unit type="graphics-em">
-				<displayName draft="unconfirmed">эм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эм</unitPattern>
+				<displayName>эм</displayName>
+				<unitPattern count="zero">{0} эм</unitPattern>
+				<unitPattern count="one">{0} эм</unitPattern>
+				<unitPattern count="other">{0} эм</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
-				<displayName draft="unconfirmed">пиксельсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкс</unitPattern>
+				<displayName>пкс</displayName>
+				<unitPattern count="zero">{0} пкс</unitPattern>
+				<unitPattern count="one">{0} пкс</unitPattern>
+				<unitPattern count="other">{0} пкс</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName draft="unconfirmed">мегапиксельсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мпкс</unitPattern>
+				<displayName>Мпкс</displayName>
+				<unitPattern count="zero">{0} Мпкс</unitPattern>
+				<unitPattern count="one">{0} Мпкс</unitPattern>
+				<unitPattern count="other">{0} Мпкс</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
-				<displayName draft="unconfirmed">пкс/см</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкс/см</unitPattern>
+				<displayName>пкс/см</displayName>
+				<unitPattern count="zero">{0} пкс/см</unitPattern>
+				<unitPattern count="one">{0} пкс/см</unitPattern>
+				<unitPattern count="other">{0} пкс/см</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<displayName draft="unconfirmed">пкс/дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкс/дюйм</unitPattern>
+				<displayName>пкс/дюйм</displayName>
+				<unitPattern count="zero">{0} пкс/дюйм</unitPattern>
+				<unitPattern count="one">{0} пкс/дюйм</unitPattern>
+				<unitPattern count="other">{0} пкс/дюйм</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName draft="unconfirmed">ҫӗр радиусӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫӗр радиусӗ</unitPattern>
+				<unitPattern count="zero">{0} R⊕</unitPattern>
+				<unitPattern count="one">{0} R⊕</unitPattern>
+				<unitPattern count="other">{0} R⊕</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/км</perUnitPattern>
+				<displayName>км</displayName>
+				<unitPattern count="zero">{0} км</unitPattern>
+				<unitPattern count="one">{0} км</unitPattern>
+				<unitPattern count="other">{0} км</unitPattern>
+				<perUnitPattern>{0}/км</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="unconfirmed">м</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/м</perUnitPattern>
+				<displayName>м</displayName>
+				<unitPattern count="zero">{0} м</unitPattern>
+				<unitPattern count="one">{0} м</unitPattern>
+				<unitPattern count="other">{0} м</unitPattern>
+				<perUnitPattern>{0}/м</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">дм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дм</unitPattern>
+				<displayName>дм</displayName>
+				<unitPattern count="zero">{0} дм</unitPattern>
+				<unitPattern count="one">{0} дм</unitPattern>
+				<unitPattern count="other">{0} дм</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">см</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} см</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/см</perUnitPattern>
+				<displayName>см</displayName>
+				<unitPattern count="zero">{0} см</unitPattern>
+				<unitPattern count="one">{0} см</unitPattern>
+				<unitPattern count="other">{0} см</unitPattern>
+				<perUnitPattern>{0}/см</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">мм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мм</unitPattern>
+				<displayName>мм</displayName>
+				<unitPattern count="zero">{0} мм</unitPattern>
+				<unitPattern count="one">{0} мм</unitPattern>
+				<unitPattern count="other">{0} мм</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">мкм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мкм</unitPattern>
+				<displayName>мкм</displayName>
+				<unitPattern count="zero">{0} мкм</unitPattern>
+				<unitPattern count="one">{0} мкм</unitPattern>
+				<unitPattern count="other">{0} мкм</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">нм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} нм</unitPattern>
+				<displayName>нм</displayName>
+				<unitPattern count="zero">{0} нм</unitPattern>
+				<unitPattern count="one">{0} нм</unitPattern>
+				<unitPattern count="other">{0} нм</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="unconfirmed">пм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пм</unitPattern>
+				<displayName>пм</displayName>
+				<unitPattern count="zero">{0} пм</unitPattern>
+				<unitPattern count="one">{0} пм</unitPattern>
+				<unitPattern count="other">{0} пм</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName draft="unconfirmed">ми</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми</unitPattern>
+				<displayName>ми</displayName>
+				<unitPattern count="zero">{0} ми</unitPattern>
+				<unitPattern count="one">{0} ми</unitPattern>
+				<unitPattern count="other">{0} ми</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName draft="unconfirmed">ярд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд</unitPattern>
+				<displayName>ярд</displayName>
+				<unitPattern count="zero">{0} ярд</unitPattern>
+				<unitPattern count="one">{0} ярд</unitPattern>
+				<unitPattern count="other">{0} ярд</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName draft="unconfirmed">фт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фт</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/фт</perUnitPattern>
+				<displayName>фт</displayName>
+				<unitPattern count="zero">{0} фт</unitPattern>
+				<unitPattern count="one">{0} фт</unitPattern>
+				<unitPattern count="other">{0} фт</unitPattern>
+				<perUnitPattern>{0}/фт</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName draft="unconfirmed">дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/дюйм</perUnitPattern>
+				<displayName>дюйм</displayName>
+				<unitPattern count="zero">{0} дюйм</unitPattern>
+				<unitPattern count="one">{0} дюйм</unitPattern>
+				<unitPattern count="other">{0} дюйм</unitPattern>
+				<perUnitPattern>{0}/дюйм</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName draft="unconfirmed">пк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пк</unitPattern>
+				<displayName>пк</displayName>
+				<unitPattern count="zero">{0} пк</unitPattern>
+				<unitPattern count="one">{0} пк</unitPattern>
+				<unitPattern count="other">{0} пк</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName draft="unconfirmed">çуттăн çулĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çуттăн çулĕ</unitPattern>
+				<displayName>ҫутӑ ҫулӗ</displayName>
+				<unitPattern count="zero">{0} ҫутӑ ҫулӗ</unitPattern>
+				<unitPattern count="one">{0} ҫутӑ ҫулӗ</unitPattern>
+				<unitPattern count="other">{0} ҫутӑ ҫулӗ</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">а.п.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} а.п.</unitPattern>
+				<displayName>а. в.</displayName>
+				<unitPattern count="zero">{0} а. в.</unitPattern>
+				<unitPattern count="one">{0} а. в.</unitPattern>
+				<unitPattern count="other">{0} а. в.</unitPattern>
 			</unit>
 			<unit type="length-furlong">
-				<displayName draft="unconfirmed">фурлонгсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фрл</unitPattern>
+				<displayName>фрл</displayName>
+				<unitPattern count="zero">{0} фрл</unitPattern>
+				<unitPattern count="one">{0} фрл</unitPattern>
+				<unitPattern count="other">{0} фрл</unitPattern>
 			</unit>
 			<unit type="length-fathom">
-				<displayName draft="unconfirmed">тинӗс чалӑш</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тинӗс чалӑш</unitPattern>
+				<displayName>тинӗс хӑл.</displayName>
+				<unitPattern count="zero">{0} тинӗс хӑл.</unitPattern>
+				<unitPattern count="one">{0} тинӗс хӑл.</unitPattern>
+				<unitPattern count="other">{0} тинӗс хӑл.</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">тнс.ми</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тинӗс милли</unitPattern>
+				<displayName>тинӗс ми</displayName>
+				<unitPattern count="zero">{0} тинӗс ми</unitPattern>
+				<unitPattern count="one">{0} тинӗс ми</unitPattern>
+				<unitPattern count="other">{0} тинӗс ми</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<displayName draft="unconfirmed">ск.ми</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ск.ми</unitPattern>
+				<displayName>ск. ми</displayName>
+				<unitPattern count="zero">{0} ск. ми</unitPattern>
+				<unitPattern count="one">{0} ск. ми</unitPattern>
+				<unitPattern count="other">{0} ск. ми</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<displayName draft="unconfirmed">пкт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкт</unitPattern>
+				<displayName>пкт</displayName>
+				<unitPattern count="zero">{0} пкт</unitPattern>
+				<unitPattern count="one">{0} пкт</unitPattern>
+				<unitPattern count="other">{0} пкт</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName draft="unconfirmed">хӗвел радиусӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} хӗвел радиусӗ</unitPattern>
+				<unitPattern count="zero">{0} R☉</unitPattern>
+				<unitPattern count="one">{0} R☉</unitPattern>
+				<unitPattern count="other">{0} R☉</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="unconfirmed">лк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} лк</unitPattern>
+				<displayName>лк</displayName>
+				<unitPattern count="zero">{0} лк</unitPattern>
+				<unitPattern count="one">{0} лк</unitPattern>
+				<unitPattern count="other">{0} лк</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName draft="unconfirmed">кд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кд</unitPattern>
+				<displayName>кд</displayName>
+				<unitPattern count="zero">{0} кд</unitPattern>
+				<unitPattern count="one">{0} кд</unitPattern>
+				<unitPattern count="other">{0} кд</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<displayName draft="unconfirmed">лм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} лм</unitPattern>
+				<displayName>лм</displayName>
+				<unitPattern count="zero">{0} лм</unitPattern>
+				<unitPattern count="one">{0} лм</unitPattern>
+				<unitPattern count="other">{0} лм</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName draft="unconfirmed">тонна</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тонна</unitPattern>
+				<displayName>т</displayName>
+				<unitPattern count="zero">{0} т</unitPattern>
+				<unitPattern count="one">{0} т</unitPattern>
+				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">кг</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кг</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кг</perUnitPattern>
+				<displayName>кг</displayName>
+				<unitPattern count="zero">{0} кг</unitPattern>
+				<unitPattern count="one">{0} кг</unitPattern>
+				<unitPattern count="other">{0} кг</unitPattern>
+				<perUnitPattern>{0}/кг</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">г</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} г</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/г</perUnitPattern>
+				<displayName>г</displayName>
+				<unitPattern count="zero">{0} г</unitPattern>
+				<unitPattern count="one">{0} г</unitPattern>
+				<unitPattern count="other">{0} г</unitPattern>
+				<perUnitPattern>{0}/г</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName draft="unconfirmed">мг</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мг</unitPattern>
+				<displayName>мг</displayName>
+				<unitPattern count="zero">{0} мг</unitPattern>
+				<unitPattern count="one">{0} мг</unitPattern>
+				<unitPattern count="other">{0} мг</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">мкг</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мкг</unitPattern>
+				<displayName>мкг</displayName>
+				<unitPattern count="zero">{0} мкг</unitPattern>
+				<unitPattern count="one">{0} мкг</unitPattern>
+				<unitPattern count="other">{0} мкг</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<displayName draft="unconfirmed">амер. тонна</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} амер. тонна</unitPattern>
+				<displayName>ам. тонна</displayName>
+				<unitPattern count="zero">{0} ам. тонна</unitPattern>
+				<unitPattern count="one">{0} ам. тонна</unitPattern>
+				<unitPattern count="other">{0} ам. тонна</unitPattern>
 			</unit>
 			<unit type="mass-stone">
-				<displayName draft="unconfirmed">стоун</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} стоун</unitPattern>
+				<displayName>стн</displayName>
+				<unitPattern count="zero">{0} стн</unitPattern>
+				<unitPattern count="one">{0} стн</unitPattern>
+				<unitPattern count="other">{0} стн</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName draft="unconfirmed">кĕренке</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕренке</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кĕренке</perUnitPattern>
+				<displayName>фнт</displayName>
+				<unitPattern count="zero">{0} фнт</unitPattern>
+				<unitPattern count="one">{0} фнт</unitPattern>
+				<unitPattern count="other">{0} фнт</unitPattern>
+				<perUnitPattern>{0}/фнт</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} унци</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/унци</perUnitPattern>
+				<displayName>унци</displayName>
+				<unitPattern count="zero">{0} унци</unitPattern>
+				<unitPattern count="one">{0} унци</unitPattern>
+				<unitPattern count="other">{0} унци</unitPattern>
+				<perUnitPattern>{0}/унци</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">трой унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} трой унци</unitPattern>
+				<displayName>тр. унцийӗ</displayName>
+				<unitPattern count="zero">{0} тр. унц.</unitPattern>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName draft="unconfirmed">карат</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} карат</unitPattern>
+				<displayName>кар</displayName>
+				<unitPattern count="zero">{0} кар</unitPattern>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
-				<displayName draft="unconfirmed">дальтон</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дальтон</unitPattern>
+				<displayName>Да</displayName>
+				<unitPattern count="zero">{0} Да</unitPattern>
+				<unitPattern count="one">{0} Да</unitPattern>
+				<unitPattern count="other">{0} Да</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName draft="unconfirmed">Ҫӗр масси</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Ҫӗр масси</unitPattern>
+				<unitPattern count="zero">{0} M⊕</unitPattern>
+				<unitPattern count="one">{0} M⊕</unitPattern>
+				<unitPattern count="other">{0} M⊕</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
-				<displayName draft="unconfirmed">Хӗвел масси</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Хӗвел масси</unitPattern>
+				<unitPattern count="zero">{0} M☉</unitPattern>
+				<unitPattern count="one">{0} M☉</unitPattern>
+				<unitPattern count="other">{0} M☉</unitPattern>
 			</unit>
 			<unit type="mass-grain">
-				<displayName draft="unconfirmed">гран</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гран</unitPattern>
+				<displayName>гран</displayName>
+				<unitPattern count="zero">{0} гран</unitPattern>
+				<unitPattern count="one">{0} гран</unitPattern>
+				<unitPattern count="other">{0} гран</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="unconfirmed">ГВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ГВт</unitPattern>
+				<displayName>ГВт</displayName>
+				<unitPattern count="zero">{0} ГВт</unitPattern>
+				<unitPattern count="one">{0} ГВт</unitPattern>
+				<unitPattern count="other">{0} ГВт</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="unconfirmed">МВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} МВт</unitPattern>
+				<displayName>МВт</displayName>
+				<unitPattern count="zero">{0} МВт</unitPattern>
+				<unitPattern count="one">{0} МВт</unitPattern>
+				<unitPattern count="other">{0} МВт</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName draft="unconfirmed">КВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} КВт</unitPattern>
+				<displayName>кВт</displayName>
+				<unitPattern count="zero">{0} кВт</unitPattern>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="unconfirmed">Вт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Вт</unitPattern>
+				<displayName>Вт</displayName>
+				<unitPattern count="zero">{0} Вт</unitPattern>
+				<unitPattern count="one">{0} Вт</unitPattern>
+				<unitPattern count="other">{0} Вт</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<displayName draft="unconfirmed">мВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мВт</unitPattern>
+				<displayName>мВт</displayName>
+				<unitPattern count="zero">{0} мВт</unitPattern>
+				<unitPattern count="one">{0} мВт</unitPattern>
+				<unitPattern count="other">{0} мВт</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<displayName draft="unconfirmed">л.в.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л.в.</unitPattern>
+				<displayName>л. в.</displayName>
+				<unitPattern count="zero">{0} л. в.</unitPattern>
+				<unitPattern count="one">{0} л. в.</unitPattern>
+				<unitPattern count="other">{0} л. в.</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName draft="unconfirmed">чĕркĕмĕл юпи мм</displayName>
-				<unitPattern count="other" draft="unconfirmed">чĕркĕмĕл юпи {0} мм</unitPattern>
+				<displayName>мм ч. к. ю.</displayName>
+				<unitPattern count="zero">{0} мм ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} мм ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} мм ч. к. ю.</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ч. к. ю.</displayName>
+				<unitPattern count="zero">{0} ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} ч. к. ю.</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName draft="unconfirmed">дюйм² кӗренке</displayName>
-				<unitPattern count="other" draft="unconfirmed">дюйм² {0} кӗренке</unitPattern>
+				<displayName>фнтв/дюйм²</displayName>
+				<unitPattern count="zero">{0} фнтв/дюйм²</unitPattern>
+				<unitPattern count="one">{0} фнтв/дюйм²</unitPattern>
+				<unitPattern count="other">{0} фнтв/дюйм²</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName draft="unconfirmed">чĕркĕмĕл юпи дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">чĕркĕмĕл юпи {0} дюйм</unitPattern>
+				<displayName>дюйм ч. к. ю.</displayName>
+				<unitPattern count="zero">{0} дюйм ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} дюйм ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} дюйм ч. к. ю.</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
-				<displayName draft="unconfirmed">бар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бар</unitPattern>
+				<displayName>бар</displayName>
+				<unitPattern count="zero">{0} бар</unitPattern>
+				<unitPattern count="one">{0} бар</unitPattern>
+				<unitPattern count="other">{0} бар</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">мбар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мбар</unitPattern>
+				<displayName>мбар</displayName>
+				<unitPattern count="zero">{0} мбар</unitPattern>
+				<unitPattern count="one">{0} мбар</unitPattern>
+				<unitPattern count="other">{0} мбар</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
-				<displayName draft="unconfirmed">атмосфера</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} атмосфера</unitPattern>
+				<displayName>атм</displayName>
+				<unitPattern count="zero">{0} атм</unitPattern>
+				<unitPattern count="one">{0} атм</unitPattern>
+				<unitPattern count="other">{0} атм</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
-				<displayName draft="unconfirmed">Па</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Па</unitPattern>
+				<displayName>Па</displayName>
+				<unitPattern count="zero">{0} Па</unitPattern>
+				<unitPattern count="one">{0} Па</unitPattern>
+				<unitPattern count="other">{0} Па</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="unconfirmed">гПа</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гПа</unitPattern>
+				<displayName>гПа</displayName>
+				<unitPattern count="zero">{0} гПа</unitPattern>
+				<unitPattern count="one">{0} гПа</unitPattern>
+				<unitPattern count="other">{0} гПа</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
-				<displayName draft="unconfirmed">кПа</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кПа</unitPattern>
+				<displayName>кПа</displayName>
+				<unitPattern count="zero">{0} кПа</unitPattern>
+				<unitPattern count="one">{0} кПа</unitPattern>
+				<unitPattern count="other">{0} кПа</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
-				<displayName draft="unconfirmed">МПа</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} МПа</unitPattern>
+				<displayName>МПа</displayName>
+				<unitPattern count="zero">{0} МПа</unitPattern>
+				<unitPattern count="one">{0} МПа</unitPattern>
+				<unitPattern count="other">{0} МПа</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">км/сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км/сехет</unitPattern>
+				<displayName>км/сех</displayName>
+				<unitPattern count="zero">{0} км/сех</unitPattern>
+				<unitPattern count="one">{0} км/сех</unitPattern>
+				<unitPattern count="other">{0} км/сех</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="unconfirmed">м/ҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м/ҫ</unitPattern>
+				<displayName>м/ҫ</displayName>
+				<unitPattern count="zero">{0} м/ҫ</unitPattern>
+				<unitPattern count="one">{0} м/ҫ</unitPattern>
+				<unitPattern count="other">{0} м/ҫ</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">ми/сехет</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми/сехет</unitPattern>
+				<displayName>ми/сех</displayName>
+				<unitPattern count="zero">{0} ми/сех</unitPattern>
+				<unitPattern count="one">{0} ми/сех</unitPattern>
+				<unitPattern count="other">{0} ми/сех</unitPattern>
 			</unit>
 			<unit type="speed-knot">
-				<displayName draft="unconfirmed">тĕвĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тĕвĕ</unitPattern>
+				<displayName>уз</displayName>
+				<unitPattern count="zero">{0} уз</unitPattern>
+				<unitPattern count="one">{0} уз</unitPattern>
+				<unitPattern count="other">{0} уз</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName draft="unconfirmed">Бофорт балл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Бофорт балл</unitPattern>
+				<displayName>Бфт</displayName>
+				<unitPattern count="zero">{0} Бфт</unitPattern>
+				<unitPattern count="one">{0} Бфт</unitPattern>
+				<unitPattern count="other">{0} Бфт</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">К</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} К</unitPattern>
+				<displayName>К</displayName>
+				<unitPattern count="zero">{0} К</unitPattern>
+				<unitPattern count="one">{0} К</unitPattern>
+				<unitPattern count="other">{0} К</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
-				<displayName draft="unconfirmed">кĕренке-фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кĕренке-фут</unitPattern>
+				<displayName>фнтв⋅фт</displayName>
+				<unitPattern count="zero">{0} фнтв⋅фт</unitPattern>
+				<unitPattern count="one">{0} фнтв⋅фт</unitPattern>
+				<unitPattern count="other">{0} фнтв⋅фт</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<displayName draft="unconfirmed">Н⋅м</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Н⋅м</unitPattern>
+				<displayName>Н⋅м</displayName>
+				<unitPattern count="zero">{0} Н⋅м</unitPattern>
+				<unitPattern count="one">{0} Н⋅м</unitPattern>
+				<unitPattern count="other">{0} Н⋅м</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName draft="unconfirmed">км³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км³</unitPattern>
+				<displayName>км³</displayName>
+				<unitPattern count="zero">{0} км³</unitPattern>
+				<unitPattern count="one">{0} км³</unitPattern>
+				<unitPattern count="other">{0} км³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName draft="unconfirmed">м³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м³</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/м³</perUnitPattern>
+				<displayName>м³</displayName>
+				<unitPattern count="zero">{0} м³</unitPattern>
+				<unitPattern count="one">{0} м³</unitPattern>
+				<unitPattern count="other">{0} м³</unitPattern>
+				<perUnitPattern>{0}/м³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<displayName draft="unconfirmed">см³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} см³</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/см³</perUnitPattern>
+				<displayName>см³</displayName>
+				<unitPattern count="zero">{0} см³</unitPattern>
+				<unitPattern count="one">{0} см³</unitPattern>
+				<unitPattern count="other">{0} см³</unitPattern>
+				<perUnitPattern>{0}/см³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="unconfirmed">ми³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми³</unitPattern>
+				<displayName>ми³</displayName>
+				<unitPattern count="zero">{0} ми³</unitPattern>
+				<unitPattern count="one">{0} ми³</unitPattern>
+				<unitPattern count="other">{0} ми³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="unconfirmed">ярд³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд³</unitPattern>
+				<displayName>ярд³</displayName>
+				<unitPattern count="zero">{0} ярд³</unitPattern>
+				<unitPattern count="one">{0} ярд³</unitPattern>
+				<unitPattern count="other">{0} ярд³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
-				<displayName draft="unconfirmed">фт³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фт³</unitPattern>
+				<displayName>фт³</displayName>
+				<unitPattern count="zero">{0} фт³</unitPattern>
+				<unitPattern count="one">{0} фт³</unitPattern>
+				<unitPattern count="other">{0} фт³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
-				<displayName draft="unconfirmed">дюйм³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм³</unitPattern>
+				<displayName>дюйм³</displayName>
+				<unitPattern count="zero">{0} дюйм³</unitPattern>
+				<unitPattern count="one">{0} дюйм³</unitPattern>
+				<unitPattern count="other">{0} дюйм³</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="unconfirmed">мегалитр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мегалитр</unitPattern>
+				<displayName>Мл</displayName>
+				<unitPattern count="zero">{0} Мл</unitPattern>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
-				<displayName draft="unconfirmed">гл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гл</unitPattern>
+				<displayName>гл</displayName>
+				<unitPattern count="zero">{0} гл</unitPattern>
+				<unitPattern count="one">{0} гл</unitPattern>
+				<unitPattern count="other">{0} гл</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="unconfirmed">л</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/л</perUnitPattern>
+				<displayName>л</displayName>
+				<unitPattern count="zero">{0} л</unitPattern>
+				<unitPattern count="one">{0} л</unitPattern>
+				<unitPattern count="other">{0} л</unitPattern>
+				<perUnitPattern>{0}/л</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">дл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дл</unitPattern>
+				<displayName>дл</displayName>
+				<unitPattern count="zero">{0} дл</unitPattern>
+				<unitPattern count="one">{0} дл</unitPattern>
+				<unitPattern count="other">{0} дл</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
-				<displayName draft="unconfirmed">сл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сл</unitPattern>
+				<displayName>сл</displayName>
+				<unitPattern count="zero">{0} сл</unitPattern>
+				<unitPattern count="one">{0} сл</unitPattern>
+				<unitPattern count="other">{0} сл</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName draft="unconfirmed">мл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мл</unitPattern>
+				<displayName>мл</displayName>
+				<unitPattern count="zero">{0} мл</unitPattern>
+				<unitPattern count="one">{0} мл</unitPattern>
+				<unitPattern count="other">{0} мл</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
-				<displayName draft="unconfirmed">мпт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мпт</unitPattern>
+				<displayName>мпт</displayName>
+				<unitPattern count="zero">{0} мпт</unitPattern>
+				<unitPattern count="one">{0} мпт</unitPattern>
+				<unitPattern count="other">{0} мпт</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
-				<displayName draft="unconfirmed">курка-метрлӑ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} курка-метрлӑ</unitPattern>
+				<displayName>м. курка</displayName>
+				<unitPattern count="zero">{0} м. курка</unitPattern>
+				<unitPattern count="one">{0} м. курка</unitPattern>
+				<unitPattern count="other">{0} м. курка</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м. шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} м. шӗвӗ унци</unitPattern>
+				<unitPattern count="one">{0} м. шӗвӗ унци</unitPattern>
+				<unitPattern count="other">{0} м. шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">акр-фут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} акр-фут</unitPattern>
+				<displayName>акр-фт</displayName>
+				<unitPattern count="zero">{0} акр-фт</unitPattern>
+				<unitPattern count="one">{0} акр-фт</unitPattern>
+				<unitPattern count="other">{0} акр-фт</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">буш.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} буш.</unitPattern>
+				<displayName>бушель</displayName>
+				<unitPattern count="zero">{0} бушель</unitPattern>
+				<unitPattern count="one">{0} бушель</unitPattern>
+				<unitPattern count="other">{0} бушель</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="unconfirmed">гал.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гал.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/гал.</perUnitPattern>
+				<displayName>ам. гал.</displayName>
+				<unitPattern count="zero">{0} ам. гал.</unitPattern>
+				<unitPattern count="one">{0} ам. гал.</unitPattern>
+				<unitPattern count="other">{0} ам. гал.</unitPattern>
+				<perUnitPattern>{0}/ам. гал.</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<displayName draft="unconfirmed">импери галлон</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери галлон</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/импери галлон</perUnitPattern>
+				<displayName>имп. гал.</displayName>
+				<unitPattern count="zero">{0} имп. гал.</unitPattern>
+				<unitPattern count="one">{0} имп. гал.</unitPattern>
+				<unitPattern count="other">{0} имп. гал.</unitPattern>
+				<perUnitPattern>{0}/имп. гал.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="unconfirmed">кварт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кварт</unitPattern>
+				<displayName>ам. кварт</displayName>
+				<unitPattern count="zero">{0} ам. кварт</unitPattern>
+				<unitPattern count="one">{0} ам. кварт</unitPattern>
+				<unitPattern count="other">{0} ам. кварт</unitPattern>
 			</unit>
 			<unit type="volume-pint">
-				<displayName draft="unconfirmed">пинт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пинт</unitPattern>
+				<displayName>ам. пинт</displayName>
+				<unitPattern count="zero">{0} ам. пинт</unitPattern>
+				<unitPattern count="one">{0} ам. пинт</unitPattern>
+				<unitPattern count="other">{0} ам. пинт</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>имп. пинт</displayName>
+				<unitPattern count="zero">{0} имп. пинт</unitPattern>
+				<unitPattern count="one">{0} имп. пинт</unitPattern>
+				<unitPattern count="other">{0} имп. пинт</unitPattern>
 			</unit>
 			<unit type="volume-cup">
-				<displayName draft="unconfirmed">чашӑк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чашӑк</unitPattern>
+				<displayName>ам. курка</displayName>
+				<unitPattern count="zero">{0} ам. курка</unitPattern>
+				<unitPattern count="one">{0} ам. курка</unitPattern>
+				<unitPattern count="other">{0} ам. курка</unitPattern>
+			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>имп. курка</displayName>
+				<unitPattern count="zero">{0} имп. курка</unitPattern>
+				<unitPattern count="one">{0} имп. курка</unitPattern>
+				<unitPattern count="other">{0} имп. курка</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
-				<displayName draft="unconfirmed">шӗвӗ унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} шӗвӗ унци</unitPattern>
+				<displayName>ам. шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} ам. шӗвӗ унци</unitPattern>
+				<unitPattern count="one">{0} ам. шӗвӗ унци</unitPattern>
+				<unitPattern count="other">{0} ам. шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName draft="unconfirmed">импери шӗвӗ унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери шӗвӗ унци</unitPattern>
+				<displayName>имп. шӗвӗ унц.</displayName>
+				<unitPattern count="zero">{0} имп. шӗвӗ унц.</unitPattern>
+				<unitPattern count="one">{0} имп. шӗвӗ унц.</unitPattern>
+				<unitPattern count="other">{0} имп. шӗвӗ унц.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="unconfirmed">апат кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} апат кашӑкӗ</unitPattern>
+				<displayName>апат каш.</displayName>
+				<unitPattern count="zero">{0} апат каш.</unitPattern>
+				<unitPattern count="one">{0} апат каш.</unitPattern>
+				<unitPattern count="other">{0} апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="unconfirmed">чей кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чей кашӑкӗ</unitPattern>
+				<displayName>чей каш.</displayName>
+				<unitPattern count="zero">{0} чей каш.</unitPattern>
+				<unitPattern count="one">{0} чей каш.</unitPattern>
+				<unitPattern count="other">{0} чей каш.</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
-				<displayName draft="unconfirmed">барр.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} барр.</unitPattern>
+				<displayName>барр.</displayName>
+				<unitPattern count="zero">{0} барр.</unitPattern>
+				<unitPattern count="one">{0} барр.</unitPattern>
+				<unitPattern count="other">{0} барр.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName draft="unconfirmed">плк.апат кшк.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} плк.апат кшк.</unitPattern>
+				<displayName>пыл. апат каш.</displayName>
+				<unitPattern count="zero">{0} пыл. апат каш.</unitPattern>
+				<unitPattern count="one">{0} пыл. апат каш.</unitPattern>
+				<unitPattern count="other">{0} пыл. апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<displayName draft="unconfirmed">имп. пылак апат кашӑкӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} имп.пылак апат кашӑкӗ</unitPattern>
+				<displayName>имп. пыл. апат каш.</displayName>
+				<unitPattern count="zero">{0} имп. пыл. апат каш.</unitPattern>
+				<unitPattern count="one">{0} имп. пыл. апат каш.</unitPattern>
+				<unitPattern count="other">{0} имп. пыл. апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<displayName draft="unconfirmed">тумлам</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тумлам</unitPattern>
+				<displayName>тумл.</displayName>
+				<unitPattern count="zero">{0} тумл.</unitPattern>
+				<unitPattern count="one">{0} тумл.</unitPattern>
+				<unitPattern count="other">{0} тумл.</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName draft="unconfirmed">шĕвĕ драхма</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} шĕвĕ драхма</unitPattern>
+				<displayName>шӗвӗ др.</displayName>
+				<unitPattern count="zero">{0} шӗвӗ др.</unitPattern>
+				<unitPattern count="one">{0} шӗвӗ др.</unitPattern>
+				<unitPattern count="other">{0} шӗвӗ др.</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
-				<displayName draft="unconfirmed">чӗркке</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чӗркке</unitPattern>
+				<displayName>чӗркке</displayName>
+				<unitPattern count="zero">{0} чӗркке</unitPattern>
+				<unitPattern count="one">{0} чӗркке</unitPattern>
+				<unitPattern count="other">{0} чӗркке</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
-				<displayName draft="unconfirmed">чĕптĕм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чĕптĕм</unitPattern>
+				<displayName>чӗпт.</displayName>
+				<unitPattern count="zero">{0} чӗпт.</unitPattern>
+				<unitPattern count="one">{0} чӗпт.</unitPattern>
+				<unitPattern count="other">{0} чӗпт.</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
-				<displayName draft="unconfirmed">импери кварт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери кварт</unitPattern>
+				<displayName>имп. кварт</displayName>
+				<unitPattern count="zero">{0} имп. кварт</unitPattern>
+				<unitPattern count="one">{0} имп. кварт</unitPattern>
+				<unitPattern count="other">{0} имп. кварт</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="zero">{0} ср</unitPattern>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="zero">{0} кат</unitPattern>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="zero">{0} Кл</unitPattern>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="zero">{0} Ф</unitPattern>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="zero">{0} Гн</unitPattern>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="zero">{0} См</unitPattern>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>кал-IT</displayName>
+				<unitPattern count="zero">{0} кал-IT</unitPattern>
+				<unitPattern count="one">{0} кал-IT</unitPattern>
+				<unitPattern count="other">{0} кал-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>БӐВ-IT</displayName>
+				<unitPattern count="zero">{0} БӐВ-IT</unitPattern>
+				<unitPattern count="one">{0} БӐВ-IT</unitPattern>
+				<unitPattern count="other">{0} БӐВ-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="zero">{0} Бк</unitPattern>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="zero">{0} Зв</unitPattern>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="zero">{0} Гр</unitPattern>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгв</displayName>
+				<unitPattern count="zero">{0} кгв</unitPattern>
+				<unitPattern count="one">{0} кгв</unitPattern>
+				<unitPattern count="other">{0} кгв</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>род</displayName>
+				<unitPattern count="zero">{0} род</unitPattern>
+				<unitPattern count="one">{0} род</unitPattern>
+				<unitPattern count="other">{0} род</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>чейн</displayName>
+				<unitPattern count="zero">{0} чейн</unitPattern>
+				<unitPattern count="one">{0} чейн</unitPattern>
+				<unitPattern count="other">{0} чейн</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="zero">{0} Тл</unitPattern>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="zero">{0} Вб</unitPattern>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<unitPattern count="zero">{0} °R</unitPattern>
+				<unitPattern count="one">{0} °R</unitPattern>
+				<unitPattern count="other">{0} °R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>икӗ эрн.</displayName>
+				<unitPattern count="zero">{0} икӗ эрн.</unitPattern>
+				<unitPattern count="one">{0} икӗ эрн.</unitPattern>
+				<unitPattern count="other">{0} икӗ эрн.</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>слаг</displayName>
+				<unitPattern count="zero">{0} слаг</unitPattern>
+				<unitPattern count="one">{0} слаг</unitPattern>
+				<unitPattern count="other">{0} слаг</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>бенз. тан.</displayName>
+				<unitPattern count="zero">{0} бенз. тан.</unitPattern>
+				<unitPattern count="one">{0} бенз. тан.</unitPattern>
+				<unitPattern count="other">{0} бенз. тан.</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>рин</displayName>
+				<unitPattern count="zero">{0} рин</unitPattern>
+				<unitPattern count="one">{0} рин</unitPattern>
+				<unitPattern count="other">{0} рин</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>сун</displayName>
+				<unitPattern count="zero">{0} сун</unitPattern>
+				<unitPattern count="one">{0} сун</unitPattern>
+				<unitPattern count="other">{0} сун</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>сяку</displayName>
+				<unitPattern count="zero">{0} сяку</unitPattern>
+				<unitPattern count="one">{0} сяку</unitPattern>
+				<unitPattern count="other">{0} сяку</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>кудзирадзяку</displayName>
+				<unitPattern count="zero">{0} кудзирадзяку</unitPattern>
+				<unitPattern count="one">{0} кудзирадзяку</unitPattern>
+				<unitPattern count="other">{0} кудзирадзяку</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>кэн</displayName>
+				<unitPattern count="zero">{0} кэн</unitPattern>
+				<unitPattern count="one">{0} кэн</unitPattern>
+				<unitPattern count="other">{0} кэн</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>дзё</displayName>
+				<unitPattern count="zero">{0} дзё</unitPattern>
+				<unitPattern count="one">{0} дзё</unitPattern>
+				<unitPattern count="other">{0} дзё</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ри</displayName>
+				<unitPattern count="zero">{0} ри</unitPattern>
+				<unitPattern count="one">{0} ри</unitPattern>
+				<unitPattern count="other">{0} ри</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>бу</displayName>
+				<unitPattern count="zero">{0} бу</unitPattern>
+				<unitPattern count="one">{0} бу</unitPattern>
+				<unitPattern count="other">{0} бу</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>сэ</displayName>
+				<unitPattern count="zero">{0} сэ</unitPattern>
+				<unitPattern count="one">{0} сэ</unitPattern>
+				<unitPattern count="other">{0} сэ</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>тё</displayName>
+				<unitPattern count="zero">{0} тё</unitPattern>
+				<unitPattern count="one">{0} тё</unitPattern>
+				<unitPattern count="other">{0} тё</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>косадзи</displayName>
+				<unitPattern count="zero">{0} косадзи</unitPattern>
+				<unitPattern count="one">{0} косадзи</unitPattern>
+				<unitPattern count="other">{0} косадзи</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>осадзи</displayName>
+				<unitPattern count="zero">{0} осадзи</unitPattern>
+				<unitPattern count="one">{0} осадзи</unitPattern>
+				<unitPattern count="other">{0} осадзи</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>каппу</displayName>
+				<unitPattern count="zero">{0} каппу</unitPattern>
+				<unitPattern count="one">{0} каппу</unitPattern>
+				<unitPattern count="other">{0} каппу</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>секи</displayName>
+				<unitPattern count="zero">{0} секи</unitPattern>
+				<unitPattern count="one">{0} секи</unitPattern>
+				<unitPattern count="other">{0} секи</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>сай</displayName>
+				<unitPattern count="zero">{0} сай</unitPattern>
+				<unitPattern count="one">{0} сай</unitPattern>
+				<unitPattern count="other">{0} сай</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>то</displayName>
+				<unitPattern count="zero">{0} то</unitPattern>
+				<unitPattern count="one">{0} то</unitPattern>
+				<unitPattern count="other">{0} то</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>коку</displayName>
+				<unitPattern count="zero">{0} коку</unitPattern>
+				<unitPattern count="one">{0} коку</unitPattern>
+				<unitPattern count="other">{0} коку</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName draft="unconfirmed">ҫутӑ хӑвӑрт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫутӑ хӑвӑрт</unitPattern>
+				<displayName>ҫутӑ</displayName>
+				<unitPattern count="zero">{0} ҫутӑ</unitPattern>
+				<unitPattern count="one">{0} ҫутӑ</unitPattern>
+				<unitPattern count="other">{0} ҫутӑ</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>фун</displayName>
+				<unitPattern count="zero">{0} фун</unitPattern>
+				<unitPattern count="one">{0} фун</unitPattern>
+				<unitPattern count="other">{0} фун</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>млрд⁻¹</displayName>
+				<unitPattern count="zero">{0} млрд⁻¹</unitPattern>
+				<unitPattern count="one">{0} млрд⁻¹</unitPattern>
+				<unitPattern count="other">{0} млрд⁻¹</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName draft="unconfirmed">ҫӗрсем</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫӗрсем</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫӗр</perUnitPattern>
+				<displayName>каҫ</displayName>
+				<unitPattern count="zero">{0} каҫ</unitPattern>
+				<unitPattern count="one">{0} каҫ</unitPattern>
+				<unitPattern count="other">{0} каҫ</unitPattern>
+				<perUnitPattern>{0}/каҫ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName>енӗ</displayName>
-				<coordinateUnitPattern type="east">{0} х. т.</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} ҫ. т.</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} к. т.</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} а. т.</coordinateUnitPattern>
+				<displayName>ен</displayName>
+				<coordinateUnitPattern type="east">т. е. {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">ҫ. е. {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">к. е. {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">а. е. {0}</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">д{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-2">
-				<unitPrefixPattern draft="unconfirmed">с{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-3">
-				<unitPrefixPattern draft="unconfirmed">м{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern draft="unconfirmed">мк{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-9">
-				<unitPrefixPattern draft="unconfirmed">н{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-12">
-				<unitPrefixPattern draft="unconfirmed">п{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-15">
-				<unitPrefixPattern draft="unconfirmed">ф{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-18">
-				<unitPrefixPattern draft="unconfirmed">а{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-21">
-				<unitPrefixPattern draft="unconfirmed">з{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-24">
-				<unitPrefixPattern draft="unconfirmed">и{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-27">
-				<unitPrefixPattern draft="unconfirmed">р{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-30">
-				<unitPrefixPattern draft="unconfirmed">кв{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p1">
-				<unitPrefixPattern draft="unconfirmed">да{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p2">
-				<unitPrefixPattern draft="unconfirmed">г{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p3">
-				<unitPrefixPattern draft="unconfirmed">к{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p6">
-				<unitPrefixPattern draft="unconfirmed">М{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p9">
-				<unitPrefixPattern draft="unconfirmed">Г{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p12">
-				<unitPrefixPattern draft="unconfirmed">Т{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p15">
-				<unitPrefixPattern draft="unconfirmed">П{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p18">
-				<unitPrefixPattern draft="unconfirmed">Э{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p21">
-				<unitPrefixPattern draft="unconfirmed">З{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p24">
-				<unitPrefixPattern draft="unconfirmed">И{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p27">
-				<unitPrefixPattern draft="unconfirmed">Р{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p30">
-				<unitPrefixPattern draft="unconfirmed">Кв{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p1">
-				<unitPrefixPattern draft="unconfirmed">Ки{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p2">
-				<unitPrefixPattern draft="unconfirmed">Ми{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p3">
-				<unitPrefixPattern draft="unconfirmed">Ги{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p4">
-				<unitPrefixPattern draft="unconfirmed">Ти{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p5">
-				<unitPrefixPattern draft="unconfirmed">Пи{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p6">
-				<unitPrefixPattern draft="unconfirmed">Эи{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p7">
-				<unitPrefixPattern draft="unconfirmed">Зи{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p8">
-				<unitPrefixPattern draft="unconfirmed">Йи{0}</unitPrefixPattern>
-			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="unconfirmed">g</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
-			</unit>
-			<unit type="acceleration-meter-per-square-second">
-				<displayName draft="unconfirmed">м/ҫ²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м/ҫ²</unitPattern>
-			</unit>
-			<unit type="angle-revolution">
-				<displayName draft="unconfirmed">çавра</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çавра</unitPattern>
+				<unitPattern count="zero">{0} g</unitPattern>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="unconfirmed">рад</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} рад</unitPattern>
+				<displayName>рад</displayName>
+				<unitPattern count="zero">{0} рад</unitPattern>
+				<unitPattern count="one">{0} рад</unitPattern>
+				<unitPattern count="other">{0} рад</unitPattern>
 			</unit>
 			<unit type="angle-degree">
-				<displayName draft="unconfirmed">градус</displayName>
+				<unitPattern count="zero">{0}°</unitPattern>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName draft="unconfirmed">минут</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} минут</unitPattern>
+				<displayName>′</displayName>
+				<unitPattern count="zero">{0}′</unitPattern>
+				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName draft="unconfirmed">çеккунт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} çеккунт</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">км²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/км²</perUnitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="unconfirmed">га</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} га</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">м²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/м²</perUnitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">см²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} см²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/см²</perUnitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">ми²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ми²</perUnitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="unconfirmed">акр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} акр</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">ярд²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд²</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">фт²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фт²</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">дюйм²</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм²</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/дюйм²</perUnitPattern>
-			</unit>
-			<unit type="area-dunam">
-				<displayName draft="unconfirmed">дунам</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дунам</unitPattern>
+				<displayName>″</displayName>
+				<unitPattern count="zero">{0}″</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">кар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кар</unitPattern>
-			</unit>
-			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<displayName draft="unconfirmed">мг/дл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мг/дл</unitPattern>
-			</unit>
-			<unit type="concentr-millimole-per-liter">
-				<displayName draft="unconfirmed">ммоль/л</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ммоль/л</unitPattern>
+				<displayName>кар</displayName>
+				<unitPattern count="zero">{0} кар</unitPattern>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="concentr-item">
-				<displayName draft="unconfirmed">объект</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} объект</unitPattern>
+				<displayName>япала</displayName>
+				<unitPattern count="zero">{0} япала</unitPattern>
+				<unitPattern count="one">{0} япала</unitPattern>
+				<unitPattern count="other">{0} япала</unitPattern>
 			</unit>
-			<unit type="concentr-mole">
-				<displayName draft="unconfirmed">моль</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} моль</unitPattern>
+			<unit type="concentr-part">
+				<displayName>пай</displayName>
+				<unitPattern count="zero">{0} пай</unitPattern>
+				<unitPattern count="one">{0} пай</unitPattern>
+				<unitPattern count="other">{0} пай</unitPattern>
 			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="unconfirmed">л/км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л/км</unitPattern>
+			<unit type="concentr-part-per-1e6">
+				<displayName>млн⁻¹</displayName>
+				<unitPattern count="zero">{0} млн⁻¹</unitPattern>
+				<unitPattern count="one">{0} млн⁻¹</unitPattern>
+				<unitPattern count="other">{0} млн⁻¹</unitPattern>
 			</unit>
-			<unit type="consumption-liter-per-100-kilometer">
-				<displayName draft="unconfirmed">л/100 км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л/100 км</unitPattern>
+			<unit type="concentr-percent">
+				<unitPattern count="zero">{0} %</unitPattern>
+				<unitPattern count="one">{0} %</unitPattern>
+				<unitPattern count="other">{0} %</unitPattern>
 			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">ми/гал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми/гал</unitPattern>
+			<unit type="concentr-permille">
+				<unitPattern count="zero">{0} ‰</unitPattern>
+				<unitPattern count="one">{0} ‰</unitPattern>
+				<unitPattern count="other">{0} ‰</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<unitPattern count="zero">{0} ‱</unitPattern>
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} ‱</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Глк</displayName>
+				<unitPattern count="zero">{0} Глк</unitPattern>
+				<unitPattern count="one">{0} Глк</unitPattern>
+				<unitPattern count="other">{0} Глк</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName draft="unconfirmed">ми/имп. гал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми/имп. гал</unitPattern>
+				<displayName>ми/имп. гал</displayName>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName draft="unconfirmed">Пб</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Пб</unitPattern>
+				<displayName>ПБ</displayName>
+				<unitPattern count="zero">{0} Пбайт</unitPattern>
+				<unitPattern count="one">{0} Пбайт</unitPattern>
+				<unitPattern count="other">{0} ПБ</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">Тб</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Тб</unitPattern>
+				<displayName>ТБ</displayName>
+				<unitPattern count="zero">{0} Тбайт</unitPattern>
+				<unitPattern count="one">{0} Тбайт</unitPattern>
+				<unitPattern count="other">{0} ТБ</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">Тбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Тбит</unitPattern>
+				<displayName>Тб</displayName>
+				<unitPattern count="zero">{0} Тбит</unitPattern>
+				<unitPattern count="one">{0} Тбит</unitPattern>
+				<unitPattern count="other">{0} Тб</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">Гб</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Гб</unitPattern>
+				<displayName>ГБ</displayName>
+				<unitPattern count="zero">{0} Гбайт</unitPattern>
+				<unitPattern count="one">{0} Гбайт</unitPattern>
+				<unitPattern count="other">{0} ГБ</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">Гбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Гбит</unitPattern>
+				<displayName>Гб</displayName>
+				<unitPattern count="zero">{0} Гбит</unitPattern>
+				<unitPattern count="one">{0} Гбит</unitPattern>
+				<unitPattern count="other">{0} Гб</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">Мб</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мб</unitPattern>
+				<displayName>МБ</displayName>
+				<unitPattern count="zero">{0} Мбайт</unitPattern>
+				<unitPattern count="one">{0} Мбайт</unitPattern>
+				<unitPattern count="other">{0} МБ</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">Мбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мбит</unitPattern>
+				<displayName>Мб</displayName>
+				<unitPattern count="zero">{0} Мбит</unitPattern>
+				<unitPattern count="one">{0} Мбит</unitPattern>
+				<unitPattern count="other">{0} Мб</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">Кб</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Кб</unitPattern>
+				<displayName>кБ</displayName>
+				<unitPattern count="zero">{0} кбайт</unitPattern>
+				<unitPattern count="one">{0} кбайт</unitPattern>
+				<unitPattern count="other">{0} кБ</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">кбит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кбит</unitPattern>
+				<displayName>кб</displayName>
+				<unitPattern count="zero">{0} кбит</unitPattern>
+				<unitPattern count="one">{0} кбит</unitPattern>
+				<unitPattern count="other">{0} кб</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<displayName draft="unconfirmed">Б</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Б</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<displayName draft="unconfirmed">бит</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бит</unitPattern>
-			</unit>
-			<unit type="duration-century">
-				<displayName draft="unconfirmed">ӗмӗр</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ӗмӗр</unitPattern>
+				<displayName>Б</displayName>
+				<unitPattern count="zero">{0} байт</unitPattern>
+				<unitPattern count="one">{0} байт</unitPattern>
+				<unitPattern count="other">{0} Б</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">внҫл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} внҫл</unitPattern>
+				<displayName>вунӑ ҫ.</displayName>
+				<unitPattern count="zero">{0} вунӑ ҫ.</unitPattern>
+				<unitPattern count="one">{0} вунӑ ҫ.</unitPattern>
+				<unitPattern count="other">{0} вунӑ ҫ.</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">ҫул.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫул.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫул</perUnitPattern>
+				<displayName>ҫул</displayName>
+				<unitPattern count="zero">{0} ҫул</unitPattern>
+				<unitPattern count="one">{0} ҫул</unitPattern>
+				<unitPattern count="other">{0} ҫул</unitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName draft="unconfirmed">чрк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чрк</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/чрк</perUnitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">уйӑх</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} уйӑх</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/уйӑх</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">эрн.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эрн.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/эрн.</perUnitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">к.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} к.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/к.</perUnitPattern>
+				<displayName>чӗр.</displayName>
+				<unitPattern count="zero">{0} чӗр.</unitPattern>
+				<unitPattern count="one">{0} чӗр.</unitPattern>
+				<unitPattern count="other">{0} чӗр.</unitPattern>
+				<perUnitPattern>{0}/чӗр.</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">схт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} схт</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/схт</perUnitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="unconfirmed">мин</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мин</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/мин</perUnitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="unconfirmed">ҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫ</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫ</perUnitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">мҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мҫ</unitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">мкҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мкҫ</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">нҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} нҫ</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">А</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} А</unitPattern>
-			</unit>
-			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">мА</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мА</unitPattern>
-			</unit>
-			<unit type="electric-ohm">
-				<displayName draft="unconfirmed">Ом</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Ом</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<displayName draft="unconfirmed">В</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} В</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="unconfirmed">ккал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ккал</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName draft="unconfirmed">кал</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кал</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName draft="unconfirmed">кДж</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кДж</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName draft="unconfirmed">Дж</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Дж</unitPattern>
+				<displayName>сех</displayName>
+				<unitPattern count="zero">{0} сех</unitPattern>
+				<unitPattern count="one">{0} сех</unitPattern>
+				<unitPattern count="other">{0} сех</unitPattern>
+				<perUnitPattern>{0}/сех</perUnitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">КВт⋅схт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} КВт⋅схт</unitPattern>
-			</unit>
-			<unit type="energy-electronvolt">
-				<displayName draft="unconfirmed">эВ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эВ</unitPattern>
+				<displayName>кВт⋅сех</displayName>
+				<unitPattern count="zero">{0} кВт⋅сех</unitPattern>
+				<unitPattern count="one">{0} кВт⋅сех</unitPattern>
+				<unitPattern count="other">{0} кВт⋅сех</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
-				<displayName draft="unconfirmed">БӐЕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} БӐЕ</unitPattern>
+				<displayName>БӐВ</displayName>
+				<unitPattern count="zero">{0} БӐВ</unitPattern>
+				<unitPattern count="one">{0} БӐВ</unitPattern>
+				<unitPattern count="other">{0} БӐВ</unitPattern>
 			</unit>
 			<unit type="energy-therm-us">
-				<displayName draft="unconfirmed">АПШ терм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} АПШ терм</unitPattern>
+				<displayName>АПШ термӗ</displayName>
+				<unitPattern count="zero">{0} АПШ термӗ</unitPattern>
+				<unitPattern count="one">{0} АПШ термӗ</unitPattern>
+				<unitPattern count="other">{0} АПШ термӗ</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
-				<displayName draft="unconfirmed">крнк-вăй</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} крнк-вăй</unitPattern>
-			</unit>
-			<unit type="force-newton">
-				<displayName draft="unconfirmed">Н</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Н</unitPattern>
+				<displayName>фнтв</displayName>
+				<unitPattern count="zero">{0} фнтв</unitPattern>
+				<unitPattern count="one">{0} фнтв</unitPattern>
+				<unitPattern count="other">{0} фнтв</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName draft="unconfirmed">кВт⋅ч/100 км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кВт⋅ч/100 км</unitPattern>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">ГГц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ГГц</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">МГц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} МГц</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">кГц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кГц</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="unconfirmed">Гц</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Гц</unitPattern>
-			</unit>
-			<unit type="graphics-em">
-				<displayName draft="unconfirmed">эм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} эм</unitPattern>
+				<displayName>кВт⋅сех/100 км</displayName>
+				<unitPattern count="zero">{0} кВт⋅сех/100 км</unitPattern>
+				<unitPattern count="one">{0} кВт⋅сех/100 км</unitPattern>
+				<unitPattern count="other">{0} кВт⋅сех/100 км</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
-				<displayName draft="unconfirmed">пкс</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкс</unitPattern>
+				<displayName>пкс</displayName>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName draft="unconfirmed">Мпкс</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мпкс</unitPattern>
-			</unit>
-			<unit type="graphics-pixel-per-centimeter">
-				<displayName draft="unconfirmed">пкс/см</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкс/см</unitPattern>
-			</unit>
-			<unit type="graphics-pixel-per-inch">
-				<displayName draft="unconfirmed">пкс/дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкс/дюйм</unitPattern>
+				<displayName>Мпкс</displayName>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName draft="unconfirmed">ҫӗр р-сӗ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫӗр р-сӗ</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">км</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/км</perUnitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="unconfirmed">м</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/м</perUnitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">дм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дм</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">см</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} см</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/см</perUnitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">мм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мм</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">мкм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мкм</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">нм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} нм</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="unconfirmed">пм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пм</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">ми</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="unconfirmed">ярд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="unconfirmed">фт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фт</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/фт</perUnitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/дюйм</perUnitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">пк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пк</unitPattern>
+				<displayName>R⊕</displayName>
+				<unitPattern count="zero">{0} R⊕</unitPattern>
+				<unitPattern count="one">{0} R⊕</unitPattern>
+				<unitPattern count="other">{0} R⊕</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName draft="unconfirmed">ç.ç.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ç.ç.</unitPattern>
+				<displayName>ҫутӑ ҫулӗ</displayName>
+				<unitPattern count="zero">{0} ҫутӑ ҫулӗ</unitPattern>
+				<unitPattern count="one">{0} ҫутӑ ҫулӗ</unitPattern>
+				<unitPattern count="other">{0} ҫутӑ ҫулӗ</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">а.п.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} а.п.</unitPattern>
+				<displayName>а. в.</displayName>
+				<unitPattern count="zero">{0} а. в.</unitPattern>
+				<unitPattern count="one">{0} а. в.</unitPattern>
+				<unitPattern count="other">{0} а. в.</unitPattern>
 			</unit>
 			<unit type="length-furlong">
-				<displayName draft="unconfirmed">фрл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фрл</unitPattern>
+				<displayName>фрл</displayName>
 			</unit>
 			<unit type="length-fathom">
-				<displayName draft="unconfirmed">тнс.члш.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тнс.члш.</unitPattern>
+				<displayName>тинӗс хӑл.</displayName>
+				<unitPattern count="zero">{0} тинӗс хӑл.</unitPattern>
+				<unitPattern count="one">{0} тинӗс хӑл.</unitPattern>
+				<unitPattern count="other">{0} тинӗс хӑл.</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">тнс.ми</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тнс.ми</unitPattern>
+				<displayName>тинӗс ми</displayName>
+				<unitPattern count="zero">{0} тинӗс ми</unitPattern>
+				<unitPattern count="one">{0} тинӗс ми</unitPattern>
+				<unitPattern count="other">{0} тинӗс ми</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<displayName draft="unconfirmed">ск.ми</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ск.ми</unitPattern>
-			</unit>
-			<unit type="length-point">
-				<displayName draft="unconfirmed">пкт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пкт</unitPattern>
+				<displayName>ск. ми</displayName>
+				<unitPattern count="zero">{0} ск. ми</unitPattern>
+				<unitPattern count="one">{0} ск. ми</unitPattern>
+				<unitPattern count="other">{0} ск. ми</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName draft="unconfirmed">хӗвел р-с</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} хӗвел р-с</unitPattern>
-			</unit>
-			<unit type="light-lux">
-				<displayName draft="unconfirmed">лк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} лк</unitPattern>
-			</unit>
-			<unit type="light-candela">
-				<displayName draft="unconfirmed">кд</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кд</unitPattern>
-			</unit>
-			<unit type="light-lumen">
-				<displayName draft="unconfirmed">лм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} лм</unitPattern>
+				<displayName>R☉</displayName>
+				<unitPattern count="zero">{0} R☉</unitPattern>
+				<unitPattern count="one">{0} R☉</unitPattern>
+				<unitPattern count="other">{0} R☉</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName draft="unconfirmed">т</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} т</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">кг</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кг</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/кг</perUnitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">г</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} г</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/г</perUnitPattern>
-			</unit>
-			<unit type="mass-milligram">
-				<displayName draft="unconfirmed">мг</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мг</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">мкг</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мкг</unitPattern>
+				<displayName>т</displayName>
+				<unitPattern count="zero">{0} т</unitPattern>
+				<unitPattern count="one">{0} т</unitPattern>
+				<unitPattern count="other">{0} т</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<displayName draft="unconfirmed">амер. т</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} амер. т</unitPattern>
+				<displayName>ам. тонна</displayName>
+				<unitPattern count="zero">{0} ам. тонна</unitPattern>
+				<unitPattern count="one">{0} ам. тонна</unitPattern>
+				<unitPattern count="other">{0} ам. тонна</unitPattern>
 			</unit>
 			<unit type="mass-stone">
-				<displayName draft="unconfirmed">стн</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} стн</unitPattern>
+				<displayName>стн</displayName>
+				<unitPattern count="zero">{0} стн</unitPattern>
+				<unitPattern count="one">{0} стн</unitPattern>
+				<unitPattern count="other">{0} стн</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName draft="unconfirmed">крнк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} крнк</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/крнк</perUnitPattern>
-			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">унц.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} унц.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/унц.</perUnitPattern>
+				<displayName>фнт</displayName>
+				<unitPattern count="zero">{0} фнт</unitPattern>
+				<unitPattern count="one">{0} фнт</unitPattern>
+				<unitPattern count="other">{0} фнт</unitPattern>
+				<perUnitPattern>{0}/фнт</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">тр. унц.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тр. унц.</unitPattern>
+				<displayName>тр. унцийӗ</displayName>
+				<unitPattern count="zero">{0} тр. унц.</unitPattern>
+				<unitPattern count="one">{0} тр. унц.</unitPattern>
+				<unitPattern count="other">{0} тр. унц.</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName draft="unconfirmed">кар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кар</unitPattern>
+				<displayName>кар</displayName>
+				<unitPattern count="zero">{0} кар</unitPattern>
+				<unitPattern count="one">{0} кар</unitPattern>
+				<unitPattern count="other">{0} кар</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
-				<displayName draft="unconfirmed">Да</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Да</unitPattern>
+				<displayName>Да</displayName>
+				<unitPattern count="zero">{0} Да</unitPattern>
+				<unitPattern count="one">{0} Да</unitPattern>
+				<unitPattern count="other">{0} Да</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName draft="unconfirmed">Ҫӗр масси</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Ҫӗр масси</unitPattern>
+				<displayName>M⊕</displayName>
+				<unitPattern count="zero">{0} M⊕</unitPattern>
+				<unitPattern count="one">{0} M⊕</unitPattern>
+				<unitPattern count="other">{0} M⊕</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
-				<displayName draft="unconfirmed">Хӗвел масси</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Хӗвел масси</unitPattern>
-			</unit>
-			<unit type="mass-grain">
-				<displayName draft="unconfirmed">гран</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гран</unitPattern>
-			</unit>
-			<unit type="power-gigawatt">
-				<displayName draft="unconfirmed">ГВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ГВт</unitPattern>
+				<displayName>M☉</displayName>
+				<unitPattern count="zero">{0} M☉</unitPattern>
+				<unitPattern count="one">{0} M☉</unitPattern>
+				<unitPattern count="other">{0} M☉</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="unconfirmed">Мвт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} МВт</unitPattern>
+				<displayName>Мвт</displayName>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName draft="unconfirmed">КВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} КВт</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<displayName draft="unconfirmed">Вт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Вт</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="unconfirmed">мВт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мВт</unitPattern>
+				<displayName>кВт</displayName>
+				<unitPattern count="zero">{0} кВт</unitPattern>
+				<unitPattern count="one">{0} кВт</unitPattern>
+				<unitPattern count="other">{0} кВт</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<displayName draft="unconfirmed">л.в.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л.в.</unitPattern>
+				<displayName>л. в.</displayName>
+				<unitPattern count="zero">{0} л. в.</unitPattern>
+				<unitPattern count="one">{0} л. в.</unitPattern>
+				<unitPattern count="other">{0} л. в.</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName draft="unconfirmed">ч.ю. мм</displayName>
-				<unitPattern count="other" draft="unconfirmed">ч.ю. {0} мм</unitPattern>
+				<displayName>мм ч. к. ю.</displayName>
+				<unitPattern count="zero">{0} мм ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} мм ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} мм ч. к. ю.</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ч. к. ю.</displayName>
+				<unitPattern count="zero">{0} ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} ч. к. ю.</unitPattern>
+				<unitPattern count="other">{0} ч. к. ю.</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName draft="unconfirmed">дюйм² крнк</displayName>
-				<unitPattern count="other" draft="unconfirmed">дюйм² {0} крнк</unitPattern>
+				<displayName>фнтв/дюйм²</displayName>
+				<unitPattern count="zero">{0} фнтв/дюйм²</unitPattern>
+				<unitPattern count="one">{0} фнтв/дюйм²</unitPattern>
+				<unitPattern count="other">{0} фнтв/дюйм²</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName draft="unconfirmed">ч.ю. дюйм</displayName>
-				<unitPattern count="other" draft="unconfirmed">ч.ю. {0} дюйм</unitPattern>
-			</unit>
-			<unit type="pressure-bar">
-				<displayName draft="unconfirmed">бар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} бар</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">мбар</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мбар</unitPattern>
+				<displayName>дюйм ч. к. ю.</displayName>
+				<unitPattern count="zero">{0} дюйм ч. к. ю.</unitPattern>
+				<unitPattern count="one">{0} дюйм ч. к. ю.</unitPattern>
+				<unitPattern count="other">ч.ю. {0} дюйм</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
-				<displayName draft="unconfirmed">атм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} атм</unitPattern>
-			</unit>
-			<unit type="pressure-pascal">
-				<displayName draft="unconfirmed">Па</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Па</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="unconfirmed">гПа</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гПа</unitPattern>
-			</unit>
-			<unit type="pressure-kilopascal">
-				<displayName draft="unconfirmed">кПа</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кПа</unitPattern>
-			</unit>
-			<unit type="pressure-megapascal">
-				<displayName draft="unconfirmed">МПа</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} МПа</unitPattern>
+				<displayName>атм</displayName>
+				<unitPattern count="zero">{0} атм</unitPattern>
+				<unitPattern count="one">{0} атм</unitPattern>
+				<unitPattern count="other">{0} атм</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">км/схт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км/схт</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName draft="unconfirmed">м/ҫ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м/ҫ</unitPattern>
+				<displayName>км/сех</displayName>
+				<unitPattern count="zero">{0} км/сех</unitPattern>
+				<unitPattern count="one">{0} км/сех</unitPattern>
+				<unitPattern count="other">{0} км/сех</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">ми/схт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми/схт</unitPattern>
+				<displayName>ми/сех</displayName>
+				<unitPattern count="zero">{0} ми/сех</unitPattern>
+				<unitPattern count="one">{0} ми/сех</unitPattern>
+				<unitPattern count="other">{0} ми/сех</unitPattern>
 			</unit>
 			<unit type="speed-knot">
-				<displayName draft="unconfirmed">тĕвĕ</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тĕвĕ</unitPattern>
+				<displayName>уз</displayName>
+				<unitPattern count="zero">{0} уз</unitPattern>
+				<unitPattern count="one">{0} уз</unitPattern>
+				<unitPattern count="other">{0} уз</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName draft="unconfirmed">Бфт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Бфт</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">К</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} К</unitPattern>
+				<displayName>Бфт</displayName>
+				<unitPattern count="zero">{0} Бфт</unitPattern>
+				<unitPattern count="one">{0} Бфт</unitPattern>
+				<unitPattern count="other">{0} Бфт</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
-				<displayName draft="unconfirmed">крнк-фт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} крнк-фт</unitPattern>
-			</unit>
-			<unit type="torque-newton-meter">
-				<displayName draft="unconfirmed">Н⋅м</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Н⋅м</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="unconfirmed">км³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} км³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="unconfirmed">м³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} м³</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/м³</perUnitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="unconfirmed">см³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} см³</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/см³</perUnitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="unconfirmed">ми³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ми³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName draft="unconfirmed">ярд³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ярд³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="unconfirmed">фт³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} фт³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="unconfirmed">дюйм³</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дюйм³</unitPattern>
+				<displayName>фнтв⋅фт</displayName>
+				<unitPattern count="zero">{0} фнтв⋅фт</unitPattern>
+				<unitPattern count="one">{0} фнтв⋅фт</unitPattern>
+				<unitPattern count="other">{0} фнтв⋅фт</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="unconfirmed">Мл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Мл</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="unconfirmed">гл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гл</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">л</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} л</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/л</perUnitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">дл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} дл</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="unconfirmed">сл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} сл</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="unconfirmed">мл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мл</unitPattern>
-			</unit>
-			<unit type="volume-pint-metric">
-				<displayName draft="unconfirmed">мпт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} мпт</unitPattern>
+				<displayName>Мл</displayName>
+				<unitPattern count="zero">{0} Мл</unitPattern>
+				<unitPattern count="one">{0} Мл</unitPattern>
+				<unitPattern count="other">{0} Мл</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
-				<displayName draft="unconfirmed">крк-мтрл</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} крк-мтрл</unitPattern>
+				<displayName>м. курка</displayName>
+				<unitPattern count="zero">{0} м. курка</unitPattern>
+				<unitPattern count="one">{0} м. курка</unitPattern>
+				<unitPattern count="other">{0} м. курка</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м. шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} м. шӗвӗ унци</unitPattern>
+				<unitPattern count="one">{0} м. шӗвӗ унци</unitPattern>
+				<unitPattern count="other">{0} м. шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">акр-фт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} акр-фт</unitPattern>
+				<displayName>акр-фт</displayName>
+				<unitPattern count="zero">{0} акр-фт</unitPattern>
+				<unitPattern count="one">{0} акр-фт</unitPattern>
+				<unitPattern count="other">{0} акр-фт</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">буш.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} буш.</unitPattern>
+				<displayName>бушель</displayName>
+				<unitPattern count="zero">{0} бушель</unitPattern>
+				<unitPattern count="one">{0} бушель</unitPattern>
+				<unitPattern count="other">{0} бушель</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="unconfirmed">гал.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} гал.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/гал.</perUnitPattern>
+				<displayName>ам. гал.</displayName>
+				<unitPattern count="zero">{0} ам. гал.</unitPattern>
+				<unitPattern count="one">{0} ам. гал.</unitPattern>
+				<unitPattern count="other">{0} ам. гал.</unitPattern>
+				<perUnitPattern>{0}/ам. гал.</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<displayName draft="unconfirmed">имп.гал.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} имп.гал.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/имп.гал.</perUnitPattern>
+				<displayName>имп. гал.</displayName>
+				<unitPattern count="zero">{0} имп. гал.</unitPattern>
+				<unitPattern count="one">{0} имп. гал.</unitPattern>
+				<unitPattern count="other">{0} имп. гал.</unitPattern>
+				<perUnitPattern>{0}/имп. гал.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="unconfirmed">кварт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} кварт</unitPattern>
+				<displayName>ам. кварт</displayName>
+				<unitPattern count="zero">{0} ам. кварт</unitPattern>
+				<unitPattern count="one">{0} ам. кварт</unitPattern>
+				<unitPattern count="other">{0} ам. кварт</unitPattern>
 			</unit>
 			<unit type="volume-pint">
-				<displayName draft="unconfirmed">пинт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} пинт</unitPattern>
+				<displayName>ам. пинт</displayName>
+				<unitPattern count="zero">{0} ам. пинт</unitPattern>
+				<unitPattern count="one">{0} ам. пинт</unitPattern>
+				<unitPattern count="other">{0} ам. пинт</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>имп. пинт</displayName>
+				<unitPattern count="zero">{0} имп. пинт</unitPattern>
+				<unitPattern count="one">{0} имп. пинт</unitPattern>
+				<unitPattern count="other">{0} имп. пинт</unitPattern>
 			</unit>
 			<unit type="volume-cup">
-				<displayName draft="unconfirmed">чашӑк</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чашӑк</unitPattern>
+				<displayName>ам. курка</displayName>
+				<unitPattern count="zero">{0} ам. курка</unitPattern>
+				<unitPattern count="one">{0} ам. курка</unitPattern>
+				<unitPattern count="other">{0} ам. курка</unitPattern>
+			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>имп. курка</displayName>
+				<unitPattern count="zero">{0} имп. курка</unitPattern>
+				<unitPattern count="one">{0} имп. курка</unitPattern>
+				<unitPattern count="other">{0} имп. курка</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
-				<displayName draft="unconfirmed">шӗвӗ унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} шӗвӗ унци</unitPattern>
+				<displayName>ам. шӗвӗ унци</displayName>
+				<unitPattern count="zero">{0} ам. шӗвӗ унци</unitPattern>
+				<unitPattern count="one">{0} ам. шӗвӗ унци</unitPattern>
+				<unitPattern count="other">{0} ам. шӗвӗ унци</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName draft="unconfirmed">имп.шӗвӗ унци</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} импери шӗвӗ унци</unitPattern>
+				<displayName>имп. шӗвӗ унц.</displayName>
+				<unitPattern count="zero">{0} имп. шӗвӗ унц.</unitPattern>
+				<unitPattern count="one">{0} имп. шӗвӗ унц.</unitPattern>
+				<unitPattern count="other">{0} имп. шӗвӗ унц.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="unconfirmed">апт.кшк.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} апт.кшк.</unitPattern>
+				<displayName>апат каш.</displayName>
+				<unitPattern count="zero">{0} апат каш.</unitPattern>
+				<unitPattern count="one">{0} апат каш.</unitPattern>
+				<unitPattern count="other">{0} апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="unconfirmed">ч.кшк.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ч.кшк.</unitPattern>
-			</unit>
-			<unit type="volume-barrel">
-				<displayName draft="unconfirmed">барр.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} барр.</unitPattern>
+				<displayName>чей каш.</displayName>
+				<unitPattern count="zero">{0} чей каш.</unitPattern>
+				<unitPattern count="one">{0} чей каш.</unitPattern>
+				<unitPattern count="other">{0} чей каш.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName draft="unconfirmed">плк.апат кшк.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} плк.апат кшк.</unitPattern>
+				<displayName>пыл. апат каш.</displayName>
+				<unitPattern count="zero">{0} пыл. апат каш.</unitPattern>
+				<unitPattern count="one">{0} пыл. апат каш.</unitPattern>
+				<unitPattern count="other">{0} пыл. апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<displayName draft="unconfirmed">имп.плк. апат кшк.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} имп.плк.апат кшк.</unitPattern>
+				<displayName>имп. пыл. апат каш.</displayName>
+				<unitPattern count="zero">{0} имп. пыл. апат каш.</unitPattern>
+				<unitPattern count="one">{0} имп. пыл. апат каш.</unitPattern>
+				<unitPattern count="other">{0} имп. пыл. апат каш.</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<displayName draft="unconfirmed">тмлм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} тмлм</unitPattern>
+				<displayName>тумл.</displayName>
+				<unitPattern count="zero">{0} тумл.</unitPattern>
+				<unitPattern count="one">{0} тумл.</unitPattern>
+				<unitPattern count="other">{0} тумл.</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName draft="unconfirmed">шĕвĕ др.</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} шĕвĕ др.</unitPattern>
-			</unit>
-			<unit type="volume-jigger">
-				<displayName draft="unconfirmed">чӗркке</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чӗркке</unitPattern>
+				<displayName>шӗвӗ др.</displayName>
+				<unitPattern count="zero">{0} шӗвӗ др.</unitPattern>
+				<unitPattern count="one">{0} шӗвӗ др.</unitPattern>
+				<unitPattern count="other">{0} шӗвӗ др.</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
-				<displayName draft="unconfirmed">чптм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} чптм</unitPattern>
+				<displayName>чӗпт.</displayName>
+				<unitPattern count="zero">{0} чӗпт.</unitPattern>
+				<unitPattern count="one">{0} чӗпт.</unitPattern>
+				<unitPattern count="other">{0} чӗпт.</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
-				<displayName draft="unconfirmed">имп.кварт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} имп.кварт</unitPattern>
+				<displayName>имп. кварт</displayName>
+				<unitPattern count="zero">{0} имп. кварт</unitPattern>
+				<unitPattern count="one">{0} имп. кварт</unitPattern>
+				<unitPattern count="other">{0} имп. кварт</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="zero">{0} ср</unitPattern>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="zero">{0} кат</unitPattern>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="zero">{0} Кл</unitPattern>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="zero">{0} Ф</unitPattern>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="zero">{0} Гн</unitPattern>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="zero">{0} См</unitPattern>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>кал-IT</displayName>
+				<unitPattern count="zero">{0} кал-IT</unitPattern>
+				<unitPattern count="one">{0} кал-IT</unitPattern>
+				<unitPattern count="other">{0} кал-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>БӐВ-IT</displayName>
+				<unitPattern count="zero">{0} БӐВ-IT</unitPattern>
+				<unitPattern count="one">{0} БӐВ-IT</unitPattern>
+				<unitPattern count="other">{0} БӐВ-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="zero">{0} Бк</unitPattern>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="zero">{0} Зв</unitPattern>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="zero">{0} Гр</unitPattern>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгв</displayName>
+				<unitPattern count="zero">{0} кгв</unitPattern>
+				<unitPattern count="one">{0} кгв</unitPattern>
+				<unitPattern count="other">{0} кгв</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>род</displayName>
+				<unitPattern count="zero">{0} род</unitPattern>
+				<unitPattern count="one">{0} род</unitPattern>
+				<unitPattern count="other">{0} род</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>чейн</displayName>
+				<unitPattern count="zero">{0} чейн</unitPattern>
+				<unitPattern count="one">{0} чейн</unitPattern>
+				<unitPattern count="other">{0} чейн</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="zero">{0} Тл</unitPattern>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="zero">{0} Вб</unitPattern>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<unitPattern count="zero">{0} °R</unitPattern>
+				<unitPattern count="one">{0} °R</unitPattern>
+				<unitPattern count="other">{0} °R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>икӗ эрн.</displayName>
+				<unitPattern count="zero">{0} икӗ эрн.</unitPattern>
+				<unitPattern count="one">{0} икӗ эрн.</unitPattern>
+				<unitPattern count="other">{0} икӗ эрн.</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>слаг</displayName>
+				<unitPattern count="zero">{0} слаг</unitPattern>
+				<unitPattern count="one">{0} слаг</unitPattern>
+				<unitPattern count="other">{0} слаг</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>бенз. тан.</displayName>
+				<unitPattern count="zero">{0} бенз. тан.</unitPattern>
+				<unitPattern count="one">{0} бенз. тан.</unitPattern>
+				<unitPattern count="other">{0} бенз. тан.</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>рин</displayName>
+				<unitPattern count="zero">{0} рин</unitPattern>
+				<unitPattern count="one">{0} рин</unitPattern>
+				<unitPattern count="other">{0} рин</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>сун</displayName>
+				<unitPattern count="zero">{0} сун</unitPattern>
+				<unitPattern count="one">{0} сун</unitPattern>
+				<unitPattern count="other">{0} сун</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>сяку</displayName>
+				<unitPattern count="zero">{0} сяку</unitPattern>
+				<unitPattern count="one">{0} сяку</unitPattern>
+				<unitPattern count="other">{0} сяку</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>кудзирадзяку</displayName>
+				<unitPattern count="zero">{0} кудзирадзяку</unitPattern>
+				<unitPattern count="one">{0} кудзирадзяку</unitPattern>
+				<unitPattern count="other">{0} кудзирадзяку</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>кэн</displayName>
+				<unitPattern count="zero">{0} кэн</unitPattern>
+				<unitPattern count="one">{0} кэн</unitPattern>
+				<unitPattern count="other">{0} кэн</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>дзё</displayName>
+				<unitPattern count="zero">{0} дзё</unitPattern>
+				<unitPattern count="one">{0} дзё</unitPattern>
+				<unitPattern count="other">{0} дзё</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ри</displayName>
+				<unitPattern count="zero">{0} ри</unitPattern>
+				<unitPattern count="one">{0} ри</unitPattern>
+				<unitPattern count="other">{0} ри</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>бу</displayName>
+				<unitPattern count="zero">{0} бу</unitPattern>
+				<unitPattern count="one">{0} бу</unitPattern>
+				<unitPattern count="other">{0} бу</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>сэ</displayName>
+				<unitPattern count="zero">{0} сэ</unitPattern>
+				<unitPattern count="one">{0} сэ</unitPattern>
+				<unitPattern count="other">{0} сэ</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>тё</displayName>
+				<unitPattern count="zero">{0} тё</unitPattern>
+				<unitPattern count="one">{0} тё</unitPattern>
+				<unitPattern count="other">{0} тё</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>косадзи</displayName>
+				<unitPattern count="zero">{0} косадзи</unitPattern>
+				<unitPattern count="one">{0} косадзи</unitPattern>
+				<unitPattern count="other">{0} косадзи</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>осадзи</displayName>
+				<unitPattern count="zero">{0} осадзи</unitPattern>
+				<unitPattern count="one">{0} осадзи</unitPattern>
+				<unitPattern count="other">{0} осадзи</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>каппу</displayName>
+				<unitPattern count="zero">{0} каппу</unitPattern>
+				<unitPattern count="one">{0} каппу</unitPattern>
+				<unitPattern count="other">{0} каппу</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>секи</displayName>
+				<unitPattern count="zero">{0} секи</unitPattern>
+				<unitPattern count="one">{0} секи</unitPattern>
+				<unitPattern count="other">{0} секи</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>сай</displayName>
+				<unitPattern count="zero">{0} сай</unitPattern>
+				<unitPattern count="one">{0} сай</unitPattern>
+				<unitPattern count="other">{0} сай</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>то</displayName>
+				<unitPattern count="zero">{0} то</unitPattern>
+				<unitPattern count="one">{0} то</unitPattern>
+				<unitPattern count="other">{0} то</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>коку</displayName>
+				<unitPattern count="zero">{0} коку</unitPattern>
+				<unitPattern count="one">{0} коку</unitPattern>
+				<unitPattern count="other">{0} коку</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName draft="unconfirmed">ҫутӑ хврт</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫутӑ хврт</unitPattern>
+				<displayName>ҫутӑ</displayName>
+				<unitPattern count="zero">{0} ҫутӑ</unitPattern>
+				<unitPattern count="one">{0} ҫутӑ</unitPattern>
+				<unitPattern count="other">{0} ҫутӑ</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>фун</displayName>
+				<unitPattern count="zero">{0} фун</unitPattern>
+				<unitPattern count="one">{0} фун</unitPattern>
+				<unitPattern count="other">{0} фун</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>млрд⁻¹</displayName>
+				<unitPattern count="zero">{0} млрд⁻¹</unitPattern>
+				<unitPattern count="one">{0} млрд⁻¹</unitPattern>
+				<unitPattern count="other">{0} млрд⁻¹</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName draft="unconfirmed">ҫрсм</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ҫрсм</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ҫӗр</perUnitPattern>
+				<displayName>каҫ</displayName>
+				<unitPattern count="zero">{0} каҫ</unitPattern>
+				<unitPattern count="one">{0} каҫ</unitPattern>
+				<unitPattern count="other">{0} каҫ</unitPattern>
+				<perUnitPattern>{0}/каҫ</perUnitPattern>
 			</unit>
+			<coordinateUnit>
+				<displayName>ен</displayName>
+				<coordinateUnitPattern type="east">т. е. {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">ҫ. е. {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">к. е. {0}</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">а. е. {0}</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 	</units>
 	<listPatterns>
@@ -10378,327 +16813,326 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</listPatterns>
 	<posix>
 		<messages>
-			<yesstr draft="unconfirmed">çапла</yesstr>
-			<nostr draft="unconfirmed">ҫук</nostr>
+			<yesstr>ҫапла:а</yesstr>
+			<nostr>ҫук:ҫ</nostr>
 		</messages>
 	</posix>
 	<characterLabels>
-		<characterLabelPattern type="all" draft="unconfirmed">{0} — пурте</characterLabelPattern>
-		<characterLabelPattern type="compatibility" draft="unconfirmed">{0} — пӗрлӗх</characterLabelPattern>
-		<characterLabelPattern type="enclosed" draft="unconfirmed">{0} — хупӑ</characterLabelPattern>
-		<characterLabelPattern type="extended" draft="unconfirmed">{0} — анлӑлан</characterLabelPattern>
-		<characterLabelPattern type="facing-left" draft="unconfirmed">{0} сулахаялла</characterLabelPattern>
-		<characterLabelPattern type="facing-right" draft="unconfirmed">{0} сылтӑмалла</characterLabelPattern>
-		<characterLabelPattern type="historic" draft="unconfirmed">{0} — истори</characterLabelPattern>
-		<characterLabelPattern type="miscellaneous" draft="unconfirmed">{0} — тӗрлӗрен</characterLabelPattern>
-		<characterLabelPattern type="other" draft="unconfirmed">{0} — ыттисем</characterLabelPattern>
-		<characterLabelPattern type="scripts" draft="unconfirmed">сӗрме купӑссем — {0}</characterLabelPattern>
-		<characterLabelPattern type="strokes" count="other" draft="unconfirmed">{0} штриха</characterLabelPattern>
-		<characterLabelPattern type="subscript" draft="unconfirmed">сроклӑ индекс {0}</characterLabelPattern>
-		<characterLabelPattern type="superscript" draft="unconfirmed">ҫӳлти индекс {0}</characterLabelPattern>
-		<characterLabel type="activities" draft="unconfirmed">активлӑх</characterLabel>
-		<characterLabel type="african_scripts" draft="unconfirmed">Африка ҫырулӑхӗ</characterLabel>
-		<characterLabel type="american_scripts" draft="unconfirmed">Америка ҫырулӑхӗ</characterLabel>
-		<characterLabel type="animal" draft="unconfirmed">выльӑх</characterLabel>
-		<characterLabel type="animals_nature" draft="unconfirmed">выльӑх е ҫутҫанталӑк</characterLabel>
-		<characterLabel type="arrows" draft="unconfirmed">стрелка</characterLabel>
-		<characterLabel type="body" draft="unconfirmed">ӳт-пӳ</characterLabel>
-		<characterLabel type="box_drawing" draft="unconfirmed">тӳркӗтеслӗх</characterLabel>
-		<characterLabel type="braille" draft="unconfirmed">Брайль шрифчӗпе</characterLabel>
-		<characterLabel type="building" draft="unconfirmed">ҫурт</characterLabel>
-		<characterLabel type="bullets_stars" draft="unconfirmed">пуля е ҫӑлтӑр</characterLabel>
-		<characterLabel type="consonantal_jamo" draft="unconfirmed">хупӑ та уҫӑ сасӑсем</characterLabel>
-		<characterLabel type="currency_symbols" draft="unconfirmed">валюта символӗ</characterLabel>
-		<characterLabel type="dash_connector" draft="unconfirmed">тире е соединитель</characterLabel>
-		<characterLabel type="digits" draft="unconfirmed">цифра</characterLabel>
-		<characterLabel type="dingbats" draft="unconfirmed">дингбат</characterLabel>
-		<characterLabel type="divination_symbols" draft="unconfirmed">юмӑҫ символӗ</characterLabel>
-		<characterLabel type="downwards_arrows" draft="unconfirmed">йӗппи аялалла</characterLabel>
-		<characterLabel type="downwards_upwards_arrows" draft="unconfirmed">йӗппи аялалла ҫӳлелле</characterLabel>
-		<characterLabel type="east_asian_scripts" draft="unconfirmed">Тухӑҫ алфавичӗ</characterLabel>
-		<characterLabel type="emoji" draft="unconfirmed">эмодзи</characterLabel>
-		<characterLabel type="european_scripts" draft="unconfirmed">Европа ҫырулӑхӗ</characterLabel>
-		<characterLabel type="female" draft="unconfirmed">хӗрарӑм</characterLabel>
-		<characterLabel type="flag" draft="unconfirmed">ялав</characterLabel>
-		<characterLabel type="flags" draft="unconfirmed">ялавсем</characterLabel>
-		<characterLabel type="food_drink" draft="unconfirmed">ҫимелли</characterLabel>
-		<characterLabel type="format" draft="unconfirmed">формат</characterLabel>
-		<characterLabel type="format_whitespace" draft="unconfirmed">форматпа пробелӑсем</characterLabel>
-		<characterLabel type="full_width_form_variant" draft="unconfirmed">экран сарлакӑшӗ</characterLabel>
-		<characterLabel type="geometric_shapes" draft="unconfirmed">геометри форми</characterLabel>
-		<characterLabel type="half_width_form_variant" draft="unconfirmed">сарлакӑшӗ ҫурри</characterLabel>
-		<characterLabel type="han_characters" draft="unconfirmed">Хань иероглифӗсем</characterLabel>
-		<characterLabel type="han_radicals" draft="unconfirmed">Радикал (китай иероглифӗсем)</characterLabel>
-		<characterLabel type="hanja" draft="unconfirmed">ханча</characterLabel>
-		<characterLabel type="hanzi_simplified" draft="unconfirmed">Ханзи (ансатланнӑ)</characterLabel>
-		<characterLabel type="hanzi_traditional" draft="unconfirmed">Ханзи (йӑлана кӗнӗ)</characterLabel>
-		<characterLabel type="heart" draft="unconfirmed">чӗре</characterLabel>
-		<characterLabel type="historic_scripts" draft="unconfirmed">историлле шрифт</characterLabel>
-		<characterLabel type="ideographic_desc_characters" draft="unconfirmed">идеографи сӑнав палли</characterLabel>
-		<characterLabel type="japanese_kana" draft="unconfirmed">Япони канӗ</characterLabel>
-		<characterLabel type="kanbun" draft="unconfirmed">камбун (китай ҫырӑвӗ)</characterLabel>
-		<characterLabel type="kanji" draft="unconfirmed">кандзи (иероглиф)</characterLabel>
-		<characterLabel type="keycap" draft="unconfirmed">брелок</characterLabel>
-		<characterLabel type="leftwards_arrows" draft="unconfirmed">стрелка сулахаялла</characterLabel>
-		<characterLabel type="leftwards_rightwards_arrows" draft="unconfirmed">стрелка сулахаялла сылтӑмалла</characterLabel>
-		<characterLabel type="letterlike_symbols" draft="unconfirmed">саспалли символӗ</characterLabel>
-		<characterLabel type="limited_use" draft="unconfirmed">пӳлӗнчӗк усӑ курни</characterLabel>
-		<characterLabel type="male" draft="unconfirmed">арҫын</characterLabel>
-		<characterLabel type="math_symbols" draft="unconfirmed">математика символӗ</characterLabel>
-		<characterLabel type="middle_eastern_scripts" draft="unconfirmed">Ҫывӑх Хӗвелтухӑҫ чӗлхисем</characterLabel>
-		<characterLabel type="miscellaneous" draft="unconfirmed">тӗрлӗрен</characterLabel>
-		<characterLabel type="modern_scripts" draft="unconfirmed">хальхи шрифт</characterLabel>
-		<characterLabel type="modifier" draft="unconfirmed">модификатор</characterLabel>
-		<characterLabel type="musical_symbols" draft="unconfirmed">музыка символӗ</characterLabel>
-		<characterLabel type="nature" draft="unconfirmed">ҫутҫанталӑк</characterLabel>
-		<characterLabel type="nonspacing" draft="unconfirmed">пробелӑсӑр</characterLabel>
-		<characterLabel type="numbers" draft="unconfirmed">цифрӑсем</characterLabel>
-		<characterLabel type="objects" draft="unconfirmed">объект</characterLabel>
-		<characterLabel type="other" draft="unconfirmed">урӑх</characterLabel>
-		<characterLabel type="paired" draft="unconfirmed">мӑшӑр</characterLabel>
-		<characterLabel type="person" draft="unconfirmed">ҫын</characterLabel>
-		<characterLabel type="phonetic_alphabet" draft="unconfirmed">фонетика алфавичӗ</characterLabel>
-		<characterLabel type="pictographs" draft="unconfirmed">пиктограмма</characterLabel>
-		<characterLabel type="place" draft="unconfirmed">вырӑн</characterLabel>
-		<characterLabel type="plant" draft="unconfirmed">ӳсентӑран</characterLabel>
-		<characterLabel type="punctuation" draft="unconfirmed">пунктуаци</characterLabel>
-		<characterLabel type="rightwards_arrows" draft="unconfirmed">стрелка сылтӑмалла</characterLabel>
-		<characterLabel type="sign_standard_symbols" draft="unconfirmed">символ е паллӑ</characterLabel>
-		<characterLabel type="small_form_variant" draft="unconfirmed">пӗчӗк вариантсем</characterLabel>
-		<characterLabel type="smiley" draft="unconfirmed">смайлик</characterLabel>
-		<characterLabel type="smileys_people" draft="unconfirmed">смайлик е ҫын</characterLabel>
-		<characterLabel type="south_asian_scripts" draft="unconfirmed">Кӑнтӑр Азири чӗлхесем</characterLabel>
-		<characterLabel type="southeast_asian_scripts" draft="unconfirmed">Кӑнтӑр-Хӗвелтухӑҫ Ази чӗлхисем</characterLabel>
-		<characterLabel type="spacing" draft="unconfirmed">интервал</characterLabel>
-		<characterLabel type="sport" draft="unconfirmed">спорт</characterLabel>
-		<characterLabel type="symbols" draft="unconfirmed">символ</characterLabel>
-		<characterLabel type="technical_symbols" draft="unconfirmed">техника символӗ</characterLabel>
-		<characterLabel type="tone_marks" draft="unconfirmed">тонна палли</characterLabel>
-		<characterLabel type="travel" draft="unconfirmed">ҫулҫӳрев</characterLabel>
-		<characterLabel type="travel_places" draft="unconfirmed">ҫулҫӳрев е вырӑн</characterLabel>
-		<characterLabel type="upwards_arrows" draft="unconfirmed">стрелоксем ҫӳлелле</characterLabel>
-		<characterLabel type="variant_forms" draft="unconfirmed">вариант</characterLabel>
-		<characterLabel type="vocalic_jamo" draft="unconfirmed">уҫӑ сасӑ</characterLabel>
-		<characterLabel type="weather" draft="unconfirmed">ҫанталӑк</characterLabel>
-		<characterLabel type="western_asian_scripts" draft="unconfirmed">Хӗвеланӑҫ Азири чӗлхесем</characterLabel>
-		<characterLabel type="whitespace" draft="unconfirmed">пробел</characterLabel>
+		<characterLabelPattern type="all">{0} — пурте</characterLabelPattern>
+		<characterLabelPattern type="compatibility">{0} — пӗрлӗх</characterLabelPattern>
+		<characterLabelPattern type="enclosed">{0} — хупӑ</characterLabelPattern>
+		<characterLabelPattern type="extended">{0} — анлӑлан</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} сулахаялла</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} сылтӑмалла</characterLabelPattern>
+		<characterLabelPattern type="historic">{0} — истори</characterLabelPattern>
+		<characterLabelPattern type="miscellaneous">{0} — тӗрлӗрен</characterLabelPattern>
+		<characterLabelPattern type="other">{0} — ыттисем</characterLabelPattern>
+		<characterLabelPattern type="scripts">сӗрме купӑссем — {0}</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="zero">{0} штриха</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="one">{0} штриха</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="other">{0} штриха</characterLabelPattern>
+		<characterLabelPattern type="subscript">сроклӑ индекс {0}</characterLabelPattern>
+		<characterLabelPattern type="superscript">ҫӳлти индекс {0}</characterLabelPattern>
+		<characterLabel type="activities">активлӑх</characterLabel>
+		<characterLabel type="african_scripts">Африка ҫырулӑхӗ</characterLabel>
+		<characterLabel type="american_scripts">Америка ҫырулӑхӗ</characterLabel>
+		<characterLabel type="animal">выльӑх</characterLabel>
+		<characterLabel type="animals_nature">выльӑх е ҫутҫанталӑк</characterLabel>
+		<characterLabel type="arrows">стрелка</characterLabel>
+		<characterLabel type="body">ӳт-пӳ</characterLabel>
+		<characterLabel type="box_drawing">тӳркӗтеслӗх</characterLabel>
+		<characterLabel type="braille">Брайль шрифчӗпе</characterLabel>
+		<characterLabel type="building">ҫурт</characterLabel>
+		<characterLabel type="bullets_stars">пуля е ҫӑлтӑр</characterLabel>
+		<characterLabel type="consonantal_jamo">хупӑ та уҫӑ сасӑсем</characterLabel>
+		<characterLabel type="currency_symbols">валюта символӗ</characterLabel>
+		<characterLabel type="dash_connector">тире е соединитель</characterLabel>
+		<characterLabel type="digits">цифра</characterLabel>
+		<characterLabel type="dingbats">дингбат</characterLabel>
+		<characterLabel type="divination_symbols">юмӑҫ символӗ</characterLabel>
+		<characterLabel type="downwards_arrows">йӗппи аялалла</characterLabel>
+		<characterLabel type="downwards_upwards_arrows">йӗппи аялалла ҫӳлелле</characterLabel>
+		<characterLabel type="east_asian_scripts">Тухӑҫ алфавичӗ</characterLabel>
+		<characterLabel type="emoji">эмодзи</characterLabel>
+		<characterLabel type="european_scripts">Европа ҫырулӑхӗ</characterLabel>
+		<characterLabel type="female">хӗрарӑм</characterLabel>
+		<characterLabel type="flag">ялав</characterLabel>
+		<characterLabel type="flags">ялавсем</characterLabel>
+		<characterLabel type="food_drink">ҫимелли</characterLabel>
+		<characterLabel type="format">формат</characterLabel>
+		<characterLabel type="format_whitespace">форматпа пробелӑсем</characterLabel>
+		<characterLabel type="full_width_form_variant">экран сарлакӑшӗ</characterLabel>
+		<characterLabel type="geometric_shapes">геометри форми</characterLabel>
+		<characterLabel type="half_width_form_variant">сарлакӑшӗ ҫурри</characterLabel>
+		<characterLabel type="han_characters">Хань иероглифӗсем</characterLabel>
+		<characterLabel type="han_radicals">Радикал (китай иероглифӗсем)</characterLabel>
+		<characterLabel type="hanja">ханча</characterLabel>
+		<characterLabel type="hanzi_simplified">Ханзи (ансатланнӑ)</characterLabel>
+		<characterLabel type="hanzi_traditional">Ханзи (йӑлана кӗнӗ)</characterLabel>
+		<characterLabel type="heart">чӗре</characterLabel>
+		<characterLabel type="historic_scripts">историлле шрифт</characterLabel>
+		<characterLabel type="ideographic_desc_characters">идеографи сӑнав палли</characterLabel>
+		<characterLabel type="japanese_kana">Япони канӗ</characterLabel>
+		<characterLabel type="kanbun">камбун (китай ҫырӑвӗ)</characterLabel>
+		<characterLabel type="kanji">кандзи (иероглиф)</characterLabel>
+		<characterLabel type="keycap">брелок</characterLabel>
+		<characterLabel type="leftwards_arrows">стрелка сулахаялла</characterLabel>
+		<characterLabel type="leftwards_rightwards_arrows">стрелка сулахаялла сылтӑмалла</characterLabel>
+		<characterLabel type="letterlike_symbols">саспалли символӗ</characterLabel>
+		<characterLabel type="limited_use">пӳлӗнчӗк усӑ курни</characterLabel>
+		<characterLabel type="male">арҫын</characterLabel>
+		<characterLabel type="math_symbols">математика символӗ</characterLabel>
+		<characterLabel type="middle_eastern_scripts">Ҫывӑх Хӗвелтухӑҫ чӗлхисем</characterLabel>
+		<characterLabel type="miscellaneous">тӗрлӗрен</characterLabel>
+		<characterLabel type="modern_scripts">хальхи шрифт</characterLabel>
+		<characterLabel type="modifier">модификатор</characterLabel>
+		<characterLabel type="musical_symbols">музыка символӗ</characterLabel>
+		<characterLabel type="nature">ҫутҫанталӑк</characterLabel>
+		<characterLabel type="nonspacing">пробелӑсӑр</characterLabel>
+		<characterLabel type="numbers">цифрӑсем</characterLabel>
+		<characterLabel type="objects">объект</characterLabel>
+		<characterLabel type="other">урӑх</characterLabel>
+		<characterLabel type="paired">мӑшӑр</characterLabel>
+		<characterLabel type="person">ҫын</characterLabel>
+		<characterLabel type="phonetic_alphabet">фонетика алфавичӗ</characterLabel>
+		<characterLabel type="pictographs">пиктограмма</characterLabel>
+		<characterLabel type="place">вырӑн</characterLabel>
+		<characterLabel type="plant">ӳсентӑран</characterLabel>
+		<characterLabel type="punctuation">пунктуаци</characterLabel>
+		<characterLabel type="rightwards_arrows">стрелка сылтӑмалла</characterLabel>
+		<characterLabel type="sign_standard_symbols">символ е паллӑ</characterLabel>
+		<characterLabel type="small_form_variant">пӗчӗк вариантсем</characterLabel>
+		<characterLabel type="smiley">смайлик</characterLabel>
+		<characterLabel type="smileys_people">смайлик е ҫын</characterLabel>
+		<characterLabel type="south_asian_scripts">Кӑнтӑр Азири чӗлхесем</characterLabel>
+		<characterLabel type="southeast_asian_scripts">Кӑнтӑр-Хӗвелтухӑҫ Ази чӗлхисем</characterLabel>
+		<characterLabel type="spacing">интервал</characterLabel>
+		<characterLabel type="sport">спорт</characterLabel>
+		<characterLabel type="symbols">символ</characterLabel>
+		<characterLabel type="technical_symbols">техника символӗ</characterLabel>
+		<characterLabel type="tone_marks">тонна палли</characterLabel>
+		<characterLabel type="travel">ҫулҫӳрев</characterLabel>
+		<characterLabel type="travel_places">ҫулҫӳрев е вырӑн</characterLabel>
+		<characterLabel type="upwards_arrows">стрелоксем ҫӳлелле</characterLabel>
+		<characterLabel type="variant_forms">вариант</characterLabel>
+		<characterLabel type="vocalic_jamo">уҫӑ сасӑ</characterLabel>
+		<characterLabel type="weather">ҫанталӑк</characterLabel>
+		<characterLabel type="western_asian_scripts">Анӑҫ Ази ҫырулӑхӗ</characterLabel>
+		<characterLabel type="whitespace">пробел</characterLabel>
 	</characterLabels>
 	<typographicNames>
-		<axisName type="ital" draft="unconfirmed">тайлӑк</axisName>
-		<axisName type="opsz" draft="unconfirmed">оптика виҫи</axisName>
-		<axisName type="slnt" draft="unconfirmed">тайлӑм</axisName>
-		<axisName type="wdth" draft="unconfirmed">сарлакӑшӗ</axisName>
-		<axisName type="wght" draft="unconfirmed">йывăрăш</axisName>
-		<styleName type="ital" subtype="1" draft="unconfirmed">тайлӑк</styleName>
-		<styleName type="opsz" subtype="8" draft="unconfirmed">алӑ пусни</styleName>
-		<styleName type="opsz" subtype="12" draft="unconfirmed">текст</styleName>
-		<styleName type="opsz" subtype="18" draft="unconfirmed">титовани</styleName>
-		<styleName type="opsz" subtype="72" draft="unconfirmed">экран (дисплей)</styleName>
-		<styleName type="opsz" subtype="144" draft="unconfirmed">плакат</styleName>
-		<styleName type="slnt" subtype="-12" draft="unconfirmed">тайлӑк каялла</styleName>
-		<styleName type="slnt" subtype="0" draft="unconfirmed">тӳрӗ</styleName>
-		<styleName type="slnt" subtype="12" draft="unconfirmed">тайлăклă</styleName>
-		<styleName type="slnt" subtype="24" draft="unconfirmed">экстра-тайлӑк</styleName>
-		<styleName type="wdth" subtype="50" draft="unconfirmed">ультрӑна чӑмӑртанӑ</styleName>
-		<styleName type="wdth" subtype="62.5" draft="unconfirmed">экстра чӑмӑртанӑ</styleName>
-		<styleName type="wdth" subtype="75" draft="unconfirmed">чӑмӑртанӑ</styleName>
-		<styleName type="wdth" subtype="87.5" draft="unconfirmed">ҫурри чӑмӑртанӑ</styleName>
-		<styleName type="wdth" subtype="100" draft="unconfirmed">йĕркеллĕ</styleName>
-		<styleName type="wdth" subtype="112.5" draft="unconfirmed">ҫурри сарлакарах</styleName>
-		<styleName type="wdth" subtype="125" draft="unconfirmed">сарлакарах</styleName>
-		<styleName type="wdth" subtype="150" draft="unconfirmed">экстра сарлакарах</styleName>
-		<styleName type="wdth" subtype="200" draft="unconfirmed">ультрӑна сарлакарах</styleName>
-		<styleName type="wght" subtype="100" draft="unconfirmed">ҫинҫешке</styleName>
-		<styleName type="wght" subtype="200" draft="unconfirmed">ҫӑп-ҫӑмӑл</styleName>
-		<styleName type="wght" subtype="300" draft="unconfirmed">ҫӑмӑл</styleName>
-		<styleName type="wght" subtype="350" draft="unconfirmed">ҫурри ҫӑмӑл</styleName>
-		<styleName type="wght" subtype="380" draft="unconfirmed">книги</styleName>
-		<styleName type="wght" subtype="400" draft="unconfirmed">регуляр</styleName>
-		<styleName type="wght" subtype="500" draft="unconfirmed">вӑтам</styleName>
-		<styleName type="wght" subtype="600" draft="unconfirmed">ҫурри ҫуллӑ</styleName>
-		<styleName type="wght" subtype="700" draft="unconfirmed">ҫуллӑ</styleName>
-		<styleName type="wght" subtype="800" draft="unconfirmed">экстра ҫуллӑ</styleName>
-		<styleName type="wght" subtype="900" draft="unconfirmed">хура</styleName>
-		<styleName type="wght" subtype="950" draft="unconfirmed">питӗ хураскер</styleName>
-		<featureName type="afrc" draft="unconfirmed">вертикаль вак</featureName>
-		<featureName type="cpsp" draft="unconfirmed">тӗп интервал</featureName>
-		<featureName type="dlig" draft="unconfirmed">хушма лигатурӑсем</featureName>
-		<featureName type="frac" draft="unconfirmed">диагональ вак</featureName>
-		<featureName type="lnum" draft="unconfirmed">аҫлӑк номерӗсем</featureName>
-		<featureName type="onum" draft="unconfirmed">кивӗ стиль цифрисем</featureName>
-		<featureName type="ordn" draft="unconfirmed">йӗрке номерӗсем</featureName>
-		<featureName type="pnum" draft="unconfirmed">пропорци хисепӗсем</featureName>
-		<featureName type="smcp" draft="unconfirmed">пӗчӗккисем тӗп саспаллисем</featureName>
-		<featureName type="tnum" draft="unconfirmed">таблица хисепӗсем</featureName>
-		<featureName type="zero" draft="unconfirmed">каснӑ ноль</featureName>
+		<axisName type="ital">тайлӑк</axisName>
+		<axisName type="opsz">оптика виҫи</axisName>
+		<axisName type="slnt">тайлӑм</axisName>
+		<axisName type="wdth">сарлакӑшӗ</axisName>
+		<axisName type="wght">йывăрăш</axisName>
+		<styleName type="ital" subtype="1">тайлӑк</styleName>
+		<styleName type="opsz" subtype="8">алӑ пусни</styleName>
+		<styleName type="opsz" subtype="12">текст</styleName>
+		<styleName type="opsz" subtype="18">титовани</styleName>
+		<styleName type="opsz" subtype="72">экран (дисплей)</styleName>
+		<styleName type="opsz" subtype="144">плакат</styleName>
+		<styleName type="slnt" subtype="-12">тайлӑк каялла</styleName>
+		<styleName type="slnt" subtype="0">тӳрӗ</styleName>
+		<styleName type="slnt" subtype="12">тайлăклă</styleName>
+		<styleName type="slnt" subtype="24">экстра-тайлӑк</styleName>
+		<styleName type="wdth" subtype="50">ультрӑна чӑмӑртанӑ</styleName>
+		<styleName type="wdth" subtype="62.5">экстра чӑмӑртанӑ</styleName>
+		<styleName type="wdth" subtype="75">чӑмӑртанӑ</styleName>
+		<styleName type="wdth" subtype="87.5">ҫурри чӑмӑртанӑ</styleName>
+		<styleName type="wdth" subtype="100">йĕркеллĕ</styleName>
+		<styleName type="wdth" subtype="112.5">ҫурри сарлакарах</styleName>
+		<styleName type="wdth" subtype="125">сарлакарах</styleName>
+		<styleName type="wdth" subtype="150">экстра сарлакарах</styleName>
+		<styleName type="wdth" subtype="200">ультрӑна сарлакарах</styleName>
+		<styleName type="wght" subtype="100">ҫинҫешке</styleName>
+		<styleName type="wght" subtype="200">ҫӑп-ҫӑмӑл</styleName>
+		<styleName type="wght" subtype="300">ҫӑмӑл</styleName>
+		<styleName type="wght" subtype="350">ҫурри ҫӑмӑл</styleName>
+		<styleName type="wght" subtype="380">книги</styleName>
+		<styleName type="wght" subtype="400">регуляр</styleName>
+		<styleName type="wght" subtype="500">вӑтам</styleName>
+		<styleName type="wght" subtype="600">ҫурри ҫуллӑ</styleName>
+		<styleName type="wght" subtype="700">ҫуллӑ</styleName>
+		<styleName type="wght" subtype="800">экстра ҫуллӑ</styleName>
+		<styleName type="wght" subtype="900">хура</styleName>
+		<styleName type="wght" subtype="950">питӗ хураскер</styleName>
+		<featureName type="afrc">вертикаль вак</featureName>
+		<featureName type="cpsp">тӗп интервал</featureName>
+		<featureName type="dlig">хушма лигатурӑсем</featureName>
+		<featureName type="frac">диагональ вак</featureName>
+		<featureName type="lnum">аҫлӑк номерӗсем</featureName>
+		<featureName type="onum">кивӗ стиль цифрисем</featureName>
+		<featureName type="ordn">йӗрке номерӗсем</featureName>
+		<featureName type="pnum">пропорци хисепӗсем</featureName>
+		<featureName type="smcp">пӗчӗккисем тӗп саспаллисем</featureName>
+		<featureName type="tnum">таблица хисепӗсем</featureName>
+		<featureName type="zero">каснӑ ноль</featureName>
 	</typographicNames>
 	<personNames>
-		<nameOrderLocales order="givenFirst" draft="unconfirmed">und cv</nameOrderLocales>
+		<nameOrderLocales order="givenFirst">und cv</nameOrderLocales>
 		<personName order="givenFirst" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{title} {given} {given2} {surname} — {generation}, {credentials}</namePattern>
+			<namePattern>{title} {given} {given2} {surname} — {generation}, {credentials}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal} {surname}</namePattern>
+			<namePattern>{given-informal} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
-		</personName>
-		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{title} {given} {given2} {surname} — {generation}, {credentials}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal} {surname}</namePattern>
+			<namePattern>{given-informal} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{given-initial} {given2-initial} {surname}</namePattern>
+			<namePattern>{given-initial} {given2-initial} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal} {surname-initial}</namePattern>
+			<namePattern>{given-informal} {surname-initial}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname} {title} {given} {given2} {credentials}</namePattern>
+			<namePattern>{surname} {title} {given} {given2} {credentials}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname} {given-informal}</namePattern>
+			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname} {given} {given2-initial}, {credentials}</namePattern>
+			<namePattern>{surname} {given} {given2-initial}, {credentials}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname} {given-informal}</namePattern>
+			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname} {given-initial} {given2-initial}</namePattern>
+			<namePattern>{surname} {given-initial} {given2-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname} {given-initial}</namePattern>
+			<namePattern>{surname} {given-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+			<namePattern>{surname-core}, {given} {given2} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname}, {given-informal}</namePattern>
+			<namePattern>{surname}, {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname}, {given-informal}</namePattern>
+			<namePattern>{surname}, {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
+			<namePattern>{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname}, {given-informal}</namePattern>
+			<namePattern>{surname}, {given-informal}</namePattern>
 		</personName>
 		<sampleName item="nativeG">
-			<nameField type="given" draft="unconfirmed">Аталан</nameField>
+			<nameField type="given">Аталан</nameField>
 		</sampleName>
 		<sampleName item="nativeGS">
-			<nameField type="given" draft="unconfirmed">Илемпи</nameField>
-			<nameField type="surname" draft="unconfirmed">Корнилова</nameField>
+			<nameField type="given">Илемпи</nameField>
+			<nameField type="surname">Корнилова</nameField>
 		</sampleName>
 		<sampleName item="nativeGGS">
-			<nameField type="given" draft="unconfirmed">Константин</nameField>
-			<nameField type="given2" draft="unconfirmed">Васильевич</nameField>
-			<nameField type="surname" draft="unconfirmed">Иванов</nameField>
+			<nameField type="given">Константин</nameField>
+			<nameField type="given2">Васильевич</nameField>
+			<nameField type="surname">Иванов</nameField>
 		</sampleName>
 		<sampleName item="nativeFull">
-			<nameField type="title" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="given" draft="unconfirmed">Николай</nameField>
-			<nameField type="given-informal" draft="unconfirmed">Коля</nameField>
-			<nameField type="given2" draft="unconfirmed">Иванович</nameField>
-			<nameField type="surname-prefix" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="surname-core" draft="unconfirmed">Ашмарин</nameField>
-			<nameField type="surname2" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="generation" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="credentials" draft="unconfirmed">∅∅∅</nameField>
+			<nameField type="title">∅∅∅</nameField>
+			<nameField type="given">Николай</nameField>
+			<nameField type="given-informal">Николай</nameField>
+			<nameField type="given2">Иванович</nameField>
+			<nameField type="surname-prefix">∅∅∅</nameField>
+			<nameField type="surname-core">Ашмарин</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
+			<nameField type="generation">∅∅∅</nameField>
+			<nameField type="credentials">∅∅∅</nameField>
 		</sampleName>
 		<sampleName item="foreignG">
-			<nameField type="given" draft="unconfirmed">Синдбад</nameField>
+			<nameField type="given">Синдбад</nameField>
 		</sampleName>
 		<sampleName item="foreignGS">
-			<nameField type="given" draft="unconfirmed">Кете</nameField>
-			<nameField type="surname" draft="unconfirmed">Мюллер</nameField>
+			<nameField type="given">Кете</nameField>
+			<nameField type="surname">Мюллер</nameField>
 		</sampleName>
 		<sampleName item="foreignGGS">
-			<nameField type="given" draft="unconfirmed">Цецилия</nameField>
-			<nameField type="given2" draft="unconfirmed">Хэмиш</nameField>
-			<nameField type="surname" draft="unconfirmed">Штёбер</nameField>
+			<nameField type="given">Цецилия</nameField>
+			<nameField type="given2">Хэмиш</nameField>
+			<nameField type="surname">Штёбер</nameField>
 		</sampleName>
 		<sampleName item="foreignFull">
-			<nameField type="title" draft="unconfirmed">проф., д-р</nameField>
-			<nameField type="given" draft="unconfirmed">Ада Корнелия</nameField>
-			<nameField type="given-informal" draft="unconfirmed">Неле</nameField>
-			<nameField type="given2" draft="unconfirmed">Сезар Мартин</nameField>
-			<nameField type="surname-prefix" draft="unconfirmed">фон</nameField>
-			<nameField type="surname-core" draft="unconfirmed">Брюль</nameField>
-			<nameField type="surname2" draft="unconfirmed">Гонсалес Доминго</nameField>
-			<nameField type="generation" draft="unconfirmed">мл.</nameField>
-			<nameField type="credentials" draft="unconfirmed">к.м.н.</nameField>
+			<nameField type="title">проф., д-р</nameField>
+			<nameField type="given">Ада Корнелия</nameField>
+			<nameField type="given-informal">Неле</nameField>
+			<nameField type="given2">Сезар Мартин</nameField>
+			<nameField type="surname-prefix">фон</nameField>
+			<nameField type="surname-core">Брюль</nameField>
+			<nameField type="surname2">Гонсалес Доминго</nameField>
+			<nameField type="generation">мл.</nameField>
+			<nameField type="credentials">к.м.н.</nameField>
 		</sampleName>
 	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/cy.xml b/make/data/cldr/common/main/cy.xml
index 7b68a594923..7d5e5fd3d67 100644
--- a/make/data/cldr/common/main/cy.xml
+++ b/make/data/cldr/common/main/cy.xml
@@ -286,6 +286,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Baffia</language>
 			<language type="ksh">Cwleneg</language>
 			<language type="ku">Cwrdeg</language>
+			<language type="ku" menu="core">Cwrdeg</language>
+			<language type="ku" menu="extension">Cwrmanjeg</language>
 			<language type="kum">Cwmiceg</language>
 			<language type="kv">Comi</language>
 			<language type="kw">Cernyweg</language>
@@ -749,6 +751,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Tsieina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Ynys Clipperton</territory>
+			<territory type="CQ">Sarc</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Ciwba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -889,7 +892,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="PF">Polynesia Ffrengig</territory>
 			<territory type="PG">Papua Guinea Newydd</territory>
 			<territory type="PH">Y Philipinau</territory>
-			<territory type="PK">Pakistan</territory>
+			<territory type="PK">Pacistan</territory>
 			<territory type="PL">Gwlad Pwyl</territory>
 			<territory type="PM">Saint-Pierre-et-Miquelon</territory>
 			<territory type="PN">Ynysoedd Pitcairn</territory>
@@ -1009,51 +1012,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Fformat Arian</key>
 			<key type="collation">Trefn</key>
 			<key type="currency">Math o Arian</key>
+			<key type="em">Cyflwyniad Emoji</key>
 			<key type="hc">Cylched Awr (12 vs 24)</key>
 			<key type="lb">Arddull Toriad Llinell</key>
+			<key type="lw">Toriadau Llinell o fewn Geiriau</key>
 			<key type="ms">System Fesur</key>
 			<key type="numbers">Rhifau</key>
+			<key type="ss">Toriad Brawddeg ar ôl Byrfodd</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Calendr Bwdaidd</type>
-			<type key="calendar" type="chinese">Calendr Tseina</type>
+			<type key="calendar" type="buddhist" scope="core">Bwdaidd</type>
+			<type key="calendar" type="chinese">Calendr Tsieineaidd</type>
+			<type key="calendar" type="chinese" scope="core">Tsieineaidd</type>
 			<type key="calendar" type="coptic">Calendr y Coptiaid</type>
+			<type key="calendar" type="coptic" scope="core">Coptaidd</type>
 			<type key="calendar" type="dangi">Calendr Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Calendr Ethiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopaidd</type>
 			<type key="calendar" type="ethiopic-amete-alem">Calendr Amete Alem Ethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem Ethiopia</type>
 			<type key="calendar" type="gregorian">Calendr Gregori</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoraidd</type>
 			<type key="calendar" type="hebrew">Calendr Hebreaidd</type>
+			<type key="calendar" type="hebrew" scope="core">Hebreaidd</type>
 			<type key="calendar" type="indian">Calendr Cenedlaethol India</type>
 			<type key="calendar" type="islamic">Calendr Hijri</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Calendr Hijri (tabl, cyfnod sifil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabl, cyfnod sifil)</type>
 			<type key="calendar" type="islamic-umalqura">Calendr Hijri (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Calendr ISO-8601</type>
 			<type key="calendar" type="japanese">Calendr Japan</type>
+			<type key="calendar" type="japanese" scope="core">Japaneaidd</type>
 			<type key="calendar" type="persian">Calendr Persia</type>
+			<type key="calendar" type="persian" scope="core">Persiaidd</type>
 			<type key="calendar" type="roc">Calendr Gweriniaeth Tseina</type>
+			<type key="calendar" type="roc" scope="core">Gweriniaeth Tseina</type>
 			<type key="cf" type="account">Fformat Arian Cyfrifeg</type>
+			<type key="cf" type="account" scope="core">Cyfrifeg</type>
 			<type key="cf" type="standard">Fformat Arian Safonol</type>
-			<type key="collation" type="big5han">Trefn Traddodiadol Tsieina - Big5</type>
+			<type key="cf" type="standard" scope="core">Safonol</type>
 			<type key="collation" type="dictionary">Trefn Geiriadur</type>
 			<type key="collation" type="ducet">Trefn Rhagosodedig Unicode</type>
+			<type key="collation" type="ducet" scope="core">Unicode Rhagosodedig</type>
 			<type key="collation" type="eor">Rheolau trefnu Ewropeaidd</type>
-			<type key="collation" type="gb2312han">Trefn Symledig Tsieina - GB2312</type>
 			<type key="collation" type="phonebook">Trefn Llyfr Ffôn</type>
 			<type key="collation" type="pinyin">Trefn Pinyin</type>
 			<type key="collation" type="search">Chwilio at Ddibenion Cyffredinol</type>
+			<type key="collation" type="search" scope="core">Chwilio</type>
 			<type key="collation" type="standard">Trefn Safonol</type>
+			<type key="collation" type="standard" scope="core">Safonol</type>
 			<type key="collation" type="traditional">Trefn Traddodiadol</type>
 			<type key="collation" type="zhuyin">Trefn Zhuyin</type>
+			<type key="em" type="default" scope="core">Rhagosodedig</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Testun</type>
 			<type key="hc" type="h11">System 12 Awr (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">System 12 Awr (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">System 24 Awr (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">System 24 Awr (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Arddull Toriad Llinell Rhydd</type>
+			<type key="lb" type="loose" scope="core">Rhydd</type>
 			<type key="lb" type="normal">Arddull Toriad Llinell Arferol</type>
+			<type key="lb" type="normal" scope="core">Arferol</type>
 			<type key="lb" type="strict">Arddull Torriad Llinell Caeth</type>
+			<type key="lb" type="strict" scope="core">Caeth</type>
+			<type key="lw" type="breakall" scope="core">Torri’r cyfan</type>
+			<type key="lw" type="keepall" scope="core">Cadw’r cyfan</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Cadw mewn brawddegau</type>
 			<type key="ms" type="metric">System Fetrig</type>
+			<type key="ms" type="metric" scope="core">Metrig</type>
 			<type key="ms" type="uksystem">System Fesur Imperialaidd</type>
+			<type key="ms" type="uksystem" scope="core">DU</type>
 			<type key="ms" type="ussystem">System Fesur UDA</type>
+			<type key="ms" type="ussystem" scope="core">UDA</type>
 			<type key="numbers" type="arab">Digidau Arabig-Indig</type>
 			<type key="numbers" type="arabext">Digidau Arabig-Indig Estynedig</type>
 			<type key="numbers" type="armn">Rhifolion Armenaidd</type>
@@ -1096,6 +1136,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">Digidau Thai</type>
 			<type key="numbers" type="tibt">Digidau Tibetaidd</type>
 			<type key="numbers" type="vaii">Digidau Vai</type>
+			<type key="ss" type="none" scope="core">Wedi’i ddiffodd</type>
+			<type key="ss" type="standard" scope="core">Ymlaen</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrig</measurementSystemName>
@@ -1147,6 +1189,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1155,6 +1200,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1171,11 +1219,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
@@ -1532,6 +1581,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1540,6 +1592,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1548,6 +1603,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1556,6 +1614,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
@@ -1563,11 +1624,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1601,7 +1663,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1626,7 +1687,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2517,33 +2577,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Dinas Anhysbys</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Fienna</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brwsel</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity>Bae Cambridge</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Ynys y Pasg</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="Indian/Christmas">
 				<exemplarCity>Ynys y Nadolig</exemplarCity>
 			</zone>
@@ -2592,9 +2637,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Rome">
 				<exemplarCity>Rhufain</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
 			</zone>
@@ -2671,9 +2713,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Amser Gorllewin Affrica</generic>
-					<standard>Amser Safonol Gorllewin Affrica</standard>
-					<daylight>Amser Haf Gorllewin Affrica</daylight>
+					<standard>Amser Gorllewin Affrica</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3041,6 +3081,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Amser Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Amser Safonol Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Amser Hawaii-Aleutian</generic>
@@ -3605,7 +3650,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5940,6 +5984,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">doler Dwyrain y Caribî</displayName>
 				<displayName count="other">doler Dwyrain y Caribî</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>guilder Caribïaidd</displayName>
+				<displayName count="zero">guilder Caribïaidd</displayName>
+				<displayName count="one">guilder Caribïaidd</displayName>
+				<displayName count="two">guilder Caribïaidd</displayName>
+				<displayName count="few">guilder Caribïaidd</displayName>
+				<displayName count="many">guilder Caribïaidd</displayName>
+				<displayName count="other">guilder Caribïaidd</displayName>
+			</currency>
 			<currency type="XEU">
 				<displayName>Uned Arian Cyfred Ewropeaidd</displayName>
 				<displayName count="zero">uned arian cyfred Ewropeaidd</displayName>
@@ -6075,6 +6128,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">doler Zimbabwe (1980–2008)</displayName>
 				<displayName count="other">doler Zimbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwean Gold</displayName>
+				<displayName count="zero">Zimbabwean Gold</displayName>
+				<displayName count="one">Zimbabwean Gold</displayName>
+				<displayName count="two">Zimbabwean Gold</displayName>
+				<displayName count="few">Zimbabwean Gold</displayName>
+				<displayName count="many">Zimbabwean Gold</displayName>
+				<displayName count="other">Zimbabwean Gold</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Doler Zimbabwe (2009)</displayName>
 				<displayName count="zero">doler Zimbabwe (2009)</displayName>
@@ -6380,7 +6442,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} mmol/L</unitPattern>
 				<unitPattern count="other">{0} milimôl y litr</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>rhan</displayName>
+				<unitPattern count="zero">{0} rhan</unitPattern>
+				<unitPattern count="one">{0} rhan</unitPattern>
+				<unitPattern count="two">{0} ran</unitPattern>
+				<unitPattern count="few">{0} rhan</unitPattern>
+				<unitPattern count="many">{0} rhan</unitPattern>
+				<unitPattern count="other">{0} rhan</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>rhannau pob miliwn</displayName>
 				<unitPattern count="zero">{0} rhan pob miliwn</unitPattern>
 				<unitPattern count="one">{0} rhan pob miliwn</unitPattern>
@@ -6416,6 +6487,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>molau</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>o glwcos</displayName>
+				<unitPattern count="zero">{0} Glc</unitPattern>
+				<unitPattern count="one">{0} o glwcos</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="many">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litrau y cilometr</displayName>
 				<unitPattern count="zero">{0} L/km</unitPattern>
@@ -7228,6 +7308,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} milimetr o fercwri</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>o fercwri</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pwysau y fodfedd sgwar</displayName>
 				<unitPattern count="zero">{0} psi</unitPattern>
@@ -7518,6 +7601,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} mc</unitPattern>
 				<unitPattern count="other">{0} cwpanaid metrig</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>owns hylif metrig</displayName>
+				<unitPattern count="zero">{0} fl oz m.</unitPattern>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="two">{0} fl oz m.</unitPattern>
+				<unitPattern count="few">{0} fl oz m.</unitPattern>
+				<unitPattern count="many">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} owns hylif metrig</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>erw-droedfeddi</displayName>
 				<unitPattern count="zero">{0} erw-droedfedd</unitPattern>
@@ -7646,8 +7738,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>chwart Imp</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradianau</displayName>
+				<unitPattern count="zero">{0} sr</unitPattern>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="many">{0} sr</unitPattern>
+				<unitPattern count="other">{0} steradian</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="zero">{0} C</unitPattern>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="two">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="many">{0} C</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ffaradau</displayName>
+				<unitPattern count="zero">{0} F</unitPattern>
+				<unitPattern count="one">{0} ffarad</unitPattern>
+				<unitPattern count="two">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="many">{0} F</unitPattern>
+				<unitPattern count="other">{0} ffarad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="zero">{0} H</unitPattern>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="two">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="many">{0} H</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensau</displayName>
+				<unitPattern count="zero">{0} S</unitPattern>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="two">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="many">{0} S</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorïau [IT]</displayName>
+				<unitPattern count="zero">{0} cal-IT</unitPattern>
+				<unitPattern count="one">{0} calori [IT]</unitPattern>
+				<unitPattern count="two">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="many">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="zero">{0} Bq</unitPattern>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="many">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="zero">{0} Sv</unitPattern>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="two">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="many">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="zero">{0} Gy</unitPattern>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="many">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>grym cilogram</displayName>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslâu</displayName>
+				<unitPattern count="zero">{0} T</unitPattern>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="many">{0} T</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weberau</displayName>
+				<unitPattern count="zero">{0} Wb</unitPattern>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="many">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>golau</displayName>
 				<unitPattern count="zero">golau</unitPattern>
 				<unitPattern count="one">golau</unitPattern>
 				<unitPattern count="two">golau</unitPattern>
@@ -7655,7 +7848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">golau</unitPattern>
 				<unitPattern count="other">{0} golau</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>rhannau fesul biliwn</displayName>
 				<unitPattern count="zero">ppb</unitPattern>
 				<unitPattern count="one">{0} rhan fesul biliwn</unitPattern>
@@ -7664,16 +7857,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} rhan fesul biliwn</unitPattern>
 				<unitPattern count="other">{0} rhan fesul biliwn</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>nosau</displayName>
-				<unitPattern count="zero">{0} noson</unitPattern>
-				<unitPattern count="one">{0} noson</unitPattern>
-				<unitPattern count="two">{0} noson</unitPattern>
-				<unitPattern count="few">{0} noson</unitPattern>
-				<unitPattern count="many">{0} noson</unitPattern>
-				<unitPattern count="other">{0} noson</unitPattern>
-				<perUnitPattern>{0}/noson</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>cyfeiriad cardinal</displayName>
 				<coordinateUnitPattern type="east">{0} i’r dwyrain</coordinateUnitPattern>
@@ -7798,7 +7981,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} eitem</unitPattern>
 				<unitPattern count="other">{0} eitem</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>rhan</displayName>
+				<unitPattern count="zero">{0} rhan</unitPattern>
+				<unitPattern count="one">{0} rhan</unitPattern>
+				<unitPattern count="two">{0} rhan</unitPattern>
+				<unitPattern count="few">{0} rhan</unitPattern>
+				<unitPattern count="many">{0} rhan</unitPattern>
+				<unitPattern count="other">{0} rhan</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>rhan/miliwn</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -7819,6 +8011,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} môl</unitPattern>
 				<unitPattern count="other">{0} môl</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litrau/km</displayName>
 			</unit>
@@ -8211,6 +8406,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>o Hg</displayName>
+			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>metrau/eil</displayName>
 			</unit>
@@ -8366,6 +8564,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} cht Imp.</unitPattern>
 				<unitPattern count="other">{0} cht Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="zero">{0} sr</unitPattern>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="many">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="zero">{0} C</unitPattern>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="two">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="many">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="zero">{0} F</unitPattern>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="two">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="many">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="zero">{0} H</unitPattern>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="two">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="many">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="zero">{0} S</unitPattern>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="two">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="many">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="zero">{0} Bq</unitPattern>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="many">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="zero">{0} Sv</unitPattern>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="two">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="many">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="zero">{0} Gy</unitPattern>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="many">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="zero">{0} T</unitPattern>
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="many">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="zero">{0} Wb</unitPattern>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="many">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>golau</displayName>
 				<unitPattern count="zero">golau</unitPattern>
@@ -8375,7 +8656,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} golau</unitPattern>
 				<unitPattern count="other">{0} golau</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>rhannau/biliwn</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -8520,9 +8801,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} kt</unitPattern>
 				<unitPattern count="other">{0}kt</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>rhan</displayName>
+				<unitPattern count="zero">{0} rhan</unitPattern>
+				<unitPattern count="one">{0} rhan</unitPattern>
+				<unitPattern count="two">{0} rhan</unitPattern>
+				<unitPattern count="few">{0} rhan</unitPattern>
+				<unitPattern count="many">{0} rhan</unitPattern>
+				<unitPattern count="other">{0} rhan</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="zero">{0}L/km</unitPattern>
@@ -9160,6 +9453,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>o Hg</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="zero">{0}psi</unitPattern>
 				<unitPattern count="one">{0}psi</unitPattern>
@@ -9484,8 +9780,90 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} qt Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="zero">{0} sr</unitPattern>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="many">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="zero">{0} C</unitPattern>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="two">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="many">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="zero">{0} F</unitPattern>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="two">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="many">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="zero">{0} H</unitPattern>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="two">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="many">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="zero">{0} S</unitPattern>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="two">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="many">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="zero">{0} Bq</unitPattern>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="many">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="zero">{0} Sv</unitPattern>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="two">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="many">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="zero">{0} Gy</unitPattern>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="many">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="zero">{0} T</unitPattern>
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="many">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="zero">{0} Wb</unitPattern>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="many">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>golau</displayName>
 				<unitPattern count="zero">{0} golau</unitPattern>
 				<unitPattern count="one">{0} golau</unitPattern>
 				<unitPattern count="two">{0} golau</unitPattern>
@@ -9493,7 +9871,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} golau</unitPattern>
 				<unitPattern count="other">{0} golau</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="zero">{0} ppb</unitPattern>
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="two">{0} ppb</unitPattern>
@@ -9502,14 +9880,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>nosau</displayName>
 				<unitPattern count="zero">{0} noson</unitPattern>
 				<unitPattern count="one">{0}noson</unitPattern>
 				<unitPattern count="two">{0}noson</unitPattern>
 				<unitPattern count="few">{0}noson</unitPattern>
 				<unitPattern count="many">{0}noson</unitPattern>
 				<unitPattern count="other">{0}noson</unitPattern>
-				<perUnitPattern>{0}/noson</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}dn</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/da.xml b/make/data/cldr/common/main/da.xml
index 56c7e15ea39..33673627040 100644
--- a/make/data/cldr/common/main/da.xml
+++ b/make/data/cldr/common/main/da.xml
@@ -294,6 +294,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurdisk</language>
+			<language type="ku" menu="core">kurdisk</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kymyk</language>
 			<language type="kut">kutenaj</language>
 			<language type="kv">komi</language>
@@ -853,6 +855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clippertonøen</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Kap Verde</territory>
@@ -1153,35 +1156,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numerisk sortering</key>
 			<key type="colStrength">Sorteringsstyrke</key>
 			<key type="currency">valuta</key>
+			<key type="em">emojivisning</key>
 			<key type="hc">timeur (12 vs. 24)</key>
 			<key type="lb">linjeskift</key>
+			<key type="lw">linjeskift midt i ord</key>
 			<key type="ms">målesystem</key>
 			<key type="numbers">tal</key>
+			<key type="ss">afsluttende tegnsætning efter fork.</key>
 			<key type="timezone">Tidszone</key>
 			<key type="va">Sprogvariant</key>
 			<key type="x">Privatbrug</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddhistisk kalender</type>
+			<type key="calendar" type="buddhist" scope="core">buddhistisk</type>
 			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="chinese" scope="core">kinesisk</type>
 			<type key="calendar" type="coptic">koptisk kalender</type>
+			<type key="calendar" type="coptic" scope="core">koptisk</type>
 			<type key="calendar" type="dangi">dangi-kalender</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopisk</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopisk amete-alem</type>
 			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriansk</type>
 			<type key="calendar" type="hebrew">jødisk kalender</type>
+			<type key="calendar" type="hebrew" scope="core">jødisk</type>
 			<type key="calendar" type="indian">indisk nationalkalender</type>
 			<type key="calendar" type="islamic">hijri-kalender</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
 			<type key="calendar" type="islamic-civil">verdslig hijri-kalender</type>
+			<type key="calendar" type="islamic-civil" scope="core">verdslig hijri</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">islamisk kalender (Saudi-Arabien, observation)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">islamisk kalender (tabellarisk, astronomisk epoke)</type>
 			<type key="calendar" type="islamic-umalqura">hijri-kalender (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601-kalender</type>
 			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="japanese" scope="core">japansk</type>
 			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="persian" scope="core">persisk</type>
 			<type key="calendar" type="roc">kalender for Republikken Kina</type>
+			<type key="calendar" type="roc" scope="core">Republikken Kina</type>
 			<type key="cf" type="account">format for regnskabsvaluta</type>
+			<type key="cf" type="account" scope="core">regnskab</type>
 			<type key="cf" type="standard">format for standardvaluta</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Sortér efter symboler</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Sortér, og ignorer symboler</type>
 			<type key="colBackwards" type="no" draft="contributed">Sortér efter accenter i normal rækkefølge</type>
@@ -1191,22 +1213,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Sortér med store bogstaver først</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Sortér uden forskel på store og små bogstaver</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Sortér med skelnen mellem store og små bogstaver</type>
-			<type key="collation" type="big5han">sorteringsrækkefølge uforkortet kinesisk - Big5</type>
 			<type key="collation" type="compat">tidligere sorteringsrækkefølge, kompatibilitet</type>
+			<type key="collation" type="compat" scope="core">kompatibilitet</type>
 			<type key="collation" type="dictionary">sorteringsrækkefølge for ordbog</type>
+			<type key="collation" type="dictionary" scope="core">ordbog</type>
 			<type key="collation" type="ducet">Unicode-standardsorteringsrækkefølge</type>
+			<type key="collation" type="ducet" scope="core">standard-Unicode</type>
 			<type key="collation" type="eor" draft="contributed">europæisk sorteringsrækkefølge</type>
-			<type key="collation" type="gb2312han">sorteringsrækkefølge forkortet kinesisk - GB2312</type>
 			<type key="collation" type="phonebook">sorteringsrækkefølge i telefonbøger</type>
+			<type key="collation" type="phonebook" scope="core">telefonbog</type>
 			<type key="collation" type="phonetic">fonetisk sorteringsrækkefølge</type>
+			<type key="collation" type="phonetic" scope="core">fonetisk</type>
 			<type key="collation" type="pinyin">pinyin-baseret sorteringsrækkefølge</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">generel søgning</type>
+			<type key="collation" type="search" scope="core">søg</type>
 			<type key="collation" type="searchjl" draft="contributed">sortér efter den første konsonant i hangul</type>
 			<type key="collation" type="standard">standardsorteringsrækkefølge</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke">stregbaseret sorteringsrækkefølge</type>
+			<type key="collation" type="stroke" scope="core">streg</type>
 			<type key="collation" type="traditional">traditionel sorteringsrækkefølge</type>
-			<type key="collation" type="unihan">sortering efter streger i rodtegn</type>
+			<type key="collation" type="traditional" scope="core">traditionel</type>
+			<type key="collation" type="unihan">sorteringsrækkefølge efter radikal-strøg</type>
+			<type key="collation" type="unihan" scope="core">radikal-strøg</type>
 			<type key="collation" type="zhuyin">zhuyin-sorteringsrækkefølge</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Sortér uden normalisering</type>
 			<type key="colNormalization" type="yes" draft="contributed">Sortér Unicode efter første normalisering</type>
 			<type key="colNumeric" type="no" draft="contributed">Sortér efter individuelle cifre</type>
@@ -1219,18 +1251,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">fuld bredde</type>
 			<type key="d0" type="hwidth">halv bredde</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerisk</type>
+			<type key="em" type="default" scope="core">standard</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-timersur (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-timersur (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-timersur (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-timersur (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">løst linjeskift</type>
+			<type key="lb" type="loose" scope="core">løst</type>
 			<type key="lb" type="normal">normalt linjeskift</type>
+			<type key="lb" type="normal" scope="core">normalt</type>
 			<type key="lb" type="strict">hårdt linjeskift</type>
+			<type key="lb" type="strict" scope="core">hårdt</type>
+			<type key="lw" type="breakall" scope="core">bryd alle</type>
+			<type key="lw" type="keepall" scope="core">behold alle</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">behold i sætningsdele</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">metersystem</type>
+			<type key="ms" type="metric" scope="core">metrisk</type>
 			<type key="ms" type="uksystem">britisk målesystem</type>
+			<type key="ms" type="uksystem" scope="core">britisk</type>
 			<type key="ms" type="ussystem">amerikansk målesystem</type>
+			<type key="ms" type="ussystem" scope="core">amerikansk</type>
 			<type key="numbers" type="arab">hindu-arabiske tal</type>
 			<type key="numbers" type="arabext">udvidede hindu-arabiske tal</type>
 			<type key="numbers" type="armn">armenske tal</type>
@@ -1292,6 +1341,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">tibetanske tal</type>
 			<type key="numbers" type="traditional" draft="contributed">Traditionelle tal</type>
 			<type key="numbers" type="vaii">vai-tal</type>
+			<type key="ss" type="none" scope="core">Fra</type>
+			<type key="ss" type="standard" scope="core">Til</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">det metriske system</measurementSystemName>
@@ -1354,20 +1405,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">0. tidsregning</era>
-						<era type="1" draft="contributed">1. tidsregning</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">0. tidsr.</era>
-						<era type="1" draft="contributed">1. tidsr.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="contributed">0. t.</era>
-						<era type="1" draft="contributed">1. t.</era>
-					</eraNarrow>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1389,20 +1426,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">0. tidsregning</era>
-						<era type="1" draft="contributed">1. tidsregning</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">0. tidsr.</era>
-						<era type="1" draft="contributed">1. tidsr.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="contributed">0. t.</era>
-						<era type="1" draft="contributed">1. t.</era>
-					</eraNarrow>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1436,6 +1459,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1444,6 +1470,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} kl. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1467,11 +1496,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
@@ -1838,6 +1868,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1846,6 +1879,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1854,6 +1890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1862,6 +1901,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bhm">h.mm B</dateFormatItem>
@@ -1875,11 +1917,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
@@ -1966,7 +2009,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a–h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h.mm a–h.mm a</greatestDifference>
@@ -1988,7 +2030,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a–h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -2671,9 +2712,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Ukendt by</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
@@ -2686,18 +2724,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Påskeøen</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kap Verde</exemplarCity>
 			</zone>
@@ -2751,7 +2783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bisjkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Canton Island</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Comorerne</exemplarCity>
@@ -2878,9 +2910,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Vestafrikansk tid</generic>
-					<standard>Vestafrikansk normaltid</standard>
-					<daylight>Vestafrikansk sommertid</daylight>
+					<standard>Vestafrikansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3278,6 +3308,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyana-tid</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutian-normaltid</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutian-tid</generic>
@@ -3728,6 +3763,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuuk-tid</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Tyrkisk tid</generic>
+					<standard>Tyrkisk normaltid</standard>
+					<daylight>Tyrkisk sommertid</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmensk tid</generic>
@@ -3891,7 +3933,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5240,6 +5285,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">østkaribisk dollar</displayName>
 				<displayName count="other">østkaribiske dollar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>caribiske gylden</displayName>
+				<displayName count="one">caribiske gylden</displayName>
+				<displayName count="other">caribiske gylden</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>SDR</displayName>
 			</currency>
@@ -5350,6 +5400,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Zimbabwisk dollar (1980–2008)</displayName>
 				<displayName count="other">Zimbabwiske dollar (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe Gold</displayName>
+				<displayName count="one">Zimbabwe Gold</displayName>
+				<displayName count="other">Zimbabwe Gold</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwisk dollar (2009)</displayName>
 				<displayName count="one">Zimbabwisk dollar (2009)</displayName>
@@ -5641,7 +5696,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} enheder</unitPattern>
 				<unitPattern count="other" case="genitive">{0} enheders</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parter</displayName>
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} parter</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>common</gender>
 				<displayName>parts per million</displayName>
 				<unitPattern count="one">{0} part per million</unitPattern>
@@ -5675,6 +5735,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mol</unitPattern>
 				<unitPattern count="other" case="genitive">{0} mols</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukose</displayName>
+				<unitPattern count="one">{0} glukose</unitPattern>
+				<unitPattern count="other">{0} glukose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>common</gender>
 				<displayName>liter pr. kilometer</displayName>
@@ -6384,6 +6449,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} millimeter kviksølv</unitPattern>
 				<unitPattern count="other" case="genitive">{0} millimeter kviksølvs</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>kviksølv</displayName>
+				<unitPattern count="one">{0} kviksølv</unitPattern>
+				<unitPattern count="other">{0} kviksølv</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pounds pr. kvadrattomme</displayName>
 				<unitPattern count="one">{0} pound pr. kvadrattomme</unitPattern>
@@ -6622,6 +6692,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} metriske kopper</unitPattern>
 				<unitPattern count="other" case="genitive">{0} metriske koppers</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriske flydende ounces</displayName>
+				<unitPattern count="one">{0} metrisk flydende ounce</unitPattern>
+				<unitPattern count="other">{0} metriske flydende ounces</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-fod</displayName>
 				<unitPattern count="one">{0} acre-fod</unitPattern>
@@ -6726,7 +6801,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} britisk quart</unitPattern>
 				<unitPattern count="other">{0} britiske quarts</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradianer</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradianer</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>international tabelkalorie</displayName>
+				<unitPattern count="one">{0} calIT</unitPattern>
+				<unitPattern count="other">{0} calIT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopond</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="other">{0} kilopond</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>lys</displayName>
+				<unitPattern count="one">{0} lys</unitPattern>
+				<unitPattern count="other">{0} lys</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>common</gender>
 				<displayName>milliardtedele</displayName>
 				<unitPattern count="one">{0} milliardtedel</unitPattern>
@@ -6736,7 +6881,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>common</gender>
-				<displayName>nætter</displayName>
 				<unitPattern count="one">{0} nat</unitPattern>
 				<unitPattern count="one" case="genitive">{0} nats</unitPattern>
 				<unitPattern count="other">{0} nætter</unitPattern>
@@ -6815,6 +6959,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7025,9 +7174,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>″ Hg</displayName>
-				<unitPattern count="one">{0} ″ Hg</unitPattern>
-				<unitPattern count="other">{0} ″ Hg</unitPattern>
+				<displayName>tommer Hg</displayName>
+				<unitPattern count="one">{0} tomme Hg</unitPattern>
+				<unitPattern count="other">{0} tommer Hg</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/t</displayName>
@@ -7148,7 +7297,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} britisk qt</unitPattern>
 				<unitPattern count="other">{0} britiske qt</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorie [IT]</displayName>
+				<unitPattern count="one">{0} calIT</unitPattern>
+				<unitPattern count="other">{0} calIT</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>lys</displayName>
+				<unitPattern count="one">{0} lys</unitPattern>
+				<unitPattern count="other">{0} lys</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>dele/milliard</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7198,11 +7370,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/L</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>p</displayName>
+				<unitPattern count="one">{0} p</unitPattern>
+				<unitPattern count="other">{0} p</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="other">{0} %</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0}mpgUK</unitPattern>
 				<unitPattern count="other">{0}mpgUK</unitPattern>
@@ -7281,7 +7463,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>kWh/100 km</displayName>
-				<unitPattern count="one">{0}kWh/100km</unitPattern>
+				<unitPattern count="one">{0} kWh/100 km</unitPattern>
 				<unitPattern count="other">{0} kWh/100 km</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
@@ -7414,11 +7596,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} br. qt.</unitPattern>
 				<unitPattern count="other">{0} br. qt.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calIT</displayName>
+				<unitPattern count="one">{0} calIT</unitPattern>
+				<unitPattern count="other">{0} calIT</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>lys</displayName>
+				<unitPattern count="one">{0} lys</unitPattern>
+				<unitPattern count="other">{0} lys</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>nætter</displayName>
 				<unitPattern count="one">{0}nat</unitPattern>
 				<unitPattern count="other">{0}nætter</unitPattern>
-				<perUnitPattern>{0}/nat</perUnitPattern>
 			</unit>
 		</unitLength>
 		<durationUnit type="hm">
diff --git a/make/data/cldr/common/main/de.xml b/make/data/cldr/common/main/de.xml
index 3ca5a3d1ec1..f2638088654 100644
--- a/make/data/cldr/common/main/de.xml
+++ b/make/data/cldr/common/main/de.xml
@@ -321,6 +321,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Kölsch</language>
 			<language type="ku">Kurdisch</language>
+			<language type="ku" menu="core" draft="contributed">Kurdisch</language>
+			<language type="ku" menu="extension" draft="contributed">Kurmandschi</language>
 			<language type="kum">Kumükisch</language>
 			<language type="kut">Kutenai</language>
 			<language type="kv">Komi</language>
@@ -946,6 +948,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Kolumbien</territory>
 			<territory type="CP">Clipperton-Insel</territory>
+			<territory type="CQ" draft="contributed">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -1224,35 +1227,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Sortierung nach Zahlen</key>
 			<key type="colStrength">Sortierstärke</key>
 			<key type="currency">Währung</key>
+			<key type="em" draft="contributed">Emojidarstellung</key>
 			<key type="hc">Stundenformat (12h/24h)</key>
 			<key type="lb">Zeilenumbruchstil</key>
+			<key type="lw" draft="contributed">Zeilenumbruch im Wortinneren</key>
 			<key type="ms">Maßsystem</key>
 			<key type="numbers">Ziffern</key>
+			<key type="ss" draft="contributed">Satzabbruch nach Abk.</key>
 			<key type="timezone">Zeitzone</key>
 			<key type="va">Lokale Variante</key>
 			<key type="x">Privatnutzung</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddhistischer Kalender</type>
+			<type key="calendar" type="buddhist" scope="core">buddhistisch</type>
 			<type key="calendar" type="chinese">Chinesischer Kalender</type>
+			<type key="calendar" type="chinese" scope="core">chinesisch</type>
 			<type key="calendar" type="coptic">Koptischer Kalender</type>
+			<type key="calendar" type="coptic" scope="core">koptisch</type>
 			<type key="calendar" type="dangi">Dangi-Kalender</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Äthiopischer Kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">äthiopisch</type>
 			<type key="calendar" type="ethiopic-amete-alem">Äthiopischer Amätä-Aläm-Kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">äthiopisch (Amätä Aläm)</type>
 			<type key="calendar" type="gregorian">Gregorianischer Kalender</type>
-			<type key="calendar" type="hebrew">Hebräischer Kalender</type>
+			<type key="calendar" type="gregorian" scope="core">gregorianisch</type>
+			<type key="calendar" type="hebrew">Jüdischer Kalender</type>
+			<type key="calendar" type="hebrew" scope="core">jüdisch</type>
 			<type key="calendar" type="indian">Indischer Nationalkalender</type>
-			<type key="calendar" type="islamic">Hidschri-Kalender</type>
-			<type key="calendar" type="islamic-civil">Bürgerlicher Hidschri-Kalender (tabellarisch)</type>
+			<type key="calendar" type="islamic">Hidschra-Kalender</type>
+			<type key="calendar" type="islamic" scope="core">Hidschra</type>
+			<type key="calendar" type="islamic-civil">Hidschra-Kalender (tabellarisch, nicht-astronomisch)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hidschra (tabellarisch, nicht-astronomisch)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Islamischer Kalender (Saudi-Arabien, Beobachtung)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">Islamischer Kalender (tabellarisch, astronomische Epoche)</type>
-			<type key="calendar" type="islamic-umalqura">Hidschri-Kalender (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura">Hidschra-Kalender (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hidschra (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601-Kalender</type>
 			<type key="calendar" type="japanese">Japanischer Kalender</type>
+			<type key="calendar" type="japanese" scope="core">japanisch</type>
 			<type key="calendar" type="persian">Persischer Kalender</type>
+			<type key="calendar" type="persian" scope="core">persisch</type>
 			<type key="calendar" type="roc">Minguo-Kalender</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Währungsformat (Buchhaltung)</type>
+			<type key="cf" type="account" scope="core" draft="contributed">Buchhaltung</type>
 			<type key="cf" type="standard">Währungsformat (Standard)</type>
+			<type key="cf" type="standard" scope="core" draft="contributed">Standard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Symbole sortieren</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Symbole sortieren ignorieren</type>
 			<type key="colBackwards" type="no" draft="contributed">Akzente normal sortieren</type>
@@ -1262,23 +1284,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Großbuchstaben zuerst aufführen</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ohne Groß-/Kleinschreibung sortieren</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Nach Groß-/Kleinschreibung sortieren</type>
-			<type key="collation" type="big5han">Traditionelle chinesische Sortierung (Big5)</type>
 			<type key="collation" type="compat">Vorherige Sortierung, Kompatibilität</type>
+			<type key="collation" type="compat" scope="core">Kompatibilität</type>
 			<type key="collation" type="dictionary">Lexikografische Sortierung</type>
+			<type key="collation" type="dictionary" scope="core">lexikografisch</type>
 			<type key="collation" type="ducet">Unicode-Sortierung</type>
+			<type key="collation" type="ducet" scope="core">Standard-Unicode</type>
 			<type key="collation" type="emoji" draft="unconfirmed">Emoji-Sortierung</type>
 			<type key="collation" type="eor" draft="contributed">Europäische Sortierregeln</type>
-			<type key="collation" type="gb2312han">Vereinfachte chinesische Sortierung (GB2312)</type>
 			<type key="collation" type="phonebook">Telefonbuch-Sortierung</type>
+			<type key="collation" type="phonebook" scope="core">Telefonbuch</type>
 			<type key="collation" type="phonetic">Phonetische Sortierung</type>
+			<type key="collation" type="phonetic" scope="core">phonetisch</type>
 			<type key="collation" type="pinyin">Pinyin-Sortierung</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Allgemeine Suche</type>
+			<type key="collation" type="search" scope="core">Suche</type>
 			<type key="collation" type="searchjl" draft="contributed">Suche nach Anfangsbuchstaben des koreanischen Alphabets</type>
 			<type key="collation" type="standard">Standard-Sortierung</type>
+			<type key="collation" type="standard" scope="core">Standard</type>
 			<type key="collation" type="stroke">Strichfolge</type>
+			<type key="collation" type="stroke" scope="core">Striche</type>
 			<type key="collation" type="traditional">Traditionelle Sortierung</type>
+			<type key="collation" type="traditional" scope="core">traditionell</type>
 			<type key="collation" type="unihan">Radikal-und-Strich-Sortierung</type>
+			<type key="collation" type="unihan" scope="core">Radikal und Strich</type>
 			<type key="collation" type="zhuyin">Zhuyin-Sortierung</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Ohne Normierung sortieren</type>
 			<type key="colNormalization" type="yes" draft="contributed">Nach Unicode sortieren</type>
 			<type key="colNumeric" type="no" draft="contributed">Ziffern einzeln sortieren</type>
@@ -1291,18 +1323,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Vollbreit</type>
 			<type key="d0" type="hwidth">Halbbreit</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerisch</type>
+			<type key="em" type="default" scope="core" draft="contributed">Standard</type>
+			<type key="em" type="emoji" scope="core" draft="contributed">Emoji</type>
+			<type key="em" type="text" scope="core" draft="contributed">Text</type>
 			<type key="hc" type="h11">12-Stunden-Format (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-Stunden-Format (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-Stunden-Format (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-Stunden-Format (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Lockerer Zeilenumbruch</type>
+			<type key="lb" type="loose" scope="core" draft="contributed">Locker</type>
 			<type key="lb" type="normal">Normaler Zeilenumbruch</type>
+			<type key="lb" type="normal" scope="core" draft="contributed">Normal</type>
 			<type key="lb" type="strict">Fester Zeilenumbruch</type>
+			<type key="lb" type="strict" scope="core" draft="contributed">Fest</type>
+			<type key="lw" type="breakall" scope="core" draft="contributed">Überall erlaubt</type>
+			<type key="lw" type="keepall" scope="core" draft="contributed">Nirgendwo erlaubt</type>
+			<type key="lw" type="normal" scope="core" draft="contributed">Normal</type>
+			<type key="lw" type="phrase" scope="core" draft="contributed">Wortgruppen erhalten</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">Metrisches System</type>
+			<type key="ms" type="metric" scope="core" draft="contributed">Metrisch</type>
 			<type key="ms" type="uksystem">Britisches Maßsystem</type>
+			<type key="ms" type="uksystem" scope="core" draft="contributed">Britisch</type>
 			<type key="ms" type="ussystem">US-Maßsystem</type>
+			<type key="ms" type="ussystem" scope="core" draft="contributed">US-amerikanisch</type>
 			<type key="numbers" type="ahom" draft="unconfirmed">Ahom-Ziffern</type>
 			<type key="numbers" type="arab">Arabisch-indische Ziffern</type>
 			<type key="numbers" type="arabext">Erweiterte arabisch-indische Ziffern</type>
@@ -1384,6 +1433,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Vai-Ziffern</type>
 			<type key="numbers" type="wara" draft="unconfirmed">Warang-Citi-Ziffern</type>
 			<type key="numbers" type="wcho" draft="unconfirmed">Wancho-Ziffern</type>
+			<type key="ss" type="none" scope="core" draft="contributed">Aus</type>
+			<type key="ss" type="standard" scope="core" draft="contributed">Ein</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Internationales (SI)</measurementSystemName>
@@ -1404,13 +1455,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[aä b c d e f g h i j k l m n oö p q r s ß t uü v w x y z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[áàăâåãā æ ç éèĕêëē ğ íìĭîïİī ı ñ óòŏôøō œ ş úùŭûū ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary" draft="contributed">[| ~]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary" draft="contributed">[× | ~]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="general" level="lenient">
 			<parseLenient sample="’">['＇’ ՚ ᾽᾿ ʼ ߴ]</parseLenient>
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
@@ -2094,6 +2146,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'um' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'um' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2102,6 +2157,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'um' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'um' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2119,7 +2177,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
@@ -2127,6 +2187,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">HH 'Uhr'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv" draft="contributed">HH 'Uhr' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -2462,6 +2523,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'um' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'um' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2470,6 +2534,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'um' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'um' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2482,25 +2549,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">h 'Uhr' B</dateFormatItem>
+						<dateFormatItem id="EBh">E, h 'Uhr' B</dateFormatItem>
+						<dateFormatItem id="EBhm">E, h:mm 'Uhr' B</dateFormatItem>
+						<dateFormatItem id="EBhms">E, h:mm:ss 'Uhr' B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
+						<dateFormatItem id="Eh" draft="contributed">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h 'Uhr' a</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH 'Uhr'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'Uhr' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
-						<dateFormatItem id="MMd">d.MM.</dateFormatItem>
+						<dateFormatItem id="MMd">dd.MM.</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
@@ -2511,7 +2587,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d.M.y</dateFormatItem>
-						<dateFormatItem id="yMM">MM.y</dateFormatItem>
+						<dateFormatItem id="yMM">MM/y</dateFormatItem>
 						<dateFormatItem id="yMMdd">dd.MM.y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d. MMM y</dateFormatItem>
@@ -2574,8 +2650,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, d. MMM y – E, d. MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h 'Uhr' a – h 'Uhr' a</greatestDifference>
-							<greatestDifference id="h">h – h 'Uhr' a</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH–HH 'Uhr'</greatestDifference>
@@ -2598,10 +2674,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">HH:mm–HH:mm 'Uhr' v</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm 'Uhr' v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">HH–HH 'Uhr' v</greatestDifference>
 						</intervalFormatItem>
@@ -3283,18 +3355,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Unbekannt</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Eriwan</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
 				<exemplarCity>Wostok</exemplarCity>
 			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
@@ -3310,21 +3376,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brunei Darussalam</exemplarCity>
 			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Osterinsel</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
 			</zone>
@@ -3340,9 +3397,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Prag</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Africa/Djibouti">
 				<exemplarCity>Dschibuti</exemplarCity>
 			</zone>
@@ -3355,9 +3409,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Cairo">
 				<exemplarCity>Kairo</exemplarCity>
 			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Kanaren</exemplarCity>
 			</zone>
@@ -3416,9 +3467,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Bischkek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komoren</exemplarCity>
 			</zone>
@@ -3551,12 +3599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskus</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Duschanbe</exemplarCity>
 			</zone>
@@ -3610,9 +3652,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Westafrikanische Zeit</generic>
-					<standard>Westafrikanische Normalzeit</standard>
-					<daylight>Westafrikanische Sommerzeit</daylight>
+					<standard>Westafrikanische Zeit</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4015,6 +4055,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyana-Zeit</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleuten-Normalzeit</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleuten-Zeit</generic>
@@ -4355,7 +4400,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Ponape-Zeit</standard>
+					<standard>Pohnpei-Zeit</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
@@ -4465,6 +4510,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuuk-Zeit</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">Türkische Zeit</generic>
+					<standard draft="contributed">Türkische Normalzeit</standard>
+					<daylight draft="contributed">Türkische Sommerzeit</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistan-Zeit</generic>
@@ -4629,7 +4681,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5447,7 +5499,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="MVR">
 				<displayName>Malediven-Rufiyaa</displayName>
 				<displayName count="one">Malediven-Rufiyaa</displayName>
-				<displayName count="other">Malediven-Rupien</displayName>
+				<displayName count="other">Malediven-Rufiyaa</displayName>
 			</currency>
 			<currency type="MWK">
 				<displayName>Malawi-Kwacha</displayName>
@@ -5897,6 +5949,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Ostkaribischer Dollar</displayName>
 				<displayName count="other">Ostkaribische Dollar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">Karibischer Gulden</displayName>
+				<displayName count="one" draft="contributed">Karibischer Gulden</displayName>
+				<displayName count="other" draft="contributed">Karibische Gulden</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Sonderziehungsrechte</displayName>
 			</currency>
@@ -6005,6 +6062,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Simbabwe-Dollar (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">Simbabwe-Gold</displayName>
+				<displayName count="one">Simbabwe-Gold</displayName>
+				<displayName count="other">Simbabwe-Gold</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Simbabwe-Dollar (2009)</displayName>
 			</currency>
@@ -6363,7 +6425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Karat</unitPattern>
 				<unitPattern count="one" case="accusative">{0} Karat</unitPattern>
 				<unitPattern count="one" case="dative">{0} Karat</unitPattern>
-				<unitPattern count="one" case="genitive">{0} Karats</unitPattern>
+				<unitPattern count="one" case="genitive">{0} Karat</unitPattern>
 				<unitPattern count="other">{0} Karat</unitPattern>
 				<unitPattern count="other" case="accusative">{0} Karat</unitPattern>
 				<unitPattern count="other" case="dative">{0} Karat</unitPattern>
@@ -6405,7 +6467,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative" draft="contributed">{0} Elementen</unitPattern>
 				<unitPattern count="other" case="genitive" draft="contributed">{0} Elemente</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>Teile</displayName>
+				<unitPattern count="one">{0} Teil</unitPattern>
+				<unitPattern count="other">{0} Teile</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>neuter</gender>
 				<displayName>Millionstel</displayName>
 				<unitPattern count="one">{0} Millionstel</unitPattern>
@@ -6459,12 +6526,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Mol</unitPattern>
 				<unitPattern count="one" case="accusative">{0} Mol</unitPattern>
 				<unitPattern count="one" case="dative">{0} Mol</unitPattern>
-				<unitPattern count="one" case="genitive">{0} Mols</unitPattern>
+				<unitPattern count="one" case="genitive">{0} Mol</unitPattern>
 				<unitPattern count="other">{0} Mol</unitPattern>
 				<unitPattern count="other" case="accusative">{0} Mol</unitPattern>
 				<unitPattern count="other" case="dative">{0} Mol</unitPattern>
 				<unitPattern count="other" case="genitive">{0} Mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glukose</displayName>
+				<unitPattern count="one" draft="contributed">{0} Glukose</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Glukose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>Liter pro Kilometer</displayName>
@@ -6530,7 +6602,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Terabytes</displayName>
 				<unitPattern count="one">{0} Terabyte</unitPattern>
 				<unitPattern count="one" case="accusative">{0} Terabyte</unitPattern>
-				<unitPattern count="one" case="dative">{0} Terabyte</unitPattern>
+				<unitPattern count="one" case="dative">{0} Terabyte</unitPattern>
 				<unitPattern count="one" case="genitive">{0} Terabyte</unitPattern>
 				<unitPattern count="other">{0} Terabyte</unitPattern>
 				<unitPattern count="other" case="accusative">{0} Terabyte</unitPattern>
@@ -6553,7 +6625,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>neuter</gender>
 				<displayName>Gigabytes</displayName>
 				<unitPattern count="one">{0} Gigabyte</unitPattern>
-				<unitPattern count="one" case="accusative">{0} Gigabyte</unitPattern>
+				<unitPattern count="one" case="accusative">{0} Gigabyte</unitPattern>
 				<unitPattern count="one" case="dative">{0} Gigabyte</unitPattern>
 				<unitPattern count="one" case="genitive">{0} Gigabyte</unitPattern>
 				<unitPattern count="other">{0} Gigabyte</unitPattern>
@@ -6961,7 +7033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Newton</unitPattern>
 				<unitPattern count="one" case="accusative">{0} Newton</unitPattern>
 				<unitPattern count="one" case="dative">{0} Newton</unitPattern>
-				<unitPattern count="one" case="genitive">{0} Newtons</unitPattern>
+				<unitPattern count="one" case="genitive">{0} Newton</unitPattern>
 				<unitPattern count="other">{0} Newton</unitPattern>
 				<unitPattern count="other" case="accusative">{0} Newton</unitPattern>
 				<unitPattern count="other" case="dative">{0} Newton</unitPattern>
@@ -7590,6 +7662,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} Millimeter Quecksilbersäule</unitPattern>
 				<unitPattern count="other" case="genitive">{0} Millimeter Quecksilbersäule</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">Quecksilber</displayName>
+				<unitPattern count="one" draft="contributed">{0} Quecksilber</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Quecksilber</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>Pfund pro Quadratzoll</displayName>
 				<unitPattern count="one">{0} Pfund pro Quadratzoll</unitPattern>
@@ -7968,6 +8045,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} metrischen Tassen</unitPattern>
 				<unitPattern count="other" case="genitive">{0} metrischen Tassen</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">metrische Flüssigunzen</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrische Flüssigunze</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metrische Flüssigunzen</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} Acre-Foot</unitPattern>
 				<unitPattern count="other">{0} Acre-Feet</unitPattern>
@@ -8173,7 +8255,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} Imp. Quart</unitPattern>
 				<unitPattern count="other" case="genitive">{0} Imp. Quart</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName draft="contributed">Steradiant</displayName>
+				<unitPattern count="one" draft="contributed">{0} Steradiant</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Steradiant</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">Katal</displayName>
+				<unitPattern count="one" draft="contributed">{0} Katal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">Coulomb</displayName>
+				<unitPattern count="one" draft="contributed">{0} Coulomb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">Farad</displayName>
+				<unitPattern count="one" draft="contributed">{0} Farad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">Henry</displayName>
+				<unitPattern count="one" draft="contributed">{0} Henry</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">Siemens</displayName>
+				<unitPattern count="one" draft="contributed">{0} Siemens</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">Internationale-Tafel-Kalorie</displayName>
+				<unitPattern count="one" draft="contributed">{0} Internationale-Tafel-Kalorie</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Internationale-Tafel-Kalorien</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">Becquerel</displayName>
+				<unitPattern count="one" draft="contributed">{0} Becquerel</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">Sievert</displayName>
+				<unitPattern count="one" draft="contributed">{0} Sievert</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">Gray</displayName>
+				<unitPattern count="one" draft="contributed">{0} Gray</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">Kraftkilogramm</displayName>
+				<unitPattern count="one" draft="contributed">{0} Krafatkilogramm</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Krafatkilogramm</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">Tesla</displayName>
+				<unitPattern count="one" draft="contributed">{0} Tesla</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">Weber</displayName>
+				<unitPattern count="one" draft="contributed">{0} Weber</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Weber</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">Lichtgeschwindigkeit</displayName>
+				<unitPattern count="one">{0}-fache Lichtgeschwindigkeit</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}-fache Lichtgeschwindigkeit</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>neuter</gender>
 				<displayName>Milliardstel</displayName>
 				<unitPattern count="one">{0} Milliardstel</unitPattern>
@@ -8187,11 +8339,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>Übernachtungen</displayName>
-				<unitPattern count="one">{0} Übernachtung</unitPattern>
-				<unitPattern count="one" case="accusative">{0} Übernachtung</unitPattern>
-				<unitPattern count="one" case="dative">{0} Übernachtung</unitPattern>
-				<unitPattern count="one" case="genitive">{0} Übernachtung</unitPattern>
+				<unitPattern count="one">{0} Nacht</unitPattern>
+				<unitPattern count="one" case="accusative">{0} Nacht</unitPattern>
+				<unitPattern count="one" case="dative">{0} Nacht</unitPattern>
+				<unitPattern count="one" case="genitive">{0} Nacht</unitPattern>
 				<unitPattern count="other">{0} Übernachtungen</unitPattern>
 				<unitPattern count="other" case="accusative">{0} Übernachtungen</unitPattern>
 				<unitPattern count="other" case="dative">{0} Übernachtungen</unitPattern>
@@ -8253,6 +8404,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Element</unitPattern>
 				<unitPattern count="other">{0} Elemente</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>Teil</displayName>
+				<unitPattern count="one">{0} Teil</unitPattern>
+				<unitPattern count="other">{0} Teil</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="other">{0} %</unitPattern>
@@ -8265,6 +8421,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -8361,6 +8520,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} Std.</unitPattern>
 			</unit>
 			<unit type="duration-minute">
+				<displayName>Min.</displayName>
 				<unitPattern count="one">{0} Min.</unitPattern>
 				<unitPattern count="other">{0} Min.</unitPattern>
 			</unit>
@@ -8390,6 +8550,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} J</unitPattern>
 				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
+			<unit type="force-newton">
+				<displayName>Newton</displayName>
+			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>kWh/100 km</displayName>
 				<unitPattern count="one">{0} kWh/100 km</unitPattern>
@@ -8538,6 +8701,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Ta</unitPattern>
 				<unitPattern count="other">{0} Ta</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">fl.oz. m.</displayName>
+				<unitPattern count="one">{0} fl.oz. m.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl.oz. m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>Acre-Feet</displayName>
 			</unit>
@@ -8562,7 +8730,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fl oz</displayName>
-				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="one">{0} fl.oz.</unitPattern>
 				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
@@ -8615,7 +8783,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Imp.qt.</unitPattern>
 				<unitPattern count="other">{0} Imp.qt.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">calIT</displayName>
+				<unitPattern count="one">{0} calIT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} calIT</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gy</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">Lichtgeschw.</displayName>
+				<unitPattern count="one">{0}-fache Lichtg.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}-fache Lichtg.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>Milliardstel</displayName>
 				<unitPattern count="one">{0} Milliardstel</unitPattern>
 				<unitPattern count="other">{0} Milliardstel</unitPattern>
@@ -8683,6 +8885,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Elem.</unitPattern>
 				<unitPattern count="other">{0} Elem.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>Teil</displayName>
+				<unitPattern count="one">{0} Teil</unitPattern>
+				<unitPattern count="other">{0} Teil</unitPattern>
+			</unit>
 			<unit type="concentr-permille">
 				<unitPattern count="one">{0}‰</unitPattern>
 				<unitPattern count="other">{0}‰</unitPattern>
@@ -8691,6 +8898,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0}Glc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}l/km</unitPattern>
 				<unitPattern count="other">{0}l/km</unitPattern>
@@ -8758,6 +8970,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} T</unitPattern>
 				<unitPattern count="other">{0} T</unitPattern>
 			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="one">{0}h</unitPattern>
+				<unitPattern count="other">{0}h</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="one">{0}ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
 			<unit type="electric-ampere">
 				<displayName>A</displayName>
 				<unitPattern count="one">{0}A</unitPattern>
@@ -8898,6 +9122,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>W</displayName>
 			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<unitPattern count="one">{0}mmHg</unitPattern>
+				<unitPattern count="other">{0}mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one" draft="contributed">{0}Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<unitPattern count="one">{0}psi</unitPattern>
+				<unitPattern count="other">{0}psi</unitPattern>
+			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one" draft="contributed">{0}°F</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}°F</unitPattern>
@@ -8913,6 +9149,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-liter">
 				<displayName>l</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl.oz. m.</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ac ft</displayName>
 			</unit>
@@ -8922,6 +9161,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} Imp.gal</unitPattern>
 				<perUnitPattern>{0}/Imp.gal</perUnitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl.oz.</displayName>
+			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>Im.fl.oz</displayName>
 				<unitPattern count="one">{0} Im.fl.oz</unitPattern>
@@ -8955,11 +9197,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Imp.qt</unitPattern>
 				<unitPattern count="other">{0} Imp.qt</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one" draft="contributed">{0}sr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}sr</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calIT</displayName>
+				<unitPattern count="one" draft="contributed">{0}calIT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}calIT</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0}T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0}Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">c</displayName>
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>Nächte</displayName>
 				<unitPattern count="one">{0}Nacht</unitPattern>
 				<unitPattern count="other">{0}Nächte</unitPattern>
-				<perUnitPattern>{0}/Nacht</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>NOSW</displayName>
diff --git a/make/data/cldr/common/main/de_AT.xml b/make/data/cldr/common/main/de_AT.xml
index 2c5005d9184..f3006e8c4a5 100644
--- a/make/data/cldr/common/main/de_AT.xml
+++ b/make/data/cldr/common/main/de_AT.xml
@@ -111,6 +111,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/de_CH.xml b/make/data/cldr/common/main/de_CH.xml
index d8c3c358004..08863f8192a 100644
--- a/make/data/cldr/common/main/de_CH.xml
+++ b/make/data/cldr/common/main/de_CH.xml
@@ -41,9 +41,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="ms">Mass-System</key>
 		</keys>
 		<types>
+			<type key="calendar" type="buddhist" scope="core">Buddhistisch</type>
+			<type key="calendar" type="chinese" scope="core">Chinesisch</type>
+			<type key="calendar" type="coptic" scope="core">Koptisch</type>
+			<type key="calendar" type="ethiopic" scope="core">Äthiopisch</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Äthiopisch Amäta Aläm</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorianisch</type>
+			<type key="calendar" type="hebrew" scope="core">Hebräisch</type>
+			<type key="calendar" type="japanese" scope="core">Japanisch</type>
+			<type key="calendar" type="persian" scope="core">Persisch</type>
 			<type key="colCaseFirst" type="upper" draft="contributed">Grossbuchstaben zuerst aufführen</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ohne Gross-/Kleinschreibung sortieren</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Nach Gross-/Kleinschreibung sortieren</type>
+			<type key="collation" type="dictionary" scope="core">Lexikografisch</type>
+			<type key="collation" type="ducet" scope="core">Unicode (Standard)</type>
+			<type key="collation" type="phonetic" scope="core">Phonetisch</type>
+			<type key="collation" type="stroke" scope="core">Strichfolge</type>
+			<type key="collation" type="traditional" scope="core">Traditionell</type>
 			<type key="ms" type="uksystem">britisches Mass-System</type>
 			<type key="ms" type="ussystem">US Mass-System</type>
 		</types>
@@ -73,7 +87,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</days>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, MM.dd.Y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="M">
@@ -137,7 +153,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
-			<group>’</group>
+			<group>'</group>
 		</symbols>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
@@ -150,6 +166,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency" draft="contributed">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber" draft="contributed">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000" count="one" alt="alphaNextToNumber">0</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">0</pattern>
+					<pattern type="1000000" count="one">¤ 0 Mio'.'</pattern>
+					<pattern type="1000000" count="other">¤ 0 Mio'.'</pattern>
+					<pattern type="10000000" count="one">¤ 00 Mio'.'</pattern>
+					<pattern type="10000000" count="other">¤ 00 Mio'.'</pattern>
+					<pattern type="100000000" count="one">¤ 000 Mio'.'</pattern>
+					<pattern type="100000000" count="other">¤ 000 Mio'.'</pattern>
+					<pattern type="1000000000" count="one">¤ 0 Mrd'.'</pattern>
+					<pattern type="1000000000" count="other">¤ 0 Mrd'.'</pattern>
+					<pattern type="10000000000" count="one">¤ 00 Mrd'.'</pattern>
+					<pattern type="10000000000" count="other">¤ 00 Mrd'.'</pattern>
+					<pattern type="100000000000" count="one">¤ 000 Mrd'.'</pattern>
+					<pattern type="100000000000" count="other">¤ 000 Mrd'.'</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 Bio'.'</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 Bio'.'</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 Bio'.'</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 Bio'.'</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 Bio'.'</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 Bio'.'</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -173,6 +219,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">São-toméischer Dobra (2018)</displayName>
 				<displayName count="other">São-toméischer Dobra (2018)</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName count="one" draft="contributed">Karibischer Gulden</displayName>
+				<displayName count="other" draft="contributed">Karibischer Gulden</displayName>
+			</currency>
 		</currencies>
 	</numbers>
 	<units>
@@ -184,6 +234,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} Quadratfuss</unitPattern>
 				<unitPattern count="other" case="genitive">{0} Quadratfuss</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>Punkte</displayName>
+				<unitPattern count="one">{0} Punkt</unitPattern>
+				<unitPattern count="other">{0} Punkte</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<unitPattern count="one" case="accusative">{0} Mol</unitPattern>
+				<unitPattern count="one" case="dative">{0} Mol</unitPattern>
+				<unitPattern count="one" case="genitive">{0} Mol</unitPattern>
+				<unitPattern count="other" case="accusative">{0} Mole</unitPattern>
+				<unitPattern count="other" case="dative">{0} Molen</unitPattern>
+				<unitPattern count="other" case="genitive">{0} Mole</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glucose</displayName>
+				<unitPattern count="one" draft="contributed">{0} Glucose</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Glucose</unitPattern>
+			</unit>
 			<unit type="duration-quarter">
 				<displayName>Quartal</displayName>
 			</unit>
@@ -194,6 +262,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} Fuss</unitPattern>
 				<perUnitPattern>{0} pro Fuss</perUnitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">Quecksilbersäule</displayName>
+				<unitPattern count="one" draft="contributed">{0} Quecksilbersäule</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Quecksilbersäule</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="one">{0} Beaufort</unitPattern>
 				<unitPattern count="other">{0} Beaufort</unitPattern>
@@ -209,18 +282,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="dative">{0} Kubikfuss</unitPattern>
 				<unitPattern count="other" case="genitive">{0} Kubikfuss</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one" draft="contributed">{0} Steradiant</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Steradianten</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">Coulombs</displayName>
+				<unitPattern count="one" draft="contributed">{0} Coulomb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Coulombs</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">Kalorie [IT]</displayName>
+				<unitPattern count="one" draft="contributed">{0} Kalorie [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Kalorien [IT]</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">Kilogrammkraft</displayName>
+				<unitPattern count="one" draft="contributed">{0} Kilogrammkraft</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Kilogrammkraft</unitPattern>
+			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="concentr-part">
+				<displayName>Punkt</displayName>
+				<unitPattern count="one">{0} Punkt</unitPattern>
+				<unitPattern count="other">{0} Punkte</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one" draft="contributed">{0} Glc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Glc</unitPattern>
+			</unit>
 			<unit type="duration-quarter">
 				<displayName>Quartal</displayName>
 			</unit>
 			<unit type="length-foot">
 				<displayName>Fuss</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one" draft="contributed">{0} Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="one">{0} Bft</unitPattern>
 				<unitPattern count="other">{0} Bft</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} m. fl. oz.</unitPattern>
+			</unit>
 			<unit type="volume-dram">
 				<displayName>Dram</displayName>
 				<unitPattern count="one">{0} dr.</unitPattern>
@@ -235,6 +344,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} Prise</unitPattern>
 				<unitPattern count="other">{0} Prise</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one" draft="contributed">{0} kat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">kcal [IT]</displayName>
+				<unitPattern count="one">{0} kcal [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one" draft="contributed">{0} Bq</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Bq</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="concentr-part">
+				<displayName>Punkt</displayName>
+				<unitPattern count="one">{0} Punkt</unitPattern>
+				<unitPattern count="other">{0} Punkte</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="other">{0} m. fl. oz.</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one" draft="contributed">{0} kat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kcal [IT]</displayName>
+				<unitPattern count="one" draft="contributed">{0} kcal [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kcal [IT]</unitPattern>
+			</unit>
 		</unitLength>
 	</units>
 	<typographicNames>
diff --git a/make/data/cldr/common/main/de_LI.xml b/make/data/cldr/common/main/de_LI.xml
index 718cb336a1a..a26e00d8e02 100644
--- a/make/data/cldr/common/main/de_LI.xml
+++ b/make/data/cldr/common/main/de_LI.xml
@@ -31,7 +31,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
-			<group>’</group>
+			<group>'</group>
 		</symbols>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
@@ -44,6 +44,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/de_LU.xml b/make/data/cldr/common/main/de_LU.xml
index 4ec6b9f5bcb..d80e409bd12 100644
--- a/make/data/cldr/common/main/de_LU.xml
+++ b/make/data/cldr/common/main/de_LU.xml
@@ -22,11 +22,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
 			</calendar>
 		</calendars>
 	</dates>
diff --git a/make/data/cldr/common/main/doi.xml b/make/data/cldr/common/main/doi.xml
index b6c9dc75dfb..5f163f3a3b9 100644
--- a/make/data/cldr/common/main/doi.xml
+++ b/make/data/cldr/common/main/doi.xml
@@ -975,7 +975,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-millimole-per-liter">
 				<displayName>मिलीमोल फी लीटर</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>हिस्से फी दस लक्ख</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -1499,7 +1499,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-millimole-per-liter">
 				<displayName>मिलीमोल/लीटर</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>हिस्से/दस लक्ख</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -1942,7 +1942,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-millimole-per-liter">
 				<displayName>मिलीमोल/ली</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>हिफीदल</displayName>
 			</unit>
 			<unit type="concentr-mole">
diff --git a/make/data/cldr/common/main/dsb.xml b/make/data/cldr/common/main/dsb.xml
index 486cd558ea6..53a8781b067 100644
--- a/make/data/cldr/common/main/dsb.xml
+++ b/make/data/cldr/common/main/dsb.xml
@@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ay">aymaršćina</language>
 			<language type="az">azerbajdžanšćina</language>
 			<language type="ba">baškiršćina</language>
+			<language type="bal">balučišćina</language>
 			<language type="ban">balinezišćina</language>
 			<language type="bas">basaa</language>
 			<language type="be">běłorušćina</language>
@@ -229,6 +230,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafia</language>
 			<language type="ksh">kelnšćina</language>
 			<language type="ku">kurdišćina</language>
+			<language type="ku" menu="core">kurdišćina</language>
+			<language type="ku" menu="extension">kurmandźišćina</language>
 			<language type="kum">kumykšćina</language>
 			<language type="kv">komišćina</language>
 			<language type="kw">kornišćina</language>
@@ -621,6 +624,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">China</territory>
 			<territory type="CO">Kolumbiska</territory>
 			<territory type="CP">Clippertonowa kupa</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kap Verde</territory>
@@ -848,42 +852,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">format płaśidła</key>
 			<key type="collation">sortěrowański slěd</key>
 			<key type="currency">pjenjeze</key>
+			<key type="em">pśedstajenje emojija</key>
 			<key type="hc">góźinowy cyklus (12 vs 24)</key>
 			<key type="lb">system łamanja smužkow</key>
+			<key type="lw">łamanje smužki w słowje</key>
 			<key type="ms">system měrow</key>
 			<key type="numbers">licby</key>
+			<key type="ss">pśetergnjenje sady pó skrotconce</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddhistiski kalender</type>
+			<type key="calendar" type="buddhist" scope="core">buddhistiski</type>
 			<type key="calendar" type="chinese">chinski kalender</type>
+			<type key="calendar" type="chinese" scope="core">chinski</type>
 			<type key="calendar" type="coptic">koptiski kalendaŕ</type>
+			<type key="calendar" type="coptic" scope="core">koptiski</type>
 			<type key="calendar" type="dangi">dangi kalender</type>
+			<type key="calendar" type="dangi" scope="core">dangiski</type>
 			<type key="calendar" type="ethiopic">etiopiski kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopiski</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopiski amete-alem-kalendaŕ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopiski Amete-Alem</type>
 			<type key="calendar" type="gregorian">gregoriański kalender</type>
+			<type key="calendar" type="gregorian" scope="core">gregorjaniski</type>
 			<type key="calendar" type="hebrew">žydojski kalender</type>
+			<type key="calendar" type="hebrew" scope="core">hebrejski</type>
 			<type key="calendar" type="islamic">islamski kalender</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
 			<type key="calendar" type="islamic-civil">islamski ciwilny kalendaŕ</type>
+			<type key="calendar" type="islamic-civil" scope="core">islamski ciwilny</type>
 			<type key="calendar" type="islamic-umalqura">islamski umalqui-kalendaŕ</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islamski Umm al-Qura</type>
 			<type key="calendar" type="iso8601">iso-8601-kalender</type>
 			<type key="calendar" type="japanese">japański kalender</type>
+			<type key="calendar" type="japanese" scope="core">japański</type>
 			<type key="calendar" type="persian">persiski kalender</type>
+			<type key="calendar" type="persian" scope="core">persiski</type>
 			<type key="calendar" type="roc">kalender republiki China</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">knigływjeźeński format płaśidła</type>
+			<type key="cf" type="account" scope="core">knigływjeźenje</type>
 			<type key="cf" type="standard">standardny format płaśidła</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="collation" type="ducet">sortěrowański slěd pó Unicoźe</type>
+			<type key="collation" type="ducet" scope="core">standardne unicode-rědowanje</type>
 			<type key="collation" type="search">powšykne pytanje</type>
+			<type key="collation" type="search" scope="core">pytaj</type>
 			<type key="collation" type="standard">standardny sortěrowański slěd</type>
+			<type key="collation" type="standard" scope="core">standardne</type>
+			<type key="em" type="default" scope="core">default</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-góźinowy cyklus (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-góźinowy cyklus (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-góźinowy cyklus (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-góźinowy cyklus (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">lichy stil łamanja smužkow</type>
+			<type key="lb" type="loose" scope="core">wólny</type>
 			<type key="lb" type="normal">běžny stil łamanja smužkow</type>
+			<type key="lb" type="normal" scope="core">normalny</type>
 			<type key="lb" type="strict">kšuty stil łamanja smužkow</type>
+			<type key="lb" type="strict" scope="core">kšuty</type>
+			<type key="lw" type="breakall" scope="core">łam wšykno</type>
+			<type key="lw" type="keepall" scope="core">zdźarž wšykno</type>
+			<type key="lw" type="normal" scope="core">normalne</type>
+			<type key="lw" type="phrase" scope="core">w sadach</type>
 			<type key="ms" type="metric">metriski system</type>
+			<type key="ms" type="metric" scope="core">metriski</type>
 			<type key="ms" type="uksystem">britiski system měrow</type>
+			<type key="ms" type="uksystem" scope="core">britiski</type>
 			<type key="ms" type="ussystem">amerikański system měrow</type>
+			<type key="ms" type="ussystem" scope="core">ameriski</type>
 			<type key="numbers" type="arab">arabisko-indiske cyfry</type>
 			<type key="numbers" type="arabext">rozšyrjone arabisko-indiske cyfry</type>
 			<type key="numbers" type="armn">armeńske cyfry</type>
@@ -924,6 +967,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">thaiske cyfry</type>
 			<type key="numbers" type="tibt">tibetske cyfry</type>
 			<type key="numbers" type="vaii">vaiske cyfry</type>
+			<type key="ss" type="none" scope="core">ně</type>
+			<type key="ss" type="standard" scope="core">jo</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metriski</measurementSystemName>
@@ -941,6 +986,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="auxiliary">[áàăâåäãąā æ ç ďđ éèĕêëėęē ğ íìĭîïİī ı ĺľ ňñ òŏôöőøō œ ř ş ß ť úùŭûůüűū ýÿ ż]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C Č Ć D E F G H {Ch} I J K Ł L M N O P Q R S Š Ś T U V W X Y Z Ž Ź]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person" draft="contributed">[\- ‐‑ , . * / † ⚭]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>„</quotationStart>
@@ -1003,21 +1049,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Bh">h 'hodź'. B</dateFormatItem>
+						<dateFormatItem id="Bh">'zeg'. h B</dateFormatItem>
+						<dateFormatItem id="EBh">E 'zeg'. h B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
+						<dateFormatItem id="Eh">E 'zeg'. h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h 'hodź'. a</dateFormatItem>
-						<dateFormatItem id="H">HH 'hodź'.</dateFormatItem>
+						<dateFormatItem id="h">'zeg'. h a</dateFormatItem>
+						<dateFormatItem id="H">'zeg'. HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">'zeg'. h a v</dateFormatItem>
+						<dateFormatItem id="Hv">'zeg'. HH v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -1365,6 +1417,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'zeger' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'zeger' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1373,6 +1428,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'zeger' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'zeger' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1385,14 +1443,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">'zeg'. h B</dateFormatItem>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="EBh">E, 'zeg'. h B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, 'zeg'. H:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
@@ -1404,6 +1466,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
+						<dateFormatItem id="hv">'zeg'. h a v</dateFormatItem>
+						<dateFormatItem id="Hv">'zeg'. H v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -2414,9 +2478,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komory</exemplarCity>
 			</zone>
@@ -2568,9 +2629,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Pódwjacornoafriski cas</generic>
-					<standard>Pódwjacornoafriski standardny cas</standard>
-					<daylight>Pódwjacornoafriski lěśojski cas</daylight>
+					<standard>Pódwjacornoafriski cas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2935,6 +2994,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyański cas</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaiisko-aleutski standardny cas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaiisko-aleutski cas</generic>
@@ -3524,6 +3588,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="latn">
+			<rationalUsage>casy</rationalUsage>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -3535,6 +3602,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4876,6 +4947,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">pódzajtšnokaribiske dolary</displayName>
 				<displayName count="other">pódzajtšnokaribiskich dolarow</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibiski šesnak</displayName>
+				<displayName count="one">karibiski šesnak</displayName>
+				<displayName count="two">karibiskej šesnaka</displayName>
+				<displayName count="few">karibiske šesnaki</displayName>
+				<displayName count="other">karibiskich šesnakow</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>CFA-frank (BCEAO)</displayName>
 				<displayName count="one">CFA-frank (BCEAO)</displayName>
@@ -4918,6 +4996,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">sambiske kwachy</displayName>
 				<displayName count="other">sambiskich kwachow</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>simbabwiske złoto</displayName>
+				<displayName count="one">simbabwiske złoto</displayName>
+				<displayName count="two">simbabwiskej złośe</displayName>
+				<displayName count="few">simbabwiske złota</displayName>
+				<displayName count="other">simbabwiskich złotow</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
@@ -5199,7 +5284,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} kuski</unitPattern>
 				<unitPattern count="other">{0} kuskow</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>źěle</displayName>
+				<unitPattern count="one">{0} źěl</unitPattern>
+				<unitPattern count="two">{0} źěla</unitPattern>
+				<unitPattern count="few">{0} źěle</unitPattern>
+				<unitPattern count="other">{0} źělow</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>milionśiny</displayName>
 				<unitPattern count="one">{0} milionśina</unitPattern>
 				<unitPattern count="two">{0} milionśinje</unitPattern>
@@ -5234,6 +5326,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} mole</unitPattern>
 				<unitPattern count="other">{0} molow</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoze</displayName>
+				<unitPattern count="one">{0} glukoze</unitPattern>
+				<unitPattern count="two">{0} glukoze</unitPattern>
+				<unitPattern count="few">{0} glukoze</unitPattern>
+				<unitPattern count="other">{0} glukoze</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litry na kilometer</displayName>
 				<unitPattern count="one">{0} liter na kilometer</unitPattern>
@@ -5948,6 +6047,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} milimetry słupika žywego slobra</unitPattern>
 				<unitPattern count="other">{0} milimetrow słupika žywego slobra</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>žywoslobrowego słupika</displayName>
+				<unitPattern count="one">{0} žywoslobrowego słupika</unitPattern>
+				<unitPattern count="two">{0} žywoslobrowego słupika</unitPattern>
+				<unitPattern count="few">{0} žywoslobrowego słupika</unitPattern>
+				<unitPattern count="other">{0} žywoslobrowego słupika</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>punty na kwadratny col</displayName>
 				<unitPattern count="one">{0} punt na kwadratny col</unitPattern>
@@ -6195,6 +6301,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} metriske taski</unitPattern>
 				<unitPattern count="other">{0} metriskich taskow</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriske žydke unce</displayName>
+				<unitPattern count="one">{0} žydka unca</unitPattern>
+				<unitPattern count="two">{0} žydkej uncy</unitPattern>
+				<unitPattern count="few">{0} žydke unce</unitPattern>
+				<unitPattern count="other">{0} metriskich žydkich uncow</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>aker-crjeje</displayName>
 				<unitPattern count="one">{0} aker-crjej</unitPattern>
@@ -6316,6 +6429,97 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} britiske běrtyle</unitPattern>
 				<unitPattern count="other">{0} britiskich běrtylow</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiany</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="two">{0} steradiana</unitPattern>
+				<unitPattern count="few">{0} steradiany</unitPattern>
+				<unitPattern count="other">{0} steradianow</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katale</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="two">{0} katala</unitPattern>
+				<unitPattern count="few">{0} katale</unitPattern>
+				<unitPattern count="other">{0} katalow</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomby</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="two">{0} coulomba</unitPattern>
+				<unitPattern count="few">{0} coulomby</unitPattern>
+				<unitPattern count="other">{0} coulombow</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farady</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="two">{0} farada</unitPattern>
+				<unitPattern count="few">{0} farady</unitPattern>
+				<unitPattern count="other">{0} faradow</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henryje</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="two">{0} henryja</unitPattern>
+				<unitPattern count="few">{0} henryje</unitPattern>
+				<unitPattern count="other">{0} henryjow</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensy</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="two">{0} siemensa</unitPattern>
+				<unitPattern count="few">{0} siemense</unitPattern>
+				<unitPattern count="other">{0} siemensow</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorije [IT]</displayName>
+				<unitPattern count="one">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="two">{0} kaloriji [IT]</unitPattern>
+				<unitPattern count="few">{0} kalorije [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorijow [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bequerele</displayName>
+				<unitPattern count="one">{0} bequerel</unitPattern>
+				<unitPattern count="two">{0} bequerela</unitPattern>
+				<unitPattern count="few">{0} bequerele</unitPattern>
+				<unitPattern count="other">{0} bequerelow</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverty</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="two">{0} sieverta</unitPattern>
+				<unitPattern count="few">{0} sieverty</unitPattern>
+				<unitPattern count="other">{0} sievertow</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grayje</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="two">{0} grayja</unitPattern>
+				<unitPattern count="few">{0} grayje</unitPattern>
+				<unitPattern count="other">{0} grayjow</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramy-force</displayName>
+				<unitPattern count="one">{0} kilogram-force</unitPattern>
+				<unitPattern count="two">{0} kilograma-force</unitPattern>
+				<unitPattern count="few">{0} kilogramy-force</unitPattern>
+				<unitPattern count="other">{0} kilogramow-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesle</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="two">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webery</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="two">{0} webera</unitPattern>
+				<unitPattern count="few">{0} webery</unitPattern>
+				<unitPattern count="other">{0} weberow</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>spěšnosć swětła</displayName>
 				<unitPattern count="one">{0} spěšnosć swětła</unitPattern>
@@ -6323,7 +6527,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} spěšnosći swětła</unitPattern>
 				<unitPattern count="other">{0} spěšnosćow swětła</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>miliardnina</displayName>
 				<unitPattern count="one">{0} miliardnina</unitPattern>
 				<unitPattern count="two">{0} miliardninje</unitPattern>
@@ -6412,6 +6616,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} kuse</unitPattern>
 				<unitPattern count="other">{0} kusow</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>źěl</displayName>
+				<unitPattern count="one">{0} źěl</unitPattern>
+				<unitPattern count="two">{0} źěl</unitPattern>
+				<unitPattern count="few">{0} źěl</unitPattern>
+				<unitPattern count="other">{0} źěl</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="two">{0} %</unitPattern>
@@ -6430,6 +6641,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6597,6 +6815,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} PS</unitPattern>
 				<unitPattern count="other">{0} PS</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="two">{0} Hg</unitPattern>
+				<unitPattern count="few">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>mph</displayName>
 				<unitPattern count="one">{0} mph</unitPattern>
@@ -6665,6 +6889,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-cup-metric">
 				<displayName>mc</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. fl oz</displayName>
+				<unitPattern count="one">{0} m. fl oz</unitPattern>
+				<unitPattern count="two">{0} m. fl oz</unitPattern>
+				<unitPattern count="few">{0} m. fl oz</unitPattern>
+				<unitPattern count="other">{0} m. fl oz</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gal</displayName>
 				<unitPattern count="one">{0} gal</unitPattern>
@@ -6754,6 +6985,86 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} šćipki</unitPattern>
 				<unitPattern count="other">{0} šćipkow</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="two">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="two">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="two">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="two">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="two">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="two">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="two">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="two">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>spěšnosć sw.</displayName>
 				<unitPattern count="one">{0} spěšnosć sw.</unitPattern>
@@ -6761,7 +7072,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} spěšnosći sw.</unitPattern>
 				<unitPattern count="other">{0} spěšnosćow sw.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>nano</displayName>
 				<unitPattern count="one">{0} nano</unitPattern>
 				<unitPattern count="two">{0} nano</unitPattern>
@@ -6853,7 +7164,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} c</unitPattern>
 				<unitPattern count="other">{0} c</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>n</displayName>
 				<unitPattern count="one">{0} n</unitPattern>
 				<unitPattern count="two">{0} n</unitPattern>
diff --git a/make/data/cldr/common/main/dua.xml b/make/data/cldr/common/main/dua.xml
index 547640b7b05..8a48674d70b 100644
--- a/make/data/cldr/common/main/dua.xml
+++ b/make/data/cldr/common/main/dua.xml
@@ -311,6 +311,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/dv.xml b/make/data/cldr/common/main/dv.xml
index 77f725c086e..c474c98c4cf 100644
--- a/make/data/cldr/common/main/dv.xml
+++ b/make/data/cldr/common/main/dv.xml
@@ -134,6 +134,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">¤ #,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/dyo.xml b/make/data/cldr/common/main/dyo.xml
index baa17a6108f..9b42bafd14a 100644
--- a/make/data/cldr/common/main/dyo.xml
+++ b/make/data/cldr/common/main/dyo.xml
@@ -421,6 +421,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/dz.xml b/make/data/cldr/common/main/dz.xml
index 85f7fb24bfe..eb96ad0f81a 100644
--- a/make/data/cldr/common/main/dz.xml
+++ b/make/data/cldr/common/main/dz.xml
@@ -592,7 +592,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1582,9 +1582,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ནུབ་ཕྱོགས་ཨཕ་རི་ཀཱ་ཆུ་ཚོད</generic>
-					<standard>ནུབ་ཕྱོགས་ཨཕ་རི་ཀཱ་ཚད་ལྡན་ཆུ་ཚོད</standard>
-					<daylight>ནུབ་ཕྱོགས་ཨཕ་རི་ཀཱ་བྱཱར་དུས་ཆུ་ཚོད</daylight>
+					<standard>ནུབ་ཕྱོགས་ཨཕ་རི་ཀཱ་ཆུ་ཚོད</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1859,6 +1857,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>གུ་ཡ་ན་ཆུ་ཚོད</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ཧ་ཝའི་-ཨེ་ལིའུ་ཤེན་ཚད་ལྡན་ཆུ་ཚོད</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ཧ་ཝའི་-ཨེ་ལིའུ་ཤེན་ཆུ་ཚོད</generic>
diff --git a/make/data/cldr/common/main/ee.xml b/make/data/cldr/common/main/ee.xml
index cbfdedbb836..f79d4ba617b 100644
--- a/make/data/cldr/common/main/ee.xml
+++ b/make/data/cldr/common/main/ee.xml
@@ -730,10 +730,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="japanese">japantɔwo ƒe kalenda</type>
 			<type key="calendar" type="persian">persiatɔwo ƒe kalenda</type>
 			<type key="calendar" type="roc">china repɔbliktɔwo ƒe kalenda tso 1912</type>
-			<type key="collation" type="big5han">blema chinatɔwo ƒe ɖoɖomɔ nu</type>
 			<type key="collation" type="dictionary">nuɖoɖo ɖe nyagɔmeɖegbalẽ ƒe ɖoɖomɔ nu</type>
 			<type key="collation" type="ducet">nuɖoɖo ɖe unicode ƒe ɖoɖo nu</type>
-			<type key="collation" type="gb2312han">chinagbe yeye ƒe ɖoɖomɔ nu</type>
 			<type key="collation" type="phonebook">fonegbalẽ me ɖoɖomɔ nu</type>
 			<type key="collation" type="pinyin">pinyin ɖoɖomɔ nu</type>
 			<type key="collation" type="search">nudidi hena zazã gbadza</type>
@@ -1904,9 +1902,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ireland nutome gaƒoƒo me</daylight>
 				</long>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macau</exemplarCity>
 			</zone>
@@ -1963,14 +1958,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>West Africa game</generic>
-					<standard>West Africa nutome gaƒoƒo me</standard>
-					<daylight>West Africa dzomeŋɔli gaƒoƒo me</daylight>
+					<standard>West Africa game</standard>
 				</long>
 				<short>
-					<generic>WAT</generic>
 					<standard>WAT</standard>
-					<daylight>WAST</daylight>
 				</short>
 			</metazone>
 			<metazone type="Alaska">
@@ -2316,7 +2307,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Greenwich gaƒoƒo me</standard>
+					<standard>Greenwich gaƒoƒo</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
@@ -2343,6 +2334,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyana gaƒoƒo me</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutia nutome gaƒoƒo me</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutia gaƒoƒo me</generic>
@@ -2778,6 +2774,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Chuuk gaƒoƒo me</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="unconfirmed">Tɛrki gaƒoƒome</generic>
+					<standard draft="unconfirmed">Tɛrki gaƒoƒoɖoanyime</standard>
+					<daylight draft="unconfirmed">Tɛrki dzomeŋɔli gaƒoƒome</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistan gaƒoƒo me</generic>
diff --git a/make/data/cldr/common/main/el.xml b/make/data/cldr/common/main/el.xml
index b4843307d3a..f20ad945fe6 100644
--- a/make/data/cldr/common/main/el.xml
+++ b/make/data/cldr/common/main/el.xml
@@ -292,6 +292,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Μπάφια</language>
 			<language type="ksh">Κολωνικά</language>
 			<language type="ku">Κουρδικά</language>
+			<language type="ku" menu="core">Κουρδικά</language>
+			<language type="ku" menu="extension">Κουρμάντζι</language>
 			<language type="kum">Κουμγιούκ</language>
 			<language type="kut">Κουτενάι</language>
 			<language type="kv">Κόμι</language>
@@ -370,6 +372,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="myv">Έρζια</language>
 			<language type="mzn">Μαζαντεράνι</language>
 			<language type="na">Ναούρου</language>
+			<language type="nan" draft="contributed">Μιν Ναν</language>
 			<language type="nap">Ναπολιτανικά</language>
 			<language type="naq">Νάμα</language>
 			<language type="nb">Νορβηγικά Μποκμάλ</language>
@@ -824,6 +827,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Κίνα</territory>
 			<territory type="CO">Κολομβία</territory>
 			<territory type="CP">Νήσος Κλίπερτον</territory>
+			<territory type="CQ" draft="contributed">Σαρκ</territory>
 			<territory type="CR">Κόστα Ρίκα</territory>
 			<territory type="CU">Κούβα</territory>
 			<territory type="CV">Πράσινο Ακρωτήριο</territory>
@@ -1101,35 +1105,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Αριθμητική ταξινόμηση</key>
 			<key type="colStrength">Ισχύς ταξινόμησης</key>
 			<key type="currency">Νόμισμα</key>
+			<key type="em">Παρουσίαση emoji</key>
 			<key type="hc">Κύκλος ωρών (12 ή 24)</key>
 			<key type="lb">Στιλ αλλαγής γραμμών</key>
+			<key type="lw">Αλλαγή γραμμής ανάμεσα σε λέξεις</key>
 			<key type="ms">Σύστημα μέτρησης</key>
 			<key type="numbers">Αριθμοί</key>
+			<key type="ss">Τέλος πρότασης μετά από σύντμηση</key>
 			<key type="timezone">Ζώνη ώρας</key>
 			<key type="va">Παραλλαγή τοπικών ρυθμίσεων</key>
 			<key type="x">Ιδιωτική χρήση</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Βουδιστικό ημερολόγιο</type>
+			<type key="calendar" type="buddhist" scope="core">Βουδιστικό</type>
 			<type key="calendar" type="chinese">Κινεζικό ημερολόγιο</type>
+			<type key="calendar" type="chinese" scope="core">Κινεζικό</type>
 			<type key="calendar" type="coptic">Κοπτικό ημερολόγιο</type>
+			<type key="calendar" type="coptic" scope="core">Κοπτικό</type>
 			<type key="calendar" type="dangi">Κορεατικό ημερολόγιο ντάνγκι</type>
+			<type key="calendar" type="dangi" scope="core">Ντάνγκι</type>
 			<type key="calendar" type="ethiopic">Αιθιοπικό ημερολόγιο</type>
+			<type key="calendar" type="ethiopic" scope="core">Αιθιοπικό</type>
 			<type key="calendar" type="ethiopic-amete-alem">Αιθιοπικό ημερολόγιο Άμετ Άλεμ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Αιθιοπικό Άμετ Άλεμ</type>
 			<type key="calendar" type="gregorian">Γρηγοριανό ημερολόγιο</type>
+			<type key="calendar" type="gregorian" scope="core">Γρηγοριανό</type>
 			<type key="calendar" type="hebrew">Εβραϊκό ημερολόγιο</type>
+			<type key="calendar" type="hebrew" scope="core">Εβραϊκό</type>
 			<type key="calendar" type="indian">Ινδικό εθνικό ημερολόγιο</type>
 			<type key="calendar" type="islamic">Ημερολόγιο Εγίρας</type>
+			<type key="calendar" type="islamic" scope="core">Εγίρα</type>
 			<type key="calendar" type="islamic-civil">Ημερολόγιο Εγίρας (σε μορφή πίνακα, αστικό εποχής)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Εγίρα (σε μορφή πίνακα, αστικό εποχής)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Ισλαμικό ημερολόγιο (Σαουδική Αραβία, θέαση)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">Ισλαμικό ημερολόγιο (δομημένο, αστρονομική εποχή)</type>
 			<type key="calendar" type="islamic-umalqura">Ημερολόγιο Εγίρας (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Εγίρα (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Ημερολόγιο ISO-8601</type>
 			<type key="calendar" type="japanese">Ιαπωνικό ημερολόγιο</type>
+			<type key="calendar" type="japanese" scope="core">Ιαπωνικό</type>
 			<type key="calendar" type="persian">Περσικό ημερολόγιο</type>
+			<type key="calendar" type="persian" scope="core">Περσικό</type>
 			<type key="calendar" type="roc">Ημερολόγιο της Δημοκρατίας της Κίνας</type>
+			<type key="calendar" type="roc" scope="core">Δημοκρατίας της Κίνας</type>
 			<type key="cf" type="account">Λογιστική μορφή νομίσματος</type>
+			<type key="cf" type="account" scope="core">Λογιστική</type>
 			<type key="cf" type="standard">Τυπική μορφή νομίσματος</type>
+			<type key="cf" type="standard" scope="core">Τυπική</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Ταξινόμηση συμβόλων</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Ταξινόμηση με αγνόηση συμβόλων</type>
 			<type key="colBackwards" type="no" draft="contributed">Κανονικά ταξινόμηση τόνων</type>
@@ -1139,22 +1162,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Ταξινόμηση κεφαλαίων χαρακτήρων πρώτα</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ταξινόμηση με διάκριση χαρακτήρων</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Ταξινόμηση χαρακτήρων διάκρισης</type>
-			<type key="collation" type="big5han">Σειρά ταξινόμησης Παραδοσιακών Κινεζικών - Big5</type>
 			<type key="collation" type="compat">Προηγούμενη σειρά ταξινόμησης, για συμβατότητα</type>
+			<type key="collation" type="compat" scope="core">Συμβατότητα</type>
 			<type key="collation" type="dictionary">Σειρά ταξινόμησης λεξικού</type>
+			<type key="collation" type="dictionary" scope="core">Λεξικό</type>
 			<type key="collation" type="ducet">Προεπιλεγμένη σειρά ταξινόμησης Unicode</type>
+			<type key="collation" type="ducet" scope="core">Προεπιλεγμένη σειρά Unicode</type>
 			<type key="collation" type="eor" draft="contributed">Ευρωπαϊκοί κανόνες ταξινόμησης</type>
-			<type key="collation" type="gb2312han">Σειρά ταξινόμησης Απλοποιημένων Κινεζικών - GB2312</type>
 			<type key="collation" type="phonebook">Σειρά ταξινόμησης τηλεφωνικού καταλόγου</type>
+			<type key="collation" type="phonebook" scope="core">Τηλεφωνικός κατάλογος</type>
 			<type key="collation" type="phonetic">Φωνητική σειρά ταξινόμησης</type>
+			<type key="collation" type="phonetic" scope="core">Φωνητική</type>
 			<type key="collation" type="pinyin">Σειρά ταξινόμησης Πινγίν</type>
+			<type key="collation" type="pinyin" scope="core">Πινγίν</type>
 			<type key="collation" type="search">Αναζήτηση γενικού τύπου</type>
+			<type key="collation" type="search" scope="core">Αναζήτηση</type>
 			<type key="collation" type="searchjl" draft="contributed">Αναζήτηση κατά αρχικό σύμφωνο Χανγκούλ</type>
 			<type key="collation" type="standard">Τυπική σειρά ταξινόμησης</type>
+			<type key="collation" type="standard" scope="core">Τυπική</type>
 			<type key="collation" type="stroke">Σειρά ταξινόμησης κινήσεων</type>
+			<type key="collation" type="stroke" scope="core">Κίνηση</type>
 			<type key="collation" type="traditional">Παραδοσιακή σειρά ταξινόμησης</type>
+			<type key="collation" type="traditional" scope="core">Παραδοσιακή</type>
 			<type key="collation" type="unihan">Σειρά ταξινόμησης ριζικής αρίθμησης</type>
+			<type key="collation" type="unihan" scope="core">Ριζική αρίθμηση</type>
 			<type key="collation" type="zhuyin">Σειρά ταξινόμησης Τζουγίν</type>
+			<type key="collation" type="zhuyin" scope="core">Τζουγίν</type>
 			<type key="colNormalization" type="no" draft="contributed">Ταξινόμηση χωρίς κανονικοποίηση</type>
 			<type key="colNormalization" type="yes" draft="contributed">Κανονικοποιημένη ταξινόμηση Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Μεμονωμένη ταξινόμηση ψηφίων</type>
@@ -1167,18 +1200,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Πλήρους πλάτους</type>
 			<type key="d0" type="hwidth">Μισού πλάτους</type>
 			<type key="d0" type="npinyin" draft="contributed">Αριθμητικό</type>
+			<type key="em" type="default" scope="core">Προεπιλογή</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Κείμενο</type>
 			<type key="hc" type="h11">12ωρο σύστημα (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12ωρο σύστημα (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24ωρο σύστημα (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24ωρο σύστημα (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Χαλαρό στιλ αλλαγής γραμμών</type>
+			<type key="lb" type="loose" scope="core">Χαλαρό</type>
 			<type key="lb" type="normal">Κανονικό στιλ αλλαγής γραμμών</type>
+			<type key="lb" type="normal" scope="core">Κανονικό</type>
 			<type key="lb" type="strict">Στενό στιλ αλλαγής γραμμών</type>
+			<type key="lb" type="strict" scope="core">Στενό</type>
+			<type key="lw" type="breakall" scope="core">Διαχωρισμός όλων</type>
+			<type key="lw" type="keepall" scope="core">Διατήρηση όλων</type>
+			<type key="lw" type="normal" scope="core">Κανονικό</type>
+			<type key="lw" type="phrase" scope="core">Διατήρηση σε φράσεις</type>
 			<type key="m0" type="bgn">Μεταγραφή BGN ΗΠΑ</type>
 			<type key="m0" type="ungegn">Μεταγραφή GEGN ΟΗΕ</type>
 			<type key="ms" type="metric">Μετρικό σύστημα</type>
+			<type key="ms" type="metric" scope="core">Μετρικό</type>
 			<type key="ms" type="uksystem">Αγγλοσαξονικό σύστημα μέτρησης</type>
+			<type key="ms" type="uksystem" scope="core">Αγγλοσαξονικό</type>
 			<type key="ms" type="ussystem">Αμερικανικό σύστημα μέτρησης</type>
+			<type key="ms" type="ussystem" scope="core">Αμερικανικό</type>
 			<type key="numbers" type="arab">Αραβικο-ινδικά ψηφία</type>
 			<type key="numbers" type="arabext">Εκτεταμένα αραβικο-ινδικά ψηφία</type>
 			<type key="numbers" type="armn">Αρμενικά αριθμητικά</type>
@@ -1223,6 +1273,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Θιβετανικά ψηφία</type>
 			<type key="numbers" type="traditional" draft="contributed">Παραδοσιακά αριθμητικά</type>
 			<type key="numbers" type="vaii">Ψηφία Βάι</type>
+			<type key="ss" type="none" scope="core">Απενεργοποίηση</type>
+			<type key="ss" type="standard" scope="core">Ενεργοποίηση</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Μετρικό</measurementSystemName>
@@ -1250,9 +1302,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1353,13 +1402,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h a (vvvv)</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' (vvvv)</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1425,7 +1477,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1439,7 +1490,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1766,14 +1816,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss (vvvv)</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm (vvvv)</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' (vvvv)</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMM">MMM</dateFormatItem>
@@ -1844,7 +1897,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1858,7 +1910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -2937,6 +2988,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Νήσος Πάσχα</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Κοϊάικε</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Πούντα Αρένας</exemplarCity>
 			</zone>
@@ -3202,9 +3256,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Πνομ Πενχ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Έντερμπερι</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Καντών</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3849,6 +3900,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Harare">
 				<exemplarCity>Χαράρε</exemplarCity>
 			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic draft="contributed">Ώρα Άκρε</generic>
+					<standard>Χειμερινή ώρα Άκρε</standard>
+					<daylight>Θερινή ώρα Άκρε</daylight>
+				</long>
+			</metazone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>Ώρα Αφγανιστάν</standard>
@@ -3871,9 +3929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ώρα Δυτικής Αφρικής</generic>
-					<standard>Χειμερινή ώρα Δυτικής Αφρικής</standard>
-					<daylight>Θερινή ώρα Δυτικής Αφρικής</daylight>
+					<standard>Ώρα Δυτικής Αφρικής</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4250,6 +4306,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ώρα Γουιάνας</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Χειμερινή ώρα Χαβάης-Αλεούτιων Νήσων</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ώρα Χαβάης-Αλεούτιων Νήσων</generic>
@@ -4688,6 +4749,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ώρα Τσουκ</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">Ώρα Τουρκίας</generic>
+					<standard draft="contributed">Χειμερινή ώρα Τουρκίας</standard>
+					<daylight draft="contributed">Θερινή ώρα Τουρκίας</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Ώρα Τουρκμενιστάν</generic>
@@ -4764,9 +4832,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic>Ώρα Αικατερίνμπουργκ</generic>
-					<standard>Χειμερινή ώρα Αικατερίνμπουργκ</standard>
-					<daylight>Θερινή ώρα Αικατερίνμπουργκ</daylight>
+					<generic>Ώρα Αικατερινούπολης</generic>
+					<standard>Χειμερινή ώρα Αικατερινούπολης</standard>
+					<daylight>Θερινή ώρα Αικατερινούπολης</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yukon">
@@ -4847,7 +4915,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -6194,6 +6265,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">δολάριο Ανατολικής Καραϊβικής</displayName>
 				<displayName count="other">δολάρια Ανατολικής Καραϊβικής</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>γκίλντα Καραϊβικής</displayName>
+				<displayName count="one" draft="contributed">γκίλντα Καραϊβικής</displayName>
+				<displayName count="other" draft="contributed">γκίλντες Καραϊβικής</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Ειδικά Δικαιώματα Ανάληψης</displayName>
 				<displayName count="one">ειδικό δικαίωμα ανάληψης</displayName>
@@ -6297,6 +6373,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">δολάριο Ζιμπάμπουε</displayName>
 				<displayName count="other">δολάρια Ζιμπάμπουε</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Χρυσός της Ζιμπάμπουε</displayName>
+				<displayName count="one" draft="contributed">Χρυσός της Ζιμπάμπουε</displayName>
+				<displayName count="other" draft="contributed">Χρυσός της Ζιμπάμπουε</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Δολάριο Ζιμπάμπουε (2009)</displayName>
 			</currency>
@@ -6635,7 +6716,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} στοιχεία</unitPattern>
 				<unitPattern count="other" case="genitive">{0} στοιχείων</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>μέρη</displayName>
+				<unitPattern count="one">{0} μέρος</unitPattern>
+				<unitPattern count="other">{0} μέρη</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>neuter</gender>
 				<displayName>μέρη ανά εκατομμύριο</displayName>
 				<unitPattern count="one">{0} μέρος ανά εκατομμύριο</unitPattern>
@@ -6675,6 +6761,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<gender>neuter</gender>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>γλυκόζης</displayName>
+				<unitPattern count="one">{0} γλυκόζης</unitPattern>
+				<unitPattern count="other">{0} γλυκόζης</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>neuter</gender>
 				<displayName>λίτρα ανά χιλιόμετρο</displayName>
@@ -7334,8 +7425,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} καντέλα</unitPattern>
 				<unitPattern count="one" case="accusative">{0} καντέλα</unitPattern>
 				<unitPattern count="one" case="genitive">{0} καντέλας</unitPattern>
-				<unitPattern count="other">{0} καντέλα</unitPattern>
-				<unitPattern count="other" case="accusative">{0} καντέλα</unitPattern>
+				<unitPattern count="other">{0} καντέλες</unitPattern>
+				<unitPattern count="other" case="accusative">{0} καντέλες</unitPattern>
 				<unitPattern count="other" case="genitive">{0} καντέλων</unitPattern>
 			</unit>
 			<unit type="light-lumen">
@@ -7516,6 +7607,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} χιλιοστόμετρα στήλης υδραργύρου</unitPattern>
 				<unitPattern count="other" case="genitive">{0} χιλιοστόμετρων στήλης υδραργύρου</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>χιλιοστόμετρο στήλης υδραργύρου</displayName>
+				<unitPattern count="one">{0} στήλης υδραργύρου</unitPattern>
+				<unitPattern count="other">{0} στήλης υδραργύρου</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>λίβρες ανά τετραγωνική ίντσα</displayName>
 				<unitPattern count="one">{0} λίβρα ανά τετραγωνική ίντσα</unitPattern>
@@ -7809,6 +7905,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} μετρικά κύπελλα</unitPattern>
 				<unitPattern count="other" case="genitive">{0} μετρικών κύπελλων</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>μετρική ουγγιά υγρών</displayName>
+				<unitPattern count="one">{0} μετρική ουγγιά υγρών</unitPattern>
+				<unitPattern count="other">{0} μετρικές ουγγιές υγρών</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ακρ-πόδια</displayName>
 				<unitPattern count="one">{0} ακρ-πόδι</unitPattern>
@@ -7905,9 +8006,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} αγγλοσαξονικό τέταρτο του γαλονιού</unitPattern>
 				<unitPattern count="other">{0} αγγλοσαξονικά τέταρτα του γαλονιού</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>στερακτίνια</displayName>
+				<unitPattern count="one">{0} στερακτίνιο</unitPattern>
+				<unitPattern count="other">{0} στερακτίνια</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>κατάλ</displayName>
+				<unitPattern count="one">{0} κατάλ</unitPattern>
+				<unitPattern count="other">{0} κατάλ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>κουλόμπ</displayName>
+				<unitPattern count="one">{0} κουλόμπ</unitPattern>
+				<unitPattern count="other">{0} κουλόμπ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>φαράντ</displayName>
+				<unitPattern count="one">{0} φαράντ</unitPattern>
+				<unitPattern count="other">{0} φαράντ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ανρί</displayName>
+				<unitPattern count="one">{0} ανρί</unitPattern>
+				<unitPattern count="other">{0} ανρί</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ζίμενς</displayName>
+				<unitPattern count="one">{0} ζίμενς</unitPattern>
+				<unitPattern count="other">{0} ζίμενς</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>θερμίδες ΙΤ</displayName>
+				<unitPattern count="one">{0} θερμίδα IT</unitPattern>
+				<unitPattern count="other">{0} θερμίδες IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>μπεκερέλ</displayName>
+				<unitPattern count="one">{0} μπεκερέλ</unitPattern>
+				<unitPattern count="other">{0} μπεκερέλ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>γκρέυ</displayName>
+				<unitPattern count="one">{0} γκρέυ</unitPattern>
+				<unitPattern count="other">{0} γκρέυ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>χιλιόγραμμα δύναμης</displayName>
+				<unitPattern count="one">{0} χιλιόγραμμο δύναμης</unitPattern>
+				<unitPattern count="other">{0} χιλιόγραμμα δύναμης</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>τέσλα</displayName>
+				<unitPattern count="one">{0} τέσλα</unitPattern>
+				<unitPattern count="other">{0} τέσλα</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>βέμπερ</displayName>
+				<unitPattern count="one">{0} βέμπερ</unitPattern>
+				<unitPattern count="other">{0} βέμπερ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>φως</displayName>
 				<unitPattern count="one">{0} φως</unitPattern>
 				<unitPattern count="one" case="accusative">{0} φως</unitPattern>
 				<unitPattern count="one" case="genitive">φωτός</unitPattern>
@@ -7915,7 +8080,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} φως</unitPattern>
 				<unitPattern count="other" case="genitive">{0} φωτός</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>neuter</gender>
 				<displayName>μέρη στο δισεκατομμύριο</displayName>
 				<unitPattern count="one">{0} μέρος στο δισεκατομμύριο</unitPattern>
@@ -8136,7 +8301,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} στοιχείο</unitPattern>
 				<unitPattern count="other">{0} στοιχεία</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>μέρος</displayName>
+				<unitPattern count="one">{0} μέρος</unitPattern>
+				<unitPattern count="other">{0} μέρη</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>μέρη/εκατ.</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -8153,6 +8323,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} μολ</unitPattern>
 				<unitPattern count="other">{0} μολ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>λίτρα/χλμ.</displayName>
 				<unitPattern count="one">{0} λίτρο/χλμ.</unitPattern>
@@ -8567,6 +8740,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} μετρ. κύπελλο</unitPattern>
 				<unitPattern count="other">{0} μετρ. κύπελλα</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>μ. ουγγιά υγρ.</displayName>
+				<unitPattern count="one">μ. ουγγιά υγρ.</unitPattern>
+				<unitPattern count="other">{0} μ. ουγγιές υγρ.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ακρ πόδια</displayName>
 				<unitPattern count="one">{0} ακρ πδ</unitPattern>
@@ -8664,12 +8842,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} αγγλ. τέτ. γαλ.</unitPattern>
 				<unitPattern count="other">{0} αγγλ. τέτ. γαλ.</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>φως</displayName>
 				<unitPattern count="one">{0} φως</unitPattern>
 				<unitPattern count="other">{0} φως</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>μέρη/δισεκατομμύριο</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -8801,7 +8986,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-inch">
 				<displayName>τ. ίντσες</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>μέρος</displayName>
+				<unitPattern count="one">{0} μέρος</unitPattern>
+				<unitPattern count="other">{0} μέρη</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -8813,6 +9003,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>λ/χλμ</displayName>
 				<unitPattern count="one">{0} λ/χλμ</unitPattern>
@@ -9054,6 +9247,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} μ. κύπ.</unitPattern>
 				<unitPattern count="other">{0} μ. κύπ.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>μ. ουγγιά υγρ.</displayName>
+				<unitPattern count="one">{0} μ. ουγγιά υγρ.</unitPattern>
+				<unitPattern count="other">{0} μ. ουγγιές υγρ.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ακρ πδ</displayName>
 			</unit>
@@ -9074,16 +9272,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-dram">
 				<displayName>δρ. όγκου</displayName>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>φώς</displayName>
-				<unitPattern count="one">{0} φως</unitPattern>
-				<unitPattern count="other">{0} φως</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>νύχτ.</displayName>
-				<unitPattern count="one">{0} νύχτ.</unitPattern>
-				<unitPattern count="other">{0} νύχτ.</unitPattern>
-				<perUnitPattern>{0}/νύχτ.</perUnitPattern>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 			<coordinateUnit>
 				<displayName>σημεία</displayName>
diff --git a/make/data/cldr/common/main/en.xml b/make/data/cldr/common/main/en.xml
index ae1e61a78df..31114de0f39 100644
--- a/make/data/cldr/common/main/en.xml
+++ b/make/data/cldr/common/main/en.xml
@@ -100,6 +100,7 @@ annotations.
 			<language type="bo">Tibetan</language>
 			<language type="bpy">Bishnupriya</language>
 			<language type="bqi">Bakhtiari</language>
+			<language type="bqi" alt="variant">Luri Bakhtiari</language>
 			<language type="br">Breton</language>
 			<language type="bra">Braj</language>
 			<language type="brh">Brahui</language>
@@ -132,6 +133,8 @@ annotations.
 			<language type="chy">Cheyenne</language>
 			<language type="cic">Chickasaw</language>
 			<language type="ckb">Central Kurdish</language>
+			<language type="ckb" menu="core">Kurdish</language>
+			<language type="ckb" menu="extension">Central</language>
 			<language type="ckb" alt="menu">Kurdish, Central</language>
 			<language type="ckb" alt="variant">Kurdish, Sorani</language>
 			<language type="clc">Chilcotin</language>
@@ -312,6 +315,7 @@ annotations.
 			<language type="kcg">Tyap</language>
 			<language type="kde">Makonde</language>
 			<language type="kea">Kabuverdianu</language>
+			<language type="kek">Qʼeqchiʼ</language>
 			<language type="ken">Kenyang</language>
 			<language type="kfo">Koro</language>
 			<language type="kg">Kongo</language>
@@ -346,6 +350,8 @@ annotations.
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Colognian</language>
 			<language type="ku">Kurdish</language>
+			<language type="ku" menu="core">Kurdish</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kut">Kutenai</language>
 			<language type="kv">Komi</language>
@@ -474,6 +480,7 @@ annotations.
 			<language type="ojs">Oji-Cree</language>
 			<language type="ojw">Western Ojibwa</language>
 			<language type="oka">Okanagan</language>
+			<language type="oka" alt="variant">Colville Salish</language>
 			<language type="om">Oromo</language>
 			<language type="or">Odia</language>
 			<language type="os">Ossetic</language>
@@ -493,6 +500,7 @@ annotations.
 			<language type="pfl">Palatine German</language>
 			<language type="phn">Phoenician</language>
 			<language type="pi">Pali</language>
+			<language type="pi" alt="variant">Pāli</language>
 			<language type="pis">Pijin</language>
 			<language type="pl">Polish</language>
 			<language type="pms">Piedmontese</language>
@@ -544,6 +552,8 @@ annotations.
 			<language type="sd">Sindhi</language>
 			<language type="sdc">Sassarese Sardinian</language>
 			<language type="sdh">Southern Kurdish</language>
+			<language type="sdh" menu="core">Kurdish</language>
+			<language type="sdh" menu="extension">Southern</language>
 			<language type="se">Northern Sami</language>
 			<language type="se" alt="menu">Sami, Northern</language>
 			<language type="see">Seneca</language>
@@ -615,7 +625,7 @@ annotations.
 			<language type="tig">Tigre</language>
 			<language type="tiv">Tiv</language>
 			<language type="tk">Turkmen</language>
-			<language type="tkl">Tokelau</language>
+			<language type="tkl">Tokelauan</language>
 			<language type="tkr">Tsakhur</language>
 			<language type="tl">Tagalog</language>
 			<language type="tlh">Klingon</language>
@@ -721,6 +731,7 @@ annotations.
 			<script type="Bass">Bassa Vah</script>
 			<script type="Batk">Batak</script>
 			<script type="Beng">Bangla</script>
+			<script type="Berf">Beria Erfe</script>
 			<script type="Bhks">Bhaiksuki</script>
 			<script type="Blis">Blissymbols</script>
 			<script type="Bopo">Bopomofo</script>
@@ -869,6 +880,7 @@ annotations.
 			<script type="Shaw">Shavian</script>
 			<script type="Shrd">Sharada</script>
 			<script type="Sidd">Siddham</script>
+			<script type="Sidt">Sidetic</script>
 			<script type="Sind">Khudawadi</script>
 			<script type="Sinh">Sinhala</script>
 			<script type="Sogd">Sogdian</script>
@@ -889,6 +901,7 @@ annotations.
 			<script type="Taml">Tamil</script>
 			<script type="Tang">Tangut</script>
 			<script type="Tavt">Tai Viet</script>
+			<script type="Tayo">Tai Yo</script>
 			<script type="Telu">Telugu</script>
 			<script type="Teng">Tengwar</script>
 			<script type="Tfng">Tifinagh</script>
@@ -899,6 +912,7 @@ annotations.
 			<script type="Tirh">Tirhuta</script>
 			<script type="Tnsa">Tangsa</script>
 			<script type="Todr">Todhri</script>
+			<script type="Tols">Tolong Siki</script>
 			<script type="Toto">Toto</script>
 			<script type="Tutg">Tulu-Tigalari</script>
 			<script type="Ugar">Ugaritic</script>
@@ -1284,7 +1298,7 @@ annotations.
 			<variant type="OSOJS">Oseacco/Osojane dialect</variant>
 			<variant type="OXENDICT">Oxford English Dictionary spelling</variant>
 			<variant type="PAMAKA">Pamaka dialect</variant>
-			<variant type="PINYIN">Pinyin Romanization</variant>
+			<variant type="PINYIN">Pinyin romanization</variant>
 			<variant type="POLYTON">Polytonic</variant>
 			<variant type="POSIX">Computer</variant>
 			<variant type="REVISED">Revised Orthography</variant>
@@ -1300,7 +1314,7 @@ annotations.
 			<variant type="UCRCOR">Unified Revised Orthography</variant>
 			<variant type="UNIFON">Unifon phonetic alphabet</variant>
 			<variant type="VALENCIA">Valencian</variant>
-			<variant type="WADEGILE">Wade-Giles Romanization</variant>
+			<variant type="WADEGILE">Wade-Giles romanization</variant>
 		</variants>
 		<keys>
 			<key type="calendar">Calendar</key>
@@ -1317,15 +1331,15 @@ annotations.
 			<key type="currency">Currency</key>
 			<key type="d0">Transform Destination</key>
 			<key type="dx">Dictionary Break Exclusions</key>
-			<key type="em">Emoji Presentation Style</key>
+			<key type="em">Emoji Presentation</key>
 			<key type="fw">First day of week</key>
 			<key type="h0">Mixed-in</key>
 			<key type="hc">Hour Cycle (12 vs 24)</key>
 			<key type="i0">Input Method</key>
 			<key type="k0">Keyboard</key>
 			<key type="kv">Highest Ignored</key>
-			<key type="lb">Line Break Style</key>
-			<key type="lw">Line Breaks In Words Setting</key>
+			<key type="lb">CJK Line Break</key>
+			<key type="lw">Line Breaks within Words</key>
 			<key type="m0">Transform Rules</key>
 			<key type="ms">Measurement System</key>
 			<key type="mu">Measurement Unit</key>
@@ -1333,7 +1347,7 @@ annotations.
 			<key type="rg">Region For Supplemental Data</key>
 			<key type="s0">Transform Source</key>
 			<key type="sd">Region Subdivision</key>
-			<key type="ss">Sentence Break Suppressions Type</key>
+			<key type="ss">Sentence Break After Abbr.</key>
 			<key type="t">Transform</key>
 			<key type="t0">Machine Translated</key>
 			<key type="timezone">Time Zone</key>
@@ -1343,25 +1357,47 @@ annotations.
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddhist Calendar</type>
+			<type key="calendar" type="buddhist" scope="core">Buddhist</type>
 			<type key="calendar" type="chinese">Chinese Calendar</type>
+			<type key="calendar" type="chinese" scope="core">Chinese</type>
 			<type key="calendar" type="coptic">Coptic Calendar</type>
+			<type key="calendar" type="coptic" scope="core">Coptic</type>
 			<type key="calendar" type="dangi">Dangi Calendar</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Ethiopic Calendar</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Ethiopic Amete Alem Calendar</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Gregorian Calendar</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Hebrew Calendar</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrew</type>
 			<type key="calendar" type="indian">Indian National Calendar</type>
+			<type key="calendar" type="indian" scope="core">Indian National</type>
 			<type key="calendar" type="islamic">Hijri Calendar</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Hijri Calendar (tabular, civil epoch)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabular, civil epoch)</type>
 			<type key="calendar" type="islamic-rgsa">Hijri Calendar (Saudi Arabia, sighting)</type>
+			<!-- Added values for English -->
+			<type key="calendar" type="islamic-rgsa" scope="core">Hijri, Saudi Arabia sighting</type>
 			<type key="calendar" type="islamic-tbla">Hijri Calendar (tabular, astronomical epoch)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hijri (tabular, astronomical epoch)</type>
 			<type key="calendar" type="islamic-umalqura">Hijri Calendar (Umm al-Qura)</type>
-			<type key="calendar" type="iso8601">ISO-8601 Calendar</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">Gregorian Calendar (ISO 8601 Weeks)</type>
+			<type key="calendar" type="iso8601" alt="variant">ISO 8601 Weeks</type>
+			<type key="calendar" type="iso8601" scope="core">Gregorian</type>
 			<type key="calendar" type="japanese">Japanese Calendar</type>
+			<type key="calendar" type="japanese" scope="core">Japanese</type>
 			<type key="calendar" type="persian">Persian Calendar</type>
+			<type key="calendar" type="persian" scope="core">Persian</type>
 			<type key="calendar" type="roc">Minguo Calendar</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Accounting Currency Format</type>
+			<type key="cf" type="account" scope="core">Accounting</type>
 			<type key="cf" type="standard">Standard Currency Format</type>
+			<type key="cf" type="standard" scope="core">Standard</type>
 			<type key="colAlternate" type="non-ignorable">Sort Symbols</type>
 			<type key="colAlternate" type="shifted">Sort Ignoring Symbols</type>
 			<type key="colBackwards" type="no">Sort Accents Normally</type>
@@ -1371,23 +1407,36 @@ annotations.
 			<type key="colCaseFirst" type="upper">Sort Uppercase First</type>
 			<type key="colCaseLevel" type="no">Sort Case Insensitive</type>
 			<type key="colCaseLevel" type="yes">Sort Case Sensitive</type>
-			<type key="collation" type="big5han">Traditional Chinese Sort Order - Big5</type>
 			<type key="collation" type="compat">Previous Sort Order, for compatibility</type>
+			<type key="collation" type="compat" scope="core">Compatibility</type>
 			<type key="collation" type="dictionary">Dictionary Sort Order</type>
+			<type key="collation" type="dictionary" scope="core">Dictionary</type>
 			<type key="collation" type="ducet">Default Unicode Sort Order</type>
+			<type key="collation" type="ducet" scope="core">Default Unicode</type>
 			<type key="collation" type="emoji">Emoji Sort Order</type>
+			<type key="collation" type="emoji" scope="core">Emoji</type>
 			<type key="collation" type="eor">European Ordering Rules</type>
-			<type key="collation" type="gb2312han">Simplified Chinese Sort Order - GB2312</type>
+			<type key="collation" type="eor" scope="core">European rules</type>
 			<type key="collation" type="phonebook">Phonebook Sort Order</type>
+			<type key="collation" type="phonebook" scope="core">Phonebook</type>
 			<type key="collation" type="phonetic">Phonetic Sort Order</type>
+			<type key="collation" type="phonetic" scope="core">Phonetic</type>
 			<type key="collation" type="pinyin">Pinyin Sort Order</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">General-Purpose Search</type>
+			<type key="collation" type="search" scope="core">Search</type>
 			<type key="collation" type="searchjl">Search By Hangul Initial Consonant</type>
+			<type key="collation" type="searchjl" scope="core">Korean initial consonant</type>
 			<type key="collation" type="standard">Standard Sort Order</type>
+			<type key="collation" type="standard" scope="core">Standard</type>
 			<type key="collation" type="stroke">Stroke Sort Order</type>
+			<type key="collation" type="stroke" scope="core">Stroke</type>
 			<type key="collation" type="traditional">Traditional Sort Order</type>
+			<type key="collation" type="traditional" scope="core">Traditional</type>
 			<type key="collation" type="unihan">Radical-Stroke Sort Order</type>
+			<type key="collation" type="unihan" scope="core">Radical-Stroke</type>
 			<type key="collation" type="zhuyin">Zhuyin Sort Order</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no">Sort Without Normalization</type>
 			<type key="colNormalization" type="yes">Sort Unicode Normalized</type>
 			<type key="colNumeric" type="no">Sort Digits Individually</type>
@@ -1425,21 +1474,28 @@ annotations.
 			<type key="d0" type="title">To Titlecase</type>
 			<type key="d0" type="upper">To Uppercase</type>
 			<type key="d0" type="zawgyi">To Zawgyi Myanmar Encoding</type>
-			<type key="em" type="default">Use Default Presentation For Emoji Characters</type>
-			<type key="em" type="emoji">Prefer Emoji Presentation For Emoji Characters</type>
-			<type key="em" type="text">Prefer Text Presentation For Emoji Characters</type>
-			<type key="fw" type="fri">First Day of Week Is Friday</type>
-			<type key="fw" type="mon">First Day of Week Is Monday</type>
-			<type key="fw" type="sat">First Day of Week Is Saturday</type>
-			<type key="fw" type="sun">First Day of Week Is Sunday</type>
-			<type key="fw" type="thu">First Day of Week Is Thursday</type>
-			<type key="fw" type="tue">First Day of Week Is Tuesday</type>
-			<type key="fw" type="wed">First Day of Week Is Wednesday</type>
+			<type key="em" type="default">Default Presentation For Emoji</type>
+			<type key="em" type="default" scope="core">Default</type>
+			<type key="em" type="emoji">Emoji Presentation For Emoji</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text">Text Presentation For Emoji</type>
+			<type key="em" type="text" scope="core">Text</type>
+			<type key="fw" type="fri">First day of week: Friday</type>
+			<type key="fw" type="mon">First day of week: Monday</type>
+			<type key="fw" type="sat">First day of week: Saturday</type>
+			<type key="fw" type="sun">First day of week: Sunday</type>
+			<type key="fw" type="thu">First day of week: Thursday</type>
+			<type key="fw" type="tue">First day of week: Tuesday</type>
+			<type key="fw" type="wed">First day of week: Wednesday</type>
 			<type key="h0" type="hybrid">Hybrid</type>
 			<type key="hc" type="h11">12 Hour System (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Hour System (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 Hour System (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 Hour System (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="i0" type="handwrit">Handwriting Input Method</type>
 			<type key="i0" type="pinyin">Pinyin Input Method</type>
 			<type key="i0" type="und">Unspecified Input Method</type>
@@ -1474,16 +1530,42 @@ annotations.
 			<type key="k0" type="viqr">Vietnamese VIQR Keyboard</type>
 			<type key="k0" type="windows">Windows Keyboard</type>
 			<type key="kv" type="currency">Ignore Symbols affects spaces, punctuation, all symbols</type>
+			<!-- <type key="ka" type="noignore" scope="core">Punctuation… not ignored</type>
+				 <type key="ka" type="shifted" scope="core">Punctuation… ignored</type>
+				 <type key="kf" type="lower" scope="core">Lowercase &lt; uppercase</type>
+				 <type key="kf" type="upper" scope="core">Uppercase &lt; lowercase</type>
+				 <type key="kr" type="currency" scope="core">Currency reordering code</type>
+				 <type key="kr" type="digit" scope="core">Digit (number) reordering code</type>
+				 <type key="kr" type="punct" scope="core">Punctuation reordering code</type>
+				 <type key="kr" type="space" scope="core">Whitespace reordering code</type>
+				 <type key="kr" type="symbol" scope="core">Symbol reordering code (other than currency)</type>
+				 <type key="ks" type="identic" scope="core">The identical level</type>
+				 <type key="ks" type="level1" scope="core">The primary level</type>
+				 <type key="ks" type="level2" scope="core">The secondary level</type>
+				 <type key="ks" type="level3" scope="core">The tertiary level</type>
+				 <type key="ks" type="level4" scope="core">The quaternary level</type>
+			-->
+			<type key="kv" type="currency" scope="core">Shift Spaces, punctuation, all symbols</type>
 			<type key="kv" type="punct">Ignore Symbols affects spaces and punctuation only</type>
+			<type key="kv" type="punct" scope="core">Shift spaces, punctuation</type>
 			<type key="kv" type="space">Ignore Symbols affects spaces only</type>
+			<type key="kv" type="space" scope="core">Shift spaces, punctuation</type>
 			<type key="kv" type="symbol">Ignore Symbols affects spaces, punctuation, non-currency symbols</type>
+			<type key="kv" type="symbol" scope="core">Shift spaces, punctuation, non-currency symbols</type>
 			<type key="lb" type="loose">Loose Line Break Style</type>
+			<type key="lb" type="loose" scope="core">Loose</type>
 			<type key="lb" type="normal">Normal Line Break Style</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Strict Line Break Style</type>
+			<type key="lb" type="strict" scope="core">Strict</type>
 			<type key="lw" type="breakall">Allow Line Breaks In All Words</type>
+			<type key="lw" type="breakall" scope="core">Break all</type>
 			<type key="lw" type="keepall">Prevent Line Breaks In All Words</type>
+			<type key="lw" type="keepall" scope="core">Keep all</type>
 			<type key="lw" type="normal">Normal Line Breaks For Words</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
 			<type key="lw" type="phrase">Prevent Line Breaks In Phrases</type>
+			<type key="lw" type="phrase" scope="core">Keep in phrases</type>
 			<type key="m0" type="aethiopi">Encylopedia Aethiopica Transliteration</type>
 			<type key="m0" type="alaloc">US ALA-LOC Transliteration</type>
 			<type key="m0" type="betamets">Beta Maṣāḥǝft Transliteration</type>
@@ -1517,8 +1599,11 @@ annotations.
 			<type key="m0" type="xml">Hex transform using XML syntax</type>
 			<type key="m0" type="xml10">Hex transform using XML decimal syntax</type>
 			<type key="ms" type="metric">Metric System</type>
+			<type key="ms" type="metric" scope="core">Metric</type>
 			<type key="ms" type="uksystem">Imperial Measurement System</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">US Measurement System</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="mu" type="celsius">Celsius</type>
 			<type key="mu" type="fahrenhe">Fahrenheit</type>
 			<type key="mu" type="kelvin">Kelvin</type>
@@ -1527,8 +1612,10 @@ annotations.
 			<type key="numbers" type="arab">Arabic-Indic Digits</type>
 			<type key="numbers" type="arabext">Extended Arabic-Indic Digits</type>
 			<type key="numbers" type="arabext" alt="short">X Arabic-Indic Digits</type>
+			<type key="numbers" type="arabext" scope="core">Extended Arabic-Indic</type>
 			<type key="numbers" type="armn">Armenian Numerals</type>
 			<type key="numbers" type="armnlow">Armenian Lowercase Numerals</type>
+			<type key="numbers" type="armnlow" scope="core">Armenian lowercase</type>
 			<type key="numbers" type="bali">Balinese Digits</type>
 			<type key="numbers" type="beng">Bangla Digits</type>
 			<type key="numbers" type="bhks">Bhaiksuki Digits</type>
@@ -1540,29 +1627,38 @@ annotations.
 			<type key="numbers" type="diak">Dives Akuru Digits</type>
 			<type key="numbers" type="ethi">Ethiopic Numerals</type>
 			<type key="numbers" type="finance">Financial Numerals</type>
+			<type key="numbers" type="finance" scope="core">Financial</type>
 			<type key="numbers" type="fullwide">Full-Width Digits</type>
+			<type key="numbers" type="fullwide" scope="core">Full-width</type>
 			<type key="numbers" type="gara">Garay Digits</type>
 			<type key="numbers" type="geor">Georgian Numerals</type>
 			<type key="numbers" type="gong">Gunjala Gondi digits</type>
 			<type key="numbers" type="gonm">Masaram Gondi digits</type>
 			<type key="numbers" type="grek">Greek Numerals</type>
 			<type key="numbers" type="greklow">Greek Lowercase Numerals</type>
+			<type key="numbers" type="greklow" scope="core">Greek lowercase</type>
 			<type key="numbers" type="gujr">Gujarati Digits</type>
 			<type key="numbers" type="gukh">Gurung Khema Digits</type>
 			<type key="numbers" type="guru">Gurmukhi Digits</type>
 			<type key="numbers" type="hanidays">Chinese Calendar Day-of-Month Numerals</type>
+			<type key="numbers" type="hanidays" scope="core">Han-character day-of-month numbering for traditional calendars</type>
 			<type key="numbers" type="hanidec">Chinese Decimal Numerals</type>
+			<type key="numbers" type="hanidec" scope="core">Positional decimal system using Chinese number ideographs as digits</type>
 			<type key="numbers" type="hans">Simplified Chinese Numerals</type>
 			<type key="numbers" type="hansfin">Simplified Chinese Financial Numerals</type>
+			<type key="numbers" type="hansfin" scope="core">Simplified Chinese financial</type>
 			<type key="numbers" type="hant">Traditional Chinese Numerals</type>
 			<type key="numbers" type="hantfin">Traditional Chinese Financial Numerals</type>
+			<type key="numbers" type="hantfin" scope="core">Traditional Chinese financial</type>
 			<type key="numbers" type="hebr">Hebrew Numerals</type>
 			<type key="numbers" type="hmng">Pahawh Hmong Digits</type>
 			<type key="numbers" type="hmnp">Nyiakeng Puachue Hmong Digits</type>
 			<type key="numbers" type="java">Javanese Digits</type>
 			<type key="numbers" type="jpan">Japanese Numerals</type>
 			<type key="numbers" type="jpanfin">Japanese Financial Numerals</type>
+			<type key="numbers" type="jpanfin" scope="core">Japanese financial</type>
 			<type key="numbers" type="jpanyear">Japanese Calendar Gannen Year Numerals</type>
+			<type key="numbers" type="jpanyear" scope="core">Japanese first-year Gannen numbering</type>
 			<type key="numbers" type="kali">Kayah Li Digits</type>
 			<type key="numbers" type="kawi">Kawi Digits</type>
 			<type key="numbers" type="khmr">Khmer Digits</type>
@@ -1570,15 +1666,21 @@ annotations.
 			<type key="numbers" type="krai">Kirat Rai Digits</type>
 			<type key="numbers" type="lana">Tai Tham Hora Digits</type>
 			<type key="numbers" type="lanatham">Tai Tham Tham Digits</type>
+			<type key="numbers" type="lanatham" scope="core">Tai Tham Tham (ecclesiastical)</type>
 			<type key="numbers" type="laoo">Lao Digits</type>
 			<type key="numbers" type="latn">Western Digits</type>
 			<type key="numbers" type="lepc">Lepcha Digits</type>
 			<type key="numbers" type="limb">Limbu Digits</type>
 			<type key="numbers" type="mathbold">Mathematical Bold Digits</type>
+			<type key="numbers" type="mathbold" scope="core">Mathematical bold</type>
 			<type key="numbers" type="mathdbl">Mathematical Double-Struck Digits</type>
+			<type key="numbers" type="mathdbl" scope="core">Mathematical double-struck</type>
 			<type key="numbers" type="mathmono">Mathematical Monospace Digits</type>
+			<type key="numbers" type="mathmono" scope="core">Mathematical monospace</type>
 			<type key="numbers" type="mathsanb">Mathematical Sans-Serif Bold Digits</type>
+			<type key="numbers" type="mathsanb" scope="core">Mathematical sans-serif bold</type>
 			<type key="numbers" type="mathsans">Mathematical Sans-Serif Digits</type>
+			<type key="numbers" type="mathsans" scope="core">Mathematical sans-serif</type>
 			<type key="numbers" type="mlym">Malayalam Digits</type>
 			<type key="numbers" type="modi">Modi Digits</type>
 			<type key="numbers" type="mong">Mongolian Digits</type>
@@ -1586,11 +1688,16 @@ annotations.
 			<type key="numbers" type="mtei">Meetei Mayek Digits</type>
 			<type key="numbers" type="mymr">Myanmar Digits</type>
 			<type key="numbers" type="mymrepka">Myanmar Eastern Pwo Karen Digits</type>
+			<type key="numbers" type="mymrepka" scope="core">Myanmar Eastern Pwo Karen</type>
 			<type key="numbers" type="mymrpao">Myanmar Pao Digits</type>
+			<type key="numbers" type="mymrpao" scope="core">Myanmar Pao</type>
 			<type key="numbers" type="mymrshan">Myanmar Shan Digits</type>
+			<type key="numbers" type="mymrshan" scope="core">Myanmar Shan</type>
 			<type key="numbers" type="mymrtlng">Myanmar Tai Laing Digits</type>
+			<type key="numbers" type="mymrtlng" scope="core">Myanmar Tai Laing</type>
 			<type key="numbers" type="nagm">Nag Mundari Digits</type>
 			<type key="numbers" type="native">Native Digits</type>
+			<type key="numbers" type="native" scope="core">Native digits</type>
 			<type key="numbers" type="newa">Newa Digits</type>
 			<type key="numbers" type="nkoo">N’Ko Digits</type>
 			<type key="numbers" type="olck">Ol Chiki Digits</type>
@@ -1598,11 +1705,15 @@ annotations.
 			<type key="numbers" type="orya">Odia Digits</type>
 			<type key="numbers" type="osma">Osmanya Digits</type>
 			<type key="numbers" type="outlined">Outlined Digits</type>
+			<type key="numbers" type="outlined" scope="core">Outlined</type>
 			<type key="numbers" type="rohg">Hanifi Rohingya digits</type>
 			<type key="numbers" type="roman">Roman Numerals</type>
+			<type key="numbers" type="roman" scope="core">Roman uppercase</type>
 			<type key="numbers" type="romanlow">Roman Lowercase Numerals</type>
+			<type key="numbers" type="romanlow" scope="core">Roman lowercase</type>
 			<type key="numbers" type="saur">Saurashtra Digits</type>
 			<type key="numbers" type="segment">Segmented Digits</type>
+			<type key="numbers" type="segment" scope="core">Segmented</type>
 			<type key="numbers" type="shrd">Sharada Digits</type>
 			<type key="numbers" type="sind">Khudawadi Digits</type>
 			<type key="numbers" type="sinh">Sinhala Lith Digits</type>
@@ -1613,12 +1724,15 @@ annotations.
 			<type key="numbers" type="talu">New Tai Lue Digits</type>
 			<type key="numbers" type="taml">Traditional Tamil Numerals</type>
 			<type key="numbers" type="tamldec">Tamil Digits</type>
+			<type key="numbers" type="tamldec" scope="core">Modern Tamil</type>
 			<type key="numbers" type="telu">Telugu Digits</type>
 			<type key="numbers" type="thai">Thai Digits</type>
 			<type key="numbers" type="tibt">Tibetan Digits</type>
 			<type key="numbers" type="tirh">Tirhuta Digits</type>
 			<type key="numbers" type="tnsa">Tangsa Digits</type>
+			<type key="numbers" type="tols">Tolong Siki Digits</type>
 			<type key="numbers" type="traditional">Traditional Numerals</type>
+			<type key="numbers" type="traditional" scope="core">Traditional numerals</type>
 			<type key="numbers" type="vaii">Vai Digits</type>
 			<type key="numbers" type="wara">Warang Citi Digits</type>
 			<type key="numbers" type="wcho">Wancho Digits</type>
@@ -1630,9 +1744,12 @@ annotations.
 			<type key="s0" type="publish">From Publishing Punctuation To ASCII</type>
 			<type key="s0" type="zawgyi">From Zawgyi Myanmar Encoding</type>
 			<type key="ss" type="none">Sentence Breaks Without Abbreviation Handling</type>
+			<type key="ss" type="none" scope="core">Off</type>
 			<type key="ss" type="standard">Suppress Sentence Breaks After Standard Abbreviations</type>
+			<type key="ss" type="standard" scope="core">On</type>
 			<type key="t0" type="und">Unspecified Machine Translation</type>
 			<type key="va" type="posix">POSIX Compliant Locale</type>
+			<type key="va" type="posix" scope="core">POSIX variant</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metric</measurementSystemName>
@@ -1671,8 +1788,9 @@ annotations.
 		<exemplarCharacters>[a b c d e f g h i j k l m n o p q r s t u v w x y z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[áàăâåäãā æ ç éèĕêëē íìĭîïī ñ óòŏôöøō œ úùŭûüū ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‐‑ , . /]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
@@ -1820,6 +1938,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1828,6 +1949,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1845,9 +1969,12 @@ annotations.
 						<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="EBh">E h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E h a</dateFormatItem>
+						<dateFormatItem id="Eh" alt="ascii">E h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehm" alt="ascii">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -1870,6 +1997,9 @@ annotations.
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hms" alt="ascii">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="hv" alt="ascii">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
@@ -2002,6 +2132,16 @@ annotations.
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="coptic">
+				<eras>
+					<eraNames>
+						<era type="1">Anno Martyrum</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="1">AM</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -2024,7 +2164,7 @@ annotations.
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>M/d/y GGGGG</pattern>
+							<pattern>M/d/y G</pattern>
 							<datetimeSkeleton>GGGGGyMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -2037,6 +2177,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2045,6 +2188,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2053,6 +2199,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -2061,6 +2210,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -2068,9 +2220,12 @@ annotations.
 						<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="EBh">E h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E h a</dateFormatItem>
+						<dateFormatItem id="Eh" alt="ascii">E h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehm" alt="ascii">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -2078,7 +2233,9 @@ annotations.
 						<dateFormatItem id="Ehms" alt="ascii">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -2091,6 +2248,9 @@ annotations.
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hms" alt="ascii">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="hv" alt="ascii">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
@@ -2101,9 +2261,9 @@ annotations.
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd">M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -2143,21 +2303,21 @@ annotations.
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G">M/d/y GGGGG – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="G">M/d/y G – M/d/y G</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G">E, M/d/y GGGGG – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="G">E, M/d/y G – E, M/d/y G</greatestDifference>
+							<greatestDifference id="M">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="y">E, M/d/y – E, M/d/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
@@ -2234,18 +2394,18 @@ annotations.
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y G</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="M">E, M/d/y – E, M/d/y G</greatestDifference>
+							<greatestDifference id="y">E, M/d/y – E, M/d/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
@@ -2631,6 +2791,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2639,6 +2802,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'at' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2647,6 +2813,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -2655,6 +2824,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -2662,9 +2834,12 @@ annotations.
 						<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="EBh">E h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E h a</dateFormatItem>
+						<dateFormatItem id="Eh" alt="ascii">E h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehm" alt="ascii">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
@@ -2672,7 +2847,9 @@ annotations.
 						<dateFormatItem id="Ehms" alt="ascii">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -2691,6 +2868,9 @@ annotations.
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="hmv" alt="ascii">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="hv" alt="ascii">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
@@ -3157,8 +3337,13 @@ annotations.
 					</monthContext>
 				</months>
 				<eras>
+					<eraNames>
+						<era type="0">Anno Hegirae</era>
+						<era type="1">Before Hijrah</era>
+					</eraNames>
 					<eraAbbr>
 						<era type="0">AH</era>
+						<era type="1">BH</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -3179,7 +3364,7 @@ annotations.
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>M/d/y GGGGG</pattern>
+							<pattern>M/d/y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -3189,7 +3374,9 @@ annotations.
 						<dateFormatItem id="E">ccc</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -3202,9 +3389,9 @@ annotations.
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd">M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -3241,6 +3428,89 @@ annotations.
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="EEEEd">EEEE d</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEEEEd">EEEE, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
+						<dateFormatItem id="MEEEEd">EEEE, M/d</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEEEEd">EEEE, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEEEEd">EEEE, MMMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMM">MM y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, MMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEEEEd">EEEE, MMMM d, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="roc">
 				<eras>
@@ -3911,20 +4181,40 @@ annotations.
 			<regionFormat type="daylight">{0} Daylight Time</regionFormat>
 			<regionFormat type="standard">{0} Standard Time</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Coordinated Universal Time</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown City</exemplarCity>
+				<exemplarCity>Unknown Location</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Rothera Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Palmer Land</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Troll Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Showa Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Mawson Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Vostok Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Casey Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Dumont d’Urville Station</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>McMurdo Station</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
 				<exemplarCity>Macquarie Island</exemplarCity>
@@ -3941,6 +4231,15 @@ annotations.
 			<zone type="Indian/Christmas">
 				<exemplarCity>Christmas Island</exemplarCity>
 			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Galápagos Islands</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Canaries</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Faroes</exemplarCity>
+			</zone>
 			<zone type="Europe/London">
 				<long>
 					<daylight>British Summer Time</daylight>
@@ -3951,12 +4250,48 @@ annotations.
 					<daylight>Irish Standard Time</daylight>
 				</long>
 			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Chagos Archipelago</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Canton Island</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Comoros</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>Aktau</exemplarCity>
+			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
 			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Kyzylorda</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Kwajalein Atoll</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Mexico City</exemplarCity>
+			</zone>
 			<zone type="Pacific/Norfolk">
 				<exemplarCity>Norfolk Island</exemplarCity>
 			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>Chatham Islands</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Marquesas Islands</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Pitcairn Islands</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Kerguelen Islands</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Midway Atoll</exemplarCity>
+			</zone>
 			<zone type="Pacific/Wake">
 				<exemplarCity>Wake Island</exemplarCity>
 			</zone>
@@ -3992,9 +4327,7 @@ annotations.
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>West Africa Time</generic>
-					<standard>West Africa Standard Time</standard>
-					<daylight>West Africa Summer Time</daylight>
+					<standard>West Africa Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4422,6 +4755,14 @@ annotations.
 					<standard>Guyana Time</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutian Standard Time</standard>
+				</long>
+				<short>
+					<standard>HST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutian Time</generic>
@@ -4443,9 +4784,9 @@ annotations.
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Hovd Time</generic>
-					<standard>Hovd Standard Time</standard>
-					<daylight>Hovd Summer Time</daylight>
+					<generic>Khovd Time</generic>
+					<standard>Khovd Standard Time</standard>
+					<daylight>Khovd Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -4777,9 +5118,9 @@ annotations.
 			</metazone>
 			<metazone type="Qyzylorda">
 				<long>
-					<generic>Qyzylorda Time</generic>
-					<standard>Qyzylorda Standard Time</standard>
-					<daylight>Qyzylorda Summer Time</daylight>
+					<generic>Kyzylorda Time</generic>
+					<standard>Kyzylorda Standard Time</standard>
+					<daylight>Kyzylorda Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -4877,6 +5218,13 @@ annotations.
 					<standard>Chuuk Time</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Türkiye Time</generic>
+					<standard>Türkiye Standard Time</standard>
+					<daylight>Türkiye Summer Time</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistan Time</generic>
@@ -5042,6 +5390,12 @@ annotations.
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="latn">
+			<rationalPattern>{0}⁄{1}</rationalPattern>
+			<integerAndRationalPattern>{0} {1}</integerAndRationalPattern>
+			<integerAndRationalPattern alt="superSub">{0}⁠{1}</integerAndRationalPattern>
+			<rationalUsage>sometimes</rationalUsage>
+		</rationalFormats>
 		<scientificFormats numberSystem="latn">
 			<scientificFormatLength>
 				<scientificFormat>
@@ -5866,9 +6220,9 @@ annotations.
 				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
-				<displayName>Kyrgystani Som</displayName>
-				<displayName count="one">Kyrgystani som</displayName>
-				<displayName count="other">Kyrgystani soms</displayName>
+				<displayName>Kyrgyz Som</displayName>
+				<displayName count="one">Kyrgyz som</displayName>
+				<displayName count="other">Kyrgyz soms</displayName>
 				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
@@ -6823,12 +7177,12 @@ annotations.
 			<pattern type="atLeast">{0}+</pattern>
 		</miscPatterns>
 		<minimalPairs>
-			<pluralMinimalPairs count="one">{0} day</pluralMinimalPairs>
-			<pluralMinimalPairs count="other">{0} days</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="few">Take the {0}rd right.</ordinalMinimalPairs>
-			<ordinalMinimalPairs ordinal="one">Take the {0}st right.</ordinalMinimalPairs>
-			<ordinalMinimalPairs ordinal="other">Take the {0}th right.</ordinalMinimalPairs>
-			<ordinalMinimalPairs ordinal="two">Take the {0}nd right.</ordinalMinimalPairs>
+			<pluralMinimalPairs count="one">{0} day</pluralMinimalPairs>
+			<pluralMinimalPairs count="other">{0} days</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="few">Take the {0}rd right.</ordinalMinimalPairs>
+			<ordinalMinimalPairs ordinal="one">Take the {0}st right.</ordinalMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">Take the {0}th right.</ordinalMinimalPairs>
+			<ordinalMinimalPairs ordinal="two">Take the {0}nd right.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
@@ -7055,7 +7409,12 @@ annotations.
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0} items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parts</displayName>
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts per million</displayName>
 				<unitPattern count="one">{0} part per million</unitPattern>
 				<unitPattern count="other">{0} parts per million</unitPattern>
@@ -7080,6 +7439,11 @@ annotations.
 				<unitPattern count="one">{0} mole</unitPattern>
 				<unitPattern count="other">{0} moles</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>of glucose</displayName>
+				<unitPattern count="one">{0} of glucose</unitPattern>
+				<unitPattern count="other">{0} of glucose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liters per kilometer</displayName>
 				<unitPattern count="one">{0} liter per kilometer</unitPattern>
@@ -7617,6 +7981,11 @@ annotations.
 				<unitPattern count="one">{0} millimeter of mercury</unitPattern>
 				<unitPattern count="other">{0} millimeters of mercury</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>of mercury</displayName>
+				<unitPattern count="one">{0} of mercury</unitPattern>
+				<unitPattern count="other">{0} of mercury</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pounds-force per square inch</displayName>
 				<unitPattern count="one">{0} pound-force per square inch</unitPattern>
@@ -7795,6 +8164,11 @@ annotations.
 				<unitPattern count="one">{0} metric cup</unitPattern>
 				<unitPattern count="other">{0} metric cups</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metric fluid ounces</displayName>
+				<unitPattern count="one">{0} metric fluid ounce</unitPattern>
+				<unitPattern count="other">{0} metric fluid ounces</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-feet</displayName>
 				<unitPattern count="one">{0} acre-foot</unitPattern>
@@ -7827,11 +8201,21 @@ annotations.
 				<unitPattern count="one">{0} pint</unitPattern>
 				<unitPattern count="other">{0} pints</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pints Imperial</displayName>
+				<unitPattern count="one">{0} pint Imperial</unitPattern>
+				<unitPattern count="other">{0} pints Imperial</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>cups</displayName>
 				<unitPattern count="one">{0} cup</unitPattern>
 				<unitPattern count="other">{0} cups</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cups Imperial</displayName>
+				<unitPattern count="one">{0} cup Imperial</unitPattern>
+				<unitPattern count="other">{0} cups Imperial</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fluid ounces</displayName>
 				<unitPattern count="one">{0} fluid ounce</unitPattern>
@@ -7892,17 +8276,202 @@ annotations.
 				<unitPattern count="one">{0} Imp. quart</unitPattern>
 				<unitPattern count="other">{0} Imp. quarts</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calories [IT]</displayName>
+				<unitPattern count="one">{0} calorie [IT]</unitPattern>
+				<unitPattern count="other">{0} calories [IT]</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>British thermal units [IT]</displayName>
+				<unitPattern count="one">{0} British thermal unit [IT]</unitPattern>
+				<unitPattern count="other">{0} British thermal units [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograms-force</displayName>
+				<unitPattern count="one">{0} kilogram-force</unitPattern>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>rods</displayName>
+				<unitPattern count="one">{0} rod</unitPattern>
+				<unitPattern count="other">{0} rods</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>chains</displayName>
+				<unitPattern count="one">{0} chain</unitPattern>
+				<unitPattern count="other">{0} chains</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>rankines</displayName>
+				<unitPattern count="one">{0} rankine</unitPattern>
+				<unitPattern count="other">{0} rankines</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>fortnights</displayName>
+				<unitPattern count="one">{0} fortnight</unitPattern>
+				<unitPattern count="other">{0} fortnights</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>slugs</displayName>
+				<unitPattern count="one">{0} slug</unitPattern>
+				<unitPattern count="other">{0} slugs</unitPattern>
+			</unit>
 			<unit type="pressure-gasoline-energy-density">
 				<displayName>of gasoline equivalent</displayName>
 				<unitPattern count="one">{0} of gasoline equivalent</unitPattern>
 				<unitPattern count="other">{0} of gasoline equivalent</unitPattern>
 			</unit>
+			<unit type="length-rin">
+				<displayName>rin [JP]</displayName>
+				<unitPattern count="one">{0} rin [JP]</unitPattern>
+				<unitPattern count="other">{0} rin [JP]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>sun [JP]</displayName>
+				<unitPattern count="one">{0} sun [JP]</unitPattern>
+				<unitPattern count="other">{0} sun [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>shaku [JP]</displayName>
+				<unitPattern count="one">{0} shaku [JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>shaku [cloth, JP]</displayName>
+				<unitPattern count="one">{0} shaku [cloth, JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [cloth, JP]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ken [JP]</displayName>
+				<unitPattern count="one">{0} ken [JP]</unitPattern>
+				<unitPattern count="other">{0} ken [JP]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>jo [JP]</displayName>
+				<unitPattern count="one">{0} jo [JP]</unitPattern>
+				<unitPattern count="other">{0} jo [JP]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ri [JP]</displayName>
+				<unitPattern count="one">{0} ri [JP]</unitPattern>
+				<unitPattern count="other">{0} ri [JP]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>bu [JP]</displayName>
+				<unitPattern count="one">{0} bu [JP]</unitPattern>
+				<unitPattern count="other">{0} bu [JP]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>se [JP]</displayName>
+				<unitPattern count="one">{0} se [JP]</unitPattern>
+				<unitPattern count="other">{0} se [JP]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>cho [JP]</displayName>
+				<unitPattern count="one">{0} cho [JP]</unitPattern>
+				<unitPattern count="other">{0} cho [JP]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>kosaji [JP]</displayName>
+				<unitPattern count="one">{0} kosaji [JP]</unitPattern>
+				<unitPattern count="other">{0} kosaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>osaji [JP]</displayName>
+				<unitPattern count="one">{0} osaji [JP]</unitPattern>
+				<unitPattern count="other">{0} osaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>cup [JP]</displayName>
+				<unitPattern count="one">{0} cup [JP]</unitPattern>
+				<unitPattern count="other">{0} cup [JP]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>shaku [volume, JP]</displayName>
+				<unitPattern count="one">{0} shaku [volume, JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [volume, JP]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>sai [JP]</displayName>
+				<unitPattern count="one">{0} sai [JP]</unitPattern>
+				<unitPattern count="other">{0} sai [JP]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>to [JP]</displayName>
+				<unitPattern count="one">{0} to [JP]</unitPattern>
+				<unitPattern count="other">{0} to [JP]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>koku [JP]</displayName>
+				<unitPattern count="one">{0} koku [JP]</unitPattern>
+				<unitPattern count="other">{0} koku [JP]</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>light</displayName>
 				<unitPattern count="one">{0} light</unitPattern>
 				<unitPattern count="other">{0} light</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="mass-fun">
+				<displayName>fun [JP]</displayName>
+				<unitPattern count="one">{0} fun [JP]</unitPattern>
+				<unitPattern count="other">{0} fun [JP]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>parts per billion</displayName>
 				<unitPattern count="one">{0} part per billion</unitPattern>
 				<unitPattern count="other">{0} parts per billion</unitPattern>
@@ -8144,7 +8713,12 @@ annotations.
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0} items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>part</displayName>
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} part</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts/million</displayName>
 				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="other">{0} ppm</unitPattern>
@@ -8169,6 +8743,11 @@ annotations.
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liters/km</displayName>
 				<unitPattern count="one">{0} L/km</unitPattern>
@@ -8706,6 +9285,11 @@ annotations.
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>of Hg</displayName>
+				<unitPattern count="one">{0} of Hg</unitPattern>
+				<unitPattern count="other">{0} of Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>psi</displayName>
 				<unitPattern count="one">{0} psi</unitPattern>
@@ -8884,6 +9468,11 @@ annotations.
 				<unitPattern count="one">{0} mc</unitPattern>
 				<unitPattern count="other">{0} mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m.</displayName>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre ft</displayName>
 				<unitPattern count="one">{0} ac ft</unitPattern>
@@ -8915,11 +9504,21 @@ annotations.
 				<unitPattern count="one">{0} pt</unitPattern>
 				<unitPattern count="other">{0} pt</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pt Imp.</displayName>
+				<unitPattern count="one">{0} pt Imp.</unitPattern>
+				<unitPattern count="other">{0} pt Imp.</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>cups</displayName>
 				<unitPattern count="one">{0} c</unitPattern>
 				<unitPattern count="other">{0} c</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cup Imp</displayName>
+				<unitPattern count="one">{0} cup Imp.</unitPattern>
+				<unitPattern count="other">{0} cup Imp.</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fl oz</displayName>
 				<unitPattern count="one">{0} fl oz</unitPattern>
@@ -8980,17 +9579,202 @@ annotations.
 				<unitPattern count="one">{0} qt-Imp.</unitPattern>
 				<unitPattern count="other">{0} qt-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>sr</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>kat</displayName>
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>C</displayName>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>F</displayName>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>H</displayName>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>S</displayName>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>BTU-IT</displayName>
+				<unitPattern count="one">{0} BTU-IT</unitPattern>
+				<unitPattern count="other">{0} BT-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bq</displayName>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Sv</displayName>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gy</displayName>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kgf</displayName>
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>rd</displayName>
+				<unitPattern count="one">{0} rd</unitPattern>
+				<unitPattern count="other">{0} rd</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ch</displayName>
+				<unitPattern count="one">{0} ch</unitPattern>
+				<unitPattern count="other">{0} ch</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>T</displayName>
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Wb</displayName>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>°R</displayName>
+				<unitPattern count="one">{0} °R</unitPattern>
+				<unitPattern count="other">{0} °R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>fw</displayName>
+				<unitPattern count="one">{0} fw</unitPattern>
+				<unitPattern count="other">{0} fw</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>slug</displayName>
+				<unitPattern count="one">{0} slug</unitPattern>
+				<unitPattern count="other">{0} slug</unitPattern>
+			</unit>
 			<unit type="pressure-gasoline-energy-density">
 				<displayName>gas-equiv</displayName>
 				<unitPattern count="one">{0} gas-equiv</unitPattern>
 				<unitPattern count="other">{0} gas-equiv</unitPattern>
 			</unit>
+			<unit type="length-rin">
+				<displayName>rin [JP]</displayName>
+				<unitPattern count="one">{0} rin [JP]</unitPattern>
+				<unitPattern count="other">{0} rin [JP]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>sun [JP]</displayName>
+				<unitPattern count="one">{0} sun [JP]</unitPattern>
+				<unitPattern count="other">{0} sun [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>shaku [JP]</displayName>
+				<unitPattern count="one">{0} shaku [JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>shaku [cloth, JP]</displayName>
+				<unitPattern count="one">{0} shaku [cloth, JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [cloth, JP]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ken [JP]</displayName>
+				<unitPattern count="one">{0} ken [JP]</unitPattern>
+				<unitPattern count="other">{0} ken [JP]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>jo [JP]</displayName>
+				<unitPattern count="one">{0} jo [JP]</unitPattern>
+				<unitPattern count="other">{0} jo [JP]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ri [JP]</displayName>
+				<unitPattern count="one">{0} ri [JP]</unitPattern>
+				<unitPattern count="other">{0} ri [JP]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>bu [JP]</displayName>
+				<unitPattern count="one">{0} bu [JP]</unitPattern>
+				<unitPattern count="other">{0} bu [JP]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>se [JP]</displayName>
+				<unitPattern count="one">{0} se [JP]</unitPattern>
+				<unitPattern count="other">{0} se [JP]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>cho [JP]</displayName>
+				<unitPattern count="one">{0} cho [JP]</unitPattern>
+				<unitPattern count="other">{0} cho [JP]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>kosaji [JP]</displayName>
+				<unitPattern count="one">{0} kosaji [JP]</unitPattern>
+				<unitPattern count="other">{0} kosaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>osaji [JP]</displayName>
+				<unitPattern count="one">{0} osaji [JP]</unitPattern>
+				<unitPattern count="other">{0} osaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>cup [JP]</displayName>
+				<unitPattern count="one">{0} cup [JP]</unitPattern>
+				<unitPattern count="other">{0} cup [JP]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>shaku [vol, JP]</displayName>
+				<unitPattern count="one">{0} shaku [vol, JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [vol, JP]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>sai [JP]</displayName>
+				<unitPattern count="one">{0} sai [JP]</unitPattern>
+				<unitPattern count="other">{0} sai [JP]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>to [JP]</displayName>
+				<unitPattern count="one">{0} to [JP]</unitPattern>
+				<unitPattern count="other">{0} to [JP]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>koku [JP]</displayName>
+				<unitPattern count="one">{0} koku [JP]</unitPattern>
+				<unitPattern count="other">{0} koku [JP]</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>light</displayName>
 				<unitPattern count="one">{0} light</unitPattern>
 				<unitPattern count="other">{0} light</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="mass-fun">
+				<displayName>fun [JP]</displayName>
+				<unitPattern count="one">{0} fun [JP]</unitPattern>
+				<unitPattern count="other">{0} fun [JP]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>parts/billion</displayName>
 				<unitPattern count="one">{0} ppb</unitPattern>
 				<unitPattern count="other">{0} ppb</unitPattern>
@@ -9230,7 +10014,12 @@ annotations.
 				<unitPattern count="one">{0}item</unitPattern>
 				<unitPattern count="other">{0}items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>part</displayName>
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} part</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -9255,6 +10044,11 @@ annotations.
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0}L/km</unitPattern>
@@ -9792,6 +10586,11 @@ annotations.
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>of Hg</displayName>
+				<unitPattern count="one">{0} of Hg</unitPattern>
+				<unitPattern count="other">{0} of Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>psi</displayName>
 				<unitPattern count="one">{0}psi</unitPattern>
@@ -9970,6 +10769,11 @@ annotations.
 				<unitPattern count="one">{0}mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m.</displayName>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre ft</displayName>
 				<unitPattern count="one">{0}ac ft</unitPattern>
@@ -9988,8 +10792,8 @@ annotations.
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>Imp gal</displayName>
-				<unitPattern count="one">{0}galIm</unitPattern>
-				<unitPattern count="other">{0}galIm</unitPattern>
+				<unitPattern count="one">{0}gal-Im</unitPattern>
+				<unitPattern count="other">{0}gal-Im</unitPattern>
 				<perUnitPattern>{0}/galIm</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
@@ -10002,11 +10806,21 @@ annotations.
 				<unitPattern count="one">{0}pt</unitPattern>
 				<unitPattern count="other">{0}pt</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pt Imp.</displayName>
+				<unitPattern count="one">{0} pt Imp.</unitPattern>
+				<unitPattern count="other">{0} pt Imp.</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>cup</displayName>
 				<unitPattern count="one">{0}c</unitPattern>
 				<unitPattern count="other">{0}c</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cup Imp</displayName>
+				<unitPattern count="one">{0} cup Imp.</unitPattern>
+				<unitPattern count="other">{0} cup Imp.</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fl oz</displayName>
 				<unitPattern count="one">{0}fl oz</unitPattern>
@@ -10067,17 +10881,202 @@ annotations.
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>sr</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>kat</displayName>
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>C</displayName>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>F</displayName>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>H</displayName>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>S</displayName>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>BTU-IT</displayName>
+				<unitPattern count="one">{0} BTU-IT</unitPattern>
+				<unitPattern count="other">{0} BT-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bq</displayName>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Sv</displayName>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gy</displayName>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kgf</displayName>
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>rd</displayName>
+				<unitPattern count="one">{0} rd</unitPattern>
+				<unitPattern count="other">{0} rd</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ch</displayName>
+				<unitPattern count="one">{0} ch</unitPattern>
+				<unitPattern count="other">{0} ch</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>T</displayName>
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Wb</displayName>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>°R</displayName>
+				<unitPattern count="one">{0} °R</unitPattern>
+				<unitPattern count="other">{0} °R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>fw</displayName>
+				<unitPattern count="one">{0} fw</unitPattern>
+				<unitPattern count="other">{0} fw</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>slug</displayName>
+				<unitPattern count="one">{0} slug</unitPattern>
+				<unitPattern count="other">{0} slug</unitPattern>
+			</unit>
 			<unit type="pressure-gasoline-energy-density">
 				<displayName>gas-equiv</displayName>
 				<unitPattern count="one">{0}gas-equiv</unitPattern>
 				<unitPattern count="other">{0}gas-equiv</unitPattern>
 			</unit>
+			<unit type="length-rin">
+				<displayName>rin [JP]</displayName>
+				<unitPattern count="one">{0} rin [JP]</unitPattern>
+				<unitPattern count="other">{0} rin [JP]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>sun [JP]</displayName>
+				<unitPattern count="one">{0} sun [JP]</unitPattern>
+				<unitPattern count="other">{0} sun [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>shaku [JP]</displayName>
+				<unitPattern count="one">{0} shaku [JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>shaku [cloth, JP]</displayName>
+				<unitPattern count="one">{0} shaku [cloth, JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [cloth, JP]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ken [JP]</displayName>
+				<unitPattern count="one">{0} ken [JP]</unitPattern>
+				<unitPattern count="other">{0} ken [JP]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>jo [JP]</displayName>
+				<unitPattern count="one">{0} jo [JP]</unitPattern>
+				<unitPattern count="other">{0} jo [JP]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ri [JP]</displayName>
+				<unitPattern count="one">{0} ri [JP]</unitPattern>
+				<unitPattern count="other">{0} ri [JP]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>bu [JP]</displayName>
+				<unitPattern count="one">{0} bu [JP]</unitPattern>
+				<unitPattern count="other">{0} bu [JP]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>se [JP]</displayName>
+				<unitPattern count="one">{0} se [JP]</unitPattern>
+				<unitPattern count="other">{0} se [JP]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>cho [JP]</displayName>
+				<unitPattern count="one">{0} cho [JP]</unitPattern>
+				<unitPattern count="other">{0} cho [JP]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>kosaji [JP]</displayName>
+				<unitPattern count="one">{0} kosaji [JP]</unitPattern>
+				<unitPattern count="other">{0} kosaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>osaji [JP]</displayName>
+				<unitPattern count="one">{0} osaji [JP]</unitPattern>
+				<unitPattern count="other">{0} osaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>cup [JP]</displayName>
+				<unitPattern count="one">{0} cup [JP]</unitPattern>
+				<unitPattern count="other">{0} cup [JP]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>shaku [vol, JP]</displayName>
+				<unitPattern count="one">{0} shaku [vol, JP]</unitPattern>
+				<unitPattern count="other">{0} shaku [vol, JP]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>sai [JP]</displayName>
+				<unitPattern count="one">{0} sai [JP]</unitPattern>
+				<unitPattern count="other">{0} sai [JP]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>to [JP]</displayName>
+				<unitPattern count="one">{0} to [JP]</unitPattern>
+				<unitPattern count="other">{0} to [JP]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>koku [JP]</displayName>
+				<unitPattern count="one">{0} koku [JP]</unitPattern>
+				<unitPattern count="other">{0} koku [JP]</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>light</displayName>
 				<unitPattern count="one">{0}light</unitPattern>
 				<unitPattern count="other">{0}light</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="mass-fun">
+				<displayName>fun [JP]</displayName>
+				<unitPattern count="one">{0} fun [JP]</unitPattern>
+				<unitPattern count="other">{0} fun [JP]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ppb</displayName>
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
diff --git a/make/data/cldr/common/main/en_001.xml b/make/data/cldr/common/main/en_001.xml
index b538c4a2de7..1449bda6c0e 100644
--- a/make/data/cldr/common/main/en_001.xml
+++ b/make/data/cldr/common/main/en_001.xml
@@ -164,6 +164,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="M">LL</dateFormatItem>
@@ -323,7 +324,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
@@ -460,14 +462,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="M">LL</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyM">MM/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">dd/MM/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, dd/MM/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
@@ -475,6 +481,128 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="japanese">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+							<datetimeSkeleton>GGGGGyMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="M">LL</dateFormatItem>
+						<dateFormatItem id="Md">dd/MM</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyM">MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="G">dd/MM/y GGGGG – dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="M">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, dd/MM/y GGGGG – E, dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M–M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="M">E dd/MM – E dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E d – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM/y – MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="M">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">dd/MM/y – dd/MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 		</calendars>
 		<fields>
 			<field type="year-short">
@@ -778,28 +906,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 		</fields>
 		<timeZoneNames>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>St Barthélemy</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>St John’s</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>St Kitts</exemplarCity>
 			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
 			<zone type="America/St_Lucia">
 				<exemplarCity>St Lucia</exemplarCity>
 			</zone>
@@ -854,6 +969,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>∅∅∅</daylight>
 				</short>
 			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<standard>∅∅∅</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<short>
 					<generic>∅∅∅</generic>
diff --git a/make/data/cldr/common/main/en_150.xml b/make/data/cldr/common/main/en_150.xml
index 412dd61dbb2..d895be5ea9c 100644
--- a/make/data/cldr/common/main/en_150.xml
+++ b/make/data/cldr/common/main/en_150.xml
@@ -71,9 +71,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
diff --git a/make/data/cldr/common/main/en_AE.xml b/make/data/cldr/common/main/en_AE.xml
index 87a19fe34dd..c6dedc7e9dd 100644
--- a/make/data/cldr/common/main/en_AE.xml
+++ b/make/data/cldr/common/main/en_AE.xml
@@ -286,13 +286,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</calendar>
 		</calendars>
 		<timeZoneNames>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</zone>
 			<metazone type="Alaska">
 				<short>
 					<generic>∅∅∅</generic>
@@ -340,6 +333,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>GST</standard>
 				</short>
 			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<standard>∅∅∅</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<short>
 					<generic>∅∅∅</generic>
diff --git a/make/data/cldr/common/main/en_AT.xml b/make/data/cldr/common/main/en_AT.xml
index de4ddc030d3..b5e5c78b5e7 100644
--- a/make/data/cldr/common/main/en_AT.xml
+++ b/make/data/cldr/common/main/en_AT.xml
@@ -28,9 +28,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_AU.xml b/make/data/cldr/common/main/en_AU.xml
index 923e42942d0..1336f9887bd 100644
--- a/make/data/cldr/common/main/en_AU.xml
+++ b/make/data/cldr/common/main/en_AU.xml
@@ -24,11 +24,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</scripts>
 		<territories>
 			<territory type="001">World</territory>
-			<territory type="BL">St. Barthélemy</territory>
-			<territory type="KN">St. Kitts &amp; Nevis</territory>
-			<territory type="LC">St. Lucia</territory>
-			<territory type="MF">St. Martin</territory>
-			<territory type="VC">St. Vincent &amp; Grenadines</territory>
+			<territory type="AG">Antigua and Barbuda</territory>
+			<territory type="BA">Bosnia and Herzegovina</territory>
+			<territory type="EA">Ceuta and Melilla</territory>
+			<territory type="GS">South Georgia and South Sandwich Islands</territory>
+			<territory type="HM">Heard Island and McDonald Islands</territory>
+			<territory type="KN">St Kitts and Nevis</territory>
+			<territory type="PM">St Pierre and Miquelon</territory>
+			<territory type="SJ">Svalbard and Jan Mayen</territory>
+			<territory type="ST">São Tomé and Príncipe</territory>
+			<territory type="TC">Turks and Caicos Islands</territory>
+			<territory type="TT">Trinidad and Tobago</territory>
+			<territory type="VC">St Vincent and the Grenadines</territory>
+			<territory type="WF">Wallis and Futuna</territory>
 		</territories>
 		<keys>
 			<key type="colCaseFirst">Upper case / Lower case Ordering</key>
@@ -43,50 +51,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<dates>
 		<calendars>
 			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/y GGGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
 				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEEEEd">EEEE d MMM y G</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">EEEE d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMEEEEd">EEEE d MMMM</dateFormatItem>
@@ -154,22 +121,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="12">Dec</month>
 						</monthWidth>
 					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">May</month>
-							<month type="6">June</month>
-							<month type="7">July</month>
-							<month type="8">Aug</month>
-							<month type="9">Sept</month>
-							<month type="10">Oct</month>
-							<month type="11">Nov</month>
-							<month type="12">Dec</month>
-						</monthWidth>
-					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
@@ -335,10 +286,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="islamic">
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="M">LL</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="yyyyM">MM/y GGGGG</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -466,6 +414,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 		</fields>
 		<timeZoneNames>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis and Futuna</exemplarCity>
+			</zone>
 			<metazone type="Australia_Central">
 				<short>
 					<generic>ACT</generic>
@@ -501,6 +452,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>China Summer Time</daylight>
 				</long>
 			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>French Southern and Antarctic Time</standard>
+				</long>
+			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Japan Time</generic>
@@ -765,13 +721,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<unitLength type="short">
 			<unit type="angle-arc-minute">
 				<displayName>arcmin.</displayName>
-				<unitPattern count="one">{0} arcmin.</unitPattern>
-				<unitPattern count="other">{0} arcmin.</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>arcsec.</displayName>
-				<unitPattern count="one">{0} arcsec.</unitPattern>
-				<unitPattern count="other">{0} arcsec.</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<displayName>mg/dL</displayName>
@@ -794,16 +743,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} L/100 km</unitPattern>
 				<unitPattern count="other">{0} L/100 km</unitPattern>
 			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName>miles/gal. US</displayName>
-				<unitPattern count="one">{0} m.p.g. US</unitPattern>
-				<unitPattern count="other">{0} m.p.g. US</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName>miles/gal.</displayName>
-				<unitPattern count="one">{0} m.p.g.</unitPattern>
-				<unitPattern count="other">{0} m.p.g.</unitPattern>
-			</unit>
 			<unit type="duration-century">
 				<displayName>C</displayName>
 				<unitPattern count="one">{0} C</unitPattern>
@@ -826,16 +765,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} CM</unitPattern>
 				<unitPattern count="other">{0} CM</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-ofhg">
-				<displayName>mm Hg</displayName>
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
-			</unit>
-			<unit type="pressure-inch-ofhg">
-				<displayName>in Hg</displayName>
-			</unit>
 			<unit type="pressure-millibar">
-				<displayName>mb</displayName>
 				<unitPattern count="one">{0} mb</unitPattern>
 				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/en_CA.xml b/make/data/cldr/common/main/en_CA.xml
index 924ad541521..0334e1eb826 100644
--- a/make/data/cldr/common/main/en_CA.xml
+++ b/make/data/cldr/common/main/en_CA.xml
@@ -164,7 +164,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="MEd" alt="variant">E, d/M</dateFormatItem>
 						<dateFormatItem id="UMd">U-MM-dd</dateFormatItem>
 						<dateFormatItem id="UMd" alt="variant">d/M/U</dateFormatItem>
-						<dateFormatItem id="yMd" alt="variant">d/M/r</dateFormatItem>
 						<dateFormatItem id="yyyyM">r-MM</dateFormatItem>
 						<dateFormatItem id="yyyyMd">r-MM-dd</dateFormatItem>
 						<dateFormatItem id="yyyyMd" alt="variant">d/M/r</dateFormatItem>
@@ -229,7 +228,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>M/d/y GGGGG</pattern>
+							<pattern>M/d/y G</pattern>
 							<pattern alt="variant">d/M/y GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
@@ -1030,7 +1029,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat type="daylight">{0} Daylight Saving Time</regionFormat>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
@@ -1043,9 +1041,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/St_Lucia">
 				<exemplarCity>Saint Lucia</exemplarCity>
 			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangoon</exemplarCity>
-			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>Saint Helena</exemplarCity>
 			</zone>
@@ -1055,197 +1050,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/St_Thomas">
 				<exemplarCity>Saint Thomas</exemplarCity>
 			</zone>
-			<metazone type="Afghanistan">
-				<short>
-					<standard>AFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska Time</generic>
-					<standard>Alaska Standard Time</standard>
-					<daylight>Alaska Daylight Saving Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Central Time</generic>
-					<standard>Central Standard Time</standard>
-					<daylight>Central Daylight Saving Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Eastern Time</generic>
-					<standard>Eastern Standard Time</standard>
-					<daylight>Eastern Daylight Saving Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<short>
-					<generic>ART</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<short>
-					<generic>ACWT</generic>
-					<standard>ACWST</standard>
-					<daylight>ACWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<short>
-					<generic>AET</generic>
-					<standard>AEST</standard>
-					<daylight>AEDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<short>
-					<standard>AWST</standard>
-					<daylight>AWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bangladesh">
-				<short>
-					<standard>BST</standard>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<short>
-					<standard>BTT</standard>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<short>
-					<generic>BRT</generic>
-					<daylight>BRST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brunei">
-				<short>
-					<standard>BNT</standard>
-				</short>
-			</metazone>
-			<metazone type="Chatham">
-				<short>
-					<standard>CHAST</standard>
-					<daylight>CHADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Christmas">
-				<short>
-					<standard>CXT</standard>
-				</short>
-			</metazone>
-			<metazone type="Cocos">
-				<short>
-					<standard>CCT</standard>
-				</short>
-			</metazone>
-			<metazone type="Colombia">
-				<short>
-					<daylight>COST</daylight>
-				</short>
-			</metazone>
-			<metazone type="East_Timor">
-				<short>
-					<standard>TLT</standard>
-				</short>
-			</metazone>
-			<metazone type="Easter">
-				<short>
-					<standard>EAST</standard>
-					<daylight>EASST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ecuador">
-				<short>
-					<standard>ECT</standard>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<short>
-					<generic>FKT</generic>
-					<daylight>FKST</daylight>
-				</short>
-			</metazone>
 			<metazone type="French_Southern">
 				<long>
 					<standard>French Southern and Antarctic Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Galapagos">
-				<short>
-					<standard>GALT</standard>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<short>
-					<generic>EGT</generic>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<short>
-					<standard>Gulf Time</standard>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<short>
-					<standard>GYT</standard>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<short>
-					<standard>IST</standard>
-				</short>
-			</metazone>
-			<metazone type="Indochina">
-				<short>
-					<standard>ICT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<short>
-					<standard>WITA</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<short>
-					<standard>WIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<short>
-					<standard>WIB</standard>
-				</short>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>Iran Time</generic>
-					<standard>Iran Standard Time</standard>
-					<daylight>Iran Daylight Saving Time</daylight>
-				</long>
-				<short>
-					<standard>IRST</standard>
-					<daylight>IRDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Malaysia">
-				<short>
-					<standard>MYT</standard>
-				</short>
-			</metazone>
-			<metazone type="Maldives">
-				<short>
-					<standard>MVT</standard>
-				</short>
-			</metazone>
-			<metazone type="Nepal">
-				<short>
-					<standard>NPT</standard>
-				</short>
-			</metazone>
 			<metazone type="Newfoundland">
 				<short>
 					<generic>NT</generic>
@@ -1253,32 +1062,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>NDT</daylight>
 				</short>
 			</metazone>
-			<metazone type="Noronha">
-				<short>
-					<generic>FNT</generic>
-				</short>
-			</metazone>
-			<metazone type="Pakistan">
-				<short>
-					<standard>PKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Paraguay">
-				<short>
-					<generic>PYT</generic>
-					<daylight>PYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Peru">
-				<short>
-					<generic>PET</generic>
-				</short>
-			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
 					<generic>Saint-Pierre-et-Miquelon Time</generic>
 					<standard>Saint-Pierre-et-Miquelon Standard Time</standard>
-					<daylight>Saint-Pierre-et-Miquelon Daylight Saving Time</daylight>
+					<daylight>Saint-Pierre-et-Miquelon Daylight Time</daylight>
 				</long>
 				<short>
 					<generic>PMT</generic>
@@ -1286,24 +1074,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>PMDT</daylight>
 				</short>
 			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<generic>American Samoa Time</generic>
-					<standard>American Samoa Standard Time</standard>
-					<daylight>Samoan Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<short>
-					<standard>UYT</standard>
-					<daylight>UYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Venezuela">
-				<short>
-					<standard>VET</standard>
-				</short>
-			</metazone>
 			<metazone type="Wallis">
 				<long>
 					<standard>Wallis and Futuna Time</standard>
@@ -1371,6 +1141,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="USD">
 				<symbol>US$</symbol>
 			</currency>
+			<currency type="XCG">
+				<symbol draft="contributed">Cg</symbol>
+			</currency>
 			<currency type="XXX">
 				<displayName>unknown currency</displayName>
 			</currency>
diff --git a/make/data/cldr/common/main/en_CH.xml b/make/data/cldr/common/main/en_CH.xml
index 089854b073e..8a7cf48cef1 100644
--- a/make/data/cldr/common/main/en_CH.xml
+++ b/make/data/cldr/common/main/en_CH.xml
@@ -110,16 +110,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<group>’</group>
+			<group>'</group>
 			<superscriptingExponent>·</superscriptingExponent>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_EE.xml b/make/data/cldr/common/main/en_EE.xml
new file mode 100644
index 00000000000..08b7cc850d1
--- /dev/null
+++ b/make/data/cldr/common/main/en_EE.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="EE"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_GB.xml b/make/data/cldr/common/main/en_GB.xml
index 2954f553cf4..73df8a91701 100644
--- a/make/data/cldr/common/main/en_GB.xml
+++ b/make/data/cldr/common/main/en_GB.xml
@@ -15,12 +15,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languages>
 			<language type="ff">Fulah</language>
 		</languages>
+		<scripts>
+			<script type="Hrkt">Japanese Syllabaries</script>
+		</scripts>
+		<keys>
+			<key type="lw">Line Breaks Within Words</key>
+		</keys>
+		<types>
+			<type key="numbers" type="armnlow" scope="core">Armenian Lowercase</type>
+			<type key="numbers" type="fullwide" scope="core">Full-Width</type>
+			<type key="numbers" type="greklow" scope="core">Greek Lowercase</type>
+			<type key="numbers" type="hansfin" scope="core">Simplified Chinese Financial</type>
+			<type key="numbers" type="hantfin" scope="core">Traditional Chinese Financial</type>
+			<type key="numbers" type="jpanfin" scope="core">Japanese Financial</type>
+			<type key="numbers" type="native" scope="core">Native Digits</type>
+			<type key="numbers" type="roman" scope="core">Roman Uppercase</type>
+			<type key="numbers" type="romanlow" scope="core">Roman Lowercase</type>
+		</types>
 	</localeDisplayNames>
 	<dates>
 		<calendars>
 			<calendar type="generic">
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEEEEd">EEEE, d MMM y G</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
@@ -126,7 +144,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEEEEd">EEEE, d MMM y G</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
@@ -136,15 +154,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMMEEEEd">EEEE, d MMMM y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEEEEd">
 							<greatestDifference id="d">EEEE d MMM – EEEE d MMM y G</greatestDifference>
 							<greatestDifference id="G">EEEE d MMM y G – EEEE d MMM y G</greatestDifference>
 							<greatestDifference id="M">EEEE d MMM – EEEE d MMM y G</greatestDifference>
 							<greatestDifference id="y">EEEE d MMM y – EEEE d MMM y G</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">d – d MMM y</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
 						</intervalFormatItem>
@@ -164,12 +197,69 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="islamic">
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="japanese">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d/M/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} 'at' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMMEEEEd">EEEE, d MMM y G</dateFormatItem>
-						<dateFormatItem id="M">LL</dateFormatItem>
-						<dateFormatItem id="yyyyM">MM/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEEEEd">EEEE, d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMMEEEEd">EEEE, d MMMM y G</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
+						<dateFormatItem id="MEEEEd">EEEE, d/M</dateFormatItem>
+						<dateFormatItem id="MMMEEEEd">EEEE, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMEEEEd">EEEE, d MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEEEEd">EEEE, d MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEEEEd">EEEE, d MMMM y G</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -180,15 +270,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>BST</daylight>
 				</short>
 			</zone>
-			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bahia Banderas</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Merida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancun</exemplarCity>
-			</zone>
 			<metazone type="Europe_Central">
 				<short>
 					<generic>CET</generic>
@@ -217,6 +298,92 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 		</timeZoneNames>
 	</dates>
+	<numbers>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0k</pattern>
+					<pattern type="1000" count="other">0k</pattern>
+					<pattern type="10000" count="one">00k</pattern>
+					<pattern type="10000" count="other">00k</pattern>
+					<pattern type="100000" count="one">000k</pattern>
+					<pattern type="100000" count="other">000k</pattern>
+					<pattern type="1000000" count="one">0m</pattern>
+					<pattern type="1000000" count="other">0m</pattern>
+					<pattern type="10000000" count="one">00m</pattern>
+					<pattern type="10000000" count="other">00m</pattern>
+					<pattern type="100000000" count="one">000m</pattern>
+					<pattern type="100000000" count="other">000m</pattern>
+					<pattern type="1000000000" count="one">0bn</pattern>
+					<pattern type="1000000000" count="other">0bn</pattern>
+					<pattern type="10000000000" count="one">00bn</pattern>
+					<pattern type="10000000000" count="other">00bn</pattern>
+					<pattern type="100000000000" count="one">000bn</pattern>
+					<pattern type="100000000000" count="other">000bn</pattern>
+					<pattern type="1000000000000" count="one">0tn</pattern>
+					<pattern type="1000000000000" count="other">0tn</pattern>
+					<pattern type="10000000000000" count="one">00tn</pattern>
+					<pattern type="10000000000000" count="other">00tn</pattern>
+					<pattern type="100000000000000" count="one">000tn</pattern>
+					<pattern type="100000000000000" count="other">000tn</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0k</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0k</pattern>
+					<pattern type="1000" count="other">¤0k</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0k</pattern>
+					<pattern type="10000" count="one">¤00k</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00k</pattern>
+					<pattern type="10000" count="other">¤00k</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00k</pattern>
+					<pattern type="100000" count="one">¤000k</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000k</pattern>
+					<pattern type="100000" count="other">¤000k</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000k</pattern>
+					<pattern type="1000000" count="one">¤0m</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0m</pattern>
+					<pattern type="1000000" count="other">¤0m</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0m</pattern>
+					<pattern type="10000000" count="one">¤00m</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00m</pattern>
+					<pattern type="10000000" count="other">¤00m</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00m</pattern>
+					<pattern type="100000000" count="one">¤000m</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000m</pattern>
+					<pattern type="100000000" count="other">¤000m</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000m</pattern>
+					<pattern type="1000000000" count="one">¤0bn</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0bn</pattern>
+					<pattern type="1000000000" count="other">¤0bn</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0bn</pattern>
+					<pattern type="10000000000" count="one">¤00bn</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00bn</pattern>
+					<pattern type="10000000000" count="other">¤00bn</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00bn</pattern>
+					<pattern type="100000000000" count="one">¤000bn</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000bn</pattern>
+					<pattern type="100000000000" count="other">¤000bn</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000bn</pattern>
+					<pattern type="1000000000000" count="one">¤0tn</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0tn</pattern>
+					<pattern type="1000000000000" count="other">¤0tn</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0tn</pattern>
+					<pattern type="10000000000000" count="one">¤00tn</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00tn</pattern>
+					<pattern type="10000000000000" count="other">¤00tn</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00tn</pattern>
+					<pattern type="100000000000000" count="one">¤000tn</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000tn</pattern>
+					<pattern type="100000000000000" count="other">¤000tn</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000tn</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
 	<personNames>
 		<initialPattern type="initial">{0}</initialPattern>
 	</personNames>
diff --git a/make/data/cldr/common/main/en_GE.xml b/make/data/cldr/common/main/en_GE.xml
new file mode 100644
index 00000000000..9c38932c636
--- /dev/null
+++ b/make/data/cldr/common/main/en_GE.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="GE"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+		<currencies>
+			<currency type="GEL">
+				<symbol>₾</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_IN.xml b/make/data/cldr/common/main/en_IN.xml
index d40501175db..38729d7acf8 100644
--- a/make/data/cldr/common/main/en_IN.xml
+++ b/make/data/cldr/common/main/en_IN.xml
@@ -12,13 +12,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<territory type="IN"/>
 	</identity>
 	<localeDisplayNames>
-		<languages>
-			<language type="bn">Bengali</language>
-		</languages>
-		<scripts>
-			<script type="Beng">Bengali</script>
-			<script type="Orya">Oriya</script>
-		</scripts>
 		<types>
 			<type key="numbers" type="beng">Bengali Digits</type>
 			<type key="numbers" type="orya">Oriya Digits</type>
@@ -299,7 +292,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
@@ -321,24 +313,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</calendar>
 		</calendars>
 		<timeZoneNames>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kyzylorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Khovd</exemplarCity>
-			</zone>
 			<metazone type="Gulf">
 				<short>
 					<standard>GST</standard>
 				</short>
 			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<generic>Khovd Time</generic>
-					<standard>Khovd Standard Time</standard>
-					<daylight>Khovd Summer Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="India">
 				<short>
 					<standard>IST</standard>
@@ -353,6 +332,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern>#,##,##0.###</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one" draft="contributed">0 thousand</pattern>
+					<pattern type="1000" count="other" draft="contributed">0 thousand</pattern>
+					<pattern type="10000" count="one" draft="contributed">00 thousand</pattern>
+					<pattern type="10000" count="other" draft="contributed">00 thousand</pattern>
+					<pattern type="100000" count="one" draft="contributed">0 lakh</pattern>
+					<pattern type="100000" count="other" draft="contributed">0 lakh</pattern>
+					<pattern type="1000000" count="one" draft="contributed">00 lakh</pattern>
+					<pattern type="1000000" count="other" draft="contributed">00 lakh</pattern>
+					<pattern type="10000000" count="one" draft="contributed">0 crore</pattern>
+					<pattern type="10000000" count="other" draft="contributed">0 crore</pattern>
+					<pattern type="100000000" count="one" draft="contributed">00 crore</pattern>
+					<pattern type="100000000" count="other" draft="contributed">00 crore</pattern>
+					<pattern type="1000000000" count="one" draft="contributed">000 crore</pattern>
+					<pattern type="1000000000" count="other" draft="contributed">000 crore</pattern>
+					<pattern type="10000000000" count="one" draft="contributed">0000 crore</pattern>
+					<pattern type="10000000000" count="other" draft="contributed">0000 crore</pattern>
+					<pattern type="100000000000" count="one" draft="contributed">00000 crore</pattern>
+					<pattern type="100000000000" count="other" draft="contributed">00000 crore</pattern>
+					<pattern type="1000000000000" count="one" draft="contributed">0 lakh crore</pattern>
+					<pattern type="1000000000000" count="other" draft="contributed">0 lakh crore</pattern>
+					<pattern type="10000000000000" count="one" draft="contributed">00 lakh crore</pattern>
+					<pattern type="10000000000000" count="other" draft="contributed">00 lakh crore</pattern>
+					<pattern type="100000000000000" count="one" draft="contributed">000 lakh crore</pattern>
+					<pattern type="100000000000000" count="other" draft="contributed">000 lakh crore</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
 					<pattern type="1000" count="one">0K</pattern>
@@ -393,8 +400,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -443,10 +450,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
+			<currency type="ANG">
+				<displayName count="one">Netherlands Antillean Guilder</displayName>
+				<displayName count="other">Netherlands Antillean Guilders</displayName>
+			</currency>
 			<currency type="KGS">
 				<displayName>Kyrgyzstani Som</displayName>
-				<displayName count="one">Kyrgyzstani som</displayName>
-				<displayName count="other">Kyrgyzstani soms</displayName>
+				<displayName count="one">Kyrgyzstani Som</displayName>
+				<displayName count="other">Kyrgyzstani Soms</displayName>
 			</currency>
 			<currency type="KZT">
 				<displayName count="one">Kazakhstani Tenge</displayName>
@@ -477,9 +488,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Venezuelan bolívars</displayName>
 			</currency>
 			<currency type="VES">
-				<displayName>VEF</displayName>
-				<displayName count="one">VEF</displayName>
-				<displayName count="other">VEF</displayName>
+				<displayName count="one">Venezuelan Bolívar</displayName>
+				<displayName count="other">Venezuelan Bolívars</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>Caribbean Guilder</displayName>
+				<displayName count="one">Caribbean Guilder</displayName>
+				<displayName count="other">Caribbean Guilders</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName count="one">Zimbabwean Gold</displayName>
+				<displayName count="other">Zimbabwean Gold</displayName>
 			</currency>
 		</currencies>
 	</numbers>
diff --git a/make/data/cldr/common/main/en_JP.xml b/make/data/cldr/common/main/en_JP.xml
new file mode 100644
index 00000000000..32e77fdbaf3
--- /dev/null
+++ b/make/data/cldr/common/main/en_JP.xml
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="JP"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, MMMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d, y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y/MM/dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="EHm">E H:mm</dateFormatItem>
+						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyMd">GGGGG y/MM/dd</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
+						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Md">MM/dd</dateFormatItem>
+						<dateFormatItem id="MEd">E, MM/dd</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y/MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y/MM/dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y/MM/dd, E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">GGGGG y/MM – GGGGG y/MM</greatestDifference>
+							<greatestDifference id="M">GGGGG y/MM – y/MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y/MM – y/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">GGGGG y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="G">GGGGG y/MM/dd – GGGGG y/MM/dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y/MM/dd – y/MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y/MM/dd, E – E, y/MM/dd, E</greatestDifference>
+							<greatestDifference id="G">GGGGG y/MM/dd, E – GGGGG y/MM/dd, E</greatestDifference>
+							<greatestDifference id="M">GGGGG y/MM/dd, E – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="y">GGGGG y/MM/dd, E – E, y/MM/dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">H – H</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">H:mm – H:mm</greatestDifference>
+							<greatestDifference id="m">H:mm – H:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">H:mm – H:mm v</greatestDifference>
+							<greatestDifference id="m">H:mm – H:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">H – H v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM/dd – MM/dd</greatestDifference>
+							<greatestDifference id="M">MM/dd – MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E, MM/dd – E, MM/dd</greatestDifference>
+							<greatestDifference id="M">E, MM/dd – E, MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">GGGGG y/MM – y/MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y/MM – yMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">GGGGG y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y/MM/dd – y/MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y/MM/dd, E – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="M">GGGGG y/MM/dd, E – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="y">GGGGG y/MM/dd, E – y/MM/dd, E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE, MMMM d, y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d, y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d, y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y/MM/dd</pattern>
+							<datetimeSkeleton>yMd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>H:mm:ss zzzz</pattern>
+							<datetimeSkeleton>Hmmsszzzz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>H:mm:ss z</pattern>
+							<datetimeSkeleton>Hmmssz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>H:mm:ss</pattern>
+							<datetimeSkeleton>Hmmss</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>H:mm</pattern>
+							<datetimeSkeleton>Hmm</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyMd">y/MM/dd G</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
+						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
+						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
+						<dateFormatItem id="yM">MM/y</dateFormatItem>
+						<dateFormatItem id="yMd">y/MM/dd</dateFormatItem>
+						<dateFormatItem id="yMEd">E, y/MM/dd</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">MM/y G – MM/y G</greatestDifference>
+							<greatestDifference id="M">MM/y – MM/y G</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">y/MM/dd – y/MM/dd G</greatestDifference>
+							<greatestDifference id="G">y/MM/dd G – y/MM/dd G</greatestDifference>
+							<greatestDifference id="M">y/MM/dd – y/MM/dd G</greatestDifference>
+							<greatestDifference id="y">y/MM/dd – y/MM/dd G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E, y/MM/dd – E, y/MM/dd G</greatestDifference>
+							<greatestDifference id="G">E, y/MM/dd G – E, y/MM/dd G</greatestDifference>
+							<greatestDifference id="M">E, y/MM/dd – E, y/MM/dd G</greatestDifference>
+							<greatestDifference id="y">E, y/MM/dd – E, y/MM/dd G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="M">y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="y">y/MM/dd – y/MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E, y/MM/dd – E, y/MM/dd</greatestDifference>
+							<greatestDifference id="M">E, y/MM/dd – E, y/MM/dd</greatestDifference>
+							<greatestDifference id="y">E, y/MM/dd – E, y/MM/dd</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="japanese">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y/MM/dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="Gy">G y</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="GyMMMEEEEd">G y MMMM d, EEEE</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y/MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y/MM/dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y/MM/dd EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMEEEEd">GGGGG y MMMM d, EEEE</dateFormatItem>
+						<dateFormatItem id="yyyyMM">GGGGG y MM</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y MMMM</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B – h B</greatestDifference>
+							<greatestDifference id="h">h – h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G y/MM – G y/MM</greatestDifference>
+							<greatestDifference id="M">G y/MM – y/MM</greatestDifference>
+							<greatestDifference id="y">G y/MM – y/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="G">G y/MM/dd – G y/MM/dd</greatestDifference>
+							<greatestDifference id="M">G y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="y">G y/MM/dd – y/MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G y/MM/dd – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="G">G y/MM/dd – G y/MM/dd, E</greatestDifference>
+							<greatestDifference id="M">G y/MM/dd, E – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="y">G y/MM/dd, E – y/MM/dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
+							<greatestDifference id="M">G y MMM – MMM</greatestDifference>
+							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y MMM d – d</greatestDifference>
+							<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
+							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">G y MMM d – y MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
+							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">H:mm – H:mm</greatestDifference>
+							<greatestDifference id="m">H:mm – H:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">H:mm – H:mm v</greatestDifference>
+							<greatestDifference id="m">H:mm – H:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">H – H v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">M/d – M/d</greatestDifference>
+							<greatestDifference id="M">M/d – M/d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM/dd, E – MM/dd, E</greatestDifference>
+							<greatestDifference id="M">M/dd, E – MM/dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d – d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
+							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">y/MM – y/MM</greatestDifference>
+							<greatestDifference id="y">y/MM – y/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="M">y/MM/dd – y/MM/dd</greatestDifference>
+							<greatestDifference id="y">y/MM/dd – y/MM/dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">y/MM/dd, E – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="M">y/MM/dd, E – y/MM/dd, E</greatestDifference>
+							<greatestDifference id="y">y/MM/dd, E – y/MM/dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">y MMM – MMM</greatestDifference>
+							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">y MMM d – d</greatestDifference>
+							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">y MMM d, E – E, MMM d, E</greatestDifference>
+							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">y MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<timeZoneNames>
+			<metazone type="Alaska">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Central">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Eastern">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Mountain">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="America_Pacific">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Atlantic">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<standard>∅∅∅</standard>
+				</short>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<short>
+					<generic>∅∅∅</generic>
+					<standard>∅∅∅</standard>
+					<daylight>∅∅∅</daylight>
+				</short>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+</ldml>
diff --git a/make/data/cldr/common/main/en_LT.xml b/make/data/cldr/common/main/en_LT.xml
new file mode 100644
index 00000000000..c5c880fcc95
--- /dev/null
+++ b/make/data/cldr/common/main/en_LT.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="LT"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_LV.xml b/make/data/cldr/common/main/en_LV.xml
new file mode 100644
index 00000000000..0dede606c74
--- /dev/null
+++ b/make/data/cldr/common/main/en_LV.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="LV"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_MH.xml b/make/data/cldr/common/main/en_MH.xml
index 7f42c1cf96c..f48bd0b31be 100644
--- a/make/data/cldr/common/main/en_MH.xml
+++ b/make/data/cldr/common/main/en_MH.xml
@@ -13,13 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<dates>
 		<timeZoneNames>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</zone>
 			<metazone type="Alaska">
 				<short>
 					<generic>∅∅∅</generic>
@@ -62,6 +55,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>∅∅∅</daylight>
 				</short>
 			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<standard>∅∅∅</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<short>
 					<generic>∅∅∅</generic>
diff --git a/make/data/cldr/common/main/en_MP.xml b/make/data/cldr/common/main/en_MP.xml
index 43d42252bdd..285ca25a84c 100644
--- a/make/data/cldr/common/main/en_MP.xml
+++ b/make/data/cldr/common/main/en_MP.xml
@@ -13,13 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<dates>
 		<timeZoneNames>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>∅∅∅</generic>
-					<standard>∅∅∅</standard>
-					<daylight>∅∅∅</daylight>
-				</short>
-			</zone>
 			<metazone type="Alaska">
 				<short>
 					<generic>∅∅∅</generic>
@@ -62,6 +55,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>∅∅∅</daylight>
 				</short>
 			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<standard>∅∅∅</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<short>
 					<generic>∅∅∅</generic>
diff --git a/make/data/cldr/common/main/en_MV.xml b/make/data/cldr/common/main/en_MV.xml
index d6ebe136b06..b851e8ee2b0 100644
--- a/make/data/cldr/common/main/en_MV.xml
+++ b/make/data/cldr/common/main/en_MV.xml
@@ -97,6 +97,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
diff --git a/make/data/cldr/common/main/en_NL.xml b/make/data/cldr/common/main/en_NL.xml
index 7db1396ef36..e9bc5140768 100644
--- a/make/data/cldr/common/main/en_NL.xml
+++ b/make/data/cldr/common/main/en_NL.xml
@@ -20,9 +20,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_PL.xml b/make/data/cldr/common/main/en_PL.xml
index f450a26f0fd..61cd8e94f52 100644
--- a/make/data/cldr/common/main/en_PL.xml
+++ b/make/data/cldr/common/main/en_PL.xml
@@ -20,6 +20,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_PT.xml b/make/data/cldr/common/main/en_PT.xml
index 83f5062f161..b1868f5d217 100644
--- a/make/data/cldr/common/main/en_PT.xml
+++ b/make/data/cldr/common/main/en_PT.xml
@@ -20,6 +20,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_RO.xml b/make/data/cldr/common/main/en_RO.xml
index 26063dc6e4c..360ee380064 100644
--- a/make/data/cldr/common/main/en_RO.xml
+++ b/make/data/cldr/common/main/en_RO.xml
@@ -20,6 +20,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_SI.xml b/make/data/cldr/common/main/en_SI.xml
index fa881408603..3cf0f92e428 100644
--- a/make/data/cldr/common/main/en_SI.xml
+++ b/make/data/cldr/common/main/en_SI.xml
@@ -21,6 +21,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_SK.xml b/make/data/cldr/common/main/en_SK.xml
index 424e5132db9..d2c3f645ce2 100644
--- a/make/data/cldr/common/main/en_SK.xml
+++ b/make/data/cldr/common/main/en_SK.xml
@@ -21,6 +21,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/en_Shaw.xml b/make/data/cldr/common/main/en_Shaw.xml
index 937d9e50698..7fedd656fc0 100644
--- a/make/data/cldr/common/main/en_Shaw.xml
+++ b/make/data/cldr/common/main/en_Shaw.xml
@@ -12,20 +12,414 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<script type="Shaw"/>
 	</identity>
 	<localeDisplayNames>
+		<languages>
+			<language type="ar" draft="unconfirmed">𐑨𐑮𐑩𐑚𐑦𐑒</language>
+			<language type="cs" draft="unconfirmed">𐑗𐑧𐑒</language>
+			<language type="da" draft="unconfirmed">𐑛𐑱𐑯𐑦𐑖</language>
+			<language type="de" draft="unconfirmed">𐑡𐑻𐑥𐑩𐑯</language>
+			<language type="en" draft="unconfirmed">𐑦𐑙𐑜𐑤𐑦𐑖</language>
+			<language type="fr" draft="unconfirmed">𐑓𐑮𐑧𐑯𐑗</language>
+			<language type="hi" draft="unconfirmed">𐑣𐑦𐑯𐑛𐑦</language>
+			<language type="hi_Latn" alt="variant" draft="unconfirmed">𐑣𐑦𐑙𐑜𐑤𐑦𐑖</language>
+			<language type="it" draft="unconfirmed">𐑦𐑑𐑨𐑤𐑾𐑯</language>
+			<language type="ja" draft="unconfirmed">𐑡𐑨𐑐𐑩𐑯𐑰𐑟</language>
+			<language type="ko" draft="unconfirmed">𐑒𐑼𐑾𐑯</language>
+			<language type="nl" draft="unconfirmed">𐑛𐑳𐑗</language>
+			<language type="nl_BE" draft="unconfirmed">𐑓𐑤𐑧𐑥𐑦𐑖</language>
+			<language type="zh" draft="unconfirmed">𐑗𐑲𐑯𐑰𐑟</language>
+		</languages>
+		<scripts>
+			<script type="Arab" draft="unconfirmed">𐑨𐑮𐑩𐑚𐑦𐑒</script>
+			<script type="Avst" draft="unconfirmed">𐑩𐑝𐑧𐑕𐑑𐑩𐑯</script>
+			<script type="Cyrl" draft="unconfirmed">𐑕𐑦𐑮𐑦𐑤𐑦𐑒</script>
+			<script type="Jpan" draft="unconfirmed">𐑡𐑨𐑐𐑩𐑯𐑰𐑟</script>
+			<script type="Kore" draft="unconfirmed">𐑒𐑼𐑾𐑯</script>
+			<script type="Latn" draft="unconfirmed">𐑤𐑨𐑑𐑦𐑯</script>
+		</scripts>
 		<territories>
 			<territory type="001" draft="unconfirmed">𐑢𐑻𐑤𐑛</territory>
+			<territory type="002" draft="unconfirmed">·𐑨𐑓𐑮𐑦𐑒𐑩</territory>
+			<territory type="003" draft="unconfirmed">·𐑯𐑹𐑔 𐑩𐑥𐑧𐑮𐑦𐑒𐑩</territory>
+			<territory type="005" draft="unconfirmed">·𐑕𐑬𐑔 𐑩𐑥𐑧𐑮𐑦𐑒𐑩</territory>
+			<territory type="009" draft="unconfirmed">·𐑴𐑖𐑦𐑭𐑯𐑾</territory>
+			<territory type="013" draft="unconfirmed">·𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑩𐑥𐑧𐑮𐑦𐑒𐑩</territory>
 			<territory type="019" draft="unconfirmed">·𐑩𐑥𐑧𐑮𐑦𐑒𐑩𐑟</territory>
+			<territory type="021" draft="unconfirmed">·𐑯𐑹𐑞𐑼𐑯 𐑩𐑥𐑧𐑮𐑦𐑒𐑩</territory>
+			<territory type="029" draft="unconfirmed">·𐑒𐑨𐑮𐑦𐑚𐑰𐑩𐑯</territory>
+			<territory type="039" draft="unconfirmed">·𐑕𐑳𐑞𐑼𐑯 𐑘𐑫𐑼𐑩𐑐</territory>
+			<territory type="057" draft="unconfirmed">𐑥𐑲𐑒𐑮𐑴𐑯𐑰𐑟𐑩𐑯 𐑮𐑰𐑡𐑩𐑯</territory>
+			<territory type="142" draft="unconfirmed">·𐑱𐑠𐑩</territory>
+			<territory type="150" draft="unconfirmed">·𐑘𐑫𐑼𐑩𐑐</territory>
+			<territory type="151" draft="unconfirmed">·𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐</territory>
+			<territory type="154" draft="unconfirmed">·𐑯𐑹𐑞𐑼𐑯 𐑘𐑫𐑼𐑩𐑐</territory>
+			<territory type="155" draft="unconfirmed">·𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐</territory>
+			<territory type="419" draft="unconfirmed">·𐑤𐑨𐑑𐑦𐑯 𐑩𐑥𐑧𐑮𐑦𐑒𐑩</territory>
+			<territory type="AC" draft="unconfirmed">·𐑩𐑕𐑧𐑯𐑖𐑩𐑯 𐑲𐑤𐑩𐑯𐑛</territory>
+			<territory type="AD" draft="unconfirmed">·𐑨𐑯𐑛𐑹𐑩</territory>
+			<territory type="AE" draft="unconfirmed">·𐑿𐑯𐑲𐑑𐑩𐑛 𐑨𐑮𐑩𐑚 𐑧𐑥𐑦𐑮𐑩𐑑𐑕</territory>
+			<territory type="AF" draft="unconfirmed">·𐑨𐑓𐑜𐑨𐑯𐑦𐑕𐑑𐑭𐑯</territory>
+			<territory type="AI" draft="unconfirmed">·𐑨𐑙𐑜𐑢𐑦𐑤𐑩</territory>
+			<territory type="AL" draft="unconfirmed">·𐑨𐑤𐑚𐑱𐑯𐑾</territory>
+			<territory type="AO" draft="unconfirmed">·𐑨𐑙𐑜𐑴𐑤𐑩</territory>
+			<territory type="AQ" draft="unconfirmed">·𐑨𐑯𐑑𐑸𐑒𐑑𐑦𐑒𐑩</territory>
+			<territory type="AR" draft="unconfirmed">·𐑸𐑡𐑩𐑯𐑑𐑰𐑯𐑩</territory>
+			<territory type="AS" draft="unconfirmed">·𐑩𐑥𐑧𐑮𐑦𐑒𐑩𐑯 𐑕𐑩𐑥𐑴𐑩</territory>
+			<territory type="AT" draft="unconfirmed">·𐑪𐑕𐑑𐑮𐑾</territory>
+			<territory type="AU" draft="unconfirmed">·𐑪𐑕𐑑𐑮𐑱𐑤𐑾</territory>
+			<territory type="AZ" draft="unconfirmed">·𐑨𐑟𐑼𐑚𐑲𐑡𐑭𐑯</territory>
+			<territory type="BB" draft="unconfirmed">·𐑚𐑸𐑚𐑱𐑛𐑪𐑕</territory>
+			<territory type="BD" draft="unconfirmed">·𐑚𐑨𐑙𐑜𐑤𐑩𐑛𐑧𐑖</territory>
+			<territory type="BE" draft="unconfirmed">·𐑚𐑧𐑤𐑡𐑩𐑥</territory>
+			<territory type="BG" draft="unconfirmed">·𐑚𐑳𐑤𐑜𐑺𐑾</territory>
+			<territory type="BH" draft="unconfirmed">·𐑚𐑸𐑱𐑯</territory>
+			<territory type="BI" draft="unconfirmed">·𐑚𐑫𐑮𐑫𐑯𐑛𐑦</territory>
+			<territory type="BJ" draft="unconfirmed">·𐑚𐑧𐑯𐑦𐑯</territory>
+			<territory type="BM" draft="unconfirmed">·𐑚𐑼𐑥𐑿𐑛𐑩</territory>
+			<territory type="BN" draft="unconfirmed">·𐑚𐑮𐑵𐑯𐑲</territory>
+			<territory type="BO" draft="unconfirmed">·𐑚𐑩𐑤𐑦𐑝𐑾</territory>
+			<territory type="BR" draft="unconfirmed">·𐑚𐑮𐑩𐑟𐑦𐑤</territory>
+			<territory type="BS" draft="unconfirmed">·𐑚𐑩𐑣𐑭𐑥𐑩𐑟</territory>
+			<territory type="BT" draft="unconfirmed">·𐑚𐑵𐑑𐑭𐑯</territory>
+			<territory type="BW" draft="unconfirmed">·𐑚𐑪𐑑𐑕𐑢𐑭𐑯𐑩</territory>
+			<territory type="CA" draft="unconfirmed">·𐑒𐑨𐑯𐑩𐑛𐑩</territory>
+			<territory type="CD" draft="unconfirmed">·𐑒𐑪𐑙𐑜𐑴 - ·𐑒𐑦𐑯𐑖𐑭𐑕𐑩</territory>
+			<territory type="CD" alt="variant" draft="unconfirmed">·𐑒𐑪𐑙𐑜𐑴 (𐑛𐑰𐑸𐑕𐑰)</territory>
+			<territory type="CF" draft="unconfirmed">·𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑨𐑓𐑮𐑦𐑒𐑩𐑯 𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒</territory>
+			<territory type="CG" draft="unconfirmed">·𐑒𐑪𐑙𐑜𐑴 - ·𐑚𐑮𐑭𐑟𐑩𐑝𐑦𐑤</territory>
+			<territory type="CG" alt="variant" draft="unconfirmed">·𐑒𐑪𐑙𐑜𐑴 (𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒)</territory>
+			<territory type="CH" draft="unconfirmed">·𐑕𐑢𐑦𐑑𐑕𐑼𐑤𐑩𐑯𐑛</territory>
+			<territory type="CK" draft="unconfirmed">·𐑒𐑫𐑒 𐑲𐑤𐑩𐑯𐑛𐑟</territory>
+			<territory type="CL" draft="unconfirmed">·𐑗𐑦𐑤𐑦</territory>
+			<territory type="CM" draft="unconfirmed">·𐑒𐑨𐑥𐑼𐑵𐑯</territory>
+			<territory type="CN" draft="unconfirmed">·𐑗𐑲𐑯𐑩</territory>
+			<territory type="CO" draft="unconfirmed">·𐑒𐑩𐑤𐑳𐑥𐑚𐑾</territory>
+			<territory type="CR" draft="unconfirmed">·𐑒𐑪𐑕𐑑𐑩 𐑮𐑰𐑒𐑩</territory>
+			<territory type="CU" draft="unconfirmed">·𐑒𐑿𐑚𐑩</territory>
+			<territory type="CY" draft="unconfirmed">·𐑕𐑲𐑐𐑮𐑩𐑕</territory>
+			<territory type="CZ" draft="unconfirmed">·𐑗𐑧𐑒𐑾</territory>
+			<territory type="CZ" alt="variant" draft="unconfirmed">·𐑗𐑧𐑒 𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒</territory>
+			<territory type="DE" draft="unconfirmed">·𐑡𐑻𐑥𐑩𐑯𐑦</territory>
+			<territory type="DJ" draft="unconfirmed">·𐑡𐑦𐑚𐑵𐑑𐑦</territory>
+			<territory type="DK" draft="unconfirmed">·𐑛𐑧𐑯𐑥𐑸𐑒</territory>
+			<territory type="DM" draft="unconfirmed">·𐑛𐑩𐑥𐑦𐑯𐑦𐑒𐑩</territory>
+			<territory type="DO" draft="unconfirmed">·𐑛𐑩𐑥𐑦𐑯𐑦𐑒𐑩𐑯 𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒</territory>
+			<territory type="DZ" draft="unconfirmed">·𐑨𐑤𐑡𐑽𐑾</territory>
+			<territory type="EC" draft="unconfirmed">·𐑧𐑒𐑢𐑩𐑛𐑹</territory>
+			<territory type="EG" draft="unconfirmed">·𐑰𐑡𐑦𐑐𐑑</territory>
+			<territory type="ER" draft="unconfirmed">·𐑧𐑮𐑦𐑑𐑮𐑱𐑩</territory>
+			<territory type="ES" draft="unconfirmed">·𐑕𐑐𐑱𐑯</territory>
+			<territory type="ET" draft="unconfirmed">·𐑰𐑔𐑦𐑴𐑐𐑾</territory>
+			<territory type="FI" draft="unconfirmed">·𐑓𐑦𐑯𐑤𐑩𐑯𐑛</territory>
+			<territory type="FJ" draft="unconfirmed">·𐑓𐑰𐑡𐑰</territory>
+			<territory type="FK" draft="unconfirmed">·𐑓𐑷𐑒𐑤𐑨𐑯𐑛 𐑲𐑤𐑩𐑯𐑛𐑟</territory>
+			<territory type="FK" alt="variant" draft="unconfirmed">·𐑓𐑷𐑒𐑤𐑨𐑯𐑛 𐑲𐑤𐑩𐑯𐑛𐑟 (·𐑦𐑕𐑤𐑨𐑟 𐑥𐑨𐑤𐑝𐑰𐑯𐑩𐑟)</territory>
+			<territory type="FR" draft="unconfirmed">·𐑓𐑮𐑭𐑯𐑕</territory>
+			<territory type="GA" draft="unconfirmed">·𐑜𐑨𐑚𐑪𐑯</territory>
+			<territory type="GB" draft="unconfirmed">·𐑿𐑯𐑲𐑑𐑩𐑛 𐑒𐑦𐑙𐑛𐑩𐑥</territory>
+			<territory type="GB" alt="short" draft="unconfirmed">·𐑿𐑒𐑱</territory>
+			<territory type="GD" draft="unconfirmed">·𐑜𐑮𐑩𐑯𐑱𐑛𐑩</territory>
+			<territory type="GE" draft="unconfirmed">·𐑡𐑹𐑡𐑩</territory>
+			<territory type="GH" draft="unconfirmed">·𐑜𐑭𐑯𐑩</territory>
+			<territory type="GI" draft="unconfirmed">·𐑡𐑦𐑚𐑮𐑷𐑤𐑑𐑼</territory>
+			<territory type="GM" draft="unconfirmed">·𐑜𐑨𐑥𐑚𐑾</territory>
+			<territory type="GN" draft="unconfirmed">·𐑜𐑦𐑯𐑦</territory>
+			<territory type="GR" draft="unconfirmed">·𐑜𐑮𐑰𐑕</territory>
+			<territory type="GT" draft="unconfirmed">·𐑜𐑢𐑭𐑑𐑩𐑥𐑭𐑤𐑩</territory>
+			<territory type="GY" draft="unconfirmed">·𐑜𐑲𐑭𐑯𐑩</territory>
+			<territory type="HK" draft="unconfirmed">·𐑣𐑪𐑙 𐑒𐑪𐑙 𐑕.𐑩.𐑮. ·𐑗𐑲𐑯𐑩</territory>
+			<territory type="HK" alt="short" draft="unconfirmed">·𐑣𐑪𐑙 𐑒𐑪𐑙</territory>
+			<territory type="HN" draft="unconfirmed">·𐑣𐑪𐑯𐑛𐑘𐑫𐑼𐑩𐑕</territory>
+			<territory type="HR" draft="unconfirmed">·𐑒𐑮𐑴𐑱𐑖𐑩</territory>
+			<territory type="HT" draft="unconfirmed">·𐑣𐑱𐑑𐑦</territory>
+			<territory type="HU" draft="unconfirmed">·𐑣𐑳𐑙𐑜𐑼𐑦</territory>
+			<territory type="ID" draft="unconfirmed">·𐑦𐑯𐑛𐑩𐑯𐑰𐑠𐑩</territory>
+			<territory type="IE" draft="unconfirmed">·𐑲𐑼𐑤𐑩𐑯𐑛</territory>
+			<territory type="IL" draft="unconfirmed">·𐑦𐑟𐑮𐑱𐑤</territory>
+			<territory type="IN" draft="unconfirmed">·𐑦𐑯𐑛𐑾</territory>
+			<territory type="IO" draft="unconfirmed">·𐑚𐑮𐑦𐑑𐑦𐑖 𐑦𐑯𐑛𐑾𐑯 𐑴𐑖𐑩𐑯 𐑑𐑧𐑮𐑦𐑑𐑼𐑦</territory>
+			<territory type="IQ" draft="unconfirmed">·𐑦𐑮𐑭𐑒</territory>
+			<territory type="IR" draft="unconfirmed">·𐑦𐑮𐑭𐑯</territory>
+			<territory type="IS" draft="unconfirmed">·𐑲𐑕𐑤𐑩𐑯𐑛</territory>
+			<territory type="IT" draft="unconfirmed">·𐑦𐑑𐑩𐑤𐑦</territory>
+			<territory type="JM" draft="unconfirmed">·𐑡𐑩𐑥𐑱𐑒𐑩</territory>
+			<territory type="JO" draft="unconfirmed">·𐑡𐑹𐑛𐑩𐑯</territory>
+			<territory type="JP" draft="unconfirmed">·𐑡𐑩𐑐𐑨𐑯</territory>
+			<territory type="KE" draft="unconfirmed">·𐑒𐑧𐑯𐑘𐑩</territory>
+			<territory type="KH" draft="unconfirmed">·𐑒𐑨𐑥𐑚𐑴𐑛𐑾</territory>
+			<territory type="KP" draft="unconfirmed">·𐑯𐑹𐑔 𐑒𐑼𐑾</territory>
+			<territory type="KR" draft="unconfirmed">·𐑕𐑬𐑔 𐑒𐑼𐑾</territory>
+			<territory type="KW" draft="unconfirmed">·𐑒𐑵𐑢𐑱𐑑</territory>
+			<territory type="LA" draft="unconfirmed">·𐑤𐑬𐑕</territory>
+			<territory type="LB" draft="unconfirmed">·𐑤𐑧𐑚𐑩𐑯𐑪𐑯</territory>
+			<territory type="LI" draft="unconfirmed">·𐑤𐑦𐑒𐑑𐑩𐑯𐑕𐑑𐑲𐑯</territory>
+			<territory type="LK" draft="unconfirmed">·𐑕𐑮𐑦 𐑤𐑨𐑯𐑒𐑩</territory>
+			<territory type="LR" draft="unconfirmed">·𐑤𐑲𐑚𐑽𐑾</territory>
+			<territory type="LS" draft="unconfirmed">·𐑤𐑩𐑕𐑵𐑑𐑵</territory>
+			<territory type="LT" draft="unconfirmed">·𐑤𐑦𐑔𐑿𐑱𐑯𐑾</territory>
+			<territory type="LU" draft="unconfirmed">·𐑤𐑳𐑒𐑕𐑩𐑥𐑚𐑻𐑜</territory>
+			<territory type="LY" draft="unconfirmed">·𐑤𐑦𐑚𐑾</territory>
+			<territory type="MA" draft="unconfirmed">·𐑥𐑼𐑪𐑒𐑴</territory>
+			<territory type="MC" draft="unconfirmed">·𐑥𐑪𐑯𐑩𐑒𐑴</territory>
+			<territory type="MG" draft="unconfirmed">·𐑥𐑨𐑛𐑩𐑜𐑨𐑕𐑒𐑼</territory>
+			<territory type="MH" draft="unconfirmed">·𐑥𐑸𐑖𐑩𐑤 𐑲𐑤𐑩𐑯𐑛𐑟</territory>
+			<territory type="MK" draft="unconfirmed">·𐑯𐑹𐑔 𐑥𐑨𐑕𐑩𐑛𐑴𐑯𐑾</territory>
+			<territory type="ML" draft="unconfirmed">·𐑥𐑭𐑤𐑦</territory>
+			<territory type="MM" draft="unconfirmed">·𐑥𐑘𐑨𐑯𐑥𐑸 (·𐑚𐑻𐑥𐑩)</territory>
+			<territory type="MN" draft="unconfirmed">·𐑥𐑪𐑙𐑜𐑴𐑤𐑾</territory>
+			<territory type="MO" draft="unconfirmed">·𐑥𐑩𐑒𐑬 𐑒𐑪𐑙 𐑕.𐑩.𐑮. ·𐑗𐑲𐑯𐑩</territory>
+			<territory type="MO" alt="short" draft="unconfirmed">·𐑥𐑩𐑒𐑬</territory>
+			<territory type="MR" draft="unconfirmed">·𐑥𐑹𐑦𐑑𐑱𐑯𐑾</territory>
+			<territory type="MS" draft="unconfirmed">·𐑥𐑪𐑯𐑑𐑕𐑼𐑨𐑑</territory>
+			<territory type="MT" draft="unconfirmed">·𐑥𐑷𐑤𐑑𐑩</territory>
+			<territory type="MU" draft="unconfirmed">·𐑥𐑼𐑦𐑖𐑩𐑕</territory>
+			<territory type="MW" draft="unconfirmed">·𐑥𐑩𐑤𐑭𐑢𐑦</territory>
+			<territory type="MX" draft="unconfirmed">·𐑥𐑧𐑒𐑕𐑦𐑒𐑴</territory>
+			<territory type="MY" draft="unconfirmed">·𐑥𐑩𐑤𐑱𐑠𐑩</territory>
+			<territory type="MZ" draft="unconfirmed">·𐑥𐑴𐑟𐑨𐑥𐑚𐑰𐑒</territory>
+			<territory type="NA" draft="unconfirmed">·𐑯𐑩𐑥𐑦𐑚𐑾</territory>
+			<territory type="NE" draft="unconfirmed">·𐑯𐑰𐑠𐑺</territory>
+			<territory type="NG" draft="unconfirmed">·𐑯𐑲𐑡𐑽𐑾</territory>
+			<territory type="NI" draft="unconfirmed">·𐑯𐑦𐑒𐑼𐑭𐑜𐑢𐑩</territory>
+			<territory type="NL" draft="unconfirmed">·𐑯𐑧𐑞𐑼𐑤𐑩𐑯𐑛𐑟</territory>
+			<territory type="NO" draft="unconfirmed">·𐑯𐑹𐑢𐑱</territory>
+			<territory type="NP" draft="unconfirmed">·𐑯𐑦𐑐𐑷𐑤</territory>
+			<territory type="NR" draft="unconfirmed">·𐑯𐑭𐑵𐑮𐑵</territory>
+			<territory type="NZ" draft="unconfirmed">·𐑯𐑿 𐑟𐑰𐑤𐑩𐑯𐑛</territory>
+			<territory type="NZ" alt="variant" draft="unconfirmed">·𐑭𐑴𐑑𐑾𐑮𐑴𐑩 𐑯𐑿 𐑟𐑰𐑤𐑩𐑯𐑛</territory>
+			<territory type="OM" draft="unconfirmed">·𐑴𐑥𐑭𐑯</territory>
+			<territory type="PA" draft="unconfirmed">·𐑐𐑨𐑯𐑩𐑥𐑭</territory>
+			<territory type="PE" draft="unconfirmed">·𐑐𐑼𐑵</territory>
+			<territory type="PH" draft="unconfirmed">·𐑓𐑦𐑤𐑦𐑐𐑰𐑯𐑟</territory>
+			<territory type="PK" draft="unconfirmed">·𐑐𐑭𐑒𐑦𐑕𐑑𐑭𐑯</territory>
+			<territory type="PL" draft="unconfirmed">·𐑐𐑴𐑤𐑩𐑯𐑛</territory>
+			<territory type="PS" draft="unconfirmed">·𐑐𐑨𐑤𐑩𐑕𐑑𐑦𐑯𐑾𐑯 𐑑𐑧𐑮𐑦𐑑𐑼𐑦𐑟</territory>
+			<territory type="PS" alt="short" draft="unconfirmed">·𐑐𐑨𐑤𐑩𐑕𐑑𐑲𐑯</territory>
+			<territory type="PT" draft="unconfirmed">·𐑐𐑹𐑗𐑩𐑜𐑩𐑤</territory>
+			<territory type="PY" draft="unconfirmed">·𐑐𐑨𐑮𐑩𐑜𐑢𐑲</territory>
+			<territory type="QA" draft="unconfirmed">·𐑒𐑳𐑑𐑸</territory>
+			<territory type="RO" draft="unconfirmed">·𐑮𐑩𐑥𐑱𐑯𐑾</territory>
+			<territory type="RS" draft="unconfirmed">·𐑕𐑻𐑚𐑾</territory>
+			<territory type="RU" draft="unconfirmed">·𐑮𐑳𐑖𐑩</territory>
+			<territory type="RW" draft="unconfirmed">·𐑮𐑵𐑨𐑯𐑛𐑩</territory>
+			<territory type="SA" draft="unconfirmed">·𐑕𐑬𐑛𐑦 𐑼𐑱𐑚𐑾</territory>
+			<territory type="SC" draft="unconfirmed">·𐑕𐑱𐑖𐑧𐑤𐑟</territory>
+			<territory type="SD" draft="unconfirmed">·𐑕𐑵𐑛𐑨𐑯</territory>
+			<territory type="SE" draft="unconfirmed">·𐑕𐑢𐑰𐑛𐑩𐑯</territory>
+			<territory type="SG" draft="unconfirmed">·𐑕𐑦𐑙𐑩𐑐𐑹</territory>
+			<territory type="SK" draft="unconfirmed">·𐑕𐑤𐑩𐑝𐑨𐑒𐑾</territory>
+			<territory type="SL" draft="unconfirmed">·𐑕𐑦𐑺𐑩 𐑤𐑦𐑴𐑯</territory>
+			<territory type="SM" draft="unconfirmed">·𐑕𐑨𐑯 𐑥𐑼𐑰𐑯𐑴</territory>
+			<territory type="SN" draft="unconfirmed">·𐑕𐑧𐑯𐑦𐑜𐑷𐑤</territory>
+			<territory type="SO" draft="unconfirmed">·𐑕𐑩𐑥𐑭𐑤𐑾</territory>
+			<territory type="SS" draft="unconfirmed">·𐑕𐑬𐑔 𐑕𐑵𐑛𐑨𐑯</territory>
+			<territory type="SV" draft="unconfirmed">·𐑧𐑤 𐑕𐑨𐑤𐑝𐑩𐑛𐑹</territory>
+			<territory type="SY" draft="unconfirmed">·𐑕𐑦𐑮𐑾</territory>
+			<territory type="SZ" draft="unconfirmed">·𐑧𐑕𐑢𐑭𐑑𐑦𐑯𐑦</territory>
+			<territory type="SZ" alt="variant" draft="unconfirmed">·𐑕𐑢𐑭𐑟𐑦𐑤𐑨𐑯𐑛</territory>
+			<territory type="TD" draft="unconfirmed">·𐑗𐑨𐑛</territory>
+			<territory type="TF" draft="unconfirmed">·𐑓𐑮𐑧𐑯𐑗 𐑕𐑳𐑞𐑼𐑯 𐑑𐑧𐑮𐑦𐑑𐑼𐑦𐑟</territory>
+			<territory type="TG" draft="unconfirmed">·𐑑𐑴𐑜𐑴</territory>
+			<territory type="TH" draft="unconfirmed">·𐑑𐑲𐑤𐑨𐑯𐑛</territory>
+			<territory type="TN" draft="unconfirmed">·𐑑𐑿𐑯𐑦𐑟𐑾</territory>
+			<territory type="TO" draft="unconfirmed">·𐑑𐑪𐑙𐑩</territory>
+			<territory type="TR" draft="unconfirmed">·𐑑𐑫𐑼𐑒𐑦𐑘𐑩</territory>
+			<territory type="TR" alt="variant" draft="unconfirmed">·𐑑𐑻𐑒𐑦</territory>
+			<territory type="TW" draft="unconfirmed">·𐑑𐑲𐑢𐑭𐑯</territory>
+			<territory type="TZ" draft="unconfirmed">·𐑑𐑨𐑯𐑟𐑩𐑯𐑾</territory>
+			<territory type="UA" draft="unconfirmed">·𐑿𐑒𐑮𐑱𐑯</territory>
+			<territory type="UG" draft="unconfirmed">·𐑿𐑜𐑨𐑯𐑛𐑩</territory>
+			<territory type="UM" draft="unconfirmed">·𐑿𐑧𐑕 𐑬𐑑𐑤𐑲𐑦𐑙 𐑲𐑤𐑩𐑯𐑛𐑟</territory>
+			<territory type="US" draft="unconfirmed">·𐑿𐑯𐑲𐑑𐑩𐑛 𐑕𐑑𐑱𐑑𐑕</territory>
+			<territory type="US" alt="short" draft="unconfirmed">·𐑿𐑧𐑕</territory>
+			<territory type="UY" draft="unconfirmed">·𐑘𐑫𐑼𐑩𐑜𐑢𐑲</territory>
+			<territory type="VA" draft="unconfirmed">·𐑝𐑨𐑑𐑦𐑒𐑩𐑯 𐑕𐑦𐑑𐑦</territory>
+			<territory type="VE" draft="unconfirmed">·𐑝𐑧𐑯𐑦𐑟𐑢𐑱𐑤𐑩</territory>
+			<territory type="VN" draft="unconfirmed">·𐑝𐑦𐑧𐑑𐑯𐑭𐑥</territory>
+			<territory type="WS" draft="unconfirmed">·𐑕𐑩𐑥𐑴𐑩</territory>
+			<territory type="XA" draft="unconfirmed">𐑕𐑿𐑛𐑴-𐑨𐑒𐑕𐑩𐑯𐑑𐑕</territory>
+			<territory type="XB" draft="unconfirmed">𐑕𐑿𐑛𐑴-𐑚𐑲𐑛𐑲</territory>
+			<territory type="YE" draft="unconfirmed">·𐑘𐑧𐑥𐑩𐑯</territory>
+			<territory type="ZA" draft="unconfirmed">·𐑕𐑬𐑔 𐑨𐑓𐑮𐑦𐑒𐑩</territory>
+			<territory type="ZM" draft="unconfirmed">·𐑟𐑨𐑥𐑚𐑾</territory>
+			<territory type="ZW" draft="unconfirmed">·𐑟𐑦𐑥𐑚𐑭𐑚𐑢𐑱</territory>
+			<territory type="ZZ" draft="unconfirmed">𐑳𐑯𐑯𐑴𐑯 𐑮𐑰𐑡𐑩𐑯</territory>
 		</territories>
+		<variants>
+			<variant type="1606NICT" draft="unconfirmed">𐑤𐑱𐑑 𐑥𐑦𐑛𐑩𐑤 𐑓𐑮𐑧𐑯𐑗 𐑑 1606</variant>
+			<variant type="1694ACAD" draft="unconfirmed">𐑻𐑤𐑦 𐑥𐑪𐑛𐑼𐑯 𐑓𐑮𐑧𐑯𐑗</variant>
+		</variants>
+		<keys>
+			<key type="calendar" draft="unconfirmed">𐑒𐑨𐑤𐑦𐑯𐑛𐑼</key>
+			<key type="cf" draft="unconfirmed">𐑒𐑳𐑮𐑩𐑯𐑕𐑦 𐑓𐑹𐑥𐑨𐑑</key>
+			<key type="collation" draft="unconfirmed">𐑕𐑹𐑑 𐑹𐑛𐑼</key>
+			<key type="currency" draft="unconfirmed">𐑒𐑳𐑮𐑩𐑯𐑕𐑦</key>
+			<key type="hc" draft="unconfirmed">𐑬𐑼 𐑕𐑲𐑒𐑩𐑤 (12 𐑹 24)</key>
+			<key type="lw" draft="unconfirmed">𐑤𐑲𐑯 𐑚𐑮𐑱𐑒𐑕 𐑭𐑓𐑑𐑼 𐑢𐑻𐑛𐑟</key>
+			<key type="ms" draft="unconfirmed">𐑥𐑧𐑠𐑼𐑥𐑩𐑯𐑑 𐑕𐑦𐑕𐑑𐑩𐑥</key>
+			<key type="numbers" draft="unconfirmed">𐑯𐑳𐑥𐑚𐑼𐑟</key>
+			<key type="ss" draft="unconfirmed">𐑕𐑧𐑯𐑑𐑩𐑯𐑕 𐑚𐑮𐑱𐑒 𐑭𐑓𐑑𐑼 𐑩𐑚𐑮.</key>
+		</keys>
+		<types>
+			<type key="calendar" type="gregorian" draft="unconfirmed">𐑜𐑮𐑦𐑜𐑹𐑾𐑯 𐑒𐑨𐑤𐑦𐑯𐑛𐑼</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">𐑜𐑮𐑦𐑜𐑹𐑾𐑯</type>
+			<type key="cf" type="account" draft="unconfirmed">𐑩𐑒𐑬𐑯𐑑𐑦𐑙 𐑒𐑳𐑮𐑩𐑯𐑕𐑦 𐑓𐑹𐑥𐑨𐑑</type>
+			<type key="cf" type="account" scope="core" draft="unconfirmed">𐑩𐑒𐑬𐑯𐑑𐑦𐑙</type>
+			<type key="cf" type="standard" draft="unconfirmed">𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑒𐑳𐑮𐑩𐑯𐑕𐑦 𐑓𐑹𐑥𐑨𐑑</type>
+			<type key="cf" type="standard" scope="core" draft="unconfirmed">𐑕𐑑𐑨𐑯𐑛𐑼𐑛</type>
+			<type key="collation" type="standard" draft="unconfirmed">𐑕𐑑𐑨𐑯𐑛𐑼𐑛</type>
+			<type key="hc" type="h11" draft="unconfirmed">12 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (0–11)</type>
+			<type key="hc" type="h11" scope="core" draft="unconfirmed">12 (0–11)</type>
+			<type key="hc" type="h12" draft="unconfirmed">12 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (1–12)</type>
+			<type key="hc" type="h12" scope="core" draft="unconfirmed">12 (1–12)</type>
+			<type key="hc" type="h23" draft="unconfirmed">24 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (0–23)</type>
+			<type key="hc" type="h23" scope="core" draft="unconfirmed">24 (0–23)</type>
+			<type key="hc" type="h24" draft="unconfirmed">24 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (1–24)</type>
+			<type key="hc" type="h24" scope="core" draft="unconfirmed">24 (1–24)</type>
+			<type key="lw" type="breakall" scope="core" draft="unconfirmed">𐑚𐑮𐑱𐑒 𐑷𐑤</type>
+			<type key="lw" type="keepall" scope="core" draft="unconfirmed">𐑒𐑰𐑐 𐑷𐑤</type>
+			<type key="lw" type="normal" scope="core" draft="unconfirmed">𐑯𐑹𐑥𐑩𐑤</type>
+			<type key="lw" type="phrase" scope="core" draft="unconfirmed">𐑒𐑰𐑐 𐑦𐑯 𐑓𐑮𐑱𐑟𐑩𐑟</type>
+			<type key="ms" type="metric" draft="unconfirmed">𐑥𐑧𐑑𐑮𐑦𐑒 𐑕𐑦𐑕𐑑𐑩𐑥</type>
+			<type key="ms" type="metric" scope="core" draft="unconfirmed">𐑥𐑧𐑑𐑮𐑦𐑒</type>
+			<type key="ms" type="uksystem" draft="unconfirmed">𐑦𐑥𐑐𐑽𐑾𐑤 𐑥𐑧𐑠𐑼𐑥𐑩𐑯𐑑 𐑕𐑦𐑕𐑑𐑩𐑥</type>
+			<type key="ms" type="uksystem" scope="core" draft="unconfirmed">𐑿𐑒𐑱</type>
+			<type key="ms" type="ussystem" draft="unconfirmed">𐑿𐑧𐑕 𐑥𐑧𐑠𐑼𐑥𐑩𐑯𐑑 𐑕𐑦𐑕𐑑𐑩𐑥</type>
+			<type key="ms" type="ussystem" scope="core" draft="unconfirmed">𐑿𐑧𐑕</type>
+			<type key="numbers" type="latn" draft="unconfirmed">𐑢𐑧𐑕𐑑𐑼𐑯 𐑛𐑦𐑡𐑦𐑑𐑕</type>
+			<type key="ss" type="none" scope="core" draft="unconfirmed">𐑪𐑓</type>
+			<type key="ss" type="standard" scope="core" draft="unconfirmed">𐑪𐑯</type>
+		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="unconfirmed">𐑥𐑧𐑑𐑮𐑦𐑒</measurementSystemName>
+			<measurementSystemName type="UK" draft="unconfirmed">𐑿𐑒𐑱</measurementSystemName>
+			<measurementSystemName type="US" draft="unconfirmed">𐑿𐑧𐑕</measurementSystemName>
 		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">𐑤𐑨𐑙𐑜𐑢𐑦𐑡: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">𐑕𐑒𐑮𐑦𐑐𐑑: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">𐑮𐑰𐑡𐑩𐑯: {0}</codePattern>
+		</codePatterns>
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[𐑐 𐑑 𐑒 𐑓 𐑔 𐑕 𐑖 𐑗 𐑘 𐑙 𐑚 𐑛 𐑜 𐑝 𐑞 𐑟 𐑠 𐑡 𐑢 𐑣 𐑤 𐑥 𐑦 𐑧 𐑨 𐑩 𐑪 𐑫 𐑬 𐑭 𐑮 𐑯 𐑰 𐑱 𐑲 𐑳 𐑴 𐑵 𐑶 𐑷 𐑸 𐑹 𐑺 𐑻 𐑼 𐑽 𐑾 𐑿]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="unconfirmed">[𐑐 𐑑 𐑒 𐑓 𐑔 𐑕 𐑖 𐑗 𐑘 𐑙 𐑚 𐑛 𐑜 𐑝 𐑞 𐑟 𐑠 𐑡 𐑢 𐑣 𐑤 𐑥 𐑦 𐑧 𐑨 𐑩 𐑪 𐑫 𐑬 𐑭 𐑮 𐑯 𐑰 𐑱 𐑲 𐑳 𐑴 𐑵 𐑶 𐑷 𐑸 𐑹 𐑺 𐑻 𐑼 𐑽 𐑾 𐑿]</exemplarCharacters>
+		<exemplarCharacters type="punctuation" draft="unconfirmed">[\- ‐‑ – — , ; \: ! ? . … ' ‹ › « » ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
+	<delimiters>
+		<quotationStart draft="unconfirmed">‹</quotationStart>
+		<quotationEnd draft="unconfirmed">›</quotationEnd>
+		<alternateQuotationStart draft="unconfirmed">«</alternateQuotationStart>
+		<alternateQuotationEnd draft="unconfirmed">»</alternateQuotationEnd>
+	</delimiters>
 	<dates>
 		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
+						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="GyMd" draft="unconfirmed">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMMM" draft="unconfirmed">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">dd/MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E dd/MM</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
+						<dateFormatItem id="y" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="yyyy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM" draft="unconfirmed">MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd" draft="unconfirmed">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" draft="unconfirmed">E, dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM" draft="unconfirmed">LLL y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd" draft="unconfirmed">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">LLLL y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ" draft="unconfirmed">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ" draft="unconfirmed">QQQQ y G</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="h" draft="unconfirmed">h – h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">y–y G</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
@@ -43,6 +437,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">·𐑯𐑴</month>
 							<month type="12">·𐑛𐑭</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">𐑡</month>
+							<month type="2" draft="unconfirmed">𐑓</month>
+							<month type="3" draft="unconfirmed">𐑥</month>
+							<month type="4" draft="unconfirmed">𐑱</month>
+							<month type="5" draft="unconfirmed">𐑥</month>
+							<month type="6" draft="unconfirmed">𐑡</month>
+							<month type="7" draft="unconfirmed">𐑡</month>
+							<month type="8" draft="unconfirmed">𐑷</month>
+							<month type="9" draft="unconfirmed">𐑕</month>
+							<month type="10" draft="unconfirmed">𐑪</month>
+							<month type="11" draft="unconfirmed">𐑯</month>
+							<month type="12" draft="unconfirmed">𐑛</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">·𐑡𐑨𐑙𐑘𐑭𐑢𐑺𐑰</month>
 							<month type="2">·𐑓𐑧𐑚𐑘𐑵𐑢𐑺𐑰</month>
@@ -59,6 +467,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">·𐑡𐑨𐑯</month>
+							<month type="2" draft="unconfirmed">·𐑓𐑧𐑚</month>
+							<month type="3" draft="unconfirmed">·𐑥𐑸𐑗</month>
+							<month type="4" draft="unconfirmed">·𐑱𐑐𐑮</month>
+							<month type="5" draft="unconfirmed">·𐑥𐑱</month>
+							<month type="6" draft="unconfirmed">·𐑡𐑵𐑯</month>
+							<month type="7" draft="unconfirmed">·𐑡𐑵𐑤</month>
+							<month type="8" draft="unconfirmed">·𐑷𐑜</month>
+							<month type="9" draft="unconfirmed">·𐑕𐑧𐑐</month>
+							<month type="10" draft="unconfirmed">·𐑪𐑒𐑑</month>
+							<month type="11" draft="unconfirmed">·𐑯𐑴𐑝</month>
+							<month type="12" draft="unconfirmed">·𐑛𐑦𐑕</month>
+						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">𐑡</month>
 							<month type="2">𐑓</month>
@@ -73,6 +495,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">𐑯</month>
 							<month type="12">𐑛</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">·𐑡𐑨𐑯𐑿𐑼𐑦</month>
+							<month type="2" draft="unconfirmed">·𐑓𐑧𐑚𐑮𐑵𐑼𐑦</month>
+							<month type="3" draft="unconfirmed">·𐑥𐑸𐑗</month>
+							<month type="4" draft="unconfirmed">·𐑱𐑐𐑮𐑩𐑤</month>
+							<month type="5" draft="unconfirmed">·𐑥𐑱</month>
+							<month type="6" draft="unconfirmed">·𐑡𐑵𐑯</month>
+							<month type="7" draft="unconfirmed">·𐑡𐑩𐑤𐑲</month>
+							<month type="8" draft="unconfirmed">·𐑷𐑜𐑩𐑕𐑑</month>
+							<month type="9" draft="unconfirmed">·𐑕𐑧𐑐𐑑𐑧𐑥𐑚𐑼</month>
+							<month type="10" draft="unconfirmed">·𐑪𐑒𐑑𐑴𐑚𐑼</month>
+							<month type="11" draft="unconfirmed">·𐑯𐑴𐑝𐑧𐑥𐑚𐑼</month>
+							<month type="12" draft="unconfirmed">·𐑛𐑦𐑕𐑧𐑥𐑚𐑼</month>
+						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -148,6 +584,231 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="1">𐑨</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">d MMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd/MM/y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="unconfirmed">HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 𐑨𐑑 {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
+						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="GyMd" draft="unconfirmed">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMMM" draft="unconfirmed">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">dd/MM</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E dd/MM</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd" draft="unconfirmed">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one" draft="unconfirmed">𐑢𐑰𐑒 W 𐑝 LLLL</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">𐑢𐑰𐑒 W 𐑝 LLLL</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">MM/y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">E, dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMMM" draft="unconfirmed">LLL y</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd" draft="unconfirmed">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM" draft="unconfirmed">LLLL y</dateFormatItem>
+						<dateFormatItem id="yQQQ" draft="unconfirmed">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ" draft="unconfirmed">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yw" count="one" draft="unconfirmed">𐑢𐑰𐑒 w 𐑝 Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other" draft="unconfirmed">𐑢𐑰𐑒 w 𐑝 Y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="h" draft="unconfirmed">h – h B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G" draft="unconfirmed">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">M/y – M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">dd/MM/y G – dd/MM/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E, dd/MM/y G – E, dd/MM/y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G" draft="unconfirmed">LLL y G – MMM y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">LLL – MMM y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">LLL y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d – d MMM y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E, d MMM y G – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E dd/MM – E dd/MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">LLL–MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">LLL – MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">LLL y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">d–d MMM y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">LLLL – MMMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">LLLL y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
 			</calendar>
 		</calendars>
 		<fields>
@@ -156,15 +817,160 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="year">
 				<displayName>𐑘𐑽</displayName>
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑘𐑽</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑘𐑽</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑘𐑽</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑘𐑽</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑘𐑽𐑟</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑘𐑽 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑘𐑽𐑟 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑘𐑽</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑘𐑽</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑘𐑽</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑘𐑽</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑘𐑽𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑘𐑽 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑘𐑽𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑘𐑽</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑘𐑽</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑘𐑽</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑘𐑽𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑘𐑽 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑘𐑽𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑒𐑢𐑹𐑑𐑼</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑒𐑢𐑹𐑑𐑼</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑒𐑢𐑹𐑑𐑼</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑒𐑢𐑹𐑑𐑼</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑒𐑢𐑹𐑑𐑼𐑟</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑒𐑢𐑹𐑑𐑼 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑒𐑢𐑹𐑑𐑼𐑟 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑒𐑢𐑑</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑒𐑢𐑑</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑒𐑢𐑑 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑒𐑢𐑑 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName>𐑥𐑭𐑙𐑔</displayName>
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑥𐑳𐑯𐑔</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑥𐑳𐑯𐑔</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑥𐑳𐑯𐑔</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑳𐑯𐑔</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑳𐑯𐑔𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑥𐑳𐑯𐑔 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑥𐑳𐑯𐑔𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑥𐑳</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑥𐑳</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑥𐑳</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑳</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑥𐑳 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑥𐑳 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>𐑢𐑰𐑒</displayName>
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑢𐑰𐑒</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑢𐑰𐑒</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑢𐑰𐑒</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑢𐑰𐑒</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑢𐑰𐑒𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑢𐑰𐑒 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑢𐑰𐑒𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod draft="unconfirmed">𐑞 𐑢𐑰𐑒 𐑝 {0}</relativePeriod>
+			</field>
+			<field type="week-short">
+				<relative type="-1" draft="unconfirmed">𐑤𐑭𐑕𐑑 𐑢</relative>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑢</relative>
+				<relative type="1" draft="unconfirmed">𐑯𐑧𐑒𐑕𐑑 𐑢</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑢</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑢</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑢 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑢 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="day">
 				<displayName>𐑛𐑱</displayName>
+				<relative type="-1" draft="unconfirmed">𐑘𐑧𐑕𐑑𐑩𐑛𐑱</relative>
+				<relative type="0" draft="unconfirmed">𐑑𐑩𐑛𐑱</relative>
+				<relative type="1" draft="unconfirmed">𐑑𐑩𐑥𐑪𐑮𐑴</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑛𐑱</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑛𐑱𐑟</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑛𐑱 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑛𐑱𐑟 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<relative type="-1" draft="unconfirmed">𐑘𐑧𐑕𐑑𐑩𐑛𐑱</relative>
+				<relative type="0" draft="unconfirmed">𐑑𐑩𐑛𐑱</relative>
+				<relative type="1" draft="unconfirmed">𐑑𐑩𐑥𐑪𐑮𐑴</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑛𐑱</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑛𐑱𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑛𐑱 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑛𐑱𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relative type="-1" draft="unconfirmed">𐑘𐑧𐑕𐑑𐑩𐑛𐑱</relative>
+				<relative type="0" draft="unconfirmed">𐑑𐑩𐑛𐑱</relative>
+				<relative type="1" draft="unconfirmed">𐑑𐑩𐑥𐑪𐑮𐑴</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑛𐑱</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑛𐑱𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑛𐑱 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑛𐑱𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="weekday">
 				<displayName>𐑛𐑱 𐑝 𐑞 𐑢𐑰𐑒</displayName>
@@ -174,12 +980,105 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="hour">
 				<displayName>𐑬𐑮</displayName>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑬𐑼</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑬𐑼</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑬𐑼𐑟</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑬𐑼 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑬𐑼𐑟 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑬𐑼</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑬𐑼</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑬𐑼𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑬𐑼 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑬𐑼𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑬𐑼</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑬𐑼</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑬𐑼𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑬𐑼 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑬𐑼𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>𐑥𐑦𐑙𐑦𐑑</displayName>
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑥𐑦𐑯𐑦𐑑</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑦𐑯𐑦𐑑</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑦𐑯𐑦𐑑𐑕</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑯𐑦𐑑 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑯𐑦𐑑𐑕 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑥𐑦𐑯𐑦𐑑</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑦𐑯</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑦𐑯</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑯 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑯 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<relative type="0" draft="unconfirmed">𐑞𐑦𐑕 𐑥𐑦𐑯𐑦𐑑</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑦𐑯</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑥𐑦𐑯</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑯 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑯 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>𐑕𐑧𐑒𐑭𐑙𐑛</displayName>
+				<relative type="0" draft="unconfirmed">𐑯𐑬</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑕𐑧𐑒𐑩𐑯𐑛</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑕𐑧𐑒𐑩𐑯𐑛 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<relative type="0" draft="unconfirmed">𐑯𐑬</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑕𐑧𐑒</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑕𐑧𐑒</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑕𐑧𐑒 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑕𐑧𐑒 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relative type="0" draft="unconfirmed">𐑯𐑬</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">𐑦𐑯 {0} 𐑕𐑧𐑒</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">𐑦𐑯 {0} 𐑕𐑧𐑒</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} 𐑕𐑧𐑒 𐑩𐑜𐑴</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} 𐑕𐑧𐑒 𐑩𐑜𐑴</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="zone">
 				<displayName>𐑟𐑴𐑯</displayName>
@@ -188,13 +1087,576 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<gmtFormat>·𐑜𐑥𐑑{0}</gmtFormat>
 			<gmtZeroFormat>·𐑜𐑥𐑑</gmtZeroFormat>
+			<gmtUnknownFormat draft="unconfirmed">𐑜𐑥𐑑+?</gmtUnknownFormat>
 			<regionFormat>{0} 𐑑𐑲𐑥</regionFormat>
+			<regionFormat type="daylight" draft="unconfirmed">{0} 𐑛𐑱𐑤𐑲𐑑 𐑑𐑲𐑥</regionFormat>
+			<regionFormat type="standard" draft="unconfirmed">{0} 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥</regionFormat>
+			<zone type="Etc/UTC">
+				<long>
+					<standard draft="unconfirmed">𐑒𐑴𐑹𐑛𐑦𐑯𐑱𐑑𐑩𐑛 𐑿𐑯𐑦𐑝𐑻𐑕𐑩𐑤 𐑑𐑲𐑥</standard>
+				</long>
+				<short>
+					<standard draft="unconfirmed">𐑿𐑑𐑰𐑒𐑰</standard>
+				</short>
+			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="unconfirmed">𐑳𐑯𐑯𐑴𐑯 𐑤𐑴𐑒𐑱𐑖𐑩𐑯</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight draft="unconfirmed">𐑚𐑮𐑦𐑑𐑦𐑖 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥</daylight>
+				</long>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight draft="unconfirmed">𐑲𐑮𐑦𐑖 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥</daylight>
+				</long>
+			</zone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic draft="unconfirmed">𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥</generic>
+					<standard draft="unconfirmed">𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥</standard>
+					<daylight draft="unconfirmed">𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">𐑕𐑘𐑑</generic>
+					<standard draft="unconfirmed">𐑕𐑘𐑑</standard>
+					<daylight draft="unconfirmed">𐑕𐑘𐑕𐑑</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic draft="unconfirmed">𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥</generic>
+					<standard draft="unconfirmed">𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥</standard>
+					<daylight draft="unconfirmed">𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">𐑰𐑘𐑑</generic>
+					<standard draft="unconfirmed">𐑰𐑘𐑑</standard>
+					<daylight draft="unconfirmed">𐑰𐑘𐑕𐑑</daylight>
+				</short>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard draft="unconfirmed">𐑓𐑻𐑞𐑼-𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic draft="unconfirmed">𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥</generic>
+					<standard draft="unconfirmed">𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥</standard>
+					<daylight draft="unconfirmed">𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥</daylight>
+				</long>
+				<short>
+					<generic draft="unconfirmed">𐑢𐑘𐑑</generic>
+					<standard draft="unconfirmed">𐑢𐑘𐑑</standard>
+					<daylight draft="unconfirmed">𐑢𐑘𐑕𐑑</daylight>
+				</short>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard draft="unconfirmed">𐑜𐑮𐑧𐑯𐑦𐑗 𐑥𐑰𐑯 𐑑𐑲𐑥</standard>
+				</long>
+				<short>
+					<standard draft="unconfirmed">𐑜𐑥𐑑</standard>
+				</short>
+			</metazone>
 		</timeZoneNames>
 	</dates>
+	<numbers>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one" draft="unconfirmed">0 𐑔𐑬𐑟𐑩𐑯𐑛</pattern>
+					<pattern type="1000" count="other" draft="unconfirmed">0 𐑔𐑬𐑟𐑩𐑯𐑛</pattern>
+					<pattern type="10000" count="one" draft="unconfirmed">00 𐑔𐑬𐑟𐑩𐑯𐑛</pattern>
+					<pattern type="10000" count="other" draft="unconfirmed">00 𐑔𐑬𐑟𐑩𐑯𐑛</pattern>
+					<pattern type="100000" count="one" draft="unconfirmed">000 𐑔𐑬𐑟𐑩𐑯𐑛</pattern>
+					<pattern type="100000" count="other" draft="unconfirmed">000 𐑔𐑬𐑟𐑩𐑯𐑛</pattern>
+					<pattern type="1000000" count="one" draft="unconfirmed">0 𐑥𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="1000000" count="other" draft="unconfirmed">0 𐑥𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="10000000" count="one" draft="unconfirmed">00 𐑥𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="10000000" count="other" draft="unconfirmed">00 𐑥𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="100000000" count="one" draft="unconfirmed">000 𐑥𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="100000000" count="other" draft="unconfirmed">000 𐑥𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="1000000000" count="one" draft="unconfirmed">0 𐑚𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="1000000000" count="other" draft="unconfirmed">0 𐑚𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="10000000000" count="one" draft="unconfirmed">00 𐑚𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="10000000000" count="other" draft="unconfirmed">00 𐑚𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="100000000000" count="one" draft="unconfirmed">000 𐑚𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="100000000000" count="other" draft="unconfirmed">000 𐑚𐑦𐑤𐑘𐑩𐑯</pattern>
+					<pattern type="1000000000000" count="one" draft="unconfirmed">0 𐑑𐑮𐑦𐑤𐑾𐑯</pattern>
+					<pattern type="1000000000000" count="other" draft="unconfirmed">0 𐑑𐑮𐑦𐑤𐑾𐑯</pattern>
+					<pattern type="10000000000000" count="one" draft="unconfirmed">00 𐑑𐑮𐑦𐑤𐑾𐑯</pattern>
+					<pattern type="10000000000000" count="other" draft="unconfirmed">00 𐑑𐑮𐑦𐑤𐑾𐑯</pattern>
+					<pattern type="100000000000000" count="one" draft="unconfirmed">000 𐑑𐑮𐑦𐑤𐑾𐑯</pattern>
+					<pattern type="100000000000000" count="other" draft="unconfirmed">000 𐑑𐑮𐑦𐑤𐑾𐑯</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="unconfirmed">¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber" draft="unconfirmed">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="BMD">
+				<displayName draft="unconfirmed">𐑚𐑼𐑥𐑿𐑛𐑩𐑯 𐑛𐑪𐑤𐑼</displayName>
+			</currency>
+			<currency type="CAD">
+				<displayName draft="unconfirmed">𐑒𐑩𐑯𐑱𐑛𐑾𐑯 𐑛𐑪𐑤𐑼</displayName>
+			</currency>
+			<currency type="CZK">
+				<displayName draft="unconfirmed">𐑗𐑧𐑒 𐑒𐑩𐑮𐑵𐑯𐑩</displayName>
+			</currency>
+			<currency type="DKK">
+				<displayName draft="unconfirmed">𐑛𐑱𐑯𐑦𐑖 𐑒𐑮𐑴𐑯𐑩</displayName>
+			</currency>
+			<currency type="GBP">
+				<displayName draft="unconfirmed">𐑚𐑮𐑦𐑑𐑦𐑖 𐑐𐑬𐑯𐑛</displayName>
+			</currency>
+			<currency type="HUF">
+				<displayName draft="unconfirmed">𐑣𐑳𐑙𐑜𐑺𐑾𐑯 𐑓𐑪𐑮𐑦𐑯𐑑</displayName>
+			</currency>
+			<currency type="ISK">
+				<displayName draft="unconfirmed">𐑲𐑕𐑤𐑨𐑯𐑛𐑦𐑒 𐑒𐑮𐑴𐑯𐑩</displayName>
+			</currency>
+			<currency type="MXN">
+				<displayName draft="unconfirmed">𐑥𐑧𐑒𐑕𐑦𐑒𐑩𐑯 𐑐𐑱𐑕𐑴</displayName>
+			</currency>
+			<currency type="SEK">
+				<displayName draft="unconfirmed">𐑕𐑢𐑰𐑛𐑦𐑖 𐑒𐑮𐑴𐑯𐑩</displayName>
+			</currency>
+			<currency type="USD">
+				<displayName draft="unconfirmed">𐑿𐑧𐑕 𐑛𐑪𐑤𐑼</displayName>
+			</currency>
+		</currencies>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast" draft="unconfirmed">{0}+</pattern>
+		</miscPatterns>
+		<minimalPairs>
+			<pluralMinimalPairs count="one" draft="unconfirmed">{0} 𐑛𐑱</pluralMinimalPairs>
+			<pluralMinimalPairs count="other" draft="unconfirmed">{0} 𐑛𐑱𐑟</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other" draft="unconfirmed">𐑑𐑱𐑒 𐑞 {0}𐑔 𐑮𐑲𐑑.</ordinalMinimalPairs>
+		</minimalPairs>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="duration-decade">
+				<displayName draft="unconfirmed">𐑛𐑧𐑒𐑱𐑛𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑛𐑧𐑒𐑱𐑛</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑛𐑧𐑒𐑱𐑛𐑟</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">𐑘𐑽𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑘𐑽</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑘𐑽𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑘𐑽𐑟</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="unconfirmed">𐑬𐑼𐑟</displayName>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="unconfirmed">𐑥𐑦𐑯𐑦𐑑𐑕</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑯𐑦𐑑</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑯𐑦𐑑𐑕</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑥𐑦𐑯𐑦𐑑</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="unconfirmed">𐑕𐑧𐑒𐑩𐑯𐑛𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑕𐑧𐑒𐑩𐑯𐑛</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑕𐑧𐑒𐑩𐑯𐑛</perUnitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName draft="unconfirmed">𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName draft="unconfirmed">𐑥𐑦𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑑𐑼𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑥𐑦𐑑𐑼𐑟</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">𐑛𐑧𐑕𐑦𐑥𐑦𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑛𐑧𐑕𐑦𐑥𐑦𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑛𐑧𐑕𐑦𐑥𐑦𐑑𐑼𐑟</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName draft="unconfirmed">𐑥𐑦𐑤𐑦𐑥𐑰𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑤𐑦𐑥𐑰𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑤𐑦𐑥𐑰𐑑𐑼𐑟</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">𐑥𐑲𐑒𐑮𐑴𐑥𐑰𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑲𐑒𐑮𐑴𐑥𐑰𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑲𐑒𐑮𐑴𐑥𐑰𐑑𐑼𐑟</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="unconfirmed">𐑯𐑨𐑯𐑴𐑥𐑦𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑯𐑨𐑯𐑴𐑥𐑦𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑯𐑨𐑯𐑴𐑥𐑦𐑑𐑼𐑟</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName draft="unconfirmed">𐑐𐑰𐑒𐑴𐑥𐑦𐑑𐑼𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑐𐑰𐑒𐑴𐑥𐑦𐑑𐑼</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑐𐑰𐑒𐑴𐑥𐑦𐑑𐑼𐑟</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">𐑥𐑲𐑤𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑲𐑤</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑲𐑤𐑟</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="unconfirmed">𐑘𐑸𐑛𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑘𐑸𐑛</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑘𐑸𐑛𐑟</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">𐑓𐑰𐑑</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑓𐑫𐑑</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑓𐑰𐑑</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑓𐑫𐑑</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">𐑦𐑯𐑗𐑩𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑦𐑯𐑗</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑦𐑯𐑗𐑩𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0} 𐑐𐑻 𐑦𐑯𐑗</perUnitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">𐑕𐑒𐑨𐑯𐑛𐑦𐑯𐑱𐑝𐑾𐑯 𐑥𐑲𐑤</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑕𐑒𐑨𐑯𐑛𐑦𐑯𐑱𐑝𐑾𐑯 𐑥𐑲𐑤</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑕𐑒𐑨𐑯𐑛𐑦𐑯𐑱𐑝𐑾𐑯 𐑥𐑲𐑤𐑟</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName draft="unconfirmed">𐑒𐑸𐑛𐑦𐑯𐑩𐑤 𐑛𐑦𐑮𐑧𐑒𐑖𐑩𐑯</displayName>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} 𐑰𐑕𐑑</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} 𐑯𐑹𐑔</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} 𐑕𐑬𐑔</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} 𐑢𐑧𐑕𐑑</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="duration-decade">
+				<displayName draft="unconfirmed">𐑛𐑧𐑒</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑛𐑧𐑒</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑛𐑧𐑒</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">𐑘𐑽𐑟</displayName>
+				<perUnitPattern draft="unconfirmed">{0}/𐑘</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="unconfirmed">𐑬𐑼𐑟</displayName>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="unconfirmed">𐑥𐑦𐑯𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑦𐑯</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑦𐑯𐑟</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑥𐑦𐑯</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="unconfirmed">𐑕𐑧𐑒𐑕</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑕𐑧𐑒</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑕𐑧𐑒𐑕</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑕</perUnitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">𐑥𐑲𐑤𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑥𐑲</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑥𐑲</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="unconfirmed">𐑘𐑸𐑛𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑘𐑛</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑘𐑛</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">𐑓𐑰𐑑</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑓𐑑</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑓𐑑</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑓𐑑</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">𐑦𐑯𐑗𐑩𐑟</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0} 𐑦𐑯</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0} 𐑦𐑯</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑦𐑯</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName draft="unconfirmed">𐑛𐑦𐑮𐑧𐑒𐑖𐑩𐑯</displayName>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0} 𐑰</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0} 𐑯</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0} 𐑕</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0} 𐑢</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-decade">
+				<displayName draft="unconfirmed">𐑛𐑧𐑒</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}𐑛𐑧𐑒</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}𐑛𐑧𐑒</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="one" draft="unconfirmed">{0}𐑘</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}𐑘</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑘</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="unconfirmed">𐑬𐑼</displayName>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="unconfirmed">𐑥𐑦𐑯</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}𐑥</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}𐑥</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑥𐑦𐑯</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="unconfirmed">𐑕𐑧𐑒</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}𐑕</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}𐑕</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑕</perUnitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one" draft="unconfirmed">{0}𐑥𐑲</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}𐑥𐑲</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="unconfirmed">𐑘𐑛</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}𐑘𐑛</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}𐑘𐑛</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">𐑓𐑑</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}′</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}′</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑓𐑑</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">𐑦𐑯</displayName>
+				<unitPattern count="one" draft="unconfirmed">{0}″</unitPattern>
+				<unitPattern count="other" draft="unconfirmed">{0}″</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/𐑦𐑯</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName draft="unconfirmed">𐑛𐑦𐑮𐑧𐑒𐑖𐑩𐑯</displayName>
+				<coordinateUnitPattern type="east" draft="unconfirmed">{0}𐑰</coordinateUnitPattern>
+				<coordinateUnitPattern type="north" draft="unconfirmed">{0}𐑯</coordinateUnitPattern>
+				<coordinateUnitPattern type="south" draft="unconfirmed">{0}𐑕</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="unconfirmed">{0}𐑢</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end" draft="unconfirmed">{0} 𐑯 {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} 𐑯 {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or">
+			<listPatternPart type="end" draft="unconfirmed">{0} 𐑹 {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} 𐑹 {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
 	<posix>
 		<messages>
 			<yesstr>𐑘𐑧𐑕:𐑘</yesstr>
 			<nostr>𐑯𐑴:𐑯</nostr>
 		</messages>
 	</posix>
+	<personNames>
+		<nameOrderLocales order="givenFirst" draft="unconfirmed">und en</nameOrderLocales>
+		<parameterDefault parameter="formality" draft="unconfirmed">informal</parameterDefault>
+		<initialPattern type="initial" draft="unconfirmed">{0}</initialPattern>
+		<initialPattern type="initialSequence" draft="unconfirmed">{0}{1}</initialPattern>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {given} {given2} {surname} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="formal">
+			<namePattern draft="unconfirmed">·{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{given} {given2-initial} {surname} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{given-initial}{given2-initial} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal} {surname-initial}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{surname} {title} {given} {given2} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{surname} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="monogram" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-monogram-allCaps}{given-monogram-allCaps}{given2-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
+			<namePattern draft="unconfirmed">·{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{surname} {given} {given2-initial} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{surname} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{surname} {given-initial}{given2-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{surname} {given-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
+			<namePattern draft="unconfirmed">·{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
+			<namePattern draft="unconfirmed">·{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="formal">
+			<namePattern draft="unconfirmed">·{surname-core}, {given-initial}{given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="informal">
+			<namePattern draft="unconfirmed">·{surname}, {given-informal}</namePattern>
+		</personName>
+		<sampleName item="nativeG">
+			<nameField type="given" draft="unconfirmed">𐑟𐑩𐑯𐑛𐑱𐑩</nameField>
+		</sampleName>
+		<sampleName item="nativeGS">
+			<nameField type="given" draft="unconfirmed">𐑲𐑮𐑰𐑯</nameField>
+			<nameField type="surname" draft="unconfirmed">𐑨𐑛𐑤𐑼</nameField>
+		</sampleName>
+		<sampleName item="nativeGGS">
+			<nameField type="given" draft="unconfirmed">𐑥𐑺𐑦 𐑕𐑵</nameField>
+			<nameField type="given2" draft="unconfirmed">𐑣𐑱𐑥𐑦𐑖</nameField>
+			<nameField type="surname" draft="unconfirmed">𐑢𐑪𐑑𐑕𐑩𐑯</nameField>
+		</sampleName>
+		<sampleName item="nativeFull">
+			<nameField type="title" draft="unconfirmed">𐑥𐑮</nameField>
+			<nameField type="given-informal" draft="unconfirmed">𐑚𐑻𐑑𐑦</nameField>
+			<nameField type="given2" draft="unconfirmed">𐑣𐑧𐑯𐑮𐑦 𐑮𐑪𐑚𐑼𐑑</nameField>
+			<nameField type="surname-prefix" draft="unconfirmed">∅∅∅</nameField>
+			<nameField type="surname-core" draft="unconfirmed">𐑢𐑵𐑕𐑑𐑼</nameField>
+			<nameField type="surname2" draft="unconfirmed">∅∅∅</nameField>
+			<nameField type="generation" draft="unconfirmed">𐑡𐑼</nameField>
+			<nameField type="credentials" draft="unconfirmed">𐑥-𐑐</nameField>
+		</sampleName>
+		<sampleName item="foreignG">
+			<nameField type="given" draft="unconfirmed">𐑕𐑦𐑯𐑚𐑨𐑛</nameField>
+		</sampleName>
+		<sampleName item="foreignGS">
+			<nameField type="given" draft="unconfirmed">𐑒𐑧𐑑𐑩</nameField>
+			<nameField type="surname" draft="unconfirmed">𐑥𐑦𐑤𐑼</nameField>
+		</sampleName>
+		<sampleName item="foreignGGS">
+			<nameField type="given" draft="unconfirmed">𐑑𐑕𐑧𐑑𐑕𐑰𐑤𐑾</nameField>
+			<nameField type="given2" draft="unconfirmed">𐑣𐑱𐑥𐑦𐑖</nameField>
+		</sampleName>
+		<sampleName item="foreignFull">
+			<nameField type="title" draft="unconfirmed">𐑐𐑮𐑓 𐑛𐑼</nameField>
+			<nameField type="surname-prefix" draft="unconfirmed">𐑝𐑪𐑯</nameField>
+			<nameField type="surname-core" draft="unconfirmed">𐑚𐑮𐑰𐑤</nameField>
+			<nameField type="surname2" draft="unconfirmed">𐑜𐑪𐑯𐑔𐑭𐑤𐑧𐑔 𐑛𐑪𐑥𐑦𐑙𐑜𐑴</nameField>
+			<nameField type="generation" draft="unconfirmed">𐑡𐑼</nameField>
+			<nameField type="credentials" draft="unconfirmed">𐑥-𐑛 𐑛𐑛𐑕</nameField>
+		</sampleName>
+	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/en_UA.xml b/make/data/cldr/common/main/en_UA.xml
new file mode 100644
index 00000000000..9e70011d6fb
--- /dev/null
+++ b/make/data/cldr/common/main/en_UA.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="UA"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_US_POSIX.xml b/make/data/cldr/common/main/en_US_POSIX.xml
index ce9b24ed41b..5e05f78e337 100644
--- a/make/data/cldr/common/main/en_US_POSIX.xml
+++ b/make/data/cldr/common/main/en_US_POSIX.xml
@@ -45,6 +45,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ 0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ 0.00</pattern>
+					<pattern alt="noCurrency">0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/eo.xml b/make/data/cldr/common/main/eo.xml
index e774c2af1ab..250a1dbeef7 100644
--- a/make/data/cldr/common/main/eo.xml
+++ b/make/data/cldr/common/main/eo.xml
@@ -14,530 +14,573 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languages>
 			<language type="aa">afara</language>
 			<language type="ab">abĥaza</language>
-			<language type="ace" draft="unconfirmed">aĉea</language>
-			<language type="ada" draft="unconfirmed">dangba</language>
-			<language type="ady" draft="unconfirmed">adigea</language>
+			<language type="ace">aĉea</language>
+			<language type="ada">dangba</language>
+			<language type="ady">adigea</language>
 			<language type="af">afrikansa</language>
-			<language type="ain" draft="unconfirmed">ajnua</language>
-			<language type="ak" draft="unconfirmed">akana</language>
-			<language type="ale" draft="unconfirmed">aleuta</language>
-			<language type="alt" draft="unconfirmed">sud-altaja</language>
+			<language type="ain">ajnua</language>
+			<language type="ak">akana</language>
+			<language type="ale">aleuta</language>
+			<language type="alt">sud-altaja</language>
 			<language type="am">amhara</language>
-			<language type="an" draft="unconfirmed">aragona</language>
-			<language type="anp" draft="unconfirmed">angika</language>
+			<language type="an">aragona</language>
+			<language type="anp">angika</language>
+			<language type="apc">araba levantenia</language>
 			<language type="ar">araba</language>
-			<language type="ar_001" draft="unconfirmed">araba moderna norma</language>
-			<language type="arn" draft="unconfirmed">mapuĉa</language>
-			<language type="arp" draft="unconfirmed">arapaha</language>
-			<language type="ars" draft="unconfirmed">araba naĝda</language>
+			<language type="ar_001">araba moderna norma</language>
+			<language type="arn">mapuĉa</language>
+			<language type="arp">arapaha</language>
+			<language type="ars">araba naĝda</language>
 			<language type="as">asama</language>
-			<language type="ast" draft="unconfirmed">astura</language>
-			<language type="atj" draft="unconfirmed">atikameka</language>
-			<language type="av" draft="unconfirmed">avara</language>
-			<language type="awa" draft="unconfirmed">avadhia</language>
+			<language type="ast">astura</language>
+			<language type="atj">atikameka</language>
+			<language type="av">avara</language>
+			<language type="awa">avadhia</language>
 			<language type="ay">ajmara</language>
 			<language type="az">azerbajĝana</language>
-			<language type="az" alt="short" draft="unconfirmed">azera</language>
+			<language type="az" alt="short">azera</language>
 			<language type="ba">baŝkira</language>
-			<language type="ban" draft="unconfirmed">balia</language>
-			<language type="bas" draft="unconfirmed">basaa</language>
+			<language type="bal">baluĉa</language>
+			<language type="ban">balia</language>
+			<language type="bas">basaa</language>
 			<language type="be">belorusa</language>
-			<language type="bem" draft="unconfirmed">bemba</language>
-			<language type="bez" draft="unconfirmed">benaa</language>
+			<language type="bem">bemba</language>
+			<language type="bew">batavia</language>
+			<language type="bez">benaa</language>
 			<language type="bg">bulgara</language>
-			<language type="bgc" draft="unconfirmed">harjana</language>
-			<language type="bho" draft="unconfirmed">boĝpura</language>
-			<language type="bi">bislamo</language>
-			<language type="bin" draft="unconfirmed">edoa</language>
-			<language type="bla" draft="unconfirmed">siksika</language>
-			<language type="blo" draft="unconfirmed">aniia</language>
-			<language type="bm" draft="unconfirmed">bambara</language>
+			<language type="bgc">harjana</language>
+			<language type="bho">boĝpura</language>
+			<language type="bi">Bislamo</language>
+			<language type="bin">edoa</language>
+			<language type="bla">nigrapieda</language>
+			<language type="blo">aniia</language>
+			<language type="bm">bambara</language>
 			<language type="bn">bengala</language>
 			<language type="bo">tibeta</language>
+			<language type="bqi">baĥtiara</language>
 			<language type="br">bretona</language>
-			<language type="brx" draft="unconfirmed">bodoa</language>
-			<language type="bs" draft="contributed">bosna</language>
-			<language type="bug" draft="unconfirmed">buĝia</language>
-			<language type="byn" draft="unconfirmed">bilena</language>
+			<language type="brx">bodoa</language>
+			<language type="bs">bosna</language>
+			<language type="bua">burjata</language>
+			<language type="bug">buĝia</language>
+			<language type="byn">bilena</language>
 			<language type="ca">kataluna</language>
-			<language type="cay" draft="unconfirmed">kajuga</language>
-			<language type="ccp" draft="unconfirmed">ĉakma</language>
-			<language type="ce" draft="unconfirmed">ĉeĉena</language>
-			<language type="ceb" draft="unconfirmed">cebua</language>
-			<language type="cgg" draft="unconfirmed">kiga</language>
-			<language type="ch" draft="unconfirmed">ĉamora</language>
-			<language type="chk" draft="unconfirmed">ĉuka</language>
-			<language type="chm" draft="unconfirmed">maria</language>
-			<language type="cho" draft="unconfirmed">ĉakta</language>
-			<language type="chp" draft="unconfirmed">ĉipevajana</language>
-			<language type="chr" draft="unconfirmed">ĉeroka</language>
-			<language type="chy" draft="unconfirmed">ĉejena</language>
-			<language type="ckb" draft="unconfirmed">sorana</language>
-			<language type="ckb" alt="menu" draft="unconfirmed">kurda, sorana</language>
-			<language type="ckb" alt="variant" draft="unconfirmed">kurda centra</language>
-			<language type="clc" draft="unconfirmed">ĉilkotina</language>
+			<language type="cay">kajuga</language>
+			<language type="ccp">ĉakma</language>
+			<language type="ce">ĉeĉena</language>
+			<language type="ceb">cebua</language>
+			<language type="cgg">kigaa</language>
+			<language type="ch">ĉamora</language>
+			<language type="chk">ĉuuka</language>
+			<language type="chm">maria</language>
+			<language type="cho">ĉaktaa</language>
+			<language type="chp">ĉipevajana</language>
+			<language type="chr">ĉeroka</language>
+			<language type="chy">ĉejena</language>
+			<language type="ckb">kurda centra</language>
+			<language type="ckb" alt="menu">kurda, centra</language>
+			<language type="ckb" alt="variant">kurda, sorana</language>
+			<language type="clc">ĉilkotina</language>
 			<language type="co">korsika</language>
-			<language type="crg" draft="unconfirmed">miĉifa</language>
-			<language type="crj" draft="unconfirmed">kria jakob-golfa suda</language>
-			<language type="crk" draft="unconfirmed">kria preria</language>
-			<language type="crl" draft="unconfirmed">kria jakob-golfa norda</language>
-			<language type="crm" draft="unconfirmed">kria alka</language>
-			<language type="crr" draft="unconfirmed">algonkena (Norda Karolino)</language>
+			<language type="cop">kopta</language>
+			<language type="crg">miĉifa</language>
+			<language type="crj">kria jakob-golfa suda</language>
+			<language type="crk">kria preria</language>
+			<language type="crl">kria jakob-golfa norda</language>
+			<language type="crm">kria alka</language>
+			<language type="crr">algonkena (Norda Karolino)</language>
 			<language type="cs">ĉeĥa</language>
-			<language type="csw" draft="unconfirmed">kria marĉa</language>
-			<language type="cu" draft="unconfirmed">malnovslava</language>
-			<language type="cv" draft="unconfirmed">ĉuvaŝa</language>
+			<language type="csw">kria marĉa</language>
+			<language type="cu">malnovslava</language>
+			<language type="cv">ĉuvaŝa</language>
 			<language type="cy">kimra</language>
 			<language type="da">dana</language>
-			<language type="dak" draft="unconfirmed">dakotaa</language>
-			<language type="dar" draft="unconfirmed">dargva</language>
-			<language type="dav" draft="unconfirmed">taitaa</language>
+			<language type="dak">dakota</language>
+			<language type="dar">dargva</language>
+			<language type="dav">taitaa</language>
 			<language type="de">germana</language>
-			<language type="de_AT" draft="unconfirmed">germana aŭstra</language>
-			<language type="de_CH" draft="unconfirmed">germana svisa</language>
-			<language type="dgr" draft="unconfirmed">dogriba</language>
-			<language type="dje" draft="unconfirmed">zarmaa</language>
-			<language type="doi" draft="unconfirmed">dogra</language>
-			<language type="dsb" draft="unconfirmed">malsuprasoraba</language>
-			<language type="dua" draft="unconfirmed">dualaa</language>
-			<language type="dv" draft="contributed">maldiva</language>
-			<language type="dyo" draft="unconfirmed">djola</language>
-			<language type="dz">dzonko</language>
-			<language type="dzg" draft="unconfirmed">dazaa</language>
-			<language type="ebu" draft="unconfirmed">embua</language>
-			<language type="ee" draft="unconfirmed">evea</language>
-			<language type="efi">ibibioefika</language>
-			<language type="eka" draft="unconfirmed">ekaĝuka</language>
+			<language type="de_AT">germana aŭstra</language>
+			<language type="de_CH">germana svisa</language>
+			<language type="dgr">dogriba</language>
+			<language type="dje">zarmaa</language>
+			<language type="doi">dogra</language>
+			<language type="dsb">malsuprasoraba</language>
+			<language type="dua">dualaa</language>
+			<language type="dv">maldiva</language>
+			<language type="dyo">djola</language>
+			<language type="dz">Dzonko</language>
+			<language type="dzg">dazaa</language>
+			<language type="ebu">embua</language>
+			<language type="ee">evea</language>
+			<language type="efi">efika</language>
+			<language type="eka">ekaĝuka</language>
 			<language type="el">greka</language>
 			<language type="en">angla</language>
-			<language type="en_AU" draft="unconfirmed">angla aŭstralia</language>
-			<language type="en_CA" draft="unconfirmed">angla kanada</language>
-			<language type="en_GB" draft="unconfirmed">angla brita</language>
-			<language type="en_US" draft="unconfirmed">angla usona</language>
+			<language type="en_AU">angla aŭstralia</language>
+			<language type="en_CA">angla kanada</language>
+			<language type="en_GB">angla brita</language>
+			<language type="en_US">angla usona</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">hispana</language>
-			<language type="es_419" draft="unconfirmed">hispana amerika</language>
-			<language type="es_ES" draft="unconfirmed">hispana eŭropa</language>
-			<language type="es_MX" draft="unconfirmed">hispana meksika</language>
+			<language type="es_419">hispana amerika</language>
+			<language type="es_ES">hispana eŭropa</language>
+			<language type="es_MX">hispana meksika</language>
 			<language type="et">estona</language>
 			<language type="eu">eŭska</language>
-			<language type="ewo" draft="unconfirmed">eunda</language>
+			<language type="ewo">eunda</language>
 			<language type="fa">persa</language>
-			<language type="fa_AF" draft="unconfirmed">daria</language>
-			<language type="ff" draft="unconfirmed">fula</language>
+			<language type="ff">fula</language>
 			<language type="fi">finna</language>
-			<language type="fil" draft="contributed">filipina</language>
+			<language type="fil">filipina</language>
 			<language type="fj">fiĝia</language>
 			<language type="fo">feroa</language>
-			<language type="fon" draft="unconfirmed">fonua</language>
+			<language type="fon">fonua</language>
 			<language type="fr">franca</language>
-			<language type="fr_CA" draft="unconfirmed">franca kanada</language>
-			<language type="fr_CH" draft="unconfirmed">franca svisa</language>
-			<language type="frc" draft="unconfirmed">kaĵun-franca</language>
-			<language type="frr" draft="unconfirmed">nord-frisa</language>
-			<language type="fur" draft="unconfirmed">friula</language>
-			<language type="fy" draft="contributed">okcident-frisa</language>
+			<language type="fr_CA">franca kanada</language>
+			<language type="fr_CH">franca svisa</language>
+			<language type="frc">kaĵun-franca</language>
+			<language type="frr">nord-frisa</language>
+			<language type="fur">friula</language>
+			<language type="fy">okcident-frisa</language>
 			<language type="ga">irlanda</language>
-			<language type="gaa" draft="contributed">gaa</language>
-			<language type="gd" draft="contributed">skot-gaela</language>
-			<language type="gez" draft="unconfirmed">geeza</language>
-			<language type="gil" draft="unconfirmed">kiribata</language>
+			<language type="gd">skot-gaela</language>
+			<language type="gez">geeza</language>
+			<language type="gil">kiribata</language>
 			<language type="gl">galega</language>
 			<language type="gn">gvarania</language>
-			<language type="gor" draft="unconfirmed">gorontala</language>
-			<language type="gsw" draft="unconfirmed">svisgermana</language>
+			<language type="gor">gorontala</language>
+			<language type="gsw">svisgermana</language>
 			<language type="gu">guĝarata</language>
-			<language type="guz" draft="unconfirmed">gusia</language>
-			<language type="gv" draft="unconfirmed">manksa</language>
-			<language type="gwi" draft="unconfirmed">gviĉina</language>
+			<language type="guz">gusia</language>
+			<language type="gv">manksa</language>
+			<language type="gwi">gviĉina</language>
 			<language type="ha">haŭsa</language>
-			<language type="hai" draft="unconfirmed">haida</language>
+			<language type="hai">haida</language>
 			<language type="haw">havaja</language>
-			<language type="hax" draft="unconfirmed">sud-haida</language>
+			<language type="hax">sud-haida</language>
 			<language type="he">hebrea</language>
-			<language type="hi">hinda</language>
-			<language type="hil" draft="unconfirmed">hiligajnona</language>
-			<language type="hmn" draft="unconfirmed">mjaŭa</language>
+			<language type="hi">hindia</language>
+			<language type="hi_Latn">hindia (latina)</language>
+			<language type="hi_Latn" alt="variant">hinglish</language>
+			<language type="hil">hiligajnona</language>
+			<language type="hmn">hmonga</language>
+			<language type="hnj">verd-hmonga</language>
 			<language type="hr">kroata</language>
-			<language type="hsb" draft="unconfirmed">suprasoraba</language>
+			<language type="hsb">suprasoraba</language>
 			<language type="ht">haitia kreola</language>
 			<language type="hu">hungara</language>
-			<language type="hup" draft="unconfirmed">hupa</language>
-			<language type="hur" draft="unconfirmed">halkomelema</language>
+			<language type="hup">hupa</language>
+			<language type="hur">halkomelema</language>
 			<language type="hy">armena</language>
-			<language type="hz" draft="unconfirmed">herera</language>
-			<language type="ia" draft="contributed">Interlingvao</language>
-			<language type="iba" draft="unconfirmed">ibana</language>
-			<language type="ibb" draft="unconfirmed">ibibia</language>
+			<language type="hz">herera</language>
+			<language type="ia">Interlingvao</language>
+			<language type="iba">ibana</language>
+			<language type="ibb">ibibia</language>
 			<language type="id">indonezia</language>
-			<language type="ie" draft="contributed">Interlingveo</language>
-			<language type="ig" draft="unconfirmed">igba</language>
-			<language type="ii" draft="unconfirmed">jia</language>
-			<language type="ik">eskima</language>
-			<language type="ikt" draft="unconfirmed">inuvialuktuna</language>
-			<language type="ilo" draft="unconfirmed">iloka</language>
-			<language type="inh" draft="unconfirmed">inguŝa</language>
-			<language type="io" draft="unconfirmed">Ido</language>
+			<language type="ie">Interlingveo</language>
+			<language type="ig">igba</language>
+			<language type="ii">jia</language>
+			<language type="ik">injupiaka</language>
+			<language type="ikt">inuvialuktuna</language>
+			<language type="ilo">iloka</language>
+			<language type="inh">inguŝa</language>
+			<language type="io">Ido</language>
 			<language type="is">islanda</language>
 			<language type="it">itala</language>
-			<language type="iu">inuita</language>
+			<language type="iu">inuktituta</language>
 			<language type="ja">japana</language>
-			<language type="jbo" draft="unconfirmed">Loĵbano</language>
-			<language type="jmc" draft="unconfirmed">kimaĉame</language>
+			<language type="jbo">Loĵbano</language>
+			<language type="jmc">ĉaga (Kimaĉame)</language>
 			<language type="jv">java</language>
 			<language type="ka">kartvela</language>
-			<language type="kab" draft="unconfirmed">kabila</language>
-			<language type="kac" draft="unconfirmed">kaĉina</language>
-			<language type="kam" draft="unconfirmed">kambaa</language>
-			<language type="kbd" draft="unconfirmed">kabarda</language>
-			<language type="kde" draft="unconfirmed">makonda</language>
-			<language type="kea" draft="unconfirmed">kaboverda kreola</language>
-			<language type="kfo" draft="unconfirmed">malinka (Koro)</language>
-			<language type="kgp" draft="unconfirmed">kainganga</language>
+			<language type="kaa">karakalpaka</language>
+			<language type="kab">kabila</language>
+			<language type="kac">kaĉina</language>
+			<language type="kam">kambaa</language>
+			<language type="kbd">kabarda</language>
+			<language type="kde">makonda</language>
+			<language type="kea">kaboverda kreola</language>
+			<language type="kek">kekĉia</language>
+			<language type="kfo">malinka (Koro)</language>
+			<language type="kgp">kainganga</language>
 			<language type="kha" draft="unconfirmed">kasia</language>
-			<language type="ki" draft="unconfirmed">kikuja</language>
-			<language type="kj" draft="unconfirmed">kuanjama</language>
+			<language type="ki">kikuja</language>
+			<language type="kj">kuanjama</language>
 			<language type="kk">kazaĥa</language>
 			<language type="kl">gronlanda</language>
-			<language type="kln" draft="unconfirmed">kalenĝina</language>
+			<language type="kln">kalenĝina</language>
 			<language type="km">kmera</language>
-			<language type="kmb" draft="unconfirmed">kimbunda</language>
+			<language type="kmb">kimbunda</language>
 			<language type="kn">kanara</language>
 			<language type="ko">korea</language>
-			<language type="kok" draft="unconfirmed">konkana</language>
-			<language type="kpe" draft="unconfirmed">kpelea</language>
-			<language type="kr" draft="unconfirmed">kanura</language>
-			<language type="krc" draft="unconfirmed">karaĉaj-balkara</language>
-			<language type="krl" draft="unconfirmed">karela</language>
-			<language type="kru" draft="unconfirmed">kuruksa</language>
+			<language type="kok">konkana</language>
+			<language type="kpe">kpelea</language>
+			<language type="kr">kanura</language>
+			<language type="krc">karaĉaj-balkara</language>
+			<language type="krl">karela</language>
+			<language type="kru">kuruksa</language>
 			<language type="ks">kaŝmira</language>
-			<language type="ksb" draft="unconfirmed">ŝambaa</language>
-			<language type="ksh" draft="unconfirmed">kolonja</language>
+			<language type="ksb">ŝambaa</language>
+			<language type="ksh">kolonja</language>
 			<language type="ku">kurda</language>
-			<language type="kum" draft="unconfirmed">kumika</language>
-			<language type="kv" draft="unconfirmed">komia</language>
-			<language type="kw" draft="unconfirmed">kornvala</language>
+			<language type="ku" menu="core">kurda</language>
+			<language type="ku" menu="extension">kurmanĉa</language>
+			<language type="kum">kumika</language>
+			<language type="kv">komia</language>
+			<language type="kw">kornvala</language>
 			<language type="ky">kirgiza</language>
-			<language type="la">latino</language>
-			<language type="lad" draft="unconfirmed">judhispana</language>
-			<language type="lag" draft="unconfirmed">rangia</language>
+			<language type="la">Latino</language>
+			<language type="lad">judhispana</language>
+			<language type="lag">rangia</language>
 			<language type="lb">luksemburga</language>
-			<language type="lez" draft="unconfirmed">lezga</language>
-			<language type="lg" draft="unconfirmed">ganda</language>
-			<language type="li" draft="unconfirmed">limburga</language>
-			<language type="lij" draft="unconfirmed">ligura</language>
-			<language type="lil" draft="unconfirmed">lilueta</language>
-			<language type="lkt" draft="unconfirmed">lakota</language>
-			<language type="lmo" draft="unconfirmed">lombarda</language>
+			<language type="lez">lezga</language>
+			<language type="lg">ganda</language>
+			<language type="li">limburga</language>
+			<language type="lij">ligura</language>
+			<language type="lil">lilueta</language>
+			<language type="lkt">lakota</language>
+			<language type="lld">ladina</language>
+			<language type="lmo">lombarda</language>
 			<language type="ln">lingala</language>
 			<language type="lo">laŭa</language>
-			<language type="lou" draft="unconfirmed">luiziana kreola</language>
-			<language type="loz" draft="unconfirmed">lozia</language>
-			<language type="lrc" draft="unconfirmed">nord-lura</language>
+			<language type="lou">luiziana kreola</language>
+			<language type="loz">lozia</language>
+			<language type="lrc">nord-lura</language>
 			<language type="lt">litova</language>
-			<language type="lu" draft="unconfirmed">katanga-luba</language>
-			<language type="lua" draft="unconfirmed">kasaja-luba</language>
-			<language type="lun" draft="unconfirmed">lundaa</language>
-			<language type="luo" draft="unconfirmed">lua</language>
-			<language type="luy" draft="unconfirmed">luhia</language>
+			<language type="ltg">latgala</language>
+			<language type="lu">katanga-luba</language>
+			<language type="lua">kasaja-luba</language>
+			<language type="lun">lundaa</language>
+			<language type="luo">lua</language>
+			<language type="luy">luhia</language>
 			<language type="lv">latva</language>
-			<language type="mad" draft="unconfirmed">madura</language>
-			<language type="mag" draft="unconfirmed">magaha</language>
-			<language type="mai" draft="unconfirmed">majtila</language>
-			<language type="mak" draft="unconfirmed">makasara</language>
-			<language type="mas" draft="unconfirmed">masaja</language>
-			<language type="mdf" draft="unconfirmed">mokŝa</language>
-			<language type="men" draft="unconfirmed">mendea</language>
-			<language type="mer" draft="unconfirmed">merua</language>
-			<language type="mfe" draft="unconfirmed">maŭrica kreola</language>
+			<language type="lzz">laza</language>
+			<language type="mad">madura</language>
+			<language type="mag">magaha</language>
+			<language type="mai">majtila</language>
+			<language type="mak">makasara</language>
+			<language type="mas">masaja</language>
+			<language type="mdf">mokŝa</language>
+			<language type="men">mendea</language>
+			<language type="mer">merua</language>
+			<language type="mfe">maŭricia kreola</language>
 			<language type="mg">malagasa</language>
-			<language type="mgh" draft="unconfirmed">makua (Meetto)</language>
-			<language type="mh" draft="unconfirmed">marŝala</language>
+			<language type="mgh">makua (Meetto)</language>
+			<language type="mh">marŝala</language>
 			<language type="mi">maoria</language>
-			<language type="mic" draft="unconfirmed">mikmaka</language>
-			<language type="min" draft="unconfirmed">minankabaŭa</language>
+			<language type="mic">mikmaka</language>
+			<language type="min">minankabaŭa</language>
 			<language type="mk">makedona</language>
 			<language type="ml">malajalama</language>
 			<language type="mn">mongola</language>
-			<language type="mni" draft="unconfirmed">manipura</language>
-			<language type="moe" draft="unconfirmed">inua</language>
-			<language type="moh" draft="unconfirmed">mohoka</language>
-			<language type="mos" draft="unconfirmed">mosia</language>
+			<language type="mni">manipura</language>
+			<language type="moe">inua</language>
+			<language type="moh">mohoka</language>
+			<language type="mos">mosia</language>
 			<language type="mr">marata</language>
 			<language type="ms">malaja</language>
 			<language type="mt">malta</language>
-			<language type="mua" draft="unconfirmed">mundanga</language>
-			<language type="mul" draft="unconfirmed">pluraj lingvoj</language>
-			<language type="mus" draft="unconfirmed">krika</language>
-			<language type="mwl" draft="unconfirmed">miranda</language>
+			<language type="mua">mundanga</language>
+			<language type="mul">pluraj lingvoj</language>
+			<language type="mus">krika</language>
+			<language type="mwl">miranda</language>
+			<language type="mww">blank-hmonga</language>
 			<language type="my">birma</language>
-			<language type="myv" draft="unconfirmed">erzja</language>
-			<language type="mzn" draft="unconfirmed">mazandarana</language>
+			<language type="myv">erzja</language>
+			<language type="mzn">mazandarana</language>
 			<language type="na">naura</language>
-			<language type="nap" draft="unconfirmed">napola</language>
-			<language type="naq" draft="unconfirmed">nama</language>
+			<language type="nap">napola</language>
+			<language type="naq">nama</language>
 			<language type="nb">dannorvega</language>
-			<language type="nd" draft="unconfirmed">nord-matabela</language>
-			<language type="nds" draft="unconfirmed">platgermana</language>
+			<language type="nd">nord-matabela</language>
+			<language type="nds">platgermana</language>
 			<language type="ne">nepala</language>
-			<language type="new" draft="unconfirmed">nevara</language>
-			<language type="ng" draft="unconfirmed">ndonga</language>
-			<language type="nia" draft="unconfirmed">niasa</language>
-			<language type="niu" draft="unconfirmed">niua</language>
+			<language type="new">nevara</language>
+			<language type="ng">ndonga</language>
+			<language type="nia">niasa</language>
+			<language type="niu">niua</language>
 			<language type="nl">nederlanda</language>
-			<language type="nl_BE" draft="unconfirmed">flandra</language>
+			<language type="nl_BE">flandra</language>
 			<language type="nn">novnorvega</language>
 			<language type="no">norvega</language>
-			<language type="nog" draft="unconfirmed">nogaja</language>
-			<language type="nqo" draft="unconfirmed">N’Ko</language>
-			<language type="nr" draft="unconfirmed">sud-matabela</language>
-			<language type="nso" draft="unconfirmed">nord-sota</language>
-			<language type="nus" draft="unconfirmed">nuera</language>
-			<language type="nv" draft="unconfirmed">navaha</language>
-			<language type="ny" draft="unconfirmed">njanĝa</language>
-			<language type="nyn" draft="unconfirmed">njankora</language>
+			<language type="nog">nogaja</language>
+			<language type="nqo">N’Ko</language>
+			<language type="nr">sud-matabela</language>
+			<language type="nso">nord-sota</language>
+			<language type="nus">nuera</language>
+			<language type="nv">navaha</language>
+			<language type="ny">njanĝa</language>
+			<language type="nyn">njankora</language>
 			<language type="oc">okcitana</language>
-			<language type="ojb" draft="unconfirmed">oĝibva nordokcidenta</language>
-			<language type="ojc" draft="unconfirmed">oĝibva centra</language>
-			<language type="ojw" draft="unconfirmed">oĝibva okcidenta</language>
-			<language type="oka" draft="unconfirmed">okanagana</language>
+			<language type="ojb">oĝibva nordokcidenta</language>
+			<language type="ojc">oĝibva centra</language>
+			<language type="ojw">oĝibva okcidenta</language>
+			<language type="oka">okanagana</language>
 			<language type="om">oroma</language>
-			<language type="or">orijo</language>
-			<language type="os" draft="unconfirmed">oseta</language>
+			<language type="or">Orijo</language>
+			<language type="os">oseta</language>
 			<language type="pa">panĝaba</language>
-			<language type="pag" draft="unconfirmed">pangasina</language>
-			<language type="pam" draft="unconfirmed">pampanga</language>
-			<language type="pap" draft="unconfirmed">Papiamento</language>
-			<language type="pau" draft="unconfirmed">palaŭa</language>
-			<language type="pcm" draft="unconfirmed">niĝeria piĝino</language>
-			<language type="pis" draft="unconfirmed">piĵina</language>
+			<language type="pag">pangasina</language>
+			<language type="pam">pampanga</language>
+			<language type="pap">Papiamento</language>
+			<language type="pau">palaŭa</language>
+			<language type="pcm">niĝeria piĝino</language>
+			<language type="pi">palia</language>
+			<language type="pis">Piĵino</language>
 			<language type="pl">pola</language>
+			<language type="pms">piemonta</language>
 			<language type="pqm" draft="unconfirmed">malesita-pasamakvodja</language>
-			<language type="prg" draft="unconfirmed">prusa</language>
-			<language type="ps" draft="contributed">paŝtua</language>
+			<language type="prg">prusa</language>
+			<language type="ps">paŝtua</language>
 			<language type="pt">portugala</language>
-			<language type="pt_BR" draft="contributed">portugala brazila</language>
-			<language type="pt_PT" draft="contributed">portugala eŭropa</language>
+			<language type="pt_BR">portugala brazila</language>
+			<language type="pt_PT">portugala eŭropa</language>
 			<language type="qu">keĉua</language>
-			<language type="raj" draft="unconfirmed">raĝastana</language>
-			<language type="rap" draft="unconfirmed">rapanuia</language>
-			<language type="rar" draft="unconfirmed">maoria kukinsula</language>
-			<language type="rhg" draft="unconfirmed">rohinĝa</language>
+			<language type="quc">kiĉea</language>
+			<language type="raj">raĝastana</language>
+			<language type="rap">rapanuia</language>
+			<language type="rar">maoria kukinsula</language>
+			<language type="rhg">rohinĝa</language>
+			<language type="rif">rifa</language>
 			<language type="rm">romanĉa</language>
 			<language type="rn">burunda</language>
 			<language type="ro">rumana</language>
-			<language type="rof" draft="unconfirmed">kiromba</language>
+			<language type="ro_MD">moldava</language>
+			<language type="rof">ĉaga (Kirombo)</language>
 			<language type="ru">rusa</language>
-			<language type="rup" draft="unconfirmed">arumana</language>
+			<language type="rup">arumana</language>
 			<language type="rw">ruanda</language>
-			<language type="rwk" draft="unconfirmed">rua</language>
-			<language type="sa">sanskrito</language>
-			<language type="sad" draft="unconfirmed">sandavea</language>
-			<language type="sah" draft="unconfirmed">jakuta</language>
-			<language type="saq" draft="unconfirmed">samburua</language>
-			<language type="sat" draft="unconfirmed">santala</language>
-			<language type="sba" draft="unconfirmed">gambaja</language>
-			<language type="sc" draft="unconfirmed">sarda</language>
-			<language type="scn" draft="unconfirmed">sicilia</language>
-			<language type="sco" draft="unconfirmed">skota</language>
+			<language type="rwk">ĉaga (Rwa)</language>
+			<language type="sa">Sanskrito</language>
+			<language type="sad">sandavea</language>
+			<language type="sah">jakuta</language>
+			<language type="saq">samburua</language>
+			<language type="sat">santala</language>
+			<language type="sba">gambaja</language>
+			<language type="sbp">sangua</language>
+			<language type="sc">sarda</language>
+			<language type="scn">sicilia</language>
+			<language type="sco">skota</language>
 			<language type="sd">sinda</language>
-			<language type="se" draft="unconfirmed">nord-samea</language>
+			<language type="sdh">sud-kurda</language>
+			<language type="se">nord-samea</language>
 			<language type="sg">sangoa</language>
-			<language type="sh">serbo-Kroata</language>
-			<language type="shi" draft="unconfirmed">ŝelha</language>
-			<language type="shn" draft="unconfirmed">ŝana</language>
+			<language type="sgs">ĵemajtia</language>
+			<language type="sh">serbokroata</language>
+			<language type="shi">ŝelha</language>
+			<language type="shn">ŝana</language>
 			<language type="si">sinhala</language>
+			<language type="sid">sidama</language>
 			<language type="sk">slovaka</language>
+			<language type="skr">saraika</language>
 			<language type="sl">slovena</language>
-			<language type="slh" draft="unconfirmed">sud-laŝucida</language>
+			<language type="slh">sud-laŝucida</language>
 			<language type="sm">samoa</language>
-			<language type="smn" draft="unconfirmed">anar-samea</language>
-			<language type="sms" draft="unconfirmed">skolt-samea</language>
+			<language type="sma">sud-samea</language>
+			<language type="smj">lule-samea</language>
+			<language type="smn">anar-samea</language>
+			<language type="sms">skolt-samea</language>
 			<language type="sn">ŝona</language>
-			<language type="snk" draft="unconfirmed">soninka</language>
+			<language type="snk">soninka</language>
 			<language type="so">somala</language>
 			<language type="sq">albana</language>
 			<language type="sr">serba</language>
-			<language type="srn" draft="unconfirmed">surinama</language>
+			<language type="srn">surinama</language>
 			<language type="ss">svazia</language>
+			<language type="ssy">saha</language>
 			<language type="st">sota</language>
-			<language type="str" draft="unconfirmed">saliŝa nord-markola</language>
+			<language type="str">saliŝa nord-markola</language>
 			<language type="su">sunda</language>
-			<language type="suk" draft="unconfirmed">sukuma</language>
+			<language type="suk">sukuma</language>
 			<language type="sv">sveda</language>
 			<language type="sw">svahila</language>
-			<language type="swb" draft="unconfirmed">maorea</language>
-			<language type="syr" draft="unconfirmed">siria</language>
-			<language type="szl" draft="unconfirmed">silezi-pola</language>
+			<language type="swb">komora</language>
+			<language type="syr">siria</language>
+			<language type="szl">silezi-pola</language>
 			<language type="ta">tamila</language>
-			<language type="tce" draft="unconfirmed">sud-tuĉona</language>
+			<language type="tce">sud-tuĉona</language>
 			<language type="te">telugua</language>
-			<language type="tem" draft="unconfirmed">temna</language>
-			<language type="teo" draft="unconfirmed">tesa</language>
-			<language type="tet" draft="unconfirmed">tetuna</language>
+			<language type="tem">temna</language>
+			<language type="teo">tesa</language>
+			<language type="tet">tetuna</language>
 			<language type="tg">taĝika</language>
-			<language type="tgx" draft="unconfirmed">tagiŝa</language>
+			<language type="tgx">tagiŝa</language>
 			<language type="th">taja</language>
-			<language type="tht" draft="unconfirmed">taltana</language>
+			<language type="tht">taltana</language>
 			<language type="ti">tigraja</language>
-			<language type="tig" draft="unconfirmed">tigrea</language>
+			<language type="tig">tigrea</language>
 			<language type="tk">turkmena</language>
 			<language type="tl">tagaloga</language>
-			<language type="tlh" draft="contributed">klingona</language>
-			<language type="tli" draft="unconfirmed">tlingita</language>
+			<language type="tlh">klingona</language>
+			<language type="tli">tlingita</language>
 			<language type="tn">cvana</language>
-			<language type="to" draft="contributed">tongana</language>
-			<language type="tok" draft="unconfirmed">Tokipono</language>
-			<language type="tpi" draft="unconfirmed">Tokpisino</language>
+			<language type="to">tonga</language>
+			<language type="tok">Tokipono</language>
+			<language type="tpi">Tokpisino</language>
 			<language type="tr">turka</language>
-			<language type="trv" draft="unconfirmed">sedeka</language>
+			<language type="trv">sedeka</language>
+			<language type="trw">torvalia</language>
 			<language type="ts">conga</language>
 			<language type="tt">tatara</language>
-			<language type="ttm" draft="unconfirmed">nord-tuĉona</language>
-			<language type="tum" draft="unconfirmed">tumbuka</language>
-			<language type="tvl" draft="unconfirmed">tuvala</language>
-			<language type="ty" draft="unconfirmed">tahitia</language>
-			<language type="tyv" draft="unconfirmed">tuva</language>
-			<language type="tzm" draft="unconfirmed">tamaziĥta mez-atlasa</language>
-			<language type="udm" draft="unconfirmed">udmurta</language>
+			<language type="ttm">nord-tuĉona</language>
+			<language type="tum">tumbuka</language>
+			<language type="tvl">tuvala</language>
+			<language type="ty">tahitia</language>
+			<language type="tyv">tuva</language>
+			<language type="tzm">tamaziĥta mez-atlasa</language>
+			<language type="udm">udmurta</language>
 			<language type="ug">ujgura</language>
 			<language type="uk">ukraina</language>
-			<language type="umb" draft="unconfirmed">ovimbunda</language>
+			<language type="umb">ovimbunda</language>
 			<language type="und">nekonata lingvo</language>
-			<language type="ur">urduo</language>
+			<language type="ur">Urduo</language>
 			<language type="uz">uzbeka</language>
-			<language type="vai" draft="unconfirmed">vaja</language>
-			<language type="ve" draft="unconfirmed">vendaa</language>
-			<language type="vec" draft="unconfirmed">venecia</language>
+			<language type="vai">vaja</language>
+			<language type="ve">vendaa</language>
+			<language type="vec">venecia</language>
 			<language type="vi">vjetnama</language>
-			<language type="vmw" draft="unconfirmed">makua</language>
-			<language type="vo" draft="contributed">Volapuko</language>
-			<language type="vun" draft="unconfirmed">kivunja</language>
-			<language type="wa" draft="unconfirmed">valona</language>
-			<language type="wae" draft="unconfirmed">germana valza</language>
-			<language type="war" draft="unconfirmed">varaja</language>
+			<language type="vmw">makua</language>
+			<language type="vo">Volapuko</language>
+			<language type="vun">ĉaga (Kivunjo)</language>
+			<language type="wa">valona</language>
+			<language type="wae">germana valza</language>
+			<language type="wal">velajtaa</language>
+			<language type="war">varaja</language>
 			<language type="wo">volofa</language>
-			<language type="wuu" draft="unconfirmed">vua</language>
-			<language type="xal" draft="unconfirmed">kalmuka</language>
+			<language type="wuu">vua</language>
+			<language type="xal">kalmuka</language>
 			<language type="xh">ksosa</language>
-			<language type="xnr" draft="unconfirmed">kangra</language>
+			<language type="xnr">kangra</language>
 			<language type="xog" draft="unconfirmed">soga</language>
-			<language type="yi">jida</language>
+			<language type="yi">judgermana</language>
 			<language type="yo">joruba</language>
-			<language type="yrl" draft="unconfirmed">nengatua</language>
-			<language type="yue" draft="unconfirmed">kantona</language>
-			<language type="yue" alt="menu" draft="unconfirmed">ĉina kantona</language>
+			<language type="yrl">nengatua</language>
+			<language type="yue">kantona</language>
+			<language type="yue" alt="menu">ĉina kantona</language>
 			<language type="za">ĝuanga</language>
-			<language type="zgh" draft="unconfirmed">tamaziĥta maroka norma</language>
+			<language type="zgh">tamaziĥta maroka norma</language>
 			<language type="zh">ĉina</language>
-			<language type="zh" alt="menu" draft="unconfirmed">ĉina, normlingvo</language>
+			<language type="zh" alt="menu">ĉina, normlingvo</language>
 			<language type="zh_Hans">ĉina simpligita</language>
-			<language type="zh_Hans" alt="long" draft="unconfirmed">ĉina normlingvo simpligita</language>
+			<language type="zh_Hans" alt="long">ĉina normlingvo simpligita</language>
 			<language type="zh_Hant">ĉina tradicia</language>
-			<language type="zh_Hant" alt="long" draft="unconfirmed">ĉina normlingvo tradicia</language>
+			<language type="zh_Hant" alt="long">ĉina normlingvo tradicia</language>
 			<language type="zu">zulua</language>
-			<language type="zun" draft="unconfirmed">zunjia</language>
+			<language type="zun">zunjia</language>
 			<language type="zxx">nelingvaĵo</language>
-			<language type="zza" draft="unconfirmed">zazaa</language>
+			<language type="zza">zazaa</language>
 		</languages>
 		<scripts>
-			<script type="Arab" draft="unconfirmed">araba</script>
-			<script type="Aran" draft="unconfirmed">nastalika</script>
-			<script type="Armn" draft="unconfirmed">armena</script>
-			<script type="Beng" draft="unconfirmed">bengala</script>
-			<script type="Bopo" draft="unconfirmed">bopomofo</script>
-			<script type="Brai" draft="unconfirmed">brajlo</script>
-			<script type="Cyrl" draft="unconfirmed">cirila</script>
-			<script type="Deva" draft="unconfirmed">nagario</script>
-			<script type="Ethi" draft="unconfirmed">etiopa</script>
-			<script type="Geor" draft="unconfirmed">kartvela</script>
-			<script type="Grek" draft="unconfirmed">greka</script>
-			<script type="Gujr" draft="unconfirmed">guĝarata</script>
-			<script type="Guru" draft="unconfirmed">gurmuka</script>
-			<script type="Hanb" draft="unconfirmed">ĉina kun bopomofo</script>
-			<script type="Hang" draft="unconfirmed">hangulo</script>
-			<script type="Hani" draft="unconfirmed">ĉina</script>
-			<script type="Hans" draft="unconfirmed">simpligita</script>
-			<script type="Hans" alt="stand-alone" draft="unconfirmed">simpligita ĉina</script>
-			<script type="Hant" draft="unconfirmed">tradicia</script>
-			<script type="Hant" alt="stand-alone" draft="unconfirmed">tradicia ĉina</script>
-			<script type="Hebr" draft="unconfirmed">hebrea</script>
-			<script type="Hira" draft="unconfirmed">hiragana</script>
-			<script type="Hrkt" draft="unconfirmed">japanaj silabaroj</script>
-			<script type="Jamo" draft="unconfirmed">jamo</script>
-			<script type="Jpan" draft="unconfirmed">japana</script>
-			<script type="Kana" draft="unconfirmed">katakana</script>
-			<script type="Khmr" draft="unconfirmed">kmera</script>
-			<script type="Knda" draft="unconfirmed">kanara</script>
-			<script type="Kore" draft="unconfirmed">korea</script>
-			<script type="Laoo" draft="unconfirmed">laŭa</script>
-			<script type="Latn" draft="contributed">latina</script>
-			<script type="Mlym" draft="unconfirmed">malajalama</script>
-			<script type="Mymr" draft="unconfirmed">birma</script>
-			<script type="Orya" draft="unconfirmed">orija</script>
-			<script type="Sinh" draft="unconfirmed">sinhala</script>
-			<script type="Taml" draft="unconfirmed">tamila</script>
-			<script type="Telu" draft="unconfirmed">telugua</script>
-			<script type="Thaa" draft="unconfirmed">maldiva</script>
-			<script type="Thai" draft="unconfirmed">taja</script>
-			<script type="Tibt" draft="unconfirmed">tibeta</script>
-			<script type="Zmth" draft="unconfirmed">matematika notacio</script>
-			<script type="Zsye" draft="unconfirmed">emoĝioj</script>
-			<script type="Zsym" draft="unconfirmed">simboloj</script>
-			<script type="Zxxx" draft="unconfirmed">neskribata</script>
-			<script type="Zyyy" draft="unconfirmed">nedifinita</script>
-			<script type="Zzzz" draft="unconfirmed">nekonata skribsistemo</script>
+			<script type="Adlm">adlam</script>
+			<script type="Arab">araba</script>
+			<script type="Aran">nastalika</script>
+			<script type="Armn">armena</script>
+			<script type="Beng">bengala</script>
+			<script type="Bopo">bopomofo</script>
+			<script type="Brai">brajlo</script>
+			<script type="Cakm">ĉakma</script>
+			<script type="Cans">unuecigita indiĝen-kanadana silabaro</script>
+			<script type="Cher">ĉeroka</script>
+			<script type="Cyrl">cirila</script>
+			<script type="Deva">devanagara</script>
+			<script type="Ethi">etiopa</script>
+			<script type="Geor">kartvela</script>
+			<script type="Grek">greka</script>
+			<script type="Gujr">guĝarata</script>
+			<script type="Guru">gurmuka</script>
+			<script type="Hanb">ĉina kun bopomofo</script>
+			<script type="Hang">hangulo</script>
+			<script type="Hani">ĉina</script>
+			<script type="Hans">simpligita</script>
+			<script type="Hans" alt="stand-alone">simpligita ĉina</script>
+			<script type="Hant">tradicia</script>
+			<script type="Hant" alt="stand-alone">tradicia ĉina</script>
+			<script type="Hebr">hebrea</script>
+			<script type="Hira">rondaj kanaoj</script>
+			<script type="Hrkt">japanaj silabaroj</script>
+			<script type="Jamo">jamo</script>
+			<script type="Java">java</script>
+			<script type="Jpan">japana</script>
+			<script type="Kana">strekaj kanaoj</script>
+			<script type="Khmr">kmera</script>
+			<script type="Knda">kanara</script>
+			<script type="Kore">korea</script>
+			<script type="Laoo">laŭa</script>
+			<script type="Latn">latina</script>
+			<script type="Mlym">malajalama</script>
+			<script type="Mong">mongola</script>
+			<script type="Mtei">manipura</script>
+			<script type="Mymr">birma</script>
+			<script type="Nkoo">N’Ko</script>
+			<script type="Orya">orija</script>
+			<script type="Rohg">hanifi</script>
+			<script type="Sinh">sinhala</script>
+			<script type="Sund">sunda</script>
+			<script type="Syrc">siria</script>
+			<script type="Taml">tamila</script>
+			<script type="Telu">telugua</script>
+			<script type="Thaa">maldiva</script>
+			<script type="Thai">taja</script>
+			<script type="Tibt">tibeta</script>
+			<script type="Vaii">vaja</script>
+			<script type="Yiii">jia</script>
+			<script type="Zmth">matematika notacio</script>
+			<script type="Zsye">miensimboloj</script>
+			<script type="Zsym">simboloj</script>
+			<script type="Zxxx">neskribata</script>
+			<script type="Zyyy">nedifinita</script>
+			<script type="Zzzz">nekonata skribsistemo</script>
 		</scripts>
 		<territories>
 			<territory type="001">mondo</territory>
-			<territory type="002" draft="unconfirmed">Afriko</territory>
-			<territory type="003" draft="unconfirmed">Nordameriko</territory>
-			<territory type="005" draft="unconfirmed">Sudameriko</territory>
-			<territory type="009" draft="unconfirmed">Oceanio</territory>
-			<territory type="011" draft="unconfirmed">Okcidenta Afriko</territory>
-			<territory type="013" draft="unconfirmed">Centra Ameriko</territory>
-			<territory type="014" draft="unconfirmed">Orienta Afriko</territory>
-			<territory type="015" draft="unconfirmed">Norda Afriko</territory>
-			<territory type="017" draft="unconfirmed">Centra Afriko</territory>
-			<territory type="018" draft="unconfirmed">Suda Afriko</territory>
-			<territory type="019" draft="unconfirmed">Amerikoj</territory>
-			<territory type="021" draft="unconfirmed">Norda Ameriko</territory>
-			<territory type="029" draft="unconfirmed">Kariba regiono</territory>
-			<territory type="030" draft="unconfirmed">Orienta Azio</territory>
-			<territory type="034" draft="unconfirmed">Suda Azio</territory>
-			<territory type="035" draft="unconfirmed">Sud-orienta Azio</territory>
-			<territory type="039" draft="unconfirmed">Suda Eŭropo</territory>
-			<territory type="053" draft="unconfirmed">Aŭstralazio</territory>
-			<territory type="054" draft="unconfirmed">Melanezio</territory>
-			<territory type="057" draft="unconfirmed">Mikronezia regiono</territory>
-			<territory type="061" draft="unconfirmed">Polinezio</territory>
-			<territory type="142" draft="unconfirmed">Azio</territory>
-			<territory type="143" draft="unconfirmed">Centra Azio</territory>
-			<territory type="145" draft="unconfirmed">Okcidenta Azio</territory>
-			<territory type="150" draft="unconfirmed">Eŭropo</territory>
-			<territory type="151" draft="unconfirmed">Orienta Eŭropo</territory>
-			<territory type="154" draft="unconfirmed">Norda Eŭropo</territory>
-			<territory type="155" draft="unconfirmed">Okcidenta Eŭropo</territory>
-			<territory type="202" draft="unconfirmed">Subsahara Afriko</territory>
-			<territory type="419" draft="unconfirmed">Latinameriko</territory>
-			<territory type="AC" draft="unconfirmed">Ascension</territory>
+			<territory type="002">Afriko</territory>
+			<territory type="003">Nordameriko</territory>
+			<territory type="005">Sudameriko</territory>
+			<territory type="009">Oceanio</territory>
+			<territory type="011">Okcidenta Afriko</territory>
+			<territory type="013">Centra Ameriko</territory>
+			<territory type="014">Orienta Afriko</territory>
+			<territory type="015">Norda Afriko</territory>
+			<territory type="017">Centra Afriko</territory>
+			<territory type="018">Suda Afriko</territory>
+			<territory type="019">Amerikoj</territory>
+			<territory type="021">Norda Ameriko</territory>
+			<territory type="029">Kariba regiono</territory>
+			<territory type="030">Orienta Azio</territory>
+			<territory type="034">Suda Azio</territory>
+			<territory type="035">Sud-orienta Azio</territory>
+			<territory type="039">Suda Eŭropo</territory>
+			<territory type="053">Aŭstralazio</territory>
+			<territory type="054">Melanezio</territory>
+			<territory type="057">Mikronezia regiono</territory>
+			<territory type="061">Polinezio</territory>
+			<territory type="142">Azio</territory>
+			<territory type="143">Centra Azio</territory>
+			<territory type="145">Okcidenta Azio</territory>
+			<territory type="150">Eŭropo</territory>
+			<territory type="151">Orienta Eŭropo</territory>
+			<territory type="154">Norda Eŭropo</territory>
+			<territory type="155">Okcidenta Eŭropo</territory>
+			<territory type="202">Subsahara Afriko</territory>
+			<territory type="419">Latinameriko</territory>
+			<territory type="AC">Ascension</territory>
 			<territory type="AD">Andoro</territory>
 			<territory type="AE">Unuiĝintaj Arabaj Emirlandoj</territory>
 			<territory type="AF">Afganujo</territory>
-			<territory type="AG" draft="contributed">Antigvo kaj Barbudo</territory>
+			<territory type="AG">Antigvo kaj Barbudo</territory>
 			<territory type="AI">Angvilo</territory>
 			<territory type="AL">Albanujo</territory>
 			<territory type="AM">Armenujo</territory>
 			<territory type="AO">Angolo</territory>
 			<territory type="AQ">Antarkto</territory>
 			<territory type="AR">Argentino</territory>
-			<territory type="AS" draft="unconfirmed">Usona Samoo</territory>
+			<territory type="AS">Usona Samoo</territory>
 			<territory type="AT">Aŭstrujo</territory>
 			<territory type="AU">Aŭstralio</territory>
 			<territory type="AW">Arubo</territory>
-			<territory type="AX" draft="unconfirmed">Alando</territory>
+			<territory type="AX">Alando</territory>
 			<territory type="AZ">Azerbajĝano</territory>
-			<territory type="BA" draft="contributed">Bosnujo kaj Hercegovino</territory>
+			<territory type="BA">Bosnujo kaj Hercegovino</territory>
 			<territory type="BB">Barbado</territory>
 			<territory type="BD">Bangladeŝo</territory>
 			<territory type="BE">Belgujo</territory>
@@ -546,25 +589,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BH">Barejno</territory>
 			<territory type="BI">Burundo</territory>
 			<territory type="BJ">Benino</territory>
-			<territory type="BL" draft="unconfirmed">Sankta Bartolomeo</territory>
+			<territory type="BL">Sankta Bartolomeo</territory>
 			<territory type="BM">Bermudoj</territory>
 			<territory type="BN">Brunejo</territory>
 			<territory type="BO">Bolivio</territory>
-			<territory type="BQ" draft="unconfirmed">Kariba Nederlando</territory>
+			<territory type="BQ">Kariba Nederlando</territory>
 			<territory type="BR">Brazilo</territory>
 			<territory type="BS">Bahamoj</territory>
 			<territory type="BT">Butano</territory>
-			<territory type="BV" draft="unconfirmed">Buvetinsulo</territory>
+			<territory type="BV">Buvetinsulo</territory>
 			<territory type="BW">Bocvano</territory>
 			<territory type="BY">Belorusujo</territory>
 			<territory type="BZ">Belizo</territory>
 			<territory type="CA">Kanado</territory>
-			<territory type="CC" draft="unconfirmed">Kokosinsuloj</territory>
-			<territory type="CD" draft="unconfirmed">Kongo Kinŝasa</territory>
-			<territory type="CD" alt="variant" draft="unconfirmed">Demokratia Respubliko Kongo</territory>
-			<territory type="CF">Centr-Afrika Respubliko</territory>
-			<territory type="CG" draft="contributed">Kongo Brazavila</territory>
-			<territory type="CG" alt="variant" draft="unconfirmed">Respubliko Kongo</territory>
+			<territory type="CC">Kokosinsuloj</territory>
+			<territory type="CD">Kongo Kinŝasa</territory>
+			<territory type="CD" alt="variant">Demokratia Respubliko Kongo</territory>
+			<territory type="CF">Centr-Afriko</territory>
+			<territory type="CG">Kongo Brazavila</territory>
+			<territory type="CG" alt="variant">Respubliko Kongo</territory>
 			<territory type="CH">Svisujo</territory>
 			<territory type="CI">Ebur-Bordo</territory>
 			<territory type="CK">Kukinsuloj</territory>
@@ -572,46 +615,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CM">Kameruno</territory>
 			<territory type="CN">Ĉinujo</territory>
 			<territory type="CO">Kolombio</territory>
-			<territory type="CP" draft="unconfirmed">Klipertono</territory>
-			<territory type="CQ" draft="unconfirmed">Sark</territory>
+			<territory type="CP">Klipertono</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostariko</territory>
 			<territory type="CU">Kubo</territory>
-			<territory type="CV" draft="contributed">Kaboverdo</territory>
-			<territory type="CW" draft="unconfirmed">Kuracao</territory>
-			<territory type="CX" draft="unconfirmed">Kristnaskinsulo</territory>
+			<territory type="CV">Kaboverdo</territory>
+			<territory type="CW">Kuracao</territory>
+			<territory type="CX">Kristnaskinsulo</territory>
 			<territory type="CY">Kipro</territory>
 			<territory type="CZ">Ĉeĥujo</territory>
-			<territory type="CZ" alt="variant" draft="unconfirmed">Ĉeĥa Respubliko</territory>
+			<territory type="CZ" alt="variant">Ĉeĥa Respubliko</territory>
 			<territory type="DE">Germanujo</territory>
-			<territory type="DG" draft="unconfirmed">Diego Garcia</territory>
+			<territory type="DG">Diego Garcia</territory>
 			<territory type="DJ">Ĝibutio</territory>
 			<territory type="DK">Danujo</territory>
 			<territory type="DM">Dominiko</territory>
-			<territory type="DO">Domingo</territory>
+			<territory type="DO">Dominika Respubliko</territory>
 			<territory type="DZ">Alĝerio</territory>
-			<territory type="EA" draft="unconfirmed">Ceŭto kaj Melilo</territory>
+			<territory type="EA">Ceŭto kaj Melilo</territory>
 			<territory type="EC">Ekvadoro</territory>
 			<territory type="EE">Estonujo</territory>
-			<territory type="EG" draft="contributed">Egiptujo</territory>
+			<territory type="EG">Egiptujo</territory>
 			<territory type="EH">Okcidenta Saharo</territory>
 			<territory type="ER">Eritreo</territory>
 			<territory type="ES">Hispanujo</territory>
 			<territory type="ET">Etiopujo</territory>
-			<territory type="EU" draft="unconfirmed">Eŭropa Unio</territory>
-			<territory type="EZ" draft="unconfirmed">Eŭrozono</territory>
+			<territory type="EU">Eŭropa Unio</territory>
+			<territory type="EZ">Eŭrozono</territory>
 			<territory type="FI">Finnlando</territory>
-			<territory type="FJ">Fiĝoj</territory>
-			<territory type="FK" draft="unconfirmed">Falklandoj</territory>
+			<territory type="FJ">Fiĝio</territory>
+			<territory type="FK">Falklandoj</territory>
 			<territory type="FM">Mikronezio</territory>
 			<territory type="FO">Ferooj</territory>
 			<territory type="FR">Francujo</territory>
 			<territory type="GA">Gabono</territory>
 			<territory type="GB">Unuiĝinta Reĝlando</territory>
-			<territory type="GB" alt="short" draft="unconfirmed">Britujo</territory>
+			<territory type="GB" alt="short">Britujo</territory>
 			<territory type="GD">Grenado</territory>
 			<territory type="GE">Kartvelujo</territory>
-			<territory type="GF">Franca Gviano</territory>
-			<territory type="GG" draft="unconfirmed">Gernezejo</territory>
+			<territory type="GF">Franca Gujano</territory>
+			<territory type="GG">Gernezejo</territory>
 			<territory type="GH">Ganao</territory>
 			<territory type="GI">Ĝibraltaro</territory>
 			<territory type="GL">Gronlando</territory>
@@ -625,44 +668,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GU">Gvamo</territory>
 			<territory type="GW">Gvineo-Bisaŭo</territory>
 			<territory type="GY">Gujano</territory>
-			<territory type="HK" draft="unconfirmed">Honkongo</territory>
+			<territory type="HK">Honkongo (SAR de Ĉinujo)</territory>
 			<territory type="HM">Herda kaj Makdonaldaj Insuloj</territory>
 			<territory type="HN">Honduro</territory>
 			<territory type="HR">Kroatujo</territory>
 			<territory type="HT">Haitio</territory>
 			<territory type="HU">Hungarujo</territory>
-			<territory type="IC" draft="unconfirmed">Kanarioj</territory>
+			<territory type="IC">Kanarioj</territory>
 			<territory type="ID">Indonezio</territory>
 			<territory type="IE">Irlando</territory>
 			<territory type="IL">Israelo</territory>
-			<territory type="IM" draft="unconfirmed">Mankinsulo</territory>
+			<territory type="IM">Manksinsulo</territory>
 			<territory type="IN">Hindujo</territory>
-			<territory type="IO" draft="provisional">Brita Hindoceana Teritorio</territory>
-			<territory type="IO" alt="chagos" draft="unconfirmed">Ĉagos-arĥipelago</territory>
+			<territory type="IO">Brita Hindoceana Teritorio</territory>
+			<territory type="IO" alt="chagos">Ĉagos-arĥipelago</territory>
 			<territory type="IQ">Irako</territory>
 			<territory type="IR">Irano</territory>
 			<territory type="IS">Islando</territory>
 			<territory type="IT">Italujo</territory>
-			<territory type="JE" draft="unconfirmed">Ĵerzejo</territory>
+			<territory type="JE">Ĵerzejo</territory>
 			<territory type="JM">Jamajko</territory>
 			<territory type="JO">Jordanio</territory>
 			<territory type="JP">Japanujo</territory>
 			<territory type="KE">Kenjo</territory>
-			<territory type="KG" draft="contributed">Kirgizujo</territory>
+			<territory type="KG">Kirgizujo</territory>
 			<territory type="KH">Kamboĝo</territory>
 			<territory type="KI">Kiribato</territory>
 			<territory type="KM">Komoroj</territory>
-			<territory type="KN" draft="contributed">Sankta Kristoforo kaj Neviso</territory>
-			<territory type="KP">Nord-Koreo</territory>
-			<territory type="KR">Sud-Koreo</territory>
+			<territory type="KN">Sankta Kristoforo kaj Neviso</territory>
+			<territory type="KP">Nord-Koreujo</territory>
+			<territory type="KR">Sud-Koreujo</territory>
 			<territory type="KW">Kuvajto</territory>
-			<territory type="KY">Kejmanoj</territory>
-			<territory type="KZ" draft="contributed">Kazaĥujo</territory>
+			<territory type="KY">Kajmana Insularo</territory>
+			<territory type="KZ">Kazaĥujo</territory>
 			<territory type="LA">Laoso</territory>
 			<territory type="LB">Libano</territory>
-			<territory type="LC" draft="contributed">Sankta Lucio</territory>
+			<territory type="LC">Sankta Lucio</territory>
 			<territory type="LI">Liĥtenŝtejno</territory>
-			<territory type="LK" draft="contributed">Srilanko</territory>
+			<territory type="LK">Srilanko</territory>
 			<territory type="LR">Liberio</territory>
 			<territory type="LS">Lesoto</territory>
 			<territory type="LT">Litovujo</territory>
@@ -672,19 +715,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MA">Maroko</territory>
 			<territory type="MC">Monako</territory>
 			<territory type="MD">Moldavujo</territory>
-			<territory type="ME" draft="unconfirmed">Montenegro</territory>
-			<territory type="MF" draft="unconfirmed">Saint-Martin</territory>
+			<territory type="ME">Montenegro</territory>
+			<territory type="MF">Saint-Martin</territory>
 			<territory type="MG">Madagaskaro</territory>
 			<territory type="MH">Marŝaloj</territory>
-			<territory type="MK" draft="unconfirmed">Nord-Makedonujo</territory>
+			<territory type="MK">Nord-Makedonujo</territory>
 			<territory type="ML">Malio</territory>
-			<territory type="MM" draft="contributed">Birmo</territory>
+			<territory type="MM">Birmo</territory>
 			<territory type="MN">Mongolujo</territory>
-			<territory type="MO" draft="unconfirmed">Makao</territory>
+			<territory type="MO">Makao (SAR de Ĉinujo)</territory>
 			<territory type="MP">Nord-Marianoj</territory>
 			<territory type="MQ">Martiniko</territory>
-			<territory type="MR">Maŭritanujo</territory>
-			<territory type="MS" draft="unconfirmed">Moncerato</territory>
+			<territory type="MR">Maŭritanio</territory>
+			<territory type="MS">Moncerato</territory>
 			<territory type="MT">Malto</territory>
 			<territory type="MU">Maŭricio</territory>
 			<territory type="MV">Maldivoj</territory>
@@ -712,143 +755,242 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="PH">Filipinoj</territory>
 			<territory type="PK">Pakistano</territory>
 			<territory type="PL">Pollando</territory>
-			<territory type="PM" draft="contributed">Sankta Piero kaj Mikelono</territory>
+			<territory type="PM">Sankta Piero kaj Mikelono</territory>
 			<territory type="PN">Pitkarna Insulo</territory>
-			<territory type="PR" draft="contributed">Puertoriko</territory>
-			<territory type="PS" draft="unconfirmed">Palestino</territory>
+			<territory type="PR">Puertoriko</territory>
+			<territory type="PS">Palestinaj teritorioj</territory>
 			<territory type="PT">Portugalujo</territory>
-			<territory type="PW" draft="contributed">Palaŭo</territory>
+			<territory type="PW">Palaŭo</territory>
 			<territory type="PY">Paragvajo</territory>
 			<territory type="QA">Kataro</territory>
-			<territory type="QO" draft="unconfirmed">malproksimaj insuletoj de Oceanio</territory>
+			<territory type="QO">malproksimaj insuletoj de Oceanio</territory>
 			<territory type="RE">Reunio</territory>
 			<territory type="RO">Rumanujo</territory>
-			<territory type="RS" draft="unconfirmed">Serbujo</territory>
+			<territory type="RS">Serbujo</territory>
 			<territory type="RU">Rusujo</territory>
 			<territory type="RW">Ruando</territory>
-			<territory type="SA" draft="contributed">Sauda Arabujo</territory>
+			<territory type="SA">Sauda Arabujo</territory>
 			<territory type="SB">Salomonoj</territory>
 			<territory type="SC">Sejŝeloj</territory>
 			<territory type="SD">Sudano</territory>
 			<territory type="SE">Svedujo</territory>
 			<territory type="SG">Singapuro</territory>
-			<territory type="SH" draft="contributed">Sankta Heleno</territory>
+			<territory type="SH">Sankta Heleno</territory>
 			<territory type="SI">Slovenujo</territory>
-			<territory type="SJ" draft="contributed">Svalbardo kaj Janmajeno</territory>
+			<territory type="SJ">Svalbardo kaj Janmajeno</territory>
 			<territory type="SK">Slovakujo</territory>
-			<territory type="SL" draft="contributed">Sieraleono</territory>
-			<territory type="SM" draft="contributed">Sanmarino</territory>
+			<territory type="SL">Sieraleono</territory>
+			<territory type="SM">Sanmarino</territory>
 			<territory type="SN">Senegalo</territory>
 			<territory type="SO">Somalujo</territory>
 			<territory type="SR">Surinamo</territory>
-			<territory type="SS" draft="provisional">Sud-Sudano</territory>
-			<territory type="ST" draft="contributed">Santomeo kaj Principeo</territory>
+			<territory type="SS">Sud-Sudano</territory>
+			<territory type="ST">Santomeo kaj Principeo</territory>
 			<territory type="SV">Salvadoro</territory>
-			<territory type="SX" draft="unconfirmed">Sint-Maarten</territory>
+			<territory type="SX">Sint-Maarten</territory>
 			<territory type="SY">Sirio</territory>
 			<territory type="SZ">Svazilando</territory>
-			<territory type="TA" draft="unconfirmed">Tristan da Cunha</territory>
-			<territory type="TC" draft="unconfirmed">Turkoj kaj Kajkoj</territory>
+			<territory type="TA">Tristan da Cunha</territory>
+			<territory type="TC">Turkoj kaj Kajkoj</territory>
 			<territory type="TD">Ĉado</territory>
-			<territory type="TF" draft="unconfirmed">Francaj Sudaj Teritorioj</territory>
-			<territory type="TG" draft="contributed">Togolando</territory>
+			<territory type="TF">Francaj Sudaj Teritorioj</territory>
+			<territory type="TG">Togolando</territory>
 			<territory type="TH">Tajlando</territory>
 			<territory type="TJ">Taĝikujo</territory>
-			<territory type="TK" draft="unconfirmed">Tokelao</territory>
-			<territory type="TL" draft="unconfirmed">Orienta Timoro</territory>
+			<territory type="TK">Tokelao</territory>
+			<territory type="TL">Orienta Timoro</territory>
 			<territory type="TM">Turkmenujo</territory>
 			<territory type="TN">Tunizio</territory>
 			<territory type="TO">Tongo</territory>
 			<territory type="TR">Turkujo</territory>
-			<territory type="TR" alt="variant" draft="unconfirmed">Turkio</territory>
 			<territory type="TT">Trinidado kaj Tobago</territory>
 			<territory type="TV">Tuvalo</territory>
 			<territory type="TW">Tajvano</territory>
 			<territory type="TZ">Tanzanio</territory>
-			<territory type="UA" draft="contributed">Ukrainujo</territory>
+			<territory type="UA">Ukrainujo</territory>
 			<territory type="UG">Ugando</territory>
 			<territory type="UM">Usonaj malgrandaj insuloj</territory>
-			<territory type="UN" draft="unconfirmed">Unuiĝintaj Nacioj</territory>
+			<territory type="UN">Unuiĝintaj Nacioj</territory>
 			<territory type="US">Usono</territory>
 			<territory type="UY">Urugvajo</territory>
 			<territory type="UZ">Uzbekujo</territory>
 			<territory type="VA">Vatikano</territory>
-			<territory type="VC" draft="contributed">Sankta Vincento kaj Grenadinoj</territory>
+			<territory type="VC">Sankta Vincento kaj Grenadinoj</territory>
 			<territory type="VE">Venezuelo</territory>
 			<territory type="VG">Britaj Virgulininsuloj</territory>
 			<territory type="VI">Usonaj Virgulininsuloj</territory>
-			<territory type="VN">Vjetnamo</territory>
+			<territory type="VN">Vjetnamujo</territory>
 			<territory type="VU">Vanuatuo</territory>
 			<territory type="WF">Valiso kaj Futuno</territory>
 			<territory type="WS">Samoo</territory>
-			<territory type="XA" draft="unconfirmed">pseŭdo-supersignoj</territory>
-			<territory type="XB" draft="unconfirmed">pseŭdo-inversdirekta</territory>
-			<territory type="XK" draft="unconfirmed">Kosovo</territory>
+			<territory type="XA">pseŭdo-supersignoj</territory>
+			<territory type="XB">pseŭdo-inversdirekta</territory>
+			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Jemeno</territory>
 			<territory type="YT">Majoto</territory>
 			<territory type="ZA">Sud-Afriko</territory>
 			<territory type="ZM">Zambio</territory>
 			<territory type="ZW">Zimbabvo</territory>
-			<territory type="ZZ" draft="unconfirmed">nekonata regiono</territory>
+			<territory type="ZZ">nekonata regiono</territory>
 		</territories>
 		<variants>
-			<variant type="ARKAIKA" draft="unconfirmed">Arkaika</variant>
-			<variant type="HSISTEMO" draft="unconfirmed">h-sistemo</variant>
-			<variant type="XSISTEMO" draft="unconfirmed">x-sistemo</variant>
+			<variant type="ARKAIKA">Arkaika</variant>
+			<variant type="HSISTEMO">h-sistemo</variant>
+			<variant type="XSISTEMO">x-sistemo</variant>
 		</variants>
 		<keys>
-			<key type="calendar" draft="unconfirmed">kalendaro</key>
-			<key type="cf" draft="unconfirmed">formo de valuto</key>
-			<key type="collation" draft="unconfirmed">ordigo</key>
-			<key type="currency" draft="unconfirmed">valuto</key>
+			<key type="calendar">kalendaro</key>
+			<key type="cf">formo de valuto</key>
+			<key type="collation">ordigo</key>
+			<key type="currency">valuto</key>
+			<key type="em">vidigo de miensimboloj</key>
+			<key type="hc">horloĝa sistemo (12- aŭ 24-hora)</key>
+			<key type="lb">stilo de linisalto</key>
+			<key type="lw">linisalto ene vortoj</key>
+			<key type="ms">mezur-sistemo</key>
+			<key type="numbers">ciferoj</key>
+			<key type="ss">frazfino post mallongigo</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist" draft="unconfirmed">budhaisma kalendaro</type>
-			<type key="calendar" type="chinese" draft="unconfirmed">ĉina kalendaro</type>
-			<type key="calendar" type="coptic" draft="unconfirmed">kopta kalendaro</type>
-			<type key="calendar" type="dangi" draft="unconfirmed">korea kalendaro</type>
-			<type key="calendar" type="ethiopic" draft="unconfirmed">etiopa kalendaro</type>
-			<type key="calendar" type="gregorian" draft="unconfirmed">gregoria kalendaro</type>
-			<type key="calendar" type="hebrew" draft="unconfirmed">juda kalendaro</type>
-			<type key="calendar" type="islamic" draft="unconfirmed">islama kalendaro</type>
-			<type key="calendar" type="islamic-civil" draft="unconfirmed">tabela islama kalendaro</type>
-			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">islama kalendaro (Umm al-Qura)</type>
-			<type key="calendar" type="iso8601" draft="unconfirmed">kalendaro ISO-8601</type>
-			<type key="calendar" type="japanese" draft="unconfirmed">japana kalendaro</type>
-			<type key="calendar" type="persian" draft="unconfirmed">persa kalendaro</type>
-			<type key="calendar" type="roc" draft="unconfirmed">kalendaro de Respubliko Ĉinujo</type>
-			<type key="collation" type="ducet" draft="unconfirmed">norma ordigo laŭ Unikodo</type>
-			<type key="collation" type="search" draft="unconfirmed">ĝeneral-uza serĉo</type>
-			<type key="collation" type="standard" draft="unconfirmed">norma ordigo</type>
-			<type key="numbers" type="latn" draft="unconfirmed">eŭropaj ciferoj</type>
+			<type key="calendar" type="buddhist">budaisma kalendaro</type>
+			<type key="calendar" type="buddhist" scope="core">budaisma</type>
+			<type key="calendar" type="chinese">ĉina kalendaro</type>
+			<type key="calendar" type="chinese" scope="core">ĉina</type>
+			<type key="calendar" type="coptic">kopta kalendaro</type>
+			<type key="calendar" type="coptic" scope="core">kopta</type>
+			<type key="calendar" type="dangi">korea kalendaro</type>
+			<type key="calendar" type="dangi" scope="core">korea</type>
+			<type key="calendar" type="ethiopic">etiopa kalendaro</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopa</type>
+			<type key="calendar" type="ethiopic-amete-alem">etiopa kalendaro (Amete Alem)</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopa Amete Alem</type>
+			<type key="calendar" type="gregorian">gregoria kalendaro</type>
+			<type key="calendar" type="gregorian" scope="core">gregoria</type>
+			<type key="calendar" type="hebrew">juda kalendaro</type>
+			<type key="calendar" type="hebrew" scope="core">juda</type>
+			<type key="calendar" type="islamic">islama kalendaro</type>
+			<type key="calendar" type="islamic" scope="core">islama</type>
+			<type key="calendar" type="islamic-civil">tabela islama kalendaro</type>
+			<type key="calendar" type="islamic-civil" scope="core">tabela islama</type>
+			<type key="calendar" type="islamic-umalqura">islama kalendaro (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islama Umm al-Qura</type>
+			<type key="calendar" type="iso8601">gregoria kalendaro (jaro unue)</type>
+			<type key="calendar" type="japanese">japana kalendaro</type>
+			<type key="calendar" type="japanese" scope="core">japana</type>
+			<type key="calendar" type="persian">persa kalendaro</type>
+			<type key="calendar" type="persian" scope="core">persa</type>
+			<type key="calendar" type="roc">kalendaro de Respubliko Ĉinujo</type>
+			<type key="calendar" type="roc" scope="core">respublik-ĉina</type>
+			<type key="cf" type="account">kontista formo de valuto</type>
+			<type key="cf" type="account" scope="core">kontista</type>
+			<type key="cf" type="standard">norma formo de valuto</type>
+			<type key="cf" type="standard" scope="core">norma</type>
+			<type key="collation" type="ducet">norma ordigo laŭ Unikodo</type>
+			<type key="collation" type="ducet" scope="core">norma laŭ Unikodo</type>
+			<type key="collation" type="search">ĝeneral-uza serĉo</type>
+			<type key="collation" type="search" scope="core">serĉa</type>
+			<type key="collation" type="standard">norma ordigo</type>
+			<type key="collation" type="standard" scope="core">norma</type>
+			<type key="em" type="default" scope="core">norma</type>
+			<type key="em" type="emoji" scope="core">miensimboloj</type>
+			<type key="em" type="text" scope="core">teksto</type>
+			<type key="hc" type="h11">12-hora sistemo (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
+			<type key="hc" type="h12">12-hora sistemo (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
+			<type key="hc" type="h23">24-hora sistemo (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
+			<type key="hc" type="h24">24-hora sistemo (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">milda stilo de linisalto</type>
+			<type key="lb" type="loose" scope="core">milda</type>
+			<type key="lb" type="normal">norma stilo de linisalto</type>
+			<type key="lb" type="normal" scope="core">norma</type>
+			<type key="lb" type="strict">malmilda stilo de linisalto</type>
+			<type key="lb" type="strict" scope="core">malmilda</type>
+			<type key="lw" type="breakall" scope="core">rompi ĉiujn</type>
+			<type key="lw" type="keepall" scope="core">konservi ĉiujn</type>
+			<type key="lw" type="normal" scope="core">norma</type>
+			<type key="lw" type="phrase" scope="core">konservi en frazoj</type>
+			<type key="ms" type="metric">metra sistemo</type>
+			<type key="ms" type="metric" scope="core">metra</type>
+			<type key="ms" type="uksystem">brita mezur-sistemo</type>
+			<type key="ms" type="uksystem" scope="core">brita</type>
+			<type key="ms" type="ussystem">usona mezur-sistemo</type>
+			<type key="ms" type="ussystem" scope="core">usona</type>
+			<type key="numbers" type="arab">hind-arabaj ciferoj</type>
+			<type key="numbers" type="arabext">hind-arabaj ciferoj etenditaj</type>
+			<type key="numbers" type="armn">armenaj ciferoj</type>
+			<type key="numbers" type="armnlow">armenaj ciferoj minusklaj</type>
+			<type key="numbers" type="beng">bengalaj ciferoj</type>
+			<type key="numbers" type="cakm">ĉakmaj ciferoj</type>
+			<type key="numbers" type="deva">devanagaraj ciferoj</type>
+			<type key="numbers" type="ethi">etiopaj ciferoj</type>
+			<type key="numbers" type="fullwide">ciferoj plenlarĝaj</type>
+			<type key="numbers" type="geor">kartvelaj ciferoj</type>
+			<type key="numbers" type="grek">grekaj ciferoj</type>
+			<type key="numbers" type="greklow">grekaj ciferoj minusklaj</type>
+			<type key="numbers" type="gujr">guĝarataj ciferoj</type>
+			<type key="numbers" type="guru">gurmukaj ciferoj</type>
+			<type key="numbers" type="hanidec">ĉinaj dekumaj ciferoj</type>
+			<type key="numbers" type="hans">simpligit-ĉinaj ciferoj</type>
+			<type key="numbers" type="hansfin">simpligit-ĉinaj financaj ciferoj</type>
+			<type key="numbers" type="hant">tradici-ĉinaj ciferoj</type>
+			<type key="numbers" type="hantfin">tradic-ĉinaj financaj ciferoj</type>
+			<type key="numbers" type="hebr">hebreaj ciferoj</type>
+			<type key="numbers" type="java">javaj ciferoj</type>
+			<type key="numbers" type="jpan">japanaj ciferoj</type>
+			<type key="numbers" type="jpanfin">japanaj financaj ciferoj</type>
+			<type key="numbers" type="khmr">kmeraj ciferoj</type>
+			<type key="numbers" type="knda">kanaraj ciferoj</type>
+			<type key="numbers" type="laoo">laŭaj ciferoj</type>
+			<type key="numbers" type="latn">eŭropaj ciferoj</type>
+			<type key="numbers" type="mlym">malajalamaj ciferoj</type>
+			<type key="numbers" type="mtei">manipuraj ciferoj</type>
+			<type key="numbers" type="mymr">birmaj ciferoj</type>
+			<type key="numbers" type="orya">orijaj ciferoj</type>
+			<type key="numbers" type="roman">romaj ciferoj</type>
+			<type key="numbers" type="romanlow">romaj ciferoj minusklaj</type>
+			<type key="numbers" type="taml">tamilaj tradiciaj ciferoj</type>
+			<type key="numbers" type="tamldec">tamilaj ciferoj</type>
+			<type key="numbers" type="telu">teluguaj ciferoj</type>
+			<type key="numbers" type="thai">tajaj ciferoj</type>
+			<type key="numbers" type="tibt">tibetaj ciferoj</type>
+			<type key="numbers" type="vaii">vajaj ciferoj</type>
+			<type key="ss" type="none" scope="core">ne</type>
+			<type key="ss" type="standard" scope="core">jes</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric" draft="contributed">metra</measurementSystemName>
-			<measurementSystemName type="UK" draft="contributed">brita</measurementSystemName>
-			<measurementSystemName type="US" draft="contributed">usona</measurementSystemName>
+			<measurementSystemName type="metric">metra</measurementSystemName>
+			<measurementSystemName type="UK">brita</measurementSystemName>
+			<measurementSystemName type="US">usona</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
-			<codePattern type="language" draft="contributed">Lingvo: {0}</codePattern>
-			<codePattern type="script" draft="contributed">Skribsistemo: {0}</codePattern>
-			<codePattern type="territory" draft="contributed">Regiono: {0}</codePattern>
+			<codePattern type="language">Lingvo: {0}</codePattern>
+			<codePattern type="script">Skribsistemo: {0}</codePattern>
+			<codePattern type="territory">Regiono: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[a b c ĉ d e f g ĝ h ĥ i j ĵ k l m n o p r s ŝ t u ŭ v z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[q w x y]</exemplarCharacters>
-		<exemplarCharacters type="index">[A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U Ŭ V Z]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U V Z]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] \{ \} /]</exemplarCharacters>
-		<ellipsis type="word-final" draft="unconfirmed">{0}…</ellipsis>
-		<ellipsis type="word-initial" draft="unconfirmed">…{0}</ellipsis>
+		<ellipsis type="word-final">{0}…</ellipsis>
+		<ellipsis type="word-initial">…{0}</ellipsis>
 	</characters>
+	<delimiters>
+		<alternateQuotationStart>«</alternateQuotationStart>
+		<alternateQuotationEnd>»</alternateQuotationEnd>
+	</delimiters>
 	<dates>
 		<calendars>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="contributed">EEEE, 'la' d-'a' 'de' MMMM y G</pattern>
+							<pattern>EEEE, 'la' d-'a' 'de' MMMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -865,104 +1007,125 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1} 'je' {0}</pattern>
+							<pattern>{1} 'je' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'je' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1} 'je' {0}</pattern>
+							<pattern>{1} 'je' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'je' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">E, dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="unconfirmed">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
-						<dateFormatItem id="y" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="yyyy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM" draft="unconfirmed">M y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd" draft="unconfirmed">y-MM-dd GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd" draft="unconfirmed">E, y-MM-dd GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd" draft="unconfirmed">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">MMMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="unconfirmed">QQQ 'de' y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="unconfirmed">QQQQ 'de' y G</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH'H' v</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd-MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">y-MM-dd GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, y-MM-dd GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ 'de' y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ 'de' y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="h">h – h B</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="unconfirmed">d – d</greatestDifference>
+							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y GGGGG – MMM y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y GGGGG</greatestDifference>
+							<greatestDifference id="G">MMM y GGGGG – MMM y GGGGG</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y GGGGG</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM y GGGGG</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d MMM y GGGGG – d MMM y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="d">d – d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="G">d MMM y GGGGG – d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y GGGGG</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E, d MMM y GGGGG – E, d MMM y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, d MMM y GGGGG – E, d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E, d MMM y G – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
@@ -979,61 +1142,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h" draft="unconfirmed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">y-MM – y-MM GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-MM – y-MM GGGGG</greatestDifference>
+							<greatestDifference id="M">y-MM – y-MM GGGGG</greatestDifference>
+							<greatestDifference id="y">y-MM – y-MM GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">y-MM-dd – y-MM-dd GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">y-MM-dd – y-MM-dd GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-MM-dd – y-MM-dd GGGGG</greatestDifference>
+							<greatestDifference id="d">y-MM-dd – y-MM-dd GGGGG</greatestDifference>
+							<greatestDifference id="M">y-MM-dd – y-MM-dd GGGGG</greatestDifference>
+							<greatestDifference id="y">y-MM-dd – y-MM-dd GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, y-MM-dd – E, y-MM-dd GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, y-MM-dd – E, y-MM-dd GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, y-MM-dd – E, y-MM-dd GGGGG</greatestDifference>
+							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd GGGGG</greatestDifference>
+							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd GGGGG</greatestDifference>
+							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMMM – MMMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y G</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1072,18 +1231,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="narrow">
-							<month type="1" draft="unconfirmed">J</month>
-							<month type="2" draft="unconfirmed">F</month>
-							<month type="3" draft="unconfirmed">M</month>
-							<month type="4" draft="unconfirmed">A</month>
-							<month type="5" draft="unconfirmed">M</month>
-							<month type="6" draft="unconfirmed">J</month>
-							<month type="7" draft="unconfirmed">J</month>
-							<month type="8" draft="unconfirmed">A</month>
-							<month type="9" draft="unconfirmed">S</month>
-							<month type="10" draft="unconfirmed">O</month>
-							<month type="11" draft="unconfirmed">N</month>
-							<month type="12" draft="unconfirmed">D</month>
+							<month type="1">J</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">J</month>
+							<month type="7">J</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -1110,29 +1269,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">d</day>
-							<day type="mon" draft="unconfirmed">l</day>
-							<day type="tue" draft="unconfirmed">m</day>
-							<day type="wed" draft="unconfirmed">m</day>
-							<day type="thu" draft="unconfirmed">ĵ</day>
-							<day type="fri" draft="unconfirmed">v</day>
-							<day type="sat" draft="unconfirmed">s</day>
+							<day type="sun">d</day>
+							<day type="mon">l</day>
+							<day type="tue">m</day>
+							<day type="wed">m</day>
+							<day type="thu">ĵ</day>
+							<day type="fri">v</day>
+							<day type="sat">s</day>
 						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1. jk.</quarter>
-							<quarter type="2" draft="unconfirmed">2. jk.</quarter>
-							<quarter type="3" draft="unconfirmed">3. jk.</quarter>
-							<quarter type="4" draft="unconfirmed">4. jk.</quarter>
+							<quarter type="1">1. jk.</quarter>
+							<quarter type="2">2. jk.</quarter>
+							<quarter type="3">3. jk.</quarter>
+							<quarter type="4">4. jk.</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">1-a jarkvarono</quarter>
-							<quarter type="2" draft="unconfirmed">2-a jarkvarono</quarter>
-							<quarter type="3" draft="unconfirmed">3-a jarkvarono</quarter>
-							<quarter type="4" draft="unconfirmed">4-a jarkvarono</quarter>
+							<quarter type="1">1-a jarkvarono</quarter>
+							<quarter type="2">2-a jarkvarono</quarter>
+							<quarter type="3">3-a jarkvarono</quarter>
+							<quarter type="4">4-a jarkvarono</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
@@ -1143,35 +1302,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="pm">ptm</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">a</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">a</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0" draft="contributed">antaŭ nia erao</era>
-						<era type="0" alt="variant" draft="contributed">antaŭ Kristo</era>
-						<era type="1" draft="contributed">de nia erao</era>
-						<era type="1" alt="variant" draft="contributed">post Kristo</era>
+						<era type="0">antaŭ nia erao</era>
+						<era type="0" alt="variant">antaŭ Kristo</era>
+						<era type="1">de nia erao</era>
+						<era type="1" alt="variant">post Kristo</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">a.n.e.</era>
-						<era type="0" alt="variant" draft="contributed">a.K.</era>
-						<era type="1" draft="contributed">n.e.</era>
-						<era type="1" alt="variant" draft="contributed">p.K.</era>
+						<era type="0">a.n.e.</era>
+						<era type="0" alt="variant">a.K.</era>
+						<era type="1">n.e.</era>
+						<era type="1" alt="variant">p.K.</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="contributed">EEEE, 'la' d-'a' 'de' MMMM y</pattern>
+							<pattern>EEEE, 'la' d-'a' 'de' MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1196,203 +1355,209 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern draft="contributed">HH:mm:ss zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 							<datetimeSkeleton>Hmsszzzz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1} 'je' {0}</pattern>
+							<pattern>{1} 'je' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'je' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1} 'je' {0}</pattern>
+							<pattern>{1} 'je' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'je' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">E, MM-dd</dateFormatItem>
-						<dateFormatItem id="MMM" draft="unconfirmed">MMM</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="unconfirmed">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one" draft="unconfirmed">W-'a' 'semajno' 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">W-'a' 'semajno' 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="unconfirmed">E, y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="unconfirmed">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="unconfirmed">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM" draft="unconfirmed">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="unconfirmed">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="unconfirmed">QQQQ 'de' y</dateFormatItem>
-						<dateFormatItem id="yw" count="one" draft="unconfirmed">w-'a' 'semajno' 'de' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other" draft="unconfirmed">w-'a' 'semajno' 'de' Y</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="H">HH'H'</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'H' v</dateFormatItem>
+						<dateFormatItem id="MEd">E, MM-dd</dateFormatItem>
+						<dateFormatItem id="MMM">MMM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">W-'a' 'semajno' 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">W-'a' 'semajno' 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="yMEd">E, y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ 'de' y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">w-'a' 'semajno' 'de' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other">w-'a' 'semajno' 'de' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="unconfirmed">d – d</greatestDifference>
+							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E, d MMM y G – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E, d MMM y G – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h – h a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">HH – HH</greatestDifference>
+							<greatestDifference id="H">HH – HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm – HH:mm</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H" draft="unconfirmed">HH:mm – HH:mm v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H" draft="unconfirmed">HH – HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="H">HH–HH'H' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">d – d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y – y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, d – E, d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y</greatestDifference>
+							<greatestDifference id="d">E, d – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMMM – MMMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1400,2371 +1565,2357 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName draft="unconfirmed">erao</displayName>
+				<displayName>erao</displayName>
 			</field>
 			<field type="year">
-				<displayName draft="unconfirmed">jaro</displayName>
-				<relative type="-1" draft="unconfirmed">pasinta jaro</relative>
-				<relative type="0" draft="unconfirmed">nuna jaro</relative>
-				<relative type="1" draft="unconfirmed">venonta jaro</relative>
+				<displayName>jaro</displayName>
+				<relative type="-1">pasinta jaro</relative>
+				<relative type="0">nuna jaro</relative>
+				<relative type="1">venonta jaro</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} jaro</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} jaroj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} jaro</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} jaroj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} jaro</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} jaroj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} jaro</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} jaroj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta j.</relative>
-				<relative type="0" draft="unconfirmed">nuna j.</relative>
-				<relative type="1" draft="unconfirmed">venonta j.</relative>
+				<relative type="-1">pasinta j.</relative>
+				<relative type="0">nuna j.</relative>
+				<relative type="1">venonta j.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} j.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} j.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} j.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} j.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} j.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} j.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} j.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} j.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName draft="unconfirmed">jarkvarono</displayName>
-				<relative type="-1" draft="unconfirmed">pasinta jarkvarono</relative>
-				<relative type="0" draft="unconfirmed">nuna jarkvarono</relative>
-				<relative type="1" draft="unconfirmed">venonta jarkvarono</relative>
+				<displayName>jarkvarono</displayName>
+				<relative type="-1">pasinta jarkvarono</relative>
+				<relative type="0">nuna jarkvarono</relative>
+				<relative type="1">venonta jarkvarono</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} jarkvarono</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} jarkvaronoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} jarkvarono</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} jarkvaronoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} jarkvarono</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} jarkvaronoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} jarkvarono</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} jarkvaronoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName draft="unconfirmed">jk.</displayName>
+				<displayName>jk.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} jk.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} jk.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} jk.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} jk.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} jk.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} jk.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} jk.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} jk.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName draft="unconfirmed">monato</displayName>
-				<relative type="-1" draft="unconfirmed">pasinta monato</relative>
-				<relative type="0" draft="unconfirmed">nuna monato</relative>
-				<relative type="1" draft="unconfirmed">venonta monato</relative>
+				<displayName>monato</displayName>
+				<relative type="-1">pasinta monato</relative>
+				<relative type="0">nuna monato</relative>
+				<relative type="1">venonta monato</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} monato</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} monatoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} monato</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} monatoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} monato</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} monatoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} monato</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} monatoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName draft="unconfirmed">mon.</displayName>
-				<relative type="-1" draft="unconfirmed">pasinta mon.</relative>
-				<relative type="0" draft="unconfirmed">nuna mon.</relative>
-				<relative type="1" draft="unconfirmed">venonta mon.</relative>
+				<displayName>mon.</displayName>
+				<relative type="-1">pasinta mon.</relative>
+				<relative type="0">nuna mon.</relative>
+				<relative type="1">venonta mon.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} mon.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} mon.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} mon.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} mon.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} mon.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} mon.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} mon.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} mon.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName draft="unconfirmed">semajno</displayName>
-				<relative type="-1" draft="unconfirmed">pasinta semajno</relative>
-				<relative type="0" draft="unconfirmed">nuna semajno</relative>
-				<relative type="1" draft="unconfirmed">venonta semajno</relative>
+				<displayName>semajno</displayName>
+				<relative type="-1">pasinta semajno</relative>
+				<relative type="0">nuna semajno</relative>
+				<relative type="1">venonta semajno</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} semajno</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} semajnoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} semajno</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} semajnoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} semajno</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} semajnoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} semajno</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} semajnoj</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod draft="unconfirmed">la semajno de {0}</relativePeriod>
+				<relativePeriod>la semajno de {0}</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName draft="unconfirmed">sem.</displayName>
-				<relative type="-1" draft="unconfirmed">pasinta sem.</relative>
-				<relative type="0" draft="unconfirmed">nuna sem.</relative>
-				<relative type="1" draft="unconfirmed">venonta sem.</relative>
+				<displayName>sem.</displayName>
+				<relative type="-1">pasinta sem.</relative>
+				<relative type="0">nuna sem.</relative>
+				<relative type="1">venonta sem.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} sem.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} sem.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} sem.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} sem.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
-				<relativePeriod draft="unconfirmed">sem. de {0}</relativePeriod>
+				<relativePeriod>sem. de {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
-				<displayName draft="unconfirmed">semajno de monato</displayName>
+				<displayName>semajno de monato</displayName>
 			</field>
 			<field type="weekOfMonth-short">
-				<displayName draft="unconfirmed">sem. de mon.</displayName>
+				<displayName>sem. de mon.</displayName>
 			</field>
 			<field type="day">
-				<displayName draft="unconfirmed">tago</displayName>
-				<relative type="-1" draft="unconfirmed">hieraŭ</relative>
-				<relative type="0" draft="unconfirmed">hodiaŭ</relative>
-				<relative type="1" draft="unconfirmed">morgaŭ</relative>
+				<displayName>tago</displayName>
+				<relative type="-1">hieraŭ</relative>
+				<relative type="0">hodiaŭ</relative>
+				<relative type="1">morgaŭ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} tago</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} tagoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} tago</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} tagoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} tago</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} tagoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} tago</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} tagoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-narrow">
-				<displayName draft="unconfirmed">t.</displayName>
+				<displayName>t.</displayName>
+				<relative type="-1">hier.</relative>
+				<relative type="0">hod.</relative>
+				<relative type="1">morg.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} t.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} t.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} t.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} t.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} t.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} t.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} t.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} t.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayOfYear">
-				<displayName draft="unconfirmed">tago de jaro</displayName>
+				<displayName>tago de jaro</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName>jartago</displayName>
 			</field>
 			<field type="dayOfYear-narrow">
-				<displayName draft="unconfirmed">t. de j.</displayName>
+				<displayName>jartago</displayName>
 			</field>
 			<field type="weekday">
-				<displayName draft="unconfirmed">tago de semajno</displayName>
+				<displayName>tago de semajno</displayName>
 			</field>
 			<field type="weekday-short">
-				<displayName draft="unconfirmed">semajntago</displayName>
+				<displayName>semajntago</displayName>
 			</field>
 			<field type="weekday-narrow">
-				<displayName draft="unconfirmed">st.</displayName>
+				<displayName>st.</displayName>
 			</field>
 			<field type="weekdayOfMonth">
-				<displayName draft="unconfirmed">semajntago de monato</displayName>
+				<displayName>semajntago de monato</displayName>
 			</field>
 			<field type="weekdayOfMonth-short">
-				<displayName draft="unconfirmed">st. de monato</displayName>
+				<displayName>st. de monato</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName>st. de mon.</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1" draft="unconfirmed">pasinta dimanĉo</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu dimanĉo</relative>
-				<relative type="1" draft="unconfirmed">venonta dimanĉo</relative>
+				<relative type="-1">pasinta dimanĉo</relative>
+				<relative type="0">ĉi tiu dimanĉo</relative>
+				<relative type="1">venonta dimanĉo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} dimanĉo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} dimanĉoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} dimanĉo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} dimanĉoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} dimanĉo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} dimanĉoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} dimanĉo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} dimanĉoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sun-short">
-				<relative type="-1" draft="unconfirmed">pasinta di.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu di.</relative>
-				<relative type="1" draft="unconfirmed">venonta di.</relative>
+				<relative type="-1">pasinta di.</relative>
+				<relative type="0">ĉi tiu di.</relative>
+				<relative type="1">venonta di.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} di.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} di.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} di.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} di.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} di.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} di.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} di.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} di.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta d.</relative>
-				<relative type="0" draft="unconfirmed">nuna d.</relative>
-				<relative type="1" draft="unconfirmed">venonta d.</relative>
+				<relative type="-1">pasinta d.</relative>
+				<relative type="0">nuna d.</relative>
+				<relative type="1">venonta d.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} d.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} d.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} d.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} d.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} d.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} d.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} d.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon">
-				<relative type="-1" draft="unconfirmed">pasinta lundo</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu lundo</relative>
-				<relative type="1" draft="unconfirmed">venonta lundo</relative>
+				<relative type="-1">pasinta lundo</relative>
+				<relative type="0">ĉi tiu lundo</relative>
+				<relative type="1">venonta lundo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} lundo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} lundoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} lundo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} lundoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} lundo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} lundoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} lundo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} lundoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon-short">
-				<relative type="-1" draft="unconfirmed">pasinta lu.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu lu.</relative>
-				<relative type="1" draft="unconfirmed">venonta lu.</relative>
+				<relative type="-1">pasinta lu.</relative>
+				<relative type="0">ĉi tiu lu.</relative>
+				<relative type="1">venonta lu.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} lu.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} lu.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} lu.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} lu.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} lu.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} lu.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} lu.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} lu.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta l.</relative>
-				<relative type="0" draft="unconfirmed">nuna l.</relative>
-				<relative type="1" draft="unconfirmed">venonta l.</relative>
+				<relative type="-1">pasinta l.</relative>
+				<relative type="0">nuna l.</relative>
+				<relative type="1">venonta l.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} l.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} l.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} l.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} l.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} l.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} l.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} l.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} l.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue">
-				<relative type="-1" draft="unconfirmed">pasinta mardo</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu mardo</relative>
-				<relative type="1" draft="unconfirmed">venonta mardo</relative>
+				<relative type="-1">pasinta mardo</relative>
+				<relative type="0">ĉi tiu mardo</relative>
+				<relative type="1">venonta mardo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} mardo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} mardoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} mardo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} mardoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} mardo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} mardoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} mardo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} mardoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue-short">
-				<relative type="-1" draft="unconfirmed">pasinta ma.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu ma.</relative>
-				<relative type="1" draft="unconfirmed">venonta ma.</relative>
+				<relative type="-1">pasinta ma.</relative>
+				<relative type="0">ĉi tiu ma.</relative>
+				<relative type="1">venonta ma.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} ma.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} ma.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} ma.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} ma.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} ma.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} ma.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} ma.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} ma.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta ma.</relative>
-				<relative type="0" draft="unconfirmed">nuna ma.</relative>
-				<relative type="1" draft="unconfirmed">venonta ma.</relative>
+				<relative type="-1">pasinta ma.</relative>
+				<relative type="0">nuna ma.</relative>
+				<relative type="1">venonta ma.</relative>
 			</field>
 			<field type="wed">
-				<relative type="-1" draft="unconfirmed">pasinta merkredo</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu merkredo</relative>
-				<relative type="1" draft="unconfirmed">venonta merkredo</relative>
+				<relative type="-1">pasinta merkredo</relative>
+				<relative type="0">ĉi tiu merkredo</relative>
+				<relative type="1">venonta merkredo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} merkredo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} merkredoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} merkredo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} merkredoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} merkredo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} merkredoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} merkredo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} merkredoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed-short">
-				<relative type="-1" draft="unconfirmed">pasinta me.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu me.</relative>
-				<relative type="1" draft="unconfirmed">venonta me.</relative>
+				<relative type="-1">pasinta me.</relative>
+				<relative type="0">ĉi tiu me.</relative>
+				<relative type="1">venonta me.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} me.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} me.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} me.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} me.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} me.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} me.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} me.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} me.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta me.</relative>
-				<relative type="0" draft="unconfirmed">nuna me.</relative>
-				<relative type="1" draft="unconfirmed">venonta me.</relative>
+				<relative type="-1">pasinta me.</relative>
+				<relative type="0">nuna me.</relative>
+				<relative type="1">venonta me.</relative>
 			</field>
 			<field type="thu">
-				<relative type="-1" draft="unconfirmed">pasinta ĵaŭdo</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu ĵaŭdo</relative>
-				<relative type="1" draft="unconfirmed">venonta ĵaŭdo</relative>
+				<relative type="-1">pasinta ĵaŭdo</relative>
+				<relative type="0">ĉi tiu ĵaŭdo</relative>
+				<relative type="1">venonta ĵaŭdo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} ĵaŭdo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} ĵaŭdoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} ĵaŭdo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} ĵaŭdoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} ĵaŭdo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} ĵaŭdoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} ĵaŭdo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} ĵaŭdoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu-short">
-				<relative type="-1" draft="unconfirmed">pasinta ĵa.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu ĵa.</relative>
-				<relative type="1" draft="unconfirmed">venonta ĵa.</relative>
+				<relative type="-1">pasinta ĵa.</relative>
+				<relative type="0">ĉi tiu ĵa.</relative>
+				<relative type="1">venonta ĵa.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} ĵa.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} ĵa.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} ĵa.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} ĵa.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} ĵa.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} ĵa.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} ĵa.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} ĵa.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta ĵ.</relative>
-				<relative type="0" draft="unconfirmed">nuna ĵ.</relative>
-				<relative type="1" draft="unconfirmed">venonta ĵ.</relative>
+				<relative type="-1">pasinta ĵ.</relative>
+				<relative type="0">nuna ĵ.</relative>
+				<relative type="1">venonta ĵ.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} ĵ.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} ĵ.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} ĵ.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} ĵ.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} ĵ.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} ĵ.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} ĵ.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} ĵ.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri">
-				<relative type="-1" draft="unconfirmed">pasinta vendredo</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu vendredo</relative>
-				<relative type="1" draft="unconfirmed">venonta vendredo</relative>
+				<relative type="-1">pasinta vendredo</relative>
+				<relative type="0">ĉi tiu vendredo</relative>
+				<relative type="1">venonta vendredo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} vendredo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} vendredoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} vendredo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} vendredoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} vendredo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} vendredoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} vendredo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} vendredoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-short">
-				<relative type="-1" draft="unconfirmed">pasinta ve.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu ve.</relative>
-				<relative type="1" draft="unconfirmed">venonta ve.</relative>
+				<relative type="-1">pasinta ve.</relative>
+				<relative type="0">ĉi tiu ve.</relative>
+				<relative type="1">venonta ve.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} ve.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} ve.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} ve.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} ve.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} ve.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} ve.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} ve.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} ve.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta v.</relative>
-				<relative type="0" draft="unconfirmed">nuna v.</relative>
-				<relative type="1" draft="unconfirmed">venonta v.</relative>
+				<relative type="-1">pasinta v.</relative>
+				<relative type="0">nuna v.</relative>
+				<relative type="1">venonta v.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} v.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} v.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} v.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} v.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} v.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} v.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} v.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} v.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat">
-				<relative type="-1" draft="unconfirmed">pasinta sabato</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu sabato</relative>
-				<relative type="1" draft="unconfirmed">venonta sabato</relative>
+				<relative type="-1">pasinta sabato</relative>
+				<relative type="0">ĉi tiu sabato</relative>
+				<relative type="1">venonta sabato</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} sabato</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} sabatoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} sabato</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} sabatoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} sabato</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} sabatoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} sabato</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} sabatoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-short">
-				<relative type="-1" draft="unconfirmed">pasinta sa.</relative>
-				<relative type="0" draft="unconfirmed">ĉi tiu sa.</relative>
-				<relative type="1" draft="unconfirmed">venonta sa.</relative>
+				<relative type="-1">pasinta sa.</relative>
+				<relative type="0">ĉi tiu sa.</relative>
+				<relative type="1">venonta sa.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} sa.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} sa.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} sa.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} sa.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} sa.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} sa.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} sa.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} sa.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1" draft="unconfirmed">pasinta s.</relative>
-				<relative type="0" draft="unconfirmed">nuna s.</relative>
-				<relative type="1" draft="unconfirmed">venonta s.</relative>
+				<relative type="-1">pasinta s.</relative>
+				<relative type="0">nuna s.</relative>
+				<relative type="1">venonta s.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} s.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} s.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} s.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} s.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} s.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} s.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} s.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayperiod-short">
-				<displayName draft="unconfirmed">tagotempo</displayName>
+				<displayName>tagtempo</displayName>
 			</field>
 			<field type="dayperiod">
-				<displayName draft="unconfirmed">mateno / posttagmezo / vespero</displayName>
+				<displayName>tagtempo</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>tagtempo</displayName>
 			</field>
 			<field type="hour">
-				<displayName draft="unconfirmed">horo</displayName>
-				<relative type="0" draft="unconfirmed">nuna horo</relative>
+				<displayName>horo</displayName>
+				<relative type="0">nuna horo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} horo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} horoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} horo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} horoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} horo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} horoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} horo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} horoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName draft="unconfirmed">h</displayName>
+				<displayName>h</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} h</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} h</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} h</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} h</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} h</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} h</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} h</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName draft="unconfirmed">minuto</displayName>
-				<relative type="0" draft="unconfirmed">nuna minuto</relative>
+				<displayName>minuto</displayName>
+				<relative type="0">nuna minuto</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} minuto</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} minutoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} minuto</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} minutoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} minuto</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} minutoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} minuto</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} minutoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
-				<displayName draft="unconfirmed">min.</displayName>
+				<displayName>min.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} min.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} min.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} min.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} min.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} min.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
-				<displayName draft="unconfirmed">min</displayName>
+				<displayName>min</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} min</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} min</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} min</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} min</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} min</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName draft="unconfirmed">sekundo</displayName>
-				<relative type="0" draft="unconfirmed">nun</relative>
+				<displayName>sekundo</displayName>
+				<relative type="0">nun</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} sekundo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} sekundoj</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} sekundo</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} sekundoj</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} sekundo</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} sekundoj</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} sekundo</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} sekundoj</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName draft="unconfirmed">sek.</displayName>
+				<displayName>sek.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} sek.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} sek.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} sek.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} sek.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
-				<displayName draft="unconfirmed">s</displayName>
+				<displayName>s</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">post {0} s</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">post {0} s</relativeTimePattern>
+					<relativeTimePattern count="one">post {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">post {0} s</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">antaŭ {0} s</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">antaŭ {0} s</relativeTimePattern>
+					<relativeTimePattern count="one">antaŭ {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">antaŭ {0} s</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName draft="unconfirmed">horzono</displayName>
+				<displayName>horzono</displayName>
 			</field>
 			<field type="zone-narrow">
-				<displayName draft="unconfirmed">zono</displayName>
+				<displayName>zono</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<gmtFormat draft="contributed">UTC{0}</gmtFormat>
-			<gmtZeroFormat draft="contributed">UTC</gmtZeroFormat>
-			<regionFormat draft="contributed">tempo de {0}</regionFormat>
-			<regionFormat type="daylight" draft="contributed">somera tempo de {0}</regionFormat>
-			<regionFormat type="standard" draft="contributed">norma tempo de {0}</regionFormat>
+			<gmtFormat>UTC{0}</gmtFormat>
+			<gmtZeroFormat>UTC</gmtZeroFormat>
+			<gmtUnknownFormat>UTC+?</gmtUnknownFormat>
+			<regionFormat>tempo: {0}</regionFormat>
+			<regionFormat type="daylight">{0} (somera tempo)</regionFormat>
+			<regionFormat type="standard">{0} (norma tempo)</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
-					<standard draft="unconfirmed">universala tempo kunordigita</standard>
+					<standard>universala tempo kunordigita</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity draft="unconfirmed">nekonata urbo</exemplarCity>
+				<exemplarCity>nekonata loko</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
-				<exemplarCity draft="unconfirmed">Andoro</exemplarCity>
+				<exemplarCity>Andoro</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
-				<exemplarCity draft="unconfirmed">Dubajurbo</exemplarCity>
+				<exemplarCity>Dubajurbo</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
-				<exemplarCity draft="unconfirmed">Kabulo</exemplarCity>
+				<exemplarCity>Kabulo</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
-				<exemplarCity draft="unconfirmed">Antigvo</exemplarCity>
+				<exemplarCity>Antigvo</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity draft="unconfirmed">Angvilo</exemplarCity>
+				<exemplarCity>Angvilo</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
-				<exemplarCity draft="unconfirmed">Tirano</exemplarCity>
+				<exemplarCity>Tirano</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
-				<exemplarCity draft="unconfirmed">Erevano</exemplarCity>
+				<exemplarCity>Erevano</exemplarCity>
 			</zone>
 			<zone type="Africa/Luanda">
-				<exemplarCity draft="unconfirmed">Luando</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="unconfirmed">Showa</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity draft="unconfirmed">Río Gallegos</exemplarCity>
+				<exemplarCity>Luando</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity draft="unconfirmed">Saltaurbo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity draft="unconfirmed">Tucumán</exemplarCity>
+				<exemplarCity>Saltaurbo</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
-				<exemplarCity draft="unconfirmed">Kordobo</exemplarCity>
+				<exemplarCity>Kordobo</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity draft="unconfirmed">Bonaero</exemplarCity>
+				<exemplarCity>Bonaero</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity draft="unconfirmed">Pagopago</exemplarCity>
+				<exemplarCity>Pagopago</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
-				<exemplarCity draft="unconfirmed">Vieno</exemplarCity>
+				<exemplarCity>Vieno</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity draft="unconfirmed">Perto</exemplarCity>
+				<exemplarCity>Perto</exemplarCity>
 			</zone>
 			<zone type="Australia/Darwin">
-				<exemplarCity draft="unconfirmed">Darvino</exemplarCity>
+				<exemplarCity>Darvino</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity draft="unconfirmed">Adelajdo</exemplarCity>
+				<exemplarCity>Adelajdo</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity draft="unconfirmed">Melburno</exemplarCity>
+				<exemplarCity>Melburno</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity draft="unconfirmed">Hobarto</exemplarCity>
+				<exemplarCity>Hobarto</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity draft="unconfirmed">Sidnejo</exemplarCity>
+				<exemplarCity>Sidnejo</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity draft="unconfirmed">Brisbano</exemplarCity>
+				<exemplarCity>Brisbano</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity draft="unconfirmed">Makvora insulo</exemplarCity>
+				<exemplarCity>Makvora insulo</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
-				<exemplarCity draft="unconfirmed">Arubo</exemplarCity>
+				<exemplarCity>Arubo</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
-				<exemplarCity draft="unconfirmed">Bakuo</exemplarCity>
+				<exemplarCity>Bakuo</exemplarCity>
 			</zone>
 			<zone type="America/Barbados">
-				<exemplarCity draft="unconfirmed">Barbado</exemplarCity>
+				<exemplarCity>Barbado</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
-				<exemplarCity draft="unconfirmed">Dako</exemplarCity>
+				<exemplarCity>Dako</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
-				<exemplarCity draft="unconfirmed">Bruselo</exemplarCity>
+				<exemplarCity>Bruselo</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity draft="unconfirmed">Vagaduguo</exemplarCity>
+				<exemplarCity>Vagaduguo</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
-				<exemplarCity draft="unconfirmed">Sofio</exemplarCity>
+				<exemplarCity>Sofio</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity draft="unconfirmed">Barejno</exemplarCity>
+				<exemplarCity>Barejno</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
-				<exemplarCity draft="unconfirmed">Buĵumburo</exemplarCity>
+				<exemplarCity>Buĵumburo</exemplarCity>
 			</zone>
 			<zone type="Africa/Porto-Novo">
-				<exemplarCity draft="unconfirmed">Portonovo</exemplarCity>
+				<exemplarCity>Portonovo</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity draft="unconfirmed">Sankta Bartolomeo</exemplarCity>
+				<exemplarCity>Sankta Bartolomeo</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity draft="unconfirmed">Bermudoj</exemplarCity>
+				<exemplarCity>Bermudoj</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
-				<exemplarCity draft="unconfirmed">Brunejo</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity draft="unconfirmed">Eirunepé</exemplarCity>
+				<exemplarCity>Brunejo</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
-				<exemplarCity draft="unconfirmed">Manaŭso</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity draft="unconfirmed">Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity draft="unconfirmed">Santarém</exemplarCity>
+				<exemplarCity>Manaŭso</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
-				<exemplarCity draft="unconfirmed">Belemo</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity draft="unconfirmed">Araguaína</exemplarCity>
+				<exemplarCity>Belemo</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity draft="unconfirmed">Sanpaŭlo</exemplarCity>
+				<exemplarCity>Sanpaŭlo</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
-				<exemplarCity draft="unconfirmed">Bahio</exemplarCity>
+				<exemplarCity>Bahio</exemplarCity>
 			</zone>
 			<zone type="America/Fortaleza">
-				<exemplarCity draft="unconfirmed">Fortalezo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity draft="unconfirmed">Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity draft="unconfirmed">Fernando de Noronha</exemplarCity>
+				<exemplarCity>Fortalezo</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
-				<exemplarCity draft="unconfirmed">Nasaŭo</exemplarCity>
+				<exemplarCity>Nasaŭo</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity draft="unconfirmed">Timbuo</exemplarCity>
+				<exemplarCity>Timbuo</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
-				<exemplarCity draft="unconfirmed">Gaborono</exemplarCity>
+				<exemplarCity>Gaborono</exemplarCity>
 			</zone>
 			<zone type="Europe/Minsk">
-				<exemplarCity draft="unconfirmed">Minsko</exemplarCity>
+				<exemplarCity>Minsko</exemplarCity>
 			</zone>
 			<zone type="America/Belize">
-				<exemplarCity draft="unconfirmed">Belizo</exemplarCity>
+				<exemplarCity>Belizo</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity draft="unconfirmed">Vankuvero</exemplarCity>
+				<exemplarCity>Vankuvero</exemplarCity>
 			</zone>
 			<zone type="America/Edmonton">
-				<exemplarCity draft="unconfirmed">Edmontono</exemplarCity>
+				<exemplarCity>Edmontono</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity draft="unconfirmed">Kembriĝa Golfo</exemplarCity>
+				<exemplarCity>Kembriĝa Golfo</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
-				<exemplarCity draft="unconfirmed">Vinipego</exemplarCity>
+				<exemplarCity>Vinipego</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
-				<exemplarCity draft="unconfirmed">Ikaluito</exemplarCity>
+				<exemplarCity>Ikaluito</exemplarCity>
 			</zone>
 			<zone type="America/Moncton">
-				<exemplarCity draft="unconfirmed">Monktono</exemplarCity>
+				<exemplarCity>Monktono</exemplarCity>
 			</zone>
 			<zone type="America/Halifax">
-				<exemplarCity draft="unconfirmed">Halifakso</exemplarCity>
+				<exemplarCity>Halifakso</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
-				<exemplarCity draft="unconfirmed">Kokosinsuloj</exemplarCity>
+				<exemplarCity>Kokosinsuloj</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
-				<exemplarCity draft="unconfirmed">Kinŝaso</exemplarCity>
+				<exemplarCity>Kinŝaso</exemplarCity>
 			</zone>
 			<zone type="Africa/Lubumbashi">
-				<exemplarCity draft="unconfirmed">Lubumbaŝo</exemplarCity>
+				<exemplarCity>Lubumbaŝo</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity draft="unconfirmed">Bango</exemplarCity>
+				<exemplarCity>Bango</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity draft="unconfirmed">Brazavilo</exemplarCity>
+				<exemplarCity>Brazavilo</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
-				<exemplarCity draft="unconfirmed">Zuriko</exemplarCity>
+				<exemplarCity>Zuriko</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
-				<exemplarCity draft="unconfirmed">Abiĝano</exemplarCity>
+				<exemplarCity>Abiĝano</exemplarCity>
 			</zone>
 			<zone type="Pacific/Rarotonga">
-				<exemplarCity draft="unconfirmed">Rarotongo</exemplarCity>
+				<exemplarCity>Rarotongo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity draft="unconfirmed">Paskinsulo</exemplarCity>
+				<exemplarCity>Paskinsulo</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
-				<exemplarCity draft="unconfirmed">Dualao</exemplarCity>
+				<exemplarCity>Dualao</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity draft="unconfirmed">Urumĉio</exemplarCity>
+				<exemplarCity>Urumĉio</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity draft="unconfirmed">Ŝanhajo</exemplarCity>
+				<exemplarCity>Ŝanhajo</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
-				<exemplarCity draft="unconfirmed">Bogoto</exemplarCity>
+				<exemplarCity>Bogoto</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity draft="unconfirmed">Kostariko</exemplarCity>
+				<exemplarCity>Kostariko</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
-				<exemplarCity draft="unconfirmed">Havano</exemplarCity>
+				<exemplarCity>Havano</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity draft="unconfirmed">Kaboverdo</exemplarCity>
+				<exemplarCity>Kaboverdo</exemplarCity>
 			</zone>
 			<zone type="America/Curacao">
-				<exemplarCity draft="unconfirmed">Kuracao</exemplarCity>
+				<exemplarCity>Kuracao</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity draft="unconfirmed">Kristnaskinsulo</exemplarCity>
+				<exemplarCity>Kristnaskinsulo</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity draft="unconfirmed">Nikozio</exemplarCity>
+				<exemplarCity>Nikozio</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
-				<exemplarCity draft="unconfirmed">Prago</exemplarCity>
+				<exemplarCity>Prago</exemplarCity>
 			</zone>
 			<zone type="Europe/Busingen">
-				<exemplarCity draft="unconfirmed">Büsingen am Hochrhein</exemplarCity>
+				<exemplarCity>Büsingen am Hochrhein</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
-				<exemplarCity draft="unconfirmed">Berlino</exemplarCity>
+				<exemplarCity>Berlino</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="unconfirmed">Ĝibutio</exemplarCity>
+				<exemplarCity>Ĝibutio</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
-				<exemplarCity draft="unconfirmed">Kopenhago</exemplarCity>
+				<exemplarCity>Kopenhago</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
-				<exemplarCity draft="unconfirmed">Dominiko</exemplarCity>
+				<exemplarCity>Dominiko</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="unconfirmed">Sankta Domingo</exemplarCity>
+				<exemplarCity>Sankta Domingo</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity draft="unconfirmed">Alĝero</exemplarCity>
+				<exemplarCity>Alĝero</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
-				<exemplarCity draft="unconfirmed">Galapagoj</exemplarCity>
+				<exemplarCity>Galapagoj</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
-				<exemplarCity draft="unconfirmed">Talino</exemplarCity>
+				<exemplarCity>Talino</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
-				<exemplarCity draft="unconfirmed">Kairo</exemplarCity>
+				<exemplarCity>Kairo</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
-				<exemplarCity draft="unconfirmed">Ajuno</exemplarCity>
+				<exemplarCity>Ajuno</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
-				<exemplarCity draft="unconfirmed">Asmero</exemplarCity>
+				<exemplarCity>Asmero</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
-				<exemplarCity draft="unconfirmed">Kanarioj</exemplarCity>
+				<exemplarCity>Kanarioj</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity draft="unconfirmed">Ceŭto</exemplarCity>
+				<exemplarCity>Ceŭto</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
-				<exemplarCity draft="unconfirmed">Madrido</exemplarCity>
+				<exemplarCity>Madrido</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity draft="unconfirmed">Adisabebo</exemplarCity>
+				<exemplarCity>Adisabebo</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity draft="unconfirmed">Helsinko</exemplarCity>
+				<exemplarCity>Helsinko</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity draft="unconfirmed">Fiĝio</exemplarCity>
+				<exemplarCity>Fiĝio</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="unconfirmed">Stanlejo</exemplarCity>
+				<exemplarCity>Stanlejo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity draft="unconfirmed">Ĉuuk</exemplarCity>
+				<exemplarCity>Ĉuuk</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
-				<exemplarCity draft="unconfirmed">Ponape</exemplarCity>
+				<exemplarCity>Ponape</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity draft="unconfirmed">Ferooj</exemplarCity>
+				<exemplarCity>Ferooj</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
-				<exemplarCity draft="unconfirmed">Parizo</exemplarCity>
+				<exemplarCity>Parizo</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity draft="unconfirmed">Librevilo</exemplarCity>
+				<exemplarCity>Librevilo</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="unconfirmed">brita somera tempo</daylight>
+					<daylight>brita somera tempo</daylight>
 				</long>
-				<exemplarCity draft="unconfirmed">Londono</exemplarCity>
+				<exemplarCity>Londono</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity draft="unconfirmed">Grenado</exemplarCity>
+				<exemplarCity>Grenado</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
-				<exemplarCity draft="unconfirmed">Tbiliso</exemplarCity>
+				<exemplarCity>Tbiliso</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
-				<exemplarCity draft="unconfirmed">Kajeno</exemplarCity>
+				<exemplarCity>Kajeno</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity draft="unconfirmed">Gernezejo</exemplarCity>
+				<exemplarCity>Gernezejo</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
-				<exemplarCity draft="unconfirmed">Akrao</exemplarCity>
+				<exemplarCity>Akrao</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
-				<exemplarCity draft="unconfirmed">Ĝibraltaro</exemplarCity>
+				<exemplarCity>Ĝibraltaro</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity draft="unconfirmed">Qaanaaq</exemplarCity>
+				<exemplarCity>Qaanaaq</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
-				<exemplarCity draft="unconfirmed">Nuko</exemplarCity>
+				<exemplarCity>Nuko</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
-				<exemplarCity draft="unconfirmed">Banjulo</exemplarCity>
+				<exemplarCity>Banjulo</exemplarCity>
 			</zone>
 			<zone type="Africa/Conakry">
-				<exemplarCity draft="unconfirmed">Konakrio</exemplarCity>
+				<exemplarCity>Konakrio</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="unconfirmed">Gvadelupo</exemplarCity>
+				<exemplarCity>Gvadelupo</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
-				<exemplarCity draft="unconfirmed">Ateno</exemplarCity>
+				<exemplarCity>Ateno</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity draft="unconfirmed">Sud-Georgio</exemplarCity>
+				<exemplarCity>Sud-Georgio</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
-				<exemplarCity draft="unconfirmed">Gvatemalo</exemplarCity>
+				<exemplarCity>Gvatemalo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guam">
-				<exemplarCity draft="unconfirmed">Gvamo</exemplarCity>
+				<exemplarCity>Gvamo</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
-				<exemplarCity draft="unconfirmed">Bisaŭo</exemplarCity>
+				<exemplarCity>Bisaŭo</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="unconfirmed">Gujano</exemplarCity>
+				<exemplarCity>Gujano</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
-				<exemplarCity draft="unconfirmed">Honkongo</exemplarCity>
+				<exemplarCity>Honkongo</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity draft="unconfirmed">Tegucigalpo</exemplarCity>
+				<exemplarCity>Tegucigalpo</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity draft="unconfirmed">Zagrebo</exemplarCity>
+				<exemplarCity>Zagrebo</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity draft="unconfirmed">Portoprinco</exemplarCity>
+				<exemplarCity>Portoprinco</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
-				<exemplarCity draft="unconfirmed">Budapeŝto</exemplarCity>
+				<exemplarCity>Budapeŝto</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity draft="unconfirmed">Ĝakarto</exemplarCity>
+				<exemplarCity>Ĝakarto</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="unconfirmed">irlanda norma tempo</daylight>
+					<daylight>irlanda norma tempo</daylight>
 				</long>
-				<exemplarCity draft="unconfirmed">Dublino</exemplarCity>
+				<exemplarCity>Dublino</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
-				<exemplarCity draft="unconfirmed">Jerusalemo</exemplarCity>
+				<exemplarCity>Jerusalemo</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="unconfirmed">Mankinsulo</exemplarCity>
+				<exemplarCity>Manksinsulo</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
-				<exemplarCity draft="unconfirmed">Kolkato</exemplarCity>
+				<exemplarCity>Kolkato</exemplarCity>
 			</zone>
 			<zone type="Indian/Chagos">
-				<exemplarCity draft="unconfirmed">Ĉagosoj</exemplarCity>
+				<exemplarCity>Ĉagosoj</exemplarCity>
 			</zone>
 			<zone type="Asia/Baghdad">
-				<exemplarCity draft="unconfirmed">Bagdado</exemplarCity>
+				<exemplarCity>Bagdado</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
-				<exemplarCity draft="unconfirmed">Teherano</exemplarCity>
+				<exemplarCity>Teherano</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity draft="unconfirmed">Rejkjaviko</exemplarCity>
+				<exemplarCity>Rejkjaviko</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
-				<exemplarCity draft="unconfirmed">Romo</exemplarCity>
+				<exemplarCity>Romo</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
-				<exemplarCity draft="unconfirmed">Ĵerzejo</exemplarCity>
+				<exemplarCity>Ĵerzejo</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
-				<exemplarCity draft="unconfirmed">Jamajko</exemplarCity>
+				<exemplarCity>Jamajko</exemplarCity>
 			</zone>
 			<zone type="Asia/Amman">
-				<exemplarCity draft="unconfirmed">Amano</exemplarCity>
+				<exemplarCity>Amano</exemplarCity>
 			</zone>
 			<zone type="Asia/Tokyo">
-				<exemplarCity draft="unconfirmed">Tokio</exemplarCity>
+				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity draft="unconfirmed">Najrobio</exemplarCity>
+				<exemplarCity>Najrobio</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
-				<exemplarCity draft="unconfirmed">Biŝkeko</exemplarCity>
+				<exemplarCity>Biŝkeko</exemplarCity>
 			</zone>
 			<zone type="Asia/Phnom_Penh">
-				<exemplarCity draft="unconfirmed">Pnompeno</exemplarCity>
+				<exemplarCity>Pnompeno</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Kanton-insulo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
-				<exemplarCity draft="unconfirmed">Taravo</exemplarCity>
+				<exemplarCity>Taravo</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity draft="unconfirmed">Komoroj</exemplarCity>
+				<exemplarCity>Komoroj</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity draft="unconfirmed">Sankta Kristoforo</exemplarCity>
+				<exemplarCity>Sankta Kristoforo</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
-				<exemplarCity draft="unconfirmed">Pjongjango</exemplarCity>
+				<exemplarCity>Pjongjango</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity draft="unconfirmed">Seulo</exemplarCity>
+				<exemplarCity>Seulo</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
-				<exemplarCity draft="unconfirmed">Kuvajto</exemplarCity>
+				<exemplarCity>Kuvajto</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity draft="unconfirmed">Kajmanoj</exemplarCity>
+				<exemplarCity>Kajmanoj</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
-				<exemplarCity draft="unconfirmed">Aktau</exemplarCity>
+				<exemplarCity>Aktau</exemplarCity>
 			</zone>
 			<zone type="Asia/Oral">
-				<exemplarCity draft="unconfirmed">Oralo</exemplarCity>
+				<exemplarCity>Oralo</exemplarCity>
 			</zone>
 			<zone type="Asia/Atyrau">
-				<exemplarCity draft="unconfirmed">Atirau</exemplarCity>
+				<exemplarCity>Atirau</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
-				<exemplarCity draft="unconfirmed">Aktobe</exemplarCity>
+				<exemplarCity>Aktobe</exemplarCity>
 			</zone>
 			<zone type="Asia/Qostanay">
-				<exemplarCity draft="unconfirmed">Kostanaj</exemplarCity>
+				<exemplarCity>Kostanaj</exemplarCity>
 			</zone>
 			<zone type="Asia/Qyzylorda">
-				<exemplarCity draft="unconfirmed">Kizilordo</exemplarCity>
+				<exemplarCity>Kizilordo</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
-				<exemplarCity draft="unconfirmed">Almato</exemplarCity>
+				<exemplarCity>Almato</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity draft="unconfirmed">Vjentiano</exemplarCity>
+				<exemplarCity>Vjentiano</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
-				<exemplarCity draft="unconfirmed">Bejruto</exemplarCity>
+				<exemplarCity>Bejruto</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity draft="unconfirmed">Sankta Lucio</exemplarCity>
+				<exemplarCity>Sankta Lucio</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity draft="unconfirmed">Vaduzo</exemplarCity>
+				<exemplarCity>Vaduzo</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity draft="unconfirmed">Kolombo</exemplarCity>
+				<exemplarCity>Kolombo</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity draft="unconfirmed">Monrovio</exemplarCity>
+				<exemplarCity>Monrovio</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
-				<exemplarCity draft="unconfirmed">Maseruo</exemplarCity>
+				<exemplarCity>Maseruo</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity draft="unconfirmed">Vilno</exemplarCity>
+				<exemplarCity>Vilno</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
-				<exemplarCity draft="unconfirmed">Luksemburgo</exemplarCity>
+				<exemplarCity>Luksemburgo</exemplarCity>
 			</zone>
 			<zone type="Europe/Riga">
-				<exemplarCity draft="unconfirmed">Rigo</exemplarCity>
+				<exemplarCity>Rigo</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
-				<exemplarCity draft="unconfirmed">Tripolo</exemplarCity>
+				<exemplarCity>Tripolo</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity draft="unconfirmed">Kazablanko</exemplarCity>
+				<exemplarCity>Kazablanko</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
-				<exemplarCity draft="unconfirmed">Monako</exemplarCity>
+				<exemplarCity>Monako</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
-				<exemplarCity draft="unconfirmed">Kiŝinevo</exemplarCity>
+				<exemplarCity>Kiŝinevo</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity draft="unconfirmed">Podgorico</exemplarCity>
+				<exemplarCity>Podgorico</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity draft="unconfirmed">Marigoto</exemplarCity>
+				<exemplarCity>Marigoto</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity draft="unconfirmed">Skopjo</exemplarCity>
+				<exemplarCity>Skopjo</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity draft="unconfirmed">Ranguno</exemplarCity>
+				<exemplarCity>Ranguno</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity draft="unconfirmed">Ĥovd</exemplarCity>
+				<exemplarCity>Ĥovd</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity draft="unconfirmed">Ulanbatoro</exemplarCity>
+				<exemplarCity>Ulanbatoro</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
-				<exemplarCity draft="unconfirmed">Makao</exemplarCity>
+				<exemplarCity>Makao</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity draft="unconfirmed">Saipano</exemplarCity>
+				<exemplarCity>Saipano</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity draft="unconfirmed">Martiniko</exemplarCity>
+				<exemplarCity>Martiniko</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity draft="unconfirmed">Nuakŝoto</exemplarCity>
+				<exemplarCity>Nuakŝoto</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="unconfirmed">Moncerato</exemplarCity>
+				<exemplarCity>Moncerato</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="unconfirmed">Malto</exemplarCity>
+				<exemplarCity>Malto</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity draft="unconfirmed">Maŭricio</exemplarCity>
+				<exemplarCity>Maŭricio</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity draft="unconfirmed">Maldivoj</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity draft="unconfirmed">Mazatlán</exemplarCity>
+				<exemplarCity>Maldivoj</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
-				<exemplarCity draft="unconfirmed">Monterejo</exemplarCity>
+				<exemplarCity>Monterejo</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity draft="unconfirmed">Meksikurbo</exemplarCity>
+				<exemplarCity>Meksikurbo</exemplarCity>
 			</zone>
 			<zone type="America/Merida">
-				<exemplarCity draft="unconfirmed">Merido</exemplarCity>
+				<exemplarCity>Merido</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
-				<exemplarCity draft="unconfirmed">Kankuno</exemplarCity>
+				<exemplarCity>Kankuno</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity draft="unconfirmed">Kualalumpuro</exemplarCity>
+				<exemplarCity>Kualalumpuro</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
-				<exemplarCity draft="unconfirmed">Vindhuko</exemplarCity>
+				<exemplarCity>Vindhuko</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
-				<exemplarCity draft="unconfirmed">Numeo</exemplarCity>
+				<exemplarCity>Numeo</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
-				<exemplarCity draft="unconfirmed">Niamejo</exemplarCity>
+				<exemplarCity>Niamejo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity draft="unconfirmed">Norfolkinsulo</exemplarCity>
+				<exemplarCity>Norfolkinsulo</exemplarCity>
 			</zone>
 			<zone type="Africa/Lagos">
-				<exemplarCity draft="unconfirmed">Lagoso</exemplarCity>
+				<exemplarCity>Lagoso</exemplarCity>
 			</zone>
 			<zone type="America/Managua">
-				<exemplarCity draft="unconfirmed">Managvo</exemplarCity>
+				<exemplarCity>Managvo</exemplarCity>
 			</zone>
 			<zone type="Europe/Amsterdam">
-				<exemplarCity draft="unconfirmed">Amsterdamo</exemplarCity>
+				<exemplarCity>Amsterdamo</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity draft="unconfirmed">Katmanduo</exemplarCity>
+				<exemplarCity>Katmanduo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
-				<exemplarCity draft="unconfirmed">Nauro</exemplarCity>
+				<exemplarCity>Nauro</exemplarCity>
 			</zone>
 			<zone type="Pacific/Niue">
-				<exemplarCity draft="unconfirmed">Niuo</exemplarCity>
+				<exemplarCity>Niuo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity draft="unconfirmed">Ĉathamo</exemplarCity>
+				<exemplarCity>Ĉathamo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity draft="unconfirmed">Aŭklando</exemplarCity>
+				<exemplarCity>Aŭklando</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity draft="unconfirmed">Maskato</exemplarCity>
+				<exemplarCity>Maskato</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
-				<exemplarCity draft="unconfirmed">Panamo</exemplarCity>
+				<exemplarCity>Panamo</exemplarCity>
 			</zone>
 			<zone type="America/Lima">
-				<exemplarCity draft="unconfirmed">Limo</exemplarCity>
+				<exemplarCity>Limo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity draft="unconfirmed">Tahitio</exemplarCity>
+				<exemplarCity>Tahitio</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity draft="unconfirmed">Markizinsuloj</exemplarCity>
+				<exemplarCity>Markizinsuloj</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
-				<exemplarCity draft="unconfirmed">Manilo</exemplarCity>
+				<exemplarCity>Manilo</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
-				<exemplarCity draft="unconfirmed">Karaĉio</exemplarCity>
+				<exemplarCity>Karaĉio</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
-				<exemplarCity draft="unconfirmed">Varsovio</exemplarCity>
+				<exemplarCity>Varsovio</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity draft="unconfirmed">Mikelono</exemplarCity>
+				<exemplarCity>Mikelono</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity draft="unconfirmed">Pitkarna Insulo</exemplarCity>
+				<exemplarCity>Pitkarna Insulo</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity draft="unconfirmed">Puertoriko</exemplarCity>
+				<exemplarCity>Puertoriko</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity draft="unconfirmed">Gazao</exemplarCity>
+				<exemplarCity>Gazao</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity draft="unconfirmed">Hebrono</exemplarCity>
+				<exemplarCity>Hebrono</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
-				<exemplarCity draft="unconfirmed">Acoroj</exemplarCity>
+				<exemplarCity>Acoroj</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Madeira">
-				<exemplarCity draft="unconfirmed">Madejro</exemplarCity>
+				<exemplarCity>Madejro</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
-				<exemplarCity draft="unconfirmed">Lisbono</exemplarCity>
+				<exemplarCity>Lisbono</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
-				<exemplarCity draft="unconfirmed">Palaŭo</exemplarCity>
+				<exemplarCity>Palaŭo</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity draft="unconfirmed">Asunciono</exemplarCity>
+				<exemplarCity>Asunciono</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
-				<exemplarCity draft="unconfirmed">Kataro</exemplarCity>
+				<exemplarCity>Kataro</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity draft="unconfirmed">Reunio</exemplarCity>
+				<exemplarCity>Reunio</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
-				<exemplarCity draft="unconfirmed">Bukareŝto</exemplarCity>
+				<exemplarCity>Bukareŝto</exemplarCity>
 			</zone>
 			<zone type="Europe/Belgrade">
-				<exemplarCity draft="unconfirmed">Beogrado</exemplarCity>
+				<exemplarCity>Beogrado</exemplarCity>
 			</zone>
 			<zone type="Europe/Kaliningrad">
-				<exemplarCity draft="unconfirmed">Kaliningrado</exemplarCity>
+				<exemplarCity>Kaliningrado</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
-				<exemplarCity draft="unconfirmed">Moskvo</exemplarCity>
+				<exemplarCity>Moskvo</exemplarCity>
 			</zone>
 			<zone type="Europe/Volgograd">
-				<exemplarCity draft="unconfirmed">Volgogrado</exemplarCity>
+				<exemplarCity>Volgogrado</exemplarCity>
 			</zone>
 			<zone type="Europe/Astrakhan">
-				<exemplarCity draft="unconfirmed">Astraĥano</exemplarCity>
+				<exemplarCity>Astraĥano</exemplarCity>
 			</zone>
 			<zone type="Europe/Ulyanovsk">
-				<exemplarCity draft="unconfirmed">Uljanovsko</exemplarCity>
+				<exemplarCity>Uljanovsko</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
-				<exemplarCity draft="unconfirmed">Jekaterinburgo</exemplarCity>
+				<exemplarCity>Jekaterinburgo</exemplarCity>
 			</zone>
 			<zone type="Asia/Omsk">
-				<exemplarCity draft="unconfirmed">Omsko</exemplarCity>
+				<exemplarCity>Omsko</exemplarCity>
 			</zone>
 			<zone type="Asia/Novosibirsk">
-				<exemplarCity draft="unconfirmed">Novosibirsko</exemplarCity>
+				<exemplarCity>Novosibirsko</exemplarCity>
 			</zone>
 			<zone type="Asia/Novokuznetsk">
-				<exemplarCity draft="unconfirmed">Novokuznecko</exemplarCity>
+				<exemplarCity>Novokuznecko</exemplarCity>
 			</zone>
 			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity draft="unconfirmed">Krasnojarsko</exemplarCity>
+				<exemplarCity>Krasnojarsko</exemplarCity>
 			</zone>
 			<zone type="Asia/Irkutsk">
-				<exemplarCity draft="unconfirmed">Irkutsko</exemplarCity>
+				<exemplarCity>Irkutsko</exemplarCity>
 			</zone>
 			<zone type="Asia/Chita">
-				<exemplarCity draft="unconfirmed">Ĉita</exemplarCity>
+				<exemplarCity>Ĉita</exemplarCity>
 			</zone>
 			<zone type="Asia/Yakutsk">
-				<exemplarCity draft="unconfirmed">Jakutsko</exemplarCity>
+				<exemplarCity>Jakutsko</exemplarCity>
 			</zone>
 			<zone type="Asia/Vladivostok">
-				<exemplarCity draft="unconfirmed">Vladivostoko</exemplarCity>
+				<exemplarCity>Vladivostoko</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
-				<exemplarCity draft="unconfirmed">Ĥandiga</exemplarCity>
+				<exemplarCity>Ĥandiga</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
-				<exemplarCity draft="unconfirmed">Saĥaleno</exemplarCity>
+				<exemplarCity>Saĥaleno</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
-				<exemplarCity draft="unconfirmed">Ustnero</exemplarCity>
+				<exemplarCity>Ustnero</exemplarCity>
 			</zone>
 			<zone type="Asia/Srednekolymsk">
-				<exemplarCity draft="unconfirmed">Srednekolimsk</exemplarCity>
+				<exemplarCity>Srednekolimsk</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
-				<exemplarCity draft="unconfirmed">Kamĉatko</exemplarCity>
+				<exemplarCity>Kamĉatko</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
-				<exemplarCity draft="unconfirmed">Anadir</exemplarCity>
+				<exemplarCity>Anadir</exemplarCity>
 			</zone>
 			<zone type="Africa/Kigali">
-				<exemplarCity draft="unconfirmed">Kigalo</exemplarCity>
+				<exemplarCity>Kigalo</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity draft="unconfirmed">Riado</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity draft="unconfirmed">Mahé</exemplarCity>
+				<exemplarCity>Riado</exemplarCity>
 			</zone>
 			<zone type="Africa/Khartoum">
-				<exemplarCity draft="unconfirmed">Ĥartumo</exemplarCity>
+				<exemplarCity>Ĥartumo</exemplarCity>
 			</zone>
 			<zone type="Europe/Stockholm">
-				<exemplarCity draft="unconfirmed">Stokholmo</exemplarCity>
+				<exemplarCity>Stokholmo</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity draft="unconfirmed">Singapuro</exemplarCity>
+				<exemplarCity>Singapuro</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity draft="unconfirmed">Sankta Heleno</exemplarCity>
+				<exemplarCity>Sankta Heleno</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity draft="unconfirmed">Ljubljano</exemplarCity>
+				<exemplarCity>Ljubljano</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="unconfirmed">Longjerurbo</exemplarCity>
+				<exemplarCity>Longjerurbo</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
-				<exemplarCity draft="unconfirmed">Bratislavo</exemplarCity>
+				<exemplarCity>Bratislavo</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity draft="unconfirmed">Fritaŭno</exemplarCity>
+				<exemplarCity>Fritaŭno</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity draft="unconfirmed">Sanmarino</exemplarCity>
+				<exemplarCity>Sanmarino</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
-				<exemplarCity draft="unconfirmed">Dakaro</exemplarCity>
+				<exemplarCity>Dakaro</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity draft="unconfirmed">Mogadiŝo</exemplarCity>
+				<exemplarCity>Mogadiŝo</exemplarCity>
 			</zone>
 			<zone type="Africa/Juba">
-				<exemplarCity draft="unconfirmed">Ĝubao</exemplarCity>
+				<exemplarCity>Ĝubao</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity draft="unconfirmed">Santomeo</exemplarCity>
+				<exemplarCity>Santomeo</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
-				<exemplarCity draft="unconfirmed">Salvadoro</exemplarCity>
+				<exemplarCity>Salvadoro</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
-				<exemplarCity draft="unconfirmed">Damasko</exemplarCity>
+				<exemplarCity>Damasko</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity draft="unconfirmed">Mbabano</exemplarCity>
+				<exemplarCity>Mbabano</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
-				<exemplarCity draft="unconfirmed">Granda Turko</exemplarCity>
+				<exemplarCity>Granda Turko</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
-				<exemplarCity draft="unconfirmed">Niĝameno</exemplarCity>
+				<exemplarCity>Niĝameno</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
-				<exemplarCity draft="unconfirmed">Kergelenoj</exemplarCity>
+				<exemplarCity>Kergelenoj</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
-				<exemplarCity draft="unconfirmed">Lomeo</exemplarCity>
+				<exemplarCity>Lomeo</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
-				<exemplarCity draft="unconfirmed">Bankoko</exemplarCity>
+				<exemplarCity>Bankoko</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
-				<exemplarCity draft="unconfirmed">Duŝanbeo</exemplarCity>
+				<exemplarCity>Duŝanbeo</exemplarCity>
 			</zone>
 			<zone type="Asia/Dili">
-				<exemplarCity draft="unconfirmed">Dilo</exemplarCity>
+				<exemplarCity>Dilo</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
-				<exemplarCity draft="unconfirmed">Aŝĥabado</exemplarCity>
+				<exemplarCity>Aŝĥabado</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity draft="unconfirmed">Tunizo</exemplarCity>
+				<exemplarCity>Tunizo</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity draft="unconfirmed">Istanbulo</exemplarCity>
+				<exemplarCity>Istanbulo</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="unconfirmed">Portospeno</exemplarCity>
+				<exemplarCity>Portospeno</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
-				<exemplarCity draft="unconfirmed">Funafutio</exemplarCity>
+				<exemplarCity>Funafutio</exemplarCity>
 			</zone>
 			<zone type="Asia/Taipei">
-				<exemplarCity draft="unconfirmed">Tajpeo</exemplarCity>
+				<exemplarCity>Tajpeo</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity draft="unconfirmed">Daresalamo</exemplarCity>
+				<exemplarCity>Daresalamo</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity draft="unconfirmed">Kievo</exemplarCity>
+				<exemplarCity>Kievo</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
-				<exemplarCity draft="unconfirmed">Simferopolo</exemplarCity>
+				<exemplarCity>Simferopolo</exemplarCity>
 			</zone>
 			<zone type="Africa/Kampala">
-				<exemplarCity draft="unconfirmed">Kampalo</exemplarCity>
+				<exemplarCity>Kampalo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Midway">
-				<exemplarCity draft="unconfirmed">Midvejinsuloj</exemplarCity>
+				<exemplarCity>Midvejinsuloj</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity draft="unconfirmed">Vejkinsulo</exemplarCity>
+				<exemplarCity>Vejkinsulo</exemplarCity>
 			</zone>
 			<zone type="America/Los_Angeles">
-				<exemplarCity draft="unconfirmed">Losanĝeleso</exemplarCity>
+				<exemplarCity>Losanĝeleso</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
-				<exemplarCity draft="unconfirmed">Fenikso</exemplarCity>
+				<exemplarCity>Fenikso</exemplarCity>
 			</zone>
 			<zone type="America/Denver">
-				<exemplarCity draft="unconfirmed">Denvero</exemplarCity>
+				<exemplarCity>Denvero</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity draft="unconfirmed">Beulah, Norda Dakoto</exemplarCity>
+				<exemplarCity>Beulah, Norda Dakoto</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="unconfirmed">New Salem, Norda Dakoto</exemplarCity>
+				<exemplarCity>New Salem, Norda Dakoto</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity draft="unconfirmed">Center, Norda Dakoto</exemplarCity>
+				<exemplarCity>Center, Norda Dakoto</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
-				<exemplarCity draft="unconfirmed">Ĉikago</exemplarCity>
+				<exemplarCity>Ĉikago</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
-				<exemplarCity draft="unconfirmed">Vincennes, Indianao</exemplarCity>
+				<exemplarCity>Vincennes, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
-				<exemplarCity draft="unconfirmed">Petersburg, Indianao</exemplarCity>
+				<exemplarCity>Petersburg, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
-				<exemplarCity draft="unconfirmed">Tell City, Indianao</exemplarCity>
+				<exemplarCity>Tell City, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Knox">
-				<exemplarCity draft="unconfirmed">Knox, Indianao</exemplarCity>
+				<exemplarCity>Knox, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Winamac">
-				<exemplarCity draft="unconfirmed">Winamac, Indianao</exemplarCity>
+				<exemplarCity>Winamac, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Marengo">
-				<exemplarCity draft="unconfirmed">Marengo, Indianao</exemplarCity>
+				<exemplarCity>Marengo, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indianapolis">
-				<exemplarCity draft="unconfirmed">Indianapolo, Indianao</exemplarCity>
+				<exemplarCity>Indianapolo, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
-				<exemplarCity draft="unconfirmed">Vevay, Indianao</exemplarCity>
+				<exemplarCity>Vevay, Indianao</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
-				<exemplarCity draft="unconfirmed">Monticello, Kentukio</exemplarCity>
+				<exemplarCity>Monticello, Kentukio</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity draft="unconfirmed">Detrojto</exemplarCity>
+				<exemplarCity>Detrojto</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity draft="unconfirmed">Novjorko</exemplarCity>
+				<exemplarCity>Nov-Jorko</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="unconfirmed">Samarkando</exemplarCity>
+				<exemplarCity>Samarkando</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
-				<exemplarCity draft="unconfirmed">Taŝkento</exemplarCity>
+				<exemplarCity>Taŝkento</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
-				<exemplarCity draft="unconfirmed">Vatikano</exemplarCity>
+				<exemplarCity>Vatikano</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity draft="unconfirmed">Sankta Vincento</exemplarCity>
+				<exemplarCity>Sankta Vincento</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
-				<exemplarCity draft="unconfirmed">Karakaso</exemplarCity>
+				<exemplarCity>Karakaso</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity draft="unconfirmed">Sankta Tomaso</exemplarCity>
+				<exemplarCity>Sankta Tomaso</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity draft="unconfirmed">Hoĉimino</exemplarCity>
+				<exemplarCity>Hoĉimino</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity draft="unconfirmed">Valiso</exemplarCity>
+				<exemplarCity>Valiso</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
-				<exemplarCity draft="unconfirmed">Apio</exemplarCity>
+				<exemplarCity>Apio</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity draft="unconfirmed">Adeno</exemplarCity>
+				<exemplarCity>Adeno</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity draft="unconfirmed">Majoto</exemplarCity>
+				<exemplarCity>Majoto</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity draft="unconfirmed">Johanesburgo</exemplarCity>
+				<exemplarCity>Johanesburgo</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
-				<exemplarCity draft="unconfirmed">Lusako</exemplarCity>
+				<exemplarCity>Lusako</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity draft="unconfirmed">Harareo</exemplarCity>
+				<exemplarCity>Harareo</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard draft="unconfirmed">afgana tempo</standard>
+					<standard>afgana tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard draft="unconfirmed">centrafrika tempo</standard>
+					<standard>centrafrika tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard draft="unconfirmed">orientafrika tempo</standard>
+					<standard>orientafrika tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard draft="unconfirmed">sudafrika tempo</standard>
+					<standard>sudafrika tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">okcidentafrika tempo</generic>
-					<standard draft="unconfirmed">okcidentafrika norma tempo</standard>
-					<daylight draft="unconfirmed">okcidentafrika somera tempo</daylight>
+					<standard>okcidentafrika tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="unconfirmed">alaska tempo</generic>
-					<standard draft="unconfirmed">alaska norma tempo</standard>
-					<daylight draft="unconfirmed">alaska somera tempo</daylight>
+					<generic>alaska tempo</generic>
+					<standard>alaska norma tempo</standard>
+					<daylight>alaska somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic draft="unconfirmed">amazonia tempo</generic>
-					<standard draft="unconfirmed">amazonia norma tempo</standard>
-					<daylight draft="unconfirmed">amazonia somera tempo</daylight>
+					<generic>amazona tempo</generic>
+					<standard>amazona norma tempo</standard>
+					<daylight>amazona somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic draft="unconfirmed">centra nordamerika tempo</generic>
-					<standard draft="unconfirmed">centra nordamerika norma tempo</standard>
-					<daylight draft="unconfirmed">centra nordamerika somera tempo</daylight>
+					<generic>centra nordamerika tempo</generic>
+					<standard>centra nordamerika norma tempo</standard>
+					<daylight>centra nordamerika somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic draft="unconfirmed">orienta nordamerika tempo</generic>
-					<standard draft="unconfirmed">orienta nordamerika norma tempo</standard>
-					<daylight draft="unconfirmed">orienta nordamerika somera tempo</daylight>
+					<generic>orienta nordamerika tempo</generic>
+					<standard>orienta nordamerika norma tempo</standard>
+					<daylight>orienta nordamerika somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic draft="unconfirmed">montara nordamerika tempo</generic>
-					<standard draft="unconfirmed">montara nordamerika norma tempo</standard>
-					<daylight draft="unconfirmed">montara nordamerika somera tempo</daylight>
+					<generic>montara nordamerika tempo</generic>
+					<standard>montara nordamerika norma tempo</standard>
+					<daylight>montara nordamerika somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic draft="unconfirmed">pacifika nordamerika tempo</generic>
-					<standard draft="unconfirmed">pacifika nordamerika norma tempo</standard>
-					<daylight draft="unconfirmed">pacifika nordamerika somera tempo</daylight>
+					<generic>pacifika nordamerika tempo</generic>
+					<standard>pacifika nordamerika norma tempo</standard>
+					<daylight>pacifika nordamerika somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="unconfirmed">tempo: Apio</generic>
-					<standard draft="unconfirmed">Apio (norma tempo)</standard>
-					<daylight draft="unconfirmed">Apio (somera tempo)</daylight>
+					<generic>samoa tempo</generic>
+					<standard>samoa norma tempo</standard>
+					<daylight>samoa somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="unconfirmed">araba tempo</generic>
-					<standard draft="unconfirmed">araba norma tempo</standard>
-					<daylight draft="unconfirmed">araba somera tempo</daylight>
+					<generic>araba tempo</generic>
+					<standard>araba norma tempo</standard>
+					<daylight>araba somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic draft="unconfirmed">argentina tempo</generic>
-					<standard draft="unconfirmed">argentina norma tempo</standard>
-					<daylight draft="unconfirmed">argentina somera tempo</daylight>
+					<generic>argentina tempo</generic>
+					<standard>argentina norma tempo</standard>
+					<daylight>argentina somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic draft="unconfirmed">okcident-argentina tempo</generic>
-					<standard draft="unconfirmed">okcident-argentina norma tempo</standard>
-					<daylight draft="unconfirmed">okcident-argentina somera tempo</daylight>
+					<generic>okcident-argentina tempo</generic>
+					<standard>okcident-argentina norma tempo</standard>
+					<daylight>okcident-argentina somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic draft="unconfirmed">armena tempo</generic>
-					<standard draft="unconfirmed">armena norma tempo</standard>
-					<daylight draft="unconfirmed">armena somera tempo</daylight>
+					<generic>armena tempo</generic>
+					<standard>armena norma tempo</standard>
+					<daylight>armena somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic draft="unconfirmed">atlantika nordamerika tempo</generic>
-					<standard draft="unconfirmed">atlantika nordamerika norma tempo</standard>
-					<daylight draft="unconfirmed">atlantika nordamerika somera tempo</daylight>
+					<generic>atlantika nordamerika tempo</generic>
+					<standard>atlantika nordamerika norma tempo</standard>
+					<daylight>atlantika nordamerika somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic draft="unconfirmed">centra aŭstralia tempo</generic>
-					<standard draft="unconfirmed">centra aŭstralia norma tempo</standard>
-					<daylight draft="unconfirmed">centra aŭstralia somera tempo</daylight>
+					<generic>centra aŭstralia tempo</generic>
+					<standard>centra aŭstralia norma tempo</standard>
+					<daylight>centra aŭstralia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic draft="unconfirmed">centrokcidenta aŭstralia tempo</generic>
-					<standard draft="unconfirmed">centrokcidenta aŭstralia norma tempo</standard>
-					<daylight draft="unconfirmed">centrokcidenta aŭstralia somera tempo</daylight>
+					<generic>centrokcidenta aŭstralia tempo</generic>
+					<standard>centrokcidenta aŭstralia norma tempo</standard>
+					<daylight>centrokcidenta aŭstralia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic draft="unconfirmed">orienta aŭstralia tempo</generic>
-					<standard draft="unconfirmed">orienta aŭstralia norma tempo</standard>
-					<daylight draft="unconfirmed">orienta aŭstralia somera tempo</daylight>
+					<generic>orienta aŭstralia tempo</generic>
+					<standard>orienta aŭstralia norma tempo</standard>
+					<daylight>orienta aŭstralia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic draft="unconfirmed">okcidenta aŭstralia tempo</generic>
-					<standard draft="unconfirmed">okcidenta aŭstralia norma tempo</standard>
-					<daylight draft="unconfirmed">okcidenta aŭstralia somera tempo</daylight>
+					<generic>okcidenta aŭstralia tempo</generic>
+					<standard>okcidenta aŭstralia norma tempo</standard>
+					<daylight>okcidenta aŭstralia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic draft="unconfirmed">azerbajĝana tempo</generic>
-					<standard draft="unconfirmed">azerbajĝana norma tempo</standard>
-					<daylight draft="unconfirmed">azerbajĝana somera tempo</daylight>
+					<generic>azerbajĝana tempo</generic>
+					<standard>azerbajĝana norma tempo</standard>
+					<daylight>azerbajĝana somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic draft="unconfirmed">tempo: Acoroj</generic>
-					<standard draft="unconfirmed">Acoroj (norma tempo)</standard>
-					<daylight draft="unconfirmed">Acoroj (somera tempo)</daylight>
+					<generic>tempo: Acoroj</generic>
+					<standard>Acoroj (norma tempo)</standard>
+					<daylight>Acoroj (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic draft="unconfirmed">bangladeŝa tempo</generic>
-					<standard draft="unconfirmed">bangladeŝa norma tempo</standard>
-					<daylight draft="unconfirmed">bangladeŝa somera tempo</daylight>
+					<generic>bangladeŝa tempo</generic>
+					<standard>bangladeŝa norma tempo</standard>
+					<daylight>bangladeŝa somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard draft="unconfirmed">butana tempo</standard>
+					<standard>butana tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard draft="unconfirmed">bolivia tempo</standard>
+					<standard>bolivia tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic draft="unconfirmed">brazilja tempo</generic>
-					<standard draft="unconfirmed">brazilja norma tempo</standard>
-					<daylight draft="unconfirmed">brazilja somera tempo</daylight>
+					<generic>brazilja tempo</generic>
+					<standard>brazilja norma tempo</standard>
+					<daylight>brazilja somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard draft="unconfirmed">bruneja tempo</standard>
+					<standard>bruneja tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic draft="unconfirmed">kaboverda tempo</generic>
-					<standard draft="unconfirmed">kaboverda norma tempo</standard>
-					<daylight draft="unconfirmed">kaboverda somera tempo</daylight>
+					<generic>kaboverda tempo</generic>
+					<standard>kaboverda norma tempo</standard>
+					<daylight>kaboverda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard draft="unconfirmed">ĉamora tempo</standard>
+					<standard>ĉamora tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic draft="unconfirmed">ĉathama tempo</generic>
-					<standard draft="unconfirmed">ĉathama norma tempo</standard>
-					<daylight draft="unconfirmed">ĉathama somera tempo</daylight>
+					<generic>ĉathama tempo</generic>
+					<standard>ĉathama norma tempo</standard>
+					<daylight>ĉathama somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic draft="unconfirmed">ĉilia tempo</generic>
-					<standard draft="unconfirmed">ĉilia norma tempo</standard>
-					<daylight draft="unconfirmed">ĉilia somera tempo</daylight>
+					<generic>ĉilia tempo</generic>
+					<standard>ĉilia norma tempo</standard>
+					<daylight>ĉilia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic draft="unconfirmed">ĉina tempo</generic>
-					<standard draft="unconfirmed">ĉina norma tempo</standard>
-					<daylight draft="unconfirmed">ĉina somera tempo</daylight>
+					<generic>ĉina tempo</generic>
+					<standard>ĉina norma tempo</standard>
+					<daylight>ĉina somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard draft="unconfirmed">kristnaskinsula tempo</standard>
+					<standard>kristnaskinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard draft="unconfirmed">kokosinsula tempo</standard>
+					<standard>kokosinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic draft="unconfirmed">kolombia tempo</generic>
-					<standard draft="unconfirmed">kolombia norma tempo</standard>
-					<daylight draft="unconfirmed">kolombia somera tempo</daylight>
+					<generic>kolombia tempo</generic>
+					<standard>kolombia norma tempo</standard>
+					<daylight>kolombia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="unconfirmed">kukinsula tempo</generic>
-					<standard draft="unconfirmed">kukinsula norma tempo</standard>
-					<daylight draft="unconfirmed">kukinsula somera tempo</daylight>
+					<generic>kukinsula tempo</generic>
+					<standard>kukinsula norma tempo</standard>
+					<daylight>kukinsula somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic draft="unconfirmed">tempo: Kubo</generic>
-					<standard draft="unconfirmed">Kubo (norma tempo)</standard>
-					<daylight draft="unconfirmed">Kubo (somera tempo)</daylight>
+					<generic>tempo: Kubo</generic>
+					<standard>Kubo (norma tempo)</standard>
+					<daylight>Kubo (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard draft="unconfirmed">tempo: Davis</standard>
+					<standard>tempo: Davis</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard draft="unconfirmed">tempo: Dumont d’Urville</standard>
+					<standard>tempo: Dumont d’Urville</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard draft="unconfirmed">orient-timora tempo</standard>
+					<standard>orient-timora tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic draft="unconfirmed">paskinsula tempo</generic>
-					<standard draft="unconfirmed">paskinsula norma tempo</standard>
-					<daylight draft="unconfirmed">paskinsula somera tempo</daylight>
+					<generic>paskinsula tempo</generic>
+					<standard>paskinsula norma tempo</standard>
+					<daylight>paskinsula somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard draft="unconfirmed">ekvadora tempo</standard>
+					<standard>ekvadora tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic draft="unconfirmed">centreŭropa tempo</generic>
-					<standard draft="unconfirmed">centreŭropa norma tempo</standard>
-					<daylight draft="unconfirmed">centreŭropa somera tempo</daylight>
+					<generic>centreŭropa tempo</generic>
+					<standard>centreŭropa norma tempo</standard>
+					<daylight>centreŭropa somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic draft="unconfirmed">orienteŭropa tempo</generic>
-					<standard draft="unconfirmed">orienteŭropa norma tempo</standard>
-					<daylight draft="unconfirmed">orienteŭropa somera tempo</daylight>
+					<generic>orienteŭropa tempo</generic>
+					<standard>orienteŭropa norma tempo</standard>
+					<daylight>orienteŭropa somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="unconfirmed">ekstrem-orienteŭropa tempo</standard>
+					<standard>ekstrem-orienteŭropa tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic draft="unconfirmed">okcidenteŭropa tempo</generic>
-					<standard draft="unconfirmed">okcidenteŭropa norma tempo</standard>
-					<daylight draft="unconfirmed">okcidenteŭropa somera tempo</daylight>
+					<generic>okcidenteŭropa tempo</generic>
+					<standard>okcidenteŭropa norma tempo</standard>
+					<daylight>okcidenteŭropa somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic draft="unconfirmed">falklanda tempo</generic>
-					<standard draft="unconfirmed">falklanda norma tempo</standard>
-					<daylight draft="unconfirmed">falklanda somera tempo</daylight>
+					<generic>falklanda tempo</generic>
+					<standard>falklanda norma tempo</standard>
+					<daylight>falklanda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="unconfirmed">fiĝia tempo</generic>
-					<standard draft="unconfirmed">fiĝia norma tempo</standard>
-					<daylight draft="unconfirmed">fiĝia somera tempo</daylight>
+					<generic>fiĝia tempo</generic>
+					<standard>fiĝia norma tempo</standard>
+					<daylight>fiĝia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard draft="unconfirmed">tempo: Franca Gujano</standard>
+					<standard>tempo: Franca Gujano</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard draft="unconfirmed">tempo: Francaj Sudaj Teritorioj</standard>
+					<standard>tempo: Francaj Sudaj Teritorioj</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard draft="unconfirmed">galapaga tempo</standard>
+					<standard>galapaga tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard draft="unconfirmed">tempo: Gambier</standard>
+					<standard>tempo: Gambier</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic draft="unconfirmed">kartvela tempo</generic>
-					<standard draft="unconfirmed">kartvela norma tempo</standard>
-					<daylight draft="unconfirmed">kartvela somera tempo</daylight>
+					<generic>kartvela tempo</generic>
+					<standard>kartvela norma tempo</standard>
+					<daylight>kartvela somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard draft="unconfirmed">gilbertinsula tempo</standard>
+					<standard>gilbertinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard draft="contributed">universala tempo kunordigita</standard>
+					<standard>universala tempo kunordigita</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic draft="unconfirmed">orienta gronlanda tempo</generic>
-					<standard draft="unconfirmed">orienta gronlanda norma tempo</standard>
-					<daylight draft="unconfirmed">orienta gronlanda somera tempo</daylight>
+					<generic>orienta gronlanda tempo</generic>
+					<standard>orienta gronlanda norma tempo</standard>
+					<daylight>orienta gronlanda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic draft="unconfirmed">okcidenta gronlanda tempo</generic>
-					<standard draft="unconfirmed">okcidenta gronlanda norma tempo</standard>
-					<daylight draft="unconfirmed">okcidenta gronlanda somera tempo</daylight>
+					<generic>okcidenta gronlanda tempo</generic>
+					<standard>okcidenta gronlanda norma tempo</standard>
+					<daylight>okcidenta gronlanda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard draft="unconfirmed">arabgolfa norma tempo</standard>
+					<standard>arabgolfa norma tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard draft="unconfirmed">gujana tempo</standard>
+					<standard>gujana tempo</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havajo-Aleutoj (norma tempo)</standard>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic draft="unconfirmed">tempo: Havajo-Aleutoj</generic>
-					<standard draft="unconfirmed">Havajo-Aleutoj (norma tempo)</standard>
-					<daylight draft="unconfirmed">Havajo-Aleutoj (somera tempo)</daylight>
+					<generic>tempo: Havajo-Aleutoj</generic>
+					<standard>Havajo-Aleutoj (norma tempo)</standard>
+					<daylight>Havajo-Aleutoj (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic draft="unconfirmed">honkonga tempo</generic>
-					<standard draft="unconfirmed">honkonga norma tempo</standard>
-					<daylight draft="unconfirmed">honkonga somera tempo</daylight>
+					<generic>honkonga tempo</generic>
+					<standard>honkonga norma tempo</standard>
+					<daylight>honkonga somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic draft="unconfirmed">ĥovda tempo</generic>
-					<standard draft="unconfirmed">ĥovda norma tempo</standard>
-					<daylight draft="unconfirmed">ĥovda somera tempo</daylight>
+					<generic>ĥovda tempo</generic>
+					<standard>ĥovda norma tempo</standard>
+					<daylight>ĥovda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard draft="unconfirmed">hinda norma tempo</standard>
+					<standard>hinda norma tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard draft="unconfirmed">hindoceana tempo</standard>
+					<standard>hindoceana tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard draft="unconfirmed">hindoĉina tempo</standard>
+					<standard>hindoĉina tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard draft="unconfirmed">centr-indonezia tempo</standard>
+					<standard>centr-indonezia tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard draft="unconfirmed">orient-indonezia tempo</standard>
+					<standard>orient-indonezia tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard draft="unconfirmed">okcident-indonezia tempo</standard>
+					<standard>okcident-indonezia tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic draft="unconfirmed">irana tempo</generic>
-					<standard draft="unconfirmed">irana norma tempo</standard>
-					<daylight draft="unconfirmed">irana somera tempo</daylight>
+					<generic>irana tempo</generic>
+					<standard>irana norma tempo</standard>
+					<daylight>irana somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic draft="unconfirmed">irkutska tempo</generic>
-					<standard draft="unconfirmed">irkutska norma tempo</standard>
-					<daylight draft="unconfirmed">irkutska somera tempo</daylight>
+					<generic>irkutska tempo</generic>
+					<standard>irkutska norma tempo</standard>
+					<daylight>irkutska somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic draft="unconfirmed">israela tempo</generic>
-					<standard draft="unconfirmed">israela norma tempo</standard>
-					<daylight draft="unconfirmed">israela somera tempo</daylight>
+					<generic>israela tempo</generic>
+					<standard>israela norma tempo</standard>
+					<daylight>israela somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic draft="unconfirmed">japana tempo</generic>
-					<standard draft="unconfirmed">japana norma tempo</standard>
-					<daylight draft="unconfirmed">japana somera tempo</daylight>
+					<generic>japana tempo</generic>
+					<standard>japana norma tempo</standard>
+					<daylight>japana somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
 				<long>
-					<standard draft="unconfirmed">kazaĥa tempo</standard>
+					<standard>kazaĥa tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard draft="unconfirmed">orient-kazaĥa tempo</standard>
+					<standard>orient-kazaĥa tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<standard draft="unconfirmed">okcident-kazaĥa tempo</standard>
+					<standard>okcident-kazaĥa tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic draft="unconfirmed">korea tempo</generic>
-					<standard draft="unconfirmed">korea norma tempo</standard>
-					<daylight draft="unconfirmed">korea somera tempo</daylight>
+					<generic>korea tempo</generic>
+					<standard>korea norma tempo</standard>
+					<daylight>korea somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="unconfirmed">tempo: Kosrae</standard>
+					<standard>tempo: Kosrae</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic draft="unconfirmed">krasnojarska tempo</generic>
-					<standard draft="unconfirmed">krasnojarska norma tempo</standard>
-					<daylight draft="unconfirmed">krasnojarska somera tempo</daylight>
+					<generic>krasnojarska tempo</generic>
+					<standard>krasnojarska norma tempo</standard>
+					<daylight>krasnojarska somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard draft="unconfirmed">kirgiza tempo</standard>
+					<standard>kirgiza tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard draft="unconfirmed">tempo: Liniaj Insuloj</standard>
+					<standard>tempo: Liniaj Insuloj</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic draft="unconfirmed">tempo: Lord Howe</generic>
-					<standard draft="unconfirmed">Lord Howe (norma tempo)</standard>
-					<daylight draft="unconfirmed">Lord Howe (somera tempo)</daylight>
+					<generic>tempo: Lord Howe</generic>
+					<standard>Lord Howe (norma tempo)</standard>
+					<daylight>Lord Howe (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<generic draft="unconfirmed">magadana tempo</generic>
-					<standard draft="unconfirmed">magadana norma tempo</standard>
-					<daylight draft="unconfirmed">magadana somera tempo</daylight>
+					<generic>magadana tempo</generic>
+					<standard>magadana norma tempo</standard>
+					<daylight>magadana somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard draft="unconfirmed">malajzia tempo</standard>
+					<standard>malajzia tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard draft="unconfirmed">maldiva tempo</standard>
+					<standard>maldiva tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard draft="unconfirmed">markizinsula tempo</standard>
+					<standard>markizinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard draft="unconfirmed">marŝalinsula tempo</standard>
+					<standard>marŝalinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic draft="unconfirmed">maŭricia tempo</generic>
-					<standard draft="unconfirmed">maŭricia norma tempo</standard>
-					<daylight draft="unconfirmed">maŭricia somera tempo</daylight>
+					<generic>maŭricia tempo</generic>
+					<standard>maŭricia norma tempo</standard>
+					<daylight>maŭricia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard draft="unconfirmed">tempo: Mawson</standard>
+					<standard>tempo: Mawson</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic draft="unconfirmed">pacifika meksika tempo</generic>
-					<standard draft="unconfirmed">pacifika meksika norma tempo</standard>
-					<daylight draft="unconfirmed">pacifika meksika somera tempo</daylight>
+					<generic>pacifika meksika tempo</generic>
+					<standard>pacifika meksika norma tempo</standard>
+					<daylight>pacifika meksika somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic draft="unconfirmed">ulanbatora tempo</generic>
-					<standard draft="unconfirmed">ulanbatora norma tempo</standard>
-					<daylight draft="unconfirmed">ulanbatora somera tempo</daylight>
+					<generic>ulanbatora tempo</generic>
+					<standard>ulanbatora norma tempo</standard>
+					<daylight>ulanbatora somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic draft="unconfirmed">moskva tempo</generic>
-					<standard draft="unconfirmed">moskva norma tempo</standard>
-					<daylight draft="unconfirmed">moskva somera tempo</daylight>
+					<generic>moskva tempo</generic>
+					<standard>moskva norma tempo</standard>
+					<daylight>moskva somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard draft="unconfirmed">birma tempo</standard>
+					<standard>birma tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard draft="unconfirmed">naura tempo</standard>
+					<standard>naura tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard draft="unconfirmed">nepala tempo</standard>
+					<standard>nepala tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="unconfirmed">novkaledonia tempo</generic>
-					<standard draft="unconfirmed">novkaledonia norma tempo</standard>
-					<daylight draft="unconfirmed">novkaledonia somera tempo</daylight>
+					<generic>novkaledonia tempo</generic>
+					<standard>novkaledonia norma tempo</standard>
+					<daylight>novkaledonia somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
-					<generic draft="unconfirmed">novzelanda tempo</generic>
-					<standard draft="unconfirmed">novzelanda norma tempo</standard>
-					<daylight draft="unconfirmed">novzelanda somera tempo</daylight>
+					<generic>novzelanda tempo</generic>
+					<standard>novzelanda norma tempo</standard>
+					<daylight>novzelanda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic draft="unconfirmed">tempo: Novlando</generic>
-					<standard draft="unconfirmed">Novlando (norma tempo)</standard>
-					<daylight draft="unconfirmed">Novlando (somera tempo)</daylight>
+					<generic>tempo: Novlando</generic>
+					<standard>Novlando (norma tempo)</standard>
+					<daylight>Novlando (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
 				<long>
-					<standard draft="unconfirmed">niua tempo</standard>
+					<standard>niua tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<generic draft="unconfirmed">norfolkinsula tempo</generic>
-					<standard draft="unconfirmed">norfolkinsula norma tempo</standard>
-					<daylight draft="unconfirmed">norfolkinsula somera tempo</daylight>
+					<generic>norfolkinsula tempo</generic>
+					<standard>norfolkinsula norma tempo</standard>
+					<daylight>norfolkinsula somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic draft="unconfirmed">tempo: Fernando de Noronha</generic>
-					<standard draft="unconfirmed">Fernando de Noronha (norma tempo)</standard>
-					<daylight draft="unconfirmed">Fernando de Noronha (somera tempo)</daylight>
+					<generic>tempo: Fernando de Noronha</generic>
+					<standard>Fernando de Noronha (norma tempo)</standard>
+					<daylight>Fernando de Noronha (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<generic draft="unconfirmed">novosibirska tempo</generic>
-					<standard draft="unconfirmed">novosibirska norma tempo</standard>
-					<daylight draft="unconfirmed">novosibirska somera tempo</daylight>
+					<generic>novosibirska tempo</generic>
+					<standard>novosibirska norma tempo</standard>
+					<daylight>novosibirska somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic draft="unconfirmed">omska tempo</generic>
-					<standard draft="unconfirmed">omska norma tempo</standard>
-					<daylight draft="unconfirmed">omska somera tempo</daylight>
+					<generic>omska tempo</generic>
+					<standard>omska norma tempo</standard>
+					<daylight>omska somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic draft="unconfirmed">pakistana tempo</generic>
-					<standard draft="unconfirmed">pakistana norma tempo</standard>
-					<daylight draft="unconfirmed">pakistana somera tempo</daylight>
+					<generic>pakistana tempo</generic>
+					<standard>pakistana norma tempo</standard>
+					<daylight>pakistana somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
 				<long>
-					<standard draft="unconfirmed">palaŭa tempo</standard>
+					<standard>palaŭa tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard draft="unconfirmed">tempo: Papuo-Nov-Gvineo</standard>
+					<standard>tempo: Papuo-Nov-Gvineo</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic draft="unconfirmed">paragvaja tempo</generic>
-					<standard draft="unconfirmed">paragvaja norma tempo</standard>
-					<daylight draft="unconfirmed">paragvaja somera tempo</daylight>
+					<generic>paragvaja tempo</generic>
+					<standard>paragvaja norma tempo</standard>
+					<daylight>paragvaja somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic draft="unconfirmed">perua tempo</generic>
-					<standard draft="unconfirmed">perua norma tempo</standard>
-					<daylight draft="unconfirmed">perua somera tempo</daylight>
+					<generic>perua tempo</generic>
+					<standard>perua norma tempo</standard>
+					<daylight>perua somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="unconfirmed">filipina tempo</generic>
-					<standard draft="unconfirmed">filipina norma tempo</standard>
-					<daylight draft="unconfirmed">filipina somera tempo</daylight>
+					<generic>filipina tempo</generic>
+					<standard>filipina norma tempo</standard>
+					<daylight>filipina somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard draft="unconfirmed">feniksinsula tempo</standard>
+					<standard>feniksinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic draft="unconfirmed">tempo: Sankta Piero kaj Mikelono</generic>
-					<standard draft="unconfirmed">Sankta Piero kaj Mikelono (norma tempo)</standard>
-					<daylight draft="unconfirmed">Sankta Piero kaj Mikelono (somera tempo)</daylight>
+					<generic>tempo: Sankta Piero kaj Mikelono</generic>
+					<standard>Sankta Piero kaj Mikelono (norma tempo)</standard>
+					<daylight>Sankta Piero kaj Mikelono (somera tempo)</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard draft="unconfirmed">pitkarninsula tempo</standard>
+					<standard>pitkarninsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="unconfirmed">tempo: Ponape</standard>
+					<standard>tempo: Ponape</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard draft="unconfirmed">pjongjanga tempo</standard>
+					<standard>nord-korea tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard draft="unconfirmed">tempo: Reunio</standard>
+					<standard>tempo: Reunio</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
 				<long>
-					<standard draft="unconfirmed">tempo: Rothera</standard>
+					<standard>tempo: Rothera</standard>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<generic draft="unconfirmed">saĥalena tempo</generic>
-					<standard draft="unconfirmed">saĥalena norma tempo</standard>
-					<daylight draft="unconfirmed">saĥalena somera tempo</daylight>
+					<generic>saĥalena tempo</generic>
+					<standard>saĥalena norma tempo</standard>
+					<daylight>saĥalena somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="unconfirmed">samoa tempo</generic>
-					<standard draft="unconfirmed">samoa norma tempo</standard>
-					<daylight draft="unconfirmed">samoa somera tempo</daylight>
+					<generic>uson-samoa tempo</generic>
+					<standard>uson-samoa norma tempo</standard>
+					<daylight>uson-samoa somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard draft="unconfirmed">sejŝela tempo</standard>
+					<standard>sejŝela tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard draft="unconfirmed">singapura norma tempo</standard>
+					<standard>singapura norma tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard draft="unconfirmed">tempo: Salomonoj</standard>
+					<standard>tempo: Salomonoj</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard draft="unconfirmed">tempo: Sud-Georgio</standard>
+					<standard>tempo: Sud-Georgio</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard draft="unconfirmed">surinama tempo</standard>
+					<standard>surinama tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard draft="unconfirmed">tempo: Showa</standard>
+					<standard>tempo: Showa</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard draft="unconfirmed">tahitia tempo</standard>
+					<standard>tahitia tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic draft="unconfirmed">tajpea tempo</generic>
-					<standard draft="unconfirmed">tajpea norma tempo</standard>
-					<daylight draft="unconfirmed">tajpea somera tempo</daylight>
+					<generic>tajvana tempo</generic>
+					<standard>tajvana norma tempo</standard>
+					<daylight>tajvana somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard draft="unconfirmed">taĝika tempo</standard>
+					<standard>taĝika tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard draft="unconfirmed">tokelaa tempo</standard>
+					<standard>tokelaa tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="unconfirmed">tonga tempo</generic>
-					<standard draft="unconfirmed">tonga norma tempo</standard>
-					<daylight draft="unconfirmed">tonga somera tempo</daylight>
+					<generic>tonga tempo</generic>
+					<standard>tonga norma tempo</standard>
+					<daylight>tonga somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard draft="unconfirmed">tempo: Ĉuuk</standard>
+					<standard>tempo: Ĉuuk</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic draft="unconfirmed">turkmena tempo</generic>
-					<standard draft="unconfirmed">turkmena norma tempo</standard>
-					<daylight draft="unconfirmed">turkmena somera tempo</daylight>
+					<generic>turkmena tempo</generic>
+					<standard>turkmena norma tempo</standard>
+					<daylight>turkmena somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
-					<standard draft="unconfirmed">tuvala tempo</standard>
+					<standard>tuvala tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic draft="unconfirmed">urugvaja tempo</generic>
-					<standard draft="unconfirmed">urugvaja norma tempo</standard>
-					<daylight draft="unconfirmed">urugvaja somera tempo</daylight>
+					<generic>urugvaja tempo</generic>
+					<standard>urugvaja norma tempo</standard>
+					<daylight>urugvaja somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="unconfirmed">uzbeka tempo</generic>
-					<standard draft="unconfirmed">uzbeka norma tempo</standard>
-					<daylight draft="unconfirmed">uzbeka somera tempo</daylight>
+					<generic>uzbeka tempo</generic>
+					<standard>uzbeka norma tempo</standard>
+					<daylight>uzbeka somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="unconfirmed">vanuatua tempo</generic>
-					<standard draft="unconfirmed">vanuatua norma tempo</standard>
-					<daylight draft="unconfirmed">vanuatua somera tempo</daylight>
+					<generic>vanuatua tempo</generic>
+					<standard>vanuatua norma tempo</standard>
+					<daylight>vanuatua somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
-					<standard draft="unconfirmed">venezuela tempo</standard>
+					<standard>venezuela tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<generic draft="unconfirmed">vladivostoka tempo</generic>
-					<standard draft="unconfirmed">vladivostoka norma tempo</standard>
-					<daylight draft="unconfirmed">vladivostoka somera tempo</daylight>
+					<generic>vladivostoka tempo</generic>
+					<standard>vladivostoka norma tempo</standard>
+					<daylight>vladivostoka somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic draft="unconfirmed">volgograda tempo</generic>
-					<standard draft="unconfirmed">volgograda norma tempo</standard>
-					<daylight draft="unconfirmed">volgograda somera tempo</daylight>
+					<generic>volgograda tempo</generic>
+					<standard>volgograda norma tempo</standard>
+					<daylight>volgograda somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
 				<long>
-					<standard draft="unconfirmed">tempo: Vostok</standard>
+					<standard>tempo: Vostok</standard>
 				</long>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard draft="unconfirmed">vejkinsula tempo</standard>
+					<standard>vejkinsula tempo</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard draft="unconfirmed">tempo: Valiso kaj Futuno</standard>
+					<standard>tempo: Valiso kaj Futuno</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic draft="unconfirmed">jakutska tempo</generic>
-					<standard draft="unconfirmed">jakutska norma tempo</standard>
-					<daylight draft="unconfirmed">jakutska somera tempo</daylight>
+					<generic>jakutska tempo</generic>
+					<standard>jakutska norma tempo</standard>
+					<daylight>jakutska somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic draft="unconfirmed">jekaterinburga tempo</generic>
-					<standard draft="unconfirmed">jekaterinburga norma tempo</standard>
-					<daylight draft="unconfirmed">jekaterinburga somera tempo</daylight>
+					<generic>jekaterinburga tempo</generic>
+					<standard>jekaterinburga norma tempo</standard>
+					<daylight>jekaterinburga somera tempo</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yukon">
 				<long>
-					<standard draft="unconfirmed">jukonia tempo</standard>
+					<standard>jukonia tempo</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
@@ -3772,837 +3923,869 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
-			<group> </group>
-			<approximatelySign draft="unconfirmed">≈</approximatelySign>
-			<superscriptingExponent draft="unconfirmed">⋅</superscriptingExponent>
+			<group> </group>
+			<approximatelySign>≈</approximatelySign>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="unconfirmed">0 mil</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">0 mil</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">00 mil</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 mil</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">000 mil</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 mil</pattern>
-					<pattern type="1000000" count="one" draft="unconfirmed">0 miliono</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 milionoj</pattern>
-					<pattern type="10000000" count="one" draft="unconfirmed">00 miliono</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 milionoj</pattern>
-					<pattern type="100000000" count="one" draft="unconfirmed">000 miliono</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 milionoj</pattern>
-					<pattern type="1000000000" count="one" draft="unconfirmed">0 miliardo</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 miliardoj</pattern>
-					<pattern type="10000000000" count="one" draft="unconfirmed">00 miliardo</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 miliardoj</pattern>
-					<pattern type="100000000000" count="one" draft="unconfirmed">000 miliardo</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 miliardoj</pattern>
-					<pattern type="1000000000000" count="one" draft="unconfirmed">0 duiliono</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 duilionoj</pattern>
-					<pattern type="10000000000000" count="one" draft="unconfirmed">00 duiliono</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 duilionoj</pattern>
-					<pattern type="100000000000000" count="one" draft="unconfirmed">000 duiliono</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 duilionoj</pattern>
+					<pattern type="1000" count="one">0 mil</pattern>
+					<pattern type="1000" count="other">0 mil</pattern>
+					<pattern type="10000" count="one">00 mil</pattern>
+					<pattern type="10000" count="other">00 mil</pattern>
+					<pattern type="100000" count="one">000 mil</pattern>
+					<pattern type="100000" count="other">000 mil</pattern>
+					<pattern type="1000000" count="one">0 miliono</pattern>
+					<pattern type="1000000" count="other">0 miliono</pattern>
+					<pattern type="10000000" count="one">00 milionoj</pattern>
+					<pattern type="10000000" count="other">00 milionoj</pattern>
+					<pattern type="100000000" count="one">000 milionoj</pattern>
+					<pattern type="100000000" count="other">000 milionoj</pattern>
+					<pattern type="1000000000" count="one">0 miliardo</pattern>
+					<pattern type="1000000000" count="other">0 miliardoj</pattern>
+					<pattern type="10000000000" count="one">00 miliardoj</pattern>
+					<pattern type="10000000000" count="other">00 miliardoj</pattern>
+					<pattern type="100000000000" count="one">000 miliardoj</pattern>
+					<pattern type="100000000000" count="other">000 miliardoj</pattern>
+					<pattern type="1000000000000" count="one">0 duiliono</pattern>
+					<pattern type="1000000000000" count="other">0 duilionoj</pattern>
+					<pattern type="10000000000000" count="one">00 duilionoj</pattern>
+					<pattern type="10000000000000" count="other">00 duilionoj</pattern>
+					<pattern type="100000000000000" count="one">000 duilionoj</pattern>
+					<pattern type="100000000000000" count="other">000 duilionoj</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="unconfirmed">0k</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">0k</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">00k</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00k</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">000k</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000k</pattern>
+					<pattern type="1000" count="one">0k</pattern>
+					<pattern type="1000" count="other">0k</pattern>
+					<pattern type="10000" count="one">00k</pattern>
+					<pattern type="10000" count="other">00k</pattern>
+					<pattern type="100000" count="one">000k</pattern>
+					<pattern type="100000" count="other">000k</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">0k ¤</pattern>
+					<pattern type="1000" count="other">0k ¤</pattern>
+					<pattern type="10000" count="one">00k ¤</pattern>
+					<pattern type="10000" count="other">00k ¤</pattern>
+					<pattern type="100000" count="one">000k ¤</pattern>
+					<pattern type="100000" count="other">000k ¤</pattern>
+					<pattern type="1000000" count="one">0M ¤</pattern>
+					<pattern type="1000000" count="other">0M ¤</pattern>
+					<pattern type="10000000" count="one">00M ¤</pattern>
+					<pattern type="10000000" count="other">00M ¤</pattern>
+					<pattern type="100000000" count="one">000M ¤</pattern>
+					<pattern type="100000000" count="other">000M ¤</pattern>
+					<pattern type="1000000000" count="one">0G ¤</pattern>
+					<pattern type="1000000000" count="other">0G ¤</pattern>
+					<pattern type="10000000000" count="one">00G ¤</pattern>
+					<pattern type="10000000000" count="other">00G ¤</pattern>
+					<pattern type="100000000000" count="one">000G ¤</pattern>
+					<pattern type="100000000000" count="other">000G ¤</pattern>
+					<pattern type="1000000000000" count="one">0T ¤</pattern>
+					<pattern type="1000000000000" count="other">0T ¤</pattern>
+					<pattern type="10000000000000" count="one">00T ¤</pattern>
+					<pattern type="10000000000000" count="other">00T ¤</pattern>
+					<pattern type="100000000000000" count="one">000T ¤</pattern>
+					<pattern type="100000000000000" count="other">000T ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName draft="unconfirmed">dirhamo de Unuiĝintaj Arabaj Emirlandoj</displayName>
-				<displayName count="one" draft="unconfirmed">UAE-dirhamo</displayName>
-				<displayName count="other" draft="unconfirmed">UAE-dirhamoj</displayName>
+				<displayName>dirhamo de Unuiĝintaj Arabaj Emirlandoj</displayName>
+				<displayName count="one">UAE-dirhamo</displayName>
+				<displayName count="other">UAE-dirhamoj</displayName>
 			</currency>
 			<currency type="AFN">
-				<displayName draft="unconfirmed">afgana afganio</displayName>
-				<displayName count="one" draft="unconfirmed">afgana afganio</displayName>
-				<displayName count="other" draft="unconfirmed">afganaj afganioj</displayName>
+				<displayName>afgana afganio</displayName>
+				<displayName count="one">afgana afganio</displayName>
+				<displayName count="other">afganaj afganioj</displayName>
 			</currency>
 			<currency type="ALL">
-				<displayName draft="unconfirmed">albana leko</displayName>
-				<displayName count="one" draft="unconfirmed">albana leko</displayName>
-				<displayName count="other" draft="unconfirmed">albanaj lekoj</displayName>
+				<displayName>albana leko</displayName>
+				<displayName count="one">albana leko</displayName>
+				<displayName count="other">albanaj lekoj</displayName>
 			</currency>
 			<currency type="AMD">
-				<displayName draft="unconfirmed">armena dramo</displayName>
-				<displayName count="one" draft="unconfirmed">armena dramo</displayName>
-				<displayName count="other" draft="unconfirmed">armenaj dramoj</displayName>
+				<displayName>armena dramo</displayName>
+				<displayName count="one">armena dramo</displayName>
+				<displayName count="other">armenaj dramoj</displayName>
 			</currency>
 			<currency type="ANG">
-				<displayName draft="unconfirmed">nederlandantila guldeno</displayName>
-				<displayName count="one" draft="unconfirmed">nederlandantila guldeno</displayName>
-				<displayName count="other" draft="unconfirmed">nederlandantilaj guldenoj</displayName>
+				<displayName>nederlandantila guldeno</displayName>
+				<displayName count="one">nederlandantila guldeno</displayName>
+				<displayName count="other">nederlandantilaj guldenoj</displayName>
 			</currency>
 			<currency type="AOA">
-				<displayName draft="unconfirmed">angola kvanzo</displayName>
-				<displayName count="one" draft="unconfirmed">angola kvanzo</displayName>
-				<displayName count="other" draft="unconfirmed">angolaj kvanzoj</displayName>
+				<displayName>angola kvanzo</displayName>
+				<displayName count="one">angola kvanzo</displayName>
+				<displayName count="other">angolaj kvanzoj</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName draft="unconfirmed">argentina peso</displayName>
-				<displayName count="one" draft="unconfirmed">argentina peso</displayName>
-				<displayName count="other" draft="unconfirmed">argentinaj pesoj</displayName>
+				<displayName>argentina peso</displayName>
+				<displayName count="one">argentina peso</displayName>
+				<displayName count="other">argentinaj pesoj</displayName>
 			</currency>
 			<currency type="AUD">
-				<displayName draft="unconfirmed">aŭstralia dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">aŭstralia dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">aŭstraliaj dolaroj</displayName>
-				<symbol draft="unconfirmed">AUD</symbol>
+				<displayName>aŭstralia dolaro</displayName>
+				<displayName count="one">aŭstralia dolaro</displayName>
+				<displayName count="other">aŭstraliaj dolaroj</displayName>
+				<symbol draft="contributed">AUD</symbol>
 			</currency>
 			<currency type="AWG">
-				<displayName draft="unconfirmed">aruba guldeno</displayName>
-				<displayName count="one" draft="unconfirmed">aruba guldeno</displayName>
-				<displayName count="other" draft="unconfirmed">arubaj guldenoj</displayName>
+				<displayName>aruba floreno</displayName>
+				<displayName count="one">aruba floreno</displayName>
+				<displayName count="other">arubaj florenoj</displayName>
 			</currency>
 			<currency type="AZN">
-				<displayName draft="unconfirmed">azerbajĝana manato</displayName>
-				<displayName count="one" draft="unconfirmed">azerbajĝana manato</displayName>
-				<displayName count="other" draft="unconfirmed">azerbajĝanaj manatoj</displayName>
+				<displayName>azerbajĝana manato</displayName>
+				<displayName count="one">azerbajĝana manato</displayName>
+				<displayName count="other">azerbajĝanaj manatoj</displayName>
 			</currency>
 			<currency type="BAM">
-				<displayName draft="unconfirmed">konvertebla marko de Bosnujo kaj Hercegovino</displayName>
-				<displayName count="one" draft="unconfirmed">konvertebla marko</displayName>
-				<displayName count="other" draft="unconfirmed">konverteblaj markoj</displayName>
+				<displayName>konvertebla marko de Bosnujo kaj Hercegovino</displayName>
+				<displayName count="one">konvertebla marko</displayName>
+				<displayName count="other">konverteblaj markoj</displayName>
 			</currency>
 			<currency type="BBD">
-				<displayName draft="unconfirmed">barbada dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">barbada dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">barbadaj dolaroj</displayName>
+				<displayName>barbada dolaro</displayName>
+				<displayName count="one">barbada dolaro</displayName>
+				<displayName count="other">barbadaj dolaroj</displayName>
 			</currency>
 			<currency type="BDT">
-				<displayName draft="unconfirmed">bangladeŝa tako</displayName>
-				<displayName count="one" draft="unconfirmed">bangladeŝa tako</displayName>
-				<displayName count="other" draft="unconfirmed">bangladeŝaj takoj</displayName>
+				<displayName>bangladeŝa tako</displayName>
+				<displayName count="one">bangladeŝa tako</displayName>
+				<displayName count="other">bangladeŝaj takoj</displayName>
 			</currency>
 			<currency type="BGN">
-				<displayName draft="unconfirmed">bulgara levo</displayName>
-				<displayName count="one" draft="unconfirmed">bulgara levo</displayName>
-				<displayName count="other" draft="unconfirmed">bulgaraj levoj</displayName>
+				<displayName>bulgara levo</displayName>
+				<displayName count="one">bulgara levo</displayName>
+				<displayName count="other">bulgaraj levoj</displayName>
 			</currency>
 			<currency type="BHD">
-				<displayName draft="unconfirmed">barejna dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">barejna dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">barejnaj dinaroj</displayName>
+				<displayName>barejna dinaro</displayName>
+				<displayName count="one">barejna dinaro</displayName>
+				<displayName count="other">barejnaj dinaroj</displayName>
 			</currency>
 			<currency type="BIF">
-				<displayName draft="unconfirmed">burunda franko</displayName>
-				<displayName count="one" draft="unconfirmed">burunda franko</displayName>
-				<displayName count="other" draft="unconfirmed">burundaj frankoj</displayName>
+				<displayName>burunda franko</displayName>
+				<displayName count="one">burunda franko</displayName>
+				<displayName count="other">burundaj frankoj</displayName>
 			</currency>
 			<currency type="BMD">
-				<displayName draft="unconfirmed">bermuda dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">bermuda dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">bermudaj dolaroj</displayName>
+				<displayName>bermuda dolaro</displayName>
+				<displayName count="one">bermuda dolaro</displayName>
+				<displayName count="other">bermudaj dolaroj</displayName>
 			</currency>
 			<currency type="BND">
-				<displayName draft="unconfirmed">bruneja dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">bruneja dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">brunejaj dolaroj</displayName>
+				<displayName>bruneja dolaro</displayName>
+				<displayName count="one">bruneja dolaro</displayName>
+				<displayName count="other">brunejaj dolaroj</displayName>
 			</currency>
 			<currency type="BOB">
-				<displayName draft="unconfirmed">bolivia bolivjano</displayName>
-				<displayName count="one" draft="unconfirmed">bolivia bolivjano</displayName>
-				<displayName count="other" draft="unconfirmed">boliviaj bolivjanoj</displayName>
+				<displayName>bolivia bolivjano</displayName>
+				<displayName count="one">bolivia bolivjano</displayName>
+				<displayName count="other">boliviaj bolivjanoj</displayName>
 			</currency>
 			<currency type="BRL">
-				<displayName draft="unconfirmed">brazila realo</displayName>
-				<displayName count="one" draft="unconfirmed">brazila realo</displayName>
-				<displayName count="other" draft="unconfirmed">brazilaj realoj</displayName>
-				<symbol draft="unconfirmed">BRL</symbol>
+				<displayName>brazila realo</displayName>
+				<displayName count="one">brazila realo</displayName>
+				<displayName count="other">brazilaj realoj</displayName>
+				<symbol draft="contributed">BRL</symbol>
 			</currency>
 			<currency type="BSD">
-				<displayName draft="unconfirmed">bahama dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">bahama dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">bahamaj dolaroj</displayName>
+				<displayName>bahama dolaro</displayName>
+				<displayName count="one">bahama dolaro</displayName>
+				<displayName count="other">bahamaj dolaroj</displayName>
 			</currency>
 			<currency type="BTN">
-				<displayName draft="unconfirmed">butana ngultrumo</displayName>
-				<displayName count="one" draft="unconfirmed">butana ngultrumo</displayName>
-				<displayName count="other" draft="unconfirmed">butanaj ngultrumoj</displayName>
+				<displayName>butana ngultrumo</displayName>
+				<displayName count="one">butana ngultrumo</displayName>
+				<displayName count="other">butanaj ngultrumoj</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName draft="unconfirmed">bocvana pulao</displayName>
-				<displayName count="one" draft="unconfirmed">bocvana pulao</displayName>
-				<displayName count="other" draft="unconfirmed">bocvanaj pulaoj</displayName>
+				<displayName>bocvana pulao</displayName>
+				<displayName count="one">bocvana pulao</displayName>
+				<displayName count="other">bocvanaj pulaoj</displayName>
 			</currency>
 			<currency type="BYN">
-				<displayName draft="unconfirmed">belorusa rublo</displayName>
-				<displayName count="one" draft="unconfirmed">belorusa rublo</displayName>
-				<displayName count="other" draft="unconfirmed">belorusaj rubloj</displayName>
+				<displayName>belorusa rublo</displayName>
+				<displayName count="one">belorusa rublo</displayName>
+				<displayName count="other">belorusaj rubloj</displayName>
 			</currency>
 			<currency type="BZD">
-				<displayName draft="unconfirmed">beliza dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">beliza dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">belizaj dolaroj</displayName>
+				<displayName>beliza dolaro</displayName>
+				<displayName count="one">beliza dolaro</displayName>
+				<displayName count="other">belizaj dolaroj</displayName>
 			</currency>
 			<currency type="CAD">
-				<displayName draft="unconfirmed">kanada dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">kanada dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">kanadaj dolaroj</displayName>
-				<symbol draft="unconfirmed">CAD</symbol>
+				<displayName>kanada dolaro</displayName>
+				<displayName count="one">kanada dolaro</displayName>
+				<displayName count="other">kanadaj dolaroj</displayName>
+				<symbol draft="contributed">CAD</symbol>
 			</currency>
 			<currency type="CDF">
-				<displayName draft="unconfirmed">konga franko</displayName>
-				<displayName count="one" draft="unconfirmed">konga franko</displayName>
-				<displayName count="other" draft="unconfirmed">kongaj frankoj</displayName>
+				<displayName>konga franko</displayName>
+				<displayName count="one">konga franko</displayName>
+				<displayName count="other">kongaj frankoj</displayName>
 			</currency>
 			<currency type="CHF">
-				<displayName draft="unconfirmed">svisa franko</displayName>
-				<displayName count="one" draft="unconfirmed">svisa franko</displayName>
-				<displayName count="other" draft="unconfirmed">svisaj frankoj</displayName>
+				<displayName>svisa franko</displayName>
+				<displayName count="one">svisa franko</displayName>
+				<displayName count="other">svisaj frankoj</displayName>
 			</currency>
 			<currency type="CLP">
-				<displayName draft="unconfirmed">ĉilia peso</displayName>
-				<displayName count="one" draft="unconfirmed">ĉilia peso</displayName>
-				<displayName count="other" draft="unconfirmed">ĉiliaj pesoj</displayName>
+				<displayName>ĉilia peso</displayName>
+				<displayName count="one">ĉilia peso</displayName>
+				<displayName count="other">ĉiliaj pesoj</displayName>
 			</currency>
 			<currency type="CNH">
-				<displayName draft="unconfirmed">ĉina juano (eksterlanda uzo)</displayName>
-				<displayName count="one" draft="unconfirmed">ĉina juano (eksterlande)</displayName>
-				<displayName count="other" draft="unconfirmed">ĉinaj juanoj (eksterlande)</displayName>
+				<displayName>ĉina juano (eksterlanda uzo)</displayName>
+				<displayName count="one">ĉina juano (eksterlande)</displayName>
+				<displayName count="other">ĉinaj juanoj (eksterlande)</displayName>
 			</currency>
 			<currency type="CNY">
-				<displayName draft="unconfirmed">ĉinaj juanoj</displayName>
-				<displayName count="one" draft="unconfirmed">ĉina juano</displayName>
-				<displayName count="other" draft="unconfirmed">ĉinaj juanoj</displayName>
-				<symbol draft="unconfirmed">CNY</symbol>
+				<displayName>ĉinaj juanoj</displayName>
+				<displayName count="one">ĉina juano</displayName>
+				<displayName count="other">ĉinaj juanoj</displayName>
+				<symbol draft="contributed">CNY</symbol>
 			</currency>
 			<currency type="COP">
-				<displayName draft="unconfirmed">kolombia peso</displayName>
-				<displayName count="one" draft="unconfirmed">kolombia peso</displayName>
-				<displayName count="other" draft="unconfirmed">kolombiaj pesoj</displayName>
+				<displayName>kolombia peso</displayName>
+				<displayName count="one">kolombia peso</displayName>
+				<displayName count="other">kolombiaj pesoj</displayName>
 			</currency>
 			<currency type="CRC">
-				<displayName draft="unconfirmed">kostarika kolumbo</displayName>
-				<displayName count="one" draft="unconfirmed">kostarika kolumbo</displayName>
-				<displayName count="other" draft="unconfirmed">kostarikaj kolumboj</displayName>
+				<displayName>kostarika kolumbo</displayName>
+				<displayName count="one">kostarika kolumbo</displayName>
+				<displayName count="other">kostarikaj kolumboj</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName draft="unconfirmed">konvertebla kuba peso</displayName>
-				<displayName count="one" draft="unconfirmed">konvertebla kuba peso</displayName>
-				<displayName count="other" draft="unconfirmed">konverteblaj kubaj pesoj</displayName>
+				<displayName>konvertebla kuba peso</displayName>
+				<displayName count="one">konvertebla kuba peso</displayName>
+				<displayName count="other">konverteblaj kubaj pesoj</displayName>
 			</currency>
 			<currency type="CUP">
-				<displayName draft="unconfirmed">kuba peso</displayName>
-				<displayName count="one" draft="unconfirmed">kuba peso</displayName>
-				<displayName count="other" draft="unconfirmed">kubaj pesoj</displayName>
+				<displayName>kuba peso</displayName>
+				<displayName count="one">kuba peso</displayName>
+				<displayName count="other">kubaj pesoj</displayName>
 			</currency>
 			<currency type="CVE">
-				<displayName draft="unconfirmed">kaboverda eskudo</displayName>
-				<displayName count="one" draft="unconfirmed">kaboverda eskudo</displayName>
-				<displayName count="other" draft="unconfirmed">kaboverdaj eskudoj</displayName>
+				<displayName>kaboverda eskudo</displayName>
+				<displayName count="one">kaboverda eskudo</displayName>
+				<displayName count="other">kaboverdaj eskudoj</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName draft="unconfirmed">ĉeĥa krono</displayName>
-				<displayName count="one" draft="unconfirmed">ĉeĥa krono</displayName>
-				<displayName count="other" draft="unconfirmed">ĉeĥaj kronoj</displayName>
+				<displayName>ĉeĥa krono</displayName>
+				<displayName count="one">ĉeĥa krono</displayName>
+				<displayName count="other">ĉeĥaj kronoj</displayName>
 			</currency>
 			<currency type="DJF">
-				<displayName draft="unconfirmed">ĝibutia franko</displayName>
-				<displayName count="one" draft="unconfirmed">ĝibutia franko</displayName>
-				<displayName count="other" draft="unconfirmed">ĝibutiaj frankoj</displayName>
+				<displayName>ĝibutia franko</displayName>
+				<displayName count="one">ĝibutia franko</displayName>
+				<displayName count="other">ĝibutiaj frankoj</displayName>
 			</currency>
 			<currency type="DKK">
-				<displayName draft="unconfirmed">dana krono</displayName>
-				<displayName count="one" draft="unconfirmed">dana krono</displayName>
-				<displayName count="other" draft="unconfirmed">danaj kronoj</displayName>
+				<displayName>dana krono</displayName>
+				<displayName count="one">dana krono</displayName>
+				<displayName count="other">danaj kronoj</displayName>
 			</currency>
 			<currency type="DOP">
-				<displayName draft="unconfirmed">dominika peso</displayName>
-				<displayName count="one" draft="unconfirmed">dominika peso</displayName>
-				<displayName count="other" draft="unconfirmed">dominikaj pesoj</displayName>
+				<displayName>dominika peso</displayName>
+				<displayName count="one">dominika peso</displayName>
+				<displayName count="other">dominikaj pesoj</displayName>
 			</currency>
 			<currency type="DZD">
-				<displayName draft="unconfirmed">alĝeria dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">alĝeria dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">alĝeriaj dinaroj</displayName>
+				<displayName>alĝeria dinaro</displayName>
+				<displayName count="one">alĝeria dinaro</displayName>
+				<displayName count="other">alĝeriaj dinaroj</displayName>
 			</currency>
 			<currency type="EGP">
-				<displayName draft="unconfirmed">egipta pundo</displayName>
-				<displayName count="one" draft="unconfirmed">egipta pundo</displayName>
-				<displayName count="other" draft="unconfirmed">egiptaj pundoj</displayName>
+				<displayName>egipta pundo</displayName>
+				<displayName count="one">egipta pundo</displayName>
+				<displayName count="other">egiptaj pundoj</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName draft="unconfirmed">eritrea nakfo</displayName>
-				<displayName count="one" draft="unconfirmed">eritrea nakfo</displayName>
-				<displayName count="other" draft="unconfirmed">eritreaj nakfoj</displayName>
+				<displayName>eritrea nakfo</displayName>
+				<displayName count="one">eritrea nakfo</displayName>
+				<displayName count="other">eritreaj nakfoj</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName draft="unconfirmed">etiopa birro</displayName>
-				<displayName count="one" draft="unconfirmed">etiopa birro</displayName>
-				<displayName count="other" draft="unconfirmed">etiopaj birroj</displayName>
+				<displayName>etiopa birro</displayName>
+				<displayName count="one">etiopa birro</displayName>
+				<displayName count="other">etiopaj birroj</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName draft="unconfirmed">eŭro</displayName>
-				<displayName count="one" draft="unconfirmed">eŭro</displayName>
-				<displayName count="other" draft="unconfirmed">eŭroj</displayName>
+				<displayName>eŭro</displayName>
+				<displayName count="one">eŭro</displayName>
+				<displayName count="other">eŭroj</displayName>
 			</currency>
 			<currency type="FJD">
-				<displayName draft="unconfirmed">fiĝia dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">fiĝia dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">fiĝiaj dolaroj</displayName>
+				<displayName>fiĝia dolaro</displayName>
+				<displayName count="one">fiĝia dolaro</displayName>
+				<displayName count="other">fiĝiaj dolaroj</displayName>
 			</currency>
 			<currency type="FKP">
-				<displayName draft="unconfirmed">falklanda pundo</displayName>
-				<displayName count="one" draft="unconfirmed">falklanda pundo</displayName>
-				<displayName count="other" draft="unconfirmed">falklandaj pundoj</displayName>
+				<displayName>falklanda pundo</displayName>
+				<displayName count="one">falklanda pundo</displayName>
+				<displayName count="other">falklandaj pundoj</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName draft="unconfirmed">brita pundo</displayName>
-				<displayName count="one" draft="unconfirmed">brita pundo</displayName>
-				<displayName count="other" draft="unconfirmed">britaj pundoj</displayName>
-				<symbol draft="unconfirmed">GBP</symbol>
+				<displayName>brita pundo</displayName>
+				<displayName count="one">brita pundo</displayName>
+				<displayName count="other">britaj pundoj</displayName>
+				<symbol draft="contributed">GBP</symbol>
 			</currency>
 			<currency type="GEL">
-				<displayName draft="unconfirmed">kartvela lario</displayName>
-				<displayName count="one" draft="unconfirmed">kartvela lario</displayName>
-				<displayName count="other" draft="unconfirmed">kartvelaj larioj</displayName>
+				<displayName>kartvela lario</displayName>
+				<displayName count="one">kartvela lario</displayName>
+				<displayName count="other">kartvelaj larioj</displayName>
 			</currency>
 			<currency type="GHS">
-				<displayName draft="unconfirmed">ganaa cedio</displayName>
-				<displayName count="one" draft="unconfirmed">ganaa cedio</displayName>
-				<displayName count="other" draft="unconfirmed">ganaaj cedioj</displayName>
+				<displayName>ganaa cedio</displayName>
+				<displayName count="one">ganaa cedio</displayName>
+				<displayName count="other">ganaaj cedioj</displayName>
+				<symbol alt="narrow" draft="contributed">₵</symbol>
 			</currency>
 			<currency type="GIP">
-				<displayName draft="unconfirmed">ĝibraltara pundo</displayName>
-				<displayName count="one" draft="unconfirmed">ĝibraltara pundo</displayName>
-				<displayName count="other" draft="unconfirmed">ĝibraltaraj pundoj</displayName>
+				<displayName>ĝibraltara pundo</displayName>
+				<displayName count="one">ĝibraltara pundo</displayName>
+				<displayName count="other">ĝibraltaraj pundoj</displayName>
 			</currency>
 			<currency type="GMD">
-				<displayName draft="unconfirmed">gambia dalasio</displayName>
-				<displayName count="one" draft="unconfirmed">gambia dalasio</displayName>
-				<displayName count="other" draft="unconfirmed">gambiaj dalasioj</displayName>
+				<displayName>gambia dalasio</displayName>
+				<displayName count="one">gambia dalasio</displayName>
+				<displayName count="other">gambiaj dalasioj</displayName>
 			</currency>
 			<currency type="GNF">
-				<displayName draft="unconfirmed">gvinea franko</displayName>
-				<displayName count="one" draft="unconfirmed">gvinea franko</displayName>
-				<displayName count="other" draft="unconfirmed">gvineaj frankoj</displayName>
+				<displayName>gvinea franko</displayName>
+				<displayName count="one">gvinea franko</displayName>
+				<displayName count="other">gvineaj frankoj</displayName>
 			</currency>
 			<currency type="GTQ">
-				<displayName draft="unconfirmed">gvatemala kecalo</displayName>
-				<displayName count="one" draft="unconfirmed">gvatemala kecalo</displayName>
-				<displayName count="other" draft="unconfirmed">gvatemalaj kecaloj</displayName>
+				<displayName>gvatemala kecalo</displayName>
+				<displayName count="one">gvatemala kecalo</displayName>
+				<displayName count="other">gvatemalaj kecaloj</displayName>
 			</currency>
 			<currency type="GYD">
-				<displayName draft="unconfirmed">gujana dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">gujana dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">gujanaj dolaroj</displayName>
+				<displayName>gujana dolaro</displayName>
+				<displayName count="one">gujana dolaro</displayName>
+				<displayName count="other">gujanaj dolaroj</displayName>
 			</currency>
 			<currency type="HKD">
-				<displayName draft="unconfirmed">honkonga dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">honkonga dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">honkongaj dolaroj</displayName>
-				<symbol draft="unconfirmed">HKD</symbol>
+				<displayName>honkonga dolaro</displayName>
+				<displayName count="one">honkonga dolaro</displayName>
+				<displayName count="other">honkongaj dolaroj</displayName>
+				<symbol draft="contributed">HKD</symbol>
 			</currency>
 			<currency type="HNL">
-				<displayName draft="unconfirmed">hondura lempiro</displayName>
-				<displayName count="one" draft="unconfirmed">hondura lempiro</displayName>
-				<displayName count="other" draft="unconfirmed">honduraj lempiroj</displayName>
+				<displayName>hondura lempiro</displayName>
+				<displayName count="one">hondura lempiro</displayName>
+				<displayName count="other">honduraj lempiroj</displayName>
 			</currency>
 			<currency type="HRK">
-				<displayName draft="unconfirmed">kroata kunao</displayName>
-				<displayName count="one" draft="unconfirmed">kroata kunao</displayName>
-				<displayName count="other" draft="unconfirmed">kroataj kunaoj</displayName>
+				<displayName>kroata kunao</displayName>
+				<displayName count="one">kroata kunao</displayName>
+				<displayName count="other">kroataj kunaoj</displayName>
 			</currency>
 			<currency type="HTG">
-				<displayName draft="unconfirmed">haitia gurdo</displayName>
-				<displayName count="one" draft="unconfirmed">haitia gurdo</displayName>
-				<displayName count="other" draft="unconfirmed">haitiaj gurdoj</displayName>
+				<displayName>haitia gurdo</displayName>
+				<displayName count="one">haitia gurdo</displayName>
+				<displayName count="other">haitiaj gurdoj</displayName>
 			</currency>
 			<currency type="HUF">
-				<displayName draft="unconfirmed">hungara forinto</displayName>
-				<displayName count="one" draft="unconfirmed">hungara forinto</displayName>
-				<displayName count="other" draft="unconfirmed">hungaraj forintoj</displayName>
+				<displayName>hungara forinto</displayName>
+				<displayName count="one">hungara forinto</displayName>
+				<displayName count="other">hungaraj forintoj</displayName>
 			</currency>
 			<currency type="IDR">
-				<displayName draft="unconfirmed">indonezia rupio</displayName>
-				<displayName count="one" draft="unconfirmed">indonezia rupio</displayName>
-				<displayName count="other" draft="unconfirmed">indoneziaj rupioj</displayName>
+				<displayName>indonezia rupio</displayName>
+				<displayName count="one">indonezia rupio</displayName>
+				<displayName count="other">indoneziaj rupioj</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName draft="unconfirmed">israela nova siklo</displayName>
-				<displayName count="one" draft="unconfirmed">israela nova siklo</displayName>
-				<displayName count="other" draft="unconfirmed">israelaj novaj sikloj</displayName>
-				<symbol draft="unconfirmed">ILS</symbol>
+				<displayName>israela nova siklo</displayName>
+				<displayName count="one">israela nova siklo</displayName>
+				<displayName count="other">israelaj novaj sikloj</displayName>
+				<symbol draft="contributed">ILS</symbol>
 			</currency>
 			<currency type="INR">
-				<displayName draft="unconfirmed">hinda rupio</displayName>
-				<displayName count="one" draft="unconfirmed">hinda rupio</displayName>
-				<displayName count="other" draft="unconfirmed">hindaj rupioj</displayName>
-				<symbol draft="unconfirmed">INR</symbol>
+				<displayName>hinda rupio</displayName>
+				<displayName count="one">hinda rupio</displayName>
+				<displayName count="other">hindaj rupioj</displayName>
+				<symbol draft="contributed">INR</symbol>
 			</currency>
 			<currency type="IQD">
-				<displayName draft="unconfirmed">iraka dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">iraka dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">irakaj dinaroj</displayName>
+				<displayName>iraka dinaro</displayName>
+				<displayName count="one">iraka dinaro</displayName>
+				<displayName count="other">irakaj dinaroj</displayName>
 			</currency>
 			<currency type="IRR">
-				<displayName draft="unconfirmed">irana rialo</displayName>
-				<displayName count="one" draft="unconfirmed">irana rialo</displayName>
-				<displayName count="other" draft="unconfirmed">iranaj rialoj</displayName>
+				<displayName>irana rialo</displayName>
+				<displayName count="one">irana rialo</displayName>
+				<displayName count="other">iranaj rialoj</displayName>
 			</currency>
 			<currency type="ISK">
-				<displayName draft="unconfirmed">islanda krono</displayName>
-				<displayName count="one" draft="unconfirmed">islanda krono</displayName>
-				<displayName count="other" draft="unconfirmed">islandaj kronoj</displayName>
+				<displayName>islanda krono</displayName>
+				<displayName count="one">islanda krono</displayName>
+				<displayName count="other">islandaj kronoj</displayName>
 			</currency>
 			<currency type="JMD">
-				<displayName draft="unconfirmed">jamajka dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">jamajka dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">jamajkaj dolaroj</displayName>
+				<displayName>jamajka dolaro</displayName>
+				<displayName count="one">jamajka dolaro</displayName>
+				<displayName count="other">jamajkaj dolaroj</displayName>
 			</currency>
 			<currency type="JOD">
-				<displayName draft="unconfirmed">jordania dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">jordania dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">jordaniaj dinaroj</displayName>
+				<displayName>jordania dinaro</displayName>
+				<displayName count="one">jordania dinaro</displayName>
+				<displayName count="other">jordaniaj dinaroj</displayName>
 			</currency>
 			<currency type="JPY">
-				<displayName draft="unconfirmed">japana eno</displayName>
-				<displayName count="one" draft="unconfirmed">japana eno</displayName>
-				<displayName count="other" draft="unconfirmed">japanaj enoj</displayName>
-				<symbol draft="unconfirmed">JPY</symbol>
+				<displayName>japana eno</displayName>
+				<displayName count="one">japana eno</displayName>
+				<displayName count="other">japanaj enoj</displayName>
+				<symbol draft="contributed">JPY</symbol>
 			</currency>
 			<currency type="KES">
-				<displayName draft="unconfirmed">kenja ŝilingo</displayName>
-				<displayName count="one" draft="unconfirmed">kenja ŝilingo</displayName>
-				<displayName count="other" draft="unconfirmed">kenjaj ŝilingoj</displayName>
+				<displayName>kenja ŝilingo</displayName>
+				<displayName count="one">kenja ŝilingo</displayName>
+				<displayName count="other">kenjaj ŝilingoj</displayName>
 			</currency>
 			<currency type="KGS">
-				<displayName draft="unconfirmed">kirgiza somo</displayName>
-				<displayName count="one" draft="unconfirmed">kirgiza somo</displayName>
-				<displayName count="other" draft="unconfirmed">kirgizaj somoj</displayName>
+				<displayName>kirgiza somo</displayName>
+				<displayName count="one">kirgiza somo</displayName>
+				<displayName count="other">kirgizaj somoj</displayName>
 			</currency>
 			<currency type="KHR">
-				<displayName draft="unconfirmed">kamboĝa rielo</displayName>
-				<displayName count="one" draft="unconfirmed">kamboĝa rielo</displayName>
-				<displayName count="other" draft="unconfirmed">kamboĝaj rieloj</displayName>
+				<displayName>kamboĝa rielo</displayName>
+				<displayName count="one">kamboĝa rielo</displayName>
+				<displayName count="other">kamboĝaj rieloj</displayName>
 			</currency>
 			<currency type="KMF">
-				<displayName draft="unconfirmed">komora franko</displayName>
-				<displayName count="one" draft="unconfirmed">komora franko</displayName>
-				<displayName count="other" draft="unconfirmed">komoraj frankoj</displayName>
+				<displayName>komora franko</displayName>
+				<displayName count="one">komora franko</displayName>
+				<displayName count="other">komoraj frankoj</displayName>
 			</currency>
 			<currency type="KPW">
-				<displayName draft="unconfirmed">nordkorea vono</displayName>
-				<displayName count="one" draft="unconfirmed">nordkorea vono</displayName>
-				<displayName count="other" draft="unconfirmed">nordkoreaj vonoj</displayName>
+				<displayName>nordkorea vono</displayName>
+				<displayName count="one">nordkorea vono</displayName>
+				<displayName count="other">nordkoreaj vonoj</displayName>
 			</currency>
 			<currency type="KRW">
-				<displayName draft="unconfirmed">sudkorea vono</displayName>
-				<displayName count="one" draft="unconfirmed">sudkorea vono</displayName>
-				<displayName count="other" draft="unconfirmed">sudkoreaj vonoj</displayName>
-				<symbol draft="unconfirmed">KRW</symbol>
+				<displayName>sudkorea vono</displayName>
+				<displayName count="one">sudkorea vono</displayName>
+				<displayName count="other">sudkoreaj vonoj</displayName>
+				<symbol draft="contributed">KRW</symbol>
 			</currency>
 			<currency type="KWD">
-				<displayName draft="unconfirmed">kuvajta dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">kuvajta dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">kuvajtaj dinaroj</displayName>
+				<displayName>kuvajta dinaro</displayName>
+				<displayName count="one">kuvajta dinaro</displayName>
+				<displayName count="other">kuvajtaj dinaroj</displayName>
 			</currency>
 			<currency type="KYD">
-				<displayName draft="unconfirmed">kajmana dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">kajmana dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">kajmanaj dolaroj</displayName>
+				<displayName>kajmana dolaro</displayName>
+				<displayName count="one">kajmana dolaro</displayName>
+				<displayName count="other">kajmanaj dolaroj</displayName>
 			</currency>
 			<currency type="KZT">
-				<displayName draft="unconfirmed">kazaĥa tengo</displayName>
-				<displayName count="one" draft="unconfirmed">kazaĥa tengo</displayName>
-				<displayName count="other" draft="unconfirmed">kazaĥaj tengoj</displayName>
+				<displayName>kazaĥa tengo</displayName>
+				<displayName count="one">kazaĥa tengo</displayName>
+				<displayName count="other">kazaĥaj tengoj</displayName>
 			</currency>
 			<currency type="LAK">
-				<displayName draft="unconfirmed">laosa kipo</displayName>
-				<displayName count="one" draft="unconfirmed">laosa kipo</displayName>
-				<displayName count="other" draft="unconfirmed">laosaj kipoj</displayName>
+				<displayName>laosa kipo</displayName>
+				<displayName count="one">laosa kipo</displayName>
+				<displayName count="other">laosaj kipoj</displayName>
 			</currency>
 			<currency type="LBP">
-				<displayName draft="unconfirmed">libana liro</displayName>
-				<displayName count="one" draft="unconfirmed">libana liro</displayName>
-				<displayName count="other" draft="unconfirmed">libanaj liroj</displayName>
+				<displayName>libana liro</displayName>
+				<displayName count="one">libana liro</displayName>
+				<displayName count="other">libanaj liroj</displayName>
 			</currency>
 			<currency type="LKR">
-				<displayName draft="unconfirmed">srilanka rupio</displayName>
-				<displayName count="one" draft="unconfirmed">srilanka rupio</displayName>
-				<displayName count="other" draft="unconfirmed">srilankaj rupioj</displayName>
-				<symbol alt="narrow" draft="unconfirmed">₨</symbol>
+				<displayName>srilanka rupio</displayName>
+				<displayName count="one">srilanka rupio</displayName>
+				<displayName count="other">srilankaj rupioj</displayName>
+				<symbol alt="narrow" draft="contributed">₨</symbol>
 			</currency>
 			<currency type="LRD">
-				<displayName draft="unconfirmed">liberia dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">liberia dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">liberiaj dolaroj</displayName>
+				<displayName>liberia dolaro</displayName>
+				<displayName count="one">liberia dolaro</displayName>
+				<displayName count="other">liberiaj dolaroj</displayName>
 			</currency>
 			<currency type="LSL">
-				<displayName draft="unconfirmed">lesota lotio</displayName>
-				<displayName count="one" draft="unconfirmed">lesota lotio</displayName>
-				<displayName count="other" draft="unconfirmed">lesotaj lotioj</displayName>
+				<displayName>lesota lotio</displayName>
+				<displayName count="one">lesota lotio</displayName>
+				<displayName count="other">lesotaj lotioj</displayName>
 			</currency>
 			<currency type="LYD">
-				<displayName draft="unconfirmed">libia dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">libia dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">libiaj dinaroj</displayName>
+				<displayName>libia dinaro</displayName>
+				<displayName count="one">libia dinaro</displayName>
+				<displayName count="other">libiaj dinaroj</displayName>
 			</currency>
 			<currency type="MAD">
-				<displayName draft="unconfirmed">maroka dirhamo</displayName>
-				<displayName count="one" draft="unconfirmed">maroka dirhamo</displayName>
-				<displayName count="other" draft="unconfirmed">marokaj dirhamoj</displayName>
+				<displayName>maroka dirhamo</displayName>
+				<displayName count="one">maroka dirhamo</displayName>
+				<displayName count="other">marokaj dirhamoj</displayName>
 			</currency>
 			<currency type="MDL">
-				<displayName draft="unconfirmed">moldava leo</displayName>
-				<displayName count="one" draft="unconfirmed">moldava leo</displayName>
-				<displayName count="other" draft="unconfirmed">moldavaj leoj</displayName>
+				<displayName>moldava leo</displayName>
+				<displayName count="one">moldava leo</displayName>
+				<displayName count="other">moldavaj leoj</displayName>
 			</currency>
 			<currency type="MGA">
-				<displayName draft="unconfirmed">madagaskara ariaro</displayName>
-				<displayName count="one" draft="unconfirmed">madagaskara ariaro</displayName>
-				<displayName count="other" draft="unconfirmed">madagaskaraj ariaroj</displayName>
+				<displayName>madagaskara ariaro</displayName>
+				<displayName count="one">madagaskara ariaro</displayName>
+				<displayName count="other">madagaskaraj ariaroj</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName draft="unconfirmed">makedona denaro</displayName>
-				<displayName count="one" draft="unconfirmed">makedona denaro</displayName>
-				<displayName count="other" draft="unconfirmed">makedonaj denaroj</displayName>
+				<displayName>makedona denaro</displayName>
+				<displayName count="one">makedona denaro</displayName>
+				<displayName count="other">makedonaj denaroj</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName draft="unconfirmed">birma kjato</displayName>
-				<displayName count="one" draft="unconfirmed">birma kjato</displayName>
-				<displayName count="other" draft="unconfirmed">birmaj kjatoj</displayName>
+				<displayName>birma kjato</displayName>
+				<displayName count="one">birma kjato</displayName>
+				<displayName count="other">birmaj kjatoj</displayName>
 			</currency>
 			<currency type="MNT">
-				<displayName draft="unconfirmed">mongola tugriko</displayName>
-				<displayName count="one" draft="unconfirmed">mongola tugriko</displayName>
-				<displayName count="other" draft="unconfirmed">mongolaj tugrikoj</displayName>
+				<displayName>mongola tugriko</displayName>
+				<displayName count="one">mongola tugriko</displayName>
+				<displayName count="other">mongolaj tugrikoj</displayName>
 			</currency>
 			<currency type="MOP">
-				<displayName draft="unconfirmed">makaa patako</displayName>
-				<displayName count="one" draft="unconfirmed">makaa patako</displayName>
-				<displayName count="other" draft="unconfirmed">makaaj patakoj</displayName>
+				<displayName>makaa patako</displayName>
+				<displayName count="one">makaa patako</displayName>
+				<displayName count="other">makaaj patakoj</displayName>
 			</currency>
 			<currency type="MRU">
-				<displayName draft="unconfirmed">maŭritania uguijao</displayName>
-				<displayName count="one" draft="unconfirmed">maŭritania uguijao</displayName>
-				<displayName count="other" draft="unconfirmed">maŭritaniaj uguijaoj</displayName>
+				<displayName>maŭritania uguijao</displayName>
+				<displayName count="one">maŭritania uguijao</displayName>
+				<displayName count="other">maŭritaniaj uguijaoj</displayName>
 			</currency>
 			<currency type="MUR">
-				<displayName draft="unconfirmed">maŭricia rupio</displayName>
-				<displayName count="one" draft="unconfirmed">maŭricia rupio</displayName>
-				<displayName count="other" draft="unconfirmed">maŭriciaj rupioj</displayName>
-				<symbol alt="narrow" draft="unconfirmed">₨</symbol>
+				<displayName>maŭricia rupio</displayName>
+				<displayName count="one">maŭricia rupio</displayName>
+				<displayName count="other">maŭriciaj rupioj</displayName>
+				<symbol alt="narrow" draft="contributed">₨</symbol>
 			</currency>
 			<currency type="MVR">
-				<displayName draft="unconfirmed">maldiva rufijao</displayName>
-				<displayName count="one" draft="unconfirmed">maldiva rufijao</displayName>
-				<displayName count="other" draft="unconfirmed">maldivaj rufijaoj</displayName>
+				<displayName>maldiva rufijao</displayName>
+				<displayName count="one">maldiva rufijao</displayName>
+				<displayName count="other">maldivaj rufijaoj</displayName>
 			</currency>
 			<currency type="MWK">
-				<displayName draft="unconfirmed">malavia kvaĉo</displayName>
-				<displayName count="one" draft="unconfirmed">malavia kvaĉo</displayName>
-				<displayName count="other" draft="unconfirmed">malaviaj kvaĉoj</displayName>
+				<displayName>malavia kvaĉo</displayName>
+				<displayName count="one">malavia kvaĉo</displayName>
+				<displayName count="other">malaviaj kvaĉoj</displayName>
 			</currency>
 			<currency type="MXN">
-				<displayName draft="unconfirmed">meksika peso</displayName>
-				<displayName count="one" draft="unconfirmed">meksika peso</displayName>
-				<displayName count="other" draft="unconfirmed">meksikaj pesoj</displayName>
-				<symbol draft="unconfirmed">MXN</symbol>
+				<displayName>meksika peso</displayName>
+				<displayName count="one">meksika peso</displayName>
+				<displayName count="other">meksikaj pesoj</displayName>
+				<symbol draft="contributed">MXN</symbol>
 			</currency>
 			<currency type="MYR">
-				<displayName draft="unconfirmed">malajzia ringito</displayName>
-				<displayName count="one" draft="unconfirmed">malajzia ringito</displayName>
-				<displayName count="other" draft="unconfirmed">malajziaj ringitoj</displayName>
+				<displayName>malajzia ringito</displayName>
+				<displayName count="one">malajzia ringito</displayName>
+				<displayName count="other">malajziaj ringitoj</displayName>
 			</currency>
 			<currency type="MZN">
-				<displayName draft="unconfirmed">mozambika metikalo</displayName>
-				<displayName count="one" draft="unconfirmed">mozambika metikalo</displayName>
-				<displayName count="other" draft="unconfirmed">mozambikaj metikaloj</displayName>
+				<displayName>mozambika metikalo</displayName>
+				<displayName count="one">mozambika metikalo</displayName>
+				<displayName count="other">mozambikaj metikaloj</displayName>
 			</currency>
 			<currency type="NAD">
-				<displayName draft="unconfirmed">namibia dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">namibia dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">namibiaj dolaroj</displayName>
+				<displayName>namibia dolaro</displayName>
+				<displayName count="one">namibia dolaro</displayName>
+				<displayName count="other">namibiaj dolaroj</displayName>
 			</currency>
 			<currency type="NGN">
-				<displayName draft="unconfirmed">niĝeria najro</displayName>
-				<displayName count="one" draft="unconfirmed">niĝeria najro</displayName>
-				<displayName count="other" draft="unconfirmed">niĝeriaj najroj</displayName>
+				<displayName>niĝeria najro</displayName>
+				<displayName count="one">niĝeria najro</displayName>
+				<displayName count="other">niĝeriaj najroj</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName draft="unconfirmed">nikaragva kordovo</displayName>
-				<displayName count="one" draft="unconfirmed">nikaragva kordovo</displayName>
-				<displayName count="other" draft="unconfirmed">nikaragvaj kordovoj</displayName>
+				<displayName>nikaragva kordovo</displayName>
+				<displayName count="one">nikaragva kordovo</displayName>
+				<displayName count="other">nikaragvaj kordovoj</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName draft="unconfirmed">norvega krono</displayName>
-				<displayName count="one" draft="unconfirmed">norvega krono</displayName>
-				<displayName count="other" draft="unconfirmed">norvegaj kronoj</displayName>
+				<displayName>norvega krono</displayName>
+				<displayName count="one">norvega krono</displayName>
+				<displayName count="other">norvegaj kronoj</displayName>
 			</currency>
 			<currency type="NPR">
-				<displayName draft="unconfirmed">nepala rupio</displayName>
-				<displayName count="one" draft="unconfirmed">nepala rupio</displayName>
-				<displayName count="other" draft="unconfirmed">nepalaj rupioj</displayName>
-				<symbol alt="narrow" draft="unconfirmed">₨</symbol>
+				<displayName>nepala rupio</displayName>
+				<displayName count="one">nepala rupio</displayName>
+				<displayName count="other">nepalaj rupioj</displayName>
+				<symbol alt="narrow" draft="contributed">₨</symbol>
 			</currency>
 			<currency type="NZD">
-				<displayName draft="unconfirmed">novzelanda dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">novzelanda dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">novzelandaj dolaroj</displayName>
-				<symbol draft="unconfirmed">NZD</symbol>
+				<displayName>novzelanda dolaro</displayName>
+				<displayName count="one">novzelanda dolaro</displayName>
+				<displayName count="other">novzelandaj dolaroj</displayName>
+				<symbol draft="contributed">NZD</symbol>
 			</currency>
 			<currency type="OMR">
-				<displayName draft="unconfirmed">omana rialo</displayName>
-				<displayName count="one" draft="unconfirmed">omana rialo</displayName>
-				<displayName count="other" draft="unconfirmed">omanaj rialoj</displayName>
+				<displayName>omana rialo</displayName>
+				<displayName count="one">omana rialo</displayName>
+				<displayName count="other">omanaj rialoj</displayName>
 			</currency>
 			<currency type="PAB">
-				<displayName draft="unconfirmed">panama balboo</displayName>
-				<displayName count="one" draft="unconfirmed">panama balboo</displayName>
-				<displayName count="other" draft="unconfirmed">panamaj balbooj</displayName>
+				<displayName>panama balboo</displayName>
+				<displayName count="one">panama balboo</displayName>
+				<displayName count="other">panamaj balbooj</displayName>
 			</currency>
 			<currency type="PEN">
-				<displayName draft="unconfirmed">perua suno</displayName>
-				<displayName count="one" draft="unconfirmed">perua suno</displayName>
-				<displayName count="other" draft="unconfirmed">peruaj sunoj</displayName>
+				<displayName>perua suno</displayName>
+				<displayName count="one">perua suno</displayName>
+				<displayName count="other">peruaj sunoj</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName draft="unconfirmed">papuonovgvinea kinao</displayName>
-				<displayName count="one" draft="unconfirmed">papuonovgvinea kinao</displayName>
-				<displayName count="other" draft="unconfirmed">papuonovgvineaj kinaoj</displayName>
+				<displayName>papuonovgvinea kinao</displayName>
+				<displayName count="one">papuonovgvinea kinao</displayName>
+				<displayName count="other">papuonovgvineaj kinaoj</displayName>
 			</currency>
 			<currency type="PHP">
-				<displayName draft="unconfirmed">filipina peso</displayName>
-				<displayName count="one" draft="unconfirmed">filipina peso</displayName>
-				<displayName count="other" draft="unconfirmed">filipinaj pesoj</displayName>
-				<symbol draft="unconfirmed">PHP</symbol>
+				<displayName>filipina peso</displayName>
+				<displayName count="one">filipina peso</displayName>
+				<displayName count="other">filipinaj pesoj</displayName>
+				<symbol draft="contributed">PHP</symbol>
 			</currency>
 			<currency type="PKR">
-				<displayName draft="unconfirmed">pakistana rupio</displayName>
-				<displayName count="one" draft="unconfirmed">pakistana rupio</displayName>
-				<displayName count="other" draft="unconfirmed">pakistanaj rupioj</displayName>
-				<symbol alt="narrow" draft="unconfirmed">₨</symbol>
+				<displayName>pakistana rupio</displayName>
+				<displayName count="one">pakistana rupio</displayName>
+				<displayName count="other">pakistanaj rupioj</displayName>
+				<symbol alt="narrow" draft="contributed">₨</symbol>
 			</currency>
 			<currency type="PLN">
-				<displayName draft="unconfirmed">pola zloto</displayName>
-				<displayName count="one" draft="unconfirmed">pola zloto</displayName>
-				<displayName count="other" draft="unconfirmed">polaj zlotoj</displayName>
+				<displayName>pola zloto</displayName>
+				<displayName count="one">pola zloto</displayName>
+				<displayName count="other">polaj zlotoj</displayName>
 			</currency>
 			<currency type="PYG">
-				<displayName draft="unconfirmed">paragvaja gvaranio</displayName>
-				<displayName count="one" draft="unconfirmed">paragvaja gvaranio</displayName>
-				<displayName count="other" draft="unconfirmed">paragvajaj gvaranioj</displayName>
+				<displayName>paragvaja gvaranio</displayName>
+				<displayName count="one">paragvaja gvaranio</displayName>
+				<displayName count="other">paragvajaj gvaranioj</displayName>
 			</currency>
 			<currency type="QAR">
-				<displayName draft="unconfirmed">katara rialo</displayName>
-				<displayName count="one" draft="unconfirmed">katara rialo</displayName>
-				<displayName count="other" draft="unconfirmed">kataraj rialoj</displayName>
+				<displayName>katara rialo</displayName>
+				<displayName count="one">katara rialo</displayName>
+				<displayName count="other">kataraj rialoj</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName draft="unconfirmed">rumana leo</displayName>
-				<displayName count="one" draft="unconfirmed">rumana leo</displayName>
-				<displayName count="other" draft="unconfirmed">rumanaj leoj</displayName>
+				<displayName>rumana leo</displayName>
+				<displayName count="one">rumana leo</displayName>
+				<displayName count="other">rumanaj leoj</displayName>
 			</currency>
 			<currency type="RSD">
-				<displayName draft="unconfirmed">serba dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">serba dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">serbaj dinaroj</displayName>
+				<displayName>serba dinaro</displayName>
+				<displayName count="one">serba dinaro</displayName>
+				<displayName count="other">serbaj dinaroj</displayName>
 			</currency>
 			<currency type="RUB">
-				<displayName draft="unconfirmed">rusa rublo</displayName>
-				<displayName count="one" draft="unconfirmed">rusa rublo</displayName>
-				<displayName count="other" draft="unconfirmed">rusaj rubloj</displayName>
+				<displayName>rusa rublo</displayName>
+				<displayName count="one">rusa rublo</displayName>
+				<displayName count="other">rusaj rubloj</displayName>
 			</currency>
 			<currency type="RWF">
-				<displayName draft="unconfirmed">ruanda franko</displayName>
-				<displayName count="one" draft="unconfirmed">ruanda franko</displayName>
-				<displayName count="other" draft="unconfirmed">ruandaj frankoj</displayName>
+				<displayName>ruanda franko</displayName>
+				<displayName count="one">ruanda franko</displayName>
+				<displayName count="other">ruandaj frankoj</displayName>
 			</currency>
 			<currency type="SAR">
-				<displayName draft="unconfirmed">sauda rialo</displayName>
-				<displayName count="one" draft="unconfirmed">sauda rialo</displayName>
-				<displayName count="other" draft="unconfirmed">saudaj rialoj</displayName>
+				<displayName>sauda rialo</displayName>
+				<displayName count="one">sauda rialo</displayName>
+				<displayName count="other">saudaj rialoj</displayName>
 			</currency>
 			<currency type="SBD">
-				<displayName draft="unconfirmed">salomona dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">salomona dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">salomonaj dolaroj</displayName>
+				<displayName>salomona dolaro</displayName>
+				<displayName count="one">salomona dolaro</displayName>
+				<displayName count="other">salomonaj dolaroj</displayName>
 			</currency>
 			<currency type="SCR">
-				<displayName draft="unconfirmed">sejŝela rupio</displayName>
-				<displayName count="one" draft="unconfirmed">sejŝela rupio</displayName>
-				<displayName count="other" draft="unconfirmed">sejŝelaj rupioj</displayName>
+				<displayName>sejŝela rupio</displayName>
+				<displayName count="one">sejŝela rupio</displayName>
+				<displayName count="other">sejŝelaj rupioj</displayName>
 			</currency>
 			<currency type="SDG">
-				<displayName draft="unconfirmed">sudana pundo</displayName>
-				<displayName count="one" draft="unconfirmed">sudana pundo</displayName>
-				<displayName count="other" draft="unconfirmed">sudanaj pundoj</displayName>
+				<displayName>sudana pundo</displayName>
+				<displayName count="one">sudana pundo</displayName>
+				<displayName count="other">sudanaj pundoj</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName draft="unconfirmed">sveda krono</displayName>
-				<displayName count="one" draft="unconfirmed">sveda krono</displayName>
-				<displayName count="other" draft="unconfirmed">svedaj kronoj</displayName>
+				<displayName>sveda krono</displayName>
+				<displayName count="one">sveda krono</displayName>
+				<displayName count="other">svedaj kronoj</displayName>
 			</currency>
 			<currency type="SGD">
-				<displayName draft="unconfirmed">singapura dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">singapura dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">singapuraj dolaroj</displayName>
+				<displayName>singapura dolaro</displayName>
+				<displayName count="one">singapura dolaro</displayName>
+				<displayName count="other">singapuraj dolaroj</displayName>
 			</currency>
 			<currency type="SHP">
-				<displayName draft="unconfirmed">sankthelena pundo</displayName>
-				<displayName count="one" draft="unconfirmed">sankthelena pundo</displayName>
-				<displayName count="other" draft="unconfirmed">sankthelenaj pundoj</displayName>
+				<displayName>sankthelena pundo</displayName>
+				<displayName count="one">sankthelena pundo</displayName>
+				<displayName count="other">sankthelenaj pundoj</displayName>
 			</currency>
 			<currency type="SLE">
-				<displayName draft="unconfirmed">sieraleona leono</displayName>
-				<displayName count="one" draft="unconfirmed">sieraleona leono</displayName>
-				<displayName count="other" draft="unconfirmed">sieraleonaj leonoj</displayName>
+				<displayName>sieraleona leono</displayName>
+				<displayName count="one">sieraleona leono</displayName>
+				<displayName count="other">sieraleonaj leonoj</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName draft="unconfirmed">sieraleona leono (1964–2022)</displayName>
-				<displayName count="one" draft="unconfirmed">sieraleona leono (1964–2022)</displayName>
-				<displayName count="other" draft="unconfirmed">sieraleonaj leonoj (1964–2022)</displayName>
+				<displayName>sieraleona leono (1964–2022)</displayName>
+				<displayName count="one">sieraleona leono (1964–2022)</displayName>
+				<displayName count="other">sieraleonaj leonoj (1964–2022)</displayName>
 			</currency>
 			<currency type="SOS">
-				<displayName draft="unconfirmed">somala ŝilingo</displayName>
-				<displayName count="one" draft="unconfirmed">somala ŝilingo</displayName>
-				<displayName count="other" draft="unconfirmed">somalaj ŝilingoj</displayName>
+				<displayName>somala ŝilingo</displayName>
+				<displayName count="one">somala ŝilingo</displayName>
+				<displayName count="other">somalaj ŝilingoj</displayName>
 			</currency>
 			<currency type="SRD">
-				<displayName draft="unconfirmed">surinama dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">surinama dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">surinamaj dolaroj</displayName>
+				<displayName>surinama dolaro</displayName>
+				<displayName count="one">surinama dolaro</displayName>
+				<displayName count="other">surinamaj dolaroj</displayName>
 			</currency>
 			<currency type="SSP">
-				<displayName draft="unconfirmed">sudsudana pundo</displayName>
-				<displayName count="one" draft="unconfirmed">sudsudana pundo</displayName>
-				<displayName count="other" draft="unconfirmed">sudsudanaj pundoj</displayName>
+				<displayName>sudsudana pundo</displayName>
+				<displayName count="one">sudsudana pundo</displayName>
+				<displayName count="other">sudsudanaj pundoj</displayName>
 			</currency>
 			<currency type="STN">
-				<displayName draft="unconfirmed">santomea dobro</displayName>
-				<displayName count="one" draft="unconfirmed">santomea dobro</displayName>
-				<displayName count="other" draft="unconfirmed">santomeaj dobroj</displayName>
+				<displayName>santomea dobro</displayName>
+				<displayName count="one">santomea dobro</displayName>
+				<displayName count="other">santomeaj dobroj</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName draft="unconfirmed">siria pundo</displayName>
-				<displayName count="one" draft="unconfirmed">siria pundo</displayName>
-				<displayName count="other" draft="unconfirmed">siriaj pundoj</displayName>
+				<displayName>siria pundo</displayName>
+				<displayName count="one">siria pundo</displayName>
+				<displayName count="other">siriaj pundoj</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName draft="unconfirmed">svazilanda liliagenio</displayName>
-				<displayName count="one" draft="unconfirmed">svazia lilangenio</displayName>
-				<displayName count="other" draft="unconfirmed">svaziaj lilangenioj</displayName>
+				<displayName>svazilanda liliagenio</displayName>
+				<displayName count="one">svazia lilangenio</displayName>
+				<displayName count="other">svaziaj lilangenioj</displayName>
 			</currency>
 			<currency type="THB">
-				<displayName draft="unconfirmed">taja bahto</displayName>
-				<displayName count="one" draft="unconfirmed">taja bahto</displayName>
-				<displayName count="other" draft="unconfirmed">tajaj bahtoj</displayName>
+				<displayName>taja bahto</displayName>
+				<displayName count="one">taja bahto</displayName>
+				<displayName count="other">tajaj bahtoj</displayName>
 			</currency>
 			<currency type="TJS">
-				<displayName draft="unconfirmed">taĝika somonio</displayName>
-				<displayName count="one" draft="unconfirmed">taĝika somonio</displayName>
-				<displayName count="other" draft="unconfirmed">taĝikaj somonioj</displayName>
+				<displayName>taĝika somonio</displayName>
+				<displayName count="one">taĝika somonio</displayName>
+				<displayName count="other">taĝikaj somonioj</displayName>
 			</currency>
 			<currency type="TMT">
-				<displayName draft="unconfirmed">turkmena manato</displayName>
-				<displayName count="one" draft="unconfirmed">turkmena manato</displayName>
-				<displayName count="other" draft="unconfirmed">turkmenaj manatoj</displayName>
+				<displayName>turkmena manato</displayName>
+				<displayName count="one">turkmena manato</displayName>
+				<displayName count="other">turkmenaj manatoj</displayName>
 			</currency>
 			<currency type="TND">
-				<displayName draft="unconfirmed">tunizia dinaro</displayName>
-				<displayName count="one" draft="unconfirmed">tunizia dinaro</displayName>
-				<displayName count="other" draft="unconfirmed">tuniziaj dinaroj</displayName>
+				<displayName>tunizia dinaro</displayName>
+				<displayName count="one">tunizia dinaro</displayName>
+				<displayName count="other">tuniziaj dinaroj</displayName>
 			</currency>
 			<currency type="TOP">
-				<displayName draft="unconfirmed">tonga paangao</displayName>
-				<displayName count="one" draft="unconfirmed">tonga paangao</displayName>
-				<displayName count="other" draft="unconfirmed">tongaj paangaoj</displayName>
+				<displayName>tonga paangao</displayName>
+				<displayName count="one">tonga paangao</displayName>
+				<displayName count="other">tongaj paangaoj</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName draft="unconfirmed">turka liro</displayName>
-				<displayName count="one" draft="unconfirmed">turka liro</displayName>
-				<displayName count="other" draft="unconfirmed">turkaj liroj</displayName>
+				<displayName>turka liro</displayName>
+				<displayName count="one">turka liro</displayName>
+				<displayName count="other">turkaj liroj</displayName>
+				<symbol alt="variant" draft="contributed">TRY</symbol>
 			</currency>
 			<currency type="TTD">
-				<displayName draft="unconfirmed">trinidada dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">trinidada dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">trinidadaj dolaroj</displayName>
+				<displayName>trinidada dolaro</displayName>
+				<displayName count="one">trinidada dolaro</displayName>
+				<displayName count="other">trinidadaj dolaroj</displayName>
 			</currency>
 			<currency type="TWD">
-				<displayName draft="unconfirmed">tajvana nova dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">tajvana nova dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">tajvanaj novaj dolaroj</displayName>
-				<symbol draft="unconfirmed">TWD</symbol>
-				<symbol alt="narrow" draft="unconfirmed">NT$</symbol>
+				<displayName>tajvana nova dolaro</displayName>
+				<displayName count="one">tajvana nova dolaro</displayName>
+				<displayName count="other">tajvanaj novaj dolaroj</displayName>
+				<symbol draft="contributed">TWD</symbol>
 			</currency>
 			<currency type="TZS">
-				<displayName draft="unconfirmed">tanzania ŝilingo</displayName>
-				<displayName count="one" draft="unconfirmed">tanzania ŝilingo</displayName>
-				<displayName count="other" draft="unconfirmed">tanzaniaj ŝilingoj</displayName>
+				<displayName>tanzania ŝilingo</displayName>
+				<displayName count="one">tanzania ŝilingo</displayName>
+				<displayName count="other">tanzaniaj ŝilingoj</displayName>
 			</currency>
 			<currency type="UAH">
-				<displayName draft="unconfirmed">ukraina hrivno</displayName>
-				<displayName count="one" draft="unconfirmed">ukraina hrivno</displayName>
-				<displayName count="other" draft="unconfirmed">ukrainaj hrivnoj</displayName>
+				<displayName>ukraina hrivno</displayName>
+				<displayName count="one">ukraina hrivno</displayName>
+				<displayName count="other">ukrainaj hrivnoj</displayName>
 			</currency>
 			<currency type="UGX">
-				<displayName draft="unconfirmed">uganda ŝilingo</displayName>
-				<displayName count="one" draft="unconfirmed">uganda ŝilingo</displayName>
-				<displayName count="other" draft="unconfirmed">ugandaj ŝilingoj</displayName>
+				<displayName>uganda ŝilingo</displayName>
+				<displayName count="one">uganda ŝilingo</displayName>
+				<displayName count="other">ugandaj ŝilingoj</displayName>
 			</currency>
 			<currency type="USD">
-				<displayName draft="unconfirmed">usona dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">usona dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">usonaj dolaroj</displayName>
-				<symbol draft="unconfirmed">USD</symbol>
+				<displayName>usona dolaro</displayName>
+				<displayName count="one">usona dolaro</displayName>
+				<displayName count="other">usonaj dolaroj</displayName>
+				<symbol draft="contributed">USD</symbol>
 			</currency>
 			<currency type="UYU">
-				<displayName draft="unconfirmed">urugvaja peso</displayName>
-				<displayName count="one" draft="unconfirmed">urugvaja peso</displayName>
-				<displayName count="other" draft="unconfirmed">urugvajaj pesoj</displayName>
+				<displayName>urugvaja peso</displayName>
+				<displayName count="one">urugvaja peso</displayName>
+				<displayName count="other">urugvajaj pesoj</displayName>
 			</currency>
 			<currency type="UZS">
-				<displayName draft="unconfirmed">uzbeka somo</displayName>
-				<displayName count="one" draft="unconfirmed">uzbeka somo</displayName>
-				<displayName count="other" draft="unconfirmed">uzbekaj somoj</displayName>
+				<displayName>uzbeka somo</displayName>
+				<displayName count="one">uzbeka somo</displayName>
+				<displayName count="other">uzbekaj somoj</displayName>
 			</currency>
 			<currency type="VES">
-				<displayName draft="unconfirmed">venezuela bolivaro</displayName>
-				<displayName count="one" draft="unconfirmed">venezuela bolivaro</displayName>
-				<displayName count="other" draft="unconfirmed">venezuelaj bolivaroj</displayName>
+				<displayName>venezuela bolivaro</displayName>
+				<displayName count="one">venezuela bolivaro</displayName>
+				<displayName count="other">venezuelaj bolivaroj</displayName>
 			</currency>
 			<currency type="VND">
-				<displayName draft="unconfirmed">vjetnama dongo</displayName>
-				<displayName count="one" draft="unconfirmed">vjetnama dongo</displayName>
-				<displayName count="other" draft="unconfirmed">vjetnamaj dongoj</displayName>
-				<symbol draft="unconfirmed">VND</symbol>
+				<displayName>vjetnama dongo</displayName>
+				<displayName count="one">vjetnama dongo</displayName>
+				<displayName count="other">vjetnamaj dongoj</displayName>
+				<symbol draft="contributed">VND</symbol>
 			</currency>
 			<currency type="VUV">
-				<displayName draft="unconfirmed">vanuatua vatuo</displayName>
-				<displayName count="one" draft="unconfirmed">vanuatua vatuo</displayName>
-				<displayName count="other" draft="unconfirmed">vanuatuaj vatuoj</displayName>
+				<displayName>vanuatua vatuo</displayName>
+				<displayName count="one">vanuatua vatuo</displayName>
+				<displayName count="other">vanuatuaj vatuoj</displayName>
 			</currency>
 			<currency type="WST">
-				<displayName draft="unconfirmed">samoa talao</displayName>
-				<displayName count="one" draft="unconfirmed">samoa talao</displayName>
-				<displayName count="other" draft="unconfirmed">samoaj talaoj</displayName>
+				<displayName>samoa talao</displayName>
+				<displayName count="one">samoa talao</displayName>
+				<displayName count="other">samoaj talaoj</displayName>
 			</currency>
 			<currency type="XAF">
-				<displayName draft="unconfirmed">ekvatorafrika franko</displayName>
-				<displayName count="one" draft="unconfirmed">ekvatorafrika franko</displayName>
-				<displayName count="other" draft="unconfirmed">ekvatorafrikaj frankoj</displayName>
-				<symbol draft="unconfirmed">XAF</symbol>
+				<displayName>ekvatorafrika franko</displayName>
+				<displayName count="one">ekvatorafrika franko</displayName>
+				<displayName count="other">ekvatorafrikaj frankoj</displayName>
+				<symbol draft="contributed">XAF</symbol>
 			</currency>
 			<currency type="XAG">
 				<displayName draft="unconfirmed">arĝento</displayName>
@@ -4614,292 +4797,622 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">eŭropa monunuo</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName draft="unconfirmed">orientkariba dolaro</displayName>
-				<displayName count="one" draft="unconfirmed">orientkariba dolaro</displayName>
-				<displayName count="other" draft="unconfirmed">orientkaribaj dolaroj</displayName>
-				<symbol draft="unconfirmed">XCD</symbol>
+				<displayName>orientkariba dolaro</displayName>
+				<displayName count="one">orientkariba dolaro</displayName>
+				<displayName count="other">orientkaribaj dolaroj</displayName>
+				<symbol draft="contributed">XCD</symbol>
+			</currency>
+			<currency type="XCG">
+				<displayName>kariba guldeno</displayName>
+				<displayName count="one">kariba guldeno</displayName>
+				<displayName count="other">karibaj guldenoj</displayName>
+				<symbol draft="contributed">XCG</symbol>
 			</currency>
 			<currency type="XFO">
 				<displayName draft="unconfirmed">franca ora franko</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName draft="unconfirmed">okcidentafrika franko</displayName>
-				<displayName count="one" draft="unconfirmed">okcidentafrika franko</displayName>
-				<displayName count="other" draft="unconfirmed">okcidentafrikaj frankoj</displayName>
-				<symbol draft="unconfirmed">XOF</symbol>
+				<displayName>okcidentafrika franko</displayName>
+				<displayName count="one">okcidentafrika franko</displayName>
+				<displayName count="other">okcidentafrikaj frankoj</displayName>
+				<symbol draft="contributed">XOF</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName draft="unconfirmed">paladio</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName draft="unconfirmed">pacifika franko</displayName>
-				<displayName count="one" draft="unconfirmed">pacifika franko</displayName>
-				<displayName count="other" draft="unconfirmed">pacifikaj frankoj</displayName>
-				<symbol draft="unconfirmed">XPF</symbol>
+				<displayName>pacifika franko</displayName>
+				<displayName count="one">pacifika franko</displayName>
+				<displayName count="other">pacifikaj frankoj</displayName>
+				<symbol draft="contributed">XPF</symbol>
 			</currency>
 			<currency type="XPT">
 				<displayName draft="unconfirmed">plateno</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName draft="unconfirmed">nekonata monunuo</displayName>
-				<displayName count="one" draft="unconfirmed">(nekunata monunuo)</displayName>
-				<displayName count="other" draft="unconfirmed">(nekonata monunuo)</displayName>
+				<displayName>nekonata monunuo</displayName>
+				<displayName count="one">(nekunata monunuo)</displayName>
+				<displayName count="other">(nekonata monunuo)</displayName>
 			</currency>
 			<currency type="YER">
-				<displayName draft="unconfirmed">jemena rialo</displayName>
-				<displayName count="one" draft="unconfirmed">jemena rialo</displayName>
-				<displayName count="other" draft="unconfirmed">jemenaj rialoj</displayName>
+				<displayName>jemena rialo</displayName>
+				<displayName count="one">jemena rialo</displayName>
+				<displayName count="other">jemenaj rialoj</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName draft="unconfirmed">sudafrika rando</displayName>
-				<displayName count="one" draft="unconfirmed">sudafrika rando</displayName>
-				<displayName count="other" draft="unconfirmed">sudafrikaj randoj</displayName>
+				<displayName>sudafrika rando</displayName>
+				<displayName count="one">sudafrika rando</displayName>
+				<displayName count="other">sudafrikaj randoj</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName draft="unconfirmed">zambia kvaĉo</displayName>
-				<displayName count="one" draft="unconfirmed">zambia kvaĉo</displayName>
-				<displayName count="other" draft="unconfirmed">zambiaj kvaĉoj</displayName>
+				<displayName>zambia kvaĉo</displayName>
+				<displayName count="one">zambia kvaĉo</displayName>
+				<displayName count="other">zambiaj kvaĉoj</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabva oro</displayName>
+				<displayName count="one">zimbabva oro</displayName>
+				<displayName count="other">zimbabvaj oroj</displayName>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
-			<pattern type="approximately" draft="unconfirmed">≈{0}</pattern>
+			<pattern type="approximately">≈{0}</pattern>
 		</miscPatterns>
 		<minimalPairs>
-			<pluralMinimalPairs count="one" draft="unconfirmed">{0} tago</pluralMinimalPairs>
-			<pluralMinimalPairs count="other" draft="unconfirmed">{0} tagoj</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other" draft="unconfirmed">Turniĝu al {0}-a dekstro.</ordinalMinimalPairs>
+			<pluralMinimalPairs count="one" draft="contributed">{0} tago</pluralMinimalPairs>
+			<pluralMinimalPairs count="other" draft="contributed">{0} tagoj</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">Turniĝu al {0}-a dekstro.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>deci{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>centi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>mili{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>mikro{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>nano{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>piko{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>femto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>ato{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>zepto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>jokto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>ronto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>kvekto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>deka{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>hekto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>kilo{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>mega{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>giga{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>tera{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>peta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>eksa{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>zeta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>jota{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>rona{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>kveta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>kibi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>mebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>gibi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>tebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>pebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>eksbi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>zebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>jobi{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="per">
-				<compoundUnitPattern draft="unconfirmed">po {0} por {1}</compoundUnitPattern>
+				<compoundUnitPattern>po {0} je {1}</compoundUnitPattern>
+			</compoundUnit>
+			<compoundUnit type="power2">
+				<compoundUnitPattern1 count="one">kvadrat{0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">kvadrat{0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="one">kub{0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">kub{0}</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="times">
-				<compoundUnitPattern draft="unconfirmed">{0} oble {1}</compoundUnitPattern>
+				<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
 			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>tera akcelo</displayName>
+				<unitPattern count="one">{0} tera akcelo</unitPattern>
+				<unitPattern count="other">{0} teraj akceloj</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>metroj en kvadrata sekundo</displayName>
+				<unitPattern count="one">po {0} metro en kvadratsekundo</unitPattern>
+				<unitPattern count="other">po {0} metroj en kvadratsekundo</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rivoluoj</displayName>
+				<unitPattern count="one">{0} rivoluo</unitPattern>
+				<unitPattern count="other">{0} rivoluoj</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radianoj</displayName>
+				<unitPattern count="one">{0} radiano</unitPattern>
+				<unitPattern count="other">{0} radianoj</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>gradoj</displayName>
+				<unitPattern count="one">{0} grado</unitPattern>
+				<unitPattern count="other">{0} gradoj</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>arkminutoj</displayName>
+				<unitPattern count="one">{0} arkminuto</unitPattern>
+				<unitPattern count="other">{0} arkminutoj</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>arksekundoj</displayName>
+				<unitPattern count="one">{0} arksekundo</unitPattern>
+				<unitPattern count="other">{0} arksekundoj</unitPattern>
+			</unit>
 			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">kvadrataj kilometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata kilometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj kilometroj</unitPattern>
+				<displayName>kvadrataj kilometroj</displayName>
+				<unitPattern count="one">{0} kvadratkilometro</unitPattern>
+				<unitPattern count="other">{0} kvadratkilometroj</unitPattern>
+				<perUnitPattern>po {0} sur kvadratkilometro</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName draft="unconfirmed">hektaroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} hektaro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} hektaroj</unitPattern>
+				<displayName>hektaroj</displayName>
+				<unitPattern count="one">{0} hektaro</unitPattern>
+				<unitPattern count="other">{0} hektaroj</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">kvadrataj metroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata metro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj metroj</unitPattern>
+				<displayName>kvadrataj metroj</displayName>
+				<unitPattern count="one">{0} kvadratmetro</unitPattern>
+				<unitPattern count="other">{0} kvadratmetroj</unitPattern>
+				<perUnitPattern>po {0} sur kvadratmetro</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">kvadrataj centimetroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata centimetro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj centimetroj</unitPattern>
+				<displayName>kvadrataj centimetroj</displayName>
+				<unitPattern count="one">{0} kvadratcentimetro</unitPattern>
+				<unitPattern count="other">{0} kvadratcentimetroj</unitPattern>
+				<perUnitPattern>po {0} sur kvadratcentimetro</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">kvadrataj mejloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata mejlo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj mejloj</unitPattern>
+				<displayName>kvadrataj mejloj</displayName>
+				<unitPattern count="one">{0} kvadratmejlo</unitPattern>
+				<unitPattern count="other">{0} kvadratmejloj</unitPattern>
+				<perUnitPattern>po {0} sur kvadratmejlo</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
-				<displayName draft="unconfirmed">akreoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} akreo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} akreoj</unitPattern>
+				<displayName>akreoj</displayName>
+				<unitPattern count="one">{0} akreo</unitPattern>
+				<unitPattern count="other">{0} akreoj</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">kvadrataj jardoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata jardo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj jardoj</unitPattern>
+				<displayName>kvadrataj jardoj</displayName>
+				<unitPattern count="one">{0} kvadratjardo</unitPattern>
+				<unitPattern count="other">{0} kvadratjardoj</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">kvadrataj futoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata futo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj futoj</unitPattern>
+				<displayName>kvadrataj futoj</displayName>
+				<unitPattern count="one">{0} kvadratfuto</unitPattern>
+				<unitPattern count="other">{0} kvadratfutoj</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">kvadrataj coloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kvadrata colo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kvadrataj coloj</unitPattern>
+				<displayName>kvadrataj coloj</displayName>
+				<unitPattern count="one">{0} kvadratcolo</unitPattern>
+				<unitPattern count="other">{0} kvadratcoloj</unitPattern>
+				<perUnitPattern>po {0} sur kvadratcolo</perUnitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karatoj</displayName>
+				<unitPattern count="one">{0} karato</unitPattern>
+				<unitPattern count="other">{0} karatoj</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>miligramoj en decilitro</displayName>
+				<unitPattern count="one">po {0} miligramo en decilitro</unitPattern>
+				<unitPattern count="other">po {0} miligramoj en decilitro</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>milimoloj en litro</displayName>
+				<unitPattern count="one">po {0} milimolo en litro</unitPattern>
+				<unitPattern count="other">po {0} milimoloj en litro</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>ekzempleroj</displayName>
+				<unitPattern count="one">{0} ekzemplero</unitPattern>
+				<unitPattern count="other">{0} ekzempleroj</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>miliononoj</displayName>
+				<unitPattern count="one">{0} milionono</unitPattern>
+				<unitPattern count="other">{0} miliononoj</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>centonoj</displayName>
+				<unitPattern count="one">{0} centono</unitPattern>
+				<unitPattern count="other">{0} centonoj</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>milonoj</displayName>
+				<unitPattern count="one">{0} milono</unitPattern>
+				<unitPattern count="other">{0} milonoj</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>dekmilonoj</displayName>
+				<unitPattern count="one">{0} dekmilono</unitPattern>
+				<unitPattern count="other">{0} dekmilonoj</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>moloj</displayName>
+				<unitPattern count="one">{0} molo</unitPattern>
+				<unitPattern count="other">{0} moloj</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>da glukozo</displayName>
+				<unitPattern count="one">{0} da glukozo</unitPattern>
+				<unitPattern count="other">{0} da glukozo</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>litroj por kilometro</displayName>
+				<unitPattern count="one">po {0} litro por kilometro</unitPattern>
+				<unitPattern count="other">po {0} litroj por kilometro</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>litroj por 100 kilometroj</displayName>
+				<unitPattern count="one">po {0} litro por 100 kilometroj</unitPattern>
+				<unitPattern count="other">po {0} litroj por 100 kilometroj</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>petabitokoj</displayName>
+				<unitPattern count="one">{0} petabitoko</unitPattern>
+				<unitPattern count="other">{0} petabitokoj</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">terabajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} terabajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} terabajtoj</unitPattern>
+				<displayName>terabitokoj</displayName>
+				<unitPattern count="one">{0} terabitoko</unitPattern>
+				<unitPattern count="other">{0} terabitokoj</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">terabitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} terabito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} terabitoj</unitPattern>
+				<displayName>terabitoj</displayName>
+				<unitPattern count="one">{0} terabito</unitPattern>
+				<unitPattern count="other">{0} terabitoj</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">gigabajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gigabajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gigabajtoj</unitPattern>
+				<displayName>gigabitokoj</displayName>
+				<unitPattern count="one">{0} gigabitoko</unitPattern>
+				<unitPattern count="other">{0} gigabitokoj</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">gigabitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gigabito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gigabitoj</unitPattern>
+				<displayName>gigabitoj</displayName>
+				<unitPattern count="one">{0} gigabito</unitPattern>
+				<unitPattern count="other">{0} gigabitoj</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">megabajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} megabajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} megabajtoj</unitPattern>
+				<displayName>megabitokoj</displayName>
+				<unitPattern count="one">{0} megabitoko</unitPattern>
+				<unitPattern count="other">{0} megabitokoj</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">megabitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} megabito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} megabitoj</unitPattern>
+				<displayName>megabitoj</displayName>
+				<unitPattern count="one">{0} megabito</unitPattern>
+				<unitPattern count="other">{0} megabitoj</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">kilobajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilobajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilobajtoj</unitPattern>
+				<displayName>kilobitokoj</displayName>
+				<unitPattern count="one">{0} kilobitoko</unitPattern>
+				<unitPattern count="other">{0} kilobitokoj</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">kilobitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilobito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilobitoj</unitPattern>
+				<displayName>kilobitoj</displayName>
+				<unitPattern count="one">{0} kilobito</unitPattern>
+				<unitPattern count="other">{0} kilobitoj</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<displayName draft="unconfirmed">bajtoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} bajto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} bajtoj</unitPattern>
+				<displayName>bitokoj</displayName>
+				<unitPattern count="one">{0} bitoko</unitPattern>
+				<unitPattern count="other">{0} bitokoj</unitPattern>
 			</unit>
 			<unit type="digital-bit">
-				<displayName draft="unconfirmed">bitoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} bito</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} bitoj</unitPattern>
+				<displayName>bitoj</displayName>
+				<unitPattern count="one">{0} bito</unitPattern>
+				<unitPattern count="other">{0} bitoj</unitPattern>
 			</unit>
 			<unit type="duration-century">
-				<displayName draft="unconfirmed">jarcentoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jarcento</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jarcentoj</unitPattern>
+				<displayName>jarcentoj</displayName>
+				<unitPattern count="one">{0} jarcento</unitPattern>
+				<unitPattern count="other">{0} jarcentoj</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">jardekoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jardeko</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jardekoj</unitPattern>
+				<displayName>jardekoj</displayName>
+				<unitPattern count="one">{0} jardeko</unitPattern>
+				<unitPattern count="other">{0} jardekoj</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">jaroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jaro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jaroj</unitPattern>
-				<perUnitPattern draft="unconfirmed">po {0} por jaro</perUnitPattern>
+				<displayName>jaroj</displayName>
+				<unitPattern count="one">{0} jaro</unitPattern>
+				<unitPattern count="other">{0} jaroj</unitPattern>
+				<perUnitPattern>po {0} en jaro</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>jarkvaronoj</displayName>
+				<unitPattern count="one">{0} jarkvarono</unitPattern>
+				<unitPattern count="other">{0} jarkvaronoj</unitPattern>
+				<perUnitPattern>po {0} en jarkvarono</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName draft="unconfirmed">monatoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} monato</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} monatoj</unitPattern>
+				<displayName>monatoj</displayName>
+				<unitPattern count="one">{0} monato</unitPattern>
+				<unitPattern count="other">{0} monatoj</unitPattern>
+				<perUnitPattern>po {0} en monato</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName draft="unconfirmed">semajnoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} semajno</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} semajnoj</unitPattern>
+				<displayName>semajnoj</displayName>
+				<unitPattern count="one">{0} semajno</unitPattern>
+				<unitPattern count="other">{0} semajnoj</unitPattern>
+				<perUnitPattern>po {0} en semajno</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="unconfirmed">tagoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} tago</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tagoj</unitPattern>
+				<displayName>tagoj</displayName>
+				<unitPattern count="one">{0} tago</unitPattern>
+				<unitPattern count="other">{0} tagoj</unitPattern>
+				<perUnitPattern>po {0} en tago</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">horoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} horo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} horoj</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} por horo</perUnitPattern>
+				<displayName>horoj</displayName>
+				<unitPattern count="one">{0} horo</unitPattern>
+				<unitPattern count="other">{0} horoj</unitPattern>
+				<perUnitPattern>po {0} en horo</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">minutoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} minuto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} minutoj</unitPattern>
+				<displayName>minutoj</displayName>
+				<unitPattern count="one">{0} minuto</unitPattern>
+				<unitPattern count="other">{0} minutoj</unitPattern>
+				<perUnitPattern>po {0} en minuto</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">sekundoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} sekundo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} sekundoj</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} por sekundo</perUnitPattern>
+				<displayName>sekundoj</displayName>
+				<unitPattern count="one">{0} sekundo</unitPattern>
+				<unitPattern count="other">{0} sekundoj</unitPattern>
+				<perUnitPattern>po {0} en sekundo</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">milisekundoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} milisekundo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} milisekundoj</unitPattern>
+				<displayName>milisekundoj</displayName>
+				<unitPattern count="one">{0} milisekundo</unitPattern>
+				<unitPattern count="other">{0} milisekundoj</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>mikrosekundoj</displayName>
+				<unitPattern count="one">{0} mikrosekundo</unitPattern>
+				<unitPattern count="other">{0} mikrosekundoj</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosekundoj</displayName>
+				<unitPattern count="one">{0} nanosekundo</unitPattern>
+				<unitPattern count="other">{0} nanosekundoj</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>amperoj</displayName>
+				<unitPattern count="one">{0} ampero</unitPattern>
+				<unitPattern count="other">{0} amperoj</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>miliamperoj</displayName>
+				<unitPattern count="one">{0} miliampero</unitPattern>
+				<unitPattern count="other">{0} miliamperoj</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>omoj</displayName>
+				<unitPattern count="one">{0} omo</unitPattern>
+				<unitPattern count="other">{0} omoj</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>voltoj</displayName>
+				<unitPattern count="one">{0} volto</unitPattern>
+				<unitPattern count="other">{0} voltoj</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilokalorioj</displayName>
+				<unitPattern count="one">{0} kilokalorio</unitPattern>
+				<unitPattern count="other">{0} kilokalorioj</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>kalorioj</displayName>
+				<unitPattern count="one">{0} kalorio</unitPattern>
+				<unitPattern count="other">{0} kalorioj</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kiloĵuloj</displayName>
+				<unitPattern count="one">{0} kiloĵulo</unitPattern>
+				<unitPattern count="other">{0} kiloĵuloj</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ĵuloj</displayName>
+				<unitPattern count="one">{0} ĵulo</unitPattern>
+				<unitPattern count="other">{0} ĵuloj</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kilovathoroj</displayName>
+				<unitPattern count="one">{0} kilovathoro</unitPattern>
+				<unitPattern count="other">{0} kilovathoroj</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>elektronvoltoj</displayName>
+				<unitPattern count="one">{0} elektronvolto</unitPattern>
+				<unitPattern count="other">{0} elektronvoltoj</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>neŭtonoj</displayName>
+				<unitPattern count="one">{0} neŭtono</unitPattern>
+				<unitPattern count="other">{0} neŭtonoj</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>kilovathoroj por 100 kilometroj</displayName>
+				<unitPattern count="one">po {0} kilovathoro por 100 kilometroj</unitPattern>
+				<unitPattern count="other">po {0} kilovathoroj por 100 kilometroj</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigahercoj</displayName>
+				<unitPattern count="one">{0} gigaherco</unitPattern>
+				<unitPattern count="other">{0} gigahercoj</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megahercoj</displayName>
+				<unitPattern count="one">{0} megaherco</unitPattern>
+				<unitPattern count="other">{0} megahercoj</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohercoj</displayName>
+				<unitPattern count="one">{0} kiloherco</unitPattern>
+				<unitPattern count="other">{0}kilohercoj</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>hercoj</displayName>
+				<unitPattern count="one">{0} herco</unitPattern>
+				<unitPattern count="other">{0} hercoj</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName>terradiusoj</displayName>
+				<unitPattern count="one">{0} terradiuso</unitPattern>
+				<unitPattern count="other">{0} terradiusoj</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">kilometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilometroj</unitPattern>
+				<displayName>kilometroj</displayName>
+				<unitPattern count="one">{0} kilometro</unitPattern>
+				<unitPattern count="other">{0} kilometroj</unitPattern>
+				<perUnitPattern>po {0} en kilometro</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="unconfirmed">metroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} metro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} metroj</unitPattern>
+				<displayName>metroj</displayName>
+				<unitPattern count="one">{0} metro</unitPattern>
+				<unitPattern count="other">{0} metroj</unitPattern>
+				<perUnitPattern>po {0} en metro</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">decimetroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} decimetro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} decimetroj</unitPattern>
+				<displayName>decimetroj</displayName>
+				<unitPattern count="one">{0} decimetro</unitPattern>
+				<unitPattern count="other">{0} decimetroj</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">centimetroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} centimetro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} centimetroj</unitPattern>
+				<displayName>centimetroj</displayName>
+				<unitPattern count="one">{0} centimetro</unitPattern>
+				<unitPattern count="other">{0} centimetroj</unitPattern>
+				<perUnitPattern>po {0} en centimetro</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">milimetroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} milimetro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} milimetroj</unitPattern>
+				<displayName>milimetroj</displayName>
+				<unitPattern count="one">{0} milimetro</unitPattern>
+				<unitPattern count="other">{0} milimetroj</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">mikrometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} mikrometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} mikrometroj</unitPattern>
+				<displayName>mikrometroj</displayName>
+				<unitPattern count="one">{0} mikrometro</unitPattern>
+				<unitPattern count="other">{0} mikrometroj</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">nanometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} nanometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} nanometroj</unitPattern>
+				<displayName>nanometroj</displayName>
+				<unitPattern count="one">{0} nanometro</unitPattern>
+				<unitPattern count="other">{0} nanometroj</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="unconfirmed">pikometroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} pikometro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} pikometroj</unitPattern>
+				<displayName>pikometroj</displayName>
+				<unitPattern count="one">{0} pikometro</unitPattern>
+				<unitPattern count="other">{0} pikometroj</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName draft="unconfirmed">mejloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} mejlo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} mejloj</unitPattern>
+				<displayName>mejloj</displayName>
+				<unitPattern count="one">{0} mejlo</unitPattern>
+				<unitPattern count="other">{0} mejloj</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName draft="unconfirmed">jardoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jardo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jardoj</unitPattern>
+				<displayName>jardoj</displayName>
+				<unitPattern count="one">{0} jardo</unitPattern>
+				<unitPattern count="other">{0} jardoj</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName draft="unconfirmed">futoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} futo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} futoj</unitPattern>
+				<displayName>futoj</displayName>
+				<unitPattern count="one">{0} futo</unitPattern>
+				<unitPattern count="other">{0} futoj</unitPattern>
+				<perUnitPattern>po {0} en futo</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName draft="unconfirmed">coloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} colo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} coloj</unitPattern>
+				<displayName>coloj</displayName>
+				<unitPattern count="one">{0} colo</unitPattern>
+				<unitPattern count="other">{0} coloj</unitPattern>
+				<perUnitPattern>po {0} en colo</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName draft="unconfirmed">parsekoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} parseko</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} parsekoj</unitPattern>
+				<displayName>parsekoj</displayName>
+				<unitPattern count="one">{0} parseko</unitPattern>
+				<unitPattern count="other">{0} parsekoj</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName draft="unconfirmed">lumjaroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lumjaro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lumjaroj</unitPattern>
+				<displayName>lumjaroj</displayName>
+				<unitPattern count="one">{0} lumjaro</unitPattern>
+				<unitPattern count="other">{0} lumjaroj</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">astronomiaj unuoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} astronomia unuo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} astronomiaj unuoj</unitPattern>
+				<displayName>astronomiaj unuoj</displayName>
+				<unitPattern count="one">{0} astronomia unuo</unitPattern>
+				<unitPattern count="other">{0} astronomiaj unuoj</unitPattern>
 			</unit>
 			<unit type="length-furlong">
 				<displayName draft="unconfirmed">stadioj</displayName>
@@ -4912,311 +5425,1740 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" draft="unconfirmed">{0} klaftoj</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">marmejloj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} marmejlo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} marmejloj</unitPattern>
+				<displayName>marmejloj</displayName>
+				<unitPattern count="one">{0} marmejlo</unitPattern>
+				<unitPattern count="other">{0} marmejloj</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>skandinavaj mejloj</displayName>
+				<unitPattern count="one">{0} skandinava mejlo</unitPattern>
+				<unitPattern count="other">{0} skandinavaj mejloj</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>punktoj tipografiaj</displayName>
+				<unitPattern count="one">{0} punkto tipografia</unitPattern>
+				<unitPattern count="other">{0} punktoj tipografiaj</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>sunradiusoj</displayName>
+				<unitPattern count="one">{0} sunradiuso</unitPattern>
+				<unitPattern count="other">{0} sunradiusoj</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>luksoj</displayName>
+				<unitPattern count="one">{0} lukso</unitPattern>
+				<unitPattern count="other">{0} luksoj</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>kandeloj</displayName>
+				<unitPattern count="one">{0} kandelo</unitPattern>
+				<unitPattern count="other">{0} kandeloj</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>lumenoj</displayName>
+				<unitPattern count="one">{0} lumeno</unitPattern>
+				<unitPattern count="other">{0} lumenoj</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>tunoj</displayName>
+				<unitPattern count="one">{0} tuno</unitPattern>
+				<unitPattern count="other">{0} tunoj</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">kilogramoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilogramo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilogramoj</unitPattern>
+				<displayName>kilogramoj</displayName>
+				<unitPattern count="one">{0} kilogramo</unitPattern>
+				<unitPattern count="other">{0} kilogramoj</unitPattern>
+				<perUnitPattern>po {0} je kilogramo</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">gramoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} gramo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gramoj</unitPattern>
+				<displayName>gramoj</displayName>
+				<unitPattern count="one">{0} gramo</unitPattern>
+				<unitPattern count="other">{0} gramoj</unitPattern>
+				<perUnitPattern>po {0} je gramo</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>miligramoj</displayName>
+				<unitPattern count="one">{0} miligramo</unitPattern>
+				<unitPattern count="other">{0} miligramoj</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>mikrogramoj</displayName>
+				<unitPattern count="one">{0} mikrogramo</unitPattern>
+				<unitPattern count="other">{0} mikrogramoj</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>mallongaj tunoj</displayName>
+				<unitPattern count="one">{0} mallonga tuno</unitPattern>
+				<unitPattern count="other">{0} mallongaj tunoj</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>funtoj</displayName>
+				<unitPattern count="one">{0} funto</unitPattern>
+				<unitPattern count="other">{0} funtoj</unitPattern>
+				<perUnitPattern>po {0} je funto</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>uncoj</displayName>
+				<unitPattern count="one">{0} unco</unitPattern>
+				<unitPattern count="other">{0} uncoj</unitPattern>
+				<perUnitPattern>po {0} je unco</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>uncoj trojaj</displayName>
+				<unitPattern count="one">{0} unco troja</unitPattern>
+				<unitPattern count="other">{0} uncoj trojaj</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karatoj</displayName>
+				<unitPattern count="one">{0} karato</unitPattern>
+				<unitPattern count="other">{0} karatoj</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>daltonoj</displayName>
+				<unitPattern count="one">{0} daltono</unitPattern>
+				<unitPattern count="other">{0} daltonoj</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>termasoj</displayName>
+				<unitPattern count="one">{0} termaso</unitPattern>
+				<unitPattern count="other">{0} termasoj</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>sunmasoj</displayName>
+				<unitPattern count="one">{0} sunmaso</unitPattern>
+				<unitPattern count="other">{0} sunmasoj</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>granoj</displayName>
+				<unitPattern count="one">{0} grano</unitPattern>
+				<unitPattern count="other">{0} granoj</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigavatoj</displayName>
+				<unitPattern count="one">{0} gigavato</unitPattern>
+				<unitPattern count="other">{0} gigavatoj</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megavatoj</displayName>
+				<unitPattern count="one">{0} megavato</unitPattern>
+				<unitPattern count="other">{0} megavatoj</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilovatoj</displayName>
+				<unitPattern count="one">{0} kilovato</unitPattern>
+				<unitPattern count="other">{0} kilovatoj</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>vatoj</displayName>
+				<unitPattern count="one">{0} vato</unitPattern>
+				<unitPattern count="other">{0} vatoj</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milivatoj</displayName>
+				<unitPattern count="one">{0} milivato</unitPattern>
+				<unitPattern count="other">{0} milivatoj</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ĉevalpovoj</displayName>
+				<unitPattern count="one">{0} ĉevalpovo</unitPattern>
+				<unitPattern count="other">{0} ĉevalpovoj</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>milimetroj da hidrargo</displayName>
+				<unitPattern count="one">{0} milimetro da hidrargo</unitPattern>
+				<unitPattern count="other">{0} milimetroj da hidrargo</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>da hidrargo</displayName>
+				<unitPattern count="one">{0} da hidrargo</unitPattern>
+				<unitPattern count="other">{0} da hidrargo</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>funtfortoj sur kvadratcolo</displayName>
+				<unitPattern count="one">{0} funtforto sur kvadratcolo</unitPattern>
+				<unitPattern count="other">{0} funtfortoj sur kvadratcolo</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>coloj da hidrargo</displayName>
+				<unitPattern count="one">{0} colo da hidrargo</unitPattern>
+				<unitPattern count="other">{0} coloj da hidrargo</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>baroj</displayName>
+				<unitPattern count="one">{0} baro</unitPattern>
+				<unitPattern count="other">{0} baroj</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>milibaroj</displayName>
+				<unitPattern count="one">{0} milibaro</unitPattern>
+				<unitPattern count="other">{0} milibaroj</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>atmosferoj</displayName>
+				<unitPattern count="one">{0} atmosfero</unitPattern>
+				<unitPattern count="other">{0} atmosferoj</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>paskaloj</displayName>
+				<unitPattern count="one">{0} paskalo</unitPattern>
+				<unitPattern count="other">{0} paskaloj</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hektopaskaloj</displayName>
+				<unitPattern count="one">{0} hektopaskalo</unitPattern>
+				<unitPattern count="other">{0} hektopaskaloj</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>kilopaskaloj</displayName>
+				<unitPattern count="one">{0} kilopaskalo</unitPattern>
+				<unitPattern count="other">{0} kilopaskaloj</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>megapaskaloj</displayName>
+				<unitPattern count="one">{0} megapaskalo</unitPattern>
+				<unitPattern count="other">{0} megapaskaloj</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">kilometroj en horo</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kilometro en horo</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kilometroj en horo</unitPattern>
+				<displayName>kilometroj en horo</displayName>
+				<unitPattern count="one">{0} kilometro en horo</unitPattern>
+				<unitPattern count="other">{0} kilometroj en horo</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>metroj en sekundo</displayName>
+				<unitPattern count="one">po {0} metro en sekundo</unitPattern>
+				<unitPattern count="other">po {0} metroj en sekundo</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>mejloj en horo</displayName>
+				<unitPattern count="one">po {0} mejlo en horo</unitPattern>
+				<unitPattern count="other">po {0} mejloj en horo</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>nodoj</displayName>
+				<unitPattern count="one">{0} nodo</unitPattern>
+				<unitPattern count="other">{0} nodoj</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>boforta skalo</displayName>
+				<unitPattern count="one">{0} grado laŭ boforta skalo</unitPattern>
+				<unitPattern count="other">{0} gradoj laŭ boforta skalo</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>gradoj de temperaturo</displayName>
+				<unitPattern count="one">{0} grado de temperaturo</unitPattern>
+				<unitPattern count="other">{0} gradoj de temperaturo</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">gradoj celsiaj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} grado celsia</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} gradoj celsiaj</unitPattern>
+				<displayName>gradoj celsiaj</displayName>
+				<unitPattern count="one">{0} grado celsia</unitPattern>
+				<unitPattern count="other">{0} gradoj celsiaj</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>gradoj farenhejtaj</displayName>
+				<unitPattern count="one">{0} grado farenhejta</unitPattern>
+				<unitPattern count="other">{0} gradoj farenhejtaj</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>kelvinoj</displayName>
+				<unitPattern count="one">{0} kelvino</unitPattern>
+				<unitPattern count="other">{0} kelvinoj</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>neŭtono-metroj</displayName>
+				<unitPattern count="one">{0} neŭtono-metro</unitPattern>
+				<unitPattern count="other">{0} neŭtono-metroj</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kubaj kilometroj</displayName>
+				<unitPattern count="one">{0} kubkilometro</unitPattern>
+				<unitPattern count="other">{0} kubkilometroj</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>kubaj metroj</displayName>
+				<unitPattern count="one">{0} kubmetro</unitPattern>
+				<unitPattern count="other">{0} kubmetroj</unitPattern>
+				<perUnitPattern>po {0} en kubmetro</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>kubaj centimetroj</displayName>
+				<unitPattern count="one">{0} kubcentimetro</unitPattern>
+				<unitPattern count="other">{0} kubcentimetroj</unitPattern>
+				<perUnitPattern>po {0} en kubcentimetro</perUnitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megalitroj</displayName>
+				<unitPattern count="one">{0} megalitro</unitPattern>
+				<unitPattern count="other">{0} megalitroj</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hektolitroj</displayName>
+				<unitPattern count="one">{0} hektolitro</unitPattern>
+				<unitPattern count="other">{0} hektolitroj</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="unconfirmed">litroj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} litro</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} litroj</unitPattern>
+				<displayName>litroj</displayName>
+				<unitPattern count="one">{0} litro</unitPattern>
+				<unitPattern count="other">{0} litroj</unitPattern>
+				<perUnitPattern>po {0} en litro</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>decilitroj</displayName>
+				<unitPattern count="one">{0} decilitro</unitPattern>
+				<unitPattern count="other">{0} decilitroj</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centilitroj</displayName>
+				<unitPattern count="one">{0} centilitro</unitPattern>
+				<unitPattern count="other">{0} centilitroj</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>mililitroj</displayName>
+				<unitPattern count="one">{0} mililitro</unitPattern>
+				<unitPattern count="other">{0} mililitroj</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>duonkvartoj metraj</displayName>
+				<unitPattern count="one">{0} duonkvarto metra</unitPattern>
+				<unitPattern count="other">{0} duonkvartoj metraj</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>kvaronkvartoj metraj</displayName>
+				<unitPattern count="one">{0} kvaronkvarto metra</unitPattern>
+				<unitPattern count="other">{0} kvaronkvartoj metraj</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fluiduncoj metraj</displayName>
+				<unitPattern count="one">{0} fluidunco metra</unitPattern>
+				<unitPattern count="other">{0} fluiduncoj metraj</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kvaronkvartoj usonaj</displayName>
+				<unitPattern count="one">{0} kvaronkvarto usona</unitPattern>
+				<unitPattern count="other">{0} kvaronkvartoj usonaj</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradianoj</displayName>
+				<unitPattern count="one">{0} steradiano</unitPattern>
+				<unitPattern count="other">{0} steradianoj</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>kataloj</displayName>
+				<unitPattern count="one">{0} katalo</unitPattern>
+				<unitPattern count="other">{0} kataloj</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kulomboj</displayName>
+				<unitPattern count="one">{0} kulombo</unitPattern>
+				<unitPattern count="other">{0} kulomboj</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradoj</displayName>
+				<unitPattern count="one">{0} farado</unitPattern>
+				<unitPattern count="other">{0} faradoj</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henroj</displayName>
+				<unitPattern count="one">{0} henro</unitPattern>
+				<unitPattern count="other">{0} henroj</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simensoj</displayName>
+				<unitPattern count="one">{0} simenso</unitPattern>
+				<unitPattern count="other">{0} simensoj</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorioj [IT]</displayName>
+				<unitPattern count="one">{0} kalorio [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorioj [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereloj</displayName>
+				<unitPattern count="one">{0} bekerelo</unitPattern>
+				<unitPattern count="other">{0} bekereloj</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sivertoj</displayName>
+				<unitPattern count="one">{0} siverto</unitPattern>
+				<unitPattern count="other">{0} sivertoj</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grajoj</displayName>
+				<unitPattern count="one">{0} grajo</unitPattern>
+				<unitPattern count="other">{0} grajoj</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramfortoj</displayName>
+				<unitPattern count="one">{0} kilogramforto</unitPattern>
+				<unitPattern count="other">{0} kilogramfortoj</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesloj</displayName>
+				<unitPattern count="one">{0} teslo</unitPattern>
+				<unitPattern count="other">{0} tesloj</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veberoj</displayName>
+				<unitPattern count="one">{0} vebero</unitPattern>
+				<unitPattern count="other">{0} veberoj</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>lum</displayName>
+				<unitPattern count="one">{0} lum</unitPattern>
+				<unitPattern count="other">{0} lum</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>miliardonoj</displayName>
+				<unitPattern count="one">{0} miliardono</unitPattern>
+				<unitPattern count="other">{0} miliardonoj</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName draft="unconfirmed">noktoj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} nokto</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} noktoj</unitPattern>
-				<perUnitPattern draft="unconfirmed">po {0} por nokto</perUnitPattern>
+				<displayName>noktoj</displayName>
+				<unitPattern count="one">{0} nokto</unitPattern>
+				<unitPattern count="other">{0} noktoj</unitPattern>
+				<perUnitPattern>po {0} en nokto</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName draft="unconfirmed">direkto</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} oriente</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} norde</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} sude</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} okcidente</coordinateUnitPattern>
+				<displayName>mond-direkto</displayName>
+				<coordinateUnitPattern type="east">{0} oriente</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} norde</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} sude</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} okcidente</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="acceleration-g-force">
+				<displayName>g₀</displayName>
+				<unitPattern count="one">{0} g₀</unitPattern>
+				<unitPattern count="other">{0} g₀</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>riv.</displayName>
+				<unitPattern count="one">{0} riv.</unitPattern>
+				<unitPattern count="other">{0} riv.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>′</displayName>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>″</displayName>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
 			<unit type="area-hectare">
-				<displayName draft="unconfirmed">ha</displayName>
+				<displayName>ha</displayName>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akreoj</displayName>
+				<unitPattern count="one">{0} akreo</unitPattern>
+				<unitPattern count="other">{0} akreoj</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>karatoj</displayName>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>mg/dl</displayName>
+				<unitPattern count="one">{0} mg/dl</unitPattern>
+				<unitPattern count="other">{0} mg/dl</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/l</displayName>
+				<unitPattern count="one">{0} mmol/l</unitPattern>
+				<unitPattern count="other">{0} mmol/l</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>ekz.</displayName>
+				<unitPattern count="one">{0} ekz.</unitPattern>
+				<unitPattern count="other">{0} ekz.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} ppm</unitPattern>
+				<unitPattern count="other">{0} ppm</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<unitPattern count="one">{0} %</unitPattern>
+				<unitPattern count="other">{0} %</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<unitPattern count="one">{0} ‰</unitPattern>
+				<unitPattern count="other">{0} ‰</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} ‱</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<unitPattern count="one">{0} PB</unitPattern>
+				<unitPattern count="other">{0} PB</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
 			</unit>
 			<unit type="duration-century">
-				<displayName draft="unconfirmed">jarcent.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jarcent.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jarcent.</unitPattern>
+				<displayName>jc.</displayName>
+				<unitPattern count="one">{0} jc.</unitPattern>
+				<unitPattern count="other">{0} jc.</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">jardek.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jardek.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jardek.</unitPattern>
+				<displayName>jd.</displayName>
+				<unitPattern count="one">{0} jd.</unitPattern>
+				<unitPattern count="other">{0} jd.</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">j.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} j.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} j.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/j.</perUnitPattern>
+				<displayName>a</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>jk-onoj</displayName>
+				<unitPattern count="one">{0} jk-ono</unitPattern>
+				<unitPattern count="other">{0} jk-onoj</unitPattern>
+				<perUnitPattern>{0}/jk-ono</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName draft="unconfirmed">monato</displayName>
+				<displayName>mon.</displayName>
 				<unitPattern count="one">{0} mon.</unitPattern>
 				<unitPattern count="other">{0} mon.</unitPattern>
+				<perUnitPattern>{0}/mon.</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName draft="unconfirmed">semajno</displayName>
+				<displayName>sem.</displayName>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sem.</unitPattern>
+				<perUnitPattern>{0}/sem.</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="unconfirmed">tago</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} t.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} t.</unitPattern>
+				<displayName>tagoj</displayName>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">horo</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} h.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} h.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/h.</perUnitPattern>
+				<displayName>h</displayName>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">minuto</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} m.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} m.</unitPattern>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">sekundo</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} s.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} s.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/s.</perUnitPattern>
+				<displayName>s</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">milisekundo</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ms.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ms.</unitPattern>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>A</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>Ω</displayName>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>V</displayName>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<unitPattern count="one">{0} eV</unitPattern>
+				<unitPattern count="other">{0} eV</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<unitPattern count="one">{0} N</unitPattern>
+				<unitPattern count="other">{0} N</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>kWh/100 km</displayName>
+				<unitPattern count="one">{0} kWh/100 km</unitPattern>
+				<unitPattern count="other">{0} kWh/100 km</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<unitPattern count="one">{0} R⊕</unitPattern>
+				<unitPattern count="other">{0} R⊕</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="unconfirmed">m</displayName>
+				<displayName>m</displayName>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName draft="unconfirmed">lj</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} lj</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} lj</unitPattern>
+				<displayName>lj</displayName>
+				<unitPattern count="one">{0} lj</unitPattern>
+				<unitPattern count="other">{0} lj</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>punktoj</displayName>
+				<unitPattern count="one">{0} punkto</unitPattern>
+				<unitPattern count="other">{0} punktoj</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<unitPattern count="one">{0} R☉</unitPattern>
+				<unitPattern count="other">{0} R☉</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<unitPattern count="one">{0} cd</unitPattern>
+				<unitPattern count="other">{0} cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<unitPattern count="one">{0} lm</unitPattern>
+				<unitPattern count="other">{0} lm</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">g</displayName>
+				<displayName>g</displayName>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="one">{0} μg</unitPattern>
+				<unitPattern count="other">{0} μg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>m-l. tunoj</displayName>
+				<unitPattern count="one">{0} m-l. tuno</unitPattern>
+				<unitPattern count="other">{0} m-l. tunoj</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>karatoj</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>daltonoj</displayName>
+				<unitPattern count="one">{0} Da</unitPattern>
+				<unitPattern count="other">{0} Da</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<unitPattern count="one">{0} M⊕</unitPattern>
+				<unitPattern count="other">{0} M⊕</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<unitPattern count="one">{0} M☉</unitPattern>
+				<unitPattern count="other">{0} M☉</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>granoj</displayName>
+				<unitPattern count="one">{0} gr</unitPattern>
+				<unitPattern count="other">{0} gr</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ĈP</displayName>
+				<unitPattern count="one">{0} ĈP</unitPattern>
+				<unitPattern count="other">{0} ĈP</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>da Hg</displayName>
+				<unitPattern count="one">{0} da Hg</unitPattern>
+				<unitPattern count="other">{0} da Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>lbf/in²</displayName>
+				<unitPattern count="one">{0} lbf/in²</unitPattern>
+				<unitPattern count="other">{0} lbf/in²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<unitPattern count="one">{0} bar</unitPattern>
+				<unitPattern count="other">{0} bar</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<unitPattern count="one">{0} atm</unitPattern>
+				<unitPattern count="other">{0} atm</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<unitPattern count="one">{0} Pa</unitPattern>
+				<unitPattern count="other">{0} Pa</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<unitPattern count="one">{0} kPa</unitPattern>
+				<unitPattern count="other">{0} kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0} MPa</unitPattern>
+				<unitPattern count="other">{0} MPa</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} mi/h</unitPattern>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>nodoj</displayName>
+				<unitPattern count="one">{0} nodo</unitPattern>
+				<unitPattern count="other">{0} nodoj</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">{0} Bft</unitPattern>
+				<unitPattern count="other">{0} Bft</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<unitPattern count="one">{0} °</unitPattern>
+				<unitPattern count="other">{0} °</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<unitPattern count="one" draft="unconfirmed">{0} °C</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} °C</unitPattern>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0} °F</unitPattern>
+				<unitPattern count="other">{0} °F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<unitPattern count="one">{0} N⋅m</unitPattern>
+				<unitPattern count="other">{0} N⋅m</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="unconfirmed">L</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} L</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} L</unitPattern>
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>duonkvartoj metraj</displayName>
+				<unitPattern count="one">{0} duonkvarto metra</unitPattern>
+				<unitPattern count="other">{0} duonkvartoj metraj</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>kvaronkvartoj metraj</displayName>
+				<unitPattern count="one">{0} kvaronkvarto metra</unitPattern>
+				<unitPattern count="other">{0} kvaronkvartoj metraj</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m.</displayName>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kvaronkvartoj usonaj</displayName>
+				<unitPattern count="one">{0} kvaronkvarto usona</unitPattern>
+				<unitPattern count="other">{0} kvaronkvartoj usonaj</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>lum</displayName>
+				<unitPattern count="one">{0} lum</unitPattern>
+				<unitPattern count="other">{0} lum</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} ppb</unitPattern>
+				<unitPattern count="other">{0} ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName draft="unconfirmed">nokt.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} nokt.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} nokt.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/nokto</perUnitPattern>
+				<displayName>nokt.</displayName>
+				<unitPattern count="one">{0} nokt.</unitPattern>
+				<unitPattern count="other">{0} nokt.</unitPattern>
+				<perUnitPattern>{0}/nokto</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName draft="unconfirmed">direkto</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} E</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} N</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} S</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} W</coordinateUnitPattern>
+				<displayName>direkto</displayName>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="acceleration-g-force">
+				<displayName>g₀</displayName>
+				<unitPattern count="one">{0} g₀</unitPattern>
+				<unitPattern count="other">{0} g₀</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<unitPattern count="one">{0} m/s²</unitPattern>
+				<unitPattern count="other">{0} m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>riv.</displayName>
+				<unitPattern count="one">{0} riv.</unitPattern>
+				<unitPattern count="other">{0} riv.</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>′</displayName>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>″</displayName>
+			</unit>
 			<unit type="area-square-kilometer">
-				<unitPattern count="one" draft="unconfirmed">{0}km²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km²</unitPattern>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<unitPattern count="one" draft="unconfirmed">{0}ha</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ha</unitPattern>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<unitPattern count="one" draft="unconfirmed">{0}m²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m²</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}cm²</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm²</unitPattern>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>akreoj</displayName>
+				<unitPattern count="one">{0} akreo</unitPattern>
+				<unitPattern count="other">{0} akreoj</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one">{0} yd²</unitPattern>
+				<unitPattern count="other">{0} yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>mg/dl</displayName>
+				<unitPattern count="one">{0} mg/dl</unitPattern>
+				<unitPattern count="other">{0} mg/dl</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>mmol/l</displayName>
+				<unitPattern count="one">{0} mmol/l</unitPattern>
+				<unitPattern count="other">{0} mmol/l</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>ekz.</displayName>
+				<unitPattern count="one">{0} ekz.</unitPattern>
+				<unitPattern count="other">{0} ekz.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} ppm</unitPattern>
+				<unitPattern count="other">{0} ppm</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<unitPattern count="one">{0} %</unitPattern>
+				<unitPattern count="other">{0} %</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<unitPattern count="one">{0} ‰</unitPattern>
+				<unitPattern count="other">{0} ‰</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} ‱</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<unitPattern count="one">{0} PB</unitPattern>
+				<unitPattern count="other">{0} PB</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0} B</unitPattern>
+				<unitPattern count="other">{0} B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>b</displayName>
+				<unitPattern count="one">{0} b</unitPattern>
+				<unitPattern count="other">{0} b</unitPattern>
 			</unit>
 			<unit type="duration-century">
-				<displayName draft="unconfirmed">jc.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jc.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jc.</unitPattern>
+				<displayName>jc.</displayName>
+				<unitPattern count="one">{0} jc.</unitPattern>
+				<unitPattern count="other">{0} jc.</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">jd.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} jd.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} jd.</unitPattern>
+				<displayName>jd.</displayName>
+				<unitPattern count="one">{0} jd.</unitPattern>
+				<unitPattern count="other">{0} jd.</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">a</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} a</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} a</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/a</perUnitPattern>
+				<displayName>a</displayName>
+				<unitPattern count="one">{0} a</unitPattern>
+				<unitPattern count="other">{0} a</unitPattern>
+				<perUnitPattern>{0}/a</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>jk-onoj</displayName>
+				<unitPattern count="one">{0} jk-ono</unitPattern>
+				<unitPattern count="other">{0} jk-onoj</unitPattern>
+				<perUnitPattern>{0}/jk-ono</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>mon.</displayName>
+				<perUnitPattern>{0}/mon.</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>sem.</displayName>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sem.</unitPattern>
+				<perUnitPattern>{0}/sem.</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="unconfirmed">t.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}t.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}t.</unitPattern>
+				<displayName>d</displayName>
+				<unitPattern count="one">{0} d</unitPattern>
+				<unitPattern count="other">{0} d</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">h.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}h.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}h.</unitPattern>
+				<displayName>h</displayName>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
+				<perUnitPattern>{0}/h</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">m.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}m.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m.</unitPattern>
+				<displayName>min</displayName>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">s.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}s.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}s.</unitPattern>
+				<displayName>s</displayName>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
+				<perUnitPattern>{0}/s</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ms.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}ms.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}ms.</unitPattern>
+				<displayName>ms</displayName>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>A</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>Ω</displayName>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>V</displayName>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<unitPattern count="one">{0} eV</unitPattern>
+				<unitPattern count="other">{0} eV</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<unitPattern count="one">{0} N</unitPattern>
+				<unitPattern count="other">{0} N</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>kWh/100 km</displayName>
+				<unitPattern count="one">{0} kWh/100 km</unitPattern>
+				<unitPattern count="other">{0} kWh/100 km</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<unitPattern count="one">{0} R⊕</unitPattern>
+				<unitPattern count="other">{0} R⊕</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<unitPattern count="one" draft="unconfirmed">{0}km</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km</unitPattern>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
 			<unit type="length-meter">
-				<unitPattern count="one" draft="unconfirmed">{0}m</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}m</unitPattern>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}dm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}dm</unitPattern>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}cm</unitPattern>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<unitPattern count="one" draft="unconfirmed">{0}mm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}mm</unitPattern>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<unitPattern count="one" draft="unconfirmed">{0}μm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}μm</unitPattern>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<unitPattern count="one" draft="unconfirmed">{0}nm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}nm</unitPattern>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<unitPattern count="one" draft="unconfirmed">{0}pm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}pm</unitPattern>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0} yd</unitPattern>
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0} ft</unitPattern>
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
+				<unitPattern count="other">{0} in</unitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<unitPattern count="one" draft="unconfirmed">{0}pc</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}pc</unitPattern>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<unitPattern count="one" draft="unconfirmed">{0}lj</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}lj</unitPattern>
+				<unitPattern count="one">{0} lj</unitPattern>
+				<unitPattern count="other">{0} lj</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<unitPattern count="one" draft="unconfirmed">{0}au</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}au</unitPattern>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>pt.</displayName>
+				<unitPattern count="one">{0} pt.</unitPattern>
+				<unitPattern count="other">{0} pt.</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<unitPattern count="one">{0} R☉</unitPattern>
+				<unitPattern count="other">{0} R☉</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<unitPattern count="one">{0} cd</unitPattern>
+				<unitPattern count="other">{0} cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<unitPattern count="one">{0} lm</unitPattern>
+				<unitPattern count="other">{0} lm</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<unitPattern count="one">{0} t</unitPattern>
+				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<unitPattern count="one" draft="unconfirmed">{0}kg</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}kg</unitPattern>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<unitPattern count="one" draft="unconfirmed">{0}g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}g</unitPattern>
+				<unitPattern count="one">{0} g</unitPattern>
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="one">{0} μg</unitPattern>
+				<unitPattern count="other">{0} μg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>m-l. tunoj</displayName>
+				<unitPattern count="one">{0} m-l. tuno</unitPattern>
+				<unitPattern count="other">{0} m-l. tunoj</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<unitPattern count="one">{0} oz t</unitPattern>
+				<unitPattern count="other">{0} oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ct</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<unitPattern count="one">{0} Da</unitPattern>
+				<unitPattern count="other">{0} Da</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<unitPattern count="one">{0} M⊕</unitPattern>
+				<unitPattern count="other">{0} M⊕</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<unitPattern count="one">{0} M☉</unitPattern>
+				<unitPattern count="other">{0} M☉</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>gr</displayName>
+				<unitPattern count="one">{0} gr</unitPattern>
+				<unitPattern count="other">{0} gr</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ĈP</displayName>
+				<unitPattern count="one">{0} ĈP</unitPattern>
+				<unitPattern count="other">{0} ĈP</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>da Hg</displayName>
+				<unitPattern count="one">{0} da Hg</unitPattern>
+				<unitPattern count="other">{0} da Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>lbf/in²</displayName>
+				<unitPattern count="one">{0} lbf/in²</unitPattern>
+				<unitPattern count="other">{0} lbf/in²</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<unitPattern count="one">{0} bar</unitPattern>
+				<unitPattern count="other">{0} bar</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<unitPattern count="one">{0} atm</unitPattern>
+				<unitPattern count="other">{0} atm</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<unitPattern count="one">{0} Pa</unitPattern>
+				<unitPattern count="other">{0} Pa</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<unitPattern count="one">{0} kPa</unitPattern>
+				<unitPattern count="other">{0} kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0} MPa</unitPattern>
+				<unitPattern count="other">{0} MPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="one" draft="unconfirmed">{0}km/h</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}km/h</unitPattern>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} m/s</unitPattern>
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} mi/h</unitPattern>
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>nd.</displayName>
+				<unitPattern count="one">{0} nd.</unitPattern>
+				<unitPattern count="other">{0} nd.</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">{0} Bft</unitPattern>
+				<unitPattern count="other">{0} Bft</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<unitPattern count="one">{0} °</unitPattern>
+				<unitPattern count="other">{0} °</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<unitPattern count="one" draft="unconfirmed">{0}°C</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°C</unitPattern>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0} °F</unitPattern>
+				<unitPattern count="other">{0} °F</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<unitPattern count="one">{0} N⋅m</unitPattern>
+				<unitPattern count="other">{0} N⋅m</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<unitPattern count="one" draft="unconfirmed">{0}L</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}L</unitPattern>
+				<displayName>l</displayName>
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName draft="unconfirmed">n.</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} n.</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} n.</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/n.</perUnitPattern>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>duonkvartoj m.</displayName>
+				<unitPattern count="one">{0} duonkvarto m.</unitPattern>
+				<unitPattern count="other">{0} duonkvartoj m.</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>kvaronkvartoj m.</displayName>
+				<unitPattern count="one">{0} kvaronkvarto m.</unitPattern>
+				<unitPattern count="other">{0} kvaronkvartoj m.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m.</displayName>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>kvaronkvartoj us.</displayName>
+				<unitPattern count="one">{0} kvaronkvarto us.</unitPattern>
+				<unitPattern count="other">{0} kvaronkvartoj us.</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>lum</displayName>
+				<unitPattern count="one">{0} lum</unitPattern>
+				<unitPattern count="other">{0} lum</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} ppb</unitPattern>
+				<unitPattern count="other">{0} ppb</unitPattern>
 			</unit>
-			<coordinateUnit>
-				<displayName draft="unconfirmed">direkto</displayName>
-			</coordinateUnit>
 		</unitLength>
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="end" draft="unconfirmed">{0} kaj {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} kaj {1}</listPatternPart>
+			<listPatternPart type="end">{0} kaj {1}</listPatternPart>
+			<listPatternPart type="2">{0} kaj {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="or">
-			<listPatternPart type="end" draft="unconfirmed">{0} aŭ {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} aŭ {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end" draft="unconfirmed">{0} aŭ {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} aŭ {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end" draft="unconfirmed">{0} aŭ {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} aŭ {1}</listPatternPart>
+			<listPatternPart type="end">{0} aŭ {1}</listPatternPart>
+			<listPatternPart type="2">{0} aŭ {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="standard-narrow">
-			<listPatternPart type="end" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="standard-short">
-			<listPatternPart type="end" draft="unconfirmed">{0} k {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} k {1}</listPatternPart>
+			<listPatternPart type="end">{0} k {1}</listPatternPart>
+			<listPatternPart type="2">{0} k {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="end" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
-			<yesstr draft="unconfirmed">jes:j</yesstr>
-			<nostr draft="unconfirmed">ne:n</nostr>
+			<yesstr>jes:j</yesstr>
+			<nostr>ne:n</nostr>
 		</messages>
 	</posix>
 </ldml>
diff --git a/make/data/cldr/common/main/es.xml b/make/data/cldr/common/main/es.xml
index 3ef6d339a66..d65824d006c 100644
--- a/make/data/cldr/common/main/es.xml
+++ b/make/data/cldr/common/main/es.xml
@@ -294,6 +294,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurdo</language>
+			<language type="ku" menu="core">kurdo</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kumyk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -821,6 +823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Isla Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -1097,33 +1100,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">orden numérico</key>
 			<key type="colStrength">intensidad de orden</key>
 			<key type="currency">moneda</key>
+			<key type="em">presentación del emoji</key>
 			<key type="hc">ciclo horario (12 o 24 horas)</key>
 			<key type="lb">estilo de salto de línea</key>
+			<key type="lw">salto de línea en palabras</key>
 			<key type="ms">sistema de medición</key>
 			<key type="numbers">números</key>
+			<key type="ss">salto de oración después de abreviatura</key>
 			<key type="timezone">zona horaria</key>
 			<key type="va">variante local</key>
 			<key type="x">uso privado</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">calendario budista</type>
+			<type key="calendar" type="buddhist" scope="core">budista</type>
 			<type key="calendar" type="chinese">calendario chino</type>
+			<type key="calendar" type="chinese" scope="core">chino</type>
 			<type key="calendar" type="coptic">calendario cóptico</type>
+			<type key="calendar" type="coptic" scope="core">cóptico</type>
 			<type key="calendar" type="dangi">calendario dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">calendario etíope</type>
+			<type key="calendar" type="ethiopic" scope="core">etíope</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendario etíope Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etíope Amete Alem</type>
 			<type key="calendar" type="gregorian">calendario gregoriano</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriano</type>
 			<type key="calendar" type="hebrew">calendario hebreo</type>
+			<type key="calendar" type="hebrew" scope="core">hebreo</type>
 			<type key="calendar" type="indian">calendario nacional hindú</type>
 			<type key="calendar" type="islamic">calendario hijri</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
 			<type key="calendar" type="islamic-civil">calendario hijri tabular</type>
+			<type key="calendar" type="islamic-civil" scope="core">hijri tabular</type>
 			<type key="calendar" type="islamic-umalqura">calendario hijri Umm al-Qura</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hijri Umm al-Qura</type>
 			<type key="calendar" type="iso8601">calendario ISO-8601</type>
 			<type key="calendar" type="japanese">calendario japonés</type>
+			<type key="calendar" type="japanese" scope="core">japonés</type>
 			<type key="calendar" type="persian">calendario persa</type>
+			<type key="calendar" type="persian" scope="core">persa</type>
 			<type key="calendar" type="roc">calendario de la República de China</type>
+			<type key="calendar" type="roc" scope="core">de la República de China</type>
 			<type key="cf" type="account">formato de moneda de contabilidad</type>
+			<type key="cf" type="account" scope="core">contabilidad</type>
 			<type key="cf" type="standard">formato de moneda estándar</type>
+			<type key="cf" type="standard" scope="core">estándar</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordenar símbolos</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Ordenar ignorando símbolos</type>
 			<type key="colBackwards" type="no" draft="contributed">Ordenar acentos normalmente</type>
@@ -1133,22 +1155,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Ordenar empezando por mayúsculas</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ordenar sin distinguir entre mayúsculas y minúsculas</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Ordenar distinguiendo entre mayúsculas y minúsculas</type>
-			<type key="collation" type="big5han">orden del chino tradicional - Big5</type>
 			<type key="collation" type="compat">orden anterior, para compatibilidad</type>
+			<type key="collation" type="compat" scope="core">compatibilidad</type>
 			<type key="collation" type="dictionary">orden de diccionario</type>
+			<type key="collation" type="dictionary" scope="core">diccionario</type>
 			<type key="collation" type="ducet">orden predeterminado de Unicode</type>
+			<type key="collation" type="ducet" scope="core">predeterminado de Unicode</type>
 			<type key="collation" type="eor" draft="contributed">reglas de ordenación europeas</type>
-			<type key="collation" type="gb2312han">orden del chino simplificado - GB2312</type>
 			<type key="collation" type="phonebook">orden de listín telefónico</type>
+			<type key="collation" type="phonebook" scope="core">listín telefónico</type>
 			<type key="collation" type="phonetic">orden fonético</type>
+			<type key="collation" type="phonetic" scope="core">fonético</type>
 			<type key="collation" type="pinyin">orden pinyin</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">búsqueda de uso general</type>
+			<type key="collation" type="search" scope="core">búsqueda</type>
 			<type key="collation" type="searchjl" draft="contributed">Buscar por consonante inicial de hangul</type>
 			<type key="collation" type="standard">orden estándar</type>
+			<type key="collation" type="standard" scope="core">estándar</type>
 			<type key="collation" type="stroke">orden de los trazos</type>
+			<type key="collation" type="stroke" scope="core">trazos</type>
 			<type key="collation" type="traditional">orden tradicional</type>
+			<type key="collation" type="traditional" scope="core">tradicional</type>
 			<type key="collation" type="unihan">orden de trazos radicales</type>
+			<type key="collation" type="unihan" scope="core">trazos radicales</type>
 			<type key="collation" type="zhuyin">orden zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Ordenar sin normalización</type>
 			<type key="colNormalization" type="yes" draft="contributed">Ordenar con normalización Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Ordenar dígitos individualmente</type>
@@ -1161,18 +1193,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ancho completo</type>
 			<type key="d0" type="hwidth">ancho medio</type>
 			<type key="d0" type="npinyin" draft="contributed">Numérico</type>
+			<type key="em" type="default" scope="core">predeterminado</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">texto</type>
 			<type key="hc" type="h11">sistema de 12 horas (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">sistema de 12 horas (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">sistema de 24 horas (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">sistema de 24 horas (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">estilo de salto de línea flexible</type>
+			<type key="lb" type="loose" scope="core">flexible</type>
 			<type key="lb" type="normal">estilo de salto de línea normal</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">estilo de salto de línea estricto</type>
+			<type key="lb" type="strict" scope="core">estricto</type>
+			<type key="lw" type="breakall" scope="core">dividir todas</type>
+			<type key="lw" type="keepall" scope="core">conservar todas</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">conservar en sintagmas</type>
 			<type key="m0" type="bgn">transliteración USBGN</type>
 			<type key="m0" type="ungegn">transliteración UNGEGN</type>
 			<type key="ms" type="metric">sistema métrico</type>
+			<type key="ms" type="metric" scope="core">métrico</type>
 			<type key="ms" type="uksystem">sistema imperial</type>
+			<type key="ms" type="uksystem" scope="core">británico</type>
 			<type key="ms" type="ussystem">sistema estadounidense</type>
+			<type key="ms" type="ussystem" scope="core">estadounidense</type>
 			<type key="numbers" type="arab">dígitos indoarábigos</type>
 			<type key="numbers" type="arabext">dígitos indoarábigos extendidos</type>
 			<type key="numbers" type="armn">números en armenio</type>
@@ -1217,6 +1266,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">dígitos en tibetano</type>
 			<type key="numbers" type="traditional" draft="contributed">Números tradicionales</type>
 			<type key="numbers" type="vaii">dígitos en vai</type>
+			<type key="ss" type="none" scope="core">desactivado</type>
+			<type key="ss" type="standard" scope="core">activado</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">métrico</measurementSystemName>
@@ -1267,9 +1318,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1408,11 +1456,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1429,16 +1483,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMM">MMMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d 'de' MMMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d 'de' MMMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1500,7 +1556,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1522,7 +1577,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1794,6 +1848,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1812,14 +1869,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMM">MMMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d 'de' MMMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d 'de' MMMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
@@ -1831,6 +1889,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsvvvv">H:mm:ss (vvvv)</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMd">d/M</dateFormatItem>
@@ -1895,10 +1954,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -1920,10 +1975,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">H:mm–H:mm v</greatestDifference>
 							<greatestDifference id="m">H:mm–H:mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -2671,21 +2722,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Anguila</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Ereván</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
@@ -2725,36 +2764,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brunéi</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
 			<zone type="America/Rio_Branco">
 				<exemplarCity>Río Branco</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
 				<exemplarCity>Manaos</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
 			<zone type="America/Belem">
 				<exemplarCity>Belén</exemplarCity>
 			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Bahía</exemplarCity>
 			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="Asia/Thimphu">
 				<exemplarCity>Timbu</exemplarCity>
 			</zone>
@@ -2779,15 +2800,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Douala">
 				<exemplarCity>Duala</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Shanghái</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>La Habana</exemplarCity>
 			</zone>
@@ -2815,21 +2830,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Algiers">
 				<exemplarCity>Argel</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
 			<zone type="Europe/Tallinn">
 				<exemplarCity>Tallin</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>El Cairo</exemplarCity>
 			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canarias</exemplarCity>
-			</zone>
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity>Adís Abeba</exemplarCity>
 			</zone>
@@ -2921,7 +2927,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Isla Kanton</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Comoras</exemplarCity>
@@ -2992,12 +2998,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldivas</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Ciudad de México</exemplarCity>
-			</zone>
 			<zone type="Pacific/Noumea">
 				<exemplarCity>Numea</exemplarCity>
 			</zone>
@@ -3091,9 +3091,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Jartum</exemplarCity>
 			</zone>
@@ -3124,9 +3121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Ndjamena">
 				<exemplarCity>Yamena</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dusambé</exemplarCity>
 			</zone>
@@ -3225,9 +3219,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>hora de África occidental</generic>
-					<standard>hora estándar de África occidental</standard>
-					<daylight>hora de verano de África occidental</daylight>
+					<standard>hora de África occidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3621,6 +3613,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora de Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>hora estándar de Hawái-Aleutianas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>hora de Hawái-Aleutianas</generic>
@@ -4071,6 +4068,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora de Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Hora de Turquía</generic>
+					<standard>Hora estándar de Turquía</standard>
+					<daylight>Hora de verano de Turquía</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>hora de Turkmenistán</generic>
@@ -4234,7 +4238,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4245,24 +4252,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000" count="other">00 mil ¤</pattern>
 					<pattern type="100000" count="one">000 mil ¤</pattern>
 					<pattern type="100000" count="other">000 mil ¤</pattern>
-					<pattern type="1000000" count="one">0 M¤</pattern>
-					<pattern type="1000000" count="other">0 M¤</pattern>
-					<pattern type="10000000" count="one">00 M¤</pattern>
-					<pattern type="10000000" count="other">00 M¤</pattern>
-					<pattern type="100000000" count="one">000 M¤</pattern>
-					<pattern type="100000000" count="other">000 M¤</pattern>
-					<pattern type="1000000000" count="one">0000 M¤</pattern>
-					<pattern type="1000000000" count="other">0000 M¤</pattern>
-					<pattern type="10000000000" count="one">00 mil M¤</pattern>
-					<pattern type="10000000000" count="other">00 mil M¤</pattern>
-					<pattern type="100000000000" count="one">000 mil M¤</pattern>
-					<pattern type="100000000000" count="other">000 mil M¤</pattern>
-					<pattern type="1000000000000" count="one">0 B¤</pattern>
-					<pattern type="1000000000000" count="other">0 B¤</pattern>
-					<pattern type="10000000000000" count="one">00 B¤</pattern>
-					<pattern type="10000000000000" count="other">00 B¤</pattern>
-					<pattern type="100000000000000" count="one">000 B¤</pattern>
-					<pattern type="100000000000000" count="other">000 B¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0000 M ¤</pattern>
+					<pattern type="1000000000" count="other">0000 M ¤</pattern>
+					<pattern type="10000000000" count="one">00 mil M ¤</pattern>
+					<pattern type="10000000000" count="other">00 mil M ¤</pattern>
+					<pattern type="100000000000" count="one">000 mil M ¤</pattern>
+					<pattern type="100000000000" count="other">000 mil M ¤</pattern>
+					<pattern type="1000000000000" count="one">0 B ¤</pattern>
+					<pattern type="1000000000000" count="other">0 B ¤</pattern>
+					<pattern type="10000000000000" count="one">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other">000 B ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5631,6 +5638,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>dólar de Zimbabue</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>oro zimbabuense</displayName>
+				<displayName count="one">oro zimbabuense</displayName>
+				<displayName count="other">oro zimbabuense</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>dólar zimbabuense</displayName>
 			</currency>
@@ -5884,7 +5896,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<gender>masculine</gender>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>partes</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>partes por millón</displayName>
 				<unitPattern count="one">{0} parte por millón</unitPattern>
@@ -5911,6 +5928,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} moles</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de glucosa</displayName>
+				<unitPattern count="one">{0} de glucosa</unitPattern>
+				<unitPattern count="other">{0} de glucosa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litros por kilómetro</displayName>
@@ -6536,6 +6558,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milímetro de mercurio</unitPattern>
 				<unitPattern count="other">{0} milímetros de mercurio</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de mercurio</displayName>
+				<unitPattern count="one">{0} de mercurio</unitPattern>
+				<unitPattern count="other">{0} de mercurio</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libras por pulgada cuadrada</displayName>
 				<unitPattern count="one">{0} libra por pulgada cuadrada</unitPattern>
@@ -6744,6 +6771,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} taza métrica</unitPattern>
 				<unitPattern count="other">{0} tazas métricas</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>onzas líquidas métricas</displayName>
+				<unitPattern count="one">{0} onza líquida métrica</unitPattern>
+				<unitPattern count="other">{0} onzas líquidas métricas</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acres-pies</displayName>
 				<unitPattern count="one">{0} acre-pie</unitPattern>
@@ -6855,13 +6887,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} cuarto imperial</unitPattern>
 				<unitPattern count="other">{0} cuartos imperiales</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>estereorradianes</displayName>
+				<unitPattern count="one">{0} estereorradián</unitPattern>
+				<unitPattern count="other">{0} estereorradianes</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katales</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katales</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>culombios</displayName>
+				<unitPattern count="one">{0} culombio</unitPattern>
+				<unitPattern count="other">{0} culombios</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradios</displayName>
+				<unitPattern count="one">{0} faradio</unitPattern>
+				<unitPattern count="other">{0} faradios</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrios</displayName>
+				<unitPattern count="one">{0} henrio</unitPattern>
+				<unitPattern count="other">{0} henrios</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorías [IT]</displayName>
+				<unitPattern count="one">{0} caloría [IT]</unitPattern>
+				<unitPattern count="other">{0} calorías [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bequereles</displayName>
+				<unitPattern count="one">{0} bequerel</unitPattern>
+				<unitPattern count="other">{0} bequereles</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>siéverts</displayName>
+				<unitPattern count="one">{0} siévert</unitPattern>
+				<unitPattern count="other">{0} siéverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grais</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grais</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramos fuerza</displayName>
+				<unitPattern count="one">{0} kilogramo fuerza</unitPattern>
+				<unitPattern count="other">{0} kilogramos fuerza</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>luz</displayName>
-				<unitPattern count="one">{0} luz</unitPattern>
-				<unitPattern count="other">{0} luz</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>partes por millardo</displayName>
 				<unitPattern count="one">{0} parte por millardo</unitPattern>
@@ -6869,9 +6963,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noches</displayName>
-				<unitPattern count="one">{0} noche</unitPattern>
-				<unitPattern count="other">{0} noches</unitPattern>
 				<perUnitPattern>{0} por noche</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6920,6 +7011,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ítem</unitPattern>
 				<unitPattern count="other">{0} ítems</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>por ciento</displayName>
 				<unitPattern count="one">{0} %</unitPattern>
@@ -6935,6 +7031,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7124,6 +7223,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="one">{0} °C</unitPattern>
 				<unitPattern count="other">{0} °C</unitPattern>
@@ -7252,12 +7356,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt imp.</unitPattern>
 				<unitPattern count="other">{0} qt imp.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>luz</displayName>
 				<unitPattern count="one">{0} luz</unitPattern>
 				<unitPattern count="other">{0} luz</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes/millardo</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7359,7 +7472,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ít</unitPattern>
 				<unitPattern count="other">{0}ít</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -7380,6 +7498,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}l/km</unitPattern>
 				<unitPattern count="other">{0}l/km</unitPattern>
@@ -7810,6 +7931,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -8021,20 +8147,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt imp</unitPattern>
 				<unitPattern count="other">{0}qt imp</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>luz</displayName>
 				<unitPattern count="one">{0}luz</unitPattern>
 				<unitPattern count="other">{0}luz</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>noches</displayName>
 				<unitPattern count="one">{0}noche</unitPattern>
 				<unitPattern count="other">{0}noches</unitPattern>
-				<perUnitPattern>{0}/noche</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
@@ -8356,7 +8482,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<namePattern alt="1">{surname} {surname2}, {title} {given} {given2}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
-			<namePattern>{surname} {surname2}, {given-informal}</namePattern>
+			<namePattern>{surname}, {given-informal}</namePattern>
 			<namePattern alt="1">{surname} {surname2}, {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="formal">
diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml
index 1c73bc6db40..641447db5df 100644
--- a/make/data/cldr/common/main/es_419.xml
+++ b/make/data/cldr/common/main/es_419.xml
@@ -23,17 +23,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="eu">vasco</language>
 			<language type="goh">alemán de la alta edad antigua</language>
 			<language type="grc">griego clásico</language>
-			<language type="gu">gujarati</language>
 			<language type="ht">haitiano</language>
 			<language type="kbd">cabardiano</language>
 			<language type="krc">karachái-bálkaro</language>
-			<language type="ks">cachemiro</language>
+			<language type="ku" menu="extension">kurmanyi</language>
 			<language type="lij">genovés</language>
 			<language type="ml">malabar</language>
 			<language type="mni">manipuri</language>
 			<language type="nr">ndebele del sur</language>
 			<language type="nso">sesotho del norte</language>
-			<language type="pa">panyabí</language>
 			<language type="prg">prusiano antiguo</language>
 			<language type="ps" alt="variant">pashtún</language>
 			<language type="rm">retorrománico</language>
@@ -41,7 +39,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="shu">árabe (Chad)</language>
 			<language type="sma">sami del sur</language>
 			<language type="st">sesotho del sur</language>
-			<language type="sw">swahili</language>
 			<language type="sw_CD">swahili (Congo)</language>
 			<language type="syr">siríaco</language>
 			<language type="tet">tetun</language>
@@ -95,10 +92,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</territories>
 		<keys>
 			<key type="colNormalization">orden normalizado</key>
+			<key type="em">presentación de emojis</key>
+			<key type="lw">saltos de línea entre palabras</key>
 		</keys>
 		<types>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">calendario islámico (Arabia Saudita)</type>
 			<type key="calendar" type="islamic-tbla">calendario islámico tabular</type>
+			<type key="calendar" type="roc" scope="core">calendario chino</type>
 			<type key="colAlternate" type="non-ignorable">ordenar símbolos</type>
 			<type key="colAlternate" type="shifted">ordenar ignorando símbolos</type>
 			<type key="colBackwards" type="no">ordenar acentos normalmente</type>
@@ -108,11 +108,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">ordenar empezando por mayúsculas</type>
 			<type key="colCaseLevel" type="no">ordenar sin distinguir entre mayúsculas y minúsculas</type>
 			<type key="colCaseLevel" type="yes">ordenar distinguiendo entre mayúsculas y minúsculas</type>
+			<type key="collation" type="ducet" scope="core">unicode predeterminado</type>
 			<type key="collation" type="eor">reglas de orden europeas</type>
 			<type key="collation" type="phonebook">orden de agenda telefónica</type>
+			<type key="collation" type="phonebook" scope="core">agenda telefónica</type>
+			<type key="collation" type="phonetic" scope="core">fonética</type>
+			<type key="collation" type="stroke" scope="core">trazo</type>
+			<type key="collation" type="unihan" scope="core">trazo radical</type>
+			<type key="lw" type="breakall" scope="core">introducir saltos</type>
+			<type key="lw" type="keepall" scope="core">conservar todos</type>
+			<type key="lw" type="phrase" scope="core">conservar en frases</type>
 			<type key="numbers" type="tirh">dígitos en tirh</type>
 			<type key="numbers" type="traditional">números traducionales</type>
 			<type key="numbers" type="wara">dígitos en Warang Citi</type>
+			<type key="ss" type="none" scope="core">no</type>
+			<type key="ss" type="standard" scope="core">sí</type>
 		</types>
 		<codePatterns>
 			<codePattern type="script">Alfabeto: {0}</codePattern>
@@ -394,12 +404,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d MMM – E d MMM 'de' y G</greatestDifference>
 							<greatestDifference id="y">E d MMM 'de' y – E d MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a–h:mm a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a–h a v</greatestDifference>
 						</intervalFormatItem>
@@ -571,12 +575,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekdayOfMonth-short">
 				<displayName>día hábil del mes</displayName>
 			</field>
-			<field type="sun">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">en {0} domingo</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} domingos</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="dayperiod">
 				<displayName>a.m./p.m.</displayName>
 			</field>
@@ -589,9 +587,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora universal coordinada</standard>
 				</long>
 			</zone>
-			<zone type="Etc/Unknown">
-				<exemplarCity>ciudad desconocida</exemplarCity>
-			</zone>
 			<zone type="America/Nassau">
 				<exemplarCity>Nasáu</exemplarCity>
 			</zone>
@@ -601,9 +596,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Santiago">
 				<exemplarCity>Santiago</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Islas Canarias</exemplarCity>
 			</zone>
@@ -779,7 +771,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -788,14 +783,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0 K</pattern>
 					<pattern type="1000" count="other">¤0 K</pattern>
 					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 K</pattern>
-					<pattern type="10000" count="one">¤00 K</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 K</pattern>
-					<pattern type="10000" count="other">¤00 K</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 K</pattern>
-					<pattern type="100000" count="one">¤000 K</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000 K</pattern>
-					<pattern type="100000" count="other">¤000 K</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 K</pattern>
+					<pattern type="10000" count="one">¤00 k</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 k</pattern>
+					<pattern type="10000" count="other">¤00 k</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 k</pattern>
+					<pattern type="100000" count="one">¤000 k</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000 k</pattern>
+					<pattern type="100000" count="other">¤000 k</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 k</pattern>
 					<pattern type="1000000" count="one">¤0 M</pattern>
 					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0 M</pattern>
 					<pattern type="1000000" count="other">¤0 M</pattern>
@@ -812,14 +807,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0000 M</pattern>
 					<pattern type="1000000000" count="other">¤0000 M</pattern>
 					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0000 M</pattern>
-					<pattern type="10000000000" count="one">¤00 MRD</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 MRD</pattern>
-					<pattern type="10000000000" count="other">¤00 MRD</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 MRD</pattern>
-					<pattern type="100000000000" count="one">¤000 MRD</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000 MRD</pattern>
-					<pattern type="100000000000" count="other">¤000 MRD</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 MRD</pattern>
+					<pattern type="10000000000" count="one">¤00 mil M</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 mil M</pattern>
+					<pattern type="10000000000" count="other">¤00 mil M</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 mil M</pattern>
+					<pattern type="100000000000" count="one">¤000 mil M</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000 mil M</pattern>
+					<pattern type="100000000000" count="other">¤000 mil M</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 mil M</pattern>
 					<pattern type="1000000000000" count="one">¤0 B</pattern>
 					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0 B</pattern>
 					<pattern type="1000000000000" count="other">¤0 B</pattern>
@@ -924,6 +919,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} unidad de fuerza gravitacional</unitPattern>
 				<unitPattern count="other">{0} unidades de fuerza gravitacional</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
 			<unit type="electric-ampere">
 				<displayName>amperes</displayName>
 				<unitPattern count="one">{0} ampere</unitPattern>
@@ -992,7 +991,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} onza fluida</unitPattern>
 				<unitPattern count="other">{0} onzas fluidas</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes por mil millones</displayName>
 				<unitPattern count="one">{0} parte por mil millones</unitPattern>
 				<unitPattern count="other">{0} partes por mil millones</unitPattern>
@@ -1007,6 +1020,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="angle-degree">
 				<displayName>grados</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} parte</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0} mpg imp.</unitPattern>
 				<unitPattern count="other">{0} mpg imp.</unitPattern>
@@ -1084,6 +1101,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} hp</unitPattern>
 				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m</displayName>
+				<unitPattern count="one">{0} fl oz m</unitPattern>
+				<unitPattern count="other">{0} fl oz m</unitPattern>
+			</unit>
 			<unit type="volume-pint">
 				<displayName>pintas</displayName>
 				<unitPattern count="one">{0} pt</unitPattern>
@@ -1103,17 +1125,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} cdta.</unitPattern>
 				<unitPattern count="other">{0} cdtas.</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>partes/mil millones</displayName>
+				<unitPattern count="one">{0} ppmm</unitPattern>
+				<unitPattern count="other">{0} ppmm</unitPattern>
+			</unit>
 		</unitLength>
 		<unitLength type="narrow">
 			<unit type="area-square-meter">
 				<displayName>metros²</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<unitPattern count="one">{0}parte</unitPattern>
+				<unitPattern count="other">{0}parte</unitPattern>
+			</unit>
 			<unit type="concentr-permille">
 				<displayName>‰</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one">{0}Glc</unitPattern>
+				<unitPattern count="other">{0}Glc</unitPattern>
+			</unit>
 			<unit type="duration-year">
 				<displayName>a.</displayName>
 				<unitPattern count="one">{0}a.</unitPattern>
@@ -1140,10 +1175,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}thm EE.UU.</unitPattern>
 				<unitPattern count="other">{0}thm EE.UU.</unitPattern>
 			</unit>
-			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<unitPattern count="one">{0} kWh/100km</unitPattern>
-				<unitPattern count="other">{0} kWh/100km</unitPattern>
-			</unit>
 			<unit type="graphics-dot">
 				<unitPattern count="one">{0}p</unitPattern>
 				<unitPattern count="other">{0}p</unitPattern>
@@ -1180,14 +1211,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}hp</unitPattern>
 				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
-			<unit type="speed-beaufort">
-				<unitPattern count="one">B {0}</unitPattern>
-				<unitPattern count="other">B {0}</unitPattern>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0}de Hg</unitPattern>
+				<unitPattern count="other">{0}de Hg</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0}ml</unitPattern>
 				<unitPattern count="other">{0}ml</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m</displayName>
+				<unitPattern count="one">{0}fl oz m</unitPattern>
+				<unitPattern count="other">{0}fl oz m</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} ac ft</unitPattern>
 				<unitPattern count="other">{0}ac ft</unitPattern>
@@ -1201,9 +1237,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}bbl</unitPattern>
 				<unitPattern count="other">{0}bbl</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<unitPattern count="one">{0} luz</unitPattern>
-				<unitPattern count="other">{0} luz</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0}sr</unitPattern>
+				<unitPattern count="other">{0}sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0}kat</unitPattern>
+				<unitPattern count="other">{0}kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0}C</unitPattern>
+				<unitPattern count="other">{0}C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0}F</unitPattern>
+				<unitPattern count="other">{0}F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0}H</unitPattern>
+				<unitPattern count="other">{0}H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0}S</unitPattern>
+				<unitPattern count="other">{0}S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<unitPattern count="one">{0}cal-IT</unitPattern>
+				<unitPattern count="other">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0}Bq</unitPattern>
+				<unitPattern count="other">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0}Sv</unitPattern>
+				<unitPattern count="other">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0}Gy</unitPattern>
+				<unitPattern count="other">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0}kgf</unitPattern>
+				<unitPattern count="other">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0}T</unitPattern>
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0}Wb</unitPattern>
+				<unitPattern count="other">{0}Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppmm</displayName>
+				<unitPattern count="one">{0}ppmm</unitPattern>
+				<unitPattern count="other">{0}ppmm</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<unitPattern count="one">{0} noche</unitPattern>
@@ -1216,67 +1305,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<characterLabelPattern type="extended">{0} — Extendido</characterLabelPattern>
 		<characterLabelPattern type="historic">{0} — Histórico</characterLabelPattern>
 		<characterLabelPattern type="miscellaneous">{0} — Miscelánea</characterLabelPattern>
-		<characterLabelPattern type="scripts">Símbolos de escritura — {0}</characterLabelPattern>
-		<characterLabel type="african_scripts">Símbolos de escritura de África</characterLabel>
-		<characterLabel type="american_scripts">Símbolos de escritura de América</characterLabel>
-		<characterLabel type="animal">animal</characterLabel>
-		<characterLabel type="animals_nature">naturaleza y animales</characterLabel>
-		<characterLabel type="arrows">flecha</characterLabel>
-		<characterLabel type="body">cuerpo</characterLabel>
-		<characterLabel type="box_drawing">Cuadro de dibujo</characterLabel>
-		<characterLabel type="building">edificio</characterLabel>
-		<characterLabel type="consonantal_jamo">Jamo consonántico</characterLabel>
-		<characterLabel type="currency_symbols">símbolos de monedas</characterLabel>
-		<characterLabel type="dash_connector">Guion/conector</characterLabel>
-		<characterLabel type="digits">dígitos</characterLabel>
-		<characterLabel type="downwards_upwards_arrows">Flechas hacia arriba y hacia abajo</characterLabel>
-		<characterLabel type="european_scripts">Símbolos de escritura de Europa</characterLabel>
-		<characterLabel type="female">femenino</characterLabel>
-		<characterLabel type="flag">bandera</characterLabel>
-		<characterLabel type="flags">banderas</characterLabel>
-		<characterLabel type="format">Formato</characterLabel>
-		<characterLabel type="format_whitespace">formato y espacio duro</characterLabel>
-		<characterLabel type="full_width_form_variant">Variantes de formato de ancho completo</characterLabel>
-		<characterLabel type="geometric_shapes">Formas geométricas</characterLabel>
+		<characterLabel type="box_drawing">Cuadros de dibujo</characterLabel>
 		<characterLabel type="half_width_form_variant">Variantes de formato de ancho medio</characterLabel>
-		<characterLabel type="han_characters">caracteres Han</characterLabel>
-		<characterLabel type="han_radicals">Radicales Han</characterLabel>
 		<characterLabel type="hanzi_simplified">Hanzi (simplificado)</characterLabel>
 		<characterLabel type="hanzi_traditional">Hanzi (tradicional)</characterLabel>
-		<characterLabel type="heart">corazón</characterLabel>
-		<characterLabel type="historic_scripts">Símbolos de escritura históricos</characterLabel>
 		<characterLabel type="japanese_kana">Kana japonés</characterLabel>
-		<characterLabel type="keycap">tecla mayus</characterLabel>
-		<characterLabel type="leftwards_rightwards_arrows">Flechas hacia la derecha y hacia la izquierda</characterLabel>
-		<characterLabel type="letterlike_symbols">símbolos con letras</characterLabel>
-		<characterLabel type="limited_use">uso limitado</characterLabel>
-		<characterLabel type="middle_eastern_scripts">Símbolos de escritura de Oriente Medio</characterLabel>
-		<characterLabel type="miscellaneous">Miscelánea</characterLabel>
-		<characterLabel type="modern_scripts">sistemas de escritura modernos</characterLabel>
-		<characterLabel type="modifier">Modificador</characterLabel>
-		<characterLabel type="nature">naturaleza</characterLabel>
-		<characterLabel type="nonspacing">sin espaciado</characterLabel>
-		<characterLabel type="other">otros</characterLabel>
-		<characterLabel type="paired">Asociado</characterLabel>
-		<characterLabel type="person">persona</characterLabel>
-		<characterLabel type="phonetic_alphabet">alfabeto fonético</characterLabel>
-		<characterLabel type="place">lugar</characterLabel>
-		<characterLabel type="plant">planta</characterLabel>
-		<characterLabel type="sign_standard_symbols">señal o símbolo</characterLabel>
-		<characterLabel type="small_form_variant">Variantes de formato pequeño</characterLabel>
-		<characterLabel type="smiley">Caras sonrientes</characterLabel>
-		<characterLabel type="south_asian_scripts">sistemas de escritura de Asia del Sur</characterLabel>
-		<characterLabel type="southeast_asian_scripts">sistemas de escritura de Asia Sudoriental</characterLabel>
-		<characterLabel type="sport">deporte</characterLabel>
-		<characterLabel type="symbols">símbolo</characterLabel>
-		<characterLabel type="tone_marks">marcas tonales</characterLabel>
-		<characterLabel type="travel">viaje</characterLabel>
-		<characterLabel type="travel_places">viajes y destinos</characterLabel>
-		<characterLabel type="variant_forms">variantes</characterLabel>
-		<characterLabel type="vocalic_jamo">Jamo vocálico</characterLabel>
-		<characterLabel type="weather">clima</characterLabel>
-		<characterLabel type="western_asian_scripts">sistemas de escritura de Asia Occidental</characterLabel>
-		<characterLabel type="whitespace">espacio duro</characterLabel>
+		<characterLabel type="weather">Clima</characterLabel>
 	</characterLabels>
 	<typographicNames>
 		<axisName type="wdth">ancho</axisName>
diff --git a/make/data/cldr/common/main/es_AR.xml b/make/data/cldr/common/main/es_AR.xml
index 03b6e24afba..eb90b063702 100644
--- a/make/data/cldr/common/main/es_AR.xml
+++ b/make/data/cldr/common/main/es_AR.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -181,9 +179,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm</greatestDifference>
 							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H" draft="contributed">HH:mm–HH:mm v</greatestDifference>
 							<greatestDifference id="m" draft="contributed">HH:mm–HH:mm v</greatestDifference>
@@ -309,6 +304,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/es_BO.xml b/make/data/cldr/common/main/es_BO.xml
index 645549fbcf5..89cb92dfd07 100644
--- a/make/data/cldr/common/main/es_BO.xml
+++ b/make/data/cldr/common/main/es_BO.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_CL.xml b/make/data/cldr/common/main/es_CL.xml
index f5c2f863db9..63b6af9f5e6 100644
--- a/make/data/cldr/common/main/es_CL.xml
+++ b/make/data/cldr/common/main/es_CL.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -301,6 +299,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/es_CO.xml b/make/data/cldr/common/main/es_CO.xml
index 2919b0a070f..c36b3901eb4 100644
--- a/make/data/cldr/common/main/es_CO.xml
+++ b/make/data/cldr/common/main/es_CO.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -66,7 +64,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMMEd" draft="contributed">E, d MMM 'de' y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback draft="contributed">{0} ‘al’ {1}</intervalFormatFallback>
+						<intervalFormatFallback draft="contributed">{0} al {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d" draft="contributed">d 'a' d</greatestDifference>
 						</intervalFormatItem>
@@ -265,7 +263,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMd" draft="contributed">d 'de' MMM 'de' y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback draft="contributed">{0} ‘al’ {1}</intervalFormatFallback>
+						<intervalFormatFallback draft="contributed">{0} al {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d" draft="contributed">d 'a' d</greatestDifference>
 						</intervalFormatItem>
diff --git a/make/data/cldr/common/main/es_CR.xml b/make/data/cldr/common/main/es_CR.xml
index 693ace12f91..b11058c94be 100644
--- a/make/data/cldr/common/main/es_CR.xml
+++ b/make/data/cldr/common/main/es_CR.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_DO.xml b/make/data/cldr/common/main/es_DO.xml
index 99a314f62e4..752562a350f 100644
--- a/make/data/cldr/common/main/es_DO.xml
+++ b/make/data/cldr/common/main/es_DO.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -142,6 +140,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/es_EC.xml b/make/data/cldr/common/main/es_EC.xml
index a813242deaa..9b00018403c 100644
--- a/make/data/cldr/common/main/es_EC.xml
+++ b/make/data/cldr/common/main/es_EC.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -212,6 +210,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/es_GQ.xml b/make/data/cldr/common/main/es_GQ.xml
index 556267534f4..eaacd908006 100644
--- a/make/data/cldr/common/main/es_GQ.xml
+++ b/make/data/cldr/common/main/es_GQ.xml
@@ -16,6 +16,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/es_GT.xml b/make/data/cldr/common/main/es_GT.xml
index 9137c3bd3d5..8f3924b4f7b 100644
--- a/make/data/cldr/common/main/es_GT.xml
+++ b/make/data/cldr/common/main/es_GT.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_HN.xml b/make/data/cldr/common/main/es_HN.xml
index 9be7f572ca7..ac4278011e4 100644
--- a/make/data/cldr/common/main/es_HN.xml
+++ b/make/data/cldr/common/main/es_HN.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml
index be625c9581e..6046b9fc4ee 100644
--- a/make/data/cldr/common/main/es_MX.xml
+++ b/make/data/cldr/common/main/es_MX.xml
@@ -51,11 +51,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nso">sotho septentrional</language>
 			<language type="ojb">ojibwa del noroeste</language>
 			<language type="ojw">ojibwa del oeste</language>
-			<language type="pa">punyabí</language>
 			<language type="shu" draft="contributed">árabe chadiano</language>
 			<language type="slh">lushootseed del sur</language>
 			<language type="ss">siswati</language>
-			<language type="sw">suajili</language>
 			<language type="sw_CD">suajili del Congo</language>
 			<language type="syr">siriaco</language>
 			<language type="tce">tutchone del sur</language>
@@ -86,7 +84,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 		<types>
 			<type key="calendar" type="roc">calendario minguo</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="collation" type="ducet">orden de clasificación de Unicode predeterminado</type>
+			<type key="collation" type="phonetic" scope="core">fonético</type>
+			<type key="collation" type="stroke" scope="core">trazos</type>
+			<type key="collation" type="unihan" scope="core">trazos radicales</type>
+			<type key="lw" type="breakall" scope="core">dividir todo</type>
+			<type key="lw" type="keepall" scope="core">conservar todo</type>
 			<type key="numbers" type="gujr">dígitos en gujarati</type>
 			<type key="numbers" type="mtei">dígitos en manipuri</type>
 			<type key="numbers" type="olck">dígitos ol chiki</type>
@@ -268,9 +272,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
@@ -400,10 +401,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">el domingo pasado</relative>
 				<relative type="0">este domingo</relative>
 				<relative type="1">el domingo próximo</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">dentro de {0} domingo</relativeTimePattern>
-					<relativeTimePattern count="other">dentro de {0} domingos</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="mon">
 				<relative type="-1">el lunes pasado</relative>
@@ -448,7 +445,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="hour-short">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">en {0} h</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} n</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} h</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
@@ -592,50 +589,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 k¤</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber">0 k ¤</pattern>
-					<pattern type="1000" count="other">0 k¤</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">0 k ¤</pattern>
-					<pattern type="10000" count="one">00 k¤</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">00 k ¤</pattern>
-					<pattern type="10000" count="other">00 k¤</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">00 k ¤</pattern>
-					<pattern type="100000" count="one">000 k¤</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">000 k ¤</pattern>
-					<pattern type="100000" count="other">000 k¤</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">000 k ¤</pattern>
-					<pattern type="1000000" count="one">0 M¤</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber">0 M ¤</pattern>
-					<pattern type="1000000" count="other">0 M¤</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">0 M ¤</pattern>
-					<pattern type="10000000" count="one">00 M¤</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">00 M ¤</pattern>
-					<pattern type="10000000" count="other">00 M¤</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">00 M ¤</pattern>
-					<pattern type="100000000" count="one">000 M¤</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber">000 M ¤</pattern>
-					<pattern type="100000000" count="other">000 M¤</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">000 M ¤</pattern>
-					<pattern type="1000000000" count="one">0000 M¤</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">0000 M ¤</pattern>
-					<pattern type="1000000000" count="other">0000 M¤</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0000 M ¤</pattern>
-					<pattern type="10000000000" count="one">00 MRD ¤</pattern>
-					<pattern type="10000000000" count="other">00 MRD ¤</pattern>
-					<pattern type="100000000000" count="one">000 MRD ¤</pattern>
-					<pattern type="100000000000" count="other">000 MRD ¤</pattern>
-					<pattern type="1000000000000" count="one">0 B¤</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">0 B ¤</pattern>
-					<pattern type="1000000000000" count="other">0 B¤</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0 B ¤</pattern>
-					<pattern type="10000000000000" count="one">00 B¤</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">00 B ¤</pattern>
-					<pattern type="10000000000000" count="other">00 B¤</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00 B ¤</pattern>
-					<pattern type="100000000000000" count="one">000 B¤</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">000 B ¤</pattern>
-					<pattern type="100000000000000" count="other">000 B¤</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000 B ¤</pattern>
+					<pattern type="1000" count="one">¤0 k</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0 k</pattern>
+					<pattern type="1000" count="other">¤0 k</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 k</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -948,30 +905,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} atm</unitPattern>
 				<unitPattern count="other">{0}atm</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
 		</unitLength>
 	</units>
 	<characterLabels>
 		<characterLabelPattern type="historic">{0} — Históricos</characterLabelPattern>
 		<characterLabelPattern type="miscellaneous">{0} — Varios</characterLabelPattern>
 		<characterLabel type="female">mujer</characterLabel>
-		<characterLabel type="format_whitespace">Formato y espacio duro</characterLabel>
 		<characterLabel type="keycap">tecla</characterLabel>
-		<characterLabel type="letterlike_symbols">Símbolos con letras</characterLabel>
-		<characterLabel type="limited_use">Uso limitado</characterLabel>
 		<characterLabel type="male">hombre</characterLabel>
-		<characterLabel type="modern_scripts">Sistemas de escritura modernos</characterLabel>
-		<characterLabel type="other">Otros</characterLabel>
-		<characterLabel type="phonetic_alphabet">Alfabeto fonético</characterLabel>
-		<characterLabel type="sign_standard_symbols">Símbolos de señales/estándar</characterLabel>
 		<characterLabel type="smiley">cara sonriente</characterLabel>
-		<characterLabel type="southeast_asian_scripts">Sistemas de escritura de Asia Sudoriental</characterLabel>
-		<characterLabel type="symbols">Símbolos</characterLabel>
-		<characterLabel type="tone_marks">Marcas tonales</characterLabel>
-		<characterLabel type="travel_places">Viajes y destinos</characterLabel>
-		<characterLabel type="variant_forms">Variantes</characterLabel>
 		<characterLabel type="weather">tiempo</characterLabel>
-		<characterLabel type="western_asian_scripts">Sistemas de escritura de Asia Occidental</characterLabel>
-		<characterLabel type="whitespace">Espacio duro</characterLabel>
 	</characterLabels>
 	<typographicNames>
 		<styleName type="wght" subtype="500">mediana</styleName>
diff --git a/make/data/cldr/common/main/es_NI.xml b/make/data/cldr/common/main/es_NI.xml
index 068c1766308..ab947f3752b 100644
--- a/make/data/cldr/common/main/es_NI.xml
+++ b/make/data/cldr/common/main/es_NI.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_PA.xml b/make/data/cldr/common/main/es_PA.xml
index 76ae5a0e0eb..4a2742aa13e 100644
--- a/make/data/cldr/common/main/es_PA.xml
+++ b/make/data/cldr/common/main/es_PA.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_PE.xml b/make/data/cldr/common/main/es_PE.xml
index aa0c0b9ab24..6ea4973ddd3 100644
--- a/make/data/cldr/common/main/es_PE.xml
+++ b/make/data/cldr/common/main/es_PE.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
diff --git a/make/data/cldr/common/main/es_PY.xml b/make/data/cldr/common/main/es_PY.xml
index 33fb2a11578..622cfe2bcb6 100644
--- a/make/data/cldr/common/main/es_PY.xml
+++ b/make/data/cldr/common/main/es_PY.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -179,6 +177,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/es_US.xml b/make/data/cldr/common/main/es_US.xml
index 98d53c4b12d..988aceeb3f0 100644
--- a/make/data/cldr/common/main/es_US.xml
+++ b/make/data/cldr/common/main/es_US.xml
@@ -44,6 +44,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="inh">ingusetio</language>
 			<language type="kab">cabilio</language>
 			<language type="krc">karachay-balkar</language>
+			<language type="ku" menu="extension">kurdo kurmanyi</language>
 			<language type="lij">ligur</language>
 			<language type="lou">creole de Luisiana</language>
 			<language type="lrc">lorí del norte</language>
@@ -100,11 +101,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="UM">Islas menores alejadas de EE. UU.</territory>
 		</territories>
 		<types>
+			<type key="calendar" type="dangi">calendario coreano</type>
+			<type key="calendar" type="dangi" scope="core">coreano</type>
+			<type key="calendar" type="roc" scope="core">chino</type>
+			<type key="collation" type="ducet" scope="core">predeterminado Unicode</type>
+			<type key="collation" type="phonetic" scope="core">fonético</type>
+			<type key="collation" type="pinyin" scope="core">sistema piyin</type>
+			<type key="collation" type="stroke" scope="core">trazos</type>
+			<type key="collation" type="unihan" scope="core">trazos radicales</type>
+			<type key="collation" type="zhuyin" scope="core">sistema zhuyin</type>
+			<type key="em" type="emoji" scope="core">emoticón</type>
+			<type key="lw" type="breakall" scope="core">dividir todo</type>
+			<type key="lw" type="keepall" scope="core">mantener todo</type>
+			<type key="lw" type="normal" scope="core">regular</type>
+			<type key="lw" type="phrase" scope="core">mantener en frases</type>
 			<type key="numbers" type="cakm">dígitos chakma</type>
 			<type key="numbers" type="gujr">dígitos en gujarati</type>
 			<type key="numbers" type="java">dígitos javaneses</type>
 			<type key="numbers" type="mtei">dígitos meetei mayek</type>
 			<type key="numbers" type="olck">dígitos ol chiki</type>
+			<type key="ss" type="none" scope="core">desactivado</type>
+			<type key="ss" type="standard" scope="core">activado</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="UK">imperial</measurementSystemName>
@@ -124,6 +141,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="generic">
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, d/M/y GGGGG</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
@@ -150,7 +169,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<quarterWidth type="wide">
 							<quarter type="1">1er trimestre</quarter>
 							<quarter type="2">2.º trimestre</quarter>
-							<quarter type="3">3.º trimestre</quarter>
+							<quarter type="3">3er trimestre</quarter>
 							<quarter type="4">4.º trimestre</quarter>
 						</quarterWidth>
 					</quarterContext>
@@ -234,6 +253,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="Hmsvvvv">HH:mm:ss (vvvv)</dateFormatItem>
 						<dateFormatItem id="MMd">d/MM</dateFormatItem>
@@ -259,9 +280,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
@@ -316,12 +334,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekdayOfMonth-short">
 				<displayName>día sem. de m</displayName>
 			</field>
-			<field type="sun">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">dentro de {0} domingo</relativeTimePattern>
-					<relativeTimePattern count="other">dentro de {0} domingos</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="wed-short">
 				<relative type="-1">el mie. pasado</relative>
 				<relative type="0">este mié.</relative>
@@ -333,11 +345,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</fields>
 		<timeZoneNames>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
@@ -476,6 +483,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>hora de las islas Gilbert</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<standard>HST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<short>
 					<generic>HAT</generic>
@@ -543,26 +555,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="10000000000" count="one">¤00 B</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 B</pattern>
-					<pattern type="10000000000" count="other">¤00 B</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 B</pattern>
-					<pattern type="100000000000" count="one">¤000 B</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000 B</pattern>
-					<pattern type="100000000000" count="other">¤000 B</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 B</pattern>
-					<pattern type="1000000000000" count="one">¤0 T</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0 T</pattern>
-					<pattern type="1000000000000" count="other">¤0 T</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 T</pattern>
-					<pattern type="10000000000000" count="one">¤00 T</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00 T</pattern>
-					<pattern type="10000000000000" count="other">¤00 T</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 T</pattern>
-					<pattern type="100000000000000" count="one">¤000 T</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000 T</pattern>
-					<pattern type="100000000000000" count="other">¤000 T</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 T</pattern>
+					<pattern type="10000" count="one">¤00 K</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 K</pattern>
+					<pattern type="10000" count="other">¤00 K</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 K</pattern>
+					<pattern type="100000" count="one">¤000 K</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000 K</pattern>
+					<pattern type="100000" count="other">¤000 K</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 K</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -618,6 +618,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">kwacha zambiano</displayName>
 				<displayName count="other">kwachas zambianos</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>oro de Zimbabue</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<genderMinimalPairs gender="feminine">{0}a</genderMinimalPairs>
@@ -629,12 +632,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="10p-2">
 				<unitPrefixPattern>centí{0}</unitPrefixPattern>
 			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>picó{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="10p-27">
 				<unitPrefixPattern>ronto {0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-30">
 				<unitPrefixPattern>quecto {0}</unitPrefixPattern>
 			</compoundUnit>
+			<unit type="concentr-part">
+				<displayName>partes por millón</displayName>
+				<unitPattern count="one">{0} parte por millón</unitPattern>
+				<unitPattern count="other">{0} partes por millón</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>por ciento</displayName>
 			</unit>
@@ -721,6 +732,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} libra fuerza-pie</unitPattern>
 				<unitPattern count="other">{0} libra fuerza-pies</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>onza líquida métrica</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acres-pies</displayName>
 				<unitPattern count="one">{0} acre-pie</unitPattern>
@@ -736,18 +750,73 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} dracma fluida</unitPattern>
 				<unitPattern count="other">{0} dreacmas fluidas</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>estereorradián</displayName>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>culombio</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradio</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrio</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simens</displayName>
+				<unitPattern count="one" draft="provisional">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>caloría IT</displayName>
+				<unitPattern count="one">{0} caloría IT</unitPattern>
+				<unitPattern count="other">{0} calorías IT</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopondio</displayName>
+				<unitPattern count="one">{0} kilopondio</unitPattern>
+				<unitPattern count="other">{0} kilopondios</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<unitPattern count="one" draft="provisional">{0} luz</unitPattern>
+				<unitPattern count="one">{0} de luces</unitPattern>
 				<unitPattern count="other">{0} luces</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="concentr-part">
+				<displayName>parte por millón</displayName>
+				<unitPattern count="one">{0} ppm</unitPattern>
+				<unitPattern count="other">{0} ppm</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} partes/millón</unitPattern>
+				<unitPattern count="other">{0} pts./M</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>‰</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="digital-byte">
 				<displayName>byte</displayName>
 			</unit>
@@ -838,12 +907,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} fl dracma</unitPattern>
 				<unitPattern count="other">{0} fl dracmas</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<unitPattern count="one" draft="provisional">{0} luz</unitPattern>
-				<unitPattern count="other">{0} de luces</unitPattern>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>partes/mil millones</displayName>
+			<unit type="energy-calorie-it">
+				<displayName>cal. IT</displayName>
+				<unitPattern count="one">{0} cal. IT</unitPattern>
+				<unitPattern count="other">{0} cal. IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<unitPattern count="one">{0} de luces</unitPattern>
+				<unitPattern count="other">{0} de luces</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
@@ -855,6 +935,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} arcsec</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ppm</displayName>
+				<unitPattern count="one">{0} ppm</unitPattern>
+				<unitPattern count="other">{0} ppm</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="duration-year">
 				<displayName>a</displayName>
 				<unitPattern count="one">{0}a</unitPattern>
@@ -897,6 +986,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mil</unitPattern>
 				<unitPattern count="other">{0}mil</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<displayName>B</displayName>
 			</unit>
@@ -912,6 +1005,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}bsh</unitPattern>
 				<unitPattern count="other">{0}bsh</unitPattern>
 			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0}F</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal. IT</displayName>
+				<unitPattern count="one">{0} cal. IT</unitPattern>
+				<unitPattern count="other">{0} cal. IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<unitPattern count="one">{0}luz</unitPattern>
 				<unitPattern count="other">{0}luces</unitPattern>
diff --git a/make/data/cldr/common/main/es_UY.xml b/make/data/cldr/common/main/es_UY.xml
index 75541c40b19..e0261af496f 100644
--- a/make/data/cldr/common/main/es_UY.xml
+++ b/make/data/cldr/common/main/es_UY.xml
@@ -126,6 +126,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
diff --git a/make/data/cldr/common/main/es_VE.xml b/make/data/cldr/common/main/es_VE.xml
index ef44a1f55d9..c80f7c7b09e 100644
--- a/make/data/cldr/common/main/es_VE.xml
+++ b/make/data/cldr/common/main/es_VE.xml
@@ -19,9 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="contributed">euskera</language>
 			<language type="grc" draft="contributed">griego antiguo</language>
 			<language type="nso" draft="contributed">sotho septentrional</language>
-			<language type="pa" draft="contributed">punyabí</language>
 			<language type="ss" draft="contributed">siswati</language>
-			<language type="sw" draft="contributed">suajili</language>
 			<language type="sw_CD" draft="contributed">suajili del Congo</language>
 			<language type="tn" draft="contributed">setswana</language>
 			<language type="wo" draft="contributed">wolof</language>
@@ -169,6 +167,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/et.xml b/make/data/cldr/common/main/et.xml
index 714746ef2db..1298eceea4c 100644
--- a/make/data/cldr/common/main/et.xml
+++ b/make/data/cldr/common/main/et.xml
@@ -302,7 +302,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kgp">kaingangi</language>
 			<language type="kha">khasi</language>
 			<language type="kho">saka</language>
-			<language type="khq">koyra chiini</language>
+			<language type="khq">koiratšiini</language>
 			<language type="khw">khovari</language>
 			<language type="ki">kikuju</language>
 			<language type="kiu">kõrmandžki</language>
@@ -330,6 +330,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölni</language>
 			<language type="ku">kurdi</language>
+			<language type="ku" menu="core">kurdi</language>
+			<language type="ku" menu="extension">kurmandži</language>
 			<language type="kum">kumõki</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -471,7 +473,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="pdc">Pennsylvania saksa</language>
 			<language type="pdt">mennoniidisaksa</language>
 			<language type="peo">vanapärsia</language>
-			<language type="pfl">Pfalzi</language>
+			<language type="pfl">pfaltsi</language>
 			<language type="phn">foiniikia</language>
 			<language type="pi">paali</language>
 			<language type="pis">pijini</language>
@@ -527,7 +529,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="seh">sena</language>
 			<language type="sei">seri</language>
 			<language type="sel">sölkupi</language>
-			<language type="ses">koyraboro senni</language>
+			<language type="ses">koiraborosenni</language>
 			<language type="sg">sango</language>
 			<language type="sga">vanaiiri</language>
 			<language type="sgs">žemaidi</language>
@@ -565,6 +567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="suk">sukuma</language>
 			<language type="sus">susu</language>
 			<language type="sux">sumeri</language>
+			<language type="suz" draft="contributed">sunvari</language>
 			<language type="sv">rootsi</language>
 			<language type="sw">suahiili</language>
 			<language type="sw_CD">Kongo suahiili</language>
@@ -613,7 +616,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="tum">tumbuka</language>
 			<language type="tvl">tuvalu</language>
 			<language type="tw">tvii</language>
-			<language type="twq">taswaqi</language>
+			<language type="twq">tasavaki</language>
 			<language type="ty">tahiti</language>
 			<language type="tyv">tõva</language>
 			<language type="tzm">tamasikti</language>
@@ -691,6 +694,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Bass">bassa</script>
 			<script type="Batk">bataki</script>
 			<script type="Beng">bengali</script>
+			<script type="Berf" draft="contributed">zaghava</script>
+			<script type="Bhks" draft="contributed">bhaiksuki</script>
 			<script type="Blis">Blissi sümbolid</script>
 			<script type="Bopo">bopomofo</script>
 			<script type="Brah">braahmi</script>
@@ -711,6 +716,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Cyrs">kürilliline kirikuslaavi</script>
 			<script type="Deva">devanaagari</script>
 			<script type="Diak" draft="contributed">divehi</script>
+			<script type="Dogr" draft="contributed">dogri</script>
 			<script type="Dsrt">desereti</script>
 			<script type="Dupl">Duployé kiirkiri</script>
 			<script type="Egyd">egiptuse demootiline</script>
@@ -729,6 +735,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Gran">grantha</script>
 			<script type="Grek">kreeka</script>
 			<script type="Gujr">gudžarati</script>
+			<script type="Gukh" draft="contributed">gurungi</script>
 			<script type="Guru">gurmukhi</script>
 			<script type="Hanb">hanbi</script>
 			<script type="Hang">korea</script>
@@ -743,6 +750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Hira">hiragana</script>
 			<script type="Hluw">Anatoolia hieroglüüfkiri</script>
 			<script type="Hmng">phahau-hmongi kiri</script>
+			<script type="Hmnp" draft="contributed">Chervangi kiri</script>
 			<script type="Hrkt">jaapani silpkirjad</script>
 			<script type="Hung">vanaungari</script>
 			<script type="Inds">Induse</script>
@@ -761,6 +769,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Knda">kannada</script>
 			<script type="Kore">korea segakiri</script>
 			<script type="Kpel">kpelle</script>
+			<script type="Krai" draft="contributed">kirat-rai</script>
 			<script type="Kthi">kaithi</script>
 			<script type="Lana">tai-thami</script>
 			<script type="Laoo">lao</script>
@@ -779,7 +788,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Maka" draft="contributed">makassari</script>
 			<script type="Mand">mandea</script>
 			<script type="Mani">mani</script>
+			<script type="Marc" draft="contributed">martšeni</script>
 			<script type="Maya">maaja hieroglüüfkiri</script>
+			<script type="Medf" draft="contributed">medefaidrini</script>
 			<script type="Mend">mende</script>
 			<script type="Merc">meroe kursiivkiri</script>
 			<script type="Mero">meroe</script>
@@ -792,6 +803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Mult">Multani</script>
 			<script type="Mymr">birma</script>
 			<script type="Nagm" draft="contributed">Nagi mundari</script>
+			<script type="Nand" draft="contributed">nandinaagari</script>
 			<script type="Narb">Põhja-Araabia</script>
 			<script type="Nbat">Nabatea</script>
 			<script type="Newa" draft="contributed">nevari</script>
@@ -800,12 +812,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Nshu">nüšu</script>
 			<script type="Ogam">ogam</script>
 			<script type="Olck">santali</script>
+			<script type="Onao" draft="contributed">bhumidži</script>
 			<script type="Orkh">Orhoni</script>
 			<script type="Orya">oria</script>
 			<script type="Osge" draft="contributed">oseidži</script>
 			<script type="Osma">osmani</script>
 			<script type="Ougr" draft="contributed">vanauiguuri</script>
 			<script type="Palm">Palmyra</script>
+			<script type="Pauc" draft="contributed">Pau Cin Hau</script>
 			<script type="Perm">vanapermi</script>
 			<script type="Phag">phakpa</script>
 			<script type="Phli">pahlavi raidkiri</script>
@@ -826,6 +840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Shaw">Shaw’ kiri</script>
 			<script type="Shrd">šaarada</script>
 			<script type="Sidd">siddhami</script>
+			<script type="Sidt" draft="contributed">side</script>
 			<script type="Sind">hudavadi</script>
 			<script type="Sinh">singali</script>
 			<script type="Sogd" draft="contributed">sogdi</script>
@@ -846,6 +861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Taml">tamili</script>
 			<script type="Tang">tanguudi</script>
 			<script type="Tavt">tai-vieti</script>
+			<script type="Tayo" draft="contributed">njoo</script>
 			<script type="Telu">telugu</script>
 			<script type="Teng">Tengwari</script>
 			<script type="Tfng">tifinagi</script>
@@ -855,7 +871,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Tibt">tiibeti</script>
 			<script type="Tirh">tirhuta</script>
 			<script type="Tnsa" draft="contributed">tase</script>
+			<script type="Todr" draft="contributed">Todhri</script>
+			<script type="Tols" draft="contributed">tolong-siki</script>
 			<script type="Toto" draft="contributed">toto</script>
+			<script type="Tutg" draft="contributed">tulu</script>
 			<script type="Ugar">ugariti</script>
 			<script type="Vaii">vai</script>
 			<script type="Visp">nähtava kõne</script>
@@ -962,7 +981,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Hiina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clippertoni saar</territory>
-			<territory type="CQ" draft="contributed">Sark</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuuba</territory>
 			<territory type="CV">Roheneemesaared</territory>
@@ -1179,7 +1198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="WF">Wallis ja Futuna</territory>
 			<territory type="WS">Samoa</territory>
 			<territory type="XA">pseudo-aktsent</territory>
-			<territory type="XB">pseudo-Bidi</territory>
+			<territory type="XB">pseudobidi</territory>
 			<territory type="XK">Kosovo</territory>
 			<territory type="YE">Jeemen</territory>
 			<territory type="YT">Mayotte</territory>
@@ -1245,35 +1264,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">numbrite järjestus</key>
 			<key type="colStrength">järjestuskaalud</key>
 			<key type="currency">vääring</key>
+			<key type="em">Emoji esitlus</key>
 			<key type="hc">12 või 24 tunni süsteem</key>
 			<key type="lb">reavahetuse laad</key>
+			<key type="lw">reavahetus sõnade vahel</key>
 			<key type="ms">mõõdustik</key>
 			<key type="numbers">numbrid</key>
+			<key type="ss">lause poolitamine pärast lühendit</key>
 			<key type="timezone">ajavöönd</key>
 			<key type="va">lokaadi variant</key>
 			<key type="x">erakasutus</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistlik kalender</type>
+			<type key="calendar" type="buddhist" scope="core">budistlik</type>
 			<type key="calendar" type="chinese">Hiina kalender</type>
+			<type key="calendar" type="chinese" scope="core">Hiina</type>
 			<type key="calendar" type="coptic">kopti kalender</type>
+			<type key="calendar" type="coptic" scope="core">kopti</type>
 			<type key="calendar" type="dangi">dangi kalender</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">Etioopia kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">Etioopia</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etioopia amete alemi kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etioopia amete alemi</type>
 			<type key="calendar" type="gregorian">Gregoriuse kalender</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriuse</type>
 			<type key="calendar" type="hebrew">juudi kalender</type>
+			<type key="calendar" type="hebrew" scope="core">juudi</type>
 			<type key="calendar" type="indian">India rahvuslik kalender</type>
 			<type key="calendar" type="islamic">hidžra kalender</type>
+			<type key="calendar" type="islamic" scope="core">hidžra</type>
 			<type key="calendar" type="islamic-civil">hidžra kalender (tabelkalender, ilmalik)</type>
+			<type key="calendar" type="islamic-civil" scope="core">hidžra (tabelkalender, ilmalik)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">hidžra kalender (Saudi Araabia, vaatluspõhine)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">hidžra kalender (tabelkalender, astronoomiline ajastu)</type>
 			<type key="calendar" type="islamic-umalqura">hidžra kalender (Umm al-Qurá)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hidžra (Umm al-Qurá)</type>
 			<type key="calendar" type="iso8601">ISO-8601 kalender</type>
 			<type key="calendar" type="japanese">Jaapani kalender</type>
+			<type key="calendar" type="japanese" scope="core">Jaapani</type>
 			<type key="calendar" type="persian">Pärsia kalender</type>
+			<type key="calendar" type="persian" scope="core">Pärsia</type>
 			<type key="calendar" type="roc">Hiina Vabariigi kalender</type>
+			<type key="calendar" type="roc" scope="core">Hiina Vabariigi</type>
 			<type key="cf" type="account">arvelduse rahavorming</type>
+			<type key="cf" type="account" scope="core">arveldus</type>
 			<type key="cf" type="standard">standardne rahavorming</type>
+			<type key="cf" type="standard" scope="core">standardne</type>
 			<type key="colAlternate" type="non-ignorable">järjesta sümbolid</type>
 			<type key="colAlternate" type="shifted">eira järjestuses sümboleid</type>
 			<type key="colBackwards" type="no">diakriitikud tavajärjestuses</type>
@@ -1283,19 +1321,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">suurtäht järjestuses eespool</type>
 			<type key="colCaseLevel" type="no">tõstutundetu järjestus</type>
 			<type key="colCaseLevel" type="yes">tõstutundlik järjestus</type>
-			<type key="collation" type="big5han">hiina traditsiooniline sortimisjärjestus (Big5)</type>
 			<type key="collation" type="compat">varasem sortimisjärjestus (ühilduvuse jaoks)</type>
 			<type key="collation" type="dictionary">sõnastiku sortimisjärjestus</type>
 			<type key="collation" type="ducet">Unicode’i vaikejärjestus</type>
+			<type key="collation" type="ducet" scope="core">vaike-Unicode</type>
 			<type key="collation" type="emoji">emoji sortimisjärjestus</type>
 			<type key="collation" type="eor">Euroopa järjestusreeglid</type>
-			<type key="collation" type="gb2312han">hiina lihtsustatud sortimisjärjestus (GB2312)</type>
 			<type key="collation" type="phonebook">telefoniraamatu sortimisjärjestus</type>
 			<type key="collation" type="phonetic">foneetiline sortimisjärjestus</type>
 			<type key="collation" type="pinyin">pinyin’i sortimisjärjestus</type>
 			<type key="collation" type="search">üldeesmärgiline otsing</type>
+			<type key="collation" type="search" scope="core">otsing</type>
 			<type key="collation" type="searchjl">otsing korea alguskonsonandi järgi</type>
 			<type key="collation" type="standard">standardne järjestus</type>
+			<type key="collation" type="standard" scope="core">standardne</type>
 			<type key="collation" type="stroke">kriipsude sortimisjärjestus</type>
 			<type key="collation" type="traditional">traditsiooniline sortimisjärjestus</type>
 			<type key="collation" type="unihan">võtmete-kriipsude sortimisjärjestus</type>
@@ -1312,18 +1351,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">täislaius</type>
 			<type key="d0" type="hwidth">poollaius</type>
 			<type key="d0" type="npinyin">Numbriline</type>
+			<type key="em" type="default" scope="core">vaikeväärtus</type>
+			<type key="em" type="emoji" scope="core">Emotikon</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-tunnine süsteem (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-tunnine süsteem (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-tunnine süsteem (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-tunnine süsteem (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">paindlik reavahetuse laad</type>
+			<type key="lb" type="loose" scope="core">paindlik</type>
 			<type key="lb" type="normal">harilik reavahetuse laad</type>
+			<type key="lb" type="normal" scope="core">harilik</type>
 			<type key="lb" type="strict">jäik reavahetuse laad</type>
+			<type key="lb" type="strict" scope="core">jäik</type>
+			<type key="lw" type="breakall" scope="core">vaheta kõik</type>
+			<type key="lw" type="keepall" scope="core">jäta kõik</type>
+			<type key="lw" type="normal" scope="core">harilik</type>
+			<type key="lw" type="phrase" scope="core">jäta fraasid</type>
 			<type key="m0" type="bgn">transkriptsioon (BGN)</type>
 			<type key="m0" type="ungegn">transkriptsioon (UNGEGN)</type>
 			<type key="ms" type="metric">meetermõõdustik</type>
+			<type key="ms" type="metric" scope="core">meetriline</type>
 			<type key="ms" type="uksystem">inglise mõõdustik</type>
+			<type key="ms" type="uksystem" scope="core">ÜK</type>
 			<type key="ms" type="ussystem">USA mõõdustik</type>
+			<type key="ms" type="ussystem" scope="core">USA</type>
 			<type key="numbers" type="ahom" draft="contributed">ahomi numbrid</type>
 			<type key="numbers" type="arab">idaaraabia numbrid</type>
 			<type key="numbers" type="arabext">laiendatud idaaraabia numbrid</type>
@@ -1340,12 +1396,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="ethi">etioopia numbrid</type>
 			<type key="numbers" type="finance">finantsnumbrid</type>
 			<type key="numbers" type="fullwide">täislaiusega numbrid</type>
+			<type key="numbers" type="gara" draft="contributed">garai numbrid</type>
 			<type key="numbers" type="geor">gruusia numbrid</type>
 			<type key="numbers" type="gong" draft="contributed">Gūnjāla gondi numbrid</type>
 			<type key="numbers" type="gonm">Masarami gondi numbrid</type>
 			<type key="numbers" type="grek">kreeka numbrid</type>
 			<type key="numbers" type="greklow">väiketähelised kreeka numbrid</type>
 			<type key="numbers" type="gujr">gudžarati numbrid</type>
+			<type key="numbers" type="gukh" draft="contributed">gurungi numbrid</type>
 			<type key="numbers" type="guru">gurmukhi numbrid</type>
 			<type key="numbers" type="hanidec">hiina kümnendnumbrid</type>
 			<type key="numbers" type="hans">lihtsustatud hiina keele numbrid</type>
@@ -1354,6 +1412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="hantfin">traditsioonilise hiina keele finantsnumbrid</type>
 			<type key="numbers" type="hebr">heebrea numbrid</type>
 			<type key="numbers" type="hmng">phahau-hmongi numbrid</type>
+			<type key="numbers" type="hmnp" draft="contributed">Chervangi numbrid</type>
 			<type key="numbers" type="java">jaava numbrid</type>
 			<type key="numbers" type="jpan">jaapani numbrid</type>
 			<type key="numbers" type="jpanfin">jaapani finantsnumbrid</type>
@@ -1361,6 +1420,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="kawi" draft="contributed">kaavi numbrid</type>
 			<type key="numbers" type="khmr">khmeeri numbrid</type>
 			<type key="numbers" type="knda">kannada numbrid</type>
+			<type key="numbers" type="krai" draft="contributed">kirat-rai numbrid</type>
 			<type key="numbers" type="lana" draft="contributed">tai tham hora numbrid</type>
 			<type key="numbers" type="lanatham" draft="contributed">tai tham tham numbrid</type>
 			<type key="numbers" type="laoo">lao numbrid</type>
@@ -1379,6 +1439,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="native">kohalikud numbrid</type>
 			<type key="numbers" type="nkoo">nkoo numbrid</type>
 			<type key="numbers" type="olck">santali numbrid</type>
+			<type key="numbers" type="onao" draft="contributed">bhumidži numbrid</type>
 			<type key="numbers" type="orya">oria numbrid</type>
 			<type key="numbers" type="osma">osmani numbrid</type>
 			<type key="numbers" type="rohg" draft="contributed">rohingja numbrid</type>
@@ -1390,6 +1451,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="sinh" draft="contributed">sinhala lithi numbrid</type>
 			<type key="numbers" type="sora">sora numbrid</type>
 			<type key="numbers" type="sund">sunda numbrid</type>
+			<type key="numbers" type="sunu" draft="contributed">sunvari numbrid</type>
 			<type key="numbers" type="takr">taakri numbrid</type>
 			<type key="numbers" type="talu">uue tai-lõõ numbrid</type>
 			<type key="numbers" type="taml">traditsioonilised tamili numbrid</type>
@@ -1399,10 +1461,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">tiibeti numbrid</type>
 			<type key="numbers" type="tirh" draft="contributed">tirhuta numbrid</type>
 			<type key="numbers" type="tnsa" draft="contributed">tase numbrid</type>
+			<type key="numbers" type="tols" draft="contributed">tolong-siki numbrid</type>
 			<type key="numbers" type="traditional">traditsioonilised numbrid</type>
 			<type key="numbers" type="vaii">vai numbrid</type>
 			<type key="numbers" type="wara" draft="contributed">hoo numbrid</type>
 			<type key="numbers" type="wcho" draft="contributed">vantšo numbrid</type>
+			<type key="ss" type="none" scope="core">välja lülitatud</type>
+			<type key="ss" type="standard" scope="core">sisse lülitatud</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">meetermõõdustik</measurementSystemName>
@@ -1534,11 +1599,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
@@ -1603,9 +1669,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d. MMM y G – E, d. MMM</greatestDifference>
 							<greatestDifference id="y">E, d. MMM y G – E, d. MMM y</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
@@ -1615,9 +1678,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -1909,11 +1969,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1921,7 +1982,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="M">M</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
-						<dateFormatItem id="MMM">MMMM</dateFormatItem>
+						<dateFormatItem id="MMM">MMM</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
@@ -1980,10 +2041,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d. MMM – E, d. MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d. MMM y – E, d. MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1994,10 +2051,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd.MM–dd.MM</greatestDifference>
 							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
@@ -2603,21 +2656,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>määramata linn</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viin</exemplarCity>
 			</zone>
@@ -2636,27 +2677,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
@@ -2669,12 +2689,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Lihavõttesaar</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
 			</zone>
@@ -2690,9 +2704,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praha</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berliin</exemplarCity>
 			</zone>
@@ -2702,15 +2713,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Algiers">
 				<exemplarCity>Alžiir</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Kairo</exemplarCity>
 			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Kanaari saared</exemplarCity>
 			</zone>
@@ -2776,9 +2781,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Abariringa</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
@@ -2814,27 +2816,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Riga">
 				<exemplarCity>Riia</exemplarCity>
 			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chișinău</exemplarCity>
-			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macau</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldiivid</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahia Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>México</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Katmandu</exemplarCity>
 			</zone>
@@ -2904,9 +2897,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Ar-Riyāḑ</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Hartum</exemplarCity>
 			</zone>
@@ -2922,12 +2912,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskus</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
@@ -2993,9 +2977,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Lääne-Aafrika aeg</generic>
-					<standard>Lääne-Aafrika standardaeg</standard>
-					<daylight>Lääne-Aafrika suveaeg</daylight>
+					<standard>Lääne-Aafrika aeg</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3390,6 +3372,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyana aeg</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleuudi standardaeg</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleuudi aeg</generic>
@@ -3840,6 +3827,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuuki aeg</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Türgi aeg</generic>
+					<standard>Türgi standardaeg</standard>
+					<daylight>Türgi suveaeg</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Türkmenistani aeg</generic>
@@ -3999,9 +3993,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4564,7 +4561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ILR">
 				<displayName>Iisraeli seekel (1980–1985)</displayName>
 				<displayName count="one">Iisraeli seekel (1980–1985)</displayName>
-				<displayName count="other">Iisraeli seekelit (1980–1985)</displayName>
+				<displayName count="other">Iisraeli seeklit (1980–1985)</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>Iisraeli uus seekel</displayName>
@@ -5277,6 +5274,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Ida-Kariibi dollar</displayName>
 				<displayName count="other">Ida-Kariibi dollarit</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Kariibi kulden</displayName>
+				<displayName count="one">Kariibi kulden</displayName>
+				<displayName count="other">Kariibi kuldnat</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Rahvusvahelise Valuutafondi arvestusühik</displayName>
 			</currency>
@@ -5333,8 +5335,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="YUD">
 				<displayName draft="contributed">Jugoslaavia kõva dinaar (1966–1990)</displayName>
-				<displayName count="one" draft="contributed">Jugoslaavia kõva dinaar (1966–1990)</displayName>
-				<displayName count="other">Jugoslaavia kõva dinaar (1966–1990)</displayName>
 			</currency>
 			<currency type="YUM">
 				<displayName>Jugoslaavia uus dinaar (1994–2002)</displayName>
@@ -5374,6 +5374,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Zimbabwe dollar (1980–2008)</displayName>
 				<displayName count="other">Zimbabwe dollarit (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe kuld</displayName>
+				<displayName count="one">Zimbabwe kuld</displayName>
+				<displayName count="other">Zimbabwe kulda</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwe dollar (2009)</displayName>
 				<displayName count="one">Zimbabwe dollar (2009)</displayName>
@@ -5599,7 +5604,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimool liitri kohta</unitPattern>
 				<unitPattern count="other">{0} millimooli liitri kohta</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>osa</displayName>
+				<unitPattern count="one">{0} osa</unitPattern>
+				<unitPattern count="other">{0} osa</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>osa miljoni kohta</displayName>
 				<unitPattern count="one">{0} osa miljoni kohta</unitPattern>
 				<unitPattern count="other">{0} osa miljoni kohta</unitPattern>
@@ -5623,6 +5633,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mool</unitPattern>
 				<unitPattern count="other">{0} mooli</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glükoosi</displayName>
+				<unitPattern count="one">{0} glükoosi</unitPattern>
+				<unitPattern count="other">{0} glükoosi</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liitrid kilomeetri kohta</displayName>
 				<unitPattern count="one">{0} liiter kilomeetri kohta</unitPattern>
@@ -6121,6 +6136,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimeeter elavhõbedasammast</unitPattern>
 				<unitPattern count="other">{0} millimeetrit elavhõbedasammast</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>elavhõbedasammast</displayName>
+				<unitPattern count="one">{0} elavhõbedasammast</unitPattern>
+				<unitPattern count="other">{0} elavhõbedasammast</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>naelad ruuttolli kohta</displayName>
 				<unitPattern count="one">{0} nael ruuttolli kohta</unitPattern>
@@ -6292,6 +6312,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} meetriline tass</unitPattern>
 				<unitPattern count="other">{0} meetrilist tassi</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>vedelikuunts m</displayName>
+				<unitPattern count="one">{0} vedelikuunts m</unitPattern>
+				<unitPattern count="other">{0} vedelikuuntsi m</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>aakerjalad</displayName>
 				<unitPattern count="one">{0} aakerjalg</unitPattern>
@@ -6372,15 +6397,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} inglise kvart</unitPattern>
 				<unitPattern count="other">{0} inglise kvarti</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradiaan</displayName>
+				<unitPattern count="one">{0} steradiaan</unitPattern>
+				<unitPattern count="other">{0} steradiaani</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katalit</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kulon</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="other">{0} kulonit</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} faradit</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henri</displayName>
+				<unitPattern count="one">{0} henri</unitPattern>
+				<unitPattern count="other">{0} henrit</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siimens</displayName>
+				<unitPattern count="one">{0} siimens</unitPattern>
+				<unitPattern count="other">{0} siimensit</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorid [IT]</displayName>
+				<unitPattern count="one">{0} kalor [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorit [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekrellid</displayName>
+				<unitPattern count="one">{0} bekrell</unitPattern>
+				<unitPattern count="other">{0} bekrelli</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>siivert</displayName>
+				<unitPattern count="one">{0} siivert</unitPattern>
+				<unitPattern count="other">{0} siivertit</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greid</displayName>
+				<unitPattern count="one">{0} grei</unitPattern>
+				<unitPattern count="other">{0} greid</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>jõukilogramm</displayName>
+				<unitPattern count="one">{0} jõukilogramm</unitPattern>
+				<unitPattern count="other">{0} jõukilogrammi</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslat</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veeber</displayName>
+				<unitPattern count="one">{0} veeber</unitPattern>
+				<unitPattern count="other">{0} veebrit</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>valgus</displayName>
+				<unitPattern count="one">{0} valgus</unitPattern>
+				<unitPattern count="other">{0} valgust</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>miljardikosa</displayName>
-				<unitPattern count="one">{0} miljardikosa</unitPattern>
-				<unitPattern count="other">{0} miljardikosa</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ööd</displayName>
-				<unitPattern count="one">{0} öö</unitPattern>
-				<unitPattern count="other">{0} ööd</unitPattern>
 				<perUnitPattern>{0} öö kohta</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6452,7 +6542,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} üksus</unitPattern>
 				<unitPattern count="other">{0} üksust</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>osa</displayName>
+				<unitPattern count="one">{0} osa</unitPattern>
+				<unitPattern count="other">{0} osa</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>osa/miljon</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
@@ -6461,6 +6556,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>mool</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6691,6 +6791,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} hj</unitPattern>
 				<unitPattern count="other">{0} hj</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>in Hg</displayName>
 				<unitPattern count="one">{0} in Hg</unitPattern>
@@ -6751,6 +6855,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m</unitPattern>
+				<unitPattern count="other">{0} fl oz m</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>aakerjalg</displayName>
 			</unit>
@@ -6820,7 +6928,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ingl kvart</unitPattern>
 				<unitPattern count="other">{0} ingl kvarti</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>valgus</displayName>
+				<unitPattern count="one">{0} valgus</unitPattern>
+				<unitPattern count="other">{0} valgust</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>osakesed/miljard</displayName>
 				<unitPattern count="one">{0} miljardikosa</unitPattern>
 				<unitPattern count="other">{0} miljardikosa</unitPattern>
@@ -6844,9 +7010,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} aaker</unitPattern>
 				<unitPattern count="other">{0} aakrit</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>osa</displayName>
+				<unitPattern count="one">{0} osa</unitPattern>
+				<unitPattern count="other">{0} osa</unitPattern>
+			</unit>
 			<unit type="concentr-mole">
 				<displayName>mol</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0} l/100km</unitPattern>
 				<unitPattern count="other">{0} l/100km</unitPattern>
@@ -6927,6 +7101,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-liter">
 				<displayName>liiter</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m</unitPattern>
+				<unitPattern count="other">{0} fl oz m</unitPattern>
+			</unit>
 			<unit type="volume-gallon-imperial">
 				<unitPattern count="one">{0} gal Im</unitPattern>
 				<unitPattern count="other">{0} gal Im</unitPattern>
@@ -6951,11 +7129,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt Imp.</unitPattern>
 				<unitPattern count="other">{0} qt Imp.</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ööd</displayName>
-				<unitPattern count="one">{0} öö</unitPattern>
-				<unitPattern count="other">{0} ööd</unitPattern>
-				<perUnitPattern>{0}/öö</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>valgus</displayName>
+				<unitPattern count="one">{0} valg.</unitPattern>
+				<unitPattern count="other">{0} valg.</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/eu.xml b/make/data/cldr/common/main/eu.xml
index e44c764a817..5230ca91424 100644
--- a/make/data/cldr/common/main/eu.xml
+++ b/make/data/cldr/common/main/eu.xml
@@ -44,6 +44,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ay">aimara</language>
 			<language type="az">azerbaijanera</language>
 			<language type="ba">baxkirera</language>
+			<language type="bal">balutxera</language>
 			<language type="ban">baliera</language>
 			<language type="bas">basaa</language>
 			<language type="be">bielorrusiera</language>
@@ -230,6 +231,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafiera</language>
 			<language type="ksh">koloniera</language>
 			<language type="ku">kurduera</language>
+			<language type="ku" menu="core">kurduera</language>
+			<language type="ku" menu="extension">kurmanjia</language>
 			<language type="kum">kumykera</language>
 			<language type="kv">komiera</language>
 			<language type="kw">kornubiera</language>
@@ -747,6 +750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Txina</territory>
 			<territory type="CO">Kolonbia</territory>
 			<territory type="CP">Clipperton uhartea</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -1096,35 +1100,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Zenbakizko ordena</key>
 			<key type="colStrength">Ordenaren sendotasuna</key>
 			<key type="currency">Moneta</key>
+			<key type="em">Emojien aurkezpena</key>
 			<key type="hc">Ordu-zikloa (12 vs 24)</key>
 			<key type="lb">Lerro-jauziaren estiloa</key>
+			<key type="lw">Hitz barruko lerro-jauziak</key>
 			<key type="ms">Neurketa-sistema</key>
 			<key type="numbers">Zenbakiak</key>
+			<key type="ss">Laburtzapenen ondorengo lerro-jauzia</key>
 			<key type="timezone">Ordu-zona</key>
 			<key type="va">Eskualdeko ezarpenen aldaera</key>
 			<key type="x">Erabilera pribatua</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Egutegi budista</type>
+			<type key="calendar" type="buddhist" scope="core">Budista</type>
 			<type key="calendar" type="chinese">Txinatar egutegia</type>
+			<type key="calendar" type="chinese" scope="core">Txinatarra</type>
 			<type key="calendar" type="coptic">Egutegi koptoa</type>
+			<type key="calendar" type="coptic" scope="core">Koptoa</type>
 			<type key="calendar" type="dangi">Dangi egutegia</type>
+			<type key="calendar" type="dangi" scope="core">Dangia</type>
 			<type key="calendar" type="ethiopic">Egutegi etiopiarra</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiopiarra</type>
 			<type key="calendar" type="ethiopic-amete-alem">Amete Alem egutegi etiopiarra</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem etiopiarra</type>
 			<type key="calendar" type="gregorian">Egutegi gregoriarra</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriarra</type>
 			<type key="calendar" type="hebrew">Hebrear egutegia</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrearra</type>
 			<type key="calendar" type="indian">Indiar egutegia</type>
 			<type key="calendar" type="islamic">Egutegi islamiarra</type>
+			<type key="calendar" type="islamic" scope="core">Islamiarra</type>
 			<type key="calendar" type="islamic-civil">Egutegi islamiarra (taula-formakoa, garai zibilekoa)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Islamiarra (taula-formakoa, garai zibilekoa)</type>
 			<type key="calendar" type="islamic-rgsa">Islamiar egutegia (Saudi Arabia, ikuspegiak)</type>
 			<type key="calendar" type="islamic-tbla">Islamiar egutegia (taula-formakoa, gai astronomikokoa)</type>
 			<type key="calendar" type="islamic-umalqura">Egutegi islamiarra (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Islamiarra (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 egutegia</type>
 			<type key="calendar" type="japanese">Japoniar egutegia</type>
+			<type key="calendar" type="japanese" scope="core">Japoniarra</type>
 			<type key="calendar" type="persian">Egutegi persiarra</type>
+			<type key="calendar" type="persian" scope="core">Persiarra</type>
 			<type key="calendar" type="roc">Minguo egutegia</type>
+			<type key="calendar" type="roc" scope="core">Minguoa</type>
 			<type key="cf" type="account">Kontabilitateko moneta-formatua</type>
+			<type key="cf" type="account" scope="core">Kontabilitatea</type>
 			<type key="cf" type="standard">Moneta-formatu estandarra</type>
+			<type key="cf" type="standard" scope="core">Estandarra</type>
 			<type key="colAlternate" type="non-ignorable">Ordenatu ikurrak</type>
 			<type key="colAlternate" type="shifted">Ordenatu ikurrei ez ikusi eginda</type>
 			<type key="colBackwards" type="no">Ordenatu azentuak modu normalean</type>
@@ -1134,19 +1157,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Ordenatu maiuskulak lehenik</type>
 			<type key="colCaseLevel" type="no">Ordenatu maiuskulak eta minuskulak bereizi gabe</type>
 			<type key="colCaseLevel" type="yes">Ordenatu maiuskulak eta minuskulak bereizita</type>
-			<type key="collation" type="big5han">Txinera tradizionalaren alfabetoa-Big5</type>
 			<type key="collation" type="compat">Aurreko hurrenkera, bateragarria izateko</type>
 			<type key="collation" type="dictionary">Hurrenkera alfabetikoa</type>
 			<type key="collation" type="ducet">Unicode hurrenkera lehenetsia</type>
+			<type key="collation" type="ducet" scope="core">Unicode lehenetsia</type>
 			<type key="collation" type="emoji">Emojien hurrenkera</type>
 			<type key="collation" type="eor">Europako ordenatzeko arauak</type>
-			<type key="collation" type="gb2312han">Txinera sinplifikatuaren alfabetoa -GB2312</type>
 			<type key="collation" type="phonebook">Telefonoen zerrenda</type>
 			<type key="collation" type="phonetic">Ordenatzeko irizpide fonetikoa</type>
 			<type key="collation" type="pinyin">Pinyin hurrenkera</type>
 			<type key="collation" type="search">Bilaketa orokorra</type>
+			<type key="collation" type="search" scope="core">Bilaketa</type>
 			<type key="collation" type="searchjl">Bilatu hangularen lehen kontsonantearen arabera</type>
 			<type key="collation" type="standard">Ordenatzeko irizpide estandarra</type>
+			<type key="collation" type="standard" scope="core">Estandarra</type>
 			<type key="collation" type="stroke">Tarteen araberako hurrenkera</type>
 			<type key="collation" type="traditional">Tradizionala</type>
 			<type key="collation" type="unihan">Radical trazuen hurrenkera</type>
@@ -1163,18 +1187,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Zabalera osoko karaktere-bihurketa</type>
 			<type key="d0" type="hwidth">Zabalera erdiko karaktere-bihurketa</type>
 			<type key="d0" type="npinyin">Zenbakizko bihurketa</type>
+			<type key="em" type="default" scope="core">Lehenetsia</type>
+			<type key="em" type="emoji" scope="core">Emojia</type>
+			<type key="em" type="text" scope="core">Testua</type>
 			<type key="hc" type="h11">12 orduko sistema (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 orduko sistema (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 orduko sistema (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 orduko sistema (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Lerro-jauziaren estilo malgua</type>
+			<type key="lb" type="loose" scope="core">Malgua</type>
 			<type key="lb" type="normal">Lerro-jauziaren estilo arrunta</type>
+			<type key="lb" type="normal" scope="core">Arrunta</type>
 			<type key="lb" type="strict">Lerro-jauziaren estilo zorrotza</type>
+			<type key="lb" type="strict" scope="core">Zorrotza</type>
+			<type key="lw" type="breakall" scope="core">Hautsi denak</type>
+			<type key="lw" type="keepall" scope="core">Mantendu denak</type>
+			<type key="lw" type="normal" scope="core">Arrunta</type>
+			<type key="lw" type="phrase" scope="core">Mantendu esaldietan</type>
 			<type key="m0" type="bgn">US BGN transliterazioa</type>
 			<type key="m0" type="ungegn">UN GEGN transliterazioa</type>
 			<type key="ms" type="metric">Sistema metrikoa</type>
+			<type key="ms" type="metric" scope="core">Metrikoa</type>
 			<type key="ms" type="uksystem">Neurketa-sistema inperiala</type>
+			<type key="ms" type="uksystem" scope="core">Erresuma Batua</type>
 			<type key="ms" type="ussystem">Neurketa-sistema anglosaxoia</type>
+			<type key="ms" type="ussystem" scope="core">AEB</type>
 			<type key="numbers" type="ahom">Ahom digituak</type>
 			<type key="numbers" type="arab">Digitu arabiar-hindikoak</type>
 			<type key="numbers" type="arabext">Digitu arabiar-hindiko hedatuak</type>
@@ -1260,6 +1301,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Vai digituak</type>
 			<type key="numbers" type="wara">Warang Citi digituak</type>
 			<type key="numbers" type="wcho">Wancho digituak</type>
+			<type key="ss" type="none" scope="core">Aktibatuta</type>
+			<type key="ss" type="standard" scope="core">Desaktibatuta</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Sistema metrikoa</measurementSystemName>
@@ -1459,7 +1502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1494,17 +1537,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h('r')('a')'k'</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:s</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d, EEEE</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">G. 'aroko' y. 'urtea'</dateFormatItem>
+						<dateFormatItem id="GyM">G. 'aroko' y-MM</dateFormatItem>
 						<dateFormatItem id="GyMd">y-MM-dd (GGGGG)</dateFormatItem>
+						<dateFormatItem id="GyMEd">G 'aroko' y-MM-dd, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G. 'aroko' y('e')'ko' MMMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G. 'aroko' y('e')'ko' MMMM d</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G. 'aroko' y('e')'ko' MMMM d, EEEE</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">MM/dd</dateFormatItem>
@@ -1887,14 +1932,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="GyM">G y/M</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y/M/d, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y. 'urteko' MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y. 'urteko' MMM d('a')</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y. 'urteko' MMM d('a'), E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1949,10 +1996,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">G y, MMM d('a'), E – MMM d('a'), E</greatestDifference>
 							<greatestDifference id="y">G y, MMM d('a'), E – G y, MMM d('a'), E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1963,10 +2006,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2522,11 +2561,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0} (udako ordua)</regionFormat>
 			<regionFormat type="standard">{0} aldeko ordu estandarra</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2540,18 +2574,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Aingira</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erevan</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
@@ -2567,24 +2592,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
@@ -2600,9 +2607,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Douala">
 				<exemplarCity>Duala</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Habana</exemplarCity>
 			</zone>
@@ -2615,9 +2619,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praga</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Africa/Djibouti">
 				<exemplarCity>Djibuti</exemplarCity>
 			</zone>
@@ -2704,9 +2705,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Bixkek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint Kitts</exemplarCity>
 			</zone>
@@ -2746,9 +2744,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Monaco">
 				<exemplarCity>Monako</exemplarCity>
 			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Khovd</exemplarCity>
-			</zone>
 			<zone type="Asia/Ulaanbaatar">
 				<exemplarCity>Ulan Bator</exemplarCity>
 			</zone>
@@ -2767,9 +2762,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldivak</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Mexiko Hiria</exemplarCity>
 			</zone>
@@ -2839,9 +2831,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Khartum</exemplarCity>
 			</zone>
@@ -2928,9 +2917,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Afrikako mendebaldeko ordua</generic>
-					<standard>Afrikako mendebaldeko ordu estandarra</standard>
-					<daylight>Afrikako mendebaldeko udako ordua</daylight>
+					<standard>Afrikako mendebaldeko ordua</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3366,6 +3353,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyanako ordua</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutiar uharteetako ordu estandarra</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutiar uharteetako ordua</generic>
@@ -3978,13 +3973,162 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4018,6 +4162,167 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
 		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
 				<displayName>pezeta andorratarra</displayName>
@@ -5396,6 +5701,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dolar ekikaribear</displayName>
 				<displayName count="other">dolar ekikaribear</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>florin karibetarra</displayName>
+				<displayName count="one">florin karibetarra</displayName>
+				<displayName count="other">florin karibetarra</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>igorpen-eskubide berezia</displayName>
 				<displayName count="one">igorpen-eskubide berezi</displayName>
@@ -5522,6 +5832,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dolar zimbabwetar (1980–2008)</displayName>
 				<displayName count="other">dolar zimbabwetar (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>urre zimbabwetarra</displayName>
+				<displayName count="one">urre zimbabwetarra</displayName>
+				<displayName count="other">urre zimbabwetarra</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>dolar zimbabwetarra (2009)</displayName>
 				<displayName count="one">dolar zimbabwetar (2009)</displayName>
@@ -5743,7 +6058,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<displayName>elementuak</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>zatiak</displayName>
+				<unitPattern count="one">{0} zati</unitPattern>
+				<unitPattern count="other">{0} zati</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>zati milioi bakoitzeko</displayName>
 				<unitPattern count="one">{0} zati milioi bakoitzeko</unitPattern>
 				<unitPattern count="other">{0} zati milioi bakoitzeko</unitPattern>
@@ -5761,6 +6081,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>molak</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukosa-unitateak</displayName>
+				<unitPattern count="one">{0} glukosa-unitate</unitPattern>
+				<unitPattern count="other">{0} glukosa-unitate</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litro kilometro bakoitzeko</displayName>
 				<unitPattern count="one">{0} litro kilometro bakoitzeko</unitPattern>
@@ -6228,6 +6553,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} merkurio-milimetro</unitPattern>
 				<unitPattern count="other">{0} merkurio-milimetro</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>merkurio-unitateak</displayName>
+				<unitPattern count="one">{0} merkurio-unitate</unitPattern>
+				<unitPattern count="other">{0} merkurio-unitate</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libra hazbete karratuko</displayName>
 				<unitPattern count="one">{0} libra hazbete karratuko</unitPattern>
@@ -6381,6 +6711,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<displayName>katilu metrikoak</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>likido-ontza metrikoak</displayName>
+				<unitPattern count="one">{0} likido-ontza metriko</unitPattern>
+				<unitPattern count="other">{0} likido-ontza metriko</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} bushel</unitPattern>
 				<unitPattern count="other">{0} bushel</unitPattern>
@@ -6426,20 +6761,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} laurden inperial</unitPattern>
 				<unitPattern count="other">{0} laurden inperial</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>argia</displayName>
-				<unitPattern count="one">{0} argi</unitPattern>
-				<unitPattern count="other">{0} argi</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>estereorradianak</displayName>
+				<unitPattern count="one">{0} estereorradian</unitPattern>
+				<unitPattern count="other">{0} estereorradian</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katalak</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombak</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradak</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henryak</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensak</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kaloriak [IT]</displayName>
+				<unitPattern count="one">{0} kaloria [IT]</unitPattern>
+				<unitPattern count="other">{0} kaloria [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerelak</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievertak</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grayak</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopondak</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="other">{0} kilopond</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslak</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weberrak</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>zati mila milioiko</displayName>
 				<unitPattern count="one">{0} zati mila milioiko</unitPattern>
 				<unitPattern count="other">{0} zati mila milioiko</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>gauak</displayName>
-				<unitPattern count="one">{0} gau</unitPattern>
-				<unitPattern count="other">{0} gau</unitPattern>
 				<perUnitPattern>{0} gau bakoitzeko</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6497,7 +6890,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} elementu</unitPattern>
 				<unitPattern count="other">{0} elementu</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>zati</displayName>
+				<unitPattern count="one">{0} zati</unitPattern>
+				<unitPattern count="other">{0} zati</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>zati/milioi</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6515,6 +6913,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>mola</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukosa-unitate</displayName>
+				<unitPattern count="one">{0} glukosa-unitate</unitPattern>
+				<unitPattern count="other">{0} glukosa-unitate</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6727,6 +7130,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>W</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>merkurio-unitate</displayName>
+				<unitPattern count="one">{0} merkurio-unitate</unitPattern>
+				<unitPattern count="other">{0} merkurio-unitate</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<displayName>mb</displayName>
 				<unitPattern count="one">{0} mb</unitPattern>
@@ -6811,6 +7219,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} katilukada metriko</unitPattern>
 				<unitPattern count="other">{0} katilukada metriko</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>likido-ontza metriko</displayName>
+				<unitPattern count="one">{0} likido-ontza metriko</unitPattern>
+				<unitPattern count="other">{0} likido-ontza metriko</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akre-oin</displayName>
 				<unitPattern count="one">{0} akre-oin</unitPattern>
@@ -6897,12 +7310,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-pinch">
 				<displayName>pinch-a</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>estereorradian</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kaloria [IT]</displayName>
+				<unitPattern count="one">{0} kaloria [IT]</unitPattern>
+				<unitPattern count="other">{0} kaloria [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopond</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="other">{0} kilopond</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>argia</displayName>
 				<unitPattern count="one">{0} argi</unitPattern>
 				<unitPattern count="other">{0} argi</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>zati / mila milioi</displayName>
 				<unitPattern count="one">{0} zati / m. m.</unitPattern>
 				<unitPattern count="other">{0} zati / m. m.</unitPattern>
@@ -6937,6 +7413,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/l</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>zati</displayName>
+				<unitPattern count="one">{0} zati</unitPattern>
+				<unitPattern count="other">{0} zati</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukosa-unitate</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0} m/g brit.</unitPattern>
 				<unitPattern count="other">{0} m/g brit.</unitPattern>
@@ -7021,6 +7507,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} M☉</unitPattern>
 				<unitPattern count="other">{0} M☉</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>merkurio-unitate</displayName>
+				<unitPattern count="one">{0} Hg unitate</unitPattern>
+				<unitPattern count="other">{0} Hg unitate</unitPattern>
+			</unit>
 			<unit type="pressure-atmosphere">
 				<unitPattern count="one">{0} atm</unitPattern>
 				<unitPattern count="other">{0} atm</unitPattern>
@@ -7055,6 +7546,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>likido-ontza metriko</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0}ac ft</unitPattern>
 				<unitPattern count="other">{0}ac ft</unitPattern>
@@ -7091,21 +7585,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}dsp-Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>estereorradian</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kaloria [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopond</displayName>
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>argia</displayName>
 				<unitPattern count="one">{0} a.</unitPattern>
 				<unitPattern count="other">{0} a.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>zati / m. m.</displayName>
 				<unitPattern count="one">{0} zati / m. m.</unitPattern>
 				<unitPattern count="other">{0} zati / m. m.</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>gau</displayName>
 				<unitPattern count="one">{0} g.</unitPattern>
 				<unitPattern count="other">{0} g.</unitPattern>
-				<perUnitPattern>{0}/gau</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ewo.xml b/make/data/cldr/common/main/ewo.xml
index 1d3f17dc49e..086685603ed 100644
--- a/make/data/cldr/common/main/ewo.xml
+++ b/make/data/cldr/common/main/ewo.xml
@@ -575,6 +575,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/fa.xml b/make/data/cldr/common/main/fa.xml
index 9fda3578343..db32ab50b4e 100644
--- a/make/data/cldr/common/main/fa.xml
+++ b/make/data/cldr/common/main/fa.xml
@@ -297,6 +297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">بافیایی</language>
 			<language type="ksh">کولش</language>
 			<language type="ku">کردی</language>
+			<language type="ku" menu="core">کردی</language>
+			<language type="ku" menu="extension">کرمانجی</language>
 			<language type="kum">کومیکی</language>
 			<language type="kut">کوتنی</language>
 			<language type="kv">کومیایی</language>
@@ -822,6 +824,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">چین</territory>
 			<territory type="CO">کلمبیا</territory>
 			<territory type="CP">جزایر کلیپرتون</territory>
+			<territory type="CQ">سارک</territory>
 			<territory type="CR">کاستاریکا</territory>
 			<territory type="CU">کوبا</territory>
 			<territory type="CV">کیپ‌ورد</territory>
@@ -1079,35 +1082,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">مرتب‌سازی عددی</key>
 			<key type="colStrength">قدرت مرتب‌سازی</key>
 			<key type="currency">واحد پول</key>
+			<key type="em">نمایش اموجی</key>
 			<key type="hc">دور ساعت (۱۲ در مقابل ۲۴)</key>
 			<key type="lb">شیوهٔ سطرشکنی</key>
+			<key type="lw">شکست خط داخل کلمات</key>
 			<key type="ms">دستگاه اندازه‌گیری</key>
 			<key type="numbers">اعداد</key>
+			<key type="ss">شکست جمله پس از مخفف</key>
 			<key type="timezone">منطقهٔ زمانی</key>
 			<key type="va">متغیر محلی</key>
 			<key type="x">استفادهٔ خصوصی</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">تقویم بودایی</type>
+			<type key="calendar" type="buddhist" scope="core">بودایی</type>
 			<type key="calendar" type="chinese">تقویم چینی</type>
+			<type key="calendar" type="chinese" scope="core">چینی</type>
 			<type key="calendar" type="coptic">تقویم قبطی</type>
+			<type key="calendar" type="coptic" scope="core">قبطی</type>
 			<type key="calendar" type="dangi">تقویم دانگی</type>
+			<type key="calendar" type="dangi" scope="core">دانگی</type>
 			<type key="calendar" type="ethiopic">تقویم اتیوپیایی</type>
+			<type key="calendar" type="ethiopic" scope="core">اتیوپیایی</type>
 			<type key="calendar" type="ethiopic-amete-alem">تقویم اتیوپیایی عامت عالم</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">عامت عالم اتیوپیایی</type>
 			<type key="calendar" type="gregorian">تقویم میلادی</type>
+			<type key="calendar" type="gregorian" scope="core">میلادی</type>
 			<type key="calendar" type="hebrew">تقویم عبری</type>
+			<type key="calendar" type="hebrew" scope="core">عبری</type>
 			<type key="calendar" type="indian">تقویم ملی هند</type>
 			<type key="calendar" type="islamic">تقویم هجری قمری</type>
+			<type key="calendar" type="islamic" scope="core">هجری</type>
 			<type key="calendar" type="islamic-civil">تقویم هجری قمری جدولی مدنی</type>
+			<type key="calendar" type="islamic-civil" scope="core">هجری (جدولی، دوران مدنی)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">قویم هجری قمری هلالی عربستان سعودی</type>
 			<type key="calendar" type="islamic-tbla">تقویم هجری قمری جدولی نجومی</type>
+			<type key="calendar" type="islamic-tbla" scope="core">هجری (جدولی، دوران نجومی)</type>
 			<type key="calendar" type="islamic-umalqura">تقویم هجری قمری ام‌القری</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">هجری (ام‌القری)</type>
 			<type key="calendar" type="iso8601">تقویم ایزو ۸۶۰۱</type>
 			<type key="calendar" type="japanese">تقویم ژاپنی</type>
+			<type key="calendar" type="japanese" scope="core">ژاپنی</type>
 			<type key="calendar" type="persian">تقویم هجری شمسی</type>
+			<type key="calendar" type="persian" scope="core">ایرانی</type>
 			<type key="calendar" type="roc">تقویم جمهوری چین (تایوان)</type>
+			<type key="calendar" type="roc" scope="core">جمهوری چین</type>
 			<type key="cf" type="account">قالب حسابداری واحد پول</type>
+			<type key="cf" type="account" scope="core">حسابداری</type>
 			<type key="cf" type="standard">قالب استاندارد واحد پول</type>
+			<type key="cf" type="standard" scope="core">استاندارد</type>
 			<type key="colAlternate" type="non-ignorable">مرتب‌سازی نمادها</type>
 			<type key="colAlternate" type="shifted">مرتب‌سازی با نادیده گرفتن نمادها</type>
 			<type key="colBackwards" type="no">مرتب‌سازی آکسان‌ها به صورت معمولی</type>
@@ -1117,19 +1140,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">مرتب‌سازی بر اساس حرف بزرگ در ابتدا</type>
 			<type key="colCaseLevel" type="no">مرتب‌سازی بدون توجه به کوچک و بزرگی حروف</type>
 			<type key="colCaseLevel" type="yes">مرتب‌سازی با حساسیت به اندازه حروف</type>
-			<type key="collation" type="big5han">ترتیب چینی سنتی - Big5</type>
 			<type key="collation" type="compat" draft="contributed">ترتیب پیشین، برای سازگاری</type>
 			<type key="collation" type="dictionary">ترتیب فرهنگ لغت</type>
 			<type key="collation" type="ducet">ترتیب پیش‌فرض یونی‌کد</type>
+			<type key="collation" type="ducet" scope="core">یونی‌کد پیش‌فرض</type>
 			<type key="collation" type="emoji">ترتیب ایموجی</type>
 			<type key="collation" type="eor" draft="contributed">قوانین ترتیب اروپایی</type>
-			<type key="collation" type="gb2312han">ترتیب چینی ساده‌شده - GB2312</type>
 			<type key="collation" type="phonebook">ترتیب دفتر تلفن</type>
 			<type key="collation" type="phonetic">مرتب کردن بر اساس آوایی</type>
 			<type key="collation" type="pinyin">ترتیب پین‌یین</type>
 			<type key="collation" type="search">جستجوی عمومی</type>
+			<type key="collation" type="search" scope="core">جستجو</type>
 			<type key="collation" type="searchjl">جستجو با صامت اول هانگول</type>
 			<type key="collation" type="standard">ترتیب استاندارد</type>
+			<type key="collation" type="standard" scope="core">استاندارد</type>
 			<type key="collation" type="stroke">ترتیب حرکتی</type>
 			<type key="collation" type="traditional">ترتیب سنتی</type>
 			<type key="collation" type="unihan">ترتیب رادیکالی-حرکتی</type>
@@ -1146,18 +1170,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">تمام‌عرض</type>
 			<type key="d0" type="hwidth">نیم‌عرض</type>
 			<type key="d0" type="npinyin">سیستم اعداد</type>
+			<type key="em" type="default" scope="core">پیش‌فرض</type>
+			<type key="em" type="emoji" scope="core">اموجی</type>
+			<type key="em" type="text" scope="core">پیامک</type>
 			<type key="hc" type="h11">سیستم ۱۲ ساعته (۰ تا ۱۱)</type>
+			<type key="hc" type="h11" scope="core">۱۲ ساعته (۰ تا ۱۱)</type>
 			<type key="hc" type="h12">سیستم ۱۲ ساعته (۱ تا ۱۲)</type>
+			<type key="hc" type="h12" scope="core">۱۲ ساعته (۱ تا ۱۲)</type>
 			<type key="hc" type="h23">سیستم ۲۴ ساعته (۰ تا ۲۳)</type>
+			<type key="hc" type="h23" scope="core">۲۴ ساعته (۰ تا ۲۳)</type>
 			<type key="hc" type="h24">سیستم ۲۴ ساعته (۱ تا ۲۴)</type>
+			<type key="hc" type="h24" scope="core">۲۴ ساعته (۱ تا ۲۴)</type>
 			<type key="lb" type="loose">شیوهٔ سطرشکنی سهل‌گیرانه</type>
+			<type key="lb" type="loose" scope="core">سهل‌گیرانه</type>
 			<type key="lb" type="normal">شیوهٔ سطرشکنی عادی</type>
+			<type key="lb" type="normal" scope="core">عادی</type>
 			<type key="lb" type="strict">شیوهٔ سطرشکنی سخت‌گیرانه</type>
+			<type key="lb" type="strict" scope="core">سخت‌گیرانه</type>
+			<type key="lw" type="breakall" scope="core">شکست همه</type>
+			<type key="lw" type="keepall" scope="core">حفظ همه</type>
+			<type key="lw" type="normal" scope="core">عادی</type>
+			<type key="lw" type="phrase" scope="core">حفظ در عبارات</type>
 			<type key="m0" type="bgn">ترانویسی انجمن نام‌های جغرافیایی ایالات متحده</type>
 			<type key="m0" type="ungegn">ترانویسی گروه نام‌های جغرافیایی سازمان ملل</type>
 			<type key="ms" type="metric">دستگاه متریک</type>
+			<type key="ms" type="metric" scope="core">متریک</type>
 			<type key="ms" type="uksystem">سیستم اندازه‌گیری انگلیسی</type>
+			<type key="ms" type="uksystem" scope="core">انگلیسی</type>
 			<type key="ms" type="ussystem">سیستم اندازه‌گیری امریکایی</type>
+			<type key="ms" type="ussystem" scope="core">امریکایی</type>
 			<type key="numbers" type="arab">ارقام عربی</type>
 			<type key="numbers" type="arabext">ارقام فارسی</type>
 			<type key="numbers" type="armn">اعداد ارمنی</type>
@@ -1209,6 +1250,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">ارقام تبتی</type>
 			<type key="numbers" type="traditional">سیستم اعداد سنتی</type>
 			<type key="numbers" type="vaii">ارقام وایی</type>
+			<type key="ss" type="none" scope="core">خاموش</type>
+			<type key="ss" type="standard" scope="core">روشن</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">متریک</measurementSystemName>
@@ -1231,7 +1274,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[ـ\u200C\u200D\u200E\u200F َ ِ ُ ْ ٖ ٰ إ ك ىي]</exemplarCharacters>
 		<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\u200E , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[{&lt;LRM&gt;} ٤ ٥ ٦]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[_ — @ / #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‐‑ . /]</exemplarCharacters>
 		<moreInformation>؟</moreInformation>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1297,20 +1343,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">قبل از حلول مسیح</era>
-						<era type="1" draft="contributed">بعد از حلول مسیح</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">قبل از مسیح</era>
-						<era type="1" draft="contributed">پس از مسیح</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="contributed">ق.م.</era>
-						<era type="1" draft="contributed">ب.م.</era>
-					</eraNarrow>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1383,7 +1415,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EHm">E H:mm</dateFormatItem>
 						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">y/M G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E، y/M/d G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -1391,6 +1425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="HHmmZ">HH:mm (Z)</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hv">سHH v</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E M/d</dateFormatItem>
 						<dateFormatItem id="MMMd">d LLL</dateFormatItem>
@@ -1821,7 +1856,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EHm">E H:mm</dateFormatItem>
 						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">y/M G</dateFormatItem>
 						<dateFormatItem id="GyMd">y/M/d GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E، y/M/d G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -1831,6 +1868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
+						<dateFormatItem id="Hv">سHH v</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E M/d</dateFormatItem>
 						<dateFormatItem id="MMMd">d LLL</dateFormatItem>
@@ -1982,7 +2020,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E y/M/d تا E y/M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL تا MMM y</greatestDifference>
+							<greatestDifference id="M">MMM تا MMM y</greatestDifference>
 							<greatestDifference id="y">MMM y تا MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
@@ -1996,7 +2034,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E d MMM y تا E d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL تا MMMM y</greatestDifference>
+							<greatestDifference id="M">MMMM تا MMMM y</greatestDifference>
 							<greatestDifference id="y">MMMM y تا MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
@@ -2164,6 +2202,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="GyM">y/M G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E، y/M/d G</dateFormatItem>
 						<dateFormatItem id="HmZ">HH:mm (Z)</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="yM">y/M G</dateFormatItem>
@@ -2448,26 +2488,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} یکشنبه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sun-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} یکشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} یکشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} یکشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} یکشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sun-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} یکشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} یکشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} یکشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} یکشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="mon">
 				<relative type="-1">دوشنبهٔ گذشته</relative>
 				<relative type="0">این دوشنبه</relative>
@@ -2481,26 +2501,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} دوشنبه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="mon-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} دوشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} دوشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} دوشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} دوشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="mon-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} دوشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} دوشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} دوشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} دوشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="tue">
 				<relative type="-1">سه‌شنبهٔ گذشته</relative>
 				<relative type="0">این سه‌شنبه</relative>
@@ -2514,26 +2514,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} سه‌شنبه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="tue-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سه‌شنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌شنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} سه‌شنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌شنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="tue-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سه‌شنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌شنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} سه‌شنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} سه‌شنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="wed">
 				<relative type="-1">چهارشنبهٔ گذشته</relative>
 				<relative type="0">این چهارشنبه</relative>
@@ -2547,26 +2527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} چهارشنبه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="wed-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} چهارشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} چهارشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} چهارشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} چهارشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="wed-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} چهارشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} چهارشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} چهارشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} چهارشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu">
 				<relative type="-1">پنجشنبهٔ گذشته</relative>
 				<relative type="0">این پنجشنبه</relative>
@@ -2580,26 +2540,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} پنجشنبه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="thu-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} پنجشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} پنجشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} پنجشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} پنجشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="thu-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} پنجشنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} پنجشنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} پنجشنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} پنجشنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="fri">
 				<relative type="-1">جمعهٔ گذشته</relative>
 				<relative type="0">این جمعه</relative>
@@ -2613,26 +2553,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} جمعه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="fri-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} جمعه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} جمعه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} جمعه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} جمعه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="fri-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} جمعه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} جمعه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} جمعه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} جمعه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="sat">
 				<relative type="-1">شنبهٔ گذشته</relative>
 				<relative type="0">این شنبه</relative>
@@ -2646,26 +2566,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} شنبه قبل</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sat-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} شنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} شنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} شنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} شنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sat-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} شنبه بعد</relativeTimePattern>
-					<relativeTimePattern count="other">{0} شنبه بعد</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} شنبه قبل</relativeTimePattern>
-					<relativeTimePattern count="other">{0} شنبه قبل</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="dayperiod">
 				<displayName>ق.ظ/ب.ظ</displayName>
 			</field>
@@ -2713,6 +2613,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>‎+HH:mm;‎−HH:mm</hourFormat>
 			<gmtFormat>{0} گرینویچ</gmtFormat>
 			<gmtZeroFormat>گرینویچ</gmtZeroFormat>
+			<gmtUnknownFormat>گرینویچ+؟</gmtUnknownFormat>
 			<regionFormat>وقت {0}</regionFormat>
 			<regionFormat type="daylight">وقت تابستانی {0}</regionFormat>
 			<regionFormat type="standard">وقت عادی {0}</regionFormat>
@@ -3069,6 +2970,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ایستر</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>کویهایکیو</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>پونتا آرناس</exemplarCity>
 			</zone>
@@ -3334,9 +3238,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>پنوم‌پن</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>اندربری</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>کانتون</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4006,9 +3907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>وقت غرب افریقا</generic>
-					<standard>وقت عادی غرب افریقا</standard>
-					<daylight>وقت تابستانی غرب افریقا</daylight>
+					<standard>وقت غرب افریقا</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4377,6 +4276,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>وقت گویان</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>وقت عادی هاوایی‐الوشن</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>وقت هاوایی‐الوشن</generic>
@@ -4827,6 +4731,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>وقت چوئوک</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>وقت ترکیه</generic>
+					<standard>وقت عادی ترکیه</standard>
+					<daylight>وقت تابستانی ترکیه</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>وقت ترکمنستان</generic>
@@ -4998,55 +4909,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‎¤#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
 					<pattern alt="noCurrency" draft="provisional">‎#,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
+				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencyFormats numberSystem="arabext">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‎¤#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
 					<pattern alt="noCurrency" draft="provisional">‎#,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">‎#,##0.00;‎(#,##0.00)</pattern>
+				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‎¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">‎#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">‎#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">‎#,##0.00;‎(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 هزار ¤</pattern>
-					<pattern type="1000" count="other">0 هزار ¤</pattern>
-					<pattern type="10000" count="one">00 هزار ¤</pattern>
-					<pattern type="10000" count="other">00 هزار ¤</pattern>
-					<pattern type="100000" count="one">000 هزار ¤</pattern>
-					<pattern type="100000" count="other">000 هزار ¤</pattern>
-					<pattern type="1000000" count="one">0 میلیون ¤</pattern>
-					<pattern type="1000000" count="other">0 میلیون ¤</pattern>
-					<pattern type="10000000" count="one">00 میلیون ¤</pattern>
-					<pattern type="10000000" count="other">00 میلیون ¤</pattern>
-					<pattern type="100000000" count="one">000 میلیون ¤</pattern>
-					<pattern type="100000000" count="other">000 میلیون ¤</pattern>
-					<pattern type="1000000000" count="one">0 میلیارد ¤</pattern>
-					<pattern type="1000000000" count="other">0 میلیارد ¤</pattern>
-					<pattern type="10000000000" count="one">00 میلیارد ¤</pattern>
-					<pattern type="10000000000" count="other">00 میلیارد ¤</pattern>
-					<pattern type="100000000000" count="one">000 میلیارد ¤</pattern>
-					<pattern type="100000000000" count="other">000 میلیارد ¤</pattern>
-					<pattern type="1000000000000" count="one">0 هزارمیلیارد ¤</pattern>
-					<pattern type="1000000000000" count="other">0 هزارمیلیارد ¤</pattern>
-					<pattern type="10000000000000" count="one">00 هزارمیلیارد ¤</pattern>
-					<pattern type="10000000000000" count="other">00 هزارمیلیارد ¤</pattern>
-					<pattern type="100000000000000" count="one">000 هزارمیلیارد ¤</pattern>
-					<pattern type="100000000000000" count="other">000 هزارمیلیارد ¤</pattern>
+					<pattern type="1000" count="one">‎¤ 0 هزار</pattern>
+					<pattern type="1000" count="other">‎¤ 0 هزار</pattern>
+					<pattern type="10000" count="one">‎¤ 00 هزار</pattern>
+					<pattern type="10000" count="other">‎¤ 00 هزار</pattern>
+					<pattern type="100000" count="one">‎¤ 000 هزار</pattern>
+					<pattern type="100000" count="other">‎¤ 000 هزار</pattern>
+					<pattern type="1000000" count="one">‎¤ 0 میلیون</pattern>
+					<pattern type="1000000" count="other">‎¤ 0 میلیون</pattern>
+					<pattern type="10000000" count="one">‎¤ 00 میلیون</pattern>
+					<pattern type="10000000" count="other">‎¤ 00 میلیون</pattern>
+					<pattern type="100000000" count="one">‎¤ 000 میلیون</pattern>
+					<pattern type="100000000" count="other">‎¤ 000 میلیون</pattern>
+					<pattern type="1000000000" count="one">‎¤ 0 میلیارد</pattern>
+					<pattern type="1000000000" count="other">‎¤ 0 میلیارد</pattern>
+					<pattern type="10000000000" count="one">‎¤ 00 میلیارد</pattern>
+					<pattern type="10000000000" count="other">‎¤ 00 میلیارد</pattern>
+					<pattern type="100000000000" count="one">‎¤ 000 میلیارد</pattern>
+					<pattern type="100000000000" count="other">‎¤ 000 میلیارد</pattern>
+					<pattern type="1000000000000" count="one">‎¤ 0 تریلیون</pattern>
+					<pattern type="1000000000000" count="other">‎¤ 0 تریلیون</pattern>
+					<pattern type="10000000000000" count="one">‎¤ 00 تریلیون</pattern>
+					<pattern type="10000000000000" count="other">‎¤ 00 تریلیون</pattern>
+					<pattern type="100000000000000" count="one">‎¤ 000 تریلیون</pattern>
+					<pattern type="100000000000000" count="other">‎¤ 000 تریلیون</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5125,8 +5047,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="BGN">
 				<displayName>لو بلغارستان</displayName>
-				<displayName count="one">لو بلغارستان</displayName>
-				<displayName count="other">لو بلغارستان</displayName>
 			</currency>
 			<currency type="BHD">
 				<displayName>دینار بحرین</displayName>
@@ -5323,8 +5243,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="ILS">
 				<displayName>شِکِل جدید اسرائیل</displayName>
-				<displayName count="one">شِکِل جدید اسرائیل</displayName>
-				<displayName count="other">شِکِل جدید اسرائیل</displayName>
 			</currency>
 			<currency type="INR">
 				<displayName>روپیهٔ هند</displayName>
@@ -5546,8 +5464,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="PLN">
 				<displayName>زلوتی لهستان</displayName>
-				<displayName count="one">زلوتی لهستان</displayName>
-				<displayName count="other">زلوتی لهستان</displayName>
 			</currency>
 			<currency type="PTE">
 				<displayName>اسکودوی پرتغال</displayName>
@@ -5737,6 +5653,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>دلار شرق کارائیب</displayName>
 				<symbol>$EC</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>گیلدر کارائیب</displayName>
+				<displayName count="one">گیلدر کارائیب</displayName>
+				<displayName count="other">گیلدر کارائیب</displayName>
+			</currency>
 			<currency type="XFO">
 				<displayName>فرانک طلای فرانسه</displayName>
 			</currency>
@@ -5783,6 +5704,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>دلار زیمبابوه (۱۹۸۰ تا ۲۰۰۸)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>طلای زیمبابوه</displayName>
+				<displayName count="one">طلای زیمبابوه</displayName>
+				<displayName count="other">طلای زیمبابوه</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>دلار زیمبابوه (۲۰۰۹)</displayName>
 			</currency>
@@ -5845,10 +5771,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} کیلومتر مربع</unitPattern>
 				<perUnitPattern>{0} در کیلومتر مربع</perUnitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one">{0} هکتار</unitPattern>
-				<unitPattern count="other">{0} هکتار</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="one">{0} متر مربع</unitPattern>
 				<unitPattern count="other">{0} متر مربع</unitPattern>
@@ -5875,7 +5797,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} میلی‌مول در لیتر</unitPattern>
 				<unitPattern count="other">{0} میلی‌مول در لیتر</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>پارت</displayName>
+				<unitPattern count="one">{0} پارت</unitPattern>
+				<unitPattern count="other">{0} پارت</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>بخش در میلیون</displayName>
 				<unitPattern count="one">{0} بخش در میلیون</unitPattern>
 				<unitPattern count="other">{0} بخش در میلیون</unitPattern>
@@ -5892,6 +5819,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ده‌هزارم</unitPattern>
 				<unitPattern count="other">{0} ده‌هزارم</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>گلوکز</displayName>
+				<unitPattern count="one">{0} گلوکز</unitPattern>
+				<unitPattern count="other">{0} گلوکز</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>لیتر در کیلومتر</displayName>
 				<unitPattern count="one">{0} لیتر در کیلومتر</unitPattern>
@@ -6088,9 +6020,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="mass-milligram">
 				<displayName>میلی‌گرم</displayName>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>میکروگرم</displayName>
-			</unit>
 			<unit type="mass-earth-mass">
 				<unitPattern count="one">{0} جرم زمین</unitPattern>
 				<unitPattern count="other">{0} جرم زمین</unitPattern>
@@ -6108,6 +6037,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} میلی‌متر جیوه</unitPattern>
 				<unitPattern count="other">{0} میلی‌متر جیوه</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>جیوه</displayName>
+				<unitPattern count="one">{0} جیوه</unitPattern>
+				<unitPattern count="other">{0} جیوه</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0} پوند در اینچ مربع</unitPattern>
 				<unitPattern count="other">{0} پوند در اینچ مربع</unitPattern>
@@ -6197,6 +6131,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} سانتی‌لیتر</unitPattern>
 				<unitPattern count="other">{0} سانتی‌لیتر</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>اونس مایع متریک</displayName>
+				<unitPattern count="one">{0} اونس مایع متریک</unitPattern>
+				<unitPattern count="other">{0} اونس مایع متریک</unitPattern>
+			</unit>
 			<unit type="volume-gallon-imperial">
 				<perUnitPattern>{0} در گالن امپریال</perUnitPattern>
 			</unit>
@@ -6231,15 +6170,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} درم</unitPattern>
 				<unitPattern count="other">{0} درم</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>بخش در بیلیون</displayName>
+			<unit type="angle-steradian">
+				<displayName>استرادیان</displayName>
+				<unitPattern count="one">{0} استرادیان</unitPattern>
+				<unitPattern count="other">{0} استرادیان</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>کاتال</displayName>
+				<unitPattern count="one">{0} کاتال</unitPattern>
+				<unitPattern count="other">{0} کاتال</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>کولن</displayName>
+				<unitPattern count="one">{0} کولن</unitPattern>
+				<unitPattern count="other">{0} کولن</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>فاراد</displayName>
+				<unitPattern count="one">{0} فاراد</unitPattern>
+				<unitPattern count="other">{0} فاراد</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>هنری</displayName>
+				<unitPattern count="one">{0} هنری</unitPattern>
+				<unitPattern count="other">{0} هنری</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>زیمنس</displayName>
+				<unitPattern count="one">{0} زیمنس</unitPattern>
+				<unitPattern count="other">{0} زیمنس</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>کالری [IT]</displayName>
+				<unitPattern count="one">{0} کالری [IT]</unitPattern>
+				<unitPattern count="other">{0} کالری [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>بکرل</displayName>
+				<unitPattern count="one">{0} بکرل</unitPattern>
+				<unitPattern count="other">{0} بکرل</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>سیورت</displayName>
+				<unitPattern count="one">{0} سیورت</unitPattern>
+				<unitPattern count="other">{0} سیورت</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>گری</displayName>
+				<unitPattern count="one">{0} گری</unitPattern>
+				<unitPattern count="other">{0} گری</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>کیلوگرم-نیرو</displayName>
+				<unitPattern count="one">{0} کیلوگرم-نیرو</unitPattern>
+				<unitPattern count="other">{0} کیلوگرم-نیرو</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>تسلا</displayName>
+				<unitPattern count="one">{0} تسلا</unitPattern>
+				<unitPattern count="other">{0} تسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>وبر</displayName>
+				<unitPattern count="one">{0} وبر</unitPattern>
+				<unitPattern count="other">{0} وبر</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>نور</displayName>
+				<unitPattern count="one">{0} نوری</unitPattern>
+				<unitPattern count="other">{0} نوری</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0} بخش در بیلیون</unitPattern>
 				<unitPattern count="other">{0} بخش در بیلیون</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>شب</displayName>
-				<unitPattern count="one">{0} شب</unitPattern>
-				<unitPattern count="other">{0} شب</unitPattern>
 				<perUnitPattern>{0} در شب</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6451,7 +6456,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} مورد</unitPattern>
 				<unitPattern count="other">{0} مورد</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>پارت</displayName>
+				<unitPattern count="one">{0} پارت</unitPattern>
+				<unitPattern count="other">{0} پارت</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>بخش/میلیون</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6470,6 +6480,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مول</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>گلوکز</displayName>
+				<unitPattern count="one">{0} گلوکز</unitPattern>
+				<unitPattern count="other">{0} گلوکز</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>لیتر/کیلومتر</displayName>
 				<unitPattern count="one">{0} ل./ک.م.</unitPattern>
@@ -6825,6 +6840,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} لوکس</unitPattern>
 				<unitPattern count="other">{0} لوکس</unitPattern>
 			</unit>
+			<unit type="light-candela">
+				<displayName>شمع</displayName>
+				<unitPattern count="one">{0} شمع</unitPattern>
+				<unitPattern count="other">{0} شمع</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>لومن</displayName>
+				<unitPattern count="one">{0} لومن</unitPattern>
+				<unitPattern count="other">{0} لومن</unitPattern>
+			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>تابندگی خورشید</displayName>
 				<unitPattern count="one">{0} ☉L</unitPattern>
@@ -6941,6 +6966,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} م‌م جیوه</unitPattern>
 				<unitPattern count="other">{0} م‌م جیوه</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>جیوه</displayName>
+				<unitPattern count="one">{0} جیوه</unitPattern>
+				<unitPattern count="other">{0} جیوه</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>پوند در اینچ مربع</displayName>
 				<unitPattern count="one">{0}‎ psi</unitPattern>
@@ -7103,6 +7133,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} پیمانهٔ متریک</unitPattern>
 				<unitPattern count="other">{0} پیمانهٔ متریک</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>جریب فوت</displayName>
 				<unitPattern count="one">{0} جریب فوت</unitPattern>
@@ -7200,7 +7234,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} کوارت انگلیسی</unitPattern>
 				<unitPattern count="other">{0} کوارت انگلیسی</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>استرادیان</displayName>
+				<unitPattern count="one">{0} استرادیان</unitPattern>
+				<unitPattern count="other">{0} استرادیان</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>کاتال</displayName>
+				<unitPattern count="one">{0} کاتال</unitPattern>
+				<unitPattern count="other">{0} کاتال</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>کولن</displayName>
+				<unitPattern count="one">{0} کولن</unitPattern>
+				<unitPattern count="other">{0} کولن</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>فاراد</displayName>
+				<unitPattern count="one">{0} فاراد</unitPattern>
+				<unitPattern count="other">{0} فاراد</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>هنری</displayName>
+				<unitPattern count="one">{0} هنری</unitPattern>
+				<unitPattern count="other">{0} هنری</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>زیمنس</displayName>
+				<unitPattern count="one">{0} زیمنس</unitPattern>
+				<unitPattern count="other">{0} زیمنس</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>کالری-IT</displayName>
+				<unitPattern count="one">{0} کالری-IT</unitPattern>
+				<unitPattern count="other">{0} کالری-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>بکرل</displayName>
+				<unitPattern count="one">{0} بکرل</unitPattern>
+				<unitPattern count="other">{0} بکرل</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>سیورت</displayName>
+				<unitPattern count="one">{0} سیورت</unitPattern>
+				<unitPattern count="other">{0} سیورت</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>گری</displayName>
+				<unitPattern count="one">{0} گری</unitPattern>
+				<unitPattern count="other">{0} گری</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>کیلوگرم-نیرو</displayName>
+				<unitPattern count="one">{0} کیلوگرم-نیرو</unitPattern>
+				<unitPattern count="other">{0} کیلوگرم-نیرو</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>تسلا</displayName>
+				<unitPattern count="one">{0} تسلا</unitPattern>
+				<unitPattern count="other">{0} تسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>وبر</displayName>
+				<unitPattern count="one">{0} وبر</unitPattern>
+				<unitPattern count="other">{0} وبر</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>نور</displayName>
+				<unitPattern count="one">{0} نوری</unitPattern>
+				<unitPattern count="other">{0} نوری</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>بخش در بیلیون</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7329,6 +7433,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="acceleration-meter-per-square-second">
 				<displayName>m/s²</displayName>
 			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
 			<unit type="angle-degree">
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
@@ -7383,17 +7491,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}دونوم</unitPattern>
 				<unitPattern count="other">{0}دونوم</unitPattern>
 			</unit>
+			<unit type="concentr-karat">
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<unitPattern count="one">{0}mmol/L</unitPattern>
+				<unitPattern count="other">{0}mmol/L</unitPattern>
+			</unit>
 			<unit type="concentr-item">
 				<unitPattern count="one">{0}مورد</unitPattern>
 				<unitPattern count="other">{0}مورد</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>پارت</displayName>
+				<unitPattern count="one">{0} پارت</unitPattern>
+				<unitPattern count="other">{0}پارت</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>٪</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>گلوکز</displayName>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>L/۱۰۰km</displayName>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<unitPattern count="one">{0}mpg</unitPattern>
+				<unitPattern count="other">{0}mpg</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0}m/gUK</unitPattern>
 				<unitPattern count="other">{0}m/gUK</unitPattern>
@@ -7513,9 +7644,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}Btu</unitPattern>
 				<unitPattern count="other">{0}Btu</unitPattern>
 			</unit>
-			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<unitPattern count="one">{0}ک.وا.س/۱۰۰ ک.م</unitPattern>
-				<unitPattern count="other">{0} ک.وا.س/۱۰۰ ک.م</unitPattern>
+			<unit type="force-pound-force">
+				<unitPattern count="one">{0}lbf</unitPattern>
+				<unitPattern count="other">{0}lbf</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<unitPattern count="one">{0}N</unitPattern>
+				<unitPattern count="other">{0}N</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>GHz</displayName>
@@ -7660,6 +7795,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}R☉</unitPattern>
 				<unitPattern count="other">{0}R☉</unitPattern>
 			</unit>
+			<unit type="light-lux">
+				<unitPattern count="one">{0}lx</unitPattern>
+				<unitPattern count="other">{0}lx</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>شمع</displayName>
+				<unitPattern count="one">{0}cd</unitPattern>
+				<unitPattern count="other">{0}cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>لومن</displayName>
+				<unitPattern count="one">{0}lm</unitPattern>
+				<unitPattern count="other">{0}lm</unitPattern>
+			</unit>
 			<unit type="mass-tonne">
 				<unitPattern count="one">{0}t</unitPattern>
 				<unitPattern count="other">{0}t</unitPattern>
@@ -7751,6 +7900,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}hp</unitPattern>
 				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>جیوه</displayName>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="one">{0}inHg</unitPattern>
 				<unitPattern count="other">{0}inHg</unitPattern>
@@ -7771,6 +7923,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0}MPa</unitPattern>
+				<unitPattern count="other">{0}MPa</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hr</displayName>
 			</unit>
@@ -7803,6 +7959,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
+			<unit type="torque-pound-force-foot">
+				<unitPattern count="one">{0}lbf⋅ft</unitPattern>
+				<unitPattern count="other">{0}lbf⋅ft</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>N⋅m</displayName>
+				<unitPattern count="one">{0}N⋅m</unitPattern>
+				<unitPattern count="other">{0}N⋅m</unitPattern>
+			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0}km³</unitPattern>
 				<unitPattern count="other">{0}km³</unitPattern>
@@ -7871,10 +8036,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}fl oz Im</unitPattern>
 				<unitPattern count="other">{0}fl oz Im</unitPattern>
 			</unit>
-			<unit type="volume-tablespoon">
-				<unitPattern count="one">{0} ق.غ.خ</unitPattern>
-				<unitPattern count="other">{0} ق.غ.خ</unitPattern>
-			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>ق.چ.خ</displayName>
 				<unitPattern count="one">{0}ق.چ.</unitPattern>
@@ -7898,14 +8059,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>بخش در بیلیون</displayName>
+			<unit type="concentr-katal">
+				<displayName>کاتال</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>شب</displayName>
-				<unitPattern count="one">{0} شب</unitPattern>
-				<unitPattern count="other">{0} شب</unitPattern>
-				<perUnitPattern>{0}/شب</perUnitPattern>
+			<unit type="electric-coulomb">
+				<displayName>کولن</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>هنری</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>کالری-IT</displayName>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>گری</displayName>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>تسلا</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>وبر</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>نور</displayName>
+				<unitPattern count="one">{0}نوری</unitPattern>
+				<unitPattern count="other">{0}نوری</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0}ppb</unitPattern>
+				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/fa_AF.xml b/make/data/cldr/common/main/fa_AF.xml
index 9c1de9f280d..34ec9d9f8e3 100644
--- a/make/data/cldr/common/main/fa_AF.xml
+++ b/make/data/cldr/common/main/fa_AF.xml
@@ -341,6 +341,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;‎(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -348,9 +354,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;‎(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/ff.xml b/make/data/cldr/common/main/ff.xml
index b512e61f302..08465b83c01 100644
--- a/make/data/cldr/common/main/ff.xml
+++ b/make/data/cldr/common/main/ff.xml
@@ -579,6 +579,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml
index 17ac848f28c..d136fea6e2c 100644
--- a/make/data/cldr/common/main/ff_Adlm.xml
+++ b/make/data/cldr/common/main/ff_Adlm.xml
@@ -1416,11 +1416,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0">𞤢𞤣𞤮 𞤁𞤢𞤴𞤢𞤳𞤭𞤤𞤼𞤭𞤴𞤢𞥄𞤲</era>
 						<era type="1">𞤩𞤢𞥄𞤱𞤮 𞤁𞤢𞤴𞤢𞤳𞤭𞤤𞤼𞤭𞤴𞤢𞥄𞤲</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">𞤀𞤁</era>
 						<era type="1">𞤇𞤁</era>
 					</eraAbbr>
 				</eras>
@@ -1565,13 +1563,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</eraAbbr>
 				</eras>
 			</calendar>
-			<calendar type="ethiopic-amete-alem">
-				<eras>
-					<eraAbbr>
-						<era type="0">𞤘𞤋𞤈𞥐</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -3267,13 +3258,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>{0} 𞤑𞤭𞤶𞤮𞥅𞤪𞤫</regionFormat>
 			<regionFormat type="daylight">{0} 𞤐𞤶𞤢𞤥𞤲𞤣𞤭 𞤕𞤫𞥅𞤯𞤵</regionFormat>
 			<regionFormat type="standard">{0} 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫</regionFormat>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>𞤑𞤖𞤖</generic>
-					<standard>𞤑𞤖𞤖</standard>
-					<daylight>𞤑𞤕𞤖</daylight>
-				</short>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞤤𞥆𞤢𞤲𞤳𞤮𞥅𞤪𞤫 𞤊𞤮𞤲𞤣𞤢𞥄𞤲𞤣𞤫</standard>
@@ -3892,9 +3876,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>𞤆𞤢𞤲𞤮𞤥-𞤆𞤫𞤲</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>𞤉𞤲𞤣𞤫𞤪𞤦𞤵𞥅𞤪𞤭</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>𞤑𞤢𞤲𞤼𞤮𞤲</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4568,9 +4549,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄</generic>
-					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄</standard>
-					<daylight>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄</daylight>
+					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤀𞤬𞤪𞤭𞤳𞤢𞥄</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4958,6 +4937,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤘𞤢𞤴𞤢𞤲𞤢𞥄</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤢𞥄𞤴𞤭𞥅-𞤀𞤤𞤮𞤧𞤭𞤴𞤢𞤲</generic>
@@ -5619,30 +5603,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0𞤓¤</pattern>
-					<pattern type="1000" count="other">0𞤓¤</pattern>
-					<pattern type="10000" count="one">00𞤓¤</pattern>
-					<pattern type="10000" count="other">00𞤓¤</pattern>
-					<pattern type="100000" count="one">000𞤓¤</pattern>
-					<pattern type="100000" count="other">000𞤓¤</pattern>
-					<pattern type="1000000" count="one">0𞤁¤</pattern>
-					<pattern type="1000000" count="other">0𞤁¤</pattern>
-					<pattern type="10000000" count="one">00𞤁¤</pattern>
-					<pattern type="10000000" count="other">00𞤁¤</pattern>
-					<pattern type="100000000" count="one">000𞤁¤</pattern>
-					<pattern type="100000000" count="other">000𞤁¤</pattern>
-					<pattern type="1000000000" count="one">0𞤁𞤶¤</pattern>
-					<pattern type="1000000000" count="other">0𞤁𞤶¤</pattern>
-					<pattern type="10000000000" count="one">00𞤁𞤶¤</pattern>
-					<pattern type="10000000000" count="other">00𞤁𞤶¤</pattern>
-					<pattern type="100000000000" count="one">000𞤁𞤶¤</pattern>
-					<pattern type="100000000000" count="other">000𞤁𞤶¤</pattern>
-					<pattern type="1000000000000" count="one">0𞤚¤</pattern>
-					<pattern type="1000000000000" count="other">0𞤚¤</pattern>
-					<pattern type="10000000000000" count="one">00𞤚¤</pattern>
-					<pattern type="10000000000000" count="other">00𞤚¤</pattern>
-					<pattern type="100000000000000" count="one">000𞤚¤</pattern>
-					<pattern type="100000000000000" count="other">000𞤚¤</pattern>
+					<pattern type="1000" count="one">¤ 0𞤓</pattern>
+					<pattern type="1000" count="other">¤ 0𞤓</pattern>
+					<pattern type="10000" count="one">¤ 00𞤓</pattern>
+					<pattern type="10000" count="other">¤ 00𞤓</pattern>
+					<pattern type="100000" count="one">¤ 000𞤓</pattern>
+					<pattern type="100000" count="other">¤ 000𞤓</pattern>
+					<pattern type="1000000" count="one">¤ 0𞤁</pattern>
+					<pattern type="1000000" count="other">¤ 0𞤁</pattern>
+					<pattern type="10000000" count="one">¤ 00𞤁</pattern>
+					<pattern type="10000000" count="other">¤ 00𞤁</pattern>
+					<pattern type="100000000" count="one">¤ 000𞤁</pattern>
+					<pattern type="100000000" count="other">¤ 000𞤁</pattern>
+					<pattern type="1000000000" count="one">¤ 0𞤁𞤶</pattern>
+					<pattern type="1000000000" count="other">¤ 0𞤁𞤶</pattern>
+					<pattern type="10000000000" count="one">¤ 00𞤁𞤶</pattern>
+					<pattern type="10000000000" count="other">¤ 00𞤁𞤶</pattern>
+					<pattern type="100000000000" count="one">¤ 000𞤁𞤶</pattern>
+					<pattern type="100000000000" count="other">¤ 000𞤁𞤶</pattern>
+					<pattern type="1000000000000" count="one">¤ 0𞤚</pattern>
+					<pattern type="1000000000000" count="other">¤ 0𞤚</pattern>
+					<pattern type="10000000000000" count="one">¤ 00𞤚</pattern>
+					<pattern type="10000000000000" count="other">¤ 00𞤚</pattern>
+					<pattern type="100000000000000" count="one">¤ 000𞤚</pattern>
+					<pattern type="100000000000000" count="other">¤ 000𞤚</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -6912,7 +6896,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} 𞤨𞤭𞤪𞤰𞤵</unitPattern>
 				<unitPattern count="other">{0} 𞤨𞤭𞤪𞤰𞤭</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>𞤺𞤫𞤩𞤫 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫</displayName>
 				<unitPattern count="one">{0} 𞤺𞤫𞤩𞤢𞤤 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫</unitPattern>
 				<unitPattern count="other">{0} 𞤺𞤫𞤩𞤫 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫</unitPattern>
@@ -7920,7 +7904,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} 𞤨𞤭𞤪</unitPattern>
 				<unitPattern count="other">{0} 𞤨𞤭𞤪</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>𞤺𞤫𞤩𞤫/𞤣𞤵𞤦𞤵𞥅𞤪𞤫</displayName>
 				<unitPattern count="one">{0} 𞤺𞤳𞤣</unitPattern>
 				<unitPattern count="other">{0} 𞤺𞤳𞤣</unitPattern>
@@ -8846,7 +8830,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}𞤨𞤭𞤪</unitPattern>
 				<unitPattern count="other">{0}𞤨𞤭𞤪</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>𞤺𞤳𞤣</displayName>
 				<unitPattern count="one">{0}𞤺𞤳𞤣</unitPattern>
 				<unitPattern count="other">{0}𞤺𞤳𞤣</unitPattern>
diff --git a/make/data/cldr/common/main/fi.xml b/make/data/cldr/common/main/fi.xml
index 3d8176baf9e..877d26d9054 100644
--- a/make/data/cldr/common/main/fi.xml
+++ b/make/data/cldr/common/main/fi.xml
@@ -301,6 +301,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kcg">tyap</language>
 			<language type="kde">makonde</language>
 			<language type="kea">kapverdenkreoli</language>
+			<language type="kek" draft="contributed">qʼeqchiʼ</language>
 			<language type="ken">kenyang</language>
 			<language type="kfo">norsunluurannikonkoro</language>
 			<language type="kg">kongo</language>
@@ -336,6 +337,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurdi</language>
+			<language type="ku" menu="core">kurdi</language>
+			<language type="ku" menu="extension">kurmandži</language>
 			<language type="kum">kumykki</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -396,6 +399,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mgh">makua-meetto</language>
 			<language type="mgo">meta’</language>
 			<language type="mh">marshall</language>
+			<language type="mhn" draft="contributed">mócheno</language>
 			<language type="mi">maori</language>
 			<language type="mic">micmac</language>
 			<language type="min">minangkabau</language>
@@ -574,6 +578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="suk">sukuma</language>
 			<language type="sus">susu</language>
 			<language type="sux">sumeri</language>
+			<language type="suz" draft="contributed">sunwar</language>
 			<language type="sv">ruotsi</language>
 			<language type="sw">swahili</language>
 			<language type="sw_CD">kongonswahili</language>
@@ -698,6 +703,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Bass">bassa</script>
 			<script type="Batk">batakilainen</script>
 			<script type="Beng">bengalilainen</script>
+			<script type="Berf">beria-aakkosto</script>
 			<script type="Bhks">sanskritin bhaiksuki-aakkosto</script>
 			<script type="Blis">bliss-symbolit</script>
 			<script type="Bopo">bopomofo</script>
@@ -729,6 +735,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Elym">elymealainen</script>
 			<script type="Ethi">etiopialainen</script>
 			<script type="Ethi" alt="secondary">ge’ez</script>
+			<script type="Gara" draft="contributed">garay</script>
 			<script type="Geok">muinaisgeorgialainen</script>
 			<script type="Geok" alt="secondary">khutsuri</script>
 			<script type="Geor">georgialainen</script>
@@ -740,6 +747,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Gran">grantha</script>
 			<script type="Grek">kreikkalainen</script>
 			<script type="Gujr">gudžaratilainen</script>
+			<script type="Gukh">gurung khema -aakkosto</script>
 			<script type="Guru">gurmukhi</script>
 			<script type="Hanb">kiinan han ja bopomofo</script>
 			<script type="Hang">hangul</script>
@@ -773,6 +781,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Knda">kannadalainen</script>
 			<script type="Kore">korealainen</script>
 			<script type="Kpel">kpelle</script>
+			<script type="Krai" draft="contributed">kirat rai</script>
 			<script type="Kthi">kaithi</script>
 			<script type="Lana">lanna</script>
 			<script type="Laoo">laolainen</script>
@@ -816,6 +825,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Nshu">nüshu</script>
 			<script type="Ogam">ogam</script>
 			<script type="Olck">ol chiki</script>
+			<script type="Onao" draft="contributed">ol onal</script>
 			<script type="Orkh">orkhon</script>
 			<script type="Orya">orijalainen</script>
 			<script type="Osge">osagen aakkosto</script>
@@ -980,7 +990,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kiina</territory>
 			<territory type="CO">Kolumbia</territory>
 			<territory type="CP">Clippertoninsaari</territory>
-			<territory type="CQ" draft="contributed">Sark</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuuba</territory>
 			<territory type="CV">Kap Verde</territory>
@@ -1336,35 +1346,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">numeroiden lajittelu</key>
 			<key type="colStrength">lajittelun taso</key>
 			<key type="currency">valuutta</key>
+			<key type="em">emojin esitys</key>
 			<key type="hc">tuntijärjestelmä</key>
 			<key type="lb">rivinvaihtotyyli</key>
+			<key type="lw">rivi vaihtuu sanojen sisällä</key>
 			<key type="ms">mittajärjestelmä</key>
 			<key type="numbers">numerot</key>
+			<key type="ss">lause vaihtuu lyhenteen jälkeen</key>
 			<key type="timezone">aikavyöhyke</key>
 			<key type="va">maavalinnan muunnelma</key>
 			<key type="x">yksityiskäyttö</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddhalainen kalenteri</type>
+			<type key="calendar" type="buddhist" scope="core">buddhalainen</type>
 			<type key="calendar" type="chinese">kiinalainen kalenteri</type>
+			<type key="calendar" type="chinese" scope="core">kiinalainen</type>
 			<type key="calendar" type="coptic">koptilainen kalenteri</type>
+			<type key="calendar" type="coptic" scope="core">koptilainen</type>
 			<type key="calendar" type="dangi">dangilainen kalenteri</type>
+			<type key="calendar" type="dangi" scope="core">dangilainen</type>
 			<type key="calendar" type="ethiopic">etiopialainen kalenteri</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopialainen</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopialainen amete alem -kalenteri</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopialainen amete alem</type>
 			<type key="calendar" type="gregorian">gregoriaaninen kalenteri</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriaaninen</type>
 			<type key="calendar" type="hebrew">juutalainen kalenteri</type>
+			<type key="calendar" type="hebrew" scope="core">juutalainen</type>
 			<type key="calendar" type="indian">intialainen kalenteri</type>
 			<type key="calendar" type="islamic">hidžra-kalenteri</type>
+			<type key="calendar" type="islamic" scope="core">hidžra-kalenteri</type>
 			<type key="calendar" type="islamic-civil">hidžra-siviilikalenteri (tabulaarinen, perjantaiepookki)</type>
+			<type key="calendar" type="islamic-civil" scope="core">hidžra-kalenteri (taulukkomuoto, perjantaiepookki)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">hidžra-kalenteri (saudiarabialainen)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">hidžra-matemaattinen kalenteri (tabulaarinen, torstaiepookki)</type>
 			<type key="calendar" type="islamic-umalqura">hidžra-kalenteri, Umm al-Qura</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Umm al Qura -kalenteri</type>
 			<type key="calendar" type="iso8601">ISO 8601 -kalenteri</type>
 			<type key="calendar" type="japanese">japanilainen kalenteri</type>
+			<type key="calendar" type="japanese" scope="core">japanilainen</type>
 			<type key="calendar" type="persian">persialainen kalenteri</type>
+			<type key="calendar" type="persian" scope="core">persialainen</type>
 			<type key="calendar" type="roc">Kiinan tasavallan kalenteri</type>
+			<type key="calendar" type="roc" scope="core">Minguo-kalenteri</type>
 			<type key="cf" type="account">valuuttojen laskentatoimen esitysmuoto</type>
+			<type key="cf" type="account" scope="core">laskentatoimi</type>
 			<type key="cf" type="standard">valuuttojen vakioesitysmuoto</type>
+			<type key="cf" type="standard" scope="core">vakio</type>
 			<type key="colAlternate" type="non-ignorable">symbolit huomioiva lajittelu</type>
 			<type key="colAlternate" type="shifted">symbolit ohittava lajittelu</type>
 			<type key="colBackwards" type="no">painomerkkien normaali lajittelu</type>
@@ -1374,23 +1403,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">isot kirjaimet edeltävät pieniä</type>
 			<type key="colCaseLevel" type="no">isojen ja pienten kirjainten lajittelu yhdessä</type>
 			<type key="colCaseLevel" type="yes">isojen ja pienten kirjainten lajittelu erikseen</type>
-			<type key="collation" type="big5han">perinteinen kiinalainen järjestys Big5</type>
 			<type key="collation" type="compat">aiempi lajittelujärjestys yhteensopivuutta varten</type>
+			<type key="collation" type="compat" scope="core">yhteensopivuus</type>
 			<type key="collation" type="dictionary">sanakirjajärjestys</type>
+			<type key="collation" type="dictionary" scope="core">sanakirja</type>
 			<type key="collation" type="ducet">Unicoden oletusjärjestys</type>
+			<type key="collation" type="ducet" scope="core">oletusarvoinen unicode</type>
 			<type key="collation" type="emoji">emojien lajittelujärjestys</type>
 			<type key="collation" type="eor">yleiseurooppalainen lajittelujärjestys</type>
-			<type key="collation" type="gb2312han">yksinkertaistettu kiinalainen järjestys GB2312</type>
 			<type key="collation" type="phonebook">puhelinluettelojärjestys</type>
+			<type key="collation" type="phonebook" scope="core">puhelinluettelo</type>
 			<type key="collation" type="phonetic">äänteellinen järjestys</type>
+			<type key="collation" type="phonetic" scope="core">äänteellinen</type>
 			<type key="collation" type="pinyin">pinyin-järjestys</type>
+			<type key="collation" type="pinyin" scope="core">pinyin-järjestelmä</type>
 			<type key="collation" type="search">yleishakujärjestys</type>
+			<type key="collation" type="search" scope="core">haku</type>
 			<type key="collation" type="searchjl">haku hangul-alkukonsonantin mukaan</type>
 			<type key="collation" type="standard">normaalijärjestys</type>
+			<type key="collation" type="standard" scope="core">normaali</type>
 			<type key="collation" type="stroke">piirtojärjestys</type>
+			<type key="collation" type="stroke" scope="core">piirto</type>
 			<type key="collation" type="traditional">perinteinen järjestys</type>
+			<type key="collation" type="traditional" scope="core">perinteinen</type>
 			<type key="collation" type="unihan">radikaali- ja piirtojärjestys</type>
+			<type key="collation" type="unihan" scope="core">radikaali piirto</type>
 			<type key="collation" type="zhuyin">zhuyin-järjestys</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin-järjestelmä</type>
 			<type key="colNormalization" type="no">lajittelu ilman normalisointia</type>
 			<type key="colNormalization" type="yes">lajittelu Unicode-normalisoituna</type>
 			<type key="colNumeric" type="no">numero-numerolta lajittelu</type>
@@ -1403,18 +1442,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ideogrammin levyinen</type>
 			<type key="d0" type="hwidth">ideogrammin puolikkaan levyinen</type>
 			<type key="d0" type="npinyin">numeerinen muunnos</type>
+			<type key="em" type="default" scope="core">oletusarvoinen</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">teksti</type>
 			<type key="hc" type="h11">12 tunnin järjestelmä (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 tunnin järjestelmä (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 tunnin järjestelmä (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 tunnin järjestelmä (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">väljä rivinvaihto</type>
+			<type key="lb" type="loose" scope="core">väljä</type>
 			<type key="lb" type="normal">normaali rivinvaihto</type>
+			<type key="lb" type="normal" scope="core">normaali</type>
 			<type key="lb" type="strict">tarkka rivinvaihto</type>
+			<type key="lb" type="strict" scope="core">tarkka</type>
+			<type key="lw" type="breakall" scope="core">erota kaikki</type>
+			<type key="lw" type="keepall" scope="core">säilytä kaikki</type>
+			<type key="lw" type="normal" scope="core">normaali</type>
+			<type key="lw" type="phrase" scope="core">säilytä lauseet</type>
 			<type key="m0" type="bgn">BGN-latinaistus</type>
 			<type key="m0" type="ungegn">UNGEGN-latinaistus</type>
 			<type key="ms" type="metric">metrijärjestelmä</type>
+			<type key="ms" type="metric" scope="core">metrinen</type>
 			<type key="ms" type="uksystem">brittiläinen mittajärjestelmä</type>
+			<type key="ms" type="uksystem" scope="core">brittiläinen</type>
 			<type key="ms" type="ussystem">yhdysvaltalainen mittajärjestelmä</type>
+			<type key="ms" type="ussystem" scope="core">yhdysvaltalainen</type>
 			<type key="numbers" type="ahom">ahom-numerot</type>
 			<type key="numbers" type="arab">arabialaiset numerot</type>
 			<type key="numbers" type="arabext">laajennetut arabialaiset numerot</type>
@@ -1500,6 +1556,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">vai-numerot</type>
 			<type key="numbers" type="wara">varang kshiti -numerot</type>
 			<type key="numbers" type="wcho">wancholaiset numerot</type>
+			<type key="ss" type="none" scope="core">pois</type>
+			<type key="ss" type="standard" scope="core">päällä</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrinen</measurementSystemName>
@@ -1536,9 +1594,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1748,6 +1803,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'klo' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1756,6 +1814,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'klo' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1764,6 +1825,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1772,6 +1836,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'klo' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bhm">h.mm B</dateFormatItem>
@@ -1784,16 +1851,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -1879,10 +1948,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d. MMMM – E d. MMMM y G</greatestDifference>
 							<greatestDifference id="y">E d. MMMM y – E d. MMMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -1904,10 +1969,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">H.mm–H.mm v</greatestDifference>
 							<greatestDifference id="m">H.mm–H.mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -2007,20 +2068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">tammi</month>
-							<month type="2">helmi</month>
-							<month type="3">maalis</month>
-							<month type="4">huhti</month>
-							<month type="5">touko</month>
-							<month type="6">kesä</month>
-							<month type="7">heinä</month>
-							<month type="8">elo</month>
-							<month type="9">syys</month>
-							<month type="10">loka</month>
-							<month type="11">marras</month>
-							<month type="12">joulu</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">T</month>
 							<month type="2">H</month>
@@ -2063,7 +2110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="sat">la</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">sunnuntai</day>
+							<day type="sun">sunnuntaina</day>
 							<day type="mon">maanantaina</day>
 							<day type="tue">tiistaina</day>
 							<day type="wed">keskiviikkona</day>
@@ -2248,6 +2295,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'klo' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2256,6 +2306,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'klo' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2264,6 +2317,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -2272,6 +2328,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'klo' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bhm">h.mm B</dateFormatItem>
@@ -2284,13 +2343,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E H.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M.d.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d. MMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E d. MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H.mm</dateFormatItem>
@@ -2300,6 +2360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">H.mm.ss v</dateFormatItem>
 						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">H.mm v</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d.M.</dateFormatItem>
@@ -2364,7 +2425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="GyMMMd">
 							<greatestDifference id="d">d.–d.M.y G</greatestDifference>
 							<greatestDifference id="G">d.M.y. G – d.M.y G</greatestDifference>
-							<greatestDifference id="M">d.M–d.M.y G</greatestDifference>
+							<greatestDifference id="M">d.M.–d.M.y G</greatestDifference>
 							<greatestDifference id="y">d.M.y–d.M.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
@@ -2390,10 +2451,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d. MMMM – E d. MMMM y G</greatestDifference>
 							<greatestDifference id="y">E d. MMMM y – E d. MMMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
 						</intervalFormatItem>
@@ -2415,10 +2472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">H.mm–H.mm v</greatestDifference>
 							<greatestDifference id="m">H.mm–H.mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -3186,18 +3239,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>tuntematon</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
@@ -3214,24 +3258,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="Indian/Cocos">
 				<exemplarCity>Kookossaaret</exemplarCity>
 			</zone>
@@ -3244,12 +3270,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Santiago">
 				<exemplarCity>Santiago de Chile</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
 			</zone>
@@ -3265,9 +3285,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praha</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berliini</exemplarCity>
 			</zone>
@@ -3283,9 +3300,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Cairo">
 				<exemplarCity>Kairo</exemplarCity>
 			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Kanariansaaret</exemplarCity>
 			</zone>
@@ -3358,7 +3372,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Abariringa</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komorit</exemplarCity>
@@ -3411,15 +3425,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Malediivit</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Ciudad de México</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Pacific/Chatham">
 				<exemplarCity>Chathamsaaret</exemplarCity>
 			</zone>
@@ -3480,9 +3485,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Khartum</exemplarCity>
 			</zone>
@@ -3495,15 +3497,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskos</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kerguelensaaret</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
@@ -3569,9 +3565,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Länsi-Afrikan aika</generic>
-					<standard>Länsi-Afrikan normaaliaika</standard>
-					<daylight>Länsi-Afrikan kesäaika</daylight>
+					<standard>Länsi-Afrikan aika</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3959,6 +3953,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyanan aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havaijin-Aleuttien normaaliaika</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havaijin-Aleuttien aika</generic>
@@ -4409,6 +4408,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuukin aika</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turkin aika</generic>
+					<standard>Turkin normaaliaika</standard>
+					<daylight>Turkin kesäaika</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistanin aika</generic>
@@ -4574,7 +4580,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -6091,6 +6100,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>XCD</symbol>
 				<symbol alt="narrow">XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karibian guldeni</displayName>
+				<displayName count="one">Karibian guldeni</displayName>
+				<displayName count="other">Karibian guldenia</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>erityisnosto-oikeus (SDR)</displayName>
 				<displayName count="one">erityisnosto-oikeus (SDR)</displayName>
@@ -6225,6 +6239,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Zimbabwen dollari (1980–2008)</displayName>
 				<displayName count="other">Zimbabwen dollaria (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwen kulta</displayName>
+				<displayName count="one">Zimbabwen kulta</displayName>
+				<displayName count="other">Zimbabwen kultaa</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwen dollari (2009)</displayName>
 				<displayName count="one">Zimbabwen dollari (2009)</displayName>
@@ -6583,7 +6602,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="illative">{0} kohteeseen</unitPattern>
 				<unitPattern count="other" case="partitive">{0} kohdetta</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>osat</displayName>
+				<unitPattern count="one">{0} osa</unitPattern>
+				<unitPattern count="other">{0} osaa</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>miljoonasosat</displayName>
 				<unitPattern count="one">{0} miljoonasosa</unitPattern>
 				<unitPattern count="one" case="elative">{0} miljoonasosasta</unitPattern>
@@ -6647,6 +6671,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="illative">{0} mooliin</unitPattern>
 				<unitPattern count="other" case="partitive">{0} moolia</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoosia</displayName>
+				<unitPattern count="one">{0} glukoosia</unitPattern>
+				<unitPattern count="other">{0} glukoosia</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litrat / kilometri</displayName>
 				<unitPattern count="one">{0} litra / kilometri</unitPattern>
@@ -7711,6 +7740,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="illative">{0} elohopeamillimetriin</unitPattern>
 				<unitPattern count="other" case="partitive">{0} elohopeamillimetriä</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>elohopeaa</displayName>
+				<unitPattern count="one">{0} elohopeaa</unitPattern>
+				<unitPattern count="other">{0} elohopeaa</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>paunat / neliötuuma</displayName>
 				<unitPattern count="one">{0} pauna / neliötuuma</unitPattern>
@@ -8081,6 +8115,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="illative">{0} teekuppiin</unitPattern>
 				<unitPattern count="other" case="partitive">{0} teekuppia</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>nesteunssit</displayName>
+				<unitPattern count="one">{0} nesteunssi</unitPattern>
+				<unitPattern count="other">{0} nesteunssia</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>eekkerijalat</displayName>
 				<unitPattern count="one">{0} eekkerijalka</unitPattern>
@@ -8157,7 +8196,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} br. neljännesgallona</unitPattern>
 				<unitPattern count="other">{0} br. neljännesgallonaa</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradiaanit</displayName>
+				<unitPattern count="one">{0} steradiaani</unitPattern>
+				<unitPattern count="other">{0} steradiaania</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katalit</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katalia</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombit</displayName>
+				<unitPattern count="one">{0} coulombi</unitPattern>
+				<unitPattern count="other">{0} coulombia</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradit</displayName>
+				<unitPattern count="one">{0} faradi</unitPattern>
+				<unitPattern count="other">{0} faradia</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henryt</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henryä</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensit</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemensiä</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorit [IT]</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kaloria [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerelit</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquereliä</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievertit</displayName>
+				<unitPattern count="one">{0} sievertti</unitPattern>
+				<unitPattern count="other">{0} sieverttiä</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grayt</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grayta</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopondit</displayName>
+				<unitPattern count="one">{0} kilopondi</unitPattern>
+				<unitPattern count="other">{0} kilopondia</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslat</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslaa</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weberit</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weberiä</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>valon nopeus</displayName>
+				<unitPattern count="one">{0} valon nopeus</unitPattern>
+				<unitPattern count="other">{0} valon nopeus</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>miljardisosat</displayName>
 				<unitPattern count="one">{0} miljardisosa</unitPattern>
 				<unitPattern count="one" case="elative">{0} miljardisosasta</unitPattern>
@@ -8171,7 +8280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="partitive">{0} miljardisosaa</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>yöt</displayName>
 				<unitPattern count="one">{0} yö</unitPattern>
 				<unitPattern count="one" case="elative">{0} yöstä</unitPattern>
 				<unitPattern count="one" case="genitive">{0} yön</unitPattern>
@@ -8232,6 +8340,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} kohde</unitPattern>
 				<unitPattern count="other">{0} kohde</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>osa</displayName>
+				<unitPattern count="one">{0} osa</unitPattern>
+				<unitPattern count="other">{0} osa</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="other">{0} %</unitPattern>
@@ -8248,6 +8361,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>mooli</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gluk</displayName>
+				<unitPattern count="one">{0} gluk</unitPattern>
+				<unitPattern count="other">{0} gluk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -8451,6 +8569,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="one">{0} °C</unitPattern>
 				<unitPattern count="other">{0} °C</unitPattern>
@@ -8502,6 +8624,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} tkp</unitPattern>
 				<unitPattern count="other">{0} tkp</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>am. gal</displayName>
 				<unitPattern count="one">{0} am. gal</unitPattern>
@@ -8516,8 +8642,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-cup">
 				<displayName>kp</displayName>
-				<unitPattern count="one">{0} kp</unitPattern>
-				<unitPattern count="other">{0} kp</unitPattern>
+				<unitPattern count="one">{0} kuppi</unitPattern>
+				<unitPattern count="other">{0} kuppia</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fl oz</displayName>
@@ -8577,6 +8703,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt br.</unitPattern>
 				<unitPattern count="other">{0} qt br.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>valon nopeus</displayName>
+				<unitPattern count="one">{0} valon nopeus</unitPattern>
+				<unitPattern count="other">{0} valon nopeus</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>yöt</displayName>
 				<unitPattern count="one">{0} yö</unitPattern>
@@ -8664,7 +8849,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} kohde</unitPattern>
 				<unitPattern count="other">{0} kohdetta</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>osa</displayName>
+				<unitPattern count="one">{0} osa</unitPattern>
+				<unitPattern count="other">{0} osa</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -8682,6 +8872,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gluk</displayName>
+				<unitPattern count="one">{0} gluk</unitPattern>
+				<unitPattern count="other">{0} gluk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}l/km</unitPattern>
 				<unitPattern count="other">{0}l/km</unitPattern>
@@ -9310,11 +9505,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt br.</unitPattern>
 				<unitPattern count="other">{0}qt br.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>valon nopeus</displayName>
+				<unitPattern count="one">{0}valon nopeus</unitPattern>
+				<unitPattern count="other">{0}valon nopeus</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0}ppb</unitPattern>
+				<unitPattern count="other">{0}ppb</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>yöt</displayName>
 				<unitPattern count="one">{0}yö</unitPattern>
 				<unitPattern count="other">{0}yöt</unitPattern>
-				<perUnitPattern>{0}/yö</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>suunta</displayName>
diff --git a/make/data/cldr/common/main/fil.xml b/make/data/cldr/common/main/fil.xml
index ffc6e42ace6..135e318c0f2 100644
--- a/make/data/cldr/common/main/fil.xml
+++ b/make/data/cldr/common/main/fil.xml
@@ -31,7 +31,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ann">Obolo</language>
 			<language type="anp">Angika</language>
 			<language type="ar">Arabic</language>
-			<language type="ar_001">Modernong Karaniwang Arabic</language>
+			<language type="ar_001">Modern Standard Arabic</language>
 			<language type="arn">Mapuche</language>
 			<language type="arp">Arapaho</language>
 			<language type="ars">Najdi Arabic</language>
@@ -45,6 +45,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">Azerbaijani</language>
 			<language type="az" alt="short">Azeri</language>
 			<language type="ba">Bashkir</language>
+			<language type="bal">Baluchi</language>
 			<language type="ban">Balinese</language>
 			<language type="bas">Basaa</language>
 			<language type="be">Belarusian</language>
@@ -92,7 +93,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="crr">Carolina Algonquian</language>
 			<language type="crs">Seselwa Creole French</language>
 			<language type="cs">Czech</language>
-			<language type="csw">Latian na Cree</language>
+			<language type="csw">Swampy Cree</language>
 			<language type="cu">Church Slavic</language>
 			<language type="cv">Chuvash</language>
 			<language type="cy">Welsh</language>
@@ -101,8 +102,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="dar">Dargwa</language>
 			<language type="dav">Taita</language>
 			<language type="de">German</language>
-			<language type="de_AT">Austrian German</language>
-			<language type="de_CH">Swiss High German</language>
 			<language type="dgr">Dogrib</language>
 			<language type="dje">Zarma</language>
 			<language type="doi">Dogri</language>
@@ -138,7 +137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="fo">Faroese</language>
 			<language type="fon">Fon</language>
 			<language type="fr">French</language>
-			<language type="fr_CH">Swiss na French</language>
 			<language type="frc">Cajun French</language>
 			<language type="frr">Hilagang Frisian</language>
 			<language type="fur">Friulian</language>
@@ -229,12 +227,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Colognian</language>
 			<language type="ku">Kurdish</language>
+			<language type="ku" menu="core">Kurdish</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Cornish</language>
 			<language type="kwk">Kwakʼwala</language>
 			<language type="kxv">Kuvi</language>
-			<language type="ky">Kirghiz</language>
+			<language type="ky">Kyrgyz</language>
 			<language type="la">Latin</language>
 			<language type="lad">Ladino</language>
 			<language type="lag">Langi</language>
@@ -287,7 +287,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ms">Malay</language>
 			<language type="mt">Maltese</language>
 			<language type="mua">Mundang</language>
-			<language type="mul">Maramihang Wika</language>
+			<language type="mul">Maramihang wika</language>
 			<language type="mus">Creek</language>
 			<language type="mwl">Mirandese</language>
 			<language type="my">Burmese</language>
@@ -341,7 +341,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ps">Pashto</language>
 			<language type="ps" alt="variant">Pushto</language>
 			<language type="pt">Portuguese</language>
-			<language type="pt_BR">Portuges ng Brasil</language>
 			<language type="pt_PT">European Portuguese</language>
 			<language type="qu">Quechua</language>
 			<language type="quc">Kʼicheʼ</language>
@@ -439,7 +438,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="udm">Udmurt</language>
 			<language type="ug">Uyghur</language>
 			<language type="ug" alt="variant">Uighur</language>
-			<language type="uk">Ukranian</language>
+			<language type="uk">Ukrainian</language>
 			<language type="umb">Umbundu</language>
 			<language type="und">Hindi Kilalang Wika</language>
 			<language type="ur">Urdu</language>
@@ -544,7 +543,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Zzzz">Hindi Kilalang Script</script>
 		</scripts>
 		<territories>
-			<territory type="001">Mundo</territory>
+			<territory type="001">mundo</territory>
 			<territory type="002">Africa</territory>
 			<territory type="003">Hilagang Amerika</territory>
 			<territory type="005">Timog Amerika</territory>
@@ -629,6 +628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clipperton Island</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cape Verde</territory>
@@ -663,7 +663,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="FR">France</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">United Kingdom</territory>
-			<territory type="GB" alt="short">U.K.</territory>
+			<territory type="GB" alt="short">UK</territory>
 			<territory type="GD">Grenada</territory>
 			<territory type="GE">Georgia</territory>
 			<territory type="GF">French Guiana</territory>
@@ -874,35 +874,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numeric na Pag-uuri-uri</key>
 			<key type="colStrength">Lakas ng Pag-uuri-uri</key>
 			<key type="currency">Pera</key>
+			<key type="em">Presentation ng Emoji</key>
 			<key type="hc">Siklo ng Oras (12 laban sa 24)</key>
-			<key type="lb">Istilo ng Putol ng Linya</key>
+			<key type="lb">CJK na Line Break</key>
+			<key type="lw">Mga Line Break sa Mga Salita</key>
 			<key type="ms">Sistema ng Pagsukat</key>
 			<key type="numbers">Mga Numero</key>
+			<key type="ss">Sentence Break Pagkatapos ng Abbr.</key>
 			<key type="timezone">Time Zone</key>
 			<key type="va">Lokal na Variant</key>
 			<key type="x">Pribadong Paggamit</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kalendaryo ng Buddhist</type>
+			<type key="calendar" type="buddhist" scope="core">Buddhist</type>
 			<type key="calendar" type="chinese">Kalendaryong Chinese</type>
+			<type key="calendar" type="chinese" scope="core">Chinese</type>
 			<type key="calendar" type="coptic">Kalendaryong Coptic</type>
+			<type key="calendar" type="coptic" scope="core">Coptic</type>
 			<type key="calendar" type="dangi">Dangi na Kalendaryo</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kalendaryo ng Ethiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Kalendaryong Ethiopic Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Gregorian na Kalendaryo</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Hebrew na Kalendaryo</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrew</type>
 			<type key="calendar" type="indian">Pambansang Kalendaryong Indian</type>
-			<type key="calendar" type="islamic" draft="contributed">Kalendaryong Islam</type>
+			<type key="calendar" type="islamic">Kalendaryong Hijiri</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Kalendaryong Hijri (tabular, Civil epoch)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabular, civil epoch)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">Kalendaryong Islamiko (Saudi Arabia, sighting)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">Kalendaryong Islamiko (tabular, astronomikal na epoch)</type>
 			<type key="calendar" type="islamic-umalqura">Kalendaryong Hijri (Umm al-Qura)</type>
-			<type key="calendar" type="iso8601">ISO-8601 na Kalendaryo</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">Kalendaryong Gregorian (Unang Taon)</type>
 			<type key="calendar" type="japanese">Kalendaryong Japanese</type>
+			<type key="calendar" type="japanese" scope="core">Japanese</type>
 			<type key="calendar" type="persian">Kalendaryong Persian</type>
+			<type key="calendar" type="persian" scope="core">Persian</type>
 			<type key="calendar" type="roc">Kalendaryong Minguo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Format ng Pera sa Accounting</type>
+			<type key="cf" type="account" scope="core">Accounting</type>
 			<type key="cf" type="standard">Karaniwang Format ng Pera</type>
+			<type key="cf" type="standard" scope="core">Karaniwan</type>
 			<type key="colAlternate" type="non-ignorable">Pag-uri-uriin ang Mga Simbolo</type>
 			<type key="colAlternate" type="shifted">Pag-uri-uriin ang Mga Ignoring Symbol</type>
 			<type key="colBackwards" type="no">Pag-uri-uriin ang Mga Accent nang Normal</type>
@@ -912,19 +931,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Uppercase Muna ang Pag-uri-uriin</type>
 			<type key="colCaseLevel" type="no">Pag-uri-uriin ang Hindi Case Sensitive</type>
 			<type key="colCaseLevel" type="yes">Pag-uri-uriin ang Case Sensitive</type>
-			<type key="collation" type="big5han">Pagkakasunod-sunod ng Pag-uuri ng Tradisyunal na Chinese - Big5</type>
 			<type key="collation" type="compat" draft="contributed">Nakaraang Pagkakasunud-sunod ng Pag-uuri, para sa compatibility</type>
 			<type key="collation" type="dictionary">Pagkakasunud-sunod ng Pag-uuri ng Diksyunaryo</type>
 			<type key="collation" type="ducet">Default na Pagkakasunud-sunod ng Ayos ng Unicode</type>
+			<type key="collation" type="ducet" scope="core">Default na Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">Pagkakasunud-sunod ng Pag-uuri ng Emoji</type>
 			<type key="collation" type="eor" draft="contributed">Mga Tuntunin ng European na Pagkakasunud-sunod</type>
-			<type key="collation" type="gb2312han">Pagkakasunud-sunod ng Pag-uuri ng Pinasimpleng Chinese - GB2312</type>
 			<type key="collation" type="phonebook">Pagkakasunud-sunod ng Pag-uuri ng Phonebook</type>
 			<type key="collation" type="phonetic">Phonetic na Ayos ng Pag-uuri-uri</type>
 			<type key="collation" type="pinyin">Pagkakasunud-sunod ng Pag-uuri ng Pinyin</type>
 			<type key="collation" type="search">Pangkalahatang Paghahanap</type>
+			<type key="collation" type="search" scope="core">Maghanap</type>
 			<type key="collation" type="searchjl">Maghanap Ayon sa Unang Katinig ng Hangul</type>
 			<type key="collation" type="standard">Karaniwang Pagkakasunud-sunod ng Ayos</type>
+			<type key="collation" type="standard" scope="core">Karaniwan</type>
 			<type key="collation" type="stroke">Pagkakasunud-sunod ng Pag-uuri ng Stroke</type>
 			<type key="collation" type="traditional">Tradisyunal na Pagkakasunud-sunod ng Pag-uuri</type>
 			<type key="collation" type="unihan">Pagkakasunud-sunod ng Pag-uuri ng Radical-Stroke</type>
@@ -941,18 +961,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Hanggang sa Fullwidth</type>
 			<type key="d0" type="hwidth">Hanggang sa Halfwidth</type>
 			<type key="d0" type="npinyin">Numeric</type>
+			<type key="em" type="default" scope="core">Default</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Text</type>
 			<type key="hc" type="h11">12 Oras na Sistema (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Oras na Sistema (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 na Oras na Sistema (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 na Oras na Sistema (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Loose na Istilo ng Line Break</type>
+			<type key="lb" type="loose" scope="core">Loose</type>
 			<type key="lb" type="normal">Normal na Istilo ng Line Break</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Mahigpit na Istilo ng Line Break</type>
+			<type key="lb" type="strict" scope="core">Strict</type>
+			<type key="lw" type="breakall" scope="core">I-break lahat</type>
+			<type key="lw" type="keepall" scope="core">Panatilihin lahat</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Panatilihin sa mga parirala</type>
 			<type key="m0" type="bgn">US BGN na Transliteration</type>
 			<type key="m0" type="ungegn">UN GEGN na Transliteration</type>
 			<type key="ms" type="metric">Metrikong Sistema</type>
+			<type key="ms" type="metric" scope="core">Metric</type>
 			<type key="ms" type="uksystem">Sistemang Imperial na Pagsukat</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Sistema ng Pagsukat sa US</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="ahom" draft="contributed">Ahom na mga Digit</type>
 			<type key="numbers" type="arab">Arabic-Indic na Mga Digit</type>
 			<type key="numbers" type="arabext">Extendend Arabic-Indic na Mga Digit</type>
@@ -1009,7 +1046,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="native">Mga Native na Digit</type>
 			<type key="numbers" type="nkoo" draft="contributed">N’Ko na Mga Digit</type>
 			<type key="numbers" type="olck">Mga Digit ng Ol Chiki</type>
-			<type key="numbers" type="orya">Mga Oriya na Digit</type>
+			<type key="numbers" type="orya">Mga Odia na Digit</type>
 			<type key="numbers" type="roman">Mga Roman Numeral</type>
 			<type key="numbers" type="romanlow">Roman Lowercase na Mga Numeral</type>
 			<type key="numbers" type="taml">Tamil na Mga Numeral</type>
@@ -1019,6 +1056,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Mga Tibetan na Digit</type>
 			<type key="numbers" type="traditional">Mga Tradisyunal na Numeral</type>
 			<type key="numbers" type="vaii">Mga Vai na Digit</type>
+			<type key="ss" type="none" scope="core">Naka-off</type>
+			<type key="ss" type="standard" scope="core">Naka-on</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metriko</measurementSystemName>
@@ -1037,9 +1076,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1082,6 +1118,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'nang' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'nang' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1090,6 +1129,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'nang' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'nang' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1106,11 +1148,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
@@ -1176,10 +1219,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
 							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
@@ -1190,10 +1229,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -1208,9 +1243,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
 							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
@@ -1327,15 +1359,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri">Biy</day>
 							<day type="sat">Sab</day>
 						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">Lin</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Miy</day>
-							<day type="thu">Huw</day>
-							<day type="fri">Biy</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Linggo</day>
 							<day type="mon">Lunes</day>
@@ -1356,15 +1379,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri">Biy</day>
 							<day type="sat">Sab</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Lin</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Miy</day>
-							<day type="thu">Huw</day>
-							<day type="fri">Biy</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
@@ -1395,24 +1409,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="night1">ng gabi</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight">hatinggabi</dayPeriod>
 							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
 							<dayPeriod type="pm">pm</dayPeriod>
-							<dayPeriod type="morning1">ng umaga</dayPeriod>
-							<dayPeriod type="morning2">madaling-araw</dayPeriod>
-							<dayPeriod type="afternoon1">ng hapon</dayPeriod>
-							<dayPeriod type="evening1">ng gabi</dayPeriod>
-							<dayPeriod type="night1">ng gabi</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight">hatinggabi</dayPeriod>
-							<dayPeriod type="noon">tanghaling-tapat</dayPeriod>
-							<dayPeriod type="morning1">ng umaga</dayPeriod>
-							<dayPeriod type="morning2">madaling-araw</dayPeriod>
-							<dayPeriod type="afternoon1">ng hapon</dayPeriod>
-							<dayPeriod type="evening1">ng gabi</dayPeriod>
-							<dayPeriod type="night1">ng gabi</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
@@ -1520,11 +1518,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1594,10 +1593,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
 							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1608,10 +1603,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -1626,9 +1617,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
 							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
@@ -2207,7 +2195,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</long>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Canton Island</exemplarCity>
 			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
@@ -2261,9 +2249,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Oras sa Kanlurang Africa</generic>
-					<standard>Standard na Oras sa Kanlurang Africa</standard>
-					<daylight>Oras sa Tag-init ng Kanlurang Africa</daylight>
+					<standard>Oras sa Kanlurang Africa</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2620,6 +2606,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Oras sa Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Standard na Oras sa Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Oras sa Hawaii-Aleutian</generic>
@@ -3179,7 +3170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="contributed">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4054,6 +4044,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dolyar ng Silangang Caribbean</displayName>
 				<displayName count="other">dolyares ng Silangang Caribbean</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribbean guilder</displayName>
+				<displayName count="one">Caribbean guilder</displayName>
+				<displayName count="other">Caribbean guilders</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>CFA Franc ng Kanlurang Africa</displayName>
 				<displayName count="one">CFA franc ng Kanlurang Africa</displayName>
@@ -4087,6 +4082,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Zambian kwacha</displayName>
 				<displayName count="other">Zambian kwachas</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwean Gold</displayName>
+				<displayName count="one">Zimbabwean gold</displayName>
+				<displayName count="other">Zimbabwean gold</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4305,7 +4305,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0} na item</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parts</displayName>
+				<unitPattern count="one" draft="contributed">{0} part</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts per million</displayName>
 				<unitPattern count="one">{0} part per million</unitPattern>
 				<unitPattern count="other">{0} parts per million</unitPattern>
@@ -4328,6 +4333,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mole</unitPattern>
 				<unitPattern count="other">{0} mole</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ng glucose</displayName>
+				<unitPattern count="one">{0} ng glucose</unitPattern>
+				<unitPattern count="other">{0} ng glucose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litro kada kilometro</displayName>
 				<unitPattern count="one">{0} litro kada kilometro</unitPattern>
@@ -4810,8 +4820,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milimetro ng asoge</unitPattern>
 				<unitPattern count="other">{0} na milimetro ng asoge</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ng mercury</displayName>
+				<unitPattern count="one">{0} ng mercury</unitPattern>
+				<unitPattern count="other">{0} ng mercury</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName>libra kada pulgadang parisukat</displayName>
+				<displayName>pounds-force bawat square inch</displayName>
 				<unitPattern count="one">{0} libra kada pulgadang parisukat</unitPattern>
 				<unitPattern count="other">{0} na libra kada pulgadang parisukat</unitPattern>
 			</unit>
@@ -5052,15 +5067,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} Imp. na kuwart</unitPattern>
 				<unitPattern count="other">{0} Imp. na kuwart</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calories [IT]</displayName>
+				<unitPattern count="one">{0} calorie [IT]</unitPattern>
+				<unitPattern count="other">{0} calories [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograms-force</displayName>
+				<unitPattern count="one">{0} kilogram-force</unitPattern>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>parts per billion</displayName>
 				<unitPattern count="one">{0} part per billion</unitPattern>
 				<unitPattern count="other">{0} parts per billion</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>mga gabi</displayName>
-				<unitPattern count="one">{0} gabi</unitPattern>
-				<unitPattern count="other">{0} gabi</unitPattern>
 				<perUnitPattern>{0} kada gabi</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -5126,7 +5198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-karat">
 				<displayName>karat</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts/million</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
@@ -5135,6 +5207,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>mole</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litro/km</displayName>
 			</unit>
@@ -5235,6 +5310,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-nanosecond">
 				<displayName>nanoseg</displayName>
 			</unit>
+			<unit type="electric-ampere">
+				<displayName>amps</displayName>
+			</unit>
 			<unit type="electric-milliampere">
 				<displayName>milliamps</displayName>
 			</unit>
@@ -5390,6 +5468,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>watts</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ng Hg</displayName>
+				<unitPattern count="one">{0} ng Hg</unitPattern>
+				<unitPattern count="other">{0} ng Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>in Hg</displayName>
 			</unit>
@@ -5485,7 +5568,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>Imp na kuwart</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>parts/billion</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -5563,7 +5675,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0}item</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
@@ -5572,6 +5684,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>mol</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 			</unit>
@@ -5816,6 +5931,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ng Hg</displayName>
+				<unitPattern count="one">{0} ng Hg</unitPattern>
+				<unitPattern count="other">{0} ng Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -5936,15 +6056,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>mga gabi</displayName>
 				<unitPattern count="one">{0}gabi</unitPattern>
 				<unitPattern count="other">{0}gabi</unitPattern>
-				<perUnitPattern>{0}/gabi</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/fo.xml b/make/data/cldr/common/main/fo.xml
index 62c754793d9..e54f95f951c 100644
--- a/make/data/cldr/common/main/fo.xml
+++ b/make/data/cldr/common/main/fo.xml
@@ -983,6 +983,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="ethiopic">etiopiskur kalendari</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopiskur amete alem kalendari</type>
 			<type key="calendar" type="gregorian">gregorianskur kalendari</type>
+			<type key="calendar" type="gregorian" scope="core">gregorianskur</type>
 			<type key="calendar" type="hebrew">hebraiskur kalendari</type>
 			<type key="calendar" type="islamic">islamiskur kalendari</type>
 			<type key="calendar" type="islamic-civil">islamiskur kalendari (talvuskapaður, fólkaligt tíðarskeið)</type>
@@ -998,6 +999,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="eor" draft="contributed">röðina fyrir fjöltyngi evrópskum skjölum</type>
 			<type key="collation" type="search">vanlig leiting</type>
 			<type key="collation" type="standard">vanlig raðskipan</type>
+			<type key="collation" type="standard" scope="core">vanlig</type>
 			<type key="collation" type="traditional">siðbundin raðskipan</type>
 			<type key="collation" type="zhuyin">zhuyin raðskipan</type>
 			<type key="hc" type="h11">12 tímar klokkuskipan (0–11)</type>
@@ -1123,6 +1125,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1131,6 +1136,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1148,7 +1156,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">dd.MM.y GGGGG, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
@@ -1516,6 +1526,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1524,6 +1537,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1541,7 +1557,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">dd.MM.y G, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
@@ -2311,9 +2329,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Jamaica">
 				<exemplarCity>Jamaika</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Kuvait</exemplarCity>
 			</zone>
@@ -2405,9 +2420,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Vesturafrika tíð</generic>
-					<standard>Vesturafrika vanlig tíð</standard>
-					<daylight>Vesturafrika summartíð</daylight>
+					<standard>Vesturafrika tíð</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2757,6 +2770,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Gujana tíð</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutian vanlig tíð</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutian tíð</generic>
@@ -3332,9 +3350,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -3965,6 +3985,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">Eystur Karibia dollari</displayName>
 				<displayName count="other">Eystur Karibia dollarar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karibia gyllin</displayName>
+				<displayName count="one">Karibia gyllin</displayName>
+				<displayName count="other">Karibia gyllin</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Vesturafrika CFA frankur</displayName>
 				<displayName count="one">Vesturafrika CFA frankur</displayName>
@@ -3995,6 +4020,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZMW">
 				<displayName>Sambia kwacha</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Simbabvi gull</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4204,7 +4232,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} lutur</unitPattern>
 				<unitPattern count="other">{0} lutir</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partar fyri hvørja millión</displayName>
 				<unitPattern count="one">{0} partur fyri hvørja millión</unitPattern>
 				<unitPattern count="other">{0} partar fyri hvørja millión</unitPattern>
@@ -4857,7 +4885,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ljós</unitPattern>
 				<unitPattern count="other">{0} ljós</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partar fyri hvørja milliard</displayName>
 				<unitPattern count="one">{0} part fyri hvørja milliard</unitPattern>
 				<unitPattern count="other">{0} partar fyri hvørja milliard</unitPattern>
@@ -4958,7 +4986,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} lutur</unitPattern>
 				<unitPattern count="other">{0} lutir</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partar/millión</displayName>
 				<unitPattern count="one">{0} pt./mill.</unitPattern>
 				<unitPattern count="other">{0} pt./mill.</unitPattern>
@@ -5456,7 +5484,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ljós</unitPattern>
 				<unitPattern count="other">{0} ljós</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partar/milliard</displayName>
 				<unitPattern count="one">{0} part/mia.</unitPattern>
 				<unitPattern count="other">{0} partar/mia.</unitPattern>
@@ -5565,7 +5593,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}lutur</unitPattern>
 				<unitPattern count="other">{0} lutir</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pt./mill.</displayName>
 				<unitPattern count="one">{0}pt./mill</unitPattern>
 				<unitPattern count="other">{0}pt./mill</unitPattern>
@@ -6046,7 +6074,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}ljós</unitPattern>
 				<unitPattern count="other">{0}ljós</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partar/mia.</displayName>
 				<unitPattern count="one">{0}part/mia.</unitPattern>
 				<unitPattern count="other">{0}partar/mia.</unitPattern>
diff --git a/make/data/cldr/common/main/fr.xml b/make/data/cldr/common/main/fr.xml
index 06ad708b52c..075e313db8d 100644
--- a/make/data/cldr/common/main/fr.xml
+++ b/make/data/cldr/common/main/fr.xml
@@ -332,6 +332,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurde</language>
+			<language type="ku" menu="core">kurde</language>
+			<language type="ku" menu="extension">kurmandji</language>
 			<language type="kum">koumyk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -695,6 +697,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Bass" draft="unconfirmed">bassa</script>
 			<script type="Batk">batak</script>
 			<script type="Beng">bengali</script>
+			<script type="Berf" draft="provisional">beria erfe</script>
 			<script type="Bhks" draft="unconfirmed">bhaïksouki</script>
 			<script type="Blis">symboles Bliss</script>
 			<script type="Bopo">bopomofo</script>
@@ -841,6 +844,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Shaw">shavien</script>
 			<script type="Shrd" draft="unconfirmed">charada</script>
 			<script type="Sidd" draft="unconfirmed">siddham</script>
+			<script type="Sidt" draft="provisional">sidétique</script>
 			<script type="Sind" draft="unconfirmed">sindhi</script>
 			<script type="Sinh">cingalais</script>
 			<script type="Sogd" draft="unconfirmed">sogdien</script>
@@ -861,6 +865,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Taml">tamoul</script>
 			<script type="Tang" draft="unconfirmed">tangoute</script>
 			<script type="Tavt">taï viêt</script>
+			<script type="Tayo" draft="provisional">taï yo</script>
 			<script type="Telu">télougou</script>
 			<script type="Teng">tengwar</script>
 			<script type="Tfng">tifinagh</script>
@@ -871,6 +876,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Tirh" draft="unconfirmed">tirhouta</script>
 			<script type="Tnsa" draft="provisional">tangsa</script>
 			<script type="Todr" draft="provisional">todhri</script>
+			<script type="Tols" draft="provisional">tolong siki</script>
 			<script type="Toto" draft="provisional">toto</script>
 			<script type="Tutg" draft="provisional">tulu-tigalari</script>
 			<script type="Ugar">ougaritique</script>
@@ -979,6 +985,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Chine</territory>
 			<territory type="CO">Colombie</territory>
 			<territory type="CP">Île Clipperton</territory>
+			<territory type="CQ">Sercq</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cap-Vert</territory>
@@ -1203,7 +1210,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="ZA">Afrique du Sud</territory>
 			<territory type="ZM">Zambie</territory>
 			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">région indéterminée</territory>
+			<territory type="ZZ">région inconnue</territory>
 		</territories>
 		<subdivisions>
 			<subdivision type="gbeng">Angleterre</subdivision>
@@ -1326,35 +1333,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">tri numérique</key>
 			<key type="colStrength">priorité du tri</key>
 			<key type="currency">devise</key>
+			<key type="em">Présentation des Emoji</key>
 			<key type="hc">système horaire (12 ou 24 heures)</key>
 			<key type="lb">style de saut de ligne</key>
+			<key type="lw">Sauts de ligne dans les mots</key>
 			<key type="ms">système de mesure</key>
 			<key type="numbers">nombres</key>
+			<key type="ss">Saut de phrase après une abréviation</key>
 			<key type="timezone">fuseau horaire</key>
 			<key type="va">variante locale</key>
 			<key type="x">usage privé</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">calendrier bouddhiste</type>
+			<type key="calendar" type="buddhist" scope="core">bouddhiste</type>
 			<type key="calendar" type="chinese">calendrier chinois</type>
+			<type key="calendar" type="chinese" scope="core">chinois</type>
 			<type key="calendar" type="coptic">calendrier copte</type>
+			<type key="calendar" type="coptic" scope="core">copte</type>
 			<type key="calendar" type="dangi">calendrier dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">calendrier éthiopien</type>
+			<type key="calendar" type="ethiopic" scope="core">éthiopien</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendrier éthiopien Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">éthiopien Amete Alem</type>
 			<type key="calendar" type="gregorian">calendrier grégorien</type>
+			<type key="calendar" type="gregorian" scope="core">grégorien</type>
 			<type key="calendar" type="hebrew">calendrier hébraïque</type>
+			<type key="calendar" type="hebrew" scope="core">hébraïque</type>
 			<type key="calendar" type="indian">calendrier indien</type>
 			<type key="calendar" type="islamic">calendrier hégirien</type>
+			<type key="calendar" type="islamic" scope="core">hégirien</type>
 			<type key="calendar" type="islamic-civil">calendrier hégirien (tabulaire, époque civile)</type>
+			<type key="calendar" type="islamic-civil" scope="core">hégirien (tabulaire, époque civile)</type>
 			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">calendrier musulman (observé, Arabie Saoudite)</type>
 			<type key="calendar" type="islamic-tbla">calendrier hégirien (tabulaire, époque astronomique)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">hégirien (tabulaire, époque astronomique)</type>
 			<type key="calendar" type="islamic-umalqura">calendrier hégirien (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hégirien (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">calendrier ISO 8601</type>
 			<type key="calendar" type="japanese">calendrier japonais</type>
+			<type key="calendar" type="japanese" scope="core">japonais</type>
 			<type key="calendar" type="persian">calendrier persan</type>
+			<type key="calendar" type="persian" scope="core">persan</type>
 			<type key="calendar" type="roc">calendrier républicain chinois</type>
+			<type key="calendar" type="roc" scope="core">républicain chinois</type>
 			<type key="cf" type="account">format de devise comptable</type>
+			<type key="cf" type="account" scope="core">comptable</type>
 			<type key="cf" type="standard">format de devise standard</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Trier les symboles</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Trier en ignorant les symboles</type>
 			<type key="colBackwards" type="no" draft="contributed">Trier les caractères accentués normalement</type>
@@ -1364,23 +1391,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Trier avec les majuscules d’abord</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Trier sans tenir compte de la casse</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Trier en tenant compte de la casse</type>
-			<type key="collation" type="big5han">ordre chinois traditionnel - Big5</type>
 			<type key="collation" type="compat">ancien ordre de tri pour compatibilité</type>
+			<type key="collation" type="compat" scope="core">compatibilité</type>
 			<type key="collation" type="dictionary">ordre du dictionnaire</type>
+			<type key="collation" type="dictionary" scope="core">dictionnaire</type>
 			<type key="collation" type="ducet">ordre de tri Unicode par défaut</type>
+			<type key="collation" type="ducet" scope="core">Unicode par défaut</type>
 			<type key="collation" type="emoji" draft="unconfirmed">ordre des emoji</type>
 			<type key="collation" type="eor" draft="contributed">règles de classement européen</type>
-			<type key="collation" type="gb2312han">ordre chinois simplifié - GB2312</type>
 			<type key="collation" type="phonebook">ordre de l’annuaire</type>
+			<type key="collation" type="phonebook" scope="core">annuaire</type>
 			<type key="collation" type="phonetic">ordre de tri phonétique</type>
+			<type key="collation" type="phonetic" scope="core">phonétique</type>
 			<type key="collation" type="pinyin">ordre pinyin</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">recherche générique</type>
+			<type key="collation" type="search" scope="core">recherche</type>
 			<type key="collation" type="searchjl" draft="contributed">rechercher par consonne initiale en hangeul</type>
 			<type key="collation" type="standard">ordre de tri standard</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke">ordre des traits</type>
+			<type key="collation" type="stroke" scope="core">traits</type>
 			<type key="collation" type="traditional">ordre traditionnel</type>
+			<type key="collation" type="traditional" scope="core">traditionnel</type>
 			<type key="collation" type="unihan">ordre de tri radical-traits</type>
+			<type key="collation" type="unihan" scope="core">radical-traits</type>
 			<type key="collation" type="zhuyin">ordre zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Trier sans normalisation</type>
 			<type key="colNormalization" type="yes" draft="contributed">Trier avec normalisation Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Trier les chiffres individuellement</type>
@@ -1393,18 +1430,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">en pleine chasse</type>
 			<type key="d0" type="hwidth">en demi-chasse</type>
 			<type key="d0" type="npinyin" draft="contributed">Numérique</type>
+			<type key="em" type="default" scope="core">par défaut</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">texte</type>
 			<type key="hc" type="h11">système horaire de 12 heures (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">système horaire de 12 heures (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">système horaire de 24 heures (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">système horaire de 24 heures (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">style de saut de ligne permissif</type>
+			<type key="lb" type="loose" scope="core">permissif</type>
 			<type key="lb" type="normal">style de saut de ligne normal</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">style de saut de ligne strict</type>
+			<type key="lb" type="strict" scope="core">strict</type>
+			<type key="lw" type="breakall" scope="core">Couper n’importe où</type>
+			<type key="lw" type="keepall" scope="core">Ne pas couper</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Ne pas couper dans les phrases</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">système métrique</type>
+			<type key="ms" type="metric" scope="core">métrique</type>
 			<type key="ms" type="uksystem">système impérial</type>
+			<type key="ms" type="uksystem" scope="core">impérial</type>
 			<type key="ms" type="ussystem">système américain</type>
+			<type key="ms" type="ussystem" scope="core">américain</type>
 			<type key="numbers" type="ahom" draft="unconfirmed">chiffres ahoms</type>
 			<type key="numbers" type="arab">chiffres arabes</type>
 			<type key="numbers" type="arabext">chiffres arabes étendus</type>
@@ -1440,11 +1494,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="hmnp">chiffres nyiakeng puachue hmong</type>
 			<type key="numbers" type="java">chiffres javanais</type>
 			<type key="numbers" type="jpan">chiffres japonais</type>
-			<type key="numbers" type="jpanfin">chiffres japonais financiers</type>
+			<type key="numbers" type="jpanfin">chiffres financiers japonais</type>
 			<type key="numbers" type="kali" draft="unconfirmed">chiffres kayah li</type>
 			<type key="numbers" type="kawi" draft="unconfirmed">chiffres kawis</type>
 			<type key="numbers" type="khmr">chiffres khmers</type>
-			<type key="numbers" type="knda">chiffres en kannada</type>
+			<type key="numbers" type="knda">chiffres kannadas</type>
 			<type key="numbers" type="krai" draft="unconfirmed">chiffres kirat rais</type>
 			<type key="numbers" type="lana" draft="unconfirmed">chiffres lannas horas</type>
 			<type key="numbers" type="lanatham" draft="unconfirmed">chiffres lannas thams</type>
@@ -1468,7 +1522,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="mymrshan" draft="unconfirmed">chiffres birmans shans</type>
 			<type key="numbers" type="mymrtlng" draft="unconfirmed">chiffres birmans tai laings</type>
 			<type key="numbers" type="nagm" draft="unconfirmed">chiffres nag mundaris</type>
-			<type key="numbers" type="native">chiffres natifs</type>
+			<type key="numbers" type="native">chiffres locaux</type>
 			<type key="numbers" type="nkoo" draft="unconfirmed">chiffres n’kos</type>
 			<type key="numbers" type="olck">chiffres ol-chikis</type>
 			<type key="numbers" type="onao" draft="unconfirmed">chiffres ol onals</type>
@@ -1498,6 +1552,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">chiffres en vaï</type>
 			<type key="numbers" type="wara" draft="unconfirmed">chiffres warang-citis</type>
 			<type key="numbers" type="wcho">chiffres wantcho</type>
+			<type key="ss" type="none" scope="core">Désactivé</type>
+			<type key="ss" type="standard" scope="core">Activé</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">métrique</measurementSystemName>
@@ -1546,10 +1602,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</parseLenients>
 		<parseLenients scope="general" level="lenient">
 			<parseLenient sample="’">['＇’ ՚ ᾽᾿ ʼ ߴ]</parseLenient>
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
-			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="stricter">
@@ -1786,11 +1840,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="contributed">avant Dioclétien</era>
 						<era type="1" draft="contributed">après Dioclétien</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">av. D.</era>
 						<era type="1" draft="contributed">ap. D.</era>
 					</eraAbbr>
 				</eras>
@@ -1841,16 +1893,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">avant l’Incarnation</era>
-						<era type="1" draft="contributed">après l’Incarnation</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">av. Inc.</era>
-						<era type="1" draft="contributed">ap. Inc.</era>
-					</eraAbbr>
-				</eras>
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
@@ -1894,6 +1936,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'à' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1902,6 +1947,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'à' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1918,13 +1966,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1944,11 +1994,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -2300,6 +2348,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'à' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2308,6 +2359,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'à' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'à' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2318,6 +2372,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="E">E</dateFormatItem>
@@ -2325,16 +2382,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH 'h'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -2356,11 +2415,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -2403,7 +2460,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -2428,7 +2484,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2657,6 +2712,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</eras>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E d/M/y GGGGG</dateFormatItem>
@@ -2819,6 +2876,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="year-short">
 				<displayName>an</displayName>
+				<relative type="-1">l’an dernier</relative>
+				<relative type="0">cette année</relative>
+				<relative type="1">l’an prochain</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">dans {0} a</relativeTimePattern>
 					<relativeTimePattern count="other">dans {0} a</relativeTimePattern>
@@ -2830,6 +2890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="year-narrow">
 				<displayName>a</displayName>
+				<relative type="-1">l’an dernier</relative>
+				<relative type="0">cette année</relative>
+				<relative type="1">l’an prochain</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} a</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} a</relativeTimePattern>
@@ -3314,11 +3377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0} (heure d’été)</regionFormat>
 			<regionFormat type="standard">{0} (heure standard)</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="unconfirmed">HT</generic>
-					<standard draft="unconfirmed">HST</standard>
-					<daylight draft="unconfirmed">HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3330,7 +3388,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</short>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>ville inconnue</exemplarCity>
+				<exemplarCity>lieu inconnu</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andorre</exemplarCity>
@@ -3341,30 +3399,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kabul">
 				<exemplarCity>Kaboul</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erevan</exemplarCity>
 			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Showa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont-d’Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
 			<zone type="America/Argentina/Ushuaia">
 				<exemplarCity>Ushuaïa</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vienne</exemplarCity>
 			</zone>
@@ -3389,39 +3429,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermudes</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
 			<zone type="America/Manaus">
 				<exemplarCity>Manaos</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint-Jean de Terre-Neuve</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity>Île de Pâques</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>La Havane</exemplarCity>
 			</zone>
@@ -3434,9 +3450,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Famagusta">
 				<exemplarCity>Famagouste</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>Copenhague</exemplarCity>
 			</zone>
@@ -3449,9 +3462,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Algiers">
 				<exemplarCity>Alger</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Le Caire</exemplarCity>
 			</zone>
@@ -3523,15 +3533,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Bichkek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>Canton</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comores</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint-Christophe</exemplarCity>
 			</zone>
@@ -3586,18 +3587,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Mauritius">
 				<exemplarCity>Maurice</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahia de Banderas</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Mexico</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Katmandou</exemplarCity>
 			</zone>
@@ -3670,9 +3665,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riyad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Asia/Singapore">
 				<exemplarCity>Singapour</exemplarCity>
 			</zone>
@@ -3688,12 +3680,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damas</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Douchanbé</exemplarCity>
 			</zone>
@@ -3792,9 +3778,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>heure d’Afrique de l’Ouest</generic>
-					<standard>heure normale d’Afrique de l’Ouest</standard>
-					<daylight>heure d’été d’Afrique de l’Ouest</daylight>
+					<standard>heure d’Afrique de l’Ouest</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3803,11 +3787,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de l’Alaska</standard>
 					<daylight>heure d’été de l’Alaska</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HAK</generic>
-					<standard draft="unconfirmed">HNAK</standard>
-					<daylight draft="unconfirmed">HEAK</daylight>
-				</short>
 			</metazone>
 			<metazone type="Almaty">
 				<long>
@@ -3829,11 +3808,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale du centre nord-américain</standard>
 					<daylight>heure d’été du centre nord-américain</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HC</generic>
-					<standard draft="unconfirmed">HNC</standard>
-					<daylight draft="unconfirmed">HEC</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -3841,11 +3815,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de l’Est nord-américain</standard>
 					<daylight>heure d’été de l’Est nord-américain</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HE</generic>
-					<standard draft="unconfirmed">HNE</standard>
-					<daylight draft="unconfirmed">HEE</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -3853,11 +3822,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale des Rocheuses</standard>
 					<daylight>heure d’été des Rocheuses</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HR</generic>
-					<standard draft="unconfirmed">HNR</standard>
-					<daylight draft="unconfirmed">HER</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -3865,11 +3829,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale du Pacifique nord-américain</standard>
 					<daylight>heure d’été du Pacifique nord-américain</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HP</generic>
-					<standard draft="unconfirmed">HNP</standard>
-					<daylight draft="unconfirmed">HEP</daylight>
-				</short>
 			</metazone>
 			<metazone type="Anadyr">
 				<long>
@@ -3933,11 +3892,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de l’Atlantique</standard>
 					<daylight>heure d’été de l’Atlantique</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HA</generic>
-					<standard draft="unconfirmed">HNA</standard>
-					<daylight draft="unconfirmed">HEA</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -4078,11 +4032,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de Cuba</standard>
 					<daylight>heure d’été de Cuba</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HCU</generic>
-					<standard draft="unconfirmed">HNCU</standard>
-					<daylight draft="unconfirmed">HECU</daylight>
-				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
@@ -4124,11 +4073,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale d’Europe de l’Est</standard>
 					<daylight>heure d’été d’Europe de l’Est</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">EET</generic>
-					<standard draft="unconfirmed">EEST</standard>
-					<daylight draft="unconfirmed">EEDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
@@ -4141,11 +4085,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale d’Europe de l’Ouest</standard>
 					<daylight>heure d’été d’Europe de l’Ouest</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">WET</generic>
-					<standard draft="unconfirmed">WEST</standard>
-					<daylight draft="unconfirmed">WEDT</daylight>
-				</short>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
@@ -4207,11 +4146,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de l’Est du Groenland</standard>
 					<daylight>heure d’été de l’Est du Groenland</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HEG</generic>
-					<standard draft="unconfirmed">HNEG</standard>
-					<daylight draft="unconfirmed">HEEG</daylight>
-				</short>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
@@ -4219,11 +4153,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de l’Ouest du Groenland</standard>
 					<daylight>heure d’été de l’Ouest du Groenland</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HOG</generic>
-					<standard draft="unconfirmed">HNOG</standard>
-					<daylight draft="unconfirmed">HEOG</daylight>
-				</short>
 			</metazone>
 			<metazone type="Guam">
 				<long>
@@ -4240,17 +4169,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure du Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>heure normale d’Hawaï - Aléoutiennes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>heure d’Hawaï - Aléoutiennes</generic>
 					<standard>heure normale d’Hawaï - Aléoutiennes</standard>
 					<daylight>heure d’été d’Hawaï - Aléoutiennes</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HHA</generic>
-					<standard draft="unconfirmed">HNHA</standard>
-					<daylight draft="unconfirmed">HEHA</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
@@ -4439,11 +4368,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale du Pacifique mexicain</standard>
 					<daylight>heure d’été du Pacifique mexicain</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HPMX</generic>
-					<standard draft="unconfirmed">HNPMX</standard>
-					<daylight draft="unconfirmed">HEPMX</daylight>
-				</short>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
@@ -4494,11 +4418,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure normale de Terre-Neuve</standard>
 					<daylight>heure d’été de Terre-Neuve</daylight>
 				</long>
-				<short>
-					<generic draft="unconfirmed">HTN</generic>
-					<standard draft="unconfirmed">HNTN</standard>
-					<daylight draft="unconfirmed">HETN</daylight>
-				</short>
 			</metazone>
 			<metazone type="Niue">
 				<long>
@@ -4710,6 +4629,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure de Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>heure de Turquie</generic>
+					<standard>heure normale de Turquie</standard>
+					<daylight>heure avancée de Turquie</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>heure du Turkménistan</generic>
@@ -4885,10 +4811,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -6489,6 +6416,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dollar zimbabwéen</displayName>
 				<displayName count="other">dollars zimbabwéens</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>or du Zimbabwe</displayName>
+				<displayName count="one">or du Zimbabwe</displayName>
+				<displayName count="other">or du Zimbabwe</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">dollar zimbabwéen (2009)</displayName>
 				<displayName count="one" draft="contributed">dollar zimbabwéen (2009)</displayName>
@@ -6754,11 +6686,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0} items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parts</displayName>
+				<unitPattern count="one">{0} parts</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
-				<displayName>parts par million</displayName>
-				<unitPattern count="one">{0} part par million</unitPattern>
-				<unitPattern count="other">{0} parts par million</unitPattern>
+				<displayName>parties par million</displayName>
+				<unitPattern count="one">{0} partie par million</unitPattern>
+				<unitPattern count="other">{0} parties par million</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<gender>masculine</gender>
@@ -6784,6 +6721,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mole</unitPattern>
 				<unitPattern count="other">{0} moles</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de glucose</displayName>
+				<unitPattern count="one">{0} de glucose</unitPattern>
+				<unitPattern count="other">{0} de glucose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litres au kilomètre</displayName>
@@ -7405,6 +7347,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimètre de mercure</unitPattern>
 				<unitPattern count="other">{0} millimètres de mercure</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de mercure</displayName>
+				<unitPattern count="one">{0} de mercure</unitPattern>
+				<unitPattern count="other">{0} de mercure</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>livres-force par pouce carré</displayName>
 				<unitPattern count="one">{0} livre-force par pouce carré</unitPattern>
@@ -7609,6 +7556,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} tasse métrique</unitPattern>
 				<unitPattern count="other">{0} tasses métriques</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>onces liquides métriques</displayName>
+				<unitPattern count="one">{0} once liquide métrique</unitPattern>
+				<unitPattern count="other">{0} onces liquides métriques</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acres-pieds</displayName>
 				<unitPattern count="one">{0} acre-pied</unitPattern>
@@ -7715,23 +7667,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} quart impérial</unitPattern>
 				<unitPattern count="other">{0} quarts impériaux</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>stéradians</displayName>
+				<unitPattern count="one">{0} stéradian</unitPattern>
+				<unitPattern count="other">{0} stéradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calories [IT]</displayName>
+				<unitPattern count="one">{0} calorie [IT]</unitPattern>
+				<unitPattern count="other">{0} calories [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogrammes-force</displayName>
+				<unitPattern count="one">{0} kilogramme-force</unitPattern>
+				<unitPattern count="other">{0} kilogrammes-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>lumière</displayName>
-				<unitPattern count="one">{0} lumière</unitPattern>
-				<unitPattern count="other">{0} lumière</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
-				<displayName>parts par milliard</displayName>
-				<unitPattern count="one">{0} part par milliard</unitPattern>
-				<unitPattern count="other">{0} parts par milliard</unitPattern>
+				<displayName>parties par milliard</displayName>
+				<unitPattern count="one">{0} partie par milliard</unitPattern>
+				<unitPattern count="other">{0} parties par milliard</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>nuits</displayName>
-				<unitPattern count="one">{0} nuit</unitPattern>
-				<unitPattern count="other">{0} nuits</unitPattern>
 				<perUnitPattern>{0} par nuit</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7837,7 +7848,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} items</unitPattern>
 				<unitPattern count="other">{0} items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<unitPattern count="one">{0} parts</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="other">{0} ppm</unitPattern>
 			</unit>
@@ -7857,6 +7872,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -8308,6 +8326,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>lb/po²</displayName>
 				<unitPattern count="one">{0} lb/po²</unitPattern>
@@ -8540,6 +8563,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt imp.</unitPattern>
 				<unitPattern count="other">{0} qt imp.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>lumière</displayName>
 				<unitPattern count="one">{0} lumière</unitPattern>
@@ -8630,7 +8666,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}item</unitPattern>
 				<unitPattern count="other">{0}items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<unitPattern count="one">{0} parts</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -8646,6 +8686,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}l/km</unitPattern>
 				<unitPattern count="other">{0}l/km</unitPattern>
@@ -9023,6 +9066,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0} lb/po²</unitPattern>
 				<unitPattern count="other">{0} lb/po²</unitPattern>
@@ -9227,20 +9275,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt imp.</unitPattern>
 				<unitPattern count="other">{0}qt imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>lumière</displayName>
-				<unitPattern count="one">{0} lumière</unitPattern>
-				<unitPattern count="other">{0} lumière</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>nuits</displayName>
 				<unitPattern count="one">{0}nuit</unitPattern>
 				<unitPattern count="other">{0}nuits</unitPattern>
-				<perUnitPattern>{0}/nuit</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/fr_CA.xml b/make/data/cldr/common/main/fr_CA.xml
index f873e9d2394..ec19a4185c9 100644
--- a/make/data/cldr/common/main/fr_CA.xml
+++ b/make/data/cldr/common/main/fr_CA.xml
@@ -13,7 +13,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
-			<localeKeyTypePattern>{0} : {1}</localeKeyTypePattern>
+			<localeKeyTypePattern>{0} : {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
 			<language type="ady">adygué</language>
@@ -48,6 +48,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kl">kalaallisut</language>
 			<language type="ks">kashmiri</language>
 			<language type="ksb">chambala</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="liv">live</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lzh">chinois classique</language>
@@ -145,19 +146,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="VI">îles Vierges américaines</territory>
 			<territory type="VN">Vietnam</territory>
 		</territories>
+		<keys>
+			<key type="em">Présentation des émojis</key>
+		</keys>
 		<types>
-			<type key="collation" type="big5han">ordre de tri chinois traditionnel - Big5</type>
+			<type key="collation" type="compat" scope="core">par compatibilité</type>
 			<type key="collation" type="dictionary">ordre de tri du dictionnaire</type>
+			<type key="collation" type="dictionary" scope="core">du dictionnaire</type>
 			<type key="collation" type="eor">ordre multilingue européen</type>
-			<type key="collation" type="gb2312han">ordre de tri chinois simplifié - GB2312</type>
 			<type key="collation" type="phonebook">ordre de tri de l’annuaire</type>
+			<type key="collation" type="phonebook" scope="core">de l’annuaire</type>
 			<type key="collation" type="pinyin">ordre de tri pinyin</type>
 			<type key="collation" type="searchjl" draft="contributed">Rechercher par consonne initiale en hangeul</type>
 			<type key="collation" type="stroke">ordre de tri des traits</type>
+			<type key="collation" type="stroke" scope="core">des traits</type>
 			<type key="collation" type="traditional">ordre de tri traditionnel</type>
 			<type key="collation" type="zhuyin">ordre de tri zhuyin</type>
 			<type key="d0" type="fwidth">pleine chasse</type>
 			<type key="d0" type="hwidth">demi-chasse</type>
+			<type key="em" type="emoji" scope="core">émoji</type>
 			<type key="m0" type="bgn">BGN (commission de toponymie des États-Unis)</type>
 			<type key="m0" type="ungegn">GENUNG</type>
 			<type key="numbers" type="gujr">chiffres gujaratis</type>
@@ -313,19 +320,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Bh">h 'h' B</dateFormatItem>
 						<dateFormatItem id="Bhm">h 'h' mm B</dateFormatItem>
 						<dateFormatItem id="Bhms">h 'h' mm 'min' ss 's' B</dateFormatItem>
+						<dateFormatItem id="EBh" draft="contributed">E h 'h' B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h 'h' mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h 'h' mm 'min' ss 's' B</dateFormatItem>
+						<dateFormatItem id="Eh" draft="contributed">E h 'h' a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h 'h' mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH 'h' mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h 'h' mm 'min' ss 's' a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH 'h' mm 'min' ss 's'</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">y-M G</dateFormatItem>
 						<dateFormatItem id="GyMd">y-MM-dd GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="h">h 'h' a</dateFormatItem>
 						<dateFormatItem id="H">HH 'h'</dateFormatItem>
 						<dateFormatItem id="hm">h 'h' mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH 'h' mm</dateFormatItem>
 						<dateFormatItem id="hms">h 'h' mm 'min' ss 's' a</dateFormatItem>
 						<dateFormatItem id="Hms">HH 'h' mm 'min' ss 's'</dateFormatItem>
+						<dateFormatItem id="hv" draft="contributed">h 'h' a v</dateFormatItem>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">E M-d</dateFormatItem>
 						<dateFormatItem id="MMd">MM-d</dateFormatItem>
@@ -536,13 +548,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Bh">h 'h' B</dateFormatItem>
 						<dateFormatItem id="Bhm">h 'h' mm B</dateFormatItem>
 						<dateFormatItem id="Bhms">h 'h' mm 'min' ss 's' B</dateFormatItem>
+						<dateFormatItem id="EBh">E h 'h' B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h 'h' mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h 'h' mm 'min' ss 's' B</dateFormatItem>
+						<dateFormatItem id="Eh">E h 'h' a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h 'h' mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH 'h' mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h 'h' mm 'min' ss 's' a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH 'h' mm 'min' ss 's'</dateFormatItem>
+						<dateFormatItem id="GyM">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMd">y-MM-dd GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="h">h 'h' a</dateFormatItem>
 						<dateFormatItem id="hm">h 'h' mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH 'h' mm</dateFormatItem>
@@ -552,6 +568,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Hmsv">HH 'h' mm 'min' ss 's' v</dateFormatItem>
 						<dateFormatItem id="hmv">h 'h' mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH 'h' mm v</dateFormatItem>
+						<dateFormatItem id="hv">h 'h' a v</dateFormatItem>
+						<dateFormatItem id="Hv">H 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
 						<dateFormatItem id="MEd">E MM-dd</dateFormatItem>
 						<dateFormatItem id="MMd">MM-dd</dateFormatItem>
@@ -802,6 +820,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM" draft="contributed">y-MM G</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
 						<dateFormatItem id="MEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="yyyyM">y-MM GGGGG</dateFormatItem>
@@ -1128,13 +1148,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>heure normale d’Afrique du Sud</standard>
 				</long>
 			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>heure d’Afrique de l’Ouest</generic>
-					<standard>heure normale d’Afrique de l’Ouest</standard>
-					<daylight>heure avancée d’Afrique de l’Ouest</daylight>
-				</long>
-			</metazone>
 			<metazone type="Alaska">
 				<long>
 					<generic>heure de l’Alaska</generic>
@@ -1266,6 +1279,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>heure normale de l’Atlantique</standard>
 					<daylight>heure avancée de l’Atlantique</daylight>
 				</long>
+				<short>
+					<generic>HA</generic>
+					<standard>HNA</standard>
+					<daylight>HAA</daylight>
+				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -1438,6 +1456,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>heure avancée de l’Ouest du Groenland</daylight>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>heure normale d’Hawaï-Aléoutiennes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>heure d’Hawaï-Aléoutiennes</generic>
@@ -1655,6 +1678,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>heure normale de Saint-Pierre-et-Miquelon</standard>
 					<daylight>heure avancée de Saint-Pierre-et-Miquelon</daylight>
 				</long>
+				<short>
+					<generic>HPM</generic>
+					<standard>HNPM</standard>
+					<daylight>HAPM</daylight>
+				</short>
 			</metazone>
 			<metazone type="Reunion">
 				<long>
@@ -1784,56 +1812,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 k¤</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber">0 k ¤</pattern>
-					<pattern type="1000" count="other">0 k¤</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">0 k ¤</pattern>
-					<pattern type="10000" count="one">00 k¤</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">00 k ¤</pattern>
-					<pattern type="10000" count="other">00 k¤</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">00 k ¤</pattern>
-					<pattern type="100000" count="one">000 k¤</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">000 k ¤</pattern>
-					<pattern type="100000" count="other">000 k¤</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">000 k ¤</pattern>
-					<pattern type="1000000" count="one">0 M¤</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber">0 M ¤</pattern>
-					<pattern type="1000000" count="other">0 M¤</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">0 M ¤</pattern>
-					<pattern type="10000000" count="one">00 M¤</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">00 M ¤</pattern>
-					<pattern type="10000000" count="other">00 M¤</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">00 M ¤</pattern>
-					<pattern type="100000000" count="one">000 M¤</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber">000 M ¤</pattern>
-					<pattern type="100000000" count="other">000 M¤</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">000 M ¤</pattern>
-					<pattern type="1000000000" count="one">0 G¤</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">0 G ¤</pattern>
-					<pattern type="1000000000" count="other">0 G¤</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0 G ¤</pattern>
-					<pattern type="10000000000" count="one">00 G¤</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">00 G ¤</pattern>
-					<pattern type="10000000000" count="other">00 G¤</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00 G ¤</pattern>
-					<pattern type="100000000000" count="one">000 G¤</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">000 G ¤</pattern>
-					<pattern type="100000000000" count="other">000 G¤</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000 G ¤</pattern>
-					<pattern type="1000000000000" count="one">0 T¤</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">0 T ¤</pattern>
-					<pattern type="1000000000000" count="other">0 T¤</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0 T ¤</pattern>
-					<pattern type="10000000000000" count="one">00 T¤</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">00 T ¤</pattern>
-					<pattern type="10000000000000" count="other">00 T¤</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00 T ¤</pattern>
-					<pattern type="100000000000000" count="one">000 T¤</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">000 T ¤</pattern>
-					<pattern type="100000000000000" count="other">000 T¤</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000 T ¤</pattern>
+					<pattern type="1000" count="one">0 k ¤</pattern>
+					<pattern type="1000" count="other">0 k ¤</pattern>
+					<pattern type="10000" count="one">00 k ¤</pattern>
+					<pattern type="10000" count="other">00 k ¤</pattern>
+					<pattern type="100000" count="one">000 k ¤</pattern>
+					<pattern type="100000" count="other">000 k ¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0 G ¤</pattern>
+					<pattern type="1000000000" count="other">0 G ¤</pattern>
+					<pattern type="10000000000" count="one">00 G ¤</pattern>
+					<pattern type="10000000000" count="other">00 G ¤</pattern>
+					<pattern type="100000000000" count="one">000 G ¤</pattern>
+					<pattern type="100000000000" count="other">000 G ¤</pattern>
+					<pattern type="1000000000000" count="one">0 T ¤</pattern>
+					<pattern type="1000000000000" count="other">0 T ¤</pattern>
+					<pattern type="10000000000000" count="one">00 T ¤</pattern>
+					<pattern type="10000000000000" count="other">00 T ¤</pattern>
+					<pattern type="100000000000000" count="one">000 T ¤</pattern>
+					<pattern type="100000000000000" count="other">000 T ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
+			<unitPattern count="one">{0} {1}</unitPattern>
+			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="AFN">
@@ -2031,6 +2037,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="one">{0} cube</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one" gender="feminine">{0} cube</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">{0} cubes</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other" gender="feminine">{0} cubes</compoundUnitPattern1>
+			</compoundUnit>
 			<unit type="acceleration-g-force">
 				<displayName>force g</displayName>
 			</unit>
@@ -2038,165 +2050,72 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mètre par seconde carrée</unitPattern>
 				<unitPattern count="other">{0} mètres par seconde carrée</unitPattern>
 			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one">{0} radian</unitPattern>
-				<unitPattern count="other">{0} radians</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<unitPattern count="one">{0} degré</unitPattern>
-				<unitPattern count="other">{0} degrés</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} kilomètre carré</unitPattern>
-				<unitPattern count="other">{0} kilomètres carrés</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="one">{0} hectare</unitPattern>
-				<unitPattern count="other">{0} hectares</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<unitPattern count="one">{0} mètre carré</unitPattern>
-				<unitPattern count="other">{0} mètres carrés</unitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<unitPattern count="one">{0} centimètre carré</unitPattern>
-				<unitPattern count="other">{0} centimètres carrés</unitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0} mille carré</unitPattern>
-				<unitPattern count="other">{0} milles carrés</unitPattern>
-			</unit>
 			<unit type="area-acre">
 				<displayName>acres</displayName>
-				<unitPattern count="one">{0} acre</unitPattern>
-				<unitPattern count="other">{0} acres</unitPattern>
+				<unitPattern count="one">{0} acre</unitPattern>
+				<unitPattern count="other">{0} acres</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>verges carrées</displayName>
-				<unitPattern count="one">{0} verge carrée</unitPattern>
-				<unitPattern count="other">{0} verges carrées</unitPattern>
+				<unitPattern count="one">{0} verge carrée</unitPattern>
+				<unitPattern count="other">{0} verges carrées</unitPattern>
 			</unit>
-			<unit type="area-square-foot">
-				<unitPattern count="one">{0} pied carré</unitPattern>
-				<unitPattern count="other">{0} pieds carrés</unitPattern>
+			<unit type="concentr-item">
+				<unitPattern count="one">{0} item</unitPattern>
+				<unitPattern count="other">{0} items</unitPattern>
 			</unit>
-			<unit type="area-square-inch">
-				<unitPattern count="one">{0} pouce carré</unitPattern>
-				<unitPattern count="other">{0} pouces carrés</unitPattern>
+			<unit type="concentr-part">
+				<unitPattern count="one" draft="contributed">{0} part</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} parts</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>parties par million</displayName>
-				<unitPattern count="one">{0} partie par million</unitPattern>
-				<unitPattern count="other">{0} parties par million</unitPattern>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one" draft="contributed">{0} de glucose</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} de glucose</unitPattern>
 			</unit>
-			<unit type="concentr-permille">
-				<unitPattern count="one">{0} pour mille</unitPattern>
-				<unitPattern count="other">{0} pour mille</unitPattern>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="one">{0} litre au kilomètre</unitPattern>
+				<unitPattern count="other">{0} litres au kilomètre</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>litres aux 100 kilomètres</displayName>
-				<unitPattern count="one">{0} litre aux 100 kilomètres</unitPattern>
-				<unitPattern count="other">{0} litres aux 100 kilomètres</unitPattern>
+				<unitPattern count="one">{0} litre aux 100 kilomètres</unitPattern>
+				<unitPattern count="other">{0} litres aux 100 kilomètres</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>milles au gallon</displayName>
-				<unitPattern count="one">{0} mille au gallon</unitPattern>
-				<unitPattern count="other">{0} milles au gallon</unitPattern>
+				<unitPattern count="one">{0} mille au gallon</unitPattern>
+				<unitPattern count="other">{0} milles au gallon</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>milles au gallon impérial</displayName>
-				<unitPattern count="one">{0} mille au gallon impérial</unitPattern>
-				<unitPattern count="other">{0} milles au gallon impérial</unitPattern>
+				<unitPattern count="one">{0} mille au gallon impérial</unitPattern>
+				<unitPattern count="other">{0} milles au gallon impérial</unitPattern>
 			</unit>
-			<unit type="digital-terabyte">
-				<unitPattern count="one">{0} téraoctet</unitPattern>
-				<unitPattern count="other">{0} téraoctets</unitPattern>
+			<unit type="duration-century">
+				<unitPattern count="one">{0} siècle</unitPattern>
+				<unitPattern count="other">{0} siècles</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<unitPattern count="one">{0} térabit</unitPattern>
-				<unitPattern count="other">{0} térabits</unitPattern>
+			<unit type="duration-decade">
+				<unitPattern count="one">{0} décennie</unitPattern>
+				<unitPattern count="other">{0} décennies</unitPattern>
 			</unit>
-			<unit type="digital-gigabyte">
-				<unitPattern count="one">{0} gigaoctet</unitPattern>
-				<unitPattern count="other">{0} gigaoctets</unitPattern>
+			<unit type="duration-year">
+				<unitPattern count="one">{0} an</unitPattern>
+				<unitPattern count="other">{0} ans</unitPattern>
 			</unit>
-			<unit type="digital-gigabit">
-				<unitPattern count="one">{0} gigabit</unitPattern>
-				<unitPattern count="other">{0} gigabits</unitPattern>
+			<unit type="duration-quarter">
+				<unitPattern count="one">{0} trimestre</unitPattern>
+				<unitPattern count="other">{0} trimestres</unitPattern>
 			</unit>
-			<unit type="digital-megabyte">
-				<unitPattern count="one">{0} mégaoctet</unitPattern>
-				<unitPattern count="other">{0} mégaoctets</unitPattern>
-			</unit>
-			<unit type="digital-megabit">
-				<unitPattern count="one">{0} mégabit</unitPattern>
-				<unitPattern count="other">{0} mégabits</unitPattern>
-			</unit>
-			<unit type="digital-kilobyte">
-				<unitPattern count="one">{0} kilooctet</unitPattern>
-				<unitPattern count="other">{0} kilooctets</unitPattern>
-			</unit>
-			<unit type="digital-kilobit">
-				<unitPattern count="one">{0} kilobit</unitPattern>
-				<unitPattern count="other">{0} kilobits</unitPattern>
-			</unit>
-			<unit type="digital-byte">
-				<unitPattern count="one">{0} octet</unitPattern>
-				<unitPattern count="other">{0} octets</unitPattern>
-			</unit>
-			<unit type="digital-bit">
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bits</unitPattern>
-			</unit>
-			<unit type="duration-month">
-				<unitPattern count="one">{0} mois</unitPattern>
-				<unitPattern count="other">{0} mois</unitPattern>
-			</unit>
-			<unit type="duration-week">
-				<unitPattern count="one">{0} semaine</unitPattern>
-				<unitPattern count="other">{0} semaines</unitPattern>
-			</unit>
-			<unit type="duration-day">
-				<unitPattern count="one">{0} jour</unitPattern>
-				<unitPattern count="other">{0} jours</unitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<unitPattern count="one">{0} heure</unitPattern>
-				<unitPattern count="other">{0} heures</unitPattern>
+			<unit type="duration-minute">
+				<unitPattern count="one">{0} minute</unitPattern>
+				<unitPattern count="other">{0} minutes</unitPattern>
 			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one">{0} seconde</unitPattern>
 				<unitPattern count="other">{0} secondes</unitPattern>
 				<perUnitPattern>{0} à la seconde</perUnitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="one">{0} milliseconde</unitPattern>
-				<unitPattern count="other">{0} millisecondes</unitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<unitPattern count="one">{0} microseconde</unitPattern>
-				<unitPattern count="other">{0} microsecondes</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0} nanoseconde</unitPattern>
-				<unitPattern count="other">{0} nanosecondes</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<unitPattern count="one">{0} ampère</unitPattern>
-				<unitPattern count="other">{0} ampères</unitPattern>
-			</unit>
-			<unit type="electric-milliampere">
-				<unitPattern count="one">{0} milliampère</unitPattern>
-				<unitPattern count="other">{0} milliampères</unitPattern>
-			</unit>
-			<unit type="electric-ohm">
-				<unitPattern count="one">{0} ohm</unitPattern>
-				<unitPattern count="other">{0} ohms</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<unitPattern count="one">{0} volt</unitPattern>
-				<unitPattern count="other">{0} volts</unitPattern>
-			</unit>
 			<unit type="energy-kilocalorie">
 				<unitPattern count="one">{0} kilocalorie</unitPattern>
 				<unitPattern count="other">{0} kilocalories</unitPattern>
@@ -2229,102 +2148,76 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-therm-us">
 				<displayName>therms américains</displayName>
-				<unitPattern count="one">{0} therm américain</unitPattern>
-				<unitPattern count="other">{0} therms américains</unitPattern>
+				<unitPattern count="one">{0} therm américain</unitPattern>
+				<unitPattern count="other">{0} therms américains</unitPattern>
 			</unit>
-			<unit type="frequency-gigahertz">
-				<unitPattern count="one">{0} gigahertz</unitPattern>
-				<unitPattern count="other">{0} gigahertz</unitPattern>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<unitPattern count="one">{0} kilowatt-heure pour 100 kilomètres</unitPattern>
+				<unitPattern count="other">{0} kilowatt-heures pour 100 kilomètres</unitPattern>
 			</unit>
-			<unit type="frequency-megahertz">
-				<unitPattern count="one">{0} mégahertz</unitPattern>
-				<unitPattern count="other">{0} mégahertz</unitPattern>
+			<unit type="graphics-em">
+				<unitPattern count="one">{0} cadratin</unitPattern>
+				<unitPattern count="other">{0} cadratins</unitPattern>
 			</unit>
-			<unit type="frequency-kilohertz">
-				<unitPattern count="one">{0} kilohertz</unitPattern>
-				<unitPattern count="other">{0} kilohertz</unitPattern>
+			<unit type="graphics-pixel">
+				<unitPattern count="one">{0} pixel</unitPattern>
+				<unitPattern count="other">{0} pixels</unitPattern>
 			</unit>
-			<unit type="frequency-hertz">
-				<unitPattern count="one">{0} hertz</unitPattern>
-				<unitPattern count="other">{0} hertz</unitPattern>
+			<unit type="graphics-megapixel">
+				<unitPattern count="one">{0} mégapixel</unitPattern>
+				<unitPattern count="other">{0} mégapixels</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<unitPattern count="one">{0} pixel par centimètre</unitPattern>
+				<unitPattern count="other">{0} pixels par centimètre</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<unitPattern count="one">{0} pixel par pouce</unitPattern>
+				<unitPattern count="other">{0} pixels par pouce</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-centimeter">
+				<unitPattern count="one">{0} point par centimètre</unitPattern>
+				<unitPattern count="other">{0} points par centimètre</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-inch">
+				<unitPattern count="one">{0} point par pouce</unitPattern>
+				<unitPattern count="other">{0} points par pouce</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>point</displayName>
+				<unitPattern count="one">{0} point</unitPattern>
+				<unitPattern count="other">{0} points</unitPattern>
 			</unit>
-			<unit type="length-kilometer">
-				<unitPattern count="one">{0} kilomètre</unitPattern>
-				<unitPattern count="other">{0} kilomètres</unitPattern>
-			</unit>
-			<unit type="length-meter">
-				<unitPattern count="one">{0} mètre</unitPattern>
-				<unitPattern count="other">{0} mètres</unitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<unitPattern count="one">{0} décimètre</unitPattern>
-				<unitPattern count="other">{0} décimètres</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<unitPattern count="one">{0} centimètre</unitPattern>
-				<unitPattern count="other">{0} centimètres</unitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<unitPattern count="one">{0} millimètre</unitPattern>
-				<unitPattern count="other">{0} millimètres</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0} micromètre</unitPattern>
-				<unitPattern count="other">{0} micromètres</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<unitPattern count="one">{0} nanomètre</unitPattern>
-				<unitPattern count="other">{0} nanomètres</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0} picomètre</unitPattern>
-				<unitPattern count="other">{0} picomètres</unitPattern>
+			<unit type="length-earth-radius">
+				<unitPattern count="one">{0} rayon terrestre</unitPattern>
+				<unitPattern count="other">{0} rayons terrestres</unitPattern>
 			</unit>
 			<unit type="length-mile">
 				<displayName>mille</displayName>
-				<unitPattern count="one">{0} mille</unitPattern>
-				<unitPattern count="other">{0} milles</unitPattern>
+				<unitPattern count="one">{0} mille</unitPattern>
+				<unitPattern count="other">{0} milles</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<gender>feminine</gender>
 				<displayName>verges</displayName>
 				<unitPattern count="one">{0} verge</unitPattern>
-				<unitPattern count="other">{0} verges</unitPattern>
+				<unitPattern count="other">{0} verges</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<unitPattern count="one">{0} pied</unitPattern>
-				<unitPattern count="other">{0} pieds</unitPattern>
+				<unitPattern count="one">{0} pied</unitPattern>
+				<unitPattern count="other">{0} pieds</unitPattern>
 			</unit>
-			<unit type="length-inch">
-				<unitPattern count="one">{0} pouce</unitPattern>
-				<unitPattern count="other">{0} pouces</unitPattern>
+			<unit type="length-point">
+				<unitPattern count="one">{0} point typographique</unitPattern>
+				<unitPattern count="other">{0} points typographiques</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0} parsec</unitPattern>
-				<unitPattern count="other">{0} parsecs</unitPattern>
+			<unit type="light-candela">
+				<unitPattern count="one">{0} candela</unitPattern>
+				<unitPattern count="other">{0} candelas</unitPattern>
 			</unit>
-			<unit type="length-light-year">
-				<unitPattern count="one">{0} année-lumière</unitPattern>
-				<unitPattern count="other">{0} années-lumière</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} unité astronomique</unitPattern>
-				<unitPattern count="other">{0} unités astronomiques</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0} mille marin</unitPattern>
-				<unitPattern count="other">{0} milles marins</unitPattern>
-			</unit>
-			<unit type="light-lux">
-				<unitPattern count="one">{0} lux</unitPattern>
-				<unitPattern count="other">{0} lux</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<unitPattern count="one">{0} kilogramme</unitPattern>
-				<unitPattern count="other">{0} kilogrammes</unitPattern>
+			<unit type="light-lumen">
+				<unitPattern count="one">{0} lumen</unitPattern>
+				<unitPattern count="other">{0} lumens</unitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<unitPattern count="one">{0} gramme</unitPattern>
@@ -2342,10 +2235,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} stone</unitPattern>
 				<unitPattern count="other">{0} stone</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="one">{0} livre</unitPattern>
-				<unitPattern count="other">{0} livres</unitPattern>
-			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0} once</unitPattern>
 				<unitPattern count="other">{0} onces</unitPattern>
@@ -2365,41 +2254,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} gigawatt</unitPattern>
 				<unitPattern count="other">{0} gigawatts</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<unitPattern count="one">{0} mégawatt</unitPattern>
-				<unitPattern count="other">{0} mégawatts</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<unitPattern count="one">{0} kilowatt</unitPattern>
-				<unitPattern count="other">{0} kilowatts</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="one">{0} watt</unitPattern>
-				<unitPattern count="other">{0} watts</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<unitPattern count="one">{0} milliwatt</unitPattern>
-				<unitPattern count="other">{0} milliwatts</unitPattern>
-			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} cheval-vapeur</unitPattern>
 				<unitPattern count="other">{0} chevaux-vapeur</unitPattern>
 			</unit>
-			<unit type="pressure-inch-ofhg">
-				<unitPattern count="one">{0} pouce de mercure</unitPattern>
-				<unitPattern count="other">{0} pouces de mercure</unitPattern>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one" draft="contributed">{0} de mercure</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} de mercure</unitPattern>
 			</unit>
-			<unit type="pressure-millibar">
-				<unitPattern count="one">{0} millibar</unitPattern>
-				<unitPattern count="other">{0} millibars</unitPattern>
+			<unit type="pressure-pound-force-per-square-inch">
+				<unitPattern count="one">{0} livre-force par pouce carré</unitPattern>
+				<unitPattern count="other">{0} livres-force par pouce carré</unitPattern>
 			</unit>
-			<unit type="pressure-atmosphere">
-				<unitPattern count="one">{0} atmosphère</unitPattern>
-				<unitPattern count="other">{0} atmosphères</unitPattern>
+			<unit type="pressure-bar">
+				<unitPattern count="one">{0} bar</unitPattern>
+				<unitPattern count="other">{0} bars</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<unitPattern count="one">{0} hectopascal</unitPattern>
-				<unitPattern count="other">{0} hectopascals</unitPattern>
+			<unit type="pressure-pascal">
+				<unitPattern count="one">{0} pascal</unitPattern>
+				<unitPattern count="other">{0} pascals</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilomètres à l’heure</displayName>
@@ -2415,59 +2288,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mille à l’heure</unitPattern>
 				<unitPattern count="other">{0} milles à l’heure</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">{0} degré Beaufort</unitPattern>
+				<unitPattern count="other">{0} degrés Beaufort</unitPattern>
+			</unit>
 			<unit type="temperature-generic">
 				<displayName>°</displayName>
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
-			<unit type="temperature-celsius">
-				<unitPattern count="one">{0} degré Celsius</unitPattern>
-				<unitPattern count="other">{0} degrés Celsius</unitPattern>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<unitPattern count="one">{0} degré Fahrenheit</unitPattern>
-				<unitPattern count="other">{0} degrés Fahrenheit</unitPattern>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0} kilomètre cube</unitPattern>
-				<unitPattern count="other">{0} kilomètres cubes</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<unitPattern count="one">{0} mètre cube</unitPattern>
-				<unitPattern count="other">{0} mètres cubes</unitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0} centimètre cube</unitPattern>
-				<unitPattern count="other">{0} centimètres cubes</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} mille cube</unitPattern>
-				<unitPattern count="other">{0} milles cubes</unitPattern>
+			<unit type="torque-pound-force-foot">
+				<unitPattern count="one">{0} livre-force-pied</unitPattern>
+				<unitPattern count="other">{0} livres-force-pieds</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName>verges cubes</displayName>
 				<unitPattern count="one">{0} verge cube</unitPattern>
-				<unitPattern count="other">{0} verges cubes</unitPattern>
+				<unitPattern count="other">{0} verges cubes</unitPattern>
 			</unit>
-			<unit type="volume-cubic-foot">
-				<unitPattern count="one">{0} pied cube</unitPattern>
-				<unitPattern count="other">{0} pieds cubes</unitPattern>
+			<unit type="volume-deciliter">
+				<unitPattern count="one">{0} décilitre</unitPattern>
+				<unitPattern count="other">{0} décilitres</unitPattern>
 			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0} pouce cube</unitPattern>
-				<unitPattern count="other">{0} pouces cubes</unitPattern>
+			<unit type="volume-centiliter">
+				<unitPattern count="one">{0} centilitre</unitPattern>
+				<unitPattern count="other">{0} centilitres</unitPattern>
 			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0} mégalitre</unitPattern>
-				<unitPattern count="other">{0} mégalitres</unitPattern>
+			<unit type="volume-milliliter">
+				<unitPattern count="one">{0} millilitre</unitPattern>
+				<unitPattern count="other">{0} millilitres</unitPattern>
 			</unit>
-			<unit type="volume-hectoliter">
-				<unitPattern count="one">{0} hectolitre</unitPattern>
-				<unitPattern count="other">{0} hectolitres</unitPattern>
+			<unit type="volume-pint-metric">
+				<unitPattern count="one">{0} pinte métrique</unitPattern>
+				<unitPattern count="other">{0} pintes métriques</unitPattern>
 			</unit>
-			<unit type="volume-liter">
-				<unitPattern count="one">{0} litre</unitPattern>
-				<unitPattern count="other">{0} litres</unitPattern>
+			<unit type="volume-cup-metric">
+				<unitPattern count="one">{0} tasse métrique</unitPattern>
+				<unitPattern count="other">{0} tasses métriques</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} once liquide métrique</unitPattern>
+				<unitPattern count="other">{0} onces liquides métriques</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} acre-pied</unitPattern>
+				<unitPattern count="other">{0} acres-pieds</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one">{0} gallon</unitPattern>
+				<unitPattern count="other">{0} gallons</unitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>gallon impérial</displayName>
@@ -2475,30 +2344,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-quart">
 				<gender>feminine</gender>
 				<displayName>pintes</displayName>
-				<unitPattern count="one">{0} pinte</unitPattern>
-				<unitPattern count="other">{0} pintes</unitPattern>
+				<unitPattern count="one">{0} pinte</unitPattern>
+				<unitPattern count="other">{0} pintes</unitPattern>
 			</unit>
 			<unit type="volume-pint">
 				<displayName>chopine</displayName>
-				<unitPattern count="one">{0} chopine</unitPattern>
-				<unitPattern count="other">{0} chopines</unitPattern>
+				<unitPattern count="one">{0} chopine</unitPattern>
+				<unitPattern count="other">{0} chopines</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one">{0} tasse</unitPattern>
+				<unitPattern count="other">{0} tasses</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="one">{0} once liquide</unitPattern>
+				<unitPattern count="other">{0} onces liquides</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<unitPattern count="one">{0} cuillère à soupe</unitPattern>
+				<unitPattern count="other">{0} cuillères à soupe</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>cuillères à thé</displayName>
-				<unitPattern count="one">{0} cuillère à thé</unitPattern>
-				<unitPattern count="other">{0} cuillères à thé</unitPattern>
+				<unitPattern count="one">{0} cuillère à thé</unitPattern>
+				<unitPattern count="other">{0} cuillères à thé</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
 				<displayName>cuillère à dessert</displayName>
+				<unitPattern count="one">{0} cuillère à dessert</unitPattern>
+				<unitPattern count="other">{0} cuillères à dessert</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<unitPattern count="one">{0} cuillère à dessert impériale</unitPattern>
+				<unitPattern count="other">{0} cuillères à dessert impériales</unitPattern>
 			</unit>
 			<unit type="volume-drop">
 				<displayName>goutte</displayName>
+				<unitPattern count="one">{0} goutte</unitPattern>
+				<unitPattern count="other">{0} gouttes</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<unitPattern count="one">{0} drachme</unitPattern>
+				<unitPattern count="other">{0} drachmes</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
 				<displayName>gobelet doseur</displayName>
+				<unitPattern count="one">{0} gobelet doseur</unitPattern>
+				<unitPattern count="other">{0} gobelets doseurs</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
 				<displayName>pincée</displayName>
+				<unitPattern count="one">{0} pincée</unitPattern>
+				<unitPattern count="other">{0} pincées</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<gender>feminine</gender>
@@ -2506,10 +2403,66 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} pinte impériale</unitPattern>
 				<unitPattern count="other">{0} pintes impériales</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>parties par milliard</displayName>
-				<unitPattern count="one">{0} partie par milliard</unitPattern>
-				<unitPattern count="other">{0} parties par milliard</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one" draft="contributed">{0} stéradian</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} stéradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one" draft="contributed">{0} katal</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one" draft="contributed">{0} coulomb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one" draft="contributed">{0} farad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one" draft="contributed">{0} henry</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one" draft="contributed">{0} siemens</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<unitPattern count="one" draft="contributed">{0} calorie [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} calories [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one" draft="contributed">{0} becquerel</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one" draft="contributed">{0} sievert</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one" draft="contributed">{0} gray</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one" draft="contributed">{0} kilogramme-force</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kilogrammes-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} tesla</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} weber</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} partie par milliard</unitPattern>
+				<unitPattern count="other">{0} parties par milliard</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<unitPattern count="one">{0} nuit</unitPattern>
+				<unitPattern count="other">{0} nuits</unitPattern>
+				<perUnitPattern>{0} par nuit</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>point cardinal</displayName>
@@ -2526,165 +2479,227 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} m/s²</unitPattern>
 				<unitPattern count="other">{0} m/s²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<unitPattern count="one">{0} tr</unitPattern>
+				<unitPattern count="other">{0} tr</unitPattern>
+			</unit>
 			<unit type="angle-radian">
-				<unitPattern count="one">{0} rad</unitPattern>
-				<unitPattern count="other">{0} rad</unitPattern>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} km²</unitPattern>
-				<unitPattern count="other">{0} km²</unitPattern>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<unitPattern count="one">{0} ha</unitPattern>
-				<unitPattern count="other">{0} ha</unitPattern>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<unitPattern count="one">{0} m²</unitPattern>
-				<unitPattern count="other">{0} m²</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<unitPattern count="one">{0} cm²</unitPattern>
-				<unitPattern count="other">{0} cm²</unitPattern>
+				<unitPattern count="one">{0} cm²</unitPattern>
+				<unitPattern count="other">{0} cm²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<unitPattern count="one">{0} mi²</unitPattern>
-				<unitPattern count="other">{0} mi²</unitPattern>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
 			</unit>
 			<unit type="area-acre">
-				<unitPattern count="one">{0} ac</unitPattern>
-				<unitPattern count="other">{0} ac</unitPattern>
+				<unitPattern count="one">{0} ac</unitPattern>
+				<unitPattern count="other">{0} ac</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>vg²</displayName>
-				<unitPattern count="one">{0} vg²</unitPattern>
-				<unitPattern count="other">{0} vg²</unitPattern>
+				<unitPattern count="one">{0} vg²</unitPattern>
+				<unitPattern count="other">{0} vg²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0} pi²</unitPattern>
-				<unitPattern count="other">{0} pi²</unitPattern>
+				<unitPattern count="other">{0} pi²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<unitPattern count="one">{0} po²</unitPattern>
-				<unitPattern count="other">{0} po²</unitPattern>
+				<unitPattern count="one">{0} po²</unitPattern>
+				<unitPattern count="other">{0} po²</unitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<unitPattern count="one">{0} dounam</unitPattern>
+				<unitPattern count="other">{0} dounams</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
 				<displayName>carats</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<unitPattern count="one">{0} mg/dl</unitPattern>
+				<unitPattern count="other">{0} mg/dl</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<unitPattern count="one">{0} mmol/l</unitPattern>
+				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
 			<unit type="concentr-item">
-				<unitPattern count="one">{0} item</unitPattern>
-				<unitPattern count="other">{0} items</unitPattern>
+				<unitPattern count="one">{0} item</unitPattern>
+				<unitPattern count="other">{0} items</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<unitPattern count="one" draft="contributed">{0} part</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} ppm</unitPattern>
+				<unitPattern count="other">{0} ppm</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="other">{0} %</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
-				<unitPattern count="one">{0} ‰</unitPattern>
-				<unitPattern count="other">{0} ‰</unitPattern>
+				<unitPattern count="one">{0} ‰</unitPattern>
+				<unitPattern count="other">{0} ‰</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<unitPattern count="one">{0} ‱</unitPattern>
+				<unitPattern count="other">{0} ‱</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one" draft="contributed">{0} Glc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Glc</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<unitPattern count="one">{0} mi/gal</unitPattern>
-				<unitPattern count="other">{0} mi/gal</unitPattern>
+				<unitPattern count="one">{0} mi/gal</unitPattern>
+				<unitPattern count="other">{0} mi/gal</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<unitPattern count="one">{0} mi/gal imp.</unitPattern>
+				<unitPattern count="other">{0} mi/gal imp.</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<unitPattern count="one">{0} Po</unitPattern>
+				<unitPattern count="other">{0} Po</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<unitPattern count="one">{0} To</unitPattern>
-				<unitPattern count="other">{0} To</unitPattern>
+				<unitPattern count="one">{0} To</unitPattern>
+				<unitPattern count="other">{0} To</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>Tb</displayName>
-				<unitPattern count="one">{0} Tb</unitPattern>
-				<unitPattern count="other">{0} Tb</unitPattern>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<unitPattern count="one">{0} Go</unitPattern>
-				<unitPattern count="other">{0} Go</unitPattern>
+				<unitPattern count="one">{0} Go</unitPattern>
+				<unitPattern count="other">{0} Go</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
 				<displayName>Gb</displayName>
-				<unitPattern count="one">{0} Gb</unitPattern>
-				<unitPattern count="other">{0} Gb</unitPattern>
+				<unitPattern count="one">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<unitPattern count="one">{0} Mo</unitPattern>
-				<unitPattern count="other">{0} Mo</unitPattern>
+				<unitPattern count="one">{0} Mo</unitPattern>
+				<unitPattern count="other">{0} Mo</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
 				<displayName>Mb</displayName>
-				<unitPattern count="one">{0} Mb</unitPattern>
-				<unitPattern count="other">{0} Mb</unitPattern>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
-				<unitPattern count="one">{0} ko</unitPattern>
-				<unitPattern count="other">{0} ko</unitPattern>
+				<unitPattern count="one">{0} ko</unitPattern>
+				<unitPattern count="other">{0} ko</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
 				<displayName>kb</displayName>
-				<unitPattern count="one">{0} kb</unitPattern>
-				<unitPattern count="other">{0} kb</unitPattern>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<unitPattern count="one">{0} octet</unitPattern>
-				<unitPattern count="other">{0} octet</unitPattern>
+				<unitPattern count="one">{0} o</unitPattern>
+				<unitPattern count="other">{0} o</unitPattern>
 			</unit>
 			<unit type="digital-bit">
-				<unitPattern count="one">{0} bit</unitPattern>
-				<unitPattern count="other">{0} bit</unitPattern>
+				<unitPattern count="one">{0} bit</unitPattern>
+				<unitPattern count="other">{0} bit</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<unitPattern count="one">{0} an</unitPattern>
-				<unitPattern count="other">{0} ans</unitPattern>
+			<unit type="duration-century">
+				<unitPattern count="one">{0} s.</unitPattern>
+				<unitPattern count="other">{0} s.</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<unitPattern count="one">{0} déc.</unitPattern>
+				<unitPattern count="other">{0} déc.</unitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<unitPattern count="one">{0} trim.</unitPattern>
+				<unitPattern count="other">{0} trim.</unitPattern>
 			</unit>
 			<unit type="duration-month">
-				<unitPattern count="one">{0} m.</unitPattern>
-				<unitPattern count="other">{0} m.</unitPattern>
+				<unitPattern count="one">{0} m.</unitPattern>
+				<unitPattern count="other">{0} m.</unitPattern>
 			</unit>
 			<unit type="duration-week">
-				<unitPattern count="one">{0} sem.</unitPattern>
-				<unitPattern count="other">{0} sem.</unitPattern>
+				<unitPattern count="one">{0} sem.</unitPattern>
+				<unitPattern count="other">{0} sem.</unitPattern>
 			</unit>
 			<unit type="duration-day">
-				<unitPattern count="one">{0} j</unitPattern>
-				<unitPattern count="other">{0} j</unitPattern>
+				<unitPattern count="one">{0} j</unitPattern>
+				<unitPattern count="other">{0} j</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<unitPattern count="one">{0} h</unitPattern>
-				<unitPattern count="other">{0} h</unitPattern>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<unitPattern count="one">{0} min</unitPattern>
-				<unitPattern count="other">{0} min</unitPattern>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
 			<unit type="duration-second">
-				<unitPattern count="one">{0} s</unitPattern>
-				<unitPattern count="other">{0} s</unitPattern>
+				<unitPattern count="one">{0} s</unitPattern>
+				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<unitPattern count="one">{0} ms</unitPattern>
-				<unitPattern count="other">{0} ms</unitPattern>
+				<unitPattern count="one">{0} ms</unitPattern>
+				<unitPattern count="other">{0} ms</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<unitPattern count="one">{0} μs</unitPattern>
-				<unitPattern count="other">{0} μs</unitPattern>
+				<unitPattern count="one">{0} μs</unitPattern>
+				<unitPattern count="other">{0} μs</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<unitPattern count="one">{0} ns</unitPattern>
-				<unitPattern count="other">{0} ns</unitPattern>
+				<unitPattern count="one">{0} ns</unitPattern>
+				<unitPattern count="other">{0} ns</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<unitPattern count="one">{0} A</unitPattern>
-				<unitPattern count="other">{0} A</unitPattern>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<unitPattern count="one">{0} mA</unitPattern>
-				<unitPattern count="other">{0} mA</unitPattern>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<unitPattern count="one">{0} Ω</unitPattern>
-				<unitPattern count="other">{0} Ω</unitPattern>
+				<unitPattern count="one">{0} Ω</unitPattern>
+				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<unitPattern count="one">{0} V</unitPattern>
-				<unitPattern count="other">{0} V</unitPattern>
+				<unitPattern count="one">{0} V</unitPattern>
+				<unitPattern count="other">{0} V</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
 				<unitPattern count="one">{0} kcal</unitPattern>
@@ -2710,103 +2725,167 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} BTU</unitPattern>
 				<unitPattern count="other">{0} BTU</unitPattern>
 			</unit>
+			<unit type="energy-therm-us">
+				<unitPattern count="one">{0} therm US</unitPattern>
+				<unitPattern count="other">{0} therms US</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<unitPattern count="one">{0} lbf</unitPattern>
+				<unitPattern count="other">{0} lbf</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<unitPattern count="one">{0} N</unitPattern>
+				<unitPattern count="other">{0} N</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<unitPattern count="one">{0} kWh/100 km</unitPattern>
+				<unitPattern count="other">{0} kWh/100 km</unitPattern>
+			</unit>
 			<unit type="frequency-gigahertz">
-				<unitPattern count="one">{0} GHz</unitPattern>
-				<unitPattern count="other">{0} GHz</unitPattern>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<unitPattern count="one">{0} MHz</unitPattern>
-				<unitPattern count="other">{0} MHz</unitPattern>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<unitPattern count="one">{0} kHz</unitPattern>
-				<unitPattern count="other">{0} kHz</unitPattern>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<unitPattern count="one">{0} Hz</unitPattern>
-				<unitPattern count="other">{0} Hz</unitPattern>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<unitPattern count="one">{0} px</unitPattern>
+				<unitPattern count="other">{0} px</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<unitPattern count="one">{0} px/cm</unitPattern>
+				<unitPattern count="other">{0} px/cm</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<unitPattern count="one">{0} px/po</unitPattern>
+				<unitPattern count="other">{0} px/po</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<unitPattern count="one">{0} pt/cm</unitPattern>
 				<unitPattern count="other">{0} pt/cm</unitPattern>
 			</unit>
+			<unit type="graphics-dot-per-inch">
+				<unitPattern count="one">{0} pt/po</unitPattern>
+				<unitPattern count="other">{0} pt/po</unitPattern>
+			</unit>
+			<unit type="graphics-dot">
+				<unitPattern count="one">{0} pt</unitPattern>
+				<unitPattern count="other">{0} pt</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<unitPattern count="one">{0} R⊕</unitPattern>
+				<unitPattern count="other">{0} R⊕</unitPattern>
+			</unit>
 			<unit type="length-kilometer">
-				<unitPattern count="one">{0} km</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+				<unitPattern count="one">{0} km</unitPattern>
+				<unitPattern count="other">{0} km</unitPattern>
 			</unit>
 			<unit type="length-meter">
-				<unitPattern count="one">{0} m</unitPattern>
-				<unitPattern count="other">{0} m</unitPattern>
+				<unitPattern count="one">{0} m</unitPattern>
+				<unitPattern count="other">{0} m</unitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<unitPattern count="one">{0} dm</unitPattern>
-				<unitPattern count="other">{0} dm</unitPattern>
+				<unitPattern count="one">{0} dm</unitPattern>
+				<unitPattern count="other">{0} dm</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<unitPattern count="one">{0} cm</unitPattern>
-				<unitPattern count="other">{0} cm</unitPattern>
+				<unitPattern count="one">{0} cm</unitPattern>
+				<unitPattern count="other">{0} cm</unitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<unitPattern count="one">{0} mm</unitPattern>
-				<unitPattern count="other">{0} mm</unitPattern>
+				<unitPattern count="one">{0} mm</unitPattern>
+				<unitPattern count="other">{0} mm</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<unitPattern count="one">{0} μm</unitPattern>
-				<unitPattern count="other">{0} μm</unitPattern>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
+				<unitPattern count="one">{0} nm</unitPattern>
+				<unitPattern count="other">{0} nm</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
+				<unitPattern count="one">{0} pm</unitPattern>
+				<unitPattern count="other">{0} pm</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<unitPattern count="one">{0} mi</unitPattern>
-				<unitPattern count="other">{0} mi</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<displayName>vg</displayName>
 				<unitPattern count="one">{0} vg</unitPattern>
-				<unitPattern count="other">{0} vg</unitPattern>
+				<unitPattern count="other">{0} vg</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<unitPattern count="one">{0} pi</unitPattern>
-				<unitPattern count="other">{0} pi</unitPattern>
+				<unitPattern count="other">{0} pi</unitPattern>
 			</unit>
 			<unit type="length-inch">
-				<unitPattern count="one">{0} po</unitPattern>
-				<unitPattern count="other">{0} po</unitPattern>
+				<unitPattern count="one">{0} po</unitPattern>
+				<unitPattern count="other">{0} po</unitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<unitPattern count="one">{0} al</unitPattern>
-				<unitPattern count="other">{0} al</unitPattern>
+				<unitPattern count="one">{0} al</unitPattern>
+				<unitPattern count="other">{0} al</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<unitPattern count="one">{0} ua</unitPattern>
-				<unitPattern count="other">{0} ua</unitPattern>
+				<unitPattern count="other">{0} ua</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>NM</displayName>
 				<unitPattern count="one">{0} NM</unitPattern>
-				<unitPattern count="other">{0} NM</unitPattern>
+				<unitPattern count="other">{0} NM</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<unitPattern count="one">{0} smi</unitPattern>
+				<unitPattern count="other">{0} smi</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<unitPattern count="one">{0} pt typog.</unitPattern>
+				<unitPattern count="other">{0} pts typog.</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<unitPattern count="one">{0} R☉</unitPattern>
+				<unitPattern count="other">{0} R☉</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<unitPattern count="one">{0} lx</unitPattern>
-				<unitPattern count="other">{0} lx</unitPattern>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<unitPattern count="one">{0} cd</unitPattern>
+				<unitPattern count="other">{0} cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<unitPattern count="one">{0} lm</unitPattern>
+				<unitPattern count="other">{0} lm</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<unitPattern count="one">{0} L☉</unitPattern>
+				<unitPattern count="other">{0} L☉</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
 				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<unitPattern count="one">{0} kg</unitPattern>
-				<unitPattern count="other">{0} kg</unitPattern>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<unitPattern count="one">{0} g</unitPattern>
@@ -2826,8 +2905,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} tc</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<unitPattern count="one">{0} lb</unitPattern>
-				<unitPattern count="other">{0} lb</unitPattern>
+				<unitPattern count="one">{0} lb</unitPattern>
+				<unitPattern count="other">{0} lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<unitPattern count="one">{0} oz</unitPattern>
@@ -2841,6 +2920,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ct</unitPattern>
 				<unitPattern count="other">{0} ct</unitPattern>
 			</unit>
+			<unit type="mass-dalton">
+				<unitPattern count="one">{0} Da</unitPattern>
+				<unitPattern count="other">{0} Da</unitPattern>
+			</unit>
 			<unit type="mass-grain">
 				<unitPattern count="one">{0} grain</unitPattern>
 				<unitPattern count="other">{0} grains</unitPattern>
@@ -2850,20 +2933,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<unitPattern count="one">{0} MW</unitPattern>
-				<unitPattern count="other">{0} MW</unitPattern>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<unitPattern count="one">{0} kW</unitPattern>
-				<unitPattern count="other">{0} kW</unitPattern>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<unitPattern count="one">{0} W</unitPattern>
-				<unitPattern count="other">{0} W</unitPattern>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<unitPattern count="one">{0} mW</unitPattern>
-				<unitPattern count="other">{0} mW</unitPattern>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} ch</unitPattern>
@@ -2871,30 +2954,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>mm Hg</displayName>
-				<unitPattern count="one">{0} mm Hg</unitPattern>
-				<unitPattern count="other">{0} mm Hg</unitPattern>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
+				<unitPattern count="other">{0} mm Hg</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one" draft="contributed">{0} de Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} de Hg</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>psi</displayName>
 				<unitPattern count="one">{0} psi</unitPattern>
-				<unitPattern count="other">{0} psi</unitPattern>
+				<unitPattern count="other">{0} psi</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>po Hg</displayName>
 				<unitPattern count="one">{0} po Hg</unitPattern>
 				<unitPattern count="other">{0} po Hg</unitPattern>
 			</unit>
+			<unit type="pressure-bar">
+				<unitPattern count="one">{0} bar</unitPattern>
+				<unitPattern count="other">{0} bars</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
-				<unitPattern count="one">{0} mbar</unitPattern>
-				<unitPattern count="other">{0} mbar</unitPattern>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<unitPattern count="one">{0} atm</unitPattern>
+				<unitPattern count="other">{0} atm</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<unitPattern count="one">{0} kPa</unitPattern>
+				<unitPattern count="other">{0} kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0} MPa</unitPattern>
+				<unitPattern count="other">{0} MPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="one">{0} km/h</unitPattern>
-				<unitPattern count="other">{0} km/h</unitPattern>
+				<unitPattern count="one">{0} km/h</unitPattern>
+				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="one">{0} m/s</unitPattern>
@@ -2904,55 +3007,108 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
 			</unit>
+			<unit type="speed-knot">
+				<unitPattern count="one">{0} nd</unitPattern>
+				<unitPattern count="other">{0} nd</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
+				<displayName>Bf</displayName>
 				<unitPattern count="one">{0} Bf</unitPattern>
 				<unitPattern count="other">{0} Bf</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<unitPattern count="one">{0} °C</unitPattern>
-				<unitPattern count="other">{0} °C</unitPattern>
+				<unitPattern count="one">{0} °C</unitPattern>
+				<unitPattern count="other">{0} °C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<unitPattern count="one">{0} °F</unitPattern>
-				<unitPattern count="other">{0} °F</unitPattern>
+				<unitPattern count="one">{0} °F</unitPattern>
+				<unitPattern count="other">{0} °F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<unitPattern count="one">{0} K</unitPattern>
-				<unitPattern count="other">{0} K</unitPattern>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName>lb-pi</displayName>
-				<unitPattern count="one">{0} lb-pi</unitPattern>
-				<unitPattern count="other">{0} lb-pi</unitPattern>
+				<unitPattern count="one">{0} lb-pi</unitPattern>
+				<unitPattern count="other">{0} lb-pi</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<unitPattern count="one">{0} N⋅m</unitPattern>
+				<unitPattern count="other">{0} N⋅m</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
+				<unitPattern count="one">{0} km³</unitPattern>
+				<unitPattern count="other">{0} km³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
+				<unitPattern count="one">{0} m³</unitPattern>
+				<unitPattern count="other">{0} m³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<unitPattern count="one">{0} cm³</unitPattern>
-				<unitPattern count="other">{0} cm³</unitPattern>
+				<unitPattern count="one">{0} cm³</unitPattern>
+				<unitPattern count="other">{0} cm³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName>vg³</displayName>
 				<unitPattern count="one">{0} vg³</unitPattern>
-				<unitPattern count="other">{0} vg³</unitPattern>
+				<unitPattern count="other">{0} vg³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<unitPattern count="one">{0} pi³</unitPattern>
 				<unitPattern count="other">{0} pi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0} po³</unitPattern>
-				<unitPattern count="other">{0} po³</unitPattern>
+				<unitPattern count="one">{0} po³</unitPattern>
+				<unitPattern count="other">{0} po³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="one">{0} l</unitPattern>
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<unitPattern count="one">{0} mpt</unitPattern>
+				<unitPattern count="other">{0} mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<unitPattern count="one">{0} tm</unitPattern>
+				<unitPattern count="other">{0} tm</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one" draft="contributed">{0} fl oz m.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz m.</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} ac pi</unitPattern>
+				<unitPattern count="other">{0} ac pi</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>gal Imp</displayName>
@@ -2963,68 +3119,140 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-quart">
 				<displayName>pte</displayName>
 				<unitPattern count="one">{0} pte</unitPattern>
-				<unitPattern count="other">{0} pte</unitPattern>
+				<unitPattern count="other">{0} pte</unitPattern>
 			</unit>
 			<unit type="volume-pint">
 				<displayName>chop</displayName>
-				<unitPattern count="one">{0} chop</unitPattern>
-				<unitPattern count="other">{0} chop</unitPattern>
+				<unitPattern count="one">{0} chop</unitPattern>
+				<unitPattern count="other">{0} chop</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one">{0} tasse</unitPattern>
+				<unitPattern count="other">{0} tasses</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>oz liq.</displayName>
 				<unitPattern count="one">{0} oz liq.</unitPattern>
-				<unitPattern count="other">{0} oz liq.</unitPattern>
+				<unitPattern count="other">{0} oz liq.</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>oz liq imp.</displayName>
-				<unitPattern count="one">{0} oz liq imp.</unitPattern>
-				<unitPattern count="other">{0} oz liq imp.</unitPattern>
+				<unitPattern count="one">{0} oz liq imp.</unitPattern>
+				<unitPattern count="other">{0} oz liq imp.</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<unitPattern count="one">{0} c. à s.</unitPattern>
+				<unitPattern count="other">{0} c. à s.</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>c. à t.</displayName>
 				<unitPattern count="one">{0} c. à t.</unitPattern>
-				<unitPattern count="other">{0} c. à t.</unitPattern>
+				<unitPattern count="other">{0} c. à t.</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<unitPattern count="one">{0} bbl</unitPattern>
+				<unitPattern count="other">{0} bbl</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
 				<displayName>cuill. à d.</displayName>
-				<unitPattern count="one">{0} cuill. à d.</unitPattern>
-				<unitPattern count="other">{0} cuill. à d.</unitPattern>
+				<unitPattern count="one">{0} cuill. à d.</unitPattern>
+				<unitPattern count="other">{0} cuill. à d.</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>cuill. à d. imp.</displayName>
-				<unitPattern count="one">{0} cuill. à d. imp.</unitPattern>
-				<unitPattern count="other">{0} cuill. à d. imp.</unitPattern>
+				<unitPattern count="one">{0} cuill. à d. imp.</unitPattern>
+				<unitPattern count="other">{0} cuill. à d. imp.</unitPattern>
 			</unit>
 			<unit type="volume-drop">
 				<displayName>goutte</displayName>
-				<unitPattern count="one">{0} goutte</unitPattern>
-				<unitPattern count="other">{0} gouttes</unitPattern>
+				<unitPattern count="one">{0} goutte</unitPattern>
+				<unitPattern count="other">{0} gouttes</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>dram liquide</displayName>
-				<unitPattern count="one">{0} dram liq</unitPattern>
-				<unitPattern count="other">{0} dram liq</unitPattern>
+				<unitPattern count="one">{0} dram liq</unitPattern>
+				<unitPattern count="other">{0} dram liq</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
 				<displayName>gobelet doseur</displayName>
-				<unitPattern count="one">{0} gobelet doseur</unitPattern>
-				<unitPattern count="other">{0} gobelets doseurs</unitPattern>
+				<unitPattern count="one">{0} gobelet doseur</unitPattern>
+				<unitPattern count="other">{0} gobelets doseurs</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<unitPattern count="one">{0} pincée</unitPattern>
+				<unitPattern count="other">{0} pincées</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>pte imp</displayName>
 				<unitPattern count="one">{0} pte imp</unitPattern>
 				<unitPattern count="other">{0} pte imp</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<unitPattern count="one" draft="contributed">{0} sr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one" draft="contributed">{0} kat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one" draft="contributed">{0} C</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one" draft="contributed">{0} F</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one" draft="contributed">{0} H</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one" draft="contributed">{0} S</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<unitPattern count="one" draft="contributed">{0} cal-IT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one" draft="contributed">{0} Bq</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one" draft="contributed">{0} Sv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one" draft="contributed">{0} Gy</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one" draft="contributed">{0} kgf</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>p.p. 10⁹</displayName>
 				<unitPattern count="one">{0} p.p. 10⁹</unitPattern>
-				<unitPattern count="other">{0} p.p. 10⁹</unitPattern>
+				<unitPattern count="other">{0} p.p. 10⁹</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<unitPattern count="one">{0} nuit</unitPattern>
+				<unitPattern count="other">{0} nuits</unitPattern>
 			</unit>
 			<coordinateUnit>
-				<coordinateUnitPattern type="east">{0} E.</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} N.</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} S.</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} O.</coordinateUnitPattern>
+				<coordinateUnitPattern type="east">{0} E.</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N.</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S.</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} O.</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
@@ -3036,6 +3264,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}vg²</unitPattern>
 				<unitPattern count="other">{0}vg²</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<unitPattern count="one" draft="contributed">{0}part</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}parts</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<unitPattern count="one">{0}%</unitPattern>
+				<unitPattern count="other">{0}%</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one" draft="contributed">{0}Glc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Glc</unitPattern>
+			</unit>
 			<unit type="digital-terabit">
 				<unitPattern count="one">{0}Tb</unitPattern>
 				<unitPattern count="other">{0}Tb</unitPattern>
@@ -3053,10 +3293,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}kb</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName>déc</displayName>
 				<unitPattern count="one">{0}déc</unitPattern>
 				<unitPattern count="other">{0}déc</unitPattern>
 			</unit>
+			<unit type="duration-quarter">
+				<unitPattern count="one">{0}T</unitPattern>
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
 			<unit type="duration-month">
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
@@ -3148,6 +3391,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one" draft="contributed">{0}deHg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}deHg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -3163,12 +3410,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="speed-beaufort">
 				<displayName>Bf</displayName>
-				<unitPattern count="one">{0} Bf</unitPattern>
-				<unitPattern count="other">{0} Bf</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<unitPattern count="one">{0} °C</unitPattern>
-				<unitPattern count="other">{0} °C</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
 				<unitPattern count="one">{0}lb-pi</unitPattern>
@@ -3178,6 +3419,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}vg³</unitPattern>
 				<unitPattern count="other">{0}vg³</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one" draft="contributed">{0}fl oz m</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}fl oz m</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ac pi</displayName>
 				<unitPattern count="one">{0}ac pi</unitPattern>
@@ -3248,8 +3493,59 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}pte imp</unitPattern>
 				<unitPattern count="other">{0}pte imp</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>p.p. 10⁹</displayName>
+			<unit type="angle-steradian">
+				<unitPattern count="one" draft="contributed">{0}sr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one" draft="contributed">{0}kat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one" draft="contributed">{0}C</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one" draft="contributed">{0}F</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one" draft="contributed">{0}H</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one" draft="contributed">{0}S</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<unitPattern count="one" draft="contributed">{0}cal-IT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one" draft="contributed">{0}Bq</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one" draft="contributed">{0}Sv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one" draft="contributed">{0}Gy</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one" draft="contributed">{0}kgf</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0}T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0}Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0}Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}pp10⁹</unitPattern>
 				<unitPattern count="other">{0}pp10⁹</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/frr.xml b/make/data/cldr/common/main/frr.xml
index 47fa5256bc5..0bee3a5752d 100644
--- a/make/data/cldr/common/main/frr.xml
+++ b/make/data/cldr/common/main/frr.xml
@@ -41,6 +41,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az" draft="unconfirmed">Aserbaidschaansk</language>
 			<language type="az" alt="short" draft="unconfirmed">Aseeri</language>
 			<language type="ba" draft="unconfirmed">Baschkiirisk</language>
+			<language type="bal" draft="unconfirmed">Belutschisk</language>
 			<language type="ban" draft="unconfirmed">Balineesk</language>
 			<language type="bas" draft="unconfirmed">Basaa</language>
 			<language type="be" draft="unconfirmed">Witjrüsk</language>
@@ -114,6 +115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en_AU" draft="unconfirmed">Austraalisk Ingelsk</language>
 			<language type="en_CA" draft="unconfirmed">Kanaadsk Ingelsk</language>
 			<language type="en_GB" draft="unconfirmed">Britisk Ingelsk</language>
+			<language type="en_GB" alt="short" draft="unconfirmed">UK Ingelsk</language>
 			<language type="en_US" draft="unconfirmed">Amerikoonsk Ingelsk</language>
 			<language type="en_US" alt="short" draft="unconfirmed">US Ingelsk</language>
 			<language type="eo" draft="unconfirmed">Esperanto</language>
@@ -221,6 +223,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf" draft="unconfirmed">Bafia</language>
 			<language type="ksh" draft="unconfirmed">Kölsch</language>
 			<language type="ku" draft="unconfirmed">Kurdisk</language>
+			<language type="ku" menu="core" draft="unconfirmed">Kurdisk (Kurmanji)</language>
+			<language type="ku" menu="extension" draft="unconfirmed">Kurmanji</language>
 			<language type="kum" draft="unconfirmed">Kumyk</language>
 			<language type="kv" draft="unconfirmed">Komi</language>
 			<language type="kw" draft="unconfirmed">Kornisk</language>
@@ -464,6 +468,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Arab" draft="unconfirmed">Araabisk</script>
 			<script type="Aran" draft="unconfirmed">Nastaliq</script>
 			<script type="Armn" draft="unconfirmed">Armeensk</script>
+			<script type="Bali" draft="unconfirmed">Balineesk</script>
 			<script type="Beng" draft="unconfirmed">Bangla</script>
 			<script type="Bopo" draft="unconfirmed">Bopomofo</script>
 			<script type="Brai" draft="unconfirmed">Braille</script>
@@ -499,6 +504,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Mong" draft="unconfirmed">Mongools</script>
 			<script type="Mtei" draft="unconfirmed">Meitei Mayek</script>
 			<script type="Mymr" draft="unconfirmed">Burmeesk</script>
+			<script type="Newa" draft="unconfirmed">Newaarisk</script>
 			<script type="Nkoo" draft="unconfirmed">N’Ko</script>
 			<script type="Olck" draft="unconfirmed">Ol Chiki</script>
 			<script type="Orya" draft="unconfirmed">Oriya</script>
@@ -599,12 +605,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CG" alt="variant" draft="unconfirmed">Republiik Kongo</territory>
 			<territory type="CH" draft="unconfirmed">Sweits</territory>
 			<territory type="CI" draft="unconfirmed">Côte d’Ivoire</territory>
+			<territory type="CI" alt="variant" draft="unconfirmed">Elfenbianküst</territory>
 			<territory type="CK" draft="unconfirmed">Cook Eilunen</territory>
 			<territory type="CL" draft="unconfirmed">Chiile</territory>
 			<territory type="CM" draft="unconfirmed">Kameruun</territory>
 			<territory type="CN" draft="unconfirmed">Schiina</territory>
 			<territory type="CO" draft="unconfirmed">Kolumbien</territory>
 			<territory type="CP" draft="unconfirmed">Clipperton Eilun</territory>
+			<territory type="CQ" draft="unconfirmed">Sark</territory>
 			<territory type="CR" draft="unconfirmed">Costa Rica</territory>
 			<territory type="CU" draft="unconfirmed">Kuuba</territory>
 			<territory type="CV" draft="unconfirmed">Kapwerden</territory>
@@ -799,7 +807,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TO" draft="unconfirmed">Tonga</territory>
 			<territory type="TR" draft="unconfirmed">Türkiye</territory>
 			<territory type="TR" alt="variant" draft="unconfirmed">Türkei</territory>
-			<territory type="TT" draft="unconfirmed">Trinidad an Tobago</territory>
+			<territory type="TT" draft="unconfirmed">Trinidad an Tobaago</territory>
 			<territory type="TV" draft="unconfirmed">Tuwaalu</territory>
 			<territory type="TW" draft="unconfirmed">Taiwan</territory>
 			<territory type="TZ" draft="unconfirmed">Tansania</territory>
@@ -835,55 +843,104 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf" draft="unconfirmed">Münt Formaat</key>
 			<key type="collation" draft="unconfirmed">Sortiaring</key>
 			<key type="currency" draft="unconfirmed">Münt</key>
+			<key type="em" draft="unconfirmed">Emoji Presentatsion</key>
 			<key type="hc" draft="unconfirmed">Stünjen Formaat (12 of 24)</key>
-			<key type="lb" draft="unconfirmed">Rä Ambreeg Stiil</key>
+			<key type="lb" draft="unconfirmed">Rä Ambreeg String</key>
+			<key type="lw" draft="unconfirmed">Rä ambreeg uun wurden</key>
 			<key type="ms" draft="unconfirmed">Miat Süsteem</key>
 			<key type="numbers" draft="unconfirmed">Taalen</key>
+			<key type="ss" draft="unconfirmed">Sats aanj efter ufk.</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist" draft="unconfirmed">Buddhistisk Kalender</type>
+			<type key="calendar" type="buddhist" scope="core" draft="unconfirmed">Buddhistisk</type>
 			<type key="calendar" type="chinese" draft="unconfirmed">Schineesk Kalender</type>
+			<type key="calendar" type="chinese" scope="core" draft="unconfirmed">Schineesk</type>
 			<type key="calendar" type="coptic" draft="unconfirmed">Koptisk Kalender</type>
+			<type key="calendar" type="coptic" scope="core" draft="unconfirmed">Koptisk</type>
 			<type key="calendar" type="dangi" draft="unconfirmed">Dangi Kalender</type>
+			<type key="calendar" type="dangi" scope="core" draft="unconfirmed">Dangi</type>
 			<type key="calendar" type="ethiopic" draft="unconfirmed">Etioopisk Kalender</type>
+			<type key="calendar" type="ethiopic" scope="core" draft="unconfirmed">Etioopisk</type>
 			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">Etioopisk Amete Alem Kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core" draft="unconfirmed">Etioopisk Amete Alem</type>
 			<type key="calendar" type="gregorian" draft="unconfirmed">Gregoriaans Kalender</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">Gregoriaans</type>
 			<type key="calendar" type="hebrew" draft="unconfirmed">Hebreewsk Kalender</type>
+			<type key="calendar" type="hebrew" scope="core" draft="unconfirmed">Hebreewsk</type>
 			<type key="calendar" type="islamic" draft="unconfirmed">Islaamisk Kalender</type>
+			<type key="calendar" type="islamic" scope="core" draft="unconfirmed">Islaamisk</type>
 			<type key="calendar" type="islamic-civil" draft="unconfirmed">Islaamisk Bürgerlik Kalender</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="unconfirmed">Islaamisk Bürgerlik</type>
 			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">Islaamisk Umalkura Kalender</type>
+			<type key="calendar" type="islamic-umalqura" scope="core" draft="unconfirmed">Islaamisk Umalkura</type>
 			<type key="calendar" type="iso8601" draft="unconfirmed">ISO-8601 Kalender</type>
 			<type key="calendar" type="japanese" draft="unconfirmed">Japoonsk Kalender</type>
+			<type key="calendar" type="japanese" scope="core" draft="unconfirmed">Japoonsk</type>
 			<type key="calendar" type="persian" draft="unconfirmed">Persisk Kalender</type>
+			<type key="calendar" type="persian" scope="core" draft="unconfirmed">Persisk</type>
 			<type key="calendar" type="roc" draft="unconfirmed">Minguo Kalender</type>
+			<type key="calendar" type="roc" scope="core" draft="unconfirmed">Minguo</type>
 			<type key="cf" type="account" draft="unconfirmed">Konto Münt Formaat</type>
+			<type key="cf" type="account" scope="core" draft="unconfirmed">Konto</type>
 			<type key="cf" type="standard" draft="unconfirmed">Standard Münt Formaat</type>
+			<type key="cf" type="standard" scope="core" draft="unconfirmed">Standard</type>
 			<type key="collation" type="ducet" draft="unconfirmed">Unicode Sortiaring</type>
-			<type key="collation" type="search" draft="unconfirmed">Normool Schüken</type>
+			<type key="collation" type="ducet" scope="core" draft="unconfirmed">Normool Unicode</type>
+			<type key="collation" type="search" draft="unconfirmed">Normool Schük</type>
+			<type key="collation" type="search" scope="core" draft="unconfirmed">Schük</type>
 			<type key="collation" type="standard" draft="unconfirmed">Standard Sortiaring</type>
+			<type key="collation" type="standard" scope="core" draft="unconfirmed">Standard</type>
+			<type key="em" type="default" scope="core" draft="unconfirmed">Normool</type>
+			<type key="em" type="emoji" scope="core" draft="unconfirmed">Emoji</type>
+			<type key="em" type="text" scope="core" draft="unconfirmed">Tekst</type>
 			<type key="hc" type="h11" draft="unconfirmed">12 Stünj Süsteem (0–11)</type>
+			<type key="hc" type="h11" scope="core" draft="unconfirmed">12 (0–11)</type>
 			<type key="hc" type="h12" draft="unconfirmed">12 Stünj Süsteem (1–12)</type>
+			<type key="hc" type="h12" scope="core" draft="unconfirmed">12 (1–12)</type>
 			<type key="hc" type="h23" draft="unconfirmed">24 Stünj Süsteem (0–23)</type>
+			<type key="hc" type="h23" scope="core" draft="unconfirmed">24 (0–23)</type>
 			<type key="hc" type="h24" draft="unconfirmed">24 Stünj Süsteem (1–24)</type>
+			<type key="hc" type="h24" scope="core" draft="unconfirmed">24 (1–24)</type>
 			<type key="lb" type="loose" draft="unconfirmed">Luas Rä Ambreeg Stiil</type>
+			<type key="lb" type="loose" scope="core" draft="unconfirmed">Luas</type>
 			<type key="lb" type="normal" draft="unconfirmed">Normool Rä Ambreeg Stiil</type>
+			<type key="lb" type="normal" scope="core" draft="unconfirmed">Normool</type>
 			<type key="lb" type="strict" draft="unconfirmed">String Rä Ambreeg Stiil</type>
+			<type key="lb" type="strict" scope="core" draft="unconfirmed">String</type>
+			<type key="lw" type="breakall" scope="core" draft="unconfirmed">Aal ambreeg</type>
+			<type key="lw" type="keepall" scope="core" draft="unconfirmed">Aal hual</type>
+			<type key="lw" type="normal" scope="core" draft="unconfirmed">Normool</type>
+			<type key="lw" type="phrase" scope="core" draft="unconfirmed">Hual uun fraasen</type>
 			<type key="ms" type="metric" draft="unconfirmed">Meetrisk Süsteem</type>
+			<type key="ms" type="metric" scope="core" draft="unconfirmed">Meetrisk</type>
 			<type key="ms" type="uksystem" draft="unconfirmed">UK Süsteem</type>
+			<type key="ms" type="uksystem" scope="core" draft="unconfirmed">UK</type>
 			<type key="ms" type="ussystem" draft="unconfirmed">US Süsteem</type>
+			<type key="ms" type="ussystem" scope="core" draft="unconfirmed">US</type>
+			<type key="numbers" type="ahom" draft="unconfirmed">Ahom Taalen</type>
 			<type key="numbers" type="arab" draft="unconfirmed">Araabisk Taalen</type>
 			<type key="numbers" type="arabext" draft="unconfirmed">Ütjwidjet Araabisk Taalen</type>
 			<type key="numbers" type="armn" draft="unconfirmed">Armeensk Taalen</type>
 			<type key="numbers" type="armnlow" draft="unconfirmed">Armeensk Letj Taalen</type>
+			<type key="numbers" type="bali" draft="unconfirmed">Balineesk Taalen</type>
 			<type key="numbers" type="beng" draft="unconfirmed">Bangla Taalen</type>
+			<type key="numbers" type="brah" draft="unconfirmed">Brahmi Taalen</type>
 			<type key="numbers" type="cakm" draft="unconfirmed">Chakma Taalen</type>
+			<type key="numbers" type="cham" draft="unconfirmed">Cham Taalen</type>
+			<type key="numbers" type="cyrl" draft="unconfirmed">Kyrilisk Taalen</type>
 			<type key="numbers" type="deva" draft="unconfirmed">Devanagari Taalen</type>
+			<type key="numbers" type="diak" draft="unconfirmed">Dives Akuru Taalen</type>
 			<type key="numbers" type="ethi" draft="unconfirmed">Etioopisk Taalen</type>
 			<type key="numbers" type="fullwide" draft="unconfirmed">Ütjwidjet Taalen</type>
+			<type key="numbers" type="gara" draft="unconfirmed">Garay Taalen</type>
 			<type key="numbers" type="geor" draft="unconfirmed">Georgisk Taalen</type>
+			<type key="numbers" type="gong" draft="unconfirmed">Gunjala Gondi Taalen</type>
+			<type key="numbers" type="gonm" draft="unconfirmed">Masaram Gondi Taalen</type>
 			<type key="numbers" type="grek" draft="unconfirmed">Greks Taalen</type>
 			<type key="numbers" type="greklow" draft="unconfirmed">Greks Letj Taalen</type>
 			<type key="numbers" type="gujr" draft="unconfirmed">Gujarati Taalen</type>
+			<type key="numbers" type="gukh" draft="unconfirmed">Gurung Khema Taalen</type>
 			<type key="numbers" type="guru" draft="unconfirmed">Gurmukhi Taalen</type>
 			<type key="numbers" type="hanidec" draft="unconfirmed">Schineesk Deesimaal Taalen</type>
 			<type key="numbers" type="hans" draft="unconfirmed">Ianfach Schineesk Taalen</type>
@@ -891,13 +948,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="hant" draft="unconfirmed">Ual Schineesk Taalen</type>
 			<type key="numbers" type="hantfin" draft="unconfirmed">Ual Schineesk Finans Taalen</type>
 			<type key="numbers" type="hebr" draft="unconfirmed">Hebreewsk Taalen</type>
+			<type key="numbers" type="hmng" draft="unconfirmed">Pahawh Hmong Taalen</type>
+			<type key="numbers" type="hmnp" draft="unconfirmed">Nyiakeng Puachue Hmong Taalen</type>
 			<type key="numbers" type="java" draft="unconfirmed">Jawaans Taalen</type>
 			<type key="numbers" type="jpan" draft="unconfirmed">Japoonsk Taalen</type>
 			<type key="numbers" type="jpanfin" draft="unconfirmed">Japoonsk Finans Taalen</type>
+			<type key="numbers" type="kali" draft="unconfirmed">Kayah Li Taalen</type>
+			<type key="numbers" type="kawi" draft="unconfirmed">Kawi Taalen</type>
 			<type key="numbers" type="khmr" draft="unconfirmed">Khmer Taalen</type>
 			<type key="numbers" type="knda" draft="unconfirmed">Kanaada Taalen</type>
+			<type key="numbers" type="krai" draft="unconfirmed">Kirat Rai Taalen</type>
+			<type key="numbers" type="lana" draft="unconfirmed">Tai Tham Hora Taalen</type>
+			<type key="numbers" type="lanatham" draft="unconfirmed">Tai Tham Tham Taalen</type>
 			<type key="numbers" type="laoo" draft="unconfirmed">Laotisk Taalen</type>
 			<type key="numbers" type="latn" draft="unconfirmed">Europeesk Taalen</type>
+			<type key="numbers" type="lepc" draft="unconfirmed">Lepcha Taalen</type>
+			<type key="numbers" type="limb" draft="unconfirmed">Limbu Taalen</type>
 			<type key="numbers" type="mlym" draft="unconfirmed">Malayalam Taalen</type>
 			<type key="numbers" type="mtei" draft="unconfirmed">Meetei Mayek Taalen</type>
 			<type key="numbers" type="mymr" draft="unconfirmed">Mjanmaar Taalen</type>
@@ -911,6 +977,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai" draft="unconfirmed">Thai Taalen</type>
 			<type key="numbers" type="tibt" draft="unconfirmed">Tibetaans Taalen</type>
 			<type key="numbers" type="vaii" draft="unconfirmed">Vai Taalen</type>
+			<type key="ss" type="none" scope="core" draft="unconfirmed">Uf</type>
+			<type key="ss" type="standard" scope="core" draft="unconfirmed">Uun</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric" draft="unconfirmed">Meetrisk</measurementSystemName>
@@ -949,7 +1017,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">GGGGG y-MM-dd</pattern>
+							<pattern draft="unconfirmed">G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -961,6 +1029,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -969,6 +1040,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -981,7 +1055,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed" draft="unconfirmed">E, d</dateFormatItem>
+						<dateFormatItem id="EBh" draft="unconfirmed">E, h B</dateFormatItem>
+						<dateFormatItem id="Eh" draft="unconfirmed">E, h a</dateFormatItem>
+						<dateFormatItem id="EHm" draft="unconfirmed">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="EHms" draft="unconfirmed">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="MMMd" draft="unconfirmed">MMM, d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">G y MMM, d</dateFormatItem>
 					</availableFormats>
@@ -1108,8 +1185,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="pm" draft="unconfirmed">e</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">iarmade</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">eftermade</dayPeriod>
+							<dayPeriod type="am" draft="unconfirmed">de iarmade</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">de eftermade</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
@@ -1185,6 +1262,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1193,6 +1273,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'am' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1206,14 +1289,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d" draft="unconfirmed">d.</dateFormatItem>
+						<dateFormatItem id="EBh" draft="unconfirmed">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm" draft="unconfirmed">E, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms" draft="unconfirmed">E, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed" draft="unconfirmed">E, d.</dateFormatItem>
+						<dateFormatItem id="Eh" draft="unconfirmed">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm" draft="unconfirmed">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm" draft="unconfirmed">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms" draft="unconfirmed">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms" draft="unconfirmed">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">G dd/MM/y</dateFormatItem>
+						<dateFormatItem id="GyM" draft="unconfirmed">G M/y</dateFormatItem>
+						<dateFormatItem id="GyMd" draft="unconfirmed">G d/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="unconfirmed">G E, d/M/y</dateFormatItem>
 						<dateFormatItem id="GyMMM" draft="unconfirmed">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd" draft="unconfirmed">G d. MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd" draft="unconfirmed">G E, d. MMM y</dateFormatItem>
@@ -1222,22 +1309,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv" draft="unconfirmed">h:mm a v</dateFormatItem>
-						<dateFormatItem id="M" draft="unconfirmed">LL</dateFormatItem>
-						<dateFormatItem id="Md" draft="unconfirmed">dd/MM</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">E dd/MM</dateFormatItem>
+						<dateFormatItem id="Md" draft="unconfirmed">d/M</dateFormatItem>
+						<dateFormatItem id="MEd" draft="unconfirmed">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd" draft="unconfirmed">d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd" draft="unconfirmed">E, d. MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd" draft="unconfirmed">d. MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">'weg' W 'faan' MMMM</dateFormatItem>
-						<dateFormatItem id="yM" draft="unconfirmed">MM/y</dateFormatItem>
-						<dateFormatItem id="yMd" draft="unconfirmed">dd/MM/y</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="unconfirmed">E, dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yM" draft="unconfirmed">M/y</dateFormatItem>
+						<dateFormatItem id="yMd" draft="unconfirmed">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd" draft="unconfirmed">E, d/M/y</dateFormatItem>
 						<dateFormatItem id="yMMM" draft="unconfirmed">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd" draft="unconfirmed">d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd" draft="unconfirmed">E, d. MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMM" draft="unconfirmed">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ" draft="unconfirmed">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="unconfirmed">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ" draft="unconfirmed">QQQQ y</dateFormatItem>
 						<dateFormatItem id="yw" count="other" draft="unconfirmed">'weg' w 'faan' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
@@ -1260,10 +1346,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y" draft="unconfirmed">G d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">G E, dd/MM/y – E, dd/MM/y</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">G E, dd/MM/y – G E, dd/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">G E, dd/MM/y – E, dd/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">G E, dd/MM/y – E. dd/MM/y</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">G E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">G E, d/M/y – G E, d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G" draft="unconfirmed">G MMM y – G MMM y</greatestDifference>
@@ -1315,15 +1401,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="H" draft="unconfirmed">HH – HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">MM – MM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM – dd/MM</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">d/M – d/M</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E, dd/MM – E, dd/MM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, dd/MM – E, dd/MM</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M" draft="unconfirmed">LLL – LLL</greatestDifference>
@@ -1340,18 +1426,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y" draft="unconfirmed">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MM/y – MM/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">M/y – M/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">dd/MM/y – dd/MM/y</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E, dd/MM/y – E, dd/MM/y</greatestDifference>
+							<greatestDifference id="d" draft="unconfirmed">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y</greatestDifference>
@@ -1385,10 +1471,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das juar</relative>
 				<relative type="1" draft="unconfirmed">naist juar</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} juar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} juaren</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">föör {0} juar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">föör {0} juaren</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
@@ -1420,9 +1506,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="quarter-short">
 				<displayName draft="unconfirmed">kwrt.</displayName>
+				<relative type="-1" draft="unconfirmed">letst kw.</relative>
+				<relative type="0" draft="unconfirmed">das kw.</relative>
+				<relative type="1" draft="unconfirmed">naist kw.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} kwn.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="unconfirmed">föör {0} kwn.</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<displayName draft="unconfirmed">kwrt</displayName>
+				<relative type="-1" draft="unconfirmed">letst kw.</relative>
+				<relative type="0" draft="unconfirmed">das kw.</relative>
+				<relative type="1" draft="unconfirmed">naist kw.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} kwn.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other" draft="unconfirmed">föör {0} kwn.</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName draft="unconfirmed">muun</displayName>
@@ -1430,7 +1534,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das muun</relative>
 				<relative type="1" draft="unconfirmed">naist muun</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} muuner</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} muuner</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} muuner</relativeTimePattern>
@@ -1448,7 +1552,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das m</relative>
 				<relative type="1" draft="unconfirmed">naist m</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} m</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} m</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} m</relativeTimePattern>
@@ -1541,7 +1645,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Söndai</relative>
 				<relative type="1" draft="unconfirmed">naist Söndai</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Söndaar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Söndaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Söndaar</relativeTimePattern>
@@ -1552,7 +1656,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Sön.</relative>
 				<relative type="1" draft="unconfirmed">naist Sön.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Sön.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Sön.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Sön.</relativeTimePattern>
@@ -1563,7 +1667,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Sö</relative>
 				<relative type="1" draft="unconfirmed">naist Sö</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Sö</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Sö</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Sö</relativeTimePattern>
@@ -1574,7 +1678,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Mundai</relative>
 				<relative type="1" draft="unconfirmed">naist Mundai</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Mundaar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Mundaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Mundaar</relativeTimePattern>
@@ -1585,7 +1689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Mun.</relative>
 				<relative type="1" draft="unconfirmed">naist Mun.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Mun.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Mun.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Mun.</relativeTimePattern>
@@ -1596,7 +1700,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Mun.</relative>
 				<relative type="1" draft="unconfirmed">naist Mun.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Mun.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Mun.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Mun.</relativeTimePattern>
@@ -1607,7 +1711,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Teisdai</relative>
 				<relative type="1" draft="unconfirmed">naist Teisdai</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Teisdaar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Teisdaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Teisdaar</relativeTimePattern>
@@ -1618,7 +1722,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Tei.</relative>
 				<relative type="1" draft="unconfirmed">naist Tei.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Tei.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Tei.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Tei.</relativeTimePattern>
@@ -1629,7 +1733,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Tei</relative>
 				<relative type="1" draft="unconfirmed">naist Tei</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Tei</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Tei</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Tei</relativeTimePattern>
@@ -1640,7 +1744,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Weedensdai</relative>
 				<relative type="1" draft="unconfirmed">naist Weedensdai</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Weedensdaar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Weedensdaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Weedensdaar</relativeTimePattern>
@@ -1651,7 +1755,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Weed.</relative>
 				<relative type="1" draft="unconfirmed">naist Weed.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Weed.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Weed.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Weed.</relativeTimePattern>
@@ -1662,7 +1766,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Weed</relative>
 				<relative type="1" draft="unconfirmed">naist Weed</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Weed</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Weed</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Weed</relativeTimePattern>
@@ -1673,7 +1777,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Tüürsdai</relative>
 				<relative type="1" draft="unconfirmed">naist Tüürsdai</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Tüürsdaar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Tüürsdaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Tüürsdaar</relativeTimePattern>
@@ -1684,7 +1788,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Tüü.</relative>
 				<relative type="1" draft="unconfirmed">naist Tüü.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Tüü.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Tüü.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Tüü.</relativeTimePattern>
@@ -1695,7 +1799,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Tüü.</relative>
 				<relative type="1" draft="unconfirmed">naist Tüü.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Tüü.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Tüü.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Tüü.</relativeTimePattern>
@@ -1706,7 +1810,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Freidai</relative>
 				<relative type="1" draft="unconfirmed">naist Freidai</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Freidaar</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Freidaar</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Freidaar</relativeTimePattern>
@@ -1717,7 +1821,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Fr.</relative>
 				<relative type="1" draft="unconfirmed">naist Fr.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Fr.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Fr.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Fr.</relativeTimePattern>
@@ -1728,7 +1832,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Fr</relative>
 				<relative type="1" draft="unconfirmed">naist Fr</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Fr</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Fr</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Fr</relativeTimePattern>
@@ -1739,7 +1843,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Saninj</relative>
 				<relative type="1" draft="unconfirmed">naist Saninj</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Saninjer</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Saninjer</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Saninjer</relativeTimePattern>
@@ -1750,7 +1854,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das San.</relative>
 				<relative type="1" draft="unconfirmed">naist San.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} San.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} San.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} San.</relativeTimePattern>
@@ -1761,7 +1865,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">das Sa</relative>
 				<relative type="1" draft="unconfirmed">naist Sa</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} Sa</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} Sa</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} Sa</relativeTimePattern>
@@ -1780,16 +1884,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">stünj</displayName>
 				<relative type="0" draft="unconfirmed">das stünj</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} stünj</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} stünjen</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">föör {0} stünj</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">föör {0} stünjen</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
 				<displayName draft="unconfirmed">s.</displayName>
+				<relative type="0" draft="unconfirmed">das st.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} st.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} st.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} st.</relativeTimePattern>
@@ -1798,17 +1903,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="hour-narrow">
 				<displayName draft="unconfirmed">s</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} st</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} st</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} st</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName draft="unconfirmed">minüüt</displayName>
+				<displayName draft="unconfirmed">minüt</displayName>
 				<relative type="0" draft="unconfirmed">das minüüt</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} minüüten</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} minüüten</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} minüüten</relativeTimePattern>
@@ -1817,7 +1922,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="minute-short">
 				<displayName draft="unconfirmed">min.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} min.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} min.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} min.</relativeTimePattern>
@@ -1826,7 +1931,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="minute-narrow">
 				<displayName draft="unconfirmed">min</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} min</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} min</relativeTimePattern>
@@ -1836,7 +1941,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">sekund</displayName>
 				<relative type="0" draft="unconfirmed">nü</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} sekunden</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} sekunden</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} sekunden</relativeTimePattern>
@@ -1845,7 +1950,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="second-short">
 				<displayName draft="unconfirmed">sek.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} sek.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} sek.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} sek.</relativeTimePattern>
@@ -1854,7 +1959,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="second-narrow">
 				<displayName draft="unconfirmed">sek</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">efter {0} s</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">uun {0} s</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other" draft="unconfirmed">föör {0} s</relativeTimePattern>
@@ -2184,9 +2289,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Waast Afrikoo Tidj</generic>
-					<standard draft="unconfirmed">Waast Afrikoo Standard Tidj</standard>
-					<daylight draft="unconfirmed">Waast Afrikoo Somertidj</daylight>
+					<standard draft="unconfirmed">Waast Afrikoo Tidj</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2233,9 +2336,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="unconfirmed">Apia Tidj</generic>
-					<standard draft="unconfirmed">Apia Standard Tidj</standard>
-					<daylight draft="unconfirmed">Apia Somertidj</daylight>
+					<generic draft="unconfirmed">Samoa Tidj</generic>
+					<standard draft="unconfirmed">Samoa Standard Tidj</standard>
+					<daylight draft="unconfirmed">Samoa Somertidj</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -2275,16 +2378,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic draft="unconfirmed">Sentraal Austraalisk Tidj</generic>
-					<standard draft="unconfirmed">Sentraal Austraalisk Standard Tidj</standard>
-					<daylight draft="unconfirmed">Sentraal Austraalisk Somertidj</daylight>
+					<generic draft="unconfirmed">Austraalisk Sentraal Tidj</generic>
+					<standard draft="unconfirmed">Austraalisk Sentraal Standard Tidj</standard>
+					<daylight draft="unconfirmed">Austraalisk Sentraal Somertidj</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic draft="unconfirmed">Sentraal Waastaustraalisk Tidj</generic>
-					<standard draft="unconfirmed">Sentraal Waastaustraalisk Standard Tidj</standard>
-					<daylight draft="unconfirmed">Sentraal Waastaustraalisk Somertidj</daylight>
+					<generic draft="unconfirmed">Austraalisk Madelwaast Tidj</generic>
+					<standard draft="unconfirmed">Austraalisk Madelwaast Standard Tidj</standard>
+					<daylight draft="unconfirmed">Austraalisk Madelwaast Somertidj</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
@@ -2341,7 +2444,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard draft="unconfirmed">Brunei Darussalam Tidj</standard>
+					<standard draft="unconfirmed">Brunei Tidj</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -2398,7 +2501,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic draft="unconfirmed">Cook Eilunen Tidj</generic>
 					<standard draft="unconfirmed">Cook Eilunen Standard Tidj</standard>
-					<daylight draft="unconfirmed">Cook Eilunen Hualew Somertidj</daylight>
+					<daylight draft="unconfirmed">Cook Eilunen Somertidj</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -2415,7 +2518,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard draft="unconfirmed">Dumont-d’Urville Tidj</standard>
+					<standard draft="unconfirmed">Dumont d’Urville Tidj</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
@@ -2536,6 +2639,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Guyaana Tidj</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Hawaii-Aleuten Standard Tidj</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Hawaii-Aleuten Tidj</generic>
@@ -2852,7 +2960,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="unconfirmed">Ponape Tidj</standard>
+					<standard draft="unconfirmed">Pohnpei Tidj</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
@@ -2879,9 +2987,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="unconfirmed">Samoa Tidj</generic>
-					<standard draft="unconfirmed">Samoa Standard Tidj</standard>
-					<daylight draft="unconfirmed">Samoa Somertidj</daylight>
+					<generic draft="unconfirmed">Amrikoons Samoa Tidj</generic>
+					<standard draft="unconfirmed">Amerikoons Samoa Standard Tidj</standard>
+					<daylight draft="unconfirmed">Amerikoons Samoa Somertidj</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -2921,9 +3029,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic draft="unconfirmed">Taipee Tidj</generic>
-					<standard draft="unconfirmed">Taipee Standard Tidj</standard>
-					<daylight draft="unconfirmed">Taipee Somertidj</daylight>
+					<generic draft="unconfirmed">Taiwan Tidj</generic>
+					<standard draft="unconfirmed">Taiwan Standard Tidj</standard>
+					<daylight draft="unconfirmed">Taiwan Somertidj</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -3063,11 +3171,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="10000" count="other" draft="unconfirmed">¤00K</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">¤000K</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">¤0M</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">¤00M</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">¤000M</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="other">¤ 000M</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -3212,6 +3320,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">Tschechisk Krüün</displayName>
 				<displayName count="other" draft="unconfirmed">Tschechisk Krüünen</displayName>
 			</currency>
+			<currency type="DEM">
+				<displayName draft="unconfirmed">D-Mark</displayName>
+			</currency>
 			<currency type="DJF">
 				<displayName draft="unconfirmed">Djibouti Franc</displayName>
 				<displayName count="other" draft="unconfirmed">Djibouti Francs</displayName>
@@ -3657,6 +3768,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">Uast Kariibik Dooler</displayName>
 				<displayName count="other" draft="unconfirmed">Uast Kariibik Doolers</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="unconfirmed">Kariibisk Gulden</displayName>
+				<displayName count="other" draft="unconfirmed">Kariibisk Gulden</displayName>
+				<symbol draft="unconfirmed">XCG</symbol>
+			</currency>
 			<currency type="XOF">
 				<displayName draft="unconfirmed">Waastafrikoonsk CFA Franc</displayName>
 				<displayName count="other" draft="unconfirmed">Waastafrikoonsk CFA Francs</displayName>
@@ -3680,6 +3796,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">Sambisk Kwacha</displayName>
 				<displayName count="other" draft="unconfirmed">Sambisk Kwachas</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="unconfirmed">Simbabwe Gul</displayName>
+				<displayName count="other" draft="unconfirmed">Simbabwe Gul</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="other" draft="unconfirmed">{0} daar</pluralMinimalPairs>
@@ -3689,7 +3809,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">dezi{0}</unitPrefixPattern>
+				<unitPrefixPattern draft="unconfirmed">deesi{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-2">
 				<unitPrefixPattern draft="unconfirmed">senti{0}</unitPrefixPattern>
@@ -3862,8 +3982,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern draft="unconfirmed">{0} per kwadroottol</perUnitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">karats</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} karats</unitPattern>
+				<displayName draft="unconfirmed">karaat</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} karaat</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<displayName draft="unconfirmed">miligram per deziliter</displayName>
@@ -3877,6 +3997,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">items</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} items</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName draft="unconfirmed">parts</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} parts</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName draft="unconfirmed">prosent</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} prosent</unitPattern>
@@ -3889,6 +4013,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">promyriad</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} promyriad</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="unconfirmed">glukoos</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} glukoos</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="unconfirmed">litern per kilomeeter</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} litern per kilomeeter</unitPattern>
@@ -4108,8 +4236,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern draft="unconfirmed">{0} per sentimeeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">millimeetern</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} millimeetern</unitPattern>
+				<displayName draft="unconfirmed">milimeetern</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} milimeetern</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName draft="unconfirmed">mikromeetern</displayName>
@@ -4120,8 +4248,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" draft="unconfirmed">{0} nanomeetern</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="unconfirmed">picomeetern</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} picomeetern</unitPattern>
+				<displayName draft="unconfirmed">pikomeetern</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} pikomeetern</unitPattern>
 			</unit>
 			<unit type="length-mile">
 				<unitPattern count="other" draft="unconfirmed">{0} miilen</unitPattern>
@@ -4269,6 +4397,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">milimeetern kwaksalwer</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} milimeetern kwaksalwer</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="unconfirmed">kwaksalwer</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kwaksalwer</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName draft="unconfirmed">tol kwaksalwer</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} tol kwaksalwer</unitPattern>
@@ -4318,7 +4450,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" draft="unconfirmed">{0} Beaufort</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
-				<displayName draft="unconfirmed">graad</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} graad</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
@@ -4330,8 +4461,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" draft="unconfirmed">{0} graad Fahrenheit</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">Kelvin</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Kelvin</unitPattern>
+				<displayName draft="unconfirmed">kelvin</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kelvin</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName draft="unconfirmed">pound-force-feet</displayName>
@@ -4385,8 +4516,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern draft="unconfirmed">{0} per liter</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">desilitern</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} desilitern</unitPattern>
+				<displayName draft="unconfirmed">deesilitern</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} deesilitern</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
 				<displayName draft="unconfirmed">sentilitern</displayName>
@@ -4404,6 +4535,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">fjuarden litern</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} fjuarden litern</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">meetrisk fluid ounces</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} meetrisk fluid ounces</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName draft="unconfirmed">acre-feet</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} acre-feet</unitPattern>
@@ -4478,6 +4613,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">ingelsk quarts</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} ingelsk quarts</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="unconfirmed">steradiant</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} steradiant</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="unconfirmed">katal</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="unconfirmed">coulomb</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="unconfirmed">farad</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="unconfirmed">henry</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="unconfirmed">siemens</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="unconfirmed">kaloriin [IT]</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kaloriin [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="unconfirmed">becquerel</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="unconfirmed">sievert</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="unconfirmed">gray</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="unconfirmed">kilopond</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kilopond</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="unconfirmed">tesla</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="unconfirmed">weber</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} weber</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="unconfirmed">laacht faard</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} laacht faard</unitPattern>
@@ -4527,7 +4714,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern draft="unconfirmed">{0}/tol²</perUnitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">karats</displayName>
+				<displayName draft="unconfirmed">karaat</displayName>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<displayName draft="unconfirmed">milimol/liter</displayName>
@@ -4535,6 +4722,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-item">
 				<unitPattern count="other" draft="unconfirmed">{0} items</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="unconfirmed">Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="unconfirmed">litern/km</displayName>
 			</unit>
@@ -4589,7 +4779,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">kilojoule</displayName>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">kWstünjen</displayName>
+				<displayName draft="unconfirmed">kW-stünj</displayName>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName draft="unconfirmed">elektroonenvolt</displayName>
@@ -4693,6 +4883,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">PS</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} PS</unitPattern>
 			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName draft="unconfirmed">tol Hg</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} tol Hg</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="other" draft="unconfirmed">{0} Bft</unitPattern>
 			</unit>
@@ -4744,6 +4938,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">pinches</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} pinches</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="unconfirmed">cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="unconfirmed">kp</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kp</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="unconfirmed">c</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} c</unitPattern>
@@ -4776,7 +4977,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">acre</displayName>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">karat</displayName>
+				<displayName draft="unconfirmed">karaat</displayName>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<displayName draft="unconfirmed">milimol/liter</displayName>
@@ -4784,6 +4985,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-item">
 				<unitPattern count="other" draft="unconfirmed">{0} items</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="unconfirmed">Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="unconfirmed">litern/km</displayName>
 			</unit>
@@ -4821,7 +5025,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">ns</displayName>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">kWstünjen</displayName>
+				<displayName draft="unconfirmed">kWh</displayName>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName draft="unconfirmed">elektroonenvolt</displayName>
@@ -4830,7 +5034,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">pound-force</displayName>
 			</unit>
 			<unit type="force-newton">
-				<displayName draft="unconfirmed">newton</displayName>
+				<displayName draft="unconfirmed">N</displayName>
 			</unit>
 			<unit type="graphics-pixel">
 				<displayName draft="unconfirmed">px</displayName>
@@ -4876,6 +5080,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">PS</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} pe-es</unitPattern>
 			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName draft="unconfirmed">″ Hg</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}″ Hg</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="other" draft="unconfirmed">{0} Bft</unitPattern>
 			</unit>
@@ -4915,6 +5123,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">drops</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} drops</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="unconfirmed">cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="unconfirmed">kp</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kp</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="unconfirmed">c</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} c</unitPattern>
diff --git a/make/data/cldr/common/main/fur.xml b/make/data/cldr/common/main/fur.xml
index a7d26ec7caa..e6fe0b2227a 100644
--- a/make/data/cldr/common/main/fur.xml
+++ b/make/data/cldr/common/main/fur.xml
@@ -593,9 +593,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="islamic-civil" draft="provisional">calendari islamic civîl</type>
 			<type key="calendar" type="japanese" draft="contributed">calendari gjaponês</type>
 			<type key="calendar" type="roc" draft="contributed">calendari de Republiche di Cine</type>
-			<type key="collation" type="big5han" draft="contributed">ordin cinês tradizionâl - Big5</type>
 			<type key="collation" type="ducet" draft="contributed">ordenament predeterminât Unicode</type>
-			<type key="collation" type="gb2312han" draft="contributed">ordin cinês semplificât - GB2312</type>
 			<type key="collation" type="phonebook" draft="contributed">ordin elenc telefonic</type>
 			<type key="collation" type="pinyin" draft="contributed">ordin pinyin</type>
 			<type key="collation" type="search" draft="contributed">ricercje par fins gjenerâi</type>
diff --git a/make/data/cldr/common/main/fy.xml b/make/data/cldr/common/main/fy.xml
index 6cf0c53ad5c..bc0e2fd4ce2 100644
--- a/make/data/cldr/common/main/fy.xml
+++ b/make/data/cldr/common/main/fy.xml
@@ -1133,10 +1133,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="colCaseFirst" type="upper" draft="contributed">Eerst sortearje op haadletters</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Net haadlettergefoelich sortearje</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Hoofdlettergevoelig sortearje</type>
-			<type key="collation" type="big5han" draft="contributed">Tradisjonele-Sineeske soartear oarder - Big5</type>
 			<type key="collation" type="dictionary" draft="contributed">Wurdboeksortearfolgorde</type>
 			<type key="collation" type="ducet" draft="contributed">Standert Unikoade-sortearfolgorde</type>
-			<type key="collation" type="gb2312han" draft="contributed">Ferienfâldigde-Sineeske sortearfolgorde - GB2312</type>
 			<type key="collation" type="phonebook" draft="contributed">Telefoanboeksortearfolgorde</type>
 			<type key="collation" type="phonetic" draft="contributed">Fonetyske sortearfolgorde</type>
 			<type key="collation" type="pinyin" draft="contributed">Pinyinvolgorde</type>
@@ -2958,9 +2956,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="contributed">West-Afrikaanske tiid</generic>
-					<standard draft="contributed">West-Afrikaanske standerttiid</standard>
-					<daylight draft="contributed">West-Afrikaanske simmertiid</daylight>
+					<standard draft="contributed">West-Afrikaanske tiid</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3358,6 +3354,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="contributed">Guyaanske tiid</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="contributed">Hawaii-Aleoetyske standerttiid</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="contributed">Hawaii-Aleoetyske tiid</generic>
@@ -3957,9 +3958,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ #,##0.00-</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ #,##0.00-</pattern>
+					<pattern alt="noCurrency">#,##0.00;#,##0.00-</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
diff --git a/make/data/cldr/common/main/ga.xml b/make/data/cldr/common/main/ga.xml
index 5be8c5b76ec..f6ce29435af 100644
--- a/make/data/cldr/common/main/ga.xml
+++ b/make/data/cldr/common/main/ga.xml
@@ -48,6 +48,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">Asarbaiseáinis</language>
 			<language type="az" alt="short">Asairis</language>
 			<language type="ba">Baiscíris</language>
+			<language type="bal">Balúitsis</language>
 			<language type="ban">Bailís</language>
 			<language type="bar">Baváiris</language>
 			<language type="bas">Basáis</language>
@@ -98,7 +99,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="crs">Criól Fraincise Seselwa</language>
 			<language type="cs">Seicis</language>
 			<language type="csb">Caisiúibis</language>
-			<language type="csw">Swampy Cree</language>
+			<language type="csw">Craís na gCorcach</language>
 			<language type="cu">Slavais na hEaglaise</language>
 			<language type="cv">Suvaisis</language>
 			<language type="cy">Breatnais</language>
@@ -203,7 +204,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="id">Indinéisis</language>
 			<language type="ie">Interlingue</language>
 			<language type="ig">Íogbóis</language>
-			<language type="ii">Ís Shichuan</language>
+			<language type="ii">Ís Sichuan</language>
 			<language type="ik">Iniúipiaicis</language>
 			<language type="ikt">Ionúitis Iarthar Cheanada</language>
 			<language type="ilo">Ileacáinis</language>
@@ -254,6 +255,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Baifiais</language>
 			<language type="ksh">Coilsis</language>
 			<language type="ku">Coirdis</language>
+			<language type="ku" menu="core">Coirdis</language>
+			<language type="ku" menu="extension">Curmainsis</language>
 			<language type="kum">Cúimicis</language>
 			<language type="kv">Coimis</language>
 			<language type="kw">Coirnis</language>
@@ -359,14 +362,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ojw">Óisibis an Iarthar</language>
 			<language type="oka">Okanagan</language>
 			<language type="om">Oraimis</language>
-			<language type="or">Odia</language>
+			<language type="or">Oirísis</language>
 			<language type="os">Oiséitis</language>
 			<language type="pa">Puinseáibis</language>
 			<language type="pag">Pangasaíneánais</language>
 			<language type="pam">Pampaingis</language>
 			<language type="pap">Paipeamaintis</language>
 			<language type="pau">Palabhais</language>
-			<language type="pcm">pidsean na Nigéire</language>
+			<language type="pcm">Pidsean na Nigéire</language>
 			<language type="peo">Sean-Pheirsis</language>
 			<language type="pi">Páilis</language>
 			<language type="pis">Pijin</language>
@@ -552,7 +555,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Egyh">Éigipteach cliarúil</script>
 			<script type="Egyp">Iairiglifí Éigipteacha</script>
 			<script type="Elba">Elbasan</script>
-			<script type="Ethi">Aetóipic</script>
+			<script type="Ethi">Aetóipice</script>
 			<script type="Geor">Seoirseach</script>
 			<script type="Glag">Glagalach</script>
 			<script type="Gonm">Masaram Gondi</script>
@@ -756,7 +759,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CG">Congó-Brazzaville</territory>
 			<territory type="CG" alt="variant">Poblacht an Chongó</territory>
 			<territory type="CH">an Eilvéis</territory>
-			<territory type="CI">An Cósta Eabhair</territory>
+			<territory type="CI">Côte d’Ivoire</territory>
 			<territory type="CI" alt="variant">an Cósta Eabhair</territory>
 			<territory type="CK">Oileáin Cook</territory>
 			<territory type="CL">an tSile</territory>
@@ -764,9 +767,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">an tSín</territory>
 			<territory type="CO">an Cholóim</territory>
 			<territory type="CP">Oileán Clipperton</territory>
+			<territory type="CQ">an tSairc</territory>
 			<territory type="CR">Cósta Ríce</territory>
 			<territory type="CU">Cúba</territory>
-			<territory type="CV">Rinn Verde</territory>
+			<territory type="CV">Poblacht Cabo Verde</territory>
 			<territory type="CW">Cúrasó</territory>
 			<territory type="CX">Oileán na Nollag</territory>
 			<territory type="CY">an Chipir</territory>
@@ -778,12 +782,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="DK">an Danmhairg</territory>
 			<territory type="DM">Doiminice</territory>
 			<territory type="DO">an Phoblacht Dhoiminiceach</territory>
-			<territory type="DZ">An Ailgéir</territory>
+			<territory type="DZ">an Ailgéir</territory>
 			<territory type="EA">Ceuta agus Melilla</territory>
 			<territory type="EC">Eacuadór</territory>
 			<territory type="EE">an Eastóin</territory>
-			<territory type="EG">An Éigipt</territory>
-			<territory type="EH">An Sahára Thiar</territory>
+			<territory type="EG">an Éigipt</territory>
+			<territory type="EH">an Sahára Thiar</territory>
 			<territory type="ER">an Eiritré</territory>
 			<territory type="ES">an Spáinn</territory>
 			<territory type="ET">an Aetóip</territory>
@@ -798,6 +802,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="FR">an Fhrainc</territory>
 			<territory type="GA">an Ghabúin</territory>
 			<territory type="GB">an Ríocht Aontaithe</territory>
+			<territory type="GB" alt="short">RA</territory>
 			<territory type="GD">Greanáda</territory>
 			<territory type="GE">an tSeoirsia</territory>
 			<territory type="GF">Guáin na Fraince</territory>
@@ -805,8 +810,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="GH">Gána</territory>
 			<territory type="GI">Giobráltar</territory>
 			<territory type="GL">an Ghraonlainn</territory>
-			<territory type="GM">An Ghaimbia</territory>
-			<territory type="GN">An Ghuine</territory>
+			<territory type="GM">an Ghaimbia</territory>
+			<territory type="GN">an Ghuine</territory>
 			<territory type="GP">Guadalúip</territory>
 			<territory type="GQ">an Ghuine Mheánchiorclach</territory>
 			<territory type="GR">an Ghréig</territory>
@@ -822,7 +827,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="HR">an Chróit</territory>
 			<territory type="HT">Háítí</territory>
 			<territory type="HU">an Ungáir</territory>
-			<territory type="IC">Na hOileáin Chanáracha</territory>
+			<territory type="IC">na hOileáin Chanáracha</territory>
 			<territory type="ID">an Indinéis</territory>
 			<territory type="IE">Éire</territory>
 			<territory type="IL">Iosrael</territory>
@@ -853,12 +858,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="LC">Saint Lucia</territory>
 			<territory type="LI">Lichtinstéin</territory>
 			<territory type="LK">Srí Lanca</territory>
-			<territory type="LR">An Libéir</territory>
+			<territory type="LR">an Libéir</territory>
 			<territory type="LS">Leosóta</territory>
 			<territory type="LT">an Liotuáin</territory>
 			<territory type="LU">Lucsamburg</territory>
 			<territory type="LV">an Laitvia</territory>
-			<territory type="LY">An Libia</territory>
+			<territory type="LY">an Libia</territory>
 			<territory type="MA">Maracó</territory>
 			<territory type="MC">Monacó</territory>
 			<territory type="MD">an Mholdóiv</territory>
@@ -874,7 +879,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="MO" alt="short">Macao</territory>
 			<territory type="MP">Na hOileáin Mháirianacha Thuaidh</territory>
 			<territory type="MQ">Martinique</territory>
-			<territory type="MR">An Mháratái</territory>
+			<territory type="MR">an Mháratáin</territory>
 			<territory type="MS">Montsarat</territory>
 			<territory type="MT">Málta</territory>
 			<territory type="MU">Oileán Mhuirís</territory>
@@ -885,9 +890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="MZ">Mósaimbíc</territory>
 			<territory type="NA">an Namaib</territory>
 			<territory type="NC">an Nua-Chaladóin</territory>
-			<territory type="NE">An Nígir</territory>
+			<territory type="NE">an Nígir</territory>
 			<territory type="NF">Oileán Norfolk</territory>
-			<territory type="NG">An Nigéir</territory>
+			<territory type="NG">an Nigéir</territory>
 			<territory type="NI">Nicearagua</territory>
 			<territory type="NL">an Ísiltír</territory>
 			<territory type="NO">an Iorua</territory>
@@ -921,7 +926,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SA">an Araib Shádach</territory>
 			<territory type="SB">Oileáin Sholaimh</territory>
 			<territory type="SC">na Séiséil</territory>
-			<territory type="SD">An tSúdáin</territory>
+			<territory type="SD">an tSúdáin</territory>
 			<territory type="SE">an tSualainn</territory>
 			<territory type="SG">Singeapór</territory>
 			<territory type="SH">San Héilin</territory>
@@ -930,7 +935,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SK">an tSlóvaic</territory>
 			<territory type="SL">Siarra Leon</territory>
 			<territory type="SM">San Mairíne</territory>
-			<territory type="SN">An tSeineagáil</territory>
+			<territory type="SN">an tSeineagáil</territory>
 			<territory type="SO">an tSomáil</territory>
 			<territory type="SR">Suranam</territory>
 			<territory type="SS">an tSúdáin Theas</territory>
@@ -938,7 +943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SV">An tSalvadóir</territory>
 			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">an tSiria</territory>
-			<territory type="SZ">eSuaitíní</territory>
+			<territory type="SZ">Esuaitíní</territory>
 			<territory type="SZ" alt="variant">an tSuasalainn</territory>
 			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Oileáin na dTurcach agus Caicos</territory>
@@ -950,7 +955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="TK">Tócalá</territory>
 			<territory type="TL">Tíomór Thoir</territory>
 			<territory type="TM">an Tuircméanastáin</territory>
-			<territory type="TN">An Tuinéis</territory>
+			<territory type="TN">an Tuinéis</territory>
 			<territory type="TO">Tonga</territory>
 			<territory type="TR">an Tuirc</territory>
 			<territory type="TT">Oileán na Tríonóide agus Tobága</territory>
@@ -1082,67 +1087,104 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Formáid Airgeadra</key>
 			<key type="collation">Ord Sórtála</key>
 			<key type="currency">Airgeadra</key>
+			<key type="em">Léiriú mar Emoji</key>
 			<key type="hc">Timthriall Uaire (12 vs 24)</key>
-			<key type="lb">Stíl Briseadh Líne</key>
+			<key type="lb">Déine Briste Líne</key>
+			<key type="lw">Bristeacha Líne laistigh d’Fhocail</key>
 			<key type="ms">Córas Tomhais</key>
 			<key type="numbers">Uimhreacha</key>
+			<key type="ss">Briseadh Frása tar éis Giorrúcháin</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Féilire Búdaíoch</type>
+			<type key="calendar" type="buddhist" scope="core">Búdaíoch</type>
 			<type key="calendar" type="chinese">Féilire Síneach</type>
+			<type key="calendar" type="chinese" scope="core">Síneach</type>
 			<type key="calendar" type="coptic">Féilire Coptach</type>
+			<type key="calendar" type="coptic" scope="core">Coptach</type>
 			<type key="calendar" type="dangi">Féilire Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Féilire Aetóipice</type>
+			<type key="calendar" type="ethiopic" scope="core">Aetóipice</type>
 			<type key="calendar" type="ethiopic-amete-alem">Féilire Aetóipice Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Aetóipice Amete Alem</type>
 			<type key="calendar" type="gregorian">Féilire Ghréagóra</type>
+			<type key="calendar" type="gregorian" scope="core">Gréagóra</type>
 			<type key="calendar" type="hebrew">Féilire na nEabhrach</type>
+			<type key="calendar" type="hebrew" scope="core">Eabhrach</type>
 			<type key="calendar" type="indian">Féilire Náisiúnta na hIndia</type>
-			<type key="calendar" type="islamic">Féilire Hijri</type>
-			<type key="calendar" type="islamic-civil">Féilire Hijiri (táblach, seanré shibhialta)</type>
+			<type key="calendar" type="islamic">Féilire na Moslamach</type>
+			<type key="calendar" type="islamic" scope="core">Moslamach</type>
+			<type key="calendar" type="islamic-civil">Féilire na Moslamach (táblach, seanré shibhialta)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Moslamach (táblach, seanré shibhialta)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Féilire Ioslamach (an Araib Shádach, dearcadh)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">Féilire Ioslamach (táblach, seanré réalteolaíoch)</type>
-			<type key="calendar" type="islamic-umalqura">Féilire Hijiri (Umm al-Qura)</type>
-			<type key="calendar" type="iso8601">Féilire ISO-8601</type>
+			<type key="calendar" type="islamic-umalqura">Féilire na Moslamach (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Moslamach (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">Féilire Ghréagóra (an bhliain ag an tús)</type>
 			<type key="calendar" type="japanese">Féilire Seapánach</type>
+			<type key="calendar" type="japanese" scope="core">Seapánach</type>
 			<type key="calendar" type="persian">Féilire Peirseach</type>
+			<type key="calendar" type="persian" scope="core">Peirseach</type>
 			<type key="calendar" type="roc">Féilire Téavánach</type>
+			<type key="calendar" type="roc" scope="core">Téavánach</type>
 			<type key="cf" type="account">Formáid Airgeadra don Chuntasaíocht</type>
+			<type key="cf" type="account" scope="core">Cuntasaíocht</type>
 			<type key="cf" type="standard">Formáid Airgeadra Caighdeánach</type>
-			<type key="collation" type="big5han">Ord sórtála Síneach traidisiúnta - Big5</type>
+			<type key="cf" type="standard" scope="core">Caighdeánach</type>
 			<type key="collation" type="compat">Ord Sórtála Roimhe Seo, ar son na comhoiriúnachta</type>
 			<type key="collation" type="dictionary">Ord Sórtála Foclóirí</type>
 			<type key="collation" type="ducet">Ord Sórtála Réamhshocraithe Unicode</type>
+			<type key="collation" type="ducet" scope="core">Réamhshocraithe Unicode</type>
 			<type key="collation" type="emoji">Ord Sórtála Emoji</type>
 			<type key="collation" type="eor">Rialacha Ordaithe Eorpacha</type>
-			<type key="collation" type="gb2312han">Ord sórtála Síneach simplithe - GB 2312</type>
 			<type key="collation" type="phonebook">Ord sórtála an eolaire teileafóin</type>
 			<type key="collation" type="pinyin">Ord sórtála pinyin</type>
 			<type key="collation" type="search">Cuardach Ilfhóinteach</type>
+			<type key="collation" type="search" scope="core">Cuardach</type>
 			<type key="collation" type="searchjl">Cuardach de réir Consan Tosaigh Hangul</type>
 			<type key="collation" type="standard">Ord Sórtála Caighdeánach</type>
+			<type key="collation" type="standard" scope="core">Caighdeánach</type>
 			<type key="collation" type="stroke">Ord sórtála stríce</type>
 			<type key="collation" type="traditional">Ord sórtála traidisiúnta</type>
 			<type key="collation" type="unihan">Ord Sórtála Stríce Radacaí</type>
 			<type key="collation" type="zhuyin">Ord Sórtála Zhuyin</type>
+			<type key="em" type="default" scope="core">Réamhshocraithe</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Téacs</type>
 			<type key="hc" type="h11">Córas 12 Uair (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Córas 12 Uair (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Córas 24 Uair (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Córas 24 Uair (1–24)</type>
-			<type key="lb" type="loose">Stíl Briseadh Líne Scaoilte</type>
-			<type key="lb" type="normal">Stíl Gnáthbhriseadh Líne</type>
-			<type key="lb" type="strict">Stíl Briseadh Líne Docht</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">Stíl Scaoilte Briste Líne</type>
+			<type key="lb" type="loose" scope="core">Scaoilte</type>
+			<type key="lb" type="normal">Gnáthstíl Briste Líne</type>
+			<type key="lb" type="normal" scope="core">Gnách</type>
+			<type key="lb" type="strict">Stíl Dhian Briste Líne</type>
+			<type key="lb" type="strict" scope="core">Dian</type>
+			<type key="lw" type="breakall" scope="core">Bris gach rud</type>
+			<type key="lw" type="keepall" scope="core">Coinnigh gach rud</type>
+			<type key="lw" type="normal" scope="core">Gnách</type>
+			<type key="lw" type="phrase" scope="core">Coinnigh i bhfrásaí</type>
 			<type key="ms" type="metric">Córas Méadrach</type>
+			<type key="ms" type="metric" scope="core">Méadrach</type>
 			<type key="ms" type="uksystem">Córas Tomhais Reachtúil</type>
+			<type key="ms" type="uksystem" scope="core">RA</type>
 			<type key="ms" type="ussystem">Córas Tomhais SAM</type>
+			<type key="ms" type="ussystem" scope="core">SAM</type>
 			<type key="numbers" type="ahom">Digití Ahom</type>
 			<type key="numbers" type="arab">Digití Ind-Arabacha</type>
 			<type key="numbers" type="arabext">Digití Ind-Arabacha Breisithe</type>
 			<type key="numbers" type="armn">Uimhreacha Airméanacha</type>
-			<type key="numbers" type="armnlow">Uimhreacha Cás Íochtair Airméanacha</type>
+			<type key="numbers" type="armnlow">Uimhreacha Cáis Íochtair Airméanacha</type>
 			<type key="numbers" type="bali">Digití Bailíocha</type>
 			<type key="numbers" type="beng">Digití Beangálacha</type>
 			<type key="numbers" type="brah">Digití Brahmi</type>
-			<type key="numbers" type="cakm">Digití Chakma</type>
+			<type key="numbers" type="cakm">Digití Seácmacha</type>
 			<type key="numbers" type="cham">Digití Cham</type>
 			<type key="numbers" type="cyrl">Uimhreacha Coireallacha</type>
 			<type key="numbers" type="deva">Digití Déiveanágracha</type>
@@ -1151,19 +1193,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="geor">Uimhreacha Seoirseacha</type>
 			<type key="numbers" type="gonm">Digití Masaram Gondi</type>
 			<type key="numbers" type="grek">Uimhreacha Gréagacha</type>
-			<type key="numbers" type="greklow">Uimhreacha Cás Íochtair Gréagacha</type>
+			<type key="numbers" type="greklow">Uimhreacha Cáis Íochtair Gréagacha</type>
 			<type key="numbers" type="gujr">Digití Gúisearátacha</type>
 			<type key="numbers" type="guru">Digití Gurmúcacha</type>
 			<type key="numbers" type="hanidec">Uimhreacha Deachúlacha Síneacha</type>
-			<type key="numbers" type="hans">Uimhreacha sa tSínis Shimplithe</type>
-			<type key="numbers" type="hansfin">Uimhreacha Airgeadúla sa tSínis Shimplithe</type>
-			<type key="numbers" type="hant">Uimhreacha sa tSínis Thraidisiúnta</type>
-			<type key="numbers" type="hantfin">Uimhreacha Airgeadúla sa tSínis Thraidisiúnta</type>
+			<type key="numbers" type="hans">Uimhreacha na Sínise Simplithe</type>
+			<type key="numbers" type="hansfin">Uimhreacha Airgeadais na Sínise Simplithe</type>
+			<type key="numbers" type="hant">Uimhreacha na Sínise Traidisiúnta</type>
+			<type key="numbers" type="hantfin">Uimhreacha Airgeadais na Sínise Traidisiúnta</type>
 			<type key="numbers" type="hebr">Uimhreacha Eabhracha</type>
 			<type key="numbers" type="hmng">Digití Pahawh Hmong</type>
 			<type key="numbers" type="java">Digití Iávacha</type>
 			<type key="numbers" type="jpan">Uimhreacha Seapánacha</type>
-			<type key="numbers" type="jpanfin">Uimhreacha Airgeadúla Seapánacha</type>
+			<type key="numbers" type="jpanfin">Uimhreacha Airgeadais Seapánacha</type>
 			<type key="numbers" type="kali">Digití Kayah Li</type>
 			<type key="numbers" type="khmr">Digití Ciméaracha</type>
 			<type key="numbers" type="knda">Digití Cannadacha</type>
@@ -1191,7 +1233,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="orya">Digití Oiríseacha</type>
 			<type key="numbers" type="osma">Digití Osmanya</type>
 			<type key="numbers" type="roman">Uimhreacha Rómhánacha</type>
-			<type key="numbers" type="romanlow">Uimhreacha Cás Íochtair Rómhánacha</type>
+			<type key="numbers" type="romanlow">Uimhreacha Cáis Íochtair Rómhánacha</type>
 			<type key="numbers" type="saur">Digití Saurashtra</type>
 			<type key="numbers" type="shrd">Digití Sharada</type>
 			<type key="numbers" type="sind">Digití Khudawadi</type>
@@ -1200,14 +1242,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="sund">Digití Sundainéise</type>
 			<type key="numbers" type="takr">Digití Takri</type>
 			<type key="numbers" type="talu">Digití Tai Lue Nua</type>
-			<type key="numbers" type="taml">Uimhreacha Traidisiúnta Tamalacha</type>
+			<type key="numbers" type="taml">Uimhreacha Tamalacha Traidisiúnta</type>
 			<type key="numbers" type="tamldec">Digití Tamalacha</type>
 			<type key="numbers" type="telu">Digití Teileagúcha</type>
 			<type key="numbers" type="thai">Digití Téalannacha</type>
 			<type key="numbers" type="tibt">Digití Tibéadacha</type>
 			<type key="numbers" type="tirh">Digití Tirhuta</type>
-			<type key="numbers" type="vaii">Digití Vai</type>
+			<type key="numbers" type="vaii">Digití Vadhacha</type>
 			<type key="numbers" type="wara">Digití Warang Citi</type>
+			<type key="ss" type="none" scope="core">Múchta</type>
+			<type key="ss" type="standard" scope="core">Ar siúl</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Méadrach</measurementSystemName>
@@ -1306,10 +1350,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="M">LL</dateFormatItem>
@@ -1332,11 +1378,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1349,12 +1393,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">MM/y GGGGG – MM/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="G">d/M/y G – d/M/y G</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="G">E d/M/y G – E d/M/y G</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
 							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
 							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
@@ -1594,7 +1664,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd/MM/y</pattern>
+							<pattern>d/M/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1658,11 +1728,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1673,11 +1744,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one">'seachtain' 'a' W 'i' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="two">'seachtain' 'a' W 'i' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="few">'seachtain' 'a' W 'i' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="many">'seachtain' 'a' W 'i' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">'seachtain' 'a' W 'i' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">MMMM: 'seachtain' W</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="two">MMMM: 'seachtain' W</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="few">MMMM: 'seachtain' W</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="many">MMMM: 'seachtain' W</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM: 'seachtain' W</dateFormatItem>
 						<dateFormatItem id="yM">MM/y</dateFormatItem>
 						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E dd/MM/y</dateFormatItem>
@@ -1687,27 +1758,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-						<dateFormatItem id="yw" count="one">'seachtain' 'a' w 'in' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="two">'seachtain' 'a' w 'in' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="few">'seachtain' 'a' w 'in' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="many">'seachtain' 'a' w 'in' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other">'seachtain' 'a' w 'in' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">'seachtain' w 'in' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="two">'seachtain' w 'in' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="few">'seachtain' w 'in' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="many">'seachtain' w 'in' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other">'seachtain' w 'in' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="G">d/M/y G – d/M/y G</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="G">E d/M/y G – E d/M/y G</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1732,7 +1838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2536,7 +2641,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Cathair Anaithnid</exemplarCity>
+				<exemplarCity>Láthair Anaithnid</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>Andóra</exemplarCity>
@@ -2553,20 +2658,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Eireaván</exemplarCity>
 			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Stáisiún Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Tír Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Stáisiún Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Stáisiún Showa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Stáisiún Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Stáisiún Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Stáisiún Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Stáisiún Dumont-d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Stáisiún McMurdo</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vín</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity>Mac Guaire</exemplarCity>
+				<exemplarCity>Oileán Mhic Guaire</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Oileán an Tiarna Howe</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
 				<exemplarCity>Arúba</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
-				<exemplarCity>Baki</exemplarCity>
+				<exemplarCity>Bakı</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
 				<exemplarCity>Sairéavó</exemplarCity>
@@ -2592,12 +2724,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brúiné</exemplarCity>
 			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="Europe/Minsk">
 				<exemplarCity>Mionsc</exemplarCity>
 			</zone>
@@ -2605,11 +2731,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>an Bheilís</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
-				<exemplarCity>Oileán Cocos</exemplarCity>
+				<exemplarCity>Oileáin Cocos</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zürich</exemplarCity>
 			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Oileán na Cásca</exemplarCity>
+			</zone>
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Shang-hai</exemplarCity>
 			</zone>
@@ -2745,6 +2874,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Calcutta">
 				<exemplarCity>Calcúta</exemplarCity>
 			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Oileánra Chagos</exemplarCity>
+			</zone>
 			<zone type="Asia/Baghdad">
 				<exemplarCity>Bagdad</exemplarCity>
 			</zone>
@@ -2764,7 +2896,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Tóiceo</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Oileán Canton</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Oileáin Chomóra</exemplarCity>
@@ -2814,12 +2946,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Antananarivo">
 				<exemplarCity>Antananairíveo</exemplarCity>
 			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Oileáin Kwajalein</exemplarCity>
+			</zone>
 			<zone type="Europe/Skopje">
 				<exemplarCity>Scóipé</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Rangún</exemplarCity>
 			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>Ulan Bator</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>Macau</exemplarCity>
+			</zone>
 			<zone type="Africa/Nouakchott">
 				<exemplarCity>Nuacsat</exemplarCity>
 			</zone>
@@ -2835,24 +2976,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Oileáin Mhaildíve</exemplarCity>
 			</zone>
-			<zone type="America/Bahia_Banderas">
-				<exemplarCity>Bahia Banderas</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Cathair Mheicsiceo</exemplarCity>
 			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Merida</exemplarCity>
-			</zone>
 			<zone type="Africa/Maputo">
 				<exemplarCity>Mapútó</exemplarCity>
 			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Oileán Norfolk</exemplarCity>
+			</zone>
 			<zone type="Europe/Amsterdam">
 				<exemplarCity>Amstardam</exemplarCity>
 			</zone>
 			<zone type="Europe/Oslo">
 				<exemplarCity>Osló</exemplarCity>
 			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Katmandu</exemplarCity>
+			</zone>
 			<zone type="Pacific/Nauru">
 				<exemplarCity>Nárú</exemplarCity>
 			</zone>
@@ -2907,6 +3048,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Yakutsk">
 				<exemplarCity>Iacútsc</exemplarCity>
 			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>Sacailín</exemplarCity>
+			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Cartúm</exemplarCity>
 			</zone>
@@ -2940,9 +3084,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>an Damaisc</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity>Túinis</exemplarCity>
 			</zone>
@@ -2958,20 +3099,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Midway">
 				<exemplarCity>Oileáin Midway</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Oileán Wake</exemplarCity>
+			</zone>
 			<zone type="America/New_York">
 				<exemplarCity>Nua-Eabhrac</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
 				<exemplarCity>an Vatacáin</exemplarCity>
 			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>San Uinseann</exemplarCity>
-			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Cathair Ho Chi Minh</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity>Vailís</exemplarCity>
+				<exemplarCity>Wallis agus Futuna</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
 				<exemplarCity>Áidin</exemplarCity>
@@ -3005,9 +3146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Am Iarthar na hAfraice</generic>
-					<standard>Am Caighdeánach Iarthar na hAfraice</standard>
-					<daylight>Am Samhraidh Iarthar na hAfraice</daylight>
+					<standard>Am Iarthar na hAfraice</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3073,9 +3212,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Am Apia</generic>
-					<standard>Am Caighdeánach Apia</standard>
-					<daylight>Am Samhraidh Apia</daylight>
+					<generic>Am Shamó</generic>
+					<standard>Am Caighdeánach Shamó</standard>
+					<daylight>Am Samhraidh Shamó</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3257,7 +3396,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>Am Oileáin Cook</generic>
 					<standard>Am Caighdeánach Oileáin Cook</standard>
-					<daylight>Am Leathshamhraidh Oileáin Cook</daylight>
+					<daylight>Am Samhraidh Oileáin Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -3378,7 +3517,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard>Am Chireabaití</standard>
+					<standard>Am Chiribeas</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
@@ -3418,6 +3557,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Am na Guáine</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Am Caighdeánach Haváí-Ailiúit</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Am Haváí-Ailiúit</generic>
@@ -3434,9 +3578,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Am Hovd</generic>
-					<standard>Am Caighdeánach Hovd</standard>
-					<daylight>Am Samhraidh Hovd</daylight>
+					<generic>Am Khovd</generic>
+					<standard>Am Caighdeánach Khovd</standard>
+					<daylight>Am Samhraidh Khovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -3616,8 +3760,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<metazone type="Mongolia">
 				<long>
 					<generic>Am Ulánbátar</generic>
-					<standard>Am Caighdeánach Ulánbátar</standard>
-					<daylight>Am Samhraidh Ulánbátar</daylight>
+					<standard>Am Caighdeánach Ulan Bator</standard>
+					<daylight>Am Samhraidh Ulan Bator</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
@@ -3758,7 +3902,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Am Phohnpei</standard>
+					<standard>Am Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
@@ -3799,9 +3943,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Am Shamó</generic>
-					<standard>Am Caighdeánach Shamó</standard>
-					<daylight>Am Samhraidh Shamó</daylight>
+					<generic>Am Shamó Mheiriceá</generic>
+					<standard>Am Caighdeánach Shamó Mheiriceá</standard>
+					<daylight>Am Samhraidh Shamó Mheiriceá</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -3853,7 +3997,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard>Am Oileáin Tócalá</standard>
+					<standard>Am Oileáin Thócaláú</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
@@ -4046,7 +4190,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4057,123 +4200,123 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="one">¤0k</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0K</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0k</pattern>
 					<pattern type="1000" count="two">¤0k</pattern>
-					<pattern type="1000" count="two" alt="alphaNextToNumber">¤0K</pattern>
+					<pattern type="1000" count="two" alt="alphaNextToNumber">¤ 0k</pattern>
 					<pattern type="1000" count="few">¤0k</pattern>
-					<pattern type="1000" count="few" alt="alphaNextToNumber">¤0K</pattern>
+					<pattern type="1000" count="few" alt="alphaNextToNumber">¤ 0k</pattern>
 					<pattern type="1000" count="many">¤0k</pattern>
-					<pattern type="1000" count="many" alt="alphaNextToNumber">¤0K</pattern>
+					<pattern type="1000" count="many" alt="alphaNextToNumber">¤ 0k</pattern>
 					<pattern type="1000" count="other">¤0k</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0K</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0k</pattern>
 					<pattern type="10000" count="one">¤00k</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00K</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00k</pattern>
 					<pattern type="10000" count="two">¤00k</pattern>
-					<pattern type="10000" count="two" alt="alphaNextToNumber">¤00K</pattern>
+					<pattern type="10000" count="two" alt="alphaNextToNumber">¤ 00k</pattern>
 					<pattern type="10000" count="few">¤00k</pattern>
-					<pattern type="10000" count="few" alt="alphaNextToNumber">¤00K</pattern>
+					<pattern type="10000" count="few" alt="alphaNextToNumber">¤ 00k</pattern>
 					<pattern type="10000" count="many">¤00k</pattern>
-					<pattern type="10000" count="many" alt="alphaNextToNumber">¤00K</pattern>
+					<pattern type="10000" count="many" alt="alphaNextToNumber">¤ 00k</pattern>
 					<pattern type="10000" count="other">¤00k</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00K</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00k</pattern>
 					<pattern type="100000" count="one">¤000k</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000K</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000k</pattern>
 					<pattern type="100000" count="two">¤000k</pattern>
-					<pattern type="100000" count="two" alt="alphaNextToNumber">¤000K</pattern>
+					<pattern type="100000" count="two" alt="alphaNextToNumber">¤ 000k</pattern>
 					<pattern type="100000" count="few">¤000k</pattern>
-					<pattern type="100000" count="few" alt="alphaNextToNumber">¤000K</pattern>
+					<pattern type="100000" count="few" alt="alphaNextToNumber">¤ 000k</pattern>
 					<pattern type="100000" count="many">¤000k</pattern>
-					<pattern type="100000" count="many" alt="alphaNextToNumber">¤000K</pattern>
+					<pattern type="100000" count="many" alt="alphaNextToNumber">¤ 000k</pattern>
 					<pattern type="100000" count="other">¤000k</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000k</pattern>
 					<pattern type="1000000" count="one">¤0M</pattern>
 					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="1000000" count="two">¤0M</pattern>
-					<pattern type="1000000" count="two" alt="alphaNextToNumber">¤0M</pattern>
+					<pattern type="1000000" count="two" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="1000000" count="few">¤0M</pattern>
-					<pattern type="1000000" count="few" alt="alphaNextToNumber">¤0M</pattern>
+					<pattern type="1000000" count="few" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="1000000" count="many">¤0M</pattern>
-					<pattern type="1000000" count="many" alt="alphaNextToNumber">¤0M</pattern>
+					<pattern type="1000000" count="many" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="1000000" count="other">¤0M</pattern>
 					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="10000000" count="one">¤00M</pattern>
 					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="10000000" count="two">¤00M</pattern>
-					<pattern type="10000000" count="two" alt="alphaNextToNumber">¤00M</pattern>
+					<pattern type="10000000" count="two" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="10000000" count="few">¤00M</pattern>
-					<pattern type="10000000" count="few" alt="alphaNextToNumber">¤00M</pattern>
+					<pattern type="10000000" count="few" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="10000000" count="many">¤00M</pattern>
-					<pattern type="10000000" count="many" alt="alphaNextToNumber">¤00M</pattern>
+					<pattern type="10000000" count="many" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="10000000" count="other">¤00M</pattern>
 					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="100000000" count="one">¤000M</pattern>
 					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="100000000" count="two">¤000M</pattern>
-					<pattern type="100000000" count="two" alt="alphaNextToNumber">¤000M</pattern>
+					<pattern type="100000000" count="two" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="100000000" count="few">¤000M</pattern>
-					<pattern type="100000000" count="few" alt="alphaNextToNumber">¤000M</pattern>
+					<pattern type="100000000" count="few" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="100000000" count="many">¤000M</pattern>
-					<pattern type="100000000" count="many" alt="alphaNextToNumber">¤000M</pattern>
+					<pattern type="100000000" count="many" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="100000000" count="other">¤000M</pattern>
 					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="1000000000" count="one">¤0B</pattern>
 					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0B</pattern>
 					<pattern type="1000000000" count="two">¤0B</pattern>
-					<pattern type="1000000000" count="two" alt="alphaNextToNumber">¤0B</pattern>
+					<pattern type="1000000000" count="two" alt="alphaNextToNumber">¤ 0B</pattern>
 					<pattern type="1000000000" count="few">¤0B</pattern>
-					<pattern type="1000000000" count="few" alt="alphaNextToNumber">¤0B</pattern>
+					<pattern type="1000000000" count="few" alt="alphaNextToNumber">¤ 0B</pattern>
 					<pattern type="1000000000" count="many">¤0B</pattern>
-					<pattern type="1000000000" count="many" alt="alphaNextToNumber">¤0B</pattern>
+					<pattern type="1000000000" count="many" alt="alphaNextToNumber">¤ 0B</pattern>
 					<pattern type="1000000000" count="other">¤0B</pattern>
 					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B</pattern>
 					<pattern type="10000000000" count="one">¤00B</pattern>
 					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00B</pattern>
 					<pattern type="10000000000" count="two">¤00B</pattern>
-					<pattern type="10000000000" count="two" alt="alphaNextToNumber">¤00B</pattern>
+					<pattern type="10000000000" count="two" alt="alphaNextToNumber">¤ 00B</pattern>
 					<pattern type="10000000000" count="few">¤00B</pattern>
-					<pattern type="10000000000" count="few" alt="alphaNextToNumber">¤00B</pattern>
+					<pattern type="10000000000" count="few" alt="alphaNextToNumber">¤ 00B</pattern>
 					<pattern type="10000000000" count="many">¤00B</pattern>
-					<pattern type="10000000000" count="many" alt="alphaNextToNumber">¤00B</pattern>
+					<pattern type="10000000000" count="many" alt="alphaNextToNumber">¤ 00B</pattern>
 					<pattern type="10000000000" count="other">¤00B</pattern>
 					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B</pattern>
 					<pattern type="100000000000" count="one">¤000B</pattern>
 					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000B</pattern>
 					<pattern type="100000000000" count="two">¤000B</pattern>
-					<pattern type="100000000000" count="two" alt="alphaNextToNumber">¤000B</pattern>
+					<pattern type="100000000000" count="two" alt="alphaNextToNumber">¤ 000B</pattern>
 					<pattern type="100000000000" count="few">¤000B</pattern>
-					<pattern type="100000000000" count="few" alt="alphaNextToNumber">¤000B</pattern>
+					<pattern type="100000000000" count="few" alt="alphaNextToNumber">¤ 000B</pattern>
 					<pattern type="100000000000" count="many">¤000B</pattern>
-					<pattern type="100000000000" count="many" alt="alphaNextToNumber">¤000B</pattern>
+					<pattern type="100000000000" count="many" alt="alphaNextToNumber">¤ 000B</pattern>
 					<pattern type="100000000000" count="other">¤000B</pattern>
 					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
 					<pattern type="1000000000000" count="one">¤0T</pattern>
 					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="1000000000000" count="two">¤0T</pattern>
-					<pattern type="1000000000000" count="two" alt="alphaNextToNumber">¤0T</pattern>
+					<pattern type="1000000000000" count="two" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="1000000000000" count="few">¤0T</pattern>
-					<pattern type="1000000000000" count="few" alt="alphaNextToNumber">¤0T</pattern>
+					<pattern type="1000000000000" count="few" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="1000000000000" count="many">¤0T</pattern>
-					<pattern type="1000000000000" count="many" alt="alphaNextToNumber">¤0T</pattern>
+					<pattern type="1000000000000" count="many" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="1000000000000" count="other">¤0T</pattern>
 					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="10000000000000" count="one">¤00T</pattern>
 					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="10000000000000" count="two">¤00T</pattern>
-					<pattern type="10000000000000" count="two" alt="alphaNextToNumber">¤00T</pattern>
+					<pattern type="10000000000000" count="two" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="10000000000000" count="few">¤00T</pattern>
-					<pattern type="10000000000000" count="few" alt="alphaNextToNumber">¤00T</pattern>
+					<pattern type="10000000000000" count="few" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="10000000000000" count="many">¤00T</pattern>
-					<pattern type="10000000000000" count="many" alt="alphaNextToNumber">¤00T</pattern>
+					<pattern type="10000000000000" count="many" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="10000000000000" count="other">¤00T</pattern>
 					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="100000000000000" count="one">¤000T</pattern>
 					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T</pattern>
 					<pattern type="100000000000000" count="two">¤000T</pattern>
-					<pattern type="100000000000000" count="two" alt="alphaNextToNumber">¤000T</pattern>
+					<pattern type="100000000000000" count="two" alt="alphaNextToNumber">¤ 000T</pattern>
 					<pattern type="100000000000000" count="few">¤000T</pattern>
-					<pattern type="100000000000000" count="few" alt="alphaNextToNumber">¤000T</pattern>
+					<pattern type="100000000000000" count="few" alt="alphaNextToNumber">¤ 000T</pattern>
 					<pattern type="100000000000000" count="many">¤000T</pattern>
-					<pattern type="100000000000000" count="many" alt="alphaNextToNumber">¤000T</pattern>
+					<pattern type="100000000000000" count="many" alt="alphaNextToNumber">¤ 000T</pattern>
 					<pattern type="100000000000000" count="other">¤000T</pattern>
 					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
 				</currencyFormat>
@@ -5506,7 +5649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="two">pheso na nOileán Filipíneach</displayName>
 				<displayName count="few">pheso na nOileán Filipíneach</displayName>
 				<displayName count="many">bpeso na nOileán Filipíneach</displayName>
-				<displayName count="other">peso na nOileán Filipíneach</displayName>
+				<displayName count="other">pesos na nOileán Filipíneach</displayName>
 			</currency>
 			<currency type="PKR">
 				<displayName>Rúipí na Pacastáine</displayName>
@@ -5545,11 +5688,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="QAR">
 				<displayName>Riyal Chatar</displayName>
-				<displayName count="one">riyal Chatar</displayName>
-				<displayName count="two">riyal Chatar</displayName>
-				<displayName count="few">riyal Chatar</displayName>
-				<displayName count="many">riyal Chatar</displayName>
-				<displayName count="other">riyal Chatar</displayName>
+				<displayName count="one">riyals Chatar</displayName>
+				<displayName count="two">riyals Chatar</displayName>
+				<displayName count="few">riyals Chatar</displayName>
+				<displayName count="many">riyals Chatar</displayName>
+				<displayName count="other">riyals Chatar</displayName>
 			</currency>
 			<currency type="ROL">
 				<displayName>Leu na Rómáine (1952–2006)</displayName>
@@ -6046,6 +6189,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">ndollar na Cairibe Thoir</displayName>
 				<displayName count="other">dollar na Cairibe Thoir</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>gildear Chairib</displayName>
+				<displayName count="one">ghildear Chairib</displayName>
+				<displayName count="two">ghildear Chairib</displayName>
+				<displayName count="few">ghildear Chairib</displayName>
+				<displayName count="many">ngildear Chairib</displayName>
+				<displayName count="other">gildir Chairib</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Cearta Speisialta Tarraingthe</displayName>
 			</currency>
@@ -6163,6 +6314,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Dollar Siombábach (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ór na Siombáibe</displayName>
+				<displayName count="one">ór na Siombáibe</displayName>
+				<displayName count="two">ór na Siombáibe</displayName>
+				<displayName count="few">ór na Siombáibe</displayName>
+				<displayName count="many">n-ór na Siombáibe</displayName>
+				<displayName count="other">ór na Siombáibe</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Dollar na Siombáibe (2009)</displayName>
 			</currency>
@@ -6285,7 +6444,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>méadair sa soicind cearnaithe</displayName>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>imrothlú</displayName>
+				<displayName>imrothluithe</displayName>
 				<unitPattern count="one">{0} imrothlú</unitPattern>
 				<unitPattern count="two">{0} imrothlú</unitPattern>
 				<unitPattern count="few">{0} imrothlú</unitPattern>
@@ -6401,11 +6560,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-karat">
 				<displayName>carait</displayName>
-				<unitPattern count="one">{0} charat óir</unitPattern>
-				<unitPattern count="two">{0} charat óir</unitPattern>
+				<unitPattern count="one">{0} charat</unitPattern>
+				<unitPattern count="two">{0} charat</unitPattern>
 				<unitPattern count="few">{0} charat</unitPattern>
-				<unitPattern count="many">{0} gcarat óir</unitPattern>
-				<unitPattern count="other">{0} carat óir</unitPattern>
+				<unitPattern count="many">{0} gcarat</unitPattern>
+				<unitPattern count="other">{0} carat</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<displayName>milleagraim sa deicilítear</displayName>
@@ -6423,7 +6582,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} milleamól sa lítear</unitPattern>
 				<unitPattern count="other">{0} milleamól sa lítear</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-item">
+				<displayName>míreanna</displayName>
+				<unitPattern count="one">{0} mhír</unitPattern>
+				<unitPattern count="two">{0} mhír</unitPattern>
+				<unitPattern count="few">{0} mhír</unitPattern>
+				<unitPattern count="many">{0} mír</unitPattern>
+				<unitPattern count="other">{0} mír</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>codanna</displayName>
+				<unitPattern count="one">{0} chuid</unitPattern>
+				<unitPattern count="two">{0} chuid</unitPattern>
+				<unitPattern count="few">{0} chuid</unitPattern>
+				<unitPattern count="many">{0} gcuid</unitPattern>
+				<unitPattern count="other">{0} cuid</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>codanna sa mhilliún</displayName>
 				<unitPattern count="one">{0} chuid sa mhilliún</unitPattern>
 				<unitPattern count="two">{0} chuid sa mhilliún</unitPattern>
@@ -6456,6 +6631,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>móil</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glúcóis</displayName>
+				<unitPattern count="one">{0} glúcóis</unitPattern>
+				<unitPattern count="two">{0} glúcóis</unitPattern>
+				<unitPattern count="few">{0} glúcóis</unitPattern>
+				<unitPattern count="many">{0} glúcóis</unitPattern>
+				<unitPattern count="other">{0} glúcóis</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítir sa chiliméadar</displayName>
 				<unitPattern count="one">{0} lítear sa chiliméadar</unitPattern>
@@ -6726,9 +6909,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="force-newton">
 				<displayName>niútain</displayName>
 				<unitPattern count="one">{0} niútan</unitPattern>
-				<unitPattern count="two">{0} N</unitPattern>
-				<unitPattern count="few">{0} N</unitPattern>
-				<unitPattern count="many">{0} N</unitPattern>
+				<unitPattern count="two">{0} niútan</unitPattern>
+				<unitPattern count="few">{0} niútan</unitPattern>
+				<unitPattern count="many">{0} niútan</unitPattern>
 				<unitPattern count="other">{0} niútan</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
@@ -6922,12 +7105,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} muirmh.</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<displayName>míle Lochlannach</displayName>
+				<displayName>mílte Lochlannacha</displayName>
 				<unitPattern count="one">{0} mhíle Lochlannach</unitPattern>
 				<unitPattern count="two">{0} mhíle Lochlannacha</unitPattern>
 				<unitPattern count="few">{0} mhíle Lochlannacha</unitPattern>
 				<unitPattern count="many">{0} míle Lochlannacha</unitPattern>
-				<unitPattern count="other">{0} míle Lochlannach</unitPattern>
+				<unitPattern count="other">{0} míle Lochlannacha</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
 				<unitPattern count="one">{0} ghriangha</unitPattern>
@@ -6937,6 +7120,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} griangha</unitPattern>
 			</unit>
 			<unit type="light-lux">
+				<displayName>lucsaí</displayName>
 				<unitPattern count="one">{0} lucsa</unitPattern>
 				<unitPattern count="two">{0} lucsa</unitPattern>
 				<unitPattern count="few">{0} lucsa</unitPattern>
@@ -6944,7 +7128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} lucsa</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName>caindéile</displayName>
+				<displayName>caindéilí</displayName>
 				<unitPattern count="one">{0} chaindéile</unitPattern>
 				<unitPattern count="two">{0} chaindéile</unitPattern>
 				<unitPattern count="few">{0} chaindéile</unitPattern>
@@ -6952,7 +7136,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} caindéile</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<displayName>lúman</displayName>
+				<displayName>lúmain</displayName>
 				<unitPattern count="one">{0} lúman</unitPattern>
 				<unitPattern count="two">{0} lúman</unitPattern>
 				<unitPattern count="few">{0} lúman</unitPattern>
@@ -7128,6 +7312,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} milliméadar mearcair</unitPattern>
 				<unitPattern count="other">{0} milliméadar mearcair</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>mearcair</displayName>
+				<unitPattern count="one">{0} mearcair</unitPattern>
+				<unitPattern count="two">{0} mearcair</unitPattern>
+				<unitPattern count="few">{0} mearcair</unitPattern>
+				<unitPattern count="many">{0} mearcair</unitPattern>
+				<unitPattern count="other">{0} mearcair</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>puint san orlach cearnach</displayName>
 				<unitPattern count="one">{0} phunt san orlach cearnach</unitPattern>
@@ -7228,18 +7420,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName>punt-troigh</displayName>
-				<unitPattern count="one">{0} punt-troigh</unitPattern>
-				<unitPattern count="two">{0} lbf⋅ft</unitPattern>
-				<unitPattern count="few">{0} lbf⋅ft</unitPattern>
-				<unitPattern count="many">{0} lbf⋅ft</unitPattern>
+				<unitPattern count="one">{0} phunt-troigh</unitPattern>
+				<unitPattern count="two">{0} phunt-troigh</unitPattern>
+				<unitPattern count="few">{0} phunt-troigh</unitPattern>
+				<unitPattern count="many">{0} bpunt-troigh</unitPattern>
 				<unitPattern count="other">{0} punt-troigh</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<displayName>méadar niútain</displayName>
+				<displayName>méadair niútain</displayName>
 				<unitPattern count="one">{0} mhéadar niútain</unitPattern>
 				<unitPattern count="two">{0} mhéadar niútain</unitPattern>
-				<unitPattern count="few">{0} N⋅m</unitPattern>
-				<unitPattern count="many">{0} N⋅m</unitPattern>
+				<unitPattern count="few">{0} mhéadar niútain</unitPattern>
+				<unitPattern count="many">{0} méadar niútain</unitPattern>
 				<unitPattern count="other">{0} méadar niútain</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
@@ -7364,6 +7556,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} gcupán mhéadracha</unitPattern>
 				<unitPattern count="other">{0} cupán méadrach</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>unsaí leachtacha méadracha</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acra-troithe</displayName>
 				<unitPattern count="one">{0} acra-troigh</unitPattern>
@@ -7459,7 +7654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} spúnóg mhilseoige impiriúla</unitPattern>
 				<unitPattern count="few">{0} spúnóg mhilseoige impiriúla</unitPattern>
 				<unitPattern count="many">{0} spúnóg mhilseoige impiriúla</unitPattern>
-				<unitPattern count="other">{0} spúnóg mhilseoige impiriúol</unitPattern>
+				<unitPattern count="other">{0} spúnóg mhilseoige impiriúla</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>dram leachtach</displayName>
@@ -7469,8 +7664,119 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ndram leachtacha</unitPattern>
 				<unitPattern count="other">{0} dram leachtach</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>stearaidiain</displayName>
+				<unitPattern count="one">{0} stearaidian</unitPattern>
+				<unitPattern count="two">{0} stearaidian</unitPattern>
+				<unitPattern count="few">{0} stearaidian</unitPattern>
+				<unitPattern count="many">{0} stearaidian</unitPattern>
+				<unitPattern count="other">{0} stearaidian</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>catail</displayName>
+				<unitPattern count="one">{0} chatal</unitPattern>
+				<unitPattern count="two">{0} chatal</unitPattern>
+				<unitPattern count="few">{0} chatal</unitPattern>
+				<unitPattern count="many">{0} gcatal</unitPattern>
+				<unitPattern count="other">{0} catal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>cúlóim</displayName>
+				<unitPattern count="one">{0} chúlóm</unitPattern>
+				<unitPattern count="two">{0} chúlóm</unitPattern>
+				<unitPattern count="few">{0} chúlóm</unitPattern>
+				<unitPattern count="many">{0} gcúlóm</unitPattern>
+				<unitPattern count="other">{0} cúlóm</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faraid</displayName>
+				<unitPattern count="one">{0} fharad</unitPattern>
+				<unitPattern count="two">{0} fharad</unitPattern>
+				<unitPattern count="few">{0} fharad</unitPattern>
+				<unitPattern count="many">{0} bhfarad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>hanraithe</displayName>
+				<unitPattern count="one">{0} hanraí</unitPattern>
+				<unitPattern count="two">{0} hanraí</unitPattern>
+				<unitPattern count="few">{0} hanraí</unitPattern>
+				<unitPattern count="many">{0} hanraí</unitPattern>
+				<unitPattern count="other">{0} hanraí</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>síminí</displayName>
+				<unitPattern count="one">{0} shímin</unitPattern>
+				<unitPattern count="two">{0} shímin</unitPattern>
+				<unitPattern count="few">{0} shímin</unitPattern>
+				<unitPattern count="many">{0} símin</unitPattern>
+				<unitPattern count="other">{0} símin</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calraí [IT]</displayName>
+				<unitPattern count="one">{0} chalra [IT]</unitPattern>
+				<unitPattern count="two">{0} chalra [IT]</unitPattern>
+				<unitPattern count="few">{0} chalra [IT]</unitPattern>
+				<unitPattern count="many">{0} gcalra [IT]</unitPattern>
+				<unitPattern count="other">{0} calra [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>beicireilí</displayName>
+				<unitPattern count="one">{0} bheicireil</unitPattern>
+				<unitPattern count="two">{0} bheicireil</unitPattern>
+				<unitPattern count="few">{0} bheicireil</unitPattern>
+				<unitPattern count="many">{0} mbeicireil</unitPattern>
+				<unitPattern count="other">{0} beicireil</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sívirt</displayName>
+				<unitPattern count="one">{0} síveart</unitPattern>
+				<unitPattern count="two">{0} shíveart</unitPattern>
+				<unitPattern count="few">{0} shíveart</unitPattern>
+				<unitPattern count="many">{0} síveart</unitPattern>
+				<unitPattern count="other">{0} síveart</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>graeanna</displayName>
+				<unitPattern count="one">{0} ghrae</unitPattern>
+				<unitPattern count="two">{0} ghrae</unitPattern>
+				<unitPattern count="few">{0} ghrae</unitPattern>
+				<unitPattern count="many">{0} ngrae</unitPattern>
+				<unitPattern count="other">{0} grae</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>cileagraim fórsa</displayName>
+				<unitPattern count="one">{0} chileagram fórsa</unitPattern>
+				<unitPattern count="two">{0} chileagram fórsa</unitPattern>
+				<unitPattern count="few">{0} chileagram fórsa</unitPattern>
+				<unitPattern count="many">{0} gcileagram fórsa</unitPattern>
+				<unitPattern count="other">{0} cileagram fórsa</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teislí</displayName>
+				<unitPattern count="one">{0} teisle</unitPattern>
+				<unitPattern count="two">{0} theisle</unitPattern>
+				<unitPattern count="few">{0} theisle</unitPattern>
+				<unitPattern count="many">{0} dteisle</unitPattern>
+				<unitPattern count="other">{0} teisle</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>véibir</displayName>
+				<unitPattern count="one">{0} véibear</unitPattern>
+				<unitPattern count="two">{0} véibear</unitPattern>
+				<unitPattern count="few">{0} véibear</unitPattern>
+				<unitPattern count="many">{0} véibear</unitPattern>
+				<unitPattern count="other">{0} véibear</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>solas</displayName>
+				<unitPattern count="one">{0} solas</unitPattern>
+				<unitPattern count="two">{0} sholas</unitPattern>
+				<unitPattern count="few">{0} sholas</unitPattern>
+				<unitPattern count="many">{0} solas</unitPattern>
+				<unitPattern count="other">{0} solas</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>oícheanta</displayName>
 				<unitPattern count="one">{0} oíche amháin</unitPattern>
 				<unitPattern count="two">{0} oíche</unitPattern>
 				<unitPattern count="few">{0} oíche</unitPattern>
@@ -7508,12 +7814,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="angle-degree">
 				<displayName>céimeanna</displayName>
+				<unitPattern count="one">{0} chéim</unitPattern>
+				<unitPattern count="two">{0} chéim</unitPattern>
+				<unitPattern count="few">{0} chéim</unitPattern>
+				<unitPattern count="many">{0} gcéim</unitPattern>
+				<unitPattern count="other">{0} céim</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName>nóiméid stua</displayName>
+				<displayName>nóim. stua</displayName>
+				<unitPattern count="one">{0} nóim. stua</unitPattern>
+				<unitPattern count="two">{0} nóim. stua</unitPattern>
+				<unitPattern count="few">{0} nóim. stua</unitPattern>
+				<unitPattern count="many">{0} nóim. stua</unitPattern>
+				<unitPattern count="other">{0} nóim. stua</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName>soic. stua</displayName>
+				<unitPattern count="one">{0} soic. stua</unitPattern>
+				<unitPattern count="two">{0} shoic. stua</unitPattern>
+				<unitPattern count="few">{0} shoic. stua</unitPattern>
+				<unitPattern count="many">{0} soic. stua</unitPattern>
+				<unitPattern count="other">{0} soic. stua</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>heicteáir</displayName>
@@ -7562,10 +7883,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ndunam</unitPattern>
 				<unitPattern count="other">{0} dunam</unitPattern>
 			</unit>
+			<unit type="concentr-karat">
+				<displayName>carait</displayName>
+				<unitPattern count="one">{0} ct</unitPattern>
+				<unitPattern count="two">{0} ct</unitPattern>
+				<unitPattern count="few">{0} ct</unitPattern>
+				<unitPattern count="many">{0} ct</unitPattern>
+				<unitPattern count="other">{0} ct</unitPattern>
+			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<displayName>milleamól/lítear</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-item">
+				<displayName>mír.</displayName>
+				<unitPattern count="one">{0} mhír</unitPattern>
+				<unitPattern count="two">{0} mhír</unitPattern>
+				<unitPattern count="few">{0} mhír</unitPattern>
+				<unitPattern count="many">{0} mír</unitPattern>
+				<unitPattern count="other">{0} mír</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>cod.</displayName>
+				<unitPattern count="one">{0} chuid</unitPattern>
+				<unitPattern count="two">{0} chuid</unitPattern>
+				<unitPattern count="few">{0} chuid</unitPattern>
+				<unitPattern count="many">{0} gcuid</unitPattern>
+				<unitPattern count="other">{0} cuid</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>codanna/milliún</displayName>
 				<unitPattern count="one">{0}/milliún</unitPattern>
 				<unitPattern count="two">{0}/milliún</unitPattern>
@@ -7590,6 +7935,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} mól</unitPattern>
 				<unitPattern count="other">{0} mól</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="many">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítir/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7651,6 +8004,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} bl</unitPattern>
 				<unitPattern count="many">{0} bl</unitPattern>
 				<unitPattern count="other">{0} bl</unitPattern>
+				<perUnitPattern>{0}/bl</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<displayName>ctú</displayName>
@@ -7862,11 +8216,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-mile-scandinavian">
 				<displayName>míle Lochl.</displayName>
-				<unitPattern count="one">{0} míle Lch</unitPattern>
-				<unitPattern count="two">{0} mhíle Lch</unitPattern>
-				<unitPattern count="few">{0} mhíle Lch</unitPattern>
-				<unitPattern count="many">{0} míle Lch</unitPattern>
-				<unitPattern count="other">{0} míle Lch</unitPattern>
+				<unitPattern count="one">{0} mhíle Lochl.</unitPattern>
+				<unitPattern count="two">{0} mhíle Lochl.</unitPattern>
+				<unitPattern count="few">{0} mhíle Lochl.</unitPattern>
+				<unitPattern count="many">{0} míle Lochl.</unitPattern>
+				<unitPattern count="other">{0} míle Lochl.</unitPattern>
 			</unit>
 			<unit type="length-point">
 				<displayName>pointí</displayName>
@@ -7875,7 +8229,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>raonta gréine</displayName>
 			</unit>
 			<unit type="light-lux">
-				<displayName>lucsa</displayName>
+				<displayName>lucs.</displayName>
+			</unit>
+			<unit type="light-candela">
+				<displayName>caindéilí</displayName>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>lúmain</displayName>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>lonrachtaí gréine</displayName>
@@ -8195,6 +8555,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} gcárt impiriúla</unitPattern>
 				<unitPattern count="other">{0} cárt impiriúil</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="many">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="two">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="many">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="two">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="many">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="many">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="many">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="two">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="many">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="many">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="many">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>solas</displayName>
+				<unitPattern count="one">{0} solas</unitPattern>
+				<unitPattern count="two">{0} sholas</unitPattern>
+				<unitPattern count="few">{0} sholas</unitPattern>
+				<unitPattern count="many">{0} solas</unitPattern>
+				<unitPattern count="other">{0} solas</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>oícheanta</displayName>
 				<unitPattern count="one">{0} oíche</unitPattern>
@@ -8220,6 +8645,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<unitPattern count="one">{0}imr</unitPattern>
+				<unitPattern count="two">{0}imr</unitPattern>
+				<unitPattern count="few">{0}imr</unitPattern>
+				<unitPattern count="many">{0}imr</unitPattern>
+				<unitPattern count="other">{0}imr</unitPattern>
+			</unit>
 			<unit type="angle-radian">
 				<displayName>raid</displayName>
 				<unitPattern count="one">{0}raid</unitPattern>
@@ -8235,15 +8667,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>nóim. stua</displayName>
 			</unit>
 			<unit type="concentr-karat">
-				<unitPattern count="one">{0}kt</unitPattern>
-				<unitPattern count="two">{0}kt</unitPattern>
-				<unitPattern count="few">{0}kt</unitPattern>
-				<unitPattern count="many">{0}kt</unitPattern>
-				<unitPattern count="other">{0}kt</unitPattern>
+				<displayName>carat</displayName>
+				<unitPattern count="one">{0}ct</unitPattern>
+				<unitPattern count="two">{0}ct</unitPattern>
+				<unitPattern count="few">{0}ct</unitPattern>
+				<unitPattern count="many">{0}ct</unitPattern>
+				<unitPattern count="other">{0}ct</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>mir.</displayName>
+				<unitPattern count="one">{0}mhír</unitPattern>
+				<unitPattern count="two">{0}mhír</unitPattern>
+				<unitPattern count="few">{0}mhír</unitPattern>
+				<unitPattern count="many">{0}mír</unitPattern>
+				<unitPattern count="other">{0}mír</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>cod.</displayName>
+				<unitPattern count="one">{0} chuid</unitPattern>
+				<unitPattern count="two">{0} chuid</unitPattern>
+				<unitPattern count="few">{0} chuid</unitPattern>
+				<unitPattern count="many">{0} gcuid</unitPattern>
+				<unitPattern count="other">{0} cuid</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-mole">
+				<unitPattern count="one">{0}mhól</unitPattern>
+				<unitPattern count="two">{0}mhól</unitPattern>
+				<unitPattern count="few">{0}mhól</unitPattern>
+				<unitPattern count="many">{0}mól</unitPattern>
+				<unitPattern count="other">{0}mól</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0}l/km</unitPattern>
@@ -8343,6 +8802,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ngiot.</unitPattern>
 				<unitPattern count="other">{0} giot.</unitPattern>
 			</unit>
+			<unit type="duration-decade">
+				<displayName>deich. blianta</displayName>
+			</unit>
 			<unit type="duration-year">
 				<perUnitPattern>{0}/bl</perUnitPattern>
 			</unit>
@@ -8455,6 +8917,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}kWh</unitPattern>
 				<unitPattern count="other">{0}kWh</unitPattern>
 			</unit>
+			<unit type="force-newton">
+				<displayName>N</displayName>
+				<unitPattern count="one">{0}N</unitPattern>
+				<unitPattern count="two">{0}N</unitPattern>
+				<unitPattern count="few">{0}N</unitPattern>
+				<unitPattern count="many">{0}N</unitPattern>
+				<unitPattern count="other">{0}N</unitPattern>
+			</unit>
 			<unit type="frequency-gigahertz">
 				<unitPattern count="one">{0}GHz</unitPattern>
 				<unitPattern count="two">{0}GHz</unitPattern>
@@ -8588,19 +9058,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} muirmh.</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<unitPattern count="one">{0} m lch</unitPattern>
-				<unitPattern count="two">{0} mh lch</unitPattern>
-				<unitPattern count="few">{0} m lch</unitPattern>
-				<unitPattern count="many">{0} m lch</unitPattern>
-				<unitPattern count="other">{0} m lch</unitPattern>
+				<unitPattern count="one">{0}mhíle Lochl.</unitPattern>
+				<unitPattern count="two">{0}mhíle Lochl.</unitPattern>
+				<unitPattern count="few">{0}mhíle Lochl.</unitPattern>
+				<unitPattern count="many">{0}míle Lochl.</unitPattern>
+				<unitPattern count="other">{0}míle Lochl.</unitPattern>
 			</unit>
 			<unit type="light-lux">
+				<displayName>lucs.</displayName>
 				<unitPattern count="one">{0}lx</unitPattern>
 				<unitPattern count="two">{0}lx</unitPattern>
 				<unitPattern count="few">{0}lx</unitPattern>
 				<unitPattern count="many">{0}lx</unitPattern>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
+			<unit type="light-candela">
+				<unitPattern count="one">{0}cd</unitPattern>
+				<unitPattern count="two">{0}cd</unitPattern>
+				<unitPattern count="few">{0}cd</unitPattern>
+				<unitPattern count="many">{0}cd</unitPattern>
+				<unitPattern count="other">{0}cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>lúmain</displayName>
+				<unitPattern count="one">{0}lm</unitPattern>
+				<unitPattern count="two">{0}lm</unitPattern>
+				<unitPattern count="few">{0}lm</unitPattern>
+				<unitPattern count="many">{0}lm</unitPattern>
+				<unitPattern count="other">{0}lm</unitPattern>
+			</unit>
 			<unit type="mass-tonne">
 				<unitPattern count="one">{0}t</unitPattern>
 				<unitPattern count="two">{0}t</unitPattern>
@@ -8746,6 +9232,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
+			<unit type="torque-pound-force-foot">
+				<unitPattern count="one">{0}lbf⋅ft</unitPattern>
+				<unitPattern count="two">{0}lbf⋅ft</unitPattern>
+				<unitPattern count="few">{0}lbf⋅ft</unitPattern>
+				<unitPattern count="many">{0}lbf⋅ft</unitPattern>
+				<unitPattern count="other">{0}lbf⋅ft</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<unitPattern count="one">{0}N⋅m</unitPattern>
+				<unitPattern count="two">{0}N⋅m</unitPattern>
+				<unitPattern count="few">{0}N⋅m</unitPattern>
+				<unitPattern count="many">{0}N⋅m</unitPattern>
+				<unitPattern count="other">{0}N⋅m</unitPattern>
+			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0}km³</unitPattern>
 				<unitPattern count="two">{0}km³</unitPattern>
@@ -8808,11 +9308,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>cl</displayName>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<unitPattern count="one">{0}ghalIm</unitPattern>
-				<unitPattern count="two">{0}ghalIm</unitPattern>
-				<unitPattern count="few">{0} ghalIm</unitPattern>
-				<unitPattern count="many">{0} ngalIm</unitPattern>
-				<unitPattern count="other">{0}galIm</unitPattern>
+				<unitPattern count="one">{0}ghal. Im</unitPattern>
+				<unitPattern count="two">{0}ghal. Im</unitPattern>
+				<unitPattern count="few">{0}ghal. Im</unitPattern>
+				<unitPattern count="many">{0}ngal. Im</unitPattern>
+				<unitPattern count="other">{0}gal. Im</unitPattern>
 			</unit>
 			<unit type="volume-cup">
 				<displayName>cupán</displayName>
@@ -8824,6 +9324,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} unsa l.</unitPattern>
 				<unitPattern count="other">{0} unsa l.</unitPattern>
 			</unit>
+			<unit type="volume-dessert-spoon">
+				<unitPattern count="one">{0}spmhil</unitPattern>
+				<unitPattern count="two">{0}spmhil</unitPattern>
+				<unitPattern count="few">{0}spmhil</unitPattern>
+				<unitPattern count="many">{0}spmhil</unitPattern>
+				<unitPattern count="other">{0}spmhil</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<unitPattern count="one">{0}spmhil imp</unitPattern>
+				<unitPattern count="two">{0}spmhil imp</unitPattern>
+				<unitPattern count="few">{0}spmhil imp</unitPattern>
+				<unitPattern count="many">{0}spmhil imp</unitPattern>
+				<unitPattern count="other">{0}spmhil imp</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<unitPattern count="one">{0}dr l.</unitPattern>
+				<unitPattern count="two">{0}dr l.</unitPattern>
+				<unitPattern count="few">{0}dr l.</unitPattern>
+				<unitPattern count="many">{0}dr l.</unitPattern>
+				<unitPattern count="other">{0}dr l.</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="two">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="many">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="many">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>solas</displayName>
+				<unitPattern count="one">{0}solas</unitPattern>
+				<unitPattern count="two">{0}sholas</unitPattern>
+				<unitPattern count="few">{0}sholas</unitPattern>
+				<unitPattern count="many">{0}solas</unitPattern>
+				<unitPattern count="other">{0}solas</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>oí</displayName>
 				<unitPattern count="one">{0}oí</unitPattern>
@@ -8831,7 +9375,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0}oí</unitPattern>
 				<unitPattern count="many">{0}oí</unitPattern>
 				<unitPattern count="other">{0}oí</unitPattern>
-				<perUnitPattern>{0}/oíche</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/gaa.xml b/make/data/cldr/common/main/gaa.xml
index 6e69d56b6a2..88a5c87207d 100644
--- a/make/data/cldr/common/main/gaa.xml
+++ b/make/data/cldr/common/main/gaa.xml
@@ -851,6 +851,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekday">
 				<displayName draft="unconfirmed">otsi lɛ mli gbi</displayName>
 			</field>
+			<field type="sun">
+				<relative type="-1">Hɔgbaa ni eho</relative>
+				<relative type="0">Hɔgbaa nɛɛ</relative>
+				<relative type="1">Hɔgbaa ni baaba</relative>
+			</field>
 			<field type="dayperiod">
 				<displayName draft="unconfirmed">LEEBI/SHWANE</displayName>
 			</field>
@@ -1155,9 +1160,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Afrika Anaigbɛ Be</generic>
-					<standard draft="unconfirmed">Afrika Anaigbɛ Be Yɛ Fɛi Beiaŋ</standard>
-					<daylight draft="unconfirmed">Afrika Anaigbɛ Be Yɛ Latsa Beiaŋ</daylight>
+					<standard draft="unconfirmed">Afrika Anaigbɛ Be</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1247,6 +1250,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Greenland Anaigbɛ Be Yɛ Latsa Beiaŋ</daylight>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Hawaii-Aleutia Be Yɛ Fɛi Beiaŋ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Hawaii-Aleutia Be</generic>
@@ -1304,6 +1312,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
@@ -1931,13 +1941,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<nameOrderLocales order="givenFirst">und gaa</nameOrderLocales>
 		<nameOrderLocales order="surnameFirst"/>
 		<personName order="givenFirst" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{given} {given2} {surname} {credentials}</namePattern>
+			<namePattern>{title} {given} {given2} {surname} {surname2}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="referring" formality="informal">
 			<namePattern draft="provisional">{given-informal} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
 			<namePattern draft="unconfirmed">{given-informal}</namePattern>
@@ -2033,7 +2043,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+			<namePattern>{surname-prefix} {surname-core}, {given} {given2}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
 			<namePattern draft="unconfirmed">{surname}, {given-informal}</namePattern>
diff --git a/make/data/cldr/common/main/gd.xml b/make/data/cldr/common/main/gd.xml
index e9b23423ac4..410a9874005 100644
--- a/make/data/cldr/common/main/gd.xml
+++ b/make/data/cldr/common/main/gd.xml
@@ -295,6 +295,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kcg">Tyap</language>
 			<language type="kde">Makonde</language>
 			<language type="kea">Kabuverdianu</language>
+			<language type="kek">Qʼeqchiʼ</language>
 			<language type="ken">Kenyang</language>
 			<language type="kfo">Koro</language>
 			<language type="kg">Kongo</language>
@@ -328,6 +329,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Gearmailtis Chologne</language>
 			<language type="ku">Cùrdais</language>
+			<language type="ku" menu="core">Cùrdais</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kut">Kutenai</language>
 			<language type="kv">Komi</language>
@@ -528,6 +531,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ses">Koyraboro Senni</language>
 			<language type="sg">Sango</language>
 			<language type="sga">Seann-Ghaeilge</language>
+			<language type="sgs">Samogitis</language>
 			<language type="sh">Sèirb-Chròthaisis</language>
 			<language type="shi">Tachelhit</language>
 			<language type="shn">Shan</language>
@@ -559,6 +563,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="suk">Sukuma</language>
 			<language type="sus">Susu</language>
 			<language type="sux">Cànan Sumer</language>
+			<language type="suz">Sunwar</language>
 			<language type="sv">Suainis</language>
 			<language type="sw">Kiswahili</language>
 			<language type="sw_CD">Kiswahili na Congo</language>
@@ -678,6 +683,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Bass">Bassa Vah</script>
 			<script type="Batk">Batak</script>
 			<script type="Beng">Beangailis</script>
+			<script type="Berf">Beria Erfe</script>
 			<script type="Bhks">Bhaiksuki</script>
 			<script type="Blis">Comharran Bliss</script>
 			<script type="Bopo">Bopomofo</script>
@@ -814,6 +820,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Shaw">Sgrìobhadh an t-Seathaich</script>
 			<script type="Shrd">Sharada</script>
 			<script type="Sidd">Siddham</script>
+			<script type="Sidt">Sideatach</script>
 			<script type="Sind">Khudawadi</script>
 			<script type="Sinh">Sinhala</script>
 			<script type="Sogd">Sogdianais</script>
@@ -834,6 +841,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Taml">Taimil</script>
 			<script type="Tang">Tangut</script>
 			<script type="Tavt">Tai Viet</script>
+			<script type="Tayo">Tai Yo</script>
 			<script type="Telu">Telugu</script>
 			<script type="Teng">Tengwar</script>
 			<script type="Tfng">Tifinagh</script>
@@ -844,6 +852,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Tirh">Tirhuta</script>
 			<script type="Tnsa">Tangsa</script>
 			<script type="Todr">Todhri</script>
+			<script type="Tols">Tolong Siki</script>
 			<script type="Tutg">Tulu-Tigalari</script>
 			<script type="Ugar">Ugariticeach</script>
 			<script type="Vaii">Vai</script>
@@ -1299,63 +1308,111 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Fòrmat an airgeadra</key>
 			<key type="collation">Òrdugh an t-seòrsachaidh</key>
 			<key type="currency">Airgeadra</key>
+			<key type="em">Riochdachadh nan Emoji</key>
 			<key type="hc">Cearcall an ama (12 no 24 uair)</key>
 			<key type="lb">Stoidhle nam brisidhean-loidhe</key>
+			<key type="lw">Brisidhean loidhne am broinn fhaclan</key>
 			<key type="ms">Siostam tomhais</key>
 			<key type="numbers">Àireamhan</key>
+			<key type="ss">Briseadh rosgrainn às dèidh giorr.</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist">Am Mìosachan Budach</type>
+			<type key="calendar" type="buddhist">Am Mìosachan Bùdach</type>
+			<type key="calendar" type="buddhist" scope="core">Bùdach</type>
 			<type key="calendar" type="chinese">Am Mìosachan Sìneach</type>
+			<type key="calendar" type="chinese" scope="core">Sìneach</type>
 			<type key="calendar" type="coptic">Am Mìosachan Coptach</type>
+			<type key="calendar" type="coptic" scope="core">Coptach</type>
 			<type key="calendar" type="dangi">Mìosachan Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Mìosachan na h-Itioipe</type>
+			<type key="calendar" type="ethiopic" scope="core">Itiopach</type>
 			<type key="calendar" type="ethiopic-amete-alem">Mìosachan Itiopach Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem Itiopach</type>
 			<type key="calendar" type="gregorian">Am Mìosachan Griogarach</type>
+			<type key="calendar" type="gregorian" scope="core">Griogarach</type>
 			<type key="calendar" type="hebrew">Am Mìosachan Eabhrach</type>
+			<type key="calendar" type="hebrew" scope="core">Eabhrach</type>
 			<type key="calendar" type="indian">Mìosachan Nàiseanta nan Innseachan</type>
+			<type key="calendar" type="indian" scope="core">Nàiseanta nan Innseachan</type>
 			<type key="calendar" type="islamic">Am Mìosachan Hijri</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Am Mìosachan Hijri (clàrach, linn sìobhalta)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (clàrach, linn sìobhalta)</type>
 			<type key="calendar" type="islamic-rgsa">Am Mìosachan Hijri (Aràibia nan Sabhd, sealladh)</type>
 			<type key="calendar" type="islamic-tbla">Am Mìosachan Hijri (clàrach, linn reul-eòlach)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hijri (clàrach, linn reul-eòlach)</type>
 			<type key="calendar" type="islamic-umalqura">Am Mìosachan Hijri (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Mìosachan ISO-8601</type>
 			<type key="calendar" type="japanese">Am Mìosachan Seapanach</type>
+			<type key="calendar" type="japanese" scope="core">Seapanach</type>
 			<type key="calendar" type="persian">Am Mìosachan Pearsach</type>
+			<type key="calendar" type="persian" scope="core">Pearsach</type>
 			<type key="calendar" type="roc">Mìosachan Poblachd na Sìne</type>
+			<type key="calendar" type="roc" scope="core">Poblachd na Sìne</type>
 			<type key="cf" type="account">Fòrmat airgeadra na cunntasachd</type>
+			<type key="cf" type="account" scope="core">Cunntasachd</type>
 			<type key="cf" type="standard">Fòrmat stannardach an airgeadra</type>
-			<type key="collation" type="big5han">Òrdugh seòrsachaidh na Sìnise Tradaiseanta - Big5</type>
+			<type key="cf" type="standard" scope="core">Stannardach</type>
 			<type key="collation" type="compat">Òrdugh seòrsachaidh roimhe a chum co-chòrdalachd</type>
+			<type key="collation" type="compat" scope="core">Co-chòrdalachd</type>
 			<type key="collation" type="dictionary">Òrdugh seòrsachaidh an fhaclair</type>
+			<type key="collation" type="dictionary" scope="core">Faclair</type>
 			<type key="collation" type="ducet">Òrdugh seòrsachaidh Unicode bunaiteach</type>
+			<type key="collation" type="ducet" scope="core">Unicode bunaiteach</type>
 			<type key="collation" type="emoji">Òrdugh seòrsachaidh Emoji</type>
 			<type key="collation" type="eor">Òrdugh seòrsachaidh Eòrpach</type>
-			<type key="collation" type="gb2312han">Òrdugh seòrsachaidh na Sìnise Simplichte - GB2312</type>
 			<type key="collation" type="phonebook">Òrdugh seòrsachaidh nan leabhraichean-fòn</type>
+			<type key="collation" type="phonebook" scope="core">Leabhar-fòn</type>
+			<type key="collation" type="phonetic" scope="core">Tar-litreachadh</type>
 			<type key="collation" type="pinyin">Òrdugh seòrsachaidh Pinyin</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Lorg coitcheann</type>
+			<type key="collation" type="search" scope="core">Coitcheann</type>
 			<type key="collation" type="searchjl">Lorg leis a’ chiad chonnrag Hangul</type>
 			<type key="collation" type="standard">Òrdugh seòrsachaidh stannardach</type>
+			<type key="collation" type="standard" scope="core">Stannardach</type>
 			<type key="collation" type="stroke">Òrdugh nan stràcan</type>
+			<type key="collation" type="stroke" scope="core">Stràcan</type>
 			<type key="collation" type="traditional">Òrdugh seòrsachaidh tradaiseanta</type>
+			<type key="collation" type="traditional" scope="core">Tradaiseanta</type>
 			<type key="collation" type="unihan">Òrdugh an fhreumha ’s nan stràcan</type>
+			<type key="collation" type="unihan" scope="core">Freumh is stràcan</type>
 			<type key="collation" type="zhuyin">Òrdugh seòrsachaidh Zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="d0" type="fwidth">Làn-Leud</type>
 			<type key="d0" type="hwidth">Leth-Leud</type>
 			<type key="d0" type="npinyin">Àireamhach</type>
+			<type key="em" type="default" scope="core">Bunaiteach</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Teacsa</type>
 			<type key="hc" type="h11">Cleoc 12 uair a thìde (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Cleoc 12 uair a thìde (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Cleoc 24 uair a thìde (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Cleoc 24 uair a thìde (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Brisidhean-loidhe fuasgailte</type>
+			<type key="lb" type="loose" scope="core">Fuasgailte</type>
 			<type key="lb" type="normal">Brisidhean-loidhe àbhaisteach</type>
+			<type key="lb" type="normal" scope="core">Àbhaisteach</type>
 			<type key="lb" type="strict">Brisidhean-loidhe teanna</type>
+			<type key="lb" type="strict" scope="core">Teann</type>
+			<type key="lw" type="breakall" scope="core">Bris na h-uile</type>
+			<type key="lw" type="keepall" scope="core">Cùm na h-uile</type>
+			<type key="lw" type="normal" scope="core">Àbhaisteach</type>
+			<type key="lw" type="phrase" scope="core">Cùm ann an abairt</type>
 			<type key="m0" type="bgn">Tar-litreachadh BGN nan Stàitean Aonaichte</type>
 			<type key="m0" type="ungegn">Tar-litreachadh GEGN nan Dùthchannan Aonaichte</type>
 			<type key="ms" type="metric">Tomhas meatrach</type>
+			<type key="ms" type="metric" scope="core">Meatrach</type>
 			<type key="ms" type="uksystem">Tomhas impireil</type>
+			<type key="ms" type="uksystem" scope="core">RA</type>
 			<type key="ms" type="ussystem">Tomhas nan Stàitean Aonaichte</type>
+			<type key="ms" type="ussystem" scope="core">SA</type>
 			<type key="numbers" type="ahom">Àireamhan Ahom</type>
 			<type key="numbers" type="arab">Àireamhan Arabach-Innseanach</type>
 			<type key="numbers" type="arabext">Àireamhan Arabach-Innseanach leudaichte</type>
@@ -1443,9 +1500,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="tibt">Àireamhan na Tibeitise</type>
 			<type key="numbers" type="tirh">Àireamhan Tirhuta</type>
 			<type key="numbers" type="tnsa">Àireamhan Tangsa</type>
+			<type key="numbers" type="tols">Àireamhan Tolong Siki</type>
 			<type key="numbers" type="vaii">Àireamhan Vai</type>
 			<type key="numbers" type="wara">Àireamhan Warang Citi</type>
 			<type key="numbers" type="wcho">Àireamhan Wancho</type>
+			<type key="ss" type="none" scope="core">Dheth</type>
+			<type key="ss" type="standard" scope="core">Air</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Meatrach</measurementSystemName>
@@ -1816,6 +1876,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'aig' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1824,6 +1887,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'aig' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1832,6 +1898,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1840,24 +1909,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">hB</dateFormatItem>
 						<dateFormatItem id="Bhm">h:mmB</dateFormatItem>
 						<dateFormatItem id="Bhms">h:mm:ssB</dateFormatItem>
+						<dateFormatItem id="EBh">E hB</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mmB</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ssB</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E ha</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mma</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ssa</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d'mh' MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d'mh' MMM y G</dateFormatItem>
 						<dateFormatItem id="h">ha</dateFormatItem>
 						<dateFormatItem id="hm">h:mma</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ssa</dateFormatItem>
+						<dateFormatItem id="hv">ha v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'u' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
@@ -1882,11 +1960,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -2220,6 +2296,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'aig' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2228,6 +2307,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'aig' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2236,6 +2318,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -2244,26 +2329,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">hB</dateFormatItem>
 						<dateFormatItem id="Bhm">h:mmB</dateFormatItem>
 						<dateFormatItem id="Bhms">h:mm:ssB</dateFormatItem>
-						<dateFormatItem id="EBhm">E h:mmB</dateFormatItem>
-						<dateFormatItem id="EBhms">E h:mm:ssB</dateFormatItem>
+						<dateFormatItem id="EBh">E, hB</dateFormatItem>
+						<dateFormatItem id="EBhm">E, h:mmB</dateFormatItem>
+						<dateFormatItem id="EBhms">E, h:mm:ssB</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
-						<dateFormatItem id="Ehm">E h:mma</dateFormatItem>
-						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Eh">E, ha</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h:mma</dateFormatItem>
+						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d'mh' MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d'mh' MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">ha</dateFormatItem>
 						<dateFormatItem id="hm">h:mma</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mma v</dateFormatItem>
+						<dateFormatItem id="hv">ha v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'u' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
@@ -2291,11 +2387,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -3261,11 +3355,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat type="daylight">Tìde samhraidh: {0}</regionFormat>
 			<regionFormat type="standard">Bun-àm: {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3285,15 +3374,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Tirane">
 				<exemplarCity>Tiranë</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidni</exemplarCity>
 			</zone>
@@ -3321,27 +3401,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brùnaigh</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/Belize">
 				<exemplarCity>A’ Bheilìs</exemplarCity>
 			</zone>
@@ -3363,12 +3422,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Rapa Nui</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Costa Rìcea</exemplarCity>
 			</zone>
@@ -3390,12 +3443,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Dominica">
 				<exemplarCity>Doiminicea</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
 			<zone type="Africa/Asmera">
 				<exemplarCity>Asmarà</exemplarCity>
 			</zone>
@@ -3496,7 +3543,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Eilean Canton</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Naomh Crìstean</exemplarCity>
@@ -3531,15 +3578,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Riga">
 				<exemplarCity>Rīga</exemplarCity>
 			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chișinău</exemplarCity>
-			</zone>
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Rangun</exemplarCity>
 			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Khovd</exemplarCity>
-			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macàthu</exemplarCity>
 			</zone>
@@ -3555,9 +3596,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Indian/Maldives">
 				<exemplarCity>Na h-Eileanan Mhaladaibh</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Cathair Mheagsago</exemplarCity>
 			</zone>
@@ -3594,9 +3632,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Moscow">
 				<exemplarCity>Mosgo</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Asia/Singapore">
 				<exemplarCity>Singeapòr</exemplarCity>
 			</zone>
@@ -3615,9 +3650,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kergelenn</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
@@ -3683,9 +3715,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Àm Afraga an Iar</generic>
-					<standard>Bun-àm Afraga an Iar</standard>
-					<daylight>Tìde Samhraidh Afraga an Iar</daylight>
+					<standard>Àm Afraga an Iar</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4128,6 +4158,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Àm Guidheàna</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Bun-àm nan Eileanan Hawai’i ’s Aleutach</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Àm nan Eileanan Hawai’i ’s Aleutach</generic>
@@ -4149,9 +4187,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Àm Hovd</generic>
-					<standard>Bun-àm Hovd</standard>
-					<daylight>Tìde samhraidh Hovd</daylight>
+					<generic>Àm Khovd</generic>
+					<standard>Bun-àm Khovd</standard>
+					<daylight>Tìde samhraidh Khovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -4746,7 +4784,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -6992,6 +7029,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">dolaran Sìombabuthach (1980–2008)</displayName>
 				<displayName count="other">dolar Sìombabuthach (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Òr Sìombabuthach</displayName>
+				<displayName count="one">Òr Sìombabuthach</displayName>
+				<displayName count="two">Òr Sìombabuthach</displayName>
+				<displayName count="few">Òr Sìombabuthach</displayName>
+				<displayName count="other">Òr Sìombabuthach</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Dolar Sìombabuthach (2009)</displayName>
 				<displayName count="one">dolar Sìombabuthach (2009)</displayName>
@@ -7266,7 +7310,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} nithean</unitPattern>
 				<unitPattern count="other">{0} nì</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>pàirt</displayName>
+				<unitPattern count="one">{0} phàirt</unitPattern>
+				<unitPattern count="two">{0} phàirt</unitPattern>
+				<unitPattern count="few">{0} pàirtean</unitPattern>
+				<unitPattern count="other">{0} pàirt</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>pàirt sa mhillean</displayName>
 				<unitPattern count="one">{0} phàirt sa mhillean</unitPattern>
 				<unitPattern count="two">{0} phàirt sa mhillean</unitPattern>
@@ -7297,6 +7348,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} mòlaichean</unitPattern>
 				<unitPattern count="other">{0} mòl</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de ghlùcos</displayName>
+				<unitPattern count="one">{0} de ghlùcos</unitPattern>
+				<unitPattern count="two">{0} de ghlùcos</unitPattern>
+				<unitPattern count="few">{0} de ghlùcos</unitPattern>
+				<unitPattern count="other">{0} de ghlùcos</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liotair sa chilemeatair</displayName>
 				<unitPattern count="one">{0} liotair sa chilemeatair</unitPattern>
@@ -7993,6 +8051,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} milimeatairean de dh’airgead-beò</unitPattern>
 				<unitPattern count="other">{0} milimeatair de dh’airgead-beò</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de dh’airgead-beò</displayName>
+				<unitPattern count="one">{0} de dh’airgead-beò</unitPattern>
+				<unitPattern count="two">{0} de dh’airgead-beò</unitPattern>
+				<unitPattern count="few">{0} de dh’airgead-beò</unitPattern>
+				<unitPattern count="other">{0} de dh’airgead-beò</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>punnd san òirleach cheàrnagach</displayName>
 				<unitPattern count="one">{0} phunnd san òirleach cheàrnagach</unitPattern>
@@ -8232,6 +8297,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} cupannan meatrach</unitPattern>
 				<unitPattern count="other">{0} cupa meatrach</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>unnsa-dighe meatrach</displayName>
+				<unitPattern count="one">{0} unnsa-dighe meatrach</unitPattern>
+				<unitPattern count="two">{0} unnsa-dighe meatrach</unitPattern>
+				<unitPattern count="few">{0} unnsachan-dighe meatrach</unitPattern>
+				<unitPattern count="other">{0} unnsa-dighe meatrach</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} acair-throigh</unitPattern>
 				<unitPattern count="two">{0} acair-throigh</unitPattern>
@@ -8272,12 +8344,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} pinntean</unitPattern>
 				<unitPattern count="other">{0} pinnt</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pinnt ìmpireil</displayName>
+				<unitPattern count="one">{0} phinnt ìmpireil</unitPattern>
+				<unitPattern count="two">{0} phinnt ìmpireil</unitPattern>
+				<unitPattern count="few">{0} phinntean ìmpireil</unitPattern>
+				<unitPattern count="other">{0} pinnt ìmpireil</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<unitPattern count="one">{0} chupa</unitPattern>
 				<unitPattern count="two">{0} chupa</unitPattern>
 				<unitPattern count="few">{0} cupannan</unitPattern>
 				<unitPattern count="other">{0} cupa</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cupa ìmpireil</displayName>
+				<unitPattern count="one">{0} chupa ìmpireil</unitPattern>
+				<unitPattern count="two">{0} chupa ìmpireil</unitPattern>
+				<unitPattern count="few">{0} cupannan ìmpireil</unitPattern>
+				<unitPattern count="other">{0} cupa ìmpireil</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>unnsa-dighe</displayName>
 				<unitPattern count="one">{0} unnsa-dighe</unitPattern>
@@ -8357,14 +8443,147 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} càrtan ìmpireil</unitPattern>
 				<unitPattern count="other">{0} càrt ìmpireil</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>solas</displayName>
-				<unitPattern count="one">{0} sholas</unitPattern>
-				<unitPattern count="two">{0} sholas</unitPattern>
-				<unitPattern count="few">{0} solasan</unitPattern>
-				<unitPattern count="other">{0} solas</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>sterèidean</displayName>
+				<unitPattern count="one">{0} sterèidean</unitPattern>
+				<unitPattern count="two">{0} sterèidean</unitPattern>
+				<unitPattern count="few">{0} sterèideanan</unitPattern>
+				<unitPattern count="other">{0} sterèidean</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="two">{0} katal</unitPattern>
+				<unitPattern count="few">{0} katalaichean</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} choulomb</unitPattern>
+				<unitPattern count="two">{0} choulomb</unitPattern>
+				<unitPattern count="few">{0} coulombaichean</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} fharad</unitPattern>
+				<unitPattern count="two">{0} fharad</unitPattern>
+				<unitPattern count="few">{0} faradaichean</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="two">{0} henry</unitPattern>
+				<unitPattern count="few">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="two">{0} shiemens</unitPattern>
+				<unitPattern count="few">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>caloraidh [IT]</displayName>
+				<unitPattern count="one">{0} chaloraidh [IT]</unitPattern>
+				<unitPattern count="two">{0} chaloraidh [IT]</unitPattern>
+				<unitPattern count="few">{0} caloraidhean [IT]</unitPattern>
+				<unitPattern count="other">{0} caloraidh [IT]</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>aonad-teasa Breatannach [IT]</displayName>
+				<unitPattern count="one">{0} aonad-teasa Breatannach [IT]</unitPattern>
+				<unitPattern count="two">{0} aonad-teasa Breatannach [IT]</unitPattern>
+				<unitPattern count="few">{0} aonadan-teasa Breatannach [IT]</unitPattern>
+				<unitPattern count="other">{0} aonad-teasa Breatannach [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} bhecquerel</unitPattern>
+				<unitPattern count="two">{0} bhecquerel</unitPattern>
+				<unitPattern count="few">{0} becquerelichean</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="two">{0} shievert</unitPattern>
+				<unitPattern count="few">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} ghray</unitPattern>
+				<unitPattern count="two">{0} ghray</unitPattern>
+				<unitPattern count="few">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>forsa-cileagram</displayName>
+				<unitPattern count="one">{0} fhorsa-cileagram</unitPattern>
+				<unitPattern count="two">{0} fhorsa-cileagram</unitPattern>
+				<unitPattern count="few">{0} forsan-cileagram</unitPattern>
+				<unitPattern count="other">{0} forsa-cileagram</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>ròd</displayName>
+				<unitPattern count="one">{0} ròd</unitPattern>
+				<unitPattern count="two">{0} ròd</unitPattern>
+				<unitPattern count="few">{0} ròidean</unitPattern>
+				<unitPattern count="other">{0} ròd</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>sèine</displayName>
+				<unitPattern count="one">{0} sèine</unitPattern>
+				<unitPattern count="two">{0} shèine</unitPattern>
+				<unitPattern count="few">{0} sèineachan</unitPattern>
+				<unitPattern count="other">{0} sèine</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="two">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="two">{0} weber</unitPattern>
+				<unitPattern count="few">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>rankine</displayName>
+				<unitPattern count="one">{0} rankine</unitPattern>
+				<unitPattern count="two">{0} rankine</unitPattern>
+				<unitPattern count="few">{0} rankine</unitPattern>
+				<unitPattern count="other">{0} rankine</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>cola-deug</displayName>
+				<unitPattern count="one">{0} chola-deug</unitPattern>
+				<unitPattern count="two">{0} chola-deug</unitPattern>
+				<unitPattern count="few">{0} cola-deug</unitPattern>
+				<unitPattern count="other">{0} cola-deug</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>sluga</displayName>
+				<unitPattern count="one">{0} shluga</unitPattern>
+				<unitPattern count="two">{0} shluga</unitPattern>
+				<unitPattern count="few">{0} slugaichean</unitPattern>
+				<unitPattern count="other">{0} sluga</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>de pheatrail-ionnannachd</displayName>
+				<unitPattern count="one">{0} de pheatrail-ionnannachd</unitPattern>
+				<unitPattern count="two">{0} de pheatrail-ionnannachd</unitPattern>
+				<unitPattern count="few">{0} de pheatrail-ionnannachdan</unitPattern>
+				<unitPattern count="other">{0} de pheatrail-ionnannachd</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>pàirt sa bhillean</displayName>
 				<unitPattern count="one">{0} phàirt sa bhillean</unitPattern>
 				<unitPattern count="two">{0} phàirt sa bhillean</unitPattern>
@@ -8372,12 +8591,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} pàirt sa bhillean</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>oidhche</displayName>
 				<unitPattern count="one">{0} oidhche</unitPattern>
 				<unitPattern count="two">{0} oidhche</unitPattern>
 				<unitPattern count="few">{0} oidhcheannan</unitPattern>
 				<unitPattern count="other">{0} oidhche</unitPattern>
-				<perUnitPattern>{0}/oidhche</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>comhair combaist</displayName>
@@ -8472,6 +8689,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} nith</unitPattern>
 				<unitPattern count="other">{0} nì</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>pàirt</displayName>
+				<unitPattern count="one">{0} phàirt</unitPattern>
+				<unitPattern count="two">{0} phàirt</unitPattern>
+				<unitPattern count="few">{0} pàirt.</unitPattern>
+				<unitPattern count="other">{0} pàirt</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>pàirt/millean</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>sa cheud</displayName>
 			</unit>
@@ -8488,6 +8715,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} mòl</unitPattern>
 				<unitPattern count="other">{0} mòl</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liotair/km</displayName>
 			</unit>
@@ -8776,6 +9010,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} gràinne</unitPattern>
 				<unitPattern count="other">{0} gràinne</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="two">{0} de Hg</unitPattern>
+				<unitPattern count="few">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>in Hg</displayName>
 			</unit>
@@ -8858,6 +9099,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-centiliter">
 				<displayName>c-liotair</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="two">{0} fl oz m.</unitPattern>
+				<unitPattern count="few">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acair-throigh</displayName>
 			</unit>
@@ -8890,9 +9137,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-pint">
 				<displayName>pinnt</displayName>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pt ìmp.</displayName>
+				<unitPattern count="one">{0} pt ìmp.</unitPattern>
+				<unitPattern count="two">{0} pt ìmp.</unitPattern>
+				<unitPattern count="few">{0} pt ìmp.</unitPattern>
+				<unitPattern count="other">{0} pt ìmp.</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>cupa</displayName>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cupa ìmp.</displayName>
+				<unitPattern count="one">{0} c ìmp.</unitPattern>
+				<unitPattern count="two">{0} c ìmp.</unitPattern>
+				<unitPattern count="few">{0} c ìmp.</unitPattern>
+				<unitPattern count="other">{0} c ìmp.</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fl oz</displayName>
 				<unitPattern count="one">{0} fl oz</unitPattern>
@@ -8973,6 +9234,131 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} càrt ìmp.</unitPattern>
 				<unitPattern count="other">{0} càrt ìmp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="two">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="two">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="two">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="two">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="two">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="two">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<unitPattern count="one">{0} BTU-IT</unitPattern>
+				<unitPattern count="two">{0} BTU-IT</unitPattern>
+				<unitPattern count="few">{0} BTU-IT</unitPattern>
+				<unitPattern count="other">{0} BTU-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="two">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="two">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>rd</displayName>
+				<unitPattern count="one">{0} rd</unitPattern>
+				<unitPattern count="two">{0} rd</unitPattern>
+				<unitPattern count="few">{0} rd</unitPattern>
+				<unitPattern count="other">{0} rd</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ch</displayName>
+				<unitPattern count="one">{0} ch</unitPattern>
+				<unitPattern count="two">{0} ch</unitPattern>
+				<unitPattern count="few">{0} ch</unitPattern>
+				<unitPattern count="other">{0} ch</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<unitPattern count="one">{0} °R</unitPattern>
+				<unitPattern count="two">{0} °R</unitPattern>
+				<unitPattern count="few">{0} °R</unitPattern>
+				<unitPattern count="other">{0} °R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>cld</displayName>
+				<unitPattern count="one">{0} cld</unitPattern>
+				<unitPattern count="two">{0} cld</unitPattern>
+				<unitPattern count="few">{0} cld</unitPattern>
+				<unitPattern count="other">{0} cld</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<unitPattern count="one">{0} slug</unitPattern>
+				<unitPattern count="two">{0} shlug</unitPattern>
+				<unitPattern count="few">{0} slug</unitPattern>
+				<unitPattern count="other">{0} slug</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>peatr-ionn</displayName>
+				<unitPattern count="one">{0} pheatr-ionn</unitPattern>
+				<unitPattern count="two">{0} pheatr-ionn</unitPattern>
+				<unitPattern count="few">{0} peatr-ionn</unitPattern>
+				<unitPattern count="other">{0} peatr-ionn</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>solas</displayName>
 				<unitPattern count="one">{0} sholas</unitPattern>
@@ -8980,7 +9366,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} solasan</unitPattern>
 				<unitPattern count="other">{0} solas</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>pàirt/billean</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -9119,7 +9505,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0}nith</unitPattern>
 				<unitPattern count="other">{0}nì</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>pàirt</displayName>
+				<unitPattern count="one">{0}phàirt</unitPattern>
+				<unitPattern count="two">{0}phàirt</unitPattern>
+				<unitPattern count="few">{0}pàirt.</unitPattern>
+				<unitPattern count="other">{0}pàirt</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="two">{0}ppm</unitPattern>
 				<unitPattern count="few">{0}ppm</unitPattern>
@@ -9140,6 +9533,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0}mòl</unitPattern>
 				<unitPattern count="other">{0}mòl</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0}Glc</unitPattern>
+				<unitPattern count="two">{0}Glc</unitPattern>
+				<unitPattern count="few">{0}Glc</unitPattern>
+				<unitPattern count="other">{0}Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">{0}L/km</unitPattern>
@@ -9802,6 +10202,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0}mm Hg</unitPattern>
 				<unitPattern count="other">{0}mm Hg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="two">{0} de Hg</unitPattern>
+				<unitPattern count="few">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="two">{0}psi</unitPattern>
@@ -10010,6 +10417,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0}mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="two">{0} fl oz m.</unitPattern>
+				<unitPattern count="few">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ac ft</displayName>
 				<unitPattern count="one">{0}ac ft</unitPattern>
@@ -10049,12 +10462,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0}pt</unitPattern>
 				<unitPattern count="other">{0}pt</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pt ìmp.</displayName>
+				<unitPattern count="one">{0} pt ìmp.</unitPattern>
+				<unitPattern count="two">{0} pt ìmp.</unitPattern>
+				<unitPattern count="few">{0} pt ìmp.</unitPattern>
+				<unitPattern count="other">{0} pt ìmp.</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<unitPattern count="one">{0}c</unitPattern>
 				<unitPattern count="two">{0}c</unitPattern>
 				<unitPattern count="few">{0}c</unitPattern>
 				<unitPattern count="other">{0}c</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cupa ìmp.</displayName>
+				<unitPattern count="one">{0} c ìmp.</unitPattern>
+				<unitPattern count="two">{0} c ìmp.</unitPattern>
+				<unitPattern count="few">{0} c ìmp.</unitPattern>
+				<unitPattern count="other">{0} c ìmp.</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<unitPattern count="one">{0}fl oz</unitPattern>
 				<unitPattern count="two">{0}fl oz</unitPattern>
@@ -10133,21 +10560,145 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0}càrt ì.</unitPattern>
 				<unitPattern count="other">{0}càrt ì.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0}sr</unitPattern>
+				<unitPattern count="two">{0}sr</unitPattern>
+				<unitPattern count="few">{0}sr</unitPattern>
+				<unitPattern count="other">{0}sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0}kat</unitPattern>
+				<unitPattern count="two">{0}kat</unitPattern>
+				<unitPattern count="few">{0}kat</unitPattern>
+				<unitPattern count="other">{0}kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0}C</unitPattern>
+				<unitPattern count="two">{0}C</unitPattern>
+				<unitPattern count="few">{0}C</unitPattern>
+				<unitPattern count="other">{0}C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0}F</unitPattern>
+				<unitPattern count="two">{0}F</unitPattern>
+				<unitPattern count="few">{0}F</unitPattern>
+				<unitPattern count="other">{0}F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0}H</unitPattern>
+				<unitPattern count="two">{0}H</unitPattern>
+				<unitPattern count="few">{0}H</unitPattern>
+				<unitPattern count="other">{0}H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0}S</unitPattern>
+				<unitPattern count="two">{0}S</unitPattern>
+				<unitPattern count="few">{0}S</unitPattern>
+				<unitPattern count="other">{0}S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0}cal-IT</unitPattern>
+				<unitPattern count="two">{0}cal-IT</unitPattern>
+				<unitPattern count="few">{0}cal-IT</unitPattern>
+				<unitPattern count="other">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<unitPattern count="one">{0}BTU-IT</unitPattern>
+				<unitPattern count="two">{0}BTU-IT</unitPattern>
+				<unitPattern count="few">{0}BTU-IT</unitPattern>
+				<unitPattern count="other">{0}BTU-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0}Bq</unitPattern>
+				<unitPattern count="two">{0}Bq</unitPattern>
+				<unitPattern count="few">{0}Bq</unitPattern>
+				<unitPattern count="other">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0}Sv</unitPattern>
+				<unitPattern count="two">{0}Sv</unitPattern>
+				<unitPattern count="few">{0}Sv</unitPattern>
+				<unitPattern count="other">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0}Gy</unitPattern>
+				<unitPattern count="two">{0}Gy</unitPattern>
+				<unitPattern count="few">{0}Gy</unitPattern>
+				<unitPattern count="other">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0}kgf</unitPattern>
+				<unitPattern count="two">{0}kgf</unitPattern>
+				<unitPattern count="few">{0}kgf</unitPattern>
+				<unitPattern count="other">{0}kgf</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>rd</displayName>
+				<unitPattern count="one">{0}rd</unitPattern>
+				<unitPattern count="two">{0}rd</unitPattern>
+				<unitPattern count="few">{0}rd</unitPattern>
+				<unitPattern count="other">{0}rd</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ch</displayName>
+				<unitPattern count="one">{0}ch</unitPattern>
+				<unitPattern count="two">{0}ch</unitPattern>
+				<unitPattern count="few">{0}ch</unitPattern>
+				<unitPattern count="other">{0}ch</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0}T</unitPattern>
+				<unitPattern count="two">{0}T</unitPattern>
+				<unitPattern count="few">{0}T</unitPattern>
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0}Wb</unitPattern>
+				<unitPattern count="two">{0}Wb</unitPattern>
+				<unitPattern count="few">{0}Wb</unitPattern>
+				<unitPattern count="other">{0}Wb</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<unitPattern count="one">{0}°R</unitPattern>
+				<unitPattern count="two">{0}°R</unitPattern>
+				<unitPattern count="few">{0}°R</unitPattern>
+				<unitPattern count="other">{0}°R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>cld</displayName>
+				<unitPattern count="one">{0}cld</unitPattern>
+				<unitPattern count="two">{0}cld</unitPattern>
+				<unitPattern count="few">{0}cld</unitPattern>
+				<unitPattern count="other">{0}cld</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<unitPattern count="one">{0}slug</unitPattern>
+				<unitPattern count="two">{0}shlug</unitPattern>
+				<unitPattern count="few">{0}slug</unitPattern>
+				<unitPattern count="other">{0}slug</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>peatr-ionn</displayName>
+				<unitPattern count="one">{0}pheatr-ionn</unitPattern>
+				<unitPattern count="two">{0}pheatr-ionn</unitPattern>
+				<unitPattern count="few">{0}peatr-ionn</unitPattern>
+				<unitPattern count="other">{0}peatr-ionn</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>solas</displayName>
 				<unitPattern count="one">{0}sholas</unitPattern>
 				<unitPattern count="two">{0}sholas</unitPattern>
 				<unitPattern count="few">{0}solas.</unitPattern>
 				<unitPattern count="other">{0}solas</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="two">{0}ppb</unitPattern>
 				<unitPattern count="few">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>oidhche</displayName>
 				<unitPattern count="one">{0}oidh.</unitPattern>
 				<unitPattern count="two">{0}oidh.</unitPattern>
 				<unitPattern count="few">{0}oidh.</unitPattern>
@@ -10407,7 +10958,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-initial} {given2-initial} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="informal">
-			<namePattern>{given-informal} {given2-initial}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
 			<namePattern>{given-vocative} {surname-vocative}</namePattern>
diff --git a/make/data/cldr/common/main/gl.xml b/make/data/cldr/common/main/gl.xml
index 2a172194808..d67fa69ac95 100644
--- a/make/data/cldr/common/main/gl.xml
+++ b/make/data/cldr/common/main/gl.xml
@@ -46,6 +46,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">acerbaixano</language>
 			<language type="az" alt="short">azerí</language>
 			<language type="ba">baxkir</language>
+			<language type="bal">baluchi</language>
 			<language type="ban">balinés</language>
 			<language type="bas">basaa</language>
 			<language type="be">belaruso</language>
@@ -236,6 +237,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurdo</language>
+			<language type="ku" menu="core">kurdo</language>
+			<language type="ku" menu="extension">kurdo setentrional</language>
 			<language type="kum">kumyk</language>
 			<language type="kv">komi</language>
 			<language type="kw">córnico</language>
@@ -634,6 +637,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Illa Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -875,34 +879,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">ordenación numérica</key>
 			<key type="colStrength">forza de ordenación</key>
 			<key type="currency">moeda</key>
+			<key type="em">representación como emoji</key>
 			<key type="hc">ciclo horario (12 ou 24)</key>
 			<key type="lb">estilo de quebra de liña</key>
+			<key type="lw">quebra de liña dentro das palabras</key>
 			<key type="ms">sistema internacional de unidades</key>
 			<key type="numbers">números</key>
+			<key type="ss">quebra de liña tras as abreviaturas</key>
 			<key type="timezone">fuso horario</key>
 			<key type="va">variante rexional</key>
 			<key type="x">uso privado</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">calendario budista</type>
+			<type key="calendar" type="buddhist" scope="core">budista</type>
 			<type key="calendar" type="chinese">calendario chinés</type>
+			<type key="calendar" type="chinese" scope="core">chinés</type>
 			<type key="calendar" type="coptic">calendario copto</type>
+			<type key="calendar" type="coptic" scope="core">copto</type>
 			<type key="calendar" type="dangi">calendario dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">calendario etíope</type>
+			<type key="calendar" type="ethiopic" scope="core">etíope</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendario etíope amete alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etíope amete alem</type>
 			<type key="calendar" type="gregorian">calendario gregoriano</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriano</type>
 			<type key="calendar" type="hebrew">calendario hebreo</type>
+			<type key="calendar" type="hebrew" scope="core">hebreo</type>
 			<type key="calendar" type="indian">Calendario nacional indio</type>
 			<type key="calendar" type="islamic">calendario da héxira</type>
+			<type key="calendar" type="islamic" scope="core">héxira</type>
 			<type key="calendar" type="islamic-civil">calendario da héxira (tabular, época civil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">héxira (tabular, época civil)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Calendario islámico (Arabia Saudita,</type>
 			<type key="calendar" type="islamic-umalqura">calendario da héxira (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">héxira (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">calendario ISO-8601</type>
 			<type key="calendar" type="japanese">calendario xaponés</type>
+			<type key="calendar" type="japanese" scope="core">xaponés</type>
 			<type key="calendar" type="persian">calendario persa</type>
+			<type key="calendar" type="persian" scope="core">persa</type>
 			<type key="calendar" type="roc">calendario Minguo</type>
+			<type key="calendar" type="roc" scope="core">MInguo</type>
 			<type key="cf" type="account">formato de moeda contable</type>
+			<type key="cf" type="account" scope="core">contable</type>
 			<type key="cf" type="standard">formato de moeda estándar</type>
+			<type key="cf" type="standard" scope="core">estándar</type>
 			<type key="colAlternate" type="non-ignorable">Clasificar símbolos</type>
 			<type key="colAlternate" type="shifted">Clasificar ignorando símbolos</type>
 			<type key="colBackwards" type="no">Clasificar acentos con normalidade</type>
@@ -912,16 +935,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Clasificar primeiro as maiúsculas</type>
 			<type key="colCaseLevel" type="no">Clasificar sen distinguir entre maiúsculas e minúsculas</type>
 			<type key="colCaseLevel" type="yes">Clasificar distinguindo entre maiúsculas e minúsculas</type>
-			<type key="collation" type="big5han">Orde de clasificación chinesa tradicional - Big5</type>
 			<type key="collation" type="dictionary">Criterio de ordenación do dicionario</type>
 			<type key="collation" type="ducet">criterio de ordenación Unicode predeterminado</type>
-			<type key="collation" type="gb2312han">orde de clasifcación chinesa simplificada - GB2312</type>
+			<type key="collation" type="ducet" scope="core">Unicode predeterminado</type>
 			<type key="collation" type="phonebook">orde de clasificación da guía telefónica</type>
 			<type key="collation" type="phonetic">Orde de clasificación fonética</type>
 			<type key="collation" type="pinyin">Orde de clasificación pinyin</type>
 			<type key="collation" type="search">busca de carácter xeral</type>
+			<type key="collation" type="search" scope="core">busca</type>
 			<type key="collation" type="searchjl">Clasificar por consonante inicial hangul</type>
 			<type key="collation" type="standard">criterio de ordenación estándar</type>
+			<type key="collation" type="standard" scope="core">estándar</type>
 			<type key="collation" type="stroke">Orde de clasificación polo número de trazos</type>
 			<type key="collation" type="traditional">Orde de clasificación tradicional</type>
 			<type key="collation" type="unihan">Criterio de ordenación radical-trazo</type>
@@ -937,18 +961,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ancho completo</type>
 			<type key="d0" type="hwidth">ancho medio</type>
 			<type key="d0" type="npinyin">Numérico</type>
+			<type key="em" type="default" scope="core">predeterminada</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">texto</type>
 			<type key="hc" type="h11">sistema de 12 horas (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">sistema de 12 horas (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">sistema de 24 horas (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">sistema de 24 horas (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">estilo de quebra de liña flexible</type>
+			<type key="lb" type="loose" scope="core">flexible</type>
 			<type key="lb" type="normal">estilo de quebra de liña normal</type>
-			<type key="lb" type="strict">estilo de quebra de liña estrita</type>
+			<type key="lb" type="normal" scope="core">normal</type>
+			<type key="lb" type="strict">estilo de quebra de liña estrito</type>
+			<type key="lb" type="strict" scope="core">estrito</type>
+			<type key="lw" type="breakall" scope="core">quebrar todo</type>
+			<type key="lw" type="keepall" scope="core">manter todo</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">manter en frases</type>
 			<type key="m0" type="bgn">transliteración do BGN</type>
 			<type key="m0" type="ungegn">transliteración do UNGEGN</type>
 			<type key="ms" type="metric">sistema métrico decimal</type>
+			<type key="ms" type="metric" scope="core">métrico</type>
 			<type key="ms" type="uksystem">sistema imperial de unidades</type>
+			<type key="ms" type="uksystem" scope="core">Reino Unido</type>
 			<type key="ms" type="ussystem">sistema estadounidense de unidades</type>
+			<type key="ms" type="ussystem" scope="core">EUA</type>
 			<type key="numbers" type="arab">díxitos indoarábigos</type>
 			<type key="numbers" type="arabext">díxitos indoarábigos ampliados</type>
 			<type key="numbers" type="armn">numeración armenia</type>
@@ -993,6 +1034,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">díxitos tibetanos</type>
 			<type key="numbers" type="traditional">Numeros tradicionais</type>
 			<type key="numbers" type="vaii">díxitos vai</type>
+			<type key="ss" type="none" scope="core">activado</type>
+			<type key="ss" type="standard" scope="core">desactivado</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">métrico decimal</measurementSystemName>
@@ -1016,9 +1059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1078,18 +1118,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d 'de' MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
 						<dateFormatItem id="MMdd" draft="contributed">dd/MM</dateFormatItem>
@@ -1120,12 +1163,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ">QQQQ 'de' y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">y G – y G</greatestDifference>
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -1477,23 +1514,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d 'de' MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
@@ -1517,12 +1558,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">w.'ª' 'semana' 'de' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">y G – y G</greatestDifference>
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -1561,10 +1596,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d 'de' MMM – E, d 'de' MMM 'de' y G</greatestDifference>
 							<greatestDifference id="y">E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1575,10 +1606,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2082,27 +2109,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Anguila</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Iereván</exemplarCity>
 			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Showa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont-d’Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
@@ -2136,33 +2145,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/La_Paz">
 				<exemplarCity>A Paz</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
 			<zone type="America/Rio_Branco">
 				<exemplarCity>Río Branco</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Baía</exemplarCity>
 			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
@@ -2172,11 +2160,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Illa de Pascua</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Coihaique</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>A Habana</exemplarCity>
@@ -2299,10 +2284,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Amán</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comores</exemplarCity>
+				<exemplarCity>illa Kantón</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint Kitts</exemplarCity>
@@ -2355,9 +2337,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldivas</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Cidade de México</exemplarCity>
 			</zone>
@@ -2433,9 +2412,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Khartún</exemplarCity>
 			</zone>
@@ -2463,12 +2439,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damasco</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Achkhabad</exemplarCity>
 			</zone>
@@ -2529,6 +2499,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<metazone type="Acre">
 				<long>
 					<generic>hora de Acre</generic>
+					<standard>hora estándar de Acre</standard>
+					<daylight>hora de verán de Acre</daylight>
 				</long>
 			</metazone>
 			<metazone type="Afghanistan">
@@ -2553,9 +2525,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>hora de África Occidental</generic>
-					<standard>hora estándar de África Occidental</standard>
-					<daylight>hora de verán de África Occidental</daylight>
+					<standard>hora de África Occidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2930,6 +2900,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora da Güiana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>hora estándar de Hawai-illas Aleutianas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>hora de Hawai-illas Aleutianas</generic>
@@ -3501,6 +3476,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="latn">
+			<integerAndRationalPattern alt="superSub">{0} {1}</integerAndRationalPattern>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -3512,6 +3490,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -3522,42 +3506,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000" count="other">0</pattern>
 					<pattern type="100000" count="one">0</pattern>
 					<pattern type="100000" count="other">0</pattern>
-					<pattern type="1000000" count="one">0 M¤</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber">0 M ¤</pattern>
-					<pattern type="1000000" count="other">0 M¤</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">0 M ¤</pattern>
-					<pattern type="10000000" count="one">00 M¤</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">00 M ¤</pattern>
-					<pattern type="10000000" count="other">00 M¤</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">00 M ¤</pattern>
-					<pattern type="100000000" count="one">000 M¤</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber">000 M ¤</pattern>
-					<pattern type="100000000" count="other">000 M¤</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">000 M ¤</pattern>
-					<pattern type="1000000000" count="one">0000 M¤</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">0000 M ¤</pattern>
-					<pattern type="1000000000" count="other">0000 M¤</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0000 M ¤</pattern>
-					<pattern type="10000000000" count="one">00000 M¤</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">00000 M ¤</pattern>
-					<pattern type="10000000000" count="other">00000 M¤</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00000 M ¤</pattern>
-					<pattern type="100000000000" count="one">000000 M¤</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">000000 M ¤</pattern>
-					<pattern type="100000000000" count="other">000000 M¤</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000000 M ¤</pattern>
-					<pattern type="1000000000000" count="one">0 B¤</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">0 B ¤</pattern>
-					<pattern type="1000000000000" count="other">0 B¤</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0 B ¤</pattern>
-					<pattern type="10000000000000" count="one">00 B¤</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">00 B ¤</pattern>
-					<pattern type="10000000000000" count="other">00 B¤</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00 B ¤</pattern>
-					<pattern type="100000000000000" count="one">000 B¤</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">000 B ¤</pattern>
-					<pattern type="100000000000000" count="other">000 B¤</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000 B ¤</pattern>
+					<pattern type="1000000" count="one">0 M ¤</pattern>
+					<pattern type="1000000" count="other">0 M ¤</pattern>
+					<pattern type="10000000" count="one">00 M ¤</pattern>
+					<pattern type="10000000" count="other">00 M ¤</pattern>
+					<pattern type="100000000" count="one">000 M ¤</pattern>
+					<pattern type="100000000" count="other">000 M ¤</pattern>
+					<pattern type="1000000000" count="one">0000 M ¤</pattern>
+					<pattern type="1000000000" count="other">0000 M ¤</pattern>
+					<pattern type="10000000000" count="one">00000 M ¤</pattern>
+					<pattern type="10000000000" count="other">00000 M ¤</pattern>
+					<pattern type="100000000000" count="one">000000 M ¤</pattern>
+					<pattern type="100000000000" count="other">000000 M ¤</pattern>
+					<pattern type="1000000000000" count="one">0 B ¤</pattern>
+					<pattern type="1000000000000" count="other">0 B ¤</pattern>
+					<pattern type="10000000000000" count="one">00 B ¤</pattern>
+					<pattern type="10000000000000" count="other">00 B ¤</pattern>
+					<pattern type="100000000000000" count="one">000 B ¤</pattern>
+					<pattern type="100000000000000" count="other">000 B ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -3873,7 +3839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other" draft="contributed">pesetas</displayName>
 				<symbol>₧</symbol>
 				<decimal>,</decimal>
-				<group>.</group>
+				<group> </group>
 			</currency>
 			<currency type="ETB">
 				<displayName>birr etíope</displayName>
@@ -4542,6 +4508,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">dólares do Caribe Oriental</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>florín caribeño</displayName>
+				<displayName count="one">florín caribeño</displayName>
+				<displayName count="other">florín caribeño</displayName>
+				<symbol>ƒ</symbol>
+			</currency>
 			<currency type="XOF">
 				<displayName>franco CFA (BCEAO)</displayName>
 				<displayName count="one">franco CFA (BCEAO)</displayName>
@@ -4581,6 +4553,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">kwacha zambiano</displayName>
 				<displayName count="other">kwachas zambianos</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ouro de Zimbabwe</displayName>
+				<displayName count="one">ouro de Zimbabwe</displayName>
+				<displayName count="other">ouro de Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} día</pluralMinimalPairs>
@@ -4794,7 +4771,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} unidade</unitPattern>
 				<unitPattern count="other">{0} unidades</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>partes</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes por millón</displayName>
 				<unitPattern count="one">{0} parte por millón</unitPattern>
 				<unitPattern count="other">{0} partes por millón</unitPattern>
@@ -4813,6 +4795,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} moles</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de glicosa</displayName>
+				<unitPattern count="one">{0} de glicosa</unitPattern>
+				<unitPattern count="other">{0} de glicosa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros por quilómetro</displayName>
 				<unitPattern count="one">{0} litro por quilómetro</unitPattern>
@@ -5316,6 +5303,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milímetro de mercurio</unitPattern>
 				<unitPattern count="other">{0} milímetros de mercurio</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de mercurio</displayName>
+				<unitPattern count="one">{0} de mercurio</unitPattern>
+				<unitPattern count="other">{0} de mercurio</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libras por polgada cadrada</displayName>
 				<unitPattern count="one">{0} libra por polgada cadrada</unitPattern>
@@ -5491,6 +5483,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} cunca métrica</unitPattern>
 				<unitPattern count="other">{0} cuncas métricas</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>onzas líquidas métricas</displayName>
+				<unitPattern count="one">{0} onza líquida métrica</unitPattern>
+				<unitPattern count="other">{0} onzas líquidas métricas</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} acre-pé</unitPattern>
 				<unitPattern count="other">{0} acre-pés</unitPattern>
@@ -5580,20 +5577,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} cuarto imperial</unitPattern>
 				<unitPattern count="other">{0} cuartos imperiais</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>luz</displayName>
-				<unitPattern count="one">{0} luz</unitPattern>
-				<unitPattern count="other">{0} luz</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>estereorradiáns</displayName>
+				<unitPattern count="one">{0} estereorradián</unitPattern>
+				<unitPattern count="other">{0} estereorradiáns</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katais</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katais</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorías internacionais</displayName>
+				<unitPattern count="one">{0} caloría internacional</unitPattern>
+				<unitPattern count="other">{0} calorías internacionais</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquereis</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquereis</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>quilogramos forza</displayName>
+				<unitPattern count="one">{0} quilogramo forza</unitPattern>
+				<unitPattern count="other">{0} quilogramos forza</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>wébers</displayName>
+				<unitPattern count="one">{0} wéber</unitPattern>
+				<unitPattern count="other">{0} wébers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes por mil millóns</displayName>
 				<unitPattern count="one">{0} parte por mil millóns</unitPattern>
 				<unitPattern count="other">{0} partes por mil millóns</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>noites</displayName>
-				<unitPattern count="one">{0} noite</unitPattern>
-				<unitPattern count="other">{0} noites</unitPattern>
 				<perUnitPattern>{0} por noite</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -5653,6 +5707,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ude.</unitPattern>
 				<unitPattern count="other">{0} udes.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>partes/millón</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="other">{0} %</unitPattern>
@@ -5665,6 +5727,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -5898,6 +5965,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>millas/hora</displayName>
 			</unit>
@@ -5962,6 +6033,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<displayName>mc</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-pés</displayName>
 			</unit>
@@ -6044,12 +6119,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} cto. imp.</unitPattern>
 				<unitPattern count="other">{0} ctos. imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal IT</displayName>
+				<unitPattern count="one">{0} cal IT</unitPattern>
+				<unitPattern count="other">{0} cal IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>luz</displayName>
 				<unitPattern count="one">{0} luz</unitPattern>
 				<unitPattern count="other">{0} luz</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes/mil millóns</displayName>
 				<unitPattern count="one">{0} ppmm</unitPattern>
 				<unitPattern count="other">{0} ppmm</unitPattern>
@@ -6093,6 +6221,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-karat">
 				<displayName>kt</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 			</unit>
@@ -6124,9 +6262,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-day">
 				<displayName>día</displayName>
-				<unitPattern count="one">{0} d</unitPattern>
-				<unitPattern count="other">{0} d</unitPattern>
-				<perUnitPattern>{0}/d</perUnitPattern>
+				<unitPattern count="one">{0} d.</unitPattern>
+				<unitPattern count="other">{0} d.</unitPattern>
+				<perUnitPattern>{0}/d.</perUnitPattern>
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>Ω</displayName>
@@ -6200,6 +6338,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>W</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>mi/h</displayName>
 			</unit>
@@ -6222,6 +6364,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-liter">
 				<displayName>l</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ac ft</displayName>
 			</unit>
@@ -6240,21 +6386,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>cto. imp.</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>luz</displayName>
-				<unitPattern count="one">{0} luz</unitPattern>
-				<unitPattern count="other">{0} luz</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal IT</displayName>
+				<unitPattern count="one">{0} cal IT</unitPattern>
+				<unitPattern count="other">{0} cal IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ppmm</displayName>
-				<unitPattern count="one">{0} ppmm</unitPattern>
-				<unitPattern count="other">{0} ppmm</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>noites</displayName>
-				<unitPattern count="one">{0} noite</unitPattern>
-				<unitPattern count="other">{0} noites</unitPattern>
-				<perUnitPattern>{0}/noite</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/gsw.xml b/make/data/cldr/common/main/gsw.xml
index fda45bd6c1b..b496e7c6c7d 100644
--- a/make/data/cldr/common/main/gsw.xml
+++ b/make/data/cldr/common/main/gsw.xml
@@ -913,8 +913,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="islamic-civil" draft="provisional">Bürgerlich islaamisch Kaländer</type>
 			<type key="calendar" type="japanese">Japaanisch Kaländer</type>
 			<type key="calendar" type="roc">Kaländer vor Republik Chiina</type>
-			<type key="collation" type="big5han">Tradizionells Chineesisch - Big5</type>
-			<type key="collation" type="gb2312han">Veräifachts Chineesisch - GB2312</type>
 			<type key="collation" type="phonebook">Telifonbuech-Sortiirregle</type>
 			<type key="collation" type="pinyin">Pinyin-Sortiirregle</type>
 			<type key="collation" type="stroke">Strichfolg</type>
@@ -1739,9 +1737,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Weschtafrikanischi Ziit</generic>
-					<standard>Weschtafrikanischi Schtandardziit</standard>
-					<daylight>Weschtafrikanischi Summerziit</daylight>
+					<standard>Weschtafrikanischi Ziit</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1819,7 +1815,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<group>’</group>
+			<group>'</group>
 			<minusSign>−</minusSign>
 		</symbols>
 		<decimalFormats numberSystem="latn">
@@ -1891,6 +1887,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/gu.xml b/make/data/cldr/common/main/gu.xml
index f3e353e8710..00111a0489d 100644
--- a/make/data/cldr/common/main/gu.xml
+++ b/make/data/cldr/common/main/gu.xml
@@ -291,6 +291,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">બફિયા</language>
 			<language type="ksh">કોલોગ્નિયન</language>
 			<language type="ku">કુર્દિશ</language>
+			<language type="ku" menu="core">કુર્દિશ</language>
+			<language type="ku" menu="extension">કુરમાનજી</language>
 			<language type="kum">કુમીક</language>
 			<language type="kut">કુતેનાઇ</language>
 			<language type="kv">કોમી</language>
@@ -769,7 +771,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="202">સબ-સહારન આફ્રિકા</territory>
 			<territory type="419">લેટિન અમેરિકા</territory>
 			<territory type="AC">એસેન્શન આઇલેન્ડ</territory>
-			<territory type="AD">ઍંડોરા</territory>
+			<territory type="AD">એન્ડોરા</territory>
 			<territory type="AE">યુનાઇટેડ આરબ અમીરાત</territory>
 			<territory type="AF">અફઘાનિસ્તાન</territory>
 			<territory type="AG">ઍન્ટિગુઆ અને બર્મુડા</territory>
@@ -783,7 +785,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="AT">ઑસ્ટ્રિયા</territory>
 			<territory type="AU">ઑસ્ટ્રેલિયા</territory>
 			<territory type="AW">અરુબા</territory>
-			<territory type="AX">ઑલેન્ડ આઇલેન્ડ્સ</territory>
+			<territory type="AX">ઑલૅન્ડ આઇલૅન્ડ્સ</territory>
 			<territory type="AZ">અઝરબૈજાન</territory>
 			<territory type="BA">બોસ્નિયા અને હર્ઝેગોવિના</territory>
 			<territory type="BB">બારબાડોસ</territory>
@@ -802,12 +804,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="BR">બ્રાઝિલ</territory>
 			<territory type="BS">બહામાસ</territory>
 			<territory type="BT">ભૂટાન</territory>
-			<territory type="BV">બૌવેત આઇલેન્ડ</territory>
+			<territory type="BV">બૌવેત આઇલૅન્ડ</territory>
 			<territory type="BW">બોત્સ્વાના</territory>
 			<territory type="BY">બેલારુસ</territory>
 			<territory type="BZ">બેલીઝ</territory>
 			<territory type="CA">કેનેડા</territory>
-			<territory type="CC">કોકોઝ (કીલીંગ) આઇલેન્ડ્સ</territory>
+			<territory type="CC">કોકોઝ (કીલીંગ) આઇલૅન્ડ્સ</territory>
 			<territory type="CD">કોંગો - કિંશાસા</territory>
 			<territory type="CD" alt="variant">કોંગો (ડીઆરસી)</territory>
 			<territory type="CF">સેન્ટ્રલ આફ્રિકન રિપબ્લિક</territory>
@@ -820,13 +822,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CL">ચિલી</territory>
 			<territory type="CM">કૅમરૂન</territory>
 			<territory type="CN">ચીન</territory>
-			<territory type="CO">કોલમ્બિયા</territory>
+			<territory type="CO">કોલંબિયા</territory>
 			<territory type="CP">ક્લિપરટન આઇલેન્ડ</territory>
+			<territory type="CQ">સાર્ક</territory>
 			<territory type="CR">કોસ્ટા રિકા</territory>
 			<territory type="CU">ક્યુબા</territory>
 			<territory type="CV">કૅપ વર્ડે</territory>
 			<territory type="CW">ક્યુરાસાઓ</territory>
-			<territory type="CX">ક્રિસમસ આઇલેન્ડ</territory>
+			<territory type="CX">ક્રિસમસ આઇલૅન્ડ</territory>
 			<territory type="CY">સાયપ્રસ</territory>
 			<territory type="CZ">ચેકીયા</territory>
 			<territory type="CZ" alt="variant">ચેક રિપબ્લિક</territory>
@@ -849,10 +852,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="EZ">યુરોઝોન</territory>
 			<territory type="FI">ફિનલેન્ડ</territory>
 			<territory type="FJ">ફીજી</territory>
-			<territory type="FK">ફૉકલેન્ડ આઇલેન્ડ્સ</territory>
-			<territory type="FK" alt="variant">ફૉકલેન્ડ આઇલેન્ડ્સ (આઇલાસ માલવિનાસ)</territory>
+			<territory type="FK">ફૉકલૅન્ડ આઇલૅન્ડ્સ</territory>
+			<territory type="FK" alt="variant">ફૉકલૅન્ડ આઇલૅન્ડ્સ (આઇલાસ માલવિનાસ)</territory>
 			<territory type="FM">માઇક્રોનેશિયા</territory>
-			<territory type="FO">ફેરો આઇલેન્ડ્સ</territory>
+			<territory type="FO">ફેરો આઇલૅન્ડ્સ</territory>
 			<territory type="FR">ફ્રાંસ</territory>
 			<territory type="GA">ગેબન</territory>
 			<territory type="GB">યુનાઇટેડ કિંગડમ</territory>
@@ -876,14 +879,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="GY">ગયાના</territory>
 			<territory type="HK">હોંગકોંગ SAR ચીન</territory>
 			<territory type="HK" alt="short">હોંગકોંગ</territory>
-			<territory type="HM">હર્ડ અને મેકડોનાલ્ડ આઇલેન્ડ્સ</territory>
+			<territory type="HM">હર્ડ અને મેકડોનાલ્ડ આઇલૅન્ડ્સ</territory>
 			<territory type="HN">હોન્ડુરસ</territory>
 			<territory type="HR">ક્રોએશિયા</territory>
 			<territory type="HT">હૈતિ</territory>
 			<territory type="HU">હંગેરી</territory>
 			<territory type="IC">કૅનેરી આઇલેન્ડ્સ</territory>
 			<territory type="ID">ઇન્ડોનેશિયા</territory>
-			<territory type="IE">આયર્લેન્ડ</territory>
+			<territory type="IE">આયરલૅન્ડ</territory>
 			<territory type="IL">ઇઝરાઇલ</territory>
 			<territory type="IM">આઇલ ઑફ મેન</territory>
 			<territory type="IN">ભારત</territory>
@@ -892,7 +895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="IO" alt="chagos">ચાગસ દ્વિપસમૂહ</territory>
 			<territory type="IQ">ઇરાક</territory>
 			<territory type="IR">ઈરાન</territory>
-			<territory type="IS">આઇસલેન્ડ</territory>
+			<territory type="IS">આઇસલૅન્ડ</territory>
 			<territory type="IT">ઇટાલી</territory>
 			<territory type="JE">જર્સી</territory>
 			<territory type="JM">જમૈકા</territory>
@@ -955,7 +958,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="NP">નેપાળ</territory>
 			<territory type="NR">નૌરુ</territory>
 			<territory type="NU">નીયુ</territory>
-			<territory type="NZ">ન્યુઝીલેન્ડ</territory>
+			<territory type="NZ">ન્યુઝીલૅન્ડ</territory>
 			<territory type="NZ" alt="variant">ઓટેરોઆ ન્યૂઝીલેન્ડ</territory>
 			<territory type="OM">ઓમાન</territory>
 			<territory type="PA">પનામા</territory>
@@ -1049,8 +1052,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="ZZ">અજ્ઞાત પ્રદેશ</territory>
 		</territories>
 		<subdivisions>
-			<subdivision type="gbeng">ઈંગ્લેન્ડ</subdivision>
-			<subdivision type="gbsct">સ્કોટલેન્ડ</subdivision>
+			<subdivision type="gbeng">ઈંગ્લૅન્ડ</subdivision>
+			<subdivision type="gbsct">સ્કૉટલૅન્ડ</subdivision>
 			<subdivision type="gbwls">વેલ્સ</subdivision>
 		</subdivisions>
 		<variants>
@@ -1069,35 +1072,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">આંકડાકીય સૉર્ટિંગ</key>
 			<key type="colStrength">સૉર્ટિંગ શક્તિ</key>
 			<key type="currency">ચલણ</key>
+			<key type="em">ઇમોજી પ્રસ્તુતિ</key>
 			<key type="hc">કલાકનું આવર્તન (12 વિ.24)</key>
 			<key type="lb">રેખા વિરામ પ્રકાર</key>
+			<key type="lw">શબ્દોમાં રેખા વિરામ</key>
 			<key type="ms">માપદંડ પદ્ધતિ</key>
 			<key type="numbers">આંકડાઓ</key>
+			<key type="ss">સંક્ષેપ પછી વાક્ય વિરામ</key>
 			<key type="timezone">સમય ઝોન</key>
 			<key type="va">લોકેલ વેરિએન્ટ</key>
 			<key type="x">ખાનગી-ઉપયોગ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">બુદ્ધિસ્ટ કેલેન્ડર</type>
+			<type key="calendar" type="buddhist" scope="core">બુદ્ધિસ્ટ</type>
 			<type key="calendar" type="chinese">ચાઇનીઝ કેલેન્ડર</type>
+			<type key="calendar" type="chinese" scope="core">ચાઇનીઝ</type>
 			<type key="calendar" type="coptic">કોપ્ટિક કેલેન્ડર</type>
+			<type key="calendar" type="coptic" scope="core">કોપ્ટિક</type>
 			<type key="calendar" type="dangi">ડાંગી કેલેન્ડર</type>
+			<type key="calendar" type="dangi" scope="core">ડાંગી</type>
 			<type key="calendar" type="ethiopic">ઇથિઓપિક કેલેન્ડર</type>
+			<type key="calendar" type="ethiopic" scope="core">ઇથિઓપિક</type>
 			<type key="calendar" type="ethiopic-amete-alem">ઇથિઓપિક એમેટ એલેમ કેલેન્ડર</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ઇથિઓપિક એમેટ એલેમ</type>
 			<type key="calendar" type="gregorian">ગ્રેગોરિઅન કેલેન્ડર</type>
+			<type key="calendar" type="gregorian" scope="core">ગ્રેગોરિઅન</type>
 			<type key="calendar" type="hebrew">હિબ્રુ કેલેન્ડર</type>
+			<type key="calendar" type="hebrew" scope="core">હિબ્રુ</type>
 			<type key="calendar" type="indian">ભારતીય રાષ્ટ્રીય કેલેન્ડર</type>
+			<type key="calendar" type="indian" scope="core" draft="contributed">ભારતીય રાષ્ટ્રીય</type>
 			<type key="calendar" type="islamic">હિજરી કેલેન્ડર</type>
+			<type key="calendar" type="islamic" scope="core">હિજરી</type>
 			<type key="calendar" type="islamic-civil">હિજરી-નાગરિક કેલેન્ડર</type>
+			<type key="calendar" type="islamic-civil" scope="core">હિજરી-નાગરિક કેલેન્ડર</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ઇસ્લામિક કેલેન્ડર (સાઉદી અરેબિયા, નિરીક્ષણ)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">ઇસ્લામિક કેલેન્ડર (ટેબ્યુલર, ખગોળશાસ્ત્રીય યુગ)</type>
 			<type key="calendar" type="islamic-umalqura">હિજરી કેલેન્ડર (ઉમ અલ-કુરા)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">હિજરી (ઉમ અલ-કુરા)</type>
 			<type key="calendar" type="iso8601">ISO-8601 કેલેન્ડર</type>
 			<type key="calendar" type="japanese">જાપાનીઝ કેલેન્ડર</type>
+			<type key="calendar" type="japanese" scope="core">જાપાનીઝ</type>
 			<type key="calendar" type="persian">પર્શિયન કેલેન્ડર</type>
+			<type key="calendar" type="persian" scope="core">પર્શિયન</type>
 			<type key="calendar" type="roc">મિંગુઓ કેલેન્ડર</type>
+			<type key="calendar" type="roc" scope="core">મિંગુઓ</type>
 			<type key="cf" type="account">હિસાબી ચલણી બંધારણ</type>
+			<type key="cf" type="account" scope="core">હિસાબ</type>
 			<type key="cf" type="standard">પ્રમાણભૂત ચલણી બંધારણ</type>
+			<type key="cf" type="standard" scope="core">પ્રમાણભૂત</type>
 			<type key="colAlternate" type="non-ignorable">પ્રતીકોને સૉર્ટ કરો</type>
 			<type key="colAlternate" type="shifted">પ્રતીકોને અવગણીને સૉર્ટ કરો</type>
 			<type key="colBackwards" type="no">ઉચ્ચારોને સામાન્ય રીતે સૉર્ટ કરો</type>
@@ -1107,18 +1130,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">પ્રથમ અપરકેસ સૉર્ટ કરો</type>
 			<type key="colCaseLevel" type="no">કેસ સંવેદીને સૉર્ટ કરો</type>
 			<type key="colCaseLevel" type="yes">કેસ સંવેદી સૉર્ટ કરો</type>
-			<type key="collation" type="big5han">પરંપરાગત ચાઇનિઝ સોર્ટ ક્રમબદ્ધ</type>
 			<type key="collation" type="compat" draft="contributed">અગાઉનો સોર્ટ ક્રમ, સુસંગતતા માટે</type>
 			<type key="collation" type="dictionary">શબ્દકોશ અનુક્મ</type>
 			<type key="collation" type="ducet">ડિફોલ્ટ યુનિકોડ સૉર્ટ ક્રમ</type>
+			<type key="collation" type="ducet" scope="core">ડિફોલ્ટ યુનિકોડ</type>
 			<type key="collation" type="eor" draft="contributed">યુરોપીયન ક્રમ આપવાના નિયમો</type>
-			<type key="collation" type="gb2312han">સરળીકૃત ચાઇનીઝ સૉર્ટ ક્રમ - GB2312</type>
 			<type key="collation" type="phonebook">ફોનબુક અનુક્મ</type>
 			<type key="collation" type="phonetic">ધ્વન્યાત્મક સૉર્ટ ક્રમ</type>
 			<type key="collation" type="pinyin">પિનયિન અનુક્મ</type>
 			<type key="collation" type="search">સામાન્ય-ઉદ્દેશ શોધ</type>
+			<type key="collation" type="search" scope="core">શોધ</type>
 			<type key="collation" type="searchjl">હંગુલ પ્રારંભિક વ્યંજન દ્વારા શોધો</type>
 			<type key="collation" type="standard">માનક સૉર્ટ ક્રમ</type>
+			<type key="collation" type="standard" scope="core">માનક</type>
 			<type key="collation" type="stroke">સ્ટ્રોક અનુક્મ</type>
 			<type key="collation" type="traditional">પરંપરાગત અનુક્મ</type>
 			<type key="collation" type="unihan">રેડિકલ-સ્ટ્રોક</type>
@@ -1134,18 +1158,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">પૂર્ણપહોળાઇ</type>
 			<type key="d0" type="hwidth">અર્ધપહોળાઈ</type>
 			<type key="d0" type="npinyin">સંખ્યા</type>
+			<type key="em" type="default" scope="core">ડિફૉલ્ટ</type>
+			<type key="em" type="emoji" scope="core">ઇમોજી</type>
+			<type key="em" type="text" scope="core">ટેક્સ્ટ</type>
 			<type key="hc" type="h11">12 કલાકની સિસ્ટમ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 કલાકની સિસ્ટમ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 કલાકની સિસ્ટમ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 કલાકની સિસ્ટમ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">શિથિલ રેખા વિરામ પ્રકાર</type>
+			<type key="lb" type="loose" scope="core">શિથિલ</type>
 			<type key="lb" type="normal">સામાન્ય રેખા વિરામ પ્રકાર</type>
+			<type key="lb" type="normal" scope="core">સામાન્ય</type>
 			<type key="lb" type="strict">ચુસ્ત રેખા વિરામ પ્રકાર</type>
+			<type key="lb" type="strict" scope="core">ચુસ્ત</type>
+			<type key="lw" type="breakall" scope="core">તમામ વિરામ</type>
+			<type key="lw" type="keepall" scope="core">તમામ રાખો</type>
+			<type key="lw" type="normal" scope="core">સામાન્ય</type>
+			<type key="lw" type="phrase" scope="core">વાક્યાંશમાં રાખો</type>
 			<type key="m0" type="bgn">US BGN</type>
 			<type key="m0" type="ungegn">UN GEGN</type>
 			<type key="ms" type="metric">દશાંશ પદ્ધતિ</type>
+			<type key="ms" type="metric" scope="core">દશાંશ</type>
 			<type key="ms" type="uksystem">રજવાડું માપદંડ પદ્ધતિ</type>
+			<type key="ms" type="uksystem" scope="core">યુકે</type>
 			<type key="ms" type="ussystem">અમેરિકન માપદંડ પદ્ધતિ</type>
+			<type key="ms" type="ussystem" scope="core">અમેરિકન</type>
 			<type key="numbers" type="arab">અરેબિક-ભારતીય અંકો</type>
 			<type key="numbers" type="arabext">વિસ્તૃત અરેબિક-ઇન્ડિક અંકો</type>
 			<type key="numbers" type="armn">અર્મેનિયન સંખ્યાઓ</type>
@@ -1190,6 +1231,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">તિબેટિયન અંકો</type>
 			<type key="numbers" type="traditional">પરંપરાગત અંકો</type>
 			<type key="numbers" type="vaii">વાઇ અંકો</type>
+			<type key="ss" type="none" scope="core">બંધ</type>
+			<type key="ss" type="standard" scope="core">ચાલુ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">મેટ્રિક</measurementSystemName>
@@ -1206,7 +1249,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[઼ ૐ ં ઁ ઃ અ આ ઇ ઈ ઉ ઊ ઋ ૠ ઍ એ ઐ ઑ ઓ ઔ ક ખ ગ ઘ ઙ ચ છ જ ઝ ઞ ટ ઠ ડ ઢ ણ ત થ દ ધ ન પ ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ ઽ ા િ ી ુ ૂ ૃ ૄ ૅ ે ૈ ૉ ો ૌ ્]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200C\u200D ૰]</exemplarCharacters>
 		<exemplarCharacters type="index">[અ {અં} {અઃ} આ ઇ ઈ ઉ ઊ ઋ ઍ એ ઐ ઑ ઓ ઔ ક {ક્ષ} ખ ગ ઘ ઙ ચ છ જ {જ્ઞ} ઝ ઞ ટ ઠ ડ ઢ ણ ત {ત્ર} થ દ ધ ન પ ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[\- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@@ -1230,12 +1275,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">એરા0</era>
-						<era type="1" draft="contributed">એરા1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1257,12 +1296,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">એરા0</era>
-						<era type="1" draft="contributed">એરા1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1293,17 +1326,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1} એ {0} વાગ્યે</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1} એ {0} વાગ્યે</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1628,17 +1655,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1} એ {0} વાગ્યે</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1} એ {0} વાગ્યે</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1652,6 +1673,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, G y</dateFormatItem>
@@ -2154,7 +2176,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>ક.</displayName>
+				<displayName>ક૰</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName>ક૰</displayName>
 			</field>
 			<field type="minute">
 				<displayName>મિનિટ</displayName>
@@ -2169,10 +2194,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="minute-short">
-				<displayName>મિ.</displayName>
+				<displayName>મિ૰</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName>મિ૰</displayName>
 			</field>
 			<field type="second">
-				<displayName>સેકન્ડ</displayName>
+				<displayName>સેકંડ</displayName>
 				<relative type="0">હમણાં</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} સેકંડમાં</relativeTimePattern>
@@ -2221,7 +2249,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ઍંગ્વિલા</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
-				<exemplarCity>તિરાને</exemplarCity>
+				<exemplarCity>તિરાના</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>યેરેવાન</exemplarCity>
@@ -2547,6 +2575,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ઇસ્ટર</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">કોહેક</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>પુન્ટા એરીનાઝ</exemplarCity>
 			</zone>
@@ -2812,10 +2843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ફ્નોમ પેન્હ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>એંડર્બરી</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>કેન્ટન</exemplarCity>
+				<exemplarCity>કેંટન આઇલૅન્ડ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>કિરિતિમાતી</exemplarCity>
@@ -2872,7 +2900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>સેંટ લુસિયા</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity>વૅદુઝ</exemplarCity>
+				<exemplarCity>વડુઝ</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
 				<exemplarCity>કોલંબો</exemplarCity>
@@ -3491,9 +3519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>પશ્ચિમ આફ્રિકા સમય</generic>
-					<standard>પશ્ચિમ આફ્રિકા માનક સમય</standard>
-					<daylight>પશ્ચિમ આફ્રિકા ગ્રીષ્મ સમય</daylight>
+					<standard>પશ્ચિમ આફ્રિકા સમય</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3876,6 +3902,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ગયાના સમય</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>હવાઇ-એલ્યુશિઅન માનક સમય</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>હવાઈ-એલ્યુશિઅન સમય</generic>
@@ -4525,8 +4556,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber" draft="contributed">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency" draft="contributed">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##,##0.00;(¤#,##,##0.00)</pattern>
@@ -4625,7 +4656,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>બોસ્નિયા અને હર્ઝેગોવિના રૂપાંતર યોગ્ય માર્ક</displayName>
 			</currency>
 			<currency type="BBD">
-				<displayName>બાર્બાડિયન ડોલર</displayName>
+				<displayName>બાર્બાડિયન ડૉલર</displayName>
+				<displayName count="one">બાર્બાડિયન ડૉલર</displayName>
+				<displayName count="other">બાર્બાડિયન ડૉલર</displayName>
 			</currency>
 			<currency type="BDT">
 				<displayName>બાંગ્લાદેશી ટાકા</displayName>
@@ -4642,10 +4675,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>બુરુન્ડિયન ફ્રેંક</displayName>
 			</currency>
 			<currency type="BMD">
-				<displayName>બર્મુડન ડોલર</displayName>
+				<displayName>બર્મુડન ડૉલર</displayName>
+				<displayName count="one">બર્મુડન ડૉલર</displayName>
+				<displayName count="other">બર્મુડન ડૉલર</displayName>
 			</currency>
 			<currency type="BND">
-				<displayName>બ્રુનેઇ ડોલર</displayName>
+				<displayName>બ્રુનેઇ ડૉલર</displayName>
+				<displayName count="one">બ્રુનેઇ ડૉલર</displayName>
+				<displayName count="other">બ્રુનેઇ ડૉલર</displayName>
 			</currency>
 			<currency type="BOB">
 				<displayName>બોલિવિયન બોલિવિયાનો</displayName>
@@ -4654,7 +4691,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>બ્રાઝિલીયન રિઆલ</displayName>
 			</currency>
 			<currency type="BSD">
-				<displayName>બહામિયન ડોલર</displayName>
+				<displayName>બહામિયન ડૉલર</displayName>
+				<displayName count="one">બહામિયન ડૉલર</displayName>
+				<displayName count="other">બહામિયન ડૉલર</displayName>
 			</currency>
 			<currency type="BTN">
 				<displayName>ભુતાનિઝ એંગુલ્ત્રમ</displayName>
@@ -4670,7 +4709,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>બેલારુશિયન રૂબલ (2000–2016)</displayName>
 			</currency>
 			<currency type="BZD">
-				<displayName>બેલિઝ ડોલર</displayName>
+				<displayName>બેલિઝ ડૉલર</displayName>
+				<displayName count="one">બેલિઝ ડૉલર</displayName>
+				<displayName count="other">બેલિઝ ડૉલર</displayName>
 			</currency>
 			<currency type="CAD">
 				<displayName>કેનેડિયન ડૉલર</displayName>
@@ -4733,7 +4774,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>યુરો</displayName>
 			</currency>
 			<currency type="FJD">
-				<displayName>ફિજિઅન ડોલર</displayName>
+				<displayName>ફિજિઅન ડૉલર</displayName>
+				<displayName count="one">ફિજિઅન ડૉલર</displayName>
+				<displayName count="other">ફિજિઅન ડૉલર</displayName>
 			</currency>
 			<currency type="FKP">
 				<displayName>ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ</displayName>
@@ -4762,7 +4805,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ગ્વાટેમાલા કુઇટ્ઝલ</displayName>
 			</currency>
 			<currency type="GYD">
-				<displayName>ગયાનિઝ ડોલર</displayName>
+				<displayName>ગયાનિઝ ડૉલર</displayName>
+				<displayName count="one">ગયાનિઝ ડૉલર</displayName>
+				<displayName count="other">ગયાનિઝ ડૉલર</displayName>
 			</currency>
 			<currency type="HKD">
 				<displayName>હોંગ કોંગ ડૉલર</displayName>
@@ -4798,7 +4843,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>આઇસલેન્ડિક ક્રોના</displayName>
 			</currency>
 			<currency type="JMD">
-				<displayName>જમૈકિયન ડોલર</displayName>
+				<displayName>જમૈકિયન ડૉલર</displayName>
+				<displayName count="one">જમૈકિયન ડૉલર</displayName>
+				<displayName count="other">જમૈકિયન ડૉલર</displayName>
 			</currency>
 			<currency type="JOD">
 				<displayName>જોર્ડનિયન દિનાર</displayName>
@@ -4843,7 +4890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>શ્રી લંકન રૂપી</displayName>
 			</currency>
 			<currency type="LRD">
-				<displayName>લિબેરિયન ડોલર</displayName>
+				<displayName>લિબેરિયન ડૉલર</displayName>
+				<displayName count="one">લિબેરિયન ડૉલર</displayName>
+				<displayName count="other">લિબેરિયન ડૉલર</displayName>
 			</currency>
 			<currency type="LSL">
 				<displayName>લેસોથો લોતી</displayName>
@@ -4967,7 +5016,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>સાઉદી રિયાલ</displayName>
 			</currency>
 			<currency type="SBD">
-				<displayName>સોલોમન આઇલેંડ્સ ડોલર</displayName>
+				<displayName>સોલોમન આઇલૅન્ડ્સ ડૉલર</displayName>
+				<displayName count="one">સોલોમન આઇલૅન્ડ્સ ડૉલર</displayName>
+				<displayName count="other">સોલોમન આઇલૅન્ડ્સ ડૉલર</displayName>
 			</currency>
 			<currency type="SCR">
 				<displayName>સેશેલોઈ રૂપી</displayName>
@@ -4994,7 +5045,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>સોમાલી શિલિંગ</displayName>
 			</currency>
 			<currency type="SRD">
-				<displayName>સૂરીનામિઝ ડોલર</displayName>
+				<displayName>સૂરીનામિઝ ડૉલર</displayName>
+				<displayName count="one">સૂરીનામિઝ ડૉલર</displayName>
+				<displayName count="other">સૂરીનામિઝ ડૉલર</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName>દક્ષિણ સુદાનિઝ પાઉન્ડ</displayName>
@@ -5031,7 +5084,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>તુર્કિશ લિરા</displayName>
 			</currency>
 			<currency type="TTD">
-				<displayName>ત્રિનિદાદ અને ટોબેગો ડોલર</displayName>
+				<displayName>ત્રિનિદાદ અને ટોબેગો ડૉલર</displayName>
+				<displayName count="one">ત્રિનિદાદ અને ટોબેગો ડૉલર</displayName>
+				<displayName count="other">ત્રિનિદાદ અને ટોબેગો ડૉલર</displayName>
 			</currency>
 			<currency type="TWD">
 				<displayName>ન્યુ તાઇવાન ડૉલર</displayName>
@@ -5047,7 +5102,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>યુગાંડન શિલિંગ</displayName>
 			</currency>
 			<currency type="USD">
-				<displayName>યુઍસ ડોલર</displayName>
+				<displayName>યુઍસ ડૉલર</displayName>
+				<displayName count="one">યુઍસ ડૉલર</displayName>
+				<displayName count="other">યુઍસ ડૉલર</displayName>
 			</currency>
 			<currency type="UYU">
 				<displayName>ઉરુગ્વેયન પેસો</displayName>
@@ -5076,7 +5133,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">મધ્ય આફ્રિકન [CFA] ફ્રેંક્સ</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName>ઇસ્ટ કેરિબિયન ડોલર</displayName>
+				<displayName>ઇસ્ટ કેરિબિયન ડૉલર</displayName>
+				<displayName count="one">ઇસ્ટ કેરિબિયન ડૉલર</displayName>
+				<displayName count="other">ઇસ્ટ કેરિબિયન ડૉલર</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">કૅરિબિયન ગિલ્ડર</displayName>
+				<displayName count="one">કૅરિબિયન ગિલ્ડર</displayName>
+				<displayName count="other">કૅરિબિયન ગિલ્ડર</displayName>
 			</currency>
 			<currency type="XOF">
 				<displayName>પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક</displayName>
@@ -5101,6 +5165,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>ઝામ્બિયન ક્વાચા</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">ઝીંબાબિયન ગોલ્ડ</displayName>
+				<displayName count="one">ઝીંબાબિયન ગોલ્ડ</displayName>
+				<displayName count="other">ઝીંબાબિયન ગોલ્ડ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5306,7 +5375,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} મિલિમોલ પ્રતિ લિટર</unitPattern>
 				<unitPattern count="other">{0} મિલિમોલ પ્રતિ લિટર</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">ભાગ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ભાગ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ભાગ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<displayName>કણ પ્રતિ મિલિયન</displayName>
 				<unitPattern count="one">{0} કણ પ્રતિ મિલિયન</unitPattern>
@@ -5330,6 +5404,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<gender>masculine</gender>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">ગ્લૂકોઝ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ગ્લૂકોઝ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ગ્લૂકોઝ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>લીટર પ્રતિ કિલોમીટર</displayName>
 				<unitPattern count="one">{0} લીટર પ્રતિ કિલોમીટર</unitPattern>
@@ -5882,6 +5961,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} મેટ્રિક કપ</unitPattern>
 				<unitPattern count="other">{0} મેટ્રિક કપ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">મેટ્રિક ફ્લુઇડ ઔંસ</displayName>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} બુશલ</unitPattern>
 				<unitPattern count="other">{0} બુશલ</unitPattern>
@@ -5922,21 +6004,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ઇમ્પીરિયલ ક્વૉર્ટ</unitPattern>
 				<unitPattern count="other">{0} ઇમ્પીરિયલ ક્વૉર્ટ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>લાઇટ</displayName>
-				<unitPattern count="one">{0} લાઇટ</unitPattern>
-				<unitPattern count="other">{0} લાઇટ</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">કૅલરિ [IT]</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">ટેસ્લા</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>પ્રતિ અબજ ભાગ</displayName>
-				<unitPattern count="one">{0} પ્રતિ અબજ ભાગ</unitPattern>
-				<unitPattern count="other">{0} પ્રતિ અબજ ભાગ</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>રાત</displayName>
-				<unitPattern count="one">{0} રાત</unitPattern>
-				<unitPattern count="other">{0} રાત</unitPattern>
-				<perUnitPattern>{0}/રાત</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>મુખ્ય દિશા</displayName>
@@ -6113,7 +6188,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} વસ્તુ</unitPattern>
 				<unitPattern count="other">{0} વસ્તુ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">ભાગ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ભાગ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ભાગ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>કણ/મિલિયન</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6130,6 +6210,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} મોલ</unitPattern>
 				<unitPattern count="other">{0} મોલ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">ગ્લૂકોઝ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ગ્લૂકોઝ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ગ્લૂકોઝ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>લીટર/કિમી</displayName>
 				<unitPattern count="one">{0} લીટર/કિમી</unitPattern>
@@ -6656,12 +6741,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ચપટી</unitPattern>
 				<unitPattern count="other">{0} ચપટી</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">કૅલ [IT]</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>લાઇટ</displayName>
 				<unitPattern count="one">{0} લાઇટ</unitPattern>
 				<unitPattern count="other">{0} લાઇટ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ભાગ/અબજ</displayName>
 				<unitPattern count="one">{0} પ્રતિ અબજ ભાગ</unitPattern>
 				<unitPattern count="other">{0} પ્રતિ અબજ ભાગ</unitPattern>
@@ -6777,7 +6865,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/L</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">ભાગ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ભાગ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ભાગ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6789,6 +6882,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">ગ્લૂકોઝ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ગ્લૂકોઝ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ગ્લૂકોઝ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}લિ/100કિમી</unitPattern>
 				<unitPattern count="other">{0}લિ/100કિમી</unitPattern>
@@ -6923,20 +7021,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} dstspn-Imp</unitPattern>
 				<unitPattern count="other">{0} dstspn-Imp</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>લાઇટ</displayName>
-				<unitPattern count="one">{0} લાઇટ</unitPattern>
-				<unitPattern count="other">{0} લાઇટ</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<unitPattern count="one">{0} પ્રતિ અબજ ભાગ</unitPattern>
-				<unitPattern count="other">{0} પ્રતિ અબજ ભાગ</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>રાત</displayName>
-				<unitPattern count="one">{0} રાત</unitPattern>
-				<unitPattern count="other">{0} રાત</unitPattern>
-				<perUnitPattern>{0}/રાત</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">કૅલ૰ [IT]</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ha.xml b/make/data/cldr/common/main/ha.xml
index f16d12fa8a0..1afd755e2e6 100644
--- a/make/data/cldr/common/main/ha.xml
+++ b/make/data/cldr/common/main/ha.xml
@@ -16,7 +16,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ace">Achinese</language>
 			<language type="ada">Adangme</language>
 			<language type="ady">Adyghe</language>
-			<language type="af">Afirkanci</language>
+			<language type="af">Afrikaans</language>
 			<language type="agq">Aghem</language>
 			<language type="ain">Ainu</language>
 			<language type="ak">Akan</language>
@@ -41,6 +41,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">Azerbaijanci</language>
 			<language type="az" alt="short">Azeri</language>
 			<language type="ba">Bashkir</language>
+			<language type="bal">Baluchi</language>
 			<language type="ban">Balenesanci</language>
 			<language type="bas">Basaa</language>
 			<language type="be">Belarusanci</language>
@@ -111,8 +112,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="el">Girkanci</language>
 			<language type="en">Turanci</language>
 			<language type="en_AU">Turanci Ostareliya</language>
-			<language type="en_GB" alt="short">Turanci (Biritaniya)</language>
-			<language type="en_US" alt="short">Turanci (Amurka)</language>
 			<language type="eo">Esperanto</language>
 			<language type="es">Sifaniyanci</language>
 			<language type="es_419">Sifaniyancin Latin Amirka</language>
@@ -155,7 +154,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hax">Haida na Kudanci</language>
 			<language type="he">Ibrananci</language>
 			<language type="hi">Harshen Hindi</language>
-			<language type="hi_Latn" alt="variant">Harshen Hindi (Latin)</language>
 			<language type="hil">Hiligaynon</language>
 			<language type="hmn">Hmong</language>
 			<language type="hr">Kuroshiyan</language>
@@ -219,6 +217,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Colognian</language>
 			<language type="ku">Kurdanci</language>
+			<language type="ku" menu="core">Kurdanci</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Cornish</language>
@@ -295,6 +295,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nia">Nias</language>
 			<language type="niu">Niuean</language>
 			<language type="nl">Holanci</language>
+			<language type="nl_BE">Flemish</language>
 			<language type="nmg">Kwasio</language>
 			<language type="nn">Norwegian Nynorsk</language>
 			<language type="nnh">Ngiemboon</language>
@@ -325,7 +326,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pis">Pijin</language>
 			<language type="pl">Harshen Polan</language>
 			<language type="pqm">Maliseet-Passamaquoddy</language>
-			<language type="prg">Ferusawa</language>
+			<language type="prg">Yaren Prussia</language>
 			<language type="ps">Pashtanci</language>
 			<language type="pt">Harshen Potugis</language>
 			<language type="pt_BR">Harshen Potugis na Birazil</language>
@@ -375,7 +376,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sr">Sabiyan</language>
 			<language type="srn">Sranan Tongo</language>
 			<language type="ss">Swati</language>
-			<language type="st">Sesotanci</language>
+			<language type="st">Kudancin Sotho</language>
 			<language type="str">Straits Salish</language>
 			<language type="su">Harshen Sundanese</language>
 			<language type="suk">Sukuma</language>
@@ -602,6 +603,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Sin</territory>
 			<territory type="CO">Kolambiya</territory>
 			<territory type="CP">Tsibirin Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kwasta Rika</territory>
 			<territory type="CU">Kyuba</territory>
 			<territory type="CV">Tsibiran Cape Verde</territory>
@@ -827,43 +829,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Yanayin Kudi</key>
 			<key type="collation">Tsarin Rabewa</key>
 			<key type="currency">Kudin Kasa</key>
+			<key type="em">Gabatar da Imoji</key>
 			<key type="hc">Zagayen Awowi (12 da 24)</key>
 			<key type="lb">Salo na Raba Layi</key>
+			<key type="lw">Layi Zai Karye tsakanin Kalmomi</key>
 			<key type="ms">Tsarin Awo</key>
 			<key type="numbers">Lambobi</key>
+			<key type="ss">Jimlar ta Karye Bayan Gajarcewa.</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kalandar Buddist</type>
+			<type key="calendar" type="buddhist" scope="core">Mabiyin addinin Buddha</type>
 			<type key="calendar" type="chinese">Kalandar Sin</type>
+			<type key="calendar" type="chinese" scope="core">Ɗan ƙasar Sin</type>
 			<type key="calendar" type="coptic">Kalandar Coptic</type>
+			<type key="calendar" type="coptic" scope="core">Coptic</type>
 			<type key="calendar" type="dangi">Kalandar Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kalandar Etiofic</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Kalandar Ethiopic Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Kalandar Gregoria</type>
+			<type key="calendar" type="gregorian" scope="core">Gregori</type>
 			<type key="calendar" type="hebrew">Kalandar Ibrananci</type>
+			<type key="calendar" type="hebrew" scope="core">Yaren Hebrew</type>
 			<type key="calendar" type="islamic">Kalandar Musulunci</type>
+			<type key="calendar" type="islamic" scope="core">Kaladar Musulunci</type>
 			<type key="calendar" type="islamic-civil">Kalandar Musulunci (tabular, civil epoch)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Kaladar Musulunci (ta ciki teburi, shekarar jamaʼa)</type>
 			<type key="calendar" type="islamic-tbla">Kalandar Musulunci (tabular, astronomical epoch)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Kalandar Musulunci (ta cikin teburi, shekarar taurari)</type>
 			<type key="calendar" type="islamic-umalqura">Kalandar Musulunci (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Kalandar Musulunci (Ummu al-Qura</type>
 			<type key="calendar" type="iso8601">Kalandar ISO-8601</type>
 			<type key="calendar" type="japanese">Kalandar Jafan</type>
+			<type key="calendar" type="japanese" scope="core">Ta ƙasar Japan</type>
 			<type key="calendar" type="persian">Kalandar Farisa</type>
+			<type key="calendar" type="persian" scope="core">Ta ƙasar Fasha</type>
 			<type key="calendar" type="roc">Kalandar kasar Sin</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Tsarin Kudi na Kididdiga</type>
+			<type key="cf" type="account" scope="core">Lissafin kuɗi</type>
 			<type key="cf" type="standard">Tsarin Kudi Nagartacce</type>
+			<type key="cf" type="standard" scope="core">Daidaitacce</type>
 			<type key="collation" type="ducet">Tsarin Rabewa na Dan-maƙalu na Asali</type>
+			<type key="collation" type="ducet" scope="core">Tsararren Unicode</type>
 			<type key="collation" type="search">Bincike na Dalilai-Gamagari</type>
+			<type key="collation" type="search" scope="core">Bincike</type>
 			<type key="collation" type="standard">Daidaitaccen Kasawa</type>
+			<type key="collation" type="standard" scope="core">Daidaitacce</type>
+			<type key="em" type="default" scope="core">Tsararre</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Rubutu</type>
 			<type key="hc" type="h11">Tsarin Awowi 12 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Tsarin Awowi 12(1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Tsarin Awowi 24(0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Tsarin Awowi 24(1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Salo na Raba Layi Sakakke</type>
+			<type key="lb" type="loose" scope="core">Sakakke</type>
 			<type key="lb" type="normal">Salo na Raba Layi na Kodayaushe</type>
+			<type key="lb" type="normal" scope="core">Na kodayaushe</type>
 			<type key="lb" type="strict">Salo na Raba Layi mai Tsauri</type>
+			<type key="lb" type="strict" scope="core">Mai tsauri</type>
+			<type key="lw" type="breakall" scope="core">Raba duka</type>
+			<type key="lw" type="keepall" scope="core">A bar duka</type>
+			<type key="lw" type="normal" scope="core">Na kodayaushe</type>
+			<type key="lw" type="phrase" scope="core">A bari cikin magana</type>
 			<type key="ms" type="metric">Tsarin Awo na Metric</type>
+			<type key="ms" type="metric" scope="core">Awo</type>
 			<type key="ms" type="uksystem">Tsarin Awo na Imperial</type>
+			<type key="ms" type="uksystem" scope="core">Turai</type>
 			<type key="ms" type="ussystem">Tsarin Awo na Amurka</type>
+			<type key="ms" type="ussystem" scope="core">Amurka</type>
 			<type key="numbers" type="arab">Lambobi na Larabawan a Gabas</type>
 			<type key="numbers" type="arabext">Fitattun lambobin lissafi na Larabci</type>
 			<type key="numbers" type="armn">Lambobin ƙirga na Armenia</type>
@@ -904,6 +946,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">Lambobin yaren Thai</type>
 			<type key="numbers" type="tibt">Lambobin yaren Tibet</type>
 			<type key="numbers" type="vaii">Lambobin Vai</type>
+			<type key="ss" type="none" scope="core">Kashe</type>
+			<type key="ss" type="standard" scope="core">Kunna</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Tsarin awo</measurementSystemName>
@@ -954,7 +998,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern>{0}, {1}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{0} 'da' {1}</pattern>
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{0} 'a' {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -962,18 +1009,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern>{0}, {1}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{0} 'da' {1}</pattern>
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{0}, {1}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{0}, {1}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
@@ -1176,6 +1238,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'da' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1184,6 +1249,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'da' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1197,6 +1265,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
@@ -1224,9 +1294,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">E, M/d/y – E, M/d/y G</greatestDifference>
 							<greatestDifference id="y">E, M/d/y – E, M/d/y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 						</intervalFormatItem>
@@ -1241,22 +1308,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="d">dd/MM/y – dd/MM/y</greatestDifference>
 							<greatestDifference id="M">dd/MM/y – dd/MM/y</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
-						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1331,18 +1382,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">shekaru {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="year-short">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">shekara {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">shekaru {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">shekara {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">shekaru {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="quarter">
 				<displayName>kwata</displayName>
 				<relative type="-1">kwatan karshe</relative>
@@ -1357,18 +1396,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">kwata {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="quarter-short">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">kwata {0} da suka gabata</relativeTimePattern>
-					<relativeTimePattern count="other">kwata {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">kwata {0} da suka gabata</relativeTimePattern>
-					<relativeTimePattern count="other">kwata {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="month">
 				<displayName>wata</displayName>
 				<relative type="-1">watan da ya gabata</relative>
@@ -1388,16 +1415,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="one">a cikin watan {0}</relativeTimePattern>
 					<relativeTimePattern count="other">a cikin watan {0}</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">wata {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">watanni {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">wata {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">watanni {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>mako</displayName>
@@ -1414,12 +1431,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 				<relativePeriod>sati na {0}</relativePeriod>
 			</field>
-			<field type="week-short">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">mako {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">makonni {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="week-narrow">
 				<relativeTime type="past">
 					<relativeTimePattern count="one">mako {0} da ya gabata</relativeTimePattern>
@@ -1446,26 +1457,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">kwanaki {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="day-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">a cikin kwanaki {0}</relativeTimePattern>
-					<relativeTimePattern count="other">a cikin kwanaki {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">kwana {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">kwanaki {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">a cikin kwanaki {0}</relativeTimePattern>
-					<relativeTimePattern count="other">a cikin kwanaki {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">kwana {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">kwanaki {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="dayOfYear">
 				<displayName>Kwanan Shekara</displayName>
 			</field>
@@ -1488,28 +1479,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Lahadi {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sun-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Lahadi {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Lahadi {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Lahadi {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Lahadi {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="sun-narrow">
 				<relative type="-1">Lahadin da ya gabata</relative>
 				<relative type="0">wannan Lahadin</relative>
 				<relative type="1">Lahadi mai zuwa</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Lahadi {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Lahadi {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Lahadi {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Lahadi {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="mon">
 				<relative type="-1">Litinin din da ta gabata</relative>
@@ -1524,32 +1497,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Litinin {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="mon-short">
-				<relative type="-1">Litinin din da ta gabata</relative>
-				<relative type="0">wannan Litinin din</relative>
-				<relative type="1">Litinin mai zuwa</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Litinin {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Litinin {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Litinin {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Litinin {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="mon-narrow">
-				<relative type="-1">Litinin din da ta gabata</relative>
-				<relative type="0">wannan Litinin din</relative>
-				<relative type="1">Litinin mai zuwa</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Litinin {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Litinin {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Litinin {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Litinin {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="tue">
 				<relative type="-1">Talata da ta gabata</relative>
 				<relative type="0">wannan Talata</relative>
@@ -1563,26 +1510,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Talata {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="tue-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Talata {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Talata {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Talata {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Talata {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="tue-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Talata {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Talata {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Talata {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Talata {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="wed">
 				<relative type="-1">Laraba da ta gabata</relative>
 				<relative type="0">wannan Larabar</relative>
@@ -1596,26 +1523,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Laraba {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="wed-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Laraba {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Laraba {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Laraba {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Laraba {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="wed-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Laraba {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Laraba {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Laraba {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Laraba {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu">
 				<relative type="-1">Alhamis din da ya Gabata</relative>
 				<relative type="0">wannan Alhamis din</relative>
@@ -1629,26 +1536,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Alhamis {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="thu-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Alhamis {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Alhamis {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Alhamis {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Alhamis {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="thu-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Alhamis {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Alhamis {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Alhamis {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">Alhamis {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="fri">
 				<relative type="-1">Jumaʼa da ta gabata</relative>
 				<relative type="0">wannan Jumaʼar</relative>
@@ -1662,26 +1549,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Jumaʼa {0} da suka wuce</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="fri-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Jumaʼa {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Jumaʼa {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Jumaʼa {0} da ta wuce</relativeTimePattern>
-					<relativeTimePattern count="other">Jumaʼa {0} da suka wuce</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="fri-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Jumaʼa {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Jumaʼa {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Jumaʼa {0} da ta wuce</relativeTimePattern>
-					<relativeTimePattern count="other">Jumaʼa {0} da suka wuce</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="sat">
 				<relative type="-1">Asabar din da ya gabata</relative>
 				<relative type="0">wannan Asabar din</relative>
@@ -1696,20 +1563,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="sat-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Asabar {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Asabar {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">Asabar {0} da ta wuce</relativeTimePattern>
-					<relativeTimePattern count="other">Asabar {0} da suka wuce</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sat-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin Asabar {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin Asabar {0}</relativeTimePattern>
-				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">Asabar {0} da ta wuce</relativeTimePattern>
 					<relativeTimePattern count="other">Asabar {0} da suka wuce</relativeTimePattern>
@@ -1730,26 +1583,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">awanni {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="hour-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin awa {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin awanni {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">awa {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">awanni {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="hour-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin awa {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin awanni {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">awa {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">awanni {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="minute">
 				<displayName>minti</displayName>
 				<relative type="0">wannan mintin</relative>
@@ -1762,26 +1595,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">mintuna {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="minute-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin minti {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin mintuna {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">minti {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">mintuna {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin minti {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin mintuna {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">minti {0} da ya gabata</relativeTimePattern>
-					<relativeTimePattern count="other">mintuna {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="second">
 				<displayName>daƙiƙa</displayName>
 				<relative type="0">yanzu</relative>
@@ -1794,26 +1607,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">dakiku {0} da suka gabata</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="second-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin dakika {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin dakiku {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">dakika {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">dakiku {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">cikin dakika {0}</relativeTimePattern>
-					<relativeTimePattern count="other">cikin dakiku {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">dakika {0} da ta gabata</relativeTimePattern>
-					<relativeTimePattern count="other">dakiku {0} da suka gabata</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="zone">
 				<displayName>Lokacin yanki</displayName>
 			</field>
@@ -1840,6 +1633,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Tsayayyen Lokacin Irish</daylight>
 				</long>
 			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Tsibirin Canton</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Arewacin Dakota</exemplarCity>
 			</zone>
@@ -1871,9 +1667,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Lokacin Afirka ta Yamma</generic>
-					<standard>Tsayayyen Lokacin Afirka ta Yamma</standard>
-					<daylight>Lokacin Bazara na Afirka ta Yamma</daylight>
+					<standard>Lokacin Afirka ta Yamma</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2223,6 +2017,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Lokacin Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Tsayayyen Lokacin Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Lokaci na Hawaii-Aleutian</generic>
@@ -2792,53 +2591,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ 0D</pattern>
-					<pattern type="1000" count="other">¤ 0D</pattern>
+					<pattern type="1000" count="one">¤ 0K</pattern>
+					<pattern type="1000" count="other">¤ 0K</pattern>
 					<pattern type="10000" count="one">¤ 00D</pattern>
 					<pattern type="10000" count="other">¤ 00D</pattern>
-					<pattern type="100000" count="one">¤ 000K</pattern>
-					<pattern type="100000" count="other">¤ 000K</pattern>
-					<pattern type="1000000000" count="one">¤0B</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤0B</pattern>
-					<pattern type="1000000000" count="other">¤0B</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B</pattern>
-					<pattern type="10000000000" count="one">¤00B</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B</pattern>
-					<pattern type="100000000000" count="one">¤000B</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
-					<pattern type="1000000000000" count="one">¤0T</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0T</pattern>
-					<pattern type="1000000000000" count="other">¤0T</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
-					<pattern type="10000000000000" count="one">¤00T</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00T</pattern>
-					<pattern type="10000000000000" count="other">¤00T</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
-					<pattern type="100000000000000" count="one">¤000T</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T</pattern>
-					<pattern type="100000000000000" count="other">¤000T</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="100000" count="one">¤ 000D</pattern>
+					<pattern type="100000" count="other">¤ 000D</pattern>
+					<pattern type="1000000000" count="one">¤ 0B</pattern>
+					<pattern type="1000000000" count="other">¤ 0B</pattern>
+					<pattern type="10000000000" count="one">¤ 00B</pattern>
+					<pattern type="10000000000" count="other">¤ 00B</pattern>
+					<pattern type="100000000000" count="one">¤ 000B</pattern>
+					<pattern type="100000000000" count="other">¤ 000B</pattern>
+					<pattern type="1000000000000" count="one">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName>Kuɗin Haɗaɗɗiyar Daular Larabawa</displayName>
+				<displayName>Dirham na Haɗaɗɗiyar Daular Larabawa</displayName>
+				<displayName count="one">Dirham na Haɗaɗɗiyar Daular Larabawa</displayName>
+				<displayName count="other">Dirham na Haɗaɗɗiyar Daular Larabawa</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>Afghani na ƙasar Afghanistan</displayName>
 			</currency>
 			<currency type="ALL">
-				<displayName>Kuɗin Albania</displayName>
+				<displayName>Lek na Albania</displayName>
+				<displayName count="one">Lek na Albania</displayName>
+				<displayName count="other">Lekë na Albania</displayName>
 			</currency>
 			<currency type="AMD">
-				<displayName>Kuɗin Armenia</displayName>
-				<displayName count="one">kuɗin Armenia</displayName>
-				<displayName count="other">Kuɗin Armenia</displayName>
+				<displayName>Dram na Armeniya</displayName>
+				<displayName count="one">Dram na Armeniya</displayName>
+				<displayName count="other">Dram na Armeniya</displayName>
 			</currency>
 			<currency type="ANG">
 				<displayName>Antillean Guilder na ƙasar Netherlands</displayName>
@@ -2846,7 +2637,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Antillean Guilder na ƙasar Netherlands</displayName>
 			</currency>
 			<currency type="AOA">
-				<displayName>Kuɗin Angola</displayName>
+				<displayName>Kwanza na Angola</displayName>
+				<displayName count="one">Kwanza na Angola</displayName>
+				<displayName count="other">Kwanza na Angola</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>Peso na ƙasar Argentina</displayName>
@@ -2855,7 +2648,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="AUD">
 				<displayName>Dalar Ostareliya</displayName>
-				<displayName count="one">Dalolin Ostareliya</displayName>
+				<displayName count="one">Dalar Ostareliya</displayName>
 				<displayName count="other">Dalolin Ostareliya</displayName>
 			</currency>
 			<currency type="AWG">
@@ -2864,9 +2657,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Florin na yankin Aruba</displayName>
 			</currency>
 			<currency type="AZN">
-				<displayName>Kuɗin Azerbaijani</displayName>
-				<displayName count="one">kuɗin Azerbaijani</displayName>
-				<displayName count="other">Kuɗin Azerbaijani</displayName>
+				<displayName>Manat na Azebaijan</displayName>
+				<displayName count="one">Manat na Azebaijan</displayName>
+				<displayName count="other">Manat na Azebaijan</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>Kuɗaɗen Bosnia da Herzegovina</displayName>
@@ -2876,24 +2669,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BDT">
 				<displayName>Taka na ƙasar Bangladesh</displayName>
-				<displayName count="one">taka na ƙasar Bangladesh</displayName>
-				<displayName count="other">Taka na ƙasar Bangladesh</displayName>
 			</currency>
 			<currency type="BGN">
-				<displayName>Kuɗin Bulgeria</displayName>
+				<displayName>Lev na Bulgeria</displayName>
+				<displayName count="one">Lev na Bulgeria</displayName>
+				<displayName count="other">Leva na Bulgeria</displayName>
 			</currency>
 			<currency type="BHD">
-				<displayName>Kuɗin Baharan</displayName>
+				<displayName>Zinaren Bahrain</displayName>
+				<displayName count="one">Zinaren Bahrain</displayName>
+				<displayName count="other">Zinaren Bahrain</displayName>
 			</currency>
 			<currency type="BIF">
-				<displayName>Kuɗin Burundi</displayName>
+				<displayName>Franc na Burundi</displayName>
+				<displayName count="one">Franc na Burundi</displayName>
+				<displayName count="other">Franc na Burundi</displayName>
 			</currency>
 			<currency type="BMD">
 				<displayName>Dalar ƙasar Bermuda</displayName>
 			</currency>
 			<currency type="BND">
 				<displayName>Dalar Brunei</displayName>
-				<displayName count="one">Dalolin Brunei</displayName>
+				<displayName count="one">Dalar Brunei</displayName>
 				<displayName count="other">Dalolin Brunei</displayName>
 			</currency>
 			<currency type="BOB">
@@ -2911,14 +2708,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BTN">
 				<displayName>Ngultrum na ƙasar Bhutan</displayName>
-				<displayName count="one">ngultrum na ƙasar Bhutan</displayName>
-				<displayName count="other">Ngultrum na ƙasar Bhutan</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName>Kuɗin Baswana</displayName>
+				<displayName>Pula na Batsuwana</displayName>
+				<displayName count="one">Pula na Batsuwana</displayName>
+				<displayName count="other">Pula na Batsuwana</displayName>
 			</currency>
 			<currency type="BYN">
-				<displayName>Kuɗin Belarus</displayName>
+				<displayName>Ruble na Belarus</displayName>
+				<displayName count="one">Ruble na Belarus</displayName>
+				<displayName count="other">Ruble na Belarus</displayName>
 			</currency>
 			<currency type="BZD">
 				<displayName>Dalar ƙasar Belize</displayName>
@@ -2927,18 +2726,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Dalar Kanada</displayName>
 			</currency>
 			<currency type="CDF">
-				<displayName>Kuɗin Kongo</displayName>
+				<displayName>Franc na Kongo</displayName>
+				<displayName count="one">Franc na Kongo</displayName>
+				<displayName count="other">Franc na Kongo</displayName>
 			</currency>
 			<currency type="CHF">
-				<displayName>Kuɗin Suwizalan</displayName>
+				<displayName>Franc na Suwizilan</displayName>
+				<displayName count="one">Franc na Suwizalan</displayName>
+				<displayName count="other">Franc na Suwizilan</displayName>
 			</currency>
 			<currency type="CLP">
 				<displayName>Peso na ƙasar Chile</displayName>
 			</currency>
 			<currency type="CNH">
 				<displayName>Yuwan na ƙasar Sin (na wajen ƙasa)</displayName>
-				<displayName count="one">yuwan na ƙasar Sin (na wajen ƙasa)</displayName>
-				<displayName count="other">yuwan na ƙasar Sin (na wajen ƙasa)</displayName>
 			</currency>
 			<currency type="CNY">
 				<displayName>Yuwan na ƙasar Sin</displayName>
@@ -2958,15 +2759,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Peso na ƙasar Kuba</displayName>
 			</currency>
 			<currency type="CVE">
-				<displayName>Kuɗin Tsibiran Kap Barde</displayName>
+				<displayName>Escudo na Cape Verde</displayName>
+				<displayName count="one">Escudo na Cape Verd</displayName>
+				<displayName count="other">Escudo na Cape Verde</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName>Kuɗin Czech</displayName>
-				<displayName count="one">kuɗin Czech</displayName>
-				<displayName count="other">Kuɗin Czech</displayName>
+				<displayName>Koruna na Czech</displayName>
+				<displayName count="one">Koruna na Czech</displayName>
+				<displayName count="other">Koruna na Czech</displayName>
 			</currency>
 			<currency type="DJF">
-				<displayName>Kuɗin Jibuti</displayName>
+				<displayName>Franc na Djibouti</displayName>
+				<displayName count="one">Franc na Djibouti</displayName>
+				<displayName count="other">Franc na Djibouti</displayName>
 			</currency>
 			<currency type="DKK">
 				<displayName>Krone na ƙasar Denmark</displayName>
@@ -2979,27 +2784,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Peso na jamhuriyar Dominica</displayName>
 			</currency>
 			<currency type="DZD">
-				<displayName>Kuɗin Aljeriya</displayName>
+				<displayName>Dinarin Aljeriya</displayName>
 				<displayName count="one">Dinarin Aljeriya</displayName>
 				<displayName count="other">Dinarin Aljeriya</displayName>
 			</currency>
 			<currency type="EGP">
-				<displayName>Fam kin Masar</displayName>
+				<displayName>Fam na Masar</displayName>
 				<displayName count="one">Fam na Masar</displayName>
 				<displayName count="other">Fam na Masar</displayName>
 			</currency>
 			<currency type="ERN">
 				<displayName>Kuɗin Eritireya</displayName>
+				<displayName count="one">Nafka na Eritrea</displayName>
+				<displayName count="other">Nafka na Eritrea</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName>Kuɗin Habasha</displayName>
+				<displayName>Birr na Habasha</displayName>
+				<displayName count="one">Birr na Habasha</displayName>
+				<displayName count="other">Birr na Habasha</displayName>
 			</currency>
 			<currency type="EUR">
 				<displayName>Yuro</displayName>
+				<displayName count="one">yuro</displayName>
+				<displayName count="other">yuro</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>Dalar Fiji</displayName>
-				<displayName count="one">Dalolin Fiji</displayName>
+				<displayName count="one">Dalar Fiji</displayName>
 				<displayName count="other">Dalolin Fiji</displayName>
 			</currency>
 			<currency type="FKP">
@@ -3009,9 +2820,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Fam na Ingila</displayName>
 			</currency>
 			<currency type="GEL">
-				<displayName>Kuɗin Georgia</displayName>
-				<displayName count="one">kuɗin Georgia</displayName>
-				<displayName count="other">Kuɗin Georgia</displayName>
+				<displayName>Lari na Georgia</displayName>
+				<displayName count="one">Lari na Georgia</displayName>
+				<displayName count="other">Lari na Georgia</displayName>
 			</currency>
 			<currency type="GHC">
 				<displayName>Cedi</displayName>
@@ -3020,13 +2831,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Sidi na Ghana</displayName>
 			</currency>
 			<currency type="GIP">
-				<displayName>Kuɗin Gibraltal</displayName>
+				<displayName>Fam na Gibraltar</displayName>
+				<displayName count="one">Fam na Gibraltar</displayName>
+				<displayName count="other">Fam na Gibraltar</displayName>
 			</currency>
 			<currency type="GMD">
-				<displayName>Kuɗin Gambiya</displayName>
+				<displayName>Dalasi na Gambiya</displayName>
+				<displayName count="one">Dalasi na Gambiya</displayName>
+				<displayName count="other">Dalasi na Gambiya</displayName>
 			</currency>
 			<currency type="GNF">
-				<displayName>Kuɗin Guinea</displayName>
+				<displayName>Franc na Guinea</displayName>
+				<displayName count="one">Franc na Guinea</displayName>
+				<displayName count="other">Franc na Guinea</displayName>
 			</currency>
 			<currency type="GNS">
 				<displayName>Kuɗin Gini</displayName>
@@ -3041,8 +2858,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="HKD">
 				<displayName>Dalar Hong Kong</displayName>
-				<displayName count="one">dalar Hong Kong</displayName>
-				<displayName count="other">Dalar Hong Kong</displayName>
 			</currency>
 			<currency type="HNL">
 				<displayName>Lempira na ƙasar Honduras</displayName>
@@ -3050,7 +2865,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Lempira na ƙasar Honduras</displayName>
 			</currency>
 			<currency type="HRK">
-				<displayName>Kuɗin Croatia</displayName>
+				<displayName>Kuna na Croatia</displayName>
+				<displayName count="one">Kuna na Croatia</displayName>
+				<displayName count="other">Kunas na Croatia</displayName>
 			</currency>
 			<currency type="HTG">
 				<displayName>Gourde na ƙasar Haiti</displayName>
@@ -3058,20 +2875,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Gourde na ƙasar Haiti</displayName>
 			</currency>
 			<currency type="HUF">
-				<displayName>Kuɗin Hungary</displayName>
-				<displayName count="one">kuɗin Hungary</displayName>
-				<displayName count="other">Kuɗin Hungary</displayName>
+				<displayName>Forint na Hungary</displayName>
+				<displayName count="one">Forint na Hungary</displayName>
+				<displayName count="other">Forint na Hungary</displayName>
 			</currency>
 			<currency type="IDR">
 				<displayName>Rupiah na ƙasar Indonesia</displayName>
-				<displayName count="one">rupiah na ƙasar Indonesia</displayName>
-				<displayName count="other">Rupiah na ƙasar Indonesia</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName>Sabbin Kuɗin Israʼila</displayName>
+				<displayName>Sabon shekel na Israʼila</displayName>
+				<displayName count="one">Sabon shekel na Israʼila</displayName>
+				<displayName count="other">Sabon shekel na Israʼila</displayName>
 			</currency>
 			<currency type="INR">
-				<displayName>Kuɗin Indiya</displayName>
+				<displayName>Rupee na ƙasar Indiya</displayName>
+				<displayName count="one">Rupee na ƙasar Indiya</displayName>
+				<displayName count="other">Rupee na ƙasar Indiya</displayName>
 			</currency>
 			<currency type="IQD">
 				<displayName>Dinarin Iraqi</displayName>
@@ -3080,7 +2899,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="IRR">
 				<displayName>Riyal na ƙasar Iran</displayName>
-				<displayName count="one">Riyal-riyal na ƙasar Iran</displayName>
+				<displayName count="one">Riyal na ƙasar Iran</displayName>
 				<displayName count="other">Riyal-riyal na ƙasar Iran</displayName>
 			</currency>
 			<currency type="ISK">
@@ -3107,26 +2926,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="KGS">
 				<displayName>Som na ƙasar Kyrgystani</displayName>
-				<displayName count="one">som na ƙasar Kyrgystani</displayName>
-				<displayName count="other">Som na ƙasar Kyrgystani</displayName>
 			</currency>
 			<currency type="KHR">
 				<displayName>Riel na ƙasar Cambodia</displayName>
-				<displayName count="one">riel na ƙasar Cambodia</displayName>
-				<displayName count="other">Riel na ƙasar Cambodia</displayName>
 			</currency>
 			<currency type="KMF">
-				<displayName>Kuɗin Kwamoras</displayName>
+				<displayName>Franc na Kwamoras</displayName>
+				<displayName count="one">Franc na Kwamoras</displayName>
+				<displayName count="other">Franc na Kwamoras</displayName>
 			</currency>
 			<currency type="KPW">
 				<displayName>Won na ƙasar Koriya ta Arewa</displayName>
-				<displayName count="one">won na ƙasar Koriya ta Arewa</displayName>
-				<displayName count="other">won na ƙasar Koriya ta Arewa</displayName>
 			</currency>
 			<currency type="KRW">
 				<displayName>Won na Koriya ta Kudu</displayName>
-				<displayName count="one">won na Koriya ta Kudu</displayName>
-				<displayName count="other">won na Koriya ta Kudu</displayName>
 			</currency>
 			<currency type="KWD">
 				<displayName>Dinarin Kuwaiti</displayName>
@@ -3140,82 +2953,84 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="KZT">
 				<displayName>Tenge na ƙasar Kazkhstan</displayName>
-				<displayName count="one">tenge na ƙasar Kazakhstan</displayName>
-				<displayName count="other">Tenge na ƙasar Kazkhstan</displayName>
 			</currency>
 			<currency type="LAK">
-				<displayName>Kuɗin Laos</displayName>
-				<displayName count="one">kuɗin Laos</displayName>
-				<displayName count="other">Kuɗin Laos</displayName>
+				<displayName>Kip na ƙasar Laos</displayName>
+				<displayName count="one">Kip na ƙasar Laos</displayName>
+				<displayName count="other">Kip na ƙasar Laos</displayName>
 			</currency>
 			<currency type="LBP">
-				<displayName>Kuɗin Lebanon</displayName>
-				<displayName count="one">kuɗin Lebanon</displayName>
-				<displayName count="other">Kuɗin Lebanon</displayName>
+				<displayName>Fam na Lebanon</displayName>
+				<displayName count="one">Fam na Lebanon</displayName>
+				<displayName count="other">Fam na Lebanon</displayName>
 			</currency>
 			<currency type="LKR">
 				<displayName>Rupee na ƙasar Sri Lanka</displayName>
-				<displayName count="one">rupee na ƙasar Sri Lanka</displayName>
-				<displayName count="other">Rupee na ƙasar Sri Lanka</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName>Dalar Laberiya</displayName>
 			</currency>
 			<currency type="LSL">
-				<displayName>Kuɗin Lesoto</displayName>
-				<displayName count="one">Kuɗaɗen Lesoto</displayName>
-				<displayName count="other">Kuɗaɗen Lesoto</displayName>
+				<displayName>Loti na Lesoto</displayName>
+				<displayName count="one">Loti na Lesoto</displayName>
+				<displayName count="other">Loti na Lesoto</displayName>
 			</currency>
 			<currency type="LYD">
-				<displayName>Kuɗin Libiya</displayName>
+				<displayName>Dinarin Libya</displayName>
 				<displayName count="one">Dinarin Libiya</displayName>
 				<displayName count="other">Dinarin Libiya</displayName>
 			</currency>
 			<currency type="MAD">
-				<displayName>Kuɗin Maroko</displayName>
+				<displayName>Dirhamin Moroko</displayName>
 				<displayName count="one">Dirhamin Maroko</displayName>
 				<displayName count="other">Dirhamomin Maroko</displayName>
 			</currency>
 			<currency type="MDL">
-				<displayName>Kuɗaɗen Moldova</displayName>
-				<displayName count="one">Kuɗaɗen Moldova</displayName>
-				<displayName count="other">kuɗaɗen Moldova</displayName>
+				<displayName>Leu na Moldova</displayName>
+				<displayName count="one">Leu na Moldova</displayName>
+				<displayName count="other">Lei na Moldova</displayName>
 			</currency>
 			<currency type="MGA">
-				<displayName>Kuɗin Madagaskar</displayName>
+				<displayName>Ariary na Malagasy</displayName>
+				<displayName count="one">Ariary na Malagasy</displayName>
+				<displayName count="other">Ariary na Malagasy</displayName>
 			</currency>
 			<currency type="MKD">
 				<displayName>Dinarin Macedonia</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName>Kuɗin Myanmar</displayName>
-				<displayName count="one">kuɗin Myanmar</displayName>
-				<displayName count="other">Kuɗin Myanmar</displayName>
+				<displayName>Kyat na ƙasar Myanmar</displayName>
+				<displayName count="one">Kyat na ƙasar Myanmar</displayName>
+				<displayName count="other">Kyat na ƙasar Myanmar</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik na Mongolia</displayName>
-				<displayName count="one">tugrik na Mongoliya</displayName>
-				<displayName count="other">Tugrik na Mongolia</displayName>
 			</currency>
 			<currency type="MOP">
 				<displayName>Pataca na ƙasar Macao</displayName>
-				<displayName count="one">pataca na ƙasar Macao</displayName>
-				<displayName count="other">Pataca na ƙasar Macao</displayName>
 			</currency>
 			<currency type="MRO">
 				<displayName>Kuɗin Moritaniya (1973–2017)</displayName>
 			</currency>
 			<currency type="MRU">
-				<displayName>Kuɗin Moritaniya</displayName>
+				<displayName>Ouguiya na Moritaniya</displayName>
+				<displayName count="one">Ouguiya na Moritaniya</displayName>
+				<displayName count="other">Ouguiya na Moritaniya</displayName>
 			</currency>
 			<currency type="MUR">
-				<displayName>Kuɗin Moritus</displayName>
+				<displayName>Rupee na Moritus</displayName>
+				<displayName count="one">Rupee na Moritus</displayName>
+				<displayName count="other">Rupee na Moritus</displayName>
 			</currency>
 			<currency type="MVR">
-				<displayName>Rufiyaa na ɓasar Maldives</displayName>
+				<displayName>Rufiyaa na ƙasar Maldives</displayName>
+				<displayName count="one">Rufiyaa na ƙasar Maldives</displayName>
+				<displayName count="other">Rufiyaa na ƙasar Maldives</displayName>
 			</currency>
 			<currency type="MWK">
-				<displayName>Kuɗin Malawi</displayName>
+				<displayName>Kwacha na Malawi</displayName>
+				<displayName count="one">Kwacha na Malawi</displayName>
+				<displayName count="other">Kwacha na Malawi</displayName>
 			</currency>
 			<currency type="MXN">
 				<displayName>Peso na ƙasar Mekziko</displayName>
@@ -3223,9 +3038,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">peso na ƙasar Mekziko</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName>Kuɗin Malaysia</displayName>
-				<displayName count="one">kuɗin Malaysia</displayName>
-				<displayName count="other">Kuɗin Malaysia</displayName>
+				<displayName>Ringgit na ƙasar Malaysia</displayName>
+				<displayName count="one">Ringgit na ƙasar Malaysia</displayName>
+				<displayName count="other">Ringgit na ƙasar Malaysia</displayName>
 			</currency>
 			<currency type="MZM">
 				<displayName>Kuɗin Mozambik</displayName>
@@ -3254,12 +3069,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="NPR">
 				<displayName>Rupee na Nepal</displayName>
-				<displayName count="one">rupee na Nepal</displayName>
-				<displayName count="other">Rupee na Nepal</displayName>
 			</currency>
 			<currency type="NZD">
 				<displayName>Dalar New Zealand</displayName>
-				<displayName count="one">Dalolin New Zealand</displayName>
+				<displayName count="one">Dalar New Zealand</displayName>
 				<displayName count="other">Dalolin New Zealand</displayName>
 			</currency>
 			<currency type="OMR">
@@ -3272,22 +3085,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Sol na ƙasar Peru</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName>Kina na ƙasar Papua Sabon Guinea</displayName>
-				<displayName count="one">kina na ƙasar Papua Sabon Guinea</displayName>
-				<displayName count="other">Kina na ƙasar Papua Sabon Guinea</displayName>
+				<displayName>Kina na ƙasar Papua New Guinea</displayName>
+				<displayName count="one">Kina na ƙasar Papua New Guinea</displayName>
+				<displayName count="other">Kina na ƙasar Papua New Guinea</displayName>
 			</currency>
 			<currency type="PHP">
-				<displayName>Kuɗin Philippine</displayName>
+				<displayName>Peso na ƙasar Philippine</displayName>
+				<displayName count="one">Peso na ƙasar Philippine</displayName>
+				<displayName count="other">Peso na ƙasar Philippine</displayName>
 			</currency>
 			<currency type="PKR">
 				<displayName>Rupee na ƙasar Pakistan</displayName>
-				<displayName count="one">rupee na ƙasar Pakistan</displayName>
-				<displayName count="other">Rupee na ƙasar Pakistan</displayName>
 			</currency>
 			<currency type="PLN">
-				<displayName>Kuɗin Polan</displayName>
-				<displayName count="one">kuɗin Polan</displayName>
-				<displayName count="other">kuɗaɗen Polan</displayName>
+				<displayName>Zloty na Polan</displayName>
+				<displayName count="one">zloty na Polan</displayName>
+				<displayName count="other">zloty na Polan</displayName>
 			</currency>
 			<currency type="PYG">
 				<displayName>Guarani na ƙasar Paraguay</displayName>
@@ -3296,9 +3109,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Riyal ɗin Qatar</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName>Kuɗin Romania</displayName>
-				<displayName count="one">kuɗin Romania</displayName>
-				<displayName count="other">Kuɗin Romania</displayName>
+				<displayName>Leu na Romania</displayName>
+				<displayName count="one">Leu na Romania</displayName>
+				<displayName count="other">Leu na Romania</displayName>
 			</currency>
 			<currency type="RSD">
 				<displayName>Dinarin Serbia</displayName>
@@ -3309,20 +3122,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Ruble na ƙasar Rasha</displayName>
 			</currency>
 			<currency type="RWF">
-				<displayName>Kuɗin Ruwanda</displayName>
+				<displayName>Franc na Ruwanda</displayName>
+				<displayName count="one">Franc na Ruwanda</displayName>
+				<displayName count="other">Franc na Ruwanda</displayName>
 			</currency>
 			<currency type="SAR">
-				<displayName>Riyal</displayName>
+				<displayName>Riyal ɗin Saudiyya</displayName>
 				<displayName count="one">Riyal ɗin Saudiyya</displayName>
-				<displayName count="other">Riyal</displayName>
+				<displayName count="other">Riyal ɗin Saudiyya</displayName>
 			</currency>
 			<currency type="SBD">
-				<displayName>Dalar Tsibirai na Solomon</displayName>
-				<displayName count="one">Dalolin Tsibirai na Solomon</displayName>
-				<displayName count="other">Dalolin Tsibirai na Solomon</displayName>
+				<displayName>Dalar Tsibiran Solomon</displayName>
+				<displayName count="one">Dalar Tsibiran Solomon</displayName>
+				<displayName count="other">Dalolin Tsibiran Solomon</displayName>
 			</currency>
 			<currency type="SCR">
-				<displayName>Kuɗin Saishal</displayName>
+				<displayName>Rupee na Seychellois</displayName>
+				<displayName count="one">Rupee na Seychellois</displayName>
+				<displayName count="other">Rupee na Seychellois</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>Fam na Sudan</displayName>
@@ -3334,23 +3151,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SGD">
 				<displayName>Dalar Singapore</displayName>
-				<displayName count="one">Dalolin Singapore</displayName>
+				<displayName count="one">Dalar Singapore</displayName>
 				<displayName count="other">Dalolin Singapore</displayName>
 			</currency>
 			<currency type="SHP">
-				<displayName>Fam kin San Helena</displayName>
+				<displayName>Fam na San Helena</displayName>
 				<displayName count="one">Fam na San Helena</displayName>
 				<displayName count="other">fam na San Helena</displayName>
 			</currency>
 			<currency type="SLE">
-				<displayName>Kuɗin Salewo</displayName>
-				<displayName count="one">Kuɗin Saliyo</displayName>
-				<displayName count="other">Kuɗin Saliyo</displayName>
+				<displayName>Leone na Saliyo</displayName>
+				<displayName count="one">Leone na Saliyo</displayName>
+				<displayName count="other">Leone na Saliyo</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>Kuɗin Salewo (1964—2022)</displayName>
-				<displayName count="one">Kuɗin Saliyo (1964—2022)</displayName>
-				<displayName count="other">Kuɗin Saliyo (1964—2022)</displayName>
+				<displayName>Leone na Saliyo (1964—2022)</displayName>
+				<displayName count="one">Leone na Saliyo (1964—2022)</displayName>
+				<displayName count="other">Leone na Saliyo (1964—2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>Sulen Somaliya</displayName>
@@ -3367,41 +3184,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Kuɗin Sawo Tome da Paransip (1977–2017)</displayName>
 			</currency>
 			<currency type="STN">
-				<displayName>Kuɗin Sawo Tome da Paransip</displayName>
+				<displayName>Dobra na Sawo Tome</displayName>
+				<displayName count="one">Dobra na Sawo Tome</displayName>
+				<displayName count="other">Dobra na Sawo Tome</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName>Kuɗin Siriya</displayName>
+				<displayName>Fam ɗin Siriya</displayName>
+				<displayName count="one">Fam ɗin Siriya</displayName>
+				<displayName count="other">Fam ɗin Siriya</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName>Kuɗin Lilangeni</displayName>
+				<displayName>Emalangeni na Swazi</displayName>
+				<displayName count="one">Lilangeni na Swazi</displayName>
+				<displayName count="other">Emalangeni na Swazi</displayName>
 			</currency>
 			<currency type="THB">
 				<displayName>Baht na ƙasar Thailand</displayName>
-				<displayName count="one">baht na ƙasar Thailand</displayName>
-				<displayName count="other">Baht na ƙasar Thailand</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>Somoni na ƙasar Tajikistan</displayName>
-				<displayName count="one">somoni na ƙasar Tajikistan</displayName>
-				<displayName count="other">Somoni na ƙasar Tajikistan</displayName>
 			</currency>
 			<currency type="TMT">
 				<displayName>Manat na ƙasar Turkmenistan</displayName>
-				<displayName count="one">manat na ƙasar Turkmenistan</displayName>
-				<displayName count="other">Manat na ƙasar Turkmenistan</displayName>
 			</currency>
 			<currency type="TND">
-				<displayName>Kuɗin Tunisiya</displayName>
+				<displayName>Dinarin Tunusiya</displayName>
 				<displayName count="one">Dinarin Tunusiya</displayName>
 				<displayName count="other">Dinarin Tunusiya</displayName>
 			</currency>
 			<currency type="TOP">
 				<displayName>Paʻanga na ƙasar Tonga</displayName>
-				<displayName count="one">paʻanga na ƙasar Tonga</displayName>
-				<displayName count="other">Paʻanga na ƙasar Tonga</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName>Kuɗin Turkiyya</displayName>
+				<displayName>Lira na Turkiyya</displayName>
+				<displayName count="one">Lira na Turkiyya</displayName>
+				<displayName count="other">Lira na Turkiyya</displayName>
 			</currency>
 			<currency type="TTD">
 				<displayName>Dalar ƙasar Trinidad da Tobago</displayName>
@@ -3410,19 +3227,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="TWD">
 				<displayName>Sabuwar Dalar Taiwan</displayName>
-				<displayName count="one">Sabuwar dalar Taiwan</displayName>
-				<displayName count="other">Sabuwar Dalar Taiwan</displayName>
 			</currency>
 			<currency type="TZS">
 				<displayName>Sulen Tanzaniya</displayName>
 			</currency>
 			<currency type="UAH">
-				<displayName>Kudin Ukrainian</displayName>
-				<displayName count="one">kuɗin Ukrain</displayName>
-				<displayName count="other">Kuɗin Ukrain</displayName>
+				<displayName>Hryvnia na Ukrain</displayName>
+				<displayName count="one">Hryvnia na Ukrain</displayName>
+				<displayName count="other">Hryvnia na Ukrain</displayName>
 			</currency>
 			<currency type="UGX">
-				<displayName>Sule Yuganda</displayName>
+				<displayName>Sulen Yuganda</displayName>
 				<displayName count="one">Sulallan Yuganda</displayName>
 				<displayName count="other">Sulallan Yuganda</displayName>
 			</currency>
@@ -3437,26 +3252,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="UZS">
 				<displayName>Som na ƙasar Uzbekistan</displayName>
-				<displayName count="one">som na ƙasar Uzbekistan</displayName>
-				<displayName count="other">Som na ƙasar Uzbekistan</displayName>
 			</currency>
 			<currency type="VES">
 				<displayName>Bolívar na ƙasar Venezuela</displayName>
 			</currency>
 			<currency type="VND">
-				<displayName>Kuɗin Vietnam</displayName>
-				<displayName count="one">kuɗin Vietnam</displayName>
-				<displayName count="other">Kuɗin Vietnam</displayName>
+				<displayName>Dong na ƙasar Vietnam</displayName>
+				<displayName count="one">Dong na ƙasar Vietnam</displayName>
+				<displayName count="other">Dong na ƙasar Vietnam</displayName>
 			</currency>
 			<currency type="VUV">
 				<displayName>Vatu da ƙasar Vanuatu</displayName>
-				<displayName count="one">vatu na ƙasar Vanuatu</displayName>
-				<displayName count="other">Vatu da ƙasar Vanuatu</displayName>
 			</currency>
 			<currency type="WST">
 				<displayName>Tala na ƙasar Samoa</displayName>
-				<displayName count="one">tala na ƙasar Samoa</displayName>
-				<displayName count="other">Tala na ƙasar Samoa</displayName>
 			</currency>
 			<currency type="XAF">
 				<displayName>Kuɗin Sefa na Afirka Ta Tsakiya</displayName>
@@ -3466,18 +3275,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dalar Gabashin Karebiyan</displayName>
 				<displayName count="other">dalar Gabashin Karebiyan</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder na Caribbean</displayName>
+				<displayName count="one">Guilder na Caribbean</displayName>
+				<displayName count="other">Guilder na Caribbean</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Kuɗin Sefa na Afirka Ta Yamma</displayName>
 			</currency>
 			<currency type="XPF">
 				<displayName>Kuɗin CFP franc</displayName>
-				<displayName count="one">kuɗin CFP franc</displayName>
-				<displayName count="other">Kuɗin CFP franc</displayName>
 			</currency>
 			<currency type="XXX">
 				<displayName>Kudin da ba a sani ba</displayName>
-				<displayName count="one">(kuɗin sashe da ba a sani ba)</displayName>
-				<displayName count="other">(Kudin da ba a sani ba)</displayName>
+				<displayName count="one">(sashin kuɗi da ba a sani ba)</displayName>
+				<displayName count="other">Kudin da ba a sani ba</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Riyal ɗin Yemen</displayName>
@@ -3485,17 +3297,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">Riyal ɗin Yemen</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName>Kuɗin Afirka Ta Kudu</displayName>
+				<displayName>Rand na Afirka ta Kudu</displayName>
+				<displayName count="one">Rand na Afirka ta Kudu</displayName>
+				<displayName count="other">Rand na Afirka ta Kudu</displayName>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Kuɗin Zambiya (1968–2012)</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName>Kuɗin Zambiya</displayName>
+				<displayName>Kwacha na Zambiya</displayName>
+				<displayName count="one">Kwacha na Zambiya</displayName>
+				<displayName count="other">Kwacha na Zambiya</displayName>
 			</currency>
 			<currency type="ZWD">
 				<displayName>Dalar zimbabuwe</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zinaren Zimbabwe</displayName>
+				<displayName count="one">Zinaren Zimbabwe</displayName>
+				<displayName count="other">Zinaren Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -3677,7 +3498,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">abu {0}</unitPattern>
 				<unitPattern count="other">abubuwa {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>sassa</displayName>
+				<unitPattern count="one">sashe {0}</unitPattern>
+				<unitPattern count="other">sassa {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts per million</displayName>
 				<unitPattern count="one">part per million {0}</unitPattern>
 				<unitPattern count="other">parts per million {0}</unitPattern>
@@ -3699,6 +3525,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mole {0}</unitPattern>
 				<unitPattern count="other">moles {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>na guluko</displayName>
+				<unitPattern count="one">{0} na guluko</unitPattern>
+				<unitPattern count="other">{0} na guluko</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litoci a kilomita</displayName>
 				<unitPattern count="one">lita a kilomita {0}</unitPattern>
@@ -3790,12 +3621,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>{0} a shekara</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName>kwatoci</displayName>
+				<displayName>kwata-kwata</displayName>
 				<unitPattern count="one">kwata {0}</unitPattern>
 				<unitPattern count="other">kwatoci {0}</unitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName>wat</displayName>
 				<unitPattern count="one">wata {0}</unitPattern>
 				<unitPattern count="other">watanni {0}</unitPattern>
 				<perUnitPattern>{0} a wata</perUnitPattern>
@@ -3970,17 +3800,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="graphics-dot-per-inch">
 				<displayName>ayoyi a inci</displayName>
-				<unitPattern count="one">{0} aya a inci</unitPattern>
-				<unitPattern count="other">{0} ayoyi a inci</unitPattern>
+				<unitPattern count="one">aya {0} a inci</unitPattern>
+				<unitPattern count="other">ayoyi {0} a inci</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<unitPattern count="one">aya {0}</unitPattern>
 				<unitPattern count="other">aya {0}</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName>earth radius</displayName>
-				<unitPattern count="one">earth radius {0}</unitPattern>
-				<unitPattern count="other">earth radius {0}</unitPattern>
+				<displayName>faɗin duniya</displayName>
+				<unitPattern count="one">faɗin duniya {0}</unitPattern>
+				<unitPattern count="other">faɗin duniya {0}</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>kilomitoci</displayName>
@@ -4202,6 +4032,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">millimitar zaiba {0}</unitPattern>
 				<unitPattern count="other">millimitocin zaiba {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>na mercury</displayName>
+				<unitPattern count="one">{0} na mercury</unitPattern>
+				<unitPattern count="other">{0} na mercury</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>laba-laba a sikwaya inci</displayName>
 				<unitPattern count="one">laba a sikwaya inci {0}</unitPattern>
@@ -4373,6 +4208,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">metric cup {0}</unitPattern>
 				<unitPattern count="other">metric cups {0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>kimar awon ruwa</displayName>
+				<unitPattern count="one">kimar awon ruwa {0}</unitPattern>
+				<unitPattern count="other">kimar awon ruwa {0}</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>eka-ƙafafu</displayName>
 				<unitPattern count="one">eka-ƙafa {0}</unitPattern>
@@ -4452,22 +4292,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">Imp. quart {0}</unitPattern>
 				<unitPattern count="other">Imp. quarts {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="one">steradian {0}</unitPattern>
+				<unitPattern count="other">steradian {0}</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">coulomb {0}</unitPattern>
+				<unitPattern count="other">coulomb {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">farad {0}</unitPattern>
+				<unitPattern count="other">farad {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori-kalori [IT]</displayName>
+				<unitPattern count="one">kalori [IT] {0}</unitPattern>
+				<unitPattern count="other">kalori-kalori [IT] {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekerel-bekerel</displayName>
+				<unitPattern count="one">bekerel {0}</unitPattern>
+				<unitPattern count="other">bekerel-bekerel {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sibat-sibat</displayName>
+				<unitPattern count="one">sibat {0}</unitPattern>
+				<unitPattern count="other">sibat-sibat {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gre-gre</displayName>
+				<unitPattern count="one">gre {0}</unitPattern>
+				<unitPattern count="other">gre-gre {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograms-force</displayName>
+				<unitPattern count="one">{0} kilogram-force</unitPattern>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">tesla {0}</unitPattern>
+				<unitPattern count="other">tesla {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">weber {0}</unitPattern>
+				<unitPattern count="other">weber {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>haske</displayName>
 				<unitPattern count="one">haske {0}</unitPattern>
 				<unitPattern count="other">haske {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>sashi a cikin biliyan</displayName>
 				<unitPattern count="one">sashi {0} a cikin biliyan</unitPattern>
 				<unitPattern count="other">sashi {0} a cikin biliyan</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>darare</displayName>
-				<unitPattern count="one">dare {0}</unitPattern>
-				<unitPattern count="other">darare {0}</unitPattern>
-				<perUnitPattern>dare {0}</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>wurin fuskanta</displayName>
 				<coordinateUnitPattern type="east">Gabas {0}</coordinateUnitPattern>
@@ -4577,7 +4475,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">abu {0}</unitPattern>
 				<unitPattern count="other">Abw. {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>sashe</displayName>
+				<unitPattern count="one">sashe {0}</unitPattern>
+				<unitPattern count="other">sashe {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>parts/million</displayName>
 				<unitPattern count="one">ppm {0}</unitPattern>
 				<unitPattern count="other">ppm {0}</unitPattern>
@@ -4600,6 +4503,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mol {0}</unitPattern>
 				<unitPattern count="other">mol {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">Glk {0}</unitPattern>
+				<unitPattern count="other">Glk {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litoci/km</displayName>
 				<unitPattern count="one">L/km {0}</unitPattern>
@@ -4746,6 +4654,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">ns {0}</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
+				<displayName>amps</displayName>
 				<unitPattern count="one">A {0}</unitPattern>
 				<unitPattern count="other">A {0}</unitPattern>
 			</unit>
@@ -4855,15 +4764,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">ppi {0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
+				<displayName>dpcm</displayName>
 				<unitPattern count="one">dpcm {0}</unitPattern>
 				<unitPattern count="other">dpcm {0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
+				<displayName>dpi</displayName>
 				<unitPattern count="one">dpi {0}</unitPattern>
 				<unitPattern count="other">dpi {0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>aya</displayName>
+				<unitPattern count="one">aya {0}</unitPattern>
+				<unitPattern count="other">aya {0}</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
 				<unitPattern count="one">R⊕ {0}</unitPattern>
@@ -4871,20 +4784,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one">km {0}</unitPattern>
-				<unitPattern count="other">{0} km</unitPattern>
+				<unitPattern count="other">km {0}</unitPattern>
+				<perUnitPattern>km/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>m</displayName>
 				<unitPattern count="one">m {0}</unitPattern>
 				<unitPattern count="other">m {0}</unitPattern>
+				<perUnitPattern>m/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<unitPattern count="one">dm {0}</unitPattern>
 				<unitPattern count="other">dm {0}</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<unitPattern count="one">cm {0}</unitPattern>
-				<unitPattern count="other">cm {0}</unitPattern>
+				<displayName>sm</displayName>
+				<unitPattern count="one">sm {0}</unitPattern>
+				<unitPattern count="other">sm {0}</unitPattern>
+				<perUnitPattern>sm/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one">mm {0}</unitPattern>
@@ -4917,12 +4834,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ƙafafu</displayName>
 				<unitPattern count="one">ƙf {0}</unitPattern>
 				<unitPattern count="other">ƙff {0}</unitPattern>
-				<perUnitPattern>{0}/ƙf</perUnitPattern>
+				<perUnitPattern>ƙafa/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>incina</displayName>
 				<unitPattern count="one">in {0}</unitPattern>
 				<unitPattern count="other">in {0}</unitPattern>
+				<perUnitPattern>in/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>fasekoki</displayName>
@@ -5080,6 +4998,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mmHg {0}</unitPattern>
 				<unitPattern count="other">mmHg {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>na Hg</displayName>
+				<unitPattern count="one">{0} na Hg</unitPattern>
+				<unitPattern count="other">{0} na Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">psi {0}</unitPattern>
 				<unitPattern count="other">psi {0}</unitPattern>
@@ -5228,6 +5151,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mc {0}</unitPattern>
 				<unitPattern count="other">mc {0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">kimar awon ruwa {0}.</unitPattern>
+				<unitPattern count="other">kimar awon ruwa {0}.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>eka ƙf</displayName>
 				<unitPattern count="one">ek ƙf {0}</unitPattern>
@@ -5314,12 +5241,68 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">qt Imp. {0}</unitPattern>
 				<unitPattern count="other">qt Imp. {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">sr {0}</unitPattern>
+				<unitPattern count="other">sr {0}</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">C {0}</unitPattern>
+				<unitPattern count="other">C {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">F {0}</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">kal-IT {0}</unitPattern>
+				<unitPattern count="other">kal-IT {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">Bk {0}</unitPattern>
+				<unitPattern count="other">Bk {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Sb</displayName>
+				<unitPattern count="one">Sb {0}</unitPattern>
+				<unitPattern count="other">Sb {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gr</displayName>
+				<unitPattern count="one">Gr {0}</unitPattern>
+				<unitPattern count="other">Gr {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">T {0}</unitPattern>
+				<unitPattern count="other">T {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">Wb {0}</unitPattern>
+				<unitPattern count="other">Wb {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>hsk</displayName>
 				<unitPattern count="one">hsk {0}</unitPattern>
 				<unitPattern count="other">hsk {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>sashi/biliyan</displayName>
 				<unitPattern count="one">sashi {0} a cikin biliyan</unitPattern>
 				<unitPattern count="other">sashi {0} a cikin biliyan</unitPattern>
@@ -5433,7 +5416,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">abu{0}</unitPattern>
 				<unitPattern count="other">Abw{0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>sashe</displayName>
+				<unitPattern count="one">sashe {0}</unitPattern>
+				<unitPattern count="other">sashe {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">ppm{0}</unitPattern>
 				<unitPattern count="other">ppm{0}</unitPattern>
@@ -5453,6 +5441,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mol{0}</unitPattern>
 				<unitPattern count="other">mol{0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">Glk {0}</unitPattern>
+				<unitPattern count="other">Glk {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="one">L/km{0}</unitPattern>
@@ -5687,10 +5680,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">ppi{0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
+				<displayName>dpcm</displayName>
 				<unitPattern count="one">dpcm{0}</unitPattern>
 				<unitPattern count="other">dpcm{0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
+				<displayName>dpi</displayName>
 				<unitPattern count="one">dpi{0}</unitPattern>
 				<unitPattern count="other">dpi{0}</unitPattern>
 			</unit>
@@ -5705,18 +5700,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="length-kilometer">
 				<unitPattern count="one">km{0}</unitPattern>
 				<unitPattern count="other">km{0}</unitPattern>
+				<perUnitPattern>km/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one">m{0}</unitPattern>
 				<unitPattern count="other">m{0}</unitPattern>
+				<perUnitPattern>m/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<unitPattern count="one">dm{0}</unitPattern>
 				<unitPattern count="other">dm{0}</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<unitPattern count="one">cm{0}</unitPattern>
-				<unitPattern count="other">cm{0}</unitPattern>
+				<displayName>sm</displayName>
+				<unitPattern count="one">sm{0}</unitPattern>
+				<unitPattern count="other">sm{0}</unitPattern>
+				<perUnitPattern>sm/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<unitPattern count="one">mm{0}</unitPattern>
@@ -5743,12 +5742,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">ydk{0}</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<unitPattern count="one">ƙf{0}</unitPattern>
-				<unitPattern count="other">ƙff{0}</unitPattern>
+				<unitPattern count="one">{0}'</unitPattern>
+				<unitPattern count="other">{0}'</unitPattern>
+				<perUnitPattern>ƙafa/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>in/{0}</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>fasek</displayName>
@@ -6035,6 +6036,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">mL{0}</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
+				<displayName>pt</displayName>
 				<unitPattern count="one">mpt{0}</unitPattern>
 				<unitPattern count="other">mpt{0}</unitPattern>
 			</unit>
@@ -6042,6 +6044,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">mc{0}</unitPattern>
 				<unitPattern count="other">mc{0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>kimar awon ruwa.</displayName>
+				<unitPattern count="one">kimar awon ruwa {0}.</unitPattern>
+				<unitPattern count="other">kimar awon ruwa {0}.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">ek ƙf{0}</unitPattern>
 				<unitPattern count="other">ek ƙf{0}</unitPattern>
@@ -6057,7 +6064,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-gallon-imperial">
 				<displayName>Imp gal</displayName>
 				<unitPattern count="one">galIm{0}</unitPattern>
-				<unitPattern count="other">galIm{0}</unitPattern>
+				<unitPattern count="other">gal-Im{0}</unitPattern>
 				<perUnitPattern>{0}/galIm</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
@@ -6128,22 +6135,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">qt-Imp.{0}</unitPattern>
 				<unitPattern count="other">qt-Imp.{0}</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>hsk</displayName>
-				<unitPattern count="one">hsk {0}</unitPattern>
-				<unitPattern count="other">hsk {0}</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">sr {0}</unitPattern>
+				<unitPattern count="other">sr {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">C {0}</unitPattern>
+				<unitPattern count="other">C {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">F {0}</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">kal-IT{0}</unitPattern>
+				<unitPattern count="other">kal-IT {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">Bk {0}</unitPattern>
+				<unitPattern count="other">Bk {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Sb</displayName>
+				<unitPattern count="one">Sb {0}</unitPattern>
+				<unitPattern count="other">Sb {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gr</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">T {0}</unitPattern>
+				<unitPattern count="other">T {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">Wb{0}</unitPattern>
+				<unitPattern count="other">Wb{0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>sashi/biliyan</displayName>
 				<unitPattern count="one">sashi {0} a cikin biliyan</unitPattern>
 				<unitPattern count="other">sashi {0} a cikin biliyan</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>darare</displayName>
-				<unitPattern count="one">dare {0}</unitPattern>
-				<unitPattern count="other">darare {0}</unitPattern>
-				<perUnitPattern>dare {0}</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">G{0}</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">A{0}</coordinateUnitPattern>
@@ -6475,7 +6517,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<nameField type="surname-prefix">van den</nameField>
 			<nameField type="surname-core">Wolf</nameField>
 			<nameField type="surname2">Becker Schmidt</nameField>
-			<nameField type="generation">Jr</nameField>
+			<nameField type="generation">Ƙarami</nameField>
 			<nameField type="credentials">M.D. Ph.D.</nameField>
 		</sampleName>
 	</personNames>
diff --git a/make/data/cldr/common/main/haw.xml b/make/data/cldr/common/main/haw.xml
index 014397e54b8..9981a26ad52 100644
--- a/make/data/cldr/common/main/haw.xml
+++ b/make/data/cldr/common/main/haw.xml
@@ -326,13 +326,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</calendar>
 		</calendars>
 		<timeZoneNames>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
-			</zone>
 			<metazone type="Alaska">
 				<short>
 					<generic>AKT</generic>
@@ -340,6 +333,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>AKDT</daylight>
 				</short>
 			</metazone>
+			<metazone type="Hawaii">
+				<short>
+					<generic>HAT</generic>
+					<standard>HAST</standard>
+					<daylight>HADT</daylight>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<short>
 					<generic>HAT</generic>
diff --git a/make/data/cldr/common/main/he.xml b/make/data/cldr/common/main/he.xml
index 640cb79740b..a31b5323898 100644
--- a/make/data/cldr/common/main/he.xml
+++ b/make/data/cldr/common/main/he.xml
@@ -283,6 +283,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">באפיה</language>
 			<language type="ksh">קולוניאן</language>
 			<language type="ku">כורדית</language>
+			<language type="ku" menu="core">כורדית</language>
+			<language type="ku" menu="extension">כורדית</language>
 			<language type="kum">קומיקית</language>
 			<language type="kut">קוטנאי</language>
 			<language type="kv">קומי</language>
@@ -860,6 +862,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">סין</territory>
 			<territory type="CO">קולומביה</territory>
 			<territory type="CP">האי קליפרטון</territory>
+			<territory type="CQ">סרק</territory>
 			<territory type="CR">קוסטה ריקה</territory>
 			<territory type="CU">קובה</territory>
 			<territory type="CV">כף ורדה</territory>
@@ -1210,35 +1213,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">מיון לפי מספרים</key>
 			<key type="colStrength">עוצמת המיון</key>
 			<key type="currency">מטבע</key>
+			<key type="em">הצגת אמוג׳י</key>
 			<key type="hc">מחזור השעות (12 או 24)</key>
 			<key type="lb">סגנון מעבר שורה</key>
+			<key type="lw">פיצול שורה בתוך מילים</key>
 			<key type="ms">מערכת מדידה</key>
 			<key type="numbers">מספרים</key>
+			<key type="ss">פיצול משפט אחרי מילה מקוצרת</key>
 			<key type="timezone">אזור זמן</key>
 			<key type="va">משתנה אזור</key>
 			<key type="x">שימוש פרטי</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">לוח השנה הבודהיסטי</type>
+			<type key="calendar" type="buddhist" scope="core">בודהיסטי</type>
 			<type key="calendar" type="chinese">לוח השנה הסיני</type>
+			<type key="calendar" type="chinese" scope="core">סיני</type>
 			<type key="calendar" type="coptic">לוח השנה הקופטי</type>
+			<type key="calendar" type="coptic" scope="core">קופטי</type>
 			<type key="calendar" type="dangi">לוח השנה הקוריאני</type>
+			<type key="calendar" type="dangi" scope="core">קוריאני</type>
 			<type key="calendar" type="ethiopic">לוח השנה האתיופי</type>
+			<type key="calendar" type="ethiopic" scope="core">אתיופי</type>
 			<type key="calendar" type="ethiopic-amete-alem">לוח השנה אמטה אלם האתיופי</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">אמטה אלם האתיופי</type>
 			<type key="calendar" type="gregorian">לוח השנה הגרגוריאני</type>
+			<type key="calendar" type="gregorian" scope="core">גרגוריאני</type>
 			<type key="calendar" type="hebrew">לוח השנה העברי</type>
+			<type key="calendar" type="hebrew" scope="core">עברי</type>
 			<type key="calendar" type="indian">לוח השנה ההודי הלאומי</type>
 			<type key="calendar" type="islamic">לוח שנה ההיג׳רי</type>
+			<type key="calendar" type="islamic" scope="core">היג׳רי</type>
 			<type key="calendar" type="islamic-civil">לוח השנה המוסלמי האזרחי</type>
+			<type key="calendar" type="islamic-civil" scope="core">היג׳רי אזרחי</type>
 			<type key="calendar" type="islamic-rgsa">לוח השנה המוסלמי (ערב הסעודית)</type>
 			<type key="calendar" type="islamic-tbla">לוח השנה המוסלמי האסטרונומי</type>
+			<type key="calendar" type="islamic-tbla" scope="core">מוסלמי אסטרונומי</type>
 			<type key="calendar" type="islamic-umalqura">לוח השנה המוסלמי אום אל-קורא</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">מוסלמי אום אל-קורא</type>
 			<type key="calendar" type="iso8601">לוח שנה ISO-8601</type>
 			<type key="calendar" type="japanese">לוח השנה היפני</type>
+			<type key="calendar" type="japanese" scope="core">יפני</type>
 			<type key="calendar" type="persian">לוח השנה הפרסי</type>
+			<type key="calendar" type="persian" scope="core">פרסי</type>
 			<type key="calendar" type="roc">לוח השנה הטייוואני</type>
+			<type key="calendar" type="roc" scope="core">טייוואני</type>
 			<type key="cf" type="account">תבנית מטבע למטרות חשבונאות</type>
+			<type key="cf" type="account" scope="core">חשבונאות</type>
 			<type key="cf" type="standard">תבנית מטבע רגילה</type>
+			<type key="cf" type="standard" scope="core">רגילה</type>
 			<type key="colAlternate" type="non-ignorable">מיין סמלים</type>
 			<type key="colAlternate" type="shifted" draft="contributed">מיין תוך התעלמות מסמלים</type>
 			<type key="colBackwards" type="no" draft="contributed">מיין הטעמות בצורה רגילה</type>
@@ -1248,23 +1271,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">מיין תחילה לפי אותיות רישיות</type>
 			<type key="colCaseLevel" type="no" draft="contributed">מיין באופן שאינו תלוי רישיות</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">מיין באופן תלוי רישיות</type>
-			<type key="collation" type="big5han">מיון סינית מסורתית</type>
 			<type key="collation" type="compat">סדר מיון קודם, עבור תאימות</type>
+			<type key="collation" type="compat" scope="core">תאימות</type>
 			<type key="collation" type="dictionary">סדר מיון במילון</type>
+			<type key="collation" type="dictionary" scope="core">מילון</type>
 			<type key="collation" type="ducet">סדר מיון Unicode המוגדר כברירת מחדל</type>
+			<type key="collation" type="ducet" scope="core">Unicode כברירת מחדל</type>
 			<type key="collation" type="emoji" draft="contributed">סדר מיון אימוג׳י</type>
 			<type key="collation" type="eor">חוקי סדר אירופיים</type>
-			<type key="collation" type="gb2312han">סדר מיון סיני פשוט - GB2312</type>
 			<type key="collation" type="phonebook">מיון ספר טלפונים</type>
+			<type key="collation" type="phonebook" scope="core">ספר טלפונים</type>
 			<type key="collation" type="phonetic">סדר מיון פונטי</type>
+			<type key="collation" type="phonetic" scope="core">פונטי</type>
 			<type key="collation" type="pinyin">מיון פיניין</type>
+			<type key="collation" type="pinyin" scope="core">פיניין</type>
 			<type key="collation" type="search">חיפוש למטרה כללית</type>
+			<type key="collation" type="search" scope="core">חיפוש</type>
 			<type key="collation" type="searchjl" draft="contributed">חפש לפי העיצור הראשון באותיות הנגול</type>
 			<type key="collation" type="standard">סדר מיון רגיל</type>
+			<type key="collation" type="standard" scope="core">רגיל</type>
 			<type key="collation" type="stroke">סדר מיון לפי ספירת תווים</type>
+			<type key="collation" type="stroke" scope="core">ספירת תווים</type>
 			<type key="collation" type="traditional">מיון מסורתי</type>
+			<type key="collation" type="traditional" scope="core">מסורתי</type>
 			<type key="collation" type="unihan">סדר מיון לפי ספירת תווים Radical-Stroke</type>
+			<type key="collation" type="unihan" scope="core">Radical-Stroke</type>
 			<type key="collation" type="zhuyin">סדר מיון של ג׳ואין</type>
+			<type key="collation" type="zhuyin" scope="core">ג׳ואין</type>
 			<type key="colNormalization" type="no" draft="contributed">מיין ללא נורמליזציה</type>
 			<type key="colNormalization" type="yes" draft="contributed">מיין לפי Unicode מנורמל</type>
 			<type key="colNumeric" type="no" draft="contributed">מיין ספרות בנפרד</type>
@@ -1277,18 +1310,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">רוחב מלא</type>
 			<type key="d0" type="hwidth">חצי רוחב</type>
 			<type key="d0" type="npinyin" draft="contributed">מספרי</type>
+			<type key="em" type="default" scope="core">ברירת מחדל</type>
+			<type key="em" type="emoji" scope="core">אמוג׳י</type>
+			<type key="em" type="text" scope="core">טקסט</type>
 			<type key="hc" type="h11">מערכת של 12 שעות (‎0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">מערכת של 12 שעות (‎1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">מערכת של 24 שעות (0‎–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">מערכת של 24 שעות (1‎–24)</type>
+			<type key="hc" type="h24" scope="core">‎24 (1–24)</type>
 			<type key="lb" type="loose">סגנון מעבר שורה גמיש</type>
+			<type key="lb" type="loose" scope="core">גמיש</type>
 			<type key="lb" type="normal">סגנון מעבר שורה רגיל</type>
+			<type key="lb" type="normal" scope="core">רגיל</type>
 			<type key="lb" type="strict">סגנון מעבר שורה קשיח</type>
+			<type key="lb" type="strict" scope="core">קשיח</type>
+			<type key="lw" type="breakall" scope="core">לחלק הכול</type>
+			<type key="lw" type="keepall" scope="core">לשמור הכול</type>
+			<type key="lw" type="normal" scope="core">רגיל</type>
+			<type key="lw" type="phrase" scope="core">לשמור כביטויים</type>
 			<type key="m0" type="bgn">תעתיק BGN ארה״ב</type>
 			<type key="m0" type="ungegn">תעתיק GEGN האו״ם</type>
 			<type key="ms" type="metric">מערכת מטרית</type>
+			<type key="ms" type="metric" scope="core">מטרית</type>
 			<type key="ms" type="uksystem">מערכת מדידה אימפריאלית</type>
+			<type key="ms" type="uksystem" scope="core">בריטית</type>
 			<type key="ms" type="ussystem">מערכת מדידה אמריקאית</type>
+			<type key="ms" type="ussystem" scope="core">אמריקאית</type>
 			<type key="numbers" type="ahom" draft="contributed">ספרות אהום</type>
 			<type key="numbers" type="arab">ספרות הודיות-ערביות</type>
 			<type key="numbers" type="arabext">ספרות הודיות-ערביות מורחבות</type>
@@ -1372,6 +1422,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">ספרות ואי</type>
 			<type key="numbers" type="wara" draft="contributed">ספרות ווראנג סיטי</type>
 			<type key="numbers" type="wcho" draft="contributed">ספרות וונצ׳ו</type>
+			<type key="ss" type="none" scope="core">כבוי</type>
+			<type key="ss" type="standard" scope="core">פועל</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">מטרי</measurementSystemName>
@@ -1398,9 +1450,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1455,12 +1504,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">עידן 0</era>
-						<era type="1" draft="contributed">עידן 1</era>
-					</eraNames>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1482,12 +1525,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">עידן 0</era>
-						<era type="1" draft="contributed">עידן 1</era>
-					</eraNames>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1543,6 +1580,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">E ה-d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d בMMM y G</dateFormatItem>
@@ -1778,8 +1816,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="midnight">חצות</dayPeriod>
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
 							<dayPeriod type="morning1">בבוקר</dayPeriod>
 							<dayPeriod type="afternoon1">בצהריים</dayPeriod>
 							<dayPeriod type="afternoon2">אחה״צ</dayPeriod>
@@ -1789,8 +1825,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="midnight">חצות</dayPeriod>
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
 							<dayPeriod type="morning1">בבוקר</dayPeriod>
 							<dayPeriod type="afternoon1">בצהריים</dayPeriod>
 							<dayPeriod type="afternoon2">אחר הצהריים</dayPeriod>
@@ -1801,8 +1835,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
 							<dayPeriod type="morning1">בוקר</dayPeriod>
 							<dayPeriod type="afternoon1">צהריים</dayPeriod>
 							<dayPeriod type="afternoon2">אחה״צ</dayPeriod>
@@ -2393,6 +2425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="h" draft="contributed">h a</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MMMMd">d בMMMM</dateFormatItem>
@@ -2474,51 +2507,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="year-short">
 				<displayName>שנ׳</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד שנה</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שנתיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} שנים</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני שנה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שנתיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} שנים</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד שנה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שנתיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} שנים</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני שנה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שנתיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} שנים</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>רבעון</displayName>
 				<relative type="-1">הרבעון הקודם</relative>
-				<relative type="0">רבעון זה</relative>
+				<relative type="0">הרבעון הזה</relative>
 				<relative type="1">הרבעון הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">ברבעון הבא</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד רבעון אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד שני רבעונים</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} רבעונים</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">ברבעון הקודם</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שני רבעונים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני רבעון אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} רבעונים</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} רבעונים</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>רבע׳</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">ברבע׳ הבא</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שני רבע׳</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד רבע׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} רבע׳</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} רבע׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} רבע׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">ברבע׳ הקודם</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שני רבע׳</relativeTimePattern>
+					<relativeTimePattern count="one">לפני רבע׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} רבע׳</relativeTimePattern>
 					<relativeTimePattern count="many">לפני {0} רבע׳</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} רבע׳</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד רבע׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} רבע׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} רבע׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני רבע׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} רבע׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} רבע׳</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="month">
 				<displayName>חודש</displayName>
 				<relative type="-1">החודש שעבר</relative>
 				<relative type="0">החודש</relative>
 				<relative type="1">החודש הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד חודש</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד חודשיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד חודש ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד חודשיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} חודשים</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני חודש</relativeTimePattern>
-					<relativeTimePattern count="two">לפני חודשיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני חודש ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני חודשיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} חודשים</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2528,13 +2595,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="month-narrow">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">בעוד חו׳</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד חודשיים</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד חודשיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} חו׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} חו׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני חו׳</relativeTimePattern>
-					<relativeTimePattern count="two">לפני חודשיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני חו׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני חודשיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="many">לפני {0} חו׳</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} חו׳</relativeTimePattern>
 				</relativeTime>
@@ -2545,13 +2612,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">השבוע</relative>
 				<relative type="1">השבוע הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שבוע</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שבועיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שבוע ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שבועיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שבועות</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שבוע</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שבועיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שבוע ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שבועיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שבועות</relativeTimePattern>
 				</relativeTime>
 				<relativePeriod>השבוע של {0}</relativePeriod>
@@ -2559,22 +2626,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="week-short">
 				<displayName>שב׳</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שב׳</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שבועיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שב׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שבועיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} שב׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שב׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שב׳</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שבועיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שב׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שבועיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="many">לפני {0} שב׳</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שב׳</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שבוע</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שבועיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שב׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שבועיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שב׳</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2589,25 +2656,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="1">מחר</relative>
 				<relative type="2">מחרתיים</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום {0}</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד יומיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד יומיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימים</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום {0}</relativeTimePattern>
-					<relativeTimePattern count="two">לפני יומיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני יומיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימים</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
 				<relativeTime type="future">
-					<relativeTimePattern count="one">מחר</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד יומיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד יומיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימים</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">אתמול</relativeTimePattern>
-					<relativeTimePattern count="two">לפני יומיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני יומיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימים</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד יומיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימים</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני יומיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימים</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2642,12 +2721,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">יום א׳ שעבר</relative>
 				<relative type="0">יום א׳</relative>
 				<relative type="1">יום א׳ הבא</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום א׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי א׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום א׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי א׳</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="sun-narrow">
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום ראשון {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום א׳ אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי א׳</relativeTimePattern>
-					<relativeTimePattern count="other">בעוד {0} ימי ראשון</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי א׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום א׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי א׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי א׳</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon">
@@ -2655,12 +2753,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">יום שני</relative>
 				<relative type="1">יום שני הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום שני {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום שני אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי שני</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימי שני</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום שני {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום שני אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} ימי שני</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימי שני</relativeTimePattern>
 				</relativeTime>
@@ -2669,18 +2767,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">יום ב׳ שעבר</relative>
 				<relative type="0">יום ב׳</relative>
 				<relative type="1">יום ב׳ הבא</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ב׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ב׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ב׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ב׳</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ב׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ב׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ב׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ב׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ב׳</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="tue">
 				<relative type="-1">יום שלישי שעבר</relative>
 				<relative type="0">יום שלישי</relative>
 				<relative type="1">יום שלישי הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום שלישי {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום שלישי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי שלישי</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימי שלישי</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום שלישי {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום שלישי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} ימי שלישי</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימי שלישי</relativeTimePattern>
 				</relativeTime>
@@ -2689,18 +2813,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">יום ג׳ שעבר</relative>
 				<relative type="0">יום ג׳</relative>
 				<relative type="1">יום ג׳ הבא</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ג׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ג׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ג׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ג׳</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ג׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ג׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ג׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ג׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ג׳</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="wed">
 				<relative type="-1">יום רביעי שעבר</relative>
 				<relative type="0">יום רביעי</relative>
 				<relative type="1">יום רביעי הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום רביעי {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום רביעי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי רביעי</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימי רביעי</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום רביעי {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום רביעי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} ימי רביעי</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימי רביעי</relativeTimePattern>
 				</relativeTime>
@@ -2709,18 +2859,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">יום ד׳ שעבר</relative>
 				<relative type="0">יום ד׳</relative>
 				<relative type="1">יום ד׳ הבא</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ד׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ד׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ד׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ד׳</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ד׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ד׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ד׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ד׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ד׳</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="thu">
 				<relative type="-1">יום חמישי שעבר</relative>
 				<relative type="0">יום חמישי</relative>
 				<relative type="1">יום חמישי הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום חמישי {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום חמישי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי חמישי</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימי חמישי</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום חמישי {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום חמישי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} ימי חמישי</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימי חמישי</relativeTimePattern>
 				</relativeTime>
@@ -2729,18 +2905,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">יום ה׳ שעבר</relative>
 				<relative type="0">יום ה׳</relative>
 				<relative type="1">יום ה׳ הבא</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ה׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ה׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ה׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ה׳</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ה׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ה׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ה׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ה׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ה׳</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="fri">
 				<relative type="-1">יום שישי שעבר</relative>
 				<relative type="0">יום שישי</relative>
 				<relative type="1">יום שישי הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום שישי אחד {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום שישי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי שישי</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימי שישי</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום שישי אחד {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום שישי אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} ימי שישי</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} ימי שישי</relativeTimePattern>
 				</relativeTime>
@@ -2750,27 +2952,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">יום ו׳</relative>
 				<relative type="1">יום ו׳ הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום שישי אחד {0}</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד {0} ימי שישי</relativeTimePattern>
-					<relativeTimePattern count="other">בעוד {0} ימי שישי</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום שישי אחד {0}</relativeTimePattern>
-					<relativeTimePattern count="two">לפני {0} ימי שישי</relativeTimePattern>
-					<relativeTimePattern count="other">לפני {0} ימי שישי</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="fri-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד יום ו׳ אחד {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד יום ו׳ אחד ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} ימי ו׳</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} ימי ו׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} ימי ו׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני יום ו׳ אחד {0}</relativeTimePattern>
-					<relativeTimePattern count="two">לפני {0} ימי שישי</relativeTimePattern>
-					<relativeTimePattern count="other">לפני {0} ימי שישי</relativeTimePattern>
+					<relativeTimePattern count="one">לפני יום ו׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ו׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ו׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ו׳</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד יום ו׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} ימי ו׳</relativeTimePattern>
+					<relativeTimePattern count="many">בעוד {0} ימי ו׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} ימי ו׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני יום ו׳ אחד ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} ימי ו׳</relativeTimePattern>
+					<relativeTimePattern count="many">לפני {0} ימי ו׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} ימי ו׳</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat">
@@ -2778,12 +2983,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">יום שבת</relative>
 				<relative type="1">יום שבת הבא</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שבת {0}</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שבת אחת ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד {0} שבתות</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שבתות</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שבת אחת {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שבת אחת ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} שבתות</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שבתות</relativeTimePattern>
 				</relativeTime>
@@ -2792,15 +2997,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">שבת שעברה</relative>
 				<relative type="0">שבת</relative>
 				<relative type="1">שבת הבאה</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד שבת אחת ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} שבתות</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} שבתות</relativeTimePattern>
+				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שבת אחת {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שבת אחת ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} שבתות</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שבתות</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד שבת אחת ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} שבתות</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} שבתות</relativeTimePattern>
+				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שבת אחת {0}</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שבת אחת ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} שבתות</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שבתות</relativeTimePattern>
 				</relativeTime>
@@ -2815,44 +3030,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>שעה</displayName>
 				<relative type="0">בשעה זו</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שעה</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שעתיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שעה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שעתיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שעות</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שעה</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שעתיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שעה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שעתיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שעות</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שעה</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שעתיים</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שעה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שעתיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} שע׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שע׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שעה</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שעתיים</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שע׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שעתיים ({0})</relativeTimePattern>
 					<relativeTimePattern count="many">לפני {0} שע׳</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שע׳</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
 				<displayName>שע׳</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד שעה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד שעתיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} שע׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני שע׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שעתיים ({0})</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} שע׳</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>דקה</displayName>
 				<relative type="0">בדקה זו</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד דקה</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שתי דקות</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד דקה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} דקות</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} דקות</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני דקה</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שתי דקות</relativeTimePattern>
+					<relativeTimePattern count="one">לפני דקה ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני {0} דקות</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} דקות</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -2860,30 +3085,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>דק׳</displayName>
 				<relative type="0" draft="contributed">דקה זו</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד דקה</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שתי דק׳</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד דק׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} דק׳</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} דק׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} דק׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני דקה</relativeTimePattern>
+					<relativeTimePattern count="one">לפני דק׳ ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני {0} דק׳</relativeTimePattern>
 					<relativeTimePattern count="many">לפני {0} דק׳</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} דק׳</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="minute-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני דקה</relativeTimePattern>
-					<relativeTimePattern count="two">לפני שתי דק׳</relativeTimePattern>
-					<relativeTimePattern count="other">לפני {0} דק׳</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="second">
 				<displayName>שנייה</displayName>
 				<relative type="0">עכשיו</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שנייה</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שנייה ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">בעוד שתי שניות</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שניות</relativeTimePattern>
 				</relativeTime>
@@ -2896,18 +3114,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="second-short">
 				<displayName>שנ׳</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">בעוד שנ׳</relativeTimePattern>
-					<relativeTimePattern count="two">בעוד שתי שנ׳</relativeTimePattern>
+					<relativeTimePattern count="one">בעוד שנ׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} שנ׳</relativeTimePattern>
 					<relativeTimePattern count="many">בעוד {0} שנ׳</relativeTimePattern>
 					<relativeTimePattern count="other">בעוד {0} שנ׳</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">לפני שנ׳</relativeTimePattern>
+					<relativeTimePattern count="one">לפני שנ׳ ({0})</relativeTimePattern>
 					<relativeTimePattern count="two">לפני שתי שנ׳</relativeTimePattern>
 					<relativeTimePattern count="many">לפני {0} שנ׳</relativeTimePattern>
 					<relativeTimePattern count="other">לפני {0} שנ׳</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">בעוד שנ׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">בעוד {0} שנ׳</relativeTimePattern>
+					<relativeTimePattern count="other">בעוד {0} שנ׳</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">לפני שנ׳ ({0})</relativeTimePattern>
+					<relativeTimePattern count="two">לפני שתי שנ׳</relativeTimePattern>
+					<relativeTimePattern count="other">לפני {0} שנ׳</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="zone">
 				<displayName>אזור זמן</displayName>
 			</field>
@@ -3274,6 +3504,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>אי הפסחא</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>קויאיקה</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>פונטה ארנס</exemplarCity>
 			</zone>
@@ -3539,9 +3772,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>פנום פן</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>אנדרבורי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>קנטון</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4211,9 +4441,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>שעון מערב אפריקה</generic>
-					<standard>שעון מערב אפריקה (חורף)</standard>
-					<daylight>שעון מערב אפריקה (קיץ)</daylight>
+					<standard>שעון מערב אפריקה</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4596,6 +4824,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>שעון גיאנה</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>שעון האיים האלאוטיים הוואי (חורף)</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>שעון האיים האלאוטיים הוואי</generic>
@@ -5041,6 +5274,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>שעון צ׳וק</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="provisional">שעון טורקיה</generic>
+					<standard draft="provisional">שעון רגיל טורקיה</standard>
+					<daylight draft="provisional">שעון קיץ טורקיה</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>שעון טורקמניסטן</generic>
@@ -5223,95 +5463,64 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‏#,##0.00 ‏¤;‏-#,##0.00 ‏¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">‏#,##0.00‏;‏-#,##0.00‏</pattern>
+					<pattern alt="alphaNextToNumber">‏#,##0.00 ‏¤;‏-#,##0.00 ‏¤</pattern>
+					<pattern alt="noCurrency">‏#,##0.00 ‏;‏-#,##0.00 ‏</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">‏#,##0.00 ‏¤;‏-#,##0.00 ‏¤</pattern>
+					<pattern alt="noCurrency">‏#,##0.00 ‏;‏-#,##0.00 ‏</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤0K‏</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0K‏</pattern>
-					<pattern type="1000" count="two">¤0K‏</pattern>
-					<pattern type="1000" count="two" alt="alphaNextToNumber">¤ 0K‏</pattern>
-					<pattern type="1000" count="many" alt="alphaNextToNumber">¤ 0K‏</pattern>
-					<pattern type="1000" count="other">¤0K‏</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0K‏</pattern>
-					<pattern type="10000" count="one">¤00K‏</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00K‏</pattern>
-					<pattern type="10000" count="two">¤00K‏</pattern>
-					<pattern type="10000" count="two" alt="alphaNextToNumber">¤ 00K‏</pattern>
-					<pattern type="10000" count="many" alt="alphaNextToNumber">¤ 00K‏</pattern>
-					<pattern type="10000" count="other">¤00K‏</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00K‏</pattern>
-					<pattern type="100000" count="one">¤000K‏</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000K‏</pattern>
-					<pattern type="100000" count="two">¤000K‏</pattern>
-					<pattern type="100000" count="two" alt="alphaNextToNumber">¤ 000K‏</pattern>
-					<pattern type="100000" count="many" alt="alphaNextToNumber">¤ 000K‏</pattern>
-					<pattern type="100000" count="other">¤000K‏</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K‏</pattern>
-					<pattern type="1000000" count="one">¤0M‏</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0M‏</pattern>
-					<pattern type="1000000" count="two">¤0M‏</pattern>
-					<pattern type="1000000" count="two" alt="alphaNextToNumber">¤ 0M‏</pattern>
-					<pattern type="1000000" count="many" alt="alphaNextToNumber">¤ 0M‏</pattern>
-					<pattern type="1000000" count="other">¤0M‏</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M‏</pattern>
-					<pattern type="10000000" count="one">¤00M‏</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00M‏</pattern>
-					<pattern type="10000000" count="two">¤00M‏</pattern>
-					<pattern type="10000000" count="two" alt="alphaNextToNumber">¤ 00M‏</pattern>
-					<pattern type="10000000" count="many" alt="alphaNextToNumber">¤ 00M‏</pattern>
-					<pattern type="10000000" count="other">¤00M‏</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M‏</pattern>
-					<pattern type="100000000" count="one">¤000M‏</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000M‏</pattern>
-					<pattern type="100000000" count="two">¤000M‏</pattern>
-					<pattern type="100000000" count="two" alt="alphaNextToNumber">¤ 000M‏</pattern>
-					<pattern type="100000000" count="many" alt="alphaNextToNumber">¤ 000M‏</pattern>
-					<pattern type="100000000" count="other">¤000M‏</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M‏</pattern>
-					<pattern type="1000000000" count="one">¤0B‏</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0B‏</pattern>
-					<pattern type="1000000000" count="two">¤0B‏</pattern>
-					<pattern type="1000000000" count="two" alt="alphaNextToNumber">¤ 0B‏</pattern>
-					<pattern type="1000000000" count="many" alt="alphaNextToNumber">¤ 0B‏</pattern>
-					<pattern type="1000000000" count="other">¤0B‏</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B‏</pattern>
-					<pattern type="10000000000" count="one">¤00B‏</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00B‏</pattern>
-					<pattern type="10000000000" count="two">¤00B‏</pattern>
-					<pattern type="10000000000" count="two" alt="alphaNextToNumber">¤ 00B‏</pattern>
-					<pattern type="10000000000" count="many" alt="alphaNextToNumber">¤ 00B‏</pattern>
-					<pattern type="10000000000" count="other">¤00B‏</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B‏</pattern>
-					<pattern type="100000000000" count="one">¤000B‏</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000B‏</pattern>
-					<pattern type="100000000000" count="two">¤000B‏</pattern>
-					<pattern type="100000000000" count="two" alt="alphaNextToNumber">¤ 000B‏</pattern>
-					<pattern type="100000000000" count="many" alt="alphaNextToNumber">¤ 000B‏</pattern>
-					<pattern type="100000000000" count="other">¤000B‏</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B‏</pattern>
-					<pattern type="1000000000000" count="one">¤0T‏</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0T‏</pattern>
-					<pattern type="1000000000000" count="two">¤0T‏</pattern>
-					<pattern type="1000000000000" count="two" alt="alphaNextToNumber">¤ 0T‏</pattern>
-					<pattern type="1000000000000" count="many" alt="alphaNextToNumber">¤ 0T‏</pattern>
-					<pattern type="1000000000000" count="other">¤0T‏</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T‏</pattern>
-					<pattern type="10000000000000" count="one">¤00T‏</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00T‏</pattern>
-					<pattern type="10000000000000" count="two">¤00T‏</pattern>
-					<pattern type="10000000000000" count="two" alt="alphaNextToNumber">¤ 00T‏</pattern>
-					<pattern type="10000000000000" count="many" alt="alphaNextToNumber">¤ 00T‏</pattern>
-					<pattern type="10000000000000" count="other">¤00T‏</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T‏</pattern>
-					<pattern type="100000000000000" count="one">¤000T‏</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T‏</pattern>
-					<pattern type="100000000000000" count="two">¤000T‏</pattern>
-					<pattern type="100000000000000" count="two" alt="alphaNextToNumber">¤ 000T‏</pattern>
-					<pattern type="100000000000000" count="many" alt="alphaNextToNumber">¤ 000T‏</pattern>
-					<pattern type="100000000000000" count="other">¤000T‏</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T‏</pattern>
+					<pattern type="1000" count="one">‏0K‏ ‏¤</pattern>
+					<pattern type="1000" count="two">‏0K‏ ‏¤</pattern>
+					<pattern type="1000" count="many">‏0K‏ ‏¤</pattern>
+					<pattern type="1000" count="other">‏0K‏ ‏¤</pattern>
+					<pattern type="10000" count="one">‏00K‏ ‏¤</pattern>
+					<pattern type="10000" count="two">‏00K‏ ‏¤</pattern>
+					<pattern type="10000" count="many">‏00K‏ ‏¤</pattern>
+					<pattern type="10000" count="other">‏00K‏ ‏¤</pattern>
+					<pattern type="100000" count="one">‏000K‏ ‏¤</pattern>
+					<pattern type="100000" count="two">‏000K‏ ‏¤</pattern>
+					<pattern type="100000" count="many">‏000K‏ ‏¤</pattern>
+					<pattern type="100000" count="other">‏000K‏ ‏¤</pattern>
+					<pattern type="1000000" count="one">‏0M‏ ‏¤</pattern>
+					<pattern type="1000000" count="two">‏0M‏ ‏¤</pattern>
+					<pattern type="1000000" count="many">‏0M‏ ‏¤</pattern>
+					<pattern type="1000000" count="other">‏0M‏ ‏¤</pattern>
+					<pattern type="10000000" count="one">‏00M‏ ‏¤</pattern>
+					<pattern type="10000000" count="two">‏00M‏ ‏¤</pattern>
+					<pattern type="10000000" count="many">‏00M‏ ‏¤</pattern>
+					<pattern type="10000000" count="other">‏00M‏ ‏¤</pattern>
+					<pattern type="100000000" count="one">‏000M‏ ‏¤</pattern>
+					<pattern type="100000000" count="two">‏000M‏ ‏¤</pattern>
+					<pattern type="100000000" count="many">‏000M‏ ‏¤</pattern>
+					<pattern type="100000000" count="other">‏000M‏ ‏¤</pattern>
+					<pattern type="1000000000" count="one">‏0B‏ ‏¤</pattern>
+					<pattern type="1000000000" count="two">‏0B‏ ‏¤</pattern>
+					<pattern type="1000000000" count="many">‏0B‏ ‏¤</pattern>
+					<pattern type="1000000000" count="other">‏0B‏ ‏¤</pattern>
+					<pattern type="10000000000" count="one">‏00B‏ ‏¤</pattern>
+					<pattern type="10000000000" count="two">‏00B‏ ‏¤</pattern>
+					<pattern type="10000000000" count="many">‏00B‏ ‏¤</pattern>
+					<pattern type="10000000000" count="other">‏00B‏ ‏¤</pattern>
+					<pattern type="100000000000" count="one">‏000B‏ ‏¤</pattern>
+					<pattern type="100000000000" count="two">‏000B‏ ‏¤</pattern>
+					<pattern type="100000000000" count="many">‏000B‏ ‏¤</pattern>
+					<pattern type="100000000000" count="other">‏000B‏ ‏¤</pattern>
+					<pattern type="1000000000000" count="one">‏0T‏ ‏¤</pattern>
+					<pattern type="1000000000000" count="two">‏0T‏ ‏¤</pattern>
+					<pattern type="1000000000000" count="many">‏0T‏ ‏¤</pattern>
+					<pattern type="1000000000000" count="other">‏0T‏ ‏¤</pattern>
+					<pattern type="10000000000000" count="one">‏00T‏ ‏¤</pattern>
+					<pattern type="10000000000000" count="two">‏00T‏ ‏¤</pattern>
+					<pattern type="10000000000000" count="many">‏00T‏ ‏¤</pattern>
+					<pattern type="10000000000000" count="other">‏00T‏ ‏¤</pattern>
+					<pattern type="100000000000000" count="one">‏000T‏ ‏¤</pattern>
+					<pattern type="100000000000000" count="two">‏000T‏ ‏¤</pattern>
+					<pattern type="100000000000000" count="many">‏000T‏ ‏¤</pattern>
+					<pattern type="100000000000000" count="other">‏000T‏ ‏¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5944,7 +6153,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>לירה טורקית חדשה</displayName>
 				<displayName count="one">לירה טורקית חדשה</displayName>
 				<displayName count="two">לירות טורקיות</displayName>
-				<displayName count="many">לירות טורקיות</displayName>
 				<displayName count="other">לירות טורקיות</displayName>
 			</currency>
 			<currency type="TTD">
@@ -6012,6 +6220,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>דולר מזרח קריבי</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>גילדר של הקריביים</displayName>
+				<displayName count="one">גילדר של הקריביים</displayName>
+				<displayName count="two">גילדר של הקריביים</displayName>
+				<displayName count="other">גילדר של הקריביים</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>זכויות משיכה מיוחדות</displayName>
 			</currency>
@@ -6069,13 +6283,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>דולר זימבבואי</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>זהב של זימבבואה</displayName>
+				<displayName count="one">זהב של זימבבואה</displayName>
+				<displayName count="two">זהב של זימבבואה</displayName>
+				<displayName count="other">זהב של זימבבואה</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">יום</pluralMinimalPairs>
 			<pluralMinimalPairs count="two">יומיים</pluralMinimalPairs>
 			<pluralMinimalPairs count="many">{0} יום</pluralMinimalPairs>
 			<pluralMinimalPairs count="other">{0} ימים</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other">פנה ימינה בפנייה ה-{0}</ordinalMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">פנו ימינה בפנייה ה-{0}</ordinalMinimalPairs>
 			<genderMinimalPairs gender="feminine">ה{0} הראשונה היא הקובעת</genderMinimalPairs>
 			<genderMinimalPairs gender="masculine">ה{0} הראשון הוא הקובע</genderMinimalPairs>
 		</minimalPairs>
@@ -6233,12 +6453,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} מייל רבוע</unitPattern>
 				<perUnitPattern>{0} למייל רבוע</perUnitPattern>
 			</unit>
-			<unit type="area-acre">
-				<unitPattern count="one">{0} אקר</unitPattern>
-				<unitPattern count="two">{0} אקר</unitPattern>
-				<unitPattern count="many">{0} אקר</unitPattern>
-				<unitPattern count="other">{0} אקר</unitPattern>
-			</unit>
 			<unit type="area-square-yard">
 				<displayName>יארד רבוע</displayName>
 				<unitPattern count="one">{0} יארד רבוע</unitPattern>
@@ -6289,7 +6503,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>masculine</gender>
 				<displayName>פריטים</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>חלקים</displayName>
+				<unitPattern count="one">{0} חלק</unitPattern>
+				<unitPattern count="two">{0} חלקים</unitPattern>
+				<unitPattern count="other">{0} חלקים</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<displayName>חלקים למיליון</displayName>
 				<unitPattern count="one">{0} חלקים למיליון</unitPattern>
@@ -6329,6 +6549,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} מול</unitPattern>
 				<unitPattern count="other">{0} מול</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>גלוקוז</displayName>
+				<unitPattern count="one">{0} גלוקוז</unitPattern>
+				<unitPattern count="two">{0} גלוקוז</unitPattern>
+				<unitPattern count="other">{0} גלוקוז</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>ליטרים/קילומטר</displayName>
@@ -6543,10 +6769,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="electric-ohm">
 				<gender>masculine</gender>
-				<unitPattern count="one">{0} ohm</unitPattern>
-				<unitPattern count="two">{0} ohms</unitPattern>
-				<unitPattern count="many">{0} ohms</unitPattern>
-				<unitPattern count="other">{0} ohms</unitPattern>
+				<displayName>אוהם</displayName>
+				<unitPattern count="one">{0} אוהם</unitPattern>
+				<unitPattern count="two">{0} אוהם</unitPattern>
+				<unitPattern count="many">{0} אוהם</unitPattern>
+				<unitPattern count="other">{0} אוהם</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<gender>masculine</gender>
@@ -6675,13 +6902,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="graphics-em">
 				<gender>masculine</gender>
 				<displayName>קו מפריד מסוג em</displayName>
-				<unitPattern count="one">{0} em</unitPattern>
-				<unitPattern count="two">{0} em</unitPattern>
-				<unitPattern count="other">{0} ems</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
 				<gender>masculine</gender>
 				<displayName>פיקסלים</displayName>
+				<unitPattern count="one">px ‏{0}</unitPattern>
+				<unitPattern count="two">px ‏{0}</unitPattern>
+				<unitPattern count="other">px ‏{0}</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
 				<gender>masculine</gender>
@@ -6690,6 +6917,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="graphics-pixel-per-centimeter">
 				<gender>masculine</gender>
 				<displayName>פיקסלים לסנטימטר</displayName>
+				<unitPattern count="one">ppcm ‏{0}</unitPattern>
+				<unitPattern count="two">ppcm ‏{0}</unitPattern>
+				<unitPattern count="many">ppcm ‏{0}</unitPattern>
+				<unitPattern count="other">ppcm ‏{0}</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
 				<displayName>פיקסלים לאינץ׳</displayName>
@@ -6700,9 +6931,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>נקודות לסנטימטר</displayName>
+				<unitPattern count="one">{0} נקודות לסנטימטר</unitPattern>
+				<unitPattern count="two">{0} נקודות לסנטימטר</unitPattern>
+				<unitPattern count="many">{0} נקודות לסנטימטר</unitPattern>
+				<unitPattern count="other">{0} נקודות לסנטימטר</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-inch">
+				<displayName>נקודות לאינץ׳</displayName>
+				<unitPattern count="one">{0} נק׳ לאינץ׳</unitPattern>
+				<unitPattern count="two">dpi ‏{0}</unitPattern>
+				<unitPattern count="other">{0} נק׳ לאינץ׳</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>נקודות קטנות</displayName>
+				<unitPattern count="one">נקודה קטנה אחת ({0})</unitPattern>
+				<unitPattern count="two">{0} נקודות קטנות</unitPattern>
+				<unitPattern count="many">{0} נקודות קטנות</unitPattern>
+				<unitPattern count="other">{0} נקודות קטנות</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
 				<displayName>רדיוס כדור-הארץ</displayName>
@@ -6836,7 +7081,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-point">
 				<gender>feminine</gender>
-				<unitPattern count="one">{0} נקודה</unitPattern>
+				<unitPattern count="one">נקודה אחת ({0})</unitPattern>
 				<unitPattern count="two">{0} נקודות</unitPattern>
 				<unitPattern count="many">{0} נקודות</unitPattern>
 				<unitPattern count="other">{0} נקודות</unitPattern>
@@ -7027,6 +7272,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} מילימטר כספית</unitPattern>
 				<unitPattern count="other">{0} מילימטר כספית</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>כספית</displayName>
+				<unitPattern count="one">{0} כספית</unitPattern>
+				<unitPattern count="two">{0} כספית</unitPattern>
+				<unitPattern count="other">{0} כספית</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>פאונד לאינץ׳ רבוע</displayName>
 				<unitPattern count="one">פאונד {0} לאינץ׳ רבוע</unitPattern>
@@ -7054,7 +7305,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="pressure-atmosphere">
 				<gender>feminine</gender>
-				<displayName>אטמוספרות</displayName>
+				<displayName>אטמוספירות</displayName>
 				<unitPattern count="one">{0} אטמוספרה</unitPattern>
 				<unitPattern count="two">{0} אטמוספרה</unitPattern>
 				<unitPattern count="many">{0} אטמוספרה</unitPattern>
@@ -7288,6 +7539,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} כ׳ מידה מטרית</unitPattern>
 				<unitPattern count="other">{0} כ׳ מידה מטרית</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>אונקיית נוזל</displayName>
+				<unitPattern count="one">{0} אונקיית נוזל</unitPattern>
+				<unitPattern count="two">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} אונקיית נוזל</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>אקר-רגל</displayName>
 				<unitPattern count="one">{0} אקר-רגל</unitPattern>
@@ -7413,14 +7670,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} קווארטות אימפריאליות</unitPattern>
 				<unitPattern count="other">{0} קווארטות אימפריאליות</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>סטרדיאן</displayName>
+				<unitPattern count="one">{0} סטרדיאן</unitPattern>
+				<unitPattern count="two">{0} סטרדיאן</unitPattern>
+				<unitPattern count="other">{0} סטרדיאן</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>קטאל</displayName>
+				<unitPattern count="one">{0} קטאל</unitPattern>
+				<unitPattern count="two">{0} קטאל</unitPattern>
+				<unitPattern count="other">{0} קטאל</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>קולון</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>פאראד</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>הנרי</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>סימנס</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>קלוריה-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>בקרל</displayName>
+				<unitPattern count="one">{0} בקרל</unitPattern>
+				<unitPattern count="two">{0} בקרל</unitPattern>
+				<unitPattern count="other">{0} בקרל</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>קילוגרם כוח</displayName>
+				<unitPattern count="one">{0} קילוגרם כוח</unitPattern>
+				<unitPattern count="two">{0} קילוגרם כוח</unitPattern>
+				<unitPattern count="other">{0} קילוגרם כוח</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>טסלה</displayName>
+				<unitPattern count="one">{0} טסלה</unitPattern>
+				<unitPattern count="two">{0} טסלה</unitPattern>
+				<unitPattern count="other">{0} טסלה</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ובר</displayName>
+				<unitPattern count="one">{0} ובר</unitPattern>
+				<unitPattern count="two">{0} ובר</unitPattern>
+				<unitPattern count="other">{0} ובר</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>masculine</gender>
-				<displayName>אור</displayName>
-				<unitPattern count="one">{0} אור</unitPattern>
-				<unitPattern count="two">{0} אור</unitPattern>
-				<unitPattern count="other">{0} אור</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>חלקים למיליארד</displayName>
 				<unitPattern count="one">{0} חלקים למיליארד</unitPattern>
@@ -7429,11 +7733,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>masculine</gender>
-				<displayName>לילות</displayName>
-				<unitPattern count="one">{0} לילה</unitPattern>
-				<unitPattern count="two">{0} לילות</unitPattern>
-				<unitPattern count="other">{0} לילות</unitPattern>
-				<perUnitPattern>{0}/לילה</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>רוחות השמיים</displayName>
@@ -7546,9 +7845,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="area-hectare">
 				<displayName>הקטאר</displayName>
-				<unitPattern count="one">{0} ha</unitPattern>
-				<unitPattern count="two">{0} ha</unitPattern>
-				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
 				<displayName>מ״ר</displayName>
@@ -7569,7 +7865,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} sq mi</unitPattern>
 				<unitPattern count="two">{0} sq mi</unitPattern>
 				<unitPattern count="other">{0} sq mi</unitPattern>
-				<perUnitPattern>{0}/mi²</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
 				<displayName>אקר</displayName>
@@ -7579,43 +7874,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>yards²</displayName>
-				<unitPattern count="one">{0} yd²</unitPattern>
-				<unitPattern count="two">{0} yd²</unitPattern>
-				<unitPattern count="other">{0} yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0} sq ft</unitPattern>
 				<unitPattern count="two">{0} sq ft</unitPattern>
 				<unitPattern count="other">{0} sq ft</unitPattern>
 			</unit>
-			<unit type="area-square-inch">
-				<unitPattern count="one">{0} in²</unitPattern>
-				<unitPattern count="two">{0} in²</unitPattern>
-				<unitPattern count="other">{0} in²</unitPattern>
-				<perUnitPattern>{0}/in²</perUnitPattern>
-			</unit>
 			<unit type="area-dunam">
 				<displayName>דונם</displayName>
 				<unitPattern count="one">{0} דונם</unitPattern>
 				<unitPattern count="two">{0} דונם</unitPattern>
 				<unitPattern count="other">{0} דונם</unitPattern>
 			</unit>
-			<unit type="concentr-karat">
-				<unitPattern count="one">{0} kt</unitPattern>
-				<unitPattern count="two">{0} kt</unitPattern>
-				<unitPattern count="other">{0} kt</unitPattern>
-			</unit>
-			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<unitPattern count="one">{0} mg/dL</unitPattern>
-				<unitPattern count="two">{0} mg/dL</unitPattern>
-				<unitPattern count="other">{0} mg/dL</unitPattern>
-			</unit>
 			<unit type="concentr-item">
 				<displayName>פריט</displayName>
 				<unitPattern count="one">{0} פריט</unitPattern>
 				<unitPattern count="two">{0} פריטים</unitPattern>
 				<unitPattern count="other">{0} פריטים</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>חלק</displayName>
+				<unitPattern count="one">{0} חלק</unitPattern>
+				<unitPattern count="two">{0} חלקים</unitPattern>
+				<unitPattern count="other">{0} חלק</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>גלוקוז</displayName>
+				<unitPattern count="one">{0} גלוקוז</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ליטרים/ק״מ</displayName>
 				<unitPattern count="one">{0} ל׳/ק״מ</unitPattern>
@@ -7637,11 +7925,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>miles/gal Imp.</displayName>
 			</unit>
+			<unit type="digital-petabyte">
+				<unitPattern count="one">PB‏{0}</unitPattern>
+				<unitPattern count="two">PB‏{0}</unitPattern>
+				<unitPattern count="many">PB‏{0}</unitPattern>
+				<unitPattern count="other">PB‏{0}</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<unitPattern count="one">TB‏{0}</unitPattern>
+				<unitPattern count="two">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one">Tb‏{0}</unitPattern>
+				<unitPattern count="two">Tb‏{0}</unitPattern>
+				<unitPattern count="many">Tb‏{0}</unitPattern>
+				<unitPattern count="other">Tb‏{0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one">GB‏{0}</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
 			<unit type="digital-gigabit">
 				<displayName>Gbit</displayName>
+				<unitPattern count="one">Gb‏{0}</unitPattern>
+				<unitPattern count="two">{0} Gb</unitPattern>
+				<unitPattern count="other">{0} Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one">MB‏{0}</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
 				<displayName>Mbit</displayName>
+				<unitPattern count="one">Mb‏{0}</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one">kB‏{0}</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one">kb‏{0}</unitPattern>
+				<unitPattern count="two">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>בייט</displayName>
@@ -7729,7 +8060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>amps</displayName>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>ohms</displayName>
+				<displayName>אוהם</displayName>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>וולט</displayName>
@@ -7760,42 +8091,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>קוט״ש/100 ק״מ</displayName>
 				<unitPattern count="one">{0} קוט״ש/100 ק״מ</unitPattern>
 				<unitPattern count="two">{0} קוט״ש/100 ק״מ</unitPattern>
-				<unitPattern count="many">{0} קוט״ש/100 ק״מ</unitPattern>
 				<unitPattern count="other">{0} קוט״ש/100 ק״מ</unitPattern>
 			</unit>
-			<unit type="graphics-em">
-				<unitPattern count="one">{0} em</unitPattern>
-				<unitPattern count="two">{0} em</unitPattern>
-				<unitPattern count="other">{0} em</unitPattern>
-			</unit>
 			<unit type="graphics-pixel">
-				<unitPattern count="one">{0} px</unitPattern>
-				<unitPattern count="two">{0} px</unitPattern>
-				<unitPattern count="other">{0} px</unitPattern>
+				<unitPattern count="one">px ‏{0}</unitPattern>
+				<unitPattern count="two">px ‏{0}</unitPattern>
+				<unitPattern count="other">px ‏{0}</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
-				<unitPattern count="one">{0} MP</unitPattern>
-				<unitPattern count="two">{0} MP</unitPattern>
-				<unitPattern count="other">{0} MP</unitPattern>
+				<unitPattern count="one">MP ‏{0}</unitPattern>
+				<unitPattern count="two">MP ‏{0}</unitPattern>
+				<unitPattern count="other">MP ‏{0}</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
-				<unitPattern count="one">{0} ppcm</unitPattern>
-				<unitPattern count="two">{0} ppcm</unitPattern>
-				<unitPattern count="other">{0} ppcm</unitPattern>
+				<unitPattern count="one">ppcm ‏{0}</unitPattern>
+				<unitPattern count="two">ppcm ‏{0}</unitPattern>
+				<unitPattern count="many">ppcm ‏{0}</unitPattern>
+				<unitPattern count="other">ppcm ‏{0}</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<unitPattern count="one">{0} ppi</unitPattern>
-				<unitPattern count="two">{0} ppi</unitPattern>
-				<unitPattern count="other">{0} ppi</unitPattern>
+				<unitPattern count="one">ppi ‏{0}</unitPattern>
+				<unitPattern count="two">ppi ‏{0}</unitPattern>
+				<unitPattern count="many">ppi ‏{0}</unitPattern>
+				<unitPattern count="other">ppi ‏{0}</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-centimeter">
+				<displayName>dpcm</displayName>
+				<unitPattern count="one">dpcm‏ {0}</unitPattern>
+				<unitPattern count="two">dpcm‏ {0}</unitPattern>
+				<unitPattern count="many">dpcm‏ {0}</unitPattern>
+				<unitPattern count="other">dpcm‏ {0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
 				<displayName>dpi</displayName>
-				<unitPattern count="one">{0} ppi</unitPattern>
-				<unitPattern count="two">{0} ppi</unitPattern>
-				<unitPattern count="other">{0} dpi</unitPattern>
+				<unitPattern count="one">ppi ‏{0}</unitPattern>
+				<unitPattern count="two">dpi ‏{0}</unitPattern>
+				<unitPattern count="many">dpi ‏{0}</unitPattern>
+				<unitPattern count="other">dpi ‏{0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>נקודה קטנה</displayName>
+				<unitPattern count="one">נק' קטנה אחת ({0})</unitPattern>
+				<unitPattern count="two">{0} נק' קטנות</unitPattern>
+				<unitPattern count="many">{0} נק' קטנות</unitPattern>
+				<unitPattern count="other">{0} נק' קטנות</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>ק״מ</displayName>
@@ -7830,16 +8169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} מ״מ</unitPattern>
 				<unitPattern count="other">{0} מ״מ</unitPattern>
 			</unit>
-			<unit type="length-micrometer">
-				<unitPattern count="one">{0} μm</unitPattern>
-				<unitPattern count="two">{0} μm</unitPattern>
-				<unitPattern count="other">{0} μm</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<unitPattern count="one">{0} nm</unitPattern>
-				<unitPattern count="two">{0} nm</unitPattern>
-				<unitPattern count="other">{0} nm</unitPattern>
-			</unit>
 			<unit type="length-picometer">
 				<displayName>פ״מ</displayName>
 				<unitPattern count="one">{0} פ“מ</unitPattern>
@@ -7860,34 +8189,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-foot">
 				<displayName>רגל</displayName>
-				<unitPattern count="one">{0} ft</unitPattern>
-				<unitPattern count="two">{0} ft</unitPattern>
-				<unitPattern count="other">{0} ft</unitPattern>
 				<perUnitPattern>{0} ‎/ft</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>אינץ׳</displayName>
-				<unitPattern count="one">{0} in</unitPattern>
-				<unitPattern count="two">{0} in</unitPattern>
-				<unitPattern count="other">{0} in</unitPattern>
 				<perUnitPattern>{0} ‎/in</perUnitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="one">{0} pc</unitPattern>
-				<unitPattern count="two">{0} pc</unitPattern>
-				<unitPattern count="other">{0} pc</unitPattern>
-			</unit>
 			<unit type="length-light-year">
 				<displayName>שנות אור</displayName>
 				<unitPattern count="one">{0} שנת אור</unitPattern>
 				<unitPattern count="two">{0} שנות אור</unitPattern>
 				<unitPattern count="other">{0} שנות אור</unitPattern>
 			</unit>
-			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="two">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
-			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>מ״י</displayName>
 				<unitPattern count="one">מ״י אחד</unitPattern>
@@ -8010,9 +8323,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} קמ״ק</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<unitPattern count="one">{0} m³</unitPattern>
-				<unitPattern count="two">{0} m³</unitPattern>
-				<unitPattern count="other">{0} m³</unitPattern>
+				<unitPattern count="one">{0} מ&quot;ק</unitPattern>
+				<unitPattern count="two">{0} מ&quot;ק</unitPattern>
+				<unitPattern count="many">{0} מ&quot;ק</unitPattern>
+				<unitPattern count="other">{0} מ&quot;ק</unitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>סמ״ק</displayName>
@@ -8021,36 +8335,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} סמ״ק</unitPattern>
 				<perUnitPattern>{0}/סמ״ק</perUnitPattern>
 			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} mi³</unitPattern>
-				<unitPattern count="two">{0} mi³</unitPattern>
-				<unitPattern count="other">{0} mi³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<unitPattern count="one">{0} yd³</unitPattern>
-				<unitPattern count="two">{0} yd³</unitPattern>
-				<unitPattern count="other">{0} yd³</unitPattern>
-			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>feet³</displayName>
-				<unitPattern count="one">{0} ft³</unitPattern>
-				<unitPattern count="two">{0} ft³</unitPattern>
-				<unitPattern count="other">{0} ft³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<unitPattern count="one">{0} in³</unitPattern>
-				<unitPattern count="two">{0} in³</unitPattern>
-				<unitPattern count="other">{0} in³</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<unitPattern count="one">{0} ML</unitPattern>
-				<unitPattern count="two">{0} ML</unitPattern>
-				<unitPattern count="other">{0} ML</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<unitPattern count="one">{0} hL</unitPattern>
-				<unitPattern count="two">{0} hL</unitPattern>
-				<unitPattern count="other">{0} hL</unitPattern>
 			</unit>
 			<unit type="volume-liter">
 				<displayName>ליטר</displayName>
@@ -8065,32 +8351,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} דצ״ל</unitPattern>
 				<unitPattern count="other">{0} דצ״ל</unitPattern>
 			</unit>
-			<unit type="volume-centiliter">
-				<unitPattern count="one">{0} cL</unitPattern>
-				<unitPattern count="two">{0} cL</unitPattern>
-				<unitPattern count="other">{0} cL</unitPattern>
-			</unit>
 			<unit type="volume-milliliter">
 				<displayName>מ״ל</displayName>
 				<unitPattern count="one">{0} מ״ל</unitPattern>
 				<unitPattern count="two">{0} מ״ל</unitPattern>
 				<unitPattern count="other">{0} מ״ל</unitPattern>
 			</unit>
-			<unit type="volume-pint-metric">
-				<unitPattern count="one">{0} mpt</unitPattern>
-				<unitPattern count="two">{0} mpt</unitPattern>
-				<unitPattern count="other">{0} mpt</unitPattern>
-			</unit>
-			<unit type="volume-cup-metric">
-				<unitPattern count="one">{0} mc</unitPattern>
-				<unitPattern count="two">{0} mc</unitPattern>
-				<unitPattern count="other">{0} mc</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<unitPattern count="one">{0} ac ft</unitPattern>
-				<unitPattern count="two">{0} ac ft</unitPattern>
-				<unitPattern count="other">{0} ac ft</unitPattern>
-			</unit>
 			<unit type="volume-gallon">
 				<displayName>גלון</displayName>
 				<unitPattern count="one">{0} גל׳</unitPattern>
@@ -8107,15 +8373,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qts</displayName>
-				<unitPattern count="one">{0} qt</unitPattern>
-				<unitPattern count="two">{0} qt</unitPattern>
-				<unitPattern count="other">{0} qt</unitPattern>
 			</unit>
 			<unit type="volume-pint">
 				<displayName>פינט</displayName>
-				<unitPattern count="one">{0} pt</unitPattern>
-				<unitPattern count="two">{0} pt</unitPattern>
-				<unitPattern count="other">{0} pt</unitPattern>
 			</unit>
 			<unit type="volume-cup">
 				<displayName>כוסות</displayName>
@@ -8129,11 +8389,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} fl oz</unitPattern>
 				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
-			<unit type="volume-fluid-ounce-imperial">
-				<unitPattern count="one">{0} fl oz Imp.</unitPattern>
-				<unitPattern count="two">{0} fl oz Imp.</unitPattern>
-				<unitPattern count="other">{0} fl oz Imp.</unitPattern>
-			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>כפות</displayName>
 				<unitPattern count="one">{0} כפ׳</unitPattern>
@@ -8146,11 +8401,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} כפי׳</unitPattern>
 				<unitPattern count="other">{0} כפי׳</unitPattern>
 			</unit>
-			<unit type="volume-barrel">
-				<unitPattern count="one">{0} bbl</unitPattern>
-				<unitPattern count="two">{0} bbl</unitPattern>
-				<unitPattern count="other">{0} bbl</unitPattern>
-			</unit>
 			<unit type="volume-drop">
 				<displayName>טיפה</displayName>
 				<unitPattern count="one">טיפה</unitPattern>
@@ -8163,6 +8413,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} פינץ'</unitPattern>
 				<unitPattern count="other">{0} פינץ'</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>קלוריה-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ק״ג-כוח</displayName>
+				<unitPattern count="one">{0} ק&quot;ג כוח</unitPattern>
+				<unitPattern count="two">{0} ק&quot;ג כוח</unitPattern>
+				<unitPattern count="other">{0} ק&quot;ג כוח</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>אור</displayName>
 				<unitPattern count="one">{0} אור</unitPattern>
@@ -8203,17 +8462,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} שנ׳</unitPattern>
 				<unitPattern count="other">{0} שנ׳</unitPattern>
 			</unit>
-			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} קמ״ר</unitPattern>
-				<unitPattern count="two">{0} קמ״ר</unitPattern>
-				<unitPattern count="other">{0} קמ״ר</unitPattern>
-			</unit>
 			<unit type="concentr-item">
 				<unitPattern count="one">{0} פריט</unitPattern>
 				<unitPattern count="two">{0} פר'</unitPattern>
 				<unitPattern count="many">{0} פר'</unitPattern>
 				<unitPattern count="other">{0} פר'</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>חלק</displayName>
+				<unitPattern count="one">{0} חלק</unitPattern>
+				<unitPattern count="two">{0} חלקים</unitPattern>
+				<unitPattern count="other">{0} חלקים</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>גלוקוז</displayName>
+				<unitPattern count="one">{0} גלוקוז</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ל׳/100ק״מ</displayName>
 				<unitPattern count="one">{0}ל׳/100ק״מ</unitPattern>
@@ -8221,6 +8487,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}ל׳/100ק״מ</unitPattern>
 				<unitPattern count="other">{0}ל׳/100ק״מ</unitPattern>
 			</unit>
+			<unit type="digital-petabyte">
+				<unitPattern count="one">PB‏{0}</unitPattern>
+				<unitPattern count="two">PB‏{0}</unitPattern>
+				<unitPattern count="many">PB‏{0}</unitPattern>
+				<unitPattern count="other">PB‏{0}</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<unitPattern count="one">TB‏{0}</unitPattern>
+				<unitPattern count="two">TB‏{0}</unitPattern>
+				<unitPattern count="many">TB‏{0}</unitPattern>
+				<unitPattern count="other">TB‏{0}</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one">Tb‏{0}</unitPattern>
+				<unitPattern count="two">Tb‏{0}</unitPattern>
+				<unitPattern count="many">Tb‏{0}</unitPattern>
+				<unitPattern count="other">Tb‏{0}</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="one">GB‏{0}</unitPattern>
+				<unitPattern count="two">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="one">MB‏{0}</unitPattern>
+				<unitPattern count="two">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one">Mb‏{0}</unitPattern>
+				<unitPattern count="two">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="one">kB‏{0}</unitPattern>
+				<unitPattern count="two">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<unitPattern count="one">B‏{0}</unitPattern>
+				<unitPattern count="two">B‏{0}</unitPattern>
+				<unitPattern count="many">B‏{0}</unitPattern>
+				<unitPattern count="other">B‏{0}</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one">bit‏{0}</unitPattern>
+				<unitPattern count="two">{0} ביט</unitPattern>
+				<unitPattern count="other">{0} ביט</unitPattern>
+			</unit>
 			<unit type="duration-year">
 				<displayName>ש׳</displayName>
 				<unitPattern count="one">{0} ש′</unitPattern>
@@ -8255,6 +8570,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-nanosecond">
 				<displayName>ns</displayName>
 			</unit>
+			<unit type="electric-ohm">
+				<displayName>אוהם</displayName>
+			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>קל׳</displayName>
 			</unit>
@@ -8265,8 +8583,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} kWh/100km</unitPattern>
 				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
+			<unit type="graphics-pixel">
+				<unitPattern count="one">px ‏{0}</unitPattern>
+				<unitPattern count="two">px ‏{0}</unitPattern>
+				<unitPattern count="many">px ‏{0}</unitPattern>
+				<unitPattern count="other">px ‏{0}</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<unitPattern count="one">MP ‏{0}</unitPattern>
+				<unitPattern count="two">MP ‏{0}</unitPattern>
+				<unitPattern count="many">MP ‏{0}</unitPattern>
+				<unitPattern count="other">MP ‏{0}</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<unitPattern count="one">ppcm‏{0}</unitPattern>
+				<unitPattern count="two">ppcm‏{0}</unitPattern>
+				<unitPattern count="many">ppcm‏{0}</unitPattern>
+				<unitPattern count="other">ppcm‏{0}</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<unitPattern count="one">ppi ‏{0}</unitPattern>
+				<unitPattern count="two">ppi ‏{0}</unitPattern>
+				<unitPattern count="many">ppi ‏{0}</unitPattern>
+				<unitPattern count="other">ppi ‏{0}</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-centimeter">
+				<displayName>dpcm</displayName>
+				<unitPattern count="one">‎dpcm‏{0}</unitPattern>
+				<unitPattern count="two">‎dpcm‏{0}</unitPattern>
+				<unitPattern count="many">‎dpcm‏{0}</unitPattern>
+				<unitPattern count="other">‎dpcm‏{0}</unitPattern>
+			</unit>
 			<unit type="graphics-dot">
 				<displayName>נקודה</displayName>
+				<unitPattern count="one">נק' קטנה אחת ({0})</unitPattern>
+				<unitPattern count="two">{0} נק' קטנות</unitPattern>
+				<unitPattern count="many">{0} נק' קטנות</unitPattern>
+				<unitPattern count="other">{0} נק' קטנות</unitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>מטר</displayName>
@@ -8310,6 +8663,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="two">{0} B</unitPattern>
 				<unitPattern count="other">{0} B</unitPattern>
 			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="one">{0} מ&quot;ק</unitPattern>
+				<unitPattern count="two">{0} מ&quot;ק</unitPattern>
+				<unitPattern count="many">{0} מ&quot;ק</unitPattern>
+				<unitPattern count="other">{0} מ&quot;ק</unitPattern>
+			</unit>
 			<unit type="volume-gallon-imperial">
 				<unitPattern count="one">{0}/galIm</unitPattern>
 				<unitPattern count="two">{0}/galIm</unitPattern>
@@ -8323,6 +8682,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}dsp-Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>קל׳-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ק״ג-כוח</displayName>
+				<unitPattern count="one">{0} ק&quot;ג כוח</unitPattern>
+				<unitPattern count="two">{0} ק&quot;ג כוח</unitPattern>
+				<unitPattern count="other">{0} ק&quot;ג כוח</unitPattern>
+			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/hi.xml b/make/data/cldr/common/main/hi.xml
index 649bddacab6..55b7aad3b28 100644
--- a/make/data/cldr/common/main/hi.xml
+++ b/make/data/cldr/common/main/hi.xml
@@ -229,7 +229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="iba">इबान</language>
 			<language type="ibb">इबिबियो</language>
 			<language type="id">इंडोनेशियाई</language>
-			<language type="ie">ईन्टरलिंगुइ</language>
+			<language type="ie">इंटरलिंग</language>
 			<language type="ig">ईग्बो</language>
 			<language type="ii">सिचुआन यी</language>
 			<language type="ik">इनुपियाक्</language>
@@ -287,6 +287,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">बफिआ</language>
 			<language type="ksh">कोलोनियाई</language>
 			<language type="ku">कुर्दिश</language>
+			<language type="ku" menu="core">कुर्दिश</language>
+			<language type="ku" menu="extension">कुर्दिश</language>
 			<language type="kum">कुमीक</language>
 			<language type="kut">क्यूतनाई</language>
 			<language type="kv">कोमी</language>
@@ -306,7 +308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lij">लिगुरियन</language>
 			<language type="lil">लिलोएट</language>
 			<language type="lkt">लैकोटा</language>
-			<language type="lmo">लॉमबर्ड</language>
+			<language type="lmo">लोम्बार्ड</language>
 			<language type="ln">लिंगाला</language>
 			<language type="lo">लाओ</language>
 			<language type="lol">मोंगो</language>
@@ -537,7 +539,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="tyv">तुवीनियन</language>
 			<language type="tzm">मध्य एटलस तमाज़ित</language>
 			<language type="udm">उदमुर्त</language>
-			<language type="ug">उइगर</language>
+			<language type="ug">उईग़ूर</language>
 			<language type="uga">युगैरिटिक</language>
 			<language type="uk">यूक्रेनियाई</language>
 			<language type="umb">उम्बुन्डु</language>
@@ -546,7 +548,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="uz">उज़्बेक</language>
 			<language type="vai">वाई</language>
 			<language type="ve">वेन्दा</language>
-			<language type="vec">वनीशन</language>
+			<language type="vec">वेनीशियन</language>
 			<language type="vi">वियतनामी</language>
 			<language type="vmw">मखुवा</language>
 			<language type="vo">वोलापुक</language>
@@ -599,7 +601,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Avst">अवेस्तन</script>
 			<script type="Bali">बाली</script>
 			<script type="Batk">बटकी</script>
-			<script type="Beng">बंगाली</script>
+			<script type="Beng">बांग्ला</script>
 			<script type="Blis">ब्लिसिम्बॉल्स</script>
 			<script type="Bopo">बोपोमोफ़ो</script>
 			<script type="Brah">ब्रह्मी</script>
@@ -827,6 +829,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">चीन</territory>
 			<territory type="CO">कोलंबिया</territory>
 			<territory type="CP">क्लिपर्टन द्वीप</territory>
+			<territory type="CQ">सार्क</territory>
 			<territory type="CR">कोस्टारिका</territory>
 			<territory type="CU">क्यूबा</territory>
 			<territory type="CV">केप वर्ड</territory>
@@ -1081,33 +1084,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">संख्यात्मक वर्गीकरण</key>
 			<key type="colStrength">वर्गीकरण सशक्तता</key>
 			<key type="currency">मुद्रा</key>
+			<key type="em">इमोजी का प्रज़ेंटेशन</key>
 			<key type="hc">घंटों का चक्र (12 बनाम 24)</key>
 			<key type="lb">पंक्ति विच्छेद शैली</key>
+			<key type="lw">शब्दों के बीच पंक्ति विच्छेद</key>
 			<key type="ms">मापन प्रणाली</key>
 			<key type="numbers">संख्याएँ</key>
+			<key type="ss">संक्षेपण के बाद वाक्य विच्छेद</key>
 			<key type="timezone">समय क्षेत्र</key>
 			<key type="va">स्थानीय प्रकार</key>
 			<key type="x">निजी-उपयोग</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">बौद्ध पंचांग</type>
+			<type key="calendar" type="buddhist" scope="core">बौद्ध</type>
 			<type key="calendar" type="chinese">चीनी पंचांग</type>
+			<type key="calendar" type="chinese" scope="core">चीनी</type>
 			<type key="calendar" type="coptic">कॉप्टिक कैलेंडर</type>
+			<type key="calendar" type="coptic" scope="core">कॉप्टिक</type>
 			<type key="calendar" type="dangi">दांगी कैलेंडर</type>
+			<type key="calendar" type="dangi" scope="core">दांगी</type>
 			<type key="calendar" type="ethiopic">इथियोपिक कैलेंडर</type>
+			<type key="calendar" type="ethiopic" scope="core">इथियोपिक</type>
 			<type key="calendar" type="ethiopic-amete-alem">इथियोपिक अमेते अलेम कैलेंडर</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">इथियोपिक अमेते अलेम</type>
 			<type key="calendar" type="gregorian">ग्रेगोरियन कैलेंडर</type>
+			<type key="calendar" type="gregorian" scope="core">ग्रेगोरियन</type>
 			<type key="calendar" type="hebrew">हिब्रू पंचांग</type>
+			<type key="calendar" type="hebrew" scope="core">हिब्रू</type>
 			<type key="calendar" type="indian">भारतीय राष्ट्रीय कैलेंडर</type>
+			<type key="calendar" type="indian" scope="core">भारतीय राष्ट्रीय</type>
 			<type key="calendar" type="islamic">हिजरी कैलेंडर</type>
+			<type key="calendar" type="islamic" scope="core">हिजरी</type>
 			<type key="calendar" type="islamic-civil">हिजरी नागरिक कैलेंडर</type>
+			<type key="calendar" type="islamic-civil" scope="core">हिजरी (टेबुलर, नागरिक शैली)</type>
 			<type key="calendar" type="islamic-umalqura">हिजरी कैलेंडर (उम्म अल-क़ुरा)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">हिजरी (उम्म अल-क़ुरा)</type>
 			<type key="calendar" type="iso8601">आईएसओ-8601 कैलेंडर</type>
 			<type key="calendar" type="japanese">जापानी पंचांग</type>
+			<type key="calendar" type="japanese" scope="core">जापानी</type>
 			<type key="calendar" type="persian">फ़ारसी कैलेंडर</type>
+			<type key="calendar" type="persian" scope="core">फ़ारसी</type>
 			<type key="calendar" type="roc">चीनी गणतंत्र पंचांग</type>
+			<type key="calendar" type="roc" scope="core">चीनी गणतंत्र</type>
 			<type key="cf" type="account">लेखांकन मुद्रा प्रारूप</type>
+			<type key="cf" type="account" scope="core">लेखांकन</type>
 			<type key="cf" type="standard">मानक मुद्रा प्रारूप</type>
+			<type key="cf" type="standard" scope="core">मानक</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">प्रतीकों को क्रमित करें</type>
 			<type key="colAlternate" type="shifted" draft="contributed">प्रतीकों पर ध्यान न देकर क्रमित करें</type>
 			<type key="colBackwards" type="no" draft="contributed">उच्‍चारणों को सामान्‍य रूप से क्रमित करें</type>
@@ -1117,22 +1140,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">पहले अपरकेस क्रमित करें</type>
 			<type key="colCaseLevel" type="no" draft="contributed">केस असंवेदी क्रमित करें</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">केस संवेदी को क्रमित करें</type>
-			<type key="collation" type="big5han">पारम्परिक चीनी वर्गीकरण क्रम</type>
 			<type key="collation" type="compat">संगतता के लिए पिछला वर्गीकरण क्रम</type>
+			<type key="collation" type="compat" scope="core">संगतता</type>
 			<type key="collation" type="dictionary">शब्दकोश वर्गीकरण क्रम</type>
+			<type key="collation" type="dictionary" scope="core">शब्दकोश</type>
 			<type key="collation" type="ducet">डिफ़ॉल्ट यूनिकोड वर्गीकरण क्रम</type>
+			<type key="collation" type="ducet" scope="core">डिफ़ॉल्ट यूनिकोड</type>
 			<type key="collation" type="eor" draft="contributed">यूरोपीय क्रमण नियम</type>
-			<type key="collation" type="gb2312han">सरलीकृत चीनी वर्गीकरण क्रम</type>
 			<type key="collation" type="phonebook">फ़ोनबुक वर्गीकरण क्रम</type>
+			<type key="collation" type="phonebook" scope="core">फ़ोनबुक</type>
 			<type key="collation" type="phonetic">ध्वन्यात्मक वर्गीकरण क्रम</type>
+			<type key="collation" type="phonetic" scope="core">ध्वन्यात्मक</type>
 			<type key="collation" type="pinyin">पिनयिन वर्गीकरण क्रम</type>
+			<type key="collation" type="pinyin" scope="core">पिनयिन</type>
 			<type key="collation" type="search">सामान्य-उद्देश्य खोज</type>
+			<type key="collation" type="search" scope="core">खोज</type>
 			<type key="collation" type="searchjl" draft="contributed">हांगुल आरंभिक व्‍यंजन द्वारा खोजें</type>
 			<type key="collation" type="standard">मानक वर्गीकरण क्रम</type>
+			<type key="collation" type="standard" scope="core">मानक</type>
 			<type key="collation" type="stroke">स्ट्रोक वर्गीकरण क्रम</type>
+			<type key="collation" type="stroke" scope="core">स्ट्रोक</type>
 			<type key="collation" type="traditional">पारंपरिक वर्गीकरण क्रम</type>
+			<type key="collation" type="traditional" scope="core">पारंपरिक</type>
 			<type key="collation" type="unihan">रेडिकल-स्ट्रोक वर्गीकरण क्रम</type>
-			<type key="collation" type="zhuyin">ज़ूयन वर्गीकरण</type>
+			<type key="collation" type="unihan" scope="core">रेडिकल-स्ट्रोक</type>
+			<type key="collation" type="zhuyin">ज़ूइन वर्गीकरण क्रम</type>
+			<type key="collation" type="zhuyin" scope="core">ज़ूइन</type>
 			<type key="colNormalization" type="no" draft="contributed">बिना सामान्‍यीकरण के क्रमित करें</type>
 			<type key="colNormalization" type="yes" draft="contributed">यूनिकोड सामान्‍यीकृत क्रमित करें</type>
 			<type key="colNumeric" type="no" draft="contributed">अंको को अलग-अलग क्रमित करें</type>
@@ -1145,18 +1178,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">पूर्ण-चौड़ाई</type>
 			<type key="d0" type="hwidth">आधी-चौड़ाई</type>
 			<type key="d0" type="npinyin" draft="contributed">सांख्यिक</type>
+			<type key="em" type="default" scope="core">डिफ़ॉल्ट</type>
+			<type key="em" type="emoji" scope="core">इमोजी</type>
+			<type key="em" type="text" scope="core">टेक्स्ट</type>
 			<type key="hc" type="h11">12 घंटों की प्रणाली (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 घंटों की प्रणाली (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 घंटों की प्रणाली (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 घंटों की प्रणाली (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ढीली पंक्ति विच्छेद शैली</type>
+			<type key="lb" type="loose" scope="core">ढीली</type>
 			<type key="lb" type="normal">सामान्य पंक्ति विच्छेद शैली</type>
+			<type key="lb" type="normal" scope="core">सामान्य</type>
 			<type key="lb" type="strict">सख्त पंक्ति विच्छेद शैली</type>
+			<type key="lb" type="strict" scope="core">स्ट्रिक्ट</type>
+			<type key="lw" type="breakall" scope="core">सभी को विच्छेद करें</type>
+			<type key="lw" type="keepall" scope="core">किसी को विच्छेद न करें</type>
+			<type key="lw" type="normal" scope="core">सामान्य</type>
+			<type key="lw" type="phrase" scope="core">वाक्यांशो के ज़रिए विच्छेद करें</type>
 			<type key="m0" type="bgn">BGN लिप्यंतरण</type>
 			<type key="m0" type="ungegn">UNGEGN लिप्यंतरण</type>
 			<type key="ms" type="metric">मेट्रिक प्रणाली</type>
+			<type key="ms" type="metric" scope="core">मेट्रिक</type>
 			<type key="ms" type="uksystem">इम्पीरियल मापन प्रणाली</type>
+			<type key="ms" type="uksystem" scope="core">यू॰के॰</type>
 			<type key="ms" type="ussystem">अमेरिकी मापन प्रणाली</type>
+			<type key="ms" type="ussystem" scope="core">यू॰एस॰</type>
 			<type key="numbers" type="arab">अरबी-भारतीय अंक</type>
 			<type key="numbers" type="arabext">विस्तृत अरबी-भारतीय अंक</type>
 			<type key="numbers" type="armn">आर्मेनियाई संख्याएँ</type>
@@ -1201,6 +1251,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">तिब्बती अंक</type>
 			<type key="numbers" type="traditional" draft="contributed">परंपरागत अंक</type>
 			<type key="numbers" type="vaii">वाई अंक</type>
+			<type key="ss" type="none" scope="core">बंद</type>
+			<type key="ss" type="standard" scope="core">चालू</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">मीट्रिक</measurementSystemName>
@@ -1222,9 +1274,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1376,7 +1425,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG d/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G E, d MMM y</dateFormatItem>
 						<dateFormatItem id="M">M</dateFormatItem>
@@ -2544,11 +2595,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0} डेलाइट समय</regionFormat>
 			<regionFormat type="standard">{0} मानक समय</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>एचएसटी</generic>
-					<standard>एचएसटी</standard>
-					<daylight draft="contributed">HST</daylight>
-				</short>
 				<exemplarCity>होनोलुलु</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2901,6 +2947,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ईस्टर</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>कॉयहेक</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>पुंटा एरिनास</exemplarCity>
 			</zone>
@@ -3166,9 +3215,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>नॉम पेन्ह</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>एंडरबरी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>कैंटन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3838,9 +3884,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>पश्चिम अफ़्रीका समय</generic>
-					<standard>पश्चिम अफ़्रीका मानक समय</standard>
-					<daylight>पश्चिम अफ़्रीका ग्रीष्मकालीन समय</daylight>
+					<standard>पश्चिम अफ़्रीका समय</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4197,6 +4241,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>गुयाना समय</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाई–आल्यूशन मानक समय</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाई–आल्यूशन समय</generic>
@@ -4799,8 +4848,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4822,7 +4871,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000000" count="other">¤00 लाख</pattern>
 					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00 लाख</pattern>
 					<pattern type="10000000" count="one">¤0 क॰</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤0 क॰</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 0 क॰</pattern>
 					<pattern type="10000000" count="other">¤0 क॰</pattern>
 					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0 क॰</pattern>
 					<pattern type="100000000" count="one">¤00 क॰</pattern>
@@ -5421,6 +5470,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>पूर्वी कैरिबियाई डॉलर</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>कैरीबियन गिल्डर</displayName>
+				<displayName count="one">कैरीबियन गिल्डर</displayName>
+				<displayName count="other">कैरीबियन गिल्डर</displayName>
+			</currency>
 			<currency type="XEU">
 				<displayName draft="contributed">यूरोपीय मुद्रा इकाई</displayName>
 			</currency>
@@ -5447,6 +5501,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>ज़ाम्बियन क्वाचा</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ज़िंबाब्वियन गोल्ड</displayName>
+				<displayName count="one">ज़िंबाब्वियन गोल्ड</displayName>
+				<displayName count="other">ज़िंबाब्वियन गोल्ड</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5692,11 +5751,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<gender>masculine</gender>
-				<displayName>मिलिग्राम प्रति डेसीलीटर</displayName>
-				<unitPattern count="one">{0} मिलिग्राम प्रति डेसीलीटर</unitPattern>
-				<unitPattern count="one" case="oblique">{0} मिलिग्राम प्रति डेसीलीटर</unitPattern>
-				<unitPattern count="other">{0} मिलिग्राम प्रति डेसीलीटर</unitPattern>
-				<unitPattern count="other" case="oblique">{0} मिलिग्राम प्रति डेसीलीटर</unitPattern>
+				<displayName>मिलीग्राम प्रति डेसीलीटर</displayName>
+				<unitPattern count="one">{0} मिलीग्राम प्रति डेसीलीटर</unitPattern>
+				<unitPattern count="one" case="oblique">{0} मिलीग्राम प्रति डेसीलीटर</unitPattern>
+				<unitPattern count="other">{0} मिलीग्राम प्रति डेसीलीटर</unitPattern>
+				<unitPattern count="other" case="oblique">{0} मिलीग्राम प्रति डेसीलीटर</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<gender>masculine</gender>
@@ -5709,7 +5768,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<gender>masculine</gender>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>भाग</displayName>
+				<unitPattern count="one">{0} भाग</unitPattern>
+				<unitPattern count="other">{0} भागों</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<unitPattern count="one">{0} हिस्सा प्रति दस लाख</unitPattern>
 				<unitPattern count="one" case="oblique">{0} हिस्सा प्रति दस लाख</unitPattern>
@@ -5741,6 +5805,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<gender>masculine</gender>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ग्लूकोज़</displayName>
+				<unitPattern count="one">{0} ग्लूकोज़</unitPattern>
+				<unitPattern count="other">{0} ग्लूकोज़</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>लीटर प्रति किलोमीटर</displayName>
@@ -6413,15 +6482,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} मर्क्यूरी मिलीमीटर</unitPattern>
 				<unitPattern count="other" case="oblique">{0} मर्क्यूरी मिलीमीटर</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>मर्क्यूरी</displayName>
+				<unitPattern count="one">{0} मर्क्यूरी</unitPattern>
+				<unitPattern count="other">{0} मर्क्यूरी</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>पाउंड प्रति वर्ग इंच</displayName>
 				<unitPattern count="one">{0} पाउंड प्रति वर्ग इंच</unitPattern>
 				<unitPattern count="other">{0} पाउंड प्रति वर्ग इंच</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>मर्करी इंच</displayName>
-				<unitPattern count="one">{0} मर्करी इंच</unitPattern>
-				<unitPattern count="other">{0} मर्करी इंच</unitPattern>
+				<displayName>मर्क्यूरी इंच</displayName>
+				<unitPattern count="one">{0} मर्क्यूरी इंच</unitPattern>
+				<unitPattern count="other">{0} मर्क्यूरी इंच</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<gender>masculine</gender>
@@ -6636,6 +6710,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<gender>masculine</gender>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>मेट्रिक फ़्लूड आउंस</displayName>
+				<unitPattern count="one">{0} मेट्रिक फ़्लूड आउंस</unitPattern>
+				<unitPattern count="other">{0} मेट्रिक फ़्लूड आउंस</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} एकड़ फ़ूट</unitPattern>
 				<unitPattern count="other">{0} एकड़ फ़ीट</unitPattern>
@@ -6727,15 +6806,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} क्वार्ट इम्पीरियल</unitPattern>
 				<unitPattern count="other" case="oblique">{0} क्वार्ट इम्पीरियल</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>स्टेरेडियन</displayName>
+				<unitPattern count="one">{0} स्टेरेडियन</unitPattern>
+				<unitPattern count="other">{0} स्टेरेडियन</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>कैटाल</displayName>
+				<unitPattern count="one">{0} कैटाल</unitPattern>
+				<unitPattern count="other">{0} कैटाल</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>कूलाम</displayName>
+				<unitPattern count="one">{0} कूलाम</unitPattern>
+				<unitPattern count="other">{0} कूलाम</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>फैरड</displayName>
+				<unitPattern count="one">{0} फैरड</unitPattern>
+				<unitPattern count="other">{0} फैरड</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>हेनरी</displayName>
+				<unitPattern count="one">{0} हेनरी</unitPattern>
+				<unitPattern count="other">{0} हेनरी</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>सीमेंस</displayName>
+				<unitPattern count="one">{0} सीमेंस</unitPattern>
+				<unitPattern count="other">{0} सीमेंस</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calories [IT]</displayName>
+				<unitPattern count="one">{0} calorie [IT]</unitPattern>
+				<unitPattern count="other">{0} calories [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>किलोग्राम-फ़ोर्स</displayName>
+				<unitPattern count="one">{0} किलोग्राम-फ़ोर्स</unitPattern>
+				<unitPattern count="other">{0} किलोग्राम-फ़ोर्स</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>टेस्ला</displayName>
+				<unitPattern count="one">{0} टेस्ला</unitPattern>
+				<unitPattern count="other">{0} टेस्ला</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>वेबर</displayName>
+				<unitPattern count="one">{0} वेबर</unitPattern>
+				<unitPattern count="other">{0} वेबर</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>लाइट</displayName>
-				<unitPattern count="one">{0} लाइट</unitPattern>
-				<unitPattern count="one" case="oblique">{0} लाइट</unitPattern>
-				<unitPattern count="other">{0} लाइट</unitPattern>
-				<unitPattern count="other" case="oblique">{0} लाइट</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>पार्ट्स प्रति बिलियन</displayName>
 				<unitPattern count="one">{0} पार्ट प्रति बिलियन</unitPattern>
@@ -6745,11 +6884,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>रातें</displayName>
-				<unitPattern count="one">{0} रात</unitPattern>
-				<unitPattern count="one" case="oblique">{0} रात</unitPattern>
-				<unitPattern count="other">{0} रातें</unitPattern>
-				<unitPattern count="other" case="oblique">{0} रातें</unitPattern>
 				<perUnitPattern>{0} प्रति रात</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6958,7 +7092,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} आइटम</unitPattern>
 				<unitPattern count="other">{0} आइटम</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>भाग</displayName>
+				<unitPattern count="one">{0} भाग</unitPattern>
+				<unitPattern count="other">{0} भाग</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>हिस्सा प्रति दस लाख</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6972,6 +7111,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मोल</unitPattern>
 				<unitPattern count="other">{0} मोल</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लीटर/किमी</displayName>
 				<unitPattern count="one">{0} ली/किमी</unitPattern>
@@ -7306,6 +7448,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>वॉट</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<displayName>बार</displayName>
 				<unitPattern count="one">{0} बार</unitPattern>
@@ -7444,6 +7590,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मीट्रिक कप</unitPattern>
 				<unitPattern count="other">{0} मीट्रिक कप</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>मेट्रिक फ़्लूड आउंस</displayName>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>एकड़ फ़ीट</displayName>
 				<unitPattern count="one">{0} ए॰फ़ी॰</unitPattern>
@@ -7536,12 +7687,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} क. इम्पी.</unitPattern>
 				<unitPattern count="other">{0} क. इम्पी.</unitPattern>
 			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>लाइट</displayName>
 				<unitPattern count="one">{0} लाइट</unitPattern>
 				<unitPattern count="other">{0} लाइट</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>पार्ट्स/बिलियन</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7671,7 +7855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/वर्ग किमी</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>हे</displayName>
+				<displayName>हे॰</displayName>
 			</unit>
 			<unit type="area-square-meter">
 				<displayName>वर्ग मी</displayName>
@@ -7703,12 +7887,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} व इं</unitPattern>
 				<unitPattern count="other">{0} व इं</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>भाग</displayName>
+				<unitPattern count="one">{0} भाग</unitPattern>
+				<unitPattern count="other">{0} भाग</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0} ली/100 किमी</unitPattern>
 				<unitPattern count="other">{0} ली/100 किमी</unitPattern>
@@ -7889,15 +8081,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} वॉ</unitPattern>
 				<unitPattern count="other">{0} वॉ</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<unitPattern count="one">{0} मिवॉ</unitPattern>
-				<unitPattern count="other">{0} मिवॉ</unitPattern>
-			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} एचपी</unitPattern>
 				<unitPattern count="other">{0} एचपी</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
+				<displayName>″ Hg</displayName>
 				<unitPattern count="one">{0}&quot; Hg</unitPattern>
 				<unitPattern count="other">{0}&quot; Hg</unitPattern>
 			</unit>
@@ -7905,18 +8098,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mb</unitPattern>
 				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<unitPattern count="one">{0}hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
-			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<unitPattern count="one">{0} किमी/घं</unitPattern>
 				<unitPattern count="other">{0} किमी/घं</unitPattern>
 			</unit>
-			<unit type="speed-meter-per-second">
-				<unitPattern count="one">{0} मी/से</unitPattern>
-				<unitPattern count="other">{0}मी॰/से॰</unitPattern>
-			</unit>
 			<unit type="speed-mile-per-hour">
 				<unitPattern count="one">{0} मीप्रघं</unitPattern>
 				<unitPattern count="other">{0} मीप्रघं</unitPattern>
@@ -7980,6 +8165,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मिली</unitPattern>
 				<unitPattern count="other">{0} मिली</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>मेट्रिक फ़्लूड आउंस</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} एकड़ फ़ीट</unitPattern>
 				<unitPattern count="other">{0} एकड़ फ़ीट</unitPattern>
@@ -8046,16 +8234,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt-Imp.</unitPattern>
 				<unitPattern count="other">{0} qt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>लाइट</displayName>
-				<unitPattern count="one">{0} लाइट</unitPattern>
-				<unitPattern count="other">{0} लाइट</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>रातें</displayName>
 				<unitPattern count="one">{0}रात</unitPattern>
 				<unitPattern count="other">{0}रातें</unitPattern>
-				<perUnitPattern>{0}/रात</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/hi_Latn.xml b/make/data/cldr/common/main/hi_Latn.xml
index a3a8493c029..707b6a6cc65 100644
--- a/make/data/cldr/common/main/hi_Latn.xml
+++ b/make/data/cldr/common/main/hi_Latn.xml
@@ -20,7 +20,6 @@ annotations.
 		<languages>
 			<language type="af">Afreeki</language>
 			<language type="bgc">Hariyaanvi</language>
-			<language type="bn">Bangla</language>
 			<language type="bo">Tibbati</language>
 			<language type="ckb">Kurdish, Sorani</language>
 			<language type="crh">Crimean Turkish</language>
@@ -37,10 +36,8 @@ annotations.
 		</languages>
 		<scripts>
 			<script type="Bali">Baali</script>
-			<script type="Beng">Bangla</script>
 			<script type="Inds">Sindhu</script>
 			<script type="Mymr">Burmese</script>
-			<script type="Orya">Odia</script>
 			<script type="Talu">Naya Tai Lue</script>
 		</scripts>
 		<territories>
@@ -122,10 +119,13 @@ annotations.
 			<type key="hc" type="h24">24 Hour System (1–24)</type>
 			<type key="lw" type="breakall">Sabhi Words mein Line Breaks allow karein</type>
 			<type key="lw" type="keepall">Sabhi Words mein Line Breaks se bachein</type>
+			<type key="lw" type="keepall" scope="core">Sabhi rakhein</type>
 			<type key="lw" type="normal">Words ke liye normal Line Breaks</type>
 			<type key="lw" type="phrase">Phrases mein Line Breaks se bachein</type>
+			<type key="lw" type="phrase" scope="core">Phrases mein rakhein</type>
 			<type key="numbers" type="beng">Bangla Digits</type>
 			<type key="numbers" type="hanidec">Chinese Decimal Numbers</type>
+			<type key="numbers" type="hanidec" scope="core">Positional decimal system ke liye digits ke taur par Chinese number ideographs kaa use</type>
 			<type key="numbers" type="hans">Simplified Chinese Numbers</type>
 			<type key="numbers" type="hansfin">Simplified Chinese Financial Numbers</type>
 			<type key="numbers" type="hant">Traditional Chinese Numbers</type>
@@ -195,6 +195,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0} 'par'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} 'par'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -203,6 +206,9 @@ annotations.
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0} 'par'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} 'par'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -216,6 +222,10 @@ annotations.
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bhms">h:mm.ss B</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h', v</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
@@ -444,7 +454,10 @@ annotations.
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0} 'baje'</pattern>
+							<pattern>{1}, {0} 'par'</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'par'</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -452,7 +465,10 @@ annotations.
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0} 'baje'</pattern>
+							<pattern>{1}, {0} 'par'</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'par'</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -466,11 +482,10 @@ annotations.
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G y, d MMM</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y, dd MMM, E</dateFormatItem>
-						<dateFormatItem id="GyMMMEEEEd">G y, dd MMMM, E</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
+						<dateFormatItem id="GyMMMEEEEd">EEEE, d MMM, y G</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">MMMM 'kaa' 'week' W</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM 'kaa' 'week' W</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
@@ -1176,9 +1191,6 @@ annotations.
 		</fields>
 		<timeZoneNames>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
@@ -1294,6 +1306,14 @@ annotations.
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
@@ -1361,6 +1381,11 @@ annotations.
 				<unitPattern count="one">{0} percent</unitPattern>
 				<unitPattern count="other">{0} percent</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glucose level</displayName>
+				<unitPattern count="one">{0} kaa glucose level</unitPattern>
+				<unitPattern count="other">{0} kaa glucose level</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>miles per Imp. gallon</displayName>
 				<unitPattern count="one">{0} mile per Imp. gallon</unitPattern>
@@ -1419,6 +1444,11 @@ annotations.
 				<unitPattern count="one">{0} millimetre mercury</unitPattern>
 				<unitPattern count="other">{0} millimetres mercury</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>mercury level</displayName>
+				<unitPattern count="one">{0} kaa mercury level</unitPattern>
+				<unitPattern count="other">{0} kaa mercury level</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="one">{0} inch mercury</unitPattern>
 				<unitPattern count="other">{0} inches mercury</unitPattern>
@@ -1491,6 +1521,11 @@ annotations.
 				<unitPattern count="one">{0} CD</unitPattern>
 				<unitPattern count="other">{0} CD</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>Hg level</displayName>
+				<unitPattern count="one">{0} kaa Hg level</unitPattern>
+				<unitPattern count="other">{0} kaa Hg level</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<unitPattern count="one">{0} bar</unitPattern>
 				<unitPattern count="other">{0} bars</unitPattern>
@@ -1538,9 +1573,6 @@ annotations.
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern>μ {0}</unitPrefixPattern>
-			</compoundUnit>
 			<unit type="concentr-karat">
 				<displayName>karat</displayName>
 				<unitPattern count="one">{0}kt</unitPattern>
@@ -1578,6 +1610,11 @@ annotations.
 				<unitPattern count="one">{0}#</unitPattern>
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>Hg level</displayName>
+				<unitPattern count="one">{0} kaa Hg level</unitPattern>
+				<unitPattern count="other">{0} kaa Hg level</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<unitPattern count="one">{0}bar</unitPattern>
 				<unitPattern count="other">{0}bars</unitPattern>
diff --git a/make/data/cldr/common/main/hr.xml b/make/data/cldr/common/main/hr.xml
index 35c73535771..b4f4f75021f 100644
--- a/make/data/cldr/common/main/hr.xml
+++ b/make/data/cldr/common/main/hr.xml
@@ -297,6 +297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kelnski</language>
 			<language type="ku">kurdski</language>
+			<language type="ku" menu="core">kurdski</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kumyk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -857,6 +859,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kina</territory>
 			<territory type="CO">Kolumbija</territory>
 			<territory type="CP">Otok Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Zelenortska Republika</territory>
@@ -887,7 +890,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="FK">Falklandski Otoci</territory>
 			<territory type="FK" alt="variant">Falklandski Otoci (Malvini)</territory>
 			<territory type="FM">Mikronezija</territory>
-			<territory type="FO">Ovčji Otoci</territory>
+			<territory type="FO">Farski Otoci</territory>
 			<territory type="FR">Francuska</territory>
 			<territory type="GA">Gabon</territory>
 			<territory type="GB">Ujedinjeno Kraljevstvo</territory>
@@ -1142,33 +1145,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">brojčano ravrstavanje</key>
 			<key type="colStrength">jačina razvrstavanja</key>
 			<key type="currency">valuta</key>
+			<key type="em">Prezentacija emojija</key>
 			<key type="hc">format vremena (12 ili 24)</key>
 			<key type="lb">stil prijeloma retka</key>
+			<key type="lw">Prijelomi redaka unutar riječi</key>
 			<key type="ms">sustav mjernih jedinica</key>
 			<key type="numbers">brojevi</key>
+			<key type="ss">Prijelom rečenice nakon kratice</key>
 			<key type="timezone">Vremenska zona</key>
 			<key type="va">Varijanta zemlje/jezika</key>
 			<key type="x">Privatna upotreba</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistički kalendar</type>
+			<type key="calendar" type="buddhist" scope="core">budistički</type>
 			<type key="calendar" type="chinese">kineski kalendar</type>
+			<type key="calendar" type="chinese" scope="core">kineski</type>
 			<type key="calendar" type="coptic">koptski kalendar</type>
+			<type key="calendar" type="coptic" scope="core">koptski</type>
 			<type key="calendar" type="dangi">dangi kalendar</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">etiopski kalendar</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopski</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopski kalendar &quot;Amete Alem&quot;</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopski &quot;Amete Alem&quot;</type>
 			<type key="calendar" type="gregorian">gregorijanski kalendar</type>
+			<type key="calendar" type="gregorian" scope="core">gregorijanski</type>
 			<type key="calendar" type="hebrew">hebrejski kalendar</type>
+			<type key="calendar" type="hebrew" scope="core">hebrejski</type>
 			<type key="calendar" type="indian">indijski nacionalni kalendar</type>
 			<type key="calendar" type="islamic">hijri kalendar</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
 			<type key="calendar" type="islamic-civil">hijri kalendar (tabularni, civilna epoha)</type>
+			<type key="calendar" type="islamic-civil" scope="core">hijri (tabularni, civilna epoha)</type>
 			<type key="calendar" type="islamic-umalqura">hijri kalendar (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 kalendar</type>
 			<type key="calendar" type="japanese">japanski kalendar</type>
+			<type key="calendar" type="japanese" scope="core">japanski</type>
 			<type key="calendar" type="persian">perzijski kalendar</type>
+			<type key="calendar" type="persian" scope="core">perzijski</type>
 			<type key="calendar" type="roc">kalendar Republike Kine</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">računovodstveni format valute</type>
+			<type key="cf" type="account" scope="core">računovodstveno</type>
 			<type key="cf" type="standard">standardni format valute</type>
+			<type key="cf" type="standard" scope="core">standardno</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Poredaj simbole</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Poredaj zanemarujući simbole</type>
 			<type key="colBackwards" type="no" draft="contributed">Poredaj naglaske normalno</type>
@@ -1178,22 +1200,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Poredaj prvo velika slova</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Poredaj zanemarujući veličinu</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Poredaj u skladu s veličinom slova</type>
-			<type key="collation" type="big5han">razvrstavanje prema tradicionalnom kineskom - Big5</type>
 			<type key="collation" type="compat">prethodni redoslijed razvrstavanja, radi kompatibilnosti</type>
+			<type key="collation" type="compat" scope="core">kompatibilnost</type>
 			<type key="collation" type="dictionary">rječničko razvrstavanje</type>
+			<type key="collation" type="dictionary" scope="core">rječnik</type>
 			<type key="collation" type="ducet">standardno unicode razvrstavanje</type>
+			<type key="collation" type="ducet" scope="core">standardni Unicode</type>
 			<type key="collation" type="eor" draft="contributed">Europska pravila razvrstavanja</type>
-			<type key="collation" type="gb2312han">razvrstavanje prema pojednostavljenom kineskom - GB2312</type>
 			<type key="collation" type="phonebook">razvrstavanje po abecedi</type>
+			<type key="collation" type="phonebook" scope="core">telefonski imenik</type>
 			<type key="collation" type="phonetic">fonetsko razvrstavanje</type>
+			<type key="collation" type="phonetic" scope="core">fonetski</type>
 			<type key="collation" type="pinyin">pinyin razvrstavanje</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">općenito pretraživanje</type>
+			<type key="collation" type="search" scope="core">pretraživanje</type>
 			<type key="collation" type="searchjl" draft="contributed">Pretraživanje po početnom suglasniku hangula</type>
 			<type key="collation" type="standard">standardno razvrstavanje</type>
+			<type key="collation" type="standard" scope="core">standardno</type>
 			<type key="collation" type="stroke">razvrstavanje po redoslijedu poteza za kineski</type>
+			<type key="collation" type="stroke" scope="core">potez</type>
 			<type key="collation" type="traditional">tradicionalno razvrstavanje</type>
+			<type key="collation" type="traditional" scope="core">tradicionalno</type>
 			<type key="collation" type="unihan">razvrstavanje prema korijenu i potezu</type>
+			<type key="collation" type="unihan" scope="core">korijen i potez</type>
 			<type key="collation" type="zhuyin">zhuyin razvrstavanje</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Poredaj bez normalizacije</type>
 			<type key="colNormalization" type="yes" draft="contributed">Poredaj unikod normalizirano</type>
 			<type key="colNumeric" type="no" draft="contributed">Poredaj znamenke pojedinačno</type>
@@ -1206,18 +1238,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">široki</type>
 			<type key="d0" type="hwidth">uski</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerički</type>
+			<type key="em" type="default" scope="core">standardno</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-satni format (0 – 11)</type>
+			<type key="hc" type="h11" scope="core">12 (0 – 11)</type>
 			<type key="hc" type="h12">12-satni format (0 – 12)</type>
+			<type key="hc" type="h12" scope="core">12 (1 – 12)</type>
 			<type key="hc" type="h23">24-satni format (0 – 23)</type>
+			<type key="hc" type="h23" scope="core">24 (0 – 23)</type>
 			<type key="hc" type="h24">24-satni format (1 – 24)</type>
+			<type key="hc" type="h24" scope="core">24 (0 – 24)</type>
 			<type key="lb" type="loose">slobodni stil prijeloma retka</type>
+			<type key="lb" type="loose" scope="core">slobodni</type>
 			<type key="lb" type="normal">normalni stil prijeloma retka</type>
+			<type key="lb" type="normal" scope="core">normalni</type>
 			<type key="lb" type="strict">strogi stil prijeloma retka</type>
+			<type key="lb" type="strict" scope="core">strogi</type>
+			<type key="lw" type="breakall" scope="core">prijelom svega</type>
+			<type key="lw" type="keepall" scope="core">zadrži sve</type>
+			<type key="lw" type="normal" scope="core">normalno</type>
+			<type key="lw" type="phrase" scope="core">zadrži u frazama</type>
 			<type key="m0" type="bgn">transliteracija prema BGN-u</type>
 			<type key="m0" type="ungegn">transliteracija prema UNGEGN-u</type>
 			<type key="ms" type="metric">metrički sustav</type>
+			<type key="ms" type="metric" scope="core">metrički</type>
 			<type key="ms" type="uksystem">imperijalni sustav mjera</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">američki sustav mjera</type>
+			<type key="ms" type="ussystem" scope="core">SAD</type>
 			<type key="numbers" type="arab">arapsko-indijske znamenke</type>
 			<type key="numbers" type="arabext">proširene arapsko-indijske znamenke</type>
 			<type key="numbers" type="armn">armenski brojevi</type>
@@ -1262,6 +1311,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">tibetske znamenke</type>
 			<type key="numbers" type="traditional" draft="contributed">Tradicionalni brojevi</type>
 			<type key="numbers" type="vaii">vai znamenke</type>
+			<type key="ss" type="none" scope="core">isključeno</type>
+			<type key="ss" type="standard" scope="core">uključeno</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrički sustav</measurementSystemName>
@@ -1306,9 +1357,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1405,6 +1453,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1413,16 +1464,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
@@ -1430,13 +1490,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
+						<dateFormatItem id="GyM">M. y. G</dateFormatItem>
 						<dateFormatItem id="GyMd">d. M. y. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd. MM. y., E</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="M">L.</dateFormatItem>
 						<dateFormatItem id="Md">dd. MM.</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd. MM.</dateFormatItem>
@@ -1458,11 +1521,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1816,6 +1877,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1824,16 +1888,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'u' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'u' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
@@ -1841,15 +1914,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
+						<dateFormatItem id="GyM">MM. y. G</dateFormatItem>
 						<dateFormatItem id="GyMd">d. M. y. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd. MM. y., G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="M">L.</dateFormatItem>
 						<dateFormatItem id="Md">dd. MM.</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd. MM.</dateFormatItem>
@@ -1881,11 +1956,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1931,7 +2004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, dd. MMM y. – E, dd. MMM y. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h 'h' a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1956,7 +2028,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h 'h' a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2882,9 +2953,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angvila</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erevan</exemplarCity>
 			</zone>
@@ -3012,9 +3080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pjongjang</exemplarCity>
 			</zone>
@@ -3069,9 +3134,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahia Banderas</exemplarCity>
 			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Ciudad de México</exemplarCity>
-			</zone>
 			<zone type="America/Merida">
 				<exemplarCity>Merida</exemplarCity>
 			</zone>
@@ -3165,9 +3227,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damask</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
@@ -3227,9 +3286,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>zapadnoafričko vrijeme</generic>
-					<standard>zapadnoafričko standardno vrijeme</standard>
-					<daylight>zapadnoafričko ljetno vrijeme</daylight>
+					<standard>zapadnoafričko vrijeme</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3635,6 +3692,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>gvajansko vrijeme</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>havajsko-aleutsko standardno vrijeme</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>havajsko-aleutsko vrijeme</generic>
@@ -4085,6 +4147,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>vrijeme Chuuka</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>tursko vrijeme</generic>
+					<standard>tursko standardno vrijeme</standard>
+					<daylight>tursko ljetno vrijeme</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>turkmenistansko vrijeme</generic>
@@ -4260,6 +4329,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5975,6 +6048,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">istočnokaripskih dolara</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>karipski gulden</displayName>
+				<displayName count="one">karipski gulden</displayName>
+				<displayName count="few">karipska guldena</displayName>
+				<displayName count="other">karipskih guldena</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>posebna crtaća prava</displayName>
 				<displayName count="one">posebno crtaće pravo</displayName>
@@ -6133,6 +6212,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="few">zimbabveanska dolara (1980.–2008.)</displayName>
 				<displayName count="other">zimbabveanskih dolara (1980.–2008.)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabveansko zlato</displayName>
+				<displayName count="one">zimbabveansko zlato</displayName>
+				<displayName count="few">zimbabveanska zlata</displayName>
+				<displayName count="other">zimbabveanskih zlata</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>zimbabveanski dolar (2009)</displayName>
 				<displayName count="one">zimbabveanski dolar (2009)</displayName>
@@ -6268,8 +6353,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="one" case="accusative">četvorni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" case="genitive">četvornog {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" case="instrumental">četvornim {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" gender="feminine">četvorni {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" gender="feminine" case="accusative">četvorni {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one" gender="feminine">četvorna {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one" gender="feminine" case="accusative">četvornu {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="feminine" case="genitive">četvorne {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="feminine" case="instrumental">četvornom {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="inanimate">četvorni {0}</compoundUnitPattern1>
@@ -6280,10 +6365,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="few" case="accusative">četvorna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" case="genitive">četvorna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" case="instrumental">četvorna {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine">četvorna {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine" case="accusative">četvorna {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine" case="genitive">četvorna {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine" case="instrumental">četvorna {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine">četvorne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine" case="accusative">četvorne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine" case="genitive">četvorne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine" case="instrumental">četvorne {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="inanimate">četvorna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="inanimate" case="accusative">četvorna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="inanimate" case="genitive">četvorna {0}</compoundUnitPattern1>
@@ -6307,8 +6392,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="one" case="accusative">kubni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" case="genitive">kubnog {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" case="instrumental">kubnim {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" gender="feminine">kubni {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" gender="feminine" case="accusative">kubni {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one" gender="feminine">kubne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one" gender="feminine" case="accusative">{0} kubnu</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="feminine" case="genitive">kubne {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="feminine" case="instrumental">kubnom {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="inanimate">kubni {0}</compoundUnitPattern1>
@@ -6320,9 +6405,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="few" case="genitive">kubna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" case="instrumental">kubna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="feminine">kubne {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine" case="accusative">kubna {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine" case="genitive">kubna {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="feminine" case="instrumental">kubna {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine" case="accusative">kubne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine" case="genitive">kubne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="feminine" case="instrumental">kubne {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="inanimate">kubna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="inanimate" case="accusative">kubna {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="inanimate" case="genitive">kubna {0}</compoundUnitPattern1>
@@ -6602,7 +6687,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} stavki</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} stavki</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dijelovi</displayName>
+				<unitPattern count="one">{0} dio</unitPattern>
+				<unitPattern count="few">{0} dijela</unitPattern>
+				<unitPattern count="other">{0} dijelova</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>inanimate</gender>
 				<displayName>dijelovi na milijun</displayName>
 				<unitPattern count="one">{0} dio na milijun</unitPattern>
@@ -6682,6 +6773,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} mola</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoze</displayName>
+				<unitPattern count="one">{0} glukoze</unitPattern>
+				<unitPattern count="few">{0} glukoze</unitPattern>
+				<unitPattern count="other">{0} glukoze</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>feminine</gender>
 				<displayName>litre po kilometru</displayName>
@@ -8002,7 +8099,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milimetar živina stupca</unitPattern>
 				<unitPattern count="one" case="accusative">{0} milimetar živina stupca</unitPattern>
 				<unitPattern count="one" case="genitive">{0} milimetar živina stupca</unitPattern>
-				<unitPattern count="one" case="instrumental">{0} milimetar živina stupca</unitPattern>
+				<unitPattern count="one" case="instrumental">{0} milimetrom živina stupca</unitPattern>
 				<unitPattern count="few">{0} milimetra živina stupca</unitPattern>
 				<unitPattern count="few" case="accusative">{0} milimetra živina stupca</unitPattern>
 				<unitPattern count="few" case="genitive">{0} milimetra živina stupca</unitPattern>
@@ -8012,6 +8109,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} milimetara živina stupca</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} milimetara živina stupca</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>žive</displayName>
+				<unitPattern count="one">{0} žive</unitPattern>
+				<unitPattern count="few">{0} žive</unitPattern>
+				<unitPattern count="other">{0} žive</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funte po kvadratnom inču</displayName>
 				<unitPattern count="one">{0} funta po kvadratnom inču</unitPattern>
@@ -8447,6 +8550,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} metričkih šalica</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} metričkih šalica</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>tekuće unce</displayName>
+				<unitPattern count="one">{0} tekuća unca</unitPattern>
+				<unitPattern count="few">{0} tekuće unce</unitPattern>
+				<unitPattern count="other">{0} tekućih unci</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>aker-stope</displayName>
 				<unitPattern count="one">{0} aker-stopa</unitPattern>
@@ -8546,9 +8655,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} imperijalne četvrtine</unitPattern>
 				<unitPattern count="other">{0} imperijalne četvrtine</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradijani</displayName>
+				<unitPattern count="one">{0} steradijan</unitPattern>
+				<unitPattern count="few">{0} steradijana</unitPattern>
+				<unitPattern count="other">{0} steradijana</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katali</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} katala</unitPattern>
+				<unitPattern count="other">{0} katala</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kuloni</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="few">{0} kulona</unitPattern>
+				<unitPattern count="other">{0} kulona</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradi</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farada</unitPattern>
+				<unitPattern count="other">{0} farada</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henriji</displayName>
+				<unitPattern count="one">{0} henri</unitPattern>
+				<unitPattern count="few">{0} henrija</unitPattern>
+				<unitPattern count="other">{0} henrija</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simensi</displayName>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorije [IT]</displayName>
+				<unitPattern count="one">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="few">{0} kalorije [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorija [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereli</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="few">{0} bekerela</unitPattern>
+				<unitPattern count="other">{0} bekerela</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>siverti</displayName>
+				<unitPattern count="one">{0} sivert</unitPattern>
+				<unitPattern count="few">{0} siverta</unitPattern>
+				<unitPattern count="other">{0} siverta</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greji</displayName>
+				<unitPattern count="one">{0} grej</unitPattern>
+				<unitPattern count="few">{0} greja</unitPattern>
+				<unitPattern count="other">{0} grejeva</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram-sila</displayName>
+				<unitPattern count="one">{0} kilogram-sila</unitPattern>
+				<unitPattern count="few">{0} kilogram-sile</unitPattern>
+				<unitPattern count="other">{0} kilogram-sila</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesle</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesle</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veberi</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="few">{0} vebera</unitPattern>
+				<unitPattern count="other">{0} vebera</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>svjetlo</displayName>
 				<unitPattern count="one">{0} svjetlo</unitPattern>
 				<unitPattern count="one" case="accusative">{0} svjetlo</unitPattern>
 				<unitPattern count="one" case="genitive">{0} svjetla</unitPattern>
@@ -8562,7 +8748,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} svjetala</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} svjetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>inanimate</gender>
 				<displayName>dijelovi na milijardu</displayName>
 				<unitPattern count="one">{0} dio na milijardu</unitPattern>
@@ -8593,7 +8779,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} noći</unitPattern>
 				<unitPattern count="other" case="genitive">{0} noći</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} noći</unitPattern>
-				<perUnitPattern>{0}/noć</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>kardinalni smjer</displayName>
@@ -8661,6 +8846,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} stavke</unitPattern>
 				<unitPattern count="other">{0} stavki</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>dio</displayName>
+				<unitPattern count="one">{0} dio</unitPattern>
+				<unitPattern count="few">{0} dijela</unitPattern>
+				<unitPattern count="other">{0} dijelova</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="few">{0} %</unitPattern>
@@ -8681,6 +8872,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} mola</unitPattern>
 				<unitPattern count="other">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -8876,6 +9073,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} KS</unitPattern>
 				<unitPattern count="other">{0} KS</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="few">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<unitPattern count="one">{0} bar</unitPattern>
 				<unitPattern count="few">{0} bara</unitPattern>
@@ -9003,13 +9205,79 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} prstohvata</unitPattern>
 				<unitPattern count="other">{0} prstohvata</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="few">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>svjetlo</displayName>
 				<unitPattern count="one">{0} svjetlo</unitPattern>
 				<unitPattern count="few">{0} svjetla</unitPattern>
 				<unitPattern count="other">{0} svjetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>dijelovi/milijarda</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -9037,11 +9305,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-dunam">
 				<displayName>dunam</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>dio</displayName>
+				<unitPattern count="one">{0} dio</unitPattern>
+				<unitPattern count="few">{0} dijela</unitPattern>
+				<unitPattern count="other">{0} dijelova</unitPattern>
+			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="few">{0} mola</unitPattern>
 				<unitPattern count="other">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}l/100km</unitPattern>
 				<unitPattern count="few">{0}l/100km</unitPattern>
@@ -9091,6 +9371,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="mass-dalton">
 				<displayName>Da</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="few">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<unitPattern count="one">{0} mb</unitPattern>
 				<unitPattern count="few">{0} mb</unitPattern>
@@ -9125,21 +9410,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} jiggera</unitPattern>
 				<unitPattern count="other">{0} jiggera</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>svjetlo</displayName>
-				<unitPattern count="one">{0} svjetlo</unitPattern>
-				<unitPattern count="few">{0} svjetla</unitPattern>
-				<unitPattern count="other">{0} svjetala</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>dijelovi/milijarda</displayName>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>noć</displayName>
-				<unitPattern count="one">{0} noć</unitPattern>
-				<unitPattern count="few">{0} noći</unitPattern>
-				<unitPattern count="other">{0} noći</unitPattern>
-				<perUnitPattern>{0}/noć</perUnitPattern>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="few">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}I</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/hsb.xml b/make/data/cldr/common/main/hsb.xml
index f3c8138cc6d..af2ffc5ce6c 100644
--- a/make/data/cldr/common/main/hsb.xml
+++ b/make/data/cldr/common/main/hsb.xml
@@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ay">aymaršćina</language>
 			<language type="az">azerbajdźanšćina</language>
 			<language type="ba">baškiršćina</language>
+			<language type="bal">balučišćina</language>
 			<language type="ban">balinezišćina</language>
 			<language type="bas">basaa</language>
 			<language type="be">běłorušćina</language>
@@ -229,6 +230,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafia</language>
 			<language type="ksh">kelnšćina</language>
 			<language type="ku">kurdišćina</language>
+			<language type="ku" menu="core">kurdišćina</language>
+			<language type="ku" menu="extension">kurmandźišćina</language>
 			<language type="kum">kumykšćina</language>
 			<language type="kv">komišćina</language>
 			<language type="kw">kornišćina</language>
@@ -621,6 +624,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">China</territory>
 			<territory type="CO">Kolumbiska</territory>
 			<territory type="CP">Clippertonowa kupa</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kap Verde</territory>
@@ -848,42 +852,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">format měny</key>
 			<key type="collation">rjadowanski slěd</key>
 			<key type="currency">měna</key>
+			<key type="em">předstajenje emojija</key>
 			<key type="hc">hodźinowy cyklus (12 vs 24)</key>
 			<key type="lb">system łamanja linkow</key>
+			<key type="lw">łamanje linki w słowje</key>
 			<key type="ms">system měrow</key>
 			<key type="numbers">ličby</key>
+			<key type="ss">přetorhnjenje sady po skrótšence</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddhistiska protyka</type>
+			<type key="calendar" type="buddhist" scope="core">buddhistiska</type>
 			<type key="calendar" type="chinese">chinska protyka</type>
+			<type key="calendar" type="chinese" scope="core">chinska</type>
 			<type key="calendar" type="coptic">koptiska protyka</type>
+			<type key="calendar" type="coptic" scope="core">koptiska</type>
 			<type key="calendar" type="dangi">dangi-protyka</type>
+			<type key="calendar" type="dangi" scope="core">dangiska</type>
 			<type key="calendar" type="ethiopic">etiopiska protyka</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopiska</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopiska amete-alem-protyka</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopiska Amete-Alem</type>
 			<type key="calendar" type="gregorian">gregorianska protyka</type>
+			<type key="calendar" type="gregorian" scope="core">gregorianiska</type>
 			<type key="calendar" type="hebrew">židowska protyka</type>
+			<type key="calendar" type="hebrew" scope="core">hebrejska</type>
 			<type key="calendar" type="islamic">islamska protyka</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
 			<type key="calendar" type="islamic-civil">islamska ciwilna protyka</type>
+			<type key="calendar" type="islamic-civil" scope="core">islamska ciwilna</type>
 			<type key="calendar" type="islamic-umalqura">islamska umalqura-protyka</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islamska Umm al-Qura</type>
 			<type key="calendar" type="iso8601">protyka po iso-8601</type>
 			<type key="calendar" type="japanese">japanska protyka</type>
+			<type key="calendar" type="japanese" scope="core">japanska</type>
 			<type key="calendar" type="persian">persiska protyka</type>
+			<type key="calendar" type="persian" scope="core">persiska</type>
 			<type key="calendar" type="roc">protyka republiki China</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">knihiwjedniski format měny</type>
+			<type key="cf" type="account" scope="core">knihiwjednistwo</type>
 			<type key="cf" type="standard">standardny format měny</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="collation" type="ducet">rjadowanski slěd po Unicode</type>
+			<type key="collation" type="ducet" scope="core">standardne unicode-rjadowanje</type>
 			<type key="collation" type="search">powšitkowne pytanje</type>
+			<type key="collation" type="search" scope="core">pytaj</type>
 			<type key="collation" type="standard">standardowy rjadowanski slěd</type>
+			<type key="collation" type="standard" scope="core">standardne</type>
+			<type key="em" type="default" scope="core">default</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-hodźinowy cyklus (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-hodźinowy cyklus (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-hodźinowy cyklus (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-hodźinowy cyklus (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">swobodny stil łamanja linkow</type>
+			<type key="lb" type="loose" scope="core">wólny</type>
 			<type key="lb" type="normal">běžny stil łamanja linkow</type>
+			<type key="lb" type="normal" scope="core">běžny</type>
 			<type key="lb" type="strict">kruty stil łamanja linkow</type>
+			<type key="lb" type="strict" scope="core">kruty</type>
+			<type key="lw" type="breakall" scope="core">łamaj wšitko</type>
+			<type key="lw" type="keepall" scope="core">zdźerž wšitko</type>
+			<type key="lw" type="normal" scope="core">normalne</type>
+			<type key="lw" type="phrase" scope="core">w sadach</type>
 			<type key="ms" type="metric">metriski system</type>
+			<type key="ms" type="metric" scope="core">metriski</type>
 			<type key="ms" type="uksystem">britiski system měrow</type>
+			<type key="ms" type="uksystem" scope="core">britiski</type>
 			<type key="ms" type="ussystem">ameriski system měrow</type>
+			<type key="ms" type="ussystem" scope="core">ameriski</type>
 			<type key="numbers" type="arab">arabsko-indiske cyfry</type>
 			<type key="numbers" type="arabext">rozšěrjene arabsko-indiske cyfry</type>
 			<type key="numbers" type="armn">armenske cyfry</type>
@@ -924,6 +967,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">thailandske cyfry</type>
 			<type key="numbers" type="tibt">tibetske cyfry</type>
 			<type key="numbers" type="vaii">vaiske cyfry</type>
+			<type key="ss" type="none" scope="core">ně</type>
+			<type key="ss" type="standard" scope="core">haj</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metriski</measurementSystemName>
@@ -941,6 +986,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="auxiliary">[áàăâåäãąā æ ç ďđ éèĕêëėęē ğ íìĭîïİī ı ĺľ ňñ òŏôöőøō œ ŕ śş ß ť úùŭûůüűū ýÿ ż ź]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C Č Ć D {DŹ} E F G H {CH} I J K Ł L M N O P Q R S Š T U V W X Y Z Ž]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person" draft="contributed">[\- ‐‑ , . * / † ⚭]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>„</quotationStart>
@@ -1004,13 +1050,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h 'hodź'. B</dateFormatItem>
+						<dateFormatItem id="EBh">E h 'hodź'. B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
+						<dateFormatItem id="Eh">E h 'hodź'. a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
@@ -1018,6 +1068,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="H">HH 'hodź'.</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h 'hodź'. a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'hodź'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -1365,6 +1417,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'w' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'w' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1373,6 +1428,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'w' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'w' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1385,14 +1443,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">h 'hodź'. B</dateFormatItem>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="EBh">E, h 'hodź'. B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, H:mm 'hodź'.</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
@@ -1404,6 +1466,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
+						<dateFormatItem id="hv">h 'hodź'. a v</dateFormatItem>
+						<dateFormatItem id="Hv">H 'hodź'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -2479,9 +2543,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Bishkek">
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komory</exemplarCity>
 			</zone>
@@ -2639,9 +2700,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>zapadoafriski čas</generic>
-					<standard>zapadoafriski standardny čas</standard>
-					<daylight>zapadoafriski lětni čas</daylight>
+					<standard>zapadoafriski čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3006,6 +3065,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>guyanski čas</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>hawaiisko-aleutski standardny čas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>hawaiisko-aleutski čas</generic>
@@ -3595,6 +3659,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="latn">
+			<rationalUsage>druhdy</rationalUsage>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -3606,6 +3673,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4955,6 +5026,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">wuchodnokaribiske dolary</displayName>
 				<displayName count="other">wuchodnokaribiskich dolarow</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibiski gulden</displayName>
+				<displayName count="one">karibiski gulden</displayName>
+				<displayName count="two">karibiskej guldenaj</displayName>
+				<displayName count="few">karibiske guldeny</displayName>
+				<displayName count="other">karibiskich guldenow</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>CFA-frank (BCEAO)</displayName>
 				<displayName count="one">CFA-frank (BCEAO)</displayName>
@@ -4997,6 +5075,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">sambiske kwachi</displayName>
 				<displayName count="other">sambiskich kwachow</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>simbabwiske złoto</displayName>
+				<displayName count="one">simbabwiske złoto</displayName>
+				<displayName count="two">simbabwiskej złoće</displayName>
+				<displayName count="few">simbabwiske złota</displayName>
+				<displayName count="other">simbabwiskich złotow</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
@@ -5278,7 +5363,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} kuski</unitPattern>
 				<unitPattern count="other">{0} kuskow</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dźěle</displayName>
+				<unitPattern count="one">{0} dźěl</unitPattern>
+				<unitPattern count="two">{0} dźělej</unitPattern>
+				<unitPattern count="few">{0} dźěle</unitPattern>
+				<unitPattern count="other">{0} dźělow</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>milionćiny</displayName>
 				<unitPattern count="one">{0} milionćina</unitPattern>
 				<unitPattern count="two">{0} milionćinje</unitPattern>
@@ -5313,6 +5405,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} mole</unitPattern>
 				<unitPattern count="other">{0} molow</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukozy</displayName>
+				<unitPattern count="one">{0} glukozy</unitPattern>
+				<unitPattern count="two">{0} glukozy</unitPattern>
+				<unitPattern count="few">{0} glukozy</unitPattern>
+				<unitPattern count="other">{0} glukozy</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litry na kilometer</displayName>
 				<unitPattern count="one">{0} liter na kilometer</unitPattern>
@@ -6029,6 +6128,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} milimetry žiwoslěbroweho stołpika</unitPattern>
 				<unitPattern count="other">{0} milimetrow žiwoslěbroweho stołpika</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>žiwoslěbroweho stołpa</displayName>
+				<unitPattern count="one">{0} žiwoslěbroweho stołpa</unitPattern>
+				<unitPattern count="two">{0} žiwoslěbroweho stołpa</unitPattern>
+				<unitPattern count="few">{0} žiwoslěbroweho stołpa</unitPattern>
+				<unitPattern count="other">{0} žiwoslěbroweho stołpa</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>punty na kwadratny cól</displayName>
 				<unitPattern count="one">{0} punt na kwadratny cól</unitPattern>
@@ -6276,6 +6382,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} metriske šalki</unitPattern>
 				<unitPattern count="other">{0} metriskich šalkow</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriske běžite uncy</displayName>
+				<unitPattern count="one">{0} běžita unca</unitPattern>
+				<unitPattern count="two">{0} běžitej uncy</unitPattern>
+				<unitPattern count="few">{0} běžite uncy</unitPattern>
+				<unitPattern count="other">{0} metriskich běžitych uncow</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-stopy</displayName>
 				<unitPattern count="one">{0} acre-stopa</unitPattern>
@@ -6397,6 +6510,97 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} britiske běrtle</unitPattern>
 				<unitPattern count="other">{0} britiskich běrtlow</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiany</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="two">{0} steradianaj</unitPattern>
+				<unitPattern count="few">{0} steradiany</unitPattern>
+				<unitPattern count="other">{0} steradianow</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katale</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="two">{0} katalej</unitPattern>
+				<unitPattern count="few">{0} katale</unitPattern>
+				<unitPattern count="other">{0} katalow</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomby</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="two">{0} coulombaj</unitPattern>
+				<unitPattern count="few">{0} coulomby</unitPattern>
+				<unitPattern count="other">{0} coulombow</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farady</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="two">{0} faradaj</unitPattern>
+				<unitPattern count="few">{0} farady</unitPattern>
+				<unitPattern count="other">{0} faradow</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henryje</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="two">{0} henryjej</unitPattern>
+				<unitPattern count="few">{0} henryje</unitPattern>
+				<unitPattern count="other">{0} henryjow</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensy</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="two">{0} siemensaj</unitPattern>
+				<unitPattern count="few">{0} siemensy</unitPattern>
+				<unitPattern count="other">{0} siemensow</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorije [IT]</displayName>
+				<unitPattern count="one">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="two">{0} kaloriji [IT]</unitPattern>
+				<unitPattern count="few">{0} kalorije [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorijow [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bequerele</displayName>
+				<unitPattern count="one">{0} bequerel</unitPattern>
+				<unitPattern count="two">{0} bequerelej</unitPattern>
+				<unitPattern count="few">{0} bequerele</unitPattern>
+				<unitPattern count="other">{0} bequerelow</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverty</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="two">{0} sievertaj</unitPattern>
+				<unitPattern count="few">{0} sieverty</unitPattern>
+				<unitPattern count="other">{0} sievertow</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grayje</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="two">{0} grayjej</unitPattern>
+				<unitPattern count="few">{0} grayje</unitPattern>
+				<unitPattern count="other">{0} grayjow</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramy-forcy</displayName>
+				<unitPattern count="one">{0} kilogram-force</unitPattern>
+				<unitPattern count="two">{0} kilogramaj-forcaj</unitPattern>
+				<unitPattern count="few">{0} kilogramy-forcy</unitPattern>
+				<unitPattern count="other">{0} kilogramow-forcow</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesle</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="two">{0} teslej</unitPattern>
+				<unitPattern count="few">{0} tesle</unitPattern>
+				<unitPattern count="other">{0} teslow</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webery</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="two">{0} weberaj</unitPattern>
+				<unitPattern count="few">{0} webery</unitPattern>
+				<unitPattern count="other">{0} weberow</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>swětłowa spěšnosć</displayName>
 				<unitPattern count="one">{0} swětłowa spěšnosć</unitPattern>
@@ -6404,7 +6608,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} swětłowe spěšnosće</unitPattern>
 				<unitPattern count="other">{0} swětłowych spěšnosćow</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>miliardćina</displayName>
 				<unitPattern count="one">{0} miliardćina</unitPattern>
 				<unitPattern count="two">{0} miliardćinje</unitPattern>
@@ -6493,6 +6697,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} kusy</unitPattern>
 				<unitPattern count="other">{0} kusow</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>dźěl</displayName>
+				<unitPattern count="one">{0} dźěl</unitPattern>
+				<unitPattern count="two">{0} dźěl</unitPattern>
+				<unitPattern count="few">{0} dźěl</unitPattern>
+				<unitPattern count="other">{0} dźěl</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="two">{0} %</unitPattern>
@@ -6511,6 +6722,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="two">{0} Glc</unitPattern>
+				<unitPattern count="few">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6678,6 +6896,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} PS</unitPattern>
 				<unitPattern count="other">{0} PS</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="two">{0} Hg</unitPattern>
+				<unitPattern count="few">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>mph</displayName>
 				<unitPattern count="one">{0} mph</unitPattern>
@@ -6746,6 +6970,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-cup-metric">
 				<displayName>mc</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. fl oz</displayName>
+				<unitPattern count="one">{0} m. fl oz</unitPattern>
+				<unitPattern count="two">{0} m. fl oz</unitPattern>
+				<unitPattern count="few">{0} m. fl oz</unitPattern>
+				<unitPattern count="other">{0} m. fl oz</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gal</displayName>
 				<unitPattern count="one">{0} gal</unitPattern>
@@ -6839,6 +7070,86 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} šćipki</unitPattern>
 				<unitPattern count="other">{0} šćipkow</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="two">{0} sr</unitPattern>
+				<unitPattern count="few">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="two">{0} kat</unitPattern>
+				<unitPattern count="few">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="two">{0} C</unitPattern>
+				<unitPattern count="few">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="two">{0} F</unitPattern>
+				<unitPattern count="few">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="two">{0} H</unitPattern>
+				<unitPattern count="few">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="two">{0} S</unitPattern>
+				<unitPattern count="few">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="two">{0} cal-IT</unitPattern>
+				<unitPattern count="few">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="two">{0} Bq</unitPattern>
+				<unitPattern count="few">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="two">{0} Sv</unitPattern>
+				<unitPattern count="few">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="two">{0} Gy</unitPattern>
+				<unitPattern count="few">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="two">{0} kgf</unitPattern>
+				<unitPattern count="few">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="two">{0} T</unitPattern>
+				<unitPattern count="few">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="two">{0} Wb</unitPattern>
+				<unitPattern count="few">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>sw. spěšnosć</displayName>
 				<unitPattern count="one">{0} sw. spěšnosć</unitPattern>
@@ -6846,7 +7157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} sw. spěšnosće</unitPattern>
 				<unitPattern count="other">{0} sw. spěšnosćow</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>nano</displayName>
 				<unitPattern count="one">{0} nano</unitPattern>
 				<unitPattern count="two">{0} nano</unitPattern>
@@ -6981,7 +7292,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} c</unitPattern>
 				<unitPattern count="other">{0} c</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>n</displayName>
 				<unitPattern count="one">{0} n</unitPattern>
 				<unitPattern count="two">{0} n</unitPattern>
diff --git a/make/data/cldr/common/main/hu.xml b/make/data/cldr/common/main/hu.xml
index 2cfb4d16073..5872fdcad3a 100644
--- a/make/data/cldr/common/main/hu.xml
+++ b/make/data/cldr/common/main/hu.xml
@@ -297,6 +297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurd</language>
+			<language type="ku" menu="core">kurd</language>
+			<language type="ku" menu="extension">kurmandzsi</language>
 			<language type="kum">kumük</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -365,7 +367,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ms">maláj</language>
 			<language type="mt">máltai</language>
 			<language type="mua">mundang</language>
-			<language type="mul">többszörös nyelvek</language>
+			<language type="mul">több nyelv</language>
 			<language type="mus">krík</language>
 			<language type="mwl">mirandéz</language>
 			<language type="mwr">márvári</language>
@@ -831,7 +833,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kína</territory>
 			<territory type="CO">Kolumbia</territory>
 			<territory type="CP">Clipperton-sziget</territory>
-			<territory type="CQ" draft="contributed">Sark</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Zöld-foki Köztársaság</territory>
@@ -1132,33 +1134,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numerikus rendezés</key>
 			<key type="colStrength">Rendezés erőssége</key>
 			<key type="currency">Pénznem</key>
+			<key type="em">Emoji megjelenítése</key>
 			<key type="hc">Óraformátum (12 – 24)</key>
 			<key type="lb">Sortörés stílusa</key>
+			<key type="lw">Szavakon belüli sortörések</key>
 			<key type="ms">Mértékegységrendszer</key>
 			<key type="numbers">Számok</key>
+			<key type="ss">Mondattörés rövidítés után</key>
 			<key type="timezone">Időzóna</key>
 			<key type="va">Földrajzi helyvariáns</key>
 			<key type="x">Privát használatra</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddhista naptár</type>
+			<type key="calendar" type="buddhist" scope="core">Buddhista</type>
 			<type key="calendar" type="chinese">Kínai naptár</type>
+			<type key="calendar" type="chinese" scope="core">Kínai</type>
 			<type key="calendar" type="coptic">Kopt naptár</type>
+			<type key="calendar" type="coptic" scope="core">Kopt</type>
 			<type key="calendar" type="dangi">Dangi naptár</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Etióp naptár</type>
+			<type key="calendar" type="ethiopic" scope="core">Etióp</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etióp amete alem naptár</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etióp amete alem</type>
 			<type key="calendar" type="gregorian">Gergely-naptár</type>
+			<type key="calendar" type="gregorian" scope="core">Gergely</type>
 			<type key="calendar" type="hebrew">Héber naptár</type>
+			<type key="calendar" type="hebrew" scope="core">Héber</type>
 			<type key="calendar" type="indian">Indiai nemzeti naptár</type>
 			<type key="calendar" type="islamic">Hidzsra naptár</type>
+			<type key="calendar" type="islamic" scope="core">Hidzsra</type>
 			<type key="calendar" type="islamic-civil">Hidzsra naptár (táblázatos, polgári)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hidzsra (táblázatos, polgári)</type>
 			<type key="calendar" type="islamic-umalqura">Hidzsra naptár (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hidzsra (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 naptár</type>
 			<type key="calendar" type="japanese">Japán naptár</type>
+			<type key="calendar" type="japanese" scope="core">Japán</type>
 			<type key="calendar" type="persian">Perzsa naptár</type>
+			<type key="calendar" type="persian" scope="core">Perzsa</type>
 			<type key="calendar" type="roc">Kínai köztársasági naptár</type>
+			<type key="calendar" type="roc" scope="core">Kínai köztársasági</type>
 			<type key="cf" type="account">Könyvelési pénznemformátum</type>
+			<type key="cf" type="account" scope="core">Könyvelési</type>
 			<type key="cf" type="standard">Normál pénznemformátum</type>
+			<type key="cf" type="standard" scope="core">Normál</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Szimbólumok rendezése</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Rendezés szimbólumok figyelmen kívül hagyásával</type>
 			<type key="colBackwards" type="no" draft="contributed">Ékezetek normál rendezése</type>
@@ -1168,23 +1189,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Nagybetűs szavak rendezése előre</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Kis- és nagybetűket meg nem különböztető rendezés</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Rendezés kisbetű-nagybetű szerint</type>
-			<type key="collation" type="big5han">Hagyományos kínai sorrend - Big5</type>
 			<type key="collation" type="compat">Előző rendezési sorrend a kompatibilitás érdekében</type>
+			<type key="collation" type="compat" scope="core">Kompatibilitás</type>
 			<type key="collation" type="dictionary">Szótári rendezési sorrend</type>
+			<type key="collation" type="dictionary" scope="core">Szótári</type>
 			<type key="collation" type="ducet">Alapértelmezett Unicode rendezési sorrend</type>
+			<type key="collation" type="ducet" scope="core">Alapértelmezett Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">Emodzsi rendezési sorrend</type>
 			<type key="collation" type="eor">Európai rendezési szabályok</type>
-			<type key="collation" type="gb2312han">Egyszerűsített kínai sorrend - GB2312</type>
 			<type key="collation" type="phonebook">Telefonkönyv sorrend</type>
+			<type key="collation" type="phonebook" scope="core">Telefonkönyv</type>
 			<type key="collation" type="phonetic">Fonetikus rendezési sorrend</type>
+			<type key="collation" type="phonetic" scope="core">Fonetikus</type>
 			<type key="collation" type="pinyin">Pinyin sorrend</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Általános célú keresés</type>
+			<type key="collation" type="search" scope="core">Keresés</type>
 			<type key="collation" type="searchjl" draft="contributed">Keresés hangul kezdő mássalhangzó szerint</type>
 			<type key="collation" type="standard">Normál rendezési sorrend</type>
+			<type key="collation" type="standard" scope="core">Normál</type>
 			<type key="collation" type="stroke">Vonássorrend</type>
-			<type key="collation" type="traditional">Hagyományos</type>
+			<type key="collation" type="stroke" scope="core">Vonás</type>
+			<type key="collation" type="traditional">Hagyományos sorrend</type>
+			<type key="collation" type="traditional" scope="core">Hagyományos</type>
 			<type key="collation" type="unihan">Szótővonás rendezési sorrend</type>
+			<type key="collation" type="unihan" scope="core">Szótővonás</type>
 			<type key="collation" type="zhuyin">Zujin rendezési sorrend</type>
+			<type key="collation" type="zhuyin" scope="core">Zujin</type>
 			<type key="colNormalization" type="no" draft="contributed">Rendezés normalizálás nélkül</type>
 			<type key="colNormalization" type="yes" draft="contributed">Unicode szerinti normalizált rendezés</type>
 			<type key="colNumeric" type="no" draft="contributed">Számjegyek egyedi rendezése</type>
@@ -1197,18 +1228,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Teljes szélesség</type>
 			<type key="d0" type="hwidth">Fél szélesség</type>
 			<type key="d0" type="npinyin" draft="contributed">Szám</type>
+			<type key="em" type="default" scope="core">Alapértelmezett</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Szöveg</type>
 			<type key="hc" type="h11">12 órás rendszer (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 órás rendszer (0–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 órás rendszer (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 órás rendszer (0–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Tág stílusú sortörés</type>
+			<type key="lb" type="loose" scope="core">Tág</type>
 			<type key="lb" type="normal">Normál stílusú sortörés</type>
+			<type key="lb" type="normal" scope="core">Normál</type>
 			<type key="lb" type="strict">Szűk stílusú sortörés</type>
+			<type key="lb" type="strict" scope="core">Szűk</type>
+			<type key="lw" type="breakall" scope="core">Az összes törése</type>
+			<type key="lw" type="keepall" scope="core">Az összes megtartása</type>
+			<type key="lw" type="normal" scope="core">Normál</type>
+			<type key="lw" type="phrase" scope="core">Megtartás a kifejezéseknél</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">Méterrendszer</type>
+			<type key="ms" type="metric" scope="core">Méter</type>
 			<type key="ms" type="uksystem">Angolszász mértékegységrendszer</type>
+			<type key="ms" type="uksystem" scope="core">Angolszász</type>
 			<type key="ms" type="ussystem">Amerikai mértékegységrendszer</type>
+			<type key="ms" type="ussystem" scope="core">Amerikai</type>
 			<type key="numbers" type="arab">Arab-indiai számjegyek</type>
 			<type key="numbers" type="arabext">Kibővített arab-indiai számjegyek</type>
 			<type key="numbers" type="armn">Örmény számok</type>
@@ -1253,6 +1301,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Tibeti számjegyek</type>
 			<type key="numbers" type="traditional" draft="contributed">Hagyományos számok</type>
 			<type key="numbers" type="vaii">Vai számjegyek</type>
+			<type key="ss" type="none" scope="core">Ki</type>
+			<type key="ss" type="standard" scope="core">Be</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrikus</measurementSystemName>
@@ -1282,9 +1332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1412,23 +1459,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d., E</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y.</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG y/MM/dd</dateFormatItem>
+						<dateFormatItem id="GyM">G y. M.</dateFormatItem>
+						<dateFormatItem id="GyMd">G y. M. d.</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y. MMM d.</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y. MMM d., E</dateFormatItem>
@@ -1438,6 +1501,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">a h v</dateFormatItem>
 						<dateFormatItem id="Md">M. d.</dateFormatItem>
 						<dateFormatItem id="MEd">M. d., E</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d.</dateFormatItem>
@@ -1692,6 +1756,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="night1">éjjel</dayPeriod>
 							<dayPeriod type="night2">hajnal</dayPeriod>
 						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">éjfél</dayPeriod>
+							<dayPeriod type="noon">dél</dayPeriod>
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">de.</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjjel</dayPeriod>
+							<dayPeriod type="night2">hajnal</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="midnight">éjfél</dayPeriod>
 							<dayPeriod type="noon">dél</dayPeriod>
@@ -1704,6 +1778,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="morning1">reggel</dayPeriod>
+							<dayPeriod type="morning2">de.</dayPeriod>
+							<dayPeriod type="afternoon1">délután</dayPeriod>
+							<dayPeriod type="evening1">este</dayPeriod>
+							<dayPeriod type="night1">éjjel</dayPeriod>
+							<dayPeriod type="night2">hajnal</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="morning1">reggel</dayPeriod>
 							<dayPeriod type="morning2">délelőtt</dayPeriod>
@@ -1805,13 +1887,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d., E</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">G y.</dateFormatItem>
+						<dateFormatItem id="GyM">G y. MM.</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG y. MM. dd.</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y. MM. dd., E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y. MMM d.</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y. MMM d., E</dateFormatItem>
@@ -1823,6 +1909,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="hv">a h v</dateFormatItem>
 						<dateFormatItem id="Md">M. d.</dateFormatItem>
 						<dateFormatItem id="MEd">M. d., E</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d.</dateFormatItem>
@@ -2368,24 +2455,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Dubai">
 				<exemplarCity>Dubaj</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jereván</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
 				<exemplarCity>Vosztok</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Bécs</exemplarCity>
 			</zone>
@@ -2407,27 +2482,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
 			<zone type="America/Rio_Branco">
 				<exemplarCity>Río Branco</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="Asia/Thimphu">
 				<exemplarCity>Timpu</exemplarCity>
 			</zone>
@@ -2449,9 +2506,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Sanghaj</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
 			</zone>
@@ -2464,9 +2518,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Prága</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Africa/Djibouti">
 				<exemplarCity>Dzsibuti</exemplarCity>
 			</zone>
@@ -2583,7 +2634,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Biskek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Canton-sziget</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kiritimati-sziget</exemplarCity>
@@ -2651,9 +2702,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldív-szigetek</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahia Banderas</exemplarCity>
 			</zone>
@@ -2884,9 +2932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>nyugat-afrikai időzóna</generic>
-					<standard>nyugat-afrikai téli idő</standard>
-					<daylight>nyugat-afrikai nyári idő</daylight>
+					<standard>nyugat-afrikai időzóna</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3170,7 +3216,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic>közép-európai időzóna</generic>
+					<generic>közép-európai idő</generic>
 					<standard>közép-európai téli idő</standard>
 					<daylight>közép-európai nyári idő</daylight>
 				</long>
@@ -3292,6 +3338,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>guyanai téli idő</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>hawaii-aleuti téli idő</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>hawaii-aleuti időzóna</generic>
@@ -3742,6 +3793,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>truki idő</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Törökországi idő</generic>
+					<standard>Törökországi zónaidő</standard>
+					<daylight>Törökországi nyári idő</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>türkmenisztáni idő</generic>
@@ -3898,7 +3956,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4283,8 +4344,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="HNL">
 				<displayName>hondurasi lempira</displayName>
-				<displayName count="one">hondurasi lempira</displayName>
-				<displayName count="other">hondurasi lempira</displayName>
 			</currency>
 			<currency type="HRD">
 				<displayName>Horvát dínár</displayName>
@@ -4323,8 +4382,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="IRR">
 				<displayName>iráni riál</displayName>
-				<displayName count="one">iráni riál</displayName>
-				<displayName count="other">iráni riál</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>izlandi korona</displayName>
@@ -4431,8 +4488,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="MKD">
 				<displayName>macedón dénár</displayName>
-				<displayName count="one">macedón dénár</displayName>
-				<displayName count="other">macedón dénár</displayName>
 			</currency>
 			<currency type="MKN">
 				<displayName draft="contributed">macedón dénár (1992–1993)</displayName>
@@ -4529,8 +4584,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="OMR">
 				<displayName>ománi riál</displayName>
-				<displayName count="one">ománi riál</displayName>
-				<displayName count="other">ománi riál</displayName>
 			</currency>
 			<currency type="PAB">
 				<displayName>panamai balboa</displayName>
@@ -4572,8 +4625,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="QAR">
 				<displayName>katari riál</displayName>
-				<displayName count="one">katari riál</displayName>
-				<displayName count="other">katari riál</displayName>
 			</currency>
 			<currency type="RHD">
 				<displayName>rhodéziai dollár</displayName>
@@ -4588,8 +4639,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="RSD">
 				<displayName>szerb dinár</displayName>
-				<displayName count="one">szerb dinár</displayName>
-				<displayName count="other">szerb dinár</displayName>
 			</currency>
 			<currency type="RUB">
 				<displayName>orosz rubel</displayName>
@@ -4602,8 +4651,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="SAR">
 				<displayName>szaúdi riál</displayName>
-				<displayName count="one">szaúdi riál</displayName>
-				<displayName count="other">szaúdi riál</displayName>
 			</currency>
 			<currency type="SBD">
 				<displayName>salamon-szigeteki dollár</displayName>
@@ -4644,8 +4691,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="SLL">
 				<displayName>Sierra Leone-i leone (1964–2022)</displayName>
-				<displayName count="one">Sierra Leone-i leone (1964–2022)</displayName>
-				<displayName count="other">Sierra Leone-i leone (1964–2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>szomáli shilling</displayName>
@@ -4762,13 +4807,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="UYU">
 				<displayName>uruguayi peso</displayName>
-				<displayName count="one">uruguayi peso</displayName>
-				<displayName count="other">uruguayi peso</displayName>
 			</currency>
 			<currency type="UZS">
 				<displayName>üzbegisztáni szom</displayName>
-				<displayName count="one">üzbegisztáni szom</displayName>
-				<displayName count="other">üzbegisztáni szom</displayName>
 			</currency>
 			<currency type="VEB">
 				<displayName>Venezuelai bolivar (1871–2008)</displayName>
@@ -4817,6 +4858,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>kelet-karibi dollár</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibi forint</displayName>
+				<displayName count="one">karibi forint</displayName>
+				<displayName count="other">karibi forint</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
 			</currency>
@@ -4863,8 +4909,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="YER">
 				<displayName>jemeni riál</displayName>
-				<displayName count="one">jemeni riál</displayName>
-				<displayName count="other">jemeni riál</displayName>
 			</currency>
 			<currency type="YUD">
 				<displayName>Jugoszláv kemény dínár</displayName>
@@ -4905,6 +4949,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Zimbabwei dollár (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabwei arany</displayName>
+				<displayName count="one">zimbabwei arany</displayName>
+				<displayName count="other">zimbabwei arany</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwei dollár (2009)</displayName>
 			</currency>
@@ -5254,7 +5303,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="terminative">{0} itemig</unitPattern>
 				<unitPattern count="other" case="translative">{0} itemmé</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>rész</displayName>
+				<unitPattern count="one">{0} rész</unitPattern>
+				<unitPattern count="other">{0} rész</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0} részecske/millió</unitPattern>
 				<unitPattern count="one" case="accusative">{0} részecske/milliót</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} részecske/millióval</unitPattern>
@@ -5316,6 +5370,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="terminative">{0} mólig</unitPattern>
 				<unitPattern count="other" case="translative">{0} móllá</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glükóz</displayName>
+				<unitPattern count="one">{0} glükóz</unitPattern>
+				<unitPattern count="other">{0} glükóz</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilométer</displayName>
 				<unitPattern count="one">{0} liter per kilométer</unitPattern>
@@ -6381,6 +6440,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="terminative">{0} higanymilliméterig</unitPattern>
 				<unitPattern count="other" case="translative">{0} higanymilliméterré</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>higany</displayName>
+				<unitPattern count="one">{0} higany</unitPattern>
+				<unitPattern count="other">{0} higany</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>font per négyzethüvelyk</displayName>
 				<unitPattern count="one">{0} font per négyzethüvelyk</unitPattern>
@@ -6518,9 +6582,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} csomó</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName draft="contributed">Beaufort</displayName>
-				<unitPattern count="one" draft="contributed">Beaufort {0}</unitPattern>
-				<unitPattern count="other" draft="contributed">Beaufort {0}</unitPattern>
+				<displayName>Beaufort</displayName>
+				<unitPattern count="one">Beaufort {0}</unitPattern>
+				<unitPattern count="other">Beaufort {0}</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
 				<unitPattern count="one">{0} fok</unitPattern>
@@ -6749,6 +6813,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="terminative">{0} bögréig</unitPattern>
 				<unitPattern count="other" case="translative">{0} bögrévé</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrikus folyadékuncia</displayName>
+				<unitPattern count="one">{0} metrikus folyadékuncia</unitPattern>
+				<unitPattern count="other">{0} metrikus folyadékuncia</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>hold-láb</displayName>
 				<unitPattern count="one">{0} hold-láb</unitPattern>
@@ -6811,8 +6880,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} birodalmi kvart</unitPattern>
 				<unitPattern count="other">{0} birodalmi kvart</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>szteradián</displayName>
+				<unitPattern count="one">{0} szteradián</unitPattern>
+				<unitPattern count="other">{0} szteradián</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalória [IT]</displayName>
+				<unitPattern count="one">{0} kalória [IT]</unitPattern>
+				<unitPattern count="other">{0} kalória [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramm-erő</displayName>
+				<unitPattern count="one">{0} kilogramm-erő</unitPattern>
+				<unitPattern count="other">{0} kilogramm-erő</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>éjszakák</displayName>
 				<unitPattern count="one">{0} éjszaka</unitPattern>
 				<unitPattern count="one" case="accusative">{0} éjszakát</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} éjszakával</unitPattern>
@@ -6823,7 +6956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} éjszakával</unitPattern>
 				<unitPattern count="other" case="terminative">{0} éjszakáig</unitPattern>
 				<unitPattern count="other" case="translative">{0} éjszakává</unitPattern>
-				<perUnitPattern>{0}/éjszaka</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>kardinális irány</displayName>
@@ -6867,7 +6999,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmol/l</unitPattern>
 				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>rész</displayName>
+				<unitPattern count="one">{0} rész</unitPattern>
+				<unitPattern count="other">{0} rész</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>részecske/millió</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6876,6 +7013,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permille">
 				<displayName>ezrelék</displayName>
 			</unit>
+			<unit type="concentr-mole">
+				<displayName>mól</displayName>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7054,6 +7197,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="length-solar-radius">
 				<displayName>Nap-sugár</displayName>
 			</unit>
+			<unit type="light-candela">
+				<displayName>kandela</displayName>
+			</unit>
 			<unit type="mass-carat">
 				<displayName>Kt</displayName>
 				<unitPattern count="one">{0} Kt</unitPattern>
@@ -7209,6 +7355,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} bir. qt</unitPattern>
 				<unitPattern count="other">{0} bir. qt</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="duration-night">
 				<displayName>éjszakák</displayName>
 				<unitPattern count="one">{0} éjszaka</unitPattern>
@@ -7235,7 +7384,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/l</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>rész</displayName>
+				<unitPattern count="one">{0} rész</unitPattern>
+				<unitPattern count="other">{0} rész</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -7244,6 +7398,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permille">
 				<displayName>‰</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0} l/100 km</unitPattern>
 				<unitPattern count="other">{0} l/100 km</unitPattern>
@@ -7284,8 +7441,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Hgin</displayName>
 			</unit>
 			<unit type="speed-beaufort">
-				<unitPattern count="one" draft="contributed">B{0}</unitPattern>
-				<unitPattern count="other" draft="contributed">B{0}</unitPattern>
+				<unitPattern count="one">B{0}</unitPattern>
+				<unitPattern count="other">B{0}</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>fl.dr.</displayName>
@@ -7297,11 +7454,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} csi</unitPattern>
 				<unitPattern count="other">{0} csi</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>éjszakák</displayName>
-				<unitPattern count="one">{0} éjszaka</unitPattern>
-				<unitPattern count="other">{0} éjszaka</unitPattern>
-				<perUnitPattern>{0}/éjszaka</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/hy.xml b/make/data/cldr/common/main/hy.xml
index 08690355a5a..8c6d8cbc0b0 100644
--- a/make/data/cldr/common/main/hy.xml
+++ b/make/data/cldr/common/main/hy.xml
@@ -54,6 +54,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ay">այմարա</language>
 			<language type="az">ադրբեջաներեն</language>
 			<language type="ba">բաշկիրերեն</language>
+			<language type="bal">բելուջերեն</language>
 			<language type="ban">բալիերեն</language>
 			<language type="bas">բասաա</language>
 			<language type="be">բելառուսերեն</language>
@@ -253,6 +254,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">բաֆիա</language>
 			<language type="ksh">քյոլներեն</language>
 			<language type="ku">քրդերեն</language>
+			<language type="ku" menu="core">քրդերեն</language>
+			<language type="ku" menu="extension">քուրմանջի</language>
 			<language type="kum">կումիկերեն</language>
 			<language type="kv">կոմիերեն</language>
 			<language type="kw">կոռներեն</language>
@@ -697,6 +700,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Չինաստան</territory>
 			<territory type="CO">Կոլումբիա</territory>
 			<territory type="CP">Քլիփերթոն կղզի</territory>
+			<territory type="CQ">Սարկ կղզի</territory>
 			<territory type="CR">Կոստա Ռիկա</territory>
 			<territory type="CU">Կուբա</territory>
 			<territory type="CV">Կաբո Վերդե</territory>
@@ -936,42 +940,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">արժույթի ձևաչափ</key>
 			<key type="collation">տեսակավորման կարգ</key>
 			<key type="currency">արժույթ</key>
+			<key type="em">էմոջիների ներկայացում</key>
 			<key type="hc">Ժամանակային համակարգ (12 կամ 24)</key>
 			<key type="lb">տողանցման ոճ</key>
+			<key type="lw">Տողերի ընդհատումներ բառամիջում</key>
 			<key type="ms">չափման համակարգ</key>
 			<key type="numbers">թվեր</key>
+			<key type="ss">Նախադասության ընդհատում հապավումից հետո․</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">բուդդայական օրացույց</type>
+			<type key="calendar" type="buddhist" scope="core">բուդդայական</type>
 			<type key="calendar" type="chinese">չինական օրացույց</type>
+			<type key="calendar" type="chinese" scope="core">չինական</type>
 			<type key="calendar" type="coptic">ղպտական օրացույց</type>
+			<type key="calendar" type="coptic" scope="core">ղպտական</type>
 			<type key="calendar" type="dangi">դանգի օրացույց</type>
+			<type key="calendar" type="dangi" scope="core">դանգի</type>
 			<type key="calendar" type="ethiopic">եթովպական օրացույց</type>
+			<type key="calendar" type="ethiopic" scope="core">եթովպական</type>
 			<type key="calendar" type="ethiopic-amete-alem">եթովպական Ամետե Ալեմ օրացույց</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">եթովպական Ամետե Ալեմ</type>
 			<type key="calendar" type="gregorian">գրիգորյան օրացույց</type>
+			<type key="calendar" type="gregorian" scope="core">գրիգորյան</type>
 			<type key="calendar" type="hebrew">հրեական օրացույց</type>
+			<type key="calendar" type="hebrew" scope="core">հրեական</type>
 			<type key="calendar" type="islamic">հիջրայի օրացույց</type>
+			<type key="calendar" type="islamic" scope="core">հիջրա</type>
 			<type key="calendar" type="islamic-civil">հիջրայի քաղաքացիական օրացույց (աղյուսակային)</type>
+			<type key="calendar" type="islamic-civil" scope="core">հիջրա (աղյուսակային, քաղաքացիական)</type>
 			<type key="calendar" type="islamic-umalqura">հիջրայի օրացույց (Ում ալ Քուրա)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">հիջրա (Ում ալ Քուրա)</type>
 			<type key="calendar" type="iso8601">ISO-8601 օրացույց</type>
 			<type key="calendar" type="japanese">ճապոնական օրացույց</type>
+			<type key="calendar" type="japanese" scope="core">ճապոնական</type>
 			<type key="calendar" type="persian">պարսկական օրացույց</type>
-			<type key="calendar" type="roc">մինգուո օրացույց</type>
+			<type key="calendar" type="persian" scope="core">պարսկական</type>
+			<type key="calendar" type="roc">Մինգո օրացույց</type>
+			<type key="calendar" type="roc" scope="core">Մինգո</type>
 			<type key="cf" type="account">արժույթի հաշվապահական ձևաչափ</type>
+			<type key="cf" type="account" scope="core">հաշվապահական</type>
 			<type key="cf" type="standard">արժույթի ստանդարտ ձևաչափ</type>
-			<type key="collation" type="ducet">Յունիկոդ լռելյայն տեսակավորում</type>
+			<type key="cf" type="standard" scope="core">ստանդարտ</type>
+			<type key="collation" type="ducet">Unicode-ի կանխադրված տեսակավորում</type>
+			<type key="collation" type="ducet" scope="core">Unicode (կանխադրված)</type>
 			<type key="collation" type="search">որոնում</type>
+			<type key="collation" type="search" scope="core">որոնում</type>
 			<type key="collation" type="standard">տեսակավորման ստանդարտ կարգ</type>
+			<type key="collation" type="standard" scope="core">ստանդարտ</type>
+			<type key="em" type="default" scope="core">կանխադրված</type>
+			<type key="em" type="emoji" scope="core">էմոջի</type>
+			<type key="em" type="text" scope="core">տեքստ</type>
 			<type key="hc" type="h11">12-ժամյա համակարգ (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-ժամյա համակարգ (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-ժամյա համակարգ (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-ժամյա համակարգ (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">փափուկ տողանցում</type>
+			<type key="lb" type="loose" scope="core">փափուկ</type>
 			<type key="lb" type="normal">սովորական տողանցում</type>
+			<type key="lb" type="normal" scope="core">սովորական</type>
 			<type key="lb" type="strict">կոշտ տողանցում</type>
+			<type key="lb" type="strict" scope="core">կոշտ</type>
+			<type key="lw" type="breakall" scope="core">Ընդհատել բոլորը</type>
+			<type key="lw" type="keepall" scope="core">Պահել բոլորը</type>
+			<type key="lw" type="normal" scope="core">Սովորական</type>
+			<type key="lw" type="phrase" scope="core">Պահել արտահայտություններում</type>
 			<type key="ms" type="metric">մետրիկ համակարգ</type>
+			<type key="ms" type="metric" scope="core">մետրիկ</type>
 			<type key="ms" type="uksystem">անգլիական համակարգ</type>
+			<type key="ms" type="uksystem" scope="core">ՄԹ</type>
 			<type key="ms" type="ussystem">ամերիկյան համակարգ</type>
+			<type key="ms" type="ussystem" scope="core">ԱՄՆ</type>
 			<type key="numbers" type="arab">արաբա-հնդկական թվանշաններ</type>
 			<type key="numbers" type="arabext">արաբա-հնդկական թվերի ընդլայնված համակարգ</type>
 			<type key="numbers" type="armn">հայկական թվանշաններ</type>
@@ -1012,6 +1055,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">թայական թվանշաններ</type>
 			<type key="numbers" type="tibt">տիբեթական թվանշաններ</type>
 			<type key="numbers" type="vaii">վայական թվանշաններ</type>
+			<type key="ss" type="none" scope="core">Անջ․</type>
+			<type key="ss" type="standard" scope="core">Միաց․</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Մետրական</measurementSystemName>
@@ -1090,22 +1135,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h-ին</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm-ին</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm-ին</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d, ccc</dateFormatItem>
 						<dateFormatItem id="Gy">G y թ․</dateFormatItem>
-						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">GGGGG dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y թ․ MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y թ․ MMM d</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y թ․ MMM d, E</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hv">ժ․ HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y, G</dateFormatItem>
 						<dateFormatItem id="yyyy">y, G</dateFormatItem>
 						<dateFormatItem id="yyyyM">G y թ. MM</dateFormatItem>
@@ -1447,6 +1493,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h-ին</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm-ին</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h-ին</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm-ին</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d, ccc</dateFormatItem>
@@ -1455,23 +1502,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y թ.</dateFormatItem>
-						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">GGGGG dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y թ. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y թ․ MMM d</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y թ. MMM d, E</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hv">ժ․ HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">MMMM W-ին շաբաթ</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM W-րդ շաբաթ</dateFormatItem>
 						<dateFormatItem id="yM">MM.y</dateFormatItem>
 						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
-						<dateFormatItem id="yMEd">d.MM.y թ., E</dateFormatItem>
+						<dateFormatItem id="yMEd">d.MM.y, E</dateFormatItem>
 						<dateFormatItem id="yMMM">y թ. LLL</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM, y թ.</dateFormatItem>
 						<dateFormatItem id="yMMMEd">y թ. MMM d, E</dateFormatItem>
@@ -1493,6 +1541,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">B h:mm – h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y թ․ – G y թ․</greatestDifference>
 							<greatestDifference id="y">G y–y թթ․</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
@@ -2363,6 +2412,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Զատկի կղզի</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Կոյայկե</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Պունտա Արենաս</exemplarCity>
 			</zone>
@@ -2628,9 +2680,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Պնոմպեն</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Էնդերբերի կղզի</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Կանտոն</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3300,9 +3349,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Արևմտյան Աֆրիկայի ժամանակ</generic>
-					<standard>Արևմտյան Աֆրիկայի ստանդարտ ժամանակ</standard>
-					<daylight>Արևմտյան Աֆրիկայի ամառային ժամանակ</daylight>
+					<standard>Արևմտյան Աֆրիկայի ժամանակ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3652,6 +3699,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Գայանայի ժամանակ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Հավայան-ալեության ստանդարտ ժամանակ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Հավայան-ալեության ժամանակ</generic>
@@ -4156,6 +4208,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<otherNumberingSystems>
 			<traditional>armn</traditional>
 		</otherNumberingSystems>
+		<minimumGroupingDigits>2</minimumGroupingDigits>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group> </group>
@@ -4223,6 +4276,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4327,8 +4384,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="BWP">
 				<displayName>բոտսվանական պուլա</displayName>
-				<displayName count="one">բոտսվանական պուլա</displayName>
-				<displayName count="other">բոտսվանական պուլա</displayName>
 			</currency>
 			<currency type="BYN">
 				<displayName>բելառուսական ռուբլի</displayName>
@@ -4377,8 +4432,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="CZK">
 				<displayName>չեխական կրոնա</displayName>
-				<displayName count="one">չեխական կրոնա</displayName>
-				<displayName count="other">չեխական կրոնա</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName>Ջիբութիի ֆրանկ</displayName>
@@ -4684,8 +4737,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="THB">
 				<displayName>թաիլանդական բահտ</displayName>
-				<displayName count="one">թաիլանդական բահտ</displayName>
-				<displayName count="other">թաիլանդական բահտ</displayName>
 				<symbol>฿</symbol>
 			</currency>
 			<currency type="TJS">
@@ -4750,6 +4801,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>արևելակարիբյան դոլար</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>կարիբյան գուլդեն</displayName>
+				<displayName count="one">կարիբյան գուլդեն</displayName>
+				<displayName count="other">կարիբյան գուլդեն</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Արևմտյան Աֆրիկայի ԿՖԱ ֆրանկ</displayName>
 			</currency>
@@ -4773,6 +4829,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>զամբիական կվաչա</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Զիմբաբվեի ոսկի</displayName>
+				<displayName count="one">Զիմբաբվեի ոսկի</displayName>
+				<displayName count="other">Զիմբաբվեի ոսկի</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4960,7 +5021,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} աստիճանում</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName>րոպե</displayName>
 				<unitPattern count="one">{0} րոպե</unitPattern>
 				<unitPattern count="one" case="ablative">{0} րոպեից</unitPattern>
 				<unitPattern count="one" case="dative">{0} րոպեին</unitPattern>
@@ -4973,7 +5033,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} րոպեում</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName>վայրկյան</displayName>
 				<unitPattern count="one">{0} վայրկյան</unitPattern>
 				<unitPattern count="one" case="ablative">{0} վայրկյանից</unitPattern>
 				<unitPattern count="one" case="dative">{0} վայրկյանին</unitPattern>
@@ -5113,7 +5172,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} միույթով</unitPattern>
 				<unitPattern count="other" case="locative">{0} միույթում</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>մաս</displayName>
+				<unitPattern count="one">{0} մաս</unitPattern>
+				<unitPattern count="other">{0} մաս</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>մաս միլիոնի վրա</displayName>
 				<unitPattern count="one">{0} մաս միլիոնի վրա</unitPattern>
 				<unitPattern count="one" case="ablative">{0} մասից միլիոնի վրա</unitPattern>
@@ -5175,6 +5239,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} մոլով</unitPattern>
 				<unitPattern count="other" case="locative">{0} մոլում</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>գլյուկոզ</displayName>
+				<unitPattern count="one">{0} գլյուկոզ</unitPattern>
+				<unitPattern count="other">{0} գլյուկոզ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>լիտր կիլոմետրի վրա</displayName>
 				<unitPattern count="one">{0} լիտր կիլոմետրի վրա</unitPattern>
@@ -5380,7 +5449,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} տասնամյակում</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName>տարի</displayName>
 				<unitPattern count="one">{0} տարի</unitPattern>
 				<unitPattern count="one" case="ablative">{0} տարուց</unitPattern>
 				<unitPattern count="one" case="dative">{0} տարուն</unitPattern>
@@ -5448,7 +5516,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>օրական {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>ժամ</displayName>
 				<unitPattern count="one">{0} ժամ</unitPattern>
 				<unitPattern count="one" case="ablative">{0} ժամից</unitPattern>
 				<unitPattern count="one" case="dative">{0} ժամին</unitPattern>
@@ -5555,7 +5622,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} միլիամպերում</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>օհմ</displayName>
 				<unitPattern count="one">{0} օհմ</unitPattern>
 				<unitPattern count="one" case="ablative">{0} օհմից</unitPattern>
 				<unitPattern count="one" case="dative">{0} օհմին</unitPattern>
@@ -5757,7 +5823,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} em-ում</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
-				<displayName>փիքսել</displayName>
 				<unitPattern count="one">{0} փիքսել</unitPattern>
 				<unitPattern count="one" case="ablative">{0} փիքսելից</unitPattern>
 				<unitPattern count="one" case="dative">{0} փիքսելին</unitPattern>
@@ -5928,7 +5993,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} մղոն</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName>յարդ</displayName>
 				<unitPattern count="one">{0} յարդ</unitPattern>
 				<unitPattern count="other">{0} յարդ</unitPattern>
 			</unit>
@@ -5986,7 +6050,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} սկանդինավյան մղոնում</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<displayName>կտ</displayName>
 				<unitPattern count="one">{0} կտ</unitPattern>
 				<unitPattern count="one" case="ablative">{0} կտ</unitPattern>
 				<unitPattern count="one" case="dative">{0} կտ</unitPattern>
@@ -6232,17 +6295,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ձիաուժ</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName>միլիմետր՝ սնդիկի սյան</displayName>
-				<unitPattern count="one">{0} միլիմետր՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="one" case="ablative">{0} միլիմետրից՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="one" case="dative">{0} միլիմետրին՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="one" case="instrumental">{0} միլիմետրով՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="one" case="locative">{0} միլիմետրում՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="other">{0} միլիմետր՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="other" case="ablative">{0} միլիմետրից՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="other" case="dative">{0} միլիմետրին՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="other" case="instrumental">{0} միլիմետրով՝ սնդիկի սյան</unitPattern>
-				<unitPattern count="other" case="locative">{0} միլիմետրում՝ սնդիկի սյան</unitPattern>
+				<displayName>միլիմետր սնդիկի սյուն</displayName>
+				<unitPattern count="one">{0} միլիմետր սնդիկի սյուն</unitPattern>
+				<unitPattern count="one" case="ablative">{0} սնդիկի սյան միլիմետրից</unitPattern>
+				<unitPattern count="one" case="dative">{0} սնդիկի սյան միլիմետրին</unitPattern>
+				<unitPattern count="one" case="instrumental">{0} սնդիկի սյան միլիմետրով</unitPattern>
+				<unitPattern count="one" case="locative">{0} սնդիկի սյան միլիմետրում</unitPattern>
+				<unitPattern count="other">{0} միլիմետր սնդիկի սյուն</unitPattern>
+				<unitPattern count="other" case="ablative">{0} սնդիկի սյան միլիմետրից</unitPattern>
+				<unitPattern count="other" case="dative">{0} սնդիկի սյան միլիմետրին</unitPattern>
+				<unitPattern count="other" case="instrumental">{0} սնդիկի սյան միլիմետրով</unitPattern>
+				<unitPattern count="other" case="locative">{0} սնդիկի սյան միլիմետրում</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>սնդիկի սյուն</displayName>
+				<unitPattern count="one">{0} սնդիկի սյուն</unitPattern>
+				<unitPattern count="other">{0} սնդիկի սյուն</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ֆունտ քառակուսի դյույմի վրա</displayName>
@@ -6613,13 +6681,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} մետրիկ բաժակով</unitPattern>
 				<unitPattern count="other" case="locative">{0} մետրիկ բաժակում</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>մետրիկ հեղուկ ունկի</displayName>
+				<unitPattern count="one">{0} մետրիկ հեղուկ ունկի</unitPattern>
+				<unitPattern count="other">{0} մետրիկ հեղուկ ունկի</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ակրոֆուտ</displayName>
 				<unitPattern count="one">{0} ակրոֆուտ</unitPattern>
 				<unitPattern count="other">{0} ակրոֆուտ</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
-				<displayName>բուշել</displayName>
 				<unitPattern count="one">{0} բուշել</unitPattern>
 				<unitPattern count="other">{0} բուշել</unitPattern>
 			</unit>
@@ -6635,11 +6707,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} անգլիական գալոն</unitPattern>
 				<perUnitPattern>{0} անգլիական գալոնի վրա</perUnitPattern>
 			</unit>
-			<unit type="volume-pint">
-				<displayName>փինթ</displayName>
-			</unit>
 			<unit type="volume-cup">
-				<displayName>բաժակ</displayName>
 				<unitPattern count="one">{0} բաժակ</unitPattern>
 				<unitPattern count="other">{0} բաժակ</unitPattern>
 			</unit>
@@ -6678,11 +6746,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} անգլիական աղանդերի գդալ</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName>դրամ</displayName>
 				<unitPattern count="one">{0} դրամ</unitPattern>
 				<unitPattern count="other">{0} դրամ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ստեռադիան</displayName>
+				<unitPattern count="one">{0} ստեռադիան</unitPattern>
+				<unitPattern count="other">{0} ստեռադիան</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>կատալ</displayName>
+				<unitPattern count="one">{0} կատալ</unitPattern>
+				<unitPattern count="other">{0} կատալ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>կուլոն</displayName>
+				<unitPattern count="one">{0} կուլոն</unitPattern>
+				<unitPattern count="other">{0} կուլոն</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ֆարադ</displayName>
+				<unitPattern count="one">{0} ֆարադ</unitPattern>
+				<unitPattern count="other">{0} ֆարադ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>հենրի</displayName>
+				<unitPattern count="one">{0} հենրի</unitPattern>
+				<unitPattern count="other">{0} հենրի</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>սիմենս</displayName>
+				<unitPattern count="one">{0} սիմենս</unitPattern>
+				<unitPattern count="other">{0} սիմենս</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>միջազգային կալորիա</displayName>
+				<unitPattern count="one">{0} միջազգային կալորիա</unitPattern>
+				<unitPattern count="other">{0} միջազգային կալորիա</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>բեքերել</displayName>
+				<unitPattern count="one">{0} բեքերել</unitPattern>
+				<unitPattern count="other">{0} բեքերել</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>զիվերտ</displayName>
+				<unitPattern count="one">{0} զիվերտ</unitPattern>
+				<unitPattern count="other">{0} զիվերտ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>գրեյ</displayName>
+				<unitPattern count="one">{0} գրեյ</unitPattern>
+				<unitPattern count="other">{0} գրեյ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>կիլոգրամ-ուժ</displayName>
+				<unitPattern count="one">{0} կիլոգրամ-ուժ</unitPattern>
+				<unitPattern count="other">{0} կիլոգրամ-ուժ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>տեսլա</displayName>
+				<unitPattern count="one">{0} տեսլա</unitPattern>
+				<unitPattern count="other">{0} տեսլա</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>վեբեր</displayName>
+				<unitPattern count="one">{0} վեբեր</unitPattern>
+				<unitPattern count="other">{0} վեբեր</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>լույսի արագություն</displayName>
+				<unitPattern count="one">{0} լույսի արագություն</unitPattern>
+				<unitPattern count="other">{0} լույսի արագություն</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>մաս միլիարդի վրա</displayName>
 				<unitPattern count="one">{0} մաս միլիարդի վրա</unitPattern>
 				<unitPattern count="one" case="ablative">{0} մասից միլիարդի վրա</unitPattern>
@@ -6696,7 +6833,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} մասում միլիարդի վրա</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>գիշեր</displayName>
 				<unitPattern count="one">{0} գիշեր</unitPattern>
 				<unitPattern count="one" case="ablative">{0} գիշերից</unitPattern>
 				<unitPattern count="one" case="dative">{0} գիշերին</unitPattern>
@@ -6917,7 +7053,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} միույթ</unitPattern>
 				<unitPattern count="other">{0} միույթ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>մաս</displayName>
+				<unitPattern count="one">{0} մաս</unitPattern>
+				<unitPattern count="other">{0} մաս</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>մաս/միլիոն</displayName>
 				<unitPattern count="one">{0} մմվ</unitPattern>
 				<unitPattern count="other">{0} մմվ</unitPattern>
@@ -6933,6 +7074,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} մոլ</unitPattern>
 				<unitPattern count="other">{0} մոլ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>գլյուկոզ</displayName>
+				<unitPattern count="one">{0} գլյուկոզ</unitPattern>
+				<unitPattern count="other">{0} գլյուկոզ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>լ/կմ</displayName>
 				<unitPattern count="one">{0} լ/կմ</unitPattern>
@@ -7093,8 +7239,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>օհմ</displayName>
-				<unitPattern count="one">{0} Ω</unitPattern>
-				<unitPattern count="other">{0} Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName>Վ</displayName>
@@ -7438,6 +7582,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} մմ ս.ս.</unitPattern>
 				<unitPattern count="other">{0} մմ ս.ս.</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ս․ս․</displayName>
+				<unitPattern count="one">{0} ս․ս․</unitPattern>
+				<unitPattern count="other">{0} ս․ս․</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ֆ․/քառ․ դյմ</displayName>
 				<unitPattern count="one">{0} ֆ./քառ․ դյմ</unitPattern>
@@ -7605,6 +7754,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} մ․ բաժ․</unitPattern>
 				<unitPattern count="other">{0} մ․ բաժ․</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>մետրիկ հղ․ ու</displayName>
+				<unitPattern count="one">{0} մետրիկ հղ․ ու</unitPattern>
+				<unitPattern count="other">{0} մետրիկ հղ․ ու</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ակր ֆտ</displayName>
 				<unitPattern count="one">{0} ակր ֆտ</unitPattern>
@@ -7702,7 +7856,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} անգլիական քվարտ</unitPattern>
 				<unitPattern count="other">{0} անգլիական քվարտ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ստեռ</displayName>
+				<unitPattern count="one">{0} ստեռ</unitPattern>
+				<unitPattern count="other">{0} ստեռ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>կատ</displayName>
+				<unitPattern count="one">{0} կատ</unitPattern>
+				<unitPattern count="other">{0} կատ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Կլ</displayName>
+				<unitPattern count="one">{0} Կլ</unitPattern>
+				<unitPattern count="other">{0} Կլ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ֆարադ</displayName>
+				<unitPattern count="one">{0} Ֆ</unitPattern>
+				<unitPattern count="other">{0} Ֆ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>հն</displayName>
+				<unitPattern count="one">{0} հն</unitPattern>
+				<unitPattern count="other">{0} հն</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>Սմ</displayName>
+				<unitPattern count="one">{0} Սմ</unitPattern>
+				<unitPattern count="other">{0} Սմ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>միջազգային կալորիա</displayName>
+				<unitPattern count="one">{0} միջազգային կալորիա</unitPattern>
+				<unitPattern count="other">{0} միջազգային կալորիա</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Բք</displayName>
+				<unitPattern count="one">{0} Բք</unitPattern>
+				<unitPattern count="other">{0} Բք</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Զվ</displayName>
+				<unitPattern count="one">{0} Զվ</unitPattern>
+				<unitPattern count="other">{0} Զվ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Գր</displayName>
+				<unitPattern count="one">{0} Գր</unitPattern>
+				<unitPattern count="other">{0} Գր</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>կգ-ուժ</displayName>
+				<unitPattern count="one">{0} կգ-ուժ</unitPattern>
+				<unitPattern count="other">{0} կգ-ուժ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Տլ</displayName>
+				<unitPattern count="one">{0} Տլ</unitPattern>
+				<unitPattern count="other">{0} Տլ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Վբ</displayName>
+				<unitPattern count="one">{0} Վբ</unitPattern>
+				<unitPattern count="other">{0} Վբ</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>լույսի արագ․</displayName>
+				<unitPattern count="one">{0} լույսի արագ․</unitPattern>
+				<unitPattern count="other">{0} լույսի արագ․</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>մաս/միլիարդ</displayName>
 				<unitPattern count="one">{0} մմլրդվ</unitPattern>
 				<unitPattern count="other">{0} մմլրդվ</unitPattern>
@@ -7723,7 +7947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</unitLength>
 		<unitLength type="narrow">
 			<unit type="acceleration-g-force">
-				<displayName>g-ուժ</displayName>
 				<unitPattern count="one">{0}G</unitPattern>
 				<unitPattern count="other">{0}G</unitPattern>
 			</unit>
@@ -7738,12 +7961,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="angle-degree">
 				<displayName>աստ</displayName>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>րոպե</displayName>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>վայրկյան</displayName>
-			</unit>
 			<unit type="area-square-kilometer">
 				<unitPattern count="one">{0}կմ²</unitPattern>
 				<unitPattern count="other">{0}կմ²</unitPattern>
@@ -7769,7 +7986,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ակր</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName>յդ²</displayName>
 				<unitPattern count="one">{0}յդ²</unitPattern>
 				<unitPattern count="other">{0}յդ²</unitPattern>
 			</unit>
@@ -7793,7 +8009,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}միույթ</unitPattern>
 				<unitPattern count="other">{0}միույթ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>մ․</displayName>
+				<unitPattern count="one">{0} մ․</unitPattern>
+				<unitPattern count="other">{0} մ․</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>մմվ</displayName>
 				<unitPattern count="one">{0}մմվ</unitPattern>
 				<unitPattern count="other">{0}մմվ</unitPattern>
@@ -7808,6 +8029,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}մոլ</unitPattern>
 				<unitPattern count="other">{0}մոլ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>գլյուկոզ</displayName>
+				<unitPattern count="one">{0} գլյուկոզ</unitPattern>
+				<unitPattern count="other">{0} գլյուկոզ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}լ/կմ</unitPattern>
 				<unitPattern count="other">{0}լ/կմ</unitPattern>
@@ -7859,6 +8085,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}բիթ</unitPattern>
 				<unitPattern count="other">{0}բիթ</unitPattern>
 			</unit>
+			<unit type="duration-year">
+				<displayName>տ</displayName>
+			</unit>
 			<unit type="duration-month">
 				<displayName>ա</displayName>
 				<unitPattern count="one">{0}ա</unitPattern>
@@ -7900,7 +8129,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}մԱ</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName>օհմ</displayName>
 				<unitPattern count="one">{0} Ω</unitPattern>
 				<unitPattern count="other">{0}Ω</unitPattern>
 			</unit>
@@ -7955,11 +8183,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="graphics-pixel">
 				<displayName>կտ</displayName>
 			</unit>
-			<unit type="graphics-pixel-per-centimeter">
-				<displayName>կսմվ</displayName>
-				<unitPattern count="one">{0}կսմվ</unitPattern>
-				<unitPattern count="other">{0}կսմվ</unitPattern>
-			</unit>
 			<unit type="length-yard">
 				<displayName>յդ</displayName>
 				<unitPattern count="one">{0}յդ</unitPattern>
@@ -7983,9 +8206,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="length-fathom">
 				<displayName>ֆատոմ</displayName>
 			</unit>
-			<unit type="length-point">
-				<displayName>կտ</displayName>
-			</unit>
 			<unit type="light-lux">
 				<unitPattern count="one">{0}լք</unitPattern>
 				<unitPattern count="other">{0}լք</unitPattern>
@@ -8011,10 +8231,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
-				<displayName>ու</displayName>
 				<unitPattern count="one">{0}ու</unitPattern>
 				<unitPattern count="other">{0}ու</unitPattern>
-				<perUnitPattern>{0}/ու</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName>տ․ ու</displayName>
@@ -8034,12 +8252,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}M☉</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<unitPattern count="one">{0}կՎ</unitPattern>
-				<unitPattern count="other">{0}կՎ</unitPattern>
+				<unitPattern count="one">{0}կՎտ</unitPattern>
+				<unitPattern count="other">{0}կՎտ</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<unitPattern count="one">{0}Վ</unitPattern>
-				<unitPattern count="other">{0}Վ</unitPattern>
+				<unitPattern count="one">{0}Վտ</unitPattern>
+				<unitPattern count="other">{0}Վտ</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<unitPattern count="one">{0}մՎտ</unitPattern>
@@ -8049,8 +8267,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ձ/ու</unitPattern>
 				<unitPattern count="other">{0}ձ/ու</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>մմսս</displayName>
+				<unitPattern count="one">{0} մմսս</unitPattern>
+				<unitPattern count="other">{0} մմսս</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ս․ս․</displayName>
+				<unitPattern count="one">{0}սս</unitPattern>
+				<unitPattern count="other">{0}սս</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>մատ. ս.ս.</displayName>
 				<unitPattern count="one">{0}&quot; ս.ս.</unitPattern>
 				<unitPattern count="other">{0}&quot; ս. ս.</unitPattern>
 			</unit>
@@ -8137,8 +8364,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-pint-metric">
 				<displayName>մետր․ փինթեր</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>մետր․ հղ․ ու</displayName>
+				<unitPattern count="one">{0} մետր․ հղ․ ու</unitPattern>
+				<unitPattern count="other">{0} մետր․ հղ․ ու</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
-				<displayName>բուշել</displayName>
 				<unitPattern count="one">{0}բու</unitPattern>
 				<unitPattern count="other">{0}բու</unitPattern>
 			</unit>
@@ -8151,7 +8382,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}քվարտ</unitPattern>
 			</unit>
 			<unit type="volume-pint">
-				<displayName>փինթ</displayName>
 				<unitPattern count="one">{0}փինթ</unitPattern>
 				<unitPattern count="other">{0}փինթ</unitPattern>
 			</unit>
@@ -8192,13 +8422,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}պտղունց</unitPattern>
 				<unitPattern count="other">{0}պտղունց</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>կատ</displayName>
+				<unitPattern count="one">{0}կատ</unitPattern>
+				<unitPattern count="other">{0}կատ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ֆ</displayName>
+				<unitPattern count="one">{0} Ֆ</unitPattern>
+				<unitPattern count="other">{0} Ֆ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>միջազգային կալորիա</displayName>
+				<unitPattern count="one">{0} միջազգային կալորիա</unitPattern>
+				<unitPattern count="other">{0} միջազգային կալորիա</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Բք</displayName>
+				<unitPattern count="one">{0}Բք</unitPattern>
+				<unitPattern count="other">{0}Բք</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Զվ</displayName>
+				<unitPattern count="one">{0}Զվ</unitPattern>
+				<unitPattern count="other">{0}Զվ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Գր</displayName>
+				<unitPattern count="one">{0}Գր</unitPattern>
+				<unitPattern count="other">{0}Գր</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>կգ-ուժ</displayName>
+				<unitPattern count="one">{0}կգ-ուժ</unitPattern>
+				<unitPattern count="other">{0}կգ-ուժ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Տլ</displayName>
+				<unitPattern count="one">{0}Տլ</unitPattern>
+				<unitPattern count="other">{0}Տլ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Վբ</displayName>
+				<unitPattern count="one">{0}Վբ</unitPattern>
+				<unitPattern count="other">{0}Վբ</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>լ․ա․</displayName>
+				<unitPattern count="one">{0} լ․ա․</unitPattern>
+				<unitPattern count="other">{0} լ․ա․</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>մմլրդվ</displayName>
 				<unitPattern count="one">{0}մմլրդվ</unitPattern>
 				<unitPattern count="other">{0}մմլրդվ</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>գիշեր</displayName>
 				<unitPattern count="one">{0}/գ․</unitPattern>
 				<unitPattern count="other">{0}/գ․</unitPattern>
 				<perUnitPattern>{0}/գ․</perUnitPattern>
diff --git a/make/data/cldr/common/main/ia.xml b/make/data/cldr/common/main/ia.xml
index c6acc5a59d9..1f7e4296943 100644
--- a/make/data/cldr/common/main/ia.xml
+++ b/make/data/cldr/common/main/ia.xml
@@ -62,10 +62,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bm">bambara</language>
 			<language type="bn">bengalese</language>
 			<language type="bo">tibetano</language>
+			<language type="bqi">bakhtiari</language>
 			<language type="br">breton</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosniaco</language>
 			<language type="bss">akoose</language>
+			<language type="bua">buriato</language>
 			<language type="bug">buginese</language>
 			<language type="byn">blin</language>
 			<language type="ca">catalano</language>
@@ -88,6 +90,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ckb" alt="variant">kurdo sorani</language>
 			<language type="clc">chilcotin</language>
 			<language type="co">corso</language>
+			<language type="cop">copto</language>
 			<language type="crg">mitchif</language>
 			<language type="crj">cree del sud-est</language>
 			<language type="crk">cree del planas</language>
@@ -105,8 +108,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dar">dargwa</language>
 			<language type="dav">taita</language>
 			<language type="de">germano</language>
-			<language type="de_AT">germano austriac</language>
-			<language type="de_CH">alte germano suisse</language>
 			<language type="dgr">dogrib</language>
 			<language type="dje">zarma</language>
 			<language type="doi">dogri</language>
@@ -122,17 +123,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eka">ekajuk</language>
 			<language type="el">greco</language>
 			<language type="en">anglese</language>
-			<language type="en_AU">anglese australian</language>
-			<language type="en_CA">anglese canadian</language>
-			<language type="en_GB">anglese britannic</language>
-			<language type="en_GB" alt="short">anglese (GB)</language>
-			<language type="en_US">anglese american</language>
+			<language type="en_GB" alt="short">anglese (RU)</language>
 			<language type="en_US" alt="short">anglese (SUA)</language>
 			<language type="eo">esperanto</language>
 			<language type="es">espaniol</language>
-			<language type="es_419">espaniol latinoamerican</language>
-			<language type="es_ES">espaniol europee</language>
-			<language type="es_MX">espaniol mexican</language>
 			<language type="et">estoniano</language>
 			<language type="eu">basco</language>
 			<language type="ewo">ewondo</language>
@@ -145,8 +139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fo">feroese</language>
 			<language type="fon">fon</language>
 			<language type="fr">francese</language>
-			<language type="fr_CA">francese canadian</language>
-			<language type="fr_CH">francese suisse</language>
 			<language type="frc">francese cajun</language>
 			<language type="frr">frison septentrional</language>
 			<language type="fur">friulano</language>
@@ -170,9 +162,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hax">haida del sud</language>
 			<language type="he">hebreo</language>
 			<language type="hi">hindi</language>
-			<language type="hi_Latn" alt="variant">hinglish</language>
 			<language type="hil">hiligaynon</language>
 			<language type="hmn">hmong</language>
+			<language type="hnj">hmong njua</language>
 			<language type="hr">croato</language>
 			<language type="hsb">alte sorabo</language>
 			<language type="ht">creolo haitian</language>
@@ -210,6 +202,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kcg">tyap</language>
 			<language type="kde">makonde</language>
 			<language type="kea">capoverdiano</language>
+			<language type="kek">kekchi</language>
 			<language type="ken">kenyang</language>
 			<language type="kfo">koro</language>
 			<language type="kgp">kaingang</language>
@@ -236,6 +229,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafia</language>
 			<language type="ksh">coloniese</language>
 			<language type="ku">kurdo</language>
+			<language type="ku" menu="core">kurdo</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kumyko</language>
 			<language type="kv">komi</language>
 			<language type="kw">cornico</language>
@@ -268,6 +263,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lus">mizo</language>
 			<language type="luy">luyia</language>
 			<language type="lv">letton</language>
+			<language type="lzz">laz</language>
 			<language type="mad">madurese</language>
 			<language type="mag">magahi</language>
 			<language type="mai">maithili</language>
@@ -299,10 +295,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mul">plure linguas</language>
 			<language type="mus">creek</language>
 			<language type="mwl">mirandese</language>
+			<language type="mww">hmong daw</language>
 			<language type="my">birmano</language>
 			<language type="myv">erzya</language>
 			<language type="mzn">mazanderani</language>
 			<language type="na">nauru</language>
+			<language type="nan">min nan</language>
 			<language type="nap">napolitano</language>
 			<language type="naq">nama</language>
 			<language type="nb">norvegiano bokmål</language>
@@ -344,14 +342,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pap">papiamento</language>
 			<language type="pau">palauano</language>
 			<language type="pcm">pidgin nigerian</language>
+			<language type="pi">pali</language>
 			<language type="pis">pijin</language>
 			<language type="pl">polonese</language>
+			<language type="pms">pedemontese</language>
 			<language type="pqm">malecite-passamaquoddy</language>
 			<language type="prg">prussiano</language>
 			<language type="ps">pashto</language>
 			<language type="pt">portugese</language>
-			<language type="pt_BR">portugese de Brasil</language>
-			<language type="pt_PT">portugese de Portugal</language>
 			<language type="qu">quechua</language>
 			<language type="quc">kʼicheʼ</language>
 			<language type="raj">rajasthani</language>
@@ -384,6 +382,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="seh">sena</language>
 			<language type="ses">koyraboro senni</language>
 			<language type="sg">sango</language>
+			<language type="sgs">samogitiano</language>
 			<language type="sh">serbocroato</language>
 			<language type="shi">tachelhit</language>
 			<language type="shn">shan</language>
@@ -410,6 +409,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="str">salish del strictos</language>
 			<language type="su">sundanese</language>
 			<language type="suk">sukuma</language>
+			<language type="suz">sunuwar</language>
 			<language type="sv">svedese</language>
 			<language type="sw">swahili</language>
 			<language type="sw_CD">swahili del Congo</language>
@@ -869,6 +869,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="ethiopic">calendario ethiope</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendario ethiope Amete Alem</type>
 			<type key="calendar" type="gregorian">calendario gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
 			<type key="calendar" type="hebrew">calendario hebraic</type>
 			<type key="calendar" type="indian">calendario national indian</type>
 			<type key="calendar" type="islamic">calendario hegiric</type>
@@ -882,18 +883,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">calendario del Republica de China</type>
 			<type key="cf" type="account">formato de moneta pro contabilitate</type>
 			<type key="cf" type="standard">formato de moneta standard</type>
-			<type key="collation" type="big5han">ordinamento traditional chinese - Big5</type>
 			<type key="collation" type="compat">ordinamento previe, pro compatibilitate</type>
 			<type key="collation" type="dictionary">ordinamento de dictionario</type>
 			<type key="collation" type="ducet">ordinamento Unicode predefinite</type>
 			<type key="collation" type="emoji">ordinamento de emoji</type>
 			<type key="collation" type="eor">regulas europee de ordinamento</type>
-			<type key="collation" type="gb2312han">ordinamento chinese simplificate - GB2312</type>
 			<type key="collation" type="phonebook">ordinamento de annuario telephonic</type>
 			<type key="collation" type="pinyin">ordinamento pinyin</type>
 			<type key="collation" type="search">recerca generic</type>
 			<type key="collation" type="searchjl">recerca per consonante initial hangul</type>
 			<type key="collation" type="standard">ordinamento standard</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke">ordinamento de tractos</type>
 			<type key="collation" type="traditional">ordinamento traditional</type>
 			<type key="collation" type="unihan">ordinamento de tractos radical</type>
@@ -1017,6 +1017,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1025,6 +1028,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1041,13 +1047,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd-MM-y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h v</dateFormatItem>
 						<dateFormatItem id="Md">dd-MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd-MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1338,6 +1347,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1346,6 +1358,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1354,6 +1369,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1362,13 +1380,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -1377,6 +1400,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="hv">h v</dateFormatItem>
 						<dateFormatItem id="Md">dd-MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd-MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1994,10 +2018,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Citate incognite</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
+				<exemplarCity>Loco incognite</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bruxelles</exemplarCity>
@@ -2023,18 +2044,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Prague">
 				<exemplarCity>Praga</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Africa/Djibouti">
 				<exemplarCity>Djibuti</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canarias</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity>Feroe</exemplarCity>
 			</zone>
@@ -2156,6 +2168,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Indian/Mayotte">
 				<exemplarCity>Mayotta</exemplarCity>
 			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>hora de Acre</generic>
+					<standard>hora normal de Acre</standard>
+					<daylight>hora estive de Acre</daylight>
+				</long>
+			</metazone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>hora de Afghanistan</standard>
@@ -2173,14 +2192,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard>hora standard de Africa del Sud</standard>
+					<standard>hora normal de Africa del Sud</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>hora de Africa del West</generic>
-					<standard>hora standard de Africa del West</standard>
-					<daylight>hora estive de Africa del West</daylight>
+					<standard>hora de Africa del West</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2193,7 +2210,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Amazon">
 				<long>
 					<generic>hora de Amazonia</generic>
-					<standard>hora standard de Amazonia</standard>
+					<standard>hora normal de Amazonia</standard>
 					<daylight>hora estive de Amazonia</daylight>
 				</long>
 			</metazone>
@@ -2227,36 +2244,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>hora de Apia</generic>
-					<standard>hora standard de Apia</standard>
-					<daylight>hora estive de Apia</daylight>
+					<generic>hora de Samoa</generic>
+					<standard>hora normal de Samoa</standard>
+					<daylight>hora estive de Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
 					<generic>hora arabe</generic>
-					<standard>hora standard arabe</standard>
+					<standard>hora normal arabe</standard>
 					<daylight>hora estive arabe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
 					<generic>hora de Argentina</generic>
-					<standard>hora standard de Argentina</standard>
+					<standard>hora normal de Argentina</standard>
 					<daylight>hora estive de Argentina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
 					<generic>hora de Argentina occidental</generic>
-					<standard>hora standard de Argentina occidental</standard>
+					<standard>hora normal de Argentina occidental</standard>
 					<daylight>hora estive de Argentina occidental</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
 					<generic>hora de Armenia</generic>
-					<standard>hora standard de Armenia</standard>
+					<standard>hora normal de Armenia</standard>
 					<daylight>hora estive de Armenia</daylight>
 				</long>
 			</metazone>
@@ -2270,35 +2287,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Australia_Central">
 				<long>
 					<generic>hora de Australia central</generic>
-					<standard>hora standard de Australia central</standard>
+					<standard>hora normal de Australia central</standard>
 					<daylight>hora estive de Australia central</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
 					<generic>hora de Australia centro-occidental</generic>
-					<standard>hora standard de Australia centro-occidental</standard>
+					<standard>hora normal de Australia centro-occidental</standard>
 					<daylight>hora estive de Australia centro-occidental</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
 					<generic>hora de Australia oriental</generic>
-					<standard>hora standard de Australia oriental</standard>
+					<standard>hora normal de Australia oriental</standard>
 					<daylight>hora estive de Australia oriental</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
 					<generic>hora de Australia occidental</generic>
-					<standard>hora standard de Australia occidental</standard>
+					<standard>hora normal de Australia occidental</standard>
 					<daylight>hora estive de Australia occidental</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
 					<generic>hora de Azerbeidzhan</generic>
-					<standard>hora standard de Azerbeidzhan</standard>
+					<standard>hora normal de Azerbeidzhan</standard>
 					<daylight>hora estive de Azerbeidzhan</daylight>
 				</long>
 			</metazone>
@@ -2312,7 +2329,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Bangladesh">
 				<long>
 					<generic>hora de Bangladesh</generic>
-					<standard>hora standard de Bangladesh</standard>
+					<standard>hora normal de Bangladesh</standard>
 					<daylight>hora estive de Bangladesh</daylight>
 				</long>
 			</metazone>
@@ -2329,45 +2346,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Brasilia">
 				<long>
 					<generic>hora de Brasilia</generic>
-					<standard>hora standard de Brasilia</standard>
+					<standard>hora normal de Brasilia</standard>
 					<daylight>hora estive de Brasilia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>hora de Brunei Darussalam</standard>
+					<standard>hora de Brunei</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
 					<generic>hora de Capo Verde</generic>
-					<standard>hora standard de Capo Verde</standard>
+					<standard>hora normal de Capo Verde</standard>
 					<daylight>hora estive de Capo Verde</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>hora standard de Chamorro</standard>
+					<standard>hora normal de Chamorro</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
 					<generic>hora de Chatham</generic>
-					<standard>hora standard de Chatham</standard>
+					<standard>hora normal de Chatham</standard>
 					<daylight>hora estive de Chatham</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
 					<generic>hora de Chile</generic>
-					<standard>hora standard de Chile</standard>
+					<standard>hora normal de Chile</standard>
 					<daylight>hora estive de Chile</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
 					<generic>hora de China</generic>
-					<standard>hora standard de China</standard>
+					<standard>hora normal de China</standard>
 					<daylight>hora estive de China</daylight>
 				</long>
 			</metazone>
@@ -2384,14 +2401,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Colombia">
 				<long>
 					<generic>hora de Colombia</generic>
-					<standard>hora standard de Colombia</standard>
+					<standard>hora normal de Colombia</standard>
 					<daylight>hora estive de Colombia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
 					<generic>hora del Insulas Cook</generic>
-					<standard>hora standard del Insulas Cook</standard>
+					<standard>hora normal del Insulas Cook</standard>
 					<daylight>hora estive del Insulas Cook</daylight>
 				</long>
 			</metazone>
@@ -2409,18 +2426,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>hora de Dumont-d’Urville</standard>
+					<standard>hora de Dumont d’Urville</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>hora de Timor del Est</standard>
+					<standard>hora de Timor Oriental</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
 				<long>
 					<generic>hora del Insula de Pascha</generic>
-					<standard>hora standard del Insula de Pascha</standard>
+					<standard>hora normal del Insula de Pascha</standard>
 					<daylight>hora estive del Insula de Pascha</daylight>
 				</long>
 			</metazone>
@@ -2458,14 +2475,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Falkland">
 				<long>
 					<generic>hora del Insulas Falkland</generic>
-					<standard>hora standard del Insulas Falkland</standard>
+					<standard>hora normal del Insulas Falkland</standard>
 					<daylight>hora estive del Insulas Falkland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
 					<generic>hora de Fiji</generic>
-					<standard>hora standard de Fiji</standard>
+					<standard>hora normal de Fiji</standard>
 					<daylight>hora estive de Fiji</daylight>
 				</long>
 			</metazone>
@@ -2492,7 +2509,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Georgia">
 				<long>
 					<generic>hora de Georgia</generic>
-					<standard>hora standard de Georgia</standard>
+					<standard>hora normal de Georgia</standard>
 					<daylight>hora estive de Georgia</daylight>
 				</long>
 			</metazone>
@@ -2506,6 +2523,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>hora medie de Greenwich</standard>
 				</long>
 			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic>hora de Groenlandia</generic>
+					<standard>hora normal de Groenlandia</standard>
+					<daylight>hora estive de Groenlandia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>hora de Groenlandia oriental</generic>
@@ -2520,9 +2544,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>hora estive de Groenlandia occidental</daylight>
 				</long>
 			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>hora normal de Guam</standard>
+				</long>
+			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>hora standard del Golfo</standard>
+					<standard>hora normal del Golfo</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -2530,6 +2559,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>hora de Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>hora normal de Hawaii-Aleutianas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>hora de Hawaii-Aleutianas</generic>
@@ -2540,20 +2574,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Hong_Kong">
 				<long>
 					<generic>hora de Hongkong</generic>
-					<standard>hora standard de Hongkong</standard>
+					<standard>hora normal de Hongkong</standard>
 					<daylight>hora estive de Hongkong</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>hora de Hovd</generic>
-					<standard>hora standard de Hovd</standard>
-					<daylight>hora estive de Hovd</daylight>
+					<generic>hora de Khovd</generic>
+					<standard>hora normal de Khovd</standard>
+					<daylight>hora estive de Khovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>hora standard de India</standard>
+					<standard>hora normal de India</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -2584,7 +2618,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Iran">
 				<long>
 					<generic>hora de Iran</generic>
-					<standard>hora standard de Iran</standard>
+					<standard>hora normal de Iran</standard>
 					<daylight>hora estive de Iran</daylight>
 				</long>
 			</metazone>
@@ -2598,14 +2632,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Israel">
 				<long>
 					<generic>hora de Israel</generic>
-					<standard>hora standard de Israel</standard>
+					<standard>hora normal de Israel</standard>
 					<daylight>hora estive de Israel</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>hora de Japon</generic>
-					<standard>hora standard de Japon</standard>
+					<standard>hora normal de Japon</standard>
 					<daylight>hora estive de Japon</daylight>
 				</long>
 			</metazone>
@@ -2627,7 +2661,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Korea">
 				<long>
 					<generic>hora de Corea</generic>
-					<standard>hora standard de Corea</standard>
+					<standard>hora normal de Corea</standard>
 					<daylight>hora estive de Corea</daylight>
 				</long>
 			</metazone>
@@ -2656,7 +2690,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Lord_Howe">
 				<long>
 					<generic>hora de Lord Howe</generic>
-					<standard>hora standard de Lord Howe</standard>
+					<standard>hora normal de Lord Howe</standard>
 					<daylight>hora estive de Lord Howe</daylight>
 				</long>
 			</metazone>
@@ -2690,7 +2724,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Mauritius">
 				<long>
 					<generic>hora de Mauritio</generic>
-					<standard>hora standard de Mauritio</standard>
+					<standard>hora normal de Mauritio</standard>
 					<daylight>hora estive de Mauritio</daylight>
 				</long>
 			</metazone>
@@ -2709,7 +2743,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Mongolia">
 				<long>
 					<generic>hora de Ulan Bator</generic>
-					<standard>hora standard de Ulan Bator</standard>
+					<standard>hora normal de Ulan Bator</standard>
 					<daylight>hora estive de Ulan Bator</daylight>
 				</long>
 			</metazone>
@@ -2738,14 +2772,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="New_Caledonia">
 				<long>
 					<generic>hora de Nove Caledonia</generic>
-					<standard>hora standard de Nove Caledonia</standard>
+					<standard>hora normal de Nove Caledonia</standard>
 					<daylight>hora estive de Nove Caledonia</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
 					<generic>hora de Nove Zelanda</generic>
-					<standard>hora standard de Nove Zelanda</standard>
+					<standard>hora normal de Nove Zelanda</standard>
 					<daylight>hora estive de Nove Zelanda</daylight>
 				</long>
 			</metazone>
@@ -2764,14 +2798,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Norfolk">
 				<long>
 					<generic>hora del Insula Norfolk</generic>
-					<standard>hora standard del Insula Norfolk</standard>
+					<standard>hora normal del Insula Norfolk</standard>
 					<daylight>hora estive del Insula Norfolk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
 					<generic>hora de Fernando de Noronha</generic>
-					<standard>hora standard de Fernando de Noronha</standard>
+					<standard>hora normal de Fernando de Noronha</standard>
 					<daylight>hora estive de Fernando de Noronha</daylight>
 				</long>
 			</metazone>
@@ -2792,7 +2826,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Pakistan">
 				<long>
 					<generic>hora de Pakistan</generic>
-					<standard>hora standard de Pakistan</standard>
+					<standard>hora normal de Pakistan</standard>
 					<daylight>hora estive de Pakistan</daylight>
 				</long>
 			</metazone>
@@ -2809,21 +2843,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Paraguay">
 				<long>
 					<generic>hora de Paraguay</generic>
-					<standard>hora standard de Paraguay</standard>
+					<standard>hora normal de Paraguay</standard>
 					<daylight>hora estive de Paraguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
 					<generic>hora de Peru</generic>
-					<standard>hora standard de Peru</standard>
+					<standard>hora normal de Peru</standard>
 					<daylight>hora estive de Peru</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
 					<generic>hora del Philippinas</generic>
-					<standard>hora standard del Philippinas</standard>
+					<standard>hora normal del Philippinas</standard>
 					<daylight>hora estive del Philippinas</daylight>
 				</long>
 			</metazone>
@@ -2846,12 +2880,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>hora de Ponape</standard>
+					<standard>hora de Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>hora de Pyongyang</standard>
+					<standard>hora de Corea del Nord</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -2873,9 +2907,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>hora de Samoa</generic>
-					<standard>hora standard de Samoa</standard>
-					<daylight>hora estive de Samoa</daylight>
+					<generic>hora de Samoa american</generic>
+					<standard>hora normal de Samoa american</standard>
+					<daylight>hora estive de Samoa american</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -2885,7 +2919,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard>hora standard de Singapore</standard>
+					<standard>hora normal de Singapore</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
@@ -2915,9 +2949,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>hora de Taipei</generic>
-					<standard>hora standard de Taipei</standard>
-					<daylight>hora estive de Taipei</daylight>
+					<generic>hora de Taiwan</generic>
+					<standard>hora normal de Taiwan</standard>
+					<daylight>hora estive de Taiwan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -2933,7 +2967,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Tonga">
 				<long>
 					<generic>hora de Tonga</generic>
-					<standard>hora standard de Tonga</standard>
+					<standard>hora normal de Tonga</standard>
 					<daylight>hora estive de Tonga</daylight>
 				</long>
 			</metazone>
@@ -2945,7 +2979,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>hora de Turkmenistan</generic>
-					<standard>hora standard de Turkmenistan</standard>
+					<standard>hora normal de Turkmenistan</standard>
 					<daylight>hora estive de Turkmenistan</daylight>
 				</long>
 			</metazone>
@@ -2957,21 +2991,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Uruguay">
 				<long>
 					<generic>hora de Uruguay</generic>
-					<standard>hora standard de Uruguay</standard>
+					<standard>hora normal de Uruguay</standard>
 					<daylight>hora estive de Uruguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
 					<generic>hora de Uzbekistan</generic>
-					<standard>hora standard de Uzbekistan</standard>
+					<standard>hora normal de Uzbekistan</standard>
 					<daylight>hora estive de Uzbekistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
 					<generic>hora de Vanuatu</generic>
-					<standard>hora standard de Vanuatu</standard>
+					<standard>hora normal de Vanuatu</standard>
 					<daylight>hora estive de Vanuatu</daylight>
 				</long>
 			</metazone>
@@ -3098,6 +3132,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -3919,6 +3954,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dollar del Caribes Oriental</displayName>
 				<displayName count="other">dollares del Caribes Oriental</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>florino caribe</displayName>
+				<displayName count="one">florino caribe</displayName>
+				<displayName count="other">florinos caribe</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>franco CFA de Africa Occidental</displayName>
 				<displayName count="one">franco CFA de Africa Occidental</displayName>
@@ -3945,6 +3985,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZMW">
 				<displayName>kwacha zambian</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>auro de Zimbwabwe</displayName>
+				<displayName count="one">auro de Zimbwabwe</displayName>
+				<displayName count="other">auros de Zimbwabwe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
@@ -4108,7 +4153,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} millimol per litro</unitPattern>
 				<unitPattern count="other">{0} millimoles per litro</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes per million</displayName>
 				<unitPattern count="one">{0} parte per million</unitPattern>
 				<unitPattern count="other">{0} partes per million</unitPattern>
@@ -5254,11 +5299,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabelPattern type="compatibility">{0} — compatibilitate</characterLabelPattern>
 		<characterLabelPattern type="enclosed">{0} — inquadrate</characterLabelPattern>
 		<characterLabelPattern type="extended">{0} — extendite</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} a sinistra</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} a dextra</characterLabelPattern>
 		<characterLabelPattern type="miscellaneous">{0} — miscellanee</characterLabelPattern>
 		<characterLabelPattern type="other">{0} — altere</characterLabelPattern>
 		<characterLabelPattern type="scripts">scripturas — {0}</characterLabelPattern>
 		<characterLabelPattern type="strokes" count="one">{0} tractos</characterLabelPattern>
 		<characterLabelPattern type="strokes" count="other">{0} tractos</characterLabelPattern>
+		<characterLabelPattern type="subscript">subscripto {0}</characterLabelPattern>
+		<characterLabelPattern type="superscript">superscripto {0}</characterLabelPattern>
 		<characterLabel type="activities">activitate</characterLabel>
 		<characterLabel type="african_scripts">scriptura african</characterLabel>
 		<characterLabel type="american_scripts">scriptura american</characterLabel>
diff --git a/make/data/cldr/common/main/id.xml b/make/data/cldr/common/main/id.xml
index 590e7d58569..e72e2951c5b 100644
--- a/make/data/cldr/common/main/id.xml
+++ b/make/data/cldr/common/main/id.xml
@@ -297,6 +297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Dialek Kolsch</language>
 			<language type="ku">Kurdi</language>
+			<language type="ku" menu="core">Kurdi</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kut">Kutenai</language>
 			<language type="kv">Komi</language>
@@ -892,6 +894,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Tiongkok</territory>
 			<territory type="CO">Kolombia</territory>
 			<territory type="CP">Pulau Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Tanjung Verde</territory>
@@ -1195,35 +1198,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Pengurutan Numerik</key>
 			<key type="colStrength">Kekuatan Pengurutan</key>
 			<key type="currency">Mata Uang</key>
+			<key type="em">Tampilan Emoji</key>
 			<key type="hc">Siklus Jam (12 vs 24)</key>
 			<key type="lb">Gaya Pemisah Baris</key>
+			<key type="lw">Pemisah Baris di antara Kata</key>
 			<key type="ms">Sistem Pengukuran</key>
 			<key type="numbers">Angka</key>
+			<key type="ss">Pemisah Kalimat Setelah Singkatan</key>
 			<key type="timezone">Zona Waktu</key>
 			<key type="va">Varian Lokal</key>
 			<key type="x">Penggunaan Pribadi</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kalender Buddha</type>
+			<type key="calendar" type="buddhist" scope="core">Buddha</type>
 			<type key="calendar" type="chinese">Kalender Tionghoa</type>
+			<type key="calendar" type="chinese" scope="core">Tiongkok</type>
 			<type key="calendar" type="coptic">Kalender Koptik</type>
+			<type key="calendar" type="coptic" scope="core">Koptik</type>
 			<type key="calendar" type="dangi">Kalender Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kalender Etiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiopia</type>
 			<type key="calendar" type="ethiopic-amete-alem">Kalender Amete Alem Etiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem Etiopia</type>
 			<type key="calendar" type="gregorian">Kalender Gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Kalender Ibrani</type>
+			<type key="calendar" type="hebrew" scope="core">Ibrani</type>
 			<type key="calendar" type="indian">Kalender Nasional India</type>
 			<type key="calendar" type="islamic">Kalender Islam</type>
+			<type key="calendar" type="islamic" scope="core">Hijriah</type>
 			<type key="calendar" type="islamic-civil">Kalender Sipil Islam</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabular, epoch sipil)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">Kalender Islam (Arab Saudi, penglihatan)</type>
 			<type key="calendar" type="islamic-tbla">Kalender Astronomi Islam</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hijriah (tabular, epoch astronomi)</type>
 			<type key="calendar" type="islamic-umalqura">Kalender Islam (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijriah (tabular, Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Kalender ISO-8601</type>
 			<type key="calendar" type="japanese">Kalender Jepang</type>
+			<type key="calendar" type="japanese" scope="core">Jepang</type>
 			<type key="calendar" type="persian">Kalender Persia</type>
+			<type key="calendar" type="persian" scope="core">Persia</type>
 			<type key="calendar" type="roc">Kalender Min-guo</type>
+			<type key="calendar" type="roc" scope="core">Min-guo</type>
 			<type key="cf" type="account">Format Mata Uang Akuntansi</type>
+			<type key="cf" type="account" scope="core">Akuntansi</type>
 			<type key="cf" type="standard">Format Mata Uang Standar</type>
+			<type key="cf" type="standard" scope="core">Standar</type>
 			<type key="colAlternate" type="non-ignorable">Sortir Simbol</type>
 			<type key="colAlternate" type="shifted">Sortir Abaikan Simbol</type>
 			<type key="colBackwards" type="no">Sortir Aksen Secara Normal</type>
@@ -1233,23 +1256,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Sortir Huruf Besar Dahulu</type>
 			<type key="colCaseLevel" type="no">Sortir Tidak Peka Huruf Besar</type>
 			<type key="colCaseLevel" type="yes">Sortir Peka Huruf Besar</type>
-			<type key="collation" type="big5han">Aturan Pengurutan Tionghoa Tradisional - Big5</type>
 			<type key="collation" type="compat">Aturan Pengurutan Sebelumnya, untuk kompatibilitas</type>
+			<type key="collation" type="compat" scope="core">Kompatibilitas</type>
 			<type key="collation" type="dictionary">Aturan Pengurutan Kamus</type>
+			<type key="collation" type="dictionary" scope="core">Kamus</type>
 			<type key="collation" type="ducet">Aturan Pengurutan Unicode Default</type>
+			<type key="collation" type="ducet" scope="core">Unicode Default</type>
 			<type key="collation" type="emoji" draft="contributed">Urutan Sortir Emoji</type>
 			<type key="collation" type="eor">Aturan Pengurutan Eropa</type>
-			<type key="collation" type="gb2312han">Aturan Pengurutan Tionghoa (Sederhana) - GB2312</type>
 			<type key="collation" type="phonebook">Aturan Pengurutan Buku Telepon</type>
+			<type key="collation" type="phonebook" scope="core">Buku Telepon</type>
 			<type key="collation" type="phonetic">Aturan Pengurutan Fonetik</type>
+			<type key="collation" type="phonetic" scope="core">Fonetik</type>
 			<type key="collation" type="pinyin">Aturan Pengurutan Pinyin</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Pencarian Tujuan Umum</type>
+			<type key="collation" type="search" scope="core">Pencarian</type>
 			<type key="collation" type="searchjl">Pencarian Menurut Konsonan Awal Hangul</type>
 			<type key="collation" type="standard">Aturan Pengurutan Standar</type>
+			<type key="collation" type="standard" scope="core">Standar</type>
 			<type key="collation" type="stroke">Aturan Pengurutan Guratan</type>
+			<type key="collation" type="stroke" scope="core">Guratan</type>
 			<type key="collation" type="traditional">Aturan Pengurutan Tradisional</type>
+			<type key="collation" type="traditional" scope="core">Tradisional</type>
 			<type key="collation" type="unihan">Aturan Pengurutan Guratan Radikal</type>
+			<type key="collation" type="unihan" scope="core">Guratan Tradisional</type>
 			<type key="collation" type="zhuyin">Aturan Pengurutan Zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no">Sortir Tanpa Normalisasi</type>
 			<type key="colNormalization" type="yes">Sortir Unicode Dinormalisasi</type>
 			<type key="colNumeric" type="no">Sortir Digit Satu Per Satu</type>
@@ -1262,18 +1295,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Lebar penuh</type>
 			<type key="d0" type="hwidth">Lebar separuh</type>
 			<type key="d0" type="npinyin">Angka</type>
+			<type key="em" type="default" scope="core">Bawaan</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Teks</type>
 			<type key="hc" type="h11">Sistem 12 Jam (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Sistem 12 Jam (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Sistem 24 Jam (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Sistem 24 Jam (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Gaya Pemisah Baris Renggang</type>
+			<type key="lb" type="loose" scope="core">Renggang</type>
 			<type key="lb" type="normal">Gaya Pemisah Baris Normal</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Gaya Pemisah Baris Rapat</type>
+			<type key="lb" type="strict" scope="core">Rapat</type>
+			<type key="lw" type="breakall" scope="core">Pisah semua</type>
+			<type key="lw" type="keepall" scope="core">Pertahankan semua</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Pertahankan frasa</type>
 			<type key="m0" type="bgn">Transliterasi BGN AS</type>
 			<type key="m0" type="ungegn">Transliterasi GEGN PBB</type>
 			<type key="ms" type="metric">Sistem Metrik</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">Sistem Pengukuran Imperial</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Sistem Pengukuran AS</type>
+			<type key="ms" type="ussystem" scope="core">AS</type>
 			<type key="numbers" type="ahom" draft="contributed">Angka Ahom</type>
 			<type key="numbers" type="arab">Angka Arab Timur</type>
 			<type key="numbers" type="arabext">Angka Arab Timur Diperluas</type>
@@ -1356,6 +1406,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Angka Vai</type>
 			<type key="numbers" type="wara" draft="contributed">Angka Warang Citi</type>
 			<type key="numbers" type="wcho" draft="contributed">Angka Wancho</type>
+			<type key="ss" type="none" scope="core">Nonaktif</type>
+			<type key="ss" type="standard" scope="core">Aktif</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1385,11 +1437,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
-			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="stricter">
@@ -1452,15 +1500,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d" draft="contributed">d – d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="h" draft="contributed">h.mm – h.mm a</greatestDifference>
 							<greatestDifference id="m" draft="contributed">h.mm – h.mm a</greatestDifference>
@@ -1477,9 +1519,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H" draft="contributed">HH.mm – HH.mm v</greatestDifference>
 							<greatestDifference id="m" draft="contributed">HH.mm – HH.mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M" draft="contributed">M – M</greatestDifference>
 						</intervalFormatItem>
@@ -1615,6 +1654,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pukul' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pukul' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1623,6 +1665,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pukul' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pukul' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1645,15 +1690,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="Hv">HH'j' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1988,6 +2035,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pukul' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pukul' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1996,6 +2046,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pukul' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pukul' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2004,6 +2057,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -2012,6 +2068,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bhm">h.mm B</dateFormatItem>
@@ -2024,11 +2083,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
@@ -2103,10 +2163,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h.mm a – h.mm a</greatestDifference>
 							<greatestDifference id="h">h.mm–h.mm a</greatestDifference>
@@ -2125,10 +2181,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
 							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2281,6 +2333,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d" draft="contributed">d – d</greatestDifference>
@@ -2829,7 +2885,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Kota Tidak Dikenal</exemplarCity>
+				<exemplarCity>Lokasi Tidak Dikenal</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
 				<exemplarCity>Anguila</exemplarCity>
@@ -2890,7 +2946,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Roma</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Pulau Canton</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komoro</exemplarCity>
@@ -2964,6 +3020,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Pulau Wake</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Dakota Utara</exemplarCity>
 			</zone>
@@ -3005,9 +3064,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Waktu Afrika Barat</generic>
-					<standard>Waktu Standar Afrika Barat</standard>
-					<daylight>Waktu Musim Panas Afrika Barat</daylight>
+					<standard>Waktu Afrika Barat</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3435,6 +3492,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Waktu Standar Hawaii-Aleutian</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Waktu Hawaii-Aleutian</generic>
@@ -3909,6 +3974,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Waktu Turki</generic>
+					<standard>Waktu Standar Turki</standard>
+					<daylight>Waktu Musim Panas Turki</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Waktu Turkmenistan</generic>
@@ -4041,36 +4113,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other">¤0 rb</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">0 rb ¤</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 rb</pattern>
 					<pattern type="10000" count="other">¤00 rb</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">00 rb ¤</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 rb</pattern>
 					<pattern type="100000" count="other">¤000 rb</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">000 rb ¤</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 rb</pattern>
 					<pattern type="1000000" count="other">¤0 jt</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">0 jt ¤</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0 jt</pattern>
 					<pattern type="10000000" count="other">¤00 jt</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">00 jt ¤</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00 jt</pattern>
 					<pattern type="100000000" count="other">¤000 jt</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">000 jt ¤</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000 jt</pattern>
 					<pattern type="1000000000" count="other">¤0 M</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0 M ¤</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 M</pattern>
 					<pattern type="10000000000" count="other">¤00 M</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00 M ¤</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 M</pattern>
 					<pattern type="100000000000" count="other">¤000 M</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000 M ¤</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 M</pattern>
 					<pattern type="1000000000000" count="other">¤0 T</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0 T ¤</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 T</pattern>
 					<pattern type="10000000000000" count="other">¤00 T</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00 T ¤</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 T</pattern>
 					<pattern type="100000000000000" count="other">¤000 T</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000 T ¤</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4903,6 +4973,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Dolar Karibia Timur</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder Karibia</displayName>
+				<displayName count="other">Guilder Karibia</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Hak Khusus Menggambar</displayName>
 			</currency>
@@ -4978,6 +5052,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Dolar Zimbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Emas Zimbabwe</displayName>
+				<displayName count="other">emas Zimbabwe</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Dolar Zimbabwe (2009)</displayName>
 			</currency>
@@ -5172,7 +5250,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>millimol per liter</displayName>
 				<unitPattern count="other">{0} millimol per liter</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>bagian</displayName>
+				<unitPattern count="other">{0} bagian</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>bagian per juta</displayName>
 				<unitPattern count="other">{0} bagian per juta</unitPattern>
 			</unit>
@@ -5185,6 +5267,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<unitPattern count="other">{0} permyriad</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukosa</displayName>
+				<unitPattern count="other">{0} glukosa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter per kilometer</displayName>
 				<unitPattern count="other">{0} liter per kilometer</unitPattern>
@@ -5559,6 +5645,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>milimeter raksa</displayName>
 				<unitPattern count="other">{0} milimeter raksa</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>raksa</displayName>
+				<unitPattern count="other">{0} raksa</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pound per inci persegi</displayName>
 				<unitPattern count="other">{0} pound per inci persegi</unitPattern>
@@ -5693,6 +5783,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>metric cup</displayName>
 				<unitPattern count="other">{0} metric cup</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metric fluid ounce</displayName>
+				<unitPattern count="other">{0} metric fluid ounce</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ekar kaki</displayName>
 				<unitPattern count="other">{0} ekar kaki</unitPattern>
@@ -5758,17 +5852,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>quart Imp.</displayName>
 				<unitPattern count="other">{0} quart Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>cahaya</displayName>
-				<unitPattern count="other">{0} cahaya</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="other">{0} steradian</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemen</displayName>
+				<unitPattern count="other">{0} siemen</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori [IT]</displayName>
+				<unitPattern count="other">{0} kalori [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram gaya</displayName>
+				<unitPattern count="other">{0} kilogram gaya</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>bagian per miliar</displayName>
 				<unitPattern count="other">{0} bagian per miliar</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>malam</displayName>
-				<unitPattern count="other">{0} malam</unitPattern>
 				<perUnitPattern>{0} per malam</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -5825,8 +5965,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>millimol/liter</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>bagian</displayName>
+				<unitPattern count="other">{0} bagian</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>bagian/juta</displayName>
+				<unitPattern count="other">{0} bpj</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>persen</displayName>
@@ -5837,6 +5982,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>permyriad</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 			</unit>
@@ -6068,6 +6217,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mmHg</displayName>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>in Hg</displayName>
 			</unit>
@@ -6139,12 +6291,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>qt Imp.</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>cahaya</displayName>
 				<unitPattern count="other">{0} cahaya</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>bagian/miliar</displayName>
+				<unitPattern count="other">{0} bpm</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>malam</displayName>
@@ -6188,8 +6372,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/L</displayName>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>ppm</displayName>
+			<unit type="concentr-part">
+				<displayName>bagian</displayName>
+				<unitPattern count="other">{0} bagian</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>bpj</displayName>
+				<unitPattern count="other">{0}bpj</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
@@ -6200,6 +6389,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 			</unit>
@@ -6326,6 +6518,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>gr</displayName>
 				<unitPattern count="other">{0} gr</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ Hg</displayName>
 				<unitPattern count="other">{0}″ Hg</unitPattern>
@@ -6379,14 +6574,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>qt Imp</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>cahaya</displayName>
-				<unitPattern count="other">{0} cahaya</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>malam</displayName>
-				<unitPattern count="other">{0} malam</unitPattern>
-				<perUnitPattern>{0}/malam</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>bpm</displayName>
+				<unitPattern count="other">{0}bpm</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}T</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/ie.xml b/make/data/cldr/common/main/ie.xml
index 2d79e00936f..13ffcd1248d 100644
--- a/make/data/cldr/common/main/ie.xml
+++ b/make/data/cldr/common/main/ie.xml
@@ -66,13 +66,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dz" draft="unconfirmed">dzongkha</language>
 			<language type="el">grec</language>
 			<language type="en">anglesi</language>
-			<language type="en_AU" draft="unconfirmed">australian anglesi</language>
-			<language type="en_CA" draft="unconfirmed">canadian anglesi</language>
-			<language type="en_GB" draft="unconfirmed">britannic anglesi</language>
-			<language type="en_GB" alt="short" draft="unconfirmed">anglesi de UR</language>
-			<language type="en_US" draft="unconfirmed">american anglesi</language>
-			<language type="en_US" alt="short" draft="unconfirmed">anglesi de USA</language>
-			<language type="eo" draft="unconfirmed">Esperanto</language>
+			<language type="en_AU">australian anglesi</language>
+			<language type="en_CA">canadian anglesi</language>
+			<language type="en_GB">britannic anglesi</language>
+			<language type="en_GB" alt="short">anglesi de UR</language>
+			<language type="en_US">american anglesi</language>
+			<language type="en_US" alt="short">anglesi de USA</language>
+			<language type="eo">Esperanto</language>
 			<language type="es">hispan</language>
 			<language type="es_419">hispan del latin America</language>
 			<language type="es_ES">europan hispan</language>
@@ -81,26 +81,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu" draft="unconfirmed">basc</language>
 			<language type="fa">persian</language>
 			<language type="fa_AF" draft="unconfirmed">dari</language>
-			<language type="fi" draft="unconfirmed">finn</language>
-			<language type="fil" draft="unconfirmed">filipinesi</language>
+			<language type="fi">finn</language>
+			<language type="fil">filipinesi</language>
 			<language type="fj" draft="unconfirmed">fidjian</language>
 			<language type="fo" draft="unconfirmed">feroesi</language>
 			<language type="fr">francesi</language>
-			<language type="fr_CA" draft="unconfirmed">canadian francesi</language>
+			<language type="fr_CA">canadian francesi</language>
 			<language type="fr_CH">sviss francesi</language>
 			<language type="frc" draft="unconfirmed">cadjun-francesi</language>
 			<language type="frr" draft="unconfirmed">nord-frisian</language>
 			<language type="fy" draft="unconfirmed">west-frisian</language>
-			<language type="ga" draft="unconfirmed">irlandesi</language>
+			<language type="ga">irlandesi</language>
 			<language type="gd" draft="unconfirmed">scotian gaelic</language>
-			<language type="gl" draft="unconfirmed">galician</language>
+			<language type="gl">galician</language>
 			<language type="gsw" draft="unconfirmed">swiss-aleman</language>
-			<language type="ha" draft="unconfirmed">hausa</language>
+			<language type="ha">hausa</language>
 			<language type="hai" draft="unconfirmed">haidan</language>
 			<language type="haw" draft="unconfirmed">hawaian</language>
 			<language type="hax" draft="unconfirmed">sud-haidan</language>
-			<language type="he" draft="unconfirmed">hebreic</language>
-			<language type="hi" draft="unconfirmed">hindi</language>
+			<language type="he">hebreic</language>
+			<language type="hi">hindi</language>
 			<language type="hi_Latn" draft="unconfirmed">hindi latinisat</language>
 			<language type="hi_Latn" alt="variant" draft="unconfirmed">hinglish</language>
 			<language type="hr" draft="unconfirmed">croatian</language>
@@ -108,18 +108,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ht" draft="unconfirmed">haitian creol</language>
 			<language type="hu">hungarian</language>
 			<language type="hy" draft="unconfirmed">armenian</language>
-			<language type="ia" draft="unconfirmed">Interlingua</language>
+			<language type="ia">Interlingua</language>
 			<language type="id">indonesian</language>
 			<language type="ie">Interlingue</language>
 			<language type="ii" draft="unconfirmed">yi de Sichuan</language>
 			<language type="inh" draft="unconfirmed">ingush</language>
 			<language type="io" draft="unconfirmed">Ido</language>
-			<language type="is" draft="unconfirmed">islandesi</language>
+			<language type="is">islandesi</language>
 			<language type="it">italian</language>
 			<language type="ja">japanesi</language>
 			<language type="jbo" draft="unconfirmed">Lojban</language>
-			<language type="jv" draft="unconfirmed">javan</language>
-			<language type="ka" draft="unconfirmed">georgian</language>
+			<language type="jv">javan</language>
+			<language type="ka">georgian</language>
 			<language type="kk" draft="unconfirmed">kazakh</language>
 			<language type="ko">korean</language>
 			<language type="krl" draft="unconfirmed">karelian</language>
@@ -208,7 +208,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="swb" draft="unconfirmed">maoresi comoran</language>
 			<language type="syr" draft="unconfirmed">sirian</language>
 			<language type="tg" draft="unconfirmed">tadjic</language>
-			<language type="th" draft="unconfirmed">thai</language>
+			<language type="th">thai</language>
 			<language type="tk" draft="unconfirmed">turcmen</language>
 			<language type="tlh" draft="unconfirmed">Klingon</language>
 			<language type="tli" draft="unconfirmed">tlingit</language>
@@ -235,18 +235,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="zgh" draft="unconfirmed">standard maroccan tamazight</language>
 			<language type="zh">chinesi</language>
 			<language type="zh" alt="menu">chinesi, mandarin</language>
-			<language type="zh_Hans" draft="unconfirmed">chinesi simplificat</language>
-			<language type="zh_Hant" draft="unconfirmed">chinesi traditional</language>
+			<language type="zh_Hans">chinesi simplificat</language>
+			<language type="zh_Hant">chinesi traditional</language>
 			<language type="zu" draft="unconfirmed">zulu</language>
 			<language type="zxx" draft="unconfirmed">sin linguistic contenete</language>
 		</languages>
 		<scripts>
 			<script type="Arab">arabic</script>
-			<script type="Aran" draft="unconfirmed">nastalik</script>
+			<script type="Aran">nastalik</script>
 			<script type="Armn" draft="unconfirmed">armenian</script>
 			<script type="Beng" draft="unconfirmed">bengalic</script>
 			<script type="Bopo" draft="unconfirmed">bopomofo</script>
-			<script type="Brai" draft="unconfirmed">Braille</script>
+			<script type="Brai">Braille</script>
 			<script type="Cans" draft="unconfirmed">canadian sillabarium</script>
 			<script type="Cyrl">cirillic</script>
 			<script type="Deva" draft="unconfirmed">devanagari</script>
@@ -264,7 +264,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Hant" alt="stand-alone">han traditional</script>
 			<script type="Hebr" draft="unconfirmed">hebreic</script>
 			<script type="Hira" draft="unconfirmed">hiragana</script>
-			<script type="Hrkt" draft="unconfirmed">japanesi sillabariums</script>
+			<script type="Hrkt">japanesi sillabariums</script>
 			<script type="Jamo" draft="unconfirmed">jamo</script>
 			<script type="Jpan">japanesi</script>
 			<script type="Kana" draft="unconfirmed">katakana</script>
@@ -273,7 +273,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Kore">korean</script>
 			<script type="Laoo" draft="unconfirmed">laotic</script>
 			<script type="Latn">latin</script>
-			<script type="Mong" draft="unconfirmed">mongolian</script>
+			<script type="Mong">mongolian</script>
 			<script type="Mymr" draft="unconfirmed">birmesi</script>
 			<script type="Sinh" draft="unconfirmed">sinhalic</script>
 			<script type="Syrc" draft="unconfirmed">sirian</script>
@@ -281,8 +281,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Telu" draft="unconfirmed">telugu</script>
 			<script type="Thai" draft="unconfirmed">thai</script>
 			<script type="Tibt" draft="unconfirmed">tibetic</script>
-			<script type="Zmth" draft="unconfirmed">matematic notation</script>
-			<script type="Zsym" draft="unconfirmed">simboles</script>
+			<script type="Zmth">matematic notation</script>
+			<script type="Zsye">emoji</script>
+			<script type="Zsym">simboles</script>
 			<script type="Zxxx">ínscrit</script>
 			<script type="Zyyy" draft="unconfirmed">comun</script>
 			<script type="Zzzz">ínconosset scritura</script>
@@ -290,7 +291,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<territories>
 			<territory type="001">munde</territory>
 			<territory type="002">Africa</territory>
-			<territory type="003" draft="unconfirmed">septentrional America</territory>
+			<territory type="003">septentrional America</territory>
 			<territory type="005">Sud-America</territory>
 			<territory type="009">Oceania</territory>
 			<territory type="011" draft="unconfirmed">West-Africa</territory>
@@ -301,26 +302,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="018" draft="unconfirmed">meridional Africa</territory>
 			<territory type="019">Americas</territory>
 			<territory type="021">Nord-America</territory>
-			<territory type="029" draft="unconfirmed">Caribes</territory>
-			<territory type="030" draft="unconfirmed">Ost-Asia</territory>
-			<territory type="034" draft="unconfirmed">Sud-Asia</territory>
-			<territory type="035" draft="unconfirmed">Sudost-Asia</territory>
-			<territory type="039" draft="unconfirmed">Sud-Europa</territory>
-			<territory type="053" draft="unconfirmed">Australasia</territory>
-			<territory type="054" draft="unconfirmed">Melanesia</territory>
-			<territory type="057" draft="unconfirmed">region de Micronesia</territory>
-			<territory type="061" draft="unconfirmed">Polinesia</territory>
+			<territory type="029">Caribes</territory>
+			<territory type="030">Ost-Asia</territory>
+			<territory type="034">Sud-Asia</territory>
+			<territory type="035">Sudost-Asia</territory>
+			<territory type="039">Sud-Europa</territory>
+			<territory type="053">Australasia</territory>
+			<territory type="054">Melanesia</territory>
+			<territory type="057">region de Micronesia</territory>
+			<territory type="061">Polinesia</territory>
 			<territory type="142">Asia</territory>
-			<territory type="143" draft="unconfirmed">Central Asia</territory>
-			<territory type="145" draft="unconfirmed">West-Asia</territory>
+			<territory type="143">Central Asia</territory>
+			<territory type="145">West-Asia</territory>
 			<territory type="150">Europa</territory>
-			<territory type="151" draft="unconfirmed">Ost-Europa</territory>
-			<territory type="154" draft="unconfirmed">Nord-Europa</territory>
-			<territory type="155" draft="unconfirmed">West-Europa</territory>
+			<territory type="151">Ost-Europa</territory>
+			<territory type="154">Nord-Europa</territory>
+			<territory type="155">West-Europa</territory>
 			<territory type="202" draft="unconfirmed">Sub-Saharan Africa</territory>
 			<territory type="419">latin America</territory>
 			<territory type="AC" draft="unconfirmed">Insul de Ascension</territory>
-			<territory type="AD" draft="unconfirmed">Andorra</territory>
+			<territory type="AD">Andorra</territory>
 			<territory type="AE" draft="unconfirmed">Unit Arab Emiratus</territory>
 			<territory type="AF" draft="unconfirmed">Afghanistan</territory>
 			<territory type="AG" draft="unconfirmed">Antigua e Barbuda</territory>
@@ -334,7 +335,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AT">Austria</territory>
 			<territory type="AU" draft="unconfirmed">Australia</territory>
 			<territory type="AW" draft="unconfirmed">Aruba</territory>
-			<territory type="AX" draft="unconfirmed">Insules Åland</territory>
+			<territory type="AX">Insules Åland</territory>
 			<territory type="AZ" draft="unconfirmed">Azerbaidjan</territory>
 			<territory type="BA">Bosnia e Herzegovina</territory>
 			<territory type="BB" draft="unconfirmed">Barbados</territory>
@@ -355,7 +356,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BT" draft="unconfirmed">Bhutan</territory>
 			<territory type="BV" draft="unconfirmed">Insul Bouvet</territory>
 			<territory type="BW" draft="unconfirmed">Botswana</territory>
-			<territory type="BY" draft="unconfirmed">Bielorussia</territory>
+			<territory type="BY">Bielorussia</territory>
 			<territory type="BZ" draft="unconfirmed">Belize</territory>
 			<territory type="CA" draft="unconfirmed">Canada</territory>
 			<territory type="CC" draft="unconfirmed">Insules Cocos (Keeling)</territory>
@@ -372,6 +373,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN" draft="unconfirmed">China</territory>
 			<territory type="CO" draft="unconfirmed">Columbia</territory>
 			<territory type="CP" draft="unconfirmed">Insul Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR" draft="unconfirmed">Costa-Rica</territory>
 			<territory type="CU" draft="unconfirmed">Cuba</territory>
 			<territory type="CV" draft="unconfirmed">Cap-Verdi</territory>
@@ -409,9 +411,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GD" draft="unconfirmed">Grenada</territory>
 			<territory type="GE" draft="unconfirmed">Georgia</territory>
 			<territory type="GF" draft="unconfirmed">Francesi Guiana</territory>
-			<territory type="GG" draft="unconfirmed">Guernsey</territory>
+			<territory type="GG">Guernsey</territory>
 			<territory type="GH" draft="unconfirmed">Ghana</territory>
-			<territory type="GI" draft="unconfirmed">Gibraltar</territory>
+			<territory type="GI">Gibraltar</territory>
 			<territory type="GL" draft="unconfirmed">Greenland</territory>
 			<territory type="GM" draft="unconfirmed">Gambia</territory>
 			<territory type="GN" draft="unconfirmed">Guinea</territory>
@@ -434,7 +436,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ID">Indonesia</territory>
 			<territory type="IE">Irland</territory>
 			<territory type="IL" draft="unconfirmed">Israel</territory>
-			<territory type="IM" draft="unconfirmed">Insul de Man</territory>
+			<territory type="IM">Insul de Man</territory>
 			<territory type="IN">India</territory>
 			<territory type="IO" draft="unconfirmed">Chagos (BTIO)</territory>
 			<territory type="IO" alt="biot" draft="unconfirmed">Britanic Territoria del Indian Ocean</territory>
@@ -443,7 +445,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IR">Iran</territory>
 			<territory type="IS">Island</territory>
 			<territory type="IT">Italia</territory>
-			<territory type="JE" draft="unconfirmed">Jersey</territory>
+			<territory type="JE">Jersey</territory>
 			<territory type="JM" draft="unconfirmed">Jamaica</territory>
 			<territory type="JO" draft="unconfirmed">Jordania</territory>
 			<territory type="JP" draft="unconfirmed">Japan</territory>
@@ -461,17 +463,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="LA" draft="unconfirmed">Laos</territory>
 			<territory type="LB" draft="unconfirmed">Liban</territory>
 			<territory type="LC" draft="unconfirmed">St.-Lucia</territory>
-			<territory type="LI" draft="unconfirmed">Liechtenstein</territory>
+			<territory type="LI">Liechtenstein</territory>
 			<territory type="LK">Sri-Lanka</territory>
 			<territory type="LR" draft="unconfirmed">Liberia</territory>
 			<territory type="LS" draft="unconfirmed">Lesotho</territory>
-			<territory type="LT" draft="unconfirmed">Lituania</territory>
+			<territory type="LT">Lituania</territory>
 			<territory type="LU">Luxemburg</territory>
-			<territory type="LV" draft="unconfirmed">Lettonia</territory>
+			<territory type="LV">Lettonia</territory>
 			<territory type="LY" draft="unconfirmed">Libia</territory>
 			<territory type="MA" draft="unconfirmed">Marocco</territory>
 			<territory type="MC">Mónaco</territory>
-			<territory type="MD" draft="unconfirmed">Moldova</territory>
+			<territory type="MD">Moldova</territory>
 			<territory type="ME">Montenegro</territory>
 			<territory type="MF" draft="unconfirmed">St.-Martin</territory>
 			<territory type="MG" draft="unconfirmed">Madagascar</territory>
@@ -499,8 +501,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="NF">Insul Norfolk</territory>
 			<territory type="NG" draft="unconfirmed">Nigeria</territory>
 			<territory type="NI" draft="unconfirmed">Nicaragua</territory>
-			<territory type="NL" draft="unconfirmed">Nederland</territory>
-			<territory type="NO" draft="unconfirmed">Norvegia</territory>
+			<territory type="NL">Nederland</territory>
+			<territory type="NO">Norvegia</territory>
 			<territory type="NP" draft="unconfirmed">Nepal</territory>
 			<territory type="NR">Nauru</territory>
 			<territory type="NU" draft="unconfirmed">Niue</territory>
@@ -522,7 +524,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="PW">Palau</territory>
 			<territory type="PY" draft="unconfirmed">Paraguay</territory>
 			<territory type="QA" draft="unconfirmed">Qatar</territory>
-			<territory type="QO" draft="unconfirmed">periferic Oceania</territory>
+			<territory type="QO">periferic Oceania</territory>
 			<territory type="RE" draft="unconfirmed">Reunion</territory>
 			<territory type="RO">Rumania</territory>
 			<territory type="RS">Serbia</territory>
@@ -536,7 +538,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SG" draft="unconfirmed">Singapur</territory>
 			<territory type="SH" draft="unconfirmed">Sant-Helena</territory>
 			<territory type="SI">Slovenia</territory>
-			<territory type="SJ" draft="unconfirmed">Svalbard e Jan Mayen</territory>
+			<territory type="SJ">Svalbard e Jan Mayen</territory>
 			<territory type="SK">Slovakia</territory>
 			<territory type="SL" draft="unconfirmed">Sierra-Leone</territory>
 			<territory type="SM">San-Marino</territory>
@@ -575,7 +577,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="US" alt="short" draft="unconfirmed">US</territory>
 			<territory type="UY" draft="unconfirmed">Uruguay</territory>
 			<territory type="UZ" draft="unconfirmed">Uzbekistan</territory>
-			<territory type="VA" draft="unconfirmed">Cité de Vatican</territory>
+			<territory type="VA">Cité de Vatican</territory>
 			<territory type="VC" draft="unconfirmed">St. Vincent e Grenadines</territory>
 			<territory type="VE" draft="unconfirmed">Venezuela</territory>
 			<territory type="VG" draft="unconfirmed">Insules Vírginas (UR)</territory>
@@ -584,8 +586,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="VU">Vanuatu</territory>
 			<territory type="WF" draft="unconfirmed">Wallis e Futuna</territory>
 			<territory type="WS">Samoa</territory>
-			<territory type="XA" draft="unconfirmed">pseudo-diacritica</territory>
-			<territory type="XB" draft="unconfirmed">pseudo-bidi</territory>
+			<territory type="XA">pseudo-diacritica</territory>
+			<territory type="XB">pseudo-bidi</territory>
 			<territory type="XK">Kosovo</territory>
 			<territory type="YE" draft="unconfirmed">Yemen</territory>
 			<territory type="YT" draft="unconfirmed">Mayotte</territory>
@@ -666,7 +668,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<variant type="XSISTEMO" draft="unconfirmed">x-sistema</variant>
 		</variants>
 		<keys>
-			<key type="calendar" draft="unconfirmed">calendare</key>
+			<key type="calendar">calendare</key>
 			<key type="cf" draft="unconfirmed">formate de valuta</key>
 			<key type="collation" draft="unconfirmed">órdine</key>
 			<key type="currency" draft="unconfirmed">valuta</key>
@@ -675,27 +677,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="numbers" draft="unconfirmed">númeres</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist" draft="unconfirmed">buddhist calendare</type>
-			<type key="calendar" type="chinese" draft="unconfirmed">chinesi calendare</type>
-			<type key="calendar" type="coptic" draft="unconfirmed">coptic calendare</type>
-			<type key="calendar" type="ethiopic" draft="unconfirmed">etiopic calendare</type>
+			<type key="calendar" type="buddhist">buddhist calendare</type>
+			<type key="calendar" type="buddhist" scope="core">buddhist</type>
+			<type key="calendar" type="chinese">chinesi calendare</type>
+			<type key="calendar" type="chinese" scope="core">chinesi</type>
+			<type key="calendar" type="coptic">coptic calendare</type>
+			<type key="calendar" type="coptic" scope="core">coptic</type>
+			<type key="calendar" type="ethiopic">etiopic calendare</type>
 			<type key="calendar" type="gregorian">gregorian calendare</type>
-			<type key="calendar" type="hebrew" draft="unconfirmed">hebreic calendare</type>
-			<type key="calendar" type="islamic" draft="unconfirmed">calendare hejra</type>
-			<type key="calendar" type="iso8601" draft="unconfirmed">calendare ISO-8601</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
+			<type key="calendar" type="hebrew">hebreic calendare</type>
+			<type key="calendar" type="islamic">calendare hejra</type>
+			<type key="calendar" type="iso8601">gregorian (li annu in avan)</type>
 			<type key="calendar" type="japanese" draft="unconfirmed">japanesi calendare</type>
 			<type key="calendar" type="persian" draft="unconfirmed">persian calendare</type>
 			<type key="cf" type="account" draft="unconfirmed">formate por contation</type>
 			<type key="cf" type="standard" draft="unconfirmed">standard valuta-formate</type>
-			<type key="collation" type="big5han" draft="unconfirmed">órdine Big5</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">órdine de dictionarium</type>
 			<type key="collation" type="ducet" draft="unconfirmed">órdine predefinit de Unicode</type>
 			<type key="collation" type="eor" draft="unconfirmed">órdine paneuropan</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">órdine GB2312</type>
 			<type key="collation" type="phonebook" draft="unconfirmed">órdine de numerarium</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">órdine pinyin</type>
 			<type key="collation" type="search" draft="unconfirmed">órdine por sercha</type>
 			<type key="collation" type="standard">standard órdine</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke" draft="unconfirmed">órdine de strecs</type>
 			<type key="collation" type="unihan" draft="unconfirmed">órdine de radicales</type>
 			<type key="hc" type="h11" draft="unconfirmed">sistema 12-hor (0..11)</type>
@@ -1050,10 +1055,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4" draft="unconfirmed">T4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">1-m trimestre</quarter>
-							<quarter type="2" draft="unconfirmed">2-m trimestre</quarter>
-							<quarter type="3" draft="unconfirmed">3-m trimestre</quarter>
-							<quarter type="4" draft="unconfirmed">4-m trimestre</quarter>
+							<quarter type="1">1-m trimestre</quarter>
+							<quarter type="2">2-m trimestre</quarter>
+							<quarter type="3">3-m trimestre</quarter>
+							<quarter type="4">4-m trimestre</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
@@ -1176,13 +1181,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="H" draft="unconfirmed">H 'h'.</dateFormatItem>
+						<dateFormatItem id="H">H 'h'.</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h'. 'de' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">W-'im' 'semane' 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="yM">M.y</dateFormatItem>
 						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
 						<dateFormatItem id="yMEd">E d.M.y</dateFormatItem>
@@ -1192,10 +1197,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-						<dateFormatItem id="yw" count="other">w-'im' 'semane' 'de' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} til {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} til {1}</intervalFormatFallback>
 						<intervalFormatItem id="Bh">
 							<greatestDifference id="h" draft="unconfirmed">h – h B</greatestDifference>
 						</intervalFormatItem>
@@ -1329,114 +1333,90 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">ultim annu</relative>
 				<relative type="0">ho-annu</relative>
 				<relative type="1">sequent annu</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} annus</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} annus</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="year-short">
 				<relative type="-1" draft="unconfirmed">ultim annu</relative>
 				<relative type="0" draft="unconfirmed">ho-annu</relative>
 				<relative type="1" draft="unconfirmed">seq. annu</relative>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="year-narrow">
 				<displayName>a</displayName>
 				<relative type="-1" draft="unconfirmed">ult. a.</relative>
 				<relative type="0" draft="unconfirmed">ho-a.</relative>
 				<relative type="1" draft="unconfirmed">seq. a.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} a</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} a</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="quarter">
 				<displayName>trimestre</displayName>
 				<relative type="-1" draft="unconfirmed">ultim trimestre</relative>
 				<relative type="0" draft="unconfirmed">ho-trimestre</relative>
 				<relative type="1" draft="unconfirmed">sequent trimestre</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} trimestres</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} trimestres</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="quarter-short">
 				<displayName draft="unconfirmed">trim.</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} tr</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} tr</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="quarter-narrow">
-				<displayName draft="unconfirmed">tr</displayName>
+				<displayName>tr</displayName>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="month">
 				<displayName>mensu</displayName>
-				<relative type="-1" draft="unconfirmed">ultim mensu</relative>
-				<relative type="0" draft="unconfirmed">ho-mensu</relative>
-				<relative type="1" draft="unconfirmed">sequent mensu</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} mensus</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} mensus</relativeTimePattern>
-				</relativeTime>
+				<relative type="-1">ultim mensu</relative>
+				<relative type="0">ho-mensu</relative>
+				<relative type="1">sequent mensu</relative>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="month-short">
-				<displayName draft="unconfirmed">mn.</displayName>
+				<displayName>mn.</displayName>
 				<relative type="-1" draft="unconfirmed">ultim mensu</relative>
 				<relative type="0" draft="unconfirmed">ho-mensu</relative>
 				<relative type="1" draft="unconfirmed">seq. mensu</relative>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="month-narrow">
-				<displayName draft="unconfirmed">mn</displayName>
+				<displayName>mn</displayName>
 				<relative type="-1" draft="unconfirmed">ult. mn.</relative>
 				<relative type="0" draft="unconfirmed">ho-mn.</relative>
 				<relative type="1" draft="unconfirmed">seq. mn.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} mn</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} mn</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="week">
 				<displayName>semane</displayName>
 				<relative type="-1" draft="unconfirmed">ultim semane</relative>
 				<relative type="0" draft="unconfirmed">ho-semane</relative>
 				<relative type="1" draft="unconfirmed">sequent semane</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} semanes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} semanes</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 				<relativePeriod draft="unconfirmed">li semane de {0}</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName draft="unconfirmed">sem.</displayName>
+				<displayName>sem.</displayName>
 				<relative type="-1" draft="unconfirmed">ultim semane</relative>
 				<relative type="0" draft="unconfirmed">ho-semane</relative>
 				<relative type="1" draft="unconfirmed">seq. semane</relative>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="week-narrow">
-				<displayName draft="unconfirmed">sem</displayName>
+				<displayName>sem</displayName>
 				<relative type="-1" draft="unconfirmed">ult. sem.</relative>
 				<relative type="0" draft="unconfirmed">ho sem.</relative>
 				<relative type="1" draft="unconfirmed">seq. sem.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} sem.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} sem.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 				<relativePeriod draft="unconfirmed">sem. de {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
@@ -1447,26 +1427,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="day">
 				<displayName>die</displayName>
-				<relative type="-2" draft="unconfirmed">anteyer</relative>
+				<relative type="-2">anteyer</relative>
 				<relative type="-1">yer</relative>
 				<relative type="0">hodie</relative>
 				<relative type="1">deman</relative>
-				<relative type="2" draft="unconfirmed">posdeman</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} dies</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} dies</relativeTimePattern>
-				</relativeTime>
+				<relative type="2">posdeman</relative>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
+			</field>
+			<field type="day-short">
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="day-narrow">
 				<displayName>d</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} d</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} d</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="dayOfYear">
 				<displayName draft="unconfirmed">die del annu</displayName>
@@ -1475,7 +1451,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">die/annu</displayName>
 			</field>
 			<field type="weekday">
-				<displayName draft="unconfirmed">die del semane</displayName>
+				<displayName>die del semane</displayName>
 			</field>
 			<field type="weekday-short">
 				<displayName draft="unconfirmed">die del sem.</displayName>
@@ -1493,211 +1469,127 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1" draft="unconfirmed">ultim soledí</relative>
 				<relative type="0" draft="unconfirmed">ho-soledí</relative>
 				<relative type="1" draft="unconfirmed">sequent soledí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} soledís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} soledís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="sun-short">
 				<relative type="-1" draft="unconfirmed">ult. sol.</relative>
 				<relative type="0" draft="unconfirmed">ho-sol.</relative>
 				<relative type="1" draft="unconfirmed">seq. sol.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} sol.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} sol.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="sun-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} so.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} so.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="mon">
 				<relative type="-1" draft="unconfirmed">ultim lunedí</relative>
 				<relative type="0" draft="unconfirmed">ho-lunedí</relative>
 				<relative type="1" draft="unconfirmed">sequent lunedí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} lunedís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} lunedís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="mon-short">
 				<relative type="-1" draft="unconfirmed">ult. lun.</relative>
 				<relative type="0" draft="unconfirmed">ho-lun.</relative>
 				<relative type="1" draft="unconfirmed">seq. lun.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} lun.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} lun.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="mon-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} lu.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} lu.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="tue">
 				<relative type="-1" draft="unconfirmed">ultim mardí</relative>
 				<relative type="0" draft="unconfirmed">ho-mardí</relative>
 				<relative type="1" draft="unconfirmed">sequent mardí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} mardís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} mardís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="tue-short">
 				<relative type="-1" draft="unconfirmed">ult. mar.</relative>
 				<relative type="0" draft="unconfirmed">ho-mar.</relative>
 				<relative type="1" draft="unconfirmed">seq. mar.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} mar.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} mar.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="tue-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} ma.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} ma.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="wed">
 				<relative type="-1" draft="unconfirmed">ultim mercurdí</relative>
 				<relative type="0" draft="unconfirmed">ho-mercurdí</relative>
 				<relative type="1" draft="unconfirmed">sequent mercurdí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} mercurdís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} mercurdís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="wed-short">
 				<relative type="-1" draft="unconfirmed">ult. mer.</relative>
 				<relative type="0" draft="unconfirmed">ho-mer.</relative>
 				<relative type="1" draft="unconfirmed">seq. mer.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} mer.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} mer.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="wed-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} me.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} me.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="thu">
 				<relative type="-1" draft="unconfirmed">ultim jovedí</relative>
 				<relative type="0" draft="unconfirmed">ho-jovedí</relative>
 				<relative type="1" draft="unconfirmed">sequent jovedí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} jovedís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} jovedís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="thu-short">
 				<relative type="-1" draft="unconfirmed">ult. jov.</relative>
 				<relative type="0" draft="unconfirmed">ho-jov.</relative>
 				<relative type="1" draft="unconfirmed">seq. jov.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} jov.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} jov.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="thu-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} jo.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} jo.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="fri">
 				<relative type="-1" draft="unconfirmed">ultim venerdí</relative>
 				<relative type="0" draft="unconfirmed">ho-venerdí</relative>
 				<relative type="1" draft="unconfirmed">sequent venerdí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} venerdís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} venerdís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="fri-short">
 				<relative type="-1" draft="unconfirmed">ult. ven.</relative>
 				<relative type="0" draft="unconfirmed">ho-ven.</relative>
 				<relative type="1" draft="unconfirmed">seq. ven.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} ven.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} ven.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="fri-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} ve.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} ve.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="sat">
 				<relative type="-1" draft="unconfirmed">ultim saturdí</relative>
 				<relative type="0" draft="unconfirmed">ho-saturdí</relative>
 				<relative type="1" draft="unconfirmed">sequent saturdí</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} saturdís</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} saturdís</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="sat-short">
 				<relative type="-1" draft="unconfirmed">ult. sat.</relative>
 				<relative type="0" draft="unconfirmed">ho-sat.</relative>
 				<relative type="1" draft="unconfirmed">seq. sat.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} sat.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} sat.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="sat-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">p. {0} sa.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">a. {0} sa.</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="dayperiod">
 				<displayName>midídie</displayName>
@@ -1705,77 +1597,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="hour">
 				<displayName>hor</displayName>
 				<relative type="0" draft="unconfirmed">ti hor</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} hores</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} hores</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
+			</field>
+			<field type="hour-short">
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="hour-narrow">
 				<displayName>h</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} h</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} h</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="minute">
 				<displayName>minute</displayName>
 				<relative type="0" draft="unconfirmed">ti minute</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} minutes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} minutes</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="minute-short">
 				<displayName>min</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} min</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} min</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="minute-narrow">
 				<displayName>m</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} m</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} m</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="second">
 				<displayName>seconde</displayName>
 				<relative type="0" draft="unconfirmed">nu</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} secondes</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} secondes</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="second-short">
 				<displayName>sec</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} sec</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} sec</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="second-narrow">
 				<displayName>s</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="other" draft="unconfirmed">pos {0} s</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other" draft="unconfirmed">ante {0} s</relativeTimePattern>
-				</relativeTime>
+				<relativeTime type="future"/>
+				<relativeTime type="past"/>
 			</field>
 			<field type="zone">
 				<displayName>zone horari</displayName>
@@ -1787,6 +1651,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<gmtFormat>TMG{0}</gmtFormat>
 			<gmtZeroFormat>TMG</gmtZeroFormat>
+			<gmtUnknownFormat>TMG+?</gmtUnknownFormat>
 			<regionFormat>témpor de {0}</regionFormat>
 			<regionFormat type="daylight">témpor estival de {0}</regionFormat>
 			<regionFormat type="standard">témpor standard de {0}</regionFormat>
@@ -1796,7 +1661,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity draft="unconfirmed">ínconosset cité</exemplarCity>
+				<exemplarCity>ínconosset loc</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
 				<exemplarCity draft="unconfirmed">Tirana</exemplarCity>
@@ -1956,7 +1821,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</long>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="unconfirmed">Insul de Man</exemplarCity>
+				<exemplarCity>Insul de Man</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
 				<exemplarCity draft="unconfirmed">Teheran</exemplarCity>
@@ -2075,6 +1940,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Kiev</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Insul Wake</exemplarCity>
+			</zone>
 			<zone type="America/Los_Angeles">
 				<exemplarCity draft="unconfirmed">Los-Angeles</exemplarCity>
 			</zone>
@@ -2160,9 +2028,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="unconfirmed">témpor del Insules Cook</generic>
-					<standard draft="unconfirmed">témpor standard del Insules Cook</standard>
-					<daylight draft="unconfirmed">témpor estival del Insules Cook</daylight>
+					<generic>témpor del Insules Cook</generic>
+					<standard>témpor standard del Insules Cook</standard>
+					<daylight>témpor demíestival del Insules Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -2224,6 +2092,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">témpor estival del occidental Greenland</daylight>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">témpor standard de Hawai e Aleutes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">témpor de Hawai e Aleutes</generic>
@@ -2304,710 +2177,516 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength type="long">
-				<decimalFormat>
-					<pattern type="1000" count="other" draft="unconfirmed">0 milles</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 milles</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 milles</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 milliones</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 milliones</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 milliones</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 milliardes</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 milliardes</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 milliardes</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 billiones</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 billiones</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 billiones</pattern>
-				</decimalFormat>
+				<decimalFormat/>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
-				<decimalFormat>
-					<pattern type="1000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">0</pattern>
-				</decimalFormat>
+				<decimalFormat/>
 			</decimalFormatLength>
 		</decimalFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
-				<currencyFormat type="standard">
-					<pattern type="1000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">0</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">0</pattern>
-				</currencyFormat>
+				<currencyFormat type="standard"/>
 			</currencyFormatLength>
-			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName draft="unconfirmed">UAE dirham</displayName>
-				<displayName count="other" draft="unconfirmed">UAE dirhams</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName draft="unconfirmed">afghan afghani</displayName>
-				<displayName count="other" draft="unconfirmed">afghan afghanis</displayName>
 			</currency>
 			<currency type="ALL">
 				<displayName draft="unconfirmed">albanian lek</displayName>
-				<displayName count="other" draft="unconfirmed">albanian leks</displayName>
 			</currency>
 			<currency type="AMD">
 				<displayName draft="unconfirmed">armenian dram</displayName>
-				<displayName count="other" draft="unconfirmed">armenian drams</displayName>
 			</currency>
 			<currency type="ANG">
 				<displayName draft="unconfirmed">guilder del Nederlandesi Antilles</displayName>
-				<displayName count="other" draft="unconfirmed">guilderes del Nederlandesi Antilles</displayName>
 			</currency>
 			<currency type="AOA">
 				<displayName draft="unconfirmed">angolan kwanza</displayName>
-				<displayName count="other" draft="unconfirmed">angolan kwanzas</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName draft="unconfirmed">argentinian peso</displayName>
-				<displayName count="other" draft="unconfirmed">argentinian pesos</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName draft="unconfirmed">australian dollar</displayName>
-				<displayName count="other" draft="unconfirmed">australian dollares</displayName>
 			</currency>
 			<currency type="AWG">
 				<displayName draft="unconfirmed">aruban florin</displayName>
-				<displayName count="other" draft="unconfirmed">aruban florines</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName draft="unconfirmed">azerbaidjanesi manat</displayName>
-				<displayName count="other" draft="unconfirmed">azerbaidjanesi manates</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName draft="unconfirmed">convertibil mark de Bosnia-Herzogovina</displayName>
-				<displayName count="other" draft="unconfirmed">convertibil marks de Bosnia-Herzogovina</displayName>
 			</currency>
 			<currency type="BBD">
 				<displayName draft="unconfirmed">barbadan dollar</displayName>
-				<displayName count="other" draft="unconfirmed">barbadan dollares</displayName>
 			</currency>
 			<currency type="BDT">
 				<displayName draft="unconfirmed">bangladeshan taka</displayName>
-				<displayName count="other" draft="unconfirmed">bangladeshan takas</displayName>
 			</currency>
 			<currency type="BGN">
 				<displayName draft="unconfirmed">bulgarian lev</displayName>
-				<displayName count="other" draft="unconfirmed">bulgarian leves</displayName>
 			</currency>
 			<currency type="BHD">
 				<displayName draft="unconfirmed">bahrainesi dinar</displayName>
-				<displayName count="other" draft="unconfirmed">bahrainesi dinares</displayName>
 			</currency>
 			<currency type="BIF">
 				<displayName draft="unconfirmed">burundian franc</displayName>
-				<displayName count="other" draft="unconfirmed">burundian francs</displayName>
 			</currency>
 			<currency type="BMD">
 				<displayName draft="unconfirmed">bermudan dollar</displayName>
-				<displayName count="other" draft="unconfirmed">bermudan dollares</displayName>
 			</currency>
 			<currency type="BND">
 				<displayName draft="unconfirmed">brunesi dollar</displayName>
-				<displayName count="other" draft="unconfirmed">brunesi dollares</displayName>
 			</currency>
 			<currency type="BOB">
 				<displayName draft="unconfirmed">bolivian boliviano</displayName>
-				<displayName count="other" draft="unconfirmed">bolivian bolivianos</displayName>
 			</currency>
 			<currency type="BRL">
 				<displayName draft="unconfirmed">brasilian real</displayName>
-				<displayName count="other" draft="unconfirmed">brasilian reales</displayName>
 			</currency>
 			<currency type="BSD">
 				<displayName draft="unconfirmed">bahaman dollar</displayName>
-				<displayName count="other" draft="unconfirmed">bahaman dollares</displayName>
 			</currency>
 			<currency type="BTN">
 				<displayName draft="unconfirmed">bhutanesi ngultrum</displayName>
-				<displayName count="other" draft="unconfirmed">bhutanesi ngultrums</displayName>
 			</currency>
 			<currency type="BWP">
 				<displayName draft="unconfirmed">botswanan pula</displayName>
-				<displayName count="other" draft="unconfirmed">botswanan pulas</displayName>
 			</currency>
 			<currency type="BYN">
 				<displayName draft="unconfirmed">bieloruss ruble</displayName>
-				<displayName count="other" draft="unconfirmed">bieloruss rubles</displayName>
 			</currency>
 			<currency type="BZD">
 				<displayName draft="unconfirmed">belizan dollar</displayName>
-				<displayName count="other" draft="unconfirmed">belizan dollares</displayName>
 			</currency>
 			<currency type="CAD">
 				<displayName draft="unconfirmed">canadan dollar</displayName>
-				<displayName count="other" draft="unconfirmed">canadan dollares</displayName>
 			</currency>
 			<currency type="CDF">
 				<displayName draft="unconfirmed">congolesi franc</displayName>
-				<displayName count="other" draft="unconfirmed">congolesi francs</displayName>
 			</currency>
 			<currency type="CHF">
 				<displayName draft="unconfirmed">sviss franc</displayName>
-				<displayName count="other" draft="unconfirmed">sviss francs</displayName>
 				<symbol draft="unconfirmed">F.Sv.</symbol>
 			</currency>
 			<currency type="CLP">
 				<displayName draft="unconfirmed">chilan peso</displayName>
-				<displayName count="other" draft="unconfirmed">chilan pesos</displayName>
 			</currency>
 			<currency type="CNH">
 				<displayName draft="unconfirmed">chinesi yuan (extraterritorial)</displayName>
-				<displayName count="other" draft="unconfirmed">chinesi yuanes (extraterritorial)</displayName>
 			</currency>
 			<currency type="CNY">
 				<displayName draft="unconfirmed">chinesi yuan</displayName>
-				<displayName count="other" draft="unconfirmed">chinesi yuanes</displayName>
 			</currency>
 			<currency type="COP">
 				<displayName draft="unconfirmed">columbian peso</displayName>
-				<displayName count="other" draft="unconfirmed">columbian pesos</displayName>
 			</currency>
 			<currency type="CRC">
 				<displayName draft="unconfirmed">costa-rican colon</displayName>
-				<displayName count="other" draft="unconfirmed">costa-rican colones</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName draft="unconfirmed">cuban convertibil peso</displayName>
-				<displayName count="other" draft="unconfirmed">cuban convertibil pesos</displayName>
 			</currency>
 			<currency type="CUP">
 				<displayName draft="unconfirmed">cuban peso</displayName>
-				<displayName count="other" draft="unconfirmed">cuban pesos</displayName>
 			</currency>
 			<currency type="CVE">
 				<displayName draft="unconfirmed">cap-verdesi escudo</displayName>
-				<displayName count="other" draft="unconfirmed">cap-verdesi escudos</displayName>
 			</currency>
 			<currency type="CZK">
 				<displayName draft="unconfirmed">tchec koruna</displayName>
-				<displayName count="other" draft="unconfirmed">tchec korunas</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName draft="unconfirmed">djibutian franc</displayName>
-				<displayName count="other" draft="unconfirmed">djibutian francs</displayName>
 			</currency>
 			<currency type="DKK">
 				<displayName draft="unconfirmed">danesi krone</displayName>
-				<displayName count="other" draft="unconfirmed">danesi krones</displayName>
 			</currency>
 			<currency type="DOP">
 				<displayName draft="unconfirmed">dominican peso</displayName>
-				<displayName count="other" draft="unconfirmed">dominican pesos</displayName>
 			</currency>
 			<currency type="DZD">
 				<displayName draft="unconfirmed">algerian dinar</displayName>
-				<displayName count="other" draft="unconfirmed">algerian dinares</displayName>
 			</currency>
 			<currency type="EGP">
 				<displayName draft="unconfirmed">egiptian pund</displayName>
-				<displayName count="other" draft="unconfirmed">egiptian pundes</displayName>
 			</currency>
 			<currency type="ERN">
 				<displayName draft="unconfirmed">eritrean nakfa</displayName>
-				<displayName count="other" draft="unconfirmed">eritrean nakfas</displayName>
 			</currency>
 			<currency type="ETB">
 				<displayName draft="unconfirmed">etiopian birr</displayName>
-				<displayName count="other" draft="unconfirmed">etiopian birres</displayName>
 			</currency>
 			<currency type="EUR">
 				<displayName draft="unconfirmed">euro</displayName>
-				<displayName count="other" draft="unconfirmed">euros</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName draft="unconfirmed">fidjian dollar</displayName>
-				<displayName count="other" draft="unconfirmed">fidjian dollares</displayName>
 			</currency>
 			<currency type="FKP">
 				<displayName draft="unconfirmed">pund de Falkland</displayName>
-				<displayName count="other" draft="unconfirmed">pundes de Falkland</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName draft="unconfirmed">pund sterling</displayName>
-				<displayName count="other" draft="unconfirmed">pundes sterling</displayName>
 			</currency>
 			<currency type="GEL">
 				<displayName draft="unconfirmed">georgian lari</displayName>
-				<displayName count="other" draft="unconfirmed">georgian laris</displayName>
 			</currency>
 			<currency type="GHS">
 				<displayName draft="unconfirmed">ghanan cedi</displayName>
-				<displayName count="other" draft="unconfirmed">ghanan cedis</displayName>
 			</currency>
 			<currency type="GIP">
 				<displayName draft="unconfirmed">pund de Gibraltar</displayName>
-				<displayName count="other" draft="unconfirmed">pundes de Gibraltar</displayName>
 			</currency>
 			<currency type="GMD">
 				<displayName draft="unconfirmed">gambian dalasi</displayName>
-				<displayName count="other" draft="unconfirmed">gambian dalasis</displayName>
 			</currency>
 			<currency type="GNF">
 				<displayName draft="unconfirmed">guinean franc</displayName>
-				<displayName count="other" draft="unconfirmed">guinean francs</displayName>
 			</currency>
 			<currency type="GTQ">
 				<displayName draft="unconfirmed">guatemalan quetzal</displayName>
-				<displayName count="other" draft="unconfirmed">guatemalan quetzales</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName draft="unconfirmed">guyanesi dollar</displayName>
-				<displayName count="other" draft="unconfirmed">guyanesi dollares</displayName>
 			</currency>
 			<currency type="HKD">
 				<displayName draft="unconfirmed">dollar de Hong-Kong</displayName>
-				<displayName count="other" draft="unconfirmed">dollares de Hong-Kong</displayName>
 			</currency>
 			<currency type="HNL">
 				<displayName draft="unconfirmed">honduresi lempira</displayName>
-				<displayName count="other" draft="unconfirmed">honduresi lempiras</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName draft="unconfirmed">croatian kuna</displayName>
-				<displayName count="other" draft="unconfirmed">croatian kunas</displayName>
 			</currency>
 			<currency type="HTG">
 				<displayName draft="unconfirmed">haitian gourde</displayName>
-				<displayName count="other" draft="unconfirmed">haitian gourdes</displayName>
 			</currency>
 			<currency type="HUF">
 				<displayName draft="unconfirmed">hungarian forint</displayName>
-				<displayName count="other" draft="unconfirmed">hungarian forintes</displayName>
 			</currency>
 			<currency type="IDR">
 				<displayName draft="unconfirmed">indonesian rupia</displayName>
-				<displayName count="other" draft="unconfirmed">indonesian rupias</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName draft="unconfirmed">israelesi nov shekel</displayName>
-				<displayName count="other" draft="unconfirmed">israelesi nov shekeles</displayName>
 			</currency>
 			<currency type="INR">
 				<displayName draft="unconfirmed">indian rupia</displayName>
-				<displayName count="other" draft="unconfirmed">indian rupias</displayName>
 			</currency>
 			<currency type="IQD">
 				<displayName draft="unconfirmed">irakesi dinar</displayName>
-				<displayName count="other" draft="unconfirmed">irakesi dinares</displayName>
 			</currency>
 			<currency type="IRR">
 				<displayName draft="unconfirmed">iranesi real</displayName>
-				<displayName count="other" draft="unconfirmed">iranesi reales</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName draft="unconfirmed">islandesi krona</displayName>
-				<displayName count="other" draft="unconfirmed">islandesi kronas</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName draft="unconfirmed">jamaican dollar</displayName>
-				<displayName count="other" draft="unconfirmed">jamaican dollares</displayName>
 			</currency>
 			<currency type="JOD">
 				<displayName draft="unconfirmed">jordanian dinar</displayName>
-				<displayName count="other" draft="unconfirmed">jordanian dinares</displayName>
 			</currency>
 			<currency type="JPY">
 				<displayName draft="unconfirmed">japanesi yen</displayName>
-				<displayName count="other" draft="unconfirmed">japanesi yenes</displayName>
 			</currency>
 			<currency type="KES">
 				<displayName draft="unconfirmed">kenian shilling</displayName>
-				<displayName count="other" draft="unconfirmed">kenian shillings</displayName>
 			</currency>
 			<currency type="KGS">
 				<displayName draft="unconfirmed">kirgistanesi som</displayName>
-				<displayName count="other" draft="unconfirmed">kirgistanesi somes</displayName>
 			</currency>
 			<currency type="KHR">
 				<displayName draft="unconfirmed">cambodjan riel</displayName>
-				<displayName count="other" draft="unconfirmed">cambodjan rieles</displayName>
 			</currency>
 			<currency type="KMF">
 				<displayName draft="unconfirmed">comoran franc</displayName>
-				<displayName count="other" draft="unconfirmed">comoran francs</displayName>
 			</currency>
 			<currency type="KPW">
 				<displayName draft="unconfirmed">nord-korean won</displayName>
-				<displayName count="other" draft="unconfirmed">nord-korean wones</displayName>
 			</currency>
 			<currency type="KRW">
 				<displayName draft="unconfirmed">sud-korean won</displayName>
-				<displayName count="other" draft="unconfirmed">sud-korean wones</displayName>
 			</currency>
 			<currency type="KWD">
 				<displayName draft="unconfirmed">kuwaitesi dinar</displayName>
-				<displayName count="other" draft="unconfirmed">kuwaitesi dinares</displayName>
 			</currency>
 			<currency type="KYD">
 				<displayName draft="unconfirmed">caymanesi dollar</displayName>
-				<displayName count="other" draft="unconfirmed">caymanesi dollares</displayName>
 			</currency>
 			<currency type="KZT">
 				<displayName draft="unconfirmed">kazakhstanesi tenge</displayName>
-				<displayName count="other" draft="unconfirmed">kazakhstanesi tenges</displayName>
 			</currency>
 			<currency type="LAK">
 				<displayName draft="unconfirmed">laotic kip</displayName>
-				<displayName count="other" draft="unconfirmed">laotic kipes</displayName>
 			</currency>
 			<currency type="LBP">
 				<displayName draft="unconfirmed">libanesi pund</displayName>
-				<displayName count="other" draft="unconfirmed">libanesi pundes</displayName>
 			</currency>
 			<currency type="LKR">
 				<displayName draft="unconfirmed">sri-lankan rupia</displayName>
-				<displayName count="other" draft="unconfirmed">sri-lankan rupias</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName draft="unconfirmed">liberian dollar</displayName>
-				<displayName count="other" draft="unconfirmed">liberian dollares</displayName>
 			</currency>
 			<currency type="LSL">
 				<displayName draft="unconfirmed">lesothan loti</displayName>
-				<displayName count="other" draft="unconfirmed">lesothan lotis</displayName>
 			</currency>
 			<currency type="LYD">
 				<displayName draft="unconfirmed">libian dinar</displayName>
-				<displayName count="other" draft="unconfirmed">libian dinares</displayName>
 			</currency>
 			<currency type="MAD">
 				<displayName draft="unconfirmed">maroccan dirham</displayName>
-				<displayName count="other" draft="unconfirmed">maroccan dirhams</displayName>
 			</currency>
 			<currency type="MDL">
 				<displayName draft="unconfirmed">moldovan lei</displayName>
 			</currency>
 			<currency type="MGA">
 				<displayName draft="unconfirmed">malgachic ariary</displayName>
-				<displayName count="other" draft="unconfirmed">malgachic ariarys</displayName>
 			</currency>
 			<currency type="MKD">
 				<displayName draft="unconfirmed">macedonian denar</displayName>
-				<displayName count="other" draft="unconfirmed">macedonian denares</displayName>
 			</currency>
 			<currency type="MMK">
 				<displayName draft="unconfirmed">myanmaran kyat</displayName>
-				<displayName count="other" draft="unconfirmed">myanmaran kyates</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName draft="unconfirmed">mongolian tugric</displayName>
-				<displayName count="other" draft="unconfirmed">mongolian tugrics</displayName>
 			</currency>
 			<currency type="MOP">
 				<displayName draft="unconfirmed">macan pataca</displayName>
-				<displayName count="other" draft="unconfirmed">macan patacas</displayName>
 			</currency>
 			<currency type="MRU">
 				<displayName draft="unconfirmed">mauritanian uguiya</displayName>
-				<displayName count="other" draft="unconfirmed">mauritanian uguiyas</displayName>
 			</currency>
 			<currency type="MUR">
 				<displayName draft="unconfirmed">maurician rupia</displayName>
-				<displayName count="other" draft="unconfirmed">maurician rupias</displayName>
 			</currency>
 			<currency type="MVR">
 				<displayName draft="unconfirmed">maldivan rufia</displayName>
-				<displayName count="other" draft="unconfirmed">maldivan rufias</displayName>
 			</currency>
 			<currency type="MWK">
 				<displayName draft="unconfirmed">malawian kwacha</displayName>
-				<displayName count="other" draft="unconfirmed">malawian kwachas</displayName>
 			</currency>
 			<currency type="MXN">
 				<displayName draft="unconfirmed">mexican peso</displayName>
-				<displayName count="other" draft="unconfirmed">mexican pesos</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName draft="unconfirmed">malaysian ringgit</displayName>
-				<displayName count="other" draft="unconfirmed">malaysian ringgites</displayName>
 			</currency>
 			<currency type="MZN">
 				<displayName draft="unconfirmed">mozambican metical</displayName>
-				<displayName count="other" draft="unconfirmed">mozambican meticales</displayName>
 			</currency>
 			<currency type="NAD">
 				<displayName draft="unconfirmed">namibian dollar</displayName>
-				<displayName count="other" draft="unconfirmed">namibian dollares</displayName>
 			</currency>
 			<currency type="NGN">
 				<displayName draft="unconfirmed">nigerian naira</displayName>
-				<displayName count="other" draft="unconfirmed">nigerian nairas</displayName>
 			</currency>
 			<currency type="NIO">
 				<displayName draft="unconfirmed">nicaraguan cordoba</displayName>
-				<displayName count="other" draft="unconfirmed">nicaraguan cordobas</displayName>
 			</currency>
 			<currency type="NOK">
 				<displayName draft="unconfirmed">norvegian krone</displayName>
-				<displayName count="other" draft="unconfirmed">norvegian krones</displayName>
 			</currency>
 			<currency type="NPR">
 				<displayName draft="unconfirmed">nepalesi rupia</displayName>
-				<displayName count="other" draft="unconfirmed">nepalesi rupias</displayName>
 			</currency>
 			<currency type="NZD">
 				<displayName draft="unconfirmed">nov-zelandesi dollar</displayName>
-				<displayName count="other" draft="unconfirmed">nov-zelandesi dollares</displayName>
 			</currency>
 			<currency type="OMR">
 				<displayName draft="unconfirmed">omanesi rial</displayName>
-				<displayName count="other" draft="unconfirmed">omanesi riales</displayName>
 			</currency>
 			<currency type="PAB">
 				<displayName draft="unconfirmed">panamesi balboa</displayName>
-				<displayName count="other" draft="unconfirmed">panamesi balboas</displayName>
 			</currency>
 			<currency type="PEN">
 				<displayName draft="unconfirmed">peruan sol</displayName>
-				<displayName count="other" draft="unconfirmed">peruan soles</displayName>
 			</currency>
 			<currency type="PGK">
 				<displayName draft="unconfirmed">kina de Papua Nov-Guinea</displayName>
-				<displayName count="other" draft="unconfirmed">kinas de Papua Nov-Guinea</displayName>
 			</currency>
 			<currency type="PHP">
 				<displayName draft="unconfirmed">filipinesi peso</displayName>
-				<displayName count="other" draft="unconfirmed">filipinesi pesos</displayName>
 			</currency>
 			<currency type="PKR">
 				<displayName draft="unconfirmed">pakistani rupia</displayName>
-				<displayName count="other" draft="unconfirmed">pakistani rupias</displayName>
 			</currency>
 			<currency type="PLN">
 				<displayName draft="unconfirmed">polonesi zloty</displayName>
-				<displayName count="other" draft="unconfirmed">polonesi zlotys</displayName>
 			</currency>
 			<currency type="PYG">
 				<displayName draft="unconfirmed">paraguayan guarani</displayName>
-				<displayName count="other" draft="unconfirmed">paraguayan guaranis</displayName>
 			</currency>
 			<currency type="QAR">
 				<displayName draft="unconfirmed">qataresi riyal</displayName>
-				<displayName count="other" draft="unconfirmed">qataresi riyales</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName draft="unconfirmed">rumanian lei</displayName>
 			</currency>
 			<currency type="RSD">
 				<displayName draft="unconfirmed">serbian dinar</displayName>
-				<displayName count="other" draft="unconfirmed">serbian dinares</displayName>
 			</currency>
 			<currency type="RUB">
 				<displayName draft="unconfirmed">russian ruble</displayName>
-				<displayName count="other" draft="unconfirmed">russian rubles</displayName>
 				<symbol draft="unconfirmed">Rub.</symbol>
 			</currency>
 			<currency type="RWF">
 				<displayName draft="unconfirmed">rwandan franc</displayName>
-				<displayName count="other" draft="unconfirmed">rwandan francs</displayName>
 			</currency>
 			<currency type="SAR">
 				<displayName draft="unconfirmed">sauditic riyal</displayName>
-				<displayName count="other" draft="unconfirmed">sauditic riyales</displayName>
 			</currency>
 			<currency type="SBD">
 				<displayName draft="unconfirmed">dollar del Insules Solomon</displayName>
-				<displayName count="other" draft="unconfirmed">dollares del Insules Solomon</displayName>
 			</currency>
 			<currency type="SCR">
 				<displayName draft="unconfirmed">seychellan rupia</displayName>
-				<displayName count="other" draft="unconfirmed">seychellan rupias</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName draft="unconfirmed">sudanesi pund</displayName>
-				<displayName count="other" draft="unconfirmed">sudanesi pundes</displayName>
 			</currency>
 			<currency type="SEK">
 				<displayName draft="unconfirmed">sved krona</displayName>
-				<displayName count="other" draft="unconfirmed">sved kronas</displayName>
 			</currency>
 			<currency type="SGD">
 				<displayName draft="unconfirmed">singapuran dollar</displayName>
-				<displayName count="other" draft="unconfirmed">singapuran dollares</displayName>
 			</currency>
 			<currency type="SHP">
 				<displayName draft="unconfirmed">pund de Sant-Helena</displayName>
-				<displayName count="other" draft="unconfirmed">pundes de Sant-Helena</displayName>
 			</currency>
 			<currency type="SLE">
 				<displayName draft="unconfirmed">leone de Sierra-Leone</displayName>
-				<displayName count="other" draft="unconfirmed">leones de Sierra-Leone</displayName>
 			</currency>
 			<currency type="SLL">
 				<displayName draft="unconfirmed">leone de Sierra-Leone (1964..2022)</displayName>
-				<displayName count="other" draft="unconfirmed">leones de Sierra-Leone (1964..2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName draft="unconfirmed">somalian shilling</displayName>
-				<displayName count="other" draft="unconfirmed">somalian shillings</displayName>
 			</currency>
 			<currency type="SRD">
 				<displayName draft="unconfirmed">surinamesi dollar</displayName>
-				<displayName count="other" draft="unconfirmed">surinamesi dollares</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName draft="unconfirmed">sud-sudanesi pund</displayName>
-				<displayName count="other" draft="unconfirmed">sud-sudanesi pundes</displayName>
 			</currency>
 			<currency type="STN">
 				<displayName draft="unconfirmed">dobra de São Tomé e Príncipe</displayName>
-				<displayName count="other" draft="unconfirmed">dobras de São Tomé e Príncipe</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName draft="unconfirmed">sirian pund</displayName>
-				<displayName count="other" draft="unconfirmed">sirian pundes</displayName>
 			</currency>
 			<currency type="SZL">
 				<displayName draft="unconfirmed">swazian lilangeni</displayName>
-				<displayName count="other" draft="unconfirmed">swazian lilangenis</displayName>
 			</currency>
 			<currency type="THB">
 				<displayName draft="unconfirmed">thai baht</displayName>
-				<displayName count="other" draft="unconfirmed">thai bahtes</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName draft="unconfirmed">tadjikistanesi somoni</displayName>
-				<displayName count="other" draft="unconfirmed">tadjikistanesi somonis</displayName>
 			</currency>
 			<currency type="TMT">
 				<displayName draft="unconfirmed">turcmen manat</displayName>
-				<displayName count="other" draft="unconfirmed">turcmen manates</displayName>
 			</currency>
 			<currency type="TND">
 				<displayName draft="unconfirmed">tunisian dinar</displayName>
-				<displayName count="other" draft="unconfirmed">tunisian dinares</displayName>
 			</currency>
 			<currency type="TOP">
 				<displayName draft="unconfirmed">tongan pa’anga</displayName>
-				<displayName count="other" draft="unconfirmed">tongan pa’angas</displayName>
 			</currency>
 			<currency type="TRY">
 				<displayName draft="unconfirmed">turc lira</displayName>
-				<displayName count="other" draft="unconfirmed">turc liras</displayName>
 			</currency>
 			<currency type="TTD">
 				<displayName draft="unconfirmed">dollar de Trinidad e Tobago</displayName>
-				<displayName count="other" draft="unconfirmed">dollares de Trinidad e Tobago</displayName>
 			</currency>
 			<currency type="TWD">
 				<displayName draft="unconfirmed">nov taiwanesi dollar</displayName>
-				<displayName count="other" draft="unconfirmed">nov taiwanesi dollares</displayName>
 			</currency>
 			<currency type="TZS">
 				<displayName draft="unconfirmed">tanzanian shilling</displayName>
-				<displayName count="other" draft="unconfirmed">tanzanian shillings</displayName>
 			</currency>
 			<currency type="UAH">
 				<displayName draft="unconfirmed">ukrainan hrivnia</displayName>
-				<displayName count="other" draft="unconfirmed">ukrainan hrivnias</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName draft="unconfirmed">ugandesi shilling</displayName>
-				<displayName count="other" draft="unconfirmed">ugandesi shillings</displayName>
 			</currency>
 			<currency type="USD">
 				<displayName draft="unconfirmed">american dollar</displayName>
-				<displayName count="other" draft="unconfirmed">american dollares</displayName>
 			</currency>
 			<currency type="UYU">
 				<displayName draft="unconfirmed">uruguayan peso</displayName>
-				<displayName count="other" draft="unconfirmed">uruguayan pesos</displayName>
 			</currency>
 			<currency type="UZS">
 				<displayName draft="unconfirmed">uzbec som</displayName>
-				<displayName count="other" draft="unconfirmed">uzbec somes</displayName>
 			</currency>
 			<currency type="VES">
 				<displayName draft="unconfirmed">venezuelan bolivar</displayName>
-				<displayName count="other" draft="unconfirmed">venezuelan bolivares</displayName>
 			</currency>
 			<currency type="VND">
 				<displayName draft="unconfirmed">vietnamesi dong</displayName>
-				<displayName count="other" draft="unconfirmed">vietnamesi dongs</displayName>
 			</currency>
 			<currency type="VUV">
 				<displayName draft="unconfirmed">vanuatuan vatu</displayName>
-				<displayName count="other" draft="unconfirmed">vanuatuan vatus</displayName>
 			</currency>
 			<currency type="WST">
 				<displayName draft="unconfirmed">samoan tala</displayName>
-				<displayName count="other" draft="unconfirmed">samoan talas</displayName>
 			</currency>
 			<currency type="XAF">
 				<displayName draft="unconfirmed">CFA franc</displayName>
-				<displayName count="other" draft="unconfirmed">CFA francs</displayName>
 			</currency>
 			<currency type="XAG">
 				<displayName draft="unconfirmed">argent</displayName>
-				<displayName count="other" draft="unconfirmed">troy-uncies de argent</displayName>
 			</currency>
 			<currency type="XAU">
 				<displayName draft="unconfirmed">aur</displayName>
-				<displayName count="other" draft="unconfirmed">troy-uncies de aur</displayName>
 			</currency>
 			<currency type="XCD">
 				<displayName draft="unconfirmed">ost-caribean dollar</displayName>
-				<displayName count="other" draft="unconfirmed">ost-caribean dollares</displayName>
 			</currency>
 			<currency type="XOF">
 				<displayName draft="unconfirmed">west-african CFA franc</displayName>
-				<displayName count="other" draft="unconfirmed">west-african CFA francs</displayName>
 			</currency>
 			<currency type="XPD">
 				<displayName draft="unconfirmed">palladium</displayName>
-				<displayName count="other" draft="unconfirmed">troy-uncies de palladium</displayName>
 			</currency>
 			<currency type="XPF">
 				<displayName draft="unconfirmed">CFP franc</displayName>
-				<displayName count="other" draft="unconfirmed">CFP francs</displayName>
 			</currency>
 			<currency type="XPT">
 				<displayName draft="unconfirmed">platine</displayName>
-				<displayName count="other" draft="unconfirmed">troy-uncies de platine</displayName>
 			</currency>
 			<currency type="XXX">
 				<displayName draft="unconfirmed">ínconosset valuta</displayName>
-				<displayName count="other" draft="unconfirmed">de ínconosset valuta</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName draft="unconfirmed">yemenesi real</displayName>
-				<displayName count="other" draft="unconfirmed">yemenesi reales</displayName>
 			</currency>
 			<currency type="ZAR">
 				<displayName draft="unconfirmed">sud-african rand</displayName>
-				<displayName count="other" draft="unconfirmed">sud-african randes</displayName>
 			</currency>
 			<currency type="ZMW">
 				<displayName draft="unconfirmed">zambian kwacha</displayName>
-				<displayName count="other" draft="unconfirmed">zambian kwachas</displayName>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
@@ -3015,7 +2694,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<pattern type="range" draft="unconfirmed">{0}..{1}</pattern>
 		</miscPatterns>
 		<minimalPairs>
-			<pluralMinimalPairs count="other" draft="contributed">{0} dies</pluralMinimalPairs>
 			<ordinalMinimalPairs ordinal="other">Li {0}-im edition</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
@@ -3081,89 +2759,64 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="10p24">
 				<unitPrefixPattern draft="unconfirmed">yotta{0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="power2">
-				<compoundUnitPattern1 count="other" draft="unconfirmed">{0} quadrat</compoundUnitPattern1>
-			</compoundUnit>
-			<compoundUnit type="power3">
-				<compoundUnitPattern1 count="other" draft="unconfirmed">{0} cubic</compoundUnitPattern1>
-			</compoundUnit>
+			<compoundUnit type="power2"/>
+			<compoundUnit type="power3"/>
 			<compoundUnit type="times">
 				<compoundUnitPattern draft="unconfirmed">{0}-{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-meter-per-square-second">
 				<displayName draft="unconfirmed">metres per seconde quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} metres per seconde quadrat</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="unconfirmed">radianes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} radianes</unitPattern>
+				<displayName>radianes</displayName>
 			</unit>
 			<unit type="angle-degree">
-				<displayName draft="unconfirmed">gradus</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} gradus</unitPattern>
+				<displayName>gradus</displayName>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName draft="unconfirmed">arc-minutes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} arc-minutes</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName draft="unconfirmed">arc-secondes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} arc-secondes</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName draft="unconfirmed">kilometres quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilometres quadrat</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName draft="unconfirmed">hectares</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} hectares</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
 				<displayName draft="unconfirmed">metre quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} metres quadrat</unitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<displayName draft="unconfirmed">centimetre quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} centimetres quadrat</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName draft="unconfirmed">milies quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milies quadrat</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="other" draft="unconfirmed">{0} acres</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName draft="unconfirmed">yardes quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} yardes quadrat</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
 				<displayName draft="unconfirmed">pedes quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pedes quadrat</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<displayName draft="unconfirmed">inches quadrat</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} inches quadrat</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
 				<displayName draft="unconfirmed">carates</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} carates</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName draft="unconfirmed">percent</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} percent</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName draft="unconfirmed">permille</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} permille</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName draft="unconfirmed">litres per kilometre</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} litres per kilometre</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
 				<displayName draft="unconfirmed">petaoctetes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} petaoctetes</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="unconfirmed">teraoctetes</displayName>
@@ -3191,420 +2844,319 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="digital-byte">
 				<displayName draft="unconfirmed">octetes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} octetes</unitPattern>
 			</unit>
 			<unit type="digital-bit">
 				<displayName draft="unconfirmed">bits</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} bits</unitPattern>
 			</unit>
 			<unit type="duration-century">
 				<displayName draft="unconfirmed">secules</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} secules</unitPattern>
 			</unit>
 			<unit type="duration-decade">
 				<displayName draft="unconfirmed">decennies</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} decennies</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<unitPattern count="other" draft="unconfirmed">{0} annus</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per annu</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<displayName draft="unconfirmed">trimestres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} trimestres</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per trimestre</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<unitPattern count="other" draft="unconfirmed">{0} mensus</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per mensu</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<unitPattern count="other" draft="unconfirmed">{0} semanes</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per semane</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<unitPattern count="other" draft="unconfirmed">{0} dies</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per die</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<unitPattern count="other" draft="unconfirmed">{0} hores</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per hor</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">minutes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} minutes</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per minute</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName draft="unconfirmed">secondes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} secondes</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per seconde</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName draft="unconfirmed">millisecondes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} millisecondes</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName draft="unconfirmed">microsecondes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} microsecondes</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName draft="unconfirmed">nanosecondes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} nanosecondes</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="unconfirmed">amperes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} amperes</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName draft="unconfirmed">milliamperes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milliamperes</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
 				<displayName draft="unconfirmed">ohms</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ohms</unitPattern>
 			</unit>
 			<unit type="electric-volt">
 				<displayName draft="unconfirmed">voltes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} voltes</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName draft="unconfirmed">kilocalories</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilocalories</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName draft="unconfirmed">calories</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} calories</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
 				<displayName draft="unconfirmed">kilojoules</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilojoules</unitPattern>
 			</unit>
 			<unit type="energy-joule">
 				<displayName draft="unconfirmed">joules</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} joules</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName draft="unconfirmed">kilowatt-hores</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilowatt-hores</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName draft="unconfirmed">electron-voltes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} electron-voltes</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
 				<displayName draft="unconfirmed">britanic termal unités</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} britanic termal unités</unitPattern>
 			</unit>
 			<unit type="force-newton">
 				<displayName draft="unconfirmed">newtones</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} newtones</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName draft="unconfirmed">gigahertz</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} gigahertz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
 				<displayName draft="unconfirmed">megahertz</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} megahertz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName draft="unconfirmed">kilohertz</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilohertz</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
 				<displayName draft="unconfirmed">hertz</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} hertz</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
 				<displayName draft="unconfirmed">pixels</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pixels</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
 				<displayName draft="unconfirmed">megapixels</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} megapixels</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
 				<displayName draft="unconfirmed">pixels per centimetre</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pixels per centimetre</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
 				<displayName draft="unconfirmed">pixels per inch</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pixels per inch</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
 				<displayName draft="unconfirmed">radiuses del terra</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} radiuses del terra</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName draft="unconfirmed">kilometres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilometres</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per kilometre</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName draft="unconfirmed">metres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} metres</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per metre</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName draft="unconfirmed">decimetres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} decimetres</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName draft="unconfirmed">centimetres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} centimetres</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per centimetre</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName draft="unconfirmed">millimetres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} millimetres</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName draft="unconfirmed">micrometres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} micrometres</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
 				<displayName draft="unconfirmed">nanometres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} nanometres</unitPattern>
 			</unit>
 			<unit type="length-picometer">
 				<displayName draft="unconfirmed">picometres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} picometres</unitPattern>
 			</unit>
 			<unit type="length-mile">
 				<displayName draft="unconfirmed">milies</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milies</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<displayName draft="unconfirmed">yards</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} yardes</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<displayName draft="unconfirmed">pedes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pedes</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per pede</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName draft="unconfirmed">inches</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} inches</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per inch</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName draft="unconfirmed">parsecs</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} parsecs</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName draft="unconfirmed">luce-annus</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} luce-annus</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName draft="unconfirmed">unité astronomic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} unités astronomic</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName draft="unconfirmed">marin milies</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} marin milies</unitPattern>
 			</unit>
 			<unit type="length-point">
 				<displayName draft="unconfirmed">punctus</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} punctus</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
 				<displayName draft="unconfirmed">radiuses del sol</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} radiuses del sol</unitPattern>
 			</unit>
 			<unit type="light-lux">
 				<displayName draft="unconfirmed">lux</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} lux</unitPattern>
 			</unit>
 			<unit type="light-candela">
 				<displayName draft="unconfirmed">candelas</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} candelas</unitPattern>
 			</unit>
 			<unit type="light-lumen">
 				<displayName draft="unconfirmed">lumenes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} lumenes</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName draft="unconfirmed">luminositás solari</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} luminositás solari</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
 				<displayName draft="unconfirmed">tonnes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} tonnes</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName draft="unconfirmed">kilogrammes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilogrammes</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per kilogramm</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName draft="unconfirmed">grammes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} grammes</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0} per gramm</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName draft="unconfirmed">milligrammes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milligrammes</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName draft="unconfirmed">microgrammes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} microgrammes</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName draft="unconfirmed">american tonnes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} american tonnes</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName draft="unconfirmed">stones</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} stones</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName draft="unconfirmed">pundes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pundes</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName draft="unconfirmed">uncies</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} uncies</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName draft="unconfirmed">gigawattes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} gigawattes</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
 				<displayName draft="unconfirmed">megawattes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} megawattes</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName draft="unconfirmed">kilowattes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilowattes</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="unconfirmed">wattes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} wattes</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName draft="unconfirmed">milliwattes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milliwattes</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<displayName draft="unconfirmed">cavall-forties</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} cavall-forties</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<displayName draft="unconfirmed">bares</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} bares</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName draft="unconfirmed">millibares</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} millibares</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
 				<displayName draft="unconfirmed">atmosferes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} atmosferes</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
 				<displayName draft="unconfirmed">pascales</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pascales</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName draft="unconfirmed">hectopascales</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} hectopascales</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
 				<displayName draft="unconfirmed">kilopascales</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilopascales</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
 				<displayName draft="unconfirmed">megapascales</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} megapascales</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName draft="unconfirmed">kilometres per hor</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilometres per hor</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName draft="unconfirmed">metres per seconde</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} metres per seconde</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName draft="unconfirmed">milies per hor</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milies per hor</unitPattern>
 			</unit>
 			<unit type="speed-knot">
 				<displayName draft="unconfirmed">nodes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} nodes</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
 				<displayName draft="unconfirmed">gradus de temperatura</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} gradus de temperatura</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName draft="unconfirmed">gradus Celsius</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} gradus Celsius</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName draft="unconfirmed">gradus Fahrenheit</displayName>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName draft="unconfirmed">kelvines</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kelvines</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
 				<displayName draft="unconfirmed">newton-metres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} newton-metres</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName draft="unconfirmed">kilometres cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} kilometres cubic</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName draft="unconfirmed">metres cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} metres cubic</unitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName draft="unconfirmed">centimetres cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} centimetres cubic</unitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName draft="unconfirmed">milies cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} milies cubic</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName draft="unconfirmed">yardes cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} yardes cubic</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName draft="unconfirmed">pedes cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} pedes cubic</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
 				<displayName draft="unconfirmed">inches cubic</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} inches cubic</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
 				<displayName draft="unconfirmed">megalitres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} megalitres</unitPattern>
 			</unit>
 			<unit type="volume-liter">
 				<displayName draft="unconfirmed">litres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} litres</unitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<displayName draft="unconfirmed">decilitres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} decilitres</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
 				<displayName draft="unconfirmed">centilitres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} centilitres</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName draft="unconfirmed">millilitres</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} millilitres</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
 				<displayName draft="unconfirmed">busheles</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} busheles</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName draft="unconfirmed">direction cardinal</displayName>
@@ -3618,61 +3170,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="10p-6">
 				<unitPrefixPattern draft="unconfirmed">mc{0}</unitPrefixPattern>
 			</compoundUnit>
+			<compoundUnit type="power2"/>
+			<compoundUnit type="power3"/>
 			<compoundUnit type="times">
 				<compoundUnitPattern draft="unconfirmed">{0}{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="angle-degree">
-				<displayName draft="unconfirmed">°</displayName>
+				<displayName>°</displayName>
 			</unit>
 			<unit type="area-acre">
 				<displayName draft="unconfirmed">acres</displayName>
 			</unit>
 			<unit type="digital-petabyte">
 				<displayName draft="unconfirmed">Po</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Po</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName draft="unconfirmed">To</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} To</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName draft="unconfirmed">Go</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Go</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
 				<displayName draft="unconfirmed">Mo</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} Mo</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
 				<displayName draft="unconfirmed">ko</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ko</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName draft="unconfirmed">oct</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} oct</unitPattern>
 			</unit>
 			<unit type="duration-century">
 				<displayName draft="unconfirmed">scl</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} scl</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName draft="unconfirmed">annus</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} a</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/a</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<displayName draft="unconfirmed">tr</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} tr</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/tr</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName draft="unconfirmed">mensus</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} mn</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/mn</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<displayName draft="unconfirmed">semanes</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} sem</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/sem</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
@@ -3683,7 +3226,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName draft="unconfirmed">mcs</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} mcs</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName draft="unconfirmed">A</displayName>
@@ -3693,29 +3235,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-british-thermal-unit">
 				<displayName draft="unconfirmed">btu</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} btu</unitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName draft="unconfirmed">m</displayName>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName draft="unconfirmed">mcm</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} mcm</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName draft="unconfirmed">la</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} la</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName draft="unconfirmed">ua</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} ua</unitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName draft="unconfirmed">gramm</displayName>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName draft="unconfirmed">mcg</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} mcg</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName draft="unconfirmed">milies/hor</displayName>
@@ -3725,7 +3262,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-liter">
 				<displayName draft="unconfirmed">l</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} L</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/L</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -3736,6 +3272,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<compoundUnit type="power2"/>
+			<compoundUnit type="power3"/>
 			<compoundUnit type="times">
 				<compoundUnitPattern draft="unconfirmed">{0}⋅{1}</compoundUnitPattern>
 			</compoundUnit>
@@ -3744,7 +3282,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="digital-byte">
 				<displayName draft="unconfirmed">o</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} o</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName draft="unconfirmed">a</displayName>
@@ -3763,7 +3300,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-minute">
 				<displayName draft="unconfirmed">m</displayName>
-				<unitPattern count="other" draft="unconfirmed">{0} m</unitPattern>
 				<perUnitPattern draft="unconfirmed">{0}/m</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
@@ -3836,7 +3372,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabelPattern type="miscellaneous" draft="unconfirmed">{0} — varie</characterLabelPattern>
 		<characterLabelPattern type="other" draft="unconfirmed">{0} — altri</characterLabelPattern>
 		<characterLabelPattern type="scripts" draft="unconfirmed">scrituras — {0}</characterLabelPattern>
-		<characterLabelPattern type="strokes" count="other" draft="unconfirmed">{0}-strec</characterLabelPattern>
 		<characterLabelPattern type="subscript" draft="unconfirmed">subscrit {0}</characterLabelPattern>
 		<characterLabelPattern type="superscript" draft="unconfirmed">surscrit {0}</characterLabelPattern>
 		<characterLabel type="activities" draft="unconfirmed">activité</characterLabel>
diff --git a/make/data/cldr/common/main/ig.xml b/make/data/cldr/common/main/ig.xml
index 787eb2c8133..dc610707af9 100644
--- a/make/data/cldr/common/main/ig.xml
+++ b/make/data/cldr/common/main/ig.xml
@@ -23,19 +23,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ak">Akan</language>
 			<language type="ale">Aleut</language>
 			<language type="alt">Southern Altai</language>
-			<language type="am">Amariikị</language>
+			<language type="am">Asụsụ Amariikị</language>
 			<language type="an">Aragonisị</language>
 			<language type="ann">Obolo</language>
 			<language type="anp">Angika</language>
 			<language type="apc">apcc</language>
-			<language type="ar">Arabiikị</language>
+			<language type="ar">Asụsụ Arabiikị</language>
 			<language type="ar_001">Ụdị Arabiikị nke oge a</language>
 			<language type="arn">Mapuche</language>
 			<language type="arp">Arapaho</language>
 			<language type="ars">Najdi Arabikị</language>
-			<language type="as">Asamisị</language>
+			<language type="as">Asụsụ Asamisị</language>
 			<language type="asa">Asụ</language>
-			<language type="ast">Asturianị</language>
+			<language type="ast">Asụsụ Asturianị</language>
 			<language type="atj">Atikamekw</language>
 			<language type="av">Avarịk</language>
 			<language type="awa">Awadhi</language>
@@ -180,7 +180,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hu">Hungarian</language>
 			<language type="hup">Hupa</language>
 			<language type="hur">Halkomelem</language>
-			<language type="hy">Armenianị</language>
+			<language type="hy">Asụsụ Armenianị</language>
 			<language type="hz">Herero</language>
 			<language type="ia">Interlingua</language>
 			<language type="iba">Iban</language>
@@ -237,6 +237,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafịa</language>
 			<language type="ksh">Colognian</language>
 			<language type="ku">Kurdish</language>
+			<language type="ku" menu="core">Asụsụ Kurdish</language>
+			<language type="ku" menu="extension">Asụsụ Kurmanji</language>
 			<language type="kum">Kumik</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Cornish</language>
@@ -992,47 +994,86 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Ụsọrọ egọ</key>
 			<key type="collation">Ụsọrọ Nhazị</key>
 			<key type="currency">Egọ</key>
+			<key type="em">Ngosiputa Emoji</key>
 			<key type="hc">Okịrịkịrị Awa (12 vs 24)</key>
 			<key type="lb">Akara akanka nkwụsị</key>
+			<key type="lw">Nkwụsị Ahịrị n’ime Okwu</key>
 			<key type="ms">Ụsọrọ Mmeshọ</key>
 			<key type="numbers">Nọmba</key>
+			<key type="ss">Nkwụsị ahịrịokwu mgbe nkenke gasịrị</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kalenda Bụddịst</type>
+			<type key="calendar" type="buddhist" scope="core">Onye ụka Buda</type>
 			<type key="calendar" type="chinese">Kalenda Chinese</type>
+			<type key="calendar" type="chinese" scope="core">China</type>
 			<type key="calendar" type="coptic">Kalenda Koptic</type>
+			<type key="calendar" type="coptic" scope="core">Koptic</type>
 			<type key="calendar" type="dangi">Kalenda Dang</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kalenda Etopịa</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiopic Amete Alem Kalenda</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Kalenda Gregory</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Kalenda Hebrew</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrew</type>
 			<type key="calendar" type="indian">Kalenda India</type>
 			<type key="calendar" type="islamic">Kalenda Hijri</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Kalenda Hijri</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabular, civil epoch)</type>
 			<type key="calendar" type="islamic-rgsa">Kalenda Hijri (Saudi Arabia, sighting)</type>
 			<type key="calendar" type="islamic-tbla">Kalenda Hijri (tabular, astronomical epoch)</type>
 			<type key="calendar" type="islamic-umalqura">Kalenda Hijri (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Kalenda ISO-8601</type>
 			<type key="calendar" type="japanese">Kalenda Japanese</type>
+			<type key="calendar" type="japanese" scope="core">Japanese</type>
 			<type key="calendar" type="persian">Kalenda Persian</type>
+			<type key="calendar" type="persian" scope="core">Persian</type>
 			<type key="calendar" type="roc">Kalenda repụblic nke China</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Ụsọrọ akantụ egọ</type>
+			<type key="cf" type="account" scope="core">Akantụ egọ</type>
 			<type key="cf" type="standard">Ụsọrọ egọ nzụgbe</type>
+			<type key="cf" type="standard" scope="core">Ụkpụrụ</type>
 			<type key="collation" type="ducet">Default Unicode ụsọrọ nhazị</type>
+			<type key="collation" type="ducet" scope="core">Unicode Ndabere</type>
 			<type key="collation" type="phonebook">Nhazị akwụkwọ ebe a na-ede nọmba fon</type>
 			<type key="collation" type="pinyin">Pinyin ụsọrọ nhazị</type>
 			<type key="collation" type="search">Ọchụchụ nịle</type>
+			<type key="collation" type="search" scope="core">Ọchụchụ</type>
 			<type key="collation" type="standard">Usoro Nhazi</type>
+			<type key="collation" type="standard" scope="core">Ụkpụrụ</type>
+			<type key="em" type="default" scope="core">Ndabara</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">Ederede</type>
 			<type key="hc" type="h11">Ụsọrọ Okịrịkịrị awa iri na abụọ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Ụsọrọ Okịrịkịrị awa iri na abụọ (0–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Ụsọrọ Okịrịkịrị (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Ụsọrọ Okịrịkịrị (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Akara akanka nkwụsị esịghị ịke</type>
+			<type key="lb" type="loose" scope="core">Esịghị ịke</type>
 			<type key="lb" type="normal">Akara akanka nkwụsị kwesịrị</type>
+			<type key="lb" type="normal" scope="core">Kwesịrị</type>
 			<type key="lb" type="strict">Akara akanka nkwụsị sịrị ịke</type>
+			<type key="lb" type="strict" scope="core">Sịrị ịke</type>
+			<type key="lw" type="breakall" scope="core">Kewaa nke niile</type>
+			<type key="lw" type="keepall" scope="core">Dobe nke niile</type>
+			<type key="lw" type="normal" scope="core">Nkịtị</type>
+			<type key="lw" type="phrase" scope="core">Dobe na nkebiokwu</type>
 			<type key="ms" type="metric">Ụsọrọ Metric</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">Ụsọrọ Mmeshọ ịmperịa</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Ụsọrọ Mmeshọ US</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="ahom">Ọnụ ọgụgụ Ahom</type>
 			<type key="numbers" type="arab">Ọnụ ọgụgụ Arab na Indị</type>
 			<type key="numbers" type="arabext">Ọnụ ọgụgụ Arab na Indị agbatịrị</type>
@@ -1123,6 +1164,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="vaii">Ọnụ ọgụgụ Vai</type>
 			<type key="numbers" type="wara">Ọnụ ọgụgụ Warang Citi</type>
 			<type key="numbers" type="wcho">Ọnụ ọgụgụ Wancho</type>
+			<type key="ss" type="none" scope="core">Mgbanyụ</type>
+			<type key="ss" type="standard" scope="core">Mgbanye</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metriik</measurementSystemName>
@@ -1172,6 +1215,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'na' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'na' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1180,6 +1226,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'na' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'na' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1260,20 +1309,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">N</month>
 							<month type="12">D</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Jenụwarị</month>
-							<month type="2">Febrụwarị</month>
-							<month type="3">Maachị</month>
-							<month type="4">Epreel</month>
-							<month type="5">Mee</month>
-							<month type="6">Jun</month>
-							<month type="7">Julaị</month>
-							<month type="8">Ọgọọst</month>
-							<month type="9">Septemba</month>
-							<month type="10">Ọktoba</month>
-							<month type="11">Novemba</month>
-							<month type="12">Disemba</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -1313,14 +1348,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">Ọkara 4</quarter>
 						</quarterWidth>
 					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
@@ -1328,29 +1355,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="am">N’ụtụtụ</dayPeriod>
 							<dayPeriod type="pm">N’abalị</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">N’ụtụtụ</dayPeriod>
-							<dayPeriod type="pm">N’abalị</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">N’ụtụtụ</dayPeriod>
 							<dayPeriod type="pm">N’abali</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">N’ụtụtụ</dayPeriod>
-							<dayPeriod type="pm">N’abalị</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">N’ụtụtụ</dayPeriod>
-							<dayPeriod type="pm">N’abalị</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">N’ụtụtụ</dayPeriod>
-							<dayPeriod type="pm">N’abalị</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
@@ -1423,6 +1432,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'na' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'na' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1431,6 +1443,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'na' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'na' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1465,10 +1480,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yw" count="other">'Izu' w 'n' 'ime' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1479,10 +1490,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
@@ -1492,46 +1499,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">MM/y – MM/y</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1541,12 +1514,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="era">
 				<displayName>Oge</displayName>
 			</field>
-			<field type="era-short">
-				<displayName>Oge</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName>Oge</displayName>
-			</field>
 			<field type="year">
 				<displayName>Afọ</displayName>
 				<relative type="-1">Afọ gara aga</relative>
@@ -1559,9 +1526,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="1">afọ na-abịa</relative>
 			</field>
 			<field type="year-narrow">
-				<relative type="-1">Afọ gara aga</relative>
-				<relative type="0">Afọ a</relative>
-				<relative type="1">afọ na-abịa</relative>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">Afọ {0} gara aga</relativeTimePattern>
 				</relativeTime>
@@ -1578,38 +1542,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">Nkejị keanọ {0} gara aga</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="quarter-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="other">Nkejị keanọ {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">Nkejị keanọ {0} gara aga</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other">Nkejị keanọ {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">Nkejị keanọ {0} gara aga</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="month">
 				<displayName>Ọnwa</displayName>
 				<relative type="-1">Ọnwa gara aga</relative>
 				<relative type="0">Ọnwa a</relative>
 				<relative type="1">Ọnwa na-abịa</relative>
 			</field>
-			<field type="month-short">
-				<relative type="-1">Ọnwa gara aga</relative>
-				<relative type="0">Ọnwa a</relative>
-				<relative type="1">Ọnwa na-abịa</relative>
-			</field>
-			<field type="month-narrow">
-				<relative type="-1">Ọnwa gara aga</relative>
-				<relative type="0">Ọnwa a</relative>
-				<relative type="1">Ọnwa na-abịa</relative>
-			</field>
 			<field type="week">
 				<displayName>Izu</displayName>
 				<relative type="-1">Izu gara aga</relative>
@@ -1637,14 +1575,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">n’ụbọchị {0} gara aga</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="day-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other">n’ụbọchị {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">n’ụbọchị {0} gara aga</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="dayOfYear">
 				<displayName>ụbọchị na afọ</displayName>
 			</field>
@@ -1755,12 +1685,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">ụbọchị Faraịde gara aga</relative>
 				<relative type="0">ụbọchị Faraịde a</relative>
 				<relative type="1">ụọchị Faraịde na abịa</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">n’ụbọchị Faraịde {0}</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">n’ụbọchị Faraịde gara aga {0}</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="sat">
 				<relative type="-1">ụbọchị Satụde gara aga</relative>
@@ -1774,9 +1698,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">Ụbọchị Satụde gara aga</relative>
 				<relative type="0">ụbọchị Satụde a</relative>
 				<relative type="1">ụbọchị Satụde na abịa</relative>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">Ụbọchị Satụde {0} gara aga</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="sat-narrow">
 				<relative type="-1">ụbọchị Satụde gara aga</relative>
@@ -1800,9 +1721,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="second-short">
 				<displayName>sekọnd</displayName>
 			</field>
-			<field type="second-narrow">
-				<displayName>sekọnd</displayName>
-			</field>
 			<field type="zone">
 				<displayName>Mpaghara oge</displayName>
 			</field>
@@ -1829,9 +1747,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Oge Okpomọkụ Ireland</daylight>
 				</long>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>Oge Afghanistan</standard>
@@ -1854,9 +1769,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Oge Mpaghara Ọdịda Anyanwụ Afrịka</generic>
-					<standard>Oge Izugbe Mpaghara Ọdịda Anyanwụ Afrịka</standard>
-					<daylight>Oge Okpomọkụ Mpaghara Ọdịda Anyanwụ Afrịka</daylight>
+					<standard>Oge Mpaghara Ọdịda Anyanwụ Afrịka</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2206,6 +2119,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Oge Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Oge Izugbe Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Oge Hawaii-Aleutian</generic>
@@ -2740,7 +2658,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -3279,6 +3196,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>Ego Dollar obodo East Carribbean</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Ego Guilder Caribbean</displayName>
+				<displayName count="other">Ego Guilder Caribbean</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Ego CFA Franc obodo West Africa</displayName>
 				<displayName count="other">Ego CFA francs mba ọdịda anyanwụ Afrịka</displayName>
@@ -3302,6 +3223,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Ego Kwacha Obodo Zambia</displayName>
 				<displayName count="other">Ego kwachas obodo Zambia</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Ego Ọlaọcha Zimbabwe</displayName>
+				<displayName count="other">Ego Ọlaọcha Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -3349,6 +3274,59 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="power3">
 				<compoundUnitPattern1 count="other">{0} kubik</compoundUnitPattern1>
 			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="other">{0} g-force</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>meters per second squared</displayName>
+				<unitPattern count="other">{0} meters per second squared</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>square kilomita</displayName>
+				<unitPattern count="other">{0} square kilomita</unitPattern>
+				<perUnitPattern>{0} per square kilomita</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="other">{0} hectare</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>square mita</displayName>
+				<unitPattern count="other">{0} square mita</unitPattern>
+				<perUnitPattern>{0} kwa square mita</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>square centimita</displayName>
+				<unitPattern count="other">{0} square centimita</unitPattern>
+				<perUnitPattern>{0} kwa square centimita</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>square mile</displayName>
+				<unitPattern count="other">{0} square mile</unitPattern>
+				<perUnitPattern>{0} kwa square mile</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} acre</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>square yard</displayName>
+				<unitPattern count="other">{0} square yard</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>square feet</displayName>
+				<unitPattern count="other">{0} square feet</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>square inches</displayName>
+				<unitPattern count="other">{0} square inches</unitPattern>
+				<perUnitPattern>{0} kwa square inch</perUnitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>akụkụ gasị</displayName>
+				<unitPattern count="other">{0} akụkụ gasị</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="other">{0} of glucose</unitPattern>
+			</unit>
 			<unit type="duration-century">
 				<displayName>Ọtụtụ nari afọ</displayName>
 				<unitPattern count="other">{0} Ọtụtụ nari afọ</unitPattern>
@@ -3363,7 +3341,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-quarter">
 				<displayName>Nkeji Nkeano</displayName>
-				<unitPattern count="other">{0}/q</unitPattern>
+				<unitPattern count="other">{0} nkeji iri anọ</unitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>Ọtụtụ Ọnwa</displayName>
@@ -3375,12 +3353,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} Ọtụtụ Izu</unitPattern>
 				<perUnitPattern>{0} kwa Izu</perUnitPattern>
 			</unit>
-			<unit type="duration-day">
-				<displayName>Ọtụtụ Ubochi</displayName>
-				<unitPattern count="other">{0} Ọtụtụ Ubochi</unitPattern>
-			</unit>
 			<unit type="duration-hour">
-				<displayName>Ọtụtụ awa</displayName>
 				<unitPattern count="other">{0} Ọtụtụ awa</unitPattern>
 			</unit>
 			<unit type="duration-minute">
@@ -3393,10 +3366,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} sekọnd</unitPattern>
 				<perUnitPattern>{0} kwa sekọnd</perUnitPattern>
 			</unit>
+			<unit type="electric-ampere">
+				<displayName>ampere</displayName>
+				<unitPattern count="other">{0} ampere</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliampere</displayName>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="other">{0} ohm</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="other">{0} volt</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilocalorie</displayName>
+				<unitPattern count="other">{0} kilocalorie</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>calorie</displayName>
+				<unitPattern count="other">{0} calorie</unitPattern>
+			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>Kalori</displayName>
 				<unitPattern count="other">{0} Kalori</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilojoules</displayName>
+				<unitPattern count="other">{0} kilojoule</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="other">{0} joule</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kilowatt-hour</displayName>
+				<unitPattern count="other">{0} kilowatt-hour</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>electronvolt</displayName>
+				<unitPattern count="other">{0} electronvolt</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertz</displayName>
+				<unitPattern count="other">{0} kilohertz</unitPattern>
+			</unit>
 			<unit type="graphics-pixel">
 				<unitPattern count="other">{0} pixels</unitPattern>
 			</unit>
@@ -3420,29 +3433,388 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} ntụpọ kwa inch</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName>radius uwa</displayName>
+				<displayName>okirikiri ụwa</displayName>
+				<unitPattern count="other">{0} okirikiri ụwa</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilomita</displayName>
+				<unitPattern count="other">{0} kilomita</unitPattern>
+				<perUnitPattern>{0} kwa kilomita</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>mita</displayName>
+				<unitPattern count="other">{0} mita</unitPattern>
+				<perUnitPattern>{0} kwa mita</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimita</displayName>
+				<unitPattern count="other">{0} decimita</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>centimita</displayName>
+				<unitPattern count="other">{0} centimita</unitPattern>
+				<perUnitPattern>{0} kwa centimita</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>millimita</displayName>
+				<unitPattern count="other">{0} millimita</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>micromita</displayName>
+				<unitPattern count="other">{0} micromita</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanomita</displayName>
+				<unitPattern count="other">{0} nanomita</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picomita</displayName>
+				<unitPattern count="other">{0} picomita</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mile</displayName>
+				<unitPattern count="other">{0} mile</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yard</displayName>
+				<unitPattern count="other">{0} yard</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>feet</displayName>
+				<unitPattern count="other">{0} feet</unitPattern>
+				<perUnitPattern>{0} kwa foot</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+				<unitPattern count="other">{0} inches</unitPattern>
+				<perUnitPattern>{0} kwa inch</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>light years</displayName>
+				<unitPattern count="other">{0} light years</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>astronomical units</displayName>
+				<unitPattern count="other">{0} astronomical units</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>nautical miles</displayName>
+				<unitPattern count="other">{0} nautical miles</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>miles-scandinavian</displayName>
+				<unitPattern count="other">{0} miles-scandinavian</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>points</displayName>
+				<unitPattern count="other">{0} points</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>solar radii</displayName>
+				<unitPattern count="other">{0} solar radii</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>metric tons</displayName>
+				<unitPattern count="other">{0} metric tons</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>kilograms</displayName>
+				<unitPattern count="other">{0} kilograms</unitPattern>
+				<perUnitPattern>{0} kwa kilogram</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="other">{0} gram</unitPattern>
+				<perUnitPattern>{0} kwa gram</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>milligram</displayName>
+				<unitPattern count="other">{0} milligrams</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>microgram</displayName>
+				<unitPattern count="other">{0} microgram</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+				<unitPattern count="other">{0} ton</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pound</displayName>
+				<unitPattern count="other">{0} pound</unitPattern>
+				<perUnitPattern>{0} per pound</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ounce</displayName>
+				<unitPattern count="other">{0} ounce</unitPattern>
+				<perUnitPattern>{0} kwa ounce</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>troy ounce</displayName>
+				<unitPattern count="other">{0} troy ounce</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="other">{0} carat</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>dalton</displayName>
+				<unitPattern count="other">{0} dalton</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Earth mass</displayName>
+				<unitPattern count="other">{0} Earth mass</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>solar mass</displayName>
+				<unitPattern count="other">{0} solar mass</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigawatt</displayName>
+				<unitPattern count="other">{0} gigawatt</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megawatt</displayName>
+				<unitPattern count="other">{0} megawatt</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilowatt</displayName>
+				<unitPattern count="other">{0} kilowatt</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="other">{0} watt</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatt</displayName>
+				<unitPattern count="other">{0} milliwatt</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>horsepower</displayName>
+				<unitPattern count="other">{0} horsepower</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>nke mekuri</displayName>
+				<unitPattern count="other">{0} nke mekuri</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ike-paụnd kwa sukwịa inch</displayName>
+				<unitPattern count="other">{0} ike-paụnd kwa sukwịa inch</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>inche kwa mekuri</displayName>
+				<unitPattern count="other">{0} inche kwa mekuri</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>kilometers per hour</displayName>
+				<unitPattern count="other">{0} kilometers per hour</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>meters per second</displayName>
+				<unitPattern count="other">{0} meters per second</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>miles per hour</displayName>
+				<unitPattern count="other">{0} miles per hour</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>knots</displayName>
+				<unitPattern count="other">{0} knots</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
 				<displayName>Beaufort</displayName>
 				<unitPattern count="other">Beaufort {0}</unitPattern>
 			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>cubic kilomita</displayName>
+				<unitPattern count="other">{0} cubic kilomita</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>cubic mita</displayName>
+				<unitPattern count="other">{0} cubic mita</unitPattern>
+				<perUnitPattern>{0} kwa cubic mita</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>cubic centimita</displayName>
+				<unitPattern count="other">{0} cubic centimita</unitPattern>
+				<perUnitPattern>{0} kwa cubic centimita</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>cubic mile</displayName>
+				<unitPattern count="other">{0} cubic mile</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>cubic yard</displayName>
+				<unitPattern count="other">{0} cubic yard</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>cubic feet</displayName>
+				<unitPattern count="other">{0} cubic feet</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>cubic inches</displayName>
+				<unitPattern count="other">{0} cubic inches</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="other">{0} megaliter</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectoliter</displayName>
+				<unitPattern count="other">{0} hectoliter</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="other">{0} liter</unitPattern>
+				<perUnitPattern>{0} kwa liter</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>deciliter</displayName>
+				<unitPattern count="other">{0} deciliter</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliter</displayName>
+				<unitPattern count="other">{0} centiliter</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>milliliter</displayName>
+				<unitPattern count="other">{0} milliliter</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>metric pints</displayName>
+				<unitPattern count="other">{0} metric pint</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>metric cup</displayName>
+				<unitPattern count="other">{0} metric cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metric fluid ounces</displayName>
+				<unitPattern count="other">{0} metric fluid ounces</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gallon</displayName>
+				<unitPattern count="other">{0} gallon</unitPattern>
+				<perUnitPattern>{0} kwa gallon</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>Imp. gallons</displayName>
+				<unitPattern count="other">{0} Imp. gallons</unitPattern>
+				<perUnitPattern>{0} per Imp. gallon</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>quart</displayName>
+				<unitPattern count="other">{0} quart</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+				<unitPattern count="other">{0} pint</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>iko</displayName>
+				<unitPattern count="other">{0} iko</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fluid ounce</displayName>
+				<unitPattern count="other">{0} fluid ounces</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>Imp. fluid ounces</displayName>
+				<unitPattern count="other">{0} Imp. fluid ounces</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ngaji</displayName>
+				<unitPattern count="other">{0} ngaji</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>obere ngaji</displayName>
+				<unitPattern count="other">{0} obere ngaji</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>barel</displayName>
+				<unitPattern count="other">{0} barel</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName>ngaji mégharia onu</displayName>
+				<unitPattern count="other">{0} ngaji mégharia onu</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>Imp. ngaji megharịa ọnụ</displayName>
+				<unitPattern count="other">{0} Imp. ngaji mégharia onu</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>ntụsà</displayName>
+				<unitPattern count="other">{0} ntụsà</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName>mmiri dram</displayName>
+				<displayName>dram</displayName>
+				<unitPattern count="other">{0} dram</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ìhè</displayName>
-				<unitPattern count="other">{0} ìhè</unitPattern>
+			<unit type="volume-quart-imperial">
+				<displayName>Imp. quarts</displayName>
+				<unitPattern count="other">{0} Imp. quarts</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="other">{0} steradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kolumb</displayName>
+				<unitPattern count="other">{0} kolumb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorie [IT]</displayName>
+				<unitPattern count="other">{0} calorie [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograms-force</displayName>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>akụkụ kwa ijeri</displayName>
 				<unitPattern count="other">{0} akụkụ kwa ijeri</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>Ọtụtụ abali</displayName>
-				<unitPattern count="other">{0} Ọtụtụ abali</unitPattern>
 				<perUnitPattern>{0} kwa abali</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -3453,10 +3825,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>meters/sec²</displayName>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>mita²</displayName>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>sq mile</displayName>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards²</displayName>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>sq feet</displayName>
+				<unitPattern count="other">{0} sq ft</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>inches²</displayName>
+			</unit>
 			<unit type="concentr-item">
 				<displayName>ihe</displayName>
 				<unitPattern count="other">{0} ihe</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>akụkụ</displayName>
+				<unitPattern count="other">{0} akụkụ</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="duration-quarter">
 				<unitPattern count="other">{0} qtrs</unitPattern>
 			</unit>
@@ -3474,10 +3872,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Ọtụtụ awa</displayName>
 				<unitPattern count="other">{0} awa</unitPattern>
 			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliamp</displayName>
+			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>Kal</displayName>
 				<unitPattern count="other">{0} Kal</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilojoule</displayName>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kW-hour</displayName>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>electronvolt</displayName>
+			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>dpcm</displayName>
 				<unitPattern count="other">{0} dpcm</unitPattern>
@@ -3490,17 +3900,142 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ntụpọ</displayName>
 				<unitPattern count="other">{0} ntụpọ</unitPattern>
 			</unit>
+			<unit type="length-earth-radius">
+				<displayName>okirikiri ụwa</displayName>
+			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>μmita</displayName>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mile</displayName>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yard</displayName>
+			</unit>
+			<unit type="length-foot">
+				<displayName>feet</displayName>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>light yrs</displayName>
+			</unit>
+			<unit type="length-point">
+				<displayName>points</displayName>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>solar radii</displayName>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pound</displayName>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>dalton</displayName>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Earth mass</displayName>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>solar mass</displayName>
+			</unit>
+			<unit type="mass-grain">
+				<unitPattern count="other">{0} gr</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>nke Hg</displayName>
+				<unitPattern count="other">{0} nke Hg</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/hour</displayName>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>meters/sec</displayName>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>miles/hour</displayName>
+				<unitPattern count="other">{0} mph</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yards³</displayName>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>feet³</displayName>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>inches³</displayName>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="other">{0} L</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0} gal</unitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<perUnitPattern>{0}/galImp</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>qts</displayName>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>iko</displayName>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>barel</displayName>
+			</unit>
 			<unit type="volume-dessert-spoon">
 				<displayName>ngaji mégharia onu</displayName>
+				<unitPattern count="other">{0} dsp</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>Imp. ngaji mégharia onu</displayName>
+				<unitPattern count="other">{0} dsp-Imp.</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<displayName>dobé</displayName>
+				<displayName>ntụsà</displayName>
+				<unitPattern count="other">{0} ntụsà</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>dram</displayName>
+				<unitPattern count="other">{0} dram</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<unitPattern count="other">{0} pn</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>Imp. quarts</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ìhè</displayName>
 				<unitPattern count="other">{0} ìhè</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>akụkụ/ijeri</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -3510,25 +4045,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="acceleration-g-force">
+				<unitPattern count="other">{0}Gs</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<unitPattern count="other">{0}m/s²</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>mita²</displayName>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards²</displayName>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>sq feet</displayName>
+				<unitPattern count="other">{0} sq ft</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>inches²</displayName>
+			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<unitPattern count="other">{0}mmol/L</unitPattern>
 			</unit>
 			<unit type="concentr-item">
 				<unitPattern count="other">{0}ihe</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>akụkụ</displayName>
+				<unitPattern count="other">{0}akụkụ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="duration-quarter">
 				<unitPattern count="other">{0}q</unitPattern>
 			</unit>
+			<unit type="duration-week">
+				<unitPattern count="other">{0}w</unitPattern>
+			</unit>
 			<unit type="duration-day">
 				<displayName>Ubochi</displayName>
-				<unitPattern count="other">{0} Ọtụtụ Ubochi</unitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>awa</displayName>
-				<unitPattern count="other">{0} awa</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>μsec</displayName>
@@ -3537,6 +4099,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-nanosecond">
 				<unitPattern count="other">{0}ns</unitPattern>
 			</unit>
+			<unit type="electric-ampere">
+				<unitPattern count="other">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliamp</displayName>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="other">{0}Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="other">{0}V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>kal</displayName>
 				<unitPattern count="other">{0}kal</unitPattern>
@@ -3544,6 +4121,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="energy-foodcalorie">
 				<unitPattern count="other">{0}Kal</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="other">{0}kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>kW-hour</displayName>
+				<unitPattern count="other">{0}kWh</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>electronvolt</displayName>
+				<unitPattern count="other">{0}eV</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<unitPattern count="other">{0}US therm</unitPattern>
+			</unit>
 			<unit type="force-newton">
 				<unitPattern count="other">{0}N</unitPattern>
 			</unit>
@@ -3557,30 +4151,223 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}MP</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
-				<displayName>dpcm</displayName>
 				<unitPattern count="other">{0}dpcm</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
-				<displayName>dpi</displayName>
 				<unitPattern count="other">{0}dpi</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<unitPattern count="other">{0}ntụpọ</unitPattern>
 			</unit>
+			<unit type="length-meter">
+				<displayName>m</displayName>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>μmita</displayName>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mile</displayName>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yard</displayName>
+			</unit>
+			<unit type="length-foot">
+				<displayName>feet</displayName>
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>inches</displayName>
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsec</displayName>
+			</unit>
+			<unit type="length-point">
+				<displayName>pts</displayName>
+			</unit>
+			<unit type="mass-tonne">
+				<unitPattern count="other">{0}t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="other">{0}kg</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="other">{0}mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="other">{0}μg</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>ton</displayName>
+				<unitPattern count="other">{0}tn</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>pound</displayName>
+				<unitPattern count="other">{0}#</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0}oz</unitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>oz troy</displayName>
+				<unitPattern count="other">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carat</displayName>
+				<unitPattern count="other">{0}CD</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>dalton</displayName>
+				<unitPattern count="other">{0}Da</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>Earth mass</displayName>
+				<unitPattern count="other">{0}M⊕</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>solar mass</displayName>
+				<unitPattern count="other">{0}M☉</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>gr</displayName>
+				<unitPattern count="other">{0}gr</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<unitPattern count="other">{0}GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<unitPattern count="other">{0}MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="other">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="other">{0}W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0}hp</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>nke Hg</displayName>
+				<unitPattern count="other">{0}nke Hg</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>″ Hg</displayName>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>km/hr</displayName>
+				<unitPattern count="other">{0}km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>meters/sec</displayName>
+				<unitPattern count="other">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>mi/hr</displayName>
+				<unitPattern count="other">{0}mph</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<unitPattern count="other">{0}kn</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="other">B{0}</unitPattern>
 			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yards³</displayName>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>feet³</displayName>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="other">{0} L</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>pt</displayName>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<unitPattern count="other">{0}gal-Im</unitPattern>
+				<perUnitPattern>{0}/galIm</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>qts</displayName>
+				<unitPattern count="other">{0}qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pint</displayName>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>iko</displayName>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="other">{0}fl oz</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<unitPattern count="other">{0}fl oz Im</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<unitPattern count="other">{0}tbsp</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<unitPattern count="other">{0}tsp</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>barel</displayName>
+				<unitPattern count="other">{0}bbl</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>dsp</displayName>
+				<unitPattern count="other">{0}dsp</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>dsp Imp</displayName>
+				<unitPattern count="other">{0}dsp-Imp</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>dr</displayName>
+				<unitPattern count="other">{0}dr</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>fl.dr.</displayName>
+				<unitPattern count="other">{0}fl.dr.</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<unitPattern count="other">{0}jigger</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>pn</displayName>
+				<unitPattern count="other">{0}pn</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>Imp. quarts</displayName>
+				<unitPattern count="other">{0}qt-Imp.</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ìhè</displayName>
 				<unitPattern count="other">{0}ìhè</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>akụkụ/ijeri</displayName>
 			</unit>
 			<unit type="duration-night">
-				<displayName>Ọtụtụ abali</displayName>
 				<unitPattern count="other">{0}Ọtụtụ abali</unitPattern>
-				<perUnitPattern>{0}/abali</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -3593,22 +4380,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0}, ma ọ bụ {1}</listPatternPart>
 			<listPatternPart type="2">{0} ma ọ bụ {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end">{0}, ma ọ bụ {1}</listPatternPart>
-			<listPatternPart type="2">{0} ma ọ bụ {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end">{0}, ma ọ bụ {1}</listPatternPart>
-			<listPatternPart type="2">{0} ma ọ bụ {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="standard-narrow">
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="end">{0}, {1}</listPatternPart>
-			<listPatternPart type="2">{0}, {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="end">{0} {1}</listPatternPart>
 			<listPatternPart type="2">{0} {1}</listPatternPart>
diff --git a/make/data/cldr/common/main/ii.xml b/make/data/cldr/common/main/ii.xml
index 268e4a9808e..1c61148df34 100644
--- a/make/data/cldr/common/main/ii.xml
+++ b/make/data/cldr/common/main/ii.xml
@@ -17,7 +17,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</localeDisplayPattern>
 		<languages>
 			<language type="ar">ꀊꇁꀨꉙ</language>
-			<language type="ar_001">ꀊꇁꀨꉙ（ꋧꃅ）</language>
 			<language type="de">ꄓꇩꉙ</language>
 			<language type="en">ꑱꇩꉙ</language>
 			<language type="es">ꑭꀠꑸꉙ</language>
@@ -95,6 +94,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="index" draft="contributed">[A B {BB} C {CH} D {DD} E F G {GG} H {HL} {HM} {HN} {HX} I {IE} J {JJ} K L M {MG} N {NB} {ND} {NG} {NJ} {NR} {NY} {NZ} O P Q R {RR} S {SH} {SS} T {UO} V W X Y Z {ZH} {ZZ}]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . {\\\-} % ‰ + 0 1 2 3 4 5 6 7 8 9 {ꋍꑍꌕꇖꉬꃘꏃꉆꈬ}]</exemplarCharacters>
 		<exemplarCharacters type="punctuation" draft="contributed">[﹉﹊﹋﹌ _＿﹍﹎﹏︳︴ \-－﹣ ‐‑ – —︱ ― ,，﹐ 、﹑ ;；﹔ \:：﹕ !！﹗ ?？﹖ .．﹒ ‥︰ … 。 · ＇‘’ ＂“”〝〞 (（﹙︵ )）﹚︶ \[［ \]］ \{｛﹛︷ \}｝﹜︸ 〈︿ 〉﹀ 《︽ 》︾ 「﹁ 」﹂ 『﹃ 』﹄ 【︻ 】︼ 〔﹝︹ 〕﹞︺ 〖 〗 ‖ § @＠﹫ *＊﹡ /／ \\＼﹨ \&amp;＆﹠ #＃﹟ %％﹪ ‰ ′ ″ ‵ 〃 ※]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person" draft="contributed">[\- ‐‑ ・ . · ⸱]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
diff --git a/make/data/cldr/common/main/is.xml b/make/data/cldr/common/main/is.xml
index a1cd0c5ef1c..def029d1654 100644
--- a/make/data/cldr/common/main/is.xml
+++ b/make/data/cldr/common/main/is.xml
@@ -284,6 +284,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafía</language>
 			<language type="ksh">kölníska</language>
 			<language type="ku">kúrdíska</language>
+			<language type="ku" menu="core">kúrdíska</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kúmík</language>
 			<language type="kut">kútenaí</language>
 			<language type="kv">komíska</language>
@@ -780,6 +782,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kína</territory>
 			<territory type="CO">Kólumbía</territory>
 			<territory type="CP">Clipperton-eyja</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostaríka</territory>
 			<territory type="CU">Kúba</territory>
 			<territory type="CV">Grænhöfðaeyjar</territory>
@@ -956,6 +959,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SX">Sint Maarten</territory>
 			<territory type="SY">Sýrland</territory>
 			<territory type="SZ">Esvatíní</territory>
+			<territory type="SZ" alt="variant">Svasíland</territory>
 			<territory type="TA">Tristan da Cunha</territory>
 			<territory type="TC">Turks- og Caicoseyjar</territory>
 			<territory type="TD">Tsjad</territory>
@@ -1025,33 +1029,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Talnaröðun</key>
 			<key type="colStrength">Röðunarstyrkur</key>
 			<key type="currency">Gjaldmiðill</key>
+			<key type="em">Framsetning emoji</key>
 			<key type="hc">Tímakerfi (12 eða 24)</key>
 			<key type="lb">Línuskipting</key>
+			<key type="lw">Línuskil innan orða</key>
 			<key type="ms">Mælingakerfi</key>
 			<key type="numbers">Tölur</key>
+			<key type="ss">Hindranir á línuskiptingu</key>
 			<key type="timezone">Tímabelti</key>
 			<key type="va">Landsstaðalsafbrigði</key>
 			<key type="x">Einkanotkun</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Búddískt tímatal</type>
-			<type key="calendar" type="chinese">Kínversk tímatal</type>
+			<type key="calendar" type="buddhist" scope="core">Búddískt</type>
+			<type key="calendar" type="chinese">Kínverskt tímatal</type>
+			<type key="calendar" type="chinese" scope="core">Kínverskt</type>
 			<type key="calendar" type="coptic">Koptískt tímatal</type>
-			<type key="calendar" type="dangi">Dangi tímatal</type>
+			<type key="calendar" type="coptic" scope="core">Koptískt</type>
+			<type key="calendar" type="dangi">Dangi-tímatal</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Eþíópískt tímatal</type>
+			<type key="calendar" type="ethiopic" scope="core">Eþíópískt</type>
 			<type key="calendar" type="ethiopic-amete-alem">Eþíópískt ‘amete alem’ tímatal</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Eþíópískt ‘amete alem’</type>
 			<type key="calendar" type="gregorian">Gregorískt tímatal</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorískt</type>
 			<type key="calendar" type="hebrew">Hebreskt tímatal</type>
+			<type key="calendar" type="hebrew" scope="core">Hebreskt</type>
 			<type key="calendar" type="indian">indverskt dagatal</type>
 			<type key="calendar" type="islamic">Íslamskt tímatal</type>
+			<type key="calendar" type="islamic" scope="core">Íslamskt tímatal</type>
 			<type key="calendar" type="islamic-civil">Íslamskt borgaradagatal</type>
+			<type key="calendar" type="islamic-civil" scope="core">Íslamskt borgaradagatal</type>
 			<type key="calendar" type="islamic-umalqura">Íslamskt dagatal (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Íslamskt dagatal (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 tímatal</type>
 			<type key="calendar" type="japanese">Japanskt tímatal</type>
+			<type key="calendar" type="japanese" scope="core">Japanskt</type>
 			<type key="calendar" type="persian">Persneskt tímatal</type>
-			<type key="calendar" type="roc">Minguo tímatal</type>
+			<type key="calendar" type="persian" scope="core">Persneskt</type>
+			<type key="calendar" type="roc">Minguo-tímatal</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Bókhaldsgjaldmiðill</type>
+			<type key="cf" type="account" scope="core">Bókhald</type>
 			<type key="cf" type="standard">Staðlað gjaldmiðilssnið</type>
+			<type key="cf" type="standard" scope="core">Staðlað</type>
 			<type key="colAlternate" type="non-ignorable">Raða táknum</type>
 			<type key="colAlternate" type="shifted">Raða óháð táknum</type>
 			<type key="colBackwards" type="no">Raða áherslum eðlilega</type>
@@ -1061,18 +1084,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Raða hástöfum fyrst</type>
 			<type key="colCaseLevel" type="no">Raða óháð hástöfum og lágstöfum</type>
 			<type key="colCaseLevel" type="yes">Raða stafrétt</type>
-			<type key="collation" type="big5han">hefðbundin kínversk röðun - Big5</type>
 			<type key="collation" type="compat">Fyrri röðun, til samræmis</type>
 			<type key="collation" type="dictionary">Orðabókarröð</type>
 			<type key="collation" type="ducet">Sjálfgefin Unicode-röðun</type>
+			<type key="collation" type="ducet" scope="core">Sjálfgefin Unicode</type>
 			<type key="collation" type="eor">Evrópskar reglur um röðun</type>
-			<type key="collation" type="gb2312han">einfölduð kínversk röðun - GB2312</type>
 			<type key="collation" type="phonebook">Símaskráarröðun</type>
 			<type key="collation" type="phonetic">Hljóðfræðileg röð</type>
 			<type key="collation" type="pinyin">Pinyin-röðun</type>
 			<type key="collation" type="search">Almenn leit</type>
+			<type key="collation" type="search" scope="core">Leit</type>
 			<type key="collation" type="searchjl">Leita eftir upphafssamhljóða í Hangul</type>
 			<type key="collation" type="standard">Stöðluð röðun</type>
+			<type key="collation" type="standard" scope="core">Stöðluð</type>
 			<type key="collation" type="stroke">Strikaröðun</type>
 			<type key="collation" type="traditional">Hefðbundin</type>
 			<type key="collation" type="unihan">Röðun eftir grunnstrikum</type>
@@ -1088,18 +1112,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Full breidd</type>
 			<type key="d0" type="hwidth">Hálfbreidd</type>
 			<type key="d0" type="npinyin">Tölulegur</type>
+			<type key="em" type="default" scope="core">Staðlað</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Texti</type>
 			<type key="hc" type="h11">12 tíma kerfi (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 tíma kerfi (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 tíma kerfi (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 tíma kerfi (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Laus línuskipting</type>
+			<type key="lb" type="loose" scope="core">Laus</type>
 			<type key="lb" type="normal">Venjuleg línuskipting</type>
+			<type key="lb" type="normal" scope="core">Venjuleg</type>
 			<type key="lb" type="strict">Ströng línuskipting</type>
+			<type key="lb" type="strict" scope="core">Ströng</type>
+			<type key="lw" type="breakall" scope="core">Skipta öllu</type>
+			<type key="lw" type="keepall" scope="core">Halda öllu</type>
+			<type key="lw" type="normal" scope="core">Venjuleg</type>
+			<type key="lw" type="phrase" scope="core">Halda í setningum</type>
 			<type key="m0" type="bgn">US BGN umritun</type>
 			<type key="m0" type="ungegn">UN GEGN umritun</type>
 			<type key="ms" type="metric">Metrakerfi</type>
+			<type key="ms" type="metric" scope="core">Metrakerfi</type>
 			<type key="ms" type="uksystem">Breskt mælingakerfi</type>
+			<type key="ms" type="uksystem" scope="core">Breskt</type>
 			<type key="ms" type="ussystem">Bandarískt mælingakerfi</type>
+			<type key="ms" type="ussystem" scope="core">Bandarískt</type>
 			<type key="numbers" type="ahom">ahom-tölur</type>
 			<type key="numbers" type="arab">Arabískar-indverskar tölur</type>
 			<type key="numbers" type="arabext">Auknar arabískar-indverskar tölur</type>
@@ -1145,6 +1186,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Tíbeskir tölustafir</type>
 			<type key="numbers" type="traditional">Hefðbundin tölutákn</type>
 			<type key="numbers" type="vaii">Vai-tölustafir</type>
+			<type key="ss" type="none" scope="core">Slökkt</type>
+			<type key="ss" type="standard" scope="core">Kveikt</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrakerfi</measurementSystemName>
@@ -1161,13 +1204,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[a á b d ð e é f g h i í j k l m n o ó p r s t u ú v x y ý þ æ ö]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[c q w z]</exemplarCharacters>
 		<exemplarCharacters type="index">[A Á B C D Ð E É F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Þ Æ Ö]</exemplarCharacters>
-		<exemplarCharacters type="punctuation" draft="contributed">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1189,16 +1229,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="0">BD</era>
 					</eraAbbr>
 				</eras>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
 			</calendar>
 			<calendar type="coptic">
 				<months>
@@ -1241,12 +1271,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">Tímabil0</era>
-						<era type="1">Tímabil1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1281,6 +1305,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1289,6 +1316,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1305,13 +1335,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH'klst'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -1372,10 +1404,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d. MMM – E, d. MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d. MMM y – E, d. MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1386,10 +1414,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M.–M.</greatestDifference>
 						</intervalFormatItem>
@@ -1679,6 +1703,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1687,6 +1714,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1705,17 +1735,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="Hmsv">v – HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">v – HH:mm</dateFormatItem>
+						<dateFormatItem id="Hv">HH'klst'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -1778,10 +1810,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d. MMM – E, d. MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d. MMM y – E, d. MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1792,10 +1820,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M.–M.</greatestDifference>
 						</intervalFormatItem>
@@ -2637,7 +2661,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Tókýó</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kanton-eyja</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Sankti Kitts</exemplarCity>
@@ -2826,9 +2850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Vestur-Afríkutími</generic>
-					<standard>Staðaltími í Vestur-Afríku</standard>
-					<daylight>Sumartími í Vestur-Afríku</daylight>
+					<standard>Vestur-Afríkutími</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3185,6 +3207,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Gvæjanatími</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Staðaltími á Havaí og Aleúta</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Tími á Havaí og Aleúta</generic>
@@ -3766,6 +3793,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4783,6 +4814,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">austurkarabískur dalur</displayName>
 				<displayName count="other">austurkarabískir dalir</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karíbahafsgyllini</displayName>
+				<displayName count="one">Karíbahafsgyllini</displayName>
+				<displayName count="other">Karíbahafsgyllini</displayName>
+				<symbol>XCG</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>Sérstök dráttarréttindi</displayName>
 			</currency>
@@ -4843,6 +4880,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Simbabveskur dalur</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>simbabveskt gold</displayName>
+				<displayName count="one">simbabveskt gold</displayName>
+				<displayName count="other">simbabveskt gold</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5204,7 +5246,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} atriðum</unitPattern>
 				<unitPattern count="other" case="genitive">{0} atriða</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hlutar</displayName>
+				<unitPattern count="one">{0} hluti</unitPattern>
+				<unitPattern count="other">{0} hlutar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<unitPattern count="one">{0} milljónarhluti</unitPattern>
 				<unitPattern count="one" case="accusative">{0} milljónarhluta</unitPattern>
@@ -5259,6 +5306,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} mólum</unitPattern>
 				<unitPattern count="other" case="genitive">{0} móla</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>af glúkósa</displayName>
+				<unitPattern count="one">{0} af glúkósa</unitPattern>
+				<unitPattern count="other">{0} af glúkósa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>lítrar á kílómetra</displayName>
@@ -6240,6 +6292,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} millimetrum af kvikasilfri</unitPattern>
 				<unitPattern count="other" case="genitive">{0} millimetra af kvikasilfri</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>af kvikasilfri</displayName>
+				<unitPattern count="one">{0} af kvikasilfri</unitPattern>
+				<unitPattern count="other">{0} af kvikasilfri</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pund á fertommu</displayName>
 				<unitPattern count="one">{0} pund á fertommu</unitPattern>
@@ -6573,6 +6630,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} áströlskum bollum</unitPattern>
 				<unitPattern count="other" case="genitive">{0} ástralskra bolla</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>vökvaúnsur í metrakerfi</displayName>
+				<unitPattern count="one">{0} vökvaúnsa í metrakerfi</unitPattern>
+				<unitPattern count="other">{0} vökvaúnsur í metrakerfi</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gallon</displayName>
 				<unitPattern count="one">{0} gallon</unitPattern>
@@ -6640,7 +6702,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-pinch">
 				<displayName>klípur</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradíanar</displayName>
+				<unitPattern count="one">{0} steradíani</unitPattern>
+				<unitPattern count="other">{0} steradíanar</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katöl</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katöl</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kúlomb</displayName>
+				<unitPattern count="one">{0} kúlomb</unitPattern>
+				<unitPattern count="other">{0} kúlomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faröd</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} faröd</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>símens</displayName>
+				<unitPattern count="one">{0} símens</unitPattern>
+				<unitPattern count="other">{0} símens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>hitaeiningar [IT]</displayName>
+				<unitPattern count="one">{0} hitaeining [IT]</unitPattern>
+				<unitPattern count="other">{0} hitaeiningar [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekerel</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="other">{0} bekerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sívert</displayName>
+				<unitPattern count="one">{0} sívert</unitPattern>
+				<unitPattern count="other">{0} sívert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grei</displayName>
+				<unitPattern count="one">{0} grei</unitPattern>
+				<unitPattern count="other">{0} grei</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kílópond</displayName>
+				<unitPattern count="one">{0} kílópond</unitPattern>
+				<unitPattern count="other">{0} kílópond</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslur</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslur</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veber</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="other">{0} veber</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ljóshraði</displayName>
+				<unitPattern count="one">{0} ljóshraði</unitPattern>
+				<unitPattern count="other">{0} ljóshraðar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>hlutar á milljarð</displayName>
 				<unitPattern count="one">{0} hluti á milljarð</unitPattern>
@@ -6663,7 +6795,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} nætur</unitPattern>
 				<unitPattern count="other" case="dative">{0} nóttum</unitPattern>
 				<unitPattern count="other" case="genitive">{0} nótta</unitPattern>
-				<perUnitPattern>{0}/nótt</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>höfuðátt</displayName>
@@ -6763,7 +6894,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} atriði</unitPattern>
 				<unitPattern count="other">{0} atriði</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hluti</displayName>
+				<unitPattern count="one">{0} hluti</unitPattern>
+				<unitPattern count="other">{0} hlutar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>milljónarhlutar</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6782,6 +6918,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mól</unitPattern>
 				<unitPattern count="other">{0} mól</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lítrar/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7063,6 +7202,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} hö</unitPattern>
 				<unitPattern count="other">{0} hö</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>af Hg</displayName>
+				<unitPattern count="one">{0} af Hg</unitPattern>
+				<unitPattern count="other">{0} af Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>to Hg</displayName>
 				<unitPattern count="one">{0} to Hg</unitPattern>
@@ -7242,6 +7386,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} lagarmál</unitPattern>
 				<unitPattern count="other">{0} lagarmál</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ljóshraði</displayName>
+				<unitPattern count="one">{0} ljóshraði</unitPattern>
+				<unitPattern count="other">{0} ljóshraðar</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>næt.</displayName>
 				<unitPattern count="one">{0} nótt</unitPattern>
@@ -7316,7 +7470,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmól/l</unitPattern>
 				<unitPattern count="other">{0}mmól/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hluti</displayName>
+				<unitPattern count="one">{0} hluti</unitPattern>
+				<unitPattern count="other">{0} hlutar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -7329,6 +7488,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>l/100km</displayName>
 				<unitPattern count="one">{0}l/100km</unitPattern>
@@ -7449,6 +7611,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="mass-ounce-troy">
 				<displayName>oz t</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>af Hg</displayName>
+				<unitPattern count="one">{0} af Hg</unitPattern>
+				<unitPattern count="other">{0} af Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>inHg</displayName>
 				<unitPattern count="one">{0}&quot; Hg</unitPattern>
@@ -7505,6 +7672,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} l.mál</unitPattern>
 				<unitPattern count="other">{0} l.mál</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ljóshraði</displayName>
+				<unitPattern count="one">{0} ljóshraði</unitPattern>
+				<unitPattern count="other">{0} ljóshraðar</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>n.</displayName>
 				<unitPattern count="one">{0} n.</unitPattern>
diff --git a/make/data/cldr/common/main/it.xml b/make/data/cldr/common/main/it.xml
index a34f0ada80a..d8c2050ea31 100644
--- a/make/data/cldr/common/main/it.xml
+++ b/make/data/cldr/common/main/it.xml
@@ -328,6 +328,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">coloniese</language>
 			<language type="ku">curdo</language>
+			<language type="ku" menu="core">curdo</language>
+			<language type="ku" menu="extension">kurmancî</language>
 			<language type="kum">kumyk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -928,6 +930,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Cina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Isola di Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Capo Verde</territory>
@@ -1218,35 +1221,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Ordinamento numerico</key>
 			<key type="colStrength">Sicurezza ordinamento</key>
 			<key type="currency">Valuta</key>
+			<key type="em">Presentazione emoji</key>
 			<key type="hc">Sistema orario (12 o 24 ore)</key>
 			<key type="lb">Tipo di interruzione di riga</key>
+			<key type="lw">Interruzioni di riga all’interno delle parole</key>
 			<key type="ms">Sistema di misurazione</key>
 			<key type="numbers">Numeri</key>
+			<key type="ss">Interruzione frase dopo abbreviaz.</key>
 			<key type="timezone">Fuso orario</key>
 			<key type="va">Variante lingua</key>
 			<key type="x">Uso privato</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Calendario buddista</type>
+			<type key="calendar" type="buddhist" scope="core">Buddista</type>
 			<type key="calendar" type="chinese">Calendario cinese</type>
+			<type key="calendar" type="chinese" scope="core">Cinese</type>
 			<type key="calendar" type="coptic">Calendario copto</type>
+			<type key="calendar" type="coptic" scope="core">Copto</type>
 			<type key="calendar" type="dangi">Calendario dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Calendario etiope</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiope</type>
 			<type key="calendar" type="ethiopic-amete-alem">Calendario etiope Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etiope Amete Alem</type>
 			<type key="calendar" type="gregorian">Calendario gregoriano</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriano</type>
 			<type key="calendar" type="hebrew">Calendario ebraico</type>
+			<type key="calendar" type="hebrew" scope="core">Ebraico</type>
 			<type key="calendar" type="indian">calendario nazionale indiano</type>
 			<type key="calendar" type="islamic">Calendario Hijri</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Calendario Hijri (tabulare, epoca civile)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabulare, epoca civile)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Calendario islamico (Arabia Saudita, osservazione)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">Calendario islamico (tabulare, era astronomica)</type>
 			<type key="calendar" type="islamic-umalqura">Calendario Hijri (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Calendario ISO-8601</type>
 			<type key="calendar" type="japanese">Calendario giapponese</type>
+			<type key="calendar" type="japanese" scope="core">Giapponese</type>
 			<type key="calendar" type="persian">Calendario persiano</type>
+			<type key="calendar" type="persian" scope="core">Persiano</type>
 			<type key="calendar" type="roc">Calendario minguo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Formato valuta contabile</type>
+			<type key="cf" type="account" scope="core">Contabile</type>
 			<type key="cf" type="standard">Formato valuta standard</type>
+			<type key="cf" type="standard" scope="core">Standard</type>
 			<type key="colAlternate" type="non-ignorable">Ordina simboli</type>
 			<type key="colAlternate" type="shifted">Ordina ignorando i simboli</type>
 			<type key="colBackwards" type="no">Ordina accenti normalmente</type>
@@ -1256,21 +1278,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Ordina prima lettere minuscole</type>
 			<type key="colCaseLevel" type="no">Ordina senza distinzione tra maiuscole e minuscole</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Ordina distinzione tra maiuscole e minuscole</type>
-			<type key="collation" type="big5han">Ordinamento Cinese tradizionale - Big5</type>
 			<type key="collation" type="compat">Ordinamento precedente, per compatibilità</type>
+			<type key="collation" type="compat" scope="core">Compatibilità</type>
 			<type key="collation" type="dictionary">Ordinamento dizionario</type>
+			<type key="collation" type="dictionary" scope="core">Dizionario</type>
 			<type key="collation" type="ducet">Ordinamento Unicode predefinito</type>
-			<type key="collation" type="gb2312han">Ordinamento Cinese semplificato - GB2312</type>
+			<type key="collation" type="ducet" scope="core">Unicode predefinito</type>
 			<type key="collation" type="phonebook">Ordinamento Elenco telefonico</type>
+			<type key="collation" type="phonebook" scope="core">Elenco telefonico</type>
 			<type key="collation" type="phonetic">Ordinamento fonetico</type>
+			<type key="collation" type="phonetic" scope="core">Fonetico</type>
 			<type key="collation" type="pinyin">Ordinamento pinyin</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Ricerca generica</type>
+			<type key="collation" type="search" scope="core">Ricerca</type>
 			<type key="collation" type="searchjl">Cerca per consonante hangul iniziale</type>
 			<type key="collation" type="standard">Ordinamento standard</type>
+			<type key="collation" type="standard" scope="core">Standard</type>
 			<type key="collation" type="stroke">Ordinamento tratti</type>
+			<type key="collation" type="stroke" scope="core">Tratti</type>
 			<type key="collation" type="traditional">Ordinamento tradizionale</type>
+			<type key="collation" type="traditional" scope="core">Tradizionale</type>
 			<type key="collation" type="unihan">Ordinamento tratti radicali</type>
+			<type key="collation" type="unihan" scope="core">Tratti radicali</type>
 			<type key="collation" type="zhuyin">Ordinamento Zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no">Ordina senza normalizzazione</type>
 			<type key="colNormalization" type="yes">Ordina Unicode normalizzato</type>
 			<type key="colNumeric" type="no">Ordina cifre individualmente</type>
@@ -1283,18 +1315,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Larghezza intera</type>
 			<type key="d0" type="hwidth">Metà larghezza</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerica</type>
+			<type key="em" type="default" scope="core">Default</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Testo</type>
 			<type key="hc" type="h11">Sistema orario a 12 ore (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 ore (0–11)</type>
 			<type key="hc" type="h12">Sistema orario a 12 ore (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 ore (1–12)</type>
 			<type key="hc" type="h23">Sistema orario a 24 ore (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 ore (0–23)</type>
 			<type key="hc" type="h24">Sistema orario a 24 ore (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 ore (1–24)</type>
 			<type key="lb" type="loose">Interruzione di riga facoltativa</type>
+			<type key="lb" type="loose" scope="core">Facoltativa</type>
 			<type key="lb" type="normal">Interruzione di riga normale</type>
+			<type key="lb" type="normal" scope="core">Normale</type>
 			<type key="lb" type="strict">Interruzione di riga forzata</type>
+			<type key="lb" type="strict" scope="core">Forzata</type>
+			<type key="lw" type="breakall" scope="core">Dividi tutte</type>
+			<type key="lw" type="keepall" scope="core">Conserva tutte</type>
+			<type key="lw" type="normal" scope="core">Normale</type>
+			<type key="lw" type="phrase" scope="core">Conserva in sintagmi</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">Sistema metrico</type>
+			<type key="ms" type="metric" scope="core">Metrico</type>
 			<type key="ms" type="uksystem">Sistema imperiale britannico</type>
+			<type key="ms" type="uksystem" scope="core">Imperiale britannico</type>
 			<type key="ms" type="ussystem">Sistema consuetudinario statunitense</type>
+			<type key="ms" type="ussystem" scope="core">Consuetudinario statunitense</type>
 			<type key="numbers" type="arab">Cifre indo-arabe</type>
 			<type key="numbers" type="arabext">Cifre indo-arabe estese</type>
 			<type key="numbers" type="armn">Numeri armeni</type>
@@ -1357,6 +1406,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Cifre tibetane</type>
 			<type key="numbers" type="traditional">Numeri tradizionali</type>
 			<type key="numbers" type="vaii">Cifre Vai</type>
+			<type key="ss" type="none" scope="core">Off</type>
+			<type key="ss" type="standard" scope="core">On</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrico</measurementSystemName>
@@ -1395,13 +1446,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[aà b c d eéè f g h iì j k l m n oò p q r s t uù v w x y z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[ªáâåäã æ ç êë íîï ñ ºóôöõø œ ß úûü ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‑ — , ; \: ! ? . … '’ &quot;“” « » ( ) \[ \] \{ \} @ /]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ — , ; \: ! ? . … '’ &quot;“” « » ( ) \[ \] \{ \} @ * / \&amp; #]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1487,6 +1535,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'alle' 'ore' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'alle' 'ore' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1495,6 +1546,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'alle' 'ore' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'alle' 'ore' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1511,13 +1565,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">'h'HH v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1537,19 +1594,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
+							<greatestDifference id="G">MM/y G – MM/y G</greatestDifference>
 							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
 							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
@@ -1867,6 +1919,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'alle' 'ore' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'alle' 'ore' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1875,6 +1930,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'alle' 'ore' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'alle' 'ore' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1891,15 +1949,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">'h'HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1921,11 +1982,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1967,10 +2026,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
 							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1981,10 +2036,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2481,12 +2532,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Città sconosciuta</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dacca</exemplarCity>
 			</zone>
@@ -2499,9 +2544,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
 			<zone type="America/Sao_Paulo">
 				<exemplarCity>San Paolo</exemplarCity>
 			</zone>
@@ -2511,9 +2553,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pasqua</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>L’Avana</exemplarCity>
 			</zone>
@@ -2526,9 +2565,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praga</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berlino</exemplarCity>
 			</zone>
@@ -2616,12 +2652,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Jamaica">
 				<exemplarCity>Giamaica</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>Canton</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Comore</exemplarCity>
 			</zone>
@@ -2733,12 +2763,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damasco</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity>Tunisi</exemplarCity>
 			</zone>
@@ -2791,9 +2815,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora dell’Africa occidentale</generic>
-					<standard>Ora standard dell’Africa occidentale</standard>
-					<daylight>Ora legale dell’Africa occidentale</daylight>
+					<standard>Ora dell’Africa occidentale</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3165,6 +3187,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ora della Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora standard delle Isole Hawaii-Aleutine</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora delle isole Hawaii-Aleutine</generic>
@@ -3723,12 +3750,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one">0</pattern>
-					<pattern type="1000" count="other">0</pattern>
-					<pattern type="10000" count="one">0</pattern>
-					<pattern type="10000" count="other">0</pattern>
-					<pattern type="100000" count="one">0</pattern>
-					<pattern type="100000" count="other">0</pattern>
+					<pattern type="1000" count="one">0K</pattern>
+					<pattern type="1000" count="other">0K</pattern>
+					<pattern type="10000" count="one">00K</pattern>
+					<pattern type="10000" count="other">00K</pattern>
+					<pattern type="100000" count="one">000K</pattern>
+					<pattern type="100000" count="other">000K</pattern>
 					<pattern type="1000000" count="one">0 Mln</pattern>
 					<pattern type="1000000" count="other">0 Mln</pattern>
 					<pattern type="10000000" count="one">00 Mln</pattern>
@@ -3754,17 +3781,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0</pattern>
-					<pattern type="1000" count="other">0</pattern>
-					<pattern type="10000" count="one">0</pattern>
-					<pattern type="10000" count="other">0</pattern>
-					<pattern type="100000" count="one">0</pattern>
-					<pattern type="100000" count="other">0</pattern>
+					<pattern type="1000" count="one">0K ¤</pattern>
+					<pattern type="1000" count="other">0K ¤</pattern>
+					<pattern type="10000" count="one">00K ¤</pattern>
+					<pattern type="10000" count="other">00K ¤</pattern>
+					<pattern type="100000" count="one">000K ¤</pattern>
+					<pattern type="100000" count="other">000K ¤</pattern>
 					<pattern type="1000000" count="one">0 Mln ¤</pattern>
 					<pattern type="1000000" count="other">0 Mln ¤</pattern>
 					<pattern type="10000000" count="one">00 Mln ¤</pattern>
@@ -4868,6 +4898,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dollaro dei Caraibi orientali</displayName>
 				<displayName count="other">dollari dei Caraibi orientali</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>fiorino caraibico</displayName>
+				<displayName count="one">fiorino caraibico</displayName>
+				<displayName count="other">fiorini caraibici</displayName>
+				<symbol draft="contributed">Cf</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>diritti speciali di incasso</displayName>
 			</currency>
@@ -4948,6 +4984,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>dollaro dello Zimbabwe</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe Gold</displayName>
+				<displayName count="one">Zimbabwe Gold</displayName>
+				<displayName count="other">Zimbabwe Gold</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">dollaro zimbabwiano (2009)</displayName>
 			</currency>
@@ -5199,7 +5240,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} elemento</unitPattern>
 				<unitPattern count="other">{0} elementi</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parti</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} parti</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>parti per milione</displayName>
 				<unitPattern count="one">{0} parte per milione</unitPattern>
@@ -5229,6 +5275,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mole</unitPattern>
 				<unitPattern count="other">{0} moli</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>di glucosio</displayName>
+				<unitPattern count="one">{0} di glucosio</unitPattern>
+				<unitPattern count="other">{0} di glucosio</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litri per chilometro</displayName>
@@ -5662,7 +5713,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} miglia scandinave</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<gender draft="contributed">masculine</gender>
+				<gender>masculine</gender>
 				<displayName>punti tipografici</displayName>
 				<unitPattern count="one">{0} punto tipografico</unitPattern>
 				<unitPattern count="other">{0} punti tipografici</unitPattern>
@@ -5825,6 +5876,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimetro di mercurio</unitPattern>
 				<unitPattern count="other">{0} millimetri di mercurio</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>di mercurio</displayName>
+				<unitPattern count="one">{0} di mercurio</unitPattern>
+				<unitPattern count="other">{0} di mercurio</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libbre per pollice quadrato</displayName>
 				<unitPattern count="one">{0} libbra per pollice quadrato</unitPattern>
@@ -6029,6 +6085,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} tazza metrica</unitPattern>
 				<unitPattern count="other">{0} tazze metriche</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>once liquide metriche</displayName>
+				<unitPattern count="one">{0} oncia liquida metrica</unitPattern>
+				<unitPattern count="other">{0} once liquide metriche</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<gender>masculine</gender>
 				<displayName>piedi acro</displayName>
@@ -6136,12 +6197,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} quarto imperiale</unitPattern>
 				<unitPattern count="other">{0} quarti imperiali</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<gender draft="contributed">feminine</gender>
-				<unitPattern count="one" draft="contributed">{0} alla velocità della luce</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} alla velocità della luce</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradianti</displayName>
+				<unitPattern count="one">{0} steradiante</unitPattern>
+				<unitPattern count="other">{0} steradianti</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorie [IT]</displayName>
+				<unitPattern count="one">{0} caloria [IT]</unitPattern>
+				<unitPattern count="other">{0} calorie [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>chilogrammi-forza</displayName>
+				<unitPattern count="one">{0} chilogrammo-forza</unitPattern>
+				<unitPattern count="other">{0} chilogrammi-forza</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<gender>feminine</gender>
+				<displayName>luce</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>parti per miliardo</displayName>
 				<unitPattern count="one">{0} parte per miliardo</unitPattern>
@@ -6149,9 +6274,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>notti</displayName>
-				<unitPattern count="one">{0} notte</unitPattern>
-				<unitPattern count="other">{0} notti</unitPattern>
 				<perUnitPattern>{0} a notte</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6209,9 +6331,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} elem.</unitPattern>
 				<unitPattern count="other">{0} elem.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} parti</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>percento</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
@@ -6376,6 +6508,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>W</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>di Hg</displayName>
+				<unitPattern count="one">{0} di Hg</unitPattern>
+				<unitPattern count="other">{0} di Hg</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="one">Bft {0}</unitPattern>
 				<unitPattern count="other">Bft {0}</unitPattern>
@@ -6426,6 +6563,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ml</unitPattern>
 				<unitPattern count="other">{0} ml</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>staia</displayName>
 			</unit>
@@ -6477,9 +6618,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} imp qt</unitPattern>
 				<unitPattern count="other">{0} imp qt</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<unitPattern count="one" draft="contributed">{0} luce</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} luce</unitPattern>
+				<displayName>luce</displayName>
+				<unitPattern count="one">{0} luce</unitPattern>
+				<unitPattern count="other">{0} luce</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>notti</displayName>
@@ -6569,7 +6764,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}elem.</unitPattern>
 				<unitPattern count="other">{0}elem.</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0}parte</unitPattern>
+				<unitPattern count="other">{0}parti</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -6580,6 +6780,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0}Glc</unitPattern>
+				<unitPattern count="other">{0}Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}L/km</unitPattern>
 				<unitPattern count="other">{0}L/km</unitPattern>
@@ -7011,6 +7216,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mm Hg</unitPattern>
 				<unitPattern count="other">{0}mm Hg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>di Hg</displayName>
+				<unitPattern count="one">{0} di Hg</unitPattern>
+				<unitPattern count="other">{0} di Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -7148,6 +7358,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0}fl oz m.</unitPattern>
+				<unitPattern count="other">{0}fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0}ac ft</unitPattern>
 				<unitPattern count="other">{0}ac ft</unitPattern>
@@ -7231,20 +7445,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" draft="contributed">{0}imp qt</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}imp qt</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<unitPattern count="one" draft="contributed">{0}l</unitPattern>
-				<unitPattern count="other" draft="contributed">{0}l</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0}sr</unitPattern>
+				<unitPattern count="other">{0}sr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0}kat</unitPattern>
+				<unitPattern count="other">{0}kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0}C</unitPattern>
+				<unitPattern count="other">{0}C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0}F</unitPattern>
+				<unitPattern count="other">{0}F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0}H</unitPattern>
+				<unitPattern count="other">{0}H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0}S</unitPattern>
+				<unitPattern count="other">{0}S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0}cal-IT</unitPattern>
+				<unitPattern count="other">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0}Bq</unitPattern>
+				<unitPattern count="other">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0}Sv</unitPattern>
+				<unitPattern count="other">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0}Gy</unitPattern>
+				<unitPattern count="other">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0}kgf</unitPattern>
+				<unitPattern count="other">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0}T</unitPattern>
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0}Wb</unitPattern>
+				<unitPattern count="other">{0}Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>luce</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>notti</displayName>
-				<unitPattern count="one">{0} notte</unitPattern>
-				<unitPattern count="other">{0} notti</unitPattern>
-				<perUnitPattern>{0}/notte</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/it_CH.xml b/make/data/cldr/common/main/it_CH.xml
index 4185a3c2f4e..2073e3b4820 100644
--- a/make/data/cldr/common/main/it_CH.xml
+++ b/make/data/cldr/common/main/it_CH.xml
@@ -169,12 +169,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal>.</decimal>
-			<group>’</group>
+			<group>'</group>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/ja.xml b/make/data/cldr/common/main/ja.xml
index 8c7f32a9a03..01c6f969f77 100644
--- a/make/data/cldr/common/main/ja.xml
+++ b/make/data/cldr/common/main/ja.xml
@@ -88,7 +88,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bjn">バンジャル語</language>
 			<language type="bkm">コム語</language>
 			<language type="bla">シクシカ語</language>
-			<language type="blo">アニ語 (blo)</language>
+			<language type="blo">アニ語 (ベナン)</language>
 			<language type="bm">バンバラ語</language>
 			<language type="bn">ベンガル語</language>
 			<language type="bo">チベット語</language>
@@ -331,6 +331,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">バフィア語</language>
 			<language type="ksh">ケルン語</language>
 			<language type="ku">クルド語</language>
+			<language type="ku" menu="core">クルド語</language>
+			<language type="ku" menu="extension">クルマンジー</language>
 			<language type="kum">クムク語</language>
 			<language type="kut">クテナイ語</language>
 			<language type="kv">コミ語</language>
@@ -396,7 +398,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mk">マケドニア語</language>
 			<language type="ml">マラヤーラム語</language>
 			<language type="mn">モンゴル語</language>
-			<language type="mnc">満州語</language>
+			<language type="mnc">満洲語</language>
 			<language type="mni">マニプリ語</language>
 			<language type="moe">イヌー＝アイムン語</language>
 			<language type="moh">モーホーク語</language>
@@ -938,6 +940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">中国</territory>
 			<territory type="CO">コロンビア</territory>
 			<territory type="CP">クリッパートン島</territory>
+			<territory type="CQ">サーク島</territory>
 			<territory type="CR">コスタリカ</territory>
 			<territory type="CU">キューバ</territory>
 			<territory type="CV">カーボベルデ</territory>
@@ -1235,43 +1238,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="calendar">暦法</key>
 			<key type="cf">通貨フォーマット</key>
 			<key type="colAlternate">記号を無視した並べ替え</key>
-			<key type="colBackwards">アクセント（逆方向）による並べ替え</key>
+			<key type="colBackwards">逆順アクセントによる並べ替え</key>
 			<key type="colCaseFirst">大文字順/小文字順による並べ替え</key>
 			<key type="colCaseLevel">大文字小文字を区別した並べ替え</key>
 			<key type="collation">並べ替え順序</key>
 			<key type="colNormalization">正規化による並べ替え</key>
 			<key type="colNumeric">数値による並べ替え</key>
-			<key type="colStrength">強度による並べ替え</key>
+			<key type="colStrength">照合強度</key>
 			<key type="currency">通貨</key>
+			<key type="em">絵文字表示方法</key>
 			<key type="hc">時間制(12 / 24)</key>
 			<key type="lb">禁則処理</key>
+			<key type="lw">単語途中の改行</key>
 			<key type="ms">単位系</key>
 			<key type="numbers">数値書式</key>
+			<key type="ss">略語の後の文分割</key>
 			<key type="timezone">タイムゾーン</key>
 			<key type="va">ロケールのバリアント</key>
 			<key type="x">私用</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">仏暦</type>
+			<type key="calendar" type="buddhist" scope="core">仏暦</type>
 			<type key="calendar" type="chinese">中国暦</type>
+			<type key="calendar" type="chinese" scope="core">中国暦</type>
 			<type key="calendar" type="coptic">コプト暦</type>
+			<type key="calendar" type="coptic" scope="core">コプト暦</type>
 			<type key="calendar" type="dangi">ダンギ暦</type>
+			<type key="calendar" type="dangi" scope="core">ダンギ暦</type>
 			<type key="calendar" type="ethiopic">エチオピア暦</type>
+			<type key="calendar" type="ethiopic" scope="core">エチオピア暦</type>
 			<type key="calendar" type="ethiopic-amete-alem">エチオピア創世紀元暦</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">エチオピア創世紀元暦</type>
 			<type key="calendar" type="gregorian">西暦(グレゴリオ暦)</type>
+			<type key="calendar" type="gregorian" scope="core">西暦(グレゴリオ暦)</type>
 			<type key="calendar" type="hebrew">ユダヤ暦</type>
+			<type key="calendar" type="hebrew" scope="core">ユダヤ暦</type>
 			<type key="calendar" type="indian">インド国定暦</type>
 			<type key="calendar" type="islamic">イスラム暦</type>
+			<type key="calendar" type="islamic" scope="core">イスラム暦</type>
 			<type key="calendar" type="islamic-civil">イスラム暦(定周期、公民紀元)</type>
+			<type key="calendar" type="islamic-civil" scope="core">イスラム暦(定周期、公民紀元)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">イスラム暦(サウジアラビア、月観測)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">イスラム歴(定周期、天文紀元)</type>
 			<type key="calendar" type="islamic-umalqura">イスラム暦(ウンム・アルクラー)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">イスラム暦(ウンム・アルクラー)</type>
 			<type key="calendar" type="iso8601">ISO-8601</type>
 			<type key="calendar" type="japanese">和暦</type>
+			<type key="calendar" type="japanese" scope="core">和暦</type>
 			<type key="calendar" type="persian">ペルシア暦</type>
+			<type key="calendar" type="persian" scope="core">ペルシア暦</type>
 			<type key="calendar" type="roc">中華民国暦</type>
+			<type key="calendar" type="roc" scope="core">中華民国暦</type>
 			<type key="cf" type="account">会計通貨フォーマット</type>
+			<type key="cf" type="account" scope="core">会計</type>
 			<type key="cf" type="standard">標準通貨フォーマット</type>
+			<type key="cf" type="standard" scope="core">標準</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">記号で並べ替え</type>
 			<type key="colAlternate" type="shifted" draft="contributed">記号を無視して並べ替え</type>
 			<type key="colBackwards" type="no" draft="contributed">アクセント（順方向）で並べ替え</type>
@@ -1281,22 +1303,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">大文字優先で並べ替え</type>
 			<type key="colCaseLevel" type="no" draft="contributed">大文字小文字を区別しないで並べ替え</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">大文字小文字を区別して並べ替え</type>
-			<type key="collation" type="big5han">繁体字中国語順(Big5)</type>
 			<type key="collation" type="compat">以前の順序（互換性）</type>
+			<type key="collation" type="compat" scope="core">互換性</type>
 			<type key="collation" type="dictionary">辞書順</type>
-			<type key="collation" type="ducet">ユニコード照合順</type>
+			<type key="collation" type="dictionary" scope="core">辞書</type>
+			<type key="collation" type="ducet">デフォルトUnicode照合順</type>
+			<type key="collation" type="ducet" scope="core">デフォルトUnicode</type>
 			<type key="collation" type="eor" draft="contributed">ヨーロッパ言語文字の並べ替え規則</type>
-			<type key="collation" type="gb2312han">簡体字中国語順(GB2312)</type>
 			<type key="collation" type="phonebook">電話帳順</type>
-			<type key="collation" type="phonetic">音声順による並べ替え</type>
+			<type key="collation" type="phonebook" scope="core">電話帳</type>
+			<type key="collation" type="phonetic">読み順</type>
+			<type key="collation" type="phonetic" scope="core">読み</type>
 			<type key="collation" type="pinyin">ピンイン順</type>
+			<type key="collation" type="pinyin" scope="core">ピンイン</type>
 			<type key="collation" type="search">汎用検索</type>
+			<type key="collation" type="search" scope="core">検索</type>
 			<type key="collation" type="searchjl">ハングル語頭子音による並べ替え</type>
 			<type key="collation" type="standard">標準並べ替え順序</type>
+			<type key="collation" type="standard" scope="core">標準</type>
 			<type key="collation" type="stroke">画数順</type>
-			<type key="collation" type="traditional">トラディッショナル</type>
-			<type key="collation" type="unihan">部首順</type>
+			<type key="collation" type="stroke" scope="core">画数</type>
+			<type key="collation" type="traditional">伝統的並べ替え順序</type>
+			<type key="collation" type="traditional" scope="core">伝統的</type>
+			<type key="collation" type="unihan">部首画数順</type>
+			<type key="collation" type="unihan" scope="core">部首画数</type>
 			<type key="collation" type="zhuyin">注音順</type>
+			<type key="collation" type="zhuyin" scope="core">注音</type>
 			<type key="colNormalization" type="no">正規化しないで並べ替え</type>
 			<type key="colNormalization" type="yes">Unicode 正規化で並べ替え</type>
 			<type key="colNumeric" type="no" draft="contributed">数値を独立して並べ替え</type>
@@ -1309,18 +1341,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">全角</type>
 			<type key="d0" type="hwidth">半角</type>
 			<type key="d0" type="npinyin" draft="contributed">数字</type>
+			<type key="em" type="default" scope="core">デフォルト</type>
+			<type key="em" type="emoji" scope="core">絵文字</type>
+			<type key="em" type="text" scope="core">テキスト</type>
 			<type key="hc" type="h11">12時間制(0〜11)</type>
+			<type key="hc" type="h11" scope="core">12時間制(0〜11)</type>
 			<type key="hc" type="h12">12時間制(1〜12)</type>
+			<type key="hc" type="h12" scope="core">12時間制(1〜12)</type>
 			<type key="hc" type="h23">24時間制(0〜23)</type>
+			<type key="hc" type="h23" scope="core">24時間制(0〜23)</type>
 			<type key="hc" type="h24">24時間制(1〜24)</type>
+			<type key="hc" type="h24" scope="core">24時間制(1〜24)</type>
 			<type key="lb" type="loose">禁則処理(弱)</type>
+			<type key="lb" type="loose" scope="core">弱</type>
 			<type key="lb" type="normal">禁則処理(標準)</type>
+			<type key="lb" type="normal" scope="core">標準</type>
 			<type key="lb" type="strict">禁則処理(強)</type>
+			<type key="lb" type="strict" scope="core">強</type>
+			<type key="lw" type="breakall" scope="core">強制改行</type>
+			<type key="lw" type="keepall" scope="core">改行禁止</type>
+			<type key="lw" type="normal" scope="core">標準</type>
+			<type key="lw" type="phrase" scope="core">文節単位</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">メートル法</type>
+			<type key="ms" type="metric" scope="core">メートル</type>
 			<type key="ms" type="uksystem">ヤード・ポンド法</type>
+			<type key="ms" type="uksystem" scope="core">英国</type>
 			<type key="ms" type="ussystem">米慣習単位</type>
+			<type key="ms" type="ussystem" scope="core">米国</type>
 			<type key="numbers" type="arab">アラビア・インド数字</type>
 			<type key="numbers" type="arabext">ペルシア数字</type>
 			<type key="numbers" type="armn">アルメニア数字</type>
@@ -1382,6 +1431,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">チベット数字</type>
 			<type key="numbers" type="traditional" draft="contributed">従来の記数法</type>
 			<type key="numbers" type="vaii">ヴァイ文字の記数法</type>
+			<type key="ss" type="none" scope="core">オフ</type>
+			<type key="ss" type="standard" scope="core">オン</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">メートル法</measurementSystemName>
@@ -1399,12 +1450,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[丑 亥 亨 兌 兎 凧 剃 卯 嘉 嘔 嘘 壬 壺 嬉 寅 巳 庚 庵 弘 彗 悶 愕 戊 戌 拼 揃 斧 昌 杖 桶 梵 楔 湘 焚 燭 爬 牌 牝 牡 狐 狗 狼 猪 獅 癸 瞑 碇 祚 禄 禎 秤 竿 絆 繍 罫 膏 芒 蟄 蟹 蠍 蠣 贛 蹄 辰 酉 鋲 錄 錨 閏 閩 雀 雉 鳳 鼠 龍]</exemplarCharacters>
 		<exemplarCharacters type="index">[あ か さ た な は ま や ら わ]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[‾ _＿ \-－ ‐‑ — ― 〜 ・･ ,， 、､ ;； \:： !！ ?？ .． ‥ … 。｡ ＇‘’ &quot;＂“” (（ )） \[［ \]］ \{｛ \}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\＼ \&amp;＆ #＃ %％ ‰ † ‡ ′ ″ 〃 ※]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[゠ ・･ . =＝]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、､﹑︑]</parseLenient>
@@ -1697,6 +1746,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">BK:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">BK:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">BK時 (E)</dateFormatItem>
 						<dateFormatItem id="EBhm">BK:mm (E)</dateFormatItem>
 						<dateFormatItem id="EBhms">BK:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="Ed">d日(E)</dateFormatItem>
@@ -1716,6 +1766,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">aK:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">aK時 v</dateFormatItem>
+						<dateFormatItem id="Hv">H時 v</dateFormatItem>
 						<dateFormatItem id="M">MMM</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d(E)</dateFormatItem>
@@ -1919,11 +1971,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}の {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}の {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1940,16 +1998,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">BK:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">BK:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">BK時 (E)</dateFormatItem>
 						<dateFormatItem id="EBhm">BK:mm (E)</dateFormatItem>
 						<dateFormatItem id="EBhms">BK:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="Ed">d日(E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d日(EEEE)</dateFormatItem>
+						<dateFormatItem id="Eh">aK時 (E)</dateFormatItem>
 						<dateFormatItem id="Ehm">aK:mm (E)</dateFormatItem>
 						<dateFormatItem id="EHm">H:mm (E)</dateFormatItem>
 						<dateFormatItem id="Ehms">aK:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="EHms">H:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">GGGGGy/M</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGGy/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">GGGGGy/M/d(E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日(E)</dateFormatItem>
@@ -1960,6 +2022,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">aK:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">aK時 v</dateFormatItem>
+						<dateFormatItem id="Hv">H時 v</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d(E)</dateFormatItem>
@@ -2298,11 +2362,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}の {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}の {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2319,16 +2389,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">BK:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">BK:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">BK時 (E)</dateFormatItem>
 						<dateFormatItem id="EBhm">BK:mm (E)</dateFormatItem>
 						<dateFormatItem id="EBhms">BK:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="Ed">d日(E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d日EEEE</dateFormatItem>
+						<dateFormatItem id="Eh">aK時 (E)</dateFormatItem>
 						<dateFormatItem id="Ehm">aK:mm (E)</dateFormatItem>
 						<dateFormatItem id="EHm">H:mm (E)</dateFormatItem>
 						<dateFormatItem id="Ehms">aK:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="EHms">H:mm:ss (E)</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">Gy/M</dateFormatItem>
 						<dateFormatItem id="GyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy/M/d(E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日(E)</dateFormatItem>
@@ -2343,6 +2417,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">H:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">aK:mm v</dateFormatItem>
 						<dateFormatItem id="Hmv">H:mm v</dateFormatItem>
+						<dateFormatItem id="hv">aK時 v</dateFormatItem>
+						<dateFormatItem id="Hv">H時 v</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d(E)</dateFormatItem>
@@ -3148,11 +3224,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}の {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}の {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -3166,6 +3248,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="EEEEd">d日EEEE</dateFormatItem>
+						<dateFormatItem id="GyM">GGGGGy/M</dateFormatItem>
+						<dateFormatItem id="GyMEd">GGGGGy/M/d(E)</dateFormatItem>
 						<dateFormatItem id="GyMMMEEEEd">Gy年M月d日EEEE</dateFormatItem>
 						<dateFormatItem id="MEEEEd">M/dEEEE</dateFormatItem>
 						<dateFormatItem id="MMMEEEEd">M月d日EEEE</dateFormatItem>
@@ -3980,6 +4064,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>イースター島</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>コジャイケ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>プンタアレナス</exemplarCity>
 			</zone>
@@ -4245,9 +4332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>プノンペン</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>エンダーベリー島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>カントン島</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4924,9 +5008,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>西アフリカ時間</generic>
-					<standard>西アフリカ標準時</standard>
-					<daylight>西アフリカ夏時間</daylight>
+					<standard>西アフリカ時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4952,30 +5034,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>アメリカ中部時間</generic>
-					<standard>アメリカ中部標準時</standard>
-					<daylight>アメリカ中部夏時間</daylight>
+					<generic>米国中部時間</generic>
+					<standard>米国中部標準時</standard>
+					<daylight>米国中部夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>アメリカ東部時間</generic>
-					<standard>アメリカ東部標準時</standard>
-					<daylight>アメリカ東部夏時間</daylight>
+					<generic>米国東部時間</generic>
+					<standard>米国東部標準時</standard>
+					<daylight>米国東部夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>アメリカ山地時間</generic>
-					<standard>アメリカ山地標準時</standard>
-					<daylight>アメリカ山地夏時間</daylight>
+					<generic>米国山岳部時間</generic>
+					<standard>米国山岳標準時</standard>
+					<daylight>米国山岳夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>アメリカ太平洋時間</generic>
-					<standard>アメリカ太平洋標準時</standard>
-					<daylight>アメリカ太平洋夏時間</daylight>
+					<generic>米国太平洋時間</generic>
+					<standard>米国太平洋標準時</standard>
+					<daylight>米国太平洋夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -4987,9 +5069,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>アピア時間</generic>
-					<standard>アピア標準時</standard>
-					<daylight>アピア夏時間</daylight>
+					<generic>サモア時間</generic>
+					<standard>サモア標準時</standard>
+					<daylight>サモア夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -5109,7 +5191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>ブルネイ・ダルサラーム時間</standard>
+					<standard>ブルネイ時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -5314,6 +5396,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ガイアナ時間</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ハワイ・アリューシャン標準時</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ハワイ・アリューシャン時間</generic>
@@ -5659,12 +5746,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>ポナペ時間</standard>
+					<standard>ポンペイ時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>平壌時間</standard>
+					<standard>北朝鮮時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -5700,9 +5787,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>サモア時間</generic>
-					<standard>サモア標準時</standard>
-					<daylight>サモア夏時間</daylight>
+					<generic>米領サモア時間</generic>
+					<standard>米領サモア標準時</standard>
+					<daylight>米領サモア夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -5742,9 +5829,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>台北時間</generic>
-					<standard>台北標準時</standard>
-					<daylight>台北夏時間</daylight>
+					<generic>台湾時間</generic>
+					<standard>台湾標準時</standard>
+					<daylight>台湾夏時間</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -5769,6 +5856,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>チューク時間</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>トルコ時間</generic>
+					<standard>トルコ標準時</standard>
+					<daylight>トルコ夏時間</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>トルクメニスタン時間</generic>
@@ -5892,8 +5986,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -6579,7 +6671,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="RSD">
 				<displayName>セルビア ディナール</displayName>
-				<displayName count="other">セルビア ディナール</displayName>
 			</currency>
 			<currency type="RUB">
 				<displayName>ロシア ルーブル</displayName>
@@ -6700,7 +6791,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="UAH">
 				<displayName>ウクライナ フリヴニャ</displayName>
-				<displayName count="other">ウクライナ フリヴニャ</displayName>
 			</currency>
 			<currency type="UAK">
 				<displayName>ウクライナ カルボバネツ</displayName>
@@ -6778,6 +6868,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>東カリブ ドル</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>カリブ ギルダー</displayName>
+				<displayName count="other">カリブ ギルダー</displayName>
+				<symbol>Cg</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>特別引き出し権</displayName>
 			</currency>
@@ -6857,6 +6952,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>ジンバブエ ドル (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ジンバブエ ゴールド</displayName>
+				<displayName count="other">ジンバブエ ゴールド</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>ジンバブエ ドル (2009)</displayName>
 			</currency>
@@ -7038,6 +7137,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<unitPattern count="other">{0} ミリモル毎リットル</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>パーツ</displayName>
+				<unitPattern count="other">{0} パーツ</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="other">{0} パーセント</unitPattern>
 			</unit>
@@ -7050,6 +7153,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0} モル</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>グルコース</displayName>
+				<unitPattern count="other">{0} グルコース</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>リットル毎キロメートル</displayName>
 				<unitPattern count="other">{0} リットル毎キロメートル</unitPattern>
@@ -7354,6 +7461,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="pressure-millimeter-ofhg">
 				<unitPattern count="other">{0} 水銀柱ミリメートル</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>水銀柱</displayName>
+				<unitPattern count="other">{0}Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">{0} 重量ポンド毎平方インチ</unitPattern>
 			</unit>
@@ -7475,6 +7586,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} メトリックカップ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>メトリック液量オンス</displayName>
+				<unitPattern count="other">{0} メトリック液量オンス</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="other">{0} エーカーフィート</unitPattern>
 			</unit>
@@ -7517,14 +7632,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0} 英クォート</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>光</displayName>
-				<unitPattern count="other">{0} 光</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ステラジアン</displayName>
+				<unitPattern count="other">{0} ステラジアン</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>泊</displayName>
-				<unitPattern count="other">{0} 泊</unitPattern>
-				<perUnitPattern>{0}/泊</perUnitPattern>
+			<unit type="concentr-katal">
+				<displayName>カタール</displayName>
+				<unitPattern count="other">{0} カタール</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>クーロン</displayName>
+				<unitPattern count="other">{0} クーロン</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ファラド</displayName>
+				<unitPattern count="other">{0} ファラド</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ヘンリー</displayName>
+				<unitPattern count="other">{0} ヘンリー</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ジーメンス</displayName>
+				<unitPattern count="other">{0} ジーメンス</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>国際蒸気表カロリー</displayName>
+				<unitPattern count="other">{0} 国際蒸気表カロリー</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ベクレル</displayName>
+				<unitPattern count="other">{0} ベクレル</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>シーベルト</displayName>
+				<unitPattern count="other">{0} シーベルト</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>グレイ</displayName>
+				<unitPattern count="other">{0} グレイ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>重量キログラム</displayName>
+				<unitPattern count="other">{0} 重量キログラム</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>テスラ</displayName>
+				<unitPattern count="other">{0} テスラ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ウェーバ</displayName>
+				<unitPattern count="other">{0} ウェーバ</unitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="short">
@@ -7585,6 +7743,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>項目</displayName>
 				<unitPattern count="other">{0} 項目</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>パーツ</displayName>
+				<unitPattern count="other">{0} パーツ</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>パーセント</displayName>
 			</unit>
@@ -7597,6 +7759,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>モル</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>グルコース</displayName>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>マイル/ガロン</displayName>
 				<unitPattern count="other">{0} mpg</unitPattern>
@@ -7872,6 +8038,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>水銀柱ミリメートル</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>水銀柱</displayName>
+				<unitPattern count="other">{0}Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>重量ポンド毎平方インチ</displayName>
 			</unit>
@@ -7946,6 +8116,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<displayName>メトリックカップ</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>メトリック液量オンス</displayName>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>エーカーフィート</displayName>
 			</unit>
@@ -8014,6 +8188,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>英クォート</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ステラジアン</displayName>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>カタール</displayName>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>重量キログラム</displayName>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>テスラ</displayName>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ウェーバ</displayName>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="length-rin">
 				<displayName>厘</displayName>
 				<unitPattern count="other">{0} 厘</unitPattern>
@@ -8172,7 +8391,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<unitPattern count="other">{0}項目</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>パーツ</displayName>
+				<unitPattern count="other">{0}パーツ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
@@ -8188,6 +8411,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mol</displayName>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>グルコース</displayName>
+				<unitPattern count="other">{0}Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
@@ -8529,6 +8756,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="pressure-millimeter-ofhg">
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>水銀柱</displayName>
+				<unitPattern count="other">{0}Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
@@ -8638,6 +8869,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>メトリック液量オンス</displayName>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ac ft</displayName>
 				<unitPattern count="other">{0}ac ft</unitPattern>
@@ -8707,6 +8942,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>qt Imp</displayName>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0}sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>カタール</displayName>
+				<unitPattern count="other">{0}kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>重量キログラム</displayName>
+				<unitPattern count="other">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>テスラ</displayName>
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ウェーバ</displayName>
+				<unitPattern count="other">{0}Wb</unitPattern>
+			</unit>
 			<unit type="length-rin">
 				<unitPattern count="other">{0}厘</unitPattern>
 			</unit>
@@ -8759,20 +9016,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}石</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName>光</displayName>
 				<unitPattern count="other">{0}光</unitPattern>
 			</unit>
 			<unit type="mass-fun">
 				<displayName>分</displayName>
 				<unitPattern count="other">{0}分</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>泊</displayName>
 				<unitPattern count="other">{0}泊</unitPattern>
-				<perUnitPattern>{0}/泊</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/jgo.xml b/make/data/cldr/common/main/jgo.xml
index 77a32c12d1e..42dc6d82a92 100644
--- a/make/data/cldr/common/main/jgo.xml
+++ b/make/data/cldr/common/main/jgo.xml
@@ -153,7 +153,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
diff --git a/make/data/cldr/common/main/jv.xml b/make/data/cldr/common/main/jv.xml
index 54ef5e3901d..c95407d748b 100644
--- a/make/data/cldr/common/main/jv.xml
+++ b/make/data/cldr/common/main/jv.xml
@@ -16,7 +16,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ace">Achinese</language>
 			<language type="ada">Adangme</language>
 			<language type="ady">Adyghe</language>
-			<language type="af">Afrika</language>
+			<language type="af">Afrikaans</language>
 			<language type="agq">Aghem</language>
 			<language type="ain">Ainu</language>
 			<language type="ak">Akan</language>
@@ -40,6 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ay">Aymara</language>
 			<language type="az">Azerbaijan</language>
 			<language type="ba">Bashkir</language>
+			<language type="bal">Baluchi</language>
 			<language type="ban">Bali</language>
 			<language type="bas">Basaa</language>
 			<language type="be">Belarus</language>
@@ -219,6 +220,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Colonia</language>
 			<language type="ku">Kurdis</language>
+			<language type="ku" menu="core">Kurdi</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumik</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Kernowek</language>
@@ -604,6 +607,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Tyongkok</territory>
 			<territory type="CO">Kolombia</territory>
 			<territory type="CP">Pulo Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Pongol Verdé</territory>
@@ -837,43 +841,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Format Mata Uang</key>
 			<key type="collation">Urutan Pamilahan</key>
 			<key type="currency">Mata Uang</key>
+			<key type="em">Presentasi Emoji</key>
 			<key type="hc">Siklus Jam (12 vs 24)</key>
 			<key type="lb">Gaya Ganti Baris</key>
+			<key type="lw">Ganti baris sajrone Tembung</key>
 			<key type="ms">Sistem Pangukuran</key>
 			<key type="numbers">Angka</key>
+			<key type="ss">Pedhotan ukara sawise singkatan</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Tanggalan Buddha</type>
+			<type key="calendar" type="buddhist" scope="core">Buddha</type>
 			<type key="calendar" type="chinese">Tanggalan Cina</type>
+			<type key="calendar" type="chinese" scope="core">Cina</type>
 			<type key="calendar" type="coptic">Tanggalan Koptik</type>
+			<type key="calendar" type="coptic" scope="core">Koptik</type>
 			<type key="calendar" type="dangi">Tanggalan Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Tanggalan Etiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiopia</type>
 			<type key="calendar" type="ethiopic-amete-alem">Tanggalan Etiopia Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etiopia Amete Alem</type>
 			<type key="calendar" type="gregorian">Tanggalan Gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Tanggalan Ibrani</type>
+			<type key="calendar" type="hebrew" scope="core">Ibrani</type>
 			<type key="calendar" type="islamic">Tanggalan Hijriah</type>
+			<type key="calendar" type="islamic" scope="core">Hijriah</type>
 			<type key="calendar" type="islamic-civil">Tanggalan Hijriah (tabel, jaman sipil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijriah (tabel, jaman sipil)</type>
 			<type key="calendar" type="islamic-tbla">Tanggalan Hijriah (tabel, jaman astronomis)</type>
-			<type key="calendar" type="islamic-umalqura">Tanggalan Hijriah (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hijriah (tabel, jaman astronomis)</type>
+			<type key="calendar" type="islamic-umalqura">Tanggalan Hijriah (Ummul Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijriah (Ummul Qura)</type>
 			<type key="calendar" type="iso8601">Tanggalan ISO-8601</type>
 			<type key="calendar" type="japanese">Tanggalan Jepang</type>
+			<type key="calendar" type="japanese" scope="core">Jepang</type>
 			<type key="calendar" type="persian">Tanggalan Persia</type>
+			<type key="calendar" type="persian" scope="core">Persia</type>
 			<type key="calendar" type="roc">Tanggalan Minguo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Format Mata Uang Akuntansi</type>
+			<type key="cf" type="account" scope="core">Akuntansi</type>
 			<type key="cf" type="standard">Format Mata Uang Standar</type>
+			<type key="cf" type="standard" scope="core">Standar</type>
 			<type key="collation" type="ducet">Urutan Pamilahan Unicode Default</type>
+			<type key="collation" type="ducet" scope="core">Unicode Default</type>
 			<type key="collation" type="search">Panlusuran Tujuan Umum</type>
+			<type key="collation" type="search" scope="core">Panlusuran</type>
 			<type key="collation" type="standard">Standar Ngurutke Urutan</type>
+			<type key="collation" type="standard" scope="core">Standar</type>
+			<type key="em" type="default" scope="core">Gawan</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Teks</type>
 			<type key="hc" type="h11">Sistem 12 Jam (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Sistem 12 Jam (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Sistem 24 Jam (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Sistem 24 Jam (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Gaya Ganti Baris Longgar</type>
+			<type key="lb" type="loose" scope="core">Longgar</type>
 			<type key="lb" type="normal">Gaya Ganti Baris Normal</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Gaya Ganti Baris Strik</type>
+			<type key="lb" type="strict" scope="core">Ketat</type>
+			<type key="lw" type="breakall" scope="core">Ganti baris kabeh</type>
+			<type key="lw" type="keepall" scope="core">Tetep kabeh</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Pertahanake frasa</type>
 			<type key="ms" type="metric">Sistem Metrik</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">Sistem Pangukuran Imperial</type>
+			<type key="ms" type="uksystem" scope="core">Inggris</type>
 			<type key="ms" type="ussystem">Sistem Pangukuran AS</type>
+			<type key="ms" type="ussystem" scope="core">AS</type>
 			<type key="numbers" type="arab">Digit Hindu-Arab</type>
 			<type key="numbers" type="arabext">Digit Hindu-Arab Diambakake</type>
 			<type key="numbers" type="armn">Angka Armenia</type>
@@ -914,6 +958,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">Digit Thailand</type>
 			<type key="numbers" type="tibt">Digit Tibet</type>
 			<type key="numbers" type="vaii">Digit Vai</type>
+			<type key="ss" type="none" scope="core">Mati</type>
+			<type key="ss" type="standard" scope="core">Urip</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -933,9 +979,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":" draft="contributed">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£" draft="contributed">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-" draft="contributed">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1003,11 +1046,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG dd-MM-y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
@@ -1301,6 +1345,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ing' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ing' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1309,6 +1356,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ing' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ing' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1324,11 +1374,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
@@ -1355,44 +1400,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">y G – y G</greatestDifference>
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="G">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="G">E, d/M/y GGGGG – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">d – d MMM y G</greatestDifference>
-							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
@@ -1517,7 +1524,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
@@ -1825,7 +1834,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Kuto Ora Dikenali</exemplarCity>
+				<exemplarCity>Lokasi Ora Dikenali</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
 				<exemplarCity>Mendosa</exemplarCity>
@@ -1936,9 +1945,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Rome">
 				<exemplarCity>Roma</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komoro</exemplarCity>
 			</zone>
@@ -2078,9 +2084,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Wektu Afrika Kulon</generic>
-					<standard>Wektu Standar Afrika Kulon</standard>
-					<daylight>Wektu Ketigo Afrika Kulon</daylight>
+					<standard>Wektu Afrika Kulon</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2128,8 +2132,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Apia">
 				<long>
 					<generic>Wektu Apia</generic>
-					<standard>Wektu Standar Apia</standard>
-					<daylight>Wektu Ketigo Apia</daylight>
+					<standard>Wektu Standar Samoa</standard>
+					<daylight>Wektu Ketiga Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
@@ -2235,7 +2239,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Wektu Brunai Darussalam</standard>
+					<standard>Wektu Brunei</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -2268,7 +2272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic>Wektu Cina</generic>
 					<standard>Wektu Standar Cina</standard>
-					<daylight>Wektu Ketigo Cina</daylight>
+					<daylight>Wektu Ketiga Cina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
@@ -2292,7 +2296,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic>Wektu Kepuloan Cook</generic>
 					<standard>Wektu Standar Kepuloan Cook</standard>
-					<daylight>Wektu Ketigo Kepuloan Cook</daylight>
+					<daylight>Wektu Ketiga Kepuloan Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -2309,12 +2313,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Wektu Dumont-d’Urville</standard>
+					<standard>Wektu Dumont d’Urville</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>Wektu Timor Leste</standard>
+					<standard>Wektu Timor-Leste</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
@@ -2430,6 +2434,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Wektu Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Wektu Standar Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Wektu Hawaii-Aleutian</generic>
@@ -2441,14 +2450,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic>Wektu Hong Kong</generic>
 					<standard>Wektu Standar Hong Kong</standard>
-					<daylight>Wektu Ketigo Hong Kong</daylight>
+					<daylight>Wektu Ketiga Hong Kong</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
 					<generic>Wektu Hovd</generic>
 					<standard>Wektu Standar Hovd</standard>
-					<daylight>Wektu Ketigo Hovd</daylight>
+					<daylight>Wektu Ketiga Hovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
@@ -2506,7 +2515,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic>Wektu Jepang</generic>
 					<standard>Wektu Standar Jepang</standard>
-					<daylight>Wektu Ketigo Jepang</daylight>
+					<daylight>Wektu Ketiga Jepang</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
@@ -2528,7 +2537,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic>Wektu Korea</generic>
 					<standard>Wektu Standar Korea</standard>
-					<daylight>Wektu Ketigo Korea</daylight>
+					<daylight>Wektu Ketiga Korea</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -2610,7 +2619,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<generic>Wektu Ulaanbaatar</generic>
 					<standard>Wektu Standar Ulaanbaatar</standard>
-					<daylight>Wektu Ketigo Ulaanbaatar</daylight>
+					<daylight>Wektu Ketiga Ulaanbaatar</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
@@ -2746,12 +2755,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Wektu Ponape</standard>
+					<standard>Wektu Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>Wektu Pyongyang</standard>
+					<standard>Wektu Korea Lor</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
@@ -2773,9 +2782,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Wektu Samoa</generic>
-					<standard>Wektu Standar Samoa</standard>
-					<daylight>Wektu Ketigo Samoa</daylight>
+					<generic>Wektu Samoa Amerika</generic>
+					<standard>Wektu Standar Samoa Amerika</standard>
+					<daylight>Wektu Ketiga Samoa Amerika</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -2815,9 +2824,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Wektu Taipei</generic>
-					<standard>Wektu Standar Taipei</standard>
-					<daylight>Wektu Ketigo Taipei</daylight>
+					<generic>Wektu Taiwan</generic>
+					<standard>Wektu Standar Taiwan</standard>
+					<daylight>Wektu Awan Taiwan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -2969,33 +2978,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0È</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0È</pattern>
-					<pattern type="10000" count="other">¤00È</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00È</pattern>
-					<pattern type="100000" count="other">¤000È</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000È</pattern>
-					<pattern type="1000000" count="other">¤0Y</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0Y</pattern>
-					<pattern type="10000000" count="other">¤00Y</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00Y</pattern>
-					<pattern type="100000000" count="other">¤000Y</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000Y</pattern>
-					<pattern type="1000000000" count="other">¤0M</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
-					<pattern type="10000000000" count="other">¤00M</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
-					<pattern type="100000000000" count="other">¤000M</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
-					<pattern type="1000000000000" count="other">¤0T</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
-					<pattern type="10000000000000" count="other">¤00T</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
-					<pattern type="100000000000000" count="other">¤000T</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="1000" count="other">¤ 0È</pattern>
+					<pattern type="10000" count="other">¤ 00È</pattern>
+					<pattern type="100000" count="other">¤ 000È</pattern>
+					<pattern type="1000000" count="other">¤ 0Y</pattern>
+					<pattern type="10000000" count="other">¤ 00Y</pattern>
+					<pattern type="100000000" count="other">¤ 000Y</pattern>
+					<pattern type="1000000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000000" count="other">¤ 000M</pattern>
+					<pattern type="1000000000000" count="other">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -3250,7 +3265,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="LSL">
 				<displayName>Loti Lesotho</displayName>
-				<displayName count="other">Loti Lesotho</displayName>
 			</currency>
 			<currency type="LYD">
 				<displayName>Dinar Libya</displayName>
@@ -3333,7 +3347,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="PHP">
 				<displayName>Peso Filipina</displayName>
-				<displayName count="other">Peso Filipina</displayName>
 			</currency>
 			<currency type="PKR">
 				<displayName>Rupee Pakistan</displayName>
@@ -3467,6 +3480,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>Dolar Karibia Wetan</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder Karibia</displayName>
+				<displayName count="other">Guilder Karibia</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>CFA Franc Afrika Kulon</displayName>
 			</currency>
@@ -3485,6 +3502,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZMW">
 				<displayName>Kwacha Sambia</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Emas Zimbabwe</displayName>
+				<displayName count="other">Emas Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
@@ -3598,11 +3619,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</compoundUnit>
 			<compoundUnit type="power2">
 				<compoundUnitPattern1>peng loro {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other">pesagi {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">{0} pesagi</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="power3">
 				<compoundUnitPattern1>peng telu {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other">kubik {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">{0} kubik</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="times">
 				<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
@@ -3668,7 +3689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>milimol saben liter</displayName>
 				<unitPattern count="other">{0} milimol saben liter</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>bagean saben yuta</displayName>
 				<unitPattern count="other">{0} bagean saben yuta</unitPattern>
 			</unit>
@@ -3681,6 +3702,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-permyriad">
 				<unitPattern count="other">{0} permiriad</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukosa</displayName>
+				<unitPattern count="other">{0} glukosa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter saben kilometer</displayName>
 				<unitPattern count="other">{0} liter saben kilometer</unitPattern>
@@ -4114,6 +4139,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} metrik kup</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="other">{0} fl ons metrik</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>{0} saben galon</perUnitPattern>
 			</unit>
@@ -4132,18 +4160,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-barrel">
 				<unitPattern count="other">{0} barel</unitPattern>
 			</unit>
-			<unit type="volume-pinch">
-				<displayName>jiwit</displayName>
-				<unitPattern count="other">{0} jiwit</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="other">{0} steradian</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>cahya</displayName>
-				<unitPattern count="other">{0} cahya</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="other">{0} katal</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>wengi</displayName>
-				<unitPattern count="other">{0} wengi</unitPattern>
-				<perUnitPattern>{0}/wengi</perUnitPattern>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori-IT</displayName>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="other">{0} weber</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>arah kardinal</displayName>
@@ -4200,7 +4254,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>iji</displayName>
 				<unitPattern count="other">{0} iji</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>bagean/yuta</displayName>
 				<unitPattern count="other">{0}bpj</unitPattern>
 			</unit>
@@ -4213,6 +4267,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-permyriad">
 				<displayName>permiriad</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 			</unit>
@@ -4433,7 +4490,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="mass-tonne">
 				<displayName>metrik ton</displayName>
-				<unitPattern count="other">{0} metrik ton</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>mikrogram</displayName>
@@ -4605,6 +4661,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Imp. seprapat galon</displayName>
 				<unitPattern count="other">{0} Imp. seprapat galon</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>cahya</displayName>
 				<unitPattern count="other">{0} cahya</unitPattern>
@@ -4638,6 +4697,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>mpg inggris</displayName>
 				<unitPattern count="other">{0}m/gUK</unitPattern>
@@ -4660,6 +4722,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="energy-therm-us">
 				<unitPattern count="other">{0}panas AS</unitPattern>
 			</unit>
+			<unit type="force-newton">
+				<displayName>N</displayName>
+			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<unitPattern count="other">{0}kWh/km</unitPattern>
 			</unit>
@@ -4669,9 +4734,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="graphics-dot-per-inch">
 				<unitPattern count="other">{0}tpi</unitPattern>
 			</unit>
-			<unit type="light-candela">
-				<unitPattern count="other">{0} cd</unitPattern>
-			</unit>
 			<unit type="mass-tonne">
 				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
@@ -4687,9 +4749,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-pint-metric">
 				<unitPattern count="other">{0}mpt</unitPattern>
 			</unit>
-			<unit type="volume-gallon-imperial">
-				<unitPattern count="other">{0}gallm</unitPattern>
-			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="other">{0}sprt</unitPattern>
 			</unit>
@@ -4712,18 +4771,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}by.dr.</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
-				<displayName>jiwit</displayName>
 				<unitPattern count="other">{0}jiwit</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0}spt-lmp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>cahya</displayName>
-				<unitPattern count="other">{0} cahya</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>wengi</displayName>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ka.xml b/make/data/cldr/common/main/ka.xml
index 7740acd7acb..2bd7c289ed6 100644
--- a/make/data/cldr/common/main/ka.xml
+++ b/make/data/cldr/common/main/ka.xml
@@ -267,6 +267,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ბაფია</language>
 			<language type="ksh">კიოლში</language>
 			<language type="ku">ქურთული</language>
+			<language type="ku" menu="core">ქურთული</language>
+			<language type="ku" menu="extension">კურმანჯი</language>
 			<language type="kum">ყუმუხური</language>
 			<language type="kut">კუტენაი</language>
 			<language type="kv">კომი</language>
@@ -804,6 +806,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ჩინეთი</territory>
 			<territory type="CO">კოლუმბია</territory>
 			<territory type="CP">კლიპერტონის კუნძული</territory>
+			<territory type="CQ">სარკი</territory>
 			<territory type="CR">კოსტა-რიკა</territory>
 			<territory type="CU">კუბა</territory>
 			<territory type="CV">კაბო-ვერდე</territory>
@@ -1100,54 +1103,91 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">ვალუტის ფორმატი</key>
 			<key type="collation">დახარისხების თანმიმდევრობა</key>
 			<key type="currency">ვალუტა</key>
+			<key type="em">სიცილაკების პრეზენტაცია</key>
 			<key type="hc">დროის სისტემა (12 ან 24)</key>
 			<key type="lb">სტრიქონის წყვეტის სტილი</key>
+			<key type="lw">სტრიქონზე გადასვლა სიტყვებს შორის</key>
 			<key type="ms">საზომი სისტემა</key>
 			<key type="numbers">რიცხვები</key>
+			<key type="ss">წინადადების წყვეტა შემოკლ. შემდეგ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ბუდისტური კალენდარი</type>
+			<type key="calendar" type="buddhist" scope="core">ბუდისტური</type>
 			<type key="calendar" type="chinese">ჩინური კალენდარი</type>
+			<type key="calendar" type="chinese" scope="core">ჩინური</type>
 			<type key="calendar" type="coptic">კოპტური კალენდარი</type>
+			<type key="calendar" type="coptic" scope="core">კოპტური</type>
 			<type key="calendar" type="dangi">კალენდარი დანგი</type>
+			<type key="calendar" type="dangi" scope="core">დანგი</type>
 			<type key="calendar" type="ethiopic">ეთიოპიური კალენდარი</type>
+			<type key="calendar" type="ethiopic" scope="core">ეთიოპიური</type>
 			<type key="calendar" type="ethiopic-amete-alem">ეთიოპიური ამეთე ალემი კალენდარი</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ეთიოპიური ამეთე ალემი</type>
 			<type key="calendar" type="gregorian">გრიგორიანული კალენდარი</type>
+			<type key="calendar" type="gregorian" scope="core">გრიგორიანული</type>
 			<type key="calendar" type="hebrew">ებრაული კალენდარი</type>
+			<type key="calendar" type="hebrew" scope="core">ებრაული</type>
 			<type key="calendar" type="indian">ინდოეთის ეროვნული კალენდარი</type>
 			<type key="calendar" type="islamic">ჰიჯრის კალენდარი</type>
+			<type key="calendar" type="islamic" scope="core">ჰიჯრი</type>
 			<type key="calendar" type="islamic-civil">ჰიჯრის სამოქალაქო კალენდარი (ტაბულარული)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ჰიჯრი (ტაბულარული, სამოქალაქო)</type>
 			<type key="calendar" type="islamic-umalqura">ჰიჯრის კალენდარი (უმ-ალ-ქურა)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ჰიჯრი (უმ-ალ-ქურა)</type>
 			<type key="calendar" type="iso8601">ISO-8601 კალენდარი</type>
 			<type key="calendar" type="japanese">იაპონური კალენდარი</type>
+			<type key="calendar" type="japanese" scope="core">იაპონური</type>
 			<type key="calendar" type="persian">სპარსული კალენდარი</type>
+			<type key="calendar" type="persian" scope="core">სპარსული</type>
 			<type key="calendar" type="roc">ჩინეთის რესპუბლიკის კალენდარი</type>
-			<type key="cf" type="account">ვალუტის ბუღალტრული ფორმატი</type>
+			<type key="calendar" type="roc" scope="core">მინგუო</type>
+			<type key="cf" type="account">ვალუტის საბუღალტრო ფორმატი</type>
+			<type key="cf" type="account" scope="core">საბუღალტრო</type>
 			<type key="cf" type="standard">ვალუტის სტანდარტული ფორმატი</type>
-			<type key="collation" type="big5han">ტრადიციული ჩინური</type>
+			<type key="cf" type="standard" scope="core">სტანდარტული</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">ლექსიკონით</type>
 			<type key="collation" type="ducet">უნიკოდის ნაგულისხმევი დახარისხების თანმიმდევრობა</type>
-			<type key="collation" type="gb2312han">გამარტივებული ჩინური</type>
+			<type key="collation" type="ducet" scope="core">უნიკოდის ნაგულისხმევი</type>
 			<type key="collation" type="phonebook" draft="unconfirmed">ტელეფონის წიგნით</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">პინ-ინი</type>
 			<type key="collation" type="reformed" draft="unconfirmed">რეფორმირებული</type>
 			<type key="collation" type="search">ზოგადი დანიშნულების ძიება</type>
+			<type key="collation" type="search" scope="core">ძიება</type>
 			<type key="collation" type="searchjl" draft="unconfirmed">ჰანგულის პირველი თანხმოვნით</type>
 			<type key="collation" type="standard">სტანდარტული დახარისხების თანმიმდევრობა</type>
+			<type key="collation" type="standard" scope="core">სტანდარტული</type>
 			<type key="collation" type="stroke" draft="unconfirmed">შტრიხით</type>
 			<type key="collation" type="traditional">ტრადიციული</type>
 			<type key="collation" type="unihan" draft="unconfirmed">ძირითადი შტრიხით</type>
 			<type key="collation" type="zhuyin" draft="unconfirmed">ჟუინი</type>
+			<type key="em" type="default" scope="core">ნაგულისხმევი</type>
+			<type key="em" type="emoji" scope="core">სიცილაკი</type>
+			<type key="em" type="text" scope="core">ტექსტი</type>
 			<type key="hc" type="h11">12-საათიანი სისტემა (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-საათიანი სისტემა (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (0–11)</type>
 			<type key="hc" type="h23">24-საათიანი სისტემა (0-23)</type>
+			<type key="hc" type="h23" scope="core">12 (0–23)</type>
 			<type key="hc" type="h24">24-საათიანი სისტემა (1-24)</type>
+			<type key="hc" type="h24" scope="core">12 (0–23)</type>
 			<type key="lb" type="loose">სტრიქონის რბილი წყვეტის სტილი</type>
+			<type key="lb" type="loose" scope="core">თავისუფალი</type>
 			<type key="lb" type="normal">სტრიქონის ჩვეულებრივი წყვეტის სტილი</type>
+			<type key="lb" type="normal" scope="core">ნორმალური</type>
 			<type key="lb" type="strict">სტრიქონის ზედმიწევნითი წყვეტის სტილი</type>
+			<type key="lb" type="strict" scope="core">მკაცრი</type>
+			<type key="lw" type="breakall" scope="core">ყველგან გაყოფა</type>
+			<type key="lw" type="keepall" scope="core">ყველგან შენარჩუნება</type>
+			<type key="lw" type="normal" scope="core">ნორმალური</type>
+			<type key="lw" type="phrase" scope="core">ფრაზებში შენარჩუნება</type>
 			<type key="ms" type="metric">მეტრული სისტემა</type>
+			<type key="ms" type="metric" scope="core">მეტრული</type>
 			<type key="ms" type="uksystem">ბრიტანული საზომი სისტემა</type>
+			<type key="ms" type="uksystem" scope="core">ბრიტანული</type>
 			<type key="ms" type="ussystem">ამერიკული საზომი სისტემა</type>
+			<type key="ms" type="ussystem" scope="core">ამერიკული</type>
 			<type key="numbers" type="arab">არაბულ-ინდური ციფრები</type>
 			<type key="numbers" type="arabext">გაფართოებული არაბულ-ინდური ციფრები</type>
 			<type key="numbers" type="armn">სომხური რიცხვები</type>
@@ -1201,6 +1241,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">ტაილანდური ციფრები</type>
 			<type key="numbers" type="tibt">ტიბეტური ციფრები</type>
 			<type key="numbers" type="vaii">ვაიური ციფრები</type>
+			<type key="ss" type="none" scope="core">გამორთული</type>
+			<type key="ss" type="standard" scope="core">ჩართული</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">მეტრული</measurementSystemName>
@@ -2471,6 +2513,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ისთერი</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>კოიჰაიკე</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>პუნტა-არენასი</exemplarCity>
 			</zone>
@@ -2736,9 +2781,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>პნომპენი</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ენდერბური</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>კანტონი</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3408,9 +3450,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>დასავლეთ აფრიკის დრო</generic>
-					<standard>დასავლეთ აფრიკის სტანდარტული დრო</standard>
-					<daylight>დასავლეთ აფრიკის ზაფხულის დრო</daylight>
+					<standard>დასავლეთ აფრიკის დრო</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3760,6 +3800,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>გაიანის დრო</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ჰავაისა და ალეუტის სტანდარტული დრო</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ჰავაისა და ალეუტის დრო</generic>
@@ -3993,9 +4038,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<generic draft="contributed">ნორფოლკის კუნძულის დრო</generic>
-					<standard draft="contributed">ნორფოლკის კუნძულის სტანდარტული დრო</standard>
-					<daylight draft="contributed">ნორფოლკის კუნძულის ზაფხულის დრო</daylight>
+					<generic>ნორფოლკის კუნძულის დრო</generic>
+					<standard>ნორფოლკის კუნძულის სტანდარტული დრო</standard>
+					<daylight>ნორფოლკის კუნძულის ზაფხულის დრო</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
@@ -4333,6 +4378,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5086,6 +5135,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>აღმოსავლეთ კარიბიული დოლარი</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>კარიბის გულდენი</displayName>
+				<displayName count="one">კარიბის გულდენი</displayName>
+				<displayName count="other">კარიბის გულდენი</displayName>
+			</currency>
 			<currency type="XEU">
 				<displayName draft="contributed">ევროპული სავალუტო ერთეული</displayName>
 			</currency>
@@ -5136,6 +5190,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName draft="contributed">ზიმბაბვეს დოლარი</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ზიმბაბვეს გოლდი</displayName>
+				<displayName count="one">ზიმბაბვეს გოლდი</displayName>
+				<displayName count="other">ზიმბაბვეს გოლდი</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
@@ -5327,7 +5386,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ერთეული</unitPattern>
 				<unitPattern count="other">{0} ერთეული</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>წილი</displayName>
+				<unitPattern count="one">{0} წილი</unitPattern>
+				<unitPattern count="other">{0} წილი</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ნაწილი მილიონზე</displayName>
 				<unitPattern count="one">{0} ნაწილი მილიონზე</unitPattern>
 				<unitPattern count="other">{0} ნაწილი მილიონზე</unitPattern>
@@ -5342,6 +5406,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} პრომილე</unitPattern>
 				<unitPattern count="other">{0} პრომილე</unitPattern>
 			</unit>
+			<unit type="concentr-mole">
+				<displayName>მოლი</displayName>
+				<unitPattern count="one">{0} მოლი</unitPattern>
+				<unitPattern count="other">{0} მოლი</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>გლუკოზის</displayName>
+				<unitPattern count="one">გლუკოზის {0}</unitPattern>
+				<unitPattern count="other">გლუკოზის {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ლიტრი კილომეტრზე</displayName>
 				<unitPattern count="one">{0} ლიტრი კილომეტრზე</unitPattern>
@@ -5522,6 +5596,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ბრიტანული სითბური ერთეული</unitPattern>
 				<unitPattern count="other">{0} ბრიტანული სითბური ერთეული</unitPattern>
 			</unit>
+			<unit type="force-newton">
+				<displayName>ნიუტონი</displayName>
+				<unitPattern count="one">{0} ნიუტონი</unitPattern>
+				<unitPattern count="other">{0} ნიუტონი</unitPattern>
+			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>გიგაჰერცი</displayName>
 				<unitPattern count="one">{0} გიგაჰერცი</unitPattern>
@@ -5712,8 +5791,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} მიკროგრამი</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<unitPattern count="one">{0} ტონა</unitPattern>
-				<unitPattern count="other">{0} ტ</unitPattern>
+				<displayName>აშშ მოკლე ტონა</displayName>
+				<unitPattern count="one">{0} აშშ მოკლე ტონა</unitPattern>
+				<unitPattern count="other">{0} აშშ მოკლე ტონა</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<unitPattern count="one">{0} ფუნტი</unitPattern>
@@ -5778,9 +5858,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ცხენის ძალა</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName>მილიმეტრი ვერცხლისწყლის სვეტისა</displayName>
-				<unitPattern count="one">{0} მილიმეტრი ვერცხლისწყლის სვეტისა</unitPattern>
-				<unitPattern count="other">{0} მილიმეტრი ვერცხლისწყლის სვეტისა</unitPattern>
+				<displayName>მილიმეტრი ვერცხლისწყლის სვეტი</displayName>
+				<unitPattern count="one">{0} მილიმეტრი ვერცხლისწყლის სვეტი</unitPattern>
+				<unitPattern count="other">{0} მილიმეტრი ვერცხლისწყლის სვეტი</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ვერცხლისწყალი</displayName>
+				<unitPattern count="one">{0} ვერცხლისწყალი</unitPattern>
+				<unitPattern count="other">{0} ვერცხლისწყალი</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ფუნტი კვადრატულ დუიმზე</displayName>
@@ -5788,9 +5873,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>ვერცხლისწყლის დუიმი</displayName>
-				<unitPattern count="one">{0} ვერცხლისწყლის დუიმი</unitPattern>
-				<unitPattern count="other">{0} ვერცხლისწყლის დუიმი</unitPattern>
+				<displayName>დუიმი ვერცხლისწყალი</displayName>
+				<unitPattern count="one">{0} დუიმი ვერცხლისწყალი</unitPattern>
+				<unitPattern count="other">{0} დუიმი ვერცხლისწყალი</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>მილიბარი</displayName>
@@ -5942,6 +6027,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} მეტრული ჭიქა</unitPattern>
 				<unitPattern count="other">{0} მეტრული ჭიქა</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>მეტრული თხევადი უნცია</displayName>
+				<unitPattern count="one">{0} მეტრული თხევადი უნცია</unitPattern>
+				<unitPattern count="other">{0} მეტრული თხევადი უნცია</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>აკრი-ფუტი</displayName>
 				<unitPattern count="one">{0} აკრი-ფუტი</unitPattern>
@@ -5993,17 +6083,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ბრიტანული კვარტი</unitPattern>
 				<unitPattern count="other">{0} ბრიტანული კვარტი</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>სტერადიანი</displayName>
+				<unitPattern count="one">{0} სტერადიანი</unitPattern>
+				<unitPattern count="other">{0} სტერადიანი</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>კატალი</displayName>
+				<unitPattern count="one">{0} კატალი</unitPattern>
+				<unitPattern count="other">{0} კატალი</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>კულონი</displayName>
+				<unitPattern count="one">{0} კულონი</unitPattern>
+				<unitPattern count="other">{0} კულონი</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ფარადა</displayName>
+				<unitPattern count="one">{0} ფარადა</unitPattern>
+				<unitPattern count="other">{0} ფარადა</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ჰენრი</displayName>
+				<unitPattern count="one">{0} ჰენრი</unitPattern>
+				<unitPattern count="other">{0} ჰენრი</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>სიმენსი</displayName>
+				<unitPattern count="one">{0} სიმენსი</unitPattern>
+				<unitPattern count="other">{0} სიმენსი</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>კალორია [IT]</displayName>
+				<unitPattern count="one">{0} კალორია [IT]</unitPattern>
+				<unitPattern count="other">{0} კალორია [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ბეკერელი</displayName>
+				<unitPattern count="one">{0} ბეკერელი</unitPattern>
+				<unitPattern count="other">{0} ბეკერელი</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ზივერტი</displayName>
+				<unitPattern count="one">{0} ზივერტი</unitPattern>
+				<unitPattern count="other">{0} ზივერტი</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>გრეი</displayName>
+				<unitPattern count="one">{0} გრეი</unitPattern>
+				<unitPattern count="other">{0} გრეი</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>კილოგრამძალა</displayName>
+				<unitPattern count="one">{0} კილოგრამძალა</unitPattern>
+				<unitPattern count="other">{0} კილოგრამძალა</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ტესლა</displayName>
+				<unitPattern count="one">{0} ტესლა</unitPattern>
+				<unitPattern count="other">{0} ტესლა</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ვებერი</displayName>
+				<unitPattern count="one">{0} ვებერი</unitPattern>
+				<unitPattern count="other">{0} ვებერი</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>სინათლის სიჩქარე</displayName>
+				<unitPattern count="one">{0} სინათლის სიჩქარე</unitPattern>
+				<unitPattern count="other">{0}-მაგი სინათლის სიჩქარე</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ნაწილი მილიარდზე</displayName>
 				<unitPattern count="one">{0} ნაწილი მილიარდზე</unitPattern>
 				<unitPattern count="other">{0} ნაწილი მილიარდზე</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ღამე</displayName>
-				<unitPattern count="one">{0} ღამე</unitPattern>
-				<unitPattern count="other">{0} ღამე</unitPattern>
-				<perUnitPattern>{0}/ღამე</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>კარდინალური მიმართულება</displayName>
 				<coordinateUnitPattern type="east">{0} აღმოსავლეთით</coordinateUnitPattern>
@@ -6214,9 +6368,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ერთე.</unitPattern>
 				<unitPattern count="other">{0} ერთე.</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>წ.</displayName>
+				<unitPattern count="one">{0} წ.</unitPattern>
+				<unitPattern count="other">{0} წ.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ნაწილი/მილიონზე</displayName>
 			</unit>
+			<unit type="concentr-mole">
+				<displayName>მოლ</displayName>
+				<unitPattern count="one">{0} მოლ</unitPattern>
+				<unitPattern count="other">{0} მოლ</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ლიტრი/კმ</displayName>
 				<unitPattern count="one">{0} ლ/კმ</unitPattern>
@@ -6252,11 +6421,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ტბიტი</unitPattern>
 				<unitPattern count="other">{0} ტბიტი</unitPattern>
 			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>გიგაბაიტი</displayName>
+				<unitPattern count="one">{0} გიგაბაიტი</unitPattern>
+				<unitPattern count="other">{0} გიგაბაიტი</unitPattern>
+			</unit>
 			<unit type="digital-gigabit">
 				<displayName>გბიტი</displayName>
 				<unitPattern count="one">{0} გბიტი</unitPattern>
 				<unitPattern count="other">{0} გბიტი</unitPattern>
 			</unit>
+			<unit type="digital-megabyte">
+				<displayName>მეგაბაიტი</displayName>
+				<unitPattern count="one">{0} მეგაბაიტი</unitPattern>
+				<unitPattern count="other">{0} მეგაბაიტი</unitPattern>
+			</unit>
 			<unit type="digital-megabit">
 				<displayName>მბიტი</displayName>
 				<unitPattern count="one">{0} მბიტი</unitPattern>
@@ -6420,6 +6599,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} აშშ თერმი</unitPattern>
 				<unitPattern count="other">{0} აშშ თერმი</unitPattern>
 			</unit>
+			<unit type="force-newton">
+				<displayName>ნ</displayName>
+				<unitPattern count="one">{0} ნ</unitPattern>
+				<unitPattern count="other">{0} ნ</unitPattern>
+			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>კვტსთ/100კმ</displayName>
 				<unitPattern count="one">{0} კვტსთ/100კმ</unitPattern>
@@ -6621,9 +6805,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ☉ სხივიერობა</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName>მტ</displayName>
-				<unitPattern count="one">{0} მტ</unitPattern>
-				<unitPattern count="other">{0} მტ</unitPattern>
+				<displayName>ტ</displayName>
+				<unitPattern count="one">{0} ტონა</unitPattern>
+				<unitPattern count="other">{0} ტონა</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>კილოგრამი</displayName>
@@ -6648,9 +6832,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} მკგ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<displayName>ტონა</displayName>
-				<unitPattern count="one">{0} ტ</unitPattern>
-				<unitPattern count="other">{0} ტ</unitPattern>
+				<displayName>მოკ. ტონა</displayName>
+				<unitPattern count="one">{0} მოკ. ტონა</unitPattern>
+				<unitPattern count="other">{0} მოკ. ტონა</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName>სტოუნი</displayName>
@@ -6720,9 +6904,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ცხ. ძ.</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName>მმ ვწყ. სვ.</displayName>
-				<unitPattern count="one">{0} მმ ვწყ. სვ.</unitPattern>
-				<unitPattern count="other">{0} მმ ვწყ. სვ.</unitPattern>
+				<displayName>მმ.ვწყ. სვ.</displayName>
+				<unitPattern count="one">{0} მმ.ვწყ. სვ.</unitPattern>
+				<unitPattern count="other">{0} მმ.ვწყ. სვ.</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ფნტ. კვ. დმ.</displayName>
@@ -6730,9 +6914,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ფნტ. კვ. დმ.</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>ვრც. დმ.</displayName>
-				<unitPattern count="one">{0} ვრც. დმ.</unitPattern>
-				<unitPattern count="other">{0} ვრც. დმ.</unitPattern>
+				<displayName>დუიმი ვერცხლისწყალი</displayName>
+				<unitPattern count="one">{0} დუიმი ვერცხლისწყალი</unitPattern>
+				<unitPattern count="other">{0} დუიმი ვერცხლისწყალი</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<displayName>ბარი</displayName>
@@ -6789,6 +6973,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} კვძ.</unitPattern>
 				<unitPattern count="other">{0} კვძ.</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<displayName>ბოფორტი</displayName>
+			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName>ფუნტი-ფუტი</displayName>
 				<unitPattern count="one">{0} ფუნტი-ფუტი</unitPattern>
@@ -6877,6 +7064,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} მეტრ. ჭიქა</unitPattern>
 				<unitPattern count="other">{0} მეტრ. ჭიქა</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>მეტრული თხევადი უნცია</displayName>
+				<unitPattern count="one">{0} მეტრული თხევადი უნცია</unitPattern>
+				<unitPattern count="other">{0} მეტრული თხევადი უნცია</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>აკრ.ფტ.</displayName>
 				<unitPattern count="one">{0} აკრ.ფტ.</unitPattern>
@@ -6974,7 +7166,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ბრიტ. კვარტი</unitPattern>
 				<unitPattern count="other">{0} ბრიტ. კვარტი</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>სრ</displayName>
+				<unitPattern count="one">{0} სრ</unitPattern>
+				<unitPattern count="other">{0} სრ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>კატ</displayName>
+				<unitPattern count="one">{0} კატ</unitPattern>
+				<unitPattern count="other">{0} კატ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>კულ</displayName>
+				<unitPattern count="one">{0} კულ</unitPattern>
+				<unitPattern count="other">{0} კულ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ფ</displayName>
+				<unitPattern count="one">{0} ფ</unitPattern>
+				<unitPattern count="other">{0} ფ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ჰ</displayName>
+				<unitPattern count="one">{0} ჰ</unitPattern>
+				<unitPattern count="other">{0} ჰ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>სიმ</displayName>
+				<unitPattern count="one">{0} სიმ</unitPattern>
+				<unitPattern count="other">{0} სიმ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>კალ-IT</displayName>
+				<unitPattern count="one">{0} კალ-IT</unitPattern>
+				<unitPattern count="other">{0} კალ-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ბკ</displayName>
+				<unitPattern count="one">{0} ბკ</unitPattern>
+				<unitPattern count="other">{0} ბკ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ზვ</displayName>
+				<unitPattern count="one">{0} ზვ</unitPattern>
+				<unitPattern count="other">{0} ზვ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>გრ</displayName>
+				<unitPattern count="one">{0} გრ</unitPattern>
+				<unitPattern count="other">{0} გრ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>კგძ</displayName>
+				<unitPattern count="one">{0} კგძ</unitPattern>
+				<unitPattern count="other">{0} კგძ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ტლ</displayName>
+				<unitPattern count="one">{0} ტლ</unitPattern>
+				<unitPattern count="other">{0} ტლ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ვბ</displayName>
+				<unitPattern count="one">{0} ვბ</unitPattern>
+				<unitPattern count="other">{0} ვბ</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>სინათლის სიჩქ.</displayName>
+				<unitPattern count="one">{0} სინათლის სიჩქ.</unitPattern>
+				<unitPattern count="other">{0}-მაგი სინათლის სიჩქ.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ნაწილი/მილიარდზე</displayName>
 				<unitPattern count="one">{0} ნ/მ</unitPattern>
 				<unitPattern count="other">{0} ნ/მ</unitPattern>
@@ -6994,6 +7256,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="acceleration-g-force">
+				<displayName>ინერციის ძალა</displayName>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0} წთ</unitPattern>
 				<unitPattern count="other">{0} წთ</unitPattern>
@@ -7002,10 +7267,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} წმ</unitPattern>
 				<unitPattern count="other">{0} წმ</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>წ.</displayName>
+				<unitPattern count="one">{0} წ.</unitPattern>
+				<unitPattern count="other">{0} წ.</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>მოლ</displayName>
+				<unitPattern count="one">{0} მოლ</unitPattern>
+				<unitPattern count="other">{0} მოლ</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}ლ/100კმ</unitPattern>
 				<unitPattern count="other">{0}ლ/100კმ</unitPattern>
 			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>გბაიტი</displayName>
+				<unitPattern count="one">{0} გბაიტი</unitPattern>
+				<unitPattern count="other">{0} გბაიტი</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>მეგაბაიტი</displayName>
+				<unitPattern count="one">{0} მეგაბაიტი</unitPattern>
+				<unitPattern count="other">{0} მეგაბაიტი</unitPattern>
+			</unit>
 			<unit type="duration-month">
 				<perUnitPattern>{0}/თ.</perUnitPattern>
 			</unit>
@@ -7022,6 +7312,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}წმ</unitPattern>
 				<unitPattern count="other">{0}წმ</unitPattern>
 			</unit>
+			<unit type="electric-milliampere">
+				<displayName>მილიამპერი</displayName>
+				<unitPattern count="one">{0} მილიამპერი</unitPattern>
+				<unitPattern count="other">{0} მილიამპერი</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0} ომი</unitPattern>
+				<unitPattern count="other">{0} ომი</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>კვტ.სთ</displayName>
+				<unitPattern count="one">{0} კვტ.სთ</unitPattern>
+				<unitPattern count="other">{0} კვტ.სთ</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>ნ</displayName>
+				<unitPattern count="one">{0} ნ</unitPattern>
+				<unitPattern count="other">{0} ნ</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<unitPattern count="one">{0} პიქს/დუიმი</unitPattern>
+				<unitPattern count="other">{0} პიქს/დუიმი</unitPattern>
+			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one">{0}მ</unitPattern>
 				<unitPattern count="other">{0}მ</unitPattern>
@@ -7030,6 +7343,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} დმ</unitPattern>
 				<unitPattern count="other">{0} დმ</unitPattern>
 			</unit>
+			<unit type="mass-tonne">
+				<displayName>ტ</displayName>
+				<unitPattern count="one">{0} ტ</unitPattern>
+				<unitPattern count="other">{0} ტ</unitPattern>
+			</unit>
 			<unit type="mass-kilogram">
 				<displayName>კგ</displayName>
 				<unitPattern count="one">{0}კგ</unitPattern>
@@ -7048,29 +7366,150 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}მკგ</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<unitPattern count="one">{0}ტ</unitPattern>
-				<unitPattern count="other">{0}ტ</unitPattern>
+				<displayName>მ.ტონა</displayName>
+				<unitPattern count="one">{0}მ.ტონა</unitPattern>
+				<unitPattern count="other">{0}მ.ტონა</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ფნტ</displayName>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>კარ</displayName>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0}ცხ.ძ.</unitPattern>
 				<unitPattern count="other">{0}ცხ.ძ.</unitPattern>
 			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>მმ.ვწყ. სვ.</displayName>
+				<unitPattern count="one">{0} მმ.ვწყ. სვ.</unitPattern>
+				<unitPattern count="other">{0} მმ.ვწყ. სვ.</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ფუნტი კვადრატულ დუიმზე</displayName>
+				<unitPattern count="one">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
+				<unitPattern count="other">{0} ფუნტი კვადრატულ დუიმზე</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>დუიმი ვერცხლისწყალი</displayName>
+				<unitPattern count="one">{0} დუიმი ვერცხლისწყალი</unitPattern>
+				<unitPattern count="other">{0} დუიმი ვერცხლისწყალი</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<unitPattern count="one">{0} მბრ</unitPattern>
 				<unitPattern count="other">{0} მბრ</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<displayName>ბოფორტი</displayName>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>მილი³</displayName>
+			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one">{0}ლ</unitPattern>
 				<unitPattern count="other">{0}ლ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>ნ/მ</displayName>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>მეტრული თხევადი უნცია</displayName>
+				<unitPattern count="one">{0} მეტრული თხევადი უნცია</unitPattern>
+				<unitPattern count="other">{0} მეტრული თხევადი უნცია</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ღამე</displayName>
-				<unitPattern count="one">{0} ღამე</unitPattern>
-				<unitPattern count="other">{0} ღამე</unitPattern>
-				<perUnitPattern>{0}/ღამე</perUnitPattern>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>ბრიტანული თხევადი უნცია</displayName>
+				<unitPattern count="one">{0} ბრიტანული თხევადი უნცია</unitPattern>
+				<unitPattern count="other">{0} ბრიტანული თხევადი უნცია</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ს.კ.</displayName>
+				<unitPattern count="one">{0} ს.კ.</unitPattern>
+				<unitPattern count="other">{0} ს.კ.</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ჩ.კ.</displayName>
+				<unitPattern count="one">{0} ჩ.კ.</unitPattern>
+				<unitPattern count="other">{0} ჩ.კ.</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<unitPattern count="one">{0} ბარელი</unitPattern>
+				<unitPattern count="other">{0} ბარელი</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>ბრიტანული თხევადი დრაქმა</displayName>
+				<unitPattern count="one">{0} ბრიტანული თხევადი დრაქმა</unitPattern>
+				<unitPattern count="other">{0} ბრიტანული თხევადი დრაქმა</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>სრ</displayName>
+				<unitPattern count="one">{0} სრ</unitPattern>
+				<unitPattern count="other">{0} სრ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>კატ</displayName>
+				<unitPattern count="one">{0} კატ</unitPattern>
+				<unitPattern count="other">{0} კატ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>კულ</displayName>
+				<unitPattern count="one">{0} კულ</unitPattern>
+				<unitPattern count="other">{0} კულ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ფ</displayName>
+				<unitPattern count="one">{0} ფ</unitPattern>
+				<unitPattern count="other">{0} ფ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ჰ</displayName>
+				<unitPattern count="one">{0} ჰ</unitPattern>
+				<unitPattern count="other">{0} ჰ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>სიმ</displayName>
+				<unitPattern count="one">{0} სიმ</unitPattern>
+				<unitPattern count="other">{0} სიმ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>კალ-IT</displayName>
+				<unitPattern count="one">{0} კალ-IT</unitPattern>
+				<unitPattern count="other">{0} კალ-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ბკ</displayName>
+				<unitPattern count="one">{0} ბკ</unitPattern>
+				<unitPattern count="other">{0} ბკ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ზვ</displayName>
+				<unitPattern count="one">{0} ზვ</unitPattern>
+				<unitPattern count="other">{0} ზვ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>გრ</displayName>
+				<unitPattern count="one">{0} გრ</unitPattern>
+				<unitPattern count="other">{0} გრ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>კგძ</displayName>
+				<unitPattern count="one">{0} კგძ</unitPattern>
+				<unitPattern count="other">{0} კგძ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ტლ</displayName>
+				<unitPattern count="one">{0} ტლ</unitPattern>
+				<unitPattern count="other">{0} ტლ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ვბ</displayName>
+				<unitPattern count="one">{0} ვბ</unitPattern>
+				<unitPattern count="other">{0} ვბ</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>c</displayName>
+				<unitPattern count="one">{0} სინათლის სიჩქ.</unitPattern>
+				<unitPattern count="other">{0}-მაგი სინათლის სიჩქ.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ნ/მ</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/kaa.xml b/make/data/cldr/common/main/kaa.xml
index 851615c3139..28914280908 100644
--- a/make/data/cldr/common/main/kaa.xml
+++ b/make/data/cldr/common/main/kaa.xml
@@ -339,6 +339,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 		<types>
 			<type key="calendar" type="gregorian">григориан календарь</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">григориан</type>
 			<type key="calendar" type="islamic-civil">кестели ҳижрий календарь</type>
 			<type key="calendar" type="islamic-tbla">кестели ҳижрий календарь (астрономиялық дәўир)</type>
 			<type key="calendar" type="iso8601">ISO-8601 календары</type>
@@ -622,9 +623,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="month-short">
 				<displayName>ай</displayName>
-				<relative type="-1">өткен ай</relative>
-				<relative type="0">усы ай</relative>
-				<relative type="1">кейинги ай</relative>
 			</field>
 			<field type="month-narrow">
 				<displayName>ай</displayName>
@@ -644,14 +642,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">өткен ҳәп.</relative>
 				<relative type="0">усы ҳәп.</relative>
 				<relative type="1">кейинги ҳәп.</relative>
-				<relativePeriod>{0}-ҳәпте</relativePeriod>
 			</field>
 			<field type="week-narrow">
 				<displayName>ҳәп</displayName>
 				<relative type="-1">өтк. ҳәп.</relative>
 				<relative type="0">усы ҳәп.</relative>
 				<relative type="1">кей. ҳәп.</relative>
-				<relativePeriod>{0}-ҳәпте</relativePeriod>
 			</field>
 			<field type="day">
 				<displayName>күн</displayName>
@@ -661,15 +657,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="day-short">
 				<displayName>күн</displayName>
-				<relative type="-1">кеше</relative>
-				<relative type="0">бүгин</relative>
-				<relative type="1">ертең</relative>
 			</field>
 			<field type="day-narrow">
 				<displayName>күн</displayName>
-				<relative type="-1">кеше</relative>
-				<relative type="0">бүгин</relative>
-				<relative type="1">ертең</relative>
 			</field>
 			<field type="weekday">
 				<displayName>ҳәпте күни</displayName>
@@ -708,5 +698,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ўақыт зонасы</displayName>
 			</field>
 		</fields>
+		<timeZoneNames>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="unconfirmed">Белгисиз орын</exemplarCity>
+			</zone>
+		</timeZoneNames>
 	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<nan draft="unconfirmed">сан емес</nan>
+		</symbols>
+	</numbers>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end" draft="unconfirmed">{0} ҳәм {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ҳәм {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or">
+			<listPatternPart type="end" draft="unconfirmed">{0} ямаса {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ямаса {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-narrow">
+			<listPatternPart type="end" draft="unconfirmed">{0} ямаса {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ямаса {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="end" draft="unconfirmed">{0} ямаса {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ямаса {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="end" draft="unconfirmed">{0} ҳәм {1}</listPatternPart>
+			<listPatternPart type="2" draft="unconfirmed">{0} ҳәм {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
 </ldml>
diff --git a/make/data/cldr/common/main/kab.xml b/make/data/cldr/common/main/kab.xml
index ef10d1d734d..c3a8b4a4446 100644
--- a/make/data/cldr/common/main/kab.xml
+++ b/make/data/cldr/common/main/kab.xml
@@ -1076,20 +1076,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">Nun</month>
 							<month type="12">Duǧ</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="unconfirmed">Y</month>
-							<month type="2" draft="unconfirmed">F</month>
-							<month type="3" draft="unconfirmed">M</month>
-							<month type="4" draft="unconfirmed">Y</month>
-							<month type="5" draft="unconfirmed">M</month>
-							<month type="6" draft="unconfirmed">Y</month>
-							<month type="7" draft="unconfirmed">Y</month>
-							<month type="8" draft="unconfirmed">Ɣ</month>
-							<month type="9" draft="unconfirmed">C</month>
-							<month type="10" draft="unconfirmed">T</month>
-							<month type="11" draft="unconfirmed">W</month>
-							<month type="12" draft="unconfirmed">D</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Yennayer</month>
 							<month type="2">Fuṛar</month>
@@ -1106,20 +1092,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">Yen</month>
-							<month type="2" draft="unconfirmed">Fur</month>
-							<month type="3" draft="unconfirmed">Meɣ</month>
-							<month type="4" draft="unconfirmed">Yeb</month>
-							<month type="5" draft="unconfirmed">May</month>
-							<month type="6" draft="unconfirmed">Yun</month>
-							<month type="7" draft="unconfirmed">Yul</month>
-							<month type="8" draft="unconfirmed">Ɣuc</month>
-							<month type="9" draft="unconfirmed">Cte</month>
-							<month type="10" draft="unconfirmed">Tub</month>
-							<month type="11" draft="unconfirmed">Wam</month>
-							<month type="12" draft="unconfirmed">Duǧ</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">Y</month>
 							<month type="2">F</month>
@@ -1139,51 +1111,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">Yan</day>
-							<day type="mon">San</day>
-							<day type="tue">Kraḍ</day>
-							<day type="wed">Kuẓ</day>
-							<day type="thu">Sam</day>
-							<day type="fri">Sḍis</day>
-							<day type="sat">Say</day>
+							<day type="sun">Acer</day>
+							<day type="mon">Arim</day>
+							<day type="tue">Aram</day>
+							<day type="wed">Ahad</day>
+							<day type="thu">Amhad</day>
+							<day type="fri">Sem</day>
+							<day type="sat">Sed</day>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">C</day>
-							<day type="mon" draft="unconfirmed">R</day>
-							<day type="tue" draft="unconfirmed">R</day>
-							<day type="wed" draft="unconfirmed">H</day>
-							<day type="thu" draft="unconfirmed">M</day>
-							<day type="fri" draft="unconfirmed">S</day>
-							<day type="sat" draft="unconfirmed">S</day>
+							<day type="sun">C</day>
+							<day type="mon">R</day>
+							<day type="tue">R</day>
+							<day type="wed">H</day>
+							<day type="thu">M</day>
+							<day type="fri">S</day>
+							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">Cr</day>
-							<day type="mon" draft="unconfirmed">Ri</day>
-							<day type="tue" draft="unconfirmed">Ra</day>
-							<day type="wed" draft="unconfirmed">Hd</day>
-							<day type="thu" draft="unconfirmed">Mh</day>
-							<day type="fri" draft="unconfirmed">Sm</day>
-							<day type="sat" draft="unconfirmed">Sd</day>
+							<day type="sun">Acer</day>
+							<day type="mon">Arim</day>
+							<day type="tue">Aram</day>
+							<day type="wed">Ahad</day>
+							<day type="thu">Amhad</day>
+							<day type="fri">Sem</day>
+							<day type="sat">Sed</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">Yanass</day>
-							<day type="mon">Sanass</day>
-							<day type="tue">Kraḍass</day>
-							<day type="wed">Kuẓass</day>
-							<day type="thu">Samass</day>
-							<day type="fri">Sḍisass</day>
-							<day type="sat">Sayass</day>
+							<day type="sun">Acer</day>
+							<day type="mon">Arim</day>
+							<day type="tue">Aram</day>
+							<day type="wed">Ahad</day>
+							<day type="thu">Amhad</day>
+							<day type="fri">Sem</day>
+							<day type="sat">Sed</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
 						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">Ace</day>
-							<day type="mon" draft="unconfirmed">Ari</day>
-							<day type="tue" draft="unconfirmed">Ara</day>
-							<day type="wed" draft="unconfirmed">Aha</day>
-							<day type="thu" draft="unconfirmed">Amh</day>
-							<day type="fri" draft="unconfirmed">Sem</day>
-							<day type="sat" draft="unconfirmed">Sed</day>
+							<day type="sun">Acer</day>
+							<day type="mon">Arim</day>
+							<day type="tue">Aram</day>
+							<day type="wed">Ahad</day>
+							<day type="thu">Amhad</day>
+							<day type="fri">Sem</day>
+							<day type="sat">Sed</day>
 						</dayWidth>
 						<!-- These are longer than the wide forms (at least for Lǧem). Commenting out for now.
 							 <dayWidth type="abbreviated">
@@ -1197,31 +1169,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							 </dayWidth>
 						-->
 						<dayWidth type="narrow">
-							<day type="sun">Y</day>
-							<day type="mon">S</day>
-							<day type="tue">K</day>
-							<day type="wed">K</day>
-							<day type="thu">S</day>
+							<day type="sun">C</day>
+							<day type="mon">R</day>
+							<day type="tue">R</day>
+							<day type="wed">H</day>
+							<day type="thu">M</day>
 							<day type="fri">S</day>
 							<day type="sat">S</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">Cr</day>
-							<day type="mon" draft="unconfirmed">Ri</day>
-							<day type="tue" draft="unconfirmed">Ra</day>
-							<day type="wed" draft="unconfirmed">Hd</day>
-							<day type="thu" draft="unconfirmed">Md</day>
-							<day type="fri" draft="unconfirmed">Sm</day>
-							<day type="sat" draft="unconfirmed">Sd</day>
+							<day type="sun">Acer</day>
+							<day type="mon">Arim</day>
+							<day type="tue">Aram</day>
+							<day type="wed">Ahad</day>
+							<day type="thu">Amhad</day>
+							<day type="fri">Sem</day>
+							<day type="sat">Sed</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">Acer</day>
-							<day type="mon" draft="unconfirmed">Arim</day>
-							<day type="tue" draft="unconfirmed">Aram</day>
-							<day type="wed" draft="unconfirmed">Ahad</day>
-							<day type="thu" draft="unconfirmed">Amhad</day>
-							<day type="fri" draft="unconfirmed">Sem</day>
-							<day type="sat" draft="unconfirmed">Sed</day>
+							<day type="sun">Acer</day>
+							<day type="mon">Arim</day>
+							<day type="tue">Aram</day>
+							<day type="wed">Ahad</day>
+							<day type="thu">Amhad</day>
+							<day type="fri">Sem</day>
+							<day type="sat">Sed</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -2299,9 +2271,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Nairobi">
 				<exemplarCity draft="unconfirmed">Nayrubi</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity draft="unconfirmed">Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity draft="unconfirmed">Kumuṛ</exemplarCity>
 			</zone>
@@ -2615,9 +2584,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Akud n Tefriqt n umalu</generic>
-					<standard draft="unconfirmed">Akud amezday n Tefriqt n umalu</standard>
-					<daylight draft="unconfirmed">Akud n unebdu n Tefriqt n umalu</daylight>
+					<standard draft="unconfirmed">Akud n Tefriqt n umalu</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2967,6 +2934,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Akud n Gwiyan</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Akud amezday n Haway-Aliwsyan</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Akud n Haway-Aliwsyan</generic>
@@ -3518,30 +3490,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one" draft="provisional">0K¤</pattern>
-					<pattern type="1000" count="other" draft="provisional">0K¤</pattern>
-					<pattern type="10000" count="one" draft="provisional">00K¤</pattern>
-					<pattern type="10000" count="other" draft="provisional">00K¤</pattern>
-					<pattern type="100000" count="one" draft="provisional">000K¤</pattern>
-					<pattern type="100000" count="other" draft="provisional">000K¤</pattern>
+					<pattern type="1000" count="one">0G¤</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">0G ¤</pattern>
+					<pattern type="1000" count="other">0G¤</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">0G ¤</pattern>
+					<pattern type="10000" count="one">00G¤</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">00G ¤</pattern>
+					<pattern type="10000" count="other">00G¤</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">00G ¤</pattern>
+					<pattern type="100000" count="one">000G¤</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">000G ¤</pattern>
+					<pattern type="100000" count="other">000G¤</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">000G ¤</pattern>
 					<pattern type="1000000" count="one" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">0M ¤</pattern>
 					<pattern type="1000000" count="other" draft="provisional">0M¤</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">0M ¤</pattern>
 					<pattern type="10000000" count="one" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">00M ¤</pattern>
 					<pattern type="10000000" count="other" draft="provisional">00M¤</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">00M ¤</pattern>
 					<pattern type="100000000" count="one" draft="provisional">000M¤</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">000M ¤</pattern>
 					<pattern type="100000000" count="other" draft="provisional">000M¤</pattern>
-					<pattern type="1000000000" count="one" draft="provisional">0G¤</pattern>
-					<pattern type="1000000000" count="other" draft="provisional">0G¤</pattern>
-					<pattern type="10000000000" count="one" draft="provisional">00G¤</pattern>
-					<pattern type="10000000000" count="other" draft="provisional">00G¤</pattern>
-					<pattern type="100000000000" count="one" draft="provisional">000G¤</pattern>
-					<pattern type="100000000000" count="other" draft="provisional">000G¤</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">000M ¤</pattern>
+					<pattern type="1000000000" count="one">0L¤</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">0L ¤</pattern>
+					<pattern type="1000000000" count="other">0L¤</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0L ¤</pattern>
+					<pattern type="10000000000" count="one">00L¤</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">00L ¤</pattern>
+					<pattern type="10000000000" count="other">00L¤</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00L ¤</pattern>
+					<pattern type="100000000000" count="one">000L¤</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">000L ¤</pattern>
+					<pattern type="100000000000" count="other">000L¤</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000L ¤</pattern>
 					<pattern type="1000000000000" count="one" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">0T ¤</pattern>
 					<pattern type="1000000000000" count="other" draft="provisional">0T¤</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0T ¤</pattern>
 					<pattern type="10000000000000" count="one" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">00T ¤</pattern>
 					<pattern type="10000000000000" count="other" draft="provisional">00T¤</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00T ¤</pattern>
 					<pattern type="100000000000000" count="one" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">000T ¤</pattern>
 					<pattern type="100000000000000" count="other" draft="provisional">000T¤</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000T ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/kea.xml b/make/data/cldr/common/main/kea.xml
index 15661c6e995..cfd3aaf5948 100644
--- a/make/data/cldr/common/main/kea.xml
+++ b/make/data/cldr/common/main/kea.xml
@@ -151,7 +151,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lo">lausianu</language>
 			<language type="lt">lituanu</language>
 			<language type="lu">luba-katanga</language>
-			<language type="luo">luo</language>
 			<language type="luy">luyia</language>
 			<language type="lv">letãu</language>
 			<language type="mg">malgaxi</language>
@@ -432,7 +431,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IL">Israel</territory>
 			<territory type="IM">Ilha di Man</territory>
 			<territory type="IN">Índia</territory>
-			<territory type="IO" draft="provisional">Ilhas Británikas di Índiku</territory>
+			<territory type="IO">Ilhas Británikas di Índiku</territory>
 			<territory type="IQ">Iraki</territory>
 			<territory type="IR">Irãu</territory>
 			<territory type="IS">Islándia</territory>
@@ -609,10 +608,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="gregorian">Kalendáriu Gregorianu</type>
 			<type key="calendar" type="hebrew">Kalendáriu ebraiku</type>
 			<type key="calendar" type="indian">Kalendáriu nasional indianu</type>
-			<type key="calendar" type="islamic" draft="provisional">Kalendáriu islámiku</type>
-			<type key="calendar" type="islamic-civil" draft="provisional">Kalendáriu islámiku (sivil)</type>
-			<type key="calendar" type="islamic-tbla" draft="provisional">Kalendáriu islámiku (astronómiku)</type>
-			<type key="calendar" type="islamic-umalqura" draft="provisional">Kalendáriu islámiku (Umm al-Qura)</type>
+			<type key="calendar" type="islamic">Kalendáriu islámiku</type>
+			<type key="calendar" type="islamic-civil">Kalendáriu islámiku (sivil)</type>
+			<type key="calendar" type="islamic-tbla">Kalendáriu islámiku (astronómiku)</type>
+			<type key="calendar" type="islamic-umalqura">Kalendáriu islámiku (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Kalendáriu ISO-8601</type>
 			<type key="calendar" type="japanese">Kalendáriu japones</type>
 			<type key="calendar" type="persian">Kalendáriu persa</type>
@@ -709,7 +708,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
@@ -1069,7 +1067,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a (v)</dateFormatItem>
@@ -1147,7 +1144,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1172,7 +1168,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1736,9 +1731,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora di Áfrika Osidental</generic>
-					<standard>Ora Padron di Áfrika Osidental</standard>
-					<daylight>Ora di Veron di Áfrika Osidental</daylight>
+					<standard>Ora di Áfrika Osidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1865,6 +1858,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ora di Veron di Gronelándia Osidental</daylight>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora Padron di Avaí i Aleutas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora di Avaí i Aleutas</generic>
@@ -1943,9 +1941,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -1965,7 +1965,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern type="100000000000000" count="other" draft="provisional">000 Bi ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
@@ -2356,7 +2355,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>milimol pur litru</displayName>
 				<unitPattern count="other">{0} milimol pur litru</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>parti pur milhãu</displayName>
 				<unitPattern count="other">{0} parti pur milhãu</unitPattern>
 			</unit>
@@ -2503,8 +2502,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} kaloria</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName draft="provisional">Kaloria</displayName>
-				<unitPattern count="other" draft="provisional">{0} Kaloria</unitPattern>
+				<displayName>Kaloria</displayName>
+				<unitPattern count="other">{0} Kaloria</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kilojoule</displayName>
@@ -2574,16 +2573,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} piksel pur pulegada</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
-				<displayName draft="provisional">pontu pur sentímeru</displayName>
-				<unitPattern count="other" draft="provisional">{0} pontu pur sentímetru</unitPattern>
+				<displayName>pontu pur sentímeru</displayName>
+				<unitPattern count="other">{0} pontu pur sentímetru</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
-				<displayName draft="provisional">pontu pur pulegada</displayName>
-				<unitPattern count="other" draft="provisional">{0} pontu pur pulegada</unitPattern>
+				<displayName>pontu pur pulegada</displayName>
+				<unitPattern count="other">{0} pontu pur pulegada</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
-				<displayName draft="provisional">pontu</displayName>
-				<unitPattern count="other" draft="provisional">{0} pontu</unitPattern>
+				<displayName>pontu</displayName>
+				<unitPattern count="other">{0} pontu</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
 				<displayName>raiu di Tera</displayName>
@@ -3000,7 +2999,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>milimol/litru</displayName>
 				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>parti/milhãu</displayName>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
@@ -3068,8 +3067,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} sig.</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
-				<displayName draft="provisional">Cal</displayName>
-				<unitPattern count="other" draft="provisional">{0} Cal</unitPattern>
+				<displayName>Cal</displayName>
+				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
 			<unit type="energy-joule">
 				<displayName>J</displayName>
diff --git a/make/data/cldr/common/main/kek.xml b/make/data/cldr/common/main/kek.xml
new file mode 100644
index 00000000000..d13302e690d
--- /dev/null
+++ b/make/data/cldr/common/main/kek.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="kek"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="kek">Qʼeqchiʼ</language>
+		</languages>
+		<territories>
+			<territory type="001">Ruchichʼochʼ</territory>
+			<territory type="UN">Molam Rehebʼ Ninqi Tenamit</territory>
+			<territory type="ZZ">Ebʼ li Naʼajej Moko Nawbʼilebʼ Ta</territory>
+		</territories>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a {aa} {bʼ} c {ch} {ch’} e {ee} h i {ii} j k {k’} l m n o {oo} p q {q’} r s t {t’} {tz} {tz’} u {uu} w x y]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[d f g v z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . … ’ “” ( ) \[ \] \{ \} /]</exemplarCharacters>
+	</characters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">Xbʼeen Po</month>
+							<month type="2">Xkabʼ Po</month>
+							<month type="3">Rox Po</month>
+							<month type="4">Xkaa Po</month>
+							<month type="5">Roʼ Po</month>
+							<month type="6">Xwaq Po</month>
+							<month type="7">Xwuuq Po</month>
+							<month type="8">Xwaqxaq Po</month>
+							<month type="9">Xbʼelee Po</month>
+							<month type="10">Xlajee Po</month>
+							<month type="11">Xjunlaj Po</month>
+							<month type="12">Xkabʼlaj Po</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="wide">
+							<day type="sun">Doʼkutan</day>
+							<day type="mon">LuʼKutan</day>
+							<day type="tue">MarʼKutan</day>
+							<day type="wed">MerʼKutan</day>
+							<day type="thu">JueʼKutan</day>
+							<day type="fri">VierʼKutan</day>
+							<day type="sat">SabʼKutan</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">Eqʼela</dayPeriod>
+							<dayPeriod type="pm">Ewu</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
diff --git a/make/data/cldr/common/main/kek_GT.xml b/make/data/cldr/common/main/kek_GT.xml
new file mode 100644
index 00000000000..4beb614a91a
--- /dev/null
+++ b/make/data/cldr/common/main/kek_GT.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="kek"/>
+		<territory type="GT"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/kgp.xml b/make/data/cldr/common/main/kgp.xml
index 343220d9650..3b00c5f70db 100644
--- a/make/data/cldr/common/main/kgp.xml
+++ b/make/data/cldr/common/main/kgp.xml
@@ -1089,12 +1089,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Vẽnhrá mág to kuprãg</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Vẽnhrá mág mré ũn kẽsir tỹ ũn’ũn mỹ kuprẽg</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Vẽnhrá mág mré ũn kẽsir tỹ ũn’ũn kỹ kuprẽg</type>
-			<type key="collation" type="big5han">Sĩnẽj Vỹsa ke to ke pẽ - Big5</type>
 			<type key="collation" type="compat" draft="contributed">Ẽgno tá jẽnẽ já kỹ ta ki já</type>
 			<type key="collation" type="dictionary">Vẽnhrá Nỹtĩj-fẽ nỹtĩ há</type>
 			<type key="collation" type="ducet">Unicode to ke pẽ</type>
 			<type key="collation" type="eor" draft="contributed">Orópa tá vẽnhvin han to ke</type>
-			<type key="collation" type="gb2312han">Sĩnẽj ke to ke (sĩmpri há) - GB2312</type>
 			<type key="collation" type="phonebook">Terefonĩ Risita to ke</type>
 			<type key="collation" type="phonetic" draft="contributed">Fonẽtika to ke kuprãg</type>
 			<type key="collation" type="pinyin">Pin-yin to nỹtĩ</type>
@@ -2854,9 +2852,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Fynãg Pẽj</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ẽnnermuri</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kiritimỹti</exemplarCity>
 			</zone>
@@ -3524,9 +3519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Afrika Rãpur tá óra</generic>
-					<standard>Óra Pã Afrika Rãpur tá</standard>
-					<daylight>Rỹ Kã óra Afrika Rãpur tá</daylight>
+					<standard>Afrika Rãpur tá óra</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3919,6 +3912,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Óra Gijỹnỹ tá</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Óra Pã Hava’i kar Arevta Goj-vẽso tá</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Óra Hava’i kar Arevta Goj-vẽso tá</generic>
@@ -6148,7 +6146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mĩrimol ritru ki</unitPattern>
 				<unitPattern count="other">{0} mĩrimol ag ritru ki</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>milhão ki kupar ‘e</displayName>
 				<unitPattern count="one">{0} kupar milhão ki</unitPattern>
 				<unitPattern count="other">{0} kupar 'e milhão ki</unitPattern>
@@ -6917,7 +6915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mĩrimol/ritru</displayName>
 				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>kupar ‘e/milhão ki</displayName>
 			</unit>
 			<unit type="concentr-percent">
diff --git a/make/data/cldr/common/main/kk.xml b/make/data/cldr/common/main/kk.xml
index c410b197cc6..8c1d68c5fe7 100644
--- a/make/data/cldr/common/main/kk.xml
+++ b/make/data/cldr/common/main/kk.xml
@@ -29,7 +29,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="an">арагон тілі</language>
 			<language type="ann">оболо тілі</language>
 			<language type="anp">ангика тілі</language>
-			<language type="apc" draft="unconfirmed">араб тілі (леватин)</language>
+			<language type="apc" draft="contributed">араб тілі (леватин)</language>
 			<language type="ar">араб тілі</language>
 			<language type="ar_001">қазіргі стандартты араб тілі</language>
 			<language type="arn">мапуче тілі</language>
@@ -44,12 +44,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ay">аймара тілі</language>
 			<language type="az">әзірбайжан тілі</language>
 			<language type="ba">башқұрт тілі</language>
-			<language type="bal" draft="unconfirmed">балучи тілі</language>
+			<language type="bal">балучи тілі</language>
 			<language type="ban">бали тілі</language>
 			<language type="bas">баса тілі</language>
 			<language type="be">беларусь тілі</language>
 			<language type="bem">бемба тілі</language>
-			<language type="bew" draft="unconfirmed">бетауи тілі</language>
+			<language type="bew" draft="contributed">бетауи тілі</language>
 			<language type="bez">бена тілі</language>
 			<language type="bg">болгар тілі</language>
 			<language type="bgc">хариани тілі</language>
@@ -59,20 +59,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bin">бини тілі</language>
 			<language type="bla">сиксика тілі</language>
 			<language type="blo">ании тілі</language>
-			<language type="blt" draft="unconfirmed">тай дам тілі</language>
+			<language type="blt" draft="contributed">тай дам тілі</language>
 			<language type="bm">бамбара тілі</language>
 			<language type="bn">бенгал тілі</language>
 			<language type="bo">тибет тілі</language>
+			<language type="bqi" draft="contributed">бахтияр тілі</language>
 			<language type="br">бретон тілі</language>
 			<language type="brx">бодо тілі</language>
 			<language type="bs">босния тілі</language>
-			<language type="bss" draft="unconfirmed">акусе тілі</language>
+			<language type="bss" draft="contributed">акусе тілі</language>
+			<language type="bua" draft="contributed">бурят тілі</language>
 			<language type="bug">бугис тілі</language>
 			<language type="byn">блин тілі</language>
 			<language type="ca">каталан тілі</language>
-			<language type="cad" draft="unconfirmed">каддо тілі</language>
+			<language type="cad" draft="contributed">каддо тілі</language>
 			<language type="cay">кайюга тілі</language>
-			<language type="cch" draft="unconfirmed">атсам тілі</language>
+			<language type="cch" draft="contributed">атсам тілі</language>
 			<language type="ccp">чакма тілі</language>
 			<language type="ce">шешен тілі</language>
 			<language type="ceb">себуано тілі</language>
@@ -84,10 +86,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="chp">чипевайан тілі</language>
 			<language type="chr">чероки тілі</language>
 			<language type="chy">шайен тілі</language>
-			<language type="cic" draft="unconfirmed">чикасау тілі</language>
+			<language type="cic" draft="contributed">чикасау тілі</language>
 			<language type="ckb">сорани тілі</language>
 			<language type="clc">чилкотин тілі</language>
 			<language type="co">корсика тілі</language>
+			<language type="cop" draft="contributed">копт тілі</language>
 			<language type="crg">мичиф тілі</language>
 			<language type="crj">оңтүстік-шығыс кри тілі</language>
 			<language type="crk">жазықтағы кри тілі</language>
@@ -121,6 +124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="eka">экаджук тілі</language>
 			<language type="el">грек тілі</language>
 			<language type="en">ағылшын тілі</language>
+			<language type="en_GB" alt="short">ағылшын тілі (Біріккен Корольдік)</language>
 			<language type="eo">эсперанто тілі</language>
 			<language type="es">испан тілі</language>
 			<language type="et">эстон тілі</language>
@@ -162,7 +166,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hi_Latn" alt="variant">хинглиш</language>
 			<language type="hil">хилигайнон тілі</language>
 			<language type="hmn">хмонг тілі</language>
-			<language type="hnj" draft="unconfirmed">хмоң ниуа тілі</language>
+			<language type="hnj" draft="contributed">хмоң ниуа тілі</language>
 			<language type="hr">хорват тілі</language>
 			<language type="hsb">жоғарғы лужица тілі</language>
 			<language type="ht">гаити тілі</language>
@@ -191,7 +195,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="jmc">мачаме тілі</language>
 			<language type="jv">ява тілі</language>
 			<language type="ka">грузин тілі</language>
-			<language type="kaa" draft="unconfirmed">қарақалпақ тілі</language>
+			<language type="kaa" draft="contributed">қарақалпақ тілі</language>
 			<language type="kab">кабил тілі</language>
 			<language type="kac">качин тілі</language>
 			<language type="kaj">каджи тілі</language>
@@ -200,7 +204,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kcg">тьяп тілі</language>
 			<language type="kde">маконде тілі</language>
 			<language type="kea">кабувердьяну тілі</language>
-			<language type="ken" draft="unconfirmed">кеняң тілі</language>
+			<language type="kek" draft="contributed">кекчи тілі</language>
+			<language type="ken" draft="contributed">кеняң тілі</language>
 			<language type="kfo">коро тілі</language>
 			<language type="kgp">кайнганг тілі</language>
 			<language type="kha">кхаси тілі</language>
@@ -227,6 +232,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафиа тілі</language>
 			<language type="ksh">кёльн тілі</language>
 			<language type="ku">күрд тілі</language>
+			<language type="ku" menu="core">күрд тілі</language>
+			<language type="ku" menu="extension">күрд тілі (күрмәнжі)</language>
 			<language type="kum">құмық тілі</language>
 			<language type="kv">коми тілі</language>
 			<language type="kw">корн тілі</language>
@@ -243,7 +250,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lij">лигур тілі</language>
 			<language type="lil">лиллуэт тілі</language>
 			<language type="lkt">лакота тілі</language>
-			<language type="lld" draft="unconfirmed">ладин тілі</language>
+			<language type="lld" draft="contributed">ладин тілі</language>
 			<language type="lmo">ломбард тілі</language>
 			<language type="ln">лингала тілі</language>
 			<language type="lo">лаос тілі</language>
@@ -252,7 +259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lrc">солтүстік люри тілі</language>
 			<language type="lsm">самия тілі</language>
 			<language type="lt">литва тілі</language>
-			<language type="ltg" draft="unconfirmed">латгалиан тілі</language>
+			<language type="ltg" draft="contributed">латгалиан тілі</language>
 			<language type="lu">луба-катанга тілі</language>
 			<language type="lua">луба-лулуа тілі</language>
 			<language type="lun">лунда тілі</language>
@@ -260,6 +267,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lus">мизо тілі</language>
 			<language type="luy">лухиа тілі</language>
 			<language type="lv">латыш тілі</language>
+			<language type="lzz" draft="contributed">Лаз тілі</language>
 			<language type="mad">мадур тілі</language>
 			<language type="mag">магахи тілі</language>
 			<language type="mai">майтхили тілі</language>
@@ -273,7 +281,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mgh">макуа-меетто тілі</language>
 			<language type="mgo">мета тілі</language>
 			<language type="mh">маршалл тілі</language>
-			<language type="mhn" draft="unconfirmed">мокено тілі</language>
+			<language type="mhn" draft="contributed">мокено тілі</language>
 			<language type="mi">маори тілі</language>
 			<language type="mic">микмак тілі</language>
 			<language type="min">минангкабау тілі</language>
@@ -336,8 +344,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="pap">папьяменто тілі</language>
 			<language type="pau">палау тілі</language>
 			<language type="pcm">нигериялық пиджин тілі</language>
+			<language type="pi" draft="contributed">пали тілі</language>
 			<language type="pis">пиджин тілі</language>
 			<language type="pl">поляк тілі</language>
+			<language type="pms" draft="contributed">пьемонт тілі</language>
 			<language type="pqm">малесит-пассамакводди тілі</language>
 			<language type="prg">пруссия тілі</language>
 			<language type="ps">пушту тілі</language>
@@ -350,7 +360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="rap">рапануй тілі</language>
 			<language type="rar">раротонган тілі</language>
 			<language type="rhg">рохинджа</language>
-			<language type="rif" draft="unconfirmed">риффиан тілі</language>
+			<language type="rif" draft="contributed">риффиан тілі</language>
 			<language type="rm">романш тілі</language>
 			<language type="rn">рунди тілі</language>
 			<language type="ro">румын тілі</language>
@@ -376,13 +386,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="seh">сена тілі</language>
 			<language type="ses">койраборо сенни тілі</language>
 			<language type="sg">санго тілі</language>
+			<language type="sgs" draft="contributed">самогития тілі</language>
 			<language type="sh">серб-хорват тілі</language>
 			<language type="shi">ташелхит тілі</language>
 			<language type="shn">шан тілі</language>
 			<language type="si">сингал тілі</language>
-			<language type="sid" draft="unconfirmed">сидамо тілі</language>
+			<language type="sid" draft="contributed">сидамо тілі</language>
 			<language type="sk">словак тілі</language>
-			<language type="skr" draft="unconfirmed">сарайки тілі</language>
+			<language type="skr" draft="contributed">сарайки тілі</language>
 			<language type="sl">словен тілі</language>
 			<language type="slh">оңтүстік лушуцид тілі</language>
 			<language type="sm">самоа тілі</language>
@@ -429,7 +440,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="tpi">ток-писин тілі</language>
 			<language type="tr">түрік тілі</language>
 			<language type="trv">тароко тілі</language>
-			<language type="trw" draft="unconfirmed">торуали тілі</language>
+			<language type="trw" draft="contributed">торуали тілі</language>
 			<language type="ts">тсонга тілі</language>
 			<language type="tt">татар тілі</language>
 			<language type="ttm">солтүстік тутчоне тілі</language>
@@ -751,6 +762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Қытай</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">Клиппертон аралы</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -1097,59 +1109,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Валюта форматы</key>
 			<key type="collation">Сұрыптау реті</key>
 			<key type="currency">Валюта</key>
+			<key type="em">Эмоджи көрсетілімі</key>
 			<key type="hc">Уақыт форматы (12 не 24)</key>
 			<key type="lb">Жолды тасымалдау стилі</key>
+			<key type="lw">Сөздердегі жол бөліністері</key>
 			<key type="ms">Өлшемдер жүйесі</key>
 			<key type="numbers">Сандар</key>
+			<key type="ss">Қысқарған сөзден кейінгі сөйлем бөлінісі</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Будда күнтізбесі</type>
+			<type key="calendar" type="buddhist" scope="core">Будда</type>
 			<type key="calendar" type="chinese">Қытай күнтізбесі</type>
+			<type key="calendar" type="chinese" scope="core">Қытай</type>
 			<type key="calendar" type="coptic">Копт күнтізбесі</type>
+			<type key="calendar" type="coptic" scope="core">Копт</type>
 			<type key="calendar" type="dangi">Данги күнтізбесі</type>
+			<type key="calendar" type="dangi" scope="core">Данги</type>
 			<type key="calendar" type="ethiopic">Эфиопия күнтізбесі</type>
+			<type key="calendar" type="ethiopic" scope="core">Эфиопия</type>
 			<type key="calendar" type="ethiopic-amete-alem">Эфиопияның Амете-Алем күнтізбесі</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Эфиопияның Амете-Алем</type>
 			<type key="calendar" type="gregorian">Грегориандық күнтізбе</type>
+			<type key="calendar" type="gregorian" scope="core">Грегориан</type>
 			<type key="calendar" type="hebrew">Көне еврей күнтізбесі</type>
+			<type key="calendar" type="hebrew" scope="core">Көне еврей</type>
 			<type key="calendar" type="indian" draft="contributed">Үндістанның ұлттық күнтізбесі</type>
 			<type key="calendar" type="islamic">Ислам күнтізбесі</type>
+			<type key="calendar" type="islamic" scope="core">Ислам</type>
 			<type key="calendar" type="islamic-civil">Ислам күнтізбесі (кестелік, азаматтық дәуір)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Ислам (кестелік, азаматтық дәуір)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">Ислам күнтізбесі (Сауд Арабиясы, жаңа ай)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">Ислам күнтізбесі (кестелік, астрономиялық дәуір)</type>
 			<type key="calendar" type="islamic-umalqura">Ислам күнтізбесі (Умм аль-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Ислам (Умм аль-Кура)</type>
 			<type key="calendar" type="iso8601">ISO-8601 күнтізбесі</type>
 			<type key="calendar" type="japanese">Жапон күнтізбесі</type>
+			<type key="calendar" type="japanese" scope="core">Жапон</type>
 			<type key="calendar" type="persian">Парсы күнтізбесі</type>
+			<type key="calendar" type="persian" scope="core">Парсы</type>
 			<type key="calendar" type="roc">Мингуо күнтізбесі</type>
+			<type key="calendar" type="roc" scope="core">Мингуо</type>
 			<type key="cf" type="account">Есептік валюта форматы</type>
+			<type key="cf" type="account" scope="core">Есептік</type>
 			<type key="cf" type="standard">Стандартты валюта форматы</type>
-			<type key="collation" type="big5han" draft="contributed">Дәстүрлі қытай тілінің сұрыптау реті - Big5</type>
+			<type key="cf" type="standard" scope="core">Стандартты</type>
 			<type key="collation" type="compat" draft="contributed">Сәйкестікке арналған алдыңғы сұрыптау реті</type>
 			<type key="collation" type="dictionary" draft="contributed">Сөздік бойынша сұрыптау реті</type>
 			<type key="collation" type="ducet">Әдепкі уникод сұрыптау реті</type>
+			<type key="collation" type="ducet" scope="core">Әдепкі уникод</type>
 			<type key="collation" type="emoji" draft="contributed">Эмоджи сұрыптау реті</type>
 			<type key="collation" type="eor" draft="contributed">Еуропалық реттеу ережелері</type>
-			<type key="collation" type="gb2312han" draft="contributed">Жеңілдетілген қытай тілінің сұрыптау реті - GB2312</type>
 			<type key="collation" type="phonebook" draft="contributed">Телефон кітапшасының сұрыптау реті</type>
 			<type key="collation" type="pinyin" draft="contributed">Пиньинь сұрыптау реті</type>
 			<type key="collation" type="reformed" draft="contributed">Қайта қарастырылған сұрыптау реті</type>
 			<type key="collation" type="search">Жалпы мақсаттағы іздеу</type>
+			<type key="collation" type="search" scope="core">Іздеу</type>
 			<type key="collation" type="searchjl" draft="contributed">Корей тілінің бастапқы дауыссызы бойынша іздеу</type>
 			<type key="collation" type="standard">Стандартты сұрыптау реті</type>
+			<type key="collation" type="standard" scope="core">Стандартты</type>
 			<type key="collation" type="stroke" draft="contributed">Иероглифтер сызықтарын сұрыптау реті</type>
 			<type key="collation" type="traditional" draft="contributed">Дәстүрлі сұрыптау реті</type>
 			<type key="collation" type="unihan" draft="contributed">Иероглифтер сызықтарын түбегейлі сұрыптау реті</type>
 			<type key="collation" type="zhuyin" draft="contributed">Чжуинь сұрыптау реті</type>
+			<type key="em" type="default" scope="core">Әдепкі</type>
+			<type key="em" type="emoji" scope="core">Эмоджи</type>
+			<type key="em" type="text" scope="core">Мәтін</type>
 			<type key="hc" type="h11">12 сағаттық жүйе (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 сағаттық жүйе (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 сағаттық жүйе (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 сағаттық жүйе (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Жолды тасымалдаудың еркін стилі</type>
+			<type key="lb" type="loose" scope="core">Еркін</type>
 			<type key="lb" type="normal">Жолды тасымалдаудың қалыпты стилі</type>
+			<type key="lb" type="normal" scope="core">Қалыпты</type>
 			<type key="lb" type="strict">Жолды тасымалдаудың қатаң стилі</type>
+			<type key="lb" type="strict" scope="core">Қатаң</type>
+			<type key="lw" type="breakall" scope="core">Бәрін тасымалдау</type>
+			<type key="lw" type="keepall" scope="core">Бәрін қалдыру</type>
+			<type key="lw" type="normal" scope="core">Қалыпты</type>
+			<type key="lw" type="phrase" scope="core">Фразаларда қалдыру</type>
 			<type key="ms" type="metric">Метрлік жүйе</type>
+			<type key="ms" type="metric" scope="core">Метрлік</type>
 			<type key="ms" type="uksystem">Британиялық өлшемдер жүйесі</type>
+			<type key="ms" type="uksystem" scope="core">Британиялық</type>
 			<type key="ms" type="ussystem">Америкалық өлшемдер жүйесі</type>
+			<type key="ms" type="ussystem" scope="core">Америкалық</type>
 			<type key="numbers" type="ahom" draft="contributed">Ахом цифрлары</type>
 			<type key="numbers" type="arab">Үнді-араб сандары</type>
 			<type key="numbers" type="arabext">Үнді-араб сандарының кеңейтілген жүйесі</type>
@@ -1232,6 +1281,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Вай цифрлары</type>
 			<type key="numbers" type="wara" draft="contributed">Варанг сити цифрлары</type>
 			<type key="numbers" type="wcho" draft="contributed">Ванчо цифрлары</type>
+			<type key="ss" type="none" scope="core">Өшіру</type>
+			<type key="ss" type="standard" scope="core">Қосу</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Метрлік</measurementSystemName>
@@ -1290,36 +1341,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="12">Он екінші ай</month>
 						</monthWidth>
 					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">1-ай</month>
-							<month type="2">2-ай</month>
-							<month type="3">3-ай</month>
-							<month type="4">4-ай</month>
-							<month type="5">5-ай</month>
-							<month type="6">6-ай</month>
-							<month type="7">7-ай</month>
-							<month type="8">8-ай</month>
-							<month type="9">9-ай</month>
-							<month type="10">10-ай</month>
-							<month type="11">11-ай</month>
-							<month type="12">12-ай</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Бірінші ай</month>
-							<month type="2">Екінші ай</month>
-							<month type="3">Үшінші ай</month>
-							<month type="4">Төртінші ай</month>
-							<month type="5">Бесінші ай</month>
-							<month type="6">Алтыншы ай</month>
-							<month type="7">Жетінші ай</month>
-							<month type="8">Сегізінші ай</month>
-							<month type="9">Тоғызыншы ай</month>
-							<month type="10">Оныншы ай</month>
-							<month type="11">Он бірінші ай</month>
-							<month type="12">Он екінші ай</month>
-						</monthWidth>
-					</monthContext>
 				</months>
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1414,18 +1435,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">G y 'ж'.</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y 'ж'. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y 'ж'. d MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y 'ж'. d MMM, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h', v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1464,9 +1489,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">G y 'ж'. d MMM, E – d MMM, E</greatestDifference>
 							<greatestDifference id="y">G y 'ж'. d MMM, E – y 'ж'. d MMM, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
@@ -1475,9 +1497,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -1770,20 +1789,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E, B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E, B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">G y 'ж'.</dateFormatItem>
+						<dateFormatItem id="GyM">MM-GGGGG y</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-GGGGG y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, MM-dd-G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y 'ж'. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y 'ж'. d MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y 'ж'. d MMM, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM, E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1806,11 +1829,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<intervalFormats>
 						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="h">h – h B</greatestDifference>
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h – h</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm – h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm – h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
 							<greatestDifference id="d">G y 'ж'. d–d MMM</greatestDifference>
@@ -1826,7 +1851,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1840,7 +1864,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1988,32 +2011,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">Зұлқ.</month>
 							<month type="12">Зұлх.</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Мұхаррам</month>
-							<month type="2">Сафар</month>
-							<month type="3">Рабиғул әууәл</month>
-							<month type="4">Рабиғул ахир</month>
-							<month type="5">Жұмадәл аууәл</month>
-							<month type="6">Жұмадәл ахир</month>
-							<month type="7">Ережеп</month>
-							<month type="8">Шағбан</month>
-							<month type="9">Рамазан</month>
-							<month type="10">Шәууал</month>
-							<month type="11">Зұлқағда</month>
-							<month type="12">Зұлхижжа</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
-					<eraNames>
-						<era type="0">ХЖ</era>
-					</eraNames>
 					<eraAbbr>
 						<era type="0">ХЖ</era>
 					</eraAbbr>
-					<eraNarrow>
-						<era type="0">ХЖ</era>
-					</eraNarrow>
 				</eras>
 			</calendar>
 			<calendar type="persian">
@@ -2877,6 +2880,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Пасха аралы</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Койайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Аренас</exemplarCity>
 			</zone>
@@ -3142,9 +3148,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3814,9 +3817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Батыс Африка уақыты</generic>
-					<standard>Батыс Африка стандартты уақыты</standard>
-					<daylight>Батыс Африка жазғы уақыты</daylight>
+					<standard>Батыс Африка уақыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4171,6 +4172,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гайана уақыты</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавай және Алеут аралдары стандартты уақыты</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавай және Алеут аралдары уақыты</generic>
@@ -4735,13 +4741,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4750,8 +4769,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000" count="other">0 мың ¤</pattern>
 					<pattern type="10000" count="one">00 мың ¤</pattern>
 					<pattern type="10000" count="other">00 мың ¤</pattern>
-					<pattern type="100000" count="one">000 мың ¤</pattern>
-					<pattern type="100000" count="other">000 мың ¤</pattern>
+					<pattern type="100000" count="one">000 м'.' ¤</pattern>
+					<pattern type="100000" count="other">000 м'.' ¤</pattern>
 					<pattern type="1000000" count="one">0 млн ¤</pattern>
 					<pattern type="1000000" count="other">0 млн ¤</pattern>
 					<pattern type="10000000" count="one">00 млн ¤</pattern>
@@ -5265,6 +5284,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Шығыс Кариб доллары</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Кариб гульдені</displayName>
+				<displayName count="one">Кариб гульдені</displayName>
+				<displayName count="other">Кариб гульдені</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Батыс Африканың КФА франкі</displayName>
 			</currency>
@@ -5285,6 +5309,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>Замбия квачасы</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабве алтыны</displayName>
+				<displayName count="one">Зимбабве алтыны</displayName>
+				<displayName count="other">Зимбабве алтыны</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5486,10 +5515,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} миллимоль/литр</unitPattern>
 				<unitPattern count="other">{0} миллимоль/литр</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>миллиондық үлес</displayName>
-				<unitPattern count="one">{0} миллиондық үлес</unitPattern>
-				<unitPattern count="other">{0} миллиондық үлес</unitPattern>
+			<unit type="concentr-part">
+				<displayName>бөлік</displayName>
+				<unitPattern count="one">{0} бөлік</unitPattern>
+				<unitPattern count="other">{0} бөлік</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>миллиондағы бөлік</displayName>
+				<unitPattern count="one">{0} б/млн</unitPattern>
+				<unitPattern count="other">{0} б/млн</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} пайыз</unitPattern>
@@ -5503,6 +5537,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} промириад</unitPattern>
 				<unitPattern count="other">{0} промириад</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="one">{0} глюкоза</unitPattern>
+				<unitPattern count="other">{0} глюкоза</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/километр</displayName>
 				<unitPattern count="one">{0} литр/километр</unitPattern>
@@ -5908,6 +5947,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} миллиметр сынап бағанасы</unitPattern>
 				<unitPattern count="other">{0} миллиметр сынап бағанасы</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>сынап бағанасы</displayName>
+				<unitPattern count="one">{0} сынап бағанасы</unitPattern>
+				<unitPattern count="other">{0} с. б.</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунт-күш/шаршы дюйм</displayName>
 				<unitPattern count="one">{0} фунт-күш/шаршы дюйм</unitPattern>
@@ -6072,6 +6116,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} метрлік кесе</unitPattern>
 				<unitPattern count="other">{0} метрлік кесе</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрлік сұйық унция</displayName>
+				<unitPattern count="one">{0} метрлік сұйық унция</unitPattern>
+				<unitPattern count="other">{0} метрлік сұйық унция</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} бушель</unitPattern>
 				<unitPattern count="other">{0} бушель</unitPattern>
@@ -6132,21 +6181,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} британдық кварта</unitPattern>
 				<unitPattern count="other">{0} брит. кварта</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>жарық</displayName>
-				<unitPattern count="one">{0} жарық</unitPattern>
-				<unitPattern count="other">{0} жарық</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>стерадиан</displayName>
+				<unitPattern count="one">{0} стерадиан</unitPattern>
+				<unitPattern count="other">{0} стерадиан</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>катал</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="other">{0} катал</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулон</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="other">{0} кулон</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарад</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="other">{0} фарад</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генри</displayName>
+				<unitPattern count="one">{0} генри</unitPattern>
+				<unitPattern count="other">{0} генри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сименс</displayName>
+				<unitPattern count="one">{0} сименс</unitPattern>
+				<unitPattern count="other">{0} сименс</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калория [халықаралық]</displayName>
+				<unitPattern count="one">{0} калория [халықаралық]</unitPattern>
+				<unitPattern count="other">{0} калория [халықаралық]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>беккерель</displayName>
+				<unitPattern count="one">{0} беккерель</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зиверт</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограмм-күш</displayName>
+				<unitPattern count="one">{0} кг-күш</unitPattern>
+				<unitPattern count="other">{0} кг-күш</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесла</displayName>
+				<unitPattern count="one">{0} тесла</unitPattern>
+				<unitPattern count="other">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебер</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="other">{0} вебер</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>миллиардтағы бөлік</displayName>
-				<unitPattern count="one">{0} б/млрд</unitPattern>
-				<unitPattern count="other">{0} б/млрд</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>түн</displayName>
-				<unitPattern count="one">{0} түн</unitPattern>
-				<unitPattern count="other">{0} түн</unitPattern>
-				<perUnitPattern>{0}/түн</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>негізгі бағыт</displayName>
@@ -6361,6 +6462,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} элемент</unitPattern>
 				<unitPattern count="other">{0} элемент</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>бөлік</displayName>
+				<unitPattern count="one">{0} бөлік</unitPattern>
+				<unitPattern count="other">{0} бөлік</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>бөлік/миллион</displayName>
+				<unitPattern count="one">{0} б/млн</unitPattern>
+				<unitPattern count="other">{0} б/млн</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>пайыз</displayName>
 			</unit>
@@ -6375,6 +6486,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} моль</unitPattern>
 				<unitPattern count="other">{0} моль</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="one">{0} Глк</unitPattern>
+				<unitPattern count="other">{0} Глк</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -6880,6 +6996,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} мм с.б.</unitPattern>
 				<unitPattern count="other">{0} мм с.б.</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>с. б.</displayName>
+				<unitPattern count="one">{0} с. б.</unitPattern>
+				<unitPattern count="other">{0} с. б.</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>дюйм сынап бағанасы</displayName>
 				<unitPattern count="one">{0} дюйм с.б.</unitPattern>
@@ -7038,6 +7159,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} мк</unitPattern>
 				<unitPattern count="other">{0} мк</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрлік сұйық унция</displayName>
+				<unitPattern count="one">{0} метрлік сұйық унция</unitPattern>
+				<unitPattern count="other">{0} метрлік сұйық унция</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акр-фут</displayName>
 				<unitPattern count="one">{0} aкр-фут</unitPattern>
@@ -7135,12 +7261,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} брит. кварта</unitPattern>
 				<unitPattern count="other">{0} брит. кварта</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Г</displayName>
+				<unitPattern count="one">{0} Г</unitPattern>
+				<unitPattern count="other">{0} Г</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>Си</displayName>
+				<unitPattern count="one">{0} Си</unitPattern>
+				<unitPattern count="other">{0} Си</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>халықаралық калория</displayName>
+				<unitPattern count="one">{0} халықаралық калория</unitPattern>
+				<unitPattern count="other">{0} халықаралық калория</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кг-күш</displayName>
+				<unitPattern count="one">{0} кг-күш</unitPattern>
+				<unitPattern count="other">{0} кг-күш</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Т</unitPattern>
+				<unitPattern count="other">{0} Т</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>жарық</displayName>
 				<unitPattern count="one">{0} жарық</unitPattern>
 				<unitPattern count="other">{0} жарық</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>бөлік/миллиард</displayName>
 				<unitPattern count="one">{0} б/млрд</unitPattern>
 				<unitPattern count="other">{0} б/млрд</unitPattern>
@@ -7187,12 +7378,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-foot">
 				<displayName>фут²</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>бөлік</displayName>
+				<unitPattern count="one">{0} бөлік</unitPattern>
+				<unitPattern count="other">{0} бөлік</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>б/млн</displayName>
+				<unitPattern count="one">{0} б/млн</unitPattern>
+				<unitPattern count="other">{0} б/млн</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>‰</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="one">{0} Глк</unitPattern>
+				<unitPattern count="other">{0} Глк</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
 			</unit>
@@ -7264,6 +7470,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} унция</unitPattern>
 				<unitPattern count="other">{0} унция</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>с. б.</displayName>
+				<unitPattern count="one">{0} с. б.</unitPattern>
+				<unitPattern count="other">{0} с. б.</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>дюйм с.б.</displayName>
 			</unit>
@@ -7288,26 +7499,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрлік сұйық унция</displayName>
+				<unitPattern count="one">{0} метрлік сұйық унция</unitPattern>
+				<unitPattern count="other">{0} метрлік сұйық унция</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>имп. сұй. унц.</displayName>
 				<unitPattern count="one">{0} имп. сұй. унц.</unitPattern>
 				<unitPattern count="other">{0} имп. сұй. унц.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>жарық</displayName>
-				<unitPattern count="one">{0} жарық</unitPattern>
-				<unitPattern count="other">{0} жарық</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Г</displayName>
+				<unitPattern count="one">{0} Г</unitPattern>
+				<unitPattern count="other">{0} Г</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>Си</displayName>
+				<unitPattern count="one">{0} Си</unitPattern>
+				<unitPattern count="other">{0} Си</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>халықаралық калория</displayName>
+				<unitPattern count="one">{0} халықаралық калория</unitPattern>
+				<unitPattern count="other">{0} халықаралық калория</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кг-күш</displayName>
+				<unitPattern count="one">{0} кг-күш</unitPattern>
+				<unitPattern count="other">{0} кг-күш</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Т</unitPattern>
+				<unitPattern count="other">{0} Т</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>б/млрд</displayName>
-				<unitPattern count="one">{0} б/млрд</unitPattern>
-				<unitPattern count="other">{0} б/млрд</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>түн</displayName>
 				<unitPattern count="one">{0}түн</unitPattern>
 				<unitPattern count="other">{0}түн</unitPattern>
-				<perUnitPattern>{0}/түн</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/kk_Arab.xml b/make/data/cldr/common/main/kk_Arab.xml
index 198e8443f83..c56abe2de99 100644
--- a/make/data/cldr/common/main/kk_Arab.xml
+++ b/make/data/cldr/common/main/kk_Arab.xml
@@ -13,1134 +13,1187 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<localeDisplayPattern>
-			<localeSeparator draft="unconfirmed">{0}، {1}</localeSeparator>
+			<localeSeparator>{0}، {1}</localeSeparator>
 		</localeDisplayPattern>
 		<languages>
-			<language type="aa" draft="unconfirmed">افار ءتىلى</language>
-			<language type="ab" draft="unconfirmed">ابحاز ءتىلى</language>
-			<language type="af" draft="unconfirmed">افريكاانس ءتىلى</language>
-			<language type="agq" draft="unconfirmed">اگەم ءتىلى</language>
-			<language type="ak" draft="unconfirmed">اكان ءتىلى</language>
-			<language type="am" draft="unconfirmed">امحار ءتىلى</language>
-			<language type="an" draft="unconfirmed">اراگون ءتىلى</language>
-			<language type="ann" draft="unconfirmed">وبولو ءتىلى</language>
-			<language type="apc" draft="unconfirmed">شامي ءتىلى</language>
-			<language type="ar" draft="unconfirmed">اراب ءتىلى</language>
-			<language type="ar_001" draft="unconfirmed">قازىرگى ستاندارتتى اراب ءتىلى</language>
-			<language type="arn" draft="unconfirmed">ماپۋچە ءتىلى</language>
-			<language type="as" draft="unconfirmed">اسسام ءتىلى</language>
-			<language type="asa" draft="unconfirmed">اسۋ ءتىلى</language>
-			<language type="ast" draft="unconfirmed">استرۋيا ءتىلى</language>
-			<language type="az" draft="unconfirmed">ءازىربايجان ءتىلى</language>
-			<language type="ba" draft="unconfirmed">باشقۇرت ءتىلى</language>
-			<language type="bal" draft="unconfirmed">بالۋچي ءتىلى</language>
-			<language type="bas" draft="unconfirmed">باسا ءتىلى</language>
-			<language type="be" draft="unconfirmed">بەلارۋس ءتىلى</language>
-			<language type="bem" draft="unconfirmed">بەمبا ءتىلى</language>
-			<language type="bew" draft="unconfirmed">بەياۋي ءتىلى</language>
-			<language type="bez" draft="unconfirmed">بەنا ءتىلى</language>
-			<language type="bg" draft="unconfirmed">بولگار ءتىلى</language>
-			<language type="bgc" draft="unconfirmed">حارياني ءتىلى</language>
-			<language type="bgn" draft="unconfirmed">باتىس بالۋچي ءتىلى</language>
-			<language type="bho" draft="unconfirmed">بحودجپۋري ءتىلى</language>
-			<language type="blo" draft="unconfirmed">اني ءتىلى</language>
-			<language type="blt" draft="unconfirmed">تاي دام ءتىلى</language>
-			<language type="bm" draft="unconfirmed">بامبارا ءتىلى</language>
-			<language type="bn" draft="unconfirmed">بەنگال ءتىلى</language>
-			<language type="bo" draft="unconfirmed">تيبەت ءتىلى</language>
-			<language type="br" draft="unconfirmed">برەتون ءتىلى</language>
-			<language type="brx" draft="unconfirmed">بودو ءتىلى</language>
-			<language type="bs" draft="unconfirmed">بوسنيا ءتىلى</language>
-			<language type="bss" draft="unconfirmed">اكوسە ءتىلى</language>
-			<language type="byn" draft="unconfirmed">بلين ءتىلى</language>
-			<language type="ca" draft="unconfirmed">كاتالان ءتىلى</language>
-			<language type="cad" draft="unconfirmed">كاددو ءتىلى</language>
-			<language type="cch" draft="unconfirmed">اتسام ءتىلى</language>
-			<language type="ccp" draft="unconfirmed">چاكما ءتىلى</language>
-			<language type="ce" draft="unconfirmed">شەشەن ءتىلى</language>
-			<language type="ceb" draft="unconfirmed">سەبۋانو ءتىلى</language>
-			<language type="cgg" draft="unconfirmed">كيگا ءتىلى</language>
-			<language type="cho" draft="unconfirmed">چوكتو ءتىلى</language>
-			<language type="chr" draft="unconfirmed">چەروكي ءتىلى</language>
-			<language type="cic" draft="unconfirmed">چيكاساۋ ءتىلى</language>
-			<language type="ckb" draft="unconfirmed">سوراني ءتىلى</language>
-			<language type="co" draft="unconfirmed">كورسيكا ءتىلى</language>
-			<language type="cs" draft="unconfirmed">چەح ءتىلى</language>
-			<language type="csw" draft="unconfirmed">باتپاقتى جەردىڭ كري ءتىلى</language>
-			<language type="cu" draft="unconfirmed">شىركەۋلىك سلاۆيان ءتىلى</language>
-			<language type="cv" draft="unconfirmed">چۋۆاش ءتىلى</language>
-			<language type="cy" draft="unconfirmed">ۆاللي ءتىلى</language>
-			<language type="da" draft="unconfirmed">دات ءتىلى</language>
-			<language type="dav" draft="unconfirmed">تايتا ءتىلى</language>
-			<language type="de" draft="unconfirmed">نەمىس ءتىلى</language>
-			<language type="de_AT" draft="unconfirmed">نەمىس ءتىلى (اۋستريا)</language>
-			<language type="de_CH" draft="unconfirmed">نەمىس ءتىلى (شۆەيساريا)</language>
-			<language type="dje" draft="unconfirmed">زارما ءتىلى</language>
-			<language type="doi" draft="unconfirmed">دوگري ءتىلى</language>
-			<language type="dsb" draft="unconfirmed">تومەنگى سوربيان ءتىلى</language>
-			<language type="dua" draft="unconfirmed">دۋالا ءتىلى</language>
-			<language type="dv" draft="unconfirmed">ديۆەحي ءتىلى</language>
-			<language type="dyo" draft="unconfirmed">ديولا ءتىلى</language>
-			<language type="dz" draft="unconfirmed">جوڭكا ءتىلى</language>
-			<language type="ebu" draft="unconfirmed">ەمبۋ ءتىلى</language>
-			<language type="ee" draft="unconfirmed">ەۆە ءتىلى</language>
-			<language type="el" draft="unconfirmed">گرەك ءتىلى</language>
-			<language type="en" draft="unconfirmed">اعىلشىن ءتىلى</language>
-			<language type="en_AU" draft="unconfirmed">اعىلشىن ءتىلى (اۋستراليا)</language>
-			<language type="en_CA" draft="unconfirmed">اعىلشىن ءتىلى (كانادا)</language>
-			<language type="en_GB" draft="unconfirmed">اعىلشىن ءتىلى (ۇلىبريتانيا)</language>
-			<language type="en_US" draft="unconfirmed">اعىلشىن ءتىلى (امەريكا قۇراما شتاتتارى)</language>
-			<language type="en_US" alt="short" draft="unconfirmed">اعىلشىن ءتىلى (امەريكا)</language>
-			<language type="eo" draft="unconfirmed">ەسپەرانتو ءتىلى</language>
-			<language type="es" draft="unconfirmed">يسپان ءتىلى</language>
-			<language type="es_419" draft="unconfirmed">يسپان ءتىلى (لاتىن امەريكا)</language>
-			<language type="es_ES" draft="unconfirmed">يسپان ءتىلى (يسپانيا)</language>
-			<language type="es_MX" draft="unconfirmed">يسپان ءتىلى (مەكسيكا)</language>
-			<language type="et" draft="unconfirmed">ەستون ءتىلى</language>
-			<language type="eu" draft="unconfirmed">باسك ءتىلى</language>
-			<language type="ewo" draft="unconfirmed">ەۆوندو ءتىلى</language>
-			<language type="fa" draft="unconfirmed">پارسى ءتىلى</language>
-			<language type="fa_AF" draft="unconfirmed">داري ءتىلى</language>
-			<language type="ff" draft="unconfirmed">فۋلا ءتىلى</language>
-			<language type="fi" draft="unconfirmed">فين ءتىلى</language>
-			<language type="fil" draft="unconfirmed">فيليپين ءتىلى</language>
-			<language type="fo" draft="unconfirmed">فارەر ءتىلى</language>
-			<language type="fr" draft="unconfirmed">فرانسۋز ءتىلى</language>
-			<language type="fr_CA" draft="unconfirmed">فرانسۋز ءتىلى (كانادا)</language>
-			<language type="fr_CH" draft="unconfirmed">فرانسۋز ءتىلى (شۆەيساريا)</language>
-			<language type="frc" draft="unconfirmed">كاجۋن ءتىلى</language>
-			<language type="frr" draft="unconfirmed">سولتۇستىك-شىعىس كري ءتىلى</language>
-			<language type="fur" draft="unconfirmed">فريۋل ءتىلى</language>
-			<language type="fy" draft="unconfirmed">باتىس فريز ءتىلى</language>
-			<language type="ga" draft="unconfirmed">يرلاند ءتىلى</language>
-			<language type="gaa" draft="unconfirmed">گا ءتىلى</language>
-			<language type="gd" draft="unconfirmed">شوتلانديالىق گەل ءتىلى</language>
-			<language type="gez" draft="unconfirmed">گەەز ءتىلى</language>
-			<language type="gl" draft="unconfirmed">گاليسيا ءتىلى</language>
-			<language type="gn" draft="unconfirmed">گۋاريني ءتىلى</language>
-			<language type="gsw" draft="unconfirmed">شۆەيساريالىق نەمىس ءتىلى</language>
-			<language type="gu" draft="unconfirmed">گۋجاراتي ءتىلى</language>
-			<language type="guz" draft="unconfirmed">گۋسي ءتىلى</language>
-			<language type="gv" draft="unconfirmed">مەن ءتىلى</language>
-			<language type="ha" draft="unconfirmed">حاۋسا ءتىلى</language>
-			<language type="haw" draft="unconfirmed">حاۋاي ءتىلى</language>
-			<language type="he" draft="unconfirmed">يۆريت ءتىلى</language>
-			<language type="hi" draft="unconfirmed">حيندي ءتىلى</language>
-			<language type="hi_Latn" draft="unconfirmed">حيندي ءتىلى (لاتىن جازۋى)</language>
-			<language type="hi_Latn" alt="variant" draft="unconfirmed">حينگليش</language>
-			<language type="hnj" draft="unconfirmed">حموڭ نيۋا ءتىلى</language>
-			<language type="hr" draft="unconfirmed">حورۆات ءتىلى</language>
-			<language type="hsb" draft="unconfirmed">جوعارعى سوربيان ءتىلى</language>
-			<language type="hu" draft="unconfirmed">ماجار ءتىلى</language>
-			<language type="hy" draft="unconfirmed">ارميان ءتىلى</language>
-			<language type="ia" draft="unconfirmed">ينتەرلينگۆا ءتىلى</language>
-			<language type="id" draft="unconfirmed">يندونەزيا ءتىلى</language>
-			<language type="ie" draft="unconfirmed">ينتەرلينگۆە ءتىلى</language>
-			<language type="ig" draft="unconfirmed">يگبو ءتىلى</language>
-			<language type="ii" draft="unconfirmed">سىچۋان ي ءتىلى</language>
-			<language type="io" draft="unconfirmed">يدو ءتىلى</language>
-			<language type="is" draft="unconfirmed">يسلاند ءتىلى</language>
-			<language type="it" draft="unconfirmed">يتاليان ءتىلى</language>
-			<language type="iu" draft="unconfirmed">ينۋكتيتۋت ءتىلى</language>
-			<language type="ja" draft="unconfirmed">جاپون ءتىلى</language>
-			<language type="jbo" draft="unconfirmed">لاجبان ءتىلى</language>
-			<language type="jgo" draft="unconfirmed">نگومبا ءتىلى</language>
-			<language type="jmc" draft="unconfirmed">ماچامە ءتىلى</language>
-			<language type="jv" draft="unconfirmed">ياۆا ءتىلى</language>
-			<language type="ka" draft="unconfirmed">گرۋزين ءتىلى</language>
-			<language type="kaa" draft="unconfirmed">قاراقالپاق ءتىلى</language>
-			<language type="kab" draft="unconfirmed">كابيل ءتىلى</language>
-			<language type="kaj" draft="unconfirmed">كاجي ءتىلى</language>
-			<language type="kam" draft="unconfirmed">كامبا ءتىلى</language>
-			<language type="kcg" draft="unconfirmed">تياپ ءتىلى</language>
-			<language type="kde" draft="unconfirmed">ماكوندە ءتىلى</language>
-			<language type="kea" draft="unconfirmed">كابۋۆەرديانۋ ءتىلى</language>
-			<language type="ken" draft="unconfirmed">كەنياڭ ءتىلى</language>
-			<language type="kgp" draft="unconfirmed">كاينگاڭ ءتىلى</language>
-			<language type="khq" draft="unconfirmed">كويرا چيني ءتىلى</language>
-			<language type="ki" draft="unconfirmed">كيكۋيۋ ءتىلى</language>
-			<language type="kk" draft="unconfirmed">قازاق ءتىلى</language>
+			<language type="aa">افار ءتىلى</language>
+			<language type="ab">ابحاز ءتىلى</language>
+			<language type="af">افريكاانس ءتىلى</language>
+			<language type="agq">اگەم ءتىلى</language>
+			<language type="ak">اكان ءتىلى</language>
+			<language type="am">امحار ءتىلى</language>
+			<language type="an">اراگون ءتىلى</language>
+			<language type="ann">وبولو ءتىلى</language>
+			<language type="apc">شامي ءتىلى</language>
+			<language type="ar">اراب ءتىلى</language>
+			<language type="ar_001">قازىرگى ستاندارتتى اراب ءتىلى</language>
+			<language type="arn">ماپۋچە ءتىلى</language>
+			<language type="as">اسسام ءتىلى</language>
+			<language type="asa">اسۋ ءتىلى</language>
+			<language type="ast">استرۋيا ءتىلى</language>
+			<language type="az">ءازىربايجان ءتىلى</language>
+			<language type="ba">باشقۇرت ءتىلى</language>
+			<language type="bal">بالۋچي ءتىلى</language>
+			<language type="bas">باسا ءتىلى</language>
+			<language type="be">بەلارۋس ءتىلى</language>
+			<language type="bem">بەمبا ءتىلى</language>
+			<language type="bew">بەياۋي ءتىلى</language>
+			<language type="bez">بەنا ءتىلى</language>
+			<language type="bg">بولگار ءتىلى</language>
+			<language type="bgc">حارياني ءتىلى</language>
+			<language type="bgn">باتىس بالۋچي ءتىلى</language>
+			<language type="bho">بحودجپۋري ءتىلى</language>
+			<language type="blo">اني ءتىلى</language>
+			<language type="blt">تاي دام ءتىلى</language>
+			<language type="bm">بامبارا ءتىلى</language>
+			<language type="bn">بەنگال ءتىلى</language>
+			<language type="bo">تيبەت ءتىلى</language>
+			<language type="bqi">باحتيار ءتىلى</language>
+			<language type="br">برەتون ءتىلى</language>
+			<language type="brx">بودو ءتىلى</language>
+			<language type="bs">بوسنيا ءتىلى</language>
+			<language type="bss">اكوسە ءتىلى</language>
+			<language type="bua">بۋريات ءتىلى</language>
+			<language type="byn">بلين ءتىلى</language>
+			<language type="ca">كاتالان ءتىلى</language>
+			<language type="cad">كاددو ءتىلى</language>
+			<language type="cch">اتسام ءتىلى</language>
+			<language type="ccp">چاكما ءتىلى</language>
+			<language type="ce">شەشەن ءتىلى</language>
+			<language type="ceb">سەبۋانو ءتىلى</language>
+			<language type="cgg">كيگا ءتىلى</language>
+			<language type="cho">چوكتو ءتىلى</language>
+			<language type="chr">چەروكي ءتىلى</language>
+			<language type="cic">چيكاساۋ ءتىلى</language>
+			<language type="ckb">سوراني ءتىلى</language>
+			<language type="co">كورسيكا ءتىلى</language>
+			<language type="cop">كوپىت ءتىلى</language>
+			<language type="cs">چەح ءتىلى</language>
+			<language type="csw">باتپاقتى جەردىڭ كري ءتىلى</language>
+			<language type="cu">شىركەۋلىك سلاۆيان ءتىلى</language>
+			<language type="cv">چۋۆاش ءتىلى</language>
+			<language type="cy">ۆاللي ءتىلى</language>
+			<language type="da">دات ءتىلى</language>
+			<language type="dav">تايتا ءتىلى</language>
+			<language type="de">نەمىس ءتىلى</language>
+			<language type="dje">زارما ءتىلى</language>
+			<language type="doi">دوگري ءتىلى</language>
+			<language type="dsb">تومەنگى سوربيان ءتىلى</language>
+			<language type="dua">دۋالا ءتىلى</language>
+			<language type="dv">ديۆەحي ءتىلى</language>
+			<language type="dyo">ديولا ءتىلى</language>
+			<language type="dz">جوڭكا ءتىلى</language>
+			<language type="ebu">ەمبۋ ءتىلى</language>
+			<language type="ee">ەۆە ءتىلى</language>
+			<language type="el">گرەك ءتىلى</language>
+			<language type="en">اعىلشىن ءتىلى</language>
+			<language type="en_US" alt="short">اعىلشىن ءتىلى (امەريكا)</language>
+			<language type="eo">ەسپەرانتو ءتىلى</language>
+			<language type="es">يسپان ءتىلى</language>
+			<language type="et">ەستون ءتىلى</language>
+			<language type="eu">باسك ءتىلى</language>
+			<language type="ewo">ەۆوندو ءتىلى</language>
+			<language type="fa">پارسى ءتىلى</language>
+			<language type="fa_AF">داري ءتىلى</language>
+			<language type="ff">فۋلا ءتىلى</language>
+			<language type="fi">فين ءتىلى</language>
+			<language type="fil">فيليپين ءتىلى</language>
+			<language type="fo">فارەر ءتىلى</language>
+			<language type="fr">فرانسۋز ءتىلى</language>
+			<language type="frc">كاجۋن ءتىلى</language>
+			<language type="frr">سولتۇستىك-شىعىس كري ءتىلى</language>
+			<language type="fur">فريۋل ءتىلى</language>
+			<language type="fy">باتىس فريز ءتىلى</language>
+			<language type="ga">يرلاند ءتىلى</language>
+			<language type="gaa">گا ءتىلى</language>
+			<language type="gd">شوتلانديالىق گەل ءتىلى</language>
+			<language type="gez">گەەز ءتىلى</language>
+			<language type="gl">گاليسيا ءتىلى</language>
+			<language type="gn">گۋاريني ءتىلى</language>
+			<language type="gsw">شۆەيساريالىق نەمىس ءتىلى</language>
+			<language type="gu">گۋجاراتي ءتىلى</language>
+			<language type="guz">گۋسي ءتىلى</language>
+			<language type="gv">مەن ءتىلى</language>
+			<language type="ha">حاۋسا ءتىلى</language>
+			<language type="haw">حاۋاي ءتىلى</language>
+			<language type="he">يۆريت ءتىلى</language>
+			<language type="hi">حيندي ءتىلى</language>
+			<language type="hi_Latn" alt="variant">حينگليش</language>
+			<language type="hnj">حموڭ نيۋا ءتىلى</language>
+			<language type="hr">حورۆات ءتىلى</language>
+			<language type="hsb">جوعارعى سوربيان ءتىلى</language>
+			<language type="ht">گايتيان كىرەول ءتىلى</language>
+			<language type="hu">ماجار ءتىلى</language>
+			<language type="hy">ارميان ءتىلى</language>
+			<language type="ia">ينتەرلينگۆا ءتىلى</language>
+			<language type="id">يندونەزيا ءتىلى</language>
+			<language type="ie">ينتەرلينگۆە ءتىلى</language>
+			<language type="ig">يگبو ءتىلى</language>
+			<language type="ii">سىچۋان ي ءتىلى</language>
+			<language type="io">يدو ءتىلى</language>
+			<language type="is">يسلاند ءتىلى</language>
+			<language type="it">يتاليان ءتىلى</language>
+			<language type="iu">ينۋكتيتۋت ءتىلى</language>
+			<language type="ja">جاپون ءتىلى</language>
+			<language type="jbo">لاجبان ءتىلى</language>
+			<language type="jgo">نگومبا ءتىلى</language>
+			<language type="jmc">ماچامە ءتىلى</language>
+			<language type="jv">ياۆا ءتىلى</language>
+			<language type="ka">گرۋزين ءتىلى</language>
+			<language type="kaa">قاراقالپاق ءتىلى</language>
+			<language type="kab">كابيل ءتىلى</language>
+			<language type="kaj">كاجي ءتىلى</language>
+			<language type="kam">كامبا ءتىلى</language>
+			<language type="kcg">تياپ ءتىلى</language>
+			<language type="kde">ماكوندە ءتىلى</language>
+			<language type="kea">كابۋۆەرديانۋ ءتىلى</language>
+			<language type="kek">كەكچي ءتىلى</language>
+			<language type="ken">كەنياڭ ءتىلى</language>
+			<language type="kgp">كاينگاڭ ءتىلى</language>
+			<language type="khq">كويرا چيني ءتىلى</language>
+			<language type="ki">كيكۋيۋ ءتىلى</language>
+			<language type="kk">قازاق ءتىلى</language>
 			<language type="kk_Arab">قازاق ءتىلى (توتە)</language>
-			<language type="kkj" draft="unconfirmed">كاكو ءتىلى</language>
-			<language type="kl" draft="unconfirmed">كالاليسۋت ءتىلى</language>
-			<language type="kln" draft="unconfirmed">كالەنجين ءتىلى</language>
-			<language type="km" draft="unconfirmed">كحمەر ءتىلى</language>
-			<language type="kn" draft="unconfirmed">كاننادا ءتىلى</language>
-			<language type="ko" draft="unconfirmed">كورەي ءتىلى</language>
-			<language type="kok" draft="unconfirmed">كونكاني ءتىلى</language>
-			<language type="kpe" draft="unconfirmed">كپەلە ءتىلى</language>
-			<language type="ks" draft="unconfirmed">كاشمير ءتىلى</language>
-			<language type="ksb" draft="unconfirmed">شامبالا ءتىلى</language>
-			<language type="ksf" draft="unconfirmed">بافيا ءتىلى</language>
-			<language type="ksh" draft="unconfirmed">كولونيان ءتىلى</language>
-			<language type="ku" draft="unconfirmed">كۇرد ءتىلى</language>
-			<language type="kw" draft="unconfirmed">كورن ءتىلى</language>
-			<language type="kxv" draft="unconfirmed">كۋۆي ءتىلى</language>
-			<language type="ky" draft="unconfirmed">قىرعىز ءتىلى</language>
-			<language type="la" draft="unconfirmed">لاتىن ءتىلى</language>
-			<language type="lag" draft="unconfirmed">لانگي ءتىلى</language>
-			<language type="lb" draft="unconfirmed">ليۋكسەمبۋرگ ءتىلى</language>
-			<language type="lg" draft="unconfirmed">گاندا ءتىلى</language>
-			<language type="lij" draft="unconfirmed">ليگۋر ءتىلى</language>
-			<language type="lkt" draft="unconfirmed">لاكوتا ءتىلى</language>
-			<language type="lld" draft="unconfirmed">لادينو ءتىلى</language>
-			<language type="lmo" draft="unconfirmed">لومبارد ءتىلى</language>
-			<language type="ln" draft="unconfirmed">لينگالا ءتىلى</language>
-			<language type="lo" draft="unconfirmed">لاوس ءتىلى</language>
-			<language type="lou" draft="unconfirmed">كىرەول ءتىلى</language>
-			<language type="lrc" draft="unconfirmed">سولتۇستىك فريز ءتىلى</language>
-			<language type="lt" draft="unconfirmed">ليتۆا ءتىلى</language>
-			<language type="ltg" draft="unconfirmed">لاتگاليان ءتىلى</language>
-			<language type="lu" draft="unconfirmed">لۋبا-كاتاڭا ءتىلى</language>
-			<language type="luo" draft="unconfirmed">لۋو ءتىلى</language>
-			<language type="luy" draft="unconfirmed">لۋحيا ءتىلى</language>
-			<language type="lv" draft="unconfirmed">لاتىش ءتىلى</language>
-			<language type="mai" draft="unconfirmed">مايتحيلي ءتىلى</language>
-			<language type="mas" draft="unconfirmed">ماساي ءتىلى</language>
-			<language type="mdf" draft="unconfirmed">موكشا ءتىلى</language>
-			<language type="mer" draft="unconfirmed">مەرۋ ءتىلى</language>
-			<language type="mfe" draft="unconfirmed">موريسيەن ءتىلى</language>
-			<language type="mg" draft="unconfirmed">مالاگاسي ءتىلى</language>
-			<language type="mgh" draft="unconfirmed">ماكۋا-مەتتو ءتىلى</language>
-			<language type="mgo" draft="unconfirmed">مەتا ءتىلى</language>
-			<language type="mhn" draft="unconfirmed">موكەنو ءتىلى</language>
-			<language type="mi" draft="unconfirmed">ماوري ءتىلى</language>
-			<language type="mic" draft="unconfirmed">ميكماۋ ءتىلى</language>
-			<language type="mk" draft="unconfirmed">ماكەدون ءتىلى</language>
-			<language type="ml" draft="unconfirmed">مالايالام ءتىلى</language>
-			<language type="mn" draft="unconfirmed">موڭعول ءتىلى</language>
-			<language type="mni" draft="unconfirmed">مانيپۋري ءتىلى</language>
-			<language type="moh" draft="unconfirmed">موحاۋك ءتىلى</language>
-			<language type="mr" draft="unconfirmed">ماراتحي ءتىلى</language>
-			<language type="ms" draft="unconfirmed">مالاي ءتىلى</language>
-			<language type="mt" draft="unconfirmed">مالتا ءتىلى</language>
-			<language type="mua" draft="unconfirmed">مۋنداڭ ءتىلى</language>
-			<language type="mul" draft="unconfirmed">بىرنەشە ءتىلى</language>
-			<language type="mus" draft="unconfirmed">كريك ءتىلى</language>
-			<language type="my" draft="unconfirmed">بيرما ءتىلى</language>
-			<language type="myv" draft="unconfirmed">ەرزيا ءتىلى</language>
-			<language type="mzn" draft="unconfirmed">مازاندەران ءتىلى</language>
-			<language type="naq" draft="unconfirmed">ناما ءتىلى</language>
-			<language type="nb" draft="unconfirmed">نورۆەگيالىق بۋكمول ءتىلى</language>
-			<language type="nd" draft="unconfirmed">سولتۇستىك ندەبەلە ءتىلى</language>
-			<language type="nds" draft="unconfirmed">تومەنگى نەمىس ءتىلى</language>
-			<language type="nds_NL" draft="unconfirmed">تومەنگى ساكسون ءتىلى</language>
-			<language type="ne" draft="unconfirmed">نەپال ءتىلى</language>
-			<language type="nl" draft="unconfirmed">نيدەرلاند ءتىلى</language>
-			<language type="nl_BE" draft="unconfirmed">فلاماند ءتىلى</language>
-			<language type="nmg" draft="unconfirmed">كۋاسيو ءتىلى</language>
-			<language type="nn" draft="unconfirmed">نورۆەگيالىق نيۋنورسك ءتىلى</language>
-			<language type="nnh" draft="unconfirmed">نگيەمبۋن ءتىلى</language>
-			<language type="no" draft="unconfirmed">نورۆەگ ءتىلى</language>
-			<language type="nqo" draft="unconfirmed">نكو ءتىلى</language>
-			<language type="nr" draft="unconfirmed">وڭتۇستىك ندەبەلە ءتىلى</language>
-			<language type="nso" draft="unconfirmed">سولتۇستىك سوتو ءتىلى</language>
-			<language type="nus" draft="unconfirmed">نۋەر ءتىلى</language>
-			<language type="nv" draft="unconfirmed">ناۆاحو ءتىلى</language>
-			<language type="ny" draft="unconfirmed">نيانجا ءتىلى</language>
-			<language type="nyn" draft="unconfirmed">نيانكولە ءتىلى</language>
-			<language type="oc" draft="unconfirmed">وكسيتان ءتىلى</language>
-			<language type="om" draft="unconfirmed">ورومو ءتىلى</language>
-			<language type="or" draft="unconfirmed">وريا ءتىلى</language>
-			<language type="os" draft="unconfirmed">وسەتين ءتىلى</language>
-			<language type="osa" draft="unconfirmed">وسەيج ءتىلى</language>
-			<language type="pa" draft="unconfirmed">پەنجاب ءتىلى</language>
-			<language type="pap" draft="unconfirmed">پاپيامەنتو ءتىلى</language>
-			<language type="pcm" draft="unconfirmed">نيگەريالىق پيدجين ءتىلى</language>
-			<language type="pis" draft="unconfirmed">پيجين ءتىلى</language>
-			<language type="pl" draft="unconfirmed">پولياك ءتىلى</language>
-			<language type="prg" draft="unconfirmed">پرۋسسيا ءتىلى</language>
-			<language type="ps" draft="unconfirmed">پۋشتۋ ءتىلى</language>
-			<language type="pt" draft="unconfirmed">پورتۋگال ءتىلى</language>
-			<language type="pt_BR" draft="unconfirmed">برازيليالىق پورتۋگال ءتىلى</language>
-			<language type="pt_PT" draft="unconfirmed">ەۋروپالىق پورتۋگال ءتىلى</language>
-			<language type="qu" draft="unconfirmed">كەچۋا ءتىلى</language>
-			<language type="quc" draft="unconfirmed">كيچە ءتىلى</language>
-			<language type="raj" draft="unconfirmed">راجاستاني ءتىلى</language>
-			<language type="rhg" draft="unconfirmed">روحينجا ءتىلى</language>
-			<language type="rif" draft="unconfirmed">ريفيان ءتىلى</language>
-			<language type="rm" draft="unconfirmed">رومانش ءتىلى</language>
-			<language type="rn" draft="unconfirmed">رۋندي ءتىلى</language>
-			<language type="ro" draft="unconfirmed">رۋمىن ءتىلى</language>
-			<language type="ro_MD" draft="unconfirmed">مولدوۆان ءتىلى</language>
-			<language type="rof" draft="unconfirmed">رومبو ءتىلى</language>
-			<language type="ru" draft="unconfirmed">ورىس ءتىلى</language>
-			<language type="rw" draft="unconfirmed">كينيارۋاندا ءتىلى</language>
-			<language type="rwk" draft="unconfirmed">رۋا ءتىلى</language>
-			<language type="sa" draft="unconfirmed">سانسكريت ءتىلى</language>
-			<language type="sah" draft="unconfirmed">ساحا ءتىلى</language>
-			<language type="saq" draft="unconfirmed">سامبۋرۋ ءتىلى</language>
-			<language type="sat" draft="unconfirmed">سانتالي ءتىلى</language>
-			<language type="sbp" draft="unconfirmed">ساڭۋ ءتىلى</language>
-			<language type="sc" draft="unconfirmed">ساردين ءتىلى</language>
-			<language type="scn" draft="unconfirmed">سيسيليا ءتىلى</language>
-			<language type="sd" draft="unconfirmed">سيندحي ءتىلى</language>
-			<language type="sdh" draft="unconfirmed">وڭتۇستىك كۇرد ءتىلى</language>
-			<language type="se" draft="unconfirmed">سولتۇستىك سامي ءتىلى</language>
-			<language type="seh" draft="unconfirmed">سەنا ءتىلى</language>
-			<language type="ses" draft="unconfirmed">كويرابورو سەنني ءتىلى</language>
-			<language type="sg" draft="unconfirmed">ساڭو ءتىلى</language>
-			<language type="shi" draft="unconfirmed">تاشەلحيت ءتىلى</language>
-			<language type="shn" draft="unconfirmed">شان ءتىلى</language>
-			<language type="si" draft="unconfirmed">سينگال ءتىلى</language>
-			<language type="sid" draft="unconfirmed">سيدامو ءتىلى</language>
-			<language type="sk" draft="unconfirmed">سلوۆاك ءتىلى</language>
-			<language type="skr" draft="unconfirmed">سارايكي ءتىلى</language>
-			<language type="sl" draft="unconfirmed">سلوۆەن ءتىلى</language>
-			<language type="sma" draft="unconfirmed">وڭتۇستىك سامي ءتىلى</language>
-			<language type="smj" draft="unconfirmed">لۋلە-سامي ءتىلى</language>
-			<language type="smn" draft="unconfirmed">يناري سامي ءتىلى</language>
-			<language type="sms" draft="unconfirmed">كولتا سامي ءتىلى</language>
-			<language type="sn" draft="unconfirmed">شونا ءتىلى</language>
-			<language type="so" draft="unconfirmed">سومالي ءتىلى</language>
-			<language type="sq" draft="unconfirmed">البان ءتىلى</language>
-			<language type="sr" draft="unconfirmed">سەرب ءتىلى</language>
-			<language type="ss" draft="unconfirmed">سۋاتي ءتىلى</language>
-			<language type="ssy" draft="unconfirmed">ساحو ءتىلى</language>
-			<language type="st" draft="unconfirmed">وڭتۇستىك سوتو ءتىلى</language>
-			<language type="su" draft="unconfirmed">سۋدان ءتىلى</language>
-			<language type="sv" draft="unconfirmed">شۆەد ءتىلى</language>
-			<language type="sw" draft="unconfirmed">سۋاحيلي ءتىلى</language>
-			<language type="sw_CD" draft="unconfirmed">كونگو سۋاحيلي ءتىلى</language>
-			<language type="syr" draft="unconfirmed">سيريا ءتىلى</language>
-			<language type="szl" draft="unconfirmed">سيلەز ءتىلى</language>
-			<language type="ta" draft="unconfirmed">تاميل ءتىلى</language>
-			<language type="te" draft="unconfirmed">تەلۋگۋ ءتىلى</language>
-			<language type="teo" draft="unconfirmed">تەسو ءتىلى</language>
-			<language type="tg" draft="unconfirmed">تاجىك ءتىلى</language>
-			<language type="th" draft="unconfirmed">تاي ءتىلى</language>
-			<language type="ti" draft="unconfirmed">تيگرينيا ءتىلى</language>
-			<language type="tig" draft="unconfirmed">تيگرە ءتىلى</language>
-			<language type="tk" draft="unconfirmed">تۇرىكمەن ءتىلى</language>
-			<language type="tn" draft="unconfirmed">سۋانا ءتىلى</language>
-			<language type="to" draft="unconfirmed">تونگان ءتىلى</language>
-			<language type="tok" draft="unconfirmed">توكي-پونا ءتىلى</language>
-			<language type="tpi" draft="unconfirmed">توك-پيسين ءتىلى</language>
-			<language type="tr" draft="unconfirmed">تۇرىك ءتىلى</language>
-			<language type="trv" draft="unconfirmed">تاروكو ءتىلى</language>
-			<language type="trw" draft="unconfirmed">توۋالي ءتىلى</language>
-			<language type="ts" draft="unconfirmed">سونگا ءتىلى</language>
-			<language type="tt" draft="unconfirmed">تاتار ءتىلى</language>
-			<language type="twq" draft="unconfirmed">تاساۋاك ءتىلى</language>
-			<language type="tyv" draft="unconfirmed">تۋۆين ءتىلى</language>
-			<language type="tzm" draft="unconfirmed">ورتالىق اتلاس تامازيگحت ءتىلى</language>
-			<language type="ug" draft="unconfirmed">ۇيعىر ءتىلى</language>
-			<language type="uk" draft="unconfirmed">ۋكراين ءتىلى</language>
-			<language type="und" draft="unconfirmed">بەلگىسىز ءتىل</language>
-			<language type="ur" draft="unconfirmed">ۋردۋ ءتىلى</language>
-			<language type="uz" draft="unconfirmed">وزبەك ءتىلى</language>
-			<language type="vai" draft="unconfirmed">ۆاي ءتىلى</language>
-			<language type="ve" draft="unconfirmed">ۆەندا ءتىلى</language>
-			<language type="vec" draft="unconfirmed">ۆەنەسيا ءتىلى</language>
-			<language type="vi" draft="unconfirmed">ۆيەتنام ءتىلى</language>
-			<language type="vmw" draft="unconfirmed">ماكۋا ءتىلى</language>
-			<language type="vo" draft="unconfirmed">ۆولاپيۋك ءتىلى</language>
-			<language type="vun" draft="unconfirmed">ۆۋنجو ءتىلى</language>
-			<language type="wa" draft="unconfirmed">ۋالون ءتىلى</language>
-			<language type="wae" draft="unconfirmed">ۋالسەر ءتىلى</language>
-			<language type="wal" draft="unconfirmed">ۋولايتا ءتىلى</language>
-			<language type="wbp" draft="unconfirmed">ۋالبيري ءتىلى</language>
-			<language type="wo" draft="unconfirmed">ۆولوف ءتىلى</language>
-			<language type="xh" draft="unconfirmed">كحوسا ءتىلى</language>
-			<language type="xnr" draft="unconfirmed">كاڭري ءتىلى</language>
-			<language type="xog" draft="unconfirmed">سوگا ءتىلى</language>
-			<language type="yav" draft="unconfirmed">ياڭبەن ءتىلى</language>
-			<language type="yi" draft="unconfirmed">يديش ءتىلى</language>
-			<language type="yo" draft="unconfirmed">يورۋبا ءتىلى</language>
-			<language type="yrl" draft="unconfirmed">نەنگاتۋ ءتىلى</language>
-			<language type="yue" draft="unconfirmed">گۋاڭدۇڭ ءتىلى</language>
-			<language type="yue" alt="menu" draft="unconfirmed">قىتاي ءتىلى (گۋاڭدۇڭ)</language>
-			<language type="za" draft="unconfirmed">جۋاڭ ءتىلى</language>
-			<language type="zgh" draft="unconfirmed">ماروككولىق ستاندارتتى تامازيگحت ءتىلى</language>
-			<language type="zh" draft="unconfirmed">قىتاي ءتىلى</language>
-			<language type="zh" alt="menu" draft="unconfirmed">قىتاي ءتىلى (پۋتۋڭحۋا)</language>
-			<language type="zh_Hans" draft="unconfirmed">جەڭىلدەتىلگەن قىتاي ءتىلى</language>
-			<language type="zh_Hans" alt="long" draft="unconfirmed">جەڭىلدەتىلگەن قىتاي ءتىلى (پۋتۋڭحۋا)</language>
-			<language type="zh_Hant" draft="unconfirmed">ءداستۇرلى قىتاي ءتىلى</language>
-			<language type="zh_Hant" alt="long" draft="unconfirmed">ءداستۇرلى قىتاي ءتىلى (پۋتۋڭحۋا)</language>
-			<language type="zu" draft="unconfirmed">زۋلۋ ءتىلى</language>
-			<language type="zxx" draft="unconfirmed">تىلدىك مازمۇنى جوق</language>
+			<language type="kkj">كاكو ءتىلى</language>
+			<language type="kl">كالاليسۋت ءتىلى</language>
+			<language type="kln">كالەنجين ءتىلى</language>
+			<language type="km">كحمەر ءتىلى</language>
+			<language type="kn">كاننادا ءتىلى</language>
+			<language type="ko">كورەي ءتىلى</language>
+			<language type="kok">كونكاني ءتىلى</language>
+			<language type="kpe">كپەلە ءتىلى</language>
+			<language type="ks">كاشمير ءتىلى</language>
+			<language type="ksb">شامبالا ءتىلى</language>
+			<language type="ksf">بافيا ءتىلى</language>
+			<language type="ksh">كولونيان ءتىلى</language>
+			<language type="ku">كۇرد ءتىلى</language>
+			<language type="ku" menu="core">كۇرد ءتىلى</language>
+			<language type="ku" menu="extension">كۇرمانجى</language>
+			<language type="kw">كورن ءتىلى</language>
+			<language type="kxv">كۋۆي ءتىلى</language>
+			<language type="ky">قىرعىز ءتىلى</language>
+			<language type="la">لاتىن ءتىلى</language>
+			<language type="lag">لانگي ءتىلى</language>
+			<language type="lb">ليۋكسەمبۋرگ ءتىلى</language>
+			<language type="lg">گاندا ءتىلى</language>
+			<language type="lij">ليگۋر ءتىلى</language>
+			<language type="lkt">لاكوتا ءتىلى</language>
+			<language type="lld">لادينو ءتىلى</language>
+			<language type="lmo">لومبارد ءتىلى</language>
+			<language type="ln">لينگالا ءتىلى</language>
+			<language type="lo">لاوس ءتىلى</language>
+			<language type="lou">كىرەول ءتىلى</language>
+			<language type="lrc">سولتۇستىك فريز ءتىلى</language>
+			<language type="lt">ليتۆا ءتىلى</language>
+			<language type="ltg">لاتگاليان ءتىلى</language>
+			<language type="lu">لۋبا-كاتاڭا ءتىلى</language>
+			<language type="luo">لۋو ءتىلى</language>
+			<language type="luy">لۋحيا ءتىلى</language>
+			<language type="lv">لاتىش ءتىلى</language>
+			<language type="lzz">لاز ءتىلى</language>
+			<language type="mai">مايتحيلي ءتىلى</language>
+			<language type="mas">ماساي ءتىلى</language>
+			<language type="mdf">موكشا ءتىلى</language>
+			<language type="mer">مەرۋ ءتىلى</language>
+			<language type="mfe">موريسيەن ءتىلى</language>
+			<language type="mg">مالاگاسي ءتىلى</language>
+			<language type="mgh">ماكۋا-مەتتو ءتىلى</language>
+			<language type="mgo">مەتا ءتىلى</language>
+			<language type="mhn">موكەنو ءتىلى</language>
+			<language type="mi">ماوري ءتىلى</language>
+			<language type="mic">ميكماۋ ءتىلى</language>
+			<language type="mk">ماكەدون ءتىلى</language>
+			<language type="ml">مالايالام ءتىلى</language>
+			<language type="mn">موڭعول ءتىلى</language>
+			<language type="mni">مانيپۋري ءتىلى</language>
+			<language type="moh">موحاۋك ءتىلى</language>
+			<language type="mr">ماراتحي ءتىلى</language>
+			<language type="ms">مالاي ءتىلى</language>
+			<language type="mt">مالتا ءتىلى</language>
+			<language type="mua">مۋنداڭ ءتىلى</language>
+			<language type="mul">بىرنەشە ءتىلى</language>
+			<language type="mus">كريك ءتىلى</language>
+			<language type="my">بيرما ءتىلى</language>
+			<language type="myv">ەرزيا ءتىلى</language>
+			<language type="mzn">مازاندەران ءتىلى</language>
+			<language type="naq">ناما ءتىلى</language>
+			<language type="nb">نورۆەگيالىق بۋكمول ءتىلى</language>
+			<language type="nd">سولتۇستىك ندەبەلە ءتىلى</language>
+			<language type="nds">تومەنگى نەمىس ءتىلى</language>
+			<language type="nds_NL">تومەنگى ساكسون ءتىلى</language>
+			<language type="ne">نەپال ءتىلى</language>
+			<language type="nl">نيدەرلاند ءتىلى</language>
+			<language type="nl_BE">فلاماند ءتىلى</language>
+			<language type="nmg">كۋاسيو ءتىلى</language>
+			<language type="nn">نورۆەگيالىق نيۋنورسك ءتىلى</language>
+			<language type="nnh">نگيەمبۋن ءتىلى</language>
+			<language type="no">نورۆەگ ءتىلى</language>
+			<language type="nqo">نكو ءتىلى</language>
+			<language type="nr">وڭتۇستىك ندەبەلە ءتىلى</language>
+			<language type="nso">سولتۇستىك سوتو ءتىلى</language>
+			<language type="nus">نۋەر ءتىلى</language>
+			<language type="nv">ناۆاحو ءتىلى</language>
+			<language type="ny">نيانجا ءتىلى</language>
+			<language type="nyn">نيانكولە ءتىلى</language>
+			<language type="oc">وكسيتان ءتىلى</language>
+			<language type="om">ورومو ءتىلى</language>
+			<language type="or">وريا ءتىلى</language>
+			<language type="os">وسەتين ءتىلى</language>
+			<language type="osa">وسەيج ءتىلى</language>
+			<language type="pa">پەنجاب ءتىلى</language>
+			<language type="pap">پاپيامەنتو ءتىلى</language>
+			<language type="pcm">نيگەريالىق پيدجين ءتىلى</language>
+			<language type="pi">پالي ءتىلى</language>
+			<language type="pis">پيجين ءتىلى</language>
+			<language type="pl">پولياك ءتىلى</language>
+			<language type="pms">پيەمونت ءتىلى</language>
+			<language type="prg">پرۋسسيا ءتىلى</language>
+			<language type="ps">پۋشتۋ ءتىلى</language>
+			<language type="pt">پورتۋگال ءتىلى</language>
+			<language type="pt_BR">برازيليالىق پورتۋگال ءتىلى</language>
+			<language type="pt_PT">ەۋروپالىق پورتۋگال ءتىلى</language>
+			<language type="qu">كەچۋا ءتىلى</language>
+			<language type="quc">كيچە ءتىلى</language>
+			<language type="raj">راجاستاني ءتىلى</language>
+			<language type="rhg">روحينجا ءتىلى</language>
+			<language type="rif">ريفيان ءتىلى</language>
+			<language type="rm">رومانش ءتىلى</language>
+			<language type="rn">رۋندي ءتىلى</language>
+			<language type="ro">رۋمىن ءتىلى</language>
+			<language type="ro_MD">مولدوۆان ءتىلى</language>
+			<language type="rof">رومبو ءتىلى</language>
+			<language type="ru">ورىس ءتىلى</language>
+			<language type="rw">كينيارۋاندا ءتىلى</language>
+			<language type="rwk">رۋا ءتىلى</language>
+			<language type="sa">سانسكريت ءتىلى</language>
+			<language type="sah">ساحا ءتىلى</language>
+			<language type="saq">سامبۋرۋ ءتىلى</language>
+			<language type="sat">سانتالي ءتىلى</language>
+			<language type="sbp">ساڭۋ ءتىلى</language>
+			<language type="sc">ساردين ءتىلى</language>
+			<language type="scn">سيسيليا ءتىلى</language>
+			<language type="sd">سيندحي ءتىلى</language>
+			<language type="sdh">وڭتۇستىك كۇرد ءتىلى</language>
+			<language type="se">سولتۇستىك سامي ءتىلى</language>
+			<language type="seh">سەنا ءتىلى</language>
+			<language type="ses">كويرابورو سەنني ءتىلى</language>
+			<language type="sg">ساڭو ءتىلى</language>
+			<language type="sgs">ساموگيتيان ءتىلى</language>
+			<language type="shi">تاشەلحيت ءتىلى</language>
+			<language type="shn">شان ءتىلى</language>
+			<language type="si">سينگال ءتىلى</language>
+			<language type="sid">سيدامو ءتىلى</language>
+			<language type="sk">سلوۆاك ءتىلى</language>
+			<language type="skr">سارايكي ءتىلى</language>
+			<language type="sl">سلوۆەن ءتىلى</language>
+			<language type="sma">وڭتۇستىك سامي ءتىلى</language>
+			<language type="smj">لۋلە-سامي ءتىلى</language>
+			<language type="smn">يناري سامي ءتىلى</language>
+			<language type="sms">كولتا سامي ءتىلى</language>
+			<language type="sn">شونا ءتىلى</language>
+			<language type="so">سومالي ءتىلى</language>
+			<language type="sq">البان ءتىلى</language>
+			<language type="sr">سەرب ءتىلى</language>
+			<language type="ss">سۋاتي ءتىلى</language>
+			<language type="ssy">ساحو ءتىلى</language>
+			<language type="st">وڭتۇستىك سوتو ءتىلى</language>
+			<language type="su">سۋدان ءتىلى</language>
+			<language type="sv">شۆەد ءتىلى</language>
+			<language type="sw">سۋاحيلي ءتىلى</language>
+			<language type="sw_CD">كونگو سۋاحيلي ءتىلى</language>
+			<language type="syr">سيريا ءتىلى</language>
+			<language type="szl">سيلەز ءتىلى</language>
+			<language type="ta">تاميل ءتىلى</language>
+			<language type="te">تەلۋگۋ ءتىلى</language>
+			<language type="teo">تەسو ءتىلى</language>
+			<language type="tg">تاجىك ءتىلى</language>
+			<language type="th">تاي ءتىلى</language>
+			<language type="ti">تيگرينيا ءتىلى</language>
+			<language type="tig">تيگرە ءتىلى</language>
+			<language type="tk">تۇرىكمەن ءتىلى</language>
+			<language type="tn">سۋانا ءتىلى</language>
+			<language type="to">تونگان ءتىلى</language>
+			<language type="tok">توكي-پونا ءتىلى</language>
+			<language type="tpi">توك-پيسين ءتىلى</language>
+			<language type="tr">تۇرىك ءتىلى</language>
+			<language type="trv">تاروكو ءتىلى</language>
+			<language type="trw">توۋالي ءتىلى</language>
+			<language type="ts">سونگا ءتىلى</language>
+			<language type="tt">تاتار ءتىلى</language>
+			<language type="twq">تاساۋاك ءتىلى</language>
+			<language type="tyv">تۋۆين ءتىلى</language>
+			<language type="tzm">ورتالىق اتلاس تامازيگحت ءتىلى</language>
+			<language type="ug">ۇيعىر ءتىلى</language>
+			<language type="uk">ۋكراين ءتىلى</language>
+			<language type="und">بەلگىسىز ءتىل</language>
+			<language type="ur">ۋردۋ ءتىلى</language>
+			<language type="uz">وزبەك ءتىلى</language>
+			<language type="vai">ۆاي ءتىلى</language>
+			<language type="ve">ۆەندا ءتىلى</language>
+			<language type="vec">ۆەنەسيا ءتىلى</language>
+			<language type="vi">ۆيەتنام ءتىلى</language>
+			<language type="vmw">ماكۋا ءتىلى</language>
+			<language type="vo">ۆولاپيۋك ءتىلى</language>
+			<language type="vun">ۆۋنجو ءتىلى</language>
+			<language type="wa">ۋالون ءتىلى</language>
+			<language type="wae">ۋالسەر ءتىلى</language>
+			<language type="wal">ۋولايتا ءتىلى</language>
+			<language type="wbp">ۋالبيري ءتىلى</language>
+			<language type="wo">ۆولوف ءتىلى</language>
+			<language type="xh">كحوسا ءتىلى</language>
+			<language type="xnr">كاڭري ءتىلى</language>
+			<language type="xog">سوگا ءتىلى</language>
+			<language type="yav">ياڭبەن ءتىلى</language>
+			<language type="yi">يديش ءتىلى</language>
+			<language type="yo">يورۋبا ءتىلى</language>
+			<language type="yrl">نەنگاتۋ ءتىلى</language>
+			<language type="yue">گۋاڭدۇڭ ءتىلى</language>
+			<language type="yue" alt="menu">قىتاي ءتىلى (گۋاڭدۇڭ)</language>
+			<language type="za">جۋاڭ ءتىلى</language>
+			<language type="zgh">ماروككولىق ستاندارتتى تامازيگحت ءتىلى</language>
+			<language type="zh">قىتاي ءتىلى</language>
+			<language type="zh" alt="menu">قىتاي ءتىلى (پۋتۋڭحۋا)</language>
+			<language type="zh_Hans">جەڭىلدەتىلگەن قىتاي ءتىلى</language>
+			<language type="zh_Hans" alt="long">جەڭىلدەتىلگەن قىتاي ءتىلى (پۋتۋڭحۋا)</language>
+			<language type="zh_Hant">ءداستۇرلى قىتاي ءتىلى</language>
+			<language type="zh_Hant" alt="long">ءداستۇرلى قىتاي ءتىلى (پۋتۋڭحۋا)</language>
+			<language type="zu">زۋلۋ ءتىلى</language>
+			<language type="zxx">تىلدىك مازمۇنى جوق</language>
 		</languages>
 		<scripts>
-			<script type="Adlm" draft="unconfirmed">ادلام جازۋى</script>
-			<script type="Aghb" draft="unconfirmed">اگۆان جازۋى</script>
-			<script type="Ahom" draft="unconfirmed">احوم جازۋى</script>
-			<script type="Arab" draft="unconfirmed">اراب جازۋى</script>
-			<script type="Aran" draft="unconfirmed">ناستاليك جازۋى</script>
-			<script type="Armi" draft="unconfirmed">ارامەي جازۋى</script>
-			<script type="Armn" draft="unconfirmed">ارميان جازۋى</script>
-			<script type="Avst" draft="unconfirmed">اۆەستا جازۋى</script>
-			<script type="Bali" draft="unconfirmed">بالي جازۋى</script>
-			<script type="Bamu" draft="unconfirmed">بامۋم جازۋى</script>
-			<script type="Bass" draft="unconfirmed">باسسا جازۋى</script>
-			<script type="Batk" draft="unconfirmed">باتاك جازۋى</script>
-			<script type="Beng" draft="unconfirmed">بەنگال جازۋى</script>
-			<script type="Bhks" draft="unconfirmed">بحايسۋكى جازۋى</script>
-			<script type="Bopo" draft="unconfirmed">بوپوموفو جازۋى</script>
-			<script type="Brah" draft="unconfirmed">براحمي جازۋى</script>
-			<script type="Brai" draft="unconfirmed">برايل جازۋى</script>
-			<script type="Bugi" draft="unconfirmed">بۋگي جازۋى</script>
-			<script type="Buhd" draft="unconfirmed">بۋحيد جازۋى</script>
-			<script type="Cakm" draft="unconfirmed">چاكما جازۋى</script>
-			<script type="Cans" draft="unconfirmed">كانادالىق بۋىن جۇيەلى جازۋ</script>
-			<script type="Cari" draft="unconfirmed">كاري جازۋى</script>
-			<script type="Cham" draft="unconfirmed">چام جازۋى</script>
-			<script type="Cher" draft="unconfirmed">چەروكي جازۋى</script>
-			<script type="Chrs" draft="unconfirmed">حورەزم جازۋى</script>
-			<script type="Copt" draft="unconfirmed">كوپت جازۋى</script>
-			<script type="Cpmn" draft="unconfirmed">كيپر-مينوي جازۋى</script>
-			<script type="Cprt" draft="unconfirmed">كيپر جازۋى</script>
-			<script type="Cyrl" draft="unconfirmed">كيريل جازۋى</script>
-			<script type="Cyrs" draft="unconfirmed">كونە ورىس جازۋى</script>
-			<script type="Deva" draft="unconfirmed">دەۆاناگاري جازۋى</script>
-			<script type="Diak" draft="unconfirmed">ديۆەحي اكۋرۋ جازۋى</script>
-			<script type="Dogr" draft="unconfirmed">دوگرا جازۋى</script>
-			<script type="Dsrt" draft="unconfirmed">دەسەرەت جازۋى</script>
-			<script type="Dupl" draft="unconfirmed">دۋپلويە جازۋى</script>
-			<script type="Egyp" draft="unconfirmed">مىسىر جازۋى</script>
-			<script type="Elba" draft="unconfirmed">ەلباسان جازۋى</script>
-			<script type="Elym" draft="unconfirmed">ەليماي جازۋى</script>
-			<script type="Ethi" draft="unconfirmed">ەفيوپيالىق جازۋ</script>
-			<script type="Gara" draft="unconfirmed">گاراي جازۋى</script>
-			<script type="Geor" draft="unconfirmed">گرۋزين جازۋى</script>
-			<script type="Glag" draft="unconfirmed">گلاگول جازۋى</script>
-			<script type="Gong" draft="unconfirmed">گۋنجالا گوندي جازۋى</script>
-			<script type="Gonm" draft="unconfirmed">ماسارام گوندي جازۋى</script>
-			<script type="Goth" draft="unconfirmed">گوت جازۋى</script>
-			<script type="Gran" draft="unconfirmed">گرانتحا جازۋى</script>
-			<script type="Grek" draft="unconfirmed">گرەك جازۋى</script>
-			<script type="Gujr" draft="unconfirmed">گۋجاراتي جازۋى</script>
-			<script type="Gukh" draft="unconfirmed">گۋرۋڭ كحەما جازۋى</script>
-			<script type="Guru" draft="unconfirmed">گۋرمۋكحي جازۋى</script>
-			<script type="Hanb" draft="unconfirmed">حانب جازۋى</script>
-			<script type="Hang" draft="unconfirmed">حانگىل جازۋى</script>
-			<script type="Hani" draft="unconfirmed">قىتاي جازۋى</script>
-			<script type="Hano" draft="unconfirmed">حانۋنۋ جازۋى</script>
-			<script type="Hans" draft="unconfirmed">جەڭىلدەتىلگەن جازۋ</script>
-			<script type="Hans" alt="stand-alone" draft="unconfirmed">جەڭىلدەتىلگەن قىتاي جازۋى</script>
-			<script type="Hant" draft="unconfirmed">ءداستۇرلى جازۋ</script>
-			<script type="Hant" alt="stand-alone" draft="unconfirmed">ءداستۇرلى قىتاي جازۋى</script>
-			<script type="Hatr" draft="unconfirmed">حاترا جازۋى</script>
-			<script type="Hebr" draft="unconfirmed">يۆريت جازۋى</script>
-			<script type="Hira" draft="unconfirmed">حيراگانا جازۋى</script>
-			<script type="Hluw" draft="unconfirmed">انادولى جازۋى</script>
-			<script type="Hmng" draft="unconfirmed">پاحاۋ جازۋى</script>
-			<script type="Hmnp" draft="unconfirmed">نياكەڭ پۋاچۋە حموڭ جازۋى</script>
-			<script type="Hrkt" draft="unconfirmed">حيراگانا نەمەسە كاتاكانا</script>
-			<script type="Hung" draft="unconfirmed">ماجار رۋناسى</script>
-			<script type="Ital" draft="unconfirmed">ەسكى يتالياجازۋى</script>
-			<script type="Jamo" draft="unconfirmed">جامو جازۋى</script>
-			<script type="Java" draft="unconfirmed">ياۆا جازۋى</script>
-			<script type="Jpan" draft="unconfirmed">جاپون جازۋى</script>
-			<script type="Kali" draft="unconfirmed">كايا-لي جازۋى</script>
-			<script type="Kana" draft="unconfirmed">كاتاكانا جازۋى</script>
-			<script type="Kawi" draft="unconfirmed">كاۋي جازۋى</script>
-			<script type="Khar" draft="unconfirmed">كحاروشتحي جازۋى</script>
-			<script type="Khmr" draft="unconfirmed">كحمەر جازۋى</script>
-			<script type="Khoj" draft="unconfirmed">حوجيكي جازۋى</script>
-			<script type="Kits" draft="unconfirmed">شاعىن كيدان جازۋى</script>
-			<script type="Knda" draft="unconfirmed">كاننادا جازۋى</script>
-			<script type="Kore" draft="unconfirmed">كورەي جازۋى</script>
-			<script type="Krai" draft="unconfirmed">كيرات راي جازۋى</script>
-			<script type="Kthi" draft="unconfirmed">كايتحي جازۋى</script>
-			<script type="Lana" draft="unconfirmed">لاننا جازۋى</script>
-			<script type="Laoo" draft="unconfirmed">لاوس جازۋى</script>
-			<script type="Latf" draft="unconfirmed">فراكتۋر لاتىن جازۋى</script>
-			<script type="Latg" draft="unconfirmed">گاەل لاتىن جازۋى</script>
-			<script type="Latn" draft="unconfirmed">لاتىن جازۋى</script>
-			<script type="Lepc" draft="unconfirmed">لەپچا جازۋى</script>
-			<script type="Limb" draft="unconfirmed">ليمبۋ جازۋى</script>
-			<script type="Lina" draft="unconfirmed">سىزىقتىق A جازۋى</script>
-			<script type="Linb" draft="unconfirmed">سىزىقتىق B جازۋى</script>
-			<script type="Lisu" draft="unconfirmed">فرايسەر جازۋى</script>
-			<script type="Lyci" draft="unconfirmed">ليكي جازۋى</script>
-			<script type="Lydi" draft="unconfirmed">ليدي جازۋى</script>
-			<script type="Mahj" draft="unconfirmed">ماحاجاني جازۋى</script>
-			<script type="Maka" draft="unconfirmed">ماكاسار جازۋى</script>
-			<script type="Mand" draft="unconfirmed">ماندەي جازۋى</script>
-			<script type="Mani" draft="unconfirmed">مانيحەي جازۋى</script>
-			<script type="Marc" draft="unconfirmed">مارچەن جازۋى</script>
-			<script type="Medf" draft="unconfirmed">مەدەفايدرين جازۋى</script>
-			<script type="Mend" draft="unconfirmed">مەندە جازۋى</script>
-			<script type="Merc" draft="unconfirmed">مەرويت قيعاش جازۋى</script>
-			<script type="Mero" draft="unconfirmed">مەرويت جازۋى</script>
-			<script type="Mlym" draft="unconfirmed">مالايالام جازۋى</script>
-			<script type="Modi" draft="unconfirmed">مودي جازۋى</script>
-			<script type="Mong" draft="unconfirmed">موڭعول جازۋى</script>
-			<script type="Mroo" draft="unconfirmed">مرو جازۋى</script>
-			<script type="Mtei" draft="unconfirmed">مەيتەي جازۋى</script>
-			<script type="Mult" draft="unconfirmed">مۋلتاني جازۋى</script>
-			<script type="Mymr" draft="unconfirmed">ميانما جازۋى</script>
-			<script type="Nagm" draft="unconfirmed">ناگ مۋنداري جازۋى</script>
-			<script type="Nand" draft="unconfirmed">نانديناگاري جازۋى</script>
-			<script type="Narb" draft="unconfirmed">كونە سولتۇستىك اراب جازۋى</script>
-			<script type="Nbat" draft="unconfirmed">ناباتەي جازۋى</script>
-			<script type="Newa" draft="unconfirmed">نيۋا جازۋى</script>
-			<script type="Nkoo" draft="unconfirmed">نكو جازۋى</script>
-			<script type="Nshu" draft="unconfirmed">نيۋ-شۋ جازۋى</script>
-			<script type="Ogam" draft="unconfirmed">وگام جازۋى</script>
-			<script type="Olck" draft="unconfirmed">ول-چيكي جازۋى</script>
-			<script type="Onao" draft="unconfirmed">ول-ونال جازۋى</script>
-			<script type="Orkh" draft="unconfirmed">كونە تۇركى جازۋى</script>
-			<script type="Orya" draft="unconfirmed">وريا جازۋى</script>
-			<script type="Osge" draft="unconfirmed">وسەيج جازۋى</script>
-			<script type="Osma" draft="unconfirmed">يسمانيا جازۋى</script>
-			<script type="Ougr" draft="unconfirmed">كونە ۇيعىر جازۋى</script>
-			<script type="Palm" draft="unconfirmed">پالمير جازۋى</script>
-			<script type="Pauc" draft="unconfirmed">پاۋ سين حاۋ جازۋى</script>
-			<script type="Perm" draft="unconfirmed">كونە پەرم جازۋى</script>
-			<script type="Phag" draft="unconfirmed">تيبەر-موڭعول جازۋى</script>
-			<script type="Phli" draft="unconfirmed">جازبا پاحلاۆي</script>
-			<script type="Phlp" draft="unconfirmed">پاحلاۆي جازۋى</script>
-			<script type="Phnx" draft="unconfirmed">فينيكيا جازۋى</script>
-			<script type="Plrd" draft="unconfirmed">پوللارد فونەتيكالىق جازۋى</script>
-			<script type="Prti" draft="unconfirmed">جازبا پارفيا</script>
-			<script type="Qaag" draft="unconfirmed">زوجي جازۋى</script>
-			<script type="Rjng" draft="unconfirmed">رەجاڭ جازۋى</script>
-			<script type="Rohg" draft="unconfirmed">حانيفي جازۋى</script>
-			<script type="Runr" draft="unconfirmed">رۋنا</script>
-			<script type="Samr" draft="unconfirmed">ساماريا جازۋى</script>
-			<script type="Sarb" draft="unconfirmed">وڭتۇستىك اراب جازۋى</script>
-			<script type="Saur" draft="unconfirmed">ساۋراشترا جازۋى</script>
-			<script type="Sgnw" draft="unconfirmed">جازۋ</script>
-			<script type="Shaw" draft="unconfirmed">شوۋ جازۋى</script>
-			<script type="Shrd" draft="unconfirmed">شارادا جازۋى</script>
-			<script type="Sidd" draft="unconfirmed">سيدحام جازۋى</script>
-			<script type="Sind" draft="unconfirmed">كحۋداۋادي جازۋى</script>
-			<script type="Sinh" draft="unconfirmed">سينگال جازۋى</script>
-			<script type="Sogd" draft="unconfirmed">سوعدى جازۋى</script>
-			<script type="Sogo" draft="unconfirmed">كونە سوعدى جازۋى</script>
-			<script type="Sora" draft="unconfirmed">سورا سومپەڭ جازۋى</script>
-			<script type="Soyo" draft="unconfirmed">سويومبو جازۋى</script>
-			<script type="Sund" draft="unconfirmed">سۋند جازۋى</script>
-			<script type="Sunu" draft="unconfirmed">سۋنۋار جازۋى</script>
-			<script type="Sylo" draft="unconfirmed">سيلحەت ناگاري جازۋى</script>
-			<script type="Syrc" draft="unconfirmed">سيريا جازۋى</script>
-			<script type="Syre" draft="unconfirmed">ەسترانگەلو سيري جازۋى</script>
-			<script type="Syrj" draft="unconfirmed">باتىس سيري جازۋى</script>
-			<script type="Syrn" draft="unconfirmed">شىعىس سيري جازۋى</script>
-			<script type="Tagb" draft="unconfirmed">تاگبانۋا جازۋى</script>
-			<script type="Takr" draft="unconfirmed">تاكري جازۋى</script>
-			<script type="Tale" draft="unconfirmed">تاي لى جازۋى</script>
-			<script type="Talu" draft="unconfirmed">جاڭا تاي لى جازۋى</script>
-			<script type="Taml" draft="unconfirmed">تاميل جازۋى</script>
-			<script type="Tang" draft="unconfirmed">تانعۇت جازۋى</script>
-			<script type="Tavt" draft="unconfirmed">تاي ۆيەت جازۋى</script>
-			<script type="Telu" draft="unconfirmed">تەلۋگۋ جازۋى</script>
-			<script type="Tfng" draft="unconfirmed">تيفيناگ جازۋى</script>
-			<script type="Tglg" draft="unconfirmed">بايبايىن جازۋى</script>
-			<script type="Thaa" draft="unconfirmed">تانا جازۋى</script>
-			<script type="Thai" draft="unconfirmed">تاي جازۋى</script>
-			<script type="Tibt" draft="unconfirmed">تيبەت جازۋى</script>
-			<script type="Tirh" draft="unconfirmed">تيرحۋتا جازۋى</script>
-			<script type="Tnsa" draft="unconfirmed">تاڭسا جازۋى</script>
-			<script type="Todr" draft="unconfirmed">تودحري جازۋى</script>
-			<script type="Toto" draft="unconfirmed">توتو جازۋى</script>
-			<script type="Tutg" draft="unconfirmed">تۋلۋ-تيگالاري جازۋى</script>
-			<script type="Ugar" draft="unconfirmed">ۋگاريت جازۋى</script>
-			<script type="Vaii" draft="unconfirmed">ۆاي جازۋى</script>
-			<script type="Vith" draft="unconfirmed">ۆيتكۋتي جازۋى</script>
-			<script type="Wara" draft="unconfirmed">ۆاراڭ كشيتي جازۋى</script>
-			<script type="Wcho" draft="unconfirmed">ۋانچو جازۋى</script>
-			<script type="Xpeo" draft="unconfirmed">كونە پارسى جازۋو</script>
-			<script type="Xsux" draft="unconfirmed">شۋمەر-اككاد سىنا جازۋى</script>
-			<script type="Yezi" draft="unconfirmed">ەزيد جازۋى</script>
-			<script type="Yiii" draft="unconfirmed">ي جازۋى</script>
-			<script type="Zanb" draft="unconfirmed">زانابازار شارشى جازۋى</script>
-			<script type="Zinh" draft="unconfirmed">مۇرا ەتىلگەن</script>
-			<script type="Zmth" draft="unconfirmed">ماتەماتيكالىق جازۋ</script>
-			<script type="Zsye" draft="unconfirmed">ەموجي</script>
-			<script type="Zsym" draft="unconfirmed">تاڭبالار</script>
-			<script type="Zxxx" draft="unconfirmed">جازۋسىز</script>
-			<script type="Zyyy" draft="unconfirmed">جالپى</script>
-			<script type="Zzzz" draft="unconfirmed">بەلگىسىز جازۋ</script>
+			<script type="Adlm">ادلام جازۋى</script>
+			<script type="Aghb">اگۆان جازۋى</script>
+			<script type="Ahom">احوم جازۋى</script>
+			<script type="Arab">اراب جازۋى</script>
+			<script type="Aran">ناستاليك جازۋى</script>
+			<script type="Armi">ارامەي جازۋى</script>
+			<script type="Armn">ارميان جازۋى</script>
+			<script type="Avst">اۆەستا جازۋى</script>
+			<script type="Bali">بالي جازۋى</script>
+			<script type="Bamu">بامۋم جازۋى</script>
+			<script type="Bass">باسسا جازۋى</script>
+			<script type="Batk">باتاك جازۋى</script>
+			<script type="Beng">بەنگال جازۋى</script>
+			<script type="Berf">زاگاۋا جازۋى</script>
+			<script type="Bhks">بحايسۋكى جازۋى</script>
+			<script type="Bopo">بوپوموفو جازۋى</script>
+			<script type="Brah">براحمي جازۋى</script>
+			<script type="Brai">برايل جازۋى</script>
+			<script type="Bugi">بۋگي جازۋى</script>
+			<script type="Buhd">بۋحيد جازۋى</script>
+			<script type="Cakm">چاكما جازۋى</script>
+			<script type="Cans">كانادالىق بۋىن جۇيەلى جازۋ</script>
+			<script type="Cari">كاري جازۋى</script>
+			<script type="Cham">چام جازۋى</script>
+			<script type="Cher">چەروكي جازۋى</script>
+			<script type="Chrs">حورەزم جازۋى</script>
+			<script type="Copt">كوپت جازۋى</script>
+			<script type="Cpmn">كيپر-مينوي جازۋى</script>
+			<script type="Cprt">كيپر جازۋى</script>
+			<script type="Cyrl">كيريل جازۋى</script>
+			<script type="Cyrs">كونە ورىس جازۋى</script>
+			<script type="Deva">دەۆاناگاري جازۋى</script>
+			<script type="Diak">ديۆەحي اكۋرۋ جازۋى</script>
+			<script type="Dogr">دوگرا جازۋى</script>
+			<script type="Dsrt">دەسەرەت جازۋى</script>
+			<script type="Dupl">دۋپلويە جازۋى</script>
+			<script type="Egyp">مىسىر جازۋى</script>
+			<script type="Elba">ەلباسان جازۋى</script>
+			<script type="Elym">ەليماي جازۋى</script>
+			<script type="Ethi">ەفيوپيالىق جازۋ</script>
+			<script type="Gara">گاراي جازۋى</script>
+			<script type="Geor">گرۋزين جازۋى</script>
+			<script type="Glag">گلاگول جازۋى</script>
+			<script type="Gong">گۋنجالا گوندي جازۋى</script>
+			<script type="Gonm">ماسارام گوندي جازۋى</script>
+			<script type="Goth">گوت جازۋى</script>
+			<script type="Gran">گرانتحا جازۋى</script>
+			<script type="Grek">گرەك جازۋى</script>
+			<script type="Gujr">گۋجاراتي جازۋى</script>
+			<script type="Gukh">گۋرۋڭ كحەما جازۋى</script>
+			<script type="Guru">گۋرمۋكحي جازۋى</script>
+			<script type="Hanb">حانب جازۋى</script>
+			<script type="Hang">حانگىل جازۋى</script>
+			<script type="Hani">قىتاي جازۋى</script>
+			<script type="Hano">حانۋنۋ جازۋى</script>
+			<script type="Hans">جەڭىلدەتىلگەن جازۋ</script>
+			<script type="Hans" alt="stand-alone">جەڭىلدەتىلگەن قىتاي جازۋى</script>
+			<script type="Hant">ءداستۇرلى جازۋ</script>
+			<script type="Hant" alt="stand-alone">ءداستۇرلى قىتاي جازۋى</script>
+			<script type="Hatr">حاترا جازۋى</script>
+			<script type="Hebr">يۆريت جازۋى</script>
+			<script type="Hira">حيراگانا جازۋى</script>
+			<script type="Hluw">انادولى جازۋى</script>
+			<script type="Hmng">پاحاۋ جازۋى</script>
+			<script type="Hmnp">نياكەڭ پۋاچۋە حموڭ جازۋى</script>
+			<script type="Hrkt">حيراگانا نەمەسە كاتاكانا</script>
+			<script type="Hung">ماجار رۋناسى</script>
+			<script type="Ital">ەسكى يتالياجازۋى</script>
+			<script type="Jamo">جامو جازۋى</script>
+			<script type="Java">ياۆا جازۋى</script>
+			<script type="Jpan">جاپون جازۋى</script>
+			<script type="Kali">كايا-لي جازۋى</script>
+			<script type="Kana">كاتاكانا جازۋى</script>
+			<script type="Kawi">كاۋي جازۋى</script>
+			<script type="Khar">كحاروشتحي جازۋى</script>
+			<script type="Khmr">كحمەر جازۋى</script>
+			<script type="Khoj">حوجيكي جازۋى</script>
+			<script type="Kits">شاعىن كيدان جازۋى</script>
+			<script type="Knda">كاننادا جازۋى</script>
+			<script type="Kore">كورەي جازۋى</script>
+			<script type="Krai">كيرات راي جازۋى</script>
+			<script type="Kthi">كايتحي جازۋى</script>
+			<script type="Lana">لاننا جازۋى</script>
+			<script type="Laoo">لاوس جازۋى</script>
+			<script type="Latf">فراكتۋر لاتىن جازۋى</script>
+			<script type="Latg">گاەل لاتىن جازۋى</script>
+			<script type="Latn">لاتىن جازۋى</script>
+			<script type="Lepc">لەپچا جازۋى</script>
+			<script type="Limb">ليمبۋ جازۋى</script>
+			<script type="Lina">سىزىقتىق A جازۋى</script>
+			<script type="Linb">سىزىقتىق B جازۋى</script>
+			<script type="Lisu">فرايسەر جازۋى</script>
+			<script type="Lyci">ليكي جازۋى</script>
+			<script type="Lydi">ليدي جازۋى</script>
+			<script type="Mahj">ماحاجاني جازۋى</script>
+			<script type="Maka">ماكاسار جازۋى</script>
+			<script type="Mand">ماندەي جازۋى</script>
+			<script type="Mani">مانيحەي جازۋى</script>
+			<script type="Marc">مارچەن جازۋى</script>
+			<script type="Medf">مەدەفايدرين جازۋى</script>
+			<script type="Mend">مەندە جازۋى</script>
+			<script type="Merc">مەرويت قيعاش جازۋى</script>
+			<script type="Mero">مەرويت جازۋى</script>
+			<script type="Mlym">مالايالام جازۋى</script>
+			<script type="Modi">مودي جازۋى</script>
+			<script type="Mong">موڭعول جازۋى</script>
+			<script type="Mroo">مرو جازۋى</script>
+			<script type="Mtei">مەيتەي جازۋى</script>
+			<script type="Mult">مۋلتاني جازۋى</script>
+			<script type="Mymr">ميانما جازۋى</script>
+			<script type="Nagm">ناگ مۋنداري جازۋى</script>
+			<script type="Nand">نانديناگاري جازۋى</script>
+			<script type="Narb">كونە سولتۇستىك اراب جازۋى</script>
+			<script type="Nbat">ناباتەي جازۋى</script>
+			<script type="Newa">نيۋا جازۋى</script>
+			<script type="Nkoo">نكو جازۋى</script>
+			<script type="Nshu">نيۋ-شۋ جازۋى</script>
+			<script type="Ogam">وگام جازۋى</script>
+			<script type="Olck">ول-چيكي جازۋى</script>
+			<script type="Onao">ول-ونال جازۋى</script>
+			<script type="Orkh">كونە تۇركى جازۋى</script>
+			<script type="Orya">وريا جازۋى</script>
+			<script type="Osge">وسەيج جازۋى</script>
+			<script type="Osma">يسمانيا جازۋى</script>
+			<script type="Ougr">كونە ۇيعىر جازۋى</script>
+			<script type="Palm">پالمير جازۋى</script>
+			<script type="Pauc">پاۋ سين حاۋ جازۋى</script>
+			<script type="Perm">كونە پەرم جازۋى</script>
+			<script type="Phag">تيبەر-موڭعول جازۋى</script>
+			<script type="Phli">جازبا پاحلاۆي</script>
+			<script type="Phlp">پاحلاۆي جازۋى</script>
+			<script type="Phnx">فينيكيا جازۋى</script>
+			<script type="Plrd">پوللارد فونەتيكالىق جازۋى</script>
+			<script type="Prti">جازبا پارفيا</script>
+			<script type="Qaag">زوجي جازۋى</script>
+			<script type="Rjng">رەجاڭ جازۋى</script>
+			<script type="Rohg">حانيفي جازۋى</script>
+			<script type="Runr">رۋنا</script>
+			<script type="Samr">ساماريا جازۋى</script>
+			<script type="Sarb">وڭتۇستىك اراب جازۋى</script>
+			<script type="Saur">ساۋراشترا جازۋى</script>
+			<script type="Sgnw">جازۋ</script>
+			<script type="Shaw">شوۋ جازۋى</script>
+			<script type="Shrd">شارادا جازۋى</script>
+			<script type="Sidd">سيدحام جازۋى</script>
+			<script type="Sidt">سيدەت جازۋى</script>
+			<script type="Sind">كحۋداۋادي جازۋى</script>
+			<script type="Sinh">سينگال جازۋى</script>
+			<script type="Sogd">سوعدى جازۋى</script>
+			<script type="Sogo">كونە سوعدى جازۋى</script>
+			<script type="Sora">سورا سومپەڭ جازۋى</script>
+			<script type="Soyo">سويومبو جازۋى</script>
+			<script type="Sund">سۋند جازۋى</script>
+			<script type="Sunu">سۋنۋار جازۋى</script>
+			<script type="Sylo">سيلحەت ناگاري جازۋى</script>
+			<script type="Syrc">سيريا جازۋى</script>
+			<script type="Syre">ەسترانگەلو سيري جازۋى</script>
+			<script type="Syrj">باتىس سيري جازۋى</script>
+			<script type="Syrn">شىعىس سيري جازۋى</script>
+			<script type="Tagb">تاگبانۋا جازۋى</script>
+			<script type="Takr">تاكري جازۋى</script>
+			<script type="Tale">تاي لى جازۋى</script>
+			<script type="Talu">جاڭا تاي لى جازۋى</script>
+			<script type="Taml">تاميل جازۋى</script>
+			<script type="Tang">تانعۇت جازۋى</script>
+			<script type="Tavt">تاي ۆيەت جازۋى</script>
+			<script type="Tayo">لاي تاي جازۋى</script>
+			<script type="Telu">تەلۋگۋ جازۋى</script>
+			<script type="Tfng">تيفيناگ جازۋى</script>
+			<script type="Tglg">بايبايىن جازۋى</script>
+			<script type="Thaa">تانا جازۋى</script>
+			<script type="Thai">تاي جازۋى</script>
+			<script type="Tibt">تيبەت جازۋى</script>
+			<script type="Tirh">تيرحۋتا جازۋى</script>
+			<script type="Tnsa">تاڭسا جازۋى</script>
+			<script type="Todr">تودحري جازۋى</script>
+			<script type="Tols">تولوڭ سيكي جازۋى</script>
+			<script type="Toto">توتو جازۋى</script>
+			<script type="Tutg">تۋلۋ-تيگالاري جازۋى</script>
+			<script type="Ugar">ۋگاريت جازۋى</script>
+			<script type="Vaii">ۆاي جازۋى</script>
+			<script type="Vith">ۆيتكۋتي جازۋى</script>
+			<script type="Wara">ۆاراڭ كشيتي جازۋى</script>
+			<script type="Wcho">ۋانچو جازۋى</script>
+			<script type="Xpeo">كونە پارسى جازۋو</script>
+			<script type="Xsux">شۋمەر-اككاد سىنا جازۋى</script>
+			<script type="Yezi">ەزيد جازۋى</script>
+			<script type="Yiii">ي جازۋى</script>
+			<script type="Zanb">زانابازار شارشى جازۋى</script>
+			<script type="Zinh">مۇرا ەتىلگەن</script>
+			<script type="Zmth">ماتەماتيكالىق جازۋ</script>
+			<script type="Zsye">ەموجي</script>
+			<script type="Zsym">تاڭبالار</script>
+			<script type="Zxxx">جازۋسىز</script>
+			<script type="Zyyy">جالپى</script>
+			<script type="Zzzz">بەلگىسىز جازۋ</script>
 		</scripts>
 		<territories>
-			<territory type="001" draft="unconfirmed">الەم</territory>
-			<territory type="002" draft="unconfirmed">افريكا</territory>
-			<territory type="003" draft="unconfirmed">سولتۇستىك امەريكا</territory>
-			<territory type="005" draft="unconfirmed">وڭتۇستىك امەريكا</territory>
-			<territory type="009" draft="unconfirmed">وكەانيا</territory>
-			<territory type="011" draft="unconfirmed">باتىس افريكا</territory>
-			<territory type="013" draft="unconfirmed">ورتالىق امەريكا</territory>
-			<territory type="014" draft="unconfirmed">شىعىس افريكا</territory>
-			<territory type="015" draft="unconfirmed">سولتۇستىك افريكا</territory>
-			<territory type="017" draft="unconfirmed">ورتالىق افريكا</territory>
-			<territory type="018" draft="unconfirmed">وڭتۇستىك افريكا ايماعى</territory>
-			<territory type="019" draft="unconfirmed">امەريكا</territory>
-			<territory type="021" draft="unconfirmed">سولتۇستىك امەريكا (ايماق)</territory>
-			<territory type="029" draft="unconfirmed">كاريب</territory>
-			<territory type="030" draft="unconfirmed">شىعىس ازيا</territory>
-			<territory type="034" draft="unconfirmed">وڭتۇستىك ازيا</territory>
-			<territory type="035" draft="unconfirmed">وڭتۇستىك-شىعىس ازيا</territory>
-			<territory type="039" draft="unconfirmed">وڭتۇستىك ەۋروپا</territory>
-			<territory type="053" draft="unconfirmed">اۋسترالازيا</territory>
-			<territory type="054" draft="unconfirmed">مەلانەزيا</territory>
-			<territory type="057" draft="unconfirmed">ميكرونەزيا ايماعى</territory>
-			<territory type="061" draft="unconfirmed">پولينەزىا</territory>
-			<territory type="142" draft="unconfirmed">ازيا</territory>
-			<territory type="143" draft="unconfirmed">ورتالىق ازيا</territory>
-			<territory type="145" draft="unconfirmed">باتىس ازيا</territory>
-			<territory type="150" draft="unconfirmed">ەۋروپا</territory>
-			<territory type="151" draft="unconfirmed">شىعىس ەۋروپا</territory>
-			<territory type="154" draft="unconfirmed">سولتۇستىك ەۋروپا</territory>
-			<territory type="155" draft="unconfirmed">باتىس ەۋروپا</territory>
-			<territory type="202" draft="unconfirmed">سۋبساحارالىق افريكا</territory>
-			<territory type="419" draft="unconfirmed">لاتىن امەريكا</territory>
-			<territory type="AC" draft="unconfirmed">اسكەنجىن ارالى</territory>
-			<territory type="AD" draft="unconfirmed">اندوررا</territory>
-			<territory type="AE" draft="unconfirmed">بىرىككەن اراب امىرلىكتەرى</territory>
-			<territory type="AF" draft="unconfirmed">اۋعانستان</territory>
-			<territory type="AG" draft="unconfirmed">انتيگۋا جانە باربۋدا</territory>
-			<territory type="AI" draft="unconfirmed">انگيليا</territory>
-			<territory type="AL" draft="unconfirmed">البانيا</territory>
-			<territory type="AM" draft="unconfirmed">ارمەنيا</territory>
-			<territory type="AO" draft="unconfirmed">انگولا</territory>
-			<territory type="AQ" draft="unconfirmed">انتاركتيدا</territory>
-			<territory type="AR" draft="unconfirmed">ارگەنتينا</territory>
-			<territory type="AS" draft="unconfirmed">امەريكالىق ساموا</territory>
-			<territory type="AT" draft="unconfirmed">اۋستريا</territory>
-			<territory type="AU" draft="unconfirmed">اۋستراليا</territory>
-			<territory type="AW" draft="unconfirmed">ارۋبا</territory>
-			<territory type="AX" draft="unconfirmed">الاند ارالدارى</territory>
-			<territory type="AZ" draft="unconfirmed">ءازىربايجان</territory>
-			<territory type="BA" draft="unconfirmed">بوسنيا جانە گەرتسەگوۆينا</territory>
-			<territory type="BB" draft="unconfirmed">باربادوس</territory>
-			<territory type="BD" draft="unconfirmed">بانگلادەش</territory>
-			<territory type="BE" draft="unconfirmed">بەلگيا</territory>
-			<territory type="BF" draft="unconfirmed">بۋركينا-فاسو</territory>
-			<territory type="BG" draft="unconfirmed">بولگاريا</territory>
-			<territory type="BH" draft="unconfirmed">باحرەين</territory>
-			<territory type="BI" draft="unconfirmed">بۋرۋندي</territory>
-			<territory type="BJ" draft="unconfirmed">بەنين</territory>
-			<territory type="BL" draft="unconfirmed">سان-بارتەمەلي</territory>
-			<territory type="BM" draft="unconfirmed">بەرمۋد ارالدارى</territory>
-			<territory type="BN" draft="unconfirmed">برۋنەي</territory>
-			<territory type="BO" draft="unconfirmed">بوليۆيا</territory>
-			<territory type="BQ" draft="unconfirmed">بونەير، سينت-ەستاتيۋس جانە سابا</territory>
-			<territory type="BR" draft="unconfirmed">برازيليا</territory>
-			<territory type="BS" draft="unconfirmed">باگام ارالدارى</territory>
-			<territory type="BT" draft="unconfirmed">بۋتان</territory>
-			<territory type="BV" draft="unconfirmed">بۋۆە ارالى</territory>
-			<territory type="BW" draft="unconfirmed">بوتسۆانا</territory>
-			<territory type="BY" draft="unconfirmed">بەلارۋس</territory>
-			<territory type="BZ" draft="unconfirmed">بەليز</territory>
-			<territory type="CA" draft="unconfirmed">كانادا</territory>
-			<territory type="CC" draft="unconfirmed">كوكوس (كيليڭ) ارالدارى</territory>
-			<territory type="CD" draft="unconfirmed">كونگو</territory>
-			<territory type="CD" alt="variant" draft="unconfirmed">كونگو دەموكراتيالىق رەسپۋبليكاسى</territory>
-			<territory type="CF" draft="unconfirmed">ورتالىق افريكا رەسپۋبليكاسى</territory>
-			<territory type="CG" draft="unconfirmed">كونگو-براززاۆيل رەسپۋبليكاسى</territory>
-			<territory type="CG" alt="variant" draft="unconfirmed">كونگو رەسپۋبليكاسى</territory>
-			<territory type="CH" draft="unconfirmed">شۆەيساريا</territory>
-			<territory type="CI" draft="unconfirmed">كوت-ديۆۋار</territory>
-			<territory type="CK" draft="unconfirmed">كۋك ارالدارى</territory>
-			<territory type="CL" draft="unconfirmed">چيلي</territory>
-			<territory type="CM" draft="unconfirmed">كامەرۋن</territory>
-			<territory type="CN" draft="unconfirmed">قىتاي</territory>
-			<territory type="CO" draft="unconfirmed">كولۋمبيا</territory>
-			<territory type="CP" draft="unconfirmed">كليپپەرتون ارالى</territory>
-			<territory type="CQ" draft="unconfirmed">سارك</territory>
-			<territory type="CR" draft="unconfirmed">كوستا-ريكا</territory>
-			<territory type="CU" draft="unconfirmed">كۋبا</territory>
-			<territory type="CV" draft="unconfirmed">كابو-ۆەردە</territory>
-			<territory type="CW" draft="unconfirmed">كيۋراساو</territory>
-			<territory type="CX" draft="unconfirmed">حريستماس ارالى</territory>
-			<territory type="CY" draft="unconfirmed">كيپر</territory>
-			<territory type="CZ" draft="unconfirmed">چەحيا</territory>
-			<territory type="CZ" alt="variant" draft="unconfirmed">چەح رەسپۋبليكاسى</territory>
-			<territory type="DE" draft="unconfirmed">گەرمانيا</territory>
-			<territory type="DG" draft="unconfirmed">ديەگو-گارسيا</territory>
-			<territory type="DJ" draft="unconfirmed">دجيبۋتي</territory>
-			<territory type="DK" draft="unconfirmed">دانيا</territory>
-			<territory type="DM" draft="unconfirmed">دومينيكا</territory>
-			<territory type="DO" draft="unconfirmed">دومينيكان رەسپۋبليكاسى</territory>
-			<territory type="DZ" draft="unconfirmed">الجىر</territory>
-			<territory type="EA" draft="unconfirmed">سەۋتا جانە مەليليا</territory>
-			<territory type="EC" draft="unconfirmed">ەكۆادور</territory>
-			<territory type="EE" draft="unconfirmed">ەستونيا</territory>
-			<territory type="EG" draft="unconfirmed">مىسىر</territory>
-			<territory type="EH" draft="unconfirmed">باتىس ساحارا</territory>
-			<territory type="ER" draft="unconfirmed">ەريترەيا</territory>
-			<territory type="ES" draft="unconfirmed">يسپانيا</territory>
-			<territory type="ET" draft="unconfirmed">ەفيوپيا</territory>
-			<territory type="EU" draft="unconfirmed">ەۋروپالىق وداق</territory>
-			<territory type="EZ" draft="unconfirmed">ەۋرو ايماق</territory>
-			<territory type="FI" draft="unconfirmed">فينليانديا</territory>
-			<territory type="FJ" draft="unconfirmed">فيجي</territory>
-			<territory type="FK" draft="unconfirmed">فولكلەند ارالدارى</territory>
-			<territory type="FK" alt="variant" draft="unconfirmed">فولكلەند ارالدارى (مالۆين ارالدارى)</territory>
-			<territory type="FM" draft="unconfirmed">ميكرونەزيا</territory>
-			<territory type="FO" draft="unconfirmed">فارەر ارالدارى</territory>
-			<territory type="FR" draft="unconfirmed">فرانسيا</territory>
-			<territory type="GA" draft="unconfirmed">گابون</territory>
-			<territory type="GB" draft="unconfirmed">ۇلىبريتانيا</territory>
-			<territory type="GD" draft="unconfirmed">گرەنادا</territory>
-			<territory type="GE" draft="unconfirmed">گرۋزيا</territory>
-			<territory type="GF" draft="unconfirmed">فرانسۋز گۆياناسى</territory>
-			<territory type="GG" draft="unconfirmed">گەرنسي</territory>
-			<territory type="GH" draft="unconfirmed">گانا</territory>
-			<territory type="GI" draft="unconfirmed">گيبرالتار</territory>
-			<territory type="GL" draft="unconfirmed">گرەنلانديا</territory>
-			<territory type="GM" draft="unconfirmed">گامبيا</territory>
-			<territory type="GN" draft="unconfirmed">گۆەنيا</territory>
-			<territory type="GP" draft="unconfirmed">گۆادەلۋپا</territory>
-			<territory type="GQ" draft="unconfirmed">ەكۆاتورلىق گۆينەيا</territory>
-			<territory type="GR" draft="unconfirmed">گرەكيا</territory>
-			<territory type="GS" draft="unconfirmed">وڭتۇستىك گەورگيا جانە وڭتۇستىك ساندۆيچ ارالدارى</territory>
-			<territory type="GT" draft="unconfirmed">گۆاتەمالا</territory>
-			<territory type="GU" draft="unconfirmed">گۋان</territory>
-			<territory type="GW" draft="unconfirmed">گۆەنيا-بيساۋ</territory>
-			<territory type="GY" draft="unconfirmed">گايانا</territory>
-			<territory type="HK" draft="unconfirmed">حوڭكوڭ</territory>
-			<territory type="HM" draft="unconfirmed">حەرد ارالى جانە ماكدونالد ارالدارى</territory>
-			<territory type="HN" draft="unconfirmed">گوندۋراس</territory>
-			<territory type="HR" draft="unconfirmed">حورۆاتيا</territory>
-			<territory type="HT" draft="unconfirmed">گايتي</territory>
-			<territory type="HU" draft="unconfirmed">ماجارستان</territory>
-			<territory type="IC" draft="unconfirmed">كانار ارالدارى</territory>
-			<territory type="ID" draft="unconfirmed">يندونەزيا</territory>
-			<territory type="IE" draft="unconfirmed">يرلانديا</territory>
-			<territory type="IL" draft="unconfirmed">يزرايل</territory>
-			<territory type="IM" draft="unconfirmed">مەن ارالى</territory>
-			<territory type="IN" draft="unconfirmed">ءۇندىستان</territory>
-			<territory type="IO" draft="unconfirmed">ءۇندى مۇحيتىنداعى بريتان ايماعى</territory>
-			<territory type="IO" alt="chagos" draft="unconfirmed">چاگوس ارحيپەلاگى</territory>
-			<territory type="IQ" draft="unconfirmed">يراك</territory>
-			<territory type="IR" draft="unconfirmed">يران</territory>
-			<territory type="IS" draft="unconfirmed">يسلانديا</territory>
-			<territory type="IT" draft="unconfirmed">يتاليا</territory>
-			<territory type="JE" draft="unconfirmed">جەرسي</territory>
-			<territory type="JM" draft="unconfirmed">يامايكا</territory>
-			<territory type="JO" draft="unconfirmed">يوردانيا</territory>
-			<territory type="JP" draft="unconfirmed">جاپونيا</territory>
-			<territory type="KE" draft="unconfirmed">كەنيا</territory>
-			<territory type="KG" draft="unconfirmed">قىرعىزستان</territory>
-			<territory type="KH" draft="unconfirmed">كامباجا</territory>
-			<territory type="KI" draft="unconfirmed">كيريباتي</territory>
-			<territory type="KM" draft="unconfirmed">كومور ارالدارى</territory>
-			<territory type="KN" draft="unconfirmed">سەنت-كيتس جانە نەۆيس</territory>
-			<territory type="KP" draft="unconfirmed">سولتۇستىك كورەيا</territory>
-			<territory type="KR" draft="unconfirmed">وڭتۇستىك كورەيا</territory>
-			<territory type="KW" draft="unconfirmed">كۋۆەيت</territory>
-			<territory type="KY" draft="unconfirmed">كايمان ارالدارى</territory>
-			<territory type="KZ" draft="unconfirmed">قازاق ەلى</territory>
-			<territory type="LA" draft="unconfirmed">لاوس</territory>
-			<territory type="LB" draft="unconfirmed">ليۆان</territory>
-			<territory type="LC" draft="unconfirmed">سەنت-ليۋسيا</territory>
-			<territory type="LI" draft="unconfirmed">ليحتەنشتەين</territory>
-			<territory type="LK" draft="unconfirmed">شري-لانكا</territory>
-			<territory type="LR" draft="unconfirmed">ليبەريا</territory>
-			<territory type="LS" draft="unconfirmed">لەسوتو</territory>
-			<territory type="LT" draft="unconfirmed">ليتۆا</territory>
-			<territory type="LU" draft="unconfirmed">ليۋكسەمبۋرگ</territory>
-			<territory type="LV" draft="unconfirmed">لاتۆيا</territory>
-			<territory type="LY" draft="unconfirmed">ليۆيا</territory>
-			<territory type="MA" draft="unconfirmed">ماروككو</territory>
-			<territory type="MC" draft="unconfirmed">موناكو</territory>
-			<territory type="MD" draft="unconfirmed">مولدوۆا</territory>
-			<territory type="ME" draft="unconfirmed">چەرنوگوريا</territory>
-			<territory type="MF" draft="unconfirmed">سەن-مارتەن</territory>
-			<territory type="MG" draft="unconfirmed">ماداگاسكار</territory>
-			<territory type="MH" draft="unconfirmed">مارشال ارالدارى</territory>
-			<territory type="MK" draft="unconfirmed">سولتۇستىك ماكەدونيا</territory>
-			<territory type="ML" draft="unconfirmed">مالي</territory>
-			<territory type="MM" draft="unconfirmed">ميانما (بيرما)</territory>
-			<territory type="MN" draft="unconfirmed">موڭعوليا</territory>
-			<territory type="MO" draft="unconfirmed">ماكاو</territory>
-			<territory type="MP" draft="unconfirmed">سولتۇستىك ماريانا ارالدارى</territory>
-			<territory type="MQ" draft="unconfirmed">مارتينيكا</territory>
-			<territory type="MR" draft="unconfirmed">ماۆريتانيا</territory>
-			<territory type="MS" draft="unconfirmed">مونتسەررات</territory>
-			<territory type="MT" draft="unconfirmed">مالتا</territory>
-			<territory type="MU" draft="unconfirmed">ماۆريكي</territory>
-			<territory type="MV" draft="unconfirmed">مالديۆ ارالدارى</territory>
-			<territory type="MW" draft="unconfirmed">مالاۆي</territory>
-			<territory type="MX" draft="unconfirmed">مەكسيكا</territory>
-			<territory type="MY" draft="unconfirmed">مالايزيا</territory>
-			<territory type="MZ" draft="unconfirmed">موزامبيك</territory>
-			<territory type="NA" draft="unconfirmed">ناميبيا</territory>
-			<territory type="NC" draft="unconfirmed">جاڭا كالەدونيا</territory>
-			<territory type="NE" draft="unconfirmed">نيگەر</territory>
-			<territory type="NF" draft="unconfirmed">نورفولك ارالى</territory>
-			<territory type="NG" draft="unconfirmed">نيگەريا</territory>
-			<territory type="NI" draft="unconfirmed">نيكاراگۋا</territory>
-			<territory type="NL" draft="unconfirmed">نيدەرلاند</territory>
-			<territory type="NO" draft="unconfirmed">نورۆەگيا</territory>
-			<territory type="NP" draft="unconfirmed">نەپال</territory>
-			<territory type="NR" draft="unconfirmed">ناۋرۋ</territory>
-			<territory type="NU" draft="unconfirmed">نيۋە</territory>
-			<territory type="NZ" draft="unconfirmed">جاڭا زەلانديا</territory>
-			<territory type="NZ" alt="variant" draft="unconfirmed">اوتەاروا، جاڭا زەلانديا</territory>
-			<territory type="OM" draft="unconfirmed">ومان</territory>
-			<territory type="PA" draft="unconfirmed">پاناما</territory>
-			<territory type="PE" draft="unconfirmed">پەرۋ</territory>
-			<territory type="PF" draft="unconfirmed">فرانتسۋز پولينەزياسى</territory>
-			<territory type="PG" draft="unconfirmed">پاپۋا — جاڭا گۆينەيا</territory>
-			<territory type="PH" draft="unconfirmed">فيليپين ارالدارى</territory>
-			<territory type="PK" draft="unconfirmed">پاكىستان</territory>
-			<territory type="PL" draft="unconfirmed">پولشا</territory>
-			<territory type="PM" draft="unconfirmed">سەن-پەر جانە ميكەلون</territory>
-			<territory type="PN" draft="unconfirmed">پيتكەرن ارالدارى</territory>
-			<territory type="PR" draft="unconfirmed">پۋەرتو-ريكو</territory>
-			<territory type="PS" draft="unconfirmed">پالەستينا ايماقتارى</territory>
-			<territory type="PS" alt="short" draft="unconfirmed">پالەستينا</territory>
-			<territory type="PT" draft="unconfirmed">پورتۋگاليا</territory>
-			<territory type="PW" draft="unconfirmed">پالاۋ</territory>
-			<territory type="PY" draft="unconfirmed">پاراگۆاي</territory>
-			<territory type="QA" draft="unconfirmed">كاتار</territory>
-			<territory type="QO" draft="unconfirmed">سىرتقى وكەانيا</territory>
-			<territory type="RE" draft="unconfirmed">رەيۋنيون</territory>
-			<territory type="RO" draft="unconfirmed">رۋمىنيا</territory>
-			<territory type="RS" draft="unconfirmed">سەربيا</territory>
-			<territory type="RU" draft="unconfirmed">حەسەي</territory>
-			<territory type="RW" draft="unconfirmed">رۋاندا</territory>
-			<territory type="SA" draft="unconfirmed">ساۋد ارابياسى</territory>
-			<territory type="SB" draft="unconfirmed">سولومون ارالدارى</territory>
-			<territory type="SC" draft="unconfirmed">سەيشەل ارالدارى</territory>
-			<territory type="SD" draft="unconfirmed">سۋدان</territory>
-			<territory type="SE" draft="unconfirmed">شۆەسيا</territory>
-			<territory type="SG" draft="unconfirmed">سينگاپۋر</territory>
-			<territory type="SH" draft="unconfirmed">اۋليە ەلەنا ارالى</territory>
-			<territory type="SI" draft="unconfirmed">سلوۆەنيا</territory>
-			<territory type="SJ" draft="unconfirmed">شپيتسبەرگەن جانە يان-مايەن</territory>
-			<territory type="SK" draft="unconfirmed">سلوۆاكيا</territory>
-			<territory type="SL" draft="unconfirmed">سەررا-لەونە</territory>
-			<territory type="SM" draft="unconfirmed">سان-مارينو</territory>
-			<territory type="SN" draft="unconfirmed">سەنەگال</territory>
-			<territory type="SO" draft="unconfirmed">سومالي</territory>
-			<territory type="SR" draft="unconfirmed">سۋرينام</territory>
-			<territory type="SS" draft="unconfirmed">وڭتۇستىك سۋدان</territory>
-			<territory type="ST" draft="unconfirmed">سان-تومە جانە پرينسيپي</territory>
-			<territory type="SV" draft="unconfirmed">سالۆادور</territory>
-			<territory type="SX" draft="unconfirmed">سينت-مارتەن</territory>
-			<territory type="SY" draft="unconfirmed">سيريا</territory>
-			<territory type="SZ" draft="unconfirmed">ەسۆاتيني</territory>
-			<territory type="SZ" alt="variant" draft="unconfirmed">سۆازيلەند</territory>
-			<territory type="TA" draft="unconfirmed">تريستان-دا-كۋنيا</territory>
-			<territory type="TC" draft="unconfirmed">تەركس جانە كايكوس ارالدارى</territory>
-			<territory type="TD" draft="unconfirmed">چاد</territory>
-			<territory type="TF" draft="unconfirmed">فرانتسيانىڭ وڭتۇستىك ايماقتارى</territory>
-			<territory type="TG" draft="unconfirmed">توگو</territory>
-			<territory type="TH" draft="unconfirmed">تايلاند</territory>
-			<territory type="TJ" draft="unconfirmed">تاجىكستان</territory>
-			<territory type="TK" draft="unconfirmed">توكەلاۋ</territory>
-			<territory type="TL" draft="unconfirmed">تيمور-لەستە</territory>
-			<territory type="TL" alt="variant" draft="unconfirmed">شىعىس تيمور</territory>
-			<territory type="TM" draft="unconfirmed">تۇرىكمەنستان</territory>
-			<territory type="TN" draft="unconfirmed">تۋنيس</territory>
-			<territory type="TO" draft="unconfirmed">تونگا</territory>
-			<territory type="TR" draft="unconfirmed">تۇركيا</territory>
-			<territory type="TT" draft="unconfirmed">ترينيداد جانە توباگو</territory>
-			<territory type="TV" draft="unconfirmed">تۋۆالۋ</territory>
-			<territory type="TW" draft="unconfirmed">تايۋان</territory>
-			<territory type="TZ" draft="unconfirmed">تانزانيا</territory>
-			<territory type="UA" draft="unconfirmed">ۋكراينا</territory>
-			<territory type="UG" draft="unconfirmed">ۋگاندا</territory>
-			<territory type="UM" draft="unconfirmed">ا ق ش-تىڭ سىرتقى كىشى ارالدارى</territory>
-			<territory type="UN" draft="unconfirmed">بىرىككەن ۇلتتار ۇيىمى</territory>
-			<territory type="US" draft="unconfirmed">امەريكا قۇراما شتاتتارى</territory>
-			<territory type="US" alt="short" draft="unconfirmed">ا ق ش</territory>
-			<territory type="UY" draft="unconfirmed">ۋرۋگۆاي</territory>
-			<territory type="UZ" draft="unconfirmed">وزبەكستان</territory>
-			<territory type="VA" draft="unconfirmed">ۆاتيكان</territory>
-			<territory type="VC" draft="unconfirmed">سەنت-ۆينسەنت جانە گرەنادين ارالدارى</territory>
-			<territory type="VE" draft="unconfirmed">ۆەنەسۋەلا</territory>
-			<territory type="VG" draft="unconfirmed">بريتاندىق ۆيرگين ارالدارى</territory>
-			<territory type="VI" draft="unconfirmed">ا ق ش-تىڭ ۆيرگين ارالدارى</territory>
-			<territory type="VN" draft="unconfirmed">ۆيەتنام</territory>
-			<territory type="VU" draft="unconfirmed">ۆانۋاتۋ</territory>
-			<territory type="WF" draft="unconfirmed">ۋولليس جانە فۋتۋنا</territory>
-			<territory type="WS" draft="unconfirmed">ساموا</territory>
-			<territory type="XA" draft="unconfirmed">جالعان اكسەنت</territory>
-			<territory type="XB" draft="unconfirmed">جالعان Bidi</territory>
-			<territory type="XK" draft="unconfirmed">كوسوۆو</territory>
-			<territory type="YE" draft="unconfirmed">يەمەن</territory>
-			<territory type="YT" draft="unconfirmed">مايوتتا</territory>
-			<territory type="ZA" draft="unconfirmed">وڭتۇستىك افريكا</territory>
-			<territory type="ZM" draft="unconfirmed">زامبيا</territory>
-			<territory type="ZW" draft="unconfirmed">زيمبابۆە</territory>
-			<territory type="ZZ" draft="unconfirmed">بەلگىسىز ايماق</territory>
+			<territory type="001">الەم</territory>
+			<territory type="002">افريكا</territory>
+			<territory type="003">سولتۇستىك امەريكا</territory>
+			<territory type="005">وڭتۇستىك امەريكا</territory>
+			<territory type="009">وكەانيا</territory>
+			<territory type="011">باتىس افريكا</territory>
+			<territory type="013">ورتالىق امەريكا</territory>
+			<territory type="014">شىعىس افريكا</territory>
+			<territory type="015">سولتۇستىك افريكا</territory>
+			<territory type="017">ورتالىق افريكا</territory>
+			<territory type="018">وڭتۇستىك افريكا ايماعى</territory>
+			<territory type="019">امەريكا</territory>
+			<territory type="021">سولتۇستىك امەريكا (ايماق)</territory>
+			<territory type="029">كاريب</territory>
+			<territory type="030">شىعىس ازيا</territory>
+			<territory type="034">وڭتۇستىك ازيا</territory>
+			<territory type="035">وڭتۇستىك-شىعىس ازيا</territory>
+			<territory type="039">وڭتۇستىك ەۋروپا</territory>
+			<territory type="053">اۋسترالازيا</territory>
+			<territory type="054">مەلانەزيا</territory>
+			<territory type="057">ميكرونەزيا ايماعى</territory>
+			<territory type="061">پولينەزىا</territory>
+			<territory type="142">ازيا</territory>
+			<territory type="143">ورتالىق ازيا</territory>
+			<territory type="145">باتىس ازيا</territory>
+			<territory type="150">ەۋروپا</territory>
+			<territory type="151">شىعىس ەۋروپا</territory>
+			<territory type="154">سولتۇستىك ەۋروپا</territory>
+			<territory type="155">باتىس ەۋروپا</territory>
+			<territory type="202">سۋبساحارالىق افريكا</territory>
+			<territory type="419">لاتىن امەريكا</territory>
+			<territory type="AC">اسكەنجىن ارالى</territory>
+			<territory type="AD">اندوررا</territory>
+			<territory type="AE">بىرىككەن اراب امىرلىكتەرى</territory>
+			<territory type="AF">اۋعانستان</territory>
+			<territory type="AG">انتيگۋا جانە باربۋدا</territory>
+			<territory type="AI">انگيليا</territory>
+			<territory type="AL">البانيا</territory>
+			<territory type="AM">ارمەنيا</territory>
+			<territory type="AO">انگولا</territory>
+			<territory type="AQ">انتاركتيدا</territory>
+			<territory type="AR">ارگەنتينا</territory>
+			<territory type="AS">امەريكالىق ساموا</territory>
+			<territory type="AT">اۋستريا</territory>
+			<territory type="AU">اۋستراليا</territory>
+			<territory type="AW">ارۋبا</territory>
+			<territory type="AX">الاند ارالدارى</territory>
+			<territory type="AZ">ءازىربايجان</territory>
+			<territory type="BA">بوسنيا جانە گەرتسەگوۆينا</territory>
+			<territory type="BB">باربادوس</territory>
+			<territory type="BD">بانگلادەش</territory>
+			<territory type="BE">بەلگيا</territory>
+			<territory type="BF">بۋركينا-فاسو</territory>
+			<territory type="BG">بولگاريا</territory>
+			<territory type="BH">باحرەين</territory>
+			<territory type="BI">بۋرۋندي</territory>
+			<territory type="BJ">بەنين</territory>
+			<territory type="BL">سان-بارتەمەلي</territory>
+			<territory type="BM">بەرمۋد ارالدارى</territory>
+			<territory type="BN">برۋنەي</territory>
+			<territory type="BO">بوليۆيا</territory>
+			<territory type="BQ">بونەير، سينت-ەستاتيۋس جانە سابا</territory>
+			<territory type="BR">برازيليا</territory>
+			<territory type="BS">باگام ارالدارى</territory>
+			<territory type="BT">بۋتان</territory>
+			<territory type="BV">بۋۆە ارالى</territory>
+			<territory type="BW">بوتسۆانا</territory>
+			<territory type="BY">بەلارۋس</territory>
+			<territory type="BZ">بەليز</territory>
+			<territory type="CA">كانادا</territory>
+			<territory type="CC">كوكوس (كيليڭ) ارالدارى</territory>
+			<territory type="CD">كونگو</territory>
+			<territory type="CD" alt="variant">كونگو دەموكراتيالىق رەسپۋبليكاسى</territory>
+			<territory type="CF">ورتالىق افريكا رەسپۋبليكاسى</territory>
+			<territory type="CG">كونگو-براززاۆيل رەسپۋبليكاسى</territory>
+			<territory type="CG" alt="variant">كونگو رەسپۋبليكاسى</territory>
+			<territory type="CH">شۆەيساريا</territory>
+			<territory type="CI">كوت-ديۆۋار</territory>
+			<territory type="CK">كۋك ارالدارى</territory>
+			<territory type="CL">چيلي</territory>
+			<territory type="CM">كامەرۋن</territory>
+			<territory type="CN">قىتاي</territory>
+			<territory type="CO">كولۋمبيا</territory>
+			<territory type="CP">كليپپەرتون ارالى</territory>
+			<territory type="CQ">سارك</territory>
+			<territory type="CR">كوستا-ريكا</territory>
+			<territory type="CU">كۋبا</territory>
+			<territory type="CV">كابو-ۆەردە</territory>
+			<territory type="CW">كيۋراساو</territory>
+			<territory type="CX">حريستماس ارالى</territory>
+			<territory type="CY">كيپر</territory>
+			<territory type="CZ">چەحيا</territory>
+			<territory type="CZ" alt="variant">چەح رەسپۋبليكاسى</territory>
+			<territory type="DE">گەرمانيا</territory>
+			<territory type="DG">ديەگو-گارسيا</territory>
+			<territory type="DJ">دجيبۋتي</territory>
+			<territory type="DK">دانيا</territory>
+			<territory type="DM">دومينيكا</territory>
+			<territory type="DO">دومينيكان رەسپۋبليكاسى</territory>
+			<territory type="DZ">الجىر</territory>
+			<territory type="EA">سەۋتا جانە مەليليا</territory>
+			<territory type="EC">ەكۆادور</territory>
+			<territory type="EE">ەستونيا</territory>
+			<territory type="EG">مىسىر</territory>
+			<territory type="EH">باتىس ساحارا</territory>
+			<territory type="ER">ەريترەيا</territory>
+			<territory type="ES">يسپانيا</territory>
+			<territory type="ET">ەفيوپيا</territory>
+			<territory type="EU">ەۋروپالىق وداق</territory>
+			<territory type="EZ">ەۋرو ايماق</territory>
+			<territory type="FI">فينليانديا</territory>
+			<territory type="FJ">فيجي</territory>
+			<territory type="FK">فولكلەند ارالدارى</territory>
+			<territory type="FK" alt="variant">فولكلەند ارالدارى (مالۆين ارالدارى)</territory>
+			<territory type="FM">ميكرونەزيا</territory>
+			<territory type="FO">فارەر ارالدارى</territory>
+			<territory type="FR">فرانسيا</territory>
+			<territory type="GA">گابون</territory>
+			<territory type="GB">ۇلىبريتانيا</territory>
+			<territory type="GD">گرەنادا</territory>
+			<territory type="GE">گرۋزيا</territory>
+			<territory type="GF">فرانسۋز گۆياناسى</territory>
+			<territory type="GG">گەرنسي</territory>
+			<territory type="GH">گانا</territory>
+			<territory type="GI">گيبرالتار</territory>
+			<territory type="GL">گرەنلانديا</territory>
+			<territory type="GM">گامبيا</territory>
+			<territory type="GN">گۆەنيا</territory>
+			<territory type="GP">گۆادەلۋپا</territory>
+			<territory type="GQ">ەكۆاتورلىق گۆينەيا</territory>
+			<territory type="GR">گرەكيا</territory>
+			<territory type="GS">وڭتۇستىك گەورگيا جانە وڭتۇستىك ساندۆيچ ارالدارى</territory>
+			<territory type="GT">گۆاتەمالا</territory>
+			<territory type="GU">گۋان</territory>
+			<territory type="GW">گۆەنيا-بيساۋ</territory>
+			<territory type="GY">گايانا</territory>
+			<territory type="HK">حوڭكوڭ</territory>
+			<territory type="HM">حەرد ارالى جانە ماكدونالد ارالدارى</territory>
+			<territory type="HN">گوندۋراس</territory>
+			<territory type="HR">حورۆاتيا</territory>
+			<territory type="HT">گايتي</territory>
+			<territory type="HU">ماجارستان</territory>
+			<territory type="IC">كانار ارالدارى</territory>
+			<territory type="ID">يندونەزيا</territory>
+			<territory type="IE">يرلانديا</territory>
+			<territory type="IL">يزرايل</territory>
+			<territory type="IM">مەن ارالى</territory>
+			<territory type="IN">ءۇندىستان</territory>
+			<territory type="IO">ءۇندى مۇحيتىنداعى بريتان ايماعى</territory>
+			<territory type="IO" alt="chagos">چاگوس ارحيپەلاگى</territory>
+			<territory type="IQ">يراك</territory>
+			<territory type="IR">يران</territory>
+			<territory type="IS">يسلانديا</territory>
+			<territory type="IT">يتاليا</territory>
+			<territory type="JE">جەرسي</territory>
+			<territory type="JM">يامايكا</territory>
+			<territory type="JO">يوردانيا</territory>
+			<territory type="JP">جاپونيا</territory>
+			<territory type="KE">كەنيا</territory>
+			<territory type="KG">قىرعىزستان</territory>
+			<territory type="KH">كامباجا</territory>
+			<territory type="KI">كيريباتي</territory>
+			<territory type="KM">كومور ارالدارى</territory>
+			<territory type="KN">سەنت-كيتس جانە نەۆيس</territory>
+			<territory type="KP">سولتۇستىك كورەيا</territory>
+			<territory type="KR">وڭتۇستىك كورەيا</territory>
+			<territory type="KW">كۋۆەيت</territory>
+			<territory type="KY">كايمان ارالدارى</territory>
+			<territory type="KZ">قازاق ەلى</territory>
+			<territory type="LA">لاوس</territory>
+			<territory type="LB">ليۆان</territory>
+			<territory type="LC">سەنت-ليۋسيا</territory>
+			<territory type="LI">ليحتەنشتەين</territory>
+			<territory type="LK">شري-لانكا</territory>
+			<territory type="LR">ليبەريا</territory>
+			<territory type="LS">لەسوتو</territory>
+			<territory type="LT">ليتۆا</territory>
+			<territory type="LU">ليۋكسەمبۋرگ</territory>
+			<territory type="LV">لاتۆيا</territory>
+			<territory type="LY">ليۆيا</territory>
+			<territory type="MA">ماروككو</territory>
+			<territory type="MC">موناكو</territory>
+			<territory type="MD">مولدوۆا</territory>
+			<territory type="ME">چەرنوگوريا</territory>
+			<territory type="MF">سەن-مارتەن</territory>
+			<territory type="MG">ماداگاسكار</territory>
+			<territory type="MH">مارشال ارالدارى</territory>
+			<territory type="MK">سولتۇستىك ماكەدونيا</territory>
+			<territory type="ML">مالي</territory>
+			<territory type="MM">ميانما (بيرما)</territory>
+			<territory type="MN">موڭعوليا</territory>
+			<territory type="MO">ماكاو</territory>
+			<territory type="MP">سولتۇستىك ماريانا ارالدارى</territory>
+			<territory type="MQ">مارتينيكا</territory>
+			<territory type="MR">ماۆريتانيا</territory>
+			<territory type="MS">مونتسەررات</territory>
+			<territory type="MT">مالتا</territory>
+			<territory type="MU">ماۆريكي</territory>
+			<territory type="MV">مالديۆ ارالدارى</territory>
+			<territory type="MW">مالاۆي</territory>
+			<territory type="MX">مەكسيكا</territory>
+			<territory type="MY">مالايزيا</territory>
+			<territory type="MZ">موزامبيك</territory>
+			<territory type="NA">ناميبيا</territory>
+			<territory type="NC">جاڭا كالەدونيا</territory>
+			<territory type="NE">نيگەر</territory>
+			<territory type="NF">نورفولك ارالى</territory>
+			<territory type="NG">نيگەريا</territory>
+			<territory type="NI">نيكاراگۋا</territory>
+			<territory type="NL">نيدەرلاند</territory>
+			<territory type="NO">نورۆەگيا</territory>
+			<territory type="NP">نەپال</territory>
+			<territory type="NR">ناۋرۋ</territory>
+			<territory type="NU">نيۋە</territory>
+			<territory type="NZ">جاڭا زەلانديا</territory>
+			<territory type="NZ" alt="variant">اوتەاروا، جاڭا زەلانديا</territory>
+			<territory type="OM">ومان</territory>
+			<territory type="PA">پاناما</territory>
+			<territory type="PE">پەرۋ</territory>
+			<territory type="PF">فرانتسۋز پولينەزياسى</territory>
+			<territory type="PG">پاپۋا — جاڭا گۆينەيا</territory>
+			<territory type="PH">فيليپين ارالدارى</territory>
+			<territory type="PK">پاكىستان</territory>
+			<territory type="PL">پولشا</territory>
+			<territory type="PM">سەن-پەر جانە ميكەلون</territory>
+			<territory type="PN">پيتكەرن ارالدارى</territory>
+			<territory type="PR">پۋەرتو-ريكو</territory>
+			<territory type="PS">پالەستينا ايماقتارى</territory>
+			<territory type="PS" alt="short">پالەستينا</territory>
+			<territory type="PT">پورتۋگاليا</territory>
+			<territory type="PW">پالاۋ</territory>
+			<territory type="PY">پاراگۆاي</territory>
+			<territory type="QA">كاتار</territory>
+			<territory type="QO">سىرتقى وكەانيا</territory>
+			<territory type="RE">رەيۋنيون</territory>
+			<territory type="RO">رۋمىنيا</territory>
+			<territory type="RS">سەربيا</territory>
+			<territory type="RU">حەسەي</territory>
+			<territory type="RW">رۋاندا</territory>
+			<territory type="SA">ساۋد ارابياسى</territory>
+			<territory type="SB">سولومون ارالدارى</territory>
+			<territory type="SC">سەيشەل ارالدارى</territory>
+			<territory type="SD">سۋدان</territory>
+			<territory type="SE">شۆەسيا</territory>
+			<territory type="SG">سينگاپۋر</territory>
+			<territory type="SH">اۋليە ەلەنا ارالى</territory>
+			<territory type="SI">سلوۆەنيا</territory>
+			<territory type="SJ">شپيتسبەرگەن جانە يان-مايەن</territory>
+			<territory type="SK">سلوۆاكيا</territory>
+			<territory type="SL">سەررا-لەونە</territory>
+			<territory type="SM">سان-مارينو</territory>
+			<territory type="SN">سەنەگال</territory>
+			<territory type="SO">سومالي</territory>
+			<territory type="SR">سۋرينام</territory>
+			<territory type="SS">وڭتۇستىك سۋدان</territory>
+			<territory type="ST">سان-تومە جانە پرينسيپي</territory>
+			<territory type="SV">سالۆادور</territory>
+			<territory type="SX">سينت-مارتەن</territory>
+			<territory type="SY">سيريا</territory>
+			<territory type="SZ">ەسۆاتيني</territory>
+			<territory type="SZ" alt="variant">سۆازيلەند</territory>
+			<territory type="TA">تريستان-دا-كۋنيا</territory>
+			<territory type="TC">تەركس جانە كايكوس ارالدارى</territory>
+			<territory type="TD">چاد</territory>
+			<territory type="TF">فرانتسيانىڭ وڭتۇستىك ايماقتارى</territory>
+			<territory type="TG">توگو</territory>
+			<territory type="TH">تايلاند</territory>
+			<territory type="TJ">تاجىكستان</territory>
+			<territory type="TK">توكەلاۋ</territory>
+			<territory type="TL">تيمور-لەستە</territory>
+			<territory type="TL" alt="variant">شىعىس تيمور</territory>
+			<territory type="TM">تۇرىكمەنستان</territory>
+			<territory type="TN">تۋنيس</territory>
+			<territory type="TO">تونگا</territory>
+			<territory type="TR">تۇركيا</territory>
+			<territory type="TT">ترينيداد جانە توباگو</territory>
+			<territory type="TV">تۋۆالۋ</territory>
+			<territory type="TW">تايۋان</territory>
+			<territory type="TZ">تانزانيا</territory>
+			<territory type="UA">ۋكراينا</territory>
+			<territory type="UG">ۋگاندا</territory>
+			<territory type="UM">ا ق ش-تىڭ سىرتقى كىشى ارالدارى</territory>
+			<territory type="UN">بىرىككەن ۇلتتار ۇيىمى</territory>
+			<territory type="US">امەريكا قۇراما شتاتتارى</territory>
+			<territory type="US" alt="short">ا ق ش</territory>
+			<territory type="UY">ۋرۋگۆاي</territory>
+			<territory type="UZ">وزبەكستان</territory>
+			<territory type="VA">ۆاتيكان</territory>
+			<territory type="VC">سەنت-ۆينسەنت جانە گرەنادين ارالدارى</territory>
+			<territory type="VE">ۆەنەسۋەلا</territory>
+			<territory type="VG">بريتاندىق ۆيرگين ارالدارى</territory>
+			<territory type="VI">ا ق ش-تىڭ ۆيرگين ارالدارى</territory>
+			<territory type="VN">ۆيەتنام</territory>
+			<territory type="VU">ۆانۋاتۋ</territory>
+			<territory type="WF">ۋولليس جانە فۋتۋنا</territory>
+			<territory type="WS">ساموا</territory>
+			<territory type="XA">جالعان اكسەنت</territory>
+			<territory type="XB">بالعان بيدي</territory>
+			<territory type="XK">كوسوۆو</territory>
+			<territory type="YE">يەمەن</territory>
+			<territory type="YT">مايوتتا</territory>
+			<territory type="ZA">وڭتۇستىك افريكا</territory>
+			<territory type="ZM">زامبيا</territory>
+			<territory type="ZW">زيمبابۆە</territory>
+			<territory type="ZZ">بەلگىسىز ايماق</territory>
 		</territories>
 		<variants>
-			<variant type="1901" draft="unconfirmed">ءداستۇرلى نەمىس جازۋى</variant>
-			<variant type="1994" draft="unconfirmed">ستاندارتتى رەزيا جازۋى</variant>
-			<variant type="1996" draft="unconfirmed">1996 جىلعا دەيىنگى نەمىس جازۋى</variant>
-			<variant type="1606NICT" draft="unconfirmed">1606 جىلعا دەيىنگى بەرگى ورتا فرانتسۋز ءتىلى</variant>
-			<variant type="1694ACAD" draft="unconfirmed">ەرتە ورتا فرانتسۋز ءتىلى</variant>
-			<variant type="1959ACAD" draft="unconfirmed">اكادەميالىق</variant>
-			<variant type="ABL1943" draft="unconfirmed">1943 جىلعى جازۋدىڭ قالىپتاسۋى</variant>
-			<variant type="AKUAPEM" draft="unconfirmed">اكۋاپەم</variant>
-			<variant type="ALALC97" draft="unconfirmed">ALA-LC رومانيزاتسياسى، 1997 جىلعى نۇسقا</variant>
-			<variant type="ALUKU" draft="unconfirmed">الۋكۋ ديالەكتىسى</variant>
-			<variant type="ANPEZO" draft="unconfirmed">انپەزو</variant>
-			<variant type="AO1990" draft="unconfirmed">پورتۋگال ءتىلىنىڭ 1990 جىلعى جازۋ كەلىسىمى</variant>
-			<variant type="ARANES" draft="unconfirmed">اران</variant>
-			<variant type="ARKAIKA" draft="unconfirmed">شىعىس ارميان</variant>
-			<variant type="ASANTE" draft="unconfirmed">باتىس ارميان</variant>
-			<variant type="AUVERN" draft="unconfirmed">وۆەرن</variant>
-			<variant type="BAKU1926" draft="unconfirmed">جالپى تۇركى ءالىپبيى</variant>
-			<variant type="BALANKA" draft="unconfirmed">انيي بالانكا ديالەكتىسى</variant>
-			<variant type="BARLA" draft="unconfirmed">كابۋۆەرديانۋ بارلاۆەنتو ديالەكت توبى</variant>
-			<variant type="BASICENG" draft="unconfirmed">بەيسيك-ەنگليش</variant>
-			<variant type="BAUDDHA" draft="unconfirmed">باددا</variant>
-			<variant type="BCIAV" draft="unconfirmed">بسياۆ</variant>
-			<variant type="BCIZBL" draft="unconfirmed">بسيزبل</variant>
-			<variant type="BISCAYAN" draft="unconfirmed">بيسكاي</variant>
-			<variant type="BISKE" draft="unconfirmed">سان-جورجو/ديلا ديالەكتىسى</variant>
-			<variant type="BLASL" draft="unconfirmed">بلاسل</variant>
-			<variant type="BOHORIC" draft="unconfirmed">بوحوريچا ءالىپبيى</variant>
-			<variant type="BOONT" draft="unconfirmed">بۋنتلينگ</variant>
-			<variant type="BORNHOLM" draft="unconfirmed">بورنحولم</variant>
-			<variant type="CISAUP" draft="unconfirmed">سيزاۋپ</variant>
-			<variant type="COLB1945" draft="unconfirmed">1945 جىلعى برازيليالىق پورتۋگال ءتىلى كونۆەنتسياسى</variant>
-			<variant type="CORNU" draft="unconfirmed">كورنۋ</variant>
-			<variant type="CREISS" draft="unconfirmed">كرەيس</variant>
-			<variant type="DAJNKO" draft="unconfirmed">داينكو ءالىپبيى</variant>
-			<variant type="EKAVSK" draft="unconfirmed">سەرب ءتىلىنىڭ ەكاۆ ايتىلىمى</variant>
-			<variant type="EMODENG" draft="unconfirmed">ەرتە ورتا اعىلشىن ءتىلى</variant>
-			<variant type="FASCIA" draft="unconfirmed">فاسكيا</variant>
-			<variant type="FODOM" draft="unconfirmed">فودوم</variant>
-			<variant type="FONIPA" draft="unconfirmed">حالىقارالىق فونەتيكالىق ءالىپبي</variant>
-			<variant type="FONKIRSH" draft="unconfirmed">فونكيرش</variant>
-			<variant type="FONNAPA" draft="unconfirmed">فونناپا</variant>
-			<variant type="FONUPA" draft="unconfirmed">ورال فونەتيكالىق ءالىپبي</variant>
-			<variant type="FONXSAMP" draft="unconfirmed">فونكسامپ</variant>
-			<variant type="GALLO" draft="unconfirmed">گاللو</variant>
-			<variant type="GASCON" draft="unconfirmed">گاسكون</variant>
-			<variant type="GHERD" draft="unconfirmed">گحەرد</variant>
-			<variant type="GRCLASS" draft="unconfirmed">گ ر ك ل ا س س</variant>
-			<variant type="GRITAL" draft="unconfirmed">گريتال</variant>
-			<variant type="GRMISTR" draft="unconfirmed">گ ر م ي س ت ر</variant>
-			<variant type="HEPBURN" draft="unconfirmed">حەپبيورن جۇيەسى</variant>
-			<variant type="HOGNORSK" draft="unconfirmed">حەگنورسك</variant>
-			<variant type="HSISTEMO" draft="unconfirmed">ح جۇيەسى</variant>
-			<variant type="IJEKAVSK" draft="unconfirmed">سەرب ءتىلىنىڭ يەكاۆ ايتىلىمى</variant>
-			<variant type="ITIHASA" draft="unconfirmed">يتيحاسا</variant>
-			<variant type="IVANCHOV" draft="unconfirmed">يۆانچوۆ</variant>
-			<variant type="JAUER" draft="unconfirmed">ياۋەر</variant>
-			<variant type="JYUTPING" draft="unconfirmed">يۋتپيڭ</variant>
-			<variant type="KKCOR" draft="unconfirmed">جالپى جازۋ</variant>
-			<variant type="KOCIEWIE" draft="unconfirmed">كوچەۋە</variant>
-			<variant type="KSCOR" draft="unconfirmed">ستاندارتتى جازۋ</variant>
-			<variant type="LAUKIKA" draft="unconfirmed">لاۋكيكا</variant>
-			<variant type="LEMOSIN" draft="unconfirmed">ليمۋزەن</variant>
-			<variant type="LENGADOC" draft="unconfirmed">لانگەدوك</variant>
-			<variant type="LIPAW" draft="unconfirmed">رەزيا ءتىلىنىڭ ليپوۆاز ديالەكتىسى</variant>
-			<variant type="LTG1929" draft="unconfirmed">لتگ1929</variant>
-			<variant type="LTG2007" draft="unconfirmed">لتگ2007</variant>
-			<variant type="LUNA1918" draft="unconfirmed">لۋنا1998</variant>
-			<variant type="METELKO" draft="unconfirmed">مەتەلكو</variant>
-			<variant type="MONOTON" draft="unconfirmed">مونوتوندى</variant>
-			<variant type="NDYUKA" draft="unconfirmed">نديۋكا</variant>
-			<variant type="NEDIS" draft="unconfirmed">ناتيسون ديالەكتىسى</variant>
-			<variant type="NEWFOUND" draft="unconfirmed">نيۋفاۋند</variant>
-			<variant type="NICARD" draft="unconfirmed">نيكارد</variant>
-			<variant type="NJIVA" draft="unconfirmed">گنيۆا/نجيۆا ديالەكتىسى</variant>
-			<variant type="NULIK" draft="unconfirmed">زاماناۋي ۆولاپيۋك</variant>
-			<variant type="OSOJS" draft="unconfirmed">وسەاككو/وسوجانە ديالەكتىسى</variant>
-			<variant type="OXENDICT" draft="unconfirmed">اعىلشىن ءتىلىنىڭ وكسفورد سوزدىگىندەگى ەملەسى</variant>
-			<variant type="PAHAWH2" draft="unconfirmed">پاحاۋح2</variant>
-			<variant type="PAHAWH3" draft="unconfirmed">پاحاۋح3</variant>
-			<variant type="PAHAWH4" draft="unconfirmed">پاحاۋح4</variant>
-			<variant type="PAMAKA" draft="unconfirmed">پاماكا ديالەكتىسى</variant>
-			<variant type="PEANO" draft="unconfirmed">پەانو</variant>
-			<variant type="PEHOEJI" draft="unconfirmed">پەحوەيي</variant>
-			<variant type="PETR1708" draft="unconfirmed">پەتر1708</variant>
-			<variant type="PINYIN" draft="unconfirmed">پينين رومانيزاسياسى</variant>
-			<variant type="POLYTON" draft="unconfirmed">پوليتوندى</variant>
-			<variant type="POSIX" draft="unconfirmed">كومپيۋتەر</variant>
-			<variant type="PROVENC" draft="unconfirmed">پروۆانس</variant>
-			<variant type="PUTER" draft="unconfirmed">پۋتەر</variant>
-			<variant type="REVISED" draft="unconfirmed">قايتا قارالعان جازۋ</variant>
-			<variant type="RIGIK" draft="unconfirmed">كلاسسيكالىق ۆولاپيۋك</variant>
-			<variant type="ROZAJ" draft="unconfirmed">رەزيا</variant>
-			<variant type="RUMGR" draft="unconfirmed">رۋمگر</variant>
-			<variant type="SAAHO" draft="unconfirmed">ساحو</variant>
-			<variant type="SCOTLAND" draft="unconfirmed">شوتلانديانىڭ ستاندارتتى اعىلشىن ءتىلى</variant>
-			<variant type="SCOUSE" draft="unconfirmed">سكاۋس</variant>
-			<variant type="SIMPLE" draft="unconfirmed">قاراپايىم</variant>
-			<variant type="SOLBA" draft="unconfirmed">ستولۆيتسا/سولبيكا ديالەكتىسى</variant>
-			<variant type="SOTAV" draft="unconfirmed">كابۋۆەرديانۋدىڭ سوتاۆەنتو ديالەكت توبى</variant>
-			<variant type="SPANGLIS" draft="unconfirmed">سپانگليش</variant>
-			<variant type="SURMIRAN" draft="unconfirmed">سۋرميران</variant>
-			<variant type="SURSILV" draft="unconfirmed">سۋرسيلۆ</variant>
-			<variant type="SUTSILV" draft="unconfirmed">سۋتسيلۆ</variant>
-			<variant type="SYNNEJYL" draft="unconfirmed">سيننەجيل</variant>
-			<variant type="TAILO" draft="unconfirmed">تايلو</variant>
-			<variant type="TARASK" draft="unconfirmed">تاراشكەۆيتسا</variant>
-			<variant type="TONGYONG" draft="unconfirmed">توڭيوڭ</variant>
-			<variant type="TUNUMIIT" draft="unconfirmed">تۋنۋمييت</variant>
-			<variant type="UCCOR" draft="unconfirmed">بىرىڭعاي جازۋ</variant>
-			<variant type="UCRCOR" draft="unconfirmed">بىرىڭعاي قايتا قارالعان جازۋ</variant>
-			<variant type="ULSTER" draft="unconfirmed">ولستەر</variant>
-			<variant type="UNIFON" draft="unconfirmed">يۋنيفون فونەتيكالىق ءالىپبيى</variant>
-			<variant type="VAIDIKA" draft="unconfirmed">ۆايديكا</variant>
-			<variant type="VALBADIA" draft="unconfirmed">ۆالباديا</variant>
-			<variant type="VALENCIA" draft="unconfirmed">ۆالەنسيا</variant>
-			<variant type="VALLADER" draft="unconfirmed">ۆاللادەر</variant>
-			<variant type="VECDRUKA" draft="unconfirmed">ۆەچدرۋكا</variant>
-			<variant type="VIVARAUP" draft="unconfirmed">ۆيۆارو-ءالپى</variant>
-			<variant type="WADEGILE" draft="unconfirmed">ۋەيد-جايىلس جۇيەسى</variant>
-			<variant type="XSISTEMO" draft="unconfirmed">X جۇيەسى</variant>
+			<variant type="1901">ءداستۇرلى نەمىس جازۋى</variant>
+			<variant type="1994">ستاندارتتى رەزيا جازۋى</variant>
+			<variant type="1996">1996 جىلعا دەيىنگى نەمىس جازۋى</variant>
+			<variant type="1606NICT">1606 جىلعا دەيىنگى بەرگى ورتا فرانتسۋز ءتىلى</variant>
+			<variant type="1694ACAD">ەرتە ورتا فرانتسۋز ءتىلى</variant>
+			<variant type="1959ACAD">اكادەميالىق</variant>
+			<variant type="ABL1943">1943 جىلعى جازۋدىڭ قالىپتاسۋى</variant>
+			<variant type="AKUAPEM">اكۋاپەم</variant>
+			<variant type="ALALC97">ALA-LC رومانيزاتسياسى، 1997 جىلعى نۇسقا</variant>
+			<variant type="ALUKU">الۋكۋ ديالەكتىسى</variant>
+			<variant type="ANPEZO">انپەزو</variant>
+			<variant type="AO1990">پورتۋگال ءتىلىنىڭ 1990 جىلعى جازۋ كەلىسىمى</variant>
+			<variant type="ARANES">اران</variant>
+			<variant type="ARKAIKA">شىعىس ارميان</variant>
+			<variant type="ASANTE">باتىس ارميان</variant>
+			<variant type="AUVERN">وۆەرن</variant>
+			<variant type="BAKU1926">جالپى تۇركى ءالىپبيى</variant>
+			<variant type="BALANKA">انيي بالانكا ديالەكتىسى</variant>
+			<variant type="BARLA">كابۋۆەرديانۋ بارلاۆەنتو ديالەكت توبى</variant>
+			<variant type="BASICENG">بەيسيك-ەنگليش</variant>
+			<variant type="BAUDDHA">باددا</variant>
+			<variant type="BCIAV">بسياۆ</variant>
+			<variant type="BCIZBL">بسيزبل</variant>
+			<variant type="BISCAYAN">بيسكاي</variant>
+			<variant type="BISKE">سان-جورجو/ديلا ديالەكتىسى</variant>
+			<variant type="BLASL">بلاسل</variant>
+			<variant type="BOHORIC">بوحوريچا ءالىپبيى</variant>
+			<variant type="BOONT">بۋنتلينگ</variant>
+			<variant type="BORNHOLM">بورنحولم</variant>
+			<variant type="CISAUP">سيزاۋپ</variant>
+			<variant type="COLB1945">1945 جىلعى برازيليالىق پورتۋگال ءتىلى كونۆەنتسياسى</variant>
+			<variant type="CORNU">كورنۋ</variant>
+			<variant type="CREISS">كرەيس</variant>
+			<variant type="DAJNKO">داينكو ءالىپبيى</variant>
+			<variant type="EKAVSK">سەرب ءتىلىنىڭ ەكاۆ ايتىلىمى</variant>
+			<variant type="EMODENG">ەرتە ورتا اعىلشىن ءتىلى</variant>
+			<variant type="FASCIA">فاسكيا</variant>
+			<variant type="FODOM">فودوم</variant>
+			<variant type="FONIPA">حالىقارالىق فونەتيكالىق ءالىپبي</variant>
+			<variant type="FONKIRSH">فونكيرش</variant>
+			<variant type="FONNAPA">فونناپا</variant>
+			<variant type="FONUPA">ورال فونەتيكالىق ءالىپبي</variant>
+			<variant type="FONXSAMP">فونكسامپ</variant>
+			<variant type="GALLO">گاللو</variant>
+			<variant type="GASCON">گاسكون</variant>
+			<variant type="GHERD">گحەرد</variant>
+			<variant type="GRCLASS">گ ر ك ل ا س س</variant>
+			<variant type="GRITAL">گريتال</variant>
+			<variant type="GRMISTR">گ ر م ي س ت ر</variant>
+			<variant type="HEPBURN">حەپبيورن جۇيەسى</variant>
+			<variant type="HOGNORSK">حەگنورسك</variant>
+			<variant type="HSISTEMO">ح جۇيەسى</variant>
+			<variant type="IJEKAVSK">سەرب ءتىلىنىڭ يەكاۆ ايتىلىمى</variant>
+			<variant type="ITIHASA">يتيحاسا</variant>
+			<variant type="IVANCHOV">يۆانچوۆ</variant>
+			<variant type="JAUER">ياۋەر</variant>
+			<variant type="JYUTPING">يۋتپيڭ</variant>
+			<variant type="KKCOR">جالپى جازۋ</variant>
+			<variant type="KOCIEWIE">كوچەۋە</variant>
+			<variant type="KSCOR">ستاندارتتى جازۋ</variant>
+			<variant type="LAUKIKA">لاۋكيكا</variant>
+			<variant type="LEMOSIN">ليمۋزەن</variant>
+			<variant type="LENGADOC">لانگەدوك</variant>
+			<variant type="LIPAW">رەزيا ءتىلىنىڭ ليپوۆاز ديالەكتىسى</variant>
+			<variant type="LTG1929">لتگ1929</variant>
+			<variant type="LTG2007">لتگ2007</variant>
+			<variant type="LUNA1918">لۋنا1998</variant>
+			<variant type="METELKO">مەتەلكو</variant>
+			<variant type="MONOTON">مونوتوندى</variant>
+			<variant type="NDYUKA">نديۋكا</variant>
+			<variant type="NEDIS">ناتيسون ديالەكتىسى</variant>
+			<variant type="NEWFOUND">نيۋفاۋند</variant>
+			<variant type="NICARD">نيكارد</variant>
+			<variant type="NJIVA">گنيۆا/نجيۆا ديالەكتىسى</variant>
+			<variant type="NULIK">زاماناۋي ۆولاپيۋك</variant>
+			<variant type="OSOJS">وسەاككو/وسوجانە ديالەكتىسى</variant>
+			<variant type="OXENDICT">اعىلشىن ءتىلىنىڭ وكسفورد سوزدىگىندەگى ەملەسى</variant>
+			<variant type="PAHAWH2">پاحاۋح2</variant>
+			<variant type="PAHAWH3">پاحاۋح3</variant>
+			<variant type="PAHAWH4">پاحاۋح4</variant>
+			<variant type="PAMAKA">پاماكا ديالەكتىسى</variant>
+			<variant type="PEANO">پەانو</variant>
+			<variant type="PEHOEJI">پەحوەيي</variant>
+			<variant type="PETR1708">پەتر1708</variant>
+			<variant type="PINYIN">پينين رومانيزاسياسى</variant>
+			<variant type="POLYTON">پوليتوندى</variant>
+			<variant type="POSIX">كومپيۋتەر</variant>
+			<variant type="PROVENC">پروۆانس</variant>
+			<variant type="PUTER">پۋتەر</variant>
+			<variant type="REVISED">قايتا قارالعان جازۋ</variant>
+			<variant type="RIGIK">كلاسسيكالىق ۆولاپيۋك</variant>
+			<variant type="ROZAJ">رەزيا</variant>
+			<variant type="RUMGR">رۋمگر</variant>
+			<variant type="SAAHO">ساحو</variant>
+			<variant type="SCOTLAND">شوتلانديانىڭ ستاندارتتى اعىلشىن ءتىلى</variant>
+			<variant type="SCOUSE">سكاۋس</variant>
+			<variant type="SIMPLE">قاراپايىم</variant>
+			<variant type="SOLBA">ستولۆيتسا/سولبيكا ديالەكتىسى</variant>
+			<variant type="SOTAV">كابۋۆەرديانۋدىڭ سوتاۆەنتو ديالەكت توبى</variant>
+			<variant type="SPANGLIS">سپانگليش</variant>
+			<variant type="SURMIRAN">سۋرميران</variant>
+			<variant type="SURSILV">سۋرسيلۆ</variant>
+			<variant type="SUTSILV">سۋتسيلۆ</variant>
+			<variant type="SYNNEJYL">سيننەجيل</variant>
+			<variant type="TAILO">تايلو</variant>
+			<variant type="TARASK">تاراشكەۆيتسا</variant>
+			<variant type="TONGYONG">توڭيوڭ</variant>
+			<variant type="TUNUMIIT">تۋنۋمييت</variant>
+			<variant type="UCCOR">بىرىڭعاي جازۋ</variant>
+			<variant type="UCRCOR">بىرىڭعاي قايتا قارالعان جازۋ</variant>
+			<variant type="ULSTER">ولستەر</variant>
+			<variant type="UNIFON">يۋنيفون فونەتيكالىق ءالىپبيى</variant>
+			<variant type="VAIDIKA">ۆايديكا</variant>
+			<variant type="VALBADIA">ۆالباديا</variant>
+			<variant type="VALENCIA">ۆالەنسيا</variant>
+			<variant type="VALLADER">ۆاللادەر</variant>
+			<variant type="VECDRUKA">ۆەچدرۋكا</variant>
+			<variant type="VIVARAUP">ۆيۆارو-ءالپى</variant>
+			<variant type="WADEGILE">ۋەيد-جايىلس جۇيەسى</variant>
+			<variant type="XSISTEMO">X جۇيەسى</variant>
 		</variants>
 		<keys>
-			<key type="calendar" draft="unconfirmed">كۇنتىزبە</key>
-			<key type="cf" draft="unconfirmed">اقشا ءپىشىمى</key>
-			<key type="collation" draft="unconfirmed">سۇرىپتاۋ رەتى</key>
-			<key type="currency" draft="unconfirmed">اقشا</key>
-			<key type="hc" draft="unconfirmed">ۋاقىت فورماتى (12 نە 24)</key>
-			<key type="lb" draft="unconfirmed">جولدى تاسىمالداۋ ءستيلى</key>
-			<key type="ms" draft="unconfirmed">ولشەمدەر جۇيەسى</key>
-			<key type="numbers" draft="unconfirmed">ساندار</key>
+			<key type="calendar">كۇنتىزبە</key>
+			<key type="cf">اقشا ءپىشىمى</key>
+			<key type="collation">سۇرىپتاۋ رەتى</key>
+			<key type="currency">اقشا</key>
+			<key type="em">ەمودجي كورسەتىلىمى</key>
+			<key type="hc">ۋاقىت فورماتى (12 نە 24)</key>
+			<key type="lb">جولدى تاسىمالداۋ ءستيلى</key>
+			<key type="lw">سوزدەردەگى جول بولىنىستەرى</key>
+			<key type="ms">ولشەمدەر جۇيەسى</key>
+			<key type="numbers">ساندار</key>
+			<key type="ss">قىسقارعان سوزدەن كەيىنگى سويلەم ءبولىنىسى</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist" draft="unconfirmed">بۋددا كۇنتىزبەسى</type>
-			<type key="calendar" type="chinese" draft="unconfirmed">قىتاي كۇنتىزبەسى</type>
-			<type key="calendar" type="coptic" draft="unconfirmed">كوپت كۇنتىزبەسى</type>
-			<type key="calendar" type="dangi" draft="unconfirmed">دانگي كۇنتىزبەسى</type>
-			<type key="calendar" type="ethiopic" draft="unconfirmed">ەفيوپيا كۇنتىزبەسى</type>
-			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">ەفيوپيانىڭ امەتە-الەم كۇنتىزبەسى</type>
-			<type key="calendar" type="gregorian" draft="unconfirmed">گرەگورياندىق كۇنتىزبە</type>
-			<type key="calendar" type="hebrew" draft="unconfirmed">كونە ەۆرەي كۇنتىزبەسى</type>
-			<type key="calendar" type="indian" draft="unconfirmed">ءۇندىستاننىڭ ۇلتتىق كۇنتىزبەسى</type>
-			<type key="calendar" type="islamic" draft="unconfirmed">يسلام كۇنتىزبەسى</type>
-			<type key="calendar" type="islamic-civil" draft="unconfirmed">يسلام كۇنتىزبەسى (كەستەلىك، ازاماتتىق ءداۋىر)</type>
-			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">يسلام كۇنتىزبەسى (ساۋد ارابياسى، جاڭا اي)</type>
-			<type key="calendar" type="islamic-tbla" draft="unconfirmed">يسلام كۇنتىزبەسى (كەستەلىك، استرونوميالىق ءداۋىر)</type>
-			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">يسلام كۇنتىزبەسى (ۋمم ءال-قۇرا)</type>
-			<type key="calendar" type="iso8601" draft="unconfirmed">ISO-8601 كۇنتىزبەسى</type>
-			<type key="calendar" type="japanese" draft="unconfirmed">جاپون كۇنتىزبەسى</type>
-			<type key="calendar" type="persian" draft="unconfirmed">پارسى كۇنتىزبەسى</type>
-			<type key="calendar" type="roc" draft="unconfirmed">مينگۋو كۇنتىزبەسى</type>
-			<type key="cf" type="account" draft="unconfirmed">ەسەپتىك اقشا ءپىشىمى</type>
-			<type key="cf" type="standard" draft="unconfirmed">ستاندارتتى اقشا ءپىشىمى</type>
-			<type key="collation" type="big5han" draft="unconfirmed">ءداستۇرلى قىتاي ءتىلىنىڭ سۇرىپتاۋ رەتى - Big5</type>
-			<type key="collation" type="compat" draft="unconfirmed">سايكەستىككە ارنالعان الدىڭعى سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="dictionary" draft="unconfirmed">سوزدىك بويىنشا سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="ducet" draft="unconfirmed">ادەپكى ۋنيكود سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="emoji" draft="unconfirmed">ەموجي سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="eor" draft="unconfirmed">ەۋروپالىق رەتتەۋ ەرەجەلەرى</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">جەڭىلدەتىلگەن قىتاي ءتىلىنىڭ سۇرىپتاۋ رەتى - GB2312</type>
-			<type key="collation" type="phonebook" draft="unconfirmed">تەلەفون كىتاپشاسىنىڭ سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="pinyin" draft="unconfirmed">پينين سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="search" draft="unconfirmed">جالپى ماقساتتاعى ىزدەۋ</type>
-			<type key="collation" type="searchjl" draft="unconfirmed">كورەي ءتىلىنىڭ باستاپقى داۋىسسىزى بويىنشا ىزدەۋ</type>
-			<type key="collation" type="standard" draft="unconfirmed">ستاندارتتى سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="stroke" draft="unconfirmed">يەروگليفتەر سىزىقتارىن سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="traditional" draft="unconfirmed">ءداستۇرلى سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="unihan" draft="unconfirmed">يەروگليفتەر سىزىقتارىن تۇبەگەيلى سۇرىپتاۋ رەتى</type>
-			<type key="collation" type="zhuyin" draft="unconfirmed">جۋين سۇرىپتاۋ رەتى</type>
-			<type key="hc" type="h11" draft="unconfirmed">12 ساعاتتىق جۇيە (0–11)</type>
-			<type key="hc" type="h12" draft="unconfirmed">12 ساعاتتىق جۇيە (0–12)</type>
-			<type key="hc" type="h23" draft="unconfirmed">24 ساعاتتىق جۇيە (0–23)</type>
-			<type key="hc" type="h24" draft="unconfirmed">24 ساعاتتىق جۇيە (0–24)</type>
-			<type key="lb" type="loose" draft="unconfirmed">جولدى تاسىمالداۋدىڭ ەركىن ءستيلى</type>
-			<type key="lb" type="normal" draft="unconfirmed">جولدى تاسىمالداۋدىڭ قالىپتى ءستيلى</type>
-			<type key="lb" type="strict" draft="unconfirmed">جولدى تاسىمالداۋدىڭ قاتاڭ ءستيلى</type>
-			<type key="ms" type="metric" draft="unconfirmed">مەترلىك جۇيە</type>
-			<type key="ms" type="uksystem" draft="unconfirmed">بريتانيالىق ولشەمدەر جۇيەسى</type>
-			<type key="ms" type="ussystem" draft="unconfirmed">امەريكالىق ولشەمدەر جۇيەسى</type>
-			<type key="numbers" type="ahom" draft="unconfirmed">احوم تسيفرلارى</type>
-			<type key="numbers" type="arab" draft="unconfirmed">ءۇندى-اراب ساندارى</type>
-			<type key="numbers" type="arabext" draft="unconfirmed">ءۇندى-اراب ساندارىنىڭ كەڭەيتىلگەن جۇيەسى</type>
-			<type key="numbers" type="armn" draft="unconfirmed">ارميان ساندارى</type>
-			<type key="numbers" type="armnlow" draft="unconfirmed">كىشى ارىپپەن بەرىلگەن ارميان ساندارى</type>
-			<type key="numbers" type="bali" draft="unconfirmed">بالي ساندارى</type>
-			<type key="numbers" type="beng" draft="unconfirmed">بەنگال ساندارى</type>
-			<type key="numbers" type="brah" draft="unconfirmed">براحمي ساندارى</type>
-			<type key="numbers" type="cakm" draft="unconfirmed">چاكما ساندارى</type>
-			<type key="numbers" type="cham" draft="unconfirmed">چام ساندارى</type>
-			<type key="numbers" type="cyrl" draft="unconfirmed">كيريل ساندارى</type>
-			<type key="numbers" type="deva" draft="unconfirmed">دەۆاناگاري ساندارى</type>
-			<type key="numbers" type="diak" draft="unconfirmed">دەۆيس اكۋرۋ ساندارى</type>
-			<type key="numbers" type="ethi" draft="unconfirmed">ەفيوپيا ساندارى</type>
-			<type key="numbers" type="fullwide" draft="unconfirmed">تولىق ەندى ساندار</type>
-			<type key="numbers" type="gara" draft="unconfirmed">گاراي ساندارى</type>
-			<type key="numbers" type="geor" draft="unconfirmed">گرۋزين ساندارى</type>
-			<type key="numbers" type="gong" draft="unconfirmed">گۋنجالا گوندي ساندارى</type>
-			<type key="numbers" type="gonm" draft="unconfirmed">ماساراما گوندي ساندارى</type>
-			<type key="numbers" type="grek" draft="unconfirmed">گرەك ساندارى</type>
-			<type key="numbers" type="greklow" draft="unconfirmed">كىشى ارىپپەن بەرىلگەن گرەك ساندارى</type>
-			<type key="numbers" type="gujr" draft="unconfirmed">گۋجاراتي ساندارى</type>
-			<type key="numbers" type="gukh" draft="unconfirmed">گۋرۋڭ حەما ساندارى</type>
-			<type key="numbers" type="guru" draft="unconfirmed">گۋرمۋكحي ساندارى</type>
-			<type key="numbers" type="hanidec" draft="unconfirmed">قىتاي وندىق ساندارى</type>
-			<type key="numbers" type="hans" draft="unconfirmed">جەڭىلدەتىلگەن قىتاي ساندارى</type>
-			<type key="numbers" type="hansfin" draft="unconfirmed">قارجى سالاسىنداعى جەڭىلدەتىلگەن قىتاي ساندارى</type>
-			<type key="numbers" type="hant" draft="unconfirmed">ءداستۇرلى قىتاي ساندارى</type>
-			<type key="numbers" type="hantfin" draft="unconfirmed">قارجى سالاسىنداعى ءداستۇرلى قىتاي ساندارى</type>
-			<type key="numbers" type="hebr" draft="unconfirmed">يۆريت ساندارى</type>
-			<type key="numbers" type="hmng" draft="unconfirmed">پاحاۋ ساندارى</type>
-			<type key="numbers" type="hmnp" draft="unconfirmed">نياكەڭ پۋاچۋە حموڭ ساندارى</type>
-			<type key="numbers" type="java" draft="unconfirmed">ياۆا ساندارى</type>
-			<type key="numbers" type="jpan" draft="unconfirmed">جاپون ساندارى</type>
-			<type key="numbers" type="jpanfin" draft="unconfirmed">قارجى سالاسىنداعى جاپون ساندارى</type>
-			<type key="numbers" type="kali" draft="unconfirmed">كاياح لي ساندارى</type>
-			<type key="numbers" type="kawi" draft="unconfirmed">كاۋي ساندارى</type>
-			<type key="numbers" type="khmr" draft="unconfirmed">كحمەر ساندارى</type>
-			<type key="numbers" type="knda" draft="unconfirmed">كاننادا ساندارى</type>
-			<type key="numbers" type="krai" draft="unconfirmed">كيرات راي ساندارى</type>
-			<type key="numbers" type="lana" draft="unconfirmed">تاي تحام حورا ساندارى</type>
-			<type key="numbers" type="lanatham" draft="unconfirmed">تاي تحام تحام ساندارى</type>
-			<type key="numbers" type="laoo" draft="unconfirmed">لاوس ساندارى</type>
-			<type key="numbers" type="latn" draft="unconfirmed">باتىس ساندارى</type>
-			<type key="numbers" type="lepc" draft="unconfirmed">لەپچا ساندارى</type>
-			<type key="numbers" type="limb" draft="unconfirmed">ليمبۋ ساندارى</type>
-			<type key="numbers" type="mathbold" draft="unconfirmed">ماتەماتيكالىق قالىڭ قارىپتى ساندار</type>
-			<type key="numbers" type="mathdbl" draft="unconfirmed">ماتەماتيكالىق قوس سىزىقتى ساندار</type>
-			<type key="numbers" type="mathmono" draft="unconfirmed">ەنى بەكىتىلگەن ماتەماتيكالىق ساندار</type>
-			<type key="numbers" type="mathsanb" draft="unconfirmed">ماتەماتيكالىق قالىڭ قارىپتى سانسەريف ساندار</type>
-			<type key="numbers" type="mathsans" draft="unconfirmed">ماتەماتيكالىق سانسەريف ساندار</type>
-			<type key="numbers" type="mlym" draft="unconfirmed">مالايالام ساندارى</type>
-			<type key="numbers" type="modi" draft="unconfirmed">مودي ساندارى</type>
-			<type key="numbers" type="mong" draft="unconfirmed">موڭعول ساندارى</type>
-			<type key="numbers" type="mroo" draft="unconfirmed">مرو ساندارى</type>
-			<type key="numbers" type="mtei" draft="unconfirmed">مەيتەي-مايەك ساندارى</type>
-			<type key="numbers" type="mymr" draft="unconfirmed">ميانمار ساندارى</type>
-			<type key="numbers" type="mymrepka" draft="unconfirmed">ميانمار شىعىس پحو كارەن ساندارى</type>
-			<type key="numbers" type="mymrpao" draft="unconfirmed">ميانمار پاو ساندارى</type>
-			<type key="numbers" type="mymrshan" draft="unconfirmed">ميانمار شان ساندارى</type>
-			<type key="numbers" type="mymrtlng" draft="unconfirmed">ميانمار تاي لايڭ ساندارى</type>
-			<type key="numbers" type="nagm" draft="unconfirmed">ناگ مۋنداري ساندارى</type>
-			<type key="numbers" type="nkoo" draft="unconfirmed">نكو ساندارى</type>
-			<type key="numbers" type="olck" draft="unconfirmed">ول-چيكي ساندارى</type>
-			<type key="numbers" type="onao" draft="unconfirmed">ول-ونال ساندارى</type>
-			<type key="numbers" type="orya" draft="unconfirmed">وريا ساندارى</type>
-			<type key="numbers" type="osma" draft="unconfirmed">يسمانيا ساندارى</type>
-			<type key="numbers" type="outlined" draft="unconfirmed">سىزىلعان ساندار</type>
-			<type key="numbers" type="rohg" draft="unconfirmed">حانيفي ساندارى</type>
-			<type key="numbers" type="roman" draft="unconfirmed">ريم ساندارى</type>
-			<type key="numbers" type="romanlow" draft="unconfirmed">كىشى ارىپپەن بەرىلگەن ريم ساندارى</type>
-			<type key="numbers" type="saur" draft="unconfirmed">ساۋراشترا ساندارى</type>
-			<type key="numbers" type="shrd" draft="unconfirmed">شارادا ساندارى</type>
-			<type key="numbers" type="sind" draft="unconfirmed">كحۋدابادي ساندارى</type>
-			<type key="numbers" type="sinh" draft="unconfirmed">سينگالا ليت ساندارى</type>
-			<type key="numbers" type="sora" draft="unconfirmed">سورا سومپەڭ ساندارى</type>
-			<type key="numbers" type="sund" draft="unconfirmed">سۋندا ساندارى</type>
-			<type key="numbers" type="sunu" draft="unconfirmed">سۋنۋار ساندارى</type>
-			<type key="numbers" type="takr" draft="unconfirmed">تاكري ساندارى</type>
-			<type key="numbers" type="talu" draft="unconfirmed">جاڭا لۋ جازۋىنىڭ ساندارى</type>
-			<type key="numbers" type="taml" draft="unconfirmed">ءداستۇرلى تاميل ساندارى</type>
-			<type key="numbers" type="tamldec" draft="unconfirmed">تاميل ساندارى</type>
-			<type key="numbers" type="telu" draft="unconfirmed">تەلۋگۋ ساندارى</type>
-			<type key="numbers" type="thai" draft="unconfirmed">تاي ساندارى</type>
-			<type key="numbers" type="tibt" draft="unconfirmed">تيبەر ساندارى</type>
-			<type key="numbers" type="tirh" draft="unconfirmed">تيرحۋتا ساندارى</type>
-			<type key="numbers" type="tnsa" draft="unconfirmed">تاڭسا ساندارى</type>
-			<type key="numbers" type="vaii" draft="unconfirmed">ۆاي ساندارى</type>
-			<type key="numbers" type="wara" draft="unconfirmed">ۋاراڭ سيتي ساندارى</type>
-			<type key="numbers" type="wcho" draft="unconfirmed">ۋانچو ساندارى</type>
+			<type key="calendar" type="buddhist">بۋددا كۇنتىزبەسى</type>
+			<type key="calendar" type="buddhist" scope="core">بۋددا</type>
+			<type key="calendar" type="chinese">قىتاي كۇنتىزبەسى</type>
+			<type key="calendar" type="chinese" scope="core">قىتاي</type>
+			<type key="calendar" type="coptic">كوپت كۇنتىزبەسى</type>
+			<type key="calendar" type="coptic" scope="core">كوپت</type>
+			<type key="calendar" type="dangi">دانگي كۇنتىزبەسى</type>
+			<type key="calendar" type="dangi" scope="core">دانگي</type>
+			<type key="calendar" type="ethiopic">ەفيوپيا كۇنتىزبەسى</type>
+			<type key="calendar" type="ethiopic" scope="core">ەفيوپيانىڭ</type>
+			<type key="calendar" type="ethiopic-amete-alem">ەفيوپيانىڭ امەتە-الەم كۇنتىزبەسى</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ەفيوپيانىڭ امەتە-الەم</type>
+			<type key="calendar" type="gregorian">گرەگورياندىق كۇنتىزبە</type>
+			<type key="calendar" type="gregorian" scope="core">گرەگوريان</type>
+			<type key="calendar" type="hebrew">كونە ەۆرەي كۇنتىزبەسى</type>
+			<type key="calendar" type="hebrew" scope="core">ەۆرەي</type>
+			<type key="calendar" type="indian">ءۇندىستاننىڭ ۇلتتىق كۇنتىزبەسى</type>
+			<type key="calendar" type="indian" scope="core">ءۇندىستاننىڭ ۇلتتىق</type>
+			<type key="calendar" type="islamic">يسلام كۇنتىزبەسى</type>
+			<type key="calendar" type="islamic" scope="core">يسلام</type>
+			<type key="calendar" type="islamic-civil">يسلام كۇنتىزبەسى (كەستەلىك، ازاماتتىق ءداۋىر)</type>
+			<type key="calendar" type="islamic-civil" scope="core">يسلام (كەستەلىك، ازاماتتىق ءداۋىر)</type>
+			<type key="calendar" type="islamic-rgsa">يسلام كۇنتىزبەسى (ساۋد ارابياسى، جاڭا اي)</type>
+			<type key="calendar" type="islamic-tbla">يسلام كۇنتىزبەسى (كەستەلىك، استرونوميالىق ءداۋىر)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">يسلام (كەستەلىك، استرونوميالىق ءداۋىر)</type>
+			<type key="calendar" type="islamic-umalqura">يسلام كۇنتىزبەسى (ۋمم ءال-قۇرا)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">يسلام (ۋمم ءال-قۇرا)</type>
+			<type key="calendar" type="iso8601">ISO-8601 كۇنتىزبەسى</type>
+			<type key="calendar" type="japanese">جاپون كۇنتىزبەسى</type>
+			<type key="calendar" type="japanese" scope="core">جاپون</type>
+			<type key="calendar" type="persian">پارسى كۇنتىزبەسى</type>
+			<type key="calendar" type="persian" scope="core">پارسى</type>
+			<type key="calendar" type="roc">مينگۋو كۇنتىزبەسى</type>
+			<type key="calendar" type="roc" scope="core">مينگۋو</type>
+			<type key="cf" type="account">ەسەپتىك اقشا ءپىشىمى</type>
+			<type key="cf" type="account" scope="core">ەسەپتىك</type>
+			<type key="cf" type="standard">ستاندارتتى اقشا ءپىشىمى</type>
+			<type key="cf" type="standard" scope="core">ستاندارت</type>
+			<type key="collation" type="compat">سايكەستىككە ارنالعان الدىڭعى سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="compat" scope="core">سايكەستىك</type>
+			<type key="collation" type="dictionary">سوزدىك بويىنشا سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="dictionary" scope="core">سوزدىك</type>
+			<type key="collation" type="ducet">ادەپكى ۋنيكود سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="ducet" scope="core">ادەپكى ۋنيكود</type>
+			<type key="collation" type="emoji">ەموجي سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="eor">ەۋروپالىق رەتتەۋ ەرەجەلەرى</type>
+			<type key="collation" type="phonebook">تەلەفون كىتاپشاسىنىڭ سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="phonebook" scope="core">تەلەفون كىتاپشاسى</type>
+			<type key="collation" type="phonetic" scope="core">فونەتيكالىق</type>
+			<type key="collation" type="pinyin">پينين سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="pinyin" scope="core">پينين</type>
+			<type key="collation" type="search">جالپى ماقساتتاعى ىزدەۋ</type>
+			<type key="collation" type="search" scope="core">ىزدەۋ</type>
+			<type key="collation" type="searchjl">كورەي ءتىلىنىڭ باستاپقى داۋىسسىزى بويىنشا ىزدەۋ</type>
+			<type key="collation" type="standard">ستاندارتتى سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="standard" scope="core">ستاندارت</type>
+			<type key="collation" type="stroke">يەروگليفتەر سىزىقتارىن سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="stroke" scope="core">يەروگليفتەر سىزىقتارى</type>
+			<type key="collation" type="traditional">ءداستۇرلى سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="traditional" scope="core">ءداستۇرلى</type>
+			<type key="collation" type="unihan">يەروگليفتەر سىزىقتارىن تۇبەگەيلى سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="unihan" scope="core">يەروگليفتەر سىزىقتارى</type>
+			<type key="collation" type="zhuyin">جۋين سۇرىپتاۋ رەتى</type>
+			<type key="collation" type="zhuyin" scope="core">جۋين</type>
+			<type key="em" type="default" scope="core">ادەپكى</type>
+			<type key="em" type="emoji" scope="core">ەمودجي</type>
+			<type key="em" type="text" scope="core">ءماتىن</type>
+			<type key="hc" type="h11">12 ساعاتتىق جۇيە (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
+			<type key="hc" type="h12">12 ساعاتتىق جۇيە (0–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
+			<type key="hc" type="h23">24 ساعاتتىق جۇيە (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
+			<type key="hc" type="h24">24 ساعاتتىق جۇيە (0–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">جولدى تاسىمالداۋدىڭ ەركىن ءستيلى</type>
+			<type key="lb" type="loose" scope="core">ەركىن</type>
+			<type key="lb" type="normal">جولدى تاسىمالداۋدىڭ قالىپتى ءستيلى</type>
+			<type key="lb" type="normal" scope="core">قالىپتى</type>
+			<type key="lb" type="strict">جولدى تاسىمالداۋدىڭ قاتاڭ ءستيلى</type>
+			<type key="lb" type="strict" scope="core">قاتاڭ</type>
+			<type key="lw" type="breakall" scope="core">ءبارىن تاسىمالداۋ</type>
+			<type key="lw" type="keepall" scope="core">ءبارىن ساقتاۋ</type>
+			<type key="lw" type="normal" scope="core">قالىپتى</type>
+			<type key="lw" type="phrase" scope="core">فرازالاردا ساقتاۋ</type>
+			<type key="ms" type="metric">مەترلىك جۇيە</type>
+			<type key="ms" type="metric" scope="core">مەترلىك</type>
+			<type key="ms" type="uksystem">بريتانيالىق ولشەمدەر جۇيەسى</type>
+			<type key="ms" type="uksystem" scope="core">بريتانيالىق</type>
+			<type key="ms" type="ussystem">امەريكالىق ولشەمدەر جۇيەسى</type>
+			<type key="ms" type="ussystem" scope="core">امەريكالىق</type>
+			<type key="numbers" type="ahom">احوم تسيفرلارى</type>
+			<type key="numbers" type="arab">ءۇندى-اراب ساندارى</type>
+			<type key="numbers" type="arabext">ءۇندى-اراب ساندارىنىڭ كەڭەيتىلگەن جۇيەسى</type>
+			<type key="numbers" type="armn">ارميان ساندارى</type>
+			<type key="numbers" type="armnlow">كىشى ارىپپەن بەرىلگەن ارميان ساندارى</type>
+			<type key="numbers" type="bali">بالي ساندارى</type>
+			<type key="numbers" type="beng">بەنگال ساندارى</type>
+			<type key="numbers" type="brah">براحمي ساندارى</type>
+			<type key="numbers" type="cakm">چاكما ساندارى</type>
+			<type key="numbers" type="cham">چام ساندارى</type>
+			<type key="numbers" type="cyrl">كيريل ساندارى</type>
+			<type key="numbers" type="deva">دەۆاناگاري ساندارى</type>
+			<type key="numbers" type="diak">دەۆيس اكۋرۋ ساندارى</type>
+			<type key="numbers" type="ethi">ەفيوپيا ساندارى</type>
+			<type key="numbers" type="fullwide">تولىق ەندى ساندار</type>
+			<type key="numbers" type="gara">گاراي ساندارى</type>
+			<type key="numbers" type="geor">گرۋزين ساندارى</type>
+			<type key="numbers" type="gong">گۋنجالا گوندي ساندارى</type>
+			<type key="numbers" type="gonm">ماساراما گوندي ساندارى</type>
+			<type key="numbers" type="grek">گرەك ساندارى</type>
+			<type key="numbers" type="greklow">كىشى ارىپپەن بەرىلگەن گرەك ساندارى</type>
+			<type key="numbers" type="gujr">گۋجاراتي ساندارى</type>
+			<type key="numbers" type="gukh">گۋرۋڭ حەما ساندارى</type>
+			<type key="numbers" type="guru">گۋرمۋكحي ساندارى</type>
+			<type key="numbers" type="hanidec">قىتاي وندىق ساندارى</type>
+			<type key="numbers" type="hans">جەڭىلدەتىلگەن قىتاي ساندارى</type>
+			<type key="numbers" type="hansfin">قارجى سالاسىنداعى جەڭىلدەتىلگەن قىتاي ساندارى</type>
+			<type key="numbers" type="hant">ءداستۇرلى قىتاي ساندارى</type>
+			<type key="numbers" type="hantfin">قارجى سالاسىنداعى ءداستۇرلى قىتاي ساندارى</type>
+			<type key="numbers" type="hebr">يۆريت ساندارى</type>
+			<type key="numbers" type="hmng">پاحاۋ ساندارى</type>
+			<type key="numbers" type="hmnp">نياكەڭ پۋاچۋە حموڭ ساندارى</type>
+			<type key="numbers" type="java">ياۆا ساندارى</type>
+			<type key="numbers" type="jpan">جاپون ساندارى</type>
+			<type key="numbers" type="jpanfin">قارجى سالاسىنداعى جاپون ساندارى</type>
+			<type key="numbers" type="kali">كاياح لي ساندارى</type>
+			<type key="numbers" type="kawi">كاۋي ساندارى</type>
+			<type key="numbers" type="khmr">كحمەر ساندارى</type>
+			<type key="numbers" type="knda">كاننادا ساندارى</type>
+			<type key="numbers" type="krai">كيرات راي ساندارى</type>
+			<type key="numbers" type="lana">تاي تحام حورا ساندارى</type>
+			<type key="numbers" type="lanatham">تاي تحام تحام ساندارى</type>
+			<type key="numbers" type="laoo">لاوس ساندارى</type>
+			<type key="numbers" type="latn">باتىس ساندارى</type>
+			<type key="numbers" type="lepc">لەپچا ساندارى</type>
+			<type key="numbers" type="limb">ليمبۋ ساندارى</type>
+			<type key="numbers" type="mathbold">ماتەماتيكالىق قالىڭ قارىپتى ساندار</type>
+			<type key="numbers" type="mathdbl">ماتەماتيكالىق قوس سىزىقتى ساندار</type>
+			<type key="numbers" type="mathmono">ەنى بەكىتىلگەن ماتەماتيكالىق ساندار</type>
+			<type key="numbers" type="mathsanb">ماتەماتيكالىق قالىڭ قارىپتى سانسەريف ساندار</type>
+			<type key="numbers" type="mathsans">ماتەماتيكالىق سانسەريف ساندار</type>
+			<type key="numbers" type="mlym">مالايالام ساندارى</type>
+			<type key="numbers" type="modi">مودي ساندارى</type>
+			<type key="numbers" type="mong">موڭعول ساندارى</type>
+			<type key="numbers" type="mroo">مرو ساندارى</type>
+			<type key="numbers" type="mtei">مەيتەي-مايەك ساندارى</type>
+			<type key="numbers" type="mymr">ميانمار ساندارى</type>
+			<type key="numbers" type="mymrepka">ميانمار شىعىس پحو كارەن ساندارى</type>
+			<type key="numbers" type="mymrpao">ميانمار پاو ساندارى</type>
+			<type key="numbers" type="mymrshan">ميانمار شان ساندارى</type>
+			<type key="numbers" type="mymrtlng">ميانمار تاي لايڭ ساندارى</type>
+			<type key="numbers" type="nagm">ناگ مۋنداري ساندارى</type>
+			<type key="numbers" type="nkoo">نكو ساندارى</type>
+			<type key="numbers" type="olck">ول-چيكي ساندارى</type>
+			<type key="numbers" type="onao">ول-ونال ساندارى</type>
+			<type key="numbers" type="orya">وريا ساندارى</type>
+			<type key="numbers" type="osma">يسمانيا ساندارى</type>
+			<type key="numbers" type="outlined">سىزىلعان ساندار</type>
+			<type key="numbers" type="rohg">حانيفي ساندارى</type>
+			<type key="numbers" type="roman">ريم ساندارى</type>
+			<type key="numbers" type="romanlow">كىشى ارىپپەن بەرىلگەن ريم ساندارى</type>
+			<type key="numbers" type="saur">ساۋراشترا ساندارى</type>
+			<type key="numbers" type="shrd">شارادا ساندارى</type>
+			<type key="numbers" type="sind">كحۋدابادي ساندارى</type>
+			<type key="numbers" type="sinh">سينگالا ليت ساندارى</type>
+			<type key="numbers" type="sora">سورا سومپەڭ ساندارى</type>
+			<type key="numbers" type="sund">سۋندا ساندارى</type>
+			<type key="numbers" type="sunu">سۋنۋار ساندارى</type>
+			<type key="numbers" type="takr">تاكري ساندارى</type>
+			<type key="numbers" type="talu">جاڭا لۋ جازۋىنىڭ ساندارى</type>
+			<type key="numbers" type="taml">ءداستۇرلى تاميل ساندارى</type>
+			<type key="numbers" type="tamldec">تاميل ساندارى</type>
+			<type key="numbers" type="telu">تەلۋگۋ ساندارى</type>
+			<type key="numbers" type="thai">تاي ساندارى</type>
+			<type key="numbers" type="tibt">تيبەر ساندارى</type>
+			<type key="numbers" type="tirh">تيرحۋتا ساندارى</type>
+			<type key="numbers" type="tnsa">تاڭسا ساندارى</type>
+			<type key="numbers" type="vaii">ۆاي ساندارى</type>
+			<type key="numbers" type="wara">ۋاراڭ سيتي ساندارى</type>
+			<type key="numbers" type="wcho">ۋانچو ساندارى</type>
+			<type key="ss" type="none" scope="core">ءوشىرۋ</type>
+			<type key="ss" type="standard" scope="core">قوسۋ</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric" draft="unconfirmed">مەترلىك</measurementSystemName>
-			<measurementSystemName type="UK" draft="unconfirmed">اعىلشىن</measurementSystemName>
-			<measurementSystemName type="US" draft="unconfirmed">امەريكالىق</measurementSystemName>
+			<measurementSystemName type="metric">مەترلىك</measurementSystemName>
+			<measurementSystemName type="UK">اعىلشىن</measurementSystemName>
+			<measurementSystemName type="US">امەريكالىق</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
-			<codePattern type="language" draft="unconfirmed">ءتىل: {0}</codePattern>
-			<codePattern type="script" draft="unconfirmed">جازۋ: {0}</codePattern>
-			<codePattern type="territory" draft="unconfirmed">ايماق: {0}</codePattern>
+			<codePattern type="language">ءتىل: {0}</codePattern>
+			<codePattern type="script">جازۋ: {0}</codePattern>
+			<codePattern type="territory">ايماق: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<layout>
@@ -1152,14 +1205,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<characters>
 		<exemplarCharacters>[ء ا ە ب پ ت ج چ ح د ر ز س ش ع ف ق ك گ ڭ ل م ن ھ و ۇ ۆ ۋ ى ي]</exemplarCharacters>
 		<exemplarCharacters type="index">[ء ا ە ب پ ت ج چ ح د ر ز س ش ع ف ق ك گ ڭ ل م ن ھ و ۇ ۆ ۋ ى ي]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary" draft="contributed">[\u200E ٫ ٬ ٪ ؉ ۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — ، ؛ \: ! ؟ . … '‘’ &quot;“” « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
 		<moreInformation>؟</moreInformation>
 	</characters>
 	<delimiters>
-		<quotationStart draft="unconfirmed">»</quotationStart>
-		<quotationEnd draft="unconfirmed">«</quotationEnd>
-		<alternateQuotationStart draft="unconfirmed">›</alternateQuotationStart>
-		<alternateQuotationEnd draft="unconfirmed">‹</alternateQuotationEnd>
+		<quotationStart>»</quotationStart>
+		<quotationEnd>«</quotationEnd>
+		<alternateQuotationStart>›</alternateQuotationStart>
+		<alternateQuotationEnd>‹</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -1167,254 +1221,371 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">قاڭ</month>
-							<month type="2" draft="unconfirmed">اقپ</month>
-							<month type="3" draft="unconfirmed">ناۋ</month>
-							<month type="4" draft="unconfirmed">ساۋ</month>
-							<month type="5" draft="unconfirmed">مام</month>
-							<month type="6" draft="unconfirmed">ماۋ</month>
-							<month type="7" draft="unconfirmed">شىل</month>
-							<month type="8" draft="unconfirmed">تام</month>
-							<month type="9" draft="unconfirmed">قىر</month>
-							<month type="10" draft="unconfirmed">قاز</month>
-							<month type="11" draft="unconfirmed">قار</month>
-							<month type="12" draft="unconfirmed">جەل</month>
+							<month type="1">قاڭ</month>
+							<month type="2">اقپ</month>
+							<month type="3">ناۋ</month>
+							<month type="4">ساۋ</month>
+							<month type="5">مام</month>
+							<month type="6">ماۋ</month>
+							<month type="7">شىل</month>
+							<month type="8">تام</month>
+							<month type="9">قىر</month>
+							<month type="10">قاز</month>
+							<month type="11">قار</month>
+							<month type="12">جەل</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">قاڭتار</month>
-							<month type="2" draft="unconfirmed">اقپان</month>
-							<month type="3" draft="unconfirmed">ناۋرىز</month>
-							<month type="4" draft="unconfirmed">ءساۋىر</month>
-							<month type="5" draft="unconfirmed">مامىر</month>
-							<month type="6" draft="unconfirmed">ماۋسىم</month>
-							<month type="7" draft="unconfirmed">شىلدە</month>
-							<month type="8" draft="unconfirmed">تامىز</month>
-							<month type="9" draft="unconfirmed">قىركۇيەك</month>
-							<month type="10" draft="unconfirmed">قازان</month>
-							<month type="11" draft="unconfirmed">قاراشا</month>
-							<month type="12" draft="unconfirmed">جەلتوقسان</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">قاڭ</month>
-							<month type="2" draft="unconfirmed">اقپ</month>
-							<month type="3" draft="unconfirmed">ناۋ</month>
-							<month type="4" draft="unconfirmed">ساۋ</month>
-							<month type="5" draft="unconfirmed">مام</month>
-							<month type="6" draft="unconfirmed">ماۋ</month>
-							<month type="7" draft="unconfirmed">شىل</month>
-							<month type="8" draft="unconfirmed">تام</month>
-							<month type="9" draft="unconfirmed">قىر</month>
-							<month type="10" draft="unconfirmed">قاز</month>
-							<month type="11" draft="unconfirmed">قار</month>
-							<month type="12" draft="unconfirmed">جەل</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">قاڭتار</month>
-							<month type="2" draft="unconfirmed">اقپان</month>
-							<month type="3" draft="unconfirmed">ناۋرىز</month>
-							<month type="4" draft="unconfirmed">ءساۋىر</month>
-							<month type="5" draft="unconfirmed">مامىر</month>
-							<month type="6" draft="unconfirmed">ماۋسىم</month>
-							<month type="7" draft="unconfirmed">شىلدە</month>
-							<month type="8" draft="unconfirmed">تامىز</month>
-							<month type="9" draft="unconfirmed">قىركۇيەك</month>
-							<month type="10" draft="unconfirmed">قازان</month>
-							<month type="11" draft="unconfirmed">قاراشا</month>
-							<month type="12" draft="unconfirmed">جەلتوقسان</month>
+							<month type="1">قاڭتار</month>
+							<month type="2">اقپان</month>
+							<month type="3">ناۋرىز</month>
+							<month type="4">ءساۋىر</month>
+							<month type="5">مامىر</month>
+							<month type="6">ماۋسىم</month>
+							<month type="7">شىلدە</month>
+							<month type="8">تامىز</month>
+							<month type="9">قىركۇيەك</month>
+							<month type="10">قازان</month>
+							<month type="11">قاراشا</month>
+							<month type="12">جەلتوقسان</month>
 						</monthWidth>
 					</monthContext>
 				</months>
+				<cyclicNameSets>
+					<cyclicNameSet type="solarTerms">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">كوكتەم باسى</cyclicName>
+								<cyclicName type="2">جاڭبىر سۋى</cyclicName>
+								<cyclicName type="3">جاندىكتەر ويانۋى</cyclicName>
+								<cyclicName type="4">كوكتەمگى توقىراۋ</cyclicName>
+								<cyclicName type="5">اشىق اسپان</cyclicName>
+								<cyclicName type="6">استىق جاڭبىر</cyclicName>
+								<cyclicName type="7">جاز باسى</cyclicName>
+								<cyclicName type="8">از تولۋ</cyclicName>
+								<cyclicName type="9">استىق ەگۋ</cyclicName>
+								<cyclicName type="10">جازعى توقىراۋ</cyclicName>
+								<cyclicName type="11">وتكىر ىستىق</cyclicName>
+								<cyclicName type="12">شىلىڭگىر ىستىق</cyclicName>
+								<cyclicName type="13">كۇزدىڭ باسى</cyclicName>
+								<cyclicName type="14">قوڭىر سالقىن</cyclicName>
+								<cyclicName type="15">اق شىق</cyclicName>
+								<cyclicName type="16">كۇزگى توقىراۋ</cyclicName>
+								<cyclicName type="17">سۋىق شىق</cyclicName>
+								<cyclicName type="18">قىراۋ ءتۇسۋ</cyclicName>
+								<cyclicName type="19">قىس باسى</cyclicName>
+								<cyclicName type="20">از قار</cyclicName>
+								<cyclicName type="21">قالىڭ قار</cyclicName>
+								<cyclicName type="22">قىسقى توقىراۋ</cyclicName>
+								<cyclicName type="23">از سۋىق</cyclicName>
+								<cyclicName type="24">قاتتى سۋىق</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">كوكتەم باسى</cyclicName>
+								<cyclicName type="2">جاڭبىر سۋى</cyclicName>
+								<cyclicName type="3">جاندىكتەر ويانۋى</cyclicName>
+								<cyclicName type="4">كوكتەمگى توقىراۋ</cyclicName>
+								<cyclicName type="5">اشىق اسپان</cyclicName>
+								<cyclicName type="6">استىق جاڭبىر</cyclicName>
+								<cyclicName type="7">جاز باسى</cyclicName>
+								<cyclicName type="8">از تولۋ</cyclicName>
+								<cyclicName type="9">استىق ەگۋ</cyclicName>
+								<cyclicName type="10">جازعى توقىراۋ</cyclicName>
+								<cyclicName type="11">وتكىر ىستىق</cyclicName>
+								<cyclicName type="12">شىلىڭگىر ىستىق</cyclicName>
+								<cyclicName type="13">كۇزدىڭ باسى</cyclicName>
+								<cyclicName type="14">قوڭىر سالقىن</cyclicName>
+								<cyclicName type="15">اق شىق</cyclicName>
+								<cyclicName type="16">كۇزگى توقىراۋ</cyclicName>
+								<cyclicName type="17">سۋىق شىق</cyclicName>
+								<cyclicName type="18">قىراۋ ءتۇسۋ</cyclicName>
+								<cyclicName type="19">قىس باسى</cyclicName>
+								<cyclicName type="20">از قار</cyclicName>
+								<cyclicName type="21">قالىڭ قار</cyclicName>
+								<cyclicName type="22">قىسقى توقىراۋ</cyclicName>
+								<cyclicName type="23">از سۋىق</cyclicName>
+								<cyclicName type="24">قاتتى سۋىق</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">كوكتەم باسى</cyclicName>
+								<cyclicName type="2">جاڭبىر سۋى</cyclicName>
+								<cyclicName type="3">جاندىكتەر ويانۋى</cyclicName>
+								<cyclicName type="4">كوكتەمگى توقىراۋ</cyclicName>
+								<cyclicName type="5">اشىق اسپان</cyclicName>
+								<cyclicName type="6">استىق جاڭبىر</cyclicName>
+								<cyclicName type="7">جاز باسى</cyclicName>
+								<cyclicName type="8">از تولۋ</cyclicName>
+								<cyclicName type="9">استىق ەگۋ</cyclicName>
+								<cyclicName type="10">جازعى توقىراۋ</cyclicName>
+								<cyclicName type="11">وتكىر ىستىق</cyclicName>
+								<cyclicName type="12">شىلىڭگىر ىستىق</cyclicName>
+								<cyclicName type="13">كۇزدىڭ باسى</cyclicName>
+								<cyclicName type="14">قوڭىر سالقىن</cyclicName>
+								<cyclicName type="15">اق شىق</cyclicName>
+								<cyclicName type="16">كۇزگى توقىراۋ</cyclicName>
+								<cyclicName type="17">سۋىق شىق</cyclicName>
+								<cyclicName type="18">قىراۋ ءتۇسۋ</cyclicName>
+								<cyclicName type="19">قىس باسى</cyclicName>
+								<cyclicName type="20">از قار</cyclicName>
+								<cyclicName type="21">قالىڭ قار</cyclicName>
+								<cyclicName type="22">قىسقى توقىراۋ</cyclicName>
+								<cyclicName type="23">از سۋىق</cyclicName>
+								<cyclicName type="24">قاتتى سۋىق</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">تىشقان</cyclicName>
+								<cyclicName type="2">سيىر</cyclicName>
+								<cyclicName type="3">بارىس</cyclicName>
+								<cyclicName type="4">قويان</cyclicName>
+								<cyclicName type="5">ۇلۋ</cyclicName>
+								<cyclicName type="6">جىلان</cyclicName>
+								<cyclicName type="7">جىلقى</cyclicName>
+								<cyclicName type="8">قوي</cyclicName>
+								<cyclicName type="9">مەشىن</cyclicName>
+								<cyclicName type="10">تاۋىق</cyclicName>
+								<cyclicName type="11">يت</cyclicName>
+								<cyclicName type="12">دوڭىز</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<cyclicName type="1">تىشقان</cyclicName>
+								<cyclicName type="2">سيىر</cyclicName>
+								<cyclicName type="3">بارىس</cyclicName>
+								<cyclicName type="4">قويان</cyclicName>
+								<cyclicName type="5">ۇلۋ</cyclicName>
+								<cyclicName type="6">جىلان</cyclicName>
+								<cyclicName type="7">جىلقى</cyclicName>
+								<cyclicName type="8">قوي</cyclicName>
+								<cyclicName type="9">مەشىن</cyclicName>
+								<cyclicName type="10">تاۋىق</cyclicName>
+								<cyclicName type="11">يت</cyclicName>
+								<cyclicName type="12">دوڭىز</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<cyclicName type="1">تىشقان</cyclicName>
+								<cyclicName type="2">سيىر</cyclicName>
+								<cyclicName type="3">بارىس</cyclicName>
+								<cyclicName type="4">قويان</cyclicName>
+								<cyclicName type="5">ۇلۋ</cyclicName>
+								<cyclicName type="6">جىلان</cyclicName>
+								<cyclicName type="7">جىلقى</cyclicName>
+								<cyclicName type="8">قوي</cyclicName>
+								<cyclicName type="9">مەشىن</cyclicName>
+								<cyclicName type="10">تاۋىق</cyclicName>
+								<cyclicName type="11">يت</cyclicName>
+								<cyclicName type="12">دوڭىز</cyclicName>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="unconfirmed">EEEE، MMMM d، r(U)</pattern>
+							<pattern>EEEE، MMMM d، r(U)</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern draft="unconfirmed">MMMM d، r(U)</pattern>
+							<pattern>MMMM d، r(U)</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern draft="unconfirmed">MMM d، r</pattern>
+							<pattern>MMM d، r</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">M/d/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern draft="unconfirmed">EEEE، MMMM d، y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern draft="unconfirmed">MMMM d، y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern draft="unconfirmed">MMM d، y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern draft="unconfirmed">M/d/y GGGGG</pattern>
+							<pattern>M/d/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}، {0}</pattern>
-						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}، {0}</pattern>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}، {0}</pattern>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}، {0}</pattern>
+					</dateTimeFormatLength>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE، MMMM d، y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>MMMM d، y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>MMM d، y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>M/d/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}، {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed" draft="unconfirmed">d E</dateFormatItem>
-						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">MMM d، y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E، MMM d، y G</dateFormatItem>
-						<dateFormatItem id="Md" draft="unconfirmed">M/d</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">E، M/d</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="unconfirmed">E، MMM d</dateFormatItem>
-						<dateFormatItem id="y" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="yyyy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM" draft="unconfirmed">M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd" draft="unconfirmed">M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd" draft="unconfirmed">E، M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">MMM d، y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd" draft="unconfirmed">E، MMM d، y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">MMMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="unconfirmed">QQQ y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="unconfirmed">QQQQ y G</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd، E</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">MMM d، y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E، MMM d، y G</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">E، M/d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E، MMM d</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E، M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">MMM d، y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E، MMM d، y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G" draft="unconfirmed">M/y GGGGG – M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d" draft="unconfirmed">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">M/d/y GGGGG – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="G">M/d/y GGGGG – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E، M/d/y GGGGG – E، M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="G">E، M/d/y GGGGG – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d" draft="unconfirmed">MMM d – d، y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">MMM d، y G – MMM d، y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM d – MMM d، y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM d، y – MMM d، y G</greatestDifference>
+							<greatestDifference id="d">MMM d – d، y G</greatestDifference>
+							<greatestDifference id="G">MMM d، y G – MMM d، y G</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d، y G</greatestDifference>
+							<greatestDifference id="y">MMM d، y – MMM d، y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E، MMM d – E، MMM d، y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E، MMM d، y G – E، MMM d، y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E، MMM d – E، MMM d، y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E، MMM d، y – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="d">E، MMM d – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="G">E، MMM d، y G – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="M">E، MMM d – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="y">E، MMM d، y – E، MMM d، y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
+							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">M/d – M/d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">M/d – M/d</greatestDifference>
+							<greatestDifference id="M">M/d – M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E، M/d – E، M/d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E، M/d – E، M/d</greatestDifference>
+							<greatestDifference id="d">E، M/d – E، M/d</greatestDifference>
+							<greatestDifference id="M">E، M/d – E، M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">MMM d – d</greatestDifference>
+							<greatestDifference id="d">MMM d – d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E، MMM d – E، MMM d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E، MMM d – E، MMM d</greatestDifference>
+							<greatestDifference id="d">E، MMM d – E، MMM d</greatestDifference>
+							<greatestDifference id="M">E، MMM d – E، MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E، M/d/y – E، M/d/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">MMM d – d، y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM d – MMM d، y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM d، y – MMM d، y G</greatestDifference>
+							<greatestDifference id="d">MMM d – d، y G</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d، y G</greatestDifference>
+							<greatestDifference id="y">MMM d، y – MMM d، y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E، MMM d – E، MMM d، y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E، MMM d – E، MMM d، y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E، MMM d، y – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="d">E، MMM d – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="M">E، MMM d – E، MMM d، y G</greatestDifference>
+							<greatestDifference id="y">E، MMM d، y – E، MMM d، y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMMM – MMMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y G</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1422,428 +1593,312 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">قاڭتار</month>
-							<month type="2" draft="unconfirmed">اقپان</month>
-							<month type="3" draft="unconfirmed">ناۋرىز</month>
-							<month type="4" draft="unconfirmed">ءساۋىر</month>
-							<month type="5" draft="unconfirmed">مامىر</month>
-							<month type="6" draft="unconfirmed">ماۋسىم</month>
-							<month type="7" draft="unconfirmed">شىلدە</month>
-							<month type="8" draft="unconfirmed">تامىز</month>
-							<month type="9" draft="unconfirmed">قىركۇيەك</month>
-							<month type="10" draft="unconfirmed">قازان</month>
-							<month type="11" draft="unconfirmed">قاراشا</month>
-							<month type="12" draft="unconfirmed">جەلتوقسان</month>
-						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">قاڭتار</month>
-							<month type="2" draft="unconfirmed">اقپان</month>
-							<month type="3" draft="unconfirmed">ناۋرىز</month>
-							<month type="4" draft="unconfirmed">ءساۋىر</month>
-							<month type="5" draft="unconfirmed">مامىر</month>
-							<month type="6" draft="unconfirmed">ماۋسىم</month>
-							<month type="7" draft="unconfirmed">شىلدە</month>
-							<month type="8" draft="unconfirmed">تامىز</month>
-							<month type="9" draft="unconfirmed">قىركۇيەك</month>
-							<month type="10" draft="unconfirmed">قازان</month>
-							<month type="11" draft="unconfirmed">قاراشا</month>
-							<month type="12" draft="unconfirmed">جەلتوقسان</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">قاڭتار</month>
-							<month type="2" draft="unconfirmed">اقپان</month>
-							<month type="3" draft="unconfirmed">ناۋرىز</month>
-							<month type="4" draft="unconfirmed">ءساۋىر</month>
-							<month type="5" draft="unconfirmed">مامىر</month>
-							<month type="6" draft="unconfirmed">ماۋسىم</month>
-							<month type="7" draft="unconfirmed">شىلدە</month>
-							<month type="8" draft="unconfirmed">تامىز</month>
-							<month type="9" draft="unconfirmed">قىركۇيەك</month>
-							<month type="10" draft="unconfirmed">قازان</month>
-							<month type="11" draft="unconfirmed">قاراشا</month>
-							<month type="12" draft="unconfirmed">جەلتوقسان</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">قاڭتار</month>
-							<month type="2" draft="unconfirmed">اقپان</month>
-							<month type="3" draft="unconfirmed">ناۋرىز</month>
-							<month type="4" draft="unconfirmed">ءساۋىر</month>
-							<month type="5" draft="unconfirmed">مامىر</month>
-							<month type="6" draft="unconfirmed">ماۋسىم</month>
-							<month type="7" draft="unconfirmed">شىلدە</month>
-							<month type="8" draft="unconfirmed">تامىز</month>
-							<month type="9" draft="unconfirmed">قىركۇيەك</month>
-							<month type="10" draft="unconfirmed">قازان</month>
-							<month type="11" draft="unconfirmed">قاراشا</month>
-							<month type="12" draft="unconfirmed">جەلتوقسان</month>
+							<month type="1">قاڭتار</month>
+							<month type="2">اقپان</month>
+							<month type="3">ناۋرىز</month>
+							<month type="4">ءساۋىر</month>
+							<month type="5">مامىر</month>
+							<month type="6">ماۋسىم</month>
+							<month type="7">شىلدە</month>
+							<month type="8">تامىز</month>
+							<month type="9">قىركۇيەك</month>
+							<month type="10">قازان</month>
+							<month type="11">قاراشا</month>
+							<month type="12">جەلتوقسان</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">جەك</day>
-							<day type="mon" draft="unconfirmed">دۇي</day>
-							<day type="tue" draft="unconfirmed">سەي</day>
-							<day type="wed" draft="unconfirmed">سار</day>
-							<day type="thu" draft="unconfirmed">بەي</day>
-							<day type="fri" draft="unconfirmed">جۇم</day>
-							<day type="sat" draft="unconfirmed">سەن</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">ج</day>
-							<day type="mon" draft="unconfirmed">د</day>
-							<day type="tue" draft="unconfirmed">س</day>
-							<day type="wed" draft="unconfirmed">س</day>
-							<day type="thu" draft="unconfirmed">ب</day>
-							<day type="fri" draft="unconfirmed">ج</day>
-							<day type="sat" draft="unconfirmed">س</day>
+							<day type="sun">جەك</day>
+							<day type="mon">دۇي</day>
+							<day type="tue">سەي</day>
+							<day type="wed">سار</day>
+							<day type="thu">بەي</day>
+							<day type="fri">جۇم</day>
+							<day type="sat">سەن</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">جە</day>
-							<day type="mon" draft="unconfirmed">دۇ</day>
-							<day type="tue" draft="unconfirmed">سە</day>
-							<day type="wed" draft="unconfirmed">سا</day>
-							<day type="thu" draft="unconfirmed">بە</day>
-							<day type="fri" draft="unconfirmed">جۇ</day>
-							<day type="sat" draft="unconfirmed">سن</day>
+							<day type="sun">جە</day>
+							<day type="mon">دۇ</day>
+							<day type="tue">سە</day>
+							<day type="wed">سا</day>
+							<day type="thu">بە</day>
+							<day type="fri">جۇ</day>
+							<day type="sat">سن</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">جەكسەنبى</day>
-							<day type="mon" draft="unconfirmed">دۇيسەنبى</day>
-							<day type="tue" draft="unconfirmed">سەيسەنبى</day>
-							<day type="wed" draft="unconfirmed">سارسەنبى</day>
-							<day type="thu" draft="unconfirmed">بەيسەنبى</day>
-							<day type="fri" draft="unconfirmed">جۇما</day>
-							<day type="sat" draft="unconfirmed">سەنبى</day>
+							<day type="sun">جەكسەنبى</day>
+							<day type="mon">دۇيسەنبى</day>
+							<day type="tue">سەيسەنبى</day>
+							<day type="wed">سارسەنبى</day>
+							<day type="thu">بەيسەنبى</day>
+							<day type="fri">جۇما</day>
+							<day type="sat">سەنبى</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">جەك</day>
-							<day type="mon" draft="unconfirmed">دۇي</day>
-							<day type="tue" draft="unconfirmed">سەي</day>
-							<day type="wed" draft="unconfirmed">سار</day>
-							<day type="thu" draft="unconfirmed">بەي</day>
-							<day type="fri" draft="unconfirmed">جۇم</day>
-							<day type="sat" draft="unconfirmed">سەن</day>
-						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">ج</day>
-							<day type="mon" draft="unconfirmed">د</day>
-							<day type="tue" draft="unconfirmed">س</day>
-							<day type="wed" draft="unconfirmed">س</day>
-							<day type="thu" draft="unconfirmed">ب</day>
-							<day type="fri" draft="unconfirmed">ج</day>
-							<day type="sat" draft="unconfirmed">س</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">جە</day>
-							<day type="mon" draft="unconfirmed">دۇ</day>
-							<day type="tue" draft="unconfirmed">سە</day>
-							<day type="wed" draft="unconfirmed">سا</day>
-							<day type="thu" draft="unconfirmed">بە</day>
-							<day type="fri" draft="unconfirmed">جۇ</day>
-							<day type="sat" draft="unconfirmed">سن</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">جەكسەنبى</day>
-							<day type="mon" draft="unconfirmed">دۇيسەنبى</day>
-							<day type="tue" draft="unconfirmed">سەيسەنبى</day>
-							<day type="wed" draft="unconfirmed">سارسەنبى</day>
-							<day type="thu" draft="unconfirmed">بەيسەنبى</day>
-							<day type="fri" draft="unconfirmed">جۇما</day>
-							<day type="sat" draft="unconfirmed">سەنبى</day>
+							<day type="sun">ج</day>
+							<day type="mon">د</day>
+							<day type="tue">س</day>
+							<day type="wed">س</day>
+							<day type="thu">ب</day>
+							<day type="fri">ج</day>
+							<day type="sat">س</day>
 						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1-توقسان</quarter>
-							<quarter type="2" draft="unconfirmed">2-توقسان</quarter>
-							<quarter type="3" draft="unconfirmed">3-توقسان</quarter>
-							<quarter type="4" draft="unconfirmed">4-توقسان</quarter>
+							<quarter type="1">1- توقسان</quarter>
+							<quarter type="2">2- توقسان</quarter>
+							<quarter type="3">3- توقسان</quarter>
+							<quarter type="4">4- توقسان</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">ءبىرىنشى توقسان</quarter>
-							<quarter type="2" draft="unconfirmed">ەكىنشى توقسان</quarter>
-							<quarter type="3" draft="unconfirmed">ءۇشىنشى توقسان</quarter>
-							<quarter type="4" draft="unconfirmed">ءتورتىنشى توقسان</quarter>
+							<quarter type="1">ءبىرىنشى توقسان</quarter>
+							<quarter type="2">ەكىنشى توقسان</quarter>
+							<quarter type="3">ءۇشىنشى توقسان</quarter>
+							<quarter type="4">ءتورتىنشى توقسان</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1-توقسان</quarter>
-							<quarter type="2" draft="unconfirmed">2-توقسان</quarter>
-							<quarter type="3" draft="unconfirmed">3-توقسان</quarter>
-							<quarter type="4" draft="unconfirmed">4-توقسان</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">ءبىرىنشى توقسان</quarter>
-							<quarter type="2" draft="unconfirmed">ەكىنشى توقسان</quarter>
-							<quarter type="3" draft="unconfirmed">ءۇشىنشى توقسان</quarter>
-							<quarter type="4" draft="unconfirmed">ءتورتىنشى توقسان</quarter>
+							<quarter type="1">1- توقسان</quarter>
+							<quarter type="2">2- توقسان</quarter>
+							<quarter type="3">3- توقسان</quarter>
+							<quarter type="4">4- توقسان</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="midnight" draft="unconfirmed">ءتۇن جارىمى</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">ت د</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">تۇسكى</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ت ك</dayPeriod>
-							<dayPeriod type="morning1" draft="unconfirmed">تاڭعى</dayPeriod>
-							<dayPeriod type="afternoon1" draft="unconfirmed">تۇستەن كەيىنگى</dayPeriod>
-							<dayPeriod type="evening1" draft="unconfirmed">كەش</dayPeriod>
-							<dayPeriod type="night1" draft="unconfirmed">تۇنگى</dayPeriod>
+							<dayPeriod type="midnight">ءتۇن جارىمى</dayPeriod>
+							<dayPeriod type="am">ت د</dayPeriod>
+							<dayPeriod type="noon">تۇسكى</dayPeriod>
+							<dayPeriod type="pm">ت ك</dayPeriod>
+							<dayPeriod type="morning1">تاڭعى</dayPeriod>
+							<dayPeriod type="afternoon1">تۇستەن كەيىنگى</dayPeriod>
+							<dayPeriod type="evening1">كەش</dayPeriod>
+							<dayPeriod type="night1">تۇنگى</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight" draft="unconfirmed">تۇنگى</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">ت د</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">تۇسكى</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ت ك</dayPeriod>
-							<dayPeriod type="morning1" draft="unconfirmed">تاڭعى</dayPeriod>
-							<dayPeriod type="afternoon1" draft="unconfirmed">تۇستەن كەيىنگى</dayPeriod>
-							<dayPeriod type="evening1" draft="unconfirmed">كەشكى</dayPeriod>
-							<dayPeriod type="night1" draft="unconfirmed">تۇنگى</dayPeriod>
+							<dayPeriod type="midnight">تۇنگى</dayPeriod>
+							<dayPeriod type="noon">تۇسكى</dayPeriod>
+							<dayPeriod type="morning1">تاڭعى</dayPeriod>
+							<dayPeriod type="afternoon1">تۇستەن كەيىنگى</dayPeriod>
+							<dayPeriod type="evening1">كەش</dayPeriod>
+							<dayPeriod type="night1">تۇنگى</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight" draft="unconfirmed">ءتۇن جارىمى</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">ت د</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">تۇسكى</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ت ك</dayPeriod>
-							<dayPeriod type="morning1" draft="unconfirmed">تاڭعى</dayPeriod>
-							<dayPeriod type="afternoon1" draft="unconfirmed">تۇستەن كەيىنگى</dayPeriod>
-							<dayPeriod type="evening1" draft="unconfirmed">كەشى</dayPeriod>
-							<dayPeriod type="night1" draft="unconfirmed">تۇنگى</dayPeriod>
+							<dayPeriod type="midnight">ءتۇن جارىمى</dayPeriod>
+							<dayPeriod type="am">ت د</dayPeriod>
+							<dayPeriod type="noon">تۇسكى</dayPeriod>
+							<dayPeriod type="pm">ت ك</dayPeriod>
+							<dayPeriod type="morning1">تاڭعى</dayPeriod>
+							<dayPeriod type="afternoon1">تۇستەن كەيىنگى</dayPeriod>
+							<dayPeriod type="evening1">كەشى</dayPeriod>
+							<dayPeriod type="night1">تۇنگى</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="midnight" draft="unconfirmed">ءتۇن جارىمى</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">ت د</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">ءتالتۇس</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ت ك</dayPeriod>
-							<dayPeriod type="morning1" draft="unconfirmed">تاڭ</dayPeriod>
-							<dayPeriod type="afternoon1" draft="unconfirmed">تۇستەن كەيىن</dayPeriod>
-							<dayPeriod type="evening1" draft="unconfirmed">كەش</dayPeriod>
-							<dayPeriod type="night1" draft="unconfirmed">ءتۇن</dayPeriod>
+							<dayPeriod type="noon">تال ءتۇس</dayPeriod>
+							<dayPeriod type="morning1">تاڭ</dayPeriod>
+							<dayPeriod type="afternoon1">تۇستەن كەيىن</dayPeriod>
+							<dayPeriod type="evening1">كەش</dayPeriod>
+							<dayPeriod type="night1">ءتۇن</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight" draft="unconfirmed">ءتۇن جارىمى</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">ت د</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">تال ءتۇس</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ت ك</dayPeriod>
-							<dayPeriod type="morning1" draft="unconfirmed">تاڭ</dayPeriod>
-							<dayPeriod type="afternoon1" draft="unconfirmed">تۇستەن كەيىن</dayPeriod>
-							<dayPeriod type="evening1" draft="unconfirmed">كەش</dayPeriod>
-							<dayPeriod type="night1" draft="unconfirmed">ءتۇن</dayPeriod>
+							<dayPeriod type="noon">تال ءتۇس</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight" draft="unconfirmed">ءتۇن جارىمى</dayPeriod>
-							<dayPeriod type="am" draft="unconfirmed">ت د</dayPeriod>
-							<dayPeriod type="noon" draft="unconfirmed">تال ءتۇس</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">ت ك</dayPeriod>
-							<dayPeriod type="morning1" draft="unconfirmed">تاڭ</dayPeriod>
-							<dayPeriod type="afternoon1" draft="unconfirmed">تۇستەن كەيىن</dayPeriod>
-							<dayPeriod type="evening1" draft="unconfirmed">كەش</dayPeriod>
-							<dayPeriod type="night1" draft="unconfirmed">ءتۇن</dayPeriod>
+							<dayPeriod type="am">ت د</dayPeriod>
+							<dayPeriod type="noon">تال ءتۇس</dayPeriod>
+							<dayPeriod type="pm">ت ك</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">ءبىزدىڭ زامانىمىزعا دەيىن</era>
-						<era type="0" alt="variant" draft="unconfirmed">ءبىزدىڭ زامانىمىزعا دەيىن</era>
-						<era type="1" draft="unconfirmed">ءبىزدىڭ زامانىمىز</era>
-						<era type="1" alt="variant" draft="unconfirmed">ءبىزدىڭ زامانىمىز</era>
+						<era type="0">ءبىزدىڭ زامانىمىزعا دەيىن</era>
+						<era type="0" alt="variant">ءبىزدىڭ زامانىمىزعا دەيىن</era>
+						<era type="1">ءبىزدىڭ زامانىمىز</era>
+						<era type="1" alt="variant">ءبىزدىڭ زامانىمىز</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">ب ز د</era>
-						<era type="1" draft="unconfirmed">ب ز</era>
+						<era type="0">ب ز د</era>
+						<era type="1">ب ز</era>
 					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="unconfirmed">ب ز د</era>
-						<era type="0" alt="variant" draft="unconfirmed">ب ز د</era>
-						<era type="1" draft="unconfirmed">ب ز</era>
-						<era type="1" alt="variant" draft="unconfirmed">ب ز</era>
-					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="unconfirmed">y d-MMMM، EEEE</pattern>
+							<pattern>y، d- MMMM، EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern draft="unconfirmed">d-MMMM، y</pattern>
+							<pattern>y، d- MMMM</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern draft="unconfirmed">d-MMM، y</pattern>
+							<pattern>y، d- MMM</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">dd-MM-y</pattern>
+							<pattern>dd-MM-y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}، {0}</pattern>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}، {0}</pattern>
+							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed" draft="unconfirmed">d E</dateFormatItem>
-						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">G d-M-y</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">y MMM G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">y d-MMM G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">y d-MMM، E G</dateFormatItem>
-						<dateFormatItem id="Md" draft="unconfirmed">d-M</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">d-M، E</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="unconfirmed">d-MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="unconfirmed">d-MMM، E</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="unconfirmed">d-MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one" draft="unconfirmed">اپتاسى-W ايىنىڭ MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">اپتاسى-W ايىنىڭ MMMM</dateFormatItem>
-						<dateFormatItem id="yM" draft="unconfirmed">M-y</dateFormatItem>
-						<dateFormatItem id="yMd" draft="unconfirmed">y-d-M</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="unconfirmed">y-d-M، E</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="unconfirmed">y d-MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="unconfirmed">y d-MMM، E</dateFormatItem>
-						<dateFormatItem id="yw" count="one" draft="unconfirmed">اپتاسى-w جىلدىڭ Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other" draft="unconfirmed">اپتاسى-w جىلدىڭ Y</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="GyMd">G d-M-y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd، E</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y، d- MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y، d- MMM، E</dateFormatItem>
+						<dateFormatItem id="Md">d-M</dateFormatItem>
+						<dateFormatItem id="MEd">d-M، E</dateFormatItem>
+						<dateFormatItem id="MMMd">d- MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">d- MMM، E</dateFormatItem>
+						<dateFormatItem id="MMMMd">d- MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">MMMM ايىنىڭ W اپتاسى</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM ايىنىڭ W اپتاسى</dateFormatItem>
+						<dateFormatItem id="yM">M-y</dateFormatItem>
+						<dateFormatItem id="yMd">y-d-M</dateFormatItem>
+						<dateFormatItem id="yMEd">y-d-M، E</dateFormatItem>
+						<dateFormatItem id="yMMMd">y d- MMM</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y d- MMM، E</dateFormatItem>
+						<dateFormatItem id="yw" count="one">Y جىلدىڭ w اپتاسى</dateFormatItem>
+						<dateFormatItem id="yw" count="other">Y جىلدىڭ w اپتاسى</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G" draft="unconfirmed">G y-M – G y-M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">G y-M – y-M</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">G y-M – y-M</greatestDifference>
+							<greatestDifference id="G">G y-M – G y-M</greatestDifference>
+							<greatestDifference id="M">G y-M – y-M</greatestDifference>
+							<greatestDifference id="y">G y-M – y-M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d" draft="unconfirmed">G y-M-d – y-M-d</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">G y-M-d – G y-M-d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">G y-M-d – y-M-d</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">G y-M-d – y-M-d</greatestDifference>
+							<greatestDifference id="d">G y-M-d – y-M-d</greatestDifference>
+							<greatestDifference id="G">G y-M-d – G y-M-d</greatestDifference>
+							<greatestDifference id="M">G y-M-d – y-M-d</greatestDifference>
+							<greatestDifference id="y">G y-M-d – y-M-d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">G y-M-d، E – y-M-d، E</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">G y-M-d، E – G y-M-d، E</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">G y-M-d، E – y-M-d، E</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">G y-M-d، E – y-M-d، E</greatestDifference>
+							<greatestDifference id="d">G y-M-d، E – y-M-d، E</greatestDifference>
+							<greatestDifference id="G">G y-M-d، E – G y-M-d، E</greatestDifference>
+							<greatestDifference id="M">G y-M-d، E – y-M-d، E</greatestDifference>
+							<greatestDifference id="y">G y-M-d، E – y-M-d، E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d" draft="unconfirmed">G y، MMM d–d</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">G y، MMM d – G y، MMM d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">G y، MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">G y، MMM d – y، MMM d</greatestDifference>
+							<greatestDifference id="d">G y، MMM d–d</greatestDifference>
+							<greatestDifference id="G">G y، MMM d – G y، MMM d</greatestDifference>
+							<greatestDifference id="M">G y، MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">G y، MMM d – y، MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">G y، d MMM، E – d MMM، E</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">G y، d MMM، E – G y، d MMM، E</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">G y، d MMM، E – d MMM، E</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">G y، d MMM، E – y d MMM، E</greatestDifference>
+							<greatestDifference id="d">G y، d MMM، E – d MMM، E</greatestDifference>
+							<greatestDifference id="G">G y، d MMM، E – G y، d MMM، E</greatestDifference>
+							<greatestDifference id="M">G y، d MMM، E – d MMM، E</greatestDifference>
+							<greatestDifference id="y">G y، d MMM، E – y d MMM، E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
+							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">M-d – M-d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M-d – M-d</greatestDifference>
+							<greatestDifference id="d">M-d – M-d</greatestDifference>
+							<greatestDifference id="M">M-d – M-d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">M-d، E – M-d، E</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M-d، E – M-d، E</greatestDifference>
+							<greatestDifference id="d">M-d، E – M-d، E</greatestDifference>
+							<greatestDifference id="M">M-d، E – M-d، E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">MMM d، E – MMM d، E</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM d، E – MMM d، E</greatestDifference>
+							<greatestDifference id="d">MMM d، E – MMM d، E</greatestDifference>
+							<greatestDifference id="M">MMM d، E – MMM d، E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">y-M – y-M</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-M – y-M</greatestDifference>
+							<greatestDifference id="M">y-M – y-M</greatestDifference>
+							<greatestDifference id="y">y-M – y-M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">y-M-d – y-M-d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">y-M-d – y-M-d</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-M-d – y-M-d</greatestDifference>
+							<greatestDifference id="d">y-M-d – y-M-d</greatestDifference>
+							<greatestDifference id="M">y-M-d – y-M-d</greatestDifference>
+							<greatestDifference id="y">y-M-d – y-M-d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">y-M-d، E – y-M-d، E</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">y-M-d، E – y-M-d، E</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y-M-d، E – y-M-d، E</greatestDifference>
+							<greatestDifference id="d">y-M-d، E – y-M-d، E</greatestDifference>
+							<greatestDifference id="M">y-M-d، E – y-M-d، E</greatestDifference>
+							<greatestDifference id="y">y-M-d، E – y-M-d، E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">y، MMM d–d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">y، MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y، MMM d – y، MMM d</greatestDifference>
+							<greatestDifference id="d">y، MMM d–d</greatestDifference>
+							<greatestDifference id="M">y، MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">y، MMM d – y، MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">y MMM d، E – MMM d، E</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">y MMM d، E – MMM d، E</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y MMM d، E – y MMM d، E</greatestDifference>
+							<greatestDifference id="d">y MMM d، E – MMM d، E</greatestDifference>
+							<greatestDifference id="M">y MMM d، E – MMM d، E</greatestDifference>
+							<greatestDifference id="y">y MMM d، E – y MMM d، E</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1851,7060 +1906,4936 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName draft="unconfirmed">ءداۋىر</displayName>
-			</field>
-			<field type="era-short">
-				<displayName draft="unconfirmed">ءداۋىر</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName draft="unconfirmed">ءداۋىر</displayName>
+				<displayName>ءداۋىر</displayName>
 			</field>
 			<field type="year">
-				<displayName draft="unconfirmed">جىل</displayName>
-				<relative type="-1" draft="unconfirmed">بىلتىرعى جىل</relative>
-				<relative type="0" draft="unconfirmed">بيىلعى جىل</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جىل</relative>
+				<displayName>جىل</displayName>
+				<relative type="-1">بىلتىرعى جىل</relative>
+				<relative type="0">بيىلعى جىل</relative>
+				<relative type="1">كەلەسى جىل</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جىلدان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جىلدان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} جىلدان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} جىلدان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جىل بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جىل بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-short">
-				<displayName draft="unconfirmed">جىل</displayName>
-				<relative type="-1" draft="unconfirmed">بىلتىرعى جىل</relative>
-				<relative type="0" draft="unconfirmed">بيىلعى جىل</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جىل</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جىلدان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جىلدان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جىل بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جىل بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-narrow">
-				<displayName draft="unconfirmed">جىل</displayName>
-				<relative type="-1" draft="unconfirmed">بىلتىرعى جىل</relative>
-				<relative type="0" draft="unconfirmed">بيىلعى جىل</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جىل</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جىلدان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جىلدان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جىل بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جىل بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} جىل بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} جىل بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName draft="unconfirmed">شيرەك</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن توقسان</relative>
-				<relative type="0" draft="unconfirmed">وسى توقسان</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى توقسان</relative>
+				<displayName>شيرەك</displayName>
+				<relative type="-1">وتكەن توقسان</relative>
+				<relative type="0">وسى توقسان</relative>
+				<relative type="1">كەلەسى توقسان</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} توقساننان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} توقساننان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} توقساننان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} توقساننان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} توقسان بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} توقسان بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-short">
-				<displayName draft="unconfirmed">شيرەك</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن توقسان</relative>
-				<relative type="0" draft="unconfirmed">وسى توقسان</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى توقسان</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} توقساننان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} توقساننان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} توقسان بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} توقسان بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-narrow">
-				<displayName draft="unconfirmed">شيرەك</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن توقسان</relative>
-				<relative type="0" draft="unconfirmed">وسى توقسان</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى توقسان</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} توقساننان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} توقساننان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} توقسان بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} توقسان بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} توقسان بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} توقسان بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName draft="unconfirmed">اي</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن اي</relative>
-				<relative type="0" draft="unconfirmed">وسى اي</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى اي</relative>
+				<displayName>اي</displayName>
+				<relative type="-1">وتكەن اي</relative>
+				<relative type="0">وسى اي</relative>
+				<relative type="1">كەلەسى اي</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ايدان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ايدان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ايدان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ايدان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اي بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اي بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-short">
-				<displayName draft="unconfirmed">اي</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن اي</relative>
-				<relative type="0" draft="unconfirmed">وسى اي</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى اي</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ايدان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ايدان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اي بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اي بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="month-narrow">
-				<displayName draft="unconfirmed">اي</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن اي</relative>
-				<relative type="0" draft="unconfirmed">وسى اي</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى اي</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ايدان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ايدان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اي بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اي بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} اي بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اي بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName draft="unconfirmed">اپتا</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن اپتا</relative>
-				<relative type="0" draft="unconfirmed">وسى اپتا</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى اپتا</relative>
+				<displayName>اپتا</displayName>
+				<relative type="-1">وتكەن اپتا</relative>
+				<relative type="0">وسى اپتا</relative>
+				<relative type="1">كەلەسى اپتا</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اپتادان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اپتادان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} اپتادان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اپتادان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اپتا بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اپتا بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} اپتا بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اپتا بۇرىن</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod draft="unconfirmed">{0} اپتاسى</relativePeriod>
-			</field>
-			<field type="week-short">
-				<displayName draft="unconfirmed">اپتا</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن اپتا</relative>
-				<relative type="0" draft="unconfirmed">وسى اپتا</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى اپتا</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اپتادان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اپتادان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اپتا بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اپتا بۇرىن</relativeTimePattern>
-				</relativeTime>
-				<relativePeriod draft="unconfirmed">{0} اپتاسى</relativePeriod>
-			</field>
-			<field type="week-narrow">
-				<displayName draft="unconfirmed">اپتا</displayName>
-				<relative type="-1" draft="unconfirmed">وتكەن اپتا</relative>
-				<relative type="0" draft="unconfirmed">وسى اپتا</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى اپتا</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اپتادان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اپتادان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} اپتا بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} اپتا بۇرىن</relativeTimePattern>
-				</relativeTime>
-				<relativePeriod draft="unconfirmed">{0} اپتاسى</relativePeriod>
+				<relativePeriod>{0} اپتاسى</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
-				<displayName draft="unconfirmed">ايداعى اپتا</displayName>
-			</field>
-			<field type="weekOfMonth-short">
-				<displayName draft="unconfirmed">ايداعى اپتا</displayName>
-			</field>
-			<field type="weekOfMonth-narrow">
-				<displayName draft="unconfirmed">ايداعى اپتا</displayName>
+				<displayName>ايداعى اپتا</displayName>
 			</field>
 			<field type="day">
-				<displayName draft="unconfirmed">كۇن</displayName>
-				<relative type="-1" draft="unconfirmed">كەشە</relative>
-				<relative type="0" draft="unconfirmed">بۇگىن</relative>
-				<relative type="1" draft="unconfirmed">ەرتەڭ</relative>
+				<displayName>كۇن</displayName>
+				<relative type="-1">كەشە</relative>
+				<relative type="0">بۇگىن</relative>
+				<relative type="1">ەرتەڭ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} كۇننەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} كۇننەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} كۇننەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} كۇننەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} كۇن بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} كۇن بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day-short">
-				<displayName draft="unconfirmed">كۇن</displayName>
-				<relative type="-1" draft="unconfirmed">كەشە</relative>
-				<relative type="0" draft="unconfirmed">بۇگىن</relative>
-				<relative type="1" draft="unconfirmed">ەرتەڭ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} كۇننەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} كۇننەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} كۇن بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} كۇن بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="day-narrow">
-				<displayName draft="unconfirmed">كۇن</displayName>
-				<relative type="-1" draft="unconfirmed">كەشە</relative>
-				<relative type="0" draft="unconfirmed">بۇگىن</relative>
-				<relative type="1" draft="unconfirmed">ەرتەڭ</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} كۇننەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} كۇننەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} كۇن بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} كۇن بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} كۇن بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} كۇن بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayOfYear">
-				<displayName draft="unconfirmed">جىلداعى كۇن</displayName>
-			</field>
-			<field type="dayOfYear-short">
-				<displayName draft="unconfirmed">جىلداعى كۇن</displayName>
-			</field>
-			<field type="dayOfYear-narrow">
-				<displayName draft="unconfirmed">جىلداعى كۇن</displayName>
+				<displayName>جىلداعى كۇن</displayName>
 			</field>
 			<field type="weekday">
-				<displayName draft="unconfirmed">اپتا كۇنى</displayName>
-			</field>
-			<field type="weekday-short">
-				<displayName draft="unconfirmed">اپتا كۇنى</displayName>
-			</field>
-			<field type="weekday-narrow">
-				<displayName draft="unconfirmed">اپتا كۇنى</displayName>
+				<displayName>اپتا كۇنى</displayName>
 			</field>
 			<field type="weekdayOfMonth">
-				<displayName draft="unconfirmed">ايداعى اپتا كۇنى</displayName>
-			</field>
-			<field type="weekdayOfMonth-short">
-				<displayName draft="unconfirmed">ايداعى اپتا كۇنى</displayName>
-			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName draft="unconfirmed">ايداعى اپتا كۇنى</displayName>
+				<displayName>ايداعى اپتا كۇنى</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1" draft="unconfirmed">وتكەن جەكسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى جەكسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جەكسەنبى</relative>
+				<relative type="-1">وتكەن جەكسەنبى</relative>
+				<relative type="0">وسى جەكسەنبى</relative>
+				<relative type="1">كەلەسى جەكسەنبى</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جەكسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جەكسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sun-short">
-				<relative type="-1" draft="unconfirmed">وتكەن جەكسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى جەكسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جەكسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جەكسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جەكسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sun-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن جەكسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى جەكسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جەكسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جەكسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جەكسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جەكسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} جەكسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} جەكسەنبى بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon">
-				<relative type="-1" draft="unconfirmed">وتكەن دۇيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى دۇيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى دۇيسەنبى</relative>
+				<relative type="-1">وتكەن دۇيسەنبى</relative>
+				<relative type="0">وسى دۇيسەنبى</relative>
+				<relative type="1">كەلەسى دۇيسەنبى</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="mon-short">
-				<relative type="-1" draft="unconfirmed">وتكەن دۇيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى دۇيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى دۇيسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="mon-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن دۇيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى دۇيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى دۇيسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} دۇيسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} دۇيسەنبى بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue">
-				<relative type="-1" draft="unconfirmed">وتكەن سەيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سەيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سەيسەنبى</relative>
+				<relative type="-1">وتكەن سەيسەنبى</relative>
+				<relative type="0">وسى سەيسەنبى</relative>
+				<relative type="1">كەلەسى سەيسەنبى</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەيسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="tue-short">
-				<relative type="-1" draft="unconfirmed">وتكەن سەيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سەيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سەيسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەيسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="tue-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن سەيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سەيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سەيسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەيسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەيسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سەيسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سەيسەنبى بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed">
-				<relative type="-1" draft="unconfirmed">وتكەن سارساەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سارسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سارسەنبى</relative>
+				<relative type="-1">وتكەن سارساەنبى</relative>
+				<relative type="0">وسى سارسەنبى</relative>
+				<relative type="1">كەلەسى سارسەنبى</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سارسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سارسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="wed-short">
-				<relative type="-1" draft="unconfirmed">وتكەن سارساەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سارسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سارسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سارسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سارسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="wed-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن سارساەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سارسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سارسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سارسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سارسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سارسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سارسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سارسەنبى بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu">
-				<relative type="-1" draft="unconfirmed">وتكەن بەيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى بەيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى بەيسەنبى</relative>
+				<relative type="-1">وتكەن بەيسەنبى</relative>
+				<relative type="0">وسى بەيسەنبى</relative>
+				<relative type="1">كەلەسى بەيسەنبى</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} بەيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} بەيسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="thu-short">
-				<relative type="-1" draft="unconfirmed">وتكەن بەيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى بەيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى بەيسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} بەيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} بەيسەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="thu-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن بەيسەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى بەيسەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى بەيسەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} بەيسەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} بەيسەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} بەيسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} بەيسەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} بەيسەنبى بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri">
-				<relative type="-1" draft="unconfirmed">وتكەن جۇما</relative>
-				<relative type="0" draft="unconfirmed">وسى جۇما</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جۇما</relative>
+				<relative type="-1">وتكەن جۇما</relative>
+				<relative type="0">وسى جۇما</relative>
+				<relative type="1">كەلەسى جۇما</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جۇمادان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جۇمادان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} جۇمادان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} جۇمادان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جۇما بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جۇما بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="fri-short">
-				<relative type="-1" draft="unconfirmed">وتكەن جۇما</relative>
-				<relative type="0" draft="unconfirmed">وسى جۇما</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جۇما</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جۇمادان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جۇمادان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جۇما بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جۇما بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="fri-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن جۇما</relative>
-				<relative type="0" draft="unconfirmed">وسى جۇما</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى جۇما</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جۇمادان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جۇمادان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} جۇما بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} جۇما بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} جۇما بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} جۇما بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat">
-				<relative type="-1" draft="unconfirmed">وتكەن سەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سەنبى</relative>
+				<relative type="-1">وتكەن سەنبى</relative>
+				<relative type="0">وسى سەنبى</relative>
+				<relative type="1">كەلەسى سەنبى</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سەنبىدەن كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سەنبىدەن كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سەنبى بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سەنبى بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sat-short">
-				<relative type="-1" draft="unconfirmed">وتكەن سەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sat-narrow">
-				<relative type="-1" draft="unconfirmed">وتكەن سەنبى</relative>
-				<relative type="0" draft="unconfirmed">وسى سەنبى</relative>
-				<relative type="1" draft="unconfirmed">كەلەسى سەنبى</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەنبىدەن كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەنبىدەن كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەنبى بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەنبى بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="dayperiod-short">
-				<displayName draft="unconfirmed">تۇسكە دەيىن/تۇستەن كەيىن</displayName>
-			</field>
 			<field type="dayperiod">
-				<displayName draft="unconfirmed">تۇسكە دەيىن/تۇستەن كەيىن</displayName>
-			</field>
-			<field type="dayperiod-narrow">
-				<displayName draft="unconfirmed">تۇسكە دەيىن/تۇستەن كەيىن</displayName>
+				<displayName>تۇسكە دەيىن/تۇستەن كەيىن</displayName>
 			</field>
 			<field type="hour">
-				<displayName draft="unconfirmed">ساعات</displayName>
-				<relative type="0" draft="unconfirmed">وسى ساعات</relative>
+				<displayName>ساعات</displayName>
+				<relative type="0">وسى ساعات</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ساعاتتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ساعاتتان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ساعاتتان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ساعاتتان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ساعات بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ساعات بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="hour-short">
-				<displayName draft="unconfirmed">ساعات</displayName>
-				<relative type="0" draft="unconfirmed">وسى ساعات</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ساعاتتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ساعاتتان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ساعات بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ساعات بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="hour-narrow">
-				<displayName draft="unconfirmed">ساعات</displayName>
-				<relative type="0" draft="unconfirmed">وسى ساعات</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ساعاتتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ساعاتتان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} ساعات بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} ساعات بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ساعات بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ساعات بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName draft="unconfirmed">مينۋت</displayName>
-				<relative type="0" draft="unconfirmed">وسى مينۋت</relative>
+				<displayName>مينۋت</displayName>
+				<relative type="0">وسى مينۋت</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} مينۋتتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} مينۋتتان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} مينۋتتان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} مينۋتتان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} مينۋت بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} مينۋت بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-short">
-				<displayName draft="unconfirmed">مينۋت</displayName>
-				<relative type="0" draft="unconfirmed">وسى مينۋت</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} مينۋتتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} مينۋتتان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} مينۋت بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} مينۋت بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="minute-narrow">
-				<displayName draft="unconfirmed">مينۋت</displayName>
-				<relative type="0" draft="unconfirmed">وسى مينۋت</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} مينۋتتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} مينۋتتان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} مينۋت بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} مينۋت بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} مينۋت بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} مينۋت بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
-				<displayName draft="unconfirmed">سەكۋند</displayName>
-				<relative type="0" draft="unconfirmed">قازىر</relative>
+				<displayName>سەكۋند</displayName>
+				<relative type="0">قازىر</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەكۋندتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەكۋندتان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سەكۋندتان كەيىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سەكۋندتان كەيىن</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەكۋند بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەكۋند بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second-short">
-				<displayName draft="unconfirmed">سەكۋند</displayName>
-				<relative type="0" draft="unconfirmed">قازىر</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەكۋندتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەكۋندتان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەكۋند بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەكۋند بۇرىن</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="second-narrow">
-				<displayName draft="unconfirmed">سەكۋند</displayName>
-				<relative type="0" draft="unconfirmed">قازىر</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەكۋندتان كەيىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەكۋندتان كەيىن</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">{0} سەكۋند بۇرىن</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} سەكۋند بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سەكۋند بۇرىن</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سەكۋند بۇرىن</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName draft="unconfirmed">ۋاقىت بەلدەۋى</displayName>
-			</field>
-			<field type="zone-short">
-				<displayName draft="unconfirmed">ۋاقىت بەلدەۋى</displayName>
-			</field>
-			<field type="zone-narrow">
-				<displayName draft="unconfirmed">ۋاقىت بەلدەۋى</displayName>
+				<displayName>ۋاقىت بەلدەۋى</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat draft="unconfirmed">{0} ۋاقىتى</regionFormat>
-			<regionFormat type="daylight" draft="unconfirmed">{0} جازعى ۋاقىتى</regionFormat>
-			<regionFormat type="standard" draft="unconfirmed">{0} ستاندارتتى ۋاقىتى</regionFormat>
+			<regionFormat>{0} ۋاقىتى</regionFormat>
+			<regionFormat type="daylight">{0} جازعى ۋاقىتى</regionFormat>
+			<regionFormat type="standard">{0} ستاندارتتى ۋاقىتى</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
-					<standard draft="unconfirmed">دۇنيەجۇزىلىك ۇيلەستىرىلگەن ۋاقىت</standard>
+					<standard>دۇنيەجۇزىلىك ۇيلەستىرىلگەن ۋاقىت</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity draft="unconfirmed">بەلگىسىز قالا</exemplarCity>
+				<exemplarCity>بەلگىسىز قالا</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
-				<exemplarCity draft="unconfirmed">اندوررا</exemplarCity>
+				<exemplarCity>اندوررا</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
-				<exemplarCity draft="unconfirmed">دۋباي</exemplarCity>
+				<exemplarCity>دۋباي</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
-				<exemplarCity draft="unconfirmed">كابۋل</exemplarCity>
+				<exemplarCity>كابۋل</exemplarCity>
 			</zone>
 			<zone type="America/Antigua">
-				<exemplarCity draft="unconfirmed">انتيگۋا</exemplarCity>
+				<exemplarCity>انتيگۋا</exemplarCity>
 			</zone>
 			<zone type="America/Anguilla">
-				<exemplarCity draft="unconfirmed">انگيليا</exemplarCity>
+				<exemplarCity>انگيليا</exemplarCity>
 			</zone>
 			<zone type="Europe/Tirane">
-				<exemplarCity draft="unconfirmed">تيرانا</exemplarCity>
+				<exemplarCity>تيرانا</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
-				<exemplarCity draft="unconfirmed">يەرەۆان</exemplarCity>
+				<exemplarCity>يەرەۆان</exemplarCity>
 			</zone>
 			<zone type="Africa/Luanda">
-				<exemplarCity draft="unconfirmed">لۋاندا</exemplarCity>
+				<exemplarCity>لۋاندا</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Rothera">
-				<exemplarCity draft="unconfirmed">روتەرا</exemplarCity>
+				<exemplarCity>روتەرا</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Palmer">
-				<exemplarCity draft="unconfirmed">پالمەر</exemplarCity>
+				<exemplarCity>پالمەر</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Troll">
-				<exemplarCity draft="unconfirmed">ترول</exemplarCity>
+				<exemplarCity>ترول</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="unconfirmed">سەۆا</exemplarCity>
+				<exemplarCity>سەۆا</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Mawson">
-				<exemplarCity draft="unconfirmed">موۋسون</exemplarCity>
+				<exemplarCity>موۋسون</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Davis">
-				<exemplarCity draft="unconfirmed">دەيۆيس</exemplarCity>
+				<exemplarCity>دەيۆيس</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
-				<exemplarCity draft="unconfirmed">ۆوستوك</exemplarCity>
+				<exemplarCity>ۆوستوك</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Casey">
-				<exemplarCity draft="unconfirmed">كەيسي</exemplarCity>
+				<exemplarCity>كەيسي</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity draft="unconfirmed">ديۋمون-ديۋرۆيل</exemplarCity>
+				<exemplarCity>ديۋمون-ديۋرۆيل</exemplarCity>
 			</zone>
 			<zone type="Antarctica/McMurdo">
-				<exemplarCity draft="unconfirmed">ماك-مەردو</exemplarCity>
+				<exemplarCity>ماك-مەردو</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity draft="unconfirmed">ريو-گالەگوس</exemplarCity>
+				<exemplarCity>ريو-گالەگوس</exemplarCity>
 			</zone>
 			<zone type="America/Mendoza">
-				<exemplarCity draft="unconfirmed">مەندوزا</exemplarCity>
+				<exemplarCity>مەندوزا</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Juan">
-				<exemplarCity draft="unconfirmed">سان-حۋان</exemplarCity>
+				<exemplarCity>سان-حۋان</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity draft="unconfirmed">ۋشۋايا</exemplarCity>
+				<exemplarCity>ۋشۋايا</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity draft="unconfirmed">لا-ريوحا</exemplarCity>
+				<exemplarCity>لا-ريوحا</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/San_Luis">
-				<exemplarCity draft="unconfirmed">سان-لۋيس</exemplarCity>
+				<exemplarCity>سان-لۋيس</exemplarCity>
 			</zone>
 			<zone type="America/Catamarca">
-				<exemplarCity draft="unconfirmed">كاتاماركا</exemplarCity>
+				<exemplarCity>كاتاماركا</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Salta">
-				<exemplarCity draft="unconfirmed">سالتا</exemplarCity>
+				<exemplarCity>سالتا</exemplarCity>
 			</zone>
 			<zone type="America/Jujuy">
-				<exemplarCity draft="unconfirmed">جۋجۋي</exemplarCity>
+				<exemplarCity>جۋجۋي</exemplarCity>
 			</zone>
 			<zone type="America/Argentina/Tucuman">
-				<exemplarCity draft="unconfirmed">تۋكۋمان</exemplarCity>
+				<exemplarCity>تۋكۋمان</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
-				<exemplarCity draft="unconfirmed">كوردوبا</exemplarCity>
+				<exemplarCity>كوردوبا</exemplarCity>
 			</zone>
 			<zone type="America/Buenos_Aires">
-				<exemplarCity draft="unconfirmed">بۋەنوس-ايروس</exemplarCity>
+				<exemplarCity>بۋەنوس-ايروس</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pago_Pago">
-				<exemplarCity draft="unconfirmed">پاگو-پاگو</exemplarCity>
+				<exemplarCity>پاگو-پاگو</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
-				<exemplarCity draft="unconfirmed">ۆەنا</exemplarCity>
+				<exemplarCity>ۆەنا</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
-				<exemplarCity draft="unconfirmed">پەرت</exemplarCity>
+				<exemplarCity>پەرت</exemplarCity>
 			</zone>
 			<zone type="Australia/Eucla">
-				<exemplarCity draft="unconfirmed">يۋكلا</exemplarCity>
+				<exemplarCity>يۋكلا</exemplarCity>
 			</zone>
 			<zone type="Australia/Darwin">
-				<exemplarCity draft="unconfirmed">دارۆين</exemplarCity>
+				<exemplarCity>دارۆين</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity draft="unconfirmed">ادەلايدا</exemplarCity>
+				<exemplarCity>ادەلايدا</exemplarCity>
 			</zone>
 			<zone type="Australia/Broken_Hill">
-				<exemplarCity draft="unconfirmed">بروكەن-حيل</exemplarCity>
+				<exemplarCity>بروكەن-حيل</exemplarCity>
 			</zone>
 			<zone type="Australia/Melbourne">
-				<exemplarCity draft="unconfirmed">مەلبۋرن</exemplarCity>
+				<exemplarCity>مەلبۋرن</exemplarCity>
 			</zone>
 			<zone type="Australia/Hobart">
-				<exemplarCity draft="unconfirmed">حوبارت</exemplarCity>
+				<exemplarCity>حوبارت</exemplarCity>
 			</zone>
 			<zone type="Australia/Lindeman">
-				<exemplarCity draft="unconfirmed">ليندەمان</exemplarCity>
+				<exemplarCity>ليندەمان</exemplarCity>
 			</zone>
 			<zone type="Australia/Sydney">
-				<exemplarCity draft="unconfirmed">سيدنەي</exemplarCity>
+				<exemplarCity>سيدنەي</exemplarCity>
 			</zone>
 			<zone type="Australia/Brisbane">
-				<exemplarCity draft="unconfirmed">بريسبەن</exemplarCity>
+				<exemplarCity>بريسبەن</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity draft="unconfirmed">ماككۋوري</exemplarCity>
+				<exemplarCity>ماككۋوري</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity draft="unconfirmed">لورد-حاۋ</exemplarCity>
+				<exemplarCity>لورد-حاۋ</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
-				<exemplarCity draft="unconfirmed">ارۋبا</exemplarCity>
+				<exemplarCity>ارۋبا</exemplarCity>
 			</zone>
 			<zone type="Europe/Mariehamn">
-				<exemplarCity draft="unconfirmed">ماريەحامن</exemplarCity>
+				<exemplarCity>ماريەحامن</exemplarCity>
 			</zone>
 			<zone type="Asia/Baku">
-				<exemplarCity draft="unconfirmed">باكۋ</exemplarCity>
+				<exemplarCity>باكۋ</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
-				<exemplarCity draft="unconfirmed">ساراەۆو</exemplarCity>
+				<exemplarCity>ساراەۆو</exemplarCity>
 			</zone>
 			<zone type="America/Barbados">
-				<exemplarCity draft="unconfirmed">باربادوس</exemplarCity>
+				<exemplarCity>باربادوس</exemplarCity>
 			</zone>
 			<zone type="Asia/Dhaka">
-				<exemplarCity draft="unconfirmed">داككا</exemplarCity>
+				<exemplarCity>داككا</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
-				<exemplarCity draft="unconfirmed">بريۋسەل</exemplarCity>
+				<exemplarCity>بريۋسەل</exemplarCity>
 			</zone>
 			<zone type="Africa/Ouagadougou">
-				<exemplarCity draft="unconfirmed">ۋاگادۋگۋ</exemplarCity>
+				<exemplarCity>ۋاگادۋگۋ</exemplarCity>
 			</zone>
 			<zone type="Europe/Sofia">
-				<exemplarCity draft="unconfirmed">سوفيا</exemplarCity>
+				<exemplarCity>سوفيا</exemplarCity>
 			</zone>
 			<zone type="Asia/Bahrain">
-				<exemplarCity draft="unconfirmed">باحرەين</exemplarCity>
+				<exemplarCity>باحرەين</exemplarCity>
 			</zone>
 			<zone type="Africa/Bujumbura">
-				<exemplarCity draft="unconfirmed">بۋجۋمبۋرا</exemplarCity>
+				<exemplarCity>بۋجۋمبۋرا</exemplarCity>
 			</zone>
 			<zone type="Africa/Porto-Novo">
-				<exemplarCity draft="unconfirmed">پورتو-نوۆو</exemplarCity>
+				<exemplarCity>پورتو-نوۆو</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity draft="unconfirmed">سەن-بارتەلەمي</exemplarCity>
+				<exemplarCity>سەن-بارتەلەمي</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity draft="unconfirmed">بەرمۋد ارالدارى</exemplarCity>
+				<exemplarCity>بەرمۋد ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
-				<exemplarCity draft="unconfirmed">برۋنەي</exemplarCity>
+				<exemplarCity>برۋنەي</exemplarCity>
 			</zone>
 			<zone type="America/La_Paz">
-				<exemplarCity draft="unconfirmed">لا-پاس</exemplarCity>
+				<exemplarCity>لا-پاس</exemplarCity>
 			</zone>
 			<zone type="America/Kralendijk">
-				<exemplarCity draft="unconfirmed">كرالەندەيك</exemplarCity>
+				<exemplarCity>كرالەندەيك</exemplarCity>
 			</zone>
 			<zone type="America/Eirunepe">
-				<exemplarCity draft="unconfirmed">ەيرۋنەپە</exemplarCity>
+				<exemplarCity>ەيرۋنەپە</exemplarCity>
 			</zone>
 			<zone type="America/Rio_Branco">
-				<exemplarCity draft="unconfirmed">ريۋ-برانكۋ</exemplarCity>
+				<exemplarCity>ريۋ-برانكۋ</exemplarCity>
 			</zone>
 			<zone type="America/Porto_Velho">
-				<exemplarCity draft="unconfirmed">پورتو-ۆەليۋ</exemplarCity>
+				<exemplarCity>پورتو-ۆەليۋ</exemplarCity>
 			</zone>
 			<zone type="America/Boa_Vista">
-				<exemplarCity draft="unconfirmed">باو-ۆيستا</exemplarCity>
+				<exemplarCity>باو-ۆيستا</exemplarCity>
 			</zone>
 			<zone type="America/Manaus">
-				<exemplarCity draft="unconfirmed">ماناۋس</exemplarCity>
+				<exemplarCity>ماناۋس</exemplarCity>
 			</zone>
 			<zone type="America/Cuiaba">
-				<exemplarCity draft="unconfirmed">كۋيابا</exemplarCity>
+				<exemplarCity>كۋيابا</exemplarCity>
 			</zone>
 			<zone type="America/Santarem">
-				<exemplarCity draft="unconfirmed">سانتارەن</exemplarCity>
+				<exemplarCity>سانتارەن</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity draft="unconfirmed">كامپۋ-گراندە</exemplarCity>
+				<exemplarCity>كامپۋ-گراندە</exemplarCity>
 			</zone>
 			<zone type="America/Belem">
-				<exemplarCity draft="unconfirmed">بەلەم</exemplarCity>
+				<exemplarCity>بەلەم</exemplarCity>
 			</zone>
 			<zone type="America/Araguaina">
-				<exemplarCity draft="unconfirmed">اراگۋاينا</exemplarCity>
+				<exemplarCity>اراگۋاينا</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity draft="unconfirmed">سان-پۋالۋ</exemplarCity>
+				<exemplarCity>سان-پۋالۋ</exemplarCity>
 			</zone>
 			<zone type="America/Bahia">
-				<exemplarCity draft="unconfirmed">بايا</exemplarCity>
+				<exemplarCity>بايا</exemplarCity>
 			</zone>
 			<zone type="America/Fortaleza">
-				<exemplarCity draft="unconfirmed">فورتالەزا</exemplarCity>
+				<exemplarCity>فورتالەزا</exemplarCity>
 			</zone>
 			<zone type="America/Maceio">
-				<exemplarCity draft="unconfirmed">ماسەيو</exemplarCity>
+				<exemplarCity>ماسەيو</exemplarCity>
 			</zone>
 			<zone type="America/Recife">
-				<exemplarCity draft="unconfirmed">رەسيفي</exemplarCity>
+				<exemplarCity>رەسيفي</exemplarCity>
 			</zone>
 			<zone type="America/Noronha">
-				<exemplarCity draft="unconfirmed">نورونيا</exemplarCity>
+				<exemplarCity>نورونيا</exemplarCity>
 			</zone>
 			<zone type="America/Nassau">
-				<exemplarCity draft="unconfirmed">ناسساۋ</exemplarCity>
+				<exemplarCity>ناسساۋ</exemplarCity>
 			</zone>
 			<zone type="Asia/Thimphu">
-				<exemplarCity draft="unconfirmed">تحيمپحۋ</exemplarCity>
+				<exemplarCity>تحيمپحۋ</exemplarCity>
 			</zone>
 			<zone type="Africa/Gaborone">
-				<exemplarCity draft="unconfirmed">گابورونە</exemplarCity>
+				<exemplarCity>گابورونە</exemplarCity>
 			</zone>
 			<zone type="Europe/Minsk">
-				<exemplarCity draft="unconfirmed">مينسك</exemplarCity>
+				<exemplarCity>مينسك</exemplarCity>
 			</zone>
 			<zone type="America/Belize">
-				<exemplarCity draft="unconfirmed">بەليز</exemplarCity>
+				<exemplarCity>بەليز</exemplarCity>
 			</zone>
 			<zone type="America/Dawson">
-				<exemplarCity draft="unconfirmed">دوۋسون</exemplarCity>
+				<exemplarCity>دوۋسون</exemplarCity>
 			</zone>
 			<zone type="America/Whitehorse">
-				<exemplarCity draft="unconfirmed">ۋايتحورس</exemplarCity>
+				<exemplarCity>ۋايتحورس</exemplarCity>
 			</zone>
 			<zone type="America/Inuvik">
-				<exemplarCity draft="unconfirmed">ينۋۆيك</exemplarCity>
+				<exemplarCity>ينۋۆيك</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
-				<exemplarCity draft="unconfirmed">ۆانكۋۆەر</exemplarCity>
+				<exemplarCity>ۆانكۋۆەر</exemplarCity>
 			</zone>
 			<zone type="America/Fort_Nelson">
-				<exemplarCity draft="unconfirmed">فورت-نەلسون</exemplarCity>
+				<exemplarCity>فورت-نەلسون</exemplarCity>
 			</zone>
 			<zone type="America/Dawson_Creek">
-				<exemplarCity draft="unconfirmed">دوۋسون-كريك</exemplarCity>
+				<exemplarCity>دوۋسون-كريك</exemplarCity>
 			</zone>
 			<zone type="America/Creston">
-				<exemplarCity draft="unconfirmed">كرەستون</exemplarCity>
+				<exemplarCity>كرەستون</exemplarCity>
 			</zone>
 			<zone type="America/Edmonton">
-				<exemplarCity draft="unconfirmed">ەدمونتون</exemplarCity>
+				<exemplarCity>ەدمونتون</exemplarCity>
 			</zone>
 			<zone type="America/Swift_Current">
-				<exemplarCity draft="unconfirmed">سۋيات-كاررەنت</exemplarCity>
+				<exemplarCity>سۋيات-كاررەنت</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
-				<exemplarCity draft="unconfirmed">كەمبريج-بەي</exemplarCity>
+				<exemplarCity>كەمبريج-بەي</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity draft="unconfirmed">رەجاينا</exemplarCity>
+				<exemplarCity>رەجاينا</exemplarCity>
 			</zone>
 			<zone type="America/Winnipeg">
-				<exemplarCity draft="unconfirmed">ۆيننيپەگ</exemplarCity>
+				<exemplarCity>ۆيننيپەگ</exemplarCity>
 			</zone>
 			<zone type="America/Resolute">
-				<exemplarCity draft="unconfirmed">رەزوليۋت</exemplarCity>
+				<exemplarCity>رەزوليۋت</exemplarCity>
 			</zone>
 			<zone type="America/Rankin_Inlet">
-				<exemplarCity draft="unconfirmed">رانكين-ينلەت</exemplarCity>
+				<exemplarCity>رانكين-ينلەت</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
-				<exemplarCity draft="unconfirmed">اتيكوكان</exemplarCity>
+				<exemplarCity>اتيكوكان</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
-				<exemplarCity draft="unconfirmed">تورونتو</exemplarCity>
+				<exemplarCity>تورونتو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
-				<exemplarCity draft="unconfirmed">يكالۋيت</exemplarCity>
+				<exemplarCity>يكالۋيت</exemplarCity>
 			</zone>
 			<zone type="America/Moncton">
-				<exemplarCity draft="unconfirmed">مونكتون</exemplarCity>
+				<exemplarCity>مونكتون</exemplarCity>
 			</zone>
 			<zone type="America/Halifax">
-				<exemplarCity draft="unconfirmed">گاليفاكس</exemplarCity>
+				<exemplarCity>گاليفاكس</exemplarCity>
 			</zone>
 			<zone type="America/Goose_Bay">
-				<exemplarCity draft="unconfirmed">گۋس-بەي</exemplarCity>
+				<exemplarCity>گۋس-بەي</exemplarCity>
 			</zone>
 			<zone type="America/Glace_Bay">
-				<exemplarCity draft="unconfirmed">گلەيس-بەي</exemplarCity>
+				<exemplarCity>گلەيس-بەي</exemplarCity>
 			</zone>
 			<zone type="America/Blanc-Sablon">
-				<exemplarCity draft="unconfirmed">بلانك-سابلون</exemplarCity>
+				<exemplarCity>بلانك-سابلون</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity draft="unconfirmed">سەنت-جونس</exemplarCity>
+				<exemplarCity>سەنت-جونس</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
-				<exemplarCity draft="unconfirmed">كوكوس ارالدارى</exemplarCity>
+				<exemplarCity>كوكوس ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
-				<exemplarCity draft="unconfirmed">كينشاسا</exemplarCity>
+				<exemplarCity>كينشاسا</exemplarCity>
 			</zone>
 			<zone type="Africa/Lubumbashi">
-				<exemplarCity draft="unconfirmed">لۋبۋمباشي</exemplarCity>
+				<exemplarCity>لۋبۋمباشي</exemplarCity>
 			</zone>
 			<zone type="Africa/Bangui">
-				<exemplarCity draft="unconfirmed">بانگي</exemplarCity>
+				<exemplarCity>بانگي</exemplarCity>
 			</zone>
 			<zone type="Africa/Brazzaville">
-				<exemplarCity draft="unconfirmed">براززاۆيل</exemplarCity>
+				<exemplarCity>براززاۆيل</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
-				<exemplarCity draft="unconfirmed">سيۋريح</exemplarCity>
+				<exemplarCity>سيۋريح</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
-				<exemplarCity draft="unconfirmed">ابيدجان</exemplarCity>
+				<exemplarCity>ابيدجان</exemplarCity>
 			</zone>
 			<zone type="Pacific/Rarotonga">
-				<exemplarCity draft="unconfirmed">راروتونگا</exemplarCity>
+				<exemplarCity>راروتونگا</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity draft="unconfirmed">پاسحا ارالى</exemplarCity>
+				<exemplarCity>پاسحا ارالى</exemplarCity>
+			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>كويايكە</exemplarCity>
 			</zone>
 			<zone type="America/Punta_Arenas">
-				<exemplarCity draft="unconfirmed">پۋنتا-ارەناس</exemplarCity>
+				<exemplarCity>پۋنتا-ارەناس</exemplarCity>
 			</zone>
 			<zone type="America/Santiago">
-				<exemplarCity draft="unconfirmed">سانتياگو</exemplarCity>
+				<exemplarCity>سانتياگو</exemplarCity>
 			</zone>
 			<zone type="Africa/Douala">
-				<exemplarCity draft="unconfirmed">دۋالا</exemplarCity>
+				<exemplarCity>دۋالا</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity draft="unconfirmed">ءۇرىمشى</exemplarCity>
+				<exemplarCity>ءۇرىمشى</exemplarCity>
 			</zone>
 			<zone type="Asia/Shanghai">
-				<exemplarCity draft="unconfirmed">شانحاي</exemplarCity>
+				<exemplarCity>شانحاي</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
-				<exemplarCity draft="unconfirmed">بوگوتا</exemplarCity>
+				<exemplarCity>بوگوتا</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity draft="unconfirmed">كوستا-ريكا</exemplarCity>
+				<exemplarCity>كوستا-ريكا</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
-				<exemplarCity draft="unconfirmed">گاۆانا</exemplarCity>
+				<exemplarCity>گاۆانا</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity draft="unconfirmed">كابو-ۆەردە</exemplarCity>
+				<exemplarCity>كابو-ۆەردە</exemplarCity>
 			</zone>
 			<zone type="America/Curacao">
-				<exemplarCity draft="unconfirmed">كيۋراساو</exemplarCity>
+				<exemplarCity>كيۋراساو</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity draft="unconfirmed">كريستماس ارالدارى</exemplarCity>
+				<exemplarCity>كريستماس ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity draft="unconfirmed">نيكوسيا</exemplarCity>
+				<exemplarCity>نيكوسيا</exemplarCity>
 			</zone>
 			<zone type="Asia/Famagusta">
-				<exemplarCity draft="unconfirmed">فاماگۋستا</exemplarCity>
+				<exemplarCity>فاماگۋستا</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
-				<exemplarCity draft="unconfirmed">پراگا</exemplarCity>
+				<exemplarCity>پراگا</exemplarCity>
 			</zone>
 			<zone type="Europe/Busingen">
-				<exemplarCity draft="unconfirmed">بيۋزينگەن</exemplarCity>
+				<exemplarCity>بيۋزينگەن</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
-				<exemplarCity draft="unconfirmed">بەرلين</exemplarCity>
+				<exemplarCity>بەرلين</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="unconfirmed">جيبۋتي</exemplarCity>
+				<exemplarCity>جيبۋتي</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
-				<exemplarCity draft="unconfirmed">كوپەنگاگەن</exemplarCity>
+				<exemplarCity>كوپەنگاگەن</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
-				<exemplarCity draft="unconfirmed">دومينيكا</exemplarCity>
+				<exemplarCity>دومينيكا</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="unconfirmed">سانتو-دومينگو</exemplarCity>
+				<exemplarCity>سانتو-دومينگو</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity draft="unconfirmed">الجير</exemplarCity>
+				<exemplarCity>الجير</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
-				<exemplarCity draft="unconfirmed">گالاپاگوس</exemplarCity>
+				<exemplarCity>گالاپاگوس</exemplarCity>
 			</zone>
 			<zone type="America/Guayaquil">
-				<exemplarCity draft="unconfirmed">گۋاياكيل</exemplarCity>
+				<exemplarCity>گۋاياكيل</exemplarCity>
 			</zone>
 			<zone type="Europe/Tallinn">
-				<exemplarCity draft="unconfirmed">تاللين</exemplarCity>
+				<exemplarCity>تاللين</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
-				<exemplarCity draft="unconfirmed">كاير</exemplarCity>
+				<exemplarCity>كاير</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
-				<exemplarCity draft="unconfirmed">ەل-ايۋن</exemplarCity>
+				<exemplarCity>ەل-ايۋن</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
-				<exemplarCity draft="unconfirmed">اسمارا</exemplarCity>
+				<exemplarCity>اسمارا</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
-				<exemplarCity draft="unconfirmed">كانار ارالدارى</exemplarCity>
+				<exemplarCity>كانار ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity draft="unconfirmed">سەۋتا</exemplarCity>
+				<exemplarCity>سەۋتا</exemplarCity>
 			</zone>
 			<zone type="Europe/Madrid">
-				<exemplarCity draft="unconfirmed">مادريد</exemplarCity>
+				<exemplarCity>مادريد</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity draft="unconfirmed">ادديس-ابەبا</exemplarCity>
+				<exemplarCity>ادديس-ابەبا</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity draft="unconfirmed">حەلسينكي</exemplarCity>
+				<exemplarCity>حەلسينكي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity draft="unconfirmed">فيجي</exemplarCity>
+				<exemplarCity>فيجي</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="unconfirmed">ستەنلي</exemplarCity>
+				<exemplarCity>ستەنلي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Truk">
-				<exemplarCity draft="unconfirmed">ترۋك</exemplarCity>
+				<exemplarCity>ترۋك</exemplarCity>
 			</zone>
 			<zone type="Pacific/Ponape">
-				<exemplarCity draft="unconfirmed">پوناپە</exemplarCity>
+				<exemplarCity>پوناپە</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kosrae">
-				<exemplarCity draft="unconfirmed">كۋسايە</exemplarCity>
+				<exemplarCity>كۋسايە</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity draft="unconfirmed">فارەر ارالدارى</exemplarCity>
+				<exemplarCity>فارەر ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
-				<exemplarCity draft="unconfirmed">پاريج</exemplarCity>
+				<exemplarCity>پاريج</exemplarCity>
 			</zone>
 			<zone type="Africa/Libreville">
-				<exemplarCity draft="unconfirmed">ليبرەۆيل</exemplarCity>
+				<exemplarCity>ليبرەۆيل</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="unconfirmed">ۇلىبريتانيا جازعى ۋاقىتى</daylight>
+					<daylight>ۇلىبريتانيا جازعى ۋاقىتى</daylight>
 				</long>
-				<exemplarCity draft="unconfirmed">لوندون</exemplarCity>
+				<exemplarCity>لوندون</exemplarCity>
 			</zone>
 			<zone type="America/Grenada">
-				<exemplarCity draft="unconfirmed">گرەنادا</exemplarCity>
+				<exemplarCity>گرەنادا</exemplarCity>
 			</zone>
 			<zone type="Asia/Tbilisi">
-				<exemplarCity draft="unconfirmed">تبيليسي</exemplarCity>
+				<exemplarCity>تبيليسي</exemplarCity>
 			</zone>
 			<zone type="America/Cayenne">
-				<exemplarCity draft="unconfirmed">كايەننا</exemplarCity>
+				<exemplarCity>كايەننا</exemplarCity>
 			</zone>
 			<zone type="Europe/Guernsey">
-				<exemplarCity draft="unconfirmed">گەرنسي</exemplarCity>
+				<exemplarCity>گەرنسي</exemplarCity>
 			</zone>
 			<zone type="Africa/Accra">
-				<exemplarCity draft="unconfirmed">اككرا</exemplarCity>
+				<exemplarCity>اككرا</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
-				<exemplarCity draft="unconfirmed">گيبرالتال</exemplarCity>
+				<exemplarCity>گيبرالتال</exemplarCity>
 			</zone>
 			<zone type="America/Thule">
-				<exemplarCity draft="unconfirmed">تۋلە</exemplarCity>
+				<exemplarCity>تۋلە</exemplarCity>
 			</zone>
 			<zone type="America/Godthab">
-				<exemplarCity draft="unconfirmed">نۋۋك</exemplarCity>
+				<exemplarCity>نۋۋك</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity draft="unconfirmed">يللوككورتوورميۋت</exemplarCity>
+				<exemplarCity>يللوككورتوورميۋت</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
-				<exemplarCity draft="unconfirmed">دانماركسحاۆن</exemplarCity>
+				<exemplarCity>دانماركسحاۆن</exemplarCity>
 			</zone>
 			<zone type="Africa/Banjul">
-				<exemplarCity draft="unconfirmed">بانجۋل</exemplarCity>
+				<exemplarCity>بانجۋل</exemplarCity>
 			</zone>
 			<zone type="Africa/Conakry">
-				<exemplarCity draft="unconfirmed">كوناكري</exemplarCity>
+				<exemplarCity>كوناكري</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="unconfirmed">گۆادەلۇپا</exemplarCity>
+				<exemplarCity>گۆادەلۇپا</exemplarCity>
 			</zone>
 			<zone type="Africa/Malabo">
-				<exemplarCity draft="unconfirmed">مالابو</exemplarCity>
+				<exemplarCity>مالابو</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
-				<exemplarCity draft="unconfirmed">افينا</exemplarCity>
+				<exemplarCity>افينا</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity draft="unconfirmed">وڭتۇستىك گەورگيا</exemplarCity>
+				<exemplarCity>وڭتۇستىك گەورگيا</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
-				<exemplarCity draft="unconfirmed">گۆاتەمالا</exemplarCity>
+				<exemplarCity>گۆاتەمالا</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guam">
-				<exemplarCity draft="unconfirmed">گۋام</exemplarCity>
+				<exemplarCity>گۋام</exemplarCity>
 			</zone>
 			<zone type="Africa/Bissau">
-				<exemplarCity draft="unconfirmed">بيساۋ</exemplarCity>
+				<exemplarCity>بيساۋ</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="unconfirmed">گايانا</exemplarCity>
+				<exemplarCity>گايانا</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
-				<exemplarCity draft="unconfirmed">حوڭكوڭ</exemplarCity>
+				<exemplarCity>حوڭكوڭ</exemplarCity>
 			</zone>
 			<zone type="America/Tegucigalpa">
-				<exemplarCity draft="unconfirmed">تەگۋسيگالپا</exemplarCity>
+				<exemplarCity>تەگۋسيگالپا</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity draft="unconfirmed">زاگرەب</exemplarCity>
+				<exemplarCity>زاگرەب</exemplarCity>
 			</zone>
 			<zone type="America/Port-au-Prince">
-				<exemplarCity draft="unconfirmed">پورت-وف-پرەنس</exemplarCity>
+				<exemplarCity>پورت-وف-پرەنس</exemplarCity>
 			</zone>
 			<zone type="Europe/Budapest">
-				<exemplarCity draft="unconfirmed">بۋداپەشت</exemplarCity>
+				<exemplarCity>بۋداپەشت</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity draft="unconfirmed">جاكارتا</exemplarCity>
+				<exemplarCity>جاكارتا</exemplarCity>
 			</zone>
 			<zone type="Asia/Pontianak">
-				<exemplarCity draft="unconfirmed">پونتياناك</exemplarCity>
+				<exemplarCity>پونتياناك</exemplarCity>
 			</zone>
 			<zone type="Asia/Makassar">
-				<exemplarCity draft="unconfirmed">ماكاسار</exemplarCity>
+				<exemplarCity>ماكاسار</exemplarCity>
 			</zone>
 			<zone type="Asia/Jayapura">
-				<exemplarCity draft="unconfirmed">جاياپۋرا</exemplarCity>
+				<exemplarCity>جاياپۋرا</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="unconfirmed">يرلانديا ستاندارتتى ۋاقىتى</daylight>
+					<daylight>يرلانديا ستاندارتتى ۋاقىتى</daylight>
 				</long>
-				<exemplarCity draft="unconfirmed">دۋبلين</exemplarCity>
+				<exemplarCity>دۋبلين</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
-				<exemplarCity draft="unconfirmed">يەرۋساليم</exemplarCity>
+				<exemplarCity>يەرۋساليم</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="unconfirmed">مەن ارالى</exemplarCity>
+				<exemplarCity>مەن ارالى</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
-				<exemplarCity draft="unconfirmed">كالكۋتا</exemplarCity>
+				<exemplarCity>كالكۋتا</exemplarCity>
 			</zone>
 			<zone type="Indian/Chagos">
-				<exemplarCity draft="unconfirmed">چاگوس</exemplarCity>
+				<exemplarCity>چاگوس</exemplarCity>
 			</zone>
 			<zone type="Asia/Baghdad">
-				<exemplarCity draft="unconfirmed">باگدات</exemplarCity>
+				<exemplarCity>باگدات</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
-				<exemplarCity draft="unconfirmed">تەگەران</exemplarCity>
+				<exemplarCity>تەگەران</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity draft="unconfirmed">رەيكياۆيك</exemplarCity>
+				<exemplarCity>رەيكياۆيك</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
-				<exemplarCity draft="unconfirmed">ريم</exemplarCity>
+				<exemplarCity>ريم</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
-				<exemplarCity draft="unconfirmed">جەرسەي</exemplarCity>
+				<exemplarCity>جەرسەي</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
-				<exemplarCity draft="unconfirmed">يامايكا</exemplarCity>
+				<exemplarCity>يامايكا</exemplarCity>
 			</zone>
 			<zone type="Asia/Amman">
-				<exemplarCity draft="unconfirmed">اممان</exemplarCity>
+				<exemplarCity>اممان</exemplarCity>
 			</zone>
 			<zone type="Asia/Tokyo">
-				<exemplarCity draft="unconfirmed">توكيو</exemplarCity>
+				<exemplarCity>توكيو</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity draft="unconfirmed">نايروبي</exemplarCity>
+				<exemplarCity>نايروبي</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
-				<exemplarCity draft="unconfirmed">بىشكەك</exemplarCity>
+				<exemplarCity>بىشكەك</exemplarCity>
 			</zone>
 			<zone type="Asia/Phnom_Penh">
-				<exemplarCity draft="unconfirmed">پنومپەن</exemplarCity>
+				<exemplarCity>پنومپەن</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity draft="unconfirmed">كانتون</exemplarCity>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>كانتون</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
-				<exemplarCity draft="unconfirmed">كيريتيماتي</exemplarCity>
+				<exemplarCity>كيريتيماتي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
-				<exemplarCity draft="unconfirmed">تاراۋا</exemplarCity>
+				<exemplarCity>تاراۋا</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity draft="unconfirmed">كومور ارالدارى</exemplarCity>
+				<exemplarCity>كومور ارالدارى</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity draft="unconfirmed">سەنت-كيتس</exemplarCity>
+				<exemplarCity>سەنت-كيتس</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
-				<exemplarCity draft="unconfirmed">پحەنيان</exemplarCity>
+				<exemplarCity>پحەنيان</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity draft="unconfirmed">سەۋل</exemplarCity>
+				<exemplarCity>سەۋل</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuwait">
-				<exemplarCity draft="unconfirmed">كۋۆەيت</exemplarCity>
+				<exemplarCity>كۋۆەيت</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity draft="unconfirmed">كايمان ارالدارى</exemplarCity>
+				<exemplarCity>كايمان ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtau">
-				<exemplarCity draft="unconfirmed">اقتاۋ</exemplarCity>
+				<exemplarCity>اقتاۋ</exemplarCity>
 			</zone>
 			<zone type="Asia/Oral">
-				<exemplarCity draft="unconfirmed">ورال</exemplarCity>
+				<exemplarCity>ورال</exemplarCity>
 			</zone>
 			<zone type="Asia/Atyrau">
-				<exemplarCity draft="unconfirmed">اتىراۋ</exemplarCity>
+				<exemplarCity>اتىراۋ</exemplarCity>
 			</zone>
 			<zone type="Asia/Aqtobe">
-				<exemplarCity draft="unconfirmed">اقتوبە</exemplarCity>
+				<exemplarCity>اقتوبە</exemplarCity>
 			</zone>
 			<zone type="Asia/Qostanay">
-				<exemplarCity draft="unconfirmed">قوستاناي</exemplarCity>
+				<exemplarCity>قوستاناي</exemplarCity>
 			</zone>
 			<zone type="Asia/Qyzylorda">
-				<exemplarCity draft="unconfirmed">قىزىلوردا</exemplarCity>
+				<exemplarCity>قىزىلوردا</exemplarCity>
 			</zone>
 			<zone type="Asia/Almaty">
-				<exemplarCity draft="unconfirmed">الماتى</exemplarCity>
+				<exemplarCity>الماتى</exemplarCity>
 			</zone>
 			<zone type="Asia/Vientiane">
-				<exemplarCity draft="unconfirmed">ۆەنتيان</exemplarCity>
+				<exemplarCity>ۆەنتيان</exemplarCity>
 			</zone>
 			<zone type="Asia/Beirut">
-				<exemplarCity draft="unconfirmed">بەيرۋت</exemplarCity>
+				<exemplarCity>بەيرۋت</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity draft="unconfirmed">سەنت-ليۋسيا</exemplarCity>
+				<exemplarCity>سەنت-ليۋسيا</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity draft="unconfirmed">ۆادۋس</exemplarCity>
+				<exemplarCity>ۆادۋس</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity draft="unconfirmed">كولومبو</exemplarCity>
+				<exemplarCity>كولومبو</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
-				<exemplarCity draft="unconfirmed">مونروۆيا</exemplarCity>
+				<exemplarCity>مونروۆيا</exemplarCity>
 			</zone>
 			<zone type="Africa/Maseru">
-				<exemplarCity draft="unconfirmed">ماسەرۋ</exemplarCity>
+				<exemplarCity>ماسەرۋ</exemplarCity>
 			</zone>
 			<zone type="Europe/Vilnius">
-				<exemplarCity draft="unconfirmed">ۆينيۋس</exemplarCity>
+				<exemplarCity>ۆينيۋس</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
-				<exemplarCity draft="unconfirmed">ليۋكسەمبۋرگ</exemplarCity>
+				<exemplarCity>ليۋكسەمبۋرگ</exemplarCity>
 			</zone>
 			<zone type="Europe/Riga">
-				<exemplarCity draft="unconfirmed">ريگا</exemplarCity>
+				<exemplarCity>ريگا</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
-				<exemplarCity draft="unconfirmed">تريپولي</exemplarCity>
+				<exemplarCity>تريپولي</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity draft="unconfirmed">كاسابلانكا</exemplarCity>
+				<exemplarCity>كاسابلانكا</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
-				<exemplarCity draft="unconfirmed">موناكو</exemplarCity>
+				<exemplarCity>موناكو</exemplarCity>
 			</zone>
 			<zone type="Europe/Chisinau">
-				<exemplarCity draft="unconfirmed">كيشينەۆ</exemplarCity>
+				<exemplarCity>كيشينەۆ</exemplarCity>
 			</zone>
 			<zone type="Europe/Podgorica">
-				<exemplarCity draft="unconfirmed">پودگوريسا</exemplarCity>
+				<exemplarCity>پودگوريسا</exemplarCity>
 			</zone>
 			<zone type="America/Marigot">
-				<exemplarCity draft="unconfirmed">ماريگو</exemplarCity>
+				<exemplarCity>ماريگو</exemplarCity>
 			</zone>
 			<zone type="Indian/Antananarivo">
-				<exemplarCity draft="unconfirmed">انتاناناريۆۋ</exemplarCity>
+				<exemplarCity>انتاناناريۆۋ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kwajalein">
-				<exemplarCity draft="unconfirmed">كۆاجالەيىن</exemplarCity>
+				<exemplarCity>كۆاجالەيىن</exemplarCity>
 			</zone>
 			<zone type="Pacific/Majuro">
-				<exemplarCity draft="unconfirmed">ماجۋرو</exemplarCity>
+				<exemplarCity>ماجۋرو</exemplarCity>
 			</zone>
 			<zone type="Europe/Skopje">
-				<exemplarCity draft="unconfirmed">سكوپيە</exemplarCity>
+				<exemplarCity>سكوپيە</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
-				<exemplarCity draft="unconfirmed">باماكو</exemplarCity>
+				<exemplarCity>باماكو</exemplarCity>
 			</zone>
 			<zone type="Asia/Rangoon">
-				<exemplarCity draft="unconfirmed">يانگون</exemplarCity>
+				<exemplarCity>يانگون</exemplarCity>
 			</zone>
 			<zone type="Asia/Hovd">
-				<exemplarCity draft="unconfirmed">حوۆد</exemplarCity>
+				<exemplarCity>حوۆد</exemplarCity>
 			</zone>
 			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity draft="unconfirmed">ۇلانباتىر</exemplarCity>
+				<exemplarCity>ۇلانباتىر</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
-				<exemplarCity draft="unconfirmed">ماكاو</exemplarCity>
+				<exemplarCity>ماكاو</exemplarCity>
 			</zone>
 			<zone type="Pacific/Saipan">
-				<exemplarCity draft="unconfirmed">سايپان</exemplarCity>
+				<exemplarCity>سايپان</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity draft="unconfirmed">مارتينيكا</exemplarCity>
+				<exemplarCity>مارتينيكا</exemplarCity>
 			</zone>
 			<zone type="Africa/Nouakchott">
-				<exemplarCity draft="unconfirmed">نۋاكشوت</exemplarCity>
+				<exemplarCity>نۋاكشوت</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="unconfirmed">مونتسەررات</exemplarCity>
+				<exemplarCity>مونتسەررات</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="unconfirmed">مالتا</exemplarCity>
+				<exemplarCity>مالتا</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
-				<exemplarCity draft="unconfirmed">ماۆريكي</exemplarCity>
+				<exemplarCity>ماۆريكي</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity draft="unconfirmed">مالديۆ ارالدارى</exemplarCity>
+				<exemplarCity>مالديۆ ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Africa/Blantyre">
-				<exemplarCity draft="unconfirmed">بلانتاير</exemplarCity>
+				<exemplarCity>بلانتاير</exemplarCity>
 			</zone>
 			<zone type="America/Tijuana">
-				<exemplarCity draft="unconfirmed">تيحۋانا</exemplarCity>
+				<exemplarCity>تيحۋانا</exemplarCity>
 			</zone>
 			<zone type="America/Hermosillo">
-				<exemplarCity draft="unconfirmed">ەرموسيلو</exemplarCity>
+				<exemplarCity>ەرموسيلو</exemplarCity>
 			</zone>
 			<zone type="America/Ciudad_Juarez">
-				<exemplarCity draft="unconfirmed">سيۋداد-حۋارەس</exemplarCity>
+				<exemplarCity>سيۋداد-حۋارەس</exemplarCity>
 			</zone>
 			<zone type="America/Mazatlan">
-				<exemplarCity draft="unconfirmed">ماساتلان</exemplarCity>
+				<exemplarCity>ماساتلان</exemplarCity>
 			</zone>
 			<zone type="America/Chihuahua">
-				<exemplarCity draft="unconfirmed">چيۋاۋا</exemplarCity>
+				<exemplarCity>چيۋاۋا</exemplarCity>
 			</zone>
 			<zone type="America/Bahia_Banderas">
-				<exemplarCity draft="unconfirmed">بايا-دە-باندەراس</exemplarCity>
+				<exemplarCity>بايا-دە-باندەراس</exemplarCity>
 			</zone>
 			<zone type="America/Ojinaga">
-				<exemplarCity draft="unconfirmed">وحيناگا</exemplarCity>
+				<exemplarCity>وحيناگا</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
-				<exemplarCity draft="unconfirmed">مونتەررەي</exemplarCity>
+				<exemplarCity>مونتەررەي</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity draft="unconfirmed">مەحيكو</exemplarCity>
+				<exemplarCity>مەحيكو</exemplarCity>
 			</zone>
 			<zone type="America/Matamoros">
-				<exemplarCity draft="unconfirmed">ماتاموروس</exemplarCity>
+				<exemplarCity>ماتاموروس</exemplarCity>
 			</zone>
 			<zone type="America/Merida">
-				<exemplarCity draft="unconfirmed">مەريدا</exemplarCity>
+				<exemplarCity>مەريدا</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
-				<exemplarCity draft="unconfirmed">كانكۋن</exemplarCity>
+				<exemplarCity>كانكۋن</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity draft="unconfirmed">كۋالا-لۋمپۋر</exemplarCity>
+				<exemplarCity>كۋالا-لۋمپۋر</exemplarCity>
 			</zone>
 			<zone type="Asia/Kuching">
-				<exemplarCity draft="unconfirmed">كۋچيڭ</exemplarCity>
+				<exemplarCity>كۋچيڭ</exemplarCity>
 			</zone>
 			<zone type="Africa/Maputo">
-				<exemplarCity draft="unconfirmed">ماپۋتۋ</exemplarCity>
+				<exemplarCity>ماپۋتۋ</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
-				<exemplarCity draft="unconfirmed">ۆيندحۋك</exemplarCity>
+				<exemplarCity>ۆيندحۋك</exemplarCity>
 			</zone>
 			<zone type="Pacific/Noumea">
-				<exemplarCity draft="unconfirmed">نۋمەا</exemplarCity>
+				<exemplarCity>نۋمەا</exemplarCity>
 			</zone>
 			<zone type="Africa/Niamey">
-				<exemplarCity draft="unconfirmed">نيامەي</exemplarCity>
+				<exemplarCity>نيامەي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity draft="unconfirmed">نورفولك</exemplarCity>
+				<exemplarCity>نورفولك</exemplarCity>
 			</zone>
 			<zone type="Africa/Lagos">
-				<exemplarCity draft="unconfirmed">لاگوس</exemplarCity>
+				<exemplarCity>لاگوس</exemplarCity>
 			</zone>
 			<zone type="America/Managua">
-				<exemplarCity draft="unconfirmed">ماناگۋا</exemplarCity>
+				<exemplarCity>ماناگۋا</exemplarCity>
 			</zone>
 			<zone type="Europe/Amsterdam">
-				<exemplarCity draft="unconfirmed">امستەردام</exemplarCity>
+				<exemplarCity>امستەردام</exemplarCity>
 			</zone>
 			<zone type="Europe/Oslo">
-				<exemplarCity draft="unconfirmed">وسلو</exemplarCity>
+				<exemplarCity>وسلو</exemplarCity>
 			</zone>
 			<zone type="Asia/Katmandu">
-				<exemplarCity draft="unconfirmed">كاتماندۋ</exemplarCity>
+				<exemplarCity>كاتماندۋ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Nauru">
-				<exemplarCity draft="unconfirmed">ناۋرۋ</exemplarCity>
+				<exemplarCity>ناۋرۋ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Niue">
-				<exemplarCity draft="unconfirmed">نيۋە</exemplarCity>
+				<exemplarCity>نيۋە</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity draft="unconfirmed">چاتەم</exemplarCity>
+				<exemplarCity>چاتەم</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
-				<exemplarCity draft="unconfirmed">وكلەند</exemplarCity>
+				<exemplarCity>وكلەند</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity draft="unconfirmed">ماسكات</exemplarCity>
+				<exemplarCity>ماسكات</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
-				<exemplarCity draft="unconfirmed">پاناما</exemplarCity>
+				<exemplarCity>پاناما</exemplarCity>
 			</zone>
 			<zone type="America/Lima">
-				<exemplarCity draft="unconfirmed">ليما</exemplarCity>
+				<exemplarCity>ليما</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tahiti">
-				<exemplarCity draft="unconfirmed">تايتي</exemplarCity>
+				<exemplarCity>تايتي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity draft="unconfirmed">ماركيز ارالدارى</exemplarCity>
+				<exemplarCity>ماركيز ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Pacific/Gambier">
-				<exemplarCity draft="unconfirmed">گامبيە</exemplarCity>
+				<exemplarCity>گامبيە</exemplarCity>
 			</zone>
 			<zone type="Pacific/Port_Moresby">
-				<exemplarCity draft="unconfirmed">پورت-مورسبي</exemplarCity>
+				<exemplarCity>پورت-مورسبي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Bougainville">
-				<exemplarCity draft="unconfirmed">بۋگەنۆيل</exemplarCity>
+				<exemplarCity>بۋگەنۆيل</exemplarCity>
 			</zone>
 			<zone type="Asia/Manila">
-				<exemplarCity draft="unconfirmed">مانيلا</exemplarCity>
+				<exemplarCity>مانيلا</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
-				<exemplarCity draft="unconfirmed">كاراچا</exemplarCity>
+				<exemplarCity>كاراچا</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
-				<exemplarCity draft="unconfirmed">ۆارشاۆا</exemplarCity>
+				<exemplarCity>ۆارشاۆا</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity draft="unconfirmed">ميكەلون</exemplarCity>
+				<exemplarCity>ميكەلون</exemplarCity>
 			</zone>
 			<zone type="Pacific/Pitcairn">
-				<exemplarCity draft="unconfirmed">پيتكەرن</exemplarCity>
+				<exemplarCity>پيتكەرن</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity draft="unconfirmed">پۋەرتو-ريكو</exemplarCity>
+				<exemplarCity>پۋەرتو-ريكو</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity draft="unconfirmed">گازا</exemplarCity>
+				<exemplarCity>گازا</exemplarCity>
 			</zone>
 			<zone type="Asia/Hebron">
-				<exemplarCity draft="unconfirmed">حەۆرون</exemplarCity>
+				<exemplarCity>حەۆرون</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
-				<exemplarCity draft="unconfirmed">ازور ارالدارى</exemplarCity>
+				<exemplarCity>ازور ارالدارى</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Madeira">
-				<exemplarCity draft="unconfirmed">مادەيرا</exemplarCity>
+				<exemplarCity>مادەيرا</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
-				<exemplarCity draft="unconfirmed">ليسابون</exemplarCity>
+				<exemplarCity>ليسابون</exemplarCity>
 			</zone>
 			<zone type="Pacific/Palau">
-				<exemplarCity draft="unconfirmed">پالاۋ</exemplarCity>
+				<exemplarCity>پالاۋ</exemplarCity>
 			</zone>
 			<zone type="America/Asuncion">
-				<exemplarCity draft="unconfirmed">اسۋنسيون</exemplarCity>
+				<exemplarCity>اسۋنسيون</exemplarCity>
 			</zone>
 			<zone type="Asia/Qatar">
-				<exemplarCity draft="unconfirmed">كاتار</exemplarCity>
+				<exemplarCity>كاتار</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
-				<exemplarCity draft="unconfirmed">رەيۋنيون</exemplarCity>
+				<exemplarCity>رەيۋنيون</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
-				<exemplarCity draft="unconfirmed">بۋحارەست</exemplarCity>
+				<exemplarCity>بۋحارەست</exemplarCity>
 			</zone>
 			<zone type="Europe/Belgrade">
-				<exemplarCity draft="unconfirmed">بەلگراد</exemplarCity>
+				<exemplarCity>بەلگراد</exemplarCity>
 			</zone>
 			<zone type="Europe/Kaliningrad">
-				<exemplarCity draft="unconfirmed">كالينينگراد</exemplarCity>
+				<exemplarCity>كالينينگراد</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
-				<exemplarCity draft="unconfirmed">ماسكەۋ</exemplarCity>
+				<exemplarCity>ماسكەۋ</exemplarCity>
 			</zone>
 			<zone type="Europe/Volgograd">
-				<exemplarCity draft="unconfirmed">ۆولگوگراد</exemplarCity>
+				<exemplarCity>ۆولگوگراد</exemplarCity>
 			</zone>
 			<zone type="Europe/Saratov">
-				<exemplarCity draft="unconfirmed">سارىتاۋ</exemplarCity>
+				<exemplarCity>سارىتاۋ</exemplarCity>
 			</zone>
 			<zone type="Europe/Astrakhan">
-				<exemplarCity draft="unconfirmed">استراحان</exemplarCity>
+				<exemplarCity>استراحان</exemplarCity>
 			</zone>
 			<zone type="Europe/Ulyanovsk">
-				<exemplarCity draft="unconfirmed">ۋليانوۆسك</exemplarCity>
+				<exemplarCity>ۋليانوۆسك</exemplarCity>
 			</zone>
 			<zone type="Europe/Kirov">
-				<exemplarCity draft="unconfirmed">كيروۆ</exemplarCity>
+				<exemplarCity>كيروۆ</exemplarCity>
 			</zone>
 			<zone type="Europe/Samara">
-				<exemplarCity draft="unconfirmed">سامارا</exemplarCity>
+				<exemplarCity>سامارا</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
-				<exemplarCity draft="unconfirmed">ەكاتەرينبۋرگ</exemplarCity>
+				<exemplarCity>ەكاتەرينبۋرگ</exemplarCity>
 			</zone>
 			<zone type="Asia/Omsk">
-				<exemplarCity draft="unconfirmed">ومبى</exemplarCity>
+				<exemplarCity>ومبى</exemplarCity>
 			</zone>
 			<zone type="Asia/Novosibirsk">
-				<exemplarCity draft="unconfirmed">جاڭاسىبىر</exemplarCity>
+				<exemplarCity>جاڭاسىبىر</exemplarCity>
 			</zone>
 			<zone type="Asia/Barnaul">
-				<exemplarCity draft="unconfirmed">بارناۋىل</exemplarCity>
+				<exemplarCity>بارناۋىل</exemplarCity>
 			</zone>
 			<zone type="Asia/Tomsk">
-				<exemplarCity draft="unconfirmed">تۋمەن</exemplarCity>
+				<exemplarCity>تۋمەن</exemplarCity>
 			</zone>
 			<zone type="Asia/Novokuznetsk">
-				<exemplarCity draft="unconfirmed">نوۆوكۋزنەتسك</exemplarCity>
+				<exemplarCity>نوۆوكۋزنەتسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity draft="unconfirmed">كراسنويارسك</exemplarCity>
+				<exemplarCity>كراسنويارسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Irkutsk">
-				<exemplarCity draft="unconfirmed">يركۋتسك</exemplarCity>
+				<exemplarCity>يركۋتسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Chita">
-				<exemplarCity draft="unconfirmed">چيتا</exemplarCity>
+				<exemplarCity>چيتا</exemplarCity>
 			</zone>
 			<zone type="Asia/Yakutsk">
-				<exemplarCity draft="unconfirmed">ياكۋتسك</exemplarCity>
+				<exemplarCity>ياكۋتسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Vladivostok">
-				<exemplarCity draft="unconfirmed">ۆلاديۆاستوك</exemplarCity>
+				<exemplarCity>ۆلاديۆاستوك</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
-				<exemplarCity draft="unconfirmed">حاندىگا</exemplarCity>
+				<exemplarCity>حاندىگا</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
-				<exemplarCity draft="unconfirmed">ساحالين</exemplarCity>
+				<exemplarCity>ساحالين</exemplarCity>
 			</zone>
 			<zone type="Asia/Ust-Nera">
-				<exemplarCity draft="unconfirmed">ۋست-نەرا</exemplarCity>
+				<exemplarCity>ۋست-نەرا</exemplarCity>
 			</zone>
 			<zone type="Asia/Magadan">
-				<exemplarCity draft="unconfirmed">ماگادان</exemplarCity>
+				<exemplarCity>ماگادان</exemplarCity>
 			</zone>
 			<zone type="Asia/Srednekolymsk">
-				<exemplarCity draft="unconfirmed">سرەدنەكولىمسك</exemplarCity>
+				<exemplarCity>سرەدنەكولىمسك</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
-				<exemplarCity draft="unconfirmed">كامچاتكا</exemplarCity>
+				<exemplarCity>كامچاتكا</exemplarCity>
 			</zone>
 			<zone type="Asia/Anadyr">
-				<exemplarCity draft="unconfirmed">انادىر</exemplarCity>
+				<exemplarCity>انادىر</exemplarCity>
 			</zone>
 			<zone type="Africa/Kigali">
-				<exemplarCity draft="unconfirmed">كيگالي</exemplarCity>
+				<exemplarCity>كيگالي</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity draft="unconfirmed">ەر-رياد</exemplarCity>
+				<exemplarCity>ەر-رياد</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
-				<exemplarCity draft="unconfirmed">گۋادالكانال</exemplarCity>
+				<exemplarCity>گۋادالكانال</exemplarCity>
 			</zone>
 			<zone type="Indian/Mahe">
-				<exemplarCity draft="unconfirmed">ماە</exemplarCity>
+				<exemplarCity>ماە</exemplarCity>
 			</zone>
 			<zone type="Africa/Khartoum">
-				<exemplarCity draft="unconfirmed">حارتۋم</exemplarCity>
+				<exemplarCity>حارتۋم</exemplarCity>
 			</zone>
 			<zone type="Europe/Stockholm">
-				<exemplarCity draft="unconfirmed">ستوكگولىم</exemplarCity>
+				<exemplarCity>ستوكگولىم</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity draft="unconfirmed">سينگاپۋر</exemplarCity>
+				<exemplarCity>سينگاپۋر</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity draft="unconfirmed">اۋليە ەلەنا ارالى</exemplarCity>
+				<exemplarCity>اۋليە ەلەنا ارالى</exemplarCity>
 			</zone>
 			<zone type="Europe/Ljubljana">
-				<exemplarCity draft="unconfirmed">ليۋبليانا</exemplarCity>
+				<exemplarCity>ليۋبليانا</exemplarCity>
 			</zone>
 			<zone type="Arctic/Longyearbyen">
-				<exemplarCity draft="unconfirmed">لونگير</exemplarCity>
+				<exemplarCity>لونگير</exemplarCity>
 			</zone>
 			<zone type="Europe/Bratislava">
-				<exemplarCity draft="unconfirmed">براتيسلاۆا</exemplarCity>
+				<exemplarCity>براتيسلاۆا</exemplarCity>
 			</zone>
 			<zone type="Africa/Freetown">
-				<exemplarCity draft="unconfirmed">فريتاۋن</exemplarCity>
+				<exemplarCity>فريتاۋن</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity draft="unconfirmed">سان-مارينو</exemplarCity>
+				<exemplarCity>سان-مارينو</exemplarCity>
 			</zone>
 			<zone type="Africa/Dakar">
-				<exemplarCity draft="unconfirmed">داكار</exemplarCity>
+				<exemplarCity>داكار</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity draft="unconfirmed">موگاديشۋ</exemplarCity>
+				<exemplarCity>موگاديشۋ</exemplarCity>
 			</zone>
 			<zone type="America/Paramaribo">
-				<exemplarCity draft="unconfirmed">پاراماريبو</exemplarCity>
+				<exemplarCity>پاراماريبو</exemplarCity>
 			</zone>
 			<zone type="Africa/Juba">
-				<exemplarCity draft="unconfirmed">جۋبا</exemplarCity>
+				<exemplarCity>جۋبا</exemplarCity>
 			</zone>
 			<zone type="Africa/Sao_Tome">
-				<exemplarCity draft="unconfirmed">سان-تومە</exemplarCity>
+				<exemplarCity>سان-تومە</exemplarCity>
 			</zone>
 			<zone type="America/El_Salvador">
-				<exemplarCity draft="unconfirmed">سالۆادور</exemplarCity>
+				<exemplarCity>سالۆادور</exemplarCity>
 			</zone>
 			<zone type="America/Lower_Princes">
-				<exemplarCity draft="unconfirmed">لوۋەر-پرينس-كۋوتەر</exemplarCity>
+				<exemplarCity>لوۋەر-پرينس-كۋوتەر</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
-				<exemplarCity draft="unconfirmed">داماسك</exemplarCity>
+				<exemplarCity>داماسك</exemplarCity>
 			</zone>
 			<zone type="Africa/Mbabane">
-				<exemplarCity draft="unconfirmed">مبابەنە</exemplarCity>
+				<exemplarCity>مبابەنە</exemplarCity>
 			</zone>
 			<zone type="America/Grand_Turk">
-				<exemplarCity draft="unconfirmed">گراند-تەرك</exemplarCity>
+				<exemplarCity>گراند-تەرك</exemplarCity>
 			</zone>
 			<zone type="Africa/Ndjamena">
-				<exemplarCity draft="unconfirmed">ندجامەنا</exemplarCity>
+				<exemplarCity>ندجامەنا</exemplarCity>
 			</zone>
 			<zone type="Indian/Kerguelen">
-				<exemplarCity draft="unconfirmed">كەرگەلەن</exemplarCity>
+				<exemplarCity>كەرگەلەن</exemplarCity>
 			</zone>
 			<zone type="Africa/Lome">
-				<exemplarCity draft="unconfirmed">لومە</exemplarCity>
+				<exemplarCity>لومە</exemplarCity>
 			</zone>
 			<zone type="Asia/Bangkok">
-				<exemplarCity draft="unconfirmed">باڭكوك</exemplarCity>
+				<exemplarCity>باڭكوك</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
-				<exemplarCity draft="unconfirmed">دۋشانبە</exemplarCity>
+				<exemplarCity>دۋشانبە</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fakaofo">
-				<exemplarCity draft="unconfirmed">فاكاوفو</exemplarCity>
+				<exemplarCity>فاكاوفو</exemplarCity>
 			</zone>
 			<zone type="Asia/Dili">
-				<exemplarCity draft="unconfirmed">ديلي</exemplarCity>
+				<exemplarCity>ديلي</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
-				<exemplarCity draft="unconfirmed">اشحابات</exemplarCity>
+				<exemplarCity>اشحابات</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity draft="unconfirmed">تۋنيس</exemplarCity>
+				<exemplarCity>تۋنيس</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tongatapu">
-				<exemplarCity draft="unconfirmed">تونگاتاپۋ</exemplarCity>
+				<exemplarCity>تونگاتاپۋ</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity draft="unconfirmed">ستامبۇل</exemplarCity>
+				<exemplarCity>ستامبۇل</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="unconfirmed">پورت-وف-سپاين</exemplarCity>
+				<exemplarCity>پورت-وف-سپاين</exemplarCity>
 			</zone>
 			<zone type="Pacific/Funafuti">
-				<exemplarCity draft="unconfirmed">فۋنافۋتي</exemplarCity>
+				<exemplarCity>فۋنافۋتي</exemplarCity>
 			</zone>
 			<zone type="Asia/Taipei">
-				<exemplarCity draft="unconfirmed">تايبەي</exemplarCity>
+				<exemplarCity>تايبەي</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity draft="unconfirmed">دار-ەس-سالام</exemplarCity>
+				<exemplarCity>دار-ەس-سالام</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity draft="unconfirmed">كيەۆ</exemplarCity>
+				<exemplarCity>كيەۆ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
-				<exemplarCity draft="unconfirmed">سيمفەرول</exemplarCity>
+				<exemplarCity>سيمفەرول</exemplarCity>
 			</zone>
 			<zone type="Africa/Kampala">
-				<exemplarCity draft="unconfirmed">كامپالا</exemplarCity>
+				<exemplarCity>كامپالا</exemplarCity>
 			</zone>
 			<zone type="Pacific/Midway">
-				<exemplarCity draft="unconfirmed">ميدۋەي</exemplarCity>
+				<exemplarCity>ميدۋەي</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity draft="unconfirmed">ۋەيك</exemplarCity>
+				<exemplarCity>ۋەيك</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
-				<exemplarCity draft="unconfirmed">اداك</exemplarCity>
+				<exemplarCity>اداك</exemplarCity>
 			</zone>
 			<zone type="America/Nome">
-				<exemplarCity draft="unconfirmed">نوم</exemplarCity>
+				<exemplarCity>نوم</exemplarCity>
 			</zone>
 			<zone type="America/Anchorage">
-				<exemplarCity draft="unconfirmed">انكوريج</exemplarCity>
+				<exemplarCity>انكوريج</exemplarCity>
 			</zone>
 			<zone type="America/Yakutat">
-				<exemplarCity draft="unconfirmed">ياكۋتات</exemplarCity>
+				<exemplarCity>ياكۋتات</exemplarCity>
 			</zone>
 			<zone type="America/Sitka">
-				<exemplarCity draft="unconfirmed">سيتكا</exemplarCity>
+				<exemplarCity>سيتكا</exemplarCity>
 			</zone>
 			<zone type="America/Juneau">
-				<exemplarCity draft="unconfirmed">جۋنو</exemplarCity>
+				<exemplarCity>جۋنو</exemplarCity>
 			</zone>
 			<zone type="America/Metlakatla">
-				<exemplarCity draft="unconfirmed">مەتلاكاتلا</exemplarCity>
+				<exemplarCity>مەتلاكاتلا</exemplarCity>
 			</zone>
 			<zone type="America/Los_Angeles">
-				<exemplarCity draft="unconfirmed">لوس-انجەلەس</exemplarCity>
+				<exemplarCity>لوس-انجەلەس</exemplarCity>
 			</zone>
 			<zone type="America/Boise">
-				<exemplarCity draft="unconfirmed">بويسە</exemplarCity>
+				<exemplarCity>بويسە</exemplarCity>
 			</zone>
 			<zone type="America/Phoenix">
-				<exemplarCity draft="unconfirmed">فينيكس</exemplarCity>
+				<exemplarCity>فينيكس</exemplarCity>
 			</zone>
 			<zone type="America/Denver">
-				<exemplarCity draft="unconfirmed">دەنۆەر</exemplarCity>
+				<exemplarCity>دەنۆەر</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity draft="unconfirmed">بويلا، سولتۇستىك داكوتا</exemplarCity>
+				<exemplarCity>بويلا، سولتۇستىك داكوتا</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="unconfirmed">نيۋ-سەيلەم، سولتۇستىك داكوتا</exemplarCity>
+				<exemplarCity>نيۋ-سەيلەم، سولتۇستىك داكوتا</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity draft="unconfirmed">سەنتەر، سولتۇستىك داكوتا</exemplarCity>
+				<exemplarCity>سەنتەر، سولتۇستىك داكوتا</exemplarCity>
 			</zone>
 			<zone type="America/Chicago">
-				<exemplarCity draft="unconfirmed">چيكاگو</exemplarCity>
+				<exemplarCity>چيكاگو</exemplarCity>
 			</zone>
 			<zone type="America/Menominee">
-				<exemplarCity draft="unconfirmed">مەنوميني</exemplarCity>
+				<exemplarCity>مەنوميني</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
-				<exemplarCity draft="unconfirmed">ۆينسەننەس، ينديانا</exemplarCity>
+				<exemplarCity>ۆينسەننەس، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
-				<exemplarCity draft="unconfirmed">پيتەرسبەرگ، ينديانا</exemplarCity>
+				<exemplarCity>پيتەرسبەرگ، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Tell_City">
-				<exemplarCity draft="unconfirmed">تەلل-سيتي، ينديانا</exemplarCity>
+				<exemplarCity>تەلل-سيتي، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Knox">
-				<exemplarCity draft="unconfirmed">نوكس، ينديانا</exemplarCity>
+				<exemplarCity>نوكس، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Winamac">
-				<exemplarCity draft="unconfirmed">ۋيناماك، ينديانا</exemplarCity>
+				<exemplarCity>ۋيناماك، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Marengo">
-				<exemplarCity draft="unconfirmed">مارەنگو، ينديانا</exemplarCity>
+				<exemplarCity>مارەنگو، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Indianapolis">
-				<exemplarCity draft="unconfirmed">يندياناپوليس</exemplarCity>
+				<exemplarCity>يندياناپوليس</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity draft="unconfirmed">لۋيسۆيل</exemplarCity>
+				<exemplarCity>لۋيسۆيل</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
-				<exemplarCity draft="unconfirmed">ۆيۆەي، ينديانا</exemplarCity>
+				<exemplarCity>ۆيۆەي، ينديانا</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
-				<exemplarCity draft="unconfirmed">مونتيسەللو، كەنتۋككي</exemplarCity>
+				<exemplarCity>مونتيسەللو، كەنتۋككي</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity draft="unconfirmed">دەترويد</exemplarCity>
+				<exemplarCity>دەترويد</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity draft="unconfirmed">نيۋ-يورك</exemplarCity>
+				<exemplarCity>نيۋ-يورك</exemplarCity>
 			</zone>
 			<zone type="America/Montevideo">
-				<exemplarCity draft="unconfirmed">مونتەۆيدەو</exemplarCity>
+				<exemplarCity>مونتەۆيدەو</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="unconfirmed">سامارقاند</exemplarCity>
+				<exemplarCity>سامارقاند</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
-				<exemplarCity draft="unconfirmed">تاشكەنت</exemplarCity>
+				<exemplarCity>تاشكەنت</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
-				<exemplarCity draft="unconfirmed">ۆاتيكان</exemplarCity>
+				<exemplarCity>ۆاتيكان</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity draft="unconfirmed">سەنت-ۆينسەنت</exemplarCity>
+				<exemplarCity>سەنت-ۆينسەنت</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
-				<exemplarCity draft="unconfirmed">كاراكاس</exemplarCity>
+				<exemplarCity>كاراكاس</exemplarCity>
 			</zone>
 			<zone type="America/Tortola">
-				<exemplarCity draft="unconfirmed">تورتولا</exemplarCity>
+				<exemplarCity>تورتولا</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity draft="unconfirmed">سەنت-توماس</exemplarCity>
+				<exemplarCity>سەنت-توماس</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
-				<exemplarCity draft="unconfirmed">حوشيمين</exemplarCity>
+				<exemplarCity>حوشيمين</exemplarCity>
 			</zone>
 			<zone type="Pacific/Efate">
-				<exemplarCity draft="unconfirmed">ەفاتە</exemplarCity>
+				<exemplarCity>ەفاتە</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity draft="unconfirmed">ۋولليس</exemplarCity>
+				<exemplarCity>ۋولليس</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
-				<exemplarCity draft="unconfirmed">اپيا</exemplarCity>
+				<exemplarCity>اپيا</exemplarCity>
 			</zone>
 			<zone type="Asia/Aden">
-				<exemplarCity draft="unconfirmed">ادەن</exemplarCity>
+				<exemplarCity>ادەن</exemplarCity>
 			</zone>
 			<zone type="Indian/Mayotte">
-				<exemplarCity draft="unconfirmed">مايوتتا</exemplarCity>
+				<exemplarCity>مايوتتا</exemplarCity>
 			</zone>
 			<zone type="Africa/Johannesburg">
-				<exemplarCity draft="unconfirmed">يوحاننەسبۋرگ</exemplarCity>
+				<exemplarCity>يوحاننەسبۋرگ</exemplarCity>
 			</zone>
 			<zone type="Africa/Lusaka">
-				<exemplarCity draft="unconfirmed">لۋساكا</exemplarCity>
+				<exemplarCity>لۋساكا</exemplarCity>
 			</zone>
 			<zone type="Africa/Harare">
-				<exemplarCity draft="unconfirmed">حارارە</exemplarCity>
+				<exemplarCity>حارارە</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard draft="unconfirmed">اۋعانستان ۋاقىتى</standard>
+					<standard>اۋعانستان ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard draft="unconfirmed">ورتالىق افريكا ۋاقىتى</standard>
+					<standard>ورتالىق افريكا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard draft="unconfirmed">شىعىس افريكا ۋاقىتى</standard>
+					<standard>شىعىس افريكا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard draft="unconfirmed">وڭتۇستىك افريكا ستاندارتتى ۋاقىتى</standard>
+					<standard>وڭتۇستىك افريكا ستاندارتتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">باتىس افريكا ۋاقىتى</generic>
-					<standard draft="unconfirmed">باتىس افريكا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">باتىس افريكا جازعى ۋاقىتى</daylight>
+					<standard>باتىس افريكا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="unconfirmed">الاسكا ۋاقىتى</generic>
-					<standard draft="unconfirmed">الاسكا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">الاسكا جازعى ۋاقىتى</daylight>
+					<generic>الاسكا ۋاقىتى</generic>
+					<standard>الاسكا ستاندارتتى ۋاقىتى</standard>
+					<daylight>الاسكا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Almaty">
 				<long>
-					<generic draft="unconfirmed">الماتى ۋاقىتى</generic>
-					<standard draft="unconfirmed">الماتى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">الماتى جازعى ۋاقىتى</daylight>
+					<generic>الماتى ۋاقىتى</generic>
+					<standard>الماتى ستاندارتتى ۋاقىتى</standard>
+					<daylight>الماتى جازعى ۋاقىتى</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">الماتى</generic>
-					<standard draft="unconfirmed">الماتى</standard>
-					<daylight draft="unconfirmed">الماتى قالاسى</daylight>
+					<generic draft="contributed">الماتى</generic>
+					<standard draft="contributed">الماتى</standard>
+					<daylight draft="contributed">الماتى قالاسى</daylight>
 				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic draft="unconfirmed">امازون ۋاقىتى</generic>
-					<standard draft="unconfirmed">امازون ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">امازون جازعى ۋاقىتى</daylight>
+					<generic>امازون ۋاقىتى</generic>
+					<standard>امازون ستاندارتتى ۋاقىتى</standard>
+					<daylight>امازون جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic draft="unconfirmed">سولتۇستىك امەريكا ورتالىق ۋاقىتى</generic>
-					<standard draft="unconfirmed">سولتۇستىك امەريكا ستاندارتتى ورتالىق ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ولتۇستىك امەريكا جازعى ورتالىق ۋاقىتى</daylight>
+					<generic>سولتۇستىك امەريكا ورتالىق ۋاقىتى</generic>
+					<standard>سولتۇستىك امەريكا ستاندارتتى ورتالىق ۋاقىتى</standard>
+					<daylight>ولتۇستىك امەريكا جازعى ورتالىق ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic draft="unconfirmed">سولتۇستىك امەريكا شىعىس ۋاقىتى</generic>
-					<standard draft="unconfirmed">سولتۇستىك امەريكا ستاندارتتى شىعىس ۋاقىتى</standard>
-					<daylight draft="unconfirmed">سولتۇستىك امەريكا جازعى شىعىس ۋاقىتى</daylight>
+					<generic>سولتۇستىك امەريكا شىعىس ۋاقىتى</generic>
+					<standard>سولتۇستىك امەريكا ستاندارتتى شىعىس ۋاقىتى</standard>
+					<daylight>سولتۇستىك امەريكا جازعى شىعىس ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic draft="unconfirmed">سولتۇستىك امەريكا تاۋ ۋاقىتى</generic>
-					<standard draft="unconfirmed">سولتۇستىك امەريكا ستاندارتتى تاۋ ۋاقىتى</standard>
-					<daylight draft="unconfirmed">سولتۇستىك امەريكا جازعى تاۋ ۋاقىتى</daylight>
+					<generic>سولتۇستىك امەريكا تاۋ ۋاقىتى</generic>
+					<standard>سولتۇستىك امەريكا ستاندارتتى تاۋ ۋاقىتى</standard>
+					<daylight>سولتۇستىك امەريكا جازعى تاۋ ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic draft="unconfirmed">سولتۇستىك امەريكا تىنىق مۇحيتى ۋاقىتى</generic>
-					<standard draft="unconfirmed">سولتۇستىك امەريكا ستاندارتتى تىنىق مۇحيتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">سولتۇستىك امەريكا جازعى تىنىق مۇحيتى ۋاقىتى</daylight>
+					<generic>سولتۇستىك امەريكا تىنىق مۇحيتى ۋاقىتى</generic>
+					<standard>سولتۇستىك امەريكا ستاندارتتى تىنىق مۇحيتى ۋاقىتى</standard>
+					<daylight>سولتۇستىك امەريكا جازعى تىنىق مۇحيتى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="unconfirmed">اپيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">اپيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اپيا جازعى ۋاقىتى</daylight>
+					<generic>اپيا ۋاقىتى</generic>
+					<standard>اپيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>اپيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
 				<long>
-					<generic draft="unconfirmed">اقتاۋ ۋاقىتى</generic>
-					<standard draft="unconfirmed">اقتاۋ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اقتاۋ جازعى ۋاقىتى</daylight>
+					<generic>اقتاۋ ۋاقىتى</generic>
+					<standard>اقتاۋ ستاندارتتى ۋاقىتى</standard>
+					<daylight>اقتاۋ جازعى ۋاقىتى</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">اقتاۋ</generic>
-					<standard draft="unconfirmed">اقتاۋ</standard>
-					<daylight draft="unconfirmed">اقتاۋ قالاسى</daylight>
+					<generic draft="contributed">اقتاۋ</generic>
+					<standard draft="contributed">اقتاۋ</standard>
+					<daylight draft="contributed">اقتاۋ قالاسى</daylight>
 				</short>
 			</metazone>
 			<metazone type="Aqtobe">
 				<long>
-					<generic draft="unconfirmed">اقتوبە ۋاقىتى</generic>
-					<standard draft="unconfirmed">اقتوبە ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اقتوبە جازعى ۋاقىتى</daylight>
+					<generic>اقتوبە ۋاقىتى</generic>
+					<standard>اقتوبە ستاندارتتى ۋاقىتى</standard>
+					<daylight>اقتوبە جازعى ۋاقىتى</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">اقتوبە</generic>
-					<standard draft="unconfirmed">اقتوبە</standard>
-					<daylight draft="unconfirmed">اقتوبە قالاسى</daylight>
+					<generic draft="contributed">اقتوبە</generic>
+					<standard draft="contributed">اقتوبە</standard>
+					<daylight draft="contributed">اقتوبە قالاسى</daylight>
 				</short>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="unconfirmed">ساۋد ارابياسى ۋاقىتى</generic>
-					<standard draft="unconfirmed">ساۋد ارابياسى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ساۋد ارابياسى جازعى ۋاقىتى</daylight>
+					<generic>ساۋد ارابياسى ۋاقىتى</generic>
+					<standard>ساۋد ارابياسى ستاندارتتى ۋاقىتى</standard>
+					<daylight>ساۋد ارابياسى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic draft="unconfirmed">ارگەنتينا ۋاقىتى</generic>
-					<standard draft="unconfirmed">ارگەنتينا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ارگەنتينا جازعى ۋاقىتى</daylight>
+					<generic>ارگەنتينا ۋاقىتى</generic>
+					<standard>ارگەنتينا ستاندارتتى ۋاقىتى</standard>
+					<daylight>ارگەنتينا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic draft="unconfirmed">باتىس ارگەنتينا ۋاقىتى</generic>
-					<standard draft="unconfirmed">باتىس ارگەنتينا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">باتىس ارگەنتينا جازعى ۋاقىتى</daylight>
+					<generic>باتىس ارگەنتينا ۋاقىتى</generic>
+					<standard>باتىس ارگەنتينا ستاندارتتى ۋاقىتى</standard>
+					<daylight>باتىس ارگەنتينا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic draft="unconfirmed">ارمەنيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">ارمەنيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ارمەنيا جازعى ۋاقىتى</daylight>
+					<generic>ارمەنيا ۋاقىتى</generic>
+					<standard>ارمەنيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>ارمەنيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic draft="unconfirmed">اتلانتيكا ۋاقىتى</generic>
-					<standard draft="unconfirmed">اتلانتيكا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اتلانتيكا جازعى ۋاقىتى</daylight>
+					<generic>اتلانتيكا ۋاقىتى</generic>
+					<standard>اتلانتيكا ستاندارتتى ۋاقىتى</standard>
+					<daylight>اتلانتيكا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic draft="unconfirmed">ورتالىق اۋستراليا ۋاقىتى</generic>
-					<standard draft="unconfirmed">اۋستراليا ستاندارتتى ورتالىق ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اۋستراليا جازعى ورتالىق ۋاقىتى</daylight>
+					<generic>ورتالىق اۋستراليا ۋاقىتى</generic>
+					<standard>اۋستراليا ستاندارتتى ورتالىق ۋاقىتى</standard>
+					<daylight>اۋستراليا جازعى ورتالىق ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic draft="unconfirmed">اۋستراليا ورتالىق-باتىس ۋاقىتى</generic>
-					<standard draft="unconfirmed">اۋستراليا ستاندارتتى ورتالىق-باتىس ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اۋستراليا جازعى ورتالىق-باتىس ۋاقىتى</daylight>
+					<generic>اۋستراليا ورتالىق-باتىس ۋاقىتى</generic>
+					<standard>اۋستراليا ستاندارتتى ورتالىق-باتىس ۋاقىتى</standard>
+					<daylight>اۋستراليا جازعى ورتالىق-باتىس ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic draft="unconfirmed">شىعىس اۋستراليا ۋاقىتى</generic>
-					<standard draft="unconfirmed">اۋستراليا ستاندارتتى شىعىس ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اۋستراليا جازعى شىعىس ۋاقىتى</daylight>
+					<generic>شىعىس اۋستراليا ۋاقىتى</generic>
+					<standard>اۋستراليا ستاندارتتى شىعىس ۋاقىتى</standard>
+					<daylight>اۋستراليا جازعى شىعىس ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic draft="unconfirmed">باتىس اۋستراليا ۋاقىتى</generic>
-					<standard draft="unconfirmed">اۋستراليا ستاندارتتى باتىس ۋاقىتى</standard>
-					<daylight draft="unconfirmed">اۋستراليا جازعى باتىس ۋاقىتى</daylight>
+					<generic>باتىس اۋستراليا ۋاقىتى</generic>
+					<standard>اۋستراليا ستاندارتتى باتىس ۋاقىتى</standard>
+					<daylight>اۋستراليا جازعى باتىس ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic draft="unconfirmed">ءازىربايجان ۋاقىتى</generic>
-					<standard draft="unconfirmed">ءازىربايجان ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ءازىربايجان جازعى ۋاقىتى</daylight>
+					<generic>ءازىربايجان ۋاقىتى</generic>
+					<standard>ءازىربايجان ستاندارتتى ۋاقىتى</standard>
+					<daylight>ءازىربايجان جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic draft="unconfirmed">ازور ارالدارى ۋاقىتى</generic>
-					<standard draft="unconfirmed">ازور ارالدارى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ازور ارالدارى جازعى ۋاقىتى</daylight>
+					<generic>ازور ارالدارى ۋاقىتى</generic>
+					<standard>ازور ارالدارى ستاندارتتى ۋاقىتى</standard>
+					<daylight>ازور ارالدارى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic draft="unconfirmed">بانگلادەش ۋاقىتى</generic>
-					<standard draft="unconfirmed">بانگلادەش ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">بانگلادەش جازعى ۋاقىتى</daylight>
+					<generic>بانگلادەش ۋاقىتى</generic>
+					<standard>بانگلادەش ستاندارتتى ۋاقىتى</standard>
+					<daylight>بانگلادەش جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard draft="unconfirmed">بۋتان ۋاقىتى</standard>
+					<standard>بۋتان ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard draft="unconfirmed">بوليۆيا ۋاقىتى</standard>
+					<standard>بوليۆيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic draft="unconfirmed">برازيليا ۋاقىتى</generic>
-					<standard draft="unconfirmed">برازيليا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">برازيليا جازعى ۋاقىتى</daylight>
+					<generic>برازيليا ۋاقىتى</generic>
+					<standard>برازيليا ستاندارتتى ۋاقىتى</standard>
+					<daylight>برازيليا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard draft="unconfirmed">برۋنەي-دارۋسسالام ۋاقىتى</standard>
+					<standard>برۋنەي-دارۋسسالام ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic draft="unconfirmed">كابو-ۆەردە ۋاقىتى</generic>
-					<standard draft="unconfirmed">كابو-ۆەردە ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">كابو-ۆەردە جازعى ۋاقىتى</daylight>
+					<generic>كابو-ۆەردە ۋاقىتى</generic>
+					<standard>كابو-ۆەردە ستاندارتتى ۋاقىتى</standard>
+					<daylight>كابو-ۆەردە جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard draft="unconfirmed">چاموررو ستاندارتتى ۋاقىتى</standard>
+					<standard>چاموررو ستاندارتتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic draft="unconfirmed">چاتەم ۋاقىتى</generic>
-					<standard draft="unconfirmed">چاتەم ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">چاتەم جازعى ۋاقىتى</daylight>
+					<generic>چاتەم ۋاقىتى</generic>
+					<standard>چاتەم ستاندارتتى ۋاقىتى</standard>
+					<daylight>چاتەم جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic draft="unconfirmed">چيلي ۋاقىتى</generic>
-					<standard draft="unconfirmed">چيلي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">چيلي جازعى ۋاقىتى</daylight>
+					<generic>چيلي ۋاقىتى</generic>
+					<standard>چيلي ستاندارتتى ۋاقىتى</standard>
+					<daylight>چيلي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic draft="unconfirmed">قىتاي ۋاقىتى</generic>
-					<standard draft="unconfirmed">قىتاي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">قىتاي جازعى ۋاقىتى</daylight>
+					<generic>قىتاي ۋاقىتى</generic>
+					<standard>قىتاي ستاندارتتى ۋاقىتى</standard>
+					<daylight>قىتاي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard draft="unconfirmed">كريستماس ارالىنىڭ ۋاقىتى</standard>
+					<standard>كريستماس ارالىنىڭ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard draft="unconfirmed">كوكوس ارالدارىنىڭ ۋاقىتى</standard>
+					<standard>كوكوس ارالدارىنىڭ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic draft="unconfirmed">كولۋمبيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">كولۋمبيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">كولۋمبيا جازعى ۋاقىتى</daylight>
+					<generic>كولۋمبيا ۋاقىتى</generic>
+					<standard>كولۋمبيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>كولۋمبيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="unconfirmed">كۋك ارالدارىنىڭ ۋاقىتى</generic>
-					<standard draft="unconfirmed">كۋك ارالدارىنىڭ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">كۋك ارالدارىنىڭ جازعى ۋاقىتى</daylight>
+					<generic>كۋك ارالدارىنىڭ ۋاقىتى</generic>
+					<standard>كۋك ارالدارىنىڭ ستاندارتتى ۋاقىتى</standard>
+					<daylight>كۋك ارالدارىنىڭ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic draft="unconfirmed">كۋبا ۋاقىتى</generic>
-					<standard draft="unconfirmed">كۋبا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">كۋبا جازعى ۋاقىتى</daylight>
+					<generic>كۋبا ۋاقىتى</generic>
+					<standard>كۋبا ستاندارتتى ۋاقىتى</standard>
+					<daylight>كۋبا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard draft="unconfirmed">دەيۆيس ۋاقىتى</standard>
+					<standard>دەيۆيس ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard draft="unconfirmed">ديۋمون-ديۋرۆيل ۋاقىتى</standard>
+					<standard>ديۋمون-ديۋرۆيل ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard draft="unconfirmed">شىعىس تيمور ۋاقىتى</standard>
+					<standard>شىعىس تيمور ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic draft="unconfirmed">پاسحا ارالى ۋاقىتى</generic>
-					<standard draft="unconfirmed">پاسحا ارالى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">پاسحا ارالى جازعى ۋاقىتى</daylight>
+					<generic>پاسحا ارالى ۋاقىتى</generic>
+					<standard>پاسحا ارالى ستاندارتتى ۋاقىتى</standard>
+					<daylight>پاسحا ارالى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard draft="unconfirmed">ەكۆادور ۋاقىتى</standard>
+					<standard>ەكۆادور ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic draft="unconfirmed">ورتالىق ەۋروپا ۋاقىتى</generic>
-					<standard draft="unconfirmed">ورتالىق ەۋروپا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ورتالىق ەۋروپا جازعى ۋاقىتى</daylight>
+					<generic>ورتالىق ەۋروپا ۋاقىتى</generic>
+					<standard>ورتالىق ەۋروپا ستاندارتتى ۋاقىتى</standard>
+					<daylight>ورتالىق ەۋروپا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic draft="unconfirmed">شىعىس ەۋروپا ۋاقىتى</generic>
-					<standard draft="unconfirmed">شىعىس ەۋروپا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">شىعىس ەۋروپا جازعى ۋاقىتى</daylight>
+					<generic>شىعىس ەۋروپا ۋاقىتى</generic>
+					<standard>شىعىس ەۋروپا ستاندارتتى ۋاقىتى</standard>
+					<daylight>شىعىس ەۋروپا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="unconfirmed">قيىر شىعىس ەۋروپا ۋاقىتى</standard>
+					<standard>قيىر شىعىس ەۋروپا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic draft="unconfirmed">باتىس ەۋروپا ۋاقىتى</generic>
-					<standard draft="unconfirmed">باتىس ەۋروپا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">باتىس ەۋروپا جازعى ۋاقىتى</daylight>
+					<generic>باتىس ەۋروپا ۋاقىتى</generic>
+					<standard>باتىس ەۋروپا ستاندارتتى ۋاقىتى</standard>
+					<daylight>باتىس ەۋروپا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic draft="unconfirmed">فولكلەند ارالدارى ۋاقىتى</generic>
-					<standard draft="unconfirmed">فولكلەند ارالدارى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">فولكلەند ارالدارى جازعى ۋاقىتى</daylight>
+					<generic>فولكلەند ارالدارى ۋاقىتى</generic>
+					<standard>فولكلەند ارالدارى ستاندارتتى ۋاقىتى</standard>
+					<daylight>فولكلەند ارالدارى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="unconfirmed">فيجي ۋاقىتى</generic>
-					<standard draft="unconfirmed">فيجي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">فيجي جازعى ۋاقىتى</daylight>
+					<generic>فيجي ۋاقىتى</generic>
+					<standard>فيجي ستاندارتتى ۋاقىتى</standard>
+					<daylight>فيجي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard draft="unconfirmed">فرانتسۋز گۆياناسى ۋاقىتى</standard>
+					<standard>فرانتسۋز گۆياناسى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard draft="unconfirmed">فرانتسيانىڭ وڭتۇستىك ايماعى جانە انتاركتيكا ۋاقىتى</standard>
+					<standard>فرانتسيانىڭ وڭتۇستىك ايماعى جانە انتاركتيكا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard draft="unconfirmed">گالاپاگوس ۋاقىتى</standard>
+					<standard>گالاپاگوس ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard draft="unconfirmed">گامبە ۋاقىتى</standard>
+					<standard>گامبە ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic draft="unconfirmed">گرۋزيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">گرۋزيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">گرۋزيا جازعى ۋاقىتى</daylight>
+					<generic>گرۋزيا ۋاقىتى</generic>
+					<standard>گرۋزيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>گرۋزيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard draft="unconfirmed">گيلبەرت ارالدارىنىڭ ۋاقىتى</standard>
+					<standard>گيلبەرت ارالدارىنىڭ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard draft="unconfirmed">گرينۆيچ ۋاقىتى</standard>
+					<standard>گرينۆيچ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic draft="unconfirmed">شىعىس گرەنلانديا ۋاقىتى</generic>
-					<standard draft="unconfirmed">شىعىس گرەنلانديا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">شىعىس گرەنلانديا جازعى ۋاقىتى</daylight>
+					<generic>شىعىس گرەنلانديا ۋاقىتى</generic>
+					<standard>شىعىس گرەنلانديا ستاندارتتى ۋاقىتى</standard>
+					<daylight>شىعىس گرەنلانديا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic draft="unconfirmed">باتىس گرەنلانديا ۋاقىتى</generic>
-					<standard draft="unconfirmed">باتىس گرەنلانديا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">باتىس گرەنلانديا جازعى ۋاقىتى</daylight>
+					<generic>باتىس گرەنلانديا ۋاقىتى</generic>
+					<standard>باتىس گرەنلانديا ستاندارتتى ۋاقىتى</standard>
+					<daylight>باتىس گرەنلانديا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard draft="unconfirmed">پارسى شىعاناعى ستاندارتتى ۋاقىتى</standard>
+					<standard>پارسى شىعاناعى ستاندارتتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard draft="unconfirmed">گايانا ۋاقىتى</standard>
+					<standard>گايانا ۋاقىتى</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>گاۆاي جانە الەۋت ارالدارى ستاندارتتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic draft="unconfirmed">گاۆاي جانە الەۋت ارالدارى ۋاقىتى</generic>
-					<standard draft="unconfirmed">گاۆاي جانە الەۋت ارالدارى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">گاۆاي جانە الەۋت ارالدارى جازعى ۋاقىتى</daylight>
+					<generic>گاۆاي جانە الەۋت ارالدارى ۋاقىتى</generic>
+					<standard>گاۆاي جانە الەۋت ارالدارى ستاندارتتى ۋاقىتى</standard>
+					<daylight>گاۆاي جانە الەۋت ارالدارى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic draft="unconfirmed">حوڭكوڭ ۋاقىتى</generic>
-					<standard draft="unconfirmed">حوڭكوڭ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">حوڭكوڭ جازعى ۋاقىتى</daylight>
+					<generic>حوڭكوڭ ۋاقىتى</generic>
+					<standard>حوڭكوڭ ستاندارتتى ۋاقىتى</standard>
+					<daylight>حوڭكوڭ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic draft="unconfirmed">حوۆد ۋاقىتى</generic>
-					<standard draft="unconfirmed">حوۆد ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">حوۆد جازعى ۋاقىتى</daylight>
+					<generic>حوۆد ۋاقىتى</generic>
+					<standard>حوۆد ستاندارتتى ۋاقىتى</standard>
+					<daylight>حوۆد جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard draft="unconfirmed">ءۇندىستان ستاندارتتى ۋاقىتى</standard>
+					<standard>ءۇندىستان ستاندارتتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard draft="unconfirmed">ءۇندى مۇحيتى ۋاقىتى</standard>
+					<standard>ءۇندى مۇحيتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard draft="unconfirmed">ءۇندى-قىتاي ۋاقىتى</standard>
+					<standard>ءۇندى-قىتاي ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard draft="unconfirmed">ورتالىق يندونەزيا ۋاقىتى</standard>
+					<standard>ورتالىق يندونەزيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard draft="unconfirmed">شىعىس يندونەزيا ۋاقىتى</standard>
+					<standard>شىعىس يندونەزيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard draft="unconfirmed">باتىس يندونەزيا ۋاقىتى</standard>
+					<standard>باتىس يندونەزيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic draft="unconfirmed">يران ۋاقىتى</generic>
-					<standard draft="unconfirmed">يران ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">يران جازعى ۋاقىتى</daylight>
+					<generic>يران ۋاقىتى</generic>
+					<standard>يران ستاندارتتى ۋاقىتى</standard>
+					<daylight>يران جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic draft="unconfirmed">يركۋتسك ۋاقىتى</generic>
-					<standard draft="unconfirmed">يركۋتسك ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">يركۋتسك جازعى ۋاقىتى</daylight>
+					<generic>يركۋتسك ۋاقىتى</generic>
+					<standard>يركۋتسك ستاندارتتى ۋاقىتى</standard>
+					<daylight>يركۋتسك جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic draft="unconfirmed">يزرايل ۋاقىتى</generic>
-					<standard draft="unconfirmed">يزرايل ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">يزرايل جازعى ۋاقىتى</daylight>
+					<generic>يزرايل ۋاقىتى</generic>
+					<standard>يزرايل ستاندارتتى ۋاقىتى</standard>
+					<daylight>يزرايل جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic draft="unconfirmed">جاپونيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">جاپونيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">جاپونيا جازعى ۋاقىتى</daylight>
+					<generic>جاپونيا ۋاقىتى</generic>
+					<standard>جاپونيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>جاپونيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
 				<long>
-					<standard draft="unconfirmed">قازاق ەلى ۋاقىتى</standard>
+					<standard>قازاق ەلى ۋاقىتى</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">قازاق ەلى</standard>
+					<standard draft="contributed">قازاق ەلى</standard>
 				</short>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard draft="unconfirmed">شىعىس قازاق ەلى ۋاقىتى</standard>
+					<standard>شىعىس قازاق ەلى ۋاقىتى</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">شىعىش قازاق ەلى</standard>
+					<standard draft="contributed">شىعىش قازاق ەلى</standard>
 				</short>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<standard draft="unconfirmed">باتىس قازاق ەلى ۋاقىتى</standard>
+					<standard>باتىس قازاق ەلى ۋاقىتى</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">باتىس قازاق ەلى</standard>
+					<standard draft="contributed">باتىس قازاق ەلى</standard>
 				</short>
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic draft="unconfirmed">كورەيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">كورەيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">كورەيا جازعى ۋاقىتى</daylight>
+					<generic>كورەيا ۋاقىتى</generic>
+					<standard>كورەيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>كورەيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="unconfirmed">كۋسايە ۋاقىتى</standard>
+					<standard>كۋسايە ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic draft="unconfirmed">كراسنويارسك ۋاقىتى</generic>
-					<standard draft="unconfirmed">كراسنويارسك ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">كراسنويارسك جازعى ۋاقىتى</daylight>
+					<generic>كراسنويارسك ۋاقىتى</generic>
+					<standard>كراسنويارسك ستاندارتتى ۋاقىتى</standard>
+					<daylight>كراسنويارسك جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard draft="unconfirmed">قىرعىزستان ۋاقىتى</standard>
+					<standard>قىرعىزستان ۋاقىتى</standard>
 				</long>
 				<short>
-					<standard draft="unconfirmed">قىرعىزستان</standard>
+					<standard draft="contributed">قىرعىزستان</standard>
 				</short>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard draft="unconfirmed">لاين ارالدارى ۋاقىتى</standard>
+					<standard>لاين ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic draft="unconfirmed">لورد-حاۋ ۋاقىتى</generic>
-					<standard draft="unconfirmed">لورد-حاۋ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">لورد-حاۋ جازعى ۋاقىتى</daylight>
+					<generic>لورد-حاۋ ۋاقىتى</generic>
+					<standard>لورد-حاۋ ستاندارتتى ۋاقىتى</standard>
+					<daylight>لورد-حاۋ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<generic draft="unconfirmed">ماگادان ۋاقىتى</generic>
-					<standard draft="unconfirmed">ماگادان ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ماگادان جازعى ۋاقىتى</daylight>
+					<generic>ماگادان ۋاقىتى</generic>
+					<standard>ماگادان ستاندارتتى ۋاقىتى</standard>
+					<daylight>ماگادان جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard draft="unconfirmed">مالايزيا ۋاقىتى</standard>
+					<standard>مالايزيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard draft="unconfirmed">مالديۆ ارالدارى ۋاقىتى</standard>
+					<standard>مالديۆ ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard draft="unconfirmed">ماركيز ارالدارى ۋاقىتى</standard>
+					<standard>ماركيز ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard draft="unconfirmed">مارشال ارالدارى ۋاقىتى</standard>
+					<standard>مارشال ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic draft="unconfirmed">ماۆريكيي ۋاقىتى</generic>
-					<standard draft="unconfirmed">ماۆريكيي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ماۆريكيي جازعى ۋاقىتى</daylight>
+					<generic>ماۆريكيي ۋاقىتى</generic>
+					<standard>ماۆريكيي ستاندارتتى ۋاقىتى</standard>
+					<daylight>ماۆريكيي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard draft="unconfirmed">موۋسون ۋاقىتى</standard>
+					<standard>موۋسون ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic draft="unconfirmed">مەكسيكا تىنىق مۇحيت ۋاقىتى</generic>
-					<standard draft="unconfirmed">مەكسيكا ستاندارتتى تىنىق مۇحيت ۋاقىتى</standard>
-					<daylight draft="unconfirmed">مەكسيكا جازعى تىنىق مۇحيت ۋاقىتى</daylight>
+					<generic>مەكسيكا تىنىق مۇحيت ۋاقىتى</generic>
+					<standard>مەكسيكا ستاندارتتى تىنىق مۇحيت ۋاقىتى</standard>
+					<daylight>مەكسيكا جازعى تىنىق مۇحيت ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic draft="unconfirmed">ۇلانباتىر ۋاقىتى</generic>
-					<standard draft="unconfirmed">ۇلانباتىر ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ۇلانباتىر جازعى ۋاقىتى</daylight>
+					<generic>ۇلانباتىر ۋاقىتى</generic>
+					<standard>ۇلانباتىر ستاندارتتى ۋاقىتى</standard>
+					<daylight>ۇلانباتىر جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic draft="unconfirmed">ماسكەۋ ۋاقىتى</generic>
-					<standard draft="unconfirmed">ماسكەۋ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ماسكەۋ جازعى ۋاقىتى</daylight>
+					<generic>ماسكەۋ ۋاقىتى</generic>
+					<standard>ماسكەۋ ستاندارتتى ۋاقىتى</standard>
+					<daylight>ماسكەۋ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard draft="unconfirmed">ميانما ۋاقىتى</standard>
+					<standard>ميانما ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard draft="unconfirmed">ناۋرۋ ۋاقىتى</standard>
+					<standard>ناۋرۋ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard draft="unconfirmed">نەپال ۋاقىتى</standard>
+					<standard>نەپال ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="unconfirmed">جاڭا كالەدونيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">جاڭا كالەدونيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">جاڭا كالەدونيا جازعى ۋاقىتى</daylight>
+					<generic>جاڭا كالەدونيا ۋاقىتى</generic>
+					<standard>جاڭا كالەدونيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>جاڭا كالەدونيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
-					<generic draft="unconfirmed">جاڭا زەلانديا ۋاقىتى</generic>
-					<standard draft="unconfirmed">جاڭا زەلانديا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">جاڭا زەلانديا جازعى ۋاقىتى</daylight>
+					<generic>جاڭا زەلانديا ۋاقىتى</generic>
+					<standard>جاڭا زەلانديا ستاندارتتى ۋاقىتى</standard>
+					<daylight>جاڭا زەلانديا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic draft="unconfirmed">نيۋفاۋندلەند ۋاقىتى</generic>
-					<standard draft="unconfirmed">نيۋفاۋندلەند ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">نيۋفاۋندلەند جازعى ۋاقىتى</daylight>
+					<generic>نيۋفاۋندلەند ۋاقىتى</generic>
+					<standard>نيۋفاۋندلەند ستاندارتتى ۋاقىتى</standard>
+					<daylight>نيۋفاۋندلەند جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
 				<long>
-					<standard draft="unconfirmed">نيۋە ۋاقىتى</standard>
+					<standard>نيۋە ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<generic draft="unconfirmed">نورفولك ارالى ۋاقىتى</generic>
-					<standard draft="unconfirmed">نورفولك ارالى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">نورفولك ارالى جازعى ۋاقىتى</daylight>
+					<generic>نورفولك ارالى ۋاقىتى</generic>
+					<standard>نورفولك ارالى ستاندارتتى ۋاقىتى</standard>
+					<daylight>نورفولك ارالى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic draft="unconfirmed">فەرناندۋ-دي-نورونيا ۋاقىتى</generic>
-					<standard draft="unconfirmed">فەرناندۋ-دي-نورونيا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">فەرناندۋ-دي-نورونيا جازعى ۋاقىتى</daylight>
+					<generic>فەرناندۋ-دي-نورونيا ۋاقىتى</generic>
+					<standard>فەرناندۋ-دي-نورونيا ستاندارتتى ۋاقىتى</standard>
+					<daylight>فەرناندۋ-دي-نورونيا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<generic draft="unconfirmed">جاڭاسىبىر ۋاقىتى</generic>
-					<standard draft="unconfirmed">جاڭاسىبىر ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">جاڭاسىبىر جازعى ۋاقىتى</daylight>
+					<generic>جاڭاسىبىر ۋاقىتى</generic>
+					<standard>جاڭاسىبىر ستاندارتتى ۋاقىتى</standard>
+					<daylight>جاڭاسىبىر جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic draft="unconfirmed">ومبى ۋاقىتى</generic>
-					<standard draft="unconfirmed">ومبى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ومبى جازعى ۋاقىتى</daylight>
+					<generic>ومبى ۋاقىتى</generic>
+					<standard>ومبى ستاندارتتى ۋاقىتى</standard>
+					<daylight>ومبى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic draft="unconfirmed">پاكىستان ۋاقىتى</generic>
-					<standard draft="unconfirmed">پاكىستان ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">پاكىستان جازعى ۋاقىتى</daylight>
+					<generic>پاكىستان ۋاقىتى</generic>
+					<standard>پاكىستان ستاندارتتى ۋاقىتى</standard>
+					<daylight>پاكىستان جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
 				<long>
-					<standard draft="unconfirmed">پالاۋ ۋاقىتى</standard>
+					<standard>پالاۋ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard draft="unconfirmed">پاپۋا – جاڭا گۆينەيا ۋاقىتى</standard>
+					<standard>پاپۋا – جاڭا گۆينەيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic draft="unconfirmed">پاراگۆاي ۋاقىتى</generic>
-					<standard draft="unconfirmed">پاراگۆاي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">پاراگۆاي جازعى ۋاقىتى</daylight>
+					<generic>پاراگۆاي ۋاقىتى</generic>
+					<standard>پاراگۆاي ستاندارتتى ۋاقىتى</standard>
+					<daylight>پاراگۆاي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic draft="unconfirmed">پەرۋ ۋاقىتى</generic>
-					<standard draft="unconfirmed">پەرۋ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">پەرۋ جازعى ۋاقىتى</daylight>
+					<generic>پەرۋ ۋاقىتى</generic>
+					<standard>پەرۋ ستاندارتتى ۋاقىتى</standard>
+					<daylight>پەرۋ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="unconfirmed">فيليپين ارالدارى ۋاقىتى</generic>
-					<standard draft="unconfirmed">فيليپين ارالدارى ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">فيليپين ارالدارى جازعى ۋاقىتى</daylight>
+					<generic>فيليپين ارالدارى ۋاقىتى</generic>
+					<standard>فيليپين ارالدارى ستاندارتتى ۋاقىتى</standard>
+					<daylight>فيليپين ارالدارى جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard draft="unconfirmed">فەنيكس ارالدارى ۋاقىتى</standard>
+					<standard>فەنيكس ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic draft="unconfirmed">سەن-پەر جانە ميكەلون ۋاقىتى</generic>
-					<standard draft="unconfirmed">سەن-پەر جانە ميكەلون ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">سەن-پەر جانە ميكەلون جازعى ۋاقىتى</daylight>
+					<generic>سەن-پەر جانە ميكەلون ۋاقىتى</generic>
+					<standard>سەن-پەر جانە ميكەلون ستاندارتتى ۋاقىتى</standard>
+					<daylight>سەن-پەر جانە ميكەلون جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard draft="unconfirmed">پيتكەرن ۋاقىتى</standard>
+					<standard>پيتكەرن ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="unconfirmed">پونپەي ۋاقىتى</standard>
+					<standard>پونپەي ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard draft="unconfirmed">پحەنيان ۋاقىتى</standard>
+					<standard>پحەنيان ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
 				<long>
-					<generic draft="unconfirmed">قىزىلوردا ۋاقىتى</generic>
-					<standard draft="unconfirmed">قىزىلوردا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">قىزىلوردا جازعى ۋاقىتى</daylight>
+					<generic>قىزىلوردا ۋاقىتى</generic>
+					<standard>قىزىلوردا ستاندارتتى ۋاقىتى</standard>
+					<daylight>قىزىلوردا جازعى ۋاقىتى</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">قىزىلوردا</generic>
-					<standard draft="unconfirmed">قىزىلوردا</standard>
-					<daylight draft="unconfirmed">قىزىلوردا قالاسى</daylight>
+					<generic draft="contributed">قىزىلوردا</generic>
+					<standard draft="contributed">قىزىلوردا</standard>
+					<daylight draft="contributed">قىزىلوردا قالاسى</daylight>
 				</short>
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard draft="unconfirmed">رەيۋنون ۋاقىتى</standard>
+					<standard>رەيۋنون ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
 				<long>
-					<standard draft="unconfirmed">روتەرا ۋقىتى</standard>
+					<standard>روتەرا ۋقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<generic draft="unconfirmed">ساحالين ۋاقىتى</generic>
-					<standard draft="unconfirmed">ساحالين ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ساحالين جازعى ۋاقىتى</daylight>
+					<generic>ساحالين ۋاقىتى</generic>
+					<standard>ساحالين ستاندارتتى ۋاقىتى</standard>
+					<daylight>ساحالين جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="unconfirmed">ساموا ۋاقىتى</generic>
-					<standard draft="unconfirmed">ساموا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ساموا جازعى ۋاقىتى</daylight>
+					<generic>ساموا ۋاقىتى</generic>
+					<standard>ساموا ستاندارتتى ۋاقىتى</standard>
+					<daylight>ساموا جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard draft="unconfirmed">سەيشەل ارالدارى ۋاقىتى</standard>
+					<standard>سەيشەل ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard draft="unconfirmed">سينگاپۋر ستاندارتتى ۋاقىتى</standard>
+					<standard>سينگاپۋر ستاندارتتى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard draft="unconfirmed">سولومون ارالدارى ۋاقىتى</standard>
+					<standard>سولومون ارالدارى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard draft="unconfirmed">وڭتۇستىك گەورگيا ۋاقىتى</standard>
+					<standard>وڭتۇستىك گەورگيا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard draft="unconfirmed">سۋرينام ۋاقىتى</standard>
+					<standard>سۋرينام ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard draft="unconfirmed">سەۆا ۋاقىتى</standard>
+					<standard>سەۆا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard draft="unconfirmed">تايتي ۋاقىتى</standard>
+					<standard>تايتي ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic draft="unconfirmed">تايبەي ۋاقىتى</generic>
-					<standard draft="unconfirmed">تايبەي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">تايبەي جازعى ۋاقىتى</daylight>
+					<generic>تايبەي ۋاقىتى</generic>
+					<standard>تايبەي ستاندارتتى ۋاقىتى</standard>
+					<daylight>تايبەي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard draft="unconfirmed">تاجىكستان ۋاقىتى</standard>
+					<standard>تاجىكستان ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard draft="unconfirmed">توكەلاۋ ۋاقىتى</standard>
+					<standard>توكەلاۋ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="unconfirmed">تونگا ۋاقىتى</generic>
-					<standard draft="unconfirmed">تونگا ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">تونگا كازعى ۋاقىتى</daylight>
+					<generic>تونگا ۋاقىتى</generic>
+					<standard>تونگا ستاندارتتى ۋاقىتى</standard>
+					<daylight>تونگا كازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard draft="unconfirmed">ترۋك ۋاقىتى</standard>
+					<standard>ترۋك ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic draft="unconfirmed">تۇرىكمەنستان ۋاقىتى</generic>
-					<standard draft="unconfirmed">تۇرىكمەنستان ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">تۇرىكمەنستان جازعى ۋاقىتى</daylight>
+					<generic>تۇرىكمەنستان ۋاقىتى</generic>
+					<standard>تۇرىكمەنستان ستاندارتتى ۋاقىتى</standard>
+					<daylight>تۇرىكمەنستان جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
-					<standard draft="unconfirmed">تۋۆالۋ ۋاقىتى</standard>
+					<standard>تۋۆالۋ ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic draft="unconfirmed">ۋرۋگۆاي ۋاقىتى</generic>
-					<standard draft="unconfirmed">ۋرۋگۆاي ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ۋرۋگۆاي جازعى ۋاقىتى</daylight>
+					<generic>ۋرۋگۆاي ۋاقىتى</generic>
+					<standard>ۋرۋگۆاي ستاندارتتى ۋاقىتى</standard>
+					<daylight>ۋرۋگۆاي جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="unconfirmed">وزبەكستان ۋاقىتى</generic>
-					<standard draft="unconfirmed">وزبەكستان ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">وزبەكستان جازعى ۋاقىتى</daylight>
+					<generic>وزبەكستان ۋاقىتى</generic>
+					<standard>وزبەكستان ستاندارتتى ۋاقىتى</standard>
+					<daylight>وزبەكستان جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="unconfirmed">ۆانۋاتۋ ۋاقىتى</generic>
-					<standard draft="unconfirmed">ۆانۋاتۋ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ۆانۋاتۋ جازعى ۋاقىتى</daylight>
+					<generic>ۆانۋاتۋ ۋاقىتى</generic>
+					<standard>ۆانۋاتۋ ستاندارتتى ۋاقىتى</standard>
+					<daylight>ۆانۋاتۋ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
-					<standard draft="unconfirmed">ۆەنەسۋەلا ۋاقىتى</standard>
+					<standard>ۆەنەسۋەلا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<generic draft="unconfirmed">ۆلاديۆوستوك ۋاقىتى</generic>
-					<standard draft="unconfirmed">ۆلاديۆوستوك ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ۆلاديۆوستوك جازعى ۋاقىتى</daylight>
+					<generic>ۆلاديۆوستوك ۋاقىتى</generic>
+					<standard>ۆلاديۆوستوك ستاندارتتى ۋاقىتى</standard>
+					<daylight>ۆلاديۆوستوك جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic draft="unconfirmed">ۆولگوگراد ۋاقىتى</generic>
-					<standard draft="unconfirmed">ۆولگوگراد ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ۆولگوگراد جازعى ۋاقىتى</daylight>
+					<generic>ۆولگوگراد ۋاقىتى</generic>
+					<standard>ۆولگوگراد ستاندارتتى ۋاقىتى</standard>
+					<daylight>ۆولگوگراد جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
 				<long>
-					<standard draft="unconfirmed">ۆوستوك ۋاقىتى</standard>
+					<standard>ۆوستوك ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard draft="unconfirmed">ۋەيك ارالى ۋاقىتى</standard>
+					<standard>ۋەيك ارالى ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard draft="unconfirmed">ۋولليس جانە فۋتۋنا ۋاقىتى</standard>
+					<standard>ۋولليس جانە فۋتۋنا ۋاقىتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic draft="unconfirmed">ياكۋتسك ۋاقىتى</generic>
-					<standard draft="unconfirmed">ياكۋتسك ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ياكۋتسك جازعى ۋاقىتى</daylight>
+					<generic>ياكۋتسك ۋاقىتى</generic>
+					<standard>ياكۋتسك ستاندارتتى ۋاقىتى</standard>
+					<daylight>ياكۋتسك جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic draft="unconfirmed">ەكاتەرينبۋرگ ۋاقىتى</generic>
-					<standard draft="unconfirmed">ەكاتەرينبۋرگ ستاندارتتى ۋاقىتى</standard>
-					<daylight draft="unconfirmed">ەكاتەرينبۋرگ جازعى ۋاقىتى</daylight>
+					<generic>ەكاتەرينبۋرگ ۋاقىتى</generic>
+					<standard>ەكاتەرينبۋرگ ستاندارتتى ۋاقىتى</standard>
+					<daylight>ەكاتەرينبۋرگ جازعى ۋاقىتى</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yukon">
 				<long>
-					<standard draft="unconfirmed">يۋكون ۋاقىتى</standard>
+					<standard>يۋكون ۋاقىتى</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<nan draft="unconfirmed">سان ەمەس</nan>
+			<nan>سان ەمەس</nan>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="unconfirmed">0 مىڭ</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">0 مىڭ</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">00 مىڭ</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 مىڭ</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">000 مىڭ</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 مىڭ</pattern>
-					<pattern type="1000000" count="one" draft="unconfirmed">0 ميلليون</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 ميلليون</pattern>
-					<pattern type="10000000" count="one" draft="unconfirmed">00 ميلليون</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 ميلليون</pattern>
-					<pattern type="100000000" count="one" draft="unconfirmed">000 ميلليون</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 ميلليون</pattern>
-					<pattern type="1000000000" count="one" draft="unconfirmed">0 ميلليارد</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 ميلليارد</pattern>
-					<pattern type="10000000000" count="one" draft="unconfirmed">00 ميلليارد</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 ميلليارد</pattern>
-					<pattern type="100000000000" count="one" draft="unconfirmed">000 ميلليارد</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 ميلليارد</pattern>
-					<pattern type="1000000000000" count="one" draft="unconfirmed">0 تريلليون</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 تريلليون</pattern>
-					<pattern type="10000000000000" count="one" draft="unconfirmed">00 تريلليون</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 تريلليون</pattern>
-					<pattern type="100000000000000" count="one" draft="unconfirmed">000 تريلليون</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 تريلليون</pattern>
+					<pattern type="1000" count="one">0 مىڭ</pattern>
+					<pattern type="1000" count="other">0 مىڭ</pattern>
+					<pattern type="10000" count="one">00 مىڭ</pattern>
+					<pattern type="10000" count="other">00 مىڭ</pattern>
+					<pattern type="100000" count="one">000 مىڭ</pattern>
+					<pattern type="100000" count="other">000 مىڭ</pattern>
+					<pattern type="1000000" count="one">0 ميلليون</pattern>
+					<pattern type="1000000" count="other">0 ميلليون</pattern>
+					<pattern type="10000000" count="one">00 ميلليون</pattern>
+					<pattern type="10000000" count="other">00 ميلليون</pattern>
+					<pattern type="100000000" count="one">000 ميلليون</pattern>
+					<pattern type="100000000" count="other">000 ميلليون</pattern>
+					<pattern type="1000000000" count="one">0 ميلليارد</pattern>
+					<pattern type="1000000000" count="other">0 ميلليارد</pattern>
+					<pattern type="10000000000" count="one">00 ميلليارد</pattern>
+					<pattern type="10000000000" count="other">00 ميلليارد</pattern>
+					<pattern type="100000000000" count="one">000 ميلليارد</pattern>
+					<pattern type="100000000000" count="other">000 ميلليارد</pattern>
+					<pattern type="1000000000000" count="one">0 تريلليون</pattern>
+					<pattern type="1000000000000" count="other">0 تريلليون</pattern>
+					<pattern type="10000000000000" count="one">00 تريلليون</pattern>
+					<pattern type="10000000000000" count="other">00 تريلليون</pattern>
+					<pattern type="100000000000000" count="one">000 تريلليون</pattern>
+					<pattern type="100000000000000" count="other">000 تريلليون</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="unconfirmed">0 مىڭ</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">0 مىڭ</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">00 مىڭ</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 مىڭ</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">000 مىڭ</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 مىڭ</pattern>
-					<pattern type="1000000" count="one" draft="unconfirmed">0 ميلليون</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 ميلليون</pattern>
-					<pattern type="10000000" count="one" draft="unconfirmed">00 ميلليون</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 ميلليون</pattern>
-					<pattern type="100000000" count="one" draft="unconfirmed">000 ملن</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 ملن</pattern>
-					<pattern type="1000000000" count="one" draft="unconfirmed">0 ميلليارد</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 ميلليارد</pattern>
-					<pattern type="10000000000" count="one" draft="unconfirmed">00 ملرد</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 ملرد</pattern>
-					<pattern type="100000000000" count="one" draft="unconfirmed">000 ملرد</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 ملرد</pattern>
-					<pattern type="1000000000000" count="one" draft="unconfirmed">0 تريلليون</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 تريلليون</pattern>
-					<pattern type="10000000000000" count="one" draft="unconfirmed">00 ترلن</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 ترلن</pattern>
-					<pattern type="100000000000000" count="one" draft="unconfirmed">000 ترلن</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 ترلن</pattern>
+					<pattern type="1000" count="one">0 مىڭ</pattern>
+					<pattern type="1000" count="other">0 مىڭ</pattern>
+					<pattern type="10000" count="one">00 مىڭ</pattern>
+					<pattern type="10000" count="other">00 مىڭ</pattern>
+					<pattern type="100000" count="one">000 مىڭ</pattern>
+					<pattern type="100000" count="other">000 مىڭ</pattern>
+					<pattern type="1000000" count="one">0 ميلليون</pattern>
+					<pattern type="1000000" count="other">0 ميلليون</pattern>
+					<pattern type="10000000" count="one">00 ميلليون</pattern>
+					<pattern type="10000000" count="other">00 ميلليون</pattern>
+					<pattern type="100000000" count="one">000 ملن</pattern>
+					<pattern type="100000000" count="other">000 ملن</pattern>
+					<pattern type="1000000000" count="one">0 ميلليارد</pattern>
+					<pattern type="1000000000" count="other">0 ميلليارد</pattern>
+					<pattern type="10000000000" count="one">00 ملرد</pattern>
+					<pattern type="10000000000" count="other">00 ملرد</pattern>
+					<pattern type="100000000000" count="one">000 ملرد</pattern>
+					<pattern type="100000000000" count="other">000 ملرد</pattern>
+					<pattern type="1000000000000" count="one">0 تريلليون</pattern>
+					<pattern type="1000000000000" count="other">0 تريلليون</pattern>
+					<pattern type="10000000000000" count="one">00 ترلن</pattern>
+					<pattern type="10000000000000" count="other">00 ترلن</pattern>
+					<pattern type="100000000000000" count="one">000 ترلن</pattern>
+					<pattern type="100000000000000" count="other">000 ترلن</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one" draft="unconfirmed">0 مىڭ ¤</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">0 مىڭ ¤</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">00 مىڭ ¤</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 مىڭ ¤</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">000 مىڭ ¤</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 مىڭ ¤</pattern>
-					<pattern type="1000000" count="one" draft="unconfirmed">0 ميلليون ¤</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 ميلليون ¤</pattern>
-					<pattern type="10000000" count="one" draft="unconfirmed">00 ميلليون ¤</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 ميلليون ¤</pattern>
-					<pattern type="100000000" count="one" draft="unconfirmed">000 ميلليون ¤</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 ميلليون ¤</pattern>
-					<pattern type="1000000000" count="one" draft="unconfirmed">0 ميلليارد ¤</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 ميلليارد ¤</pattern>
-					<pattern type="10000000000" count="one" draft="unconfirmed">00 ميلليارد ¤</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 ميلليارد ¤</pattern>
-					<pattern type="100000000000" count="one" draft="unconfirmed">000 ميلليارد ¤</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 ميلليارد ¤</pattern>
-					<pattern type="1000000000000" count="one" draft="unconfirmed">0 تريلليون ¤</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 تريلليون ¤</pattern>
-					<pattern type="10000000000000" count="one" draft="unconfirmed">00 تريلليون ¤</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 تريلليون ¤</pattern>
-					<pattern type="100000000000000" count="one" draft="unconfirmed">000 تريلليون ¤</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 تريلليون ¤</pattern>
+					<pattern type="1000" count="one">¤ 0 مىڭ</pattern>
+					<pattern type="1000" count="other">¤ 0 مىڭ</pattern>
+					<pattern type="10000" count="one">¤ 00 مىڭ</pattern>
+					<pattern type="10000" count="other">¤ 00 مىڭ</pattern>
+					<pattern type="100000" count="one">¤ 000 مىڭ</pattern>
+					<pattern type="100000" count="other">¤ 000 مىڭ</pattern>
+					<pattern type="1000000" count="one">¤ 0 ميلليون</pattern>
+					<pattern type="1000000" count="other">¤ 0 ميلليون</pattern>
+					<pattern type="10000000" count="one">¤ 00 ميلليون</pattern>
+					<pattern type="10000000" count="other">¤ 00 ميلليون</pattern>
+					<pattern type="100000000" count="one">¤ 000 ملن</pattern>
+					<pattern type="100000000" count="other">¤ 000 ملن</pattern>
+					<pattern type="1000000000" count="one">¤ 0 ميلليارد</pattern>
+					<pattern type="1000000000" count="other">¤ 0 ميلليارد</pattern>
+					<pattern type="10000000000" count="one">¤ 00 ملرد</pattern>
+					<pattern type="10000000000" count="other">¤ 00 ملرد</pattern>
+					<pattern type="100000000000" count="one">¤ 000 ملرد</pattern>
+					<pattern type="100000000000" count="other">¤ 000 ملرد</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 تريلليون</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 تريلليون</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 ترلن</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 ترلن</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 ترلن</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 ترلن</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName draft="unconfirmed">بىرىككەن اراب امىرلىكتەرىنىڭ ديرحامى</displayName>
-				<displayName count="one" draft="unconfirmed">ب ا ءا ديرحامى</displayName>
-				<displayName count="other" draft="unconfirmed">ب ا ءا ديرحامى</displayName>
+				<displayName>بىرىككەن اراب امىرلىكتەرىنىڭ ديرحامى</displayName>
+				<displayName count="one">ب ا ءا ديرحامى</displayName>
+				<displayName count="other">ب ا ءا ديرحامى</displayName>
 			</currency>
 			<currency type="AFN">
-				<displayName draft="unconfirmed">اۋعانستان افگانيى</displayName>
-				<displayName count="one" draft="unconfirmed">اۋعانستان افگانيى</displayName>
-				<displayName count="other" draft="unconfirmed">اۋعانستان افگانيى</displayName>
+				<displayName>اۋعانستان افگانيى</displayName>
 			</currency>
 			<currency type="ALL">
-				<displayName draft="unconfirmed">البانيا لەگى</displayName>
-				<displayName count="one" draft="unconfirmed">البانيا لەگى</displayName>
-				<displayName count="other" draft="unconfirmed">البانيا لەگى</displayName>
+				<displayName>البانيا لەگى</displayName>
 			</currency>
 			<currency type="AMD">
-				<displayName draft="unconfirmed">ارمەنيا درامى</displayName>
-				<displayName count="one" draft="unconfirmed">ارمەنيا درامى</displayName>
-				<displayName count="other" draft="unconfirmed">ارمەنيا درامى</displayName>
+				<displayName>ارمەنيا درامى</displayName>
 			</currency>
 			<currency type="ANG">
-				<displayName draft="unconfirmed">نيدەرلاند انتيل گۋلدەنى</displayName>
-				<displayName count="one" draft="unconfirmed">نيدەرلاند انتيل گۋلدەنى</displayName>
-				<displayName count="other" draft="unconfirmed">نيدەرلاند انتيل گۋلدەنى</displayName>
+				<displayName>نيدەرلاند انتيل گۋلدەنى</displayName>
 			</currency>
 			<currency type="AOA">
-				<displayName draft="unconfirmed">انگولا كۆانزاسى</displayName>
-				<displayName count="one" draft="unconfirmed">انگولا كۆانزاسى</displayName>
-				<displayName count="other" draft="unconfirmed">انگولا كۆانزاسى</displayName>
+				<displayName>انگولا كۆانزاسى</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName draft="unconfirmed">ارگەنتينا پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">ارگەنتينا پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">ارگەنتينا پەسوسى</displayName>
+				<displayName>ارگەنتينا پەسوسى</displayName>
 			</currency>
 			<currency type="AUD">
-				<displayName draft="unconfirmed">اۋستراليا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">اۋستراليا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">اۋستراليا دوللارى</displayName>
+				<displayName>اۋستراليا دوللارى</displayName>
 			</currency>
 			<currency type="AWG">
-				<displayName draft="unconfirmed">ارۋبا فلورينى</displayName>
-				<displayName count="one" draft="unconfirmed">ارۋبا فلورينى</displayName>
-				<displayName count="other" draft="unconfirmed">ارۋبا فلورينى</displayName>
+				<displayName>ارۋبا فلورينى</displayName>
 			</currency>
 			<currency type="AZN">
-				<displayName draft="unconfirmed">ءازىربايجان ماناتى</displayName>
-				<displayName count="one" draft="unconfirmed">ءازىربايجان ماناتى</displayName>
-				<displayName count="other" draft="unconfirmed">ءازىربايجان ماناتى</displayName>
+				<displayName>ءازىربايجان ماناتى</displayName>
 			</currency>
 			<currency type="BAM">
-				<displayName draft="unconfirmed">بوسنيا جانە گەرتسەگوۆينا ايىرباستالمالى ماركاسى</displayName>
-				<displayName count="one" draft="unconfirmed">بوسنيا جانە گەرتسەگوۆينا ايىرباستالمالى ماركاسى</displayName>
-				<displayName count="other" draft="unconfirmed">بوسنيا جانە گەرتسەگوۆينا ايىرباستالمالى ماركاسى</displayName>
+				<displayName>بوسنيا جانە گەرتسەگوۆينا ايىرباستالمالى ماركاسى</displayName>
 			</currency>
 			<currency type="BBD">
-				<displayName draft="unconfirmed">باربادوس دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">باربادوس دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">باربادوس دوللارى</displayName>
+				<displayName>باربادوس دوللارى</displayName>
 			</currency>
 			<currency type="BDT">
-				<displayName draft="unconfirmed">بانگلادەش تاكاسى</displayName>
-				<displayName count="one" draft="unconfirmed">بانگلادەش تاكاسى</displayName>
-				<displayName count="other" draft="unconfirmed">بانگلادەش تاكاسى</displayName>
+				<displayName>بانگلادەش تاكاسى</displayName>
 			</currency>
 			<currency type="BGN">
-				<displayName draft="unconfirmed">ڭولگاريا لەۆى</displayName>
-				<displayName count="one" draft="unconfirmed">ڭولگاريا لەۆى</displayName>
-				<displayName count="other" draft="unconfirmed">ڭولگاريا لەۆى</displayName>
+				<displayName>ڭولگاريا لەۆى</displayName>
 			</currency>
 			<currency type="BHD">
-				<displayName draft="unconfirmed">باحرەين دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">باحرەين دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">باحرەين دينارى</displayName>
+				<displayName>باحرەين دينارى</displayName>
 			</currency>
 			<currency type="BIF">
-				<displayName draft="unconfirmed">بۋرۋندي فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">بۋرۋندي فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">بۋرۋندي فرانكى</displayName>
+				<displayName>بۋرۋندي فرانكى</displayName>
 			</currency>
 			<currency type="BMD">
-				<displayName draft="unconfirmed">بەرمۋد دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">بەرمۋد دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">بەرمۋد دوللارى</displayName>
+				<displayName>بەرمۋد دوللارى</displayName>
 			</currency>
 			<currency type="BND">
-				<displayName draft="unconfirmed">برۋنەي دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">برۋنەي دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">برۋنەي دوللارى</displayName>
+				<displayName>برۋنەي دوللارى</displayName>
 			</currency>
 			<currency type="BOB">
-				<displayName draft="unconfirmed">بوليۆيا بوليۆيانوسى</displayName>
-				<displayName count="one" draft="unconfirmed">بوليۆيا بوليۆيانوسى</displayName>
-				<displayName count="other" draft="unconfirmed">بوليۆيا بوليۆيانوسى</displayName>
+				<displayName>بوليۆيا بوليۆيانوسى</displayName>
 			</currency>
 			<currency type="BRL">
-				<displayName draft="unconfirmed">برازيليا رەالى</displayName>
-				<displayName count="one" draft="unconfirmed">برازيليا رەالى</displayName>
-				<displayName count="other" draft="unconfirmed">برازيليا رەالى</displayName>
+				<displayName>برازيليا رەالى</displayName>
 			</currency>
 			<currency type="BSD">
-				<displayName draft="unconfirmed">باگام دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">باگام دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">باگام دوللارى</displayName>
+				<displayName>باگام دوللارى</displayName>
 			</currency>
 			<currency type="BTN">
-				<displayName draft="unconfirmed">بۋتان نگۋلترۋمى</displayName>
-				<displayName count="one" draft="unconfirmed">بۋتان نگۋلترۋمى</displayName>
-				<displayName count="other" draft="unconfirmed">بۋتان نگۋلترۋمى</displayName>
+				<displayName>بۋتان نگۋلترۋمى</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName draft="unconfirmed">بوتسۆانا پۋلاسى</displayName>
-				<displayName count="one" draft="unconfirmed">بوتسۆانا پۋلاسى</displayName>
-				<displayName count="other" draft="unconfirmed">بوتسۆانا پۋلاسى</displayName>
+				<displayName>بوتسۆانا پۋلاسى</displayName>
 			</currency>
 			<currency type="BYN">
-				<displayName draft="unconfirmed">بەلارۋس رۋبىلى</displayName>
-				<displayName count="one" draft="unconfirmed">بەلارۋس رۋبىلى</displayName>
-				<displayName count="other" draft="unconfirmed">بەلارۋس رۋبىلى</displayName>
+				<displayName>بەلارۋس رۋبىلى</displayName>
 			</currency>
 			<currency type="BZD">
-				<displayName draft="unconfirmed">بەليز دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">بەليز دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">بەليز دوللارى</displayName>
+				<displayName>بەليز دوللارى</displayName>
 			</currency>
 			<currency type="CAD">
-				<displayName draft="unconfirmed">كانادا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">كانادا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">كانادا دوللارى</displayName>
+				<displayName>كانادا دوللارى</displayName>
 			</currency>
 			<currency type="CDF">
-				<displayName draft="unconfirmed">كونگو فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">كونگو فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">كونگو فرانكى</displayName>
+				<displayName>كونگو فرانكى</displayName>
 			</currency>
 			<currency type="CHF">
-				<displayName draft="unconfirmed">شۆەيساريا فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">شۆەيساريا فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">شۆەيساريا فرانكى</displayName>
+				<displayName>شۆەيساريا فرانكى</displayName>
 			</currency>
 			<currency type="CLP">
-				<displayName draft="unconfirmed">چيلي پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">چيلي پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">چيلي پەسوسى</displayName>
+				<displayName>چيلي پەسوسى</displayName>
 			</currency>
 			<currency type="CNH">
-				<displayName draft="unconfirmed">قىتاي يۋانى (وفشور)</displayName>
-				<displayName count="one" draft="unconfirmed">قىتاي يۋانى (وفشور)</displayName>
-				<displayName count="other" draft="unconfirmed">قىتاي يۋانى (وفشور)</displayName>
+				<displayName>قىتاي يۋانى (وفشور)</displayName>
 			</currency>
 			<currency type="CNY">
-				<displayName draft="unconfirmed">قىتاي يۋانى</displayName>
-				<displayName count="one" draft="unconfirmed">قىتاي يۋانى</displayName>
-				<displayName count="other" draft="unconfirmed">قىتاي يۋانى</displayName>
+				<displayName>قىتاي يۋانى</displayName>
 			</currency>
 			<currency type="COP">
-				<displayName draft="unconfirmed">كولۋمبيا پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">كولۋمبيا پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">كولۋمبيا پەسوسى</displayName>
+				<displayName>كولۋمبيا پەسوسى</displayName>
 			</currency>
 			<currency type="CRC">
-				<displayName draft="unconfirmed">كوستا-ريكا كولونى</displayName>
-				<displayName count="one" draft="unconfirmed">كوستا-ريكا كولونى</displayName>
-				<displayName count="other" draft="unconfirmed">كوستا-ريكا كولونى</displayName>
+				<displayName>كوستا-ريكا كولونى</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName draft="unconfirmed">كۋبا ايىرباستالمالى پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">كۋبا ايىرباستالمالى پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">كۋبا ايىرباستالمالى پەسوسى</displayName>
+				<displayName>كۋبا ايىرباستالمالى پەسوسى</displayName>
 			</currency>
 			<currency type="CUP">
-				<displayName draft="unconfirmed">كۋبا پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">كۋبا پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">كۋبا پەسوسى</displayName>
+				<displayName>كۋبا پەسوسى</displayName>
 			</currency>
 			<currency type="CVE">
-				<displayName draft="unconfirmed">كابو-ۆەردە ەسكۋدوسى</displayName>
-				<displayName count="one" draft="unconfirmed">كابو-ۆەردە ەسكۋدوسى</displayName>
-				<displayName count="other" draft="unconfirmed">كابو-ۆەردە ەسكۋدوسى</displayName>
+				<displayName>كابو-ۆەردە ەسكۋدوسى</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName draft="unconfirmed">چەح كرونى</displayName>
-				<displayName count="one" draft="unconfirmed">چەح كرونى</displayName>
-				<displayName count="other" draft="unconfirmed">چەح كرونى</displayName>
+				<displayName>چەح كرونى</displayName>
 			</currency>
 			<currency type="DJF">
-				<displayName draft="unconfirmed">جيبۋتي فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">جيبۋتي فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">جيبۋتي فرانكى</displayName>
+				<displayName>جيبۋتي فرانكى</displayName>
 			</currency>
 			<currency type="DKK">
-				<displayName draft="unconfirmed">دار كرونى</displayName>
-				<displayName count="one" draft="unconfirmed">دار كرونى</displayName>
-				<displayName count="other" draft="unconfirmed">دار كرونى</displayName>
+				<displayName>دار كرونى</displayName>
 			</currency>
 			<currency type="DOP">
-				<displayName draft="unconfirmed">دومينيكان پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">دومينيكان پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">دومينيكان پەسوسى</displayName>
+				<displayName>دومينيكان پەسوسى</displayName>
 			</currency>
 			<currency type="DZD">
-				<displayName draft="unconfirmed">الجير دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">الجير دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">الجير دينارى</displayName>
+				<displayName>الجير دينارى</displayName>
 			</currency>
 			<currency type="EGP">
-				<displayName draft="unconfirmed">مىسىر فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">مىسىر فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">مىسىر فۋنتى</displayName>
+				<displayName>مىسىر فۋنتى</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName draft="unconfirmed">ەريترەيا ناكفاس</displayName>
-				<displayName count="one" draft="unconfirmed">ەريترەيا ناكفاس</displayName>
-				<displayName count="other" draft="unconfirmed">ەريترەيا ناكفاس</displayName>
+				<displayName>ەريترەيا ناكفاس</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName draft="unconfirmed">ەفيوپيا بىرى</displayName>
-				<displayName count="one" draft="unconfirmed">ەفيوپيا بىرى</displayName>
-				<displayName count="other" draft="unconfirmed">ەفيوپيا بىرى</displayName>
+				<displayName>ەفيوپيا بىرى</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName draft="unconfirmed">ەۋرو</displayName>
-				<displayName count="one" draft="unconfirmed">ەۋرو</displayName>
-				<displayName count="other" draft="unconfirmed">ەۋرو</displayName>
+				<displayName>ەۋرو</displayName>
 			</currency>
 			<currency type="FJD">
-				<displayName draft="unconfirmed">فيجي دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">فيجي دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">فيجي دوللارى</displayName>
+				<displayName>فيجي دوللارى</displayName>
 			</currency>
 			<currency type="FKP">
-				<displayName draft="unconfirmed">فولكلەند ارالدارىنىڭ فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">فولكلەند ارالدارىنىڭ فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">فولكلەند ارالدارىنىڭ فۋنتى</displayName>
+				<displayName>فولكلەند ارالدارىنىڭ فۋنتى</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName draft="unconfirmed">بريتاندىق فۋنت</displayName>
-				<displayName count="one" draft="unconfirmed">بريتاندىق فۋنت</displayName>
-				<displayName count="other" draft="unconfirmed">بريتاندىق فۋنت</displayName>
+				<displayName>بريتاندىق فۋنت</displayName>
 			</currency>
 			<currency type="GEL">
-				<displayName draft="unconfirmed">گرۋزيا لاريى</displayName>
-				<displayName count="one" draft="unconfirmed">گرۋزيا لاريى</displayName>
-				<displayName count="other" draft="unconfirmed">گرۋزيا لاريى</displayName>
+				<displayName>گرۋزيا لاريى</displayName>
 			</currency>
 			<currency type="GHS">
-				<displayName draft="unconfirmed">گانا سەديى</displayName>
-				<displayName count="one" draft="unconfirmed">گانا سەديى</displayName>
-				<displayName count="other" draft="unconfirmed">گانا سەديى</displayName>
+				<displayName>گانا سەديى</displayName>
 			</currency>
 			<currency type="GIP">
-				<displayName draft="unconfirmed">گيبراتال فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">گيبراتال فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">گيبراتال فۋنتى</displayName>
+				<displayName>گيبراتال فۋنتى</displayName>
 			</currency>
 			<currency type="GMD">
-				<displayName draft="unconfirmed">گامبيا دالاسيى</displayName>
-				<displayName count="one" draft="unconfirmed">گامبيا دالاسيى</displayName>
-				<displayName count="other" draft="unconfirmed">گامبيا دالاسيى</displayName>
+				<displayName>گامبيا دالاسيى</displayName>
 			</currency>
 			<currency type="GNF">
-				<displayName draft="unconfirmed">گۆينەيا فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">گۆينەيا فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">گۆينەيا فرانكى</displayName>
+				<displayName>گۆينەيا فرانكى</displayName>
 			</currency>
 			<currency type="GTQ">
-				<displayName draft="unconfirmed">گۆاتەمالا كەتسالى</displayName>
-				<displayName count="one" draft="unconfirmed">گۆاتەمالا كەتسالى</displayName>
-				<displayName count="other" draft="unconfirmed">گۆاتەمالا كەتسالى</displayName>
+				<displayName>گۆاتەمالا كەتسالى</displayName>
 			</currency>
 			<currency type="GYD">
-				<displayName draft="unconfirmed">گايانا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">گايانا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">گايانا دوللارى</displayName>
+				<displayName>گايانا دوللارى</displayName>
 			</currency>
 			<currency type="HKD">
-				<displayName draft="unconfirmed">حوڭكوڭ دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">حوڭكوڭ دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">حوڭكوڭ دوللارى</displayName>
+				<displayName>حوڭكوڭ دوللارى</displayName>
 			</currency>
 			<currency type="HNL">
-				<displayName draft="unconfirmed">گوندۋراس ليمپيراسى</displayName>
-				<displayName count="one" draft="unconfirmed">گوندۋراس ليمپيراسى</displayName>
-				<displayName count="other" draft="unconfirmed">گوندۋراس ليمپيراسى</displayName>
+				<displayName>گوندۋراس ليمپيراسى</displayName>
 			</currency>
 			<currency type="HRK">
-				<displayName draft="unconfirmed">حورۆاتيا كۋناسى</displayName>
-				<displayName count="one" draft="unconfirmed">حورۆاتيا كۋناسى</displayName>
-				<displayName count="other" draft="unconfirmed">حورۆاتيا كۋناسى</displayName>
+				<displayName>حورۆاتيا كۋناسى</displayName>
 			</currency>
 			<currency type="HTG">
-				<displayName draft="unconfirmed">گايتي گۋردى</displayName>
-				<displayName count="one" draft="unconfirmed">گايتي گۋردى</displayName>
-				<displayName count="other" draft="unconfirmed">گايتي گۋردى</displayName>
+				<displayName>گايتي گۋردى</displayName>
 			</currency>
 			<currency type="HUF">
-				<displayName draft="unconfirmed">ماجار فورينتى</displayName>
-				<displayName count="one" draft="unconfirmed">ماجار فورينتى</displayName>
-				<displayName count="other" draft="unconfirmed">ماجار فورينتى</displayName>
+				<displayName>ماجار فورينتى</displayName>
 			</currency>
 			<currency type="IDR">
-				<displayName draft="unconfirmed">يندونەزيا رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">يندونەزيا رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">يندونەزيا رۋپياسى</displayName>
+				<displayName>يندونەزيا رۋپياسى</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName draft="unconfirmed">يزرايل جاڭا شەكەلى</displayName>
-				<displayName count="one" draft="unconfirmed">يزرايل جاڭا شەكەلى</displayName>
-				<displayName count="other" draft="unconfirmed">يزرايل جاڭا شەكەلى</displayName>
+				<displayName>يزرايل جاڭا شەكەلى</displayName>
 			</currency>
 			<currency type="INR">
-				<displayName draft="unconfirmed">ءۇندىستان رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">ءۇندىستان رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">ءۇندىستان رۋپياسى</displayName>
+				<displayName>ءۇندىستان رۋپياسى</displayName>
 			</currency>
 			<currency type="IQD">
-				<displayName draft="unconfirmed">يراك دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">يراك دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">يراك دينارى</displayName>
+				<displayName>يراك دينارى</displayName>
 			</currency>
 			<currency type="IRR">
-				<displayName draft="unconfirmed">يران ريالى</displayName>
-				<displayName count="one" draft="unconfirmed">يران ريالى</displayName>
-				<displayName count="other" draft="unconfirmed">يران ريالى</displayName>
+				<displayName>يران ريالى</displayName>
 			</currency>
 			<currency type="ISK">
-				<displayName draft="unconfirmed">يسلانديا كروناسى</displayName>
-				<displayName count="one" draft="unconfirmed">يسلانديا كروناسى</displayName>
-				<displayName count="other" draft="unconfirmed">يسلانديا كروناسى</displayName>
+				<displayName>يسلانديا كروناسى</displayName>
 			</currency>
 			<currency type="JMD">
-				<displayName draft="unconfirmed">يامايكا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">يامايكا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">يامايكا دوللارى</displayName>
+				<displayName>يامايكا دوللارى</displayName>
 			</currency>
 			<currency type="JOD">
-				<displayName draft="unconfirmed">يوردانيا دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">يوردانيا دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">يوردانيا دينارى</displayName>
+				<displayName>يوردانيا دينارى</displayName>
 			</currency>
 			<currency type="JPY">
-				<displayName draft="unconfirmed">جاپون يەناسى</displayName>
-				<displayName count="one" draft="unconfirmed">جاپون يەناسى</displayName>
-				<displayName count="other" draft="unconfirmed">جاپون يەناسى</displayName>
+				<displayName>جاپون يەناسى</displayName>
 			</currency>
 			<currency type="KES">
-				<displayName draft="unconfirmed">Vote كەنيا شيللينگى</displayName>
-				<displayName count="one" draft="unconfirmed">Vote كەنيا شيللينگى</displayName>
-				<displayName count="other" draft="unconfirmed">Vote كەنيا شيللينگى</displayName>
+				<displayName>كەنيا شيللينگى</displayName>
+				<displayName count="one">كەنيا شيللينگى</displayName>
+				<displayName count="other">كەنيا شيللينگى</displayName>
 			</currency>
 			<currency type="KGS">
-				<displayName draft="unconfirmed">قىرعىس سومى</displayName>
-				<displayName count="one" draft="unconfirmed">قىرعىس سومى</displayName>
-				<displayName count="other" draft="unconfirmed">قىرعىس سومى</displayName>
+				<displayName>قىرعىس سومى</displayName>
 			</currency>
 			<currency type="KHR">
-				<displayName draft="unconfirmed">كامبودجا ريەلى</displayName>
-				<displayName count="one" draft="unconfirmed">كامبودجا ريەلى</displayName>
-				<displayName count="other" draft="unconfirmed">كامبودجا ريەلى</displayName>
+				<displayName>كامبودجا ريەلى</displayName>
 			</currency>
 			<currency type="KMF">
-				<displayName draft="unconfirmed">كومور ارالدارى فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">كومور ارالدارى فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">كومور ارالدارى فرانكى</displayName>
+				<displayName>كومور ارالدارى فرانكى</displayName>
 			</currency>
 			<currency type="KPW">
-				<displayName draft="unconfirmed">سولتۇستىك كورەيا ۆونى</displayName>
-				<displayName count="one" draft="unconfirmed">سولتۇستىك كورەيا ۆونى</displayName>
-				<displayName count="other" draft="unconfirmed">سولتۇستىك كورەيا ۆونى</displayName>
+				<displayName>سولتۇستىك كورەيا ۆونى</displayName>
 			</currency>
 			<currency type="KRW">
-				<displayName draft="unconfirmed">وڭتۇستىك كورەيا ۆونى</displayName>
-				<displayName count="one" draft="unconfirmed">وڭتۇستىك كورەيا ۆونى</displayName>
-				<displayName count="other" draft="unconfirmed">وڭتۇستىك كورەيا ۆونى</displayName>
+				<displayName>وڭتۇستىك كورەيا ۆونى</displayName>
 			</currency>
 			<currency type="KWD">
-				<displayName draft="unconfirmed">كۋۆەيت دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">كۋۆەيت دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">كۋۆەيت دينارى</displayName>
+				<displayName>كۋۆەيت دينارى</displayName>
 			</currency>
 			<currency type="KYD">
-				<displayName draft="unconfirmed">كايمان ارالدارى دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">كايمان ارالدارى دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">كايمان ارالدارى دوللارى</displayName>
+				<displayName>كايمان ارالدارى دوللارى</displayName>
 			</currency>
 			<currency type="KZT">
-				<displayName draft="unconfirmed">قازاق تەڭگەسى</displayName>
-				<displayName count="one" draft="unconfirmed">قازاق تەڭگەسى</displayName>
-				<displayName count="other" draft="unconfirmed">قازاق تەڭگەسى</displayName>
-				<symbol draft="unconfirmed">₸</symbol>
+				<displayName>قازاق تەڭگەسى</displayName>
+				<symbol draft="contributed">₸</symbol>
 			</currency>
 			<currency type="LAK">
-				<displayName draft="unconfirmed">لاوس كيپى</displayName>
-				<displayName count="one" draft="unconfirmed">لاوس كيپى</displayName>
-				<displayName count="other" draft="unconfirmed">لاوس كيپى</displayName>
+				<displayName>لاوس كيپى</displayName>
 			</currency>
 			<currency type="LBP">
-				<displayName draft="unconfirmed">ليۆان فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">ليۆان فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">ليۆان فۋنتى</displayName>
+				<displayName>ليۆان فۋنتى</displayName>
 			</currency>
 			<currency type="LKR">
-				<displayName draft="unconfirmed">شري-لانكا رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">شري-لانكا رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">شري-لانكا رۋپياسى</displayName>
+				<displayName>شري-لانكا رۋپياسى</displayName>
 			</currency>
 			<currency type="LRD">
-				<displayName draft="unconfirmed">ليبەريا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">ليبەريا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">ليبەريا دوللارى</displayName>
+				<displayName>ليبەريا دوللارى</displayName>
 			</currency>
 			<currency type="LSL">
-				<displayName draft="unconfirmed">لەسوتو ءلوتيى</displayName>
-				<displayName count="one" draft="unconfirmed">لەسوتو ءلوتيى</displayName>
-				<displayName count="other" draft="unconfirmed">لەسوتو ءلوتيى</displayName>
+				<displayName>لەسوتو ءلوتيى</displayName>
 			</currency>
 			<currency type="LYD">
-				<displayName draft="unconfirmed">ليۆيا دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">ليۆيا دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">ليۆيا دينارى</displayName>
+				<displayName>ليۆيا دينارى</displayName>
 			</currency>
 			<currency type="MAD">
-				<displayName draft="unconfirmed">ماروككو دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">ماروككو دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">ماروككو دينارى</displayName>
+				<displayName>ماروككو دينارى</displayName>
 			</currency>
 			<currency type="MDL">
-				<displayName draft="unconfirmed">مولدوۆا لەيى</displayName>
-				<displayName count="one" draft="unconfirmed">مولدوۆا لەيى</displayName>
-				<displayName count="other" draft="unconfirmed">مولدوۆا لەيى</displayName>
+				<displayName>مولدوۆا لەيى</displayName>
 			</currency>
 			<currency type="MGA">
-				<displayName draft="unconfirmed">مالاگاسي ءارياريى</displayName>
-				<displayName count="one" draft="unconfirmed">مالاگاسي ءارياريى</displayName>
-				<displayName count="other" draft="unconfirmed">مالاگاسي ءارياريى</displayName>
+				<displayName>مالاگاسي ءارياريى</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName draft="unconfirmed">ماكەدونيا دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">ماكەدونيا دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">ماكەدونيا دينارى</displayName>
+				<displayName>ماكەدونيا دينارى</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName draft="unconfirmed">ميانما كياتى</displayName>
-				<displayName count="one" draft="unconfirmed">ميانما كياتى</displayName>
-				<displayName count="other" draft="unconfirmed">ميانما كياتى</displayName>
+				<displayName>ميانما كياتى</displayName>
 			</currency>
 			<currency type="MNT">
-				<displayName draft="unconfirmed">موڭعوليا تۋگريكى</displayName>
-				<displayName count="one" draft="unconfirmed">موڭعوليا تۋگريكى</displayName>
-				<displayName count="other" draft="unconfirmed">موڭعوليا تۋگريكى</displayName>
+				<displayName>موڭعوليا تۋگريكى</displayName>
 			</currency>
 			<currency type="MOP">
-				<displayName draft="unconfirmed">ماكاو پاتاكاسى</displayName>
-				<displayName count="one" draft="unconfirmed">ماكاو پاتاكاسى</displayName>
-				<displayName count="other" draft="unconfirmed">ماكاو پاتاكاسى</displayName>
+				<displayName>ماكاو پاتاكاسى</displayName>
 			</currency>
 			<currency type="MRU">
-				<displayName draft="unconfirmed">ماۆريتانيا ۋگياسى</displayName>
-				<displayName count="one" draft="unconfirmed">ماۆريتانيا ۋگياسى</displayName>
-				<displayName count="other" draft="unconfirmed">ماۆريتانيا ۋگياسى</displayName>
+				<displayName>ماۆريتانيا ۋگياسى</displayName>
 			</currency>
 			<currency type="MUR">
-				<displayName draft="unconfirmed">ماۆريكيي رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">ماۆريكيي رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">ماۆريكيي رۋپياسى</displayName>
+				<displayName>ماۆريكيي رۋپياسى</displayName>
 			</currency>
 			<currency type="MVR">
-				<displayName draft="unconfirmed">مالديۆ رۋفياسى</displayName>
-				<displayName count="one" draft="unconfirmed">مالديۆ رۋفياسى</displayName>
-				<displayName count="other" draft="unconfirmed">مالديۆ رۋفياسى</displayName>
+				<displayName>مالديۆ رۋفياسى</displayName>
 			</currency>
 			<currency type="MWK">
-				<displayName draft="unconfirmed">مالاۆي كۆاچاسى</displayName>
-				<displayName count="one" draft="unconfirmed">مالاۆي كۆاچاسى</displayName>
-				<displayName count="other" draft="unconfirmed">مالاۆي كۆاچاسى</displayName>
+				<displayName>مالاۆي كۆاچاسى</displayName>
 			</currency>
 			<currency type="MXN">
-				<displayName draft="unconfirmed">مەكسيكا پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">مەكسيكا پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">مەكسيكا پەسوسى</displayName>
+				<displayName>مەكسيكا پەسوسى</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName draft="unconfirmed">مالايزيا رينگگيتى</displayName>
-				<displayName count="one" draft="unconfirmed">مالايزيا رينگگيتى</displayName>
-				<displayName count="other" draft="unconfirmed">مالايزيا رينگگيتى</displayName>
+				<displayName>مالايزيا رينگگيتى</displayName>
 			</currency>
 			<currency type="MZN">
-				<displayName draft="unconfirmed">موزامبيك مەتيكالى</displayName>
-				<displayName count="one" draft="unconfirmed">موزامبيك مەتيكالى</displayName>
-				<displayName count="other" draft="unconfirmed">موزامبيك مەتيكالى</displayName>
+				<displayName>موزامبيك مەتيكالى</displayName>
 			</currency>
 			<currency type="NAD">
-				<displayName draft="unconfirmed">ناميبيا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">ناميبيا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">ناميبيا دوللارى</displayName>
+				<displayName>ناميبيا دوللارى</displayName>
 			</currency>
 			<currency type="NGN">
-				<displayName draft="unconfirmed">نيگەريا نايراسى</displayName>
-				<displayName count="one" draft="unconfirmed">نيگەريا نايراسى</displayName>
-				<displayName count="other" draft="unconfirmed">نيگەريا نايراسى</displayName>
+				<displayName>نيگەريا نايراسى</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName draft="unconfirmed">نيكاراگۋا كوردوباسى</displayName>
-				<displayName count="one" draft="unconfirmed">نيكاراگۋا كوردوباسى</displayName>
-				<displayName count="other" draft="unconfirmed">نيكاراگۋا كوردوباسى</displayName>
+				<displayName>نيكاراگۋا كوردوباسى</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName draft="unconfirmed">نورۆەگيا كرونى</displayName>
-				<displayName count="one" draft="unconfirmed">نورۆەگيا كرونى</displayName>
-				<displayName count="other" draft="unconfirmed">نورۆەگيا كرونى</displayName>
+				<displayName>نورۆەگيا كرونى</displayName>
 			</currency>
 			<currency type="NPR">
-				<displayName draft="unconfirmed">نەپال رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">نەپال رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">نەپال رۋپياسى</displayName>
+				<displayName>نەپال رۋپياسى</displayName>
 			</currency>
 			<currency type="NZD">
-				<displayName draft="unconfirmed">جاڭا زەلانديا دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">جاڭا زەلانديا دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">جاڭا زەلانديا دوللارى</displayName>
+				<displayName>جاڭا زەلانديا دوللارى</displayName>
 			</currency>
 			<currency type="OMR">
-				<displayName draft="unconfirmed">ومان ريالى</displayName>
-				<displayName count="one" draft="unconfirmed">ومان ريالى</displayName>
-				<displayName count="other" draft="unconfirmed">ومان ريالى</displayName>
+				<displayName>ومان ريالى</displayName>
 			</currency>
 			<currency type="PAB">
-				<displayName draft="unconfirmed">پاناما بالبواسى</displayName>
-				<displayName count="one" draft="unconfirmed">پاناما بالبواسى</displayName>
-				<displayName count="other" draft="unconfirmed">پاناما بالبواسى</displayName>
+				<displayName>پاناما بالبواسى</displayName>
 			</currency>
 			<currency type="PEN">
-				<displayName draft="unconfirmed">پەرۋ سولى</displayName>
-				<displayName count="one" draft="unconfirmed">پەرۋ سولى</displayName>
-				<displayName count="other" draft="unconfirmed">پەرۋ سولى</displayName>
+				<displayName>پەرۋ سولى</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName draft="unconfirmed">پاپۋا - جاڭا گۆينەيا كيناسى</displayName>
-				<displayName count="one" draft="unconfirmed">پاپۋا - جاڭا گۆينەيا كيناسى</displayName>
-				<displayName count="other" draft="unconfirmed">پاپۋا - جاڭا گۆينەيا كيناسى</displayName>
+				<displayName>پاپۋا - جاڭا گۆينەيا كيناسى</displayName>
 			</currency>
 			<currency type="PHP">
-				<displayName draft="unconfirmed">فيليپپين پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">فيليپپين پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">فيليپپين پەسوسى</displayName>
+				<displayName>فيليپپين پەسوسى</displayName>
 			</currency>
 			<currency type="PKR">
-				<displayName draft="unconfirmed">پاكىستان رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">پاكىستان رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">پاكىستان رۋپياسى</displayName>
+				<displayName>پاكىستان رۋپياسى</displayName>
 			</currency>
 			<currency type="PLN">
-				<displayName draft="unconfirmed">پولشا زلوتىسى</displayName>
-				<displayName count="one" draft="unconfirmed">پولشا زلوتىسى</displayName>
-				<displayName count="other" draft="unconfirmed">پولشا زلوتىسى</displayName>
+				<displayName>پولشا زلوتىسى</displayName>
 			</currency>
 			<currency type="PYG">
-				<displayName draft="unconfirmed">پاراگۆاي گۋارانيى</displayName>
-				<displayName count="one" draft="unconfirmed">پاراگۆاي گۋارانيى</displayName>
-				<displayName count="other" draft="unconfirmed">پاراگۆاي گۋارانيى</displayName>
+				<displayName>پاراگۆاي گۋارانيى</displayName>
 			</currency>
 			<currency type="QAR">
-				<displayName draft="unconfirmed">كاتار ريالى</displayName>
-				<displayName count="one" draft="unconfirmed">كاتار ريالى</displayName>
-				<displayName count="other" draft="unconfirmed">كاتار ريالى</displayName>
+				<displayName>كاتار ريالى</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName draft="unconfirmed">رۋمىنيا لەيى</displayName>
-				<displayName count="one" draft="unconfirmed">رۋمىنيا لەيى</displayName>
-				<displayName count="other" draft="unconfirmed">رۋمىنيا لەيى</displayName>
+				<displayName>رۋمىنيا لەيى</displayName>
 			</currency>
 			<currency type="RSD">
-				<displayName draft="unconfirmed">سەربيا دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">سەربيا دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">سەربيا دينارى</displayName>
+				<displayName>سەربيا دينارى</displayName>
 			</currency>
 			<currency type="RUB">
-				<displayName draft="unconfirmed">رەسەي رۋبىلى</displayName>
-				<displayName count="one" draft="unconfirmed">رەسەي رۋبىلى</displayName>
-				<displayName count="other" draft="unconfirmed">رەسەي رۋبىلى</displayName>
+				<displayName>رەسەي رۋبىلى</displayName>
 			</currency>
 			<currency type="RWF">
-				<displayName draft="unconfirmed">رۋاندا فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">رۋاندا فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">رۋاندا فرانكى</displayName>
+				<displayName>رۋاندا فرانكى</displayName>
 			</currency>
 			<currency type="SAR">
-				<displayName draft="unconfirmed">ساۋد ارابياسىنىڭ ريالى</displayName>
-				<displayName count="one" draft="unconfirmed">ساۋد ارابياسىنىڭ ريالى</displayName>
-				<displayName count="other" draft="unconfirmed">ساۋد ارابياسىنىڭ ريالى</displayName>
+				<displayName>ساۋد ارابياسىنىڭ ريالى</displayName>
 			</currency>
 			<currency type="SBD">
-				<displayName draft="unconfirmed">سولومون ارالدارى دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">سولومون ارالدارى دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">سولومون ارالدارى دوللارى</displayName>
+				<displayName>سولومون ارالدارى دوللارى</displayName>
 			</currency>
 			<currency type="SCR">
-				<displayName draft="unconfirmed">سەيشەل رۋپياسى</displayName>
-				<displayName count="one" draft="unconfirmed">سەيشەل رۋپياسى</displayName>
-				<displayName count="other" draft="unconfirmed">سەيشەل رۋپياسى</displayName>
+				<displayName>سەيشەل رۋپياسى</displayName>
 			</currency>
 			<currency type="SDG">
-				<displayName draft="unconfirmed">سۋدان فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">سۋدان فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">سۋدان فۋنتى</displayName>
+				<displayName>سۋدان فۋنتى</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName draft="unconfirmed">شۆەسيا كرونى</displayName>
-				<displayName count="one" draft="unconfirmed">شۆەسيا كرونى</displayName>
-				<displayName count="other" draft="unconfirmed">شۆەسيا كرونى</displayName>
+				<displayName>شۆەسيا كرونى</displayName>
 			</currency>
 			<currency type="SGD">
-				<displayName draft="unconfirmed">سينگاپۋر دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">سينگاپۋر دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">سينگاپۋر دوللارى</displayName>
+				<displayName>سينگاپۋر دوللارى</displayName>
 			</currency>
 			<currency type="SHP">
-				<displayName draft="unconfirmed">اۋليە ەلەنا ارالى فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">اۋليە ەلەنا ارالى فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">اۋليە ەلەنا ارالى فۋنتى</displayName>
+				<displayName>اۋليە ەلەنا ارالى فۋنتى</displayName>
 			</currency>
 			<currency type="SLE">
-				<displayName draft="unconfirmed">سەررا-لەونە لەونەسى</displayName>
-				<displayName count="one" draft="unconfirmed">سەررا-لەونە لەونەسى</displayName>
-				<displayName count="other" draft="unconfirmed">سەررا-لەونە لەونەسى</displayName>
+				<displayName>سەررا-لەونە لەونەسى</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName draft="unconfirmed">سەررا-لەونە لەونەسى (1964—2022)</displayName>
-				<displayName count="one" draft="unconfirmed">سەررا-لەونە لەونەسى (1964—2022)</displayName>
-				<displayName count="other" draft="unconfirmed">سەررا-لەونە لەونەسى (1964—2022)</displayName>
+				<displayName>سەررا-لەونە لەونەسى (1964—2022)</displayName>
 			</currency>
 			<currency type="SOS">
-				<displayName draft="unconfirmed">سومالي شيللينگى</displayName>
-				<displayName count="one" draft="unconfirmed">سومالي شيللينگى</displayName>
-				<displayName count="other" draft="unconfirmed">سومالي شيللينگى</displayName>
+				<displayName>سومالي شيللينگى</displayName>
 			</currency>
 			<currency type="SRD">
-				<displayName draft="unconfirmed">سۋرينام دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">سۋرينام دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">سۋرينام دوللارى</displayName>
+				<displayName>سۋرينام دوللارى</displayName>
 			</currency>
 			<currency type="SSP">
-				<displayName draft="unconfirmed">وڭتۇستىك سۋدان فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">وڭتۇستىك سۋدان فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">وڭتۇستىك سۋدان فۋنتى</displayName>
+				<displayName>وڭتۇستىك سۋدان فۋنتى</displayName>
 			</currency>
 			<currency type="STN">
-				<displayName draft="unconfirmed">سانت-تومە مەن پرينسيپي دوبراسى</displayName>
-				<displayName count="one" draft="unconfirmed">سانت-تومە مەن پرينسيپي دوبراسى</displayName>
-				<displayName count="other" draft="unconfirmed">سانت-تومە مەن پرينسيپي دوبراسى</displayName>
+				<displayName>سانت-تومە مەن پرينسيپي دوبراسى</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName draft="unconfirmed">سيريا فۋنتى</displayName>
-				<displayName count="one" draft="unconfirmed">سيريا فۋنتى</displayName>
-				<displayName count="other" draft="unconfirmed">سيريا فۋنتى</displayName>
+				<displayName>سيريا فۋنتى</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName draft="unconfirmed">سۆازيلەند ليلانگەنيى</displayName>
-				<displayName count="one" draft="unconfirmed">سۆازيلەند ليلانگەنيى</displayName>
-				<displayName count="other" draft="unconfirmed">سۆازيلەند ليلانگەنيى</displayName>
+				<displayName>سۆازيلەند ليلانگەنيى</displayName>
 			</currency>
 			<currency type="THB">
-				<displayName draft="unconfirmed">تاي باتى</displayName>
-				<displayName count="one" draft="unconfirmed">تاي باتى</displayName>
-				<displayName count="other" draft="unconfirmed">تاي باتى</displayName>
+				<displayName>تاي باتى</displayName>
 			</currency>
 			<currency type="TJS">
-				<displayName draft="unconfirmed">تاجىك سومونيى</displayName>
-				<displayName count="one" draft="unconfirmed">تاجىك سومونيى</displayName>
-				<displayName count="other" draft="unconfirmed">تاجىك سومونيى</displayName>
+				<displayName>تاجىك سومونيى</displayName>
 			</currency>
 			<currency type="TMT">
-				<displayName draft="unconfirmed">تۇىكمەن ماناتى</displayName>
-				<displayName count="one" draft="unconfirmed">تۇىكمەن ماناتى</displayName>
-				<displayName count="other" draft="unconfirmed">تۇىكمەن ماناتى</displayName>
+				<displayName>تۇىكمەن ماناتى</displayName>
 			</currency>
 			<currency type="TND">
-				<displayName draft="unconfirmed">تۋنيس دينارى</displayName>
-				<displayName count="one" draft="unconfirmed">تۋنيس دينارى</displayName>
-				<displayName count="other" draft="unconfirmed">تۋنيس دينارى</displayName>
+				<displayName>تۋنيس دينارى</displayName>
 			</currency>
 			<currency type="TOP">
-				<displayName draft="unconfirmed">تونگا پاانگاسى</displayName>
-				<displayName count="one" draft="unconfirmed">تونگا پاانگاسى</displayName>
-				<displayName count="other" draft="unconfirmed">تونگا پاانگاسى</displayName>
+				<displayName>تونگا پاانگاسى</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName draft="unconfirmed">تۇرىك ليراسى</displayName>
-				<displayName count="one" draft="unconfirmed">تۇرىك ليراسى</displayName>
-				<displayName count="other" draft="unconfirmed">تۇرىك ليراسى</displayName>
+				<displayName>تۇرىك ليراسى</displayName>
 			</currency>
 			<currency type="TTD">
-				<displayName draft="unconfirmed">ترينيداد جانە توباگو دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">ترينيداد جانە توباگو دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">ترينيداد جانە توباگو دوللارى</displayName>
+				<displayName>ترينيداد جانە توباگو دوللارى</displayName>
 			</currency>
 			<currency type="TWD">
-				<displayName draft="unconfirmed">جاڭا تايبەي دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">جاڭا تايبەي دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">جاڭا تايبەي دوللارى</displayName>
+				<displayName>جاڭا تايبەي دوللارى</displayName>
 			</currency>
 			<currency type="TZS">
-				<displayName draft="unconfirmed">تانزانيا شيللينگى</displayName>
-				<displayName count="one" draft="unconfirmed">تانزانيا شيللينگى</displayName>
-				<displayName count="other" draft="unconfirmed">تانزانيا شيللينگى</displayName>
+				<displayName>تانزانيا شيللينگى</displayName>
 			</currency>
 			<currency type="UAH">
-				<displayName draft="unconfirmed">ۋكراينا گريۆناسى</displayName>
-				<displayName count="one" draft="unconfirmed">ۋكراينا گريۆناسى</displayName>
-				<displayName count="other" draft="unconfirmed">ۋكراينا گريۆناسى</displayName>
+				<displayName>ۋكراينا گريۆناسى</displayName>
 			</currency>
 			<currency type="UGX">
-				<displayName draft="unconfirmed">ۋگاندا شيللينگى</displayName>
-				<displayName count="one" draft="unconfirmed">ۋگاندا شيللينگى</displayName>
-				<displayName count="other" draft="unconfirmed">ۋگاندا شيللينگى</displayName>
+				<displayName>ۋگاندا شيللينگى</displayName>
 			</currency>
 			<currency type="USD">
-				<displayName draft="unconfirmed">ا ق ش دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">ا ق ش دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">ا ق ش دوللارى</displayName>
+				<displayName>ا ق ش دوللارى</displayName>
 			</currency>
 			<currency type="UYU">
-				<displayName draft="unconfirmed">ۋرۋگۆاي پەسوسى</displayName>
-				<displayName count="one" draft="unconfirmed">ۋرۋگۆاي پەسوسى</displayName>
-				<displayName count="other" draft="unconfirmed">ۋرۋگۆاي پەسوسى</displayName>
+				<displayName>ۋرۋگۆاي پەسوسى</displayName>
 			</currency>
 			<currency type="UZS">
-				<displayName draft="unconfirmed">وزبەك سومى</displayName>
-				<displayName count="one" draft="unconfirmed">وزبەك سومى</displayName>
-				<displayName count="other" draft="unconfirmed">وزبەك سومى</displayName>
+				<displayName>وزبەك سومى</displayName>
 			</currency>
 			<currency type="VES">
-				<displayName draft="unconfirmed">ۆەنەسۋەلا بوليۆارى</displayName>
-				<displayName count="one" draft="unconfirmed">ۆەنەسۋەلا بوليۆارى</displayName>
-				<displayName count="other" draft="unconfirmed">ۆەنەسۋەلا بوليۆارى</displayName>
+				<displayName>ۆەنەسۋەلا بوليۆارى</displayName>
 			</currency>
 			<currency type="VND">
-				<displayName draft="unconfirmed">ۆەتنام دونگى</displayName>
-				<displayName count="one" draft="unconfirmed">ۆەتنام دونگى</displayName>
-				<displayName count="other" draft="unconfirmed">ۆەتنام دونگى</displayName>
+				<displayName>ۆەتنام دونگى</displayName>
 			</currency>
 			<currency type="VUV">
-				<displayName draft="unconfirmed">ۆانۋاتۋ ۆاتۋى</displayName>
-				<displayName count="one" draft="unconfirmed">ۆانۋاتۋ ۆاتۋى</displayName>
-				<displayName count="other" draft="unconfirmed">ۆانۋاتۋ ۆاتۋى</displayName>
+				<displayName>ۆانۋاتۋ ۆاتۋى</displayName>
 			</currency>
 			<currency type="WST">
-				<displayName draft="unconfirmed">ساموا تالاسى</displayName>
-				<displayName count="one" draft="unconfirmed">ساموا تالاسى</displayName>
-				<displayName count="other" draft="unconfirmed">ساموا تالاسى</displayName>
+				<displayName>ساموا تالاسى</displayName>
 			</currency>
 			<currency type="XAF">
-				<displayName draft="unconfirmed">ورتالىق افريكانىڭ فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">ورتالىق افريكانىڭ فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">ورتالىق افريكانىڭ فرانكى</displayName>
+				<displayName>ورتالىق افريكانىڭ فرانكى</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName draft="unconfirmed">شىعىس كاريب دوللارى</displayName>
-				<displayName count="one" draft="unconfirmed">شىعىس كاريب دوللارى</displayName>
-				<displayName count="other" draft="unconfirmed">شىعىس كاريب دوللارى</displayName>
+				<displayName>شىعىس كاريب دوللارى</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>كاريب گۋلدەرى</displayName>
+				<displayName count="one">كاريب گۋلدەرى</displayName>
+				<displayName count="other">كاريب گۋلدەرى</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName draft="unconfirmed">باتىس افريكانىڭ فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">باتىس افريكانىڭ فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">باتىس افريكانىڭ فرانكى</displayName>
+				<displayName>باتىس افريكانىڭ فرانكى</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName draft="unconfirmed">فرانسۋز پولينەزيا فرانكى</displayName>
-				<displayName count="one" draft="unconfirmed">فرانسۋز پولينەزيا فرانكى</displayName>
-				<displayName count="other" draft="unconfirmed">فرانسۋز پولينەزيا فرانكى</displayName>
+				<displayName>فرانسۋز پولينەزيا فرانكى</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName draft="unconfirmed">بەلگىسىز اقشا</displayName>
-				<displayName count="one" draft="unconfirmed">(بەلگىسىز اقشا بىرلىگى)</displayName>
-				<displayName count="other" draft="unconfirmed">(بەلگىسىز اقشا)</displayName>
+				<displayName>بەلگىسىز اقشا</displayName>
+				<displayName count="one">(بەلگىسىز اقشا)</displayName>
+				<displayName count="other">(بەلگىسىز اقشا)</displayName>
 			</currency>
 			<currency type="YER">
-				<displayName draft="unconfirmed">يەمەن ريالى</displayName>
-				<displayName count="one" draft="unconfirmed">يەمەن ريالى</displayName>
-				<displayName count="other" draft="unconfirmed">يەمەن ريالى</displayName>
+				<displayName>يەمەن ريالى</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName draft="unconfirmed">وڭتۇستىك افريكا ءرەندى</displayName>
-				<displayName count="one" draft="unconfirmed">وڭتۇستىك افريكا ءرەندى</displayName>
-				<displayName count="other" draft="unconfirmed">وڭتۇستىك افريكا ءرەندى</displayName>
+				<displayName>وڭتۇستىك افريكا ءرەندى</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName draft="unconfirmed">زامبيا كۆاچاسى</displayName>
-				<displayName count="one" draft="unconfirmed">زامبيا كۆاچاسى</displayName>
-				<displayName count="other" draft="unconfirmed">زامبيا كۆاچاسى</displayName>
+				<displayName>زامبيا كۆاچاسى</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>زيمباب التىنى</displayName>
+				<displayName count="one">زيمباب التىنى</displayName>
+				<displayName count="other">زيمباب التىنى</displayName>
 			</currency>
 		</currencies>
 		<minimalPairs>
-			<pluralMinimalPairs count="one" draft="unconfirmed">ناۋرىزعا {0} كۇن قالدي.</pluralMinimalPairs>
-			<pluralMinimalPairs count="other" draft="unconfirmed">ناۋرىز مەيرامىنا {0} كۇن قالدى.</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other" draft="unconfirmed">مۇرات {0}- سىنىپقا كوشتى.</ordinalMinimalPairs>
+			<pluralMinimalPairs count="one" draft="contributed">{0} كۇن</pluralMinimalPairs>
+			<pluralMinimalPairs count="other" draft="contributed">{0} كۇن</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">مۇرات {0}- سىنىپقا كوشتى.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
 		<unitLength type="long">
 			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">دەسي{0}</unitPrefixPattern>
+				<unitPrefixPattern>دەسي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-2">
-				<unitPrefixPattern draft="unconfirmed">سانتي{0}</unitPrefixPattern>
+				<unitPrefixPattern>سانتي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-3">
-				<unitPrefixPattern draft="unconfirmed">ميلي{0}</unitPrefixPattern>
+				<unitPrefixPattern>ميلي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-6">
-				<unitPrefixPattern draft="unconfirmed">ميكرو{0}</unitPrefixPattern>
+				<unitPrefixPattern>ميكرو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-9">
-				<unitPrefixPattern draft="unconfirmed">نانو{0}</unitPrefixPattern>
+				<unitPrefixPattern>نانو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-12">
-				<unitPrefixPattern draft="unconfirmed">پيكو{0}</unitPrefixPattern>
+				<unitPrefixPattern>پيكو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-15">
-				<unitPrefixPattern draft="unconfirmed">فەمتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>فەمتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-18">
-				<unitPrefixPattern draft="unconfirmed">اتتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>اتتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-21">
-				<unitPrefixPattern draft="unconfirmed">زەپتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>زەپتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-24">
-				<unitPrefixPattern draft="unconfirmed">يوكتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>يوكتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-27">
-				<unitPrefixPattern draft="unconfirmed">رونتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>رونتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-30">
-				<unitPrefixPattern draft="unconfirmed">كۆەكتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>كۆەكتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p1">
-				<unitPrefixPattern draft="unconfirmed">دەكا{0}</unitPrefixPattern>
+				<unitPrefixPattern>دەكا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p2">
-				<unitPrefixPattern draft="unconfirmed">گەكتو{0}</unitPrefixPattern>
+				<unitPrefixPattern>گەكتو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p3">
-				<unitPrefixPattern draft="unconfirmed">كيلو{0}</unitPrefixPattern>
+				<unitPrefixPattern>كيلو{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p6">
-				<unitPrefixPattern draft="unconfirmed">مەگا{0}</unitPrefixPattern>
+				<unitPrefixPattern>مەگا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p9">
-				<unitPrefixPattern draft="unconfirmed">گيگا{0}</unitPrefixPattern>
+				<unitPrefixPattern>گيگا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p12">
-				<unitPrefixPattern draft="unconfirmed">تەرا{0}</unitPrefixPattern>
+				<unitPrefixPattern>تەرا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p15">
-				<unitPrefixPattern draft="unconfirmed">پەتا{0}</unitPrefixPattern>
+				<unitPrefixPattern>پەتا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p18">
-				<unitPrefixPattern draft="unconfirmed">ەكسا{0}</unitPrefixPattern>
+				<unitPrefixPattern>ەكسا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p21">
-				<unitPrefixPattern draft="unconfirmed">زەتا{0}</unitPrefixPattern>
+				<unitPrefixPattern>زەتا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p24">
-				<unitPrefixPattern draft="unconfirmed">يوتا{0}</unitPrefixPattern>
+				<unitPrefixPattern>يوتا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p27">
-				<unitPrefixPattern draft="unconfirmed">رونا{0}</unitPrefixPattern>
+				<unitPrefixPattern>رونا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p30">
-				<unitPrefixPattern draft="unconfirmed">كۋەتا{0}</unitPrefixPattern>
+				<unitPrefixPattern>كۋەتا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p1">
-				<unitPrefixPattern draft="unconfirmed">كيبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>كيبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p2">
-				<unitPrefixPattern draft="unconfirmed">مەبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>مەبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p3">
-				<unitPrefixPattern draft="unconfirmed">گيبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>گيبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p4">
-				<unitPrefixPattern draft="unconfirmed">تەبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>تەبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p5">
-				<unitPrefixPattern draft="unconfirmed">پەبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>پەبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p6">
-				<unitPrefixPattern draft="unconfirmed">ەكسبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>ەكسبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p7">
-				<unitPrefixPattern draft="unconfirmed">زەبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>زەبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p8">
-				<unitPrefixPattern draft="unconfirmed">يوبي{0}</unitPrefixPattern>
+				<unitPrefixPattern>يوبي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="power2">
-				<compoundUnitPattern1 count="one" draft="unconfirmed">شارشى {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" draft="unconfirmed">شارشى {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one">شارشى {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">شارشى {0}</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="power3">
-				<compoundUnitPattern1 count="one" draft="unconfirmed">تەكشە {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" draft="unconfirmed">تەكشە {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one">تەكشە {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">تەكشە {0}</compoundUnitPattern1>
 			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<displayName draft="unconfirmed">تارتىلىس كۇشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تارتىلىس كۇشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تارتىلىس كۇشى</unitPattern>
-			</unit>
-			<unit type="acceleration-meter-per-square-second">
-				<displayName draft="unconfirmed">مەتىر/شارشى سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىر/شارشى سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىر/شارشى سەكۋند</unitPattern>
-			</unit>
-			<unit type="angle-revolution">
-				<displayName draft="unconfirmed">اينالىم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اينالىم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اينالىم</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="unconfirmed">راديان</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} راديان</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} راديان</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="unconfirmed">گرادۋس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گرادۋس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گرادۋس</unitPattern>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="unconfirmed">اركمينۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اركمينۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اركمينۋت</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="unconfirmed">اركسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اركسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اركسەكۋند</unitPattern>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">شارشى كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/شارشى كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/شارشى كيلومەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى كيلومەتىر</perUnitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="unconfirmed">گەكتار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتار</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">شارشى مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى مەتىر</perUnitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">شارشى سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى سانتيمەتىر</perUnitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">شارشى ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى ميل</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى ميل</perUnitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="unconfirmed">اكر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اكر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اكر</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">شارشى يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى يارد</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">شارشى فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى فۋت</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">شارشى ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى ديۋيم</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} شارشى ديۋيم</perUnitPattern>
-			</unit>
-			<unit type="area-dunam">
-				<displayName draft="unconfirmed">دۋنام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دۋنام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دۋنام</unitPattern>
-			</unit>
-			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">كارات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كارات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كارات</unitPattern>
-			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<displayName draft="unconfirmed">ميليگرام/دەسيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليگرام/دەسيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليگرام/دەسيمەتىر</unitPattern>
+				<unitPattern count="one">{0} ميليگرام/دەسيمەتىر</unitPattern>
+				<unitPattern count="other">{0} ميليگرام/دەسيمەتىر</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
-				<displayName draft="unconfirmed">ميليمول/ليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمول/ليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمول/ليتىر</unitPattern>
+				<unitPattern count="one">{0} ميليمول/ليتىر</unitPattern>
+				<unitPattern count="other">{0} ميليمول/ليتىر</unitPattern>
 			</unit>
-			<unit type="concentr-item">
-				<displayName draft="unconfirmed">ەلەمەنت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ەلەمەنت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ەلەمەنت</unitPattern>
+			<unit type="concentr-part">
+				<displayName>بولىك</displayName>
+				<unitPattern count="one">{0} بولىك</unitPattern>
+				<unitPattern count="other">{0} بولىك</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName draft="unconfirmed">ميلليوندىق ۇلەس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميلليوندىق ۇلەس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميلليوندىق ۇلەس</unitPattern>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} ميلليوندىق ۇلەس</unitPattern>
+				<unitPattern count="other">{0} ميلليوندىق ۇلەس</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
-				<displayName draft="unconfirmed">پايىز</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پايىز</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پايىز</unitPattern>
+				<unitPattern count="one">{0} پايىز</unitPattern>
+				<unitPattern count="other">{0} پايىز</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
-				<displayName draft="unconfirmed">پروميللە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پروميللە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پروميللە</unitPattern>
+				<unitPattern count="one">{0} پروميللە</unitPattern>
+				<unitPattern count="other">{0} پروميللە</unitPattern>
 			</unit>
 			<unit type="concentr-permyriad">
-				<displayName draft="unconfirmed">پروميرياد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پروميرياد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پروميرياد</unitPattern>
+				<unitPattern count="one">{0} پروميرياد</unitPattern>
+				<unitPattern count="other">{0} پروميرياد</unitPattern>
 			</unit>
-			<unit type="concentr-mole">
-				<displayName draft="unconfirmed">مول</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مول</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مول</unitPattern>
+			<unit type="concentr-ofglucose">
+				<displayName>گليۋكوزا</displayName>
+				<unitPattern count="one">{0} گليۋكوزا</unitPattern>
+				<unitPattern count="other">{0} گليۋكوزا</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="unconfirmed">ليتىر/كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليتىر/كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليتىر/كيلومەتىر</unitPattern>
+				<unitPattern count="one">{0} ليتىر/كيلومەتىر</unitPattern>
+				<unitPattern count="other">{0} ليتىر/كيلومەتىر</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
-				<displayName draft="unconfirmed">ليتىر/100 كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليتىر/100 كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليتىر/100 كيلومەتىر</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">ميل/گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/گاللون</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName draft="unconfirmed">ميل/يمپ گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/يمپ گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/يمپ گاللون</unitPattern>
+				<unitPattern count="one">{0} ليتىر/100 كيلومەتىر</unitPattern>
+				<unitPattern count="other">{0} ليتىر/100 كيلومەتىر</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName draft="unconfirmed">پەتابايت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پەتابايت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پەتابايت</unitPattern>
+				<unitPattern count="one">{0} پەتابايت</unitPattern>
+				<unitPattern count="other">{0} پەتابايت</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">تەرابايت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەرابايت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەرابايت</unitPattern>
+				<unitPattern count="one">{0} تەرابايت</unitPattern>
+				<unitPattern count="other">{0} تەرابايت</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">تەرابيت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەرابيت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەرابيت</unitPattern>
+				<unitPattern count="one">{0} تەرابيت</unitPattern>
+				<unitPattern count="other">{0} تەرابيت</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">گيگابايت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگابايت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگابايت</unitPattern>
+				<unitPattern count="one">{0} گيگابايت</unitPattern>
+				<unitPattern count="other">{0} گيگابايت</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">گيگابيت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگابيت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگابيت</unitPattern>
+				<unitPattern count="one">{0} گيگابيت</unitPattern>
+				<unitPattern count="other">{0} گيگابيت</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">مەگابايت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگابايت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگابايت</unitPattern>
+				<unitPattern count="one">{0} مەگابايت</unitPattern>
+				<unitPattern count="other">{0} مەگابايت</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">مەگابيت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگابيت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگابيت</unitPattern>
+				<unitPattern count="one">{0} مەگابيت</unitPattern>
+				<unitPattern count="other">{0} مەگابيت</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">كيلوبايت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوبايت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوبايت</unitPattern>
+				<unitPattern count="one">{0} كيلوبايت</unitPattern>
+				<unitPattern count="other">{0} كيلوبايت</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">كيلوبيت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوبيت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوبيت</unitPattern>
+				<unitPattern count="one">{0} كيلوبيت</unitPattern>
+				<unitPattern count="other">{0} كيلوبيت</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<displayName draft="unconfirmed">بايت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بايت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بايت</unitPattern>
+				<unitPattern count="one">{0} بايت</unitPattern>
+				<unitPattern count="other">{0} بايت</unitPattern>
 			</unit>
 			<unit type="digital-bit">
-				<displayName draft="unconfirmed">بيت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بيت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بيت</unitPattern>
-			</unit>
-			<unit type="duration-century">
-				<displayName draft="unconfirmed">عاسىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} عاسىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} عاسىر</unitPattern>
-			</unit>
-			<unit type="duration-decade">
-				<displayName draft="unconfirmed">ون جىلدىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ون جىلدىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ون جىلدىق</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">جىل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جىل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جىل</unitPattern>
-				<perUnitPattern draft="unconfirmed">جىلىنا {0}</perUnitPattern>
-			</unit>
-			<unit type="duration-quarter">
-				<displayName draft="unconfirmed">توقسان</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} توقسان</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} توقسان</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/توقسان</perUnitPattern>
+				<unitPattern count="one">{0} بيت</unitPattern>
+				<unitPattern count="other">{0} بيت</unitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName draft="unconfirmed">اي</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اي</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اي</unitPattern>
-				<perUnitPattern draft="unconfirmed">ايىنا {0}</perUnitPattern>
+				<perUnitPattern>ايىنا {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName draft="unconfirmed">اپتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اپتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اپتا</unitPattern>
-				<perUnitPattern draft="unconfirmed">اپتاسىنا {0}</perUnitPattern>
+				<perUnitPattern>اپتاسىنا {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="unconfirmed">كۇن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن</unitPattern>
-				<perUnitPattern draft="unconfirmed">كۇنىنە {0}</perUnitPattern>
+				<perUnitPattern>كۇنىنە {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ساعات</unitPattern>
-				<perUnitPattern draft="unconfirmed">ساعاتىنا {0}</perUnitPattern>
+				<perUnitPattern>ساعاتىنا {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">مينۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مينۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مينۋت</unitPattern>
-				<perUnitPattern draft="unconfirmed">مينۋتىنا {0}</perUnitPattern>
+				<perUnitPattern>مينۋتىنا {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سەكۋند</unitPattern>
-				<perUnitPattern draft="unconfirmed">سەكۋندىنا {0}</perUnitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ميليسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليسەكۋند</unitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">ميكروسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكروسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكروسەكۋند</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">نانوسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نانوسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نانوسەكۋند</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">امپەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} امپەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} امپەر</unitPattern>
-			</unit>
-			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">ميليامپەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليامپەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليامپەر</unitPattern>
-			</unit>
-			<unit type="electric-ohm">
-				<displayName draft="unconfirmed">وم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} وم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} وم</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<displayName draft="unconfirmed">ۆولت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۆولت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۆولت</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="unconfirmed">كيلوكالوريا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوكالوريا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوكالوريا</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName draft="unconfirmed">كالوريا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كالوريا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كالوريا</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName draft="unconfirmed">كيلوجوۋل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كىلوجوۋل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كىلوجوۋل</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName draft="unconfirmed">جوۋل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جوۋل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جوۋل</unitPattern>
-			</unit>
-			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">كيلوۆات-ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات-ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات-ساعات</unitPattern>
-			</unit>
-			<unit type="energy-electronvolt">
-				<displayName draft="unconfirmed">ەلەكتونۆولت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ەلەكترونۆولت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ەلەكترونۆولت</unitPattern>
-			</unit>
-			<unit type="energy-british-thermal-unit">
-				<displayName draft="unconfirmed">بريتاندىق جىلۋ بىرلىگى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
-			</unit>
-			<unit type="energy-therm-us">
-				<displayName draft="unconfirmed">ا ق ش تەرمى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ا ق ش تەرمى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ا ق ش تەرمى</unitPattern>
-			</unit>
-			<unit type="force-pound-force">
-				<displayName draft="unconfirmed">فۋنت-كۇش</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش</unitPattern>
+				<perUnitPattern>سەكۋندىنا {0}</perUnitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName draft="unconfirmed">نيۋتون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نيۋتون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نيۋتون</unitPattern>
+				<unitPattern count="one">{0} نيۋتون</unitPattern>
+				<unitPattern count="other">{0} نيۋتون</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName draft="unconfirmed">كيلوۆات-ساعات/100 كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات-ساعات/100 كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات-ساعات/100 كيلومەتىر</unitPattern>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">گيگاگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگاگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگاگەرس</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">مەگاگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاگەرس</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">كيلوگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوگەرس</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="unconfirmed">گەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەرس</unitPattern>
+				<unitPattern count="one">{0} كيلوۆات-ساعات/100 كيلومەتىر</unitPattern>
+				<unitPattern count="other">{0} كيلوۆات-ساعات/100 كيلومەتىر</unitPattern>
 			</unit>
 			<unit type="graphics-em">
-				<displayName draft="unconfirmed">باسپالىق em</displayName>
+				<displayName>باسپالىق em</displayName>
 			</unit>
 			<unit type="graphics-pixel">
-				<displayName draft="unconfirmed">پيكسەل</displayName>
+				<displayName>پيكسەل</displayName>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName draft="unconfirmed">مەگاپيكسەل</displayName>
+				<displayName>مەگاپيكسەل</displayName>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
-				<displayName draft="unconfirmed">پيكسەل/سانتيمەتىر</displayName>
+				<displayName>پيكسەل/سانتيمەتىر</displayName>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<displayName draft="unconfirmed">پيكسەل/ديۋيم</displayName>
-			</unit>
-			<unit type="length-earth-radius">
-				<displayName draft="unconfirmed">جەر راديۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جەر راديۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جەر راديۋسى</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلومەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كيلومەتىر</perUnitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="unconfirmed">مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/مەتىر</perUnitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">دەسيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/دەسيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/دەسيمەتىر</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/سانتيمەتىر</perUnitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">ميليمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمەتىر</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">ميكرومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكرومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكرومەتىر</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">نانومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نانومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نانومەتىر</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="unconfirmed">پيكومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پيكومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پيكومەتىر</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="unconfirmed">يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يارد</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="unconfirmed">فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/فۋت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/فۋت</perUnitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ديۋيم</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ديۋيم</perUnitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">پارسەك</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پارسەك</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پارسەك</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">جارىق جىلى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جارىق جىلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جارىق جىلى</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">استرونوميالىق بىرلىك</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} استرونوميالىق بىرلىك</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} استرونوميالىق بىرلىك</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">فۋرلوڭ</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋرلوڭ</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋرلوڭ</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="unconfirmed">فاتوم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فاتوم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فاتوم</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">تەڭىز ميلى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەڭىز ميلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەڭىز ميلى</unitPattern>
-			</unit>
-			<unit type="length-mile-scandinavian">
-				<displayName draft="unconfirmed">سكانديناۆيالىق ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سكانديناۆيالىق ميلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سكانديناۆيالىق ميلى</unitPattern>
-			</unit>
-			<unit type="length-point">
-				<displayName draft="unconfirmed">پۋنكت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پۋنكت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پۋنكت</unitPattern>
-			</unit>
-			<unit type="length-solar-radius">
-				<displayName draft="unconfirmed">كۇن راديۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن راديۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن راديۋسى</unitPattern>
+				<displayName>پيكسەل/ديۋيم</displayName>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="unconfirmed">ليۋكس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليۋكس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليۋكس</unitPattern>
+				<unitPattern count="one">{0} ليۋكس</unitPattern>
+				<unitPattern count="other">{0} ليۋكس</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName draft="unconfirmed">كاندەلا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كاندەلا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كاندەلا</unitPattern>
+				<unitPattern count="one">{0} كاندەلا</unitPattern>
+				<unitPattern count="other">{0} كاندەلا</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<displayName draft="unconfirmed">ليۋمەن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليۋمەن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليۋمەن</unitPattern>
-			</unit>
-			<unit type="light-solar-luminosity">
-				<displayName draft="unconfirmed">كۇن جارىقتىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن جارىقتىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن جارىقتىعى</unitPattern>
+				<unitPattern count="one">{0} ليۋمەن</unitPattern>
+				<unitPattern count="other">{0} ليۋمەن</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName draft="unconfirmed">مەتىرلىك توننا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك توننا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك توننا</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">كيلوگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوگرام</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كيلوگرام</perUnitPattern>
+				<unitPattern count="one">{0} مەتىرلىك توننا</unitPattern>
+				<unitPattern count="other">{0} مەتىرلىك توننا</unitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">گرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گرام</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/گرام</perUnitPattern>
-			</unit>
-			<unit type="mass-milligram">
-				<displayName draft="unconfirmed">ميليگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليگرام</unitPattern>
-			</unit>
-			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">ميكروگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكروگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكروگرام</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<displayName draft="unconfirmed">توننا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تن</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">ستوۋن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ستوۋن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ستوۋن</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName draft="unconfirmed">فۋنت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/فۋنت</perUnitPattern>
+				<displayName>lb</displayName>
 			</unit>
-			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۋنسيا</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ۋنسيا</perUnitPattern>
-			</unit>
-			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">تروي ۋنسياسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تروۋ ۋنسياسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تروۋ ۋنسياسى</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<displayName draft="unconfirmed">كارات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كارات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كارات</unitPattern>
-			</unit>
-			<unit type="mass-dalton">
-				<displayName draft="unconfirmed">دالتون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دالتون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دالتون</unitPattern>
-			</unit>
-			<unit type="mass-earth-mass">
-				<displayName draft="unconfirmed">جەر ماسساسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جەر ماسساسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جەر ماسساسى</unitPattern>
-			</unit>
-			<unit type="mass-solar-mass">
-				<displayName draft="unconfirmed">كۇن ماسساسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن ماسساسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن ماسساسى</unitPattern>
-			</unit>
-			<unit type="mass-grain">
-				<displayName draft="unconfirmed">گران</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گران</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گران</unitPattern>
-			</unit>
-			<unit type="power-gigawatt">
-				<displayName draft="unconfirmed">گيگاۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگاۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگاۆات</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="unconfirmed">مەگاۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاۆات</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="unconfirmed">كيلوۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<displayName draft="unconfirmed">ۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۆات</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="unconfirmed">ميليۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليۆات</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="unconfirmed">ات كۇشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ات كۇشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ات كۇشى</unitPattern>
-			</unit>
-			<unit type="pressure-millimeter-ofhg">
-				<displayName draft="unconfirmed">ميليمەتىر سىناپ باعاناسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
-			</unit>
-			<unit type="pressure-pound-force-per-square-inch">
-				<displayName draft="unconfirmed">فۋنت-كۇش/شارشى ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
-			</unit>
-			<unit type="pressure-inch-ofhg">
-				<displayName draft="unconfirmed">ديۋيم سىناپ باعاناسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ديۋيم سىناپ باعاناسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ديۋيم سىناپ باعاناسى</unitPattern>
-			</unit>
-			<unit type="pressure-bar">
-				<displayName draft="unconfirmed">بار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بار</unitPattern>
-			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">ميليبار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليبار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليبار</unitPattern>
-			</unit>
-			<unit type="pressure-atmosphere">
-				<displayName draft="unconfirmed">اتموسفەرا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اتموسفەرا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اتموسفەرا</unitPattern>
-			</unit>
-			<unit type="pressure-pascal">
-				<displayName draft="unconfirmed">پاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پاسكال</unitPattern>
-			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="unconfirmed">گەكتوپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتوپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتوپاسكال</unitPattern>
-			</unit>
-			<unit type="pressure-kilopascal">
-				<displayName draft="unconfirmed">كيلوپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوپاسكال</unitPattern>
-			</unit>
-			<unit type="pressure-megapascal">
-				<displayName draft="unconfirmed">مەگاپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاپاسكال</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">كيلومەتىر/ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلومەتىر/ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلومەتىر/ساعات</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName draft="unconfirmed">مەتىر/سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىر/سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىر/سەكۋند</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">ميل/ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/ساعات</unitPattern>
-			</unit>
-			<unit type="speed-knot">
-				<displayName draft="unconfirmed">ءتۇيىن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ءتۇيىن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ءتۇيىن</unitPattern>
-			</unit>
-			<unit type="speed-beaufort">
-				<displayName draft="unconfirmed">بوفورت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بوفورت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بوفورت</unitPattern>
+			<unit type="pressure-ofhg">
+				<displayName>مەركۋري ءديۋيمى</displayName>
+				<unitPattern count="one">{0} مەركۋري ءديۋيمى</unitPattern>
+				<unitPattern count="other">{0} مەركۋري ءديۋيمى</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
-				<displayName draft="unconfirmed">تەمپەراتۋرا گرادۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گرادۋس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گرادۋس</unitPattern>
+				<displayName>تەمپەراتۋرا گرادۋسى</displayName>
+				<unitPattern count="one">{0} گرادۋس</unitPattern>
+				<unitPattern count="other">{0} گرادۋس</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">سەلسي گرادۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سەلسي گرادۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سەلسي گرادۋسى</unitPattern>
+				<unitPattern count="one">{0} سەلسي گرادۋسى</unitPattern>
+				<unitPattern count="other">{0} سەلسي گرادۋسى</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="unconfirmed">فارانگەيت گرادۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فارانگەيت گرادۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فارانگەيت گرادۋسى</unitPattern>
+				<unitPattern count="one">{0} فارانگەيت گرادۋسى</unitPattern>
+				<unitPattern count="other">{0} فارانگەيت گرادۋسى</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">كەلۆين</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كەلۆين</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كەلۆين</unitPattern>
-			</unit>
-			<unit type="torque-pound-force-foot">
-				<displayName draft="unconfirmed">فۋنت-كۇش-فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش-فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش-فۋت</unitPattern>
+				<unitPattern count="one">{0} كەلۆين</unitPattern>
+				<unitPattern count="other">{0} كەلۆين</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<displayName draft="unconfirmed">نيۋتون-مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نيۋتون-مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نيۋتون-مەتىر</unitPattern>
+				<unitPattern count="one">{0} نيۋتون-مەتىر</unitPattern>
+				<unitPattern count="other">{0} نيۋتون-مەتىر</unitPattern>
 			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="unconfirmed">تەكشە كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە كيلومەتىر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="unconfirmed">تەكشە مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/تەكشە مەتىر</perUnitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="unconfirmed">تەكشە سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/تەكشە سانتيمەتىر</perUnitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="unconfirmed">تەكشە ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە ميل</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName draft="unconfirmed">تەكشە يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە يارد</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="unconfirmed">تەكشە فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە فۋت</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="unconfirmed">تەكشە ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە ديۋيم</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="unconfirmed">مەگاليتر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاليتر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاليتر</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="unconfirmed">گەكتوليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتوليرىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتوليرىر</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">ليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ليتىر</perUnitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">دەسيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دەسيليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دەسيليتىر</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="unconfirmed">سانتيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سانتيليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سانتيليتىر</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="unconfirmed">ميليليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليليتىر</unitPattern>
-			</unit>
-			<unit type="volume-pint-metric">
-				<displayName draft="unconfirmed">مەتىرلىك پينتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك پينتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك پينتا</unitPattern>
-			</unit>
-			<unit type="volume-cup-metric">
-				<displayName draft="unconfirmed">مەتىرلىك كەسە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك كەسە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك كەسە</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">اكر-فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اكر-فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اكر-فۋت</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">بۋشەل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بۋشەل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بۋشەل</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="unconfirmed">گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گاللون</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/گاللون</perUnitPattern>
-			</unit>
-			<unit type="volume-gallon-imperial">
-				<displayName draft="unconfirmed">يمپ گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ گاللون</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} يمپ گاللون</perUnitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<displayName draft="unconfirmed">كۆارتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۆارتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۆارتا</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<displayName draft="unconfirmed">پينتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پينتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پينتا</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName draft="unconfirmed">كەسە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كەسە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كەسە</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="unconfirmed">سۇيىق ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سۇيىق ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سۇيىق ۋنسيا</unitPattern>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>سۇ. ۋن.</displayName>
+				<unitPattern count="one">{0} سۇ. ۋن.</unitPattern>
+				<unitPattern count="other">{0} سۇ. ۋن.</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName draft="unconfirmed">يمپ سۇيىق ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">يمپ سۇيىق ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ سۇيىق ۋنسيا</unitPattern>
+				<unitPattern count="one">يمپ سۇيىق ۋنسيا</unitPattern>
+				<unitPattern count="other">{0} يمپ سۇيىق ۋنسيا</unitPattern>
 			</unit>
-			<unit type="volume-tablespoon">
-				<displayName draft="unconfirmed">اس قاسىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اس قاسىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اس قاسىق</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ستەراديان</displayName>
+				<unitPattern count="one">{0} ستەراديان</unitPattern>
+				<unitPattern count="other">{0} ستەراديان</unitPattern>
 			</unit>
-			<unit type="volume-teaspoon">
-				<displayName draft="unconfirmed">شاي قاسىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شاي قاسىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شاي قاسىق</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>كاتال</displayName>
+				<unitPattern count="one">{0} كاتال</unitPattern>
+				<unitPattern count="other">{0} كاتال</unitPattern>
 			</unit>
-			<unit type="volume-barrel">
-				<displayName draft="unconfirmed">باررەل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} باررەل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} باررەل</unitPattern>
+			<unit type="electric-coulomb">
+				<displayName>كۋلون</displayName>
+				<unitPattern count="one">{0} كۋلون</unitPattern>
+				<unitPattern count="other">{0} كۋلون</unitPattern>
 			</unit>
-			<unit type="volume-dessert-spoon">
-				<displayName draft="unconfirmed">دەسەرت قاسىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دەسەرت قاسىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دەسەرت قاسىعى</unitPattern>
+			<unit type="electric-farad">
+				<displayName>فاراد</displayName>
+				<unitPattern count="one">{0} فاراد</unitPattern>
+				<unitPattern count="other">{0} فاراد</unitPattern>
 			</unit>
-			<unit type="volume-dessert-spoon-imperial">
-				<displayName draft="unconfirmed">يمپ دەسەرت قاسىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ دەسەرت قاسىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ دەسەرت قاسىعى</unitPattern>
+			<unit type="electric-henry">
+				<displayName>حەنري</displayName>
+				<unitPattern count="one">{0} حەنري</unitPattern>
+				<unitPattern count="other">{0} حەنري</unitPattern>
 			</unit>
-			<unit type="volume-drop">
-				<displayName draft="unconfirmed">تامشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تامشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تامشى</unitPattern>
+			<unit type="electric-siemens">
+				<displayName>سيمەنس</displayName>
+				<unitPattern count="one">{0} سيمەنس</unitPattern>
+				<unitPattern count="other">{0} سيمەنس</unitPattern>
 			</unit>
-			<unit type="volume-dram">
-				<displayName draft="unconfirmed">دراحما</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دراحما</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دراحما</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>كالو.</displayName>
+				<unitPattern count="one">{0} كالو.</unitPattern>
+				<unitPattern count="other">{0} كالو.</unitPattern>
 			</unit>
-			<unit type="volume-jigger">
-				<displayName draft="unconfirmed">جيگگەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جيگگەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جيگگەر</unitPattern>
+			<unit type="energy-becquerel">
+				<displayName>بەككەرەل</displayName>
+				<unitPattern count="one">{0} بەككەرەل</unitPattern>
+				<unitPattern count="other">{0} بەككەرەل</unitPattern>
 			</unit>
-			<unit type="volume-pinch">
-				<displayName draft="unconfirmed">شوكىم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شوكىم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شوكىم</unitPattern>
+			<unit type="energy-sievert">
+				<displayName>زيۆەرت</displayName>
+				<unitPattern count="one">{0} زيۆەرت</unitPattern>
+				<unitPattern count="other">{0} زيۆەرت</unitPattern>
 			</unit>
-			<unit type="volume-quart-imperial">
-				<displayName draft="unconfirmed">يمپ كۆارتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ كۆارتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ كۆارتا</unitPattern>
+			<unit type="energy-gray">
+				<displayName>گىرەي</displayName>
+				<unitPattern count="one">{0} گىرەي</unitPattern>
+				<unitPattern count="other">{0} گىرەي</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName draft="unconfirmed">جارىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جارىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جارىق</unitPattern>
+			<unit type="force-kilogram-force">
+				<displayName>كيلوگرام-كۇش</displayName>
+				<unitPattern count="one">{0} كيلوگرام-كۇش</unitPattern>
+				<unitPattern count="other">{0} كيلوگرام-كۇش</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName draft="unconfirmed">ميللياردتىق ۇلەس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميىللياردتىق ۇلەس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميللياردتىق ۇلەس</unitPattern>
+			<unit type="magnetic-tesla">
+				<displayName>ت</displayName>
+				<unitPattern count="one">{0} تەسلا</unitPattern>
+				<unitPattern count="other">{0} تەسلا</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName draft="unconfirmed">ءتۇن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ءتۇن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ءتۇن</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ءتۇن</perUnitPattern>
+			<unit type="magnetic-weber">
+				<displayName>ۋەبەر</displayName>
+				<unitPattern count="one">{0} ۋەبەر</unitPattern>
+				<unitPattern count="other">{0} ۋەبەر</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} ميللياردتىق ۇلەس</unitPattern>
+				<unitPattern count="other">{0} ميللياردتىق ۇلەس</unitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName draft="unconfirmed">نەگىزگى باعىت</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} شىعىس</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} سولتۇستىك</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} وڭتۇستىك</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} باتىس</coordinateUnitPattern>
+				<displayName>نەگىزگى باعىت</displayName>
+				<coordinateUnitPattern type="east">{0} شىعىس</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} سولتۇستىك</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} وڭتۇستىك</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} باتىس</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">د{0}</unitPrefixPattern>
+				<unitPrefixPattern>د{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-2">
-				<unitPrefixPattern draft="unconfirmed">س{0}</unitPrefixPattern>
+				<unitPrefixPattern>س{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-3">
-				<unitPrefixPattern draft="unconfirmed">مل{0}</unitPrefixPattern>
+				<unitPrefixPattern>مل{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-6">
-				<unitPrefixPattern draft="unconfirmed">مك{0}</unitPrefixPattern>
+				<unitPrefixPattern>مك{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-9">
-				<unitPrefixPattern draft="unconfirmed">ن{0}</unitPrefixPattern>
+				<unitPrefixPattern>ن{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-12">
-				<unitPrefixPattern draft="unconfirmed">پ{0}</unitPrefixPattern>
+				<unitPrefixPattern>پ{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-15">
-				<unitPrefixPattern draft="unconfirmed">ف{0}</unitPrefixPattern>
+				<unitPrefixPattern>ف{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-18">
-				<unitPrefixPattern draft="unconfirmed">ا{0}</unitPrefixPattern>
+				<unitPrefixPattern>ا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-21">
-				<unitPrefixPattern draft="unconfirmed">ز{0}</unitPrefixPattern>
+				<unitPrefixPattern>ز{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-24">
-				<unitPrefixPattern draft="unconfirmed">ي{0}</unitPrefixPattern>
+				<unitPrefixPattern>ي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-27">
-				<unitPrefixPattern draft="unconfirmed">ر{0}</unitPrefixPattern>
+				<unitPrefixPattern>ر{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-30">
-				<unitPrefixPattern draft="unconfirmed">ك{0}</unitPrefixPattern>
+				<unitPrefixPattern>ك{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p1">
-				<unitPrefixPattern draft="unconfirmed">دا{0}</unitPrefixPattern>
+				<unitPrefixPattern>دا{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p2">
-				<unitPrefixPattern draft="unconfirmed">گ{0}</unitPrefixPattern>
+				<unitPrefixPattern>گ{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p3">
-				<unitPrefixPattern draft="unconfirmed">كل{0}</unitPrefixPattern>
+				<unitPrefixPattern>كل{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p6">
-				<unitPrefixPattern draft="unconfirmed">مگ{0}</unitPrefixPattern>
+				<unitPrefixPattern>مگ{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p9">
-				<unitPrefixPattern draft="unconfirmed">گگ{0}</unitPrefixPattern>
+				<unitPrefixPattern>گگ{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p12">
-				<unitPrefixPattern draft="unconfirmed">ت{0}</unitPrefixPattern>
+				<unitPrefixPattern>ت{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p15">
-				<unitPrefixPattern draft="unconfirmed">پت{0}</unitPrefixPattern>
+				<unitPrefixPattern>پت{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p18">
-				<unitPrefixPattern draft="unconfirmed">ە{0}</unitPrefixPattern>
+				<unitPrefixPattern>ە{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p21">
-				<unitPrefixPattern draft="unconfirmed">زت{0}</unitPrefixPattern>
+				<unitPrefixPattern>زت{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p24">
-				<unitPrefixPattern draft="unconfirmed">يت{0}</unitPrefixPattern>
+				<unitPrefixPattern>يت{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p27">
-				<unitPrefixPattern draft="unconfirmed">رن{0}</unitPrefixPattern>
+				<unitPrefixPattern>رن{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p30">
-				<unitPrefixPattern draft="unconfirmed">كت{0}</unitPrefixPattern>
+				<unitPrefixPattern>كت{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p1">
-				<unitPrefixPattern draft="unconfirmed">كي{0}</unitPrefixPattern>
+				<unitPrefixPattern>كي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p2">
-				<unitPrefixPattern draft="unconfirmed">مب{0}</unitPrefixPattern>
+				<unitPrefixPattern>مب{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p3">
-				<unitPrefixPattern draft="unconfirmed">گي{0}</unitPrefixPattern>
+				<unitPrefixPattern>گي{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p4">
-				<unitPrefixPattern draft="unconfirmed">تب{0}</unitPrefixPattern>
+				<unitPrefixPattern>تب{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p5">
-				<unitPrefixPattern draft="unconfirmed">پب{0}</unitPrefixPattern>
+				<unitPrefixPattern>پب{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p6">
-				<unitPrefixPattern draft="unconfirmed">ەب{0}</unitPrefixPattern>
+				<unitPrefixPattern>ەب{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p7">
-				<unitPrefixPattern draft="unconfirmed">زب{0}</unitPrefixPattern>
+				<unitPrefixPattern>زب{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p8">
-				<unitPrefixPattern draft="unconfirmed">يب{0}</unitPrefixPattern>
+				<unitPrefixPattern>يب{0}</unitPrefixPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
-				<displayName draft="unconfirmed">تارتىلىس كۇشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تارتىلىس كۇشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تارتىلىس كۇشى</unitPattern>
+				<displayName>تارتىلىس كۇشى</displayName>
+				<unitPattern count="one">{0} تارتىلىس كۇشى</unitPattern>
+				<unitPattern count="other">{0} تارتىلىس كۇشى</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
-				<displayName draft="unconfirmed">مەتىر/شارشى سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىر/شارشى سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىر/شارشى سەكۋند</unitPattern>
+				<displayName>مەتىر/شارشى سەكۋند</displayName>
+				<unitPattern count="one">{0} مەتىر/شارشى سەكۋند</unitPattern>
+				<unitPattern count="other">{0} مەتىر/شارشى سەكۋند</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName draft="unconfirmed">اينالىم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اينالىم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اينالىم</unitPattern>
+				<displayName>اينالىم</displayName>
+				<unitPattern count="one">{0} اينالىم</unitPattern>
+				<unitPattern count="other">{0} اينالىم</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName draft="unconfirmed">راديان</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} راديان</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} راديان</unitPattern>
+				<displayName>راديان</displayName>
+				<unitPattern count="one">{0} راديان</unitPattern>
+				<unitPattern count="other">{0} راديان</unitPattern>
 			</unit>
 			<unit type="angle-degree">
-				<displayName draft="unconfirmed">گرادۋس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گرادۋس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گرادۋس</unitPattern>
+				<displayName>گرادۋس</displayName>
+				<unitPattern count="one">{0} گرادۋس</unitPattern>
+				<unitPattern count="other">{0} گرادۋس</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
-				<displayName draft="unconfirmed">اركمينۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اركمينۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اركمينۋت</unitPattern>
+				<displayName>اركمينۋت</displayName>
+				<unitPattern count="one">{0} اركمينۋت</unitPattern>
+				<unitPattern count="other">{0} اركمينۋت</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
-				<displayName draft="unconfirmed">اركسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اركسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اركسەكۋند</unitPattern>
+				<displayName>اركسەكۋند</displayName>
+				<unitPattern count="one">{0} اركسەكۋند</unitPattern>
+				<unitPattern count="other">{0} اركسەكۋند</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">شارشى كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/شارشى كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/شارشى كيلومەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى كيلومەتىر</perUnitPattern>
+				<displayName>شارشى كيلومەتىر</displayName>
+				<unitPattern count="one">{0}/شارشى كيلومەتىر</unitPattern>
+				<unitPattern count="other">{0}/شارشى كيلومەتىر</unitPattern>
+				<perUnitPattern>{0}/شارشى كيلومەتىر</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName draft="unconfirmed">گەكتار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتار</unitPattern>
+				<displayName>گەكتار</displayName>
+				<unitPattern count="one">{0} گەكتار</unitPattern>
+				<unitPattern count="other">{0} گەكتار</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">شارشى مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى مەتىر</perUnitPattern>
+				<displayName>شارشى مەتىر</displayName>
+				<unitPattern count="one">{0} شارشى مەتىر</unitPattern>
+				<unitPattern count="other">{0} شارشى مەتىر</unitPattern>
+				<perUnitPattern>{0}/شارشى مەتىر</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">شارشى سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى سانتيمەتىر</perUnitPattern>
+				<displayName>شارشى سانتيمەتىر</displayName>
+				<unitPattern count="one">{0} شارشى سانتيمەتىر</unitPattern>
+				<unitPattern count="other">{0} شارشى سانتيمەتىر</unitPattern>
+				<perUnitPattern>{0}/شارشى سانتيمەتىر</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">شارشى ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى ميل</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى ميل</perUnitPattern>
+				<displayName>شارشى ميل</displayName>
+				<unitPattern count="one">{0} شارشى ميل</unitPattern>
+				<unitPattern count="other">{0} شارشى ميل</unitPattern>
+				<perUnitPattern>{0}/شارشى ميل</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
-				<displayName draft="unconfirmed">اكر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اكر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اكر</unitPattern>
+				<displayName>اكر</displayName>
+				<unitPattern count="one">{0} اكر</unitPattern>
+				<unitPattern count="other">{0} اكر</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">شارشى يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى يارد</unitPattern>
+				<displayName>شارشى يارد</displayName>
+				<unitPattern count="one">{0} شارشى يارد</unitPattern>
+				<unitPattern count="other">{0} شارشى يارد</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">شارشى فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى فۋت</unitPattern>
+				<displayName>شارشى فۋت</displayName>
+				<unitPattern count="one">{0} شارشى فۋت</unitPattern>
+				<unitPattern count="other">{0} شارشى فۋت</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">شارشى ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى ديۋيم</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} شارشى ديۋيم</perUnitPattern>
+				<displayName>شارشى ديۋيم</displayName>
+				<unitPattern count="one">{0} شارشى ديۋيم</unitPattern>
+				<unitPattern count="other">{0} شارشى ديۋيم</unitPattern>
+				<perUnitPattern>{0} شارشى ديۋيم</perUnitPattern>
 			</unit>
 			<unit type="area-dunam">
-				<displayName draft="unconfirmed">دۋنام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دۋنام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دۋنام</unitPattern>
+				<displayName>دۋنام</displayName>
+				<unitPattern count="one">{0} دۋنام</unitPattern>
+				<unitPattern count="other">{0} دۋنام</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">كارات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كارات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كارات</unitPattern>
+				<displayName>كارات</displayName>
+				<unitPattern count="one">{0} كارات</unitPattern>
+				<unitPattern count="other">{0} كارات</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<displayName draft="unconfirmed">ميليگرام/دەسيليتىر</displayName>
+				<displayName>ميليگرام/دەسيليتىر</displayName>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
-				<displayName draft="unconfirmed">ميليمول/ليتىر</displayName>
+				<displayName>ميليمول/ليتىر</displayName>
 			</unit>
 			<unit type="concentr-item">
-				<displayName draft="unconfirmed">ەلەمەنت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ەلەمەنت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ەلەمەنت</unitPattern>
+				<displayName>ەلەمەنت</displayName>
+				<unitPattern count="one">{0} ەلەمەنت</unitPattern>
+				<unitPattern count="other">{0} ەلەمەنت</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName draft="unconfirmed">ميلليوندىق ۇلەس</displayName>
+			<unit type="concentr-part">
+				<displayName>بولىك</displayName>
+				<unitPattern count="one">{0} بولىك</unitPattern>
+				<unitPattern count="other">{0} بولىك</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>ميلليوندىق ۇلەس</displayName>
+				<unitPattern count="one">{0} ميلليوندىق ۇلەس</unitPattern>
+				<unitPattern count="other">{0} ميلليوندىق ۇلەس</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
-				<displayName draft="unconfirmed">پايىز</displayName>
+				<displayName>پايىز</displayName>
 			</unit>
 			<unit type="concentr-permille">
-				<displayName draft="unconfirmed">پروميللە</displayName>
+				<displayName>پروميللە</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
-				<displayName draft="unconfirmed">پروميرياد</displayName>
+				<displayName>پروميرياد</displayName>
 			</unit>
 			<unit type="concentr-mole">
-				<displayName draft="unconfirmed">مول</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مول</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مول</unitPattern>
+				<displayName>مول</displayName>
+				<unitPattern count="one">{0} مول</unitPattern>
+				<unitPattern count="other">{0} مول</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>گليۋكوزا</displayName>
+				<unitPattern count="one">{0} گليۋكوزا</unitPattern>
+				<unitPattern count="other">{0} گليۋكوزا</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="unconfirmed">ليتىر/كيلومەتىر</displayName>
+				<displayName>ليتىر/كيلومەتىر</displayName>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
-				<displayName draft="unconfirmed">ليتىر/100 كيلومەتىر</displayName>
+				<displayName>ليتىر/100 كيلومەتىر</displayName>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">ميل/گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/گاللون</unitPattern>
+				<displayName>ميل/گاللون</displayName>
+				<unitPattern count="one">{0} ميل/گاللون</unitPattern>
+				<unitPattern count="other">{0} ميل/گاللون</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName draft="unconfirmed">ميل/يمپ گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/يمپ گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/يمپ گاللون</unitPattern>
+				<displayName>ميل/يمپ گاللون</displayName>
+				<unitPattern count="one">{0} ميل/يمپ گاللون</unitPattern>
+				<unitPattern count="other">{0} ميل/يمپ گاللون</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName draft="unconfirmed">پەتابايت</displayName>
+				<displayName>پەتابايت</displayName>
 			</unit>
 			<unit type="digital-terabyte">
-				<displayName draft="unconfirmed">تەرابايت</displayName>
+				<displayName>تەرابايت</displayName>
 			</unit>
 			<unit type="digital-terabit">
-				<displayName draft="unconfirmed">تەرابيت</displayName>
+				<displayName>تەرابيت</displayName>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName draft="unconfirmed">گيگابايت</displayName>
+				<displayName>گيگابايت</displayName>
 			</unit>
 			<unit type="digital-gigabit">
-				<displayName draft="unconfirmed">گيگابيت</displayName>
+				<displayName>گيگابيت</displayName>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName draft="unconfirmed">مەگابايت</displayName>
+				<displayName>مەگابايت</displayName>
 			</unit>
 			<unit type="digital-megabit">
-				<displayName draft="unconfirmed">مەگابيت</displayName>
+				<displayName>مەگابيت</displayName>
 			</unit>
 			<unit type="digital-kilobyte">
-				<displayName draft="unconfirmed">كيلوبايت</displayName>
+				<displayName>كيلوبايت</displayName>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName draft="unconfirmed">كيلوبيت</displayName>
+				<displayName>كيلوبيت</displayName>
 			</unit>
 			<unit type="digital-byte">
-				<displayName draft="unconfirmed">بايت</displayName>
+				<displayName>بايت</displayName>
 			</unit>
 			<unit type="digital-bit">
-				<displayName draft="unconfirmed">بيت</displayName>
+				<displayName>بيت</displayName>
 			</unit>
 			<unit type="duration-century">
-				<displayName draft="unconfirmed">عاسىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} عاسىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} عاسىر</unitPattern>
+				<displayName>عاسىر</displayName>
+				<unitPattern count="one">{0} عاسىر</unitPattern>
+				<unitPattern count="other">{0} عاسىر</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName draft="unconfirmed">ون جىلدىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ون جىلدىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ون جىلدىق</unitPattern>
+				<displayName>ون جىلدىق</displayName>
+				<unitPattern count="one">{0} ون جىلدىق</unitPattern>
+				<unitPattern count="other">{0} ون جىلدىق</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName draft="unconfirmed">جىل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جىل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جىل</unitPattern>
-				<perUnitPattern draft="unconfirmed">جىلىنا {0}</perUnitPattern>
+				<displayName>جىل</displayName>
+				<unitPattern count="one">{0} جىل</unitPattern>
+				<unitPattern count="other">{0} جىل</unitPattern>
+				<perUnitPattern>جىلىنا {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName draft="unconfirmed">توقسان</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} توقسان</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} توقسان</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/توقسان</perUnitPattern>
+				<displayName>توقسان</displayName>
+				<unitPattern count="one">{0} توقسان</unitPattern>
+				<unitPattern count="other">{0} توقسان</unitPattern>
+				<perUnitPattern>{0}/توقسان</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName draft="unconfirmed">اي</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اي</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اي</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/اي</perUnitPattern>
+				<displayName>اي</displayName>
+				<unitPattern count="one">{0} اي</unitPattern>
+				<unitPattern count="other">{0} اي</unitPattern>
+				<perUnitPattern>{0}/اي</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName draft="unconfirmed">اپتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اپتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اپتا</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/اپتا</perUnitPattern>
+				<displayName>اپتا</displayName>
+				<unitPattern count="one">{0} اپتا</unitPattern>
+				<unitPattern count="other">{0} اپتا</unitPattern>
+				<perUnitPattern>{0}/اپتا</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName draft="unconfirmed">كۇن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كۇن</perUnitPattern>
+				<displayName>كۇن</displayName>
+				<unitPattern count="one">{0} كۇن</unitPattern>
+				<unitPattern count="other">{0} كۇن</unitPattern>
+				<perUnitPattern>{0}/كۇن</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName draft="unconfirmed">ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ساعات</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ساعات</perUnitPattern>
+				<displayName>ساعات</displayName>
+				<unitPattern count="one">{0} ساعات</unitPattern>
+				<unitPattern count="other">{0} ساعات</unitPattern>
+				<perUnitPattern>{0}/ساعات</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName draft="unconfirmed">مينۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مينۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مينۋت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/مينۋت</perUnitPattern>
+				<displayName>مينۋت</displayName>
+				<unitPattern count="one">{0} مينۋت</unitPattern>
+				<unitPattern count="other">{0} مينۋت</unitPattern>
+				<perUnitPattern>{0}/مينۋت</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName draft="unconfirmed">سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سەكۋند</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/سەكۋند</perUnitPattern>
+				<displayName>سەكۋند</displayName>
+				<unitPattern count="one">{0} سەكۋند</unitPattern>
+				<unitPattern count="other">{0} سەكۋند</unitPattern>
+				<perUnitPattern>{0}/سەكۋند</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ميليسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليسەكۋند</unitPattern>
+				<displayName>ميليسەكۋند</displayName>
+				<unitPattern count="one">{0} ميليسەكۋند</unitPattern>
+				<unitPattern count="other">{0} ميليسەكۋند</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">ميكروسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكروسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكروسەكۋند</unitPattern>
+				<displayName>ميكروسەكۋند</displayName>
+				<unitPattern count="one">{0} ميكروسەكۋند</unitPattern>
+				<unitPattern count="other">{0} ميكروسەكۋند</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">نانوسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نانوسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نانوسەكۋند</unitPattern>
+				<displayName>نانوسەكۋند</displayName>
+				<unitPattern count="one">{0} نانوسەكۋند</unitPattern>
+				<unitPattern count="other">{0} نانوسەكۋند</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">امپەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} امپەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} امپەر</unitPattern>
+				<displayName>امپەر</displayName>
+				<unitPattern count="one">{0} امپەر</unitPattern>
+				<unitPattern count="other">{0} امپەر</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">ميليامپەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليامپەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليامپەر</unitPattern>
+				<displayName>ميليامپەر</displayName>
+				<unitPattern count="one">{0} ميليامپەر</unitPattern>
+				<unitPattern count="other">{0} ميليامپەر</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
-				<displayName draft="unconfirmed">وم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} وم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} وم</unitPattern>
+				<displayName>وم</displayName>
+				<unitPattern count="one">{0} وم</unitPattern>
+				<unitPattern count="other">{0} وم</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName draft="unconfirmed">ۆولت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۆولت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۆولت</unitPattern>
+				<displayName>ۆولت</displayName>
+				<unitPattern count="one">{0} ۆولت</unitPattern>
+				<unitPattern count="other">{0} ۆولت</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<displayName draft="unconfirmed">كيلوكالوريا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوكالوريا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوكالوريا</unitPattern>
+				<displayName>كيلوكالوريا</displayName>
+				<unitPattern count="one">{0} كيلوكالوريا</unitPattern>
+				<unitPattern count="other">{0} كيلوكالوريا</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
-				<displayName draft="unconfirmed">كالوريا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كالوريا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كالوريا</unitPattern>
+				<displayName>كالوريا</displayName>
+				<unitPattern count="one">{0} كالوريا</unitPattern>
+				<unitPattern count="other">{0} كالوريا</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName draft="unconfirmed">كيلوجوۋل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كىلوجوۋل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كىلوجوۋل</unitPattern>
+				<displayName>كيلوجوۋل</displayName>
+				<unitPattern count="one">{0} كىلوجوۋل</unitPattern>
+				<unitPattern count="other">{0} كىلوجوۋل</unitPattern>
 			</unit>
 			<unit type="energy-joule">
-				<displayName draft="unconfirmed">جوۋل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جوۋل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جوۋل</unitPattern>
+				<displayName>جوۋل</displayName>
+				<unitPattern count="one">{0} جوۋل</unitPattern>
+				<unitPattern count="other">{0} جوۋل</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">كيلوۆات-ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات-ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات-ساعات</unitPattern>
+				<displayName>كيلوۆات-ساعات</displayName>
+				<unitPattern count="one">{0} كيلوۆات-ساعات</unitPattern>
+				<unitPattern count="other">{0} كيلوۆات-ساعات</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
-				<displayName draft="unconfirmed">ەلەكتونۆولت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ەلەكترونۆولت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ەلەكترونۆولت</unitPattern>
+				<displayName>ەلەكتونۆولت</displayName>
+				<unitPattern count="one">{0} ەلەكترونۆولت</unitPattern>
+				<unitPattern count="other">{0} ەلەكترونۆولت</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
-				<displayName draft="unconfirmed">بريتاندىق جىلۋ بىرلىگى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
+				<displayName>بريتاندىق جىلۋ بىرلىگى</displayName>
+				<unitPattern count="one">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
+				<unitPattern count="other">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
 			</unit>
 			<unit type="energy-therm-us">
-				<displayName draft="unconfirmed">ا ق ش تەرمى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ا ق ش تەرمى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ا ق ش تەرمى</unitPattern>
+				<displayName>ا ق ش تەرمى</displayName>
+				<unitPattern count="one">{0} ا ق ش تەرمى</unitPattern>
+				<unitPattern count="other">{0} ا ق ش تەرمى</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
-				<displayName draft="unconfirmed">فۋنت-كۇش</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش</unitPattern>
+				<displayName>فۋنت-كۇش</displayName>
+				<unitPattern count="one">{0} فۋنت-كۇش</unitPattern>
+				<unitPattern count="other">{0} فۋنت-كۇش</unitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName draft="unconfirmed">نيۋتون</displayName>
+				<displayName>نيۋتون</displayName>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName draft="unconfirmed">كيلوۆات-ساعات/100 كيلومەتىر</displayName>
+				<displayName>كيلوۆات-ساعات/100 كيلومەتىر</displayName>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">گيگاگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگاگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگاگەرس</unitPattern>
+				<displayName>گيگاگەرس</displayName>
+				<unitPattern count="one">{0} گيگاگەرس</unitPattern>
+				<unitPattern count="other">{0} گيگاگەرس</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">مەگاگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاگەرس</unitPattern>
+				<displayName>مەگاگەرس</displayName>
+				<unitPattern count="one">{0} مەگاگەرس</unitPattern>
+				<unitPattern count="other">{0} مەگاگەرس</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">كيلوگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوگەرس</unitPattern>
+				<displayName>كيلوگەرس</displayName>
+				<unitPattern count="one">{0} كيلوگەرس</unitPattern>
+				<unitPattern count="other">{0} كيلوگەرس</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<displayName draft="unconfirmed">گەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەرس</unitPattern>
+				<displayName>گەرس</displayName>
+				<unitPattern count="one">{0} گەرس</unitPattern>
+				<unitPattern count="other">{0} گەرس</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName draft="unconfirmed">جەر راديۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جەر راديۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جەر راديۋسى</unitPattern>
+				<displayName>جەر راديۋسى</displayName>
+				<unitPattern count="one">{0} جەر راديۋسى</unitPattern>
+				<unitPattern count="other">{0} جەر راديۋسى</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلومەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كيلومەتىر</perUnitPattern>
+				<displayName>كيلومەتىر</displayName>
+				<unitPattern count="one">{0} كيلومەتىر</unitPattern>
+				<unitPattern count="other">{0} كيلومەتىر</unitPattern>
+				<perUnitPattern>{0}/كيلومەتىر</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName draft="unconfirmed">مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/مەتىر</perUnitPattern>
+				<displayName>مەتىر</displayName>
+				<unitPattern count="one">{0}/مەتىر</unitPattern>
+				<unitPattern count="other">{0}/مەتىر</unitPattern>
+				<perUnitPattern>{0}/مەتىر</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">دەسيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/دەسيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/دەسيمەتىر</unitPattern>
+				<displayName>دەسيمەتىر</displayName>
+				<unitPattern count="one">{0}/دەسيمەتىر</unitPattern>
+				<unitPattern count="other">{0}/دەسيمەتىر</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/سانتيمەتىر</perUnitPattern>
+				<displayName>سانتيمەتىر</displayName>
+				<unitPattern count="one">{0}/سانتيمەتىر</unitPattern>
+				<unitPattern count="other">{0}/سانتيمەتىر</unitPattern>
+				<perUnitPattern>{0}/سانتيمەتىر</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">ميليمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمەتىر</unitPattern>
+				<displayName>ميليمەتىر</displayName>
+				<unitPattern count="one">{0} ميليمەتىر</unitPattern>
+				<unitPattern count="other">{0} ميليمەتىر</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">ميكرومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكرومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكرومەتىر</unitPattern>
+				<displayName>ميكرومەتىر</displayName>
+				<unitPattern count="one">{0} ميكرومەتىر</unitPattern>
+				<unitPattern count="other">{0} ميكرومەتىر</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">نانومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نانومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نانومەتىر</unitPattern>
+				<displayName>نانومەتىر</displayName>
+				<unitPattern count="one">{0} نانومەتىر</unitPattern>
+				<unitPattern count="other">{0} نانومەتىر</unitPattern>
 			</unit>
 			<unit type="length-picometer">
-				<displayName draft="unconfirmed">پيكومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پيكومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پيكومەتىر</unitPattern>
+				<displayName>پيكومەتىر</displayName>
+				<unitPattern count="one">{0} پيكومەتىر</unitPattern>
+				<unitPattern count="other">{0} پيكومەتىر</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName draft="unconfirmed">ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل</unitPattern>
+				<displayName>ميل</displayName>
+				<unitPattern count="one">{0} ميل</unitPattern>
+				<unitPattern count="other">{0} ميل</unitPattern>
 			</unit>
 			<unit type="length-yard">
-				<displayName draft="unconfirmed">يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يارد</unitPattern>
+				<displayName>يارد</displayName>
+				<unitPattern count="one">{0} يارد</unitPattern>
+				<unitPattern count="other">{0} يارد</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName draft="unconfirmed">فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/فۋت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/فۋت</perUnitPattern>
+				<displayName>فۋت</displayName>
+				<unitPattern count="one">{0}/فۋت</unitPattern>
+				<unitPattern count="other">{0}/فۋت</unitPattern>
+				<perUnitPattern>{0}/فۋت</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName draft="unconfirmed">ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ديۋيم</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ديۋيم</perUnitPattern>
+				<displayName>ديۋيم</displayName>
+				<unitPattern count="one">{0} ديۋيم</unitPattern>
+				<unitPattern count="other">{0} ديۋيم</unitPattern>
+				<perUnitPattern>{0}/ديۋيم</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName draft="unconfirmed">پارسەك</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پارسەك</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پارسەك</unitPattern>
+				<displayName>پارسەك</displayName>
+				<unitPattern count="one">{0} پارسەك</unitPattern>
+				<unitPattern count="other">{0} پارسەك</unitPattern>
 			</unit>
 			<unit type="length-light-year">
-				<displayName draft="unconfirmed">جارىق جىلى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جارىق جىلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جارىق جىلى</unitPattern>
+				<displayName>جارىق جىلى</displayName>
+				<unitPattern count="one">{0} جارىق جىلى</unitPattern>
+				<unitPattern count="other">{0} جارىق جىلى</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">استرونوميالىق بىرلىك</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} استرونوميالىق بىرلىك</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} استرونوميالىق بىرلىك</unitPattern>
+				<displayName>استرونوميالىق بىرلىك</displayName>
+				<unitPattern count="one">{0} استرونوميالىق بىرلىك</unitPattern>
+				<unitPattern count="other">{0} استرونوميالىق بىرلىك</unitPattern>
 			</unit>
 			<unit type="length-furlong">
-				<displayName draft="unconfirmed">فۋرلوڭ</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋرلوڭ</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋرلوڭ</unitPattern>
+				<displayName>فۋرلوڭ</displayName>
+				<unitPattern count="one">{0} فۋرلوڭ</unitPattern>
+				<unitPattern count="other">{0} فۋرلوڭ</unitPattern>
 			</unit>
 			<unit type="length-fathom">
-				<displayName draft="unconfirmed">فاتوم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فاتوم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فاتوم</unitPattern>
+				<displayName>فاتوم</displayName>
+				<unitPattern count="one">{0} فاتوم</unitPattern>
+				<unitPattern count="other">{0} فاتوم</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">تەڭىز ميلى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەڭىز ميلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەڭىز ميلى</unitPattern>
+				<displayName>تەڭىز ميلى</displayName>
+				<unitPattern count="one">{0} تەڭىز ميلى</unitPattern>
+				<unitPattern count="other">{0} تەڭىز ميلى</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<displayName draft="unconfirmed">سكانديناۆيالىق ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سكانديناۆيالىق ميلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سكانديناۆيالىق ميلى</unitPattern>
+				<displayName>سكانديناۆيالىق ميل</displayName>
+				<unitPattern count="one">{0} سكانديناۆيالىق ميلى</unitPattern>
+				<unitPattern count="other">{0} سكانديناۆيالىق ميلى</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<displayName draft="unconfirmed">پۋنكت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پۋنكت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پۋنكت</unitPattern>
+				<displayName>پۋنكت</displayName>
+				<unitPattern count="one">{0} پۋنكت</unitPattern>
+				<unitPattern count="other">{0} پۋنكت</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName draft="unconfirmed">كۇن راديۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن راديۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن راديۋسى</unitPattern>
+				<displayName>كۇن راديۋسى</displayName>
+				<unitPattern count="one">{0} كۇن راديۋسى</unitPattern>
+				<unitPattern count="other">{0} كۇن راديۋسى</unitPattern>
 			</unit>
 			<unit type="light-lux">
-				<displayName draft="unconfirmed">ليۋكس</displayName>
+				<displayName>ليۋكس</displayName>
 			</unit>
 			<unit type="light-candela">
-				<displayName draft="unconfirmed">كاندەلا</displayName>
+				<displayName>كاندەلا</displayName>
 			</unit>
 			<unit type="light-lumen">
-				<displayName draft="unconfirmed">ليۋمەن</displayName>
+				<displayName>ليۋمەن</displayName>
 			</unit>
 			<unit type="light-solar-luminosity">
-				<displayName draft="unconfirmed">كۇن جارىقتىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن جارىقتىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن جارىقتىعى</unitPattern>
+				<displayName>كۇن جارىقتىعى</displayName>
+				<unitPattern count="one">{0} كۇن جارىقتىعى</unitPattern>
+				<unitPattern count="other">{0} كۇن جارىقتىعى</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName draft="unconfirmed">مەتىرلىك توننا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} توننا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} توننا</unitPattern>
+				<displayName>مەتىرلىك توننا</displayName>
+				<unitPattern count="one">{0} توننا</unitPattern>
+				<unitPattern count="other">{0} توننا</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">كيلوگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوگرام</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كيلوگرام</perUnitPattern>
+				<displayName>كيلوگرام</displayName>
+				<unitPattern count="one">{0} كگ</unitPattern>
+				<unitPattern count="other">{0} كگ</unitPattern>
+				<perUnitPattern>{0}‎/kg</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">گرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گرام</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/گرام</perUnitPattern>
+				<displayName>گرام</displayName>
+				<unitPattern count="one">{0} گرام</unitPattern>
+				<unitPattern count="other">{0} گرام</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName draft="unconfirmed">ميليگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليگرام</unitPattern>
+				<unitPattern count="one">{0} ميليگرام</unitPattern>
+				<unitPattern count="other">{0} ميليگرام</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">ميكروگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكروگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكروگرام</unitPattern>
+				<displayName>ميكروگرام</displayName>
+				<unitPattern count="one">{0} ميكروگرام</unitPattern>
+				<unitPattern count="other">{0} ميكروگرام</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<displayName draft="unconfirmed">توننا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تن</unitPattern>
+				<displayName>توننا</displayName>
+				<unitPattern count="one">{0} تن</unitPattern>
+				<unitPattern count="other">{0} تن</unitPattern>
 			</unit>
 			<unit type="mass-stone">
-				<displayName draft="unconfirmed">ستوۋن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ستوۋن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ستوۋن</unitPattern>
+				<displayName>ستوۋن</displayName>
+				<unitPattern count="one">{0} ستوۋن</unitPattern>
+				<unitPattern count="other">{0} ستوۋن</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName draft="unconfirmed">فۋنت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/فۋنت</perUnitPattern>
+				<unitPattern count="one">{0} فۋنت</unitPattern>
+				<unitPattern count="other">{0} فۋنت</unitPattern>
+				<perUnitPattern>{0}/فۋنت</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۋنسيا</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ۋنسيا</perUnitPattern>
+				<displayName>ۋنسيا</displayName>
+				<unitPattern count="one">{0} ۋنسيا</unitPattern>
+				<unitPattern count="other">{0} ۋنسيا</unitPattern>
+				<perUnitPattern>{0}/ۋنسيا</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">تروي ۋنسياسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تروۋ ۋنسياسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تروۋ ۋنسياسى</unitPattern>
+				<displayName>تروي ۋنسياسى</displayName>
+				<unitPattern count="one">{0} تروۋ ۋنسياسى</unitPattern>
+				<unitPattern count="other">{0} تروۋ ۋنسياسى</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName draft="unconfirmed">كارات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كارات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كارات</unitPattern>
+				<displayName>كارات</displayName>
+				<unitPattern count="one">{0} كارات</unitPattern>
+				<unitPattern count="other">{0} كارات</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
-				<displayName draft="unconfirmed">دالتون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دالتون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دالتون</unitPattern>
+				<displayName>دالتون</displayName>
+				<unitPattern count="one">{0} دالتون</unitPattern>
+				<unitPattern count="other">{0} دالتون</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName draft="unconfirmed">جەر ماسساسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جەر ماسساسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جەر ماسساسى</unitPattern>
+				<displayName>جەر ماسساسى</displayName>
+				<unitPattern count="one">{0} M⊕</unitPattern>
+				<unitPattern count="other">{0} M⊕</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
-				<displayName draft="unconfirmed">كۇن ماسساسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن ماسساسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن ماسساسى</unitPattern>
+				<displayName>كۇن ماسساسى</displayName>
+				<unitPattern count="one">{0} M☉</unitPattern>
+				<unitPattern count="other">{0} M☉</unitPattern>
 			</unit>
 			<unit type="mass-grain">
-				<displayName draft="unconfirmed">گران</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گران</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گران</unitPattern>
+				<displayName>گران</displayName>
+				<unitPattern count="one">{0} گران</unitPattern>
+				<unitPattern count="other">{0} گران</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName draft="unconfirmed">گيگاۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگاۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگاۆات</unitPattern>
+				<displayName>گيگاۆات</displayName>
+				<unitPattern count="one">{0} گيگاۆات</unitPattern>
+				<unitPattern count="other">{0} گيگاۆات</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName draft="unconfirmed">مەگاۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاۆات</unitPattern>
+				<displayName>مەگاۆات</displayName>
+				<unitPattern count="one">{0} مەگاۆات</unitPattern>
+				<unitPattern count="other">{0} مەگاۆات</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName draft="unconfirmed">كيلوۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات</unitPattern>
+				<displayName>كيلوۆات</displayName>
+				<unitPattern count="one">{0} كيلوۆات</unitPattern>
+				<unitPattern count="other">{0} كيلوۆات</unitPattern>
 			</unit>
 			<unit type="power-watt">
-				<displayName draft="unconfirmed">ۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۆات</unitPattern>
+				<displayName>ۆات</displayName>
+				<unitPattern count="one">{0} ۆات</unitPattern>
+				<unitPattern count="other">{0} ۆات</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<displayName draft="unconfirmed">ميليۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليۆات</unitPattern>
+				<displayName>ميليۆات</displayName>
+				<unitPattern count="one">{0} ميليۆات</unitPattern>
+				<unitPattern count="other">{0} ميليۆات</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<displayName draft="unconfirmed">ات كۇشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ات كۇشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ات كۇشى</unitPattern>
+				<displayName>ات كۇشى</displayName>
+				<unitPattern count="one">{0} ات كۇشى</unitPattern>
+				<unitPattern count="other">{0} ات كۇشى</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName draft="unconfirmed">ميليمەتىر سىناپ باعاناسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
+				<displayName>ميليمەتىر سىناپ باعاناسى</displayName>
+				<unitPattern count="one">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
+				<unitPattern count="other">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>مەركۋري ءديۋيمى</displayName>
+				<unitPattern count="one">{0} مەركۋري ءديۋيمى</unitPattern>
+				<unitPattern count="other">{0} مەركۋري ءديۋيمى</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName draft="unconfirmed">فۋنت-كۇش/شارشى ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
+				<displayName>فۋنت-كۇش/شارشى ديۋيم</displayName>
+				<unitPattern count="one">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
+				<unitPattern count="other">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName draft="unconfirmed">ديۋيم سىناپ باعاناسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ديۋيم سىناپ باعاناسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ديۋيم سىناپ باعاناسى</unitPattern>
+				<displayName>ديۋيم سىناپ باعاناسى</displayName>
+				<unitPattern count="one">{0} ديۋيم سىناپ باعاناسى</unitPattern>
+				<unitPattern count="other">{0} ديۋيم سىناپ باعاناسى</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
-				<displayName draft="unconfirmed">بار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بار</unitPattern>
+				<displayName>بار</displayName>
+				<unitPattern count="one">{0} بار</unitPattern>
+				<unitPattern count="other">{0} بار</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">ميليبار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليبار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليبار</unitPattern>
+				<displayName>ميليبار</displayName>
+				<unitPattern count="one">{0} ميليبار</unitPattern>
+				<unitPattern count="other">{0} ميليبار</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
-				<displayName draft="unconfirmed">اتموسفەرا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اتموسفەرا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اتموسفەرا</unitPattern>
+				<displayName>اتموسفەرا</displayName>
+				<unitPattern count="one">{0} اتموسفەرا</unitPattern>
+				<unitPattern count="other">{0} اتموسفەرا</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
-				<displayName draft="unconfirmed">پاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پاسكال</unitPattern>
+				<displayName>پاسكال</displayName>
+				<unitPattern count="one">{0} پاسكال</unitPattern>
+				<unitPattern count="other">{0} پاسكال</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName draft="unconfirmed">گەكتوپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتوپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتوپاسكال</unitPattern>
+				<displayName>گەكتوپاسكال</displayName>
+				<unitPattern count="one">{0} گەكتوپاسكال</unitPattern>
+				<unitPattern count="other">{0} گەكتوپاسكال</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
-				<displayName draft="unconfirmed">كيلوپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوپاسكال</unitPattern>
+				<displayName>كيلوپاسكال</displayName>
+				<unitPattern count="one">{0} كيلوپاسكال</unitPattern>
+				<unitPattern count="other">{0} كيلوپاسكال</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
-				<displayName draft="unconfirmed">مەگاپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاپاسكال</unitPattern>
+				<displayName>مەگاپاسكال</displayName>
+				<unitPattern count="one">{0} مەگاپاسكال</unitPattern>
+				<unitPattern count="other">{0} مەگاپاسكال</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">كيلومەتىر/ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلومەتىر/ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلومەتىر/ساعات</unitPattern>
+				<displayName>كيلومەتىر/ساعات</displayName>
+				<unitPattern count="one">{0} كيلومەتىر/ساعات</unitPattern>
+				<unitPattern count="other">{0} كيلومەتىر/ساعات</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName draft="unconfirmed">مەتىر/سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىر/سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىر/سەكۋند</unitPattern>
+				<displayName>مەتىر/سەكۋند</displayName>
+				<unitPattern count="one">{0} مەتىر/سەكۋند</unitPattern>
+				<unitPattern count="other">{0} مەتىر/سەكۋند</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">ميل/ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/ساعات</unitPattern>
+				<displayName>ميل/ساعات</displayName>
+				<unitPattern count="one">{0} ميل/ساعات</unitPattern>
+				<unitPattern count="other">{0} ميل/ساعات</unitPattern>
 			</unit>
 			<unit type="speed-knot">
-				<displayName draft="unconfirmed">ءتۇيىن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ءتۇيىن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ءتۇيىن</unitPattern>
+				<displayName>ءتۇيىن</displayName>
+				<unitPattern count="one">{0} ءتۇيىن</unitPattern>
+				<unitPattern count="other">{0} ءتۇيىن</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName draft="unconfirmed">بوفورت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بوفورت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بوفورت</unitPattern>
+				<displayName>بوفورت</displayName>
+				<unitPattern count="one">{0} بوفورت</unitPattern>
+				<unitPattern count="other">{0} بوفورت</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">سەلسي گرادۋسى</displayName>
+				<displayName>سەلسي گرادۋسى</displayName>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName draft="unconfirmed">فارانگەيت گرادۋسى</displayName>
+				<displayName>فارانگەيت گرادۋسى</displayName>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">كەلۆين</displayName>
+				<displayName>كەلۆين</displayName>
 			</unit>
 			<unit type="torque-pound-force-foot">
-				<displayName draft="unconfirmed">فۋنت-كۇش-فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش-فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش-فۋت</unitPattern>
+				<displayName>فۋنت-كۇش-فۋت</displayName>
+				<unitPattern count="one">{0} فۋنت-كۇش-فۋت</unitPattern>
+				<unitPattern count="other">{0} فۋنت-كۇش-فۋت</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<displayName draft="unconfirmed">نيۋتون-مەتىر</displayName>
+				<displayName>نيۋتون-مەتىر</displayName>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName draft="unconfirmed">تەكشە كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە كيلومەتىر</unitPattern>
+				<displayName>تەكشە كيلومەتىر</displayName>
+				<unitPattern count="one">{0} تەكشە كيلومەتىر</unitPattern>
+				<unitPattern count="other">{0} تەكشە كيلومەتىر</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName draft="unconfirmed">تەكشە مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/تەكشە مەتىر</perUnitPattern>
+				<displayName>تەكشە مەتىر</displayName>
+				<unitPattern count="one">{0} تەكشە مەتىر</unitPattern>
+				<unitPattern count="other">{0} تەكشە مەتىر</unitPattern>
+				<perUnitPattern>{0}/تەكشە مەتىر</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<displayName draft="unconfirmed">تەكشە سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/تەكشە سانتيمەتىر</perUnitPattern>
+				<displayName>تەكشە سانتيمەتىر</displayName>
+				<unitPattern count="one">{0} تەكشە سانتيمەتىر</unitPattern>
+				<unitPattern count="other">{0} تەكشە سانتيمەتىر</unitPattern>
+				<perUnitPattern>{0}/تەكشە سانتيمەتىر</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName draft="unconfirmed">تەكشە ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە ميل</unitPattern>
+				<displayName>تەكشە ميل</displayName>
+				<unitPattern count="one">{0} تەكشە ميل</unitPattern>
+				<unitPattern count="other">{0} تەكشە ميل</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName draft="unconfirmed">تەكشە يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە يارد</unitPattern>
+				<displayName>تەكشە يارد</displayName>
+				<unitPattern count="one">{0} تەكشە يارد</unitPattern>
+				<unitPattern count="other">{0} تەكشە يارد</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
-				<displayName draft="unconfirmed">تەكشە فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە فۋت</unitPattern>
+				<displayName>تەكشە فۋت</displayName>
+				<unitPattern count="one">{0} تەكشە فۋت</unitPattern>
+				<unitPattern count="other">{0} تەكشە فۋت</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
-				<displayName draft="unconfirmed">تەكشە ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە ديۋيم</unitPattern>
+				<displayName>تەكشە ديۋيم</displayName>
+				<unitPattern count="one">{0} تەكشە ديۋيم</unitPattern>
+				<unitPattern count="other">{0} تەكشە ديۋيم</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
-				<displayName draft="unconfirmed">مەگاليتر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاليتر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاليتر</unitPattern>
+				<displayName>مەگاليتر</displayName>
+				<unitPattern count="one">{0} مەگاليتر</unitPattern>
+				<unitPattern count="other">{0} مەگاليتر</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
-				<displayName draft="unconfirmed">گەكتوليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتوليرىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتوليرىر</unitPattern>
+				<displayName>گەكتوليتىر</displayName>
+				<unitPattern count="one">{0} گەكتوليرىر</unitPattern>
+				<unitPattern count="other">{0} گەكتوليرىر</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName draft="unconfirmed">ليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ليتىر</perUnitPattern>
+				<displayName>ليتىر</displayName>
+				<unitPattern count="one">{0} ليتىر</unitPattern>
+				<unitPattern count="other">{0} ليتىر</unitPattern>
+				<perUnitPattern>{0}/ليتىر</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">دەسيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دەسيليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دەسيليتىر</unitPattern>
+				<displayName>دەسيليتىر</displayName>
+				<unitPattern count="one">{0} دەسيليتىر</unitPattern>
+				<unitPattern count="other">{0} دەسيليتىر</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
-				<displayName draft="unconfirmed">سانتيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سانتيليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سانتيليتىر</unitPattern>
+				<displayName>سانتيليتىر</displayName>
+				<unitPattern count="one">{0} سانتيليتىر</unitPattern>
+				<unitPattern count="other">{0} سانتيليتىر</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
-				<displayName draft="unconfirmed">ميليليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليليتىر</unitPattern>
+				<displayName>ميليليتىر</displayName>
+				<unitPattern count="one">{0} ميليليتىر</unitPattern>
+				<unitPattern count="other">{0} ميليليتىر</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
-				<displayName draft="unconfirmed">مەتىرلىك پينتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك پينتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك پينتا</unitPattern>
+				<displayName>مەتىرلىك پينتا</displayName>
+				<unitPattern count="one">{0} مەتىرلىك پينتا</unitPattern>
+				<unitPattern count="other">{0} مەتىرلىك پينتا</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
-				<displayName draft="unconfirmed">مەتىرلىك كەسە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك كەسە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك كەسە</unitPattern>
+				<displayName>مەتىرلىك كەسە</displayName>
+				<unitPattern count="one">{0} مەتىرلىك كەسە</unitPattern>
+				<unitPattern count="other">{0} مەتىرلىك كەسە</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>سۇ. ۋن.</displayName>
+				<unitPattern count="one">{0} سۇ. ۋن.</unitPattern>
+				<unitPattern count="other">{0} سۇ. ۋن.</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">اكر-فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اكر-فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اكر-فۋت</unitPattern>
+				<displayName>اكر-فۋت</displayName>
+				<unitPattern count="one">{0} اكر-فۋت</unitPattern>
+				<unitPattern count="other">{0} اكر-فۋت</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">بۋشەل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بۋشەل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بۋشەل</unitPattern>
+				<displayName>بۋشەل</displayName>
+				<unitPattern count="one">{0} بۋشەل</unitPattern>
+				<unitPattern count="other">{0} بۋشەل</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName draft="unconfirmed">گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گاللون</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/گاللون</perUnitPattern>
+				<displayName>گاللون</displayName>
+				<unitPattern count="one">{0} گاللون</unitPattern>
+				<unitPattern count="other">{0} گاللون</unitPattern>
+				<perUnitPattern>{0}/گاللون</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<displayName draft="unconfirmed">يمپ گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ گاللون</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} يمپ گاللون</perUnitPattern>
+				<displayName>يمپ گاللون</displayName>
+				<unitPattern count="one">{0} يمپ گاللون</unitPattern>
+				<unitPattern count="other">{0} يمپ گاللون</unitPattern>
+				<perUnitPattern>{0} يمپ گاللون</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
-				<displayName draft="unconfirmed">كۆارتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۆارتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۆارتا</unitPattern>
+				<displayName>كۆارتا</displayName>
+				<unitPattern count="one">{0} كۆارتا</unitPattern>
+				<unitPattern count="other">{0} كۆارتا</unitPattern>
 			</unit>
 			<unit type="volume-pint">
-				<displayName draft="unconfirmed">پينتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پينتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پينتا</unitPattern>
+				<displayName>پينتا</displayName>
+				<unitPattern count="one">{0} پينتا</unitPattern>
+				<unitPattern count="other">{0} پينتا</unitPattern>
 			</unit>
 			<unit type="volume-cup">
-				<displayName draft="unconfirmed">كەسە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كەسە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كەسە</unitPattern>
+				<displayName>كەسە</displayName>
+				<unitPattern count="one">{0} كەسە</unitPattern>
+				<unitPattern count="other">{0} كەسە</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
-				<displayName draft="unconfirmed">سۇيىق ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سۇيىق ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سۇيىق ۋنسيا</unitPattern>
+				<displayName>سۇيىق ۋنسيا</displayName>
+				<unitPattern count="one">{0} سۇيىق ۋنسيا</unitPattern>
+				<unitPattern count="other">{0} سۇيىق ۋنسيا</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName draft="unconfirmed">يمپ سۇيىق ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ سۇيىق ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ سۇيىق ۋنسيا</unitPattern>
+				<displayName>يمپ سۇيىق ۋنسيا</displayName>
+				<unitPattern count="one">{0} يمپ سۇيىق ۋنسيا</unitPattern>
+				<unitPattern count="other">{0} يمپ سۇيىق ۋنسيا</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
-				<displayName draft="unconfirmed">اس قاسىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اس قاسىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اس قاسىق</unitPattern>
+				<displayName>اس قاسىق</displayName>
+				<unitPattern count="one">{0} اس قاسىق</unitPattern>
+				<unitPattern count="other">{0} اس قاسىق</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
-				<displayName draft="unconfirmed">شاي قاسىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شاي قاسىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شاي قاسىق</unitPattern>
+				<displayName>شاي قاسىق</displayName>
+				<unitPattern count="one">{0} شاي قاسىق</unitPattern>
+				<unitPattern count="other">{0} شاي قاسىق</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
-				<displayName draft="unconfirmed">باررەل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} باررەل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} باررەل</unitPattern>
+				<displayName>باررەل</displayName>
+				<unitPattern count="one">{0} باررەل</unitPattern>
+				<unitPattern count="other">{0} باررەل</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName draft="unconfirmed">دەسەرت قاسىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دەسەرت قاسىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دەسەرت قاسىعى</unitPattern>
+				<displayName>دەسەرت قاسىعى</displayName>
+				<unitPattern count="one">{0} دەسەرت قاسىعى</unitPattern>
+				<unitPattern count="other">{0} دەسەرت قاسىعى</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<displayName draft="unconfirmed">يمپ دەسەرت قاسىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ دەسەرت قاسىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ دەسەرت قاسىعى</unitPattern>
+				<displayName>يمپ دەسەرت قاسىعى</displayName>
+				<unitPattern count="one">{0} يمپ دەسەرت قاسىعى</unitPattern>
+				<unitPattern count="other">{0} يمپ دەسەرت قاسىعى</unitPattern>
 			</unit>
 			<unit type="volume-drop">
-				<displayName draft="unconfirmed">تامشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تامشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تامشى</unitPattern>
+				<displayName>تامشى</displayName>
+				<unitPattern count="one">{0} تامشى</unitPattern>
+				<unitPattern count="other">{0} تامشى</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName draft="unconfirmed">دراحما</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دراحما</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دراحما</unitPattern>
+				<displayName>دراحما</displayName>
+				<unitPattern count="one">{0} دراحما</unitPattern>
+				<unitPattern count="other">{0} دراحما</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
-				<displayName draft="unconfirmed">جيگگەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جيگگەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جيگگەر</unitPattern>
+				<displayName>جيگگەر</displayName>
+				<unitPattern count="one">{0} جيگگەر</unitPattern>
+				<unitPattern count="other">{0} جيگگەر</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
-				<displayName draft="unconfirmed">شوكىم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شوكىم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شوكىم</unitPattern>
+				<displayName>شوكىم</displayName>
+				<unitPattern count="one">{0} شوكىم</unitPattern>
+				<unitPattern count="other">{0} شوكىم</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
-				<displayName draft="unconfirmed">يمپ كۆارتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ كۆارتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ كۆارتا</unitPattern>
+				<displayName>يمپ كۆارتا</displayName>
+				<unitPattern count="one">{0} يمپ كۆارتا</unitPattern>
+				<unitPattern count="other">{0} يمپ كۆارتا</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>ستەراديان</displayName>
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>كاتال</displayName>
+				<unitPattern count="one">{0} كاتال</unitPattern>
+				<unitPattern count="other">{0} كاتال</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>كۋلون</displayName>
+				<unitPattern count="one">{0} كۋلون</unitPattern>
+				<unitPattern count="other">{0} كۋلون</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>فاراد</displayName>
+				<unitPattern count="one">{0} فاراد</unitPattern>
+				<unitPattern count="other">{0} فاراد</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>حەنري</displayName>
+				<unitPattern count="one">{0} حەنري</unitPattern>
+				<unitPattern count="other">{0} حەنري</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>سيمەنس</displayName>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>كالو.</displayName>
+				<unitPattern count="one">{0} كالو.</unitPattern>
+				<unitPattern count="other">{0} كالو.</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>بەككەرەل</displayName>
+				<unitPattern count="one">{0} بك</unitPattern>
+				<unitPattern count="other">{0} بك</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>زيۆەرت</displayName>
+				<unitPattern count="one">{0} زيۆەرت</unitPattern>
+				<unitPattern count="other">{0} زيۆەرت</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>گىرەي</displayName>
+				<unitPattern count="one">{0} گىرەي</unitPattern>
+				<unitPattern count="other">{0} گىرەي</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>كيلوگرام-كۇش</displayName>
+				<unitPattern count="one">{0} كيلوگرام-كۇش</unitPattern>
+				<unitPattern count="other">{0} كيلوگرام-كۇش</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ت</displayName>
+				<unitPattern count="one">{0} تەسلا</unitPattern>
+				<unitPattern count="other">{0} تەسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ۋەبەر</displayName>
+				<unitPattern count="one">{0} ۋەبەر</unitPattern>
+				<unitPattern count="other">{0} ۋەبەر</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName draft="unconfirmed">جارىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جارىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جارىق</unitPattern>
+				<displayName>جارىق</displayName>
+				<unitPattern count="one">{0} جارىق</unitPattern>
+				<unitPattern count="other">{0} جارىق</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName draft="unconfirmed">ميللياردتىق ۇلەس</displayName>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ميللياردتىق ۇلەس</displayName>
+				<unitPattern count="one">{0} ميللياردتىق ۇلەس</unitPattern>
+				<unitPattern count="other">{0} ميللياردتىق ۇلەس</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName draft="unconfirmed">ءتۇن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ءتۇن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ءتۇن</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ءتۇن</perUnitPattern>
+				<displayName>ءتۇن</displayName>
+				<unitPattern count="one">{0} ءتۇن</unitPattern>
+				<unitPattern count="other">{0} ءتۇن</unitPattern>
+				<perUnitPattern>{0}/ءتۇن</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName draft="unconfirmed">باعىت</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} ش</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} س</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} و</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} ب</coordinateUnitPattern>
+				<displayName>باعىت</displayName>
+				<coordinateUnitPattern type="east">{0} ش</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} س</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} و</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ب</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<compoundUnit type="10p-1">
-				<unitPrefixPattern draft="unconfirmed">د{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-2">
-				<unitPrefixPattern draft="unconfirmed">س{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-3">
-				<unitPrefixPattern draft="unconfirmed">مل{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern draft="unconfirmed">مك{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-9">
-				<unitPrefixPattern draft="unconfirmed">ن{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-12">
-				<unitPrefixPattern draft="unconfirmed">پ{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-15">
-				<unitPrefixPattern draft="unconfirmed">ف{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-18">
-				<unitPrefixPattern draft="unconfirmed">ا{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-21">
-				<unitPrefixPattern draft="unconfirmed">ز{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-24">
-				<unitPrefixPattern draft="unconfirmed">ي{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-27">
-				<unitPrefixPattern draft="unconfirmed">ر{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p-30">
-				<unitPrefixPattern draft="unconfirmed">ك{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p1">
-				<unitPrefixPattern draft="unconfirmed">دا{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p2">
-				<unitPrefixPattern draft="unconfirmed">گ{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p3">
-				<unitPrefixPattern draft="unconfirmed">كل{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p6">
-				<unitPrefixPattern draft="unconfirmed">مگ{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p9">
-				<unitPrefixPattern draft="unconfirmed">گگ{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p12">
-				<unitPrefixPattern draft="unconfirmed">ت{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p15">
-				<unitPrefixPattern draft="unconfirmed">پت{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p18">
-				<unitPrefixPattern draft="unconfirmed">ە{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p21">
-				<unitPrefixPattern draft="unconfirmed">زت{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p24">
-				<unitPrefixPattern draft="unconfirmed">يت{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p27">
-				<unitPrefixPattern draft="unconfirmed">رن{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p30">
-				<unitPrefixPattern draft="unconfirmed">كت{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p1">
-				<unitPrefixPattern draft="unconfirmed">كي{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p2">
-				<unitPrefixPattern draft="unconfirmed">مب{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p3">
-				<unitPrefixPattern draft="unconfirmed">گي{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p4">
-				<unitPrefixPattern draft="unconfirmed">تب{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p5">
-				<unitPrefixPattern draft="unconfirmed">پب{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p6">
-				<unitPrefixPattern draft="unconfirmed">ەب{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p7">
-				<unitPrefixPattern draft="unconfirmed">زب{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p8">
-				<unitPrefixPattern draft="unconfirmed">يب{0}</unitPrefixPattern>
-			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<displayName draft="unconfirmed">تارتىلىس كۇشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تارتىلىس كۇشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تارتىلىس كۇشى</unitPattern>
+			<unit type="concentr-part">
+				<displayName>بولىك</displayName>
+				<unitPattern count="one">{0} بولىك</unitPattern>
+				<unitPattern count="other">{0} بولىك</unitPattern>
 			</unit>
-			<unit type="acceleration-meter-per-square-second">
-				<displayName draft="unconfirmed">مەتىر/شارشى سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىر/شارشى سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىر/شارشى سەكۋند</unitPattern>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} ميلليوندىق ۇلەس</unitPattern>
+				<unitPattern count="other">{0} ميلليوندىق ۇلەس</unitPattern>
 			</unit>
-			<unit type="angle-revolution">
-				<displayName draft="unconfirmed">اينالىم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اينالىم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اينالىم</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<displayName draft="unconfirmed">راديان</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} راديان</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} راديان</unitPattern>
-			</unit>
-			<unit type="angle-degree">
-				<displayName draft="unconfirmed">گرادۋس</displayName>
-			</unit>
-			<unit type="angle-arc-minute">
-				<displayName draft="unconfirmed">اركمينۋت</displayName>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName draft="unconfirmed">اركسەكۋند</displayName>
-			</unit>
-			<unit type="area-square-kilometer">
-				<displayName draft="unconfirmed">شارشى كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/شارشى كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/شارشى كيلومەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى كيلومەتىر</perUnitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<displayName draft="unconfirmed">گەكتار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتار</unitPattern>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName draft="unconfirmed">شارشى مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى مەتىر</perUnitPattern>
-			</unit>
-			<unit type="area-square-centimeter">
-				<displayName draft="unconfirmed">شارشى سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى سانتيمەتىر</perUnitPattern>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName draft="unconfirmed">شارشى ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى ميل</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/شارشى ميل</perUnitPattern>
-			</unit>
-			<unit type="area-acre">
-				<displayName draft="unconfirmed">اكر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اكر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اكر</unitPattern>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName draft="unconfirmed">شارشى يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى يارد</unitPattern>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName draft="unconfirmed">شارشى فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى فۋت</unitPattern>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName draft="unconfirmed">شارشى ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شارشى ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شارشى ديۋيم</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} شارشى ديۋيم</perUnitPattern>
-			</unit>
-			<unit type="area-dunam">
-				<displayName draft="unconfirmed">دۋنام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دۋنام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دۋنام</unitPattern>
-			</unit>
-			<unit type="concentr-karat">
-				<displayName draft="unconfirmed">كارات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كارات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كارات</unitPattern>
-			</unit>
-			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<displayName draft="unconfirmed">ميليگرام/دەسيليتىر</displayName>
-			</unit>
-			<unit type="concentr-millimole-per-liter">
-				<displayName draft="unconfirmed">ميليمول/ليتىر</displayName>
-			</unit>
-			<unit type="concentr-item">
-				<displayName draft="unconfirmed">ەلەمەنت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ەلەمەنت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ەلەمەنت</unitPattern>
-			</unit>
-			<unit type="concentr-permillion">
-				<displayName draft="unconfirmed">ميلليوندىق ۇلەس</displayName>
-			</unit>
-			<unit type="concentr-mole">
-				<displayName draft="unconfirmed">مول</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مول</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مول</unitPattern>
-			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName draft="unconfirmed">ليتىر/كيلومەتىر</displayName>
-			</unit>
-			<unit type="consumption-liter-per-100-kilometer">
-				<displayName draft="unconfirmed">ليتىر/100 كيلومەتىر</displayName>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName draft="unconfirmed">ميل/گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/گاللون</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon-imperial">
-				<displayName draft="unconfirmed">ميل/يمپ گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/يمپ گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/يمپ گاللون</unitPattern>
+			<unit type="concentr-ofglucose">
+				<displayName>گليۋكوزا</displayName>
+				<unitPattern count="one">{0} گليۋكوزا</unitPattern>
+				<unitPattern count="other">{0} گليۋكوزا</unitPattern>
 			</unit>
 			<unit type="digital-byte">
-				<displayName draft="unconfirmed">B</displayName>
-			</unit>
-			<unit type="duration-century">
-				<displayName draft="unconfirmed">عاسىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} عاسىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} عاسىر</unitPattern>
-			</unit>
-			<unit type="duration-decade">
-				<displayName draft="unconfirmed">ون جىلدىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ون جىلدىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ون جىلدىق</unitPattern>
-			</unit>
-			<unit type="duration-year">
-				<displayName draft="unconfirmed">جىل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جىل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جىل</unitPattern>
-				<perUnitPattern draft="unconfirmed">جىلىنا {0}</perUnitPattern>
-			</unit>
-			<unit type="duration-quarter">
-				<displayName draft="unconfirmed">توقسان</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} توقسان</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} توقسان</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/توقسان</perUnitPattern>
-			</unit>
-			<unit type="duration-month">
-				<displayName draft="unconfirmed">اي</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اي</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اي</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/اي</perUnitPattern>
-			</unit>
-			<unit type="duration-week">
-				<displayName draft="unconfirmed">اپتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اپتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اپتا</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/اپتا</perUnitPattern>
-			</unit>
-			<unit type="duration-day">
-				<displayName draft="unconfirmed">كۇن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كۇن</perUnitPattern>
-			</unit>
-			<unit type="duration-hour">
-				<displayName draft="unconfirmed">ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ساعات</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ساعات</perUnitPattern>
-			</unit>
-			<unit type="duration-minute">
-				<displayName draft="unconfirmed">مينۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مينۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مينۋت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/مينۋت</perUnitPattern>
-			</unit>
-			<unit type="duration-second">
-				<displayName draft="unconfirmed">سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سەكۋند</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/سەكۋند</perUnitPattern>
-			</unit>
-			<unit type="duration-millisecond">
-				<displayName draft="unconfirmed">ميليسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليسەكۋند</unitPattern>
-			</unit>
-			<unit type="duration-microsecond">
-				<displayName draft="unconfirmed">ميكروسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكروسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكروسەكۋند</unitPattern>
-			</unit>
-			<unit type="duration-nanosecond">
-				<displayName draft="unconfirmed">نانوسەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نانوسەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نانوسەكۋند</unitPattern>
-			</unit>
-			<unit type="electric-ampere">
-				<displayName draft="unconfirmed">امپەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} امپەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} امپەر</unitPattern>
-			</unit>
-			<unit type="electric-milliampere">
-				<displayName draft="unconfirmed">ميليامپەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليامپەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليامپەر</unitPattern>
-			</unit>
-			<unit type="electric-ohm">
-				<displayName draft="unconfirmed">وم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} وم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} وم</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<displayName draft="unconfirmed">ۆولت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۆولت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۆولت</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName draft="unconfirmed">كيلوكالوريا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوكالوريا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوكالوريا</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<displayName draft="unconfirmed">كالوريا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كالوريا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كالوريا</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName draft="unconfirmed">كيلوجوۋل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كىلوجوۋل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كىلوجوۋل</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName draft="unconfirmed">جوۋل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جوۋل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جوۋل</unitPattern>
-			</unit>
-			<unit type="energy-kilowatt-hour">
-				<displayName draft="unconfirmed">كيلوۆات-ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات-ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات-ساعات</unitPattern>
-			</unit>
-			<unit type="energy-electronvolt">
-				<displayName draft="unconfirmed">ەلەكتونۆولت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ەلەكترونۆولت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ەلەكترونۆولت</unitPattern>
-			</unit>
-			<unit type="energy-british-thermal-unit">
-				<displayName draft="unconfirmed">بريتاندىق جىلۋ بىرلىگى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بريتاندىق جىلۋ بىرلىگى</unitPattern>
-			</unit>
-			<unit type="energy-therm-us">
-				<displayName draft="unconfirmed">ا ق ش تەرمى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ا ق ش تەرمى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ا ق ش تەرمى</unitPattern>
-			</unit>
-			<unit type="force-pound-force">
-				<displayName draft="unconfirmed">فۋنت-كۇش</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش</unitPattern>
-			</unit>
-			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName draft="unconfirmed">كيلوۆات-ساعات/100 كيلومەتىر</displayName>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName draft="unconfirmed">گيگاگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگاگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگاگەرس</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName draft="unconfirmed">مەگاگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاگەرس</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName draft="unconfirmed">كيلوگەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوگەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوگەرس</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName draft="unconfirmed">گەرس</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەرس</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەرس</unitPattern>
-			</unit>
-			<unit type="length-earth-radius">
-				<displayName draft="unconfirmed">جەر راديۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جەر راديۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جەر راديۋسى</unitPattern>
-			</unit>
-			<unit type="length-kilometer">
-				<displayName draft="unconfirmed">كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلومەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كيلومەتىر</perUnitPattern>
-			</unit>
-			<unit type="length-meter">
-				<displayName draft="unconfirmed">مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/مەتىر</perUnitPattern>
-			</unit>
-			<unit type="length-decimeter">
-				<displayName draft="unconfirmed">دەسيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/دەسيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/دەسيمەتىر</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/سانتيمەتىر</perUnitPattern>
-			</unit>
-			<unit type="length-millimeter">
-				<displayName draft="unconfirmed">ميليمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمەتىر</unitPattern>
-			</unit>
-			<unit type="length-micrometer">
-				<displayName draft="unconfirmed">ميكرومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكرومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكرومەتىر</unitPattern>
-			</unit>
-			<unit type="length-nanometer">
-				<displayName draft="unconfirmed">نانومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} نانومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} نانومەتىر</unitPattern>
-			</unit>
-			<unit type="length-picometer">
-				<displayName draft="unconfirmed">پيكومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پيكومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پيكومەتىر</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<displayName draft="unconfirmed">ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل</unitPattern>
-			</unit>
-			<unit type="length-yard">
-				<displayName draft="unconfirmed">يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يارد</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<displayName draft="unconfirmed">فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}/فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}/فۋت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/فۋت</perUnitPattern>
-			</unit>
-			<unit type="length-inch">
-				<displayName draft="unconfirmed">ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ديۋيم</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ديۋيم</perUnitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<displayName draft="unconfirmed">پارسەك</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پارسەك</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پارسەك</unitPattern>
-			</unit>
-			<unit type="length-light-year">
-				<displayName draft="unconfirmed">جارىق جىلى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جارىق جىلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جارىق جىلى</unitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName draft="unconfirmed">استرونوميالىق بىرلىك</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} استرونوميالىق بىرلىك</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} استرونوميالىق بىرلىك</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName draft="unconfirmed">فۋرلوڭ</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋرلوڭ</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋرلوڭ</unitPattern>
-			</unit>
-			<unit type="length-fathom">
-				<displayName draft="unconfirmed">فاتوم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فاتوم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فاتوم</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<displayName draft="unconfirmed">تەڭىز ميلى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەڭىز ميلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەڭىز ميلى</unitPattern>
-			</unit>
-			<unit type="length-mile-scandinavian">
-				<displayName draft="unconfirmed">سكانديناۆيالىق ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سكانديناۆيالىق ميلى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سكانديناۆيالىق ميلى</unitPattern>
-			</unit>
-			<unit type="length-point">
-				<displayName draft="unconfirmed">پۋنكت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پۋنكت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پۋنكت</unitPattern>
-			</unit>
-			<unit type="length-solar-radius">
-				<displayName draft="unconfirmed">كۇن راديۋسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن راديۋسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن راديۋسى</unitPattern>
-			</unit>
-			<unit type="light-lux">
-				<displayName draft="unconfirmed">ليۋكس</displayName>
-			</unit>
-			<unit type="light-candela">
-				<displayName draft="unconfirmed">كاندەلا</displayName>
-			</unit>
-			<unit type="light-lumen">
-				<displayName draft="unconfirmed">ليۋمەن</displayName>
-			</unit>
-			<unit type="light-solar-luminosity">
-				<displayName draft="unconfirmed">كۇن جارىقتىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن جارىقتىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن جارىقتىعى</unitPattern>
-			</unit>
-			<unit type="mass-tonne">
-				<displayName draft="unconfirmed">مەتىرلىك توننا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} توننا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} توننا</unitPattern>
+				<displayName>B</displayName>
 			</unit>
 			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">كيلوگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوگرام</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/كيلوگرام</perUnitPattern>
+				<displayName>kg</displayName>
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+				<perUnitPattern>{0}‎/kg</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<displayName draft="unconfirmed">گرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گرام</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/گرام</perUnitPattern>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+				<perUnitPattern>{0}/g</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName draft="unconfirmed">ميليگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليگرام</unitPattern>
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0}mg</unitPattern>
+				<unitPattern count="other">{0}mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
-				<displayName draft="unconfirmed">ميكروگرام</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميكروگرام</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميكروگرام</unitPattern>
+				<unitPattern count="one">{0}μg</unitPattern>
+				<unitPattern count="other">{0}μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
-				<displayName draft="unconfirmed">توننا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} توننا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} توننا</unitPattern>
-			</unit>
-			<unit type="mass-stone">
-				<displayName draft="unconfirmed">ستوۋن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ستوۋن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ستوۋن</unitPattern>
+				<unitPattern count="one">{0}tn</unitPattern>
+				<unitPattern count="other">{0}tn</unitPattern>
 			</unit>
 			<unit type="mass-pound">
-				<displayName draft="unconfirmed">فۋنت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/فۋنت</perUnitPattern>
+				<displayName>lb</displayName>
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lb</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
-				<displayName draft="unconfirmed">ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۋنسيا</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ۋنسيا</perUnitPattern>
+				<displayName>oz</displayName>
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+				<perUnitPattern>{0}/oz</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName draft="unconfirmed">تروي ۋنسياسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تروۋ ۋنسياسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تروۋ ۋنسياسى</unitPattern>
+				<displayName>oz t</displayName>
+				<unitPattern count="one">{0}oz t</unitPattern>
+				<unitPattern count="other">{0}oz t</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName draft="unconfirmed">كارات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كارات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كارات</unitPattern>
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
-				<displayName draft="unconfirmed">دالتون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دالتون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دالتون</unitPattern>
+				<displayName>Da</displayName>
+				<unitPattern count="one">{0}Da</unitPattern>
+				<unitPattern count="other">{0}Da</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName draft="unconfirmed">جەر ماسساسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جەر ماسساسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جەر ماسساسى</unitPattern>
+				<displayName>M⊕</displayName>
+				<unitPattern count="one">{0}M⊕</unitPattern>
+				<unitPattern count="other">{0}M⊕</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
-				<displayName draft="unconfirmed">كۇن ماسساسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۇن ماسساسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۇن ماسساسى</unitPattern>
+				<displayName>M☉</displayName>
+				<unitPattern count="one">{0}M☉</unitPattern>
+				<unitPattern count="other">{0}M☉</unitPattern>
 			</unit>
 			<unit type="mass-grain">
-				<displayName draft="unconfirmed">گران</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گران</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گران</unitPattern>
+				<displayName>gr</displayName>
+				<unitPattern count="one">{0}gr</unitPattern>
+				<unitPattern count="other">{0}gr</unitPattern>
 			</unit>
-			<unit type="power-gigawatt">
-				<displayName draft="unconfirmed">گيگاۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گيگاۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گيگاۆات</unitPattern>
+			<unit type="pressure-ofhg">
+				<displayName>مەركۋري ءديۋيمى</displayName>
+				<unitPattern count="one">{0} مەركۋري ءديۋيمى</unitPattern>
+				<unitPattern count="other">{0} مەركۋري ءديۋيمى</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName draft="unconfirmed">مەگاۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاۆات</unitPattern>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>سۇ. ۋن.</displayName>
+				<unitPattern count="one">{0} سۇ. ۋن.</unitPattern>
+				<unitPattern count="other">{0} سۇ. ۋن.</unitPattern>
 			</unit>
-			<unit type="power-kilowatt">
-				<displayName draft="unconfirmed">كيلوۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوۆات</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>كاتال</displayName>
+				<unitPattern count="one">{0} كاتال</unitPattern>
+				<unitPattern count="other">{0} كاتال</unitPattern>
 			</unit>
-			<unit type="power-watt">
-				<displayName draft="unconfirmed">ۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ۆات</unitPattern>
+			<unit type="electric-coulomb">
+				<displayName>كۋلون</displayName>
+				<unitPattern count="one">{0} كۋلون</unitPattern>
+				<unitPattern count="other">{0} كۋلون</unitPattern>
 			</unit>
-			<unit type="power-milliwatt">
-				<displayName draft="unconfirmed">ميليۆات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليۆات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليۆات</unitPattern>
+			<unit type="electric-farad">
+				<displayName>فاراد</displayName>
+				<unitPattern count="one">{0} فاراد</unitPattern>
+				<unitPattern count="other">{0} فاراد</unitPattern>
 			</unit>
-			<unit type="power-horsepower">
-				<displayName draft="unconfirmed">ات كۇشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ات كۇشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ات كۇشى</unitPattern>
+			<unit type="electric-henry">
+				<displayName>حەنري</displayName>
+				<unitPattern count="one">{0} حەنري</unitPattern>
+				<unitPattern count="other">{0} حەنري</unitPattern>
 			</unit>
-			<unit type="pressure-millimeter-ofhg">
-				<displayName draft="unconfirmed">ميليمەتىر سىناپ باعاناسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليمەتىر سىناپ باعاناسى</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>كالو.</displayName>
+				<unitPattern count="one">{0} كالو.</unitPattern>
+				<unitPattern count="other">{0} كالو.</unitPattern>
 			</unit>
-			<unit type="pressure-pound-force-per-square-inch">
-				<displayName draft="unconfirmed">فۋنت-كۇش/شارشى ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش/شارشى ديۋيم</unitPattern>
+			<unit type="energy-becquerel">
+				<displayName>بەككەرەل</displayName>
+				<unitPattern count="one">{0} بك</unitPattern>
+				<unitPattern count="other">{0} بك</unitPattern>
 			</unit>
-			<unit type="pressure-inch-ofhg">
-				<displayName draft="unconfirmed">ديۋيم سىناپ باعاناسى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ديۋيم سىناپ باعاناسى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ديۋيم سىناپ باعاناسى</unitPattern>
+			<unit type="energy-sievert">
+				<displayName>زيۆەرت</displayName>
+				<unitPattern count="one">{0} زيۆەرت</unitPattern>
+				<unitPattern count="other">{0} زيۆەرت</unitPattern>
 			</unit>
-			<unit type="pressure-bar">
-				<displayName draft="unconfirmed">بار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بار</unitPattern>
+			<unit type="energy-gray">
+				<displayName>گىرەي</displayName>
+				<unitPattern count="one">{0} گىرەي</unitPattern>
+				<unitPattern count="other">{0} گىرەي</unitPattern>
 			</unit>
-			<unit type="pressure-millibar">
-				<displayName draft="unconfirmed">ميليبار</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليبار</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليبار</unitPattern>
+			<unit type="force-kilogram-force">
+				<displayName>كيلوگرام-كۇش</displayName>
+				<unitPattern count="one">{0} كيلوگرام-كۇش</unitPattern>
+				<unitPattern count="other">{0} كيلوگرام-كۇش</unitPattern>
 			</unit>
-			<unit type="pressure-atmosphere">
-				<displayName draft="unconfirmed">اتموسفەرا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اتموسفەرا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اتموسفەرا</unitPattern>
+			<unit type="magnetic-tesla">
+				<displayName>ت</displayName>
+				<unitPattern count="one">{0} ت</unitPattern>
+				<unitPattern count="other">{0} ت</unitPattern>
 			</unit>
-			<unit type="pressure-pascal">
-				<displayName draft="unconfirmed">پاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پاسكال</unitPattern>
+			<unit type="magnetic-weber">
+				<displayName>ۋەبەر</displayName>
+				<unitPattern count="one">{0} ۋەبەر</unitPattern>
+				<unitPattern count="other">{0} ۋەبەر</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName draft="unconfirmed">گەكتوپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتوپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتوپاسكال</unitPattern>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} ميللياردتىق ۇلەس</unitPattern>
+				<unitPattern count="other">{0} ميللياردتىق ۇلەس</unitPattern>
 			</unit>
-			<unit type="pressure-kilopascal">
-				<displayName draft="unconfirmed">كيلوپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلوپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلوپاسكال</unitPattern>
-			</unit>
-			<unit type="pressure-megapascal">
-				<displayName draft="unconfirmed">مەگاپاسكال</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاپاسكال</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاپاسكال</unitPattern>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName draft="unconfirmed">كيلومەتىر/ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كيلومەتىر/ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كيلومەتىر/ساعات</unitPattern>
-			</unit>
-			<unit type="speed-meter-per-second">
-				<displayName draft="unconfirmed">مەتىر/سەكۋند</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىر/سەكۋند</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىر/سەكۋند</unitPattern>
-			</unit>
-			<unit type="speed-mile-per-hour">
-				<displayName draft="unconfirmed">ميل/ساعات</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميل/ساعات</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميل/ساعات</unitPattern>
-			</unit>
-			<unit type="speed-knot">
-				<displayName draft="unconfirmed">ءتۇيىن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ءتۇيىن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ءتۇيىن</unitPattern>
-			</unit>
-			<unit type="speed-beaufort">
-				<displayName draft="unconfirmed">بوفورت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بوفورت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بوفورت</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">سەلسي گرادۋسى</displayName>
-			</unit>
-			<unit type="temperature-fahrenheit">
-				<displayName draft="unconfirmed">فارانگەيت گرادۋسى</displayName>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName draft="unconfirmed">كەلۆين</displayName>
-			</unit>
-			<unit type="torque-pound-force-foot">
-				<displayName draft="unconfirmed">فۋنت-كۇش-فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} فۋنت-كۇش-فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} فۋنت-كۇش-فۋت</unitPattern>
-			</unit>
-			<unit type="torque-newton-meter">
-				<displayName draft="unconfirmed">نيۋتون-مەتىر</displayName>
-			</unit>
-			<unit type="volume-cubic-kilometer">
-				<displayName draft="unconfirmed">تەكشە كيلومەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە كيلومەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە كيلومەتىر</unitPattern>
-			</unit>
-			<unit type="volume-cubic-meter">
-				<displayName draft="unconfirmed">تەكشە مەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە مەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە مەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/تەكشە مەتىر</perUnitPattern>
-			</unit>
-			<unit type="volume-cubic-centimeter">
-				<displayName draft="unconfirmed">تەكشە سانتيمەتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە سانتيمەتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە سانتيمەتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/تەكشە سانتيمەتىر</perUnitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<displayName draft="unconfirmed">تەكشە ميل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە ميل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە ميل</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName draft="unconfirmed">تەكشە يارد</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە يارد</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە يارد</unitPattern>
-			</unit>
-			<unit type="volume-cubic-foot">
-				<displayName draft="unconfirmed">تەكشە فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە فۋت</unitPattern>
-			</unit>
-			<unit type="volume-cubic-inch">
-				<displayName draft="unconfirmed">تەكشە ديۋيم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تەكشە ديۋيم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تەكشە ديۋيم</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName draft="unconfirmed">مەگاليتر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەگاليتر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەگاليتر</unitPattern>
-			</unit>
-			<unit type="volume-hectoliter">
-				<displayName draft="unconfirmed">گەكتوليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گەكتوليرىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گەكتوليرىر</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName draft="unconfirmed">ليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ليتىر</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ليتىر</perUnitPattern>
-			</unit>
-			<unit type="volume-deciliter">
-				<displayName draft="unconfirmed">دەسيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دەسيليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دەسيليتىر</unitPattern>
-			</unit>
-			<unit type="volume-centiliter">
-				<displayName draft="unconfirmed">سانتيليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سانتيليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سانتيليتىر</unitPattern>
-			</unit>
-			<unit type="volume-milliliter">
-				<displayName draft="unconfirmed">ميليليتىر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ميليليتىر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ميليليتىر</unitPattern>
-			</unit>
-			<unit type="volume-pint-metric">
-				<displayName draft="unconfirmed">مەتىرلىك پينتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك پينتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك پينتا</unitPattern>
-			</unit>
-			<unit type="volume-cup-metric">
-				<displayName draft="unconfirmed">مەتىرلىك كەسە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} مەتىرلىك كەسە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} مەتىرلىك كەسە</unitPattern>
-			</unit>
-			<unit type="volume-acre-foot">
-				<displayName draft="unconfirmed">اكر-فۋت</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اكر-فۋت</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اكر-فۋت</unitPattern>
-			</unit>
-			<unit type="volume-bushel">
-				<displayName draft="unconfirmed">بۋشەل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} بۋشەل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} بۋشەل</unitPattern>
-			</unit>
-			<unit type="volume-gallon">
-				<displayName draft="unconfirmed">گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} گاللون</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/گاللون</perUnitPattern>
-			</unit>
-			<unit type="volume-gallon-imperial">
-				<displayName draft="unconfirmed">يمپ گاللون</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ گاللون</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ گاللون</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0} يمپ گاللون</perUnitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<displayName draft="unconfirmed">كۆارتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كۆارتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كۆارتا</unitPattern>
-			</unit>
-			<unit type="volume-pint">
-				<displayName draft="unconfirmed">پينتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} پينتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} پينتا</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName draft="unconfirmed">كەسە</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} كەسە</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} كەسە</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<displayName draft="unconfirmed">سۇيىق ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} سۇيىق ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} سۇيىق ۋنسيا</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce-imperial">
-				<displayName draft="unconfirmed">يمپ سۇيىق ۋنسيا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ سۇيىق ۋنسيا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ سۇيىق ۋنسيا</unitPattern>
-			</unit>
-			<unit type="volume-tablespoon">
-				<displayName draft="unconfirmed">اس قاسىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} اس قاسىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} اس قاسىق</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName draft="unconfirmed">شاي قاسىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شاي قاسىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شاي قاسىق</unitPattern>
-			</unit>
-			<unit type="volume-barrel">
-				<displayName draft="unconfirmed">باررەل</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} باررەل</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} باررەل</unitPattern>
-			</unit>
-			<unit type="volume-dessert-spoon">
-				<displayName draft="unconfirmed">دەسەرت قاسىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دەسەرت قاسىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دەسەرت قاسىعى</unitPattern>
-			</unit>
-			<unit type="volume-dessert-spoon-imperial">
-				<displayName draft="unconfirmed">يمپ دەسەرت قاسىعى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ دەسەرت قاسىعى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ دەسەرت قاسىعى</unitPattern>
-			</unit>
-			<unit type="volume-drop">
-				<displayName draft="unconfirmed">تامشى</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} تامشى</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} تامشى</unitPattern>
-			</unit>
-			<unit type="volume-dram">
-				<displayName draft="unconfirmed">دراحما</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} دراحما</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} دراحما</unitPattern>
-			</unit>
-			<unit type="volume-jigger">
-				<displayName draft="unconfirmed">جيگگەر</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جيگگەر</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جيگگەر</unitPattern>
-			</unit>
-			<unit type="volume-pinch">
-				<displayName draft="unconfirmed">شوكىم</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} شوكىم</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} شوكىم</unitPattern>
-			</unit>
-			<unit type="volume-quart-imperial">
-				<displayName draft="unconfirmed">يمپ كۆارتا</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} يمپ كۆارتا</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} يمپ كۆارتا</unitPattern>
-			</unit>
-			<unit type="speed-light-speed">
-				<displayName draft="unconfirmed">جارىق</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} جارىق</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} جارىق</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName draft="unconfirmed">ميللياردتىق ۇلەس</displayName>
-			</unit>
-			<unit type="duration-night">
-				<displayName draft="unconfirmed">ءتۇن</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} ءتۇن</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} ءتۇن</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/ءتۇن</perUnitPattern>
-			</unit>
-			<coordinateUnit>
-				<displayName draft="unconfirmed">باعىت</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} ش</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} س</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} و</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} ب</coordinateUnitPattern>
-			</coordinateUnit>
 		</unitLength>
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} جانە {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} جانە {1}</listPatternPart>
+			<listPatternPart type="start">{0}، {1}</listPatternPart>
+			<listPatternPart type="middle">{0}، {1}</listPatternPart>
+			<listPatternPart type="end">{0} جانە {1}</listPatternPart>
+			<listPatternPart type="2">{0} جانە {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="or">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} نە {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} نە {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} نە {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} نە {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} نە {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} نە {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} جانە {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} جانە {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} جانە {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} جانە {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0}، {1}</listPatternPart>
+			<listPatternPart type="start">{0}، {1}</listPatternPart>
+			<listPatternPart type="middle">{0}، {1}</listPatternPart>
+			<listPatternPart type="end">{0} نە {1}</listPatternPart>
+			<listPatternPart type="2">{0} نە {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0}، {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0}، {1}</listPatternPart>
+			<listPatternPart type="end">{0}، {1}</listPatternPart>
+			<listPatternPart type="2">{0}، {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
-			<yesstr draft="unconfirmed">ءيا:ءيا</yesstr>
-			<nostr draft="unconfirmed">جوق:جوق</nostr>
+			<yesstr>ءيا:ءيا</yesstr>
+			<nostr>جوق:جوق</nostr>
 		</messages>
 	</posix>
 	<characterLabels>
-		<characterLabelPattern type="all" draft="unconfirmed">{0} — بارلىعى</characterLabelPattern>
-		<characterLabelPattern type="compatibility" draft="unconfirmed">{0} — ۇيلەسىمدى</characterLabelPattern>
-		<characterLabelPattern type="enclosed" draft="unconfirmed">{0} — ەنگىزىلگەن</characterLabelPattern>
-		<characterLabelPattern type="extended" draft="unconfirmed">{0} — كەڭەيتىلگەن</characterLabelPattern>
-		<characterLabelPattern type="facing-left" draft="unconfirmed">{0} سولعا قاراتىلعان</characterLabelPattern>
-		<characterLabelPattern type="facing-right" draft="unconfirmed">{0} وڭعا قاراتىلعان</characterLabelPattern>
-		<characterLabelPattern type="historic" draft="unconfirmed">{0} — تاريحي</characterLabelPattern>
-		<characterLabelPattern type="miscellaneous" draft="unconfirmed">{0} — ءارتۇرلى</characterLabelPattern>
-		<characterLabelPattern type="other" draft="unconfirmed">{0} — باسقا</characterLabelPattern>
-		<characterLabelPattern type="scripts" draft="unconfirmed">{0} — جازۋلار</characterLabelPattern>
-		<characterLabelPattern type="strokes" count="one" draft="unconfirmed">{0} سىزىق</characterLabelPattern>
-		<characterLabelPattern type="strokes" count="other" draft="unconfirmed">{0} سىزىق</characterLabelPattern>
-		<characterLabelPattern type="subscript" draft="unconfirmed">{0} — جول استى تاڭبا</characterLabelPattern>
-		<characterLabelPattern type="superscript" draft="unconfirmed">{0} — جول ءۇستى تاڭبا</characterLabelPattern>
-		<characterLabel type="activities" draft="unconfirmed">ارەكەت</characterLabel>
-		<characterLabel type="african_scripts" draft="unconfirmed">افريكا جازۋلارى</characterLabel>
-		<characterLabel type="american_scripts" draft="unconfirmed">امەريكا جازۋلارى</characterLabel>
-		<characterLabel type="animal" draft="unconfirmed">جانۋار</characterLabel>
-		<characterLabel type="animals_nature" draft="unconfirmed">جانۋار نە تابيعات</characterLabel>
-		<characterLabel type="arrows" draft="unconfirmed">كورسەتكى</characterLabel>
-		<characterLabel type="body" draft="unconfirmed">دەنە</characterLabel>
-		<characterLabel type="box_drawing" draft="unconfirmed">جالعان ءپىشىن</characterLabel>
-		<characterLabel type="braille" draft="unconfirmed">برايل جازۋى</characterLabel>
-		<characterLabel type="building" draft="unconfirmed">عيمارات</characterLabel>
-		<characterLabel type="bullets_stars" draft="unconfirmed">ءتىزىم ماركەرلەرى/جۇلدىزدار</characterLabel>
-		<characterLabel type="consonantal_jamo" draft="unconfirmed">داۋىسسىز چامو</characterLabel>
-		<characterLabel type="currency_symbols" draft="unconfirmed">اقشا تاڭبالارى</characterLabel>
-		<characterLabel type="dash_connector" draft="unconfirmed">سىزىقشا/بايلانىس</characterLabel>
-		<characterLabel type="digits" draft="unconfirmed">سان</characterLabel>
-		<characterLabel type="dingbats" draft="unconfirmed">دينگبات</characterLabel>
-		<characterLabel type="divination_symbols" draft="unconfirmed">سىرلى بەلگى</characterLabel>
-		<characterLabel type="downwards_arrows" draft="unconfirmed">تومەن باعىتتالعان كورسەتكىلەر</characterLabel>
-		<characterLabel type="downwards_upwards_arrows" draft="unconfirmed">تومەن جانە جوعارى باعىتتالعان كورسەتكىلەر</characterLabel>
-		<characterLabel type="east_asian_scripts" draft="unconfirmed">شىعىس ازيا جازۋلارى</characterLabel>
-		<characterLabel type="emoji" draft="unconfirmed">ەموجي</characterLabel>
-		<characterLabel type="european_scripts" draft="unconfirmed">ەۋروپا جازۋلارى</characterLabel>
-		<characterLabel type="female" draft="unconfirmed">ايەل</characterLabel>
-		<characterLabel type="flag" draft="unconfirmed">تۋ</characterLabel>
-		<characterLabel type="flags" draft="unconfirmed">تۋلار</characterLabel>
-		<characterLabel type="food_drink" draft="unconfirmed">تاماق پەن سۋسىن</characterLabel>
-		<characterLabel type="format" draft="unconfirmed">ءپىشىم</characterLabel>
-		<characterLabel type="format_whitespace" draft="unconfirmed">ءپىشىم جانە بوس ورىن</characterLabel>
-		<characterLabel type="full_width_form_variant" draft="unconfirmed">تولىق ەندى ءپىشىم نۇسقالارى</characterLabel>
-		<characterLabel type="geometric_shapes" draft="unconfirmed">گەومەتريالىق ءپىشىن</characterLabel>
-		<characterLabel type="half_width_form_variant" draft="unconfirmed">جارتى ەندى ءپىشىم نۇسقالارى</characterLabel>
-		<characterLabel type="han_characters" draft="unconfirmed">قىتاي جازۋى</characterLabel>
-		<characterLabel type="han_radicals" draft="unconfirmed">قىتاي جازۋىنىڭ كىلتتەرى</characterLabel>
-		<characterLabel type="hanja" draft="unconfirmed">حانچا</characterLabel>
-		<characterLabel type="hanzi_simplified" draft="unconfirmed">قىتاي جازۋى (جەڭىلدەتىلگەن)</characterLabel>
-		<characterLabel type="hanzi_traditional" draft="unconfirmed">قىتاي جازۋى (ءداستۇرلى)</characterLabel>
-		<characterLabel type="heart" draft="unconfirmed">جۇرەك</characterLabel>
-		<characterLabel type="historic_scripts" draft="unconfirmed">كونە جازۋلار</characterLabel>
-		<characterLabel type="ideographic_desc_characters" draft="unconfirmed">قىتاي جازۋىن سيپاتتاۋ تاڭبالارى</characterLabel>
-		<characterLabel type="japanese_kana" draft="unconfirmed">جاپون كانا جازۋى</characterLabel>
-		<characterLabel type="kanbun" draft="unconfirmed">كانبۋن</characterLabel>
-		<characterLabel type="kanji" draft="unconfirmed">كانجي</characterLabel>
-		<characterLabel type="keycap" draft="unconfirmed">پەرنە</characterLabel>
-		<characterLabel type="leftwards_arrows" draft="unconfirmed">سولعا باعىتتالعان كورسەتكىلەر</characterLabel>
-		<characterLabel type="leftwards_rightwards_arrows" draft="unconfirmed">سولعا جانە وڭعا باعىتتالعان كورسەتكىلەر</characterLabel>
-		<characterLabel type="letterlike_symbols" draft="unconfirmed">ارىپتىك تاڭبالار</characterLabel>
-		<characterLabel type="limited_use" draft="unconfirmed">قولدانىسى شەكتەۋلى</characterLabel>
-		<characterLabel type="male" draft="unconfirmed">ەركەك</characterLabel>
-		<characterLabel type="math_symbols" draft="unconfirmed">ماتەماتيكالىق تاڭبالار</characterLabel>
-		<characterLabel type="middle_eastern_scripts" draft="unconfirmed">تاياۋ شىعىس جازۋلارى</characterLabel>
-		<characterLabel type="miscellaneous" draft="unconfirmed">ءارتۇرلى</characterLabel>
-		<characterLabel type="modern_scripts" draft="unconfirmed">قازىرگى زامان جازۋلارى</characterLabel>
-		<characterLabel type="modifier" draft="unconfirmed">وزگەرتكىۋ</characterLabel>
-		<characterLabel type="musical_symbols" draft="unconfirmed">مۋزىكالىق تاڭبالار</characterLabel>
-		<characterLabel type="nature" draft="unconfirmed">تابيعات</characterLabel>
-		<characterLabel type="nonspacing" draft="unconfirmed">بوس ورىنسىز</characterLabel>
-		<characterLabel type="numbers" draft="unconfirmed">ساندار</characterLabel>
-		<characterLabel type="objects" draft="unconfirmed">نىساندار</characterLabel>
-		<characterLabel type="other" draft="unconfirmed">باسقا</characterLabel>
-		<characterLabel type="paired" draft="unconfirmed">جۇپتاسقان</characterLabel>
-		<characterLabel type="person" draft="unconfirmed">ادام</characterLabel>
-		<characterLabel type="phonetic_alphabet" draft="unconfirmed">فونەتيكالىق ءالىپبي</characterLabel>
-		<characterLabel type="pictographs" draft="unconfirmed">پىشىندىك جازۋ</characterLabel>
-		<characterLabel type="place" draft="unconfirmed">ورىن</characterLabel>
-		<characterLabel type="plant" draft="unconfirmed">وسىمدىك</characterLabel>
-		<characterLabel type="punctuation" draft="unconfirmed">تىنىس بەلگىلەرى</characterLabel>
-		<characterLabel type="rightwards_arrows" draft="unconfirmed">وڭعا باعىتتالعان كورسەتكىلەر</characterLabel>
-		<characterLabel type="sign_standard_symbols" draft="unconfirmed">بەلگىلەر/تاڭبالار</characterLabel>
-		<characterLabel type="small_form_variant" draft="unconfirmed">كىشى نۇسقالارى</characterLabel>
-		<characterLabel type="smiley" draft="unconfirmed">سمايىل</characterLabel>
-		<characterLabel type="smileys_people" draft="unconfirmed">سمايىلدار مەن ادامدار</characterLabel>
-		<characterLabel type="south_asian_scripts" draft="unconfirmed">وڭتۇستىك ازيا جازۋلارى</characterLabel>
-		<characterLabel type="southeast_asian_scripts" draft="unconfirmed">وڭتۇستىك-شىعىس ازيا جازۋلارى</characterLabel>
-		<characterLabel type="spacing" draft="unconfirmed">بوس ورىن</characterLabel>
-		<characterLabel type="sport" draft="unconfirmed">سپورت</characterLabel>
-		<characterLabel type="symbols" draft="unconfirmed">تاڭبالار</characterLabel>
-		<characterLabel type="technical_symbols" draft="unconfirmed">تەحنيكالىق تاڭبالار</characterLabel>
-		<characterLabel type="tone_marks" draft="unconfirmed">ەكپىن بەلگىلەرى</characterLabel>
-		<characterLabel type="travel" draft="unconfirmed">ساياحات</characterLabel>
-		<characterLabel type="travel_places" draft="unconfirmed">ساياحات جانە ورىندار</characterLabel>
-		<characterLabel type="upwards_arrows" draft="unconfirmed">جوعارى باعىتتالعان كورسەتكىلەر</characterLabel>
-		<characterLabel type="variant_forms" draft="unconfirmed">وزگەرمەلى پىشىندەر</characterLabel>
-		<characterLabel type="vocalic_jamo" draft="unconfirmed">داۋىستى چامو</characterLabel>
-		<characterLabel type="weather" draft="unconfirmed">اۋا رايى</characterLabel>
-		<characterLabel type="western_asian_scripts" draft="unconfirmed">باتىس ازيا جازۋلارى</characterLabel>
-		<characterLabel type="whitespace" draft="unconfirmed">بوس ورىن</characterLabel>
+		<characterLabelPattern type="all">{0} — بارلىعى</characterLabelPattern>
+		<characterLabelPattern type="compatibility">{0} — ۇيلەسىمدى</characterLabelPattern>
+		<characterLabelPattern type="enclosed">{0} — ەنگىزىلگەن</characterLabelPattern>
+		<characterLabelPattern type="extended">{0} — كەڭەيتىلگەن</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} سولعا قاراتىلعان</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} وڭعا قاراتىلعان</characterLabelPattern>
+		<characterLabelPattern type="historic">{0} — تاريحي</characterLabelPattern>
+		<characterLabelPattern type="miscellaneous">{0} — ءارتۇرلى</characterLabelPattern>
+		<characterLabelPattern type="other">{0} — باسقا</characterLabelPattern>
+		<characterLabelPattern type="scripts">{0} — جازۋلار</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="one">{0} سىزىق</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="other">{0} سىزىق</characterLabelPattern>
+		<characterLabelPattern type="subscript">{0} — جول استى تاڭبا</characterLabelPattern>
+		<characterLabelPattern type="superscript">{0} — جول ءۇستى تاڭبا</characterLabelPattern>
+		<characterLabel type="activities">ارەكەت</characterLabel>
+		<characterLabel type="african_scripts">افريكا جازۋلارى</characterLabel>
+		<characterLabel type="american_scripts">امەريكا جازۋلارى</characterLabel>
+		<characterLabel type="animal">جانۋار</characterLabel>
+		<characterLabel type="animals_nature">جانۋار نە تابيعات</characterLabel>
+		<characterLabel type="arrows">كورسەتكى</characterLabel>
+		<characterLabel type="body">دەنە</characterLabel>
+		<characterLabel type="box_drawing">جالعان ءپىشىن</characterLabel>
+		<characterLabel type="braille">برايل جازۋى</characterLabel>
+		<characterLabel type="building">عيمارات</characterLabel>
+		<characterLabel type="bullets_stars">ءتىزىم ماركەرلەرى/جۇلدىزدار</characterLabel>
+		<characterLabel type="consonantal_jamo">داۋىسسىز چامو</characterLabel>
+		<characterLabel type="currency_symbols">اقشا تاڭبالارى</characterLabel>
+		<characterLabel type="dash_connector">سىزىقشا/بايلانىس</characterLabel>
+		<characterLabel type="digits">سان</characterLabel>
+		<characterLabel type="dingbats">دينگبات</characterLabel>
+		<characterLabel type="divination_symbols">سىرلى بەلگى</characterLabel>
+		<characterLabel type="downwards_arrows">تومەن باعىتتالعان كورسەتكىلەر</characterLabel>
+		<characterLabel type="downwards_upwards_arrows">تومەن جانە جوعارى باعىتتالعان كورسەتكىلەر</characterLabel>
+		<characterLabel type="east_asian_scripts">شىعىس ازيا جازۋلارى</characterLabel>
+		<characterLabel type="emoji">ەموجي</characterLabel>
+		<characterLabel type="european_scripts">ەۋروپا جازۋلارى</characterLabel>
+		<characterLabel type="female">ايەل</characterLabel>
+		<characterLabel type="flag">تۋ</characterLabel>
+		<characterLabel type="flags">تۋلار</characterLabel>
+		<characterLabel type="food_drink">تاماق پەن سۋسىن</characterLabel>
+		<characterLabel type="format">ءپىشىم</characterLabel>
+		<characterLabel type="format_whitespace">ءپىشىم جانە بوس ورىن</characterLabel>
+		<characterLabel type="full_width_form_variant">تولىق ەندى ءپىشىم نۇسقالارى</characterLabel>
+		<characterLabel type="geometric_shapes">گەومەتريالىق ءپىشىن</characterLabel>
+		<characterLabel type="half_width_form_variant">جارتى ەندى ءپىشىم نۇسقالارى</characterLabel>
+		<characterLabel type="han_characters">قىتاي جازۋى</characterLabel>
+		<characterLabel type="han_radicals">قىتاي جازۋىنىڭ كىلتتەرى</characterLabel>
+		<characterLabel type="hanja">حانچا</characterLabel>
+		<characterLabel type="hanzi_simplified">قىتاي جازۋى (جەڭىلدەتىلگەن)</characterLabel>
+		<characterLabel type="hanzi_traditional">قىتاي جازۋى (ءداستۇرلى)</characterLabel>
+		<characterLabel type="heart">جۇرەك</characterLabel>
+		<characterLabel type="historic_scripts">كونە جازۋلار</characterLabel>
+		<characterLabel type="ideographic_desc_characters">قىتاي جازۋىن سيپاتتاۋ تاڭبالارى</characterLabel>
+		<characterLabel type="japanese_kana">جاپون كانا جازۋى</characterLabel>
+		<characterLabel type="kanbun">كانبۋن</characterLabel>
+		<characterLabel type="kanji">كانجي</characterLabel>
+		<characterLabel type="keycap">پەرنە</characterLabel>
+		<characterLabel type="leftwards_arrows">سولعا باعىتتالعان كورسەتكىلەر</characterLabel>
+		<characterLabel type="leftwards_rightwards_arrows">سولعا جانە وڭعا باعىتتالعان كورسەتكىلەر</characterLabel>
+		<characterLabel type="letterlike_symbols">ارىپتىك تاڭبالار</characterLabel>
+		<characterLabel type="limited_use">قولدانىسى شەكتەۋلى</characterLabel>
+		<characterLabel type="male">ەركەك</characterLabel>
+		<characterLabel type="math_symbols">ماتەماتيكالىق تاڭبالار</characterLabel>
+		<characterLabel type="middle_eastern_scripts">تاياۋ شىعىس جازۋلارى</characterLabel>
+		<characterLabel type="miscellaneous">ءارتۇرلى</characterLabel>
+		<characterLabel type="modern_scripts">قازىرگى زامان جازۋلارى</characterLabel>
+		<characterLabel type="modifier">وزگەرتكىۋ</characterLabel>
+		<characterLabel type="musical_symbols">مۋزىكالىق تاڭبالار</characterLabel>
+		<characterLabel type="nature">تابيعات</characterLabel>
+		<characterLabel type="nonspacing">بوس ورىنسىز</characterLabel>
+		<characterLabel type="numbers">ساندار</characterLabel>
+		<characterLabel type="objects">نىساندار</characterLabel>
+		<characterLabel type="other">باسقا</characterLabel>
+		<characterLabel type="paired">جۇپتاسقان</characterLabel>
+		<characterLabel type="person">ادام</characterLabel>
+		<characterLabel type="phonetic_alphabet">فونەتيكالىق ءالىپبي</characterLabel>
+		<characterLabel type="pictographs">پىشىندىك جازۋ</characterLabel>
+		<characterLabel type="place">ورىن</characterLabel>
+		<characterLabel type="plant">وسىمدىك</characterLabel>
+		<characterLabel type="punctuation">تىنىس بەلگىلەرى</characterLabel>
+		<characterLabel type="rightwards_arrows">وڭعا باعىتتالعان كورسەتكىلەر</characterLabel>
+		<characterLabel type="sign_standard_symbols">بەلگىلەر/تاڭبالار</characterLabel>
+		<characterLabel type="small_form_variant">كىشى نۇسقالارى</characterLabel>
+		<characterLabel type="smiley">سمايىل</characterLabel>
+		<characterLabel type="smileys_people">سمايىلدار مەن ادامدار</characterLabel>
+		<characterLabel type="south_asian_scripts">وڭتۇستىك ازيا جازۋلارى</characterLabel>
+		<characterLabel type="southeast_asian_scripts">وڭتۇستىك-شىعىس ازيا جازۋلارى</characterLabel>
+		<characterLabel type="spacing">بوس ورىن</characterLabel>
+		<characterLabel type="sport">سپورت</characterLabel>
+		<characterLabel type="symbols">تاڭبالار</characterLabel>
+		<characterLabel type="technical_symbols">تەحنيكالىق تاڭبالار</characterLabel>
+		<characterLabel type="tone_marks">ەكپىن بەلگىلەرى</characterLabel>
+		<characterLabel type="travel">ساياحات</characterLabel>
+		<characterLabel type="travel_places">ساياحات جانە ورىندار</characterLabel>
+		<characterLabel type="upwards_arrows">جوعارى باعىتتالعان كورسەتكىلەر</characterLabel>
+		<characterLabel type="variant_forms">وزگەرمەلى پىشىندەر</characterLabel>
+		<characterLabel type="vocalic_jamo">داۋىستى چامو</characterLabel>
+		<characterLabel type="weather">اۋا رايى</characterLabel>
+		<characterLabel type="western_asian_scripts">باتىس ازيا جازۋلارى</characterLabel>
+		<characterLabel type="whitespace">بوس ورىن</characterLabel>
 	</characterLabels>
 	<typographicNames>
-		<axisName type="ital" draft="unconfirmed">قيعاش</axisName>
-		<axisName type="opsz" draft="unconfirmed">وپتيكالىق ولشەم</axisName>
-		<axisName type="slnt" draft="unconfirmed">قيعاشتالعان</axisName>
-		<axisName type="wdth" draft="unconfirmed">ەنى</axisName>
-		<axisName type="wght" draft="unconfirmed">سالماق</axisName>
-		<styleName type="ital" subtype="1" draft="unconfirmed">قيعاش</styleName>
-		<styleName type="opsz" subtype="8" draft="unconfirmed">جازۋ</styleName>
-		<styleName type="opsz" subtype="12" draft="unconfirmed">ءماتىن</styleName>
-		<styleName type="opsz" subtype="18" draft="unconfirmed">تاقىرىپشا</styleName>
-		<styleName type="opsz" subtype="72" draft="unconfirmed">كورسەتۋ</styleName>
-		<styleName type="opsz" subtype="144" draft="unconfirmed">حابارلاندىۋ</styleName>
-		<styleName type="slnt" subtype="-12" draft="unconfirmed">كەرى قيعاشتالعان</styleName>
-		<styleName type="slnt" subtype="0" draft="unconfirmed">تىك</styleName>
-		<styleName type="slnt" subtype="12" draft="unconfirmed">قيعاشتالعان</styleName>
-		<styleName type="slnt" subtype="24" draft="unconfirmed">قاتتى قيعاش</styleName>
-		<styleName type="wdth" subtype="50" draft="unconfirmed">قاتتى تۇرلەنگەن</styleName>
-		<styleName type="wdth" subtype="62.5" draft="unconfirmed">قوسىمشا تۇرلەنگەن</styleName>
-		<styleName type="wdth" subtype="75" draft="unconfirmed">تۇرلەنگەن</styleName>
-		<styleName type="wdth" subtype="87.5" draft="unconfirmed">جارتىلاي سىزىلعان</styleName>
-		<styleName type="wdth" subtype="100" draft="unconfirmed">قالىپتى</styleName>
-		<styleName type="wdth" subtype="112.5" draft="unconfirmed">جارتىلاي كەڭەيتىلگەن</styleName>
-		<styleName type="wdth" subtype="125" draft="unconfirmed">كەڭەيتىلگەن</styleName>
-		<styleName type="wdth" subtype="150" draft="unconfirmed">قوسىمشا كەڭەيتىلگەن</styleName>
-		<styleName type="wdth" subtype="200" draft="unconfirmed">قاتتى كەڭەيتىلگەن</styleName>
-		<styleName type="wght" subtype="100" draft="unconfirmed">جۇقا</styleName>
-		<styleName type="wght" subtype="200" draft="unconfirmed">تىم اشىق</styleName>
-		<styleName type="wght" subtype="300" draft="unconfirmed">جارىق</styleName>
-		<styleName type="wght" subtype="350" draft="unconfirmed">جاتىلاي جارىق</styleName>
-		<styleName type="wght" subtype="380" draft="unconfirmed">كىتاپ</styleName>
-		<styleName type="wght" subtype="400" draft="unconfirmed">تۇراقتى</styleName>
-		<styleName type="wght" subtype="500" draft="unconfirmed">ورتاشا</styleName>
-		<styleName type="wght" subtype="600" draft="unconfirmed">جارتىلاي قالىڭ</styleName>
-		<styleName type="wght" subtype="700" draft="unconfirmed">جۋان</styleName>
-		<styleName type="wght" subtype="800" draft="unconfirmed">وتە جۋان</styleName>
-		<styleName type="wght" subtype="900" draft="unconfirmed">قارا</styleName>
-		<styleName type="wght" subtype="950" draft="unconfirmed">قاپ-قارا</styleName>
-		<featureName type="afrc" draft="unconfirmed">تىك بولشەكتەر</featureName>
-		<featureName type="cpsp" draft="unconfirmed">باس ارىپتەر اراسى</featureName>
-		<featureName type="dlig" draft="unconfirmed">تاڭداۋلى ليگاتۋرالار</featureName>
-		<featureName type="frac" draft="unconfirmed">قيعاش سىزىقتى بولشەكتەر</featureName>
-		<featureName type="lnum" draft="unconfirmed">قاتار ساندار</featureName>
-		<featureName type="onum" draft="unconfirmed">ەسكى تاڭبالار</featureName>
-		<featureName type="ordn" draft="unconfirmed">تاق ساندار</featureName>
-		<featureName type="pnum" draft="unconfirmed">سالىستىرمالى ساندار</featureName>
-		<featureName type="smcp" draft="unconfirmed">كىشى باس ارىپتەر</featureName>
-		<featureName type="tnum" draft="unconfirmed">كەستەلىك ساندار</featureName>
-		<featureName type="zero" draft="unconfirmed">جولاقتى ءنول</featureName>
+		<axisName type="ital">قيعاش</axisName>
+		<axisName type="opsz">وپتيكالىق ولشەم</axisName>
+		<axisName type="slnt">قيعاشتالعان</axisName>
+		<axisName type="wdth">ەنى</axisName>
+		<axisName type="wght">سالماق</axisName>
+		<styleName type="ital" subtype="1">قيعاش</styleName>
+		<styleName type="opsz" subtype="8">جازۋ</styleName>
+		<styleName type="opsz" subtype="12">ءماتىن</styleName>
+		<styleName type="opsz" subtype="18">تاقىرىپشا</styleName>
+		<styleName type="opsz" subtype="72">كورسەتۋ</styleName>
+		<styleName type="opsz" subtype="144">حابارلاندىۋ</styleName>
+		<styleName type="slnt" subtype="-12">كەرى قيعاشتالعان</styleName>
+		<styleName type="slnt" subtype="0">تىك</styleName>
+		<styleName type="slnt" subtype="12">قيعاشتالعان</styleName>
+		<styleName type="slnt" subtype="24">قاتتى قيعاش</styleName>
+		<styleName type="wdth" subtype="50">قاتتى تۇرلەنگەن</styleName>
+		<styleName type="wdth" subtype="62.5">قوسىمشا تۇرلەنگەن</styleName>
+		<styleName type="wdth" subtype="75">تۇرلەنگەن</styleName>
+		<styleName type="wdth" subtype="87.5">جارتىلاي سىزىلعان</styleName>
+		<styleName type="wdth" subtype="100">قالىپتى</styleName>
+		<styleName type="wdth" subtype="112.5">جارتىلاي كەڭەيتىلگەن</styleName>
+		<styleName type="wdth" subtype="125">كەڭەيتىلگەن</styleName>
+		<styleName type="wdth" subtype="150">قوسىمشا كەڭەيتىلگەن</styleName>
+		<styleName type="wdth" subtype="200">قاتتى كەڭەيتىلگەن</styleName>
+		<styleName type="wght" subtype="100">جۇقا</styleName>
+		<styleName type="wght" subtype="200">تىم اشىق</styleName>
+		<styleName type="wght" subtype="300">جارىق</styleName>
+		<styleName type="wght" subtype="350">جاتىلاي جارىق</styleName>
+		<styleName type="wght" subtype="380">كىتاپ</styleName>
+		<styleName type="wght" subtype="400">تۇراقتى</styleName>
+		<styleName type="wght" subtype="500">ورتاشا</styleName>
+		<styleName type="wght" subtype="600">جارتىلاي قالىڭ</styleName>
+		<styleName type="wght" subtype="700">جۋان</styleName>
+		<styleName type="wght" subtype="800">وتە جۋان</styleName>
+		<styleName type="wght" subtype="900">قارا</styleName>
+		<styleName type="wght" subtype="950">قاپ-قارا</styleName>
+		<featureName type="afrc">تىك بولشەكتەر</featureName>
+		<featureName type="cpsp">باس ارىپتەر اراسى</featureName>
+		<featureName type="dlig">تاڭداۋلى ليگاتۋرالار</featureName>
+		<featureName type="frac">قيعاش سىزىقتى بولشەكتەر</featureName>
+		<featureName type="lnum">قاتار ساندار</featureName>
+		<featureName type="onum">ەسكى تاڭبالار</featureName>
+		<featureName type="ordn">تاق ساندار</featureName>
+		<featureName type="pnum">سالىستىرمالى ساندار</featureName>
+		<featureName type="smcp">كىشى باس ارىپتەر</featureName>
+		<featureName type="tnum">كەستەلىك ساندار</featureName>
+		<featureName type="zero">جولاقتى ءنول</featureName>
 	</typographicNames>
 	<personNames>
-		<nameOrderLocales order="givenFirst" draft="unconfirmed">und kk</nameOrderLocales>
+		<nameOrderLocales order="givenFirst">und kk</nameOrderLocales>
 		<personName order="givenFirst" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{given} {surname} {generation}، {credentials}</namePattern>
+			<namePattern>{given} {surname} {generation}، {credentials}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{surname}</namePattern>
+			<namePattern>{surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{given-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
+			<namePattern>{given-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
-		</personName>
-		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{given} {surname} {generation}، {credentials}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{surname}</namePattern>
+			<namePattern>{surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{given-initial} {surname}</namePattern>
+			<namePattern>{given-initial} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{surname}</namePattern>
+			<namePattern>{surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname} {given}</namePattern>
+			<namePattern>{surname} {given}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname} {given-informal}</namePattern>
+			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{surname}</namePattern>
+			<namePattern>{surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}{given-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}{given-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
-		</personName>
-		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname} {given}</namePattern>
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname} {given-informal}</namePattern>
+			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{surname}</namePattern>
+			<namePattern>{surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname} {given-initial}</namePattern>
+			<namePattern>{surname} {given-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname} {given-initial}</namePattern>
+			<namePattern>{surname} {given-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
-			<namePattern draft="unconfirmed">{surname}</namePattern>
+			<namePattern>{surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal}</namePattern>
+			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
-			<namePattern draft="unconfirmed">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
-			<namePattern draft="unconfirmed">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname-core}، {given} {given2} {surname-prefix}</namePattern>
+			<namePattern>{surname-core}، {given} {given2} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname}، {given-informal}</namePattern>
+			<namePattern>{surname}، {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname-core}، {given} {surname-prefix}</namePattern>
+			<namePattern>{surname-core}، {given} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname}، {given-informal}</namePattern>
+			<namePattern>{surname}، {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="formal">
-			<namePattern draft="unconfirmed">{surname}، {given}</namePattern>
+			<namePattern>{surname}، {given}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="informal">
-			<namePattern draft="unconfirmed">{surname}، {given-informal}</namePattern>
+			<namePattern>{surname}، {given-informal}</namePattern>
 		</personName>
 		<sampleName item="nativeG">
-			<nameField type="given" draft="unconfirmed">اسەم</nameField>
+			<nameField type="given">اسەم</nameField>
 		</sampleName>
 		<sampleName item="nativeGS">
-			<nameField type="given" draft="unconfirmed">مۇرات</nameField>
-			<nameField type="surname" draft="unconfirmed">كارىباي</nameField>
+			<nameField type="given">مۇرات</nameField>
+			<nameField type="surname">كارىباي</nameField>
 		</sampleName>
 		<sampleName item="nativeGGS">
-			<nameField type="given" draft="unconfirmed">قالاجان</nameField>
-			<nameField type="given2" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="surname" draft="unconfirmed">قايرات</nameField>
+			<nameField type="given">قالاجان</nameField>
+			<nameField type="given2">∅∅∅</nameField>
+			<nameField type="surname">قايرات</nameField>
 		</sampleName>
 		<sampleName item="nativeFull">
-			<nameField type="title" draft="unconfirmed">مىرزا</nameField>
-			<nameField type="given" draft="unconfirmed">ماقسات</nameField>
-			<nameField type="given-informal" draft="unconfirmed">ماكە</nameField>
-			<nameField type="given2" draft="unconfirmed">توقماحامبەتۇلى</nameField>
-			<nameField type="surname-prefix" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="surname-core" draft="unconfirmed">بالقىباي</nameField>
-			<nameField type="surname2" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="generation" draft="unconfirmed">∅∅∅</nameField>
-			<nameField type="credentials" draft="unconfirmed">∅∅∅</nameField>
+			<nameField type="title">مىرزا</nameField>
+			<nameField type="given">ماقسات</nameField>
+			<nameField type="given-informal">ماكە</nameField>
+			<nameField type="given2">توقماحامبەتۇلى</nameField>
+			<nameField type="surname-prefix">∅∅∅</nameField>
+			<nameField type="surname-core">بالقىباي</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
+			<nameField type="generation">∅∅∅</nameField>
+			<nameField type="credentials">∅∅∅</nameField>
 		</sampleName>
 		<sampleName item="foreignG">
-			<nameField type="given" draft="unconfirmed">سينباد</nameField>
+			<nameField type="given">سينباد</nameField>
 		</sampleName>
 		<sampleName item="foreignGS">
-			<nameField type="given" draft="unconfirmed">كەيت</nameField>
-			<nameField type="surname" draft="unconfirmed">مۇللەر</nameField>
+			<nameField type="given">كەيت</nameField>
+			<nameField type="surname">مۇللەر</nameField>
 		</sampleName>
 		<sampleName item="foreignGGS">
-			<nameField type="given" draft="unconfirmed">سەسيليا</nameField>
-			<nameField type="given2" draft="unconfirmed">حەمىش</nameField>
-			<nameField type="surname" draft="unconfirmed">شتوبەر</nameField>
+			<nameField type="given">سەسيليا</nameField>
+			<nameField type="given2">حەمىش</nameField>
+			<nameField type="surname">شتوبەر</nameField>
 		</sampleName>
 		<sampleName item="foreignFull">
-			<nameField type="title" draft="unconfirmed">پروءەسسوت</nameField>
-			<nameField type="given" draft="unconfirmed">ادا كورنەليا</nameField>
-			<nameField type="given-informal" draft="unconfirmed">نەلي</nameField>
-			<nameField type="given2" draft="unconfirmed">سەزار مارتين</nameField>
-			<nameField type="surname-prefix" draft="unconfirmed">فون</nameField>
-			<nameField type="surname-core" draft="unconfirmed">بريۋل</nameField>
-			<nameField type="surname2" draft="unconfirmed">گونسالەس</nameField>
-			<nameField type="generation" draft="unconfirmed">جۋنيور</nameField>
-			<nameField type="credentials" draft="unconfirmed">ءتىس دارىگەرى</nameField>
+			<nameField type="title">پروءەسسوت</nameField>
+			<nameField type="given">ادا كورنەليا</nameField>
+			<nameField type="given-informal">نەلي</nameField>
+			<nameField type="given2">سەزار مارتين</nameField>
+			<nameField type="surname-prefix">فون</nameField>
+			<nameField type="surname-core">بريۋل</nameField>
+			<nameField type="surname2">گونسالەس</nameField>
+			<nameField type="generation">جۋنيور</nameField>
+			<nameField type="credentials">ءتىس دارىگەرى</nameField>
 		</sampleName>
 	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/kl.xml b/make/data/cldr/common/main/kl.xml
index 83f3643a1ef..e5a4b9e1c85 100644
--- a/make/data/cldr/common/main/kl.xml
+++ b/make/data/cldr/common/main/kl.xml
@@ -376,7 +376,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">GGGGG y-MM-dd</pattern>
+							<pattern draft="unconfirmed">G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1034,6 +1034,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -1193,7 +1199,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one" draft="unconfirmed">{0} millimoli per literi</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} millimoli per literi</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one" draft="unconfirmed">{0} millioni ilaa</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} millioni ilaa</unitPattern>
 			</unit>
@@ -1448,7 +1454,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="area-square-foot">
 				<displayName draft="provisional">kvadratfod</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">millioni ilaa</displayName>
 			</unit>
 			<unit type="duration-year">
@@ -1657,7 +1663,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one" draft="unconfirmed">{0}mmol/L</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}mmol/L</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one" draft="unconfirmed">{0}ppm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}ppm</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/km.xml b/make/data/cldr/common/main/km.xml
index f07aa1d935f..31c141661e4 100644
--- a/make/data/cldr/common/main/km.xml
+++ b/make/data/cldr/common/main/km.xml
@@ -48,6 +48,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">អាស៊ែបៃហ្សង់</language>
 			<language type="az" alt="short">អាហ្ស៊ែរី</language>
 			<language type="ba">បាស្គៀ</language>
+			<language type="bal">បាលូឈី</language>
 			<language type="ban">បាលី</language>
 			<language type="bas">បាសា</language>
 			<language type="be">បេឡារុស</language>
@@ -62,7 +63,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bla">ស៊ីកស៊ីកា</language>
 			<language type="blo">អានី</language>
 			<language type="bm">បាម្បារា</language>
-			<language type="bn">បង់ក្លាដែស</language>
+			<language type="bn">បង់ក្លា</language>
 			<language type="bo">ទីបេ</language>
 			<language type="br">ប្រ៊ីស្តុន</language>
 			<language type="brx">បូដូ</language>
@@ -160,7 +161,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hi_Latn" alt="variant">ហ៊ីងលីង</language>
 			<language type="hil">ហ៊ីលីហ្គេណុន</language>
 			<language type="hmn">ម៉ុង</language>
-			<language type="hr">ក្រូអាត</language>
+			<language type="hr">ក្រូអាស៊ី</language>
 			<language type="hsb">សូប៊ីលើ</language>
 			<language type="ht">ហៃទី</language>
 			<language type="hu">ហុងគ្រី</language>
@@ -222,6 +223,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">បាហ្វៀ</language>
 			<language type="ksh">កូឡូញ</language>
 			<language type="ku">ឃឺដ</language>
+			<language type="ku" menu="core">ឃឺដ</language>
+			<language type="ku" menu="extension">ឃឺរម៉ាន់ជី</language>
 			<language type="kum">គូមីគ</language>
 			<language type="kv">កូមី</language>
 			<language type="kw">កូនីស</language>
@@ -457,7 +460,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="yi">យ៉ីឌីស</language>
 			<language type="yo">យរូបា</language>
 			<language type="yrl">ញីនហ្កាទូ</language>
-			<language type="yue">កន្តាំង</language>
+			<language type="yue">កាតាំង</language>
 			<language type="yue" alt="menu">ចិនកាតាំង</language>
 			<language type="za">ហ្សួង</language>
 			<language type="zgh">តាម៉ាហ្សៃម៉ារ៉ុកស្តង់ដា</language>
@@ -657,6 +660,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ចិន</territory>
 			<territory type="CO">កូឡុំប៊ី</territory>
 			<territory type="CP">កោះ​ឃ្លីភឺតុន</territory>
+			<territory type="CQ">សាខ</territory>
 			<territory type="CR">កូស្តារីកា</territory>
 			<territory type="CU">គុយបា</territory>
 			<territory type="CV">កាប់វែរ</territory>
@@ -887,50 +891,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</subdivisions>
 		<keys>
 			<key type="calendar">ប្រតិទិន</key>
-			<key type="cf">ទម្រង់រូបិយបណ្ណ</key>
+			<key type="cf">ទម្រង់រូបិយប័ណ្ណ</key>
 			<key type="collation">លំដាប់​តម្រៀប</key>
-			<key type="currency">រូបិយបណ្ណ</key>
+			<key type="currency">រូបិយប័ណ្ណ</key>
+			<key type="em">រូបរាងរូបអារម្មណ៍</key>
 			<key type="hc">វដ្តម៉ោង (12 vs 24)</key>
-			<key type="lb">របៀបចុះបន្ទាត់</key>
+			<key type="lb">ការចុះបន្ទាត់ភាសា CJK</key>
+			<key type="lw">ការចុះបន្ទាត់ក្នុងពាក្យ</key>
 			<key type="ms">ប្រព័ន្ធវាស់វែង</key>
 			<key type="numbers">លេខ</key>
+			<key type="ss">ការបំបែកប្រយោគបន្ទាប់ពី Abbr ។</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ប្រតិទិនពុទ្ធសាសនា</type>
+			<type key="calendar" type="buddhist" scope="core">ពុទ្ធសាសនា</type>
 			<type key="calendar" type="chinese">ប្រតិទិន​ចិន</type>
+			<type key="calendar" type="chinese" scope="core">ចិន</type>
 			<type key="calendar" type="coptic">ប្រតិទិនកបទិច</type>
-			<type key="calendar" type="dangi">ប្រតិទិនកូរ៉េ</type>
+			<type key="calendar" type="coptic" scope="core">កប់ទិក</type>
+			<type key="calendar" type="dangi">ប្រតិទិនថានហ្គី</type>
+			<type key="calendar" type="dangi" scope="core">ថានហ្គី</type>
 			<type key="calendar" type="ethiopic">ប្រតិទិន​អេត្យូពី</type>
+			<type key="calendar" type="ethiopic" scope="core">អេត្យូពី</type>
 			<type key="calendar" type="ethiopic-amete-alem">ប្រតិទិនអេត្យូពីអាម៉េតេ​អាលែម</type>
-			<type key="calendar" type="gregorian">ប្រតិទិន​ហ្សកហ្ស៊ី</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">អេត្យូពីអាម៉េតេ​អាលែម</type>
+			<type key="calendar" type="gregorian">ប្រតិទិនហ្គ្រីហ្គររៀន</type>
+			<type key="calendar" type="gregorian" scope="core">ហ្គ្រីហ្គររៀន</type>
 			<type key="calendar" type="hebrew">ប្រតិទិនហេប្រឺ</type>
+			<type key="calendar" type="hebrew" scope="core">ហេប្រឺ</type>
 			<type key="calendar" type="islamic">ប្រតិទិនអ៊ីស្លាម</type>
+			<type key="calendar" type="islamic" scope="core">ហ៊ីជ្រី</type>
 			<type key="calendar" type="islamic-civil">ប្រតិទិនអ៊ិស្លាម (តារាង, សម័យស៊ីវិល)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ហ៊ីជ្រី (តាមតារាង, សម័យស៊ីវិល)</type>
 			<type key="calendar" type="islamic-umalqura">ប្រតិទិនអ៊ិស្លាម (អ៊ុំអាល់គូរ៉ា)</type>
-			<type key="calendar" type="iso8601">ប្រតិទិន ISO-8601</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ហ៊ីជ្រី (អ៊ុំអាល់គូរ៉ា)</type>
+			<type key="calendar" type="iso8601">ប្រតិទិនហ្គ្រីហ្គររៀន (ឆ្នាំនៅពីមុខ)</type>
 			<type key="calendar" type="japanese">ប្រតិទិន​ជប៉ុន</type>
+			<type key="calendar" type="japanese" scope="core">ជប៉ុន</type>
 			<type key="calendar" type="persian">ប្រតិទិនពែក្ស</type>
+			<type key="calendar" type="persian" scope="core">ពែក្ស</type>
 			<type key="calendar" type="roc">ប្រតិទិនមីងគ័រ</type>
-			<type key="cf" type="account">ទម្រង់រូបិយបណ្ណគណនី</type>
-			<type key="cf" type="standard">ទម្រង់រូបិយបណ្ណបទដ្ឋាន</type>
+			<type key="calendar" type="roc" scope="core">មីងគ័រ</type>
+			<type key="cf" type="account">ទម្រង់រូបិយប័ណ្ណគណនេយ្យ</type>
+			<type key="cf" type="account" scope="core">គណនេយ្យ</type>
+			<type key="cf" type="standard">ទម្រង់រូបិយប័ណ្ណស្តង់ដា</type>
+			<type key="cf" type="standard" scope="core">ស្តង់ដា</type>
 			<type key="collation" type="ducet">លំដាប់​តម្រៀប​យូនីកូដ​លំនាំដើម</type>
-			<type key="collation" type="search">ស្វែងរក​ទូទៅ</type>
-			<type key="collation" type="standard">លំដាប់​តម្រៀប​ស្តង់ដារ</type>
+			<type key="collation" type="ducet" scope="core">យូនីកូដ​លំនាំដើម</type>
+			<type key="collation" type="search">ការស្វែងរកក្នុងគោលបំណងទូទៅ</type>
+			<type key="collation" type="search" scope="core">ស្វែងរក</type>
+			<type key="collation" type="standard">លំដាប់​តម្រៀប​ស្តង់ដា</type>
+			<type key="collation" type="standard" scope="core">ស្តង់ដា</type>
+			<type key="em" type="default" scope="core">លំនាំដើម</type>
+			<type key="em" type="emoji" scope="core">រូបអារម្មណ៍</type>
+			<type key="em" type="text" scope="core">អក្សរ</type>
 			<type key="hc" type="h11">ប្រព័ន្ធ 12 ម៉ោង (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">ប្រព័ន្ធ 12 ម៉ោង (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">ប្រព័ន្ធ 24 ម៉ោង (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">ប្រព័ន្ធ 24 ម៉ោង (1–24)</type>
-			<type key="lb" type="loose">របៀបចុះបន្ទាត់ខ្លី</type>
-			<type key="lb" type="normal">របៀបចុះបន្ទាត់ធម្មតា</type>
-			<type key="lb" type="strict">របៀបចុះបន្ទាត់តឹងរឹង</type>
-			<type key="ms" type="metric">ប្រព័ន្ធវាស់វែងម៉ាទ្រិក</type>
-			<type key="ms" type="uksystem">ប្រព័ន្ធវាស់វែងចក្រព័ទ្ធ</type>
-			<type key="ms" type="ussystem">ប្រព័ន្ធវាស់វែងអាមេរិក</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">បែបបទចុះបន្ទាត់ធូររលុង</type>
+			<type key="lb" type="loose" scope="core">ធូររលុង</type>
+			<type key="lb" type="normal">បែបបទចុះបន្ទាត់ធម្មតា</type>
+			<type key="lb" type="normal" scope="core">ធម្មតា</type>
+			<type key="lb" type="strict">បែបបទចុះបន្ទាត់តឹងរ៉ឹង</type>
+			<type key="lb" type="strict" scope="core">តឹងរ៉ឹង</type>
+			<type key="lw" type="breakall" scope="core">បំបែកទាំងអស់</type>
+			<type key="lw" type="keepall" scope="core">រក្សាទាំងអស់</type>
+			<type key="lw" type="normal" scope="core">ធម្មតា</type>
+			<type key="lw" type="phrase" scope="core">រក្សាក្នុងឃ្លា</type>
+			<type key="ms" type="metric">ប្រព័ន្ធម៉ែត្រ</type>
+			<type key="ms" type="metric" scope="core">ម៉ែត្រ</type>
+			<type key="ms" type="uksystem">ប្រព័ន្ធរង្វាស់អង់គ្លេស</type>
+			<type key="ms" type="uksystem" scope="core">ចក្រភពអង់គ្លេស</type>
+			<type key="ms" type="ussystem">ប្រព័ន្ធរង្វាស់សហរដ្ឋអាម៉េរិក</type>
+			<type key="ms" type="ussystem" scope="core">សហរដ្ឋអាម៉េរិក</type>
 			<type key="numbers" type="arab">លេខ​ឥណ្ឌា-អារ៉ាប់</type>
 			<type key="numbers" type="arabext">លេខ​ឥណ្ឌា-អារ៉ាប់​ពង្រីក</type>
 			<type key="numbers" type="armn">លេខ​អាមេនី</type>
 			<type key="numbers" type="armnlow">លេខ​តូច​អាមេនី</type>
-			<type key="numbers" type="beng">លេខ​បង់ក្លាដែស</type>
+			<type key="numbers" type="beng">លេខ​បង់ក្លា</type>
 			<type key="numbers" type="cakm">លេខចាក់ម៉ា</type>
 			<type key="numbers" type="deva">លេខ​ឌីវ៉ាណាការី</type>
 			<type key="numbers" type="ethi">លេខ​អេត្យូពី</type>
@@ -966,6 +1009,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">លេខ​ថៃ</type>
 			<type key="numbers" type="tibt">លេខទីបេ</type>
 			<type key="numbers" type="vaii">លេខវ៉ៃ</type>
+			<type key="ss" type="none" scope="core">បិទ</type>
+			<type key="ss" type="standard" scope="core">បើក</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">រង្វាស់​ប្រវែង</measurementSystemName>
@@ -1025,6 +1070,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} នៅ​ម៉ោង {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} នៅម៉ោង {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1033,23 +1081,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} នៅ​ម៉ោង {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} នៅម៉ោង {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="Hv">ម៉HH v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1380,6 +1446,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} នៅ​ម៉ោង {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} នៅម៉ោង {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1388,23 +1457,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} នៅ​ម៉ោង {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} នៅម៉ោង {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} នៅម៉ោង {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} នៅម៉ោង {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="Hv">ម៉HH v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -2136,6 +2217,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>អ៊ីស្ទ័រ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>កូយអៃកេ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ពុនតា អារ៉េណា</exemplarCity>
 			</zone>
@@ -2401,9 +2485,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ភ្នំពេញ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>អ៊ីនដឺប៊ូរី</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>កាន់តុន</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3073,9 +3154,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ម៉ោង​នៅ​អាហ្វ្រិក​ខាង​លិច</generic>
-					<standard>ម៉ោង​ស្តង់ដារ​នៅ​អាហ្វ្រិក​ខាង​លិច</standard>
-					<daylight>ម៉ោងនៅ​អាហ្វ្រិក​​​ខាងលិច​​នារដូវ​ក្ដៅ​</daylight>
+					<standard>ម៉ោង​នៅ​អាហ្វ្រិក​ខាង​លិច</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3425,6 +3504,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ម៉ោង​នៅ​ហ្គីយ៉ាន</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ម៉ោង​ស្តង់ដារ​​នៅ​ហាវៃ-អាល់ដ្យូសិន</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ម៉ោង​​នៅ​ហាវៃ-អាល់ដ្យូសិន</generic>
@@ -3971,7 +4055,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00¤</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤;(#,##0.00¤)</pattern>
@@ -3981,30 +4065,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0 ពាន់</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 ពាន់</pattern>
-					<pattern type="10000" count="other">¤00 ពាន់</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 ពាន់</pattern>
-					<pattern type="100000" count="other">¤000 ពាន់</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 ពាន់</pattern>
-					<pattern type="1000000" count="other">¤0 លាន</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0 លាន</pattern>
-					<pattern type="10000000" count="other">¤00 លាន</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00 លាន</pattern>
-					<pattern type="100000000" count="other">¤000 លាន</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000 លាន</pattern>
-					<pattern type="1000000000" count="other">¤0 ប៊ីលាន</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 ប៊ីលាន</pattern>
-					<pattern type="10000000000" count="other">¤00 ប៊ីលាន</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 ប៊ីលាន</pattern>
-					<pattern type="100000000000" count="other">¤000 ប៊ីលាន</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 ប៊ីលាន</pattern>
-					<pattern type="1000000000000" count="other">¤0 ទ្រីលាន</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 ទ្រីលាន</pattern>
-					<pattern type="10000000000000" count="other">¤00 ទ្រីលាន</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 ទ្រីលាន</pattern>
-					<pattern type="100000000000000" count="other">¤000 ទ្រីលាន</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 ទ្រីលាន</pattern>
+					<pattern type="1000" count="other">0ពាន់¤</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">0ពាន់ ¤</pattern>
+					<pattern type="10000" count="other">00 ពាន់¤</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">00 ពាន់ ¤</pattern>
+					<pattern type="100000" count="other">000 ពាន់¤</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">000 ពាន់ ¤</pattern>
+					<pattern type="1000000" count="other">0 លាន¤</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">0 លាន ¤</pattern>
+					<pattern type="10000000" count="other">00 លាន¤</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">00 លាន ¤</pattern>
+					<pattern type="100000000" count="other">000 លាន¤</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">000 លាន ¤</pattern>
+					<pattern type="1000000000" count="other">0 ប៊ីលាន¤</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0 ប៊ីលាន ¤</pattern>
+					<pattern type="10000000000" count="other">00 ប៊ីលាន¤</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00 ប៊ីលាន ¤</pattern>
+					<pattern type="100000000000" count="other">000 ប៊ីលាន¤</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000 ប៊ីលាន ¤</pattern>
+					<pattern type="1000000000000" count="other">0 ទ្រីលាន¤</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0 ទ្រីលាន ¤</pattern>
+					<pattern type="10000000000000" count="other">00 ទ្រីលាន¤</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00 ទ្រីលាន ¤</pattern>
+					<pattern type="100000000000000" count="other">000 ទ្រីលាន¤</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000 ទ្រីលាន ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4022,7 +4106,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ដ្រាំ​អាមេនី</displayName>
 			</currency>
 			<currency type="ANG">
-				<displayName>ហ្គីឌិន​ហុល្លង់​អង់ទីលៀន</displayName>
+				<displayName>ហ្គីលឌ័រអាំងទីលហូឡង់</displayName>
 			</currency>
 			<currency type="AOA">
 				<displayName>ក្វាន់ហ្សា​អង់ហ្គោឡា</displayName>
@@ -4367,7 +4451,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="QAR">
 				<displayName>រីយ៉ាលកាតា</displayName>
-				<displayName count="other">រីយ៉ាលកាតា</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName>លូ​រូម៉ានី</displayName>
@@ -4495,6 +4578,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ដុល្លារ​ការ៉ាប៊ីន​ខាង​កើត</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ហ្គីលឌ័រការីបៀន</displayName>
+				<displayName count="other">ហ្គីលឌ័រការីបៀន</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>ហ្វ្រង់ CFA អាហ្វ្រិកខាងលិច</displayName>
 			</currency>
@@ -4517,6 +4604,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>ក្វាចាហ្សំប៊ី</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ហ្កូលស៊ីមបាវ៉េ</displayName>
+				<displayName count="other">ហ្កូលស៊ីមបាវ៉េ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4663,7 +4754,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>មិល្លីម៉ូលក្នុងមួយលីត្រ</displayName>
 				<unitPattern count="other">{0} មិល្លីម៉ូលក្នុងមួយលីត្រ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ផ្នែកក្នុងមួយលាន</displayName>
 				<unitPattern count="other">{0} ផ្នែកក្នុងមួយលាន</unitPattern>
 			</unit>
@@ -5128,6 +5219,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>រង្វាស់ពែង</displayName>
 				<unitPattern count="other">{0} រង្វាស់ពែង</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>អោនស៍រាវម៉ែត្រ</displayName>
+				<unitPattern count="other">{0} អោនស៍រាវម៉ែត្រ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="other">{0} អាហ្វីត</unitPattern>
 			</unit>
@@ -5174,17 +5269,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ត្រាម</displayName>
 				<unitPattern count="other">{0} ត្រាម</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ពន្លឺ</displayName>
-				<unitPattern count="other">{0} ពន្លឺ</unitPattern>
+			<unit type="energy-becquerel">
+				<displayName>ប៊ែកគ័ររែល</displayName>
+				<unitPattern count="other">{0} ប៊ែកគ័ររែល</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ផ្នែកក្នុងមួយប៊ីលាន</displayName>
 				<unitPattern count="other">{0} ផ្នែកក្នុងមួយប៊ីលាន</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>យប់</displayName>
-				<unitPattern count="other">{0} យប់</unitPattern>
 				<perUnitPattern>{0} ក្នុងមួយយប់</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -5486,7 +5579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ពន្លឺ</displayName>
 				<unitPattern count="other">{0} ពន្លឺ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ផ្នែក/ប៊ីលាន</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -5590,7 +5683,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} វ.</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<unitPattern count="other">{0} សេះ</unitPattern>
+				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>mmHg</displayName>
@@ -5625,18 +5718,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-liter">
 				<unitPattern count="other">{0}L</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ពន្លឺ</displayName>
-				<unitPattern count="other">{0} ពន្លឺ</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>យប់</displayName>
-				<unitPattern count="other">{0} យប់</unitPattern>
-				<perUnitPattern>{0}/យប់</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/kn.xml b/make/data/cldr/common/main/kn.xml
index 344df888bb8..53ceb0c9116 100644
--- a/make/data/cldr/common/main/kn.xml
+++ b/make/data/cldr/common/main/kn.xml
@@ -286,6 +286,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ಬಫಿಯ</language>
 			<language type="ksh">ಕಲೊಗ್ನಿಯನ್</language>
 			<language type="ku">ಕುರ್ದಿಷ್</language>
+			<language type="ku" menu="core">ಕುರ್ದಿಷ್</language>
+			<language type="ku" menu="extension">ಕುರ್ಮಂಜಿ</language>
 			<language type="kum">ಕುಮೈಕ್</language>
 			<language type="kut">ಕುಟೇನಾಯ್</language>
 			<language type="kv">ಕೋಮಿ</language>
@@ -816,6 +818,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ಚೀನಾ</territory>
 			<territory type="CO">ಕೊಲಂಬಿಯಾ</territory>
 			<territory type="CP">ಕ್ಲಿಪ್ಪರ್‌ಟಾನ್ ದ್ವೀಪ</territory>
+			<territory type="CQ">ಸಾರ್ಕ್</territory>
 			<territory type="CR">ಕೊಸ್ಟಾ ರಿಕಾ</territory>
 			<territory type="CU">ಕ್ಯೂಬಾ</territory>
 			<territory type="CV">ಕೇಪ್ ವರ್ಡೆ</territory>
@@ -1062,34 +1065,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">ಸಂಖ್ಯೆ ವಿಂಗಡಣೆ</key>
 			<key type="colStrength">ವಿಂಗಡಣೆ ಸಾಮರ್ಥ್ಯ</key>
 			<key type="currency">ಕರೆನ್ಸಿ</key>
+			<key type="em">ಎಮೋಜಿ ಪ್ರೆಸೆಂಟೇಶನ್</key>
 			<key type="hc">ಕಾಲ ಚಕ್ರ (12 ವಿರುದ್ಧ 24)</key>
 			<key type="lb">ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</key>
+			<key type="lw">ಪದಗಳ ಮಧ್ಯ ಲೈನ್ ಬ್ರೇಕ್‌ಗಳು</key>
 			<key type="ms">ಮಾಪನ ವ್ಯವಸ್ಥೆ</key>
 			<key type="numbers">ಸಂಖ್ಯೆಗಳು</key>
+			<key type="ss">ಸಂಕ್ಷಿಪ್ತರೂಪದ ನಂತರ ವಾಕ್ಯ ವಿರಾಮ</key>
 			<key type="timezone">ಸಮಯ ವಲಯ</key>
 			<key type="va">ಸ್ಥಳೀಯ ಭಿನ್ನತೆ</key>
 			<key type="x">ಖಾಸಗಿ ಬಳಕೆ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ಬೌದ್ಧರ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="buddhist" scope="core">ಬೌದ್ಧ</type>
 			<type key="calendar" type="chinese">ಚೈನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="chinese" scope="core">ಚೈನೀಸ್</type>
 			<type key="calendar" type="coptic">ಕೋಪ್ಟಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="coptic" scope="core">ಕೋಪ್ಟಿಕ್</type>
 			<type key="calendar" type="dangi">ಡಾಂಗಿ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="dangi" scope="core">ಡಾಂಗಿ</type>
 			<type key="calendar" type="ethiopic">ಇಥಿಯೋಪಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="ethiopic" scope="core">ಇಥಿಯೋಪಿಕ್</type>
 			<type key="calendar" type="ethiopic-amete-alem">ಇಥಿಯೋಪಿಕ್ ಅಮೆಟೆ ಅಲೆಮ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ಇಥಿಯೋಪಿಕ್ ಅಮೆಟೆ ಅಲೆಮ್</type>
 			<type key="calendar" type="gregorian">ಗ್ರೆಗೋರಿಯನ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="gregorian" scope="core">ಗ್ರೆಗೋರಿಯನ್</type>
 			<type key="calendar" type="hebrew">ಹೀಬ್ರೂ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="hebrew" scope="core">ಹೀಬ್ರೂ</type>
 			<type key="calendar" type="indian">ಭಾರತೀಯ ರಾಷ್ಟ್ರೀಯ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="indian" scope="core">ಭಾರತೀಯ ರಾಷ್ಟ್ರೀಯ</type>
 			<type key="calendar" type="islamic">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="islamic" scope="core">ಹಿಜ್ರಿ</type>
 			<type key="calendar" type="islamic-civil">ಇಸ್ಲಾಮಿಕ್-ಸಿವಿಲ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="islamic-civil" scope="core">ಹಿಜ್ರಿ (ಟ್ಯಾಬುಲರ್, ನಾಗರಿಕ ಯುಗ)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ಇಸ್ಲಾಮಿಕ್‌ ಕ್ಯಾಲೆಂಡರ್‌ (ಸೌದಿ ಅರೇಬಿಯಾ, ಸೈಟಿಂಗ್‌)bia, sighting)</type>
 			<type key="calendar" type="islamic-umalqura">ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್ (ಉಮ್ ಅಲ್-ಖುರಾ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ಹಿಜ್ರಿ (ಉಮ್ ಅಲ್-ಖುರಾ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 ಕ್ಯಾಲೆಂಡರ್</type>
 			<type key="calendar" type="japanese">ಜಪಾನೀಸ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="japanese" scope="core">ಜಪಾನೀಸ್</type>
 			<type key="calendar" type="persian">ಪರ್ಷಿಯನ್ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="persian" scope="core">ಪರ್ಷಿಯನ್</type>
 			<type key="calendar" type="roc">ಮಿಂಗೋ ಕ್ಯಾಲೆಂಡರ್</type>
+			<type key="calendar" type="roc" scope="core">ಮಿಂಗೋ</type>
 			<type key="cf" type="account">ಅಕೌಂಟಿಂಗ್ ಕರೆನ್ಸಿ ಸ್ವರೂಪ</type>
+			<type key="cf" type="account" scope="core">ಅಕೌಂಟಿಂಗ್</type>
 			<type key="cf" type="standard">ಪ್ರಮಾಣಿತ ಕರೆನ್ಸಿ ಸ್ವರೂಪ</type>
+			<type key="cf" type="standard" scope="core">ಸ್ಟ್ಯಾಂಡರ್ಡ್</type>
 			<type key="colAlternate" type="non-ignorable">ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
 			<type key="colAlternate" type="shifted">ನಿರ್ಲಕ್ಷಿಸಿದ ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ</type>
 			<type key="colBackwards" type="no">ಉಚ್ಛಾರಣೆಯನ್ನು ಸಾಮಾನ್ಯವಾಗಿ ವಿಂಗಡಿಸಿ</type>
@@ -1099,20 +1122,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">ಮೊದಲು ಅಪ್ಪರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
 			<type key="colCaseLevel" type="no">ಕೇಸ್ ಇನ್‌ಸೆಂಟೀವ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
 			<type key="colCaseLevel" type="yes">ಕೇಸ್‌ ಸೆನ್ಸಿಟೀವ್‌‌ ವಿಂಗಡಿಸಿ</type>
-			<type key="collation" type="big5han">ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾದ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ - ದೊಡ್ಡ ಐದು</type>
 			<type key="collation" type="compat" draft="contributed">ಹೊಂದಾಣಿಕೆಯ ಸಲುವಾಗಿ ಹಿಂದಿನ ವಿಂಗಡಣಾ ಕ್ರಮ</type>
 			<type key="collation" type="dictionary">ಡಿಕ್ಷನರಿ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ</type>
 			<type key="collation" type="ducet">ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="ducet" scope="core">ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್</type>
 			<type key="collation" type="eor" draft="contributed">ಯುರೋಪಿನ ಅನುಕ್ರಮ ನಿಯಮಗಳು</type>
-			<type key="collation" type="gb2312han">ಸರಳೀಕೃತ ಚೈನೀಸ್ ವಿಂಗಡಣೆ ಕ್ರಮ - GB2312</type>
 			<type key="collation" type="phonebook">ಫೋನ್‌ಬುಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="collation" type="phonetic">ಉಚ್ಛಾರಣಾನುರೂಪವಾಗಿ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="collation" type="pinyin">ಪಿನ್‌ಯಿನ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="collation" type="search">ಸಾಮಾನ್ಯ- ಉದ್ದೇಶ ಹುಡುಕಾಟ</type>
+			<type key="collation" type="search" scope="core">ಹುಡುಕಾಟ</type>
 			<type key="collation" type="searchjl">ಹಂಗುಲ್ ಆದ್ಯಕ್ಷರ ವ್ಯಂಜನದ ಮೂಲಕ ಹುಡುಕಿ</type>
 			<type key="collation" type="standard">ಪ್ರಮಾಣೀಕೃತ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="standard" scope="core">ಪ್ರಮಾಣೀಕೃತ</type>
 			<type key="collation" type="stroke">ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="collation" type="traditional">ಸಾಂಪ್ರದಾಯಿಕ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
+			<type key="collation" type="traditional" scope="core">ಸಾಂಪ್ರದಾಯಿಕ</type>
 			<type key="collation" type="unihan">ರ್ಯಾಡಿಕಲ್-ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="colNormalization" type="no">ಸಾಮಾನ್ಯ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ ವಿಂಗಡಿಸಿ</type>
 			<type key="colNormalization" type="yes">ಸಾಮಾನ್ಯವಾದ ಯೂನಿಕೋಡ್ ಅನ್ನು ವಿಂಗಡಿಸಿ</type>
@@ -1126,18 +1151,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ಪೂರ್ಣಅಗಲಕ್ಕೆ</type>
 			<type key="d0" type="hwidth">ಅರೆಅಗಲಕ್ಕೆ</type>
 			<type key="d0" type="npinyin">ಸಂಖ್ಯೆ</type>
+			<type key="em" type="default" scope="core">ಡೀಫಾಲ್ಟ್</type>
+			<type key="em" type="emoji" scope="core">ಎಮೋಜಿ</type>
+			<type key="em" type="text" scope="core">ಪಠ್ಯ</type>
 			<type key="hc" type="h11">12 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ಲೂಸ್ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</type>
+			<type key="lb" type="loose" scope="core">ಲೂಸ್</type>
 			<type key="lb" type="normal">ಸಾಮಾನ್ಯ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</type>
+			<type key="lb" type="normal" scope="core">ಸಾಮಾನ್ಯ</type>
 			<type key="lb" type="strict">ಕಟ್ಟುನಿಟ್ಟಾದ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ</type>
+			<type key="lb" type="strict" scope="core">ಕಟ್ಟು ನಿಟ್ಟು</type>
+			<type key="lw" type="breakall" scope="core">ಎಲ್ಲವನ್ನು ಬ್ರೇಕ್ ಮಾಡಿ</type>
+			<type key="lw" type="keepall" scope="core">ಎಲ್ಲವನ್ನು ಇರಿಸಿಕೊಳ್ಳಿ</type>
+			<type key="lw" type="normal" scope="core">ಸಾಮಾನ್ಯ</type>
+			<type key="lw" type="phrase" scope="core">ಪದಗುಚ್ಛಗಳಲ್ಲಿ ಇರಿಸಿಕೊಳ್ಳಿ</type>
 			<type key="m0" type="bgn">ಯುಎಸ್ ಬಿಜಿಎನ್ ಲಿಪ್ಯಂತರಣ</type>
 			<type key="m0" type="ungegn">ಯುಎಸ್ ಜಿಇಜಿಎನ್ ಲಿಪ್ಯಂತರಣ</type>
 			<type key="ms" type="metric">ಮೆಟ್ರಿಕ್ ಪದ್ಧತಿ</type>
+			<type key="ms" type="metric" scope="core">ಮೆಟ್ರಿಕ್</type>
 			<type key="ms" type="uksystem">ಇಂಪಿರಿಯಲ್ ಮಾಪನ ವ್ಯವಸ್ಥೆ</type>
+			<type key="ms" type="uksystem" scope="core">ಯುನೈಟೆಡ್ ಕಿಂಗ್‌ಡಮ್</type>
 			<type key="ms" type="ussystem">ಅಮೇರಿಕಾದ ಮಾಪನಾ ವ್ಯವಸ್ಥೆ</type>
+			<type key="ms" type="ussystem" scope="core">ಅಮೇರಿಕಾ</type>
 			<type key="numbers" type="arab">ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು</type>
 			<type key="numbers" type="arabext">ವಿಸ್ತರಿಸಲಾದ ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು</type>
 			<type key="numbers" type="armn">ಆರ್ಮೇನಿಯಾದ ಸಂಖ್ಯೆಗಳು</type>
@@ -1182,6 +1224,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">ಟಿಬೇಟಿಯನ್ ಅಂಕೆಗಳು</type>
 			<type key="numbers" type="traditional">ಸಾಂಪ್ರದಾಯಿಕ ಸಂಖ್ಯೆಗಳು</type>
 			<type key="numbers" type="vaii">ವಾಯ್ ಅಂಕೆಗಳು</type>
+			<type key="ss" type="none" scope="core">ಆಫ್</type>
+			<type key="ss" type="standard" scope="core">ಆನ್</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ಮೆಟ್ರಿಕ್</measurementSystemName>
@@ -1203,13 +1247,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="general" level="lenient">
 			<parseLenient sample="₹">[₹ {ರೂ}]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="number" level="lenient">
-			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
-			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
-		</parseLenients>
-		<parseLenients scope="number" level="stricter">
-			<parseLenient sample=",">[,，﹐︐ ٫]</parseLenient>
-		</parseLenients>
 	</characters>
 	<dates>
 		<calendars>
@@ -1274,7 +1311,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1302,6 +1339,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1310,9 +1350,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
@@ -1394,20 +1438,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">ಜನ</month>
-							<month type="2">ಫೆಬ್ರ</month>
-							<month type="3">ಮಾರ್ಚ್</month>
-							<month type="4">ಏಪ್ರಿ</month>
-							<month type="5">ಮೇ</month>
-							<month type="6">ಜೂನ್</month>
-							<month type="7">ಜುಲೈ</month>
-							<month type="8">ಆಗ</month>
-							<month type="9">ಸೆಪ್ಟೆಂ</month>
-							<month type="10">ಅಕ್ಟೋ</month>
-							<month type="11">ನವೆಂ</month>
-							<month type="12">ಡಿಸೆಂ</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ಜ</month>
 							<month type="2">ಫೆ</month>
@@ -1491,24 +1521,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">ಸಂಜೆ</dayPeriod>
 							<dayPeriod type="night1">ರಾತ್ರಿ</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="midnight">ಮಧ್ಯರಾತ್ರಿ</dayPeriod>
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1581,6 +1597,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} ರಂದು {0} ಸಮಯಕ್ಕೆ</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} ಸಮಯಕ್ಕೆ</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1589,6 +1608,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} ರಂದು {0} ಸಮಯಕ್ಕೆ</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} ಸಮಯಕ್ಕೆ</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1605,6 +1627,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} ಗೆ</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
@@ -2013,12 +2038,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} ಶುಕ್ರವಾರಗಳ ಹಿಂದೆ</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="fri-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} ಶುಕ್ರವಾರದ ಹಿಂದೆ</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ಶುಕ್ರವಾರಗಳ ಹಿಂದೆ</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="sat">
 				<relative type="-1">ಕಳೆದ ಶನಿವಾರ</relative>
 				<relative type="0">ಈ ಶನಿವಾರ</relative>
@@ -2035,9 +2054,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="dayperiod">
 				<displayName>AM/PM</displayName>
 			</field>
-			<field type="dayperiod-narrow">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="hour">
 				<displayName>ಗಂಟೆ</displayName>
 				<relative type="0">ಈ ಗಂಟೆ</relative>
@@ -2438,6 +2454,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ಈಸ್ಟರ್</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ಕೊಯಯ್ಕಿ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ಪುಂತಾ ಅರೇನಾಸ್</exemplarCity>
 			</zone>
@@ -2703,10 +2722,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ನೋಮ್ ಪೆನ್</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ಎಂಡರ್ಬರಿ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>ಕ್ಯಾಂಟನ್</exemplarCity>
+				<exemplarCity>ಕ್ಯಾಂಟನ್ ಐಲ್ಯಾಂಡ್</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>ಕಿರಿತಿಮತಿ</exemplarCity>
@@ -3382,9 +3398,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾ ಸಮಯ</generic>
-					<standard>ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
-					<daylight>ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾ ಬೇಸಿಗೆ ಸಮಯ</daylight>
+					<standard>ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾ ಸಮಯ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3767,6 +3781,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ಗಯಾನಾ ಸಮಯ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ಹವಾಯಿ-ಅಲ್ಯುಟಿಯನ್ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ಹವಾಯಿ-ಅಲ್ಯುಟಿಯನ್ ಸಮಯ</generic>
@@ -4220,6 +4239,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ಚುಕ್ ಸಮಯ</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="unconfirmed">ಟರ್ಕಿ ಸಮಯ</generic>
+					<standard draft="unconfirmed">ಟರ್ಕಿ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
+					<daylight draft="unconfirmed">ಟರ್ಕಿ ಬೇಸಿಗೆ ಸಮಯ</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>ತುರ್ಕ್‌ಮೇನಿಸ್ತಾನ್ ಸಮಯ</generic>
@@ -4374,8 +4400,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5195,6 +5219,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್</displayName>
 				<displayName count="other">ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್‌ಗಳು</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ಕೆರೆಬಿಯನ್ ಗಿಲ್ಡರ್</displayName>
+				<displayName count="one">ಕೆರೆಬಿಯನ್ ಗಿಲ್ಡರ್</displayName>
+				<displayName count="other">ಕೆರೆಬಿಯನ್ ಗಿಲ್ಡರ್‌ಗಳು</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ CFA ಫ್ರಾಂಕ್</displayName>
 				<displayName count="one">ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ CFA ಫ್ರಾಂಕ್</displayName>
@@ -5226,6 +5255,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">ಜಾಂಬಿಯಾ ಕ್ವಾಚ</displayName>
 				<displayName count="other">ಜಾಂಬಿಯಾ ಕ್ವಾಚಗಳು</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ಜಿಂಬಾಬ್ವಿಯನ್ ಗೋಲ್ಡ್</displayName>
+				<displayName count="one">ಜಿಂಬಾಬ್ವಿಯನ್ ಗೋಲ್ಡ್</displayName>
+				<displayName count="other">ಜಿಂಬಾಬ್ವಿಯನ್ ಗೋಲ್ಡ್</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5611,7 +5645,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} ವಸ್ತುಗಳ</unitPattern>
 				<unitPattern count="other" case="locative">{0} ವಸ್ತುಗಳಲ್ಲಿ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ಪಾರ್ಟ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಪಾರ್ಟ್</unitPattern>
+				<unitPattern count="other">{0} ಪಾರ್ಟ್ಸ್</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>neuter</gender>
 				<displayName>ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು</displayName>
 				<unitPattern count="one">{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗವು</unitPattern>
@@ -5681,6 +5720,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} ಮೋಲ್‌ಗಳ</unitPattern>
 				<unitPattern count="other" case="locative">{0} ಮೋಲ್‌ಗಳಲ್ಲಿ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one">{0} ಗ್ಲೂಕೋಸ್</unitPattern>
+				<unitPattern count="other">{0} ಗ್ಲೂಕೋಸ್</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>neuter</gender>
 				<displayName>ಲೀಟರ್‌ಗಳು ಪ್ರತಿ ಕಿಲೋಮೀಟರಿಗೆ</displayName>
@@ -5881,6 +5924,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="dative">{0} ಶತಮಾನಕ್ಕೆ</unitPattern>
 				<unitPattern count="one" case="genitive">{0} ಶತಮಾನದ</unitPattern>
 				<unitPattern count="one" case="locative">{0} ಶತಮಾನದಲ್ಲಿ</unitPattern>
+				<unitPattern count="one" case="vocative">{0} ಶತಮಾನ</unitPattern>
 				<unitPattern count="other">{0}ಶತಮಾನಗಳು</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ಶತಮಾನಗಳನ್ನು</unitPattern>
 				<unitPattern count="other" case="dative">{0} ಶತಮಾನಗಳಿಗೆ</unitPattern>
@@ -5903,11 +5947,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-year">
 				<gender>neuter</gender>
-				<unitPattern count="one">{0} ವರ್ಷವು</unitPattern>
+				<unitPattern count="one">{0} ವರ್ಷ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ವರ್ಷವನ್ನು</unitPattern>
 				<unitPattern count="one" case="dative">{0} ವರ್ಷಕ್ಕೆ</unitPattern>
 				<unitPattern count="one" case="genitive">{0} ವರ್ಷದ</unitPattern>
 				<unitPattern count="one" case="locative">{0} ವರ್ಷದಲ್ಲಿ</unitPattern>
+				<unitPattern count="one" case="vocative">{0} ವರ್ಷ</unitPattern>
 				<unitPattern count="other">{0} ವರ್ಷಗಳು</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ವರ್ಷಗಳನ್ನು</unitPattern>
 				<unitPattern count="other" case="dative">{0} ವರ್ಷಗಳಿಗೆ</unitPattern>
@@ -5975,7 +6020,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-hour">
 				<gender>neuter</gender>
-				<unitPattern count="one">{0} ಗಂಟೆಯು</unitPattern>
+				<unitPattern count="one">{0} ಗಂಟೆ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ಗಂಟೆಯನ್ನು</unitPattern>
 				<unitPattern count="one" case="dative">{0} ಗಂಟೆಗೆ</unitPattern>
 				<unitPattern count="one" case="genitive">{0} ಗಂಟೆಯ</unitPattern>
@@ -6360,7 +6405,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ಡಾಟ್‌ಗಳು</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName>ಭೂಮಿಯ ತ್ರಿಜ್ಯ</displayName>
 				<unitPattern count="one">{0} ಭೂಮಿಯ ತ್ರಿಜ್ಯ</unitPattern>
 				<unitPattern count="other">{0} ಭೂಮಿಯ ತ್ರಿಜ್ಯ</unitPattern>
 			</unit>
@@ -6714,10 +6758,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} ಕ್ಯಾರೆಟ್‌ಗಳ</unitPattern>
 				<unitPattern count="other" case="locative">{0} ಕ್ಯಾರೆಟ್‌ಗಳಲ್ಲಿ</unitPattern>
 			</unit>
-			<unit type="mass-dalton">
-				<unitPattern count="one">{0} ಡಿಎ</unitPattern>
-				<unitPattern count="other">{0} ಡಿಎ</unitPattern>
-			</unit>
 			<unit type="mass-earth-mass">
 				<displayName>ಭೂಮಿಯ ದ್ರವ್ಯರಾಶಿಗಳು</displayName>
 				<unitPattern count="one">{0} ಭೂಮಿಯ ದ್ರವ್ಯರಾಶಿ</unitPattern>
@@ -6806,15 +6846,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>neuter</gender>
 				<displayName>ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</displayName>
 				<unitPattern count="one">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌</unitPattern>
-				<unitPattern count="one" case="dative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌</unitPattern>
-				<unitPattern count="one" case="genitive">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌</unitPattern>
-				<unitPattern count="one" case="locative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ ಅನ್ನು</unitPattern>
+				<unitPattern count="one" case="dative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ಗೆ</unitPattern>
+				<unitPattern count="one" case="genitive">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ನ</unitPattern>
+				<unitPattern count="one" case="locative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ನಲ್ಲಿ</unitPattern>
 				<unitPattern count="other">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</unitPattern>
-				<unitPattern count="other" case="dative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</unitPattern>
-				<unitPattern count="other" case="genitive">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</unitPattern>
-				<unitPattern count="other" case="locative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ಗಳನ್ನು</unitPattern>
+				<unitPattern count="other" case="dative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ಗಳಿಗೆ</unitPattern>
+				<unitPattern count="other" case="genitive">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ಗಳ</unitPattern>
+				<unitPattern count="other" case="locative">{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌‌ಗಳಲ್ಲಿ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ಮರ್ಕ್ಯೂರಿ</displayName>
+				<unitPattern count="one">{0} ಮರ್ಕ್ಯೂರಿ</unitPattern>
+				<unitPattern count="other">{0} ಮರ್ಕ್ಯೂರಿ</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ಪೌಂಡ್ಸ್-ಫೋರ್ಸ್ ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ</displayName>
@@ -7209,6 +7254,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} ಮೆಟ್ರಿಕ್‌ ಕಪ್‌ಗಳ</unitPattern>
 				<unitPattern count="other" case="locative">{0} ಮೆಟ್ರಿಕ್‌ ಕಪ್‌ಗಳಲ್ಲಿ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ಮೆಟ್ರಿಕ್ ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್‌ಗಳು</displayName>
+				<unitPattern count="one">{0} ಮೆಟ್ರಿಕ್ ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್</unitPattern>
+				<unitPattern count="other">{0} ಮೆಟ್ರಿಕ್ ಫ್ಲೂಯ್ಡ್ ಔನ್ಸ್‌ಗಳು</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ಎಕರೆ-ಅಡಿ</displayName>
 				<unitPattern count="one">{0} ಎಕರೆ-ಅಡಿ</unitPattern>
@@ -7293,9 +7343,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ಇಂಪಿರಿಯಲ್ ಕ್ವಾರ್ಟ್</unitPattern>
 				<unitPattern count="other">{0} ಇಂಪಿರಿಯಲ್ ಕ್ವಾರ್ಟ್</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ಸ್ಟೆರಾಡಿಯನ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಸ್ಟೆರಾಡಿಯನ್</unitPattern>
+				<unitPattern count="other">{0} ಸ್ಟೆರಾಡಿಯನ್ಸ್</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ಕ್ಯಾಟಲ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಕ್ಯಾಟಲ್</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯಾಟಲ್ಸ್</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ಕೂಲಂಬ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಕೂಲಂಬ್</unitPattern>
+				<unitPattern count="other">{0} ಕೂಲಂಬ್ಸ್</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ಫ್ಯಾರಡ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಫ್ಯಾರಡ್</unitPattern>
+				<unitPattern count="other">{0} ಫ್ಯಾರಡ್ಸ್</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ಹೆನ್ರಿಸ್</displayName>
+				<unitPattern count="one">{0} ಹೆನ್ರಿ</unitPattern>
+				<unitPattern count="other">{0} ಹೆನ್ರಿಸ್</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ಸೀಮೆನ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಸೀಮೆನ್ಸ್</unitPattern>
+				<unitPattern count="other">{0} ಸೀಮೆನ್ಸ್</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ಕ್ಯಾಲೋರಿಗಳು [IT]</displayName>
+				<unitPattern count="one">{0} ಕ್ಯಾಲೋರಿ [IT]</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯಾಲೋರಿಗಳು [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ಬೆಕೆರೆಲ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಬೆಕೆರೆಲ್</unitPattern>
+				<unitPattern count="other">{0} ಬೆಕೆರೆಲ್ಸ್</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ಸೀವೆರ್ಟ್</displayName>
+				<unitPattern count="one">{0} ಸೀವೆರ್ಟ್</unitPattern>
+				<unitPattern count="other">{0} ಸೀವೆರ್ಟ್ಸ್</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ಗ್ರೇಸ್</displayName>
+				<unitPattern count="one">{0} ಗ್ರೇ</unitPattern>
+				<unitPattern count="other">{0} ಗ್ರೇಸ್</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ಕಿಲೋಗ್ರಾಮ್ಸ್-ಫೋರ್ಸ್</displayName>
+				<unitPattern count="one">{0} ಕಿಲೋಗ್ರಾಂ-ಫೋರ್ಸ್</unitPattern>
+				<unitPattern count="other">{0} ಕಿಲೋಗ್ರಾಂ-ಫೋರ್ಸ್</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ಟೆಸ್ಲಾಸ್</displayName>
+				<unitPattern count="one">{0} ಟೆಸ್ಲಾ</unitPattern>
+				<unitPattern count="other">{0} ಟೆಸ್ಲಾಸ್</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ವೆಬರ್ಸ್</displayName>
+				<unitPattern count="one">{0} ವೆಬರ್</unitPattern>
+				<unitPattern count="other">{0} ವೆಬರ್ಸ್</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>ಲೈಟ್</displayName>
 				<unitPattern count="one">{0} ಲೈಟ್</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ಲೈಟ್ ಅನ್ನು</unitPattern>
 				<unitPattern count="one" case="dative">{0} ಲೈಟ್‌ಗೆ</unitPattern>
@@ -7307,7 +7421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} ಲೈಟ್‌‌ನ</unitPattern>
 				<unitPattern count="other" case="locative">{0} ಲೈಟ್‌ನಲ್ಲಿ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>neuter</gender>
 				<displayName>ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್</displayName>
 				<unitPattern count="one">{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್</unitPattern>
@@ -7530,7 +7644,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ವಸ್ತು</unitPattern>
 				<unitPattern count="other">{0} ವಸ್ತು</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ಪಾರ್ಟ್</displayName>
+				<unitPattern count="one">{0} ಪಾರ್ಟ್</unitPattern>
+				<unitPattern count="other">{0} ಪಾರ್ಟ್</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ಭಾಗಗಳು/ಮಿಲಿಯನ್</displayName>
 				<unitPattern count="one">{0} ಭಾಪ್ರಮಿ</unitPattern>
 				<unitPattern count="other">{0} ಭಾಪ್ರಮಿ</unitPattern>
@@ -7549,6 +7668,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ಮೋಲ್</unitPattern>
 				<unitPattern count="other">{0} ಮೋಲ್</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ಲೀಟರ್‌ಗಳು/ಕಿಮೀ</displayName>
 				<unitPattern count="one">{0} ಲೀ/ಕಿ.ಮೀ</unitPattern>
@@ -7908,8 +8032,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-mile-scandinavian">
 				<displayName>ಸ್ಕ್ಯಾಂ.ಮೈ</displayName>
-				<unitPattern count="one">{0} smi</unitPattern>
-				<unitPattern count="other">{0} smi</unitPattern>
 			</unit>
 			<unit type="length-point">
 				<displayName>ಪಾಯಿಂಟ್‌ಗಳು</displayName>
@@ -8317,12 +8439,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ಕ್ವಾ.ಇಂಪ್</unitPattern>
 				<unitPattern count="other">{0} ಕ್ವಾ.ಇಂಪ್</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ಕ್ಯಾಟ್</displayName>
+				<unitPattern count="one">{0} ಕ್ಯಾಟ್</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯಾಟ್</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ಲೈಟ್</displayName>
 				<unitPattern count="one">{0} ಲೈಟ್</unitPattern>
 				<unitPattern count="other">{0} ಲೈಟ್</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ಪಾರ್ಟ್ಸ್/ಬಿಲಿಯನ್</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -8479,7 +8643,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ವಸ್ತು</unitPattern>
 				<unitPattern count="other">{0}ವಸ್ತು</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ಪಾರ್ಟ್</displayName>
+				<unitPattern count="one">{0} ಪಾರ್ಟ್</unitPattern>
+				<unitPattern count="other">{0} ಪಾರ್ಟ್</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ಭಾಪ್ರಮಿ</displayName>
 				<unitPattern count="one">{0}ಭಾಪ್ರಮಿ</unitPattern>
 				<unitPattern count="other">{0}ಭಾಪ್ರಮಿ</unitPattern>
@@ -8497,6 +8666,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ಮೋಲ್</unitPattern>
 				<unitPattern count="other">{0}ಮೋಲ್</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ಲೀ/ಕಿಮೀ</displayName>
 			</unit>
@@ -9090,16 +9264,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ಲೈಟ್</displayName>
-				<unitPattern count="one">{0} ಲೈಟ್</unitPattern>
-				<unitPattern count="other">{0} ಲೈಟ್</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>ಕ್ಯಾಟ್</displayName>
+				<unitPattern count="one">{0} ಕ್ಯಾಟ್</unitPattern>
+				<unitPattern count="other">{0} ಕ್ಯಾಟ್</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
 			<unit type="duration-night">
 				<displayName>ರಾತ್ರಿಗಳು</displayName>
-				<unitPattern count="one">{0} ರಾತ್ರಿಯು</unitPattern>
-				<unitPattern count="other">{0} ರಾತ್ರಿಗಳು</unitPattern>
-				<perUnitPattern>{0}/ರಾತ್ರಿಗೆ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}ಪೂ</coordinateUnitPattern>
@@ -9459,7 +9633,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</sampleName>
 		<sampleName item="foreignGS">
 			<nameField type="given">ಕ್ಯಾಥಿ</nameField>
-			<nameField type="surname">ಮಲ್ಲರ್</nameField>
+			<nameField type="surname">ಮುಲ್ಲರ್</nameField>
 		</sampleName>
 		<sampleName item="foreignGGS">
 			<nameField type="given">ಝಝಿಲಿಯಾ</nameField>
diff --git a/make/data/cldr/common/main/ko.xml b/make/data/cldr/common/main/ko.xml
index 893a89500e8..dd0a8ad6869 100644
--- a/make/data/cldr/common/main/ko.xml
+++ b/make/data/cldr/common/main/ko.xml
@@ -296,6 +296,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">바피아어</language>
 			<language type="ksh">콜로그니안어</language>
 			<language type="ku">쿠르드어</language>
+			<language type="ku" menu="core">쿠르드어</language>
+			<language type="ku" menu="extension" draft="contributed">쿠르만지</language>
 			<language type="kum">쿠믹어</language>
 			<language type="kut">쿠테네어</language>
 			<language type="kv">코미어</language>
@@ -419,7 +421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="os">오세트어</language>
 			<language type="osa">오세이지어</language>
 			<language type="ota">오스만 터키어</language>
-			<language type="pa">펀잡어</language>
+			<language type="pa">펀자브어</language>
 			<language type="pag">판가시난어</language>
 			<language type="pal">팔레비어</language>
 			<language type="pam">팜팡가어</language>
@@ -866,6 +868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">중국</territory>
 			<territory type="CO">콜롬비아</territory>
 			<territory type="CP">클리퍼턴섬</territory>
+			<territory type="CQ" draft="contributed">사크</territory>
 			<territory type="CR">코스타리카</territory>
 			<territory type="CU">쿠바</territory>
 			<territory type="CV">카보베르데</territory>
@@ -948,6 +951,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="KN">세인트키츠 네비스</territory>
 			<territory type="KP">북한</territory>
 			<territory type="KR">대한민국</territory>
+			<territory type="KR" alt="short">한국</territory>
 			<territory type="KW">쿠웨이트</territory>
 			<territory type="KY">케이맨 제도</territory>
 			<territory type="KZ">카자흐스탄</territory>
@@ -1159,33 +1163,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">숫자 정렬</key>
 			<key type="colStrength">정렬 강도</key>
 			<key type="currency">통화</key>
+			<key type="em" draft="contributed">이모티콘 표시</key>
 			<key type="hc">시간표시법(12시, 24시)</key>
 			<key type="lb">줄바꿈 스타일</key>
+			<key type="lw" draft="contributed">단어의 줄바꿈</key>
 			<key type="ms">계량법</key>
 			<key type="numbers">숫자</key>
+			<key type="ss" draft="contributed">약어 뒤 문장 구분</key>
 			<key type="timezone">시간대</key>
 			<key type="va">방언</key>
 			<key type="x">공개 여부</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">불교력</type>
+			<type key="calendar" type="buddhist" scope="core" draft="contributed">불교</type>
 			<type key="calendar" type="chinese">음력</type>
+			<type key="calendar" type="chinese" scope="core" draft="contributed">음</type>
 			<type key="calendar" type="coptic">콥트력</type>
+			<type key="calendar" type="coptic" scope="core" draft="contributed">콥트</type>
 			<type key="calendar" type="dangi">단기력</type>
+			<type key="calendar" type="dangi" scope="core" draft="contributed">단기</type>
 			<type key="calendar" type="ethiopic">에티오피아력</type>
+			<type key="calendar" type="ethiopic" scope="core" draft="contributed">에티오피아</type>
 			<type key="calendar" type="ethiopic-amete-alem">에티오피아 아메테 알렘력</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core" draft="contributed">에티오피아 아메테 알렘</type>
 			<type key="calendar" type="gregorian">양력</type>
+			<type key="calendar" type="gregorian" scope="core" draft="contributed">양</type>
 			<type key="calendar" type="hebrew">히브리력</type>
+			<type key="calendar" type="hebrew" scope="core" draft="contributed">히브리</type>
 			<type key="calendar" type="indian">인도력</type>
 			<type key="calendar" type="islamic">히즈라력</type>
+			<type key="calendar" type="islamic" scope="core" draft="contributed">히즈라</type>
 			<type key="calendar" type="islamic-civil">히즈라 상용력</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="contributed">히즈라 상용</type>
 			<type key="calendar" type="islamic-umalqura">히즈라력(움 알 쿠라)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core" draft="contributed">히즈라(움 알 쿠라)</type>
 			<type key="calendar" type="iso8601">ISO-8601 달력</type>
 			<type key="calendar" type="japanese">일본력</type>
+			<type key="calendar" type="japanese" scope="core" draft="contributed">일본</type>
 			<type key="calendar" type="persian">페르시안력</type>
+			<type key="calendar" type="persian" scope="core" draft="contributed">페르시안</type>
 			<type key="calendar" type="roc">대만력</type>
+			<type key="calendar" type="roc" scope="core" draft="contributed">대만</type>
 			<type key="cf" type="account">회계 통화 형식</type>
+			<type key="cf" type="account" scope="core" draft="contributed">회계</type>
 			<type key="cf" type="standard">표준 통화 형식</type>
+			<type key="cf" type="standard" scope="core" draft="contributed">표준</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">기호 정렬</type>
 			<type key="colAlternate" type="shifted" draft="contributed">기호 무시 정렬</type>
 			<type key="colBackwards" type="no" draft="contributed">악센트 일반 정렬</type>
@@ -1195,22 +1218,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">대문자 우선 정렬</type>
 			<type key="colCaseLevel" type="no" draft="contributed">대/소문자 무시 정렬</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">대/소문자 구분 정렬</type>
-			<type key="collation" type="big5han">중국어 번체 정렬 순서 (Big5)</type>
 			<type key="collation" type="compat">호환성을 위해 이전 정렬 순서</type>
+			<type key="collation" type="compat" scope="core" draft="contributed">호환성</type>
 			<type key="collation" type="dictionary">사전 정렬순</type>
+			<type key="collation" type="dictionary" scope="core" draft="contributed">사전</type>
 			<type key="collation" type="ducet">기본 유니코드 정렬 순서</type>
+			<type key="collation" type="ducet" scope="core" draft="contributed">기본 유니코드</type>
 			<type key="collation" type="eor" draft="contributed">유럽 정렬 규칙</type>
-			<type key="collation" type="gb2312han">중국어 간체 정렬 순서 (GB2312)</type>
 			<type key="collation" type="phonebook">전화번호부순</type>
+			<type key="collation" type="phonebook" scope="core" draft="contributed">전화번호부</type>
 			<type key="collation" type="phonetic">소리나는 대로 정렬 순서</type>
+			<type key="collation" type="phonetic" scope="core" draft="contributed">소리나는 대로</type>
 			<type key="collation" type="pinyin">병음순</type>
+			<type key="collation" type="pinyin" scope="core" draft="contributed">병음</type>
 			<type key="collation" type="search">범용 검색</type>
+			<type key="collation" type="search" scope="core" draft="contributed">검색</type>
 			<type key="collation" type="searchjl" draft="contributed">한글 자음으로 검색</type>
 			<type key="collation" type="standard">표준 정렬 순서</type>
+			<type key="collation" type="standard" scope="core" draft="contributed">표준</type>
 			<type key="collation" type="stroke">자획순</type>
+			<type key="collation" type="stroke" scope="core" draft="contributed">자획</type>
 			<type key="collation" type="traditional">전통 역법</type>
+			<type key="collation" type="traditional" scope="core" draft="contributed">전통</type>
 			<type key="collation" type="unihan">부수순</type>
+			<type key="collation" type="unihan" scope="core" draft="contributed">부수</type>
 			<type key="collation" type="zhuyin">주음순</type>
+			<type key="collation" type="zhuyin" scope="core" draft="contributed">주음</type>
 			<type key="colNormalization" type="no" draft="contributed">표준화 없이 정렬</type>
 			<type key="colNormalization" type="yes" draft="contributed">유니코드 표준화 정렬</type>
 			<type key="colNumeric" type="no" draft="contributed">숫자별 정렬</type>
@@ -1223,18 +1256,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">전각</type>
 			<type key="d0" type="hwidth">반각</type>
 			<type key="d0" type="npinyin" draft="contributed">숫자</type>
+			<type key="em" type="default" scope="core" draft="contributed">기본</type>
+			<type key="em" type="emoji" scope="core" draft="contributed">이모티콘</type>
+			<type key="em" type="text" scope="core" draft="contributed">텍스트</type>
 			<type key="hc" type="h11">12시간제(0–11)</type>
+			<type key="hc" type="h11" scope="core" draft="contributed">12(0–11)</type>
 			<type key="hc" type="h12">12시간제(1–12)</type>
+			<type key="hc" type="h12" scope="core" draft="contributed">12(1–12)</type>
 			<type key="hc" type="h23">24시간제(0–23)</type>
+			<type key="hc" type="h23" scope="core" draft="contributed">24(0–23)</type>
 			<type key="hc" type="h24">24시간제(1–24)</type>
+			<type key="hc" type="h24" scope="core" draft="contributed">24(1–24)</type>
 			<type key="lb" type="loose">줄바꿈 - 넓게</type>
+			<type key="lb" type="loose" scope="core" draft="contributed">넓게</type>
 			<type key="lb" type="normal">줄바꿈 - 보통</type>
+			<type key="lb" type="normal" scope="core" draft="contributed">보통</type>
 			<type key="lb" type="strict">줄바꿈 - 좁게</type>
+			<type key="lb" type="strict" scope="core" draft="contributed">좁게</type>
+			<type key="lw" type="breakall" scope="core" draft="contributed">모두 분리</type>
+			<type key="lw" type="keepall" scope="core" draft="contributed">모두 유지</type>
+			<type key="lw" type="normal" scope="core" draft="contributed">일반</type>
+			<type key="lw" type="phrase" scope="core" draft="contributed">구 단위 유지</type>
 			<type key="m0" type="bgn">미국 지명위원회(BGN)</type>
 			<type key="m0" type="ungegn">유엔 지명전문가 그룹(UNGEGN)</type>
 			<type key="ms" type="metric">미터법</type>
+			<type key="ms" type="metric" scope="core" draft="contributed">미터법</type>
 			<type key="ms" type="uksystem">야드파운드법</type>
+			<type key="ms" type="uksystem" scope="core" draft="contributed">영국식</type>
 			<type key="ms" type="ussystem">미국 계량법</type>
+			<type key="ms" type="ussystem" scope="core" draft="contributed">미국식</type>
 			<type key="numbers" type="arab">아라비아-인도식 숫자</type>
 			<type key="numbers" type="arabext">확장형 아라비아-인도식 숫자</type>
 			<type key="numbers" type="armn">아르메니아 숫자</type>
@@ -1292,6 +1342,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">티벳 숫자</type>
 			<type key="numbers" type="traditional" draft="contributed">전통적인 숫자</type>
 			<type key="numbers" type="vaii">바이 숫자</type>
+			<type key="ss" type="none" scope="core" draft="contributed">끔</type>
+			<type key="ss" type="standard" scope="core" draft="contributed">켬</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">미터법</measurementSystemName>
@@ -1312,9 +1364,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1551,6 +1600,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d일</dateFormatItem>
+						<dateFormatItem id="EBh" draft="contributed">E B h시</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d일 (E)</dateFormatItem>
@@ -1567,6 +1617,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">H시</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv" draft="contributed">a h시 v</dateFormatItem>
+						<dateFormatItem id="Hv" draft="contributed">H시 v</dateFormatItem>
 						<dateFormatItem id="M">MMM</dateFormatItem>
 						<dateFormatItem id="Md">M. d.</dateFormatItem>
 						<dateFormatItem id="MEd">M. d. (E)</dateFormatItem>
@@ -1751,14 +1803,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d일</dateFormatItem>
+						<dateFormatItem id="EBh" draft="contributed">E B h시</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d일 (E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d일 EEEE</dateFormatItem>
+						<dateFormatItem id="Eh" draft="contributed">E a h시</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y년</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">G y/M</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">G y/M/d (E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y년 M월</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y년 M월 d일</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y년 M월 d일 (E)</dateFormatItem>
@@ -1768,6 +1824,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv" draft="contributed">a h시 v</dateFormatItem>
+						<dateFormatItem id="Hv" draft="contributed">H시 v</dateFormatItem>
 						<dateFormatItem id="M">M월</dateFormatItem>
 						<dateFormatItem id="Md">M. d.</dateFormatItem>
 						<dateFormatItem id="MEd">M. d. (E)</dateFormatItem>
@@ -2041,50 +2099,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">저녁</dayPeriod>
 							<dayPeriod type="night1">밤</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight">자정</dayPeriod>
-							<dayPeriod type="noon">정오</dayPeriod>
-							<dayPeriod type="morning1">아침</dayPeriod>
-							<dayPeriod type="morning2">오전</dayPeriod>
-							<dayPeriod type="afternoon1">오후</dayPeriod>
-							<dayPeriod type="evening1">저녁</dayPeriod>
-							<dayPeriod type="night1">밤</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight">자정</dayPeriod>
 							<dayPeriod type="am">오전</dayPeriod>
-							<dayPeriod type="noon">정오</dayPeriod>
 							<dayPeriod type="pm">오후</dayPeriod>
-							<dayPeriod type="morning1">아침</dayPeriod>
-							<dayPeriod type="morning2">오전</dayPeriod>
-							<dayPeriod type="afternoon1">오후</dayPeriod>
-							<dayPeriod type="evening1">저녁</dayPeriod>
-							<dayPeriod type="night1">밤</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="morning1">아침</dayPeriod>
-							<dayPeriod type="morning2">오전</dayPeriod>
-							<dayPeriod type="afternoon1">오후</dayPeriod>
-							<dayPeriod type="evening1">저녁</dayPeriod>
-							<dayPeriod type="night1">밤</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="morning1">아침</dayPeriod>
-							<dayPeriod type="morning2">오전</dayPeriod>
-							<dayPeriod type="afternoon1">오후</dayPeriod>
-							<dayPeriod type="evening1">저녁</dayPeriod>
-							<dayPeriod type="night1">밤</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">오전</dayPeriod>
 							<dayPeriod type="pm">오후</dayPeriod>
-							<dayPeriod type="morning1">아침</dayPeriod>
-							<dayPeriod type="morning2">오전</dayPeriod>
-							<dayPeriod type="afternoon1">오후</dayPeriod>
-							<dayPeriod type="evening1">저녁</dayPeriod>
-							<dayPeriod type="night1">밤</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2180,16 +2203,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d일</dateFormatItem>
+						<dateFormatItem id="EBh">(E) B h시</dateFormatItem>
 						<dateFormatItem id="EBhm">(E) B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">(E) B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d일 (E)</dateFormatItem>
 						<dateFormatItem id="EEEEd">d일 EEEE</dateFormatItem>
+						<dateFormatItem id="Eh" draft="contributed">(E) a h</dateFormatItem>
 						<dateFormatItem id="Ehm">(E) a h:mm</dateFormatItem>
 						<dateFormatItem id="EHm">(E) HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">(E) a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">(E) HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y년</dateFormatItem>
+						<dateFormatItem id="GyM">G y/M</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y/M/d (E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y년 MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y년 MMM d일</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y년 MMM d일 (E)</dateFormatItem>
@@ -2203,6 +2230,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
 						<dateFormatItem id="Hmsv">H시 m분 s초 v</dateFormatItem>
 						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="hv" draft="contributed">a h시 v</dateFormatItem>
+						<dateFormatItem id="Hv" draft="contributed">H시 v</dateFormatItem>
 						<dateFormatItem id="M">M월</dateFormatItem>
 						<dateFormatItem id="Md">M. d.</dateFormatItem>
 						<dateFormatItem id="MEd">M. d. (E)</dateFormatItem>
@@ -2328,11 +2357,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d일~d일</greatestDifference>
-							<greatestDifference id="M">M월 d일 ~ M월 d일</greatestDifference>
+							<greatestDifference id="M">MMM d일~MMM d일</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">M월 d일 (E) ~ d일 (E)</greatestDifference>
-							<greatestDifference id="M">M월 d일 (E) ~ M월 d일 (E)</greatestDifference>
+							<greatestDifference id="d">MMM d일 (E)~d일 (E)</greatestDifference>
+							<greatestDifference id="M">MMM d일 (E)~MMM d일 (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
 							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
@@ -2356,17 +2385,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">y년 M월~M월</greatestDifference>
-							<greatestDifference id="y">y년 M월 ~ y년 M월</greatestDifference>
+							<greatestDifference id="y">y년 MMM~y년 MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">y년 M월 d일~d일</greatestDifference>
-							<greatestDifference id="M">y년 M월 d일 ~ M월 d일</greatestDifference>
-							<greatestDifference id="y">y년 M월 d일 ~ y년 M월 d일</greatestDifference>
+							<greatestDifference id="M">y년 MMM d일~MMM d일</greatestDifference>
+							<greatestDifference id="y">y년 MMM d일~y년 MMM d일</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y년 M월 d일 (E) ~ d일 (E)</greatestDifference>
-							<greatestDifference id="M">y년 M월 d일 (E) ~ M월 d일 (E)</greatestDifference>
-							<greatestDifference id="y">y년 M월 d일 (E) ~ y년 M월 d일 (E)</greatestDifference>
+							<greatestDifference id="d">y년 MMM d일 (E)~d일 (E)</greatestDifference>
+							<greatestDifference id="M">y년 MMM d일 (E)~MMM d일 (E)</greatestDifference>
+							<greatestDifference id="y">y년 MMM d일 (E)~y년 MMM d일 (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEEEEd">
 							<greatestDifference id="d">y년 M월 d일 EEEE ~ d일 EEEE</greatestDifference>
@@ -2374,8 +2403,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">y년 M월 d일 EEEE ~ y년 M월 d일 EEEE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y년 MMMM ~ MMMM</greatestDifference>
-							<greatestDifference id="y">y년 MMMM ~ y년 MMMM</greatestDifference>
+							<greatestDifference id="M">y년 MMMM~MMMM</greatestDifference>
+							<greatestDifference id="y">y년 MMMM~y년 MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -3329,6 +3358,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>이스터 섬</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">코이아이케</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>푼타아레나스</exemplarCity>
 			</zone>
@@ -3594,9 +3626,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>프놈펜</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>엔더베리</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>칸톤</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4273,9 +4302,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>서아프리카 시간</generic>
-					<standard>서아프리카 표준시</standard>
-					<daylight>서아프리카 하계 표준시</daylight>
+					<standard>서아프리카 시간</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4392,30 +4419,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic>오스트레일리아 중부 시간</generic>
-					<standard>오스트레일리아 중부 표준시</standard>
-					<daylight>오스트레일리아 중부 하계 표준시</daylight>
+					<generic>호주 중부 시간</generic>
+					<standard>호주 중부 표준시</standard>
+					<daylight>호주 중부 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic>오스트레일리아 중서부 시간</generic>
-					<standard>오스트레일리아 중서부 표준시</standard>
-					<daylight>오스트레일리아 중서부 하계 표준시</daylight>
+					<generic>호주 중서부 시간</generic>
+					<standard>호주 중서부 표준시</standard>
+					<daylight>호주 중서부 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>오스트레일리아 동부 시간</generic>
-					<standard>오스트레일리아 동부 표준시</standard>
-					<daylight>오스트레일리아 동부 하계 표준시</daylight>
+					<generic>호주 동부 시간</generic>
+					<standard>호주 동부 표준시</standard>
+					<daylight>호주 동부 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>오스트레일리아 서부 시간</generic>
-					<standard>오스트레일리아 서부 표준시</standard>
-					<daylight>오스트레일리아 서부 하계 표준시</daylight>
+					<generic>호주 서부 시간</generic>
+					<standard>호주 서부 표준시</standard>
+					<daylight>호주 서부 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
@@ -4663,6 +4690,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>가이아나 시간</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>하와이 알류샨 표준시</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>하와이 알류샨 시간</generic>
@@ -4766,9 +4798,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic>대한민국 시간</generic>
-					<standard>대한민국 표준시</standard>
-					<daylight>대한민국 하계 표준시</daylight>
+					<generic>한국 시간</generic>
+					<standard>한국 표준시</standard>
+					<daylight>한국 하계 표준시</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
@@ -5113,6 +5145,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>추크 시간</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="provisional">터키 시간</generic>
+					<standard draft="provisional">터키 표준시</standard>
+					<daylight draft="provisional">터키 일광 절약 시간</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>투르크메니스탄 시간</generic>
@@ -5228,8 +5267,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5528,7 +5565,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>이집트 파운드</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName>에리트리아 나크파</displayName>
+				<displayName>에리트레아 낙파</displayName>
 			</currency>
 			<currency type="ESA">
 				<displayName>스페인 페세타(예금)</displayName>
@@ -5988,7 +6025,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="TRY">
 				<displayName>튀르키예 리라</displayName>
-				<displayName count="other">튀르키예 리라</displayName>
 			</currency>
 			<currency type="TTD">
 				<displayName>트리니다드 토바고 달러</displayName>
@@ -6078,6 +6114,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>동카리브 달러</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">카리브 길더</displayName>
+				<displayName count="other">카리브 길더</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>특별인출권</displayName>
 			</currency>
@@ -6148,6 +6188,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>짐바브웨 달러</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">짐바브웨 골드</displayName>
+				<displayName count="other">짐바브웨 골드</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">짐바브웨 달러 (2009)</displayName>
 			</currency>
@@ -6354,10 +6398,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>리터당 밀리몰</displayName>
 				<unitPattern count="other">리터당 {0}밀리몰</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName draft="contributed">분율</displayName>
+				<unitPattern count="other" draft="contributed">{0}분율</unitPattern>
+			</unit>
 			<unit type="concentr-mole">
 				<displayName>몰</displayName>
 				<unitPattern count="other">{0}몰</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">포도당</displayName>
+				<unitPattern count="other" draft="contributed">{0}포도당</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>킬로미터당 리터</displayName>
 				<unitPattern count="other">킬로미터당 {0}리터</unitPattern>
@@ -6734,6 +6786,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>수은주밀리미터</displayName>
 				<unitPattern count="other">{0}수은주밀리미터</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">수은주</displayName>
+				<unitPattern count="other" draft="contributed">{0}수은주</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>제곱인치당 파운드</displayName>
 				<unitPattern count="other">{0}제곱인치당 파운드</unitPattern>
@@ -6868,6 +6924,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>미터식 컵</displayName>
 				<unitPattern count="other">{0}미터식 컵</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">미터식 액량 온스</displayName>
+				<unitPattern count="other" draft="contributed">{0}미터식 액량 온스</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>에이커 피트</displayName>
 				<unitPattern count="other">{0}에이커 피트</unitPattern>
@@ -6942,12 +7002,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>영국 쿼트</displayName>
 				<unitPattern count="other">{0}영국 쿼트</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<unitPattern count="other">{0}ppb</unitPattern>
+			<unit type="angle-steradian">
+				<displayName draft="contributed">스테라디안</displayName>
+				<unitPattern count="other" draft="contributed">{0}스테라디안</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">캐탈</displayName>
+				<unitPattern count="other" draft="contributed">{0}캐탈</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">쿨롬</displayName>
+				<unitPattern count="other" draft="contributed">{0}쿨롬</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">패럿</displayName>
+				<unitPattern count="other" draft="contributed">{0}패럿</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">헨리</displayName>
+				<unitPattern count="other" draft="contributed">{0}헨리</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">지멘스</displayName>
+				<unitPattern count="other" draft="contributed">{0}지멘스</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">칼로리[IT]</displayName>
+				<unitPattern count="other" draft="contributed">{0}칼로리[IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">베크렐</displayName>
+				<unitPattern count="other" draft="contributed">{0}베크렐</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">시버트</displayName>
+				<unitPattern count="other" draft="contributed">{0}시버트</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">그레이</displayName>
+				<unitPattern count="other" draft="contributed">{0}그레이</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">킬로그램힘</displayName>
+				<unitPattern count="other" draft="contributed">{0}킬로그램힘</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">테슬라</displayName>
+				<unitPattern count="other" draft="contributed">{0}테슬라</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">웨버</displayName>
+				<unitPattern count="other" draft="contributed">{0}웨버</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">광속</displayName>
+				<unitPattern count="other" draft="contributed">{0}광속</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>박</displayName>
-				<unitPattern count="other">{0}박</unitPattern>
 				<perUnitPattern>1박당 {0}</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7026,12 +7137,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>항목</displayName>
 				<unitPattern count="other">{0}개 항목</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<unitPattern count="other" draft="contributed">{0}part</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glc</displayName>
+				<unitPattern count="other" draft="contributed">{0}Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
@@ -7371,6 +7489,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mmHg</displayName>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other" draft="contributed">{0}Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
@@ -7466,6 +7587,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="other" draft="contributed">{0}fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="other">{0}ac ft</unitPattern>
 			</unit>
@@ -7527,7 +7651,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0}qt Imp.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<unitPattern count="other" draft="contributed">{0}sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="other" draft="contributed">{0}kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other" draft="contributed">{0}C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other" draft="contributed">{0}F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="other" draft="contributed">{0}H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="other" draft="contributed">{0}S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
+				<unitPattern count="other" draft="contributed">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="other" draft="contributed">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other" draft="contributed">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="other" draft="contributed">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other" draft="contributed">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other" draft="contributed">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other" draft="contributed">{0}Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<unitPattern count="other" draft="contributed">{0}light</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
@@ -7540,6 +7707,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="concentr-part">
+				<unitPattern count="other" draft="contributed">{0}part</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glc</displayName>
+				<unitPattern count="other" draft="contributed">{0}Glc</unitPattern>
+			</unit>
 			<unit type="digital-byte">
 				<displayName>B</displayName>
 			</unit>
@@ -7567,23 +7741,64 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-horsepower">
 				<unitPattern count="other">{0}HP</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other" draft="contributed">{0}Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<unitPattern count="other">{0}mph</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="other">B{0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="other" draft="contributed">{0}fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>dsp Imp</displayName>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<unitPattern count="other">{0}ppb</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="other" draft="contributed">{0}sr</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>박</displayName>
-				<unitPattern count="other">{0}박</unitPattern>
-				<perUnitPattern>{0}/박</perUnitPattern>
+			<unit type="concentr-katal">
+				<unitPattern count="other" draft="contributed">{0}kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other" draft="contributed">{0}C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other" draft="contributed">{0}F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="other" draft="contributed">{0}H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="other" draft="contributed">{0}S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
+				<unitPattern count="other" draft="contributed">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="other" draft="contributed">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other" draft="contributed">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="other" draft="contributed">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other" draft="contributed">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other" draft="contributed">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other" draft="contributed">{0}Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<unitPattern count="other" draft="contributed">{0}light</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/kok.xml b/make/data/cldr/common/main/kok.xml
index 061136411d8..a26bb0ab07f 100644
--- a/make/data/cldr/common/main/kok.xml
+++ b/make/data/cldr/common/main/kok.xml
@@ -27,12 +27,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="an">आरागोनिस</language>
 			<language type="ann">ओबोलो</language>
 			<language type="anp">अंगिका</language>
-			<language type="ar">अरेबिक</language>
-			<language type="ar_001">आधुनिक प्रमाणित अरेबिक</language>
+			<language type="ar">अरबी</language>
+			<language type="ar_001">आधुनिक प्रमाणित अरबी</language>
 			<language type="arn">मापुचे</language>
 			<language type="arp">अरापाहो</language>
 			<language type="ars">नाझदी अरबी</language>
-			<language type="as">आसामी</language>
+			<language type="as">असमिया</language>
 			<language type="asa">असु</language>
 			<language type="ast">अस्टुरियान</language>
 			<language type="atj">अटिकामेक्वु</language>
@@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">अझरबैजानी</language>
 			<language type="az" alt="short">अझेरी</language>
 			<language type="ba">बष्किर</language>
+			<language type="bal">Baluchi</language>
 			<language type="ban">बालिनीज</language>
 			<language type="bas">बस्सा</language>
 			<language type="be">बेलारुशियन</language>
@@ -55,7 +56,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bla">सिकसिका</language>
 			<language type="blo">अनी</language>
 			<language type="bm">बंबारा</language>
-			<language type="bn">बांग्ला</language>
+			<language type="bn">बांगला</language>
 			<language type="bo">तिबेटी</language>
 			<language type="br">ब्रेटन</language>
 			<language type="brx">बोडो</language>
@@ -102,7 +103,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dgr">डोगरीब</language>
 			<language type="dje">झर्मा</language>
 			<language type="doi">डोग्री</language>
-			<language type="dsb">लोवर सोर्बियन</language>
+			<language type="dsb">सकयलें सोर्बियन</language>
 			<language type="dua">डुआला</language>
 			<language type="dv">दिवेही</language>
 			<language type="dyo">जोला-फोन्यी</language>
@@ -160,8 +161,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hai">हैदा</language>
 			<language type="haw">हवायियान</language>
 			<language type="hax">दक्षिणी हैदा</language>
-			<language type="he">हिब्रू</language>
+			<language type="he">हेब्रेव</language>
 			<language type="hi">हिन्दी</language>
+			<language type="hi_Latn">हिन्दी (रोमी)</language>
 			<language type="hi_Latn" alt="variant">हिंग्लीश</language>
 			<language type="hil">हिलीगायनॉन</language>
 			<language type="hmn">मोंग</language>
@@ -177,7 +179,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="iba">आयबन</language>
 			<language type="ibb">ईबिबियो</language>
 			<language type="id">इंडोनेशियन</language>
-			<language type="ie">इन्टरलिंग्</language>
+			<language type="ie">इन्टरलिंग्वे</language>
 			<language type="ig">इग्बो</language>
 			<language type="ii">सिच्युआन यी</language>
 			<language type="ik">इनूपेयाक्</language>
@@ -227,13 +229,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">बाफिया</language>
 			<language type="ksh">कोलोनियन</language>
 			<language type="ku">कर्दिश</language>
+			<language type="ku" menu="core">कर्दिश</language>
+			<language type="ku" menu="extension">कुर्मनजी</language>
 			<language type="kum">कुमयक</language>
 			<language type="kv">कोमी</language>
 			<language type="kw">कोर्निश</language>
 			<language type="kwk">क्वाकवाला</language>
 			<language type="kxv">कुवी</language>
 			<language type="ky">किर्गिझ</language>
-			<language type="la">लॅटिन</language>
+			<language type="la">लातीन</language>
 			<language type="lad">लाडिनो</language>
 			<language type="lag">लांगी</language>
 			<language type="lb">लक्झेम्बर्गीश</language>
@@ -296,13 +300,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="naq">नामा</language>
 			<language type="nb">नॉर्वेजियन बोकमाल</language>
 			<language type="nd">उत्तर डेबेले</language>
-			<language type="nds">लोवर जर्मन</language>
+			<language type="nds">सकयलें जर्मन</language>
 			<language type="ne">नेपाळी</language>
 			<language type="new">नेवारी</language>
 			<language type="ng">डोंगा</language>
 			<language type="nia">नियास</language>
 			<language type="niu">नायान</language>
-			<language type="nl">डच</language>
+			<language type="nl">हाॅलँडी</language>
 			<language type="nl_BE">फ्लेमिश</language>
 			<language type="nmg">क्वासीयो</language>
 			<language type="nn">नॉर्वेजियन नायनोर्स्क</language>
@@ -311,7 +315,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nog">नोगाय</language>
 			<language type="nqo">नको</language>
 			<language type="nr">दक्षिण डेबेले</language>
-			<language type="nso">उत्तरीय सोथो</language>
+			<language type="nso">उत्तरी सोथो</language>
 			<language type="nus">न्युयर</language>
 			<language type="nv">नावाजो</language>
 			<language type="ny">नांन्जा</language>
@@ -464,7 +468,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="yue" alt="menu">चिनी, कॅण्टोनीस</language>
 			<language type="za">झ्हुन्ग</language>
 			<language type="zgh">प्रमाणीत मॉरोक्कन तमाझीट</language>
-			<language type="zh">चिनी</language>
+			<language type="zh">चीनी</language>
 			<language type="zh" alt="menu">चिनी, मंडारीन</language>
 			<language type="zh_Hans">सोंपी चिनी</language>
 			<language type="zh_Hans" alt="long">सोंपी मंडारीन चिनी</language>
@@ -472,7 +476,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="zh_Hant" alt="long">पारंपारीक मंडारीन चिनी</language>
 			<language type="zu">झुलू</language>
 			<language type="zun">झुनी</language>
-			<language type="zxx">अणकार सामुग्री ना</language>
+			<language type="zxx">भाशीक मजकूर ना</language>
 			<language type="zza">झाझा</language>
 		</languages>
 		<scripts>
@@ -510,7 +514,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Knda">कन्नड</script>
 			<script type="Kore">कोरियन</script>
 			<script type="Laoo">लाओ</script>
-			<script type="Latn">लॅटीन</script>
+			<script type="Latn">रोमी</script>
 			<script type="Mlym">मल्याळम</script>
 			<script type="Mong">मोंगोलियन</script>
 			<script type="Mtei">मेयतेई मायेक</script>
@@ -522,7 +526,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Sinh">सिंहाला</script>
 			<script type="Sund">सुंदानीज</script>
 			<script type="Syrc">सिरीयाक</script>
-			<script type="Taml">तमीळ</script>
+			<script type="Taml">तमिळ</script>
 			<script type="Telu">तेलुगू</script>
 			<script type="Tfng">टिफीनाघ</script>
 			<script type="Thaa">थाणा</script>
@@ -546,11 +550,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="011">अस्तंत आफ्रिका</territory>
 			<territory type="013">मध्य अमेरिका</territory>
 			<territory type="014">उदेंत आफ्रिका</territory>
-			<territory type="015">उत्तरीय आफ्रिका</territory>
+			<territory type="015">उत्तरी आफ्रिका</territory>
 			<territory type="017">मध्य आफ्रिका</territory>
-			<territory type="018">दक्षिण आफ्रिका</territory>
+			<territory type="018">दक्षिणी आफ्रिका</territory>
 			<territory type="019">अमेरिकास</territory>
-			<territory type="021">उत्तरीय अमेरिका</territory>
+			<territory type="021">उत्तरी अमेरिका</territory>
 			<territory type="029">कॅरिबियन</territory>
 			<territory type="030">उदेंत आशिया</territory>
 			<territory type="034">दक्षिण आशिया</territory>
@@ -565,85 +569,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="145">अस्तंत आशिया</territory>
 			<territory type="150">युरोप</territory>
 			<territory type="151">उदेंत युरोप</territory>
-			<territory type="154">उत्तर युरोप</territory>
+			<territory type="154">उत्तरी येरोप</territory>
 			<territory type="155">अस्तंत युरोप</territory>
 			<territory type="202">उप-सहाराई आफ्रिका</territory>
 			<territory type="419">लॅटीन अमेरिका</territory>
-			<territory type="AC">असेंशन आयलँड</territory>
-			<territory type="AD">अंडोरा</territory>
-			<territory type="AE">युनाइटेड अरब इमीरात</territory>
+			<territory type="AC">असँसांव जुंवो</territory>
+			<territory type="AD">आंडोरा</territory>
+			<territory type="AE">संयुक्त अरबी अमीरात</territory>
 			<territory type="AF">अफगानिस्तान</territory>
-			<territory type="AG">एँटिगुआ आनी बारबुडा</territory>
-			<territory type="AI">अंगुला</territory>
-			<territory type="AL">अल्बानीया</territory>
-			<territory type="AM">आर्मीनीया</territory>
+			<territory type="AG">अँटिगुआ आनी बार्बुडा</territory>
+			<territory type="AI">अँग्विला</territory>
+			<territory type="AL">आल्बान्या</territory>
+			<territory type="AM">अर्मेनिया</territory>
 			<territory type="AO">अंगोला</territory>
 			<territory type="AQ">अंटार्क्टिका</territory>
-			<territory type="AR">अर्जेंटिना</territory>
-			<territory type="AS">अमेरिकी सामोआ</territory>
+			<territory type="AR">आर्जेंटीना</territory>
+			<territory type="AS">अमेरिकेचो सामोआ</territory>
 			<territory type="AT">ऑस्ट्रिया</territory>
-			<territory type="AU">ऑस्ट्रेलीया</territory>
+			<territory type="AU">ऑस्ट्रेलिया</territory>
 			<territory type="AW">अरुबा</territory>
-			<territory type="AX">अलांड जुवे</territory>
-			<territory type="AZ">अजरबैजान</territory>
-			<territory type="BA">बोस्निया आनी हेर्जेगोविना</territory>
-			<territory type="BB">बारबाडोस</territory>
+			<territory type="AX">ओलँड जुंवे</territory>
+			<territory type="AZ">आजरबैजान</territory>
+			<territory type="BA">बॉस्निया आनी हर्जेगोविना</territory>
+			<territory type="BB">बार्बाडोस</territory>
 			<territory type="BD">बांगलादेश</territory>
 			<territory type="BE">बेल्जियम</territory>
-			<territory type="BF">बुर्किना फॅसो</territory>
-			<territory type="BG">बल्गेरीया</territory>
-			<territory type="BH">बेहरेन</territory>
+			<territory type="BF">बुर्कीना फासो</territory>
+			<territory type="BG">बुल्गारिया</territory>
+			<territory type="BH">बाहरेन</territory>
 			<territory type="BI">बुरुंडी</territory>
 			<territory type="BJ">बेनीन</territory>
-			<territory type="BL">सॅंट बार्थेल्मी</territory>
+			<territory type="BL">सांव बार्टोलोमेव</territory>
 			<territory type="BM">बर्मुडा</territory>
 			<territory type="BN">ब्रूनेई</territory>
-			<territory type="BO">बोलिव्हिया</territory>
-			<territory type="BQ">कॅरिबियन निदरलँड</territory>
+			<territory type="BO">बोलिविया</territory>
+			<territory type="BQ">कॅरिबियन नॅदरलँड</territory>
 			<territory type="BR">ब्राझील</territory>
-			<territory type="BS">बहामास</territory>
+			<territory type="BS">बाहामास</territory>
 			<territory type="BT">भूतान</territory>
-			<territory type="BV">बोवट आयलँड</territory>
-			<territory type="BW">बोत्सवाना</territory>
+			<territory type="BV">बोउवे जुंवो</territory>
+			<territory type="BW">बोट्स्वाना</territory>
 			<territory type="BY">बेलारूस</territory>
 			<territory type="BZ">बेलिझ</territory>
 			<territory type="CA">कॅनडा</territory>
-			<territory type="CC">कोकोस (कीलिंग) आयलँड</territory>
-			<territory type="CD">कोंगो - किंशासा</territory>
-			<territory type="CD" alt="variant">कोंगो (डीआरसी)</territory>
-			<territory type="CF">मध्य अफ्रीकी लोकसत्तकराज्य</territory>
+			<territory type="CC">कोकोस (कीलिंग) जुंवे</territory>
+			<territory type="CD">काँगो - किंशासा</territory>
+			<territory type="CF">मदलें अफ्रीकी प्रजासत्तो</territory>
 			<territory type="CG">कोंगो - ब्राझाविला</territory>
-			<territory type="CG" alt="variant">कोंगो (प्रजासत्ताक)</territory>
-			<territory type="CH">स्विट्ज़रलैंड</territory>
-			<territory type="CI">कोत द’ईवोआर</territory>
-			<territory type="CI" alt="variant">आयवोरी कोस्ट</territory>
-			<territory type="CK">कुक आयलँड्स</territory>
+			<territory type="CG" alt="variant">काँगो - ब्राज़ाविल</territory>
+			<territory type="CH">स्वित्झरलँड</territory>
+			<territory type="CI">कोस्ता दो मारफ़ीम</territory>
+			<territory type="CK">कुक जुंवे</territory>
 			<territory type="CL">चिली</territory>
-			<territory type="CM">कॅमेरून</territory>
+			<territory type="CM">कॅमरून</territory>
 			<territory type="CN">चीन</territory>
 			<territory type="CO">कोलंबिया</territory>
-			<territory type="CP">क्लिपरटॉन आयलँड</territory>
+			<territory type="CP">क्लिपर्टन जुंवो</territory>
+			<territory type="CQ">सार्क</territory>
 			<territory type="CR">कोस्ता रिका</territory>
 			<territory type="CU">क्युबा</territory>
-			<territory type="CV">केप वर्दी</territory>
-			<territory type="CW">कुरसावो</territory>
-			<territory type="CX">क्रिसमस आयलँड</territory>
-			<territory type="CY">सायप्रस</territory>
+			<territory type="CV">काबो वेर्दे</territory>
+			<territory type="CW">कुरासाव</territory>
+			<territory type="CX">ख्रिसमस जुंवो</territory>
+			<territory type="CY">सिप्रुस</territory>
 			<territory type="CZ">चेकिया</territory>
-			<territory type="CZ" alt="variant">चेक लोकसत्ताक</territory>
 			<territory type="DE">जर्मनी</territory>
-			<territory type="DG">दिगो गार्सिया</territory>
+			<territory type="DG">डिएगो गार्सिया</territory>
 			<territory type="DJ">जिबूती</territory>
 			<territory type="DK">डेनमार्क</territory>
-			<territory type="DM">डोमिनीका</territory>
-			<territory type="DO">डोमिनिकन प्रजासत्ताक</territory>
-			<territory type="DZ">अल्जेरिया</territory>
-			<territory type="EA">सिटा आनी मेलिल्ला</territory>
-			<territory type="EC">इक्वाडोर</territory>
+			<territory type="DM">डोमिनिका</territory>
+			<territory type="DO">डोमिनिकन प्रजासत्तो</territory>
+			<territory type="DZ">अल्जीरिया</territory>
+			<territory type="EA">सेउता आनि मेलिया</territory>
+			<territory type="EC">एक्वाडोर</territory>
 			<territory type="EE">एस्टोनिया</territory>
-			<territory type="EG">ईजिप्त</territory>
-			<territory type="EH">अस्तंत सहारा</territory>
-			<territory type="ER">इरिट्रिया</territory>
+			<territory type="EG">एजिप्त</territory>
+			<territory type="EH">अस्तंती सहारा</territory>
+			<territory type="ER">एरिट्रिया</territory>
 			<territory type="ES">स्पेन</territory>
 			<territory type="ET">इथियोपिया</territory>
 			<territory type="EU">युरोपियन युनियन</territory>
@@ -651,89 +653,87 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="FI">फिनलँड</territory>
 			<territory type="FJ">फिजी</territory>
 			<territory type="FK">फ़ॉकलैंड आइलैंड्स</territory>
-			<territory type="FK" alt="variant">फ़ॉकलैंड आइलैंड्स (इलास मालविनास)</territory>
-			<territory type="FM">मायक्रोनेशिया</territory>
-			<territory type="FO">फैरो आयलँड्स</territory>
+			<territory type="FM">मायक्रोनिशिया</territory>
+			<territory type="FO">फेरो जुंवे</territory>
 			<territory type="FR">फ्रान्स</territory>
-			<territory type="GA">गॅबोन</territory>
+			<territory type="GA">गाबॉन</territory>
 			<territory type="GB">युनायटेड किंगडम</territory>
-			<territory type="GB" alt="short">युके</territory>
-			<territory type="GD">ग्रेनॅडा</territory>
+			<territory type="GB" alt="short">संयुक्त राजवट</territory>
+			<territory type="GD">ग्रेनाडा</territory>
 			<territory type="GE">जॉर्जिया</territory>
-			<territory type="GF">फ्रेन्च गयाना</territory>
-			<territory type="GG">गर्नसी</territory>
+			<territory type="GF">फ्रांसेझ गियॅना</territory>
+			<territory type="GG">गॅर्नजी</territory>
 			<territory type="GH">घाना</territory>
 			<territory type="GI">जिब्राल्टर</territory>
 			<territory type="GL">ग्रीनलँड</territory>
-			<territory type="GM">गॅम्बिया</territory>
-			<territory type="GN">गुएनिया</territory>
-			<territory type="GP">ग्वाडेलोप</territory>
-			<territory type="GQ">इक्वेटोरियल गुएनिया</territory>
+			<territory type="GM">गाम्बिया</territory>
+			<territory type="GN">गिनी</territory>
+			<territory type="GP">ग्वाडलूप</territory>
+			<territory type="GQ">भूमध्यरेखी गिनी</territory>
 			<territory type="GR">ग्रीस</territory>
-			<territory type="GS">दक्षिण जोर्जिया आनी दक्षिण सॅण्डविच आयलँड्स</territory>
+			<territory type="GS">दक्षिण जॉर्जिया आनी दक्षिण सँडविच जुंवे</territory>
 			<territory type="GT">ग्वाटेमाला</territory>
 			<territory type="GU">गुआम</territory>
-			<territory type="GW">गुअनिया-बिसाउ</territory>
-			<territory type="GY">गयाना</territory>
-			<territory type="HK">हाँग काँग एसएआर चीन</territory>
-			<territory type="HK" alt="short">हाँग काँग</territory>
-			<territory type="HM">हर्ड ऍंड मॅक्डोनाल्ड आयलँड्स</territory>
-			<territory type="HN">हॉनडुरस</territory>
-			<territory type="HR">क्रोयेशीया</territory>
+			<territory type="GW">गिनी-बिसाउ</territory>
+			<territory type="GY">गियॅना</territory>
+			<territory type="HK">हाँग काँग</territory>
+			<territory type="HM">हर्ड आनि मॅक्डोनल्ड जुंवे</territory>
+			<territory type="HN">हाँडूरास</territory>
+			<territory type="HR">क्रोएशिया</territory>
 			<territory type="HT">हैती</territory>
-			<territory type="HU">हंगेरी</territory>
-			<territory type="IC">कॅनरी आयलैंड्स</territory>
-			<territory type="ID">इंडोनेशीया</territory>
+			<territory type="HU">हंगरी</territory>
+			<territory type="IC">कानारियास जुंवे</territory>
+			<territory type="ID">इंडोनिशिया</territory>
 			<territory type="IE">आयरलँड</territory>
-			<territory type="IL">इस्त्राइल</territory>
-			<territory type="IM">इसले ऑफ मॅन</territory>
+			<territory type="IL">इज्राएल</territory>
+			<territory type="IM">मॅनाचो जुंवो</territory>
 			<territory type="IN">भारत</territory>
-			<territory type="IO">ब्रिटिश हिंद महासागरीय क्षेत्र</territory>
+			<territory type="IO">ब्रिटनाचो हिंदी महासागर प्रांत</territory>
+			<territory type="IO" alt="chagos">शागस जुंवे</territory>
 			<territory type="IQ">इराक</territory>
 			<territory type="IR">इरान</territory>
-			<territory type="IS">आइसलैंड</territory>
+			<territory type="IS">आइसलँड</territory>
 			<territory type="IT">इटली</territory>
 			<territory type="JE">जर्सी</territory>
 			<territory type="JM">जमैका</territory>
 			<territory type="JO">जॉर्डन</territory>
 			<territory type="JP">जपान</territory>
-			<territory type="KE">केनया</territory>
-			<territory type="KG">किर्गिझस्तान</territory>
-			<territory type="KH">कंबोडिया</territory>
-			<territory type="KI">किरिबाती</territory>
+			<territory type="KE">केनिया</territory>
+			<territory type="KG">किर्गिस्तान</territory>
+			<territory type="KH">कॅम्बोडिया</territory>
+			<territory type="KI">किरिबास</territory>
 			<territory type="KM">कोमोरोस</territory>
-			<territory type="KN">सेंट किट्स आनी नेविस</territory>
+			<territory type="KN">सांव क्रिस्टोवांव आनी नेविस</territory>
 			<territory type="KP">उत्तर कोरिया</territory>
 			<territory type="KR">दक्षिण कोरिया</territory>
 			<territory type="KW">कुवेत</territory>
-			<territory type="KY">कैमेन आइलैंड्स</territory>
-			<territory type="KZ">कझाकस्तान</territory>
+			<territory type="KY">केमॅन जुंवे</territory>
+			<territory type="KZ">कजाखस्तान</territory>
 			<territory type="LA">लाओस</territory>
-			<territory type="LB">लेबनान</territory>
-			<territory type="LC">सँट लुसिया</territory>
-			<territory type="LI">लिचेंस्टीन</territory>
+			<territory type="LB">लेबनन</territory>
+			<territory type="LC">सांता लूसिया</territory>
+			<territory type="LI">लिश्टेंस्टाइन</territory>
 			<territory type="LK">श्री लंका</territory>
-			<territory type="LR">लायबेरीया</territory>
-			<territory type="LS">लिसोथो</territory>
-			<territory type="LT">लिथुआनिया</territory>
-			<territory type="LU">लक्सेमबर्ग</territory>
-			<territory type="LV">लॅटविया</territory>
-			<territory type="LY">लीबिया</territory>
+			<territory type="LR">लायबिरिया</territory>
+			<territory type="LS">लेसोथो</territory>
+			<territory type="LT">लितुआनिया</territory>
+			<territory type="LU">लुक्सेमबर्ग</territory>
+			<territory type="LV">लाटविया</territory>
+			<territory type="LY">लिबिया</territory>
 			<territory type="MA">मोरोक्को</territory>
-			<territory type="MC">मोनॅको</territory>
-			<territory type="MD">माल्डोवा</territory>
-			<territory type="ME">मॉन्टॅनग्रो</territory>
+			<territory type="MC">मोनाको</territory>
+			<territory type="MD">मॉल्डोवा</territory>
+			<territory type="ME">मोंटेनेग्रो</territory>
 			<territory type="MF">सॅंट मार्टिन</territory>
-			<territory type="MG">माडागास्कर</territory>
-			<territory type="MH">मार्शल आयलँड्स</territory>
+			<territory type="MG">मॅडागास्कर</territory>
+			<territory type="MH">मार्शल जुंवे</territory>
 			<territory type="MK">उत्तर मॅसिडोनिया</territory>
 			<territory type="ML">माली</territory>
-			<territory type="MM">म्यानमार (बर्मा)</territory>
+			<territory type="MM">म्यानमार</territory>
 			<territory type="MN">मंगोलिया</territory>
-			<territory type="MO">मकाव एसएआर चीन</territory>
-			<territory type="MO" alt="short">मकाव</territory>
-			<territory type="MP">उत्तरी मरिना आयसलैण्ड</territory>
-			<territory type="MQ">मार्टीनिक</territory>
+			<territory type="MO">मकाव</territory>
+			<territory type="MP">उत्तरी मारियाना जुंवे</territory>
+			<territory type="MQ">मार्टिनीक</territory>
 			<territory type="MR">मॉरिटानिया</territory>
 			<territory type="MS">मॉन्टसेराट</territory>
 			<territory type="MT">माल्टा</territory>
@@ -742,107 +742,107 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MW">मलावी</territory>
 			<territory type="MX">मेक्सिको</territory>
 			<territory type="MY">मलेशिया</territory>
-			<territory type="MZ">मॉझांबीक</territory>
-			<territory type="NA">नामीबिया</territory>
-			<territory type="NC">न्यू कॅलिडोनिया</territory>
+			<territory type="MZ">मोजाम्बिक</territory>
+			<territory type="NA">नामिबिया</territory>
+			<territory type="NC">नोवो कॅलेडोनिया</territory>
 			<territory type="NE">नायजर</territory>
-			<territory type="NF">नॉरफॉक आयलँड</territory>
-			<territory type="NG">नायजेरिया</territory>
-			<territory type="NI">निकारगुवा</territory>
+			<territory type="NF">नॉरफोक जुंवो</territory>
+			<territory type="NG">नायजिरिया</territory>
+			<territory type="NI">निकारागुआ</territory>
 			<territory type="NL">नॅदरलँड</territory>
 			<territory type="NO">नॉर्वे</territory>
 			<territory type="NP">नेपाळ</territory>
-			<territory type="NR">नावरू</territory>
-			<territory type="NU">नीयू</territory>
-			<territory type="NZ">न्युझीलॅन्ड</territory>
-			<territory type="NZ" alt="variant">आओटेरोआ न्युझीलॅन्ड</territory>
+			<territory type="NR">नाउरु</territory>
+			<territory type="NU">निउए</territory>
+			<territory type="NZ">नोवो झीलॅंड</territory>
+			<territory type="NZ" alt="variant">आओतेरोआ</territory>
 			<territory type="OM">ओमान</territory>
-			<territory type="PA">पनामा</territory>
+			<territory type="PA">पानामा</territory>
 			<territory type="PE">पेरू</territory>
-			<territory type="PF">फ्रेन्च पोलिनेसिया</territory>
-			<territory type="PG">पापुआ न्यु गिनी</territory>
-			<territory type="PH">फिलीपिन्झ</territory>
+			<territory type="PF">फ्रांसेझ पॉलिनिशिया</territory>
+			<territory type="PG">पापुआ नोवो गिनी</territory>
+			<territory type="PH">फिलिपीन्स</territory>
 			<territory type="PK">पाकिस्तान</territory>
-			<territory type="PL">पोलंड</territory>
-			<territory type="PM">सँ. पायरे आनी मिकेलन</territory>
-			<territory type="PN">पिटकॅरन आयलँड्स</territory>
-			<territory type="PR">प्युएर्तो रिको</territory>
-			<territory type="PS">पेलेस्टीनियन प्रांत</territory>
-			<territory type="PS" alt="short">पेलेस्टायन</territory>
-			<territory type="PT">पुर्तगाल</territory>
-			<territory type="PW">पलाऊ</territory>
-			<territory type="PY">पैराग्वे</territory>
-			<territory type="QA">कतार</territory>
+			<territory type="PL">पोलँड</territory>
+			<territory type="PM">सांव पेद्रु आनी मिकेलांव</territory>
+			<territory type="PN">पिटकॅर्न जुंवे</territory>
+			<territory type="PR">पोर्टो रिको</territory>
+			<territory type="PS">पालेसटीन</territory>
+			<territory type="PS" alt="short">पालेसटीनी प्रांत</territory>
+			<territory type="PT">पुर्तुगाल</territory>
+			<territory type="PW">पालाउ</territory>
+			<territory type="PY">पॅरग्वे</territory>
+			<territory type="QA">कातार</territory>
 			<territory type="QO">आवटलायींग ओशेनिया</territory>
-			<territory type="RE">रीयूनियन</territory>
-			<territory type="RO">रोमानीया</territory>
+			<territory type="RE">रेयुनियांव</territory>
+			<territory type="RO">रोमेनिया</territory>
 			<territory type="RS">सर्बिया</territory>
 			<territory type="RU">रूस</territory>
-			<territory type="RW">रवांडा</territory>
-			<territory type="SA">सऊदी अरेबिया</territory>
-			<territory type="SB">सोलोमन आइलँड्स</territory>
+			<territory type="RW">रुआंडा</territory>
+			<territory type="SA">साउदी अरब</territory>
+			<territory type="SB">सोलोमन जुंवे</territory>
 			<territory type="SC">सेशेल्स</territory>
-			<territory type="SD">सूडान</territory>
+			<territory type="SD">सुदान</territory>
 			<territory type="SE">स्वीडन</territory>
-			<territory type="SG">सिंगापूर</territory>
-			<territory type="SH">सेंट हेलिना</territory>
+			<territory type="SG">सिंगापुर</territory>
+			<territory type="SH">सांता हेलेना</territory>
 			<territory type="SI">स्लोवेनिया</territory>
-			<territory type="SJ">स्वालबार्ड आनी जान मेयन</territory>
+			<territory type="SJ">स्वालबार्ड आनी यान मायेन</territory>
 			<territory type="SK">स्लोवाकिया</territory>
-			<territory type="SL">सिएरा लियॉन</territory>
-			<territory type="SM">सॅन मारीनो</territory>
-			<territory type="SN">सिनिगल</territory>
+			<territory type="SL">सेर्रा लेओं</territory>
+			<territory type="SM">सान मारीनो</territory>
+			<territory type="SN">सेनेगाल</territory>
 			<territory type="SO">सोमालिया</territory>
-			<territory type="SR">सुरीनाम</territory>
-			<territory type="SS">दक्षिण सुडान</territory>
-			<territory type="ST">साओ टोम आनी प्रिन्सिप</territory>
+			<territory type="SR">सुरिनाम</territory>
+			<territory type="SS">दक्षिण सुदान</territory>
+			<territory type="ST">सांव टोमे आनी प्रिंसिपे</territory>
 			<territory type="SV">एल साल्वाडोर</territory>
-			<territory type="SX">सिंट मार्टेन</territory>
+			<territory type="SX">सांव मोर्टिन (नॅदरलँड)</territory>
 			<territory type="SY">सिरिया</territory>
-			<territory type="SZ">इस्वातिनी</territory>
-			<territory type="SZ" alt="variant">स्वाझिलँड</territory>
-			<territory type="TA">त्रिस्तान दा कुन्हा</territory>
-			<territory type="TC">तुर्क्स आनी कॅकोज आयलँड्स</territory>
+			<territory type="SZ">एस्वातीनी</territory>
+			<territory type="TA">ट्रीस्टांव दा कुन्ह्या</territory>
+			<territory type="TC">तुर्क आनी कायकोस जुंवे</territory>
 			<territory type="TD">चाड</territory>
-			<territory type="TF">फ्रेंच दक्षिणी प्रांत</territory>
+			<territory type="TF">फ्रांसेझ दक्षिणी प्रांत</territory>
 			<territory type="TG">टोगो</territory>
 			<territory type="TH">थायलँड</territory>
-			<territory type="TJ">तजीकिस्तान</territory>
-			<territory type="TK">टोकलाऊ</territory>
+			<territory type="TJ">ताजीकिस्तान</territory>
+			<territory type="TK">टोकलाउ</territory>
 			<territory type="TL">तिमोर-लेस्ते</territory>
-			<territory type="TL" alt="variant">ईस्ट तिमूर</territory>
+			<territory type="TL" alt="variant">उदेंत तिमोर</territory>
 			<territory type="TM">तुर्कमेनिस्तान</territory>
-			<territory type="TN">ट्यूनीशिया</territory>
-			<territory type="TO">टोंगा</territory>
+			<territory type="TN">टुनिसिया</territory>
+			<territory type="TO">टाँगा</territory>
 			<territory type="TR">तुर्की</territory>
-			<territory type="TT">ट्रिनीदाद आनी टोबॅगो</territory>
-			<territory type="TV">टुवालू</territory>
-			<territory type="TW">तायवान</territory>
-			<territory type="TZ">तांझानिया</territory>
+			<territory type="TR" alt="variant">तुर्किया</territory>
+			<territory type="TT">त्रिनदाड आनी तोबाग</territory>
+			<territory type="TV">तुवालू</territory>
+			<territory type="TW">ताइवान</territory>
+			<territory type="TZ">तांजानिया</territory>
 			<territory type="UA">युक्रेन</territory>
 			<territory type="UG">युगांडा</territory>
-			<territory type="UM">यु. एस. मायनर आवटलायींग आयलँड्‍स</territory>
-			<territory type="UN">युनायटेड नेशन्स</territory>
+			<territory type="UM">संयुक्त राज्यांचे पयशिल्ले धाकटे जुंवे</territory>
+			<territory type="UN">संयुक्त राष्ट्रां</territory>
 			<territory type="US">युनायटेड स्टेट्स</territory>
 			<territory type="US" alt="short">युएस</territory>
-			<territory type="UY">उरूग्वे</territory>
-			<territory type="UZ">उझ्बेकिस्तान</territory>
-			<territory type="VA">वॅटिकन सिटी</territory>
-			<territory type="VC">सेंट विंसेंट ऐंड द ग्रेनेडाइंस</territory>
-			<territory type="VE">विनेझुएला</territory>
-			<territory type="VG">ब्रिटिश वर्जिन आयलँड्स</territory>
-			<territory type="VI">यु. एस. वर्जिन आयलँड्‍स</territory>
-			<territory type="VN">व्हिएतनाम</territory>
-			<territory type="VU">वनौतू</territory>
-			<territory type="WF">वालिस आनी फ्यूचूना</territory>
+			<territory type="UY">उरुग्वे</territory>
+			<territory type="UZ">उज्बेकिस्तान</territory>
+			<territory type="VA">वॅटिकन शार</territory>
+			<territory type="VC">सांव विसेंट आनी ग्रानाडीनस</territory>
+			<territory type="VE">वेनेजुएला</territory>
+			<territory type="VG">ब्रिटनाचे विर्जिन जुंवे</territory>
+			<territory type="VI">संयुक्त राज्यांचे विर्जिन जुंवे</territory>
+			<territory type="VN">विएतनाम</territory>
+			<territory type="VU">वानुआतु</territory>
+			<territory type="WF">वॉलिस आनी फुतुना</territory>
 			<territory type="WS">सामोआ</territory>
 			<territory type="XA">स्युडो-ऍक्सेंट</territory>
 			<territory type="XB">स्युडो-बिडी</territory>
 			<territory type="XK">कोसोवो</territory>
 			<territory type="YE">येमेन</territory>
-			<territory type="YT">मेयोट</territory>
-			<territory type="ZA">दक्षिण आफ्रीका</territory>
-			<territory type="ZM">झांबिया</territory>
+			<territory type="YT">मायोट</territory>
+			<territory type="ZA">दक्षिण आफ्रिका</territory>
+			<territory type="ZM">जाम्बिया</territory>
 			<territory type="ZW">जिम्बाब्वे</territory>
 			<territory type="ZZ">अज्ञात प्रांत</territory>
 		</territories>
@@ -851,43 +851,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">चलनाचें स्वरूप</key>
 			<key type="collation">वर्गवारी क्रम</key>
 			<key type="currency">चलन</key>
+			<key type="em">इमोजी सादरीकरण</key>
 			<key type="hc">वराचें चक्र (12 वि 24)</key>
 			<key type="lb">रेग खंड करपाची शैली</key>
+			<key type="lw">शब्दां भितर ओळी मोडप</key>
 			<key type="ms">मापन प्रणाली</key>
 			<key type="numbers">संख्या</key>
+			<key type="ss">वाक्य विराम उपरांत Abbr.</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">बौद्ध दिनदर्शिका</type>
+			<type key="calendar" type="buddhist" scope="core">बौध्द धर्म</type>
 			<type key="calendar" type="chinese">चीनी दिनदर्शिका</type>
+			<type key="calendar" type="chinese" scope="core">चीनी</type>
 			<type key="calendar" type="coptic">कॉप्टिक दिनदर्शिका</type>
+			<type key="calendar" type="coptic" scope="core">कॉप्टिक</type>
 			<type key="calendar" type="dangi">डांगी दिनदर्शिका</type>
+			<type key="calendar" type="dangi" scope="core">डांगी</type>
 			<type key="calendar" type="ethiopic">इथियोपिक दिनदर्शिका</type>
+			<type key="calendar" type="ethiopic" scope="core">इथियोपिक</type>
 			<type key="calendar" type="ethiopic-amete-alem">इथियोपिक अमिटी आलेम दिनदर्शिका</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">इथियोपिक</type>
 			<type key="calendar" type="gregorian">ग्रेगोरियन कॅलॅण्डर</type>
+			<type key="calendar" type="gregorian" scope="core">ग्रेगोरियन</type>
 			<type key="calendar" type="hebrew">हिब्रू दिनदर्शिका</type>
+			<type key="calendar" type="hebrew" scope="core">हिब्रू</type>
 			<type key="calendar" type="indian">भारतीय राष्ट्रीय दिनदर्शिका</type>
+			<type key="calendar" type="indian" scope="core">भारतीय राष्ट्रीय</type>
 			<type key="calendar" type="islamic">ईस्लामीक दिनदर्शिका</type>
+			<type key="calendar" type="islamic" scope="core">ईस्लामीक</type>
 			<type key="calendar" type="islamic-civil">ईस्लामीक दिनदर्शिका (कोश्टक, नागरी शक)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ईस्लामीक (कोश्टक, नागरी शक)</type>
 			<type key="calendar" type="islamic-umalqura">ईस्लामीक दिनदर्शिका (उम अल-कुरा)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ईस्लामीक (उम अल-कुरा)</type>
 			<type key="calendar" type="iso8601">आयएसओ-8601 दिनदर्शिका</type>
 			<type key="calendar" type="japanese">जपानी दिनदर्शिका</type>
+			<type key="calendar" type="japanese" scope="core">जपानी</type>
 			<type key="calendar" type="persian">पर्शियन दिनदर्शिका</type>
+			<type key="calendar" type="persian" scope="core">पर्शियन</type>
 			<type key="calendar" type="roc">मिंगुआ दिनदर्शिका (अणकाराची कुरू: जाका चिनी दिनदर्शिकेचें प्रजासत्ताक&quot;, &quot;रिपब्लिकन दिनदर्शिका&quot;)</type>
+			<type key="calendar" type="roc" scope="core">मिंगुआ</type>
 			<type key="cf" type="account">लेखा चलन स्वरूप</type>
+			<type key="cf" type="account" scope="core">लेखा चलन</type>
 			<type key="cf" type="standard">प्रमाणित चलन स्वरुप</type>
+			<type key="cf" type="standard" scope="core">प्रमाणित</type>
 			<type key="collation" type="ducet">डिफॉल्ट युनिकोड वर्गवारी क्रम</type>
+			<type key="collation" type="ducet" scope="core">डिफॉल्ट युनिकोड</type>
 			<type key="collation" type="search">सामान्य-उद्देशान केल्लो सोद</type>
+			<type key="collation" type="search" scope="core">सोद</type>
 			<type key="collation" type="standard">प्रमाणित वर्गवारी क्रम</type>
+			<type key="collation" type="standard" scope="core">वर्गवारी</type>
+			<type key="em" type="default" scope="core">डिफॉल्ट</type>
+			<type key="em" type="emoji" scope="core">इमोजी</type>
+			<type key="em" type="text" scope="core">लिखीत</type>
 			<type key="hc" type="h11">12 वरांची यंत्रणा (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 वरांची यंत्रणा (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 वरांची यंत्रणा (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 वरांची यंत्रणा (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">सुटी रेग खंड शैली</type>
+			<type key="lb" type="loose" scope="core">सुटी</type>
 			<type key="lb" type="normal">सामान्य रेग खंड शैली</type>
+			<type key="lb" type="normal" scope="core">सामान्य</type>
 			<type key="lb" type="strict">सक्तीची रेग खंड शैली</type>
+			<type key="lb" type="strict" scope="core">सक्तीची</type>
+			<type key="lw" type="breakall" scope="core">सगळें मोडून उडोवप</type>
+			<type key="lw" type="keepall" scope="core">सगळें दवरात</type>
+			<type key="lw" type="normal" scope="core">सामान्य</type>
+			<type key="lw" type="phrase" scope="core">वाक्यांशांत दवरात</type>
 			<type key="ms" type="metric">मॅट्रीक प्रणाली</type>
+			<type key="ms" type="metric" scope="core">मॅट्रीक</type>
 			<type key="ms" type="uksystem">भव्य मापन प्रणाली</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">युएस मापन प्रणाली</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">अरेबिक-भारतीय अंक</type>
 			<type key="numbers" type="arabext">विस्तारीत अरेबीक-भारतीय अंक</type>
 			<type key="numbers" type="armn">आर्मेनियन संख्या</type>
@@ -928,6 +968,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">थाय अंक</type>
 			<type key="numbers" type="tibt">तिबेतियन अंक</type>
 			<type key="numbers" type="vaii">वाई अंक</type>
+			<type key="ss" type="none" scope="core">बंद करचें</type>
+			<type key="ss" type="standard" scope="core">चालू</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">मॅट्रिक</measurementSystemName>
@@ -1009,37 +1051,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d-M-y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d, MMM y G</dateFormatItem>
+						<dateFormatItem id="h">a h</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Md">d-M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d, MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M-y GGGG</dateFormatItem>
+						<dateFormatItem id="yyyyM">M-y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d-M-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d-M-y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM, y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM, y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="h">h – h B</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">YG – YG</greatestDifference>
-							<greatestDifference id="y">y–y G</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M-y GGGG – M-y GGGG</greatestDifference>
-							<greatestDifference id="M">M-y GGGGG – M y</greatestDifference>
-							<greatestDifference id="y">M-y GGGGG – M-y</greatestDifference>
+							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
 							<greatestDifference id="d">d-M-y GGGGG – d-M-y</greatestDifference>
@@ -1049,14 +1100,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
 							<greatestDifference id="d">E, d-M-Y GGGGG – E-d-M-y</greatestDifference>
-							<greatestDifference id="G">E, d-M-y GGGGG – E, d-M-y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, d/M/y GGGGG – E, d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="M">E, d-M-y GGGGG – E, d-M-y</greatestDifference>
-							<greatestDifference id="y">E,dd-MM-y GGGGG – E,dd-MM-y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
 							<greatestDifference id="M">MMM y G–MMM</greatestDifference>
-							<greatestDifference id="y">MMM y G – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
 							<greatestDifference id="d">d-MMM y G–d</greatestDifference>
@@ -1065,10 +1116,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">d MMM y G – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">e, d MMM y G – e, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM, y G</greatestDifference>
 							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
 							<greatestDifference id="M">E, d MMM y G – E, d MMM</greatestDifference>
-							<greatestDifference id="y">E, d MMM y G – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">a h – a h</greatestDifference>
@@ -1102,62 +1153,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">HH – HH v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d-M – d-M</greatestDifference>
-							<greatestDifference id="M">d-M – d-M</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">E, d-M – E, d-M</greatestDifference>
 							<greatestDifference id="M">E, d-M, E d-M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
 							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
 							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M-y – M-y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">d-M-y – d-M-y GGGGG</greatestDifference>
-							<greatestDifference id="M">d-M-y – d-M-y GGGGG</greatestDifference>
 							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y G – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d MMM, y G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM, y G</greatestDifference>
-							<greatestDifference id="y">d, MMM y – d, MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y G</greatestDifference>
+							<greatestDifference id="y">d MMM, y – d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM, yG</greatestDifference>
 							<greatestDifference id="M">E, d, MMM y – E, d, MMM y G</greatestDifference>
-							<greatestDifference id="y">E, d, MMM y – E, d, MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1165,6 +1208,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">जाने</month>
+							<month type="2">फेब्रु</month>
+							<month type="3">मार्च</month>
+							<month type="4">एप्री</month>
+							<month type="5">मे</month>
+							<month type="6">जून</month>
+							<month type="7">जुल</month>
+							<month type="8">ऑग</month>
+							<month type="9">सप्टें</month>
+							<month type="10">ऑक्टो</month>
+							<month type="11">नोव्हें</month>
+							<month type="12">डिसें</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">जा</month>
+							<month type="2">फे</month>
+							<month type="3">मा</month>
+							<month type="4">ए</month>
+							<month type="5">मे</month>
+							<month type="6">जू</month>
+							<month type="7">जु</month>
+							<month type="8">ऑ</month>
+							<month type="9">स</month>
+							<month type="10">ऑ</month>
+							<month type="11">नो</month>
+							<month type="12">डि</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">जानेवारी</month>
 							<month type="2">फेब्रुवारी</month>
@@ -1192,9 +1263,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="8">ऑग</month>
 							<month type="9">सप्टें</month>
 							<month type="10">ऑक्टो</month>
-							<month type="11">नो</month>
+							<month type="11">नोव्हें</month>
 							<month type="12">डिसे</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">जा</month>
+							<month type="2">फे</month>
+							<month type="3">मा</month>
+							<month type="4">ए</month>
+							<month type="5">मे</month>
+							<month type="6">जू</month>
+							<month type="7">जु</month>
+							<month type="8">ऑ</month>
+							<month type="9">स</month>
+							<month type="10">ऑ</month>
+							<month type="11">नो</month>
+							<month type="12">डि</month>
+						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -1209,13 +1294,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="sat">शे</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun">आय</day>
+							<day type="sun">आ</day>
 							<day type="mon">सोम</day>
-							<day type="tue">मंगळ</day>
-							<day type="wed">बुध</day>
+							<day type="tue">मंगळार</day>
+							<day type="wed">बुधवार</day>
 							<day type="thu">बिरे</day>
-							<day type="fri">शुक्र</day>
-							<day type="sat">शेन</day>
+							<day type="fri">शुक्रार</day>
+							<day type="sat">शेनवार</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">आयतार</day>
@@ -1237,6 +1322,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">शु</day>
 							<day type="sat">शे</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">आ</day>
+							<day type="mon">सो</day>
+							<day type="tue">मंगळार</day>
+							<day type="wed">बुधवार</day>
+							<day type="thu">बिरे</day>
+							<day type="fri">शुक्रार</day>
+							<day type="sat">शेनवार</day>
+						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
@@ -1254,30 +1348,79 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">4थें त्रैमासीक</quarter>
 						</quarterWidth>
 					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">तिम्ह1</quarter>
+							<quarter type="2">तिम्ह2</quarter>
+							<quarter type="3">तिम्ह3</quarter>
+							<quarter type="4">तिम्ह4</quarter>
+						</quarterWidth>
+					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">मध्यान</dayPeriod>
+							<dayPeriod type="morning1">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दनपार</dayPeriod>
+							<dayPeriod type="evening1">सांज</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">मध्यान</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
-							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="morning1">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दनपार</dayPeriod>
+							<dayPeriod type="evening1">सांज</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यानरात</dayPeriod>
 							<dayPeriod type="am">सकाळीं</dayPeriod>
 							<dayPeriod type="pm">सांजे</dayPeriod>
+							<dayPeriod type="morning1">सकाळीं</dayPeriod>
+							<dayPeriod type="afternoon1">दनपारां</dayPeriod>
+							<dayPeriod type="evening1">सांजे</dayPeriod>
+							<dayPeriod type="night1">राती</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">मध्यान</dayPeriod>
+							<dayPeriod type="morning1">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दनपार</dayPeriod>
+							<dayPeriod type="evening1">सांज</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">मध्यान</dayPeriod>
+							<dayPeriod type="morning1">सकाळ</dayPeriod>
+							<dayPeriod type="afternoon1">दनपार</dayPeriod>
+							<dayPeriod type="evening1">सांज</dayPeriod>
+							<dayPeriod type="night1">रात</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">मध्यानरात</dayPeriod>
+							<dayPeriod type="am">सकाळीं</dayPeriod>
+							<dayPeriod type="pm">सांजे</dayPeriod>
+							<dayPeriod type="morning1">सकाळीं</dayPeriod>
+							<dayPeriod type="afternoon1">दनपारां</dayPeriod>
+							<dayPeriod type="evening1">सांजे</dayPeriod>
+							<dayPeriod type="night1">राती</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
+						<era type="0">क्रिस्ता आदीं</era>
 						<era type="0" alt="variant">क्रिस्तपूर्व शक</era>
-						<era type="1">क्रिस्तशक</era>
 						<era type="1" alt="variant">इसवी सन</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">क्रिस्तपूर्व</era>
 						<era type="0" alt="variant">BCE</era>
 						<era type="1">क्रि.श.</era>
-						<era type="1" alt="variant">CE</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">क्रि.आ.</era>
@@ -1342,6 +1485,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} {0} वरांचेर</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} वरांचेर</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1350,6 +1496,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} {0} वरांचेर</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} वरांचेर</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1358,6 +1507,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1366,44 +1518,106 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Md">d-M</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d-M-y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
+						<dateFormatItem id="hm">a h:mm</dateFormatItem>
+						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
+						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="hv">a h वाजतां v</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">d-M, E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">MMMM हाचो सप्तक W</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM हाचो सप्तक W</dateFormatItem>
 						<dateFormatItem id="yM">M-y</dateFormatItem>
 						<dateFormatItem id="yMd">d-M-y</dateFormatItem>
 						<dateFormatItem id="yMEd">d-M-y, E</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">Y हाचो सप्तक w</dateFormatItem>
+						<dateFormatItem id="yw" count="other">Y हाचो सप्तक w</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG M-y – GGGGG M-y</greatestDifference>
-							<greatestDifference id="M">GGGGG M-y – M-y</greatestDifference>
-							<greatestDifference id="y">GGGGG M-y – M-y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG d-M-y – d-M-y</greatestDifference>
-							<greatestDifference id="G">GGGGG d-M-y – GGGGG d-M-y</greatestDifference>
-							<greatestDifference id="M">GGGGG d-M-y – d-M-y</greatestDifference>
-							<greatestDifference id="y">GGGGG d-M-y – d-M-y</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="G">d/M/y G – d/M/y G</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG d-M-y, E – d-M-y, E</greatestDifference>
-							<greatestDifference id="G">GGGGG d-M-y, E – GGGGG d-M-y, E</greatestDifference>
-							<greatestDifference id="M">GGGGG d-M-y, E – d-M-y, E</greatestDifference>
-							<greatestDifference id="y">GGGGG d-M-y, E – d-M-y, E</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y G</greatestDifference>
+							<greatestDifference id="G">E, d/M/y G – E, d/M/y G</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y G</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d – d MMM, y G</greatestDifference>
+							<greatestDifference id="G">d MMM, y G – d MMM, y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y G</greatestDifference>
+							<greatestDifference id="y">d MMM, y – d MMM, y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM, y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM, y G – E, d MMM, y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM, y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">a h – a h</greatestDifference>
+							<greatestDifference id="h">a h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">a h:mm – a h:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d-M –d-M</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
 							<greatestDifference id="M">d-M –d-M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
@@ -1411,19 +1625,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">d-M, E – d-M, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM – MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M-y – M-y</greatestDifference>
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
 							<greatestDifference id="y">M-y – M-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">d-M-y – d-M-y</greatestDifference>
-							<greatestDifference id="M">d-M-y – d-M-y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
 							<greatestDifference id="y">d-M-y – d-M-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">d-M-y, E – d-M-y, E</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
 							<greatestDifference id="M">d-M-y, E – d-M-y, E</greatestDifference>
 							<greatestDifference id="y">d-M-y, E – d-M-y, E</greatestDifference>
 						</intervalFormatItem>
@@ -1438,8 +1663,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">E, d MMM –E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM, y</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
@@ -1451,6 +1676,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="indian">
 				<months>
 					<monthContext type="format">
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">चैत्र</month>
 							<month type="2">वैशाख</month>
@@ -1466,22 +1705,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="12">फाल्गुन</month>
 						</monthWidth>
 					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">१</month>
-							<month type="2">२</month>
-							<month type="3">३</month>
-							<month type="4">४</month>
-							<month type="5">५</month>
-							<month type="6">६</month>
-							<month type="7">७</month>
-							<month type="8">८</month>
-							<month type="9">९</month>
-							<month type="10">१०</month>
-							<month type="11">११</month>
-							<month type="12">१२</month>
-						</monthWidth>
-					</monthContext>
 				</months>
 				<eras>
 					<eraAbbr>
@@ -1496,42 +1719,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="year">
 				<displayName>वर्स</displayName>
-				<relative type="-1">फाटलें वर्स</relative>
+				<relative type="-1">पोरूं</relative>
 				<relative type="0">हें वर्स</relative>
 				<relative type="1">फुडलें वर्स</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} वर्सान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} वर्सांनीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} वर्स आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} वर्सां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
+				<relative type="-1">पोरूं</relative>
+				<relative type="0">हें वर्स</relative>
+				<relative type="1">फुडलें वर्स</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} वर्सान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} वर्सांनीं</relativeTimePattern>
+				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} वर्स आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} वर्स आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} वर्सां आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<relative type="-1">पोरूं</relative>
+				<relative type="0">हें वर्स</relative>
+				<relative type="1">फुडलें वर्स</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}वर्सान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}वर्सांनीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}वर्स आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}वर्सां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>त्रैमासीक</displayName>
-				<relative type="-1">फाटलो त्रैमासीक</relative>
-				<relative type="0">हो त्रैमासीक</relative>
-				<relative type="1">फुडलो त्रैमासीक</relative>
+				<relative type="-1">फाटलें तिम्हयनाळें</relative>
+				<relative type="0">हें तिम्हयनाळें</relative>
+				<relative type="1">फुडलें तिम्हयनाळें</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} त्रैमासीकांत</relativeTimePattern>
+					<relativeTimePattern count="one">{0} तिम्हयनाळ्यान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तिम्हयनाळ्यांनीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} त्रैमासीकां आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} तिम्हयनाळें आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तिम्हयनाळे आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<relative type="-1">फाटलें तिम्ह.</relative>
 				<relative type="0">हें तिम्ह.</relative>
 				<relative type="1">फुडलें तिम्ह.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} तिम्हयनाळ्यान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तिम्हयनाळ्यांनीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} तिम्ह. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} तिम्ह. आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
 				<relative type="-1">फाटलें तिम्ह</relative>
 				<relative type="0">हें तिम्ह</relative>
 				<relative type="1">फुडलें तिम्ह</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}तिम्हयनाळ्यान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}तिम्हयनाळ्यांनीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}तिम्ह आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}तिम्ह आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName>म्हयनो</displayName>
@@ -1539,29 +1803,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">हो म्हयनो</relative>
 				<relative type="1">फुडलो म्हयनो</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} म्हयन्यान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} म्हयन्यानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} म्हयन्यां आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} म्हयनो आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} म्हयने आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<relative type="-1">फाटलो म्ह.</relative>
+				<relative type="0">हो म्ह.</relative>
+				<relative type="1">फुडलो म्ह.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} म्हयन्यान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} म्हयन्यानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} म्ह. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} म्ह. आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<relative type="-1">फाटलो म्ह</relative>
+				<relative type="0">हो म्ह</relative>
+				<relative type="1">फुडलो म्ह</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}म्हयन्यान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}म्हयन्यानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}म्ह आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}म्ह आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>सप्तक</displayName>
-				<relative type="-1">निमाणो सप्तक</relative>
+				<relative type="-1">फाटलो सप्तक</relative>
 				<relative type="0">हो सप्तक</relative>
 				<relative type="1">फुडलो सप्तक</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सप्तकान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} सप्तकांनीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सप्तक आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} सप्तकां आदीं</relativeTimePattern>
 				</relativeTime>
 				<relativePeriod>{0} चो सप्तक</relativePeriod>
 			</field>
-			<field type="week-narrow">
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} सप्त. आदीं</relativeTimePattern>
+			<field type="week-short">
+				<relative type="-1">फाटलो सप्तक</relative>
+				<relative type="0">हो सप्तक</relative>
+				<relative type="1">फुडलो सप्तक</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सप्तकान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सप्तकांनीं</relativeTimePattern>
 				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सप्तक आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सप्तकां आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<relative type="-1">फाटलो सप्त</relative>
+				<relative type="0">हो सप्त</relative>
+				<relative type="1">फुडलो सप्त</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}सप्तकान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}सप्तकांनीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}सप्त आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}सप्त आदीं</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>{0} चो सप्त</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>म्हयन्यातलो सप्तक</displayName>
@@ -1572,12 +1888,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">आयज</relative>
 				<relative type="1">फाल्यां</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} दिसान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} दिसानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} दीस आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} दीस आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="day-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} दिसान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} दिसानीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}दिसान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}दिसानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}दी आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}दी आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="dayOfYear">
 				<displayName>वर्साचो दीस</displayName>
 			</field>
@@ -1585,144 +1919,286 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>सप्तकाचो दीस</displayName>
 			</field>
 			<field type="weekdayOfMonth">
-				<displayName>म्हयन्यातलो सप्तकीय दीस</displayName>
+				<displayName>म्हयन्यांत दीसाचो प्रसंग</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName>म्हयन्यांत दीसाचो प्रसंग</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName>म्हयन्यांत दीसाचो प्रसंग</displayName>
 			</field>
 			<field type="sun">
 				<relative type="-1">फाटलो आयतार</relative>
 				<relative type="0">हो आयतार</relative>
 				<relative type="1">फुडलो आयतार</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} आयतारान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} आयतारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} आयतार आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} आयतारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="sun-short">
+				<relative type="-1">फाटलो आयत</relative>
+				<relative type="0">हो आयत</relative>
+				<relative type="1">फुडलो आयत</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} आयतारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आयतारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} आयत. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आयत आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">फाटलो आ</relative>
+				<relative type="0">हो आ</relative>
+				<relative type="1">फुडलो आ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} आयतारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आयतारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} आ आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} आ आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="mon">
-				<relative type="-1">निमाणो सोमार</relative>
+				<relative type="-1">फाटलो सोमार</relative>
 				<relative type="0">हो सोमार</relative>
 				<relative type="1">फुडलो सोमार</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सोमारान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} सोमारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सोमार आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} सोमारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon-short">
-				<relative type="-1">निमाणो सोम.</relative>
+				<relative type="-1">फाटलो सोम.</relative>
 				<relative type="0">हो सोम.</relative>
 				<relative type="1">फुडलो सोम.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सोमारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सोमारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सोम. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सोम. आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="mon-narrow">
-				<relative type="-1">निमाणो सो.</relative>
-				<relative type="0">हो सो.</relative>
-				<relative type="1">फुडलो सो.</relative>
+				<relative type="-1">फाटलो सो</relative>
+				<relative type="0">हो सो</relative>
+				<relative type="1">फुडलो सो</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सोमारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सोमारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सो आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सो आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="tue">
-				<relative type="-1">निमाणो मंगळार</relative>
+				<relative type="-1">फाटलो मंगळार</relative>
 				<relative type="0">हो मंगळार</relative>
 				<relative type="1">फुडलो मंगळार</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} मंगळारान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} मंगळारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} मंगळार आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} मंगळारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">निमाणो मंगळ.</relative>
-				<relative type="0">हो मंगळ.</relative>
-				<relative type="1">फुडलो मंगळ.</relative>
+				<relative type="-1">फाटलो मंग.</relative>
+				<relative type="0">हो मंग.</relative>
+				<relative type="1">फुडलो मंग.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} मंगळारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मंगळारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} मंग. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मंग. आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="tue-narrow">
-				<relative type="-1">फाटलो मं.</relative>
-				<relative type="0">हो मं.</relative>
-				<relative type="1">फुडलो मं.</relative>
+				<relative type="-1">फाटलो मं</relative>
+				<relative type="0">हो मं</relative>
+				<relative type="1">फुडलो मं</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} मंगळारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मंगळारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} मं आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मं आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="wed">
 				<relative type="-1">फाटलो बुधवार</relative>
 				<relative type="0">हो बुधवार</relative>
 				<relative type="1">फुडलो बुधवार</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} बुधवारान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} बुधवारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} बुधवार आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} बुधवारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="wed-short">
-				<relative type="-1">निमाणो बुध.</relative>
+				<relative type="-1">फाटलो बुध.</relative>
 				<relative type="0">हो बुध.</relative>
 				<relative type="1">फुडलो बुध.</relative>
-			</field>
-			<field type="wed-narrow">
-				<relative type="-1">निमाणो बु.</relative>
-				<relative type="0">हो बु.</relative>
-				<relative type="1">फुडलो बु.</relative>
-			</field>
-			<field type="thu">
-				<relative type="-1">निमाणो गुरुवार</relative>
-				<relative type="0">हो गुरुवार</relative>
-				<relative type="1">फुडलो गुरुवार</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} गुरुवारानीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} बुधवारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बुधवारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} गुरुवारां आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} बुध. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बुध. आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">फाटलो बु</relative>
+				<relative type="0">हो बु</relative>
+				<relative type="1">फुडलो बु</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} बुधवारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बुधवारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} बु आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बु आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu">
+				<relative type="-1">फाटलो बिरेस्तार</relative>
+				<relative type="0">हो बिरेस्तार</relative>
+				<relative type="1">फुडलो बिरेस्तार</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} बिरेस्तारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बिरेस्तारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} बिरेस्तार आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बिरेस्तारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu-short">
-				<relative type="-1">निमाणो गुरु.</relative>
-				<relative type="0">हो गुरु.</relative>
-				<relative type="1">फुडलो गुरु.</relative>
-			</field>
-			<field type="thu-narrow">
-				<relative type="-1">निमाणो गु.</relative>
-				<relative type="0">हो गु.</relative>
-				<relative type="1">फुडलो गु.</relative>
-			</field>
-			<field type="fri">
-				<relative type="-1">निमाणो शुक्रार</relative>
-				<relative type="0">हो शुक्रार</relative>
-				<relative type="1">फुडलो शुक्रार</relative>
+				<relative type="-1">फाटलो ब्रेस्त.</relative>
+				<relative type="0">हो ब्रेस्त.</relative>
+				<relative type="1">फुडलो ब्रेस्त.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} शुक्रारानीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} बिरेस्तारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बिरेस्तारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} शुक्रारां आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ब्रेस्त. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ब्रेस्त. आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">फाटलो ब्रे</relative>
+				<relative type="0">हो ब्रे</relative>
+				<relative type="1">फुडलो ब्रे</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} बिरेस्तारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} बिरेस्तारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ब्रे आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ब्रे आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri">
+				<relative type="-1">फाटलो सुक्रार</relative>
+				<relative type="0">हो सुक्रार</relative>
+				<relative type="1">फुडलो सुक्रार</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सुक्रारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सुक्रारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सुक्रार आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सुक्रारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">निमाणो शुक्र.</relative>
-				<relative type="0">हो शुक्र.</relative>
-				<relative type="1">फुडलो शुक्र.</relative>
+				<relative type="-1">फाटलो सुक्र.</relative>
+				<relative type="0">हो सुक्र.</relative>
+				<relative type="1">फुडलो सुक्र.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सुक्रारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सुक्रारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सुक्र. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सुक्र. आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1">निमाणो शु.</relative>
-				<relative type="0">हो शु.</relative>
-				<relative type="1">फुडलो शु.</relative>
+				<relative type="-1">फाटलो सुक्र</relative>
+				<relative type="0">हो सुक्र</relative>
+				<relative type="1">फुडलो सुक्र</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सुक्रारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सुक्रारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} सुक्र आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सुक्र आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="sat">
-				<relative type="-1">निमाणो शेनवार</relative>
+				<relative type="-1">फाटलो शेनवार</relative>
 				<relative type="0">हो शेनवार</relative>
 				<relative type="1">फुडलो शेनवार</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} शेनवारान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} शेनवारानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} शेनवार आदीं</relativeTimePattern>
 					<relativeTimePattern count="other">{0} शेनवारां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-short">
-				<relative type="-1">निमाणो शेन.</relative>
+				<relative type="-1">फाटलो शेन.</relative>
 				<relative type="0">हो शेन.</relative>
 				<relative type="1">फुडलो शेन.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} शेनवारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} शेनवारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} शेन. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} शेन. आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1">निमाणो शे.</relative>
-				<relative type="0">हो शे.</relative>
-				<relative type="1">फुडलो शेन.</relative>
+				<relative type="-1">फाटलो शे</relative>
+				<relative type="0">हो शे</relative>
+				<relative type="1">फुडलो शे</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} शेनवारान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} शेनवारानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} शे आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} शे आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="dayperiod">
 				<displayName>AM/PM</displayName>
@@ -1731,54 +2207,114 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>वर</displayName>
 				<relative type="0">हें वर</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} वरान</relativeTimePattern>
 					<relativeTimePattern count="other">{0} वरांनीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} वरा आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} वर आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} वरां आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} वरान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} वरांनीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} वर आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} वरां आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}वरान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}वरांनीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}वर आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}वरां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>मिनीट</displayName>
-				<relative type="0">हें मिनीट</relative>
+				<relative type="0">हो मिनूट</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} मिन्टां</relativeTimePattern>
+					<relativeTimePattern count="one">{0} मिणटान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिणटांनी</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} मिन्टां आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} मिनूट आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिणटां आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<relative type="0">हो मिन.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} मिणटान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिण.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} मिण. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} मिण. आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute-narrow">
 				<relative type="0">हो मिन</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}मिणटान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}मिण</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}मिण आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}मिण आदीं</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>सेकंद</displayName>
 				<relative type="0">आतां</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} सेकंदानीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} सॅकंडान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सॅकंडानीं</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} सेकंद आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} सॅकंड आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सॅकंड आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} सॅकंडान</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सॅकंडानीं</relativeTimePattern>
+				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} से. आदीं</relativeTimePattern>
+					<relativeTimePattern count="one">{0} सॅक. आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0} सॅक. आदीं</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}सॅकंडान</relativeTimePattern>
+					<relativeTimePattern count="other">{0}सॅकंडानीं</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}सॅक आदीं</relativeTimePattern>
+					<relativeTimePattern count="other">{0}सॅक आदीं</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="zone">
 				<displayName>वेळ झोन</displayName>
 			</field>
 			<field type="zone-short">
-				<displayName>झोन</displayName>
+				<displayName>क्षेत्र</displayName>
+			</field>
+			<field type="zone-narrow">
+				<displayName>क्षेत्र</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0} वेळ</regionFormat>
 			<regionFormat type="daylight">{0} डेलायट वेळ</regionFormat>
-			<regionFormat type="standard">{0} प्रमाणित वेळ</regionFormat>
+			<regionFormat type="standard">{0} प्रमाण वेळ</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>समन्वित वैश्विक वेळ</standard>
@@ -2129,6 +2665,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>ईस्टर</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>कोयहायक</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>पुंटा अरेनास</exemplarCity>
 			</zone>
@@ -2355,7 +2894,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>इसले ऑफ मॅन</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
-				<exemplarCity>कोलकाता</exemplarCity>
+				<exemplarCity>कोलकाता, बॉम्बाईं, पणजी</exemplarCity>
 			</zone>
 			<zone type="Indian/Chagos">
 				<exemplarCity>चागोस</exemplarCity>
@@ -2394,9 +2933,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>फ्नोम पेन्ह</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>इंडरबरी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>कांटोन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3066,9 +3602,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>अस्तंत आफ्रिका वेळ</generic>
-					<standard>अस्तंत आफ्रिका प्रमाणित वेळ</standard>
-					<daylight>अस्तंत आफ्रिका ग्रीष्म वेळ</daylight>
+					<standard>अस्तंत आफ्रिका वेळ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3418,6 +3952,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>गुयाना वेळ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाई-अलेयुशिन प्रमाणीत वेळ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाई-अलेयुशिन वेळ</generic>
@@ -3929,189 +4468,859 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<nan>0/0</nan>
 		</symbols>
 		<decimalFormats numberSystem="latn">
+			<decimalFormatLength>
+				<decimalFormat>
+					<pattern>#,##,##0.###</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
 			<decimalFormatLength type="long">
 				<decimalFormat>
+					<pattern type="1000" count="one">0हज</pattern>
 					<pattern type="1000" count="other">0 हजार</pattern>
+					<pattern type="10000" count="one">00हज</pattern>
 					<pattern type="10000" count="other">00 हजार</pattern>
-					<pattern type="100000" count="other">000 हजार</pattern>
-					<pattern type="1000000" count="other">0 दशलक्ष</pattern>
-					<pattern type="10000000" count="other">00 दशलक्ष</pattern>
-					<pattern type="100000000" count="other">000 दशलक्ष</pattern>
+					<pattern type="100000" count="one">0लाख</pattern>
+					<pattern type="100000" count="other">0 लाख</pattern>
+					<pattern type="1000000" count="one">00लाख</pattern>
+					<pattern type="1000000" count="other">00 लाख</pattern>
+					<pattern type="10000000" count="one">0कोटी</pattern>
+					<pattern type="10000000" count="other">0 कोटी</pattern>
+					<pattern type="100000000" count="one">00कोटी</pattern>
+					<pattern type="100000000" count="other">00 कोटी</pattern>
+					<pattern type="1000000000" count="one">0अब्ज</pattern>
 					<pattern type="1000000000" count="other">0 अब्ज</pattern>
+					<pattern type="10000000000" count="one">00अब्ज</pattern>
 					<pattern type="10000000000" count="other">00 अब्ज</pattern>
-					<pattern type="100000000000" count="other">000 अब्ज</pattern>
-					<pattern type="1000000000000" count="other">0 ट्रिलियन</pattern>
-					<pattern type="10000000000000" count="other">00 ट्रिलियन</pattern>
-					<pattern type="100000000000000" count="other">000 ट्रिलियन</pattern>
+					<pattern type="100000000000" count="one">0निख</pattern>
+					<pattern type="100000000000" count="other">0 निखर्व</pattern>
+					<pattern type="1000000000000" count="one">00निख</pattern>
+					<pattern type="1000000000000" count="other">00 निखर्व</pattern>
+					<pattern type="10000000000000" count="one">000निख</pattern>
+					<pattern type="10000000000000" count="other">000 निखर्व</pattern>
+					<pattern type="100000000000000" count="one">0हज'.'निख'.'</pattern>
+					<pattern type="100000000000000" count="other">0 हजार निखर्व</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000000000" count="other">0B</pattern>
-					<pattern type="10000000000" count="other">00B</pattern>
-					<pattern type="100000000000" count="other">000B</pattern>
+					<pattern type="1000" count="one">0हज</pattern>
+					<pattern type="1000" count="other">0हज</pattern>
+					<pattern type="10000" count="one">00हज</pattern>
+					<pattern type="10000" count="other">00हज</pattern>
+					<pattern type="100000" count="one">0लाख</pattern>
+					<pattern type="100000" count="other">0लाख</pattern>
+					<pattern type="1000000" count="one">00लाख</pattern>
+					<pattern type="1000000" count="other">00लाख</pattern>
+					<pattern type="10000000" count="one">0कोटी</pattern>
+					<pattern type="10000000" count="other">0कोटी</pattern>
+					<pattern type="100000000" count="one">00कोटी</pattern>
+					<pattern type="100000000" count="other">00कोटी</pattern>
+					<pattern type="1000000000" count="one">0अब्ज</pattern>
+					<pattern type="1000000000" count="other">0अब्ज</pattern>
+					<pattern type="10000000000" count="one">00अब्ज</pattern>
+					<pattern type="10000000000" count="other">00अब्ज</pattern>
+					<pattern type="100000000000" count="one">0निख</pattern>
+					<pattern type="100000000000" count="other">0निख</pattern>
+					<pattern type="1000000000000" count="one">00निख</pattern>
+					<pattern type="1000000000000" count="other">00निख</pattern>
+					<pattern type="10000000000000" count="one">000निख</pattern>
+					<pattern type="10000000000000" count="other">000निख</pattern>
+					<pattern type="100000000000000" count="one">0हज'.'निख'.'</pattern>
+					<pattern type="100000000000000" count="other">0हज'.'निख'.'</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="ahom">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bhks">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="deva">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="diak">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gara">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gukh">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmng">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmnp">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kawi">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="krai">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0K</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0K</pattern>
-					<pattern type="10000" count="other">¤00K</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00K</pattern>
-					<pattern type="100000" count="other">¤000K</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K</pattern>
-					<pattern type="1000000" count="other">¤0M</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
-					<pattern type="10000000" count="other">¤00M</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
-					<pattern type="100000000" count="other">¤000M</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
-					<pattern type="1000000000" count="other">¤0B</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
-					<pattern type="1000000000000" count="other">¤0T</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
-					<pattern type="10000000000000" count="other">¤00T</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
-					<pattern type="100000000000000" count="other">¤000T</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="1000" count="one">¤0हज</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0हज</pattern>
+					<pattern type="1000" count="other">¤0हज</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0हज</pattern>
+					<pattern type="10000" count="one">¤00हज</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00हज</pattern>
+					<pattern type="10000" count="other">¤00हज</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00हज</pattern>
+					<pattern type="100000" count="one">¤0लाख</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 0लाख</pattern>
+					<pattern type="100000" count="other">¤0लाख</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 0लाख</pattern>
+					<pattern type="1000000" count="one">¤00लाख</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 00लाख</pattern>
+					<pattern type="1000000" count="other">¤00लाख</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00लाख</pattern>
+					<pattern type="10000000" count="one">¤0कोटी</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 0कोटी</pattern>
+					<pattern type="10000000" count="other">¤0कोटी</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0कोटी</pattern>
+					<pattern type="100000000" count="one">¤00कोटी</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 00कोटी</pattern>
+					<pattern type="100000000" count="other">¤00कोटी</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 00कोटी</pattern>
+					<pattern type="1000000000" count="one">¤0अब्ज</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0अब्ज</pattern>
+					<pattern type="1000000000" count="other">¤0अब्ज</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0अब्ज</pattern>
+					<pattern type="10000000000" count="one">¤00अब्ज</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00अब्ज</pattern>
+					<pattern type="10000000000" count="other">¤00अब्ज</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00अब्ज</pattern>
+					<pattern type="100000000000" count="one">¤0निख</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 0निख</pattern>
+					<pattern type="100000000000" count="other">¤0निख</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0निख</pattern>
+					<pattern type="1000000000000" count="one">¤00निख</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 00निख</pattern>
+					<pattern type="1000000000000" count="other">¤00निख</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 00निख</pattern>
+					<pattern type="10000000000000" count="one">¤000निख</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 000निख</pattern>
+					<pattern type="10000000000000" count="other">¤000निख</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 000निख</pattern>
+					<pattern type="100000000000000" count="one">¤0हज'.'निख'.'</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 0हज'.'निख'.'</pattern>
+					<pattern type="100000000000000" count="other">¤0हज'.'निख'.'</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 0हज'.'निख'.'</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathbold">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathdbl">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathmono">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsanb">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsans">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="modi">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mroo">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrepka">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrpao">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrtlng">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nagm">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="newa">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="onao">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="outlined">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="segment">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sind">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sinh">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sunu">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tirh">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tnsa">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tols">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wara">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wcho">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤000LCr</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤000LCr</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName>युनाइटेड अरब इमीरॅट्स दिरहम</displayName>
-				<displayName count="other">युएई दिरहम्स</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>अफगाण अफगाणी</displayName>
-				<displayName count="other">अफगाण अफगाणीस</displayName>
 			</currency>
 			<currency type="ALL">
 				<displayName>अल्बेनियन लेक</displayName>
-				<displayName count="other">अल्बेनियन लेके</displayName>
 			</currency>
 			<currency type="AMD">
 				<displayName>अर्मेनियन ड्राम</displayName>
-				<displayName count="other">अर्मेनियन ड्राम्स</displayName>
+				<displayName count="one">अर्मेनियन ड्राम</displayName>
+				<displayName count="other">अर्मेनियन ड्राम</displayName>
 			</currency>
 			<currency type="ANG">
 				<displayName>नॅदरलँड अँटिलियन गिल्डर</displayName>
-				<displayName count="other">नॅदरलँड अँटिलियन गिल्डर्स</displayName>
 			</currency>
 			<currency type="AOA">
 				<displayName>अंगोलन क्वॉन्ज</displayName>
-				<displayName count="other">अंगोलन क्वॉन्ज्स</displayName>
+				<displayName count="one">अंगोलन क्वॉन्ज</displayName>
+				<displayName count="other">अंगोलन क्वॉन्ज</displayName>
 			</currency>
 			<currency type="ARS">
 				<displayName>अर्जेंटिना पेसो</displayName>
+				<displayName count="one">अर्जेंटिना पेसोस</displayName>
 				<displayName count="other">अर्जेंटिना पेसोस</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>ऑस्ट्रेलियाई डॉलर</displayName>
-				<displayName count="other">ऑस्ट्रेलियाई डॉलर्स</displayName>
 			</currency>
 			<currency type="AWG">
 				<displayName>अरुबान फ्लोरिन</displayName>
 			</currency>
 			<currency type="AZN">
 				<displayName>अज़रबैजानी मनात</displayName>
-				<displayName count="other">अज़रबैजानी मनात्स</displayName>
 			</currency>
 			<currency type="BAM">
 				<displayName>बोस्निया-हेर्जेगोविना रुपांतरीत मार्क</displayName>
-				<displayName count="other">बोस्निया-हेर्जेगोविना रुपांतरीत मार्क्स</displayName>
 			</currency>
 			<currency type="BBD">
 				<displayName>बार्बाडियान डॉलर</displayName>
+				<displayName count="one">बार्बाडियान डॉलर्स</displayName>
 				<displayName count="other">बार्बाडियान डॉलर्स</displayName>
 			</currency>
 			<currency type="BDT">
 				<displayName>बांगलादेशी टाका</displayName>
-				<displayName count="other">बांगलादेशी टाकास</displayName>
+				<displayName count="one">बांगलादेशी टाका</displayName>
+				<displayName count="other">बांगलादेशी टाका</displayName>
 			</currency>
 			<currency type="BGN">
 				<displayName>बल्गेरियन लेव</displayName>
-				<displayName count="other">बल्गेरियन लेवा</displayName>
 			</currency>
 			<currency type="BHD">
 				<displayName>बहरिनी डिनार</displayName>
-				<displayName count="other">बहरिनी डिनार्स</displayName>
 			</currency>
 			<currency type="BIF">
 				<displayName>बुरुंडी फ्रँक</displayName>
 			</currency>
 			<currency type="BMD">
 				<displayName>बरमुदान डॉलर</displayName>
-				<displayName count="other">बरमुदान डॉलर्स</displayName>
 			</currency>
 			<currency type="BND">
 				<displayName>ब्रूनेई डॉलर</displayName>
-				<displayName count="other">ब्रूनेई डॉलर्स</displayName>
 			</currency>
 			<currency type="BOB">
 				<displayName>बोलिव्हियन बोलिवियानो</displayName>
+				<displayName count="one">बोलिव्हियन बोलिवियानोस</displayName>
 				<displayName count="other">बोलिव्हियन बोलिवियानोस</displayName>
 			</currency>
 			<currency type="BRL">
 				<displayName>ब्राझिलियन रियाल</displayName>
+				<displayName count="one">ब्राझिलियन रियाल्स</displayName>
 				<displayName count="other">ब्राझिलियन रियाल्स</displayName>
 			</currency>
 			<currency type="BSD">
 				<displayName>बहामियन डॉलर</displayName>
-				<displayName count="other">बहामियन डॉलर्स</displayName>
 			</currency>
 			<currency type="BTN">
 				<displayName>भुतानीज नागल्ट्रम</displayName>
-				<displayName count="other">भुतानीज नागल्ट्रम्स</displayName>
+				<displayName count="one">भुतानीज नागल्ट्रम</displayName>
+				<displayName count="other">भुतानीज नागल्ट्रम</displayName>
 			</currency>
 			<currency type="BWP">
 				<displayName>बोत्सवाना पुला</displayName>
-				<displayName count="other">बोत्सवाना पुलास</displayName>
 			</currency>
 			<currency type="BYN">
 				<displayName>बैलोरुसियन् रूबल</displayName>
-				<displayName count="other">बैलोरुसियन् रूबल्स</displayName>
 				<symbol alt="narrow" draft="contributed">р.</symbol>
 			</currency>
 			<currency type="BZD">
 				<displayName>बेलिझ डॉलर</displayName>
-				<displayName count="other">बेलिझ डॉलर्स</displayName>
 			</currency>
 			<currency type="CAD">
 				<displayName>कॅनाडियन डॉलर</displayName>
-				<displayName count="other">कॅनाडियन डॉलर्स</displayName>
 			</currency>
 			<currency type="CDF">
 				<displayName>काँगोलिसी फ्रँक</displayName>
-				<displayName count="other">काँगोलिसी फ्रँक्स</displayName>
+				<displayName count="one">काँगोलिसी फ्रँक</displayName>
+				<displayName count="other">काँगोलिसी फ्रँक</displayName>
 			</currency>
 			<currency type="CHF">
 				<displayName>स्विस फ्रँक</displayName>
-				<displayName count="other">स्विस फ्रँक्स</displayName>
 			</currency>
 			<currency type="CLP">
 				<displayName>चिली पेसो</displayName>
-				<displayName count="other">चिली पेसोस</displayName>
 			</currency>
 			<currency type="CNH">
 				<displayName>चिनी युआन (ऑफशोर)</displayName>
@@ -4121,168 +5330,143 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="COP">
 				<displayName>कोलंबियन पेसो</displayName>
-				<displayName count="other">कोलंबियन पेसोस</displayName>
 			</currency>
 			<currency type="CRC">
 				<displayName>कोस्ता रिका कॉलॉन</displayName>
-				<displayName count="other">कोस्ता रिका कॉलॉन्स</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName>क्युबान रुपांतरीत पेसो</displayName>
-				<displayName count="other">क्युबान रुपांतरीत पेसोस</displayName>
 			</currency>
 			<currency type="CUP">
 				<displayName>क्युबान पेसो</displayName>
-				<displayName count="other">क्युबान पेसोस</displayName>
 			</currency>
 			<currency type="CVE">
 				<displayName>केप वर्दे एस्कुडो</displayName>
-				<displayName count="other">केप वर्दे एस्कुडो्स</displayName>
 			</currency>
 			<currency type="CZK">
 				<displayName>चेक कोरुना</displayName>
-				<displayName count="other">चेक कोरुनास</displayName>
 			</currency>
 			<currency type="DJF">
 				<displayName>जिबूती फ्रँक</displayName>
-				<displayName count="other">जिबूती फ्रँक्स</displayName>
 			</currency>
 			<currency type="DKK">
 				<displayName>डॅनिश क्रोन</displayName>
+				<displayName count="one">डॅनिश क्रोनर</displayName>
 				<displayName count="other">डॅनिश क्रोनर</displayName>
 			</currency>
 			<currency type="DOP">
 				<displayName>डोमिनिकन पेसो</displayName>
-				<displayName count="other">डोमिनिकन पेसोस</displayName>
 			</currency>
 			<currency type="DZD">
 				<displayName>अल्जेरियाई डिनार</displayName>
-				<displayName count="other">अल्जेरियाई डिनार्स</displayName>
 			</currency>
 			<currency type="EGP">
 				<displayName>ईजिप्ती पावंड</displayName>
-				<displayName count="other">ईजिप्ती पावंड्स</displayName>
+				<displayName count="one">ईजिप्ती पावंड</displayName>
+				<displayName count="other">ईजिप्ती पावंड</displayName>
 			</currency>
 			<currency type="ERN">
 				<displayName>इरिट्रियन नाक्फा</displayName>
-				<displayName count="other">इरिट्रियन नाक्फास</displayName>
 			</currency>
 			<currency type="ETB">
 				<displayName>इथियोपियाई बिरर</displayName>
-				<displayName count="other">इथियोपियाई बिरर्स</displayName>
 			</currency>
 			<currency type="EUR">
 				<displayName>युरो</displayName>
+				<displayName count="one">युरोस</displayName>
 				<displayName count="other">युरोस</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>फिजी डॉलर</displayName>
-				<displayName count="other">फिजी डॉलर्स</displayName>
 			</currency>
 			<currency type="FKP">
 				<displayName>फ़ॉकलैंड आइलैंड्स पावंड</displayName>
-				<displayName count="other">फ़ॉकलैंड आइलैंड्स पावंड्स</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>ब्रिटिश पावंड</displayName>
+				<displayName count="one">ब्रिटिश पावंड्स</displayName>
 				<displayName count="other">ब्रिटिश पावंड्स</displayName>
 			</currency>
 			<currency type="GEL">
 				<displayName>जॉर्जियन लारी</displayName>
-				<displayName count="other">जॉर्जियन लारीस</displayName>
 			</currency>
 			<currency type="GHS">
 				<displayName>घानाई सेडी</displayName>
-				<displayName count="other">घानाई सेडीस</displayName>
 			</currency>
 			<currency type="GIP">
 				<displayName>जिब्राल्टर पावंड</displayName>
+				<displayName count="one">जिब्राल्टर पावंड्स</displayName>
 				<displayName count="other">जिब्राल्टर पावंड्स</displayName>
 			</currency>
 			<currency type="GMD">
 				<displayName>गॅम्बियन दलासी</displayName>
-				<displayName count="other">गॅम्बियन दलासीस</displayName>
 			</currency>
 			<currency type="GNF">
 				<displayName>गिनीन फ्रँक</displayName>
-				<displayName count="other">गिनीन फ्रँक्स</displayName>
 			</currency>
 			<currency type="GTQ">
 				<displayName>ग्वाटेमाला कुएट्झल</displayName>
-				<displayName count="other">ग्वाटेमाला कुएट्झल्स</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName>गयाना डॉलर</displayName>
-				<displayName count="other">गयाना डॉलर्स</displayName>
 			</currency>
 			<currency type="HKD">
 				<displayName>हाँग काँग डॉलर</displayName>
-				<displayName count="other">हाँग काँग डॉलर्स</displayName>
 			</currency>
 			<currency type="HNL">
 				<displayName>होंडुरान लेम्पिरा</displayName>
-				<displayName count="other">होंडुरान लेम्पिरास</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName>क्रोयेषियन् कुना</displayName>
-				<displayName count="other">क्रोयेषियन् कुनास</displayName>
 			</currency>
 			<currency type="HTG">
 				<displayName>हैतीयन गौर्डे</displayName>
-				<displayName count="other">हैतीयन गौर्डेस</displayName>
 			</currency>
 			<currency type="HUF">
 				<displayName>हंगेरियन फोरिंट</displayName>
-				<displayName count="other">हंगेरियन फोरिंट्स</displayName>
 			</currency>
 			<currency type="IDR">
 				<displayName>इंडोनेशियन रुपिया</displayName>
 			</currency>
 			<currency type="ILS">
 				<displayName>इस्त्रायली न्यु शेकेल</displayName>
-				<displayName count="other">इस्त्रायली न्यु शेकेल्स</displayName>
 			</currency>
 			<currency type="INR">
 				<displayName>भारतीय रुपया</displayName>
 			</currency>
 			<currency type="IQD">
 				<displayName>इराकी डिनार</displayName>
-				<displayName count="other">इराकी डिनार्स</displayName>
+				<displayName count="one">इराकी डिनार</displayName>
+				<displayName count="other">इराकी डिनार</displayName>
 			</currency>
 			<currency type="IRR">
 				<displayName>ईरानी रियाल</displayName>
-				<displayName count="other">ईरानी रियाल्स</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>आईस्लान्डिक क्रोना</displayName>
-				<displayName count="other">आईस्लान्डिक क्रोनुर</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName>जमैकन डॉलर</displayName>
-				<displayName count="other">जमैकन डॉलर्स</displayName>
+				<displayName count="one">जमैकन डॉलर</displayName>
+				<displayName count="other">जमैकन डॉलर</displayName>
 			</currency>
 			<currency type="JOD">
 				<displayName>जॉर्डनियन डिनार</displayName>
-				<displayName count="other">जॉर्डनियन डिनार्स</displayName>
 			</currency>
 			<currency type="JPY">
 				<displayName>जपानी येन</displayName>
 			</currency>
 			<currency type="KES">
 				<displayName>केनयाई शिलिंग</displayName>
-				<displayName count="other">केनयाई शिलिंग्स</displayName>
 			</currency>
 			<currency type="KGS">
 				<displayName>किरगिझस्तान सोम</displayName>
-				<displayName count="other">किरगिझस्तान सोम्स</displayName>
 			</currency>
 			<currency type="KHR">
 				<displayName>कंबोडियन रियाल</displayName>
-				<displayName count="other">कंबोडियन रियाल्स</displayName>
 			</currency>
 			<currency type="KMF">
 				<displayName>कोमोरियन फ्रँक</displayName>
-				<displayName count="other">कोमोरियन फ्रँक्स</displayName>
 			</currency>
 			<currency type="KPW">
 				<displayName>उत्तर कोरियन वॉन</displayName>
@@ -4292,136 +5476,111 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="KWD">
 				<displayName>कुवेती डिनार</displayName>
-				<displayName count="other">कुवेती डिनार्स</displayName>
 			</currency>
 			<currency type="KYD">
 				<displayName>कैमेन आइलैंड्स डॉलर</displayName>
-				<displayName count="other">कैमेन आइलैंड्स डॉलर्स</displayName>
+				<displayName count="one">कैमेन आइलैंड्स डॉलर</displayName>
+				<displayName count="other">कैमेन आइलैंड्स डॉलर</displayName>
 			</currency>
 			<currency type="KZT">
 				<displayName>कझाकस्तानी टेंग</displayName>
-				<displayName count="other">कझाकस्तानी टेंग्स</displayName>
 			</currency>
 			<currency type="LAK">
 				<displayName>लाओ किप</displayName>
-				<displayName count="other">लाओ किप्स</displayName>
 			</currency>
 			<currency type="LBP">
 				<displayName>लिबानेस पावंड</displayName>
-				<displayName count="other">लिबानेस पावंड्स</displayName>
 			</currency>
 			<currency type="LKR">
 				<displayName>श्री लंका रुपया</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName>लायबेरियन डॉलर</displayName>
-				<displayName count="other">लायबेरियन डॉलर्स</displayName>
 			</currency>
 			<currency type="LSL">
 				<displayName>लिसोथो लोटि</displayName>
-				<displayName count="other">लिसोथो लोटिस</displayName>
 			</currency>
 			<currency type="LYD">
 				<displayName>लीबियान डिनार</displayName>
-				<displayName count="other">लीबियान डिनार्स</displayName>
 			</currency>
 			<currency type="MAD">
 				<displayName>मोरक्कन दिरहम</displayName>
-				<displayName count="other">मोरक्कन दिरहम्स</displayName>
 			</currency>
 			<currency type="MDL">
 				<displayName>मोल्दोवान लियू</displayName>
-				<displayName count="other">मोल्दोवान लेई</displayName>
 			</currency>
 			<currency type="MGA">
 				<displayName>मलागासी एरियारी</displayName>
-				<displayName count="other">मलागासी एरियारीस</displayName>
 			</currency>
 			<currency type="MKD">
 				<displayName>मसीडोनियन् डिनर</displayName>
-				<displayName count="other">मसीडोनियन् डिनारी</displayName>
 			</currency>
 			<currency type="MMK">
 				<displayName>म्यानमार क्यात</displayName>
+				<displayName count="one">म्यानमार क्यात्स</displayName>
 				<displayName count="other">म्यानमार क्यात्स</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>मंगोलियन तुगरिक</displayName>
-				<displayName count="other">मंगोलियन तुगरिक्स</displayName>
 			</currency>
 			<currency type="MOP">
 				<displayName>मकानेसे पटका</displayName>
-				<displayName count="other">मकानेसे पटकास</displayName>
 			</currency>
 			<currency type="MRU">
 				<displayName>मॉरिटानिया उगिया</displayName>
-				<displayName count="other">मॉरिटानिया उगियास</displayName>
 			</currency>
 			<currency type="MUR">
 				<displayName>मॉरिशस रुपी</displayName>
-				<displayName count="other">मॉरिशस रुपया</displayName>
 			</currency>
 			<currency type="MVR">
 				<displayName>मालदिवी रुफिया</displayName>
-				<displayName count="other">मालदिवी रुफियास</displayName>
 			</currency>
 			<currency type="MWK">
 				<displayName>मलावियन क्वाचा</displayName>
-				<displayName count="other">मलावियन क्वाचास</displayName>
 			</currency>
 			<currency type="MXN">
 				<displayName>मेक्सिकन पेसो</displayName>
-				<displayName count="other">मेक्सिकन पेसोस</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName>मलेशियाई रिंग्गित</displayName>
-				<displayName count="other">मलेशियाई रिंग्गित्स</displayName>
 			</currency>
 			<currency type="MZN">
 				<displayName>मोझांबिकन मेटिकल</displayName>
-				<displayName count="other">मोझांबिकन मेटिकल्स</displayName>
 			</currency>
 			<currency type="NAD">
 				<displayName>नामीबिया डॉलर</displayName>
-				<displayName count="other">नामीबिया डॉलर्स</displayName>
 			</currency>
 			<currency type="NGN">
 				<displayName>नायजेरियन नायरा</displayName>
-				<displayName count="other">नायजेरियन नायरास</displayName>
 			</currency>
 			<currency type="NIO">
 				<displayName>निकारागुआन कॉर्डोबा</displayName>
+				<displayName count="one">निकारागुआन कॉर्डोबास</displayName>
 				<displayName count="other">निकारागुआन कॉर्डोबास</displayName>
 			</currency>
 			<currency type="NOK">
 				<displayName>नॉर्वेगन क्रोन</displayName>
-				<displayName count="other">नॉर्वेगन क्रोनर</displayName>
 			</currency>
 			<currency type="NPR">
 				<displayName>नेपाळी रुपया</displayName>
 			</currency>
 			<currency type="NZD">
 				<displayName>न्युझीलॅन्ड डॉलर</displayName>
-				<displayName count="other">न्युझीलॅन्ड डॉलर्स</displayName>
 			</currency>
 			<currency type="OMR">
 				<displayName>ओमानी रियाल</displayName>
-				<displayName count="other">ओमानी रियाल्स</displayName>
 			</currency>
 			<currency type="PAB">
 				<displayName>पानामानियन बाल्बोआ</displayName>
-				<displayName count="other">पानामानियन बाल्बोआस</displayName>
 			</currency>
 			<currency type="PEN">
 				<displayName>पेरिवियन सोल</displayName>
-				<displayName count="other">पेरुवियन सोल्स</displayName>
 			</currency>
 			<currency type="PGK">
 				<displayName>पापुआ न्यु गिनी किना</displayName>
 			</currency>
 			<currency type="PHP">
 				<displayName>फिलिपिनी पेसो</displayName>
-				<displayName count="other">फिलिपिनी पेसोस</displayName>
 				<symbol draft="contributed">PHP</symbol>
 			</currency>
 			<currency type="PKR">
@@ -4429,99 +5588,86 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="PLN">
 				<displayName>पोलिष झ्लोटी</displayName>
-				<displayName count="other">पोलिष झ्लोटी्स</displayName>
 			</currency>
 			<currency type="PYG">
 				<displayName>पराग्वेन गौरानी</displayName>
-				<displayName count="other">पराग्वेन गौरानीस</displayName>
 			</currency>
 			<currency type="QAR">
 				<displayName>कतारी रियाल</displayName>
-				<displayName count="other">कतारी रियाल्स</displayName>
 			</currency>
 			<currency type="RON">
 				<displayName>रोमानियन् लियू</displayName>
-				<displayName count="other">रोमानियन् लेई</displayName>
 				<symbol draft="contributed">रॉन</symbol>
 				<symbol alt="narrow" draft="contributed">लेई</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>सर्बियन डिनार</displayName>
-				<displayName count="other">सर्बियन डिनार्स</displayName>
 			</currency>
 			<currency type="RUB">
 				<displayName>रुसी रुबल</displayName>
+				<displayName count="one">रुसी रुबल्स</displayName>
 				<displayName count="other">रुसी रुबल्स</displayName>
 			</currency>
 			<currency type="RWF">
 				<displayName>रवांडा फ्रँक</displayName>
-				<displayName count="other">रवांडा फ्रँक्स</displayName>
 			</currency>
 			<currency type="SAR">
 				<displayName>सौदी रियाल</displayName>
-				<displayName count="other">सौदी रियाल्स</displayName>
 			</currency>
 			<currency type="SBD">
 				<displayName>सोलोमन आयलँड्स डॉलर</displayName>
-				<displayName count="other">सोलोमन आयलँड डॉलर्स</displayName>
+				<displayName count="one">सोलोमन आयलँड्स डॉलर</displayName>
+				<displayName count="other">सोलोमन आयलँड्स डॉलर</displayName>
 			</currency>
 			<currency type="SCR">
 				<displayName>सेशेल्लोइस रुपी</displayName>
-				<displayName count="other">सेशेल्लोइस रुपया</displayName>
 			</currency>
 			<currency type="SDG">
 				<displayName>सुदानी पावंड</displayName>
-				<displayName count="other">सुदानी पावंड्स</displayName>
 			</currency>
 			<currency type="SEK">
 				<displayName>स्वीदीष क्रोन</displayName>
-				<displayName count="other">स्वीदीष क्रोनोर</displayName>
 			</currency>
 			<currency type="SGD">
 				<displayName>सिंगापूरी डॉलर</displayName>
-				<displayName count="other">सिंगापूरी डॉलर्स</displayName>
+				<displayName count="one">सिंगापूरी डॉलर</displayName>
+				<displayName count="other">सिंगापूरी डॉलर</displayName>
 			</currency>
 			<currency type="SHP">
 				<displayName>सेंट हेलिना पावंड</displayName>
-				<displayName count="other">सेंट हेलिना पावंड्स</displayName>
 			</currency>
 			<currency type="SLE">
 				<displayName>सिएरा लियॉनी लियॉन</displayName>
-				<displayName count="other">सिएरा लियॉनी लियॉन्स</displayName>
 			</currency>
 			<currency type="SLL">
 				<displayName>सिएरा लियॉनी लियॉन (1964—2022)</displayName>
-				<displayName count="other">सिएरा लियॉनी लियॉन्स (1964—2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>सोमाली शिलिंग</displayName>
-				<displayName count="other">सोमाली शिलिंग्स</displayName>
 			</currency>
 			<currency type="SRD">
 				<displayName>सुरीनामी डॉलर</displayName>
-				<displayName count="other">सुरीनामी डॉलर्स</displayName>
 			</currency>
 			<currency type="SSP">
 				<displayName>दक्षिण सुडानी पावंड</displayName>
-				<displayName count="other">दक्षिण सुडानी पावंड्स</displayName>
 			</currency>
 			<currency type="STN">
 				<displayName>साओ टोम आनी प्रिन्सिप डोब्रा</displayName>
-				<displayName count="other">साओ टोम आनी प्रिन्सिप डोब्रास</displayName>
 			</currency>
 			<currency type="SYP">
 				<displayName>सिरियन पावंड</displayName>
-				<displayName count="other">सिरियन पावंड्स</displayName>
+				<displayName count="one">सिरियन पावंड</displayName>
+				<displayName count="other">सिरियन पावंड</displayName>
 			</currency>
 			<currency type="SZL">
 				<displayName>स्वाजी लिलांगेनी</displayName>
-				<displayName count="other">स्वाजी एमालांगेनी</displayName>
 			</currency>
 			<currency type="THB">
 				<displayName>थाई बाट</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>ताजिकिस्तानी सोमोनी</displayName>
+				<displayName count="one">ताजिकिस्तानी सोमोनीस</displayName>
 				<displayName count="other">ताजिकिस्तानी सोमोनीस</displayName>
 			</currency>
 			<currency type="TMT">
@@ -4529,7 +5675,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="TND">
 				<displayName>ट्यूनीशियन डिनार</displayName>
-				<displayName count="other">ट्यूनीशियन डिनार्स</displayName>
 			</currency>
 			<currency type="TOP">
 				<displayName>टोंगन पांगा</displayName>
@@ -4539,84 +5684,89 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="TTD">
 				<displayName>ट्रिनीडाड आनी टोबॅगो डॉलर</displayName>
-				<displayName count="other">ट्रिनीडाड आनी टोबॅगो डॉलर्स</displayName>
 			</currency>
 			<currency type="TWD">
 				<displayName>न्यू तायवान डॉलर</displayName>
-				<displayName count="other">न्यू तायवान डॉलर्स</displayName>
 			</currency>
 			<currency type="TZS">
 				<displayName>तंजानिया शिलिंग</displayName>
-				<displayName count="other">तंजानिया शिलिंग्स</displayName>
 			</currency>
 			<currency type="UAH">
 				<displayName>युक्रेनियन् रिव्निया</displayName>
-				<displayName count="other">युक्रेनियन् रिव्नियास</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName>युगांडा शिलिंग</displayName>
-				<displayName count="other">युगांडा शिलिंग्स</displayName>
 			</currency>
 			<currency type="USD">
 				<displayName>युएस डॉलर</displayName>
+				<displayName count="one">युएस डॉलर्स</displayName>
 				<displayName count="other">युएस डॉलर्स</displayName>
 			</currency>
 			<currency type="UYU">
 				<displayName>उरुग्वेन पेसो</displayName>
-				<displayName count="other">उरुग्वेन पेसोस</displayName>
 			</currency>
 			<currency type="UZS">
 				<displayName>उज़्बेकिस्तानी सोम</displayName>
 			</currency>
 			<currency type="VES">
 				<displayName>विनेझुएला बोलिव्हर</displayName>
-				<displayName count="other">विनेझुएला बोलिव्हर्स</displayName>
+				<displayName count="one">विनेझुएला बोलिव्हर</displayName>
+				<displayName count="other">विनेझुएला बोलिव्हर</displayName>
 			</currency>
 			<currency type="VND">
 				<displayName>वियतनामी डोंग</displayName>
 			</currency>
 			<currency type="VUV">
 				<displayName>वानूआतू वातू</displayName>
-				<displayName count="other">वानूआतू वातूस</displayName>
 			</currency>
 			<currency type="WST">
 				<displayName>समोआई टाला</displayName>
 			</currency>
 			<currency type="XAF">
 				<displayName>मध्य अफ्रीकी सीएफए फ्रँक</displayName>
-				<displayName count="other">मध्य अफ्रीकी सीएफए फ्रँक्स</displayName>
 			</currency>
 			<currency type="XCD">
 				<displayName>उदेंत कॅरिबियन डॉलर</displayName>
-				<displayName count="other">उदेंत कॅरिबियन डॉलर्स</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>कॅरिबियन गिल्डर</displayName>
+				<displayName count="one">कॅरिबियन गिल्डर</displayName>
+				<displayName count="other">कॅरिबियन गिल्डर</displayName>
 			</currency>
 			<currency type="XOF">
 				<displayName>अस्तंत आफ्रिकी सीएफए फ्रँक</displayName>
-				<displayName count="other">अस्तंत आफ्रिकी सीएफए फ्रँक्स</displayName>
 			</currency>
 			<currency type="XPF">
 				<displayName>सीएफपी फ्रँक</displayName>
-				<displayName count="other">सीएफपी फ्रँक्स</displayName>
 			</currency>
 			<currency type="XXX">
 				<displayName>अज्ञात चलन</displayName>
+				<displayName count="one">(अज्ञात चलन)</displayName>
 				<displayName count="other">(अज्ञात चलन)</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>येमेनी रियाल</displayName>
-				<displayName count="other">येमेनी रियाल्स</displayName>
 			</currency>
 			<currency type="ZAR">
 				<displayName>दक्षिण आफ्रिकन रँड</displayName>
 			</currency>
 			<currency type="ZMW">
 				<displayName>झांबियन क्वाचा</displayName>
-				<displayName count="other">झांबियन क्वाचास</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>झिंबाब्वेचें भांगर</displayName>
+				<displayName count="one">झिंबाब्वेचें भांगर</displayName>
+				<displayName count="other">झिंबाब्वेचें भांगर</displayName>
 			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
 		</miscPatterns>
+		<minimalPairs>
+			<pluralMinimalPairs count="one">{0} वांटो</pluralMinimalPairs>
+			<pluralMinimalPairs count="other">{0} वांटे</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">{0}व्या उजव्या वाटेन वच.</ordinalMinimalPairs>
+		</minimalPairs>
 	</numbers>
 	<units>
 		<unitLength type="long">
@@ -4709,23 +5859,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</compoundUnit>
 			<compoundUnit type="power2">
 				<compoundUnitPattern1>चवकोण {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one">चवकोन {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other">चौरस {0}</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="power3">
 				<compoundUnitPattern1>घनाकार {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one">घन {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other">घन {0}</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="times">
 				<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
+				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0} जी-फोर्स</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
 				<displayName>परिभ्रमण</displayName>
+				<unitPattern count="one">{0} rev</unitPattern>
 				<unitPattern count="other">{0} परिभ्रमणां</unitPattern>
 			</unit>
 			<unit type="angle-radian">
+				<unitPattern count="one">{0} रे</unitPattern>
 				<unitPattern count="other">{0} रेडियन</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
@@ -4733,219 +5888,282 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName>आर्कसेकंद</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0} आर्कसेकंद</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName>चौरस किलोमीटर</displayName>
-				<unitPattern count="other">{0} चौरस किलोमीटर</unitPattern>
-				<perUnitPattern>दर चौरस किलोमीटर {0}</perUnitPattern>
+				<displayName>चौकोन किलोमीटर</displayName>
+				<unitPattern count="one">{0} चौकोन किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} चौकोन किलोमीटर</unitPattern>
+				<perUnitPattern>दर चौकोन किलोमीटर {0}</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
+				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0} हॅक्टर</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName>चौरस मीटर</displayName>
-				<unitPattern count="other">{0} चौरस मीटर</unitPattern>
-				<perUnitPattern>दर चौरस मिटर {0}</perUnitPattern>
+				<displayName>चौकोन मीटर</displayName>
+				<unitPattern count="one">{0} चौकोन मीटर</unitPattern>
+				<unitPattern count="other">{0} चौकोन मीटर</unitPattern>
+				<perUnitPattern>दर चौकोन मिटर {0}</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<displayName>चौरस सेंटिमीटर</displayName>
+				<unitPattern count="one">{0} सेमी²</unitPattern>
 				<unitPattern count="other">{0} चौरस सेंटिमीटर</unitPattern>
 				<perUnitPattern>दर चौरस सेंटिमीटर {0}</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>चौरस मायल</displayName>
-				<unitPattern count="other">{0} चौरस मायल</unitPattern>
-				<perUnitPattern>दर चौरस मायल {0}</perUnitPattern>
+				<displayName>चौकोन मील</displayName>
+				<perUnitPattern>दर चौकोन मील {0}</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
 				<unitPattern count="other">{0} एकर</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName>चौरस यार्ड</displayName>
-				<unitPattern count="other">{0} चौरस यार्ड</unitPattern>
+				<displayName>चौकोन यार्ड</displayName>
+				<unitPattern count="one">{0} चौकोन यार्ड</unitPattern>
+				<unitPattern count="other">{0} चौकोन यार्ड</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>चौरस फूट</displayName>
+				<displayName>चौकोन फुट</displayName>
+				<unitPattern count="one">{0} चौकोन फुट</unitPattern>
 				<unitPattern count="other">{0} चौरस फूट</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>चौरस इंच</displayName>
-				<unitPattern count="other">{0} चौरस इंच</unitPattern>
-				<perUnitPattern>दर चौरस इंच {0}</perUnitPattern>
+				<displayName>चौकोन इंच</displayName>
+				<unitPattern count="one">{0} चौकोन इंच</unitPattern>
+				<unitPattern count="other">{0} चौकोन इंच</unitPattern>
+				<perUnitPattern>दर चौकोन इंच {0}</perUnitPattern>
 			</unit>
 			<unit type="area-dunam">
+				<unitPattern count="one">{0} डुनाम</unitPattern>
 				<unitPattern count="other">{0} डुनाम्स</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
+				<unitPattern count="one">{0} kt</unitPattern>
 				<unitPattern count="other">{0} कॅरट्स</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<displayName>मिलिग्राम/डेसिलिटर</displayName>
+				<unitPattern count="one">{0} mg/dL</unitPattern>
 				<unitPattern count="other">{0} मिलिग्राम/डेसिलिटर</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<displayName>मिलिमोल्स/लि</displayName>
+				<unitPattern count="one">{0} mmol/L</unitPattern>
 				<unitPattern count="other">{0} मिलिमोल्स/लि</unitPattern>
 			</unit>
 			<unit type="concentr-item">
+				<unitPattern count="one">{0} वस्त</unitPattern>
 				<unitPattern count="other">{0} वस्ती</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>पार्ट पर मिलियन</displayName>
+				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="other">{0} पार्ट पर मिलियन</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>टक्को</displayName>
+				<unitPattern count="one">{0}%</unitPattern>
 				<unitPattern count="other">{0} टक्को</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
+				<unitPattern count="one">{0}‰</unitPattern>
 				<unitPattern count="other">{0} दरमायल</unitPattern>
 			</unit>
 			<unit type="concentr-permyriad">
+				<unitPattern count="one">{0}‱</unitPattern>
 				<unitPattern count="other">{0} परमिरियड</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>मोल्स</displayName>
+				<unitPattern count="one">{0} मोल</unitPattern>
 				<unitPattern count="other">{0} मोल्स</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लिटर/किलोमीटर</displayName>
+				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0} लिटर/किलोमीटर</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>लिटर/100किलोमीटर</displayName>
+				<unitPattern count="one">{0} लि/100किमी</unitPattern>
 				<unitPattern count="other">{0} लिटर/100किलोमीटर</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>मैल दर गॅलोन</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} मैल दर गॅलोन</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>मैल दर इंपिरियल गॅलोन</displayName>
+				<unitPattern count="one">{0} mpg Imp.</unitPattern>
 				<unitPattern count="other">{0} मैल दर इंपिरियल गॅलोन</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
 				<displayName>पेटाबायट</displayName>
+				<unitPattern count="one">{0} PB</unitPattern>
 				<unitPattern count="other">{0} पेटाबायट</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
+				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0} टेराबायट</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>टेराबिट्स</displayName>
+				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0} टेराबिट्स</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
+				<unitPattern count="one">{0} GB</unitPattern>
 				<unitPattern count="other">{0} गिगाबायट</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
 				<displayName>गिगाबिट</displayName>
+				<unitPattern count="one">{0} Gb</unitPattern>
 				<unitPattern count="other">{0} गिगाबिट</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
 				<displayName>मॅगाबायट</displayName>
+				<unitPattern count="one">{0} MB</unitPattern>
 				<unitPattern count="other">{0} मॅगाबायट</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
 				<displayName>मॅगाबिट</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
 				<unitPattern count="other">{0} मॅगाबिट</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
+				<unitPattern count="one">{0} kB</unitPattern>
 				<unitPattern count="other">{0} किलोबायट</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
 				<displayName>किलोबिट</displayName>
+				<unitPattern count="one">{0} kb</unitPattern>
 				<unitPattern count="other">{0} किलोबिट</unitPattern>
 			</unit>
 			<unit type="duration-century">
-				<displayName>शतकां</displayName>
-				<unitPattern count="other">{0} शतकां</unitPattern>
+				<displayName>शेंकडे</displayName>
+				<unitPattern count="one">{0} शेंकडो</unitPattern>
+				<unitPattern count="other">{0} शेंकडे</unitPattern>
 			</unit>
 			<unit type="duration-decade">
 				<displayName>दशकां</displayName>
+				<unitPattern count="one">{0} दशक</unitPattern>
 				<unitPattern count="other">{0} दशकां</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<perUnitPattern>दर वर्सा {0}</perUnitPattern>
+				<unitPattern count="one">{0} वर्स</unitPattern>
+				<unitPattern count="other">{0} वर्सां</unitPattern>
+				<perUnitPattern>दर वर्स {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName>क्वार्टर्स</displayName>
+				<displayName>तिम्हयनाळे</displayName>
+				<unitPattern count="one">{0} तिम्हयनाळें</unitPattern>
+				<unitPattern count="other">{0} तिम्हयनाळे</unitPattern>
+				<perUnitPattern>{0}/तिम्हयनाळें</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
+				<unitPattern count="one">{0} म्हयनो</unitPattern>
+				<unitPattern count="other">{0} म्ह</unitPattern>
 				<perUnitPattern>दर म्हयनो {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
+				<displayName>सप्तकां</displayName>
+				<unitPattern count="one">{0} सप्तक</unitPattern>
+				<unitPattern count="other">{0} सप्तकां</unitPattern>
 				<perUnitPattern>दर सप्तकाक {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<perUnitPattern>दर दिसा {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
+				<unitPattern count="one">{0} वर</unitPattern>
 				<unitPattern count="other">{0} वरां</unitPattern>
 				<perUnitPattern>दर वरा {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
+				<displayName>मिणटां</displayName>
+				<unitPattern count="one">{0} मिन</unitPattern>
 				<unitPattern count="other">{0} मिण्टां</unitPattern>
-				<perUnitPattern>दर मिनीट {0}</perUnitPattern>
+				<perUnitPattern>दर मिनूट {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName>सेकंद</displayName>
+				<displayName>सॅकंड</displayName>
+				<unitPattern count="one">{0} सॅकंड</unitPattern>
 				<unitPattern count="other">{0} सेकंदांनी</unitPattern>
 				<perUnitPattern>दर सेकंद {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
+				<displayName>मिलीसॅकंड</displayName>
+				<unitPattern count="one">{0} मिलीसॅकंड</unitPattern>
 				<unitPattern count="other">{0} मिलिसेकंदांनी</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>मायक्रोसेकंदांनी</displayName>
+				<unitPattern count="one">{0} मायक्रोसॅकंड</unitPattern>
 				<unitPattern count="other">{0} मायक्रोसेकंदांनी</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
-				<unitPattern count="other">{0} नॅनोसेकंदांनी</unitPattern>
+				<displayName>नॅनोसॅकंड</displayName>
+				<unitPattern count="one">{0} नॅसॅक</unitPattern>
+				<unitPattern count="other">{0} नॅनोसॅकंड</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>एम्पियर</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
 				<unitPattern count="other">{0} एम्पियर</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName>मिलिएम्पियर</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
 				<unitPattern count="other">{0} मिलिएम्पियर</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
+				<unitPattern count="one">{0} Ω</unitPattern>
 				<unitPattern count="other">{0} ओम</unitPattern>
 			</unit>
 			<unit type="electric-volt">
+				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0} वो</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName>किलोकॅलरीज</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} किलोकॅलरीज</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName>कॅलरीज</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} कॅलरीज</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>कॅलरीज</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} कॅलरीज</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
+				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} किलोज्युल</unitPattern>
 			</unit>
 			<unit type="energy-joule">
+				<unitPattern count="one">{0} J</unitPattern>
 				<unitPattern count="other">{0} ज्युल</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>किलोवॅट-वरां</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
 				<unitPattern count="other">{0} किलोवॅट-वरां</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName>इलॅक्ट्रॉनवॉल्ट्स</displayName>
+				<unitPattern count="one">{0} eV</unitPattern>
 				<unitPattern count="other">{0} इलॅक्ट्रॉनवॉल्ट्स</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
 				<displayName>ब्रिटिश थर्मल युनिट्स</displayName>
+				<unitPattern count="one">{0} ब्रिटीश थर्मल युनीट</unitPattern>
 				<unitPattern count="other">{0} ब्रिटिश थर्मल युनिट्स</unitPattern>
 			</unit>
 			<unit type="energy-therm-us">
@@ -4953,172 +6171,221 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="force-pound-force">
 				<displayName>पावंड ऑफ फोर्स</displayName>
+				<unitPattern count="one">{0} lbf</unitPattern>
 				<unitPattern count="other">{0} पावंड ऑफ फोर्स</unitPattern>
 			</unit>
 			<unit type="force-newton">
+				<unitPattern count="one">{0} न्यु</unitPattern>
 				<unitPattern count="other">{0} न्युटन</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>किलोवॉट-वर/१००किलोमीटर</displayName>
+				<unitPattern count="one">{0} किवॉवर/१००किमी</unitPattern>
 				<unitPattern count="other">{0} किलोवॉट-वर/१००किलोमीटर</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<displayName>गिगाहर्ट्झ</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0} गिगाहर्ट्झ</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
 				<displayName>मॅगाहर्ट्झ</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
 				<unitPattern count="other">{0} मॅगाहर्ट्झ</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
 				<displayName>किलोहर्ट्झ</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0} किलोहर्ट्झ</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
 				<displayName>हर्ट्झ</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
 				<unitPattern count="other">{0} हर्ट्झ</unitPattern>
 			</unit>
 			<unit type="graphics-em">
 				<displayName>टायपोग्रॅफिक एम</displayName>
+				<unitPattern count="one">{0} em</unitPattern>
 				<unitPattern count="other">{0} ems</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
+				<displayName>चित्र-तत्वां</displayName>
+				<unitPattern count="one">{0} px</unitPattern>
 				<unitPattern count="other">{0} पिक्सेल्स</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
+				<displayName>मॅगा-चित्र-तत्वां</displayName>
+				<unitPattern count="one">{0} MP</unitPattern>
 				<unitPattern count="other">{0} मॅगोपिक्सेल्स</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
 				<displayName>दर सेंटिमीटराक पिक्सेल</displayName>
-				<unitPattern count="other">दर सेंटिमीटराक पिक्सेल {0}</unitPattern>
+				<unitPattern count="one">{0} ppcm</unitPattern>
+				<unitPattern count="other">दर सेंटिमीटराक चित्र-तत्वां {0}</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
 				<displayName>दर इंचाक पिक्सेल्स</displayName>
+				<unitPattern count="one">{0} ppi</unitPattern>
 				<unitPattern count="other">दर इंचाक पिक्सेल {0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>दर सेंटिमीटर ठिपके</displayName>
+				<unitPattern count="one">{0} ppcm</unitPattern>
 				<unitPattern count="other">दर सेंटिमीटर ठिपके {0}</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
 				<displayName>दर इंचाक ठिपके</displayName>
+				<unitPattern count="one">{0} ppi</unitPattern>
 				<unitPattern count="other">दर इंचाक ठिपके {0}</unitPattern>
 			</unit>
+			<unit type="graphics-dot">
+				<displayName>चित्र-तत्वां</displayName>
+			</unit>
 			<unit type="length-earth-radius">
 				<displayName>पृथ्वी त्रिज्या</displayName>
+				<unitPattern count="one">{0} R⊕</unitPattern>
 				<unitPattern count="other">{0} पृथ्वी त्रिज्या</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>किलोमीटर</displayName>
+				<unitPattern count="one">{0} किमी</unitPattern>
 				<unitPattern count="other">{0} किलोमीटर</unitPattern>
 				<perUnitPattern>दर किलोमीटर {0}</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>मीटर</displayName>
+				<unitPattern count="one">{0} मी</unitPattern>
 				<unitPattern count="other">{0} मीटर</unitPattern>
 				<perUnitPattern>दर मिटर {0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डेसीमीटर</displayName>
+				<unitPattern count="one">{0} डेमी</unitPattern>
 				<unitPattern count="other">{0} डेसीमीटर</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>सेंटिमीटर</displayName>
+				<unitPattern count="one">{0} सेमी</unitPattern>
 				<unitPattern count="other">{0} सेंटिमीटर</unitPattern>
 				<perUnitPattern>दर सेंटिमीटर {0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिलिमीटर</displayName>
+				<unitPattern count="one">{0} मिमी</unitPattern>
 				<unitPattern count="other">{0} मिलिमिटर</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>मायक्रोमीटर</displayName>
+				<unitPattern count="one">{0} μm</unitPattern>
 				<unitPattern count="other">{0} मायक्रोमीटर</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
 				<displayName>नॅनोमीटर</displayName>
+				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0} नॅनोमीटर</unitPattern>
 			</unit>
 			<unit type="length-picometer">
 				<displayName>पिकोमीटर</displayName>
+				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0} पिकोमिटर</unitPattern>
 			</unit>
 			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
 				<unitPattern count="other">{0} मायल्स</unitPattern>
 			</unit>
 			<unit type="length-yard">
+				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0} यार्ड</unitPattern>
 			</unit>
 			<unit type="length-foot">
 				<perUnitPattern>दर फूट {0}</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
 				<unitPattern count="other">{0} इंच</unitPattern>
 				<perUnitPattern>दर इंच {0}</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>पासेक्स</displayName>
+				<unitPattern count="one">{0} pc</unitPattern>
 				<unitPattern count="other">{0} पासेक्स</unitPattern>
 			</unit>
 			<unit type="length-light-year">
+				<unitPattern count="one">{0} ly</unitPattern>
 				<unitPattern count="other">{0} प्रकाश वर्सां</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName>खगोलशास्त्रीय प्रमाण</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
 				<unitPattern count="other">{0} खगोलशास्त्रीय प्रमाण</unitPattern>
 			</unit>
 			<unit type="length-furlong">
+				<unitPattern count="one">{0} फर्लोंग</unitPattern>
 				<unitPattern count="other">{0} फर्लांग</unitPattern>
 			</unit>
 			<unit type="length-fathom">
+				<unitPattern count="one">{0} fth</unitPattern>
 				<unitPattern count="other">{0} फॅदम</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>नॉटिकल मायल्स</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
 				<unitPattern count="other">{0} नॉटिकल्स मायल्स</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
 				<displayName>मायल-स्कँडिनेव्हियन</displayName>
+				<unitPattern count="one">{0} smi</unitPattern>
 				<unitPattern count="other">{0} मायल्स-स्कँडिनेव्हियन</unitPattern>
 			</unit>
 			<unit type="length-point">
+				<unitPattern count="one">{0} pt</unitPattern>
 				<unitPattern count="other">{0} पॉयंट्स</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
+				<unitPattern count="one">{0} R☉</unitPattern>
 				<unitPattern count="other">{0} सौर त्रिज्या</unitPattern>
 			</unit>
 			<unit type="light-lux">
+				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0} लक्स</unitPattern>
 			</unit>
 			<unit type="light-candela">
 				<displayName>कॅन्डेला</displayName>
+				<unitPattern count="one">{0} cd</unitPattern>
 				<unitPattern count="other">{0} कॅन्डेला</unitPattern>
 			</unit>
 			<unit type="light-lumen">
 				<displayName>ल्युमन</displayName>
+				<unitPattern count="one">{0} lm</unitPattern>
 				<unitPattern count="other">{0} ल्युमन</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
+				<unitPattern count="one">{0} L☉</unitPattern>
 				<unitPattern count="other">{0} सौर ल्युमिनोसायटिस</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
 				<displayName>मॅट्रिक टन</displayName>
+				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0} मॅट्रिक टन</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>किलोग्राम</displayName>
+				<unitPattern count="one">{0} किग्रा</unitPattern>
 				<unitPattern count="other">{0} किलोग्राम</unitPattern>
 				<perUnitPattern>{0}/किलोग्राम</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिलिग्राम</displayName>
+				<unitPattern count="one">{0} मिग्रा</unitPattern>
 				<unitPattern count="other">{0} मिलिग्राम</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
 				<displayName>मायक्रोग्राम</displayName>
+				<unitPattern count="one">{0} μg</unitPattern>
 				<unitPattern count="other">{0} मायक्रोग्राम</unitPattern>
 			</unit>
 			<unit type="mass-pound">
+				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} पौंड</unitPattern>
 				<perUnitPattern>{0} दर पौंड</perUnitPattern>
 			</unit>
@@ -5127,237 +6394,300 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName>ट्रॉय औंस</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
 				<unitPattern count="other">{0} ट्रॉय औंस</unitPattern>
 			</unit>
 			<unit type="mass-carat">
+				<unitPattern count="one">{0} कॅ</unitPattern>
 				<unitPattern count="other">{0} कॅरट</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
+				<unitPattern count="one">{0} Da</unitPattern>
 				<unitPattern count="other">{0} डाल्टन</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
+				<unitPattern count="one">{0} M⊕</unitPattern>
 				<unitPattern count="other">{0} पृथ्वी वस्तुमान</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
+				<unitPattern count="one">{0} M☉</unitPattern>
 				<unitPattern count="other">{0} सौर वस्तुमान</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
 				<displayName>गिगावॉट्स</displayName>
+				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0} गिगावॉट्स</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
 				<displayName>मेगावॅट</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0} मेगावॅट</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<displayName>किलोवॅट</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0} किलोवॅट</unitPattern>
 			</unit>
 			<unit type="power-watt">
+				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0} वॅट</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>मिलिवॅट</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0} मिलिवॅट</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<displayName>हॉर्सपावर</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
 				<unitPattern count="other">{0} हॉर्सपावर</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>मिलिमीटर ऑफ मर्क्युरी</displayName>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
 				<unitPattern count="other">{0} मिलिमीटर ऑफ मर्क्युरी</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName>पावंड दर चौरस इंच</displayName>
-				<unitPattern count="other">{0} पावंड दर चौरस इंच</unitPattern>
+				<displayName>पावंड दर चौकोन इंच</displayName>
+				<unitPattern count="one">{0} psi</unitPattern>
+				<unitPattern count="other">{0} पावंड दर चौकोन इंच</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>इंचेस ऑफ मर्क्युरी</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
 				<unitPattern count="other">{0} इंचेस ऑफ मर्क्युरी</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
+				<unitPattern count="one">{0} पट्टी</unitPattern>
 				<unitPattern count="other">{0} पट्ट्यो</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>मिलिबार</displayName>
+				<unitPattern count="one">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} मिलिबार</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
 				<displayName>अटमोसपियर</displayName>
+				<unitPattern count="one">{0} atm</unitPattern>
 				<unitPattern count="other">{0} अटमोसपियर</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
 				<displayName>पास्कल</displayName>
+				<unitPattern count="one">{0} Pa</unitPattern>
 				<unitPattern count="other">{0} पास्कल</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<displayName>हेक्टोपास्कल</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0} हेक्टोपास्कल</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
 				<displayName>किलोपास्कल</displayName>
+				<unitPattern count="one">{0} kPa</unitPattern>
 				<unitPattern count="other">{0} किलोपास्कल</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
 				<displayName>मेगापास्कल</displayName>
+				<unitPattern count="one">{0} MPa</unitPattern>
 				<unitPattern count="other">{0} किलोपास्कल्स</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>मीटर प्रती सेकंद</displayName>
 			</unit>
 			<unit type="speed-knot">
+				<unitPattern count="one">{0} kn</unitPattern>
 				<unitPattern count="other">{0} नॉट</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
 				<displayName>अंश तापमान</displayName>
+				<unitPattern count="one">{0} अंश तापमान</unitPattern>
 				<unitPattern count="other">{0} अंश तापमान</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>अंश सेल्सियस</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0} अंश सेल्सियस</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
+				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0} अंश फारेनहायट</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<displayName>केल्वीन</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0} केल्वीन</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
+				<unitPattern count="one">{0} lbf⋅ft</unitPattern>
 				<unitPattern count="other">{0} पावंड-फूट</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
 				<displayName>न्युटन-मीटर</displayName>
+				<unitPattern count="one">{0} N⋅m</unitPattern>
 				<unitPattern count="other">{0} न्युटन-मीटर</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
-				<displayName>क्युबीक किलोमीटर</displayName>
-				<unitPattern count="other">{0} क्युबीक किलोमीटर</unitPattern>
+				<displayName>घन किलोमीटर</displayName>
+				<unitPattern count="one">{0} घन किलोमीटर</unitPattern>
+				<unitPattern count="other">{0} घन किलोमीटर</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName>क्युबीक मीटर</displayName>
-				<unitPattern count="other">{0} क्युबीक मीटर</unitPattern>
+				<unitPattern count="one">{0} घन मीटर</unitPattern>
+				<unitPattern count="other">{0} घन मीटर</unitPattern>
+				<perUnitPattern>{0} दर घन मीटर</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<displayName>क्युबीक सेंटीमीटर</displayName>
-				<unitPattern count="other">{0} क्युबीक सेंटीमीटर</unitPattern>
-				<perUnitPattern>{0} दर क्युबीक सेंटीमीटर</perUnitPattern>
+				<displayName>घन सेंटीमीटर</displayName>
+				<unitPattern count="one">{0} घन सेंटीमीटर</unitPattern>
+				<unitPattern count="other">{0} घन सेंटीमीटर</unitPattern>
+				<perUnitPattern>{0} दर घन सेंटिमीटर</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName>क्युबीक मील</displayName>
-				<unitPattern count="other">{0} क्युबीक मील</unitPattern>
+				<displayName>घन मील</displayName>
+				<unitPattern count="one">{0} घन मील</unitPattern>
+				<unitPattern count="other">{0} घन मील</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
-				<displayName>क्युबीक यार्ड</displayName>
-				<unitPattern count="other">{0} क्युबीक यार्ड</unitPattern>
+				<displayName>घन यार्ड</displayName>
+				<unitPattern count="one">{0} घन यार्ड</unitPattern>
+				<unitPattern count="other">{0} घन यार्ड</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
-				<displayName>क्युबीक फूट</displayName>
-				<unitPattern count="other">{0} क्युबीक फूट</unitPattern>
+				<displayName>घन फुट</displayName>
+				<unitPattern count="one">{0} घन फुट</unitPattern>
+				<unitPattern count="other">{0} घन फुट</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
-				<displayName>क्युबीक इंच</displayName>
-				<unitPattern count="other">{0} क्युबीक इंच</unitPattern>
+				<displayName>घन इंच</displayName>
+				<unitPattern count="one">{0} घन इंच</unitPattern>
+				<unitPattern count="other">{0} घन इंच</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
 				<displayName>मॅगालिटर</displayName>
+				<unitPattern count="one">{0} ML</unitPattern>
 				<unitPattern count="other">{0} मॅगालिटर</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>हॅक्टोलीटर</displayName>
 			</unit>
 			<unit type="volume-liter">
+				<unitPattern count="one">{0} लि</unitPattern>
 				<unitPattern count="other">{0} लिटर</unitPattern>
 				<perUnitPattern>{0}/लिटर</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<displayName>डेसिलीटर</displayName>
+				<unitPattern count="one">{0} dL</unitPattern>
 				<unitPattern count="other">{0} डेसिलीटर</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
 				<displayName>सेंटिलीटर</displayName>
+				<unitPattern count="one">{0} cL</unitPattern>
 				<unitPattern count="other">{0} सेंटिलीटर</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मिलिलिटर</displayName>
+				<unitPattern count="one">{0} मिलि</unitPattern>
 				<unitPattern count="other">{0} मिलिलिटर</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
 				<displayName>मॅट्रिक पाइंट</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
 				<unitPattern count="other">{0} मॅट्रिक पाइंट</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
 				<displayName>मॅट्रिक कप</displayName>
+				<unitPattern count="one">{0} mc</unitPattern>
 				<unitPattern count="other">{0} मॅट्रिक कप</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>एकर-फूट</displayName>
+				<unitPattern count="one">{0} ac ft</unitPattern>
 				<unitPattern count="other">{0} एकर-फूट</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
+				<unitPattern count="one">{0} बुशेल</unitPattern>
 				<unitPattern count="other">{0} बुशेल्स</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
 				<displayName>गॅलोन</displayName>
+				<unitPattern count="one">{0} गॅ</unitPattern>
 				<unitPattern count="other">{0} गॅलोन</unitPattern>
 				<perUnitPattern>दर गॅलोन {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>इंपिरियल गॅलोन</displayName>
+				<unitPattern count="one">{0} गॅल इंप.</unitPattern>
 				<unitPattern count="other">{0} इंप. गॅलोन</unitPattern>
 				<perUnitPattern>{0} दर इंप. गॅलोन</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वार्त</displayName>
+				<unitPattern count="one">{0} क्वा</unitPattern>
 				<unitPattern count="other">{0} क्वार्त</unitPattern>
 			</unit>
 			<unit type="volume-pint">
+				<unitPattern count="one">{0} pt</unitPattern>
 				<unitPattern count="other">{0} पाइंट</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>फ्लुइड औंस</displayName>
+				<unitPattern count="one">{0} fl oz US</unitPattern>
 				<unitPattern count="other">{0} फ्लुइड औंस</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>इंपिरियल फ्लुइड औंस</displayName>
+				<unitPattern count="one">{0} fl oz Imp.</unitPattern>
 				<unitPattern count="other">{0} इंप. फ्लुइड औंस</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>व्हडलें कुलेर</displayName>
+				<unitPattern count="one">{0} tbsp</unitPattern>
 				<unitPattern count="other">{0} व्हडलें कुलेर</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>कुलेर</displayName>
+				<unitPattern count="one">{0} कु</unitPattern>
 				<unitPattern count="other">{0} कुलेर</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
 				<displayName>डिझर्ट कुलेर</displayName>
+				<unitPattern count="one">{0} dstspn</unitPattern>
 				<unitPattern count="other">{0} डिझर्ट कुलेर</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>इंपिरियल डिझर्ट कुलेर</displayName>
+				<unitPattern count="one">{0} dstspn Imp</unitPattern>
 				<unitPattern count="other">{0} इंप. डिझर्ट कुलेर</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>ड्रॅम</displayName>
+				<unitPattern count="one">{0} ड्रॅम फ्लु</unitPattern>
 				<unitPattern count="other">{0} ड्रॅम</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>इंपिरियल क्वार्त</displayName>
+				<unitPattern count="one">{0} qt Imp.</unitPattern>
 				<unitPattern count="other">{0} इंप. क्वार्त</unitPattern>
 			</unit>
+			<unit type="duration-fortnight">
+				<displayName>पंद्रस</displayName>
+				<unitPattern count="one">{0} पंद्रस</unitPattern>
+				<unitPattern count="other">{0} पंद्रस</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>प्रकाश</displayName>
+				<unitPattern count="one">{0} प्रकाश</unitPattern>
 				<unitPattern count="other">{0} प्रकाश</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>राती</displayName>
+				<unitPattern count="one">{0} रात</unitPattern>
 				<unitPattern count="other">{0} राती</unitPattern>
 				<perUnitPattern>दर रात {0}</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName>मुख्य दिका</displayName>
+				<displayName>मुखेळ दिशा</displayName>
 				<coordinateUnitPattern type="east">{0} उदेंत</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} उत्तर</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0} दक्षिण</coordinateUnitPattern>
@@ -5382,18 +6712,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
 				<displayName>मी/से²</displayName>
+				<unitPattern count="one">{0} मी/से²</unitPattern>
 				<unitPattern count="other">{0} मी/से²</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>रेडियन</displayName>
+				<unitPattern count="one">{0} रे</unitPattern>
 				<unitPattern count="other">{0} रे</unitPattern>
 			</unit>
 			<unit type="angle-degree">
 				<displayName>अंश</displayName>
+				<unitPattern count="one">{0} अंश</unitPattern>
 				<unitPattern count="other">{0} अंश</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>आमि</displayName>
+				<unitPattern count="one">{0} आर्कमिनीट</unitPattern>
 				<unitPattern count="other">{0} आर्कमिनीट</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
@@ -5401,6 +6735,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>किमी²</displayName>
+				<unitPattern count="one">{0} किमी²</unitPattern>
 				<unitPattern count="other">{0} किमी²</unitPattern>
 				<perUnitPattern>{0}/किमी²</perUnitPattern>
 			</unit>
@@ -5409,16 +6744,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="area-square-meter">
 				<displayName>मीटर²</displayName>
+				<unitPattern count="one">{0} मी²</unitPattern>
 				<unitPattern count="other">{0} मी²</unitPattern>
 				<perUnitPattern>{0}/मी²</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>सेमी²</displayName>
+				<unitPattern count="one">{0} सेमी²</unitPattern>
 				<unitPattern count="other">{0} सेमी²</unitPattern>
 				<perUnitPattern>{0}/सेमी²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>चौ मायल</displayName>
+				<unitPattern count="one">{0} चौ मा</unitPattern>
 				<unitPattern count="other">{0} चौ मा</unitPattern>
 			</unit>
 			<unit type="area-acre">
@@ -5429,10 +6767,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="area-square-foot">
 				<displayName>चौ फूट</displayName>
+				<unitPattern count="one">{0} चौ फू</unitPattern>
 				<unitPattern count="other">{0} चौ फू</unitPattern>
 			</unit>
 			<unit type="area-dunam">
 				<displayName>डुनाम्स</displayName>
+				<unitPattern count="one">{0} डुनाम</unitPattern>
 				<unitPattern count="other">{0} डुनाम</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
@@ -5446,9 +6786,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="concentr-item">
 				<displayName>वस्त</displayName>
+				<unitPattern count="one">{0} वस्त</unitPattern>
 				<unitPattern count="other">{0} वस्त</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>पार्ट/मिलियन</displayName>
 			</unit>
 			<unit type="concentr-permille">
@@ -5459,6 +6800,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>मोल</displayName>
+				<unitPattern count="one">{0} मोल</unitPattern>
 				<unitPattern count="other">{0} मोल</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
@@ -5466,10 +6808,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>लि/100किमी</displayName>
+				<unitPattern count="one">{0} लि/100किमी</unitPattern>
 				<unitPattern count="other">{0} लि/100किमी</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>मैल/गॅ</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
@@ -5486,65 +6830,86 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="digital-byte">
 				<displayName>बायट</displayName>
+				<unitPattern count="one">{0} बायट</unitPattern>
 				<unitPattern count="other">{0} बायट</unitPattern>
 			</unit>
 			<unit type="digital-bit">
 				<displayName>बिट</displayName>
+				<unitPattern count="one">{0} बिट</unitPattern>
 				<unitPattern count="other">{0} बिट</unitPattern>
 			</unit>
 			<unit type="duration-century">
 				<displayName>श</displayName>
+				<unitPattern count="one">{0} श</unitPattern>
 				<unitPattern count="other">{0} श</unitPattern>
 			</unit>
 			<unit type="duration-decade">
 				<displayName>दशक</displayName>
+				<unitPattern count="one">{0} दशक</unitPattern>
 				<unitPattern count="other">{0} दशक</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>वर्सां</displayName>
+				<unitPattern count="one">{0} वर्स</unitPattern>
 				<unitPattern count="other">{0} वर्सां</unitPattern>
-				<perUnitPattern>{0}/वर्सां</perUnitPattern>
+				<perUnitPattern>{0}/वर्स</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>तिम्ह</displayName>
+				<unitPattern count="one">{0} तिम्ह</unitPattern>
+				<unitPattern count="other">{0} तिम्ह</unitPattern>
+				<perUnitPattern>{0}/तिम्ह</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName>म्हयने</displayName>
-				<unitPattern count="other">{0} म्हयने</unitPattern>
+				<displayName>म्ह</displayName>
+				<unitPattern count="one">{0} म्ह</unitPattern>
+				<unitPattern count="other">{0} म्ह</unitPattern>
 				<perUnitPattern>{0}/म्ह</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName>सप्तक</displayName>
+				<displayName>सप्तकां</displayName>
+				<unitPattern count="one">{0} सप्तक</unitPattern>
 				<unitPattern count="other">{0} सप्तक</unitPattern>
-				<perUnitPattern>{0}/स</perUnitPattern>
+				<perUnitPattern>{0}/सप्तक</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>दीस</displayName>
+				<unitPattern count="one">{0} दीस</unitPattern>
 				<unitPattern count="other">{0} दीस</unitPattern>
-				<perUnitPattern>{0}/दी</perUnitPattern>
+				<perUnitPattern>{0}/दीस</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>वरां</displayName>
+				<unitPattern count="one">{0} वर</unitPattern>
 				<unitPattern count="other">{0} वर</unitPattern>
 				<perUnitPattern>{0}/वर</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName>मिण्टां</displayName>
+				<displayName>मिण.</displayName>
+				<unitPattern count="one">{0} मिन</unitPattern>
 				<unitPattern count="other">{0} मिनीट</unitPattern>
 				<perUnitPattern>{0}/मिनीट</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंदांनी</displayName>
-				<unitPattern count="other">{0} सेकंद</unitPattern>
+				<unitPattern count="one">{0} सॅक</unitPattern>
+				<unitPattern count="other">{0} सॅक</unitPattern>
 				<perUnitPattern>{0}/से</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>मिलिसेकंदांनी</displayName>
+				<unitPattern count="one">{0} मिसॅक</unitPattern>
 				<unitPattern count="other">{0} मिलिसेकंद</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<displayName>μsecs</displayName>
+				<displayName>मायसॅक</displayName>
+				<unitPattern count="one">{0} मायसॅक</unitPattern>
+				<unitPattern count="other">{0} मायसॅक</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>नॅनोसेकंदांनी</displayName>
-				<unitPattern count="other">{0} नॅसे</unitPattern>
+				<unitPattern count="one">{0} नॅसॅक</unitPattern>
+				<unitPattern count="other">{0} नॅसॅक</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>एम्प्स</displayName>
@@ -5560,6 +6925,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>Cal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0} Cal</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
@@ -5579,6 +6945,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-therm-us">
 				<displayName>युएस थर्म</displayName>
+				<unitPattern count="one">{0} युएस थर्म्स</unitPattern>
 				<unitPattern count="other">{0} युएस थर्म्स</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
@@ -5586,51 +6953,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="force-newton">
 				<displayName>न्युटन</displayName>
+				<unitPattern count="one">{0} न्यु</unitPattern>
 				<unitPattern count="other">{0} न्यु</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>किवॉवर/१००किमी</displayName>
+				<unitPattern count="one">{0} किवॉवर/१००किमी</unitPattern>
 				<unitPattern count="other">{0} किवॉवर/१००किमी</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
 				<displayName>पिक्सेल्स</displayName>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName>मॅगोपिक्सेल्स</displayName>
+				<displayName>मॅगा-चित्र-तत्वां</displayName>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>dpcm</displayName>
+				<unitPattern count="one">{0} ppcm</unitPattern>
 				<unitPattern count="other">{0} dpcm</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
 				<displayName>dpi</displayName>
+				<unitPattern count="one">{0} ppi</unitPattern>
 				<unitPattern count="other">{0} dpi</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>ठिपके</displayName>
+				<unitPattern count="one">{0} px</unitPattern>
 				<unitPattern count="other">{0} ठिपके</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
 				<displayName>किमी</displayName>
+				<unitPattern count="one">{0} किमी</unitPattern>
 				<unitPattern count="other">{0} किमी</unitPattern>
 				<perUnitPattern>{0}/किमी</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<displayName>मी</displayName>
+				<unitPattern count="one">{0} मी</unitPattern>
 				<unitPattern count="other">{0} मी</unitPattern>
 				<perUnitPattern>{0}/मी</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डेमी</displayName>
+				<unitPattern count="one">{0} डेमी</unitPattern>
 				<unitPattern count="other">{0} डेमी</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>सेमी</displayName>
+				<unitPattern count="one">{0} सेमी</unitPattern>
 				<unitPattern count="other">{0} सेमी</unitPattern>
 				<perUnitPattern>{0}/सेमी</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मिमी</displayName>
+				<unitPattern count="one">{0} मिमी</unitPattern>
 				<unitPattern count="other">{0} मिमी</unitPattern>
 			</unit>
 			<unit type="length-mile">
@@ -5641,6 +7018,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="length-foot">
 				<displayName>फूट</displayName>
+				<unitPattern count="one">{0} फूट</unitPattern>
 				<unitPattern count="other">{0} फूट</unitPattern>
 			</unit>
 			<unit type="length-inch">
@@ -5672,24 +7050,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>किग्रा</displayName>
+				<unitPattern count="one">{0} किग्रा</unitPattern>
 				<unitPattern count="other">{0} किग्रा</unitPattern>
 				<perUnitPattern>{0}/किग्रा</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>ग्राम</displayName>
+				<unitPattern count="one">{0} ग्राम</unitPattern>
 				<unitPattern count="other">{0} ग्राम</unitPattern>
 				<perUnitPattern>{0}/ग्रा</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
 				<displayName>मिग्रा</displayName>
+				<unitPattern count="one">{0} मिग्रा</unitPattern>
 				<unitPattern count="other">{0} मिग्रा</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>टन</displayName>
+				<unitPattern count="one">{0} टन</unitPattern>
 				<unitPattern count="other">{0} टन</unitPattern>
 			</unit>
 			<unit type="mass-stone">
 				<displayName>स्टोन</displayName>
+				<unitPattern count="one">{0} स्टोन</unitPattern>
 				<unitPattern count="other">{0} स्टोन</unitPattern>
 			</unit>
 			<unit type="mass-pound">
@@ -5697,6 +7080,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="mass-ounce">
 				<displayName>औंस</displayName>
+				<unitPattern count="one">{0} औंस</unitPattern>
 				<unitPattern count="other">{0} औंस</unitPattern>
 				<perUnitPattern>{0}/औंस</perUnitPattern>
 			</unit>
@@ -5705,6 +7089,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="mass-carat">
 				<displayName>कॅरट</displayName>
+				<unitPattern count="one">{0} कॅ</unitPattern>
 				<unitPattern count="other">{0} कॅ</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
@@ -5718,6 +7103,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="mass-grain">
 				<displayName>कण</displayName>
+				<unitPattern count="one">{0} कण</unitPattern>
 				<unitPattern count="other">{0} कण</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
@@ -5728,23 +7114,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="pressure-bar">
 				<displayName>पट्टी</displayName>
+				<unitPattern count="one">{0} पट्टी</unitPattern>
 				<unitPattern count="other">{0} पट्टी</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>किमी/व</displayName>
+				<unitPattern count="one">{0} किमी/व</unitPattern>
 				<unitPattern count="other">{0} किमी/व</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>मी/से</displayName>
+				<unitPattern count="one">{0} मी/से</unitPattern>
 				<unitPattern count="other">{0} मी/से</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>मा/व</displayName>
+				<unitPattern count="one">{0} मा/व</unitPattern>
 				<unitPattern count="other">{0} मा/व</unitPattern>
 			</unit>
 			<unit type="speed-knot">
 				<displayName>नॉट</displayName>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName>अंश तापमान</displayName>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>अं. से</displayName>
 			</unit>
@@ -5756,15 +7149,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>किमी³</displayName>
+				<unitPattern count="one">{0} किमी³</unitPattern>
 				<unitPattern count="other">{0} किमी³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
 				<displayName>मी³</displayName>
+				<unitPattern count="one">{0} मी³</unitPattern>
 				<unitPattern count="other">{0} मी³</unitPattern>
 				<perUnitPattern>{0}/मी³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>सेमी³</displayName>
+				<unitPattern count="one">{0} सेमी³</unitPattern>
 				<unitPattern count="other">{0} सेमी³</unitPattern>
 				<perUnitPattern>{0}/सेमी³</perUnitPattern>
 			</unit>
@@ -5779,11 +7175,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-liter">
 				<displayName>लिटर</displayName>
+				<unitPattern count="one">{0} लि</unitPattern>
 				<unitPattern count="other">{0} लि</unitPattern>
 				<perUnitPattern>{0}/लि</perUnitPattern>
 			</unit>
 			<unit type="volume-milliliter">
 				<displayName>मिलि</displayName>
+				<unitPattern count="one">{0} मिलि</unitPattern>
 				<unitPattern count="other">{0} मिलि</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
@@ -5794,16 +7192,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-gallon">
 				<displayName>गॅ</displayName>
+				<unitPattern count="one">{0} गॅ</unitPattern>
 				<unitPattern count="other">{0} गॅ</unitPattern>
 				<perUnitPattern>{0}/गॅलो युएस</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>इंप.गॅलोन</displayName>
+				<unitPattern count="one">{0} गॅल इंप.</unitPattern>
 				<unitPattern count="other">{0} गॅल इंप.</unitPattern>
 				<perUnitPattern>{0}/गॅलोन इंप.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>क्वा</displayName>
+				<unitPattern count="one">{0} क्वा</unitPattern>
 				<unitPattern count="other">{0} क्वा</unitPattern>
 			</unit>
 			<unit type="volume-pint">
@@ -5811,14 +7212,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-cup">
 				<displayName>कप</displayName>
+				<unitPattern count="one">{0} क</unitPattern>
 				<unitPattern count="other">{0} क</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>कु</displayName>
+				<unitPattern count="one">{0} कु</unitPattern>
 				<unitPattern count="other">{0} कु</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
 				<displayName>बॅरल</displayName>
+				<unitPattern count="one">{0} बॅरल</unitPattern>
 				<unitPattern count="other">{0} बॅरल</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
@@ -5829,38 +7233,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-drop">
 				<displayName>थेंबो</displayName>
+				<unitPattern count="one">{0} थेंबो</unitPattern>
 				<unitPattern count="other">{0} थेंबो</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>ड्रॅम फ्लुइड</displayName>
+				<unitPattern count="one">{0} ड्रॅम फ्लु</unitPattern>
 				<unitPattern count="other">{0} ड्रॅम फ्लु</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
 				<displayName>जिगर</displayName>
+				<unitPattern count="one">{0} जिगर</unitPattern>
 				<unitPattern count="other">{0} जिगर</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
 				<displayName>चिमटी</displayName>
+				<unitPattern count="one">{0} चिमटी</unitPattern>
 				<unitPattern count="other">{0} चिमटी</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>क्वार्त इंप</displayName>
 			</unit>
+			<unit type="duration-fortnight">
+				<displayName>पंद्र</displayName>
+				<unitPattern count="one">{0} पंद्र</unitPattern>
+				<unitPattern count="other">{0} पंद्र</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>प्रकाश</displayName>
+				<unitPattern count="one">{0} प्रकाश</unitPattern>
 				<unitPattern count="other">{0} प्रकाश</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>राती</displayName>
+				<unitPattern count="one">{0} रात</unitPattern>
 				<unitPattern count="other">{0} राती</unitPattern>
 				<perUnitPattern>{0}/रात</perUnitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName>दिका</displayName>
+				<displayName>दिशा</displayName>
 				<coordinateUnitPattern type="east">{0} उदें</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} उत्त</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} द</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} अ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} दक्ष</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} अस</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
@@ -5874,71 +7289,90 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPrefixPattern>पि{0}</unitPrefixPattern>
 			</compoundUnit>
 			<unit type="acceleration-g-force">
+				<unitPattern count="one">{0} G</unitPattern>
 				<unitPattern count="other">{0}Gs</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
+				<unitPattern count="one">{0} मी/से²</unitPattern>
 				<unitPattern count="other">{0}मी/से²</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
+				<unitPattern count="one">{0} rev</unitPattern>
 				<unitPattern count="other">{0}rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
+				<unitPattern count="one">{0} रे</unitPattern>
 				<unitPattern count="other">{0}रे</unitPattern>
 			</unit>
 			<unit type="angle-degree">
+				<unitPattern count="one">{0} अंश</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
+				<unitPattern count="one">{0} आर्कमिनीट</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0} किमी²</unitPattern>
 				<unitPattern count="other">{0}किमी²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
+				<unitPattern count="one">{0} ha</unitPattern>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
+				<unitPattern count="one">{0} मी²</unitPattern>
 				<unitPattern count="other">{0}मी²</unitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
+				<unitPattern count="one">{0} सेमी²</unitPattern>
 				<unitPattern count="other">{0}सेमी²</unitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} चौ मा</unitPattern>
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
 			<unit type="area-acre">
+				<unitPattern count="one">{0} ac</unitPattern>
 				<unitPattern count="other">{0}ac</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>yd²</displayName>
+				<unitPattern count="one">{0} yd²</unitPattern>
 				<unitPattern count="other">{0}yd²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>ft²</displayName>
+				<unitPattern count="one">{0} चौ फू</unitPattern>
 				<unitPattern count="other">{0}ft²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
+				<unitPattern count="one">{0} in²</unitPattern>
 				<unitPattern count="other">{0}in²</unitPattern>
 			</unit>
 			<unit type="area-dunam">
 				<displayName>डुनाम</displayName>
+				<unitPattern count="one">{0} डुनाम</unitPattern>
 				<unitPattern count="other">{0}डुनाम</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
+				<unitPattern count="one">{0} kt</unitPattern>
 				<unitPattern count="other">{0}kt</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<unitPattern count="one">{0} mg/dL</unitPattern>
 				<unitPattern count="other">{0}mg/dL</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/L</displayName>
 			</unit>
 			<unit type="concentr-item">
+				<unitPattern count="one">{0} वस्त</unitPattern>
 				<unitPattern count="other">{0}वस्त</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
+				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
@@ -5948,365 +7382,482 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>‱</displayName>
 			</unit>
 			<unit type="concentr-mole">
+				<unitPattern count="one">{0} मोल</unitPattern>
 				<unitPattern count="other">{0}मोल</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
+				<unitPattern count="one">{0} L/km</unitPattern>
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
+				<unitPattern count="one">{0} लि/100किमी</unitPattern>
 				<unitPattern count="other">{0}लि/100किमी</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
+				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0}mpg</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
+				<unitPattern count="one">{0} mpg Imp.</unitPattern>
 				<unitPattern count="other">{0}mpg Imp.</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
+				<unitPattern count="one">{0} PB</unitPattern>
 				<unitPattern count="other">{0}PB</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>TB</displayName>
+				<unitPattern count="one">{0} TB</unitPattern>
 				<unitPattern count="other">{0}TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
+				<unitPattern count="one">{0} Tb</unitPattern>
 				<unitPattern count="other">{0}Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>GB</displayName>
+				<unitPattern count="one">{0} GB</unitPattern>
 				<unitPattern count="other">{0}GB</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
+				<unitPattern count="one">{0} Gb</unitPattern>
 				<unitPattern count="other">{0}Gb</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
+				<unitPattern count="one">{0} MB</unitPattern>
 				<unitPattern count="other">{0}MB</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
+				<unitPattern count="one">{0} Mb</unitPattern>
 				<unitPattern count="other">{0}Mb</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
 				<displayName>kB</displayName>
+				<unitPattern count="one">{0} kB</unitPattern>
 				<unitPattern count="other">{0}kB</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
+				<unitPattern count="one">{0} kb</unitPattern>
 				<unitPattern count="other">{0}kb</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>B</displayName>
+				<unitPattern count="one">{0} बायट</unitPattern>
 				<unitPattern count="other">{0}B</unitPattern>
 			</unit>
 			<unit type="digital-bit">
+				<unitPattern count="one">{0} बिट</unitPattern>
 				<unitPattern count="other">{0}बिट</unitPattern>
 			</unit>
 			<unit type="duration-century">
+				<unitPattern count="one">{0}श</unitPattern>
 				<unitPattern count="other">{0}श</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<unitPattern count="other">{0}दशक</unitPattern>
+				<displayName>दश</displayName>
+				<unitPattern count="one">{0}दश</unitPattern>
+				<unitPattern count="other">{0}दश</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName>वर्सा</displayName>
-				<unitPattern count="other">{0}व</unitPattern>
+				<displayName>वर्स</displayName>
+				<unitPattern count="one">{0}वर्स</unitPattern>
+				<unitPattern count="other">{0}वर्स</unitPattern>
+				<perUnitPattern>{0}/वर्स</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>तिम्ह</displayName>
+				<unitPattern count="one">{0}तिम्ह</unitPattern>
+				<unitPattern count="other">{0}तिम्ह</unitPattern>
+				<perUnitPattern>{0}/तिम्ह</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName>म्हयनो</displayName>
+				<displayName>म्ह</displayName>
+				<unitPattern count="one">{0}म्ह</unitPattern>
 				<unitPattern count="other">{0}म्ह</unitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName>स</displayName>
-				<unitPattern count="other">{0}स</unitPattern>
+				<displayName>सप्त</displayName>
+				<unitPattern count="one">{0}सप्तक</unitPattern>
+				<unitPattern count="other">{0}सप्त</unitPattern>
+				<perUnitPattern>{0}/सप्त</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
+				<displayName>दी</displayName>
+				<unitPattern count="one">{0}दी</unitPattern>
 				<unitPattern count="other">{0}दी</unitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>वर</displayName>
-				<unitPattern count="other">{0}व</unitPattern>
+				<unitPattern count="one">{0}वर</unitPattern>
+				<unitPattern count="other">{0}वर</unitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>मिनीट</displayName>
-				<unitPattern count="other">{0} मि</unitPattern>
+				<unitPattern count="one">{0}मिन</unitPattern>
+				<unitPattern count="other">{0}मिण</unitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>सेकंद</displayName>
-				<unitPattern count="other">{0}से</unitPattern>
+				<unitPattern count="one">{0}सॅक</unitPattern>
+				<unitPattern count="other">{0}सॅक</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>मिलिसे</displayName>
+				<unitPattern count="one">{0} मिसॅक</unitPattern>
 				<unitPattern count="other">{0}मिसे</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<unitPattern count="other">{0}μs</unitPattern>
+				<displayName>मायसॅक</displayName>
+				<unitPattern count="one">{0}मायसॅक</unitPattern>
+				<unitPattern count="other">{0}मायसॅक</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>नॅसे</displayName>
-				<unitPattern count="other">{0}नॅसे</unitPattern>
+				<unitPattern count="one">{0}नॅसॅक</unitPattern>
+				<unitPattern count="other">{0}नॅसॅक</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
 				<displayName>एम्प</displayName>
+				<unitPattern count="one">{0} A</unitPattern>
 				<unitPattern count="other">{0}A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName>mA</displayName>
+				<unitPattern count="one">{0} mA</unitPattern>
 				<unitPattern count="other">{0}mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
+				<unitPattern count="one">{0} Ω</unitPattern>
 				<unitPattern count="other">{0}Ω</unitPattern>
 			</unit>
 			<unit type="electric-volt">
+				<unitPattern count="one">{0} V</unitPattern>
 				<unitPattern count="other">{0}V</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
+				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0}kcal</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
+				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0}cal</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
+				<unitPattern count="one">{0} kcal</unitPattern>
 				<unitPattern count="other">{0}Cal</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
 				<displayName>kJ</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0}kJ</unitPattern>
 			</unit>
 			<unit type="energy-joule">
+				<unitPattern count="one">{0} J</unitPattern>
 				<unitPattern count="other">{0}J</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>kWh</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
 				<unitPattern count="other">{0}kWh</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName>eV</displayName>
+				<unitPattern count="one">{0} eV</unitPattern>
 				<unitPattern count="other">{0}eV</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
+				<unitPattern count="one">{0} Btu</unitPattern>
 				<unitPattern count="other">{0}Btu</unitPattern>
 			</unit>
 			<unit type="energy-therm-us">
+				<unitPattern count="one">{0} युएस थर्म्स</unitPattern>
 				<unitPattern count="other">{0}युएस थर्म्स</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
 				<displayName>lbf</displayName>
+				<unitPattern count="one">{0} lbf</unitPattern>
 				<unitPattern count="other">{0}lbf</unitPattern>
 			</unit>
 			<unit type="force-newton">
 				<displayName>न्यु</displayName>
+				<unitPattern count="one">{0} न्यु</unitPattern>
 				<unitPattern count="other">{0}न्यु</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<unitPattern count="one">{0} किवॉवर/१००किमी</unitPattern>
 				<unitPattern count="other">{0}किवॉवर/१००किमी</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
+				<unitPattern count="one">{0} GHz</unitPattern>
 				<unitPattern count="other">{0}GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
+				<unitPattern count="one">{0} MHz</unitPattern>
 				<unitPattern count="other">{0}MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
+				<unitPattern count="one">{0} kHz</unitPattern>
 				<unitPattern count="other">{0}kHz</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
+				<unitPattern count="one">{0} Hz</unitPattern>
 				<unitPattern count="other">{0}Hz</unitPattern>
 			</unit>
 			<unit type="graphics-em">
+				<unitPattern count="one">{0} em</unitPattern>
 				<unitPattern count="other">{0}em</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
 				<displayName>px</displayName>
+				<unitPattern count="one">{0} px</unitPattern>
 				<unitPattern count="other">{0}px</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName>मॅपि</displayName>
+				<displayName>मॅगा-चित्र-तत्वां</displayName>
+				<unitPattern count="one">{0} MP</unitPattern>
 				<unitPattern count="other">{0}MP</unitPattern>
 			</unit>
-			<unit type="graphics-pixel-per-centimeter">
-				<unitPattern count="other">{0}ppcm</unitPattern>
-			</unit>
 			<unit type="graphics-pixel-per-inch">
+				<unitPattern count="one">{0} ppi</unitPattern>
 				<unitPattern count="other">{0}ppi</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
+				<unitPattern count="one">{0} ppcm</unitPattern>
 				<unitPattern count="other">{0}dpcm</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
+				<unitPattern count="one">{0} ppi</unitPattern>
 				<unitPattern count="other">{0}dpi</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>ठिपको</displayName>
+				<unitPattern count="one">{0} px</unitPattern>
 				<unitPattern count="other">{0}ठिपको</unitPattern>
 			</unit>
 			<unit type="length-earth-radius">
+				<unitPattern count="one">{0} R⊕</unitPattern>
 				<unitPattern count="other">{0}R⊕</unitPattern>
 			</unit>
 			<unit type="length-kilometer">
+				<unitPattern count="one">{0} किमी</unitPattern>
 				<unitPattern count="other">{0}किमी</unitPattern>
 			</unit>
 			<unit type="length-meter">
+				<unitPattern count="one">{0} मी</unitPattern>
 				<unitPattern count="other">{0}मी</unitPattern>
 			</unit>
 			<unit type="length-decimeter">
+				<unitPattern count="one">{0} डेमी</unitPattern>
 				<unitPattern count="other">{0}डेमी</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
+				<unitPattern count="one">{0} सेमी</unitPattern>
 				<unitPattern count="other">{0}सेमी</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
+				<unitPattern count="one">{0} μm</unitPattern>
 				<unitPattern count="other">{0}μm</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
+				<unitPattern count="one">{0} nm</unitPattern>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
 			<unit type="length-picometer">
+				<unitPattern count="one">{0} pm</unitPattern>
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
 			<unit type="length-mile">
+				<unitPattern count="one">{0} mi</unitPattern>
 				<unitPattern count="other">{0}mi</unitPattern>
 			</unit>
 			<unit type="length-yard">
+				<unitPattern count="one">{0} yd</unitPattern>
 				<unitPattern count="other">{0}yd</unitPattern>
 			</unit>
 			<unit type="length-foot">
+				<unitPattern count="one">{0} फूट</unitPattern>
 				<unitPattern count="other">{0}फूट</unitPattern>
 			</unit>
 			<unit type="length-inch">
+				<unitPattern count="one">{0} in</unitPattern>
 				<unitPattern count="other">{0}in</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
+				<unitPattern count="one">{0} au</unitPattern>
 				<unitPattern count="other">{0}au</unitPattern>
 			</unit>
 			<unit type="length-furlong">
+				<unitPattern count="one">{0} fur</unitPattern>
 				<unitPattern count="other">{0}fur</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
+				<unitPattern count="one">{0} smi</unitPattern>
 				<unitPattern count="other">{0}smi</unitPattern>
 			</unit>
 			<unit type="length-point">
+				<unitPattern count="one">{0} pt</unitPattern>
 				<unitPattern count="other">{0}pt</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
+				<unitPattern count="one">{0} R☉</unitPattern>
 				<unitPattern count="other">{0}R☉</unitPattern>
 			</unit>
 			<unit type="light-lux">
+				<unitPattern count="one">{0} lx</unitPattern>
 				<unitPattern count="other">{0}lx</unitPattern>
 			</unit>
 			<unit type="light-candela">
+				<unitPattern count="one">{0} cd</unitPattern>
 				<unitPattern count="other">{0}cd</unitPattern>
 			</unit>
 			<unit type="light-lumen">
+				<unitPattern count="one">{0} lm</unitPattern>
 				<unitPattern count="other">{0}lm</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>L☉</displayName>
+				<unitPattern count="one">{0} L☉</unitPattern>
 				<unitPattern count="other">{0}L☉</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
+				<unitPattern count="one">{0} t</unitPattern>
 				<unitPattern count="other">{0}t</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
+				<unitPattern count="one">{0} किग्रा</unitPattern>
 				<unitPattern count="other">{0}किग्रा</unitPattern>
 			</unit>
 			<unit type="mass-gram">
+				<unitPattern count="one">{0} ग्राम</unitPattern>
 				<unitPattern count="other">{0}ग्रा</unitPattern>
 			</unit>
 			<unit type="mass-milligram">
+				<unitPattern count="one">{0} मिग्रा</unitPattern>
 				<unitPattern count="other">{0}मिग्रा</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
+				<unitPattern count="one">{0} μg</unitPattern>
 				<unitPattern count="other">{0}μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
+				<unitPattern count="one">{0} टन</unitPattern>
 				<unitPattern count="other">{0}टन</unitPattern>
 			</unit>
 			<unit type="mass-stone">
+				<unitPattern count="one">{0} स्टोन</unitPattern>
 				<unitPattern count="other">{0}स्टोन</unitPattern>
 			</unit>
 			<unit type="mass-pound">
 				<displayName>lb</displayName>
+				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0}#</unitPattern>
 			</unit>
 			<unit type="mass-ounce">
+				<unitPattern count="one">{0} औंस</unitPattern>
 				<unitPattern count="other">{0}औंस</unitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
 				<displayName>oz t</displayName>
+				<unitPattern count="one">{0} oz t</unitPattern>
 				<unitPattern count="other">{0}oz t</unitPattern>
 			</unit>
 			<unit type="mass-carat">
+				<unitPattern count="one">{0} कॅ</unitPattern>
 				<unitPattern count="other">{0}कॅ</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
 				<displayName>Da</displayName>
+				<unitPattern count="one">{0} Da</unitPattern>
 				<unitPattern count="other">{0}Da</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
 				<displayName>M⊕</displayName>
+				<unitPattern count="one">{0} M⊕</unitPattern>
 				<unitPattern count="other">{0}M⊕</unitPattern>
 			</unit>
 			<unit type="mass-solar-mass">
 				<displayName>M☉</displayName>
+				<unitPattern count="one">{0} M☉</unitPattern>
 				<unitPattern count="other">{0}M☉</unitPattern>
 			</unit>
 			<unit type="mass-grain">
+				<unitPattern count="one">{0} कण</unitPattern>
 				<unitPattern count="other">{0}कण</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
+				<unitPattern count="one">{0} GW</unitPattern>
 				<unitPattern count="other">{0}GW</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
 				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
 				<unitPattern count="other">{0}MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
+				<unitPattern count="one">{0} kW</unitPattern>
 				<unitPattern count="other">{0}kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
+				<unitPattern count="one">{0} W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
+				<unitPattern count="one">{0} mW</unitPattern>
 				<unitPattern count="other">{0}mW</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
+				<unitPattern count="one">{0} hp</unitPattern>
 				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mm Hg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
+				<unitPattern count="one">{0} psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ Hg</displayName>
+				<unitPattern count="one">{0} inHg</unitPattern>
 				<unitPattern count="other">{0}″ Hg</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
+				<unitPattern count="one">{0} पट्टी</unitPattern>
 				<unitPattern count="other">{0}पट्टी</unitPattern>
 			</unit>
 			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mbar</unitPattern>
 				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
 			<unit type="pressure-atmosphere">
+				<unitPattern count="one">{0} atm</unitPattern>
 				<unitPattern count="other">{0}atm</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
+				<unitPattern count="one">{0} Pa</unitPattern>
 				<unitPattern count="other">{0}Pa</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0} hPa</unitPattern>
 				<unitPattern count="other">{0}hPa</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
+				<unitPattern count="one">{0} kPa</unitPattern>
 				<unitPattern count="other">{0}kPa</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0} MPa</unitPattern>
 				<unitPattern count="other">{0}MPa</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0} मी/से</unitPattern>
 				<unitPattern count="other">{0}मी/से</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
+				<unitPattern count="one">{0} मा/व</unitPattern>
 				<unitPattern count="other">{0}मा/व</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
@@ -6314,143 +7865,186 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
+				<unitPattern count="one">{0} K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
+				<unitPattern count="one">{0} lbf⋅ft</unitPattern>
 				<unitPattern count="other">{0}lbf⋅ft</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
+				<unitPattern count="one">{0} N⋅m</unitPattern>
 				<unitPattern count="other">{0}N⋅m</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0} किमी³</unitPattern>
 				<unitPattern count="other">{0}किमी³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
+				<unitPattern count="one">{0} मी³</unitPattern>
 				<unitPattern count="other">{0}मी³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0} mi³</unitPattern>
 				<unitPattern count="other">{0}mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
+				<unitPattern count="one">{0} yd³</unitPattern>
 				<unitPattern count="other">{0}yd³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
+				<unitPattern count="one">{0} ft³</unitPattern>
 				<unitPattern count="other">{0}ft³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
+				<unitPattern count="one">{0} in³</unitPattern>
 				<unitPattern count="other">{0}in³</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
+				<unitPattern count="one">{0} ML</unitPattern>
 				<unitPattern count="other">{0}ML</unitPattern>
 			</unit>
 			<unit type="volume-hectoliter">
+				<unitPattern count="one">{0} hL</unitPattern>
 				<unitPattern count="other">{0}hL</unitPattern>
 			</unit>
 			<unit type="volume-liter">
+				<unitPattern count="one">{0} लि</unitPattern>
 				<unitPattern count="other">{0}लि</unitPattern>
 			</unit>
 			<unit type="volume-deciliter">
+				<unitPattern count="one">{0} dL</unitPattern>
 				<unitPattern count="other">{0}dL</unitPattern>
 			</unit>
 			<unit type="volume-centiliter">
+				<unitPattern count="one">{0} cL</unitPattern>
 				<unitPattern count="other">{0}cL</unitPattern>
 			</unit>
 			<unit type="volume-milliliter">
+				<unitPattern count="one">{0} मिलि</unitPattern>
 				<unitPattern count="other">{0}मिलि</unitPattern>
 			</unit>
 			<unit type="volume-pint-metric">
 				<displayName>pt</displayName>
+				<unitPattern count="one">{0} mpt</unitPattern>
 				<unitPattern count="other">{0}mpt</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
+				<unitPattern count="one">{0} mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
+				<unitPattern count="one">{0} ac ft</unitPattern>
 				<unitPattern count="other">{0}ac ft</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
 				<displayName>बुशेल</displayName>
+				<unitPattern count="one">{0} bu</unitPattern>
 				<unitPattern count="other">{0}bu</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
+				<unitPattern count="one">{0} गॅ</unitPattern>
 				<unitPattern count="other">{0}गॅ</unitPattern>
 				<perUnitPattern>{0}/गॅ</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
+				<unitPattern count="one">{0} गॅल इंप.</unitPattern>
 				<unitPattern count="other">{0}गॅलइंप.</unitPattern>
 				<perUnitPattern>{0}/गॅलइंप.</perUnitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<displayName>qt</displayName>
+				<unitPattern count="one">{0} क्वा</unitPattern>
 				<unitPattern count="other">{0}qt</unitPattern>
 			</unit>
 			<unit type="volume-pint">
 				<displayName>pt</displayName>
+				<unitPattern count="one">{0} pt</unitPattern>
 				<unitPattern count="other">{0}pt</unitPattern>
 			</unit>
 			<unit type="volume-cup">
+				<unitPattern count="one">{0} क</unitPattern>
 				<unitPattern count="other">{0}क</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz US</unitPattern>
 				<unitPattern count="other">{0}fl oz</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>Imp fl oz</displayName>
+				<unitPattern count="one">{0} fl oz Imp.</unitPattern>
 				<unitPattern count="other">{0}fl oz Im</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
+				<unitPattern count="one">{0} tbsp</unitPattern>
 				<unitPattern count="other">{0}tbsp</unitPattern>
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>tsp</displayName>
+				<unitPattern count="one">{0} कु</unitPattern>
 				<unitPattern count="other">{0}tsp</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
+				<unitPattern count="one">{0} बॅरल</unitPattern>
 				<unitPattern count="other">{0}बॅरल</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
 				<displayName>dsp</displayName>
+				<unitPattern count="one">{0} dstspn</unitPattern>
 				<unitPattern count="other">{0}dsp</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>dsp Imp</displayName>
+				<unitPattern count="one">{0} dstspn Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
 			<unit type="volume-drop">
+				<unitPattern count="one">{0} थेंबो</unitPattern>
 				<unitPattern count="other">{0}थेंबो</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>fl.dr.</displayName>
+				<unitPattern count="one">{0} ड्रॅम फ्लु</unitPattern>
 				<unitPattern count="other">{0}fl.dr.</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
+				<unitPattern count="one">{0} जिगर</unitPattern>
 				<unitPattern count="other">{0}जिगर</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
+				<unitPattern count="one">{0} चिमटी</unitPattern>
 				<unitPattern count="other">{0}चिमटी</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>qt Imp</displayName>
+				<unitPattern count="one">{0} qt Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="duration-fortnight">
+				<displayName>पंद्र</displayName>
+				<unitPattern count="one">{0} पंद्र</unitPattern>
+				<unitPattern count="other">{0} पंद्र</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>प्रकाश</displayName>
+				<unitPattern count="one">{0} प्रकाश</unitPattern>
 				<unitPattern count="other">{0} प्रकाश</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>राती</displayName>
+				<unitPattern count="one">{0}रात</unitPattern>
 				<unitPattern count="other">{0}राती</unitPattern>
-				<perUnitPattern>{0}/रात</perUnitPattern>
 			</unit>
 			<coordinateUnit>
+				<displayName>दिशा</displayName>
 				<coordinateUnitPattern type="east">{0}उदें</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}उत्त</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0}द</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0}अ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}दक्ष</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}अस</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 	</units>
@@ -6459,6 +8053,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0}, वा {1}</listPatternPart>
 			<listPatternPart type="2">{0} वा {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="end">{0}, or {1}</listPatternPart>
+			<listPatternPart type="2">{0} or {1}</listPatternPart>
+		</listPattern>
 		<listPattern type="standard-narrow">
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
@@ -6491,6 +8089,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabelPattern type="miscellaneous">{0} — तरेकवार</characterLabelPattern>
 		<characterLabelPattern type="other">{0} — हेर</characterLabelPattern>
 		<characterLabelPattern type="scripts">लिपयो — {0}</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="one">{0} आघात</characterLabelPattern>
 		<characterLabelPattern type="strokes" count="other">{0} आघात</characterLabelPattern>
 		<characterLabelPattern type="subscript">सबस्क्रिप्ट {0}</characterLabelPattern>
 		<characterLabelPattern type="superscript">सुपरस्क्रिप्ट {0}</characterLabelPattern>
@@ -6647,51 +8246,174 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<featureName type="zero">स्लॅश शून्य</featureName>
 	</typographicNames>
 	<personNames>
-		<nameOrderLocales order="givenFirst">und kok</nameOrderLocales>
-		<nameOrderLocales order="surnameFirst">ko si ta te vi yue zh</nameOrderLocales>
+		<nameOrderLocales order="givenFirst">und kok kok_Latn</nameOrderLocales>
+		<parameterDefault parameter="formality">informal</parameterDefault>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{title} {given} {given2} {surname} {surname2} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="formal">
+			<namePattern>{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-allCaps}{surname2-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}{surname-monogram-allCaps}{surname2-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{given} {given2-initial} {surname} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{given-initial} {given2-initial} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname-initial}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{surname} {surname2} {title} {given} {given2} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{surname} {surname2} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname} {given} {given2-initial} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{surname} {given-initial} {given2-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{surname} {given-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="informal">
+			<namePattern>{surname} {surname2}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
 		<sampleName item="nativeG">
 			<nameField type="given">दिशा</nameField>
 		</sampleName>
 		<sampleName item="nativeGS">
-			<nameField type="given">उमेश</nameField>
-			<nameField type="surname">भंडारकर</nameField>
+			<nameField type="given">शांति</nameField>
+			<nameField type="surname">गांवकर</nameField>
 		</sampleName>
 		<sampleName item="nativeGGS">
-			<nameField type="given">अतुल</nameField>
-			<nameField type="given2">मनोहर</nameField>
-			<nameField type="surname">प्रभुकोंकार</nameField>
+			<nameField type="given">मारिया</nameField>
+			<nameField type="given2">हेलेना</nameField>
+			<nameField type="surname">फर्नॅन्डेज</nameField>
 		</sampleName>
 		<sampleName item="nativeFull">
-			<nameField type="title">श्री.</nameField>
-			<nameField type="given">उमेश भंडारकर</nameField>
-			<nameField type="given-informal">साक्षी</nameField>
-			<nameField type="given2">अनुसुया कुंकळ्येकार</nameField>
-			<nameField type="surname-prefix">∅∅∅</nameField>
-			<nameField type="surname-core">प्रभु</nameField>
-			<nameField type="surname2">मावजो</nameField>
-			<nameField type="generation">क.</nameField>
+			<nameField type="title">श्री</nameField>
+			<nameField type="given">फ्रांसिस शावियेर</nameField>
+			<nameField type="given-informal">फोर्सु</nameField>
+			<nameField type="given2">जुआंव आंतोन</nameField>
+			<nameField type="surname-prefix">दे</nameField>
+			<nameField type="surname-core">सोजा</nameField>
+			<nameField type="surname2">ए मेनेजेस</nameField>
+			<nameField type="generation">धा.</nameField>
 			<nameField type="credentials">एमपी</nameField>
 		</sampleName>
 		<sampleName item="foreignG">
 			<nameField type="given">सिंदबाद</nameField>
 		</sampleName>
 		<sampleName item="foreignGS">
-			<nameField type="given">आरवी</nameField>
-			<nameField type="surname">कामत</nameField>
+			<nameField type="given">काथा</nameField>
+			<nameField type="surname">बाउमान</nameField>
 		</sampleName>
 		<sampleName item="foreignGGS">
-			<nameField type="given">मनोहर</nameField>
-			<nameField type="given2">माधव</nameField>
-			<nameField type="surname">नायक</nameField>
+			<nameField type="given">जाजिला</nameField>
+			<nameField type="given2">हामिश</nameField>
+			<nameField type="surname">स्टोबा</nameField>
 		</sampleName>
 		<sampleName item="foreignFull">
 			<nameField type="title">प्रो. डॉ.</nameField>
-			<nameField type="given">विक्रम सिंह</nameField>
-			<nameField type="given-informal">विकी</nameField>
-			<nameField type="given2">रामचरण दास</nameField>
-			<nameField type="surname-prefix">शेणवी कुंकळ्येकार</nameField>
-			<nameField type="surname-core">शर्मा</nameField>
-			<nameField type="surname2">सरदेसाय</nameField>
+			<nameField type="given">आडा कोर्नेलिया</nameField>
+			<nameField type="given-informal">नील</nameField>
+			<nameField type="given2">सेजार मार्टिन</nameField>
+			<nameField type="surname-prefix">वॉन</nameField>
+			<nameField type="surname-core">ब्रूह्ल</nameField>
+			<nameField type="surname2">गॉन्जालेज डोमिंगो</nameField>
 			<nameField type="generation">जेआर</nameField>
 			<nameField type="credentials">बी.ए. एल.एल.बी</nameField>
 		</sampleName>
diff --git a/make/data/cldr/common/main/kok_Latn.xml b/make/data/cldr/common/main/kok_Latn.xml
index e7566ebdaaa..89ff58c34ef 100644
--- a/make/data/cldr/common/main/kok_Latn.xml
+++ b/make/data/cldr/common/main/kok_Latn.xml
@@ -13,34 +13,504 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<languages>
+			<language type="af">Afrikaans</language>
+			<language type="ak">Akan</language>
+			<language type="am">Amharic</language>
 			<language type="ar">Arbi</language>
+			<language type="ar_001">Adhunik Promann Orbi</language>
+			<language type="as">Osomiya</language>
+			<language type="ast">Asturian</language>
+			<language type="az">Azerbaijani</language>
+			<language type="az" alt="short">Azeri</language>
+			<language type="bal">Baluchi</language>
+			<language type="be">Belarusian</language>
+			<language type="bg">Bulgarian</language>
+			<language type="bgc">Haryanvi</language>
+			<language type="bho">Bhojpuri</language>
+			<language type="blo">Anii</language>
+			<language type="bn">Bangla</language>
+			<language type="br">Breton</language>
+			<language type="brx">Bodo</language>
+			<language type="bs">Bosnian</language>
+			<language type="ca">Catalao</language>
+			<language type="ceb">Cebuano</language>
+			<language type="chr">Cherokee</language>
+			<language type="cs">Chek</language>
+			<language type="csw">Swampy Cree</language>
+			<language type="cv">Chuvax</language>
+			<language type="cy">Welx</language>
+			<language type="da">Denmarkez</language>
+			<language type="de">Jermon</language>
+			<language type="de_AT">Jermon (Austria)</language>
+			<language type="de_CH">Jermon (Switzerland)</language>
+			<language type="doi">Dogri</language>
+			<language type="dsb">Sokoilem Sorbian</language>
+			<language type="ee">Ewe</language>
 			<language type="el">Grik</language>
 			<language type="en">Inglix</language>
+			<language type="en_AU">Inglix (Australia)</language>
+			<language type="en_CA">Inglix (Canada)</language>
+			<language type="en_GB">Inglix (Sõyukt Razvott)</language>
+			<language type="en_US">Inglix (Amerikechim Sõyukt Rajyam)</language>
+			<language type="eo">Esperanto</language>
 			<language type="es">Ispanhol</language>
+			<language type="es_419">Ispanhol (Latin Amerika)</language>
+			<language type="es_MX">Ispanhol (Meksiko)</language>
+			<language type="et">Estonian</language>
+			<language type="eu">Bask</language>
+			<language type="fa">Farsi</language>
+			<language type="ff">Fula</language>
+			<language type="fi">Finlandez</language>
+			<language type="fil">Filipino</language>
+			<language type="fo">Faroez</language>
 			<language type="fr">Fransez</language>
+			<language type="fr_CA">Fransez (Canada)</language>
+			<language type="fr_CH">Fransez (Switzerland)</language>
+			<language type="fy">Ostonti Frisian</language>
+			<language type="ga">Ayerlandez</language>
+			<language type="gaa">Ga</language>
+			<language type="gd">Scottish Gaelic</language>
+			<language type="gl">Galician</language>
+			<language type="gu">Gujarati</language>
+			<language type="ha">Hausa</language>
+			<language type="he">Hebrev</language>
+			<language type="hi">Hindi</language>
+			<language type="hi_Latn">Romi Hindi</language>
+			<language type="hr">Croatian</language>
+			<language type="hsb">Voilem Sorbian</language>
+			<language type="hu">Hungarian</language>
+			<language type="hy">Armenian</language>
+			<language type="ia">Interlingua</language>
+			<language type="id">Indonesian</language>
+			<language type="ie">Interlingue</language>
+			<language type="ig">Igbo</language>
+			<language type="ii">Sichuan Yi</language>
+			<language type="is">Ayslandez</language>
+			<language type="it">Italian</language>
+			<language type="ja">Japani</language>
+			<language type="jv">Javanez</language>
+			<language type="ka">Georgian</language>
+			<language type="kea">Kabuverdianu</language>
+			<language type="kgp">Kaingang</language>
+			<language type="kk">Kazakh</language>
+			<language type="km">Khmer</language>
 			<language type="kn">Kon’nodd</language>
+			<language type="ko">Korean</language>
 			<language type="kok">Konknni</language>
+			<language type="ks">Kaxmiri</language>
+			<language type="ku">Kurdez</language>
+			<language type="ku" menu="core">Kurdez</language>
+			<language type="ku" menu="extension">Kurmanji</language>
+			<language type="kxv">Kuvi</language>
+			<language type="ky">Kyrgyz</language>
+			<language type="la">Latin</language>
+			<language type="lb">Luxembourgez</language>
+			<language type="lij">Ligurian</language>
+			<language type="lmo">Lombard</language>
+			<language type="lo">Lao</language>
+			<language type="lt">Lithuanian</language>
+			<language type="lv">Latvian</language>
+			<language type="mai">Maithili</language>
+			<language type="mi">Maori</language>
+			<language type="mk">Masedonian</language>
+			<language type="ml">Malayalam</language>
+			<language type="mn">Mongolian</language>
+			<language type="mni">Manipuri</language>
 			<language type="mr">Moratthi</language>
+			<language type="ms">Malay</language>
+			<language type="mt">Maltez</language>
+			<language type="mul">Sabar bhaso</language>
+			<language type="my">Burmez</language>
+			<language type="nds">Sokoilem Jermon</language>
+			<language type="ne">Nepali</language>
+			<language type="nl">Hollandi</language>
+			<language type="nl_BE">Hollandi (Beljiom)</language>
+			<language type="nn">Norwegian Nynorsk</language>
+			<language type="no">Norwegian</language>
+			<language type="nqo">N’Ko</language>
+			<language type="nso">Ut’tori Sotho</language>
+			<language type="oc">Occitan</language>
+			<language type="om">Oromo</language>
+			<language type="or">Odia</language>
+			<language type="pa">Punjabi</language>
+			<language type="pcm">Nigerian Pidgin</language>
+			<language type="pl">Polandez</language>
+			<language type="prg">Prussian</language>
+			<language type="ps">Pashto</language>
+			<language type="pt">Portugez</language>
+			<language type="pt_BR">Portugez (Brazil)</language>
+			<language type="pt_PT">Portugez (Portugal)</language>
+			<language type="qu">Kechua</language>
+			<language type="raj">Rajasthani</language>
+			<language type="rm">Romansh</language>
+			<language type="ro">Romanian</language>
+			<language type="ru">Roxyan</language>
+			<language type="rw">Kinyarwanda</language>
+			<language type="sa">Sanskrit</language>
+			<language type="sah">Yakut</language>
+			<language type="sat">Santali</language>
+			<language type="sc">Sardinian</language>
+			<language type="sd">Sindhi</language>
+			<language type="si">Sinhala</language>
+			<language type="sk">Slovak</language>
+			<language type="sl">Slovenian</language>
+			<language type="so">Somali</language>
+			<language type="sq">Albanian</language>
+			<language type="sr">Serbian</language>
+			<language type="st">Southern Sotho</language>
+			<language type="su">Sundanez</language>
+			<language type="sv">Sweedez</language>
+			<language type="sw">Swahili</language>
+			<language type="syr">Syriac</language>
+			<language type="szl">Silesian</language>
+			<language type="ta">Tamil</language>
+			<language type="te">Telugu</language>
+			<language type="tg">Tajik</language>
+			<language type="th">Thai</language>
+			<language type="ti">Tigrinya</language>
+			<language type="tk">Turkmen</language>
+			<language type="tn">Tswana</language>
+			<language type="to">Tongan</language>
+			<language type="tr">Turki</language>
+			<language type="tt">Tatar</language>
+			<language type="ug">Uyghur</language>
+			<language type="uk">Ukrainian</language>
+			<language type="und">Onollkhi bhas</language>
+			<language type="ur">Urdu</language>
+			<language type="uz">Uzbek</language>
+			<language type="vec">Venixan</language>
+			<language type="vi">Vietnamez</language>
+			<language type="vmw">Makhuwa</language>
+			<language type="wo">Wolof</language>
+			<language type="xh">Khosa</language>
+			<language type="xnr">Kangri</language>
+			<language type="yo">Yoruba</language>
+			<language type="yrl">Nheengatu</language>
+			<language type="yue">Cantonez</language>
+			<language type="yue" alt="menu">Chini, Cantonez</language>
+			<language type="za">Zhuang</language>
 			<language type="zh">Chini</language>
+			<language type="zh" alt="menu">Chini, Mandarin</language>
+			<language type="zh_Hans">Sompi Chini</language>
+			<language type="zh_Hans" alt="long">Sompi Mandarin Chini</language>
+			<language type="zh_Hant">Paromporik Chini</language>
+			<language type="zh_Hant" alt="long">Paromporik Mandarin Chini</language>
+			<language type="zu">Zulu</language>
+			<language type="zxx">Bhaxik mozkur na</language>
 		</languages>
 		<scripts>
+			<script type="Arab">Farsi Orbi</script>
+			<script type="Beng">Bangla</script>
+			<script type="Cyrl">Cyrili</script>
 			<script type="Deva">Devanagari</script>
+			<script type="Grek">Grik</script>
+			<script type="Hebr">Hebrev</script>
 			<script type="Latn">Romi</script>
 		</scripts>
 		<territories>
+			<territory type="001">sonvsar</territory>
+			<territory type="002">Afrika</territory>
+			<territory type="003">Ut’tor Amerika</territory>
+			<territory type="005">Dokxinn Amerika</territory>
+			<territory type="009">Oxiania</territory>
+			<territory type="011">Ostonti Afrika</territory>
+			<territory type="013">Modlo America</territory>
+			<territory type="014">Udenti Afrika</territory>
+			<territory type="015">Ut’tori Amerika</territory>
+			<territory type="017">Modlo Afrika</territory>
+			<territory type="018">Dokxinni Afrika</territory>
+			<territory type="019">Purai Amerika</territory>
+			<territory type="021">Ut’tori Amerika</territory>
+			<territory type="029">Caribean</territory>
+			<territory type="030">Udenti Asia</territory>
+			<territory type="034">Dokxinni Asia</territory>
+			<territory type="035">Dokxinn-udent Asia</territory>
+			<territory type="039">Dokxinni Yerop</territory>
+			<territory type="053">Australasia</territory>
+			<territory type="054">Melanesia</territory>
+			<territory type="057">Micronesia Prant</territory>
+			<territory type="061">Polinesia</territory>
+			<territory type="142">Asia</territory>
+			<territory type="143">Modlo Asia</territory>
+			<territory type="145">Ostonti Asia</territory>
+			<territory type="150">Yerop</territory>
+			<territory type="151">Udenti Yerop</territory>
+			<territory type="154">Ut’tori Yerop</territory>
+			<territory type="155">Ostonti Yerop</territory>
+			<territory type="202">Saharache Dokxinnek Afrika</territory>
+			<territory type="419">Latin Amerika</territory>
+			<territory type="AC">Ascensanv Zunvo</territory>
+			<territory type="AD">Andorra</territory>
+			<territory type="AE">Sõyukt Orbi Emirat</territory>
+			<territory type="AF">Afghanistan</territory>
+			<territory type="AG">Antigua ani Barbuda</territory>
+			<territory type="AI">Anguila</territory>
+			<territory type="AL">Albania</territory>
+			<territory type="AM">Armenia</territory>
+			<territory type="AO">Angola</territory>
+			<territory type="AQ">Antarktika</territory>
+			<territory type="AR">Argentina</territory>
+			<territory type="AS">Amerikecho Samoa</territory>
+			<territory type="AT">Austria</territory>
+			<territory type="AU">Australia</territory>
+			<territory type="AW">Aruba</territory>
+			<territory type="AX">Oland Zunve</territory>
+			<territory type="AZ">Azerbaijan</territory>
+			<territory type="BA">Bosnia ani Herzegovina</territory>
+			<territory type="BB">Barbados</territory>
+			<territory type="BD">Bangladex</territory>
+			<territory type="BE">Beljiom</territory>
+			<territory type="BF">Burkina Faso</territory>
+			<territory type="BG">Bulgaria</territory>
+			<territory type="BH">Bahrain</territory>
+			<territory type="BI">Burundi</territory>
+			<territory type="BJ">Benin</territory>
+			<territory type="BL">São Bartolomev</territory>
+			<territory type="BM">Bermudas</territory>
+			<territory type="BN">Brunei</territory>
+			<territory type="BO">Bolivia</territory>
+			<territory type="BQ">Caribean Netherlands</territory>
+			<territory type="BR">Brazil</territory>
+			<territory type="BS">Bahamas</territory>
+			<territory type="BT">Bhutan</territory>
+			<territory type="BV">Bouve Zunvo</territory>
+			<territory type="BW">Botswana</territory>
+			<territory type="BY">Belarus</territory>
+			<territory type="BZ">Belize</territory>
+			<territory type="CA">Canada</territory>
+			<territory type="CC">Cocos (Keeling) Zunve</territory>
+			<territory type="CD">Congo - Kinshasa</territory>
+			<territory type="CF">Modlem Afriki Porjeraj</territory>
+			<territory type="CG">Congo - Brazzavil</territory>
+			<territory type="CH">Switzerland</territory>
+			<territory type="CI">Costa do Marfim</territory>
+			<territory type="CK">Cook Zunve</territory>
+			<territory type="CL">Chili</territory>
+			<territory type="CM">Camaroon</territory>
 			<territory type="CN">Chin</territory>
+			<territory type="CO">Colombia</territory>
+			<territory type="CP">Clipperton Zunvo</territory>
+			<territory type="CQ">Sark</territory>
+			<territory type="CR">Costa Rica</territory>
+			<territory type="CU">Cuba</territory>
+			<territory type="CV">Cabo Verde</territory>
+			<territory type="CW">Curaçao</territory>
+			<territory type="CX">Christmas Zunvo</territory>
 			<territory type="CY">Siprus</territory>
+			<territory type="CZ">Chekia</territory>
 			<territory type="DE">Jermon</territory>
+			<territory type="DG">Diego Garcia</territory>
+			<territory type="DJ">Djibuti</territory>
+			<territory type="DK">Denmark</territory>
+			<territory type="DM">Dominika</territory>
+			<territory type="DO">Dominican Porjeraj</territory>
+			<territory type="DZ">Algeria</territory>
+			<territory type="EA">Ceuta ani Meliya</territory>
+			<territory type="EC">Equador</territory>
+			<territory type="EE">Estonia</territory>
 			<territory type="EG">Ejipt</territory>
+			<territory type="EH">Ostonti Sahara</territory>
+			<territory type="ER">Eritrea</territory>
 			<territory type="ES">Ispania</territory>
+			<territory type="ET">Ethiopia</territory>
+			<territory type="EU">Yeropi Ekvott</territory>
+			<territory type="EZ">Yuro kxetr</territory>
+			<territory type="FI">Finland</territory>
+			<territory type="FJ">Fiji</territory>
+			<territory type="FK">Fokland Zunve</territory>
+			<territory type="FK" alt="variant">Malvinas Zunve</territory>
+			<territory type="FM">Maicronesia</territory>
+			<territory type="FO">Fero Zunve</territory>
 			<territory type="FR">Frans</territory>
+			<territory type="GA">Gabon</territory>
+			<territory type="GB">Sõyukt Razvott</territory>
+			<territory type="GD">Grenada</territory>
+			<territory type="GE">Georgia</territory>
+			<territory type="GF">Fransez Guiana</territory>
+			<territory type="GG">Guernzy</territory>
+			<territory type="GH">Ghana</territory>
+			<territory type="GI">Gibraltar</territory>
+			<territory type="GL">Greenland</territory>
+			<territory type="GM">Gambia</territory>
+			<territory type="GN">Gini</territory>
+			<territory type="GP">Guadalup</territory>
+			<territory type="GQ">Bhuinmodlogitacho Gini</territory>
 			<territory type="GR">Gres</territory>
+			<territory type="GS">Dokxinn Georgia ani Dokxinn Sandwich Zunve</territory>
+			<territory type="GT">Guatemala</territory>
+			<territory type="GU">Guam</territory>
+			<territory type="GW">Gini-Bissau</territory>
+			<territory type="GY">Guiana</territory>
+			<territory type="HK">Hong Kong</territory>
+			<territory type="HM">Heard ani McDonald Zunve</territory>
+			<territory type="HN">Honduras</territory>
+			<territory type="HR">Croaxia</territory>
+			<territory type="HT">Haiti</territory>
+			<territory type="HU">Hungary</territory>
+			<territory type="IC">Canarias Zunve</territory>
+			<territory type="ID">Indonesia</territory>
+			<territory type="IE">Ayerland</territory>
+			<territory type="IL">Israel</territory>
+			<territory type="IM">Menacho Zunvo</territory>
 			<territory type="IN">Bharot</territory>
+			<territory type="IO">Britanacho Hindi Mahasagor Prant</territory>
+			<territory type="IO" alt="chagos">Xagos Zunve</territory>
+			<territory type="IQ">Irak</territory>
+			<territory type="IR">Iran</territory>
+			<territory type="IS">Aysland</territory>
 			<territory type="IT">Italia</territory>
+			<territory type="JE">Jersy</territory>
+			<territory type="JM">Jamaica</territory>
+			<territory type="JO">Jordan</territory>
+			<territory type="JP">Japan</territory>
+			<territory type="KE">Kenya</territory>
+			<territory type="KG">Kyrgyzstan</territory>
+			<territory type="KH">Cambodia</territory>
+			<territory type="KI">Kiribas</territory>
+			<territory type="KM">Comoros</territory>
+			<territory type="KN">São Cristovão ani Nevis</territory>
+			<territory type="KP">Ut’tor Korea</territory>
+			<territory type="KR">Dokxinn Korea</territory>
+			<territory type="KW">Kuwait</territory>
+			<territory type="KY">Cayman Zunve</territory>
+			<territory type="KZ">Kazakhstan</territory>
+			<territory type="LA">Laos</territory>
+			<territory type="LB">Lebanon</territory>
+			<territory type="LC">Santa Lucia</territory>
+			<territory type="LI">Lixtenstain</territory>
+			<territory type="LK">Sri Lanka</territory>
+			<territory type="LR">Laibiria</territory>
+			<territory type="LS">Lesotho</territory>
+			<territory type="LT">Lithuania</territory>
+			<territory type="LU">Luksemborg</territory>
+			<territory type="LV">Latvia</territory>
 			<territory type="LY">Libia</territory>
+			<territory type="MA">Morokko</territory>
+			<territory type="MC">Monaco</territory>
+			<territory type="MD">Moldova</territory>
+			<territory type="ME">Montenegro</territory>
+			<territory type="MF">São Martinho (Frans)</territory>
+			<territory type="MG">Madagascar</territory>
+			<territory type="MH">Marxal Zunve</territory>
 			<territory type="MK">Ut’tor Masedonia</territory>
+			<territory type="ML">Mali</territory>
+			<territory type="MM">Myanmar</territory>
+			<territory type="MN">Mongolia</territory>
+			<territory type="MO">Macao</territory>
+			<territory type="MP">Ut’tori Mariana Zunvo</territory>
+			<territory type="MQ">Martinik</territory>
+			<territory type="MR">Mauritania</territory>
+			<territory type="MS">Montserrat</territory>
+			<territory type="MT">Malta</territory>
+			<territory type="MU">Maurixos</territory>
+			<territory type="MV">Maldiv</territory>
+			<territory type="MW">Malawi</territory>
+			<territory type="MX">Meksiko</territory>
+			<territory type="MY">Malayxia</territory>
+			<territory type="MZ">Mozambique</territory>
+			<territory type="NA">Namibia</territory>
+			<territory type="NC">Novo Caledonia</territory>
+			<territory type="NE">Naiger</territory>
+			<territory type="NF">Norfok Zunvo</territory>
+			<territory type="NG">Naigeria</territory>
+			<territory type="NI">Nicaragua</territory>
+			<territory type="NL">Netherlands</territory>
+			<territory type="NO">Norway</territory>
+			<territory type="NP">Nepal</territory>
+			<territory type="NR">Nauru</territory>
+			<territory type="NU">Niue</territory>
+			<territory type="NZ">Novo Zeeland</territory>
+			<territory type="NZ" alt="variant">Aoteroa</territory>
+			<territory type="OM">Oman</territory>
+			<territory type="PA">Panama</territory>
+			<territory type="PE">Peru</territory>
+			<territory type="PF">Fransez Polinesia</territory>
+			<territory type="PG">Papua Novo Gini</territory>
+			<territory type="PH">Phillipines</territory>
+			<territory type="PK">Pakistan</territory>
+			<territory type="PL">Poland</territory>
+			<territory type="PM">São Pedro ani Miquelão</territory>
+			<territory type="PN">Pitcairn Zunve</territory>
+			<territory type="PR">Porto Rico</territory>
+			<territory type="PS">Palestin</territory>
+			<territory type="PS" alt="short">Palestini Prant</territory>
+			<territory type="PT">Portugal</territory>
+			<territory type="PW">Palau</territory>
+			<territory type="PY">Paraguay</territory>
+			<territory type="QA">Qatar</territory>
+			<territory type="QO">Poixilo Oxiania</territory>
+			<territory type="RE">Reunião</territory>
+			<territory type="RO">Romenia</territory>
+			<territory type="RS">Serbia</territory>
 			<territory type="RU">Roxya</territory>
+			<territory type="RW">Ruanda</territory>
+			<territory type="SA">Saudi Orob</territory>
+			<territory type="SB">Solomon Zunve</territory>
+			<territory type="SC">Seyxels</territory>
+			<territory type="SD">Sudan</territory>
+			<territory type="SE">Sweeden</territory>
+			<territory type="SG">Singapur</territory>
+			<territory type="SH">Santa Helena</territory>
+			<territory type="SI">Slovenia</territory>
+			<territory type="SJ">Svalbard ani Yan Mayen</territory>
+			<territory type="SK">Slovakia</territory>
+			<territory type="SL">Serra Leõ</territory>
+			<territory type="SM">San Marino</territory>
+			<territory type="SN">Senegal</territory>
+			<territory type="SO">Somalia</territory>
+			<territory type="SR">Surinam</territory>
+			<territory type="SS">Dokxinn Sudan</territory>
+			<territory type="ST">São Tomé ani Príncipe</territory>
+			<territory type="SV">El Salvador</territory>
+			<territory type="SX">São Martinho (Netherlands)</territory>
+			<territory type="SY">Siria</territory>
+			<territory type="SZ">Eswatini</territory>
+			<territory type="TA">Tristão da Cunha</territory>
+			<territory type="TC">Turk ani Caicos Zunve</territory>
+			<territory type="TD">Chad</territory>
+			<territory type="TF">Fransez Dokxinni Prant</territory>
+			<territory type="TG">Togo</territory>
+			<territory type="TH">Thailand</territory>
+			<territory type="TJ">Tajikistan</territory>
+			<territory type="TK">Tokolau</territory>
+			<territory type="TL">Timor-Leste</territory>
+			<territory type="TL" alt="variant">Udent Timor</territory>
+			<territory type="TM">Turkmenistan</territory>
+			<territory type="TN">Tunisia</territory>
+			<territory type="TO">Tonga</territory>
+			<territory type="TR">Turkiya</territory>
+			<territory type="TT">Trindade ani Tobag</territory>
+			<territory type="TV">Tuvalu</territory>
+			<territory type="TW">Taiwan</territory>
+			<territory type="TZ">Tanzania</territory>
+			<territory type="UA">Yukrain</territory>
+			<territory type="UG">Yuganda</territory>
+			<territory type="UM">Sõyukt Rajyanche Poixile Dhaktte Zunve</territory>
+			<territory type="UN">Sõyukt Raxttram</territory>
+			<territory type="US">Amerikechim Sõyukt Rajyam</territory>
+			<territory type="UY">Uruguay</territory>
+			<territory type="UZ">Uzbekistan</territory>
+			<territory type="VA">Vatikan Xar</territory>
+			<territory type="VC">São Vicent ani Granadinas</territory>
+			<territory type="VE">Venezuela</territory>
+			<territory type="VG">Britanache Virgin Zunve</territory>
+			<territory type="VI">Sõyukt Rajyanche Virgin Zunve</territory>
+			<territory type="VN">Vietnam</territory>
+			<territory type="VU">Vanuatu</territory>
+			<territory type="WF">Wollis ani Futuna</territory>
+			<territory type="WS">Samoa</territory>
+			<territory type="XK">Kosovo</territory>
+			<territory type="YE">Yemen</territory>
+			<territory type="YT">Mayott</territory>
+			<territory type="ZA">Dokxinn Afrika</territory>
+			<territory type="ZM">Zambia</territory>
+			<territory type="ZW">Zimbabwe</territory>
+			<territory type="ZZ">Onollkhi Prant</territory>
 		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="UK">Britix</measurementSystemName>
+			<measurementSystemName type="US">Ameriki</measurementSystemName>
+		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Bhas: {0}</codePattern>
 			<codePattern type="script">Lipi: {0}</codePattern>
@@ -48,9 +518,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[aã b cç d eêẽ f g h iĩ j k l m nñ oôõ p q r s t u v w x y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[áàăâåäā æ éèĕëē íìĭîïī óòŏöøō œ úùŭûüū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters>[aã b cç d eêẽ f g h iĩ j k l m nñ oôõø p q r s t u v w x y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[áàăâåäā æ éèĕëē íìĭîïī óòŏöō œ úùŭûüū ÿ]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” « » ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@@ -85,6 +555,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0} 'vaztam'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'vaztam'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -93,33 +566,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0} 'vaztam'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'vaztam'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">B h 'vaztam'</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h 'vaztam'</dateFormatItem>
+						<dateFormatItem id="EBhm">E B h:mm 'vaztam'</dateFormatItem>
+						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E a h 'vaztam'</dateFormatItem>
+						<dateFormatItem id="Ehm">E a h:mm </dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d-M-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d-M-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
 						<dateFormatItem id="h">a h</dateFormatItem>
+						<dateFormatItem id="H">HH'v'</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">a h 'vaztam' v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'v' v</dateFormatItem>
 						<dateFormatItem id="Md">d-M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -139,10 +622,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h 'vaztam'</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -288,6 +771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="3">Mar</month>
 							<month type="4">Abr</month>
 							<month type="5">Mai</month>
+							<month type="6">Jun</month>
 							<month type="7">Jul</month>
 							<month type="8">Ago</month>
 							<month type="9">Set</month>
@@ -295,20 +779,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">Nov</month>
 							<month type="12">Dez</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Janer</month>
 							<month type="2">Febrer</month>
@@ -352,15 +822,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Suk</day>
 							<day type="sat">Son</day>
 						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">A</day>
-							<day type="mon">S</day>
-							<day type="tue">M</day>
-							<day type="wed">B</day>
-							<day type="thu">B</day>
-							<day type="fri">S</day>
-							<day type="sat">S</day>
-						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">Ai</day>
 							<day type="mon">Sm</day>
@@ -404,30 +865,76 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="1">1lem timhoinallem</quarter>
 							<quarter type="2">2rem timhoinallem</quarter>
 							<quarter type="3">3rem timhoinallem</quarter>
-							<quarter type="4">4tem timhoinallem</quarter>
+							<quarter type="4">4them timhoinallem</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1">1lem timhoinallem</quarter>
+							<quarter type="2">2rem timhoinallem</quarter>
+							<quarter type="3">3rem timhoinallem</quarter>
+							<quarter type="4">4them timhoinallem</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">modhyan</dayPeriod>
+							<dayPeriod type="morning1">sokall</dayPeriod>
+							<dayPeriod type="afternoon1">donpar</dayPeriod>
+							<dayPeriod type="evening1">sanj</dayPeriod>
+							<dayPeriod type="night1">rat</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">md</dayPeriod>
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">sk</dayPeriod>
+							<dayPeriod type="afternoon1">dp</dayPeriod>
+							<dayPeriod type="evening1">sj</dayPeriod>
+							<dayPeriod type="night1">rt</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">modhyanrat</dayPeriod>
 							<dayPeriod type="am">sokallim</dayPeriod>
 							<dayPeriod type="pm">sanje</dayPeriod>
+							<dayPeriod type="morning1">sokallim</dayPeriod>
+							<dayPeriod type="afternoon1">donparam</dayPeriod>
+							<dayPeriod type="evening1">sanje</dayPeriod>
+							<dayPeriod type="night1">rati</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="midnight">modhyan</dayPeriod>
+							<dayPeriod type="morning1">sokall</dayPeriod>
+							<dayPeriod type="afternoon1">donpar</dayPeriod>
+							<dayPeriod type="evening1">sanj</dayPeriod>
+							<dayPeriod type="night1">rat</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">md</dayPeriod>
+							<dayPeriod type="morning1">sk</dayPeriod>
+							<dayPeriod type="afternoon1">dp</dayPeriod>
+							<dayPeriod type="evening1">sj</dayPeriod>
+							<dayPeriod type="night1">rt</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="midnight">modhyanrat</dayPeriod>
 							<dayPeriod type="am">sokallim</dayPeriod>
 							<dayPeriod type="pm">sanje</dayPeriod>
+							<dayPeriod type="morning1">sokallim</dayPeriod>
+							<dayPeriod type="afternoon1">donparam</dayPeriod>
+							<dayPeriod type="evening1">sanje</dayPeriod>
+							<dayPeriod type="night1">rati</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">Krista Adim</era>
-						<era type="0" alt="variant">KA</era>
 						<era type="1">Anno Domini</era>
-						<era type="1" alt="variant">AD</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">KA</era>
@@ -490,6 +997,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0} 'vaztam'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'vaztam'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -498,48 +1008,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0} 'vaztam'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'vaztam'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bh">B h 'vaztam'</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h 'vaztam'</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Eh">E a h 'vaztam'</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d-M-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d-M-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="h">a h</dateFormatItem>
+						<dateFormatItem id="h">a h 'vaztam'</dateFormatItem>
+						<dateFormatItem id="H">HH'v'</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="hv">a h 'vaztam' v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'v' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">dd-MM, E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">MMMM -'acho' 'suman' W</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM -'acho' 'suman' W</dateFormatItem>
-						<dateFormatItem id="yM">M-y</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d-M-y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, d-M-y</dateFormatItem>
 						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
@@ -548,12 +1062,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">Y -'acho' 'suman' w</dateFormatItem>
 						<dateFormatItem id="yw" count="other">Y -'acho' 'suman' w</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">B h – B h</greatestDifference>
-							<greatestDifference id="h">B h – h</greatestDifference>
+							<greatestDifference id="B">B h 'vaztam' – B h 'vaztam'</greatestDifference>
+							<greatestDifference id="h">B h – h 'vaztam'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
 							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
@@ -563,10 +1078,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">y G – y G</greatestDifference>
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
 							<greatestDifference id="M">M/y – M/y G</greatestDifference>
@@ -602,11 +1113,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">a h – a h</greatestDifference>
-							<greatestDifference id="h">a h–h</greatestDifference>
+							<greatestDifference id="a">a h 'vaztam' – a h 'vaztam'</greatestDifference>
+							<greatestDifference id="h">a h–h 'vaztam'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH – HH</greatestDifference>
+							<greatestDifference id="H">HH–HH'v'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
@@ -627,11 +1138,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">a h – a h v</greatestDifference>
-							<greatestDifference id="h">a h–h v</greatestDifference>
+							<greatestDifference id="a">a h 'vaztam' – a h 'vaztam' v</greatestDifference>
+							<greatestDifference id="h">a h–h 'vaztam' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH – HH v</greatestDifference>
+							<greatestDifference id="H">HH–HH'v' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
@@ -698,45 +1209,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="era">
 				<displayName>yug</displayName>
 			</field>
-			<field type="era-short">
-				<displayName>yug</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName>yug</displayName>
-			</field>
 			<field type="year">
 				<displayName>voros</displayName>
-				<relative type="-1">fattlem voros</relative>
-				<relative type="0">hem voros</relative>
+				<relative type="-1">porum</relative>
+				<relative type="0">ondum</relative>
 				<relative type="1">fuddlem voros</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} vorsan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} vorsanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} voros adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} vorsam adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName>voros</displayName>
-				<relative type="-1">fattlem voros</relative>
-				<relative type="0">hem voros</relative>
+				<relative type="-1">porum</relative>
+				<relative type="0">ondum</relative>
 				<relative type="1">fuddlem voros</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} vorsan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} vorsanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} voros adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} vorsam adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName>voros</displayName>
-				<relative type="-1">fattlem voros</relative>
-				<relative type="0">hem voros</relative>
+				<relative type="-1">porum</relative>
+				<relative type="0">ondum</relative>
 				<relative type="1">fuddlem voros</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}vorsan</relativeTimePattern>
 					<relativeTimePattern count="other">{0}vorsanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}voros adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}vorsam adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -746,9 +1255,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">hem timhoinallem</relative>
 				<relative type="1">fuddlem timhoinallem</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} timhoinallean</relativeTimePattern>
 					<relativeTimePattern count="other">{0} timhoinalleanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} timhoinallem adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} timhoinalle adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -758,9 +1269,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">hem timho.</relative>
 				<relative type="1">fuddlem timho.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} timhoinallean</relativeTimePattern>
 					<relativeTimePattern count="other">{0} timhoinalleanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} timho. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} timho. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -770,9 +1283,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">hem timh</relative>
 				<relative type="1">fuddlem timh</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}timhoinallean</relativeTimePattern>
 					<relativeTimePattern count="other">{0}timhoinalleanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}timh adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}timh adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -782,9 +1297,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho mhoino</relative>
 				<relative type="1">fuddlo mhoino</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} mhoinean</relativeTimePattern>
 					<relativeTimePattern count="other">{0} mhoineanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mhoino adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} mhoine adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -794,9 +1311,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho mho.</relative>
 				<relative type="1">fuddlo mho.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} mhoinean</relativeTimePattern>
 					<relativeTimePattern count="other">{0} mhoineanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} mho. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} mho. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -806,9 +1325,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho mh</relative>
 				<relative type="1">fuddlo mh</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}mhoinean</relativeTimePattern>
 					<relativeTimePattern count="other">{0}mhoineanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}mh adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}mh adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -818,25 +1339,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho suman</relative>
 				<relative type="1">fuddlo suman</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sumanan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} sumananim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} suman adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} suman adim</relativeTimePattern>
 				</relativeTime>
 				<relativePeriod>{0} cho suman</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName>suman</displayName>
-				<relative type="-1">fattlo suman</relative>
-				<relative type="0">ho suman</relative>
-				<relative type="1">fuddlo suman</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sumanan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} sumananim</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} suman adim</relativeTimePattern>
-				</relativeTime>
-				<relativePeriod>{0} cho suman</relativePeriod>
 			</field>
 			<field type="week-narrow">
 				<displayName>sum</displayName>
@@ -844,9 +1360,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho sum</relative>
 				<relative type="1">fuddlo sum</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}sumanan</relativeTimePattern>
 					<relativeTimePattern count="other">{0}sumananim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}sum adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}sum adim</relativeTimePattern>
 				</relativeTime>
 				<relativePeriod>{0} cho sum</relativePeriod>
@@ -854,9 +1372,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekOfMonth">
 				<displayName>mhoineacho suman</displayName>
 			</field>
-			<field type="weekOfMonth-short">
-				<displayName>mhoineacho suman</displayName>
-			</field>
 			<field type="weekOfMonth-narrow">
 				<displayName>mhoineacho sum.</displayName>
 			</field>
@@ -866,23 +1381,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">aiz</relative>
 				<relative type="1">faleam</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} disan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} disanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} dis adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} dis adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName>dis</displayName>
-				<relative type="-1">kal</relative>
-				<relative type="0">aiz</relative>
-				<relative type="1">faleam</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} disan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} disanim</relativeTimePattern>
 				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} dis adim</relativeTimePattern>
-				</relativeTime>
 			</field>
 			<field type="day-narrow">
 				<displayName>d</displayName>
@@ -890,38 +1401,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">aiz</relative>
 				<relative type="1">fal</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}disan</relativeTimePattern>
 					<relativeTimePattern count="other">{0}disanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}d adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}d adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayOfYear">
 				<displayName>vorsacho dis</displayName>
 			</field>
-			<field type="dayOfYear-short">
-				<displayName>vorsacho dis</displayName>
-			</field>
 			<field type="dayOfYear-narrow">
 				<displayName>vorsacho d.</displayName>
 			</field>
 			<field type="weekday">
 				<displayName>sumanacho dis</displayName>
 			</field>
-			<field type="weekday-short">
-				<displayName>sumanacho dis</displayName>
-			</field>
 			<field type="weekday-narrow">
 				<displayName>sumanacho d.</displayName>
 			</field>
+			<field type="weekdayOfMonth">
+				<displayName>mhoineant disacho prosong</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName>mhoineant disacho prosong</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName>mhoineant disacho prosong</displayName>
+			</field>
 			<field type="sun">
 				<relative type="-1">fattlo Aitar</relative>
 				<relative type="0">ho Aitar</relative>
 				<relative type="1">fuddlo Aitar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Aitaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Aitaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Aitar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Aitaram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -930,9 +1448,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Ait.</relative>
 				<relative type="1">fuddlo Ait.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Aitaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Aitaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Ait. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Ait. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -941,9 +1461,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Ai</relative>
 				<relative type="1">fuddlo Ai</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Aitaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Aitaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Ai adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Ai adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -952,9 +1474,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Somar</relative>
 				<relative type="1">fuddlo Somar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Somaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Somaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Somar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Somaram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -963,9 +1487,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Som.</relative>
 				<relative type="1">fuddlo Som.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Somaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Somaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Som. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Som. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -974,9 +1500,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Sm</relative>
 				<relative type="1">fuddlo Sm</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Somaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Somaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Sm adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sm adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -985,9 +1513,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Mongllar</relative>
 				<relative type="1">fuddlo Mongllar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Mongllaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Mongllaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Mongllar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Mongllaram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -996,9 +1526,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Mon.</relative>
 				<relative type="1">fuddlo Mon.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Mongllaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Mongllaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Mon. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Mon. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1007,9 +1539,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Mg</relative>
 				<relative type="1">fuddlo Mg</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Mongllaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Mongllaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Mg adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Mg adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1018,9 +1552,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Budhvar</relative>
 				<relative type="1">fuddlo Budhvar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Budhvaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Budhvaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Budhvar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Budhvaram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1029,9 +1565,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Bud.</relative>
 				<relative type="1">fuddlo Bud.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Budhvaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Budhvaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Bud. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Bud. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1040,9 +1578,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Bu</relative>
 				<relative type="1">fuddlo Bu</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Budhvaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Budhvaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Bu adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Bu adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1051,9 +1591,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Birestar</relative>
 				<relative type="1">fuddlo Birestar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Birestaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Birestaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Birestar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Birestaram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1062,9 +1604,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Bre.</relative>
 				<relative type="1">fuddlo Bre.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Birestaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Birestaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Bre. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Bre. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1073,9 +1617,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Br</relative>
 				<relative type="1">fuddlo Br</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Birestaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Birestaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Br adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Br adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1084,9 +1630,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Sukrar</relative>
 				<relative type="1">fuddlo Sukrar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Sukraran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sukraranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Sukrar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sukraram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1095,9 +1643,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Suk.</relative>
 				<relative type="1">fuddlo Suk.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Sukraran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sukraranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Suk. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Suk. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1106,9 +1656,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Su</relative>
 				<relative type="1">fuddlo Su</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Sukraran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sukraranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Su adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Su adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1117,9 +1669,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Sonvar</relative>
 				<relative type="1">fuddlo Sonvar</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Sonvaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sonvaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Sonvar adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sonvaram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1128,9 +1682,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Son.</relative>
 				<relative type="1">fuddlo Son.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Sonvaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sonvaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Son. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Son. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1139,48 +1695,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ho Sn</relative>
 				<relative type="1">fuddlo Sn</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} Sonvaran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sonvaranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} Sn adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} Sn adim</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="dayperiod-short">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="dayperiod">
 				<displayName>AM/PM</displayName>
 			</field>
-			<field type="dayperiod-narrow">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="hour">
 				<displayName>vor</displayName>
 				<relative type="0">hem vor</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} voran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} voranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} vor adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} voram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>vor</displayName>
-				<relative type="0">hem vor</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} voran</relativeTimePattern>
 					<relativeTimePattern count="other">{0} voranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} vor adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} voram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
-				<displayName>vor</displayName>
-				<relative type="0">hem vor</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}voran</relativeTimePattern>
 					<relativeTimePattern count="other">{0}voranim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}vor adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}voram adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1188,9 +1742,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>minut</displayName>
 				<relative type="0">ho minut</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} mintan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} mintanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} minut adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} mintam adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1198,9 +1754,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>min.</displayName>
 				<relative type="0">ho min.</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} mintan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} min.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} min. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} min. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1208,9 +1766,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>min</displayName>
 				<relative type="0">ho min</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}mintan</relativeTimePattern>
 					<relativeTimePattern count="other">{0}min</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}min adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}min adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1218,29 +1778,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>sekond</displayName>
 				<relative type="0">atam</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sekondan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} sekondanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sekond adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} sekond adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>sek.</displayName>
-				<relative type="0">atam</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} sekondan</relativeTimePattern>
 					<relativeTimePattern count="other">{0} sekondanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} sek. adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0} sek. adim</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
 				<displayName>sek</displayName>
-				<relative type="0">atam</relative>
 				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}sekondan</relativeTimePattern>
 					<relativeTimePattern count="other">{0}sekondanim</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}sek adim</relativeTimePattern>
 					<relativeTimePattern count="other">{0}sek adim</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1250,29 +1814,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="zone-short">
 				<displayName>kxetr</displayName>
 			</field>
-			<field type="zone-narrow">
-				<displayName>kxetr</displayName>
-			</field>
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0} Vell</regionFormat>
-			<regionFormat type="daylight">{0} Dis-uzvadd vachovp Vell</regionFormat>
+			<regionFormat type="daylight">{0} Dis-uzvadd Vachovp Vell</regionFormat>
 			<regionFormat type="standard">{0} Promann Vell</regionFormat>
+			<zone type="Etc/UTC">
+				<long>
+					<standard>Vixvacho Somonvoyit Vell</standard>
+				</long>
+			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Onollkhi Zago</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Kolkata, Bombaim, Ponnji</exemplarCity>
+			</zone>
 			<metazone type="GMT">
 				<long>
-					<standard>Greenwich Mean Time</standard>
+					<standard>Greenwich Promann Vell</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
-		<decimalFormats numberSystem="deva">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
@@ -1315,7 +1880,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="deva">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -1323,219 +1893,817 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other">¤0hoz</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0hoz</pattern>
 					<pattern type="10000" count="other">¤00hoz</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00hoz</pattern>
 					<pattern type="100000" count="other">¤0lak</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 0lak</pattern>
 					<pattern type="1000000" count="other">¤00lak</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00lak</pattern>
 					<pattern type="10000000" count="other">¤0ko</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0ko</pattern>
 					<pattern type="100000000" count="other">¤00ko</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 00ko</pattern>
 					<pattern type="1000000000" count="other">¤0obz</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0obz</pattern>
 					<pattern type="10000000000" count="other">¤00obz</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00obz</pattern>
 					<pattern type="100000000000" count="other">¤0nikh</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0nikh</pattern>
 					<pattern type="1000000000000" count="other">¤00nikh</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 00nikh</pattern>
 					<pattern type="10000000000000" count="other">¤000nikh</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 000nikh</pattern>
 					<pattern type="100000000000000" count="other">¤0hoz'.'nikh'.'</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 0hoz'.'nikh'.'</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
+		<minimalPairs>
+			<pluralMinimalPairs count="one">{0} vantto</pluralMinimalPairs>
+			<pluralMinimalPairs count="other">{0} vantte</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">{0}vya uzvya vatten voch.</ordinalMinimalPairs>
+		</minimalPairs>
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>maikro{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} dor {1}</compoundUnitPattern>
+			</compoundUnit>
+			<compoundUnit type="power2">
+				<compoundUnitPattern1 count="one">choukon {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">choukon {0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="one">ghon {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">ghon {0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="times">
+				<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="angle-degree">
+				<displayName>onx</displayName>
+				<unitPattern count="one">{0} onx</unitPattern>
+				<unitPattern count="other">{0} onx</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>choukon kilomiter</displayName>
+				<unitPattern count="one">{0} choukon kilomiter</unitPattern>
+				<unitPattern count="other">{0} choukon kilomiter</unitPattern>
+				<perUnitPattern>{0} dor choukon kilomiter</perUnitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>choukon miter</displayName>
+				<unitPattern count="one">{0} choukon miter</unitPattern>
+				<unitPattern count="other">{0} choukon miter</unitPattern>
+				<perUnitPattern>{0} dor choukon miter</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>choukon centimiter</displayName>
+				<unitPattern count="one">{0} choukon centimiter</unitPattern>
+				<unitPattern count="other">{0} choukon centimiter</unitPattern>
+				<perUnitPattern>{0} dor choukon centimiter</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>choukon mil</displayName>
+				<unitPattern count="one">{0} choukon mil</unitPattern>
+				<unitPattern count="other">{0} choukon mil</unitPattern>
+				<perUnitPattern>{0} dor choukon mil</perUnitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>choukon yard</displayName>
+				<unitPattern count="one">{0} choukon yard</unitPattern>
+				<unitPattern count="other">{0} choukon yard</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>choukon fut</displayName>
+				<unitPattern count="one">{0} choukon fut</unitPattern>
+				<unitPattern count="other">{0} choukon fut</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>choukon inch</displayName>
+				<unitPattern count="one">{0} choukon inch</unitPattern>
+				<unitPattern count="other">{0} choukon inch</unitPattern>
+				<perUnitPattern>{0} dor choukon inch</perUnitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>petabayt</displayName>
+				<unitPattern count="one">{0} petabayt</unitPattern>
+				<unitPattern count="other">{0} petabayt</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>terabayt</displayName>
+				<unitPattern count="one">{0} terabayt</unitPattern>
+				<unitPattern count="other">{0} terabayt</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<unitPattern count="one">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabayt</displayName>
+				<unitPattern count="one">{0} gigabayt</unitPattern>
+				<unitPattern count="other">{0} gigabayt</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="one">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabayt</displayName>
+				<unitPattern count="one">{0} megabayt</unitPattern>
+				<unitPattern count="other">{0} megabayt</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="one">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobayt</displayName>
+				<unitPattern count="one">{0} kilobayt</unitPattern>
+				<unitPattern count="other">{0} kilobayt</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="one">{0} kilobit</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
 			<unit type="duration-century">
 				<displayName>xekdde</displayName>
+				<unitPattern count="one">{0} xekddo</unitPattern>
 				<unitPattern count="other">{0} xekdde</unitPattern>
 			</unit>
 			<unit type="duration-decade">
 				<displayName>doskam</displayName>
+				<unitPattern count="one">{0} dosok</unitPattern>
 				<unitPattern count="other">{0} doskam</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName>vorsam</displayName>
+				<unitPattern count="one">{0} voros</unitPattern>
 				<unitPattern count="other">{0} vorsam</unitPattern>
 				<perUnitPattern>dor voros {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<displayName>timhoinalle</displayName>
+				<unitPattern count="one">{0} timhoinallem</unitPattern>
 				<unitPattern count="other">{0} timhoinalle</unitPattern>
 				<perUnitPattern>{0}/timhoinallem</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mhoine</displayName>
+				<unitPattern count="one">{0} mhoino</unitPattern>
 				<unitPattern count="other">{0} mhoine</unitPattern>
 				<perUnitPattern>dor mhoino {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName>suman</displayName>
-				<unitPattern count="other">{0} suman</unitPattern>
 				<perUnitPattern>dor sumanak {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName>dis</displayName>
-				<unitPattern count="other">{0} dis</unitPattern>
 				<perUnitPattern>dor disa {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>voram</displayName>
+				<unitPattern count="one">{0} vor</unitPattern>
 				<unitPattern count="other">{0} voram</unitPattern>
 				<perUnitPattern>dor vora {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>mintam</displayName>
+				<unitPattern count="one">{0} minut</unitPattern>
 				<unitPattern count="other">{0} mintam</unitPattern>
 				<perUnitPattern>dor minut {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sekond</displayName>
+				<unitPattern count="one">{0} sekond</unitPattern>
 				<unitPattern count="other">{0} sekond</unitPattern>
 				<perUnitPattern>dor sekond {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>milisekond</displayName>
+				<unitPattern count="one">{0} milisekond</unitPattern>
 				<unitPattern count="other">{0} milisekond</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>maikrosekond</displayName>
+				<unitPattern count="one">{0} maikrosekond</unitPattern>
 				<unitPattern count="other">{0} maikrosekond</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosekond</displayName>
+				<unitPattern count="one">{0} nanosekond</unitPattern>
 				<unitPattern count="other">{0} nanosekond</unitPattern>
 			</unit>
+			<unit type="graphics-pixel">
+				<displayName>chitr-totvam</displayName>
+				<unitPattern count="one">{0} chitr-totv</unitPattern>
+				<unitPattern count="other">{0} chitr-totvam</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>mega-chitr-totvam</displayName>
+				<unitPattern count="one">{0} mega-chitr-totv</unitPattern>
+				<unitPattern count="other">{0} mega-chitr-totvam</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName>dor centimiterak chitr-totvam</displayName>
+				<unitPattern count="one">{0} dor centimiterak chitr-totv</unitPattern>
+				<unitPattern count="other">{0} dor centimiterak chitr-totvam</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>dor inchak chitr-totvam</displayName>
+				<unitPattern count="one">{0} dor inchak chitr-totv</unitPattern>
+				<unitPattern count="other">{0} dor inchak chitr-totvam</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>kilomiter</displayName>
+				<unitPattern count="one">{0} kilomiter</unitPattern>
+				<unitPattern count="other">{0} kilomiter</unitPattern>
+				<perUnitPattern>{0} dor kilomiter</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>miter</displayName>
+				<unitPattern count="one">{0} miter</unitPattern>
+				<unitPattern count="other">{0} miter</unitPattern>
+				<perUnitPattern>{0} per miter</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimiter</displayName>
+				<unitPattern count="one">{0} decimiter</unitPattern>
+				<unitPattern count="other">{0} decimiter</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>centimiter</displayName>
+				<unitPattern count="one">{0} centimiter</unitPattern>
+				<unitPattern count="other">{0} centimiter</unitPattern>
+				<perUnitPattern>{0} dor centimiter</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>millimiter</displayName>
+				<unitPattern count="one">{0} millimiter</unitPattern>
+				<unitPattern count="other">{0} millimiter</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>maikromiter</displayName>
+				<unitPattern count="one">{0} maikromiter</unitPattern>
+				<unitPattern count="other">{0} maikromiter</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanomiter</displayName>
+				<unitPattern count="one">{0} nanomiter</unitPattern>
+				<unitPattern count="other">{0} nanomiter</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picomiter</displayName>
+				<unitPattern count="one">{0} picomiter</unitPattern>
+				<unitPattern count="other">{0} picomiter</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+				<unitPattern count="one">{0} mil</unitPattern>
+				<unitPattern count="other">{0} mil</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>paund dor choukon inch</displayName>
+				<unitPattern count="one">{0} paund dor choukon inch</unitPattern>
+				<unitPattern count="other">{0} paund dor choukon inch</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>onx tapman</displayName>
+				<unitPattern count="one">{0} onx tapman</unitPattern>
+				<unitPattern count="other">{0} onx tapman</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>onx Celsius</displayName>
+				<unitPattern count="one">{0} onx Celsius</unitPattern>
+				<unitPattern count="other">{0} onx Celsius</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>onx Fahrenheit</displayName>
+				<unitPattern count="one">{0} onx Fahrenheit</unitPattern>
+				<unitPattern count="other">{0} onx Fahrenheit</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>ghon kilomiter</displayName>
+				<unitPattern count="one">{0} ghon kilomiter</unitPattern>
+				<unitPattern count="other">{0} ghon kilomiter</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>ghon miter</displayName>
+				<unitPattern count="one">{0} ghon miter</unitPattern>
+				<unitPattern count="other">{0} ghon miter</unitPattern>
+				<perUnitPattern>{0} dor ghon miter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ghon centimiter</displayName>
+				<unitPattern count="one">{0} ghon centimiter</unitPattern>
+				<unitPattern count="other">{0} ghon centimiter</unitPattern>
+				<perUnitPattern>{0} dor ghon centimiter</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>ghon mil</displayName>
+				<unitPattern count="one">{0} ghon mil</unitPattern>
+				<unitPattern count="other">{0} ghon mil</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ghon yard</displayName>
+				<unitPattern count="one">{0} ghon yard</unitPattern>
+				<unitPattern count="other">{0} ghon yard</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ghon fut</displayName>
+				<unitPattern count="one">{0} ghon fut</unitPattern>
+				<unitPattern count="other">{0} ghon fut</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>ghon inch</displayName>
+				<unitPattern count="one">{0} ghon inch</unitPattern>
+				<unitPattern count="other">{0} ghon inch</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>pondros</displayName>
+				<unitPattern count="one">{0} pondros</unitPattern>
+				<unitPattern count="other">{0} pondros</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>rati</displayName>
+				<unitPattern count="one">{0} rat</unitPattern>
 				<unitPattern count="other">{0} rati</unitPattern>
 				<perUnitPattern>dor rat {0}</perUnitPattern>
 			</unit>
+			<coordinateUnit>
+				<displayName>mukhel dixa</displayName>
+				<coordinateUnitPattern type="east">{0} udent</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ut’tor</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} dokxin</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} Ostont</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="angle-degree">
+				<displayName>onx</displayName>
+				<unitPattern count="one">{0} onx</unitPattern>
+				<unitPattern count="other">{0} onx</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>PBayt</displayName>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TBayt</displayName>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tbit</displayName>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GBayt</displayName>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gbit</displayName>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MBayt</displayName>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mbit</displayName>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kBayt</displayName>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kbit</displayName>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>bayt</displayName>
+				<unitPattern count="one">{0} bayt</unitPattern>
+				<unitPattern count="other">{0} bayt</unitPattern>
+			</unit>
 			<unit type="duration-century">
 				<displayName>x</displayName>
+				<unitPattern count="one">{0} x</unitPattern>
 				<unitPattern count="other">{0} x</unitPattern>
 			</unit>
 			<unit type="duration-decade">
 				<displayName>dos</displayName>
+				<unitPattern count="one">{0} dos</unitPattern>
 				<unitPattern count="other">{0} dos</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>vorsam</displayName>
+				<unitPattern count="one">{0} voros</unitPattern>
 				<unitPattern count="other">{0} vorsam</unitPattern>
 				<perUnitPattern>{0}/voros</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<displayName>timho</displayName>
+				<unitPattern count="one">{0} timho</unitPattern>
 				<unitPattern count="other">{0} timho</unitPattern>
 				<perUnitPattern>{0}/timho</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mho</displayName>
+				<unitPattern count="one">{0} mho</unitPattern>
 				<unitPattern count="other">{0} mho</unitPattern>
 				<perUnitPattern>{0}/mho</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<displayName>suman</displayName>
+				<unitPattern count="one">{0} suman</unitPattern>
 				<unitPattern count="other">{0} suman</unitPattern>
 				<perUnitPattern>{0}/suman</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dis</displayName>
+				<unitPattern count="one">{0} dis</unitPattern>
 				<unitPattern count="other">{0} dis</unitPattern>
 				<perUnitPattern>{0}/dis</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>voram</displayName>
+				<unitPattern count="one">{0} vor</unitPattern>
 				<unitPattern count="other">{0} vor</unitPattern>
 				<perUnitPattern>{0}/vor</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
+				<unitPattern count="one">{0} sek</unitPattern>
 				<unitPattern count="other">{0} sek</unitPattern>
 				<perUnitPattern>{0}/sek</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<displayName>msek</displayName>
+				<unitPattern count="one">{0} msek</unitPattern>
 				<unitPattern count="other">{0} msek</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
 				<displayName>μsek</displayName>
+				<unitPattern count="one">{0} μsek</unitPattern>
 				<unitPattern count="other">{0} μsek</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nanosek</displayName>
+				<unitPattern count="one">{0} nsek</unitPattern>
 				<unitPattern count="other">{0} nsek</unitPattern>
 			</unit>
+			<unit type="graphics-pixel">
+				<displayName>chitr-totvam</displayName>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>mega-chitr-totvam</displayName>
+			</unit>
+			<unit type="length-mile">
+				<displayName>mil</displayName>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>onx tapman</displayName>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>onx C</displayName>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>onx F</displayName>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>pondr</displayName>
+				<unitPattern count="one">{0} pondr</unitPattern>
+				<unitPattern count="other">{0} pondr</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>rati</displayName>
+				<unitPattern count="one">{0} rat</unitPattern>
 				<unitPattern count="other">{0} rati</unitPattern>
 				<perUnitPattern>{0}/rat</perUnitPattern>
 			</unit>
+			<coordinateUnit>
+				<displayName>dixa</displayName>
+				<coordinateUnitPattern type="east">{0} UD</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} UT</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} DO</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} OS</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="angle-degree">
+				<displayName>onx</displayName>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>PBayt</displayName>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TBayt</displayName>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GBayt</displayName>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MBayt</displayName>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kBayt</displayName>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0}B</unitPattern>
+				<unitPattern count="other">{0}B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one">{0}bit</unitPattern>
+				<unitPattern count="other">{0}bit</unitPattern>
+			</unit>
 			<unit type="duration-century">
-				<displayName>x</displayName>
+				<unitPattern count="one">{0}x</unitPattern>
 				<unitPattern count="other">{0}x</unitPattern>
 			</unit>
 			<unit type="duration-decade">
-				<displayName>dos</displayName>
+				<unitPattern count="one">{0}dos</unitPattern>
 				<unitPattern count="other">{0}dos</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName>vorsam</displayName>
+				<unitPattern count="one">{0}voros</unitPattern>
 				<unitPattern count="other">{0}vorsam</unitPattern>
-				<perUnitPattern>{0}/voros</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName>timho</displayName>
+				<unitPattern count="one">{0}timho</unitPattern>
 				<unitPattern count="other">{0}timho</unitPattern>
-				<perUnitPattern>{0}/timho</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<displayName>mho</displayName>
+				<unitPattern count="one">{0}mho</unitPattern>
 				<unitPattern count="other">{0}mho</unitPattern>
-				<perUnitPattern>{0}/mho</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<displayName>sum</displayName>
+				<unitPattern count="one">{0}sum</unitPattern>
 				<unitPattern count="other">{0}sum</unitPattern>
 				<perUnitPattern>{0}/sum</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>d</displayName>
+				<unitPattern count="one">{0}d</unitPattern>
 				<unitPattern count="other">{0}d</unitPattern>
+				<perUnitPattern>{0}/d</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>vor</displayName>
+				<unitPattern count="one">{0}vor</unitPattern>
 				<unitPattern count="other">{0}vor</unitPattern>
-				<perUnitPattern>{0}/vor</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
+				<unitPattern count="one">{0}min</unitPattern>
 				<unitPattern count="other">{0}min</unitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName>sek</displayName>
+				<unitPattern count="one">{0}sek</unitPattern>
 				<unitPattern count="other">{0}sek</unitPattern>
-				<perUnitPattern>{0}/sek</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
-				<displayName>msek</displayName>
+				<unitPattern count="one">{0}msek</unitPattern>
 				<unitPattern count="other">{0}msek</unitPattern>
 			</unit>
 			<unit type="duration-microsecond">
-				<displayName>μsek</displayName>
+				<unitPattern count="one">{0}μsek</unitPattern>
 				<unitPattern count="other">{0}μsek</unitPattern>
 			</unit>
 			<unit type="duration-nanosecond">
 				<displayName>nsek</displayName>
+				<unitPattern count="one">{0}nsek</unitPattern>
 				<unitPattern count="other">{0}nsek</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>rati</displayName>
-				<unitPattern count="other">{0}rati</unitPattern>
-				<perUnitPattern>{0}/rat</perUnitPattern>
+			<unit type="duration-fortnight">
+				<displayName>pondr</displayName>
+				<unitPattern count="one">{0} pondr</unitPattern>
+				<unitPattern count="other">{0} pondr</unitPattern>
 			</unit>
+			<unit type="duration-night">
+				<unitPattern count="one">{0}rat</unitPattern>
+				<unitPattern count="other">{0}rati</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>dixa</displayName>
+				<coordinateUnitPattern type="east">{0}UD</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}UT</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}DO</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}OS</coordinateUnitPattern>
+			</coordinateUnit>
 		</unitLength>
 	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="end">{0}, ani {1}</listPatternPart>
+			<listPatternPart type="2">{0} ani {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or">
+			<listPatternPart type="end">{0}, vo {1}</listPatternPart>
+			<listPatternPart type="2">{0} vo {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-narrow">
+			<listPatternPart type="end">{0}, vo {1}</listPatternPart>
+			<listPatternPart type="2">{0} vo {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="end">{0}, vo {1}</listPatternPart>
+			<listPatternPart type="2">{0} vo {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="end">{0}, &amp; {1}</listPatternPart>
+			<listPatternPart type="2">{0} &amp; {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="2">{0} ani {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0} {1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
+			<listPatternPart type="end">{0} {1}</listPatternPart>
+			<listPatternPart type="2">{0} {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr>hoi:h</yesstr>
+			<nostr>na:n</nostr>
+		</messages>
+	</posix>
+	<personNames>
+		<nameOrderLocales order="givenFirst">und kok kok_Latn</nameOrderLocales>
+		<parameterDefault parameter="formality">informal</parameterDefault>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{title} {given} {given2} {surname} {surname2} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="formal">
+			<namePattern>{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-allCaps}{surname2-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}{surname-monogram-allCaps}{surname2-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{given} {given2-initial} {surname} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{given-initial} {given2-initial} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname-initial}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{surname} {surname2} {title} {given} {given2} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{surname} {surname2} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname} {given} {given2-initial} {generation}, {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname} {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{surname} {given-initial} {given2-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{surname} {given-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="informal">
+			<namePattern>{surname} {surname2}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<sampleName item="nativeG">
+			<nameField type="given">Prema</nameField>
+		</sampleName>
+		<sampleName item="nativeGS">
+			<nameField type="given">Shanti</nameField>
+			<nameField type="surname">Gaonkar</nameField>
+		</sampleName>
+		<sampleName item="nativeGGS">
+			<nameField type="given">Maria</nameField>
+			<nameField type="given2">Helena</nameField>
+			<nameField type="surname">Fernandes</nameField>
+		</sampleName>
+		<sampleName item="nativeFull">
+			<nameField type="title">Mr.</nameField>
+			<nameField type="given">Francisco Xavier</nameField>
+			<nameField type="given-informal">Forsu</nameField>
+			<nameField type="given2">Joao Anton</nameField>
+			<nameField type="surname-prefix">de</nameField>
+			<nameField type="surname-core">Souza</nameField>
+			<nameField type="surname2">e Menezes</nameField>
+			<nameField type="generation">Dk</nameField>
+			<nameField type="credentials">MP</nameField>
+		</sampleName>
+		<sampleName item="foreignG">
+			<nameField type="given">Sinbad</nameField>
+		</sampleName>
+		<sampleName item="foreignGS">
+			<nameField type="given">Käthe</nameField>
+			<nameField type="surname">Müller</nameField>
+		</sampleName>
+		<sampleName item="foreignGGS">
+			<nameField type="given">Zäzilia</nameField>
+			<nameField type="given2">Hamish</nameField>
+			<nameField type="surname">Stöber</nameField>
+		</sampleName>
+		<sampleName item="foreignFull">
+			<nameField type="title">Prof. Dr.</nameField>
+			<nameField type="given">Ada Cornelia</nameField>
+			<nameField type="given-informal">Neele</nameField>
+			<nameField type="given2">César Martín</nameField>
+			<nameField type="surname-prefix">von</nameField>
+			<nameField type="surname-core">Brühl</nameField>
+			<nameField type="surname2">González Domingo</nameField>
+			<nameField type="generation">Jr</nameField>
+			<nameField type="credentials">MD DDS</nameField>
+		</sampleName>
+	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/ks.xml b/make/data/cldr/common/main/ks.xml
index 5592cc9b897..58b33083aa0 100644
--- a/make/data/cldr/common/main/ks.xml
+++ b/make/data/cldr/common/main/ks.xml
@@ -923,7 +923,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="iso8601">ISO-8601 کیلنڈر</type>
 			<type key="calendar" type="japanese">جاپٲنؠ کیلنڑَر</type>
 			<type key="calendar" type="roc">جموٗریٲتی چیٖنی کیلَنڑَر</type>
-			<type key="collation" type="big5han">رؠوٲتی چیٖنی تِرتیٖب</type>
 			<type key="collation" type="phonebook">فون بُک تَرتیٖب</type>
 			<type key="collation" type="pinyin">آسان بَناونہٕ آمُت چیٖنی پیٖنیَن تَرتیٖب</type>
 			<type key="collation" type="standard">معیٲری ترتیٖب آڈر</type>
@@ -2175,9 +2174,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>نوم پؠنہہ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>اؠنڑربیری</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>کِرِتِماتی</exemplarCity>
 			</zone>
@@ -2846,9 +2842,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>مغربی افریٖقا ٹایِم</generic>
-					<standard>مغربی افریٖقا سٹینڈرڈ ٹایِم</standard>
-					<daylight>مغربی افریٖقا سَمَر ٹایِم</daylight>
+					<standard>مغربی افریٖقا ٹایِم</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3224,6 +3218,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>گُیَنا ٹایِم</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>حَواے اؠلیوٗٹِیَن سٹینڑاڑ ٹایِم</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>حَواے اؠلیوٗٹِیَن ٹایِم</generic>
@@ -3669,6 +3668,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ٹٔرک ٹایِم</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>تُرکی ٹایِم</generic>
+					<standard>تُرکی سٹینڑاڑ ٹایِم</standard>
+					<daylight>تُرکی سَمَر ٹایِم</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>ترکمانستان ٹائم</generic>
diff --git a/make/data/cldr/common/main/ks_Deva.xml b/make/data/cldr/common/main/ks_Deva.xml
index 6cdc96cfc00..26c540fe3cb 100644
--- a/make/data/cldr/common/main/ks_Deva.xml
+++ b/make/data/cldr/common/main/ks_Deva.xml
@@ -115,7 +115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
diff --git a/make/data/cldr/common/main/ksf.xml b/make/data/cldr/common/main/ksf.xml
index d2f9e02e439..aa7a59dc790 100644
--- a/make/data/cldr/common/main/ksf.xml
+++ b/make/data/cldr/common/main/ksf.xml
@@ -557,6 +557,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ksh.xml b/make/data/cldr/common/main/ksh.xml
index 1e34fe41add..43af5f40d04 100644
--- a/make/data/cldr/common/main/ksh.xml
+++ b/make/data/cldr/common/main/ksh.xml
@@ -763,10 +763,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="japanese" draft="contributed">japaanesche Kaländer</type>
 			<type key="calendar" type="persian" draft="contributed">pärsesche Kaländer</type>
 			<type key="calendar" type="roc" draft="contributed">rotschineesesche Kaländer</type>
-			<type key="collation" type="big5han" draft="contributed">zoteert nohm tradizjonäll schineesesch Big5</type>
 			<type key="collation" type="dictionary">zotehrt wi em Wööterbohch</type>
 			<type key="collation" type="ducet">standattmähßesch zotehrt nohm Unicode</type>
-			<type key="collation" type="gb2312han" draft="contributed">zoteert nohm eijfacher schineesesch GB2312</type>
 			<type key="collation" type="phonebook" draft="contributed">zoteert wi em Tollefoonbooch</type>
 			<type key="collation" type="pinyin" draft="contributed">zoteert noh de Pinjin Ömschreff vum Schineesesch</type>
 			<type key="collation" type="search" draft="contributed">Söhke</type>
@@ -1629,9 +1627,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="contributed">Wäß-Affrekaanesche Zigg</generic>
-					<standard draft="contributed">Jewöhnlijje Wäß-Affrekaanesche Zigg</standard>
-					<daylight draft="contributed">Wäß-Affrekaanesche Sommerzigg</daylight>
+					<standard draft="contributed">Wäß-Affrekaanesche Zigg</standard>
 				</long>
 			</metazone>
 			<metazone type="Azores">
@@ -1801,6 +1797,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ku.xml b/make/data/cldr/common/main/ku.xml
index f9e1ec94a62..dc0a5fe47f7 100644
--- a/make/data/cldr/common/main/ku.xml
+++ b/make/data/cldr/common/main/ku.xml
@@ -27,7 +27,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="an">aragonî</language>
 			<language type="ann">obolo</language>
 			<language type="anp">angîkayî</language>
-			<language type="apc">erebîya bakurê şamê</language>
+			<language type="apc">erebîya bakurê Şamê</language>
 			<language type="ar">erebî</language>
 			<language type="ar_001">erebîya modern a standard</language>
 			<language type="arn">mapuçî</language>
@@ -40,7 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="av">avarî</language>
 			<language type="awa">awadhî</language>
 			<language type="ay">aymarayî</language>
-			<language type="az">azerî</language>
+			<language type="az">azerbaycanî</language>
 			<language type="ba">başkîrî</language>
 			<language type="bal">belûcî</language>
 			<language type="ban">balînî</language>
@@ -51,7 +51,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bez">benayî</language>
 			<language type="bg">bulgarî</language>
 			<language type="bgc">haryanvîyî</language>
-			<language type="bgn">belucîya rojavayî</language>
+			<language type="bgn">belûcîya rojavayî</language>
 			<language type="bho">bojpûrî</language>
 			<language type="bi">bîslamayî</language>
 			<language type="bin">bînîyî</language>
@@ -61,10 +61,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bm">bambarayî</language>
 			<language type="bn">bengalî</language>
 			<language type="bo">tîbetî</language>
+			<language type="bqi">bextiyarî</language>
 			<language type="br">bretonî</language>
 			<language type="brx">bodoyî</language>
 			<language type="bs">bosnî</language>
 			<language type="bss">akooseyî</language>
+			<language type="bua">buriat</language>
 			<language type="bug">bugî</language>
 			<language type="byn">blînî</language>
 			<language type="ca">katalanî</language>
@@ -84,12 +86,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="chy">çeyenî</language>
 			<language type="cic">çîkasawî</language>
 			<language type="ckb">kurdî (soranî)</language>
-			<language type="ckb" alt="menu">kurdî (navîn)</language>
+			<language type="ckb" alt="menu">kurdî (navendî)</language>
 			<language type="clc">çilkotînî</language>
 			<language type="co">korsîkayî</language>
+			<language type="cop">qiptî</language>
 			<language type="crg">mîçîfî</language>
 			<language type="crj">krîya rojhilat ya başûrî</language>
-			<language type="crk">kriya bejayî</language>
+			<language type="crk">krîya bejayî</language>
 			<language type="crl">krîya rojhilat ya bakurî</language>
 			<language type="crm">krîya mûsî</language>
 			<language type="crr">zimanê karolina algonquianî</language>
@@ -98,11 +101,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="cu">slavîya kenîseyî</language>
 			<language type="cv">çuvaşî</language>
 			<language type="cy">weylsî</language>
-			<language type="da">danmarkî</language>
+			<language type="da">danîmarkî</language>
 			<language type="dak">dakotayî</language>
 			<language type="dar">dargînî</language>
 			<language type="dav">tayîtayî</language>
 			<language type="de">almanî</language>
+			<language type="de_CH">almanîya bilind a swîsreyî</language>
 			<language type="dgr">dogrîbî</language>
 			<language type="dje">zarma</language>
 			<language type="doi">dogrîyî</language>
@@ -118,8 +122,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eka">ekajukî</language>
 			<language type="el">yûnanî</language>
 			<language type="en">îngilîzî</language>
-			<language type="en_GB">îngilîzî (Qiralîyeta Yekbûyî)</language>
+			<language type="en_GB">îngilîzî (brîtanî)</language>
 			<language type="en_GB" alt="short">îngilîzî (QY)</language>
+			<language type="en_US">îngilîzî (amerîkî)</language>
 			<language type="eo">esperantoyî</language>
 			<language type="es">spanî</language>
 			<language type="es_ES">spanî (Ewropa)</language>
@@ -127,20 +132,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eu">baskî</language>
 			<language type="ewo">ewondoyî</language>
 			<language type="fa">farisî</language>
-			<language type="fa_AF">derî</language>
+			<language type="fa_AF">darî</language>
 			<language type="ff">fulahî</language>
 			<language type="fi">fînî</language>
-			<language type="fil">fîlîpînoyî</language>
+			<language type="fil">fîlîpînî</language>
 			<language type="fj">fîjî</language>
 			<language type="fo">ferî</language>
 			<language type="fon">fonî</language>
 			<language type="fr">fransizî</language>
-			<language type="fr_CA">fransizî (Kanada)</language>
-			<language type="fr_CH">fransizî (Swîsre)</language>
 			<language type="frc">fransizîya kajûnê</language>
 			<language type="frr">frîsîya bakur</language>
 			<language type="fur">frîyolî</language>
-			<language type="fy">frîsî</language>
+			<language type="fy">frîsîya rojavayî</language>
 			<language type="ga">îrlendî</language>
 			<language type="gaa">gayî</language>
 			<language type="gd">gaelîka skotî</language>
@@ -167,7 +170,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hr">xirwatî</language>
 			<language type="hsb">sorbîya jorîn</language>
 			<language type="ht">haîtî</language>
-			<language type="hu">mecarî</language>
+			<language type="hu">macarî</language>
 			<language type="hup">hupayî</language>
 			<language type="hur">halkomelemî</language>
 			<language type="hy">ermenî</language>
@@ -194,13 +197,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ka">gurcî</language>
 			<language type="kaa">kara-kalpakî</language>
 			<language type="kab">kabîlî</language>
-			<language type="kac">cingphoyî</language>
+			<language type="kac">kaçînî</language>
 			<language type="kaj">jju</language>
 			<language type="kam">kambayî</language>
 			<language type="kbd">kabardî</language>
 			<language type="kcg">tyap</language>
 			<language type="kde">makondeyî</language>
 			<language type="kea">kapverdî</language>
+			<language type="kek">qeqçîyî</language>
 			<language type="ken">kenyangî</language>
 			<language type="kfo">koro</language>
 			<language type="kgp">kayingangî</language>
@@ -212,7 +216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kkj">kako</language>
 			<language type="kl">kalalîsûtî</language>
 			<language type="kln">kalencînî</language>
-			<language type="km">ximêrî</language>
+			<language type="km">khmerî</language>
 			<language type="kmb">kîmbunduyî</language>
 			<language type="kn">kannadayî</language>
 			<language type="ko">koreyî</language>
@@ -227,12 +231,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafyayî</language>
 			<language type="ksh">rîpwarî</language>
 			<language type="ku">kurdî (kurmancî)</language>
+			<language type="ku" menu="core">kurdî (kurmancî)</language>
+			<language type="ku" menu="extension">kurmancî</language>
 			<language type="kum">kumikî</language>
 			<language type="kv">komî</language>
 			<language type="kw">kornî</language>
 			<language type="kwk">kwak’walayî</language>
 			<language type="kxv">kuvî</language>
-			<language type="ky">kirgizî</language>
+			<language type="ky">qirgizî</language>
 			<language type="la">latînî</language>
 			<language type="lad">ladînoyî</language>
 			<language type="lag">langî</language>
@@ -243,9 +249,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lij">lîgûrî</language>
 			<language type="lil">lillooet</language>
 			<language type="lkt">lakotayî</language>
+			<language type="lld">ladînî</language>
 			<language type="lmo">lombardî</language>
 			<language type="ln">lingalayî</language>
-			<language type="lo">lawsî</language>
+			<language type="lo">lao</language>
 			<language type="lou">kreyolîya louisianayê</language>
 			<language type="loz">lozî</language>
 			<language type="lrc">lurîya bakur</language>
@@ -259,6 +266,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lus">mizoyî</language>
 			<language type="luy">luhyayî</language>
 			<language type="lv">latvîyayî</language>
+			<language type="lzz">lazî</language>
 			<language type="mad">madurayî</language>
 			<language type="mag">magahî</language>
 			<language type="mai">maithili</language>
@@ -272,6 +280,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mgh">makhuwa-meetto</language>
 			<language type="mgo">meta’</language>
 			<language type="mh">marşalî</language>
+			<language type="mhn">moçenoyî</language>
 			<language type="mi">maorî</language>
 			<language type="mic">mîkmakî</language>
 			<language type="min">mînangkabawî</language>
@@ -289,10 +298,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mul">pirzimanî</language>
 			<language type="mus">krîkî</language>
 			<language type="mwl">mîrandî</language>
+			<language type="mww">hmongîya dawî</language>
 			<language type="my">burmayî</language>
 			<language type="myv">erzayî</language>
 			<language type="mzn">mazenderanî</language>
 			<language type="na">nawrûyî</language>
+			<language type="nan">çînîya mîn nanî</language>
 			<language type="nap">napolîtanî</language>
 			<language type="naq">namayî</language>
 			<language type="nb">norwecî (bokmål)</language>
@@ -333,8 +344,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pap">papyamentoyî</language>
 			<language type="pau">palawî</language>
 			<language type="pcm">pîdgînîya nîjeryayî</language>
+			<language type="pi">palî</language>
 			<language type="pis">pijînî</language>
 			<language type="pl">polonî</language>
+			<language type="pms">piedmontîsî</language>
 			<language type="pqm">malecite-passamaquoddy</language>
 			<language type="prg">prûsyayî</language>
 			<language type="ps">peştûyî</language>
@@ -366,11 +379,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="scn">sicîlî</language>
 			<language type="sco">skotî</language>
 			<language type="sd">sindhî</language>
-			<language type="sdh">kurdîya başûrî</language>
+			<language type="sdh">kurdî (xwarîn)</language>
 			<language type="se">samîya bakur</language>
 			<language type="seh">sena</language>
-			<language type="ses">sonxayî</language>
+			<language type="ses">sennîya koyraboro</language>
 			<language type="sg">sangoyî</language>
+			<language type="sgs">samogîtî</language>
 			<language type="shi">taşelhîtî</language>
 			<language type="shn">şanî</language>
 			<language type="si">kîngalî</language>
@@ -381,7 +395,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="slh">lushootseeda başûrî</language>
 			<language type="sm">samoayî</language>
 			<language type="sma">samîya başûr</language>
-			<language type="smj">samiya lule</language>
+			<language type="smj">samîya lule</language>
 			<language type="smn">samîya înarî</language>
 			<language type="sms">samîya skoltî</language>
 			<language type="sn">şonayî</language>
@@ -396,6 +410,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="str">saanîçî</language>
 			<language type="su">sundanî</language>
 			<language type="suk">sukuma</language>
+			<language type="suz">sunwarî</language>
 			<language type="sv">swêdî</language>
 			<language type="sw">swahîlî</language>
 			<language type="sw_CD">swahîlîya kongoyî</language>
@@ -434,12 +449,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="tyv">tuvanî</language>
 			<language type="tzm">temazîxtî</language>
 			<language type="udm">udmurtî</language>
-			<language type="ug">oygurî</language>
+			<language type="ug">uyxurî</language>
 			<language type="uk">ukraynî</language>
 			<language type="umb">umbunduyî</language>
 			<language type="und">zimanê nenas</language>
 			<language type="ur">urdûyî</language>
 			<language type="uz">ozbekî</language>
+			<language type="vai">vaî</language>
+			<language type="ve">venda</language>
 			<language type="vec">venîsî</language>
 			<language type="vi">vîetnamî</language>
 			<language type="vmw">makhuwayî</language>
@@ -469,58 +486,204 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="zh" alt="menu">çînî, mandarînî</language>
 			<language type="zh_Hans">çînîya sadekirî</language>
 			<language type="zh_Hans" alt="long">çînîya mandarînî ya sadekirî</language>
-			<language type="zh_Hant">çînîya kevneşopî</language>
-			<language type="zh_Hant" alt="long">çînîya mandarînî ya kevneşopî</language>
+			<language type="zh_Hant">çînîya edetî</language>
+			<language type="zh_Hant" alt="long">çînîya mandarînî ya edetî</language>
 			<language type="zu">zuluyî</language>
 			<language type="zun">zunîyî</language>
 			<language type="zxx">bê naveroka zimanî</language>
-			<language type="zza">zazakî (kirdkî, kirmanckî)</language>
+			<language type="zza">zazakî</language>
 		</languages>
 		<scripts>
+			<script type="Adlm">adlamî</script>
+			<script type="Aghb">albanîya qefqasî</script>
+			<script type="Ahom">ahomî</script>
 			<script type="Arab">erebî</script>
 			<script type="Aran">nestalîq</script>
+			<script type="Armi">aramîya împeratorî</script>
 			<script type="Armn">ermenî</script>
+			<script type="Avst">avestayî</script>
+			<script type="Bali">balînî</script>
+			<script type="Bamu">bamumî</script>
+			<script type="Bass">bassa vah</script>
+			<script type="Batk">batakî</script>
 			<script type="Beng">bengalî</script>
+			<script type="Berf">beria erfe</script>
+			<script type="Bhks">bhaîksukî</script>
 			<script type="Bopo">bopomofo</script>
+			<script type="Brah">brahmî</script>
 			<script type="Brai">braille</script>
+			<script type="Bugi">bugî</script>
+			<script type="Buhd">buhid</script>
+			<script type="Cakm">çakmayî</script>
+			<script type="Cans">heceyên aborjînî yên kanadî yên yekgirtî</script>
+			<script type="Cari">carian</script>
+			<script type="Cham">çamî</script>
+			<script type="Cher">çerokî</script>
+			<script type="Chrs">xwarezmî</script>
 			<script type="Copt">qiptî</script>
+			<script type="Cpmn">qibris-mînoanî</script>
 			<script type="Cprt">qibrisî</script>
 			<script type="Cyrl">kirîlî</script>
+			<script type="Cyrs">slavonîka krîlî ya dêrê ya kevn</script>
 			<script type="Deva">devanagarî</script>
+			<script type="Diak">dives akuruyî</script>
+			<script type="Dogr">dograyî</script>
+			<script type="Dsrt">deseret</script>
+			<script type="Dupl">duployé stenografî</script>
 			<script type="Egyp">hîyeroglîfên misirî</script>
+			<script type="Elba">elbasan</script>
+			<script type="Elym">elymaic</script>
 			<script type="Ethi">etîyopîk</script>
+			<script type="Gara">garayî</script>
 			<script type="Geor">gurcî</script>
+			<script type="Glag">glagolîtîk</script>
+			<script type="Gong">gunjala gondî</script>
+			<script type="Gonm">masaram gondî</script>
 			<script type="Goth">gotîk</script>
+			<script type="Gran">grantha</script>
 			<script type="Grek">yûnanî</script>
 			<script type="Gujr">gujeratî</script>
+			<script type="Gukh">gurung khema</script>
+			<script type="Guru">gurmuxî</script>
 			<script type="Hanb">hanîya bi bopomofoyê</script>
 			<script type="Hang">hangulî</script>
 			<script type="Hani">hanî</script>
+			<script type="Hano">hanunoo</script>
 			<script type="Hans">sadekirî</script>
 			<script type="Hans" alt="stand-alone">hanîya sadekirî</script>
-			<script type="Hant">kevneşopî</script>
-			<script type="Hant" alt="stand-alone">hanîya kevneşopî</script>
+			<script type="Hant">edetî</script>
+			<script type="Hant" alt="stand-alone">hanîya edetî</script>
+			<script type="Hatr">hatranî</script>
 			<script type="Hebr">îbranî</script>
 			<script type="Hira">hîraganayî</script>
+			<script type="Hluw">hîyeroglîfên anadolî</script>
+			<script type="Hmng">pahawh hmongî</script>
+			<script type="Hmnp">nyiakeng puachue hmongî</script>
 			<script type="Hrkt">nivîsên heceyî yên japonî</script>
+			<script type="Hung">macarîya kevn</script>
+			<script type="Ital">îtalîya kevn</script>
 			<script type="Jamo">jamoyî</script>
+			<script type="Java">javayî</script>
 			<script type="Jpan">japonî</script>
+			<script type="Kali">kayah liyî</script>
 			<script type="Kana">katakanayî</script>
-			<script type="Khmr">ximêrî</script>
+			<script type="Kawi">kawî</script>
+			<script type="Khar">kharoshthi</script>
+			<script type="Khmr">khmerî</script>
+			<script type="Khoj">khojkî</script>
+			<script type="Kits">nivîsa biçûk ya xîtanî</script>
 			<script type="Knda">kannadayî</script>
 			<script type="Kore">koreyî</script>
+			<script type="Krai">kirat rai</script>
+			<script type="Kthi">haithi</script>
+			<script type="Lana">lannayî</script>
 			<script type="Laoo">laoyî</script>
+			<script type="Latf">latînîya frakturî</script>
+			<script type="Latg">latînîya gaelîk</script>
 			<script type="Latn">latînî</script>
+			<script type="Lepc">lepçayî</script>
+			<script type="Limb">lîmbuyî</script>
+			<script type="Lina">lînear a</script>
+			<script type="Linb">lînear b</script>
+			<script type="Lisu">fraser</script>
+			<script type="Lyci">lîkyayî</script>
+			<script type="Lydi">lîdyayî</script>
+			<script type="Mahj">mahajanî</script>
+			<script type="Maka">makasarî</script>
+			<script type="Mand">mandaean</script>
+			<script type="Mani">manîheyî</script>
+			<script type="Marc">marchen</script>
+			<script type="Medf">medefaidrin</script>
+			<script type="Mend">mende</script>
+			<script type="Merc">destnivîsa meroytîk</script>
+			<script type="Mero">meroytîk</script>
 			<script type="Mlym">malayamî</script>
+			<script type="Modi">modî</script>
 			<script type="Mong">moxolî</script>
+			<script type="Mroo">mro</script>
+			<script type="Mtei">meitei mayekî</script>
+			<script type="Mult">multanî</script>
 			<script type="Mymr">myanmarî</script>
+			<script type="Nagm">nag mundarî</script>
+			<script type="Nand">nandînagarî</script>
+			<script type="Narb">erebîya bakurî ya kevn</script>
+			<script type="Nbat">nebatî</script>
+			<script type="Newa">newayî</script>
+			<script type="Nkoo">n’koyî</script>
+			<script type="Nshu">nüshu</script>
+			<script type="Ogam">ogham</script>
+			<script type="Olck">ol chiki</script>
+			<script type="Onao">ol onal</script>
+			<script type="Orkh">orxun</script>
+			<script type="Orya">odiayî</script>
+			<script type="Osge">osageyî</script>
+			<script type="Osma">osmanya</script>
+			<script type="Ougr">oygurîya kevn</script>
+			<script type="Palm">palmîrayî</script>
+			<script type="Pauc">pau cin hau</script>
+			<script type="Perm">permîka kevn</script>
+			<script type="Phag">phags-pa</script>
+			<script type="Phli">pehlewîya nivîskî</script>
+			<script type="Phlp">pehlewîya psalter</script>
+			<script type="Phnx">fenîkeyî</script>
+			<script type="Plrd">pollard fonetîk</script>
+			<script type="Prti">partîya nivîskî</script>
 			<script type="Qaag">zawgyi</script>
+			<script type="Rjng">rejang</script>
+			<script type="Rohg">hanîfî</script>
+			<script type="Runr">runîk</script>
+			<script type="Samr">samarîtî</script>
+			<script type="Sarb">erebîya başûrî ya kevn</script>
+			<script type="Saur">sauraştrayî</script>
+			<script type="Sgnw">zimanê îşaretê</script>
+			<script type="Shaw">shavian</script>
+			<script type="Shrd">sharada</script>
+			<script type="Sidd">siddham</script>
+			<script type="Sidt">sidetic</script>
+			<script type="Sind">khudawadi</script>
 			<script type="Sinh">sînhalayî</script>
+			<script type="Sogd">sogdî</script>
+			<script type="Sogo">sogdîya kevn</script>
+			<script type="Sora">sora sompengî</script>
+			<script type="Soyo">soyomboyî</script>
+			<script type="Sund">sundanî</script>
+			<script type="Sunu">sunuwarî</script>
+			<script type="Sylo">syloti nagri</script>
+			<script type="Syrc">siryanî</script>
+			<script type="Syre">siryanîya estrangelo</script>
+			<script type="Syrj">siryanîya rojavayî</script>
+			<script type="Syrn">siryanîya rojhilatî</script>
+			<script type="Tagb">tagbanwa</script>
+			<script type="Takr">takrî</script>
+			<script type="Tale">taî leyî</script>
+			<script type="Talu">new tai lue</script>
 			<script type="Taml">tamîlî</script>
+			<script type="Tang">tangut</script>
+			<script type="Tavt">tai viet</script>
+			<script type="Tayo">tai yo</script>
 			<script type="Telu">teluguyî</script>
+			<script type="Tfng">tifinagh</script>
+			<script type="Tglg">tagalogî</script>
+			<script type="Thaa">thaanayî</script>
 			<script type="Thai">tayî</script>
 			<script type="Tibt">tîbetî</script>
+			<script type="Tirh">tirhuta</script>
+			<script type="Tnsa">tangsayî</script>
+			<script type="Todr">todhrî</script>
+			<script type="Tols">tolong sikî</script>
+			<script type="Toto">totoyî</script>
+			<script type="Tutg">tulu-tîgalarî</script>
+			<script type="Ugar">ugarîtîk</script>
+			<script type="Vaii">vaî</script>
+			<script type="Vith">vithkuqi</script>
+			<script type="Wara">varang kshiti</script>
+			<script type="Wcho">wançoyî</script>
+			<script type="Xpeo">farisîya kevn</script>
+			<script type="Xsux">nivîsên bizmarî yên sumero-akadî</script>
 			<script type="Yezi">êzidî</script>
+			<script type="Yiii">yî</script>
+			<script type="Zanb">meydana zanabazar</script>
+			<script type="Zinh">irsî</script>
 			<script type="Zmth">nîşandana matematîkî</script>
 			<script type="Zsye">emojî</script>
 			<script type="Zsym">sembol</script>
@@ -602,14 +765,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CC">Giravên Kokosê (Keeling)</territory>
 			<territory type="CD">Kongo - Kînşasa</territory>
 			<territory type="CD" alt="variant">Kongo (KDK)</territory>
-			<territory type="CF">Komara Afrîkaya Navîn</territory>
+			<territory type="CF">Cimhûrîyeta Afrîkaya Navîn</territory>
 			<territory type="CG">Kongo - Brazzaville</territory>
-			<territory type="CG" alt="variant">Kongo (Komar)</territory>
+			<territory type="CG" alt="variant">Kongo (Cimhûrîyet)</territory>
 			<territory type="CH">Swîsre</territory>
 			<territory type="CI">Côte d’Ivoire</territory>
 			<territory type="CI" alt="variant">Perava Ivoryê</territory>
 			<territory type="CK">Giravên Cookê</territory>
-			<territory type="CL">Şîle</territory>
+			<territory type="CL">Şîlî</territory>
 			<territory type="CM">Kamerûn</territory>
 			<territory type="CN">Çîn</territory>
 			<territory type="CO">Kolombîya</territory>
@@ -622,12 +785,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CX">Girava Christmasê</territory>
 			<territory type="CY">Qibris</territory>
 			<territory type="CZ">Çekya</territory>
+			<territory type="CZ" alt="variant">Cimhûrîyeta Çekî</territory>
 			<territory type="DE">Almanya</territory>
 			<territory type="DG">Diego Garcia</territory>
 			<territory type="DJ">Cîbûtî</territory>
 			<territory type="DK">Danîmarka</territory>
 			<territory type="DM">Domînîka</territory>
-			<territory type="DO">Komara Domînîkê</territory>
+			<territory type="DO">Cimhûrîyeta Domînîkê</territory>
 			<territory type="DZ">Cezayîr</territory>
 			<territory type="EA">Ceuta û Melîla</territory>
 			<territory type="EC">Ekwador</territory>
@@ -714,11 +878,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MA">Fas</territory>
 			<territory type="MC">Monako</territory>
 			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
+			<territory type="ME">Qeredax</territory>
 			<territory type="MF">Saint Martin</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Giravên Marşalê</territory>
-			<territory type="MK">Makendonyaya Bakur</territory>
+			<territory type="MK">Makedonyaya Bakur</territory>
 			<territory type="ML">Malî</territory>
 			<territory type="MM">Myanmar (Bûrma)</territory>
 			<territory type="MN">Moxolistan</territory>
@@ -730,7 +894,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MS">Montserat</territory>
 			<territory type="MT">Malta</territory>
 			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldîva</territory>
+			<territory type="MV">Maldîv</territory>
 			<territory type="MW">Malawî</territory>
 			<territory type="MX">Meksîka</territory>
 			<territory type="MY">Malezya</territory>
@@ -742,13 +906,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="NG">Nîjerya</territory>
 			<territory type="NI">Nîkaragua</territory>
 			<territory type="NL">Holanda</territory>
-			<territory type="NO">Norwêc</territory>
+			<territory type="NO">Norwec</territory>
 			<territory type="NP">Nepal</territory>
 			<territory type="NR">Naûrû</territory>
 			<territory type="NU">Niûe</territory>
 			<territory type="NZ">Zelandaya Nû</territory>
 			<territory type="NZ" alt="variant">Aoteroaya Zelandaya Nû</territory>
-			<territory type="OM">Oman</territory>
+			<territory type="OM">Uman</territory>
 			<territory type="PA">Panama</territory>
 			<territory type="PE">Perû</territory>
 			<territory type="PF">Polînezyaya Fransizî</territory>
@@ -759,9 +923,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="PM">Saint-Pierre û Miquelon</territory>
 			<territory type="PN">Giravên Pitcairnê</territory>
 			<territory type="PR">Porto Rîko</territory>
-			<territory type="PS">Herêmên Filîstînî</territory>
+			<territory type="PS">Herêmên Filistînî</territory>
 			<territory type="PS" alt="short">Filistîn</territory>
-			<territory type="PT">Portûgal</territory>
+			<territory type="PT">Portugal</territory>
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paragûay</territory>
 			<territory type="QA">Qeter</territory>
@@ -799,25 +963,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TF">Herêmên Başûr ên Fransayê</territory>
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Tayland</territory>
-			<territory type="TJ">Tacîkistan</territory>
+			<territory type="TJ">Tacikistan</territory>
 			<territory type="TK">Tokelau</territory>
 			<territory type="TL">Tîmor-Leste</territory>
 			<territory type="TL" alt="variant">Tîmora Rojhilat</territory>
 			<territory type="TM">Tirkmenistan</territory>
 			<territory type="TN">Tûnis</territory>
 			<territory type="TO">Tonga</territory>
-			<territory type="TR">Tirkîye</territory>
-			<territory type="TR" alt="variant">Türkiye</territory>
+			<territory type="TR">Türkiye</territory>
 			<territory type="TT">Trînîdad û Tobago</territory>
 			<territory type="TV">Tûvalû</territory>
 			<territory type="TW">Taywan</territory>
 			<territory type="TZ">Tanzanya</territory>
 			<territory type="UA">Ûkrayna</territory>
 			<territory type="UG">Ûganda</territory>
-			<territory type="UM">Giravên Biçûk ên Derveyî DYAyê</territory>
+			<territory type="UM">Giravên Biçûk ên Derveyî DAYê</territory>
 			<territory type="UN">Miletên Yekbûyî</territory>
-			<territory type="US">Dewletên Yekbûyî yên Amerîkayê</territory>
-			<territory type="US" alt="short">DYA</territory>
+			<territory type="US">Dewletên Amerîkayê yên Yekbûyî</territory>
+			<territory type="US" alt="short">DAY</territory>
 			<territory type="UY">Ûrûguay</territory>
 			<territory type="UZ">Ozbekistan</territory>
 			<territory type="VA">Vatîkan</territory>
@@ -840,32 +1003,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ZZ">Herêma Nenas</territory>
 		</territories>
 		<variants>
-			<variant type="1959ACAD" draft="contributed">Akademîk</variant>
+			<variant type="1959ACAD">Akademîk</variant>
 		</variants>
 		<keys>
-			<key type="calendar">Salname</key>
+			<key type="calendar">Teqwîm</key>
 			<key type="collation">Rêzkirin</key>
 			<key type="currency">diwîz</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist">Salnameya Budîst</type>
-			<type key="calendar" type="chinese">Salnameya Çînî</type>
-			<type key="calendar" type="coptic">Salnameya Qiptî</type>
-			<type key="calendar" type="dangi">Salnameya Dangî</type>
-			<type key="calendar" type="ethiopic">Salnameya Etîyopîk</type>
-			<type key="calendar" type="ethiopic-amete-alem">Salnameya Amete Alem ya Etîyopîk</type>
-			<type key="calendar" type="gregorian">Salnameya Mîladî</type>
-			<type key="calendar" type="hebrew">salnameya îbranî</type>
-			<type key="calendar" type="indian">Salnameya Milî ya Hindî</type>
-			<type key="calendar" type="islamic">Salnameya Hicrî</type>
-			<type key="calendar" type="islamic-civil">Salnameya Hicrî (16ê tîrmeha 622yan)</type>
-			<type key="calendar" type="islamic-rgsa">Salnameya Hicrî (Siudî)</type>
-			<type key="calendar" type="islamic-tbla">Salnameya Hicrî (15ê tîrmeha 622yan)</type>
-			<type key="calendar" type="islamic-umalqura">Salnameya Hicrî (Um el-Qura)</type>
-			<type key="calendar" type="iso8601">Salnameya ISO-8601ê</type>
-			<type key="calendar" type="japanese">Salnameya Japonî</type>
-			<type key="calendar" type="persian">Salnameya Îranî</type>
-			<type key="calendar" type="roc">Salnameya Komara Çînê</type>
+			<type key="calendar" type="buddhist">Teqwîma Budîst</type>
+			<type key="calendar" type="chinese">Teqwîma Çînî</type>
+			<type key="calendar" type="coptic">Teqwîma Qiptî</type>
+			<type key="calendar" type="dangi">Teqwîma Dangî</type>
+			<type key="calendar" type="ethiopic">Teqwîma Etîyopîk</type>
+			<type key="calendar" type="ethiopic-amete-alem">Teqwîma Amete Alem ya Etîyopîk</type>
+			<type key="calendar" type="gregorian">Teqwîma Mîladî</type>
+			<type key="calendar" type="gregorian" scope="core">Mîladî</type>
+			<type key="calendar" type="hebrew">Teqwîma Îbranî</type>
+			<type key="calendar" type="indian">Teqwîma Milî ya Hindî</type>
+			<type key="calendar" type="islamic">Teqwîma Hicrî</type>
+			<type key="calendar" type="islamic" scope="core">Hicrî</type>
+			<type key="calendar" type="islamic-civil">Teqwîma Hicrî (16ê tîrmeha 622yan)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hicrî (16ê tîrmeha 622yan)</type>
+			<type key="calendar" type="islamic-rgsa">Teqwîma Hicrî (Siudî)</type>
+			<type key="calendar" type="islamic-tbla">Teqwîma Hicrî (15ê tîrmeha 622yan)</type>
+			<type key="calendar" type="islamic-umalqura">Teqwîma Hicrî (Um el-Qura)</type>
+			<type key="calendar" type="iso8601">Teqwîma ISO-8601ê</type>
+			<type key="calendar" type="japanese">Teqwîma Japonî</type>
+			<type key="calendar" type="persian">Teqwîma Îranî</type>
+			<type key="calendar" type="roc">Teqwîma Cimhûrîyeta Çînê</type>
 			<type key="collation" type="standard">Awayê Rêzkirina Standard</type>
 			<type key="numbers" type="arab">Reqemên hindo-erebî</type>
 			<type key="numbers" type="latn">Reqemên Rojavayî</type>
@@ -893,7 +1059,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</characters>
 	<dates>
 		<calendars>
-			<calendar type="generic">
+			<calendar type="buddhist">
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -912,7 +1078,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG d.MM.y</pattern>
+							<pattern>G dd.MM.y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -938,25 +1104,412 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ehm">E, h:mm'ê' a</dateFormatItem>
-						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E, h:mm:ss'ê' a</dateFormatItem>
-						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G d/M/y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G d/M/y, E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="coptic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an' EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G d'ê' MMM'a' y'an', E</dateFormatItem>
+						<dateFormatItem id="yyyyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G d.M.y, E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G MM.y – G MM.y</greatestDifference>
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y – G dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y, E – G dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G MMM y – G MMM y</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="G">G d'ê' MMM'a' y'an' E – G d'ê' MMM'a' y'an', E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH's'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH's' v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
+							<greatestDifference id="M">G d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y">G d MMM, y – d MMM, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">G MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="ethiopic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an' EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G d'ê' MMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G d'ê' MMM'a' y'an', E</dateFormatItem>
+						<dateFormatItem id="yyyyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G d.M.y, E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">G MM.y – G MM.y</greatestDifference>
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y – G dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y, E – G dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">G MMM y – G MMM y</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="G">G d'ê' MMM'a' y'an' E – G d'ê' MMM'a' y'an', E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH's'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH's' v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
+							<greatestDifference id="M">G d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y">G d MMM, y – d MMM, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">G MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an' EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G d'ê' MMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Eh">h a, E</dateFormatItem>
+						<dateFormatItem id="Ehm">h:mm a, E</dateFormatItem>
+						<dateFormatItem id="EHm">HH:mm, E</dateFormatItem>
+						<dateFormatItem id="Ehms">h:mm:ss a, E</dateFormatItem>
+						<dateFormatItem id="EHms">HH:mm:ss, E</dateFormatItem>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM'a' y'an'</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d'ê' MMM'a' y'an'</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G d'ê' MMM'a' y'an' E</dateFormatItem>
-						<dateFormatItem id="h">h'ê' a</dateFormatItem>
-						<dateFormatItem id="hm">h:mm'ê' a</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss'ê' a</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G d'ê' MMM'a' y'an', E</dateFormatItem>
+						<dateFormatItem id="H">HH's'</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd/MM, E</dateFormatItem>
 						<dateFormatItem id="MMMd">d'ê' MMM'ê'</dateFormatItem>
 						<dateFormatItem id="MMMEd">d'ê' MMM'ê', E</dateFormatItem>
 						<dateFormatItem id="MMMMd">d'ê' MMMM'ê'</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG M/y</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG dd.MM.y</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">GGGGG dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="yyyyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G d.M.y, E</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">G MMM'a' y'an'</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G d'ê' MMM'a' y'an'</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G d'ê' MMM'a' y'an' E</dateFormatItem>
@@ -965,53 +1518,92 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yyyyQQQQ">G y/QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG MM.y – GGGGG MM.y</greatestDifference>
-							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG MM.y – MM.y</greatestDifference>
+							<greatestDifference id="G">G MM.y – G MM.y</greatestDifference>
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="G">GGGGG dd.MM.y – GGGGG dd.MM.y</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y – G dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="G">GGGGG dd.MM.y E – GGGGG dd.MM.y E</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="G">G dd.MM.y, E – G dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">G MMM'a' y'an' – G MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="G">G MMM y – G MMM y</greatestDifference>
 							<greatestDifference id="M">G MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">G MMM'a' y'an' – MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">G d–d'ê' MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
 							<greatestDifference id="G">G d'ê' MMM'a' y'an' – G d'ê' MMM'a' y'an'</greatestDifference>
 							<greatestDifference id="M">G d'ê' MMM'ê' – d'ê' MMM'ê' y</greatestDifference>
 							<greatestDifference id="y">G d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
 							<greatestDifference id="d">G d'ê' MMM'ê' E – d'ê' MMM'ê' E y</greatestDifference>
-							<greatestDifference id="G">G d'ê' MMM'a' y'an' E – G d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="G">G d'ê' MMM'a' y'an' E – G d'ê' MMM'a' y'an', E</greatestDifference>
 							<greatestDifference id="M">G d'ê' MMM'ê' E – d'ê' MMM'ê' E y</greatestDifference>
 							<greatestDifference id="y">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH's'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH's' v</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
+							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">d.M – d.M</greatestDifference>
 							<greatestDifference id="M">d.M – d.M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">d.M E – d.M E</greatestDifference>
-							<greatestDifference id="M">d.M E – d.M E</greatestDifference>
+							<greatestDifference id="d">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d – d'ê' MMM'ê'</greatestDifference>
@@ -1021,37 +1613,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="d">d'ê' MMM'ê', E – d'ê' MMM'ê', E</greatestDifference>
 							<greatestDifference id="M">d'ê' MMM'ê', E – d'ê' MMM'ê', E</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y – y</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG MM.y – MM.y</greatestDifference>
+							<greatestDifference id="M">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y – dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="d">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">G MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">G MMM'a' y'an' – MMMa y'an'</greatestDifference>
+							<greatestDifference id="M">G MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">G d–d'ê' MMM'a' y'an'</greatestDifference>
-							<greatestDifference id="M">G d'ê' MMM'ê' – d'ê' MMM'ê' y</greatestDifference>
-							<greatestDifference id="y">G d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
+							<greatestDifference id="M">G d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y">G d MMM, y – d MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="M">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="y">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="d">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">G MMMM – MMMM y</greatestDifference>
-							<greatestDifference id="y">G MMMM'a' y'an' – MMMM'a' y'an'</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">G MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1156,10 +1751,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">Ç4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1">çaryeka 1em</quarter>
-							<quarter type="2">çaryeka 2yem</quarter>
-							<quarter type="3">çaryeka 3yem</quarter>
-							<quarter type="4">çaryeka 4em</quarter>
+							<quarter type="1">çaryeka 1ê</quarter>
+							<quarter type="2">çaryeka 2an</quarter>
+							<quarter type="3">çaryeka 3an</quarter>
+							<quarter type="4">çaryeka 4an</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="wide">
+							<quarter type="1">çaryeka 1ê</quarter>
+							<quarter type="2">çaryeka 2an</quarter>
+							<quarter type="3">çaryeka 3an</quarter>
+							<quarter type="4">çaryeka 4an</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
@@ -1177,17 +1780,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dayPeriods>
 				<eras>
 					<eraNames>
-						<era type="0">berî zayînê</era>
-						<era type="0" alt="variant">berî mîladê</era>
-						<era type="1">piştî zayînê</era>
-						<era type="1" alt="variant">piştî mîladê</era>
+						<era type="0">Berî Mîladê</era>
+						<era type="0" alt="variant">Berî Mîladê</era>
+						<era type="1">Piştî Mîladê</era>
+						<era type="1" alt="variant">Piştî Mîladê</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">BZ</era>
-						<era type="0" alt="variant">BM</era>
-						<era type="1">PZ</era>
-						<era type="1" alt="variant">PM</era>
+						<era type="0">BM</era>
+						<era type="1">PM</era>
 					</eraAbbr>
+					<eraNarrow>
+						<era type="0">BM</era>
+						<era type="1">PM</era>
+					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1202,7 +1807,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d'ê' MMM'a' y'an'</pattern>
+							<pattern>d MMM, y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -1255,158 +1860,214 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Bh">h'ê' B</dateFormatItem>
-						<dateFormatItem id="Bhm">h:mm'ê' B</dateFormatItem>
-						<dateFormatItem id="Bhms">h:mm:ss'ê' B</dateFormatItem>
-						<dateFormatItem id="EBhm">E, h:mm'ê' B</dateFormatItem>
-						<dateFormatItem id="EBhms">E, h:mm:ss'ê' B</dateFormatItem>
-						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">E, h:mm'ê' a</dateFormatItem>
-						<dateFormatItem id="Ehms">E, h:mm:ss'ê' a</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG dd.MM.y</dateFormatItem>
-						<dateFormatItem id="GyMMM">G MMM'a' y'an'</dateFormatItem>
-						<dateFormatItem id="GyMMMd">G d'ê' MMM'a' y'an'</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G d'ê' MMM'a' y'an', E</dateFormatItem>
-						<dateFormatItem id="h">h'ê' a</dateFormatItem>
-						<dateFormatItem id="hm">h:mm'ê' a</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss'ê' a</dateFormatItem>
-						<dateFormatItem id="hmsv">h:mm:ss'ê' a 'bi' 'dema' v('y')'ê'</dateFormatItem>
-						<dateFormatItem id="Hmsv">HH:mm:ss 'bi' 'dema' v('y')'ê'</dateFormatItem>
-						<dateFormatItem id="hmv">h:mm'ê' a 'bi' 'dema' v('y')'ê'</dateFormatItem>
-						<dateFormatItem id="Hmv">HH:mm 'bi' 'dema' v('y')'ê'</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
+						<dateFormatItem id="GyMd">G d/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y, E</dateFormatItem>
+						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G d MMM, y</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G d MMM y, E</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d'ê' MMM'ê'</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d'ê' MMM'ê'</dateFormatItem>
+						<dateFormatItem id="MEd">d/M, E</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
 						<dateFormatItem id="MMMMd">d'ê' MMMM'ê'</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one">'hefteya' W'em' 'ya' MMMM'ê'</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">'hefteya' W'em' 'ya' MMMM'ê'</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">'hefteya' W'an' 'ya' MMMM'ê'</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">'hefteya' W'an' 'ya' MMMM'ê'</dateFormatItem>
 						<dateFormatItem id="yM">MM.y</dateFormatItem>
 						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, dd.MM.y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM'a' y'an'</dateFormatItem>
-						<dateFormatItem id="yMMMd">d'ê' MMM'a' y'an'</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d'ê' MMM'a' y'an'</dateFormatItem>
+						<dateFormatItem id="yMEd">dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM, y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">d MMM y, E</dateFormatItem>
 						<dateFormatItem id="yMMMM">MMMM'a' y'an'</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ'em' 'ya' y'an'</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ, y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ 'ya' y'an'</dateFormatItem>
-						<dateFormatItem id="yw" count="one">'hefteya' w'em' 'ya' Y'an'</dateFormatItem>
-						<dateFormatItem id="yw" count="other">'hefteya' w'em' 'ya' Y'an'</dateFormatItem>
+						<dateFormatItem id="yw" count="one">'hefteya' w'an' 'ya' Y'an'</dateFormatItem>
+						<dateFormatItem id="yw" count="other">'hefteya' w'an' 'ya' Y'an'</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h'ê' B – h'ê' B</greatestDifference>
-							<greatestDifference id="h">h–h'ê' B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG MM.y – GGGGG MM.y</greatestDifference>
-							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG MM.y – MM.y</greatestDifference>
+							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M">G M/y – M/y</greatestDifference>
+							<greatestDifference id="y">G M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="G">GGGGG dd.MM.y – GGGGG dd.MM.y</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">G d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="G">G d/M/y – G d/M/y</greatestDifference>
+							<greatestDifference id="M">G d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">G d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="G">GGGGG dd.MM.y E – GGGGG dd.MM.y E</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="d">G d/M/y, E – G d/M/y, E</greatestDifference>
+							<greatestDifference id="G">G d/M/y, E – G d/M/y, E</greatestDifference>
+							<greatestDifference id="M">G d/M/y, E – G d/M/y, E</greatestDifference>
+							<greatestDifference id="y">G d/M/y – d/M/y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">G MMM'a' y'an' – G MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="G">G MMM y – G MMM y</greatestDifference>
 							<greatestDifference id="M">G MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">G MMM'a' y'an' – MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">G d–d'ê' MMM'a' y'an'</greatestDifference>
-							<greatestDifference id="G">G d'ê' MMM'a' y'an' – G d'ê' MMM'a' y'an'</greatestDifference>
-							<greatestDifference id="M">G d'ê' MMM'ê' – d'ê' MMM'ê' y</greatestDifference>
-							<greatestDifference id="y">G d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="d">G d – d MMM, y</greatestDifference>
+							<greatestDifference id="G">G d MMM, y – G d MMM, y</greatestDifference>
+							<greatestDifference id="M">G d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y">G d MMM, y – G d MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G d'ê' MMM'ê' E – d'ê' MMM'ê' E y</greatestDifference>
-							<greatestDifference id="G">G d'ê' MMM'a' y'an' E – G d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="M">G d'ê' MMM'ê' E – d'ê' MMM'ê' E y</greatestDifference>
-							<greatestDifference id="y">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="d">G d MMM, E – G d MMM y, E</greatestDifference>
+							<greatestDifference id="G">G d MMM y, E – G d MMM y, E</greatestDifference>
+							<greatestDifference id="M">G d MMM – d MMM y, E</greatestDifference>
+							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h'ê' a – h'ê' a</greatestDifference>
-							<greatestDifference id="h">h–h'ê' a</greatestDifference>
+							<greatestDifference id="h">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH – HH's'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm'ê' a – h:mm'ê' a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm'ê' a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm'ê' a</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm'ê' a – h:mm'ê' a v</greatestDifference>
-							<greatestDifference id="h">h:mm'ê'–h:mm'ê' a v</greatestDifference>
-							<greatestDifference id="m">h:mm'ê'–h:mm'ê' a v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h'ê' a – h'ê' a v</greatestDifference>
-							<greatestDifference id="h">h–h'ê' a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH – HH'h' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M – d.M</greatestDifference>
-							<greatestDifference id="M">d.M – d.M</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">d.M E – d.M E</greatestDifference>
-							<greatestDifference id="M">d.M E – d.M E</greatestDifference>
+							<greatestDifference id="d">d/M, E – d/M, E</greatestDifference>
+							<greatestDifference id="M">d/M, E – d/M, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d – d'ê' MMM'ê'</greatestDifference>
-							<greatestDifference id="M">d'ê' MMM'ê' – d'ê' MMM'ê'</greatestDifference>
+							<greatestDifference id="d">d – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">d'ê' MMM'ê', E – d'ê' MMM'ê', E</greatestDifference>
-							<greatestDifference id="M">d'ê' MMM'ê', E – d'ê' MMM'ê', E</greatestDifference>
+							<greatestDifference id="d">d MMM, E – d MMM, E</greatestDifference>
+							<greatestDifference id="M">d MMM, E – d MMM, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">y – y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y</greatestDifference>
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="M">dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="y">dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="d">d/M/y, E – d/M/y, E</greatestDifference>
+							<greatestDifference id="M">d/M/y, E – d/M/y, E</greatestDifference>
+							<greatestDifference id="y">d/M/y, E – d/M/y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM'a' y'an' – MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d'ê' MMM'a' y'an'</greatestDifference>
-							<greatestDifference id="M">d'ê' MMM'ê' – d'ê' MMM'ê' y</greatestDifference>
-							<greatestDifference id="y">d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
+							<greatestDifference id="d">d – d MMM, y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y">d MMM, y – d MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="M">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="y">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="d">d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="M">d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="y">d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM'a' y'an' – MMMM'a' y'an'</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="hebrew">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an' EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G d'ê' MMMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G d'ê' MMM'a' y'an'</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G dd.MM.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G d'ê' MMM'a' y'an', E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="islamic">
 				<months>
 					<monthContext type="format">
@@ -1445,19 +2106,149 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="0">Hicrî</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM" draft="unconfirmed">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd" draft="unconfirmed">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="unconfirmed">G dd.MM.y, E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd" draft="unconfirmed">G d'ê' MMM'a' y'an', E</dateFormatItem>
+						<dateFormatItem id="yyyyM" draft="unconfirmed">G MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMd" draft="unconfirmed">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yyyyMEd" draft="unconfirmed">G d.M.y, E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d" draft="unconfirmed">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="y" draft="unconfirmed">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G" draft="unconfirmed">G MM.y – G MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d" draft="unconfirmed">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">G dd.MM.y – G dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d" draft="unconfirmed">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">G dd.MM.y, E – G dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G" draft="unconfirmed">G MMM y – G MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d" draft="unconfirmed">G d – d MMM, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="G" draft="unconfirmed">G d'ê' MMM'a' y'an' E – G d'ê' MMM'a' y'an', E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="h" draft="unconfirmed">h – h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H" draft="unconfirmed">HH – HH's'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">HH:mm – HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H" draft="unconfirmed">HH:mm – HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="h" draft="unconfirmed">h – h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H" draft="unconfirmed">HH – HH's' v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d" draft="unconfirmed">dd.MM, E – dd.MM, E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">dd.MM, E – dd.MM, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M" draft="unconfirmed">MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y" draft="unconfirmed">G y – y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M" draft="unconfirmed">G MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G MM.y – MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d" draft="unconfirmed">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G dd.MM.y – dd.MM.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="unconfirmed">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G dd.MM.y, E – dd.MM.y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="unconfirmed">G MMM – MMM y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G MMM y – MMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="unconfirmed">G d – d MMM, y</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G d MMM, y – d MMM, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="unconfirmed">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G d MMM y, E – d MMM y, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="unconfirmed">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y" draft="unconfirmed">G MMMM y – MMMM y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
 			</calendar>
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName>serdem</displayName>
+				<displayName>çax</displayName>
+			</field>
+			<field type="era-short">
+				<displayName>çax</displayName>
+			</field>
+			<field type="era-narrow">
+				<displayName>çax</displayName>
 			</field>
 			<field type="year">
 				<displayName>sal</displayName>
 				<relative type="-1">sala borî</relative>
 				<relative type="0">îsal</relative>
-				<relative type="1">sala bê</relative>
+				<relative type="1">sala were</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">di salekê de</relativeTimePattern>
+					<relativeTimePattern count="one">di {0} salê de</relativeTimePattern>
 					<relativeTimePattern count="other">di {0} salan de</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
@@ -1466,12 +2257,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="year-short">
+				<relative type="-1">sala borî</relative>
+				<relative type="0">îsal</relative>
+				<relative type="1">sala were</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">piştî {0} salan</relativeTimePattern>
+					<relativeTimePattern count="one">piştî {0} salê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} salan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<relative type="-1">sala borî</relative>
+				<relative type="0">îsal</relative>
+				<relative type="1">sala were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} salê</relativeTimePattern>
 					<relativeTimePattern count="other">piştî {0} salan</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">berî salekê</relativeTimePattern>
+					<relativeTimePattern count="one">berî {0} salê</relativeTimePattern>
 					<relativeTimePattern count="other">berî {0} salan</relativeTimePattern>
 				</relativeTime>
 			</field>
@@ -1480,46 +2283,118 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">çaryeka dawî</relative>
 				<relative type="0">ev çaryek</relative>
 				<relative type="1">çaryeka were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} çaryekê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} çaryekan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} çaryekê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} çaryekan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter-short">
 				<displayName>çrk.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} çaryekê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} çaryekan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} çaryekê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} çaryekan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} çaryekê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} çaryekan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} çaryekê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} çaryekan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
 				<displayName>meh</displayName>
 				<relative type="-1">meha borî</relative>
 				<relative type="0">ev meh</relative>
-				<relative type="1">meha bê</relative>
+				<relative type="1">meha were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} mehê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} mehan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} mehê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} mehan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month-short">
 				<relative type="-1">meha borî</relative>
 				<relative type="0">ev meh</relative>
-				<relative type="1">meha bê</relative>
+				<relative type="1">meha were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} mehê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} mehan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} mehê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} mehan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month-narrow">
 				<relative type="-1">meha borî</relative>
 				<relative type="0">ev meh</relative>
-				<relative type="1">meha bê</relative>
+				<relative type="1">meha were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} mehê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} mehan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} mehê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} mehan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName>hefte</displayName>
 				<relative type="-1">hefteya borî</relative>
 				<relative type="0">ev hefte</relative>
-				<relative type="1">hefteya bê</relative>
+				<relative type="1">hefteya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} hefteyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} hefteyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} hefteyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} hefteyan</relativeTimePattern>
+				</relativeTime>
 				<relativePeriod>hefteya {0}</relativePeriod>
 			</field>
 			<field type="week-short">
 				<displayName>hf.</displayName>
 				<relative type="-1">hft. borî</relative>
 				<relative type="0">ev hft.</relative>
-				<relative type="1">hft. bê</relative>
-				<relativePeriod>hefteya {0}</relativePeriod>
+				<relative type="1">hft. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} hefteyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} hefteyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} hefteyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} hefteyan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week-narrow">
 				<displayName>hf</displayName>
 				<relative type="-1">hft. borî</relative>
 				<relative type="0">ev hft.</relative>
-				<relative type="1">hft. bê</relative>
-				<relativePeriod>hefteya {0}</relativePeriod>
+				<relative type="1">hft. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} hefteyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} hefteyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} hefteyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} hefteyan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>hefteya mehê</displayName>
@@ -1529,6 +2404,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">duh</relative>
 				<relative type="0">îro</relative>
 				<relative type="1">sibê</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} rojê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} rojan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} rojê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} rojan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} rojê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} rojan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} rojê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} rojan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} rojê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} rojan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} rojê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} rojan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="dayOfYear">
 				<displayName>roja salê</displayName>
@@ -1539,32 +2442,335 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekdayOfMonth">
 				<displayName>roja mehê</displayName>
 			</field>
+			<field type="sun">
+				<relative type="-1">yekşema borî</relative>
+				<relative type="0">ev yekşem</relative>
+				<relative type="1">yekşema were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} yekşemê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} yekşeman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} yekşemê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} yekşeman</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">yşm. borî</relative>
+				<relative type="0">ev yşm.</relative>
+				<relative type="1">yşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} yşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} yşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} yşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} yşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">yşm. borî</relative>
+				<relative type="0">ev yşm.</relative>
+				<relative type="1">yşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} yşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} yşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} yşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} yşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon">
+				<relative type="-1">duşema borî</relative>
+				<relative type="0">ev duşem</relative>
+				<relative type="1">duşema were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} duşemê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} duşeman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} duşemê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} duşeman</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">dşm. borî</relative>
+				<relative type="0">ev dşm.</relative>
+				<relative type="1">dşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} dşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} dşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} dşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} dşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">dşm. borî</relative>
+				<relative type="0">ev dşm.</relative>
+				<relative type="1">dşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} dşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} dşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} dşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} dşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue">
+				<relative type="-1">sêşema borî</relative>
+				<relative type="0">ev sêşem</relative>
+				<relative type="1">sêşema were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} sêşemê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} sêşeman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} sêşemê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} sêşeman</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">sşm. borî</relative>
+				<relative type="0">ev sşm.</relative>
+				<relative type="1">sşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} sşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} sşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} sşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} sşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">sşm. borî</relative>
+				<relative type="0">ev sşm.</relative>
+				<relative type="1">sşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} sşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} sşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} sşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} sşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed">
+				<relative type="-1">çarşema borî</relative>
+				<relative type="0">ev çarşem</relative>
+				<relative type="1">çarşema were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} çarşemê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} çarşeman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} çarşemê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} çarşeman</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">çşm. borî</relative>
+				<relative type="0">ev çşm.</relative>
+				<relative type="1">çşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} çşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} çşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} çşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} çşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">çşm. borî</relative>
+				<relative type="0">ev çşm.</relative>
+				<relative type="1">çşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} çşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} çşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} çşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} çşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu">
+				<relative type="-1">pêncşema borî</relative>
+				<relative type="0">ev pêncşem</relative>
+				<relative type="1">pêncşema were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} pêncşemê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} pêncşeman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} pêncşemê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} pêncşeman</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">pşm. borî</relative>
+				<relative type="0">ev pşm.</relative>
+				<relative type="1">pşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} pşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} pşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} pşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} pşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">pşm. borî</relative>
+				<relative type="0">ev pşm.</relative>
+				<relative type="1">pşm. were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} pşm.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} pşm.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} pşm.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} pşm.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri">
+				<relative type="-1">înîya borî</relative>
+				<relative type="0">ev înî</relative>
+				<relative type="1">înîya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} înîyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} înîyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} înîyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} înîyan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">înîya borî</relative>
+				<relative type="0">ev înî</relative>
+				<relative type="1">înîya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} înîyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} înîyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} înîyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} înîyan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">înîya borî</relative>
+				<relative type="0">ev înî</relative>
+				<relative type="1">înîya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} înîyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} înîyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} înîyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} înîyan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat">
+				<relative type="-1">şemîya borî</relative>
+				<relative type="0">ev şemî</relative>
+				<relative type="1">şemîya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} şemîyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} şemîyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} şemîyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} şemîyan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">şemîya borî</relative>
+				<relative type="0">ev şemî</relative>
+				<relative type="1">şemîya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} şemîyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} şemîyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} şemîyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} şemîyan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">şemîya borî</relative>
+				<relative type="0">ev şemî</relative>
+				<relative type="1">şemîya were</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} şemîyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} şemîyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} şemîyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} şemîyan</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="dayperiod">
 				<displayName>BN/PN</displayName>
 			</field>
 			<field type="hour">
 				<displayName>saet</displayName>
+				<relative type="0">ev saet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} saetê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} saetan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} saetê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} saetan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="hour-short">
 				<displayName>sa.</displayName>
+				<relative type="0">ev saet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} saetê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} saetan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} saetê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} saetan</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<relative type="0">ev saet</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} saetê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} saetan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} saetê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} saetan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>deqîqe</displayName>
-				<relative type="0">vê deqeyê</relative>
+				<relative type="0">ev deqîqe</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">di {0} deqeyê de</relativeTimePattern>
-					<relativeTimePattern count="other">di {0} deqeyan de</relativeTimePattern>
+					<relativeTimePattern count="one">piştî {0} deqîqeyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} deqîqeyan</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">berî {0} deqeyê</relativeTimePattern>
-					<relativeTimePattern count="other">berî {0} deqeyan</relativeTimePattern>
+					<relativeTimePattern count="one">berî {0} deqîqeyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} deqîqeyan</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>dq.</displayName>
+				<relative type="0">ev deqîqe</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">di {0} dq. de</relativeTimePattern>
-					<relativeTimePattern count="other">di {0} dq de</relativeTimePattern>
+					<relativeTimePattern count="one">piştî {0} dq.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} dq.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">berî {0} dq.</relativeTimePattern>
@@ -1572,21 +2778,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="minute-narrow">
+				<relative type="0">ev deqîqe</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">di {0} dq de</relativeTimePattern>
-					<relativeTimePattern count="other">di {0}dq de</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">berî {0} dq.</relativeTimePattern>
-					<relativeTimePattern count="other">berî {0} d.</relativeTimePattern>
+					<relativeTimePattern count="one">piştî {0} dq.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} dq.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>sanîye</displayName>
-				<relative type="0">vêga</relative>
+				<relative type="0">niha</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} saniyeyê</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} saniyeyan</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} saniyeyê</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} saniyeyan</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>sn.</displayName>
+				<relative type="0">niha</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} sn.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} sn.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} sn.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} sn.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relative type="0">niha</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">piştî {0} sn.</relativeTimePattern>
+					<relativeTimePattern count="other">piştî {0} sn.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">berî {0} sn.</relativeTimePattern>
+					<relativeTimePattern count="other">berî {0} sn.</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="zone">
 				<displayName>qada saetê</displayName>
@@ -1598,7 +2829,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<regionFormat>Saeta {0}(y)ê</regionFormat>
 			<regionFormat type="daylight">Saeta Havînê ya {0}(y)ê</regionFormat>
-			<regionFormat type="standard">Saeta Standard a {0}(y)ê</regionFormat>
+			<regionFormat type="standard">Saeta {0}(y)ê ya Standard</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Saeta Gerdûnî ya Hevdemî</standard>
@@ -1748,9 +2979,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Tbilisi">
 				<exemplarCity>Tiflîs</exemplarCity>
 			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akra</exemplarCity>
-			</zone>
 			<zone type="Europe/Gibraltar">
 				<exemplarCity>Cebelîtariq</exemplarCity>
 			</zone>
@@ -1777,7 +3005,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight>Saeta Standard a Îrlandayê</daylight>
+					<daylight>Saeta Îrlandayê ya Standard</daylight>
 				</long>
 				<exemplarCity>Dûblîn</exemplarCity>
 			</zone>
@@ -2027,6 +3255,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Saigon">
 				<exemplarCity>Bajarê Ho Chi Minhê</exemplarCity>
 			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>Saeta Acreyê</generic>
+					<standard>Saeta Acreyê ya Standard</standard>
+					<daylight>Saeta Havînê ya Acreyê</daylight>
+				</long>
+			</metazone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>Saeta Efxanistanê</standard>
@@ -2049,9 +3284,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Saeta Afrîkaya Rojava</generic>
-					<standard>Saeta Standard a Afrîkaya Rojava</standard>
-					<daylight>Saeta Havînê ya Afrîkaya Rojava</daylight>
+					<standard>Saeta Afrîkaya Rojava</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2060,30 +3293,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Alaskayê</standard>
 					<daylight>Saeta Havînê ya Alaskayê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SAK</generic>
-					<standard draft="contributed">SSAK</standard>
-					<daylight draft="contributed">SHAK</daylight>
-				</short>
+			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>Saeta Almatîyê</generic>
+					<standard>Saeta Almatîyê ya Standard</standard>
+					<daylight>Saeta Havînê ya Almatîyê</daylight>
+				</long>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
 					<generic>Saeta Amazonê</generic>
-					<standard>Saeta Standard a Amazonê</standard>
+					<standard>Saeta Amazonê ya Standard</standard>
 					<daylight>Saeta Havînê ya Amazonê</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Saeta Navendî ya Amerîkaya Bakur</generic>
-					<standard>Saeta Standard a Navendî ya Amerîkaya Bakur</standard>
-					<daylight>Saeta Havînê ya Navendî ya Amerîkaya Bakur</daylight>
+					<generic>Saeta Merkezî ya Amerîkaya Bakur</generic>
+					<standard>Saeta Merkezî ya Standard a Amerîkaya Bakur</standard>
+					<daylight>Saeta Havînê ya Merkezî ya Amerîkaya Bakur</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SN</generic>
-					<standard draft="contributed">SSN</standard>
-					<daylight draft="contributed">SHN</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
@@ -2091,11 +3321,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Rojhilat ya Amerîkaya Bakur</standard>
 					<daylight>Saeta Havînê ya Rojhilat ya Amerîkaya Bakur</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SR</generic>
-					<standard draft="contributed">SSR</standard>
-					<daylight draft="contributed">SHR</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
@@ -2103,11 +3328,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Çîyayî ya Amerîkaya Bakur</standard>
 					<daylight>Saeta Havînê ya Çîyayî ya Amerîkaya Bakur</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SÇ</generic>
-					<standard draft="contributed">SSÇ</standard>
-					<daylight draft="contributed">SHÇ</daylight>
-				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
@@ -2115,30 +3335,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Pasîfîkê ya Amerîkaya Bakur</standard>
 					<daylight>Saeta Havînê ya Pasîfîkê ya Amerîkaya Bakur</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SP</generic>
-					<standard draft="contributed">SSP</standard>
-					<daylight draft="contributed">SHP</daylight>
-				</short>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>Saeta Anadyrê</generic>
+					<standard>Saeta Anadyrê ya Standard</standard>
+					<daylight>Saeta Havînê ya Anadyrê</daylight>
+				</long>
 			</metazone>
 			<metazone type="Apia">
 				<long>
 					<generic>Saeta Apiayê</generic>
-					<standard>Saeta Standard a Apiayê</standard>
+					<standard>Saeta Apiayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Apiayê</daylight>
 				</long>
 			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>Saeta Aqtauyê</generic>
+					<standard>Saeta Aqtauyê ya Standard</standard>
+					<daylight>Saeta Havînê ya Aqtauyê</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>Saeta Aqtobeyê</generic>
+					<standard>Saeta Aqtobeyê ya Standard</standard>
+					<daylight>Saeta Havînê ya Aqtobeyê</daylight>
+				</long>
+			</metazone>
 			<metazone type="Arabian">
 				<long>
 					<generic>Saeta Erebistanê</generic>
-					<standard>Saeta Standard a Erebistanê</standard>
+					<standard>Saeta Erebistanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Erebistanê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
 					<generic>Saeta Arjantînê</generic>
-					<standard>Saeta Standard a Arjantînê</standard>
+					<standard>Saeta Arjantînê ya Standard</standard>
 					<daylight>Saeta Havînê ya Arjantînê</daylight>
 				</long>
 			</metazone>
@@ -2152,7 +3388,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Armenia">
 				<long>
 					<generic>Saeta Ermenistanê</generic>
-					<standard>Saeta Standard a Ermenistanê</standard>
+					<standard>Saeta Ermenistanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Ermenistanê</daylight>
 				</long>
 			</metazone>
@@ -2162,11 +3398,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Atlantîkê</standard>
 					<daylight>Saeta Havînê ya Atlantîkê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SA</generic>
-					<standard draft="contributed">SSA</standard>
-					<daylight draft="contributed">SHA</daylight>
-				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
@@ -2199,21 +3430,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Azerbaijan">
 				<long>
 					<generic>Saeta Azerbeycanê</generic>
-					<standard>Saeta Standard a Azerbeycanê</standard>
+					<standard>Saeta Azerbeycanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Azerbeycanê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
 					<generic>Saeta Azoran</generic>
-					<standard>Saeta Standard a Azoran</standard>
+					<standard>Saeta Azoran a Standard</standard>
 					<daylight>Saeta Havînê ya Azoran</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
 					<generic>Saeta Bengladeşê</generic>
-					<standard>Saeta Standard a Bengladeşê</standard>
+					<standard>Saeta Bengladeşê ya Standard</standard>
 					<daylight>Saeta Havînê ya Bengladeşê</daylight>
 				</long>
 			</metazone>
@@ -2230,13 +3461,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Brasilia">
 				<long>
 					<generic>Saeta Brasîlyayê</generic>
-					<standard>Saeta Standard a Brasîlyayê</standard>
+					<standard>Saeta Brasîlyayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Brasîlyayê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Saeta Brûney Darusselamê</standard>
+					<standard>Saeta Brûneyê</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -2246,9 +3477,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Saeta Havînê ya Cape Verdeyê</daylight>
 				</long>
 			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard>Saeta Caseyê</standard>
+				</long>
+			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Saeta Standard a Chamorroyê</standard>
+					<standard>Saeta Chamorroyê ya Standard</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -2261,14 +3497,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Chile">
 				<long>
 					<generic>Saeta Şîlîyê</generic>
-					<standard>Saeta Standard a Şîlîyê</standard>
+					<standard>Saeta Şîlîyê ya Standard</standard>
 					<daylight>Saeta Havînê ya Şîlîyê</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
 					<generic>Saeta Çînê</generic>
-					<standard>Saeta Standard a Çînê</standard>
+					<standard>Saeta Çînê ya Standard</standard>
 					<daylight>Saeta Havînê ya Çînê</daylight>
 				</long>
 			</metazone>
@@ -2285,15 +3521,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Colombia">
 				<long>
 					<generic>Saeta Kolombîyayê</generic>
-					<standard>Saeta Standard a Kolombîyayê</standard>
+					<standard>Saeta Kolombîyayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Kolombîyayê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
 					<generic>Saeta Giravên Cookê</generic>
-					<standard>Saeta Standard a Giravên Cookê</standard>
-					<daylight>Saeta Nîvhavînê ya Giravên Cookê</daylight>
+					<standard>Saeta Giravên Cookê ya Standard</standard>
+					<daylight>Saeta Havînê ya Giravên Cookê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -2302,11 +3538,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Kubayê</standard>
 					<daylight>Saeta Havînê ya Kubayê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SK</generic>
-					<standard draft="contributed">SSK</standard>
-					<daylight draft="contributed">SHK</daylight>
-				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
@@ -2364,14 +3595,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Falkland">
 				<long>
 					<generic>Saeta Giravên Falklandê</generic>
-					<standard>Saeta Standard a Giravên Falklandê</standard>
+					<standard>Saeta Giravên Falklandê ya Standard</standard>
 					<daylight>Saeta Havînê ya Giravên Falklandê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
 					<generic>Saeta Fîjîyê</generic>
-					<standard>Saeta Standard a Fîjîyê</standard>
+					<standard>Saeta Fîjîyê ya Standard</standard>
 					<daylight>Saeta Havînê ya Fîjîyê</daylight>
 				</long>
 			</metazone>
@@ -2398,7 +3629,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Georgia">
 				<long>
 					<generic>Saeta Gurcistanê</generic>
-					<standard>Saeta Standard a Gurcistanê</standard>
+					<standard>Saeta Gurcistanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Gurcistanê</daylight>
 				</long>
 			</metazone>
@@ -2412,17 +3643,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Navînî ya Greenwichê</standard>
 				</long>
 			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic>Saeta Grînlendayê</generic>
+					<standard>Saeta Grînlendayê ya Standard</standard>
+					<daylight>Saeta Havînê ya Grînlendayê</daylight>
+				</long>
+			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>Saeta Grînlanda Rojhilat</generic>
 					<standard>Saeta Standard a Grînlanda Rojhilat</standard>
 					<daylight>Saeta Havînê ya Grînlanda Rojhilat</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SGR</generic>
-					<standard draft="contributed">SSGR</standard>
-					<daylight draft="contributed">SHGR</daylight>
-				</short>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
@@ -2430,15 +3663,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Grînlanda Rojava</standard>
 					<daylight>Saeta Havînê ya Grînlanda Rojava</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SGRO</generic>
-					<standard draft="contributed">SSGRO</standard>
-					<daylight draft="contributed">SHGRO</daylight>
-				</short>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>Saeta Guamê ya Standard</standard>
+				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard>Saeta Standard a Kendavê</standard>
+					<standard>Saeta Kendavê ya Standard</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
@@ -2446,35 +3679,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Guyanayê</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Saeta Standard a Hawaii-Aleutianê</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Saeta Hawaii-Aleutianê</generic>
 					<standard>Saeta Standard a Hawaii-Aleutianê</standard>
 					<daylight>Saeta Havînê ya Hawaii-Aleutianê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SHAL</generic>
-					<standard draft="contributed">SSHA</standard>
-					<daylight draft="contributed">SHHA</daylight>
-				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
 					<generic>Saeta Hong Kongê</generic>
-					<standard>Saeta Standard a Hong Kongê</standard>
+					<standard>Saeta Hong Kongê ya Standard</standard>
 					<daylight>Saeta Havînê ya Hong Kongê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
 					<generic>Saeta Hovdê</generic>
-					<standard>Saeta Standard a Hovdê</standard>
+					<standard>Saeta Hovdê ya Standard</standard>
 					<daylight>Saeta Havînê ya Hovdê</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard>Saeta Standard a Hindistanê</standard>
+					<standard>Saeta Hindistanê ya Standard</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -2505,29 +3738,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Iran">
 				<long>
 					<generic>Saeta Îranê</generic>
-					<standard>Saeta Standard a Îranê</standard>
+					<standard>Saeta Îranê ya Standard</standard>
 					<daylight>Saeta Havînê ya Îranê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
 					<generic>Saeta Irkutskê</generic>
-					<standard>Saeta Standard a Irkutskê</standard>
+					<standard>Saeta Irkutskê ya Standard</standard>
 					<daylight>Saeta Havînê ya Irkutskê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
 					<generic>Saeta Îsraîlê</generic>
-					<standard>Saeta Standard a Îsraîlê</standard>
+					<standard>Saeta Îsraîlê ya Standard</standard>
 					<daylight>Saeta Havînê ya Îsraîlê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Saeta Japonyayê</generic>
-					<standard>Saeta Standard a Japonyayê</standard>
-					<daylight>Saeta Havşnê ya Japonyayê</daylight>
+					<standard>Saeta Japonyayê ya Standard</standard>
+					<daylight>Saeta Havînê ya Japonyayê</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kamchatka">
+				<long>
+					<generic>Saeta Kamchatkayê</generic>
+					<standard>Saeta Kamchatkayê ya Standard</standard>
+					<daylight>Saeta Havînê ya Kamchatkayê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
@@ -2548,7 +3788,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Korea">
 				<long>
 					<generic>Saeta Koreyê</generic>
-					<standard>Saeta Standard a Koreyê</standard>
+					<standard>Saeta Koreyê ya Standard</standard>
 					<daylight>Saeta Havînê ya Koreyê</daylight>
 				</long>
 			</metazone>
@@ -2560,7 +3800,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Krasnoyarsk">
 				<long>
 					<generic>Saeta Krasnoyarskê</generic>
-					<standard>Saeta Standard a Krasnoyarskê</standard>
+					<standard>Saeta Krasnoyarskê ya Standard</standard>
 					<daylight>Saeta Havînê ya Krasnoyarskê</daylight>
 				</long>
 			</metazone>
@@ -2569,6 +3809,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Qirxizistanê</standard>
 				</long>
 			</metazone>
+			<metazone type="Lanka">
+				<long>
+					<standard>Saeta Lankayê</standard>
+				</long>
+			</metazone>
 			<metazone type="Line_Islands">
 				<long>
 					<standard>Saeta Giravên Lîneyê</standard>
@@ -2581,10 +3826,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Saeta Havînê ya Lord Howeyê</daylight>
 				</long>
 			</metazone>
+			<metazone type="Macau">
+				<long>
+					<generic>Saeta Macaoyê</generic>
+					<standard>Saeta Macaoyê ya Standard</standard>
+					<daylight>Saeta Havînê ya Macaoyê</daylight>
+				</long>
+			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Saeta Magadanê</generic>
-					<standard>Saeta Standard a Magadanê</standard>
+					<standard>Saeta Magadanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Magadanê</daylight>
 				</long>
 			</metazone>
@@ -2611,7 +3863,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Mauritius">
 				<long>
 					<generic>Saeta Mauritiusê</generic>
-					<standard>Saeta Standard a Mauritiusê</standard>
+					<standard>Saeta Mauritiusê ya Standard</standard>
 					<daylight>Saeta Havînê ya Mauritiusê</daylight>
 				</long>
 			</metazone>
@@ -2630,14 +3882,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Mongolia">
 				<long>
 					<generic>Saeta Ûlanbatarê</generic>
-					<standard>Saeta Standard a Ûlanbatarê</standard>
+					<standard>Saeta Ûlanbatarê ya Standard</standard>
 					<daylight>Saeta Havînê ya Ûlanbatarê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
 					<generic>Saeta Moskovayê</generic>
-					<standard>Saeta Standard a Moskovayê</standard>
+					<standard>Saeta Moskovayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Moskovayê</daylight>
 				</long>
 			</metazone>
@@ -2676,11 +3928,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Newfoundlandê</standard>
 					<daylight>Saeta Havînê ya Newfoundlandê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SNF</generic>
-					<standard draft="contributed">SSNF</standard>
-					<daylight draft="contributed">SHNF</daylight>
-				</short>
 			</metazone>
 			<metazone type="Niue">
 				<long>
@@ -2697,28 +3944,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Noronha">
 				<long>
 					<generic>Saeta Fernando de Noronhayê</generic>
-					<standard>Saeta Standard a Fernando de Noronhayê</standard>
+					<standard>Saeta Fernando de Noronhayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Fernando de Noronhayê</daylight>
 				</long>
 			</metazone>
+			<metazone type="North_Mariana">
+				<long>
+					<standard>Saeta Giravên Marianaya Bakur</standard>
+				</long>
+			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
 					<generic>Saeta Novosibirskê</generic>
-					<standard>Saeta Standard a Novosibirskê</standard>
+					<standard>Saeta Novosibirskê ya Standard</standard>
 					<daylight>Saeta Havînê ya Novosibirskê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
 					<generic>Saeta Omskê</generic>
-					<standard>Saeta Standard a Omskê</standard>
+					<standard>Saeta Omskê ya Standard</standard>
 					<daylight>Saeta Havînê ya Omskê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
 					<generic>Saeta Pakistanê</generic>
-					<standard>Saeta Standard a Pakistanê</standard>
+					<standard>Saeta Pakistanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Pakistanê</daylight>
 				</long>
 			</metazone>
@@ -2735,21 +3987,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Paraguay">
 				<long>
 					<generic>Saeta Paragûayê</generic>
-					<standard>Saeta Standard a Paragûayê</standard>
+					<standard>Saeta Paragûayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Paragûayê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
 					<generic>Saeta Perûyê</generic>
-					<standard>Saeta Standard a Perûyê</standard>
+					<standard>Saeta Perûyê ya Standard</standard>
 					<daylight>Saeta Havînê ya Perûyê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
 					<generic>Saeta Fîlîpînê</generic>
-					<standard>Saeta Standard a Fîlîpînê</standard>
+					<standard>Saeta Fîlîpînê ya Standard</standard>
 					<daylight>Saeta Havînê ya Fîlîpînê</daylight>
 				</long>
 			</metazone>
@@ -2780,6 +4032,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Pyongyangê</standard>
 				</long>
 			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>Saeta Qizilordayê</generic>
+					<standard>Saeta Qizilordayê ya Standard</standard>
+					<daylight>Saeta Havînê ya Qizilordayê</daylight>
+				</long>
+			</metazone>
 			<metazone type="Reunion">
 				<long>
 					<standard>Saeta Réunionê</standard>
@@ -2793,14 +4052,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Sakhalin">
 				<long>
 					<generic>Saeta Saxalînê</generic>
-					<standard>Saeta Standard a Saxalînê</standard>
+					<standard>Saeta Saxalînê ya Standard</standard>
 					<daylight>Saeta Havînê ya Saxalînê</daylight>
 				</long>
 			</metazone>
+			<metazone type="Samara">
+				<long>
+					<generic>Saeta Samarayê</generic>
+					<standard>Saeta Samarayê ya Standard</standard>
+					<daylight>Saeta Havînê ya Samarayê</daylight>
+				</long>
+			</metazone>
 			<metazone type="Samoa">
 				<long>
 					<generic>Saeta Samoayê</generic>
-					<standard>Saeta Standard a Samoayê</standard>
+					<standard>Saeta Samoayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Samoayê</daylight>
 				</long>
 			</metazone>
@@ -2811,7 +4077,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard>Saeta Standard a Sîngapûrê</standard>
+					<standard>Saeta Sîngapûrê ya Standard</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
@@ -2842,7 +4108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Taipei">
 				<long>
 					<generic>Saeta Taîpeîyê</generic>
-					<standard>Saeta Standard a Taîpeîyê</standard>
+					<standard>Saeta Taîpeîyê ya Standard</standard>
 					<daylight>Saeta Havînê ya Taîpeîyê</daylight>
 				</long>
 			</metazone>
@@ -2859,7 +4125,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Tonga">
 				<long>
 					<generic>Saeta Tongayê</generic>
-					<standard>Saeta Standard a Tongayê</standard>
+					<standard>Saeta Tongayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Tongayê</daylight>
 				</long>
 			</metazone>
@@ -2871,7 +4137,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Saeta Tirkmenistanê</generic>
-					<standard>Saeta Standard a Tirkmenistanê</standard>
+					<standard>Saeta Tirkmenistanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Tirkmenistanê</daylight>
 				</long>
 			</metazone>
@@ -2883,21 +4149,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Uruguay">
 				<long>
 					<generic>Saeta Ûrûgûayê</generic>
-					<standard>Saeta Standard a Ûrûgûayê</standard>
+					<standard>Saeta Ûrûgûayê ya Standard</standard>
 					<daylight>Saeta Havînê ya Ûrûgûayê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
 					<generic>Saeta Ozbekistanê</generic>
-					<standard>Saeta Standard a Ozbekistanê</standard>
+					<standard>Saeta Ozbekistanê ya Standard</standard>
 					<daylight>Saeta Havînê ya Ozbekistanê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
 					<generic>Saeta Vanûatûyê</generic>
-					<standard>Saeta Standard a Vanûatûyê</standard>
+					<standard>Saeta Vanûatûyê ya Standard</standard>
 					<daylight>Saeta Havînê ya Vanûatûyê</daylight>
 				</long>
 			</metazone>
@@ -2909,14 +4175,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Vladivostok">
 				<long>
 					<generic>Saeta Vladivostokê</generic>
-					<standard>Saeta Standard a Vladivostokê</standard>
+					<standard>Saeta Vladivostokê ya Standard</standard>
 					<daylight>Saeta Havînê ya Vladivostokê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
 					<generic>Saeta Volgogradê</generic>
-					<standard>Saeta Standard a Volgogradê</standard>
+					<standard>Saeta Volgogradê ya Standard</standard>
 					<daylight>Saeta Havînê ya Volgogradê</daylight>
 				</long>
 			</metazone>
@@ -2938,14 +4204,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Yakutsk">
 				<long>
 					<generic>Saeta Yakutskê</generic>
-					<standard>Saeta Standard a Yakutskê</standard>
+					<standard>Saeta Yakutskê ya Standard</standard>
 					<daylight>Saeta Havînê ya Yakutskê</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
 					<generic>Saeta Yekaterinburgê</generic>
-					<standard>Saeta Standard a Yekaterinburgê</standard>
+					<standard>Saeta Yekaterinburgê ya Standard</standard>
 					<daylight>Saeta Havînê ya Yekaterinburgê</daylight>
 				</long>
 			</metazone>
@@ -2953,9 +4219,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<long>
 					<standard>Saeta Yukonê</standard>
 				</long>
-				<short>
-					<standard draft="contributed">SY</standard>
-				</short>
 			</metazone>
 		</timeZoneNames>
 	</dates>
@@ -3029,13 +4292,315 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="ahom">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bhks">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="diak">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gara">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gukh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hmnp">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kawi">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="krai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -3068,17 +4633,492 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathbold">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathdbl">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathmono">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsanb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mathsans">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="modi">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mroo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrepka">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrpao">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrtlng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nagm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="newa">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="onao">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="outlined">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="segment">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sind">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sinh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sunu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tirh">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tnsa">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tols">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wara">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="wcho">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
+			<currency type="ADP">
+				<displayName>pezetayê andorrayî</displayName>
+				<displayName count="one">pezetayê andorrayî</displayName>
+				<displayName count="other">pezetayên andorrayî</displayName>
+			</currency>
 			<currency type="AED">
 				<displayName>dîrhemê mîrgehên erebî yên yekbûyî</displayName>
 				<displayName count="one">dîrhemê MEYî</displayName>
 				<displayName count="other">dîrhemên MEYî</displayName>
 			</currency>
+			<currency type="AFA">
+				<displayName>efxanîyê efxanistanî (1927–2002)</displayName>
+				<displayName count="one">efxanîyê efxanistanî (1927–2002)</displayName>
+				<displayName count="other">efxanîyên efxanistanî (1927–2002)</displayName>
+			</currency>
 			<currency type="AFN">
 				<displayName>efxanîyê efxanistanî</displayName>
 				<displayName count="one">efxanîyê efxanistanî</displayName>
 				<displayName count="other">efxanîyên efxanistanî</displayName>
 			</currency>
+			<currency type="ALK">
+				<displayName>lekê arnawidî (1946–1965)</displayName>
+				<displayName count="one">lekê arnawidî (1946–1965)</displayName>
+				<displayName count="other">lekên arnawidî (1946–1965)</displayName>
+			</currency>
 			<currency type="ALL">
 				<displayName>lekê arnawidî</displayName>
 				<displayName count="one">lekê arnawidî</displayName>
@@ -3099,11 +5139,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">kwanzayê angolayî</displayName>
 				<displayName count="other">kwanzayên angolayî</displayName>
 			</currency>
+			<currency type="AOK">
+				<displayName>kwanzayê angolayî (1977–1991)</displayName>
+				<displayName count="one">kwanzayê angolayî (1977–1991)</displayName>
+				<displayName count="other">kwanzayên angolayî (1977–1991)</displayName>
+			</currency>
+			<currency type="AON">
+				<displayName>kwanzayê nû ya angolayî (1990–2000)</displayName>
+				<displayName count="one">kwanzayê nû ya angolayî (1990–2000)</displayName>
+				<displayName count="other">kwanzayên nû yên angolayî (1990–2000)</displayName>
+			</currency>
+			<currency type="AOR">
+				<displayName>kwanza reajustadoyê angolayî (1995–1999)</displayName>
+				<displayName count="one">kwanza reajustadoyê angolayî (1995–1999)</displayName>
+				<displayName count="other">kwanza reajustadoyên angolayî (1995–1999)</displayName>
+			</currency>
+			<currency type="ARA">
+				<displayName>australê arjantînî</displayName>
+				<displayName count="one">australê arjantînî</displayName>
+				<displayName count="other">australên arjantînî</displayName>
+			</currency>
+			<currency type="ARL">
+				<displayName>peso leyê arjantînî (1970–1983)</displayName>
+				<displayName count="one">peso leyê arjantînî (1970–1983)</displayName>
+				<displayName count="other">peso leyên arjantînî (1970–1983)</displayName>
+			</currency>
+			<currency type="ARM">
+				<displayName>pesoyê arjantînî (1881–1970)</displayName>
+				<displayName count="one">pesoyê arjantînî (1881–1970)</displayName>
+				<displayName count="other">pesoyên arjantînî (1881–1970)</displayName>
+			</currency>
+			<currency type="ARP">
+				<displayName>pesoyê arjantînî (1983–1985)</displayName>
+				<displayName count="one">pesoyê arjantînî (1983–1985)</displayName>
+				<displayName count="other">pesoyên arjantînî (1983–1985)</displayName>
+			</currency>
 			<currency type="ARS">
 				<displayName>pesoyê arjantînî</displayName>
 				<displayName count="one">pesoyê arjantînî</displayName>
 				<displayName count="other">pesoyên arjantînî</displayName>
 			</currency>
+			<currency type="ATS">
+				<displayName>şîllîngê awistiryayî</displayName>
+				<displayName count="one">şîllîngê awistiryayî</displayName>
+				<displayName count="other">şîllîngên awistiryayî</displayName>
+			</currency>
 			<currency type="AUD">
 				<displayName>dolarê awistralyayî</displayName>
 				<displayName count="one">dolarê awistralyayî</displayName>
@@ -3114,14 +5194,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">florînê arubayî</displayName>
 				<displayName count="other">florînên arubayî</displayName>
 			</currency>
+			<currency type="AZM">
+				<displayName>manatê azerbeycanî (1993–2006)</displayName>
+				<displayName count="one">manatê azerbeycanî (1993–2006)</displayName>
+				<displayName count="other">manatên azerbeycanî (1993–2006)</displayName>
+			</currency>
 			<currency type="AZN">
 				<displayName>manatê azerbeycanî</displayName>
 			</currency>
+			<currency type="BAD">
+				<displayName>dînarê bosna hersekî (1992–1994)</displayName>
+				<displayName count="one">dînarê bosna hersekî (1992–1994)</displayName>
+				<displayName count="other">dînarên bosna hersekî (1992–1994)</displayName>
+			</currency>
 			<currency type="BAM">
 				<displayName>markê konvertibl ê bosna hersekî</displayName>
 				<displayName count="one">markê konvertibl ê bosna hersekî</displayName>
 				<displayName count="other">markên konvertibl ê bosna hersekî</displayName>
 			</currency>
+			<currency type="BAN">
+				<displayName>dînarê nû yê bosna hersekî (1994–1997)</displayName>
+				<displayName count="one">dînarê nû yê bosna hersekî (1994–1997)</displayName>
+				<displayName count="other">dînarên nû yên bosna hersekî (1994–1997)</displayName>
+			</currency>
 			<currency type="BBD">
 				<displayName>dolarê barbadosî</displayName>
 				<displayName count="one">dolarê barbadosî</displayName>
@@ -3132,11 +5227,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">takayê bengladeşî</displayName>
 				<displayName count="other">takayên bengladeşî</displayName>
 			</currency>
+			<currency type="BEC">
+				<displayName>frankê belçîkayî (konvertibl)</displayName>
+				<displayName count="one">frankê belçîkayî (konvertibl)</displayName>
+				<displayName count="other">frankên belçîkayî (konvertibl)</displayName>
+			</currency>
+			<currency type="BEF">
+				<displayName>frankê belçîkayî</displayName>
+				<displayName count="one">frankê belçîkayî</displayName>
+				<displayName count="other">frankên belçîkayî</displayName>
+			</currency>
+			<currency type="BEL">
+				<displayName>frankê belçîkayî (fînansî)</displayName>
+				<displayName count="one">frankê belçîkayî (fînansî)</displayName>
+				<displayName count="other">frankên belçîkayî (fînansî)</displayName>
+			</currency>
+			<currency type="BGL">
+				<displayName>levê bulgarî (hard)</displayName>
+				<displayName count="one">levê bulgarî (hard)</displayName>
+				<displayName count="other">levên bulgarî (hard)</displayName>
+			</currency>
+			<currency type="BGM">
+				<displayName>levê bulgarî (1952–1962)</displayName>
+				<displayName count="one">levê bulgarî (1952–1962)</displayName>
+				<displayName count="other">levên bulgarî (1952–1962)</displayName>
+			</currency>
 			<currency type="BGN">
 				<displayName>levê bulgarî</displayName>
 				<displayName count="one">levê bulgarî</displayName>
 				<displayName count="other">levên bulgarî</displayName>
 			</currency>
+			<currency type="BGO">
+				<displayName>levê bulgarî (1879–1952)</displayName>
+				<displayName count="one">levê bulgarî (1879–1952)</displayName>
+				<displayName count="other">levên bulgarî (1879–1952)</displayName>
+			</currency>
 			<currency type="BHD">
 				<displayName>dînarê behreynê</displayName>
 				<displayName count="one">dînarê behreynê</displayName>
@@ -3162,11 +5287,56 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">bolîvyanoyê bolîvyayî</displayName>
 				<displayName count="other">bolîvyanoyên bolîvyayî</displayName>
 			</currency>
+			<currency type="BOL">
+				<displayName>bolîvyanoyê bolîvyayî (1863–1963)</displayName>
+				<displayName count="one">bolîvyanoyê bolîvyayî (1863–1963)</displayName>
+				<displayName count="other">bolîvyanoyên bolîvyayî (1863–1963)</displayName>
+			</currency>
+			<currency type="BOP">
+				<displayName>pesoyê bolîvyayî</displayName>
+				<displayName count="one">pesoyê bolîvyayî</displayName>
+				<displayName count="other">pesoyên bolîvyayî</displayName>
+			</currency>
+			<currency type="BOV">
+				<displayName>mvodolê bolîvyayî</displayName>
+				<displayName count="one">mvodolê bolîvyayî</displayName>
+				<displayName count="other">mvodolên bolîvyayî</displayName>
+			</currency>
+			<currency type="BRB">
+				<displayName>kruzeîroyê nû ya brezîlyayî (1967–1986)</displayName>
+				<displayName count="one">kruzeîroyê nû ya brezîlyayî (1967–1986)</displayName>
+				<displayName count="other">kruzeîroyên nû yên brezîlyayî (1967–1986)</displayName>
+			</currency>
+			<currency type="BRC">
+				<displayName>kruzadoyê brezîlyayî (1986–1989)</displayName>
+				<displayName count="one">kruzadoyê brezîlyayî (1986–1989)</displayName>
+				<displayName count="other">kruzadoyên brezîlyayî (1986–1989)</displayName>
+			</currency>
+			<currency type="BRE">
+				<displayName>kruzeîroyê brezîlyayî (1990–1993)</displayName>
+				<displayName count="one">kruzeîroyê brezîlyayî (1990–1993)</displayName>
+				<displayName count="other">kruzeîroyên brezîlyayî (1990–1993)</displayName>
+			</currency>
 			<currency type="BRL">
 				<displayName>realê brezîlyayî</displayName>
 				<displayName count="one">realê brezîlyayî</displayName>
 				<displayName count="other">realên brezîlyayî</displayName>
 			</currency>
+			<currency type="BRN">
+				<displayName>kruzadoyê nû yê brezîlyayî (1989–1990)</displayName>
+				<displayName count="one">kruzadoyê nû yê brezîlyayî (1989–1990)</displayName>
+				<displayName count="other">kruzadoyên nû yên brezîlyayî (1989–1990)</displayName>
+			</currency>
+			<currency type="BRR">
+				<displayName>kruzeîroyê brezîlyayî (1993–1994)</displayName>
+				<displayName count="one">kruzeîroyê brezîlyayî (1993–1994)</displayName>
+				<displayName count="other">kruzeîroyên brezîlyayî (1993–1994)</displayName>
+			</currency>
+			<currency type="BRZ">
+				<displayName>kruzeîroyê brezîlyayî (1942–1967)</displayName>
+				<displayName count="one">kruzeîroyê brezîlyayî (1942–1967)</displayName>
+				<displayName count="other">kruzeîroyên brezîlyayî (1942–1967)</displayName>
+			</currency>
 			<currency type="BSD">
 				<displayName>dolarê bahamayî</displayName>
 				<displayName count="one">dolarê bahamayî</displayName>
@@ -3177,15 +5347,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">ngultrumê bûtanî</displayName>
 				<displayName count="other">ngultrumên bûtanî</displayName>
 			</currency>
+			<currency type="BUK">
+				<displayName>kyatê burmayî</displayName>
+				<displayName count="one">kyatê burmayî</displayName>
+				<displayName count="other">kyatên burmayî</displayName>
+			</currency>
 			<currency type="BWP">
 				<displayName>pulayê botswanayî</displayName>
 				<displayName count="one">pulayê botswanayî</displayName>
 				<displayName count="other">pulayên botswanayî</displayName>
 			</currency>
+			<currency type="BYB">
+				<displayName>rubleyê belarûsî (1994–1999)</displayName>
+				<displayName count="one">rubleyê belarûsî (1994–1999)</displayName>
+				<displayName count="other">rubleyên belarûsî (1994–1999)</displayName>
+			</currency>
 			<currency type="BYN">
-				<displayName>rûbleyê belarûsî</displayName>
-				<displayName count="one">rûbleyê belarûsî</displayName>
-				<displayName count="other">rûbleyên belarûsî</displayName>
+				<displayName>rubleyê belarûsî</displayName>
+				<displayName count="one">rubleyê belarûsî</displayName>
+				<displayName count="other">rubleyên belarûsî</displayName>
+			</currency>
+			<currency type="BYR">
+				<displayName>rubleyê belarûsî (2000–2016)</displayName>
+				<displayName count="one">rubleyê belarûsî (2000–2016)</displayName>
+				<displayName count="other">rubleyên belarûsî (2000–2016)</displayName>
 			</currency>
 			<currency type="BZD">
 				<displayName>dolarê belîzeyî</displayName>
@@ -3202,21 +5387,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">frankê kongoyî</displayName>
 				<displayName count="other">frankên kongoyî</displayName>
 			</currency>
+			<currency type="CHE">
+				<displayName>ewroyê WIRê</displayName>
+				<displayName count="one">ewroyê WIRê</displayName>
+				<displayName count="other">ewroyên WIRê</displayName>
+			</currency>
 			<currency type="CHF">
 				<displayName>frankê swîsrî</displayName>
 				<displayName count="one">frankê swîsrî</displayName>
 				<displayName count="other">frankên swîsrî</displayName>
 			</currency>
+			<currency type="CHW">
+				<displayName>frankê WIRê</displayName>
+				<displayName count="one">frankê WIRê</displayName>
+				<displayName count="other">frankên WIRê</displayName>
+			</currency>
+			<currency type="CLE">
+				<displayName>eskodoyê şîlîyî</displayName>
+				<displayName count="one">eskodoyê şîlîyî</displayName>
+				<displayName count="other">eskodoyên şîlîyî</displayName>
+			</currency>
+			<currency type="CLF">
+				<displayName>unidades de fomentoyê şîlîyî</displayName>
+				<displayName count="one">unidades de fomentoyê şîlîyî</displayName>
+				<displayName count="other">unidades de fomentoyên şîlîyî</displayName>
+			</currency>
 			<currency type="CLP">
-				<displayName>pesoyê şîlîyê</displayName>
-				<displayName count="one">pesoyê şîlîyê</displayName>
-				<displayName count="other">pesoyên şîlîyê</displayName>
+				<displayName>pesoyê şîlîyî</displayName>
+				<displayName count="one">pesoyê şîlîyî</displayName>
+				<displayName count="other">pesoyên şîlîyî</displayName>
 			</currency>
 			<currency type="CNH">
 				<displayName>yûanê çînî (offshore)</displayName>
 				<displayName count="one">yûanê çînî (offshore)</displayName>
 				<displayName count="other">yûanên çînî (offshore)</displayName>
 			</currency>
+			<currency type="CNX">
+				<displayName>dolarê Banka Xelkî ya çînî</displayName>
+				<displayName count="one">dolarê Banka Xelkî ya çînî</displayName>
+				<displayName count="other">dolarên Banka Xelkî ya çînî</displayName>
+			</currency>
 			<currency type="CNY">
 				<displayName>yûanê çînî</displayName>
 				<displayName count="one">yûanê çînî</displayName>
@@ -3227,11 +5437,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">pesoyê kolombîyayî</displayName>
 				<displayName count="other">pesoyên kolombîyayî</displayName>
 			</currency>
+			<currency type="COU">
+				<displayName>unidad de valor realê kolombîyayî</displayName>
+				<displayName count="one">unidad de valor realê kolombîyayî</displayName>
+				<displayName count="other">unidad de valor realên kolombîyayî</displayName>
+			</currency>
 			<currency type="CRC">
 				<displayName>kolonê kosta rîkayî</displayName>
 				<displayName count="one">kolonê kosta rîkayî</displayName>
 				<displayName count="other">kolonên kosta rîkayî</displayName>
 			</currency>
+			<currency type="CSD">
+				<displayName>poundê maltayî (2002–2006)</displayName>
+				<displayName count="one">poundê maltayî (2002–2006)</displayName>
+				<displayName count="other">poundên maltayî (2002–2006)</displayName>
+			</currency>
+			<currency type="CSK">
+				<displayName>kronê çekoslovakî (hard)</displayName>
+				<displayName count="one">kronê çekoslovakî (hard)</displayName>
+				<displayName count="other">kronên çekoslovakî (hard)</displayName>
+			</currency>
 			<currency type="CUC">
 				<displayName>pesoyên konvertibl ê kubayî</displayName>
 				<displayName count="one">pesoyê konvertibl ê kubayî</displayName>
@@ -3247,11 +5472,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">eskudoyê kape verdeyî</displayName>
 				<displayName count="other">eskudoyên kape verdeyî</displayName>
 			</currency>
+			<currency type="CYP">
+				<displayName>lîreyê qibrisî</displayName>
+				<displayName count="one">lîreyê qibrisî</displayName>
+				<displayName count="other">lîreyên qibrisî</displayName>
+			</currency>
 			<currency type="CZK">
 				<displayName>kronê çekî</displayName>
 				<displayName count="one">kronê çekî</displayName>
 				<displayName count="other">kronên çekî</displayName>
 			</currency>
+			<currency type="DDM">
+				<displayName>markê almanyaya rojhilatî</displayName>
+				<displayName count="one">markê almanyaya rojhilatî</displayName>
+				<displayName count="other">markên almanyaya rojhilatî</displayName>
+			</currency>
+			<currency type="DEM">
+				<displayName>markê almanî</displayName>
+				<displayName count="one">markê almanî</displayName>
+				<displayName count="other">markên almanî</displayName>
+			</currency>
 			<currency type="DJF">
 				<displayName>frankê cîbûtîyî</displayName>
 				<displayName count="one">frankê cîbûtîyî</displayName>
@@ -3272,6 +5512,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dînarê cezayîrî</displayName>
 				<displayName count="other">dînarên cezayîrî</displayName>
 			</currency>
+			<currency type="ECS">
+				<displayName>sukreyê ekwadorî</displayName>
+				<displayName count="one">sukreyê ekwadorî</displayName>
+				<displayName count="other">sukreyên ekwadorî</displayName>
+			</currency>
+			<currency type="ECV">
+				<displayName>unidad de valor constanteyê ekwadorî (UVC)</displayName>
+				<displayName count="one">unidad de valor constanteyê ekwadorî (UVC)</displayName>
+				<displayName count="other">unidad de valor constanteyên ekwadorî (UVC)</displayName>
+			</currency>
+			<currency type="EEK">
+				<displayName>krûnê estonî</displayName>
+				<displayName count="one">krûnê estonî</displayName>
+				<displayName count="other">krûnên estonî</displayName>
+			</currency>
 			<currency type="EGP">
 				<displayName>lîreyê misirî</displayName>
 				<displayName count="one">lîreyê misirî</displayName>
@@ -3282,6 +5537,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">nakfayê erîtreyî</displayName>
 				<displayName count="other">nakfayên erîtreyî</displayName>
 			</currency>
+			<currency type="ESA">
+				<displayName>pezetayê spanî (hesabê Ayê)</displayName>
+				<displayName count="one">pezetayê spanî (hesabê Ayê)</displayName>
+				<displayName count="other">pezetayên spanî (hesabê Ayê)</displayName>
+			</currency>
+			<currency type="ESB">
+				<displayName>pezetayê spanî (hesabê konvertibl)</displayName>
+				<displayName count="one">pezetayê spanî (hesabê konvertibl)</displayName>
+				<displayName count="other">pezetayên spanî (hesabê konvertibl)</displayName>
+			</currency>
+			<currency type="ESP">
+				<displayName>pezetayê spanî</displayName>
+				<displayName count="one">pezetayê spanî</displayName>
+				<displayName count="other">pezetayên spanî</displayName>
+			</currency>
 			<currency type="ETB">
 				<displayName>bîrê etyopyayî</displayName>
 				<displayName count="one">bîrê etyopyayî</displayName>
@@ -3290,35 +5560,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="EUR">
 				<displayName>ewro</displayName>
 			</currency>
+			<currency type="FIM">
+				<displayName>markkayê fînî</displayName>
+				<displayName count="one">markkayê fînî</displayName>
+				<displayName count="other">markkayên fînî</displayName>
+			</currency>
 			<currency type="FJD">
 				<displayName>dolarê fîjîyî</displayName>
 				<displayName count="one">dolarê fîjîyî</displayName>
 				<displayName count="other">dolarên fîjîyî</displayName>
 			</currency>
 			<currency type="FKP">
-				<displayName>paundê giravên falklandê</displayName>
-				<displayName count="one">paundê giravên falklandê</displayName>
-				<displayName count="other">paundên giravên falklandê</displayName>
+				<displayName>paundê giravên falklandî</displayName>
+				<displayName count="one">paundê giravên falklandî</displayName>
+				<displayName count="other">paundên giravên falklandî</displayName>
+			</currency>
+			<currency type="FRF">
+				<displayName>markê fransî</displayName>
+				<displayName count="one">markê fransî</displayName>
+				<displayName count="other">markên fransî</displayName>
 			</currency>
 			<currency type="GBP">
 				<displayName>sterlînê brîtanî</displayName>
 				<displayName count="one">sterlînê brîtanî</displayName>
 				<displayName count="other">sterlînên brîtanî</displayName>
 			</currency>
+			<currency type="GEK">
+				<displayName>kupon larîtê gurcistanî</displayName>
+				<displayName count="one">kupon larîtê gurcistanî</displayName>
+				<displayName count="other">kupon larîtên gurcistanî</displayName>
+			</currency>
 			<currency type="GEL">
 				<displayName>larîyê gurcistanî</displayName>
 				<displayName count="one">larîyê gurcistanî</displayName>
 				<displayName count="other">larîyên gurcistanî</displayName>
 			</currency>
+			<currency type="GHC">
+				<displayName>cedîyê ganayî (1979–2007)</displayName>
+				<displayName count="one">cedîyê ganayî (1979–2007)</displayName>
+				<displayName count="other">cedîyên ganayî (1979–2007)</displayName>
+			</currency>
 			<currency type="GHS">
 				<displayName>cedîyê ganayî</displayName>
 				<displayName count="one">cedîyê ganayî</displayName>
 				<displayName count="other">cedîyên ganayî</displayName>
 			</currency>
 			<currency type="GIP">
-				<displayName>poundê gîbraltarê</displayName>
-				<displayName count="one">poundê gîbraltarê</displayName>
-				<displayName count="other">poundên gîbraltarê</displayName>
+				<displayName>lîreyê cebelîtariqî</displayName>
+				<displayName count="one">lîreyê cebelîtariqî</displayName>
+				<displayName count="other">lîreyên cebelîtariqî</displayName>
 			</currency>
 			<currency type="GMD">
 				<displayName>dalasîyê gambîyayî</displayName>
@@ -3330,11 +5620,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">frankê gîneyî</displayName>
 				<displayName count="other">frankên gîneyî</displayName>
 			</currency>
+			<currency type="GNS">
+				<displayName>sylîyê gîneyî</displayName>
+				<displayName count="one">sylîyê gîneyî</displayName>
+				<displayName count="other">sylîyên gîneyî</displayName>
+			</currency>
+			<currency type="GQE">
+				<displayName>ekweleyê gîneya ekvatorî</displayName>
+				<displayName count="one">ekweleyê gîneya ekvatorî</displayName>
+				<displayName count="other">ekweleyên gîneya ekvatorî</displayName>
+			</currency>
+			<currency type="GRD">
+				<displayName>draxmayê yûnanî</displayName>
+				<displayName count="one">draxmayê yûnanî</displayName>
+				<displayName count="other">draxmayên yûnanî</displayName>
+			</currency>
 			<currency type="GTQ">
 				<displayName>quertzalê guatemalayî</displayName>
 				<displayName count="one">quertzalê guatemalayî</displayName>
 				<displayName count="other">quertzalên guatemalayî</displayName>
 			</currency>
+			<currency type="GWE">
+				<displayName>eskudoyê gîneya portugalî</displayName>
+				<displayName count="one">eskudoyê gîneya portugalî</displayName>
+				<displayName count="other">eskudoyên gîneya portugalî</displayName>
+			</currency>
+			<currency type="GWP">
+				<displayName>pezoyê gîne-bissauyî</displayName>
+				<displayName count="one">pezoyê gîne-bissauyî</displayName>
+				<displayName count="other">pezoyên gîne-bissauyî</displayName>
+			</currency>
 			<currency type="GYD">
 				<displayName>dolarê guayanayî</displayName>
 				<displayName count="one">dolarê guayanayî</displayName>
@@ -3350,10 +5665,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">lempîrayê hondurasî</displayName>
 				<displayName count="other">lempîrayên hondurasî</displayName>
 			</currency>
+			<currency type="HRD">
+				<displayName>dînarê xirwatî</displayName>
+				<displayName count="one">dînarê xirwatî</displayName>
+				<displayName count="other">dînarên xirwatî</displayName>
+			</currency>
 			<currency type="HRK">
-				<displayName>kûnayê xirwatî</displayName>
-				<displayName count="one">kûnayê xirwatî</displayName>
-				<displayName count="other">kûnayên xirwatî</displayName>
+				<displayName>kunayê xirwatî</displayName>
+				<displayName count="one">kunayê xirwatî</displayName>
+				<displayName count="other">kunayên xirwatî</displayName>
 			</currency>
 			<currency type="HTG">
 				<displayName>gûrdeyê haîtîyî</displayName>
@@ -3370,6 +5690,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">rûpîyê endonezî</displayName>
 				<displayName count="other">rûpîyên endonezî</displayName>
 			</currency>
+			<currency type="IEP">
+				<displayName>lîreyê îrlandî</displayName>
+				<displayName count="one">lîreyê îrlandî</displayName>
+				<displayName count="other">lîreyên îrlandî</displayName>
+			</currency>
+			<currency type="ILP">
+				<displayName>lîreyê îsraîlî</displayName>
+				<displayName count="one">lîreyê îsraîlî</displayName>
+				<displayName count="other">lîreyên îsraîlî</displayName>
+			</currency>
+			<currency type="ILR">
+				<displayName>şekelê îsraîlî (1980–1985)</displayName>
+				<displayName count="one">şekelê îsraîlî (1980–1985)</displayName>
+				<displayName count="other">şekelên îsraîlî (1980–1985)</displayName>
+			</currency>
 			<currency type="ILS">
 				<displayName>şekelê nû yê îsraîlî</displayName>
 				<displayName count="one">şekelê nû yê îsraîlî</displayName>
@@ -3390,11 +5725,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">rîyalê îranî</displayName>
 				<displayName count="other">rîyalên îranî</displayName>
 			</currency>
+			<currency type="ISJ">
+				<displayName>kronê îslandayî (1918–1981)</displayName>
+				<displayName count="one">kronê îslandayî (1918–1981)</displayName>
+				<displayName count="other">kronên îslandayî (1918–1981)</displayName>
+			</currency>
 			<currency type="ISK">
 				<displayName>kronê îslandayî</displayName>
 				<displayName count="one">kronê îslandayî</displayName>
 				<displayName count="other">kronên îslandayî</displayName>
 			</currency>
+			<currency type="ITL">
+				<displayName>lîrayê îtalî</displayName>
+				<displayName count="one">lîrayê îtalî</displayName>
+				<displayName count="other">lîrayên îtalî</displayName>
+			</currency>
 			<currency type="JMD">
 				<displayName>dolarê jamaîkayî</displayName>
 				<displayName count="one">dolarê jamaîkayî</displayName>
@@ -3435,6 +5780,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">wonê koreya bakurî</displayName>
 				<displayName count="other">wonên koreya bakurî</displayName>
 			</currency>
+			<currency type="KRH">
+				<displayName>hwanê koreya başûrî (1953–1962)</displayName>
+				<displayName count="one">hwanê koreya başûrî (1953–1962)</displayName>
+				<displayName count="other">hwanên koreya başûrî (1953–1962)</displayName>
+			</currency>
+			<currency type="KRO">
+				<displayName>wonê koreya başûrî (1945–1953)</displayName>
+				<displayName count="one">wonê koreya başûrî (1945–1953)</displayName>
+				<displayName count="other">wonên koreya başûrî (1945–1953)</displayName>
+			</currency>
 			<currency type="KRW">
 				<displayName>wonê koreya başûrî</displayName>
 				<displayName count="one">wonê koreya başûrî</displayName>
@@ -3480,6 +5835,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">lotîyê lesothoyî</displayName>
 				<displayName count="other">lotîyên lesothoyî</displayName>
 			</currency>
+			<currency type="LTL">
+				<displayName>lîtayê lîtvanyayî</displayName>
+				<displayName count="one">lîtayê lîtvanyayî</displayName>
+				<displayName count="other">lîtayên lîtvanyayî</displayName>
+			</currency>
+			<currency type="LTT">
+				<displayName>talonasê lîtvanyayî</displayName>
+				<displayName count="one">talonasê lîtvanyayî</displayName>
+				<displayName count="other">talonasên lîtvanyayî</displayName>
+			</currency>
+			<currency type="LUC">
+				<displayName>frankê konvertibl ya luksembûrgî</displayName>
+				<displayName count="one">frankê konvertibl yê luksembûrgî</displayName>
+				<displayName count="other">frankê konvertibl yê luksembûrgî</displayName>
+			</currency>
+			<currency type="LUF">
+				<displayName>frankê luksembûrgî</displayName>
+				<displayName count="one">frankê luksembûrgî</displayName>
+				<displayName count="other">frankên luksembûrgî</displayName>
+			</currency>
+			<currency type="LUL">
+				<displayName>frankê fînansî yê luksembûrgî</displayName>
+				<displayName count="one">frankê fînansî yê luksembûrgî</displayName>
+				<displayName count="other">frankên fînansî yên luksembûrgî</displayName>
+			</currency>
+			<currency type="LVL">
+				<displayName>latê letonyayî</displayName>
+				<displayName count="one">latê letonyayî</displayName>
+				<displayName count="other">latên letonyayî</displayName>
+			</currency>
+			<currency type="LVR">
+				<displayName>rubleyê letonyayî</displayName>
+				<displayName count="one">rubleyê letonyayî</displayName>
+				<displayName count="other">rubleyên letonyayî</displayName>
+			</currency>
 			<currency type="LYD">
 				<displayName>dînarê lîbyayî</displayName>
 				<displayName count="one">dînarê lîbyayî</displayName>
@@ -3490,12 +5880,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dîrhemê fasî</displayName>
 				<displayName count="other">dîrhemên fasî</displayName>
 			</currency>
+			<currency type="MAF">
+				<displayName>franka fasî</displayName>
+				<displayName count="one">franka fasî</displayName>
+				<displayName count="other">frankên fasî</displayName>
+			</currency>
+			<currency type="MCF">
+				<displayName>frankê monakoyî</displayName>
+				<displayName count="one">frankê monakoyî</displayName>
+				<displayName count="other">frankên monakoyî</displayName>
+			</currency>
+			<currency type="MDC">
+				<displayName>kuponê moldovayî</displayName>
+				<displayName count="one">kuponê moldovayî</displayName>
+				<displayName count="other">kuponên moldovayî</displayName>
+			</currency>
 			<currency type="MDL">
 				<displayName>leyê moldovayî</displayName>
 				<displayName count="one">leyê moldovayî</displayName>
 				<displayName count="other">leyên moldovayî</displayName>
 			</currency>
 			<currency type="MGA">
+				<displayName>arîarîyê madagaskarî</displayName>
+				<displayName count="one">arîarîyê madagaskarî</displayName>
+				<displayName count="other">arîarîyên madagaskarî</displayName>
+			</currency>
+			<currency type="MGF">
 				<displayName>frankê madagaskarî</displayName>
 				<displayName count="one">frankê madagaskarî</displayName>
 				<displayName count="other">frankên madagaskarî</displayName>
@@ -3505,6 +5915,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dînarê makedonî</displayName>
 				<displayName count="other">dînarên makedonî</displayName>
 			</currency>
+			<currency type="MKN">
+				<displayName>dînarê makedonî (1992–1993)</displayName>
+				<displayName count="one">dînarê makedonî (1992–1993)</displayName>
+				<displayName count="other">dînarên makedonî (1992–1993)</displayName>
+			</currency>
+			<currency type="MLF">
+				<displayName>franka malîyî</displayName>
+				<displayName count="one">franka malîyî</displayName>
+				<displayName count="other">frankên malîyî</displayName>
+			</currency>
 			<currency type="MMK">
 				<displayName>kyatê myanmarî</displayName>
 				<displayName count="one">kyatê myanmarî</displayName>
@@ -3520,16 +5940,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">patakayê makaoyî</displayName>
 				<displayName count="other">patakaynê makaoyî</displayName>
 			</currency>
+			<currency type="MRO">
+				<displayName>ouguîayê morîtanyayî (1973–2017)</displayName>
+				<displayName count="one">ouguîayê morîtanyayî (1973–2017)</displayName>
+				<displayName count="other">ouguîayên morîtanyayî (1973–2017)</displayName>
+			</currency>
 			<currency type="MRU">
 				<displayName>ouguîayê morîtanyayî</displayName>
 				<displayName count="one">ouguîayê morîtanyayî</displayName>
 				<displayName count="other">ouguîayên morîtanyayî</displayName>
 			</currency>
+			<currency type="MTL">
+				<displayName>lîreyê maltayî</displayName>
+				<displayName count="one">lîreyê maltayî</displayName>
+				<displayName count="other">lîreyên maltayî</displayName>
+			</currency>
+			<currency type="MTP">
+				<displayName>poundê maltayî</displayName>
+				<displayName count="one">poundê maltayî</displayName>
+				<displayName count="other">poundên maltayî</displayName>
+			</currency>
 			<currency type="MUR">
 				<displayName>rûpîyê maûrîtîûsê</displayName>
 				<displayName count="one">rûpîyê maûrîtîûsê</displayName>
 				<displayName count="other">rûpîyên maûrîtîûsê</displayName>
 			</currency>
+			<currency type="MVP">
+				<displayName>rûpîyê maldîvayî (1947–1981)</displayName>
+				<displayName count="one">rûpîyê maldîvayî (1947–1981)</displayName>
+				<displayName count="other">rûpîyên maldîvayî (1947–1981)</displayName>
+			</currency>
 			<currency type="MVR">
 				<displayName>rûfîyaayê maldîvayî</displayName>
 				<displayName count="one">rûfîyaayê maldîvayî</displayName>
@@ -3545,15 +5985,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">pesoyê meksîkayî</displayName>
 				<displayName count="other">pesoyên meksîkayî</displayName>
 			</currency>
+			<currency type="MXP">
+				<displayName>pesoyê zîvî yê meksîkayî (1861–1992)</displayName>
+				<displayName count="one">pesoyê zîvî yê meksîkayî (1861–1992)</displayName>
+				<displayName count="other">pesoyên zîvî yên meksîkayî (1861–1992)</displayName>
+			</currency>
+			<currency type="MXV">
+				<displayName>unidad de inversionê meksîkayî (UDI)</displayName>
+				<displayName count="one">unidad de inversionê meksîkayî (UDI)</displayName>
+				<displayName count="other">unidad de inversionên meksîkayî (UDI)</displayName>
+			</currency>
 			<currency type="MYR">
 				<displayName>ringgitê malezyayî</displayName>
 				<displayName count="one">ringgitê malezyayî</displayName>
 				<displayName count="other">ringgitên malezyayî</displayName>
 			</currency>
+			<currency type="MZE">
+				<displayName>eskudoyê mozambîkî</displayName>
+				<displayName count="one">eskudoyê mozambîkî</displayName>
+				<displayName count="other">eskudoyên mozambîkî</displayName>
+			</currency>
+			<currency type="MZM">
+				<displayName>metîkalê mozambîkî (1980–2006)</displayName>
+				<displayName count="one">metîkalê mozambîkî (1980–2006)</displayName>
+				<displayName count="other">metîkalên mozambîkî (1980–2006)</displayName>
+			</currency>
 			<currency type="MZN">
-				<displayName>meticalê mozambîkî</displayName>
-				<displayName count="one">meticalê mozambîkî</displayName>
-				<displayName count="other">meticalên mozambîkî</displayName>
+				<displayName>metîkalê mozambîkî</displayName>
+				<displayName count="one">metîkalê mozambîkî</displayName>
+				<displayName count="other">metîkalên mozambîkî</displayName>
 			</currency>
 			<currency type="NAD">
 				<displayName>dolarê namîbyayî</displayName>
@@ -3565,11 +6025,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">naîrayê nîjeryayî</displayName>
 				<displayName count="other">naîrayên nîjeryayî</displayName>
 			</currency>
+			<currency type="NIC">
+				<displayName>kordobayê nîkaraguayî (1988–1991)</displayName>
+				<displayName count="one">kordobayê nîkaraguayî (1988–1991)</displayName>
+				<displayName count="other">kordobayên nîkaraguayî (1988–1991)</displayName>
+			</currency>
 			<currency type="NIO">
 				<displayName>kordobayê nîkaraguayî</displayName>
 				<displayName count="one">kordobayê nîkaraguayî</displayName>
 				<displayName count="other">kordobayên nîkaraguayî</displayName>
 			</currency>
+			<currency type="NLG">
+				<displayName>florînê holendî</displayName>
+				<displayName count="one">florînê holendî</displayName>
+				<displayName count="other">florînên holendî</displayName>
+			</currency>
 			<currency type="NOK">
 				<displayName>kronê norweçî</displayName>
 				<displayName count="one">kronê norweçî</displayName>
@@ -3595,11 +6065,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">balboayê panamayî</displayName>
 				<displayName count="other">balboayên panamayî</displayName>
 			</currency>
+			<currency type="PEI">
+				<displayName>întîyê perûyî</displayName>
+				<displayName count="one">întîyê perûyî</displayName>
+				<displayName count="other">întîyên perûyî</displayName>
+			</currency>
 			<currency type="PEN">
 				<displayName>solê perûyî</displayName>
 				<displayName count="one">solê perûyî</displayName>
 				<displayName count="other">solên perûyî</displayName>
 			</currency>
+			<currency type="PES">
+				<displayName>solê perûyî (1863–1965)</displayName>
+				<displayName count="one">solê perûyî (1863–1965)</displayName>
+				<displayName count="other">solên perûyî (1863–1965)</displayName>
+			</currency>
 			<currency type="PGK">
 				<displayName>kînayê gîneya nû ya papûayî</displayName>
 				<displayName count="one">kînayê gîneya nû ya papûayî</displayName>
@@ -3620,6 +6100,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">zlotîyê polonyayî</displayName>
 				<displayName count="other">zlotîyên polonyayî</displayName>
 			</currency>
+			<currency type="PLZ">
+				<displayName>zlotîyê polonyayî (1950–1995)</displayName>
+				<displayName count="one">zlotîyê polonyayî (1950–1995)</displayName>
+				<displayName count="other">zlotîyên polonyayî (1950–1995)</displayName>
+			</currency>
+			<currency type="PTE">
+				<displayName>eskudoyê portugalî</displayName>
+				<displayName count="one">eskudoyê portugalî</displayName>
+				<displayName count="other">eskudoyên portugalî</displayName>
+			</currency>
 			<currency type="PYG">
 				<displayName>gûaranîyê paragûayî</displayName>
 				<displayName count="one">gûaranîyê paragûayî</displayName>
@@ -3630,6 +6120,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">rîyalê qeterî</displayName>
 				<displayName count="other">rîyalên qeterî</displayName>
 			</currency>
+			<currency type="RHD">
+				<displayName>dolarê rodezyayî</displayName>
+				<displayName count="one">dolarê rodezyayî</displayName>
+				<displayName count="other">dolarên rodezyayî</displayName>
+			</currency>
+			<currency type="ROL">
+				<displayName>leyê romanyayî (1952–2006)</displayName>
+				<displayName count="one">leyê romanyayî (1952–2006)</displayName>
+				<displayName count="other">leyên romanyayî (1952–2006)</displayName>
+			</currency>
 			<currency type="RON">
 				<displayName>leyê romanyayî</displayName>
 				<displayName count="one">leyê romanyayî</displayName>
@@ -3645,6 +6145,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">rubleyê rûsî</displayName>
 				<displayName count="other">rubleyên rûsî</displayName>
 			</currency>
+			<currency type="RUR">
+				<displayName>rubleyê belarûsî (1991–1998)</displayName>
+				<displayName count="one">rubleyê belarûsî (1991–1998)</displayName>
+				<displayName count="other">rubleyên belarûsî (1991–1998)</displayName>
+			</currency>
 			<currency type="RWF">
 				<displayName>frankê rwandayî</displayName>
 				<displayName count="one">frankê rwandayî</displayName>
@@ -3665,11 +6170,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">rûpîyê seyşelerî</displayName>
 				<displayName count="other">rûpîyên seyşelerî</displayName>
 			</currency>
+			<currency type="SDD">
+				<displayName>dînarê sûdanî (1992–2007)</displayName>
+				<displayName count="one">dînarê sûdanî (1992–2007)</displayName>
+				<displayName count="other">dînarên sûdanî (1992–2007)</displayName>
+			</currency>
 			<currency type="SDG">
 				<displayName>lîreyê sûdanî</displayName>
 				<displayName count="one">lîreyê sûdanî</displayName>
 				<displayName count="other">lîreyên sûdanî</displayName>
 			</currency>
+			<currency type="SDP">
+				<displayName>lîreyê sûdanî (1957–1998)</displayName>
+				<displayName count="one">lîreyê sûdanî (1957–1998)</displayName>
+				<displayName count="other">lîreyên sûdanî (1957–1998)</displayName>
+			</currency>
 			<currency type="SEK">
 				<displayName>kronê swêdî</displayName>
 				<displayName count="one">kronê swêdî</displayName>
@@ -3685,6 +6200,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">lîreyê saînt helenayî</displayName>
 				<displayName count="other">lîreyên saînt helenayî</displayName>
 			</currency>
+			<currency type="SIT">
+				<displayName>tolarê slovenî</displayName>
+				<displayName count="one">tolarê slovenî</displayName>
+				<displayName count="other">tolarên slovenî</displayName>
+			</currency>
+			<currency type="SKK">
+				<displayName>korunayê slovakî</displayName>
+				<displayName count="one">korunayê slovakî</displayName>
+				<displayName count="other">korunayên slovakî</displayName>
+			</currency>
 			<currency type="SLE">
 				<displayName>leoneyê sîera leoneyî</displayName>
 				<displayName count="one">leoneyê sîera leoneyî</displayName>
@@ -3705,16 +6230,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dolarê surînamî</displayName>
 				<displayName count="other">dolarên surînamî</displayName>
 			</currency>
+			<currency type="SRG">
+				<displayName>guldenê surînamî</displayName>
+				<displayName count="one">guldenê surînamî</displayName>
+				<displayName count="other">guldenên surînamî</displayName>
+			</currency>
 			<currency type="SSP">
 				<displayName>lîreyê sûdana başûrî</displayName>
 				<displayName count="one">lîreyê sûdana başûrî</displayName>
 				<displayName count="other">lîreyên sûdana başûrî</displayName>
 			</currency>
+			<currency type="STD">
+				<displayName>dobrayê sao tome û principeyî (1977–2017)</displayName>
+				<displayName count="one">dobrayê sao tome û principeyî (1977–2017)</displayName>
+				<displayName count="other">dobrayên sao tome û principeyî (1977–2017)</displayName>
+			</currency>
 			<currency type="STN">
 				<displayName>dobrayê sao tome û principeyî</displayName>
 				<displayName count="one">dobrayê sao tome û principeyî</displayName>
 				<displayName count="other">dobrayên sao tome û principeyî</displayName>
 			</currency>
+			<currency type="SUR">
+				<displayName>rubleyê sovyetî</displayName>
+				<displayName count="one">rubleyê sovyetî</displayName>
+				<displayName count="other">rubleyên sovyetî</displayName>
+			</currency>
+			<currency type="SVC">
+				<displayName>kolonê el salvadorî</displayName>
+				<displayName count="one">kolonê el salvadorî</displayName>
+				<displayName count="other">kolonên el salvadorî</displayName>
+			</currency>
 			<currency type="SYP">
 				<displayName>lîreyê sûrî</displayName>
 				<displayName count="one">lîreyê sûrî</displayName>
@@ -3730,11 +6275,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">bahtê taylandî</displayName>
 				<displayName count="other">bahtên taylandî</displayName>
 			</currency>
+			<currency type="TJR">
+				<displayName>rubleyê tacikistanî</displayName>
+				<displayName count="one">rubleyê tacikistanî</displayName>
+				<displayName count="other">rubleyên tacikistanî</displayName>
+			</currency>
 			<currency type="TJS">
 				<displayName>somonê tacikistanî</displayName>
 				<displayName count="one">somonê tacikistanî</displayName>
 				<displayName count="other">somonên tacikistanî</displayName>
 			</currency>
+			<currency type="TMM">
+				<displayName>manatê tirkmenî (1993–2009)</displayName>
+				<displayName count="one">manatê tirkmenî (1993–2009)</displayName>
+				<displayName count="other">manatên tirkmenî (1993–2009)</displayName>
+			</currency>
 			<currency type="TMT">
 				<displayName>manatê tirkmenî</displayName>
 				<displayName count="one">manatê tirkmenî</displayName>
@@ -3750,6 +6305,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">paʻangayê tonganî</displayName>
 				<displayName count="other">paʻangayên tonganî</displayName>
 			</currency>
+			<currency type="TPE">
+				<displayName>ekudoyê tîmorî</displayName>
+				<displayName count="one">ekudoyê tîmorî</displayName>
+				<displayName count="other">ekudoyên tîmorî</displayName>
+			</currency>
+			<currency type="TRL">
+				<displayName>lîreyê tirkî (1922–2005)</displayName>
+				<displayName count="one">lîreyê tirkî (1922–2005)</displayName>
+				<displayName count="other">lîreyên tirkî (1922–2005)</displayName>
+			</currency>
 			<currency type="TRY">
 				<displayName>lîreyê tirkî</displayName>
 				<displayName count="one">lîreyê tirkî</displayName>
@@ -3776,6 +6341,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">grîvnayê ûkraynî</displayName>
 				<displayName count="other">grîvnayên ûkraynî</displayName>
 			</currency>
+			<currency type="UAK">
+				<displayName>karbovanetzê ûkraynî</displayName>
+				<displayName count="one">karbovanetzê ûkraynî</displayName>
+				<displayName count="other">karbovanetzên ûkraynî</displayName>
+			</currency>
+			<currency type="UGS">
+				<displayName>şîlîngê ûgandayî (1966–1987)</displayName>
+				<displayName count="one">şîlîngê ûgandayî (1966–1987)</displayName>
+				<displayName count="other">şîlîngên ûgandayî (1966–1987)</displayName>
+			</currency>
 			<currency type="UGX">
 				<displayName>şîlîngê ûgandayî</displayName>
 				<displayName count="one">şîlîngê ûgandayî</displayName>
@@ -3787,16 +6362,56 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">dolarên amerîkî</displayName>
 				<symbol draft="contributed">$</symbol>
 			</currency>
+			<currency type="USN">
+				<displayName>dolarê amerîkî (roja din)</displayName>
+				<displayName count="one">dolarê amerîkî (roja din)</displayName>
+				<displayName count="other">dolarên amerîkî (roja din)</displayName>
+			</currency>
+			<currency type="USS">
+				<displayName>dolarê amerîkî (eynî roj)</displayName>
+				<displayName count="one">dolarê amerîkî (eynî roj)</displayName>
+				<displayName count="other">dolarên amerîkî (eynî roj)</displayName>
+			</currency>
+			<currency type="UYI">
+				<displayName>peso en unidades indexadasê ûrûguayî</displayName>
+				<displayName count="one">peso en unidades indexadasê ûrûguayî</displayName>
+				<displayName count="other">peso en unidades indexadasên ûrûguayî</displayName>
+			</currency>
+			<currency type="UYP">
+				<displayName>pesoyê ûrûgûayî (1975–1993)</displayName>
+				<displayName count="one">pesoyê ûrûgûayî (1975–1993)</displayName>
+				<displayName count="other">pesoyên ûrûgûayî (1975–1993)</displayName>
+			</currency>
 			<currency type="UYU">
 				<displayName>pesoyê ûrûgûayî</displayName>
 				<displayName count="one">pesoyê ûrûgûayî</displayName>
 				<displayName count="other">pesoyên ûrûgûayî</displayName>
 			</currency>
+			<currency type="UYW">
+				<displayName>yekeya îndeksa heqdestê nomînal yê ûrûguayî</displayName>
+				<displayName count="one">yekeya îndeksa heqdestê nomînal yê ûrûguayî</displayName>
+				<displayName count="other">yekeyên îndeksa heqdestê nomînal yên ûrûguayî</displayName>
+			</currency>
 			<currency type="UZS">
 				<displayName>somê ozbekî</displayName>
 				<displayName count="one">somê ozbekî</displayName>
 				<displayName count="other">somên ozbekî</displayName>
 			</currency>
+			<currency type="VEB">
+				<displayName>bolîvarê venezuelayî (1871–2008)</displayName>
+				<displayName count="one">bolîvarê venezuelayî (1871–2008)</displayName>
+				<displayName count="other">bolîvarên venezuelayî (1871–2008)</displayName>
+			</currency>
+			<currency type="VED">
+				<displayName>bolivar soberano (VED)</displayName>
+				<displayName count="one">bolivar soberano (VED)</displayName>
+				<displayName count="other">bolivar soberano (VED)</displayName>
+			</currency>
+			<currency type="VEF">
+				<displayName>bolîvarê venezuelayî (2008–2018)</displayName>
+				<displayName count="one">bolîvarê venezuelayî (2008–2018)</displayName>
+				<displayName count="other">bolîvarên venezuelayî (2008–2018)</displayName>
+			</currency>
 			<currency type="VES">
 				<displayName>bolîvarê venezuelayî</displayName>
 				<displayName count="one">bolîvarê venezuelayî</displayName>
@@ -3807,6 +6422,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dongê vîetnamî</displayName>
 				<displayName count="other">dongên vîetnamî</displayName>
 			</currency>
+			<currency type="VNN">
+				<displayName>dongê vîetnamî (1978–1985)</displayName>
+				<displayName count="one">dongê vîetnamî (1978–1985)</displayName>
+				<displayName count="other">dongên vîetnamî (1978–1985)</displayName>
+			</currency>
 			<currency type="VUV">
 				<displayName>vatûyê vanûatûyî</displayName>
 				<displayName count="one">vatûyê vanûatûyî</displayName>
@@ -3822,41 +6442,191 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">frenkê CFA yê afrîkaya navîn</displayName>
 				<displayName count="other">frenkên CFA yê afrîkaya navîn</displayName>
 			</currency>
+			<currency type="XAG">
+				<displayName>Zîv</displayName>
+				<displayName count="one">Zîv</displayName>
+				<displayName count="other">Zîv</displayName>
+			</currency>
+			<currency type="XAU">
+				<displayName>Zêr</displayName>
+				<displayName count="one">Zêr</displayName>
+				<displayName count="other">Zêr</displayName>
+			</currency>
+			<currency type="XBA">
+				<displayName>Yekeya Yekgirtî ya Ewropî</displayName>
+				<displayName count="one">Yekeya Yekgirtî ya Ewropî</displayName>
+				<displayName count="other">Yekeya Yekgirtî ya Ewropî</displayName>
+			</currency>
+			<currency type="XBB">
+				<displayName>Yekeya Pereyê ya Ewropî</displayName>
+				<displayName count="one">Yekeya Pereyê ya Ewropî</displayName>
+				<displayName count="other">Yekeya Pereyê ya Ewropî</displayName>
+			</currency>
+			<currency type="XBC">
+				<displayName>Yekeya Hesabê ya Ewropî (XBC)</displayName>
+				<displayName count="one">Yekeya Hesabê ya Ewropî (XBC)</displayName>
+				<displayName count="other">Yekeya Hesabê ya Ewropî (XBC)</displayName>
+			</currency>
+			<currency type="XBD">
+				<displayName>Yekeya Hesabê ya Ewropî (XBD)</displayName>
+				<displayName count="one">Yekeya Hesabê ya Ewropî (XBD)</displayName>
+				<displayName count="other">Yekeya Hesabê ya Ewropî (XBD)</displayName>
+			</currency>
 			<currency type="XCD">
 				<displayName>dolarê karayîba rojhilatî</displayName>
 				<displayName count="one">dolarê karayîba rojhilatî</displayName>
 				<displayName count="other">dolarên karayîba rojhilatî</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>guldenê karayîbî</displayName>
+				<displayName count="one">guldenê karayîbî</displayName>
+				<displayName count="other">guldenên karayîbî</displayName>
+			</currency>
+			<currency type="XDR">
+				<displayName>Heqê Kişandinê yê Xisûsî</displayName>
+				<displayName count="one">Heqê Kişandinê yê Xisûsî</displayName>
+				<displayName count="other">Heqê Kişandinê yê Xisûsî</displayName>
+			</currency>
+			<currency type="XEU">
+				<displayName>Yekeya Pereyê ya Ewropayê</displayName>
+				<displayName count="one">Yekeya Pereyê ya Ewropayê</displayName>
+				<displayName count="other">Yekeya Pereyê ya Ewropayê</displayName>
+			</currency>
+			<currency type="XFO">
+				<displayName>Franka Fransî ya Zêrê</displayName>
+				<displayName count="one">Franka fransî ya zêrê</displayName>
+				<displayName count="other">Franka fransî ya zêrê</displayName>
+			</currency>
+			<currency type="XFU">
+				<displayName>Franka Fransî ya UICê</displayName>
+				<displayName count="one">Franka Fransî ya UICê</displayName>
+				<displayName count="other">Franka Fransî ya UICê</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>frankê CFA yê afrîkaya başûrî</displayName>
 				<displayName count="one">frankê CFA yê afrîkaya başûrî</displayName>
 				<displayName count="other">frankên CFA yê afrîkaya başûrî</displayName>
 			</currency>
+			<currency type="XPD">
+				<displayName>Paladyûm</displayName>
+				<displayName count="one">Paladyûm</displayName>
+				<displayName count="other">Paladyûm</displayName>
+			</currency>
 			<currency type="XPF">
 				<displayName>frankê CFPî</displayName>
 				<displayName count="one">frankê CFPî</displayName>
 				<displayName count="other">frankên CFPî</displayName>
 			</currency>
+			<currency type="XPT">
+				<displayName>Platîn</displayName>
+				<displayName count="one">Platîn</displayName>
+				<displayName count="other">Platîn</displayName>
+			</currency>
+			<currency type="XRE">
+				<displayName>Fonên RINETê</displayName>
+				<displayName count="one">yekeya Fonên RINETê</displayName>
+				<displayName count="other">yekeyên Fonên RINETê</displayName>
+			</currency>
+			<currency type="XSU">
+				<displayName>Sucre</displayName>
+				<displayName count="one">Sucre</displayName>
+				<displayName count="other">Sucre</displayName>
+			</currency>
+			<currency type="XTS">
+				<displayName>Yekeya Pereyê ya Testê</displayName>
+				<displayName count="one">yekeya Pereyê ya Testê</displayName>
+				<displayName count="other">Yekeyên pereyê yên testê</displayName>
+			</currency>
+			<currency type="XUA">
+				<displayName>Yekeya Hesabê ya ADByê</displayName>
+				<displayName count="one">yekeya hesabê ya ADByê</displayName>
+				<displayName count="other">yekeyên hesabê yên ADByê</displayName>
+			</currency>
 			<currency type="XXX">
 				<displayName>(yekeya pereyî ya nenas)</displayName>
 				<displayName count="one">yekeya pereyî ya nenas</displayName>
 				<displayName count="other">(yekeyên pereyî yên nenas)</displayName>
 			</currency>
+			<currency type="YDD">
+				<displayName>dînarê yemenî</displayName>
+				<displayName count="one">dînarê yemenî</displayName>
+				<displayName count="other">dînarên yemenî</displayName>
+			</currency>
 			<currency type="YER">
 				<displayName>rîyalê yemenî</displayName>
 				<displayName count="one">rîyalê yemenî</displayName>
 				<displayName count="other">rîyalên yemenî</displayName>
 			</currency>
+			<currency type="YUD">
+				<displayName>hard dînarê yûgoslavî (1966–1990)</displayName>
+				<displayName count="one">hard dînarê yûgoslavî (1966–1990)</displayName>
+				<displayName count="other">hard dînarên yûgoslavî (1966–1990)</displayName>
+			</currency>
+			<currency type="YUM">
+				<displayName>dînarê nû ya yûgoslavî (1994–2002)</displayName>
+				<displayName count="one">dînarê nû ya yûgoslavî (1994–2002)</displayName>
+				<displayName count="other">dînarên nû ya yûgoslavî (1994–2002)</displayName>
+			</currency>
+			<currency type="YUN">
+				<displayName>dînarê konvertibl ya yûgoslavî (1990–1992)</displayName>
+				<displayName count="one">dînarê konvertibl ya yûgoslavî (1990–1992)</displayName>
+				<displayName count="other">dînarên konvertibl ya yûgoslavî (1990–1992)</displayName>
+			</currency>
+			<currency type="YUR">
+				<displayName>dînarê reformkirî ya yûgoslavî (1992–1993)</displayName>
+				<displayName count="one">dînarê reformkirî ya yûgoslavî (1992–1993)</displayName>
+				<displayName count="other">dînarên reformkirî yên yûgoslavî (1992–1993)</displayName>
+			</currency>
+			<currency type="ZAL">
+				<displayName>randê afrîkaya başûrî (fînansî)</displayName>
+				<displayName count="one">randê afrîkaya başûrî (fînansî)</displayName>
+				<displayName count="other">randên afrîkaya başûrî (fînansî)</displayName>
+			</currency>
 			<currency type="ZAR">
 				<displayName>randê afrîkaya başûrî</displayName>
 				<displayName count="one">randê afrîkaya başûrî</displayName>
 				<displayName count="other">randên afrîkaya başûrî</displayName>
 			</currency>
+			<currency type="ZMK">
+				<displayName>kwaçayê zambîyayî (1968–2012)</displayName>
+				<displayName count="one">kwaçayê zambîyayî (1968–2012)</displayName>
+				<displayName count="other">kwaçayên zambîyayî (1968–2012)</displayName>
+			</currency>
 			<currency type="ZMW">
 				<displayName>kwaçayê zambîyayî</displayName>
 				<displayName count="one">kwaçayê zambîyayî</displayName>
 				<displayName count="other">kwaçayên zambîyayî</displayName>
 			</currency>
+			<currency type="ZRN">
+				<displayName>zaîreyê nû ya zaîreyî (1993–1998)</displayName>
+				<displayName count="one">zaîreyê nû ya zaîreyî (1993–1998)</displayName>
+				<displayName count="other">zaîreyên nû yên zaîreyî (1993–1998)</displayName>
+			</currency>
+			<currency type="ZRZ">
+				<displayName>zaîreyê zaîreyî (1971–1993)</displayName>
+				<displayName count="one">zaîreyê zaîreyî (1971–1993)</displayName>
+				<displayName count="other">zaîreyên zaîreyî (1971–1993)</displayName>
+			</currency>
+			<currency type="ZWD">
+				<displayName>dolarê zîmbabweyî (1980–2008)</displayName>
+				<displayName count="one">dolarê zîmbabweyî (1980–2008)</displayName>
+				<displayName count="other">dolarên zîmbabweyî (1980–2008)</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>zêrê zîmbabweyî</displayName>
+				<displayName count="one">zêrê zîmbabweyî</displayName>
+				<displayName count="other">zêrên zîmbabweyî</displayName>
+			</currency>
+			<currency type="ZWL">
+				<displayName>dolarê zîmbabweyî (2009–2024)</displayName>
+				<displayName count="one">dolarê zîmbabweyî (2009–2024)</displayName>
+				<displayName count="other">dolarên zîmbabweyî (2009–2024)</displayName>
+			</currency>
+			<currency type="ZWR">
+				<displayName>dolarê zîmbabweyî (2008)</displayName>
+				<displayName count="one">dolarê zîmbabweyî (2008)</displayName>
+				<displayName count="other">dolarên zîmbabweyî (2008)</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
@@ -3898,11 +6668,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} kîlometre kare</unitPattern>
 				<perUnitPattern>{0} serê kîlometre kareyê</perUnitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<displayName>hektar</displayName>
-			</unit>
 			<unit type="area-square-meter">
-				<displayName>metre kare</displayName>
 				<unitPattern count="one">{0} metre kare</unitPattern>
 				<unitPattern count="other">{0} metre kare</unitPattern>
 				<perUnitPattern>{0} serê metre kareyê</perUnitPattern>
@@ -3914,37 +6680,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>{0} serê santîmetre kareyê</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>mîl kare</displayName>
 				<unitPattern count="one">{0} mîl kare</unitPattern>
 				<unitPattern count="other">{0} mîl kare</unitPattern>
 				<perUnitPattern>{0} serê mîl kareyê</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
-				<displayName>akre</displayName>
 				<unitPattern count="one">{0} akre</unitPattern>
 				<unitPattern count="other">{0} akre</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName>yarda kare</displayName>
 				<unitPattern count="one">{0} yarda kare</unitPattern>
 				<unitPattern count="other">{0} yarda kare</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>fît kare</displayName>
 				<unitPattern count="one">{0} fît kare</unitPattern>
 				<unitPattern count="other">{0} fît kare</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>înç kare</displayName>
 				<unitPattern count="one">{0} înç kare</unitPattern>
 				<unitPattern count="other">{0} înç kare</unitPattern>
 				<perUnitPattern>{0} serê înç kareyê</perUnitPattern>
 			</unit>
-			<unit type="area-dunam">
-				<displayName>donim</displayName>
-				<unitPattern count="one">{0} donim</unitPattern>
-				<unitPattern count="other">{0} donim</unitPattern>
-			</unit>
 			<unit type="concentr-karat">
 				<unitPattern count="one">{0} qerat</unitPattern>
 				<unitPattern count="other">{0} qerat</unitPattern>
@@ -3954,22 +6710,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">ji sedî {0}</unitPattern>
 				<unitPattern count="other">ji sedî {0}</unitPattern>
 			</unit>
-			<unit type="duration-century">
-				<displayName>ss</displayName>
-				<unitPattern count="one">{0} ss</unitPattern>
-				<unitPattern count="other">{0} ss</unitPattern>
-			</unit>
-			<unit type="duration-decade">
-				<displayName>dehsal</displayName>
-				<unitPattern count="one">{0} dehsal</unitPattern>
-				<unitPattern count="other">{0} dehsal</unitPattern>
-			</unit>
-			<unit type="duration-quarter">
-				<displayName>çaryek</displayName>
-				<unitPattern count="one">{0} çaryek</unitPattern>
-				<unitPattern count="other">{0} çaryek</unitPattern>
-				<perUnitPattern>{0}/çaryek</perUnitPattern>
-			</unit>
 			<unit type="duration-month">
 				<unitPattern count="one">{0} meh</unitPattern>
 				<unitPattern count="other">{0} meh</unitPattern>
@@ -3997,10 +6737,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>sanîye</displayName>
 				<unitPattern count="one">{0} sanîye</unitPattern>
 				<unitPattern count="other">{0} saniye</unitPattern>
-				<perUnitPattern>{0}/sn</perUnitPattern>
 			</unit>
 			<unit type="length-earth-radius">
-				<displayName>nîvçapa dinyayê</displayName>
 				<unitPattern count="one">{0} nîvçapa dinyayê</unitPattern>
 				<unitPattern count="other">{0} nîvçapa dinyayê</unitPattern>
 			</unit>
@@ -4046,27 +6784,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} pîkometre</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName>mîl</displayName>
 				<unitPattern count="one">{0} mîl</unitPattern>
 				<unitPattern count="other">{0} mîl</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<displayName>yarda</displayName>
-			</unit>
 			<unit type="length-foot">
-				<displayName>fît</displayName>
 				<unitPattern count="one">{0} fît</unitPattern>
 				<unitPattern count="other">{0} fît</unitPattern>
 				<perUnitPattern>{0} serê fîtê</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName>înç</displayName>
 				<unitPattern count="one">{0} înç</unitPattern>
 				<unitPattern count="other">{0} înç</unitPattern>
 				<perUnitPattern>{0} serê înçê</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName>parsek</displayName>
 				<unitPattern count="one">{0} parsek</unitPattern>
 				<unitPattern count="other">{0} parsek</unitPattern>
 			</unit>
@@ -4081,12 +6812,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} yekeya astronomîk</unitPattern>
 			</unit>
 			<unit type="length-furlong">
-				<displayName>furlong</displayName>
 				<unitPattern count="one">{0} furlong</unitPattern>
 				<unitPattern count="other">{0} furlong</unitPattern>
 			</unit>
 			<unit type="length-fathom">
-				<displayName>fathom</displayName>
 				<unitPattern count="one">{0} fathom</unitPattern>
 				<unitPattern count="other">{0} fathom</unitPattern>
 			</unit>
@@ -4096,12 +6825,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} mîla behrê</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<displayName>punto</displayName>
 				<unitPattern count="one">{0} punto</unitPattern>
 				<unitPattern count="other">{0} punto</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName>nîvçapa rojê</displayName>
 				<unitPattern count="one">{0} nîvçapa rojê</unitPattern>
 				<unitPattern count="other">{0} nîvçapa rojê</unitPattern>
 			</unit>
@@ -4110,17 +6837,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kîlometreya serê saetê</displayName>
-				<unitPattern count="one">{0} km/st</unitPattern>
-				<unitPattern count="other">{0} km/st</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>lître</displayName>
-			</unit>
-			<unit type="duration-night">
-				<displayName>şev</displayName>
-				<unitPattern count="one">{0} şev</unitPattern>
-				<unitPattern count="other">{0} şev</unitPattern>
-				<perUnitPattern>{0}/şev</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>hêlên sereke</displayName>
@@ -4310,64 +7026,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="angle-radian">
 				<displayName>rad</displayName>
 			</unit>
-			<unit type="angle-arc-minute">
-				<displayName>dq. kevanî</displayName>
-			</unit>
-			<unit type="angle-arc-second">
-				<displayName>sn. kevanî</displayName>
-			</unit>
-			<unit type="area-hectare">
-				<displayName>hektar</displayName>
-			</unit>
-			<unit type="area-square-meter">
-				<displayName>metre kare</displayName>
-			</unit>
-			<unit type="area-square-mile">
-				<displayName>mîl kare</displayName>
-			</unit>
-			<unit type="area-acre">
-				<displayName>akre</displayName>
-			</unit>
-			<unit type="area-square-yard">
-				<displayName>yarda kare</displayName>
-			</unit>
-			<unit type="area-square-foot">
-				<displayName>fît kare</displayName>
-			</unit>
-			<unit type="area-square-inch">
-				<displayName>înç kare</displayName>
-			</unit>
-			<unit type="area-dunam">
-				<displayName>donim</displayName>
-				<unitPattern count="one">{0} donim</unitPattern>
-				<unitPattern count="other">{0} donim</unitPattern>
-			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>l/100km</displayName>
 				<unitPattern count="one">{0}l/100km</unitPattern>
 				<unitPattern count="other">{0}l/100km</unitPattern>
 			</unit>
-			<unit type="duration-century">
-				<displayName>ss</displayName>
-				<unitPattern count="one">{0} ss</unitPattern>
-				<unitPattern count="other">{0} ss</unitPattern>
-			</unit>
-			<unit type="duration-decade">
-				<displayName>dehsal</displayName>
-				<unitPattern count="one">{0} dehsal</unitPattern>
-				<unitPattern count="other">{0} dehsal</unitPattern>
-			</unit>
 			<unit type="duration-year">
 				<displayName>sl</displayName>
 				<unitPattern count="one">{0}sl</unitPattern>
 				<unitPattern count="other">{0}sl</unitPattern>
 			</unit>
-			<unit type="duration-quarter">
-				<displayName>çaryek</displayName>
-				<unitPattern count="one">{0} çaryek</unitPattern>
-				<unitPattern count="other">{0} çaryek</unitPattern>
-				<perUnitPattern>{0}/çaryek</perUnitPattern>
-			</unit>
 			<unit type="duration-month">
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
@@ -4389,16 +7057,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}d</unitPattern>
 			</unit>
 			<unit type="duration-second">
-				<displayName>sn</displayName>
 				<unitPattern count="one">{0}sn</unitPattern>
 				<unitPattern count="other">{0}sn</unitPattern>
-				<perUnitPattern>{0}/sn</perUnitPattern>
-			</unit>
-			<unit type="length-earth-radius">
-				<displayName>nîvçapa dinyayê</displayName>
 			</unit>
 			<unit type="length-meter">
-				<displayName>m</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
@@ -4427,54 +7089,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}pm</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName>mîl</displayName>
 				<unitPattern count="one">{0}mi</unitPattern>
 				<unitPattern count="other">{0}mi</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<displayName>yarda</displayName>
-			</unit>
 			<unit type="length-foot">
-				<displayName>fît</displayName>
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="length-inch">
-				<displayName>înç</displayName>
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="length-parsec">
-				<displayName>parsek</displayName>
-			</unit>
-			<unit type="length-light-year">
-				<displayName>sala rnh</displayName>
-				<unitPattern count="one">{0} sala rnh</unitPattern>
-				<unitPattern count="other">{0} sala rnh</unitPattern>
-			</unit>
-			<unit type="length-furlong">
-				<displayName>furlong</displayName>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>fathom</displayName>
-			</unit>
-			<unit type="length-solar-radius">
-				<displayName>nîvçapa rojê</displayName>
-			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName>km/st</displayName>
-				<unitPattern count="one">{0} km/st</unitPattern>
-				<unitPattern count="other">{0} km/st</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<displayName>lître</displayName>
-			</unit>
-			<unit type="duration-night">
-				<displayName>şev</displayName>
-				<unitPattern count="one">{0} şev</unitPattern>
-				<unitPattern count="other">{0} şev</unitPattern>
-				<perUnitPattern>{0}/şev</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}Rh</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}Bk</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/ku_Arab.xml b/make/data/cldr/common/main/ku_Arab.xml
new file mode 100644
index 00000000000..980252cf799
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Arab.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Arab"/>
+	</identity>
+	<layout>
+		<orientation>
+			<characterOrder>right-to-left</characterOrder>
+			<lineOrder>top-to-bottom</lineOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<exemplarCharacters>[ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ه ە و ۆ ی ێ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200C\u200D\u200E\u200F ً ٌ ٍ َ ُ ِ ّ ْ ء آ أ ؤ إ ة ث ذ ص ض ط ظ ك ھ ى ي]</exemplarCharacters>
+		<exemplarCharacters type="index" draft="unconfirmed">[ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ه ە و ۆ ی ێ]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E\u200F \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ , ، ؛ \: ! ؟ . … ‘’ ‹ › &quot;“” « » ( ) \[ \] \{ \} ﴿ * / • −]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/ku_Arab_IQ.xml b/make/data/cldr/common/main/ku_Arab_IQ.xml
new file mode 100644
index 00000000000..d6172dd62ba
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Arab_IQ.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Arab"/>
+		<territory type="IQ"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/ku_Arab_IR.xml b/make/data/cldr/common/main/ku_Arab_IR.xml
new file mode 100644
index 00000000000..76f170e2955
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Arab_IR.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Arab"/>
+		<territory type="IR"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/ku_Latn.xml b/make/data/cldr/common/main/ku_Latn.xml
new file mode 100644
index 00000000000..6912886fe0e
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Latn.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Latn"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/ku_Latn_IQ.xml b/make/data/cldr/common/main/ku_Latn_IQ.xml
new file mode 100644
index 00000000000..aebce80cf6d
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Latn_IQ.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Latn"/>
+		<territory type="IQ"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/ku_Latn_SY.xml b/make/data/cldr/common/main/ku_Latn_SY.xml
new file mode 100644
index 00000000000..3f56aa51d11
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Latn_SY.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Latn"/>
+		<territory type="SY"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/ku_Latn_TR.xml b/make/data/cldr/common/main/ku_Latn_TR.xml
new file mode 100644
index 00000000000..bcca8f65893
--- /dev/null
+++ b/make/data/cldr/common/main/ku_Latn_TR.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ku"/>
+		<script type="Latn"/>
+		<territory type="TR"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/kxv.xml b/make/data/cldr/common/main/kxv.xml
index 7a3a8b3b16f..90414d82a0b 100644
--- a/make/data/cldr/common/main/kxv.xml
+++ b/make/data/cldr/common/main/kxv.xml
@@ -1595,7 +1595,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>pnom penh</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>kanṭon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2262,9 +2262,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>veḍakuṇpu aaprika belā</generic>
-					<standard>veḍa kuṇpu aaprika mananka belā</standard>
-					<daylight>veḍa kuṇpu aaprika karã belā</daylight>
+					<standard>veḍakuṇpu aaprika belā</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2614,6 +2612,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>guyān belā</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>hāwāe- aalūsān mānānka belā</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>hāwāe- aalūsān belā</generic>
@@ -3149,30 +3152,56 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0h</pattern>
-					<pattern type="10000" count="other">¤00h</pattern>
-					<pattern type="100000" count="other">¤000h</pattern>
-					<pattern type="1000000" count="other">¤0mi</pattern>
-					<pattern type="10000000" count="other">¤00mi</pattern>
-					<pattern type="100000000" count="other">¤000mi</pattern>
-					<pattern type="1000000000" count="other">¤0bi</pattern>
-					<pattern type="10000000000" count="other">¤00bi</pattern>
-					<pattern type="100000000000" count="other">¤000bi</pattern>
-					<pattern type="1000000000000" count="other">¤0tri</pattern>
-					<pattern type="10000000000000" count="other">¤00tri</pattern>
-					<pattern type="100000000000000" count="other">¤000tri</pattern>
+					<pattern type="1000" count="other">¤0 h</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 h</pattern>
+					<pattern type="10000" count="other">¤00 h</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 h</pattern>
+					<pattern type="100000" count="other">¤000 h</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 h</pattern>
+					<pattern type="1000000" count="other">¤0 mi</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0 mi</pattern>
+					<pattern type="10000000" count="other">¤00 mi</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00 mi</pattern>
+					<pattern type="100000000" count="other">¤000 mi</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000 mi</pattern>
+					<pattern type="1000000000" count="other">¤0 bi</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 bi</pattern>
+					<pattern type="10000000000" count="other">¤00 bi</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 bi</pattern>
+					<pattern type="100000000000" count="other">¤000 bi</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 bi</pattern>
+					<pattern type="1000000000000" count="other">¤0 tri</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 tri</pattern>
+					<pattern type="10000000000000" count="other">¤00 tri</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 tri</pattern>
+					<pattern type="100000000000000" count="other">¤000 tri</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 tri</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/kxv_Deva.xml b/make/data/cldr/common/main/kxv_Deva.xml
index d777e1d7441..bbd7ccaded8 100644
--- a/make/data/cldr/common/main/kxv_Deva.xml
+++ b/make/data/cldr/common/main/kxv_Deva.xml
@@ -1606,7 +1606,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>पनॉम पेन्ह</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>केंटन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2273,9 +2273,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>पस्चिम आप्रिका बेला</generic>
-					<standard>पस्चिम आप्रिका मानांकॉ बेला</standard>
-					<daylight>पस्चिम आप्रिका काराँ मासा बेला</daylight>
+					<standard>पस्चिम आप्रिका बेला</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2625,6 +2623,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>गुयाना बेला</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाति–आल्यूसन मानांकॉ बेला</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाति–आल्यूसन बेला</generic>
@@ -3131,10 +3134,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/kxv_Orya.xml b/make/data/cldr/common/main/kxv_Orya.xml
index e44e4894aa1..d6601fc47c0 100644
--- a/make/data/cldr/common/main/kxv_Orya.xml
+++ b/make/data/cldr/common/main/kxv_Orya.xml
@@ -1609,7 +1609,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>ପନମ୍‌ ପେନହ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>କେଣ୍ଟନ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2276,9 +2276,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ୱେଡ଼ା କୁଣ୍‍ପୁ ଆପ୍ରିକା ବେଲା</generic>
-					<standard>ୱେଡ଼ା କୁଣ୍‍ପୁ ଆପ୍ରିକା ମାନାଙ୍କ ବେଲା</standard>
-					<daylight>ୱେଡ଼ା କୁଣ୍‍ପୁ ଆପ୍ରିକା କାରାଁ ବେଲା</daylight>
+					<standard>ୱେଡ଼ା କୁଣ୍‍ପୁ ଆପ୍ରିକା ବେଲା</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2628,6 +2626,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ଗୁୟାନା ବେଲା</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ହାୱାଇ-ଆଲ୍ୟୁସାନ ମାନାଙ୍କ ବେଲା</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ହାୱାଇ-ଆଲ୍ୟୁସାନ ବେଲା</generic>
@@ -3134,10 +3137,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/kxv_Telu.xml b/make/data/cldr/common/main/kxv_Telu.xml
index 4a139f94b74..ebb7cf35344 100644
--- a/make/data/cldr/common/main/kxv_Telu.xml
+++ b/make/data/cldr/common/main/kxv_Telu.xml
@@ -1578,7 +1578,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>నోమ్‌పెన్హ్</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>కాంటన్</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2245,9 +2245,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>పశ్చిమ ఆఫ్రికా సమయం</generic>
-					<standard>పశ్చిమ ఆఫ్రికా ప్రామాణిక సమయం</standard>
-					<daylight>పశ్చిమ ఆఫ్రికా వేసవి సమయం</daylight>
+					<standard>పశ్చిమ ఆఫ్రికా సమయం</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2597,6 +2595,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>గయానా సమయం</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>హవాయ్-అల్యూషియన్ ప్రామాణిక సమయం</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>హవాయ్-అల్యూషియన్ సమయం</generic>
@@ -3103,10 +3106,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/ky.xml b/make/data/cldr/common/main/ky.xml
index 28c43627a3b..6e2a55c32f0 100644
--- a/make/data/cldr/common/main/ky.xml
+++ b/make/data/cldr/common/main/ky.xml
@@ -44,6 +44,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">азербайжанча</language>
 			<language type="az" alt="short">азерче</language>
 			<language type="ba">башкырча</language>
+			<language type="bal">белужиче</language>
 			<language type="ban">баличе</language>
 			<language type="bas">басаача</language>
 			<language type="be">беларусча</language>
@@ -223,6 +224,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафияча</language>
 			<language type="ksh">колоньяча</language>
 			<language type="ku">курдча</language>
+			<language type="ku" menu="core">курдча</language>
+			<language type="ku" menu="extension">курманжиче (курдча)</language>
 			<language type="kum">кумыкча</language>
 			<language type="kv">комиче</language>
 			<language type="kw">корнишче</language>
@@ -618,6 +621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Кытай</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">Клиппертон аралы</territory>
+			<territory type="CQ">саркча (нормандча)</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -849,45 +853,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Валюта форматы</key>
 			<key type="collation">Иргөө тартиби</key>
 			<key type="currency">Валюта</key>
+			<key type="em">Быйтыкчалардын презентациясы</key>
 			<key type="hc">Саат мерчеми (12/24)</key>
 			<key type="lb">Саптарды ажыратуу стили</key>
+			<key type="lw">Сөздөрдүн ичиндеги саптардын үзүлүшү</key>
 			<key type="ms">Өлчөө тутуму</key>
 			<key type="numbers">Сандар</key>
+			<key type="ss">Аббревиатурадан кийин сүйлөм тыныгуусу.</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Будда жылнаамасы</type>
+			<type key="calendar" type="buddhist" scope="core">Буддист</type>
 			<type key="calendar" type="chinese">Кытай жылнаамасы</type>
+			<type key="calendar" type="chinese" scope="core">Кытайлык</type>
 			<type key="calendar" type="coptic">Копт жылнаамасы</type>
+			<type key="calendar" type="coptic" scope="core">Копт</type>
 			<type key="calendar" type="dangi">Данги жылнаамасы</type>
+			<type key="calendar" type="dangi" scope="core">Данги</type>
 			<type key="calendar" type="ethiopic">Эфиоп жылнаамасы</type>
+			<type key="calendar" type="ethiopic" scope="core">Эфиопиялык</type>
 			<type key="calendar" type="ethiopic-amete-alem">Эфиопиялык Амет Алем жылнаамасы</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Эфиопиялык Амет Алем</type>
 			<type key="calendar" type="gregorian">Григориан жылнаамасы</type>
+			<type key="calendar" type="gregorian" scope="core">Григориан</type>
 			<type key="calendar" type="hebrew">Иврит жылнаамасы</type>
+			<type key="calendar" type="hebrew" scope="core">Иврит</type>
 			<type key="calendar" type="islamic">Ислам жылнаамасы</type>
+			<type key="calendar" type="islamic" scope="core">Исламдык</type>
 			<type key="calendar" type="islamic-civil">Ислам жылнаамасы (жадыбал)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Ислам жылнаамасы (жадыбал, жарандык доор)</type>
 			<type key="calendar" type="islamic-umalqura">Ислам жылнаамасы (Умм аль-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Ислам жылнаамасы (Умм аль-Кура)</type>
 			<type key="calendar" type="iso8601">ИСО-8601 жылнаамасы</type>
 			<type key="calendar" type="japanese">Жапон жылнаамасы</type>
+			<type key="calendar" type="japanese" scope="core">Жапон</type>
 			<type key="calendar" type="persian">Перс жылнаамасы</type>
+			<type key="calendar" type="persian" scope="core">Перс</type>
 			<type key="calendar" type="roc">Мингуо жылнаамасы</type>
+			<type key="calendar" type="roc" scope="core">Мингуо</type>
 			<type key="cf" type="account">Эсептешүү валютасынын форматы</type>
+			<type key="cf" type="account" scope="core">Бухгалтердик эсеп</type>
 			<type key="cf" type="standard">Стандарттык валюта форматы</type>
+			<type key="cf" type="standard" scope="core">Стандарттык</type>
 			<type key="collation" type="ducet">Демейки Unicode иргөө тартиби</type>
+			<type key="collation" type="ducet" scope="core">Демейки Unicode</type>
 			<type key="collation" type="search">Жалпы издөө</type>
+			<type key="collation" type="search" scope="core">Издөө</type>
 			<type key="collation" type="standard">Стандарттык иргөө тартиби</type>
+			<type key="collation" type="standard" scope="core">Стандарттык</type>
 			<type key="d0" type="fwidth">Кең формат</type>
 			<type key="d0" type="hwidth">Кыска формат</type>
 			<type key="d0" type="npinyin" draft="unconfirmed">Сандык</type>
+			<type key="em" type="default" scope="core">Демейки</type>
+			<type key="em" type="emoji" scope="core">Быйтыкча</type>
+			<type key="em" type="text" scope="core">Текст</type>
 			<type key="hc" type="h11">12 сааттык тутум (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 сааттык тутум (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 сааттык тутум (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 сааттык тутум (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24</type>
 			<type key="lb" type="loose">Саптардын арасы кенен</type>
+			<type key="lb" type="loose" scope="core">Кенен</type>
 			<type key="lb" type="normal">Саптардын арасы орточо</type>
+			<type key="lb" type="normal" scope="core">Кадимкидей</type>
 			<type key="lb" type="strict">Саптардын арасы тыкыс</type>
+			<type key="lb" type="strict" scope="core">тыкыс</type>
+			<type key="lw" type="breakall" scope="core">Баарын үзүү</type>
+			<type key="lw" type="keepall" scope="core">Баарын сактоо</type>
+			<type key="lw" type="normal" scope="core">Кадимки</type>
+			<type key="lw" type="phrase" scope="core">Фразалар менен сактоо</type>
 			<type key="ms" type="metric">Метрикалык тутум</type>
+			<type key="ms" type="metric" scope="core">Метрикалык</type>
 			<type key="ms" type="uksystem">Британ империясынын өлчөө тутуму</type>
+			<type key="ms" type="uksystem" scope="core">УБ</type>
 			<type key="ms" type="ussystem">АКШ өлчөө тутуму</type>
+			<type key="ms" type="ussystem" scope="core">АКШ</type>
 			<type key="numbers" type="arab">Араб-индус сандары</type>
 			<type key="numbers" type="arabext">Кеңейтилген араб-индус сандары</type>
 			<type key="numbers" type="armn">Армян сандары</type>
@@ -928,6 +971,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">Тай сандары</type>
 			<type key="numbers" type="tibt">Тибет сандары</type>
 			<type key="numbers" type="vaii">Ваи сандары</type>
+			<type key="ss" type="none" scope="core">Өчүк</type>
+			<type key="ss" type="standard" scope="core">Күйүк</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Метрикалык өлчөө тутуму</measurementSystemName>
@@ -1018,7 +1063,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y-'ж'. d-MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y-'ж'. d-MMM, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
@@ -1377,7 +1421,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">G y-'ж'. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y-'ж'. d-MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y-'ж'. d-MMM, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1964,6 +2007,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0} убактысы</regionFormat>
+			<regionFormat type="daylight">{0} Күндүзгү убакыт</regionFormat>
+			<regionFormat type="standard">{0} Стандарттык убакыт</regionFormat>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Гонолулу</exemplarCity>
 			</zone>
@@ -2317,6 +2362,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Истер</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Койайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Аренас</exemplarCity>
 			</zone>
@@ -2582,9 +2630,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3254,9 +3299,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Батыш Африка убактысы</generic>
-					<standard>Батыш Африка кышкы убакыты</standard>
-					<daylight>Батыш Африка жайкы убактысы</daylight>
+					<standard>Батыш Африка убактысы</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3606,6 +3649,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гвиана убактысы</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайи-Алеут кышкы убактысы</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавайи-Алеут убактысы</generic>
@@ -4170,10 +4218,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4716,6 +4778,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>чыгыш кариб доллары</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>Кариб гулдени</displayName>
+				<displayName count="one">кариб гулдени</displayName>
+				<displayName count="other">кариб гулдени</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>КФА франкы</displayName>
 			</currency>
@@ -4736,6 +4803,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>Замбия квачасы</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабве алтыны</displayName>
+				<displayName count="one">Зимбабве алтыны</displayName>
+				<displayName count="other">Зимбабве алтыны</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4902,7 +4974,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">литрине {0} миллимоль</unitPattern>
 				<unitPattern count="other">литрине {0} миллимоль</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>бирдик</displayName>
+				<unitPattern count="one">{0} бирдик</unitPattern>
+				<unitPattern count="other">{0} бирдик</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>миллионго бөлүктөр</displayName>
 				<unitPattern count="one">миллионго {0} бөлүк</unitPattern>
 				<unitPattern count="other">миллионго {0} бөлүк</unitPattern>
@@ -4918,6 +4995,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>мольдор</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="one">{0} глюкоза</unitPattern>
+				<unitPattern count="other">{0} глюкоза</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>километрине литр</displayName>
 				<unitPattern count="one">километрине {0} литр</unitPattern>
@@ -5320,6 +5402,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} миллиметр сымап мамычасы</unitPattern>
 				<unitPattern count="other">{0} миллиметр сымап мамычасы</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>сымап мамычасы</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>чарчы дюймга фунт</displayName>
 				<unitPattern count="one">чарчы дюймга {0} фунт</unitPattern>
@@ -5522,20 +5607,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} драм</unitPattern>
 				<unitPattern count="other">{0} драм</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>жарык</displayName>
-				<unitPattern count="one">{0} жарык</unitPattern>
-				<unitPattern count="other">{0} жарык</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>стерадиан</displayName>
+				<unitPattern count="one">{0} стерадиан</unitPattern>
+				<unitPattern count="other">{0} стерадиан</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>катал</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="other">{0} катал</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кулон</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="other">{0} кулон</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарад</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="other">{0} фарад</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генри</displayName>
+				<unitPattern count="one">{0} генри</unitPattern>
+				<unitPattern count="other">{0} генри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сименс</displayName>
+				<unitPattern count="one">{0} сименс</unitPattern>
+				<unitPattern count="other">{0} сименс</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калориялар [IT]</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Беккерель</displayName>
+				<unitPattern count="one">{0} беккерель</unitPattern>
+				<unitPattern count="other">{0} беккерель</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зиверттер</displayName>
+				<unitPattern count="one">{0} зиверттер</unitPattern>
+				<unitPattern count="other">{0} зиверттер</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Грей</displayName>
+				<unitPattern count="one">{0} грей</unitPattern>
+				<unitPattern count="other">{0} грей</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограмм- күч</displayName>
+				<unitPattern count="one">{0} килограмм-күч</unitPattern>
+				<unitPattern count="other">{0} килограмм-күч</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесла</displayName>
+				<unitPattern count="one">{0} тесла</unitPattern>
+				<unitPattern count="other">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебер</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="other">{0} вебер</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>мкг/л</displayName>
 				<unitPattern count="one">{0} мкг/л</unitPattern>
 				<unitPattern count="other">{0} мкг/л</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>түн</displayName>
-				<unitPattern count="one">{0}/түн</unitPattern>
-				<unitPattern count="other">{0}/түн</unitPattern>
 				<perUnitPattern>{0}/түнүнө</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -5692,7 +5832,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} нерсе</unitPattern>
 				<unitPattern count="other">{0} нерсе</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>бирдик</displayName>
+				<unitPattern count="one">{0} бирдик</unitPattern>
+				<unitPattern count="other">{0} бирдик</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>миллионго/бөлүк</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -5706,6 +5851,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} моль</unitPattern>
 				<unitPattern count="other">{0} моль</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -6353,7 +6501,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} жарык</unitPattern>
 				<unitPattern count="other">{0} жарык</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>мкг/л</displayName>
 				<unitPattern count="one">{0} мкг/л</unitPattern>
 				<unitPattern count="other">{0} мкг/л</unitPattern>
@@ -6393,9 +6541,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ммоль/л</unitPattern>
 				<unitPattern count="other">{0}ммоль/л</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>бирдик</displayName>
+				<unitPattern count="one">{0} бирдик</unitPattern>
+				<unitPattern count="other">{0} бирдик</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>100 км/л</displayName>
 			</unit>
@@ -6540,22 +6696,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>жарык</displayName>
-				<unitPattern count="one">{0} жарык</unitPattern>
-				<unitPattern count="other">{0} жарык</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>мкг/л</displayName>
 				<unitPattern count="one">{0} мкг/л</unitPattern>
 				<unitPattern count="other">{0} мкг/л</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>түн</displayName>
-				<unitPattern count="one">{0}/түн</unitPattern>
-				<unitPattern count="other">{0}/түн</unitPattern>
-				<perUnitPattern>{0}/түн</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="north">{0}Тн</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0}Тш</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/la.xml b/make/data/cldr/common/main/la.xml
index f3d9037b632..89af177b555 100644
--- a/make/data/cldr/common/main/la.xml
+++ b/make/data/cldr/common/main/la.xml
@@ -1069,6 +1069,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤ 0M</pattern>
+					<pattern type="1000" count="other">¤ 0M</pattern>
+					<pattern type="10000" count="one">¤ 00M</pattern>
+					<pattern type="10000" count="other">¤ 00M</pattern>
+					<pattern type="100000" count="one">¤ 000M</pattern>
+					<pattern type="100000" count="other">¤ 000M</pattern>
+					<pattern type="1000000" count="one">¤ 0 Mn</pattern>
+					<pattern type="1000000" count="other">¤ 0 Mn</pattern>
+					<pattern type="10000000" count="one">¤ 00 Mn</pattern>
+					<pattern type="10000000" count="other">¤ 00 Mn</pattern>
+					<pattern type="100000000" count="one">¤ 000 Mn</pattern>
+					<pattern type="100000000" count="other">¤ 000 Mn</pattern>
+					<pattern type="1000000000" count="one">¤ 0 Md</pattern>
+					<pattern type="1000000000" count="other">¤ 0 Md</pattern>
+					<pattern type="10000000000" count="one">¤ 00 Md</pattern>
+					<pattern type="10000000000" count="other">¤ 00 Md</pattern>
+					<pattern type="100000000000" count="one">¤ 000 Md</pattern>
+					<pattern type="100000000000" count="other">¤ 000 Md</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 mil Md</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 mil Md</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 mil Md</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 mil Md</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 mil Md</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 mil Md</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="CHF">
 				<displayName draft="provisional">Francus Helveticus</displayName>
diff --git a/make/data/cldr/common/main/lb.xml b/make/data/cldr/common/main/lb.xml
index d2b14f0cd92..a4e0e47b2e7 100644
--- a/make/data/cldr/common/main/lb.xml
+++ b/make/data/cldr/common/main/lb.xml
@@ -1120,11 +1120,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="japanese">Japanesche Kalenner</type>
 			<type key="calendar" type="persian">Persesche Kalenner</type>
 			<type key="calendar" type="roc">Kalenner vun der Republik China</type>
-			<type key="collation" type="big5han">Traditionellt Chinesesch - Big5</type>
 			<type key="collation" type="dictionary">Lexikographesch Zortéierreiefolleg</type>
 			<type key="collation" type="ducet">Unicode-Zortéierung</type>
 			<type key="collation" type="eor">Europäesch Zortéierregelen</type>
-			<type key="collation" type="gb2312han">Vereinfacht Chinesesch - GB2312</type>
 			<type key="collation" type="phonebook">Telefonsbuch-Zortéierung</type>
 			<type key="collation" type="pinyin">Pinyin-Zortéierregelen</type>
 			<type key="collation" type="search">Allgemeng Sich</type>
@@ -2381,9 +2379,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Westafrikanesch Zäit</generic>
-					<standard>Westafrikanesch Normalzäit</standard>
-					<daylight>Westafrikanesch Summerzäit</daylight>
+					<standard>Westafrikanesch Zäit</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2740,6 +2736,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyana-Zäit</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleuten-Normalzäit</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleuten-Zäit</generic>
@@ -3313,6 +3314,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/lij.xml b/make/data/cldr/common/main/lij.xml
index 87513dfd5e8..3cabba674ef 100644
--- a/make/data/cldr/common/main/lij.xml
+++ b/make/data/cldr/common/main/lij.xml
@@ -2229,9 +2229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">oa de l’Africa de ponente</generic>
-					<standard draft="unconfirmed">oa standard de l’Africa de ponente</standard>
-					<daylight draft="unconfirmed">oa de stæ de l’Africa de ponente</daylight>
+					<standard draft="unconfirmed">oa de l’Africa de ponente</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2581,6 +2579,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="unconfirmed">oa da Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">oa standard de Hawaii-Aleutiñe</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">oa de Hawaii-Aleutiñe</generic>
@@ -3143,9 +3146,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4160,7 +4165,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" draft="unconfirmed">{0} elemento</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} elementi</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">parte pe mion</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} parte pe mion</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} parte pe mion</unitPattern>
@@ -5262,7 +5267,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" draft="unconfirmed">{0}elem</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}elem</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one" draft="unconfirmed">{0}ppm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0}ppm</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/lld.xml b/make/data/cldr/common/main/lld.xml
index 7fa1cff49b1..f60f01e682b 100644
--- a/make/data/cldr/common/main/lld.xml
+++ b/make/data/cldr/common/main/lld.xml
@@ -15,22 +15,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="aa">afar</language>
 			<language type="ab">abkhasich</language>
 			<language type="af">afrikaans</language>
+			<language type="agq">aghem</language>
 			<language type="ak">akan</language>
 			<language type="am">amarich</language>
 			<language type="an">aragonesc</language>
 			<language type="ar">arabich</language>
-			<language type="ar_001">arabich modern standard</language>
+			<language type="ar_001">arabich standard modern</language>
 			<language type="as">assamesc</language>
+			<language type="asa">asu</language>
+			<language type="ast">asturian</language>
 			<language type="az">azerbaijan</language>
 			<language type="ba">bashkir</language>
+			<language type="bal">baluchi</language>
 			<language type="be">belarus</language>
 			<language type="bg">bulgar</language>
+			<language type="blo">anii</language>
 			<language type="bm">bambara</language>
 			<language type="bn">bengalesc</language>
 			<language type="bo">tibetan</language>
+			<language type="bqi">bakhtiari</language>
 			<language type="br">breton</language>
 			<language type="bs">bosniach</language>
+			<language type="bss">akoose</language>
 			<language type="ca">catalan</language>
+			<language type="cch">atsam</language>
 			<language type="ce">cecen</language>
 			<language type="chr">cherokee</language>
 			<language type="co">corsich</language>
@@ -78,7 +86,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ha">haussa</language>
 			<language type="he">ebraich</language>
 			<language type="hi">hindi</language>
-			<language type="hi_Latn">hindi (latin)</language>
 			<language type="hi_Latn" alt="variant">hinglish</language>
 			<language type="hr">croat</language>
 			<language type="hu">ungaresc</language>
@@ -103,6 +110,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kn">kannada</language>
 			<language type="ko">corean</language>
 			<language type="ks">kashmiri</language>
+			<language type="ksf">bafia</language>
 			<language type="ku">curdich</language>
 			<language type="kw">cornich</language>
 			<language type="ky">kyrgyz</language>
@@ -301,6 +309,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Cina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Isola de Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Capo Verde</territory>
@@ -525,8 +534,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 		<types>
 			<type key="calendar" type="gregorian">Calënder gregorian</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">Gregorian</type>
 			<type key="calendar" type="iso8601">Calënder ISO-8601</type>
 			<type key="collation" type="standard">Ordinamënt standard</type>
+			<type key="collation" type="standard" scope="core" draft="unconfirmed">Standard</type>
 			<type key="numbers" type="latn">Zifres ozidentales</type>
 		</types>
 		<measurementSystemNames>
@@ -606,9 +617,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
@@ -619,7 +627,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
@@ -740,20 +750,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">de jená</month>
-							<month type="2">de forá</month>
-							<month type="3">de merz</month>
-							<month type="4">d’aurí</month>
-							<month type="5">de ma</month>
-							<month type="6">de jügn</month>
-							<month type="7">de messé</month>
-							<month type="8">d’aost</month>
-							<month type="9">de set</month>
-							<month type="10">d’oto</month>
-							<month type="11">de nov</month>
-							<month type="12">de dez</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">J</month>
 							<month type="2">F</month>
@@ -839,24 +835,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">vën</day>
 							<day type="sat">sab</day>
 						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">D</day>
-							<day type="mon" draft="unconfirmed">L</day>
-							<day type="tue" draft="unconfirmed">M</day>
-							<day type="wed" draft="unconfirmed">M</day>
-							<day type="thu" draft="unconfirmed">J</day>
-							<day type="fri" draft="unconfirmed">V</day>
-							<day type="sat" draft="unconfirmed">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">dom</day>
-							<day type="mon">lön</day>
-							<day type="tue">mert</day>
-							<day type="wed">merc</day>
-							<day type="thu">jöb</day>
-							<day type="fri">vën</day>
-							<day type="sat">sab</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">domënia</day>
 							<day type="mon">lönesc</day>
@@ -868,15 +846,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">lön</day>
-							<day type="tue">mert</day>
-							<day type="wed">merc</day>
-							<day type="thu">jöb</day>
-							<day type="fri">vën</day>
-							<day type="sat">sab</day>
-						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">D</day>
 							<day type="mon">L</day>
@@ -886,34 +855,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">V</day>
 							<day type="sat">S</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">dom</day>
-							<day type="mon">lön</day>
-							<day type="tue">mert</day>
-							<day type="wed">merc</day>
-							<day type="thu">jöb</day>
-							<day type="fri">vën</day>
-							<day type="sat">sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">domënia</day>
-							<day type="mon" draft="unconfirmed">lönesc</day>
-							<day type="tue" draft="unconfirmed">mertesc</day>
-							<day type="wed" draft="unconfirmed">mercui</day>
-							<day type="thu" draft="unconfirmed">jöbia</day>
-							<day type="fri" draft="unconfirmed">vëndres</day>
-							<day type="sat" draft="unconfirmed">sabeda</day>
-						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">pröm trimester</quarter>
 							<quarter type="2">secundo trimester</quarter>
@@ -921,33 +866,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">cuarto trimester</quarter>
 						</quarterWidth>
 					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">pröm trimester</quarter>
-							<quarter type="2" draft="unconfirmed">secundo trimester</quarter>
-							<quarter type="3" draft="unconfirmed">terzo trimester</quarter>
-							<quarter type="4" draft="unconfirmed">cuarto trimester</quarter>
-						</quarterWidth>
-					</quarterContext>
 				</quarters>
 				<eras>
 					<eraNames>
 						<era type="0">dan Gejú Crist</era>
 						<era type="0" alt="variant">dan le tëmp cristian</era>
-						<era type="1">A.D.</era>
 						<era type="1" alt="variant">Tëmp cristian</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">dan G.C.</era>
-						<era type="0" alt="variant">dan t.c.</era>
 						<era type="1">AD</era>
-						<era type="1" alt="variant">t.c.</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1002,6 +930,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'dales' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1010,22 +941,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'dales' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, 'dales' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
@@ -1035,8 +963,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">G y, MM</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y.MM.dd, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
@@ -1176,9 +1105,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="year-short">
 				<displayName>ann</displayName>
-				<relative type="-1">l’ann passé</relative>
-				<relative type="0">chësc ann</relative>
-				<relative type="1">l’ann che vëgn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">te {0} n ann</relativeTimePattern>
 					<relativeTimePattern count="other">te {0} agn</relativeTimePattern>
@@ -1246,9 +1172,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="month-short">
 				<displayName>mëis</displayName>
-				<relative type="-1">le mëis da denant</relative>
-				<relative type="0">chësc mëis</relative>
-				<relative type="1">le mëis che vëgn</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">te {0} n mëis</relativeTimePattern>
 					<relativeTimePattern count="other">te {0} mëisc</relativeTimePattern>
@@ -1260,9 +1183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="month-narrow">
 				<displayName>mëis</displayName>
-				<relative type="-1" draft="unconfirmed">le mëis da denant</relative>
-				<relative type="0" draft="unconfirmed">chësc mëis</relative>
-				<relative type="1" draft="unconfirmed">le mëis che vëgn</relative>
 			</field>
 			<field type="week">
 				<displayName>edema</displayName>
@@ -1292,14 +1212,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="one">dan da {0} n’ede.</relativeTimePattern>
 					<relativeTimePattern count="other">dan da {0} ede.</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod draft="unconfirmed">l’edema dl {0}</relativePeriod>
 			</field>
 			<field type="week-narrow">
 				<displayName>ede</displayName>
-				<relative type="-1" draft="unconfirmed">edema da denant</relative>
-				<relative type="0" draft="unconfirmed">chësta edema</relative>
-				<relative type="1" draft="unconfirmed">edema che vëgn</relative>
-				<relativePeriod draft="unconfirmed">l’edema dl {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>edema dl mëis</displayName>
@@ -1323,9 +1238,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="day-short">
 				<displayName>de</displayName>
-				<relative type="-1" draft="unconfirmed">inier</relative>
-				<relative type="0" draft="unconfirmed">incö</relative>
-				<relative type="1" draft="unconfirmed">indoman</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">te {0} n de</relativeTimePattern>
 					<relativeTimePattern count="other">te {0} dis</relativeTimePattern>
@@ -1337,9 +1249,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="day-narrow">
 				<displayName>de</displayName>
-				<relative type="-1" draft="unconfirmed">inier</relative>
-				<relative type="0" draft="unconfirmed">incö</relative>
-				<relative type="1" draft="unconfirmed">indoman</relative>
 			</field>
 			<field type="dayOfYear">
 				<displayName>de dl ann</displayName>
@@ -1935,9 +1844,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora dl’Africa ozidentala</generic>
-					<standard>Ora standard dl’Africa ozidentala</standard>
-					<daylight>Ora da d’isté dl’Africa ozidentala</daylight>
+					<standard>Ora dl’Africa ozidentala</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2287,6 +2194,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora dla Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora standard dles Isoles Hawaii-Aleutines</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora dles Isoles Hawaii-Aleutines</generic>
@@ -2854,9 +2766,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -3649,6 +3563,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dolar di Caraibi orientai</displayName>
 				<displayName count="other">dolars di Caraibi orientai</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>rainesc di Caraibi</displayName>
+				<displayName count="one">rainesc di Caraibi</displayName>
+				<displayName count="other">rainesc di Caraibi</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Franch CFA dl’Africa ozidentala</displayName>
 				<displayName count="one">franch CFA dl’Africa ozidentala</displayName>
@@ -3679,6 +3598,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">kwacha dl Zambia</displayName>
 				<displayName count="other">kwachas dl Zambia</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Or dl Zimbabwe</displayName>
+				<displayName count="one">or dl Zimbabwe</displayName>
+				<displayName count="other">ors dl Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one" draft="contributed">{0} de</pluralMinimalPairs>
@@ -3705,7 +3629,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</unitLength>
 		<unitLength type="narrow">
 			<coordinateUnit>
-				<displayName>direziun</displayName>
 				<coordinateUnitPattern type="east">{0} O</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
@@ -3722,23 +3645,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0} o {1}</listPatternPart>
 			<listPatternPart type="2">{0} o {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end">{0} o {1}</listPatternPart>
-			<listPatternPart type="2">{0} o {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end">{0} o {1}</listPatternPart>
-			<listPatternPart type="2">{0} o {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="end">{0} y {1}</listPatternPart>
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="2">{0} y {1}</listPatternPart>
-		</listPattern>
 	</listPatterns>
 </ldml>
diff --git a/make/data/cldr/common/main/lmo.xml b/make/data/cldr/common/main/lmo.xml
index 039d6c5ae3d..ea923105d2d 100644
--- a/make/data/cldr/common/main/lmo.xml
+++ b/make/data/cldr/common/main/lmo.xml
@@ -90,7 +90,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal draft="contributed">,</decimal>
-			<group draft="contributed">’</group>
+			<group draft="contributed">'</group>
 		</symbols>
 	</numbers>
 	<personNames>
diff --git a/make/data/cldr/common/main/ln.xml b/make/data/cldr/common/main/ln.xml
index ad0c686e849..eff2cd8d35b 100644
--- a/make/data/cldr/common/main/ln.xml
+++ b/make/data/cldr/common/main/ln.xml
@@ -686,6 +686,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/lo.xml b/make/data/cldr/common/main/lo.xml
index 9c80f01c584..2c19ecf99aa 100644
--- a/make/data/cldr/common/main/lo.xml
+++ b/make/data/cldr/common/main/lo.xml
@@ -287,6 +287,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ບາເຟຍ</language>
 			<language type="ksh">ໂຄລອກນຽນ</language>
 			<language type="ku">ເຄີດິສ</language>
+			<language type="ku" menu="core">ເຄີດິສ</language>
+			<language type="ku" menu="extension">ເຄີມານຈິ</language>
 			<language type="kum">ຄູມີກ</language>
 			<language type="kut">ຄູເທໄນ</language>
 			<language type="kv">ໂຄມິ</language>
@@ -844,6 +846,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ຈີນ</territory>
 			<territory type="CO">ໂຄລົມເບຍ</territory>
 			<territory type="CP">ເກາະຄລິບເປີຕັນ</territory>
+			<territory type="CQ">ຊາກຄ໌</territory>
 			<territory type="CR">ໂຄສຕາ ຣິກາ</territory>
 			<territory type="CU">ຄິວບາ</territory>
 			<territory type="CV">ເຄບ ເວີດ</territory>
@@ -1135,52 +1138,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">ຮູບແບບສະກຸນເງິນ</key>
 			<key type="collation">ຮຽງລຳດັບ</key>
 			<key type="currency">ສະກຸນເງິນ</key>
+			<key type="em">ການນໍາສະເໜີອີໂມຈິ</key>
 			<key type="hc">ຮອບວຽນຊົ່ວໂມງ( 12 ຫຼື 24)</key>
 			<key type="lb">ຮູບແບບເສັ້ນຂັ້ນ</key>
+			<key type="lw">ຮູບແບບເສັ້ນຂັ້ນພາຍໃນຄໍາສັບ</key>
 			<key type="ms">ລະບົບການວັດແທກ</key>
 			<key type="numbers">ຕົວເລກ</key>
+			<key type="ss">ຮູບແບບປະໂຫຍກຂັ້ນຫຼັງຕົວອັກສອນຫຍໍ້</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ປະຕິທິນ ພຸດທະສັງກາດ</type>
+			<type key="calendar" type="buddhist" scope="core">ພຸດ</type>
 			<type key="calendar" type="chinese">ປະຕິທິນຈີນ</type>
+			<type key="calendar" type="chinese" scope="core">ຈີນ</type>
 			<type key="calendar" type="coptic">ປະຕິທິນຄັອບຕິກ</type>
+			<type key="calendar" type="coptic" scope="core">ຄັອບຕິກ</type>
 			<type key="calendar" type="dangi">ປະ​ຕິ​ທິນ​ດັງ​ກີ</type>
+			<type key="calendar" type="dangi" scope="core">ດັງ​ກີ</type>
 			<type key="calendar" type="ethiopic">ປະຕິທິນເອທິໂອເປຍ</type>
+			<type key="calendar" type="ethiopic" scope="core">ເອທິໂອເປຍ</type>
 			<type key="calendar" type="ethiopic-amete-alem">ປະຕິທິນປີໂອເອທິໂອເປຍ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ໂອເອທິໂອເປຍ</type>
 			<type key="calendar" type="gregorian">ປະຕິທິນເກຣໂກຣຽນ</type>
+			<type key="calendar" type="gregorian" scope="core">ເກຣໂກຣຽນ</type>
 			<type key="calendar" type="hebrew">ປະ​ຕິ​ທິນ​ຮີບ​ຣິວ</type>
+			<type key="calendar" type="hebrew" scope="core">​ຮີບ​ຣິວ</type>
 			<type key="calendar" type="indian">ປະຕິທິນແຫ່ງຊາດອິນເດຍ</type>
 			<type key="calendar" type="islamic">ປະຕິທິນອິສະລາມ</type>
+			<type key="calendar" type="islamic" scope="core">ປະຕິທິນອິດສະລາມ</type>
 			<type key="calendar" type="islamic-civil">ປະຕິທິນອິດສະລາມ</type>
+			<type key="calendar" type="islamic-civil" scope="core">ປະຕິທິນອິດສະລາມ</type>
 			<type key="calendar" type="islamic-umalqura">ປະຕິທິນອິດສະລາມ (ອຳອາວຄິວຣາ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ປະຕິທິນອິດສະລາມ (ອຳອາວຄິວຣາ)</type>
 			<type key="calendar" type="iso8601">ປະ​ຕິ​ທິນ ISO-8601</type>
 			<type key="calendar" type="japanese">ປະຕິທິນຍີ່ປຸ່ນ</type>
+			<type key="calendar" type="japanese" scope="core">ຍີ່ປຸ່ນ</type>
 			<type key="calendar" type="persian">ປະຕິທິນເປີຊຽນ</type>
+			<type key="calendar" type="persian" scope="core">ເປີຊຽນ</type>
 			<type key="calendar" type="roc">ປະຕິທິນໄຕ້ຫວັນ</type>
+			<type key="calendar" type="roc" scope="core">ໄຕ້ຫວັນ</type>
 			<type key="cf" type="account">ຮູບແບບສະກຸນເງິນການບັນຊີ</type>
+			<type key="cf" type="account" scope="core">ການບັນຊີ</type>
 			<type key="cf" type="standard">ຮູບແບບສະກຸນເງິນມາດຕະຖານ</type>
-			<type key="collation" type="big5han">ລຽງຕາມອັກສອນຈີນດັ້ງເດີມ</type>
+			<type key="cf" type="standard" scope="core">ມາດຕະຖານ</type>
 			<type key="collation" type="dictionary">ລຽງຕາມພົດຈະນານຸກົມ</type>
 			<type key="collation" type="ducet">ຮຽງຕາມລຳດັບຢູນິໂຄດເລີ່ມຕົ້ນ</type>
-			<type key="collation" type="gb2312han">ລຽງຕາມອັກສອນຈີນປະຍຸກ</type>
+			<type key="collation" type="ducet" scope="core">ຢູນິໂຄດເລີ່ມຕົ້ນ</type>
 			<type key="collation" type="phonebook">ລຽງຕາມສະໝຸດໂທລະສັບ</type>
 			<type key="collation" type="pinyin">ລຽງຕາມການອອກສຽງພາສາຈີນ</type>
 			<type key="collation" type="search">ການຊອກຫາທົ່ວໄປ</type>
+			<type key="collation" type="search" scope="core">ການຊອກຫາ</type>
 			<type key="collation" type="searchjl">ຄົ້ນຫາຕາມພະຍັນຊະນະຂຶ້ນຕົ້ນທີ່ເປັນຮັງກີຣ</type>
 			<type key="collation" type="standard">ຮຽງຕາມມາດຕະຖານ</type>
+			<type key="collation" type="standard" scope="core">ມາດຕະຖານ</type>
 			<type key="collation" type="stroke">ລຽງຕາມການລາກເສັ້ນ</type>
 			<type key="collation" type="traditional">ລຽງຕາມແບບດັ້ງເດີມ</type>
 			<type key="collation" type="unihan">ລຽງລຳດັບຕາມຈຳນວນຂີດ</type>
+			<type key="em" type="default" scope="core">ຄ່າເລີ່ມຕົ້ນ</type>
+			<type key="em" type="emoji" scope="core">ອີໂມຈິ</type>
+			<type key="em" type="text" scope="core">ຂໍ້ຄວາມ</type>
 			<type key="hc" type="h11">ຕາມລະບົບ 12 ຊົ່ວໂມງ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">ຕາມລະບົບ 12 ຊົ່ວໂມງ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">ຕາມລະບົບ 24 ຊົ່ວໂມງ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">ຕາມລະບົບ 24 ຊົ່ວໂມງ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ຮູບແບບເສັ້ນຂັ້ນແບບຫຼວມ</type>
+			<type key="lb" type="loose" scope="core">ແບບຫຼວມ</type>
 			<type key="lb" type="normal">ຮູບແບບເສັ້ນຂັ້ນແບບປົກກະຕິ</type>
+			<type key="lb" type="normal" scope="core">ແບບປົກກະຕິ</type>
 			<type key="lb" type="strict">ຮູບແບບເສັ້ນຂັ້ນແບບເຄັ່ງຄັດ</type>
+			<type key="lb" type="strict" scope="core">ແບບເຄັ່ງຄັດ</type>
+			<type key="lw" type="breakall" scope="core">ຂັ້ນທັງໝົດ</type>
+			<type key="lw" type="keepall" scope="core">ຮັກສາທັງໝົດໄວ້</type>
+			<type key="lw" type="normal" scope="core">ປົກກະຕິ</type>
+			<type key="lw" type="phrase" scope="core">ຮັກສາໄວ້ໃນປະໂຫຍກ</type>
 			<type key="ms" type="metric">ລະບົບເມທຣິກ</type>
+			<type key="ms" type="metric" scope="core">ເມທຣິກ</type>
 			<type key="ms" type="uksystem">ລະບົບການວັດແທກແບບອິມເພີຣຽວ</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">ລະບົບການວັດແທກແບບສະຫະລັດ</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">ຕົວເລກອາຣາບິກ-ອິນດິກ</type>
 			<type key="numbers" type="arabext">ຕົວເລກອາຣາບິກ-ອິນດິກຕົວເຕັມ</type>
 			<type key="numbers" type="armn">ຕົວເລກອາເມນຽນ</type>
@@ -1234,6 +1274,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">ຕົວເລກໄທ</type>
 			<type key="numbers" type="tibt">ຕົວເລກທິເບດ</type>
 			<type key="numbers" type="vaii">ຕົວເລກໃນລະບົບໄວ</type>
+			<type key="ss" type="none" scope="core">ປິດ</type>
+			<type key="ss" type="standard" scope="core">ເປີດ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ເມທຣິກ</measurementSystemName>
@@ -1542,7 +1584,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/GGGGG y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, G d/M/y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -1880,12 +1924,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E h ໂມງa</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E h ໂມງa</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/GGGGG y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, G d/M/y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMMM, G y</dateFormatItem>
 						<dateFormatItem id="h">h ໂມງa</dateFormatItem>
+						<dateFormatItem id="hv">h ໂມງa v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1987,7 +2036,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, dd/MM/y – E, dd/MM/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM/y – MM</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
 							<greatestDifference id="y">MM/y – MM/y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
@@ -3377,9 +3426,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ພະນົມເປັນ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ເອັນເດີເບີລີ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ແຄນຕອນ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4056,9 +4102,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ເວ​ລາ​ອາ​ຟຣິ​ກາ​ຕາ​ເວັນ​ຕົກ</generic>
-					<standard>ເວ​ລາ​ມາດ​ຕະ​ຖານ​ອາ​ຟຣິ​ກາ​ຕາ​ເວັນ​ຕົກ</standard>
-					<daylight>ເວ​ລາ​ລະ​ດູ​ຮ້ອນ​ອາ​ຟຣິ​ກາ​ຕາ​ເວັນ​ຕົກ</daylight>
+					<standard>ເວ​ລາ​ອາ​ຟຣິ​ກາ​ຕາ​ເວັນ​ຕົກ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4439,6 +4483,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ເວລາກາຍອານາ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ເວລາມາດຕະຖານຮາວາຍ-ເອລູທຽນ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ເວລາຮາວາຍ-ເອລູທຽນ</generic>
@@ -4610,8 +4659,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic>ເວ​ລາ​ເມົາ​ຣິ​ທຽ​ສ</generic>
-					<standard>ເວ​ລາ​ມາດ​ຕະ​ຖານເມົາ​ຣິ​ທຽ​ສ</standard>
+					<generic>ເວ​ລາ​ມົວຣິ​ຊຽ​ສ</generic>
+					<standard>ເວ​ລາ​ມາດ​ຕະ​ຖານມົວ​ຣິ​ຊຽ​ສ</standard>
 					<daylight>​ເວ​ລາ​ລະ​ດູ​ຮ້ອນ​ເມົາ​ຣິ​ທຽ​ສ</daylight>
 				</long>
 			</metazone>
@@ -5047,11 +5096,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">¤0ພັນ</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0ພັນ</pattern>
+					<pattern type="10000" count="other">¤00ພັນ</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00ພັນ</pattern>
+					<pattern type="100000" count="other">¤000ພັນ</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000ພັນ</pattern>
+					<pattern type="1000000" count="other">¤0ລ້ານ</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0ລ້ານ</pattern>
+					<pattern type="10000000" count="other">¤00ລ້ານ</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00ລ້ານ</pattern>
+					<pattern type="100000000" count="other">¤000ລ້ານ</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000ລ້ານ</pattern>
+					<pattern type="1000000000" count="other">¤0ຕື້</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0ຕື້</pattern>
+					<pattern type="10000000000" count="other">¤00ຕື້</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00ຕື້</pattern>
+					<pattern type="100000000000" count="other">¤000ຕື້</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000ຕື້</pattern>
+					<pattern type="1000000000000" count="other">¤0000ຕື້</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0000ຕື້</pattern>
+					<pattern type="10000000000000" count="other">¤00ພັນຕື້</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00ພັນຕື້</pattern>
+					<pattern type="100000000000000" count="other">¤000ພັນຕື້</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000ພັນຕື້</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5076,10 +5170,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 ຕື້</pattern>
 					<pattern type="1000000000000" count="other">¤0 ລ້ານລ້ານ</pattern>
 					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 ລ້ານລ້ານ</pattern>
-					<pattern type="10000000000000" count="other">¤00 ລ້ານລ້ານ</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 ລ້ານລ້ານ</pattern>
-					<pattern type="100000000000000" count="other">¤000 ລ້ານລ້ານ</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 ລ້ານລ້ານ</pattern>
+					<pattern type="10000000000000" count="other">¤00ລລ</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00ລລ</pattern>
+					<pattern type="100000000000000" count="other">¤000ລລ</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000ລລ</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5906,6 +6000,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ອີ​ສ ຄາ​ຣິ​ບຽນ ໂດ​ລ່າ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ຄາຣິບຽນ ກິວເດີ</displayName>
+				<displayName count="other">ຄາຣິບຽນ ກິວເດີ</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>ສິດທິຖອນເງິນພິເສດ</displayName>
 			</currency>
@@ -5979,6 +6077,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>ດອນລາ ຊິມບັບເວ (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ຊິມບັບວຽນ ໂກລ</displayName>
+				<displayName count="other">ຊິມບັບວຽນ ໂກລ</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>ດອນລາ ຊິມບັບເວ (2009)</displayName>
 			</currency>
@@ -6113,11 +6215,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="angle-arc-minute">
 				<displayName>arcminutes</displayName>
-				<unitPattern count="other">{0} ນາທີ</unitPattern>
 			</unit>
 			<unit type="angle-arc-second">
 				<displayName>arcseconds</displayName>
-				<unitPattern count="other">{0} ວິນາທີ</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
 				<displayName>ກິໂລຕາແມັດ</displayName>
@@ -6142,7 +6242,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ຕາ​ລາງໄມລ໌</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
-				<displayName>square yards</displayName>
 				<unitPattern count="other">{0} ຕາລາງຢາດ</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
@@ -6164,7 +6263,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ມິລິໂມລຕໍ່ລິດ</displayName>
 				<unitPattern count="other">{0} ມິລິໂມລຕໍ່ລິດ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ພາດຕໍ່ລ້ານ</displayName>
 				<unitPattern count="other">{0} ພາດຕໍ່ລ້ານ</unitPattern>
 			</unit>
@@ -6201,6 +6300,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ເພຕາໄບຕ໌</displayName>
 				<unitPattern count="other">{0} ເພຕາໄບຕ໌</unitPattern>
 			</unit>
+			<unit type="digital-terabit">
+				<displayName>terabit</displayName>
+				<unitPattern count="other">{0} terabit</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>gigabyte</displayName>
+				<unitPattern count="other">{0} gigabyte</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>gigabit</displayName>
+				<unitPattern count="other">{0} gigabit</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>megabyte</displayName>
+				<unitPattern count="other">{0} megabyte</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>megabit</displayName>
+				<unitPattern count="other">{0} megabit</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kilobyte</displayName>
+				<unitPattern count="other">{0} kilobyte</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kilobit</displayName>
+				<unitPattern count="other">{0} kilobit</unitPattern>
+			</unit>
 			<unit type="duration-century">
 				<displayName>ສັດຕະວັດ</displayName>
 				<unitPattern count="other">{0} ສັດຕະວັດ</unitPattern>
@@ -6244,6 +6371,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ນາ​ໂນ​ວິ​ນາ​ທີ</displayName>
 				<unitPattern count="other">{0} ນາ​ໂນ​ວິ​ນາ​ທີ</unitPattern>
 			</unit>
+			<unit type="electric-ampere">
+				<displayName>ແອັມແປ</displayName>
+				<unitPattern count="other">{0} ແອັມແປ</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>ມິນລິແອັມແປ</displayName>
+				<unitPattern count="other">{0} ມິນລິແອັມແປ</unitPattern>
+			</unit>
 			<unit type="energy-calorie">
 				<displayName>ແຄລໍລີ່</displayName>
 				<unitPattern count="other">{0} ແຄລໍລີ່</unitPattern>
@@ -6252,6 +6387,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ແຄລໍລີ່</displayName>
 				<unitPattern count="other">{0} ແຄລໍລີ່</unitPattern>
 			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="other">{0} ກິໂລຈູນ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ຈູນ</displayName>
+				<unitPattern count="other">{0} ຈູນ</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>ກິໂລວັດໂມງ</displayName>
+				<unitPattern count="other">{0} ກິໂລວັດໂມງ</unitPattern>
+			</unit>
 			<unit type="energy-electronvolt">
 				<displayName>ເອ​ເລັກ​ຕ​ຣົງ​ໂວນ</displayName>
 				<unitPattern count="other">{0} ເອ​ເລັກ​ຕ​ຣົງ​ໂວນ</unitPattern>
@@ -6272,6 +6418,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ກິໂລວັດໂມງຕໍ່ 100 ກິໂລແມັດ</displayName>
 				<unitPattern count="other">{0} ກິໂລວັດໂມງຕໍ່ 100 ກິໂລແມັດ</unitPattern>
 			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigahertz</displayName>
+				<unitPattern count="other">{0} gigahertz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="other">{0} megahertz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertz</displayName>
+				<unitPattern count="other">{0} kilohertz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="other">{0} hertz</unitPattern>
+			</unit>
 			<unit type="length-kilometer">
 				<displayName>ກິໂລແມັດ</displayName>
 				<unitPattern count="other">{0} ກິໂລແມັດ</unitPattern>
@@ -6357,6 +6519,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ຄວາມ​ແຈ້ງດວງ​ຕາ​ເວັນ</displayName>
 				<unitPattern count="other">{0} ຄວາມ​ແຈ້ງດວງ​ຕາ​ເວັນ</unitPattern>
 			</unit>
+			<unit type="mass-tonne">
+				<displayName>ໂຕນ</displayName>
+				<unitPattern count="other">{0} ໂຕນ</unitPattern>
+			</unit>
 			<unit type="mass-kilogram">
 				<unitPattern count="other">{0} ກິໂລກຣາມ</unitPattern>
 			</unit>
@@ -6399,9 +6565,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ເກຣນ</displayName>
 				<unitPattern count="other">{0} ເກຣນ</unitPattern>
 			</unit>
+			<unit type="power-megawatt">
+				<displayName>ເມກາວັດ</displayName>
+				<unitPattern count="other">{0} ເມກາວັດ</unitPattern>
+			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="other">{0} ກິໂລວັດ</unitPattern>
 			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ມິນລິວັດ</displayName>
+				<unitPattern count="other">{0} ມິນລິວັດ</unitPattern>
+			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="other">{0} ແຮງມ້າ</unitPattern>
 			</unit>
@@ -6409,6 +6583,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ມິນລີແມັດໃນບາຫຼອດ</displayName>
 				<unitPattern count="other">{0} ມິນລີແມັດໃນບາຫຼອດ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ໃນບາຫຼອດ</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ປອນຕໍ່ຕະລາງນິ້້ວ</displayName>
 				<unitPattern count="other">{0} ປອນຕໍ່ຕະລາງນິ້້ວ</unitPattern>
@@ -6485,14 +6662,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ແມັດກ້ອນ</unitPattern>
 				<perUnitPattern>{0} ຕໍ່ມ³</perUnitPattern>
 			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ຊັງຕີແມັດກ້ອນ</displayName>
+				<unitPattern count="other">{0} ຊັງຕີແມັດກ້ອນ</unitPattern>
+				<perUnitPattern>{0}/ຊັງຕີແມັດກ້ອນ</perUnitPattern>
+			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ໄມລ໌ກ້ອນ</displayName>
 				<unitPattern count="other">{0} ໄມລ໌ກ້ອນ</unitPattern>
 			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yard³</displayName>
+				<unitPattern count="other">{0} yard³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ຟຸດ³</displayName>
+				<unitPattern count="other">{0} ຟຸດ³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>ນິ້ວ³</displayName>
+				<unitPattern count="other">{0} ນິ້ວ³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megaliter</displayName>
+				<unitPattern count="other">{0} megaliter</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectoliter</displayName>
+				<unitPattern count="other">{0} hectoliter</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="other">{0} ລິດ</unitPattern>
 				<perUnitPattern>{0} ຕໍ່ລິດ</perUnitPattern>
 			</unit>
+			<unit type="volume-deciliter">
+				<displayName>ເດຊີລິດ</displayName>
+				<unitPattern count="other">{0} ເດຊີລິດ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>ຊັງຕີລິດ</displayName>
+				<unitPattern count="other">{0} ຊັງຕີລິດ</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ມິນລີລິດ</displayName>
+				<unitPattern count="other">{0} ມິນລີລິດ</unitPattern>
+			</unit>
 			<unit type="volume-pint-metric">
 				<displayName>metric pints</displayName>
 				<unitPattern count="other">{0} metric pints</unitPattern>
@@ -6500,6 +6714,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} metric cups</unitPattern>
 			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ເອເຄີຟຸດ</displayName>
+				<unitPattern count="other">{0} ເອເຄີຟຸດ</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>{0} ຕໍ່ແກລລອນ</perUnitPattern>
 			</unit>
@@ -6507,27 +6725,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ແກລລອນອັງກິດ</displayName>
 				<unitPattern count="other">{0} ແກລລອນອັງກິດ</unitPattern>
 			</unit>
+			<unit type="volume-quart">
+				<displayName>ຄວາດ</displayName>
+				<unitPattern count="other">{0} ຄວາດ</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>ພິນ</displayName>
+				<unitPattern count="other">{0} ພິນ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="other">{0} cup</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ອອນສຂອງແຫຼວ</displayName>
+				<unitPattern count="other">{0} ອອນສຂອງແຫຼວ</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ບ່ວງແກງ</displayName>
+				<unitPattern count="other">{0} ບ່ວງແກງ</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ບ່ວງຊາ</displayName>
+				<unitPattern count="other">{0} ບ່ວງຊາ</unitPattern>
+			</unit>
 			<unit type="volume-barrel">
 				<displayName>ບາ​ເຣວ</displayName>
 				<unitPattern count="other">{0} ບາ​ເຣວ</unitPattern>
 			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>ບ່ວງຂອງຫວານ</displayName>
+				<unitPattern count="other">{0} ບ່ວງຂອງຫວານ</unitPattern>
+			</unit>
 			<unit type="volume-dram">
 				<displayName>ແດຣມ</displayName>
 				<unitPattern count="other">{0} ແດຣມ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ແສງ</displayName>
-				<unitPattern count="other">{0} ແສງ</unitPattern>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="other">{0} coulombs</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="electric-farad">
+				<displayName>ຟາຣາດ</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ຊີເມັນ</displayName>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ສ່ວນໃນພັນລ້ານສ່ວນ</displayName>
 				<unitPattern count="other">{0} ສ່ວນໃນພັນລ້ານສ່ວນ</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ຄືນ</displayName>
-				<unitPattern count="other">{0} ຄືນ</unitPattern>
-				<perUnitPattern>{0}/ຄືນ</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>ທິດທາງຕາມລຳດັບ</displayName>
 			</coordinateUnit>
@@ -6646,7 +6895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/ຊມ²</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>sq miles</displayName>
+				<displayName>ຕາລາງໄມລ໌</displayName>
 			</unit>
 			<unit type="area-acre">
 				<displayName>ເອເຄີ</displayName>
@@ -6676,7 +6925,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ອັນ</displayName>
 				<unitPattern count="other">{0} ອັນ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ພາດ/ລ້ານ</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6685,6 +6934,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permille">
 				<displayName>ຕໍ່ພັນ</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ລ/ກມ</displayName>
 				<unitPattern count="other">{0} ລ/ກມ</unitPattern>
@@ -6778,6 +7030,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ຄລ</displayName>
 				<unitPattern count="other">{0} ຄລ</unitPattern>
 			</unit>
+			<unit type="energy-joule">
+				<displayName>ຈູນ</displayName>
+			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>dpcm</displayName>
 				<unitPattern count="other">{0} dpcm</unitPattern>
@@ -6970,7 +7225,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ແສງ</displayName>
 				<unitPattern count="other">{0} ແສງ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ສ່ວນ/ພັນລ້ານສ່ວນ</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6983,6 +7238,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+			</unit>
 			<unit type="angle-degree">
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
@@ -7007,12 +7265,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-foot">
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>ppm</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>‰</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="other">{0} ລ / 100 ກມ</unitPattern>
 			</unit>
@@ -7020,10 +7284,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mpg UK</displayName>
 				<unitPattern count="other">{0} m/gUK</unitPattern>
 			</unit>
-			<unit type="duration-century">
-				<displayName>ສຕວ</displayName>
-				<unitPattern count="other">{0} ສຕວ</unitPattern>
-			</unit>
 			<unit type="duration-year">
 				<unitPattern count="other">{0} ປ</unitPattern>
 			</unit>
@@ -7090,19 +7350,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-dram">
 				<displayName>fl.dr.</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ແສງ</displayName>
-				<unitPattern count="other">{0} ແສງ</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>ສ່ວນ/ພັນລ້ານສ່ວນ</displayName>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ຄືນ</displayName>
-				<unitPattern count="other">{0} ຄືນ</unitPattern>
-				<perUnitPattern>{0}/ຄືນ</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/lt.xml b/make/data/cldr/common/main/lt.xml
index d6f1f79b788..c3b90cc1f19 100644
--- a/make/data/cldr/common/main/lt.xml
+++ b/make/data/cldr/common/main/lt.xml
@@ -325,6 +325,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafų</language>
 			<language type="ksh">kolognų</language>
 			<language type="ku">kurdų</language>
+			<language type="ku" menu="core">kurdų</language>
+			<language type="ku" menu="extension">šiaurės kurdų</language>
 			<language type="kum">kumikų</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -926,6 +928,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kinija</territory>
 			<territory type="CO">Kolumbija</territory>
 			<territory type="CP">Klipertono sala</territory>
+			<territory type="CQ">Sarkas</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Žaliasis Kyšulys</territory>
@@ -953,8 +956,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="EZ">euro zona</territory>
 			<territory type="FI">Suomija</territory>
 			<territory type="FJ">Fidžis</territory>
-			<territory type="FK">Folklando Salos</territory>
-			<territory type="FK" alt="variant">Folklando (Malvinų) Salos</territory>
+			<territory type="FK">Folklando salos</territory>
+			<territory type="FK" alt="variant">Folklando (Malvinų) salos</territory>
 			<territory type="FM">Mikronezija</territory>
 			<territory type="FO">Farerų Salos</territory>
 			<territory type="FR">Prancūzija</territory>
@@ -1200,35 +1203,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Skaitinis rikiavimas</key>
 			<key type="colStrength">Rikiavimo intensyvumas</key>
 			<key type="currency">valiuta</key>
+			<key type="em">Jaustukų pateiktis</key>
 			<key type="hc">valandų ciklas (12 ir 24)</key>
 			<key type="lb">teksto laužymo stilius</key>
+			<key type="lw">Eilučių laužymas</key>
 			<key type="ms">matų sistema</key>
 			<key type="numbers">skaičiai</key>
+			<key type="ss">tarpas po trumpinio</key>
 			<key type="timezone">Laiko juosta</key>
 			<key type="va">Lokalės variantas</key>
 			<key type="x">Naudoti privačiai</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistų kalendorius</type>
+			<type key="calendar" type="buddhist" scope="core">budistų</type>
 			<type key="calendar" type="chinese">kinų kalendorius</type>
+			<type key="calendar" type="chinese" scope="core">kinų</type>
 			<type key="calendar" type="coptic">koptų kalendorius</type>
+			<type key="calendar" type="coptic" scope="core">koptų</type>
 			<type key="calendar" type="dangi">dangi kalendorius</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">Etiopijos kalendorius</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiopijos</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiopijos „Amete Alem“ kalendorius</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etiopijos „Amete Alem“</type>
 			<type key="calendar" type="gregorian">Grigaliaus kalendorius</type>
+			<type key="calendar" type="gregorian" scope="core">Grigaliaus</type>
 			<type key="calendar" type="hebrew">hebrajų kalendorius</type>
+			<type key="calendar" type="hebrew" scope="core">hebrajų</type>
 			<type key="calendar" type="indian">nacionalinis indų kalendorius</type>
-			<type key="calendar" type="islamic">islamo kalendorius</type>
-			<type key="calendar" type="islamic-civil">Islamo kalendorius (lentelinis, pilietinė era)</type>
+			<type key="calendar" type="islamic">musulmonų kalendorius</type>
+			<type key="calendar" type="islamic" scope="core">Islamo</type>
+			<type key="calendar" type="islamic-civil">musulmonų kalendorius (lentelinis, pilietinė era)</type>
+			<type key="calendar" type="islamic-civil" scope="core">musulmonų (lentelinis, pilietinė era)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">Islamo kalendorius (Saudo Arabija)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">Islamo kalendorius (lentelinis, astronominė era)</type>
-			<type key="calendar" type="islamic-umalqura">Islamo kalendorius (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura">musulmonų kalendorius (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">musulmonų (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO 8601 kalendorius</type>
 			<type key="calendar" type="japanese">japonų kalendorius</type>
+			<type key="calendar" type="japanese" scope="core">japonų</type>
 			<type key="calendar" type="persian">persų kalendorius</type>
+			<type key="calendar" type="persian" scope="core">persų</type>
 			<type key="calendar" type="roc">Kinijos Respublikos kalendorius</type>
+			<type key="calendar" type="roc" scope="core">Kinijos Respublikos</type>
 			<type key="cf" type="account">apskaitos valiutos formatas</type>
+			<type key="cf" type="account" scope="core">apskaita</type>
 			<type key="cf" type="standard">standartinis valiutos formatas</type>
+			<type key="cf" type="standard" scope="core">standartinis</type>
 			<type key="colAlternate" type="non-ignorable">Rikiuoti simbolius</type>
 			<type key="colAlternate" type="shifted">Rikiuoti nepaisant simbolių</type>
 			<type key="colBackwards" type="no">Rikiuoti diakritinius ženklus įprastai</type>
@@ -1238,18 +1260,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Rikiuoti suteikiant pirmumą didžiosioms raidėms</type>
 			<type key="colCaseLevel" type="no">Rikiuoti neskiriant didžiųjų ir mažųjų raidžių</type>
 			<type key="colCaseLevel" type="yes">Rikiuoti skiriant didžiąsias ir mažąsias raides</type>
-			<type key="collation" type="big5han">įprasta kiniška rūšiavimo tvarka - Big5</type>
 			<type key="collation" type="compat">ankstesnė rūšiavimo tvarka, skirta suderinamumui</type>
 			<type key="collation" type="dictionary">žodyno rūšiavimo tvarka</type>
 			<type key="collation" type="ducet">numatytasis unikodo rikiavimas</type>
+			<type key="collation" type="ducet" scope="core">numatytasis unikodo</type>
 			<type key="collation" type="eor">rūšiavimo tvarka daugiakalbės Europos dokumentų</type>
-			<type key="collation" type="gb2312han">supaprastinta kiniška rūšiavimo tvarka - GB2312</type>
 			<type key="collation" type="phonebook">telefonų knygos rūšiavimo tvarka</type>
 			<type key="collation" type="phonetic">Fonetinė rikiavimo tvarka</type>
 			<type key="collation" type="pinyin">supaprastinta kiniškų hieroglifų rūšiavimo tvarka</type>
 			<type key="collation" type="search">bendroji paieška</type>
+			<type key="collation" type="search" scope="core">paieška</type>
 			<type key="collation" type="searchjl" draft="provisional">ieškoti pagal hangul pirmines priebalses</type>
 			<type key="collation" type="standard">standartinis rikiavimas</type>
+			<type key="collation" type="standard" scope="core">standartinis</type>
 			<type key="collation" type="stroke">Įprasta kiniško požymio rūšiavimo tvarka</type>
 			<type key="collation" type="traditional">įprasta rūšiavimo tvarka</type>
 			<type key="collation" type="unihan">Šaknies ženklų ir brūkšnių rūšiavimo tvarka</type>
@@ -1266,18 +1289,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">viso pločio</type>
 			<type key="d0" type="hwidth">vidutinio pločio</type>
 			<type key="d0" type="npinyin">Skaitinis</type>
+			<type key="em" type="default" scope="core">numatytasis</type>
+			<type key="em" type="emoji" scope="core">jausmaženklis</type>
+			<type key="em" type="text" scope="core">tekstas</type>
 			<type key="hc" type="h11">12 valandų sistema (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 valandų sistema (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 valandų sistema (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 valandų sistema (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">laisvas teksto laužymo stilius</type>
+			<type key="lb" type="loose" scope="core">laisvas</type>
 			<type key="lb" type="normal">įprastas teksto laužymo stilius</type>
+			<type key="lb" type="normal" scope="core">įprastas</type>
 			<type key="lb" type="strict">griežtas teksto laužymo stilius</type>
+			<type key="lb" type="strict" scope="core">griežtas</type>
+			<type key="lw" type="breakall" scope="core">Laužti viską</type>
+			<type key="lw" type="keepall" scope="core">Išlaikyti viską</type>
+			<type key="lw" type="normal" scope="core">Įprastinis</type>
+			<type key="lw" type="phrase" scope="core">Išlaikyti frazėse</type>
 			<type key="m0" type="bgn">BGN simboliai</type>
 			<type key="m0" type="ungegn">UNGEGN simboliai</type>
 			<type key="ms" type="metric">metrinė sistema</type>
+			<type key="ms" type="metric" scope="core">metrinė</type>
 			<type key="ms" type="uksystem">angliška matų sistema</type>
+			<type key="ms" type="uksystem" scope="core">JK</type>
 			<type key="ms" type="ussystem">amerikietiška matų sistema</type>
+			<type key="ms" type="ussystem" scope="core">JAV</type>
 			<type key="numbers" type="arab">arabų-indų skaitmenys</type>
 			<type key="numbers" type="arabext">išplėstiniai arabų-indų skaitmenys</type>
 			<type key="numbers" type="armn">armėnų skaitmenys</type>
@@ -1339,6 +1379,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">tibetiečių skaitmenys</type>
 			<type key="numbers" type="traditional">Tradiciniai skaičiai</type>
 			<type key="numbers" type="vaii">vai skaitmenys</type>
+			<type key="ss" type="none" scope="core">išjungta</type>
+			<type key="ss" type="standard" scope="core">įjungta</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrinė</measurementSystemName>
@@ -1360,9 +1402,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1617,7 +1656,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">y MMM G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">y MMM d G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">y MMM d G, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="M">LL</dateFormatItem>
@@ -1638,7 +1676,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<intervalFormats>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a–h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">hh:mm a–hh:mm a</greatestDifference>
@@ -1652,7 +1689,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a–h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1661,20 +1697,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="d">MM-dd–MM-dd</greatestDifference>
 							<greatestDifference id="M">MM-dd–MM-dd</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="M">MMM d–MMM d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
@@ -1958,14 +1986,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">dd</dateFormatItem>
+						<dateFormatItem id="EBh">h B, E</dateFormatItem>
 						<dateFormatItem id="EBhm">h:mm B, E</dateFormatItem>
 						<dateFormatItem id="EBhms">h:mm:ss B, E</dateFormatItem>
+						<dateFormatItem id="Eh">h a, E</dateFormatItem>
 						<dateFormatItem id="Ehm">hh:mm a, E</dateFormatItem>
 						<dateFormatItem id="EHm">HH:mm, E</dateFormatItem>
 						<dateFormatItem id="Ehms">hh:mm:ss a, E</dateFormatItem>
 						<dateFormatItem id="EHms">HH:mm:ss, E</dateFormatItem>
 						<dateFormatItem id="Gy">y 'm'. G</dateFormatItem>
+						<dateFormatItem id="GyM">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMd">y-MM-dd G</dateFormatItem>
+						<dateFormatItem id="GyMEd">y-MM-dd G, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">y-MM-dd G, E</dateFormatItem>
@@ -1979,6 +2011,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">HH:mm:ss; v</dateFormatItem>
 						<dateFormatItem id="hmv">hh:mm a; v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm; v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="M">MM</dateFormatItem>
 						<dateFormatItem id="Md">MM-d</dateFormatItem>
 						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
@@ -2005,7 +2038,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">hh–hh B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
@@ -2016,62 +2048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">dd–dd</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
 							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
 						</intervalFormatItem>
@@ -2083,32 +2059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="d">MMMM d, E – MMMM d, E</greatestDifference>
 							<greatestDifference id="M">MMMM d, E – MMMM d, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">y LLLL–LLLL</greatestDifference>
 							<greatestDifference id="y">y LLLL – y LLLL</greatestDifference>
@@ -2120,8 +2070,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMEd">
 							<greatestDifference id="d">y MMMM d, E – MMMM d, E</greatestDifference>
-							<greatestDifference id="M">y MMMM d, E. – MMMM d, E.</greatestDifference>
-							<greatestDifference id="y">y MMMM d, E. – y MMMM d, E.</greatestDifference>
+							<greatestDifference id="M">y MMMM d, E – MMMM d, E</greatestDifference>
+							<greatestDifference id="y">y MMMM d, E – y MMMM d, E</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2905,9 +2855,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angilija</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevanas</exemplarCity>
 			</zone>
@@ -3214,6 +3161,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Velykų sala</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Kojhaikė</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Punta Arenasas</exemplarCity>
 			</zone>
@@ -3461,7 +3411,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Pnompenis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderburis</exemplarCity>
+				<exemplarCity>Kantono sala</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kiritimatis</exemplarCity>
@@ -4077,9 +4027,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Vakarų Afrikos laikas</generic>
-					<standard>Vakarų Afrikos žiemos laikas</standard>
-					<daylight>Vakarų Afrikos vasaros laikas</daylight>
+					<standard>Vakarų Afrikos laikas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4467,6 +4415,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Gajanos laikas</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havajų–Aleutų žiemos laikas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havajų-Aleutų laikas</generic>
@@ -4917,6 +4870,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Čuko laikas</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turkijos laikas</generic>
+					<standard>Turkijos žiemos laikas</standard>
+					<daylight>Turkijos vasaros laikas</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmėnistano laikas</generic>
@@ -5106,6 +5066,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -7085,6 +7049,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">Rytų Karibų dolerių</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karibų guldenas</displayName>
+				<displayName count="one">Karibų guldenas</displayName>
+				<displayName count="few">Karibų guldenai</displayName>
+				<displayName count="many">Karibų guldeno</displayName>
+				<displayName count="other">Karibų guldenų</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>SDR tarptautinis valiutos fondas</displayName>
 			</currency>
@@ -7249,6 +7220,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">Zimbabvės dolerio (1980–2008)</displayName>
 				<displayName count="other">Zimbabvės dolerių (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabvės auksas</displayName>
+				<displayName count="one">Zimbabvės auksas</displayName>
+				<displayName count="few">Zimbabvės auksas</displayName>
+				<displayName count="many">Zimbabvės auksas</displayName>
+				<displayName count="other">Zimbabvės auksas</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabvės doleris (2009)</displayName>
 				<displayName count="one">Zimbabvės doleris (2009)</displayName>
@@ -7929,7 +7907,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} elementų</unitPattern>
 				<unitPattern count="other" case="locative">{0} elementų</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>dalelė</displayName>
+				<unitPattern count="one">{0} dalelė</unitPattern>
+				<unitPattern count="few">{0} dalelės</unitPattern>
+				<unitPattern count="many">{0} dalelės</unitPattern>
+				<unitPattern count="other">{0} dalelių</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>milijoninės dalys</displayName>
 				<unitPattern count="one">{0} milijoninė dalis</unitPattern>
@@ -8042,6 +8027,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} molių</unitPattern>
 				<unitPattern count="other" case="locative">{0} molių</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gliukozė</displayName>
+				<unitPattern count="one">gliukozės kiekis – {0}</unitPattern>
+				<unitPattern count="few">gliukozės kiekis – {0}</unitPattern>
+				<unitPattern count="many">gliukozės kiekis – {0}</unitPattern>
+				<unitPattern count="other">gliukozės kiekis – {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litrai kilometrui</displayName>
@@ -9466,8 +9458,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few" case="accusative">{0} centimetrus</unitPattern>
 				<unitPattern count="few" case="dative">{0} centimetrams</unitPattern>
 				<unitPattern count="few" case="genitive">{0} centimetrų</unitPattern>
-				<unitPattern count="few" case="instrumental">{0} centimetruose</unitPattern>
-				<unitPattern count="few" case="locative">{0} centimetrai</unitPattern>
+				<unitPattern count="few" case="instrumental">{0} centimetrais</unitPattern>
+				<unitPattern count="few" case="locative">{0} centimetruose</unitPattern>
 				<unitPattern count="many">{0} centimetro</unitPattern>
 				<unitPattern count="many" case="accusative">{0} centimetro</unitPattern>
 				<unitPattern count="many" case="dative">{0} centimetro</unitPattern>
@@ -9757,7 +9749,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="genitive">{0} kandelos</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} kandela</unitPattern>
 				<unitPattern count="one" case="locative">{0} kandeloje</unitPattern>
-				<unitPattern count="few">{0} cd</unitPattern>
+				<unitPattern count="few">{0} kandelos</unitPattern>
 				<unitPattern count="few" case="accusative">{0} kandelas</unitPattern>
 				<unitPattern count="few" case="dative">{0} kandeloms</unitPattern>
 				<unitPattern count="few" case="genitive">{0} kandelų</unitPattern>
@@ -10913,6 +10905,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} matavimo puodelių</unitPattern>
 				<unitPattern count="other" case="locative">{0} matavimo puodelių</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrinės skysčio uncijos</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>pėdos akre</displayName>
 				<unitPattern count="one">{0} pėda akre</unitPattern>
@@ -11032,33 +11027,124 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} imp. kvortos</unitPattern>
 				<unitPattern count="other">{0} imp. kvortų</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradianai</displayName>
+				<unitPattern count="one">{0} steradianas</unitPattern>
+				<unitPattern count="few">{0} steradianai</unitPattern>
+				<unitPattern count="many">{0} steradiano</unitPattern>
+				<unitPattern count="other">{0} steradianų</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kulonai</displayName>
+				<unitPattern count="one">{0} kulonas</unitPattern>
+				<unitPattern count="few">{0} kulonai</unitPattern>
+				<unitPattern count="many">{0} kulono</unitPattern>
+				<unitPattern count="other">{0} kulonų</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradai</displayName>
+				<unitPattern count="one">{0} faradas</unitPattern>
+				<unitPattern count="few">{0} faradai</unitPattern>
+				<unitPattern count="many">{0} farado</unitPattern>
+				<unitPattern count="other">{0} faradų</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henriai</displayName>
+				<unitPattern count="one">{0} henris</unitPattern>
+				<unitPattern count="few">{0} henriai</unitPattern>
+				<unitPattern count="many">{0} henrio</unitPattern>
+				<unitPattern count="other">{0} henrių</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simensai</displayName>
+				<unitPattern count="one">{0} simensas</unitPattern>
+				<unitPattern count="few">{0} simensai</unitPattern>
+				<unitPattern count="many">{0} simenso</unitPattern>
+				<unitPattern count="other">{0} simensų</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal.</displayName>
+				<unitPattern count="one">{0} kalorija</unitPattern>
+				<unitPattern count="few">{0} kalorijos</unitPattern>
+				<unitPattern count="many">{0} kalorijos</unitPattern>
+				<unitPattern count="other">{0} kalorijų</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereliai</displayName>
+				<unitPattern count="one">{0} &lt; NBTSP&gt;bekerelis</unitPattern>
+				<unitPattern count="few">{0} bekereliai</unitPattern>
+				<unitPattern count="many">{0} bekerelio</unitPattern>
+				<unitPattern count="other">{0} bekerelių</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sivertai</displayName>
+				<unitPattern count="one">{0} sivertas</unitPattern>
+				<unitPattern count="few">{0} sivertai</unitPattern>
+				<unitPattern count="many">{0} siverto</unitPattern>
+				<unitPattern count="other">{0} sivertų</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grėjai</displayName>
+				<unitPattern count="one">{0} grėjus</unitPattern>
+				<unitPattern count="few">{0} grėjai</unitPattern>
+				<unitPattern count="many">{0} grėjaus</unitPattern>
+				<unitPattern count="other">{0} grėjų</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramo jėga</displayName>
+				<unitPattern count="one">{0} kilogramo jėga</unitPattern>
+				<unitPattern count="few">{0} kilogramo jėgos</unitPattern>
+				<unitPattern count="many">{0} kilogramo jėgos</unitPattern>
+				<unitPattern count="other">{0} kilogramo jėgų</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} teslos</unitPattern>
+				<unitPattern count="many">{0} teslos</unitPattern>
+				<unitPattern count="other">{0} teslų</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>vėberis</displayName>
+				<unitPattern count="one">{0} vėberis</unitPattern>
+				<unitPattern count="few">{0} vėberiai</unitPattern>
+				<unitPattern count="many">{0} vėberio</unitPattern>
+				<unitPattern count="other">{0} vėberių</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>šviesos greitis</displayName>
+				<unitPattern count="one">{0} šm</unitPattern>
+				<unitPattern count="few">{0} šm</unitPattern>
+				<unitPattern count="many">{0} šm</unitPattern>
+				<unitPattern count="other">{0} šm</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
-				<displayName>milijoninės dalelytės</displayName>
-				<unitPattern count="one">{0} milijoninė dalelytė</unitPattern>
-				<unitPattern count="one" case="accusative">{0} milijoninę dalelytę</unitPattern>
-				<unitPattern count="one" case="dative">{0} milijoninei dalelytei</unitPattern>
-				<unitPattern count="one" case="genitive">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="one" case="instrumental">{0} milijonine dalelyte</unitPattern>
-				<unitPattern count="one" case="locative">{0} milijoninėje dalelytėje</unitPattern>
-				<unitPattern count="few">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="few" case="accusative">{0} milijonines dalelytes</unitPattern>
-				<unitPattern count="few" case="dative">{0} milijoninėms dalelytėms</unitPattern>
-				<unitPattern count="few" case="genitive">{0} milijoninių dalelyčių</unitPattern>
-				<unitPattern count="few" case="instrumental">{0} milijoninėmis dalelytėmis</unitPattern>
-				<unitPattern count="few" case="locative">{0} milijoninėse dalelytėse</unitPattern>
-				<unitPattern count="many">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="many" case="accusative">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="many" case="dative">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="many" case="genitive">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="many" case="instrumental">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="many" case="locative">{0} milijoninės dalelytės</unitPattern>
-				<unitPattern count="other">{0} milijoninių dalelyčių</unitPattern>
-				<unitPattern count="other" case="accusative">{0} milijoninių dalelyčių</unitPattern>
-				<unitPattern count="other" case="dative">{0} milijoninių dalelyčių</unitPattern>
-				<unitPattern count="other" case="genitive">{0} milijoninių dalelyčių</unitPattern>
-				<unitPattern count="other" case="instrumental">{0} milijoninių dalelyčių</unitPattern>
-				<unitPattern count="other" case="locative">{0} milijoninių dalelyčių</unitPattern>
+				<displayName>milijardinės dalys</displayName>
+				<unitPattern count="one">{0} milijardinė dalis</unitPattern>
+				<unitPattern count="one" case="accusative">{0} milijardinę dalį</unitPattern>
+				<unitPattern count="one" case="dative">{0} milijardinei daliai</unitPattern>
+				<unitPattern count="one" case="genitive">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="one" case="instrumental">{0} milijardine dalimi</unitPattern>
+				<unitPattern count="one" case="locative">{0} milijardinėje dalyje</unitPattern>
+				<unitPattern count="few">{0} milijardinės dalys</unitPattern>
+				<unitPattern count="few" case="accusative">{0} milijardines dalis</unitPattern>
+				<unitPattern count="few" case="dative">{0} milijardinėms dalims</unitPattern>
+				<unitPattern count="few" case="genitive">{0} milijardinių dalių</unitPattern>
+				<unitPattern count="few" case="instrumental">{0} milijardinėmis dalimis</unitPattern>
+				<unitPattern count="few" case="locative">{0} milijardinėse dalyse</unitPattern>
+				<unitPattern count="many">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="many" case="accusative">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="many" case="dative">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="many" case="genitive">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="many" case="instrumental">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="many" case="locative">{0} milijardinės dalies</unitPattern>
+				<unitPattern count="other">{0} milijardinių dalių</unitPattern>
+				<unitPattern count="other" case="accusative">{0} milijardinių dalių</unitPattern>
+				<unitPattern count="other" case="dative">{0} milijardinių dalių</unitPattern>
+				<unitPattern count="other" case="genitive">{0} milijardinių dalių</unitPattern>
+				<unitPattern count="other" case="instrumental">{0} milijardinių dalių</unitPattern>
+				<unitPattern count="other" case="locative">{0} milijardinių dalių</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
@@ -11087,7 +11173,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} naktų</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} naktų</unitPattern>
 				<unitPattern count="other" case="locative">{0} naktų</unitPattern>
-				<perUnitPattern>{0}/nakt.</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>pagrindinė kryptis</displayName>
@@ -11184,6 +11269,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} elem.</unitPattern>
 				<unitPattern count="other">{0} elem.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>dalelė</displayName>
+				<unitPattern count="one">{0} dalelė</unitPattern>
+				<unitPattern count="few">{0} dalelės</unitPattern>
+				<unitPattern count="many">{0} dalelės</unitPattern>
+				<unitPattern count="other">{0} dalelių</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>procentas</displayName>
 				<unitPattern count="one">{0} %</unitPattern>
@@ -11198,6 +11290,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ‰</unitPattern>
 				<unitPattern count="other">{0} ‰</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gliukozė</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -11334,6 +11429,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="electric-volt">
 				<displayName>V</displayName>
 			</unit>
+			<unit type="energy-calorie">
+				<displayName>kal.</displayName>
+			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>cal</displayName>
 				<unitPattern count="one">{0} cal</unitPattern>
@@ -11406,10 +11504,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-light-year">
 				<displayName>šviesmečiai</displayName>
-				<unitPattern count="one">{0} šm.</unitPattern>
-				<unitPattern count="few">{0} šm.</unitPattern>
-				<unitPattern count="many">{0} šm.</unitPattern>
-				<unitPattern count="other">{0} šm.</unitPattern>
+				<unitPattern count="one">{0} šviesm.</unitPattern>
+				<unitPattern count="few">{0} šviesm.</unitPattern>
+				<unitPattern count="many">{0} šviesm.</unitPattern>
+				<unitPattern count="other">{0} šviesm.</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName>AV</displayName>
@@ -11693,12 +11791,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} imp. kv.</unitPattern>
 				<unitPattern count="other">{0} imp. kv.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>dalelytė/mln.</displayName>
-				<unitPattern count="one">{0} dalelytė/mln.</unitPattern>
-				<unitPattern count="few">{0} dalelytės/mln.</unitPattern>
-				<unitPattern count="many">{0} dalelytės/mln.</unitPattern>
-				<unitPattern count="other">{0} dalelyčių/mln.</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="few">{0} cal</unitPattern>
+				<unitPattern count="many">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>šm</displayName>
+				<unitPattern count="one">{0} šm</unitPattern>
+				<unitPattern count="few">{0} šm</unitPattern>
+				<unitPattern count="many">{0} šm</unitPattern>
+				<unitPattern count="other">{0} šm</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>dalis/mlrd.</displayName>
+				<unitPattern count="one">{0} dal./mlrd.</unitPattern>
+				<unitPattern count="few">{0} dal./mlrd.</unitPattern>
+				<unitPattern count="many">{0} dal./mlrd.</unitPattern>
+				<unitPattern count="other">{0} dal./mlrd.</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>nakt.</displayName>
@@ -11748,9 +11860,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>dalelė</displayName>
+				<unitPattern count="one">{0} dal.</unitPattern>
+				<unitPattern count="few">{0} dal.</unitPattern>
+				<unitPattern count="many">{0} dal.</unitPattern>
+				<unitPattern count="other">{0} dal.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gliukozė</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one">{0} mi/gal</unitPattern>
 				<unitPattern count="few">{0} mi/gal</unitPattern>
@@ -11808,20 +11930,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} fl oz</unitPattern>
 				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>dalelytė/mln.</displayName>
-				<unitPattern count="one">{0} dalelytė/mln.</unitPattern>
-				<unitPattern count="few">{0} dalelytės/mln.</unitPattern>
-				<unitPattern count="many">{0} dalelytės/mln.</unitPattern>
-				<unitPattern count="other">{0} dalelyčių/mln.</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal</displayName>
+				<unitPattern count="one">{0} cal</unitPattern>
+				<unitPattern count="few">{0} cal</unitPattern>
+				<unitPattern count="many">{0} cal</unitPattern>
+				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>nakt.</displayName>
-				<unitPattern count="one">{0} nakt.</unitPattern>
-				<unitPattern count="few">{0} nakt.</unitPattern>
-				<unitPattern count="many">{0} nakt.</unitPattern>
-				<unitPattern count="other">{0} nakt.</unitPattern>
-				<perUnitPattern>{0}/nakt.</perUnitPattern>
+			<unit type="speed-light-speed">
+				<displayName>šm</displayName>
+				<unitPattern count="one">{0} šm</unitPattern>
+				<unitPattern count="few">{0} šm</unitPattern>
+				<unitPattern count="many">{0} šm</unitPattern>
+				<unitPattern count="other">{0} šm</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>dalis/mlrd.</displayName>
+				<unitPattern count="one">{0} dal./mlrd.</unitPattern>
+				<unitPattern count="few">{0} dal./mlrd.</unitPattern>
+				<unitPattern count="many">{0} dal./mlrd.</unitPattern>
+				<unitPattern count="other">{0} dal./mlrd.</unitPattern>
 			</unit>
 		</unitLength>
 		<durationUnit type="hm">
diff --git a/make/data/cldr/common/main/luy.xml b/make/data/cldr/common/main/luy.xml
index 8e35dab092f..558327dee22 100644
--- a/make/data/cldr/common/main/luy.xml
+++ b/make/data/cldr/common/main/luy.xml
@@ -548,6 +548,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤- #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤- #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00;- #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤- #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00;- #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/lv.xml b/make/data/cldr/common/main/lv.xml
index cdba3533df3..0c7817aaa9a 100644
--- a/make/data/cldr/common/main/lv.xml
+++ b/make/data/cldr/common/main/lv.xml
@@ -280,6 +280,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafiju</language>
 			<language type="ksh">Ķelnes vācu</language>
 			<language type="ku">kurdu</language>
+			<language type="ku" menu="core">kurdu</language>
+			<language type="ku" menu="extension">kurmandži</language>
 			<language type="kum">kumiku</language>
 			<language type="kut">kutenaju</language>
 			<language type="kv">komiešu</language>
@@ -760,6 +762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Ķīna</territory>
 			<territory type="CO">Kolumbija</territory>
 			<territory type="CP">Klipertona sala</territory>
+			<territory type="CQ">Sarka</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kaboverde</territory>
@@ -1020,33 +1023,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">kārtošana skaitliskā secībā</key>
 			<key type="colStrength">kārtošanas pakāpe</key>
 			<key type="currency">valūta</key>
+			<key type="em">Emocijzīmes attēlojums</key>
 			<key type="hc">Stundu formāts (12 vai 24)</key>
 			<key type="lb">Rindiņas pārtraukuma stils</key>
+			<key type="lw">Rindiņu pārtraukumi vārdos</key>
 			<key type="ms">mērvienību sistēma</key>
 			<key type="numbers">Cipari</key>
+			<key type="ss">Teikuma beigas pēc abr.</key>
 			<key type="timezone">laika josla</key>
 			<key type="va">lokalizācijas variants</key>
 			<key type="x">personīgai lietošanai</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistu kalendārs</type>
+			<type key="calendar" type="buddhist" scope="core">budistu</type>
 			<type key="calendar" type="chinese">ķīniešu kalendārs</type>
+			<type key="calendar" type="chinese" scope="core">ķīniešu</type>
 			<type key="calendar" type="coptic">Koptu kalendārs</type>
+			<type key="calendar" type="coptic" scope="core">Koptu</type>
 			<type key="calendar" type="dangi">dangi kalendārs</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">etiopiešu kalendārs</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopiešu</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopiešu Amete Alem kalendārs</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopiešu Amete Alem</type>
 			<type key="calendar" type="gregorian">Gregora kalendārs</type>
+			<type key="calendar" type="gregorian" scope="core">Gregora</type>
 			<type key="calendar" type="hebrew">ebreju kalendārs</type>
+			<type key="calendar" type="hebrew" scope="core">ebreju</type>
 			<type key="calendar" type="indian">Indijas nacionālais kalendārs</type>
 			<type key="calendar" type="islamic">Hidžrī kalendārs</type>
+			<type key="calendar" type="islamic" scope="core">Hidžrī</type>
 			<type key="calendar" type="islamic-civil">Hidžrī kalendārs (pilsoņu)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hidžrī (pilsoņu)</type>
 			<type key="calendar" type="islamic-umalqura">Hidžrī kalendārs (Umm al-kura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hidžrī (Umm al-kura)</type>
 			<type key="calendar" type="iso8601">ISO 8601 kalendārs</type>
 			<type key="calendar" type="japanese">japāņu kalendārs</type>
+			<type key="calendar" type="japanese" scope="core">japāņu</type>
 			<type key="calendar" type="persian">persiešu kalendārs</type>
+			<type key="calendar" type="persian" scope="core">persiešu</type>
 			<type key="calendar" type="roc">Ķīnas Republikas kalendārs</type>
+			<type key="calendar" type="roc" scope="core">Ķīnas Republikas</type>
 			<type key="cf" type="account">uzskaites valūtas formāts</type>
+			<type key="cf" type="account" scope="core">Uzskaites</type>
 			<type key="cf" type="standard">standarta valūtas formāts</type>
+			<type key="cf" type="standard" scope="core">Standarta</type>
 			<type key="colAlternate" type="non-ignorable">Kārtot simbolus</type>
 			<type key="colAlternate" type="shifted">Kārtot, ignorējot simbolus</type>
 			<type key="colBackwards" type="no">Kārtot diakritiskās zīmes parastā secībā</type>
@@ -1056,18 +1078,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Kārtot pēc pirmā lielā burta</type>
 			<type key="colCaseLevel" type="no">Kārtot reģistrnejutīgas rakstzīmes</type>
 			<type key="colCaseLevel" type="yes">Kārtot reģistrjutīgās rakstzīmes</type>
-			<type key="collation" type="big5han">tradicionālās ķīniešu valodas kārtošanas secība - Big5</type>
 			<type key="collation" type="compat" draft="contributed">saderīgā kārtošanas secība</type>
 			<type key="collation" type="dictionary">Vārdnīcas kārtošanas secība</type>
 			<type key="collation" type="ducet">noklusējuma unikoda kārtošanas secība</type>
+			<type key="collation" type="ducet" scope="core">noklusējuma unikods</type>
 			<type key="collation" type="eor" draft="contributed">Eiropas rakstību kārtošanas secīa</type>
-			<type key="collation" type="gb2312han">vienkāršotās ķīniešu valodas kārtošanas secība - GB2312</type>
 			<type key="collation" type="phonebook">tālruņu grāmatas kārtošanas secība</type>
 			<type key="collation" type="phonetic">Fonētiskā kārtošanas secība</type>
 			<type key="collation" type="pinyin">piņjiņa kārtošanas secība</type>
 			<type key="collation" type="search">vispārīga meklēšana</type>
+			<type key="collation" type="search" scope="core">meklēšana</type>
 			<type key="collation" type="searchjl">Meklēt pēc Hangul sākuma līdzskaņa</type>
 			<type key="collation" type="standard">standarta kārtošanas secība</type>
+			<type key="collation" type="standard" scope="core">standarta</type>
 			<type key="collation" type="stroke">Stroke kārtošanas secība</type>
 			<type key="collation" type="traditional">tradicionālā kārtošanas secība</type>
 			<type key="collation" type="unihan">Radikālā kārtošanas secība pēc vilkumu skaita</type>
@@ -1083,18 +1106,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Pilna platuma</type>
 			<type key="d0" type="hwidth">Pusplatuma</type>
 			<type key="d0" type="npinyin">Ciparu</type>
+			<type key="em" type="default" scope="core">Noklusējuma</type>
+			<type key="em" type="emoji" scope="core">Emocijzīmes</type>
+			<type key="em" type="text" scope="core">Teksts</type>
 			<type key="hc" type="h11">12 stundu sistēma (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 stundu sistēma (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 stundu sistēma (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 stundu sistēma (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Brīvais rindiņas pārtraukuma stils</type>
+			<type key="lb" type="loose" scope="core">Brīvais</type>
 			<type key="lb" type="normal">Parastais rindiņas pārtraukuma stils</type>
+			<type key="lb" type="normal" scope="core">Parastais</type>
 			<type key="lb" type="strict">Stingrais rindiņas pārtraukuma stils</type>
+			<type key="lb" type="strict" scope="core">Stingrais</type>
+			<type key="lw" type="breakall" scope="core">Pārtraukt visas</type>
+			<type key="lw" type="keepall" scope="core">Saglabāt visas</type>
+			<type key="lw" type="normal" scope="core">Parasti</type>
+			<type key="lw" type="phrase" scope="core">Saglabāt frāzes</type>
 			<type key="m0" type="bgn">transliterācijas sistēma US BGN</type>
 			<type key="m0" type="ungegn">transliterācijas sistēma UN GEGN</type>
 			<type key="ms" type="metric">metriskā sistēma</type>
+			<type key="ms" type="metric" scope="core">metriskā</type>
 			<type key="ms" type="uksystem">britu mērvienību sistēma</type>
+			<type key="ms" type="uksystem" scope="core">britu</type>
 			<type key="ms" type="ussystem">amerikāņu mērvienību sistēma</type>
+			<type key="ms" type="ussystem" scope="core">ASV</type>
 			<type key="numbers" type="arab">Arābu-indiešu cipari</type>
 			<type key="numbers" type="arabext">Izvērstie arābu-indiešu cipari</type>
 			<type key="numbers" type="armn">Armēņu cipari</type>
@@ -1139,6 +1179,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Tibetiešu cipari</type>
 			<type key="numbers" type="traditional">Tradicionālā ciparu sistēma</type>
 			<type key="numbers" type="vaii">VAI cipari</type>
+			<type key="ss" type="none" scope="core">Izsl.</type>
+			<type key="ss" type="standard" scope="core">Iesl.</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metriskā</measurementSystemName>
@@ -1163,9 +1205,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1208,11 +1247,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="contributed">pirms Diokletiāna</era>
 						<era type="1" draft="contributed">pēc Diokletiāna</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">pirms Diokl.</era>
 						<era type="1" draft="contributed">pēc Diokl.</era>
 					</eraAbbr>
 				</eras>
@@ -1237,16 +1274,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">pirms Kristus iemiesošanās</era>
-						<era type="1" draft="contributed">pēc Kristus iemiesošanās</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">pirms Kristus</era>
-						<era type="1" draft="contributed">pēc Kristus</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1307,13 +1334,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y. 'g'. G</dateFormatItem>
+						<dateFormatItem id="GyM">G M.y.</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y., G</dateFormatItem>
 						<dateFormatItem id="GyMMM">y. 'g'. MMM G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">y. 'g'. d. MMM G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, y. 'g'. d. MMM G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM.</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM.</dateFormatItem>
 						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
@@ -1683,7 +1712,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">G y. 'g'. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y. 'g'. d. MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, G y. 'g'. d. MMM</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1754,10 +1782,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">G y. 'gada' d. MMM, E – d. MMM, E</greatestDifference>
 							<greatestDifference id="y">G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1768,10 +1792,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a, v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">MM.–MM.</greatestDifference>
 						</intervalFormatItem>
@@ -2788,6 +2808,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Lieldienu sala</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Kojhaika</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Puntaarenasa</exemplarCity>
 			</zone>
@@ -3029,9 +3052,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Pnompeņa</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderberija</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Kantona</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3605,9 +3625,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Rietumāfrikas laiks</generic>
-					<standard>Rietumāfrikas ziemas laiks</standard>
-					<daylight>Rietumāfrikas vasaras laiks</daylight>
+					<standard>Rietumāfrikas laiks</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3979,6 +3997,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Gajānas laiks</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havaju–Aleutu ziemas laiks</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havaju–Aleutu laiks</generic>
@@ -4405,6 +4428,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Čūkas laiks</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turcijas laiks</generic>
+					<standard>Turcijas ziemas laiks</standard>
+					<daylight>Turcijas vasaras laiks</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistānas laiks</generic>
@@ -4574,6 +4604,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5656,6 +5690,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Austrumkarību dolārs</displayName>
 				<displayName count="other">Austrumkarību dolāri</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karību guldenis</displayName>
+				<displayName count="zero">Karību guldenis</displayName>
+				<displayName count="one">Karību guldenis</displayName>
+				<displayName count="other">Karību guldenis</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Speciālās aizņēmuma tiesības</displayName>
 			</currency>
@@ -5731,6 +5771,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Zimbabves dolārs</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabves zelts</displayName>
+				<displayName count="zero">Zimbabves zelts</displayName>
+				<displayName count="one">Zimbabves zelts</displayName>
+				<displayName count="other">Zimbabves zelts</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabves dolārs (2009)</displayName>
 				<displayName count="zero">Zimbabves dollāri (2009)</displayName>
@@ -6228,7 +6274,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} vienumu</unitPattern>
 				<unitPattern count="other" case="locative">{0} vienumos</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>daļas</displayName>
+				<unitPattern count="zero">{0} daļu</unitPattern>
+				<unitPattern count="one">{0} daļa</unitPattern>
+				<unitPattern count="other">{0} daļas</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<unitPattern count="zero">{0} miljono daļu</unitPattern>
 				<unitPattern count="zero" case="accusative">{0} miljono daļu</unitPattern>
@@ -6319,6 +6371,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} molu</unitPattern>
 				<unitPattern count="other" case="locative">{0} molos</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glikozes vienības</displayName>
+				<unitPattern count="zero">{0} glikozes vienība</unitPattern>
+				<unitPattern count="one">{0} glikozes vienība</unitPattern>
+				<unitPattern count="other">{0} glikozes vienības</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litri uz kilometru</displayName>
@@ -6638,11 +6696,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-quarter">
 				<gender>masculine</gender>
 				<displayName>ceturkšņi</displayName>
-				<unitPattern count="zero">{0} cet.</unitPattern>
-				<unitPattern count="zero" case="accusative">{0} cet.</unitPattern>
-				<unitPattern count="zero" case="dative">{0} cet.</unitPattern>
-				<unitPattern count="zero" case="genitive">{0} cet.</unitPattern>
-				<unitPattern count="zero" case="locative">{0} cet.</unitPattern>
+				<unitPattern count="zero">{0} ceturkšņa</unitPattern>
+				<unitPattern count="zero" case="accusative">{0} ceturkšņa</unitPattern>
+				<unitPattern count="zero" case="dative">{0} ceturkšņiem</unitPattern>
+				<unitPattern count="zero" case="genitive">{0} ceturkšņa</unitPattern>
+				<unitPattern count="zero" case="locative">{0} ceturkšņos</unitPattern>
 				<unitPattern count="one">{0} ceturksnis</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ceturksni</unitPattern>
 				<unitPattern count="one" case="dative">{0} ceturksnim</unitPattern>
@@ -7810,6 +7868,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} dzīvsudraba stabiņa milimetru</unitPattern>
 				<unitPattern count="other" case="locative">{0} dzīvsudraba stabiņa milimetros</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>pēc dzīvsudraba staba</displayName>
+				<unitPattern count="zero">{0} pēc dzīvsudraba staba</unitPattern>
+				<unitPattern count="one">{0} pēc dzīvsudraba staba</unitPattern>
+				<unitPattern count="other">{0} pēc dzīvsudraba staba</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>mārciņas uz kvadrātcollu</displayName>
 				<unitPattern count="zero">{0} mārciņu uz kvadrātcollu</unitPattern>
@@ -8332,6 +8396,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} metrisko glāžu</unitPattern>
 				<unitPattern count="other" case="locative">{0} metriskajās glāzēs</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriskā šķidruma unce</displayName>
+				<unitPattern count="zero">{0} metriskā šķidruma unces</unitPattern>
+				<unitPattern count="one">{0} metriskā šķidruma unce</unitPattern>
+				<unitPattern count="other">{0} metriskā šķidruma unces</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akrpēda</displayName>
 				<unitPattern count="zero">{0} akrpēdu</unitPattern>
@@ -8441,9 +8511,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} britu kvarta</unitPattern>
 				<unitPattern count="other">{0} britu kvartas</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiāns</displayName>
+				<unitPattern count="zero">{0} sr</unitPattern>
+				<unitPattern count="one">{0} steradiāns</unitPattern>
+				<unitPattern count="other">{0} steradiāni</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="zero">{0} katalu</unitPattern>
+				<unitPattern count="one">{0} katals</unitPattern>
+				<unitPattern count="other">{0} katali</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kuloni</displayName>
+				<unitPattern count="zero">{0} kulonu</unitPattern>
+				<unitPattern count="one">{0} kulons</unitPattern>
+				<unitPattern count="other">{0} kuloni</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradi</displayName>
+				<unitPattern count="zero">{0} faradu</unitPattern>
+				<unitPattern count="one">{0} farads</unitPattern>
+				<unitPattern count="other">{0} faradi</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henriji</displayName>
+				<unitPattern count="zero">{0} henriju</unitPattern>
+				<unitPattern count="one">{0} henrijs</unitPattern>
+				<unitPattern count="other">{0} henriji</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>sīmensi</displayName>
+				<unitPattern count="zero">{0} sīmensu</unitPattern>
+				<unitPattern count="one">{0} sīmenss</unitPattern>
+				<unitPattern count="other">{0} sīmensi</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorijas [IT]</displayName>
+				<unitPattern count="zero">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="one">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorijas [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekerels</displayName>
+				<unitPattern count="zero">{0} bekerels</unitPattern>
+				<unitPattern count="one">{0} bekerels</unitPattern>
+				<unitPattern count="other">{0} bekereli</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>zīverti</displayName>
+				<unitPattern count="zero">{0} zīvertu</unitPattern>
+				<unitPattern count="one">{0} zīverts</unitPattern>
+				<unitPattern count="other">{0} zīverti</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greji</displayName>
+				<unitPattern count="zero">{0} greju</unitPattern>
+				<unitPattern count="one">{0} grejs</unitPattern>
+				<unitPattern count="other">{0} greji</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>spēka kilograms</displayName>
+				<unitPattern count="zero">{0} spēka kilogramu</unitPattern>
+				<unitPattern count="one">{0} spēka kilograms</unitPattern>
+				<unitPattern count="other">{0} spēka kilogrami</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="zero">{0} teslu</unitPattern>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>vēberi</displayName>
+				<unitPattern count="zero">{0} vēberu</unitPattern>
+				<unitPattern count="one">{0} vēbers</unitPattern>
+				<unitPattern count="other">{0} vēberi</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>gaisma</displayName>
 				<unitPattern count="zero">{0} gaismas</unitPattern>
 				<unitPattern count="zero" case="accusative">{0} gaismas</unitPattern>
 				<unitPattern count="zero" case="dative">{0} gaismas</unitPattern>
@@ -8460,9 +8607,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} gaismu</unitPattern>
 				<unitPattern count="other" case="locative">{0} gaismās</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
-				<displayName>miljarddaļas</displayName>
 				<unitPattern count="zero">{0} miljarddaļu</unitPattern>
 				<unitPattern count="zero" case="accusative">{0} miljarddaļu</unitPattern>
 				<unitPattern count="zero" case="dative">{0} miljarddaļu</unitPattern>
@@ -8481,7 +8627,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>naktis</displayName>
 				<unitPattern count="zero">{0} nakšu</unitPattern>
 				<unitPattern count="zero" case="accusative">{0} nakšu</unitPattern>
 				<unitPattern count="zero" case="dative">{0} nakšu</unitPattern>
@@ -8497,7 +8642,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} naktīm</unitPattern>
 				<unitPattern count="other" case="genitive">{0} nakšu</unitPattern>
 				<unitPattern count="other" case="locative">{0} naktīs</unitPattern>
-				<perUnitPattern>{0}/nakts</perUnitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="short">
@@ -8558,7 +8702,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} vienums</unitPattern>
 				<unitPattern count="other">{0} vienumi</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>daļa</displayName>
+				<unitPattern count="zero">{0} daļu</unitPattern>
+				<unitPattern count="one">{0} daļa</unitPattern>
+				<unitPattern count="other">{0} daļa</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>miljonās daļas</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -8573,6 +8723,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>mols</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="zero">{0} Glc</unitPattern>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="zero">{0} l/km</unitPattern>
@@ -8850,6 +9006,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>pēc dzīvsudraba staba</displayName>
+				<unitPattern count="zero">{0} pēc dzīvsudraba staba</unitPattern>
+				<unitPattern count="one">{0} pēc dzīvsudraba staba</unitPattern>
+				<unitPattern count="other">{0} pēc dzīvsudraba staba</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/st.</displayName>
 				<unitPattern count="zero">{0} km/st.</unitPattern>
@@ -9000,13 +9162,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} IQT</unitPattern>
 				<unitPattern count="other">{0} IQT</unitPattern>
 			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="zero">{0} C</unitPattern>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="zero">{0} F</unitPattern>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="zero">{0} H</unitPattern>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="zero">{0} S</unitPattern>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="zero">{0} cal-IT</unitPattern>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="zero">{0} Bq</unitPattern>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="zero">{0} Sv</unitPattern>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="zero">{0} Gy</unitPattern>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="zero">{0} Wb</unitPattern>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>gaisma</displayName>
 				<unitPattern count="zero">{0} gaismu</unitPattern>
 				<unitPattern count="one">{0} gaisma</unitPattern>
 				<unitPattern count="other">{0} gaismas</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>miljarddaļas</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -9064,6 +9272,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-dunam">
 				<displayName>dunams</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>daļa</displayName>
+				<unitPattern count="zero">{0} daļu</unitPattern>
+				<unitPattern count="one">{0} daļa</unitPattern>
+				<unitPattern count="other">{0} daļa</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="zero">{0} Glc</unitPattern>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="duration-quarter">
 				<unitPattern count="zero">{0} cet.</unitPattern>
 				<unitPattern count="one">{0} c.</unitPattern>
@@ -9205,6 +9425,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}W</unitPattern>
 				<unitPattern count="other">{0}W</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>pēc dzīvsudraba staba</displayName>
+				<unitPattern count="zero">{0} pēc dzīvsudraba staba</unitPattern>
+				<unitPattern count="one">{0} pēc dzīvsudraba staba</unitPattern>
+				<unitPattern count="other">{0} pēc dzīvsudraba staba</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="zero">{0}inHg</unitPattern>
 				<unitPattern count="one">{0}inHg</unitPattern>
@@ -9260,21 +9486,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mi³</unitPattern>
 				<unitPattern count="other">{0}mi³</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>gaisma</displayName>
-				<unitPattern count="zero">{0} gaismu</unitPattern>
-				<unitPattern count="one">{0} gaisma</unitPattern>
-				<unitPattern count="other">{0} gaismas</unitPattern>
+			<unit type="electric-coulomb">
+				<unitPattern count="zero">{0} C</unitPattern>
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>miljarddaļas</displayName>
+			<unit type="electric-farad">
+				<unitPattern count="zero">{0} F</unitPattern>
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>naktis</displayName>
-				<unitPattern count="zero">{0} nakšu</unitPattern>
-				<unitPattern count="one">{0} nakts</unitPattern>
-				<unitPattern count="other">{0} naktis</unitPattern>
-				<perUnitPattern>{0}/nakts</perUnitPattern>
+			<unit type="electric-henry">
+				<unitPattern count="zero">{0} H</unitPattern>
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="zero">{0} S</unitPattern>
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="zero">{0} Bq</unitPattern>
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="zero">{0} Sv</unitPattern>
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="zero">{0} Gy</unitPattern>
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="zero">{0} Wb</unitPattern>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/lzz.xml b/make/data/cldr/common/main/lzz.xml
new file mode 100644
index 00000000000..52db3349798
--- /dev/null
+++ b/make/data/cldr/common/main/lzz.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="lzz"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="en">İngilizuri</language>
+			<language type="laz">Lazuri</language>
+		</languages>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a b cç{ç̌} d {dz} e f gğ h iİ j kǩ l m n o p{p̌} q r sş t{t̆} {ts} {tz} u v x y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ı ö ü w ž ʒǯ]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B CÇ{Ç̌} D E F GĞ H İ J KǨ L M N O P{P̌} Q R SŞ T{T̆} U V W X Y Z]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/lzz_TR.xml b/make/data/cldr/common/main/lzz_TR.xml
new file mode 100644
index 00000000000..189204c37dd
--- /dev/null
+++ b/make/data/cldr/common/main/lzz_TR.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="lzz"/>
+		<territory type="TR"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/mai.xml b/make/data/cldr/common/main/mai.xml
index beaf8294757..f10da890684 100644
--- a/make/data/cldr/common/main/mai.xml
+++ b/make/data/cldr/common/main/mai.xml
@@ -1032,20 +1032,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">न</month>
 							<month type="12">दि</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">जनवरी</month>
-							<month type="2">फरवरी</month>
-							<month type="3">मार्च</month>
-							<month type="4">अप्रैल</month>
-							<month type="5">मई</month>
-							<month type="6">जून</month>
-							<month type="7">जुलाई</month>
-							<month type="8">अगस्त</month>
-							<month type="9">सितंबर</month>
-							<month type="10">अक्टूबर</month>
-							<month type="11">नवंबर</month>
-							<month type="12">दिसंबर</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -2633,9 +2619,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>पश्चिम अफ्रीका टाइम</generic>
-					<standard>पश्चिम अफ्रीका मानक टाइम</standard>
-					<daylight>मध्य अफ्रीका समर टाइम</daylight>
+					<standard>पश्चिम अफ्रीका टाइम</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2939,6 +2923,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>गुयाना टाइम</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाई-एल्यूटियन मानक टाइम</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाई-एल्यूटियन टाइम</generic>
diff --git a/make/data/cldr/common/main/mg.xml b/make/data/cldr/common/main/mg.xml
index 10fc10235e5..a457ae8ab58 100644
--- a/make/data/cldr/common/main/mg.xml
+++ b/make/data/cldr/common/main/mg.xml
@@ -285,8 +285,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[aàâ b d eéèêë f g h iìîï j k l m nñ oô p r s t v y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q u w x]</exemplarCharacters>
+		<exemplarCharacters>[aà b d eè f g h iì j k l m n oòô p r s t v yỳ z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[áâã c éêë îï {n̂}{n̈}ñ óö q u w x ýÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B D E F G H I J K L M N O P R S T V Y Z]</exemplarCharacters>
 	</characters>
 	<delimiters>
diff --git a/make/data/cldr/common/main/mgo.xml b/make/data/cldr/common/main/mgo.xml
index b3dfb5c492f..5513cc76544 100644
--- a/make/data/cldr/common/main/mgo.xml
+++ b/make/data/cldr/common/main/mgo.xml
@@ -57,7 +57,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
diff --git a/make/data/cldr/common/main/mi.xml b/make/data/cldr/common/main/mi.xml
index c6ab2b52789..00fa790d8ab 100644
--- a/make/data/cldr/common/main/mi.xml
+++ b/make/data/cldr/common/main/mi.xml
@@ -118,7 +118,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en_US" alt="short">Ingarihi US</language>
 			<language type="eo">Eheperāto</language>
 			<language type="es">Pāniora</language>
-			<language type="es_419">Pāniora Amerikana ki te Tonga</language>
+			<language type="es_419">Pāniora o Amerika Rātini</language>
 			<language type="es_ES">Pāniora Ūropi</language>
 			<language type="es_MX">Pāniora Mehikana</language>
 			<language type="et">Etōniana</language>
@@ -559,7 +559,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AW">Arūpa</territory>
 			<territory type="AX">Motu Ōrana</territory>
 			<territory type="AZ">Atepaihānia</territory>
-			<territory type="BA">Pōngia-Herekōwini</territory>
+			<territory type="BA">Pōngia &amp; Herekōwini</territory>
 			<territory type="BB">Papatohe</territory>
 			<territory type="BD">Pākaratēhi</territory>
 			<territory type="BE">Peretiama</territory>
@@ -595,6 +595,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Haina</territory>
 			<territory type="CO">Koromōpia</territory>
 			<territory type="CP">Te Moutere Kiripetone</territory>
+			<territory type="CQ">Hāka</territory>
 			<territory type="CR">Koto Rīka</territory>
 			<territory type="CU">Kiupa</territory>
 			<territory type="CV">Te Kūrae Matomato</territory>
@@ -833,11 +834,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="ethiopic">Maramataka Etiopia</type>
 			<type key="calendar" type="ethiopic-amete-alem">Maramataka Etiopia Amete Arema</type>
 			<type key="calendar" type="gregorian">Maramataka Pākehā</type>
+			<type key="calendar" type="gregorian" scope="core">Pākehā</type>
 			<type key="calendar" type="hebrew">Maramataka Hīperu</type>
 			<type key="calendar" type="islamic">Maramataka Hitiuri</type>
 			<type key="calendar" type="islamic-civil">Maramataka Hitiuri (tūtohi, wā o naiānei)</type>
 			<type key="calendar" type="islamic-umalqura">Maramataka Hitiuri (Uma ara Kura)</type>
-			<type key="calendar" type="iso8601">Maramataka ISO-8601</type>
+			<type key="calendar" type="iso8601">Maramataka Pākehā (Tau Tuatahi)</type>
 			<type key="calendar" type="japanese">Maramataka Hapanihi</type>
 			<type key="calendar" type="persian">Maramataka Pāhia</type>
 			<type key="calendar" type="roc">Maramataka Minguo</type>
@@ -846,6 +848,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="ducet">Raupapa Kōmaka Unicode Taunoa</type>
 			<type key="collation" type="search">Rapunga Arowhānui</type>
 			<type key="collation" type="standard">Raupapa Kōmaka Arowhānui</type>
+			<type key="collation" type="standard" scope="core">Arowhānui</type>
 			<type key="hc" type="h11">Pūnaha Haora 12 (0–11)</type>
 			<type key="hc" type="h12">Pūnaha Haora 12 (1–12)</type>
 			<type key="hc" type="h23">Pūnaha Haora 24 (0–23)</type>
@@ -941,42 +944,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'i' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'i' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<intervalFormats>
 						<intervalFormatFallback>{0} ki te {1}</intervalFormatFallback>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
@@ -988,21 +987,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
 							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">G y MMMM – y MMMM</greatestDifference>
-						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1180,21 +1164,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'i' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'i' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'i' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
@@ -1204,7 +1203,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -2112,9 +2110,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Wā o Āwherika ki te uru</generic>
-					<standard>Wā Arowhānui o Āwerika ki te uru</standard>
-					<daylight>Wā Raumati o Āwherika ki te uru</daylight>
+					<standard>Wā o Āwherika ki te uru</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2464,6 +2460,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Wā Kaiana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Wā Arowhānui Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Wā Hawaii-Aleutian</generic>
@@ -3571,6 +3572,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Tāra Karapīana Rāwhiti</displayName>
 				<displayName count="other">tāra Karapīana Rāwhiti</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder Karapīana</displayName>
+				<displayName count="other">Guilder Karapīana</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Franc CFA Āwherika ki te Uru</displayName>
 				<displayName count="other">franc CFA Āwherika ki te Uru</displayName>
@@ -3595,12 +3600,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Kwacha Tāmipia</displayName>
 				<displayName count="other">kwacha Tāmipia</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Kōura Timuwawe</displayName>
+				<displayName count="other">Kino Tāone o Timuwawe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
 		</miscPatterns>
 		<minimalPairs>
-			<pluralMinimalPairs count="other" draft="contributed">{0} rā</pluralMinimalPairs>
+			<pluralMinimalPairs count="other">{0} rā</pluralMinimalPairs>
 			<ordinalMinimalPairs ordinal="other">Kōwhiria te tua{0} ki te matau.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
@@ -4042,12 +4051,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0}, {1} rānei</listPatternPart>
 			<listPatternPart type="2">{0}, {1} rānei</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="2">{0}, {1} rānei</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="2">{0}, {1} rānei</listPatternPart>
-		</listPattern>
 		<listPattern type="standard-narrow">
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
diff --git a/make/data/cldr/common/main/mk.xml b/make/data/cldr/common/main/mk.xml
index 33d31fa0067..0f9590f4694 100644
--- a/make/data/cldr/common/main/mk.xml
+++ b/make/data/cldr/common/main/mk.xml
@@ -332,6 +332,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафија</language>
 			<language type="ksh">колоњски</language>
 			<language type="ku">курдски</language>
+			<language type="ku" menu="core">курдски</language>
+			<language type="ku" menu="extension">курманџи</language>
 			<language type="kum">кумички</language>
 			<language type="kut">кутенајски</language>
 			<language type="kv">коми</language>
@@ -937,6 +939,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Кина</territory>
 			<territory type="CO">Колумбија</territory>
 			<territory type="CP">Остров Клипертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Костарика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо Верде</territory>
@@ -1114,7 +1117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SV">Ел Салвадор</territory>
 			<territory type="SX">Свети Мартин</territory>
 			<territory type="SY">Сирија</territory>
-			<territory type="SZ">Свазиленд</territory>
+			<territory type="SZ">Есватини</territory>
 			<territory type="TA">Тристан да Куња</territory>
 			<territory type="TC">Острови Туркс и Каикос</territory>
 			<territory type="TD">Чад</territory>
@@ -1175,59 +1178,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Формат на валута</key>
 			<key type="collation">Подредување</key>
 			<key type="currency">Валута</key>
+			<key type="em">Приказ на емоџи</key>
 			<key type="hc">Часовен циклус (12 или 24)</key>
 			<key type="lb">Стил за разделување редови</key>
+			<key type="lw">Разделување редови во рамки на зборови</key>
 			<key type="ms">Мерен систем</key>
 			<key type="numbers">Броеви</key>
+			<key type="ss">Разделување реченица по кратенка</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Будистички календар</type>
+			<type key="calendar" type="buddhist" scope="core">Будистички</type>
 			<type key="calendar" type="chinese">Кинески календар</type>
+			<type key="calendar" type="chinese" scope="core">Кинески</type>
 			<type key="calendar" type="coptic">Коптски календар</type>
+			<type key="calendar" type="coptic" scope="core">Коптски</type>
 			<type key="calendar" type="dangi">Дангиски календар</type>
+			<type key="calendar" type="dangi" scope="core">Дангиски</type>
 			<type key="calendar" type="ethiopic">Етиопски календар</type>
+			<type key="calendar" type="ethiopic" scope="core">Етиопски</type>
 			<type key="calendar" type="ethiopic-amete-alem">Етиопски Амет Алем календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Етиопски Амет Алем</type>
 			<type key="calendar" type="gregorian">Грегоријански календар</type>
+			<type key="calendar" type="gregorian" scope="core">Грегоријански</type>
 			<type key="calendar" type="hebrew">Еврејски календар</type>
+			<type key="calendar" type="hebrew" scope="core">Еврејски</type>
 			<type key="calendar" type="indian">Индиски национален календар</type>
 			<type key="calendar" type="islamic">Исламски календар</type>
+			<type key="calendar" type="islamic" scope="core">Исламски</type>
 			<type key="calendar" type="islamic-civil">Исламски граѓански календар</type>
+			<type key="calendar" type="islamic-civil" scope="core">Исламски (граѓански)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">Исламски календар (Саудиска Арабија)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">Исламски календар (астрономска епоха)</type>
 			<type key="calendar" type="islamic-umalqura">Исламски календар (Ум ал-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Исламски (Ум ал-Кура)</type>
 			<type key="calendar" type="iso8601">Календар ISO-8601</type>
 			<type key="calendar" type="japanese">Јапонски календар</type>
+			<type key="calendar" type="japanese" scope="core">Јапонски</type>
 			<type key="calendar" type="persian">Персиски календар</type>
+			<type key="calendar" type="persian" scope="core">Персиски</type>
 			<type key="calendar" type="roc">Мингуо-календар</type>
+			<type key="calendar" type="roc" scope="core">Мингуо</type>
 			<type key="cf" type="account">Сметководствен формат на валута</type>
+			<type key="cf" type="account" scope="core">Сметководствен</type>
 			<type key="cf" type="standard">Стандарден формат на валута</type>
-			<type key="collation" type="big5han">Традиционално кинеско сортирање</type>
+			<type key="cf" type="standard" scope="core">Стандарден</type>
 			<type key="collation" type="compat" draft="contributed">Претходно подредување</type>
 			<type key="collation" type="dictionary" draft="contributed">Подредување по азбучен редослед</type>
 			<type key="collation" type="ducet">Стандардно подредување во уникод</type>
+			<type key="collation" type="ducet" scope="core">Стандардно во уникод</type>
 			<type key="collation" type="emoji" draft="contributed">Подредување емотикони</type>
 			<type key="collation" type="eor" draft="contributed">Европски правила за подредување</type>
-			<type key="collation" type="gb2312han">Поедноставено кинеско сортирање</type>
 			<type key="collation" type="phonebook">Азбучен редослед</type>
 			<type key="collation" type="pinyin">Сортирање Pinyin</type>
 			<type key="collation" type="reformed" draft="contributed">Реформирано подредување</type>
 			<type key="collation" type="search">Општо пребарување</type>
+			<type key="collation" type="search" scope="core">Пребарување</type>
 			<type key="collation" type="searchjl" draft="contributed">Пребарување според почетна согласка хангул</type>
 			<type key="collation" type="standard">Стандардно подредување</type>
+			<type key="collation" type="standard" scope="core">Стандардно</type>
 			<type key="collation" type="stroke">Ритмички редослед</type>
 			<type key="collation" type="traditional">Традиционално сортирање</type>
 			<type key="collation" type="unihan" draft="contributed">Подредување унихан</type>
 			<type key="collation" type="zhuyin" draft="contributed">Подредување жујин</type>
-			<type key="hc" type="h11">12-часовен систем (0-11)</type>
-			<type key="hc" type="h12">12-часовен систем (1-12)</type>
-			<type key="hc" type="h23">24-часовен систем (0-23)</type>
-			<type key="hc" type="h24">24-часовен систем (1-24)</type>
+			<type key="em" type="default" scope="core">Стандардно</type>
+			<type key="em" type="emoji" scope="core">Емоџи</type>
+			<type key="em" type="text" scope="core">Текст</type>
+			<type key="hc" type="h11">12-часовен систем (0 – 11)</type>
+			<type key="hc" type="h11" scope="core">12 (0 – 11)</type>
+			<type key="hc" type="h12">12-часовен систем (1 – 12)</type>
+			<type key="hc" type="h12" scope="core">12 (1 – 12)</type>
+			<type key="hc" type="h23">24-часовен систем (0 – 23)</type>
+			<type key="hc" type="h23" scope="core">24 (0 – 23)</type>
+			<type key="hc" type="h24">24-часовен систем (1 – 24)</type>
+			<type key="hc" type="h24" scope="core">24 (1 – 24)</type>
 			<type key="lb" type="loose">Допустлив стил за разделување редови</type>
+			<type key="lb" type="loose" scope="core">Допустлив стил</type>
 			<type key="lb" type="normal">Нормален стил за разделување редови</type>
+			<type key="lb" type="normal" scope="core">Нормален стил</type>
 			<type key="lb" type="strict">Строг стил за разделување редови</type>
+			<type key="lb" type="strict" scope="core">Строг стил</type>
+			<type key="lw" type="breakall" scope="core">Раздели ги сите</type>
+			<type key="lw" type="keepall" scope="core">Задржи ги сите</type>
+			<type key="lw" type="normal" scope="core">Нормално разделување</type>
+			<type key="lw" type="phrase" scope="core">Задржи во фрази</type>
 			<type key="ms" type="metric">Метрички систем</type>
+			<type key="ms" type="metric" scope="core">Метрички</type>
 			<type key="ms" type="uksystem">Империјален мерен систем</type>
+			<type key="ms" type="uksystem" scope="core">Обединето Кралство</type>
 			<type key="ms" type="ussystem">Американски мерен систем</type>
+			<type key="ms" type="ussystem" scope="core">САД</type>
 			<type key="numbers" type="ahom" draft="contributed">Ахомски цифри</type>
 			<type key="numbers" type="arab">Арапско-индиски цифри</type>
 			<type key="numbers" type="arabext">Проширени арапско-индиски цифри</type>
@@ -1269,6 +1309,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">Тајландски цифри</type>
 			<type key="numbers" type="tibt">Тибетски цифри</type>
 			<type key="numbers" type="vaii">Цифри ваи</type>
+			<type key="ss" type="none" scope="core">Исклучено</type>
+			<type key="ss" type="standard" scope="core">Вклучено</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрички</measurementSystemName>
@@ -1292,9 +1334,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1449,12 +1488,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">ЕРА0</era>
-						<era type="1" draft="contributed">ЕРА1</era>
-					</eraAbbr>
-				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -1520,12 +1553,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">ЕРА0</era>
-						<era type="1" draft="contributed">ЕРА1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1562,21 +1589,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'во' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'во' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'во' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="E">E</dateFormatItem>
@@ -1586,16 +1625,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E H:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyM">M. y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y 'г'. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d.M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'ч'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1665,7 +1706,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1679,7 +1719,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
@@ -1841,14 +1880,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<quarter type="4">четврто тримесечје</quarter>
 						</quarterWidth>
 					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">јан. – мар.</quarter>
-							<quarter type="2">апр. – јун.</quarter>
-							<quarter type="3">јул. – сеп.</quarter>
-							<quarter type="4">окт. – дек.</quarter>
-						</quarterWidth>
-					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
@@ -1894,7 +1925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<eras>
 					<eraNames>
 						<era type="0">пред нашата ера</era>
-						<era type="0" alt="variant">пр. н. е.</era>
 						<era type="1">од нашата ера</era>
 						<era type="1" alt="variant">нашата ера</era>
 					</eraNames>
@@ -1916,13 +1946,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>d.M.y 'г'.</pattern>
+							<pattern>d MMM y 'г'.</pattern>
 							<datetimeSkeleton>yMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>d.M.yy</pattern>
+							<pattern>d.M.y 'г'.</pattern>
 							<datetimeSkeleton>yyMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -1957,6 +1987,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, 'во' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'во' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1965,6 +1998,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, 'во' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'во' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1978,24 +2014,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, 'во' {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'ч'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="Mdd">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
@@ -2545,28 +2581,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="quarter">
-				<displayName>тромесечје</displayName>
-				<relative type="-1">последното тромесечје</relative>
-				<relative type="0">ова тромесечје</relative>
-				<relative type="1">следното тромесечје</relative>
+				<displayName>тримесечје</displayName>
+				<relative type="-1">последното тримесечје</relative>
+				<relative type="0">ова тримесечје</relative>
+				<relative type="1">следното тримесечје</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">за {0} тромесечје</relativeTimePattern>
-					<relativeTimePattern count="other">за {0} тромесечја</relativeTimePattern>
+					<relativeTimePattern count="one">за {0} тримесечје</relativeTimePattern>
+					<relativeTimePattern count="other">за {0} тримесечја</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">пред {0} тромесечје</relativeTimePattern>
-					<relativeTimePattern count="other">пред {0} тромесечја</relativeTimePattern>
+					<relativeTimePattern count="one">пред {0} тримесечје</relativeTimePattern>
+					<relativeTimePattern count="other">пред {0} тримесечја</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>тромес.</displayName>
+				<displayName>тримес.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">за {0} тромес.</relativeTimePattern>
-					<relativeTimePattern count="other">за {0} тромес.</relativeTimePattern>
+					<relativeTimePattern count="one">за {0} тримес.</relativeTimePattern>
+					<relativeTimePattern count="other">за {0} тримес.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">пред {0} тромес.</relativeTimePattern>
-					<relativeTimePattern count="other">пред {0} тромес.</relativeTimePattern>
+					<relativeTimePattern count="one">пред {0} тримес.</relativeTimePattern>
+					<relativeTimePattern count="other">пред {0} тримес.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>тримес.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">за {0} тримес.</relativeTimePattern>
+					<relativeTimePattern count="other">за {0} тримес.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">пред {0} тримес.</relativeTimePattern>
+					<relativeTimePattern count="other">пред {0} тримес.</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
@@ -2607,6 +2654,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekOfMonth">
 				<displayName>седмица од месецот</displayName>
 			</field>
+			<field type="weekOfMonth-short">
+				<displayName>сед. од мес.</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName>сед. од мес.</displayName>
+			</field>
 			<field type="day">
 				<displayName>ден</displayName>
 				<relative type="-2">завчера</relative>
@@ -2633,7 +2686,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ден од неделата</displayName>
 			</field>
 			<field type="weekday-short">
-				<displayName>ден во неделата</displayName>
+				<displayName>ден од нед.</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName>ден од нед.</displayName>
 			</field>
 			<field type="weekdayOfMonth">
 				<displayName>ден од месецот</displayName>
@@ -2823,12 +2879,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">пред {0} саб.</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="dayperiod-short">
+				<displayName>претпл./попл.</displayName>
+			</field>
 			<field type="dayperiod">
 				<displayName>претпладне/попладне</displayName>
 			</field>
+			<field type="dayperiod-narrow">
+				<displayName>претпл./попл.</displayName>
+			</field>
 			<field type="hour">
 				<displayName>час</displayName>
-				<relative type="0">часов</relative>
+				<relative type="0">овој час</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">за {0} час</relativeTimePattern>
 					<relativeTimePattern count="other">за {0} часа</relativeTimePattern>
@@ -3196,7 +3258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Ренкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал Харбор</exemplarCity>
+				<exemplarCity>Атикокан</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
@@ -3249,6 +3311,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Велигденски Остров</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Којајке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта Аренас</exemplarCity>
 			</zone>
@@ -3514,9 +3579,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пном Пен</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4193,9 +4255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западноафриканско време</generic>
-					<standard>Западноафриканско стандардно време</standard>
-					<daylight>Западноафриканско летно сметање на времето</daylight>
+					<standard>Западноафриканско време</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4567,6 +4627,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Време во Гвајана</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Стандардно време во Хаваи - Алеутски острови</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Време во Хаваи - Алеутски острови</generic>
@@ -4939,7 +5004,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard>Време во Јужна Грузија</standard>
+					<standard>Време во Јужна Џорџија</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
@@ -4986,6 +5051,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Време во Чуук</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Турција време</generic>
+					<standard>Турција стандардно време</standard>
+					<daylight>Турција летно сметање на времето</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Време во Туркменистан</generic>
@@ -5149,6 +5221,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5163,14 +5239,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000000" count="other">0 мил'.' ¤</pattern>
 					<pattern type="10000000" count="one">00 мил'.' ¤</pattern>
 					<pattern type="10000000" count="other">00 мил'.' ¤</pattern>
-					<pattern type="100000000" count="one">000 мил'.' ¤</pattern>
-					<pattern type="100000000" count="other">000 мил'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 М ¤</pattern>
+					<pattern type="100000000" count="other">000 М ¤</pattern>
 					<pattern type="1000000000" count="one">0 милј'.' ¤</pattern>
 					<pattern type="1000000000" count="other">0 милј'.' ¤</pattern>
 					<pattern type="10000000000" count="one">00 милј'.' ¤</pattern>
 					<pattern type="10000000000" count="other">00 милј'.' ¤</pattern>
-					<pattern type="100000000000" count="one">000 милј'.' ¤</pattern>
-					<pattern type="100000000000" count="other">000 милј'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 мј'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 ми'.' ¤</pattern>
 					<pattern type="1000000000000" count="one">0 бил'.' ¤</pattern>
 					<pattern type="1000000000000" count="other">0 бил'.' ¤</pattern>
 					<pattern type="10000000000000" count="one">00 бил'.' ¤</pattern>
@@ -5193,9 +5269,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Авгани (1927–2002)</displayName>
 			</currency>
 			<currency type="AFN">
-				<displayName>Авганистански авгани</displayName>
-				<displayName count="one">Авгани</displayName>
-				<displayName count="other">Авгани</displayName>
+				<displayName>Авганистански авган</displayName>
+				<displayName count="one">Авганистански авган</displayName>
+				<displayName count="other">Авганистански авган</displayName>
 			</currency>
 			<currency type="ALL">
 				<displayName>Албански лек</displayName>
@@ -5208,9 +5284,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">Ерменски драми</displayName>
 			</currency>
 			<currency type="ANG">
-				<displayName>Холандски антилски гилдер</displayName>
-				<displayName count="one">Холандски антилски гилдер</displayName>
-				<displayName count="other">Холандски антилски гилдери</displayName>
+				<displayName>Холандски антилски гулден</displayName>
+				<displayName count="one">Холандски антилски гулден</displayName>
+				<displayName count="other">Холандски антилски гулдени</displayName>
 			</currency>
 			<currency type="AOA">
 				<displayName>Анголска кванза</displayName>
@@ -5371,6 +5447,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="CNH">
 				<displayName>Кинески јуан (офшор)</displayName>
+				<displayName count="one">Кинески јуани (офшор)</displayName>
+				<displayName count="other">Кинески јуани (офшор)</displayName>
 			</currency>
 			<currency type="CNY">
 				<displayName>Кинески јуан</displayName>
@@ -5580,9 +5658,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">Ирачки динари</displayName>
 			</currency>
 			<currency type="IRR">
-				<displayName>Ирански риал</displayName>
-				<displayName count="one">Ирански риал</displayName>
-				<displayName count="other">Ирански риали</displayName>
+				<displayName>Ирански ријал</displayName>
+				<displayName count="one">Ирански ријал</displayName>
+				<displayName count="other">Ирански ријали</displayName>
 			</currency>
 			<currency type="ISK">
 				<displayName>Исландска крона</displayName>
@@ -5676,7 +5754,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="LSL">
 				<displayName>Лесотско лоти</displayName>
-				<displayName count="one">Лесотски лоти</displayName>
+				<displayName count="one">Лесотско лоти</displayName>
 				<displayName count="other">Лесотски лоти</displayName>
 			</currency>
 			<currency type="LTL">
@@ -5723,9 +5801,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Малски франк</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName>Мјанмарски киат</displayName>
-				<displayName count="one">Мјанмарски киат</displayName>
-				<displayName count="other">Мјанмарски киати</displayName>
+				<displayName>Мјанмарски кјат</displayName>
+				<displayName count="one">Мјанмарски кјат</displayName>
+				<displayName count="other">Мјанмарски кјати</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>Монголиски тугрик</displayName>
@@ -5832,9 +5910,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>NZD</symbol>
 			</currency>
 			<currency type="OMR">
-				<displayName>Омански риал</displayName>
-				<displayName count="one">Омански риал</displayName>
-				<displayName count="other">Омански риали</displayName>
+				<displayName>Омански ријал</displayName>
+				<displayName count="one">Омански ријал</displayName>
+				<displayName count="other">Омански ријали</displayName>
 			</currency>
 			<currency type="PAB">
 				<displayName>Панамска балбоа</displayName>
@@ -5850,7 +5928,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Перуански сол (1863–1965)</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName>Папуа новогвинејска кина</displayName>
+				<displayName>Папуанска кина</displayName>
+				<displayName count="one">Папуанска кина</displayName>
+				<displayName count="other">Папуански кини</displayName>
 			</currency>
 			<currency type="PHP">
 				<displayName>Филипински пезос</displayName>
@@ -5880,9 +5960,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">Парагвајски гуарани</displayName>
 			</currency>
 			<currency type="QAR">
-				<displayName>Катарски риал</displayName>
-				<displayName count="one">Катарски риал</displayName>
-				<displayName count="other">Катарски риали</displayName>
+				<displayName>Катарски ријал</displayName>
+				<displayName count="one">Катарски ријал</displayName>
+				<displayName count="other">Катарски ријали</displayName>
 			</currency>
 			<currency type="ROL">
 				<displayName>Романска леи (1952–2006)</displayName>
@@ -6119,9 +6199,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>VND</symbol>
 			</currency>
 			<currency type="VUV">
-				<displayName>Ванатски вату</displayName>
-				<displayName count="one">Ванатски вату</displayName>
-				<displayName count="other">Ванатски ватуи</displayName>
+				<displayName>Вануатски вату</displayName>
+				<displayName count="one">Вануатски вату</displayName>
+				<displayName count="other">Вануатски ватуи</displayName>
 			</currency>
 			<currency type="WST">
 				<displayName>Самоанска тала</displayName>
@@ -6136,6 +6216,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Источнокарипски долар</displayName>
 				<displayName count="other">Источнокарипски долари</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Карипски гулден</displayName>
+				<displayName count="one">Карипски гулден</displayName>
+				<displayName count="other">Карипски гулден</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Западноафрикански франк</displayName>
 				<displayName count="one">Западноафрикански франк</displayName>
@@ -6153,9 +6238,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Јеменски динар</displayName>
 			</currency>
 			<currency type="YER">
-				<displayName>Јеменски риал</displayName>
-				<displayName count="one">Јеменски риал</displayName>
-				<displayName count="other">Јеменски риали</displayName>
+				<displayName>Јеменски ријал</displayName>
+				<displayName count="one">Јеменски ријал</displayName>
+				<displayName count="other">Јеменски ријали</displayName>
 			</currency>
 			<currency type="YUD">
 				<displayName>Југословенски динар</displayName>
@@ -6188,6 +6273,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Зимбабвиски долар</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабвеско злато</displayName>
+				<displayName count="one">Зимбабвеско злато</displayName>
+				<displayName count="other">Зимбабвеско злато</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -6414,7 +6504,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<displayName>ставки</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>делови</displayName>
+				<unitPattern count="one">{0} дел</unitPattern>
+				<unitPattern count="other">{0} делови</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>делови на милион</displayName>
 				<unitPattern count="one">{0} дел на милион</unitPattern>
 				<unitPattern count="other">{0} дела на милион</unitPattern>
@@ -6439,6 +6534,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} мол</unitPattern>
 				<unitPattern count="other">{0} мола</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>гликоза</displayName>
+				<unitPattern count="one">{0} гликоза</unitPattern>
+				<unitPattern count="other">{0} гликоза</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри на километар</displayName>
 				<unitPattern count="one">{0} литар на километар</unitPattern>
@@ -6941,6 +7041,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} милиметар жива</unitPattern>
 				<unitPattern count="other">{0} милиметри жива</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>жива</displayName>
+				<unitPattern count="one">{0} на живиниот столб</unitPattern>
+				<unitPattern count="other">{0} на живиниот столб</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунти на квадратен инч</displayName>
 				<unitPattern count="one">{0} фунта на квадратен инч</unitPattern>
@@ -7112,6 +7217,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} метричка чаша</unitPattern>
 				<unitPattern count="other">{0} метрички чаши</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрички течни унци</displayName>
+				<unitPattern count="one">{0} метричка течна унца</unitPattern>
+				<unitPattern count="other">{0} метрички течни унци</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акр-стапка</displayName>
 				<unitPattern count="one">{0} акр-стапка</unitPattern>
@@ -7147,14 +7257,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} чаши</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
-				<displayName>унци течност</displayName>
-				<unitPattern count="one">{0} унца течност</unitPattern>
-				<unitPattern count="other">{0} унци течност</unitPattern>
+				<displayName>течни унци</displayName>
+				<unitPattern count="one">{0} течна унца</unitPattern>
+				<unitPattern count="other">{0} течни унци</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName>имп. унци течност</displayName>
-				<unitPattern count="one">{0} имп. унца течност</unitPattern>
-				<unitPattern count="other">{0} имп. унци течност</unitPattern>
+				<displayName>имп. течни унци</displayName>
+				<unitPattern count="one">{0} имп. течна унца</unitPattern>
+				<unitPattern count="other">{0} имп. течни унци</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>супени лажици</displayName>
@@ -7204,22 +7314,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} имп. четвртина</unitPattern>
 				<unitPattern count="other">{0} имп. четвртини</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлини</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>стерадијани</displayName>
+				<unitPattern count="one">{0} стерадијан</unitPattern>
+				<unitPattern count="other">{0} стерадијани</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>катали</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="other">{0} катали</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулони</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="other">{0} кулони</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фаради</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="other">{0} фаради</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>хенри</displayName>
+				<unitPattern count="one">{0} хенри</unitPattern>
+				<unitPattern count="other">{0} хенри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сименси</displayName>
+				<unitPattern count="one">{0} сименс</unitPattern>
+				<unitPattern count="other">{0} сименси</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калории [IT]</displayName>
+				<unitPattern count="one">{0} калорија [IT]</unitPattern>
+				<unitPattern count="other">{0} калории [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерели</displayName>
+				<unitPattern count="one">{0} бекерел</unitPattern>
+				<unitPattern count="other">{0} бекерели</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>сиверти</displayName>
+				<unitPattern count="one">{0} сиверт</unitPattern>
+				<unitPattern count="other">{0} сиверти</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>греја</displayName>
+				<unitPattern count="one">{0} греј</unitPattern>
+				<unitPattern count="other">{0} греја</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килопонди</displayName>
+				<unitPattern count="one">{0} килопонд</unitPattern>
+				<unitPattern count="other">{0} килопонди</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесли</displayName>
+				<unitPattern count="one">{0} тесла</unitPattern>
+				<unitPattern count="other">{0} тесли</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебери</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="other">{0} вебери</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>светлосна</displayName>
+				<unitPattern count="one">{0} светлосна</unitPattern>
+				<unitPattern count="other">{0} светлосни</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>делови на милијарда</displayName>
 				<unitPattern count="one">{0} дел на милијарда</unitPattern>
 				<unitPattern count="other">{0} дела на милијарда</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ноќи</displayName>
-				<unitPattern count="one">{0} ноќ</unitPattern>
-				<unitPattern count="other">{0} ноќи</unitPattern>
-				<perUnitPattern>{0}/ноќ</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} исток</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} север</coordinateUnitPattern>
@@ -7279,6 +7448,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ставка</unitPattern>
 				<unitPattern count="other">{0} ставки</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>дел</displayName>
+				<unitPattern count="one">{0} дел</unitPattern>
+				<unitPattern count="other">{0} делови</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="other">{0} %</unitPattern>
@@ -7287,6 +7461,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‰</unitPattern>
 				<unitPattern count="other">{0} ‰</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
@@ -7542,11 +7719,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-jigger">
 				<displayName>џигер</displayName>
+				<unitPattern count="one">{0} џигер</unitPattern>
+				<unitPattern count="other">{0} џигери</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлини</unitPattern>
+				<displayName>светлосна</displayName>
+				<unitPattern count="one">{0} светлосна</unitPattern>
+				<unitPattern count="other">{0} светлосни</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>ноќи</displayName>
@@ -7601,10 +7785,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-dunam">
 				<displayName>дунам</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>дел</displayName>
+				<unitPattern count="one">{0} дел</unitPattern>
+				<unitPattern count="other">{0} делови</unitPattern>
+			</unit>
 			<unit type="concentr-permyriad">
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>mpg UK</displayName>
 				<unitPattern count="one">{0} m/gUK</unitPattern>
@@ -7805,6 +7997,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} fl.dr.</unitPattern>
 				<unitPattern count="other">{0} fl.dr.</unitPattern>
 			</unit>
+			<unit type="volume-jigger">
+				<unitPattern count="one">{0} џигер</unitPattern>
+				<unitPattern count="other">{0} џигери</unitPattern>
+			</unit>
 			<unit type="volume-pinch">
 				<displayName>pn</displayName>
 				<unitPattern count="one">{0} pn</unitPattern>
@@ -7814,16 +8010,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt-Imp.</unitPattern>
 				<unitPattern count="other">{0} qt-Imp.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлини</unitPattern>
+				<displayName>светлосна</displayName>
+				<unitPattern count="one">{0} светлосна</unitPattern>
+				<unitPattern count="other">{0} светлосни</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ноќи</displayName>
 				<unitPattern count="one">{0} н.</unitPattern>
 				<unitPattern count="other">{0} н.</unitPattern>
-				<perUnitPattern>{0}/ноќ</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -8016,7 +8215,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	</typographicNames>
 	<personNames>
 		<nameOrderLocales order="givenFirst">und mk</nameOrderLocales>
-		<nameOrderLocales order="surnameFirst">ko vi yue zh</nameOrderLocales>
 		<personName order="givenFirst" length="long" usage="referring" formality="formal">
 			<namePattern>{title} {given} {given2} {surname}</namePattern>
 		</personName>
diff --git a/make/data/cldr/common/main/ml.xml b/make/data/cldr/common/main/ml.xml
index 1be91580838..cdc82cb145f 100644
--- a/make/data/cldr/common/main/ml.xml
+++ b/make/data/cldr/common/main/ml.xml
@@ -294,6 +294,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ബാഫിയ</language>
 			<language type="ksh">കൊളോണിയൻ</language>
 			<language type="ku">കുർദ്ദിഷ്</language>
+			<language type="ku" menu="core">കുർദ്ദിഷ്</language>
+			<language type="ku" menu="extension">കുർമാൻജി</language>
 			<language type="kum">കൂമിക്ക്</language>
 			<language type="kut">കുതേനൈ</language>
 			<language type="kv">കോമി</language>
@@ -829,6 +831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ചൈന</territory>
 			<territory type="CO">കൊളംബിയ</territory>
 			<territory type="CP">ക്ലിപ്പെർട്ടൻ ദ്വീപ്</territory>
+			<territory type="CQ">സാർക്ക്</territory>
 			<territory type="CR">കോസ്റ്ററിക്ക</territory>
 			<territory type="CU">ക്യൂബ</territory>
 			<territory type="CV">കേപ്പ് വേർഡ്</territory>
@@ -1083,37 +1086,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="collation">അടുക്കൽ ക്രമം</key>
 			<key type="colNormalization">സാധാരണ അടുക്കൽ</key>
 			<key type="colNumeric">അക്കങ്ങൾ പ്രകാരമുള്ള അടുക്കൽ</key>
-			<key type="colStrength">അടുക്കൽ ദൃഢത</key>
+			<key type="colStrength">അടുക്കൽ ശക്തി</key>
 			<key type="currency">നാണയം</key>
+			<key type="em">ഇമോജി അവതരണം</key>
 			<key type="hc">സമയ ഘടന (12 / 24)</key>
-			<key type="lb">രേഖ വിഭാജി ശൈലി</key>
+			<key type="lb">CJK ലൈൻ ബ്രേക്ക്</key>
+			<key type="lw">വാക്കുകൾക്കുള്ളിലെ ലൈൻ ബ്രേക്ക്</key>
 			<key type="ms">അളക്കൽ സംവിധാനം</key>
 			<key type="numbers">അക്കങ്ങൾ‌</key>
+			<key type="ss">ചുരുക്കരൂപത്തിന് ശേഷമുള്ള സെന്റൻസ് ബ്രേക്ക്</key>
 			<key type="timezone">സമയ മേഖല</key>
 			<key type="va">ഭാഷാ ഭേദം</key>
 			<key type="x">സ്വകാര്യ ഉപയോഗം</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist">ബുദ്ധമതകലണ്ടർ</type>
+			<type key="calendar" type="buddhist">ബുദ്ധിസ്റ്റ് കലണ്ടർ</type>
+			<type key="calendar" type="buddhist" scope="core">ബുദ്ധിസ്റ്റ്</type>
 			<type key="calendar" type="chinese">ചൈനീസ് കലണ്ടർ</type>
+			<type key="calendar" type="chinese" scope="core">ചൈനീസ്</type>
 			<type key="calendar" type="coptic">കോപ്റ്റിക് കലണ്ടർ</type>
+			<type key="calendar" type="coptic" scope="core">കോപ്റ്റിക്</type>
 			<type key="calendar" type="dangi">ഡാംഗി കലണ്ടർ</type>
+			<type key="calendar" type="dangi" scope="core">ഡാംഗി</type>
 			<type key="calendar" type="ethiopic">എത്യോപിക് കലണ്ടർ</type>
+			<type key="calendar" type="ethiopic" scope="core">എത്യോപിക്</type>
 			<type key="calendar" type="ethiopic-amete-alem">എത്യോപിക് അമെതെ അലെം കലണ്ടർ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">എത്യോപിക് അമെതെ അലെം</type>
 			<type key="calendar" type="gregorian">ഇംഗ്ലീഷ് കലണ്ടർ</type>
+			<type key="calendar" type="gregorian" scope="core">ഇംഗ്ലീഷ്</type>
 			<type key="calendar" type="hebrew">ഹീബ്രൂ കലണ്ടർ</type>
+			<type key="calendar" type="hebrew" scope="core">ഹീബ്രൂ</type>
 			<type key="calendar" type="indian">ശകവർഷ കലണ്ടർ</type>
-			<type key="calendar" type="islamic">ഇസ്‌ലാമിക് കലണ്ടർ</type>
-			<type key="calendar" type="islamic-civil">ഇസ്ലാമിക് കലണ്ടർ</type>
+			<type key="calendar" type="indian" scope="core">ശകവർഷം</type>
+			<type key="calendar" type="islamic">ഇസ്ലാമിക് കലണ്ടർ</type>
+			<type key="calendar" type="islamic" scope="core">ഇസ്ലാമിക്</type>
+			<type key="calendar" type="islamic-civil">ഇസ്ലാമിക് കലണ്ടർ (ടാബുലർ, സിവിൽ ഇപോക്ക്)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ഇസ്ലാമിക് (ടാബുലർ, സിവിൽ ഇപോക്ക്)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ഇസ്ലാം-അറബിക് കലണ്ടർ</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">ഇസ്ലാം-ജ്യോതിഷ കലണ്ടർ</type>
-			<type key="calendar" type="islamic-umalqura">ഇസ്‌ലാമിക് കലണ്ടർ (ഉം അൽ ഖുറ)</type>
+			<type key="calendar" type="islamic-umalqura">ഇസ്ലാമിക് കലണ്ടർ (ഉം അൽ ഖുറ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ഇസ്ലാമിക് (ഉം അൽ ഖുറ)</type>
 			<type key="calendar" type="iso8601">ഐഎസ്ഓ 8601 കലണ്ടർ</type>
 			<type key="calendar" type="japanese">ജാപ്പനീസ് കലണ്ടർ</type>
+			<type key="calendar" type="japanese" scope="core">ജാപ്പനീസ്</type>
 			<type key="calendar" type="persian">പേർഷ്യൻ കലണ്ടർ</type>
+			<type key="calendar" type="persian" scope="core">പേർഷ്യൻ</type>
 			<type key="calendar" type="roc">മിംഗ്വോ കലണ്ടർ</type>
+			<type key="calendar" type="roc" scope="core">മിംഗ്വോ</type>
 			<type key="cf" type="account">അക്കൗണ്ടിംഗ് കറൻസി ഫോർമാറ്റ്</type>
-			<type key="cf" type="standard">സാധാരണ കറൻസി ഫോർമാറ്റ്</type>
+			<type key="cf" type="account" scope="core">അക്കൗണ്ടിംഗ്</type>
+			<type key="cf" type="standard">സ്റ്റാൻഡേർഡ് കറൻസി ഫോർമാറ്റ്</type>
+			<type key="cf" type="standard" scope="core">സ്റ്റാൻഡേർഡ്</type>
 			<type key="colAlternate" type="non-ignorable">ചിഹ്നങ്ങൾ അടുക്കുക</type>
 			<type key="colAlternate" type="shifted">അവഗണിക്കൽ ചിഹ്നങ്ങൾ അടുക്കുക</type>
 			<type key="colBackwards" type="no">സാധാരണ ആക്‌സന്റുകൾ പ്രകാരം അടുക്കുക</type>
@@ -1123,20 +1146,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">ആദ്യം വലിയക്ഷരപ്രകാരം അടുക്കുക</type>
 			<type key="colCaseLevel" type="no">കേസ് സെൻസിറ്റീവ് പ്രകാരം അടുക്കുക</type>
 			<type key="colCaseLevel" type="yes">കേസ് സെൻസിറ്റീവ് അടുക്കുക</type>
-			<type key="collation" type="big5han">പരമ്പരാഗത ചൈനീസ് ക്രമീകരണം - ബിഗ്5</type>
 			<type key="collation" type="compat" draft="contributed">അനുയോജ്യതയ്‌ക്കായുള്ള മുൻ അടുക്കൽ ക്രമം</type>
 			<type key="collation" type="dictionary" draft="contributed">നിഘണ്ടു അടുക്കൽ ക്രമം</type>
-			<type key="collation" type="ducet">സ്ഥിര യൂണികോഡ് അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="ducet">ഡിഫോൾട്ട് യൂണികോഡ് അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="ducet" scope="core">ഡിഫോൾട്ട് യൂണികോഡ്</type>
 			<type key="collation" type="emoji" draft="contributed">ഇമോജി അടുക്കൽ ക്രമം</type>
 			<type key="collation" type="eor" draft="contributed">യൂറോപ്യൻ അടുക്കൽ നിയമങ്ങൾ</type>
-			<type key="collation" type="gb2312han">ലളിതമായ ചൈനീസ് ക്രമീകരണം - ജീബി2312</type>
 			<type key="collation" type="phonebook">ഫോൺബുക്കിലെ ക്രമീകരണം</type>
 			<type key="collation" type="phonetic">സ്വരസൂചക അടുക്കൽ ക്രമം</type>
 			<type key="collation" type="pinyin">പിൻ‌യിൻ ക്രമീകരണം</type>
 			<type key="collation" type="reformed" draft="contributed">നവീകരിച്ച അടുക്കൽ ക്രമം</type>
 			<type key="collation" type="search">പൊതുവായ ആവശ്യത്തിനുള്ള തിരയൽ</type>
+			<type key="collation" type="search" scope="core">തിരയൽ</type>
 			<type key="collation" type="searchjl">ഹാംഗൽ പ്രാരംഭ വ്യഞ്ജനാക്ഷരം പ്രകാരം തിരയുക</type>
-			<type key="collation" type="standard">സാധാരണ അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="standard">സ്റ്റാൻഡേർഡ് അടുക്കൽ ക്രമം</type>
+			<type key="collation" type="standard" scope="core">സ്റ്റാൻഡേർഡ്</type>
 			<type key="collation" type="stroke">സ്റ്റ്രോക്ക് ക്രമീകരണം</type>
 			<type key="collation" type="traditional">പരമ്പരാഗത ക്രമീകരണം</type>
 			<type key="collation" type="unihan" draft="contributed">റാഡിക്കൽ-സ്ട്രോക്ക് അടുക്കൽ ക്രമം</type>
@@ -1153,18 +1177,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ഫുൾവിഡ്‌ത്തിലേക്ക്</type>
 			<type key="d0" type="hwidth">ഹാഫ്‌വിഡ്‌ത്തിലേക്ക്</type>
 			<type key="d0" type="npinyin" draft="contributed">സംഖ്യാപരമായ</type>
+			<type key="em" type="default" scope="core">ഡിഫോൾട്ട്</type>
+			<type key="em" type="emoji" scope="core">ഇമോജി</type>
+			<type key="em" type="text" scope="core">ടെക്സ്റ്റ്</type>
 			<type key="hc" type="h11">12 മണിക്കൂർ സംവിധാനം (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 മണിക്കൂർ സംവിധാനം (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 മണിക്കൂർ സംവിധാനം (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 മണിക്കൂർ സംവിധാനം (1–24)</type>
-			<type key="lb" type="loose">അനിയന്ത്രിത രേഖാ വിഭാജി ശൈലി</type>
-			<type key="lb" type="normal">സാധാരണ രേഖ വിഭാജി ശൈലി</type>
-			<type key="lb" type="strict">നിയന്ത്രിത രേഖ വിഭാജി ശൈലി</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">ലൂസ് ലൈൻ ബ്രേക്ക് സ്റ്റൈൽ</type>
+			<type key="lb" type="loose" scope="core">ലൂസ്</type>
+			<type key="lb" type="normal">നോർമൽ ലൈൻ ബ്രേക്ക് സ്റ്റൈൽ</type>
+			<type key="lb" type="normal" scope="core">നോർമൽ</type>
+			<type key="lb" type="strict">സ്ട്രിക്റ്റ് ലൈൻ ബ്രേക്ക് സ്റ്റൈൽ</type>
+			<type key="lb" type="strict" scope="core">സ്ട്രിക്റ്റ്</type>
+			<type key="lw" type="breakall" scope="core">എല്ലാം വിഭജിക്കുക</type>
+			<type key="lw" type="keepall" scope="core">എല്ലാം നിലനിർത്തുക</type>
+			<type key="lw" type="normal" scope="core">നോർമൽ</type>
+			<type key="lw" type="phrase" scope="core">ഉപവാക്യങ്ങൾ നിലനിർത്തുക</type>
 			<type key="m0" type="bgn">യു.എസ്. ബി.ജി.എൻ. ലിപ്യന്തരണം</type>
 			<type key="m0" type="ungegn">യു.എൻ. ജി.ഇ.ജി.എൻ. ലിപ്യന്തരണം</type>
 			<type key="ms" type="metric">മെട്രിക്ക് സംവിധാനം</type>
+			<type key="ms" type="metric" scope="core">മെട്രിക്ക്</type>
 			<type key="ms" type="uksystem">ബ്രിട്ടീഷ് അളക്കൽ സംവിധാനം</type>
+			<type key="ms" type="uksystem" scope="core">യു.കെ.</type>
 			<type key="ms" type="ussystem">യുഎസ് അളക്കൽ സംവിധാനം</type>
+			<type key="ms" type="ussystem" scope="core">യുഎസ്</type>
 			<type key="numbers" type="ahom" draft="contributed">അഹോം അക്കങ്ങൾ</type>
 			<type key="numbers" type="arab">അറബിക്-ഇന്ത്യ അക്കങ്ങൾ</type>
 			<type key="numbers" type="arabext">വിപുലീകൃത അറബിക്-ഇന്ത്യ അക്കങ്ങൾ</type>
@@ -1242,6 +1283,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="traditional">സാധാരണയായി ഉപയോഗിച്ചുവരുന്ന സംഖ്യകൾ</type>
 			<type key="numbers" type="vaii">വായ് സംഖ്യകൾ</type>
 			<type key="numbers" type="wara" draft="contributed">വറാങ് സിറ്റി അക്കങ്ങൾ</type>
+			<type key="ss" type="none" scope="core">ഓഫ്</type>
+			<type key="ss" type="standard" scope="core">ഓൺ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">മെട്രിക്ക്</measurementSystemName>
@@ -1258,7 +1301,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[അ{അഃ} {അം} ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200C\u200Dഃ ൠ ഌ ൡ ൿ ൺ ൻ ം ർ ൽ ൾ ാ ി ീ ു ൂ ൃ െ േ ൈ ൊ ോ ൗ ്]</exemplarCharacters>
 		<exemplarCharacters type="index">[അ ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[൦ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[\\ % \^ ~]</exemplarCharacters>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
 		</parseLenients>
@@ -1305,12 +1350,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">കാലഘട്ടം0</era>
-						<era type="1" draft="contributed">കാലഘട്ടം1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1349,66 +1388,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">കാലഘട്ടം0</era>
-						<era type="1" draft="contributed">കാലഘട്ടം1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>G y, MMMM d, EEEE</pattern>
+							<pattern>G y MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>G y, MMMM d</pattern>
+							<pattern>G y MMMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>G y, MMM d</pattern>
+							<pattern>G y MMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}-ന്</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}-ന്</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}-ന്</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}-ന്</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E, B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E, B h:mm:ss</dateFormatItem>
-						<dateFormatItem id="MEd">M/d, E</dateFormatItem>
+						<dateFormatItem id="GyM">G y/M</dateFormatItem>
+						<dateFormatItem id="GyMd">G y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y/M/d, E</dateFormatItem>
+						<dateFormatItem id="hv">v h a</dateFormatItem>
+						<dateFormatItem id="Hv">v HH'h'</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">d/M, E</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">MMMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y/M</dateFormatItem>
 						<dateFormatItem id="yyyyMd">G d/M/y</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">G d/M/y, E</dateFormatItem>
 						<dateFormatItem id="yyyyMM">MM-y G</dateFormatItem>
@@ -1601,12 +1660,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<eras>
 					<eraNames>
 						<era type="0">ക്രിസ്‌തുവിന് മുമ്പ്</era>
-						<era type="0" alt="variant">ബി.സി.ഇ.</era>
+						<era type="0" alt="variant">കോമൺ ഇറയ്ക്ക് മുമ്പ്</era>
 						<era type="1">ആന്നോ ഡൊമിനി</era>
-						<era type="1" alt="variant">സി.ഇ.</era>
+						<era type="1" alt="variant">കോമൺ ഇറ</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">ബി.സി.</era>
+						<era type="0">ബിസി</era>
 						<era type="0" alt="variant">ബിസിഇ</era>
 						<era type="1">എഡി</era>
 						<era type="1" alt="variant">സിഇ</era>
@@ -1615,17 +1674,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>y, MMMM d, EEEE</pattern>
+							<pattern>y MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>y, MMMM d</pattern>
+							<pattern>y MMMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>y, MMM d</pattern>
+							<pattern>y MMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -1638,13 +1697,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
+							<pattern>zzzz h:mm:ss a</pattern>
 							<datetimeSkeleton>ahmmsszzzz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
+							<pattern>z h:mm:ss a</pattern>
 							<datetimeSkeleton>ahmmssz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
@@ -1664,22 +1723,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}-ന്</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}-ന്</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}-ന്</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}-ന്</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
@@ -1688,16 +1765,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="EBhm">E, B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E, B h:mm:ss</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
+						<dateFormatItem id="GyM">G y/M</dateFormatItem>
+						<dateFormatItem id="GyMd">G y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y, E</dateFormatItem>
+						<dateFormatItem id="hmsv">v h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hmsv">v HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmv">v h:mm a</dateFormatItem>
+						<dateFormatItem id="Hmv">v HH:mm</dateFormatItem>
+						<dateFormatItem id="hv">v h a</dateFormatItem>
+						<dateFormatItem id="Hv">v HH'h'</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">d/M, E</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">MMMM d, E</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">MMMM - ആഴ്ച W</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM - ആഴ്ച W</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">d-M-y, E</dateFormatItem>
-						<dateFormatItem id="yMM">y-MM</dateFormatItem>
+						<dateFormatItem id="yMEd">d/M/y, E</dateFormatItem>
+						<dateFormatItem id="yMM">MM/y</dateFormatItem>
 						<dateFormatItem id="yw" count="one">Y-ലെ ആഴ്ച w</dateFormatItem>
 						<dateFormatItem id="yw" count="other">Y-ലെ ആഴ്ച w</dateFormatItem>
 					</availableFormats>
@@ -1842,20 +1929,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">മാഘം</month>
 							<month type="12">ഫൽഗുനം</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">ചൈത്രം</month>
 							<month type="2">വൈശാഖം</month>
@@ -2290,8 +2363,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 		</fields>
 		<timeZoneNames>
-			<gmtFormat>ജിഎംടി {0}</gmtFormat>
+			<gmtFormat>ജിഎംടി{0}</gmtFormat>
 			<gmtZeroFormat>ജിഎംടി</gmtZeroFormat>
+			<gmtUnknownFormat>ജിഎംടി+?</gmtUnknownFormat>
 			<regionFormat>{0} സമയം</regionFormat>
 			<regionFormat type="daylight">{0} ഡേലൈറ്റ് സമയം</regionFormat>
 			<regionFormat type="standard">{0} സ്റ്റാൻഡേർഡ് സമയം</regionFormat>
@@ -2648,6 +2722,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ഈസ്റ്റർ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>കൊയൈകേ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>പുന്റ അരീനസ്</exemplarCity>
 			</zone>
@@ -2913,10 +2990,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ഫെനോം പെൻ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>എൻഡബറി</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>കാൻട്ടൻ</exemplarCity>
+				<exemplarCity>കാന്റൺ ദ്വീപ്</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>കിരിറ്റിമാറ്റി</exemplarCity>
@@ -3495,7 +3569,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>മരെങ്കോ, ഇൻഡ്യാന</exemplarCity>
 			</zone>
 			<zone type="America/Indianapolis">
-				<exemplarCity>ഇൻഡ്യാനാപോലീസ്</exemplarCity>
+				<exemplarCity>ഇൻഡ്യാനാപോളിസ്</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
 				<exemplarCity>ലൂയിസ്‌വില്ലെ</exemplarCity>
@@ -3592,9 +3666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>പടിഞ്ഞാറൻ ആഫ്രിക്ക സമയം</generic>
-					<standard>പടിഞ്ഞാറൻ ആഫ്രിക്ക സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>പടിഞ്ഞാറൻ ആഫ്രിക്ക ഗ്രീഷ്‌മകാല സമയം</daylight>
+					<standard>പടിഞ്ഞാറൻ ആഫ്രിക്ക സമയം</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3620,30 +3692,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>വടക്കെ അമേരിക്കൻ സെൻട്രൽ സമയം</generic>
-					<standard>വടക്കെ അമേരിക്കൻ സെൻട്രൽ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ സെൻട്രൽ ഡേലൈറ്റ് സമയം</daylight>
+					<generic>സെൻട്രൽ സമയം</generic>
+					<standard>സെൻട്രൽ സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>സെൻട്രൽ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>വടക്കെ അമേരിക്കൻ കിഴക്കൻ സമയം</generic>
-					<standard>വടക്കെ അമേരിക്കൻ കിഴക്കൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ കിഴക്കൻ ഡേലൈറ്റ് സമയം</daylight>
+					<generic>ഈസ്റ്റേൺ സമയം</generic>
+					<standard>ഈസ്റ്റേൺ സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>ഈസ്റ്റേൺ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>വടക്കെ അമേരിക്കൻ മൌണ്ടൻ സമയം</generic>
-					<standard>വടക്കെ അമേരിക്കൻ മൗണ്ടൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ മൗണ്ടൻ ഡേലൈറ്റ് സമയം</daylight>
+					<generic>മൗണ്ടൻ സമയം</generic>
+					<standard>മൗണ്ടൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>മൗണ്ടൻ ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
 					<generic>വടക്കെ അമേരിക്കൻ പസഫിക് സമയം</generic>
-					<standard>വടക്കെ അമേരിക്കൻ പസഫിക് സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കെ അമേരിക്കൻ പസഫിക് ഡേലൈറ്റ് സമയം</daylight>
+					<standard>പസഫിക് സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>പസഫിക് ഡേലൈറ്റ് സമയം</daylight>
 				</long>
 			</metazone>
 			<metazone type="Anadyr">
@@ -3977,6 +4049,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ഗയാന സമയം</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ഹവായ്-അലൂഷ്യൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ഹവായ്-അലൂഷ്യൻ സമയം</generic>
@@ -4430,6 +4507,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ചൂക്ക് സമയം</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>തുർക്കി സമയം</generic>
+					<standard>തുർക്കി സ്റ്റാൻഡേർഡ് സമയം</standard>
+					<daylight>തുർക്കി വേനൽക്കാല സമയം</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>തുർക്ക്‌മെനിസ്ഥാൻ സമയം</generic>
@@ -4571,7 +4655,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4692,7 +4775,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">അർജൻറീൻ പെയ്സോസ് (ARP)</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName>അർജൻറീൻ പെസോ</displayName>
+				<displayName>അർജന്റീൻ പെസോ</displayName>
+				<displayName count="one">അർജന്റീൻ പെസോ</displayName>
+				<displayName count="other">അർജന്റീൻ പെസോ</displayName>
 			</currency>
 			<currency type="ATS">
 				<displayName>ഓസ്ട്രേലിയൻ ഷില്ലിംഗ്</displayName>
@@ -5588,6 +5673,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>കിഴക്കൻ കരീബിയൻ ഡോളർ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>കരീബിയൻ ഗിൽഡർ</displayName>
+				<displayName count="one">കരീബിയൻ ഗിൽഡർ</displayName>
+				<displayName count="other">കരീബിയൻ ഗിൽഡർ</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>സ്പെഷ്യൽ ഡ്രോയിംഗ് റൈറ്റ്സ്</displayName>
 			</currency>
@@ -5685,6 +5775,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">സിംബാബ്‌വെ ഡോളർ</displayName>
 				<displayName count="other">സിംബാബ്‌വെ ഡോളേഴ്സ്</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>സിംബാബ്‌വെയൻ ഗോൾഡ്</displayName>
+				<displayName count="one">സിംബാബ്‌വെയൻ ഗോൾഡ്</displayName>
+				<displayName count="other">സിംബാബ്‌വെയൻ ഗോൾഡ്</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5802,19 +5897,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</compoundUnit>
 			<compoundUnit type="power2">
 				<compoundUnitPattern1 count="one">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" case="accusative">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" case="dative">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" case="genitive">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" case="instrumental">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" case="locative">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" case="sociative">ചതുരശ്ര {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="accusative">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="dative">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="genitive">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="instrumental">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="locative">ചതുരശ്ര {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="sociative">ചതുരശ്ര {0}</compoundUnitPattern1>
 			</compoundUnit>
 			<compoundUnit type="power3">
 				<compoundUnitPattern1 count="one">ക്യുബിക് {0}</compoundUnitPattern1>
@@ -5995,7 +6078,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-karat">
 				<gender>neuter</gender>
-				<displayName>കാരറ്റ്</displayName>
 				<unitPattern count="one">{0} കാരറ്റ്</unitPattern>
 				<unitPattern count="one" case="accusative">{0} കാരറ്റിനെ</unitPattern>
 				<unitPattern count="one" case="dative">{0} കാരറ്റിന്</unitPattern>
@@ -6026,23 +6108,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ഇനം</unitPattern>
 				<unitPattern count="other">{0} ഇനങ്ങൾ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>പാർട്ട്</displayName>
+				<unitPattern count="one">{0} പാർട്ട്</unitPattern>
+				<unitPattern count="other">{0} പാർട്ട്</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>neuter</gender>
-				<displayName>പാർട്‌സ് / മില്ല്യൺ</displayName>
+				<displayName>പാർട്ട്സ് / മില്ല്യൺ</displayName>
 				<unitPattern count="one">{0} പാർട്ട് / മില്ല്യൺ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} പാർട്ട് / മില്ല്യണിനെ</unitPattern>
 				<unitPattern count="one" case="dative">{0} പാർട്ട് / മില്ല്യണിന്</unitPattern>
 				<unitPattern count="one" case="genitive">{0} പാർട്ട് / മില്ല്യണിന്റെ</unitPattern>
-				<unitPattern count="one" case="instrumental">{0} പാർട്ട് / മില്ല്യണിനാൽ</unitPattern>
+				<unitPattern count="one" case="instrumental">{0} പാർട്ട് / മില്ല്യൺ കൊണ്ട്</unitPattern>
 				<unitPattern count="one" case="locative">{0} പാർട്ട് / മില്ല്യണിൽ</unitPattern>
 				<unitPattern count="one" case="sociative">{0} പാർട്ട് / മില്ല്യണിനോട്</unitPattern>
-				<unitPattern count="other">{0} പാർട്‌സ് / മില്ല്യൺ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} പാർട്ട് / മില്ല്യണിനെ</unitPattern>
-				<unitPattern count="other" case="dative">{0} പാർട്ട് / മില്ല്യണിന്</unitPattern>
-				<unitPattern count="other" case="genitive">{0} പാർട്ട് / മില്ല്യണിന്റെ</unitPattern>
-				<unitPattern count="other" case="instrumental">{0} പാർട്ട് / മില്ല്യണിനാൽ</unitPattern>
-				<unitPattern count="other" case="locative">{0} പാർട്ട് / മില്ല്യണിൽ</unitPattern>
-				<unitPattern count="other" case="sociative">{0} പാർട്ട് / മില്ല്യണിനോട്</unitPattern>
+				<unitPattern count="other">{0} പാർട്ട്സ് / മില്ല്യൺ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} പാർട്ട്സ് / മില്ല്യണിനെ</unitPattern>
+				<unitPattern count="other" case="dative">{0} പാർട്ട്സ് / മില്ല്യണിന്</unitPattern>
+				<unitPattern count="other" case="genitive">{0} പാർട്ട്സ് / മില്ല്യണിന്റെ</unitPattern>
+				<unitPattern count="other" case="instrumental">{0} പാർട്ട്സ് / മില്ല്യണിനാൽ</unitPattern>
+				<unitPattern count="other" case="locative">{0} പാർട്ട്സ് / മില്ല്യണിൽ</unitPattern>
+				<unitPattern count="other" case="sociative">{0} പാർട്ട്സ് / മില്ല്യണിനോട്</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<gender>neuter</gender>
@@ -6109,6 +6196,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} മോളിൽ</unitPattern>
 				<unitPattern count="other" case="sociative">{0} മോളിനോട്</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ഗ്ലൂക്കോസ്</displayName>
+				<unitPattern count="one">{0} ഗ്ലൂക്കോസ്</unitPattern>
+				<unitPattern count="other">{0} ഗ്ലൂക്കോസ്</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ലിറ്റർ/കിലോമീറ്റർ</displayName>
 				<unitPattern count="one">{0} ലിറ്റർ/കിലോമീറ്റർ</unitPattern>
@@ -6130,7 +6222,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} മൈൽ / ഇംപീ. ഗാലൺ</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName>പെറ്റാബൈറ്റുകൾ</displayName>
+				<displayName>പെറ്റാബൈറ്റ്</displayName>
 				<unitPattern count="one">{0} പെറ്റാബൈറ്റ്</unitPattern>
 				<unitPattern count="other">{0} പെറ്റാബൈറ്റ്</unitPattern>
 			</unit>
@@ -6862,7 +6954,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="mass-carat">
 				<gender>neuter</gender>
-				<displayName>കാരറ്റ്</displayName>
 				<unitPattern count="one">{0} കാരറ്റ്</unitPattern>
 				<unitPattern count="one" case="accusative">{0} കാരറ്റിനെ</unitPattern>
 				<unitPattern count="one" case="dative">{0} കാരറ്റിന്</unitPattern>
@@ -6937,6 +7028,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} മില്ലീമീറ്റർ മെർക്കുറി</unitPattern>
 				<unitPattern count="other">{0} മില്ലീമീറ്റർ മെർക്കുറി</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>മെർക്കുറി</displayName>
+				<unitPattern count="one">{0} മെർക്കുറി</unitPattern>
+				<unitPattern count="other">{0} മെർക്കുറി</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്</displayName>
 				<unitPattern count="one">{0} പൗണ്ട് / ചതുരശ്ര ഇഞ്ച്</unitPattern>
@@ -7034,14 +7130,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} മൈൽ/മണിക്കൂർ</unitPattern>
 				<unitPattern count="other">{0} മൈൽ/മണിക്കൂർ</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<displayName>ബോഫർട്ട്</displayName>
+				<unitPattern count="one">ബോഫർട്ട് {0}</unitPattern>
+				<unitPattern count="other">ബോഫർട്ട് {0}</unitPattern>
+			</unit>
 			<unit type="temperature-generic">
 				<gender>neuter</gender>
+				<displayName>ഡിഗ്രി താപനില</displayName>
+				<unitPattern count="one">{0} ഡിഗ്രി</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ഡിഗ്രിയെ</unitPattern>
 				<unitPattern count="one" case="dative">{0} ഡിഗ്രിക്ക്</unitPattern>
 				<unitPattern count="one" case="genitive">{0} ഡിഗ്രിയുടെ</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} ഡിഗ്രിയാൽ</unitPattern>
 				<unitPattern count="one" case="locative">{0} ഡിഗ്രിയിൽ</unitPattern>
 				<unitPattern count="one" case="sociative">{0} ഡിഗ്രിയോട്</unitPattern>
+				<unitPattern count="other">{0} ഡിഗ്രി</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ഡിഗ്രിയെ</unitPattern>
 				<unitPattern count="other" case="dative">{0} ഡിഗ്രിക്ക്</unitPattern>
 				<unitPattern count="other" case="genitive">{0} ഡിഗ്രിയുടെ</unitPattern>
@@ -7216,6 +7320,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} മെട്രിക് കപ്പിൽ</unitPattern>
 				<unitPattern count="other" case="sociative">{0} മെട്രിക് കപ്പിനോട്</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>മെട്രിക് ഫ്ലൂയിഡ് ഔൺസ്</displayName>
+				<unitPattern count="one">{0} മെട്രിക് ഫ്ലൂയിഡ് ഔൺസ്</unitPattern>
+				<unitPattern count="other">{0} മെട്രിക് ഫ്ലൂയിഡ് ഔൺസ്</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ഏക്കർ അടി</displayName>
 				<unitPattern count="one">{0} ഏക്കർ അടി</unitPattern>
@@ -7271,16 +7380,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} dram</unitPattern>
 				<unitPattern count="other">{0} dram</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>പാർട്‌സ്/ബില്ല്യൺ</displayName>
-				<unitPattern count="one">{0} പാർട്ട്/ബില്ല്യൺ</unitPattern>
-				<unitPattern count="other">{0} പാർട്‌സ്/ബില്ല്യൺ</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>സ്റ്ററേഡിയൻ</displayName>
+				<unitPattern count="one">{0} സ്റ്ററേഡിയൻ</unitPattern>
+				<unitPattern count="other">{0} സ്റ്ററേഡിയൻ</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>രാത്രികൾ</displayName>
-				<unitPattern count="one">{0} രാത്രി</unitPattern>
-				<unitPattern count="other">{0} രാത്രികൾ</unitPattern>
-				<perUnitPattern>{0}/രാത്രി</perUnitPattern>
+			<unit type="concentr-katal">
+				<displayName>കാറ്റൽ</displayName>
+				<unitPattern count="one">{0} കാറ്റൽ</unitPattern>
+				<unitPattern count="other">{0} കാറ്റൽ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>കൂളോം</displayName>
+				<unitPattern count="one">{0} കൂളോം</unitPattern>
+				<unitPattern count="other">{0} കൂളോം</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ഫാരഡ്</displayName>
+				<unitPattern count="one">{0} ഫാരഡ്</unitPattern>
+				<unitPattern count="other">{0} ഫാരഡ്</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ഹെൻറി</displayName>
+				<unitPattern count="one">{0} ഹെൻറി</unitPattern>
+				<unitPattern count="other">{0} ഹെൻറി</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>സീമൺസ്</displayName>
+				<unitPattern count="one">{0} സീമൺസ്</unitPattern>
+				<unitPattern count="other">{0} സീമൺസ്</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>കലോറി [IT]</displayName>
+				<unitPattern count="one">{0} കലോറി [IT]</unitPattern>
+				<unitPattern count="other">{0} കലോറി [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ബെക്കറൽ</displayName>
+				<unitPattern count="one">ബെക്കറൽ</unitPattern>
+				<unitPattern count="other">{0} ബെക്കറൽ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>സീവെർട്ട്</displayName>
+				<unitPattern count="one">{0} സീവെർട്ട്</unitPattern>
+				<unitPattern count="other">{0} സീവെർട്ട്</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ഗ്രേ</displayName>
+				<unitPattern count="one">{0} ഗ്രേ</unitPattern>
+				<unitPattern count="other">{0} ഗ്രേ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>കിലോഗ്രാം ഫോഴ്സ്</displayName>
+				<unitPattern count="one">{0} കിലോഗ്രാം ഫോഴ്സ്</unitPattern>
+				<unitPattern count="other">{0} കിലോഗ്രാം ഫോഴ്സ്</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ടെസ്‌ല</displayName>
+				<unitPattern count="one">{0} ടെസ്‌ല</unitPattern>
+				<unitPattern count="other">{0} ടെസ്‌ല</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>വെയ്ബർ</displayName>
+				<unitPattern count="one">{0} വെയ്ബർ</unitPattern>
+				<unitPattern count="other">{0} വെയ്ബർ</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>പ്രകാശം</displayName>
+				<unitPattern count="one">{0} പ്രകാശ</unitPattern>
+				<unitPattern count="other">{0} പ്രകാശ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>പാർട്ട്സ് / ബില്ല്യൺ</displayName>
+				<unitPattern count="one">{0} പാർട്ട് / ബില്ല്യൺ</unitPattern>
+				<unitPattern count="other">{0} പാർട്ട്സ് / ബില്ല്യൺ</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>കാർഡിനൽ ദിശ</displayName>
@@ -7311,14 +7484,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} മീ/സെ²</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>റെവ.</displayName>
-				<unitPattern count="one">{0} റെവ.</unitPattern>
-				<unitPattern count="other">{0} റെവ.</unitPattern>
+				<unitPattern count="one">{0} rev</unitPattern>
+				<unitPattern count="other">{0} rev</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>റേഡിയൻ</displayName>
-				<unitPattern count="one">{0} റേഡി.</unitPattern>
-				<unitPattern count="other">{0} റേഡി.</unitPattern>
+				<unitPattern count="one">{0} rad</unitPattern>
+				<unitPattern count="other">{0} rad</unitPattern>
 			</unit>
 			<unit type="angle-degree">
 				<displayName>ഡിഗ്രി</displayName>
@@ -7392,8 +7564,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-karat">
 				<displayName>കാരറ്റ്</displayName>
-				<unitPattern count="one">{0} കാ.</unitPattern>
-				<unitPattern count="other">{0} കാ.</unitPattern>
+				<unitPattern count="one">{0} kt</unitPattern>
+				<unitPattern count="other">{0} kt</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<displayName>മി.ഗ്രാം/ഡെ.ലി.</displayName>
@@ -7410,8 +7582,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ഇനം</unitPattern>
 				<unitPattern count="other">{0} ഇനം</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>പാർട്‌സ്/മില്ല്യൺ</displayName>
+			<unit type="concentr-part">
+				<displayName>പാർട്ട്</displayName>
+				<unitPattern count="one">{0} പാർട്ട്</unitPattern>
+				<unitPattern count="other">{0} പാർട്ട്</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>പാർട്ട്സ്/മില്ല്യൺ</displayName>
 				<unitPattern count="one">{0} പാ.പെ.മി.</unitPattern>
 				<unitPattern count="other">{0} പാ.പെ.മി.</unitPattern>
 			</unit>
@@ -7423,6 +7600,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} മോൾ</unitPattern>
 				<unitPattern count="other">{0} മോൾ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ലിറ്റർ/കി.മീ.</displayName>
 				<unitPattern count="one">{0} ലി/കി.മീ.</unitPattern>
@@ -7435,56 +7615,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>മൈൽ/ഗാ.</displayName>
-				<unitPattern count="one">{0} മൈ/ഗാ.</unitPattern>
-				<unitPattern count="other">{0} മൈ/ഗാ.</unitPattern>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>മൈൽ/ഗാ. ഇംപീ.</displayName>
-				<unitPattern count="one">{0} മൈ.പെ.ഗാ./ഇം‌പീ.</unitPattern>
-				<unitPattern count="other">{0} മൈ.പെ.ഗാ./ഇം‌പീ.</unitPattern>
+				<unitPattern count="one">{0} mpg Imp.</unitPattern>
+				<unitPattern count="other">{0} mpg Imp.</unitPattern>
 			</unit>
 			<unit type="digital-petabyte">
-				<displayName>പെ.ബൈ.</displayName>
-				<unitPattern count="one">{0} പിബി</unitPattern>
-				<unitPattern count="other">{0} പിബി</unitPattern>
+				<unitPattern count="one">{0} PB</unitPattern>
+				<unitPattern count="other">{0} PB</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>ടെ.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} ടിബി</unitPattern>
-				<unitPattern count="other">{0} ടിബി</unitPattern>
+				<unitPattern count="one">{0} TB</unitPattern>
+				<unitPattern count="other">{0} TB</unitPattern>
 			</unit>
 			<unit type="digital-terabit">
 				<displayName>ടെ.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} ടെ.ബി.</unitPattern>
-				<unitPattern count="other">{0} ടെ.ബി.</unitPattern>
+				<unitPattern count="one">{0} Tb</unitPattern>
+				<unitPattern count="other">{0} Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
 				<displayName>ജി.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} ജിബി</unitPattern>
-				<unitPattern count="other">{0} ജിബി</unitPattern>
+				<unitPattern count="one">{0} GB</unitPattern>
+				<unitPattern count="other">{0} GB</unitPattern>
 			</unit>
 			<unit type="digital-gigabit">
 				<displayName>ജി.ബിറ്റ്</displayName>
 			</unit>
 			<unit type="digital-megabyte">
 				<displayName>മെ.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} എംബി</unitPattern>
-				<unitPattern count="other">{0} എംബി</unitPattern>
+				<unitPattern count="one">{0} MB</unitPattern>
+				<unitPattern count="other">{0} MB</unitPattern>
 			</unit>
 			<unit type="digital-megabit">
 				<displayName>മെ.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} മെ.ബി.</unitPattern>
-				<unitPattern count="other">{0} മെ.ബി.</unitPattern>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
 			</unit>
 			<unit type="digital-kilobyte">
 				<displayName>കി.ബൈറ്റ്</displayName>
-				<unitPattern count="one">{0} കെബി</unitPattern>
-				<unitPattern count="other">{0} കെബി</unitPattern>
+				<unitPattern count="one">{0} kB</unitPattern>
+				<unitPattern count="other">{0} kB</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
 				<displayName>കി.ബിറ്റ്</displayName>
-				<unitPattern count="one">{0} കി.ബിറ്റ്</unitPattern>
-				<unitPattern count="other">{0} കി.ബിറ്റ്</unitPattern>
+				<unitPattern count="one">{0} kb</unitPattern>
+				<unitPattern count="other">{0} kb</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>ബൈറ്റ്</displayName>
@@ -7570,14 +7749,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} നാ.സെ.</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>ആമ്പിയർ</displayName>
-				<unitPattern count="one">{0} ആ.</unitPattern>
-				<unitPattern count="other">{0} ആ.</unitPattern>
+				<unitPattern count="one">{0} A</unitPattern>
+				<unitPattern count="other">{0} A</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
 				<displayName>മില്ലിആമ്പിയർ</displayName>
-				<unitPattern count="one">{0} മി.ആ.</unitPattern>
-				<unitPattern count="other">{0} മി.ആ.</unitPattern>
+				<unitPattern count="one">{0} mA</unitPattern>
+				<unitPattern count="other">{0} mA</unitPattern>
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>ഓം</displayName>
@@ -7633,24 +7811,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ന്യൂട്ടൻ</displayName>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>ഗി.ഹെ.</displayName>
-				<unitPattern count="one">{0} ഗി.ഹെ.</unitPattern>
-				<unitPattern count="other">{0} ഗി.ഹെ.</unitPattern>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>മെ.ഹെ.</displayName>
-				<unitPattern count="one">{0} മെ.ഹെ.</unitPattern>
-				<unitPattern count="other">{0} മെ.ഹെ.</unitPattern>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<displayName>കി.ഹെ.</displayName>
-				<unitPattern count="one">{0} കി.ഹെ.</unitPattern>
-				<unitPattern count="other">{0} കി.ഹെ.</unitPattern>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<displayName>ഹെ.</displayName>
-				<unitPattern count="one">{0} ഹെ.</unitPattern>
-				<unitPattern count="other">{0} ഹെ.</unitPattern>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>dpcm</displayName>
@@ -7774,8 +7948,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="light-lux">
 				<displayName>ലക്സ്</displayName>
-				<unitPattern count="one">{0} ലക്സ്</unitPattern>
-				<unitPattern count="other">{0} ലക്സ്</unitPattern>
+				<unitPattern count="one">{0} lx</unitPattern>
+				<unitPattern count="other">{0} lx</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>സോളാർ ലുമിനോസിറ്റീസ്</displayName>
@@ -7839,8 +8013,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="mass-dalton">
 				<displayName>ഡാൽട്ടണുകൾ</displayName>
-				<unitPattern count="one">{0} ഡാ</unitPattern>
-				<unitPattern count="other">{0} ഡാ</unitPattern>
+				<unitPattern count="one">{0} Da</unitPattern>
+				<unitPattern count="other">{0} Da</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
 				<displayName>ഭൂപിണ്ഡം</displayName>
@@ -7884,9 +8058,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} എച്ച്.പി.</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName>മിമീ.മെ.</displayName>
-				<unitPattern count="one">{0} മിമീ.മെ.</unitPattern>
-				<unitPattern count="other">{0} മിമീ.മെ.</unitPattern>
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>പിഎസ്ഐ</displayName>
@@ -7894,9 +8068,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} പിഎസ്ഐ</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>ഇഞ്ച് മെ.</displayName>
-				<unitPattern count="one">{0} ഇഞ്ച് മെ.</unitPattern>
-				<unitPattern count="other">{0} ഇഞ്ച് മെ.</unitPattern>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<displayName>ബാർ</displayName>
@@ -7909,14 +8082,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} മി.ബാ</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
-				<displayName>പാ</displayName>
-				<unitPattern count="one">{0} പാ</unitPattern>
-				<unitPattern count="other">{0} പാ</unitPattern>
+				<unitPattern count="one">{0} Pa</unitPattern>
+				<unitPattern count="other">{0} Pa</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName>ഹെ.പാ.</displayName>
-				<unitPattern count="one">{0} ഹെ.പാ.</unitPattern>
-				<unitPattern count="other">{0} ഹെ.പാ.</unitPattern>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>കി.മീ/മ.</displayName>
@@ -7948,10 +8119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}° ഫാ</unitPattern>
 				<unitPattern count="other">{0}°ഫാ</unitPattern>
 			</unit>
-			<unit type="temperature-kelvin">
-				<unitPattern count="one">{0} K​</unitPattern>
-				<unitPattern count="other">{0} K</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>കി.മീ³</displayName>
 				<unitPattern count="one">{0} കി.മീ³</unitPattern>
@@ -8030,6 +8197,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} മെ. ക.</unitPattern>
 				<unitPattern count="other">{0} മെ. ക.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ഫ്ലൂ ഔ മെ.</displayName>
+				<unitPattern count="one">{0} ഫ്ലൂ ഔ മെ.</unitPattern>
+				<unitPattern count="other">{0} ഫ്ലൂ ഔ മെ.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ഏ. അടി</displayName>
 				<unitPattern count="one">{0} ഏ. അടി</unitPattern>
@@ -8095,8 +8267,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} നുള്ള്</unitPattern>
 				<unitPattern count="other">{0} നുള്ള്</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>പാർട്‌സ്/ബില്ല്യൺ</displayName>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>പ്രകാശം</displayName>
+				<unitPattern count="one">{0} പ്രകാശ</unitPattern>
+				<unitPattern count="other">{0} പ്രകാശ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>പാർട്ട്സ്/ബില്ല്യൺ</displayName>
 				<unitPattern count="one">{0} പി.പി.ബി.</unitPattern>
 				<unitPattern count="other">{0} പി.പി.ബി.</unitPattern>
 			</unit>
@@ -8115,14 +8295,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<compoundUnit type="10p3">
-				<unitPrefixPattern>കി.{0}</unitPrefixPattern>
-			</compoundUnit>
 			<unit type="acceleration-meter-per-square-second">
 				<displayName>മീ/സെ²</displayName>
 				<unitPattern count="one">{0}മീ/സെ²</unitPattern>
 				<unitPattern count="other">{0}മീ/സെ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>rev</displayName>
+				<unitPattern count="one">{0}rev</unitPattern>
+				<unitPattern count="other">{0}rev</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>rad</displayName>
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one">{0}′</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
@@ -8159,28 +8346,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ദുനം</displayName>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName>കാരറ്റ്</displayName>
-				<unitPattern count="one">{0} കാ.</unitPattern>
-				<unitPattern count="other">{0}കാ.</unitPattern>
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>പാർട്ട്</displayName>
+				<unitPattern count="one">{0} പാർട്ട്</unitPattern>
+				<unitPattern count="other">{0} പാർട്ട്</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>പാർട്ട്സ്/മില്ല്യൺ</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}ലി/100കി.മീ.</unitPattern>
 				<unitPattern count="other">{0}ലി/100കി.മീ</unitPattern>
 			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>mpg UK</displayName>
+				<unitPattern count="one">{0}m/gUK</unitPattern>
+				<unitPattern count="other">{0}m/gUK</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>PB</displayName>
+				<unitPattern count="one">{0}PB</unitPattern>
+				<unitPattern count="other">{0}PB</unitPattern>
+			</unit>
 			<unit type="digital-terabyte">
-				<displayName>ടിബി</displayName>
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0}Tb</unitPattern>
+				<unitPattern count="other">{0}Tb</unitPattern>
 			</unit>
 			<unit type="digital-gigabyte">
-				<displayName>ജിബി</displayName>
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
 			</unit>
 			<unit type="digital-megabyte">
-				<displayName>എംബി</displayName>
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0} Mb</unitPattern>
+				<unitPattern count="other">{0} Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
 			</unit>
 			<unit type="digital-kilobit">
-				<displayName>കെബി</displayName>
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0}B</unitPattern>
+				<unitPattern count="other">{0}B</unitPattern>
 			</unit>
 			<unit type="duration-decade">
 				<displayName>ദശാബ്‌ദം</displayName>
@@ -8210,6 +8455,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-nanosecond">
 				<displayName>നാ.സെ.</displayName>
 			</unit>
+			<unit type="electric-ampere">
+				<displayName>amp</displayName>
+				<unitPattern count="one">{0}A</unitPattern>
+				<unitPattern count="other">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>mA</displayName>
+				<unitPattern count="one">{0}mA</unitPattern>
+				<unitPattern count="other">{0}mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0}Ω</unitPattern>
+				<unitPattern count="other">{0}Ω</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>lbf</displayName>
+				<unitPattern count="one">{0}lbf</unitPattern>
+				<unitPattern count="other">{0}lbf</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>N</displayName>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0}GHz</unitPattern>
+				<unitPattern count="other">{0}GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0}kHz</unitPattern>
+				<unitPattern count="other">{0}kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
+			</unit>
 			<unit type="graphics-dot">
 				<displayName>ഡോട്ട്</displayName>
 				<unitPattern count="one">{0} ഡോട്ട്</unitPattern>
@@ -8273,8 +8560,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}പോ.</unitPattern>
 				<unitPattern count="other">{0}പോ.</unitPattern>
 			</unit>
+			<unit type="light-lux">
+				<unitPattern count="one">{0}lx</unitPattern>
+				<unitPattern count="other">{0}lx</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<unitPattern count="one">{0}cd</unitPattern>
+				<unitPattern count="other">{0}cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<unitPattern count="one">{0}lm</unitPattern>
+				<unitPattern count="other">{0}lm</unitPattern>
+			</unit>
 			<unit type="light-solar-luminosity">
-				<displayName>സോളാർ ലുമിനോസൈട്സ്</displayName>
+				<displayName>L☉</displayName>
+				<unitPattern count="one">{0}L☉</unitPattern>
+				<unitPattern count="other">{0}L☉</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
 				<unitPattern count="one">{0}ട.</unitPattern>
@@ -8308,12 +8609,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ഔ</unitPattern>
 			</unit>
 			<unit type="mass-carat">
-				<displayName>കാരറ്റ്</displayName>
 				<unitPattern count="one">{0}CD</unitPattern>
 				<unitPattern count="other">{0}CD</unitPattern>
 			</unit>
 			<unit type="mass-dalton">
 				<displayName>ഡാ.</displayName>
+				<unitPattern count="one">{0}Da</unitPattern>
+				<unitPattern count="other">{0}Da</unitPattern>
 			</unit>
 			<unit type="mass-earth-mass">
 				<displayName>M⊕</displayName>
@@ -8333,10 +8635,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} വാ</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<unitPattern count="one">{0}മിമീ.മെ.</unitPattern>
-				<unitPattern count="other">{0}മിമീ.മെ.</unitPattern>
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0}mmHg</unitPattern>
+				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
+				<displayName>″ Hg</displayName>
 				<unitPattern count="one">{0}&quot; Hg</unitPattern>
 				<unitPattern count="other">{0}&quot; Hg</unitPattern>
 			</unit>
@@ -8348,9 +8652,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} മിബാ</unitPattern>
 				<unitPattern count="other">{0} മിബാ</unitPattern>
 			</unit>
+			<unit type="pressure-atmosphere">
+				<unitPattern count="one">{0}atm</unitPattern>
+				<unitPattern count="other">{0}atm</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>Pa</displayName>
+				<unitPattern count="one">{0}Pa</unitPattern>
+				<unitPattern count="other">{0}Pa</unitPattern>
+			</unit>
 			<unit type="pressure-hectopascal">
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0}hPa</unitPattern>
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<unitPattern count="one">{0}kPa</unitPattern>
+				<unitPattern count="other">{0}kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0}MPa</unitPattern>
+				<unitPattern count="other">{0}MPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<unitPattern count="one">{0}കി.മീ/മ.</unitPattern>
@@ -8382,10 +8704,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}K</unitPattern>
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
+			<unit type="torque-pound-force-foot">
+				<unitPattern count="one">{0}lbf⋅ft</unitPattern>
+				<unitPattern count="other">{0}lbf⋅ft</unitPattern>
+			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0} കിമീ³</unitPattern>
 				<unitPattern count="other">{0} കിമീ³</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ഫ്ലൂ ഔ മെ.</displayName>
+				<unitPattern count="one">{0} ഫ്ലൂ ഔ മെ.</unitPattern>
+				<unitPattern count="other">{0} ഫ്ലൂ ഔ മെ.</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} പറ</unitPattern>
 				<unitPattern count="other">{0} bu</unitPattern>
@@ -8414,16 +8745,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}fl.dr.</unitPattern>
 				<unitPattern count="other">{0}fl.dr.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>പ്രകാശം</displayName>
+				<unitPattern count="one">{0}പ്രകാശ</unitPattern>
+				<unitPattern count="other">{0}പ്രകാശ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>പി.പി.ബി.</displayName>
 				<unitPattern count="one">{0}പി.പി.ബി.</unitPattern>
 				<unitPattern count="other">{0}പി.പി.ബി.</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>രാത്രികൾ</displayName>
 				<unitPattern count="one">{0}രാത്രി</unitPattern>
 				<unitPattern count="other">{0}രാത്രികൾ</unitPattern>
-				<perUnitPattern>{0}/രാത്രി</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}കി.</coordinateUnitPattern>
@@ -8434,10 +8771,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</unitLength>
 	</units>
 	<listPatterns>
-		<listPattern>
-			<listPatternPart type="end">{0}, {1} എന്നിവ</listPatternPart>
-			<listPatternPart type="2">{0} കൂടാതെ {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="or">
 			<listPatternPart type="end">{0}, അല്ലെങ്കിൽ {1}</listPatternPart>
 			<listPatternPart type="2">{0} അല്ലെങ്കിൽ {1}</listPatternPart>
@@ -8445,6 +8778,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<listPattern type="standard-narrow">
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
 			<listPatternPart type="middle">{0} {1}</listPatternPart>
diff --git a/make/data/cldr/common/main/mn.xml b/make/data/cldr/common/main/mn.xml
index c2ef8bb91ce..2e0da3f352f 100644
--- a/make/data/cldr/common/main/mn.xml
+++ b/make/data/cldr/common/main/mn.xml
@@ -44,6 +44,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">азербайжан</language>
 			<language type="az" alt="short">азери</language>
 			<language type="ba">башкир</language>
+			<language type="bal">балучи</language>
 			<language type="ban">бали</language>
 			<language type="bas">басаа</language>
 			<language type="be">беларусь</language>
@@ -99,7 +100,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="dar">даргва</language>
 			<language type="dav">тайта</language>
 			<language type="de">герман</language>
-			<language type="de_CH">герман (Швейцар)</language>
 			<language type="dgr">догриб</language>
 			<language type="dje">зарма</language>
 			<language type="doi">догри</language>
@@ -135,7 +135,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="fo">фарер</language>
 			<language type="fon">фон</language>
 			<language type="fr">франц</language>
-			<language type="fr_CH">франц (Швейцар)</language>
 			<language type="frc">франц, кажун</language>
 			<language type="frr">хойд фриз</language>
 			<language type="fur">фриулан</language>
@@ -225,6 +224,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафиа</language>
 			<language type="ksh">кёльш</language>
 			<language type="ku">курд</language>
+			<language type="ku" menu="core">курд</language>
+			<language type="ku" menu="extension">курманжи</language>
 			<language type="kum">кумук</language>
 			<language type="kv">коми</language>
 			<language type="kw">корн</language>
@@ -738,6 +739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Хятад</territory>
 			<territory type="CO">Колумби</territory>
 			<territory type="CP">Клиппертон арал</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -973,57 +975,94 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">мөнгөн тэмдэгтийн хэлбэр</key>
 			<key type="collation">эрэмбэлэх дараалал</key>
 			<key type="currency">мөнгөн тэмдэгт</key>
+			<key type="em">Эможи үзүүлэн</key>
 			<key type="hc">цагийн мөчлөг (12 эсвэл 24)</key>
 			<key type="lb">мөрийн зайн загвар</key>
+			<key type="lw">үг хоорондын мөрийн зай</key>
 			<key type="ms">нэгжийн систем</key>
 			<key type="numbers">тоо</key>
+			<key type="ss">Товчилсон үгийн дараа өгүүлбэр таслах</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">буддын цаглавар</type>
+			<type key="calendar" type="buddhist" scope="core">буддын</type>
 			<type key="calendar" type="chinese">хятад цаглавар</type>
+			<type key="calendar" type="chinese" scope="core">хятадын</type>
 			<type key="calendar" type="coptic">коптик цаглавар</type>
+			<type key="calendar" type="coptic" scope="core">коптик</type>
 			<type key="calendar" type="dangi">данги цаглавар</type>
+			<type key="calendar" type="dangi" scope="core">данги</type>
 			<type key="calendar" type="ethiopic">этиоп цаглавар</type>
+			<type key="calendar" type="ethiopic" scope="core">этиоп</type>
 			<type key="calendar" type="ethiopic-amete-alem">этиоп цаглавар</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">этиоп</type>
 			<type key="calendar" type="gregorian">грегорийн цаглавар</type>
+			<type key="calendar" type="gregorian" scope="core">грегорийн</type>
 			<type key="calendar" type="hebrew">еврей цаглавар</type>
+			<type key="calendar" type="hebrew" scope="core">еврей</type>
 			<type key="calendar" type="indian">энэтхэгийн үндэсний цаглавар</type>
 			<type key="calendar" type="islamic">исламын цаглавар</type>
+			<type key="calendar" type="islamic" scope="core">исламын</type>
 			<type key="calendar" type="islamic-civil">исламын цаглавар (хүснэгт, иргэний эрин үе)</type>
+			<type key="calendar" type="islamic-civil" scope="core">исламын (хүснэгт, иргэний эрин үе)</type>
 			<type key="calendar" type="islamic-rgsa">исламийн цаглавар (саудын араб, газарзүйн)</type>
 			<type key="calendar" type="islamic-tbla">исламийн цаглавар (хүснэгтэн, одон орны эрин)</type>
 			<type key="calendar" type="islamic-umalqura">исламын цаглавар (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">исламын (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 цаглавар</type>
 			<type key="calendar" type="japanese">япон цаглавар</type>
+			<type key="calendar" type="japanese" scope="core">японы</type>
 			<type key="calendar" type="persian">перс цаглавар</type>
+			<type key="calendar" type="persian" scope="core">персийн</type>
 			<type key="calendar" type="roc">минго цаглавар</type>
+			<type key="calendar" type="roc" scope="core">минго</type>
 			<type key="cf" type="account">мөнгөн тэмдэгтийн нягтлан бодох бүртгэлийн хэлбэр</type>
+			<type key="cf" type="account" scope="core">Нягтлан бодох бүртгэл</type>
 			<type key="cf" type="standard">мөнгөн тэмдэгтийн стандарт хэлбэр</type>
-			<type key="collation" type="big5han">Хуучин хятад Эрэмбэлэх дараалал - Том5</type>
+			<type key="cf" type="standard" scope="core">Стандарт</type>
 			<type key="collation" type="compat">Нийцлийн үүднээс өмнөх эрэмбэлэх дараалал</type>
 			<type key="collation" type="dictionary">Тольны эрэмбэлэх дараалал</type>
 			<type key="collation" type="ducet">юникодын үндсэн эрэмбэлэх дараалал</type>
+			<type key="collation" type="ducet" scope="core">өгөгдмөл юникод</type>
 			<type key="collation" type="emoji">Эможи эрэмбэлэх дараалал</type>
 			<type key="collation" type="eor">Европийн эрэмбэлэх дүрэм</type>
-			<type key="collation" type="gb2312han">Хялбаршуулсан хятад Эрэмбэлэх дараалал - GB2312</type>
 			<type key="collation" type="phonebook">Утасны дэвтрийн эрэмбэлэх дараалал</type>
 			<type key="collation" type="pinyin">Пиньян эрэмбэлэх дараалал</type>
 			<type key="collation" type="search">ерөнхий хайлт</type>
+			<type key="collation" type="search" scope="core">хайлт</type>
 			<type key="collation" type="searchjl">Хангүлээр эхний гийгүүлэгчээр хайх</type>
 			<type key="collation" type="standard">стандарт эрэмбэлэх дараалал</type>
+			<type key="collation" type="standard" scope="core">стандарт</type>
 			<type key="collation" type="traditional">Хуучин эрэмбэлэх дараалал</type>
 			<type key="collation" type="unihan">Язгуурын зураасны эрэмбэлэх дараалал</type>
 			<type key="collation" type="zhuyin">Жүяин эрэмбэлэх дараалал</type>
+			<type key="em" type="default" scope="core">Өгөгдмөл</type>
+			<type key="em" type="emoji" scope="core">Эможи</type>
+			<type key="em" type="text" scope="core">Текст</type>
 			<type key="hc" type="h11">12 цагийн систем (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 цагийн систем (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 цагийн систем (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 цагийн систем (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">урт мөрийн зайн загвар</type>
+			<type key="lb" type="loose" scope="core">урт</type>
 			<type key="lb" type="normal">энгийн мөрийн зайн загвар</type>
+			<type key="lb" type="normal" scope="core">энгийн</type>
 			<type key="lb" type="strict">шулуун мөрийн зайн загвар</type>
+			<type key="lb" type="strict" scope="core">шулуун</type>
+			<type key="lw" type="breakall" scope="core">Бүгдийг таслах</type>
+			<type key="lw" type="keepall" scope="core">Бүгдийг хадгалах</type>
+			<type key="lw" type="normal" scope="core">Хэвийн</type>
+			<type key="lw" type="phrase" scope="core">Үг хэллэгээр хадгалах</type>
 			<type key="ms" type="metric">метрийн систем</type>
+			<type key="ms" type="metric" scope="core">метрийн</type>
 			<type key="ms" type="uksystem">Англи нэгжийн систем</type>
+			<type key="ms" type="uksystem" scope="core">Англи</type>
 			<type key="ms" type="ussystem">Америк нэгжийн систем</type>
+			<type key="ms" type="ussystem" scope="core">Америк</type>
 			<type key="numbers" type="ahom">Ахом тоо</type>
 			<type key="numbers" type="arab">араб-энэтхэг тоо</type>
 			<type key="numbers" type="arabext">өргөтгөсөн араб-энэтхэг тоо</type>
@@ -1106,6 +1145,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">вай тоо</type>
 			<type key="numbers" type="wara">Варанг сити тоо</type>
 			<type key="numbers" type="wcho">Ванчо тоо</type>
+			<type key="ss" type="none" scope="core">Унтраалттай</type>
+			<type key="ss" type="standard" scope="core">Асаалттай</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрийн систем</measurementSystemName>
@@ -1218,6 +1259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h 'ц'</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">B E h 'ц'</dateFormatItem>
 						<dateFormatItem id="EBhm">E. B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E. B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">dd. E</dateFormatItem>
@@ -1225,7 +1267,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EHm">E. HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E. h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E. HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">G y.MM</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG y.MM.dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, y.MM.dd G</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y 'оны' MM-'р' 'сар'</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y 'оны' MM-'р' 'сарын' d</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y 'оны' MM-'р' 'сарын' d, E</dateFormatItem>
@@ -1233,6 +1277,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">HH 'ц'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH'ц' v</dateFormatItem>
 						<dateFormatItem id="M">LLLLL</dateFormatItem>
 						<dateFormatItem id="Md">MMMMM/dd</dateFormatItem>
 						<dateFormatItem id="MEd">MMMMM/dd. E</dateFormatItem>
@@ -1571,6 +1616,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">HH:mm:ss (v)</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a (v)</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH'ц' v</dateFormatItem>
 						<dateFormatItem id="M">LLLLL</dateFormatItem>
 						<dateFormatItem id="Md">MMMMM/dd</dateFormatItem>
 						<dateFormatItem id="MEd">MMMMM/dd. E</dateFormatItem>
@@ -2417,6 +2463,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Истер</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Койайкэ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта Арена</exemplarCity>
 			</zone>
@@ -2508,7 +2557,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Мадрид</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Аддис-Aбеба</exemplarCity>
+				<exemplarCity>Аддис-Абеба</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
 				<exemplarCity>Хельсинк</exemplarCity>
@@ -2682,9 +2731,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3354,9 +3400,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Баруун Африкийн цаг</generic>
-					<standard>Баруун Африкийн стандарт цаг</standard>
-					<daylight>Баруун Африкийн зуны цаг</daylight>
+					<standard>Баруун Африкийн цаг</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3706,6 +3750,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гайанагийн цаг</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавай-Алеутын стандарт цаг</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавай-Алеутын цаг</generic>
@@ -4242,12 +4291,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one">0 мянга</pattern>
-					<pattern type="1000" count="other">0 мянга</pattern>
-					<pattern type="10000" count="one">00 мянга</pattern>
-					<pattern type="10000" count="other">00 мянга</pattern>
-					<pattern type="100000" count="one">000 мянга</pattern>
-					<pattern type="100000" count="other">000 мянга</pattern>
+					<pattern type="1000" count="one">0 мян'.'</pattern>
+					<pattern type="1000" count="other">0 мян</pattern>
+					<pattern type="10000" count="one">00 мян'.'</pattern>
+					<pattern type="10000" count="other">00 мян</pattern>
+					<pattern type="100000" count="one">000 мян'.'</pattern>
+					<pattern type="100000" count="other">000 мян</pattern>
 					<pattern type="1000000" count="one">0 сая</pattern>
 					<pattern type="1000000" count="other">0 сая</pattern>
 					<pattern type="10000000" count="one">00 сая</pattern>
@@ -4269,48 +4318,526 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ 0 мянга</pattern>
-					<pattern type="1000" count="other">¤ 0 мянга</pattern>
-					<pattern type="10000" count="one">¤ 00 мянга</pattern>
-					<pattern type="10000" count="other">¤ 00 мянга</pattern>
-					<pattern type="100000" count="one">¤000 мянга</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">000 мянган ¤</pattern>
-					<pattern type="100000" count="other">¤000 мянга</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">000 мянган ¤</pattern>
-					<pattern type="1000000" count="one">¤0 сая</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber">0 сая ¤</pattern>
-					<pattern type="1000000" count="other">¤0 сая</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">0 сая ¤</pattern>
-					<pattern type="10000000" count="one">¤00 сая</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">00 сая ¤</pattern>
-					<pattern type="10000000" count="other">¤00 сая</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">00 сая ¤</pattern>
-					<pattern type="100000000" count="one">¤000 сая</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber">000 сая ¤</pattern>
-					<pattern type="100000000" count="other">¤000 сая</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">000 сая ¤</pattern>
-					<pattern type="1000000000" count="one">¤0 тэрбум</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">0 тэрбум ¤</pattern>
-					<pattern type="1000000000" count="other">¤0 тэрбум</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0 тэрбум ¤</pattern>
+					<pattern type="1000" count="one">¤ 0 мян'.'</pattern>
+					<pattern type="1000" count="other">¤ 0 мян</pattern>
+					<pattern type="10000" count="one">¤ 00 мян'.'</pattern>
+					<pattern type="10000" count="other">¤ 00 мян</pattern>
+					<pattern type="100000" count="one">¤ 000 мян'.'</pattern>
+					<pattern type="100000" count="other">¤ 000 мян</pattern>
+					<pattern type="1000000" count="one">¤ 0 сая</pattern>
+					<pattern type="1000000" count="other">¤ 0 сая</pattern>
+					<pattern type="10000000" count="one">¤ 00 сая</pattern>
+					<pattern type="10000000" count="other">¤ 00 сая</pattern>
+					<pattern type="100000000" count="one">¤ 000 сая</pattern>
+					<pattern type="100000000" count="other">¤ 000 сая</pattern>
+					<pattern type="1000000000" count="one">¤ 0 тэрбум</pattern>
+					<pattern type="1000000000" count="other">¤ 0 тэрбум</pattern>
 					<pattern type="10000000000" count="one">¤ 00 тэрбум</pattern>
 					<pattern type="10000000000" count="other">¤ 00 тэрбум</pattern>
-					<pattern type="100000000000" count="one">¤ 000 тэрбум</pattern>
-					<pattern type="100000000000" count="other">¤ 000 тэрбум</pattern>
-					<pattern type="1000000000000" count="one">¤ 0 их наяд</pattern>
-					<pattern type="1000000000000" count="other">¤ 0 их наяд</pattern>
-					<pattern type="10000000000000" count="one">¤ 00 их наяд</pattern>
-					<pattern type="10000000000000" count="other">¤ 00 их наяд</pattern>
-					<pattern type="100000000000000" count="one">¤ 000 их наяд</pattern>
-					<pattern type="100000000000000" count="other">¤ 000 их наяд</pattern>
+					<pattern type="100000000000" count="one">¤ 000Т</pattern>
+					<pattern type="100000000000" count="other">¤ 000Т</pattern>
+					<pattern type="1000000000000" count="one">¤ 0ИН</pattern>
+					<pattern type="1000000000000" count="other">¤ 0ИН</pattern>
+					<pattern type="10000000000000" count="one">¤ 00ИН</pattern>
+					<pattern type="10000000000000" count="other">¤ 00ИН</pattern>
+					<pattern type="100000000000000" count="one">¤ 000ИН</pattern>
+					<pattern type="100000000000000" count="other">¤ 000ИН</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4799,6 +5326,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Зүүн Карибийн доллар</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Карибын гулдер</displayName>
+				<displayName count="one">Карибын гулдер</displayName>
+				<displayName count="other">Карибын гулдер</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Баруун Африкийн франк</displayName>
 			</currency>
@@ -4822,6 +5354,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>Замбийн квача</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабвегийн гоулд</displayName>
+				<displayName count="one">Зимбабвегийн гоулд</displayName>
+				<displayName count="other">Зимбабвегийн гоулд</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">Картанд {0} Х байна. Үүнийг авах уу?</pluralMinimalPairs>
@@ -5005,7 +5542,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">литр тутамд {0} миллимоль</unitPattern>
 				<unitPattern count="other">литр тутамд {0} миллимоль</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>саяны хувь</displayName>
 				<unitPattern count="one">саяны {0} хувь</unitPattern>
 				<unitPattern count="other">саяны {0} хувь</unitPattern>
@@ -5022,6 +5559,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">арван мянганы {0} хувь</unitPattern>
 				<unitPattern count="other">арван мянганы {0} хувь</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоз</displayName>
+				<unitPattern count="one">{0} глюкоз</unitPattern>
+				<unitPattern count="other">{0} глюкоз</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>километр тутамд ногдох литр</displayName>
 				<unitPattern count="one">километр тутамд {0} литр</unitPattern>
@@ -5224,11 +5766,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} пиксель/инч</unitPattern>
 				<unitPattern count="other">{0} пиксель/инч</unitPattern>
 			</unit>
-			<unit type="graphics-dot-per-inch">
-				<displayName>цэг/инч</displayName>
-				<unitPattern count="one">{0} цэг/инч</unitPattern>
-				<unitPattern count="other">{0} цэг/инч</unitPattern>
-			</unit>
 			<unit type="length-earth-radius">
 				<displayName>дэлхийн радиус</displayName>
 				<unitPattern count="one">{0} дэлхийн радиус</unitPattern>
@@ -5321,11 +5858,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} кандел</unitPattern>
 				<unitPattern count="other">{0} кандел</unitPattern>
 			</unit>
-			<unit type="light-lumen">
-				<displayName>люмен</displayName>
-				<unitPattern count="one">{0} люмен</unitPattern>
-				<unitPattern count="other">{0} люмен</unitPattern>
-			</unit>
 			<unit type="light-solar-luminosity">
 				<unitPattern count="one">{0} нарны гэрлийн урсгал</unitPattern>
 				<unitPattern count="other">{0} нарны гэрлийн урсгал</unitPattern>
@@ -5652,13 +6184,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>Том куарт</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>стерадиан</displayName>
+				<unitPattern count="one">{0} стерадиан</unitPattern>
+				<unitPattern count="other">{0} стерадиан</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>катал</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="other">{0} катал</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулон</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарад</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="other">{0} фарад</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генри</displayName>
+				<unitPattern count="one">{0} генри</unitPattern>
+				<unitPattern count="other">{0} генри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>зименс</displayName>
+				<unitPattern count="one">{0} зименс</unitPattern>
+				<unitPattern count="other">{0} зименс</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калори [IT]</displayName>
+				<unitPattern count="one">{0} калори [IT]</unitPattern>
+				<unitPattern count="other">{0} калори [IT]</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограмм-хүч</displayName>
+				<unitPattern count="one">{0} килограмм-хүч</unitPattern>
+				<unitPattern count="other">{0} килограмм-хүч</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесла</displayName>
+				<unitPattern count="one">{0} тесла</unitPattern>
+				<unitPattern count="other">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебер</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="other">{0} вебер</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>гэрэл</displayName>
+				<unitPattern count="one">{0} гэрэл</unitPattern>
+				<unitPattern count="other">{0} гэрэл</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>мкг/кг</displayName>
 				<unitPattern count="one">{0} мкг/кг</unitPattern>
 				<unitPattern count="other">{0} мкг/кг</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>шөнө</displayName>
 				<unitPattern count="one">{0} шөнө</unitPattern>
 				<unitPattern count="other">{0} шөнө</unitPattern>
 				<perUnitPattern>{0}/шөнөдөө</perUnitPattern>
@@ -5863,7 +6447,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} зүйл</unitPattern>
 				<unitPattern count="other">{0} зүйл</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>хувь/сая</displayName>
 				<unitPattern count="one">саяны {0} хувь</unitPattern>
 				<unitPattern count="other">{0}x10⁻⁶</unitPattern>
@@ -5882,6 +6466,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} моль</unitPattern>
 				<unitPattern count="other">{0} моль</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литр/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -6616,7 +7203,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} том куарт</unitPattern>
 				<unitPattern count="other">{0} том куарт</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>кал-IT</displayName>
+				<unitPattern count="one">{0} кал-IT</unitPattern>
+				<unitPattern count="other">{0} кал-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>гэрэл</displayName>
+				<unitPattern count="one">{0} гэрэл</unitPattern>
+				<unitPattern count="other">{0} гэрэл</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>мкг/кг</displayName>
 				<unitPattern count="one">{0} мкг/кг</unitPattern>
 				<unitPattern count="other">{0} мкг/кг</unitPattern>
@@ -6660,7 +7266,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} фт²</unitPattern>
 				<unitPattern count="other">{0} фт²</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -6674,6 +7280,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
 			</unit>
@@ -6711,11 +7320,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}кВт.ц/100км</unitPattern>
 				<unitPattern count="other">{0}кВт.ц/100км</unitPattern>
 			</unit>
-			<unit type="graphics-dot-per-inch">
-				<displayName>цэг/инч</displayName>
-				<unitPattern count="one">{0} цэг/инч</unitPattern>
-				<unitPattern count="other">{0} цэг/инч</unitPattern>
-			</unit>
 			<unit type="graphics-dot">
 				<unitPattern count="one">{0}цэг</unitPattern>
 				<unitPattern count="other">{0}цэг</unitPattern>
@@ -6736,7 +7340,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName>о.о.н</displayName>
 				<unitPattern count="one">{0}о.о.н</unitPattern>
 				<unitPattern count="other">{0}о.о.н</unitPattern>
 			</unit>
@@ -6756,11 +7359,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} кандел</unitPattern>
 				<unitPattern count="other">{0} кандел</unitPattern>
 			</unit>
-			<unit type="light-lumen">
-				<displayName>люмен</displayName>
-				<unitPattern count="one">{0} люмен</unitPattern>
-				<unitPattern count="other">{0} люмен</unitPattern>
-			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>L☉</displayName>
 			</unit>
@@ -6827,7 +7425,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} аяга</unitPattern>
 				<unitPattern count="other">{0} аяга</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>кал-IT</displayName>
+				<unitPattern count="one">{0} кал-IT</unitPattern>
+				<unitPattern count="other">{0} кал-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>гэрэл</displayName>
+				<unitPattern count="one">{0} гэрэл</unitPattern>
+				<unitPattern count="other">{0} гэрэл</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>мкг/кг</displayName>
 				<unitPattern count="one">{0} мкг/кг</unitPattern>
 				<unitPattern count="other">{0} мкг/кг</unitPattern>
diff --git a/make/data/cldr/common/main/mr.xml b/make/data/cldr/common/main/mr.xml
index d5548854883..5d98e5aa5c1 100644
--- a/make/data/cldr/common/main/mr.xml
+++ b/make/data/cldr/common/main/mr.xml
@@ -282,11 +282,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="krc">कराचय-बाल्कर</language>
 			<language type="krl">करेलियन</language>
 			<language type="kru">कुरूख</language>
-			<language type="ks">काश्मीरी</language>
+			<language type="ks">काश्मिरी</language>
 			<language type="ksb">शांबाला</language>
 			<language type="ksf">बाफिया</language>
 			<language type="ksh">कोलोग्नियन</language>
 			<language type="ku">कुर्दिश</language>
+			<language type="ku" menu="core">कुर्दिश</language>
+			<language type="ku" menu="extension">कुरमंजी</language>
 			<language type="kum">कुमीक</language>
 			<language type="kut">कुतेनाई</language>
 			<language type="kv">कोमी</language>
@@ -764,7 +766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="419">लॅटिन अमेरिका</territory>
 			<territory type="AC">अ‍ॅसेन्शियन बेट</territory>
 			<territory type="AD">अँडोरा</territory>
-			<territory type="AE">संयुक्त अरब अमीरात</territory>
+			<territory type="AE">संयुक्त अरब अमिराती</territory>
 			<territory type="AF">अफगाणिस्तान</territory>
 			<territory type="AG">अँटिग्वा आणि बर्बुडा</territory>
 			<territory type="AI">अँग्विला</territory>
@@ -816,6 +818,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">चीन</territory>
 			<territory type="CO">कोलम्बिया</territory>
 			<territory type="CP">क्लिपरटोन बेट</territory>
+			<territory type="CQ">सार्क</territory>
 			<territory type="CR">कोस्टा रिका</territory>
 			<territory type="CU">क्यूबा</territory>
 			<territory type="CV">केप व्हर्डे</territory>
@@ -1052,43 +1055,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</variants>
 		<keys>
 			<key type="calendar">दिनदर्शिका</key>
-			<key type="cf">चलन स्वरुप</key>
+			<key type="cf">चलन स्वरूप</key>
 			<key type="colAlternate">प्रतीक क्रमवारीकडे दुर्लक्ष करा</key>
 			<key type="colBackwards">उलट उच्चार क्रमवारी</key>
 			<key type="colCaseFirst">अपरकेस/लोअरकेस क्रम</key>
 			<key type="colCaseLevel">केस संवेदी क्रमवारी</key>
-			<key type="collation">क्रमवारी क्रम</key>
+			<key type="collation">वर्गवारी क्रम</key>
 			<key type="colNormalization">सामान्य क्रमवारी</key>
 			<key type="colNumeric">अंकीय क्रमवारी</key>
 			<key type="colStrength">क्रमवारी सामर्थ्य</key>
 			<key type="currency">चलन</key>
+			<key type="em">इमोजी सादरीकरण</key>
 			<key type="hc">तास चक्र (12 वि 24)</key>
-			<key type="lb">लाइन ब्रेक शैली</key>
+			<key type="lb">लाइन ब्रेक स्ट्रिक्टनेस</key>
+			<key type="lw">शब्दांमधील लाईन ब्रेक</key>
 			<key type="ms">मापन पद्धती</key>
 			<key type="numbers">संख्या</key>
+			<key type="ss">संक्षिप्त रूपानंतर वाक्य खंड</key>
 			<key type="timezone">टाइम झोन</key>
 			<key type="va">लोकेल व्हेरियंट</key>
 			<key type="x">खासगी-वापर</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">बौद्ध दिनदर्शिका</type>
+			<type key="calendar" type="buddhist" scope="core">बौद्ध</type>
 			<type key="calendar" type="chinese">चीनी दिनदर्शिका</type>
+			<type key="calendar" type="chinese" scope="core">चीनी</type>
 			<type key="calendar" type="coptic">कॉप्टिक दिनदर्शिका</type>
+			<type key="calendar" type="coptic" scope="core">कॉप्टिक</type>
 			<type key="calendar" type="dangi">डांगी दिनदर्शिका</type>
+			<type key="calendar" type="dangi" scope="core">डांगी</type>
 			<type key="calendar" type="ethiopic">इथिओपिक दिनदर्शिका</type>
+			<type key="calendar" type="ethiopic" scope="core">इथिओपिक</type>
 			<type key="calendar" type="ethiopic-amete-alem">इथियोपिक अमेते अलेम दिनदर्शिका</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">इथिओपिक अमेते अलेम</type>
 			<type key="calendar" type="gregorian">ग्रेगोरियन दिनदर्शिका</type>
+			<type key="calendar" type="gregorian" scope="core">ग्रेगोरियन</type>
 			<type key="calendar" type="hebrew">यहूदी दिनदर्शिका</type>
+			<type key="calendar" type="hebrew" scope="core">हिब्रू</type>
 			<type key="calendar" type="indian">भारतीय राष्ट्रीय दिनदर्शिका</type>
+			<type key="calendar" type="indian" scope="core">भारतीय राष्ट्रीय</type>
 			<type key="calendar" type="islamic">हिजरी दिनदर्शिका</type>
+			<type key="calendar" type="islamic" scope="core">हिजरी</type>
 			<type key="calendar" type="islamic-civil">हिजरी दिनदर्शिका (टॅब्युलर, सिव्हील ईपॉक्)</type>
+			<type key="calendar" type="islamic-civil" scope="core">हिजरी (सारणीबद्ध, नागरी कालखंड)</type>
 			<type key="calendar" type="islamic-umalqura">हिजरी दिनदर्शिका (उम-अल-कुरा)</type>
-			<type key="calendar" type="iso8601">(ISO-8601) दिनदर्शिका</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">हिजरी (उम-अल-कुरा)</type>
+			<type key="calendar" type="iso8601">ग्रेगोरियन दिनदर्शिका (प्रथम वर्ष)</type>
 			<type key="calendar" type="japanese">जपानी दिनदर्शिका</type>
+			<type key="calendar" type="japanese" scope="core">जपानी</type>
 			<type key="calendar" type="persian">फारसी दिनदर्शिका</type>
-			<type key="calendar" type="roc">मिनगुओ दिनदर्शिका</type>
+			<type key="calendar" type="persian" scope="core">फारसी</type>
+			<type key="calendar" type="roc">मिनगुओ वर्ष</type>
+			<type key="calendar" type="roc" scope="core">मिंग्वो</type>
 			<type key="cf" type="account">अकाउंटिंग चलन स्वरूप</type>
-			<type key="cf" type="standard">प्रमाणित चलन स्वरुप</type>
+			<type key="cf" type="account" scope="core">अकाउंटिंग</type>
+			<type key="cf" type="standard">प्रमाणित चलन स्वरूप</type>
+			<type key="cf" type="standard" scope="core">प्रमाणित</type>
 			<type key="colAlternate" type="non-ignorable">प्रतीकांची क्रमवारी लावा</type>
 			<type key="colAlternate" type="shifted">दुर्लक्षित प्रतीकांची क्रमवारी लावा</type>
 			<type key="colBackwards" type="no">सामान्यपणे उच्चार क्रमवारी करा</type>
@@ -1098,18 +1121,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">प्रथम अपरकेस क्रमवारी लावा</type>
 			<type key="colCaseLevel" type="no">केस संवेदी क्रमवारी लावा</type>
 			<type key="colCaseLevel" type="yes">केस संवेदी क्रमवारी लावा</type>
-			<type key="collation" type="big5han">पारंपारिक चिनी क्रमवारी क्रम - Big5</type>
 			<type key="collation" type="compat" draft="contributed">अनुकूलतेसाठी आधीची क्रमवारी</type>
 			<type key="collation" type="dictionary">शब्दकोश अनुक्रम</type>
 			<type key="collation" type="ducet">डीफॉल्ट युनिकोड क्रमवारी क्रम</type>
+			<type key="collation" type="ducet" scope="core">डिफॉल्ट युनिकोड</type>
 			<type key="collation" type="eor" draft="contributed">युरोपियन क्रमवारी नियम</type>
-			<type key="collation" type="gb2312han">सरलीकृत चिनी क्रमवारी क्रम - GB2312</type>
 			<type key="collation" type="phonebook">फोनबुक अनुक्रम</type>
 			<type key="collation" type="phonetic">ध्वनीविचार क्रमवारी क्रम</type>
 			<type key="collation" type="pinyin">पिनयिन अनुक्रम</type>
-			<type key="collation" type="search">सामान्य हेतु शोध</type>
+			<type key="collation" type="search">सामान्य हेतू शोध</type>
+			<type key="collation" type="search" scope="core">शोध</type>
 			<type key="collation" type="searchjl">हँगुल प्रारंभिक व्यंजनानुसार शोधा</type>
 			<type key="collation" type="standard">प्रमाणित क्रमवारी क्रम</type>
+			<type key="collation" type="standard" scope="core">प्रमाणित</type>
 			<type key="collation" type="stroke">स्ट्रोक अनुक्रम</type>
 			<type key="collation" type="traditional">पारंपारिक अनुक्रम</type>
 			<type key="collation" type="unihan">रॅडिकल-स्ट्रोक अनुक्रम</type>
@@ -1125,22 +1149,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">पूर्णरुंदी</type>
 			<type key="d0" type="hwidth">अर्धीरुंदी</type>
 			<type key="d0" type="npinyin">अंकीय</type>
+			<type key="em" type="default" scope="core">डीफॉल्ट</type>
+			<type key="em" type="emoji" scope="core">इमोजी</type>
+			<type key="em" type="text" scope="core">मजकूर</type>
 			<type key="hc" type="h11">12 तास पद्धती (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 तास पद्धती (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 तास पद्धती (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 तास पद्धती (1–24)</type>
-			<type key="lb" type="loose">ढिली लाइन ब्रेक शैली</type>
-			<type key="lb" type="normal">सामान्य लाइन ब्रेक शैली</type>
-			<type key="lb" type="strict">काटेकोर लाइन ब्रेक</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">लूज लाइन ब्रेक स्टाइल</type>
+			<type key="lb" type="loose" scope="core">लूज</type>
+			<type key="lb" type="normal">नॉर्मल लाइन ब्रेक स्टाइल</type>
+			<type key="lb" type="normal" scope="core">नॉर्मल</type>
+			<type key="lb" type="strict">स्ट्रिक्ट लाइन ब्रेक स्टाइल</type>
+			<type key="lb" type="strict" scope="core">स्ट्रिक्ट</type>
+			<type key="lw" type="breakall" scope="core">ब्रेक ऑल</type>
+			<type key="lw" type="keepall" scope="core">कीप ऑल</type>
+			<type key="lw" type="normal" scope="core">नॉर्मल</type>
+			<type key="lw" type="phrase" scope="core">कीप इन फ्रेझेस</type>
 			<type key="m0" type="bgn">यूएस बीजीएन लिप्यंतरण</type>
 			<type key="m0" type="ungegn">यूएन जीईजीएन लिप्यंतरण</type>
 			<type key="ms" type="metric">दशमान पद्धती</type>
+			<type key="ms" type="metric" scope="core">मेट्रिक</type>
 			<type key="ms" type="uksystem">ब्रिटिश मापन पद्धती</type>
+			<type key="ms" type="uksystem" scope="core">यूके</type>
 			<type key="ms" type="ussystem">अमेरिकन मापन पद्धती</type>
+			<type key="ms" type="ussystem" scope="core">यूएस</type>
 			<type key="numbers" type="arab">अरबी-भारतीय अंक</type>
 			<type key="numbers" type="arabext">विस्तारित अरबी-भारतीय अंक</type>
 			<type key="numbers" type="armn">अर्मेनियन अंक</type>
-			<type key="numbers" type="armnlow">अर्मेनियन छोटी लिपी अंक</type>
+			<type key="numbers" type="armnlow">अर्मेनियन लोअरकेस अंक</type>
 			<type key="numbers" type="beng">बंगाली अंक</type>
 			<type key="numbers" type="cakm">चकमा अंक</type>
 			<type key="numbers" type="deva">देवनागरी अंक</type>
@@ -1173,14 +1214,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="olck">ओलचिकी अंक</type>
 			<type key="numbers" type="orya">उडिया अंक</type>
 			<type key="numbers" type="roman">रोमन अंक</type>
-			<type key="numbers" type="romanlow">रोमन लहान लिपीचे अंक</type>
-			<type key="numbers" type="taml">पारंपारिक तामिळ अंक</type>
+			<type key="numbers" type="romanlow">रोमन लोअरकेस अंक</type>
+			<type key="numbers" type="taml">पारंपरिक तामिळ अंक</type>
 			<type key="numbers" type="tamldec">तामिळ अंक</type>
 			<type key="numbers" type="telu">तेलगु अंक</type>
 			<type key="numbers" type="thai">थाई अंक</type>
 			<type key="numbers" type="tibt">तिबेटी अंक</type>
 			<type key="numbers" type="traditional">पारंपारिक संख्‍या</type>
 			<type key="numbers" type="vaii">व्हाई अंक</type>
+			<type key="ss" type="none" scope="core">बंद</type>
+			<type key="ss" type="standard" scope="core">सुरू</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">मेट्रिक</measurementSystemName>
@@ -1202,9 +1245,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1262,12 +1302,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">युग0</era>
-						<era type="1" draft="contributed">युग1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1306,12 +1340,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">युग0</era>
-						<era type="1" draft="contributed">युग1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1689,7 +1717,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{1} रोजी {0}</pattern>
+							<pattern>{1} रोजी {0} वाजता</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1910,20 +1938,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">चैत्र</month>
-							<month type="2">वैशाख</month>
-							<month type="3">ज्येष्ठ</month>
-							<month type="4">आषाढ</month>
-							<month type="5">श्रावण</month>
-							<month type="6">भाद्रपद</month>
-							<month type="7">अश्विन</month>
-							<month type="8">कार्तिक</month>
-							<month type="9">मार्गशीर्ष</month>
-							<month type="10">पौष</month>
-							<month type="11">माघ</month>
-							<month type="12">फाल्गुन</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">१</month>
 							<month type="2">२</month>
@@ -1938,20 +1952,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11">११</month>
 							<month type="12">१२</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">चैत्र</month>
-							<month type="2">वैशाख</month>
-							<month type="3">ज्येष्ठ</month>
-							<month type="4">आषाढ</month>
-							<month type="5">श्रावण</month>
-							<month type="6">भाद्रपद</month>
-							<month type="7">आश्विन</month>
-							<month type="8">कार्तिक</month>
-							<month type="9">मार्गशीर्ष</month>
-							<month type="10">पौष</month>
-							<month type="11">माघ</month>
-							<month type="12">फाल्गुन</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<eras>
@@ -2233,7 +2233,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="1">पुढील रवि.</relative>
 			</field>
 			<field type="sun-narrow">
-				<relative type="-1">मागील र</relative>
+				<relative type="-1">मागील रवि.</relative>
 				<relative type="0">हा र</relative>
 				<relative type="1">पुढील र</relative>
 			</field>
@@ -2343,11 +2343,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="-1">मागील गुरू.</relative>
 				<relative type="0">हा गुरू.</relative>
 				<relative type="1">पुढील गुरू.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">येत्या {0} गुरुवारी</relativeTimePattern>
+					<relativeTimePattern count="other">येत्या {0} गुरुवारी</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} गुरुवारपूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} गुरुवारांपूर्वी</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="thu-narrow">
 				<relative type="-1">मागील गु</relative>
 				<relative type="0">हा गु</relative>
 				<relative type="1">पुढील गु</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">येत्या {0} गुरुवारी</relativeTimePattern>
+					<relativeTimePattern count="other">येत्या {0} गुरुवारी</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} गुरुवारपूर्वी</relativeTimePattern>
+					<relativeTimePattern count="other">{0} गुरुवारांपूर्वी</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="fri">
 				<relative type="-1">मागील शुक्रवार</relative>
@@ -2462,7 +2478,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="zone">
-				<displayName>वेळ क्षेत्र</displayName>
+				<displayName>टाइम झोन</displayName>
 			</field>
 			<field type="zone-short">
 				<displayName>क्षेत्र</displayName>
@@ -2827,6 +2843,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ईस्टर</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>कोयाइके</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>पुंता अरीनास</exemplarCity>
 			</zone>
@@ -3092,9 +3111,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>प्नोम पेन्ह</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>एंडरबरी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>कँटन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3771,9 +3787,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>पश्चिम आफ्रिका वेळ</generic>
-					<standard>पश्चिम आफ्रिका प्रमाण वेळ</standard>
-					<daylight>पश्चिम आफ्रिका उन्हाळी वेळ</daylight>
+					<standard>पश्चिम आफ्रिका वेळ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3871,7 +3885,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>पश्चिमी अर्जेंटिना वेळ</generic>
 					<standard>पश्चिमी अर्जेंटिना प्रमाण वेळ</standard>
-					<daylight>पश्चिमी अर्जेंटिना उन्हाळी वेळ</daylight>
+					<daylight>पश्चिमी अर्जेंटिना उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
@@ -4013,7 +4027,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>कुक बेटे वेळ</generic>
 					<standard>कुक बेटे प्रमाण वेळ</standard>
-					<daylight>कुक बेटे अर्ध उन्हाळी वेळ</daylight>
+					<daylight>कुक बेटे उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -4156,6 +4170,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>गयाना वेळ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाई-अलूशन प्रमाण वेळ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाई-अलूशन वेळ</generic>
@@ -4387,7 +4406,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>न्यू कॅलेडोनिया वेळ</generic>
 					<standard>न्यू कॅलेडोनिया प्रमाण वेळ</standard>
-					<daylight>न्यू कॅलेडोनिया उन्हाळी वेळ</daylight>
+					<daylight>न्यू कॅलेडोनिया उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
@@ -4420,7 +4439,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>फर्नांडो दी नोरोन्हा वेळ</generic>
 					<standard>फर्नांडो दी नोरोन्हा प्रमाण वेळ</standard>
-					<daylight>फर्नांडो दी नोरोन्हा उन्हाळी वेळ</daylight>
+					<daylight>फर्नांडो दी नोरोन्हा उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="North_Mariana">
@@ -4463,14 +4482,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>पॅराग्वे वेळ</generic>
 					<standard>पॅराग्वे प्रमाण वेळ</standard>
-					<daylight>पॅराग्वे उन्हाळी वेळ</daylight>
+					<daylight>पॅराग्वे उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
 					<generic>पेरु वेळ</generic>
 					<standard>पेरु प्रमाण वेळ</standard>
-					<daylight>पेरु उन्हाळी वेळ</daylight>
+					<daylight>पेरु उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
@@ -4601,7 +4620,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>टोंगा वेळ</generic>
 					<standard>टोंगा प्रमाण वेळ</standard>
-					<daylight>टोंगा उन्हाळी वेळ</daylight>
+					<daylight>टोंगा उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
@@ -4609,6 +4628,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>चूक वेळ</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>तुर्की वेळ</generic>
+					<standard>तुर्की प्रमाणवेळ</standard>
+					<daylight>तुर्की ग्रीष्मकालीन वेळ</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>तुर्कमेनिस्तान वेळ</generic>
@@ -4625,7 +4651,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>उरुग्वे वेळ</generic>
 					<standard>उरुग्वे प्रमाण वेळ</standard>
-					<daylight>उरुग्वे उन्हाळी वेळ</daylight>
+					<daylight>उरुग्वे उन्हाळी प्रमाणवेळ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
@@ -4776,8 +4802,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4907,7 +4931,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="BMD">
 				<displayName>बर्मुडा डॉलर</displayName>
-				<displayName count="one">बर्मुडा डॉलर</displayName>
+				<displayName count="one">बर्मुडा डॉलर्स</displayName>
 				<displayName count="other">बर्मुडा डॉलर्स</displayName>
 			</currency>
 			<currency type="BND">
@@ -5176,9 +5200,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>कुवैती दिनार</displayName>
 			</currency>
 			<currency type="KYD">
-				<displayName>केमेन आयलॅंड डॉलर</displayName>
-				<displayName count="one">केमेन आयलॅंड डॉलर</displayName>
-				<displayName count="other">केमेन आयलॅंड डॉलर्स</displayName>
+				<displayName>केमन आयलंड डॉलर</displayName>
+				<displayName count="one">केमन आयलंड डॉलर</displayName>
+				<displayName count="other">केमन आयलंड डॉलर्स</displayName>
 			</currency>
 			<currency type="KZT">
 				<displayName>कझाकिस्तानी तेंगे</displayName>
@@ -5542,6 +5566,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">पूर्व कॅरीबियन डॉलर</displayName>
 				<displayName count="other">पूर्व कॅरीबियन डॉलर्स</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>कॅरेबियब गिल्डर</displayName>
+				<displayName count="one">कॅरेबियन गिल्डर</displayName>
+				<displayName count="other">कॅरेबियन गिल्डर्स</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>पश्चिम आफ्रिकन [CFA] फ्रँक</displayName>
 				<displayName count="one">पश्चिम आफ्रिकन [CFA] फ्रँक</displayName>
@@ -5571,6 +5600,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">झांबियन क्वाचा</displayName>
 				<displayName count="other">झांबियन क्वाचास</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>झिंबाब्वेयन गोल्ड</displayName>
+				<displayName count="one">झिंबाब्वियन गोल्ड</displayName>
+				<displayName count="other">झिंबाब्वेयन गोल्ड</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5722,7 +5756,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="other" case="ablative">चौरस {0} हून</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" case="accusative">चौरस {0} ना</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" case="dative">चौरस {0} साठी</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" case="ergative">चौरस {0} नी</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other" case="ergative">चौरस {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" case="genitive">चौरस {0} चे</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" case="locative">चौरस {0} चा</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" gender="feminine">चौरस {0}</compoundUnitPattern1>
@@ -5736,7 +5770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="other" gender="masculine" case="ablative">चौरस {0} हून</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" gender="masculine" case="accusative">चौरस {0} ना</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" gender="masculine" case="dative">चौरस {0} साठी</compoundUnitPattern1>
-				<compoundUnitPattern1 count="other" gender="masculine" case="ergative">चौरस {0} नी</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other" gender="masculine" case="ergative">चौरस {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" gender="masculine" case="genitive">चौरस {0} चे</compoundUnitPattern1>
 				<compoundUnitPattern1 count="other" gender="masculine" case="locative">चौरस {0} चा</compoundUnitPattern1>
 			</compoundUnit>
@@ -6022,7 +6056,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} कॅरेट्सचा</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<gender draft="contributed">neuter</gender>
+				<gender>neuter</gender>
 				<displayName>मिलीग्रामस् पर डेसीलिटर</displayName>
 				<unitPattern count="one">{0} मिलीग्रॅम प्रति डेसीलिटर</unitPattern>
 				<unitPattern count="one" case="ablative">{0} मिलीग्रॅम प्रति डेसीलिटरनी</unitPattern>
@@ -6074,7 +6108,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} आयटमचे</unitPattern>
 				<unitPattern count="other" case="locative">{0} आयटममध्ये</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<unitPattern count="one">{0} पार्ट</unitPattern>
+				<unitPattern count="other">{0} part</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>neuter</gender>
 				<displayName>भाग प्रति दशलक्ष</displayName>
 				<unitPattern count="one">{0} भाग प्रति दशलक्ष</unitPattern>
@@ -6152,13 +6190,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="ergative">{0} मोलने</unitPattern>
 				<unitPattern count="one" case="genitive">{0} मोलचा</unitPattern>
 				<unitPattern count="one" case="locative">{0} मोलशी</unitPattern>
-				<unitPattern count="other">{0} मोल</unitPattern>
-				<unitPattern count="other" case="ablative">{0} मोलहून</unitPattern>
-				<unitPattern count="other" case="accusative">{0} मोलना</unitPattern>
-				<unitPattern count="other" case="dative">{0} मोलसाठी</unitPattern>
+				<unitPattern count="other">{0} मोल्स</unitPattern>
+				<unitPattern count="other" case="ablative">{0} मोल्सहून</unitPattern>
+				<unitPattern count="other" case="accusative">{0} मोल्सना</unitPattern>
+				<unitPattern count="other" case="dative">{0} मोल्ससाठी</unitPattern>
 				<unitPattern count="other" case="ergative">{0} मोलनी</unitPattern>
-				<unitPattern count="other" case="genitive">{0} मोलचे</unitPattern>
-				<unitPattern count="other" case="locative">{0} मोलचा</unitPattern>
+				<unitPattern count="other" case="genitive">{0} मोल्सचे</unitPattern>
+				<unitPattern count="other" case="locative">{0} मोल्सचा</unitPattern>
+				<unitPattern count="other" case="oblique">{0} मोल्स</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ग्लुकोजचा । ग्लुकोजची । ग्लुकोजचे । ग्लुकोजच्या</displayName>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>neuter</gender>
@@ -6706,7 +6748,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} व्होल्टचा</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<gender draft="contributed">feminine</gender>
+				<gender>feminine</gender>
 				<displayName>किलोकॅलरी</displayName>
 				<unitPattern count="one">{0} किलोकॅलरी</unitPattern>
 				<unitPattern count="one" case="ablative">{0} किलोकॅलरीतून</unitPattern>
@@ -7209,21 +7251,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="locative">{0} मैल-स्कॅन्डीनेव्हियनचा</unitPattern>
 			</unit>
 			<unit type="length-point">
-				<gender draft="contributed">masculine</gender>
+				<gender>masculine</gender>
 				<unitPattern count="one">{0} बिंदु</unitPattern>
-				<unitPattern count="one" case="ablative" draft="contributed">{0} बिंदुपासून</unitPattern>
-				<unitPattern count="one" case="accusative" draft="contributed">{0} बिंदूला</unitPattern>
-				<unitPattern count="one" case="dative" draft="contributed">{0} बिंदूसाठी</unitPattern>
-				<unitPattern count="one" case="ergative" draft="contributed">{0} बिंदुने</unitPattern>
-				<unitPattern count="one" case="genitive" draft="contributed">{0} बिंदूच्या</unitPattern>
-				<unitPattern count="one" case="locative" draft="contributed">बिंदूचा</unitPattern>
+				<unitPattern count="one" case="ablative">{0} बिंदुपासून</unitPattern>
+				<unitPattern count="one" case="accusative">{0} बिंदूला</unitPattern>
+				<unitPattern count="one" case="dative">{0} बिंदूसाठी</unitPattern>
+				<unitPattern count="one" case="ergative">{0} बिंदुने</unitPattern>
+				<unitPattern count="one" case="genitive">{0} बिंदूच्या</unitPattern>
+				<unitPattern count="one" case="locative">बिंदूचा</unitPattern>
 				<unitPattern count="other">{0} बिंदु</unitPattern>
-				<unitPattern count="other" case="ablative" draft="contributed">{0} बिंदुपासून</unitPattern>
-				<unitPattern count="other" case="accusative" draft="contributed">{0} बिंदुला</unitPattern>
-				<unitPattern count="other" case="dative" draft="contributed">{0} बिंदुस</unitPattern>
-				<unitPattern count="other" case="ergative" draft="contributed">{0} बिंदुने</unitPattern>
-				<unitPattern count="other" case="genitive" draft="contributed">{0} बिंदुच्या</unitPattern>
-				<unitPattern count="other" case="locative" draft="contributed">{0} बिंदुचा</unitPattern>
+				<unitPattern count="other" case="ablative">{0} बिंदुपासून</unitPattern>
+				<unitPattern count="other" case="accusative">{0} बिंदुला</unitPattern>
+				<unitPattern count="other" case="dative">{0} बिंदुस</unitPattern>
+				<unitPattern count="other" case="ergative">{0} बिंदुने</unitPattern>
+				<unitPattern count="other" case="genitive">{0} बिंदुच्या</unitPattern>
+				<unitPattern count="other" case="locative">{0} बिंदुचा</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
 				<unitPattern count="one">{0} सौर त्रिज्या</unitPattern>
@@ -7508,22 +7550,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} हॉर्सपॉवर</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<gender draft="contributed">neuter</gender>
+				<gender>neuter</gender>
 				<displayName>मर्क्यूरी मिलिमीटर</displayName>
 				<unitPattern count="one">{0} मर्क्यूरी मिलिमीटर</unitPattern>
-				<unitPattern count="one" case="ablative" draft="contributed">{0} मर्क्यूरी मिलिमीटरहून</unitPattern>
-				<unitPattern count="one" case="accusative" draft="contributed">{0} मर्क्यूरी मिलिमीटरला</unitPattern>
-				<unitPattern count="one" case="dative" draft="contributed">{0} मर्क्यूरी मिलिमीटरसाठी</unitPattern>
-				<unitPattern count="one" case="ergative" draft="contributed">{0} मर्क्यूरी मिलिमीटरने</unitPattern>
-				<unitPattern count="one" case="genitive" draft="contributed">{0} मर्क्यूरी मिलिमीटरचे</unitPattern>
-				<unitPattern count="one" case="locative" draft="contributed">{0} मर्क्यूरी मिलिमीटरचा</unitPattern>
+				<unitPattern count="one" case="ablative">{0} मर्क्यूरी मिलिमीटरहून</unitPattern>
+				<unitPattern count="one" case="accusative">{0} मर्क्यूरी मिलिमीटरला</unitPattern>
+				<unitPattern count="one" case="dative">{0} मर्क्यूरी मिलिमीटरसाठी</unitPattern>
+				<unitPattern count="one" case="ergative">{0} मर्क्यूरी मिलिमीटरने</unitPattern>
+				<unitPattern count="one" case="genitive">{0} मर्क्यूरी मिलिमीटरचे</unitPattern>
+				<unitPattern count="one" case="locative">{0} मर्क्यूरी मिलिमीटरचा</unitPattern>
 				<unitPattern count="other">{0} मर्क्यूरी मिलिमीटर</unitPattern>
-				<unitPattern count="other" case="ablative" draft="contributed">{0} मर्क्यूरी मिलिमीटरहून</unitPattern>
-				<unitPattern count="other" case="accusative" draft="contributed">{0} मर्क्यूरी मिलिमीटरना</unitPattern>
-				<unitPattern count="other" case="dative" draft="contributed">{0} मर्क्यूरी मिलिमीटरला</unitPattern>
-				<unitPattern count="other" case="ergative" draft="contributed">{0} मर्क्यूरी मिलिमीटरने</unitPattern>
-				<unitPattern count="other" case="genitive" draft="contributed">{0} मर्क्यूरी मिलिमीटरच्या</unitPattern>
-				<unitPattern count="other" case="locative" draft="contributed">{0} मर्क्यूरी मिलिमीटरपासून</unitPattern>
+				<unitPattern count="other" case="ablative">{0} मर्क्यूरी मिलिमीटरहून</unitPattern>
+				<unitPattern count="other" case="accusative">{0} मर्क्यूरी मिलिमीटरना</unitPattern>
+				<unitPattern count="other" case="dative">{0} मर्क्यूरी मिलिमीटरला</unitPattern>
+				<unitPattern count="other" case="ergative">{0} मर्क्यूरी मिलिमीटरने</unitPattern>
+				<unitPattern count="other" case="genitive">{0} मर्क्यूरी मिलिमीटरच्या</unitPattern>
+				<unitPattern count="other" case="locative">{0} मर्क्यूरी मिलिमीटरपासून</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>प्रति चौरस इंच पाउंड</displayName>
@@ -7597,7 +7639,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="ergative">{0} पास्कलने</unitPattern>
 				<unitPattern count="one" case="genitive">{0} पास्कलचा</unitPattern>
 				<unitPattern count="one" case="locative">{0} पास्कलशी</unitPattern>
-				<unitPattern count="one" case="oblique">{0} पास्कल</unitPattern>
 				<unitPattern count="other">{0} पास्कल</unitPattern>
 				<unitPattern count="other" case="ablative">{0} पास्कलहून</unitPattern>
 				<unitPattern count="other" case="accusative">{0} पास्कलना</unitPattern>
@@ -8010,6 +8051,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} मेट्रिक कपचे</unitPattern>
 				<unitPattern count="other" case="locative">{0} मेट्रिक कपचा</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>मेट्रिक फ्लुइड औंसेस</displayName>
+				<unitPattern count="one">{0} मेट्रिक फ्लुइड औंस</unitPattern>
+				<unitPattern count="other">{0} मेट्रिक फ्लुइड औंसेस</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>एकर-फूट</displayName>
 				<unitPattern count="one">{0} एकर-फूट</unitPattern>
@@ -8088,25 +8134,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} इंपि. क्वार्ट</unitPattern>
 				<unitPattern count="other">{0} इंपि. क्वार्ट</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<gender draft="contributed">masculine</gender>
-				<displayName draft="contributed">प्रकाश</displayName>
-				<unitPattern count="one" draft="contributed">प्रकाश</unitPattern>
-				<unitPattern count="one" case="ablative" draft="contributed">प्रकाशापासून</unitPattern>
-				<unitPattern count="one" case="accusative" draft="contributed">प्रकाशाला</unitPattern>
-				<unitPattern count="one" case="dative" draft="contributed">प्रकाशासाठी</unitPattern>
-				<unitPattern count="one" case="ergative" draft="contributed">प्रकाशाने</unitPattern>
-				<unitPattern count="one" case="genitive" draft="contributed">प्रकाशाचे</unitPattern>
-				<unitPattern count="one" case="locative" draft="contributed">प्रकाशामध्ये</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} प्रकाश</unitPattern>
-				<unitPattern count="other" case="ablative" draft="contributed">{0} प्रकाशापासून</unitPattern>
-				<unitPattern count="other" case="accusative" draft="contributed">{0} प्रकाशाला</unitPattern>
-				<unitPattern count="other" case="dative" draft="contributed">{0} प्रकाशासाठी</unitPattern>
-				<unitPattern count="other" case="ergative" draft="contributed">{0} प्रकाश</unitPattern>
-				<unitPattern count="other" case="genitive" draft="contributed">{0} प्रकाशांचे</unitPattern>
-				<unitPattern count="other" case="locative" draft="contributed">{0} प्रकाशामध्ये</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} स्टेराडियन</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>कॅटल्स</displayName>
+				<unitPattern count="one">{0} कॅटल</unitPattern>
+				<unitPattern count="other">{0} कॅ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>कूलोम</displayName>
+				<unitPattern count="one">कूलोम</unitPattern>
+				<unitPattern count="other">{0} कूलोम्स</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>फॅरड</displayName>
+				<unitPattern count="one">{0} फॅरड</unitPattern>
+				<unitPattern count="other">{0} फॅरड्स</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>हे</displayName>
+				<unitPattern count="one">{0} हे</unitPattern>
+				<unitPattern count="other">{0} हे</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>सिमेन्स</displayName>
+				<unitPattern count="one">{0} सिमेन्स</unitPattern>
+				<unitPattern count="other">{0} सिमेन्स</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>कॅलरी [IT]</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>बेकरल्स</displayName>
+				<unitPattern count="one">{0} बेकरल</unitPattern>
+				<unitPattern count="other">{0} बेकरल्स</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>सिव्हर्ट</displayName>
+				<unitPattern count="one">{0} सिव्हर्ट</unitPattern>
+				<unitPattern count="other">{0} सिव्हर्ट्स</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ग्रे</displayName>
+				<unitPattern count="one">{0} ग्रे</unitPattern>
+				<unitPattern count="other">{0} ग्रेज</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} किलोग्रॅम्स-फोर्स</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} टेस्ला</unitPattern>
+				<unitPattern count="other">{0} टेस्लाज</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} वेबर</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<gender>masculine</gender>
+				<displayName>प्रकाश</displayName>
+				<unitPattern count="one">प्रकाश</unitPattern>
+				<unitPattern count="one" case="ablative">प्रकाशापासून</unitPattern>
+				<unitPattern count="one" case="accusative">प्रकाशाला</unitPattern>
+				<unitPattern count="one" case="dative">प्रकाशासाठी</unitPattern>
+				<unitPattern count="one" case="ergative">प्रकाशाने</unitPattern>
+				<unitPattern count="one" case="genitive">प्रकाशाचे</unitPattern>
+				<unitPattern count="one" case="locative">प्रकाशामध्ये</unitPattern>
+				<unitPattern count="other">{0} प्रकाश</unitPattern>
+				<unitPattern count="other" case="ablative">{0} प्रकाशापासून</unitPattern>
+				<unitPattern count="other" case="accusative">{0} प्रकाशाला</unitPattern>
+				<unitPattern count="other" case="dative">{0} प्रकाशासाठी</unitPattern>
+				<unitPattern count="other" case="ergative">{0} प्रकाश</unitPattern>
+				<unitPattern count="other" case="genitive">{0} प्रकाशांचे</unitPattern>
+				<unitPattern count="other" case="locative">{0} प्रकाशामध्ये</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>neuter</gender>
 				<displayName>भाग प्रति अब्ज</displayName>
 				<unitPattern count="one">{0} भाग प्रति अब्ज</unitPattern>
@@ -8120,28 +8225,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="ablative">{0} भाग प्रति अब्जांहून</unitPattern>
 				<unitPattern count="other" case="accusative">{0} भाग प्रति अब्जांना</unitPattern>
 				<unitPattern count="other" case="dative">{0} भाग प्रति अब्जांसाठी</unitPattern>
-				<unitPattern count="other" case="ergative" draft="contributed">{0} भाग प्रति अब्जांनी</unitPattern>
+				<unitPattern count="other" case="ergative">{0} भाग प्रति अब्जांनी</unitPattern>
 				<unitPattern count="other" case="genitive">{0} भाग प्रति अब्जांचे</unitPattern>
 				<unitPattern count="other" case="locative">{0} भाग प्रति अब्जांहून</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>रात्री</displayName>
 				<unitPattern count="one">रात्र</unitPattern>
 				<unitPattern count="one" case="ablative">{0} रात्रीपासून</unitPattern>
 				<unitPattern count="one" case="accusative">रात्री</unitPattern>
-				<unitPattern count="one" case="dative" draft="contributed">रात्री</unitPattern>
+				<unitPattern count="one" case="dative">रात्री</unitPattern>
 				<unitPattern count="one" case="ergative">{0} रात्रीने</unitPattern>
 				<unitPattern count="one" case="genitive">रात्रीचा</unitPattern>
-				<unitPattern count="one" case="locative" draft="contributed">रात्री</unitPattern>
+				<unitPattern count="one" case="locative">रात्री</unitPattern>
 				<unitPattern count="other">{0} रात्री</unitPattern>
-				<unitPattern count="other" case="ablative" draft="contributed">{0} रात्रीपासून</unitPattern>
+				<unitPattern count="other" case="ablative">{0} रात्रीपासून</unitPattern>
 				<unitPattern count="other" case="accusative">{0} रात्री</unitPattern>
-				<unitPattern count="other" case="dative" draft="contributed">{0} रात्री</unitPattern>
-				<unitPattern count="other" case="ergative" draft="contributed">{0} रात्रीने</unitPattern>
-				<unitPattern count="other" case="genitive" draft="contributed">{0} रात्रीला</unitPattern>
-				<unitPattern count="other" case="locative" draft="contributed">{0} रात्रीस</unitPattern>
-				<perUnitPattern>{0}/रात्र</perUnitPattern>
+				<unitPattern count="other" case="dative">{0} रात्री</unitPattern>
+				<unitPattern count="other" case="ergative">{0} रात्रीने</unitPattern>
+				<unitPattern count="other" case="genitive">{0} रात्रीला</unitPattern>
+				<unitPattern count="other" case="locative">{0} रात्रीस</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>मुख्य दिशा</displayName>
@@ -8311,7 +8414,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} आयटम</unitPattern>
 				<unitPattern count="other">{0} आयटम</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>भाग/दशलक्ष</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -8328,6 +8431,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मोल</unitPattern>
 				<unitPattern count="other">{0} मोल</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लीटर/किमी</displayName>
 				<unitPattern count="one">{0} ली/किमी</unitPattern>
@@ -8772,6 +8878,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मिली</unitPattern>
 				<unitPattern count="other">{0} मिली</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} मेट्रिक फ्लुइड औंस</unitPattern>
+				<unitPattern count="other">{0} मेट्रिक फ्लुइड औंसेस</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>बुशेल</displayName>
 			</unit>
@@ -8819,20 +8929,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} आकुंचन</unitPattern>
 				<unitPattern count="other">{0} आकुंचन</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName draft="contributed">प्र</displayName>
-				<unitPattern count="one" draft="contributed">{0} प्रकाश</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} प्रकाश</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>कॅ</displayName>
+				<unitPattern count="one">{0} कॅ</unitPattern>
+				<unitPattern count="other">{0} कॅ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="electric-coulomb">
+				<displayName>कू</displayName>
+				<unitPattern count="one">{0} कू</unitPattern>
+				<unitPattern count="other">{0} कू</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>फॅ</displayName>
+				<unitPattern count="one">{0} फॅ</unitPattern>
+				<unitPattern count="other">{0} फॅ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>हे</displayName>
+				<unitPattern count="one">{0} हे</unitPattern>
+				<unitPattern count="other">{0} हे</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>सि</displayName>
+				<unitPattern count="one">{0} सि</unitPattern>
+				<unitPattern count="other">{0} सि</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>कॅल-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>बेकरल्स</displayName>
+				<unitPattern count="one">{0} बेक</unitPattern>
+				<unitPattern count="other">{0} बेक</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>सिव्हर्ट</displayName>
+				<unitPattern count="one">{0} सिव्हर्ट</unitPattern>
+				<unitPattern count="other">{0} सिव्ह</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ग्रे</displayName>
+				<unitPattern count="one">{0} ग्रे</unitPattern>
+				<unitPattern count="other">{0} ग्रेज</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>प्र</displayName>
+				<unitPattern count="one">{0} प्रकाश</unitPattern>
+				<unitPattern count="other">{0} प्रकाश</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>भाग/अब्ज</displayName>
-				<unitPattern count="one" draft="contributed">{0} भाग प्रति अब्ज</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} भाप्रअ</unitPattern>
+				<unitPattern count="one">{0} भाग प्रति अब्ज</unitPattern>
+				<unitPattern count="other">{0} भाप्रअ</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>रात्री</displayName>
-				<unitPattern count="one" draft="contributed">{0} रात्र</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} रात्र</unitPattern>
+				<unitPattern count="one">{0} रात्र</unitPattern>
+				<unitPattern count="other">{0} रात्र</unitPattern>
 				<perUnitPattern>{0}/रात्र</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -8921,7 +9074,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}आयटम</unitPattern>
 				<unitPattern count="other">{0}आयटम</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -8929,6 +9082,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one">{0}mpg</unitPattern>
 				<unitPattern count="other">{0}mpg</unitPattern>
@@ -9030,8 +9186,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="energy-kilocalorie">
 				<displayName>किकॅल</displayName>
-				<unitPattern count="one">{0} किकॅ</unitPattern>
-				<unitPattern count="other">{0} किकॅ</unitPattern>
 			</unit>
 			<unit type="energy-british-thermal-unit">
 				<unitPattern count="one">{0}Btu</unitPattern>
@@ -9199,6 +9353,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ली</unitPattern>
 				<unitPattern count="other">{0}ली</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} मे. फ्लु. औ.</unitPattern>
+				<unitPattern count="other">{0} मे. फ्लु. औ.</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<unitPattern count="one">{0}fl oz Im</unitPattern>
 				<unitPattern count="other">{0}fl oz Im</unitPattern>
@@ -9216,21 +9374,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName draft="contributed">प्र</displayName>
-				<unitPattern count="one" draft="contributed">{0} प्रकाश</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} प्रकाश</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>कॅ</displayName>
+				<unitPattern count="one">{0} कॅ</unitPattern>
+				<unitPattern count="other">{0} कॅ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>भाग/अब्ज</displayName>
-				<unitPattern count="one" draft="contributed">{0} भाग/अब्ज</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} भाग/अब्ज</unitPattern>
+			<unit type="electric-coulomb">
+				<displayName>कूलोम</displayName>
+				<unitPattern count="one">{0} कू</unitPattern>
+				<unitPattern count="other">{0} कू</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>रात्री</displayName>
-				<unitPattern count="one" draft="contributed">{0} रात्र</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} रात्र</unitPattern>
-				<perUnitPattern>{0}/रात्र</perUnitPattern>
+			<unit type="electric-farad">
+				<displayName>फॅ</displayName>
+				<unitPattern count="one">{0} फॅ</unitPattern>
+				<unitPattern count="other">{0} फॅ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>हे</displayName>
+				<unitPattern count="one">{0} हे</unitPattern>
+				<unitPattern count="other">{0} हे</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>सि</displayName>
+				<unitPattern count="one">{0} सि</unitPattern>
+				<unitPattern count="other">{0} सि</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>कॅल-IT</displayName>
+				<unitPattern count="one">{0} कॅल-IT</unitPattern>
+				<unitPattern count="other">{0} कॅल-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>बेक</displayName>
+				<unitPattern count="one">{0} बेक</unitPattern>
+				<unitPattern count="other">{0} बेक</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>सिव्ह</displayName>
+				<unitPattern count="one">{0} सिव्ह</unitPattern>
+				<unitPattern count="other">{0} सिव्ह</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ग्रे</displayName>
+				<unitPattern count="one">{0} ग्रे</unitPattern>
+				<unitPattern count="other">{0} ग्रेज</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} भाग/अब्ज</unitPattern>
+				<unitPattern count="other">{0} भाग/अब्ज</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -9369,18 +9560,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<axisName type="ital">तिर्यक</axisName>
 		<axisName type="opsz">ऑप्टिकल आकार</axisName>
 		<axisName type="slnt">उतार</axisName>
-		<axisName type="wdth">रूंदी</axisName>
+		<axisName type="wdth">रुंदी</axisName>
 		<axisName type="wght">वजन</axisName>
-		<styleName type="ital" subtype="1">कर्सीव्ह</styleName>
+		<styleName type="ital" subtype="1">कर्सिव्ह</styleName>
 		<styleName type="opsz" subtype="8">कॅप्शन</styleName>
 		<styleName type="opsz" subtype="12">मजकूर</styleName>
 		<styleName type="opsz" subtype="18">शीर्षक</styleName>
 		<styleName type="opsz" subtype="72">डिस्प्ले</styleName>
 		<styleName type="opsz" subtype="144">पोस्टर</styleName>
-		<styleName type="slnt" subtype="-12">बॅकस्लान्टेड</styleName>
-		<styleName type="slnt" subtype="0">सरळ</styleName>
-		<styleName type="slnt" subtype="12">एकीकडून</styleName>
-		<styleName type="slnt" subtype="24">जास्त-एकीकडून</styleName>
+		<styleName type="slnt" subtype="-12">बॅकस्लॅंटेड</styleName>
+		<styleName type="slnt" subtype="0">अपराइट</styleName>
+		<styleName type="slnt" subtype="12">स्लॅंटेड</styleName>
+		<styleName type="slnt" subtype="24">एक्स्ट्रा-स्लॅंटेड</styleName>
 		<styleName type="wdth" subtype="50">खूपघनरूप</styleName>
 		<styleName type="wdth" subtype="50" alt="compressed">खूपसंकुचित</styleName>
 		<styleName type="wdth" subtype="50" alt="narrow">खूपअरूंद</styleName>
@@ -9431,8 +9622,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	</typographicNames>
 	<personNames>
 		<nameOrderLocales order="givenFirst">und mr</nameOrderLocales>
-		<nameOrderLocales order="surnameFirst">ko si ta te vi yue zh</nameOrderLocales>
 		<parameterDefault parameter="formality">informal</parameterDefault>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{title} {given} {given2} {surname} {generation}, {credentials}</namePattern>
+		</personName>
 		<personName order="givenFirst" length="long" usage="referring" formality="informal">
 			<namePattern>{title} {given} {given2} {surname}, {credentials}</namePattern>
 		</personName>
@@ -9446,7 +9639,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<namePattern>{given-informal-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
-			<namePattern>{title} {given} {given2} {surname}, {credentials}</namePattern>
+			<namePattern>{given} {given2-initial} {surname} {generation}, {credentials}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
 			<namePattern>{given-informal} {surname}</namePattern>
@@ -9482,7 +9675,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {given2} {credentials}</namePattern>
+			<namePattern>{surname} {title} {given} {given2} {generation}, {credentials}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
 			<namePattern>{surname} {given-informal}</namePattern>
@@ -9578,20 +9771,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<nameField type="surname">मुलर</nameField>
 		</sampleName>
 		<sampleName item="foreignGGS">
-			<nameField type="given">झाझिलिया</nameField>
+			<nameField type="given">आलिया</nameField>
 			<nameField type="given2">हमीश</nameField>
-			<nameField type="surname">स्टॉबर</nameField>
+			<nameField type="surname">हेमंत</nameField>
 		</sampleName>
 		<sampleName item="foreignFull">
 			<nameField type="title">प्रोफे.डॉ.</nameField>
-			<nameField type="given">एडा कॉर्नेलिया</nameField>
-			<nameField type="given-informal">निले</nameField>
+			<nameField type="given">अदा शर्मा</nameField>
+			<nameField type="given-informal">नील</nameField>
 			<nameField type="given2">सीझर मार्टिन</nameField>
 			<nameField type="surname-prefix">व्हॉन</nameField>
 			<nameField type="surname-core">ब्र्यूल</nameField>
 			<nameField type="surname2">गोन्झालेझ डोमिंगो</nameField>
-			<nameField type="generation">क.</nameField>
-			<nameField type="credentials">एम.डी.पीएच.डी</nameField>
+			<nameField type="generation">ज्यु.</nameField>
+			<nameField type="credentials">एम. डी. डी. डी. एस.</nameField>
 		</sampleName>
 	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/ms.xml b/make/data/cldr/common/main/ms.xml
index 01eb22f39a7..9df69555642 100644
--- a/make/data/cldr/common/main/ms.xml
+++ b/make/data/cldr/common/main/ms.xml
@@ -261,6 +261,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Colognian</language>
 			<language type="ku">Kurdish</language>
+			<language type="ku" menu="core">Kurdish</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Cornish</language>
@@ -365,6 +367,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="om">Oromo</language>
 			<language type="or">Odia</language>
 			<language type="os">Ossete</language>
+			<language type="osa" draft="contributed">Osage</language>
 			<language type="pa">Punjabi</language>
 			<language type="pag">Pangasinan</language>
 			<language type="pam">Pampanga</language>
@@ -626,7 +629,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Olck">Ol Chiki</script>
 			<script type="Orkh" draft="contributed">Orkhon</script>
 			<script type="Orya">Oriya</script>
-			<script type="Osge" draft="contributed">Osage</script>
+			<script type="Osge">Osage</script>
 			<script type="Osma" draft="contributed">Osmanya</script>
 			<script type="Palm" draft="contributed">Palmyrene</script>
 			<script type="Pauc" draft="contributed">Pau Cin Hau</script>
@@ -772,6 +775,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Pulau Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cape Verde</territory>
@@ -1117,35 +1121,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Pengisihan Berangka</key>
 			<key type="colStrength">Kekuatan Pengisihan</key>
 			<key type="currency">Mata wang</key>
+			<key type="em">Paparan Emoji</key>
 			<key type="hc">Kitaran Jam (12 berbanding 24)</key>
 			<key type="lb">Gaya Pemisah Baris</key>
+			<key type="lw">Penggalan Baris dalam Perkataan</key>
 			<key type="ms">Sistem Ukuran</key>
 			<key type="numbers">Nombor</key>
+			<key type="ss">Penggalan Ayat Selepas Singkatan</key>
 			<key type="timezone">Zon Waktu</key>
 			<key type="va">Varian Tempat</key>
 			<key type="x">Penggunaan Peribadi</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kalendar Buddha</type>
+			<type key="calendar" type="buddhist" scope="core">Buddha</type>
 			<type key="calendar" type="chinese">Kalendar Cina</type>
+			<type key="calendar" type="chinese" scope="core">Cina</type>
 			<type key="calendar" type="coptic">Kalendar Qibti</type>
+			<type key="calendar" type="coptic" scope="core">Qibti</type>
 			<type key="calendar" type="dangi">Kalendar Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kalendar Ethiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopia</type>
 			<type key="calendar" type="ethiopic-amete-alem">Kalendar Amete Alem Ethiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopia Amete Alem</type>
 			<type key="calendar" type="gregorian">Kalendar Gregory</type>
+			<type key="calendar" type="gregorian" scope="core">Gregory</type>
 			<type key="calendar" type="hebrew">Kalendar Ibrani</type>
+			<type key="calendar" type="hebrew" scope="core">Ibrani</type>
 			<type key="calendar" type="indian">Kalendar Kebangsaan India</type>
-			<type key="calendar" type="islamic">Kalendar Islam</type>
-			<type key="calendar" type="islamic-civil">Kalendar Sivil Islam</type>
+			<type key="calendar" type="islamic">Kalendar Hijrah</type>
+			<type key="calendar" type="islamic" scope="core">Hijrah</type>
+			<type key="calendar" type="islamic-civil">Kalendar Hijrah (jadual, zaman sivil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijrah (jadual, zaman sivil)</type>
 			<type key="calendar" type="islamic-rgsa">Kalendar Islam (Arab Saudi, cerapan)</type>
-			<type key="calendar" type="islamic-tbla">Kalendar Islam (jadual, zaman astronomi)</type>
+			<type key="calendar" type="islamic-tbla">Kalendar Hijrah (jadual, zaman astronomi)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hijrah (jadual, zaman astronomi)</type>
 			<type key="calendar" type="islamic-umalqura">Kalendar Islam (Umm Al-Quran)</type>
-			<type key="calendar" type="iso8601">Kalendar ISO-8601</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijrah (Umm al-Quran)</type>
+			<type key="calendar" type="iso8601">Kalendar Gregorian (Tahun Pertama)</type>
 			<type key="calendar" type="japanese">Kalendar Jepun</type>
+			<type key="calendar" type="japanese" scope="core">Jepun</type>
 			<type key="calendar" type="persian">Kalendar Parsi</type>
+			<type key="calendar" type="persian" scope="core">Parsi</type>
 			<type key="calendar" type="roc">Kalendar Minguo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Format Mata Wang Perakaunan</type>
+			<type key="cf" type="account" scope="core">Perakaunan</type>
 			<type key="cf" type="standard">Format Mata Wang Standard</type>
+			<type key="cf" type="standard" scope="core">Standard</type>
 			<type key="colAlternate" type="non-ignorable">Isih Simbol</type>
 			<type key="colAlternate" type="shifted">Isih Mengabaikan Simbol</type>
 			<type key="colBackwards" type="no">Isih Aksen Secara Biasa</type>
@@ -1155,23 +1179,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Isih Huruf Besar Dahulu</type>
 			<type key="colCaseLevel" type="no">Isih Tidak Sensitif Atur</type>
 			<type key="colCaseLevel" type="yes">Isih Sensitif Atur</type>
-			<type key="collation" type="big5han">Aturan Isih Cina Tradisional - Big5</type>
 			<type key="collation" type="compat">Tertib Isihan Sebelumnya</type>
+			<type key="collation" type="compat" scope="core">Keserasian</type>
 			<type key="collation" type="dictionary">Aturan Isih Kamus</type>
+			<type key="collation" type="dictionary" scope="core">Kamus</type>
 			<type key="collation" type="ducet">Tertib Isih Unikod Lalai</type>
+			<type key="collation" type="ducet" scope="core">Unikod Lalai</type>
 			<type key="collation" type="emoji">Aturan Isih Emoji</type>
 			<type key="collation" type="eor">Peraturan Isihan Eropah</type>
-			<type key="collation" type="gb2312han">Aturan Isih Bahasa Cina Ringkas - GB2312</type>
 			<type key="collation" type="phonebook">Aturan Isih Buku Telefon</type>
+			<type key="collation" type="phonebook" scope="core">Buku Telefon</type>
 			<type key="collation" type="phonetic">Urutan Isih Fonetik</type>
+			<type key="collation" type="phonetic" scope="core">Fonetik</type>
 			<type key="collation" type="pinyin">Aturan Isih Pinyin</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Carian Tujuan Umum</type>
+			<type key="collation" type="search" scope="core">Carian</type>
 			<type key="collation" type="searchjl">Cari Mengikut Konsonan Awal Hangul</type>
 			<type key="collation" type="standard">Tertib Isih Standard</type>
+			<type key="collation" type="standard" scope="core">Standard</type>
 			<type key="collation" type="stroke">Aturan Isih Coretan</type>
+			<type key="collation" type="stroke" scope="core">Coretan</type>
 			<type key="collation" type="traditional">Aturan Isih Tradisional</type>
+			<type key="collation" type="traditional" scope="core">Tradisional</type>
 			<type key="collation" type="unihan">Aturan Isih Coretan Radikal</type>
+			<type key="collation" type="unihan" scope="core">Coretan Radikal</type>
 			<type key="collation" type="zhuyin">Aturan Isih Zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no">Isih Tanpa Penormalan</type>
 			<type key="colNormalization" type="yes">Isih Unikod Ternormal</type>
 			<type key="colNumeric" type="no">Isih Digit Secara Berasingan</type>
@@ -1184,18 +1218,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Ke Kelebaran Penuh</type>
 			<type key="d0" type="hwidth">Ke Kelebaran Separa</type>
 			<type key="d0" type="npinyin">Bernombor</type>
+			<type key="em" type="default" scope="core">Lalai</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Teks</type>
 			<type key="hc" type="h11">Sistem 12 Jam (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Sistem 12 Jam (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Sistem 24 Jam (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Sistem 24 Jam (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Gaya Pemisah Baris Bebas</type>
+			<type key="lb" type="loose" scope="core">Bebas</type>
 			<type key="lb" type="normal">Gaya Pemisah Baris Biasa</type>
+			<type key="lb" type="normal" scope="core">Biasa</type>
 			<type key="lb" type="strict">Gaya Pemisah Baris Ketat</type>
+			<type key="lb" type="strict" scope="core">Ketat</type>
+			<type key="lw" type="breakall" scope="core">Pecahkan semua</type>
+			<type key="lw" type="keepall" scope="core">Simpan semua</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Simpan dalam frasa</type>
 			<type key="m0" type="bgn">Transliterasi BGN AS</type>
 			<type key="m0" type="ungegn">Transliterasi UN GEGN</type>
 			<type key="ms" type="metric">Sistem Metrik</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">Sistem Ukuran Imperial</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Sistem Ukuran AS</type>
+			<type key="ms" type="ussystem" scope="core">AS</type>
 			<type key="numbers" type="ahom">Digit Ahom</type>
 			<type key="numbers" type="arab">Digit Indi-Arab</type>
 			<type key="numbers" type="arabext">Digit Indi Arab Lanjutan</type>
@@ -1277,6 +1328,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Digit Vai</type>
 			<type key="numbers" type="wara">Digit Warang Citi</type>
 			<type key="numbers" type="wcho" draft="contributed">Digit Wancho</type>
+			<type key="ss" type="none" scope="core">Matikan</type>
+			<type key="ss" type="standard" scope="core">Hidupkan</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1295,9 +1348,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1308,18 +1358,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	</characters>
 	<dates>
 		<calendars>
-			<calendar type="buddhist">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
 			<calendar type="chinese">
 				<months>
 					<monthContext type="format">
@@ -1440,6 +1478,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pada' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pada' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1448,6 +1489,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pada' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pada' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1470,11 +1514,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
@@ -1533,10 +1578,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d MMM – E, d MMM, y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1547,10 +1588,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -1817,6 +1854,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pada' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pada' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1825,6 +1865,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'pada' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'pada' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1841,10 +1884,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1906,10 +1950,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E,d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1920,10 +1960,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2073,25 +2109,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</eras>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">E, d/M/y GGGGG</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
-			<calendar type="japanese">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
 			<calendar type="roc">
 				<eras>
 					<eraNames>
@@ -2210,13 +2236,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="weekOfMonth">
-				<displayName>Minggu dalam Bulan</displayName>
+				<displayName>minggu dalam bulan</displayName>
 			</field>
 			<field type="weekOfMonth-short">
-				<displayName>Minggu dlm bulan</displayName>
+				<displayName>minggu dlm bln</displayName>
 			</field>
 			<field type="weekOfMonth-narrow">
-				<displayName>Minggu dalam Bulan</displayName>
+				<displayName>mgu dlm bln</displayName>
 			</field>
 			<field type="day">
 				<displayName>hari</displayName>
@@ -2243,13 +2269,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="1">esok</relative>
 			</field>
 			<field type="dayOfYear">
-				<displayName>Hari dalam Tahun</displayName>
+				<displayName>hari dalam tahun</displayName>
 			</field>
 			<field type="dayOfYear-short">
-				<displayName>Hari dlm Thn</displayName>
-			</field>
-			<field type="dayOfYear-narrow">
-				<displayName>Hari dlm Thn</displayName>
+				<displayName>hari dlm thn</displayName>
 			</field>
 			<field type="weekday">
 				<displayName>Hari dalam Minggu</displayName>
@@ -2260,9 +2283,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekdayOfMonth-short">
 				<displayName>Hari dlm bln</displayName>
 			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName>Hari dlm bln</displayName>
-			</field>
 			<field type="sun">
 				<relative type="-1">Ahad lalu</relative>
 				<relative type="0">Ahad ini</relative>
@@ -2540,7 +2560,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Baitulmuqaddis</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Pulau Canton</exemplarCity>
 			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
@@ -2595,9 +2615,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Waktu Afrika Barat</generic>
-					<standard>Waktu Piawai Afrika Barat</standard>
-					<daylight>Waktu Musim Panas Afrika Barat</daylight>
+					<standard>Waktu Afrika Barat</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2978,6 +2996,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Waktu Piawai Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Waktu Hawaii-Aleutian</generic>
@@ -3553,8 +3576,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -3874,7 +3895,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Denar Macedonia</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName>Kyat Myanma</displayName>
+				<displayName>Kyat Myanmar</displayName>
+				<displayName count="other">Kyat Myanmar</displayName>
 			</currency>
 			<currency type="MNT">
 				<displayName>Tugrik Mongolia</displayName>
@@ -4091,6 +4113,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Dolar Caribbean Timur</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder Caribbean</displayName>
+				<displayName count="other">Guilder Caribbean</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Franc CFA BCEAO</displayName>
 			</currency>
@@ -4116,6 +4142,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName draft="contributed">Dolar Zimbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Emas Zimbabwe</displayName>
+				<displayName count="other">Emas Zimbabwe</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">Dolar Zimbabwe (2009)</displayName>
 			</currency>
@@ -4304,7 +4334,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>milimol setiap liter</displayName>
 				<unitPattern count="other">{0} milimol setiap liter</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>bahagian</displayName>
+				<unitPattern count="other">{0} bahagian</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>bahagian setiap juta</displayName>
 				<unitPattern count="other">{0} bahagian setiap juta</unitPattern>
 			</unit>
@@ -4318,6 +4352,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>permyriad</displayName>
 				<unitPattern count="other">{0} permyriad</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukosa</displayName>
+				<unitPattern count="other">{0} glukosa</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter sekilometer</displayName>
 				<unitPattern count="other">{0} liter sekilometer</unitPattern>
@@ -4692,6 +4730,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>milimeter raksa</displayName>
 				<unitPattern count="other">{0} milimeter raksa</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>merkuri</displayName>
+				<unitPattern count="other">{0} merkuri</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>paun seinci persegi</displayName>
 				<unitPattern count="other">{0} paun seinci persegi</unitPattern>
@@ -4741,6 +4783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} knot</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
+				<displayName>Beaufort</displayName>
 				<unitPattern count="other">Beaufort {0}</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
@@ -4824,6 +4867,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} cawan metrik</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>auns cecair metrik</displayName>
+				<unitPattern count="other">{0} auns cecair metrik</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ekar-kaki</displayName>
 				<unitPattern count="other">{0} ekar-kaki</unitPattern>
@@ -4871,17 +4918,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>kuart Imp.</displayName>
 				<unitPattern count="other">{0} kuart Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>cahaya</displayName>
-				<unitPattern count="other">{0} cahaya</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="other">{0} steradian</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>bahagian per bilion</displayName>
-				<unitPattern count="other">{0} bahagian per bilion</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori [IT]</displayName>
+				<unitPattern count="other">{0} kalori [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram-daya</displayName>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>bahagian setiap bilion</displayName>
+				<unitPattern count="other">{0} bahagian setiap bilion</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>malam</displayName>
-				<unitPattern count="other">{0} malam</unitPattern>
 				<perUnitPattern>{0} setiap malam</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -4940,12 +5033,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-karat">
 				<displayName>karat</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>bahagian</displayName>
+				<unitPattern count="other">{0} bahagian</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>peratus</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>per seribu</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 			</unit>
@@ -5211,11 +5311,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>cubit</displayName>
 				<unitPattern count="other">{0} cubit</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>cahaya</displayName>
 				<unitPattern count="other">{0} cahaya</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>bahagian/bilion</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -5256,12 +5360,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-inch">
 				<displayName>in²</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>bahagian</displayName>
+				<unitPattern count="other">{0} bahagian</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>mpg UK</displayName>
 				<unitPattern count="other">{0}m/gUK</unitPattern>
@@ -5489,14 +5600,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-dram">
 				<unitPattern count="other">{0}dr.fl.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>cahaya</displayName>
-				<unitPattern count="other">{0} cahaya</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>malam</displayName>
-				<unitPattern count="other">{0} malam</unitPattern>
-				<perUnitPattern>{0}/malam</perUnitPattern>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ms_Arab.xml b/make/data/cldr/common/main/ms_Arab.xml
index ce88331ca6f..58c26c002e5 100644
--- a/make/data/cldr/common/main/ms_Arab.xml
+++ b/make/data/cldr/common/main/ms_Arab.xml
@@ -760,6 +760,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/mt.xml b/make/data/cldr/common/main/mt.xml
index df9ca3a1f79..a1b0ebcb2de 100644
--- a/make/data/cldr/common/main/mt.xml
+++ b/make/data/cldr/common/main/mt.xml
@@ -861,9 +861,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="islamic-civil" draft="provisional">Kalendarju Islamiku-Ċivili</type>
 			<type key="calendar" type="iso8601">Kalendarju ISO-8601</type>
 			<type key="calendar" type="japanese">Kalendarju Ġappuniż</type>
-			<type key="collation" type="big5han">Ordni Ċiniż Tradizzjonali (Big5)</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">Ordni tad-Dizzjunarju</type>
-			<type key="collation" type="gb2312han">Ordni Ċiniż Sempliċi (GB2312)</type>
 			<type key="collation" type="phonebook">Ordni Telefonika</type>
 			<type key="collation" type="pinyin">Ordni tal-Pinjin</type>
 			<type key="collation" type="standard">Ordni Standard</type>
@@ -1766,9 +1764,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Jamaica">
 				<exemplarCity>il-Ġamajka</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>il-Belt tal-Kuwajt</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/mww.xml b/make/data/cldr/common/main/mww.xml
new file mode 100644
index 00000000000..5da9f871a93
--- /dev/null
+++ b/make/data/cldr/common/main/mww.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="mww"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="ar" draft="unconfirmed">𞄤𞄣</language>
+			<language type="bn" draft="unconfirmed">𞄜𞄤</language>
+			<language type="en" draft="unconfirmed">𞄥𞄴𞄅𞄇𞄉𞄦𞄱𞄊</language>
+			<language type="fr" draft="unconfirmed">𞄕𞄤𞄰𞄎𞄦𞄴</language>
+			<language type="zh" draft="unconfirmed">𞄋𞄄</language>
+		</languages>
+		<scripts>
+			<script type="Hmnp" draft="unconfirmed">𞄐𞄦𞄲𞄤𞄎𞄫𞄰 𞄚𞄜𞄲𞄔𞄬𞄱 𞄀𞄄𞄰𞄩</script>
+		</scripts>
+		<territories>
+			<territory type="US" draft="unconfirmed">𞄒𞄫𞄱𞄔𞄩𞄴</territory>
+		</territories>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters draft="unconfirmed">[𞄱 𞄶 𞄲 𞄳 𞄰 𞄴 𞄵 𞅏 𞄼 𞄽 𞄀 𞄁 𞄂 𞄃 𞄄 𞄅 𞄆 𞄇 𞄈 𞄉 𞄊 𞄋 𞄌 𞄍 𞄎 𞄏 𞄐 𞄑 𞄒 𞄓 𞄔 𞄕 𞄖 𞄗 𞄘 𞄙 𞄚 𞄛 𞄜 𞄝 𞄞 𞄟 𞄠 𞄡 𞄢 𞄣 𞄤 𞄥 𞄦 𞄧 𞄨 𞄩 𞄪 𞄫 𞄬 𞅎]</exemplarCharacters>
+		<!-- <exemplarCharacters type="auxiliary">[]</exemplarCharacters> -->
+		<exemplarCharacters type="index" draft="unconfirmed">[𞄀 𞄁 𞄂 𞄃 𞄄 𞄅 𞄆 𞄇 𞄈 𞄉 𞄊 𞄋 𞄌 𞄍 𞄎 𞄏 𞄐 𞄑 𞄒 𞄓 𞄔 𞄕 𞄖 𞄗 𞄘 𞄙 𞄚 𞄛 𞄜 𞄝 𞄞 𞄟 𞄠 𞄡 𞄢 𞄣 𞄤 𞄥 𞄦 𞄧 𞄨 𞄩 𞄪 𞄫 𞄬]</exemplarCharacters>
+		<exemplarCharacters type="numbers" draft="unconfirmed">[\- ‑ , . % + 𞅀 𞅁 𞅂 𞅃 𞅄 𞅅 𞅆 𞅇 𞅈 𞅉]</exemplarCharacters>
+		<exemplarCharacters type="punctuation" draft="unconfirmed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+	</characters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">𞄆𞄬</month>
+							<month type="2" draft="unconfirmed">𞄛𞄨𞄱𞄄𞄤𞄲𞄨</month>
+							<month type="3" draft="unconfirmed">𞄒𞄫𞄰𞄒𞄪𞄱</month>
+							<month type="4" draft="unconfirmed">𞄤𞄨𞄱</month>
+							<month type="5" draft="unconfirmed">𞄀𞄪𞄴</month>
+							<month type="6" draft="unconfirmed">𞄛𞄤𞄱𞄞𞄤𞄦</month>
+							<month type="7" draft="unconfirmed">𞄔𞄩𞄴𞄆𞄨𞄰</month>
+							<month type="8" draft="unconfirmed">𞄕𞄩𞄲𞄔𞄄𞄰𞄤</month>
+							<month type="9" draft="unconfirmed">𞄛𞄤𞄱𞄒𞄤𞄰</month>
+							<month type="10" draft="unconfirmed">𞄪𞄱𞄀𞄤𞄴</month>
+							<month type="11" draft="unconfirmed">𞄚𞄦𞄲𞄤𞄚𞄄𞄰𞄫</month>
+							<month type="12" draft="unconfirmed">𞄒𞄩𞄱𞄔𞄬𞄴</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="stand-alone">
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">𞄎𞄤𞄲</day>
+							<day type="mon" draft="unconfirmed">𞄈𞄦</day>
+							<day type="tue" draft="unconfirmed">𞄆𞄨𞄰</day>
+							<day type="wed" draft="unconfirmed">𞄗𞄄𞄤𞄰𞄦</day>
+							<day type="thu" draft="unconfirmed">𞄙𞄤𞄱𞄨</day>
+							<day type="fri" draft="unconfirmed">𞄑𞄤𞄱𞄨</day>
+							<day type="sat" draft="unconfirmed">𞄊𞄧𞄳</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="narrow">
+							<quarter type="1" draft="unconfirmed">𞅁</quarter>
+							<quarter type="2" draft="unconfirmed">𞅂</quarter>
+							<quarter type="3" draft="unconfirmed">𞅃</quarter>
+							<quarter type="4" draft="unconfirmed">𞅄</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<eras>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">𞄜𞄆𞄪</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="year">
+				<displayName draft="unconfirmed">𞄛𞄩</displayName>
+			</field>
+		</fields>
+	</dates>
+	<numbers>
+		<defaultNumberingSystem>hmnp</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
+		<currencies>
+			<currency type="USD">
+				<symbol draft="contributed">𞅎</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/mww_Hmnp.xml b/make/data/cldr/common/main/mww_Hmnp.xml
new file mode 100644
index 00000000000..639b8ee8760
--- /dev/null
+++ b/make/data/cldr/common/main/mww_Hmnp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="mww"/>
+		<script type="Hmnp"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/mww_Hmnp_US.xml b/make/data/cldr/common/main/mww_Hmnp_US.xml
new file mode 100644
index 00000000000..2b030f072a6
--- /dev/null
+++ b/make/data/cldr/common/main/mww_Hmnp_US.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="mww"/>
+		<script type="Hmnp"/>
+		<territory type="US"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/my.xml b/make/data/cldr/common/main/my.xml
index 42aab30f35a..fb68d319367 100644
--- a/make/data/cldr/common/main/my.xml
+++ b/make/data/cldr/common/main/my.xml
@@ -49,6 +49,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">အဇာဘိုင်ဂျန်</language>
 			<language type="az" alt="short">အဇာရီ</language>
 			<language type="ba">ဘက်ရှ်ကာ</language>
+			<language type="bal">ဘယ်လူချီ</language>
 			<language type="ban">ဘာလီ</language>
 			<language type="bas">ဘာဆာ</language>
 			<language type="be">ဘီလာရုစ်</language>
@@ -180,7 +181,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hax">တောင် ဟိုင်ဒါ</language>
 			<language type="he">ဟီဘရူး</language>
 			<language type="hi">ဟိန္ဒီ</language>
-			<language type="hi_Latn">ဟိန္ဒီ (လက်တင်)</language>
 			<language type="hil">ဟီလီဂေနွန်</language>
 			<language type="hmn">မုံ</language>
 			<language type="hr">ခရိုအေးရှား</language>
@@ -248,6 +248,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ဘာဖီအာ</language>
 			<language type="ksh">ကိုလိုနီယန်း</language>
 			<language type="ku">ကဒ်</language>
+			<language type="ku" menu="core">ကဒ်</language>
+			<language type="ku" menu="extension">ကာမန်းဂျီ</language>
 			<language type="kum">ကွမ်မိုက်</language>
 			<language type="kv">ကိုမီ</language>
 			<language type="kw">ခိုနီရှ်</language>
@@ -550,7 +552,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Syrc">ဆီရီရက်ခ်</script>
 			<script type="Tale">တိုင်လီ</script>
 			<script type="Taml">တမီးလ်</script>
-			<script type="Telu">တီလု</script>
+			<script type="Telu">တယ်လူဂူ</script>
 			<script type="Tfng">တီဖီနော</script>
 			<script type="Tglg">တဂလော့ဂ်</script>
 			<script type="Thaa">သာအ်</script>
@@ -653,6 +655,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">တရုတ်</territory>
 			<territory type="CO">ကိုလံဘီယာ</territory>
 			<territory type="CP">ကလစ်ပါတန်ကျွန်း</territory>
+			<territory type="CQ">ဆာ့က်</territory>
 			<territory type="CR">ကို့စ်တာရီကာ</territory>
 			<territory type="CU">ကျူးဘား</territory>
 			<territory type="CV">ကိတ်ဗာဒီ</territory>
@@ -898,44 +901,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">ငွေရေတွက်ပုံစနစ်</key>
 			<key type="collation">အစဉ်လိုက်စီရန်</key>
 			<key type="currency">ငွေကြေး</key>
+			<key type="em">အီမိုဂျီဖော်ပြချက်</key>
 			<key type="hc">နာရီစက်ဝန်း (၁၂ နှင့် ၂၄)</key>
 			<key type="lb">စာပိုဒ်ခွဲပုံစံ</key>
+			<key type="lw">စာပုဒ်ခြား</key>
 			<key type="ms">တိုင်းတာရေးစနစ်</key>
 			<key type="numbers">ကိန်းဂဏန်း</key>
+			<key type="ss">စာလုံးခြား</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ဗုဒ္ဓ ပြက္ခဒိန်</type>
+			<type key="calendar" type="buddhist" scope="core">ဗုဒ္ဓ</type>
 			<type key="calendar" type="chinese">တရုတ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="chinese" scope="core">တရုတ်</type>
 			<type key="calendar" type="coptic">ကို့ပ်တစ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="coptic" scope="core">ကို့ပ်တစ်</type>
 			<type key="calendar" type="dangi">ဒန်းဂိ ပြက္ခဒိန်</type>
+			<type key="calendar" type="dangi" scope="core">ဒန်းဂိ</type>
 			<type key="calendar" type="ethiopic">အီသီယိုးပီးယား ပြက္ခဒိန်</type>
+			<type key="calendar" type="ethiopic" scope="core">အီသီယိုးပီးယား</type>
 			<type key="calendar" type="ethiopic-amete-alem">အီသီယိုပစ်ခ် အာမဲတဲ အာလင်မ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">အီသီယိုပစ်ခ် အာမဲတဲ အာလင်မ်</type>
 			<type key="calendar" type="gregorian">နိုင်ငံတကာသုံး ပြက္ခဒိန်</type>
+			<type key="calendar" type="gregorian" scope="core">နိုင်ငံတကာသုံး</type>
 			<type key="calendar" type="hebrew">ဟီဘရူး ပြက္ခဒိန်</type>
+			<type key="calendar" type="hebrew" scope="core">ဟီဘရူး</type>
 			<type key="calendar" type="indian">အိန္ဒြိယ အမျိုးသား ပြက္ခဒိန်</type>
 			<type key="calendar" type="islamic">အစ္စလာမ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="islamic" scope="core">အစ္စလာမ်</type>
 			<type key="calendar" type="islamic-civil">အစ္စလာမ်မစ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="islamic-civil" scope="core">အစ္စလာမ်</type>
 			<type key="calendar" type="islamic-umalqura">အယ်လ်ကူရာ အစ္စလာမ်မစ် ပြက္ခဒိန်</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">အစ္စလာမ်</type>
 			<type key="calendar" type="iso8601">ISO-8601 ပြက္ခဒိန်</type>
 			<type key="calendar" type="japanese">ဂျပန် ပြက္ခဒိန်</type>
+			<type key="calendar" type="japanese" scope="core">ဂျပန်</type>
 			<type key="calendar" type="persian">ပါရှား ပြက္ခဒိန်</type>
+			<type key="calendar" type="persian" scope="core">ပါရှား</type>
 			<type key="calendar" type="roc">မင်ဂုအို ပြက္ခဒိန်</type>
+			<type key="calendar" type="roc" scope="core">မင်ဂုအို</type>
 			<type key="cf" type="account">စာရင်းကိုင်သုံး ငွေရေတွက်ပုံစနစ်</type>
+			<type key="cf" type="account" scope="core">စာရင်းကိုင်</type>
 			<type key="cf" type="standard">ပုံမှန် ငွေရေတွက်ပုံစနစ်</type>
+			<type key="cf" type="standard" scope="core">ပုံမှန်</type>
 			<type key="collation" type="ducet">အစဉ်လိုက်စီထားသော ယူနီကုတ်</type>
+			<type key="collation" type="ducet" scope="core">ပုံသေယူနီကုတ်</type>
 			<type key="collation" type="phonebook">ဖုန်းစာအုပ် အစီအစဉ်</type>
 			<type key="collation" type="search">ယေဘုယျရှာခြင်း</type>
+			<type key="collation" type="search" scope="core">ရှာဖွေမှု</type>
 			<type key="collation" type="standard">ပုံမှန်စီထားသော</type>
+			<type key="collation" type="standard" scope="core">ပုံမှန်</type>
+			<type key="em" type="default" scope="core">ပုံသေ | မူသေ | မူရင်း | ပင်တိုင်</type>
+			<type key="em" type="emoji" scope="core">အီမိုဂျီ</type>
+			<type key="em" type="text" scope="core">စာသား</type>
 			<type key="hc" type="h11">၁၂ နာရီ စနစ် (၀–၁၁)</type>
+			<type key="hc" type="h11" scope="core">၁၂ (၀−၁၁)</type>
 			<type key="hc" type="h12">၁၂ နာရီစနစ် (၁–၁၂)</type>
+			<type key="hc" type="h12" scope="core">၁၂ (၁−၁၂)</type>
 			<type key="hc" type="h23">၂၄ နာရီ စနစ် (၀–၂၃)</type>
+			<type key="hc" type="h23" scope="core">၂၄ (၀−၂၃)</type>
 			<type key="hc" type="h24">၂၄ နာရီ စနစ်(၁–၂၄)</type>
+			<type key="hc" type="h24" scope="core">၂၄ (၁−၂၄)</type>
 			<type key="lb" type="loose">ကန့်သတ်မထားသော စာပိုဒ်ခွဲပုံစံ</type>
+			<type key="lb" type="loose" scope="core">ကန့်သတ်မထား</type>
 			<type key="lb" type="normal">ပုံမှန်စာပိုဒ်ခွဲပုံစံ</type>
+			<type key="lb" type="normal" scope="core">ပုံမှန်</type>
 			<type key="lb" type="strict">ကန့်သတ်ထားသော စာပိုဒ်ခွဲပုံစံ</type>
+			<type key="lb" type="strict" scope="core">ကန့်သတ်ထား</type>
+			<type key="lw" type="breakall" scope="core">အားလုံးခွဲရန်</type>
+			<type key="lw" type="keepall" scope="core">အားလုံးတွဲထားရန်</type>
+			<type key="lw" type="normal" scope="core">ပုံမှန်</type>
+			<type key="lw" type="phrase" scope="core">စကားစုအလိုက် တွဲထားရန်</type>
 			<type key="ms" type="metric">မက်ထရစ်စနစ်</type>
+			<type key="ms" type="metric" scope="core">မက်ထရစ်</type>
 			<type key="ms" type="uksystem">ဗြိတိသျှတိုင်းတာစနစ်</type>
+			<type key="ms" type="uksystem" scope="core">ဗြိတိန်</type>
 			<type key="ms" type="ussystem">အမေရိကန်တိုင်းတာစနစ်</type>
+			<type key="ms" type="ussystem" scope="core">အမေရိကန်</type>
 			<type key="numbers" type="arab">အာရပ် ဂဏန်းခြေ</type>
 			<type key="numbers" type="arabext">တိုးချဲ့အာရပ် ဂဏန်းခြေ</type>
 			<type key="numbers" type="armn">အာမေးနီးယား ဂဏန်းခြေ</type>
@@ -977,6 +1019,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">ထိုင်း ဂဏန်းခြေ</type>
 			<type key="numbers" type="tibt">တိဘက် ဂဏန်းခြေ</type>
 			<type key="numbers" type="vaii">ဗိုင်း ဂဏန်းခြေ</type>
+			<type key="ss" type="none" scope="core">ပိတ်</type>
+			<type key="ss" type="standard" scope="core">ဖွင့်</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">မက်ထရစ်စနစ်</measurementSystemName>
@@ -998,9 +1042,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":" draft="contributed">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£" draft="contributed">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-" draft="contributed">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample="," draft="contributed">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1062,22 +1103,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd၊ E</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d၊ E</dateFormatItem>
 						<dateFormatItem id="h">a h</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">v a h</dateFormatItem>
+						<dateFormatItem id="Hv">v HH'h'</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd၊ E</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d E</dateFormatItem>
 						<dateFormatItem id="MMMMEd">MMMM d Eနေ့</dateFormatItem>
 						<dateFormatItem id="yyyyM">G M/y</dateFormatItem>
 						<dateFormatItem id="yyyyMd">GGGGG dd/MM/Y</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G d MMM y</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d၊ E</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
@@ -1097,6 +1146,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG y/M – GGGGG y/M</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d၊ E – MMM d၊ E</greatestDifference>
+							<greatestDifference id="G">G y MMM d၊ E – G y MMM d၊ E</greatestDifference>
+							<greatestDifference id="M">G y MMM d၊ E – MMM d၊ E</greatestDifference>
+							<greatestDifference id="y">G y MMM d၊ E – y MMM d၊ E</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
@@ -1234,15 +1289,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri">သ</day>
 							<day type="sat">စ</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">နွေ</day>
-							<day type="mon">လာ</day>
-							<day type="tue">ဂါ</day>
-							<day type="wed">ဟူး</day>
-							<day type="thu">တေး</day>
-							<day type="fri">ကြာ</day>
-							<day type="sat">နေ</day>
-						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
@@ -1261,12 +1307,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
 						<quarterWidth type="narrow">
 							<quarter type="1">ပ</quarter>
 							<quarter type="2">ဒု</quarter>
@@ -1374,13 +1414,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d ရက် E</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="GyMd">G y/M/d</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">G y/ MMM d/ E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd၊ E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d၊ E</dateFormatItem>
 						<dateFormatItem id="h">a h</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
@@ -1388,6 +1431,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">v HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmv">v a h:mm</dateFormatItem>
 						<dateFormatItem id="Hmv">v HH:mm</dateFormatItem>
+						<dateFormatItem id="hv">v a h</dateFormatItem>
+						<dateFormatItem id="Hv">v HH</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">d/M E</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d E</dateFormatItem>
@@ -2088,6 +2133,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>အီစတာ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ကွိုင်းဟိုင်ခ်</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ပွန်တာ အရီနာစ်</exemplarCity>
 			</zone>
@@ -2353,9 +2401,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ဖနွမ်ပင်</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>အန်ဒါဘူရီ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ကန်တွန်</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3025,9 +3070,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>အနောက်အာဖရိက အချိန်</generic>
-					<standard>အနောက်အာဖရိက စံတော်ချိန်</standard>
-					<daylight>အနောက်အာဖရိက နွေရာသီ အချိန်</daylight>
+					<standard>အနောက်အာဖရိက အချိန်</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3377,6 +3420,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ဂိုင်ယာနာ အချိန်</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ဟာဝိုင်ယီ အယ်လူးရှန်း စံတော်ချိန်</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ဟာဝိုင်ယီ အယ်လူးရှန်း အချိန်</generic>
@@ -3801,6 +3849,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ချုခ် အချိန်</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>တူရကီ အချိန်</generic>
+					<standard>တူရကီ စံတော်ချိန်</standard>
+					<daylight>တူရကီ နွေရာသီ အချိန်</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>တာ့ခ်မင်နစ္စတန် အချိန်</generic>
@@ -3938,29 +3993,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤ 0 ထောင်</pattern>
-					<pattern type="10000" count="other">¤ 0 သောင်း</pattern>
-					<pattern type="100000" count="other">¤ 0 သိန်း</pattern>
-					<pattern type="1000000" count="other">¤ 0 သန်း</pattern>
-					<pattern type="10000000" count="other">¤ 0 ကုဋေ</pattern>
-					<pattern type="100000000" count="other">¤ 00 ကုဋေ</pattern>
-					<pattern type="1000000000" count="other">¤ 000 ကုဋေ</pattern>
-					<pattern type="10000000000" count="other">¤ 0000 ကုဋေ</pattern>
-					<pattern type="100000000000" count="other">¤ ကုဋေ 0 သောင်း</pattern>
-					<pattern type="1000000000000" count="other">¤ ကုဋေ 0 သိန်း</pattern>
-					<pattern type="10000000000000" count="other">¤ ကုဋေ 0 သန်း</pattern>
-					<pattern type="100000000000000" count="other">¤ 0 ကောဋိ</pattern>
+					<pattern type="1000" count="other">0 ထောင် ¤</pattern>
+					<pattern type="10000" count="other">0 သောင်း ¤</pattern>
+					<pattern type="100000" count="other">0 သိန်း ¤</pattern>
+					<pattern type="1000000" count="other">0 သန်း ¤</pattern>
+					<pattern type="10000000" count="other">0 ကုဋေ ¤</pattern>
+					<pattern type="100000000" count="other">00 ကုဋေ ¤</pattern>
+					<pattern type="1000000000" count="other">000 ဋေ ¤</pattern>
+					<pattern type="10000000000" count="other">ဋေ 0 ထ ¤</pattern>
+					<pattern type="100000000000" count="other">ဋေ 0 သ ¤</pattern>
+					<pattern type="1000000000000" count="other">ဋေ 0 သိန်း ¤</pattern>
+					<pattern type="10000000000000" count="other">ဋေ 0 သန်း ¤</pattern>
+					<pattern type="100000000000000" count="other">0 ကောဋိ ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{1} {0}</unitPattern>
 		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="AED">
 				<displayName>အာရပ်စော်ဘွားများ ပြည်ထောင်စု ဒါဟမ်း</displayName>
@@ -4397,7 +4464,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="SLL">
 				<displayName>ဆီယာရာလီယွန်း လီအိုနီ (၁၉၆၄—၂၀၂၂)</displayName>
-				<displayName count="other">ဆီယာရာလီယွန်း လီအိုနီ (၁၉၆၄—၂၀၂၂)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>ဆိုမာလီ သျှီလင်</displayName>
@@ -4507,6 +4573,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>အရှေ့ကာရစ်ဘီယံ ဒေါ်လာ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ကာရစ်ဘီယံ ဂင်းဒါး</displayName>
+				<displayName count="other">ကာရစ်ဘီယံ ဂင်းဒါး</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>အထူးထုတ်ယူခွင့်</displayName>
 			</currency>
@@ -4539,6 +4609,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>ဇင်ဘာဘွေ ဒေါ်လာ</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ဇင်ဘာဘွေ ရွှေ</displayName>
+				<displayName count="other">ဇင်ဘာဘွေ ရွှေ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0} နှင့်အထက်</pattern>
@@ -4723,7 +4797,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>တစ်လီတာရှိ မီလီမိုးလ်</displayName>
 				<unitPattern count="other">တစ်လီတာရှိ {0} မီလီမိုးလ်</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ပတ်</displayName>
+				<unitPattern count="other">{0} ပတ်</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">တစ်သန်းပုံ {0} ပုံ</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
@@ -4737,6 +4815,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<unitPattern count="other">{0} ပါမီရိတ်</unitPattern>
 			</unit>
+			<unit type="concentr-mole">
+				<displayName>မိုး</displayName>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ဂလူးကို့စ်</displayName>
+				<unitPattern count="other">{0} ဂလူးကို့စ်</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>တစ်ကီလိုမီတာရှိ လီတာ</displayName>
 				<unitPattern count="other">တစ်ကီလိုမီတာရှိ {0} လီတာ</unitPattern>
@@ -5066,6 +5151,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ပြဒါးမီလီမီတာ</displayName>
 				<unitPattern count="other">{0} ပြဒါးမီလီမီတာ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ပြဒါး</displayName>
+				<unitPattern count="other">{0} ပြဒါး</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">တစ်စတုရန်းလက်မလျှင် {0} ပေါင်</unitPattern>
 			</unit>
@@ -5177,6 +5266,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>မထ္ထရစ် ခွက်</displayName>
 				<unitPattern count="other">{0} မထ္ထရစ် ခွက်</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>မက်ထရစ် အရည် အောင်စ</displayName>
+				<unitPattern count="other">{0} မက်ထရစ် အရည် အောင်စ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="other">{0} ဧက-ပေ</unitPattern>
 			</unit>
@@ -5214,19 +5307,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-dessert-spoon-imperial">
 				<unitPattern count="other">ဗြိတိသျှသုံး အချိုပွဲဇွန်း {0} ဇွန်း</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>အလင်း</displayName>
-				<unitPattern count="other">{0} အလင်း</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>စတယ်ရေဒီယန်</displayName>
+				<unitPattern count="other">{0} စတယ်ရေဒီယန်</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>သန်းတစ်ထောင်ပုံ တစ်ပုံ</displayName>
+			<unit type="concentr-katal">
+				<displayName>ကတ်တဲလ်</displayName>
+				<unitPattern count="other">{0} ကတ်တဲလ်</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ဖာရက်ဒ်</displayName>
+				<unitPattern count="other">{0} ဖာရက်ဒ်</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ဟင်နရီ</displayName>
+				<unitPattern count="other">{0} ဟင်နရီ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>စီးမန်</displayName>
+				<unitPattern count="other">{0} စီးမန်</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ကယ်လိုရီ [IT]</displayName>
+				<unitPattern count="other">{0} ကယ်လိုရီ [IT]</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ဂရေးစ်</displayName>
+				<unitPattern count="other">{0} ဂရေးစ်</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ကီလိုဂရမ်စွမ်းအင်</displayName>
+				<unitPattern count="other">{0} ကီလိုဂရမ်စွမ်းအင်</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>တက်စလာ</displayName>
+				<unitPattern count="other">{0} တက်စလာ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">သန်းတစ်ထောင်ပုံ {0} ပုံ</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ည</displayName>
-				<unitPattern count="other">{0} ည</unitPattern>
-				<perUnitPattern>{0}/ည</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>အရပ် လေးမျက်နှာ</displayName>
 				<coordinateUnitPattern type="east">{0} အရှေ့</coordinateUnitPattern>
@@ -5285,12 +5404,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-karat">
 				<displayName>ကာရက်</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ပတ်</displayName>
+				<unitPattern count="other">{0} ပတ်</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>တစ်သန်းပုံ တစ်ပုံ</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>ပါမီရိတ်</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ဂလူးကို့စ်</displayName>
+				<unitPattern count="other">{0} ဂလူးကို့စ်</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>လီတာ/ကီလိုမီတာ</displayName>
 			</unit>
@@ -5692,11 +5819,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ဗြိတိသျှသုံး ကွတ်</displayName>
 				<unitPattern count="other">ဗြိတိသျှသုံး {0} ကွတ်</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ကယ်လိုရီ-IT</displayName>
+				<unitPattern count="other">{0} ကယ်လိုရီ-IT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>အလင်း</displayName>
 				<unitPattern count="other">{0} အလင်း</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>သန်းတစ်ထောင်ပုံ တစ်ပုံ</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -5716,8 +5847,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="angle-degree">
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
-			<unit type="area-square-centimeter">
-				<displayName>cm²</displayName>
+			<unit type="concentr-part">
+				<displayName>ပတ်</displayName>
+				<unitPattern count="other">{0} ပတ်</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
@@ -5841,18 +5976,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-drop">
 				<displayName>စက်</displayName>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ကယ်လိုရီ-IT</displayName>
+				<unitPattern count="other">{0} ကယ်လိုရီ-IT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>အလင်း</displayName>
 				<unitPattern count="other">{0}အလင်း</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ည</displayName>
-				<unitPattern count="other">{0} ည</unitPattern>
-				<perUnitPattern>{0}/ည</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/nds.xml b/make/data/cldr/common/main/nds.xml
index b4f1e03f66c..e2db2de5bd2 100644
--- a/make/data/cldr/common/main/nds.xml
+++ b/make/data/cldr/common/main/nds.xml
@@ -918,8 +918,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="iso8601" draft="unconfirmed">ISO-8601-Klenner</type>
 			<type key="calendar" type="japanese" draft="unconfirmed">Japaansch Klenner</type>
 			<type key="calendar" type="roc" draft="unconfirmed">Klenner vun de Republik China</type>
-			<type key="collation" type="big5han" draft="unconfirmed">Traditschonell Chineesch Sorteerregeln - Big5</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">Vereenfacht Chineesch Sorteerregeln - GB2312</type>
 			<type key="collation" type="phonebook" draft="unconfirmed">Telefonbook-Sorteerregeln</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">Pinyin-Sorteerregeln</type>
 			<type key="collation" type="standard" draft="unconfirmed">Standard-Sorteerreeg</type>
@@ -1577,9 +1575,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Westafrikaansch Tiet</generic>
-					<standard draft="unconfirmed">Westafrikaansch Standardtiet</standard>
-					<daylight draft="unconfirmed">Westafrikaansch Summertiet</daylight>
+					<standard draft="unconfirmed">Westafrikaansch Tiet</standard>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
@@ -1756,6 +1752,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/ne.xml b/make/data/cldr/common/main/ne.xml
index 0ef08650f30..a8951965542 100644
--- a/make/data/cldr/common/main/ne.xml
+++ b/make/data/cldr/common/main/ne.xml
@@ -325,6 +325,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">बाफिया</language>
 			<language type="ksh">कोलोग्नियाली</language>
 			<language type="ku">कुर्दी</language>
+			<language type="ku" menu="core">कुर्दिस</language>
+			<language type="ku" menu="extension">कुर्मान्जी</language>
 			<language type="kum">कुमिक</language>
 			<language type="kut">कुतेनाइ</language>
 			<language type="kv">कोमी</language>
@@ -847,6 +849,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">चीन</territory>
 			<territory type="CO">कोलोम्बिया</territory>
 			<territory type="CP">क्लिप्पेर्टन टापु</territory>
+			<territory type="CQ">सार्क</territory>
 			<territory type="CR">कोष्टारिका</territory>
 			<territory type="CU">क्युबा</territory>
 			<territory type="CV">केप भर्डे</territory>
@@ -1085,49 +1088,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">मुद्राको ढाँचा</key>
 			<key type="collation">क्रमबद्ध सुची</key>
 			<key type="currency">मुद्रा</key>
+			<key type="em">इमोजी प्रेजन्टेसन</key>
 			<key type="hc">समय चक्र (12 तथा 24)</key>
 			<key type="lb">पङ्क्ति विच्छेदको शैली</key>
+			<key type="lw">शब्दबीचका लाइन ब्रेकहरू</key>
 			<key type="ms">मापन प्रणाली</key>
 			<key type="numbers">अङ्कहरू</key>
+			<key type="ss">संक्षिप्त शब्दपछि आउने वाक्यान्त</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">बुद्धिष्ट पात्रो</type>
+			<type key="calendar" type="buddhist" scope="core">बौद्ध</type>
 			<type key="calendar" type="chinese">चिनियाँ पात्रो</type>
+			<type key="calendar" type="chinese" scope="core">चिनियाँ</type>
 			<type key="calendar" type="coptic">कोप्टिक पात्र</type>
+			<type key="calendar" type="coptic" scope="core">कोप्टिक</type>
 			<type key="calendar" type="dangi">डाङ्गी पात्रो</type>
+			<type key="calendar" type="dangi" scope="core">डाँगी</type>
 			<type key="calendar" type="ethiopic">इथिओपिक पात्रो</type>
+			<type key="calendar" type="ethiopic" scope="core">इथियोपियाली</type>
 			<type key="calendar" type="ethiopic-amete-alem">इथियिपियाली आमेट आलेम पात्र</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">इथियोपिक अमेटे अलेम</type>
 			<type key="calendar" type="gregorian">ग्रेगोरियन पात्रो</type>
+			<type key="calendar" type="gregorian" scope="core">ग्रिगोरियन</type>
 			<type key="calendar" type="hebrew">हिब्रु पात्रो</type>
+			<type key="calendar" type="hebrew" scope="core">ह्रिब्रू</type>
 			<type key="calendar" type="indian">भारतीय राष्ट्रिय पात्रो</type>
+			<type key="calendar" type="indian" scope="core">भारतीय राष्ट्रिय</type>
 			<type key="calendar" type="islamic">हिजरी पात्रो</type>
+			<type key="calendar" type="islamic" scope="core">हिज्री</type>
 			<type key="calendar" type="islamic-civil">हिजरी पात्रो (टेबुलर, नागरिक युग)</type>
+			<type key="calendar" type="islamic-civil" scope="core">हिज्री (टेबुलर, सिभिल एपोच)</type>
 			<type key="calendar" type="islamic-umalqura">इस्लामी पात्रो</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">हिज्री (अन अल क्वारा)</type>
 			<type key="calendar" type="iso8601">ISO-8601 पात्रो</type>
 			<type key="calendar" type="japanese">जापानी पात्रो</type>
+			<type key="calendar" type="japanese" scope="core">जापानी</type>
 			<type key="calendar" type="persian">फारसी पात्रो</type>
+			<type key="calendar" type="persian" scope="core">पर्सियाली</type>
 			<type key="calendar" type="roc">चिनियाँ गणतन्त्रको पात्रो</type>
+			<type key="calendar" type="roc" scope="core">मिन्ग्वो</type>
 			<type key="cf" type="account">लेखासम्बन्धी मुद्राको ढाँचा</type>
+			<type key="cf" type="account" scope="core">लेखापालन</type>
 			<type key="cf" type="standard">मानक मुद्राको ढाँचा</type>
-			<type key="collation" type="big5han" draft="contributed">परम्परागत चिनिँया क्रमबद्धता पद्दति - बिग फाइभ</type>
+			<type key="cf" type="standard" scope="core">मानक</type>
 			<type key="collation" type="ducet">पूर्वनिर्धारित युनिकोडको क्रमबद्धता सूची</type>
-			<type key="collation" type="gb2312han" draft="contributed">सरलिकृत चिनियाँ क्रमबद्धता पद्दति-गीबीटुथ्रीवानटु</type>
+			<type key="collation" type="ducet" scope="core">डिफल्ट युनिकोड</type>
 			<type key="collation" type="phonebook" draft="contributed">टेलिफोन पुस्तिका क्रमबद्धतापद्दति</type>
 			<type key="collation" type="pinyin" draft="contributed">पिनयिन क्रमबद्धता पद्दति</type>
 			<type key="collation" type="search">सामान्य उद्देशीय खोजी</type>
+			<type key="collation" type="search" scope="core">खोज</type>
 			<type key="collation" type="standard">मानक क्रमबद्धता</type>
+			<type key="collation" type="standard" scope="core">मानक</type>
 			<type key="collation" type="stroke" draft="contributed">स्ट्रोक क्रमबद्धता पद्दति</type>
 			<type key="collation" type="traditional" draft="contributed">परम्परागत क्रमबद्धता पद्दति</type>
+			<type key="em" type="default" scope="core">डिफल्ट</type>
+			<type key="em" type="emoji" scope="core">इमोजी</type>
+			<type key="em" type="text" scope="core">टेक्स्ट</type>
 			<type key="hc" type="h11">१२ घण्टे प्रणाली (०–११)</type>
+			<type key="hc" type="h11" scope="core">१२ (0–11) १२ (0–११)</type>
 			<type key="hc" type="h12">१२ घन्टाको प्रणाली (१–१२)</type>
+			<type key="hc" type="h12" scope="core">१२(१–१२) १२ (1–१२)</type>
 			<type key="hc" type="h23">२४ घन्टाको प्रणाली (०–२३)</type>
+			<type key="hc" type="h23" scope="core">२४ (०–२३) २४ (०–२३)</type>
 			<type key="hc" type="h24">२४ घन्टाको प्रणाली (१–२४)</type>
+			<type key="hc" type="h24" scope="core">२४ (१–२४) २४ (१–२४)</type>
 			<type key="lb" type="loose">पङ्क्ति विच्छेदको खुला शैली</type>
+			<type key="lb" type="loose" scope="core">खुला</type>
 			<type key="lb" type="normal">पङ्क्ति विच्छेदको सामान्य शैली</type>
+			<type key="lb" type="normal" scope="core">सामान्य</type>
 			<type key="lb" type="strict">पङ्क्ति विच्छेदको कडा शैली</type>
+			<type key="lb" type="strict" scope="core">कडा</type>
+			<type key="lw" type="breakall" scope="core">सबै ब्रेक गर्नुहोस्</type>
+			<type key="lw" type="keepall" scope="core">सबै राख्नुहोस्</type>
+			<type key="lw" type="normal" scope="core">सामान्य</type>
+			<type key="lw" type="phrase" scope="core">वाक्यांशमा राख्नुहोस्</type>
 			<type key="ms" type="metric">मेट्रिक प्रणाली</type>
+			<type key="ms" type="metric" scope="core">मेट्रिक</type>
 			<type key="ms" type="uksystem">इम्पेरियल मापन प्रणाली</type>
+			<type key="ms" type="uksystem" scope="core">बेलायती</type>
 			<type key="ms" type="ussystem">संयुक्त राज्य मापन प्रणाली</type>
+			<type key="ms" type="ussystem" scope="core">अमेरिकी</type>
 			<type key="numbers" type="arab">अरबी भारतीय अङ्कहरू</type>
 			<type key="numbers" type="arabext">विस्तृत अरबी भारतीय अङ्कहरू</type>
 			<type key="numbers" type="armn">आर्मेनियाली अङ्कहरू</type>
@@ -1168,6 +1209,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">थाई अङ्कहरू</type>
 			<type key="numbers" type="tibt">तिब्बती अङ्कहरू</type>
 			<type key="numbers" type="vaii">भाई अङ्क</type>
+			<type key="ss" type="none" scope="core">अफ</type>
+			<type key="ss" type="standard" scope="core">अन</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">मेट्रिक</measurementSystemName>
@@ -1186,6 +1229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="index" draft="contributed">[अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‑ — , ; ! ? । '‘’ &quot;“” ( ) \[ \] \{ \}]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary" draft="contributed">[.]</exemplarCharacters>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="," draft="contributed">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
 		</parseLenients>
@@ -1214,7 +1258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1223,11 +1267,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} बजे {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} बजे {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} बजे {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1382,7 +1435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<eras>
 					<eraAbbr>
 						<era type="0">ईसा पूर्व</era>
-						<era type="0" alt="variant">इस्वीपूर्व</era>
 						<era type="1">सन्</era>
 						<era type="1" alt="variant">ईसा काल</era>
 					</eraAbbr>
@@ -1440,6 +1492,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}: {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} मा {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1448,6 +1503,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}: {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} मा {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1461,7 +1519,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">MMMM को W हप्ता</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM को W हप्ता</dateFormatItem>
 						<dateFormatItem id="yw" count="one">Y को w हप्ता</dateFormatItem>
@@ -2162,6 +2222,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>इस्टर</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>कोहाक्व</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>पुन्टा अरिनाज</exemplarCity>
 			</zone>
@@ -2427,9 +2490,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>फेनोम फेन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>एन्डरबरी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>कान्टोन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3099,9 +3159,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>पश्चिम अफ्रिकी समय</generic>
-					<standard>पश्चिम अफ्रिकी मानक समय</standard>
-					<daylight>पश्चिम अफ्रिकी ग्रीष्मकालीन समय</daylight>
+					<standard>पश्चिम अफ्रिकी समय</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3451,6 +3509,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>गुयाना समय</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाई-एलुटियन मानक समय</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाई-एलुटियन समय</generic>
@@ -4026,11 +4089,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4601,6 +4678,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>पूर्वी क्यारिबियन डलर</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>क्यारिबियन गिल्डर</displayName>
+				<displayName count="one">क्यारिबियन गिल्डर</displayName>
+				<displayName count="other">क्यारिबियन गिल्ड</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>सीएफ्‌ए फ्रान्क बीसीइएओ</displayName>
 				<displayName count="one">सीएफ्‌ए फ्रान्क बीसीइएओ</displayName>
@@ -4628,6 +4710,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>जाम्बियाली क्वाचा</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>जिम्बाबेली सुन</displayName>
+				<displayName count="one">जिम्बाबेली सुन</displayName>
+				<displayName count="other">जिम्बाबेली सुन</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4720,7 +4807,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPrefixPattern>पेबि{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p6">
-				<unitPrefixPattern>एक्‍सबि{0}</unitPrefixPattern>
+				<unitPrefixPattern>एक्सबी{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="1024p7">
 				<unitPrefixPattern>जेबि{0}</unitPrefixPattern>
@@ -4785,17 +4872,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>वर्ग फिट</displayName>
 			</unit>
 			<unit type="concentr-karat">
-				<unitPattern count="one">{0}कराट</unitPattern>
-				<unitPattern count="other">{0}कराट</unitPattern>
+				<displayName>क्यारेट</displayName>
+				<unitPattern count="one">{0} क्यारेट</unitPattern>
+				<unitPattern count="other">{0} क्यारेट</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<displayName>मिलिग्राम पति डेेसिलिटर</displayName>
 				<unitPattern count="one">{0} mg/dL</unitPattern>
 				<unitPattern count="other">{0} मिलिग्राम पति डेेसिलिटर</unitPattern>
 			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>मिलिमोल प्रति लिटर</displayName>
+				<unitPattern count="one">{0} mmol/L</unitPattern>
+				<unitPattern count="other">{0} मिलिमोल प्रति लिटर</unitPattern>
+			</unit>
 			<unit type="concentr-item">
 				<displayName>वस्तुहरू</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>भाग</displayName>
+				<unitPattern count="one">{0} भाग</unitPattern>
+				<unitPattern count="other">{0} भाग</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>भाग प्रति दस लाख</displayName>
+				<unitPattern count="one">{0} भाग प्रति दस लाख</unitPattern>
+				<unitPattern count="other">{0} भाग प्रति दस लाख</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} प्रतिशत</unitPattern>
 				<unitPattern count="other">{0} प्रतिशत</unitPattern>
@@ -4808,6 +4911,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} पर्माइराइड</unitPattern>
 				<unitPattern count="other">{0} पर्माइराइड</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ग्लुकोजको</displayName>
+				<unitPattern count="one">ग्लुकोजको {0}</unitPattern>
+				<unitPattern count="other">ग्लुकोजको {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लिटर प्रति किलोमिटर</displayName>
 				<unitPattern count="one">{0}लिटर प्रति किलोमिटर</unitPattern>
@@ -4822,10 +4930,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}माइल प्रति ग्यालोन</unitPattern>
 				<unitPattern count="other">{0}माइल प्रति ग्यालोन</unitPattern>
 			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<unitPattern count="one">{0} माइल प्रति इम्पिरियल ग्यालोन</unitPattern>
+				<unitPattern count="other">{0} माइल प्रति इम्पिरियल ग्यालोन</unitPattern>
+			</unit>
 			<unit type="digital-petabyte">
-				<displayName>पिटाबाइटहरू</displayName>
 				<unitPattern count="one">{0} पिटाबाइट</unitPattern>
-				<unitPattern count="other">{0} पिटाबाइटहरू</unitPattern>
+				<unitPattern count="other">{0} पिटाबाइट</unitPattern>
 			</unit>
 			<unit type="digital-terabyte">
 				<displayName>टेराबाइट</displayName>
@@ -4880,7 +4991,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0} प्रति वर्ष</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName>qtr</displayName>
+				<displayName>क्वाटर</displayName>
 				<unitPattern count="one">{0} क्वाटर</unitPattern>
 				<unitPattern count="other">{0} क्वाटर</unitPattern>
 			</unit>
@@ -4984,6 +5095,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-em">
 				<displayName>टाइपोग्रापिक एम</displayName>
+				<unitPattern count="one">{0} em</unitPattern>
+				<unitPattern count="other">{0} ems</unitPattern>
 			</unit>
 			<unit type="graphics-pixel">
 				<unitPattern count="one">{0} पिक्सेल</unitPattern>
@@ -5013,10 +5126,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} डट प्रति इन्च</unitPattern>
 				<unitPattern count="other">{0} डट प्रति इन्च</unitPattern>
 			</unit>
-			<unit type="graphics-dot">
-				<unitPattern count="one">{0}बिन्‍दु</unitPattern>
-				<unitPattern count="other">{0}बिन्‍दु</unitPattern>
-			</unit>
 			<unit type="length-earth-radius">
 				<displayName>पृथ्वीको त्रिज्या</displayName>
 				<unitPattern count="one">{0} पृथ्वीको त्रिज्या</unitPattern>
@@ -5031,7 +5140,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="length-meter">
 				<unitPattern count="one">{0} मिटर</unitPattern>
 				<unitPattern count="other">{0} मिटर</unitPattern>
-				<perUnitPattern>{0}प्रति मिटर</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<displayName>डेसिमिटर</displayName>
@@ -5068,9 +5176,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} माइल</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName>फुट</displayName>
 				<unitPattern count="one">{0} फुट</unitPattern>
-				<unitPattern count="other">{0} फुट</unitPattern>
+				<unitPattern count="other">{0}फिट</unitPattern>
 				<perUnitPattern>{0} प्रति फुट</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
@@ -5105,8 +5212,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}नउटिकल माइल</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<unitPattern count="one">{0} miles-scandinavian</unitPattern>
-				<unitPattern count="other">{0} miles-scandinavian</unitPattern>
+				<displayName>माइल-स्क्यान्डिनेभियन</displayName>
+				<unitPattern count="one">{0} माइल-स्क्यान्डिनेभियन</unitPattern>
+				<unitPattern count="other">{0} माइल-स्क्यान्डिनेभियन</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>पोइन्ट</displayName>
+				<unitPattern count="one">{0} पोइन्ट</unitPattern>
+				<unitPattern count="other">{0} पोइन्ट</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
 				<unitPattern count="one">{0} सौर्य रेडियस</unitPattern>
@@ -5188,6 +5301,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मिलिमिटर पारो</unitPattern>
 				<unitPattern count="other">{0} मिलिमिटर पारो</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>मर्करीको</displayName>
+				<unitPattern count="one">मर्करीको {0}</unitPattern>
+				<unitPattern count="other">मर्करीको {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>पाउन्ड प्रति वर्ग इन्च</displayName>
 				<unitPattern count="one">{0} पाउन्ड प्रति वर्ग इन्च</unitPattern>
@@ -5232,6 +5350,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">ब्यूफोर्ट {0}</unitPattern>
 				<unitPattern count="other">ब्यूफोर्ट {0}</unitPattern>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName>डिग्री तापक्रम</displayName>
+				<unitPattern count="one">{0} डिग्री तापक्रम</unitPattern>
+				<unitPattern count="other">{0} डिग्री तापक्रम</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="one">{0} डिग्री सेल्सियस्</unitPattern>
 				<unitPattern count="other">{0} डिग्री सेल्सियस्</unitPattern>
@@ -5303,6 +5426,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}मेट्रिक कप</unitPattern>
 				<unitPattern count="other">{0}मेट्रिक कप्स</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>मेट्रिक फ्ल्युड आउन्स</displayName>
+				<unitPattern count="one">{0} मेट्रिक फ्ल्युड आउन्स</unitPattern>
+				<unitPattern count="other">{0} मेट्रिक फ्ल्युड आउन्स</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>वर्ग गज-फिट</displayName>
 				<unitPattern count="one">{0}वर्ग गज-फिट</unitPattern>
@@ -5331,8 +5459,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>Imp. fluid ounces</displayName>
-				<unitPattern count="one">{0} Imp. fluid ounce</unitPattern>
-				<unitPattern count="other">{0} Imp. fluid ounces</unitPattern>
+				<unitPattern count="one">{0} इम्पिरियल फल्युइड आउन्स</unitPattern>
+				<unitPattern count="other">{0} इम्पिरियल फल्युइड आउन्स</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>टेबल चम्चा</displayName>
@@ -5350,9 +5478,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} डेजर्ट चम्चा</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
-				<displayName>Imp. डेजर्ट चम्चा</displayName>
-				<unitPattern count="one">{0} Imp. डेजर्ट चम्चा</unitPattern>
-				<unitPattern count="other">{0} Imp. डेजर्ट चम्चा</unitPattern>
+				<displayName>इम्पिरियल डेजर्ट चम्चा</displayName>
+				<unitPattern count="one">{0} इम्पिरियल डेजर्ट चम्चा</unitPattern>
+				<unitPattern count="other">{0} इम्पिरियल डेजर्ट चम्चा</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<displayName>ड्राम</displayName>
@@ -5364,20 +5492,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} इम्पिरियल चौथाइ</unitPattern>
 				<unitPattern count="other">{0} इम्पिरियल चौथाइ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>प्रकाश</displayName>
-				<unitPattern count="one">प्रकाश</unitPattern>
-				<unitPattern count="other">{0} प्रकाश</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>स्टाराडियन</displayName>
+				<unitPattern count="one">{0} स्टाराडियन</unitPattern>
+				<unitPattern count="other">{0} स्टाराडियन</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>काटल्स</displayName>
+				<unitPattern count="one">{0} काटल</unitPattern>
+				<unitPattern count="other">{0} काटल</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>कुलम्ब</displayName>
+				<unitPattern count="one">{0} कुलम्ब</unitPattern>
+				<unitPattern count="other">{0} कुलम्ब</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>फराड</displayName>
+				<unitPattern count="one">{0} फराड</unitPattern>
+				<unitPattern count="other">{0} फराड</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>हेनरी</displayName>
+				<unitPattern count="one">{0} हेनरी</unitPattern>
+				<unitPattern count="other">{0} हेनरी</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>साइमेन्स</displayName>
+				<unitPattern count="one">{0} साइमेन्स</unitPattern>
+				<unitPattern count="other">{0} साइमेन्स</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>क्यारोली [IT]</displayName>
+				<unitPattern count="one">{0} क्यालोरी [IT]</unitPattern>
+				<unitPattern count="other">{0} क्यालोरी [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>बेक्वेरल</displayName>
+				<unitPattern count="one">{0} बेक्वेरल</unitPattern>
+				<unitPattern count="other">{0} बेक्वेरल</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>सिभर्ट्स</displayName>
+				<unitPattern count="one">{0} सिभर्ट्स</unitPattern>
+				<unitPattern count="other">{0} सिभर्ट्स</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>खैरो</displayName>
+				<unitPattern count="one">{0} खैरो</unitPattern>
+				<unitPattern count="other">{0} खैरा</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>किलोग्राम फोर्स</displayName>
+				<unitPattern count="one">{0} किलोग्राम फोर्स</unitPattern>
+				<unitPattern count="other">{0} किलोग्राम फोर्स</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>टेस्ला</displayName>
+				<unitPattern count="one">{0} टेस्ला</unitPattern>
+				<unitPattern count="other">{0} टेस्ला</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>वेबर्स</displayName>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>अंश प्रति बरब</displayName>
 				<unitPattern count="one">{0} अंश प्रति अरब</unitPattern>
 				<unitPattern count="other">{0} अंश प्रति अरब</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>रात</displayName>
-				<unitPattern count="one">{0} रात</unitPattern>
-				<unitPattern count="other">{0} रात</unitPattern>
 				<perUnitPattern>{0} प्रति रात</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -5526,20 +5711,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} डुनाम</unitPattern>
 			</unit>
 			<unit type="concentr-karat">
-				<displayName>कराट</displayName>
+				<displayName>क्यारेट</displayName>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>मिलिमोल/लिटर</displayName>
 			</unit>
 			<unit type="concentr-item">
 				<displayName>वस्तु</displayName>
 				<unitPattern count="one">{0} वस्तु</unitPattern>
 				<unitPattern count="other">{0} वस्तु</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>भाग</displayName>
+				<unitPattern count="one">{0} भाग</unitPattern>
+				<unitPattern count="other">{0} भाग</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>भाग/दस लाख</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>प्रतिशत</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>प्रति मिल</displayName>
 				<unitPattern count="one">{0}प्रति मिल</unitPattern>
-				<unitPattern count="other">{0}प्रतिशत १</unitPattern>
+				<unitPattern count="other">{0}‰</unitPattern>
 			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>पर्माइराइड</displayName>
@@ -5549,6 +5745,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} मोल</unitPattern>
 				<unitPattern count="other">{0} मोल</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>लिटर/किलोमिटर</displayName>
 			</unit>
@@ -5562,9 +5763,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mpg</unitPattern>
 				<unitPattern count="other">{0} mpg</unitPattern>
 			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>माइल/इम्पिरियल ग्यालोन</displayName>
+			</unit>
 			<unit type="digital-petabyte">
 				<displayName>पिटाबाइट</displayName>
-				<unitPattern count="one">{0} पिटा</unitPattern>
+				<unitPattern count="one">{0} PB</unitPattern>
 				<unitPattern count="other">{0} पिटा</unitPattern>
 			</unit>
 			<unit type="digital-byte">
@@ -5728,7 +5932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>मि.मि.</displayName>
-				<unitPattern count="one">मि.मि.</unitPattern>
+				<unitPattern count="one">{0}मि.मि.</unitPattern>
 				<unitPattern count="other">{0}मि.मि.</unitPattern>
 			</unit>
 			<unit type="length-picometer">
@@ -5772,6 +5976,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="length-fathom">
 				<displayName>फ्यादम</displayName>
 			</unit>
+			<unit type="length-point">
+				<displayName>पोइन्ट</displayName>
+			</unit>
 			<unit type="length-solar-radius">
 				<displayName>सौर्य रेडिआई</displayName>
 			</unit>
@@ -5861,6 +6068,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} हर्सपावर</unitPattern>
 				<unitPattern count="other">{0} हर्सपावर</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>मर्करीको</displayName>
+				<unitPattern count="one">मर्करीको {0}</unitPattern>
+				<unitPattern count="other">मर्करीको {0}</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>इन्च पारो</displayName>
 				<unitPattern count="one">{0} इन्च पारो</unitPattern>
@@ -5912,6 +6124,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="speed-beaufort">
 				<displayName>ब्यूफोर्ट</displayName>
 			</unit>
+			<unit type="temperature-generic">
+				<displayName>डिग्री तापक्रम</displayName>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>डिग्री सेल्सियस्</displayName>
 				<unitPattern count="one">{0}°से</unitPattern>
@@ -5974,6 +6189,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mc</unitPattern>
 				<unitPattern count="other">{0} mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>वर्ग गज फिट</displayName>
 				<unitPattern count="one">{0}वर्ग गज फिट</unitPattern>
@@ -6007,6 +6226,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ब्यारल</unitPattern>
 				<unitPattern count="other">{0} ब्यारल</unitPattern>
 			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>इम्पिरियल डेजर्ट चम्चा</displayName>
+				<unitPattern count="one">{0} इम्पिरियल डेजर्ट चम्चा</unitPattern>
+				<unitPattern count="other">{0} इम्पिरियल डेजर्ट चम्चा</unitPattern>
+			</unit>
 			<unit type="volume-drop">
 				<displayName>थोपा</displayName>
 				<unitPattern count="one">{0} थोपा</unitPattern>
@@ -6014,8 +6238,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-dram">
 				<displayName>ड्राम तरल पदार्थ</displayName>
-				<unitPattern count="one">{0} ड्राम तरल</unitPattern>
-				<unitPattern count="other">{0} ड्राम fl</unitPattern>
+				<unitPattern count="one">{0} ड्राम</unitPattern>
+				<unitPattern count="other">{0} ड्राम</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
 				<displayName>जिगर</displayName>
@@ -6027,12 +6251,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} चुटकी</unitPattern>
 				<unitPattern count="other">{0} चुटकी</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>काट</displayName>
+				<unitPattern count="one">{0} काट</unitPattern>
+				<unitPattern count="other">{0} काट</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>क्याल-IT</displayName>
+				<unitPattern count="one">{0} क्याल-IT</unitPattern>
+				<unitPattern count="other">{0} क्याल-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>प्रकाश</displayName>
 				<unitPattern count="one">{0} प्रकाश</unitPattern>
 				<unitPattern count="other">{0} प्रकाश</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>अंश/अरब</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6125,22 +6403,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="1024p8">
 				<unitPrefixPattern>वाइआइ{0}</unitPrefixPattern>
 			</compoundUnit>
-			<unit type="acceleration-g-force">
-				<unitPattern count="one">{0} g</unitPattern>
-				<unitPattern count="other">{0} g</unitPattern>
-			</unit>
 			<unit type="angle-radian">
 				<unitPattern count="one">{0}rad</unitPattern>
 				<unitPattern count="other">{0}rad</unitPattern>
 			</unit>
-			<unit type="angle-arc-minute">
-				<unitPattern count="one">{0}′</unitPattern>
-				<unitPattern count="other">{0}′</unitPattern>
-			</unit>
-			<unit type="angle-arc-second">
-				<unitPattern count="one">{0}″</unitPattern>
-				<unitPattern count="other">{0}″</unitPattern>
-			</unit>
 			<unit type="area-square-kilometer">
 				<unitPattern count="one">{0} ब.कि.मि.</unitPattern>
 				<unitPattern count="other">{0} ब.कि.मि.</unitPattern>
@@ -6149,10 +6415,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ब.मि.</unitPattern>
 				<unitPattern count="other">{0} ब.मि.</unitPattern>
 			</unit>
-			<unit type="area-square-mile">
-				<unitPattern count="one">{0} बर्ग माईल</unitPattern>
-				<unitPattern count="other">{0} बर्ग माईल</unitPattern>
-			</unit>
 			<unit type="area-acre">
 				<unitPattern count="one">{0} एकर</unitPattern>
 				<unitPattern count="other">{0} एकर</unitPattern>
@@ -6161,11 +6423,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ब.फु.</unitPattern>
 				<unitPattern count="other">{0} ब.फु.</unitPattern>
 			</unit>
+			<unit type="concentr-karat">
+				<displayName>क्यारेट</displayName>
+			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<unitPattern count="one">{0}mmol/L</unitPattern>
 				<unitPattern count="other">{0}mmol/L</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>भाग</displayName>
+				<unitPattern count="one">{0} भाग</unitPattern>
+				<unitPattern count="other">{0} भाग</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>भाग/दस लाख</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -6173,14 +6444,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}‰</unitPattern>
 				<unitPattern count="other">{0}‰</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}L/km</unitPattern>
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
-			<unit type="consumption-liter-per-100-kilometer">
-				<unitPattern count="one">{0}L/100km</unitPattern>
-				<unitPattern count="other">{0}L/100km</unitPattern>
-			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<unitPattern count="one">{0}mpg</unitPattern>
 				<unitPattern count="other">{0}mpg</unitPattern>
@@ -6340,16 +6610,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}nm</unitPattern>
 				<unitPattern count="other">{0}nm</unitPattern>
 			</unit>
-			<unit type="length-picometer">
-				<unitPattern count="one">{0} pm</unitPattern>
-				<unitPattern count="other">{0} pm</unitPattern>
-			</unit>
-			<unit type="length-mile">
-				<unitPattern count="one">{0} माईल</unitPattern>
-				<unitPattern count="other">{0} माईल</unitPattern>
-			</unit>
 			<unit type="length-foot">
-				<unitPattern count="one">{0}′</unitPattern>
+				<unitPattern count="one">{0}फिट</unitPattern>
 				<unitPattern count="other">{0}′</unitPattern>
 			</unit>
 			<unit type="length-inch">
@@ -6403,7 +6665,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="light-solar-luminosity">
 				<unitPattern count="one">{0}L☉</unitPattern>
-				<unitPattern count="other">{0} L☉</unitPattern>
+				<unitPattern count="other">{0}L☉</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>किलो</displayName>
@@ -6412,10 +6674,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} पाउण्ड</unitPattern>
 				<unitPattern count="other">{0} पाउण्ड</unitPattern>
 			</unit>
-			<unit type="mass-ounce">
-				<unitPattern count="one">{0} आऊन्स</unitPattern>
-				<unitPattern count="other">{0} आऊन्स</unitPattern>
-			</unit>
 			<unit type="mass-earth-mass">
 				<unitPattern count="one">{0}M⊕</unitPattern>
 				<unitPattern count="other">{0}M⊕</unitPattern>
@@ -6440,6 +6698,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>मर्करीको</displayName>
+				<unitPattern count="one">मर्करीको {0}</unitPattern>
+				<unitPattern count="other">मर्करीको {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -6464,18 +6727,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} km/h</unitPattern>
 				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="one">{0} mi/h</unitPattern>
-				<unitPattern count="other">{0} mi/h</unitPattern>
-			</unit>
 			<unit type="speed-beaufort">
 				<unitPattern count="one">B{0}</unitPattern>
 				<unitPattern count="other">B{0}</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°से</displayName>
-				<unitPattern count="one">{0}°</unitPattern>
-				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
 				<unitPattern count="one">{0}K</unitPattern>
@@ -6487,11 +6744,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0} km³</unitPattern>
-				<unitPattern count="other">{0} km³</unitPattern>
-			</unit>
-			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} घन माईल</unitPattern>
-				<unitPattern count="other">{0} घन माईल</unitPattern>
+				<unitPattern count="other">{0}घन कि.मि.</unitPattern>
 			</unit>
 			<unit type="volume-megaliter">
 				<unitPattern count="one">{0}ML</unitPattern>
@@ -6517,6 +6770,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0}bu</unitPattern>
 				<unitPattern count="other">{0}bu</unitPattern>
@@ -6525,6 +6782,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}dsp</unitPattern>
 				<unitPattern count="other">{0}dsp</unitPattern>
 			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>इम्पिरियल डेजर्ट चम्चा</displayName>
+				<unitPattern count="one">{0}इम्पिरियल डेजर्ट चम्चा</unitPattern>
+				<unitPattern count="other">{0} इम्पिरियल डेजर्ट चम्चा</unitPattern>
+			</unit>
 			<unit type="volume-dram">
 				<unitPattern count="one">{0}fl.dr.</unitPattern>
 				<unitPattern count="other">{0}fl.dr.</unitPattern>
@@ -6533,26 +6795,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>प्रकाश</displayName>
-				<unitPattern count="one">{0}प्रकाश</unitPattern>
-				<unitPattern count="other">{0}प्रकाशा</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>काट</displayName>
+				<unitPattern count="one">{0} काट</unitPattern>
+				<unitPattern count="other">{0} काट</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="energy-calorie-it">
+				<displayName>क्याल-IT</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>रात</displayName>
 				<unitPattern count="one">{0}रात</unitPattern>
 				<unitPattern count="other">{0}रात</unitPattern>
-				<perUnitPattern>{0}/रात</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start">{0},{1}</listPatternPart>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
 			<listPatternPart type="end">{0} र {1}</listPatternPart>
 			<listPatternPart type="2">{0} र {1}</listPatternPart>
 		</listPattern>
@@ -6565,15 +6828,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit">
-			<listPatternPart type="2">{0},{1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
-			<listPatternPart type="middle">{0}{1}</listPatternPart>
+			<listPatternPart type="middle">{0} {1}</listPatternPart>
 			<listPatternPart type="end">{0} {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="end">{0},{1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
diff --git a/make/data/cldr/common/main/nl.xml b/make/data/cldr/common/main/nl.xml
index 1de3fa015a9..457195e687b 100644
--- a/make/data/cldr/common/main/nl.xml
+++ b/make/data/cldr/common/main/nl.xml
@@ -37,7 +37,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ang">Oudengels</language>
 			<language type="ann">Obolo</language>
 			<language type="anp">Angika</language>
-			<language type="apc" draft="contributed">Levantijns-Arabisch</language>
+			<language type="apc">Levantijns-Arabisch</language>
 			<language type="ar">Arabisch</language>
 			<language type="ar_001">modern standaard Arabisch</language>
 			<language type="arc">Aramees</language>
@@ -87,6 +87,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bkm">Kom</language>
 			<language type="bla">Siksika</language>
 			<language type="blo">Anii</language>
+			<language type="blt" draft="contributed">Tai Dam</language>
 			<language type="bm">Bambara</language>
 			<language type="bn">Bengaals</language>
 			<language type="bo">Tibetaans</language>
@@ -122,6 +123,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="chp">Chipewyan</language>
 			<language type="chr">Cherokee</language>
 			<language type="chy">Cheyenne</language>
+			<language type="cic" draft="contributed">Chickasaw</language>
 			<language type="ckb">Soranî</language>
 			<language type="ckb" alt="menu">Koerdisch, Soranî</language>
 			<language type="ckb" alt="variant">Koerdisch, Soranî</language>
@@ -240,6 +242,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hil">Hiligaynon</language>
 			<language type="hit">Hettitisch</language>
 			<language type="hmn">Hmong</language>
+			<language type="hnj" draft="contributed">Hmong Njua</language>
 			<language type="ho">Hiri Motu</language>
 			<language type="hr">Kroatisch</language>
 			<language type="hsb">Oppersorbisch</language>
@@ -287,6 +290,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kcg">Tyap</language>
 			<language type="kde">Makonde</language>
 			<language type="kea">Kaapverdisch Creools</language>
+			<language type="kek" draft="contributed">Qʼeqchiʼ</language>
 			<language type="ken">Kenyang</language>
 			<language type="kfo">Koro</language>
 			<language type="kg">Kongo</language>
@@ -321,6 +325,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Kölsch</language>
 			<language type="ku">Koerdisch</language>
+			<language type="ku" menu="core">Koerdisch</language>
+			<language type="ku" menu="extension">Kurmanci</language>
 			<language type="kum">Koemuks</language>
 			<language type="kut">Kutenai</language>
 			<language type="kv">Komi</language>
@@ -412,7 +418,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="nb">Noors - Bokmål</language>
 			<language type="nd">Noord-Ndebele</language>
 			<language type="nds">Nedersaksisch</language>
-			<language type="nds_NL" draft="contributed">Nederduits</language>
+			<language type="nds_NL">Nederduits</language>
 			<language type="ne">Nepalees</language>
 			<language type="new">Newari</language>
 			<language type="ng">Ndonga</language>
@@ -592,6 +598,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="tr">Turks</language>
 			<language type="tru">Turoyo</language>
 			<language type="trv">Taroko</language>
+			<language type="trw" draft="contributed">Torwali</language>
 			<language type="ts">Tsonga</language>
 			<language type="tsd">Tsakonisch</language>
 			<language type="tsi">Tsimshian</language>
@@ -663,8 +670,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</languages>
 		<scripts>
 			<script type="Adlm">Adlam</script>
-			<script type="Afak" draft="contributed">Defaka</script>
-			<script type="Aghb" draft="contributed">Kaukasisch Albanees</script>
+			<script type="Afak">Defaka</script>
+			<script type="Aghb">Kaukasisch Albanees</script>
 			<script type="Arab">Arabisch</script>
 			<script type="Arab" alt="variant">Perso-Arabisch</script>
 			<script type="Aran">Nastaliq</script>
@@ -672,11 +679,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Armn">Armeens</script>
 			<script type="Avst">Avestaans</script>
 			<script type="Bali">Balinees</script>
-			<script type="Bamu" draft="contributed">Bamoun</script>
-			<script type="Bass" draft="contributed">Bassa Vah</script>
+			<script type="Bamu">Bamoun</script>
+			<script type="Bass">Bassa Vah</script>
 			<script type="Batk">Batak</script>
 			<script type="Beng">Bengaals</script>
-			<script type="Bhks" draft="contributed">Bhaiksuki</script>
+			<script type="Berf" draft="contributed">Beria Erfe</script>
+			<script type="Bhks">Bhaiksuki</script>
 			<script type="Blis">Blissymbolen</script>
 			<script type="Bopo">Bopomofo</script>
 			<script type="Brah">Brahmi</script>
@@ -687,33 +695,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Cans">Verenigde Canadese Aboriginal-symbolen</script>
 			<script type="Cari">Carisch</script>
 			<script type="Cher">Cherokee</script>
-			<script type="Chrs" draft="contributed">Chorasmisch</script>
+			<script type="Chrs">Chorasmisch</script>
 			<script type="Cirt">Cirth</script>
 			<script type="Copt">Koptisch</script>
-			<script type="Cpmn" draft="contributed">Cypro-Minoïsch</script>
+			<script type="Cpmn">Cypro-Minoïsch</script>
 			<script type="Cprt">Cyprisch</script>
 			<script type="Cyrl">Cyrillisch</script>
 			<script type="Cyrs">Oudkerkslavisch Cyrillisch</script>
 			<script type="Deva">Devanagari</script>
-			<script type="Diak" draft="contributed">Dives Akuru</script>
-			<script type="Dogr" draft="contributed">Dogra</script>
+			<script type="Diak">Dives Akuru</script>
+			<script type="Dogr">Dogra</script>
 			<script type="Dsrt">Deseret</script>
-			<script type="Dupl" draft="contributed">Duployan snelschrift</script>
+			<script type="Dupl">Duployan snelschrift</script>
 			<script type="Egyd">Egyptisch demotisch</script>
 			<script type="Egyh">Egyptisch hiëratisch</script>
 			<script type="Egyp">Egyptische hiërogliefen</script>
-			<script type="Elba" draft="contributed">Elbasan</script>
-			<script type="Elym" draft="contributed">Elymaisch</script>
+			<script type="Elba">Elbasan</script>
+			<script type="Elym">Elymaisch</script>
 			<script type="Ethi">Ethiopisch</script>
+			<script type="Gara" draft="contributed">Garay</script>
 			<script type="Geok">Georgisch Khutsuri</script>
 			<script type="Geor">Georgisch</script>
 			<script type="Glag">Glagolitisch</script>
-			<script type="Gong" draft="contributed">Gunjala Gondi</script>
-			<script type="Gonm" draft="contributed">Masaram Gondi</script>
+			<script type="Gong">Gunjala Gondi</script>
+			<script type="Gonm">Masaram Gondi</script>
 			<script type="Goth">Gothisch</script>
-			<script type="Gran" draft="contributed">Grantha</script>
+			<script type="Gran">Grantha</script>
 			<script type="Grek">Grieks</script>
 			<script type="Gujr">Gujarati</script>
+			<script type="Gukh" draft="contributed">Gurung Khema</script>
 			<script type="Guru">Gurmukhi</script>
 			<script type="Hanb">Han met Bopomofo</script>
 			<script type="Hang">Hangul</script>
@@ -723,29 +733,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Hans" alt="stand-alone">vereenvoudigd Chinees</script>
 			<script type="Hant">traditioneel</script>
 			<script type="Hant" alt="stand-alone">traditioneel Chinees</script>
-			<script type="Hatr" draft="contributed">Hatran</script>
+			<script type="Hatr">Hatran</script>
 			<script type="Hebr">Hebreeuws</script>
 			<script type="Hira">Hiragana</script>
-			<script type="Hluw" draft="contributed">Anatolische hiërogliefen</script>
+			<script type="Hluw">Anatolische hiërogliefen</script>
 			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hmnp" draft="contributed">Nyiakeng Puachue Hmong</script>
+			<script type="Hmnp">Nyiakeng Puachue Hmong</script>
 			<script type="Hrkt">Katakana of Hiragana</script>
 			<script type="Hung">Oudhongaars</script>
 			<script type="Inds">Indus</script>
 			<script type="Ital">Oud-italisch</script>
 			<script type="Java">Javaans</script>
 			<script type="Jpan">Japans</script>
-			<script type="Jurc" draft="contributed">Jurchen</script>
+			<script type="Jurc">Jurchen</script>
 			<script type="Kali">Kayah Li</script>
 			<script type="Kana">Katakana</script>
 			<script type="Kawi" draft="contributed">Kawi-taal</script>
 			<script type="Khar">Kharoshthi</script>
 			<script type="Khmr">Khmer</script>
-			<script type="Khoj" draft="contributed">Khojki</script>
-			<script type="Kits" draft="contributed">Kitaans kleinschrift</script>
+			<script type="Khoj">Khojki</script>
+			<script type="Kits">Kitaans kleinschrift</script>
 			<script type="Knda">Kannada</script>
 			<script type="Kore">Koreaans</script>
-			<script type="Kpel" draft="contributed">Kpelle</script>
+			<script type="Kpel">Kpelle</script>
+			<script type="Krai" draft="contributed">Kirat Rai</script>
 			<script type="Kthi">Kaithi</script>
 			<script type="Lana">Lanna</script>
 			<script type="Laoo">Laotiaans</script>
@@ -756,44 +767,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Limb">Limbu</script>
 			<script type="Lina">Lineair A</script>
 			<script type="Linb">Lineair B</script>
-			<script type="Lisu" draft="contributed">Fraser</script>
-			<script type="Loma" draft="contributed">Loma</script>
+			<script type="Lisu">Fraser</script>
+			<script type="Loma">Loma</script>
 			<script type="Lyci">Lycisch</script>
 			<script type="Lydi">Lydisch</script>
-			<script type="Mahj" draft="contributed">Mahajani</script>
-			<script type="Maka" draft="contributed">Makasar</script>
+			<script type="Mahj">Mahajani</script>
+			<script type="Maka">Makasar</script>
 			<script type="Mand">Mandaeans</script>
 			<script type="Mani">Manicheaans</script>
-			<script type="Marc" draft="contributed">Marchen</script>
+			<script type="Marc">Marchen</script>
 			<script type="Maya">Mayahiërogliefen</script>
-			<script type="Medf" draft="contributed">Medefaidrin</script>
-			<script type="Mend" draft="contributed">Mende</script>
-			<script type="Merc" draft="contributed">Meroitisch cursief</script>
+			<script type="Medf">Medefaidrin</script>
+			<script type="Mend">Mende</script>
+			<script type="Merc">Meroitisch cursief</script>
 			<script type="Mero">Meroïtisch</script>
 			<script type="Mlym">Malayalam</script>
 			<script type="Mong">Mongools</script>
 			<script type="Moon">Moon</script>
-			<script type="Mroo" draft="contributed">Mro</script>
+			<script type="Mroo">Mro</script>
 			<script type="Mtei">Meitei</script>
-			<script type="Mult" draft="contributed">Multani</script>
+			<script type="Mult">Multani</script>
 			<script type="Mymr">Birmaans</script>
 			<script type="Nagm" draft="contributed">Nag Mundari</script>
-			<script type="Nand" draft="contributed">Nandinagari</script>
-			<script type="Narb" draft="contributed">Oud Noord-Arabisch</script>
-			<script type="Nbat" draft="contributed">Nabateaans</script>
-			<script type="Newa" draft="contributed">Newari</script>
+			<script type="Nand">Nandinagari</script>
+			<script type="Narb">Oud Noord-Arabisch</script>
+			<script type="Nbat">Nabateaans</script>
+			<script type="Newa">Newari</script>
 			<script type="Nkgb" draft="contributed">Naxi Geba</script>
 			<script type="Nkoo">N’Ko</script>
-			<script type="Nshu" draft="contributed">Nüshu</script>
+			<script type="Nshu">Nüshu</script>
 			<script type="Ogam">Ogham</script>
 			<script type="Olck">Ol Chiki</script>
+			<script type="Onao" draft="contributed">Ol Onal</script>
 			<script type="Orkh">Orkhon</script>
 			<script type="Orya">Odia</script>
-			<script type="Osge" draft="contributed">Osage</script>
+			<script type="Osge">Osage</script>
 			<script type="Osma">Osmanya</script>
-			<script type="Ougr" draft="contributed">Oud Oeigoers</script>
-			<script type="Palm" draft="contributed">Palmyreens</script>
-			<script type="Pauc" draft="contributed">Pau Cin Hau</script>
+			<script type="Ougr">Oud Oeigoers</script>
+			<script type="Palm">Palmyreens</script>
+			<script type="Pauc">Pau Cin Hau</script>
 			<script type="Perm">Oudpermisch</script>
 			<script type="Phag">Phags-pa</script>
 			<script type="Phli">Inscriptioneel Pahlavi</script>
@@ -809,19 +821,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Runr">Runic</script>
 			<script type="Samr">Samaritaans</script>
 			<script type="Sara">Sarati</script>
-			<script type="Sarb" draft="contributed">Oud Zuid-Arabisch</script>
+			<script type="Sarb">Oud Zuid-Arabisch</script>
 			<script type="Saur">Saurashtra</script>
 			<script type="Sgnw">SignWriting</script>
 			<script type="Shaw">Shavian</script>
-			<script type="Shrd" draft="contributed">Sharada</script>
-			<script type="Sidd" draft="contributed">Siddham</script>
-			<script type="Sind" draft="contributed">Sindhi</script>
+			<script type="Shrd">Sharada</script>
+			<script type="Sidd">Siddham</script>
+			<script type="Sidt" draft="contributed">Sidetisch</script>
+			<script type="Sind">Sindhi</script>
 			<script type="Sinh">Singalees</script>
-			<script type="Sogd" draft="contributed">Sogdisch</script>
-			<script type="Sogo" draft="contributed">Oud Sogdisch</script>
-			<script type="Sora" draft="contributed">Sora Sompeng</script>
-			<script type="Soyo" draft="contributed">Soyombo</script>
+			<script type="Sogd">Sogdisch</script>
+			<script type="Sogo">Oud Sogdisch</script>
+			<script type="Sora">Sora Sompeng</script>
+			<script type="Soyo">Soyombo</script>
 			<script type="Sund">Soendanees</script>
+			<script type="Sunu" draft="contributed">Sunuwar</script>
 			<script type="Sylo">Syloti Nagri</script>
 			<script type="Syrc">Syriac</script>
 			<script type="Syre">Estrangelo Aramees</script>
@@ -834,6 +848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Taml">Tamil</script>
 			<script type="Tang" draft="contributed">Tangut</script>
 			<script type="Tavt">Tai Viet</script>
+			<script type="Tayo" draft="contributed">Tai Yo</script>
 			<script type="Telu">Telugu</script>
 			<script type="Teng">Tengwar</script>
 			<script type="Tfng">Tifinagh</script>
@@ -842,19 +857,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Tibt">Tibetaans</script>
 			<script type="Tirh" draft="contributed">Tirhuta</script>
 			<script type="Tnsa" draft="contributed">Tangsa</script>
+			<script type="Todr" draft="contributed">Todhri</script>
+			<script type="Tols" draft="contributed">Tolong Siki</script>
 			<script type="Toto">Totoschrift</script>
+			<script type="Tutg" draft="contributed">Tulu-Tigalari</script>
 			<script type="Ugar">Ugaritisch</script>
 			<script type="Vaii">Vai</script>
 			<script type="Visp">Zichtbare spraak</script>
 			<script type="Vith" draft="contributed">Vithkuqi</script>
 			<script type="Wara" draft="contributed">Varang Kshiti</script>
-			<script type="Wcho" draft="contributed">Wancho</script>
-			<script type="Wole" draft="contributed">Woleai</script>
+			<script type="Wcho">Wancho</script>
+			<script type="Wole">Woleai</script>
 			<script type="Xpeo">Oudperzisch</script>
 			<script type="Xsux">Sumero-Akkadian Cuneiform</script>
 			<script type="Yezi" draft="contributed">Jezidi</script>
 			<script type="Yiii">Yi</script>
-			<script type="Zanb" draft="contributed">vierkant Zanabazar</script>
+			<script type="Zanb">vierkant Zanabazar</script>
 			<script type="Zinh">Overgeërfd</script>
 			<script type="Zmth">wiskundige notatie</script>
 			<script type="Zsye">emoji</script>
@@ -949,7 +967,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clipperton</territory>
-			<territory type="CQ" draft="contributed">Sark</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Kaapverdië</territory>
@@ -1305,35 +1323,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numeriek sorteren</key>
 			<key type="colStrength">Sorteervoorrang</key>
 			<key type="currency">valuta</key>
+			<key type="em">Emoji-presentatie</key>
 			<key type="hc">uursysteem (12 of 24)</key>
 			<key type="lb">stijl regelafbreking</key>
+			<key type="lw">Regelafbreking binnen woorden</key>
 			<key type="ms">maatsysteem</key>
 			<key type="numbers">cijfers</key>
+			<key type="ss">Zinsafbreking na afk.</key>
 			<key type="timezone">Tijdzone</key>
 			<key type="va">Landvariant</key>
 			<key type="x">Privégebruik</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Boeddhistische kalender</type>
+			<type key="calendar" type="buddhist" scope="core">Boeddhistisch</type>
 			<type key="calendar" type="chinese">Chinese kalender</type>
+			<type key="calendar" type="chinese" scope="core">Chinees</type>
 			<type key="calendar" type="coptic">Koptische kalender</type>
+			<type key="calendar" type="coptic" scope="core">Koptisch</type>
 			<type key="calendar" type="dangi">Dangi-kalender</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Ethiopische kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopisch</type>
 			<type key="calendar" type="ethiopic-amete-alem">Ethiopische Amete Alem-kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopische Amete Alem</type>
 			<type key="calendar" type="gregorian">Gregoriaanse kalender</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriaans</type>
 			<type key="calendar" type="hebrew">Hebreeuwse kalender</type>
+			<type key="calendar" type="hebrew" scope="core">Hebreeuws</type>
 			<type key="calendar" type="indian">Indiase nationale kalender</type>
+			<type key="calendar" type="indian" scope="core" draft="contributed">Indiaas nationaal</type>
 			<type key="calendar" type="islamic">Islamitische kalender</type>
+			<type key="calendar" type="islamic" scope="core">Islamitisch</type>
 			<type key="calendar" type="islamic-civil">Islamitische kalender (cyclisch)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Islamitisch (cyclisch)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">Islamitische kalender (Saudi–Arabië)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">Islamitische kalender (epoche)</type>
+			<type key="calendar" type="islamic-tbla" scope="core" draft="contributed">Hijri (tabulair, astronomische epoche)</type>
 			<type key="calendar" type="islamic-umalqura">Islamitische kalender (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Islamitisch (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601-kalender</type>
 			<type key="calendar" type="japanese">Japanse kalender</type>
+			<type key="calendar" type="japanese" scope="core">Japans</type>
 			<type key="calendar" type="persian">Perzische kalender</type>
+			<type key="calendar" type="persian" scope="core">Perzisch</type>
 			<type key="calendar" type="roc">Kalender van de Chinese Republiek</type>
+			<type key="calendar" type="roc" scope="core">van de Chinese Republiek</type>
 			<type key="cf" type="account">financiële valutanotatie</type>
+			<type key="cf" type="account" scope="core">financieel</type>
 			<type key="cf" type="standard">standaard valutanotatie</type>
+			<type key="cf" type="standard" scope="core">standaard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Symbolen sorteren</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Sorteren zonder symbolen</type>
 			<type key="colBackwards" type="no" draft="contributed">Normaal sorteren op accenten</type>
@@ -1343,23 +1382,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Eerst sorteren op hoofdletters</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Niet hoofdlettergevoelig sorteren</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Hoofdlettergevoelig sorteren</type>
-			<type key="collation" type="big5han">Traditioneel-Chinese sorteervolgorde - Big5</type>
 			<type key="collation" type="compat">vorige sorteervolgorde, voor compatibiliteit</type>
+			<type key="collation" type="compat" scope="core">Compatibiliteit</type>
 			<type key="collation" type="dictionary">Woordenboeksorteervolgorde</type>
+			<type key="collation" type="dictionary" scope="core">Woordenboek</type>
 			<type key="collation" type="ducet">standaard Unicode-sorteervolgorde</type>
+			<type key="collation" type="ducet" scope="core">standaard Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">emojisorteervolgorde</type>
 			<type key="collation" type="eor" draft="contributed">Europese sorteerregels</type>
-			<type key="collation" type="gb2312han">Vereenvoudigd-Chinese sorteervolgorde - GB2312</type>
 			<type key="collation" type="phonebook">Telefoonboeksorteervolgorde</type>
+			<type key="collation" type="phonebook" scope="core">Telefoonboek</type>
 			<type key="collation" type="phonetic">Fonetische sorteervolgorde</type>
+			<type key="collation" type="phonetic" scope="core">Fonetisch</type>
 			<type key="collation" type="pinyin">Pinyinsorteervolgorde</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">algemeen zoeken</type>
+			<type key="collation" type="search" scope="core">zoeken</type>
 			<type key="collation" type="searchjl" draft="contributed">Zoeken op eerste Hangul-medeklinker</type>
 			<type key="collation" type="standard">standaard sorteervolgorde</type>
+			<type key="collation" type="standard" scope="core">standaard</type>
 			<type key="collation" type="stroke">Streeksorteervolgorde</type>
+			<type key="collation" type="stroke" scope="core">streek</type>
 			<type key="collation" type="traditional">Traditionele sorteervolgorde</type>
+			<type key="collation" type="traditional" scope="core">traditioneel</type>
 			<type key="collation" type="unihan">Sorteervolgorde radicalen/strepen</type>
+			<type key="collation" type="unihan" scope="core">radicalen/strepen</type>
 			<type key="collation" type="zhuyin">Zhuyinvolgorde</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Zonder normalisatie sorteren</type>
 			<type key="colNormalization" type="yes" draft="contributed">Unicode genormaliseerd sorteren</type>
 			<type key="colNumeric" type="no" draft="contributed">Cijfers afzonderlijk sorteren</type>
@@ -1372,18 +1421,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Volledige breedte</type>
 			<type key="d0" type="hwidth">Halve breedte</type>
 			<type key="d0" type="npinyin" draft="contributed">Numeriek</type>
+			<type key="em" type="default" scope="core">standaard</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-uursysteem (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-uursysteem (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-uursysteem (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-uursysteem (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">losse stijl regelafbreking</type>
+			<type key="lb" type="loose" scope="core">los</type>
 			<type key="lb" type="normal">normale stijl regelafbreking</type>
+			<type key="lb" type="normal" scope="core">normaal</type>
 			<type key="lb" type="strict">strikte stijl regelafbreking</type>
+			<type key="lb" type="strict" scope="core">strikt</type>
+			<type key="lw" type="breakall" scope="core">breek alles af</type>
+			<type key="lw" type="keepall" scope="core">behoud alles</type>
+			<type key="lw" type="normal" scope="core">normaal</type>
+			<type key="lw" type="phrase" scope="core">behoud in zinnen</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">metriek stelsel</type>
+			<type key="ms" type="metric" scope="core">metriek</type>
 			<type key="ms" type="uksystem">Brits imperiaal stelsel</type>
+			<type key="ms" type="uksystem" scope="core">VK</type>
 			<type key="ms" type="ussystem">Amerikaans imperiaal stelsel</type>
+			<type key="ms" type="ussystem" scope="core">VS</type>
 			<type key="numbers" type="ahom" draft="contributed">Ahom cijfers</type>
 			<type key="numbers" type="arab">Arabisch-Indische cijfers</type>
 			<type key="numbers" type="arabext">uitgebreide Arabisch-Indische cijfers</type>
@@ -1469,6 +1535,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Vai cijfers</type>
 			<type key="numbers" type="wara" draft="contributed">Warang Citi cijfers</type>
 			<type key="numbers" type="wcho" draft="contributed">Wancho cijfers</type>
+			<type key="ss" type="none" scope="core">uit</type>
+			<type key="ss" type="standard" scope="core">aan</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metriek</measurementSystemName>
@@ -1569,14 +1637,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="chinese">
@@ -1742,10 +1802,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ U</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
@@ -1756,54 +1812,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h" draft="contributed">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m" draft="contributed">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="contributed">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="contributed">U MMM – U MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="contributed">U MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y" draft="contributed">U MMM d – U MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">U MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">U MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y" draft="contributed">U MMM d, E – U MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y" draft="contributed">U MMMM – U MMMM</greatestDifference>
-						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1870,14 +1878,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="dangi">
@@ -1956,14 +1956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQ" draft="contributed">QQQ r (U)</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ" draft="contributed">QQQQ r (U)</dateFormatItem>
 					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="ethiopic">
@@ -1986,16 +1978,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">tijdperk 0</era>
-						<era type="1" draft="contributed">tijdperk 1</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">era 0</era>
-						<era type="1" draft="contributed">era 1</era>
-					</eraAbbr>
-				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2039,26 +2021,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
-			<calendar type="ethiopic-amete-alem">
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">tijdperk 0</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">era 0</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -2091,6 +2055,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2099,6 +2066,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2116,7 +2086,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -2448,6 +2420,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2456,6 +2431,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'om' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'om' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2470,7 +2448,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -2661,14 +2641,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="MEd" draft="contributed">E d MMM</dateFormatItem>
 						<dateFormatItem id="y" draft="contributed">y</dateFormatItem>
 					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="indian">
@@ -2733,14 +2705,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="islamic">
@@ -2824,14 +2788,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
@@ -2929,14 +2885,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="persian">
@@ -2983,14 +2931,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="roc">
@@ -3043,14 +2983,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<pattern draft="contributed">{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
@@ -3558,11 +3490,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">zomertijd in {0}</regionFormat>
 			<regionFormat type="standard">standaardtijd in {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="contributed">HST</generic>
-					<standard draft="contributed">HST</standard>
-					<daylight draft="contributed">HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3573,21 +3500,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>onbekende stad</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wenen</exemplarCity>
 			</zone>
@@ -3603,18 +3518,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
@@ -3705,7 +3608,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bisjkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kanton</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Saint Kitts</exemplarCity>
@@ -3740,18 +3643,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldiven</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Mexico_City">
 				<exemplarCity>Mexico-Stad</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
 				<exemplarCity>Cancun</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Pacific/Marquesas">
 				<exemplarCity>Marquesaseilanden</exemplarCity>
 			</zone>
@@ -3803,9 +3700,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riyad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Khartoem</exemplarCity>
 			</zone>
@@ -3818,9 +3712,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Lower_Princes">
 				<exemplarCity>Beneden Prinsen Kwartier</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Doesjanbe</exemplarCity>
 			</zone>
@@ -3886,9 +3777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>West-Afrikaanse tijd</generic>
-					<standard>West-Afrikaanse standaardtijd</standard>
-					<daylight>West-Afrikaanse zomertijd</daylight>
+					<standard>West-Afrikaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4295,6 +4184,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="contributed">GMT</standard>
 				</short>
 			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic draft="contributed">Groenlandse tijd</generic>
+					<standard draft="contributed">Groenlandse standaardtijd</standard>
+					<daylight draft="contributed">Groenlandse zomertijd</daylight>
+				</long>
+			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>Oost-Groenlandse tijd</generic>
@@ -4324,6 +4220,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyaanse tijd</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleoetische standaardtijd</standard>
+				</long>
+				<short>
+					<standard>HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleoetische tijd</generic>
@@ -4331,9 +4235,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Hawaii-Aleoetische zomertijd</daylight>
 				</long>
 				<short>
-					<generic draft="contributed">HAT</generic>
-					<standard draft="contributed">HAST</standard>
-					<daylight draft="contributed">HADT</daylight>
+					<generic>HAT</generic>
+					<standard>HAST</standard>
+					<daylight>HADT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -4779,6 +4683,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuukse tijd</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">Turkse tijd</generic>
+					<standard draft="contributed">Turkse standaardtijd</standard>
+					<daylight draft="contributed">Turkse zomertijd</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmeense tijd</generic>
@@ -4931,14 +4842,247 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="adlm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gonm">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
-					<pattern alt="noCurrency" draft="contributed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4965,6 +5109,259 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="rohg">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
 				<displayName>Andorrese peseta</displayName>
@@ -5927,6 +6324,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Zimbabwaanse dollar</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe Gold</displayName>
+				<displayName count="one">Zimbabwe Gold</displayName>
+				<displayName count="other">Zimbabwe Gold</displayName>
+				<symbol>ZiG</symbol>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">Zimbabwaanse dollar (2009)</displayName>
 			</currency>
@@ -6178,11 +6581,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<gender>neuter</gender>
 				<displayName>onderdelen</displayName>
-				<unitPattern count="one">{0} ond.</unitPattern>
+				<unitPattern count="one">{0} onderdeel</unitPattern>
 				<unitPattern count="other">{0} onderdelen</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>deel</displayName>
+				<unitPattern count="one">{0} deel</unitPattern>
+				<unitPattern count="other">{0} delen</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>common</gender>
+				<displayName>parts per million</displayName>
+				<unitPattern count="one">{0} part per million</unitPattern>
+				<unitPattern count="other">{0} parts per million</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<gender>neuter</gender>
@@ -6203,6 +6614,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<gender>common</gender>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="one">{0} glucose</unitPattern>
+				<unitPattern count="other">{0} glucose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>common</gender>
 				<displayName>liter per kilometer</displayName>
@@ -6793,6 +7208,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimeter-kwikdruk</unitPattern>
 				<unitPattern count="other">{0} millimeter-kwikdruk</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">kwik</displayName>
+				<unitPattern count="one" draft="contributed">{0} kwik</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kwik</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>inch-kwikdruk</displayName>
 				<unitPattern count="one">{0} inch-kwikdruk</unitPattern>
@@ -6985,6 +7405,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} metrische cup</unitPattern>
 				<unitPattern count="other">{0} metrische cup</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">metrische fluid ounces</displayName>
+				<unitPattern count="one" draft="contributed">{0} metrische fluid ounce</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} metrische fluid ounces</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-feet</displayName>
 				<unitPattern count="one">{0} acre-foot</unitPattern>
@@ -7089,20 +7514,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} imp. quart</unitPattern>
 				<unitPattern count="other">{0} imp. quarts</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ste­ra­diaal</displayName>
+				<unitPattern count="one">{0} ste­ra­diaal</unitPattern>
+				<unitPattern count="other">{0} ste­ra­dialen</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">coulomb</displayName>
+				<unitPattern count="one" draft="contributed">{0} coulomb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">farad</displayName>
+				<unitPattern count="one" draft="contributed">{0} farad</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry's</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">calorieën [IT]</displayName>
+				<unitPattern count="one" draft="contributed">{0} calorie [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} calorieën [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">becquerel</displayName>
+				<unitPattern count="one" draft="contributed">{0} becquerel</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">sievert</displayName>
+				<unitPattern count="one" draft="contributed">{0} sievert</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">gray</displayName>
+				<unitPattern count="one" draft="contributed">{0} gray</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramkracht</displayName>
+				<unitPattern count="one">{0} kilogramkracht</unitPattern>
+				<unitPattern count="other">{0} kilogramkracht</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>licht</displayName>
-				<unitPattern count="one">{0} licht</unitPattern>
-				<unitPattern count="other">{0} licht</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>common</gender>
+				<displayName>parts per billion</displayName>
+				<unitPattern count="one">{0} part per billion</unitPattern>
+				<unitPattern count="other">{0} parts per billion</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>common</gender>
-				<displayName>nachten</displayName>
-				<unitPattern count="one">{0} nacht</unitPattern>
-				<unitPattern count="other">{0} nachten</unitPattern>
 				<perUnitPattern>{0} per nacht</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7173,12 +7660,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ond.</unitPattern>
 				<unitPattern count="other">{0} ond.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>deel</displayName>
+				<unitPattern count="one">{0} deel</unitPattern>
+				<unitPattern count="other">{0} delen</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>parts/million</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>procent</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>promille</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7448,11 +7946,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} imp. qt</unitPattern>
 				<unitPattern count="other">{0} imp. qt</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>licht</displayName>
 				<unitPattern count="one">{0} licht</unitPattern>
 				<unitPattern count="other">{0} licht</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>parts/billion</displayName>
+			</unit>
 			<unit type="duration-night">
 				<displayName>nachten</displayName>
 				<unitPattern count="one">{0} nacht</unitPattern>
@@ -7487,9 +7991,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-inch">
 				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>deel</displayName>
+				<unitPattern count="one">{0} deel</unitPattern>
+				<unitPattern count="other">{0} delen</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0} m/gUK</unitPattern>
 				<unitPattern count="other">{0} m/gUK</unitPattern>
@@ -7606,17 +8118,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} sn</unitPattern>
 				<unitPattern count="other">{0} sn</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>licht</displayName>
 				<unitPattern count="one">{0}licht</unitPattern>
 				<unitPattern count="other">{0}licht</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>nachten</displayName>
-				<unitPattern count="one">{0} nacht</unitPattern>
-				<unitPattern count="other">{0} nachten</unitPattern>
-				<perUnitPattern>{0}/nacht</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/nmg.xml b/make/data/cldr/common/main/nmg.xml
index b3caea650a8..48985090177 100644
--- a/make/data/cldr/common/main/nmg.xml
+++ b/make/data/cldr/common/main/nmg.xml
@@ -555,6 +555,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/nn.xml b/make/data/cldr/common/main/nn.xml
index 781763020eb..2fc5a6814df 100644
--- a/make/data/cldr/common/main/nn.xml
+++ b/make/data/cldr/common/main/nn.xml
@@ -79,7 +79,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="tce">sørleg tutchone</language>
 			<language type="tiv">tivi</language>
 			<language type="tkl">tokelau</language>
-			<language type="tn">tswana</language>
 			<language type="tog">tonga (Nyasa)</language>
 			<language type="ttm">nordleg tutchone</language>
 			<language type="tvl">tuvalu</language>
@@ -205,14 +204,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="colNormalization">normalisert sortering</key>
 			<key type="colNumeric">numerisk sortering</key>
 			<key type="colStrength">sorteringsstyrke</key>
+			<key type="em">emojivising</key>
 			<key type="lb">lineskiftstil</key>
+			<key type="lw">lineskift innanfor ord</key>
 			<key type="numbers">tal</key>
 		</keys>
 		<types>
 			<type key="cf" type="account">valutaformat for rekneskapsføring</type>
-			<type key="collation" type="big5han">tradisjonell kinesisk sortering</type>
+			<type key="cf" type="account" scope="core">rekneskapsføring</type>
 			<type key="collation" type="ducet">standard Unicode-sorteringsrekkjefølgje</type>
-			<type key="collation" type="gb2312han">forenkla kinesisk sortering</type>
 			<type key="collation" type="pinyin">pinyin-sortering</type>
 			<type key="collation" type="standard">standard sorteringsrekkjefølgje</type>
 			<type key="d0" type="fwidth">full breidd</type>
@@ -222,8 +222,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="hc" type="h23">24-timarssystem (0–23)</type>
 			<type key="hc" type="h24">24-timarssystem (1–24)</type>
 			<type key="lb" type="loose">laus lineskiftstil</type>
+			<type key="lb" type="loose" scope="core">laus</type>
 			<type key="lb" type="normal">normal lineskiftstil</type>
 			<type key="lb" type="strict">streng lineskiftstil</type>
+			<type key="lw" type="keepall" scope="core">behald alle</type>
+			<type key="lw" type="phrase" scope="core">behald i fraser</type>
 			<type key="numbers" type="arab">arabisk-indiske siffer</type>
 			<type key="numbers" type="arabext">utvida arabisk-indiske siffer</type>
 			<type key="numbers" type="armn">armenske tal</type>
@@ -270,15 +273,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</localeDisplayNames>
 	<dates>
 		<calendars>
-			<calendar type="generic">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d.–E d. MMM y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
 			<calendar type="gregorian">
 				<days>
 					<dayContext type="format">
@@ -392,7 +386,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>'kl'. HH:mm:ss zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 							<pattern alt="variant">'kl'. HH.mm.ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
@@ -550,15 +544,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="week-narrow">
 				<displayName>v.</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">om {0} v.</relativeTimePattern>
-					<relativeTimePattern count="other">om {0} v.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">for {0} v. sidan</relativeTimePattern>
-					<relativeTimePattern count="other">for {0} v. sidan</relativeTimePattern>
-				</relativeTime>
-				<relativePeriod>veka med {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>veke i månaden</displayName>
@@ -935,9 +920,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Etc/Unknown">
 				<exemplarCity>ukjend by</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiaba</exemplarCity>
-			</zone>
 			<zone type="Indian/Cocos">
 				<exemplarCity>Kokosøyane</exemplarCity>
 			</zone>
@@ -972,9 +954,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Yangôn</exemplarCity>
 			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Khovd</exemplarCity>
-			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldivane</exemplarCity>
 			</zone>
@@ -992,13 +971,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>austafrikansk tid</standard>
 				</long>
 			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>vestafrikansk tid</generic>
-					<standard>vestafrikansk standardtid</standard>
-					<daylight>vestafrikansk sommartid</daylight>
-				</long>
-			</metazone>
 			<metazone type="Alaska">
 				<long>
 					<generic>alaskisk tid</generic>
@@ -1922,8 +1894,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">gammalt sudansk pund</displayName>
 				<displayName count="other">gamle sudanske pund</displayName>
 			</currency>
+			<currency type="SLE">
+				<displayName count="one">sierraleonsk leone</displayName>
+				<displayName count="other">sierraleonske leonar</displayName>
+			</currency>
 			<currency type="SLL">
 				<displayName>sierraleonsk leone (1964—2022)</displayName>
+				<displayName count="one">sierraleonsk leone (1964–2022)</displayName>
+				<displayName count="other">sierraleonske leonar (1964–2022)</displayName>
 			</currency>
 			<currency type="SUR">
 				<displayName>sovjetiske rublar</displayName>
@@ -2142,7 +2120,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} element</unitPattern>
 				<unitPattern count="other" case="genitive">{0} elements</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>delar</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} delar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>delar per million</displayName>
 				<unitPattern count="one">{0} del per million</unitPattern>
 				<unitPattern count="one" case="genitive">{0} del per millions</unitPattern>
@@ -2363,7 +2346,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<gender>feminine</gender>
 			</unit>
 			<unit type="mass-earth-mass">
-				<displayName>jordmassar</displayName>
 				<unitPattern count="one">{0} jordmasse</unitPattern>
 				<unitPattern count="other">{0} jordmassar</unitPattern>
 			</unit>
@@ -2421,6 +2403,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} metriske koppar</unitPattern>
 				<unitPattern count="other" case="genitive">{0} metriske koppars</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriske væskeunsar</displayName>
+				<unitPattern count="one">{0} metrisk væskeunse</unitPattern>
+				<unitPattern count="other">{0} metriske væskeunsar</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} bushel</unitPattern>
 				<unitPattern count="other">{0} bushels</unitPattern>
@@ -2469,6 +2456,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-pinch">
 				<gender>feminine</gender>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradianar</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradianar</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kaloriar [IT]</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kaloriar [IT]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>delar per milliard</displayName>
+				<unitPattern count="one">{0} del per milliard</unitPattern>
+				<unitPattern count="one" case="genitive">{0} del per milliards</unitPattern>
+				<unitPattern count="other">{0} delar per milliard</unitPattern>
+				<unitPattern count="other" case="genitive">{0} delar per milliards</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
 			</unit>
@@ -2694,7 +2698,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} b. quart</unitPattern>
 				<unitPattern count="other">{0} b. quart</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>delar/milliard</displayName>
 			</unit>
 		</unitLength>
diff --git a/make/data/cldr/common/main/no.xml b/make/data/cldr/common/main/no.xml
index 6f4c4cd9c0e..b1112090dd3 100644
--- a/make/data/cldr/common/main/no.xml
+++ b/make/data/cldr/common/main/no.xml
@@ -121,6 +121,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="chp">chipewiansk</language>
 			<language type="chr">cherokesisk</language>
 			<language type="chy">cheyenne</language>
+			<language type="cic" draft="contributed">chickasaw</language>
 			<language type="ckb">sentralkurdisk</language>
 			<language type="ckb" alt="menu">kurdisk (sentral)</language>
 			<language type="ckb" alt="variant">kurdisk (sorani)</language>
@@ -320,6 +321,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kølnsk</language>
 			<language type="ku">kurdisk</language>
+			<language type="ku" menu="core">kurdisk</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">kumykisk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -927,7 +930,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clippertonøya</territory>
-			<territory type="CQ" draft="contributed">Sark</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Kapp Verde</territory>
@@ -1237,35 +1240,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numerisk sortering</key>
 			<key type="colStrength">Sorteringsstyrke</key>
 			<key type="currency">valuta</key>
+			<key type="em">emojivisning</key>
 			<key type="hc">timesyklus (12 eller 24)</key>
 			<key type="lb">linjeskiftstil</key>
+			<key type="lw">linjeskift innenfor ord</key>
 			<key type="ms">målesystem</key>
 			<key type="numbers">tall</key>
+			<key type="ss">Ny setning etter fork.</key>
 			<key type="timezone">tidssone</key>
 			<key type="va">språkvariant</key>
 			<key type="x">privat bruk</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddhistisk kalender</type>
+			<type key="calendar" type="buddhist" scope="core">buddhistisk</type>
 			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="chinese" scope="core">kinesisk</type>
 			<type key="calendar" type="coptic">koptisk kalender</type>
+			<type key="calendar" type="coptic" scope="core">koptisk</type>
 			<type key="calendar" type="dangi">dangisk kalender</type>
+			<type key="calendar" type="dangi" scope="core">dangisk</type>
 			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopisk</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopisk amete-alem</type>
 			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriansk</type>
 			<type key="calendar" type="hebrew">hebraisk kalender</type>
+			<type key="calendar" type="hebrew" scope="core">hebraisk</type>
 			<type key="calendar" type="indian">indisk nasjonalkalender</type>
 			<type key="calendar" type="islamic">hijrikalender</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
 			<type key="calendar" type="islamic-civil">hijrikalender (tabell, sivil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">hijri (tabell, sivil)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">islamsk kalender (Saudi-Arabia, observasjon)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">islamsk kalender (tabell, astronomisk)</type>
 			<type key="calendar" type="islamic-umalqura">hijrikalender (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO 8601-kalender</type>
 			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="japanese" scope="core">japansk</type>
 			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="persian" scope="core">persisk</type>
 			<type key="calendar" type="roc">minguo-kalender</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">valutaformat for regnskapsføring</type>
+			<type key="cf" type="account" scope="core">regnskapsføring</type>
 			<type key="cf" type="standard">standard valutaformat</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">sortér symboler</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Ignorer symboler under sortering</type>
 			<type key="colBackwards" type="no" draft="contributed">sortér aksenttegn normalt</type>
@@ -1275,23 +1297,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Sortér store bokstaver først</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Sortér uavhengig av store og små bokstaver.</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Sortér med skille mellom små og store bokstaver</type>
-			<type key="collation" type="big5han">tradisjonell kinesisk sortering - Big 5</type>
 			<type key="collation" type="compat">forrige sorteringsrekkefølge (for kompatibilitet)</type>
+			<type key="collation" type="compat" scope="core">kompatibilitet</type>
 			<type key="collation" type="dictionary">ordlistesortering</type>
+			<type key="collation" type="dictionary" scope="core">ordliste</type>
 			<type key="collation" type="ducet">standard Unicode-sorteringsrekkefølge</type>
+			<type key="collation" type="ducet" scope="core">standard Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">emoji-sorteringsrekkefølge</type>
 			<type key="collation" type="eor" draft="contributed">sorteringsrekkefølge for flerspråklige europeiske dokumenter</type>
-			<type key="collation" type="gb2312han">forenklet kinesisk sortering - GB2312</type>
 			<type key="collation" type="phonebook">telefonkatalogsortering</type>
+			<type key="collation" type="phonebook" scope="core">telefonkatalog</type>
 			<type key="collation" type="phonetic">fonetisk sortering</type>
+			<type key="collation" type="phonetic" scope="core">fonetisk</type>
 			<type key="collation" type="pinyin">pinyinsortering</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">generelt søk</type>
+			<type key="collation" type="search" scope="core">søk</type>
 			<type key="collation" type="searchjl" draft="contributed">Søk etter første konsonant i hangul</type>
 			<type key="collation" type="standard">standard sorteringsrekkefølge</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke">streksortering</type>
+			<type key="collation" type="stroke" scope="core">strek</type>
 			<type key="collation" type="traditional">tradisjonell sortering</type>
+			<type key="collation" type="traditional" scope="core">tradisjonell</type>
 			<type key="collation" type="unihan">radikal-strek-sortering</type>
+			<type key="collation" type="unihan" scope="core">radikal-strek</type>
 			<type key="collation" type="zhuyin">zhuyin-sortering</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Sortér uten normalisering</type>
 			<type key="colNormalization" type="yes" draft="contributed">Sortér Unicode normalisert</type>
 			<type key="colNumeric" type="no" draft="contributed">Sortér sifre individuelt</type>
@@ -1304,18 +1336,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">full bredde</type>
 			<type key="d0" type="hwidth">halv bredde</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerisk</type>
+			<type key="em" type="default" scope="core">standard</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-timers system (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-timers system (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-timers system (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-timers system (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">løs linjeskiftstil</type>
+			<type key="lb" type="loose" scope="core">løs</type>
 			<type key="lb" type="normal">normal linjeskiftstil</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">streng linjeskiftstil</type>
+			<type key="lb" type="strict" scope="core">streng</type>
+			<type key="lw" type="breakall" scope="core">bryt alle</type>
+			<type key="lw" type="keepall" scope="core">behold alle</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">behold i fraser</type>
 			<type key="m0" type="bgn">USBGN-translitterasjon</type>
 			<type key="m0" type="ungegn">UNGEGN-translitterasjon</type>
 			<type key="ms" type="metric">metrisk system</type>
+			<type key="ms" type="metric" scope="core">metrisk</type>
 			<type key="ms" type="uksystem">britisk målesystem</type>
+			<type key="ms" type="uksystem" scope="core">britisk</type>
 			<type key="ms" type="ussystem">amerikansk målesystem</type>
+			<type key="ms" type="ussystem" scope="core">amerikansk</type>
 			<type key="numbers" type="arab">arabisk-indiske sifre</type>
 			<type key="numbers" type="arabext">utvidede arabisk-indiske sifre</type>
 			<type key="numbers" type="armn">armenske tall</type>
@@ -1381,6 +1430,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tnsa" draft="contributed">tangsa-sifre</type>
 			<type key="numbers" type="traditional" draft="contributed">Tradisjonelle tall</type>
 			<type key="numbers" type="vaii">vai-sifre</type>
+			<type key="ss" type="none" scope="core">av</type>
+			<type key="ss" type="standard" scope="core">på</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrisk</measurementSystemName>
@@ -1540,7 +1591,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="contributed">h a–h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a–h:mm a</greatestDifference>
@@ -1554,7 +1604,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a" draft="contributed">h a–h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M" draft="contributed">MM.–MM.</greatestDifference>
@@ -1630,20 +1679,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0">0. tidsalder</era>
-						<era type="1">1. tidsalder</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">0. t.a.</era>
-						<era type="1">1. t.a.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">TA0</era>
-						<era type="1">TA1</era>
-					</eraNarrow>
-				</eras>
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="h">
@@ -1675,20 +1710,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0">0. tidsalder</era>
-						<era type="1">1. tidsalder</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">0. t.a.</era>
-						<era type="1">1. t.a.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">TA0</era>
-						<era type="1">TA1</era>
-					</eraNarrow>
-				</eras>
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="h">
@@ -1700,19 +1721,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
-			<calendar type="ethiopic-amete-alem">
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">0. tidsalder</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">0. t.a.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0" draft="contributed">TA0</era>
-					</eraNarrow>
-				</eras>
-			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -1745,6 +1753,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1753,6 +1764,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1770,13 +1784,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH't' v</dateFormatItem>
 						<dateFormatItem id="M">L.</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M</dateFormatItem>
@@ -1848,7 +1865,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1862,7 +1878,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M.–M.</greatestDifference>
@@ -2176,6 +2191,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2184,6 +2202,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2203,15 +2224,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E 'kl'. HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d.M.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH v</dateFormatItem>
 						<dateFormatItem id="M">L.</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
@@ -2285,7 +2308,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a–h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 't'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a–h:mm a</greatestDifference>
@@ -2299,7 +2324,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a–h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M.–M.</greatestDifference>
@@ -3195,11 +3219,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">sommertid – {0}</regionFormat>
 			<regionFormat type="standard">normaltid – {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="contributed">HST</generic>
-					<standard draft="contributed">HST</standard>
-					<daylight draft="contributed">HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3210,18 +3229,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>ukjent by</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
@@ -3231,24 +3241,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="Asia/Thimphu">
 				<exemplarCity>Thimpu</exemplarCity>
 			</zone>
@@ -3261,12 +3253,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Påskeøya</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Kapp Verde</exemplarCity>
 			</zone>
@@ -3279,9 +3265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praha</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>København</exemplarCity>
 			</zone>
@@ -3294,9 +3277,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Cairo">
 				<exemplarCity>Kairo</exemplarCity>
 			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Kanariøyene</exemplarCity>
 			</zone>
@@ -3350,9 +3330,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bisjkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Kantonøya</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
@@ -3376,9 +3353,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxemburg</exemplarCity>
 			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chișinău</exemplarCity>
-			</zone>
 			<zone type="Asia/Ulaanbaatar">
 				<exemplarCity>Ulan Bator</exemplarCity>
 			</zone>
@@ -3391,9 +3365,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Mexico_City">
 				<exemplarCity>Mexico by</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Pacific/Norfolk">
 				<exemplarCity>Norfolkøya</exemplarCity>
 			</zone>
@@ -3439,15 +3410,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtsjatka</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskus</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dusjanbe</exemplarCity>
 			</zone>
@@ -3504,9 +3469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>vestafrikansk tid</generic>
-					<standard>vestafrikansk normaltid</standard>
-					<daylight>vestafrikansk sommertid</daylight>
+					<standard>vestafrikansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3942,6 +3905,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>guyansk tid</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>normaltid for Hawaii og Aleutene</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>tidssone for Hawaii og Aleutene</generic>
@@ -4587,9 +4558,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4597,9 +4572,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4607,9 +4586,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4617,9 +4600,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4627,9 +4614,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4637,9 +4628,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4647,9 +4642,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4657,9 +4656,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4667,9 +4670,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4677,9 +4684,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4687,9 +4698,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4697,9 +4712,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4707,9 +4726,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4717,9 +4740,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4727,9 +4754,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4737,9 +4768,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4747,9 +4782,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4757,9 +4796,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4767,39 +4810,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤;-#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ 0k</pattern>
-					<pattern type="1000" count="other">¤ 0k</pattern>
-					<pattern type="10000" count="one">¤ 00k</pattern>
-					<pattern type="10000" count="other">¤ 00k</pattern>
-					<pattern type="100000" count="one">¤ 000k</pattern>
-					<pattern type="100000" count="other">¤ 000k</pattern>
-					<pattern type="1000000" count="one">¤ 0 mill'.'</pattern>
-					<pattern type="1000000" count="other">¤ 0 mill'.'</pattern>
-					<pattern type="10000000" count="one">¤ 00 mill'.'</pattern>
-					<pattern type="10000000" count="other">¤ 00 mill'.'</pattern>
-					<pattern type="100000000" count="one">¤ 000 mill'.'</pattern>
-					<pattern type="100000000" count="other">¤ 000 mill'.'</pattern>
-					<pattern type="1000000000" count="one">¤ 0 mrd'.'</pattern>
-					<pattern type="1000000000" count="other">¤ 0 mrd'.'</pattern>
-					<pattern type="10000000000" count="one">¤ 00 mrd'.'</pattern>
-					<pattern type="10000000000" count="other">¤ 00 mrd'.'</pattern>
-					<pattern type="100000000000" count="one">¤ 000 mrd'.'</pattern>
-					<pattern type="100000000000" count="other">¤ 000 mrd'.'</pattern>
-					<pattern type="1000000000000" count="one">¤ 0 bill'.'</pattern>
-					<pattern type="1000000000000" count="other">¤ 0 bill'.'</pattern>
-					<pattern type="10000000000000" count="one">¤ 00 bill'.'</pattern>
-					<pattern type="10000000000000" count="other">¤ 00 bill'.'</pattern>
-					<pattern type="100000000000000" count="one">¤ 000 bill'.'</pattern>
-					<pattern type="100000000000000" count="other">¤ 000 bill'.'</pattern>
+					<pattern type="1000" count="one">0k ¤</pattern>
+					<pattern type="1000" count="other">0k ¤</pattern>
+					<pattern type="10000" count="one">00k ¤</pattern>
+					<pattern type="10000" count="other">00k ¤</pattern>
+					<pattern type="100000" count="one">000k ¤</pattern>
+					<pattern type="100000" count="other">000k ¤</pattern>
+					<pattern type="1000000" count="one">0 mill'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 mill'.' ¤</pattern>
+					<pattern type="10000000" count="one">00 mill'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 mill'.' ¤</pattern>
+					<pattern type="100000000" count="one">000 mill'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 mill'.' ¤</pattern>
+					<pattern type="1000000000" count="one">0 mrd'.' ¤</pattern>
+					<pattern type="1000000000" count="other">0 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="one">00 mrd'.' ¤</pattern>
+					<pattern type="10000000000" count="other">00 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="one">000 mrd'.' ¤</pattern>
+					<pattern type="100000000000" count="other">000 mrd'.' ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bill'.' ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bill'.' ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bill'.' ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bill'.' ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bill'.' ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bill'.' ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4807,9 +4852,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4817,9 +4866,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4827,9 +4880,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4837,9 +4894,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4847,9 +4908,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4857,9 +4922,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4867,9 +4936,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4877,9 +4950,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4887,9 +4964,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4897,9 +4978,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4907,9 +4992,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4917,9 +5006,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4927,9 +5020,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4937,9 +5034,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4947,9 +5048,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4957,9 +5062,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4967,9 +5076,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4977,9 +5090,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4987,9 +5104,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4997,9 +5118,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5007,9 +5132,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5017,9 +5146,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="contributed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -6406,6 +6539,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">østkaribiske dollar</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibiske gylden</displayName>
+				<displayName count="one">karibisk gylden</displayName>
+				<displayName count="other">karibiske gylden</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>spesielle trekkrettigheter</displayName>
 				<displayName count="one">spesiell trekkrettighet</displayName>
@@ -6532,6 +6670,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">zimbabwisk dollar (1980–2008)</displayName>
 				<displayName count="other">zimbabwiske dollar (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabwiske gull</displayName>
+				<displayName count="one">zimbabwisk gull</displayName>
+				<displayName count="other">zimbabwiske gull</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>zimbabwisk dollar (2009)</displayName>
 				<displayName count="one">zimbabwisk dollar (2009)</displayName>
@@ -6957,7 +7100,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} item</unitPattern>
 				<unitPattern count="other" case="genitive">{0} items</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>deler</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} deler</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<displayName>deler per million</displayName>
 				<unitPattern count="one">{0} del per million</unitPattern>
@@ -6993,6 +7141,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mol</unitPattern>
 				<unitPattern count="other" case="genitive">{0} mols</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukose</displayName>
+				<unitPattern count="one">{0} glukose</unitPattern>
+				<unitPattern count="other">{0} glukose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>liter per kilometer</displayName>
@@ -7691,6 +7844,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} millimeter kvikksølv</unitPattern>
 				<unitPattern count="other" case="genitive">{0} millimeter kvikksølvs</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>kvikksølv</displayName>
+				<unitPattern count="one">{0} kvikksølv</unitPattern>
+				<unitPattern count="other">{0} kvikksølv</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pund per kvadrattomme</displayName>
 				<unitPattern count="one">{0} pund per kvadrattomme</unitPattern>
@@ -7944,6 +8102,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} metriske kopper</unitPattern>
 				<unitPattern count="other" case="genitive">{0} metriske koppers</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriske væskeunser</displayName>
+				<unitPattern count="one">{0} metrisk væskeunse</unitPattern>
+				<unitPattern count="other">{0} metriske væskeunser</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} acre-fot</unitPattern>
 				<unitPattern count="other">{0} acre-fot</unitPattern>
@@ -8037,7 +8200,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-pinch">
 				<gender>masculine</gender>
-				<unitPattern count="one">{0} klyper</unitPattern>
+				<unitPattern count="one">{0} klype</unitPattern>
 				<unitPattern count="other">{0} klyper</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
@@ -8046,15 +8209,79 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} britisk quart</unitPattern>
 				<unitPattern count="other">{0} britiske quart</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradianer</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradianer</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorier [IT]</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorier [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopond</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="other">{0} kilopond</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>lys</displayName>
 				<unitPattern count="one">{0} lys</unitPattern>
 				<unitPattern count="one" case="genitive">{0} lys'</unitPattern>
 				<unitPattern count="other">{0} lys</unitPattern>
 				<unitPattern count="other" case="genitive">{0} lys'</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>deler per milliard</displayName>
 				<unitPattern count="one">{0} del per milliard</unitPattern>
@@ -8064,7 +8291,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>masculine</gender>
-				<displayName>netter</displayName>
 				<unitPattern count="one">{0} natt</unitPattern>
 				<unitPattern count="one" case="genitive">{0} natts</unitPattern>
 				<unitPattern count="other">{0} netter</unitPattern>
@@ -8136,6 +8362,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmol/l</unitPattern>
 				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>del</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} del</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>prosent</displayName>
 				<unitPattern count="one">{0} %</unitPattern>
@@ -8151,6 +8382,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -8547,7 +8783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-pinch">
 				<displayName>klype</displayName>
-				<unitPattern count="one">{0} klyper</unitPattern>
+				<unitPattern count="one">{0} klype</unitPattern>
 				<unitPattern count="other">{0} klyper</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
@@ -8555,14 +8791,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} imp. quart</unitPattern>
 				<unitPattern count="other">{0} imp. quart</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>lys</displayName>
 				<unitPattern count="one">{0} lys</unitPattern>
 				<unitPattern count="other">{0} lys</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>deler/milliard</displayName>
-			</unit>
 			<unit type="duration-night">
 				<displayName>netter</displayName>
 				<unitPattern count="one">{0} natt</unitPattern>
@@ -8643,7 +8884,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmol/l</unitPattern>
 				<unitPattern count="other">{0}mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>del</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} del</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -8666,6 +8912,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0}l/km</unitPattern>
@@ -9096,21 +9347,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} qt. Imp.</unitPattern>
 				<unitPattern count="other">{0} qt. Imp.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>lys</displayName>
 				<unitPattern count="one">{0}lys</unitPattern>
 				<unitPattern count="other">{0}lys</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>netter</displayName>
-				<unitPattern count="one">{0} natt</unitPattern>
-				<unitPattern count="other">{0} netter</unitPattern>
-				<perUnitPattern>{0}/natt</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}Ø</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/nqo.xml b/make/data/cldr/common/main/nqo.xml
index 035bcb49c1b..6fb67d952cb 100644
--- a/make/data/cldr/common/main/nqo.xml
+++ b/make/data/cldr/common/main/nqo.xml
@@ -1710,7 +1710,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>ߔߑߣߐ߲߫ ߔߍ߲߫</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>ߞߊ߲ߕߐ߲߫</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2380,9 +2380,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ߝߘߊ߬ߝߌ߲߬ߠߊ߫ ߕߟߋ߬ߓߋ ߕߎ߬ߡߊ߬ߙߋ߲</generic>
-					<standard>ߝߘߊ߬ߝߌ߲߬ߠߊ߫ ߕߟߋ߬ߓߋ ߕߎ߬ߡߊ߬ߙߋ߲ ߢߊߓߘߍ</standard>
-					<daylight>ߝߘߊ߬ߝߌ߲߬ߠߊ߫ ߕߟߋ߬ߓߋ ߕߟߋ߬ߡߊ߬ ߕߎߡߊߙߋ߲</daylight>
+					<standard>ߝߘߊ߬ߝߌ߲߬ߠߊ߫ ߕߟߋ߬ߓߋ ߕߎ߬ߡߊ߬ߙߋ߲</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2732,6 +2730,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ߜ߭ߎߦߣߊ߫ ߕߎ߬ߡߊ߬ߘߊ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ߤߥߊߦ - ߊߟߋߦߎߕߌߦߊ߲߫ ߕߎ߬ߡߘߊ߬ ߛߎߡߊ߲ߘߊ߲ߕߊ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ߤߥߊߦ - ߊߟߋߦߎߕߌߦߊ߲߫ ߕߎ߬ߡߊ߬ߘߊ</generic>
diff --git a/make/data/cldr/common/main/nso.xml b/make/data/cldr/common/main/nso.xml
index 83e2ad877e0..39fb2b0f8a7 100644
--- a/make/data/cldr/common/main/nso.xml
+++ b/make/data/cldr/common/main/nso.xml
@@ -35,30 +35,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="auxiliary">[c q v z]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="unconfirmed">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
 	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>”</alternateQuotationEnd>
-	</delimiters>
 	<dates>
 		<calendars>
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">Phere</month>
-							<month type="2">Dibo</month>
-							<month type="3">Hlak</month>
-							<month type="4">Mora</month>
+							<month type="1">Jan</month>
+							<month type="2">Feb</month>
+							<month type="3">Mat</month>
+							<month type="4">Apo</month>
 							<month type="5">Mei</month>
-							<month type="6">June</month>
-							<month type="7">Mose</month>
-							<month type="8">Agosetose</month>
-							<month type="9">Lewe</month>
-							<month type="10">Dipha</month>
-							<month type="11">Diba</month>
-							<month type="12">Manth</month>
+							<month type="6">Jun</month>
+							<month type="7">Jul</month>
+							<month type="8">Ago</month>
+							<month type="9">Sep</month>
+							<month type="10">Okt</month>
+							<month type="11">Nof</month>
+							<month type="12">Dis</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Janeware</month>
@@ -127,6 +121,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</days>
 				<quarters>
 					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">Kotara 1</quarter>
+							<quarter type="2">Kotara 2</quarter>
+							<quarter type="3">Kotara 3</quarter>
+							<quarter type="4">Kotara 4</quarter>
+						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1st Kotara</quarter>
 							<quarter type="2">2nd Kotara</quarter>
@@ -227,6 +227,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">'beke' W 'ya' MMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">'beke' 'ya' 'bo' W 'ya' MMM</dateFormatItem>
+						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
 						<dateFormatItem id="yw" count="one">'beke' 'ya' 'bo' w 'ya' Y</dateFormatItem>
 						<dateFormatItem id="yw" count="other">'beke' 'ya' 'bo' w 'ya' Y</dateFormatItem>
 					</availableFormats>
@@ -297,6 +299,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<fields>
+			<field type="year">
+				<relative type="-1">ngwaga wa go feta</relative>
+				<relative type="0">ngwaga wo</relative>
+				<relative type="1">ngwaga wo o tlago</relative>
+			</field>
+			<field type="month">
+				<relative type="-1">kgwedi ye e fetilego</relative>
+				<relative type="0">kgwedi ye</relative>
+				<relative type="1">kgwedi ye e tlago</relative>
+			</field>
+			<field type="week">
+				<relative type="-1">beke ye e fetilego</relative>
+				<relative type="0">beke ye</relative>
+				<relative type="1">beke ye e tlago</relative>
+			</field>
+			<field type="day">
+				<relative type="-1">maabane</relative>
+				<relative type="0">lehono</relative>
+				<relative type="1">gosasa</relative>
+			</field>
+			<field type="sun">
+				<relative type="-1">LaMorena le fetilego</relative>
+				<relative type="0">LaMorena le</relative>
+				<relative type="1">LaMorena le latelago</relative>
+			</field>
+		</fields>
 		<timeZoneNames>
 			<metazone type="GMT">
 				<long>
@@ -306,9 +335,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</timeZoneNames>
 	</dates>
 	<numbers>
-		<symbols numberSystem="latn">
-			<group> </group>
-		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
diff --git a/make/data/cldr/common/main/oc.xml b/make/data/cldr/common/main/oc.xml
index 869bf9b9931..70f3943ab2a 100644
--- a/make/data/cldr/common/main/oc.xml
+++ b/make/data/cldr/common/main/oc.xml
@@ -576,7 +576,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">GGGGG y-MM-dd</pattern>
+							<pattern draft="unconfirmed">G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1231,9 +1231,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">ora d’Africa occidentala</generic>
-					<standard draft="unconfirmed">ora estandarda d’Africa occidentala</standard>
-					<daylight draft="unconfirmed">ora d’estiu d’Africa occidentala</daylight>
+					<standard draft="unconfirmed">ora d’Africa occidentala</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1583,6 +1581,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">ora de la Guayana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">ora estandarda de Hawai-Aleutianes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">ora de Hawai-Aleutianes</generic>
@@ -2226,168 +2229,252 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</percentFormats>
 		<currencyFormats numberSystem="adlm">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="arabext">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="bali">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="beng">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="brah">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="cakm">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="cham">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="deva">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="fullwide">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="gong">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="gonm">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="gujr">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="guru">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="hanidec">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="java">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="kali">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="khmr">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="knda">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="lana">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="lanatham">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="laoo">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
@@ -2396,210 +2483,316 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">#,##0.00¤;(#,##0.00¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other" draft="unconfirmed">0K¤</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">0K ¤</pattern>
 					<pattern type="10000" count="other" draft="unconfirmed">00K¤</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">00K ¤</pattern>
 					<pattern type="100000" count="other" draft="unconfirmed">000K¤</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">000K ¤</pattern>
 					<pattern type="1000000" count="other" draft="unconfirmed">0M¤</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">0M ¤</pattern>
 					<pattern type="10000000" count="other" draft="unconfirmed">00M¤</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">00M ¤</pattern>
 					<pattern type="100000000" count="other" draft="unconfirmed">000M¤</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">000M ¤</pattern>
 					<pattern type="1000000000" count="other" draft="unconfirmed">0G¤</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">0G ¤</pattern>
 					<pattern type="10000000000" count="other" draft="unconfirmed">00G¤</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">00G ¤</pattern>
 					<pattern type="100000000000" count="other" draft="unconfirmed">000G¤</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">000G ¤</pattern>
 					<pattern type="1000000000000" count="other" draft="unconfirmed">0T¤</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">0T ¤</pattern>
 					<pattern type="10000000000000" count="other" draft="unconfirmed">00T¤</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">00T ¤</pattern>
 					<pattern type="100000000000000" count="other" draft="unconfirmed">000T¤</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">000T ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="lepc">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="limb">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="mlym">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="mong">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="mtei">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="mymr">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="mymrshan">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="nkoo">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="olck">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="orya">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="osma">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="rohg">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="saur">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="shrd">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="sora">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="sund">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="takr">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="talu">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="tamldec">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="telu">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="thai">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="tibt">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencyFormats numberSystem="vaii">
 			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
@@ -3500,7 +3693,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">milimòls per litres</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} milimòls per litres</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">partidas per milions</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} partidas per milions</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/oc_ES.xml b/make/data/cldr/common/main/oc_ES.xml
index df686405e32..e0377e605c0 100644
--- a/make/data/cldr/common/main/oc_ES.xml
+++ b/make/data/cldr/common/main/oc_ES.xml
@@ -27,7 +27,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="es_419" draft="unconfirmed">espanhòu latinoamerican</language>
 			<language type="es_ES" draft="unconfirmed">espanhòu d’Espanha</language>
 			<language type="es_MX" draft="unconfirmed">espanhòu de Mexic</language>
-			<language type="fi" draft="unconfirmed">finés</language>
 			<language type="fr_CA" draft="unconfirmed">francés canadienc</language>
 			<language type="fr_CH" draft="unconfirmed">francés suís</language>
 			<language type="hi_Latn" draft="unconfirmed">hindi (latin)</language>
@@ -41,7 +40,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="th" draft="unconfirmed">tailandés</language>
 			<language type="und" draft="unconfirmed">lengua desconeishuda</language>
 			<language type="zh" alt="menu" draft="unconfirmed">chinés mandarin</language>
-			<language type="zh_Hans" draft="unconfirmed">shinés simplificat</language>
 			<language type="zh_Hant" draft="unconfirmed">chinés tradicionau</language>
 			<language type="zh_Hant" alt="long" draft="unconfirmed">chinés mandarin tradicionau</language>
 		</languages>
@@ -50,7 +48,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Hans" alt="stand-alone" draft="unconfirmed">han simplificat</script>
 			<script type="Hant" draft="unconfirmed">tradicionau</script>
 			<script type="Hant" alt="stand-alone" draft="unconfirmed">han tradicionau</script>
-			<script type="Latn" draft="unconfirmed">latino</script>
 			<script type="Zxxx" draft="unconfirmed">no escrit</script>
 			<script type="Zzzz" draft="unconfirmed">alfabet desconeishut</script>
 		</scripts>
@@ -68,7 +65,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="021" draft="unconfirmed">Nòrt America</territory>
 			<territory type="030" draft="unconfirmed">Asia orientau</territory>
 			<territory type="034" draft="unconfirmed">Asia meridionau</territory>
-			<territory type="035" draft="unconfirmed">Sudèst aisatic</territory>
+			<territory type="035" draft="unconfirmed">Sudèst asiatic</territory>
 			<territory type="039" draft="unconfirmed">Euròpa meridionau</territory>
 			<territory type="053" draft="unconfirmed">Australasia</territory>
 			<territory type="057" draft="unconfirmed">Region de Micronesia</territory>
@@ -241,7 +238,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<ellipsis type="word-initial" draft="unconfirmed">… {0}</ellipsis>
 		<parseLenients scope="general" level="lenient">
 			<parseLenient sample="’" draft="unconfirmed">['＇’ ՚ ᾽᾿ ʼ ߴ]</parseLenient>
-			<parseLenient sample="£" draft="unconfirmed">[£￡ ₤]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-" draft="unconfirmed">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
@@ -475,6 +471,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">G</month>
+							<month type="2" draft="unconfirmed">H</month>
+							<month type="3" draft="unconfirmed">M</month>
+							<month type="4" draft="unconfirmed">A</month>
+							<month type="5" draft="unconfirmed">M</month>
+							<month type="6" draft="unconfirmed">J</month>
+							<month type="7" draft="unconfirmed">J</month>
+							<month type="8" draft="unconfirmed">A</month>
+							<month type="9" draft="unconfirmed">S</month>
+							<month type="10" draft="unconfirmed">O</month>
+							<month type="11" draft="unconfirmed">N</month>
+							<month type="12" draft="unconfirmed">D</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1" draft="unconfirmed">gèr</month>
 							<month type="2" draft="unconfirmed">hereuèr</month>
@@ -645,9 +655,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Bh" draft="unconfirmed">h B</dateFormatItem>
 						<dateFormatItem id="Bhm" draft="unconfirmed">h:mm B</dateFormatItem>
-						<dateFormatItem id="Bhms" draft="unconfirmed">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="EBhm" draft="unconfirmed">E h:mm B</dateFormatItem>
-						<dateFormatItem id="EBhms" draft="unconfirmed">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm" draft="unconfirmed">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm" draft="unconfirmed">E, H:mm</dateFormatItem>
@@ -877,9 +885,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Etc/Unknown">
 				<exemplarCity draft="unconfirmed">ciutat desconeishuda</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity draft="unconfirmed">Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity draft="unconfirmed">Ereván</exemplarCity>
 			</zone>
@@ -965,7 +970,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">Santiago de Chile</exemplarCity>
 			</zone>
 			<zone type="Asia/Urumqi">
-				<exemplarCity draft="unconfirmed">Ürümqi</exemplarCity>
+				<exemplarCity draft="unconfirmed">Urumqui</exemplarCity>
 			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity draft="unconfirmed">Bogotá</exemplarCity>
@@ -979,9 +984,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity draft="unconfirmed">Cabo Verde</exemplarCity>
 			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity draft="unconfirmed">Curaçao</exemplarCity>
-			</zone>
 			<zone type="Indian/Christmas">
 				<exemplarCity draft="unconfirmed">Nadau</exemplarCity>
 			</zone>
@@ -1062,9 +1064,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Tokyo">
 				<exemplarCity draft="unconfirmed">Tokio</exemplarCity>
 			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity draft="unconfirmed">Comores</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity draft="unconfirmed">Sant Cristòbal</exemplarCity>
 			</zone>
@@ -1086,6 +1085,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Qyzylorda">
 				<exemplarCity draft="unconfirmed">Kyzylorda</exemplarCity>
 			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity draft="unconfirmed">Vientian</exemplarCity>
+			</zone>
 			<zone type="America/St_Lucia">
 				<exemplarCity draft="unconfirmed">Santa Lucía</exemplarCity>
 			</zone>
@@ -1095,6 +1097,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Tripoli">
 				<exemplarCity draft="unconfirmed">Trípoli</exemplarCity>
 			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity draft="unconfirmed">Chisinau</exemplarCity>
+			</zone>
 			<zone type="Europe/Skopje">
 				<exemplarCity draft="unconfirmed">Skopie</exemplarCity>
 			</zone>
@@ -1140,6 +1145,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Qatar">
 				<exemplarCity draft="unconfirmed">Catar</exemplarCity>
 			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity draft="unconfirmed">Reunion</exemplarCity>
+			</zone>
 			<zone type="Europe/Bucharest">
 				<exemplarCity draft="unconfirmed">Bucarest</exemplarCity>
 			</zone>
@@ -1173,9 +1181,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Riyadh">
 				<exemplarCity draft="unconfirmed">Riad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity draft="unconfirmed">Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity draft="unconfirmed">Jartum</exemplarCity>
 			</zone>
@@ -1206,9 +1211,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Ndjamena">
 				<exemplarCity draft="unconfirmed">Yamena</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity draft="unconfirmed">Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity draft="unconfirmed">Dusambé</exemplarCity>
 			</zone>
@@ -1230,6 +1232,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Simferòpol</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity draft="unconfirmed">Isla Wake</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity draft="unconfirmed">Beulah, Dakota deth Nòrd</exemplarCity>
 			</zone>
@@ -1260,6 +1265,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Saigon">
 				<exemplarCity draft="unconfirmed">Ciutat Ho Chi Minh</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity draft="unconfirmed">Wallis e Furtuna</exemplarCity>
+			</zone>
 			<metazone type="Africa_Central">
 				<long>
 					<standard draft="unconfirmed">ora d’Africa central</standard>
@@ -1272,9 +1280,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">ora d’Africa occidentau</generic>
-					<standard draft="unconfirmed">ora esdandard d’Africa occidentau</standard>
-					<daylight draft="unconfirmed">ora d’estiu d’Africa occidentau</daylight>
+					<standard draft="unconfirmed">ora d’Africa occidentau</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1558,6 +1564,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">ora de Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">ora estandard de Hawai-Aleutianes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">ora de Hawai-Aleutianes</generic>
@@ -1632,6 +1643,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">ora d’estiu de Japon</daylight>
 				</long>
 			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard draft="unconfirmed">ora de Kazajistan</standard>
+				</long>
+			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
 					<standard draft="unconfirmed">ora de Kazajistan orientau</standard>
@@ -2103,6 +2119,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2110,6 +2128,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2117,6 +2137,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2124,6 +2146,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2131,6 +2155,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2138,6 +2164,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2145,6 +2173,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2152,6 +2182,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2159,6 +2191,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2166,6 +2200,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2173,6 +2209,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2180,6 +2218,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2187,6 +2227,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2194,6 +2236,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2201,6 +2245,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2208,6 +2254,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2215,6 +2263,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2222,6 +2272,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2229,6 +2281,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2236,6 +2290,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2243,6 +2299,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2250,6 +2308,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2257,6 +2317,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2264,6 +2326,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2271,6 +2335,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2278,6 +2344,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2285,6 +2353,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2292,6 +2362,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2299,6 +2371,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2306,6 +2380,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2313,6 +2389,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2320,6 +2398,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2327,6 +2407,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2334,6 +2416,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2341,6 +2425,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2348,6 +2434,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2355,6 +2443,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2362,6 +2452,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2369,6 +2461,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2376,6 +2470,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2383,6 +2479,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2390,6 +2488,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2397,6 +2497,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2404,6 +2506,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2411,6 +2515,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/oka.xml b/make/data/cldr/common/main/oka.xml
new file mode 100644
index 00000000000..a0cc05ef8e2
--- /dev/null
+++ b/make/data/cldr/common/main/oka.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="oka"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="oka">n̓səl̓xcin̓</language>
+		</languages>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[aá {aˤ}{áˤ} c{c̓}č ə ɣ h ií ɪ{ɪ́} k{k̓} {kʷ}{k̓ʷ} l{l̓} ɬ {ƛ̓} m{m̓} n{n̓} p{p̓} q{q̓} {qʷ}{q̓ʷ} r s t{t̓} uú w{w̓} x{x̌} {xʷ}{x̌ʷ} y{y̓} ʔ ʕ{ʕ̓} {ʕʷ}{ʕ̓ʷ}]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[b d e f g j o v z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . '‘’ &quot;“” ( ) \[ \] @ * / \&amp; #]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/oka_CA.xml b/make/data/cldr/common/main/oka_CA.xml
new file mode 100644
index 00000000000..3035f46d11e
--- /dev/null
+++ b/make/data/cldr/common/main/oka_CA.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="oka"/>
+		<territory type="CA"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/oka_US.xml b/make/data/cldr/common/main/oka_US.xml
new file mode 100644
index 00000000000..5c3c4b73808
--- /dev/null
+++ b/make/data/cldr/common/main/oka_US.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="oka"/>
+		<territory type="US"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/om.xml b/make/data/cldr/common/main/om.xml
index 6416d60b7c5..fe0c3d5b9ad 100644
--- a/make/data/cldr/common/main/om.xml
+++ b/make/data/cldr/common/main/om.xml
@@ -537,21 +537,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="12">H</month>
 							<month type="13">Q</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Fulbaana</month>
-							<month type="2">Guraandhala</month>
-							<month type="3">Sadaasa</month>
-							<month type="4">Mudde</month>
-							<month type="5">Amajji</month>
-							<month type="6">Waxabajjii</month>
-							<month type="7">Bitootessa</month>
-							<month type="8">Eebila</month>
-							<month type="9">Caamsaa</month>
-							<month type="10">Onkoloolessa</month>
-							<month type="11">Adoolessa</month>
-							<month type="12">Hagayya</month>
-							<month type="13">Qaam’ee</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -602,17 +587,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
@@ -752,20 +731,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">Sadaasa</month>
 							<month type="12">Mud</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">A</month>
-							<month type="2">G</month>
-							<month type="3">B</month>
-							<month type="4">E</month>
-							<month type="5">C</month>
-							<month type="6">W</month>
-							<month type="7">A</month>
-							<month type="8">H</month>
-							<month type="9">F</month>
-							<month type="10">O</month>
-							<month type="11">S</month>
-							<month type="12">M</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Amajjii</month>
 							<month type="2">Guraandhala</month>
@@ -782,20 +747,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Ama</month>
-							<month type="2">Gur</month>
-							<month type="3">Bitootessa</month>
-							<month type="4">Elb</month>
-							<month type="5">Cam</month>
-							<month type="6">Wax</month>
-							<month type="7">Ado</month>
-							<month type="8">Hag</month>
-							<month type="9">Ful</month>
-							<month type="10">Onk</month>
-							<month type="11">Sadaasa</month>
-							<month type="12">Mud</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">A</month>
 							<month type="2">G</month>
@@ -810,20 +761,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">S</month>
 							<month type="12">M</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Amajjii</month>
-							<month type="2">Guraandhala</month>
-							<month type="3">Bitootessa</month>
-							<month type="4">Eebila</month>
-							<month type="5">Caamsaa</month>
-							<month type="6">Waxabajjii</month>
-							<month type="7">Adoolessa</month>
-							<month type="8">Hagayya</month>
-							<month type="9">Fulbaana</month>
-							<month type="10">Onkoloolessa</month>
-							<month type="11">Sadaasa</month>
-							<month type="12">Mudde</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -837,24 +774,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Jim</day>
 							<day type="sat">San</day>
 						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">W</day>
-							<day type="tue">K</day>
-							<day type="wed">R</day>
-							<day type="thu">K</day>
-							<day type="fri">J</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Dil</day>
-							<day type="mon">Wix</day>
-							<day type="tue">Kib</day>
-							<day type="wed">Rob</day>
-							<day type="thu">Kam</day>
-							<day type="fri">Jim</day>
-							<day type="sat">San</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Dilbata</day>
 							<day type="mon">Wiixata</day>
@@ -866,15 +785,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">Dil</day>
-							<day type="mon">Wix</day>
-							<day type="tue">Kib</day>
-							<day type="wed">Rob</day>
-							<day type="thu">Kam</day>
-							<day type="fri">Jim</day>
-							<day type="sat">San</day>
-						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">D</day>
 							<day type="mon">W</day>
@@ -884,24 +794,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">J</day>
 							<day type="sat">S</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Dil</day>
-							<day type="mon">Wix</day>
-							<day type="tue">Kib</day>
-							<day type="wed">Rob</day>
-							<day type="thu">Kam</day>
-							<day type="fri">Jim</day>
-							<day type="sat">San</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Dilbata</day>
-							<day type="mon">Wiixata</day>
-							<day type="tue">Kibxata</day>
-							<day type="wed">Roobii</day>
-							<day type="thu">Kamisa</day>
-							<day type="fri">Jimaata</day>
-							<day type="sat">Sanbata</day>
-						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
@@ -919,20 +811,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">Kurmaana 4ffaa</quarter>
 						</quarterWidth>
 					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Kurmaana 1ffaa</quarter>
-							<quarter type="2">Kurmaana 2ffaa</quarter>
-							<quarter type="3">Kurmaana 3ffaa</quarter>
-							<quarter type="4">Kurmaana 4ffaa</quarter>
-						</quarterWidth>
-					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
@@ -957,9 +835,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">Dh</era>
-						<era type="0" alt="variant">BWD</era>
 						<era type="1">B</era>
-						<era type="1" alt="variant">BW</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
@@ -1034,17 +910,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
@@ -1052,7 +922,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1116,7 +985,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a </greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1128,10 +996,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
@@ -1143,11 +1007,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
 							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
 							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
@@ -1190,12 +1050,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="era">
 				<displayName>bara</displayName>
 			</field>
-			<field type="era-short">
-				<displayName>bara</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName>bara</displayName>
-			</field>
 			<field type="year">
 				<displayName>waggaa</displayName>
 				<relative type="-1">waggaa darbe</relative>
@@ -1226,9 +1080,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="year-narrow">
 				<displayName>wg</displayName>
-				<relative type="-1">wg. darbe</relative>
-				<relative type="0">wg. kana</relative>
-				<relative type="1">wg. dhufu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">w {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">w {0} keessatti</relativeTimePattern>
@@ -1310,9 +1161,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="month-narrow">
 				<displayName>ji</displayName>
-				<relative type="-1">ji. darbe</relative>
-				<relative type="0">ji. kana</relative>
-				<relative type="1">ji. dhufu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">ji {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">ji {0} keessatti</relativeTimePattern>
@@ -1350,13 +1198,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="one">tr. {0} darbe</relativeTimePattern>
 					<relativeTimePattern count="other">tr. {0} darbe</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod>torban {0}</relativePeriod>
 			</field>
 			<field type="week-narrow">
 				<displayName>tr</displayName>
-				<relative type="-1">tr. darbe</relative>
-				<relative type="0">tr. kana</relative>
-				<relative type="1">tr. dhufu</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">w {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">w {0} keessatti</relativeTimePattern>
@@ -1365,7 +1209,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="one">w {0} darbe</relativeTimePattern>
 					<relativeTimePattern count="other">w {0} darbe</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod>torban {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>torbrr ji’aa</displayName>
@@ -1390,25 +1233,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">guyyoota {0} darban</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="day-short">
-				<displayName>guyyaa</displayName>
-				<relative type="-1">kaleessa</relative>
-				<relative type="0">har’a</relative>
-				<relative type="1">boru</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">guyyaa {0} keessatti</relativeTimePattern>
-					<relativeTimePattern count="other">guyyoota {0} keessatti</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">guyyaa {0} darbe</relativeTimePattern>
-					<relativeTimePattern count="other">guyyoota {0} darban</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="day-narrow">
-				<displayName>guyyaa</displayName>
-				<relative type="-1">kaleessa</relative>
-				<relative type="0">har’a</relative>
-				<relative type="1">boru</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">g {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">g {0} keessatti</relativeTimePattern>
@@ -1424,27 +1249,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="dayOfYear-short">
 				<displayName>guyyaa kan wg.</displayName>
 			</field>
-			<field type="dayOfYear-narrow">
-				<displayName>guyyaa kan wg.</displayName>
-			</field>
 			<field type="weekday">
 				<displayName>guyyaa kan torbee</displayName>
 			</field>
 			<field type="weekday-short">
 				<displayName>guyyaa kan tr.</displayName>
 			</field>
-			<field type="weekday-narrow">
-				<displayName>guyyaa kan tr.</displayName>
-			</field>
 			<field type="weekdayOfMonth">
 				<displayName>guyyaatorbee kan ji’aa</displayName>
 			</field>
 			<field type="weekdayOfMonth-short">
 				<displayName>gytr. kan ji.</displayName>
 			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName>gytr. kan ji.</displayName>
-			</field>
 			<field type="sun">
 				<relative type="-1">Dilbata darbe</relative>
 				<relative type="0">Dilbata kana</relative>
@@ -1718,15 +1534,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">sa {0} dura</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="dayperiod-short">
-				<displayName>WD/WB</displayName>
-			</field>
 			<field type="dayperiod">
 				<displayName>WD/WB</displayName>
 			</field>
-			<field type="dayperiod-narrow">
-				<displayName>WD/WB</displayName>
-			</field>
 			<field type="hour">
 				<displayName>sa’aatii</displayName>
 				<relative type="0">sa’aatii kana</relative>
@@ -1741,7 +1551,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="hour-short">
 				<displayName>sa.</displayName>
-				<relative type="0">sa’aatii kana</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sa. {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">sa. {0} keessatti</relativeTimePattern>
@@ -1753,7 +1562,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="hour-narrow">
 				<displayName>sa</displayName>
-				<relative type="0">sa’aatii kana</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">h {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">h {0} keessatti</relativeTimePattern>
@@ -1788,7 +1596,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="minute-narrow">
 				<displayName>dq</displayName>
-				<relative type="0">daqiiqaa kana</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">d {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">d {0} keessatti</relativeTimePattern>
@@ -1812,7 +1619,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="second-short">
 				<displayName>sek.</displayName>
-				<relative type="0">amma</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">sek. {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">sek. {0} keessatti</relativeTimePattern>
@@ -1824,7 +1630,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="second-narrow">
 				<displayName>sek</displayName>
-				<relative type="0">amma</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">s {0} keessatti</relativeTimePattern>
 					<relativeTimePattern count="other">s {0} keessatti</relativeTimePattern>
@@ -1840,9 +1645,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="zone-short">
 				<displayName>zoonii</displayName>
 			</field>
-			<field type="zone-narrow">
-				<displayName>zoonii</displayName>
-			</field>
 		</fields>
 		<timeZoneNames>
 			<regionFormat>Sa’aatii {0}</regionFormat>
@@ -1885,9 +1687,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Sa’aatii Afrikaa Dhihaa</generic>
-					<standard>Sa’aatii Istaandaardii Afrikaa Dhihaa</standard>
-					<daylight>Sa’aatii Bonaa Afrikaa Dhihaa</daylight>
+					<standard>Sa’aatii Afrikaa Dhihaa</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2272,6 +2072,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Sa’aatii Guyaanaa</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Sa’aatii Istaandaardii Haawayi-Alewutiyan</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAS</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Sa’aatii Haawayi-Alewutiyan</generic>
diff --git a/make/data/cldr/common/main/or.xml b/make/data/cldr/common/main/or.xml
index 77f1ebb89a2..cabc4fdf545 100644
--- a/make/data/cldr/common/main/or.xml
+++ b/make/data/cldr/common/main/or.xml
@@ -279,6 +279,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ବାଫଲା</language>
 			<language type="ksh">କୋଲୋବନିୟ</language>
 			<language type="ku">କୁର୍ଦ୍ଦିଶ୍</language>
+			<language type="ku" menu="core">କୁର୍ଦ୍ଦିଶ୍‌</language>
+			<language type="ku" menu="extension">କୁର୍‌ମାଞ୍ଜି</language>
 			<language type="kum">କୁମୀକ୍</language>
 			<language type="kut">କୁତେନାଉ</language>
 			<language type="kv">କୋମି</language>
@@ -801,6 +803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ଚୀନ୍‌</territory>
 			<territory type="CO">କଲମ୍ବିଆ</territory>
 			<territory type="CP">କ୍ଲିପରଟନ୍‌ ଦ୍ୱୀପ</territory>
+			<territory type="CQ">ସର୍କ୍‌</territory>
 			<territory type="CR">କୋଷ୍ଟା ରିକା</territory>
 			<territory type="CU">କ‍୍ୟୁବା</territory>
 			<territory type="CV">କେପ୍ ଭର୍ଦେ</territory>
@@ -1045,43 +1048,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">ମୁଦ୍ରା ଫର୍ମାଟ୍‌</key>
 			<key type="collation">ସର୍ଟ୍‌ କ୍ରମ</key>
 			<key type="currency">ମୁଦ୍ରା</key>
+			<key type="em">ଦର୍ଶାଯାଇଥିବା ଇମୋଜି</key>
 			<key type="hc">ଘଣ୍ଟା ଚକ୍ର (12 ବନାମ 24)</key>
 			<key type="lb">ଲାଇନ୍‌ ବ୍ରେକ୍‌ ଷ୍ଟାଇଲ୍‌</key>
+			<key type="lw">ଶବ୍ଦଗୁଡ଼ିକ ଥିବା ଲାଇନ ବ୍ରେକ</key>
 			<key type="ms">ମାପ ପଦ୍ଧତି</key>
 			<key type="numbers">ସଂଖ୍ୟା</key>
+			<key type="ss">Abbr ପରେ ଥିବା ବାକ୍ୟ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ବୌଦ୍ଧ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="buddhist" scope="core">ବୌଦ୍ଧ</type>
 			<type key="calendar" type="chinese">ଚାଇନିଜ୍‌ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="chinese" scope="core">ଚାଇନିଜ୍‌</type>
 			<type key="calendar" type="coptic">କପ୍ଟିକ୍ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="coptic" scope="core">କପ୍ଟିକ୍‌</type>
 			<type key="calendar" type="dangi">ଦାଙ୍ଗି କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="dangi" scope="core">ଦାଙ୍ଗି</type>
 			<type key="calendar" type="ethiopic">ଇଥିଓପିକ୍‌ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="ethiopic" scope="core">ଇଥିଓପିକ୍‌</type>
 			<type key="calendar" type="ethiopic-amete-alem">ଏଥିଓପିକ୍-ଆମେଟ୍-ଆଲେମ୍</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ଇଥିଓପିକ୍ ଆମେଟେ ଆଲେମ୍</type>
 			<type key="calendar" type="gregorian">ଗ୍ରେଗୋରିୟ କ୍ୟାଲେଣ୍ଡର୍</type>
+			<type key="calendar" type="gregorian" scope="core">ଗ୍ରେଗୋରିଆନ୍‌</type>
 			<type key="calendar" type="hebrew">ହିବୃ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="hebrew" scope="core">ହିବୃ</type>
 			<type key="calendar" type="indian">ଭାରତୀୟ ରାଷ୍ଟ୍ରୀୟ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="indian" scope="core">ଭାରତୀୟ ଜାତୀୟ</type>
 			<type key="calendar" type="islamic">ହିଜ୍ରି କ୍ୟାଲେଣ୍ଡର</type>
+			<type key="calendar" type="islamic" scope="core">ହିଜ୍ରି</type>
 			<type key="calendar" type="islamic-civil">ହିଜ୍ରି କ୍ୟାଲେଣ୍ଡର (ଟାବୁଲାର୍, ନାଗରିକ ଯୁଗ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ହିଜ୍ରି (ଟାବୁଲାର୍, ସିଭିଲ୍‌ ଆରମ୍ଭ କାଳ)</type>
 			<type key="calendar" type="islamic-umalqura">ହିଜ୍ରି କ୍ୟାଲେଣ୍ଡର (ଉମ୍ ଅଲ୍-କୁରା)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ହିଜ୍ରି (ଉମ୍ ଅଲ୍-କୁରା)</type>
 			<type key="calendar" type="iso8601">ISO-8601 କ୍ୟାଲେଣ୍ଡର୍‌</type>
 			<type key="calendar" type="japanese">ଜାପାନିଜ୍‌ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="japanese" scope="core">ଜାପାନିଜ୍‌</type>
 			<type key="calendar" type="persian">ପର୍ସିଆନ୍‌ କ୍ୟାଲେଣ୍ଡର୍‌</type>
+			<type key="calendar" type="persian" scope="core">ପର୍ସିଆନ୍‌</type>
 			<type key="calendar" type="roc">ମିଙ୍ଗୋଓ କ୍ୟାଲେଣ୍ଡର୍‌</type>
-			<type key="cf" type="account">ଏକାଉଣ୍ଟିଂ ମୁଦ୍ରା ଫର୍ମାଟ୍‌</type>
-			<type key="cf" type="standard">ମାନାଙ୍କ ମୁଦ୍ରା ଫର୍ମାଟ୍‌</type>
+			<type key="calendar" type="roc" scope="core">ମିଙ୍ଗ୍‌ୱୋ</type>
+			<type key="cf" type="account">ଆକାଉଣ୍ଟିଂ ମୁଦ୍ରା ଫର୍ମାଟ୍‌</type>
+			<type key="cf" type="account" scope="core">ଆକାଉଣ୍ଟିଂ</type>
+			<type key="cf" type="standard">ମାନକ ମୁଦ୍ରା ଫର୍ମାଟ୍‌</type>
+			<type key="cf" type="standard" scope="core">ମାନକ</type>
 			<type key="collation" type="ducet">ଡିଫଲ୍ଟ ୟୁନିକୋଡ୍‌ ସର୍ଟ୍‌ କ୍ରମ</type>
+			<type key="collation" type="ducet" scope="core">ଡିଫଲ୍ଟ୍‌ ୟୁନିକୋଡ୍‌</type>
 			<type key="collation" type="search">ସାଧାରଣ ଉଦ୍ଦେଶ୍ୟ-ବିଶିଷ୍ଟ ସନ୍ଧାନ</type>
+			<type key="collation" type="search" scope="core">ସର୍ଚ୍ଚ୍‌</type>
 			<type key="collation" type="standard">ଷ୍ଟାଣ୍ଡାର୍ଡ୍‌ ସର୍ଟ୍‌ କ୍ରମ</type>
+			<type key="collation" type="standard" scope="core">ଷ୍ଟାଣ୍ଡାର୍ଡ୍‌</type>
+			<type key="em" type="default" scope="core">ଡିଫଲ୍ଟ୍‌</type>
+			<type key="em" type="emoji" scope="core">ଇମୋଜି</type>
+			<type key="em" type="text" scope="core">ଟେକ୍ସ୍‌ଟ୍‌</type>
 			<type key="hc" type="h11">12 ଘଣ୍ଟିଆ ପଦ୍ଧତି (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 ଘଣ୍ଟିଆ ପଦ୍ଧତି (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 ଘଣ୍ଟିଆ ପଦ୍ଧତି (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 ଘଣ୍ଟିଆ ପଦ୍ଧତି (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">କୋହଳ ଲାଇନ୍‌ ବ୍ରେକ୍‌ ଷ୍ଟାଇଲ୍‌</type>
+			<type key="lb" type="loose" scope="core">କୋହଳ</type>
 			<type key="lb" type="normal">ସାଧାରଣ ଲାଇନ୍‌ ବ୍ରେକ୍‌ ଷ୍ଟାଇଲ୍‌</type>
+			<type key="lb" type="normal" scope="core">ସାଧାରଣ</type>
 			<type key="lb" type="strict">କଠୋର ଧାଡ଼ି ବିରତି ଶୈଳୀ</type>
+			<type key="lb" type="strict" scope="core">କଠୋର</type>
+			<type key="lw" type="breakall" scope="core">ସବୁ ବ୍ରେକ୍ କରନ୍ତୁ</type>
+			<type key="lw" type="keepall" scope="core">ସବୁ ରଖନ୍ତୁ</type>
+			<type key="lw" type="normal" scope="core">ସାଧାରଣ</type>
+			<type key="lw" type="phrase" scope="core">ବାକ‍୍ୟାଂଶରେ ରଖନ୍ତୁ</type>
 			<type key="ms" type="metric">ମେଟ୍ରିକ୍‌ ପଦ୍ଧତି</type>
+			<type key="ms" type="metric" scope="core">ମେଟ୍ରିକ୍‌</type>
 			<type key="ms" type="uksystem">ଇମ୍ପେରିଆଲ୍‌ ମାପ ପଦ୍ଧତି</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">ୟୁଏସ୍‌ ମାପ ପଦ୍ଧତି</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">ଆରବିକ୍‌-ଇଣ୍ଡିକ୍‌ ଅଙ୍କଗୁଡ଼ିକ</type>
 			<type key="numbers" type="arabext">ପରିବର୍ଦ୍ଧିତ ଆରବିକ୍‌-ଇଣ୍ଡିକ୍‌ ଅଙ୍କଗୁଡ଼ିକ</type>
 			<type key="numbers" type="armn">ଆର୍ମେନିୟ ସଂଖ୍ୟାଗୁଡ଼ିକ</type>
@@ -1123,6 +1166,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">ଥାଇ ଅଙ୍କଗୁଡ଼ିକ</type>
 			<type key="numbers" type="tibt">ତିବତୀ ଅଙ୍କଗୁଡ଼ିକ</type>
 			<type key="numbers" type="vaii">ଭାଇ ଅଙ୍କଗୁଡ଼ିକ</type>
+			<type key="ss" type="none" scope="core">ଅଫ୍‌</type>
+			<type key="ss" type="standard" scope="core">ଅନ୍‌</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ମେଟ୍ରିକ୍‌</measurementSystemName>
@@ -1138,11 +1183,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	<characters>
 		<exemplarCharacters>[଼ ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଏ ଐ ଓ ଔ ଁ ଂ ଃ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ{ଡ଼} ଢ{ଢ଼} ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯୟ ର ଲ ଳ ଵ ୱ ଶ ଷ ସ ହ {କ୍ଷ} ା ି ୀ ୁ ୂ ୃ େ ୈ ୋ ୌ ୍]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200C\u200D]</exemplarCharacters>
-		<exemplarCharacters type="index">[ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଏ ଐ ଓ ଔ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ ଢ ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯ ର ଲ ଳ ଶ ଷ ସ ହ {କ୍ଷ}]</exemplarCharacters>
+		<exemplarCharacters type="index">[ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଏ ଐ ଓ ଔ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ ଢ ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯୟ ର ଲ ଳ ୱ ଶ ଷ ସ ହ {କ୍ଷ}]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0୦ 1୧ 2୨ 3୩ 4୪ 5୫ 6୬ 7୭ 8୮ 9୯]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[୦ ୧ ୨ ୩ ୪ ୫ ୬ ୭ ୮ ୯]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … । '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[॥]</exemplarCharacters>
 		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
 			<parseLenient sample="₹">[₹ {ଟ.} {ଟଙ୍କା} {Rp} {Rs}₨]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
@@ -1206,6 +1252,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd-MM-y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -1395,8 +1442,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<quarterWidth type="abbreviated">
 							<quarter type="1">Q1</quarter>
 							<quarter type="2">Q2</quarter>
-							<quarter type="3">3ୟ ତ୍ରୟମାସ</quarter>
-							<quarter type="4">4ର୍ଥ ତ୍ରୟମାସ</quarter>
+							<quarter type="3">Q3</quarter>
+							<quarter type="4">Q4</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">1ମ ତ୍ରୟମାସ</quarter>
@@ -1415,21 +1462,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">ପୂ</dayPeriod>
-							<dayPeriod type="pm">ଅ</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">ପୂର୍ବାହ୍ନ</dayPeriod>
-							<dayPeriod type="pm">ଅପରାହ୍ନ</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -1526,6 +1567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd-MM-y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -1641,50 +1683,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<calendar type="indian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ଚୈତ୍ର</month>
-							<month type="2">ବୈଶାଖ</month>
-							<month type="3">ଜ୍ୟେଷ୍ଠ</month>
-							<month type="4">ଆଷାଢ଼</month>
-							<month type="5">ଶ୍ରାବଣ</month>
-							<month type="6">ଭାଦ୍ରବ</month>
-							<month type="7">ଆଶ୍ଵିନ</month>
-							<month type="8">କାର୍ତ୍ତିକ</month>
-							<month type="9">ମାର୍ଗଶିର</month>
-							<month type="10">ପୌଷ</month>
-							<month type="11">ମାଘ</month>
-							<month type="12">ଫାଲଗୁନ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ଚୈତ୍ର</month>
-							<month type="2">ବୈଶାଖ</month>
-							<month type="3">ଜ୍ୟେଷ୍ଠ</month>
-							<month type="4">ଆଷାଢ଼</month>
-							<month type="5">ଶ୍ରାବଣ</month>
-							<month type="6">ଭାଦ୍ରବ</month>
-							<month type="7">ଆଶ୍ଵିନ</month>
-							<month type="8">କାର୍ତ୍ତିକ</month>
-							<month type="9">ମାର୍ଗଶିର</month>
-							<month type="10">ପୌଷ</month>
-							<month type="11">ମାଘ</month>
-							<month type="12">ଫାଲଗୁନ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">ଚୈତ୍ର</month>
-							<month type="2">ବୈଶାଖ</month>
-							<month type="3">ଜ୍ୟେଷ୍ଠ</month>
-							<month type="4">ଆଷାଢ଼</month>
-							<month type="5">ଶ୍ରାବଣ</month>
-							<month type="6">ଭାଦ୍ରବ</month>
-							<month type="7">ଆଶ୍ଵିନ</month>
-							<month type="8">କାର୍ତ୍ତିକ</month>
-							<month type="9">ମାର୍ଗଶିର</month>
-							<month type="10">ପୌଷ</month>
-							<month type="11">ମାଘ</month>
-							<month type="12">ଫାଲଗୁନ</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">ଚୈତ୍ର</month>
 							<month type="2">ବୈଶାଖ</month>
@@ -1856,9 +1854,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekdayOfMonth-short">
 				<displayName>ମାସର ସାପ୍ତାହିକ ଦି.</displayName>
 			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName>ମାସର ସାପ୍ତାହିକ ଦି.</displayName>
-			</field>
 			<field type="sun">
 				<relative type="-1">ଗତ ରବିବାର</relative>
 				<relative type="0">ଏହି ରବିବାର</relative>
@@ -2065,15 +2060,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} ଶନି. ପୂର୍ବେ</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="dayperiod-short">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="dayperiod">
 				<displayName>AM/PM</displayName>
 			</field>
-			<field type="dayperiod-narrow">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="hour">
 				<displayName>ଘଣ୍ଟା</displayName>
 				<relative type="0">ଏହି ଘଣ୍ଟା</relative>
@@ -2509,6 +2498,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ଇଷ୍ଟର୍‌</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>କୋୟାଇକେ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ପୁଣ୍ଟା ଏରିନାସ୍‌</exemplarCity>
 			</zone>
@@ -2774,9 +2766,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ଫନୋମ୍‌ ପେନହ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ଏଣ୍ଡେରବୁରି</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>କ୍ୟାଣ୍ଟନ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3453,9 +3442,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ପଶ୍ଚିମ ଆଫ୍ରିକା ସମୟ</generic>
-					<standard>ପଶ୍ଚିମ ଆଫ୍ରିକା ମାନାଙ୍କ ସମୟ</standard>
-					<daylight>ପଶ୍ଚିମ ଆଫ୍ରିକା ଖରାଦିନ ସମୟ</daylight>
+					<standard>ପଶ୍ଚିମ ଆଫ୍ରିକା ସମୟ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3836,6 +3823,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ଗୁଏନା ସମୟ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ହୱାଇ-ଆଲେଉଟିୟ ମାନାଙ୍କ ସମୟ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ହୱାଇ-ଆଲେଉଟିୟ ସମୟ</generic>
@@ -4448,7 +4440,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4495,17 +4486,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="100000000000" count="other">¤000ବି</pattern>
 					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000ବି</pattern>
 					<pattern type="1000000000000" count="one">¤0ଟ୍ରି</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0T</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0ଟ୍ରି</pattern>
 					<pattern type="1000000000000" count="other">¤0ଟ୍ରି</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0ଟ୍ରି</pattern>
 					<pattern type="10000000000000" count="one">¤00ଟ୍ରି</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00T</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00ଟ୍ରି</pattern>
 					<pattern type="10000000000000" count="other">¤00ଟ୍ରି</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00ଟ୍ରି</pattern>
 					<pattern type="100000000000000" count="one">¤000ଟ୍ରି</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000ଟ୍ରି</pattern>
 					<pattern type="100000000000000" count="other">¤000ଟ୍ରି</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000ଟ୍ରି</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4991,6 +4982,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ପୂର୍ବ କାରିବୀୟ ଡଲାର୍</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>କ‍୍ୟାରବିଅନ୍‌ ଗିଲ୍ଡର୍‌</displayName>
+				<displayName count="one">କ‍୍ୟାରବିଅନ୍‌ ଗିଲ୍ଡର୍‌</displayName>
+				<displayName count="other">କ‍୍ୟାରବିଅନ୍‌ ଗିଲ୍ଡର୍‌</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>ପଶ୍ଚିମ ଆଫ୍ରିକିୟ CFA ଫ୍ରାଙ୍କ୍</displayName>
 				<displayName count="one">ପଶ୍ଚିମ ଆଫ୍ରିକୀୟ CFA ଫ୍ରାଙ୍କ୍</displayName>
@@ -5013,6 +5009,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>ଜାମ୍ବୀୟ କ୍ୱାଚା</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ଜିମ୍ବାୱିଅନ୍‌ ଗୋଲ୍ଡ୍‌</displayName>
+				<displayName count="one">ଜିମ୍ବାୱିଅନ୍‌ ଗୋଲ୍ଡ୍‌</displayName>
+				<displayName count="other">ଜିମ୍ବାୱିଅନ୍‌ ଗୋଲ୍ଡ୍‌</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5208,7 +5209,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ଆଇଟମ୍</unitPattern>
 				<unitPattern count="other">{0} ଆଇଟମ୍‌ଗୁଡିକ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ଅଂଶ</displayName>
+				<unitPattern count="one">{0} ଅଂଶ</unitPattern>
+				<unitPattern count="other">{0} ଅଂଶ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ଅଂଶ ପ୍ରତି ନିୟୁତ</displayName>
 				<unitPattern count="one">{0} ଅଂଶ ପ୍ରତି ନିୟୁତ</unitPattern>
 				<unitPattern count="other">{0} ଅଂଶ ପ୍ରତି ନିୟୁତ</unitPattern>
@@ -5230,6 +5236,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ମୋଲ</unitPattern>
 				<unitPattern count="other">{0} ମୋଲସ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ଗ୍ଲୁକୋଜ୍‌</displayName>
+				<unitPattern count="one">{0} ଗ୍ଲୁକୋଜ୍‌</unitPattern>
+				<unitPattern count="other">{0} ଗ୍ଲୁକୋଜ୍‌</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ଲିଟର୍ ପ୍ରତି କିଲୋମିଟର୍</displayName>
 				<unitPattern count="one">{0} ଲିଟର୍ ପ୍ରତି କିଲୋମିଟର୍</unitPattern>
@@ -5298,10 +5309,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ଶତାବ୍ଦୀ</unitPattern>
 				<unitPattern count="other">{0} ଶତାବ୍ଦୀ</unitPattern>
 			</unit>
-			<unit type="duration-decade">
-				<unitPattern count="one">{0} ଦଶନ୍ଧି</unitPattern>
-				<unitPattern count="other">{0} ଦଶନ୍ଧି</unitPattern>
-			</unit>
 			<unit type="duration-year">
 				<perUnitPattern>{0} ପ୍ରତି ବର୍ଷ</perUnitPattern>
 			</unit>
@@ -5567,7 +5574,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ପଏଣ୍ଟ୍</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
-				<displayName>ସୋଲାର ବ୍ୟାସାର୍ଦ୍ଧ</displayName>
 				<unitPattern count="one">{0} ସୋଲାର ବ୍ୟାସାର୍ଦ୍ଧ</unitPattern>
 				<unitPattern count="other">{0} ସୋଲାର ବ୍ୟାସାର୍ଦ୍ଧ</unitPattern>
 			</unit>
@@ -5677,6 +5683,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">ପାରାର {0} ମିଲିମିଟର୍</unitPattern>
 				<unitPattern count="other">ପାରାର {0} ମିଲିମିଟର୍</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ପାରଦ</displayName>
+				<unitPattern count="one">{0} ପାରଦ</unitPattern>
+				<unitPattern count="other">{0} ପାରଦ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ପାଉଣ୍ଡ୍ ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ</displayName>
 				<unitPattern count="one">ପ୍ରତି ବର୍ଗ ଇଞ୍ଚ {0} ପାଉଣ୍ଡ୍</unitPattern>
@@ -5829,6 +5840,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ମେଟ୍ରିକ୍ କପ୍</unitPattern>
 				<unitPattern count="other">{0} ମେଟ୍ରିକ୍ କପ୍</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ମେଟ୍ରିକ୍‌ ଫ୍ଲୁଇଡ୍‌ ଆଉନ୍ସ୍‌</displayName>
+				<unitPattern count="one">{0} ମେଟ୍ରିକ୍‌ ଫ୍ଲୁଇଡ୍‌ ଆଉନ୍ସ୍‌</unitPattern>
+				<unitPattern count="other">{0} ମେଟ୍ରିକ୍‌ ଫ୍ଲୁଇଡ୍‌ ଆଉନ୍ସ୍‌</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ଏକର-ଫିଟ୍</displayName>
 				<unitPattern count="one">{0} ଏକର-ଫୁଟ</unitPattern>
@@ -5869,20 +5885,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ଡିଜଟ୍ ସ୍ପୁନ୍</unitPattern>
 				<unitPattern count="other">{0} ଡିଜଟ୍ ସ୍ପୁନ୍</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ଆଲୋକ</displayName>
-				<unitPattern count="one">{0} ଆଲୋକ</unitPattern>
-				<unitPattern count="other">{0} ଆଲୋକ</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ଷ୍ଟେରାଡିଆନ୍</displayName>
+				<unitPattern count="one">{0} ଷ୍ଟେରାଡିଆନ୍‌</unitPattern>
+				<unitPattern count="other">{0} ଷ୍ଟେରାଡିଆନ୍‌</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>କେଟଲ୍‌</displayName>
+				<unitPattern count="one">{0} କେଟଲ୍‌</unitPattern>
+				<unitPattern count="other">{0} କେଟଲ୍‌</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>କୂଲମ୍‌</displayName>
+				<unitPattern count="one">{0} କୂଲମ୍‌</unitPattern>
+				<unitPattern count="other">{0} କୂଲମ୍‌</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ଫାରାଡ୍‌</displayName>
+				<unitPattern count="one">{0} ଫାରାଡ୍‌</unitPattern>
+				<unitPattern count="other">{0} ଫାରାଡ୍‌</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ହେନେରି</displayName>
+				<unitPattern count="one">{0} ହେନେରି</unitPattern>
+				<unitPattern count="other">{0} ହେନେରି</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ସିମେନ୍ସ୍‌</displayName>
+				<unitPattern count="one">{0} ସିମେନ୍ସ୍‌</unitPattern>
+				<unitPattern count="other">{0} ସିମେନ୍ସ୍‌</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>କ‍୍ୟାଲୋରି [IT]</displayName>
+				<unitPattern count="one">{0} କ‍୍ୟାଲୋରି [IT]</unitPattern>
+				<unitPattern count="other">{0} କ‍୍ୟାଲୋରି [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ବେକରେଲ୍‌</displayName>
+				<unitPattern count="one">{0} ବେକରେଲ୍‌</unitPattern>
+				<unitPattern count="other">{0} ବେକରେଲ୍‌</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ସିଭର୍ଟ୍‌</displayName>
+				<unitPattern count="one">{0} ସିଭର୍ଟ୍‌</unitPattern>
+				<unitPattern count="other">{0} ସିଭର୍ଟ୍‌</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ଗ୍ରେ</displayName>
+				<unitPattern count="one">{0} ଗ୍ରେ</unitPattern>
+				<unitPattern count="other">{0} ଗ୍ରେ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>କିଲୋଗ୍ରାମ୍‌-ବଳ</displayName>
+				<unitPattern count="one">{0} କିଲୋଗ୍ରାମ୍‌-ବଳ</unitPattern>
+				<unitPattern count="other">{0} କିଲୋଗ୍ରାମ୍‌-ବଳ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ଟେସ୍‌ଲା</displayName>
+				<unitPattern count="one">{0} ଟେସ୍‌ଲା</unitPattern>
+				<unitPattern count="other">{0} ଟେସ୍‌ଲା</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ୱେବର୍‌</displayName>
+				<unitPattern count="one">{0} ୱେବର୍‌</unitPattern>
+				<unitPattern count="other">{0} ୱେବର୍‌</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ବିଲିୟନ ପ୍ରତି ଅଂଶଗୁଡିକ</displayName>
 				<unitPattern count="one">{0} ପାର୍ଟ୍ସ ପ୍ରତି ବିଲିୟନ୍</unitPattern>
 				<unitPattern count="other">{0} ପାର୍ଟ୍ସ ପ୍ରତି ବିଲିୟନ୍</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ରାତି</displayName>
-				<unitPattern count="one">{0} ରାତି</unitPattern>
-				<unitPattern count="other">{0} ରାତି</unitPattern>
 				<perUnitPattern>{0} ପ୍ରତି ରାତି</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6058,7 +6131,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ଆଇଟମ୍</unitPattern>
 				<unitPattern count="other">{0} ଆଇଟମ୍</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ଅଂଶ</displayName>
+				<unitPattern count="one">{0} ଅଂଶ</unitPattern>
+				<unitPattern count="other">{0} ଅଂଶ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ଅଂଶ/ନିୟୁତ</displayName>
 				<unitPattern count="one">{0} ପିପିଏମ୍</unitPattern>
 				<unitPattern count="other">{0} ପିପିଏମ୍</unitPattern>
@@ -6077,6 +6155,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">ମୋଲ</unitPattern>
 				<unitPattern count="other">{0} ମୋଲ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ଲିଟର୍/କିମି</displayName>
 				<unitPattern count="one">{0} ଲି/କିମି</unitPattern>
@@ -6346,8 +6429,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-astronomical-unit">
 				<displayName>ଆୟୁ</displayName>
-				<unitPattern count="one">{0} au</unitPattern>
-				<unitPattern count="other">{0} au</unitPattern>
 			</unit>
 			<unit type="length-furlong">
 				<displayName>ଫର୍ଲଙ୍ଗସ୍</displayName>
@@ -6360,8 +6441,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-nautical-mile">
 				<displayName>ନୌମି</displayName>
-				<unitPattern count="one">{0} nmi</unitPattern>
-				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
 				<displayName>ସମି</displayName>
@@ -6555,8 +6634,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName>ୟାର୍ଡ୍³</displayName>
-				<unitPattern count="one">{0} yd³</unitPattern>
-				<unitPattern count="other">{0} yd³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
 				<displayName>ଫିଟ୍³</displayName>
@@ -6601,8 +6678,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-pint-metric">
 				<displayName>ମେପା</displayName>
-				<unitPattern count="one">{0} mpt</unitPattern>
-				<unitPattern count="other">{0} mpt</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
 				<unitPattern count="one">{0} ମେକ</unitPattern>
@@ -6655,8 +6730,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-teaspoon">
 				<displayName>ଛୋଟ ଚାମଚ</displayName>
-				<unitPattern count="one">{0} tsp</unitPattern>
-				<unitPattern count="other">{0} tsp</unitPattern>
 			</unit>
 			<unit type="volume-barrel">
 				<displayName>ବାରେଲ</displayName>
@@ -6665,12 +6738,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} dsp-Imp.</unitPattern>
 				<unitPattern count="other">{0} dsp-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ଆଲୋକ</displayName>
 				<unitPattern count="one">{0} ଆଲୋକ</unitPattern>
 				<unitPattern count="other">{0} ଆଲୋକ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ପାର୍ଟ୍ସ/ବିଲିୟନ୍</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6818,7 +6914,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ଆଇଟମ୍</unitPattern>
 				<unitPattern count="other">{0}ଆଇଟମ୍</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ଅଂଶ</displayName>
+				<unitPattern count="one">{0} ଅଂଶ</unitPattern>
+				<unitPattern count="other">{0} ଅଂଶ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ପିପିଏମ୍</displayName>
 				<unitPattern count="one">{0}ପିପିଏମ୍</unitPattern>
 				<unitPattern count="other">{0}ପିପିଏମ୍</unitPattern>
@@ -6836,6 +6937,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ମୋଲ</unitPattern>
 				<unitPattern count="other">{0}ମୋଲ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ଲି/100କିମି</displayName>
 				<unitPattern count="one">{0}ଲି/100 କିମି</unitPattern>
@@ -6855,8 +6959,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-decade">
 				<displayName>ଦଶନ୍ଧି</displayName>
-				<unitPattern count="one">{0} ଦଶନ୍ଧି</unitPattern>
-				<unitPattern count="other">{0} ଦଶନ୍ଧି</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>yr</displayName>
@@ -7160,7 +7262,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}mpt</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
-				<displayName>mcup</displayName>
 				<unitPattern count="one">{0}mc</unitPattern>
 				<unitPattern count="other">{0}mc</unitPattern>
 			</unit>
@@ -7223,21 +7324,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ଚିମୁଟ</unitPattern>
 				<unitPattern count="other">{0} ଚିମୁଟ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ଆଲୋକ</displayName>
-				<unitPattern count="one">{0} ଆଲୋକ</unitPattern>
-				<unitPattern count="other">{0} ଆଲୋକ</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ରାତି</displayName>
-				<unitPattern count="one">{0} ରାତି</unitPattern>
-				<unitPattern count="other">{0} ରାତି</unitPattern>
-				<perUnitPattern>{0}/ରାତି</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="north">{0}ଉ</coordinateUnitPattern>
 			</coordinateUnit>
diff --git a/make/data/cldr/common/main/pa.xml b/make/data/cldr/common/main/pa.xml
index 2da4fdb061a..3ae5f04c949 100644
--- a/make/data/cldr/common/main/pa.xml
+++ b/make/data/cldr/common/main/pa.xml
@@ -47,6 +47,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">ਅਜ਼ਰਬਾਈਜਾਨੀ</language>
 			<language type="az" alt="short">ਅਜ਼ੇਰੀ</language>
 			<language type="ba">ਬਸ਼ਕੀਰ</language>
+			<language type="bal">ਬਲੋਚੀ</language>
 			<language type="ban">ਬਾਲੀਨੀਜ਼</language>
 			<language type="bas">ਬਾਸਾ</language>
 			<language type="be">ਬੇਲਾਰੂਸੀ</language>
@@ -59,7 +60,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bi">ਬਿਸਲਾਮਾ</language>
 			<language type="bin">ਬਿਨੀ</language>
 			<language type="bla">ਸਿਕਸਿਕਾ</language>
-			<language type="blo" draft="contributed">ਅਨੀ</language>
+			<language type="blo">ਅਨੀ</language>
 			<language type="bm">ਬੰਬਾਰਾ</language>
 			<language type="bn">ਬੰਗਾਲੀ</language>
 			<language type="bo">ਤਿੱਬਤੀ</language>
@@ -236,6 +237,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ਬਫ਼ੀਆ</language>
 			<language type="ksh">ਕਲੋਨੀਅਨ</language>
 			<language type="ku">ਕੁਰਦਿਸ਼</language>
+			<language type="ku" menu="core" draft="contributed">ਕੁਰਦਿਸ਼</language>
+			<language type="ku" menu="extension" draft="contributed">ਕੁਰਮਾਂਜੀ</language>
 			<language type="kum">ਕੁਮੀਕ</language>
 			<language type="kv">ਕੋਮੀ</language>
 			<language type="kw">ਕੋਰਨਿਸ਼</language>
@@ -637,6 +640,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ਚੀਨ</territory>
 			<territory type="CO">ਕੋਲੰਬੀਆ</territory>
 			<territory type="CP">ਕਲਿੱਪਰਟਨ ਟਾਪੂ</territory>
+			<territory type="CQ">ਸਾਰਕ</territory>
 			<territory type="CR">ਕੋਸਟਾ ਰੀਕਾ</territory>
 			<territory type="CU">ਕਿਊਬਾ</territory>
 			<territory type="CV">ਕੇਪ ਵਰਡੇ</territory>
@@ -703,14 +707,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="IM">ਆਇਲ ਆਫ ਮੈਨ</territory>
 			<territory type="IN">ਭਾਰਤ</territory>
 			<territory type="IO">ਬਰਤਾਨਵੀ ਹਿੰਦ ਮਹਾਂਸਾਗਰ ਖਿੱਤਾ</territory>
-			<territory type="IO" alt="chagos" draft="contributed">ਚਗੋਸ ਟਾਪੂ</territory>
+			<territory type="IO" alt="chagos">ਚਗੋਸ ਟਾਪੂ</territory>
 			<territory type="IQ">ਇਰਾਕ</territory>
 			<territory type="IR">ਈਰਾਨ</territory>
 			<territory type="IS">ਆਈਸਲੈਂਡ</territory>
 			<territory type="IT">ਇਟਲੀ</territory>
 			<territory type="JE">ਜਰਸੀ</territory>
 			<territory type="JM">ਜਮਾਇਕਾ</territory>
-			<territory type="JO">ਜਾਰਡਨ</territory>
+			<territory type="JO">ਜੌਰਡਨ</territory>
 			<territory type="JP">ਜਪਾਨ</territory>
 			<territory type="KE">ਕੀਨੀਆ</territory>
 			<territory type="KG">ਕਿਰਗਿਜ਼ਸਤਾਨ</territory>
@@ -718,13 +722,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="KI">ਕਿਰਬਾਤੀ</territory>
 			<territory type="KM">ਕੋਮੋਰੋਸ</territory>
 			<territory type="KN">ਸੇਂਟ ਕਿਟਸ ਐਂਡ ਨੇਵਿਸ</territory>
-			<territory type="KP">ਉੱਤਰ ਕੋਰੀਆ</territory>
-			<territory type="KR">ਦੱਖਣ ਕੋਰੀਆ</territory>
+			<territory type="KP">ਉੱਤਰੀ ਕੋਰੀਆ</territory>
+			<territory type="KR">ਦੱਖਣੀ ਕੋਰੀਆ</territory>
 			<territory type="KW">ਕੁਵੈਤ</territory>
 			<territory type="KY">ਕੇਮੈਨ ਟਾਪੂ</territory>
 			<territory type="KZ">ਕਜ਼ਾਖਸਤਾਨ</territory>
 			<territory type="LA">ਲਾਓਸ</territory>
-			<territory type="LB">ਲੈਬਨਾਨ</territory>
+			<territory type="LB">ਲਿਬਨਾਨ</territory>
 			<territory type="LC">ਸੇਂਟ ਲੂਸੀਆ</territory>
 			<territory type="LI">ਲਿਚੇਂਸਟਾਇਨ</territory>
 			<territory type="LK">ਸ੍ਰੀ ਲੰਕਾ</territory>
@@ -782,7 +786,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="PM">ਸੇਂਟ ਪੀਅਰੇ ਐਂਡ ਮਿਕੇਲਨ</territory>
 			<territory type="PN">ਪਿਟਕੇਰਨ ਟਾਪੂ</territory>
 			<territory type="PR">ਪਿਊਰਟੋ ਰਿਕੋ</territory>
-			<territory type="PS">ਫਿਲੀਸਤੀਨੀ ਇਲਾਕਾ</territory>
+			<territory type="PS">ਫਿਲਸਤੀਨੀ ਖਿੱਤੇ</territory>
 			<territory type="PS" alt="short">ਫਿਲੀਸਤੀਨ</territory>
 			<territory type="PT">ਪੁਰਤਗਾਲ</territory>
 			<territory type="PW">ਪਲਾਉ</territory>
@@ -839,7 +843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="UM">ਯੂ.ਐੱਸ. ਦੂਰ-ਦੁਰਾਡੇ ਟਾਪੂ</territory>
 			<territory type="UN">ਸੰਯੁਕਤ ਰਾਸ਼ਟਰ</territory>
 			<territory type="UN" alt="short">ਯੂ.ਐੱਨ.</territory>
-			<territory type="US">ਸੰਯੁਕਤ ਰਾਜ</territory>
+			<territory type="US">ਸੰਯੁਕਤ ਰਾਜ (ਅਮਰੀਕਾ)</territory>
 			<territory type="US" alt="short">ਯੂ.ਐੱਸ.</territory>
 			<territory type="UY">ਉਰੂਗਵੇ</territory>
 			<territory type="UZ">ਉਜ਼ਬੇਕਿਸਤਾਨ</territory>
@@ -872,48 +876,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">ਮੁਦਰਾ ਬਣਤਰ</key>
 			<key type="collation">ਲੜੀਬੱਧ ਕ੍ਰਮ</key>
 			<key type="currency">ਮੁਦਰਾ</key>
+			<key type="em">ਇਮੋਜੀ ਪੇਸ਼ਕਾਰੀ</key>
 			<key type="hc">ਘੰਟੇ ਦਾ ਚੱਕਰ (12 ਬਨਾਮ 24)</key>
 			<key type="lb">ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</key>
+			<key type="lw">ਸ਼ਬਦਾਂ ਵਿਚਕਾਰ ਲਾਈਨ ਵਿੱਥ</key>
 			<key type="ms">ਮਾਪ ਪ੍ਰਣਾਲੀ</key>
 			<key type="numbers">ਸੰਖਿਆਵਾਂ</key>
+			<key type="ss">ਸੰਖੇਪ ਸ਼ਬਦ ਤੋਂ ਬਾਅਦ ਵਾਕ ਵਿੱਥ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ਬੋਧੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="buddhist" scope="core">ਬੋਧੀ</type>
 			<type key="calendar" type="chinese">ਚੀਨੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="chinese" scope="core">ਚੀਨੀ</type>
 			<type key="calendar" type="coptic">ਕੋਪਟਿਕ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="coptic" scope="core">ਕੋਪਟਿਕ</type>
 			<type key="calendar" type="dangi">ਡਾਂਗੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="dangi" scope="core">ਡਾਂਗੀ</type>
 			<type key="calendar" type="ethiopic">ਇਥੀਓਪਿਕ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="ethiopic" scope="core">ਇਥੀਓਪਿਕ</type>
 			<type key="calendar" type="ethiopic-amete-alem">ਇਥੀਓਪਿਕ-ਅਮੀਟ-ਆਲਮ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ਇਥੀਓਪਿਕ ਅਮੀਟ ਆਲਮ</type>
 			<type key="calendar" type="gregorian">ਗਰੇਗੋਰੀਅਨ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="gregorian" scope="core">ਗਰੇਗੋਰੀਅਨ</type>
 			<type key="calendar" type="hebrew">ਹਿਬਰੂ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="hebrew" scope="core">ਹਿਬਰੂ</type>
 			<type key="calendar" type="indian">ਭਾਰਤੀ ਕੌਮੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="indian" scope="core">ਭਾਰਤੀ ਕੌਮੀ</type>
 			<type key="calendar" type="islamic">ਇਸਲਾਮੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="islamic" scope="core">ਇਸਲਾਮੀ</type>
 			<type key="calendar" type="islamic-civil">ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਸਾਰਨੀਬੱਧ, ਸਮਾਜਿਕ ਯੁੱਗ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ਇਸਲਾਮੀ (ਸਾਰਨੀਬੱਧ, ਸਮਾਜਿਕ ਯੁੱਗ)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਸਾਊਦੀ ਅਰਬ, ਚੰਨ ਦਿਖਣਾ)</type>
-			<type key="calendar" type="islamic-tbla">ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਟੇਬਲਰ, ਖਗੋਲੀ ਯੁੱਗ)</type>
+			<type key="calendar" type="islamic-tbla">ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਸਾਰਨੀਬੱਧ, ਖਗੋਲੀ ਯੁੱਗ)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">ਇਸਲਾਮੀ (ਸਾਰਨੀਬੱਧ, ਖਗੋਲੀ ਯੁੱਗ)</type>
 			<type key="calendar" type="islamic-umalqura">ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਅਮ ਅਲ-ਕੁਰਾ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ਇਸਲਾਮੀ (ਉਮ ਅਲ-ਕੁਰਾ)</type>
 			<type key="calendar" type="iso8601">(ISO-8601) ਕੈਲੰਡਰ</type>
 			<type key="calendar" type="japanese">ਜਪਾਨੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="japanese" scope="core">ਜਪਾਨੀ</type>
 			<type key="calendar" type="persian">ਫ਼ਾਰਸੀ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="persian" scope="core">ਫ਼ਾਰਸੀ</type>
 			<type key="calendar" type="roc">ਮਿੰਗੂਓ ਕੈਲੰਡਰ</type>
+			<type key="calendar" type="roc" scope="core">ਮਿੰਗੂਓ</type>
 			<type key="cf" type="account">ਲੇਖਾ ਮੁਦਰਾ ਬਣਤਰ</type>
+			<type key="cf" type="account" scope="core">ਲੇਖਾ</type>
 			<type key="cf" type="standard">ਮਿਆਰੀ ਮੁਦਰਾ ਬਣਤਰ</type>
+			<type key="cf" type="standard" scope="core">ਮਿਆਰੀ</type>
 			<type key="collation" type="compat" draft="contributed">ਪਿਛਲਾ ਤਰਤੀਬ ਵਾਰ ਕ੍ਰਮ, ਅਨੁਰੂਪਤਾ ਲਈ</type>
 			<type key="collation" type="dictionary">ਸ਼ਬਦ-ਕੋਸ਼ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
 			<type key="collation" type="ducet">ਮੂਲ ਯੂਨੀਕੋਡ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="collation" type="ducet" scope="core">ਡਿਫ਼ੌਲਟ ਯੂਨੀਕੋਡ</type>
 			<type key="collation" type="search">ਆਮ-ਮੰਤਵ ਖੋਜ</type>
+			<type key="collation" type="search" scope="core">ਖੋਜੋ</type>
 			<type key="collation" type="standard">ਸਧਾਰਨ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="collation" type="standard" scope="core">ਮਿਆਰੀ</type>
 			<type key="collation" type="traditional">ਰਵਾਇਤੀ ਲੜੀਬੱਧ ਕ੍ਰਮ</type>
+			<type key="em" type="default" scope="core">ਡਿਫ਼ੌਲਟ</type>
+			<type key="em" type="emoji" scope="core">ਇਮੋਜੀ</type>
+			<type key="em" type="text" scope="core">ਟੈਕਸਟ</type>
 			<type key="hc" type="h11">12 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ਖੁੱਲ੍ਹੀ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</type>
+			<type key="lb" type="loose" scope="core">ਖੁੱਲ੍ਹੀ</type>
 			<type key="lb" type="normal">ਸਧਾਰਨ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</type>
+			<type key="lb" type="normal" scope="core">ਸਧਾਰਨ</type>
 			<type key="lb" type="strict">ਪੱਕੀ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ</type>
+			<type key="lb" type="strict" scope="core">ਪੱਕੀ</type>
+			<type key="lw" type="breakall" scope="core">ਸਭ ‘ਚ ਵਿੱਥ ਰੱਖੋ</type>
+			<type key="lw" type="keepall" scope="core">ਸਭ ਰੱਖੋ</type>
+			<type key="lw" type="normal" scope="core">ਸਧਾਰਨ</type>
+			<type key="lw" type="phrase" scope="core">ਵਾਕੰਸ਼ਾਂ ‘ਚ ਰੱਖੋ</type>
 			<type key="ms" type="metric">ਮੀਟਰਿਕ ਪ੍ਰਣਾਲੀ</type>
+			<type key="ms" type="metric" scope="core">ਮੀਟਰਿਕ</type>
 			<type key="ms" type="uksystem">ਇੰਪੀਰੀਅਲ ਮਾਪ ਪ੍ਰਣਾਲੀ</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">ਅਮਰੀਕੀ ਮਾਪ ਪ੍ਰਣਾਲੀ</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ</type>
 			<type key="numbers" type="arabext">ਵਿਸਤਾਰਿਤ ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ</type>
 			<type key="numbers" type="armn">ਆਰਮੀਨੀਅਨ ਸੰਖਿਆਵਾਂ</type>
@@ -956,6 +1001,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">ਥਾਈ ਅੰਕ</type>
 			<type key="numbers" type="tibt">ਤਿੱਬਤੀ ਅੰਕ</type>
 			<type key="numbers" type="vaii">ਵਾਈ ਅੰਕ</type>
+			<type key="ss" type="none" scope="core">ਬੰਦ</type>
+			<type key="ss" type="standard" scope="core">ਚਾਲੂ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ਮੀਟਰਿਕ</measurementSystemName>
@@ -969,17 +1016,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[ੱ ੰ ਼ ੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ ੴ ੳ ਉ ਊ ਓ ਅ ਆ ਐ ਔ ੲ ਇ ਈ ਏ ਸ{ਸ਼} ਹ ਕ ਖ{ਖ਼} ਗ{ਗ਼} ਘ ਙ ਚ ਛ ਜ{ਜ਼} ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ{ਫ਼} ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ ੍ ਾ ਿ ੀ ੁ ੂ ੇ ੈ ੋ ੌ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C\u200Dਃ ਂ {ਲ਼}]</exemplarCharacters>
-		<exemplarCharacters type="index">[ੳ ਅ ੲ ਸ ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ]</exemplarCharacters>
+		<exemplarCharacters>[ੱ {ੰਂ} ਼ ੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ ੴ ੳ ਉ ਊ ਓ ਅ ਆ ਐ ਔ ੲ ਇ ਈ ਏ ਸ{ਸ਼} ਹ ਕ ਖ{ਖ਼} ਗ{ਗ਼} ਘ ਙ ਚ ਛ ਜ{ਜ਼} ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ{ਫ਼} ਬ ਭ ਮ ਯ ਰ ਲ{ਲ਼} ਵ ੜ ੍ ਾ ਿ ੀ ੁ ੂ ੇ ੈ ੋ ੌ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[\u200C\u200Dਃ]</exemplarCharacters>
+		<exemplarCharacters type="index">[ੳ ਅ ੲ ਸ{ਸ਼} ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0੦ 1੧ 2੨ 3੩ 4੪ 5੫ 6੬ 7੭ 8੮ 9੯]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . '‘’ &quot;“” ( ) \[ \] / \&amp; ′ ″]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1048,12 +1092,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">ਕਾਲ0</era>
-						<era type="1" draft="contributed">ਕਾਲ1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1075,12 +1113,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">ਕਾਲ0</era>
-						<era type="1" draft="contributed">ਕਾਲ1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1111,11 +1143,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1128,6 +1166,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
+						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/GGGGG y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
@@ -1272,7 +1316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="wed">ਬੁੱਧ</day>
 							<day type="thu">ਵੀਰ</day>
 							<day type="fri">ਸ਼ੁੱਕਰ</day>
-							<day type="sat">ਸ਼ਨਿੱਚਰ</day>
+							<day type="sat">ਸ਼ਨੀ</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">ਐਤ</day>
@@ -1281,7 +1325,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="wed">ਬੁੱਧ</day>
 							<day type="thu">ਵੀਰ</day>
 							<day type="fri">ਸ਼ੁੱਕ</day>
-							<day type="sat">ਸ਼ਨਿੱ</day>
+							<day type="sat">ਸ਼ਨੀ</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">ਐਤਵਾਰ</day>
@@ -1290,10 +1334,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="wed">ਬੁੱਧਵਾਰ</day>
 							<day type="thu">ਵੀਰਵਾਰ</day>
 							<day type="fri">ਸ਼ੁੱਕਰਵਾਰ</day>
-							<day type="sat">ਸ਼ਨਿੱਚਰਵਾਰ</day>
+							<day type="sat">ਸ਼ਨੀਵਾਰ</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">ਐਤ</day>
+							<day type="mon">ਸੋਮ</day>
+							<day type="tue">ਮੰਗਲ</day>
+							<day type="wed">ਬੁੱਧ</day>
+							<day type="thu">ਵੀਰ</day>
+							<day type="fri">ਸ਼ੁੱਕਰ</day>
+							<day type="sat">ਸ਼ਨੀ</day>
+						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">ਐ</day>
 							<day type="mon">ਸੋ</day>
@@ -1303,6 +1356,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri">ਸ਼ੁੱ</day>
 							<day type="sat">ਸ਼</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">ਐਤ</day>
+							<day type="mon">ਸੋਮ</day>
+							<day type="tue">ਮੰਗ</day>
+							<day type="wed">ਬੁੱਧ</day>
+							<day type="thu">ਵੀਰ</day>
+							<day type="fri">ਸ਼ੁੱਕ</day>
+							<day type="sat">ਸ਼ਨੀ</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">ਐਤਵਾਰ</day>
+							<day type="mon">ਸੋਮਵਾਰ</day>
+							<day type="tue">ਮੰਗਲਵਾਰ</day>
+							<day type="wed">ਬੁੱਧਵਾਰ</day>
+							<day type="thu">ਵੀਰਵਾਰ</day>
+							<day type="fri">ਸ਼ੁੱਕਰਵਾਰ</day>
+							<day type="sat">ਸ਼ਨੀਵਾਰ</day>
+						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
@@ -1325,20 +1396,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="midnight">ਅੱਧੀ ਰਾਤ</dayPeriod>
-							<dayPeriod type="am">ਪੂ.ਦੁ.</dayPeriod>
-							<dayPeriod type="pm">ਬਾ.ਦੁ.</dayPeriod>
 							<dayPeriod type="morning1">ਸਵੇਰੇ</dayPeriod>
 							<dayPeriod type="afternoon1">ਦੁਪਹਿਰੇ</dayPeriod>
 							<dayPeriod type="evening1">ਸ਼ਾਮੀਂ</dayPeriod>
 							<dayPeriod type="night1">ਰਾਤੀਂ</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">ਸ.</dayPeriod>
-							<dayPeriod type="pm">ਸ਼.</dayPeriod>
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
 							<dayPeriod type="morning1">ਸਵੇਰੇ</dayPeriod>
 							<dayPeriod type="afternoon1">ਦੁਪਹਿਰੇ</dayPeriod>
 							<dayPeriod type="evening1">ਸ਼ਾਮ</dayPeriod>
@@ -1417,11 +1500,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1434,7 +1523,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
+						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/GGGGG y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM, G y</dateFormatItem>
@@ -1630,6 +1727,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</months>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
@@ -1890,34 +1989,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="1">ਅਗਲਾ ਸ਼ੁੱ</relative>
 			</field>
 			<field type="sat">
-				<relative type="-1">ਪਿਛਲਾ ਸ਼ਨਿੱਚਰਵਾਰ</relative>
-				<relative type="0">ਇਹ ਸ਼ਨਿੱਚਰਵਾਰ</relative>
-				<relative type="1">ਅਗਲਾ ਸ਼ਨਿੱਚਰਵਾਰ</relative>
+				<relative type="-1">ਪਿਛਲੇ ਸ਼ਨੀਵਾਰ</relative>
+				<relative type="0">ਇਹ ਸ਼ਨੀਵਾਰ</relative>
+				<relative type="1">ਅਗਲੇ ਸ਼ਨੀਵਾਰ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ਸ਼ਨਿੱਚਰਵਾਰ ਵਿੱਚ</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ਸ਼ਨਿੱਚਰਵਾਰਾਂ ਵਿੱਚ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ਸ਼ਨੀਵਾਰ ਬਾਅਦ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਸ਼ਨੀਵਾਰਾਂ ਬਾਅਦ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} ਸ਼ਨਿੱਚਰਵਾਰ ਪਹਿਲਾਂ</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ਸ਼ਨਿੱਚਰਵਾਰ ਪਹਿਲਾਂ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ਸ਼ਨੀਵਾਰ ਪਹਿਲਾਂ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਸ਼ਨੀਵਾਰ ਪਹਿਲਾਂ</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-short">
-				<relative type="-1">ਪਿਛਲਾ ਸ਼ਨਿੱਚਰ</relative>
-				<relative type="0">ਇਹ ਸ਼ਨਿੱਚਰ</relative>
-				<relative type="1">ਅਗਲਾ ਸ਼ਨਿੱਚਰ</relative>
+				<relative type="-1">ਪਿਛਲੇ ਸ਼ਨੀ</relative>
+				<relative type="0">ਇਹ ਸ਼ਨੀ</relative>
+				<relative type="1">ਅਗਲੇ ਸ਼ਨੀ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ਸ਼ਨਿੱਚਰਵਾਰਾਂ ਵਿੱਚ</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ਸ਼ਨਿੱਚਰਵਾਰਾਂ ਵਿੱਚ</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ਸ਼ਨੀਵਾਰ ਬਾਅਦ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਸ਼ਨੀਵਾਰਾਂ ਬਾਅਦ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ਸ਼ਨੀਵਾਰ ਪਹਿਲਾਂ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਸ਼ਨੀਵਾਰ ਪਹਿਲਾਂ</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sat-narrow">
-				<relative type="-1">ਪਿਛਲਾ ਸ਼ਨਿੱ</relative>
-				<relative type="0">ਇਹ ਸ਼ਨਿੱ</relative>
-				<relative type="1">ਅਗਲਾ ਸ਼ਨਿੱ</relative>
+				<relative type="-1">ਪਿਛਲੇ ਸ਼ਨੀ</relative>
+				<relative type="0">ਇਹ ਸ਼ਨੀ</relative>
+				<relative type="1">ਅਗਲੇ ਸ਼ਨੀ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ਸ਼ਨੀ ਬਾਅਦ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਸ਼ਨੀ ਬਾਅਦ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} ਸ਼ਨੀ ਪਹਿਲਾਂ</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ਸ਼ਨੀ ਪਹਿਲਾਂ</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayperiod-short">
+				<displayName>AM/PM</displayName>
 			</field>
 			<field type="dayperiod">
-				<displayName>ਪੂ.ਦੁ./ਬਾ.ਦੁ.</displayName>
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
 				<displayName>ਘੰਟਾ</displayName>
@@ -2319,6 +2436,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ਈਸਟਰ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">ਕੋਹੇਕੇ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ਪੰਟਾ ਅਰੇਨਸ</exemplarCity>
 			</zone>
@@ -2584,9 +2704,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ਫਨੋਮ ਪੇਨਹ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ਏਂਡਰਬਰੀ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ਕੈਂਟੋਨ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3241,12 +3358,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard>ਕੇਂਦਰੀ ਅਫਰੀਕਾ ਵੇਲਾ</standard>
+					<standard>ਕੇਂਦਰੀ ਅਫ਼ਰੀਕਾ ਵੇਲਾ</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard>ਪੂਰਬੀ ਅਫਰੀਕਾ ਵੇਲਾ</standard>
+					<standard>ਪੂਰਬੀ ਅਫ਼ਰੀਕਾ ਵੇਲਾ</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
@@ -3256,9 +3373,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ਪੱਛਮੀ ਅਫਰੀਕਾ ਵੇਲਾ</generic>
-					<standard>ਪੱਛਮੀ ਅਫਰੀਕਾ ਮਿਆਰੀ ਵੇਲਾ</standard>
-					<daylight>ਪੱਛਮੀ ਅਫਰੀਕਾ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ</daylight>
+					<standard>ਪੱਛਮੀ ਅਫਰੀਕਾ ਵੇਲਾ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3639,6 +3754,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ਗੁਯਾਨਾ ਵੇਲਾ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ਹਵਾਈ-ਅਲੇਯੂਸ਼ਿਅਨ ਮਿਆਰੀ ਵੇਲਾ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ਹਵਾਈ-ਅਲੇਯੂਸ਼ਿਅਨ ਵੇਲਾ</generic>
@@ -4247,6 +4367,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="arab">
+			<rationalUsage>never</rationalUsage>
+		</rationalFormats>
+		<rationalFormats numberSystem="arabext">
+			<rationalUsage>never</rationalUsage>
+		</rationalFormats>
 		<scientificFormats numberSystem="latn">
 			<scientificFormatLength>
 				<scientificFormat>
@@ -4264,9 +4390,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencyFormats numberSystem="arab">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern draft="contributed">¤#,##,##0.00</pattern>
+					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 					<pattern alt="noCurrency" draft="contributed">#,##,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencyFormats numberSystem="arabext">
@@ -4274,45 +4404,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ 0 ਹਜ਼ਾਰ</pattern>
-					<pattern type="1000" count="other">¤ 0 ਹਜ਼ਾਰ</pattern>
-					<pattern type="10000" count="one">¤ 00 ਹਜ਼ਾਰ</pattern>
-					<pattern type="10000" count="other">¤ 00 ਹਜ਼ਾਰ</pattern>
-					<pattern type="100000" count="one">¤ 0 ਲੱਖ</pattern>
-					<pattern type="100000" count="other">¤ 0 ਲੱਖ</pattern>
-					<pattern type="1000000" count="one">¤ 00 ਲੱਖ</pattern>
-					<pattern type="1000000" count="other">¤ 00 ਲੱਖ</pattern>
-					<pattern type="10000000" count="one">¤ 0 ਕਰੋੜ</pattern>
-					<pattern type="10000000" count="other">¤ 0 ਕਰੋੜ</pattern>
-					<pattern type="100000000" count="one">¤ 00 ਕਰੋੜ</pattern>
-					<pattern type="100000000" count="other">¤ 00 ਕਰੋੜ</pattern>
-					<pattern type="1000000000" count="one">¤ 0 ਅਰਬ</pattern>
-					<pattern type="1000000000" count="other">¤ 0 ਅਰਬ</pattern>
-					<pattern type="10000000000" count="one">¤ 00 ਅਰਬ</pattern>
-					<pattern type="10000000000" count="other">¤ 00 ਅਰਬ</pattern>
-					<pattern type="100000000000" count="one">¤ 0 ਖਰਬ</pattern>
-					<pattern type="100000000000" count="other">¤ 0 ਖਰਬ</pattern>
-					<pattern type="1000000000000" count="one">¤ 00 ਖਰਬ</pattern>
-					<pattern type="1000000000000" count="other">¤ 00 ਖਰਬ</pattern>
-					<pattern type="10000000000000" count="one">¤ 0 ਨੀਲ</pattern>
-					<pattern type="10000000000000" count="other">¤ 0 ਨੀਲ</pattern>
-					<pattern type="100000000000000" count="one">¤ 00 ਨੀਲ</pattern>
-					<pattern type="100000000000000" count="other">¤ 00 ਨੀਲ</pattern>
+					<pattern type="1000" count="one">¤0 ਹਜ਼ਾਰ</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0 ਹਜ਼ਾਰ</pattern>
+					<pattern type="1000" count="other">¤0 ਹਜ਼ਾਰ</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 ਹਜ਼ਾਰ</pattern>
+					<pattern type="10000" count="one">¤00 ਹਜ਼ਾਰ</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 ਹਜ਼ਾਰ</pattern>
+					<pattern type="10000" count="other">¤00 ਹਜ਼ਾਰ</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 ਹਜ਼ਾਰ</pattern>
+					<pattern type="100000" count="one">¤0 ਲੱਖ</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 0 ਲੱਖ</pattern>
+					<pattern type="100000" count="other">¤0 ਲੱਖ</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 0 ਲੱਖ</pattern>
+					<pattern type="1000000" count="one">¤00 ਲੱਖ</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 00 ਲੱਖ</pattern>
+					<pattern type="1000000" count="other">¤00 ਲੱਖ</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00 ਲੱਖ</pattern>
+					<pattern type="10000000" count="one">¤0 ਕਰੋੜ</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 0 ਕਰੋੜ</pattern>
+					<pattern type="10000000" count="other">¤0 ਕਰੋੜ</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0 ਕਰੋੜ</pattern>
+					<pattern type="100000000" count="one">¤00 ਕਰੋੜ</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 00 ਕਰੋੜ</pattern>
+					<pattern type="100000000" count="other">¤00 ਕਰੋੜ</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 00 ਕਰੋੜ</pattern>
+					<pattern type="1000000000" count="one">¤0 ਅਰਬ</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0 ਅਰਬ</pattern>
+					<pattern type="1000000000" count="other">¤0 ਅਰਬ</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 ਅਰਬ</pattern>
+					<pattern type="10000000000" count="one">¤00 ਅਰਬ</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 ਅਰਬ</pattern>
+					<pattern type="10000000000" count="other">¤00 ਅਰਬ</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 ਅਰਬ</pattern>
+					<pattern type="100000000000" count="one">¤0 ਖਰਬ</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 0 ਖਰਬ</pattern>
+					<pattern type="100000000000" count="other">¤0 ਖਰਬ</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0 ਖਰਬ</pattern>
+					<pattern type="1000000000000" count="one">¤00 ਖਰਬ</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 00 ਖਰਬ</pattern>
+					<pattern type="1000000000000" count="other">¤00 ਖਰਬ</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 00 ਖਰਬ</pattern>
+					<pattern type="10000000000000" count="one">¤0 ਨੀਲ</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 0 ਨੀਲ</pattern>
+					<pattern type="10000000000000" count="other">¤0 ਨੀਲ</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 0 ਨੀਲ</pattern>
+					<pattern type="100000000000000" count="one">¤00 ਨੀਲ</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 00 ਨੀਲ</pattern>
+					<pattern type="100000000000000" count="other">¤00 ਨੀਲ</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 00 ਨੀਲ</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -4881,6 +5050,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ</displayName>
+				<displayName count="one">ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ</displayName>
+				<displayName count="other">ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ</displayName>
+			</currency>
 			<currency type="XEU">
 				<displayName>ਯੂਰਪੀ ਮੁਦਰਾ ਇਕਾਈ</displayName>
 				<displayName count="one">ਯੂਰਪੀਅਨ ਮੁਦਰਾ ਇਕਾਈ</displayName>
@@ -4907,6 +5081,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">ਜ਼ਿੰਬਾਬਵੀ ਗੋਲਡ</displayName>
+				<displayName count="one" draft="contributed">ਜ਼ਿੰਬਾਬਵੀ ਗੋਲਡ</displayName>
+				<displayName count="other" draft="contributed">ਜ਼ਿੰਬਾਬਵੀ ਗੋਲਡ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4914,7 +5093,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} ਘੰਟਾ</pluralMinimalPairs>
 			<pluralMinimalPairs count="other">{0} ਘੰਟੇ</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other">ਸਜੇ ਪਾਸੇ {0} ਮੋੜ ਲਵੋ</ordinalMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">ਸੱਜੇ ਪਾਸੇ {0}ਵਾਂ ਮੋੜ ਲਓ</ordinalMinimalPairs>
 			<caseMinimalPairs case="nominative">ਅਧਿਆਪਕ ਨੇ {0} ਪੜ੍ਹਾਇਆ</caseMinimalPairs>
 			<caseMinimalPairs case="oblique">ਅਧਿਆਪਕ ਨੇ {0} ਤੱਕ ਪੜ੍ਹਾਇਆ</caseMinimalPairs>
 			<genderMinimalPairs gender="feminine">ਇਹ ਕਿੰਨੀ {0} ਦਾ ਹੈ</genderMinimalPairs>
@@ -5038,14 +5217,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
 				<gender>masculine</gender>
-				<displayName>ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਵਰਗ ਸਕਿੰਟ</unitPattern>
+				<displayName>ਮੀਟਰ ਪ੍ਰਤਿ ਵਰਗ ਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਵਰਗ ਸਕਿੰਟ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਵਰਗ ਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਵਰਗ ਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਵਰਗ ਸਕਿੰਟ</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
 				<gender>feminine</gender>
+				<displayName>ਚੱਕਰ</displayName>
+				<unitPattern count="one">{0} ਚੱਕਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਚੱਕਰ</unitPattern>
+				<unitPattern count="other">{0} ਚੱਕਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਚੱਕਰ</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<gender>masculine</gender>
@@ -5074,7 +5258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਵਰਗ ਕਿਲੋਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਕਿਲੋਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਵਰਗ ਕਿਲੋਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<gender>masculine</gender>
@@ -5090,7 +5274,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਵਰਗ ਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਵਰਗ ਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<gender>masculine</gender>
@@ -5099,12 +5283,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਵਰਗ ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਵਰਗ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਵਰਗ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
 				<unitPattern count="one">{0} ਵਰਗ ਮੀਲ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਮੀਲ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਮੀਲ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਵਰਗ ਮੀਲ</perUnitPattern>
 			</unit>
 			<unit type="area-square-yard">
 				<displayName>ਵਰਗ ਗਜ਼</displayName>
@@ -5120,45 +5304,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ਵਰਗ ਇੰਚ</displayName>
 				<unitPattern count="one">{0} ਵਰਗ ਇੰਚ</unitPattern>
 				<unitPattern count="other">{0} ਵਰਗ ਇੰਚ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਵਰਗ ਇੰਚ</perUnitPattern>
 			</unit>
 			<unit type="concentr-karat">
 				<gender>masculine</gender>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
 				<gender>masculine</gender>
-				<displayName>ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ</unitPattern>
+				<displayName>ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤਿ ਡੈਸੀਲਿਟਰ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤਿ ਡੈਸੀਲਿਟਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤਿ ਡੈਸੀਲਿਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤਿ ਡੈਸੀਲਿਟਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤਿ ਡੈਸੀਲਿਟਰ</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<gender>masculine</gender>
-				<displayName>ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</displayName>
-				<unitPattern count="one">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤੀ ਲਿਟਰ</unitPattern>
+				<displayName>ਮਿਲੀਮੋਲ ਪ੍ਰਤਿ ਲਿਟਰ</displayName>
+				<unitPattern count="one">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤਿ ਲਿਟਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤਿ ਲਿਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤਿ ਲਿਟਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਮਿਲੀਮੋਲ ਪ੍ਰਤਿ ਲਿਟਰ</unitPattern>
 			</unit>
 			<unit type="concentr-item">
 				<gender>feminine</gender>
 				<displayName>ਆਈਟਮਾਂ</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ਹਿੱਸਾ</displayName>
+				<unitPattern count="one">{0} ਹਿੱਸਾ</unitPattern>
+				<unitPattern count="other">{0} ਹਿੱਸੇ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
-				<displayName>ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</displayName>
-				<unitPattern count="one">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</unitPattern>
-				<unitPattern count="other">{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ</unitPattern>
+				<displayName>ਹਿੱਸੇ ਪ੍ਰਤਿ ਮਿਲੀਅਨ</displayName>
+				<unitPattern count="one">{0} ਹਿੱਸਾ ਪ੍ਰਤਿ ਮਿਲੀਅਨ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਹਿੱਸਾ ਪ੍ਰਤਿ ਮਿਲੀਅਨ</unitPattern>
+				<unitPattern count="other">{0} ਹਿੱਸੇ ਪ੍ਰਤਿ ਮਿਲੀਅਨ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਹਿੱਸੇ ਪ੍ਰਤਿ ਮਿਲੀਅਨ</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<gender>masculine</gender>
-				<unitPattern count="one">{0} ਪ੍ਰਤੀਸ਼ਤ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਪ੍ਰਤੀਸ਼ਤ</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰਤੀਸ਼ਤ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਪ੍ਰਤੀਸ਼ਤ</unitPattern>
+				<displayName>ਪ੍ਰਤਿਸ਼ਤ</displayName>
+				<unitPattern count="one">{0} ਪ੍ਰਤਿਸ਼ਤ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਪ੍ਰਤਿਸ਼ਤ</unitPattern>
+				<unitPattern count="other">{0} ਪ੍ਰਤਿਸ਼ਤ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਪ੍ਰਤਿਸ਼ਤ</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
 				<gender>masculine</gender>
@@ -5170,28 +5360,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<gender>masculine</gender>
 				<unitPattern count="one">{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਪ੍ਰਤਿ ਦਸ ਹਜ਼ਾਰ</unitPattern>
+				<unitPattern count="other">{0} ਪ੍ਰਤਿ ਦਸ ਹਜ਼ਾਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਪ੍ਰਤਿ ਦਸ ਹਜ਼ਾਰ</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
 				<gender>masculine</gender>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ਗੁਲੂਕੋਜ਼</displayName>
+				<unitPattern count="one">{0} ਗੁਲੂਕੋਜ਼</unitPattern>
+				<unitPattern count="other">{0} ਗੁਲੂਕੋਜ਼</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
-				<displayName>ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</unitPattern>
+				<displayName>ਲਿਟਰ ਪ੍ਰਤਿ ਕਿਲੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤਿ ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤਿ ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤਿ ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤਿ ਕਿਲੋਮੀਟਰ</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<gender>masculine</gender>
-				<displayName>ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<displayName>ਲਿਟਰ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਲਿਟਰ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਲਿਟਰ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਲਿਟਰ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>ਮੀਲ ਪ੍ਰਤੀ ਗੈਲਨ</displayName>
@@ -5295,7 +5490,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਸਾਲ</unitPattern>
 				<unitPattern count="other">{0} ਸਾਲ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਸਾਲਾਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸਾਲ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਸਾਲ</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<gender>feminine</gender>
@@ -5307,7 +5502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਮਹੀਨੇ</unitPattern>
 				<unitPattern count="other">{0} ਮਹੀਨੇ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਮਹੀਨਿਆਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮਹੀਨਾ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਮਹੀਨਾ</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<gender>masculine</gender>
@@ -5315,11 +5510,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਹਫ਼ਤੇ</unitPattern>
 				<unitPattern count="other">{0} ਹਫ਼ਤੇ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਹਫ਼ਤਿਆਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਹਫ਼ਤਾ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਹਫ਼ਤਾ</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<gender>masculine</gender>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਦਿਨ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਦਿਨ</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<gender>masculine</gender>
@@ -5327,7 +5522,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਘੰਟੇ</unitPattern>
 				<unitPattern count="other">{0} ਘੰਟੇ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਘੰਟਿਆਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਘੰਟਾ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਘੰਟਾ</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<gender>masculine</gender>
@@ -5335,7 +5530,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਮਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਮਿੰਟ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਮਿੰਟਾਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮਿੰਟ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਮਿੰਟ</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<gender>masculine</gender>
@@ -5343,7 +5538,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਸਕਿੰਟ</unitPattern>
 				<unitPattern count="other">{0} ਸਕਿੰਟ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਸਕਿੰਟਾਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸਕਿੰਟ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਸਕਿੰਟ</perUnitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<gender>masculine</gender>
@@ -5423,7 +5618,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>masculine</gender>
 				<displayName>ਕਿਲੋਵਾਟ-ਘੰਟੇ</displayName>
 				<unitPattern count="one">{0} ਕਿਲੋਵਾਟ ਘੰਟਾ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਵਾਟ ਘੰਟਾ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਵਾਟ ਘੰਟੇ</unitPattern>
 				<unitPattern count="other">{0} ਕਿਲੋਵਾਟ ਘੰਟੇ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਕਿਲੋਵਾਟ ਘੰਟੇ</unitPattern>
 			</unit>
@@ -5453,11 +5648,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<gender>masculine</gender>
-				<displayName>ਕਿੱਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤੀ 100 ਕਿੱਲੋਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਕਿੱਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤੀ 100 ਕਿੱਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਕਿੱਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤੀ 100 ਕਿੱਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਕਿੱਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤੀ 100 ਕਿੱਲੋਮੀਟਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਕਿੱਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤੀ 100 ਕਿੱਲੋਮੀਟਰ</unitPattern>
+				<displayName>ਕਿਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਕਿਲੋਵਾਟ-ਘੰਟਾ ਪ੍ਰਤਿ 100 ਕਿਲੋਮੀਟਰ</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
 				<gender>masculine</gender>
@@ -5517,16 +5712,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
 				<gender>masculine</gender>
-				<displayName>ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</displayName>
-				<unitPattern count="one">{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<unitPattern count="other">{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<displayName>ਪਿਕਸਲ ਪ੍ਰਤਿ ਸੈਂਟੀਮੀਟਰ</displayName>
+				<unitPattern count="one">{0} ਪਿਕਸਲ ਪ੍ਰਤਿ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਪਿਕਸਲ ਪ੍ਰਤਿ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<unitPattern count="other">{0} ਪਿਕਸਲ ਪ੍ਰਤਿ ਸੈਂਟੀਮੀਟਰ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਪਿਕਸਲ ਪ੍ਰਤਿ ਸੈਂਟੀਮੀਟਰ</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<displayName>ਪਿਕਸਲ ਪ੍ਰਤੀ ਇੰਚ</displayName>
-				<unitPattern count="one">{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਇੰਚ</unitPattern>
-				<unitPattern count="other">{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਇੰਚ</unitPattern>
+				<displayName>ਪਿਕਸਲ ਪ੍ਰਤਿ ਇੰਚ</displayName>
+				<unitPattern count="one">{0} ਪਿਕਸਲ ਪ੍ਰਤਿ ਇੰਚ</unitPattern>
+				<unitPattern count="other">{0} ਪਿਕਸਲ ਪ੍ਰਤਿ ਇੰਚ</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>ਡਾਟਸ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</displayName>
@@ -5550,7 +5745,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਕਿਲੋਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਕਿਲੋਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਕਿਲੋਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<gender>masculine</gender>
@@ -5558,7 +5753,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਮੀਟਰਾਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
 				<gender>masculine</gender>
@@ -5575,7 +5770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<gender>masculine</gender>
@@ -5605,10 +5800,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ਪਿਕੋਮੀਟਰ</displayName>
 			</unit>
 			<unit type="length-foot">
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਫੁੱਟ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਫੁੱਟ</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਇੰਚ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਇੰਚ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ਪਾਰਸੈਕ</displayName>
+				<unitPattern count="one">{0} ਪਾਰਸੈਕ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਰਸੈਕ</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<unitPattern count="one">{0} ਪ੍ਰਕਾਸ਼ ਸਾਲ</unitPattern>
@@ -5774,6 +5974,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ਪਾਰਾ</displayName>
+				<unitPattern count="one">{0} ਪਾਰਾ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਰਾ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</displayName>
 				<unitPattern count="one">{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ</unitPattern>
@@ -5795,11 +6000,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="pressure-pascal">
 				<gender>masculine</gender>
-				<displayName>ਪੈਸਕਲ</displayName>
-				<unitPattern count="one">{0} ਪੈਸਕਲ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਪੈਸਕਲ</unitPattern>
-				<unitPattern count="other">{0} ਪੈਸਕਲ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਪੈਸਕਲ</unitPattern>
+				<displayName>ਪਾਸਕਲ</displayName>
+				<unitPattern count="one">{0} ਪਾਸਕਲ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਪਾਸਕਲ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਸਕਲ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਪਾਸਕਲ</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
 				<gender>masculine</gender>
@@ -5811,11 +6016,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="pressure-kilopascal">
 				<gender>masculine</gender>
-				<displayName>ਕਿੱਲੋਪਾਸਕਲ</displayName>
-				<unitPattern count="one">{0} ਕਿੱਲੋਪਾਸਕਲ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਕਿੱਲੋਪਾਸਕਲ</unitPattern>
-				<unitPattern count="other">{0} ਕਿੱਲੋਪਾਸਕਲ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਕਿੱਲੋਪਾਸਕਲ</unitPattern>
+				<displayName>ਕਿਲੋਪਾਸਕਲ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਪਾਸਕਲ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਪਾਸਕਲ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਪਾਸਕਲ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਕਿਲੋਪਾਸਕਲ</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
 				<gender>masculine</gender>
@@ -5827,19 +6032,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<gender>masculine</gender>
-				<displayName>ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ</displayName>
-				<unitPattern count="one">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ</unitPattern>
-				<unitPattern count="other">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ</unitPattern>
+				<displayName>ਕਿਲੋਮੀਟਰ ਪ੍ਰਤਿ ਘੰਟਾ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤਿ ਘੰਟਾ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤਿ ਘੰਟੇ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤਿ ਘੰਟਾ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਕਿਲੋਮੀਟਰ ਪ੍ਰਤਿ ਘੰਟੇ</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
 				<gender>masculine</gender>
-				<displayName>ਮੀਟਰ ਪ੍ਰਤੀ ਸਕਿੰਟ</displayName>
-				<unitPattern count="one">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਸਕਿੰਟ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਸਕਿੰਟ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤੀ ਸਕਿੰਟ</unitPattern>
+				<displayName>ਮੀਟਰ ਪ੍ਰਤਿ ਸਕਿੰਟ</displayName>
+				<unitPattern count="one">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਸਕਿੰਟ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਸਕਿੰਟ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਮੀਟਰ ਪ੍ਰਤਿ ਸਕਿੰਟ</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
 				<displayName>ਮੀਲ ਪ੍ਰਤੀ ਘੰਟਾ</displayName>
@@ -5912,7 +6117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਘਣ ਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਘਣ ਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਘਣ ਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਘਣ ਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਘਣ ਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
 				<gender>masculine</gender>
@@ -5921,7 +6126,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਘਣ ਸੈਂਟੀਮੀਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਘਣ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਘਣ ਸੈਂਟੀਮੀਟਰ</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
 				<displayName>ਘਣ ਮੀਲ</displayName>
@@ -5965,7 +6170,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="oblique">{0} ਲਿਟਰ</unitPattern>
 				<unitPattern count="other">{0} ਲਿਟਰ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਲਿਟਰ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਲਿਟਰ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਲਿਟਰ</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<gender>masculine</gender>
@@ -6007,6 +6212,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ਮੀਟਰਿਕ ਕੱਪ</unitPattern>
 				<unitPattern count="other" case="oblique">{0} ਮੀਟਰਿਕ ਕੱਪ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ਮੀਟਰਿਕ ਤਰਲ ਔਂਸ</displayName>
+				<unitPattern count="one">{0} ਮੀਟਰਿਕ ਤਰਲ ਔਂਸ</unitPattern>
+				<unitPattern count="other">{0} ਮੀਟਰਿਕ ਤਰਲ ਔਂਸ</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>{0} ਪ੍ਰਤੀ ਗੈਲਨ</perUnitPattern>
 			</unit>
@@ -6038,30 +6248,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਇੰਪੀਰੀਅਲ ਚੁਥਾਈ ਗੈਲਨ</unitPattern>
 				<unitPattern count="other">{0} ਇੰਪੀਰੀਅਲ ਚੁਥਾਈ ਗੈਲਨ</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ਸਟਰੇਡੀਅਨ</displayName>
+				<unitPattern count="one">{0} ਸਟਰੇਡੀਅਨ</unitPattern>
+				<unitPattern count="other">{0} ਸਟਰੇਡੀਅਨ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ਕੇਟਲ</displayName>
+				<unitPattern count="one">{0} ਕੇਟਲ</unitPattern>
+				<unitPattern count="other">{0} ਕੇਟਲ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">ਕੂਲਮ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ਕੂਲਮ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ਕੂਲਮ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">ਫ਼ੈਰਡ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ਫ਼ੈਰਡ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ਫ਼ੈਰਡ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">ਹੈਨਰੀ</displayName>
+				<unitPattern count="one" draft="contributed">{0} ਹੈਨਰੀ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ਹੈਨਰੀ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">ਸੀਮਨਜ਼</displayName>
+				<unitPattern count="one" draft="contributed">{0} ਸੀਮਨਜ਼</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ਸੀਮਨਜ਼</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ਕੈਲੋਰੀਆਂ [IT]</displayName>
+				<unitPattern count="one">{0} ਕੈਲੋਰੀ [IT]</unitPattern>
+				<unitPattern count="other">{0} ਕੈਲੋਰੀਆਂ [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ਬੈਕਰਲ</displayName>
+				<unitPattern count="one">{0} ਬੈਕਰਲ</unitPattern>
+				<unitPattern count="other">{0} ਬੈਕਰਲ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ਸੀਵਰਟ</displayName>
+				<unitPattern count="one">{0} ਸੀਵਰਟ</unitPattern>
+				<unitPattern count="other">{0} ਸੀਵਰਟ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ਗ੍ਰੇਅ</displayName>
+				<unitPattern count="one">{0} ਗ੍ਰੇਅ</unitPattern>
+				<unitPattern count="other">{0} ਗ੍ਰੇਅ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ਕਿਲੋਗ੍ਰਾਮ-ਫ਼ੋਰਸ</displayName>
+				<unitPattern count="one">{0} ਕਿਲੋਗ੍ਰਾਮ-ਫ਼ੋਰਸ</unitPattern>
+				<unitPattern count="other">{0} ਕਿਲੋਗ੍ਰਾਮ-ਫ਼ੋਰਸ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ਟੈਸਲਾ</displayName>
+				<unitPattern count="one">{0} ਟੈਸਲਾ</unitPattern>
+				<unitPattern count="other">{0} ਟੈਸਲਾ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ਵੈਬਰਸ</displayName>
+				<unitPattern count="one">{0} ਵੈਬਰ</unitPattern>
+				<unitPattern count="other">{0} ਵੈਬਰਸ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>masculine</gender>
-				<displayName>ਪ੍ਰਕਾਸ਼</displayName>
-				<unitPattern count="one">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
-				<displayName>ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ</displayName>
-				<unitPattern count="one">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ</unitPattern>
-				<unitPattern count="other">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ</unitPattern>
+				<displayName>ਹਿੱਸਾ ਪ੍ਰਤਿ ਅਰਬ</displayName>
+				<unitPattern count="one">{0} ਹਿੱਸਾ ਪ੍ਰਤਿ ਅਰਬ</unitPattern>
+				<unitPattern count="one" case="oblique">{0} ਹਿੱਸਾ ਪ੍ਰਤਿ ਅਰਬ</unitPattern>
+				<unitPattern count="other">{0} ਹਿੱਸਾ ਪ੍ਰਤਿ ਅਰਬ</unitPattern>
+				<unitPattern count="other" case="oblique">{0} ਹਿੱਸਾ ਪ੍ਰਤਿ ਅਰਬ</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>ਰਾਤਾਂ</displayName>
-				<unitPattern count="one">{0} ਰਾਤ</unitPattern>
-				<unitPattern count="one" case="oblique">{0} ਰਾਤ</unitPattern>
-				<unitPattern count="other">{0} ਰਾਤਾਂ</unitPattern>
-				<unitPattern count="other" case="oblique">{0} ਰਾਤਾਂ</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਰਾਤ</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਰਾਤ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>ਮੁੱਖ ਦਿਸ਼ਾ</displayName>
@@ -6177,9 +6442,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ਮੀ/ਸ²</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>ਪਰਿਕਰਮਾ</displayName>
-				<unitPattern count="one">{0} ਪਰਿਕਰਮਾ</unitPattern>
-				<unitPattern count="other">{0} ਪਰਿਕਰਮਾ</unitPattern>
+				<displayName>ਚੱਕਰ</displayName>
+				<unitPattern count="one">{0} ਚੱਕਰ</unitPattern>
+				<unitPattern count="other">{0} ਚੱਕਰ</unitPattern>
 			</unit>
 			<unit type="angle-radian">
 				<displayName>ਰੇਡੀਅਨ</displayName>
@@ -6216,7 +6481,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ਮੀਟਰ²</displayName>
 				<unitPattern count="one">{0} ਮੀ²</unitPattern>
 				<unitPattern count="other">{0} ਮੀ²</unitPattern>
-				<perUnitPattern>{0} ਪ੍ਰਤੀ ਮੀ²</perUnitPattern>
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਮੀ²</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<displayName>ਸੈਮੀ²</displayName>
@@ -6276,11 +6541,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਆਈਟਮ</unitPattern>
 				<unitPattern count="other">{0} ਆਈਟਮਾਂ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ਹਿੱਸਾ</displayName>
+				<unitPattern count="one">{0} ਹਿੱਸਾ</unitPattern>
+				<unitPattern count="other">{0} ਹਿੱਸੇ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ਹਿੱਸੇ/ਮਿਲੀਅਨ</displayName>
 			</unit>
 			<unit type="concentr-percent">
-				<displayName>ਪ੍ਰਤੀਸ਼ਤ</displayName>
+				<displayName>ਪ੍ਰਤਿਸ਼ਤ</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>ਪਰਮਾਈਲ</displayName>
@@ -6293,6 +6563,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਮੋਲ</unitPattern>
 				<unitPattern count="other">{0} ਮੋਲ</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ਲਿਟਰ/ਕਿ.ਮੀ.</displayName>
 				<unitPattern count="one">{0} ਲਿ./ਕਿ.ਮੀ.</unitPattern>
@@ -6561,9 +6836,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/ਇੰਚ</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<displayName>ਪਾਸੈੱਕ</displayName>
-				<unitPattern count="one">{0} ਪਾਸੈੱਕ</unitPattern>
-				<unitPattern count="other">{0} ਪਾਸੈੱਕ</unitPattern>
+				<displayName>ਪਾਰਸੈਕ</displayName>
+				<unitPattern count="one">{0} ਪਾਰਸੈਕ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਰਸੈਕ</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ਪ੍ਰਕਾਸ਼ ਸਾਲ</displayName>
@@ -6708,6 +6983,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਮੀ. ਪਾਰਾ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ਪਾਰਾ</displayName>
+				<unitPattern count="one">{0} ਪਾਰਾ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਰਾ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ਪੌਂ.ਵ.ਇੰਚ</displayName>
 				<unitPattern count="one">{0} ਪੌਂ.ਵ.ਇੰਚ</unitPattern>
@@ -6852,6 +7132,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਮੀ ਕੱਪ</unitPattern>
 				<unitPattern count="other">{0} ਮੀ ਕੱਪ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ਏਕੜ ਫੁੱਟ</displayName>
 				<unitPattern count="one">{0} ਏਕੜ ਫੁੱਟ</unitPattern>
@@ -6949,12 +7233,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਇੰਪ. ਚੁ. ਗੈ.</unitPattern>
 				<unitPattern count="other">{0} ਇੰਪ. ਚੁ. ਗੈ.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one" draft="contributed">{0} H</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one" draft="contributed">{0} S</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ਪ੍ਰਕਾਸ਼</displayName>
 				<unitPattern count="one">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
 				<unitPattern count="other">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ਹਿੱਸਾ/ਅਰਬ</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6980,6 +7305,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ਮੀ/ਸ²</unitPattern>
 				<unitPattern count="other">{0}ਮੀ/ਸ²</unitPattern>
 			</unit>
+			<unit type="angle-revolution">
+				<displayName>ਚੱਕਰ</displayName>
+				<unitPattern count="one">{0} ਚੱਕਰ</unitPattern>
+				<unitPattern count="other">{0} ਚੱਕਰ</unitPattern>
+			</unit>
 			<unit type="angle-degree">
 				<displayName>ਡਿ.</displayName>
 				<unitPattern count="one">{0}°</unitPattern>
@@ -6993,6 +7323,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
+			<unit type="area-square-meter">
+				<perUnitPattern>{0} ਪ੍ਰਤਿ ਮੀ²</perUnitPattern>
+			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one">{0}ਸੈਮੀ²</unitPattern>
 				<unitPattern count="other">{0}ਸੈਮੀ²</unitPattern>
@@ -7021,9 +7354,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}ਆਈਟਮ</unitPattern>
 				<unitPattern count="other">{0}ਆਈਟਮ</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ਹਿੱਸਾ</displayName>
+				<unitPattern count="one">{0} ਹਿੱਸਾ</unitPattern>
+				<unitPattern count="other">{0} ਹਿੱਸੇ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>ppm</displayName>
+			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}ਲਿ./ਕਿ.ਮੀ.</unitPattern>
 				<unitPattern count="other">{0}ਲਿ./ਕਿ.ਮੀ.</unitPattern>
@@ -7157,6 +7501,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}&quot;</unitPattern>
 				<unitPattern count="other">{0}&quot;</unitPattern>
 			</unit>
+			<unit type="length-parsec">
+				<displayName>ਪਾਰਸੈਕ</displayName>
+				<unitPattern count="one">{0} ਪਾਰਸੈਕ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਰਸੈਕ</unitPattern>
+			</unit>
 			<unit type="length-solar-radius">
 				<displayName>R☉</displayName>
 			</unit>
@@ -7179,6 +7528,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}hp</unitPattern>
 				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ਪਾਰਾ</displayName>
+				<unitPattern count="one">{0} ਪਾਰਾ</unitPattern>
+				<unitPattern count="other">{0} ਪਾਰਾ</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="one">{0}&quot; ਪਾਰਾ</unitPattern>
 				<unitPattern count="other">{0}&quot; ਪਾਰਾ</unitPattern>
@@ -7188,18 +7542,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਮਿ.ਬਾ.</unitPattern>
 				<unitPattern count="other">{0} ਮਿ.ਬਾ.</unitPattern>
 			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="one">{0} ਕਿ.ਮੀ./ਘੰ.</unitPattern>
-				<unitPattern count="other">{0} ਕਿ.ਮੀ./ਘੰ.</unitPattern>
-			</unit>
 			<unit type="speed-meter-per-second">
 				<unitPattern count="one">{0}ਮੀ/ਸ</unitPattern>
 				<unitPattern count="other">{0}ਮੀ/ਸ</unitPattern>
 			</unit>
-			<unit type="speed-mile-per-hour">
-				<unitPattern count="one">{0} ਮੀਲ/ਘੰ.</unitPattern>
-				<unitPattern count="other">{0} ਮੀਲ/ਘੰ.</unitPattern>
-			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 			</unit>
@@ -7281,16 +7627,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ਇ.ਚੁ.ਗੈ.</unitPattern>
 				<unitPattern count="other">{0} ਇ.ਚੁ.ਗੈ.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ਪ੍ਰਕਾਸ਼</displayName>
-				<unitPattern count="one">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
-				<unitPattern count="other">{0} ਪ੍ਰਕਾਸ਼</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ਰਾਤਾਂ</displayName>
-				<unitPattern count="one">{0} ਰਾਤ</unitPattern>
-				<unitPattern count="other">{0} ਰਾਤਾਂ</unitPattern>
-				<perUnitPattern>{0}/ਰਾਤ</perUnitPattern>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/pap.xml b/make/data/cldr/common/main/pap.xml
index d537758ef24..5f0986b0cb9 100644
--- a/make/data/cldr/common/main/pap.xml
+++ b/make/data/cldr/common/main/pap.xml
@@ -293,29 +293,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed" draft="unconfirmed">E, d</dateFormatItem>
@@ -519,21 +537,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="1" draft="unconfirmed">di promé kuartal</quarter>
 							<quarter type="2" draft="unconfirmed">di dos kuartal</quarter>
 							<quarter type="3" draft="unconfirmed">di tres kuartal</quarter>
-							<quarter type="4" draft="unconfirmed">di kuanter kuartal</quarter>
+							<quarter type="4" draft="unconfirmed">di kuater kuartal</quarter>
 						</quarterWidth>
 					</quarterContext>
 					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1 kuartal</quarter>
-							<quarter type="2" draft="unconfirmed">2 kuartal</quarter>
-							<quarter type="3" draft="unconfirmed">3 kuartal</quarter>
-							<quarter type="4" draft="unconfirmed">4 kuartal</quarter>
-						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1" draft="unconfirmed">di promé kuartal</quarter>
 							<quarter type="2" draft="unconfirmed">di dos kuartal</quarter>
 							<quarter type="3" draft="unconfirmed">di tres kuartal</quarter>
-							<quarter type="4" draft="unconfirmed">di kuanter kuartal</quarter>
+							<quarter type="4" draft="unconfirmed">di kuater kuartal</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
@@ -739,40 +751,371 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1" draft="unconfirmed">aña pasá</relative>
 				<relative type="0" draft="unconfirmed">e aña akí</relative>
 				<relative type="1" draft="unconfirmed">otro aña</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} aña</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} aña</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} aña pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} aña pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">kuartal</displayName>
+				<relative type="-1" draft="unconfirmed">lastu kuartal</relative>
+				<relative type="0" draft="unconfirmed">e kuartal akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente kuartal</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} kuartal</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} kuartal</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} kuartal pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} kuartal pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">kuartal</displayName>
+				<relative type="-1" draft="unconfirmed">lastu kuartal</relative>
+				<relative type="0" draft="unconfirmed">e kuartal akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente kuartal</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} kuartal</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} kuartal</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} kuartal pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} kuartal pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">kuartal</displayName>
 			</field>
 			<field type="month">
 				<displayName draft="unconfirmed">luna</displayName>
 				<relative type="-1" draft="unconfirmed">luna pasá</relative>
 				<relative type="0" draft="unconfirmed">e luna akí</relative>
 				<relative type="1" draft="unconfirmed">otro luna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} luna</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} luna</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} luna pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} luna pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} luna</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} luna</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} luna pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} luna pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} luna</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} luna</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} luna pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} luna pasá</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
 				<displayName draft="unconfirmed">siman</displayName>
 				<relative type="-1" draft="unconfirmed">siman pasá</relative>
 				<relative type="0" draft="unconfirmed">e siman akí</relative>
 				<relative type="1" draft="unconfirmed">otro siman</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} siman</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} siman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} siman pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} siman pasá</relativeTimePattern>
+				</relativeTime>
 				<relativePeriod draft="unconfirmed">e siman di {0}</relativePeriod>
 			</field>
+			<field type="week-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} siman</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} siman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} siman pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} siman pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} siman</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} siman</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} siman pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} siman pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekOfMonth">
+				<displayName draft="unconfirmed">siman di luna</displayName>
+			</field>
+			<field type="weekOfMonth-short">
+				<displayName draft="unconfirmed">siman di luna</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName draft="unconfirmed">siman di luna</displayName>
+			</field>
 			<field type="day">
 				<displayName draft="unconfirmed">dia</displayName>
 				<relative type="-1" draft="unconfirmed">ayera</relative>
 				<relative type="0" draft="unconfirmed">awe</relative>
 				<relative type="1" draft="unconfirmed">mañan</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} dia</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} dia pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} dia pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} dia</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} dia pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} dia pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} dia</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} dia</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} dia pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} dia pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayOfYear">
+				<displayName draft="unconfirmed">dia di aña</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName draft="unconfirmed">dia di aña</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName draft="unconfirmed">dia di aña</displayName>
 			</field>
 			<field type="weekday">
 				<displayName draft="unconfirmed">dia di siman</displayName>
 			</field>
+			<field type="weekdayOfMonth">
+				<displayName draft="unconfirmed">dia den siman di luna</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName draft="unconfirmed">dia den siman di luna</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName draft="unconfirmed">dia den siman di luna</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1" draft="unconfirmed">djadumingu pasá</relative>
+				<relative type="0" draft="unconfirmed">djadumingu akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djadumingu</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djadumingu</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djadumingu</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djadumingu pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djadumingu pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon">
+				<relative type="-1" draft="unconfirmed">djaluna pasá</relative>
+				<relative type="0" draft="unconfirmed">djaluna akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djaluna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djaluna</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djaluna</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djaluna pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djaluna pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue">
+				<relative type="-1" draft="unconfirmed">djamars pasá</relative>
+				<relative type="0" draft="unconfirmed">djamars akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djamars</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djamars</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djamars</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djamars pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djamars pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed">
+				<relative type="-1" draft="unconfirmed">djarason pasá</relative>
+				<relative type="0" draft="unconfirmed">djarason akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djarason</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djarason</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djarason</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djarason pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djarason pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu">
+				<relative type="-1" draft="unconfirmed">djaweps pasá</relative>
+				<relative type="0" draft="unconfirmed">djaweps akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djaweps</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djaweps</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djaweps</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djaweps pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djaweps pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri">
+				<relative type="-1" draft="unconfirmed">djabièrnè pasá</relative>
+				<relative type="0" draft="unconfirmed">djabièrnè akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djabièrnè</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djabièrnè</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djabièrnè</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djabièrnè pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djabièrnè pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat">
+				<relative type="-1" draft="unconfirmed">djasabra pasá</relative>
+				<relative type="0" draft="unconfirmed">djasabra akí</relative>
+				<relative type="1" draft="unconfirmed">siguiente djasabra</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} djasabra</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} djasabra</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} djasabra pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} djasabra pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="dayperiod">
 				<displayName draft="unconfirmed">periodo di dia</displayName>
 			</field>
 			<field type="hour">
 				<displayName draft="unconfirmed">ora</displayName>
+				<relative type="0" draft="unconfirmed">orario</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} ora</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} ora</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} ora pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} ora pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<relative type="0" draft="unconfirmed">ora</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} ora</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} ora</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} ora pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} ora pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<relative type="0" draft="unconfirmed">ora</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} ora</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} ora</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} ora pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} ora pasá</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName draft="unconfirmed">minüt</displayName>
+				<relative type="0" draft="unconfirmed">minüt</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} minüt</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} minüt</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} minüt pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} minüt pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0}min.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0}min.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0}min pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0}min pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0}min.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0}min.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0}min. pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0}min. pasá</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName draft="unconfirmed">sekònde</displayName>
+				<relative type="0" draft="unconfirmed">awoki</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0} sekònde</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0} sekònde</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0} sekònde pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0} sekònde pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<relative type="0" draft="unconfirmed">awoki</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0}sek.</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0}sek.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0}sek. pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0}sek. pasá</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one" draft="unconfirmed">aki {0}s</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">aki {0}s</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one" draft="unconfirmed">{0}s pasá</relativeTimePattern>
+					<relativeTimePattern count="other" draft="unconfirmed">{0}s pasá</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="zone">
 				<displayName draft="unconfirmed">zona di ora</displayName>
@@ -932,36 +1275,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one" draft="unconfirmed">¤0mil</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">¤0mil</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">¤00mil</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">¤00mil</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">¤000mil</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">¤000mil</pattern>
-					<pattern type="1000000" count="one" draft="unconfirmed">¤0mion</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">¤0mion</pattern>
-					<pattern type="10000000" count="one" draft="unconfirmed">¤00mion</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">¤00mion</pattern>
-					<pattern type="100000000" count="one" draft="unconfirmed">¤000mion</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">¤000mion</pattern>
-					<pattern type="1000000000" count="one" draft="unconfirmed">¤0bion</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">¤0bion</pattern>
-					<pattern type="10000000000" count="one" draft="unconfirmed">¤00bion</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">¤00bion</pattern>
-					<pattern type="100000000000" count="one" draft="unconfirmed">¤000bion</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">¤000bion</pattern>
-					<pattern type="1000000000000" count="one" draft="unconfirmed">¤0trion</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">¤0trion</pattern>
-					<pattern type="10000000000000" count="one" draft="unconfirmed">¤00trion</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">¤00trion</pattern>
-					<pattern type="100000000000000" count="one" draft="unconfirmed">¤000trion</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">¤000trion</pattern>
+					<pattern type="1000" count="one">¤ 0mil</pattern>
+					<pattern type="1000" count="other">¤ 0mil</pattern>
+					<pattern type="10000" count="one">¤ 00mil</pattern>
+					<pattern type="10000" count="other">¤ 00mil</pattern>
+					<pattern type="100000" count="one">¤ 000mil</pattern>
+					<pattern type="100000" count="other">¤ 000mil</pattern>
+					<pattern type="1000000" count="one">¤ 0mion</pattern>
+					<pattern type="1000000" count="other">¤ 0mion</pattern>
+					<pattern type="10000000" count="one">¤ 00mion</pattern>
+					<pattern type="10000000" count="other">¤ 00mion</pattern>
+					<pattern type="100000000" count="one">¤ 000mion</pattern>
+					<pattern type="100000000" count="other">¤ 000mion</pattern>
+					<pattern type="1000000000" count="one">¤ 0bion</pattern>
+					<pattern type="1000000000" count="other">¤ 0bion</pattern>
+					<pattern type="10000000000" count="one">¤ 00bion</pattern>
+					<pattern type="10000000000" count="other">¤ 00bion</pattern>
+					<pattern type="100000000000" count="one">¤ 000bion</pattern>
+					<pattern type="100000000000" count="other">¤ 000bion</pattern>
+					<pattern type="1000000000000" count="one">¤ 0trion</pattern>
+					<pattern type="1000000000000" count="other">¤ 0trion</pattern>
+					<pattern type="10000000000000" count="one">¤ 00trion</pattern>
+					<pattern type="10000000000000" count="other">¤ 00trion</pattern>
+					<pattern type="100000000000000" count="one">¤ 000trion</pattern>
+					<pattern type="100000000000000" count="other">¤ 000trion</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
 			<currency type="ANG">
-				<displayName draft="unconfirmed">Florin</displayName>
+				<displayName draft="unconfirmed">Florin Karibense</displayName>
+				<displayName count="one" draft="unconfirmed">Florin Karibense</displayName>
+				<displayName count="other" draft="unconfirmed">Florin Karibense</displayName>
+				<symbol draft="unconfirmed">XCG</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName draft="unconfirmed">Florin di Aruba</displayName>
@@ -978,10 +1324,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="USD">
 				<displayName draft="unconfirmed">Dòler merikano</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="unconfirmed">Florin Karibense</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one" draft="unconfirmed">{0} dia</pluralMinimalPairs>
-			<pluralMinimalPairs count="other" draft="unconfirmed">{0} dianan</pluralMinimalPairs>
+			<pluralMinimalPairs count="other" draft="unconfirmed">{0} dia</pluralMinimalPairs>
 			<ordinalMinimalPairs ordinal="other" draft="unconfirmed">di {0}</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
@@ -993,12 +1342,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="times">
 				<compoundUnitPattern draft="unconfirmed">{0}-{1}</compoundUnitPattern>
 			</compoundUnit>
-			<coordinateUnit>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} ost</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} nort</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} suit</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} wèst</coordinateUnitPattern>
-			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
 			<coordinateUnit>
@@ -1009,14 +1352,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<coordinateUnitPattern type="west" draft="unconfirmed">{0} wèst</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
-		<unitLength type="narrow">
-			<coordinateUnit>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0} ost</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0} nort</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0} suit</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0} wèst</coordinateUnitPattern>
-			</coordinateUnit>
-		</unitLength>
 	</units>
 	<listPatterns>
 		<listPattern>
@@ -1028,17 +1363,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="2" draft="unconfirmed">{0} òf {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="standard-narrow">
-			<listPatternPart type="end" draft="unconfirmed">{0}, i {1}</listPatternPart>
 			<listPatternPart type="2" draft="unconfirmed">{0} &amp; {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="end" draft="unconfirmed">{0}, i {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} i {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="2" draft="unconfirmed">{0} i {1}</listPatternPart>
-		</listPattern>
 	</listPatterns>
+	<posix>
+		<messages>
+			<yesstr draft="unconfirmed">si</yesstr>
+			<nostr draft="unconfirmed">no</nostr>
+		</messages>
+	</posix>
 	<characterLabels>
 		<characterLabelPattern type="all" draft="unconfirmed">{0} — tur</characterLabelPattern>
 		<characterLabelPattern type="historic" draft="unconfirmed">{0} — históriko</characterLabelPattern>
diff --git a/make/data/cldr/common/main/pcm.xml b/make/data/cldr/common/main/pcm.xml
index 165db2e975e..525131759e8 100644
--- a/make/data/cldr/common/main/pcm.xml
+++ b/make/data/cldr/common/main/pcm.xml
@@ -40,6 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">Azẹrbaijáni Lángwej</language>
 			<language type="az" alt="short">Azẹ́rí</language>
 			<language type="ba">Bashkír</language>
+			<language type="bal">Báluchí</language>
 			<language type="ban">Balinẹẹ́s</language>
 			<language type="bas">Básaa Lángwej</language>
 			<language type="be">Bẹlarúsiá Lángwej</language>
@@ -224,6 +225,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafiá Lángwej</language>
 			<language type="ksh">Kọlónián Lángwej</language>
 			<language type="ku">Kọ́dísh Lángwej</language>
+			<language type="ku" menu="core">Kọ́dísh Lángwej</language>
+			<language type="ku" menu="extension">Kọ́manjí Lángwej</language>
 			<language type="kum">Kumyík Lángwej</language>
 			<language type="kv">Komi Lángwej</language>
 			<language type="kw">Kọ́nish Lángwej</language>
@@ -608,6 +611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Chaína</territory>
 			<territory type="CO">Kolómbia</territory>
 			<territory type="CP">Klipatọ́n Aíland</territory>
+			<territory type="CQ">Sák</territory>
 			<territory type="CR">Kósta Ríka</territory>
 			<territory type="CU">Kiúbá</territory>
 			<territory type="CV">Kép Vẹ́d</territory>
@@ -835,42 +839,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Haú To Arénj Mọní</key>
 			<key type="collation">Arénj Tins Wẹl</key>
 			<key type="currency">Mọní</key>
+			<key type="em">Imọ́ji presentáshọn</key>
 			<key type="hc">Awá Saíkul (12 vs 24)</key>
 			<key type="lb">Laín Brẹk Staíl</key>
+			<key type="lw">Laín Brẹks wídin wọds</key>
 			<key type="ms">Sístẹm fọ Mẹ́zhọ́mẹnt</key>
 			<key type="numbers">Nọ́mba-dẹm</key>
+			<key type="ss">Sẹntẹns Brẹk Aftá Abbr</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Búdíst Kalẹ́nda</type>
+			<type key="calendar" type="buddhist" scope="core">Búdíst</type>
 			<type key="calendar" type="chinese">Chaíníz Kalẹ́nda</type>
+			<type key="calendar" type="chinese" scope="core">Chaíníz</type>
 			<type key="calendar" type="coptic">Kọ́ptík Kalẹ́nda</type>
+			<type key="calendar" type="coptic" scope="core">Kọ́ptík</type>
 			<type key="calendar" type="dangi">Dangi Kalẹ́nda</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Ẹtiópiá Kalẹ́nda</type>
+			<type key="calendar" type="ethiopic" scope="core">Ẹtiópiá</type>
 			<type key="calendar" type="ethiopic-amete-alem">Ẹtiópiá Amẹtẹ́ Álẹ́m Kalénda</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ẹtiópiá Amẹtẹ́ Álẹ́m</type>
 			<type key="calendar" type="gregorian">Grẹ́górí Kalẹ́nda</type>
+			<type key="calendar" type="gregorian" scope="core">Grẹ́górían</type>
 			<type key="calendar" type="hebrew">Híbrú Kalẹ́nda</type>
+			<type key="calendar" type="hebrew" scope="core">Híbrú</type>
 			<type key="calendar" type="islamic">Íslám Kalẹ́nda</type>
+			<type key="calendar" type="islamic" scope="core">Íslám</type>
 			<type key="calendar" type="islamic-civil">Íslám Kalẹ́nda (Tébúlá Taip an Sívúl Taip)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Íslám (Tébúlá Taip an Sívúl Taip)</type>
 			<type key="calendar" type="islamic-umalqura">Íslám Kalẹ́nda (Úmm al-Kúrá)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Íslám (Úmm al-Kúrá)</type>
 			<type key="calendar" type="iso8601">ISO-8601 Kalẹ́nda</type>
 			<type key="calendar" type="japanese">Japán Kalẹ́nda</type>
+			<type key="calendar" type="japanese" scope="core">Japánis</type>
 			<type key="calendar" type="persian">Pẹ́shia Kalẹ́nda</type>
+			<type key="calendar" type="persian" scope="core">Pẹ́shia</type>
 			<type key="calendar" type="roc">Ripọ́blík ọf Chaíná Kalẹ́nda</type>
+			<type key="calendar" type="roc" scope="core">Ripọ́blík ọf Chaíná</type>
 			<type key="cf" type="account">Akáunt To Ték Arénj Mọní</type>
+			<type key="cf" type="account" scope="core">Akáunting</type>
 			<type key="cf" type="standard">Nọ́mál Wè To Arénj Mọní</type>
+			<type key="cf" type="standard" scope="core">Nọ́mál</type>
 			<type key="collation" type="ducet">Yúníkód Mén Wè To Arénj Tins Wẹl</type>
+			<type key="collation" type="ducet" scope="core">Yúníkód Mén</type>
 			<type key="collation" type="search">Jẹ́nárál Sachin</type>
+			<type key="collation" type="search" scope="core">Sach</type>
 			<type key="collation" type="standard">Nọ́mál Wè To Arénj Tins Wẹl</type>
+			<type key="collation" type="standard" scope="core">Nọ́mál Wè</type>
+			<type key="em" type="default" scope="core">Mén</type>
+			<type key="em" type="emoji" scope="core">Imọ́ji</type>
+			<type key="em" type="text" scope="core">Tẹxt</type>
 			<type key="hc" type="h11">12 Áwa Sístẹm (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Áwa Sístẹm (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 Áwa Sístẹm (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 Áwa Sístẹm (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Lúz Laín Brẹk Staíl</type>
+			<type key="lb" type="loose" scope="core">Lúz</type>
 			<type key="lb" type="normal">Nọ́mál Laín Brẹk Staíl</type>
+			<type key="lb" type="normal" scope="core">Nọ́mál</type>
 			<type key="lb" type="strict">Fíksd Laín Brẹk Staíl</type>
+			<type key="lb" type="strict" scope="core">Fíksd</type>
+			<type key="lw" type="breakall" scope="core">Brẹk all</type>
+			<type key="lw" type="keepall" scope="core">Kíp all</type>
+			<type key="lw" type="normal" scope="core">Nọ́mál</type>
+			<type key="lw" type="phrase" scope="core">Kíp in frẹzis</type>
 			<type key="ms" type="metric">Mẹ́trík Sístẹm</type>
+			<type key="ms" type="metric" scope="core">Mẹ́trík</type>
 			<type key="ms" type="uksystem">Impẹ́riál Sístẹm fọ Mẹ́zhọ́mẹnt</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">US Sístẹm fọ Mẹ́zhọ́mẹnt</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">Arábík Nọ́mba-dẹm</type>
 			<type key="numbers" type="arabext">Ẹstrá Arábík Nọ́mba-dẹm</type>
 			<type key="numbers" type="armn">Armẹ́niá Nọ́mba-dẹm</type>
@@ -911,6 +954,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">Taí Nọ́mba-dẹm</type>
 			<type key="numbers" type="tibt">Tíbẹt Nọ́mba-dẹm</type>
 			<type key="numbers" type="vaii">Vaí Nọ́mba-dẹm</type>
+			<type key="ss" type="none" scope="core">Off</type>
+			<type key="ss" type="standard" scope="core">On</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Mẹ́trik</measurementSystemName>
@@ -989,7 +1034,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
@@ -998,93 +1042,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">G y MMMM – y MMMM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
@@ -1277,6 +1234,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'fọ' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'fọ' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1285,22 +1245,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'fọ' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'fọ' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1325,50 +1293,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yw" count="other">'Wiik' w 'fọ' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">Gy – Gy</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
 							<greatestDifference id="G">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
-							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
-							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
 							<greatestDifference id="G">G y MMM d, E – G y MMM</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1380,10 +1312,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
 							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
@@ -2266,9 +2194,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Fnọ́m Pẹn</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ẹ́ndábẹ́ri</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kritímáti</exemplarCity>
 			</zone>
@@ -2915,9 +2840,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Wẹ́st Áfríká Taim</generic>
-					<standard>Wẹ́st Áfríká Fíksd Taim</standard>
-					<daylight>Wẹ́st Áfríká Họ́t Sízin Taim</daylight>
+					<standard>Wẹ́st Áfríká Taim</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3267,6 +3190,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Gayána Taim</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaií-Elúshián Fíksd Taim</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaií-Elúshián Taim</generic>
@@ -3812,7 +3740,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4519,6 +4446,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>Íst Karíbián Dọla</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karíbíen Gílda</displayName>
+				<displayName count="one">Karíbíen Gílda</displayName>
+				<displayName count="other">Karíbíen Gílda</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Wẹ́st Afríká Sẹ́fa Frank</displayName>
 				<displayName count="one">Wẹ́st Afríká Sẹ́fa frank</displayName>
@@ -4549,6 +4481,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">Zámbiá kwácha</displayName>
 				<displayName count="other">Zámbiá kwáchas</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbábwẹn Gọ́ld</displayName>
+				<displayName count="one">Zimbábwẹn Gọ́ld</displayName>
+				<displayName count="other">Zimbábwẹn Gọ́ld</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4749,7 +4686,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} Mílimol Fọ Ẹ́vrí Líta</unitPattern>
 				<unitPattern count="other">{0} Mílimol Fọ Ẹ́vrí Líta</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>párts</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>Pat-dẹm Fọ Ích Míliọn</displayName>
 				<unitPattern count="one">{0} Pat Fọ Ích Míliọn</unitPattern>
 				<unitPattern count="other">{0} Pat Fọ Ích Míliọn</unitPattern>
@@ -4771,6 +4711,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} Mol</unitPattern>
 				<unitPattern count="other">{0} Mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ọf glúcọs</displayName>
+				<unitPattern count="one">{0} of glúcọs</unitPattern>
+				<unitPattern count="other">{0} of glúcọs</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>Líta-dẹm Fọ Ẹ́vrí Kilómíta</displayName>
 				<unitPattern count="one">{0} Líta Fọ Ẹ́vrí Kilómíta</unitPattern>
@@ -5520,22 +5465,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} Impẹ́riál Kwọt</unitPattern>
 				<unitPattern count="other">{0} Impẹ́riál Kwọt</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>laít</displayName>
-				<unitPattern count="one">{0} laít</unitPattern>
-				<unitPattern count="other">{0} laít</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katáls</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="magnetic-tesla">
+				<displayName>tẹslás</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Webers</displayName>
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>pat fọ ích bíliọn</displayName>
 				<unitPattern count="one">{0} pat fọ ích bíliọn</unitPattern>
 				<unitPattern count="other">{0} pat fọ ích bíliọn</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>nait</displayName>
-				<unitPattern count="one">{0} nait</unitPattern>
-				<unitPattern count="other">{0} nait</unitPattern>
-				<perUnitPattern>{0}/nait</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>Kádínál Pọint</displayName>
 				<coordinateUnitPattern type="east">{0} Ist</coordinateUnitPattern>
@@ -5679,7 +5624,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-millimole-per-liter">
 				<displayName>Mílimol/Líta</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>párt</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>Pat/Míliọn</displayName>
 				<unitPattern count="one">{0} pfim</unitPattern>
 				<unitPattern count="other">{0} pfim</unitPattern>
@@ -5693,6 +5641,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-permyriad">
 				<displayName>Fọ Ích Tẹ́n Taúzan</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glúcọs</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>Lítas/km</displayName>
 			</unit>
@@ -5982,7 +5933,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Sólá Luminósítis</displayName>
 			</unit>
 			<unit type="mass-tonne">
-				<displayName>T</displayName>
+				<displayName>M. Tọn-dẹm</displayName>
+				<unitPattern count="one">{0} M. Tọn</unitPattern>
+				<unitPattern count="other">{0} M. Tọn</unitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>Grams</displayName>
@@ -6220,7 +6173,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} laít</unitPattern>
 				<unitPattern count="other">{0} laít</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>pat/bíliọn</displayName>
 				<unitPattern count="one">{0} pfib</unitPattern>
 				<unitPattern count="other">{0} pfib</unitPattern>
@@ -6263,7 +6216,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} kárá</unitPattern>
 				<unitPattern count="other">{0} kárá</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>párt</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>Pfim</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6275,6 +6231,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glúcọs</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 			</unit>
@@ -6430,20 +6389,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}dzp-Imp</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName>laít</displayName>
 				<unitPattern count="one">{0}laít</unitPattern>
 				<unitPattern count="other">{0}laít</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>pfib</displayName>
 				<unitPattern count="one">{0}pfib</unitPattern>
 				<unitPattern count="other">{0}pfib</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>nait</displayName>
 				<unitPattern count="one">{0}nait</unitPattern>
 				<unitPattern count="other">{0}nait</unitPattern>
-				<perUnitPattern>{0}/nait</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
@@ -6497,6 +6453,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabelPattern type="compatibility">{0} — Fít ích ọ́da</characterLabelPattern>
 		<characterLabelPattern type="enclosed">{0} — Sọráund</characterLabelPattern>
 		<characterLabelPattern type="extended">{0} — Strẹch</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} Fẹsin left</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} Fẹsin ráít</characterLabelPattern>
 		<characterLabelPattern type="historic">{0} — Impọ́tant</characterLabelPattern>
 		<characterLabelPattern type="miscellaneous">{0} — Dífrẹ́n Dífrẹ́n Tins</characterLabelPattern>
 		<characterLabelPattern type="other">{0} — Ọ́da</characterLabelPattern>
diff --git a/make/data/cldr/common/main/pi.xml b/make/data/cldr/common/main/pi.xml
new file mode 100644
index 00000000000..0a43e2dae6b
--- /dev/null
+++ b/make/data/cldr/common/main/pi.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="pi"/>
+	</identity>
+	<characters>
+		<exemplarCharacters>[aā b c dḍ e f g h iī j k lḷ mṁṃ nñṅṇ ŋ o p q r sśṣ tṭ uū v w x y z]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/pi_Latn.xml b/make/data/cldr/common/main/pi_Latn.xml
new file mode 100644
index 00000000000..8858f03f456
--- /dev/null
+++ b/make/data/cldr/common/main/pi_Latn.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="pi"/>
+		<script type="Latn"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/pi_Latn_GB.xml b/make/data/cldr/common/main/pi_Latn_GB.xml
new file mode 100644
index 00000000000..72bd3cee2c1
--- /dev/null
+++ b/make/data/cldr/common/main/pi_Latn_GB.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="pi"/>
+		<script type="Latn"/>
+		<territory type="GB"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/pl.xml b/make/data/cldr/common/main/pl.xml
index c302f4537a2..b24590174c1 100644
--- a/make/data/cldr/common/main/pl.xml
+++ b/make/data/cldr/common/main/pl.xml
@@ -332,6 +332,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">gwara kolońska</language>
 			<language type="ku">kurdyjski</language>
+			<language type="ku" menu="core">kurdyjski</language>
+			<language type="ku" menu="extension">kurmandżi</language>
 			<language type="kum">kumycki</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -934,6 +936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Chiny</territory>
 			<territory type="CO">Kolumbia</territory>
 			<territory type="CP">Wyspa Clippertona</territory>
+			<territory type="CQ" draft="contributed">Sark</territory>
 			<territory type="CR">Kostaryka</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Republika Zielonego Przylądka</territory>
@@ -1210,35 +1213,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">sortowanie numeryczne</key>
 			<key type="colStrength">siła sortowania</key>
 			<key type="currency">waluta</key>
+			<key type="em">prezentacja emoji</key>
 			<key type="hc">cykl (12- lub 24-godzinny)</key>
 			<key type="lb">styl podziału wiersza</key>
+			<key type="lw" draft="contributed">podział wierszy wewnątrz wyrazów</key>
 			<key type="ms">system miar</key>
 			<key type="numbers">cyfry</key>
+			<key type="ss">koniec zdania po skrócie</key>
 			<key type="timezone">strefa czasowa</key>
 			<key type="va">wariant regionalny</key>
 			<key type="x">do użytku prywatnego</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">kalendarz buddyjski</type>
+			<type key="calendar" type="buddhist" scope="core">buddyjski</type>
 			<type key="calendar" type="chinese">kalendarz chiński</type>
+			<type key="calendar" type="chinese" scope="core">chiński</type>
 			<type key="calendar" type="coptic">kalendarz koptyjski</type>
+			<type key="calendar" type="coptic" scope="core">koptyjski</type>
 			<type key="calendar" type="dangi">kalendarz koreański</type>
+			<type key="calendar" type="dangi" scope="core">koreański</type>
 			<type key="calendar" type="ethiopic">kalendarz etiopski</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopski</type>
 			<type key="calendar" type="ethiopic-amete-alem">kalendarz etiopski Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopski Amete Alem</type>
 			<type key="calendar" type="gregorian">kalendarz gregoriański</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriański</type>
 			<type key="calendar" type="hebrew">kalendarz hebrajski</type>
+			<type key="calendar" type="hebrew" scope="core">hebrajski</type>
 			<type key="calendar" type="indian">narodowy kalendarz hinduski</type>
 			<type key="calendar" type="islamic">kalendarz muzułmański</type>
+			<type key="calendar" type="islamic" scope="core">muzułmański</type>
 			<type key="calendar" type="islamic-civil">kalendarz muzułmański (metoda obliczeniowa)</type>
+			<type key="calendar" type="islamic-civil" scope="core">muzułmański (metoda obliczeniowa)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">kalendarz islamski (Arabia Saudyjska, metoda wzrokowa)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">kalendarz islamski (metoda obliczeniowa, epoka astronomiczna)</type>
 			<type key="calendar" type="islamic-umalqura">kalendarz muzułmański (Umm al-Kura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">muzułmański (Umm al-Kura)</type>
 			<type key="calendar" type="iso8601">kalendarz ISO-8601</type>
 			<type key="calendar" type="japanese">kalendarz japoński</type>
+			<type key="calendar" type="japanese" scope="core">japoński</type>
 			<type key="calendar" type="persian">kalendarz perski</type>
+			<type key="calendar" type="persian" scope="core">perski</type>
 			<type key="calendar" type="roc">kalendarz Republiki Chińskiej</type>
+			<type key="calendar" type="roc" scope="core">Republiki Chińskiej</type>
 			<type key="cf" type="account">księgowy format waluty</type>
+			<type key="cf" type="account" scope="core">księgowy</type>
 			<type key="cf" type="standard">standardowy format waluty</type>
+			<type key="cf" type="standard" scope="core">standardowy</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Sortowanie symboli</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Sortowanie ignorujące symbole</type>
 			<type key="colBackwards" type="no" draft="contributed">Zwykłe sortowanie znaków akcentowanych</type>
@@ -1248,22 +1270,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Sortowanie od wielkich liter</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Sortowanie bez rozróżniania wielkości liter</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Sortowanie z rozróżnianiem wielkości liter</type>
-			<type key="collation" type="big5han">chiński tradycyjny porządek sortowania - Big5</type>
 			<type key="collation" type="compat">poprzedni porządek sortowania, dla zgodności</type>
+			<type key="collation" type="compat" scope="core">zgodność</type>
 			<type key="collation" type="dictionary">sortowanie słownikowe</type>
+			<type key="collation" type="dictionary" scope="core">słownikowe</type>
 			<type key="collation" type="ducet">domyślna kolejność sortowania Unicode</type>
+			<type key="collation" type="ducet" scope="core">domyślne Unicode</type>
 			<type key="collation" type="eor" draft="contributed">europejskie reguły określania kolejności</type>
-			<type key="collation" type="gb2312han">chiński uproszczony porządek sortowania - GB2312</type>
 			<type key="collation" type="phonebook">porządek sortowania książki telefonicznej</type>
+			<type key="collation" type="phonebook" scope="core">książka telefoniczna</type>
 			<type key="collation" type="phonetic">sortowanie fonetyczne</type>
+			<type key="collation" type="phonetic" scope="core">fonetyczne</type>
 			<type key="collation" type="pinyin">porządek sortowania pinyin</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">wyszukiwanie ogólnego zastosowania</type>
+			<type key="collation" type="search" scope="core">wyszukiwanie</type>
 			<type key="collation" type="searchjl" draft="contributed">Wyszukiwanie według początkowej spółgłoski hangul</type>
 			<type key="collation" type="standard">standardowa kolejność sortowania</type>
+			<type key="collation" type="standard" scope="core">standardowe</type>
 			<type key="collation" type="stroke">sortowanie wg liczby kresek</type>
+			<type key="collation" type="stroke" scope="core">liczba kresek</type>
 			<type key="collation" type="traditional">tradycyjny porządek sortowania</type>
+			<type key="collation" type="traditional" scope="core">tradycyjne</type>
 			<type key="collation" type="unihan">sortowanie wg kluczy i ich liczby kresek</type>
-			<type key="collation" type="zhuyin">sortowanie zhuyin</type>
+			<type key="collation" type="unihan" scope="core">klucze i liczba kresek</type>
+			<type key="collation" type="zhuyin">sortowanie bopomofo</type>
+			<type key="collation" type="zhuyin" scope="core">bopomofo</type>
 			<type key="colNormalization" type="no" draft="contributed">Sortowanie bez normalizacji</type>
 			<type key="colNormalization" type="yes" draft="contributed">Sortowanie z normalizacją unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Oddzielne sortowanie cyfr</type>
@@ -1276,18 +1308,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">pełna szerokość</type>
 			<type key="d0" type="hwidth">połowa szerokości</type>
 			<type key="d0" type="npinyin" draft="contributed">Liczbowe</type>
+			<type key="em" type="default" scope="core">domyślna</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">system 12-godzinny (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">system 12-godzinny (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">system 24-godzinny (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">system 24-godzinny (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">luźny styl podziału wiersza</type>
+			<type key="lb" type="loose" scope="core">luźny</type>
 			<type key="lb" type="normal">normalny styl podziału wiersza</type>
+			<type key="lb" type="normal" scope="core">normalny</type>
 			<type key="lb" type="strict">ścisły styl podziału wiersza</type>
+			<type key="lb" type="strict" scope="core">ścisły</type>
+			<type key="lw" type="breakall" scope="core">dowolny podział</type>
+			<type key="lw" type="keepall" scope="core">bez podziału</type>
+			<type key="lw" type="normal" scope="core">normalny</type>
+			<type key="lw" type="phrase" scope="core">bez podziału w wyrażeniach</type>
 			<type key="m0" type="bgn">transliteracja BGN</type>
 			<type key="m0" type="ungegn">transliteracja UNGEGN</type>
 			<type key="ms" type="metric">system metryczny</type>
+			<type key="ms" type="metric" scope="core">metryczny</type>
 			<type key="ms" type="uksystem">imperialny system miar</type>
+			<type key="ms" type="uksystem" scope="core">imperialny</type>
 			<type key="ms" type="ussystem">amerykański system miar</type>
+			<type key="ms" type="ussystem" scope="core">amerykański</type>
 			<type key="numbers" type="arab">cyfry arabsko-indyjskie</type>
 			<type key="numbers" type="arabext">rozszerzone cyfry arabsko-indyjskie</type>
 			<type key="numbers" type="armn">cyfry ormiańskie</type>
@@ -1332,6 +1381,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">cyfry tybetańskie</type>
 			<type key="numbers" type="traditional" draft="contributed">Liczebniki tradycyjne</type>
 			<type key="numbers" type="vaii">cyfry vai</type>
+			<type key="ss" type="none" scope="core">wył.</type>
+			<type key="ss" type="standard" scope="core">wł.</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metryczny</measurementSystemName>
@@ -1377,9 +1428,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1508,7 +1556,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="contributed">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="contributed">E, M.d.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
@@ -1532,12 +1582,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">y G – y G</greatestDifference>
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -1901,11 +1945,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1924,14 +1974,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMM">LLLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d MMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1963,12 +2014,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">Y, 'tydz'. w</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">y G – y G</greatestDifference>
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -2009,7 +2054,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a–h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a–h:mm a</greatestDifference>
@@ -2021,10 +2065,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd.MM–dd.MM</greatestDifference>
 							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
@@ -2340,9 +2380,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 				<relativePeriod>tydz. {0}</relativePeriod>
 			</field>
-			<field type="week-narrow">
-				<relativePeriod>tydz. {0}</relativePeriod>
-			</field>
 			<field type="weekOfMonth">
 				<displayName>tydzień miesiąca</displayName>
 			</field>
@@ -2684,18 +2721,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Dubai">
 				<exemplarCity>Dubaj</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erywań</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Vostok">
 				<exemplarCity>Wostok</exemplarCity>
 			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wiedeń</exemplarCity>
 			</zone>
@@ -2726,18 +2757,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermudy</exemplarCity>
 			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Salvador</exemplarCity>
 			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="Europe/Minsk">
 				<exemplarCity>Mińsk</exemplarCity>
 			</zone>
@@ -2912,7 +2934,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Biszkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kanton</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komory</exemplarCity>
@@ -3124,9 +3146,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Rijad</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Chartum</exemplarCity>
 			</zone>
@@ -3163,9 +3182,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Wyspy Kerguelena</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Duszanbe</exemplarCity>
 			</zone>
@@ -3239,9 +3255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>czas zachodnioafrykański</generic>
-					<standard>czas zachodnioafrykański standardowy</standard>
-					<daylight>czas zachodnioafrykański letni</daylight>
+					<standard>czas zachodnioafrykański</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3634,6 +3648,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>czas Gujana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaje-Aleuty (czas standardowy)</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>czas Hawaje-Aleuty</generic>
@@ -4247,10 +4266,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -5522,11 +5542,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">leone sierraleońskiego</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>leone sierraleoński (1964—2022)</displayName>
+				<displayName>leone sierraleoński (1964–2022)</displayName>
 				<displayName count="one">leone sierraleoński (1964—2022)</displayName>
-				<displayName count="few">leone sierraleońskie (1964—2022)</displayName>
-				<displayName count="many">leone sierraleońskich (1964—2022)</displayName>
-				<displayName count="other">leone sierraleońskiego (1964—2022)</displayName>
+				<displayName count="few">leone sierraleońskie (1964–2022)</displayName>
+				<displayName count="many">leone sierraleońskich (1964–2022)</displayName>
+				<displayName count="other">leone sierraleońskiego (1964–2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>szyling somalijski</displayName>
@@ -5799,6 +5819,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">dolarów wschodniokaraibskich</displayName>
 				<displayName count="other">dolara wschodniokaraibskiego</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>gulden karaibski</displayName>
+				<displayName count="one">gulden karaibski</displayName>
+				<displayName count="few">guldeny karaibskie</displayName>
+				<displayName count="many">guldenów karaibskich</displayName>
+				<displayName count="other">guldena karaibskiego</displayName>
+				<symbol>XCG</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>specjalne prawa ciągnienia</displayName>
 			</currency>
@@ -5890,6 +5918,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>dolar Zimbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>złoto Zimbabwe</displayName>
+				<displayName count="one">złoto Zimbabwe</displayName>
+				<displayName count="few">złota Zimbabwe</displayName>
+				<displayName count="many">złot Zimbabwe</displayName>
+				<displayName count="other">złota Zimbabwe</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>dolar Zimbabwe (2009)</displayName>
 			</currency>
@@ -6137,28 +6172,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="genitive">przyspieszenia ziemskiego</unitPattern>
 				<unitPattern count="one" case="instrumental">przyspieszeniem ziemskim</unitPattern>
 				<unitPattern count="one" case="locative">przyspieszeniu ziemskim</unitPattern>
-				<unitPattern count="one" case="vocative">przyspieszenie ziemskie</unitPattern>
 				<unitPattern count="few">{0} przyspieszenia ziemskie</unitPattern>
 				<unitPattern count="few" case="accusative">{0} przyspieszenia ziemskie</unitPattern>
 				<unitPattern count="few" case="dative">{0} przyspieszeniom ziemskim</unitPattern>
 				<unitPattern count="few" case="genitive">{0} przyspieszeń ziemskich</unitPattern>
 				<unitPattern count="few" case="instrumental">{0} przyspieszeniami ziemskimi</unitPattern>
 				<unitPattern count="few" case="locative">{0} przyspieszeniach ziemskich</unitPattern>
-				<unitPattern count="few" case="vocative">{0} przyspieszenia ziemskie</unitPattern>
 				<unitPattern count="many">{0} przyspieszeń ziemskich</unitPattern>
 				<unitPattern count="many" case="accusative">{0} przyspieszeń ziemskich</unitPattern>
 				<unitPattern count="many" case="dative">{0} przyspieszeniami ziemskimi</unitPattern>
 				<unitPattern count="many" case="genitive">{0} przyspieszeń ziemskich</unitPattern>
 				<unitPattern count="many" case="instrumental">{0} przyspieszeniami ziemskimi</unitPattern>
 				<unitPattern count="many" case="locative">{0} przyspieszeniach ziemskich</unitPattern>
-				<unitPattern count="many" case="vocative">{0} przyspieszeń ziemskich</unitPattern>
 				<unitPattern count="other">{0} przyspieszenia ziemskiego</unitPattern>
 				<unitPattern count="other" case="accusative">{0} przyspieszenia ziemskiego</unitPattern>
-				<unitPattern count="other" case="dative">{0} przyspieszenia ziemskiego</unitPattern>
 				<unitPattern count="other" case="genitive">{0} przyspieszenia ziemskiego</unitPattern>
-				<unitPattern count="other" case="instrumental">{0} przyspieszenia ziemskiego</unitPattern>
-				<unitPattern count="other" case="locative">{0} przyspieszenia ziemskiego</unitPattern>
-				<unitPattern count="other" case="vocative">{0} przyspieszenia ziemskiego</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
 				<gender>inanimate</gender>
@@ -6518,7 +6546,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} sztuki</unitPattern>
 				<unitPattern count="other" case="genitive">{0} sztuki</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>części</displayName>
+				<unitPattern count="one">{0} część</unitPattern>
+				<unitPattern count="few">{0} części</unitPattern>
+				<unitPattern count="many">{0} części</unitPattern>
+				<unitPattern count="other">{0} części</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>części na milion</displayName>
 				<unitPattern count="one">{0} część na milion</unitPattern>
@@ -6607,6 +6642,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} mola</unitPattern>
 				<unitPattern count="other" case="genitive">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukozy</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>inanimate</gender>
 				<displayName>litry na kilometr</displayName>
@@ -6738,7 +6776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>terabity</displayName>
 				<unitPattern count="one">{0} terabit</unitPattern>
 				<unitPattern count="one" case="accusative">{0} terabit</unitPattern>
-				<unitPattern count="one" case="genitive">{0} terabita</unitPattern>
+				<unitPattern count="one" case="genitive">{0} terabitu</unitPattern>
 				<unitPattern count="few">{0} terabity</unitPattern>
 				<unitPattern count="few" case="accusative">{0} terabity</unitPattern>
 				<unitPattern count="few" case="genitive">{0} terabitów</unitPattern>
@@ -6770,7 +6808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>gigabity</displayName>
 				<unitPattern count="one">{0} gigabit</unitPattern>
 				<unitPattern count="one" case="accusative">{0} gigabit</unitPattern>
-				<unitPattern count="one" case="genitive">{0} gigabita</unitPattern>
+				<unitPattern count="one" case="genitive">{0} gigabitu</unitPattern>
 				<unitPattern count="few">{0} gigabity</unitPattern>
 				<unitPattern count="few" case="accusative">{0} gigabity</unitPattern>
 				<unitPattern count="few" case="genitive">{0} gigabitów</unitPattern>
@@ -6802,7 +6840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>megabity</displayName>
 				<unitPattern count="one">{0} megabit</unitPattern>
 				<unitPattern count="one" case="accusative">{0} megabit</unitPattern>
-				<unitPattern count="one" case="genitive">{0} megabita</unitPattern>
+				<unitPattern count="one" case="genitive">{0} megabitu</unitPattern>
 				<unitPattern count="few">{0} megabity</unitPattern>
 				<unitPattern count="few" case="accusative">{0} megabity</unitPattern>
 				<unitPattern count="few" case="genitive">{0} megabitów</unitPattern>
@@ -6866,7 +6904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>bity</displayName>
 				<unitPattern count="one">{0} bit</unitPattern>
 				<unitPattern count="one" case="accusative">{0} bit</unitPattern>
-				<unitPattern count="one" case="genitive">{0} bita</unitPattern>
+				<unitPattern count="one" case="genitive">{0} bitu</unitPattern>
 				<unitPattern count="few">{0} bity</unitPattern>
 				<unitPattern count="few" case="accusative">{0} bity</unitPattern>
 				<unitPattern count="few" case="genitive">{0} bitów</unitPattern>
@@ -7675,7 +7713,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="genitive">{0} milimetra</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} milimentrem</unitPattern>
 				<unitPattern count="one" case="locative">{0} milimetrze</unitPattern>
-				<unitPattern count="one" case="vocative">{0} milimetrrze</unitPattern>
+				<unitPattern count="one" case="vocative">{0} milimetrze</unitPattern>
 				<unitPattern count="few">{0} milimetry</unitPattern>
 				<unitPattern count="few" case="accusative">{0} milimetry</unitPattern>
 				<unitPattern count="few" case="dative">{0} milimetrom</unitPattern>
@@ -8446,6 +8484,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} milimetra słupa rtęci</unitPattern>
 				<unitPattern count="other" case="genitive">{0} milimetra słupa rtęci</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>słupa rtęci</displayName>
+				<unitPattern count="one">{0} słupa rtęci</unitPattern>
+				<unitPattern count="few">{0} słupa rtęci</unitPattern>
+				<unitPattern count="many">{0} słupa rtęci</unitPattern>
+				<unitPattern count="other">{0} słupa rtęci</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funty na cal kwadratowy</displayName>
 				<unitPattern count="one">{0} funt na cal kwadratowy</unitPattern>
@@ -9233,7 +9278,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ćwierćkwarty amerykańskiej</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ćwierćkwarty amerykańskiej</unitPattern>
 				<unitPattern count="other" case="genitive">{0} ćwierćkwarty amerykańskiej</unitPattern>
-				<unitPattern count="other" case="vocative">{0} ćwierćkwarty am.</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
 				<gender>feminine</gender>
@@ -9524,6 +9568,97 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} kwarty angielskiej</unitPattern>
 				<unitPattern count="other" case="genitive">{0} kwarty angielskiej</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiany</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="few">{0} steradiany</unitPattern>
+				<unitPattern count="many">{0} steradianów</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katale</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} katale</unitPattern>
+				<unitPattern count="many">{0} katali</unitPattern>
+				<unitPattern count="other">{0} katala</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kulomby</displayName>
+				<unitPattern count="one">{0} kulomb</unitPattern>
+				<unitPattern count="few">{0} kulomby</unitPattern>
+				<unitPattern count="many">{0} kulombów</unitPattern>
+				<unitPattern count="other">{0} kulomba</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farady</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farady</unitPattern>
+				<unitPattern count="many">{0} faradów</unitPattern>
+				<unitPattern count="other">{0} farada</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henr</unitPattern>
+				<unitPattern count="few">{0} henry</unitPattern>
+				<unitPattern count="many">{0} henrów</unitPattern>
+				<unitPattern count="other">{0} henra</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensy</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="few">{0} siemensy</unitPattern>
+				<unitPattern count="many">{0} siemensów</unitPattern>
+				<unitPattern count="other">{0} siemensa</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorie [IT]</displayName>
+				<unitPattern count="one">{0} kaloria [IT]</unitPattern>
+				<unitPattern count="few">{0} kalorie [IT]</unitPattern>
+				<unitPattern count="many">{0} kalorii [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorii [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekerele</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="few">{0} bekerele</unitPattern>
+				<unitPattern count="many">{0} bekereli</unitPattern>
+				<unitPattern count="other">{0} bekerela</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>siwerty</displayName>
+				<unitPattern count="one">{0} siwert</unitPattern>
+				<unitPattern count="few">{0} siwerty</unitPattern>
+				<unitPattern count="many">{0} siwertów</unitPattern>
+				<unitPattern count="other">{0} siwerta</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greje</displayName>
+				<unitPattern count="one">{0} grej</unitPattern>
+				<unitPattern count="few">{0} greje</unitPattern>
+				<unitPattern count="many">{0} grejów</unitPattern>
+				<unitPattern count="other">{0} greja</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramy-siła</displayName>
+				<unitPattern count="one">{0} kilogram-siła</unitPattern>
+				<unitPattern count="few">{0} kilogramy-siła</unitPattern>
+				<unitPattern count="many">{0} kilogramów-siła</unitPattern>
+				<unitPattern count="other">{0} kilograma-siła</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesle</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesle</unitPattern>
+				<unitPattern count="many">{0} tesli</unitPattern>
+				<unitPattern count="other">{0} tesli</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webery</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="few">{0} webery</unitPattern>
+				<unitPattern count="many">{0} weberów</unitPattern>
+				<unitPattern count="other">{0} webera</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
 				<displayName>światło</displayName>
@@ -9540,7 +9675,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} światła</unitPattern>
 				<unitPattern count="other" case="genitive">{0} światła</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>części na miliard</displayName>
 				<unitPattern count="one">{0} część na miliard</unitPattern>
@@ -9558,7 +9693,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noce</displayName>
 				<unitPattern count="one">{0} noc</unitPattern>
 				<unitPattern count="one" case="accusative">{0} noc</unitPattern>
 				<unitPattern count="one" case="genitive">{0} nocy</unitPattern>
@@ -9571,7 +9705,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} nocy</unitPattern>
 				<unitPattern count="other" case="accusative">{0} nocy</unitPattern>
 				<unitPattern count="other" case="genitive">{0} nocy</unitPattern>
-				<perUnitPattern>{0}/noc</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>kierunek świata</displayName>
@@ -9672,12 +9805,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} szt.</unitPattern>
 				<unitPattern count="other">{0} szt.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>część</displayName>
+				<unitPattern count="one">{0} cz.</unitPattern>
+				<unitPattern count="few">{0} cz.</unitPattern>
+				<unitPattern count="many">{0} cz.</unitPattern>
+				<unitPattern count="other">{0} cz.</unitPattern>
+			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="few">{0} mole</unitPattern>
 				<unitPattern count="many">{0} moli</unitPattern>
 				<unitPattern count="other">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -9949,7 +10092,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} Bft</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>st. C</displayName>
 				<unitPattern count="one">{0} st. C</unitPattern>
 				<unitPattern count="few">{0} st. C</unitPattern>
 				<unitPattern count="many">{0} st. C</unitPattern>
@@ -10159,6 +10301,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} kwart ang.</unitPattern>
 				<unitPattern count="other">{0} kwarty ang.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="few">{0} cal [IT]</unitPattern>
+				<unitPattern count="many">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>św.</displayName>
 				<unitPattern count="one">{0} św.</unitPattern>
@@ -10213,6 +10362,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} in²</unitPattern>
 				<perUnitPattern>{0}/in²</perUnitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>część</displayName>
+				<unitPattern count="one">{0} cz.</unitPattern>
+				<unitPattern count="few">{0} cz.</unitPattern>
+				<unitPattern count="many">{0} cz.</unitPattern>
+				<unitPattern count="other">{0} cz.</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="duration-year">
 				<displayName>r.</displayName>
 				<unitPattern count="one">{0} r.</unitPattern>
@@ -10340,20 +10499,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-barrel">
 				<displayName>bbl</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>św.</displayName>
-				<unitPattern count="one">{0} św.</unitPattern>
-				<unitPattern count="few">{0} św.</unitPattern>
-				<unitPattern count="many">{0} św.</unitPattern>
-				<unitPattern count="other">{0} św.</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>noce</displayName>
-				<unitPattern count="one">{0} noc</unitPattern>
-				<unitPattern count="few">{0} noce</unitPattern>
-				<unitPattern count="many">{0} nocy</unitPattern>
-				<unitPattern count="other">{0} nocy</unitPattern>
-				<perUnitPattern>{0}/noc</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+				<unitPattern count="one">{0} cal [IT]</unitPattern>
+				<unitPattern count="few">{0} cal [IT]</unitPattern>
+				<unitPattern count="many">{0} cal [IT]</unitPattern>
+				<unitPattern count="other">{0} cal [IT]</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/pms.xml b/make/data/cldr/common/main/pms.xml
new file mode 100644
index 00000000000..ae120e6f3f8
--- /dev/null
+++ b/make/data/cldr/common/main/pms.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="pms"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="ar">arabich</language>
+			<language type="ar_001">arabich modern stàndar</language>
+			<language type="en">inglèis</language>
+			<language type="pms">piemontèis</language>
+		</languages>
+		<scripts>
+			<script type="Latn">latin</script>
+		</scripts>
+		<territories>
+			<territory type="IT">Italia</territory>
+		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">metrico</measurementSystemName>
+			<measurementSystemName type="UK">britànico</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Lingua: {0}</codePattern>
+			<codePattern type="script">Scritura: {0}</codePattern>
+			<codePattern type="territory">Region: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[aà b c {cc} {ch} d eéèë {eu} f g {gg} {gh} iì j l m n {n\-} oò p q r s {s\-c} {ss} t uù v z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[h]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ — , ; \: ! ? . … '’ &quot;“” « » ( ) \[ \] \{ \} @ /]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>“</alternateQuotationStart>
+		<alternateQuotationEnd>”</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">gené</month>
+							<month type="2">fërvé</month>
+							<month type="3">mars</month>
+							<month type="4">avril</month>
+							<month type="5">magg</month>
+							<month type="6">giugn</month>
+							<month type="7">lugn</month>
+							<month type="8">agost</month>
+							<month type="9">stèmber</month>
+							<month type="10">utuber</month>
+							<month type="11">novèmber</month>
+							<month type="12">dzèmber</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="wide">
+							<day type="sun">dumìnica</day>
+							<day type="mon">lun-es</day>
+							<day type="tue">màrtes</day>
+							<day type="wed">merco</day>
+							<day type="thu">giòbia</day>
+							<day type="fri">vënner</day>
+							<day type="sat">saba</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<timeZoneNames>
+			<regionFormat>Ora {0}</regionFormat>
+			<regionFormat type="daylight">Ora legal: {0}</regionFormat>
+			<regionFormat type="standard">Ora stàndar: {0}</regionFormat>
+			<metazone type="GMT">
+				<long>
+					<standard>Ora dë Greenwich</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/pms_IT.xml b/make/data/cldr/common/main/pms_IT.xml
new file mode 100644
index 00000000000..21a082b9cd4
--- /dev/null
+++ b/make/data/cldr/common/main/pms_IT.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="pms"/>
+		<territory type="IT"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/prg.xml b/make/data/cldr/common/main/prg.xml
index 13e1c01ac0d..cebddbf9f73 100644
--- a/make/data/cldr/common/main/prg.xml
+++ b/make/data/cldr/common/main/prg.xml
@@ -686,6 +686,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="zero" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/ps.xml b/make/data/cldr/common/main/ps.xml
index 55a7f06f86d..660449526f5 100644
--- a/make/data/cldr/common/main/ps.xml
+++ b/make/data/cldr/common/main/ps.xml
@@ -225,6 +225,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">بفیا</language>
 			<language type="ksh">کولوګنيايي</language>
 			<language type="ku">کردي</language>
+			<language type="ku" menu="core">کردش</language>
+			<language type="ku" menu="extension">کرمانجي</language>
 			<language type="kum">کومک</language>
 			<language type="kv">کومی</language>
 			<language type="kw">کورنيشي</language>
@@ -619,6 +621,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">چین</territory>
 			<territory type="CO">کولمبیا</territory>
 			<territory type="CP">د کلپرټون ټاپو</territory>
+			<territory type="CQ">سارک</territory>
 			<territory type="CR">کوستاریکا</territory>
 			<territory type="CU">کیوبا</territory>
 			<territory type="CV">کیپ ورد</territory>
@@ -850,43 +853,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">اسعارو بڼه</key>
 			<key type="collation">ترتيب</key>
 			<key type="currency">اسعارو</key>
+			<key type="em">ایموجي پریزنټیشن</key>
 			<key type="hc">د ساعت چکر (۱۲ پرتله ۲۴)</key>
 			<key type="lb">د ماتې کرښې ډول</key>
+			<key type="lw">د کلمو دننه د کرښې وقفې</key>
 			<key type="ms">د ناپ نظام</key>
 			<key type="numbers">شمېرې</key>
+			<key type="ss">جملې وقفه د ابر څخه وروسته</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">بودايي جنتري</type>
+			<type key="calendar" type="buddhist" scope="core">بودايي</type>
 			<type key="calendar" type="chinese">د چين جنتري</type>
+			<type key="calendar" type="chinese" scope="core">چینایی</type>
 			<type key="calendar" type="coptic">کاپټیک کیلنډر</type>
+			<type key="calendar" type="coptic" scope="core">قبطي</type>
 			<type key="calendar" type="dangi">ډانګي جنتري</type>
+			<type key="calendar" type="dangi" scope="core">دانګي</type>
 			<type key="calendar" type="ethiopic">ایتوپيک جنتري</type>
+			<type key="calendar" type="ethiopic" scope="core">ایتوپیایي</type>
 			<type key="calendar" type="ethiopic-amete-alem">د ایتوپیک امیټ ایلم تقویم</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">د ایتوپیا امیټ عالم</type>
 			<type key="calendar" type="gregorian">ګريګورين جنتري</type>
+			<type key="calendar" type="gregorian" scope="core">ګریګورین</type>
 			<type key="calendar" type="hebrew">جورجویان جنتري</type>
+			<type key="calendar" type="hebrew" scope="core">ګریګوریان</type>
 			<type key="calendar" type="islamic">اسلامي جنتري</type>
+			<type key="calendar" type="islamic" scope="core">هجري</type>
 			<type key="calendar" type="islamic-civil">اسلامي جنتري (جدولي، مدني عصر)</type>
+			<type key="calendar" type="islamic-civil" scope="core">هجري (جدول، مدني دوره)</type>
 			<type key="calendar" type="islamic-tbla">اسلامي جنتري (جدولي، ستورپوهنيز عصر)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">هجري (جدول، ستورپوهنه)</type>
 			<type key="calendar" type="islamic-umalqura">اسلامي کلیزه (ام القری)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">هجري (ام القراء)</type>
 			<type key="calendar" type="iso8601">ISO-8601 جنتري</type>
 			<type key="calendar" type="japanese">جاپاني جنتري</type>
+			<type key="calendar" type="japanese" scope="core">جاپاني</type>
 			<type key="calendar" type="persian">فارسي جنتري</type>
+			<type key="calendar" type="persian" scope="core">فارسي</type>
 			<type key="calendar" type="roc">منگوو جنتري</type>
+			<type key="calendar" type="roc" scope="core">منګوو</type>
 			<type key="cf" type="account">محاسبه اسعارو بڼه</type>
+			<type key="cf" type="account" scope="core">محاسبه</type>
 			<type key="cf" type="standard">معياري اسعارو بڼه</type>
+			<type key="cf" type="standard" scope="core">معیاري</type>
 			<type key="collation" type="ducet">ډيفالټ يونيکوډ ترتيب</type>
+			<type key="collation" type="ducet" scope="core">ډیفالټ یونیکوډ</type>
 			<type key="collation" type="search">د عمومي موخي لټون</type>
+			<type key="collation" type="search" scope="core">لټون</type>
 			<type key="collation" type="standard">د معیاري لټي ترتیب</type>
+			<type key="collation" type="standard" scope="core">معیاري</type>
+			<type key="em" type="default" scope="core">ډیفالټ</type>
+			<type key="em" type="emoji" scope="core">ایموجي</type>
+			<type key="em" type="text" scope="core">متن</type>
 			<type key="hc" type="h11">د ۱۲ ساعتو نظام (۰ـ۱۱)</type>
+			<type key="hc" type="h11" scope="core">۱۲ (۰–۱۱)</type>
 			<type key="hc" type="h12">د ۱۲ ساعتو نظام (۱ ـ ۱۲)</type>
+			<type key="hc" type="h12" scope="core">۱۲ (۱–۱۲)</type>
 			<type key="hc" type="h23">د ۲۴ ساعتو نظام (۰ـ۲۳)</type>
+			<type key="hc" type="h23" scope="core">۲۴ (۰–۲۳)</type>
 			<type key="hc" type="h24">د ساعتو نظام (۱ـ۲۴)</type>
+			<type key="hc" type="h24" scope="core">۲۴ (۱–۲۴)</type>
 			<type key="lb" type="loose">د غړندې ماتې کرښې ډول</type>
-			<type key="lb" type="normal">د عادي ماتې کرښې ډول</type>
-			<type key="lb" type="strict">د سختې ماتې کرښې ډول</type>
+			<type key="lb" type="loose" scope="core">خلاص</type>
+			<type key="lb" type="normal">د عادي کرښې ماتولو طرز</type>
+			<type key="lb" type="normal" scope="core">عادي</type>
+			<type key="lb" type="strict">د سختې کرښې ماتولو طرز</type>
+			<type key="lb" type="strict" scope="core">سخت</type>
+			<type key="lw" type="breakall" scope="core">ټول مات کړئ</type>
+			<type key="lw" type="keepall" scope="core">ټول وساتئ</type>
+			<type key="lw" type="normal" scope="core">عادي</type>
+			<type key="lw" type="phrase" scope="core">په جملو کې وساتئ</type>
 			<type key="ms" type="metric">ميټرک نظام</type>
+			<type key="ms" type="metric" scope="core">میټریک</type>
 			<type key="ms" type="uksystem">امپيريل د ناپ نظام</type>
+			<type key="ms" type="uksystem" scope="core">انګلستان</type>
 			<type key="ms" type="ussystem">د متحده آيالاتو د ناپ نظام</type>
+			<type key="ms" type="ussystem" scope="core">امریکا</type>
 			<type key="numbers" type="arab">عربي - انډیک عددونه</type>
 			<type key="numbers" type="arabext">غځېدلې عربي ۔ اينډيک عدد</type>
 			<type key="numbers" type="armn">آرمينيايي اعداد</type>
@@ -927,6 +970,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">تايي اعداد</type>
 			<type key="numbers" type="tibt">تبتي اعداد</type>
 			<type key="numbers" type="vaii">وای اعداد</type>
+			<type key="ss" type="none" scope="core">بند</type>
+			<type key="ss" type="standard" scope="core">چالان</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">مېټرک</measurementSystemName>
@@ -953,9 +998,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -966,12 +1008,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE د G y د MMMM d</pattern>
+							<pattern>G y MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>د G y د MMMM d</pattern>
+							<pattern>G y MMMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -1109,6 +1151,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">نومبر</month>
 							<month type="12">دسمبر</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">ج</month>
+							<month type="2">ف</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">جنوري</month>
 							<month type="2">فېبروري</month>
@@ -1233,11 +1289,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} په {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} په {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} په {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} په {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1301,7 +1369,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="2">صفر</month>
 							<month type="3">ربيع</month>
 							<month type="4">ربيع II</month>
-							<month type="5">جماد</month>
+							<month type="5">جماد I</month>
 							<month type="6">جماد ۲</month>
 							<month type="7">رجب</month>
 							<month type="8">شعبان</month>
@@ -1311,11 +1379,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="12">ذي الحج</month>
 						</monthWidth>
 						<monthWidth type="wide">
+							<month type="1">محرم</month>
+							<month type="2">صفر</month>
+							<month type="3">ربیع اول</month>
+							<month type="4">ربيع II</month>
+							<month type="5">جمادي اول</month>
+							<month type="6">جماعه II</month>
+							<month type="7">رجب</month>
+							<month type="8">شعبان</month>
+							<month type="9">رمضان</month>
+							<month type="10">شوال</month>
+							<month type="11">ذي القعده</month>
+							<month type="12">ذي الحج</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
 							<month type="1">محرم</month>
 							<month type="2">صفر</month>
 							<month type="3">ربيع</month>
 							<month type="4">ربيع II</month>
-							<month type="5">جماعه</month>
+							<month type="5">جماد I</month>
+							<month type="6">جماد ۲</month>
+							<month type="7">رجب</month>
+							<month type="8">شعبان</month>
+							<month type="9">رمضان</month>
+							<month type="10">شوال</month>
+							<month type="11">دالقاعده</month>
+							<month type="12">ذي الحج</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">محرم</month>
+							<month type="2">صفر</month>
+							<month type="3">ربیع اول</month>
+							<month type="4">ربيع II</month>
+							<month type="5">جمادي اول</month>
 							<month type="6">جماعه II</month>
 							<month type="7">رجب</month>
 							<month type="8">شعبان</month>
@@ -1326,9 +1424,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 				</months>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y/M/d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1373,12 +1498,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="era">
 				<displayName>دور</displayName>
 			</field>
-			<field type="era-short">
-				<displayName>دور</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName>دور</displayName>
-			</field>
 			<field type="year">
 				<displayName>کال</displayName>
 				<relative type="-1">پروسږکال</relative>
@@ -1740,7 +1859,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat>د {0} په وخت</regionFormat>
+			<regionFormat>{0} وخت</regionFormat>
 			<regionFormat type="daylight">{0} رڼا ورځ وخت</regionFormat>
 			<regionFormat type="standard">{0} معیاری وخت</regionFormat>
 			<zone type="Pacific/Honolulu">
@@ -2096,6 +2215,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>ایسټر</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>کوهيک</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>پنټا آریناس</exemplarCity>
 			</zone>
@@ -2361,7 +2483,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>پنوم پن</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>انډربري</exemplarCity>
+				<exemplarCity>کانټون</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>کيريټماټي</exemplarCity>
@@ -3030,9 +3152,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>لوېديځ افريقا وخت</generic>
-					<standard>لویدیځ افریقایي معیاري وخت</standard>
-					<daylight>د افریقا افریقا لویدیځ وخت</daylight>
+					<standard>لوېديځ افريقا وخت</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3382,6 +3502,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>د ګوانانا وخت</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>هوایی الیوتین معیاری وخت</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>هوایی الیوتین وخت</generic>
@@ -3921,42 +4046,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0K ¤</pattern>
-					<pattern type="1000" count="other">0K ¤</pattern>
-					<pattern type="10000" count="one">00K ¤</pattern>
-					<pattern type="10000" count="other">00K ¤</pattern>
-					<pattern type="100000" count="one">000K ¤</pattern>
-					<pattern type="100000" count="other">000K ¤</pattern>
-					<pattern type="1000000" count="one">0M ¤</pattern>
-					<pattern type="1000000" count="other">0M ¤</pattern>
-					<pattern type="10000000" count="one">00M ¤</pattern>
-					<pattern type="10000000" count="other">00M ¤</pattern>
-					<pattern type="100000000" count="one">000M ¤</pattern>
-					<pattern type="100000000" count="other">000M ¤</pattern>
-					<pattern type="1000000000" count="one">0G ¤</pattern>
-					<pattern type="1000000000" count="other">0G ¤</pattern>
-					<pattern type="10000000000" count="one">00G ¤</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤00B</pattern>
-					<pattern type="100000000000" count="one">¤000B</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
-					<pattern type="1000000000000" count="one">0T ¤</pattern>
-					<pattern type="1000000000000" count="other">0T ¤</pattern>
-					<pattern type="10000000000000" count="one">00T ¤</pattern>
-					<pattern type="10000000000000" count="other">00T ¤</pattern>
-					<pattern type="100000000000000" count="one">000T ¤</pattern>
-					<pattern type="100000000000000" count="other">000T ¤</pattern>
+					<pattern type="1000" count="one">¤ 0K</pattern>
+					<pattern type="1000" count="other">¤ 0K</pattern>
+					<pattern type="10000" count="one">¤ 00K</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="one">¤ 000K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="one">¤ 0M</pattern>
+					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000" count="one">¤ 00M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="one">¤ 000M</pattern>
+					<pattern type="100000000" count="other">¤ 000M</pattern>
+					<pattern type="1000000000" count="one">¤ 0B</pattern>
+					<pattern type="1000000000" count="other">¤ 0B</pattern>
+					<pattern type="10000000000" count="one">¤ 00B</pattern>
+					<pattern type="10000000000" count="other">¤ 00B</pattern>
+					<pattern type="100000000000" count="one">¤ 000G</pattern>
+					<pattern type="100000000000" count="other">¤ 000B</pattern>
+					<pattern type="1000000000000" count="one">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -4039,8 +4170,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BIF">
 				<displayName>برونډي فرانک</displayName>
-				<displayName count="one">برونډي فرانک</displayName>
-				<displayName count="other">برونډي فرانکس</displayName>
 			</currency>
 			<currency type="BMD">
 				<displayName>برمودا ډالر</displayName>
@@ -4642,7 +4771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>امريکايي ډالر</displayName>
 				<displayName count="one">امريکايي ډالر</displayName>
 				<displayName count="other">امريکايي ډالرې</displayName>
-				<symbol draft="contributed">$</symbol>
+				<symbol>$</symbol>
 			</currency>
 			<currency type="UYU">
 				<displayName>يوراګوي پسو</displayName>
@@ -4678,6 +4807,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">ختيځ کربين ډالر</displayName>
 				<displayName count="other">ختيځ کربين ډالرې</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>د کارابین ګیلډر</displayName>
+				<displayName count="one">د کارابین ګیلډر</displayName>
+				<displayName count="other">د کارابین ګیلډران</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>ختيځ افريقايي CFA فرانک</displayName>
 				<displayName count="one">ختيځ افريقايي CFA فرانک</displayName>
@@ -4706,6 +4840,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">زيمبي کواچا</displayName>
 				<displayName count="other">زيمبي کواچاز</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>د زمبابوې سره زر</displayName>
+				<displayName count="one">د زمبابوې سره زر</displayName>
+				<displayName count="other">د زمبابوې سره زر</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4929,7 +5068,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-item">
 				<displayName>توکي</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>برخې</displayName>
+				<unitPattern count="one">{0} برخه</unitPattern>
+				<unitPattern count="other">{0} برخې</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>پارټتس في مليون</displayName>
 				<unitPattern count="one">{0} پارټ في مليون</unitPattern>
 				<unitPattern count="other">{0} پارټس في مليون</unitPattern>
@@ -4951,6 +5095,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مولز</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>د ګلوکوز</displayName>
+				<unitPattern count="one">د ګلوکوز {0}</unitPattern>
+				<unitPattern count="other">د ګلوکوز {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ليټرز في کيلو متر</displayName>
 				<unitPattern count="one">{0} ليټر في کيلو متر</unitPattern>
@@ -5142,6 +5291,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-therm-us">
 				<displayName>متحده ایالاتو ترمامونه</displayName>
+				<unitPattern count="one">{0} US تهرم</unitPattern>
+				<unitPattern count="other">{0} US تهرم</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
 				<displayName>د قوې پاونډز</displayName>
@@ -5304,6 +5455,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="light-lux">
 				<displayName>لکس</displayName>
 			</unit>
+			<unit type="light-candela">
+				<displayName>کینډیلا</displayName>
+				<unitPattern count="one">{0} کینډیلا</unitPattern>
+				<unitPattern count="other">{0} کینډیلا</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>لومن</displayName>
+				<unitPattern count="one">{0} لومن</unitPattern>
+				<unitPattern count="other">{0} لومن</unitPattern>
+			</unit>
 			<unit type="light-solar-luminosity">
 				<unitPattern count="one">{0} لمريز ځلښت</unitPattern>
 				<unitPattern count="other">{0} لمريز ځلښتونه</unitPattern>
@@ -5371,6 +5532,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} لمريز حجم</unitPattern>
 				<unitPattern count="other">{0} لمريز حجم</unitPattern>
 			</unit>
+			<unit type="mass-grain">
+				<displayName>دانې</displayName>
+				<unitPattern count="one">{0} دانې</unitPattern>
+				<unitPattern count="other">{0} دانې</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ګيګا واټس</displayName>
 				<unitPattern count="one">{0} ګيګا واټ</unitPattern>
@@ -5405,7 +5571,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} د پارې ملي متر</unitPattern>
 				<unitPattern count="other">{0} د پارې ملي مترز</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>د پارې</displayName>
+				<unitPattern count="one">د پارې {0}</unitPattern>
+				<unitPattern count="other">د پارې {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>پونډ - په هر مربع انچ کې ځواک</displayName>
 				<unitPattern count="one">{0} پاونډ في مربع انچ</unitPattern>
 				<unitPattern count="other">{0} پاونډز في مربع انچ</unitPattern>
 			</unit>
@@ -5414,6 +5586,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} د پارې انچ</unitPattern>
 				<unitPattern count="other">{0} د پارې انچې</unitPattern>
 			</unit>
+			<unit type="pressure-bar">
+				<displayName>بارونه</displayName>
+				<unitPattern count="one">{0} بار</unitPattern>
+				<unitPattern count="other">{0} بارونه</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<displayName>ملي بارز</displayName>
 				<unitPattern count="one">{0} ملي بار</unitPattern>
@@ -5568,6 +5745,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} میټریک کپ</unitPattern>
 				<unitPattern count="other">{0} میټریک کپ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>میټریک مایع اونس</displayName>
+				<unitPattern count="one">{0} میټریک مایع اونس</unitPattern>
+				<unitPattern count="other">{0} میټریک مایع اونس</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} اکړ فټ</unitPattern>
 				<unitPattern count="other">{0} اکړ فټ</unitPattern>
@@ -5636,11 +5818,77 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} Imp. quart</unitPattern>
 				<unitPattern count="other">{0} Imp. quart</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>شپي</displayName>
-				<unitPattern count="one">{0}/شپه</unitPattern>
-				<unitPattern count="other">{0}/شپه</unitPattern>
-				<perUnitPattern>{0}/شپه</perUnitPattern>
+			<unit type="angle-steradian">
+				<displayName>سټراډیان</displayName>
+				<unitPattern count="one">{0} سټراډیان</unitPattern>
+				<unitPattern count="other">{0} سټراډیانز</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>کاتالز</displayName>
+				<unitPattern count="one">{0} کاتال</unitPattern>
+				<unitPattern count="other">{0} کاتالز</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>کولمبونه</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>فارادونه</displayName>
+				<unitPattern count="one">{0} فاراد</unitPattern>
+				<unitPattern count="other">{0} فاراد</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>هینري</displayName>
+				<unitPattern count="one">{0} هینري</unitPattern>
+				<unitPattern count="other">{0} هینري</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>سیمنز</displayName>
+				<unitPattern count="one">{0} سیمنز</unitPattern>
+				<unitPattern count="other">{0} سیمنز</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>کالوري [IT]</displayName>
+				<unitPattern count="one">{0} کالوري [IT]</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>بیکریلز</displayName>
+				<unitPattern count="one">{0} بیکریل</unitPattern>
+				<unitPattern count="other">{0} بیکریلونه</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} سیورټ</unitPattern>
+				<unitPattern count="other">{0} سیورټونه</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>خړ</displayName>
+				<unitPattern count="one">{0} خړ</unitPattern>
+				<unitPattern count="other">{0} خړ رنګونه</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>کیلوګرامه ځواک</displayName>
+				<unitPattern count="one">{0} کیلوګرامه ځواک</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ټیسلا</displayName>
+				<unitPattern count="one">{0} ټیسلا</unitPattern>
+				<unitPattern count="other">{0} ټیسلاز</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ویبرز</displayName>
+				<unitPattern count="one">{0} ویبر</unitPattern>
+				<unitPattern count="other">{0} ویبرز</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>رڼا</displayName>
+				<unitPattern count="one">{0} رڼا</unitPattern>
+				<unitPattern count="other">{0} رڼا</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>برخې په ملیارد</displayName>
+				<unitPattern count="one">{0} برخې په ملیارد</unitPattern>
+				<unitPattern count="other">{0} برخې په ملیارد</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>کارډنل اړخ</displayName>
@@ -5677,7 +5925,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>meters²</displayName>
 			</unit>
 			<unit type="area-square-mile">
-				<displayName>sq miles</displayName>
+				<displayName>مربع ميل</displayName>
 				<unitPattern count="one">{0} sq mi</unitPattern>
 				<unitPattern count="other">{0} sq mi</unitPattern>
 			</unit>
@@ -5688,12 +5936,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>yards²</displayName>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>sq feet</displayName>
-				<unitPattern count="one">{0} sq ft</unitPattern>
-				<unitPattern count="other">{0} sq ft</unitPattern>
+				<displayName>مربع فټ</displayName>
+				<unitPattern count="one">{0} مربع فټ</unitPattern>
+				<unitPattern count="other">{0} مربع فټ</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<displayName>inches²</displayName>
+				<displayName>مربع انچ</displayName>
 			</unit>
 			<unit type="area-dunam">
 				<displayName>دونمز</displayName>
@@ -5711,7 +5959,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} توکی</unitPattern>
 				<unitPattern count="other">{0} توکی</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>برخه</displayName>
+				<unitPattern count="one">{0} برخه</unitPattern>
+				<unitPattern count="other">{0} برخه</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>پارټس/مليون</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -5728,6 +5981,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مول</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>میلونه/ګیلن</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>ميلز/ګيلن ايمپيريل</displayName>
 			</unit>
@@ -5805,7 +6064,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>amps</displayName>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName>milliamps</displayName>
+				<displayName>ملي ايمپيرز</displayName>
 			</unit>
 			<unit type="electric-ohm">
 				<displayName>اوهمز</displayName>
@@ -5830,6 +6089,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-therm-us">
 				<displayName>US تهرم</displayName>
+				<unitPattern count="one">{0} US تهرم</unitPattern>
+				<unitPattern count="other">{0} US therm</unitPattern>
 			</unit>
 			<unit type="force-pound-force">
 				<displayName>پاونډ قوه</displayName>
@@ -5869,7 +6130,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>پارسيکس</displayName>
 			</unit>
 			<unit type="length-light-year">
-				<displayName>light yrs</displayName>
+				<displayName>نوري کاله</displayName>
 			</unit>
 			<unit type="length-furlong">
 				<displayName>فرلانګونه</displayName>
@@ -5880,6 +6141,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="length-solar-radius">
 				<displayName>لمريزې وړانګې</displayName>
 			</unit>
+			<unit type="light-candela">
+				<displayName>کینډیلا</displayName>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>لومن</displayName>
+			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>لمريز ځلښتونه</displayName>
 			</unit>
@@ -5907,6 +6174,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="mass-solar-mass">
 				<displayName>لمريز حجم</displayName>
 			</unit>
+			<unit type="mass-grain">
+				<displayName>دانې</displayName>
+				<unitPattern count="one">{0} gr</unitPattern>
+				<unitPattern count="other">{0} gr</unitPattern>
+			</unit>
 			<unit type="power-watt">
 				<displayName>واټس</displayName>
 			</unit>
@@ -5915,6 +6187,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>د Hg</displayName>
+				<unitPattern count="one">{0} د Hg</unitPattern>
+				<unitPattern count="other">{0} د Hg</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>بار</displayName>
+				<unitPattern count="one">{0} بار</unitPattern>
+				<unitPattern count="other">{0} بار</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hour</displayName>
 				<unitPattern count="one">{0} kph</unitPattern>
@@ -5988,6 +6270,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-dram">
 				<displayName>ډرام مایع</displayName>
+				<unitPattern count="one">{0} ډرام</unitPattern>
+				<unitPattern count="other">{0} ډرام</unitPattern>
 			</unit>
 			<unit type="volume-jigger">
 				<displayName>جګر</displayName>
@@ -5999,8 +6283,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} چنه</unitPattern>
 				<unitPattern count="other">{0} چنه</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>p/b</displayName>
+			<unit type="concentr-katal">
+				<displayName>کات</displayName>
+				<unitPattern count="one">{0} کات</unitPattern>
+				<unitPattern count="other">{0} کات</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>رڼا</displayName>
+				<unitPattern count="one">{0} رڼا</unitPattern>
+				<unitPattern count="other">{0} رڼا</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>برخې/ملیارد</displayName>
 			</unit>
 			<unit type="duration-night">
 				<displayName>شپي</displayName>
@@ -6017,8 +6314,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="area-square-mile">
+				<displayName>مربع ميل</displayName>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ft²</displayName>
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>مربع انچ</displayName>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>برخه</displayName>
+				<unitPattern count="one">{0} برخه</unitPattern>
+				<unitPattern count="other">{0} برخه</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="one">{0}mpg</unitPattern>
+				<unitPattern count="other">{0}mpg</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>mpg UK</displayName>
+				<unitPattern count="one">{0}m/gUK</unitPattern>
+				<unitPattern count="other">{0}m/gUK</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>PB</displayName>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
 			</unit>
 			<unit type="duration-year">
 				<displayName>کال</displayName>
@@ -6054,6 +6404,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-microsecond">
 				<displayName>μsec</displayName>
 			</unit>
+			<unit type="electric-milliampere">
+				<displayName>ملي ايمپيرز</displayName>
+			</unit>
+			<unit type="energy-therm-us">
+				<unitPattern count="one">{0}US تهرم</unitPattern>
+				<unitPattern count="other">{0}US تهرم</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>lbf</displayName>
+				<unitPattern count="one">{0}lbf</unitPattern>
+				<unitPattern count="other">{0} lbf</unitPattern>
+			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<unitPattern count="one">{0} kWh/100km</unitPattern>
 				<unitPattern count="other">{0}kWh/100km</unitPattern>
@@ -6080,7 +6442,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
+			<unit type="length-light-year">
+				<displayName>نوري کاله</displayName>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>لومن</displayName>
+			</unit>
 			<unit type="light-solar-luminosity">
+				<displayName>L☉</displayName>
 				<unitPattern count="one">{0} L☉</unitPattern>
 				<unitPattern count="other">{0}L☉</unitPattern>
 			</unit>
@@ -6093,6 +6462,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}g</unitPattern>
 				<unitPattern count="other">{0}g</unitPattern>
 			</unit>
+			<unit type="mass-grain">
+				<displayName>دانې</displayName>
+				<unitPattern count="one">{0}gr</unitPattern>
+				<unitPattern count="other">{0}gr</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>د Hg</displayName>
+				<unitPattern count="one">{0} د Hg</unitPattern>
+				<unitPattern count="other">{0} د Hg</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>بار</displayName>
+				<unitPattern count="one">{0}بار</unitPattern>
+				<unitPattern count="other">{0} بار</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/hr</displayName>
 				<unitPattern count="one">{0}kph</unitPattern>
@@ -6139,14 +6523,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}dsp-Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>p/b</displayName>
+			<unit type="volume-dram">
+				<unitPattern count="one">{0}fl.dr.</unitPattern>
+				<unitPattern count="other">{0}fl.dr.</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>شپي</displayName>
-				<unitPattern count="one">{0}/شپه</unitPattern>
-				<unitPattern count="other">{0}/شپه</unitPattern>
-				<perUnitPattern>{0}/شپه</perUnitPattern>
+			<unit type="concentr-katal">
+				<displayName>کات</displayName>
+				<unitPattern count="one">{0} کات</unitPattern>
+				<unitPattern count="other">{0} کات</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>رڼا</displayName>
+				<unitPattern count="one">{0}رڼا</unitPattern>
+				<unitPattern count="other">{0}رڼا</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}خ</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/ps_PK.xml b/make/data/cldr/common/main/ps_PK.xml
index 4eac726eaa2..c8e19898c73 100644
--- a/make/data/cldr/common/main/ps_PK.xml
+++ b/make/data/cldr/common/main/ps_PK.xml
@@ -167,6 +167,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>د فرانسے سویل او انټارټيک وخت</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<daylight>هوایی الیوتین رڼا ورځے وخت</daylight>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<daylight>هوایی الیوتین رڼا ورځے وخت</daylight>
diff --git a/make/data/cldr/common/main/pt.xml b/make/data/cldr/common/main/pt.xml
index 43027cd50d0..abafafc69a6 100644
--- a/make/data/cldr/common/main/pt.xml
+++ b/make/data/cldr/common/main/pt.xml
@@ -205,7 +205,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="haw">havaiano</language>
 			<language type="hax">haida do sul</language>
 			<language type="he">hebraico</language>
-			<language type="hi">híndi</language>
+			<language type="hi">hindi</language>
+			<language type="hi_Latn">hindi (latim)</language>
 			<language type="hi_Latn" alt="variant">hinglish</language>
 			<language type="hil">hiligaynon</language>
 			<language type="hit">hitita</language>
@@ -283,6 +284,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">curdo</language>
+			<language type="ku" menu="core">curdo</language>
+			<language type="ku" menu="extension">curmânji</language>
 			<language type="kum">kumyk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -817,6 +820,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Colômbia</territory>
 			<territory type="CP">Ilha de Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -1101,33 +1105,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Classificação numérica</key>
 			<key type="colStrength">Prioridade da classificação</key>
 			<key type="currency">Moeda</key>
+			<key type="em">Tipo de emoji</key>
 			<key type="hc">Ciclo de horário (12 vs. 24)</key>
 			<key type="lb">Estilo de quebra de linha</key>
+			<key type="lw">Quebras de linha em palavras</key>
 			<key type="ms">Sistema de medição</key>
 			<key type="numbers">Números</key>
+			<key type="ss">Espaço após abreviação</key>
 			<key type="timezone">Fuso horário</key>
 			<key type="va">Variante de localidade</key>
 			<key type="x">Uso privado</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Calendário Budista</type>
+			<type key="calendar" type="buddhist" scope="core">Budista</type>
 			<type key="calendar" type="chinese">Calendário Chinês</type>
+			<type key="calendar" type="chinese" scope="core">Chinês</type>
 			<type key="calendar" type="coptic">Calendário Copta</type>
+			<type key="calendar" type="coptic" scope="core">Copta</type>
 			<type key="calendar" type="dangi">Calendário Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Calendário Etíope</type>
-			<type key="calendar" type="ethiopic-amete-alem">Calendário Amete Alem da Etiópia</type>
+			<type key="calendar" type="ethiopic" scope="core">Etíope</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calendário Amete Alem Etíope</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem Etíope</type>
 			<type key="calendar" type="gregorian">Calendário Gregoriano</type>
+			<type key="calendar" type="gregorian" scope="core">Gregoriano</type>
 			<type key="calendar" type="hebrew">Calendário Hebraico</type>
+			<type key="calendar" type="hebrew" scope="core">Hebraico</type>
 			<type key="calendar" type="indian">Calendário Nacional Indiano</type>
 			<type key="calendar" type="islamic">Calendário Hegírico</type>
+			<type key="calendar" type="islamic" scope="core">Hegírico</type>
 			<type key="calendar" type="islamic-civil">Calendário Hegírico (tabular, época civil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hegírico (tabular, época civil)</type>
 			<type key="calendar" type="islamic-umalqura">Calendário Hegírico (Umm al‑Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hegírico (Umm al‑Qura)</type>
 			<type key="calendar" type="iso8601">Calendário ISO-8601</type>
 			<type key="calendar" type="japanese">Calendário Japonês</type>
+			<type key="calendar" type="japanese" scope="core">Japonês</type>
 			<type key="calendar" type="persian">Calendário Persa</type>
+			<type key="calendar" type="persian" scope="core">Persa</type>
 			<type key="calendar" type="roc">Calendário da República da China</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Formato de moeda para contabilidade</type>
+			<type key="cf" type="account" scope="core">Contabilidade</type>
 			<type key="cf" type="standard">Formato de moeda padrão</type>
+			<type key="cf" type="standard" scope="core">Padrão</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Classificar símbolos</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Classificar ignorando símbolos</type>
 			<type key="colBackwards" type="no" draft="contributed">Classificar acentos normalmente</type>
@@ -1137,22 +1160,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Classificar por maiúsculas</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Classificação sem diferenciação de maiúsculas e minúsculas</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Classificação com diferenciação de maiúsculas e minúsculas</type>
-			<type key="collation" type="big5han">Ordem do Chinês Tradicional - Big5</type>
 			<type key="collation" type="compat">Ordem anterior, para compatibilidade</type>
+			<type key="collation" type="compat" scope="core">Compatibilidade</type>
 			<type key="collation" type="dictionary">Ordem do dicionário</type>
+			<type key="collation" type="dictionary" scope="core">Dicionário</type>
 			<type key="collation" type="ducet">Ordem padrão do Unicode</type>
+			<type key="collation" type="ducet" scope="core">Padrão do Unicode</type>
 			<type key="collation" type="eor" draft="contributed">Regras europeias de ordenação</type>
-			<type key="collation" type="gb2312han">Ordem do Chinês Simplificado - GB2312</type>
 			<type key="collation" type="phonebook">Ordem de lista telefônica</type>
+			<type key="collation" type="phonebook" scope="core">Lista telefônica</type>
 			<type key="collation" type="phonetic">Ordem de classificação fonética</type>
+			<type key="collation" type="phonetic" scope="core">Fonética</type>
 			<type key="collation" type="pinyin">Ordem Pin-yin</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Pesquisa de uso geral</type>
+			<type key="collation" type="search" scope="core">Pesquisa</type>
 			<type key="collation" type="searchjl" draft="contributed">Pesquisar por consonante inicial hangul</type>
 			<type key="collation" type="standard">Ordem padrão</type>
+			<type key="collation" type="standard" scope="core">Padrão</type>
 			<type key="collation" type="stroke">Ordem dos traços</type>
+			<type key="collation" type="stroke" scope="core">Traços</type>
 			<type key="collation" type="traditional">Ordem tradicional</type>
+			<type key="collation" type="traditional" scope="core">Tradicional</type>
 			<type key="collation" type="unihan">Ordem por Radical-Traços</type>
+			<type key="collation" type="unihan" scope="core">Radical-Traços</type>
 			<type key="collation" type="zhuyin">Ordem Zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Classificar sem normalização</type>
 			<type key="colNormalization" type="yes" draft="contributed">Classificar Unicode normalizado</type>
 			<type key="colNumeric" type="no" draft="contributed">Classificar dígitos individualmente</type>
@@ -1165,18 +1198,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Largura inteira</type>
 			<type key="d0" type="hwidth">Meia largura</type>
 			<type key="d0" type="npinyin" draft="contributed">Numérico</type>
+			<type key="em" type="default" scope="core">Padrão</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Texto</type>
 			<type key="hc" type="h11">Sistema de 12 horas (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Sistema de 12 horas (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Sistema de 24 horas (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Sistema de 24 horas (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Quebra de linha com estilo solto</type>
+			<type key="lb" type="loose" scope="core">Solto</type>
 			<type key="lb" type="normal">Quebra de linha com estilo normal</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Quebra de linha com estilo estrito</type>
+			<type key="lb" type="strict" scope="core">Estrito</type>
+			<type key="lw" type="breakall" scope="core">Quebrar tudo</type>
+			<type key="lw" type="keepall" scope="core">Manter tudo</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Manter em frases</type>
 			<type key="m0" type="bgn">Transliteração BGN EUA</type>
 			<type key="m0" type="ungegn">Transliteração UN GEGN</type>
 			<type key="ms" type="metric">Sistema métrico</type>
+			<type key="ms" type="metric" scope="core">Métrico</type>
 			<type key="ms" type="uksystem">Sistema de medição imperial</type>
+			<type key="ms" type="uksystem" scope="core">Reino Unido</type>
 			<type key="ms" type="ussystem">Sistema de medição americano</type>
+			<type key="ms" type="ussystem" scope="core">EUA</type>
 			<type key="numbers" type="arab">Algarismos indo-arábicos</type>
 			<type key="numbers" type="arabext">Algarismos indo-arábicos estendidos</type>
 			<type key="numbers" type="armn">Algarismos armênios</type>
@@ -1221,6 +1271,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Algarismos tibetanos</type>
 			<type key="numbers" type="traditional" draft="contributed">Numerais tradicionais</type>
 			<type key="numbers" type="vaii">Algarismos vai</type>
+			<type key="ss" type="none" scope="core">Desativado</type>
+			<type key="ss" type="standard" scope="core">Ativado</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">métrico</measurementSystemName>
@@ -1265,9 +1317,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1394,6 +1443,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'às' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'às' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1402,6 +1454,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'às' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'às' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1410,6 +1465,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1418,19 +1476,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d 'de' MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h', v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d 'de' MMM</dateFormatItem>
@@ -1721,6 +1787,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'às' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'às' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1729,6 +1798,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'às' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'às' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1737,6 +1809,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1745,23 +1820,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, MM/dd/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d 'de' MMM 'de' y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h', v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd/MM</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
@@ -1788,11 +1871,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1838,7 +1919,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1863,7 +1943,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2372,15 +2451,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Anguila</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="America/Argentina/Tucuman">
 				<exemplarCity>Tucumã</exemplarCity>
 			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
@@ -2405,30 +2478,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity>Bermudas</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>Fernando de Noronha</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
@@ -2438,12 +2487,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Ilha de Páscoa</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Coihaique</exemplarCity>
+			</zone>
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Xangai</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Cabo Verde</exemplarCity>
 			</zone>
@@ -2453,9 +2502,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praga</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berlim</exemplarCity>
 			</zone>
@@ -2468,15 +2514,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Algiers">
 				<exemplarCity>Argel</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
 			<zone type="America/Guayaquil">
 				<exemplarCity>Guaiaquil</exemplarCity>
 			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Canárias</exemplarCity>
 			</zone>
@@ -2567,14 +2607,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Nairóbi</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Ilha de Canton</exemplarCity>
 			</zone>
 			<zone type="Pacific/Tarawa">
 				<exemplarCity>Taraua</exemplarCity>
 			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comores</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>São Cristóvão</exemplarCity>
 			</zone>
@@ -2629,9 +2666,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Mexico_City">
 				<exemplarCity>Cidade do México</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="America/Managua">
 				<exemplarCity>Manágua</exemplarCity>
 			</zone>
@@ -2704,9 +2738,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Riade</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Cartum</exemplarCity>
 			</zone>
@@ -2728,12 +2759,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damasco</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Duchambe</exemplarCity>
 			</zone>
@@ -2825,9 +2850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Horário da África Ocidental</generic>
-					<standard>Horário Padrão da África Ocidental</standard>
-					<daylight>Horário de Verão da África Ocidental</daylight>
+					<standard>Horário da África Ocidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3220,6 +3243,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Horário da Guiana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Horário Padrão do Havaí e Ilhas Aleutas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Horário do Havaí e Ilhas Aleutas</generic>
@@ -3670,6 +3698,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Horário de Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Horário da Turquia</generic>
+					<standard>Horário Padrão da Turquia</standard>
+					<daylight>Horário de Verão da Turquia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Horário do Turcomenistão</generic>
@@ -5226,6 +5261,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Dólar do Caribe Oriental</displayName>
 				<displayName count="other">Dólares do Caribe Oriental</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Florim do Caribe</displayName>
+				<displayName count="one">Florim do Caribe</displayName>
+				<displayName count="other">Florins do Caribe</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Direitos Especiais de Giro</displayName>
 				<displayName count="one">Direitos de desenho especiais</displayName>
@@ -5344,6 +5384,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Dólar do Zimbábue</displayName>
 				<displayName count="other">Dólares do Zimbábue</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Ouro zimbabueano</displayName>
+				<displayName count="one">Ouro zimbabueano</displayName>
+				<displayName count="other">Ouros zimbabueanos</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Dólar do Zimbábue (2009)</displayName>
 				<displayName count="one">Dólar do Zimbábue (2009)</displayName>
@@ -5598,7 +5643,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>masculine</gender>
 				<displayName>itens</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>partes</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} partes</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>partes por milhão</displayName>
 				<unitPattern count="one">{0} parte por milhão</unitPattern>
@@ -5625,6 +5675,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} mols</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de glicose</displayName>
+				<unitPattern count="one">{0} de glicose</unitPattern>
+				<unitPattern count="other">{0} de glicose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litros por quilômetro</displayName>
@@ -6206,6 +6261,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milímetro de mercúrio</unitPattern>
 				<unitPattern count="other">{0} milímetros de mercúrio</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de mercúrio</displayName>
+				<unitPattern count="one">{0} de mercúrio</unitPattern>
+				<unitPattern count="other">{0} de mercúrio</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libras por polegada quadrada</displayName>
 				<unitPattern count="one">{0} libra por polegada quadrada</unitPattern>
@@ -6405,6 +6465,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} xícara métrica</unitPattern>
 				<unitPattern count="other">{0} xícaras métricas</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} onça fluida métrica</unitPattern>
+				<unitPattern count="other">{0} onças fluidas métricas</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} bushel</unitPattern>
 				<unitPattern count="other">{0} bushels</unitPattern>
@@ -6501,13 +6565,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} quarto imperial</unitPattern>
 				<unitPattern count="other">{0} quartos imperiais</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>esterradianos</displayName>
+				<unitPattern count="one">{0} esterradiano</unitPattern>
+				<unitPattern count="other">{0} esterradianos</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorias [IT]</displayName>
+				<unitPattern count="one">{0} caloria [IT]</unitPattern>
+				<unitPattern count="other">{0} calorias [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becqueréis</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becqueréis</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>quilogramas-força</displayName>
+				<unitPattern count="one">{0} quilograma-força</unitPattern>
+				<unitPattern count="other">{0} quilogramas-força</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>luz</displayName>
-				<unitPattern count="one">{0} luz</unitPattern>
-				<unitPattern count="other">{0} luzes</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>partes por bilhão</displayName>
 				<unitPattern count="one">{0} parte por bilhão</unitPattern>
@@ -6515,9 +6641,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noites</displayName>
-				<unitPattern count="one">{0} noite</unitPattern>
-				<unitPattern count="other">{0} noites</unitPattern>
 				<perUnitPattern>{0} por noite</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6601,7 +6724,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} item</unitPattern>
 				<unitPattern count="other">{0} itens</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} parte</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes/milhão</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6613,6 +6741,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>ponto base</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litros/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6881,6 +7012,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<unitPattern count="one">{0} bar</unitPattern>
 				<unitPattern count="other">{0} bars</unitPattern>
@@ -7043,12 +7179,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} impqt</unitPattern>
 				<unitPattern count="other">{0} impqt</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>luz</displayName>
 				<unitPattern count="one">{0} luz</unitPattern>
 				<unitPattern count="other">{0} luzes</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes/bilhão</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7112,7 +7251,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<displayName>mmol/l</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="other">{0} parte</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -7124,6 +7268,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 			</unit>
@@ -7296,6 +7443,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>watt</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-millibar">
 				<unitPattern count="one">{0} mb</unitPattern>
 				<unitPattern count="other">{0} mb</unitPattern>
@@ -7347,16 +7499,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} fl. oz.</unitPattern>
 				<unitPattern count="other">{0} fl. oz.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>luz</displayName>
-				<unitPattern count="one">{0} luz</unitPattern>
-				<unitPattern count="other">{0} luzes</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>noites</displayName>
-				<unitPattern count="one">{0} noite</unitPattern>
-				<unitPattern count="other">{0} noites</unitPattern>
-				<perUnitPattern>{0}/noite</perUnitPattern>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}L</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/pt_PT.xml b/make/data/cldr/common/main/pt_PT.xml
index 81f0ef80a2c..b23a9da416b 100644
--- a/make/data/cldr/common/main/pt_PT.xml
+++ b/make/data/cldr/common/main/pt_PT.xml
@@ -64,7 +64,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="grc">grego clássico</language>
 			<language type="gsw">alemão suíço</language>
 			<language type="ha">haúça</language>
-			<language type="hi">hindi</language>
 			<language type="hy">arménio</language>
 			<language type="ikt">inuktitut canadiano ocidental</language>
 			<language type="kbd">cabardiano</language>
@@ -262,14 +261,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="calendar" type="dangi">Calendário dangi</type>
 			<type key="calendar" type="ethiopic">Calendário etíope</type>
 			<type key="calendar" type="ethiopic-amete-alem">Calendário etíope Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etíope Amete Alem</type>
 			<type key="calendar" type="gregorian">Calendário gregoriano</type>
 			<type key="calendar" type="hebrew">Calendário hebraico</type>
 			<type key="calendar" type="indian" draft="contributed">Calendário nacional indiano</type>
 			<type key="calendar" type="islamic">Calendário hegírico</type>
 			<type key="calendar" type="islamic-civil">Calendário hegírico (civil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hegírico (civil)</type>
 			<type key="calendar" type="islamic-umalqura">Calendário hegírico (Umm al-Qura)</type>
 			<type key="calendar" type="japanese">Calendário japonês</type>
 			<type key="calendar" type="persian">Calendário persa</type>
+			<type key="calendar" type="roc" scope="core">República da China</type>
 			<type key="cf" type="account">Formato monetário contabilístico</type>
 			<type key="cf" type="standard">Formato monetário padrão</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordenar símbolos</type>
@@ -281,14 +283,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Ordenar por maiúsculas</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ordenar insensível a maiúsculas/minúsculas</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Ordenar sensível a maiúsculas/minúsculas</type>
-			<type key="collation" type="big5han">Ordem do chinês tradicional - Big5</type>
+			<type key="collation" type="ducet" scope="core">Unicode padrão</type>
 			<type key="collation" type="eor" draft="contributed">Regras de ordenação europeias</type>
-			<type key="collation" type="gb2312han">Ordem do chinês simplificado - GB2312</type>
 			<type key="collation" type="phonebook">Ordem da lista telefónica</type>
+			<type key="collation" type="phonebook" scope="core">Lista telefónica</type>
 			<type key="collation" type="pinyin">Ordem de pinyin</type>
 			<type key="collation" type="standard">Ordenação padrão</type>
 			<type key="collation" type="stroke">Ordem por traços</type>
 			<type key="collation" type="unihan">Ordem por radical e traços</type>
+			<type key="collation" type="unihan" scope="core">Radical e traços</type>
 			<type key="collation" type="zhuyin">Ordem de zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Ordenar sem normalização</type>
 			<type key="colNormalization" type="yes" draft="contributed">Ordenar Unicode normalizado</type>
@@ -301,11 +304,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colStrength" type="tertiary" draft="contributed">Ordenar acentos/tipo de letra/largura</type>
 			<type key="d0" type="fwidth">Largura completa</type>
 			<type key="lb" type="loose">Estilo flexível de quebra de linha</type>
+			<type key="lb" type="loose" scope="core">Flexível</type>
 			<type key="lb" type="normal">Estilo padrão de quebra de linha</type>
+			<type key="lb" type="normal" scope="core">Padrão</type>
 			<type key="lb" type="strict">Estilo estrito de quebra de linha</type>
+			<type key="lw" type="breakall" scope="core">Desfazer tudo</type>
+			<type key="lw" type="normal" scope="core">Padrão</type>
+			<type key="lw" type="phrase" scope="core">Manter nas frases</type>
 			<type key="m0" type="bgn">Transliteração BGN</type>
 			<type key="m0" type="ungegn">Transliteração UNGEGN</type>
 			<type key="ms" type="uksystem">Sistema de medida imperial</type>
+			<type key="ms" type="uksystem" scope="core">RU</type>
 			<type key="ms" type="ussystem">Sistema de medida americano</type>
 			<type key="numbers" type="arabext">Algarismos indo-arábicos expandidos</type>
 			<type key="numbers" type="armn">Numeração arménia</type>
@@ -470,6 +479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MM/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d/MM/y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d/MM/y G</dateFormatItem>
@@ -687,6 +697,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="MMMd">d/MM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d/MM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">ccc, d 'de' MMMM</dateFormatItem>
@@ -1208,12 +1220,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora Coordenada Universal</standard>
 				</long>
 			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity>Localização desconhecida</exemplarCity>
+			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erevan</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Estação Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Terra de Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Estação Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Estação Showa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Estação Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Estação Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Estação Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Estação Dumont-d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Estação McMurdo</exemplarCity>
+			</zone>
 			<zone type="America/Argentina/Tucuman">
 				<exemplarCity>Tucumán</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Ilha Macquarie</exemplarCity>
+			</zone>
 			<zone type="Australia/Lord_Howe">
 				<exemplarCity>Ilha de Lord Howe</exemplarCity>
 			</zone>
@@ -1226,9 +1271,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Porto-Novo">
 				<exemplarCity>Porto-Novo</exemplarCity>
 			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaina</exemplarCity>
-			</zone>
 			<zone type="America/Bahia">
 				<exemplarCity>Baía</exemplarCity>
 			</zone>
@@ -1250,9 +1292,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Christmas">
 				<exemplarCity>Ilha do Natal</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Busingen</exemplarCity>
-			</zone>
 			<zone type="Africa/Djibouti">
 				<exemplarCity>Jibuti</exemplarCity>
 			</zone>
@@ -1262,6 +1301,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Dominica">
 				<exemplarCity>Domínica</exemplarCity>
 			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Ilhas Galápagos</exemplarCity>
+			</zone>
 			<zone type="Europe/Tallinn">
 				<exemplarCity>Talim</exemplarCity>
 			</zone>
@@ -1293,6 +1335,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Hora de verão da Irlanda</daylight>
 				</long>
 			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>Arquipélago de Chagos</exemplarCity>
+			</zone>
 			<zone type="Asia/Baghdad">
 				<exemplarCity>Bagdade</exemplarCity>
 			</zone>
@@ -1305,6 +1350,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Nairobi">
 				<exemplarCity>Nairobi</exemplarCity>
 			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Ilha Canton</exemplarCity>
+			</zone>
 			<zone type="Pacific/Tarawa">
 				<exemplarCity>Tarawa</exemplarCity>
 			</zone>
@@ -1329,6 +1377,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Monaco">
 				<exemplarCity>Mónaco</exemplarCity>
 			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>Atol de Kwajalein</exemplarCity>
+			</zone>
 			<zone type="Africa/Bamako">
 				<exemplarCity>Bamaco</exemplarCity>
 			</zone>
@@ -1350,6 +1401,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Niamey">
 				<exemplarCity>Niamei</exemplarCity>
 			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Ilha Norfolk</exemplarCity>
+			</zone>
 			<zone type="Europe/Amsterdam">
 				<exemplarCity>Amesterdão</exemplarCity>
 			</zone>
@@ -1357,7 +1411,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Catmandu</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity>Chatham</exemplarCity>
+				<exemplarCity>Ilhas Chatham</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>Ilhas Marquesas</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
 				<exemplarCity>Carachi</exemplarCity>
@@ -1371,9 +1428,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Moscow">
 				<exemplarCity>Moscovo</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahe</exemplarCity>
-			</zone>
 			<zone type="Europe/San_Marino">
 				<exemplarCity>São Marinho</exemplarCity>
 			</zone>
@@ -1386,6 +1440,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Ndjamena">
 				<exemplarCity>Ndjamena</exemplarCity>
 			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>Ilhas Kerguelen</exemplarCity>
+			</zone>
 			<zone type="Asia/Bangkok">
 				<exemplarCity>Banguecoque</exemplarCity>
 			</zone>
@@ -1401,6 +1458,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Kampala">
 				<exemplarCity>Campala</exemplarCity>
 			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Atol de Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Ilha Wake</exemplarCity>
+			</zone>
 			<zone type="America/New_York">
 				<exemplarCity>Nova Iorque</exemplarCity>
 			</zone>
@@ -1453,9 +1516,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Hora da África Ocidental</generic>
-					<standard>Hora padrão da África Ocidental</standard>
-					<daylight>Hora de verão da África Ocidental</daylight>
+					<standard>Hora da África Ocidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1521,9 +1582,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Hora de Apia</generic>
-					<standard>Hora padrão de Apia</standard>
-					<daylight>Hora de verão de Apia</daylight>
+					<generic>Hora de Samoa</generic>
+					<standard>Hora padrão de Samoa</standard>
+					<daylight>Hora de verão de Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -1653,7 +1714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Hora do Brunei Darussalam</standard>
+					<standard>Hora do Brunei</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -1868,6 +1929,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora da Guiana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hora padrão do Havai e Aleutas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hora do Havai e Aleutas</generic>
@@ -1884,7 +1950,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic>Hora de Hovd</generic>
+					<generic>Hora de Khovd</generic>
 					<standard>Hora padrão de Hovd</standard>
 					<daylight>Hora de verão de Hovd</daylight>
 				</long>
@@ -2208,12 +2274,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Hora de Ponape</standard>
+					<standard>Hora de Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>Hora de Pyongyang</standard>
+					<standard>Hora da Coreia do Norte</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -2249,9 +2315,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Hora de Samoa</generic>
-					<standard>Hora padrão de Samoa</standard>
-					<daylight>Hora de verão de Samoa</daylight>
+					<generic>Hora de Samoa Americana</generic>
+					<standard>Hora padrão de Samoa Americana</standard>
+					<daylight>Hora de verão de Samoa Americana</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -2291,9 +2357,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Hora de Taipé</generic>
-					<standard>Hora padrão de Taipé</standard>
-					<daylight>Hora de verão de Taipé</daylight>
+					<generic>Hora de Taiwan</generic>
+					<standard>Hora padrão de Taiwan</standard>
+					<daylight>Hora de verão de Taiwan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -2318,6 +2384,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora de Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">Hora da Turquia</generic>
+					<standard draft="contributed">Hora Padrão da Turquia</standard>
+					<daylight draft="contributed">Hora de Verão da Turquia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Hora do Turquemenistão</generic>
@@ -2461,10 +2534,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -2488,12 +2562,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000000000" count="other">00 mM ¤</pattern>
 					<pattern type="100000000000" count="one">000 mM ¤</pattern>
 					<pattern type="100000000000" count="other">000 mM ¤</pattern>
-					<pattern type="1000000000000" count="one">0 B ¤</pattern>
-					<pattern type="1000000000000" count="other">0 B ¤</pattern>
-					<pattern type="10000000000000" count="one">00 B ¤</pattern>
-					<pattern type="10000000000000" count="other">00 B ¤</pattern>
-					<pattern type="100000000000000" count="one">000 B ¤</pattern>
-					<pattern type="100000000000000" count="other">000 B ¤</pattern>
+					<pattern type="1000000000000" count="one">0 Bi ¤</pattern>
+					<pattern type="1000000000000" count="other">0 Bi ¤</pattern>
+					<pattern type="10000000000000" count="one">00 Bi ¤</pattern>
+					<pattern type="10000000000000" count="other">00 Bi ¤</pattern>
+					<pattern type="100000000000000" count="one">000 Bi ¤</pattern>
+					<pattern type="100000000000000" count="other">000 Bi ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -3329,6 +3403,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dólar das Caraíbas Orientais</displayName>
 				<displayName count="other">dólares das Caraíbas Orientais</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>florim caribenho</displayName>
+				<displayName count="one">florim caribenho</displayName>
+				<displayName count="other">florins caribenhos</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName count="one" draft="provisional">direito especial de saque</displayName>
 				<displayName count="other" draft="provisional">direitos especiais de saque</displayName>
@@ -3383,6 +3462,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName draft="unconfirmed">Dólar do Zimbabwe</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ouro zimbabuense</displayName>
+				<displayName count="one">ouro zimbabuense</displayName>
+				<displayName count="other">ouros zimbabuenses</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="range">{0} - {1}</pattern>
@@ -3616,6 +3700,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} chávena métrica</unitPattern>
 				<unitPattern count="other">{0} chávenas métricas</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>onças fluidas métricas</displayName>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-pés</displayName>
 				<unitPattern count="one">{0} acre-pé</unitPattern>
@@ -3632,7 +3719,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} dracma</unitPattern>
 				<unitPattern count="other">{0} dracmas</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes por mil milhões</displayName>
 				<unitPattern count="one">{0} parte por mil milhões</unitPattern>
 				<unitPattern count="other">{0} partes por mil milhões</unitPattern>
@@ -3744,8 +3831,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>metros</displayName>
 			</unit>
 			<unit type="length-mile">
-				<unitPattern count="one">{0} milha</unitPattern>
-				<unitPattern count="other">{0} milhas</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>polegadas</displayName>
@@ -3867,7 +3954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} quarto imp.</unitPattern>
 				<unitPattern count="other">{0} quartos imp.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes/mil milhões</displayName>
 				<unitPattern count="one">{0} ppmm</unitPattern>
 				<unitPattern count="other">{0} ppmm</unitPattern>
@@ -3975,10 +4062,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-dram">
 				<displayName>dram fl</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ppmm</displayName>
-				<unitPattern count="one">{0} ppmm</unitPattern>
-				<unitPattern count="other">{0} ppmm</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/qu.xml b/make/data/cldr/common/main/qu.xml
index e6fda4e4aca..e0c664f1a7e 100644
--- a/make/data/cldr/common/main/qu.xml
+++ b/make/data/cldr/common/main/qu.xml
@@ -41,6 +41,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">Azerbaiyano Simi</language>
 			<language type="az" alt="short">Azerí Simi</language>
 			<language type="ba">Baskir Simi</language>
+			<language type="bal">Baluchi Simi</language>
 			<language type="ban">Balines Simi</language>
 			<language type="bas">Basaa Simi</language>
 			<language type="be">Bielorruso Simi</language>
@@ -48,10 +49,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bez">Bena Simi</language>
 			<language type="bg">Bulgaro Simi</language>
 			<language type="bgc">Haryanvi</language>
-			<language type="bho">Bhojpuri</language>
+			<language type="bho">Bhojpuri Simi</language>
 			<language type="bi">Bislama</language>
 			<language type="bin">Bini</language>
 			<language type="bla">Siksiká Simi</language>
+			<language type="blo">Anii Simi</language>
 			<language type="bm">Bambara Simi</language>
 			<language type="bn">Bangla Simi</language>
 			<language type="bo">Tibetano Simi</language>
@@ -164,6 +166,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="iba">Iban Simi</language>
 			<language type="ibb">Ibibio Simi</language>
 			<language type="id">Indonesio Simi</language>
+			<language type="ie">Interlingue Simi</language>
 			<language type="ig">Igbo Simi</language>
 			<language type="ii">Yi Simi</language>
 			<language type="ikt">Inuktitut Simi (Canadá occidental)</language>
@@ -212,10 +215,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafia Simi</language>
 			<language type="ksh">Kölsch Simi</language>
 			<language type="ku">Kurdo Simi</language>
+			<language type="ku" menu="core">Kurdo Simi</language>
+			<language type="ku" menu="extension">Kurmanji Simi</language>
 			<language type="kum">Kumyk Simi</language>
 			<language type="kv">Komi Simi</language>
 			<language type="kw">Córnico Simi</language>
 			<language type="kwk">Kwakʼwala Simi</language>
+			<language type="kxv">Kuvi Simi</language>
 			<language type="ky">Kirghiz Simi</language>
 			<language type="la">Latín Simi</language>
 			<language type="lad">Ladino Simi</language>
@@ -224,8 +230,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lez">Lezghian Simi</language>
 			<language type="lg">Luganda Simi</language>
 			<language type="li">Limburgues Simi</language>
+			<language type="lij">Liguria Simi</language>
 			<language type="lil">Lillooet Simi</language>
 			<language type="lkt">Lakota Simi</language>
+			<language type="lmo">Lombardo Simi</language>
 			<language type="ln">Lingala Simi</language>
 			<language type="lo">Lao Simi</language>
 			<language type="lou">Luisiana Criollo</language>
@@ -267,7 +275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ms">Malayo Simi</language>
 			<language type="mt">Maltes Simi</language>
 			<language type="mua">Mundang Simi</language>
-			<language type="mul">Idiomas M´últiples Simi</language>
+			<language type="mul">Achka simikuna</language>
 			<language type="mus">Muscogee Simi</language>
 			<language type="mwl">Mirandés Simi</language>
 			<language type="my">Birmano Simi</language>
@@ -375,6 +383,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sw_CD">Suajili Simi (Congo (RDC))</language>
 			<language type="swb">Comorian Simi</language>
 			<language type="syr">Siriaco Simi</language>
+			<language type="szl">Silesiano</language>
 			<language type="ta">Tamil Simi</language>
 			<language type="tce">Tutchone Meridional</language>
 			<language type="te">Telugu Simi</language>
@@ -414,7 +423,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="uz">Uzbeko Simi</language>
 			<language type="vai">Vai Simi</language>
 			<language type="ve">Venda Simi</language>
+			<language type="vec">Veneciamanta</language>
 			<language type="vi">Vietnamita Simi</language>
+			<language type="vmw">Makhuwa Simi</language>
 			<language type="vo">Volapük Simi</language>
 			<language type="vun">Vunjo Simi</language>
 			<language type="wa">Valona Simi</language>
@@ -425,6 +436,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="wuu">Wu Chino</language>
 			<language type="xal">Kalmyk Simi</language>
 			<language type="xh">Isixhosa Simi</language>
+			<language type="xnr">Kangri Simi</language>
 			<language type="xog">Soga Simi</language>
 			<language type="yav">Yangben Simi</language>
 			<language type="ybb">Yemba Simi</language>
@@ -433,6 +445,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="yrl">Nheengatu Simi</language>
 			<language type="yue">Cantonés Simi</language>
 			<language type="yue" alt="menu">Chino Cantonés Simi</language>
+			<language type="za">Zhuang</language>
 			<language type="zgh">Bereber Marroquí Estándar Simi</language>
 			<language type="zh">Chino Simi</language>
 			<language type="zh" alt="menu">Chino Mandarín Simi</language>
@@ -589,6 +602,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">China</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Isla Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -814,42 +828,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Imayna Qullqi kaynin</key>
 			<key type="collation">Ñiqinchana</key>
 			<key type="currency">qullqi</key>
+			<key type="em">Emoji nisqamanta rikuchiy</key>
 			<key type="hc">Ciclo de Horas (12 vs 24)</key>
 			<key type="lb">Siqi paway kaynin</key>
+			<key type="lw">Simikuna ukhupi Chiru Pakikuna</key>
 			<key type="ms">Tupuy Kamay</key>
 			<key type="numbers">Yupaykuna</key>
+			<key type="ss">Oración Pakikuy Abbr.</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Budista Intiwatana</type>
+			<type key="calendar" type="buddhist" scope="core">Buddhist</type>
 			<type key="calendar" type="chinese">Chino Intiwatana</type>
+			<type key="calendar" type="chinese" scope="core">Chinese</type>
 			<type key="calendar" type="coptic">Copto Intiwatana</type>
+			<type key="calendar" type="coptic" scope="core">Copto</type>
 			<type key="calendar" type="dangi">Dangi Intiwatana</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Etiope Intiwatana</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etíope Amete Alem Intiwatana</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Gregoriano Intiwatana</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Hebreo Intiwatana</type>
+			<type key="calendar" type="hebrew" scope="core">Hebreo</type>
 			<type key="calendar" type="islamic">Hijri Intiwatana</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Hijri Intiwatana (tabular, epoca civil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabular, epoca civil)</type>
 			<type key="calendar" type="islamic-umalqura">Hijri Intiwatana (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 Intiwatana</type>
 			<type key="calendar" type="japanese">Japones Intiwatana</type>
+			<type key="calendar" type="japanese" scope="core">Japones</type>
 			<type key="calendar" type="persian">Persa Intiwatana</type>
+			<type key="calendar" type="persian" scope="core">Persa</type>
 			<type key="calendar" type="roc">Minguo Intiwatana</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Yupana Qullqi imayna kaynin</type>
+			<type key="cf" type="account" scope="core">Accounting</type>
 			<type key="cf" type="standard">Estandar nisqa qullqi imayna kaynin</type>
+			<type key="cf" type="standard" scope="core">Standard</type>
 			<type key="collation" type="ducet">Ñawpaqchasqa Unicode Nisqa Ñiqinchana</type>
+			<type key="collation" type="ducet" scope="core">Ñawpaqchasqa Unicode</type>
 			<type key="collation" type="search">Llapanpaq maskana</type>
+			<type key="collation" type="search" scope="core">maskana</type>
 			<type key="collation" type="standard">Estandar nisqa Ñiqinchana</type>
+			<type key="collation" type="standard" scope="core">Estandar</type>
+			<type key="em" type="default" scope="core">Default</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Text</type>
 			<type key="hc" type="h11">12 hora kaynin (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 hora kaynin (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 hora kaynin (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 hora kaynin (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Siqi paway chinkachiy kaynin</type>
+			<type key="lb" type="loose" scope="core">Loose</type>
 			<type key="lb" type="normal">Siqi paway Normal kaynin</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Siqi paway Chiqa kaynin</type>
+			<type key="lb" type="strict" scope="core">Strict</type>
+			<type key="lw" type="breakall" scope="core">Tukuyta pakiy</type>
+			<type key="lw" type="keepall" scope="core">Tukuy imata waqaychay</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Frases nisqapi waqaychay</type>
 			<type key="ms" type="metric">Metrico Kamay</type>
+			<type key="ms" type="metric" scope="core">Metrico</type>
 			<type key="ms" type="uksystem">Metrico Ingles Kamay</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Metrico Americano Kamay</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">Arabe Sananpakuna</type>
 			<type key="numbers" type="arabext">Arabe Mirachisqa Sananpakuna</type>
 			<type key="numbers" type="armn">Armenio Sananpakuna</type>
@@ -890,6 +943,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">Thai Sananpakuna</type>
 			<type key="numbers" type="tibt">Tibetano Sananpakuna</type>
 			<type key="numbers" type="vaii">Vai Yupaykuna</type>
+			<type key="ss" type="none" scope="core">Off</type>
+			<type key="ss" type="standard" scope="core">On</type>
 		</types>
 		<codePatterns>
 			<codePattern type="language">Simi: {0}</codePattern>
@@ -899,8 +954,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[a {ch} {chʼ} h i k {kʼ} l {ll} m nñ p {pʼ} q {qʼ} s t {tʼ} u w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[áàăâåäãā æ b cç d eéèĕêëē f g íìĭîïī j oóòŏôöøō œ r úùŭûüū v x ÿ z]</exemplarCharacters>
-		<exemplarCharacters type="index">[A {Ch} H I K L {Ll} M NÑ P Q S T U W Y]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[áàăâåäãā æ b cç {chh} d eéèĕêëē f g íìĭîïī j oóòŏôöøō œ {ph} {qh} r úùŭûüū v x ÿ z]</exemplarCharacters>
+		<exemplarCharacters type="index">[A {CH} H I K L {Ll} M NÑ P Q R S T U W Y]</exemplarCharacters>
 		<exemplarCharacters type="punctuation" draft="contributed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<dates>
@@ -1970,9 +2025,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tokio</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>San Cristobal</exemplarCity>
 			</zone>
@@ -2136,9 +2188,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Hora de Africa Occidental</generic>
-					<standard>Hora Estandar de Africa Occidental</standard>
-					<daylight>Hora Estandar de Verano de Africa Occidental</daylight>
+					<standard>Hora de Africa Occidental</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2488,6 +2538,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora de Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hora Estandar de Hawai-Aleutiano</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hora de Hawai-Aleutiano</generic>
@@ -3004,7 +3059,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -3604,6 +3659,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Dólar del Caribe Oriental</displayName>
 				<displayName count="other">Dólar del caribe oriental</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribe guilderkuna</displayName>
+				<displayName count="other">Caribe guilderkuna</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Franco CFA de África Occidental</displayName>
 				<displayName count="other">Franco CFA de áfrica occidental</displayName>
@@ -3627,6 +3686,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Kwacha Zambiano</displayName>
 				<displayName count="other">Kwacha zambiano</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabuemanta quri</displayName>
+				<displayName count="other">Zimbabuemanta quri</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<ordinalMinimalPairs ordinal="other">{0}qi yupayta hapiy.</ordinalMinimalPairs>
@@ -3775,7 +3838,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>imakuna</displayName>
 				<unitPattern count="other">{0} imakuna</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes por millon</displayName>
 				<unitPattern count="other">{0} partes por millon</unitPattern>
 			</unit>
@@ -4139,7 +4202,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ima</displayName>
 				<unitPattern count="other">{0} ima</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes/millon</displayName>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
diff --git a/make/data/cldr/common/main/rif.xml b/make/data/cldr/common/main/rif.xml
index 4c254f9e790..5b7abd373cc 100644
--- a/make/data/cldr/common/main/rif.xml
+++ b/make/data/cldr/common/main/rif.xml
@@ -14,10 +14,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languages>
 			<language type="ar" draft="unconfirmed">taɛrabt</language>
 			<language type="ar_001" draft="unconfirmed">taɛrabt tamaynut</language>
+			<language type="as" draft="unconfirmed">asamis</language>
 			<language type="bn" draft="unconfirmed">tabanɣaliyt</language>
+			<language type="cs" draft="unconfirmed">ttcik</language>
 			<language type="de" draft="unconfirmed">talimant</language>
 			<language type="en" draft="unconfirmed">taglinzit</language>
-			<language type="en_GB" alt="short" draft="unconfirmed">taglinzit (UK)</language>
 			<language type="es" draft="unconfirmed">taseppanyut</language>
 			<language type="fr" draft="unconfirmed">tafransist</language>
 			<language type="hi_Latn" draft="unconfirmed">tahindawiyt</language>
@@ -29,7 +30,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nl_BE" draft="unconfirmed">taflamant</language>
 			<language type="pl" draft="unconfirmed">tapulandiyt</language>
 			<language type="pt" draft="unconfirmed">tapurtuɣaliyt</language>
-			<language type="pt_BR" draft="unconfirmed">tapurtuɣaliyt (brazil)</language>
 			<language type="pt_PT" draft="unconfirmed">tapurtuɣaliyt (uruppa)</language>
 			<language type="rif">Tarifit</language>
 			<language type="ru" draft="unconfirmed">tarusiyt</language>
@@ -46,8 +46,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<scripts>
 			<script type="Arab" draft="unconfirmed">aɛrab</script>
 			<script type="Cyrl" draft="unconfirmed">asirilik</script>
-			<script type="Hans" draft="unconfirmed">yehwen</script>
-			<script type="Hans" alt="stand-alone" draft="unconfirmed">yehwen Han</script>
+			<script type="Hans" draft="unconfirmed">sampl</script>
+			<script type="Hans" alt="stand-alone" draft="unconfirmed">han sampl</script>
 			<script type="Hant" draft="unconfirmed">amensay</script>
 			<script type="Hant" alt="stand-alone" draft="unconfirmed">amensay Han</script>
 			<script type="Jpan" draft="unconfirmed">ajappuni</script>
@@ -133,13 +133,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CF" draft="unconfirmed">rripublik n terfriqt n lwesṭ</territory>
 			<territory type="CG" draft="unconfirmed">kungu</territory>
 			<territory type="CH" draft="unconfirmed">sswis</territory>
-			<territory type="CI" draft="unconfirmed">kudivwar</territory>
+			<territory type="CI" draft="unconfirmed">kudibwar</territory>
 			<territory type="CK" draft="unconfirmed">tigzirin n kuk</territory>
 			<territory type="CL" draft="unconfirmed">tcili</territory>
 			<territory type="CM" draft="unconfirmed">kamirun</territory>
 			<territory type="CN" draft="unconfirmed">tcina</territory>
 			<territory type="CO" draft="unconfirmed">kulumbya</territory>
 			<territory type="CP" draft="unconfirmed">tigzirin n klipirṭun</territory>
+			<territory type="CQ" draft="unconfirmed">sark</territory>
 			<territory type="CR" draft="unconfirmed">kustarika</territory>
 			<territory type="CU" draft="unconfirmed">kuba</territory>
 			<territory type="CV" draft="unconfirmed">qabu yazegza</territory>
@@ -206,7 +207,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IO" draft="unconfirmed">timmura n uglanzi di lebḥer ahindawi</territory>
 			<territory type="IQ" draft="unconfirmed">lɛiraq</territory>
 			<territory type="IR" draft="unconfirmed">iran</territory>
-			<territory type="IS" draft="unconfirmed">ayeslanda</territory>
+			<territory type="IS" draft="unconfirmed">yeslanda</territory>
 			<territory type="IT" draft="unconfirmed">atayal</territory>
 			<territory type="JE" draft="unconfirmed">jirsi</territory>
 			<territory type="JM" draft="unconfirmed">jamayka</territory>
@@ -252,7 +253,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MS" draft="unconfirmed">munsirat</territory>
 			<territory type="MT" draft="unconfirmed">malṭa</territory>
 			<territory type="MU" draft="unconfirmed">muricyus</territory>
-			<territory type="MV" draft="unconfirmed">lmaldiv</territory>
+			<territory type="MV" draft="unconfirmed">lmaldib</territory>
 			<territory type="MW" draft="unconfirmed">malawi</territory>
 			<territory type="MX" draft="unconfirmed">miksiku</territory>
 			<territory type="MY" draft="unconfirmed">malizya</territory>
@@ -299,8 +300,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SE" draft="unconfirmed">sswid</territory>
 			<territory type="SG" draft="unconfirmed">sanɣafura</territory>
 			<territory type="SH" draft="unconfirmed">santḥilina</territory>
-			<territory type="SI" draft="unconfirmed">sluvinya</territory>
-			<territory type="SJ" draft="unconfirmed">svalbard d janmayen</territory>
+			<territory type="SI" draft="unconfirmed">slubinya</territory>
+			<territory type="SJ" draft="unconfirmed">sbalbard d janmayen</territory>
 			<territory type="SK" draft="unconfirmed">sluvakya</territory>
 			<territory type="SL" draft="unconfirmed">siraliyyun</territory>
 			<territory type="SM" draft="unconfirmed">sanmarinu</territory>
@@ -314,7 +315,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SY" draft="unconfirmed">surya</territory>
 			<territory type="SZ" draft="unconfirmed">iswatini</territory>
 			<territory type="TA" draft="unconfirmed">tristan dakuna</territory>
-			<territory type="TC" draft="unconfirmed">ṭṭurks d tegzirin n kaykus</territory>
+			<territory type="TC" draft="unconfirmed">tigzirin n ṭurks d kaykus</territory>
 			<territory type="TD" draft="unconfirmed">tcad</territory>
 			<territory type="TF" draft="unconfirmed">timmura tifransisin nwadday</territory>
 			<territory type="TG" draft="unconfirmed">ṭṭugu</territory>
@@ -329,10 +330,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TR" draft="unconfirmed">ṭurekya</territory>
 			<territory type="TR" alt="variant" draft="unconfirmed">ṭṭurk</territory>
 			<territory type="TT" draft="unconfirmed">trinidad d ṭubagu</territory>
-			<territory type="TV" draft="unconfirmed">ṭuvalu</territory>
+			<territory type="TV" draft="unconfirmed">ṭubalu</territory>
 			<territory type="TW" draft="unconfirmed">ṭṭaywan</territory>
 			<territory type="TZ" draft="unconfirmed">ṭanzanya</territory>
-			<territory type="UA" draft="unconfirmed">ukrayina</territory>
+			<territory type="UA" draft="unconfirmed">ukranya</territory>
 			<territory type="UG" draft="unconfirmed">uɣanda</territory>
 			<territory type="UM" draft="unconfirmed">tigzirin timirikanin i yegʷjen</territory>
 			<territory type="UN" draft="unconfirmed">tamunt n tmura</territory>
@@ -340,18 +341,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="US" alt="short" draft="unconfirmed">US</territory>
 			<territory type="UY" draft="unconfirmed">urugway</territory>
 			<territory type="UZ" draft="unconfirmed">uzbakistan</territory>
-			<territory type="VA" draft="unconfirmed">lvatikan</territory>
+			<territory type="VA" draft="unconfirmed">lbatikan</territory>
 			<territory type="VC" draft="unconfirmed">sanvinsit d grinadin</territory>
-			<territory type="VE" draft="unconfirmed">vanzwilla</territory>
+			<territory type="VE" draft="unconfirmed">banzwilla</territory>
 			<territory type="VG" draft="unconfirmed">tigzirin tiɛezriyyin tiglanziyyin</territory>
 			<territory type="VI" draft="unconfirmed">tigzirin tiɛezriyyin timarikanin</territory>
-			<territory type="VN" draft="unconfirmed">vitnam</territory>
-			<territory type="VU" draft="unconfirmed">vanwatu</territory>
+			<territory type="VN" draft="unconfirmed">bitnam</territory>
+			<territory type="VU" draft="unconfirmed">banwatu</territory>
 			<territory type="WF" draft="unconfirmed">walis d futuna</territory>
 			<territory type="WS" draft="unconfirmed">samwa</territory>
 			<territory type="XA" draft="unconfirmed">awal amsaqar</territory>
 			<territory type="XB" draft="unconfirmed">bidi tamsaqart</territory>
-			<territory type="XK" draft="unconfirmed">kusuvu</territory>
+			<territory type="XK" draft="unconfirmed">kusubu</territory>
 			<territory type="YE" draft="unconfirmed">lyaman</territory>
 			<territory type="YT" draft="unconfirmed">mayuṭ</territory>
 			<territory type="ZA" draft="unconfirmed">tafriqt n wadday</territory>
@@ -361,11 +362,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 		<types>
 			<type key="calendar" type="gregorian" draft="unconfirmed">taklindart tagrikant</type>
+			<type key="calendar" type="gregorian" scope="core" draft="unconfirmed">agrikan</type>
 			<type key="calendar" type="islamic" draft="unconfirmed">taklindart tameslemt</type>
+			<type key="calendar" type="islamic" scope="core" draft="unconfirmed">ameslem</type>
 			<type key="calendar" type="islamic-civil" draft="unconfirmed">taklindart tameslemt (leḥsab)</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="unconfirmed">ameslem (leḥsab)</type>
 			<type key="calendar" type="islamic-tbla" draft="unconfirmed">taklindart tameslemt (ayur)</type>
+			<type key="calendar" type="islamic-tbla" scope="core" draft="unconfirmed">ameslem (ayur)</type>
 			<type key="calendar" type="iso8601" draft="unconfirmed">kalandar n ISO-8601</type>
 			<type key="collation" type="standard" draft="unconfirmed">asettef sṭandar</type>
+			<type key="collation" type="standard" scope="core" draft="unconfirmed">sṭandar</type>
 			<type key="numbers" type="latn" draft="unconfirmed">nnumrawat irumiyyen</type>
 		</types>
 		<measurementSystemNames>
@@ -418,6 +424,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -426,6 +435,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -441,10 +453,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="d" draft="unconfirmed">dd</dateFormatItem>
 						<dateFormatItem id="Ed" draft="unconfirmed">E dd</dateFormatItem>
 						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="unconfirmed">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd" draft="unconfirmed">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="unconfirmed">E dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd" draft="unconfirmed">dd MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E dd MMM y G</dateFormatItem>
+						<dateFormatItem id="M" draft="unconfirmed">LL</dateFormatItem>
 						<dateFormatItem id="Md" draft="unconfirmed">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd" draft="unconfirmed">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd" draft="unconfirmed">dd MMM</dateFormatItem>
@@ -587,12 +602,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="4" draft="unconfirmed">yebril</month>
 							<month type="5" draft="unconfirmed">mayyu</month>
 							<month type="6" draft="unconfirmed">yunyu</month>
-							<month type="7" draft="unconfirmed">yulyuz</month>
-							<month type="8" draft="unconfirmed">ɣucct</month>
-							<month type="9" draft="unconfirmed">cutenber</month>
+							<month type="7" draft="unconfirmed">yulyu</month>
+							<month type="8" draft="unconfirmed">ɣuccet</month>
+							<month type="9" draft="unconfirmed">cutembir</month>
 							<month type="10" draft="unconfirmed">kṭuber</month>
-							<month type="11" draft="unconfirmed">nuwember</month>
-							<month type="12" draft="unconfirmed">dujember</month>
+							<month type="11" draft="unconfirmed">nuwembir</month>
+							<month type="12" draft="unconfirmed">dujembir</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
@@ -610,6 +625,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11" draft="unconfirmed">n</month>
 							<month type="12" draft="unconfirmed">d</month>
 						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">yennayer</month>
+							<month type="2" draft="unconfirmed">febrayer</month>
+							<month type="3" draft="unconfirmed">mars</month>
+							<month type="4" draft="unconfirmed">yebril</month>
+							<month type="5" draft="unconfirmed">mayyu</month>
+							<month type="6" draft="unconfirmed">yunyu</month>
+							<month type="7" draft="unconfirmed">yulyu</month>
+							<month type="8" draft="unconfirmed">ɣuccet</month>
+							<month type="9" draft="unconfirmed">cutembir</month>
+							<month type="10" draft="unconfirmed">kṭuber</month>
+							<month type="11" draft="unconfirmed">nuwembir</month>
+							<month type="12" draft="unconfirmed">dujembir</month>
+						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -744,6 +773,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -752,6 +784,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="unconfirmed">{1} 'ɣer' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -767,7 +802,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="d" draft="unconfirmed">dd</dateFormatItem>
 						<dateFormatItem id="Ed" draft="unconfirmed">E dd</dateFormatItem>
 						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
+						<dateFormatItem id="GyM" draft="unconfirmed">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd" draft="unconfirmed">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd" draft="unconfirmed">E dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd" draft="unconfirmed">dd MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E dd MMM y G</dateFormatItem>
@@ -830,7 +867,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y" draft="unconfirmed">E dd MMM y – E dd MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
 							<greatestDifference id="h" draft="unconfirmed">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -855,7 +891,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m" draft="unconfirmed">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="unconfirmed">h a – h a v</greatestDifference>
 							<greatestDifference id="h" draft="unconfirmed">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1091,12 +1126,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">akud agraɣlan amezday</standard>
 				</long>
 			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity draft="unconfirmed">wer yettemwassen</exemplarCity>
+			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity draft="unconfirmed">andura</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
 				<exemplarCity draft="unconfirmed">dubay</exemplarCity>
 			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity draft="unconfirmed">kabul</exemplarCity>
+			</zone>
 			<zone type="America/Antigua">
 				<exemplarCity draft="unconfirmed">antigwa</exemplarCity>
 			</zone>
@@ -1112,6 +1153,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Luanda">
 				<exemplarCity draft="unconfirmed">lwanda</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity draft="unconfirmed">stasyun n rutira</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity draft="unconfirmed">palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity draft="unconfirmed">stasyun n ṭrul</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity draft="unconfirmed">stasyun n suwa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity draft="unconfirmed">stasyun n mawsun</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity draft="unconfirmed">deybis</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity draft="unconfirmed">stasyun n bustuk</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity draft="unconfirmed">stasyun n kasi</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity draft="unconfirmed">dimun durbil</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity draft="unconfirmed">stasyun n makmurdu</exemplarCity>
+			</zone>
 			<zone type="America/Argentina/Rio_Gallegos">
 				<exemplarCity draft="unconfirmed">riyugayyigus</exemplarCity>
 			</zone>
@@ -1148,9 +1219,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Buenos_Aires">
 				<exemplarCity draft="unconfirmed">bwinusayris</exemplarCity>
 			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity draft="unconfirmed">pagupagu</exemplarCity>
+			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity draft="unconfirmed">byinna</exemplarCity>
 			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity draft="unconfirmed">pert</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity draft="unconfirmed">yukla</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity draft="unconfirmed">darwin</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity draft="unconfirmed">adelayd</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity draft="unconfirmed">brukenhil</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity draft="unconfirmed">milben</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity draft="unconfirmed">hubart</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity draft="unconfirmed">lindman</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity draft="unconfirmed">sidni</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity draft="unconfirmed">brizban</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity draft="unconfirmed">tayzirt n makkari</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity draft="unconfirmed">lurdhaw</exemplarCity>
+			</zone>
 			<zone type="America/Aruba">
 				<exemplarCity draft="unconfirmed">aruba</exemplarCity>
 			</zone>
@@ -1166,6 +1276,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Barbados">
 				<exemplarCity draft="unconfirmed">barbadus</exemplarCity>
 			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity draft="unconfirmed">dhaka</exemplarCity>
+			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity draft="unconfirmed">bruksil</exemplarCity>
 			</zone>
@@ -1190,6 +1303,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Atlantic/Bermuda">
 				<exemplarCity draft="unconfirmed">birmuda</exemplarCity>
 			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity draft="unconfirmed">brunay</exemplarCity>
+			</zone>
 			<zone type="America/La_Paz">
 				<exemplarCity draft="unconfirmed">lappaz</exemplarCity>
 			</zone>
@@ -1247,6 +1363,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nassau">
 				<exemplarCity draft="unconfirmed">nassaw</exemplarCity>
 			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity draft="unconfirmed">timpfu</exemplarCity>
+			</zone>
 			<zone type="Africa/Gaborone">
 				<exemplarCity draft="unconfirmed">gaburun</exemplarCity>
 			</zone>
@@ -1263,7 +1382,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">waythurs</exemplarCity>
 			</zone>
 			<zone type="America/Inuvik">
-				<exemplarCity draft="unconfirmed">inuvik</exemplarCity>
+				<exemplarCity draft="unconfirmed">inubik</exemplarCity>
 			</zone>
 			<zone type="America/Vancouver">
 				<exemplarCity draft="unconfirmed">fankufer</exemplarCity>
@@ -1325,6 +1444,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/St_Johns">
 				<exemplarCity draft="unconfirmed">sanjuns</exemplarCity>
 			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity draft="unconfirmed">tiyzirin n kukus</exemplarCity>
+			</zone>
 			<zone type="Africa/Kinshasa">
 				<exemplarCity draft="unconfirmed">kincasa</exemplarCity>
 			</zone>
@@ -1343,9 +1465,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Abidjan">
 				<exemplarCity draft="unconfirmed">abidjan</exemplarCity>
 			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity draft="unconfirmed">raruṭunga</exemplarCity>
+			</zone>
 			<zone type="Pacific/Easter">
 				<exemplarCity draft="unconfirmed">ister</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="unconfirmed">kuyhayki</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity draft="unconfirmed">puntarinas</exemplarCity>
 			</zone>
@@ -1355,6 +1483,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Douala">
 				<exemplarCity draft="unconfirmed">diwala</exemplarCity>
 			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity draft="unconfirmed">urumutci</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity draft="unconfirmed">canhay</exemplarCity>
+			</zone>
 			<zone type="America/Bogota">
 				<exemplarCity draft="unconfirmed">buguṭa</exemplarCity>
 			</zone>
@@ -1362,7 +1496,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">kustarika</exemplarCity>
 			</zone>
 			<zone type="America/Havana">
-				<exemplarCity draft="unconfirmed">havana</exemplarCity>
+				<exemplarCity draft="unconfirmed">habana</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity draft="unconfirmed">qabubirdi</exemplarCity>
@@ -1370,6 +1504,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Curacao">
 				<exemplarCity draft="unconfirmed">kuracaw</exemplarCity>
 			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity draft="unconfirmed">tayzirt n kristmas</exemplarCity>
+			</zone>
 			<zone type="Asia/Nicosia">
 				<exemplarCity draft="unconfirmed">nikuzya</exemplarCity>
 			</zone>
@@ -1433,9 +1570,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Helsinki">
 				<exemplarCity draft="unconfirmed">hilsinki</exemplarCity>
 			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity draft="unconfirmed">fiji</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Stanley">
 				<exemplarCity draft="unconfirmed">sṭanli</exemplarCity>
 			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity draft="unconfirmed">tcuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity draft="unconfirmed">punpi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity draft="unconfirmed">kursay</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Faeroe">
 				<exemplarCity draft="unconfirmed">faraw</exemplarCity>
 			</zone>
@@ -1502,12 +1651,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Guatemala">
 				<exemplarCity draft="unconfirmed">gwatimala</exemplarCity>
 			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity draft="unconfirmed">gwam</exemplarCity>
+			</zone>
 			<zone type="Africa/Bissau">
 				<exemplarCity draft="unconfirmed">bisaw</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
 				<exemplarCity draft="unconfirmed">guyana</exemplarCity>
 			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity draft="unconfirmed">hungkung</exemplarCity>
+			</zone>
 			<zone type="America/Tegucigalpa">
 				<exemplarCity draft="unconfirmed">tigicigalpa</exemplarCity>
 			</zone>
@@ -1520,6 +1675,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Budapest">
 				<exemplarCity draft="unconfirmed">budabist</exemplarCity>
 			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity draft="unconfirmed">jakarṭa</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity draft="unconfirmed">puntyanak</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity draft="unconfirmed">makasar</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity draft="unconfirmed">jayapura</exemplarCity>
+			</zone>
 			<zone type="Europe/Dublin">
 				<long>
 					<daylight draft="unconfirmed">akud anaway ayirlandi</daylight>
@@ -1532,14 +1699,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Isle_of_Man">
 				<exemplarCity draft="unconfirmed">tagzirt n man</exemplarCity>
 			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity draft="unconfirmed">kulkaṭa</exemplarCity>
+			</zone>
 			<zone type="Indian/Chagos">
 				<exemplarCity draft="unconfirmed">ttcagus</exemplarCity>
 			</zone>
 			<zone type="Asia/Baghdad">
 				<exemplarCity draft="unconfirmed">baɣdad</exemplarCity>
 			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity draft="unconfirmed">ṭahran</exemplarCity>
+			</zone>
 			<zone type="Atlantic/Reykjavik">
-				<exemplarCity draft="unconfirmed">reykjavik</exemplarCity>
+				<exemplarCity draft="unconfirmed">reykjabik</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
 				<exemplarCity draft="unconfirmed">ruma</exemplarCity>
@@ -1553,21 +1726,69 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Amman">
 				<exemplarCity draft="unconfirmed">ɛamman</exemplarCity>
 			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity draft="unconfirmed">ṭukyu</exemplarCity>
+			</zone>
 			<zone type="Africa/Nairobi">
 				<exemplarCity draft="unconfirmed">nayrubi</exemplarCity>
 			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity draft="unconfirmed">bickik</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity draft="unconfirmed">knumpayn</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity draft="unconfirmed">tagzirt n kanṭun</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity draft="unconfirmed">kiritimati</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity draft="unconfirmed">ṭarawa</exemplarCity>
+			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity draft="unconfirmed">kumuru</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity draft="unconfirmed">sankits</exemplarCity>
 			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity draft="unconfirmed">pyungyang</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity draft="unconfirmed">syul</exemplarCity>
+			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity draft="unconfirmed">kuwit</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
 				<exemplarCity draft="unconfirmed">sayman</exemplarCity>
 			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity draft="unconfirmed">aqṭaw</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity draft="unconfirmed">ural</exemplarCity>
+			</zone>
+			<zone type="Asia/Atyrau">
+				<exemplarCity draft="unconfirmed">aṭraw</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity draft="unconfirmed">aqtubi</exemplarCity>
+			</zone>
+			<zone type="Asia/Qostanay">
+				<exemplarCity draft="unconfirmed">qusṭanay</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity draft="unconfirmed">qazalurda</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity draft="unconfirmed">almaṭi</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity draft="unconfirmed">bintyan</exemplarCity>
+			</zone>
 			<zone type="Asia/Beirut">
 				<exemplarCity draft="unconfirmed">bayrut</exemplarCity>
 			</zone>
@@ -1575,7 +1796,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">sanlucya</exemplarCity>
 			</zone>
 			<zone type="Europe/Vaduz">
-				<exemplarCity draft="unconfirmed">vaduts</exemplarCity>
+				<exemplarCity draft="unconfirmed">faduts</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity draft="unconfirmed">kulumbu</exemplarCity>
 			</zone>
 			<zone type="Africa/Monrovia">
 				<exemplarCity draft="unconfirmed">munrubya</exemplarCity>
@@ -1613,12 +1837,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Indian/Antananarivo">
 				<exemplarCity draft="unconfirmed">antananaribu</exemplarCity>
 			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity draft="unconfirmed">kwajilen</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity draft="unconfirmed">majuru</exemplarCity>
+			</zone>
 			<zone type="Europe/Skopje">
 				<exemplarCity draft="unconfirmed">skupya</exemplarCity>
 			</zone>
 			<zone type="Africa/Bamako">
 				<exemplarCity draft="unconfirmed">bamaku</exemplarCity>
 			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity draft="unconfirmed">yangun</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity draft="unconfirmed">xubd</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity draft="unconfirmed">ulanbaṭar</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity draft="unconfirmed">makkaw</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity draft="unconfirmed">saypan</exemplarCity>
+			</zone>
 			<zone type="America/Martinique">
 				<exemplarCity draft="unconfirmed">martinik</exemplarCity>
 			</zone>
@@ -1629,11 +1874,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">muntsirat</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="unconfirmed">malta</exemplarCity>
+				<exemplarCity draft="unconfirmed">malṭa</exemplarCity>
 			</zone>
 			<zone type="Indian/Mauritius">
 				<exemplarCity draft="unconfirmed">muriṭanya</exemplarCity>
 			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity draft="unconfirmed">lmaldib</exemplarCity>
+			</zone>
 			<zone type="Africa/Blantyre">
 				<exemplarCity draft="unconfirmed">blanṭayr</exemplarCity>
 			</zone>
@@ -1673,15 +1921,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Cancun">
 				<exemplarCity draft="unconfirmed">kankun</exemplarCity>
 			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity draft="unconfirmed">kwalalampur</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity draft="unconfirmed">kutcin</exemplarCity>
+			</zone>
 			<zone type="Africa/Maputo">
 				<exemplarCity draft="unconfirmed">maputu</exemplarCity>
 			</zone>
 			<zone type="Africa/Windhoek">
 				<exemplarCity draft="unconfirmed">binhuwk</exemplarCity>
 			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity draft="unconfirmed">numya</exemplarCity>
+			</zone>
 			<zone type="Africa/Niamey">
 				<exemplarCity draft="unconfirmed">nyamiy</exemplarCity>
 			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity draft="unconfirmed">tayzirt n nurfuk</exemplarCity>
+			</zone>
 			<zone type="Africa/Lagos">
 				<exemplarCity draft="unconfirmed">lagus</exemplarCity>
 			</zone>
@@ -1694,6 +1954,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Oslo">
 				<exemplarCity draft="unconfirmed">uslu</exemplarCity>
 			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity draft="unconfirmed">katmandu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity draft="unconfirmed">nawru</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity draft="unconfirmed">nyu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity draft="unconfirmed">tcatem</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity draft="unconfirmed">ukland</exemplarCity>
+			</zone>
 			<zone type="Asia/Muscat">
 				<exemplarCity draft="unconfirmed">masqaṭ</exemplarCity>
 			</zone>
@@ -1703,12 +1978,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Lima">
 				<exemplarCity draft="unconfirmed">lima</exemplarCity>
 			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity draft="unconfirmed">tahiti</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity draft="unconfirmed">markwisas</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity draft="unconfirmed">gambyi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity draft="unconfirmed">mursbay</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity draft="unconfirmed">bugenbil</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity draft="unconfirmed">manila</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity draft="unconfirmed">kratci</exemplarCity>
+			</zone>
 			<zone type="Europe/Warsaw">
 				<exemplarCity draft="unconfirmed">warsaw</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
 				<exemplarCity draft="unconfirmed">mikilon</exemplarCity>
 			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity draft="unconfirmed">pitkirn</exemplarCity>
+			</zone>
 			<zone type="America/Puerto_Rico">
 				<exemplarCity draft="unconfirmed">ppurturiku</exemplarCity>
 			</zone>
@@ -1727,6 +2026,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Lisbon">
 				<exemplarCity draft="unconfirmed">licbuna</exemplarCity>
 			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity draft="unconfirmed">palaw</exemplarCity>
+			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity draft="unconfirmed">asuntyun</exemplarCity>
 			</zone>
@@ -1770,7 +2072,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">yekaterinburg</exemplarCity>
 			</zone>
 			<zone type="Asia/Omsk">
-				<exemplarCity draft="unconfirmed">omsek</exemplarCity>
+				<exemplarCity draft="unconfirmed">umsek</exemplarCity>
 			</zone>
 			<zone type="Asia/Novosibirsk">
 				<exemplarCity draft="unconfirmed">nubusibiresk</exemplarCity>
@@ -1826,6 +2128,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Riyadh">
 				<exemplarCity draft="unconfirmed">riyad</exemplarCity>
 			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity draft="unconfirmed">gwadelkanal</exemplarCity>
+			</zone>
 			<zone type="Indian/Mahe">
 				<exemplarCity draft="unconfirmed">mahi</exemplarCity>
 			</zone>
@@ -1835,6 +2140,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Stockholm">
 				<exemplarCity draft="unconfirmed">sṭukhulm</exemplarCity>
 			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity draft="unconfirmed">singappur</exemplarCity>
+			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity draft="unconfirmed">santhilina</exemplarCity>
 			</zone>
@@ -1892,15 +2200,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Lome">
 				<exemplarCity draft="unconfirmed">lumi</exemplarCity>
 			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity draft="unconfirmed">bangkuk</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity draft="unconfirmed">ducanba</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity draft="unconfirmed">fakawfu</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity draft="unconfirmed">dili</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity draft="unconfirmed">ɛicqabad</exemplarCity>
+			</zone>
 			<zone type="Africa/Tunis">
 				<exemplarCity draft="unconfirmed">tunes</exemplarCity>
 			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity draft="unconfirmed">ṭungaṭapu</exemplarCity>
+			</zone>
 			<zone type="Europe/Istanbul">
 				<exemplarCity draft="unconfirmed">sṭanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
 				<exemplarCity draft="unconfirmed">ppurtufspin</exemplarCity>
 			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity draft="unconfirmed">funafuti</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity draft="unconfirmed">ṭaypay</exemplarCity>
+			</zone>
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity draft="unconfirmed">daressalam</exemplarCity>
 			</zone>
@@ -1913,6 +2245,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Kampala">
 				<exemplarCity draft="unconfirmed">kampala</exemplarCity>
 			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity draft="unconfirmed">midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity draft="unconfirmed">tagzirt n wayk</exemplarCity>
+			</zone>
 			<zone type="America/Adak">
 				<exemplarCity draft="unconfirmed">adak</exemplarCity>
 			</zone>
@@ -1944,7 +2282,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">finiks</exemplarCity>
 			</zone>
 			<zone type="America/Denver">
-				<exemplarCity draft="unconfirmed">dinver</exemplarCity>
+				<exemplarCity draft="unconfirmed">dinbir</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity draft="unconfirmed">bulah, nurtdakuṭa</exemplarCity>
@@ -1962,7 +2300,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">minumini</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vincennes">
-				<exemplarCity draft="unconfirmed">vinsanz, indyana</exemplarCity>
+				<exemplarCity draft="unconfirmed">binsanz, indyana</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Petersburg">
 				<exemplarCity draft="unconfirmed">pitersburg, indyana</exemplarCity>
@@ -1983,10 +2321,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity draft="unconfirmed">indyanapulis</exemplarCity>
 			</zone>
 			<zone type="America/Louisville">
-				<exemplarCity draft="unconfirmed">lwisvil</exemplarCity>
+				<exemplarCity draft="unconfirmed">lwisbil</exemplarCity>
 			</zone>
 			<zone type="America/Indiana/Vevay">
-				<exemplarCity draft="unconfirmed">vivi, indyana</exemplarCity>
+				<exemplarCity draft="unconfirmed">bibi, indyana</exemplarCity>
 			</zone>
 			<zone type="America/Kentucky/Monticello">
 				<exemplarCity draft="unconfirmed">muntitcilu, kinṭaki</exemplarCity>
@@ -2000,11 +2338,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Montevideo">
 				<exemplarCity draft="unconfirmed">muntibidyu</exemplarCity>
 			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity draft="unconfirmed">samarqand</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity draft="unconfirmed">tacqand</exemplarCity>
+			</zone>
 			<zone type="Europe/Vatican">
 				<exemplarCity draft="unconfirmed">lbatikan</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity draft="unconfirmed">sanvinsint</exemplarCity>
+				<exemplarCity draft="unconfirmed">sanbinsint</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity draft="unconfirmed">karakas</exemplarCity>
@@ -2015,6 +2359,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/St_Thomas">
 				<exemplarCity draft="unconfirmed">sanṭumas</exemplarCity>
 			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity draft="unconfirmed">hutcimin</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity draft="unconfirmed">ifaṭi</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity draft="unconfirmed">wilis d futuna</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity draft="unconfirmed">apya</exemplarCity>
+			</zone>
 			<zone type="Asia/Aden">
 				<exemplarCity draft="unconfirmed">ɛadan</exemplarCity>
 			</zone>
@@ -2030,6 +2386,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Harare">
 				<exemplarCity draft="unconfirmed">harari</exemplarCity>
 			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard draft="unconfirmed">akud n afɣanistan</standard>
+				</long>
+			</metazone>
 			<metazone type="Africa_Central">
 				<long>
 					<standard draft="unconfirmed">akud n tefriqt n lwesṭ</standard>
@@ -2047,9 +2408,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">akud n tefriqt n lɣerb</generic>
-					<standard draft="unconfirmed">akud anaway n tefriqt n lɣerb</standard>
-					<daylight draft="unconfirmed">akud n uzil n tefriqt n lɣerb</daylight>
+					<standard draft="unconfirmed">akud n tefriqt n lɣerb</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2094,6 +2453,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n pasifik</daylight>
 				</long>
 			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic draft="unconfirmed">akud n samwa</generic>
+					<standard draft="unconfirmed">akud anaway n samwa</standard>
+					<daylight draft="unconfirmed">akud n uzil n samwa</daylight>
+				</long>
+			</metazone>
 			<metazone type="Arabian">
 				<long>
 					<generic draft="unconfirmed">akud n waɛrab</generic>
@@ -2129,6 +2495,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n atlantik</daylight>
 				</long>
 			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic draft="unconfirmed">akud suntral n wustralya</generic>
+					<standard draft="unconfirmed">akud suntral anaway n wustralya</standard>
+					<daylight draft="unconfirmed">akud suntral n uzil n wustralya</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic draft="unconfirmed">akud suntral n lɣerb n wustralya</generic>
+					<standard draft="unconfirmed">akud suntral anaway n lɣerb n wustralya</standard>
+					<daylight draft="unconfirmed">akud suntral n uzil n lɣerb n wustralya</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic draft="unconfirmed">akud n ccerq n wustralya</generic>
+					<standard draft="unconfirmed">akud anaway n ccerq n wustralya</standard>
+					<daylight draft="unconfirmed">akud n uzil n ccerq n wustralya</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic draft="unconfirmed">akud n lɣerb n wustralya</generic>
+					<standard draft="unconfirmed">akud anaway n lɣerb n wustralya</standard>
+					<daylight draft="unconfirmed">akud n uzil n lɣerb n wustralya</daylight>
+				</long>
+			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
 					<generic draft="unconfirmed">akud n azrabidjan</generic>
@@ -2143,9 +2537,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n azures</daylight>
 				</long>
 			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic draft="unconfirmed">akud n bangladic</generic>
+					<standard draft="unconfirmed">akud anaway n bangladic</standard>
+					<daylight draft="unconfirmed">akud n uzil n bangladic</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard draft="unconfirmed">akud n butan</standard>
+				</long>
+			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard draft="unconfirmed">akud n bulivya</standard>
+					<standard draft="unconfirmed">akud n bulibya</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
@@ -2155,6 +2561,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n brazilya</daylight>
 				</long>
 			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard draft="unconfirmed">akud n brunay</standard>
+				</long>
+			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
 					<generic draft="unconfirmed">akud n qabubirdi</generic>
@@ -2162,6 +2573,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n qabubirdi</daylight>
 				</long>
 			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard draft="unconfirmed">akud anaway n tcamuru</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic draft="unconfirmed">akud n tcatem</generic>
+					<standard draft="unconfirmed">akud anaway n tcatem</standard>
+					<daylight draft="unconfirmed">akud n uzil n tcatem</daylight>
+				</long>
+			</metazone>
 			<metazone type="Chile">
 				<long>
 					<generic draft="unconfirmed">akud n cili</generic>
@@ -2176,6 +2599,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n tcina</daylight>
 				</long>
 			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard draft="unconfirmed">akud n tayzirt n kristmas</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard draft="unconfirmed">akud n tiyzirin n kukus</standard>
+				</long>
+			</metazone>
 			<metazone type="Colombia">
 				<long>
 					<generic draft="unconfirmed">akud n kulumbya</generic>
@@ -2183,6 +2616,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n kulumbya</daylight>
 				</long>
 			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic draft="unconfirmed">akud n tigzirin n kuk</generic>
+					<standard draft="unconfirmed">akud anaway n tigzirin n kuk</standard>
+					<daylight draft="unconfirmed">akud n uzil n tigzirin n kuk</daylight>
+				</long>
+			</metazone>
 			<metazone type="Cuba">
 				<long>
 					<generic draft="unconfirmed">akud n kuba</generic>
@@ -2190,6 +2630,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n kuba</daylight>
 				</long>
 			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard draft="unconfirmed">akud n deybis</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard draft="unconfirmed">akud n dimun durbil</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard draft="unconfirmed">akud n ṭimur licti</standard>
+				</long>
+			</metazone>
 			<metazone type="Easter">
 				<long>
 					<generic draft="unconfirmed">akud n isterayland</generic>
@@ -2235,6 +2690,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n falkland</daylight>
 				</long>
 			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic draft="unconfirmed">akud n fiji</generic>
+					<standard draft="unconfirmed">akud anaway n fiji</standard>
+					<daylight draft="unconfirmed">akud n uzil n fiji</daylight>
+				</long>
+			</metazone>
 			<metazone type="French_Guiana">
 				<long>
 					<standard draft="unconfirmed">akud n ɣana tafransist</standard>
@@ -2250,6 +2712,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">akud n galappagus</standard>
 				</long>
 			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard draft="unconfirmed">akud n gambyi</standard>
+				</long>
+			</metazone>
 			<metazone type="Georgia">
 				<long>
 					<generic draft="unconfirmed">akud n jyurjya</generic>
@@ -2257,6 +2724,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n jyurjya</daylight>
 				</long>
 			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard draft="unconfirmed">akud n tigzirin n gilbert</standard>
+				</long>
+			</metazone>
 			<metazone type="GMT">
 				<long>
 					<standard draft="unconfirmed">GMT</standard>
@@ -2286,6 +2758,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">akud n guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">akud anaway n haway-alucyan</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">akud n haway-alucyan</generic>
@@ -2302,9 +2779,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic draft="unconfirmed">akud n hubd</generic>
-					<standard draft="unconfirmed">akud anaway n hubd</standard>
-					<daylight draft="unconfirmed">akud n uzil n hubd</daylight>
+					<generic draft="unconfirmed">akud n xubd</generic>
+					<standard draft="unconfirmed">akud anaway n xubd</standard>
+					<daylight draft="unconfirmed">akud n uzil n xubd</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard draft="unconfirmed">akud anawy n lhend</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
@@ -2312,6 +2794,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">akud n lebḥer ahindi</standard>
 				</long>
 			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard draft="unconfirmed">akud n indutcina</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard draft="unconfirmed">akud n yindunisya n lwesṭ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard draft="unconfirmed">akud n ccerq n yindunisya</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard draft="unconfirmed">akud n lɣerb n yindunisya</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic draft="unconfirmed">akud n iran</generic>
+					<standard draft="unconfirmed">akud anaway n iran</standard>
+					<daylight draft="unconfirmed">akud n uzil n iran</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic draft="unconfirmed">akud n irkutsek</generic>
+					<standard draft="unconfirmed">akud anaway n irkutsek</standard>
+					<daylight draft="unconfirmed">akud n uzil n irkutsek</daylight>
+				</long>
+			</metazone>
 			<metazone type="Israel">
 				<long>
 					<generic draft="unconfirmed">akud n yisrayil</generic>
@@ -2319,6 +2835,91 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n yisrayil</daylight>
 				</long>
 			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic draft="unconfirmed">akud n jjapun</generic>
+					<standard draft="unconfirmed">akud anaway n jjapun</standard>
+					<daylight draft="unconfirmed">akud n uzil n jjapun</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard draft="unconfirmed">akud n kazaxistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard draft="unconfirmed">akud n ccerq n kazaxistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard draft="unconfirmed">akud n lɣerb n kazaxistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic draft="unconfirmed">akud n kurya</generic>
+					<standard draft="unconfirmed">akud anaway n kurya</standard>
+					<daylight draft="unconfirmed">akud n uzil n kurya</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard draft="unconfirmed">akud n kursay</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic draft="unconfirmed">akud n krasnuyarsek</generic>
+					<standard draft="unconfirmed">akud anaway n krasnuyarsek</standard>
+					<daylight draft="unconfirmed">akud n uzil n krasnuyarsek</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard draft="unconfirmed">akud n krigistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard draft="unconfirmed">akud n tigzirin n layn</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic draft="unconfirmed">akud n lurdhaw</generic>
+					<standard draft="unconfirmed">akud anaway n lurdhaw</standard>
+					<daylight draft="unconfirmed">akud n uzil n lurdhaw</daylight>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic draft="unconfirmed">akud n magadan</generic>
+					<standard draft="unconfirmed">akud anaway n magadan</standard>
+					<daylight draft="unconfirmed">akud n uzil n magadan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard draft="unconfirmed">akud n malizya</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard draft="unconfirmed">akud n lmaldib</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard draft="unconfirmed">akud n markwisas</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard draft="unconfirmed">akud n tigzirin n marcal</standard>
+				</long>
+			</metazone>
 			<metazone type="Mauritius">
 				<long>
 					<generic draft="unconfirmed">akud n mawritus</generic>
@@ -2326,6 +2927,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n mawritus</daylight>
 				</long>
 			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard draft="unconfirmed">akud n mawson</standard>
+				</long>
+			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">akud n pasifik amiksikan</generic>
@@ -2333,6 +2939,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n pasifik amiksikan</daylight>
 				</long>
 			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic draft="unconfirmed">akud n ulanbaṭar</generic>
+					<standard draft="unconfirmed">akud anaway n ulanbaṭar</standard>
+					<daylight draft="unconfirmed">akud n uzil n ulanbaṭar</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic draft="unconfirmed">akud n musku</generic>
+					<standard draft="unconfirmed">akud anaway n musku</standard>
+					<daylight draft="unconfirmed">akud n uzil n musku</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard draft="unconfirmed">akud n myanmar</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard draft="unconfirmed">akud n nawru</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard draft="unconfirmed">akud n nnipal</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic draft="unconfirmed">akud n nyewkalidunya</generic>
+					<standard draft="unconfirmed">akud anaway n nyewkalidunya</standard>
+					<daylight draft="unconfirmed">akud n uzil n nyewkalidunya</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic draft="unconfirmed">akud n nyuziland</generic>
+					<standard draft="unconfirmed">akud anaway n nyuziland</standard>
+					<daylight draft="unconfirmed">akud n uzil n nyuziland</daylight>
+				</long>
+			</metazone>
 			<metazone type="Newfoundland">
 				<long>
 					<generic draft="unconfirmed">akud n nyuw fawemd land</generic>
@@ -2340,6 +2989,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n nyuw fawemd land</daylight>
 				</long>
 			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard draft="unconfirmed">akud n nyu</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<generic draft="unconfirmed">akud n tayzirt n nurfuk</generic>
+					<standard draft="unconfirmed">akud anaway n tayzirt n nurfuk</standard>
+					<daylight draft="unconfirmed">akud n uzil n tayzirt n nurfuk</daylight>
+				</long>
+			</metazone>
 			<metazone type="Noronha">
 				<long>
 					<generic draft="unconfirmed">akud n firnardu dinurunha</generic>
@@ -2347,6 +3008,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n firnardu dinurunha</daylight>
 				</long>
 			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic draft="unconfirmed">akud n nubusibirsek</generic>
+					<standard draft="unconfirmed">akud anaway n nubusibirsek</standard>
+					<daylight draft="unconfirmed">akud n uzil n nubusibirsek</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic draft="unconfirmed">akud n umsek</generic>
+					<standard draft="unconfirmed">akud anaway n umsek</standard>
+					<daylight draft="unconfirmed">akud n uzil n umsek</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic draft="unconfirmed">akud n pakistan</generic>
+					<standard draft="unconfirmed">akud anaway n pakistan</standard>
+					<daylight draft="unconfirmed">akud n uzil n pakistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard draft="unconfirmed">akud n palaw</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard draft="unconfirmed">akud n papwa ɣinya tamaynut</standard>
+				</long>
+			</metazone>
 			<metazone type="Paraguay">
 				<long>
 					<generic draft="unconfirmed">akud n pparagway</generic>
@@ -2361,6 +3053,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n ppiru</daylight>
 				</long>
 			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic draft="unconfirmed">akud n filippin</generic>
+					<standard draft="unconfirmed">akud anaway n filippin</standard>
+					<daylight draft="unconfirmed">akud n uzil n filippin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard draft="unconfirmed">akud n tigzirin n finiks</standard>
+				</long>
+			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
 					<generic draft="unconfirmed">akud n sant-pyiɣ d mikilun</generic>
@@ -2368,16 +3072,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n sant-pyiɣ d mikilun</daylight>
 				</long>
 			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard draft="unconfirmed">akud n pitkirn</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard draft="unconfirmed">akud n punpi</standard>
+				</long>
+			</metazone>
+			<metazone type="Pyongyang">
+				<long>
+					<standard draft="unconfirmed">akud n kurya n sennej</standard>
+				</long>
+			</metazone>
 			<metazone type="Reunion">
 				<long>
 					<standard draft="unconfirmed">akud n riyunyun</standard>
 				</long>
 			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard draft="unconfirmed">akud n rutira</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic draft="unconfirmed">akud n saxalin</generic>
+					<standard draft="unconfirmed">akud anaway n saxalin</standard>
+					<daylight draft="unconfirmed">akud n uzil n saxalin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic draft="unconfirmed">akud n samwa tamarikant</generic>
+					<standard draft="unconfirmed">akud anaway n samwa tamarikant</standard>
+					<daylight draft="unconfirmed">akud n uzil n samwa tamarikant</daylight>
+				</long>
+			</metazone>
 			<metazone type="Seychelles">
 				<long>
 					<standard draft="unconfirmed">akud n saycal</standard>
 				</long>
 			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard draft="unconfirmed">akud anaway n singappur</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard draft="unconfirmed">akud n tigzirin n sulumun</standard>
+				</long>
+			</metazone>
 			<metazone type="South_Georgia">
 				<long>
 					<standard draft="unconfirmed">akud n jyurjya n wadday</standard>
@@ -2388,6 +3136,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">akud n surinam</standard>
 				</long>
 			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard draft="unconfirmed">akud n syuwa</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard draft="unconfirmed">akud n tahiti</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic draft="unconfirmed">akud n ṭṭaywan</generic>
+					<standard draft="unconfirmed">akud anaway n ṭṭaywan</standard>
+					<daylight draft="unconfirmed">akud n uzil n ṭṭaywan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard draft="unconfirmed">akud n tajikistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard draft="unconfirmed">akud n tuwkulaw</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic draft="unconfirmed">akud n ṭunga</generic>
+					<standard draft="unconfirmed">akud anaway n ṭunga</standard>
+					<daylight draft="unconfirmed">akud n uzil n ṭunga</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard draft="unconfirmed">akud n tcuk</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic draft="unconfirmed">akud n ṭurkmanistan</generic>
+					<standard draft="unconfirmed">akud anaway n ṭurkmanistan</standard>
+					<daylight draft="unconfirmed">akud n uzil n ṭurkmanistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard draft="unconfirmed">akud n ṭubalu</standard>
+				</long>
+			</metazone>
 			<metazone type="Uruguay">
 				<long>
 					<generic draft="unconfirmed">akud n urugway</generic>
@@ -2395,11 +3194,68 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n urugway</daylight>
 				</long>
 			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic draft="unconfirmed">akud n uẓbakistan</generic>
+					<standard draft="unconfirmed">akud n anaway n uẓbakistan</standard>
+					<daylight draft="unconfirmed">akud n uzil n uẓbakistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic draft="unconfirmed">akud n banwatu</generic>
+					<standard draft="unconfirmed">akud anaway n banwatu</standard>
+					<daylight draft="unconfirmed">akud n uzil n banwatu</daylight>
+				</long>
+			</metazone>
 			<metazone type="Venezuela">
 				<long>
 					<standard draft="unconfirmed">akud n vinzwila</standard>
 				</long>
 			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic draft="unconfirmed">akud n bladibustuk</generic>
+					<standard draft="unconfirmed">akud anaway n bladibustuk</standard>
+					<daylight draft="unconfirmed">akud n uzil n bladibustuk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic draft="unconfirmed">akud n bulgugrad</generic>
+					<standard draft="unconfirmed">akud anaway n bulgugrad</standard>
+					<daylight draft="unconfirmed">akud n uzil n bulgugrad</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard draft="unconfirmed">akud n bustuk</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard draft="unconfirmed">akud n tagzirt n wayk</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard draft="unconfirmed">akud n walis d futuna</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic draft="unconfirmed">akud n yakutsek</generic>
+					<standard draft="unconfirmed">akud anaway n yakutsek</standard>
+					<daylight draft="unconfirmed">akud n uzil n yakutsek</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic draft="unconfirmed">akud n yakatirinburg</generic>
+					<standard draft="unconfirmed">akud anaway n yakatirinburg</standard>
+					<daylight draft="unconfirmed">akud n uzil n yakatirinburg</daylight>
+				</long>
+			</metazone>
 			<metazone type="Yukon">
 				<long>
 					<standard draft="unconfirmed">akud n yukun</standard>
@@ -2441,14 +3297,126 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other">0K ¤</pattern>
+					<pattern type="10000" count="other">00K ¤</pattern>
+					<pattern type="100000" count="other">000K ¤</pattern>
+					<pattern type="1000000" count="other">0M ¤</pattern>
+					<pattern type="10000000" count="other">00M ¤</pattern>
+					<pattern type="100000000" count="other">000M ¤</pattern>
+					<pattern type="1000000000" count="other">0G ¤</pattern>
+					<pattern type="10000000000" count="other">00G ¤</pattern>
+					<pattern type="100000000000" count="other">000G ¤</pattern>
+					<pattern type="1000000000000" count="other">0T ¤</pattern>
+					<pattern type="10000000000000" count="other">00T ¤</pattern>
+					<pattern type="100000000000000" count="other">000T ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
 		<currencies>
+			<currency type="AED">
+				<displayName draft="unconfirmed">dderhem n limarat</displayName>
+				<displayName count="other" draft="unconfirmed">dderhem n limarat</displayName>
+			</currency>
+			<currency type="AFN">
+				<displayName draft="unconfirmed">afɣani</displayName>
+				<displayName count="other" draft="unconfirmed">afɣani</displayName>
+			</currency>
+			<currency type="ALL">
+				<displayName draft="unconfirmed">lik n walbanya</displayName>
+				<displayName count="other" draft="unconfirmed">lik n walbanya</displayName>
+			</currency>
+			<currency type="AMD">
+				<displayName draft="unconfirmed">ddram n arminya</displayName>
+				<displayName count="other" draft="unconfirmed">ddram n arminya</displayName>
+			</currency>
+			<currency type="ANG">
+				<displayName draft="unconfirmed">xulden n wantil</displayName>
+				<displayName count="other" draft="unconfirmed">xulden n wantil</displayName>
+			</currency>
+			<currency type="AOA">
+				<displayName draft="unconfirmed">kwanza n angula</displayName>
+				<displayName count="other" draft="unconfirmed">kwanza n angula</displayName>
+			</currency>
+			<currency type="ARS">
+				<displayName draft="unconfirmed">pisus n arxantina</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n arxantina</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName draft="unconfirmed">ddular n wustralya</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n wustralya</displayName>
+			</currency>
+			<currency type="AWG">
+				<displayName draft="unconfirmed">flurin n aruba</displayName>
+				<displayName count="other" draft="unconfirmed">flurin n aruba</displayName>
+			</currency>
+			<currency type="AZN">
+				<displayName draft="unconfirmed">manat n azrabijan</displayName>
+				<displayName count="other" draft="unconfirmed">manat n azrabijan</displayName>
+			</currency>
+			<currency type="BAM">
+				<displayName draft="unconfirmed">mark n busniya</displayName>
+				<displayName count="other" draft="unconfirmed">mark n busniya</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName draft="unconfirmed">ddular n barbadyan</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n barbadyan</displayName>
+			</currency>
+			<currency type="BDT">
+				<displayName draft="unconfirmed">ṭaka n bangladic</displayName>
+				<displayName count="other" draft="unconfirmed">ṭaka n bangladic</displayName>
+			</currency>
+			<currency type="BGN">
+				<displayName draft="unconfirmed">liva n belgarya</displayName>
+				<displayName count="other" draft="unconfirmed">liva n belgarya</displayName>
+			</currency>
+			<currency type="BHD">
+				<displayName draft="unconfirmed">ddinar n lbeḥrin</displayName>
+				<displayName count="other" draft="unconfirmed">ddinar n lbeḥrin</displayName>
+			</currency>
+			<currency type="BIF">
+				<displayName draft="unconfirmed">frank n burundi</displayName>
+				<displayName count="other" draft="unconfirmed">frank n burundi</displayName>
+			</currency>
 			<currency type="BMD">
 				<displayName draft="unconfirmed">Bermudan Dollar</displayName>
 				<displayName count="other" draft="unconfirmed">ddular n birmudan</displayName>
 			</currency>
+			<currency type="BND">
+				<displayName draft="unconfirmed">ddular n brunay</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n brunay</displayName>
+			</currency>
+			<currency type="BOB">
+				<displayName draft="unconfirmed">bulibyanu</displayName>
+				<displayName count="other" draft="unconfirmed">bulibyanu</displayName>
+			</currency>
+			<currency type="BRL">
+				<displayName draft="unconfirmed">riyal n brazil</displayName>
+				<displayName count="other" draft="unconfirmed">riyal n brazil</displayName>
+			</currency>
+			<currency type="BSD">
+				<displayName draft="unconfirmed">ddular n bahamas</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n bahamas</displayName>
+			</currency>
+			<currency type="BTN">
+				<displayName draft="unconfirmed">ngultrum n buṭan</displayName>
+				<displayName count="other" draft="unconfirmed">ngultrum n buṭan</displayName>
+			</currency>
+			<currency type="BWP">
+				<displayName draft="unconfirmed">pula n buteswana</displayName>
+				<displayName count="other" draft="unconfirmed">pula n buteswana</displayName>
+			</currency>
+			<currency type="BYN">
+				<displayName draft="unconfirmed">rrubel n bilarus</displayName>
+				<displayName count="other" draft="unconfirmed">rrubel n bilarus</displayName>
+			</currency>
 			<currency type="BZD">
 				<displayName draft="unconfirmed">Belize Dollar</displayName>
 				<displayName count="other" draft="unconfirmed">ddular n biliz</displayName>
@@ -2457,66 +3425,542 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">Canadian Dollar</displayName>
 				<displayName count="other" draft="unconfirmed">ddular n kanada</displayName>
 			</currency>
+			<currency type="CDF">
+				<displayName draft="unconfirmed">frank n kungu</displayName>
+				<displayName count="other" draft="unconfirmed">frank n kungu</displayName>
+			</currency>
+			<currency type="CHF">
+				<displayName draft="unconfirmed">frank</displayName>
+				<displayName count="other" draft="unconfirmed">frank</displayName>
+			</currency>
+			<currency type="CLP">
+				<displayName draft="unconfirmed">pisus n tcili</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n tcili</displayName>
+			</currency>
+			<currency type="CNH">
+				<displayName draft="unconfirmed">ywan n cina</displayName>
+				<displayName count="other" draft="unconfirmed">ywan n cina</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName draft="unconfirmed">ywan n tcina</displayName>
+				<displayName count="other" draft="unconfirmed">ywan n tcina</displayName>
+			</currency>
+			<currency type="COP">
+				<displayName draft="unconfirmed">pisus n kulumbya</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n kulumbya</displayName>
+			</currency>
 			<currency type="CRC">
 				<displayName draft="unconfirmed">Costa Rican Colón</displayName>
 				<displayName count="other" draft="unconfirmed">kulun n kustarika</displayName>
 			</currency>
+			<currency type="CUC">
+				<displayName draft="unconfirmed">pisus n kuba</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n kuba</displayName>
+			</currency>
+			<currency type="CUP">
+				<displayName draft="unconfirmed">pisus n kuba</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n kuba</displayName>
+			</currency>
+			<currency type="CVE">
+				<displayName draft="unconfirmed">iskudu n qabu yazegza</displayName>
+				<displayName count="other" draft="unconfirmed">iskudu n qabu yazegza</displayName>
+			</currency>
+			<currency type="CZK">
+				<displayName draft="unconfirmed">kruna n ttcik</displayName>
+				<displayName count="other" draft="unconfirmed">kruna n ttcik</displayName>
+			</currency>
+			<currency type="DJF">
+				<displayName draft="unconfirmed">frank n djibuti</displayName>
+				<displayName count="other" draft="unconfirmed">frank n djibuti</displayName>
+			</currency>
 			<currency type="DKK">
 				<displayName draft="unconfirmed">Danish Krone</displayName>
 				<displayName count="other" draft="unconfirmed">kruna n ddanmark</displayName>
 			</currency>
+			<currency type="DOP">
+				<displayName draft="unconfirmed">pisus n dduminik</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n dduminik</displayName>
+			</currency>
 			<currency type="DZD">
 				<displayName draft="unconfirmed">Algerian Dinar</displayName>
 				<displayName count="other" draft="unconfirmed">ddinar n ddzayer</displayName>
 			</currency>
+			<currency type="EGP">
+				<displayName draft="unconfirmed">ljunih n masr</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n masr</displayName>
+			</currency>
+			<currency type="ERN">
+				<displayName draft="unconfirmed">nafka n iritirya</displayName>
+				<displayName count="other" draft="unconfirmed">nafka n iritirya</displayName>
+			</currency>
+			<currency type="ETB">
+				<displayName draft="unconfirmed">bir n yityupya</displayName>
+				<displayName count="other" draft="unconfirmed">bir n yityupya</displayName>
+			</currency>
 			<currency type="EUR">
 				<displayName draft="unconfirmed">Euro</displayName>
 				<displayName count="other" draft="unconfirmed">uru</displayName>
 			</currency>
+			<currency type="FJD">
+				<displayName draft="unconfirmed">ddular n fiji</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n fiji</displayName>
+			</currency>
+			<currency type="FKP">
+				<displayName draft="unconfirmed">ljunih n falkland</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n falkland</displayName>
+			</currency>
 			<currency type="GBP">
 				<displayName draft="unconfirmed">British Pound</displayName>
-				<displayName count="other" draft="unconfirmed">ppaʷndd</displayName>
+				<displayName count="other" draft="unconfirmed">jinuh</displayName>
+			</currency>
+			<currency type="GEL">
+				<displayName draft="unconfirmed">lari n gyurgya</displayName>
+				<displayName count="other" draft="unconfirmed">lari n gyurgya</displayName>
+			</currency>
+			<currency type="GHS">
+				<displayName draft="unconfirmed">sidiy n ɣana</displayName>
+				<displayName count="other" draft="unconfirmed">sidiy n ɣana</displayName>
+			</currency>
+			<currency type="GIP">
+				<displayName draft="unconfirmed">ljunih n jabalṭariq</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n jabalṭariq</displayName>
+			</currency>
+			<currency type="GMD">
+				<displayName draft="unconfirmed">dalasi n ɣambya</displayName>
+				<displayName count="other" draft="unconfirmed">dalasi n ɣambya</displayName>
+			</currency>
+			<currency type="GNF">
+				<displayName draft="unconfirmed">frank n ɣinya</displayName>
+				<displayName count="other" draft="unconfirmed">frank n ɣinya</displayName>
 			</currency>
 			<currency type="GTQ">
 				<displayName draft="unconfirmed">Guatemalan Quetzal</displayName>
 				<displayName count="other" draft="unconfirmed">kwitzal n gwatimala</displayName>
 			</currency>
+			<currency type="GYD">
+				<displayName draft="unconfirmed">ddular n guyana</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n guyana</displayName>
+			</currency>
+			<currency type="HKD">
+				<displayName draft="unconfirmed">ddular n hungkung</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n hungkung</displayName>
+			</currency>
 			<currency type="HNL">
 				<displayName draft="unconfirmed">Honduran Lempira</displayName>
 				<displayName count="other" draft="unconfirmed">lempiras n hondura</displayName>
 			</currency>
+			<currency type="HRK">
+				<displayName draft="unconfirmed">kuna n kerwatya</displayName>
+				<displayName count="other" draft="unconfirmed">kuna n kerwatya</displayName>
+			</currency>
+			<currency type="HTG">
+				<displayName draft="unconfirmed">ɣurda n hayṭi</displayName>
+				<displayName count="other" draft="unconfirmed">ɣurda n hayṭi</displayName>
+			</currency>
+			<currency type="HUF">
+				<displayName draft="unconfirmed">furint n hungatya</displayName>
+				<displayName count="other" draft="unconfirmed">furint n hungatya</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName draft="unconfirmed">rrupya n yindunisya</displayName>
+				<displayName count="other" draft="unconfirmed">rrupya n yindunisya</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName draft="unconfirmed">cikel</displayName>
+				<displayName count="other" draft="unconfirmed">cikel</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName draft="unconfirmed">rrupya n lhend</displayName>
+				<displayName count="other" draft="unconfirmed">Indian rupees</displayName>
+			</currency>
+			<currency type="IQD">
+				<displayName draft="unconfirmed">ddinar n lɛiraq</displayName>
+				<displayName count="other" draft="unconfirmed">ddinar n lɛiraq</displayName>
+			</currency>
+			<currency type="IRR">
+				<displayName draft="unconfirmed">rryal n iran</displayName>
+				<displayName count="other" draft="unconfirmed">Iranian rials</displayName>
+			</currency>
+			<currency type="ISK">
+				<displayName draft="unconfirmed">kruna n yeslanda</displayName>
+				<displayName count="other" draft="unconfirmed">kruna n yeslanda</displayName>
+			</currency>
+			<currency type="JMD">
+				<displayName draft="unconfirmed">ddular n jamayka</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n jamayka</displayName>
+			</currency>
+			<currency type="JOD">
+				<displayName draft="unconfirmed">ddinar n lurdun</displayName>
+				<displayName count="other" draft="unconfirmed">ddinar n lurdun</displayName>
+			</currency>
+			<currency type="JPY">
+				<displayName draft="unconfirmed">lyan n jjapun</displayName>
+				<displayName count="other" draft="unconfirmed">lyan n jjapun</displayName>
+			</currency>
+			<currency type="KES">
+				<displayName draft="unconfirmed">cilin n kinya</displayName>
+				<displayName count="other" draft="unconfirmed">cilin n kinya</displayName>
+			</currency>
+			<currency type="KGS">
+				<displayName draft="unconfirmed">sum n kirgistan</displayName>
+				<displayName count="other" draft="unconfirmed">sum n kirgistan</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName draft="unconfirmed">rryal n kambudya</displayName>
+				<displayName count="other" draft="unconfirmed">rryal n kambudya</displayName>
+			</currency>
+			<currency type="KMF">
+				<displayName draft="unconfirmed">frank n qumrus</displayName>
+				<displayName count="other" draft="unconfirmed">frank n qumrus</displayName>
+			</currency>
+			<currency type="KPW">
+				<displayName draft="unconfirmed">wun n kurya n sennej</displayName>
+				<displayName count="other" draft="unconfirmed">wun n kurya n sennej</displayName>
+			</currency>
+			<currency type="KRW">
+				<displayName draft="unconfirmed">wun n kurya n wadday</displayName>
+				<displayName count="other" draft="unconfirmed">wun n kurya n wadday</displayName>
+			</currency>
+			<currency type="KWD">
+				<displayName draft="unconfirmed">ddinar n lkuwit</displayName>
+				<displayName count="other" draft="unconfirmed">ddinar n lkuwit</displayName>
+			</currency>
+			<currency type="KYD">
+				<displayName draft="unconfirmed">ddular n sayman</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n sayman</displayName>
+			</currency>
+			<currency type="KZT">
+				<displayName draft="unconfirmed">tinga n kazaxistan</displayName>
+				<displayName count="other" draft="unconfirmed">tinga n kazaxistan</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName draft="unconfirmed">kip n lawes</displayName>
+				<displayName count="other" draft="unconfirmed">kip n lawes</displayName>
+			</currency>
+			<currency type="LBP">
+				<displayName draft="unconfirmed">ljunih n lubnan</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n lubnan</displayName>
+			</currency>
+			<currency type="LKR">
+				<displayName draft="unconfirmed">rrupya n Sri Lanka</displayName>
+				<displayName count="other" draft="unconfirmed">Sri Lankan rupees</displayName>
+			</currency>
+			<currency type="LRD">
+				<displayName draft="unconfirmed">ddular n libirya</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n libirya</displayName>
+			</currency>
+			<currency type="LSL">
+				<displayName draft="unconfirmed">lluti n lisutu</displayName>
+				<displayName count="other" draft="unconfirmed">lluti n lisutu</displayName>
+			</currency>
 			<currency type="LYD">
 				<displayName draft="unconfirmed">Libyan Dinar</displayName>
 				<displayName count="other" draft="unconfirmed">ddinar n libya</displayName>
 			</currency>
 			<currency type="MAD">
-				<displayName draft="unconfirmed">Moroccan Dirham</displayName>
-				<displayName count="other" draft="unconfirmed">derhem</displayName>
+				<displayName draft="unconfirmed">dderhem ameɣrabi</displayName>
+				<displayName count="other" draft="unconfirmed">dderhem</displayName>
+			</currency>
+			<currency type="MDL">
+				<displayName draft="unconfirmed">liyu n muldub</displayName>
+				<displayName count="other" draft="unconfirmed">liyu n muldub</displayName>
+			</currency>
+			<currency type="MGA">
+				<displayName draft="unconfirmed">aryari n madaɣacqar</displayName>
+				<displayName count="other" draft="unconfirmed">aryari n madaɣacqar</displayName>
+			</currency>
+			<currency type="MKD">
+				<displayName draft="unconfirmed">ddinar n maqdunya</displayName>
+				<displayName count="other" draft="unconfirmed">ddinar n maqdunya</displayName>
+			</currency>
+			<currency type="MMK">
+				<displayName draft="unconfirmed">kyat n myanmar</displayName>
+				<displayName count="other" draft="unconfirmed">kyat n myanmar</displayName>
+			</currency>
+			<currency type="MNT">
+				<displayName draft="unconfirmed">tugrug n mangulya</displayName>
+				<displayName count="other" draft="unconfirmed">tugrug n mangulya</displayName>
+			</currency>
+			<currency type="MOP">
+				<displayName draft="unconfirmed">patakaw n makkaw</displayName>
+				<displayName count="other" draft="unconfirmed">patakaw n makkaw</displayName>
+			</currency>
+			<currency type="MRU">
+				<displayName draft="unconfirmed">uqiya n muritanya</displayName>
+				<displayName count="other" draft="unconfirmed">uqiya n muritanya</displayName>
+			</currency>
+			<currency type="MUR">
+				<displayName draft="unconfirmed">rrupya n muriṭanya</displayName>
+				<displayName count="other" draft="unconfirmed">rrupya n muriṭanya</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName draft="unconfirmed">rrufiya n maldib</displayName>
+				<displayName count="other" draft="unconfirmed">Maldivian rufiyaas</displayName>
+			</currency>
+			<currency type="MWK">
+				<displayName draft="unconfirmed">kwaca n malawi</displayName>
+				<displayName count="other" draft="unconfirmed">kwaca n malawi</displayName>
 			</currency>
 			<currency type="MXN">
 				<displayName draft="unconfirmed">Mexican Peso</displayName>
 				<displayName count="other" draft="unconfirmed">pisus n miksiku</displayName>
 			</currency>
+			<currency type="MYR">
+				<displayName draft="unconfirmed">ringit n malizya</displayName>
+				<displayName count="other" draft="unconfirmed">ringit n malizya</displayName>
+			</currency>
+			<currency type="MZN">
+				<displayName draft="unconfirmed">metqal n muzembiq</displayName>
+				<displayName count="other" draft="unconfirmed">metqal n muzembiq</displayName>
+			</currency>
+			<currency type="NAD">
+				<displayName draft="unconfirmed">ddular n nambya</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n nambya</displayName>
+			</currency>
+			<currency type="NGN">
+				<displayName draft="unconfirmed">nira n nijirya</displayName>
+				<displayName count="other" draft="unconfirmed">nira n nijirya</displayName>
+			</currency>
+			<currency type="NIO">
+				<displayName draft="unconfirmed">kurduba n nikaragwa</displayName>
+				<displayName count="other" draft="unconfirmed">kurduba n nikaragwa</displayName>
+			</currency>
 			<currency type="NOK">
 				<displayName draft="unconfirmed">Norwegian Krone</displayName>
 				<displayName count="other" draft="unconfirmed">kruna n nnarwij</displayName>
 			</currency>
+			<currency type="NPR">
+				<displayName draft="unconfirmed">rrupya n nnipal</displayName>
+				<displayName count="other" draft="unconfirmed">rrupya n nnipal</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName draft="unconfirmed">ddular nyuziland</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n yuziland</displayName>
+			</currency>
+			<currency type="OMR">
+				<displayName draft="unconfirmed">rriyal n ɛumman</displayName>
+				<displayName count="other" draft="unconfirmed">rriyal n ɛumman</displayName>
+			</currency>
+			<currency type="PAB">
+				<displayName draft="unconfirmed">balbaw n panama</displayName>
+				<displayName count="other" draft="unconfirmed">balbaw n panama</displayName>
+			</currency>
+			<currency type="PEN">
+				<displayName draft="unconfirmed">ssul n piru</displayName>
+				<displayName count="other" draft="unconfirmed">ssul n piru</displayName>
+			</currency>
+			<currency type="PGK">
+				<displayName draft="unconfirmed">kina n papwa</displayName>
+				<displayName count="other" draft="unconfirmed">kina n papwa</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName draft="unconfirmed">pisus n filippin</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n filippin</displayName>
+			</currency>
+			<currency type="PKR">
+				<displayName draft="unconfirmed">rrupya n pakistan</displayName>
+				<displayName count="other" draft="unconfirmed">rrupya n pakistan</displayName>
+			</currency>
+			<currency type="PLN">
+				<displayName draft="unconfirmed">zluṭi n pulanda</displayName>
+				<displayName count="other" draft="unconfirmed">zluṭi n pulanda</displayName>
+			</currency>
+			<currency type="PYG">
+				<displayName draft="unconfirmed">gwarani n paragway</displayName>
+				<displayName count="other" draft="unconfirmed">gwarani n paragway</displayName>
+			</currency>
+			<currency type="QAR">
+				<displayName draft="unconfirmed">rriyal n qatar</displayName>
+				<displayName count="other" draft="unconfirmed">rriyal n qatar</displayName>
+			</currency>
+			<currency type="RON">
+				<displayName draft="unconfirmed">liyu n rumanya</displayName>
+				<displayName count="other" draft="unconfirmed">liyu n rumanya</displayName>
+			</currency>
+			<currency type="RSD">
+				<displayName draft="unconfirmed">ddinar n sirbya</displayName>
+				<displayName count="other" draft="unconfirmed">ddinar n sirbya</displayName>
+			</currency>
+			<currency type="RUB">
+				<displayName draft="unconfirmed">rrubel</displayName>
+				<displayName count="other" draft="unconfirmed">rrubel</displayName>
+			</currency>
+			<currency type="RWF">
+				<displayName draft="unconfirmed">frank n ruwanda</displayName>
+				<displayName count="other" draft="unconfirmed">frank n ruwanda</displayName>
+			</currency>
+			<currency type="SAR">
+				<displayName draft="unconfirmed">rriyal n ssaɛud</displayName>
+				<displayName count="other" draft="unconfirmed">rriyal n ssaɛud</displayName>
+			</currency>
+			<currency type="SBD">
+				<displayName draft="unconfirmed">ddular n sulumun</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n sulumun</displayName>
+			</currency>
+			<currency type="SCR">
+				<displayName draft="unconfirmed">rrupya n sicel</displayName>
+				<displayName count="other" draft="unconfirmed">rrupya n sicel</displayName>
+			</currency>
+			<currency type="SDG">
+				<displayName draft="unconfirmed">ljunih n ssudan</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n ssudan</displayName>
+			</currency>
 			<currency type="SEK">
 				<displayName draft="unconfirmed">Swedish Krona</displayName>
 				<displayName count="other" draft="unconfirmed">kruna n sswid</displayName>
 			</currency>
+			<currency type="SGD">
+				<displayName draft="unconfirmed">ddular n sanɣafura</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n sanɣafura</displayName>
+			</currency>
+			<currency type="SHP">
+				<displayName draft="unconfirmed">ljunih n hilina</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n hilina</displayName>
+			</currency>
+			<currency type="SLE">
+				<displayName draft="unconfirmed">lyun n siraliyyun</displayName>
+				<displayName count="other" draft="unconfirmed">lyun n siraliyyun</displayName>
+			</currency>
+			<currency type="SLL">
+				<displayName draft="unconfirmed">lyun n siraliyyun</displayName>
+				<displayName count="other" draft="unconfirmed">lyun n siraliyyun</displayName>
+			</currency>
+			<currency type="SOS">
+				<displayName draft="unconfirmed">cilin n ssumal</displayName>
+				<displayName count="other" draft="unconfirmed">cilin n ssumal</displayName>
+			</currency>
+			<currency type="SRD">
+				<displayName draft="unconfirmed">ddular n surinam</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n surinam</displayName>
+			</currency>
+			<currency type="SSP">
+				<displayName draft="unconfirmed">ljunih n ssudan n wadday</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n ssudan n wadday</displayName>
+			</currency>
+			<currency type="STN">
+				<displayName draft="unconfirmed">dubra n sawtumi</displayName>
+				<displayName count="other" draft="unconfirmed">dubra n sawtumi</displayName>
+			</currency>
+			<currency type="SYP">
+				<displayName draft="unconfirmed">ljunih n surya</displayName>
+				<displayName count="other" draft="unconfirmed">ljunih n surya</displayName>
+			</currency>
+			<currency type="SZL">
+				<displayName draft="unconfirmed">lilangini</displayName>
+				<displayName count="other" draft="unconfirmed">lilangini</displayName>
+			</currency>
+			<currency type="THB">
+				<displayName draft="unconfirmed">baṭ n ṭṭayland</displayName>
+				<displayName count="other" draft="unconfirmed">baṭ n ṭṭayland</displayName>
+			</currency>
+			<currency type="TJS">
+				<displayName draft="unconfirmed">sumuni n tajikistan</displayName>
+				<displayName count="other" draft="unconfirmed">sumuni n tajikistan</displayName>
+			</currency>
+			<currency type="TMT">
+				<displayName draft="unconfirmed">manat n ṭurkmanistan</displayName>
+				<displayName count="other" draft="unconfirmed">manat n ṭurkmanistan</displayName>
+			</currency>
 			<currency type="TND">
 				<displayName draft="unconfirmed">Tunisian Dinar</displayName>
 				<displayName count="other" draft="unconfirmed">ddinar n tunes</displayName>
 			</currency>
+			<currency type="TOP">
+				<displayName draft="unconfirmed">panga n ṭunga</displayName>
+				<displayName count="other" draft="unconfirmed">panga</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName draft="unconfirmed">llira</displayName>
+				<displayName count="other" draft="unconfirmed">llira</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName draft="unconfirmed">ddular n trinindad</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n trinindad</displayName>
+			</currency>
+			<currency type="TWD">
+				<displayName draft="unconfirmed">ddular n ttaywan</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n ttaywan</displayName>
+			</currency>
+			<currency type="TZS">
+				<displayName draft="unconfirmed">cilin n tanzanya</displayName>
+				<displayName count="other" draft="unconfirmed">cilin n tanzanya</displayName>
+			</currency>
+			<currency type="UAH">
+				<displayName draft="unconfirmed">hribnya n wekranya</displayName>
+				<displayName count="other" draft="unconfirmed">hribnya n wekranya</displayName>
+			</currency>
+			<currency type="UGX">
+				<displayName draft="unconfirmed">cilin n uɣanda</displayName>
+				<displayName count="other" draft="unconfirmed">cilin n uɣanda</displayName>
+			</currency>
 			<currency type="USD">
 				<displayName draft="unconfirmed">US Dollar</displayName>
 				<displayName count="other" draft="unconfirmed">ddular</displayName>
 			</currency>
+			<currency type="UYU">
+				<displayName draft="unconfirmed">pisus n urugway</displayName>
+				<displayName count="other" draft="unconfirmed">pisus n urugway</displayName>
+			</currency>
+			<currency type="UZS">
+				<displayName draft="unconfirmed">sum n uzbakistan</displayName>
+				<displayName count="other" draft="unconfirmed">sum n uzbakistan</displayName>
+			</currency>
+			<currency type="VES">
+				<displayName draft="unconfirmed">bulibyar</displayName>
+				<displayName count="other" draft="unconfirmed">bulibyar</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName draft="unconfirmed">ddung n bitnam</displayName>
+				<displayName count="other" draft="unconfirmed">ddung n bitnam</displayName>
+			</currency>
+			<currency type="VUV">
+				<displayName draft="unconfirmed">batu n banwatu</displayName>
+				<displayName count="other" draft="unconfirmed">batu n banwatu</displayName>
+			</currency>
+			<currency type="WST">
+				<displayName draft="unconfirmed">tala n samwa</displayName>
+				<displayName count="other" draft="unconfirmed">tala n samwa</displayName>
+			</currency>
+			<currency type="XAF">
+				<displayName draft="unconfirmed">frank n wafriqa</displayName>
+				<displayName count="other" draft="unconfirmed">frank n wafriqa</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName draft="unconfirmed">ddular n karibyan</displayName>
+				<displayName count="other" draft="unconfirmed">ddular n karibyan</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName draft="unconfirmed">xulden n karibyan</displayName>
+				<displayName count="other" draft="unconfirmed">xulden n karibyan</displayName>
+			</currency>
+			<currency type="XOF">
+				<displayName draft="unconfirmed">frank n wafriqa</displayName>
+				<displayName count="other" draft="unconfirmed">frank n wafriqa</displayName>
+			</currency>
+			<currency type="XPF">
+				<displayName draft="unconfirmed">frank n kalidunya</displayName>
+				<displayName count="other" draft="unconfirmed">frank n kalidunya</displayName>
+			</currency>
 			<currency type="XXX">
 				<displayName draft="unconfirmed">ttmenyat</displayName>
 				<displayName count="other" draft="unconfirmed">ttmneyat</displayName>
 			</currency>
+			<currency type="YER">
+				<displayName draft="unconfirmed">rriyal n lyaman</displayName>
+				<displayName count="other" draft="unconfirmed">rriyal n lyaman</displayName>
+			</currency>
+			<currency type="ZAR">
+				<displayName draft="unconfirmed">rrand n tafriqt n wadday</displayName>
+				<displayName count="other" draft="unconfirmed">rrand n tafriqt n wadday</displayName>
+			</currency>
+			<currency type="ZMW">
+				<displayName draft="unconfirmed">kwaca n zambya</displayName>
+				<displayName count="other" draft="unconfirmed">kwaca n zambya</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName draft="unconfirmed">uru n zimbabwi</displayName>
+				<displayName count="other" draft="unconfirmed">uru n zimbabwi</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="other" draft="unconfirmed">{0} n wussan</pluralMinimalPairs>
diff --git a/make/data/cldr/common/main/rm.xml b/make/data/cldr/common/main/rm.xml
index e5e3aeaa8c5..13ac0b64f23 100644
--- a/make/data/cldr/common/main/rm.xml
+++ b/make/data/cldr/common/main/rm.xml
@@ -19,62 +19,65 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ada" draft="contributed">andangme</language>
 			<language type="ady" draft="contributed">adygai</language>
 			<language type="ae" draft="contributed">avestic</language>
-			<language type="af" draft="contributed">afrikaans</language>
+			<language type="af">afrikaans</language>
 			<language type="afh" draft="contributed">afrihili</language>
 			<language type="agq">aghem</language>
 			<language type="ain" draft="contributed">ainu</language>
-			<language type="ak" draft="contributed">akan</language>
+			<language type="ak">akan</language>
 			<language type="akk" draft="contributed">accadic</language>
 			<language type="ale" draft="contributed">aleutic</language>
 			<language type="alt" draft="contributed">altaic dal sid</language>
-			<language type="am" draft="contributed">amaric</language>
+			<language type="am">amaric</language>
 			<language type="an" draft="contributed">aragonais</language>
 			<language type="ang" draft="contributed">englais vegl</language>
 			<language type="anp" draft="contributed">angika</language>
-			<language type="ar" draft="contributed">arab</language>
-			<language type="ar_001">arab modern standardisà</language>
+			<language type="ar">arab</language>
+			<language type="ar_001">arab standardisà modern</language>
 			<language type="arc" draft="contributed">arameic</language>
 			<language type="arn" draft="contributed">araucanic</language>
 			<language type="arp" draft="contributed">arapaho</language>
 			<language type="arw" draft="contributed">arawak</language>
-			<language type="as" draft="contributed">assami</language>
+			<language type="as">assami</language>
 			<language type="asa">asu</language>
-			<language type="ast" draft="contributed">asturian</language>
+			<language type="ast">asturian</language>
 			<language type="av" draft="contributed">avaric</language>
 			<language type="awa" draft="contributed">awadhi</language>
 			<language type="ay" draft="contributed">aymara</language>
-			<language type="az" draft="contributed">aserbeidschanic</language>
+			<language type="az">lingua aserbaidschana</language>
+			<language type="az" alt="short">azeri</language>
 			<language type="ba" draft="contributed">baschkir</language>
-			<language type="bal" draft="contributed">belutschi</language>
+			<language type="bal">belutschi</language>
 			<language type="ban" draft="contributed">balinais</language>
 			<language type="bas" draft="contributed">basaa</language>
-			<language type="be" draft="contributed">bieloruss</language>
+			<language type="be">lingua bielorussa</language>
 			<language type="bej" draft="contributed">bedscha</language>
 			<language type="bem" draft="contributed">bemba</language>
 			<language type="bez">bena</language>
-			<language type="bg" draft="contributed">bulgar</language>
-			<language type="bho" draft="contributed">bhojpuri</language>
+			<language type="bg">bulgar</language>
+			<language type="bgc">haryanvi</language>
+			<language type="bho">bhojpuri</language>
 			<language type="bi" draft="contributed">bislama</language>
 			<language type="bik" draft="contributed">bikol</language>
 			<language type="bin" draft="contributed">bini</language>
 			<language type="bla" draft="contributed">siksika</language>
+			<language type="blo">anii</language>
 			<language type="bm">bambara</language>
-			<language type="bn" draft="contributed">bengal</language>
+			<language type="bn">lingua bengala</language>
 			<language type="bo" draft="contributed">tibetan</language>
-			<language type="br" draft="contributed">breton</language>
+			<language type="br">breton</language>
 			<language type="bra" draft="contributed">braj</language>
 			<language type="brx">bodo</language>
-			<language type="bs" draft="contributed">bosniac</language>
+			<language type="bs">bosniac</language>
 			<language type="bua" draft="contributed">buriat</language>
 			<language type="bug" draft="contributed">bugi</language>
 			<language type="byn" draft="contributed">blin</language>
-			<language type="ca" draft="contributed">catalan</language>
+			<language type="ca">catalan</language>
 			<language type="cad" draft="contributed">caddo</language>
 			<language type="car" draft="contributed">caribic</language>
 			<language type="cch" draft="contributed">atsam</language>
 			<language type="ccp">chakma</language>
 			<language type="ce" draft="contributed">tschetschen</language>
-			<language type="ceb" draft="contributed">cebuano</language>
+			<language type="ceb">cebuano</language>
 			<language type="cgg">chiga</language>
 			<language type="ch" draft="contributed">chamorro</language>
 			<language type="chb" draft="contributed">chibcha</language>
@@ -84,7 +87,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="chn" draft="contributed">patuà chinook</language>
 			<language type="cho" draft="contributed">choctaw</language>
 			<language type="chp" draft="contributed">chipewyan</language>
-			<language type="chr" draft="contributed">cherokee</language>
+			<language type="chr">cherokee</language>
 			<language type="chy" draft="contributed">cheyenne</language>
 			<language type="ckb">curd central</language>
 			<language type="ckb" alt="menu">curd, central</language>
@@ -93,12 +96,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="cop" draft="contributed">coptic</language>
 			<language type="cr" draft="contributed">cree</language>
 			<language type="crh" draft="contributed">tirc crimean</language>
-			<language type="cs" draft="contributed">tschec</language>
+			<language type="cs">tschec</language>
 			<language type="csb" draft="contributed">kaschubic</language>
+			<language type="csw">swampy cree</language>
 			<language type="cu" draft="contributed">slav da baselgia</language>
-			<language type="cv" draft="contributed">tschuvasch</language>
-			<language type="cy" draft="contributed">kimric</language>
-			<language type="da" draft="contributed">danais</language>
+			<language type="cv">tschuvasch</language>
+			<language type="cy">valisic</language>
+			<language type="da">danais</language>
 			<language type="dak" draft="contributed">dakota</language>
 			<language type="dar" draft="contributed">dargwa</language>
 			<language type="dav">taita</language>
@@ -110,8 +114,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dgr" draft="contributed">dogrib</language>
 			<language type="din" draft="contributed">dinka</language>
 			<language type="dje">zarma</language>
-			<language type="doi" draft="contributed">dogri</language>
-			<language type="dsb" draft="contributed">bass sorb</language>
+			<language type="doi">dogri</language>
+			<language type="dsb">bass sorb</language>
 			<language type="dua" draft="contributed">duala</language>
 			<language type="dum" draft="contributed">ollandais mesaun</language>
 			<language type="dv" draft="contributed">maledivic</language>
@@ -119,55 +123,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dyu" draft="contributed">diula</language>
 			<language type="dz" draft="contributed">dzongkha</language>
 			<language type="ebu">embu</language>
-			<language type="ee" draft="contributed">ewe</language>
+			<language type="ee">ewe</language>
 			<language type="efi" draft="contributed">efik</language>
 			<language type="egy" draft="contributed">egipzian vegl</language>
 			<language type="eka" draft="contributed">ekajuk</language>
-			<language type="el" draft="contributed">grec</language>
+			<language type="el">grec</language>
 			<language type="elx" draft="contributed">elamitic</language>
-			<language type="en" draft="contributed">englais</language>
-			<language type="en_AU" draft="contributed">englais australian</language>
-			<language type="en_CA" draft="contributed">englais canadais</language>
-			<language type="en_GB" draft="contributed">englais britannic</language>
+			<language type="en">englais</language>
+			<language type="en_AU">englais australian</language>
+			<language type="en_CA">englais canadais</language>
+			<language type="en_GB">englais britannic</language>
 			<language type="en_GB" alt="short">englais GB</language>
 			<language type="en_US">englais american</language>
 			<language type="en_US" alt="short">englais USA</language>
 			<language type="enm" draft="contributed">englais mesaun</language>
-			<language type="eo" draft="contributed">esperanto</language>
-			<language type="es" draft="contributed">spagnol</language>
-			<language type="es_419" draft="contributed">spagnol latinamerican</language>
+			<language type="eo">esperanto</language>
+			<language type="es">spagnol</language>
+			<language type="es_419">spagnol latinamerican</language>
 			<language type="es_ES">spagnol europeic</language>
 			<language type="es_MX">spagnol mexican</language>
-			<language type="et" draft="contributed">eston</language>
-			<language type="eu" draft="contributed">basc</language>
+			<language type="et">eston</language>
+			<language type="eu">basc</language>
 			<language type="ewo" draft="contributed">ewondo</language>
-			<language type="fa" draft="contributed">persian</language>
+			<language type="fa">persian</language>
 			<language type="fa_AF">dari</language>
 			<language type="fan" draft="contributed">fang</language>
 			<language type="fat" draft="contributed">fanti</language>
-			<language type="ff" draft="contributed">fulah</language>
-			<language type="fi" draft="contributed">finlandais</language>
-			<language type="fil" draft="contributed">filippino</language>
+			<language type="ff">fulah</language>
+			<language type="fi">finlandais</language>
+			<language type="fil">filippino</language>
 			<language type="fj" draft="contributed">fidschian</language>
 			<language type="fo">feroais</language>
 			<language type="fon" draft="contributed">fon</language>
-			<language type="fr" draft="contributed">franzos</language>
-			<language type="fr_CA" draft="contributed">franzos canadais</language>
-			<language type="fr_CH" draft="contributed">franzos svizzer</language>
+			<language type="fr">franzos</language>
+			<language type="fr_CA">franzos canadais</language>
+			<language type="fr_CH">franzos svizzer</language>
 			<language type="frm" draft="contributed">franzos mesaun</language>
 			<language type="fro" draft="contributed">franzos vegl</language>
 			<language type="frr" draft="contributed">fris dal nord</language>
 			<language type="frs" draft="contributed">fris da l’ost</language>
 			<language type="fur" draft="contributed">friulan</language>
-			<language type="fy" draft="contributed">fris</language>
-			<language type="ga" draft="contributed">irlandais</language>
-			<language type="gaa" draft="contributed">ga</language>
+			<language type="fy">fris occidental</language>
+			<language type="ga">irlandais</language>
+			<language type="gaa">ga</language>
 			<language type="gay" draft="contributed">gayo</language>
 			<language type="gba" draft="contributed">gbaya</language>
-			<language type="gd" draft="contributed">gaelic scot</language>
+			<language type="gd">gaelic scot</language>
 			<language type="gez" draft="contributed">geez</language>
 			<language type="gil" draft="contributed">gilbertais</language>
-			<language type="gl" draft="contributed">galician</language>
+			<language type="gl">galizian</language>
 			<language type="gmh" draft="contributed">tudestg mesaun</language>
 			<language type="gn" draft="contributed">guarani</language>
 			<language type="goh" draft="contributed">vegl tudestg da scrittira</language>
@@ -177,47 +181,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="grb" draft="contributed">grebo</language>
 			<language type="grc" draft="contributed">grec vegl</language>
 			<language type="gsw" draft="contributed">tudestg svizzer</language>
-			<language type="gu" draft="contributed">gujarati</language>
+			<language type="gu">gujarati</language>
 			<language type="guz">gusii</language>
 			<language type="gv" draft="contributed">manx</language>
 			<language type="gwi" draft="contributed">gwichʼin</language>
-			<language type="ha" draft="contributed">haussa</language>
+			<language type="ha">hausa</language>
 			<language type="hai" draft="contributed">haida</language>
 			<language type="haw" draft="contributed">hawaian</language>
-			<language type="he" draft="contributed">ebraic</language>
-			<language type="hi" draft="contributed">hindi</language>
+			<language type="he">ebraic</language>
+			<language type="hi">hindi</language>
+			<language type="hi_Latn" alt="variant">hinglish</language>
 			<language type="hil" draft="contributed">hiligaynon</language>
 			<language type="hit" draft="contributed">ettitic</language>
 			<language type="hmn" draft="contributed">hmong</language>
 			<language type="ho" draft="contributed">hiri motu</language>
-			<language type="hr" draft="contributed">croat</language>
-			<language type="hsb" draft="contributed">aut sorb</language>
+			<language type="hr">croat</language>
+			<language type="hsb">aut sorb</language>
 			<language type="ht">creol haitian</language>
-			<language type="hu" draft="contributed">ungarais</language>
+			<language type="hu">ungarais</language>
 			<language type="hup" draft="contributed">hupa</language>
-			<language type="hy" draft="contributed">armen</language>
+			<language type="hy">armen</language>
 			<language type="hz" draft="contributed">herero</language>
-			<language type="ia" draft="contributed">interlingua</language>
+			<language type="ia">interlingua</language>
 			<language type="iba" draft="contributed">iban</language>
-			<language type="id" draft="contributed">indonais</language>
-			<language type="ie" draft="contributed">interlingue</language>
-			<language type="ig" draft="contributed">igbo</language>
-			<language type="ii" draft="contributed">sichuan yi</language>
+			<language type="id">indonais</language>
+			<language type="ie">interlingue</language>
+			<language type="ig">igbo</language>
+			<language type="ii">sichuan yi</language>
 			<language type="ik" draft="contributed">inupiak</language>
 			<language type="ilo" draft="contributed">ilocano</language>
 			<language type="inh" draft="contributed">ingush</language>
 			<language type="io" draft="contributed">ido</language>
-			<language type="is" draft="contributed">islandais</language>
-			<language type="it" draft="contributed">talian</language>
+			<language type="is">islandais</language>
+			<language type="it">talian</language>
 			<language type="iu" draft="contributed">inuktitut</language>
-			<language type="ja" draft="contributed">giapunais</language>
+			<language type="ja">giapunais</language>
 			<language type="jbo" draft="contributed">lojban</language>
 			<language type="jgo">ngomba</language>
 			<language type="jmc">machame</language>
 			<language type="jpr" draft="contributed">giudaic-persian</language>
 			<language type="jrb" draft="contributed">giudaic-arab</language>
-			<language type="jv" draft="contributed">javanais</language>
-			<language type="ka" draft="contributed">georgian</language>
+			<language type="jv">javanais</language>
+			<language type="ka">georgian</language>
 			<language type="kaa" draft="contributed">karakalpak</language>
 			<language type="kab" draft="contributed">kabyle</language>
 			<language type="kac" draft="contributed">kachin</language>
@@ -227,55 +232,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kbd" draft="contributed">kabardic</language>
 			<language type="kcg" draft="contributed">tyap</language>
 			<language type="kde">makonde</language>
-			<language type="kea">cabverdian</language>
+			<language type="kea">creol dal Cap Verd</language>
 			<language type="kfo" draft="contributed">koro</language>
 			<language type="kg" draft="contributed">kongo</language>
+			<language type="kgp">kaingang</language>
 			<language type="kha" draft="contributed">khasi</language>
 			<language type="kho" draft="contributed">khotanais</language>
 			<language type="khq">koyra chiini</language>
 			<language type="ki" draft="contributed">kikuyu</language>
 			<language type="kj" draft="contributed">kuanyama</language>
-			<language type="kk" draft="contributed">casac</language>
+			<language type="kk">kasac</language>
 			<language type="kkj">kako</language>
 			<language type="kl" draft="contributed">grönlandais</language>
 			<language type="kln">kalenjin</language>
-			<language type="km" draft="contributed">cambodschan</language>
+			<language type="km">khmer</language>
 			<language type="kmb" draft="contributed">kimbundu</language>
-			<language type="kn" draft="contributed">kannada</language>
-			<language type="ko" draft="contributed">corean</language>
-			<language type="kok" draft="contributed">konkani</language>
+			<language type="kn">kannada</language>
+			<language type="ko">corean</language>
+			<language type="kok">konkani</language>
 			<language type="kos" draft="contributed">kosraean</language>
 			<language type="kpe" draft="contributed">kpelle</language>
 			<language type="kr" draft="contributed">kanuri</language>
 			<language type="krc" draft="contributed">karachay-balkar</language>
 			<language type="krl" draft="contributed">carelian</language>
 			<language type="kru" draft="contributed">kurukh</language>
-			<language type="ks" draft="contributed">kashmiri</language>
+			<language type="ks">kashmiri</language>
 			<language type="ksb">shambala</language>
 			<language type="ksf">bafia</language>
 			<language type="ksh">colognais</language>
-			<language type="ku" draft="contributed">curd</language>
+			<language type="ku">curd</language>
+			<language type="ku" menu="core">curd</language>
+			<language type="ku" menu="extension">curd settentriunal</language>
 			<language type="kum" draft="contributed">kumuk</language>
 			<language type="kut" draft="contributed">kutenai</language>
 			<language type="kv" draft="contributed">komi</language>
 			<language type="kw" draft="contributed">cornic</language>
-			<language type="ky" draft="contributed">kirghis</language>
+			<language type="kxv">kuvi</language>
+			<language type="ky">kirghis</language>
 			<language type="la" draft="contributed">latin</language>
 			<language type="lad" draft="contributed">ladino</language>
 			<language type="lag">langi</language>
 			<language type="lah" draft="contributed">lahnda</language>
 			<language type="lam" draft="contributed">lamba</language>
-			<language type="lb" draft="contributed">luxemburgais</language>
+			<language type="lb">luxemburgais</language>
 			<language type="lez" draft="contributed">lezghian</language>
 			<language type="lg" draft="contributed">ganda</language>
 			<language type="li" draft="contributed">limburgais</language>
+			<language type="lij">ligur</language>
 			<language type="lkt">lakota</language>
+			<language type="lmo">lumbard</language>
 			<language type="ln" draft="contributed">lingala</language>
-			<language type="lo" draft="contributed">laot</language>
+			<language type="lo">laot</language>
 			<language type="lol" draft="contributed">lomongo</language>
 			<language type="loz" draft="contributed">lozi</language>
 			<language type="lrc">luri dal nord</language>
-			<language type="lt" draft="contributed">lituan</language>
+			<language type="lt">lituan</language>
 			<language type="lu" draft="contributed">luba-katanga</language>
 			<language type="lua" draft="contributed">luba-lulua</language>
 			<language type="lui" draft="contributed">luiseno</language>
@@ -283,10 +294,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="luo" draft="contributed">luo</language>
 			<language type="lus" draft="contributed">lushai</language>
 			<language type="luy">luyia</language>
-			<language type="lv" draft="contributed">letton</language>
+			<language type="lv">letton</language>
 			<language type="mad" draft="contributed">madurais</language>
 			<language type="mag" draft="contributed">magahi</language>
-			<language type="mai" draft="contributed">maithili</language>
+			<language type="mai">maithili</language>
 			<language type="mak" draft="contributed">makassar</language>
 			<language type="man" draft="contributed">mandingo</language>
 			<language type="mas" draft="contributed">masai</language>
@@ -300,25 +311,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mgh">makhuwa-meetto</language>
 			<language type="mgo">meta’</language>
 			<language type="mh" draft="contributed">marschallais</language>
-			<language type="mi" draft="contributed">maori</language>
+			<language type="mi">māori</language>
 			<language type="mic" draft="contributed">micmac</language>
 			<language type="min" draft="contributed">minangkabau</language>
-			<language type="mk" draft="contributed">macedon</language>
-			<language type="ml" draft="contributed">malayalam</language>
-			<language type="mn" draft="contributed">mongolic</language>
+			<language type="mk">macedon</language>
+			<language type="ml">malayalam</language>
+			<language type="mn">mongol</language>
 			<language type="mnc" draft="contributed">manchu</language>
-			<language type="mni" draft="contributed">manipuri</language>
+			<language type="mni">meitei</language>
 			<language type="moh" draft="contributed">mohawk</language>
 			<language type="mos" draft="contributed">mossi</language>
-			<language type="mr" draft="contributed">marathi</language>
-			<language type="ms" draft="contributed">malaic</language>
-			<language type="mt" draft="contributed">maltais</language>
+			<language type="mr">marathi</language>
+			<language type="ms">malaic</language>
+			<language type="mt">maltais</language>
 			<language type="mua">mundang</language>
-			<language type="mul" draft="contributed">pluriling</language>
+			<language type="mul">pluriling</language>
 			<language type="mus" draft="contributed">creek</language>
 			<language type="mwl" draft="contributed">mirandais</language>
 			<language type="mwr" draft="contributed">marwari</language>
-			<language type="my" draft="contributed">birman</language>
+			<language type="my">birman</language>
 			<language type="myv" draft="contributed">erzya</language>
 			<language type="mzn">mazanderani</language>
 			<language type="na" draft="contributed">nauru</language>
@@ -326,23 +337,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="naq">nama</language>
 			<language type="nb" draft="contributed">norvegais bokmål</language>
 			<language type="nd" draft="contributed">ndebele dal nord</language>
-			<language type="nds" draft="contributed">bass tudestg</language>
-			<language type="ne" draft="contributed">nepalais</language>
+			<language type="nds">bass tudestg</language>
+			<language type="ne">nepalais</language>
 			<language type="new" draft="contributed">newari</language>
 			<language type="ng" draft="contributed">ndonga</language>
 			<language type="nia" draft="contributed">nias</language>
 			<language type="niu" draft="contributed">niue</language>
-			<language type="nl" draft="contributed">ollandais</language>
-			<language type="nl_BE" draft="contributed">flam</language>
+			<language type="nl">neerlandais</language>
+			<language type="nl_BE">flam</language>
 			<language type="nmg">kwasio</language>
-			<language type="nn" draft="contributed">norvegiais nynorsk</language>
+			<language type="nn">norvegiais nynorsk</language>
 			<language type="nnh">ngienboon</language>
-			<language type="no" draft="contributed">norvegiais</language>
+			<language type="no">norvegiais</language>
 			<language type="nog" draft="contributed">nogai</language>
 			<language type="non" draft="contributed">nordic vegl</language>
-			<language type="nqo" draft="contributed">n’ko</language>
+			<language type="nqo">n’ko</language>
 			<language type="nr" draft="contributed">ndebele dal sid</language>
-			<language type="nso" draft="contributed">sotho dal nord</language>
+			<language type="nso">sotho dal nord</language>
 			<language type="nus">nuer</language>
 			<language type="nv" draft="contributed">navajo</language>
 			<language type="nwc" draft="contributed">newari classic</language>
@@ -351,14 +362,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nyn" draft="contributed">nyankole</language>
 			<language type="nyo" draft="contributed">nyoro</language>
 			<language type="nzi" draft="contributed">nzima</language>
-			<language type="oc" draft="contributed">occitan</language>
+			<language type="oc">occitan</language>
 			<language type="oj" draft="contributed">ojibwa</language>
-			<language type="om" draft="contributed">oromo</language>
-			<language type="or" draft="contributed">oriya</language>
+			<language type="om">oromo</language>
+			<language type="or">oriya</language>
 			<language type="os" draft="contributed">ossetic</language>
 			<language type="osa" draft="contributed">osage</language>
 			<language type="ota" draft="contributed">tirc ottoman</language>
-			<language type="pa" draft="contributed">punjabi</language>
+			<language type="pa">punjabi</language>
 			<language type="pag" draft="contributed">pangasinan</language>
 			<language type="pal" draft="contributed">pahlavi</language>
 			<language type="pam" draft="contributed">pampanga</language>
@@ -368,40 +379,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="peo" draft="contributed">persian vegl</language>
 			<language type="phn" draft="contributed">fenizian</language>
 			<language type="pi" draft="contributed">pali</language>
-			<language type="pl" draft="contributed">polac</language>
+			<language type="pl">polac</language>
 			<language type="pon" draft="contributed">ponapean</language>
 			<language type="prg">prussian</language>
 			<language type="pro" draft="contributed">provenzal vegl</language>
-			<language type="ps" draft="contributed">paschto</language>
-			<language type="pt" draft="contributed">portugais</language>
-			<language type="pt_BR" draft="contributed">portugais brasilian</language>
+			<language type="ps">paschto</language>
+			<language type="pt">portugais</language>
+			<language type="pt_BR">portugais brasilian</language>
 			<language type="pt_PT">portugais europeic</language>
-			<language type="qu" draft="contributed">quechua</language>
-			<language type="raj" draft="contributed">rajasthani</language>
+			<language type="qu">quechua</language>
+			<language type="raj">rajasthani</language>
 			<language type="rap" draft="contributed">rapanui</language>
 			<language type="rar" draft="contributed">rarotonga</language>
-			<language type="rm" draft="contributed">rumantsch</language>
+			<language type="rm">rumantsch</language>
 			<language type="rn" draft="contributed">rundi</language>
-			<language type="ro" draft="contributed">rumen</language>
+			<language type="ro">rumen</language>
 			<language type="ro_MD">moldav</language>
 			<language type="rof">rombo</language>
 			<language type="rom" draft="contributed">romani</language>
-			<language type="ru" draft="contributed">russ</language>
+			<language type="ru">russ</language>
 			<language type="rup" draft="contributed">aromunic</language>
-			<language type="rw" draft="contributed">kinyarwanda</language>
+			<language type="rw">kinyarwanda</language>
 			<language type="rwk">rwa</language>
-			<language type="sa" draft="contributed">sanscrit</language>
+			<language type="sa">sanscrit</language>
 			<language type="sad" draft="contributed">sandawe</language>
-			<language type="sah" draft="contributed">jakut</language>
+			<language type="sah">jakut</language>
 			<language type="sam" draft="contributed">arameic samaritan</language>
 			<language type="saq">samburu</language>
 			<language type="sas" draft="contributed">sasak</language>
-			<language type="sat" draft="contributed">santali</language>
+			<language type="sat">santali</language>
 			<language type="sbp">sangu</language>
-			<language type="sc" draft="contributed">sard</language>
+			<language type="sc">sard</language>
 			<language type="scn" draft="contributed">sicilian</language>
 			<language type="sco" draft="contributed">scot</language>
-			<language type="sd" draft="contributed">sindhi</language>
+			<language type="sd">sindhi</language>
 			<language type="se" draft="contributed">sami dal nord</language>
 			<language type="seh">sena</language>
 			<language type="sel" draft="contributed">selkup</language>
@@ -411,10 +422,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sh" draft="contributed">serbo-croat</language>
 			<language type="shi">tachelit</language>
 			<language type="shn" draft="contributed">shan</language>
-			<language type="si" draft="contributed">singalais</language>
+			<language type="si">singalais</language>
 			<language type="sid" draft="contributed">sidamo</language>
-			<language type="sk" draft="contributed">slovac</language>
-			<language type="sl" draft="contributed">sloven</language>
+			<language type="sk">slovac</language>
+			<language type="sl">sloven</language>
 			<language type="sm" draft="contributed">samoan</language>
 			<language type="sma" draft="contributed">sami dal sid</language>
 			<language type="smj" draft="contributed">sami lule</language>
@@ -422,48 +433,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sms" draft="contributed">sami skolt</language>
 			<language type="sn" draft="contributed">shona</language>
 			<language type="snk" draft="contributed">soninke</language>
-			<language type="so" draft="contributed">somali</language>
+			<language type="so">somali</language>
 			<language type="sog" draft="contributed">sogdian</language>
-			<language type="sq" draft="contributed">albanais</language>
-			<language type="sr" draft="contributed">serb</language>
+			<language type="sq">albanais</language>
+			<language type="sr">serb</language>
 			<language type="srn" draft="contributed">sranan tongo</language>
 			<language type="srr" draft="contributed">serer</language>
 			<language type="ss" draft="contributed">swazi</language>
-			<language type="st" draft="contributed">sotho dal sid</language>
-			<language type="su" draft="contributed">sundanais</language>
+			<language type="st">sotho dal sid</language>
+			<language type="su">sundanais</language>
 			<language type="suk" draft="contributed">sukuma</language>
 			<language type="sus" draft="contributed">susu</language>
 			<language type="sux" draft="contributed">sumeric</language>
-			<language type="sv" draft="contributed">svedais</language>
-			<language type="sw" draft="contributed">suahili</language>
+			<language type="sv">svedais</language>
+			<language type="sw">suaheli</language>
 			<language type="sw_CD" draft="unconfirmed">suahili dal Congo</language>
 			<language type="syc" draft="contributed">siric classic</language>
-			<language type="syr" draft="contributed">siric</language>
-			<language type="ta" draft="contributed">tamil</language>
-			<language type="te" draft="contributed">telugu</language>
+			<language type="syr">sirian</language>
+			<language type="szl">silesian</language>
+			<language type="ta">tamil</language>
+			<language type="te">telugu</language>
 			<language type="tem" draft="contributed">temne</language>
 			<language type="teo">teso</language>
 			<language type="ter" draft="contributed">tereno</language>
 			<language type="tet" draft="contributed">tetum</language>
-			<language type="tg" draft="contributed">tadjik</language>
+			<language type="tg">tadschic</language>
 			<language type="th">tailandais</language>
-			<language type="ti" draft="contributed">tigrinya</language>
+			<language type="ti">tigrinya</language>
 			<language type="tig" draft="contributed">tigre</language>
 			<language type="tiv" draft="contributed">tiv</language>
-			<language type="tk" draft="contributed">turkmen</language>
+			<language type="tk">turkmen</language>
 			<language type="tkl" draft="contributed">tokelau</language>
 			<language type="tl" draft="contributed">tagalog</language>
 			<language type="tlh" draft="contributed">klingonic</language>
 			<language type="tli" draft="contributed">tlingit</language>
 			<language type="tmh" draft="contributed">tamasheq</language>
-			<language type="tn" draft="contributed">tswana</language>
-			<language type="to" draft="contributed">tonga</language>
+			<language type="tn">tswana</language>
+			<language type="to">tonga</language>
 			<language type="tog" draft="contributed">lingua tsonga</language>
 			<language type="tpi" draft="contributed">tok pisin</language>
 			<language type="tr">tirc</language>
 			<language type="ts" draft="contributed">tsonga</language>
 			<language type="tsi" draft="contributed">tsimshian</language>
-			<language type="tt" draft="contributed">tatar</language>
+			<language type="tt">tatar</language>
 			<language type="tum" draft="contributed">tumbuka</language>
 			<language type="tvl" draft="contributed">tuvalu</language>
 			<language type="tw" draft="contributed">twi</language>
@@ -472,16 +484,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="tyv" draft="contributed">tuvinian</language>
 			<language type="tzm">tamazight</language>
 			<language type="udm" draft="contributed">udmurt</language>
-			<language type="ug" draft="contributed">uiguric</language>
+			<language type="ug">uiguric</language>
 			<language type="uga" draft="contributed">ugaritic</language>
-			<language type="uk" draft="contributed">ucranais</language>
+			<language type="uk">ucranais</language>
 			<language type="umb" draft="contributed">mbundu</language>
 			<language type="und">lingua nunenconuschenta</language>
-			<language type="ur" draft="contributed">urdu</language>
-			<language type="uz" draft="contributed">usbec</language>
+			<language type="ur">urdu</language>
+			<language type="uz">usbec</language>
 			<language type="vai" draft="contributed">vai</language>
 			<language type="ve" draft="contributed">venda</language>
-			<language type="vi" draft="contributed">vietnamais</language>
+			<language type="vec">venetic</language>
+			<language type="vi">vietnamais</language>
+			<language type="vmw">makhuwa</language>
 			<language type="vo" draft="contributed">volapuk</language>
 			<language type="vot" draft="contributed">votic</language>
 			<language type="vun">vunjo</language>
@@ -490,18 +504,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="wal" draft="contributed">walamo</language>
 			<language type="war" draft="contributed">waray</language>
 			<language type="was" draft="contributed">washo</language>
-			<language type="wo" draft="contributed">wolof</language>
+			<language type="wo">wolof</language>
 			<language type="xal" draft="contributed">kalmuk</language>
-			<language type="xh" draft="contributed">xhosa</language>
+			<language type="xh">xhosa</language>
+			<language type="xnr">kangri</language>
 			<language type="xog">soga</language>
 			<language type="yao" draft="contributed">yao</language>
 			<language type="yap" draft="contributed">yapais</language>
 			<language type="yav">yangben</language>
 			<language type="yi" draft="contributed">jiddic</language>
-			<language type="yo" draft="contributed">yoruba</language>
+			<language type="yo">yoruba</language>
+			<language type="yrl">nheengatu</language>
 			<language type="yue">cantonais</language>
 			<language type="yue" alt="menu">chinais, cantonais</language>
-			<language type="za" draft="contributed">zhuang</language>
+			<language type="za">zhuang</language>
 			<language type="zap" draft="contributed">zapotec</language>
 			<language type="zbl" draft="contributed">simbols da Bliss</language>
 			<language type="zen" draft="contributed">zenaga</language>
@@ -512,41 +528,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="zh_Hans" alt="long">chinais mandarin simplifitgà</language>
 			<language type="zh_Hant">chinais tradiziunal</language>
 			<language type="zh_Hant" alt="long">chinais mandarin tradiziunal</language>
-			<language type="zu" draft="contributed">zulu</language>
+			<language type="zu">zulu</language>
 			<language type="zun" draft="contributed">zuni</language>
-			<language type="zxx" draft="contributed">nagins cuntegns linguistics</language>
+			<language type="zxx">nagin cuntegn linguistic</language>
 			<language type="zza" draft="contributed">zaza</language>
 		</languages>
 		<scripts>
-			<script type="Adlm" draft="unconfirmed">adlam</script>
+			<script type="Adlm">adlam</script>
 			<script type="Aghb">albanais dal Caucasus</script>
 			<script type="Ahom">ahom</script>
-			<script type="Arab" draft="contributed">arab</script>
-			<script type="Aran" draft="unconfirmed">nastaliq</script>
+			<script type="Arab">arab</script>
+			<script type="Aran">nastaliq</script>
 			<script type="Armi" draft="contributed">arameic imperial</script>
-			<script type="Armn" draft="contributed">armen</script>
+			<script type="Armn">armen</script>
 			<script type="Avst" draft="contributed">avestic</script>
 			<script type="Bali" draft="contributed">balinais</script>
 			<script type="Bamu" draft="unconfirmed">bamun</script>
 			<script type="Batk" draft="contributed">batak</script>
-			<script type="Beng" draft="contributed">bengal</script>
+			<script type="Beng">bengal</script>
 			<script type="Blis" draft="contributed">simbols da Bliss</script>
-			<script type="Bopo" draft="contributed">bopomofo</script>
+			<script type="Bopo">bopomofo</script>
 			<script type="Brah" draft="contributed">brahmi</script>
-			<script type="Brai" draft="contributed">scrittira da Braille</script>
+			<script type="Brai">Braille</script>
 			<script type="Bugi" draft="contributed">buginais</script>
 			<script type="Buhd" draft="contributed">buhid</script>
-			<script type="Cakm" draft="contributed">chakma</script>
-			<script type="Cans" draft="contributed">simbols autoctons canadais unifitgads</script>
+			<script type="Cakm">chakma</script>
+			<script type="Cans">simbols da silbas unifitgads da la populaziun autoctona canadaisa</script>
 			<script type="Cari" draft="contributed">carian</script>
 			<script type="Cham" draft="contributed">cham</script>
-			<script type="Cher" draft="contributed">cherokee</script>
+			<script type="Cher">cherokee</script>
 			<script type="Cirt" draft="contributed">cirth</script>
 			<script type="Copt" draft="contributed">coptic</script>
 			<script type="Cprt" draft="contributed">cipriot</script>
-			<script type="Cyrl" draft="contributed">cirillic</script>
+			<script type="Cyrl">cirillic</script>
 			<script type="Cyrs" draft="contributed">slav da baselgia vegl</script>
-			<script type="Deva" draft="contributed">devanagari</script>
+			<script type="Deva">devanagari</script>
 			<script type="Dsrt" draft="contributed">deseret</script>
 			<script type="Dupl" draft="unconfirmed">stenografia da Duployé</script>
 			<script type="Egyd" draft="contributed">egipzian demotic</script>
@@ -554,41 +570,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Egyp" draft="contributed">ieroglifas egipzianas</script>
 			<script type="Elba" draft="unconfirmed">elbasan</script>
 			<script type="Elym" draft="unconfirmed">elimeic</script>
-			<script type="Ethi" draft="contributed">etiopic</script>
+			<script type="Ethi">etiopic</script>
 			<script type="Geok" draft="contributed">kutsuri</script>
-			<script type="Geor" draft="contributed">georgian</script>
+			<script type="Geor">georgian</script>
 			<script type="Glag" draft="contributed">glagolitic</script>
 			<script type="Goth" draft="contributed">gotic</script>
-			<script type="Grek" draft="contributed">grec</script>
-			<script type="Gujr" draft="contributed">gujarati</script>
-			<script type="Guru" draft="contributed">gurmukhi</script>
+			<script type="Grek">grec</script>
+			<script type="Gujr">gujarati</script>
+			<script type="Guru">gurmukhi</script>
 			<script type="Hanb">han cun bopomofo</script>
-			<script type="Hang" draft="contributed">hangul</script>
-			<script type="Hani" draft="contributed">han</script>
+			<script type="Hang">hangul</script>
+			<script type="Hani">han</script>
 			<script type="Hano" draft="contributed">hanunoo</script>
 			<script type="Hans">simplifitgà</script>
 			<script type="Hans" alt="stand-alone">han simplifitgà</script>
 			<script type="Hant">tradiziunal</script>
 			<script type="Hant" alt="stand-alone">han tradiziunal</script>
-			<script type="Hebr" draft="contributed">ebraic</script>
-			<script type="Hira" draft="contributed">hiragana</script>
+			<script type="Hebr">ebraic</script>
+			<script type="Hira">hiragana</script>
 			<script type="Hmng" draft="contributed">pahawn hmong</script>
-			<script type="Hrkt">scrittira da silbas giapunaisa</script>
+			<script type="Hrkt">scrittiras da silbas giapunaisas</script>
 			<script type="Hung" draft="contributed">ungarais vegl</script>
 			<script type="Inds" draft="contributed">indus</script>
 			<script type="Ital" draft="contributed">italic vegl</script>
 			<script type="Jamo">jamo</script>
 			<script type="Java" draft="contributed">javanais</script>
-			<script type="Jpan" draft="contributed">giapunais</script>
+			<script type="Jpan">giapunais</script>
 			<script type="Kali" draft="contributed">kayah li</script>
-			<script type="Kana" draft="contributed">katakana</script>
+			<script type="Kana">katakana</script>
 			<script type="Khar" draft="contributed">kharoshthi</script>
-			<script type="Khmr" draft="contributed">khmer/cambodschan</script>
-			<script type="Knda" draft="contributed">kannada</script>
-			<script type="Kore" draft="contributed">corean</script>
+			<script type="Khmr">khmer</script>
+			<script type="Knda">kannada</script>
+			<script type="Kore">corean</script>
 			<script type="Kthi" draft="contributed">kaithi</script>
 			<script type="Lana" draft="contributed">lanna</script>
-			<script type="Laoo" draft="contributed">laot</script>
+			<script type="Laoo">laot</script>
 			<script type="Latf" draft="contributed">latin (scrittira gotica)</script>
 			<script type="Latg" draft="contributed">latin (scrittira gaelica)</script>
 			<script type="Latn">latin</script>
@@ -603,20 +619,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Mani" draft="contributed">manicheic</script>
 			<script type="Maya" draft="contributed">ieroglifas maya</script>
 			<script type="Mero" draft="contributed">meroitic</script>
-			<script type="Mlym" draft="contributed">malaisian</script>
-			<script type="Mong" draft="contributed">mongolic</script>
+			<script type="Mlym">malayalam</script>
+			<script type="Mong">mongol</script>
 			<script type="Moon" draft="contributed">moon</script>
-			<script type="Mtei" draft="contributed">meetei mayek</script>
-			<script type="Mymr" draft="contributed">burmais</script>
+			<script type="Mtei">meitei mayek</script>
+			<script type="Mymr">burmais</script>
 			<script type="Narb">arab vegl dal nord</script>
 			<script type="Nbat" draft="unconfirmed">nabateic</script>
 			<script type="Newa" draft="unconfirmed">newari</script>
-			<script type="Nkoo" draft="contributed">n’ko</script>
+			<script type="Nkoo">n’ko</script>
 			<script type="Nshu" draft="unconfirmed">scrittira da dunnas</script>
 			<script type="Ogam" draft="contributed">ogham</script>
-			<script type="Olck" draft="contributed">ol chiki</script>
+			<script type="Olck">ol chiki</script>
 			<script type="Orkh" draft="contributed">orkhon</script>
-			<script type="Orya" draft="contributed">oriya</script>
+			<script type="Orya">oriya</script>
 			<script type="Osge" draft="unconfirmed">osage</script>
 			<script type="Osma" draft="contributed">osman</script>
 			<script type="Palm" draft="unconfirmed">palmiren</script>
@@ -630,6 +646,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Prti" draft="contributed">partic dad inscripziuns</script>
 			<script type="Qaag" draft="unconfirmed">zawgyi</script>
 			<script type="Rjng" draft="contributed">rejang</script>
+			<script type="Rohg">hanifi</script>
 			<script type="Roro" draft="contributed">rongorongo</script>
 			<script type="Runr" draft="contributed">runic</script>
 			<script type="Samr" draft="contributed">samaritan</script>
@@ -641,14 +658,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Shrd">sharada</script>
 			<script type="Sidd" draft="unconfirmed">siddham</script>
 			<script type="Sind" draft="unconfirmed">khudabadic</script>
-			<script type="Sinh" draft="contributed">singalais</script>
+			<script type="Sinh">singalais</script>
 			<script type="Sogd" draft="unconfirmed">sogdian</script>
 			<script type="Sogo" draft="unconfirmed">sogdian vegl</script>
 			<script type="Sora" draft="unconfirmed">sora sompeng</script>
 			<script type="Soyo" draft="unconfirmed">soyombo</script>
-			<script type="Sund" draft="contributed">sundanais</script>
+			<script type="Sund">sundanais</script>
 			<script type="Sylo" draft="contributed">syloti nagri</script>
-			<script type="Syrc" draft="contributed">siric</script>
+			<script type="Syrc">siric</script>
 			<script type="Syre" draft="contributed">siric estrangelo</script>
 			<script type="Syrj" draft="contributed">siric dal vest</script>
 			<script type="Syrn" draft="contributed">siric da l’ost</script>
@@ -656,338 +673,343 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Takr" draft="unconfirmed">takri</script>
 			<script type="Tale" draft="contributed">tai le</script>
 			<script type="Talu" draft="contributed">tai lue</script>
-			<script type="Taml" draft="contributed">tamil</script>
+			<script type="Taml">tamil</script>
 			<script type="Tang" draft="unconfirmed">tangut</script>
 			<script type="Tavt" draft="contributed">tai viet</script>
-			<script type="Telu" draft="contributed">telugu</script>
+			<script type="Telu">telugu</script>
 			<script type="Teng" draft="contributed">tengwar</script>
-			<script type="Tfng" draft="contributed">tifinagh</script>
+			<script type="Tfng">tifinagh</script>
 			<script type="Tglg" draft="contributed">tagalog</script>
-			<script type="Thaa" draft="contributed">thaana</script>
-			<script type="Thai" draft="contributed">tailandais</script>
-			<script type="Tibt" draft="contributed">tibetan</script>
+			<script type="Thaa">thaana</script>
+			<script type="Thai">tailandais</script>
+			<script type="Tibt">tibetan</script>
 			<script type="Ugar" draft="contributed">ugaritic</script>
-			<script type="Vaii" draft="contributed">vaii</script>
+			<script type="Vaii">vai</script>
 			<script type="Visp" draft="contributed">alfabet visibel</script>
 			<script type="Wara" draft="unconfirmed">varang kshiti</script>
 			<script type="Wcho" draft="unconfirmed">wancho</script>
 			<script type="Xpeo" draft="contributed">persian vegl</script>
 			<script type="Xsux" draft="contributed">scrittira a cugn sumeric-accadica</script>
 			<script type="Yezi" draft="unconfirmed">jesid</script>
-			<script type="Yiii" draft="contributed">yi</script>
+			<script type="Yiii">yi</script>
 			<script type="Zanb" draft="unconfirmed">quadrats da Zanabazar</script>
 			<script type="Zinh" draft="contributed">ertà</script>
-			<script type="Zmth" draft="contributed">notaziun matematica</script>
-			<script type="Zsye">emojis</script>
-			<script type="Zsym" draft="contributed">simbols</script>
+			<script type="Zmth">notaziun matematica</script>
+			<script type="Zsye">emoji</script>
+			<script type="Zsym">simbols</script>
 			<script type="Zxxx">betg scrit</script>
-			<script type="Zyyy" draft="contributed">betg determinà</script>
+			<script type="Zyyy">betg determinà</script>
 			<script type="Zzzz">scrittira nunenconuschenta</script>
 		</scripts>
 		<territories>
 			<territory type="001">mund</territory>
-			<territory type="002" draft="contributed">Africa</territory>
-			<territory type="003" draft="contributed">America dal Nord</territory>
-			<territory type="005" draft="contributed">America dal Sid</territory>
-			<territory type="009" draft="contributed">Oceania</territory>
-			<territory type="011" draft="contributed">Africa dal Vest</territory>
-			<territory type="013" draft="contributed">America Centrala</territory>
-			<territory type="014" draft="contributed">Africa da l’Ost</territory>
-			<territory type="015" draft="contributed">Africa dal Nord</territory>
-			<territory type="017" draft="contributed">Africa Centrala</territory>
-			<territory type="018" draft="contributed">Africa Meridiunala</territory>
-			<territory type="019">americas</territory>
-			<territory type="021">Amercia dal Nord</territory>
-			<territory type="029" draft="contributed">Caribica</territory>
-			<territory type="030" draft="contributed">Asia da l’Ost</territory>
-			<territory type="034" draft="contributed">Asia dal Sid</territory>
-			<territory type="035" draft="contributed">Asia dal Sidost</territory>
-			<territory type="039" draft="contributed">Europa dal Sid</territory>
-			<territory type="053" draft="contributed">Australia e Nova Zelanda</territory>
-			<territory type="054" draft="contributed">Melanesia</territory>
-			<territory type="057" draft="contributed">Regiun Micronesica</territory>
-			<territory type="061" draft="contributed">Polinesia</territory>
-			<territory type="142" draft="contributed">Asia</territory>
-			<territory type="143" draft="contributed">Asia Centrala</territory>
-			<territory type="145" draft="contributed">Asia dal Vest</territory>
-			<territory type="150" draft="contributed">Europa</territory>
-			<territory type="151" draft="contributed">Europa Orientala</territory>
-			<territory type="154" draft="contributed">Europa dal Nord</territory>
-			<territory type="155" draft="contributed">Europa dal Vest</territory>
+			<territory type="002">Africa</territory>
+			<territory type="003">America dal Nord</territory>
+			<territory type="005">America dal Sid</territory>
+			<territory type="009">Oceania</territory>
+			<territory type="011">Africa dal Vest</territory>
+			<territory type="013">America Centrala</territory>
+			<territory type="014">Africa da l’Ost</territory>
+			<territory type="015">Africa dal Nord</territory>
+			<territory type="017">Africa Centrala</territory>
+			<territory type="018">Africa Meridiunala</territory>
+			<territory type="019">America</territory>
+			<territory type="021">America dal nord</territory>
+			<territory type="029">Caribica</territory>
+			<territory type="030">Asia da l’Ost</territory>
+			<territory type="034">Asia dal Sid</territory>
+			<territory type="035">Asia dal Sidost</territory>
+			<territory type="039">Europa dal Sid</territory>
+			<territory type="053">Australasia</territory>
+			<territory type="054">Melanesia</territory>
+			<territory type="057">Regiun Micronesica</territory>
+			<territory type="061">Polinesia</territory>
+			<territory type="142">Asia</territory>
+			<territory type="143">Asia Centrala</territory>
+			<territory type="145">Asia dal Vest</territory>
+			<territory type="150">Europa</territory>
+			<territory type="151">Europa Orientala</territory>
+			<territory type="154">Europa dal Nord</territory>
+			<territory type="155">Europa dal Vest</territory>
 			<territory type="202">Africa Subsaharica</territory>
-			<territory type="419" draft="contributed">America Latina</territory>
-			<territory type="AC">Insla d’Ascensiun</territory>
-			<territory type="AD" draft="contributed">Andorra</territory>
-			<territory type="AE" draft="contributed">Emirats Arabs Unids</territory>
-			<territory type="AF" draft="contributed">Afghanistan</territory>
-			<territory type="AG" draft="contributed">Antigua e Barbuda</territory>
-			<territory type="AI" draft="contributed">Anguilla</territory>
-			<territory type="AL" draft="contributed">Albania</territory>
-			<territory type="AM" draft="contributed">Armenia</territory>
-			<territory type="AO" draft="contributed">Angola</territory>
-			<territory type="AQ" draft="contributed">Antarctica</territory>
-			<territory type="AR" draft="contributed">Argentinia</territory>
-			<territory type="AS" draft="contributed">Samoa Americana</territory>
-			<territory type="AT" draft="contributed">Austria</territory>
-			<territory type="AU" draft="contributed">Australia</territory>
-			<territory type="AW" draft="contributed">Aruba</territory>
-			<territory type="AX" draft="contributed">Inslas Aland</territory>
-			<territory type="AZ" draft="contributed">Aserbaidschan</territory>
-			<territory type="BA" draft="contributed">Bosnia ed Erzegovina</territory>
-			<territory type="BB" draft="contributed">Barbados</territory>
-			<territory type="BD" draft="contributed">Bangladesch</territory>
-			<territory type="BE" draft="contributed">Belgia</territory>
-			<territory type="BF" draft="contributed">Burkina Faso</territory>
-			<territory type="BG" draft="contributed">Bulgaria</territory>
-			<territory type="BH" draft="contributed">Bahrain</territory>
-			<territory type="BI" draft="contributed">Burundi</territory>
-			<territory type="BJ" draft="contributed">Benin</territory>
-			<territory type="BL" draft="contributed">Son Barthélemy</territory>
-			<territory type="BM" draft="contributed">Bermudas</territory>
-			<territory type="BN" draft="contributed">Brunei</territory>
-			<territory type="BO" draft="contributed">Bolivia</territory>
-			<territory type="BQ">Antillas Ollandaisas</territory>
+			<territory type="419">America latina</territory>
+			<territory type="AC">Insla da l’Ascensiun</territory>
+			<territory type="AD">Andorra</territory>
+			<territory type="AE">Emirats Arabs Unids</territory>
+			<territory type="AF">Afganistan</territory>
+			<territory type="AG">Antigua e Barbuda</territory>
+			<territory type="AI">Anguilla</territory>
+			<territory type="AL">Albania</territory>
+			<territory type="AM">Armenia</territory>
+			<territory type="AO">Angola</territory>
+			<territory type="AQ">Antarctica</territory>
+			<territory type="AR">Argentina</territory>
+			<territory type="AS">Samoa Americana</territory>
+			<territory type="AT">Austria</territory>
+			<territory type="AU">Australia</territory>
+			<territory type="AW">Aruba</territory>
+			<territory type="AX">Inslas Aland</territory>
+			<territory type="AZ">Aserbaidschan</territory>
+			<territory type="BA">Bosnia ed Erzegovina</territory>
+			<territory type="BB">Barbados</territory>
+			<territory type="BD">Bangladesch</territory>
+			<territory type="BE">Belgia</territory>
+			<territory type="BF">Burkina Faso</territory>
+			<territory type="BG">Bulgaria</territory>
+			<territory type="BH">Bahrain</territory>
+			<territory type="BI">Burundi</territory>
+			<territory type="BJ">Benin</territory>
+			<territory type="BL">Son Barthélemy</territory>
+			<territory type="BM">Bermudas</territory>
+			<territory type="BN">Brunei</territory>
+			<territory type="BO">Bolivia</territory>
+			<territory type="BQ">Pajais Bass caribics</territory>
 			<territory type="BR">Brasilia</territory>
-			<territory type="BS" draft="contributed">Bahamas</territory>
-			<territory type="BT" draft="contributed">Bhutan</territory>
-			<territory type="BV" draft="contributed">Insla Bouvet</territory>
-			<territory type="BW" draft="contributed">Botswana</territory>
-			<territory type="BY" draft="contributed">Bielorussia</territory>
-			<territory type="BZ" draft="contributed">Belize</territory>
-			<territory type="CA" draft="contributed">Canada</territory>
-			<territory type="CC" draft="contributed">Inslas Cocos</territory>
-			<territory type="CD">Congo - Kinshasa</territory>
-			<territory type="CD" alt="variant">Congo (DRC)</territory>
-			<territory type="CF" draft="contributed">Republica Centralafricana</territory>
-			<territory type="CG" draft="contributed">Congo</territory>
-			<territory type="CG" alt="variant">Congo (republica)</territory>
-			<territory type="CH" draft="contributed">Svizra</territory>
-			<territory type="CI" draft="contributed">Costa d’Ivur</territory>
-			<territory type="CK" draft="contributed">Inslas Cook</territory>
-			<territory type="CL" draft="contributed">Chile</territory>
-			<territory type="CM" draft="contributed">Camerun</territory>
+			<territory type="BS">Bahamas</territory>
+			<territory type="BT">Butan</territory>
+			<territory type="BV">Insla da Bouvet</territory>
+			<territory type="BW">Botsuana</territory>
+			<territory type="BY">Belarus</territory>
+			<territory type="BZ">Belize</territory>
+			<territory type="CA">Canada</territory>
+			<territory type="CC">Inslas Cocos</territory>
+			<territory type="CD">Congo-Kinshasa</territory>
+			<territory type="CD" alt="variant">Republica Democratica dal Congo</territory>
+			<territory type="CF">Republica Centralafricana</territory>
+			<territory type="CG">Congo-Brazzaville</territory>
+			<territory type="CG" alt="variant">Republica dal Congo</territory>
+			<territory type="CH">Svizra</territory>
+			<territory type="CI">Costa d’Ivur</territory>
+			<territory type="CI" alt="variant">Côte d’Ivoire</territory>
+			<territory type="CK">Inslas Cook</territory>
+			<territory type="CL">Chile</territory>
+			<territory type="CM">Camerun</territory>
 			<territory type="CN">China</territory>
-			<territory type="CO" draft="contributed">Columbia</territory>
-			<territory type="CP">Insla da Clipperton</territory>
-			<territory type="CR" draft="contributed">Costa Rica</territory>
-			<territory type="CU" draft="contributed">Cuba</territory>
-			<territory type="CV" draft="contributed">Cap Verd</territory>
+			<territory type="CO">Columbia</territory>
+			<territory type="CP">Insla Clipperton</territory>
+			<territory type="CQ">Sark</territory>
+			<territory type="CR">Costa Rica</territory>
+			<territory type="CU">Cuba</territory>
+			<territory type="CV">Cap Verd</territory>
 			<territory type="CW">Curaçao</territory>
 			<territory type="CX">Insla da Nadal</territory>
-			<territory type="CY" draft="contributed">Cipra</territory>
+			<territory type="CY">Cipra</territory>
 			<territory type="CZ">Tschechia</territory>
 			<territory type="CZ" alt="variant">Republica Tscheca</territory>
-			<territory type="DE" draft="contributed">Germania</territory>
+			<territory type="DE">Germania</territory>
 			<territory type="DG">Diego Garcia</territory>
-			<territory type="DJ" draft="contributed">Dschibuti</territory>
-			<territory type="DK" draft="contributed">Danemarc</territory>
-			<territory type="DM" draft="contributed">Dominica</territory>
-			<territory type="DO" draft="contributed">Republica Dominicana</territory>
-			<territory type="DZ" draft="contributed">Algeria</territory>
+			<territory type="DJ">Dschibuti</territory>
+			<territory type="DK">Danemarc</territory>
+			<territory type="DM">Dominica</territory>
+			<territory type="DO">Republica Dominicana</territory>
+			<territory type="DZ">Algeria</territory>
 			<territory type="EA">Ceuta e Melilla</territory>
-			<territory type="EC" draft="contributed">Ecuador</territory>
-			<territory type="EE" draft="contributed">Estonia</territory>
-			<territory type="EG" draft="contributed">Egipta</territory>
-			<territory type="EH" draft="contributed">Sahara Occidentala</territory>
-			<territory type="ER" draft="contributed">Eritrea</territory>
-			<territory type="ES" draft="contributed">Spagna</territory>
-			<territory type="ET" draft="contributed">Etiopia</territory>
-			<territory type="EU">Uniun Europeica</territory>
+			<territory type="EC">Ecuador</territory>
+			<territory type="EE">Estonia</territory>
+			<territory type="EG">Egipta</territory>
+			<territory type="EH">Sahara Occidentala</territory>
+			<territory type="ER">Eritrea</territory>
+			<territory type="ES">Spagna</territory>
+			<territory type="ET">Etiopia</territory>
+			<territory type="EU">Uniun europeica</territory>
 			<territory type="EZ">zona da l’euro</territory>
-			<territory type="FI" draft="contributed">Finlanda</territory>
-			<territory type="FJ" draft="contributed">Fidschi</territory>
-			<territory type="FK" draft="contributed">Inslas dal Falkland</territory>
-			<territory type="FK" alt="variant">Inslas Falkland</territory>
-			<territory type="FM" draft="contributed">Micronesia</territory>
-			<territory type="FO" draft="contributed">Inslas Feroe</territory>
-			<territory type="FR" draft="contributed">Frantscha</territory>
-			<territory type="GA" draft="contributed">Gabun</territory>
-			<territory type="GB" draft="contributed">Reginavel Unì</territory>
+			<territory type="FI">Finlanda</territory>
+			<territory type="FJ">Fidschi</territory>
+			<territory type="FK">Inslas Falkland</territory>
+			<territory type="FK" alt="variant">Inslas Falkland (Inslas Malvinas)</territory>
+			<territory type="FM">Micronesia</territory>
+			<territory type="FO">Inslas Feroe</territory>
+			<territory type="FR">Frantscha</territory>
+			<territory type="GA">Gabun</territory>
+			<territory type="GB">Reginavel Unì</territory>
 			<territory type="GB" alt="short">GB</territory>
-			<territory type="GD" draft="contributed">Grenada</territory>
-			<territory type="GE" draft="contributed">Georgia</territory>
-			<territory type="GF" draft="contributed">Guyana Franzosa</territory>
-			<territory type="GG" draft="contributed">Guernsey</territory>
-			<territory type="GH" draft="contributed">Ghana</territory>
-			<territory type="GI" draft="contributed">Gibraltar</territory>
-			<territory type="GL" draft="contributed">Grönlanda</territory>
-			<territory type="GM" draft="contributed">Gambia</territory>
-			<territory type="GN" draft="contributed">Guinea</territory>
-			<territory type="GP" draft="contributed">Guadeloupe</territory>
-			<territory type="GQ" draft="contributed">Guinea Equatoriala</territory>
-			<territory type="GR" draft="contributed">Grezia</territory>
-			<territory type="GS" draft="contributed">Georgia dal Sid e las Inslas Sandwich dal Sid</territory>
-			<territory type="GT" draft="contributed">Guatemala</territory>
-			<territory type="GU" draft="contributed">Guam</territory>
-			<territory type="GW" draft="contributed">Guinea-Bissau</territory>
-			<territory type="GY" draft="contributed">Guyana</territory>
-			<territory type="HK" draft="contributed">Regiun d’administraziun speziala da Hongkong, China</territory>
-			<territory type="HK" alt="short">Hong Kong</territory>
-			<territory type="HM">Inslas da Heard e da McDonald</territory>
-			<territory type="HN" draft="contributed">Honduras</territory>
-			<territory type="HR" draft="contributed">Croazia</territory>
-			<territory type="HT" draft="contributed">Haiti</territory>
-			<territory type="HU" draft="contributed">Ungaria</territory>
+			<territory type="GD">Grenada</territory>
+			<territory type="GE">Georgia</territory>
+			<territory type="GF">Guyana Franzosa</territory>
+			<territory type="GG">Guernsey</territory>
+			<territory type="GH">Ghana</territory>
+			<territory type="GI">Gibraltar</territory>
+			<territory type="GL">Grönlanda</territory>
+			<territory type="GM">Gambia</territory>
+			<territory type="GN">Guinea</territory>
+			<territory type="GP">Guadalupa</territory>
+			<territory type="GQ">Guinea Equatoriala</territory>
+			<territory type="GR">Grezia</territory>
+			<territory type="GS">Georgia dal Sid e las Inslas Sandwich dal Sid</territory>
+			<territory type="GT">Guatemala</territory>
+			<territory type="GU">Guam</territory>
+			<territory type="GW">Guinea-Bissau</territory>
+			<territory type="GY">Guyana</territory>
+			<territory type="HK">Regiun d’administraziun speziala Hongkong, China</territory>
+			<territory type="HK" alt="short">Hongkong</territory>
+			<territory type="HM">Inslas da Heard e McDonald</territory>
+			<territory type="HN">Honduras</territory>
+			<territory type="HR">Croazia</territory>
+			<territory type="HT">Haiti</territory>
+			<territory type="HU">Ungaria</territory>
 			<territory type="IC">Inslas Canarias</territory>
-			<territory type="ID" draft="contributed">Indonesia</territory>
-			<territory type="IE" draft="contributed">Irlanda</territory>
-			<territory type="IL" draft="contributed">Israel</territory>
-			<territory type="IM" draft="contributed">Insla da Man</territory>
+			<territory type="ID">Indonesia</territory>
+			<territory type="IE">Irlanda</territory>
+			<territory type="IL">Israel</territory>
+			<territory type="IM">Insla da Man</territory>
 			<territory type="IN">India</territory>
-			<territory type="IO" draft="provisional">Territori Britannic en l’Ocean Indic</territory>
-			<territory type="IQ" draft="contributed">Irac</territory>
-			<territory type="IR" draft="contributed">Iran</territory>
-			<territory type="IS" draft="contributed">Islanda</territory>
-			<territory type="IT" draft="contributed">Italia</territory>
-			<territory type="JE" draft="contributed">Jersey</territory>
-			<territory type="JM" draft="contributed">Giamaica</territory>
-			<territory type="JO" draft="contributed">Jordania</territory>
-			<territory type="JP" draft="contributed">Giapun</territory>
-			<territory type="KE" draft="contributed">Kenia</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH" draft="contributed">Cambodscha</territory>
-			<territory type="KI" draft="contributed">Kiribati</territory>
-			<territory type="KM" draft="contributed">Comoras</territory>
-			<territory type="KN" draft="contributed">Saint Kitts e Nevis</territory>
-			<territory type="KP" draft="contributed">Corea dal Nord</territory>
-			<territory type="KR" draft="contributed">Corea dal Sid</territory>
-			<territory type="KW" draft="contributed">Kuwait</territory>
-			<territory type="KY" draft="contributed">Inslas Cayman</territory>
-			<territory type="KZ" draft="contributed">Kasachstan</territory>
-			<territory type="LA" draft="contributed">Laos</territory>
-			<territory type="LB" draft="contributed">Libanon</territory>
-			<territory type="LC" draft="contributed">Saint Lucia</territory>
-			<territory type="LI" draft="contributed">Liechtenstein</territory>
-			<territory type="LK" draft="contributed">Sri Lanka</territory>
-			<territory type="LR" draft="contributed">Liberia</territory>
-			<territory type="LS" draft="contributed">Lesotho</territory>
-			<territory type="LT" draft="contributed">Lituania</territory>
-			<territory type="LU" draft="contributed">Luxemburg</territory>
-			<territory type="LV" draft="contributed">Lettonia</territory>
-			<territory type="LY" draft="contributed">Libia</territory>
-			<territory type="MA" draft="contributed">Maroc</territory>
-			<territory type="MC" draft="contributed">Monaco</territory>
-			<territory type="MD" draft="contributed">Moldavia</territory>
-			<territory type="ME" draft="contributed">Montenegro</territory>
-			<territory type="MF" draft="contributed">Saint Martin</territory>
-			<territory type="MG" draft="contributed">Madagascar</territory>
-			<territory type="MH" draft="contributed">Inslas da Marshall</territory>
+			<territory type="IO">Territori Britannic da l’Ocean Indic</territory>
+			<territory type="IO" alt="chagos">Archipel da Chagos</territory>
+			<territory type="IQ">Irac</territory>
+			<territory type="IR">Iran</territory>
+			<territory type="IS">Islanda</territory>
+			<territory type="IT">Italia</territory>
+			<territory type="JE">Jersey</territory>
+			<territory type="JM">Giamaica</territory>
+			<territory type="JO">Jordania</territory>
+			<territory type="JP">Giapun</territory>
+			<territory type="KE">Kenia</territory>
+			<territory type="KG">Kirghistan</territory>
+			<territory type="KH">Cambodscha</territory>
+			<territory type="KI">Kiribati</territory>
+			<territory type="KM">Comoras</territory>
+			<territory type="KN">Son Cristof e Nevis</territory>
+			<territory type="KP">Corea dal Nord</territory>
+			<territory type="KR">Corea dal Sid</territory>
+			<territory type="KW">Kuwait</territory>
+			<territory type="KY">Inslas Cayman</territory>
+			<territory type="KZ">Kasachstan</territory>
+			<territory type="LA">Laos</territory>
+			<territory type="LB">Libanon</territory>
+			<territory type="LC">Sontga Lucia</territory>
+			<territory type="LI">Liechtenstein</territory>
+			<territory type="LK">Sri Lanka</territory>
+			<territory type="LR">Liberia</territory>
+			<territory type="LS">Lesotho</territory>
+			<territory type="LT">Lituania</territory>
+			<territory type="LU">Luxemburg</territory>
+			<territory type="LV">Lettonia</territory>
+			<territory type="LY">Libia</territory>
+			<territory type="MA">Maroc</territory>
+			<territory type="MC">Monaco</territory>
+			<territory type="MD">Moldavia</territory>
+			<territory type="ME">Montenegro</territory>
+			<territory type="MF">Saint Martin</territory>
+			<territory type="MG">Madagascar</territory>
+			<territory type="MH">Inslas da Marshall</territory>
 			<territory type="MK">Macedonia dal Nord</territory>
-			<territory type="ML" draft="contributed">Mali</territory>
+			<territory type="ML">Mali</territory>
 			<territory type="MM">Myanmar (Burma)</territory>
-			<territory type="MN" draft="contributed">Mongolia</territory>
-			<territory type="MO" draft="contributed">Regiun d’administraziun speziala Macao, China</territory>
+			<territory type="MN">Mongolia</territory>
+			<territory type="MO">Regiun d’administraziun speziala Macao, China</territory>
 			<territory type="MO" alt="short">Macao</territory>
-			<territory type="MP" draft="contributed">Inslas Mariannas dal Nord</territory>
-			<territory type="MQ" draft="contributed">Martinique</territory>
-			<territory type="MR" draft="contributed">Mauretania</territory>
-			<territory type="MS" draft="contributed">Montserrat</territory>
-			<territory type="MT" draft="contributed">Malta</territory>
-			<territory type="MU" draft="contributed">Mauritius</territory>
-			<territory type="MV" draft="contributed">Maldivas</territory>
-			<territory type="MW" draft="contributed">Malawi</territory>
-			<territory type="MX" draft="contributed">Mexico</territory>
-			<territory type="MY" draft="contributed">Malaisia</territory>
-			<territory type="MZ" draft="contributed">Mosambic</territory>
-			<territory type="NA" draft="contributed">Namibia</territory>
-			<territory type="NC" draft="contributed">Nova Caledonia</territory>
-			<territory type="NE" draft="contributed">Niger</territory>
-			<territory type="NF" draft="contributed">Insla Norfolk</territory>
-			<territory type="NG" draft="contributed">Nigeria</territory>
-			<territory type="NI" draft="contributed">Nicaragua</territory>
-			<territory type="NL" draft="contributed">Pajais Bass</territory>
-			<territory type="NO" draft="contributed">Norvegia</territory>
-			<territory type="NP" draft="contributed">Nepal</territory>
-			<territory type="NR" draft="contributed">Nauru</territory>
-			<territory type="NU" draft="contributed">Niue</territory>
-			<territory type="NZ" draft="contributed">Nova Zelanda</territory>
-			<territory type="OM" draft="contributed">Oman</territory>
+			<territory type="MP">Inslas Mariannas dal Nord</territory>
+			<territory type="MQ">Martinica</territory>
+			<territory type="MR">Mauretania</territory>
+			<territory type="MS">Montserrat</territory>
+			<territory type="MT">Malta</territory>
+			<territory type="MU">Mauritius</territory>
+			<territory type="MV">Maledivas</territory>
+			<territory type="MW">Malawi</territory>
+			<territory type="MX">Mexico</territory>
+			<territory type="MY">Malaisia</territory>
+			<territory type="MZ">Mosambic</territory>
+			<territory type="NA">Namibia</territory>
+			<territory type="NC">Nova Caledonia</territory>
+			<territory type="NE">Niger</territory>
+			<territory type="NF">Insla Norfolk</territory>
+			<territory type="NG">Nigeria</territory>
+			<territory type="NI">Nicaragua</territory>
+			<territory type="NL">Pajais Bass</territory>
+			<territory type="NO">Norvegia</territory>
+			<territory type="NP">Nepal</territory>
+			<territory type="NR">Nauru</territory>
+			<territory type="NU">Niue</territory>
+			<territory type="NZ">Nova Zelanda</territory>
+			<territory type="NZ" alt="variant">Aotearoa (Nova Zelanda)</territory>
+			<territory type="OM">Oman</territory>
 			<territory type="PA">Panama</territory>
-			<territory type="PE" draft="contributed">Peru</territory>
-			<territory type="PF" draft="contributed">Polinesia Franzosa</territory>
-			<territory type="PG" draft="contributed">Papua Nova Guinea</territory>
-			<territory type="PH" draft="contributed">Filippinas</territory>
-			<territory type="PK" draft="contributed">Pakistan</territory>
-			<territory type="PL" draft="contributed">Pologna</territory>
-			<territory type="PM" draft="contributed">Saint Pierre e Miquelon</territory>
-			<territory type="PN" draft="contributed">Pitcairn</territory>
-			<territory type="PR" draft="contributed">Puerto Rico</territory>
-			<territory type="PS" draft="contributed">Territori Palestinais</territory>
+			<territory type="PE">Peru</territory>
+			<territory type="PF">Polinesia Franzosa</territory>
+			<territory type="PG">Papua Nova Guinea</territory>
+			<territory type="PH">Filippinas</territory>
+			<territory type="PK">Pakistan</territory>
+			<territory type="PL">Pologna</territory>
+			<territory type="PM">Saint Pierre e Miquelon</territory>
+			<territory type="PN">Pitcairn</territory>
+			<territory type="PR">Puerto Rico</territory>
+			<territory type="PS">Territori Palestinais</territory>
 			<territory type="PS" alt="short">Palestina</territory>
-			<territory type="PT" draft="contributed">Portugal</territory>
-			<territory type="PW" draft="contributed">Palau</territory>
-			<territory type="PY" draft="contributed">Paraguai</territory>
-			<territory type="QA" draft="contributed">Katar</territory>
-			<territory type="QO" draft="contributed">Oceania Periferica</territory>
-			<territory type="RE" draft="contributed">Réunion</territory>
-			<territory type="RO" draft="contributed">Rumenia</territory>
-			<territory type="RS" draft="contributed">Serbia</territory>
+			<territory type="PT">Portugal</territory>
+			<territory type="PW">Palau</territory>
+			<territory type="PY">Paraguai</territory>
+			<territory type="QA">Qatar</territory>
+			<territory type="QO">Oceania Periferica</territory>
+			<territory type="RE">Réunion</territory>
+			<territory type="RO">Rumenia</territory>
+			<territory type="RS">Serbia</territory>
 			<territory type="RU">Russia</territory>
-			<territory type="RW" draft="contributed">Ruanda</territory>
-			<territory type="SA" draft="contributed">Arabia Saudita</territory>
-			<territory type="SB">Inslas Salomonas</territory>
-			<territory type="SC" draft="contributed">Seychellas</territory>
-			<territory type="SD" draft="contributed">Sudan</territory>
-			<territory type="SE" draft="contributed">Svezia</territory>
-			<territory type="SG" draft="contributed">Singapur</territory>
-			<territory type="SH" draft="contributed">Sontg’Elena</territory>
-			<territory type="SI" draft="contributed">Slovenia</territory>
-			<territory type="SJ" draft="contributed">Svalbard e Jan Mayen</territory>
-			<territory type="SK" draft="contributed">Slovachia</territory>
-			<territory type="SL" draft="contributed">Sierra Leone</territory>
-			<territory type="SM" draft="contributed">San Marino</territory>
-			<territory type="SN" draft="contributed">Senegal</territory>
-			<territory type="SO" draft="contributed">Somalia</territory>
-			<territory type="SR" draft="contributed">Surinam</territory>
+			<territory type="RW">Ruanda</territory>
+			<territory type="SA">Arabia Saudita</territory>
+			<territory type="SB">Inslas da Salomon</territory>
+			<territory type="SC">Seychellas</territory>
+			<territory type="SD">Sudan</territory>
+			<territory type="SE">Svezia</territory>
+			<territory type="SG">Singapur</territory>
+			<territory type="SH">Sontg’Elena</territory>
+			<territory type="SI">Slovenia</territory>
+			<territory type="SJ">Svalbard e Jan Mayen</territory>
+			<territory type="SK">Slovachia</territory>
+			<territory type="SL">Sierra Leone</territory>
+			<territory type="SM">Son Marin</territory>
+			<territory type="SN">Senegal</territory>
+			<territory type="SO">Somalia</territory>
+			<territory type="SR">Surinam</territory>
 			<territory type="SS">Sudan dal Sid</territory>
-			<territory type="ST">São Tomé &amp; Príncipe</territory>
-			<territory type="SV" draft="contributed">El Salvador</territory>
+			<territory type="ST">São Tomé e Príncipe</territory>
+			<territory type="SV">El Salvador</territory>
 			<territory type="SX">Sint Maarten</territory>
-			<territory type="SY" draft="contributed">Siria</territory>
+			<territory type="SY">Siria</territory>
 			<territory type="SZ">Eswatini</territory>
-			<territory type="SZ" alt="variant">Swaziland</territory>
+			<territory type="SZ" alt="variant">Swasiland</territory>
 			<territory type="TA">Tristan da Cunha</territory>
-			<territory type="TC" draft="contributed">Inslas Turks e Caicos</territory>
-			<territory type="TD" draft="contributed">Tschad</territory>
-			<territory type="TF" draft="contributed">Territoris Franzos Meridiunals</territory>
-			<territory type="TG" draft="contributed">Togo</territory>
-			<territory type="TH" draft="contributed">Tailanda</territory>
-			<territory type="TJ" draft="contributed">Tadschikistan</territory>
-			<territory type="TK" draft="contributed">Tokelau</territory>
-			<territory type="TL" draft="contributed">Timor da l’Ost</territory>
-			<territory type="TM" draft="contributed">Turkmenistan</territory>
-			<territory type="TN" draft="contributed">Tunesia</territory>
-			<territory type="TO" draft="contributed">Tonga</territory>
-			<territory type="TR" draft="contributed">Tirchia</territory>
-			<territory type="TT" draft="contributed">Trinidad e Tobago</territory>
-			<territory type="TV" draft="contributed">Tuvalu</territory>
-			<territory type="TW" draft="contributed">Taiwan</territory>
-			<territory type="TZ" draft="contributed">Tansania</territory>
-			<territory type="UA" draft="contributed">Ucraina</territory>
-			<territory type="UG" draft="contributed">Uganda</territory>
+			<territory type="TC">Inslas Turks e Caicos</territory>
+			<territory type="TD">Tschad</territory>
+			<territory type="TF">Territoris Franzos Meridiunals</territory>
+			<territory type="TG">Togo</territory>
+			<territory type="TH">Tailanda</territory>
+			<territory type="TJ">Tadschikistan</territory>
+			<territory type="TK">Tokelau</territory>
+			<territory type="TL">Timor da l’Ost</territory>
+			<territory type="TL" alt="variant">Timor-Leste</territory>
+			<territory type="TM">Turkmenistan</territory>
+			<territory type="TN">Tunesia</territory>
+			<territory type="TO">Tonga</territory>
+			<territory type="TR">Tirchia</territory>
+			<territory type="TT">Trinidad e Tobago</territory>
+			<territory type="TV">Tuvalu</territory>
+			<territory type="TW">Taiwan</territory>
+			<territory type="TZ">Tansania</territory>
+			<territory type="UA">Ucraina</territory>
+			<territory type="UG">Uganda</territory>
 			<territory type="UM">Inslas Pitschnas Perifericas dals Stadis Unids da l’America</territory>
-			<territory type="UN">Naziuns Unidas</territory>
-			<territory type="US" draft="contributed">Stadis Unids da l’America</territory>
-			<territory type="US" alt="short">US</territory>
-			<territory type="UY" draft="contributed">Uruguay</territory>
-			<territory type="UZ" draft="contributed">Usbekistan</territory>
-			<territory type="VA" draft="contributed">Citad dal Vatican</territory>
-			<territory type="VC" draft="contributed">Saint Vincent e las Grenadinas</territory>
-			<territory type="VE" draft="contributed">Venezuela</territory>
+			<territory type="UN">Naziuns unidas</territory>
+			<territory type="US">Stadis Unids da l’America</territory>
+			<territory type="US" alt="short">USA</territory>
+			<territory type="UY">Uruguai</territory>
+			<territory type="UZ">Usbekistan</territory>
+			<territory type="VA">Citad dal Vatican</territory>
+			<territory type="VC">Son Vincenz e las Grenadinas</territory>
+			<territory type="VE">Venezuela</territory>
 			<territory type="VG">Inslas Virginas Britannicas</territory>
 			<territory type="VI">Inslas Virginas Americanas</territory>
-			<territory type="VN" draft="contributed">Vietnam</territory>
-			<territory type="VU" draft="contributed">Vanuatu</territory>
-			<territory type="WF">Wallis &amp; Futuna</territory>
-			<territory type="WS" draft="contributed">Samoa</territory>
-			<territory type="XA">accents pseudo</territory>
-			<territory type="XB">pseudo-bidirecziunal</territory>
+			<territory type="VN">Vietnam</territory>
+			<territory type="VU">Vanuatu</territory>
+			<territory type="WF">Wallis e Futuna</territory>
+			<territory type="WS">Samoa</territory>
+			<territory type="XA">pseudo-accents</territory>
+			<territory type="XB">pseudo-bidi</territory>
 			<territory type="XK">Cosovo</territory>
-			<territory type="YE" draft="contributed">Jemen</territory>
-			<territory type="YT" draft="contributed">Mayotte</territory>
-			<territory type="ZA" draft="contributed">Africa dal Sid</territory>
-			<territory type="ZM" draft="contributed">Sambia</territory>
-			<territory type="ZW" draft="contributed">Simbabwe</territory>
+			<territory type="YE">Jemen</territory>
+			<territory type="YT">Mayotte</territory>
+			<territory type="ZA">Africa dal Sid</territory>
+			<territory type="ZM">Sambia</territory>
+			<territory type="ZW">Simbabwe</territory>
 			<territory type="ZZ">regiun nunenconuschenta</territory>
 		</territories>
 		<variants>
@@ -1020,63 +1042,138 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<variant type="VALENCIA" draft="contributed">valencian</variant>
 		</variants>
 		<keys>
-			<key type="calendar" draft="contributed">chalender</key>
+			<key type="calendar">chalender</key>
 			<key type="cf">format da valuta</key>
-			<key type="collation" draft="contributed">zavrada</key>
+			<key type="collation">zavrada</key>
 			<key type="currency">valuta</key>
-			<key type="hc">ciclus da las uras</key>
+			<key type="em">visualisaziun dals emojis</key>
+			<key type="hc">ciclus da las uras (12 u 24h)</key>
 			<key type="lb">stil da sigl da lingia</key>
+			<key type="lw">sigls da lingia entaifer pleds</key>
 			<key type="ms">sistem da mesira</key>
-			<key type="numbers" draft="unconfirmed">dumbers</key>
+			<key type="numbers">dumbers</key>
+			<key type="ss">Interrupziun da la frasa suenter ina abreviaziun</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist" draft="contributed">chalender budistic</type>
-			<type key="calendar" type="chinese" draft="contributed">chalender chinais</type>
-			<type key="calendar" type="coptic" draft="unconfirmed">chalender coptic</type>
+			<type key="calendar" type="buddhist">chalender budistic</type>
+			<type key="calendar" type="buddhist" scope="core">budistic</type>
+			<type key="calendar" type="chinese">chalender chinais</type>
+			<type key="calendar" type="chinese" scope="core">chinais</type>
+			<type key="calendar" type="coptic">chalender coptic</type>
+			<type key="calendar" type="coptic" scope="core">coptic</type>
 			<type key="calendar" type="dangi">chalender dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">chalender etiopic</type>
-			<type key="calendar" type="gregorian" draft="contributed">chalender gregorian</type>
-			<type key="calendar" type="hebrew" draft="contributed">chalender ebraic</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopic</type>
+			<type key="calendar" type="ethiopic-amete-alem">chalender etiopic amete alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopic amete alem</type>
+			<type key="calendar" type="gregorian">chalender gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
+			<type key="calendar" type="hebrew">chalender ebraic</type>
+			<type key="calendar" type="hebrew" scope="core">ebraic</type>
 			<type key="calendar" type="indian" draft="contributed">chalender naziunal indic</type>
-			<type key="calendar" type="islamic" draft="provisional">chalender islamic</type>
-			<type key="calendar" type="islamic-civil" draft="provisional">chalender islamic civil</type>
+			<type key="calendar" type="islamic">chalender hijri</type>
+			<type key="calendar" type="islamic" scope="core">hijri</type>
+			<type key="calendar" type="islamic-civil">chalender hijri (tabellar, epoca civila)</type>
+			<type key="calendar" type="islamic-civil" scope="core">hijri (tabellar, epoca civila)</type>
 			<type key="calendar" type="islamic-rgsa" draft="unconfirmed">chalender islamic (Arabia Saudita)</type>
-			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">chalender islamic (Umm al-Qura)</type>
-			<type key="calendar" type="iso8601">chalender tenor ISO 8601</type>
-			<type key="calendar" type="japanese" draft="contributed">chalender giapunais</type>
+			<type key="calendar" type="islamic-umalqura">chalender hijri (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hijri (Umm al-Qura)</type>
+			<type key="calendar" type="iso8601">chalender gregorian (cun l’onn al cumenzament)</type>
+			<type key="calendar" type="japanese">chalender giapunais</type>
+			<type key="calendar" type="japanese" scope="core">giapunais</type>
 			<type key="calendar" type="persian">chalender persian</type>
-			<type key="calendar" type="roc">chalender da la Republica Chinaisa</type>
+			<type key="calendar" type="persian" scope="core">persian</type>
+			<type key="calendar" type="roc">chalender minguo</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">format da valuta per la contabilitad</type>
+			<type key="cf" type="account" scope="core">contabilitad</type>
 			<type key="cf" type="standard">format da valuta da standard</type>
-			<type key="collation" type="big5han" draft="contributed">chinaisa tradiziunala - Big5</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="collation" type="ducet">zavrada unicode standard</type>
-			<type key="collation" type="gb2312han" draft="contributed">chinaisa simplifitgada - GB2312</type>
+			<type key="collation" type="ducet" scope="core">standard unicode</type>
 			<type key="collation" type="phonebook" draft="contributed">cudesch da telefon</type>
 			<type key="collation" type="pinyin" draft="contributed">Pinyin</type>
 			<type key="collation" type="search">tschertga generala</type>
+			<type key="collation" type="search" scope="core">tschertga</type>
 			<type key="collation" type="standard">zavrada da standard</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke" draft="contributed">urden dals stritgs</type>
 			<type key="collation" type="traditional" draft="contributed">reglas tradiziunalas</type>
+			<type key="em" type="default" scope="core">predefinì</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">text</type>
 			<type key="hc" type="h11">sistem da 12 uras (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">sistem da 12 uras (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">sistem da 24 uras (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">sistem da 24 uras (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">stil da sigl da lingia liber</type>
+			<type key="lb" type="loose" scope="core">liber</type>
 			<type key="lb" type="normal">stil da sigl da lingia normal</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">stil da sigl da lingia strict</type>
+			<type key="lb" type="strict" scope="core">strict</type>
+			<type key="lw" type="breakall" scope="core">divider tut</type>
+			<type key="lw" type="keepall" scope="core">preservar tut</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">preservar en frasas</type>
 			<type key="ms" type="metric">sistem metric</type>
-			<type key="ms" type="uksystem">sistem da mesira imperial</type>
-			<type key="ms" type="ussystem">sistem da mesira US</type>
+			<type key="ms" type="metric" scope="core">metric</type>
+			<type key="ms" type="uksystem">sistem imperial britannic</type>
+			<type key="ms" type="uksystem" scope="core">imperial britannic</type>
+			<type key="ms" type="ussystem">sistem da mesira USA</type>
+			<type key="ms" type="ussystem" scope="core">USA</type>
 			<type key="numbers" type="arab">cifras indic-arabas</type>
-			<type key="numbers" type="armn" draft="unconfirmed">dumbers armens</type>
-			<type key="numbers" type="beng" draft="unconfirmed">cifras bengalas</type>
-			<type key="numbers" type="geor" draft="unconfirmed">dumbers georgians</type>
+			<type key="numbers" type="arabext">cifras indic-arabas extendidas</type>
+			<type key="numbers" type="armn">dumbers armens</type>
+			<type key="numbers" type="armnlow">dumbers armens en minusclas</type>
+			<type key="numbers" type="beng">cifras bengalas</type>
+			<type key="numbers" type="cakm">cifras chakma</type>
+			<type key="numbers" type="deva">cifras devanagari</type>
+			<type key="numbers" type="ethi">cifras etiopicas</type>
+			<type key="numbers" type="fullwide">cifras da ladezza cumplaina</type>
+			<type key="numbers" type="geor">dumbers georgians</type>
+			<type key="numbers" type="grek">dumbers grecs</type>
+			<type key="numbers" type="greklow">dumbers grecs en minusclas</type>
+			<type key="numbers" type="gujr">cifras gujarati</type>
+			<type key="numbers" type="guru">cifras gurmukhi</type>
+			<type key="numbers" type="hanidec">dumbers chinais decimals</type>
+			<type key="numbers" type="hans">dumbers en chinais simplifitgà</type>
+			<type key="numbers" type="hansfin">dumbers finanziars en chinais simplifitgà</type>
+			<type key="numbers" type="hant">dumbers en chinais tradiziunal</type>
+			<type key="numbers" type="hantfin">dumbers finanziars en chinais tradiziunal</type>
+			<type key="numbers" type="hebr">dumbers ebraics</type>
+			<type key="numbers" type="java">cifras javanaisas</type>
+			<type key="numbers" type="jpan">dumbers giapunais</type>
+			<type key="numbers" type="jpanfin">dumbers finanziars giapunais</type>
+			<type key="numbers" type="khmr">cifras khmer</type>
+			<type key="numbers" type="knda">cifras kannada</type>
+			<type key="numbers" type="laoo">cifras laotas</type>
 			<type key="numbers" type="latn">cifras occidentalas</type>
+			<type key="numbers" type="mlym">cifras malayalam</type>
+			<type key="numbers" type="mtei">cifras meetei mayek</type>
+			<type key="numbers" type="mymr">cifras dal Myanmar</type>
+			<type key="numbers" type="olck">cifras ol chiki</type>
+			<type key="numbers" type="orya">cifras oriya</type>
+			<type key="numbers" type="roman">dumbers romans</type>
+			<type key="numbers" type="romanlow">dumbers romans en minusclas</type>
+			<type key="numbers" type="taml">dumbers tamil tradiziunal</type>
+			<type key="numbers" type="tamldec">cifras tamilas</type>
+			<type key="numbers" type="telu">cifras telugu</type>
+			<type key="numbers" type="thai">cifras en thai</type>
+			<type key="numbers" type="tibt">cifras tibetanas</type>
+			<type key="numbers" type="vaii">cifras vai</type>
+			<type key="ss" type="none" scope="core">Deactivà</type>
+			<type key="ss" type="standard" scope="core">Activà</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metric</measurementSystemName>
-			<measurementSystemName type="UK">englais</measurementSystemName>
-			<measurementSystemName type="US">american</measurementSystemName>
+			<measurementSystemName type="UK">britannic</measurementSystemName>
+			<measurementSystemName type="US">USA</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Lingua: {0}</codePattern>
@@ -1091,10 +1188,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="numbers">[. ’ % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<delimiters>
-		<quotationStart draft="contributed">«</quotationStart>
-		<quotationEnd draft="contributed">»</quotationEnd>
-		<alternateQuotationStart draft="contributed">‹</alternateQuotationStart>
-		<alternateQuotationEnd draft="contributed">›</alternateQuotationEnd>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>‹</alternateQuotationStart>
+		<alternateQuotationEnd>›</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -1102,23 +1199,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="contributed">EEEE, 'ils' d MMMM y G</pattern>
+							<pattern>EEEE, 'ils' d MMMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern draft="contributed">d MMMM y G</pattern>
+							<pattern>d MMMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern draft="contributed">dd-MM-y G</pattern>
+							<pattern>d MMM y G</pattern>
 							<datetimeSkeleton draft="contributed">GyMMdd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="contributed">dd-MM-y GGGGG</pattern>
+							<pattern>dd-MM-y GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1130,6 +1227,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'las' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1138,6 +1238,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'las' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1150,43 +1253,93 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed" draft="contributed">E d.</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="contributed">E h:mm a</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="contributed">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Gy" draft="contributed">y G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="contributed">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="contributed">dd-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="contributed">E, dd-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMMMd" draft="contributed">d MMMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMMEd" draft="contributed">E, d MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMMMMd">d MMMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMMEd">E, d MMMM y G</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
-						<dateFormatItem id="Md" draft="contributed">dd-MM</dateFormatItem>
-						<dateFormatItem id="MEd" draft="contributed">E, dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="contributed">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="contributed">E, dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="contributed">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd" draft="contributed">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="y" draft="contributed">y G</dateFormatItem>
-						<dateFormatItem id="yM" draft="contributed">MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="contributed">E, dd-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="contributed">LLL y G</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="contributed">dd-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="contributed">E, dd-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yMMMM" draft="contributed">LLLL y G</dateFormatItem>
-						<dateFormatItem id="yMMMMd" draft="contributed">d MMMM y G</dateFormatItem>
-						<dateFormatItem id="yMMMMEd" draft="contributed">E, d MMMM y G</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="contributed">QQQ y G</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="contributed">QQQQ y G</dateFormatItem>
+						<dateFormatItem id="Md">dd-MM</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd-MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yM">MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yMEd">E, dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yMMM">LLL y G</dateFormatItem>
+						<dateFormatItem id="yMMMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yMMMM">LLLL y G</dateFormatItem>
+						<dateFormatItem id="yMMMMd">d MMMM y G</dateFormatItem>
+						<dateFormatItem id="yMMMMEd">E, d MMMM y G</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">MM-y G</dateFormatItem>
+						<dateFormatItem id="yyyyMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="contributed">d.–d.</greatestDifference>
+							<greatestDifference id="d">d – d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">MM-y G – MM-y G</greatestDifference>
+							<greatestDifference id="M">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="y">MM-y – MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">dd – dd-MM-y G</greatestDifference>
+							<greatestDifference id="G">dd-MM-y G – dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">dd – dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">dd-MM-y – dd-MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="G">E dd-MM-y G – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">E dd-MM-y – E dd-MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E d – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
@@ -1207,76 +1360,79 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="contributed">LL–LL</greatestDifference>
+							<greatestDifference id="M">LL–LL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d">dd – dd-MM</greatestDifference>
+							<greatestDifference id="M">dd-MM – dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">E, dd-MM – E, dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, dd-MM – E, dd-MM</greatestDifference>
+							<greatestDifference id="d">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="M">E dd-MM – E dd-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="contributed">dd-MM – dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">E, dd-MM – E, dd-MM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, dd-MM – E, dd-MM</greatestDifference>
+							<greatestDifference id="d">E d – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMMd">
-							<greatestDifference id="d" draft="contributed">d.–d MMMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d MMMM – d MMMM</greatestDifference>
+							<greatestDifference id="d">d – d MMMM</greatestDifference>
+							<greatestDifference id="M">d MMMM – d MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMMEd">
-							<greatestDifference id="d" draft="contributed">E, d. – E, d MMMM</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d MMMM – E, d MMMM</greatestDifference>
+							<greatestDifference id="d">E d. – E d MMMM</greatestDifference>
+							<greatestDifference id="M">E d MMMM – E d MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="contributed">y–y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">LL-y – LL-y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">LL-y – LL-y GGGGG</greatestDifference>
+							<greatestDifference id="M">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="y">MM-y – MM-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
+							<greatestDifference id="d">d-M-y – d-M-y G</greatestDifference>
+							<greatestDifference id="M">d-M-y – d-M-y G</greatestDifference>
+							<greatestDifference id="y">d-M-y – d-M-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
+							<greatestDifference id="d">E d-M-y – E d-M-y G</greatestDifference>
+							<greatestDifference id="M">E d-M-y – E d-M-y G</greatestDifference>
+							<greatestDifference id="y">E d-M-y – E d-M-y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="contributed">LLL–LLL y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">LLL y – LLL y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="contributed">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="contributed">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">dd-MM-y – dd-MM-y GGGGG</greatestDifference>
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, dd-MM-y – E, dd-MM-y GGGGG</greatestDifference>
+							<greatestDifference id="d">E d – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="contributed">LLLL–LLLL y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">LLLL y – LLLL y G</greatestDifference>
+							<greatestDifference id="M">LLLL–LLLL y G</greatestDifference>
+							<greatestDifference id="y">LLLL y – LLLL y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMd">
-							<greatestDifference id="d" draft="contributed">d.–d MMMM y G</greatestDifference>
-							<greatestDifference id="M" draft="contributed">d MMMM – d MMMM y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">d MMMM y – d MMMM y G</greatestDifference>
+							<greatestDifference id="d">d – d MMMM y G</greatestDifference>
+							<greatestDifference id="M">d MMMM – d MMMM y G</greatestDifference>
+							<greatestDifference id="y">d MMMM y – d MMMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMEd">
-							<greatestDifference id="d" draft="contributed">E, d. – E, d MMMM y G</greatestDifference>
-							<greatestDifference id="M" draft="contributed">E, d MMMM – E, d MMMM y G</greatestDifference>
-							<greatestDifference id="y" draft="contributed">E, d MMMM y – E, d MMMM y G</greatestDifference>
+							<greatestDifference id="d">E d – E d MMMM y</greatestDifference>
+							<greatestDifference id="M">E d MMMM – E d MMMM y</greatestDifference>
+							<greatestDifference id="y">E d MMMM y – E d MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1393,16 +1549,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<era type="0">avant Cristus</era>
+						<era type="0" alt="variant">avant l’èra cuminaivla</era>
 						<era type="1">suenter Cristus</era>
+						<era type="1" alt="variant">da l’èra cuminaivla</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">av. Cr.</era>
-						<era type="0" alt="variant">BCE</era>
-						<era type="1">s. Cr.</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="0">a.Cr.</era>
+						<era type="0" alt="variant">a.e.c.</era>
+						<era type="1">s.C.</era>
+						<era type="1" alt="variant">e.c.</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1454,66 +1620,125 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'las' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'las' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'las' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed">E d.</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">dd-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMMMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d MMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E, d MMMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Md">dd-MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, dd-MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one">W. 'emna' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">W. 'emna' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">'emna' W 'dal' 'mais' LLLL</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">'emna' W 'dal' 'mais' LLLL</dateFormatItem>
 						<dateFormatItem id="yM">LL-y</dateFormatItem>
-						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
-						<dateFormatItem id="yMEd">E, dd-MM-y</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
-						<dateFormatItem id="yMMMd">dd-MM-y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, dd-MM-y</dateFormatItem>
+						<dateFormatItem id="yMd">d-M-y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, d-M-y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
 						<dateFormatItem id="yMMMMd">d MMMM y</dateFormatItem>
 						<dateFormatItem id="yMMMMEd">E, d MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
-						<dateFormatItem id="yw" count="one">w. 'dal' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other">w. 'emna' 'dal' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">'emna' w 'dal' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other">'emna' w 'dal' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">MM-y G – MM-y G</greatestDifference>
+							<greatestDifference id="M">MM-y – MM-y G</greatestDifference>
+							<greatestDifference id="y">MM-y – MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">dd – dd-MM-y G</greatestDifference>
+							<greatestDifference id="G">dd-MM-y G – dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">dd-MM – dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">dd-MM-y – dd-MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E dd-MM-y – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="G">E dd-MM-y G – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">E dd-MM – E dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">E dd-MM-y – E dd-MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E d – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1525,78 +1750,74 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">LL–LL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d">dd – dd-MM</greatestDifference>
 							<greatestDifference id="M">dd-MM – dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd-MM – E, dd-MM</greatestDifference>
-							<greatestDifference id="M">E, dd-MM – E, dd-MM</greatestDifference>
+							<greatestDifference id="d">E dd-MM – E dd-MM</greatestDifference>
+							<greatestDifference id="M">E dd-MM – E dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-MM – dd-MM</greatestDifference>
-							<greatestDifference id="M">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd-MM – E, dd-MM</greatestDifference>
-							<greatestDifference id="M">E, dd-MM – E, dd-MM</greatestDifference>
+							<greatestDifference id="d">E d – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMMd">
-							<greatestDifference id="d">d.–d MMMM</greatestDifference>
+							<greatestDifference id="d">d – d MMMM</greatestDifference>
 							<greatestDifference id="M">d MMMM – d MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMMEd">
-							<greatestDifference id="d">E, d. – E, d MMMM</greatestDifference>
-							<greatestDifference id="M">E, d MMMM – E, d MMMM</greatestDifference>
+							<greatestDifference id="d">E d. – E d MMMM</greatestDifference>
+							<greatestDifference id="M">E d MMMM – E d MMMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">LL-y – LL-y</greatestDifference>
-							<greatestDifference id="y">LL-y – LL-y</greatestDifference>
+							<greatestDifference id="M">MM-y – MM-y</greatestDifference>
+							<greatestDifference id="y">MM-y – MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd-MM-y – dd-MM-y</greatestDifference>
-							<greatestDifference id="M">dd-MM-y – dd-MM-y</greatestDifference>
-							<greatestDifference id="y">dd-MM-y – dd-MM-y</greatestDifference>
+							<greatestDifference id="d">d-M-y – d-M-y</greatestDifference>
+							<greatestDifference id="M">d-M-y – d-M-y</greatestDifference>
+							<greatestDifference id="y">d-M-y – d-M-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd-MM-y – E, dd-MM-y</greatestDifference>
-							<greatestDifference id="M">E, dd-MM-y – E, dd-MM-y</greatestDifference>
-							<greatestDifference id="y">E, dd-MM-y – E, dd-MM-y</greatestDifference>
+							<greatestDifference id="d">E d-M-y – E d-M-y</greatestDifference>
+							<greatestDifference id="M">E d-M-y – E d-M-y</greatestDifference>
+							<greatestDifference id="y">E d-M-y – E d-M-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL–LLL y</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-MM-y – dd-MM-y</greatestDifference>
-							<greatestDifference id="M">dd-MM-y – dd-MM-y</greatestDifference>
-							<greatestDifference id="y">dd-MM-y – dd-MM-y</greatestDifference>
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd-MM-y – E, dd-MM-y</greatestDifference>
-							<greatestDifference id="M">E, dd-MM-y – E, dd-MM-y</greatestDifference>
-							<greatestDifference id="y">E, dd-MM-y – E, dd-MM-y</greatestDifference>
+							<greatestDifference id="d">E d – E d MMM y</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">LLLL–LLLL y</greatestDifference>
 							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMd">
-							<greatestDifference id="d">d.–d MMMM y</greatestDifference>
+							<greatestDifference id="d">d – d MMMM y</greatestDifference>
 							<greatestDifference id="M">d MMMM – d MMMM y</greatestDifference>
 							<greatestDifference id="y">d MMMM y – d MMMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMMEd">
-							<greatestDifference id="d">E, d. – E, d MMMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMMM – E, d MMMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMMM y – E, d MMMM y</greatestDifference>
+							<greatestDifference id="d">E d – E d MMMM y</greatestDifference>
+							<greatestDifference id="M">E d MMMM – E d MMMM y</greatestDifference>
+							<greatestDifference id="y">E d MMMM y – E d MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1604,25 +1825,181 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName draft="contributed">epoca</displayName>
+				<displayName>èra</displayName>
+			</field>
+			<field type="era-short">
+				<displayName>èra</displayName>
+			</field>
+			<field type="era-narrow">
+				<displayName>èra</displayName>
 			</field>
 			<field type="year">
-				<displayName draft="contributed">onn</displayName>
+				<displayName>onn</displayName>
 				<relative type="-1">l’onn passà</relative>
 				<relative type="0">quest onn</relative>
 				<relative type="1">l’onn proxim</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} onn</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} onns</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} onn</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} onns</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} onn</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} onns</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} onn</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} onns</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>o.</displayName>
+				<relative type="-1">l’onn passà</relative>
+				<relative type="0">quest onn</relative>
+				<relative type="1">l’onn prox.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0}o</relativeTimePattern>
+					<relativeTimePattern count="other">en {0}o</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0}o</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0}o</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>quartal</displayName>
+				<relative type="-1">l’ultim quartal</relative>
+				<relative type="0">quest quartal</relative>
+				<relative type="1">il proxim quartal</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} quartal</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} quartals</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} quartal</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} quartals</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>qrtl</displayName>
+				<displayName>quart.</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} qrtl.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} qrtls.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} qrtl.</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} qrtls.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>Q</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0}q</relativeTimePattern>
+					<relativeTimePattern count="other">en {0}q</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0}q</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0}q</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName draft="contributed">mais</displayName>
+				<displayName>mais</displayName>
+				<relative type="-1">l’ultim mais</relative>
+				<relative type="0">quest mais</relative>
+				<relative type="1">il proxim mais</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mais</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} mais</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} mais</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} mais</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<relative type="-1">ultim mais</relative>
+				<relative type="0">quest mais</relative>
+				<relative type="1">proxim mais</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mais</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} mais</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} mais</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} mais</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>m.</displayName>
+				<relative type="-1">ultim mais</relative>
+				<relative type="0">quest mais</relative>
+				<relative type="1">proxim mais</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0}mais</relativeTimePattern>
+					<relativeTimePattern count="other">en {0}mais</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0}mais</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0}mais</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="week">
-				<displayName draft="contributed">emna</displayName>
+				<displayName>emna</displayName>
+				<relative type="-1">l’ultima emna</relative>
+				<relative type="0">quest’emna</relative>
+				<relative type="1">proxim’emna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} emna</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} emnas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} emna</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} emnas</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>l’emna dals {0}</relativePeriod>
+			</field>
+			<field type="week-short">
+				<relative type="-1">ultim’emna</relative>
+				<relative type="0">quest’emna</relative>
+				<relative type="1">proxim’emna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} emna</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} emnas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} emna</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} emnas</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>l’emna dals {0}</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<displayName>e.</displayName>
+				<relative type="-1">ultim’emna</relative>
+				<relative type="0">quest’emna</relative>
+				<relative type="1">proxim’emna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0}e</relativeTimePattern>
+					<relativeTimePattern count="other">en {0}e</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0}e</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0}e</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>l’emna dals {0}</relativePeriod>
+			</field>
+			<field type="weekOfMonth">
+				<displayName>emna dal mais</displayName>
+			</field>
+			<field type="weekOfMonth-short">
+				<displayName>emna dal mais</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName>emna mais</displayName>
 			</field>
 			<field type="day">
 				<displayName>di</displayName>
@@ -1631,540 +2008,1705 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">oz</relative>
 				<relative type="1">damaun</relative>
 				<relative type="2">puschmaun</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} di</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} dis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} di</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} dis</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} di</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} dis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} di</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} dis</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="day-narrow">
 				<displayName>d</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0}d</relativeTimePattern>
+					<relativeTimePattern count="other">en {0}d</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0}d</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0}d</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayOfYear">
+				<displayName>di da l’onn</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName>di da l’onn</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName>di da l’onn</displayName>
 			</field>
 			<field type="weekday">
 				<displayName>di da l’emna</displayName>
 			</field>
-			<field type="sun-short">
+			<field type="weekdayOfMonth">
+				<displayName>di dal mais</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName>di dal mais</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName>di dal mais</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">l’ultima dumengia</relative>
+				<relative type="0">questa dumengia</relative>
+				<relative type="1">proxima dumengia</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} dumengia</relativeTimePattern>
-					<relativeTimePattern count="other">en {0} du</relativeTimePattern>
+					<relativeTimePattern count="one">en {0} dumengia</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} dumengias</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} dumengia</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} dumengias</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="sun-short">
+				<relative type="-1">ultima dum.</relative>
+				<relative type="0">questa dum.</relative>
+				<relative type="1">proxima dum.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} dum.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} dum.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} dum.</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} dum.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">ultima du</relative>
+				<relative type="0">questa du</relative>
+				<relative type="1">prox. du</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} du</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} dum.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} du</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} du</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon">
+				<relative type="-1">l’ultim glindesdi</relative>
+				<relative type="0">quest glindesdi</relative>
+				<relative type="1">proxim glindesdi</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} glindesdi</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} glindesdis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} glindesdi</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} glindesdis</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">ultim glind.</relative>
+				<relative type="0">quest glind.</relative>
+				<relative type="1">proxim glind.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} glind.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} glind.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} glind.</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} glind.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">ultim gli</relative>
+				<relative type="0">quest gli</relative>
+				<relative type="1">prox. gli</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} gli</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} gli</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} gli</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} gli</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue">
+				<relative type="-1">l’ultim mardi</relative>
+				<relative type="0">quest mardi</relative>
+				<relative type="1">proxim mardi</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mardi</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} mardis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} mardi</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} mardis</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">ultim mardi</relative>
+				<relative type="0">quest mardi</relative>
+				<relative type="1">proxim mar</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mardi</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} mardis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} mardi</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} mardis</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">ultim ma</relative>
+				<relative type="0">quest ma</relative>
+				<relative type="1">prox. ma</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} ma</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} ma</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} ma</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} ma</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed">
+				<relative type="-1">l’ultima mesemna</relative>
+				<relative type="0">questa mesemna</relative>
+				<relative type="1">proxima mesemna</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mesemna</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} mesemnas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} mesemna</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} mesemnas</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">ultima mesem.</relative>
+				<relative type="0">questa mesem.</relative>
+				<relative type="1">proxima mesem.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} mesem.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} mesem.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} mesem.</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} mesem.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">ultima me</relative>
+				<relative type="0">questa me</relative>
+				<relative type="1">prox. me</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} me</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} me</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} me</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} me</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu">
+				<relative type="-1">l’ultima gievgia</relative>
+				<relative type="0">questa gievgia</relative>
+				<relative type="1">proxima gievgia</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} gievgia</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} gievgias</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} gievgia</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} gievgias</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">ultima giev.</relative>
+				<relative type="0">questa giev.</relative>
+				<relative type="1">proxima giev.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} giev.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} giev.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} giev.</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} giev.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">ultima gie</relative>
+				<relative type="0">questa gie</relative>
+				<relative type="1">prox. gie</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} gie</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} gie</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} gie</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} gie</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri">
+				<relative type="-1">l’ultim venderdi</relative>
+				<relative type="0">quest venderdi</relative>
+				<relative type="1">proxim venderdi</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} venderdi</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} venderdis</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} venderdi</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} venderdis</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">ultim vend.</relative>
+				<relative type="0">quest vend.</relative>
+				<relative type="1">proxim vend.</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} vend.</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} vend.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} vend.</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} vend.</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">ultim ve</relative>
+				<relative type="0">quest ve</relative>
+				<relative type="1">prox. ve</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} ve</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} ve</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} ve</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} ve</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat">
+				<relative type="-1">l’ultima sonda</relative>
+				<relative type="0">questa sonda</relative>
+				<relative type="1">proxima sonda</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} sonda</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} sondas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} sonda</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} sondas</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">ultima sonda</relative>
+				<relative type="0">questa sonda</relative>
+				<relative type="1">proxima sonda</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} sonda</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} sondas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} sonda</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} sondas</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">ultima so</relative>
+				<relative type="0">questa so</relative>
+				<relative type="1">prox. so</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} so</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} so</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} so</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} so</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayperiod-short">
+				<displayName>AM/PM</displayName>
+			</field>
 			<field type="dayperiod">
-				<displayName>mesadad dal di</displayName>
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
 				<displayName>ura</displayName>
+				<relative type="0">quest’ura</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} ura</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} uras</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} ura</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} uras</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>h</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} h</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} h</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} h</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} h</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>h</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0}h</relativeTimePattern>
+					<relativeTimePattern count="other">en {0}h</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0}h</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0}h</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute">
 				<displayName>minuta</displayName>
+				<relative type="0">questa minuta</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} minuta</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} minutas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} minuta</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} minutas</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="minute-short">
 				<displayName>min</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} min</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} min</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} min</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second">
 				<displayName>secunda</displayName>
+				<relative type="0">ussa</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} secunda</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} secundas</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} secunda</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} secundas</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="second-short">
 				<displayName>s</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} s</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} s</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">en {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">en {0} s</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">avant {0} s</relativeTimePattern>
+					<relativeTimePattern count="other">avant {0} s</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="zone">
 				<displayName>zona d’urari</displayName>
 			</field>
+			<field type="zone-narrow">
+				<displayName>zona</displayName>
+			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat>temp: {0}</regionFormat>
-			<regionFormat type="daylight">temp da stad: {0}</regionFormat>
-			<regionFormat type="standard">temp normal: {0}</regionFormat>
+			<regionFormat>{0} (temp local)</regionFormat>
+			<regionFormat type="daylight">{0} (temp da stad)</regionFormat>
+			<regionFormat type="standard">{0} (temp normal)</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
-					<standard>Temp universal coordinà</standard>
+					<standard>temp universal coordinà</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>citad nunenconuschenta</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity draft="contributed">The Valley</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
+				<exemplarCity>lieu nunenconuschent</exemplarCity>
 			</zone>
 			<zone type="Asia/Yerevan">
-				<exemplarCity draft="contributed">Jerevan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity draft="contributed">Showa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity draft="contributed">Mac Murdo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity draft="contributed">San Juan, Argentinia</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity draft="contributed">Ushuaïa</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity draft="contributed">San Salvador de Jujuy</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity draft="contributed">Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity draft="contributed">Córdoba</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity draft="contributed">Oranjestad</exemplarCity>
+				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxelles</exemplarCity>
+				<exemplarCity>Brüssel</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>Son Barthélemy</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity draft="contributed">Bermudas</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity draft="contributed">Bandar Seri Begawan</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity draft="contributed">Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity draft="contributed">Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity draft="contributed">Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity draft="contributed">Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity draft="contributed">São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity draft="contributed">Fernando de Noronha</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity draft="contributed">Belmopan</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity draft="contributed">Saint John’s</exemplarCity>
+				<exemplarCity>Bermudas</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
-				<exemplarCity draft="contributed">West Island</exemplarCity>
+				<exemplarCity>Inslas Cocos</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
 				<exemplarCity>Turitg</exemplarCity>
 			</zone>
 			<zone type="Pacific/Easter">
-				<exemplarCity draft="contributed">Insla da Pasca</exemplarCity>
+				<exemplarCity>Insla da Pasca</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity draft="contributed">Ürümqi</exemplarCity>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>Schanghai</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>Havanna</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity draft="contributed">Cap Verd</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity draft="contributed">Curaçao</exemplarCity>
+				<exemplarCity>Cap Verd</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity draft="contributed">Flying Fish Cove</exemplarCity>
+				<exemplarCity>Insla da Nadal</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>Prag</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="contributed">Dschibuti</exemplarCity>
+				<exemplarCity>Dschibuti</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity draft="contributed">Algier</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity draft="contributed">Galápagos</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
+				<exemplarCity>Algier</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
-				<exemplarCity draft="contributed">Inslas Canarias</exemplarCity>
+				<exemplarCity>Inslas Canarias</exemplarCity>
 			</zone>
 			<zone type="Africa/Addis_Ababa">
-				<exemplarCity draft="contributed">Addis Abeba</exemplarCity>
+				<exemplarCity>Addis Abeba</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity draft="contributed">Fidschi</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity draft="contributed">Port Stanley</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity draft="contributed">Weno</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity draft="contributed">Palikir</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity draft="contributed">Tofol</exemplarCity>
+				<exemplarCity>Fidschi</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Faeroe">
-				<exemplarCity draft="contributed">Inslas Feroe</exemplarCity>
+				<exemplarCity>Inslas Feroe</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>temp da stad britannic</daylight>
+					<daylight>temp da stad da la Gronda Britannia</daylight>
 				</long>
 				<exemplarCity>Londra</exemplarCity>
 			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity draft="contributed">Saint Peter Port</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity draft="contributed">Godthåb</exemplarCity>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>Tiflis</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="contributed">Basse-Terre</exemplarCity>
+				<exemplarCity>Guadalupa</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
 				<exemplarCity>Athen</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity draft="contributed">Georgia dal Sid</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity draft="contributed">Hagåtña</exemplarCity>
+				<exemplarCity>Georgia dal Sid</exemplarCity>
 			</zone>
 			<zone type="Asia/Hong_Kong">
-				<exemplarCity draft="contributed">Hongkong</exemplarCity>
+				<exemplarCity>Hongkong</exemplarCity>
 			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity draft="contributed">Macassar</exemplarCity>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>temp da stad da l’Irlanda</daylight>
+				</long>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="contributed">Douglas</exemplarCity>
+				<exemplarCity>Insla da Man</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Calcutta</exemplarCity>
 			</zone>
 			<zone type="Asia/Baghdad">
-				<exemplarCity draft="contributed">Bagdad</exemplarCity>
+				<exemplarCity>Bagdad</exemplarCity>
 			</zone>
 			<zone type="Asia/Tehran">
-				<exemplarCity draft="contributed">Teheran</exemplarCity>
+				<exemplarCity>Teheran</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>Reykjavík</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
 				<exemplarCity>Roma</exemplarCity>
 			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity draft="contributed">Saint Helier</exemplarCity>
-			</zone>
 			<zone type="America/Jamaica">
-				<exemplarCity draft="contributed">Giamaica</exemplarCity>
+				<exemplarCity>Giamaica</exemplarCity>
 			</zone>
 			<zone type="Asia/Tokyo">
-				<exemplarCity draft="contributed">Tokio</exemplarCity>
+				<exemplarCity>Tokio</exemplarCity>
 			</zone>
 			<zone type="Asia/Bishkek">
-				<exemplarCity draft="contributed">Bischkek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity draft="contributed">South Tarawa</exemplarCity>
+				<exemplarCity>Bischkek</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
-				<exemplarCity draft="contributed">Comoras</exemplarCity>
+				<exemplarCity>Comoras</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
-				<exemplarCity draft="contributed">Saint Kitts</exemplarCity>
+				<exemplarCity>Saint Kitts</exemplarCity>
 			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity draft="contributed">Seul</exemplarCity>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>Pjöngjang</exemplarCity>
 			</zone>
 			<zone type="America/Cayman">
-				<exemplarCity draft="contributed">Inslas Cayman</exemplarCity>
+				<exemplarCity>Inslas Cayman</exemplarCity>
 			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity draft="contributed">Aqtöbe</exemplarCity>
+			<zone type="Asia/Qostanay">
+				<exemplarCity>Qostanai</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>Qysylorda</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity draft="contributed">Santa Lucia</exemplarCity>
+				<exemplarCity>Sontga Lucia</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
-				<exemplarCity draft="contributed">Luxemburg</exemplarCity>
+				<exemplarCity>Luxemburg</exemplarCity>
 			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity draft="contributed">Brades</exemplarCity>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>Tripolis</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>Martinica</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity draft="contributed">Maldivas</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity draft="contributed">Mazatlán</exemplarCity>
+				<exemplarCity>Maledivas</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity draft="contributed">Citad da Mexico</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity draft="contributed">Nouméa</exemplarCity>
+				<exemplarCity>Citad dal Mexico</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity draft="contributed">Kingston</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity draft="contributed">Yaren</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity draft="contributed">Alofi</exemplarCity>
+				<exemplarCity>Insla Norfolk</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity draft="contributed">Mascate</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity draft="contributed">Rikitea</exemplarCity>
+				<exemplarCity>Mascat</exemplarCity>
 			</zone>
 			<zone type="Asia/Karachi">
-				<exemplarCity draft="contributed">Karatschi</exemplarCity>
+				<exemplarCity>Karatschi</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
-				<exemplarCity draft="contributed">Varsovia</exemplarCity>
+				<exemplarCity>Varsovia</exemplarCity>
 			</zone>
 			<zone type="America/Miquelon">
-				<exemplarCity draft="contributed">Saint Pierre</exemplarCity>
+				<exemplarCity>Saint Pierre</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
-				<exemplarCity draft="contributed">Azoras</exemplarCity>
+				<exemplarCity>Azoras</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
-				<exemplarCity draft="contributed">Lissabon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity draft="contributed">Melekok</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity draft="contributed">Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity draft="contributed">Réunion</exemplarCity>
+				<exemplarCity>Lissabon</exemplarCity>
 			</zone>
 			<zone type="Europe/Bucharest">
 				<exemplarCity>Bucarest</exemplarCity>
 			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>Belgrad</exemplarCity>
+			</zone>
 			<zone type="Europe/Moscow">
-				<exemplarCity draft="contributed">Moscau</exemplarCity>
+				<exemplarCity>Moscau</exemplarCity>
+			</zone>
+			<zone type="Europe/Astrakhan">
+				<exemplarCity>Astrachan</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
-				<exemplarCity draft="contributed">Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity draft="contributed">Nowosibirsk</exemplarCity>
+				<exemplarCity>Jekaterinburg</exemplarCity>
 			</zone>
 			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity draft="contributed">Krasnojarsk</exemplarCity>
+				<exemplarCity>Krasnojarsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>Tschita</exemplarCity>
 			</zone>
 			<zone type="Asia/Yakutsk">
-				<exemplarCity draft="contributed">Jakutsk</exemplarCity>
+				<exemplarCity>Jakutsk</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>Chandyga</exemplarCity>
 			</zone>
 			<zone type="Asia/Sakhalin">
-				<exemplarCity draft="contributed">Sachalin</exemplarCity>
+				<exemplarCity>Sachalin</exemplarCity>
 			</zone>
 			<zone type="Asia/Kamchatka">
-				<exemplarCity draft="contributed">Kamtschatka</exemplarCity>
+				<exemplarCity>Kamtschatka</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity draft="contributed">Riyad</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity draft="contributed">Honiara</exemplarCity>
+				<exemplarCity>Riad</exemplarCity>
 			</zone>
 			<zone type="Africa/Khartoum">
-				<exemplarCity draft="contributed">Khartum</exemplarCity>
+				<exemplarCity>Khartum</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity draft="contributed">Singapur</exemplarCity>
+				<exemplarCity>Singapur</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity draft="contributed">Sontg’elena</exemplarCity>
+				<exemplarCity>Sontg’elena</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity draft="contributed">Mogadischu</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity draft="contributed">São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity draft="contributed">Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity draft="contributed">Cockburn Town</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity draft="contributed">Lomé</exemplarCity>
+				<exemplarCity>Mogadischu</exemplarCity>
 			</zone>
 			<zone type="Asia/Dushanbe">
-				<exemplarCity draft="contributed">Duschanbe</exemplarCity>
+				<exemplarCity>Duschanbe</exemplarCity>
 			</zone>
 			<zone type="Asia/Ashgabat">
-				<exemplarCity draft="contributed">Aşgabat</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity draft="contributed">Nukuʻalofa</exemplarCity>
+				<exemplarCity>Aşgabat</exemplarCity>
 			</zone>
 			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity draft="contributed">Daressalam</exemplarCity>
+				<exemplarCity>Daressalam</exemplarCity>
 			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity draft="contributed">Alasca</exemplarCity>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiev</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah, Dakota dal Nord</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="contributed">North Dakota (New Salem)</exemplarCity>
+				<exemplarCity>New Salem, Dakota dal Nord</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity draft="contributed">North Dakota (Central)</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity draft="contributed">Vincennes</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity draft="contributed">Petersburg</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity draft="contributed">Tell City</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity draft="contributed">Knox</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity draft="contributed">Winamac</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity draft="contributed">Marengo</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity draft="contributed">Vevay</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity draft="contributed">Monticello</exemplarCity>
+				<exemplarCity>Center, Dakota dal Nord</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="contributed">Samarcanda</exemplarCity>
+				<exemplarCity>Samarcanda</exemplarCity>
 			</zone>
 			<zone type="Asia/Tashkent">
-				<exemplarCity draft="contributed">Taschkent</exemplarCity>
+				<exemplarCity>Taschkent</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity draft="contributed">Saint Vincent</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity draft="contributed">Road Town</exemplarCity>
+				<exemplarCity>Son Vincenz</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity draft="contributed">Saint Thomas</exemplarCity>
+				<exemplarCity>Saint Thomas</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Citad da Ho Chi Minh</exemplarCity>
 			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity draft="contributed">Matāʻutu</exemplarCity>
-			</zone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>temp da l’Afganistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>temp da l’Africa Centrala</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>temp da l’Africa Orientala</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>temp normal da l’Africa Meridiunala</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<standard>temp da l’Africa Occidentala</standard>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>temp da l’Alasca</generic>
+					<standard>temp normal da l’Alasca</standard>
+					<daylight>temp da stad da l’Alasca</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>temp da l’Amazonas</generic>
+					<standard>temp normal da l’Amazonas</standard>
+					<daylight>temp da stad da l’Amazonas</daylight>
+				</long>
+			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Temp central</generic>
-					<standard>Temp da standard central</standard>
-					<daylight>Temp da stad central</daylight>
+					<generic>temp dal center USA</generic>
+					<standard>temp normal dal center USA</standard>
+					<daylight>temp da stad dal center USA</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Temp oriental</generic>
-					<standard>Temp da standard oriental</standard>
-					<daylight>Temp da stad oriental</daylight>
+					<generic>temp da l’ost USA</generic>
+					<standard>temp normal da l’ost USA</standard>
+					<daylight>temp da stad da l’ost USA</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Temp da muntogna</generic>
-					<standard>Temp da standard da muntogna</standard>
-					<daylight>Temp da stad da muntogna</daylight>
+					<generic>temp dals Rocky Mountains</generic>
+					<standard>temp normal dals Rocky Mountains</standard>
+					<daylight>temp da stad dals Rocky Mountains</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>Temp pacific</generic>
-					<standard>Temp da standard pacific</standard>
-					<daylight>Temp da stad pacific</daylight>
+					<generic>temp dal Pacific USA</generic>
+					<standard>temp normal dal Pacific USA</standard>
+					<daylight>temp da stad dal Pacific USA</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>temp da la Samoa</generic>
+					<standard>temp normal da la Samoa</standard>
+					<daylight>temp da stad da la Samoa</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>temp arab</generic>
+					<standard>temp normal arab</standard>
+					<daylight>temp da stad arab</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>temp da l’Argentina</generic>
+					<standard>temp normal da l’Argentina</standard>
+					<daylight>temp da stad da l’Argentina</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>temp da l’Argentina occidentala</generic>
+					<standard>temp normal da l’Argentina occidentala</standard>
+					<daylight>temp da stad da l’Argentina occidentala</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>temp da l’Armenia</generic>
+					<standard>temp normal da l’Armenia</standard>
+					<daylight>temp da stad da l’Armenia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>Temp atlantic</generic>
-					<standard>Temp da standard atlantic</standard>
-					<daylight>Temp da stad atlantic</daylight>
+					<generic>temp da l’Atlantic USA</generic>
+					<standard>temp normal da l’Atlantic USA</standard>
+					<daylight>temp da stad da l’Atlantic USA</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>temp dal center da l’Australia</generic>
+					<standard>temp normal dal center da l’Australia</standard>
+					<daylight>temp da stad dal center da l’Australia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>temp dal center-vest da l’Australia</generic>
+					<standard>temp normal dal center-vest da l’Australia</standard>
+					<daylight>temp da stad dal center-vest da l’Australia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>temp da l’ost da l’Australia</generic>
+					<standard>temp normal da l’ost da l’Australia</standard>
+					<daylight>temp da stad da l’ost da l’Australia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>temp dal vest da l’Australia</generic>
+					<standard>temp normal dal vest da l’Australia</standard>
+					<daylight>temp da stad dal vest da l’Australia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>temp da l’Aserbaidschan</generic>
+					<standard>temp normal da l’Aserbaidschan</standard>
+					<daylight>temp da stad da l’Aserbaidschan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>temp da las Azoras</generic>
+					<standard>temp normal da las Azoras</standard>
+					<daylight>temp da stad da las Azoras</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>temp dal Bangladesch</generic>
+					<standard>temp normal dal Bangladesch</standard>
+					<daylight>temp da stad dal Bangladesch</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>temp dal Butan</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>temp da la Bolivia</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>temp da la Brasilia</generic>
+					<standard>temp normal da la Brasilia</standard>
+					<daylight>temp da stad da la Brasilia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>temp dal Brunei</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>temp dal Cap Verd</generic>
+					<standard>temp normal dal Cap Verd</standard>
+					<daylight>temp da stad dal Cap Verd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>temp dals Chamorro</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>temp da las Inslas Chatham</generic>
+					<standard>temp normal da las Inslas Chatham</standard>
+					<daylight>temp da stad da las Inslas Chatham</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>temp dal Chile</generic>
+					<standard>temp normal dal Chile</standard>
+					<daylight>temp da stad dal Chile</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>temp da la China</generic>
+					<standard>temp normal da la China</standard>
+					<daylight>temp da stad da la China</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>temp da l’Insla da Nadal</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>temp da las Inslas Cocos</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>temp da la Columbia</generic>
+					<standard>temp normal da la Columbia</standard>
+					<daylight>temp da stad da la Columbia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>temp da las Inslas Cook</generic>
+					<standard>temp normal da las Inslas Cook</standard>
+					<daylight>temp da stad da las Inslas Cook</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>temp da la Cuba</generic>
+					<standard>temp normal da la Cuba</standard>
+					<daylight>temp da stad da la Cuba</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>temp da Davis</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>temp da Dumont d’Urville</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>temp dal Timor da l’Ost</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>temp da l’Insla da Pasca</generic>
+					<standard>temp normal da l’Insla da Pasca</standard>
+					<daylight>temp da stad da l’Insla da Pasca</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>temp da l’Ecuador</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic>Temp da l’Europa Centrala</generic>
-					<standard>Temp da standard da l’Europa Centrala</standard>
-					<daylight>Temp da stad da l’Europa Centrala</daylight>
+					<generic>temp da l’Europa Centrala</generic>
+					<standard>temp normal da l’Europa Centrala</standard>
+					<daylight>temp da stad da l’Europa Centrala</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic>Temp da l’Europa Orientala</generic>
-					<standard>Temp da standard da l’Europa Orientala</standard>
-					<daylight>Temp da stad da l’Europa Orientala</daylight>
+					<generic>temp da l’Europa Orientala</generic>
+					<standard>temp normal da l’Europa Orientala</standard>
+					<daylight>temp da stad da l’Europa Orientala</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>temp da l’extrem orient da l’Europa</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic>Temp da l’Europa dal Vest</generic>
-					<standard>Temp da standard da l’Europa dal Vest</standard>
-					<daylight>Temp da stad da l’Europa dal Vest</daylight>
+					<generic>temp da l’Europa dal Vest</generic>
+					<standard>temp normal da l’Europa dal Vest</standard>
+					<daylight>temp da stad da l’Europa dal Vest</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>temp da las Inslas Falkland</generic>
+					<standard>temp normal da las Inslas Falkland</standard>
+					<daylight>temp da stad da las Inslas Falkland</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>temp dal Fidschi</generic>
+					<standard>temp normal dal Fidschi</standard>
+					<daylight>temp da stad dal Fidschi</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>temp da la Guyana Franzosa</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>temp dals Territoris Franzos Meridiunals ed Antarctics</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>temp da las Inslas Galápagos</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>temp da las Inslas Gambier</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>temp da la Georgia</generic>
+					<standard>temp normal da la Georgia</standard>
+					<daylight>temp da stad da la Georgia</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>temp da las Inslas Gilbert</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Temp Greenwich</standard>
+					<standard>temp dal meridian da Greenwich</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>temp da la Grönlanda orientala</generic>
+					<standard>temp normal da la Grönlanda orientala</standard>
+					<daylight>temp da stad da la Grönlanda orientala</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>temp da la Grönlanda occidentala</generic>
+					<standard>temp normal da la Grönlanda occidentala</standard>
+					<daylight>temp da stad da la Grönlanda occidentala</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>temp normal dal Golf</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>temp da la Guyana</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>temp normal dal Hawai e las Aleutinas</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>temp dal Hawai e las Aleutinas</generic>
+					<standard>temp normal dal Hawai e las Aleutinas</standard>
+					<daylight>temp da stad dal Hawai e da las Aleutinas</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>temp dal Hongkong</generic>
+					<standard>temp normal dal Hongkong</standard>
+					<daylight>temp da stad dal Hongkong</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>temp da Hovd</generic>
+					<standard>temp normal da Hovd</standard>
+					<daylight>temp da stad da Hovd</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>temp normal da l’India</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>temp da l’Ocean Indic</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>temp da l’Indochina</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>temp dal center da l’Indonesia</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>temp da l’ost da l’Indonesia</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>temp dal vest da l’Indonesia</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>temp da l’Iran</generic>
+					<standard>temp normal da l’Iran</standard>
+					<daylight>temp da stad da l’Iran</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>temp dad Irkutsk</generic>
+					<standard>temp normal dad Irkutsk</standard>
+					<daylight>temp da stad dad Irkutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>temp da l’Israel</generic>
+					<standard>temp normal da l’Israel</standard>
+					<daylight>temp da stad da l’Israel</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>temp dal Giapun</generic>
+					<standard>temp normal dal Giapun</standard>
+					<daylight>temp da stad dal Giapun</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard>temp dal Kasachstan</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>temp dal Kasachstan oriental</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>temp dal Kasachstan occidental</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>temp da la Corea</generic>
+					<standard>temp normal da la Corea</standard>
+					<daylight>temp da stad da la Corea</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>temp da Kosrae</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>temp da Krasnojarsk</generic>
+					<standard>temp normal da Krasnojarsk</standard>
+					<daylight>temp da stad da Krasnojarsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>temp dal Kirghistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>temp da las Inslas da la Lingia</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>temp da Lord Howe</generic>
+					<standard>temp normal da Lord Howe</standard>
+					<daylight>temp da stad da Lord Howe</daylight>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>temp da Magadan</generic>
+					<standard>temp normal da Magadan</standard>
+					<daylight>temp da stad da Magadan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>temp da la Malaisia</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>temp da las Maledivas</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>temp da las Inslas Marquesas</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>temp da las Inslas da Marshall</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>temp dal Mauritius</generic>
+					<standard>temp normal dal Mauritius</standard>
+					<daylight>temp da stad dal Mauritius</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>temp da Mawson</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>temp mexican dal Pacific</generic>
+					<standard>temp normal mexican dal Pacific</standard>
+					<daylight>temp da stad mexican dal Pacific</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>temp dad Ulaanbaatar</generic>
+					<standard>temp normal dad Ulaanbaatar</standard>
+					<daylight>temp da stad dad Ulaanbaatar</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>temp da Moscau</generic>
+					<standard>temp normal da Moscau</standard>
+					<daylight>temp da stad da Moscau</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>temp dal Myanmar</standard>
+				</long>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>temp da Nauru</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>temp dal Nepal</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>temp da la Nova Caledonia</generic>
+					<standard>temp normal da la Nova Caledonia</standard>
+					<daylight>temp da stad da la Nova Caledonia</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>temp da la Nova Zelanda</generic>
+					<standard>temp normal da la Nova Zelanda</standard>
+					<daylight>temp da stad da la Nova Zelanda</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>temp da la Terranova</generic>
+					<standard>temp normal da la Terranova</standard>
+					<daylight>temp da stad da la Terranova</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>temp da Niue</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<generic>temp da l’Insla Norfolk</generic>
+					<standard>temp normal da l’Insla Norfolk</standard>
+					<daylight>temp da stad da l’Insla Norfolk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>temp da Fernando de Noronha</generic>
+					<standard>temp normal da Fernando de Noronha</standard>
+					<daylight>temp da stad da Fernando de Noronha</daylight>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>temp da Novosibirsk</generic>
+					<standard>temp normal da Novosibirsk</standard>
+					<daylight>temp da stad da Novosibirsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>temp dad Omsk</generic>
+					<standard>temp normal dad Omsk</standard>
+					<daylight>temp da stad dad Omsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>temp dal Pakistan</generic>
+					<standard>temp normal dal Pakistan</standard>
+					<daylight>temp da stad dal Pakistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>temp da Palau</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>temp da la Papua Nova Guinea</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>temp dal Paraguai</generic>
+					<standard>temp normal dal Paraguai</standard>
+					<daylight>temp da stad dal Paraguai</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>temp dal Peru</generic>
+					<standard>temp normal dal Peru</standard>
+					<daylight>temp da stad dal Peru</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>temp da las Filippinas</generic>
+					<standard>temp normal da las Filippinas</standard>
+					<daylight>temp da stad da las Filippinas</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>temp da las Inslas Fenix</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>temp da Saint Pierre e Miquelon</generic>
+					<standard>temp normal da Saint Pierre e Miquelon</standard>
+					<daylight>temp da stad da Saint Pierre e Miquelon</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>temp da las Inslas Pitcairn</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>temp da Pohnpei</standard>
+				</long>
+			</metazone>
+			<metazone type="Pyongyang">
+				<long>
+					<standard>temp da la Corea dal Nord</standard>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>temp da la Réunion</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>temp da Rothera</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>temp da Sachalin</generic>
+					<standard>temp normal da Sachalin</standard>
+					<daylight>temp da stad da Sachalin</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>temp da la Samoa Americana</generic>
+					<standard>temp normal da la Samoa Americana</standard>
+					<daylight>temp da stad da la Samoa Americana</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>temp da las Seychellas</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>temp normal dal Singapur</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>temp da las Inslas da Salomon</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>temp da la Georgia dal Sid</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>temp dal Surinam</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>temp da Shōwa</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>temp da Tahiti</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>temp dal Taiwan</generic>
+					<standard>temp normal dal Taiwan</standard>
+					<daylight>temp da stad dal Taiwan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>temp dal Tadschikistan</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>temp da Tokelau</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>temp da Tonga</generic>
+					<standard>temp normal da Tonga</standard>
+					<daylight>temp da stad da Tonga</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>temp da Chuuk</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>temp dal Turkmenistan</generic>
+					<standard>temp normal dal Turkmenistan</standard>
+					<daylight>temp da stad dal Turkmenistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>temp da las Inslas da Tuvalu</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>temp da l’Uruguai</generic>
+					<standard>temp normal da l’Uruguai</standard>
+					<daylight>temp da stad da l’Uruguai</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>temp da l’Usbekistan</generic>
+					<standard>temp normal da l’Usbekistan</standard>
+					<daylight>temp da stad da l’Usbekistan</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>temp dal Vanuatu</generic>
+					<standard>temp normal dal Vanuatu</standard>
+					<daylight>temp da stad dal Vanuatu</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>temp da la Venezuela</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>temp da Vladivostok</generic>
+					<standard>temp normal da Vladivostok</standard>
+					<daylight>temp da stad da Vladivostok</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>temp da Volgograd</generic>
+					<standard>temp normal da Volgograd</standard>
+					<daylight>temp da stad da Volgograd</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>temp da Vostok</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>temp da l’Insla Wake</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>temp da Wallis e Futuna</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>temp da Jakutsk</generic>
+					<standard>temp normal da Jakutsk</standard>
+					<daylight>temp da stad da Jakutsk</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>temp da Jekaterinburg</generic>
+					<standard>temp normal da Jekaterinburg</standard>
+					<daylight>temp da stad da Jekaterinburg</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yukon">
+				<long>
+					<standard>temp dal Yukon</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<group>’</group>
-			<minusSign>−</minusSign>
+			<decimal>,</decimal>
+			<group> </group>
 			<approximatelySign>≈</approximatelySign>
+			<superscriptingExponent>·</superscriptingExponent>
 		</symbols>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="one">0</pattern>
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="one">0</pattern>
+					<pattern type="10000" count="other">0</pattern>
+					<pattern type="100000" count="one">0</pattern>
+					<pattern type="100000" count="other">0</pattern>
+					<pattern type="1000000" count="one">0 milliun</pattern>
+					<pattern type="1000000" count="other">0 milliuns</pattern>
+					<pattern type="10000000" count="one">00 milliuns</pattern>
+					<pattern type="10000000" count="other">00 milliuns</pattern>
+					<pattern type="100000000" count="one">000 milliuns</pattern>
+					<pattern type="100000000" count="other">000 milliuns</pattern>
+					<pattern type="1000000000" count="one">0 milliarda</pattern>
+					<pattern type="1000000000" count="other">0 milliardas</pattern>
+					<pattern type="10000000000" count="one">00 milliardas</pattern>
+					<pattern type="10000000000" count="other">00 milliardas</pattern>
+					<pattern type="100000000000" count="one">000 milliardas</pattern>
+					<pattern type="100000000000" count="other">000 milliardas</pattern>
+					<pattern type="1000000000000" count="one">0 billiun</pattern>
+					<pattern type="1000000000000" count="other">0 billiuns</pattern>
+					<pattern type="10000000000000" count="one">00 billiuns</pattern>
+					<pattern type="10000000000000" count="other">00 billiuns</pattern>
+					<pattern type="100000000000000" count="one">000 billiuns</pattern>
+					<pattern type="100000000000000" count="other">000 billiuns</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="one">0</pattern>
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="one">0</pattern>
+					<pattern type="10000" count="other">0</pattern>
+					<pattern type="100000" count="one">0</pattern>
+					<pattern type="100000" count="other">0</pattern>
+					<pattern type="1000000" count="one">0 miu'.'</pattern>
+					<pattern type="1000000" count="other">0 miu'.'</pattern>
+					<pattern type="10000000" count="one">00 miu'.'</pattern>
+					<pattern type="10000000" count="other">00 miu'.'</pattern>
+					<pattern type="100000000" count="one">000 miu'.'</pattern>
+					<pattern type="100000000" count="other">000 miu'.'</pattern>
+					<pattern type="1000000000" count="one">0 mia'.'</pattern>
+					<pattern type="1000000000" count="other">0 mia'.'</pattern>
+					<pattern type="10000000000" count="one">00 mia'.'</pattern>
+					<pattern type="10000000000" count="other">00 mia'.'</pattern>
+					<pattern type="100000000000" count="one">000 mia'.'</pattern>
+					<pattern type="100000000000" count="other">000 mia'.'</pattern>
+					<pattern type="1000000000000" count="one">0 biu'.'</pattern>
+					<pattern type="1000000000000" count="other">0 biu'.'</pattern>
+					<pattern type="10000000000000" count="one">00 biu'.'</pattern>
+					<pattern type="10000000000000" count="other">00 biu'.'</pattern>
+					<pattern type="100000000000000" count="one">000T biu'.'</pattern>
+					<pattern type="100000000000000" count="other">000 biu'.'</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>#,##0.00 ¤</pattern>
+					<pattern>¤#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one" draft="provisional">0K ¤</pattern>
-					<pattern type="1000" count="other" draft="provisional">0K ¤</pattern>
-					<pattern type="10000" count="one" draft="provisional">00K ¤</pattern>
-					<pattern type="10000" count="other" draft="provisional">00K ¤</pattern>
-					<pattern type="100000" count="one" draft="provisional">000K ¤</pattern>
-					<pattern type="100000" count="other" draft="provisional">000K ¤</pattern>
-					<pattern type="1000000" count="one" draft="provisional">0M ¤</pattern>
-					<pattern type="1000000" count="other" draft="provisional">0M ¤</pattern>
-					<pattern type="10000000" count="one" draft="provisional">00M ¤</pattern>
-					<pattern type="10000000" count="other" draft="provisional">00M ¤</pattern>
-					<pattern type="100000000" count="one" draft="provisional">000M ¤</pattern>
-					<pattern type="100000000" count="other" draft="provisional">000M ¤</pattern>
-					<pattern type="1000000000" count="one" draft="provisional">0G ¤</pattern>
-					<pattern type="1000000000" count="other" draft="provisional">0G ¤</pattern>
-					<pattern type="10000000000" count="one" draft="provisional">00G ¤</pattern>
-					<pattern type="10000000000" count="other" draft="provisional">00G ¤</pattern>
-					<pattern type="100000000000" count="one" draft="provisional">000G ¤</pattern>
-					<pattern type="100000000000" count="other" draft="provisional">000G ¤</pattern>
-					<pattern type="1000000000000" count="one" draft="provisional">0T ¤</pattern>
-					<pattern type="1000000000000" count="other" draft="provisional">0T ¤</pattern>
-					<pattern type="10000000000000" count="one" draft="provisional">00T ¤</pattern>
-					<pattern type="10000000000000" count="other" draft="provisional">00T ¤</pattern>
-					<pattern type="100000000000000" count="one" draft="provisional">000T ¤</pattern>
-					<pattern type="100000000000000" count="other" draft="provisional">000T ¤</pattern>
+					<pattern type="1000" count="one">0</pattern>
+					<pattern type="1000" count="other">0</pattern>
+					<pattern type="10000" count="one">0</pattern>
+					<pattern type="10000" count="other">0</pattern>
+					<pattern type="100000" count="one">0</pattern>
+					<pattern type="100000" count="other">0</pattern>
+					<pattern type="1000000" count="one">¤0 miu'.'</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0 miu'.'</pattern>
+					<pattern type="1000000" count="other">¤0 miu'.'</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0 miu'.'</pattern>
+					<pattern type="10000000" count="one">¤00 miu'.'</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00 miu'.'</pattern>
+					<pattern type="10000000" count="other">¤00 miu'.'</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00 miu'.'</pattern>
+					<pattern type="100000000" count="one">¤000 miu'.'</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000 miu'.'</pattern>
+					<pattern type="100000000" count="other">¤000 miu'.'</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000 miu'.'</pattern>
+					<pattern type="1000000000" count="one">¤0 mia'.'</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0 mia'.'</pattern>
+					<pattern type="1000000000" count="other">¤0 mia'.'</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 mia'.'</pattern>
+					<pattern type="10000000000" count="one">¤00 mia'.'</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 mia'.'</pattern>
+					<pattern type="10000000000" count="other">¤00 mia'.'</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 mia'.'</pattern>
+					<pattern type="100000000000" count="one">¤000 mia'.'</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000 mia'.'</pattern>
+					<pattern type="100000000000" count="other">¤000 mia'.'</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 mia'.'</pattern>
+					<pattern type="1000000000000" count="one">¤0 biu'.'</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0 biu'.'</pattern>
+					<pattern type="1000000000000" count="other">¤0 biu'.'</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 biu'.'</pattern>
+					<pattern type="10000000000000" count="one">¤00 biu'.'</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00 biu'.'</pattern>
+					<pattern type="10000000000000" count="other">¤00 biu'.'</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 biu'.'</pattern>
+					<pattern type="100000000000000" count="one">¤000T biu'.'</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T biu'.'</pattern>
+					<pattern type="100000000000000" count="other">¤000 biu'.'</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 biu'.'</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="ADP">
@@ -2198,9 +3740,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">leks albanais</displayName>
 			</currency>
 			<currency type="AMD">
-				<displayName>dram armen</displayName>
-				<displayName count="one">dram armen</displayName>
-				<displayName count="other">drams armens</displayName>
+				<displayName>dram da l’Armenia</displayName>
+				<displayName count="one">dram da l’Armenia</displayName>
+				<displayName count="other">drams da l’Armenia</displayName>
 			</currency>
 			<currency type="ANG">
 				<displayName>flurin da las Antillas Ollandaisas</displayName>
@@ -2241,7 +3783,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="ARS">
 				<displayName>peso argentin</displayName>
-				<displayName count="one">pesos argentins</displayName>
+				<displayName count="one">peso argentin</displayName>
 				<displayName count="other">pesos argentins</displayName>
 			</currency>
 			<currency type="ATS">
@@ -2256,7 +3798,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="AWG">
 				<displayName>flurin da l’Aruba</displayName>
-				<displayName count="one">flurins da l’Aruba</displayName>
+				<displayName count="one">flurin da l’Aruba</displayName>
 				<displayName count="other">flurins da l’Aruba</displayName>
 			</currency>
 			<currency type="AZM">
@@ -2277,7 +3819,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="BAM">
 				<displayName>marc convertibel da la Bosnia-Erzegovina</displayName>
 				<displayName count="one">marc convertibel da la Bosnia-Erzegovina</displayName>
-				<displayName count="other">marcs convertibel da la Bosnia-Erzegovina</displayName>
+				<displayName count="other">marcs convertibels da la Bosnia-Erzegovina</displayName>
 			</currency>
 			<currency type="BAN">
 				<displayName>nov dinar da la Bosnia-Erzegovina (1994–1997)</displayName>
@@ -2286,13 +3828,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BBD">
 				<displayName>dollar da Barbados</displayName>
-				<displayName count="one">dollars da Barbados</displayName>
+				<displayName count="one">dollar da Barbados</displayName>
 				<displayName count="other">dollars da Barbados</displayName>
 			</currency>
 			<currency type="BDT">
-				<displayName>taka bangladais</displayName>
-				<displayName count="one">taka bangladais</displayName>
-				<displayName count="other">takas bangladais</displayName>
+				<displayName>taka dal Bangladesch</displayName>
+				<displayName count="one">taka dal Bangladesch</displayName>
+				<displayName count="other">takas dal Bangladesch</displayName>
 			</currency>
 			<currency type="BEC">
 				<displayName>franc beltg (convertibel)</displayName>
@@ -2341,7 +3883,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BMD">
 				<displayName>dollar da las Bermudas</displayName>
-				<displayName count="one">dollars da las Bermudas</displayName>
+				<displayName count="one">dollar da las Bermudas</displayName>
 				<displayName count="other">dollars da las Bermudas</displayName>
 			</currency>
 			<currency type="BND">
@@ -2388,13 +3930,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BSD">
 				<displayName>dollar da las Bahamas</displayName>
-				<displayName count="one">dollars da las Bahamas</displayName>
+				<displayName count="one">dollar da las Bahamas</displayName>
 				<displayName count="other">dollars da las Bahamas</displayName>
 			</currency>
 			<currency type="BTN">
-				<displayName>ngultrum butanais</displayName>
-				<displayName count="one">ngultrum butanais</displayName>
-				<displayName count="other">ngultrums butanais</displayName>
+				<displayName>ngultrum dal Butan</displayName>
+				<displayName count="one">ngultrum dal Butan</displayName>
+				<displayName count="other">ngultrums dal Butan</displayName>
 			</currency>
 			<currency type="BUK">
 				<displayName>kyat burmais</displayName>
@@ -2402,9 +3944,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">kyats burmais</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName>pula da la Botswana</displayName>
-				<displayName count="one">pula da la Botswana</displayName>
-				<displayName count="other">pulas da la Botswana</displayName>
+				<displayName>pula da la Botsuana</displayName>
+				<displayName count="one">pula da la Botsuana</displayName>
+				<displayName count="other">pulas da la Botsuana</displayName>
 			</currency>
 			<currency type="BYB">
 				<displayName>rubel bieloruss (1994–1999)</displayName>
@@ -2423,7 +3965,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BZD">
 				<displayName>dollar dal Belize</displayName>
-				<displayName count="one">dollars dal Belize</displayName>
+				<displayName count="one">dollar dal Belize</displayName>
 				<displayName count="other">dollars dal Belize</displayName>
 			</currency>
 			<currency type="CAD">
@@ -2459,7 +4001,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="CLP">
 				<displayName>peso chilen</displayName>
-				<displayName count="one">pesos chilens</displayName>
+				<displayName count="one">peso chilen</displayName>
 				<displayName count="other">pesos chilens</displayName>
 			</currency>
 			<currency type="CNH">
@@ -2479,16 +4021,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="COP">
 				<displayName>peso columbian</displayName>
-				<displayName count="one">pesos columbians</displayName>
+				<displayName count="one">peso columbian</displayName>
 				<displayName count="other">pesos columbians</displayName>
 			</currency>
 			<currency type="COU">
 				<displayName draft="contributed">unidad de valor real</displayName>
 			</currency>
 			<currency type="CRC">
-				<displayName>colon da la Costa Rica</displayName>
-				<displayName count="one">colons da la Costa Rica</displayName>
-				<displayName count="other">colons da la Costa Rica</displayName>
+				<displayName>colón da la Costa Rica</displayName>
+				<displayName count="one">colón da la Costa Rica</displayName>
+				<displayName count="other">colóns da la Costa Rica</displayName>
 			</currency>
 			<currency type="CSD">
 				<displayName>dinar serb (2002–2006)</displayName>
@@ -2507,7 +4049,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="CUP">
 				<displayName>peso cuban</displayName>
-				<displayName count="one">pesos cubans</displayName>
+				<displayName count="one">peso cuban</displayName>
 				<displayName count="other">pesos cubans</displayName>
 			</currency>
 			<currency type="CVE">
@@ -2521,9 +4063,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">glivras cipriotas</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName>cruna tscheca</displayName>
-				<displayName count="one">cruna tcheca</displayName>
-				<displayName count="other">crunas tschecas</displayName>
+				<displayName>curuna tscheca</displayName>
+				<displayName count="one">curuna tscheca</displayName>
+				<displayName count="other">curunas tschecas</displayName>
 			</currency>
 			<currency type="DDM">
 				<displayName>marc da la Germania da l’Ost</displayName>
@@ -2541,13 +4083,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">francs dal Dschibuti</displayName>
 			</currency>
 			<currency type="DKK">
-				<displayName>cruna danaisa</displayName>
-				<displayName count="one">cruna danaisa</displayName>
-				<displayName count="other">crunas danaisas</displayName>
+				<displayName>curuna danaisa</displayName>
+				<displayName count="one">curuna danaisa</displayName>
+				<displayName count="other">curunas danaisas</displayName>
 			</currency>
 			<currency type="DOP">
 				<displayName>peso dominican</displayName>
-				<displayName count="one">pesos dominicans</displayName>
+				<displayName count="one">peso dominican</displayName>
 				<displayName count="other">pesos dominicans</displayName>
 			</currency>
 			<currency type="DZD">
@@ -2570,9 +4112,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">glivras egipzianas</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName>nakfa eritreic</displayName>
-				<displayName count="one">nakfa eritreic</displayName>
-				<displayName count="other">nakfas eritreics</displayName>
+				<displayName>nakfa da l’Eritrea</displayName>
+				<displayName count="one">nakfa da l’Eritrea</displayName>
+				<displayName count="other">nakfas da l’Eritrea</displayName>
 			</currency>
 			<currency type="ESA">
 				<displayName>peseta spagnola (conto A)</displayName>
@@ -2609,7 +4151,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="FKP">
 				<displayName>glivra dal Falkland</displayName>
-				<displayName count="one">glivras dal Falkland</displayName>
+				<displayName count="one">glivra dal Falkland</displayName>
 				<displayName count="other">glivras dal Falkland</displayName>
 			</currency>
 			<currency type="FRF">
@@ -2618,9 +4160,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">francs franzos</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName>glivra britannica</displayName>
-				<displayName count="one">glivra britannica</displayName>
-				<displayName count="other">glivras britannicas</displayName>
+				<displayName>glivra sterlina</displayName>
+				<displayName count="one">glivra sterlina</displayName>
+				<displayName count="other">glivras sterlinas</displayName>
 			</currency>
 			<currency type="GEK">
 				<displayName>kupon larit georgian</displayName>
@@ -2648,9 +4190,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">glivras da Gibraltar</displayName>
 			</currency>
 			<currency type="GMD">
-				<displayName>dalasi gambic</displayName>
-				<displayName count="one">dalasi gambic</displayName>
-				<displayName count="other">dalasis gambics</displayName>
+				<displayName>dalasi da la Gambia</displayName>
+				<displayName count="one">dalasi da la Gambia</displayName>
+				<displayName count="other">dalasis da la Gambia</displayName>
 			</currency>
 			<currency type="GNF">
 				<displayName>franc da la Guinea</displayName>
@@ -2674,7 +4216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="GTQ">
 				<displayName>quetzal da la Guatemala</displayName>
-				<displayName count="one">quetzals da la Guatemala</displayName>
+				<displayName count="one">quetzal da la Guatemala</displayName>
 				<displayName count="other">quetzals da la Guatemala</displayName>
 			</currency>
 			<currency type="GWE">
@@ -2689,7 +4231,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="GYD">
 				<displayName>dollar da la Guyana</displayName>
-				<displayName count="one">dollars da la Guyana</displayName>
+				<displayName count="one">dollar da la Guyana</displayName>
 				<displayName count="other">dollars da la Guyana</displayName>
 			</currency>
 			<currency type="HKD">
@@ -2698,9 +4240,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">dollars da Hongkong</displayName>
 			</currency>
 			<currency type="HNL">
-				<displayName>lempira hondurian</displayName>
-				<displayName count="one">lempira hondurian</displayName>
-				<displayName count="other">lempiras hondurians</displayName>
+				<displayName>lempira honduriana</displayName>
+				<displayName count="one">lempira honduriana</displayName>
+				<displayName count="other">lempiras hondurianas</displayName>
 			</currency>
 			<currency type="HRD">
 				<displayName>dinar croat</displayName>
@@ -2714,7 +4256,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="HTG">
 				<displayName>gourde haitian</displayName>
-				<displayName count="one">gourdes haitians</displayName>
+				<displayName count="one">gourde haitian</displayName>
 				<displayName count="other">gourdes haitians</displayName>
 			</currency>
 			<currency type="HUF">
@@ -2723,7 +4265,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">forints ungarais</displayName>
 			</currency>
 			<currency type="IDR">
-				<displayName draft="contributed">rupia indonaisa</displayName>
+				<displayName>rupia indonaisa</displayName>
 				<displayName count="one">rupia indonaisa</displayName>
 				<displayName count="other">rupias indonaisas</displayName>
 			</currency>
@@ -2741,9 +4283,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">schekels israelians (1980–1985)</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName>nov schekel israelian</displayName>
-				<displayName count="one">nov schekel israelian</displayName>
-				<displayName count="other">novs schekels israelians</displayName>
+				<displayName>nov shekel israelian</displayName>
+				<displayName count="one">nov shekel israelian</displayName>
+				<displayName count="other">novs shekels israelians</displayName>
 			</currency>
 			<currency type="INR">
 				<displayName>rupia indica</displayName>
@@ -2764,9 +4306,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="contributed">veglia cruna islandaisa</displayName>
 			</currency>
 			<currency type="ISK">
-				<displayName>cruna islandaisa</displayName>
-				<displayName count="one">cruna islandaisa</displayName>
-				<displayName count="other">crunas islandaisas</displayName>
+				<displayName>curuna islandaisa</displayName>
+				<displayName count="one">curuna islandaisa</displayName>
+				<displayName count="other">curunas islandaisas</displayName>
 			</currency>
 			<currency type="ITL">
 				<displayName>lira taliana</displayName>
@@ -2794,9 +4336,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">schillings kenians</displayName>
 			</currency>
 			<currency type="KGS">
-				<displayName>som kirgis</displayName>
-				<displayName count="one">som kirgis</displayName>
-				<displayName count="other">soms kirgis</displayName>
+				<displayName>som kirghis</displayName>
+				<displayName count="one">som kirghis</displayName>
+				<displayName count="other">soms kirghis</displayName>
 			</currency>
 			<currency type="KHR">
 				<displayName>riel cambodschan</displayName>
@@ -2804,9 +4346,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">riels cambodschans</displayName>
 			</currency>
 			<currency type="KMF">
-				<displayName>franc comorian</displayName>
-				<displayName count="one">franc comorian</displayName>
-				<displayName count="other">francs comorians</displayName>
+				<displayName>franc da las Comoras</displayName>
+				<displayName count="one">franc da las Comoras</displayName>
+				<displayName count="other">francs da las Comoras</displayName>
 			</currency>
 			<currency type="KPW">
 				<displayName>won da la Corea dal Nord</displayName>
@@ -2969,9 +4511,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">tugriks mongolics</displayName>
 			</currency>
 			<currency type="MOP">
-				<displayName>pataca dal Macao</displayName>
-				<displayName count="one">pataca dal Macao</displayName>
-				<displayName count="other">patacas dal Macao</displayName>
+				<displayName>pataca da Macao</displayName>
+				<displayName count="one">pataca da Macao</displayName>
+				<displayName count="other">patacas da Macao</displayName>
 			</currency>
 			<currency type="MRO">
 				<displayName>ouguiya da la Mauretania (1973–2017)</displayName>
@@ -3045,9 +4587,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">meticals dal Mosambic</displayName>
 			</currency>
 			<currency type="NAD">
-				<displayName>dollar namibian</displayName>
-				<displayName count="one">dollar namibian</displayName>
-				<displayName count="other">dollars namibians</displayName>
+				<displayName>dollar da la Namibia</displayName>
+				<displayName count="one">dollar da la Namibia</displayName>
+				<displayName count="other">dollars da la Namibia</displayName>
 			</currency>
 			<currency type="NGN">
 				<displayName>naira nigeriana</displayName>
@@ -3068,9 +4610,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">flurins ollandais</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName>cruna norvegiaisa</displayName>
-				<displayName count="one">cruna norvegiaisa</displayName>
-				<displayName count="other">crunas norvegiaisas</displayName>
+				<displayName>curuna norvegiaisa</displayName>
+				<displayName count="one">curuna norvegiaisa</displayName>
+				<displayName count="other">curunas norvegiaisas</displayName>
 			</currency>
 			<currency type="NPR">
 				<displayName>rupia nepalaisa</displayName>
@@ -3089,7 +4631,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="PAB">
 				<displayName>balboa dal Panama</displayName>
-				<displayName count="one">balboas dal Panama</displayName>
+				<displayName count="one">balboa dal Panama</displayName>
 				<displayName count="other">balboas dal Panama</displayName>
 			</currency>
 			<currency type="PEI">
@@ -3097,7 +4639,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="PEN">
 				<displayName>sol peruan</displayName>
-				<displayName count="one">soles peruans</displayName>
+				<displayName count="one">sol peruan</displayName>
 				<displayName count="other">soles peruans</displayName>
 			</currency>
 			<currency type="PES">
@@ -3119,9 +4661,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">rupias pakistanas</displayName>
 			</currency>
 			<currency type="PLN">
-				<displayName>zloty polac</displayName>
-				<displayName count="one">zloty polac</displayName>
-				<displayName count="other">zlotys polacs</displayName>
+				<displayName>zloti polac</displayName>
+				<displayName count="one">zloti polac</displayName>
+				<displayName count="other">zlotis polacs</displayName>
 			</currency>
 			<currency type="PLZ">
 				<displayName draft="contributed">zloty polac (1950–1995)</displayName>
@@ -3133,13 +4675,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="PYG">
 				<displayName>guarani paraguaian</displayName>
-				<displayName count="one">guaranis paraguaians</displayName>
+				<displayName count="one">guarani paraguaian</displayName>
 				<displayName count="other">guaranis paraguaians</displayName>
 			</currency>
 			<currency type="QAR">
-				<displayName>rial da Katar</displayName>
-				<displayName count="one">rial da Katar</displayName>
-				<displayName count="other">rials da Katar</displayName>
+				<displayName>riyal dal Qatar</displayName>
+				<displayName count="one">riyal dal Qatar</displayName>
+				<displayName count="other">riyals dal Qatar</displayName>
 			</currency>
 			<currency type="RHD">
 				<displayName draft="contributed">dollar rodesian</displayName>
@@ -3205,14 +4747,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">glivras sudanaisas (1957–1998)</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName>cruna svedaisa</displayName>
-				<displayName count="one">cruna svedaisa</displayName>
-				<displayName count="other">crunas svedaisas</displayName>
+				<displayName>curuna svedaisa</displayName>
+				<displayName count="one">curuna svedaisa</displayName>
+				<displayName count="other">curunas svedaisas</displayName>
 			</currency>
 			<currency type="SGD">
-				<displayName>dollar dal Singapur</displayName>
-				<displayName count="one">dollar dal Singapur</displayName>
-				<displayName count="other">dollars dal Singapur</displayName>
+				<displayName>dollar da Singapur</displayName>
+				<displayName count="one">dollar da Singapur</displayName>
+				<displayName count="other">dollars da Singapur</displayName>
 			</currency>
 			<currency type="SHP">
 				<displayName>glivra da Sontg’Elena</displayName>
@@ -3235,9 +4777,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">leones da la Sierra Leone</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName>leone da la Sierra Leone (1964—2022)</displayName>
-				<displayName count="one">leone da la Sierra Leone (1964—2022)</displayName>
-				<displayName count="other">leones da la Sierra Leone (1964—2022)</displayName>
+				<displayName>leone da la Sierra Leone (1964–2022)</displayName>
+				<displayName count="one">leone da la Sierra Leone (1964–2022)</displayName>
+				<displayName count="other">leones da la Sierra Leone (1964–2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>schilling somalian</displayName>
@@ -3245,9 +4787,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">schillings somalians</displayName>
 			</currency>
 			<currency type="SRD">
-				<displayName>dollar surinam</displayName>
-				<displayName count="one">dollars surinams</displayName>
-				<displayName count="other">dollars surinams</displayName>
+				<displayName>dollar dal Surinam</displayName>
+				<displayName count="one">dollar dal Surinam</displayName>
+				<displayName count="other">dollars dal Surinam</displayName>
 			</currency>
 			<currency type="SRG">
 				<displayName draft="contributed">flurin surinam</displayName>
@@ -3263,7 +4805,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other" draft="unconfirmed">dobras da São Tomé e Príncipe (1977–2017)</displayName>
 			</currency>
 			<currency type="STN">
-				<displayName>dobra da São Tomé e Principe</displayName>
+				<displayName>dobra da São Tomé e Príncipe</displayName>
 				<displayName count="one">dobra da São Tomé e Príncipe</displayName>
 				<displayName count="other">dobras da São Tomé e Príncipe</displayName>
 			</currency>
@@ -3281,9 +4823,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">glivras sirianas</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName>lilangeni dal Swaziland</displayName>
-				<displayName count="one">lilangeni dal Swaziland</displayName>
-				<displayName count="other">emalangenis dal Swaziland</displayName>
+				<displayName>lilangeni dal Swasiland</displayName>
+				<displayName count="one">lilangeni dal Swasiland</displayName>
+				<displayName count="other">lilangenis dal Swasiland</displayName>
 			</currency>
 			<currency type="THB">
 				<displayName>baht tailandais</displayName>
@@ -3316,9 +4858,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">dinars tunesians</displayName>
 			</currency>
 			<currency type="TOP">
-				<displayName>paʻanga da Tonga</displayName>
-				<displayName count="one">paʻanga da Tonga</displayName>
-				<displayName count="other">pa’angas da Tonga</displayName>
+				<displayName>paʻanga dal Tonga</displayName>
+				<displayName count="one">paʻanga dal Tonga</displayName>
+				<displayName count="other">pa’angas dal Tonga</displayName>
 			</currency>
 			<currency type="TPE">
 				<displayName>escudo dal Timor</displayName>
@@ -3337,7 +4879,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="TTD">
 				<displayName>dollar da Trinidad e Tobago</displayName>
-				<displayName count="one">dollars da Trinidad e Tobago</displayName>
+				<displayName count="one">dollar da Trinidad e Tobago</displayName>
 				<displayName count="other">dollars da Trinidad e Tobago</displayName>
 			</currency>
 			<currency type="TWD">
@@ -3346,9 +4888,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">novs dollars taiwanais</displayName>
 			</currency>
 			<currency type="TZS">
-				<displayName>schilling tansanian</displayName>
-				<displayName count="one">schilling tansanian</displayName>
-				<displayName count="other">schillings tansanians</displayName>
+				<displayName>schilling da la Tansania</displayName>
+				<displayName count="one">schilling da la Tansania</displayName>
+				<displayName count="other">schillings da la Tansania</displayName>
 			</currency>
 			<currency type="UAH">
 				<displayName>hryvnia ucranaisa</displayName>
@@ -3389,9 +4931,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="contributed">nov peso da l’Uruguay (1975–1993)</displayName>
 			</currency>
 			<currency type="UYU">
-				<displayName>peso da l’Uruguay</displayName>
-				<displayName count="one">peso da l’Uruguai</displayName>
-				<displayName count="other">pesos da l’Uruguai</displayName>
+				<displayName>peso uruguaian</displayName>
+				<displayName count="one">peso uruguaian</displayName>
+				<displayName count="other">pesos uruguaians</displayName>
 			</currency>
 			<currency type="UZS">
 				<displayName>som usbec</displayName>
@@ -3405,9 +4947,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="contributed">bolivar venezuelan (2008–2018)</displayName>
 			</currency>
 			<currency type="VES">
-				<displayName>bolívar venezuelan</displayName>
-				<displayName count="one">bolívar venezuelan</displayName>
-				<displayName count="other">bolívars venezuelans</displayName>
+				<displayName>bolívar venezolan</displayName>
+				<displayName count="one">bolívar venezolan</displayName>
+				<displayName count="other">bolívars venezolans</displayName>
 			</currency>
 			<currency type="VND">
 				<displayName>dong vietnamais</displayName>
@@ -3462,6 +5004,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dollar da la Caribica Orientala</displayName>
 				<displayName count="other">dollars da la Caribica Orientala</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>flurin caribic</displayName>
+				<displayName count="one">flurin caribic</displayName>
+				<displayName count="other">flurins caribics</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName draft="contributed">dretgs da prelevaziun spezials</displayName>
 				<displayName count="one" draft="unconfirmed">dretg da prelevaziun spezial</displayName>
@@ -3515,7 +5062,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="XXX">
 				<displayName>valuta nunenconuschenta</displayName>
-				<displayName count="one">(unitad nunenconuschenta da la valuta)</displayName>
+				<displayName count="one">(valuta nunenconuschenta)</displayName>
 				<displayName count="other">(valuta nunenconuschenta)</displayName>
 			</currency>
 			<currency type="YDD">
@@ -3564,7 +5111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">kwachas da la Sambia (1968–2012)</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName>kwacha da la sambia</displayName>
+				<displayName>kwacha da la Sambia</displayName>
 				<displayName count="one">kwacha da la Sambia</displayName>
 				<displayName count="other">kwachas da la Sambia</displayName>
 			</currency>
@@ -3583,6 +5130,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dollar dal Simbabwe (1980–2008)</displayName>
 				<displayName count="other">dollars dal Simbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>aur dal Simbabwe</displayName>
+				<displayName count="one">aur dal Simbabwe</displayName>
+				<displayName count="other">aur dal Simbabwe</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>dollar dal Simbabwe (2009)</displayName>
 				<displayName count="one">dollar dal Simbabwe (2009)</displayName>
@@ -3594,9 +5146,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">dollars dal Simbabwe (2008)</displayName>
 			</currency>
 		</currencies>
-		<miscPatterns numberSystem="latn">
-			<pattern type="approximately">≈{0}</pattern>
-		</miscPatterns>
 		<minimalPairs>
 			<pluralMinimalPairs count="one" draft="contributed">{0} di</pluralMinimalPairs>
 			<pluralMinimalPairs count="other" draft="contributed">{0} dis</pluralMinimalPairs>
@@ -3605,9 +5154,281 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>deci{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>centi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>milli{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>micro{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>nano{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>pico{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>femto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>atto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>zepto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>yocto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>ronto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>quecto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>deca{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>hecto{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>kilo{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>mega{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>giga{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>tera{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>peta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>exa{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>zetta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>yotta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ronna{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>quetta{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>kibi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>mebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>gibi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>tebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>pebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>exbi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>zebi{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>yobi{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0} per {1}</compoundUnitPattern>
 			</compoundUnit>
+			<compoundUnit type="power2">
+				<compoundUnitPattern1 count="one">{0} quadrat</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">{0} quadrat</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="one">{0} cubic</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">{0} cubic</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="times">
+				<compoundUnitPattern>{0}-{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>forzas g</displayName>
+				<unitPattern count="one">{0} forza g</unitPattern>
+				<unitPattern count="other">{0} forzas g</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>meters per secunda quadrat</displayName>
+				<unitPattern count="one">{0} meters per secunda quadrat</unitPattern>
+				<unitPattern count="other">{0} meter per secunda quadrat</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rotaziuns</displayName>
+				<unitPattern count="one">{0} rotaziun</unitPattern>
+				<unitPattern count="other">{0} rotaziuns</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
+				<unitPattern count="one">{0} radian</unitPattern>
+				<unitPattern count="other">{0} radians</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>grads</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="other">{0} grads</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>minutas d’artg</displayName>
+				<unitPattern count="one">{0} minuta d'artg</unitPattern>
+				<unitPattern count="other">{0} minutas d'artg</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>secundas d’artg</displayName>
+				<unitPattern count="one">{0} secunda d’artg</unitPattern>
+				<unitPattern count="other">{0} secundas d’artg</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>kilometers quadrats</displayName>
+				<unitPattern count="one">{0} kilometer quadrat</unitPattern>
+				<unitPattern count="other">{0} kilometers quadrats</unitPattern>
+				<perUnitPattern>{0} per kilometer quadrat</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>hectaras</displayName>
+				<unitPattern count="one">{0} hectara</unitPattern>
+				<unitPattern count="other">{0} hectaras</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>meters quadrat</displayName>
+				<unitPattern count="one">{0} meter quadrat</unitPattern>
+				<unitPattern count="other">{0} meters quadrats</unitPattern>
+				<perUnitPattern>{0} per meter quadrat</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>centimeters quadrats</displayName>
+				<unitPattern count="one">{0} centimeter quadrat</unitPattern>
+				<unitPattern count="other">{0} centimeters quadrats</unitPattern>
+				<perUnitPattern>{0} per centimeter quadrat</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>miglias quadrats</displayName>
+				<unitPattern count="one">{0} miglia quadrat</unitPattern>
+				<unitPattern count="other">{0} miglias quadrats</unitPattern>
+				<perUnitPattern>{0} per miglia quadrat</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>acras</displayName>
+				<unitPattern count="one">{0} acra</unitPattern>
+				<unitPattern count="other">{0} acras</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>yards quadrats</displayName>
+				<unitPattern count="one">{0} yard quadrat</unitPattern>
+				<unitPattern count="other">{0} yards quadrats</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>pes quadrats</displayName>
+				<unitPattern count="one">{0} pe quadrat</unitPattern>
+				<unitPattern count="other">{0} pes quadrats</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>poleschs quadrats</displayName>
+				<unitPattern count="one">{0} polesch quadrat</unitPattern>
+				<unitPattern count="other">{0} poleschs quadrats</unitPattern>
+				<perUnitPattern>{0} per polesch quadrat</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>dunams</displayName>
+				<unitPattern count="one">{0} dunam</unitPattern>
+				<unitPattern count="other">{0} dunams</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>carats</displayName>
+				<unitPattern count="one">{0} carat</unitPattern>
+				<unitPattern count="other">{0} carats</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>milligrams per deciliter</displayName>
+				<unitPattern count="one">{0} milligram per deciliter</unitPattern>
+				<unitPattern count="other">{0} milligrams per deciliter</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>millimols per liter</displayName>
+				<unitPattern count="one">{0} millimol per liter</unitPattern>
+				<unitPattern count="other">{0} millimols per liter</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>elements</displayName>
+				<unitPattern count="one">{0} element</unitPattern>
+				<unitPattern count="other">{0} elements</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>parts</displayName>
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} parts</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>parts per milliun</displayName>
+				<unitPattern count="one">{0} part per milliun</unitPattern>
+				<unitPattern count="other">{0} parts per milliun</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>pertschient</displayName>
+				<unitPattern count="one">{0} pertschient</unitPattern>
+				<unitPattern count="other">{0} pertschient</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>promil</displayName>
+				<unitPattern count="one">{0} promil</unitPattern>
+				<unitPattern count="other">{0} promil</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>per diesch milli</displayName>
+				<unitPattern count="one">{0} per diesch milli</unitPattern>
+				<unitPattern count="other">{0} per diesch milli</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>mols</displayName>
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mols</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>da glucosa</displayName>
+				<unitPattern count="one">{0} da glucosa</unitPattern>
+				<unitPattern count="other">{0} da glucosa</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>liters per kilometer</displayName>
+				<unitPattern count="one">{0} liter per kilometer</unitPattern>
+				<unitPattern count="other">{0} liters per kilometer</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>liters per 100 kilometers</displayName>
+				<unitPattern count="one">{0} liter per 100 kilometers</unitPattern>
+				<unitPattern count="other">{0} liters per 100 kilometers</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>miglias per gallun</displayName>
+				<unitPattern count="one">{0} miglia per gallun</unitPattern>
+				<unitPattern count="other">{0} miglias per gallun</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miglias per gallun imperial</displayName>
+				<unitPattern count="one">{0} miglia per gallun imperial</unitPattern>
+				<unitPattern count="other">{0} miglias per gallun imperial</unitPattern>
+			</unit>
 			<unit type="digital-petabyte">
 				<displayName>petabytes</displayName>
 				<unitPattern count="one">{0} petabyte</unitPattern>
@@ -3663,6 +5484,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} bit</unitPattern>
 				<unitPattern count="other">{0} bits</unitPattern>
 			</unit>
+			<unit type="duration-century">
+				<displayName>tschientaners</displayName>
+				<unitPattern count="one">{0} tschientaner</unitPattern>
+				<unitPattern count="other">{0} tschientaners</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>decennis</displayName>
+				<unitPattern count="one">{0} decenni</unitPattern>
+				<unitPattern count="other">{0} decennis</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<perUnitPattern>{0} per onn</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>quartals</displayName>
+				<unitPattern count="one">{0} quartal</unitPattern>
+				<unitPattern count="other">{0} quartals</unitPattern>
+				<perUnitPattern>{0}/quartal</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<perUnitPattern>{0} per mais</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<perUnitPattern>{0} per emna</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<perUnitPattern>{0} per di</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<perUnitPattern>{0} per ura</perUnitPattern>
+			</unit>
 			<unit type="duration-minute">
 				<unitPattern count="one">{0} minuta</unitPattern>
 				<unitPattern count="other">{0} minutas</unitPattern>
@@ -3678,53 +5530,698 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} millisecunda</unitPattern>
 				<unitPattern count="other">{0} millisecundas</unitPattern>
 			</unit>
+			<unit type="duration-microsecond">
+				<displayName>microsecundas</displayName>
+				<unitPattern count="one">{0} microsecunda</unitPattern>
+				<unitPattern count="other">{0} microsecundas</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>nanosecundas</displayName>
+				<unitPattern count="one">{0} nanosecunda</unitPattern>
+				<unitPattern count="other">{0} nanosecundas</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>ampers</displayName>
+				<unitPattern count="one">{0} ampere</unitPattern>
+				<unitPattern count="other">{0} amperes</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>milliamperes</displayName>
+				<unitPattern count="one">{0} milliampere</unitPattern>
+				<unitPattern count="other">{0} milliamperes</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ohms</displayName>
+				<unitPattern count="one">{0} ohm</unitPattern>
+				<unitPattern count="other">{0} ohms</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>volts</displayName>
+				<unitPattern count="one">{0} volt</unitPattern>
+				<unitPattern count="other">{0} volts</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>kilocalorias</displayName>
+				<unitPattern count="one">{0} kilocaloria</unitPattern>
+				<unitPattern count="other">{0} kilocalorias</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>calorias</displayName>
+				<unitPattern count="one">{0} caloria</unitPattern>
+				<unitPattern count="other">{0} calorias</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>kilojoules</displayName>
+				<unitPattern count="one">{0} kilojoule</unitPattern>
+				<unitPattern count="other">{0} kilojoules</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+				<unitPattern count="one">{0} joule</unitPattern>
+				<unitPattern count="other">{0} joules</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>uras kilowatt</displayName>
+				<unitPattern count="one">{0} ura kilowatt</unitPattern>
+				<unitPattern count="other">{0} uras kilowatt</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>electronvolts</displayName>
+				<unitPattern count="one">{0} electronvolt</unitPattern>
+				<unitPattern count="other">{0} electronvolts</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>therm US</displayName>
+				<unitPattern count="one">{0} therm US</unitPattern>
+				<unitPattern count="other">{0} therm US</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>glivra-forza</displayName>
+				<unitPattern count="one">{0} glivra-forza</unitPattern>
+				<unitPattern count="other">{0} glivra-forza</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>Newtons</displayName>
+				<unitPattern count="one">{0} Newton</unitPattern>
+				<unitPattern count="other">{0} Newtons</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>kilowatt-uras per 100 kilometers</displayName>
+				<unitPattern count="one">{0} kilowatt-ura per 100 kilometers</unitPattern>
+				<unitPattern count="other">{0} kilowatt-uras per 100 kilometers</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>gigahertz</displayName>
+				<unitPattern count="one">{0} gigahertz</unitPattern>
+				<unitPattern count="other">{0} gigahertz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>megahertz</displayName>
+				<unitPattern count="one">{0} megahertz</unitPattern>
+				<unitPattern count="other">{0} megahertz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>kilohertz</displayName>
+				<unitPattern count="one">{0} kilohertz</unitPattern>
+				<unitPattern count="other">{0} kilohertz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>hertz</displayName>
+				<unitPattern count="one">{0} hertz</unitPattern>
+				<unitPattern count="other">{0} hertz</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName>em tipografic</displayName>
+			</unit>
 			<unit type="graphics-pixel">
 				<unitPattern count="one">{0} pixel</unitPattern>
 				<unitPattern count="other">{0} pixels</unitPattern>
 			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>megapixels</displayName>
+				<unitPattern count="one">{0} megapixel</unitPattern>
+				<unitPattern count="other">{0} megapixels</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName>pixels per centimeter</displayName>
+				<unitPattern count="one">{0} pixel per centimeter</unitPattern>
+				<unitPattern count="other">{0} pixels per centimeter</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>pixels per polesch</displayName>
+				<unitPattern count="one">{0} pixel per polesch</unitPattern>
+				<unitPattern count="other">{0} pixels per polesch</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName>radius da la terra</displayName>
+				<unitPattern count="one">{0} radius da la terra</unitPattern>
+				<unitPattern count="other">{0} radius da la terra</unitPattern>
+			</unit>
 			<unit type="length-kilometer">
 				<displayName>kilometers</displayName>
 				<unitPattern count="one">{0} kilometer</unitPattern>
 				<unitPattern count="other">{0} kilometers</unitPattern>
+				<perUnitPattern>{0} per kilometer</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
 				<unitPattern count="one">{0} meter</unitPattern>
 				<unitPattern count="other">{0} meters</unitPattern>
+				<perUnitPattern>{0} per meter</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>decimeters</displayName>
+				<unitPattern count="one">{0} decimeter</unitPattern>
+				<unitPattern count="other">{0} decimeters</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
 				<displayName>centimeters</displayName>
 				<unitPattern count="one">{0} centimeter</unitPattern>
 				<unitPattern count="other">{0} centimeters</unitPattern>
+				<perUnitPattern>{0} per centimeter</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
 				<displayName>millimeters</displayName>
 				<unitPattern count="one">{0} millimeter</unitPattern>
 				<unitPattern count="other">{0} millimeters</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<displayName>micrometers</displayName>
+				<unitPattern count="one">{0} micrometer</unitPattern>
+				<unitPattern count="other">{0} micrometers</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>nanometers</displayName>
+				<unitPattern count="one">{0} nanometer</unitPattern>
+				<unitPattern count="other">{0} nanometers</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>picometers</displayName>
+				<unitPattern count="one">{0} picometer</unitPattern>
+				<unitPattern count="other">{0} picometers</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>miglia</displayName>
+				<unitPattern count="one">{0} miglia</unitPattern>
+				<unitPattern count="other">{0} miglias</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yards</displayName>
+				<unitPattern count="one">{0} yard</unitPattern>
+				<unitPattern count="other">{0} yards</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>pes</displayName>
+				<unitPattern count="one">{0} pe</unitPattern>
+				<unitPattern count="other">{0} pes</unitPattern>
+				<perUnitPattern>{0} per pe</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>poleschs</displayName>
+				<unitPattern count="one">{0} polesch</unitPattern>
+				<unitPattern count="other">{0} poleschs</unitPattern>
+				<perUnitPattern>{0} per polesch</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+				<unitPattern count="one">{0} parsec</unitPattern>
+				<unitPattern count="other">{0} parsecs</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>onns da glisch</displayName>
+				<unitPattern count="one">{0} onn da glisch</unitPattern>
+				<unitPattern count="other">{0} onns da glisch</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>unitads astronomicas</displayName>
+				<unitPattern count="one">{0} unitad astronomica</unitPattern>
+				<unitPattern count="other">{0} unitads astronomicas</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>miglias marinas</displayName>
+				<unitPattern count="one">{0} miglia marina</unitPattern>
+				<unitPattern count="other">{0} miglias marinas</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>miglia scandinava</displayName>
+				<unitPattern count="one">{0} miglia scandinava</unitPattern>
+				<unitPattern count="other">{0} miglias scandinavas</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>puncts tipografics</displayName>
+				<unitPattern count="one">{0} punct</unitPattern>
+				<unitPattern count="other">{0} puncts</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>radius solars</displayName>
+				<unitPattern count="one">{0} radius solar</unitPattern>
+				<unitPattern count="other">{0} radius solars</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0} lux</unitPattern>
+				<unitPattern count="other">{0} lux</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>candela</displayName>
+				<unitPattern count="one">{0} candela</unitPattern>
+				<unitPattern count="other">{0} candela</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>lumen</displayName>
+				<unitPattern count="one">{0} lumen</unitPattern>
+				<unitPattern count="other">{0} lumen</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>luminusitads solaras</displayName>
+				<unitPattern count="one">{0} luminusitad solara</unitPattern>
+				<unitPattern count="other">{0} luminusitads solaras</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>tonnas</displayName>
+				<unitPattern count="one">{0} tonna</unitPattern>
+				<unitPattern count="other">{0} tonnas</unitPattern>
+			</unit>
 			<unit type="mass-kilogram">
 				<displayName>kilograms</displayName>
-				<unitPattern count="one">{0} kilogram</unitPattern>
-				<unitPattern count="other">{0} kilograms</unitPattern>
+				<unitPattern count="one">{0} kilogram</unitPattern>
+				<unitPattern count="other">{0} kilograms</unitPattern>
+				<perUnitPattern>{0} per kilogram</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
-				<unitPattern count="one">{0} gram</unitPattern>
-				<unitPattern count="other">{0} grams</unitPattern>
+				<unitPattern count="one">{0} gram</unitPattern>
+				<unitPattern count="other">{0} grams</unitPattern>
+				<perUnitPattern>{0} per gram</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>milligrams</displayName>
+				<unitPattern count="one">{0} milligram</unitPattern>
+				<unitPattern count="other">{0} milligrams</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>micrograms</displayName>
+				<unitPattern count="one">{0} microgram</unitPattern>
+				<unitPattern count="other">{0} micrograms</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>tonnas curtas</displayName>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>glivras</displayName>
+				<unitPattern count="one">{0} glivra</unitPattern>
+				<unitPattern count="other">{0} glivras</unitPattern>
+				<perUnitPattern>{0} per glivra</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>unzas</displayName>
+				<unitPattern count="one">{0} unza</unitPattern>
+				<unitPattern count="other">{0} unzas</unitPattern>
+				<perUnitPattern>{0} per unza</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>unzas finas</displayName>
+				<unitPattern count="one">{0} unza fina</unitPattern>
+				<unitPattern count="other">{0} unzas finas</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>carats</displayName>
+				<unitPattern count="one">{0} carat</unitPattern>
+				<unitPattern count="other">{0} carats</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>daltons</displayName>
+				<unitPattern count="one">{0} dalton</unitPattern>
+				<unitPattern count="other">{0} daltons</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>massas da terra</displayName>
+				<unitPattern count="one">{0} massa da terra</unitPattern>
+				<unitPattern count="other">{0} massas da terra</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>massas solaras</displayName>
+				<unitPattern count="one">{0} massa solara</unitPattern>
+				<unitPattern count="other">{0} massas solaras</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>grauns</displayName>
+				<unitPattern count="one">{0} graun</unitPattern>
+				<unitPattern count="other">{0} grauns</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>gigawatts</displayName>
+				<unitPattern count="one">{0} gigawatt</unitPattern>
+				<unitPattern count="other">{0} gigawatts</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>megawatts</displayName>
+				<unitPattern count="one">{0} megawatt</unitPattern>
+				<unitPattern count="other">{0} megawatts</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kilowatts</displayName>
+				<unitPattern count="one">{0} kilowatt</unitPattern>
+				<unitPattern count="other">{0} kilowatts</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>watts</displayName>
+				<unitPattern count="one">{0} watt</unitPattern>
+				<unitPattern count="other">{0} watts</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>milliwatts</displayName>
+				<unitPattern count="one">{0} milliwatt</unitPattern>
+				<unitPattern count="other">{0} milliwatts</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>forzas-chaval</displayName>
+				<unitPattern count="one">{0} forza-chaval</unitPattern>
+				<unitPattern count="other">{0} forzas-chaval</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>millimeters colonna d’argient viv</displayName>
+				<unitPattern count="one">{0} millimeter colonna d’argient viv</unitPattern>
+				<unitPattern count="other">{0} millimeters colonna d’argient viv</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>d’argient viv</displayName>
+				<unitPattern count="one">{0} d’argient viv</unitPattern>
+				<unitPattern count="other">{0} d’argient viv</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>glivras per polesch quadrat</displayName>
+				<unitPattern count="one">{0} glivra per polesch quadrat</unitPattern>
+				<unitPattern count="other">{0} glivras per polesch quadrat</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>poleschs colonna d’argient viv</displayName>
+				<unitPattern count="one">{0} polesch colonna d’argient viv</unitPattern>
+				<unitPattern count="other">{0} poleschs colonna d’argient viv</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>millibar</displayName>
+				<unitPattern count="one">{0} millibar</unitPattern>
+				<unitPattern count="other">{0} millibar</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>atmosferas</displayName>
+				<unitPattern count="one">{0} atmosfera</unitPattern>
+				<unitPattern count="other">{0} atmosferas</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>pascal</displayName>
+				<unitPattern count="one">{0} pascal</unitPattern>
+				<unitPattern count="other">{0} pascal</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hectopascal</displayName>
+				<unitPattern count="one">{0} hectopascal</unitPattern>
+				<unitPattern count="other">{0} hectopascal</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>kilopascal</displayName>
+				<unitPattern count="one">{0} kilopascal</unitPattern>
+				<unitPattern count="other">{0} kilopascal</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>megapascal</displayName>
+				<unitPattern count="one">{0} megapascal</unitPattern>
+				<unitPattern count="other">{0} megapascal</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>kilometers per ura</displayName>
 				<unitPattern count="one">{0} kilometer per ura</unitPattern>
 				<unitPattern count="other">{0} kilometers per ura</unitPattern>
 			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>meters per secunda</displayName>
+				<unitPattern count="one">{0} meter per secunda</unitPattern>
+				<unitPattern count="other">{0} meters per secunda</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>miglias per ura</displayName>
+				<unitPattern count="one">{0} miglia per ura</unitPattern>
+				<unitPattern count="other">{0} miglias per ura</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>nufs</displayName>
+				<unitPattern count="one">{0} nuf</unitPattern>
+				<unitPattern count="other">{0} nufs</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>beaufort</displayName>
+				<unitPattern count="one">beaufort {0}</unitPattern>
+				<unitPattern count="other">beaufort {0}</unitPattern>
+			</unit>
+			<unit type="temperature-generic">
+				<displayName>grads</displayName>
+				<unitPattern count="one">{0} grad</unitPattern>
+				<unitPattern count="other">{0} grads</unitPattern>
+			</unit>
 			<unit type="temperature-celsius">
 				<displayName>grads celsius</displayName>
 				<unitPattern count="one">{0} grad celsius</unitPattern>
 				<unitPattern count="other">{0} grads celsius</unitPattern>
 			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>grads fahrenheit</displayName>
+				<unitPattern count="one">{0} grad fahrenheit</unitPattern>
+				<unitPattern count="other">{0} grads fahrenheit</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>kelvin</displayName>
+				<unitPattern count="one">{0} kelvin</unitPattern>
+				<unitPattern count="other">{0} kelvin</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>Newton meters</displayName>
+				<unitPattern count="one">{0} Newton meter</unitPattern>
+				<unitPattern count="other">{0} Newton meters</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>kilometers cubics</displayName>
+				<unitPattern count="one">{0} kilometer cubic</unitPattern>
+				<unitPattern count="other">{0} kilometers cubics</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>meters cubics</displayName>
+				<unitPattern count="one">{0} meter cubic</unitPattern>
+				<unitPattern count="other">{0} meters cubics</unitPattern>
+				<perUnitPattern>{0} per meter cubic</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>centimeters cubics</displayName>
+				<unitPattern count="one">{0} centimeter cubic</unitPattern>
+				<unitPattern count="other">{0} centimeters cubics</unitPattern>
+				<perUnitPattern>{0} per centimeter cubic</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>miglias cubicas</displayName>
+				<unitPattern count="one">{0} miglia cubica</unitPattern>
+				<unitPattern count="other">{0} miglias cubicas</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>yards cubics</displayName>
+				<unitPattern count="one">{0} yard cubic</unitPattern>
+				<unitPattern count="other">{0} yards cubics</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>pes cubics</displayName>
+				<unitPattern count="one">{0} pe cubic</unitPattern>
+				<unitPattern count="other">{0} pes cubics</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>poleschs cubics</displayName>
+				<unitPattern count="one">{0} polesch cubic</unitPattern>
+				<unitPattern count="other">{0} poleschs cubics</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>megaliters</displayName>
+				<unitPattern count="one">{0} megaliter</unitPattern>
+				<unitPattern count="other">{0} megaliters</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hectoliters</displayName>
+				<unitPattern count="one">{0} hectoliter</unitPattern>
+				<unitPattern count="other">{0} hectoliters</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one">{0} liter</unitPattern>
 				<unitPattern count="other">{0} liters</unitPattern>
 				<perUnitPattern>{0} per liter</perUnitPattern>
 			</unit>
+			<unit type="volume-deciliter">
+				<displayName>deciliters</displayName>
+				<unitPattern count="one">{0} deciliter</unitPattern>
+				<unitPattern count="other">{0} deciliters</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>centiliters</displayName>
+				<unitPattern count="one">{0} centiliter</unitPattern>
+				<unitPattern count="other">{0} centiliters</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>milliliters</displayName>
+				<unitPattern count="one">{0} milliliter</unitPattern>
+				<unitPattern count="other">{0} milliliters</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>pintas metricas</displayName>
+				<unitPattern count="one">{0} pinta metrica</unitPattern>
+				<unitPattern count="other">{0} pintas metricas</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>cups metrics</displayName>
+				<unitPattern count="one">{0} cup metric</unitPattern>
+				<unitPattern count="other">{0} cups metrics</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre-feet</displayName>
+				<unitPattern count="one">{0} acre-foot</unitPattern>
+				<unitPattern count="other">{0} acre-feet</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>galluns</displayName>
+				<unitPattern count="one">{0} gallun</unitPattern>
+				<unitPattern count="other">{0} galluns</unitPattern>
+				<perUnitPattern>{0} per gallun</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>galluns imperials</displayName>
+				<unitPattern count="one">{0} gallun imperial</unitPattern>
+				<unitPattern count="other">{0} galluns imperials</unitPattern>
+				<perUnitPattern>{0} per gal imp</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>quarts</displayName>
+				<unitPattern count="one">{0} quart</unitPattern>
+				<unitPattern count="other">{0} quarts</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>pintas</displayName>
+				<unitPattern count="one">{0} pinta</unitPattern>
+				<unitPattern count="other">{0} pintas</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cups</displayName>
+				<unitPattern count="one">{0} cup</unitPattern>
+				<unitPattern count="other">{0} cups</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>unzas liquidas</displayName>
+				<unitPattern count="one">{0} unza liquida</unitPattern>
+				<unitPattern count="other">{0} unzas liquidas</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>unzas liquidas imperialas</displayName>
+				<unitPattern count="one">{0} unza liquida imperiala</unitPattern>
+				<unitPattern count="other">{0} unzas liquidas imperialas</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>tschaduns gronds</displayName>
+				<unitPattern count="one">{0} tschadun grond</unitPattern>
+				<unitPattern count="other">{0} tschaduns gronds</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>tschaduns pitschens</displayName>
+				<unitPattern count="one">{0} tschadun pitschen</unitPattern>
+				<unitPattern count="other">{0} tschaduns pitschens</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>barrels</displayName>
+				<unitPattern count="one">{0} barrel</unitPattern>
+				<unitPattern count="other">{0} barrels</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>tschaduns da dessert</displayName>
+				<unitPattern count="one">{0} tschadun da dessert</unitPattern>
+				<unitPattern count="other">{0} tschaduns da dessert</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>tschaduns da dessert imperials</displayName>
+				<unitPattern count="one">{0} tschadun da dessert imperial</unitPattern>
+				<unitPattern count="other">{0} tschaduns da dessert imperials</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>guts</displayName>
+				<unitPattern count="one">{0} gut</unitPattern>
+				<unitPattern count="other">{0} guts</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>drams</displayName>
+				<unitPattern count="one">{0} dram</unitPattern>
+				<unitPattern count="other">{0} drams</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>jiggers</displayName>
+				<unitPattern count="one">{0} jiggers</unitPattern>
+				<unitPattern count="other">{0} jiggers</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>presas</displayName>
+				<unitPattern count="one">{0} presa</unitPattern>
+				<unitPattern count="other">{0} presas</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>quarts imperials</displayName>
+				<unitPattern count="one">{0} quart imperial</unitPattern>
+				<unitPattern count="other">{0} quarts imperials</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradians</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorias [IT]</displayName>
+				<unitPattern count="one">{0} caloria [IT]</unitPattern>
+				<unitPattern count="other">{0} calorias [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Webers</displayName>
+				<unitPattern count="one">{0} Weber</unitPattern>
+				<unitPattern count="other">{0} Webers</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>glisch</displayName>
+				<unitPattern count="one">{0} glisch</unitPattern>
+				<unitPattern count="other">{0} glisch</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>parts per milliarda</displayName>
+				<unitPattern count="one">{0} part per milliarda</unitPattern>
+				<unitPattern count="other">{0} parts per milliarda</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>notgs</displayName>
+				<unitPattern count="one">{0} notg</unitPattern>
+				<unitPattern count="other">{0} notgs</unitPattern>
+				<perUnitPattern>{0} per notg</perUnitPattern>
+			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} ost</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} nord</coordinateUnitPattern>
@@ -3733,86 +6230,401 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
-			<unit type="digital-petabyte">
-				<displayName>PByte</displayName>
+			<unit type="acceleration-g-force">
+				<displayName>forzas g</displayName>
 			</unit>
-			<unit type="digital-terabyte">
-				<displayName>TByte</displayName>
+			<unit type="angle-revolution">
+				<displayName>rot</displayName>
+				<unitPattern count="one">{0} rot</unitPattern>
+				<unitPattern count="other">{0} rot</unitPattern>
 			</unit>
-			<unit type="digital-terabit">
-				<displayName>Tbit</displayName>
+			<unit type="angle-radian">
+				<displayName>radians</displayName>
 			</unit>
-			<unit type="digital-gigabyte">
-				<displayName>GByte</displayName>
+			<unit type="angle-degree">
+				<displayName>grads</displayName>
 			</unit>
-			<unit type="digital-gigabit">
-				<displayName>Gbit</displayName>
+			<unit type="angle-arc-minute">
+				<displayName>arcmins</displayName>
+				<unitPattern count="one">{0} arcmin</unitPattern>
+				<unitPattern count="other">{0} arcmins</unitPattern>
 			</unit>
-			<unit type="digital-megabyte">
-				<displayName>MByte</displayName>
+			<unit type="angle-arc-second">
+				<displayName>arcsecs</displayName>
+				<unitPattern count="one">{0} arcsec</unitPattern>
+				<unitPattern count="other">{0} arcsecs</unitPattern>
 			</unit>
-			<unit type="digital-megabit">
-				<displayName>Mbit</displayName>
+			<unit type="area-hectare">
+				<displayName>ha</displayName>
 			</unit>
-			<unit type="digital-kilobyte">
-				<displayName>kByte</displayName>
+			<unit type="area-acre">
+				<displayName>acras</displayName>
 			</unit>
-			<unit type="digital-kilobit">
-				<displayName>kbit</displayName>
+			<unit type="area-dunam">
+				<displayName>dunams</displayName>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>carats</displayName>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>elem.</displayName>
+				<unitPattern count="one">{0} elem.</unitPattern>
+				<unitPattern count="other">{0} elem.</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<unitPattern count="one">{0} part</unitPattern>
+				<unitPattern count="other">{0} part</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>parts/milliun</displayName>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>pertschient</displayName>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>promil</displayName>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>per diesch milli</displayName>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0} l/km</unitPattern>
+				<unitPattern count="other">{0} l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>l/100 km</displayName>
+				<unitPattern count="one">{0} l/100 km</unitPattern>
+				<unitPattern count="other">{0} l/100 km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>miglias/gallun</displayName>
+				<unitPattern count="one">{0} mpg</unitPattern>
+				<unitPattern count="other">{0} mpg</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>miglias/gal imp.</displayName>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+			</unit>
+			<unit type="duration-century">
+				<displayName>tsch.</displayName>
+				<unitPattern count="one">{0} tsch.</unitPattern>
+				<unitPattern count="other">{0} tsch.</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>dec.</displayName>
+				<unitPattern count="one">{0} dec.</unitPattern>
+				<unitPattern count="other">{0} dec.</unitPattern>
 			</unit>
 			<unit type="duration-year">
 				<displayName>onns</displayName>
 				<unitPattern count="one">{0} onn</unitPattern>
 				<unitPattern count="other">{0} onns</unitPattern>
+				<perUnitPattern>{0}/o.</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>quart.</displayName>
+				<unitPattern count="one">{0} quart.</unitPattern>
+				<unitPattern count="other">{0} quart.</unitPattern>
+				<perUnitPattern>{0}/quart.</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mais</displayName>
 				<unitPattern count="one">{0} mais</unitPattern>
 				<unitPattern count="other">{0} mais</unitPattern>
+				<perUnitPattern>{0}/mais</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<displayName>emnas</displayName>
 				<unitPattern count="one">{0} emna</unitPattern>
 				<unitPattern count="other">{0} emnas</unitPattern>
+				<perUnitPattern>{0}/emna</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<displayName>dis</displayName>
 				<unitPattern count="one">{0} di</unitPattern>
 				<unitPattern count="other">{0} dis</unitPattern>
+				<perUnitPattern>{0}/di</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>uras</displayName>
-				<unitPattern count="one">{0} ura</unitPattern>
-				<unitPattern count="other">{0} uras</unitPattern>
+				<unitPattern count="one">{0} h</unitPattern>
+				<unitPattern count="other">{0} h</unitPattern>
+				<perUnitPattern>{0}/ura</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>minutas</displayName>
-				<unitPattern count="one">{0} min.</unitPattern>
-				<unitPattern count="other">{0} mins.</unitPattern>
+				<unitPattern count="one">{0} min</unitPattern>
+				<unitPattern count="other">{0} min</unitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>secundas</displayName>
-				<unitPattern count="one">{0} sec.</unitPattern>
-				<unitPattern count="other">{0} secs.</unitPattern>
+				<unitPattern count="one">{0} sec</unitPattern>
+				<unitPattern count="other">{0} sec</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>volts</displayName>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>joules</displayName>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>electronvolt</displayName>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>therm US</displayName>
+				<unitPattern count="one">{0} therm US</unitPattern>
+				<unitPattern count="other">{0} therm US</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>Newton</displayName>
 			</unit>
 			<unit type="graphics-pixel">
 				<displayName>pixels</displayName>
 			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>megapixels</displayName>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>pixels per polesch</displayName>
+			</unit>
 			<unit type="length-meter">
-				<displayName>meters</displayName>
+				<displayName>m</displayName>
+			</unit>
+			<unit type="length-mile">
+				<displayName>miglia</displayName>
+			</unit>
+			<unit type="length-yard">
+				<displayName>yards</displayName>
+			</unit>
+			<unit type="length-foot">
+				<displayName>pes</displayName>
+			</unit>
+			<unit type="length-inch">
+				<displayName>poleschs</displayName>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>parsecs</displayName>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>onns da glisch</displayName>
+			</unit>
+			<unit type="length-point">
+				<displayName>puncts</displayName>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lux</displayName>
+			</unit>
+			<unit type="light-candela">
+				<displayName>candela</displayName>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>lumen</displayName>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>luminusitads solaras</displayName>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>grams</displayName>
 			</unit>
-			<unit type="speed-kilometer-per-hour">
-				<displayName>km/ura</displayName>
+			<unit type="mass-dalton">
+				<displayName>daltons</displayName>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>massas solaras</displayName>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>grauns</displayName>
+				<unitPattern count="one">{0} gr</unitPattern>
+				<unitPattern count="other">{0} gr</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>PS</displayName>
+				<unitPattern count="one">{0} PS</unitPattern>
+				<unitPattern count="other">{0} PS</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>da Hg</displayName>
+				<unitPattern count="one">{0} da Hg</unitPattern>
+				<unitPattern count="other">{0} da Hg</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<unitPattern count="one">{0} °C</unitPattern>
-				<unitPattern count="other">{0} °C</unitPattern>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0} Ml</unitPattern>
+				<unitPattern count="other">{0} Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0} hl</unitPattern>
+				<unitPattern count="other">{0} hl</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>liters</displayName>
+				<displayName>l</displayName>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0} dl</unitPattern>
+				<unitPattern count="other">{0} dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0} cl</unitPattern>
+				<unitPattern count="other">{0} cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0} ml</unitPattern>
+				<unitPattern count="other">{0} ml</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0} gal</unitPattern>
+				<unitPattern count="other">{0} gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>gal imp</displayName>
+				<unitPattern count="one">{0} gal imp</unitPattern>
+				<unitPattern count="other">{0} gal imp</unitPattern>
+				<perUnitPattern>{0}/gal imp</perUnitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>cups</displayName>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0} fl oz</unitPattern>
+				<unitPattern count="other">{0} fl oz</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>tg</displayName>
+				<unitPattern count="one">{0} tg</unitPattern>
+				<unitPattern count="other">{0} tg</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>tp</displayName>
+				<unitPattern count="one">{0} tp</unitPattern>
+				<unitPattern count="other">{0} tp</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>td</displayName>
+				<unitPattern count="one">{0} td</unitPattern>
+				<unitPattern count="other">{0} td</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>Imp. dessert spoons</displayName>
+				<unitPattern count="one">{0} dsp-Imp.</unitPattern>
+				<unitPattern count="other">{0} dsp-Imp.</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>guts</displayName>
+				<unitPattern count="one">{0} gt</unitPattern>
+				<unitPattern count="other">{0} gt</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>drams</displayName>
+				<unitPattern count="one">{0} dram</unitPattern>
+				<unitPattern count="other">{0} drams</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>jiggers</displayName>
+				<unitPattern count="one">{0} jiggers</unitPattern>
+				<unitPattern count="other">{0} jiggers</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>presas</displayName>
+				<unitPattern count="one">{0} pr</unitPattern>
+				<unitPattern count="other">{0} pr</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>qt imp</displayName>
+				<unitPattern count="one">{0} qt imp</unitPattern>
+				<unitPattern count="other">{0} qt imp</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>glisch</displayName>
+				<unitPattern count="one">{0} glisch</unitPattern>
+				<unitPattern count="other">{0} glisch</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>parts/milliarda</displayName>
+			</unit>
+			<unit type="duration-night">
+				<displayName>notgs</displayName>
+				<unitPattern count="one">{0} notg</unitPattern>
+				<unitPattern count="other">{0} notgs</unitPattern>
+				<perUnitPattern>{0}/notg</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>direcziun</displayName>
@@ -3823,50 +6635,350 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="acceleration-g-force">
+				<displayName>G</displayName>
+				<unitPattern count="one">{0}G</unitPattern>
+				<unitPattern count="other">{0}Gs</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<unitPattern count="one">{0}m/s²</unitPattern>
+				<unitPattern count="other">{0}m/s²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>rot</displayName>
+				<unitPattern count="one">{0}rot</unitPattern>
+				<unitPattern count="other">{0}rot</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<unitPattern count="one">{0}rad</unitPattern>
+				<unitPattern count="other">{0}rad</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>°</displayName>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="one">{0}km²</unitPattern>
+				<unitPattern count="other">{0}km²</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ha</displayName>
+				<unitPattern count="one">{0}ha</unitPattern>
+				<unitPattern count="other">{0}ha</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="one">{0}m²</unitPattern>
+				<unitPattern count="other">{0}m²</unitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<unitPattern count="one">{0}cm²</unitPattern>
+				<unitPattern count="other">{0}cm²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="one">{0}mi²</unitPattern>
+				<unitPattern count="other">{0}mi²</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ac</displayName>
+				<unitPattern count="one">{0}ac</unitPattern>
+				<unitPattern count="other">{0}ac</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one">{0}yd²</unitPattern>
+				<unitPattern count="other">{0}yd²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="one">{0}ft²</unitPattern>
+				<unitPattern count="other">{0}ft²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<unitPattern count="one">{0}in²</unitPattern>
+				<unitPattern count="other">{0}in²</unitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<unitPattern count="one">{0}dunam</unitPattern>
+				<unitPattern count="other">{0}dunam</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<unitPattern count="one">{0}kt</unitPattern>
+				<unitPattern count="other">{0}kt</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<unitPattern count="one">{0}mg/dL</unitPattern>
+				<unitPattern count="other">{0}mg/dL</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<unitPattern count="one">{0}mmol/L</unitPattern>
+				<unitPattern count="other">{0}mmol/L</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>elem.</displayName>
+				<unitPattern count="one">{0}elem.</unitPattern>
+				<unitPattern count="other">{0}elem.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>parts/milliun</displayName>
+				<unitPattern count="one">{0}ppm</unitPattern>
+				<unitPattern count="other">{0}ppm</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>pertschient</displayName>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>promil</displayName>
+			</unit>
+			<unit type="concentr-mole">
+				<unitPattern count="one">{0}mol</unitPattern>
+				<unitPattern count="other">{0}mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>l/km</displayName>
+				<unitPattern count="one">{0}l/km</unitPattern>
+				<unitPattern count="other">{0}l/km</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>l/100km</displayName>
+				<unitPattern count="one">{0}l/100km</unitPattern>
+				<unitPattern count="other">{0}l/100km</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="one">{0}mpg</unitPattern>
+				<unitPattern count="other">{0}mpg</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>mpg UK</displayName>
+				<unitPattern count="one">{0}m/gUK</unitPattern>
+				<unitPattern count="other">{0}m/gUK</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>PB</displayName>
+				<unitPattern count="one">{0}PB</unitPattern>
+				<unitPattern count="other">{0}PB</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>TB</displayName>
+				<unitPattern count="one">{0}TB</unitPattern>
+				<unitPattern count="other">{0}TB</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>Tb</displayName>
+				<unitPattern count="one">{0}Tb</unitPattern>
+				<unitPattern count="other">{0}Tb</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>GB</displayName>
+				<unitPattern count="one">{0}GB</unitPattern>
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>Gb</displayName>
+				<unitPattern count="one">{0}Gb</unitPattern>
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>MB</displayName>
+				<unitPattern count="one">{0}MB</unitPattern>
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>Mb</displayName>
+				<unitPattern count="one">{0}Mb</unitPattern>
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>kB</displayName>
+				<unitPattern count="one">{0}kB</unitPattern>
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>kb</displayName>
+				<unitPattern count="one">{0}kb</unitPattern>
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>B</displayName>
+				<unitPattern count="one">{0}B</unitPattern>
+				<unitPattern count="other">{0}B</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<unitPattern count="one">{0}bit</unitPattern>
+				<unitPattern count="other">{0}bit</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>tsch.</displayName>
+				<unitPattern count="one">{0}tsch.</unitPattern>
+				<unitPattern count="other">{0}tsch.</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>dec.</displayName>
+				<unitPattern count="one">{0}dec.</unitPattern>
+				<unitPattern count="other">{0}dec.</unitPattern>
+			</unit>
 			<unit type="duration-year">
-				<displayName>onn</displayName>
-				<unitPattern count="one">{0} onns</unitPattern>
-				<unitPattern count="other">{0} onns</unitPattern>
+				<displayName>o.</displayName>
+				<unitPattern count="one">{0}o.</unitPattern>
+				<unitPattern count="other">{0}o.</unitPattern>
+				<perUnitPattern>{0}/o.</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>Q</displayName>
+				<unitPattern count="one">{0}Q</unitPattern>
+				<unitPattern count="other">{0}Q</unitPattern>
+				<perUnitPattern>{0}/Q</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>m.</displayName>
+				<unitPattern count="one">{0}m.</unitPattern>
+				<unitPattern count="other">{0}m.</unitPattern>
+				<perUnitPattern>{0}/m.</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<displayName>emna</displayName>
-				<unitPattern count="one">{0} emnas</unitPattern>
-				<unitPattern count="other">{0} emnas</unitPattern>
+				<displayName>e.</displayName>
+				<unitPattern count="one">{0}e.</unitPattern>
+				<unitPattern count="other">{0}e.</unitPattern>
+				<perUnitPattern>{0}/e.</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<displayName>di</displayName>
-				<unitPattern count="one">{0} dis</unitPattern>
-				<unitPattern count="other">{0} dis</unitPattern>
+				<displayName>d</displayName>
+				<unitPattern count="one">{0}d</unitPattern>
+				<unitPattern count="other">{0}d</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>ura</displayName>
-				<unitPattern count="one">{0} uras</unitPattern>
-				<unitPattern count="other">{0} uras</unitPattern>
+				<displayName>h</displayName>
+				<unitPattern count="one">{0}h</unitPattern>
+				<unitPattern count="other">{0}h</unitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>min</displayName>
-				<unitPattern count="one">{0} mins.</unitPattern>
-				<unitPattern count="other">{0} mins.</unitPattern>
+				<unitPattern count="one">{0}m</unitPattern>
+				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sec</displayName>
-				<unitPattern count="one">{0} secs.</unitPattern>
-				<unitPattern count="other">{0} secs.</unitPattern>
+				<unitPattern count="one">{0}s</unitPattern>
+				<unitPattern count="other">{0}s</unitPattern>
 			</unit>
 			<unit type="duration-millisecond">
 				<unitPattern count="one">{0}ms</unitPattern>
 				<unitPattern count="other">{0}ms</unitPattern>
 			</unit>
+			<unit type="duration-microsecond">
+				<unitPattern count="one">{0}μs</unitPattern>
+				<unitPattern count="other">{0}μs</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<unitPattern count="one">{0}ns</unitPattern>
+				<unitPattern count="other">{0}ns</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<unitPattern count="one">{0}A</unitPattern>
+				<unitPattern count="other">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<unitPattern count="one">{0}mA</unitPattern>
+				<unitPattern count="other">{0}mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<unitPattern count="one">{0}Ω</unitPattern>
+				<unitPattern count="other">{0}Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<unitPattern count="one">{0}V</unitPattern>
+				<unitPattern count="other">{0}V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<unitPattern count="one">{0}kcal</unitPattern>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<unitPattern count="one">{0}cal</unitPattern>
+				<unitPattern count="other">{0}cal</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<unitPattern count="one">{0}kJ</unitPattern>
+				<unitPattern count="other">{0}kJ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>J</displayName>
+				<unitPattern count="one">{0}J</unitPattern>
+				<unitPattern count="other">{0}J</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<unitPattern count="one">{0}kWh</unitPattern>
+				<unitPattern count="other">{0}kWh</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<unitPattern count="one">{0}eV</unitPattern>
+				<unitPattern count="other">{0}eV</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>therm US</displayName>
+				<unitPattern count="one">{0}therm US</unitPattern>
+				<unitPattern count="other">{0}therm US</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<unitPattern count="one">{0}lbf</unitPattern>
+				<unitPattern count="other">{0}lbf</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<unitPattern count="one">{0}N</unitPattern>
+				<unitPattern count="other">{0}N</unitPattern>
+			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<unitPattern count="one">{0}kWh/100km</unitPattern>
 				<unitPattern count="other">{0}kWh/100km</unitPattern>
 			</unit>
+			<unit type="frequency-gigahertz">
+				<unitPattern count="one">{0}GHz</unitPattern>
+				<unitPattern count="other">{0}GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<unitPattern count="one">{0}MHz</unitPattern>
+				<unitPattern count="other">{0}MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<unitPattern count="one">{0}kHz</unitPattern>
+				<unitPattern count="other">{0}kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<unitPattern count="one">{0}Hz</unitPattern>
+				<unitPattern count="other">{0}Hz</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<unitPattern count="one">{0}em</unitPattern>
+				<unitPattern count="other">{0}em</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName>px</displayName>
+				<unitPattern count="one">{0}px</unitPattern>
+				<unitPattern count="other">{0}px</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<unitPattern count="one">{0}MP</unitPattern>
+				<unitPattern count="other">{0}MP</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<unitPattern count="one">{0}ppcm</unitPattern>
+				<unitPattern count="other">{0}ppcm</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>pixels per polesch</displayName>
+				<unitPattern count="one">{0}ppi</unitPattern>
+				<unitPattern count="other">{0}ppi</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<unitPattern count="one">{0}R⊕</unitPattern>
+				<unitPattern count="other">{0}R⊕</unitPattern>
+			</unit>
 			<unit type="length-kilometer">
 				<unitPattern count="one">{0}km</unitPattern>
 				<unitPattern count="other">{0}km</unitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName>meter</displayName>
+				<displayName>m</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
 			</unit>
@@ -3878,33 +6990,412 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mm</unitPattern>
 				<unitPattern count="other">{0}mm</unitPattern>
 			</unit>
+			<unit type="length-micrometer">
+				<unitPattern count="one">{0}μm</unitPattern>
+				<unitPattern count="other">{0}μm</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<unitPattern count="one">{0}nm</unitPattern>
+				<unitPattern count="other">{0}nm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="one">{0}pm</unitPattern>
+				<unitPattern count="other">{0}pm</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="one">{0}mi</unitPattern>
+				<unitPattern count="other">{0}mi</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="one">{0}yd</unitPattern>
+				<unitPattern count="other">{0}yd</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="one">{0}ft</unitPattern>
+				<unitPattern count="other">{0}ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="one">{0}in</unitPattern>
+				<unitPattern count="other">{0}in</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="one">{0}pc</unitPattern>
+				<unitPattern count="other">{0}pc</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="one">{0}ly</unitPattern>
+				<unitPattern count="other">{0}ly</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="one">{0}au</unitPattern>
+				<unitPattern count="other">{0}au</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="one">{0}nmi</unitPattern>
+				<unitPattern count="other">{0}nmi</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<unitPattern count="one">{0}smi</unitPattern>
+				<unitPattern count="other">{0}smi</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<unitPattern count="one">{0}R☉</unitPattern>
+				<unitPattern count="other">{0}R☉</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>lux</displayName>
+				<unitPattern count="one">{0}lx</unitPattern>
+				<unitPattern count="other">{0}lx</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<unitPattern count="one">{0}cd</unitPattern>
+				<unitPattern count="other">{0}cd</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>lumen</displayName>
+				<unitPattern count="one">{0}lm</unitPattern>
+				<unitPattern count="other">{0}lm</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<unitPattern count="one">{0}L☉</unitPattern>
+				<unitPattern count="other">{0}L☉</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<unitPattern count="one">{0}t</unitPattern>
+				<unitPattern count="other">{0}t</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="one">{0}kg</unitPattern>
+				<unitPattern count="other">{0}kg</unitPattern>
+			</unit>
 			<unit type="mass-gram">
-				<displayName>gram</displayName>
+				<displayName>g</displayName>
+				<unitPattern count="one">{0}g</unitPattern>
+				<unitPattern count="other">{0}g</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="one">{0}mg</unitPattern>
+				<unitPattern count="other">{0}mg</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="one">{0}μg</unitPattern>
+				<unitPattern count="other">{0}μg</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="one">{0}lb</unitPattern>
+				<unitPattern count="other">{0}lb</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0}oz</unitPattern>
+				<unitPattern count="other">{0}oz</unitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<unitPattern count="one">{0}oz t</unitPattern>
+				<unitPattern count="other">{0}oz t</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<unitPattern count="one">{0}CD</unitPattern>
+				<unitPattern count="other">{0}CD</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<unitPattern count="one">{0}Da</unitPattern>
+				<unitPattern count="other">{0}Da</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<unitPattern count="one">{0}M⊕</unitPattern>
+				<unitPattern count="other">{0}M⊕</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<unitPattern count="one">{0}M☉</unitPattern>
+				<unitPattern count="other">{0}M☉</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>gr</displayName>
+				<unitPattern count="one">{0}gr</unitPattern>
+				<unitPattern count="other">{0}gr</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<unitPattern count="one">{0}GW</unitPattern>
+				<unitPattern count="other">{0}GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<unitPattern count="one">{0}MW</unitPattern>
+				<unitPattern count="other">{0}MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="one">{0}kW</unitPattern>
+				<unitPattern count="other">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>W</displayName>
+				<unitPattern count="one">{0}W</unitPattern>
+				<unitPattern count="other">{0}W</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<unitPattern count="one">{0}mW</unitPattern>
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>PS</displayName>
+				<unitPattern count="one">{0}PS</unitPattern>
+				<unitPattern count="other">{0}PS</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0}mmHg</unitPattern>
+				<unitPattern count="other">{0}mmHg</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>da Hg</displayName>
+				<unitPattern count="one">{0} da Hg</unitPattern>
+				<unitPattern count="other">{0} da Hg</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<unitPattern count="one">{0}psi</unitPattern>
+				<unitPattern count="other">{0}psi</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>″ Hg</displayName>
+				<unitPattern count="one">{0}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<unitPattern count="one">{0}bar</unitPattern>
+				<unitPattern count="other">{0}bar</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<unitPattern count="one">{0}atm</unitPattern>
+				<unitPattern count="other">{0}atm</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<unitPattern count="one">{0}Pa</unitPattern>
+				<unitPattern count="other">{0}Pa</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="one">{0}hPa</unitPattern>
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<unitPattern count="one">{0}kPa</unitPattern>
+				<unitPattern count="other">{0}kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="one">{0}MPa</unitPattern>
+				<unitPattern count="other">{0}MPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
+				<unitPattern count="one">{0}km/h</unitPattern>
+				<unitPattern count="other">{0}km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="one">{0}m/s</unitPattern>
+				<unitPattern count="other">{0}m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>mi/hr</displayName>
+				<unitPattern count="one">{0}mi/h</unitPattern>
+				<unitPattern count="other">{0}mi/h</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<unitPattern count="one">{0}kn</unitPattern>
+				<unitPattern count="other">{0}kn</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">B{0}</unitPattern>
+				<unitPattern count="other">B{0}</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<unitPattern count="one">{0}°C</unitPattern>
 				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
+			<unit type="temperature-kelvin">
+				<unitPattern count="one">{0}K</unitPattern>
+				<unitPattern count="other">{0}K</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<unitPattern count="one">{0}N⋅m</unitPattern>
+				<unitPattern count="other">{0}N⋅m</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="one">{0}km³</unitPattern>
+				<unitPattern count="other">{0}km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="one">{0}m³</unitPattern>
+				<unitPattern count="other">{0}m³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="one">{0}cm³</unitPattern>
+				<unitPattern count="other">{0}cm³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="one">{0}mi³</unitPattern>
+				<unitPattern count="other">{0}mi³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<unitPattern count="one">{0}yd³</unitPattern>
+				<unitPattern count="other">{0}yd³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="one">{0}ft³</unitPattern>
+				<unitPattern count="other">{0}ft³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="one">{0}in³</unitPattern>
+				<unitPattern count="other">{0}in³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>Ml</displayName>
+				<unitPattern count="one">{0}Ml</unitPattern>
+				<unitPattern count="other">{0}Ml</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>hl</displayName>
+				<unitPattern count="one">{0}hl</unitPattern>
+				<unitPattern count="other">{0}hl</unitPattern>
+			</unit>
 			<unit type="volume-liter">
-				<displayName>liter</displayName>
+				<displayName>l</displayName>
+				<unitPattern count="one">{0}l</unitPattern>
+				<unitPattern count="other">{0}l</unitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>dl</displayName>
+				<unitPattern count="one">{0}dl</unitPattern>
+				<unitPattern count="other">{0}dl</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>cl</displayName>
+				<unitPattern count="one">{0}cl</unitPattern>
+				<unitPattern count="other">{0}cl</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>ml</displayName>
+				<unitPattern count="one">{0}ml</unitPattern>
+				<unitPattern count="other">{0}ml</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<unitPattern count="one">{0}mpt</unitPattern>
+				<unitPattern count="other">{0}mpt</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<unitPattern count="one">{0}mc</unitPattern>
+				<unitPattern count="other">{0}mc</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>acre ft</displayName>
+				<unitPattern count="one">{0}ac ft</unitPattern>
+				<unitPattern count="other">{0}ac ft</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>gal</displayName>
+				<unitPattern count="one">{0}gal</unitPattern>
+				<unitPattern count="other">{0}gal</unitPattern>
+				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<unitPattern count="one">{0} gal imp</unitPattern>
-				<unitPattern count="other">{0} gal imp</unitPattern>
+				<displayName>gal imp</displayName>
+				<unitPattern count="one">{0}gal imp</unitPattern>
+				<unitPattern count="other">{0}gal imp</unitPattern>
+				<perUnitPattern>{0}/gal imp</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<unitPattern count="one">{0}qt</unitPattern>
+				<unitPattern count="other">{0}qt</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<unitPattern count="one">{0}pt</unitPattern>
+				<unitPattern count="other">{0}pt</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="one">{0}c</unitPattern>
+				<unitPattern count="other">{0}c</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>fl oz</displayName>
+				<unitPattern count="one">{0}fl oz</unitPattern>
+				<unitPattern count="other">{0}fl oz</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<unitPattern count="one">{0} fl oz imp</unitPattern>
-				<unitPattern count="other">{0} fl oz imp</unitPattern>
+				<displayName>Imp fl oz</displayName>
+				<unitPattern count="one">{0}fl oz Im</unitPattern>
+				<unitPattern count="other">{0}fl oz Im</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>tg</displayName>
+				<unitPattern count="one">{0}tg</unitPattern>
+				<unitPattern count="other">{0}tg</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>tp</displayName>
+				<unitPattern count="one">{0}tp</unitPattern>
+				<unitPattern count="other">{0}tp</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<unitPattern count="one">{0}bbl</unitPattern>
+				<unitPattern count="other">{0}bbl</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>td</displayName>
+				<unitPattern count="one">{0}td</unitPattern>
+				<unitPattern count="other">{0}td</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon-imperial">
+				<displayName>dsp Imp</displayName>
 				<unitPattern count="one">{0}dsp-Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
+			<unit type="volume-drop">
+				<displayName>gt</displayName>
+				<unitPattern count="one">{0}gt</unitPattern>
+				<unitPattern count="other">{0}gt</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>fl.dr.</displayName>
+				<unitPattern count="one">{0}fl.dr.</unitPattern>
+				<unitPattern count="other">{0}fl.dr.</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<unitPattern count="one">{0}jigger</unitPattern>
+				<unitPattern count="other">{0}jigger</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>pr</displayName>
+				<unitPattern count="one">{0}pr</unitPattern>
+				<unitPattern count="other">{0}pr</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>qt imp</displayName>
+				<unitPattern count="one">{0}qt imp</unitPattern>
+				<unitPattern count="other">{0}qt imp</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>glisch</displayName>
+				<unitPattern count="one">{0}glisch</unitPattern>
+				<unitPattern count="other">{0}glisch</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>parts/milliarda</displayName>
+				<unitPattern count="one">{0}ppb</unitPattern>
+				<unitPattern count="other">{0}ppb</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>notgs</displayName>
+				<unitPattern count="one">{0}notg</unitPattern>
+				<unitPattern count="other">{0}notgs</unitPattern>
+				<perUnitPattern>{0}/notg</perUnitPattern>
+			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}O</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}N</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
 				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
 			</coordinateUnit>
@@ -3919,12 +7410,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0} u {1}</listPatternPart>
 			<listPatternPart type="2">{0} u {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="standard-narrow">
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start">{0} {1}</listPatternPart>
 			<listPatternPart type="middle">{0} {1}</listPatternPart>
 			<listPatternPart type="end">{0} {1}</listPatternPart>
 			<listPatternPart type="2">{0} {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
@@ -3932,7 +7431,313 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<nostr draft="contributed">na:n</nostr>
 		</messages>
 	</posix>
+	<characterLabels>
+		<characterLabelPattern type="all">{0} – tut</characterLabelPattern>
+		<characterLabelPattern type="compatibility">{0} – cumpatibilitad</characterLabelPattern>
+		<characterLabelPattern type="enclosed">{0} – incorporà</characterLabelPattern>
+		<characterLabelPattern type="extended">{0} – expandì</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} a sanestra</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} a dretga</characterLabelPattern>
+		<characterLabelPattern type="historic">{0} – istoric</characterLabelPattern>
+		<characterLabelPattern type="miscellaneous">{0} – varia</characterLabelPattern>
+		<characterLabelPattern type="other">{0} – auter</characterLabelPattern>
+		<characterLabelPattern type="scripts">sistems da scrittira – {0}</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="one">{0} stritg</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="other">{0} stritgs</characterLabelPattern>
+		<characterLabelPattern type="subscript">sbassà {0}</characterLabelPattern>
+		<characterLabelPattern type="superscript">elevà {0}</characterLabelPattern>
+		<characterLabel type="activities">activitads</characterLabel>
+		<characterLabel type="african_scripts">sistems da scrittira africans</characterLabel>
+		<characterLabel type="american_scripts">sistems da scrittira americans</characterLabel>
+		<characterLabel type="animals_nature">animals u natira</characterLabel>
+		<characterLabel type="arrows">frizzas</characterLabel>
+		<characterLabel type="body">corp</characterLabel>
+		<characterLabel type="box_drawing">segns cun rom</characterLabel>
+		<characterLabel type="braille">Braille</characterLabel>
+		<characterLabel type="building">edifizi</characterLabel>
+		<characterLabel type="bullets_stars">simbols d’enumeraziun u stailas</characterLabel>
+		<characterLabel type="consonantal_jamo">jamo consonantic</characterLabel>
+		<characterLabel type="currency_symbols">simbols da valuta</characterLabel>
+		<characterLabel type="dash_connector">lingetta u stritg d’uniun</characterLabel>
+		<characterLabel type="digits">cifras</characterLabel>
+		<characterLabel type="divination_symbols">simbols da divinaziun</characterLabel>
+		<characterLabel type="downwards_arrows">frizzas vers engiu</characterLabel>
+		<characterLabel type="downwards_upwards_arrows">frizzas vers ensi ed engiu</characterLabel>
+		<characterLabel type="east_asian_scripts">sistems da scrittira da l’Asia da l’Ost</characterLabel>
+		<characterLabel type="european_scripts">sistems da scrittira europeics</characterLabel>
+		<characterLabel type="female">feminin</characterLabel>
+		<characterLabel type="flag">bandiera</characterLabel>
+		<characterLabel type="flags">bandieras</characterLabel>
+		<characterLabel type="food_drink">da mangiar e da baiver</characterLabel>
+		<characterLabel type="format_whitespace">format &amp; spazi</characterLabel>
+		<characterLabel type="full_width_form_variant">variantas en plaina largezza</characterLabel>
+		<characterLabel type="geometric_shapes">furmas geometricas</characterLabel>
+		<characterLabel type="half_width_form_variant">variantas en mesa largezza</characterLabel>
+		<characterLabel type="han_characters">caracters han</characterLabel>
+		<characterLabel type="han_radicals">radicals han</characterLabel>
+		<characterLabel type="hanzi_simplified">hanzi (simplifitgà)</characterLabel>
+		<characterLabel type="hanzi_traditional">hanzi (tradiziunal)</characterLabel>
+		<characterLabel type="heart">cor</characterLabel>
+		<characterLabel type="historic_scripts">sistems da scrittira istorics</characterLabel>
+		<characterLabel type="ideographic_desc_characters">caracters da descripziun ideografica</characterLabel>
+		<characterLabel type="japanese_kana">kana giapunais</characterLabel>
+		<characterLabel type="keycap">tasta</characterLabel>
+		<characterLabel type="leftwards_arrows">frizzas a sanestra</characterLabel>
+		<characterLabel type="leftwards_rightwards_arrows">frizzas a sanestra ed a dretga</characterLabel>
+		<characterLabel type="letterlike_symbols">simbols sco letras</characterLabel>
+		<characterLabel type="limited_use">diever limità</characterLabel>
+		<characterLabel type="male">masculin</characterLabel>
+		<characterLabel type="math_symbols">simbols matematics</characterLabel>
+		<characterLabel type="middle_eastern_scripts">sistems da scrittira dal Proxim Orient</characterLabel>
+		<characterLabel type="miscellaneous">varia</characterLabel>
+		<characterLabel type="modern_scripts">sistems da scrittira moderns</characterLabel>
+		<characterLabel type="modifier">modificatur</characterLabel>
+		<characterLabel type="musical_symbols">simbols musicals</characterLabel>
+		<characterLabel type="nature">natira</characterLabel>
+		<characterLabel type="nonspacing">senza spazi</characterLabel>
+		<characterLabel type="numbers">cifras</characterLabel>
+		<characterLabel type="objects">objects</characterLabel>
+		<characterLabel type="other">auter</characterLabel>
+		<characterLabel type="paired">en pèrs</characterLabel>
+		<characterLabel type="person">persuna</characterLabel>
+		<characterLabel type="phonetic_alphabet">alfabet fonetic</characterLabel>
+		<characterLabel type="pictographs">pictograms</characterLabel>
+		<characterLabel type="place">lieu</characterLabel>
+		<characterLabel type="plant">planta</characterLabel>
+		<characterLabel type="punctuation">interpuncziun</characterLabel>
+		<characterLabel type="rightwards_arrows">frizzas a dretga</characterLabel>
+		<characterLabel type="sign_standard_symbols">segn u simbol</characterLabel>
+		<characterLabel type="small_form_variant">variantas pitschnas</characterLabel>
+		<characterLabel type="smileys_people">smiley u persuna</characterLabel>
+		<characterLabel type="south_asian_scripts">sistems da scrittira da l’Asia dal Sid</characterLabel>
+		<characterLabel type="southeast_asian_scripts">sistems da scrittira da l’Asia dal Sidost</characterLabel>
+		<characterLabel type="spacing">spazi</characterLabel>
+		<characterLabel type="symbols">simbols</characterLabel>
+		<characterLabel type="technical_symbols">simbols tecnics</characterLabel>
+		<characterLabel type="tone_marks">accents d’intunaziun</characterLabel>
+		<characterLabel type="travel">viadi</characterLabel>
+		<characterLabel type="travel_places">viadi u lieu</characterLabel>
+		<characterLabel type="upwards_arrows">frizzas ensi</characterLabel>
+		<characterLabel type="variant_forms">variantas</characterLabel>
+		<characterLabel type="vocalic_jamo">jamo vocalic</characterLabel>
+		<characterLabel type="weather">aura</characterLabel>
+		<characterLabel type="western_asian_scripts">scripts da l’Asia dal Vest</characterLabel>
+		<characterLabel type="whitespace">spazi vid</characterLabel>
+	</characterLabels>
 	<typographicNames>
 		<axisName type="ital">cursiv</axisName>
+		<axisName type="opsz">dimensiun optica</axisName>
+		<axisName type="slnt">inclinaziun</axisName>
+		<axisName type="wdth">largezza</axisName>
+		<axisName type="wght">grossezza</axisName>
+		<styleName type="ital" subtype="1">cursiv</styleName>
+		<styleName type="opsz" subtype="8">legenda</styleName>
+		<styleName type="opsz" subtype="18">titel</styleName>
+		<styleName type="opsz" subtype="72">visur</styleName>
+		<styleName type="opsz" subtype="144">placat</styleName>
+		<styleName type="slnt" subtype="-12">cursiv invers</styleName>
+		<styleName type="slnt" subtype="0">vertical</styleName>
+		<styleName type="slnt" subtype="12">inclinà</styleName>
+		<styleName type="slnt" subtype="24">extrainclinà</styleName>
+		<styleName type="wdth" subtype="50">ultracondensà</styleName>
+		<styleName type="wdth" subtype="62.5">extracondensà</styleName>
+		<styleName type="wdth" subtype="75">condensà</styleName>
+		<styleName type="wdth" subtype="87.5">semicondensà</styleName>
+		<styleName type="wdth" subtype="112.5">semiexpandì</styleName>
+		<styleName type="wdth" subtype="125">expandì</styleName>
+		<styleName type="wdth" subtype="150">extraexpandì</styleName>
+		<styleName type="wdth" subtype="200">ultraexpandì</styleName>
+		<styleName type="wght" subtype="100">fin</styleName>
+		<styleName type="wght" subtype="200">extralev</styleName>
+		<styleName type="wght" subtype="300">lev</styleName>
+		<styleName type="wght" subtype="350">semilev</styleName>
+		<styleName type="wght" subtype="380">cudesch</styleName>
+		<styleName type="wght" subtype="500">mesaun</styleName>
+		<styleName type="wght" subtype="600">semigrass</styleName>
+		<styleName type="wght" subtype="700">grass</styleName>
+		<styleName type="wght" subtype="800">extragrass</styleName>
+		<styleName type="wght" subtype="900">nair</styleName>
+		<styleName type="wght" subtype="950">extranair</styleName>
+		<featureName type="afrc">fracziuns verticalas</featureName>
+		<featureName type="cpsp">spazi tranter maiusclas</featureName>
+		<featureName type="dlig">ligaturas opziunalas</featureName>
+		<featureName type="frac">fracziuns diagonalas</featureName>
+		<featureName type="lnum">cifras maiusclas</featureName>
+		<featureName type="onum">cifras medievalas</featureName>
+		<featureName type="ordn">dumbers ordinals</featureName>
+		<featureName type="pnum">cifras proporziunalas</featureName>
+		<featureName type="smcp">maiusclettas</featureName>
+		<featureName type="tnum">cifras tabellaras</featureName>
+		<featureName type="zero">nulla cun stritg diagonal</featureName>
 	</typographicNames>
+	<personNames>
+		<nameOrderLocales order="givenFirst">und rm</nameOrderLocales>
+		<parameterDefault parameter="formality">informal</parameterDefault>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{title} {given} {given2} {surname} {generation} {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{given} {given2-initial} {surname} {generation} {credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{given-initial} {given2-initial} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{given-informal} {surname-initial}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{surname}, {title} {given} {given2} {generation} {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname}, {given} {given2-initial} {generation} {credentials}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{surname}, {given-initial} {given2-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-initial}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
+			<namePattern>{title} {surname}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="long" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="medium" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="formal">
+			<namePattern>{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
+		</personName>
+		<personName order="sorting" length="short" usage="referring" formality="informal">
+			<namePattern>{surname}, {given-informal}</namePattern>
+		</personName>
+		<sampleName item="nativeG">
+			<nameField type="given">Ursina</nameField>
+		</sampleName>
+		<sampleName item="nativeGS">
+			<nameField type="given">Aita</nameField>
+			<nameField type="surname">Caduff</nameField>
+		</sampleName>
+		<sampleName item="nativeGGS">
+			<nameField type="given">Gian Carlo</nameField>
+			<nameField type="given2">Ramun</nameField>
+			<nameField type="surname">Foffa</nameField>
+		</sampleName>
+		<sampleName item="nativeFull">
+			<nameField type="title">dr.</nameField>
+			<nameField type="given">Margaritta Marionna</nameField>
+			<nameField type="given-informal">Rita</nameField>
+			<nameField type="given2">Maria</nameField>
+			<nameField type="surname-prefix">de</nameField>
+			<nameField type="surname-core">Planta</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
+			<nameField type="generation">jr.</nameField>
+			<nameField type="credentials">CF</nameField>
+		</sampleName>
+		<sampleName item="foreignG">
+			<nameField type="given">Rüdiger</nameField>
+		</sampleName>
+		<sampleName item="foreignGS">
+			<nameField type="given">Käthe</nameField>
+			<nameField type="surname">Müller</nameField>
+		</sampleName>
+		<sampleName item="foreignGGS">
+			<nameField type="given">Zäzilia</nameField>
+			<nameField type="given2">Hamish</nameField>
+			<nameField type="surname">Stöber</nameField>
+		</sampleName>
+		<sampleName item="foreignFull">
+			<nameField type="title">Prof. Dr.</nameField>
+			<nameField type="given">Ada Cornelia</nameField>
+			<nameField type="given-informal">Neele</nameField>
+			<nameField type="given2">César Martín</nameField>
+			<nameField type="surname-prefix">von</nameField>
+			<nameField type="surname-core">Brühl</nameField>
+			<nameField type="surname2">González Domingo</nameField>
+			<nameField type="generation">Jr</nameField>
+			<nameField type="credentials">MD DDS</nameField>
+		</sampleName>
+	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/ro.xml b/make/data/cldr/common/main/ro.xml
index 5add9d07498..44de014592e 100644
--- a/make/data/cldr/common/main/ro.xml
+++ b/make/data/cldr/common/main/ro.xml
@@ -151,7 +151,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="el">greacă</language>
 			<language type="elx">elamită</language>
 			<language type="en">engleză</language>
-			<language type="en_US" alt="short">engleză (S.U.A)</language>
+			<language type="en_GB" alt="short">engleză (UK)</language>
 			<language type="enm">engleză medie</language>
 			<language type="eo">esperanto</language>
 			<language type="es">spaniolă</language>
@@ -284,6 +284,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölsch</language>
 			<language type="ku">kurdă</language>
+			<language type="ku" menu="core">kurdă</language>
+			<language type="ku" menu="extension">kurmangi</language>
 			<language type="kum">kumyk</language>
 			<language type="kut">kutenai</language>
 			<language type="kv">komi</language>
@@ -865,6 +867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">China</territory>
 			<territory type="CO">Columbia</territory>
 			<territory type="CP">Insula Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Capul Verde</territory>
@@ -1057,7 +1060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="TN">Tunisia</territory>
 			<territory type="TO">Tonga</territory>
 			<territory type="TR">Turcia</territory>
-			<territory type="TR" alt="variant">Türkiye</territory>
+			<territory type="TR" alt="variant">TR-variant</territory>
 			<territory type="TT">Trinidad și Tobago</territory>
 			<territory type="TV">Tuvalu</territory>
 			<territory type="TW">Taiwan</territory>
@@ -1219,35 +1222,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">sortare numerică</key>
 			<key type="colStrength">puterea sortării</key>
 			<key type="currency">monedă</key>
+			<key type="em">Prezentare emojiuri</key>
 			<key type="hc">ciclu orar (12 sau 24)</key>
-			<key type="lb">stil de întrerupere a liniei</key>
+			<key type="lb">stil de întrerupere a rândului (chineză, japoneză, coreeană)</key>
+			<key type="lw">întrerupere a rândului în interiorul cuvântului</key>
 			<key type="ms">sistem de unități de măsură</key>
 			<key type="numbers">numere</key>
+			<key type="ss">întrerupere propoziție după abr.</key>
 			<key type="timezone">fus orar</key>
 			<key type="va">variantă locală</key>
 			<key type="x">utilizare privată</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">calendar budist</type>
+			<type key="calendar" type="buddhist" scope="core">budist</type>
 			<type key="calendar" type="chinese">calendar chinezesc</type>
+			<type key="calendar" type="chinese" scope="core">chinezesc</type>
 			<type key="calendar" type="coptic">calendar copt</type>
+			<type key="calendar" type="coptic" scope="core">copt</type>
 			<type key="calendar" type="dangi">calendar dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">calendar etiopian</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopian</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendar etiopian amete alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopian amete alem</type>
 			<type key="calendar" type="gregorian">calendar gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
 			<type key="calendar" type="hebrew">calendar ebraic</type>
+			<type key="calendar" type="hebrew" scope="core">ebraic</type>
 			<type key="calendar" type="indian">calendar național indian</type>
 			<type key="calendar" type="islamic">calendarul hegirei</type>
+			<type key="calendar" type="islamic" scope="core">al hegirei</type>
 			<type key="calendar" type="islamic-civil">calendarul hegirei (tabular, civil)</type>
+			<type key="calendar" type="islamic-civil" scope="core">al hegirei (tabular, civil)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">calendar islamic (Arabia Saudită, lunar)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">calendar islamic (tabular, epocă astronomică)</type>
 			<type key="calendar" type="islamic-umalqura">calendarul hegirei (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">al hegirei (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">calendar ISO-8601</type>
 			<type key="calendar" type="japanese">calendar japonez</type>
+			<type key="calendar" type="japanese" scope="core">japonez</type>
 			<type key="calendar" type="persian">calendar persan</type>
+			<type key="calendar" type="persian" scope="core">persan</type>
 			<type key="calendar" type="roc">calendarul Republicii Chineze</type>
+			<type key="calendar" type="roc" scope="core">al Republicii Chineze</type>
 			<type key="cf" type="account">Format monedă contabilitate</type>
+			<type key="cf" type="account" scope="core">contabilitate</type>
 			<type key="cf" type="standard">Format monedă standard</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Ordonați simbolurile</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Ordonați ignorând simbolurile</type>
 			<type key="colBackwards" type="no" draft="contributed">Ordonați accentele în mod normal</type>
@@ -1257,23 +1279,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Ordonați mai întâi majusculele</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Ordonați neținând seama de diferența dintre majuscule/minuscule</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Ordonați ținând seama de diferența dintre majuscule/minuscule</type>
-			<type key="collation" type="big5han">ordine de sortare a chinezei tradiționale - Big5</type>
 			<type key="collation" type="compat">ordine de sortare anterioară, pentru compatibilitate</type>
+			<type key="collation" type="compat" scope="core">compatibilitate</type>
 			<type key="collation" type="dictionary">ordine de sortare a dicționarului</type>
+			<type key="collation" type="dictionary" scope="core">dicționar</type>
 			<type key="collation" type="ducet">ordine de sortare Unicode implicită</type>
+			<type key="collation" type="ducet" scope="core">Unicode implicită</type>
 			<type key="collation" type="emoji" draft="contributed">ordine de sortare a emojiurilor</type>
 			<type key="collation" type="eor" draft="contributed">regulile europene de sortare</type>
-			<type key="collation" type="gb2312han">ordine de sortare a chinezei simplificate - GB2312</type>
 			<type key="collation" type="phonebook">ordine de sortare după cartea de telefon</type>
+			<type key="collation" type="phonebook" scope="core">carte de telefon</type>
 			<type key="collation" type="phonetic">ordine de sortare fonetică</type>
+			<type key="collation" type="phonetic" scope="core">fonetică</type>
 			<type key="collation" type="pinyin">ordine de sortare pinyin</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">căutare cu scop general</type>
+			<type key="collation" type="search" scope="core">căutare</type>
 			<type key="collation" type="searchjl" draft="contributed">Căutați în funcție de consoana inițială hangul</type>
 			<type key="collation" type="standard">ordine de sortare standard</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="collation" type="stroke">ordine de sortare după trasare</type>
+			<type key="collation" type="stroke" scope="core">trasare</type>
 			<type key="collation" type="traditional">ordine de sortare tradițională</type>
+			<type key="collation" type="traditional" scope="core">tradițională</type>
 			<type key="collation" type="unihan">ordine de sortare după radical și trasare</type>
+			<type key="collation" type="unihan" scope="core">radical și trasare</type>
 			<type key="collation" type="zhuyin">ordine de sortare zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Ordonați fără normalizare</type>
 			<type key="colNormalization" type="yes" draft="contributed">Ordonați caracterele unicode normalizat</type>
 			<type key="colNumeric" type="no" draft="contributed">Ordonați cifrele individual</type>
@@ -1286,18 +1318,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Cu lățime întreagă</type>
 			<type key="d0" type="hwidth">Cu jumătate de lățime</type>
 			<type key="d0" type="npinyin" draft="contributed">Numeric</type>
+			<type key="em" type="default" scope="core">implicită</type>
+			<type key="em" type="emoji" scope="core">emojiuri</type>
+			<type key="em" type="text" scope="core">text</type>
 			<type key="hc" type="h11">sistem cu 12 ore (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">sistem cu 12 ore (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">sistem cu 24 de ore (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">sistem cu 24 de ore (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">stil liber de întrerupere a liniei</type>
-			<type key="lb" type="normal">stil normal de întrerupere a liniei</type>
-			<type key="lb" type="strict">stil strict de întrerupere a liniei</type>
+			<type key="lb" type="loose" scope="core">liber</type>
+			<type key="lb" type="normal">stil de normal întrerupere a rândului</type>
+			<type key="lb" type="normal" scope="core">normal</type>
+			<type key="lb" type="strict">stil strict de întrerupere a rândului</type>
+			<type key="lb" type="strict" scope="core">strict</type>
+			<type key="lw" type="breakall" scope="core">întrerupere oriunde</type>
+			<type key="lw" type="keepall" scope="core">fără întrerupere</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">fără întrerupere în expresii</type>
 			<type key="m0" type="bgn">transliterare BGN SUA</type>
 			<type key="m0" type="ungegn">transliterare GEGN ONU</type>
 			<type key="ms" type="metric">sistemul metric</type>
+			<type key="ms" type="metric" scope="core">metric</type>
 			<type key="ms" type="uksystem">sistemul imperial de unități de măsură</type>
+			<type key="ms" type="uksystem" scope="core">britanic</type>
 			<type key="ms" type="ussystem">sistemul american de unități de măsură</type>
+			<type key="ms" type="ussystem" scope="core">american</type>
 			<type key="numbers" type="ahom" draft="contributed">cifre ahom</type>
 			<type key="numbers" type="arab">cifre indo-arabe</type>
 			<type key="numbers" type="arabext">cifre indo-arabe extinse</type>
@@ -1383,6 +1432,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">cifre vai</type>
 			<type key="numbers" type="wara" draft="contributed">cifre warang citi</type>
 			<type key="numbers" type="wcho" draft="contributed">cifre wancho</type>
+			<type key="ss" type="none" scope="core">dezactivată</type>
+			<type key="ss" type="standard" scope="core">activată</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metric</measurementSystemName>
@@ -1412,9 +1463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1508,11 +1556,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="contributed">înainte de Anno Martyrum</era>
 						<era type="1" draft="contributed">după Anno Martyrum</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">î.A.M.</era>
 						<era type="1" draft="contributed">A.M.</era>
 					</eraAbbr>
 				</eras>
@@ -1537,16 +1583,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">înainte de Întrupare</era>
-						<era type="1" draft="contributed">după Întrupare</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">î.Într.</era>
-						<era type="1" draft="contributed">d.Într.</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1580,6 +1616,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'la' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'la' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1588,6 +1627,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'la' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'la' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1604,11 +1646,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
@@ -1955,6 +1998,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'la' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'la' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1963,11 +2009,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'la' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'la' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'la' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1979,15 +2031,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">'h' HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
@@ -2051,10 +2105,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -2065,10 +2115,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2313,18 +2359,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">acum {0} de luni</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="month-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">peste {0} lună</relativeTimePattern>
-					<relativeTimePattern count="few">peste {0} luni</relativeTimePattern>
-					<relativeTimePattern count="other">peste {0} luni</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one">acum {0} lună</relativeTimePattern>
-					<relativeTimePattern count="few">acum {0} luni</relativeTimePattern>
-					<relativeTimePattern count="other">acum {0} luni</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="month-narrow">
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} lună</relativeTimePattern>
@@ -2746,8 +2780,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">sâ. -{0} săpt.</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="dayperiod-short">
+				<displayName>a.m./p.m.</displayName>
+			</field>
 			<field type="dayperiod">
-				<displayName>a.m/p.m.</displayName>
+				<displayName>a.m./p.m.</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>a.m./p.m.</displayName>
 			</field>
 			<field type="hour">
 				<displayName>oră</displayName>
@@ -2890,15 +2930,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Oraș necunoscut</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erevan</exemplarCity>
 			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Showa</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
@@ -2920,6 +2954,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Atlantic/Cape_Verde">
 				<exemplarCity>Capul Verde</exemplarCity>
 			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Insula Christmas</exemplarCity>
+			</zone>
 			<zone type="Europe/Prague">
 				<exemplarCity>Praga</exemplarCity>
 			</zone>
@@ -2983,7 +3020,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bișkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Insula Canton</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Comore</exemplarCity>
@@ -2991,6 +3028,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Phenian</exemplarCity>
 			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>Seul</exemplarCity>
+			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Kuweit</exemplarCity>
 			</zone>
@@ -3018,9 +3058,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxemburg</exemplarCity>
 			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chișinău</exemplarCity>
-			</zone>
 			<zone type="Europe/Podgorica">
 				<exemplarCity>Podgorița</exemplarCity>
 			</zone>
@@ -3120,9 +3157,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damasc</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dușanbe</exemplarCity>
 			</zone>
@@ -3132,6 +3166,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Insula Wake</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Dakota de Nord</exemplarCity>
 			</zone>
@@ -3176,9 +3213,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora Africii Occidentale</generic>
-					<standard>Ora standard a Africii Occidentale</standard>
-					<daylight>Ora de vară a Africii Occidentale</daylight>
+					<standard>Ora Africii Occidentale</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3239,9 +3274,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Ora din Apia</generic>
-					<standard>Ora standard din Apia</standard>
-					<daylight>Ora de vară din Apia</daylight>
+					<generic>Ora din Samoa</generic>
+					<standard>Ora standard din Samoa</standard>
+					<daylight>Ora de vară din Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3544,7 +3579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard>Ora de Greenwhich</standard>
+					<standard>Ora de Greenwich</standard>
 				</long>
 				<short>
 					<standard>GMT</standard>
@@ -3574,6 +3609,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ora din Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora standard din Hawaii-Aleutine</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora din Hawaii-Aleutine</generic>
@@ -4174,24 +4214,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 mie ¤</pattern>
-					<pattern type="1000" count="few">0 mii ¤</pattern>
-					<pattern type="1000" count="other">0 mii ¤</pattern>
-					<pattern type="10000" count="one">00 mii ¤</pattern>
-					<pattern type="10000" count="few">00 mii ¤</pattern>
-					<pattern type="10000" count="other">00 mii ¤</pattern>
-					<pattern type="100000" count="one">000 mii ¤</pattern>
-					<pattern type="100000" count="few">000 mii ¤</pattern>
-					<pattern type="100000" count="other">000 mii ¤</pattern>
+					<pattern type="1000" count="one">0 K ¤</pattern>
+					<pattern type="1000" count="few">0 K ¤</pattern>
+					<pattern type="1000" count="other">0 K ¤</pattern>
+					<pattern type="10000" count="one">00 K ¤</pattern>
+					<pattern type="10000" count="few">00 K ¤</pattern>
+					<pattern type="10000" count="other">00 K ¤</pattern>
+					<pattern type="100000" count="one">000 K ¤</pattern>
+					<pattern type="100000" count="few">000 K ¤</pattern>
+					<pattern type="100000" count="other">000 K ¤</pattern>
 					<pattern type="1000000" count="one">0 mil'.' ¤</pattern>
 					<pattern type="1000000" count="few">0 mil'.' ¤</pattern>
 					<pattern type="1000000" count="other">0 mil'.' ¤</pattern>
@@ -5521,6 +5562,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">dolari est-caraibi</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>gulden caraib</displayName>
+				<displayName count="one">gulden caraib</displayName>
+				<displayName count="few">guldeni caraibi</displayName>
+				<displayName count="other">guldeni caraibi</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>drepturi speciale de tragere</displayName>
 			</currency>
@@ -5626,6 +5673,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="few">dolari Zimbabwe (1980–2008)</displayName>
 				<displayName count="other">dolari Zimbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe Gold</displayName>
+				<displayName count="one">Zimbabwe Gold</displayName>
+				<displayName count="few">Zimbabwe Gold</displayName>
+				<displayName count="other">Zimbabwe Gold</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>dolar Zimbabwe (2009)</displayName>
 			</currency>
@@ -5797,10 +5850,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>feminine</gender>
 				<unitPattern count="one">{0} forță g</unitPattern>
 				<unitPattern count="one" case="genitive">unei forțe g</unitPattern>
-				<unitPattern count="few">{0} forță g</unitPattern>
-				<unitPattern count="few" case="genitive">{0} forță g</unitPattern>
-				<unitPattern count="other">{0} forță g</unitPattern>
-				<unitPattern count="other" case="genitive">{0} forță g</unitPattern>
+				<unitPattern count="few">{0} forțe g</unitPattern>
+				<unitPattern count="few" case="genitive">{0} forțe g</unitPattern>
+				<unitPattern count="other">{0} de forțe g</unitPattern>
+				<unitPattern count="other" case="genitive">{0} de forțe g</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
 				<gender>masculine</gender>
@@ -5979,7 +6032,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} de itemi</unitPattern>
 				<unitPattern count="other" case="genitive">{0} de itemi</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>părți</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="few">{0} părți</unitPattern>
+				<unitPattern count="other">{0} de părți</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>părți pe milion</displayName>
 				<unitPattern count="one">{0} parte pe milion</unitPattern>
@@ -6028,6 +6087,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} de moli</unitPattern>
 				<unitPattern count="other" case="genitive">{0} de moli</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>de glucoză</displayName>
+				<unitPattern count="one">{0} de glucoză</unitPattern>
+				<unitPattern count="few">{0} de glucoză</unitPattern>
+				<unitPattern count="other">{0} de glucoză</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litri pe kilometru</displayName>
@@ -6935,6 +7000,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} de milimetri coloană de mercur</unitPattern>
 				<unitPattern count="other" case="genitive">{0} de milimetri coloană de mercur</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de mercur</displayName>
+				<unitPattern count="one">{0} de mercur</unitPattern>
+				<unitPattern count="few">{0} de mercur</unitPattern>
+				<unitPattern count="other">{0} de mercur</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>livre pe inch pătrat</displayName>
 				<unitPattern count="one">{0} livră pe inch pătrat</unitPattern>
@@ -7050,9 +7121,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} de noduri</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<unitPattern count="one">Beaufort {0}</unitPattern>
-				<unitPattern count="few">Beaufort {0}</unitPattern>
-				<unitPattern count="other">Beaufort {0}</unitPattern>
+				<unitPattern count="one">{0} grad Beaufort</unitPattern>
+				<unitPattern count="few">{0} grade Beaufort</unitPattern>
+				<unitPattern count="other">{0} de grade Beaufort</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
 				<gender>neuter</gender>
@@ -7241,6 +7312,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} de căni metrice</unitPattern>
 				<unitPattern count="other" case="genitive">{0} de căni metrice</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>uncii lichide metrice</displayName>
+				<unitPattern count="one">uncie lichidă metrică</unitPattern>
+				<unitPattern count="few">{0} uncii lichide metrice</unitPattern>
+				<unitPattern count="other">{0} de uncii lichide metrice</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acru-picioare</displayName>
 				<unitPattern count="one">{0} acru-picior</unitPattern>
@@ -7346,17 +7423,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} quarte imperiale</unitPattern>
 				<unitPattern count="other">{0} de quarte imperiale</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradieni</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="few">{0} steradieni</unitPattern>
+				<unitPattern count="other">{0} de steradieni</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katali</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} katali</unitPattern>
+				<unitPattern count="other">{0} de katali</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombi</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="few">{0} coulombi</unitPattern>
+				<unitPattern count="other">{0} de coulombi</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farazi</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farazi</unitPattern>
+				<unitPattern count="other">{0} de farazi</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="few">{0} henry</unitPattern>
+				<unitPattern count="other">{0} de henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemenși</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="few">{0} siemenși</unitPattern>
+				<unitPattern count="other">{0} de siemenși</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorii [IT]</displayName>
+				<unitPattern count="one">{0} calorie [IT]</unitPattern>
+				<unitPattern count="few">{0} calorii [IT]</unitPattern>
+				<unitPattern count="other">{0} de calorii [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquereli</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="few">{0} becquereli</unitPattern>
+				<unitPattern count="other">{0} de becquereli</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="few">{0} sieverți</unitPattern>
+				<unitPattern count="other">{0} de sieverți</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="few">{0} gray</unitPattern>
+				<unitPattern count="other">{0} de gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograme-forță</displayName>
+				<unitPattern count="one">{0} kilogram-forță</unitPattern>
+				<unitPattern count="few">{0} kilograme-forță</unitPattern>
+				<unitPattern count="other">{0} de kilograme-forță</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} de tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weberi</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="few">{0} weberi</unitPattern>
+				<unitPattern count="other">{0} de weberi</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>lumină</displayName>
-				<unitPattern count="one">{0} lumină</unitPattern>
-				<unitPattern count="one" case="genitive">{0} lumină</unitPattern>
-				<unitPattern count="few">{0} lumină</unitPattern>
-				<unitPattern count="few" case="genitive">{0} lumină</unitPattern>
-				<unitPattern count="other">{0} lumină</unitPattern>
-				<unitPattern count="other" case="genitive">{0} lumină</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>părți pe miliard</displayName>
 				<unitPattern count="one">{0} parte pe miliard</unitPattern>
@@ -7375,14 +7523,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few" case="genitive">{0} nopți</unitPattern>
 				<unitPattern count="other">{0} de nopți</unitPattern>
 				<unitPattern count="other" case="genitive">{0} de nopți</unitPattern>
-				<perUnitPattern>{0}/noapte</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>punct cardinal</displayName>
-				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} V</coordinateUnitPattern>
+				<coordinateUnitPattern type="east">{0} est</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} nord</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} sud</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} vest</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
@@ -7449,11 +7596,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} itemi</unitPattern>
 				<unitPattern count="other">{0} de itemi</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="few">{0} părți</unitPattern>
+				<unitPattern count="other">{0} de părți</unitPattern>
+			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="few">{0} moli</unitPattern>
 				<unitPattern count="other">{0} moli</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7673,6 +7829,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} CP</unitPattern>
 				<unitPattern count="other">{0} CP</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="few">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>in Hg</displayName>
 				<unitPattern count="one">{0} in Hg</unitPattern>
@@ -7789,13 +7951,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} qt imp.</unitPattern>
 				<unitPattern count="other">{0} qt imp.</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>lumină</displayName>
 				<unitPattern count="one">{0} lumină</unitPattern>
 				<unitPattern count="few">{0} lumină</unitPattern>
 				<unitPattern count="other">{0} lumină</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>părți/miliard</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7807,7 +7972,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<coordinateUnit>
 				<displayName>direcție</displayName>
-				<coordinateUnitPattern type="west">{0}V</coordinateUnitPattern>
+				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} V</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
@@ -7847,6 +8015,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} itemi</unitPattern>
 				<unitPattern count="other">{0} itemi</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>parte</displayName>
+				<unitPattern count="one">{0} parte</unitPattern>
+				<unitPattern count="few">{0} părți</unitPattern>
+				<unitPattern count="other">{0} părți</unitPattern>
+			</unit>
 			<unit type="concentr-permille">
 				<unitPattern count="one">{0} ‰</unitPattern>
 				<unitPattern count="few">{0} ‰</unitPattern>
@@ -7857,6 +8031,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 				<unitPattern count="one">{0} mi/gal</unitPattern>
@@ -7922,6 +8099,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="mass-gram">
 				<displayName>g</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>de Hg</displayName>
+				<unitPattern count="one">{0} de Hg</unitPattern>
+				<unitPattern count="few">{0} de Hg</unitPattern>
+				<unitPattern count="other">{0} de Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="one">{0}″ Hg</unitPattern>
 				<unitPattern count="few">{0}″ Hg</unitPattern>
@@ -7983,21 +8166,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} qt im</unitPattern>
 				<unitPattern count="other">{0} qt im</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>lumină</displayName>
-				<unitPattern count="one">{0} lumină</unitPattern>
-				<unitPattern count="few">{0} lumină</unitPattern>
-				<unitPattern count="other">{0} lumină</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>părți/miliard</displayName>
-			</unit>
-			<unit type="duration-night">
-				<displayName>nopți</displayName>
-				<unitPattern count="one">{0} noapte</unitPattern>
-				<unitPattern count="few">{0} nopți</unitPattern>
-				<unitPattern count="other">{0} de nopți</unitPattern>
-				<perUnitPattern>{0}/noapte</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/root.xml b/make/data/cldr/common/main/root.xml
index 4aee72f9dec..cb483de4be8 100644
--- a/make/data/cldr/common/main/root.xml
+++ b/make/data/cldr/common/main/root.xml
@@ -42,8 +42,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	<characters>
 		<exemplarCharacters>[]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . ( ) \[ \] \{ \}]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ , ; \: ! ? . ( ) \[ \] \{ \}]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‐‑ , . /]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
 		<ellipsis type="medial">{0}…{1}</ellipsis>
@@ -393,6 +396,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -401,6 +407,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -409,6 +418,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -417,6 +429,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -424,6 +439,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="EBh">E h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
@@ -440,6 +456,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
@@ -648,8 +666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">ERA0</era>
-						<era type="1">ERA1</era>
+						<era type="1">AM</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -757,8 +774,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">ERA0</era>
-						<era type="1">ERA1</era>
+						<era type="0">AA</era>
+						<era type="1">AM</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -792,7 +809,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">ERA0</era>
+						<era type="0">AA</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -897,7 +914,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 							<datetimeSkeleton>GGGGGyMMdd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -913,6 +930,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -921,6 +941,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -929,6 +952,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -937,6 +963,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -944,15 +973,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="EBh">E h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Eh">E h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyM">G y-MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
@@ -962,6 +995,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
@@ -972,9 +1007,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">G y</dateFormatItem>
 						<dateFormatItem id="yyyy">G y</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">G y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y-MM-dd, E</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
@@ -1014,21 +1049,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="G">G y-MM – G y-MM</greatestDifference>
+							<greatestDifference id="M">G y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">G y-MM – y-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">G y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="G">G y-MM-dd – G y-MM-dd</greatestDifference>
+							<greatestDifference id="M">G y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">G y-MM-dd – y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="G">G y-MM-dd, E – G y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
@@ -1105,18 +1140,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">G y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">G y-MM – y-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">G y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M">G y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">G y-MM-dd – y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">G y MMM–MMM</greatestDifference>
@@ -1355,6 +1390,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1363,6 +1401,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1371,6 +1412,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1379,6 +1423,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<alias source="locale" path="../dateTimeFormat[@type='standard']"/>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h B</dateFormatItem>
@@ -1386,15 +1433,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="E">ccc</dateFormatItem>
+						<dateFormatItem id="EBh">E h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Eh">E h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyM">G y-MM</dateFormatItem>
+						<dateFormatItem id="GyMd">G y-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
@@ -1408,6 +1459,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">HH:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm v</dateFormatItem>
+						<dateFormatItem id="hv">h a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'h' v</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">MM-dd</dateFormatItem>
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
@@ -1461,21 +1514,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="G">G y-MM – G y-MM</greatestDifference>
+							<greatestDifference id="M">G y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">G y-MM – y-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">G y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="G">G y-MM-dd – G y-MM-dd</greatestDifference>
+							<greatestDifference id="M">G y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">G y-MM-dd – y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="G">GGGGG y-MM-dd, E – GGGGG y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="G">G y-MM-dd, E – G y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">G y-MM-dd, E – y-MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">G y MMM – G y MMM</greatestDifference>
@@ -1728,7 +1781,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">Saka</era>
+						<era type="0">Śaka</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -1817,6 +1870,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</eraNames>
 					<eraAbbr>
 						<era type="0">AH</era>
+						<era type="1">BH</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -2070,7 +2124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM 'week' W</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
@@ -2844,8 +2898,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">Before R.O.C.</era>
-						<era type="1">R.O.C.</era>
+						<era type="0">BROC</era>
+						<era type="1">ROC</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
@@ -3189,6 +3243,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
+			<gmtUnknownFormat>GMT+?</gmtUnknownFormat>
 			<regionFormat>{0}</regionFormat>
 			<regionFormat type="daylight">{0} (+1)</regionFormat>
 			<regionFormat type="standard">{0} (+0)</regionFormat>
@@ -3198,12 +3253,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>UTC</standard>
 				</short>
 			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>Tirana</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Showa</exemplarCity>
+			</zone>
 			<zone type="Antarctica/DumontDUrville">
 				<exemplarCity>Dumont-d’Urville</exemplarCity>
 			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>Río Gallegos</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>Tucumán</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>Córdoba</exemplarCity>
+			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>St. Barthélemy</exemplarCity>
 			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>Eirunepé</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>Cuiabá</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>Santarém</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>Belém</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>Araguaína</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>São Paulo</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>Maceió</exemplarCity>
+			</zone>
 			<zone type="America/Noronha">
 				<exemplarCity>Fernando de Noronha</exemplarCity>
 			</zone>
@@ -3213,12 +3304,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Johns">
 				<exemplarCity>St. John’s</exemplarCity>
 			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>Ürümqi</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>Bogotá</exemplarCity>
+			</zone>
 			<zone type="America/Curacao">
 				<exemplarCity>Curaçao</exemplarCity>
 			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>Büsingen</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Galápagos</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>El Aaiún</exemplarCity>
+			</zone>
 			<zone type="Africa/Asmera">
 				<exemplarCity>Asmara</exemplarCity>
 			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>Canarias</exemplarCity>
+			</zone>
 			<zone type="Pacific/Truk">
 				<exemplarCity>Chuuk</exemplarCity>
 			</zone>
@@ -3237,39 +3346,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Calcutta">
 				<exemplarCity>Kolkata</exemplarCity>
 			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>Canton</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>Comores</exemplarCity>
+			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>St. Kitts</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
 				<exemplarCity>St. Lucia</exemplarCity>
 			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>Chișinău</exemplarCity>
+			</zone>
 			<zone type="Asia/Rangoon">
 				<exemplarCity>Yangon</exemplarCity>
 			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>Khovd</exemplarCity>
+			</zone>
 			<zone type="Asia/Macau">
 				<exemplarCity>Macao</exemplarCity>
 			</zone>
 			<zone type="America/Ciudad_Juarez">
 				<exemplarCity>Ciudad Juárez</exemplarCity>
 			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>Mazatlán</exemplarCity>
+			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahía de Banderas</exemplarCity>
 			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>Ciudad de México</exemplarCity>
+			</zone>
 			<zone type="America/Merida">
 				<exemplarCity>Mérida</exemplarCity>
 			</zone>
 			<zone type="America/Cancun">
 				<exemplarCity>Cancún</exemplarCity>
 			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>Nouméa</exemplarCity>
+			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Kathmandu</exemplarCity>
 			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>Saint-Pierre</exemplarCity>
+			</zone>
 			<zone type="America/Asuncion">
 				<exemplarCity>Asunción</exemplarCity>
 			</zone>
 			<zone type="Indian/Reunion">
 				<exemplarCity>Réunion</exemplarCity>
 			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>Mahé</exemplarCity>
+			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>St. Helena</exemplarCity>
 			</zone>
@@ -3279,6 +3415,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Lower_Princes">
 				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
 			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>N’Djamena</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>Lomé</exemplarCity>
+			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kyiv</exemplarCity>
 			</zone>
@@ -3324,6 +3466,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Chi Minh</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis &amp; Futuna</exemplarCity>
+			</zone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
@@ -3332,9 +3477,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<native>latn</native>
 		</otherNumberingSystems>
 		<minimumGroupingDigits>1</minimumGroupingDigits>
-		<symbols>
-			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
-		</symbols>
 		<symbols numberSystem="adlm">
 			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
 		</symbols>
@@ -3593,6 +3735,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<symbols numberSystem="tnsa">
 			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
 		</symbols>
+		<symbols numberSystem="tols">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
 		<symbols numberSystem="vaii">
 			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
 		</symbols>
@@ -3602,9 +3747,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<symbols numberSystem="wcho">
 			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
 		</symbols>
-		<decimalFormats>
-			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
-		</decimalFormats>
 		<decimalFormats numberSystem="adlm">
 			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
 		</decimalFormats>
@@ -3850,6 +3992,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<decimalFormats numberSystem="tnsa">
 			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
 		</decimalFormats>
+		<decimalFormats numberSystem="tols">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
 		<decimalFormats numberSystem="vaii">
 			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
 		</decimalFormats>
@@ -3859,9 +4004,240 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<decimalFormats numberSystem="wcho">
 			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
 		</decimalFormats>
-		<scientificFormats>
-			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
-		</scientificFormats>
+		<rationalFormats numberSystem="adlm">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="ahom">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="arab">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="arabext">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="bali">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="beng">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="bhks">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="brah">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="cakm">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="cham">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="deva">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="diak">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="fullwide">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="gara">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="gong">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="gonm">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="gujr">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="gukh">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="guru">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="hanidec">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="hmng">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="hmnp">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="java">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="kali">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="kawi">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="khmr">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="knda">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="krai">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="lana">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="lanatham">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="laoo">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="latn">
+			<rationalPattern>{0}⁄{1}</rationalPattern>
+			<integerAndRationalPattern>{0} {1}</integerAndRationalPattern>
+			<integerAndRationalPattern alt="superSub">{0}⁠{1}</integerAndRationalPattern>
+			<rationalUsage>sometimes</rationalUsage>
+		</rationalFormats>
+		<rationalFormats numberSystem="lepc">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="limb">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mathbold">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mathdbl">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mathmono">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mathsanb">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mathsans">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mlym">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="modi">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mong">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mroo">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mtei">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mymr">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mymrepka">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mymrpao">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mymrshan">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="mymrtlng">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="nagm">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="newa">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="nkoo">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="olck">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="onao">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="orya">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="osma">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="outlined">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="rohg">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="saur">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="segment">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="shrd">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="sind">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="sinh">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="sora">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="sund">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="sunu">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="takr">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="talu">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="tamldec">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="telu">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="thai">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="tibt">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="tirh">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="tnsa">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="vaii">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="wara">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
+		<rationalFormats numberSystem="wcho">
+			<alias source="locale" path="../rationalFormats[@numberSystem='latn']"/>
+		</rationalFormats>
 		<scientificFormats numberSystem="adlm">
 			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
 		</scientificFormats>
@@ -4088,6 +4464,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<scientificFormats numberSystem="tnsa">
 			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
 		</scientificFormats>
+		<scientificFormats numberSystem="tols">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
 		<scientificFormats numberSystem="vaii">
 			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
 		</scientificFormats>
@@ -4097,9 +4476,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<scientificFormats numberSystem="wcho">
 			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
 		</scientificFormats>
-		<percentFormats>
-			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
-		</percentFormats>
 		<percentFormats numberSystem="adlm">
 			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
 		</percentFormats>
@@ -4330,6 +4706,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<percentFormats numberSystem="tnsa">
 			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
 		</percentFormats>
+		<percentFormats numberSystem="tols">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
 		<percentFormats numberSystem="vaii">
 			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
 		</percentFormats>
@@ -4339,9 +4718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<percentFormats numberSystem="wcho">
 			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
 		</percentFormats>
-		<currencyFormats>
-			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
-		</currencyFormats>
 		<currencyFormats numberSystem="adlm">
 			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
 		</currencyFormats>
@@ -4614,6 +4990,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencyFormats numberSystem="tnsa">
 			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
 		</currencyFormats>
+		<currencyFormats numberSystem="tols">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
 		<currencyFormats numberSystem="vaii">
 			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
 		</currencyFormats>
@@ -4878,6 +5257,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="RWF">
 				<symbol alt="narrow">RF</symbol>
 			</currency>
+			<currency type="SAR">
+				<symbol alt="variant">⃁</symbol>
+			</currency>
 			<currency type="SBD">
 				<symbol alt="narrow">$</symbol>
 			</currency>
@@ -5187,6 +5569,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<miscPatterns numberSystem="tnsa">
 			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
 		</miscPatterns>
+		<miscPatterns numberSystem="tols">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
 		<miscPatterns numberSystem="vaii">
 			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
 		</miscPatterns>
@@ -5405,7 +5790,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>item</displayName>
 				<unitPattern count="other">{0} item</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>part</displayName>
+				<unitPattern count="other">{0} part</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="other">{0} ppm</unitPattern>
 			</unit>
@@ -5425,6 +5814,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mol</displayName>
 				<unitPattern count="other">{0} mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glucose</displayName>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>L/km</displayName>
 				<unitPattern count="other">{0} L/km</unitPattern>
@@ -5866,6 +6259,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mm Hg</displayName>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>Hg</displayName>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>psi</displayName>
 				<unitPattern count="other">{0} psi</unitPattern>
@@ -6009,6 +6406,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mcup</displayName>
 				<unitPattern count="other">{0} mc</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m.</displayName>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ac ft</displayName>
 				<unitPattern count="other">{0} ac ft</unitPattern>
@@ -6035,10 +6436,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>pt</displayName>
 				<unitPattern count="other">{0} pt</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>pint Imp.</displayName>
+				<unitPattern count="other">{0} pt Imp.</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>cup</displayName>
 				<unitPattern count="other">{0} c</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>cup Imp.</displayName>
+				<unitPattern count="other">{0} cup Imp.</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>US fl oz</displayName>
 				<unitPattern count="other">{0} fl oz US</unitPattern>
@@ -6087,11 +6496,163 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>qt Imp</displayName>
 				<unitPattern count="other">{0} qt Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>sr</displayName>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>kat</displayName>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>C</displayName>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>F</displayName>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>H</displayName>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>S</displayName>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorie-IT</displayName>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>BTU-IT</displayName>
+				<unitPattern count="other">{0} BTU-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bq</displayName>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Sv</displayName>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gy</displayName>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kgf</displayName>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>rod</displayName>
+				<unitPattern count="other">{0} rod</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>chain</displayName>
+				<unitPattern count="other">{0} chain</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>T</displayName>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Wb</displayName>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>°R</displayName>
+				<unitPattern count="other">{0} °R</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>fortnight</displayName>
+				<unitPattern count="other">{0} fw</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>slug</displayName>
+				<unitPattern count="other">{0} slug</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>gas E</displayName>
+				<unitPattern count="other">{0} gas E</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>rin [JP]</displayName>
+				<unitPattern count="other">{0} rin [JP]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>sun [JP]</displayName>
+				<unitPattern count="other">{0} sun [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>shaku [JP]</displayName>
+				<unitPattern count="other">{0} shaku [JP]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>shaku [cloth, JP]</displayName>
+				<unitPattern count="other">{0} shaku [cloth, JP]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ken [JP]</displayName>
+				<unitPattern count="other">{0} ken [JP]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>jo [JP]</displayName>
+				<unitPattern count="other">{0} jo [JP]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ri [JP]</displayName>
+				<unitPattern count="other">{0} ri [JP]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>bu [JP]</displayName>
+				<unitPattern count="other">{0} bu [JP]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>se [JP]</displayName>
+				<unitPattern count="other">{0} se [JP]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>cho [JP]</displayName>
+				<unitPattern count="other">{0} cho [JP]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>kosaji [JP]</displayName>
+				<unitPattern count="other">{0} kosaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>osaji [JP]</displayName>
+				<unitPattern count="other">{0} osaji [JP]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>cup [JP]</displayName>
+				<unitPattern count="other">{0} cup [JP]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>shaku [vol, JP]</displayName>
+				<unitPattern count="other">{0} shaku [vol, JP]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>sai [JP]</displayName>
+				<unitPattern count="other">{0} sai [JP]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>to [JP]</displayName>
+				<unitPattern count="other">{0} to [JP]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>koku [JP]</displayName>
+				<unitPattern count="other">{0} koku [JP]</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>light</displayName>
 				<unitPattern count="other">{0} light</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="mass-fun">
+				<displayName>fun [JP]</displayName>
+				<unitPattern count="other">{0} fun [JP]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ppb</displayName>
 				<unitPattern count="other">{0} ppb</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/ru.xml b/make/data/cldr/common/main/ru.xml
index f01b65479ab..15c63dc621f 100644
--- a/make/data/cldr/common/main/ru.xml
+++ b/make/data/cldr/common/main/ru.xml
@@ -293,6 +293,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафия</language>
 			<language type="ksh">кёльнский</language>
 			<language type="ku">курдский</language>
+			<language type="ku" menu="core">курдский</language>
+			<language type="ku" menu="extension">курманджи</language>
 			<language type="kum">кумыкский</language>
 			<language type="kut">кутенаи</language>
 			<language type="kv">коми</language>
@@ -854,6 +856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Китай</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">о-в Клиппертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -1131,35 +1134,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">числовая сортировка</key>
 			<key type="colStrength">эффективность сортировки</key>
 			<key type="currency">валюта</key>
+			<key type="em">представление эмодзи</key>
 			<key type="hc">формат времени (12- или 24-часовой)</key>
 			<key type="lb">стиль перевода строки</key>
+			<key type="lw">стиль переноса слов</key>
 			<key type="ms">система мер</key>
 			<key type="numbers">цифры</key>
+			<key type="ss">разрыв предложения после сокращения</key>
 			<key type="timezone">часовой пояс</key>
 			<key type="va">вариант региональных настроек</key>
 			<key type="x">частное</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">буддийский календарь</type>
+			<type key="calendar" type="buddhist" scope="core">буддийский</type>
 			<type key="calendar" type="chinese">китайский календарь</type>
+			<type key="calendar" type="chinese" scope="core">китайский</type>
 			<type key="calendar" type="coptic">коптский календарь</type>
+			<type key="calendar" type="coptic" scope="core">коптский</type>
 			<type key="calendar" type="dangi">календарь данги</type>
+			<type key="calendar" type="dangi" scope="core">данги</type>
 			<type key="calendar" type="ethiopic">эфиопский календарь</type>
+			<type key="calendar" type="ethiopic" scope="core">эфиопский</type>
 			<type key="calendar" type="ethiopic-amete-alem">эфиопский календарь амете-алем</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">эфиопский (амете-алем)</type>
 			<type key="calendar" type="gregorian">григорианский календарь</type>
+			<type key="calendar" type="gregorian" scope="core">григорианский</type>
 			<type key="calendar" type="hebrew">еврейский календарь</type>
+			<type key="calendar" type="hebrew" scope="core">еврейский</type>
 			<type key="calendar" type="indian">Национальный календарь Индии</type>
 			<type key="calendar" type="islamic">календарь хиджры</type>
+			<type key="calendar" type="islamic" scope="core">хиджра</type>
 			<type key="calendar" type="islamic-civil">гражданский календарь хиджры (табличный)</type>
+			<type key="calendar" type="islamic-civil" scope="core">хиджра (табличный, гражданский)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">исламский календарь (Саудовская Аравия)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">исламский календарь (табличный, астрономическая эпоха)</type>
 			<type key="calendar" type="islamic-umalqura">календарь хиджры (Умм аль-Кура)</type>
-			<type key="calendar" type="iso8601">календарь ISO-8601</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">хиджра (Умм аль-Кура)</type>
+			<type key="calendar" type="iso8601">григорианский (сначала год)</type>
 			<type key="calendar" type="japanese">японский календарь</type>
+			<type key="calendar" type="japanese" scope="core">японский</type>
 			<type key="calendar" type="persian">персидский календарь</type>
+			<type key="calendar" type="persian" scope="core">персидский</type>
 			<type key="calendar" type="roc">календарь Миньго</type>
+			<type key="calendar" type="roc" scope="core">Миньго</type>
 			<type key="cf" type="account">финансовый формат</type>
+			<type key="cf" type="account" scope="core">финансовый</type>
 			<type key="cf" type="standard">стандартный формат</type>
+			<type key="cf" type="standard" scope="core">стандартный</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Сортировка символов</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Сортировка без учета символов</type>
 			<type key="colBackwards" type="no" draft="contributed">Сортировка по акцентам в обычном порядке</type>
@@ -1169,23 +1191,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Приоритетная сортировка слов в верхнем регистре</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Сортировка вне зависимости от регистра</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Сортировка с учетом регистра</type>
-			<type key="collation" type="big5han">традиционный китайский - Big5</type>
 			<type key="collation" type="compat">совместимый порядок сортировки</type>
+			<type key="collation" type="compat" scope="core">совместимый</type>
 			<type key="collation" type="dictionary">словарный порядок сортировки</type>
+			<type key="collation" type="dictionary" scope="core">словарный</type>
 			<type key="collation" type="ducet">cтандартная сортировка Unicode</type>
+			<type key="collation" type="ducet" scope="core">стандартный (Unicode)</type>
 			<type key="collation" type="emoji" draft="contributed">эмодзи</type>
 			<type key="collation" type="eor" draft="contributed">европейские правила сортировки</type>
-			<type key="collation" type="gb2312han">упрощенный китайский - GB2312</type>
 			<type key="collation" type="phonebook">порядок телефонной книги</type>
+			<type key="collation" type="phonebook" scope="core">телефонная книга</type>
 			<type key="collation" type="phonetic">фонетический порядок сортировки</type>
+			<type key="collation" type="phonetic" scope="core">фонетический</type>
 			<type key="collation" type="pinyin">пиньинь</type>
+			<type key="collation" type="pinyin" scope="core">пиньинь</type>
 			<type key="collation" type="search">поиск</type>
+			<type key="collation" type="search" scope="core">поиск</type>
 			<type key="collation" type="searchjl" draft="contributed">Поиск по первой согласной хангыль</type>
 			<type key="collation" type="standard">стандартная сортировка</type>
+			<type key="collation" type="standard" scope="core">стандартный</type>
 			<type key="collation" type="stroke">по чертам</type>
+			<type key="collation" type="stroke" scope="core">по чертам</type>
 			<type key="collation" type="traditional">традиционный порядок</type>
+			<type key="collation" type="traditional" scope="core">традиционный</type>
 			<type key="collation" type="unihan">сортировка по ключам, затем по чертам</type>
+			<type key="collation" type="unihan" scope="core">по ключам, затем по чертам</type>
 			<type key="collation" type="zhuyin">чжуинь</type>
+			<type key="collation" type="zhuyin" scope="core">чжуинь</type>
 			<type key="colNormalization" type="no" draft="contributed">Сортировка без нормализации</type>
 			<type key="colNormalization" type="yes" draft="contributed">Сортировка нормализованных символов Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Отдельная сортировка числовых значений</type>
@@ -1198,18 +1230,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">полноширинные символы</type>
 			<type key="d0" type="hwidth">полуширинные символы</type>
 			<type key="d0" type="npinyin" draft="contributed">Числовая</type>
+			<type key="em" type="default" scope="core">по умолчанию</type>
+			<type key="em" type="emoji" scope="core">эмодзи</type>
+			<type key="em" type="text" scope="core">текстовые символы</type>
 			<type key="hc" type="h11">12-часовой формат времени (0–11)</type>
+			<type key="hc" type="h11" scope="core">12-часовой (0–11)</type>
 			<type key="hc" type="h12">12-часовой формат времени (1–12)</type>
+			<type key="hc" type="h12" scope="core">12-часовой (1–12)</type>
 			<type key="hc" type="h23">24-часовой формат времени (0–23)</type>
+			<type key="hc" type="h23" scope="core">24-часовой (0–23)</type>
 			<type key="hc" type="h24">24-часовой формат времени (1–24)</type>
+			<type key="hc" type="h24" scope="core">24-часовой (1–24)</type>
 			<type key="lb" type="loose">мягкий перевод строки</type>
+			<type key="lb" type="loose" scope="core">мягкий</type>
 			<type key="lb" type="normal">обычный перевод строки</type>
+			<type key="lb" type="normal" scope="core">обычный</type>
 			<type key="lb" type="strict">жесткий перевод строки</type>
+			<type key="lb" type="strict" scope="core">жесткий</type>
+			<type key="lw" type="breakall" scope="core">переносить все</type>
+			<type key="lw" type="keepall" scope="core">сохранять все</type>
+			<type key="lw" type="normal" scope="core">обычный стиль</type>
+			<type key="lw" type="phrase" scope="core">сохранять во фразах</type>
 			<type key="m0" type="bgn">система транслитерации BGN</type>
 			<type key="m0" type="ungegn">система транслитерации ООН</type>
 			<type key="ms" type="metric">метрическая система</type>
+			<type key="ms" type="metric" scope="core">метрическая</type>
 			<type key="ms" type="uksystem">британская система мер</type>
+			<type key="ms" type="uksystem" scope="core">британская</type>
 			<type key="ms" type="ussystem">американская система мер</type>
+			<type key="ms" type="ussystem" scope="core">американская</type>
 			<type key="numbers" type="arab">арабско-индийские цифры</type>
 			<type key="numbers" type="arabext">расширенная система арабско-индийских цифр</type>
 			<type key="numbers" type="armn">армянские цифры</type>
@@ -1271,6 +1320,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">тибетские цифры</type>
 			<type key="numbers" type="traditional" draft="contributed">Традиционная система нумерации</type>
 			<type key="numbers" type="vaii">цифры ваи</type>
+			<type key="ss" type="none" scope="core">выключено</type>
+			<type key="ss" type="standard" scope="core">включено</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Метрическая</measurementSystemName>
@@ -1338,13 +1389,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[{а́} {е́} {и́} {о́} {у́} {ы́} {э́} {ю́} {я́}]</exemplarCharacters>
 		<exemplarCharacters type="index">[А Б В Г Д ЕЁ Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ы Э Ю Я]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[. / A B C D E F I L M V X]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[· + &lt; = &gt; ~ №]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‑ . '’ ( )]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1485,11 +1536,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0" draft="contributed">до Диоклетиана</era>
 						<era type="1" draft="contributed">от Диоклетиана</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="contributed">до Диокл.</era>
 						<era type="1" draft="contributed">от Диокл.</era>
 					</eraAbbr>
 				</eras>
@@ -1514,16 +1563,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0" draft="contributed">до воплощения Христа</era>
-						<era type="1" draft="contributed">от воплощения Христа</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">до Христа</era>
-						<era type="1" draft="contributed">от Христа</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1557,6 +1596,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1565,6 +1607,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1577,21 +1622,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">ccc, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">ccc, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">ccc, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">ccc HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">ccc, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">ccc HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'ч'. v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1610,48 +1661,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyQQQQ">QQQQ y 'г'. G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} — {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">h B — h B</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
-							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="B">h:mm B — h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm — h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm — h:mm B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">y 'г'. G – y 'г'. G</greatestDifference>
+							<greatestDifference id="G">y 'г'. G — y 'г'. G</greatestDifference>
 							<greatestDifference id="y">y–y 'гг'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">MM.y G – MM.y G</greatestDifference>
-							<greatestDifference id="M">MM.y – MM.y G</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y G</greatestDifference>
+							<greatestDifference id="G">MM.y G — MM.y G</greatestDifference>
+							<greatestDifference id="M">MM.y — MM.y G</greatestDifference>
+							<greatestDifference id="y">MM.y — MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="G">dd.MM.y G – dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">dd.MM.y — dd.MM.y G</greatestDifference>
+							<greatestDifference id="G">dd.MM.y G — dd.MM.y G</greatestDifference>
+							<greatestDifference id="M">dd.MM.y — dd.MM.y G</greatestDifference>
+							<greatestDifference id="y">dd.MM.y — dd.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="G">ccc, dd.MM.y G – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">ccc, dd.MM.y — ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="G">ccc, dd.MM.y G — ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="M">ccc, dd.MM.y — ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="y">ccc, dd.MM.y — ccc, dd.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">LLL y 'г'. G – LLL y 'г'. G</greatestDifference>
-							<greatestDifference id="M">LLL – LLL y 'г'. G</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y 'гг'. G</greatestDifference>
+							<greatestDifference id="G">LLL y 'г'. G — LLL y 'г'. G</greatestDifference>
+							<greatestDifference id="M">LLL — LLL y 'г'. G</greatestDifference>
+							<greatestDifference id="y">LLL y — LLL y 'гг'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
 							<greatestDifference id="d">d–d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="G">d MMM y 'г'. G – d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y 'гг'. G</greatestDifference>
+							<greatestDifference id="G">d MMM y 'г'. G — d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="M">d MMM — d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="y">d MMM y — d MMM y 'гг'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="G">ccc, d MMM y 'г'. G – ccc, d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="y">ccc, d MMM y – ccc, d MMM y 'гг'. G</greatestDifference>
+							<greatestDifference id="d">ccc, d MMM — ccc, d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="G">ccc, d MMM y 'г'. G — ccc, d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="M">ccc, d MMM — ccc, d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="y">ccc, d MMM y — ccc, d MMM y 'гг'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
@@ -1689,61 +1744,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
+							<greatestDifference id="d">dd.MM — dd.MM</greatestDifference>
+							<greatestDifference id="M">dd.MM — dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
+							<greatestDifference id="d">E, dd.MM — E, dd.MM</greatestDifference>
+							<greatestDifference id="M">E, dd.MM — E, dd.MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL – LLL</greatestDifference>
+							<greatestDifference id="M">LLL — LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM — d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM</greatestDifference>
+							<greatestDifference id="d">ccc, d MMM — ccc, d MMM</greatestDifference>
+							<greatestDifference id="M">ccc, d MMM — ccc, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL – LLLL</greatestDifference>
+							<greatestDifference id="M">LLLL — LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y 'гг'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.y – MM.y G</greatestDifference>
-							<greatestDifference id="y">MM.y – MM.y G</greatestDifference>
+							<greatestDifference id="M">MM.y — MM.y G</greatestDifference>
+							<greatestDifference id="y">MM.y — MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">dd.MM.y – dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">dd.MM.y – dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">dd.MM.y — dd.MM.y G</greatestDifference>
+							<greatestDifference id="M">dd.MM.y — dd.MM.y G</greatestDifference>
+							<greatestDifference id="y">dd.MM.y — dd.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="M">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
-							<greatestDifference id="y">ccc, dd.MM.y – ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="d">ccc, dd.MM.y — ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="M">ccc, dd.MM.y — ccc, dd.MM.y G</greatestDifference>
+							<greatestDifference id="y">ccc, dd.MM.y — ccc, dd.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL – LLL y 'г'. G</greatestDifference>
-							<greatestDifference id="y">LLL y 'г'. – LLL y 'г'. G</greatestDifference>
+							<greatestDifference id="M">LLL — LLL y 'г'. G</greatestDifference>
+							<greatestDifference id="y">LLL y 'г'. — LLL y 'г'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="y">d MMM y 'г'. – d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="M">d MMM — d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="y">d MMM y 'г'. — d MMM y 'г'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">ccc, d MMM – ccc, d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="M">ccc, d MMM – ccc, d MMM y 'г'. G</greatestDifference>
-							<greatestDifference id="y">ccc, d MMM y 'г'. – ccc, d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="d">ccc, d MMM — ccc, d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="M">ccc, d MMM — ccc, d MMM y 'г'. G</greatestDifference>
+							<greatestDifference id="y">ccc, d MMM y 'г'. — ccc, d MMM y 'г'. G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL – LLLL y 'г'. G</greatestDifference>
-							<greatestDifference id="y">LLLL y 'г'. – LLLL y 'г'. G</greatestDifference>
+							<greatestDifference id="M">LLLL — LLLL y 'г'. G</greatestDifference>
+							<greatestDifference id="y">LLLL y 'г'. — LLLL y 'г'. G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1987,6 +2042,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1995,6 +2053,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2007,21 +2068,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">ccc, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">ccc, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">ccc, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyM">MM.y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd.MM.y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'ч'. v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
@@ -2034,7 +2101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="MMMMW" count="other">W-'я' 'неделя' MMMM</dateFormatItem>
 						<dateFormatItem id="yM">MM.y</dateFormatItem>
 						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
-						<dateFormatItem id="yMEd">ccc, dd.MM.y 'г'.</dateFormatItem>
+						<dateFormatItem id="yMEd">ccc, dd.MM.y</dateFormatItem>
 						<dateFormatItem id="yMM">MM.y</dateFormatItem>
 						<dateFormatItem id="yMMM">LLL y 'г'.</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMM y 'г'.</dateFormatItem>
@@ -2089,7 +2156,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'ч'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -2103,7 +2172,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'ч'. v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -3682,6 +3753,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>о-в Пасхи</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">Койайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Аренас</exemplarCity>
 			</zone>
@@ -3947,10 +4021,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>о-в Эндербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>Кантон</exemplarCity>
+				<exemplarCity>о-в Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Киритимати</exemplarCity>
@@ -4626,9 +4697,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западная Африка</generic>
-					<standard>Западная Африка, стандартное время</standard>
-					<daylight>Западная Африка, летнее время</daylight>
+					<standard>Западная Африка</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -5016,6 +5085,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гайана</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайско-алеутское стандартное время</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавайско-алеутское время</generic>
@@ -5466,6 +5540,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Трук</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">Турецкое время</generic>
+					<standard draft="contributed">Турецкое стандартное время</standard>
+					<daylight draft="contributed">Турецкое летнее время</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Туркменистан</generic>
@@ -5643,6 +5724,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="latn">
+			<integerAndRationalPattern>{0} {1}</integerAndRationalPattern>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -5654,7 +5738,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber" draft="contributed">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -7116,6 +7203,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">восточно-карибских долларов</displayName>
 				<displayName count="other">восточно-карибского доллара</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">карибский гульден</displayName>
+				<displayName count="one">карибский гульден</displayName>
+				<displayName count="few">карибских гульдена</displayName>
+				<displayName count="many">карибских гульденов</displayName>
+				<displayName count="other">карибского гульдена</displayName>
+				<symbol draft="contributed">Cg</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>СДР (специальные права заимствования)</displayName>
 			</currency>
@@ -7214,6 +7309,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Доллар Зимбабве</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>зимбабвийский золотой</displayName>
+				<displayName count="one">зимбабвийский золотой</displayName>
+				<displayName count="few">зимбабвийских золотых</displayName>
+				<displayName count="many">зимбабвийских золотых</displayName>
+				<displayName count="other">зимбабвийского золотого</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Доллар Зимбабве (2009)</displayName>
 			</currency>
@@ -8023,7 +8125,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} объекта</unitPattern>
 				<unitPattern count="other" case="prepositional">{0} объекта</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">части</displayName>
+				<unitPattern count="one" draft="contributed">{0} часть</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} части</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} частей</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} части</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>миллионные доли</displayName>
 				<unitPattern count="one">{0} миллионная доля</unitPattern>
@@ -8166,6 +8275,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} моля</unitPattern>
 				<unitPattern count="other" case="prepositional">{0} моля</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>литры на километр</displayName>
@@ -10789,6 +10905,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental" draft="contributed">{0} миллиметра ртутного столба</unitPattern>
 				<unitPattern count="other" case="prepositional" draft="contributed">{0} миллиметра ртутного столба</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ртутного столба</displayName>
+				<unitPattern count="one">{0} ртутного столба</unitPattern>
+				<unitPattern count="few">{0} ртутного столба</unitPattern>
+				<unitPattern count="many">{0} ртутного столба</unitPattern>
+				<unitPattern count="other">{0} ртутного столба</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунты на квадратный дюйм</displayName>
 				<unitPattern count="one">{0} фунт на квадратный дюйм</unitPattern>
@@ -11665,6 +11788,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} метрической чашки</unitPattern>
 				<unitPattern count="other" case="prepositional">{0} метрической чашки</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">метрические жидкие унции</displayName>
+				<unitPattern count="one" draft="contributed">{0} метрическая жидкая унция</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} метрические жидкие унции</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} метрических жидких унций</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} метрической жидкой унции</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акрофуты</displayName>
 				<unitPattern count="one">{0} акрофут</unitPattern>
@@ -12167,7 +12297,105 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} имп. кварты</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} имп. кварты</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName draft="contributed">стерадианы</displayName>
+				<unitPattern count="one" draft="contributed">{0} стерадиан</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} стерадиана</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} стерадиан</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} стерадиана</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">каталы</displayName>
+				<unitPattern count="one" draft="contributed">{0} катал</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} катала</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} катал</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">кулоны</displayName>
+				<unitPattern count="one" draft="contributed">{0} кулон</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} кулона</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} кулон</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">фарады</displayName>
+				<unitPattern count="one" draft="contributed">{0} фарад</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} фарада</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} фарад</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">генри</displayName>
+				<unitPattern count="one" draft="contributed">{0} генри</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} генри</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} генри</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} генри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">сименсы</displayName>
+				<unitPattern count="one" draft="contributed">{0} сименс</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} сименса</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} сименс</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} сименса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>международные калории</displayName>
+				<unitPattern count="one">{0} международная калория</unitPattern>
+				<unitPattern count="few">{0} международные калории</unitPattern>
+				<unitPattern count="many">{0} международных калорий</unitPattern>
+				<unitPattern count="other">{0} международной калории</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">беккерели</displayName>
+				<unitPattern count="one" draft="contributed">{0} беккерель</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} беккереля</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} беккерелей</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} беккереля</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">зиверты</displayName>
+				<unitPattern count="one" draft="contributed">{0} зиверт</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} зиверта</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} зиверт</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} зиверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">греи</displayName>
+				<unitPattern count="one" draft="contributed">{0} грей</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} грея</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} греев</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} грея</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограмм-силы</displayName>
+				<unitPattern count="one">{0} килограмм-сила</unitPattern>
+				<unitPattern count="few">{0} килограмм-силы</unitPattern>
+				<unitPattern count="many">{0} килограмм-сил</unitPattern>
+				<unitPattern count="other">{0} килограмм-силы</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">теслы</displayName>
+				<unitPattern count="one" draft="contributed">{0} тесла</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} теслы</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} тесл</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} теслы</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">веберы</displayName>
+				<unitPattern count="one" draft="contributed">{0} вебер</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} вебера</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} веберов</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} вебера</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">скорости света</displayName>
+				<unitPattern count="one" draft="contributed">{0} скорость света</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} скорости света</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} скоростей света</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} скорости света</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>миллиардные доли</displayName>
 				<unitPattern count="one">{0} миллиардная доля</unitPattern>
@@ -12468,6 +12696,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} объектов</unitPattern>
 				<unitPattern count="other">{0} объекта</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName draft="contributed">ч.</displayName>
+				<unitPattern count="one" draft="contributed">{0} ч.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ч.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ч.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ч.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="few">{0} %</unitPattern>
@@ -12493,6 +12728,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} моль</unitPattern>
 				<unitPattern count="other">{0} моль</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -13196,6 +13438,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мм рт. ст.</unitPattern>
 				<unitPattern count="other">{0} мм рт. ст.</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. ст.</displayName>
+				<unitPattern count="one">{0} рт. ст.</unitPattern>
+				<unitPattern count="few">{0} рт. ст.</unitPattern>
+				<unitPattern count="many">{0} рт. ст.</unitPattern>
+				<unitPattern count="other">{0} рт. ст.</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ф. на дюйм²</displayName>
 				<unitPattern count="one">{0} ф/дюйм²</unitPattern>
@@ -13428,6 +13677,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} м. чаш.</unitPattern>
 				<unitPattern count="other">{0} м. чаш.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">м. жидк. унц.</displayName>
+				<unitPattern count="one" draft="contributed">{0} м. жидк. унц.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} м. жидк. унц.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} м. жидк. унц.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} м. жидк. унц.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акрофут.</displayName>
 				<unitPattern count="one">{0} акрофут</unitPattern>
@@ -13563,6 +13819,104 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} имп. кварт.</unitPattern>
 				<unitPattern count="other">{0} имп. кварт.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="contributed">ср</displayName>
+				<unitPattern count="one" draft="contributed">{0} ср</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ср</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ср</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">кат</displayName>
+				<unitPattern count="one" draft="contributed">{0} кат</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} кат</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} кат</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">Кл</displayName>
+				<unitPattern count="one" draft="contributed">{0} Кл</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Кл</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Кл</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">Ф</displayName>
+				<unitPattern count="one" draft="contributed">{0} Ф</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Ф</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Ф</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">Гн</displayName>
+				<unitPattern count="one" draft="contributed">{0} Гн</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Гн</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Гн</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">См</displayName>
+				<unitPattern count="one" draft="contributed">{0} См</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} См</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} См</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калм</displayName>
+				<unitPattern count="one">{0} калм</unitPattern>
+				<unitPattern count="few">{0} калм</unitPattern>
+				<unitPattern count="many">{0} калм</unitPattern>
+				<unitPattern count="other">{0} калм</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">Бк</displayName>
+				<unitPattern count="one" draft="contributed">{0} Бк</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Бк</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Бк</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">Зв</displayName>
+				<unitPattern count="one" draft="contributed">{0} Зв</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Зв</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Зв</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">Гр</displayName>
+				<unitPattern count="one" draft="contributed">{0} Гр</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Гр</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Гр</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">Тл</displayName>
+				<unitPattern count="one" draft="contributed">{0} Тл</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Тл</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Тл</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">Вб</displayName>
+				<unitPattern count="one" draft="contributed">{0} Вб</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Вб</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Вб</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">ск. света</displayName>
+				<unitPattern count="one" draft="contributed">{0} ск. света</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ск. света</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ск. света</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ск. света</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>ноч.</displayName>
 				<unitPattern count="one">{0} ноч.</unitPattern>
@@ -13580,12 +13934,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="concentr-part">
+				<displayName draft="contributed">ч.</displayName>
+				<unitPattern count="one" draft="contributed">{0} ч.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ч.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ч.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ч.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0}%</unitPattern>
 				<unitPattern count="few">{0}%</unitPattern>
 				<unitPattern count="many">{0}%</unitPattern>
 				<unitPattern count="other">{0}%</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>ми/имп. гал</displayName>
 				<unitPattern count="one">{0} ми/имп. гал</unitPattern>
@@ -13664,19 +14032,123 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} стн</unitPattern>
 				<unitPattern count="other">{0} стн</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. ст.</displayName>
+				<unitPattern count="one">{0} рт. ст.</unitPattern>
+				<unitPattern count="few">{0} рт. ст.</unitPattern>
+				<unitPattern count="many">{0} рт. ст.</unitPattern>
+				<unitPattern count="other">{0} рт. ст.</unitPattern>
+			</unit>
 			<unit type="temperature-fahrenheit">
 				<unitPattern count="one">{0}°F</unitPattern>
 				<unitPattern count="few">{0} °F</unitPattern>
 				<unitPattern count="many">{0}°F</unitPattern>
 				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ноч.</displayName>
-				<unitPattern count="one">{0} ноч.</unitPattern>
-				<unitPattern count="few">{0} ноч.</unitPattern>
-				<unitPattern count="many">{0} ноч.</unitPattern>
-				<unitPattern count="other">{0} ноч.</unitPattern>
-				<perUnitPattern>{0}/ноч.</perUnitPattern>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">м. жидк. унц.</displayName>
+				<unitPattern count="one" draft="contributed">{0} м. жидк. унц.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} м. жидк. унц.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} м. жидк. унц.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} м. жидк. унц.</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="contributed">ср</displayName>
+				<unitPattern count="one" draft="contributed">{0} ср</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ср</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ср</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">кат</displayName>
+				<unitPattern count="one" draft="contributed">{0} кат</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} кат</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} кат</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">Кл</displayName>
+				<unitPattern count="one" draft="contributed">{0} Кл</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Кл</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Кл</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">Ф</displayName>
+				<unitPattern count="one" draft="contributed">{0} Ф</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Ф</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Ф</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">Гн</displayName>
+				<unitPattern count="one" draft="contributed">{0} Гн</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Гн</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Гн</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">См</displayName>
+				<unitPattern count="one" draft="contributed">{0} См</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} См</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} См</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калм</displayName>
+				<unitPattern count="one">{0} калм</unitPattern>
+				<unitPattern count="few">{0} калм</unitPattern>
+				<unitPattern count="many">{0} калм</unitPattern>
+				<unitPattern count="other">{0} калм</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">Бк</displayName>
+				<unitPattern count="one" draft="contributed">{0} Бк</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Бк</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Бк</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">Зв</displayName>
+				<unitPattern count="one" draft="contributed">{0} Зв</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Зв</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Зв</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">Гр</displayName>
+				<unitPattern count="one" draft="contributed">{0} Гр</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Гр</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Гр</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">Тл</displayName>
+				<unitPattern count="one" draft="contributed">{0} Тл</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Тл</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Тл</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">Вб</displayName>
+				<unitPattern count="one" draft="contributed">{0} Вб</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} Вб</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} Вб</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName draft="contributed">c</displayName>
+				<unitPattern count="one" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} c</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} c</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>напр.</displayName>
diff --git a/make/data/cldr/common/main/rw.xml b/make/data/cldr/common/main/rw.xml
index 0c25e15c411..eabe4bf1c2f 100644
--- a/make/data/cldr/common/main/rw.xml
+++ b/make/data/cldr/common/main/rw.xml
@@ -167,18 +167,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">mut.</month>
-							<month type="2">gas.</month>
-							<month type="3">wer.</month>
-							<month type="4">mat.</month>
-							<month type="5">gic.</month>
-							<month type="6">kam.</month>
-							<month type="7">nya.</month>
-							<month type="8">kan.</month>
-							<month type="9">nze.</month>
-							<month type="10">ukw.</month>
-							<month type="11">ugu.</month>
-							<month type="12">uku.</month>
+							<month type="1">Mut.</month>
+							<month type="2">Gas.</month>
+							<month type="3">Wer.</month>
+							<month type="4">Mat.</month>
+							<month type="5">Gic.</month>
+							<month type="6">Kam.</month>
+							<month type="7">Nya.</month>
+							<month type="8">Kan.</month>
+							<month type="9">Nze.</month>
+							<month type="10">Ukw.</month>
+							<month type="11">Ugu.</month>
+							<month type="12">Uku.</month>
 						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Mutarama</month>
@@ -199,13 +199,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun">cyu.</day>
-							<day type="mon">mbe.</day>
-							<day type="tue">kab.</day>
-							<day type="wed">gtu.</day>
-							<day type="thu">kan.</day>
-							<day type="fri">gnu.</day>
-							<day type="sat">gnd.</day>
+							<day type="sun">Cyu.</day>
+							<day type="mon">Mbe.</day>
+							<day type="tue">Kab.</day>
+							<day type="wed">Gtu.</day>
+							<day type="thu">Kan.</day>
+							<day type="fri">Gnu.</day>
+							<day type="sat">Gnd.</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Ku cyumweru</day>
@@ -236,17 +236,75 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</quarters>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMd">dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Md">dd-MM</dateFormatItem>
+						<dateFormatItem id="MEd">E, dd-MM</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="yM">MM-y</dateFormatItem>
 						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
+						<dateFormatItem id="yMEd">E, dd-MM-y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMd">d MMMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G–y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">MM-y G– MM-y G</greatestDifference>
+							<greatestDifference id="M">MM-y– MM-y G</greatestDifference>
+							<greatestDifference id="y">MM-y– MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">dd-MM-y– dd-MM-y G</greatestDifference>
+							<greatestDifference id="G">dd-MM-y G – dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">dd-MM-y – dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">dd-MM-y – dd-MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E, dd-MM-y – E, dd-MM-y G</greatestDifference>
+							<greatestDifference id="G">E, dd-MM-y G–E, dd-MM-y G</greatestDifference>
+							<greatestDifference id="M">E, dd-MM-y – E, dd-MM-y G</greatestDifference>
+							<greatestDifference id="y">E, dd-MM-y – E, dd-MM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMM">
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d-MMM-y G–d-MMM-y G</greatestDifference>
+							<greatestDifference id="M">d MMM–d MMM y G</greatestDifference>
+							<greatestDifference id="y">d-MMM-y–d-MMM-y G</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">E, d MMM–d MMM y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y G–E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM y–E, d MMM G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y –E, d MMM y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h–h a</greatestDifference>
@@ -266,53 +324,84 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="d">dd-MM – dd-MM</greatestDifference>
+							<greatestDifference id="M">dd-MM – dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="d">E, dd-MM – E, dd-MM</greatestDifference>
+							<greatestDifference id="M">E, dd-MM – E, dd-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">MM-y –MM-y</greatestDifference>
+							<greatestDifference id="y">MM-y – MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">dd-MM-y – dd-MM-y </greatestDifference>
+							<greatestDifference id="M">dd-MM-y – dd-MM-y</greatestDifference>
+							<greatestDifference id="y">dd-MM-y – dd-MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="d">E, dd–dd-MM–y – E, dd-dd-MM–y </greatestDifference>
+							<greatestDifference id="M">E, dd-MM-y –E, dd-MM-y</greatestDifference>
+							<greatestDifference id="y">E, dd-MM-y –E, dd-MM-y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<fields>
+			<field type="year">
+				<relative type="-1">umwaka ushize</relative>
+				<relative type="0">uyu mwaka</relative>
+				<relative type="1">umwaka utaha</relative>
+			</field>
+			<field type="month">
+				<relative type="-1">ukwezi gushize</relative>
+				<relative type="0">uku kwezi</relative>
+				<relative type="1">ukwezi gutaha</relative>
+			</field>
+			<field type="week">
+				<relative type="-1">icyumweru gishize</relative>
+				<relative type="0">iki cyumweru</relative>
+				<relative type="1">icyumweru gitaha</relative>
+			</field>
+			<field type="day">
+				<relative type="-1">ejo</relative>
+				<relative type="0">uyu munsi</relative>
+				<relative type="1">ejo</relative>
+			</field>
+			<field type="sun">
+				<relative type="-1">Ku Cyumweru hashize</relative>
+				<relative type="0">kuri iki Cyumweru</relative>
+				<relative type="1">Ku Cyumweru hazaza</relative>
+			</field>
+		</fields>
 		<timeZoneNames>
 			<metazone type="GMT">
 				<long>
diff --git a/make/data/cldr/common/main/sa.xml b/make/data/cldr/common/main/sa.xml
index 0d58bdfcbcd..9ed2f24a255 100644
--- a/make/data/cldr/common/main/sa.xml
+++ b/make/data/cldr/common/main/sa.xml
@@ -596,6 +596,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
@@ -605,6 +613,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/sah.xml b/make/data/cldr/common/main/sah.xml
index 29ed04a5da4..a13d7ef0938 100644
--- a/make/data/cldr/common/main/sah.xml
+++ b/make/data/cldr/common/main/sah.xml
@@ -1031,6 +1031,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/sat.xml b/make/data/cldr/common/main/sat.xml
index 8ed99a516cc..e750b13b01c 100644
--- a/make/data/cldr/common/main/sat.xml
+++ b/make/data/cldr/common/main/sat.xml
@@ -986,13 +986,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc" draft="unconfirmed">ᱢᱤᱱᱜᱩᱣᱚ ᱢᱟᱦᱮᱛᱟ</type>
 			<type key="cf" type="account" draft="unconfirmed">ᱯᱩᱭᱥᱟᱹ ᱠᱷᱟᱛᱟ ᱯᱷᱚᱨᱢᱟᱴ</type>
 			<type key="cf" type="standard" draft="unconfirmed">ᱢᱩᱞ ᱯᱩᱭᱥᱟᱹ ᱯᱷᱚᱨᱢᱟᱴ</type>
-			<type key="collation" type="big5han" draft="unconfirmed">ᱫᱤᱥᱤ ᱪᱟᱭᱱᱤᱡᱽ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="compat" draft="unconfirmed">ᱢᱟᱲᱟᱝ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">ᱥᱟᱵᱟᱫ ᱜᱟᱫᱮᱞ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="ducet" draft="unconfirmed">ᱢᱩᱞ ᱭᱩᱱᱤᱠᱳᱰ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="emoji" draft="unconfirmed">ᱤᱢᱚᱡᱤ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="eor" draft="unconfirmed">ᱭᱩᱨᱚᱯᱤᱭᱟᱹᱱ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">ᱥᱚᱦᱚᱡᱽ ᱪᱟᱭᱱᱤᱡᱽ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="phonebook" draft="unconfirmed">ᱯᱷᱚᱱᱯᱚᱛᱚᱵ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">ᱯᱤᱱᱭᱟᱱ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
 			<type key="collation" type="reformed" draft="unconfirmed">ᱫᱩᱦᱲᱟᱹ ᱛᱮᱭᱟᱨ ᱛᱷᱟᱨ ᱟᱸᱫᱮ</type>
@@ -1856,6 +1854,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">ᱯᱟᱪᱮ ᱜᱽᱨᱤᱱᱞᱮᱱᱰ ᱥᱤᱛᱩᱝ ᱚᱠᱛᱚ</daylight>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱚᱠᱛᱚ</generic>
diff --git a/make/data/cldr/common/main/sc.xml b/make/data/cldr/common/main/sc.xml
index ec57770a997..e5f27dfa21d 100644
--- a/make/data/cldr/common/main/sc.xml
+++ b/make/data/cldr/common/main/sc.xml
@@ -12,6 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<languages>
+			<language type="aa">afar</language>
 			<language type="ab">abcasu</language>
 			<language type="ace">acehnesu</language>
 			<language type="ada">adangme</language>
@@ -42,28 +43,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">azerbaigianu</language>
 			<language type="az" alt="short">azeru</language>
 			<language type="ba">baschiru</language>
+			<language type="bal">baluci</language>
 			<language type="ban">balinesu</language>
 			<language type="bas">basaa</language>
 			<language type="be">bielorussu</language>
 			<language type="bem">bemba</language>
+			<language type="bew">betawi</language>
 			<language type="bez">bena</language>
 			<language type="bg">bùlgaru</language>
 			<language type="bgc">haryanvi</language>
+			<language type="bgn">baluci otzidentale</language>
 			<language type="bho">bhojpuri</language>
 			<language type="bi">bislama</language>
 			<language type="bin">bini</language>
 			<language type="bla">pees nieddos</language>
 			<language type="blo">anii</language>
+			<language type="blt">tai dam</language>
 			<language type="bm">bambara</language>
 			<language type="bn">bengalesu</language>
 			<language type="bo">tibetanu</language>
+			<language type="bqi">bakhtiari</language>
 			<language type="br">brètone</language>
 			<language type="brx">bodo</language>
 			<language type="bs">bosnìacu</language>
+			<language type="bss">akoose</language>
+			<language type="bua">buriat</language>
 			<language type="bug">buginesu</language>
 			<language type="byn">blin</language>
 			<language type="ca">catalanu</language>
+			<language type="cad">caddo</language>
 			<language type="cay">cayuga</language>
+			<language type="cch">atsam</language>
 			<language type="ccp">chakma</language>
 			<language type="ce">cecenu</language>
 			<language type="ceb">cebuanu</language>
@@ -75,11 +85,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="chp">chipewyan</language>
 			<language type="chr">cherokee</language>
 			<language type="chy">cheyenne</language>
+			<language type="cic">chickasaw</language>
 			<language type="ckb">curdu tzentrale</language>
 			<language type="ckb" alt="menu">curdu, tzentrale</language>
 			<language type="ckb" alt="variant">curdu, sorani</language>
 			<language type="clc">chilcotin</language>
 			<language type="co">corsicanu</language>
+			<language type="cop">coptu</language>
 			<language type="crg">michif</language>
 			<language type="crj">cree sud-orientale</language>
 			<language type="crk">cree de sas campuras</language>
@@ -159,12 +171,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hai">haida</language>
 			<language type="haw">hawaianu</language>
 			<language type="hax">haida meridionale</language>
-			<language type="he">ebreu</language>
+			<language type="he">ebràicu</language>
 			<language type="hi">hindi</language>
 			<language type="hi_Latn">hindi (caràteres latinos)</language>
 			<language type="hi_Latn" alt="variant">hinglish</language>
 			<language type="hil">ilongu</language>
 			<language type="hmn">hmong</language>
+			<language type="hnj">hmong njua</language>
 			<language type="hr">croatu</language>
 			<language type="hsb">sòrabu artu</language>
 			<language type="ht">crèolu haitianu</language>
@@ -193,6 +206,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="jmc">machame</language>
 			<language type="jv">giavanesu</language>
 			<language type="ka">georgianu</language>
+			<language type="kaa">kara-kalpak</language>
 			<language type="kab">cabilu</language>
 			<language type="kac">kachin</language>
 			<language type="kaj">jju</language>
@@ -201,6 +215,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kcg">tyap</language>
 			<language type="kde">makonde</language>
 			<language type="kea">cabubirdianu</language>
+			<language type="kek">qʼeqchiʼ</language>
+			<language type="ken">kenyang</language>
 			<language type="kfo">koro</language>
 			<language type="kgp">kaingang</language>
 			<language type="kha">khasi</language>
@@ -226,6 +242,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafia</language>
 			<language type="ksh">coloniesu</language>
 			<language type="ku">curdu</language>
+			<language type="ku" menu="core">curdu</language>
+			<language type="ku" menu="extension">curmangi</language>
 			<language type="kum">cumucu</language>
 			<language type="kv">komi</language>
 			<language type="kw">còrnicu</language>
@@ -242,6 +260,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lij">lìgure</language>
 			<language type="lil">lillooet</language>
 			<language type="lkt">lakota</language>
+			<language type="lld">ladinu</language>
 			<language type="lmo">lombardu</language>
 			<language type="ln">lingala</language>
 			<language type="lo">laotianu</language>
@@ -250,12 +269,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lrc">luri setentrionale</language>
 			<language type="lsm">sàmia</language>
 			<language type="lt">lituanu</language>
+			<language type="ltg">latgalianu</language>
 			<language type="lu">luba-katanga</language>
 			<language type="lua">tshiluba</language>
 			<language type="lun">lunda</language>
 			<language type="lus">mizo</language>
 			<language type="luy">luyia</language>
 			<language type="lv">lètone</language>
+			<language type="lzz">laz</language>
 			<language type="mad">maduresu</language>
 			<language type="mag">magahi</language>
 			<language type="mai">maithili</language>
@@ -269,6 +290,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mgh">makhuwa-meetto</language>
 			<language type="mgo">meta’</language>
 			<language type="mh">marshallesu</language>
+			<language type="mhn">mòchenu</language>
 			<language type="mi">maori</language>
 			<language type="mic">micmac</language>
 			<language type="min">minangkabau</language>
@@ -286,10 +308,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mul">limbas mùltiplas</language>
 			<language type="mus">muscogee</language>
 			<language type="mwl">mirandesu</language>
+			<language type="mww">hmong daw</language>
 			<language type="my">burmesu</language>
 			<language type="myv">erzya</language>
 			<language type="mzn">mazandarani</language>
 			<language type="na">nauru</language>
+			<language type="nan">min nan</language>
 			<language type="nap">napoletanu</language>
 			<language type="naq">nama</language>
 			<language type="nb">norvegesu bokmål</language>
@@ -324,14 +348,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="om">oromo</language>
 			<language type="or">odia</language>
 			<language type="os">ossèticu</language>
+			<language type="osa">osage</language>
 			<language type="pa">punjabi</language>
 			<language type="pag">pangasinan</language>
 			<language type="pam">pampanga</language>
 			<language type="pap">papiamentu</language>
 			<language type="pau">palauanu</language>
 			<language type="pcm">pidgin nigerianu</language>
+			<language type="pi">pali</language>
 			<language type="pis">pijin</language>
 			<language type="pl">polacu</language>
+			<language type="pms">piemontesu</language>
 			<language type="pqm">malecite-passamaquoddy</language>
 			<language type="prg">prussianu</language>
 			<language type="ps">pashto</language>
@@ -339,6 +366,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pt_BR">portoghesu brasilianu</language>
 			<language type="pt_PT">portoghesu europeu</language>
 			<language type="qu">quechua</language>
+			<language type="quc">k’iche’</language>
 			<language type="raj">rajasthani</language>
 			<language type="rap">rapanui</language>
 			<language type="rar">rarotonganu</language>
@@ -364,17 +392,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="scn">sitzilianu</language>
 			<language type="sco">scots</language>
 			<language type="sd">sindhi</language>
+			<language type="sdh">curdu meridionale</language>
 			<language type="se">sami setentrionale</language>
 			<language type="seh">sena</language>
 			<language type="ses">koyraboro senni</language>
 			<language type="sg">sango</language>
+			<language type="sgs">samogitianu</language>
 			<language type="shi">tashelhit</language>
 			<language type="shn">shan</language>
 			<language type="si">singalesu</language>
+			<language type="sid">sidamo</language>
 			<language type="sk">islovacu</language>
+			<language type="skr">saraiki</language>
 			<language type="sl">islovenu</language>
 			<language type="slh">lushootseed meridionale</language>
 			<language type="sm">samoanu</language>
+			<language type="sma">sami meridionale</language>
+			<language type="smj">sami de Lule</language>
 			<language type="smn">sami de sos inari</language>
 			<language type="sms">sami skolt</language>
 			<language type="sn">shona</language>
@@ -384,10 +418,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sr">serbu</language>
 			<language type="srn">sranan tongo</language>
 			<language type="ss">swati</language>
+			<language type="ssy">saho</language>
 			<language type="st">sotho meridionale</language>
 			<language type="str">salish de sas astrinturas</language>
 			<language type="su">sundanesu</language>
 			<language type="suk">sukuma</language>
+			<language type="suz">sunwar</language>
 			<language type="sv">isvedesu</language>
 			<language type="sw">swahili</language>
 			<language type="sw_CD">swahili de su Congo</language>
@@ -415,6 +451,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="tpi">tok pisin</language>
 			<language type="tr">turcu</language>
 			<language type="trv">taroko</language>
+			<language type="trw">torwali</language>
 			<language type="ts">tsonga</language>
 			<language type="tt">tàtaru</language>
 			<language type="ttm">tutchone setentrionale</language>
@@ -441,6 +478,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="wae">walser</language>
 			<language type="wal">wolaita</language>
 			<language type="war">waray</language>
+			<language type="wbp">warlpiri</language>
 			<language type="wo">wolof</language>
 			<language type="wuu">wu</language>
 			<language type="xal">calmucu</language>
@@ -727,7 +765,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CG" alt="variant">Congo (Repùblica)</territory>
 			<territory type="CH">Isvìtzera</territory>
 			<territory type="CI">Costa de Avòriu</territory>
-			<territory type="CI" alt="variant">Côte d’Ivoire</territory>
 			<territory type="CK">Ìsulas Cook</territory>
 			<territory type="CL">Tzile</territory>
 			<territory type="CM">Camerùn</territory>
@@ -885,7 +922,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="PT">Portogallu</territory>
 			<territory type="PW">Palau</territory>
 			<territory type="PY">Paraguày</territory>
-			<territory type="QA">Catar</territory>
+			<territory type="QA">Catàr</territory>
 			<territory type="QO">Otzeània perifèrica</territory>
 			<territory type="RE">Riunione</territory>
 			<territory type="RO">Romania</territory>
@@ -1076,58 +1113,106 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">formadu de valuta</key>
 			<key type="collation">ordinamentu</key>
 			<key type="currency">valuta</key>
+			<key type="em">presentatzione emoji</key>
 			<key type="hc">sistema oràriu (12 o 24 oras)</key>
 			<key type="lb">casta de truncadura de lìnia</key>
+			<key type="lw">truncaduras de lìnia a intro de sas paràulas</key>
 			<key type="ms">sistema de medida</key>
 			<key type="numbers">nùmeros</key>
+			<key type="ss">truncadura de fràsia a pustis de incurtz.</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">calendàriu buddhista</type>
+			<type key="calendar" type="buddhist" scope="core">buddhista</type>
 			<type key="calendar" type="chinese">calendàriu tzinesu</type>
+			<type key="calendar" type="chinese" scope="core">tzinesu</type>
 			<type key="calendar" type="coptic">calendàriu coptu</type>
+			<type key="calendar" type="coptic" scope="core">coptu</type>
 			<type key="calendar" type="dangi">calendàriu dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">calendàriu etìope</type>
+			<type key="calendar" type="ethiopic" scope="core">etìope</type>
 			<type key="calendar" type="ethiopic-amete-alem">calendàriu etìope Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etìope Amete Alem</type>
 			<type key="calendar" type="gregorian">calendàriu gregorianu</type>
+			<type key="calendar" type="gregorian" scope="core">gregorianu</type>
 			<type key="calendar" type="hebrew">calendàriu ebràicu</type>
+			<type key="calendar" type="hebrew" scope="core">ebràicu</type>
 			<type key="calendar" type="indian">calendàriu natzionale indianu</type>
+			<type key="calendar" type="indian" scope="core">natzionale indianu</type>
 			<type key="calendar" type="islamic">calendàriu egirianu</type>
+			<type key="calendar" type="islamic" scope="core">egirianu</type>
 			<type key="calendar" type="islamic-civil">calendàriu egirianu (tabulare, època tzivile)</type>
+			<type key="calendar" type="islamic-civil" scope="core">egirianu (tabulare, època tzivile)</type>
 			<type key="calendar" type="islamic-rgsa">calendàriu islàmicu (Aràbia Saudita, osservatzione)</type>
 			<type key="calendar" type="islamic-tbla">calendàriu islàmicu (tabulare, època astronòmica)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">islàmicu (tabulare, època astronòmica)</type>
 			<type key="calendar" type="islamic-umalqura">calendàriu egirianu (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">egirianu (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">calendàriu ISO-8601</type>
 			<type key="calendar" type="japanese">calendàriu giaponesu</type>
+			<type key="calendar" type="japanese" scope="core">giaponesu</type>
 			<type key="calendar" type="persian">calendàriu persianu</type>
+			<type key="calendar" type="persian" scope="core">persianu</type>
 			<type key="calendar" type="roc">calendàriu minguo</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">formadu de valuta contàbile</type>
+			<type key="cf" type="account" scope="core">contàbile</type>
 			<type key="cf" type="standard">formadu de valuta istandard</type>
-			<type key="collation" type="big5han">ordinamentu de su tzinesu traditzionale - Big5</type>
-			<type key="collation" type="compat">ordinamentu antepostu, pro cumpatibilitade</type>
+			<type key="cf" type="standard" scope="core">istandard</type>
+			<type key="collation" type="compat">ordinamentu antepostu, pro cumpatibilidade</type>
+			<type key="collation" type="compat" scope="core">cumpatibilidade</type>
 			<type key="collation" type="dictionary">ordinamentu de su ditzionàriu</type>
+			<type key="collation" type="dictionary" scope="core">ditzionàriu</type>
 			<type key="collation" type="ducet">ordinamentu Unicode predefinidu</type>
+			<type key="collation" type="ducet" scope="core">Unicode predefinidu</type>
 			<type key="collation" type="emoji">ordinamentu de sas emoji</type>
 			<type key="collation" type="eor">règulas de ordinamentu europeas</type>
-			<type key="collation" type="gb2312han">ordinamentu de su tzinesu semplificadu - GB2312</type>
 			<type key="collation" type="phonebook">ordinamentu de s’elencu telefònicu</type>
+			<type key="collation" type="phonebook" scope="core">elencu telefònicu</type>
+			<type key="collation" type="phonetic" scope="core">fonèticu</type>
 			<type key="collation" type="pinyin">ordinamentu pinyin</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">chirca genèrica</type>
+			<type key="collation" type="search" scope="core">chirca</type>
 			<type key="collation" type="searchjl">chirca pro consonante hangul initziale</type>
 			<type key="collation" type="standard">ordinamentu istandard</type>
+			<type key="collation" type="standard" scope="core">istandard</type>
 			<type key="collation" type="stroke">òrdine de sos tratos</type>
+			<type key="collation" type="stroke" scope="core">tratos</type>
 			<type key="collation" type="traditional">ordinamentu traditzionale</type>
+			<type key="collation" type="traditional" scope="core">traditzionale</type>
 			<type key="collation" type="unihan">ordinamentu in base a sos radicales</type>
+			<type key="collation" type="unihan" scope="core">in base a sos radicales</type>
 			<type key="collation" type="zhuyin">ordinamentu zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
+			<type key="em" type="default" scope="core">predefinida</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">testu</type>
 			<type key="hc" type="h11">sistema oràriu a 12 oras (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">sistema oràriu a 12 oras (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">sistema oràriu a 24 oras (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">sistema oràriu a 24 oras (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">truncadura de lìnia facoltativa</type>
+			<type key="lb" type="loose" scope="core">facoltativa</type>
 			<type key="lb" type="normal">truncadura de lìnia normale</type>
+			<type key="lb" type="normal" scope="core">normale</type>
 			<type key="lb" type="strict">truncadura de lìnia fortzada</type>
+			<type key="lb" type="strict" scope="core">fortzada</type>
+			<type key="lw" type="breakall" scope="core">trunca totu</type>
+			<type key="lw" type="keepall" scope="core">mantene totu</type>
+			<type key="lw" type="normal" scope="core">normale</type>
+			<type key="lw" type="phrase" scope="core">mantene in sas fràsias</type>
 			<type key="ms" type="metric">sistema mètricu</type>
+			<type key="ms" type="metric" scope="core">mètricu</type>
 			<type key="ms" type="uksystem">sistema imperiale britànnicu</type>
+			<type key="ms" type="uksystem" scope="core">imperiale britànnicu</type>
 			<type key="ms" type="ussystem">sistema consuetudinàriu americanu</type>
+			<type key="ms" type="ussystem" scope="core">consuetudinàriu americanu</type>
 			<type key="numbers" type="ahom">tzifras ahom</type>
 			<type key="numbers" type="arab">tzifras indo-àrabas</type>
 			<type key="numbers" type="arabext">tzifras indo-àrabas estèndidas</type>
@@ -1143,12 +1228,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="diak">tzifras dhives akuru</type>
 			<type key="numbers" type="ethi">nùmeros etìopes</type>
 			<type key="numbers" type="fullwide">tzifras a largària intrea</type>
+			<type key="numbers" type="gara">tzifras garay</type>
 			<type key="numbers" type="geor">nùmeros georgianos</type>
 			<type key="numbers" type="gong">tzifras gondi gunjala</type>
 			<type key="numbers" type="gonm">tzifras gondi masaram</type>
 			<type key="numbers" type="grek">nùmeros grecos</type>
 			<type key="numbers" type="greklow">nùmeros grecos minùscolos</type>
 			<type key="numbers" type="gujr">tzifras gujarati</type>
+			<type key="numbers" type="gukh">tzifras gurung khema</type>
 			<type key="numbers" type="guru">tzifras gurmukhi</type>
 			<type key="numbers" type="hanidec">nùmeros detzimales tzinesos</type>
 			<type key="numbers" type="hans">nùmeros in tzinesu semplificadu</type>
@@ -1165,6 +1252,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="kawi">tzifras kawi</type>
 			<type key="numbers" type="khmr">tzifras khmer</type>
 			<type key="numbers" type="knda">tzifras kannada</type>
+			<type key="numbers" type="krai">tzifras kirat rai</type>
 			<type key="numbers" type="lana">tzifras tai tham hora</type>
 			<type key="numbers" type="lanatham">tzifras tai tham tham</type>
 			<type key="numbers" type="laoo">tzifras laotianas</type>
@@ -1182,13 +1270,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="mroo">tzifras mro</type>
 			<type key="numbers" type="mtei">tzifras meitei mayek</type>
 			<type key="numbers" type="mymr">tzifras birmanas</type>
+			<type key="numbers" type="mymrepka">tzifras birmanas de su pwo karen orientale</type>
+			<type key="numbers" type="mymrpao">tzifras birmanas pao</type>
 			<type key="numbers" type="mymrshan">tzifras shan birmanas</type>
 			<type key="numbers" type="mymrtlng">tzifras tai lang birmanas</type>
 			<type key="numbers" type="nagm">tzifras nag mundari</type>
 			<type key="numbers" type="nkoo">tzifras n’ko</type>
 			<type key="numbers" type="olck">tzifras ol chiki</type>
+			<type key="numbers" type="onao">tzifras ol onal</type>
 			<type key="numbers" type="orya">tzifras odia</type>
 			<type key="numbers" type="osma">tzifras osmanya</type>
+			<type key="numbers" type="outlined">tzifras deliniadas</type>
 			<type key="numbers" type="rohg">tzifras rohingya hanifi</type>
 			<type key="numbers" type="roman">nùmeros romanos</type>
 			<type key="numbers" type="romanlow">nùmeros romanos minùscolos</type>
@@ -1198,6 +1290,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="sinh">tzifras lith singalesas</type>
 			<type key="numbers" type="sora">tzifras sora sompeng</type>
 			<type key="numbers" type="sund">tzifras sundanesas</type>
+			<type key="numbers" type="sunu">tzifras sunuwar</type>
 			<type key="numbers" type="takr">tzifras takri</type>
 			<type key="numbers" type="talu">tzifras tai lue noas</type>
 			<type key="numbers" type="taml">nùmeros tamil traditzionales</type>
@@ -1207,9 +1300,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="tibt">tzifras tibetanas</type>
 			<type key="numbers" type="tirh">tzifras tirhuta</type>
 			<type key="numbers" type="tnsa">tzifras tangsa</type>
+			<type key="numbers" type="tols">tzifras tolong siki</type>
 			<type key="numbers" type="vaii">tzifras vai</type>
 			<type key="numbers" type="wara">tzifras warang citi</type>
 			<type key="numbers" type="wcho">tzifras wancho</type>
+			<type key="ss" type="none" scope="core">alluta</type>
+			<type key="ss" type="standard" scope="core">istudada</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">mètricu</measurementSystemName>
@@ -1248,34 +1344,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="0">EB</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1403,6 +1545,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'sas' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1411,6 +1556,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'sas' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1431,6 +1579,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMMM">MMMM 'de' 'su' r (U)</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d 'de' MMMM 'de' 'su' r (U)</dateFormatItem>
 						<dateFormatItem id="GyMMMMEd">E d 'de' MMMM 'de' 'su' r (U)</dateFormatItem>
+						<dateFormatItem id="Hv">HH'o' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1532,74 +1681,139 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0">in antis de Diocletzianu</era>
 						<era type="1">annu de sos màrtires</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">a.D.</era>
 						<era type="1">a.M.</era>
 					</eraAbbr>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="dangi">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE dd 'de' MMMM 'de' 'su' r (U)</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>dd 'de' MMMM 'de' 'su' r (U)</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM r</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd-MM-r</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="ethiopic">
@@ -1637,16 +1851,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0">in antis de s’Incarnatzione</era>
-						<era type="1">a pustis de s’Incarnatzione</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a.Inc.</era>
-						<era type="1">p.Inc.</era>
-					</eraAbbr>
-				</eras>
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
@@ -1721,6 +1925,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'sas' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1729,6 +1936,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'sas' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1743,13 +1953,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
+						<dateFormatItem id="H">HH'o'</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH'o' v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1768,6 +1982,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yyyyQQQQ">QQQQ 'de' 'su' y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
 							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
@@ -1802,6 +2020,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
 							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2034,6 +2269,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'sas' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2042,6 +2280,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'sas' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2056,7 +2297,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d 'de' MMM 'de' 'su' y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d 'de' MMM 'de' 'su' y G</dateFormatItem>
@@ -2065,8 +2308,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="MMMd">d 'de' MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d 'de' MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one">'chida' W 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other">'chida' W 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">W'a' 'chida' 'de' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">W'a' 'chida' 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="yM">MM/Y</dateFormatItem>
 						<dateFormatItem id="yMd">dd/MM/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E dd/MM/y</dateFormatItem>
@@ -2076,8 +2319,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMM">MMMM 'de' 'su' y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ 'de' 'su' y</dateFormatItem>
-						<dateFormatItem id="yw" count="one">'chida' w 'de' 'su' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other">'chida' w 'de' 'su' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">w'a' 'chida' 'de' 'su' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other">w'a' 'chida' 'de' 'su' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Gy">
@@ -2220,34 +2463,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="0">a.m.</era>
 					</eraAbbr>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2289,35 +2578,84 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<eraNames>
 						<era type="0">era Saka</era>
 					</eraNames>
+					<eraNarrow>
+						<era type="0">S</era>
+					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2357,76 +2695,167 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</months>
 				<eras>
 					<eraNames>
-						<era type="0">era de s’Egira</era>
+						<era type="0">era de s’ègira</era>
+						<era type="1">in antis de s’ègira</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">e.E.</era>
+						<era type="1">a.E.</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">E</era>
+						<era type="1">A</era>
 					</eraNarrow>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2472,34 +2901,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="0">a.p.</era>
 					</eraAbbr>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2515,34 +2990,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="1">R.d.T</era>
 					</eraAbbr>
 				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d 'de' MMMM 'de' 'su' y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>dd MMM y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>dd/MM/y GGGGG</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'sas' {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'o'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="a">hh:mm a – hh:mm a v</greatestDifference>
+							<greatestDifference id="h">hh:mm–hh:mm a v</greatestDifference>
+							<greatestDifference id="m">hh:mm–hh:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+							<greatestDifference id="a">hh a – hh a v</greatestDifference>
+							<greatestDifference id="h">hh–hh a v</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2640,6 +3161,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekOfMonth-short">
 				<displayName>ch. de su mese</displayName>
 			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName>ch. de mese</displayName>
+			</field>
 			<field type="day">
 				<displayName>die</displayName>
 				<relative type="-1">eris</relative>
@@ -2950,13 +3474,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>Ora {0}</regionFormat>
 			<regionFormat type="daylight">Ora legale: {0}</regionFormat>
 			<regionFormat type="standard">Ora istandard: {0}</regionFormat>
-			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>OIH</generic>
-					<standard>OIH</standard>
-					<daylight>OLH</daylight>
-				</short>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Tempus coordinadu universale</standard>
@@ -2968,12 +3485,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Etc/Unknown">
 				<exemplarCity>Tzitade disconnota</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Daca</exemplarCity>
 			</zone>
@@ -2995,6 +3506,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Zurich">
 				<exemplarCity>Zurigu</exemplarCity>
 			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Ìsula de Pasca</exemplarCity>
+			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>S’Avana</exemplarCity>
 			</zone>
@@ -3007,21 +3521,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Prague">
 				<exemplarCity>Praga</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berlinu</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
 				<exemplarCity>Algeri</exemplarCity>
 			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>Ìsulas Galàpagos</exemplarCity>
+			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Su Càiru</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
 				<exemplarCity>Ìsulas Canàrias</exemplarCity>
 			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>Madrìd</exemplarCity>
+			</zone>
 			<zone type="Africa/Addis_Ababa">
 				<exemplarCity>Addis Abeba</exemplarCity>
 			</zone>
@@ -3079,11 +3596,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Rome">
 				<exemplarCity>Roma</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>Canton</exemplarCity>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>Tòkyo</exemplarCity>
 			</zone>
 			<zone type="America/St_Kitts">
 				<exemplarCity>Santu Cristolu</exemplarCity>
@@ -3106,6 +3620,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Monrovia">
 				<exemplarCity>Monròvia</exemplarCity>
 			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>Vìlnius</exemplarCity>
+			</zone>
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Lussemburgu</exemplarCity>
 			</zone>
@@ -3145,6 +3662,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Atlantic/Azores">
 				<exemplarCity>Azorras</exemplarCity>
 			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>Madèira</exemplarCity>
+			</zone>
 			<zone type="Europe/Lisbon">
 				<exemplarCity>Lisbona</exemplarCity>
 			</zone>
@@ -3178,6 +3698,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>Sant’Elene</exemplarCity>
 			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>Lubiana</exemplarCity>
+			</zone>
 			<zone type="Europe/San_Marino">
 				<exemplarCity>Santu Marinu</exemplarCity>
 			</zone>
@@ -3196,6 +3719,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Portu de Ispagna</exemplarCity>
 			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>Kiev</exemplarCity>
+			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Dakota de su Nord</exemplarCity>
 			</zone>
@@ -3223,6 +3749,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Saigon">
 				<exemplarCity>Tzitade de Ho Chi Minh</exemplarCity>
 			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis e Futuna</exemplarCity>
+			</zone>
 			<zone type="Indian/Mayotte">
 				<exemplarCity>Maiota</exemplarCity>
 			</zone>
@@ -3255,9 +3784,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora de s’Àfrica otzidentale</generic>
-					<standard>Ora istandard de s’Àfrica otzidentale</standard>
-					<daylight>Ora legale de s’Àfrica otzidentale</daylight>
+					<standard>Ora de s’Àfrica otzidentale</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3541,6 +4068,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora istandard de Cuba</standard>
 					<daylight>Ora legale de Cuba</daylight>
 				</long>
+				<short>
+					<generic draft="contributed">OC</generic>
+					<standard draft="contributed">OIC</standard>
+					<daylight draft="contributed">OLC</daylight>
+				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
@@ -3649,6 +4181,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="contributed">OMG</standard>
 				</short>
 			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic>Ora de sa Groenlàndia</generic>
+					<standard>Ora istandard de sa Groenlàndia</standard>
+					<daylight>Ora legale de sa Groenlàndia</daylight>
+				</long>
+			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>Ora de sa Groenlàndia orientale</generic>
@@ -3678,6 +4217,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora de sa Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora istandard de sas ìsulas Hawaii-Aleutinas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora de sas ìsulas Hawaii-Aleutinas</generic>
@@ -4283,6 +4827,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4962,8 +5512,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="ITL">
 				<displayName>lira italiana</displayName>
-				<displayName count="one">lira italiana</displayName>
-				<displayName count="other">liras italianas</displayName>
+				<displayName count="one">francu italianu</displayName>
+				<displayName count="other">francos italianos</displayName>
 			</currency>
 			<currency type="JMD">
 				<displayName>dòllaru giamaicanu</displayName>
@@ -5700,6 +6250,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">dòllaru de sos Caràibes orientales</displayName>
 				<displayName count="other">dòllaros de sos Caràibes orientales</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>fiorinu caraìbicu</displayName>
+				<displayName count="one">fiorinu caraìbicu</displayName>
+				<displayName count="other">fiorinos caraìbicos</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>diritos ispetziales de prelievu</displayName>
 				<displayName count="one">diritu ispetziale de prelievu</displayName>
@@ -6063,7 +6618,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} elementu</unitPattern>
 				<unitPattern count="other">{0} elementos</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes pro millione</displayName>
 				<unitPattern count="one">{0} parte pro millione</unitPattern>
 				<unitPattern count="other">{0} partes pro millione</unitPattern>
@@ -6864,7 +7419,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} a sa velotzidade de sa lughe</unitPattern>
 				<unitPattern count="other">{0} a sa velotzidade de sa lughe</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes pro milliardu</displayName>
 				<unitPattern count="one">{0} parte pro milliardu</unitPattern>
 				<unitPattern count="other">{0} partes pro milliardu</unitPattern>
@@ -7212,7 +7767,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} lughe</unitPattern>
 				<unitPattern count="other">{0} lughe</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>partes/milliardu</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7306,7 +7861,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}elem.</unitPattern>
 				<unitPattern count="other">{0}elem.</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -7946,7 +8501,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/scn.xml b/make/data/cldr/common/main/scn.xml
index 309d98394ea..37e92021b99 100644
--- a/make/data/cldr/common/main/scn.xml
+++ b/make/data/cldr/common/main/scn.xml
@@ -12,697 +12,707 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<languages>
-			<language type="aa" draft="unconfirmed">afar</language>
-			<language type="ab" draft="unconfirmed">abkhasu</language>
-			<language type="af" draft="unconfirmed">afrikaans</language>
-			<language type="agq" draft="unconfirmed">aghem</language>
-			<language type="ak" draft="unconfirmed">akan</language>
-			<language type="am" draft="unconfirmed">amàricu</language>
-			<language type="an" draft="unconfirmed">aragunisi</language>
-			<language type="apc" draft="unconfirmed">àrabbu livantinu di tramuntana</language>
-			<language type="ar" draft="unconfirmed">àrabbu</language>
-			<language type="ar_001" draft="unconfirmed">àrabbu nadaru mudernu</language>
-			<language type="arn" draft="unconfirmed">mapuche</language>
-			<language type="as" draft="unconfirmed">assamisi</language>
-			<language type="asa" draft="unconfirmed">asu</language>
-			<language type="ast" draft="unconfirmed">asturianu</language>
-			<language type="az" draft="unconfirmed">azzeru</language>
-			<language type="ba" draft="unconfirmed">bashkir</language>
-			<language type="bal" draft="unconfirmed">baluchi</language>
-			<language type="bas" draft="unconfirmed">basaa</language>
-			<language type="be" draft="unconfirmed">belurrussu</language>
-			<language type="bem" draft="unconfirmed">bemba</language>
-			<language type="bew" draft="unconfirmed">betawi</language>
-			<language type="bez" draft="unconfirmed">bena</language>
-			<language type="bg" draft="unconfirmed">bùrgaru</language>
-			<language type="bgc" draft="unconfirmed">haryanvi</language>
-			<language type="bho" draft="unconfirmed">bhojipuri</language>
-			<language type="blo" draft="unconfirmed">anii</language>
-			<language type="bm" draft="unconfirmed">bambara</language>
-			<language type="bn" draft="unconfirmed">bangladisi</language>
-			<language type="br" draft="unconfirmed">brètuni</language>
-			<language type="brx" draft="unconfirmed">bodu</language>
-			<language type="bs" draft="unconfirmed">busnìacu</language>
-			<language type="bss" draft="unconfirmed">akoose</language>
-			<language type="byn" draft="unconfirmed">blin</language>
-			<language type="ca" draft="unconfirmed">catalanu</language>
-			<language type="cad" draft="unconfirmed">caddu</language>
-			<language type="cch" draft="unconfirmed">atsam</language>
-			<language type="ccp" draft="unconfirmed">chakma</language>
-			<language type="ce" draft="unconfirmed">cicenu</language>
-			<language type="ceb" draft="unconfirmed">cebbuanu</language>
-			<language type="cgg" draft="unconfirmed">chiga</language>
-			<language type="cho" draft="unconfirmed">choctaw</language>
-			<language type="chr" draft="unconfirmed">cherokee</language>
-			<language type="cic" draft="unconfirmed">chickasaw</language>
-			<language type="ckb" draft="unconfirmed">curdu cintrali</language>
-			<language type="ckb" alt="variant" draft="unconfirmed">curdu Sorani</language>
-			<language type="co" draft="unconfirmed">corsu</language>
-			<language type="cs" draft="unconfirmed">cecu</language>
-			<language type="csw" draft="unconfirmed">swampy cree</language>
-			<language type="cu" draft="unconfirmed">slavu dâ cresia</language>
-			<language type="cv" draft="unconfirmed">ciuvasciu</language>
-			<language type="cy" draft="unconfirmed">gallisi</language>
-			<language type="da" draft="unconfirmed">danisi</language>
-			<language type="de" draft="unconfirmed">tidiscu</language>
-			<language type="de_AT" draft="unconfirmed">tidiscu austrìacu</language>
-			<language type="de_CH" draft="unconfirmed">tidiscu autu sbìzziru</language>
-			<language type="doi" draft="unconfirmed">dogri</language>
-			<language type="dsb" draft="unconfirmed">sorbu suttanu</language>
-			<language type="dua" draft="unconfirmed">duala</language>
-			<language type="dv" draft="unconfirmed">divehi</language>
-			<language type="dyo" draft="unconfirmed">jola-fonyi</language>
-			<language type="dz" draft="unconfirmed">dzongkha</language>
-			<language type="ebu" draft="unconfirmed">embu</language>
-			<language type="ee" draft="unconfirmed">ewe</language>
-			<language type="el" draft="unconfirmed">grecu</language>
-			<language type="en" draft="unconfirmed">ngrisi</language>
-			<language type="en_AU" draft="unconfirmed">ngrisi australianu</language>
-			<language type="en_CA" draft="unconfirmed">ngrisi canadisi</language>
-			<language type="en_GB" draft="unconfirmed">ngrisi britànnicu</language>
-			<language type="en_US" draft="unconfirmed">ngrisi miricanu</language>
-			<language type="eo" draft="unconfirmed">spirantu</language>
-			<language type="es" draft="unconfirmed">spagnolu</language>
-			<language type="es_419" draft="unconfirmed">spagnolu dâ mèrica latina</language>
-			<language type="es_ES" draft="unconfirmed">spagnolu eurupeu</language>
-			<language type="es_MX" draft="unconfirmed">spagnolu missicanu</language>
-			<language type="et" draft="unconfirmed">èstuni</language>
-			<language type="eu" draft="unconfirmed">bascu</language>
-			<language type="ewo" draft="unconfirmed">ewondo</language>
-			<language type="fa" draft="unconfirmed">pirsianu</language>
-			<language type="ff" draft="unconfirmed">fula</language>
-			<language type="fi" draft="unconfirmed">fillannisi</language>
-			<language type="fil" draft="unconfirmed">filippinu</language>
-			<language type="fo" draft="unconfirmed">faruisi</language>
-			<language type="fr" draft="unconfirmed">francisi</language>
-			<language type="fr_CA" draft="unconfirmed">francisi canadisi</language>
-			<language type="fr_CH" draft="unconfirmed">francisi sbìzziru</language>
-			<language type="frc" draft="unconfirmed">francisi Cajun</language>
-			<language type="fur" draft="unconfirmed">friulanu</language>
-			<language type="fy" draft="unconfirmed">frìsuni uccidintali</language>
-			<language type="ga" draft="unconfirmed">irlannisi</language>
-			<language type="gaa" draft="unconfirmed">ga</language>
-			<language type="gd" draft="unconfirmed">gaèlicu scuzzisi</language>
-			<language type="gez" draft="unconfirmed">geez</language>
-			<language type="gl" draft="unconfirmed">galizzianu</language>
-			<language type="gn" draft="unconfirmed">guarani</language>
-			<language type="gsw" draft="unconfirmed">tidiscu sbìzziru</language>
-			<language type="gu" draft="unconfirmed">gujarati</language>
-			<language type="guz" draft="unconfirmed">gusii</language>
-			<language type="gv" draft="unconfirmed">mannisi</language>
-			<language type="ha" draft="unconfirmed">hausa</language>
-			<language type="haw" draft="unconfirmed">hawaiianu</language>
-			<language type="he" draft="unconfirmed">ebbràicu</language>
-			<language type="hi" draft="unconfirmed">innianu</language>
-			<language type="hi_Latn" draft="unconfirmed">innianu (latinu)</language>
-			<language type="hi_Latn" alt="variant" draft="unconfirmed">innianu ngrisi</language>
-			<language type="hnj" draft="unconfirmed">hmong njua</language>
-			<language type="hr" draft="unconfirmed">cruatu</language>
-			<language type="hsb" draft="unconfirmed">surbu supranu</language>
-			<language type="hu" draft="unconfirmed">unghirisi</language>
-			<language type="hy" draft="unconfirmed">armenu</language>
-			<language type="ia" draft="unconfirmed">ntirlingua</language>
-			<language type="id" draft="unconfirmed">innunisianu</language>
-			<language type="ie" draft="unconfirmed">ntirlingui</language>
-			<language type="ig" draft="unconfirmed">igbo</language>
-			<language type="io" draft="unconfirmed">idu</language>
-			<language type="is" draft="unconfirmed">islannisi</language>
-			<language type="it" draft="unconfirmed">talianu</language>
-			<language type="iu" draft="unconfirmed">inuktitut</language>
-			<language type="ja" draft="unconfirmed">giappunisi</language>
-			<language type="jbo" draft="unconfirmed">lojban</language>
-			<language type="jgo" draft="unconfirmed">ngomba</language>
-			<language type="jmc" draft="unconfirmed">machame</language>
-			<language type="jv" draft="unconfirmed">giavanisi</language>
-			<language type="ka" draft="unconfirmed">giurgianu</language>
-			<language type="kaa" draft="unconfirmed">kara-kalpak</language>
-			<language type="kab" draft="unconfirmed">kabyle</language>
-			<language type="kaj" draft="unconfirmed">jiu</language>
-			<language type="kam" draft="unconfirmed">kamba</language>
-			<language type="kde" draft="unconfirmed">makonde</language>
-			<language type="kea" draft="unconfirmed">capuvirdianu</language>
-			<language type="ken" draft="unconfirmed">kenyang</language>
-			<language type="kgp" draft="unconfirmed">kaingang</language>
-			<language type="khq" draft="unconfirmed">koyra chiini</language>
-			<language type="ki" draft="unconfirmed">kikuyu</language>
-			<language type="kk" draft="unconfirmed">kazaku</language>
-			<language type="kkj" draft="unconfirmed">kako</language>
-			<language type="kl" draft="unconfirmed">kalaallisut</language>
-			<language type="kln" draft="unconfirmed">kalenjin</language>
-			<language type="km" draft="unconfirmed">khmer</language>
-			<language type="kn" draft="unconfirmed">kannada</language>
-			<language type="ko" draft="unconfirmed">curianu</language>
-			<language type="kok" draft="unconfirmed">konkani</language>
-			<language type="kpe" draft="unconfirmed">kpelle</language>
-			<language type="ks" draft="unconfirmed">kashmiri</language>
-			<language type="ksf" draft="unconfirmed">bafia</language>
-			<language type="ksh" draft="unconfirmed">culunisi</language>
-			<language type="ku" draft="unconfirmed">curdu</language>
-			<language type="kw" draft="unconfirmed">còrnicu</language>
-			<language type="kxv" draft="unconfirmed">kuvi</language>
-			<language type="ky" draft="unconfirmed">kirghizu</language>
-			<language type="la" draft="unconfirmed">latinu</language>
-			<language type="lag" draft="unconfirmed">langi</language>
-			<language type="lb" draft="unconfirmed">lussimmurghisi</language>
-			<language type="lg" draft="unconfirmed">ganda</language>
-			<language type="lij" draft="unconfirmed">lìguri</language>
-			<language type="lkt" draft="unconfirmed">lakota</language>
-			<language type="lld" draft="unconfirmed">ild</language>
-			<language type="lmo" draft="unconfirmed">lummardu</language>
-			<language type="ln" draft="unconfirmed">lingala</language>
-			<language type="lo" draft="unconfirmed">lau</language>
-			<language type="lou" draft="unconfirmed">criolu dâ Louisiana</language>
-			<language type="lt" draft="unconfirmed">lituanu</language>
-			<language type="ltg" draft="unconfirmed">latgallisi</language>
-			<language type="lu" draft="unconfirmed">luba-katanga</language>
-			<language type="luy" draft="unconfirmed">luyia</language>
-			<language type="lv" draft="unconfirmed">lèttuni</language>
-			<language type="mai" draft="unconfirmed">maithili</language>
-			<language type="mas" draft="unconfirmed">masai</language>
-			<language type="mdf" draft="unconfirmed">moksha</language>
-			<language type="mer" draft="unconfirmed">meru</language>
-			<language type="mfe" draft="unconfirmed">murisianu</language>
-			<language type="mg" draft="unconfirmed">margasciu</language>
-			<language type="mgh" draft="unconfirmed">makhuwa-meetto</language>
-			<language type="mgo" draft="unconfirmed">metaʼ</language>
-			<language type="mhn" draft="unconfirmed">muchenu</language>
-			<language type="mi" draft="unconfirmed">māori</language>
-			<language type="mic" draft="unconfirmed">mi'kmaw</language>
-			<language type="mk" draft="unconfirmed">macèduni</language>
-			<language type="ml" draft="unconfirmed">malayalam</language>
-			<language type="mn" draft="unconfirmed">mòngulu</language>
-			<language type="mni" draft="unconfirmed">manipuri</language>
-			<language type="moh" draft="unconfirmed">mohawk</language>
-			<language type="mr" draft="unconfirmed">marathi</language>
-			<language type="ms" draft="unconfirmed">malisi</language>
-			<language type="mt" draft="unconfirmed">mautisi</language>
-			<language type="mua" draft="unconfirmed">mundang</language>
-			<language type="mul" draft="unconfirmed">assai lingui</language>
-			<language type="mus" draft="unconfirmed">muscogee</language>
-			<language type="my" draft="unconfirmed">burmisi</language>
-			<language type="myv" draft="unconfirmed">erzya</language>
-			<language type="mzn" draft="unconfirmed">mazanderani</language>
-			<language type="naq" draft="unconfirmed">nama</language>
-			<language type="nb" draft="unconfirmed">nurviggisi Bokmål</language>
-			<language type="nds" draft="unconfirmed">tidiscu suttanu</language>
-			<language type="nds_NL" draft="unconfirmed">sàssuni suttanu</language>
-			<language type="ne" draft="unconfirmed">nipalisi</language>
-			<language type="nl" draft="unconfirmed">ulannisi</language>
-			<language type="nl_BE" draft="unconfirmed">ciammingu</language>
-			<language type="nmg" draft="unconfirmed">kwasio</language>
-			<language type="nn" draft="unconfirmed">nurviggisi Nynorsk</language>
-			<language type="nnh" draft="unconfirmed">ngiemboon</language>
-			<language type="no" draft="unconfirmed">nurviggisi</language>
-			<language type="nqo" draft="unconfirmed">n’ko</language>
-			<language type="nv" draft="unconfirmed">navajo</language>
-			<language type="oc" draft="unconfirmed">uccitanu</language>
-			<language type="or" draft="unconfirmed">odia</language>
-			<language type="pa" draft="unconfirmed">punjabi</language>
-			<language type="pcm" draft="unconfirmed">pidgin niggirianu</language>
-			<language type="pl" draft="unconfirmed">pulaccu</language>
-			<language type="prg" draft="unconfirmed">prussianu</language>
-			<language type="ps" draft="unconfirmed">pashto</language>
-			<language type="pt" draft="unconfirmed">purtughisi</language>
-			<language type="pt_BR" draft="unconfirmed">purtughisi brasilianu</language>
-			<language type="pt_PT" draft="unconfirmed">purtughisi eurupeu</language>
-			<language type="qu" draft="unconfirmed">quechua</language>
-			<language type="quc" draft="unconfirmed">kʼicheʼ</language>
-			<language type="raj" draft="unconfirmed">rajasthani</language>
-			<language type="rm" draft="unconfirmed">rumanciu</language>
-			<language type="ro" draft="unconfirmed">rumenu</language>
-			<language type="ro_MD" draft="unconfirmed">murdavu</language>
-			<language type="ru" draft="unconfirmed">russu</language>
-			<language type="rw" draft="unconfirmed">kinyarwanda</language>
-			<language type="sa" draft="unconfirmed">sàscritu</language>
-			<language type="sah" draft="unconfirmed">yakut</language>
-			<language type="sat" draft="unconfirmed">santali</language>
-			<language type="sc" draft="unconfirmed">sardu</language>
-			<language type="scn" draft="contributed">sicilianu</language>
-			<language type="sd" draft="unconfirmed">sindhi</language>
-			<language type="ses" draft="unconfirmed">koyraboro senni</language>
-			<language type="si" draft="unconfirmed">sinhala</language>
-			<language type="sk" draft="unconfirmed">sluvaccu</language>
-			<language type="sl" draft="unconfirmed">sluvenu</language>
-			<language type="smj" draft="unconfirmed">lule sami</language>
-			<language type="smn" draft="unconfirmed">inari sami</language>
-			<language type="so" draft="unconfirmed">sòmalu</language>
-			<language type="sq" draft="unconfirmed">arbanisi</language>
-			<language type="sr" draft="unconfirmed">serbu</language>
-			<language type="su" draft="unconfirmed">sunnanisi</language>
-			<language type="sv" draft="unconfirmed">svidisi</language>
-			<language type="sw" draft="unconfirmed">swahili</language>
-			<language type="syr" draft="unconfirmed">sirìacu</language>
-			<language type="szl" draft="unconfirmed">silisianu</language>
-			<language type="ta" draft="unconfirmed">tamil</language>
-			<language type="te" draft="unconfirmed">telugu</language>
-			<language type="tg" draft="unconfirmed">tajik</language>
-			<language type="th" draft="unconfirmed">tailannisi</language>
-			<language type="ti" draft="unconfirmed">tigrinya</language>
-			<language type="tk" draft="unconfirmed">turkmenu</language>
-			<language type="to" draft="unconfirmed">tunganu</language>
-			<language type="tr" draft="unconfirmed">turcu</language>
-			<language type="tt" draft="unconfirmed">tàtaru</language>
-			<language type="tzm" draft="unconfirmed">tamazight di l’Atlanti Cintrali</language>
-			<language type="ug" draft="unconfirmed">uyghur</language>
-			<language type="uk" draft="unconfirmed">ucrainu</language>
-			<language type="und" draft="unconfirmed">lingua scanusciuta</language>
-			<language type="ur" draft="unconfirmed">urdu</language>
-			<language type="uz" draft="unconfirmed">uzbeku</language>
-			<language type="vec" draft="unconfirmed">vènitu</language>
-			<language type="vi" draft="unconfirmed">vietnamisi</language>
-			<language type="vmw" draft="unconfirmed">makhuwa</language>
-			<language type="vo" draft="unconfirmed">volapük</language>
-			<language type="wo" draft="unconfirmed">wolof</language>
-			<language type="xh" draft="unconfirmed">xhosa</language>
-			<language type="xnr" draft="unconfirmed">kangri</language>
-			<language type="yo" draft="unconfirmed">yoruba</language>
-			<language type="yrl" draft="unconfirmed">nheengatu</language>
-			<language type="yue" draft="unconfirmed">cantunisi</language>
-			<language type="yue" alt="menu" draft="unconfirmed">cinisi cantunisi</language>
-			<language type="za" draft="unconfirmed">zhuang</language>
-			<language type="zh" draft="unconfirmed">cinisi</language>
-			<language type="zh" alt="menu" draft="unconfirmed">cinisi, mannarinu</language>
-			<language type="zh_Hans" draft="unconfirmed">cinisi simprificatu</language>
-			<language type="zh_Hans" alt="long" draft="unconfirmed">cinisi mannarinu simprificatu</language>
-			<language type="zh_Hant" draft="unconfirmed">cinisi tradizziunali</language>
-			<language type="zh_Hant" alt="long" draft="unconfirmed">cinisi mannarinu tradizziunali</language>
-			<language type="zu" draft="unconfirmed">zulu</language>
-			<language type="zxx" draft="unconfirmed">nuḍḍu cuntinutu linguìsticu</language>
+			<language type="aa">afar</language>
+			<language type="ab">abkhasu</language>
+			<language type="af">afrikaans</language>
+			<language type="agq">aghem</language>
+			<language type="ak">akan</language>
+			<language type="am">amàricu</language>
+			<language type="an">aragunisi</language>
+			<language type="apc">àrabbu livantinu di tramuntana</language>
+			<language type="ar">àrabbu</language>
+			<language type="ar_001">àrabbu nadaru mudernu</language>
+			<language type="arn">mapuche</language>
+			<language type="as">assamisi</language>
+			<language type="asa">asu</language>
+			<language type="ast">asturianu</language>
+			<language type="az">azzeru</language>
+			<language type="ba">bashkir</language>
+			<language type="bal">baluchi</language>
+			<language type="bas">basaa</language>
+			<language type="be">belurrussu</language>
+			<language type="bem">bemba</language>
+			<language type="bew">betawi</language>
+			<language type="bez">bena</language>
+			<language type="bg">bùrgaru</language>
+			<language type="bgc">haryanvi</language>
+			<language type="bho">bhojipuri</language>
+			<language type="blo">anii</language>
+			<language type="bm">bambara</language>
+			<language type="bn">bangladisi</language>
+			<language type="br">brètuni</language>
+			<language type="brx">bodu</language>
+			<language type="bs">busnìacu</language>
+			<language type="bss">akoose</language>
+			<language type="byn">blin</language>
+			<language type="ca">catalanu</language>
+			<language type="cad">caddu</language>
+			<language type="cch">atsam</language>
+			<language type="ccp">chakma</language>
+			<language type="ce">cicenu</language>
+			<language type="ceb">cebbuanu</language>
+			<language type="cgg">chiga</language>
+			<language type="cho">choctaw</language>
+			<language type="chr">cherokee</language>
+			<language type="cic">chickasaw</language>
+			<language type="ckb">curdu cintrali</language>
+			<language type="ckb" alt="variant">curdu Sorani</language>
+			<language type="co">corsu</language>
+			<language type="cs">cecu</language>
+			<language type="csw">swampy cree</language>
+			<language type="cu">slavu dâ cresia</language>
+			<language type="cv">ciuvasciu</language>
+			<language type="cy">gallisi</language>
+			<language type="da">danisi</language>
+			<language type="de">tidiscu</language>
+			<language type="de_AT">tidiscu austrìacu</language>
+			<language type="de_CH">tidiscu autu sbìzziru</language>
+			<language type="doi">dogri</language>
+			<language type="dsb">sòrabbu suttanu</language>
+			<language type="dua">duala</language>
+			<language type="dv">divehi</language>
+			<language type="dyo">jola-fonyi</language>
+			<language type="dz">dzongkha</language>
+			<language type="ebu">embu</language>
+			<language type="ee">ewe</language>
+			<language type="el">grecu</language>
+			<language type="en">ngrisi</language>
+			<language type="en_AU">ngrisi australianu</language>
+			<language type="en_CA">ngrisi canadisi</language>
+			<language type="en_GB">ngrisi britànnicu</language>
+			<language type="en_GB" alt="short">ngrisi dû RJ</language>
+			<language type="en_US">ngrisi miricanu</language>
+			<language type="en_US" alt="short">ngrisi dî SJ</language>
+			<language type="eo">spirantu</language>
+			<language type="es">spagnolu</language>
+			<language type="es_419">spagnolu dâ mèrica latina</language>
+			<language type="es_ES">spagnolu eurupeu</language>
+			<language type="es_MX">spagnolu missicanu</language>
+			<language type="et">èstuni</language>
+			<language type="eu">bascu</language>
+			<language type="ewo">ewondo</language>
+			<language type="fa">pirsianu</language>
+			<language type="ff">fula</language>
+			<language type="fi">fillannisi</language>
+			<language type="fil">filippinu</language>
+			<language type="fo">faruisi</language>
+			<language type="fr">francisi</language>
+			<language type="fr_CA">francisi canadisi</language>
+			<language type="fr_CH">francisi sbìzziru</language>
+			<language type="frc">francisi Cajun</language>
+			<language type="fur">friulanu</language>
+			<language type="fy">frìsuni uccidintali</language>
+			<language type="ga">irlannisi</language>
+			<language type="gaa">ga</language>
+			<language type="gd">gaèlicu scuzzisi</language>
+			<language type="gez">geez</language>
+			<language type="gl">galizzianu</language>
+			<language type="gn">guarani</language>
+			<language type="gsw">tidiscu sbìzziru</language>
+			<language type="gu">gujarati</language>
+			<language type="guz">gusii</language>
+			<language type="gv">mannisi</language>
+			<language type="ha">hausa</language>
+			<language type="haw">hawaiianu</language>
+			<language type="he">ebbràicu</language>
+			<language type="hi">innianu</language>
+			<language type="hi_Latn" alt="variant">innianu ngrisi</language>
+			<language type="hnj">hmong njua</language>
+			<language type="hr">cruatu</language>
+			<language type="hsb">sòrabbu supranu</language>
+			<language type="ht">criolu d’Haiti</language>
+			<language type="hu">unghirisi</language>
+			<language type="hy">armenu</language>
+			<language type="ia">ntirlingua</language>
+			<language type="id">innunisianu</language>
+			<language type="ie">ntirlingui</language>
+			<language type="ig">igbo</language>
+			<language type="io">idu</language>
+			<language type="is">islannisi</language>
+			<language type="it">italianu</language>
+			<language type="iu">inuktitut</language>
+			<language type="ja">giappunisi</language>
+			<language type="jbo">lojban</language>
+			<language type="jgo">ngomba</language>
+			<language type="jmc">machame</language>
+			<language type="jv">giavanisi</language>
+			<language type="ka">giurgianu</language>
+			<language type="kaa">kara-kalpak</language>
+			<language type="kab">kabyle</language>
+			<language type="kaj">jiu</language>
+			<language type="kam">kamba</language>
+			<language type="kde">makonde</language>
+			<language type="kea">capuvirdianu</language>
+			<language type="ken">kenyang</language>
+			<language type="kgp">kaingang</language>
+			<language type="khq">koyra chiini</language>
+			<language type="ki">kikuyu</language>
+			<language type="kk">kazzaku</language>
+			<language type="kkj">kako</language>
+			<language type="kl">kalaallisut</language>
+			<language type="kln">kalenjin</language>
+			<language type="km">khmer</language>
+			<language type="kn">kannada</language>
+			<language type="ko">curianu</language>
+			<language type="kok">konkani</language>
+			<language type="kpe">kpelle</language>
+			<language type="ks">kashmiri</language>
+			<language type="ksf">bafia</language>
+			<language type="ksh">culunisi</language>
+			<language type="ku">curdu</language>
+			<language type="ku" menu="core">curdu</language>
+			<language type="ku" menu="extension">kurmanji</language>
+			<language type="kw">còrnicu</language>
+			<language type="kxv">kuvi</language>
+			<language type="ky">kirghizzu</language>
+			<language type="la">latinu</language>
+			<language type="lag">langi</language>
+			<language type="lb">lussimmurghisi</language>
+			<language type="lg">ganda</language>
+			<language type="lij">lìguri</language>
+			<language type="lkt">lakota</language>
+			<language type="lld">ild</language>
+			<language type="lmo">lummardu</language>
+			<language type="ln">lingala</language>
+			<language type="lo">lau</language>
+			<language type="lou">criolu dâ Louisiana</language>
+			<language type="lt">lituanu</language>
+			<language type="ltg">latgallisi</language>
+			<language type="lu">luba-katanga</language>
+			<language type="luy">luyia</language>
+			<language type="lv">lèttuni</language>
+			<language type="mai">maithili</language>
+			<language type="mas">masai</language>
+			<language type="mdf">moksha</language>
+			<language type="mer">meru</language>
+			<language type="mfe">murisianu</language>
+			<language type="mg">margasciu</language>
+			<language type="mgh">makhuwa-meetto</language>
+			<language type="mgo">metaʼ</language>
+			<language type="mhn">muchenu</language>
+			<language type="mi">māori</language>
+			<language type="mic">mi'kmaw</language>
+			<language type="mk">macèduni</language>
+			<language type="ml">malayalam</language>
+			<language type="mn">mòngulu</language>
+			<language type="mni">manipuri</language>
+			<language type="moh">mohawk</language>
+			<language type="mr">marathi</language>
+			<language type="ms">malisi</language>
+			<language type="mt">mautisi</language>
+			<language type="mua">mundang</language>
+			<language type="mul">assai lingui</language>
+			<language type="mus">muscogee</language>
+			<language type="my">burmisi</language>
+			<language type="myv">erzya</language>
+			<language type="mzn">mazanderani</language>
+			<language type="naq">nama</language>
+			<language type="nb">nurviggisi Bokmål</language>
+			<language type="nds">tidiscu suttanu</language>
+			<language type="nds_NL">sàssuni suttanu</language>
+			<language type="ne">nipalisi</language>
+			<language type="nl">ulannisi</language>
+			<language type="nl_BE">ciammingu</language>
+			<language type="nmg">kwasio</language>
+			<language type="nn">nurbiggisi Nynorsk</language>
+			<language type="nnh">ngiemboon</language>
+			<language type="no">nurbiggisi</language>
+			<language type="nqo">n’ko</language>
+			<language type="nso">sothu di tramuntana</language>
+			<language type="nv">navajo</language>
+			<language type="oc">uccitanu</language>
+			<language type="or">orìa</language>
+			<language type="pa">punjabi</language>
+			<language type="pcm">pidgin niggirianu</language>
+			<language type="pl">pulaccu</language>
+			<language type="prg">prussianu</language>
+			<language type="ps">pashto</language>
+			<language type="pt">purtughisi</language>
+			<language type="pt_BR">purtughisi brasilianu</language>
+			<language type="pt_PT">purtughisi eurupeu</language>
+			<language type="qu">quechua</language>
+			<language type="quc">kʼicheʼ</language>
+			<language type="raj">rajasthani</language>
+			<language type="rm">rumanciu</language>
+			<language type="ro">rumenu</language>
+			<language type="ro_MD">murdavu</language>
+			<language type="ru">russu</language>
+			<language type="rw">kinyarwanda</language>
+			<language type="sa">sàscritu</language>
+			<language type="sah">yakut</language>
+			<language type="sat">santali</language>
+			<language type="sc">sardu</language>
+			<language type="scn">sicilianu</language>
+			<language type="sd">sindhi</language>
+			<language type="ses">koyraboro senni</language>
+			<language type="si">singalisi</language>
+			<language type="sk">sluvaccu</language>
+			<language type="sl">sluvenu</language>
+			<language type="smj">lule sami</language>
+			<language type="smn">inari sami</language>
+			<language type="so">sòmalu</language>
+			<language type="sq">arbanisi</language>
+			<language type="sr">serbu</language>
+			<language type="su">sunnanisi</language>
+			<language type="sv">svidisi</language>
+			<language type="sw">swahili</language>
+			<language type="syr">sirìacu</language>
+			<language type="szl">silisianu</language>
+			<language type="ta">tamil</language>
+			<language type="te">telugu</language>
+			<language type="tg">tajik</language>
+			<language type="th">tailannisi</language>
+			<language type="ti">tigrinya</language>
+			<language type="tk">turkmenu</language>
+			<language type="to">tunganu</language>
+			<language type="tr">turcu</language>
+			<language type="tt">tàtaru</language>
+			<language type="tzm">tamazight di l’Atlanti Cintrali</language>
+			<language type="ug">uyghur</language>
+			<language type="uk">ucrainu</language>
+			<language type="und">lingua scanusciuta</language>
+			<language type="ur">urdu</language>
+			<language type="uz">uzbeku</language>
+			<language type="vec">vènitu</language>
+			<language type="vi">vietnamisi</language>
+			<language type="vmw">makhuwa</language>
+			<language type="vo">volapük</language>
+			<language type="wo">wolof</language>
+			<language type="xh">xhosa</language>
+			<language type="xnr">kangri</language>
+			<language type="yo">yoruba</language>
+			<language type="yrl">nheengatu</language>
+			<language type="yue">cantunisi</language>
+			<language type="yue" alt="menu">cinisi cantunisi</language>
+			<language type="za">zhuang</language>
+			<language type="zh">cinisi</language>
+			<language type="zh" alt="menu">cinisi, mannarinu</language>
+			<language type="zh_Hans">cinisi simprificatu</language>
+			<language type="zh_Hans" alt="long">cinisi mannarinu simprificatu</language>
+			<language type="zh_Hant">cinisi tradizziunali</language>
+			<language type="zh_Hant" alt="long">cinisi mannarinu tradizziunali</language>
+			<language type="zu">zulu</language>
+			<language type="zxx">nuḍḍu cuntinutu linguìsticu</language>
 		</languages>
 		<scripts>
-			<script type="Adlm" draft="unconfirmed">adlam</script>
-			<script type="Arab" draft="unconfirmed">àrabbu</script>
-			<script type="Aran" draft="unconfirmed">nastaliq</script>
-			<script type="Armn" draft="unconfirmed">armenu</script>
-			<script type="Beng" draft="unconfirmed">bangla</script>
-			<script type="Bopo" draft="unconfirmed">bopomofo</script>
-			<script type="Brai" draft="unconfirmed">braille</script>
-			<script type="Cakm" draft="unconfirmed">chakma</script>
-			<script type="Cans" draft="unconfirmed">sillabbazzioni nurmalizzata di l’abburìggini canadisi</script>
-			<script type="Cher" draft="unconfirmed">cherokee</script>
-			<script type="Cyrl" draft="unconfirmed">cirìllicu</script>
-			<script type="Deva" draft="unconfirmed">devanagari</script>
-			<script type="Ethi" draft="unconfirmed">etìupi</script>
-			<script type="Geor" draft="unconfirmed">giurgianu</script>
-			<script type="Grek" draft="unconfirmed">grecu</script>
-			<script type="Gujr" draft="unconfirmed">gujarati</script>
-			<script type="Guru" draft="unconfirmed">gurmukhi</script>
-			<script type="Hanb" draft="unconfirmed">Han cu bopomofo</script>
-			<script type="Hang" draft="unconfirmed">Hangul</script>
-			<script type="Hani" draft="unconfirmed">Han</script>
-			<script type="Hans" draft="unconfirmed">simprificatu</script>
-			<script type="Hans" alt="stand-alone" draft="unconfirmed">Han simprificatu</script>
-			<script type="Hant" draft="unconfirmed">tradizziunali</script>
-			<script type="Hant" alt="stand-alone" draft="unconfirmed">Han tradizziunali</script>
-			<script type="Hebr" draft="unconfirmed">ebbràicu</script>
-			<script type="Hira" draft="unconfirmed">hiragana</script>
-			<script type="Hrkt" draft="unconfirmed">sillabbari giappunisi</script>
-			<script type="Jamo" draft="unconfirmed">jamo</script>
-			<script type="Jpan" draft="unconfirmed">giappunisi</script>
-			<script type="Kana" draft="unconfirmed">katakana</script>
-			<script type="Khmr" draft="unconfirmed">khmer</script>
-			<script type="Knda" draft="unconfirmed">kannada</script>
-			<script type="Kore" draft="unconfirmed">curianu</script>
-			<script type="Laoo" draft="unconfirmed">lao</script>
-			<script type="Latn" draft="unconfirmed">latinu</script>
-			<script type="Mlym" draft="unconfirmed">malayalam</script>
-			<script type="Mong" draft="unconfirmed">mòngulu</script>
-			<script type="Mtei" draft="unconfirmed">meitei mayek</script>
-			<script type="Mymr" draft="unconfirmed">myanmar</script>
-			<script type="Nkoo" draft="unconfirmed">n’ko</script>
-			<script type="Olck" draft="unconfirmed">ol chiki</script>
-			<script type="Orya" draft="unconfirmed">odia</script>
-			<script type="Rohg" draft="unconfirmed">hanifi</script>
-			<script type="Sinh" draft="unconfirmed">sinhala</script>
-			<script type="Sund" draft="unconfirmed">sunnanisi</script>
-			<script type="Syrc" draft="unconfirmed">sirìacu</script>
-			<script type="Taml" draft="unconfirmed">tamil</script>
-			<script type="Telu" draft="unconfirmed">telugu</script>
-			<script type="Tfng" draft="unconfirmed">tifinagh</script>
-			<script type="Thaa" draft="unconfirmed">thaana</script>
-			<script type="Thai" draft="unconfirmed">tailannisi</script>
-			<script type="Tibt" draft="unconfirmed">tibbitanu</script>
-			<script type="Vaii" draft="unconfirmed">vai</script>
-			<script type="Yiii" draft="unconfirmed">yi</script>
-			<script type="Zmth" draft="unconfirmed">nutazzioni matimàtica</script>
-			<script type="Zsye" draft="unconfirmed">emoji</script>
-			<script type="Zsym" draft="unconfirmed">sìmmuli</script>
-			<script type="Zxxx" draft="unconfirmed">nun scrittu</script>
-			<script type="Zyyy" draft="unconfirmed">cumuni</script>
-			<script type="Zzzz" draft="unconfirmed">scrittura scanusciuta</script>
+			<script type="Adlm">adlam</script>
+			<script type="Arab">àrabbu</script>
+			<script type="Aran">nastaliq</script>
+			<script type="Armn">armenu</script>
+			<script type="Bali">balinisi</script>
+			<script type="Beng">bangla</script>
+			<script type="Bopo">bopomofo</script>
+			<script type="Brai">braille</script>
+			<script type="Cakm">chakma</script>
+			<script type="Cans">sillabbazzioni nurmalizzata di l’abburìggini canadisi</script>
+			<script type="Cher">cherokee</script>
+			<script type="Cyrl">cirìllicu</script>
+			<script type="Deva">devanagari</script>
+			<script type="Ethi">etìupi</script>
+			<script type="Geor">giurgianu</script>
+			<script type="Grek">grecu</script>
+			<script type="Gujr">gujarati</script>
+			<script type="Guru">gurmukhi</script>
+			<script type="Hanb">Han cu bopomofo</script>
+			<script type="Hang">Hangul</script>
+			<script type="Hani">Han</script>
+			<script type="Hans">simprificatu</script>
+			<script type="Hans" alt="stand-alone">Han simprificatu</script>
+			<script type="Hant">tradizziunali</script>
+			<script type="Hant" alt="stand-alone">Han tradizziunali</script>
+			<script type="Hebr">ebbràicu</script>
+			<script type="Hira">hiragana</script>
+			<script type="Hrkt">sillabbari giappunisi</script>
+			<script type="Jamo">jamo</script>
+			<script type="Jpan">giappunisi</script>
+			<script type="Kana">katakana</script>
+			<script type="Khmr">khmer</script>
+			<script type="Knda">kannada</script>
+			<script type="Kore">curianu</script>
+			<script type="Laoo">lao</script>
+			<script type="Latn">latinu</script>
+			<script type="Mlym">malayalam</script>
+			<script type="Mong">mòngulu</script>
+			<script type="Mtei">meitei mayek</script>
+			<script type="Mymr">birmanu</script>
+			<script type="Nkoo">n’ko</script>
+			<script type="Olck">ol chiki</script>
+			<script type="Orya">orìa</script>
+			<script type="Rohg">hanifi</script>
+			<script type="Sinh">singalisi</script>
+			<script type="Sund">sunnanisi</script>
+			<script type="Syrc">sirìacu</script>
+			<script type="Taml">tamil</script>
+			<script type="Telu">telugu</script>
+			<script type="Tfng">tifinagh</script>
+			<script type="Thaa">thaana</script>
+			<script type="Thai">tailannisi</script>
+			<script type="Tibt">tibbitanu</script>
+			<script type="Vaii">vai</script>
+			<script type="Yiii">yi</script>
+			<script type="Zmth">nutazzioni matimàtica</script>
+			<script type="Zsye">emoji</script>
+			<script type="Zsym">sìmmuli</script>
+			<script type="Zxxx">nun scrittu</script>
+			<script type="Zyyy">cumuni</script>
+			<script type="Zzzz">scrittura scanusciuta</script>
 		</scripts>
 		<territories>
-			<territory type="001" draft="unconfirmed">Munnu</territory>
-			<territory type="002" draft="unconfirmed">Àfrica</territory>
-			<territory type="003" draft="unconfirmed">Mèrica di tramuntana cuntinintali</territory>
-			<territory type="005" draft="unconfirmed">Mèrica di sciroccu</territory>
-			<territory type="009" draft="unconfirmed">Uciània</territory>
-			<territory type="011" draft="unconfirmed">Àfrica punintina</territory>
-			<territory type="013" draft="unconfirmed">Mèrica cintrali</territory>
-			<territory type="014" draft="unconfirmed">Àfrica livantina</territory>
-			<territory type="015" draft="unconfirmed">Àfrica di tramuntana</territory>
-			<territory type="017" draft="unconfirmed">Àfrica di menzu</territory>
-			<territory type="018" draft="unconfirmed">Àfrica di sciroccu</territory>
-			<territory type="019" draft="unconfirmed">Mèrichi</territory>
-			<territory type="021" draft="unconfirmed">Mèrica di tramuntana</territory>
-			<territory type="029" draft="unconfirmed">Caràibbi</territory>
-			<territory type="030" draft="unconfirmed">Asia livantina</territory>
-			<territory type="034" draft="unconfirmed">Asia di sciroccu</territory>
-			<territory type="035" draft="unconfirmed">Asia di sciroccu-livantina</territory>
-			<territory type="039" draft="unconfirmed">Europa di sciroccu</territory>
-			<territory type="053" draft="unconfirmed">Australasia</territory>
-			<territory type="054" draft="unconfirmed">Milanesia</territory>
-			<territory type="057" draft="unconfirmed">Riggiuni dâ Micrunesia</territory>
-			<territory type="061" draft="unconfirmed">Pulinesia</territory>
-			<territory type="142" draft="unconfirmed">Asia</territory>
-			<territory type="143" draft="unconfirmed">Asia cintrali</territory>
-			<territory type="145" draft="unconfirmed">Asia punintina</territory>
-			<territory type="150" draft="unconfirmed">Europa</territory>
-			<territory type="151" draft="unconfirmed">Europa livantina</territory>
-			<territory type="154" draft="unconfirmed">Europa di tramuntana</territory>
-			<territory type="155" draft="unconfirmed">Europa punintina</territory>
-			<territory type="202" draft="unconfirmed">Àfrica sutta-sahariana</territory>
-			<territory type="419" draft="unconfirmed">Mèrica latina</territory>
-			<territory type="AC" draft="unconfirmed">Ìsula d’Ascinziuni</territory>
-			<territory type="AD" draft="unconfirmed">Annorra</territory>
-			<territory type="AE" draft="unconfirmed">Emirati Àrabbi Junciuti</territory>
-			<territory type="AF" draft="unconfirmed">Afghànistan</territory>
-			<territory type="AG" draft="unconfirmed">Antigua e Barbuda</territory>
-			<territory type="AI" draft="unconfirmed">Anguilla</territory>
-			<territory type="AL" draft="unconfirmed">Arbanìa</territory>
-			<territory type="AM" draft="unconfirmed">Armenia</territory>
-			<territory type="AO" draft="unconfirmed">Angola</territory>
-			<territory type="AQ" draft="unconfirmed">Antàrtidi</territory>
-			<territory type="AR" draft="unconfirmed">Argintina</territory>
-			<territory type="AS" draft="unconfirmed">Samoa Miricani</territory>
-			<territory type="AT" draft="unconfirmed">Austria</territory>
-			<territory type="AU" draft="unconfirmed">Australia</territory>
-			<territory type="AW" draft="unconfirmed">Aruba</territory>
-			<territory type="AX" draft="unconfirmed">Ìsuli Åland</territory>
-			<territory type="AZ" draft="unconfirmed">Azerbaijan</territory>
-			<territory type="BA" draft="unconfirmed">Bosnia e Herzegòvina</territory>
-			<territory type="BB" draft="unconfirmed">Barbados</territory>
-			<territory type="BD" draft="unconfirmed">Bàngladesh</territory>
-			<territory type="BE" draft="unconfirmed">Bergiu</territory>
-			<territory type="BF" draft="unconfirmed">Burkina Fasu</territory>
-			<territory type="BG" draft="unconfirmed">Burgarìa</territory>
-			<territory type="BH" draft="unconfirmed">Bahrain</territory>
-			<territory type="BI" draft="unconfirmed">Burundi</territory>
-			<territory type="BJ" draft="unconfirmed">Benin</territory>
-			<territory type="BL" draft="unconfirmed">St. Barthélemy</territory>
-			<territory type="BM" draft="unconfirmed">Birmuda</territory>
-			<territory type="BN" draft="unconfirmed">Brunei</territory>
-			<territory type="BO" draft="unconfirmed">Bulivia</territory>
-			<territory type="BQ" draft="unconfirmed">Caràibbi ulannisi</territory>
-			<territory type="BR" draft="unconfirmed">Brasili</territory>
-			<territory type="BS" draft="unconfirmed">Bahamas</territory>
-			<territory type="BT" draft="unconfirmed">Bhutan</territory>
-			<territory type="BV" draft="unconfirmed">Ìsula Bouvet</territory>
-			<territory type="BW" draft="unconfirmed">Botswana</territory>
-			<territory type="BY" draft="unconfirmed">Belurussia</territory>
-			<territory type="BZ" draft="unconfirmed">Bilisi</territory>
-			<territory type="CA" draft="unconfirmed">Cànada</territory>
-			<territory type="CC" draft="unconfirmed">Ìsuli Cocos (Keeling)</territory>
-			<territory type="CD" draft="unconfirmed">Congu - Kinshasa</territory>
-			<territory type="CD" alt="variant" draft="unconfirmed">Congu (RDC)</territory>
-			<territory type="CF" draft="unconfirmed">Ripùbblica Centrafricana</territory>
-			<territory type="CG" draft="unconfirmed">Congu - Brazzaville</territory>
-			<territory type="CG" alt="variant" draft="unconfirmed">Congu (Ripùbblica)</territory>
-			<territory type="CH" draft="unconfirmed">Sbìzzira</territory>
-			<territory type="CI" draft="unconfirmed">Custa d’Avoriu</territory>
-			<territory type="CK" draft="unconfirmed">Ìsuli Cook</territory>
-			<territory type="CL" draft="unconfirmed">Cili</territory>
-			<territory type="CM" draft="unconfirmed">Càmerun</territory>
-			<territory type="CN" draft="unconfirmed">Cina</territory>
-			<territory type="CO" draft="unconfirmed">Culommia</territory>
-			<territory type="CP" draft="unconfirmed">Ìsula di Clipperton</territory>
-			<territory type="CR" draft="unconfirmed">Custa Rica</territory>
-			<territory type="CU" draft="unconfirmed">Cubba</territory>
-			<territory type="CV" draft="unconfirmed">Capu Virdi</territory>
-			<territory type="CW" draft="unconfirmed">Curaçao</territory>
-			<territory type="CX" draft="unconfirmed">Ìsula di Natali</territory>
-			<territory type="CY" draft="unconfirmed">Cipru</territory>
-			<territory type="CZ" draft="unconfirmed">Cechia</territory>
-			<territory type="CZ" alt="variant" draft="unconfirmed">Ripùbblica Ceca</territory>
-			<territory type="DE" draft="unconfirmed">Girmania</territory>
-			<territory type="DG" draft="unconfirmed">Diego Garcia</territory>
-			<territory type="DJ" draft="unconfirmed">Gibbuti</territory>
-			<territory type="DK" draft="unconfirmed">Danimarca</territory>
-			<territory type="DM" draft="unconfirmed">Dumìnica</territory>
-			<territory type="DO" draft="unconfirmed">Ripùbblica Duminicana</territory>
-			<territory type="DZ" draft="unconfirmed">Algirìa</territory>
-			<territory type="EA" draft="unconfirmed">Ceuta e Miliḍḍa</territory>
-			<territory type="EC" draft="unconfirmed">Ècuador</territory>
-			<territory type="EE" draft="unconfirmed">Estonia</territory>
-			<territory type="EG" draft="unconfirmed">Eggittu</territory>
-			<territory type="EH" draft="unconfirmed">Sahara punintinu</territory>
-			<territory type="ER" draft="unconfirmed">Eritrea</territory>
-			<territory type="ES" draft="unconfirmed">Spagna</territory>
-			<territory type="ET" draft="unconfirmed">Etiopia</territory>
-			<territory type="EU" draft="unconfirmed">Uniuni Eurupea</territory>
-			<territory type="EZ" draft="unconfirmed">Zuna Euru</territory>
-			<territory type="FI" draft="unconfirmed">Fillannia</territory>
-			<territory type="FJ" draft="unconfirmed">Figi</territory>
-			<territory type="FK" draft="unconfirmed">Ìsuli Falkland</territory>
-			<territory type="FK" alt="variant" draft="unconfirmed">Ìsuli Falkland (Ìsuli Marvini)</territory>
-			<territory type="FM" draft="unconfirmed">Micrunisia</territory>
-			<territory type="FO" draft="unconfirmed">Ìsuli Faroe</territory>
-			<territory type="FR" draft="unconfirmed">Franza</territory>
-			<territory type="GA" draft="unconfirmed">Gabon</territory>
-			<territory type="GB" draft="unconfirmed">Regnu Junciutu</territory>
-			<territory type="GB" alt="short" draft="unconfirmed">RJ</territory>
-			<territory type="GD" draft="unconfirmed">Grenada</territory>
-			<territory type="GE" draft="unconfirmed">Giorgia</territory>
-			<territory type="GF" draft="unconfirmed">Guiana Francisi</territory>
-			<territory type="GG" draft="unconfirmed">Guernsey</territory>
-			<territory type="GH" draft="unconfirmed">Ghana</territory>
-			<territory type="GI" draft="unconfirmed">Gibbirterra</territory>
-			<territory type="GL" draft="unconfirmed">Gruillannia</territory>
-			<territory type="GM" draft="unconfirmed">Gammia</territory>
-			<territory type="GN" draft="unconfirmed">Guinìa</territory>
-			<territory type="GP" draft="unconfirmed">Guadalupa</territory>
-			<territory type="GQ" draft="unconfirmed">Guinìa Equaturiali</territory>
-			<territory type="GR" draft="unconfirmed">Grecia</territory>
-			<territory type="GS" draft="unconfirmed">Giorgia di sciroccu e Ìsuli Sandwich australi</territory>
-			<territory type="GT" draft="unconfirmed">Guatimala</territory>
-			<territory type="GU" draft="unconfirmed">Guam</territory>
-			<territory type="GW" draft="unconfirmed">Guinìa-Bissau</territory>
-			<territory type="GY" draft="unconfirmed">Guiana</territory>
-			<territory type="HK" draft="unconfirmed">Hong Kong RAS dâ Cina</territory>
-			<territory type="HK" alt="short" draft="unconfirmed">Hong Kong</territory>
-			<territory type="HM" draft="unconfirmed">Ìsuli Heard e McDonald</territory>
-			<territory type="HN" draft="unconfirmed">Hunnuras</territory>
-			<territory type="HR" draft="unconfirmed">Cruazzia</territory>
-			<territory type="HT" draft="unconfirmed">Haiti</territory>
-			<territory type="HU" draft="unconfirmed">Ungarìa</territory>
-			<territory type="IC" draft="unconfirmed">Ìsuli Canari</territory>
-			<territory type="ID" draft="unconfirmed">Innunesia</territory>
-			<territory type="IE" draft="unconfirmed">Irlanna</territory>
-			<territory type="IL" draft="unconfirmed">Isdraeli</territory>
-			<territory type="IM" draft="unconfirmed">Ìsula di Man</territory>
-			<territory type="IN" draft="unconfirmed">Innia</territory>
-			<territory type="IO" draft="unconfirmed">Tirritoriu Ucianicu di l’Innia Britànnica</territory>
-			<territory type="IO" alt="chagos" draft="unconfirmed">Arcipèlagu Chagos</territory>
-			<territory type="IQ" draft="unconfirmed">Iraq</territory>
-			<territory type="IR" draft="unconfirmed">Iran</territory>
-			<territory type="IS" draft="unconfirmed">Islanna</territory>
-			<territory type="IT" draft="unconfirmed">Italia</territory>
-			<territory type="JE" draft="unconfirmed">Jersey</territory>
-			<territory type="JM" draft="unconfirmed">Giamàica</territory>
-			<territory type="JO" draft="unconfirmed">Giurdania</territory>
-			<territory type="JP" draft="unconfirmed">Giappuni</territory>
-			<territory type="KE" draft="unconfirmed">Kenya</territory>
-			<territory type="KG" draft="unconfirmed">Kyrgyzistan</territory>
-			<territory type="KH" draft="unconfirmed">Camboggia</territory>
-			<territory type="KI" draft="unconfirmed">Kiribati</territory>
-			<territory type="KM" draft="unconfirmed">Còmoros</territory>
-			<territory type="KN" draft="unconfirmed">S. Kitts e Nevis</territory>
-			<territory type="KP" draft="unconfirmed">Curìa di Tramuntana</territory>
-			<territory type="KR" draft="unconfirmed">Curìa di Sciroccu</territory>
-			<territory type="KW" draft="unconfirmed">Kuwait</territory>
-			<territory type="KY" draft="unconfirmed">Ìsuli Cayman</territory>
-			<territory type="KZ" draft="unconfirmed">Kazzàkistan</territory>
-			<territory type="LA" draft="unconfirmed">Laos</territory>
-			<territory type="LB" draft="unconfirmed">Lìbbanu</territory>
-			<territory type="LC" draft="unconfirmed">Santa Lucìa</territory>
-			<territory type="LI" draft="unconfirmed">Liechtenstein</territory>
-			<territory type="LK" draft="unconfirmed">Sri Lanka</territory>
-			<territory type="LR" draft="unconfirmed">Libberia</territory>
-			<territory type="LS" draft="unconfirmed">Lisothu</territory>
-			<territory type="LT" draft="unconfirmed">Lituania</territory>
-			<territory type="LU" draft="unconfirmed">Lussimmurgu</territory>
-			<territory type="LV" draft="unconfirmed">Littonia</territory>
-			<territory type="LY" draft="unconfirmed">Libbia</territory>
-			<territory type="MA" draft="unconfirmed">Maroccu</territory>
-			<territory type="MC" draft="unconfirmed">Mònacu</territory>
-			<territory type="MD" draft="unconfirmed">Murdova</territory>
-			<territory type="ME" draft="unconfirmed">Muntinegru</territory>
-			<territory type="MF" draft="unconfirmed">San Martinu</territory>
-			<territory type="MG" draft="unconfirmed">Madagascàr</territory>
-			<territory type="MH" draft="unconfirmed">Ìsuli Marshall</territory>
-			<territory type="MK" draft="unconfirmed">Macidonia di tramuntana</territory>
-			<territory type="ML" draft="unconfirmed">Mali</territory>
-			<territory type="MM" draft="unconfirmed">Myanmar (Burma)</territory>
-			<territory type="MN" draft="unconfirmed">Mungolia</territory>
-			<territory type="MO" draft="unconfirmed">Macau RAS dâ Cina</territory>
-			<territory type="MO" alt="short" draft="unconfirmed">Macau</territory>
-			<territory type="MP" draft="unconfirmed">Ìsuli Marianna di Tramuntana</territory>
-			<territory type="MQ" draft="unconfirmed">Martinica</territory>
-			<territory type="MR" draft="unconfirmed">Mauritania</territory>
-			<territory type="MS" draft="unconfirmed">Munzirratu</territory>
-			<territory type="MT" draft="unconfirmed">Mauta</territory>
-			<territory type="MU" draft="unconfirmed">Mauritius</territory>
-			<territory type="MV" draft="unconfirmed">Mardivi</territory>
-			<territory type="MW" draft="unconfirmed">Malawi</territory>
-			<territory type="MX" draft="unconfirmed">Mèssicu</territory>
-			<territory type="MY" draft="unconfirmed">Malesia</territory>
-			<territory type="MZ" draft="unconfirmed">Muzzammicu</territory>
-			<territory type="NA" draft="unconfirmed">Namibbia</territory>
-			<territory type="NC" draft="unconfirmed">Nova Calidonia</territory>
-			<territory type="NE" draft="unconfirmed">Niger</territory>
-			<territory type="NF" draft="unconfirmed">Ìsula Norfolk</territory>
-			<territory type="NG" draft="unconfirmed">Niggeria</territory>
-			<territory type="NI" draft="unconfirmed">Nicaragua</territory>
-			<territory type="NL" draft="unconfirmed">Paisi Vasci</territory>
-			<territory type="NO" draft="unconfirmed">Nurveggia</territory>
-			<territory type="NP" draft="unconfirmed">Nepal</territory>
-			<territory type="NR" draft="unconfirmed">Nauru</territory>
-			<territory type="NU" draft="unconfirmed">Niue</territory>
-			<territory type="NZ" draft="unconfirmed">Nova Zilannia</territory>
-			<territory type="NZ" alt="variant" draft="unconfirmed">Aotearoa Nova Zilannia</territory>
-			<territory type="OM" draft="unconfirmed">Oman</territory>
-			<territory type="PA" draft="unconfirmed">Pànama</territory>
-			<territory type="PE" draft="unconfirmed">Pirù</territory>
-			<territory type="PF" draft="unconfirmed">Pulinisia Francisi</territory>
-			<territory type="PG" draft="unconfirmed">Papua Nova Guinìa</territory>
-			<territory type="PH" draft="unconfirmed">Filippini</territory>
-			<territory type="PK" draft="unconfirmed">Pàkistan</territory>
-			<territory type="PL" draft="unconfirmed">Pulonia</territory>
-			<territory type="PM" draft="unconfirmed">S. Pierre e Miquelon</territory>
-			<territory type="PN" draft="unconfirmed">Ìsuli Pitcairn</territory>
-			<territory type="PR" draft="unconfirmed">Portu Ricu</territory>
-			<territory type="PS" draft="unconfirmed">Tirritori Palistinesi</territory>
-			<territory type="PS" alt="short" draft="unconfirmed">Palistina</territory>
-			<territory type="PT" draft="unconfirmed">Purtugallu</territory>
-			<territory type="PW" draft="unconfirmed">Palau</territory>
-			<territory type="PY" draft="unconfirmed">Paraguay</territory>
-			<territory type="QA" draft="unconfirmed">Qatar</territory>
-			<territory type="QO" draft="unconfirmed">Uciània di fora</territory>
-			<territory type="RE" draft="unconfirmed">Réunion</territory>
-			<territory type="RO" draft="unconfirmed">Rumanìa</territory>
-			<territory type="RS" draft="unconfirmed">Serbia</territory>
-			<territory type="RU" draft="unconfirmed">Russia</territory>
-			<territory type="RW" draft="unconfirmed">Ruanna</territory>
-			<territory type="SA" draft="unconfirmed">Arabbia Saudita</territory>
-			<territory type="SB" draft="unconfirmed">Ìsuli Salumuni</territory>
-			<territory type="SC" draft="unconfirmed">Seychelles</territory>
-			<territory type="SD" draft="unconfirmed">Sudan</territory>
-			<territory type="SE" draft="unconfirmed">Sbezzia</territory>
-			<territory type="SG" draft="unconfirmed">Singapuri</territory>
-			<territory type="SH" draft="unconfirmed">Sant’Èlina</territory>
-			<territory type="SI" draft="unconfirmed">Sluvenia</territory>
-			<territory type="SJ" draft="unconfirmed">Svalbard e Jan Mayen</territory>
-			<territory type="SK" draft="unconfirmed">Sluvacchia</territory>
-			<territory type="SL" draft="unconfirmed">Sierra Liuni</territory>
-			<territory type="SM" draft="unconfirmed">San Marinu</territory>
-			<territory type="SN" draft="unconfirmed">Sènigal</territory>
-			<territory type="SO" draft="unconfirmed">Sumalia</territory>
-			<territory type="SR" draft="unconfirmed">Surinami</territory>
-			<territory type="SS" draft="unconfirmed">Sudan di sciroccu</territory>
-			<territory type="ST" draft="unconfirmed">São Tomé e Príncipe</territory>
-			<territory type="SV" draft="unconfirmed">El Salvador</territory>
-			<territory type="SX" draft="unconfirmed">Sint Maarten</territory>
-			<territory type="SY" draft="unconfirmed">Siria</territory>
-			<territory type="SZ" draft="unconfirmed">Eswatini</territory>
-			<territory type="SZ" alt="variant" draft="unconfirmed">Swazilannia</territory>
-			<territory type="TA" draft="unconfirmed">Tristan da Cunha</territory>
-			<territory type="TC" draft="unconfirmed">Ìsuli Turks e Càicos</territory>
-			<territory type="TD" draft="unconfirmed">Chad</territory>
-			<territory type="TF" draft="unconfirmed">Tirritori Francisi di Sciroccu</territory>
-			<territory type="TG" draft="unconfirmed">Togu</territory>
-			<territory type="TH" draft="unconfirmed">Tailannia</territory>
-			<territory type="TJ" draft="unconfirmed">Tajìkistan</territory>
-			<territory type="TK" draft="unconfirmed">Tukilau</territory>
-			<territory type="TL" draft="unconfirmed">Timor-Leste</territory>
-			<territory type="TL" alt="variant" draft="unconfirmed">Timor di Livanti</territory>
-			<territory type="TM" draft="unconfirmed">Turkmènistan</territory>
-			<territory type="TN" draft="unconfirmed">Tunisìa</territory>
-			<territory type="TO" draft="unconfirmed">Tonga</territory>
-			<territory type="TR" draft="unconfirmed">Turchìa</territory>
-			<territory type="TT" draft="unconfirmed">Trinidad e Tobago</territory>
-			<territory type="TV" draft="unconfirmed">Tuvalu</territory>
-			<territory type="TW" draft="unconfirmed">Taiwan</territory>
-			<territory type="TZ" draft="unconfirmed">Tanzania</territory>
-			<territory type="UA" draft="unconfirmed">Ucraina</territory>
-			<territory type="UG" draft="unconfirmed">Uganna</territory>
-			<territory type="UM" draft="unconfirmed">Ìsuli Miricani di Fora</territory>
-			<territory type="UN" draft="unconfirmed">Nazziuna Junciuti</territory>
-			<territory type="US" draft="unconfirmed">Stati Junciuti</territory>
-			<territory type="US" alt="short" draft="unconfirmed">SJM</territory>
-			<territory type="UY" draft="unconfirmed">Uruguay</territory>
-			<territory type="UZ" draft="unconfirmed">Uzbèkistan</territory>
-			<territory type="VA" draft="unconfirmed">Città dû Vaticanu</territory>
-			<territory type="VC" draft="unconfirmed">S. Vincent e Grenadine</territory>
-			<territory type="VE" draft="unconfirmed">Vinizzuela</territory>
-			<territory type="VG" draft="unconfirmed">Ìsuli Vìrgini Britànnichi</territory>
-			<territory type="VI" draft="unconfirmed">Ìsuli Vìrgini Miricani</territory>
-			<territory type="VN" draft="unconfirmed">Vietnam</territory>
-			<territory type="VU" draft="unconfirmed">Vanuatu</territory>
-			<territory type="WF" draft="unconfirmed">Wallis e Futuna</territory>
-			<territory type="WS" draft="unconfirmed">Samoa</territory>
-			<territory type="XA" draft="unconfirmed">Accenti fausi</territory>
-			<territory type="XB" draft="unconfirmed">Bidirizziunali fausu</territory>
-			<territory type="XK" draft="unconfirmed">Kòssuvu</territory>
-			<territory type="YE" draft="unconfirmed">Yemen</territory>
-			<territory type="YT" draft="unconfirmed">Mayotte</territory>
-			<territory type="ZA" draft="unconfirmed">Africa di sciroccu</territory>
-			<territory type="ZM" draft="unconfirmed">Zammia</territory>
-			<territory type="ZW" draft="unconfirmed">Zimbabwe</territory>
-			<territory type="ZZ" draft="unconfirmed">Riggiuni scanusciuta</territory>
+			<territory type="001">Munnu</territory>
+			<territory type="002">Àfrica</territory>
+			<territory type="003">Mèrica di tramuntana cuntinintali</territory>
+			<territory type="005">Mèrica di sciroccu</territory>
+			<territory type="009">Uciània</territory>
+			<territory type="011">Àfrica punintina</territory>
+			<territory type="013">Mèrica cintrali</territory>
+			<territory type="014">Àfrica livantina</territory>
+			<territory type="015">Àfrica di tramuntana</territory>
+			<territory type="017">Àfrica di menzu</territory>
+			<territory type="018">Àfrica di sciroccu</territory>
+			<territory type="019">Mèrichi</territory>
+			<territory type="021">Mèrica di tramuntana</territory>
+			<territory type="029">Caràibbi</territory>
+			<territory type="030">Asia livantina</territory>
+			<territory type="034">Asia di sciroccu</territory>
+			<territory type="035">Asia di sciroccu-livantina</territory>
+			<territory type="039">Europa di sciroccu</territory>
+			<territory type="053">Australasia</territory>
+			<territory type="054">Milanesia</territory>
+			<territory type="057">Riggiuni dâ Micrunesia</territory>
+			<territory type="061">Pulinesia</territory>
+			<territory type="142">Asia</territory>
+			<territory type="143">Asia cintrali</territory>
+			<territory type="145">Asia punintina</territory>
+			<territory type="150">Europa</territory>
+			<territory type="151">Europa livantina</territory>
+			<territory type="154">Europa di tramuntana</territory>
+			<territory type="155">Europa punintina</territory>
+			<territory type="202">Àfrica sutta-sahariana</territory>
+			<territory type="419">Mèrica latina</territory>
+			<territory type="AC">Ìsula d’Ascinziuni</territory>
+			<territory type="AD">Annorra</territory>
+			<territory type="AE">Emirati Àrabbi Junciuti</territory>
+			<territory type="AF">Afghànistan</territory>
+			<territory type="AG">Antigua e Barbuda</territory>
+			<territory type="AI">Anguilla</territory>
+			<territory type="AL">Arbanìa</territory>
+			<territory type="AM">Armenia</territory>
+			<territory type="AO">Angola</territory>
+			<territory type="AQ">Antàrtidi</territory>
+			<territory type="AR">Argintina</territory>
+			<territory type="AS">Samoa Miricani</territory>
+			<territory type="AT">Austria</territory>
+			<territory type="AU">Australia</territory>
+			<territory type="AW">Aruba</territory>
+			<territory type="AX">Ìsuli Åland</territory>
+			<territory type="AZ">Azerbaijan</territory>
+			<territory type="BA">Bosnia e Herzegòvina</territory>
+			<territory type="BB">Barbados</territory>
+			<territory type="BD">Bàngladesh</territory>
+			<territory type="BE">Bergiu</territory>
+			<territory type="BF">Burkina Fasu</territory>
+			<territory type="BG">Burgarìa</territory>
+			<territory type="BH">Bahrain</territory>
+			<territory type="BI">Burunni</territory>
+			<territory type="BJ">Benin</territory>
+			<territory type="BL">St. Barthélemy</territory>
+			<territory type="BM">Birmuda</territory>
+			<territory type="BN">Brunei</territory>
+			<territory type="BO">Bulivia</territory>
+			<territory type="BQ">Caràibbi ulannisi</territory>
+			<territory type="BR">Brasili</territory>
+			<territory type="BS">Bahamas</territory>
+			<territory type="BT">Bhutan</territory>
+			<territory type="BV">Ìsula Bouvet</territory>
+			<territory type="BW">Botswana</territory>
+			<territory type="BY">Bilurussia</territory>
+			<territory type="BZ">Bilisi</territory>
+			<territory type="CA">Cànada</territory>
+			<territory type="CC">Ìsuli Cocos (Keeling)</territory>
+			<territory type="CD">Congu - Kinshasa</territory>
+			<territory type="CD" alt="variant">Congu (RDC)</territory>
+			<territory type="CF">Ripùbblica Centrafricana</territory>
+			<territory type="CG">Congu - Brazzaville</territory>
+			<territory type="CG" alt="variant">Congu (Ripùbblica)</territory>
+			<territory type="CH">Sbìzzira</territory>
+			<territory type="CI">Custa d’Avoriu</territory>
+			<territory type="CK">Ìsuli Cook</territory>
+			<territory type="CL">Cili</territory>
+			<territory type="CM">Càmerun</territory>
+			<territory type="CN">Cina</territory>
+			<territory type="CO">Culommia</territory>
+			<territory type="CP">Ìsula di Clipperton</territory>
+			<territory type="CQ">Sark</territory>
+			<territory type="CR">Custa Rica</territory>
+			<territory type="CU">Cubba</territory>
+			<territory type="CV">Capu Virdi</territory>
+			<territory type="CW">Curaçao</territory>
+			<territory type="CX">Ìsula di Natali</territory>
+			<territory type="CY">Cipru</territory>
+			<territory type="CZ">Cechia</territory>
+			<territory type="CZ" alt="variant">Ripùbblica Ceca</territory>
+			<territory type="DE">Girmania</territory>
+			<territory type="DG">Diego Garcia</territory>
+			<territory type="DJ">Gibbuti</territory>
+			<territory type="DK">Danimarca</territory>
+			<territory type="DM">Dumìnica</territory>
+			<territory type="DO">Ripùbblica Duminicana</territory>
+			<territory type="DZ">Algirìa</territory>
+			<territory type="EA">Ceuta e Miliḍḍa</territory>
+			<territory type="EC">Ècuador</territory>
+			<territory type="EE">Estonia</territory>
+			<territory type="EG">Eggittu</territory>
+			<territory type="EH">Sahara punintinu</territory>
+			<territory type="ER">Eritrea</territory>
+			<territory type="ES">Spagna</territory>
+			<territory type="ET">Etiopia</territory>
+			<territory type="EU">Unioni Eurupea</territory>
+			<territory type="EZ">Zuna Euru</territory>
+			<territory type="FI">Fillannia</territory>
+			<territory type="FJ">Figi</territory>
+			<territory type="FK">Ìsuli Falkland</territory>
+			<territory type="FK" alt="variant">Ìsuli Falkland (Ìsuli Marvini)</territory>
+			<territory type="FM">Micrunisia</territory>
+			<territory type="FO">Ìsuli Faroe</territory>
+			<territory type="FR">Franza</territory>
+			<territory type="GA">Gabòn</territory>
+			<territory type="GB">Regnu Junciutu</territory>
+			<territory type="GB" alt="short">RJ</territory>
+			<territory type="GD">Grenada</territory>
+			<territory type="GE">Giorgia</territory>
+			<territory type="GF">Guiana Francisi</territory>
+			<territory type="GG">Guernsey</territory>
+			<territory type="GH">Ghana</territory>
+			<territory type="GI">Gibbirterra</territory>
+			<territory type="GL">Gruillannia</territory>
+			<territory type="GM">Gammia</territory>
+			<territory type="GN">Guinìa</territory>
+			<territory type="GP">Guadalupa</territory>
+			<territory type="GQ">Guinìa Equaturiali</territory>
+			<territory type="GR">Grecia</territory>
+			<territory type="GS">Giorgia di sciroccu e Ìsuli Sandwich australi</territory>
+			<territory type="GT">Guatimala</territory>
+			<territory type="GU">Guam</territory>
+			<territory type="GW">Guinìa-Bissau</territory>
+			<territory type="GY">Guiana</territory>
+			<territory type="HK">Hong Kong RAS dâ Cina</territory>
+			<territory type="HK" alt="short">Hong Kong</territory>
+			<territory type="HM">Ìsuli Heard e McDonald</territory>
+			<territory type="HN">Hunnuras</territory>
+			<territory type="HR">Cruazzia</territory>
+			<territory type="HT">Haiti</territory>
+			<territory type="HU">Ungarìa</territory>
+			<territory type="IC">Ìsuli Canari</territory>
+			<territory type="ID">Innunesia</territory>
+			<territory type="IE">Irlanna</territory>
+			<territory type="IL">Isdraeli</territory>
+			<territory type="IM">Ìsula di Man</territory>
+			<territory type="IN">Innia</territory>
+			<territory type="IO">Tirritoriu Uciànicu di l’Innia Britànnica</territory>
+			<territory type="IO" alt="chagos">Arcipèlagu Chagos</territory>
+			<territory type="IQ">Iraq</territory>
+			<territory type="IR">Iran</territory>
+			<territory type="IS">Islanna</territory>
+			<territory type="IT">Italia</territory>
+			<territory type="JE">Jersey</territory>
+			<territory type="JM">Giamàica</territory>
+			<territory type="JO">Giurdania</territory>
+			<territory type="JP">Giappuni</territory>
+			<territory type="KE">Kenya</territory>
+			<territory type="KG">Kirghìzzistan</territory>
+			<territory type="KH">Camboggia</territory>
+			<territory type="KI">Kiribati</territory>
+			<territory type="KM">Còmoros</territory>
+			<territory type="KN">S. Kitts e Nevis</territory>
+			<territory type="KP">Curìa di Tramuntana</territory>
+			<territory type="KR">Curìa di Sciroccu</territory>
+			<territory type="KW">Kuwait</territory>
+			<territory type="KY">Ìsuli Cayman</territory>
+			<territory type="KZ">Kazzàkistan</territory>
+			<territory type="LA">Laos</territory>
+			<territory type="LB">Lìbbanu</territory>
+			<territory type="LC">Santa Lucìa</territory>
+			<territory type="LI">Liechtenstein</territory>
+			<territory type="LK">Sri Lanka</territory>
+			<territory type="LR">Libberia</territory>
+			<territory type="LS">Lisothu</territory>
+			<territory type="LT">Lituania</territory>
+			<territory type="LU">Lussimmurgu</territory>
+			<territory type="LV">Littonia</territory>
+			<territory type="LY">Libbia</territory>
+			<territory type="MA">Maroccu</territory>
+			<territory type="MC">Mònacu</territory>
+			<territory type="MD">Murdova</territory>
+			<territory type="ME">Muntinegru</territory>
+			<territory type="MF">San Martinu</territory>
+			<territory type="MG">Madagascàr</territory>
+			<territory type="MH">Ìsuli Marshall</territory>
+			<territory type="MK">Macidonia di tramuntana</territory>
+			<territory type="ML">Mali</territory>
+			<territory type="MM">Myanmar (Birmania)</territory>
+			<territory type="MN">Mungolia</territory>
+			<territory type="MO">Macau RAS dâ Cina</territory>
+			<territory type="MO" alt="short">Macau</territory>
+			<territory type="MP">Ìsuli Marianna di Tramuntana</territory>
+			<territory type="MQ">Martinica</territory>
+			<territory type="MR">Mauritania</territory>
+			<territory type="MS">Munzirratu</territory>
+			<territory type="MT">Mauta</territory>
+			<territory type="MU">Maurizzius</territory>
+			<territory type="MV">Mardivi</territory>
+			<territory type="MW">Malawi</territory>
+			<territory type="MX">Mèssicu</territory>
+			<territory type="MY">Malesia</territory>
+			<territory type="MZ">Muzzammicu</territory>
+			<territory type="NA">Namibbia</territory>
+			<territory type="NC">Nova Calidonia</territory>
+			<territory type="NE">Niger</territory>
+			<territory type="NF">Ìsula Norfolk</territory>
+			<territory type="NG">Niggeria</territory>
+			<territory type="NI">Nicaragua</territory>
+			<territory type="NL">Pajisi Basci</territory>
+			<territory type="NO">Nurbeggia</territory>
+			<territory type="NP">Nepal</territory>
+			<territory type="NR">Nauru</territory>
+			<territory type="NU">Niue</territory>
+			<territory type="NZ">Nova Zilannia</territory>
+			<territory type="NZ" alt="variant">Aotearoa Nova Zilannia</territory>
+			<territory type="OM">Oman</territory>
+			<territory type="PA">Pànama</territory>
+			<territory type="PE">Pirù</territory>
+			<territory type="PF">Pulinisia Francisi</territory>
+			<territory type="PG">Papua Nova Guinìa</territory>
+			<territory type="PH">Filippini</territory>
+			<territory type="PK">Pàkistan</territory>
+			<territory type="PL">Pulonia</territory>
+			<territory type="PM">S. Pierre e Miquelon</territory>
+			<territory type="PN">Ìsuli Pitcairn</territory>
+			<territory type="PR">Portu Ricu</territory>
+			<territory type="PS">Tirritori Palistinesi</territory>
+			<territory type="PS" alt="short">Palistina</territory>
+			<territory type="PT">Purtugallu</territory>
+			<territory type="PW">Palau</territory>
+			<territory type="PY">Paraguay</territory>
+			<territory type="QA">Qatar</territory>
+			<territory type="QO">Uciània di fora</territory>
+			<territory type="RE">Riunion</territory>
+			<territory type="RO">Rumanìa</territory>
+			<territory type="RS">Serbia</territory>
+			<territory type="RU">Russia</territory>
+			<territory type="RW">Ruanna</territory>
+			<territory type="SA">Arabbia Saudita</territory>
+			<territory type="SB">Ìsuli Salumuni</territory>
+			<territory type="SC">Seychelles</territory>
+			<territory type="SD">Sudan</territory>
+			<territory type="SE">Sbezzia</territory>
+			<territory type="SG">Singapuri</territory>
+			<territory type="SH">Sant’Èlina</territory>
+			<territory type="SI">Sluvenia</territory>
+			<territory type="SJ">Svalbard e Jan Mayen</territory>
+			<territory type="SK">Sluvacchia</territory>
+			<territory type="SL">Sierra Liuni</territory>
+			<territory type="SM">San Marinu</territory>
+			<territory type="SN">Sènigal</territory>
+			<territory type="SO">Sumalia</territory>
+			<territory type="SR">Surinami</territory>
+			<territory type="SS">Sudan di sciroccu</territory>
+			<territory type="ST">São Tomé e Príncipe</territory>
+			<territory type="SV">El Salvador</territory>
+			<territory type="SX">Sint Maarten</territory>
+			<territory type="SY">Siria</territory>
+			<territory type="SZ">Eswatini</territory>
+			<territory type="SZ" alt="variant">Swazzilannia</territory>
+			<territory type="TA">Tristan da Cunha</territory>
+			<territory type="TC">Ìsuli Turks e Càicos</territory>
+			<territory type="TD">Chad</territory>
+			<territory type="TF">Tirritori Francisi di Sciroccu</territory>
+			<territory type="TG">Togu</territory>
+			<territory type="TH">Tailannia</territory>
+			<territory type="TJ">Tajìkistan</territory>
+			<territory type="TK">Tukilau</territory>
+			<territory type="TL">Timor-Leste</territory>
+			<territory type="TL" alt="variant">Timor di Livanti</territory>
+			<territory type="TM">Turkmènistan</territory>
+			<territory type="TN">Tunisìa</territory>
+			<territory type="TO">Tonga</territory>
+			<territory type="TR">Turchìa</territory>
+			<territory type="TT">Trinidad e Tobago</territory>
+			<territory type="TV">Tuvalu</territory>
+			<territory type="TW">Taiwan</territory>
+			<territory type="TZ">Tanzania</territory>
+			<territory type="UA">Ucraina</territory>
+			<territory type="UG">Uganna</territory>
+			<territory type="UM">Ìsuli Miricani di Fora</territory>
+			<territory type="UN">Nazzioni Junciuti</territory>
+			<territory type="US">Stati Junciuti</territory>
+			<territory type="US" alt="short">SJ</territory>
+			<territory type="UY">Uruguay</territory>
+			<territory type="UZ">Uzbèkistan</territory>
+			<territory type="VA">Città dû Vaticanu</territory>
+			<territory type="VC">S. Vincent e Grenadine</territory>
+			<territory type="VE">Vinizzuela</territory>
+			<territory type="VG">Ìsuli Vìrgini Britànnichi</territory>
+			<territory type="VI">Ìsuli Vìrgini Miricani</territory>
+			<territory type="VN">Vietnam</territory>
+			<territory type="VU">Vanuatu</territory>
+			<territory type="WF">Wallis e Futuna</territory>
+			<territory type="WS">Samoa</territory>
+			<territory type="XA">Accenti fausi</territory>
+			<territory type="XB">Bidirizziunali fausu</territory>
+			<territory type="XK">Kòssuvu</territory>
+			<territory type="YE">Yemen</territory>
+			<territory type="YT">Mayotte</territory>
+			<territory type="ZA">Àfrica di sciroccu</territory>
+			<territory type="ZM">Zammia</territory>
+			<territory type="ZW">Zimbabwe</territory>
+			<territory type="ZZ">Riggiuni scanusciuta</territory>
 		</territories>
 		<keys>
-			<key type="calendar" draft="unconfirmed">Calannariu</key>
-			<key type="ms" draft="unconfirmed">Sistema di misura</key>
-			<key type="numbers" draft="unconfirmed">Nùmmari</key>
+			<key type="calendar">Calannariu</key>
+			<key type="ms">Sistema di misura</key>
+			<key type="numbers">Nùmmari</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist" draft="unconfirmed">Calannariu buddista</type>
-			<type key="calendar" type="chinese" draft="unconfirmed">Calannariu cinisi</type>
-			<type key="calendar" type="coptic" draft="unconfirmed">Calannariu coptu</type>
-			<type key="calendar" type="dangi" draft="unconfirmed">Calannariu dangi</type>
-			<type key="calendar" type="ethiopic" draft="unconfirmed">Calannariu etìupi</type>
-			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">Calannariu etìupi Amete-Alem</type>
-			<type key="calendar" type="gregorian" draft="unconfirmed">Calannariu grigurianu</type>
-			<type key="calendar" type="hebrew" draft="unconfirmed">Calannariu ebbràicu</type>
-			<type key="calendar" type="islamic" draft="unconfirmed">Calannariu slàmicu</type>
-			<type key="calendar" type="islamic-civil" draft="unconfirmed">Calannariu slàmicu civili</type>
-			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">Calannariu slàmicu Umm Al-Qura</type>
-			<type key="calendar" type="iso8601" draft="unconfirmed">Calannariu ISO-8601</type>
-			<type key="calendar" type="japanese" draft="unconfirmed">Calannariu giappunisi</type>
-			<type key="calendar" type="persian" draft="unconfirmed">Calannariu pirsianu</type>
-			<type key="calendar" type="roc" draft="unconfirmed">Calannariu minguo</type>
-			<type key="collation" type="standard" draft="unconfirmed">Arringu Pridifinitu</type>
-			<type key="ms" type="metric" draft="unconfirmed">Sistema mètricu</type>
-			<type key="ms" type="uksystem" draft="unconfirmed">Sistema mpiriali</type>
-			<type key="ms" type="ussystem" draft="unconfirmed">Sistema miricanu</type>
-			<type key="numbers" type="latn" draft="unconfirmed">Nùmmari di Punenti</type>
+			<type key="calendar" type="buddhist">Calannariu buddista</type>
+			<type key="calendar" type="chinese">Calannariu cinisi</type>
+			<type key="calendar" type="coptic">Calannariu coptu</type>
+			<type key="calendar" type="dangi">Calannariu dangi</type>
+			<type key="calendar" type="ethiopic">Calannariu etìupi</type>
+			<type key="calendar" type="ethiopic-amete-alem">Calannariu etìupi Amete-Alem</type>
+			<type key="calendar" type="gregorian">Calannariu grigurianu</type>
+			<type key="calendar" type="gregorian" scope="core">Grigurianu</type>
+			<type key="calendar" type="hebrew">Calannariu ebbràicu</type>
+			<type key="calendar" type="islamic">Calannariu slàmicu</type>
+			<type key="calendar" type="islamic-civil">Calannariu slàmicu civili</type>
+			<type key="calendar" type="islamic-umalqura">Calannariu slàmicu Umm Al-Qura</type>
+			<type key="calendar" type="iso8601">Calannariu grigurianu (prima l’annu)</type>
+			<type key="calendar" type="japanese">Calannariu giappunisi</type>
+			<type key="calendar" type="persian">Calannariu pirsianu</type>
+			<type key="calendar" type="roc">Calannariu minguo</type>
+			<type key="collation" type="standard">Arringu pridifinutu</type>
+			<type key="collation" type="standard" scope="core">Pridifinutu</type>
+			<type key="ms" type="metric">Sistema mètricu</type>
+			<type key="ms" type="uksystem">Sistema mpiriali</type>
+			<type key="ms" type="ussystem">Sistema miricanu</type>
+			<type key="numbers" type="latn">Nùmmari di Punenti</type>
 		</types>
 		<measurementSystemNames>
-			<measurementSystemName type="metric" draft="unconfirmed">mètricu</measurementSystemName>
-			<measurementSystemName type="UK" draft="unconfirmed">ngrisi</measurementSystemName>
-			<measurementSystemName type="US" draft="unconfirmed">miricanu</measurementSystemName>
+			<measurementSystemName type="metric">mètricu</measurementSystemName>
+			<measurementSystemName type="UK">ngrisi</measurementSystemName>
+			<measurementSystemName type="US">miricanu</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
-			<codePattern type="language" draft="unconfirmed">Lingua: {0}</codePattern>
-			<codePattern type="script" draft="unconfirmed">Scrittura: {0}</codePattern>
-			<codePattern type="territory" draft="unconfirmed">Riggiuni: {0}</codePattern>
+			<codePattern type="language">Lingua: {0}</codePattern>
+			<codePattern type="script">Scrittura: {0}</codePattern>
+			<codePattern type="territory">Riggiuni: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[aàâ b c dḍ eèê f g h iìî j l m n oòô p q r s t uùû v z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[ç đ éë ə ḥ k š w x y]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I J L M N O P Q R S T U V Z]</exemplarCharacters>
-		<exemplarCharacters type="punctuation" draft="unconfirmed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="numbers" draft="contributed">[\- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9 ª ᵘ]</exemplarCharacters>
+		<exemplarCharacters type="punctuation" draft="contributed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@@ -710,172 +720,180 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="unconfirmed">EEEE d MMMM y G</pattern>
+							<pattern>EEEE d MMMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern draft="unconfirmed">d MMMM y G</pattern>
+							<pattern>d MMMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern draft="unconfirmed">d MMM y G</pattern>
+							<pattern>d MMM y G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">dd/MM/y GGGGG</pattern>
+							<pattern>dd/MM/y GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1} 'a' 'l''''uri' {0}</pattern>
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1} 'a' 'l''''uri' {0}</pattern>
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="unconfirmed">E hh:mm a</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="unconfirmed">E hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="hm" draft="unconfirmed">hh:mm a</dateFormatItem>
-						<dateFormatItem id="hms" draft="unconfirmed">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Md" draft="unconfirmed">d/M</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">E d/M</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="unconfirmed">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
-						<dateFormatItem id="y" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="yyyy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM" draft="unconfirmed">M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd" draft="unconfirmed">d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd" draft="unconfirmed">E d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMM" draft="unconfirmed">MMMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd" draft="unconfirmed">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM" draft="unconfirmed">MMMM y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ" draft="unconfirmed">QQQ/y G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ" draft="unconfirmed">QQQQ 'dû' y G</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Ehm">E hh:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E MM/dd/y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
+						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E d/M</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="y">y G</dateFormatItem>
+						<dateFormatItem id="yyyy">y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">MMMM y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">QQQ/y G</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">QQQQ 'dû' y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y–y G</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G" draft="unconfirmed">M/y GGGGG – M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d" draft="unconfirmed">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/M/y – E d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E dd/MM/y GGGGG – E dd/MM/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/M/y – E d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/M/y – E d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">E dd/MM/y GGGGG – E dd/MM/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E d MMM y G – E d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d MMM y – E d MMM y G</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M" draft="unconfirmed">M – M</greatestDifference>
+							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">d/M – d/M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/M – d/M</greatestDifference>
+							<greatestDifference id="d">d/M – d/M</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/M – E d/M</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y G</greatestDifference>
+							<greatestDifference id="y">y–y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/M/y – E d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/M/y – E d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/M/y – E d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d MMM y – E d MMM y G</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMMM–MMMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y G</greatestDifference>
+							<greatestDifference id="M">MMMM–MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -884,391 +902,352 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">jin</month>
-							<month type="2" draft="unconfirmed">fri</month>
-							<month type="3" draft="unconfirmed">mar</month>
-							<month type="4" draft="unconfirmed">apr</month>
-							<month type="5" draft="unconfirmed">maj</month>
-							<month type="6" draft="unconfirmed">giu</month>
-							<month type="7" draft="unconfirmed">gnt</month>
-							<month type="8" draft="unconfirmed">agu</month>
-							<month type="9" draft="unconfirmed">sit</month>
-							<month type="10" draft="unconfirmed">utt</month>
-							<month type="11" draft="unconfirmed">nuv</month>
-							<month type="12" draft="unconfirmed">dic</month>
+							<month type="1">jin</month>
+							<month type="2">fri</month>
+							<month type="3">mar</month>
+							<month type="4">apr</month>
+							<month type="5">maj</month>
+							<month type="6">giu</month>
+							<month type="7">gnt</month>
+							<month type="8">agu</month>
+							<month type="9">sit</month>
+							<month type="10">utt</month>
+							<month type="11">nuv</month>
+							<month type="12">dic</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">jinnaru</month>
-							<month type="2" draft="unconfirmed">frivaru</month>
-							<month type="3" draft="unconfirmed">marzu</month>
-							<month type="4" draft="unconfirmed">aprili</month>
-							<month type="5" draft="unconfirmed">maju</month>
-							<month type="6" draft="unconfirmed">giugnu</month>
-							<month type="7" draft="unconfirmed">giugnettu</month>
-							<month type="8" draft="unconfirmed">agustu</month>
-							<month type="9" draft="unconfirmed">sittèmmiru</month>
-							<month type="10" draft="unconfirmed">uttùviru</month>
-							<month type="11" draft="unconfirmed">nuvèmmiru</month>
-							<month type="12" draft="unconfirmed">dicèmmiru</month>
+							<month type="1">jinnaru</month>
+							<month type="2">frivaru</month>
+							<month type="3">marzu</month>
+							<month type="4">aprili</month>
+							<month type="5">maju</month>
+							<month type="6">giugnu</month>
+							<month type="7">giugnettu</month>
+							<month type="8">agustu</month>
+							<month type="9">sittèmmiru</month>
+							<month type="10">uttùviru</month>
+							<month type="11">nuvèmmiru</month>
+							<month type="12">dicèmmiru</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="narrow">
-							<month type="1" draft="unconfirmed">J</month>
-							<month type="2" draft="unconfirmed">F</month>
-							<month type="3" draft="unconfirmed">M</month>
-							<month type="4" draft="unconfirmed">A</month>
-							<month type="5" draft="unconfirmed">M</month>
-							<month type="6" draft="unconfirmed">G</month>
-							<month type="7" draft="unconfirmed">G</month>
-							<month type="8" draft="unconfirmed">A</month>
-							<month type="9" draft="unconfirmed">S</month>
-							<month type="10" draft="unconfirmed">U</month>
-							<month type="11" draft="unconfirmed">N</month>
-							<month type="12" draft="unconfirmed">D</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">jinnaru</month>
-							<month type="2" draft="unconfirmed">frivaru</month>
-							<month type="3" draft="unconfirmed">marzu</month>
-							<month type="4" draft="unconfirmed">aprili</month>
-							<month type="5" draft="unconfirmed">maju</month>
-							<month type="6" draft="unconfirmed">giugnu</month>
-							<month type="7" draft="unconfirmed">giugnettu</month>
-							<month type="8" draft="unconfirmed">agustu</month>
-							<month type="9" draft="unconfirmed">sittèmmiru</month>
-							<month type="10" draft="unconfirmed">uttùviru</month>
-							<month type="11" draft="unconfirmed">nuvèmmiru</month>
-							<month type="12" draft="unconfirmed">dicèmmiru</month>
+							<month type="1">J</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">G</month>
+							<month type="7">G</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">U</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">dum</day>
-							<day type="mon" draft="unconfirmed">lun</day>
-							<day type="tue" draft="unconfirmed">mar</day>
-							<day type="wed" draft="unconfirmed">mer</day>
-							<day type="thu" draft="unconfirmed">jov</day>
-							<day type="fri" draft="unconfirmed">ven</day>
-							<day type="sat" draft="unconfirmed">sab</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">d</day>
-							<day type="mon" draft="unconfirmed">l</day>
-							<day type="tue" draft="unconfirmed">m</day>
-							<day type="wed" draft="unconfirmed">m</day>
-							<day type="thu" draft="unconfirmed">j</day>
-							<day type="fri" draft="unconfirmed">v</day>
-							<day type="sat" draft="unconfirmed">s</day>
+							<day type="sun">dum</day>
+							<day type="mon">lun</day>
+							<day type="tue">mar</day>
+							<day type="wed">mer</day>
+							<day type="thu">jov</day>
+							<day type="fri">ven</day>
+							<day type="sat">sab</day>
 						</dayWidth>
 						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">du</day>
-							<day type="mon" draft="unconfirmed">lu</day>
-							<day type="tue" draft="unconfirmed">ma</day>
-							<day type="wed" draft="unconfirmed">me</day>
-							<day type="thu" draft="unconfirmed">jo</day>
-							<day type="fri" draft="unconfirmed">ve</day>
-							<day type="sat" draft="unconfirmed">sa</day>
+							<day type="sun">du</day>
+							<day type="mon">lu</day>
+							<day type="tue">ma</day>
+							<day type="wed">me</day>
+							<day type="thu">jo</day>
+							<day type="fri">ve</day>
+							<day type="sat">sa</day>
 						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">dumìnica</day>
-							<day type="mon" draft="unconfirmed">lunnidìa</day>
-							<day type="tue" draft="unconfirmed">martidìa</day>
-							<day type="wed" draft="unconfirmed">mercuridìa</day>
-							<day type="thu" draft="unconfirmed">jovidìa</day>
-							<day type="fri" draft="unconfirmed">venniridìa</day>
-							<day type="sat" draft="unconfirmed">sàbbatu</day>
+							<day type="sun">dumìnica</day>
+							<day type="mon">lunnidìa</day>
+							<day type="tue">martidìa</day>
+							<day type="wed">mercuridìa</day>
+							<day type="thu">jovidìa</day>
+							<day type="fri">venniridìa</day>
+							<day type="sat">sàbbatu</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">dum</day>
-							<day type="mon" draft="unconfirmed">lun</day>
-							<day type="tue" draft="unconfirmed">mar</day>
-							<day type="wed" draft="unconfirmed">mer</day>
-							<day type="thu" draft="unconfirmed">jov</day>
-							<day type="fri" draft="unconfirmed">ven</day>
-							<day type="sat" draft="unconfirmed">sab</day>
-						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">d</day>
-							<day type="mon" draft="unconfirmed">l</day>
-							<day type="tue" draft="unconfirmed">m</day>
-							<day type="wed" draft="unconfirmed">m</day>
-							<day type="thu" draft="unconfirmed">j</day>
-							<day type="fri" draft="unconfirmed">v</day>
-							<day type="sat" draft="unconfirmed">s</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">du</day>
-							<day type="mon" draft="unconfirmed">lu</day>
-							<day type="tue" draft="unconfirmed">ma</day>
-							<day type="wed" draft="unconfirmed">me</day>
-							<day type="thu" draft="unconfirmed">jo</day>
-							<day type="fri" draft="unconfirmed">ve</day>
-							<day type="sat" draft="unconfirmed">sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">dumìnica</day>
-							<day type="mon" draft="unconfirmed">lunnidìa</day>
-							<day type="tue" draft="unconfirmed">martidìa</day>
-							<day type="wed" draft="unconfirmed">mercuridìa</day>
-							<day type="thu" draft="unconfirmed">jovidìa</day>
-							<day type="fri" draft="unconfirmed">venniridìa</day>
-							<day type="sat" draft="unconfirmed">sàbbatu</day>
+							<day type="sun">d</day>
+							<day type="mon">l</day>
+							<day type="tue">m</day>
+							<day type="wed">m</day>
+							<day type="thu">j</day>
+							<day type="fri">v</day>
+							<day type="sat">s</day>
 						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1T</quarter>
-							<quarter type="2" draft="unconfirmed">2T</quarter>
-							<quarter type="3" draft="unconfirmed">3T</quarter>
-							<quarter type="4" draft="unconfirmed">4T</quarter>
+							<quarter type="1">1T</quarter>
+							<quarter type="2">2T</quarter>
+							<quarter type="3">3T</quarter>
+							<quarter type="4">4T</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">1ᵘ trimestri</quarter>
-							<quarter type="2" draft="unconfirmed">2ᵘ trimestri</quarter>
-							<quarter type="3" draft="unconfirmed">3ᵘ trimestri</quarter>
-							<quarter type="4" draft="unconfirmed">4ᵘ trimestri</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1T</quarter>
-							<quarter type="2" draft="unconfirmed">2T</quarter>
-							<quarter type="3" draft="unconfirmed">3T</quarter>
-							<quarter type="4" draft="unconfirmed">4T</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">1ᵘ trimestri</quarter>
-							<quarter type="2" draft="unconfirmed">2ᵘ trimestri</quarter>
-							<quarter type="3" draft="unconfirmed">3ᵘ trimestri</quarter>
-							<quarter type="4" draft="unconfirmed">4ᵘ trimestri</quarter>
+							<quarter type="1">1ᵘ trimestri</quarter>
+							<quarter type="2">2ᵘ trimestri</quarter>
+							<quarter type="3">3ᵘ trimestri</quarter>
+							<quarter type="4">4ᵘ trimestri</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<eras>
 					<eraNames>
-						<era type="0" draft="unconfirmed">prima di Cristu</era>
-						<era type="0" alt="variant" draft="unconfirmed">prima di l’èbbica cumuni</era>
-						<era type="1" draft="unconfirmed">doppu di Cristu</era>
-						<era type="1" alt="variant" draft="unconfirmed">èbbica cumuni</era>
+						<era type="0">prima di Cristu</era>
+						<era type="0" alt="variant">prima di l’èbbica cumuni</era>
+						<era type="1">doppu di Cristu</era>
+						<era type="1" alt="variant">èbbica cumuni</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">p.C.</era>
-						<era type="0" alt="variant" draft="unconfirmed">p.E.C.</era>
-						<era type="1" draft="unconfirmed">d.C.</era>
-						<era type="1" alt="variant" draft="unconfirmed">E.C.</era>
+						<era type="0">p.C.</era>
+						<era type="0" alt="variant">p.E.C.</era>
+						<era type="1">d.C.</era>
+						<era type="1" alt="variant">E.C.</era>
 					</eraAbbr>
 					<eraNarrow>
-						<era type="0" draft="unconfirmed">pC</era>
-						<era type="0" alt="variant" draft="unconfirmed">pEC</era>
-						<era type="1" draft="unconfirmed">dC</era>
-						<era type="1" alt="variant" draft="unconfirmed">EC</era>
+						<era type="0">pC</era>
+						<era type="0" alt="variant">pEC</era>
+						<era type="1">dC</era>
+						<era type="1" alt="variant">EC</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern draft="unconfirmed">EEEE d MMMM y</pattern>
+							<pattern>EEEE d MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern draft="unconfirmed">d MMMM y</pattern>
+							<pattern>d MMMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern draft="unconfirmed">d MMM y</pattern>
+							<pattern>d MMM y</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">d/M/yy</pattern>
+							<pattern>d/M/yy</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss zzzz</pattern>
+							<pattern>HH:mm:ss zzzz</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss z</pattern>
+							<pattern>HH:mm:ss z</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm:ss</pattern>
+							<pattern>HH:mm:ss</pattern>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern draft="unconfirmed">HH:mm</pattern>
+							<pattern>HH:mm</pattern>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'l'’'uri' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern draft="unconfirmed">{1} {0}</pattern>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'ê' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ê' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
-						<dateFormatItem id="Ehm" draft="unconfirmed">E h:mm a</dateFormatItem>
-						<dateFormatItem id="Ehms" draft="unconfirmed">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
-						<dateFormatItem id="GyMd" draft="unconfirmed">d/M/y G</dateFormatItem>
-						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
-						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a v</dateFormatItem>
-						<dateFormatItem id="hmv" draft="unconfirmed">h:mm a v</dateFormatItem>
-						<dateFormatItem id="Md" draft="unconfirmed">d/M</dateFormatItem>
-						<dateFormatItem id="MEd" draft="unconfirmed">E d/M</dateFormatItem>
-						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd" draft="unconfirmed">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="one" draft="unconfirmed">'simana' W 'di' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">'simana' W 'di' MMMM</dateFormatItem>
-						<dateFormatItem id="yM" draft="unconfirmed">M/y</dateFormatItem>
-						<dateFormatItem id="yMd" draft="unconfirmed">d/M/y</dateFormatItem>
-						<dateFormatItem id="yMEd" draft="unconfirmed">E d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="unconfirmed">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd" draft="unconfirmed">E d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM" draft="unconfirmed">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQQQ" draft="unconfirmed">QQQ y</dateFormatItem>
-						<dateFormatItem id="yQQQQ" draft="unconfirmed">QQQQ 'dû' y</dateFormatItem>
-						<dateFormatItem id="yw" count="one" draft="unconfirmed">'simana' w 'dû' Y</dateFormatItem>
-						<dateFormatItem id="yw" count="other" draft="unconfirmed">'simana' w 'dû' Y</dateFormatItem>
+						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Md">d/M</dateFormatItem>
+						<dateFormatItem id="MEd">E d/M</dateFormatItem>
+						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
+						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
+						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">'simana' W 'di' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">'simana' W 'di' MMMM</dateFormatItem>
+						<dateFormatItem id="yM">M/y</dateFormatItem>
+						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
+						<dateFormatItem id="yMEd">E d/M/y</dateFormatItem>
+						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMd">d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMEd">E d MMM y</dateFormatItem>
+						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
+						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
+						<dateFormatItem id="yQQQQ">QQQQ 'dû' y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">'simana' w 'dû' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other">'simana' w 'dû' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="unconfirmed">h:mm B – h:mm B</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
-							<greatestDifference id="G" draft="unconfirmed">y G – y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">y – y G</greatestDifference>
+							<greatestDifference id="G">y G – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G" draft="unconfirmed">M/y G – M/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/y – M/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/y – M/y G</greatestDifference>
+							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
+							<greatestDifference id="M">M/y – M/y G</greatestDifference>
+							<greatestDifference id="y">M/y – M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d" draft="unconfirmed">d/M/y – d/M/y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d/M/y G – d/M/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/M/y – d/M/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="G">d/M/y G – d/M/y G</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/M/y – E d/M/y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E d/M/y G – E d/M/y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/M/y – E d/M/y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="G">E d/M/y G – E d/M/y G</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y G</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y G</greatestDifference>
+							<greatestDifference id="d">d–d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E d MMM y G – E d MMM y G</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM y G</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d MMM y – E d MMM y G</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G – E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
-							<greatestDifference id="m" draft="unconfirmed">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="unconfirmed">M/d – M/d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">M/d – M/d</greatestDifference>
+							<greatestDifference id="M">M/d – M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="unconfirmed">E M/d – E M/d</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E M/d – E M/d</greatestDifference>
+							<greatestDifference id="d">E M/d – E M/d</greatestDifference>
+							<greatestDifference id="M">E M/d – E M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="d">d–d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="unconfirmed">M/y – M/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">M/y – M/y</greatestDifference>
+							<greatestDifference id="M">M/y – M/y</greatestDifference>
+							<greatestDifference id="y">M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="d">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="M">d/M/y – d/M/y</greatestDifference>
+							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d/M/y – E d/M/y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d/M/y – E d/M/y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="d">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="M">E d/M/y – E d/M/y</greatestDifference>
+							<greatestDifference id="y">E d/M/y – E d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMM y – MMM y</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d" draft="unconfirmed">d–d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">d MMM y – d MMM y</greatestDifference>
+							<greatestDifference id="d">d–d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="unconfirmed">E d MMM – E d MMM y</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">E d MMM – E d MMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">E d MMM y – E d MMM y</greatestDifference>
+							<greatestDifference id="d">E d MMM – E d MMM y</greatestDifference>
+							<greatestDifference id="M">E d MMM – E d MMM y</greatestDifference>
+							<greatestDifference id="y">E d MMM y – E d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M" draft="unconfirmed">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y" draft="unconfirmed">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1276,2385 +1255,2361 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</calendars>
 		<fields>
 			<field type="era">
-				<displayName draft="unconfirmed">èbbica</displayName>
+				<displayName>èbbica</displayName>
 			</field>
 			<field type="era-short">
-				<displayName draft="unconfirmed">èbb.</displayName>
+				<displayName>èbb.</displayName>
 			</field>
 			<field type="era-narrow">
-				<displayName draft="unconfirmed">èbb</displayName>
+				<displayName>èbb</displayName>
 			</field>
 			<field type="year">
-				<displayName draft="unconfirmed">annu</displayName>
-				<relative type="-1" draft="unconfirmed">l’annu passatu</relative>
-				<relative type="0" draft="unconfirmed">st’annu</relative>
-				<relative type="1" draft="unconfirmed">l’annu pròssimu</relative>
+				<displayName>annu</displayName>
+				<relative type="-1">l’annu passatu</relative>
+				<relative type="0">st’annu</relative>
+				<relative type="1">l’annu vinturu</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra n’annu</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} anni</relativeTimePattern>
+					<relativeTimePattern count="one">ntra n’annu</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} anni</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">n’annu nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} anni nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">n’annu nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} anni nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="year-short">
-				<displayName draft="unconfirmed">a.</displayName>
-				<relative type="-1" draft="unconfirmed">l’a. passatu</relative>
-				<relative type="0" draft="unconfirmed">st’a.</relative>
-				<relative type="1" draft="unconfirmed">l’a. pròssimu</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra n’annu</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} anni</relativeTimePattern>
-				</relativeTime>
+				<displayName>a.</displayName>
+				<relative type="-1">l’a. passatu</relative>
+				<relative type="0">st’a.</relative>
+				<relative type="1">l’a. vinturu</relative>
 			</field>
 			<field type="year-narrow">
-				<relative type="-1" draft="unconfirmed">l’a. passatu</relative>
-				<relative type="0" draft="unconfirmed">st’.a</relative>
-				<relative type="1" draft="unconfirmed">u pròssimu annu</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra n’annu</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} anni</relativeTimePattern>
-				</relativeTime>
+				<relative type="-1">l’a. passatu</relative>
+				<relative type="0">st’.a</relative>
+				<relative type="1">l’a. vinturu</relative>
 			</field>
 			<field type="quarter">
-				<displayName draft="unconfirmed">trimestri</displayName>
-				<relative type="-1" draft="unconfirmed">l’ùrtimu trimestri</relative>
-				<relative type="0" draft="unconfirmed">stu trimestri</relative>
-				<relative type="1" draft="unconfirmed">u pròssimu trimestri</relative>
+				<displayName>trimestri</displayName>
+				<relative type="-1">l’ùrtimu trimestri</relative>
+				<relative type="0">stu trimestri</relative>
+				<relative type="1">u pròssimu trimestri</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un trimestri</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} trimestri</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un trimestri</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} trimestri</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un trimestri nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} trimestri nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un trimestri nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} trimestri nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName draft="unconfirmed">tri.</displayName>
+				<displayName>tri.</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un tri.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} tri.</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un tri.</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} tri.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un tri. nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} tri. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un tri. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} tri. nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
-				<displayName draft="unconfirmed">tri</displayName>
+				<displayName>tri</displayName>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un t.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} t.</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un t.</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} t.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un t. nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} t. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un t. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} t. nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month">
-				<displayName draft="unconfirmed">misi</displayName>
-				<relative type="-1" draft="unconfirmed">u misi passatu</relative>
-				<relative type="0" draft="unconfirmed">stu misi</relative>
-				<relative type="1" draft="unconfirmed">u pròssimu misi</relative>
+				<displayName>misi</displayName>
+				<relative type="-1">u misi passatu</relative>
+				<relative type="0">stu misi</relative>
+				<relative type="1">u misi vinturu</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un misi</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} misi</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un misi</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} misi</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un misi nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} misi nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un misi nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} misi nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-short">
-				<displayName draft="unconfirmed">m.</displayName>
-				<relative type="-1" draft="unconfirmed">u m. passatu</relative>
-				<relative type="0" draft="unconfirmed">stu m.</relative>
-				<relative type="1" draft="unconfirmed">u pròssimu m.</relative>
+				<displayName>m.</displayName>
+				<relative type="-1">u m. passatu</relative>
+				<relative type="0">stu m.</relative>
+				<relative type="1">u m. vinturu</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un m.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} m.</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un m.</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} m.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un m. nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} m. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un m. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} m. nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
-				<relative type="-1" draft="unconfirmed">u m. passatu</relative>
-				<relative type="0" draft="unconfirmed">stu m.</relative>
-				<relative type="1" draft="unconfirmed">u pròssimu m.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un m.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} m.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un m. nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} m. nnarrè</relativeTimePattern>
-				</relativeTime>
+				<relative type="-1">u m. passatu</relative>
+				<relative type="0">stu m.</relative>
+				<relative type="1">u m. vinturu</relative>
 			</field>
 			<field type="week">
-				<displayName draft="unconfirmed">simana</displayName>
-				<relative type="-1" draft="unconfirmed">a simana passata</relative>
-				<relative type="0" draft="unconfirmed">sta simana</relative>
-				<relative type="1" draft="unconfirmed">a pròssima simana</relative>
+				<displayName>simana</displayName>
+				<relative type="-1">a simana passata</relative>
+				<relative type="0">sta simana</relative>
+				<relative type="1">a pròssima simana</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra na simana</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} simani</relativeTimePattern>
+					<relativeTimePattern count="one">ntra na simana</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} simani</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">na simana nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} simani nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">na simana nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} simani nnarrè</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod draft="unconfirmed">a simana di {0}</relativePeriod>
+				<relativePeriod>a simana di {0}</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName draft="unconfirmed">smn.</displayName>
-				<relative type="-1" draft="unconfirmed">a smn. passata</relative>
-				<relative type="0" draft="unconfirmed">sta smn.</relative>
-				<relative type="1" draft="unconfirmed">a pròssima smn.</relative>
-				<relativePeriod draft="unconfirmed">a smn. di {0}</relativePeriod>
-			</field>
-			<field type="week-narrow">
-				<relative type="-1" draft="unconfirmed">a smn. passata</relative>
-				<relative type="0" draft="unconfirmed">sta smn.</relative>
-				<relative type="1" draft="unconfirmed">a pròssima smn.</relative>
-				<relativePeriod draft="unconfirmed">a smn. di {0}</relativePeriod>
+				<displayName>smn.</displayName>
+				<relative type="-1">a smn. passata</relative>
+				<relative type="0">sta smn.</relative>
+				<relative type="1">a pròssima smn.</relative>
+				<relativePeriod>a smn. di {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
-				<displayName draft="unconfirmed">simana dû misi</displayName>
+				<displayName>simana dû misi</displayName>
 			</field>
 			<field type="weekOfMonth-short">
-				<displayName draft="unconfirmed">smn. dû m.</displayName>
+				<displayName>smn. dû m.</displayName>
 			</field>
 			<field type="day">
-				<displayName draft="unconfirmed">jornu</displayName>
-				<relative type="-1" draft="unconfirmed">ajeri</relative>
-				<relative type="0" draft="unconfirmed">oji</relative>
-				<relative type="1" draft="unconfirmed">dumani</relative>
+				<displayName>jornu</displayName>
+				<relative type="-1">ajeri</relative>
+				<relative type="0">oji</relative>
+				<relative type="1">dumani</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un jornu</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} jorna</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un jornu</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} jorna</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un jornu nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} jorna nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un jornu nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} jorna nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="day-short">
-				<displayName draft="unconfirmed">j.</displayName>
-				<relative type="-1" draft="unconfirmed">ajeri</relative>
-				<relative type="0" draft="unconfirmed">oji</relative>
-				<relative type="1" draft="unconfirmed">dumani</relative>
+				<displayName>j.</displayName>
 			</field>
 			<field type="dayOfYear">
-				<displayName draft="unconfirmed">jornu di l’annu</displayName>
+				<displayName>jornu di l’annu</displayName>
 			</field>
 			<field type="dayOfYear-short">
-				<displayName draft="unconfirmed">j. di l’a.</displayName>
+				<displayName>j. di l’a.</displayName>
 			</field>
 			<field type="weekday">
-				<displayName draft="unconfirmed">jornu dâ simana</displayName>
+				<displayName>jornu dâ simana</displayName>
 			</field>
 			<field type="weekday-short">
-				<displayName draft="unconfirmed">j. dâ smn.</displayName>
+				<displayName>j. dâ smn.</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1" draft="unconfirmed">l’ùrtima dumìnica</relative>
-				<relative type="0" draft="unconfirmed">sta dumìnica</relative>
-				<relative type="1" draft="unconfirmed">a pròssima dumìnica</relative>
+				<relative type="-1">l’ùrtima dumìnica</relative>
+				<relative type="0">sta dumìnica</relative>
+				<relative type="1">a pròssima dumìnica</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra na dumìnica</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} dumìnichi</relativeTimePattern>
+					<relativeTimePattern count="one">ntra na dumìnica</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} dumìnichi</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">na dumìnica nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} dumìnichi nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">na dumìnica nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} dumìnichi nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="sun-short">
-				<relative type="-1" draft="unconfirmed">l’ùrtima dum.</relative>
-				<relative type="0" draft="unconfirmed">sta dum.</relative>
-				<relative type="1" draft="unconfirmed">a pròssima dum.</relative>
+				<relative type="-1">l’ùrtima dum.</relative>
+				<relative type="0">sta dum.</relative>
+				<relative type="1">a pròssima dum.</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra na dum.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} dum.</relativeTimePattern>
+					<relativeTimePattern count="one">ntra na dum.</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} dum.</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">na dum. nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} dum. nnarrè</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sun-narrow">
-				<relative type="-1" draft="unconfirmed">l’ùrtima dum.</relative>
-				<relative type="0" draft="unconfirmed">sta dum.</relative>
-				<relative type="1" draft="unconfirmed">a pròssima dum.</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra na dum.</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} dum.</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">na dum. nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} dum. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">na dum. nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} dum. nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="mon">
-				<relative type="-1" draft="unconfirmed">l’ùrtimu lùnnidi</relative>
-				<relative type="0" draft="unconfirmed">stu lùnnidi</relative>
-				<relative type="1" draft="unconfirmed">u pròssimu lùnnidi</relative>
+				<relative type="-1">l’ùrtimu lùnnidi</relative>
+				<relative type="0">stu lùnnidi</relative>
+				<relative type="1">u pròssimu lùnnidi</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one" draft="unconfirmed">ntra un lùnnidi</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">ntra {0} lùnnidi</relativeTimePattern>
+					<relativeTimePattern count="one">ntra un lùnnidi</relativeTimePattern>
+					<relativeTimePattern count="other">ntra {0} lùnnidi</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one" draft="unconfirmed">un lùnnidi nnarrè</relativeTimePattern>
-					<relativeTimePattern count="other" draft="unconfirmed">{0} lùnnidi nnarrè</relativeTimePattern>
+					<relativeTimePattern count="one">un lùnnidi nnarrè</relativeTimePattern>
+					<relativeTimePattern count="other">{0} lùnnidi nnarrè</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="dayperiod">
+				<displayName>AM/PM</displayName>
+			</field>
 			<field type="hour">
-				<displayName draft="unconfirmed">ura</displayName>
+				<displayName>ura</displayName>
 			</field>
 			<field type="hour-short">
-				<displayName draft="unconfirmed">u.</displayName>
+				<displayName>u.</displayName>
 			</field>
 			<field type="minute">
-				<displayName draft="unconfirmed">minutu</displayName>
+				<displayName>minutu</displayName>
 			</field>
 			<field type="minute-short">
-				<displayName draft="unconfirmed">min.</displayName>
+				<displayName>min.</displayName>
 			</field>
 			<field type="second">
-				<displayName draft="unconfirmed">sicunnu</displayName>
-				<relative type="0" draft="unconfirmed">ora</relative>
+				<displayName>sicunnu</displayName>
+				<relative type="0">ora</relative>
 			</field>
 			<field type="second-short">
-				<displayName draft="unconfirmed">sic.</displayName>
+				<displayName>sic.</displayName>
 			</field>
 			<field type="zone">
-				<displayName draft="unconfirmed">fusu urariu</displayName>
+				<displayName>fusu urariu</displayName>
 			</field>
 			<field type="zone-short">
-				<displayName draft="unconfirmed">fusu</displayName>
+				<displayName>fusu</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat type="daylight" draft="unconfirmed">{0} (ura ligali)</regionFormat>
-			<regionFormat type="standard" draft="unconfirmed">{0} (ura sulari)</regionFormat>
+			<regionFormat type="daylight">{0} (ura ligali)</regionFormat>
+			<regionFormat type="standard">{0} (ura sulari)</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
-					<standard draft="unconfirmed">Ura Curdinata Univirsali</standard>
+					<standard>Ura Curdinata Univirsali</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity draft="unconfirmed">Scanusciutu</exemplarCity>
+				<exemplarCity>Scanusciutu</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity draft="unconfirmed">Tirana</exemplarCity>
+			<zone type="Asia/Dubai">
+				<exemplarCity>Dubbai</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>Basi Rothera</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>Terra di Palmer</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>Basi Troll</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>Basi Showa</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>Basi Mawson</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>Basi Vostok</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>Basi Casey</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>Basi Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>Basi McMurdo</exemplarCity>
 			</zone>
 			<zone type="America/Cordoba">
-				<exemplarCity draft="unconfirmed">Còrduba</exemplarCity>
+				<exemplarCity>Còrduba</exemplarCity>
 			</zone>
 			<zone type="Australia/Adelaide">
-				<exemplarCity draft="unconfirmed">Adilaidi</exemplarCity>
+				<exemplarCity>Adilaidi</exemplarCity>
 			</zone>
 			<zone type="Europe/Sarajevo">
-				<exemplarCity draft="unconfirmed">Sarajevu</exemplarCity>
+				<exemplarCity>Sarajevu</exemplarCity>
 			</zone>
 			<zone type="Europe/Brussels">
-				<exemplarCity draft="unconfirmed">Brusseli</exemplarCity>
+				<exemplarCity>Bruselli</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity draft="unconfirmed">Birmuda</exemplarCity>
+				<exemplarCity>Birmuda</exemplarCity>
 			</zone>
 			<zone type="America/Campo_Grande">
-				<exemplarCity draft="unconfirmed">Campu Ranni</exemplarCity>
+				<exemplarCity>Campu Granni</exemplarCity>
 			</zone>
 			<zone type="America/Sao_Paulo">
-				<exemplarCity draft="unconfirmed">San Paulu</exemplarCity>
+				<exemplarCity>San Paulu</exemplarCity>
 			</zone>
 			<zone type="America/Belize">
-				<exemplarCity draft="unconfirmed">Bilisi</exemplarCity>
+				<exemplarCity>Bilisi</exemplarCity>
 			</zone>
 			<zone type="America/Regina">
-				<exemplarCity draft="unconfirmed">Riggina</exemplarCity>
+				<exemplarCity>Riggina</exemplarCity>
 			</zone>
 			<zone type="America/Toronto">
-				<exemplarCity draft="unconfirmed">Torontu</exemplarCity>
+				<exemplarCity>Turontu</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
-				<exemplarCity draft="unconfirmed">Zurigu</exemplarCity>
+				<exemplarCity>Zurigu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Ìsula di Pasca</exemplarCity>
 			</zone>
 			<zone type="America/Costa_Rica">
-				<exemplarCity draft="unconfirmed">Custa Rica</exemplarCity>
+				<exemplarCity>Custa Rica</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity draft="unconfirmed">Capu Virdi</exemplarCity>
+				<exemplarCity>Capu Virdi</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity draft="unconfirmed">Natali</exemplarCity>
+				<exemplarCity>Natali</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
-				<exemplarCity draft="unconfirmed">Nicusìa</exemplarCity>
+				<exemplarCity>Nicusìa</exemplarCity>
 			</zone>
 			<zone type="Europe/Prague">
-				<exemplarCity draft="unconfirmed">Praga</exemplarCity>
+				<exemplarCity>Praga</exemplarCity>
 			</zone>
 			<zone type="Europe/Berlin">
-				<exemplarCity draft="unconfirmed">Birlinu</exemplarCity>
+				<exemplarCity>Birlinu</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity draft="unconfirmed">Gibbuti</exemplarCity>
+				<exemplarCity>Gibbuti</exemplarCity>
 			</zone>
 			<zone type="America/Dominica">
-				<exemplarCity draft="unconfirmed">Dumìnica</exemplarCity>
+				<exemplarCity>Dumìnica</exemplarCity>
 			</zone>
 			<zone type="America/Santo_Domingo">
-				<exemplarCity draft="unconfirmed">Santu Dumingu</exemplarCity>
+				<exemplarCity>Santu Dumingu</exemplarCity>
 			</zone>
 			<zone type="Africa/Algiers">
-				<exemplarCity draft="unconfirmed">Algeri</exemplarCity>
+				<exemplarCity>Algeri</exemplarCity>
 			</zone>
 			<zone type="Pacific/Galapagos">
-				<exemplarCity draft="unconfirmed">Galàpagos</exemplarCity>
+				<exemplarCity>Galàpagos</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
-				<exemplarCity draft="unconfirmed">Cairu</exemplarCity>
+				<exemplarCity>Cairu</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Canary">
-				<exemplarCity draft="unconfirmed">Canari</exemplarCity>
+				<exemplarCity>Canari</exemplarCity>
 			</zone>
 			<zone type="Africa/Ceuta">
-				<exemplarCity draft="unconfirmed">Cèuta</exemplarCity>
+				<exemplarCity>Cèuta</exemplarCity>
 			</zone>
 			<zone type="Europe/Helsinki">
-				<exemplarCity draft="unconfirmed">Hèlsinki</exemplarCity>
+				<exemplarCity>Hèlsinki</exemplarCity>
 			</zone>
 			<zone type="Pacific/Fiji">
-				<exemplarCity draft="unconfirmed">Figi</exemplarCity>
+				<exemplarCity>Figi</exemplarCity>
 			</zone>
 			<zone type="Europe/Paris">
-				<exemplarCity draft="unconfirmed">Pariggi</exemplarCity>
+				<exemplarCity>Pariggi</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight draft="unconfirmed">Ura ligali Britànnica</daylight>
+					<daylight>Ura ligali Britànnica</daylight>
 				</long>
-				<exemplarCity draft="unconfirmed">Lònnira</exemplarCity>
+				<exemplarCity>Lònnira</exemplarCity>
 			</zone>
 			<zone type="Europe/Gibraltar">
-				<exemplarCity draft="unconfirmed">Gibbirterra</exemplarCity>
+				<exemplarCity>Gibbirterra</exemplarCity>
 			</zone>
 			<zone type="America/Guadeloupe">
-				<exemplarCity draft="unconfirmed">Guadalupa</exemplarCity>
+				<exemplarCity>Guadalupa</exemplarCity>
 			</zone>
 			<zone type="Europe/Athens">
-				<exemplarCity draft="unconfirmed">Ateni</exemplarCity>
+				<exemplarCity>Ateni</exemplarCity>
 			</zone>
 			<zone type="Atlantic/South_Georgia">
-				<exemplarCity draft="unconfirmed">Giorgia di sciroccu</exemplarCity>
+				<exemplarCity>Giorgia di sciroccu</exemplarCity>
 			</zone>
 			<zone type="America/Guatemala">
-				<exemplarCity draft="unconfirmed">Guatimala</exemplarCity>
+				<exemplarCity>Guatimala</exemplarCity>
 			</zone>
 			<zone type="America/Guyana">
-				<exemplarCity draft="unconfirmed">Guiana</exemplarCity>
+				<exemplarCity>Guiana</exemplarCity>
 			</zone>
 			<zone type="Europe/Zagreb">
-				<exemplarCity draft="unconfirmed">Zagabbria</exemplarCity>
+				<exemplarCity>Zagabbria</exemplarCity>
 			</zone>
 			<zone type="Asia/Jakarta">
-				<exemplarCity draft="unconfirmed">Giacarta</exemplarCity>
+				<exemplarCity>Giacarta</exemplarCity>
 			</zone>
 			<zone type="Europe/Dublin">
 				<long>
-					<daylight draft="unconfirmed">Ura sulari Irlannisi</daylight>
+					<daylight>Ura sulari Irlannisi</daylight>
 				</long>
-				<exemplarCity draft="unconfirmed">Dubblinu</exemplarCity>
+				<exemplarCity>Dubblinu</exemplarCity>
 			</zone>
 			<zone type="Asia/Jerusalem">
-				<exemplarCity draft="unconfirmed">Girusalemmi</exemplarCity>
+				<exemplarCity>Girusalemmi</exemplarCity>
 			</zone>
 			<zone type="Europe/Isle_of_Man">
-				<exemplarCity draft="unconfirmed">Ìsula di Man</exemplarCity>
+				<exemplarCity>Ìsula di Man</exemplarCity>
 			</zone>
 			<zone type="Asia/Calcutta">
-				<exemplarCity draft="unconfirmed">Kurkata</exemplarCity>
+				<exemplarCity>Kurkata</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
-				<exemplarCity draft="unconfirmed">Roma</exemplarCity>
+				<exemplarCity>Roma</exemplarCity>
 			</zone>
 			<zone type="America/Jamaica">
-				<exemplarCity draft="unconfirmed">Giamaica</exemplarCity>
+				<exemplarCity>Giamaica</exemplarCity>
 			</zone>
 			<zone type="Asia/Amman">
-				<exemplarCity draft="unconfirmed">Ammàn</exemplarCity>
+				<exemplarCity>Ammàn</exemplarCity>
 			</zone>
 			<zone type="Africa/Nairobi">
-				<exemplarCity draft="unconfirmed">Nairobbi</exemplarCity>
+				<exemplarCity>Nairobbi</exemplarCity>
 			</zone>
 			<zone type="Asia/Seoul">
-				<exemplarCity draft="unconfirmed">Siul</exemplarCity>
+				<exemplarCity>Siul</exemplarCity>
 			</zone>
 			<zone type="America/St_Lucia">
-				<exemplarCity draft="unconfirmed">Santa Lucìa</exemplarCity>
+				<exemplarCity>Santa Lucìa</exemplarCity>
 			</zone>
 			<zone type="Asia/Colombo">
-				<exemplarCity draft="unconfirmed">Culummu</exemplarCity>
+				<exemplarCity>Culummu</exemplarCity>
 			</zone>
 			<zone type="Europe/Luxembourg">
-				<exemplarCity draft="unconfirmed">Lussimburgu</exemplarCity>
+				<exemplarCity>Lussimmurgu</exemplarCity>
 			</zone>
 			<zone type="Africa/Tripoli">
-				<exemplarCity draft="unconfirmed">Trìpuli</exemplarCity>
+				<exemplarCity>Trìpuli</exemplarCity>
 			</zone>
 			<zone type="Africa/Casablanca">
-				<exemplarCity draft="unconfirmed">Casabblanca</exemplarCity>
+				<exemplarCity>Casabblanca</exemplarCity>
 			</zone>
 			<zone type="Europe/Monaco">
-				<exemplarCity draft="unconfirmed">Mònacu</exemplarCity>
+				<exemplarCity>Mònacu</exemplarCity>
 			</zone>
 			<zone type="Asia/Macau">
-				<exemplarCity draft="unconfirmed">Macau</exemplarCity>
+				<exemplarCity>Macau</exemplarCity>
 			</zone>
 			<zone type="America/Martinique">
-				<exemplarCity draft="unconfirmed">Martinica</exemplarCity>
+				<exemplarCity>Martinica</exemplarCity>
 			</zone>
 			<zone type="America/Montserrat">
-				<exemplarCity draft="unconfirmed">Munzirratu</exemplarCity>
+				<exemplarCity>Munzirratu</exemplarCity>
 			</zone>
 			<zone type="Europe/Malta">
-				<exemplarCity draft="unconfirmed">Mauta</exemplarCity>
+				<exemplarCity>Mauta</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
-				<exemplarCity draft="unconfirmed">Mardivi</exemplarCity>
+				<exemplarCity>Mardivi</exemplarCity>
 			</zone>
 			<zone type="America/Monterrey">
-				<exemplarCity draft="unconfirmed">Muntirrei</exemplarCity>
+				<exemplarCity>Muntirrei</exemplarCity>
 			</zone>
 			<zone type="America/Mexico_City">
-				<exemplarCity draft="unconfirmed">Cità dû Mèssicu</exemplarCity>
+				<exemplarCity>Cità dû Mèssicu</exemplarCity>
 			</zone>
 			<zone type="Asia/Muscat">
-				<exemplarCity draft="unconfirmed">Mascati</exemplarCity>
+				<exemplarCity>Mascati</exemplarCity>
 			</zone>
 			<zone type="America/Panama">
-				<exemplarCity draft="unconfirmed">Pànama</exemplarCity>
+				<exemplarCity>Pànama</exemplarCity>
 			</zone>
 			<zone type="Pacific/Marquesas">
-				<exemplarCity draft="unconfirmed">Marchesi</exemplarCity>
+				<exemplarCity>Ìsuli Marchesi</exemplarCity>
 			</zone>
 			<zone type="Europe/Warsaw">
-				<exemplarCity draft="unconfirmed">Varsavia</exemplarCity>
+				<exemplarCity>Varsavia</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>Ìsuli Pitcairn</exemplarCity>
 			</zone>
 			<zone type="America/Puerto_Rico">
-				<exemplarCity draft="unconfirmed">Portu Ricu</exemplarCity>
+				<exemplarCity>Portu Ricu</exemplarCity>
 			</zone>
 			<zone type="Asia/Gaza">
-				<exemplarCity draft="unconfirmed">Gazza</exemplarCity>
+				<exemplarCity>Gazza</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Azores">
-				<exemplarCity draft="unconfirmed">Azzorri</exemplarCity>
+				<exemplarCity>Azzorri</exemplarCity>
 			</zone>
 			<zone type="Europe/Lisbon">
-				<exemplarCity draft="unconfirmed">Lisbona</exemplarCity>
+				<exemplarCity>Lisbona</exemplarCity>
 			</zone>
 			<zone type="Europe/Belgrade">
-				<exemplarCity draft="unconfirmed">Belgradu</exemplarCity>
+				<exemplarCity>Belgradu</exemplarCity>
 			</zone>
 			<zone type="Europe/Moscow">
-				<exemplarCity draft="unconfirmed">Mosca</exemplarCity>
+				<exemplarCity>Mosca</exemplarCity>
 			</zone>
 			<zone type="Europe/Volgograd">
-				<exemplarCity draft="unconfirmed">Vòlgugrad</exemplarCity>
+				<exemplarCity>Vòlgugrad</exemplarCity>
 			</zone>
 			<zone type="Asia/Yekaterinburg">
-				<exemplarCity draft="unconfirmed">Yekatirimmurgu</exemplarCity>
+				<exemplarCity>Yekatirimmurgu</exemplarCity>
 			</zone>
 			<zone type="Asia/Vladivostok">
-				<exemplarCity draft="unconfirmed">Vladìvustok</exemplarCity>
+				<exemplarCity>Vladìvustok</exemplarCity>
 			</zone>
 			<zone type="Europe/Stockholm">
-				<exemplarCity draft="unconfirmed">Stuccorma</exemplarCity>
+				<exemplarCity>Stuccorma</exemplarCity>
 			</zone>
 			<zone type="Asia/Singapore">
-				<exemplarCity draft="unconfirmed">Singapuri</exemplarCity>
+				<exemplarCity>Singapuri</exemplarCity>
 			</zone>
 			<zone type="Atlantic/St_Helena">
-				<exemplarCity draft="unconfirmed">Sant’Èlina</exemplarCity>
+				<exemplarCity>Sant’Èlina</exemplarCity>
 			</zone>
 			<zone type="Europe/San_Marino">
-				<exemplarCity draft="unconfirmed">San Marinu</exemplarCity>
+				<exemplarCity>San Marinu</exemplarCity>
 			</zone>
 			<zone type="Africa/Mogadishu">
-				<exemplarCity draft="unconfirmed">Mugadisciu</exemplarCity>
+				<exemplarCity>Mugadisciu</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
-				<exemplarCity draft="unconfirmed">Damascu</exemplarCity>
+				<exemplarCity>Damascu</exemplarCity>
 			</zone>
 			<zone type="Africa/Tunis">
-				<exemplarCity draft="unconfirmed">Tùnisi</exemplarCity>
+				<exemplarCity>Tùnisi</exemplarCity>
 			</zone>
 			<zone type="Europe/Istanbul">
-				<exemplarCity draft="unconfirmed">Ìstanbul</exemplarCity>
+				<exemplarCity>Ìstanbul</exemplarCity>
 			</zone>
 			<zone type="America/Port_of_Spain">
-				<exemplarCity draft="unconfirmed">Portu di Spagna</exemplarCity>
+				<exemplarCity>Portu di Spagna</exemplarCity>
 			</zone>
 			<zone type="Europe/Kiev">
-				<exemplarCity draft="unconfirmed">Kiev</exemplarCity>
+				<exemplarCity>Kiev</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>Atollu Midway</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Ìsula Wake</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Beulah">
-				<exemplarCity draft="unconfirmed">Beulah, Dakota di Tramuntana</exemplarCity>
+				<exemplarCity>Beulah, Dakota di Tramuntana</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity draft="unconfirmed">New Salem, Dakota di Tramuntana</exemplarCity>
+				<exemplarCity>New Salem, Dakota di Tramuntana</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/Center">
-				<exemplarCity draft="unconfirmed">Centru, Dakota di Tramuntana</exemplarCity>
+				<exemplarCity>Centru, Dakota di Tramuntana</exemplarCity>
 			</zone>
 			<zone type="America/Detroit">
-				<exemplarCity draft="unconfirmed">Ditroit</exemplarCity>
+				<exemplarCity>Ditroit</exemplarCity>
 			</zone>
 			<zone type="America/New_York">
-				<exemplarCity draft="unconfirmed">Nova Jorca</exemplarCity>
+				<exemplarCity>Nova Jorca</exemplarCity>
 			</zone>
 			<zone type="Asia/Samarkand">
-				<exemplarCity draft="unconfirmed">Samarcanna</exemplarCity>
+				<exemplarCity>Samarcanna</exemplarCity>
 			</zone>
 			<zone type="Europe/Vatican">
-				<exemplarCity draft="unconfirmed">Vaticanu</exemplarCity>
+				<exemplarCity>Vaticanu</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>Wallis e Futuna</exemplarCity>
 			</zone>
 			<metazone type="Afghanistan">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Afghànistan</standard>
+					<standard>Ura di l’Afghànistan</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Central">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Àfrica Cintrali</standard>
+					<standard>Ura di l’Àfrica Cintrali</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Eastern">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Àfrica di Livanti</standard>
+					<standard>Ura di l’Àfrica di Livanti</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Southern">
 				<long>
-					<standard draft="unconfirmed">Ura Nurmali di l’Àfrica di Sciroccu</standard>
+					<standard>Ura Nurmali di l’Àfrica di Sciroccu</standard>
 				</long>
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Àfrica di Punenti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Àfrica di Punenti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Àfrica di Punenti</daylight>
+					<standard>Ura di l’Àfrica di Punenti</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Alaska</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Alaska</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Alaska</daylight>
+					<generic>Ura di l’Alaska</generic>
+					<standard>Ura sulari di l’Alaska</standard>
+					<daylight>Ura ligali di l’Alaska</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AKT</generic>
-					<standard draft="unconfirmed">AKST</standard>
-					<daylight draft="unconfirmed">AKDT</daylight>
+					<generic draft="contributed">AKT</generic>
+					<standard draft="contributed">AKST</standard>
+					<daylight draft="contributed">AKDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Amazzonia</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Amazzonia</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Amazzonia</daylight>
+					<generic>Ura di l’Amazzonia</generic>
+					<standard>Ura sulari di l’Amazzonia</standard>
+					<daylight>Ura ligali di l’Amazzonia</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic draft="unconfirmed">Ura cintrali</generic>
-					<standard draft="unconfirmed">Ura sulari cintrali</standard>
-					<daylight draft="unconfirmed">Ura ligali cintrali</daylight>
+					<generic>Ura cintrali</generic>
+					<standard>Ura sulari cintrali</standard>
+					<daylight>Ura ligali cintrali</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CT</generic>
-					<standard draft="unconfirmed">CST</standard>
-					<daylight draft="unconfirmed">CDT</daylight>
+					<generic draft="contributed">CT</generic>
+					<standard draft="contributed">CST</standard>
+					<daylight draft="contributed">CDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic draft="unconfirmed">Ura livantina</generic>
-					<standard draft="unconfirmed">Ura sulari livantina</standard>
-					<daylight draft="unconfirmed">Ura ligali livantina</daylight>
+					<generic>Ura livantina</generic>
+					<standard>Ura sulari livantina</standard>
+					<daylight>Ura ligali livantina</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">ET</generic>
-					<standard draft="unconfirmed">EST</standard>
-					<daylight draft="unconfirmed">EDT</daylight>
+					<generic draft="contributed">ET</generic>
+					<standard draft="contributed">EST</standard>
+					<daylight draft="contributed">EDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic draft="unconfirmed">Ura dî muntagni</generic>
-					<standard draft="unconfirmed">Ura sulari dî muntagni</standard>
-					<daylight draft="unconfirmed">Ura ligali dî muntagni</daylight>
+					<generic>Ura dî muntagni</generic>
+					<standard>Ura sulari dî muntagni</standard>
+					<daylight>Ura ligali dî muntagni</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">MT</generic>
-					<standard draft="unconfirmed">MST</standard>
-					<daylight draft="unconfirmed">MDT</daylight>
+					<generic draft="contributed">MT</generic>
+					<standard draft="contributed">MST</standard>
+					<daylight draft="contributed">MDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic draft="unconfirmed">Ura dû Pacìficu</generic>
-					<standard draft="unconfirmed">Ura sulari dû Pacìficu</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Pacìficu</daylight>
+					<generic>Ura dû Pacìficu</generic>
+					<standard>Ura sulari dû Pacìficu</standard>
+					<daylight>Ura ligali dû Pacìficu</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">PT</generic>
-					<standard draft="unconfirmed">PST</standard>
-					<daylight draft="unconfirmed">PDT</daylight>
+					<generic draft="contributed">PT</generic>
+					<standard draft="contributed">PST</standard>
+					<daylight draft="contributed">PDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic draft="unconfirmed">Ura di Apia</generic>
-					<standard draft="unconfirmed">Ura sulari di Apia</standard>
-					<daylight draft="unconfirmed">Ura ligali di Apia</daylight>
+					<generic>Ura di Samoa</generic>
+					<standard>Ura sulari di Samoa</standard>
+					<daylight>Ura ligali di Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="unconfirmed">Ura Àrabba</generic>
-					<standard draft="unconfirmed">Ura sulari Àrabba</standard>
-					<daylight draft="unconfirmed">Ura ligali Àrabba</daylight>
+					<generic>Ura Àrabba</generic>
+					<standard>Ura sulari Àrabba</standard>
+					<daylight>Ura ligali Àrabba</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Argintina</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Argintina</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Argintina</daylight>
+					<generic>Ura di l’Argintina</generic>
+					<standard>Ura sulari di l’Argintina</standard>
+					<daylight>Ura ligali di l’Argintina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Argintina di punenti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Argintina di punenti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Argintina di punenti</daylight>
+					<generic>Ura di l’Argintina di punenti</generic>
+					<standard>Ura sulari di l’Argintina di punenti</standard>
+					<daylight>Ura ligali di l’Argintina di punenti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Armenia</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Armenia</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Armenia</daylight>
+					<generic>Ura di l’Armenia</generic>
+					<standard>Ura sulari di l’Armenia</standard>
+					<daylight>Ura ligali di l’Armenia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Atlànticu</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Atlànticu</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Atlànticu</daylight>
+					<generic>Ura di l’Atlànticu</generic>
+					<standard>Ura sulari di l’Atlànticu</standard>
+					<daylight>Ura ligali di l’Atlànticu</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">AT</generic>
-					<standard draft="unconfirmed">AST</standard>
-					<daylight draft="unconfirmed">ADT</daylight>
+					<generic draft="contributed">AT</generic>
+					<standard draft="contributed">AST</standard>
+					<daylight draft="contributed">ADT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Australia cintrali</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Australia cintrali</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Australia cintrali</daylight>
+					<generic>Ura di l’Australia cintrali</generic>
+					<standard>Ura sulari di l’Australia cintrali</standard>
+					<daylight>Ura ligali di l’Australia cintrali</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_CentralWestern">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Australia cintrali di punenti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Australia cintrali di punenti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Australia cintrali di punenti</daylight>
+					<generic>Ura di l’Australia cintrali di punenti</generic>
+					<standard>Ura sulari di l’Australia cintrali di punenti</standard>
+					<daylight>Ura ligali di l’Australia cintrali di punenti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Australia di livanti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Australia di livanti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Australia di livanti</daylight>
+					<generic>Ura di l’Australia di livanti</generic>
+					<standard>Ura sulari di l’Australia di livanti</standard>
+					<daylight>Ura ligali di l’Australia di livanti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Australia di punenti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Australia di punenti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Australia di punenti</daylight>
+					<generic>Ura di l’Australia di punenti</generic>
+					<standard>Ura sulari di l’Australia di punenti</standard>
+					<daylight>Ura ligali di l’Australia di punenti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azerbaijan">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Azerbaijan</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Azerbaijan</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Azerbaijan</daylight>
+					<generic>Ura di l’Azerbaijan</generic>
+					<standard>Ura sulari di l’Azerbaijan</standard>
+					<daylight>Ura ligali di l’Azerbaijan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Azores">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Azzorri</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Azzorri</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Azzorri</daylight>
+					<generic>Ura di l’Azzorri</generic>
+					<standard>Ura sulari di l’Azzorri</standard>
+					<daylight>Ura ligali di l’Azzorri</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bangladesh">
 				<long>
-					<generic draft="unconfirmed">Ura dû Bàngladesh</generic>
-					<standard draft="unconfirmed">Ura sulari dû Bàngladesh</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Bàngladesh</daylight>
+					<generic>Ura dû Bàngladesh</generic>
+					<standard>Ura sulari dû Bàngladesh</standard>
+					<daylight>Ura ligali dû Bàngladesh</daylight>
 				</long>
 			</metazone>
 			<metazone type="Bhutan">
 				<long>
-					<standard draft="unconfirmed">Ura dû Bhutan</standard>
+					<standard>Ura dû Bhutan</standard>
 				</long>
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard draft="unconfirmed">Ura dâ Bulivia</standard>
+					<standard>Ura dâ Bulivia</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic draft="unconfirmed">Ura di Brasilia</generic>
-					<standard draft="unconfirmed">Ura sulari di Brasilia</standard>
-					<daylight draft="unconfirmed">Ura ligali di Brasilia</daylight>
+					<generic>Ura di Brasilia</generic>
+					<standard>Ura sulari di Brasilia</standard>
+					<daylight>Ura ligali di Brasilia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard draft="unconfirmed">Ura dû Brunei</standard>
+					<standard>Ura dû Brunei</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
 				<long>
-					<generic draft="unconfirmed">Ura di Capu Virdi</generic>
-					<standard draft="unconfirmed">Ura sulari di Capu Virdi</standard>
-					<daylight draft="unconfirmed">Ura ligali di Capu Virdi</daylight>
+					<generic>Ura di Capu Virdi</generic>
+					<standard>Ura sulari di Capu Virdi</standard>
+					<daylight>Ura ligali di Capu Virdi</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard draft="unconfirmed">Ura di Chamorro</standard>
+					<standard>Ura di Chamorro</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
 				<long>
-					<generic draft="unconfirmed">Ura di Chatham</generic>
-					<standard draft="unconfirmed">Ura sulari di Chatham</standard>
-					<daylight draft="unconfirmed">Ura ligali di Chatham</daylight>
+					<generic>Ura di Chatham</generic>
+					<standard>Ura sulari di Chatham</standard>
+					<daylight>Ura ligali di Chatham</daylight>
 				</long>
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic draft="unconfirmed">Ura dû Cili</generic>
-					<standard draft="unconfirmed">Ura sulari dû Cili</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Cili</daylight>
+					<generic>Ura dû Cili</generic>
+					<standard>Ura sulari dû Cili</standard>
+					<daylight>Ura ligali dû Cili</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Cina</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Cina</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Cina</daylight>
+					<generic>Ura dâ Cina</generic>
+					<standard>Ura sulari dâ Cina</standard>
+					<daylight>Ura ligali dâ Cina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Christmas">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsula di Natali</standard>
+					<standard>Ura di l’Ìsula di Natali</standard>
 				</long>
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsuli Cocos</standard>
+					<standard>Ura di l’Ìsuli Cocos</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Culummia</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Culummia</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Culummia</daylight>
+					<generic>Ura dâ Culommia</generic>
+					<standard>Ura sulari dâ Culommia</standard>
+					<daylight>Ura ligali dâ Culommia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Ìsuli Cook</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Ìsuli Cook</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Ìsuli Cook</daylight>
+					<generic>Ura di l’Ìsuli Cook</generic>
+					<standard>Ura sulari di l’Ìsuli Cook</standard>
+					<daylight>Ura ligali di l’Ìsuli Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic draft="unconfirmed">Ura di Cubba</generic>
-					<standard draft="unconfirmed">Ura sulari di Cubba</standard>
-					<daylight draft="unconfirmed">Ura ligali di Cubba</daylight>
+					<generic>Ura di Cubba</generic>
+					<standard>Ura sulari di Cubba</standard>
+					<daylight>Ura ligali di Cubba</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">CuT</generic>
-					<standard draft="unconfirmed">CuST</standard>
-					<daylight draft="unconfirmed">CuDT</daylight>
+					<generic draft="contributed">CuT</generic>
+					<standard draft="contributed">CuST</standard>
+					<daylight draft="contributed">CuDT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard draft="unconfirmed">Ura di Davis</standard>
+					<standard>Ura di Davis</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard draft="unconfirmed">Ura di Dumont-d’Urville</standard>
+					<standard>Ura di Dumont d’Urville</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard draft="unconfirmed">Ura di Timor di Livanti</standard>
+					<standard>Ura di Timor di Livanti</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Ìsula di Pasca</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Ìsula di Pasca</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Ìsula di Pasca</daylight>
+					<generic>Ura di l’Ìsula di Pasca</generic>
+					<standard>Ura sulari di l’Ìsula di Pasca</standard>
+					<daylight>Ura ligali di l’Ìsula di Pasca</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ècuador</standard>
+					<standard>Ura di l’Ècuador</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
 				<long>
-					<generic draft="unconfirmed">Ura Cintrali Eurupea</generic>
-					<standard draft="unconfirmed">Ura sulari Cintrali Eurupea</standard>
-					<daylight draft="unconfirmed">Ura ligali Cintrali Eurupea</daylight>
+					<generic>Ura Cintrali Eurupea</generic>
+					<standard>Ura sulari Cintrali Eurupea</standard>
+					<daylight>Ura ligali Cintrali Eurupea</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Eastern">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Europa di Livanti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Europa di Livanti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Europa di Livanti</daylight>
+					<generic>Ura di l’Europa di Livanti</generic>
+					<standard>Ura sulari di l’Europa di Livanti</standard>
+					<daylight>Ura ligali di l’Europa di Livanti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Europe_Further_Eastern">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Europa cchiù a Livanti</standard>
+					<standard>Ura di l’Europa cchiù a Livanti</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Western">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Europa di Punenti</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Europa di Punenti</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Europa di Punenti</daylight>
+					<generic>Ura di l’Europa di Punenti</generic>
+					<standard>Ura sulari di l’Europa di Punenti</standard>
+					<daylight>Ura ligali di l’Europa di Punenti</daylight>
 				</long>
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Ìsuli Falkland</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Ìsuli Falkland</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Ìsuli Falkland</daylight>
+					<generic>Ura di l’Ìsuli Falkland</generic>
+					<standard>Ura sulari di l’Ìsuli Falkland</standard>
+					<daylight>Ura ligali di l’Ìsuli Falkland</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
 				<long>
-					<generic draft="unconfirmed">Ura dî Figi</generic>
-					<standard draft="unconfirmed">Ura sulari dî Figi</standard>
-					<daylight draft="unconfirmed">Ura ligali dî Figi</daylight>
+					<generic>Ura dî Figi</generic>
+					<standard>Ura sulari dî Figi</standard>
+					<daylight>Ura ligali dî Figi</daylight>
 				</long>
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard draft="unconfirmed">Ura dâ Guiana Francisi</standard>
+					<standard>Ura dâ Guiana Francisi</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
 				<long>
-					<standard draft="unconfirmed">Ura Francisi di Sciroccu e di l’Antàrtidi</standard>
+					<standard>Ura Francisi di Sciroccu e di l’Antàrtidi</standard>
 				</long>
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard draft="unconfirmed">Ura dî Galàpagos</standard>
+					<standard>Ura dî Galàpagos</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
 				<long>
-					<standard draft="unconfirmed">Ura di Gambier</standard>
+					<standard>Ura di Gambier</standard>
 				</long>
 			</metazone>
 			<metazone type="Georgia">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Giorgia</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Giorgia</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Giorgia</daylight>
+					<generic>Ura dâ Giorgia</generic>
+					<standard>Ura sulari dâ Giorgia</standard>
+					<daylight>Ura ligali dâ Giorgia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gilbert_Islands">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsuli Gilbert</standard>
+					<standard>Ura di l’Ìsuli Gilbert</standard>
 				</long>
 			</metazone>
 			<metazone type="GMT">
 				<long>
-					<standard draft="unconfirmed">Ura Minzana di Greenwich</standard>
+					<standard>Ura Minzana di Greenwich</standard>
 				</long>
 			</metazone>
 			<metazone type="Greenland">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Gruillannia</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Gruillannia</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Gruillannia</daylight>
+					<generic>Ura dâ Gruillannia</generic>
+					<standard>Ura sulari dâ Gruillannia</standard>
+					<daylight>Ura ligali dâ Gruillannia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Gruillannia livantina</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Gruillannia livantina</standard>
-					<daylight draft="unconfirmed">Ura livantina dâ Gruillannia livantina</daylight>
+					<generic>Ura dâ Gruillannia livantina</generic>
+					<standard>Ura sulari dâ Gruillannia livantina</standard>
+					<daylight>Ura livantina dâ Gruillannia livantina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Gruillannia punintina</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Gruillannia punintina</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Gruillannia punintina</daylight>
+					<generic>Ura dâ Gruillannia punintina</generic>
+					<standard>Ura sulari dâ Gruillannia punintina</standard>
+					<daylight>Ura ligali dâ Gruillannia punintina</daylight>
 				</long>
 			</metazone>
 			<metazone type="Gulf">
 				<long>
-					<standard draft="unconfirmed">Ura Nurmali dû Gurfu</standard>
+					<standard>Ura Nurmali dû Gurfu</standard>
 				</long>
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard draft="unconfirmed">Ura dâ Guiana</standard>
+					<standard>Ura dâ Guiana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ura sulari di l’Hawaai</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Hawaai</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Hawaai</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Hawaai</daylight>
+					<generic>Ura di l’Hawaai</generic>
+					<standard>Ura sulari di l’Hawaai</standard>
+					<daylight>Ura ligali di l’Hawaai</daylight>
 				</long>
 				<short>
-					<generic draft="unconfirmed">HAT</generic>
-					<standard draft="unconfirmed">HAST</standard>
-					<daylight draft="unconfirmed">HADT</daylight>
+					<generic draft="contributed">HAT</generic>
+					<standard draft="contributed">HAST</standard>
+					<daylight draft="contributed">HADT</daylight>
 				</short>
 			</metazone>
 			<metazone type="Hong_Kong">
 				<long>
-					<generic draft="unconfirmed">Ura di Hong Kong</generic>
-					<standard draft="unconfirmed">Ura sulari di Hong Kong</standard>
-					<daylight draft="unconfirmed">Ura ligali di Hong Kong</daylight>
+					<generic>Ura di Hong Kong</generic>
+					<standard>Ura sulari di Hong Kong</standard>
+					<daylight>Ura ligali di Hong Kong</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hovd">
 				<long>
-					<generic draft="unconfirmed">Ura di Hovd</generic>
-					<standard draft="unconfirmed">Ura sulari di Hovd</standard>
-					<daylight draft="unconfirmed">Ura ligali di Hovd</daylight>
+					<generic>Ura di Khovd</generic>
+					<standard>Ura sulari di Khovd</standard>
+					<daylight>Ura ligali di Khovd</daylight>
 				</long>
 			</metazone>
 			<metazone type="India">
 				<long>
-					<standard draft="unconfirmed">Ura sulari di l’Ìnnia</standard>
+					<standard>Ura sulari di l’Ìnnia</standard>
 				</long>
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ucianu Innianu</standard>
+					<standard>Ura di l’Ucianu Innianu</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Innucina</standard>
+					<standard>Ura di l’Innucina</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Innunesia cintrali</standard>
+					<standard>Ura di l’Innunesia cintrali</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Eastern">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Innunesia di livanti</standard>
+					<standard>Ura di l’Innunesia di livanti</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Western">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Innunesia di punenti</standard>
+					<standard>Ura di l’Innunesia di punenti</standard>
 				</long>
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Iran</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Iran</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Iran</daylight>
+					<generic>Ura di l’Iran</generic>
+					<standard>Ura sulari di l’Iran</standard>
+					<daylight>Ura ligali di l’Iran</daylight>
 				</long>
 			</metazone>
 			<metazone type="Irkutsk">
 				<long>
-					<generic draft="unconfirmed">Ura di Irtkutsk</generic>
-					<standard draft="unconfirmed">Ura sulari di Irtkutsk</standard>
-					<daylight draft="unconfirmed">Ura ligali di Irtkutsk</daylight>
+					<generic>Ura di Irtkutsk</generic>
+					<standard>Ura sulari di Irtkutsk</standard>
+					<daylight>Ura ligali di Irtkutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Israel">
 				<long>
-					<generic draft="unconfirmed">Ura di Isdraeli</generic>
-					<standard draft="unconfirmed">Ura sulari di Isdraeli</standard>
-					<daylight draft="unconfirmed">Ura ligali di Isdraeli</daylight>
+					<generic>Ura di Isdraeli</generic>
+					<standard>Ura sulari di Isdraeli</standard>
+					<daylight>Ura ligali di Isdraeli</daylight>
 				</long>
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic draft="unconfirmed">Ura dû Giappuni</generic>
-					<standard draft="unconfirmed">Ura sulari dû Giappuni</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Giappuni</daylight>
+					<generic>Ura dû Giappuni</generic>
+					<standard>Ura sulari dû Giappuni</standard>
+					<daylight>Ura ligali dû Giappuni</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
 				<long>
-					<standard draft="unconfirmed">Ura dû Kazzàkistan</standard>
+					<standard>Ura dû Kazzàkistan</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
-					<standard draft="unconfirmed">Ura dû Kazzàkistan di Livanti</standard>
+					<standard>Ura dû Kazzàkistan di Livanti</standard>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan_Western">
 				<long>
-					<standard draft="unconfirmed">Ura dû Kazzàkistan di Punenti</standard>
+					<standard>Ura dû Kazzàkistan di Punenti</standard>
 				</long>
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Curìa</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Curìa</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Curìa</daylight>
+					<generic>Ura dâ Curìa</generic>
+					<standard>Ura sulari dâ Curìa</standard>
+					<daylight>Ura ligali dâ Curìa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="unconfirmed">Ura di Kosrae</standard>
+					<standard>Ura di Kosrae</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
 				<long>
-					<generic draft="unconfirmed">Ura di Krasnoyarsk</generic>
-					<standard draft="unconfirmed">Ura sulari di Krasnoyarsk</standard>
-					<daylight draft="unconfirmed">Ura ligali di Krasnoyarsk</daylight>
+					<generic>Ura di Krasnoyarsk</generic>
+					<standard>Ura sulari di Krasnoyarsk</standard>
+					<daylight>Ura ligali di Krasnoyarsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kyrgystan">
 				<long>
-					<standard draft="unconfirmed">Ura dû Kirghìzzistan</standard>
+					<standard>Ura dû Kirghìzzistan</standard>
 				</long>
 			</metazone>
 			<metazone type="Line_Islands">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsuli Line</standard>
+					<standard>Ura di l’Ìsuli Line</standard>
 				</long>
 			</metazone>
 			<metazone type="Lord_Howe">
 				<long>
-					<generic draft="unconfirmed">Ura di Lord Howe</generic>
-					<standard draft="unconfirmed">Ura sulari di Lord Howe</standard>
-					<daylight draft="unconfirmed">Ura ligali di Lord Howe</daylight>
+					<generic>Ura di Lord Howe</generic>
+					<standard>Ura sulari di Lord Howe</standard>
+					<daylight>Ura ligali di Lord Howe</daylight>
 				</long>
 			</metazone>
 			<metazone type="Magadan">
 				<long>
-					<generic draft="unconfirmed">Ura di Magdan</generic>
-					<standard draft="unconfirmed">Ura sulari di Magdan</standard>
-					<daylight draft="unconfirmed">Ura ligali di Magdan</daylight>
+					<generic>Ura di Magdan</generic>
+					<standard>Ura sulari di Magdan</standard>
+					<daylight>Ura ligali di Magdan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Malaysia">
 				<long>
-					<standard draft="unconfirmed">Ura dâ Malisia</standard>
+					<standard>Ura dâ Malisia</standard>
 				</long>
 			</metazone>
 			<metazone type="Maldives">
 				<long>
-					<standard draft="unconfirmed">Ura dî Mardivi</standard>
+					<standard>Ura dî Mardivi</standard>
 				</long>
 			</metazone>
 			<metazone type="Marquesas">
 				<long>
-					<standard draft="unconfirmed">Ura dî Marchesi</standard>
+					<standard>Ura dî Marchesi</standard>
 				</long>
 			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsuli Marshall</standard>
+					<standard>Ura di l’Ìsuli Marshall</standard>
 				</long>
 			</metazone>
 			<metazone type="Mauritius">
 				<long>
-					<generic draft="unconfirmed">Ura di Mauritius</generic>
-					<standard draft="unconfirmed">Ura sulari di Mauritius</standard>
-					<daylight draft="unconfirmed">Ura ligali di Mauritius</daylight>
+					<generic>Ura di Mauritius</generic>
+					<standard>Ura sulari di Mauritius</standard>
+					<daylight>Ura ligali di Mauritius</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mawson">
 				<long>
-					<standard draft="unconfirmed">Ura di Mawson</standard>
+					<standard>Ura di Mawson</standard>
 				</long>
 			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic draft="unconfirmed">Ura dû Mèssicu Pacìficu</generic>
-					<standard draft="unconfirmed">Ura sulari dû Mèssicu Pacìficu</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Mèssicu Pacìficu</daylight>
+					<generic>Ura dû Mèssicu Pacìficu</generic>
+					<standard>Ura sulari dû Mèssicu Pacìficu</standard>
+					<daylight>Ura ligali dû Mèssicu Pacìficu</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
-					<generic draft="unconfirmed">Ura di Ulaanbaatar</generic>
-					<standard draft="unconfirmed">Ura sulari di Ulaanbaatar</standard>
-					<daylight draft="unconfirmed">Ura ligali di Ulaanbaatar</daylight>
+					<generic>Ura di Ulaanbaatar</generic>
+					<standard>Ura sulari di Ulaanbaatar</standard>
+					<daylight>Ura ligali di Ulaanbaatar</daylight>
 				</long>
 			</metazone>
 			<metazone type="Moscow">
 				<long>
-					<generic draft="unconfirmed">Ura di Mosca</generic>
-					<standard draft="unconfirmed">Ura sulari di Mosca</standard>
-					<daylight draft="unconfirmed">Ura ligali di Mosca</daylight>
+					<generic>Ura di Mosca</generic>
+					<standard>Ura sulari di Mosca</standard>
+					<daylight>Ura ligali di Mosca</daylight>
 				</long>
 			</metazone>
 			<metazone type="Myanmar">
 				<long>
-					<standard draft="unconfirmed">Ura di Myanmar</standard>
+					<standard>Ura di Myanmar</standard>
 				</long>
 			</metazone>
 			<metazone type="Nauru">
 				<long>
-					<standard draft="unconfirmed">Ura di Nauru</standard>
+					<standard>Ura di Nauru</standard>
 				</long>
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard draft="unconfirmed">Ura dû Nepal</standard>
+					<standard>Ura dû Nepal</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Nova Calidonia</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Nova Calidonia</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Nova Calidonia</daylight>
+					<generic>Ura dâ Nova Calidonia</generic>
+					<standard>Ura sulari dâ Nova Calidonia</standard>
+					<daylight>Ura ligali dâ Nova Calidonia</daylight>
 				</long>
 			</metazone>
 			<metazone type="New_Zealand">
 				<long>
-					<generic draft="unconfirmed">Ura dâ Nova Zilannia</generic>
-					<standard draft="unconfirmed">Ura sulari dâ Nova Zilannia</standard>
-					<daylight draft="unconfirmed">Ura ligali dâ Nova Zilannia</daylight>
+					<generic>Ura dâ Nova Zilannia</generic>
+					<standard>Ura sulari dâ Nova Zilannia</standard>
+					<daylight>Ura ligali dâ Nova Zilannia</daylight>
 				</long>
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic draft="unconfirmed">Ura di Tirranova</generic>
-					<standard draft="unconfirmed">Ura sulari di Tirranova</standard>
-					<daylight draft="unconfirmed">Ura ligali di Tirranova</daylight>
+					<generic>Ura di Tirranova</generic>
+					<standard>Ura sulari di Tirranova</standard>
+					<daylight>Ura ligali di Tirranova</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
 				<long>
-					<standard draft="unconfirmed">Ura di Niue</standard>
+					<standard>Ura di Niue</standard>
 				</long>
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Ìsula Norfolk</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Ìsula Norfolk</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Ìsula Norfolk</daylight>
+					<generic>Ura di l’Ìsula Norfolk</generic>
+					<standard>Ura sulari di l’Ìsula Norfolk</standard>
+					<daylight>Ura ligali di l’Ìsula Norfolk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic draft="unconfirmed">Ura di Fernando di Noronha</generic>
-					<standard draft="unconfirmed">Ura sulari di Fernando di Noronha</standard>
-					<daylight draft="unconfirmed">Ura ligali di Fernando di Noronha</daylight>
+					<generic>Ura di Fernando di Noronha</generic>
+					<standard>Ura sulari di Fernando di Noronha</standard>
+					<daylight>Ura ligali di Fernando di Noronha</daylight>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
 				<long>
-					<generic draft="unconfirmed">Ura di Novosibirsk</generic>
-					<standard draft="unconfirmed">Ura sulari di Novosibirsk</standard>
-					<daylight draft="unconfirmed">Ura ligali di Novosibirsk</daylight>
+					<generic>Ura di Novosibirsk</generic>
+					<standard>Ura sulari di Novosibirsk</standard>
+					<daylight>Ura ligali di Novosibirsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Omsk">
 				<long>
-					<generic draft="unconfirmed">Ura di Omsk</generic>
-					<standard draft="unconfirmed">Ura sulari di Omsk</standard>
-					<daylight draft="unconfirmed">Ura ligali di Omsk</daylight>
+					<generic>Ura di Omsk</generic>
+					<standard>Ura sulari di Omsk</standard>
+					<daylight>Ura ligali di Omsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pakistan">
 				<long>
-					<generic draft="unconfirmed">Ura dû Pàkistan</generic>
-					<standard draft="unconfirmed">Ura sulari dû Pàkistan</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Pàkistan</daylight>
+					<generic>Ura dû Pàkistan</generic>
+					<standard>Ura sulari dû Pàkistan</standard>
+					<daylight>Ura ligali dû Pàkistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Palau">
 				<long>
-					<standard draft="unconfirmed">Ura di Palau</standard>
+					<standard>Ura di Palau</standard>
 				</long>
 			</metazone>
 			<metazone type="Papua_New_Guinea">
 				<long>
-					<standard draft="unconfirmed">Ura dâ Papua Nova Guinìa</standard>
+					<standard>Ura dâ Papua Nova Guinìa</standard>
 				</long>
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic draft="unconfirmed">Ura dû Paraguay</generic>
-					<standard draft="unconfirmed">Ura sulari dû Paraguay</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Paraguay</daylight>
+					<generic>Ura dû Paraguay</generic>
+					<standard>Ura sulari dû Paraguay</standard>
+					<daylight>Ura ligali dû Paraguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic draft="unconfirmed">Ura dû Pirù</generic>
-					<standard draft="unconfirmed">Ura sulari dû Pirù</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Pirù</daylight>
+					<generic>Ura dû Pirù</generic>
+					<standard>Ura sulari dû Pirù</standard>
+					<daylight>Ura ligali dû Pirù</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
 				<long>
-					<generic draft="unconfirmed">Ura dî Filippini</generic>
-					<standard draft="unconfirmed">Ura sulari dî Filippini</standard>
-					<daylight draft="unconfirmed">Ura ligali dî Filippini</daylight>
+					<generic>Ura dî Filippini</generic>
+					<standard>Ura sulari dî Filippini</standard>
+					<daylight>Ura ligali dî Filippini</daylight>
 				</long>
 			</metazone>
 			<metazone type="Phoenix_Islands">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsuli Phoenix</standard>
+					<standard>Ura di l’Ìsuli Phoenix</standard>
 				</long>
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic draft="unconfirmed">Ura di S. Pierre e Miquelon</generic>
-					<standard draft="unconfirmed">Ura sulari di S. Pierre e Miquelon</standard>
-					<daylight draft="unconfirmed">Ura ligali di S. Pierre e Miquelon</daylight>
+					<generic>Ura di S. Pierre e Miquelon</generic>
+					<standard>Ura sulari di S. Pierre e Miquelon</standard>
+					<daylight>Ura ligali di S. Pierre e Miquelon</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
-					<standard draft="unconfirmed">Ura di Pitcairn</standard>
+					<standard>Ura di Pitcairn</standard>
 				</long>
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard draft="unconfirmed">Ura di Ponape</standard>
+					<standard>Ura di Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard draft="unconfirmed">Ura di Pyongyang</standard>
+					<standard>Ura dâ Curia di Tramuntana</standard>
 				</long>
 			</metazone>
 			<metazone type="Reunion">
 				<long>
-					<standard draft="unconfirmed">Ura di Réunion</standard>
+					<standard>Ura di Réunion</standard>
 				</long>
 			</metazone>
 			<metazone type="Rothera">
 				<long>
-					<standard draft="unconfirmed">Ura di Rothera</standard>
+					<standard>Ura di Rothera</standard>
 				</long>
 			</metazone>
 			<metazone type="Sakhalin">
 				<long>
-					<generic draft="unconfirmed">Ura di Sakhalin</generic>
-					<standard draft="unconfirmed">Ura sulari di Sakhalin</standard>
-					<daylight draft="unconfirmed">Ura ligali di Sakhalin</daylight>
+					<generic>Ura di Sakhalin</generic>
+					<standard>Ura sulari di Sakhalin</standard>
+					<daylight>Ura ligali di Sakhalin</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic draft="unconfirmed">Ura dî Samoa</generic>
-					<standard draft="unconfirmed">Ura sulari dî Samoa</standard>
-					<daylight draft="unconfirmed">Ura ligali dî Samoa</daylight>
+					<generic>Ura dî Samoa miricani</generic>
+					<standard>Ura sulari dî Samoa miricani</standard>
+					<daylight>Ura ligali dî Samoa miricani</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
 				<long>
-					<standard draft="unconfirmed">Ura dî Seychelles</standard>
+					<standard>Ura dî Seychelles</standard>
 				</long>
 			</metazone>
 			<metazone type="Singapore">
 				<long>
-					<standard draft="unconfirmed">Ura di Singapuri</standard>
+					<standard>Ura di Singapuri</standard>
 				</long>
 			</metazone>
 			<metazone type="Solomon">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsuli Salumuni</standard>
+					<standard>Ura di l’Ìsuli Salumuni</standard>
 				</long>
 			</metazone>
 			<metazone type="South_Georgia">
 				<long>
-					<standard draft="unconfirmed">Ura dâ Giorgia di sciroccu</standard>
+					<standard>Ura dâ Giorgia di sciroccu</standard>
 				</long>
 			</metazone>
 			<metazone type="Suriname">
 				<long>
-					<standard draft="unconfirmed">Ura dû Surinami</standard>
+					<standard>Ura dû Surinami</standard>
 				</long>
 			</metazone>
 			<metazone type="Syowa">
 				<long>
-					<standard draft="unconfirmed">Ura di Syowa</standard>
+					<standard>Ura di Syowa</standard>
 				</long>
 			</metazone>
 			<metazone type="Tahiti">
 				<long>
-					<standard draft="unconfirmed">Ura di Tahiti</standard>
+					<standard>Ura di Tahiti</standard>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic draft="unconfirmed">Ura di Taipei</generic>
-					<standard draft="unconfirmed">Ura sulari di Taipei</standard>
-					<daylight draft="unconfirmed">Ura ligali di Taipei</daylight>
+					<generic>Ura di Taiwan</generic>
+					<standard>Ura sulari di Taiwan</standard>
+					<daylight>Ura ligali di Taiwan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
 				<long>
-					<standard draft="unconfirmed">Ura dû Taggìkistan</standard>
+					<standard>Ura dû Taggìkistan</standard>
 				</long>
 			</metazone>
 			<metazone type="Tokelau">
 				<long>
-					<standard draft="unconfirmed">Ura di Tukilau</standard>
+					<standard>Ura di Tukilau</standard>
 				</long>
 			</metazone>
 			<metazone type="Tonga">
 				<long>
-					<generic draft="unconfirmed">Ura di Tonga</generic>
-					<standard draft="unconfirmed">Ura sulari di Tonga</standard>
-					<daylight draft="unconfirmed">Ura ligali di Tonga</daylight>
+					<generic>Ura di Tonga</generic>
+					<standard>Ura sulari di Tonga</standard>
+					<daylight>Ura ligali di Tonga</daylight>
 				</long>
 			</metazone>
 			<metazone type="Truk">
 				<long>
-					<standard draft="unconfirmed">Ura di Chuuk</standard>
+					<standard>Ura di Chuuk</standard>
 				</long>
 			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
-					<generic draft="unconfirmed">Ura dû Turkmènistan</generic>
-					<standard draft="unconfirmed">Ura sulari dû Turkmènistan</standard>
-					<daylight draft="unconfirmed">Ura ligali dû Turkmènistan</daylight>
+					<generic>Ura dû Turkmènistan</generic>
+					<standard>Ura sulari dû Turkmènistan</standard>
+					<daylight>Ura ligali dû Turkmènistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tuvalu">
 				<long>
-					<standard draft="unconfirmed">Ura di Tuvalu</standard>
+					<standard>Ura di Tuvalu</standard>
 				</long>
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Uruguay</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Uruguay</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Uruguay</daylight>
+					<generic>Ura di l’Uruguay</generic>
+					<standard>Ura sulari di l’Uruguay</standard>
+					<daylight>Ura ligali di l’Uruguay</daylight>
 				</long>
 			</metazone>
 			<metazone type="Uzbekistan">
 				<long>
-					<generic draft="unconfirmed">Ura di l’Uzbèkistan</generic>
-					<standard draft="unconfirmed">Ura sulari di l’Uzbèkistan</standard>
-					<daylight draft="unconfirmed">Ura ligali di l’Uzbèkistan</daylight>
+					<generic>Ura di l’Uzbèkistan</generic>
+					<standard>Ura sulari di l’Uzbèkistan</standard>
+					<daylight>Ura ligali di l’Uzbèkistan</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vanuatu">
 				<long>
-					<generic draft="unconfirmed">Ura di Vanuatu</generic>
-					<standard draft="unconfirmed">Ura sulari di Vanuatu</standard>
-					<daylight draft="unconfirmed">Ura ligali di Vanuatu</daylight>
+					<generic>Ura di Vanuatu</generic>
+					<standard>Ura sulari di Vanuatu</standard>
+					<daylight>Ura ligali di Vanuatu</daylight>
 				</long>
 			</metazone>
 			<metazone type="Venezuela">
 				<long>
-					<standard draft="unconfirmed">Ura dû Vinizzuela</standard>
+					<standard>Ura dû Vinizzuela</standard>
 				</long>
 			</metazone>
 			<metazone type="Vladivostok">
 				<long>
-					<generic draft="unconfirmed">Ura di Vladìvustok</generic>
-					<standard draft="unconfirmed">Ura sulari di Vladìvustok</standard>
-					<daylight draft="unconfirmed">Ura ligali di Vladìvustok</daylight>
+					<generic>Ura di Vladìvustok</generic>
+					<standard>Ura sulari di Vladìvustok</standard>
+					<daylight>Ura ligali di Vladìvustok</daylight>
 				</long>
 			</metazone>
 			<metazone type="Volgograd">
 				<long>
-					<generic draft="unconfirmed">Ura di Vòlgugrad</generic>
-					<standard draft="unconfirmed">Ura sulari di Vòlgugrad</standard>
-					<daylight draft="unconfirmed">Ura ligali di Vòlgugrad</daylight>
+					<generic>Ura di Vòlgugrad</generic>
+					<standard>Ura sulari di Vòlgugrad</standard>
+					<daylight>Ura ligali di Vòlgugrad</daylight>
 				</long>
 			</metazone>
 			<metazone type="Vostok">
 				<long>
-					<standard draft="unconfirmed">Ura di Vostok</standard>
+					<standard>Ura di Vostok</standard>
 				</long>
 			</metazone>
 			<metazone type="Wake">
 				<long>
-					<standard draft="unconfirmed">Ura di l’Ìsula Wake</standard>
+					<standard>Ura di l’Ìsula Wake</standard>
 				</long>
 			</metazone>
 			<metazone type="Wallis">
 				<long>
-					<standard draft="unconfirmed">Ura di Wallis e Futuna</standard>
+					<standard>Ura di Wallis e Futuna</standard>
 				</long>
 			</metazone>
 			<metazone type="Yakutsk">
 				<long>
-					<generic draft="unconfirmed">Ura di Yakutsk</generic>
-					<standard draft="unconfirmed">Ura sulari di Yakutsk</standard>
-					<daylight draft="unconfirmed">Ura ligali di Yakutsk</daylight>
+					<generic>Ura di Yakutsk</generic>
+					<standard>Ura sulari di Yakutsk</standard>
+					<daylight>Ura ligali di Yakutsk</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yekaterinburg">
 				<long>
-					<generic draft="unconfirmed">Ura di Yekatirimmurgu</generic>
-					<standard draft="unconfirmed">Ura sulari di Yekatirimmurgu</standard>
-					<daylight draft="unconfirmed">Ura ligali di Yekatirimmurgu</daylight>
+					<generic>Ura di Yekatirimmurgu</generic>
+					<standard>Ura sulari di Yekatirimmurgu</standard>
+					<daylight>Ura ligali di Yekatirimmurgu</daylight>
 				</long>
 			</metazone>
 			<metazone type="Yukon">
 				<long>
-					<standard draft="unconfirmed">Ura dû Yukon</standard>
+					<standard>Ura dû Yukon</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<decimal draft="unconfirmed">,</decimal>
-			<group draft="unconfirmed">.</group>
+			<decimal>,</decimal>
+			<group>.</group>
 		</symbols>
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength type="long">
 				<decimalFormat>
-					<pattern type="1000" count="one" draft="unconfirmed">0 migghiaru</pattern>
-					<pattern type="1000" count="other" draft="unconfirmed">0 mila</pattern>
-					<pattern type="10000" count="one" draft="unconfirmed">00 mila</pattern>
-					<pattern type="10000" count="other" draft="unconfirmed">00 mila</pattern>
-					<pattern type="100000" count="one" draft="unconfirmed">000 mila</pattern>
-					<pattern type="100000" count="other" draft="unconfirmed">000 mila</pattern>
-					<pattern type="1000000" count="one" draft="unconfirmed">0 miliuni</pattern>
-					<pattern type="1000000" count="other" draft="unconfirmed">0 miliuna</pattern>
-					<pattern type="10000000" count="one" draft="unconfirmed">00 miliuna</pattern>
-					<pattern type="10000000" count="other" draft="unconfirmed">00 miliuna</pattern>
-					<pattern type="100000000" count="one" draft="unconfirmed">000 miliuna</pattern>
-					<pattern type="100000000" count="other" draft="unconfirmed">000 miliuna</pattern>
-					<pattern type="1000000000" count="one" draft="unconfirmed">0 miliardu</pattern>
-					<pattern type="1000000000" count="other" draft="unconfirmed">0 miliardi</pattern>
-					<pattern type="10000000000" count="one" draft="unconfirmed">00 miliardi</pattern>
-					<pattern type="10000000000" count="other" draft="unconfirmed">00 miliardi</pattern>
-					<pattern type="100000000000" count="one" draft="unconfirmed">000 miliardi</pattern>
-					<pattern type="100000000000" count="other" draft="unconfirmed">000 miliardi</pattern>
-					<pattern type="1000000000000" count="one" draft="unconfirmed">0 biliuni</pattern>
-					<pattern type="1000000000000" count="other" draft="unconfirmed">0 biliuna</pattern>
-					<pattern type="10000000000000" count="one" draft="unconfirmed">00 biliuna</pattern>
-					<pattern type="10000000000000" count="other" draft="unconfirmed">00 biliuna</pattern>
-					<pattern type="100000000000000" count="one" draft="unconfirmed">000 biliuna</pattern>
-					<pattern type="100000000000000" count="other" draft="unconfirmed">000 biliuna</pattern>
+					<pattern type="1000" count="one">0 migghiaru</pattern>
+					<pattern type="1000" count="other">0 mila</pattern>
+					<pattern type="10000" count="one">00 mila</pattern>
+					<pattern type="10000" count="other">00 mila</pattern>
+					<pattern type="100000" count="one">000 mila</pattern>
+					<pattern type="100000" count="other">000 mila</pattern>
+					<pattern type="1000000" count="one">0 miliuni</pattern>
+					<pattern type="1000000" count="other">0 miliuna</pattern>
+					<pattern type="10000000" count="one">00 miliuna</pattern>
+					<pattern type="10000000" count="other">00 miliuna</pattern>
+					<pattern type="100000000" count="one">000 miliuna</pattern>
+					<pattern type="100000000" count="other">000 miliuna</pattern>
+					<pattern type="1000000000" count="one">0 miliardu</pattern>
+					<pattern type="1000000000" count="other">0 miliardi</pattern>
+					<pattern type="10000000000" count="one">00 miliardi</pattern>
+					<pattern type="10000000000" count="other">00 miliardi</pattern>
+					<pattern type="100000000000" count="one">000 miliardi</pattern>
+					<pattern type="100000000000" count="other">000 miliardi</pattern>
+					<pattern type="1000000000000" count="one">0 biliuni</pattern>
+					<pattern type="1000000000000" count="other">0 biliuna</pattern>
+					<pattern type="10000000000000" count="one">00 biliuna</pattern>
+					<pattern type="10000000000000" count="other">00 biliuna</pattern>
+					<pattern type="100000000000000" count="one">000 biliuna</pattern>
+					<pattern type="100000000000000" count="other">000 biliuna</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
 		<currencies>
 			<currency type="AED">
-				<displayName draft="unconfirmed">Dirham di l’Emirati Àrabbi Junciuti</displayName>
-				<displayName count="one" draft="unconfirmed">dirham EAJ</displayName>
-				<displayName count="other" draft="unconfirmed">dirham EAJ</displayName>
+				<displayName>Dirham di l’Emirati Àrabbi Junciuti</displayName>
+				<displayName count="one">dirham EAJ</displayName>
+				<displayName count="other">dirham EAJ</displayName>
 			</currency>
 			<currency type="AFN">
-				<displayName draft="unconfirmed">Afghani afghanu</displayName>
-				<displayName count="one" draft="unconfirmed">afghani afghanu</displayName>
-				<displayName count="other" draft="unconfirmed">afghani afghani</displayName>
+				<displayName>Afghani afghanu</displayName>
+				<displayName count="one">afghani afghanu</displayName>
+				<displayName count="other">afghani afghani</displayName>
 			</currency>
 			<currency type="ALL">
-				<displayName draft="unconfirmed">Lek arbanisi</displayName>
-				<displayName count="one" draft="unconfirmed">lek arbanisi</displayName>
-				<displayName count="other" draft="unconfirmed">lek arbanisi</displayName>
+				<displayName>Lek arbanisi</displayName>
+				<displayName count="one">lek arbanisi</displayName>
+				<displayName count="other">lek arbanisi</displayName>
 			</currency>
 			<currency type="AMD">
-				<displayName draft="unconfirmed">Dram armenu</displayName>
-				<displayName count="one" draft="unconfirmed">dram armenu</displayName>
-				<displayName count="other" draft="unconfirmed">dram armeni</displayName>
+				<displayName>Dram armenu</displayName>
+				<displayName count="one">dram armenu</displayName>
+				<displayName count="other">dram armeni</displayName>
 			</currency>
 			<currency type="ANG">
-				<displayName draft="unconfirmed">Ciurinu di l’Antiḍḍi Ulannisi</displayName>
-				<displayName count="one" draft="unconfirmed">ciurinu di l’Antiḍḍi Ulannisi</displayName>
-				<displayName count="other" draft="unconfirmed">ciurini di l’Antiḍḍi Ulannisi</displayName>
+				<displayName>Ciurinu di l’Antiḍḍi Ulannisi</displayName>
+				<displayName count="one">ciurinu di l’Antiḍḍi Ulannisi</displayName>
+				<displayName count="other">ciurini di l’Antiḍḍi Ulannisi</displayName>
 			</currency>
 			<currency type="AOA">
-				<displayName draft="unconfirmed">Kwanza angulisi</displayName>
-				<displayName count="one" draft="unconfirmed">kwanza angulisi</displayName>
-				<displayName count="other" draft="unconfirmed">kwanza angulisi</displayName>
+				<displayName>Kwanza angulisi</displayName>
+				<displayName count="one">kwanza angulisi</displayName>
+				<displayName count="other">kwanza angulisi</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName draft="unconfirmed">Pesu argintinu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu argintinu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi argintini</displayName>
+				<displayName>Pesu argintinu</displayName>
+				<displayName count="one">pesu argintinu</displayName>
+				<displayName count="other">pesi argintini</displayName>
 			</currency>
 			<currency type="AUD">
-				<displayName draft="unconfirmed">Dòllaru australianu</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru australianu</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari australiani</displayName>
+				<displayName>Dòllaru australianu</displayName>
+				<displayName count="one">dòllaru australianu</displayName>
+				<displayName count="other">dòllari australiani</displayName>
 			</currency>
 			<currency type="AWG">
-				<displayName draft="unconfirmed">Ciurinu d’Arubba</displayName>
-				<displayName count="one" draft="unconfirmed">ciurinu d’Arubba</displayName>
-				<displayName count="other" draft="unconfirmed">ciurini d’Arubba</displayName>
+				<displayName>Ciurinu d’Arubba</displayName>
+				<displayName count="one">ciurinu d’Arubba</displayName>
+				<displayName count="other">ciurini d’Arubba</displayName>
 			</currency>
 			<currency type="AZN">
-				<displayName draft="unconfirmed">Manat azzeru</displayName>
-				<displayName count="one" draft="unconfirmed">manat azzeru</displayName>
-				<displayName count="other" draft="unconfirmed">manat azzeri</displayName>
+				<displayName>Manat azzeru</displayName>
+				<displayName count="one">manat azzeru</displayName>
+				<displayName count="other">manat azzeri</displayName>
 			</currency>
 			<currency type="BAM">
-				<displayName draft="unconfirmed">Marcu cummirtìbbili dâ Bosnia-Herzegòvina</displayName>
-				<displayName count="one" draft="unconfirmed">marcu cummirtìbbili dâ Bosnia-Herzegòvina</displayName>
-				<displayName count="other" draft="unconfirmed">marchi cummirtìbbili dâ Bosnia-Herzegòvina</displayName>
+				<displayName>Marcu cummirtìbbili dâ Bosnia-Herzegòvina</displayName>
+				<displayName count="one">marcu cummirtìbbili dâ Bosnia-Herzegòvina</displayName>
+				<displayName count="other">marchi cummirtìbbili dâ Bosnia-Herzegòvina</displayName>
 			</currency>
 			<currency type="BBD">
-				<displayName draft="unconfirmed">Dòllaru dî Barbados</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dî Barbados</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dî Barbados</displayName>
+				<displayName>Dòllaru dî Barbados</displayName>
+				<displayName count="one">dòllaru dî Barbados</displayName>
+				<displayName count="other">dòllari dî Barbados</displayName>
 			</currency>
 			<currency type="BDT">
-				<displayName draft="unconfirmed">Taka dû Bàngladesh</displayName>
-				<displayName count="one" draft="unconfirmed">taka dû Bàngladesh</displayName>
-				<displayName count="other" draft="unconfirmed">taka dû Bàngladesh</displayName>
+				<displayName>Taka dû Bàngladesh</displayName>
+				<displayName count="one">taka dû Bàngladesh</displayName>
+				<displayName count="other">taka dû Bàngladesh</displayName>
 			</currency>
 			<currency type="BGN">
-				<displayName draft="unconfirmed">Lev bùrgaru</displayName>
-				<displayName count="one" draft="unconfirmed">lev bùrgaru</displayName>
-				<displayName count="other" draft="unconfirmed">lev bùrgari</displayName>
+				<displayName>Lev bùrgaru</displayName>
+				<displayName count="one">lev bùrgaru</displayName>
+				<displayName count="other">lev bùrgari</displayName>
 			</currency>
 			<currency type="BHD">
-				<displayName draft="unconfirmed">Dìnaru dû Bahrain</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru dû Bahrain</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari dû Bahrain</displayName>
+				<displayName>Dìnaru dû Bahrain</displayName>
+				<displayName count="one">dìnaru dû Bahrain</displayName>
+				<displayName count="other">dìnari dû Bahrain</displayName>
 			</currency>
 			<currency type="BIF">
-				<displayName draft="unconfirmed">Francu dû Burundi</displayName>
-				<displayName count="one" draft="unconfirmed">francu dû Burundi</displayName>
-				<displayName count="other" draft="unconfirmed">franchi dû Burundi</displayName>
+				<displayName>Francu dû Burundi</displayName>
+				<displayName count="one">francu dû Burundi</displayName>
+				<displayName count="other">franchi dû Burundi</displayName>
 			</currency>
 			<currency type="BMD">
-				<displayName draft="unconfirmed">Dòllaru dî Birmuda</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dî Birmuda</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dî Birmuda</displayName>
+				<displayName>Dòllaru dî Birmuda</displayName>
+				<displayName count="one">dòllaru dî Birmuda</displayName>
+				<displayName count="other">dòllari dî Birmuda</displayName>
 			</currency>
 			<currency type="BND">
-				<displayName draft="unconfirmed">Dòllaru dû Brunei</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dû Brunei</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dû Brunei</displayName>
+				<displayName>Dòllaru dû Brunei</displayName>
+				<displayName count="one">dòllaru dû Brunei</displayName>
+				<displayName count="other">dòllari dû Brunei</displayName>
 			</currency>
 			<currency type="BOB">
-				<displayName draft="unconfirmed">Bulivianu</displayName>
-				<displayName count="one" draft="unconfirmed">bulivianu</displayName>
-				<displayName count="other" draft="unconfirmed">buliviani</displayName>
+				<displayName>Bulivianu</displayName>
+				<displayName count="one">bulivianu</displayName>
+				<displayName count="other">buliviani</displayName>
 			</currency>
 			<currency type="BRL">
-				<displayName draft="unconfirmed">Riali brasilianu</displayName>
-				<displayName count="one" draft="unconfirmed">riali brasilianu</displayName>
-				<displayName count="other" draft="unconfirmed">riali brasiliani</displayName>
+				<displayName>Riali brasilianu</displayName>
+				<displayName count="one">riali brasilianu</displayName>
+				<displayName count="other">riali brasiliani</displayName>
 			</currency>
 			<currency type="BSD">
-				<displayName draft="unconfirmed">Dòllaru dî Bahamas</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dî Bahamas</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dî Bahamas</displayName>
+				<displayName>Dòllaru dî Bahamas</displayName>
+				<displayName count="one">dòllaru dî Bahamas</displayName>
+				<displayName count="other">dòllari dî Bahamas</displayName>
 			</currency>
 			<currency type="BTN">
-				<displayName draft="unconfirmed">Ngultrum butanisi</displayName>
-				<displayName count="one" draft="unconfirmed">ngultrum butanisi</displayName>
-				<displayName count="other" draft="unconfirmed">ngultrum butanisi</displayName>
+				<displayName>Ngultrum butanisi</displayName>
+				<displayName count="one">ngultrum butanisi</displayName>
+				<displayName count="other">ngultrum butanisi</displayName>
 			</currency>
 			<currency type="BWP">
-				<displayName draft="unconfirmed">Pula dû Botswana</displayName>
-				<displayName count="one" draft="unconfirmed">pula dû Botswana</displayName>
-				<displayName count="other" draft="unconfirmed">pula dû Botswana</displayName>
+				<displayName>Pula dû Botswana</displayName>
+				<displayName count="one">pula dû Botswana</displayName>
+				<displayName count="other">pula dû Botswana</displayName>
 			</currency>
 			<currency type="BYN">
-				<displayName draft="unconfirmed">Rubblu belurrussu</displayName>
-				<displayName count="one" draft="unconfirmed">rubblu belurrussu</displayName>
-				<displayName count="other" draft="unconfirmed">rubbli belurrussi</displayName>
+				<displayName>Rubblu belurrussu</displayName>
+				<displayName count="one">rubblu belurrussu</displayName>
+				<displayName count="other">rubbli belurrussi</displayName>
 			</currency>
 			<currency type="BZD">
-				<displayName draft="unconfirmed">Dòllaru dû Bilisi</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dû Bilisi</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dû Bilisi</displayName>
+				<displayName>Dòllaru dû Bilisi</displayName>
+				<displayName count="one">dòllaru dû Bilisi</displayName>
+				<displayName count="other">dòllari dû Bilisi</displayName>
 			</currency>
 			<currency type="CAD">
-				<displayName draft="unconfirmed">Dòllaru canadisi</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru canadisi</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari canadisi</displayName>
+				<displayName>Dòllaru canadisi</displayName>
+				<displayName count="one">dòllaru canadisi</displayName>
+				<displayName count="other">dòllari canadisi</displayName>
 			</currency>
 			<currency type="CDF">
-				<displayName draft="unconfirmed">Francu cungulisi</displayName>
-				<displayName count="one" draft="unconfirmed">francu cungulisi</displayName>
-				<displayName count="other" draft="unconfirmed">franchi cungulisi</displayName>
+				<displayName>Francu cungulisi</displayName>
+				<displayName count="one">francu cungulisi</displayName>
+				<displayName count="other">franchi cungulisi</displayName>
 			</currency>
 			<currency type="CHF">
-				<displayName draft="unconfirmed">Francu sbìzziru</displayName>
-				<displayName count="one" draft="unconfirmed">francu sbìzziru</displayName>
-				<displayName count="other" draft="unconfirmed">franchi sbìzziri</displayName>
+				<displayName>Francu sbìzziru</displayName>
+				<displayName count="one">francu sbìzziru</displayName>
+				<displayName count="other">franchi sbìzziri</displayName>
 			</currency>
 			<currency type="CLP">
-				<displayName draft="unconfirmed">Pesu cilenu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu cilenu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi cileni</displayName>
+				<displayName>Pesu cilenu</displayName>
+				<displayName count="one">pesu cilenu</displayName>
+				<displayName count="other">pesi cileni</displayName>
 			</currency>
 			<currency type="CNH">
-				<displayName draft="unconfirmed">Yuan cinisi (di fora)</displayName>
-				<displayName count="one" draft="unconfirmed">yuan cinisi (di fora)</displayName>
-				<displayName count="other" draft="unconfirmed">yuan cinisi (di fora)</displayName>
+				<displayName>Yuan cinisi (di fora)</displayName>
+				<displayName count="one">yuan cinisi (di fora)</displayName>
+				<displayName count="other">yuan cinisi (di fora)</displayName>
 			</currency>
 			<currency type="CNY">
-				<displayName draft="unconfirmed">Yuan cinisi</displayName>
-				<displayName count="one" draft="unconfirmed">yuan cinisi</displayName>
-				<displayName count="other" draft="unconfirmed">yuan cinisi</displayName>
+				<displayName>Yuan cinisi</displayName>
+				<displayName count="one">yuan cinisi</displayName>
+				<displayName count="other">yuan cinisi</displayName>
 			</currency>
 			<currency type="COP">
-				<displayName draft="unconfirmed">Pesu culummianu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu culummianu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi culummiani</displayName>
+				<displayName>Pesu culummianu</displayName>
+				<displayName count="one">pesu culummianu</displayName>
+				<displayName count="other">pesi culummiani</displayName>
 			</currency>
 			<currency type="CRC">
-				<displayName draft="unconfirmed">Culón dâ Custa Rica</displayName>
-				<displayName count="one" draft="unconfirmed">culón dâ Custa Rica</displayName>
-				<displayName count="other" draft="unconfirmed">culoni dâ Custa Rica</displayName>
+				<displayName>Culón dâ Custa Rica</displayName>
+				<displayName count="one">culón dâ Custa Rica</displayName>
+				<displayName count="other">culoni dâ Custa Rica</displayName>
 			</currency>
 			<currency type="CUC">
-				<displayName draft="unconfirmed">Pesu cubbanu cummirtìbbili</displayName>
-				<displayName count="one" draft="unconfirmed">pesu cubbanu cummirtìbbili</displayName>
-				<displayName count="other" draft="unconfirmed">pesi cubbani cummirtìbbili</displayName>
+				<displayName>Pesu cubbanu cummirtìbbili</displayName>
+				<displayName count="one">pesu cubbanu cummirtìbbili</displayName>
+				<displayName count="other">pesi cubbani cummirtìbbili</displayName>
 			</currency>
 			<currency type="CUP">
-				<displayName draft="unconfirmed">Pesu cubbanu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu cubbanu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi cubbani</displayName>
+				<displayName>Pesu cubbanu</displayName>
+				<displayName count="one">pesu cubbanu</displayName>
+				<displayName count="other">pesi cubbani</displayName>
 			</currency>
 			<currency type="CVE">
-				<displayName draft="unconfirmed">Scudu capuvirdisi</displayName>
-				<displayName count="one" draft="unconfirmed">scudu capuvirdisi</displayName>
-				<displayName count="other" draft="unconfirmed">scudi capuvirdisi</displayName>
+				<displayName>Scudu di Capu Virdi</displayName>
+				<displayName count="one">scudu di Capu Virdi</displayName>
+				<displayName count="other">scudi di Capu Virdi</displayName>
 			</currency>
 			<currency type="CZK">
-				<displayName draft="unconfirmed">Curuna ceca</displayName>
-				<displayName count="one" draft="unconfirmed">curuna ceca</displayName>
-				<displayName count="other" draft="unconfirmed">curuni cechi</displayName>
+				<displayName>Curuna ceca</displayName>
+				<displayName count="one">curuna ceca</displayName>
+				<displayName count="other">curuni cechi</displayName>
 			</currency>
 			<currency type="DJF">
-				<displayName draft="unconfirmed">Francu di Gibbuti</displayName>
-				<displayName count="one" draft="unconfirmed">francu di Gibbuti</displayName>
-				<displayName count="other" draft="unconfirmed">franchi di Gibbuti</displayName>
+				<displayName>Francu di Gibbuti</displayName>
+				<displayName count="one">francu di Gibbuti</displayName>
+				<displayName count="other">franchi di Gibbuti</displayName>
 			</currency>
 			<currency type="DKK">
-				<displayName draft="unconfirmed">Curuna danisi</displayName>
-				<displayName count="one" draft="unconfirmed">curuna danisi</displayName>
-				<displayName count="other" draft="unconfirmed">curuni danisi</displayName>
+				<displayName>Curuna danisi</displayName>
+				<displayName count="one">curuna danisi</displayName>
+				<displayName count="other">curuni danisi</displayName>
 			</currency>
 			<currency type="DOP">
-				<displayName draft="unconfirmed">Pesu duminicanu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu duminicanu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi duminicani</displayName>
+				<displayName>Pesu duminicanu</displayName>
+				<displayName count="one">pesu duminicanu</displayName>
+				<displayName count="other">pesi duminicani</displayName>
 			</currency>
 			<currency type="DZD">
-				<displayName draft="unconfirmed">Dìnaru argirinu</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru argirinu</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari argirini</displayName>
+				<displayName>Dìnaru argirinu</displayName>
+				<displayName count="one">dìnaru argirinu</displayName>
+				<displayName count="other">dìnari argirini</displayName>
 			</currency>
 			<currency type="EGP">
-				<displayName draft="unconfirmed">Stirlina eggizziana</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina eggizziana</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini eggizziani</displayName>
+				<displayName>Stirlina eggizziana</displayName>
+				<displayName count="one">stirlina eggizziana</displayName>
+				<displayName count="other">stirlini eggizziani</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName draft="unconfirmed">Nafka eritreu</displayName>
-				<displayName count="one" draft="unconfirmed">nafka eritreu</displayName>
-				<displayName count="other" draft="unconfirmed">nafka eritrei</displayName>
+				<displayName>Nafka eritreu</displayName>
+				<displayName count="one">nafka eritreu</displayName>
+				<displayName count="other">nafka eritrei</displayName>
 			</currency>
 			<currency type="ETB">
-				<displayName draft="unconfirmed">Birr etiupi</displayName>
-				<displayName count="one" draft="unconfirmed">birr etiupi</displayName>
-				<displayName count="other" draft="unconfirmed">birr etiupi</displayName>
+				<displayName>Birr etiupi</displayName>
+				<displayName count="one">birr etiupi</displayName>
+				<displayName count="other">birr etiupi</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName draft="unconfirmed">Euru</displayName>
-				<displayName count="one" draft="unconfirmed">euru</displayName>
-				<displayName count="other" draft="unconfirmed">euru</displayName>
+				<displayName>Euru</displayName>
+				<displayName count="one">euru</displayName>
+				<displayName count="other">euru</displayName>
 			</currency>
 			<currency type="FJD">
-				<displayName draft="unconfirmed">Dòllaru dî Figi</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dî Figi</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dî Figi</displayName>
+				<displayName>Dòllaru dî Figi</displayName>
+				<displayName count="one">dòllaru dî Figi</displayName>
+				<displayName count="other">dòllari dî Figi</displayName>
 			</currency>
 			<currency type="FKP">
-				<displayName draft="unconfirmed">Stirlina di l’Ìsuli Falkland</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina di l’Ìsuli Falkland</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini di l’Ìsuli Falkland</displayName>
+				<displayName>Stirlina di l’Ìsuli Falkland</displayName>
+				<displayName count="one">stirlina di l’Ìsuli Falkland</displayName>
+				<displayName count="other">stirlini di l’Ìsuli Falkland</displayName>
 			</currency>
 			<currency type="GBP">
-				<displayName draft="unconfirmed">Stirlina Britànnica</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina Britànnica</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini Britànnica</displayName>
+				<displayName>Stirlina Britànnica</displayName>
+				<displayName count="one">stirlina Britànnica</displayName>
+				<displayName count="other">stirlini Britànnichi</displayName>
 			</currency>
 			<currency type="GEL">
-				<displayName draft="unconfirmed">Lari giurgianu</displayName>
-				<displayName count="one" draft="unconfirmed">lari giurgianu</displayName>
-				<displayName count="other" draft="unconfirmed">lari giurgiani</displayName>
+				<displayName>Lari giurgianu</displayName>
+				<displayName count="one">lari giurgianu</displayName>
+				<displayName count="other">lari giurgiani</displayName>
 			</currency>
 			<currency type="GHS">
-				<displayName draft="unconfirmed">Cedi ganisi</displayName>
-				<displayName count="one" draft="unconfirmed">cedi ganisi</displayName>
-				<displayName count="other" draft="unconfirmed">cedi ganisi</displayName>
+				<displayName>Cedi ganisi</displayName>
+				<displayName count="one">cedi ganisi</displayName>
+				<displayName count="other">cedi ganisi</displayName>
 			</currency>
 			<currency type="GIP">
-				<displayName draft="unconfirmed">Stirlina di Gibbirterra</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina di Gibbirterra</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini di Gibbirterra</displayName>
+				<displayName>Stirlina di Gibbirterra</displayName>
+				<displayName count="one">stirlina di Gibbirterra</displayName>
+				<displayName count="other">stirlini di Gibbirterra</displayName>
 			</currency>
 			<currency type="GMD">
-				<displayName draft="unconfirmed">Dalasi dû Gammia</displayName>
-				<displayName count="one" draft="unconfirmed">dalasi dû Gammia</displayName>
-				<displayName count="other" draft="unconfirmed">dalasi dû Gammia</displayName>
+				<displayName>Dalasi dû Gammia</displayName>
+				<displayName count="one">dalasi dû Gammia</displayName>
+				<displayName count="other">dalasi dû Gammia</displayName>
 			</currency>
 			<currency type="GNF">
-				<displayName draft="unconfirmed">Francu dâ Guinìa</displayName>
-				<displayName count="one" draft="unconfirmed">francu dâ Guinìa</displayName>
-				<displayName count="other" draft="unconfirmed">franchi dâ Guinìa</displayName>
+				<displayName>Francu dâ Guinìa</displayName>
+				<displayName count="one">francu dâ Guinìa</displayName>
+				<displayName count="other">franchi dâ Guinìa</displayName>
 			</currency>
 			<currency type="GTQ">
-				<displayName draft="unconfirmed">Quetzal dâ Guatimala</displayName>
-				<displayName count="one" draft="unconfirmed">quetzal dâ Guatimala</displayName>
-				<displayName count="other" draft="unconfirmed">quetzal dâ Guatimala</displayName>
+				<displayName>Quetzal dû Guatimala</displayName>
+				<displayName count="one">quetzal dû Guatimala</displayName>
+				<displayName count="other">quetzal dû Guatimala</displayName>
 			</currency>
 			<currency type="GYD">
-				<displayName draft="unconfirmed">Dòllaru dâ Guiana</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dâ Guiana</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dâ Guiana</displayName>
+				<displayName>Dòllaru dâ Guiana</displayName>
+				<displayName count="one">dòllaru dâ Guiana</displayName>
+				<displayName count="other">dòllari dâ Guiana</displayName>
 			</currency>
 			<currency type="HKD">
-				<displayName draft="unconfirmed">Dòllaru di Hong Kong</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru di Hong Kong</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari di Hong Kong</displayName>
+				<displayName>Dòllaru di Hong Kong</displayName>
+				<displayName count="one">dòllaru di Hong Kong</displayName>
+				<displayName count="other">dòllari di Hong Kong</displayName>
 			</currency>
 			<currency type="HNL">
-				<displayName draft="unconfirmed">Limpira di l’Hunnuras</displayName>
-				<displayName count="one" draft="unconfirmed">limpira di l’Hunnuras</displayName>
-				<displayName count="other" draft="unconfirmed">limpira di l’Hunnuras</displayName>
+				<displayName>Limpira di l’Hunnuras</displayName>
+				<displayName count="one">limpira di l’Hunnuras</displayName>
+				<displayName count="other">limpira di l’Hunnuras</displayName>
 			</currency>
 			<currency type="HRK">
-				<displayName draft="unconfirmed">Kuna cruata</displayName>
-				<displayName count="one" draft="unconfirmed">kuna cruata</displayName>
-				<displayName count="other" draft="unconfirmed">kuni cruati</displayName>
+				<displayName>Kuna cruata</displayName>
+				<displayName count="one">kuna cruata</displayName>
+				<displayName count="other">kuni cruati</displayName>
 			</currency>
 			<currency type="HTG">
-				<displayName draft="unconfirmed">Gordu d’Haiti</displayName>
-				<displayName count="one" draft="unconfirmed">gordu d’Haiti</displayName>
-				<displayName count="other" draft="unconfirmed">gordi d’Haiti</displayName>
+				<displayName>Gordu d’Haiti</displayName>
+				<displayName count="one">gordu d’Haiti</displayName>
+				<displayName count="other">gordi d’Haiti</displayName>
 			</currency>
 			<currency type="HUF">
-				<displayName draft="unconfirmed">Ciurinu unghirisi</displayName>
-				<displayName count="one" draft="unconfirmed">ciurinu unghirisi</displayName>
-				<displayName count="other" draft="unconfirmed">ciurini unghirisi</displayName>
+				<displayName>Ciurinu unghirisi</displayName>
+				<displayName count="one">ciurinu unghirisi</displayName>
+				<displayName count="other">ciurini unghirisi</displayName>
 			</currency>
 			<currency type="IDR">
-				<displayName draft="unconfirmed">Rupìa innunisiana</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa innunisiana</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi innunisiani</displayName>
+				<displayName>Rupìa innunisiana</displayName>
+				<displayName count="one">rupìa innunisiana</displayName>
+				<displayName count="other">rupìi innunisiani</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName draft="unconfirmed">Novu siclu isdraelianu</displayName>
-				<displayName count="one" draft="unconfirmed">novu siclu isdraelianu</displayName>
-				<displayName count="other" draft="unconfirmed">novi sicli isdraeliani</displayName>
+				<displayName>Novu siclu isdraelianu</displayName>
+				<displayName count="one">novu siclu isdraelianu</displayName>
+				<displayName count="other">novi sicli isdraeliani</displayName>
 			</currency>
 			<currency type="INR">
-				<displayName draft="unconfirmed">Rupìa inniana</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa inniana</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi inniani</displayName>
+				<displayName>Rupìa inniana</displayName>
+				<displayName count="one">rupìa inniana</displayName>
+				<displayName count="other">rupìi inniani</displayName>
 			</currency>
 			<currency type="IQD">
-				<displayName draft="unconfirmed">Dìnaru irachenu</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru irachenu</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari iracheni</displayName>
+				<displayName>Dìnaru irachenu</displayName>
+				<displayName count="one">dìnaru irachenu</displayName>
+				<displayName count="other">dìnari iracheni</displayName>
 			</currency>
 			<currency type="IRR">
-				<displayName draft="unconfirmed">Riali iranianu</displayName>
-				<displayName count="one" draft="unconfirmed">riali iranianu</displayName>
-				<displayName count="other" draft="unconfirmed">riali iraniani</displayName>
+				<displayName>Riali iranianu</displayName>
+				<displayName count="one">riali iranianu</displayName>
+				<displayName count="other">riali iraniani</displayName>
 			</currency>
 			<currency type="ISK">
-				<displayName draft="unconfirmed">Curuna islannisi</displayName>
-				<displayName count="one" draft="unconfirmed">curuna islannisi</displayName>
-				<displayName count="other" draft="unconfirmed">curuni islannisi</displayName>
+				<displayName>Curuna islannisi</displayName>
+				<displayName count="one">curuna islannisi</displayName>
+				<displayName count="other">curuni islannisi</displayName>
 			</currency>
 			<currency type="JMD">
-				<displayName draft="unconfirmed">Dòllaru giamaicanu</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru giamaicanu</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari giamaicanu</displayName>
+				<displayName>Dòllaru giamaicanu</displayName>
+				<displayName count="one">dòllaru giamaicanu</displayName>
+				<displayName count="other">dòllari giamaicanu</displayName>
 			</currency>
 			<currency type="JOD">
-				<displayName draft="unconfirmed">Dìnaru giurdanu</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru giurdanu</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari giurdani</displayName>
+				<displayName>Dìnaru giurdanu</displayName>
+				<displayName count="one">dìnaru giurdanu</displayName>
+				<displayName count="other">dìnari giurdani</displayName>
 			</currency>
 			<currency type="JPY">
-				<displayName draft="unconfirmed">Yen giappunisi</displayName>
-				<displayName count="one" draft="unconfirmed">yen giappunisi</displayName>
-				<displayName count="other" draft="unconfirmed">yen giappunisi</displayName>
+				<displayName>Yen giappunisi</displayName>
+				<displayName count="one">yen giappunisi</displayName>
+				<displayName count="other">yen giappunisi</displayName>
 			</currency>
 			<currency type="KES">
-				<displayName draft="unconfirmed">Scillinu dû Kenya</displayName>
-				<displayName count="one" draft="unconfirmed">scillinu dû Kenya</displayName>
-				<displayName count="other" draft="unconfirmed">scillini dû Kenya</displayName>
+				<displayName>Scillinu dû Kenya</displayName>
+				<displayName count="one">scillinu dû Kenya</displayName>
+				<displayName count="other">scillini dû Kenya</displayName>
 			</currency>
 			<currency type="KGS">
-				<displayName draft="unconfirmed">Som dû Kyrgyzistan</displayName>
-				<displayName count="one" draft="unconfirmed">som dû Kyrgyzistan</displayName>
-				<displayName count="other" draft="unconfirmed">som dû Kyrgyzistan</displayName>
+				<displayName>Som dû Kirghìzzistan</displayName>
+				<displayName count="one">som dû Kirghìzzistan</displayName>
+				<displayName count="other">som dû Kirghìzzistan</displayName>
 			</currency>
 			<currency type="KHR">
-				<displayName draft="unconfirmed">Riel cambuggianu</displayName>
-				<displayName count="one" draft="unconfirmed">riel cambuggianu</displayName>
-				<displayName count="other" draft="unconfirmed">riel cambuggianI</displayName>
+				<displayName>Riel cambuggianu</displayName>
+				<displayName count="one">riel cambuggianu</displayName>
+				<displayName count="other">riel cambuggianI</displayName>
 			</currency>
 			<currency type="KMF">
-				<displayName draft="unconfirmed">Francu dî Cumori</displayName>
-				<displayName count="one" draft="unconfirmed">francu dî Cumori</displayName>
-				<displayName count="other" draft="unconfirmed">franchi dî Cumori</displayName>
+				<displayName>Francu dî Cumori</displayName>
+				<displayName count="one">francu dî Cumori</displayName>
+				<displayName count="other">franchi dî Cumori</displayName>
 			</currency>
 			<currency type="KPW">
-				<displayName draft="unconfirmed">Won dâ Curìa di Tramuntana</displayName>
-				<displayName count="one" draft="unconfirmed">won dâ Curìa di Tramuntana</displayName>
-				<displayName count="other" draft="unconfirmed">won dâ Curìa di Tramuntana</displayName>
+				<displayName>Won dâ Curìa di Tramuntana</displayName>
+				<displayName count="one">won dâ Curìa di Tramuntana</displayName>
+				<displayName count="other">won dâ Curìa di Tramuntana</displayName>
 			</currency>
 			<currency type="KRW">
-				<displayName draft="unconfirmed">Won dâ Curìa di Sciroccu</displayName>
-				<displayName count="one" draft="unconfirmed">won dâ Curìa di Sciroccu</displayName>
-				<displayName count="other" draft="unconfirmed">won dâ Curìa di Sciroccu</displayName>
+				<displayName>Won dâ Curìa di Sciroccu</displayName>
+				<displayName count="one">won dâ Curìa di Sciroccu</displayName>
+				<displayName count="other">won dâ Curìa di Sciroccu</displayName>
 			</currency>
 			<currency type="KWD">
-				<displayName draft="unconfirmed">Dìnaru dû Kuwait</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru dû Kuwait</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari dû Kuwait</displayName>
+				<displayName>Dìnaru dû Kuwait</displayName>
+				<displayName count="one">dìnaru dû Kuwait</displayName>
+				<displayName count="other">dìnari dû Kuwait</displayName>
 			</currency>
 			<currency type="KYD">
-				<displayName draft="unconfirmed">Dòllaru di l’Ìsuli Cayman</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru di l’Ìsuli Cayman</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari di l’Ìsuli Cayman</displayName>
+				<displayName>Dòllaru di l’Ìsuli Cayman</displayName>
+				<displayName count="one">dòllaru di l’Ìsuli Cayman</displayName>
+				<displayName count="other">dòllari di l’Ìsuli Cayman</displayName>
 			</currency>
 			<currency type="KZT">
-				<displayName draft="unconfirmed">Tenge dû Kazzàkistan</displayName>
-				<displayName count="one" draft="unconfirmed">tenge dû Kazzàkistan</displayName>
-				<displayName count="other" draft="unconfirmed">tenge dû Kazzàkistan</displayName>
+				<displayName>Tenge dû Kazzàkistan</displayName>
+				<displayName count="one">tenge dû Kazzàkistan</displayName>
+				<displayName count="other">tenge dû Kazzàkistan</displayName>
 			</currency>
 			<currency type="LAK">
-				<displayName draft="unconfirmed">Kip lauisi</displayName>
-				<displayName count="one" draft="unconfirmed">kip lauisi</displayName>
-				<displayName count="other" draft="unconfirmed">kip lauisi</displayName>
+				<displayName>Kip lauisi</displayName>
+				<displayName count="one">kip lauisi</displayName>
+				<displayName count="other">kip lauisi</displayName>
 			</currency>
 			<currency type="LBP">
-				<displayName draft="unconfirmed">Stirlina libbanisi</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina libbanisi</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini libbanisi</displayName>
+				<displayName>Stirlina libbanisi</displayName>
+				<displayName count="one">stirlina libbanisi</displayName>
+				<displayName count="other">stirlini libbanisi</displayName>
 			</currency>
 			<currency type="LKR">
-				<displayName draft="unconfirmed">Rupìa dû Sri Lanka</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa dû Sri Lanka</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi dû Sri Lanka</displayName>
+				<displayName>Rupìa dû Sri Lanka</displayName>
+				<displayName count="one">rupìa dû Sri Lanka</displayName>
+				<displayName count="other">rupìi dû Sri Lanka</displayName>
 			</currency>
 			<currency type="LRD">
-				<displayName draft="unconfirmed">Dòllaru dâ Libberia</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dâ Libberia</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dâ Libberia</displayName>
+				<displayName>Dòllaru dâ Libberia</displayName>
+				<displayName count="one">dòllaru dâ Libberia</displayName>
+				<displayName count="other">dòllari dâ Libberia</displayName>
 			</currency>
 			<currency type="LSL">
-				<displayName draft="unconfirmed">Loti dû Lisothu</displayName>
-				<displayName count="one" draft="unconfirmed">loti dû Lisothu</displayName>
-				<displayName count="other" draft="unconfirmed">loti dû Lisothu</displayName>
+				<displayName>Loti dû Lisothu</displayName>
+				<displayName count="one">loti dû Lisothu</displayName>
+				<displayName count="other">loti dû Lisothu</displayName>
 			</currency>
 			<currency type="LYD">
-				<displayName draft="unconfirmed">Dìnaru lìbbicu</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru lìbbicu</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari lìbbichi</displayName>
+				<displayName>Dìnaru lìbbicu</displayName>
+				<displayName count="one">dìnaru lìbbicu</displayName>
+				<displayName count="other">dìnari lìbbichi</displayName>
 			</currency>
 			<currency type="MAD">
-				<displayName draft="unconfirmed">Dirham marucchinu</displayName>
-				<displayName count="one" draft="unconfirmed">dirham marucchinu</displayName>
-				<displayName count="other" draft="unconfirmed">dirham marucchini</displayName>
+				<displayName>Dirham marucchinu</displayName>
+				<displayName count="one">dirham marucchinu</displayName>
+				<displayName count="other">dirham marucchini</displayName>
 			</currency>
 			<currency type="MDL">
-				<displayName draft="unconfirmed">Leu murdavu</displayName>
-				<displayName count="one" draft="unconfirmed">leu murdavu</displayName>
-				<displayName count="other" draft="unconfirmed">lei murdavi</displayName>
+				<displayName>Leu murdavu</displayName>
+				<displayName count="one">leu murdavu</displayName>
+				<displayName count="other">lei murdavi</displayName>
 			</currency>
 			<currency type="MGA">
-				<displayName draft="unconfirmed">Ariary margasciu</displayName>
-				<displayName count="one" draft="unconfirmed">ariary margasciu</displayName>
-				<displayName count="other" draft="unconfirmed">ariary margasci</displayName>
+				<displayName>Ariary margasciu</displayName>
+				<displayName count="one">ariary margasciu</displayName>
+				<displayName count="other">ariary margasci</displayName>
 			</currency>
 			<currency type="MKD">
-				<displayName draft="unconfirmed">Dìnaru macèduni</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru macèduni</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari macèduni</displayName>
+				<displayName>Dìnaru macèduni</displayName>
+				<displayName count="one">dìnaru macèduni</displayName>
+				<displayName count="other">dìnari macèduni</displayName>
 			</currency>
 			<currency type="MMK">
-				<displayName draft="unconfirmed">Kyat dû Myanmar</displayName>
-				<displayName count="one" draft="unconfirmed">kyat dû Myanmar</displayName>
-				<displayName count="other" draft="unconfirmed">kyat dû Myanmar</displayName>
+				<displayName>Kyat dû Myanmar</displayName>
+				<displayName count="one">kyat dû Myanmar</displayName>
+				<displayName count="other">kyat dû Myanmar</displayName>
 			</currency>
 			<currency type="MNT">
-				<displayName draft="unconfirmed">Tugrik mòngulu</displayName>
-				<displayName count="one" draft="unconfirmed">tugrik mòngulu</displayName>
-				<displayName count="other" draft="unconfirmed">tugrik mònguli</displayName>
+				<displayName>Tugrik mòngulu</displayName>
+				<displayName count="one">tugrik mòngulu</displayName>
+				<displayName count="other">tugrik mònguli</displayName>
 			</currency>
 			<currency type="MOP">
-				<displayName draft="unconfirmed">Pataca di Macau</displayName>
-				<displayName count="one" draft="unconfirmed">pataca di Macau</displayName>
-				<displayName count="other" draft="unconfirmed">patachi di Macau</displayName>
+				<displayName>Patacca di Macau</displayName>
+				<displayName count="one">patacca di Macau</displayName>
+				<displayName count="other">patacchi di Macau</displayName>
 			</currency>
 			<currency type="MRU">
-				<displayName draft="unconfirmed">Ouguiya mauritanu</displayName>
-				<displayName count="one" draft="unconfirmed">ouguiya mauritanu</displayName>
-				<displayName count="other" draft="unconfirmed">ouguiya mauritani</displayName>
+				<displayName>Ouguiya mauritanu</displayName>
+				<displayName count="one">ouguiya mauritanu</displayName>
+				<displayName count="other">ouguiya mauritani</displayName>
 			</currency>
 			<currency type="MUR">
-				<displayName draft="unconfirmed">Rupìa di Mauritius</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa di Mauritius</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi di Mauritius</displayName>
+				<displayName>Rupìa di Mauritius</displayName>
+				<displayName count="one">rupìa di Mauritius</displayName>
+				<displayName count="other">rupìi di Mauritius</displayName>
 			</currency>
 			<currency type="MVR">
-				<displayName draft="unconfirmed">Rufiyaa dî Mardivi</displayName>
-				<displayName count="one" draft="unconfirmed">rufiyaa dî Mardivi</displayName>
-				<displayName count="other" draft="unconfirmed">rufiyaa dî Mardivi</displayName>
+				<displayName>Rufiyaa dî Mardivi</displayName>
+				<displayName count="one">rufiyaa dî Mardivi</displayName>
+				<displayName count="other">rufiyaa dî Mardivi</displayName>
 			</currency>
 			<currency type="MWK">
-				<displayName draft="unconfirmed">Kwacha dû Malawi</displayName>
-				<displayName count="one" draft="unconfirmed">kwacha dû Malawi</displayName>
-				<displayName count="other" draft="unconfirmed">kwacha dû Malawi</displayName>
+				<displayName>Kwacha dû Malawi</displayName>
+				<displayName count="one">kwacha dû Malawi</displayName>
+				<displayName count="other">kwacha dû Malawi</displayName>
 			</currency>
 			<currency type="MXN">
-				<displayName draft="unconfirmed">Pesu missicanu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu missicanu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi missicani</displayName>
+				<displayName>Pesu missicanu</displayName>
+				<displayName count="one">pesu missicanu</displayName>
+				<displayName count="other">pesi missicani</displayName>
 			</currency>
 			<currency type="MYR">
-				<displayName draft="unconfirmed">Ringgit malisi</displayName>
-				<displayName count="one" draft="unconfirmed">ringgit malisi</displayName>
-				<displayName count="other" draft="unconfirmed">ringgit malisi</displayName>
+				<displayName>Ringgit malisi</displayName>
+				<displayName count="one">ringgit malisi</displayName>
+				<displayName count="other">ringgit malisi</displayName>
 			</currency>
 			<currency type="MZN">
-				<displayName draft="unconfirmed">Mètical dû Muzzammicu</displayName>
-				<displayName count="one" draft="unconfirmed">mètical dû Muzzammicu</displayName>
-				<displayName count="other" draft="unconfirmed">mètical dû Muzzammicu</displayName>
+				<displayName>Mètical dû Muzzammicu</displayName>
+				<displayName count="one">mètical dû Muzzammicu</displayName>
+				<displayName count="other">mètical dû Muzzammicu</displayName>
 			</currency>
 			<currency type="NAD">
-				<displayName draft="unconfirmed">Dòllaru dâ Namibbia</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dâ Namibbia</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dâ Namibbia</displayName>
+				<displayName>Dòllaru dâ Namibbia</displayName>
+				<displayName count="one">dòllaru dâ Namibbia</displayName>
+				<displayName count="other">dòllari dâ Namibbia</displayName>
 			</currency>
 			<currency type="NGN">
-				<displayName draft="unconfirmed">Naira niggirianu</displayName>
-				<displayName count="one" draft="unconfirmed">naira niggirianu</displayName>
-				<displayName count="other" draft="unconfirmed">naira niggiriani</displayName>
+				<displayName>Naira niggirianu</displayName>
+				<displayName count="one">naira niggirianu</displayName>
+				<displayName count="other">naira niggiriani</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName draft="unconfirmed">Còrdubba dâ Nicaragua</displayName>
-				<displayName count="one" draft="unconfirmed">còrdubba dâ Nicaragua</displayName>
-				<displayName count="other" draft="unconfirmed">còrdubba dâ Nicaragua</displayName>
+				<displayName>Còrdubba dû Nicaragua</displayName>
+				<displayName count="one">còrdubba dû Nicaragua</displayName>
+				<displayName count="other">còrdubba dû Nicaragua</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName draft="unconfirmed">Curuna nurviggisi</displayName>
-				<displayName count="one" draft="unconfirmed">curuna nurviggisi</displayName>
-				<displayName count="other" draft="unconfirmed">curuni nurviggisi</displayName>
+				<displayName>Curuna nurviggisi</displayName>
+				<displayName count="one">curuna nurviggisi</displayName>
+				<displayName count="other">curuni nurviggisi</displayName>
 			</currency>
 			<currency type="NPR">
-				<displayName draft="unconfirmed">Rupìa nipalisi</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa nipalisi</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi nipalisi</displayName>
+				<displayName>Rupìa nipalisi</displayName>
+				<displayName count="one">rupìa nipalisi</displayName>
+				<displayName count="other">rupìi nipalisi</displayName>
 			</currency>
 			<currency type="NZD">
-				<displayName draft="unconfirmed">Dòllaru dâ Nova Zilannia</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dâ Nova Zilannia</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dâ Nova Zilannia</displayName>
+				<displayName>Dòllaru dâ Nova Zilannia</displayName>
+				<displayName count="one">dòllaru dâ Nova Zilannia</displayName>
+				<displayName count="other">dòllari dâ Nova Zilannia</displayName>
 			</currency>
 			<currency type="OMR">
-				<displayName draft="unconfirmed">Riali di l’Oman</displayName>
-				<displayName count="one" draft="unconfirmed">riali di l’Oman</displayName>
-				<displayName count="other" draft="unconfirmed">riali di l’Oman</displayName>
+				<displayName>Riali di l’Oman</displayName>
+				<displayName count="one">riali di l’Oman</displayName>
+				<displayName count="other">riali di l’Oman</displayName>
 			</currency>
 			<currency type="PAB">
-				<displayName draft="unconfirmed">Barboa di Pànama</displayName>
-				<displayName count="one" draft="unconfirmed">barboa di Pànama</displayName>
-				<displayName count="other" draft="unconfirmed">barboa di Pànama</displayName>
+				<displayName>Barboa di Pànama</displayName>
+				<displayName count="one">barboa di Pànama</displayName>
+				<displayName count="other">barboa di Pànama</displayName>
 			</currency>
 			<currency type="PEN">
-				<displayName draft="unconfirmed">Suli piruvianu</displayName>
-				<displayName count="one" draft="unconfirmed">suli piruvianu</displayName>
-				<displayName count="other" draft="unconfirmed">suli piruvianu</displayName>
+				<displayName>Suli piruvianu</displayName>
+				<displayName count="one">suli piruvianu</displayName>
+				<displayName count="other">suli piruvianu</displayName>
 			</currency>
 			<currency type="PGK">
-				<displayName draft="unconfirmed">Kina dâ Papua Nova Guinìa</displayName>
-				<displayName count="one" draft="unconfirmed">kina dâ Papua Nova Guinìa</displayName>
-				<displayName count="other" draft="unconfirmed">kina dâ Papua Nova Guinìa</displayName>
+				<displayName>Kina dâ Papua Nova Guinìa</displayName>
+				<displayName count="one">kina dâ Papua Nova Guinìa</displayName>
+				<displayName count="other">kina dâ Papua Nova Guinìa</displayName>
 			</currency>
 			<currency type="PHP">
-				<displayName draft="unconfirmed">Pesu filippinu</displayName>
-				<displayName count="one" draft="unconfirmed">pesu filippinu</displayName>
-				<displayName count="other" draft="unconfirmed">pesi filippini</displayName>
+				<displayName>Pesu filippinu</displayName>
+				<displayName count="one">pesu filippinu</displayName>
+				<displayName count="other">pesi filippini</displayName>
 			</currency>
 			<currency type="PKR">
-				<displayName draft="unconfirmed">Rupìa pakistana</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa pakistana</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi pakistani</displayName>
+				<displayName>Rupìa pakistana</displayName>
+				<displayName count="one">rupìa pakistana</displayName>
+				<displayName count="other">rupìi pakistani</displayName>
 			</currency>
 			<currency type="PLN">
-				<displayName draft="unconfirmed">Zloty pulaccu</displayName>
-				<displayName count="one" draft="unconfirmed">zloty pulaccu</displayName>
-				<displayName count="other" draft="unconfirmed">zloty pulacchi</displayName>
+				<displayName>Zloty pulaccu</displayName>
+				<displayName count="one">zloty pulaccu</displayName>
+				<displayName count="other">zloty pulacchi</displayName>
 			</currency>
 			<currency type="PYG">
-				<displayName draft="unconfirmed">Guaranì dû Paraguay</displayName>
-				<displayName count="one" draft="unconfirmed">guaranì dû Paraguay</displayName>
-				<displayName count="other" draft="unconfirmed">guaranì dû Paraguay</displayName>
+				<displayName>Guaranì dû Paraguay</displayName>
+				<displayName count="one">guaranì dû Paraguay</displayName>
+				<displayName count="other">guaranì dû Paraguay</displayName>
 			</currency>
 			<currency type="QAR">
-				<displayName draft="unconfirmed">Riali dû Qatar</displayName>
-				<displayName count="one" draft="unconfirmed">riali dû Qatar</displayName>
-				<displayName count="other" draft="unconfirmed">riali dû Qatar</displayName>
+				<displayName>Riali dû Qatar</displayName>
+				<displayName count="one">riali dû Qatar</displayName>
+				<displayName count="other">riali dû Qatar</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName draft="unconfirmed">Leu rumenu</displayName>
-				<displayName count="one" draft="unconfirmed">leu rumenu</displayName>
-				<displayName count="other" draft="unconfirmed">lei rumeni</displayName>
+				<displayName>Leu rumenu</displayName>
+				<displayName count="one">leu rumenu</displayName>
+				<displayName count="other">lei rumeni</displayName>
 			</currency>
 			<currency type="RSD">
-				<displayName draft="unconfirmed">Dìnaru serbu</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru serbu</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari serbi</displayName>
+				<displayName>Dìnaru serbu</displayName>
+				<displayName count="one">dìnaru serbu</displayName>
+				<displayName count="other">dìnari serbi</displayName>
 			</currency>
 			<currency type="RUB">
-				<displayName draft="unconfirmed">Rubblu russu</displayName>
-				<displayName count="one" draft="unconfirmed">rubblu russu</displayName>
-				<displayName count="other" draft="unconfirmed">rubbli russi</displayName>
+				<displayName>Rubblu russu</displayName>
+				<displayName count="one">rubblu russu</displayName>
+				<displayName count="other">rubbli russi</displayName>
 			</currency>
 			<currency type="RWF">
-				<displayName draft="unconfirmed">Francu dû Ruanna</displayName>
-				<displayName count="one" draft="unconfirmed">francu dû Ruanna</displayName>
-				<displayName count="other" draft="unconfirmed">franchi dû Ruanna</displayName>
+				<displayName>Francu dû Ruanna</displayName>
+				<displayName count="one">francu dû Ruanna</displayName>
+				<displayName count="other">franchi dû Ruanna</displayName>
 			</currency>
 			<currency type="SAR">
-				<displayName draft="unconfirmed">Riali di l’Arabbia Saudita</displayName>
-				<displayName count="one" draft="unconfirmed">riali di l’Arabbia Saudita</displayName>
-				<displayName count="other" draft="unconfirmed">riali di l’Arabbia Saudita</displayName>
+				<displayName>Riali di l’Arabbia Saudita</displayName>
+				<displayName count="one">riali di l’Arabbia Saudita</displayName>
+				<displayName count="other">riali di l’Arabbia Saudita</displayName>
 			</currency>
 			<currency type="SBD">
-				<displayName draft="unconfirmed">Dòllaru di l’Ìsuli Salumuni</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru di l’Ìsuli Salumuni</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari di l’Ìsuli Salumuni</displayName>
+				<displayName>Dòllaru di l’Ìsuli Salumuni</displayName>
+				<displayName count="one">dòllaru di l’Ìsuli Salumuni</displayName>
+				<displayName count="other">dòllari di l’Ìsuli Salumuni</displayName>
 			</currency>
 			<currency type="SCR">
-				<displayName draft="unconfirmed">Rupìa dî Seychelles</displayName>
-				<displayName count="one" draft="unconfirmed">rupìa dî Seychelles</displayName>
-				<displayName count="other" draft="unconfirmed">rupìi dî Seychelles</displayName>
+				<displayName>Rupìa dî Seychelles</displayName>
+				<displayName count="one">rupìa dî Seychelles</displayName>
+				<displayName count="other">rupìi dî Seychelles</displayName>
 			</currency>
 			<currency type="SDG">
-				<displayName draft="unconfirmed">Stirlina sudanisi</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina sudanisi</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini sudanisi</displayName>
+				<displayName>Stirlina sudanisi</displayName>
+				<displayName count="one">stirlina sudanisi</displayName>
+				<displayName count="other">stirlini sudanisi</displayName>
 			</currency>
 			<currency type="SEK">
-				<displayName draft="unconfirmed">Curuna svidisi</displayName>
-				<displayName count="one" draft="unconfirmed">curuna svidisi</displayName>
-				<displayName count="other" draft="unconfirmed">curuni svidisi</displayName>
+				<displayName>Curuna sbidisi</displayName>
+				<displayName count="one">curuna sbidisi</displayName>
+				<displayName count="other">curuni sbidisi</displayName>
 			</currency>
 			<currency type="SGD">
-				<displayName draft="unconfirmed">Dòllaru di Singapuri</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru di Singapuri</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari di Singapuri</displayName>
+				<displayName>Dòllaru di Singapuri</displayName>
+				<displayName count="one">dòllaru di Singapuri</displayName>
+				<displayName count="other">dòllari di Singapuri</displayName>
 			</currency>
 			<currency type="SHP">
-				<displayName draft="unconfirmed">Stirlina di Sant’Èlina</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina di Sant’Èlina</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini di Sant’Èlina</displayName>
+				<displayName>Stirlina di Sant’Èlina</displayName>
+				<displayName count="one">stirlina di Sant’Èlina</displayName>
+				<displayName count="other">stirlini di Sant’Èlina</displayName>
 			</currency>
 			<currency type="SLE">
-				<displayName draft="unconfirmed">Liuni dâ Sierra Liuni</displayName>
-				<displayName count="one" draft="unconfirmed">liuni dâ Sierra Liuni</displayName>
-				<displayName count="other" draft="unconfirmed">liuna dâ Sierra Liuni</displayName>
+				<displayName>Liuni dâ Sierra Liuni</displayName>
+				<displayName count="one">liuni dâ Sierra Liuni</displayName>
+				<displayName count="other">liuna dâ Sierra Liuni</displayName>
 			</currency>
 			<currency type="SLL">
-				<displayName draft="unconfirmed">Liuni dâ Sierra Liuni (1964—2022)</displayName>
-				<displayName count="one" draft="unconfirmed">liuni dâ Sierra Liuni (1964—2022)</displayName>
-				<displayName count="other" draft="unconfirmed">liuna dâ Sierra Liuni (1964—2022)</displayName>
+				<displayName>Liuni dâ Sierra Liuni (1964—2022)</displayName>
+				<displayName count="one">liuni dâ Sierra Liuni (1964—2022)</displayName>
+				<displayName count="other">liuna dâ Sierra Liuni (1964—2022)</displayName>
 			</currency>
 			<currency type="SOS">
-				<displayName draft="unconfirmed">Scillinu sòmalu</displayName>
-				<displayName count="one" draft="unconfirmed">scillinu sòmalu</displayName>
-				<displayName count="other" draft="unconfirmed">scillini sòmali</displayName>
+				<displayName>Scillinu sòmalu</displayName>
+				<displayName count="one">scillinu sòmalu</displayName>
+				<displayName count="other">scillini sòmali</displayName>
 			</currency>
 			<currency type="SRD">
-				<displayName draft="unconfirmed">Dòllaru dû Surinami</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dû Surinami</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dû Surinami</displayName>
+				<displayName>Dòllaru dû Surinami</displayName>
+				<displayName count="one">dòllaru dû Surinami</displayName>
+				<displayName count="other">dòllari dû Surinami</displayName>
 			</currency>
 			<currency type="SSP">
-				<displayName draft="unconfirmed">Stirlina dû Sudan di sciroccu</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina dû Sudan di sciroccu</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini dû Sudan di sciroccu</displayName>
+				<displayName>Stirlina dû Sudan di sciroccu</displayName>
+				<displayName count="one">stirlina dû Sudan di sciroccu</displayName>
+				<displayName count="other">stirlini dû Sudan di sciroccu</displayName>
 			</currency>
 			<currency type="STN">
-				<displayName draft="unconfirmed">Dobra di São Tomé &amp; Príncipe</displayName>
-				<displayName count="one" draft="unconfirmed">dobra di São Tomé &amp; Príncipe</displayName>
-				<displayName count="other" draft="unconfirmed">dobra di São Tomé &amp; Príncipe</displayName>
+				<displayName>Dobra di São Tomé &amp; Príncipe</displayName>
+				<displayName count="one">dobra di São Tomé &amp; Príncipe</displayName>
+				<displayName count="other">dobra di São Tomé &amp; Príncipe</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName draft="unconfirmed">Stirlina siriana</displayName>
-				<displayName count="one" draft="unconfirmed">stirlina siriana</displayName>
-				<displayName count="other" draft="unconfirmed">stirlini siriani</displayName>
+				<displayName>Stirlina siriana</displayName>
+				<displayName count="one">stirlina siriana</displayName>
+				<displayName count="other">stirlini siriani</displayName>
 			</currency>
 			<currency type="SZL">
-				<displayName draft="unconfirmed">Lilangeni di Eswatini</displayName>
-				<displayName count="one" draft="unconfirmed">lilangeni di Eswatini</displayName>
-				<displayName count="other" draft="unconfirmed">lilangeni di Eswatini</displayName>
+				<displayName>Lilangeni di Eswatini</displayName>
+				<displayName count="one">lilangeni di Eswatini</displayName>
+				<displayName count="other">lilangeni di Eswatini</displayName>
 			</currency>
 			<currency type="THB">
-				<displayName draft="unconfirmed">Baht tailannisi</displayName>
-				<displayName count="one" draft="unconfirmed">baht tailannisi</displayName>
-				<displayName count="other" draft="unconfirmed">baht tailannisi</displayName>
+				<displayName>Baht tailannisi</displayName>
+				<displayName count="one">baht tailannisi</displayName>
+				<displayName count="other">baht tailannisi</displayName>
 			</currency>
 			<currency type="TJS">
-				<displayName draft="unconfirmed">Somoni dû Tajìkistan</displayName>
-				<displayName count="one" draft="unconfirmed">somoni dû Tajìkistan</displayName>
-				<displayName count="other" draft="unconfirmed">somoni dû Tajìkistan</displayName>
+				<displayName>Somoni dû Tajìkistan</displayName>
+				<displayName count="one">somoni dû Tajìkistan</displayName>
+				<displayName count="other">somoni dû Tajìkistan</displayName>
 			</currency>
 			<currency type="TMT">
-				<displayName draft="unconfirmed">Manat turkmenu</displayName>
-				<displayName count="one" draft="unconfirmed">manat turkmenu</displayName>
-				<displayName count="other" draft="unconfirmed">manat turkmeni</displayName>
+				<displayName>Manat turkmenu</displayName>
+				<displayName count="one">manat turkmenu</displayName>
+				<displayName count="other">manat turkmeni</displayName>
 			</currency>
 			<currency type="TND">
-				<displayName draft="unconfirmed">Dìnaru tunisinu</displayName>
-				<displayName count="one" draft="unconfirmed">dìnaru tunisinu</displayName>
-				<displayName count="other" draft="unconfirmed">dìnari tunisini</displayName>
+				<displayName>Dìnaru tunisinu</displayName>
+				<displayName count="one">dìnaru tunisinu</displayName>
+				<displayName count="other">dìnari tunisini</displayName>
 			</currency>
 			<currency type="TOP">
-				<displayName draft="unconfirmed">Tongan Paʻanga</displayName>
-				<displayName count="one" draft="unconfirmed">Tongan paʻanga</displayName>
-				<displayName count="other" draft="unconfirmed">Tongan paʻanga</displayName>
+				<displayName>Tongan Paʻanga</displayName>
+				<displayName count="one">Tongan paʻanga</displayName>
+				<displayName count="other">Tongan paʻanga</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName draft="unconfirmed">Lira turca</displayName>
-				<displayName count="one" draft="unconfirmed">lira turca</displayName>
-				<displayName count="other" draft="unconfirmed">liri turchi</displayName>
+				<displayName>Lira turca</displayName>
+				<displayName count="one">lira turca</displayName>
+				<displayName count="other">liri turchi</displayName>
 			</currency>
 			<currency type="TTD">
-				<displayName draft="unconfirmed">Dòllaru di Trinidad e Tobago</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru di Trinidad e Tobago</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari di Trinidad e Tobago</displayName>
+				<displayName>Dòllaru di Trinidad e Tobago</displayName>
+				<displayName count="one">dòllaru di Trinidad e Tobago</displayName>
+				<displayName count="other">dòllari di Trinidad e Tobago</displayName>
 			</currency>
 			<currency type="TWD">
-				<displayName draft="unconfirmed">Novu dòllaru taiwanisi</displayName>
-				<displayName count="one" draft="unconfirmed">novu dòllaru taiwanisi</displayName>
-				<displayName count="other" draft="unconfirmed">novi dòllari taiwanisi</displayName>
+				<displayName>Novu dòllaru taiwanisi</displayName>
+				<displayName count="one">novu dòllaru taiwanisi</displayName>
+				<displayName count="other">novi dòllari taiwanisi</displayName>
 			</currency>
 			<currency type="TZS">
-				<displayName draft="unconfirmed">Scillinu dâ Tanzania</displayName>
-				<displayName count="one" draft="unconfirmed">scillinu dâ Tanzania</displayName>
-				<displayName count="other" draft="unconfirmed">scillini dâ Tanzania</displayName>
+				<displayName>Scillinu dâ Tanzania</displayName>
+				<displayName count="one">scillinu dâ Tanzania</displayName>
+				<displayName count="other">scillini dâ Tanzania</displayName>
 			</currency>
 			<currency type="UAH">
-				<displayName draft="unconfirmed">Grivnia ucràina</displayName>
-				<displayName count="one" draft="unconfirmed">grivnia ucràina</displayName>
-				<displayName count="other" draft="unconfirmed">grivni ucràini</displayName>
+				<displayName>Grivnia ucràina</displayName>
+				<displayName count="one">grivnia ucràina</displayName>
+				<displayName count="other">grivni ucràini</displayName>
 			</currency>
 			<currency type="UGX">
-				<displayName draft="unconfirmed">Scillinu di l’Uganna</displayName>
-				<displayName count="one" draft="unconfirmed">scillinu di l’Uganna</displayName>
-				<displayName count="other" draft="unconfirmed">scillini di l’Uganna</displayName>
+				<displayName>Scillinu di l’Uganna</displayName>
+				<displayName count="one">scillinu di l’Uganna</displayName>
+				<displayName count="other">scillini di l’Uganna</displayName>
 			</currency>
 			<currency type="USD">
-				<displayName draft="unconfirmed">Dòllaru miricanu</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru miricanu</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari miricani</displayName>
+				<displayName>Dòllaru miricanu</displayName>
+				<displayName count="one">dòllaru miricanu</displayName>
+				<displayName count="other">dòllari miricani</displayName>
 			</currency>
 			<currency type="UYU">
-				<displayName draft="unconfirmed">Pesu di l’Uruguay</displayName>
-				<displayName count="one" draft="unconfirmed">pesu di l’Uruguay</displayName>
-				<displayName count="other" draft="unconfirmed">pesi di l’Uruguay</displayName>
+				<displayName>Pesu di l’Uruguay</displayName>
+				<displayName count="one">pesu di l’Uruguay</displayName>
+				<displayName count="other">pesi di l’Uruguay</displayName>
 			</currency>
 			<currency type="UZS">
-				<displayName draft="unconfirmed">Som di l’Uzbèkistan</displayName>
-				<displayName count="one" draft="unconfirmed">som di l’Uzbèkistan</displayName>
-				<displayName count="other" draft="unconfirmed">som di l’Uzbèkistan</displayName>
+				<displayName>Som di l’Uzbèkistan</displayName>
+				<displayName count="one">som di l’Uzbèkistan</displayName>
+				<displayName count="other">som di l’Uzbèkistan</displayName>
 			</currency>
 			<currency type="VES">
-				<displayName draft="unconfirmed">Bulivar dû Vinizzuela</displayName>
-				<displayName count="one" draft="unconfirmed">bulivar dû Vinizzuela</displayName>
-				<displayName count="other" draft="unconfirmed">bulivar dû Vinizzuela</displayName>
+				<displayName>Bulivar dû Vinizzuela</displayName>
+				<displayName count="one">bulivar dû Vinizzuela</displayName>
+				<displayName count="other">bulivar dû Vinizzuela</displayName>
 			</currency>
 			<currency type="VND">
-				<displayName draft="unconfirmed">Dong vietnamisi</displayName>
-				<displayName count="one" draft="unconfirmed">dong vietnamisi</displayName>
-				<displayName count="other" draft="unconfirmed">dong vietnamisi</displayName>
+				<displayName>Dong vietnamisi</displayName>
+				<displayName count="one">dong vietnamisi</displayName>
+				<displayName count="other">dong vietnamisi</displayName>
 			</currency>
 			<currency type="VUV">
-				<displayName draft="unconfirmed">Vatu di Vanuatu</displayName>
-				<displayName count="one" draft="unconfirmed">vatu di Vanuatu</displayName>
-				<displayName count="other" draft="unconfirmed">vatu di Vanuatu</displayName>
+				<displayName>Vatu di Vanuatu</displayName>
+				<displayName count="one">vatu di Vanuatu</displayName>
+				<displayName count="other">vatu di Vanuatu</displayName>
 			</currency>
 			<currency type="WST">
-				<displayName draft="unconfirmed">Tala samuanu</displayName>
-				<displayName count="one" draft="unconfirmed">Tala samuanu</displayName>
-				<displayName count="other" draft="unconfirmed">Tala samuani</displayName>
+				<displayName>Tala samuanu</displayName>
+				<displayName count="one">Tala samuanu</displayName>
+				<displayName count="other">Tala samuani</displayName>
 			</currency>
 			<currency type="XAF">
-				<displayName draft="unconfirmed">Francu CFA di l’Àfrica cintrali</displayName>
-				<displayName count="one" draft="unconfirmed">francu CFA di l’Àfrica cintrali</displayName>
-				<displayName count="other" draft="unconfirmed">franchi CFA di l’Àfrica cintrali</displayName>
+				<displayName>Francu CFA di l’Àfrica cintrali</displayName>
+				<displayName count="one">francu CFA di l’Àfrica cintrali</displayName>
+				<displayName count="other">franchi CFA di l’Àfrica cintrali</displayName>
 			</currency>
 			<currency type="XCD">
-				<displayName draft="unconfirmed">Dòllaru dî Caraibbi di livanti</displayName>
-				<displayName count="one" draft="unconfirmed">dòllaru dî Caraibbi di livanti</displayName>
-				<displayName count="other" draft="unconfirmed">dòllari dî Caraibbi di livanti</displayName>
+				<displayName>Dòllaru dî Caraibbi di livanti</displayName>
+				<displayName count="one">dòllaru dî Caraibbi di livanti</displayName>
+				<displayName count="other">dòllari dî Caraibbi di livanti</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>ciurinu caraìbbicu</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName draft="unconfirmed">Francu CFA di l’Àfrica di punenti</displayName>
-				<displayName count="one" draft="unconfirmed">francu CFA di l’Àfrica di punenti</displayName>
-				<displayName count="other" draft="unconfirmed">franchi CFA di l’Àfrica di punenti</displayName>
+				<displayName>Francu CFA di l’Àfrica di punenti</displayName>
+				<displayName count="one">francu CFA di l’Àfrica di punenti</displayName>
+				<displayName count="other">franchi CFA di l’Àfrica di punenti</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName draft="unconfirmed">Francu CFP</displayName>
-				<displayName count="one" draft="unconfirmed">francu CFP</displayName>
-				<displayName count="other" draft="unconfirmed">franchi CFP</displayName>
+				<displayName>Francu CFP</displayName>
+				<displayName count="one">francu CFP</displayName>
+				<displayName count="other">franchi CFP</displayName>
 			</currency>
 			<currency type="XXX">
-				<displayName draft="unconfirmed">Munita Scanusciuta</displayName>
-				<displayName count="one" draft="unconfirmed">(munita scanusciuta)</displayName>
-				<displayName count="other" draft="unconfirmed">(munita scanusciuta)</displayName>
+				<displayName>Munita Scanusciuta</displayName>
+				<displayName count="one">(munita scanusciuta)</displayName>
+				<displayName count="other">(munita scanusciuta)</displayName>
 			</currency>
 			<currency type="YER">
-				<displayName draft="unconfirmed">Riali dû Yemen</displayName>
-				<displayName count="one" draft="unconfirmed">riali dû Yemen</displayName>
-				<displayName count="other" draft="unconfirmed">riali dû Yemen</displayName>
+				<displayName>Riali dû Yemen</displayName>
+				<displayName count="one">riali dû Yemen</displayName>
+				<displayName count="other">riali dû Yemen</displayName>
 			</currency>
 			<currency type="ZAR">
-				<displayName draft="unconfirmed">Rand di l’Àfrica di Sciroccu</displayName>
-				<displayName count="one" draft="unconfirmed">rand di l’Àfrica di Sciroccu</displayName>
-				<displayName count="other" draft="unconfirmed">rand di l’Àfrica di Sciroccu</displayName>
+				<displayName>Rand di l’Àfrica di Sciroccu</displayName>
+				<displayName count="one">rand di l’Àfrica di Sciroccu</displayName>
+				<displayName count="other">rand di l’Àfrica di Sciroccu</displayName>
 			</currency>
 			<currency type="ZMW">
-				<displayName draft="unconfirmed">Kwacha dâ Zammia</displayName>
-				<displayName count="one" draft="unconfirmed">kwacha dâ Zammia</displayName>
-				<displayName count="other" draft="unconfirmed">kwacha dâ Zammia</displayName>
+				<displayName>Kwacha dâ Zammia</displayName>
+				<displayName count="one">kwacha dâ Zammia</displayName>
+				<displayName count="other">kwacha dâ Zammia</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>oru dû Zimbabwe</displayName>
 			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} jornu</pluralMinimalPairs>
 			<pluralMinimalPairs count="many">{0} di jorna</pluralMinimalPairs>
 			<pluralMinimalPairs count="other">{0} jorna</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">Pigghia a {0}ª a manu dritta.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
-		<unitLength type="long">
-			<coordinateUnit>
-				<displayName draft="unconfirmed">dirizzioni</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0}L</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0}T</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0}P</coordinateUnitPattern>
-			</coordinateUnit>
-		</unitLength>
 		<unitLength type="short">
 			<coordinateUnit>
-				<displayName draft="unconfirmed">dirizzioni</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0}L</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0}T</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0}P</coordinateUnitPattern>
-			</coordinateUnit>
-		</unitLength>
-		<unitLength type="narrow">
-			<coordinateUnit>
-				<displayName draft="unconfirmed">dirizzioni</displayName>
-				<coordinateUnitPattern type="east" draft="unconfirmed">{0}L</coordinateUnitPattern>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0}T</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0}P</coordinateUnitPattern>
+				<displayName>dirizzioni</displayName>
+				<coordinateUnitPattern type="east">{0}L</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}T</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}P</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<durationUnit type="hm">
-			<durationUnitPattern draft="unconfirmed">hh:mm</durationUnitPattern>
+			<durationUnitPattern>hh:mm</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="hms">
-			<durationUnitPattern draft="unconfirmed">hh:mm:ss</durationUnitPattern>
+			<durationUnitPattern>hh:mm:ss</durationUnitPattern>
 		</durationUnit>
 		<durationUnit type="ms">
-			<durationUnitPattern draft="unconfirmed">mm:ss</durationUnitPattern>
+			<durationUnitPattern>mm:ss</durationUnitPattern>
 		</durationUnit>
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="end" draft="unconfirmed">{0} e {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} e {1}</listPatternPart>
+			<listPatternPart type="end">{0} e {1}</listPatternPart>
+			<listPatternPart type="2">{0} e {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="or">
-			<listPatternPart type="end" draft="unconfirmed">{0} o {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} o {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end" draft="unconfirmed">{0} o {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} o {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end" draft="unconfirmed">{0} o {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} o {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-narrow">
-			<listPatternPart type="end" draft="unconfirmed">{0} e {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} e {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="end" draft="unconfirmed">{0} e {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} e {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="end" draft="unconfirmed">{0} e {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} e {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-narrow">
-			<listPatternPart type="end" draft="unconfirmed">{0} e {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} e {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="end" draft="unconfirmed">{0} e {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} e {1}</listPatternPart>
+			<listPatternPart type="end">{0} o {1}</listPatternPart>
+			<listPatternPart type="2">{0} o {1}</listPatternPart>
 		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
-			<yesstr draft="unconfirmed">se:s</yesstr>
+			<yesstr>se:s</yesstr>
 		</messages>
 	</posix>
 </ldml>
diff --git a/make/data/cldr/common/main/sd.xml b/make/data/cldr/common/main/sd.xml
index 19b23be9f41..d3ddcdae45e 100644
--- a/make/data/cldr/common/main/sd.xml
+++ b/make/data/cldr/common/main/sd.xml
@@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">آزربائيجاني</language>
 			<language type="az" alt="short">ازري</language>
 			<language type="ba">ڪينيڊا</language>
+			<language type="bal">بلوچي</language>
 			<language type="ban">بالينيس</language>
 			<language type="bas">باسا</language>
 			<language type="be">بيلاروسي</language>
@@ -222,6 +223,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">بافيا</language>
 			<language type="ksh">ڪلونئين</language>
 			<language type="ku">ڪردي</language>
+			<language type="ku" menu="core">ڪردي</language>
+			<language type="ku" menu="extension">ڪرمانجي</language>
 			<language type="kum">ڪومڪ</language>
 			<language type="kv">ڪومي</language>
 			<language type="kw">ڪورنش</language>
@@ -569,10 +572,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AD">اندورا</territory>
 			<territory type="AE">متحده عرب امارات</territory>
 			<territory type="AF">افغانستان</territory>
-			<territory type="AG">انٽيگا ۽ باربد</territory>
+			<territory type="AG">اينٽيگا ۽ باربوڊا</territory>
 			<territory type="AI">انگويلا</territory>
 			<territory type="AL">البانيا</territory>
-			<territory type="AM">ارمینیا</territory>
+			<territory type="AM">آرمينيا</territory>
 			<territory type="AO">انگولا</territory>
 			<territory type="AQ">انٽارڪٽيڪا</territory>
 			<territory type="AR">ارجنٽينا</territory>
@@ -582,7 +585,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AW">عروبا</territory>
 			<territory type="AX">الند ٻيٽ</territory>
 			<territory type="AZ">آذربائيجان</territory>
-			<territory type="BA">بوسنيا ۽ هرزوگووينا</territory>
+			<territory type="BA">بوسنيا ۽ هرزيگووينا</territory>
 			<territory type="BB">باربڊوس</territory>
 			<territory type="BD">بنگلاديش</territory>
 			<territory type="BE">بيلجيم</territory>
@@ -601,7 +604,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BT">ڀوٽان</territory>
 			<territory type="BV">بووٽ ٻيٽ</territory>
 			<territory type="BW">بوٽسوانا</territory>
-			<territory type="BY">بیلارس</territory>
+			<territory type="BY">بيلاروس</territory>
 			<territory type="BZ">بيليز</territory>
 			<territory type="CA">ڪينيڊا</territory>
 			<territory type="CC">ڪوڪوس ٻيٽ</territory>
@@ -619,6 +622,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">چين</territory>
 			<territory type="CO">ڪولمبيا</territory>
 			<territory type="CP">ڪلپرٽن ٻيٽ</territory>
+			<territory type="CQ">سارڪ</territory>
 			<territory type="CR">ڪوسٽا ريڪا</territory>
 			<territory type="CU">ڪيوبا</territory>
 			<territory type="CV">ڪيپ وردي</territory>
@@ -671,7 +675,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GU">گوام</territory>
 			<territory type="GW">گني بسائو</territory>
 			<territory type="GY">گيانا</territory>
-			<territory type="HK">هانگ ڪانگ SAR</territory>
+			<territory type="HK">هانگ ڪانگ SAR چين</territory>
 			<territory type="HK" alt="short">هانگ ڪانگ</territory>
 			<territory type="HM">هرڊ ۽ مڪڊونلڊ ٻيٽ</territory>
 			<territory type="HN">هنڊورس</territory>
@@ -759,7 +763,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="PH">فلپائن</territory>
 			<territory type="PK">پاڪستان</territory>
 			<territory type="PL">پولينڊ</territory>
-			<territory type="PM">سینٽ پیئر و میڪوئیلون</territory>
+			<territory type="PM">سينٽ پيئر ۽ ميڪيلون</territory>
 			<territory type="PN">پٽڪئرن ٻيٽ</territory>
 			<territory type="PR">پيوئرٽو ريڪو</territory>
 			<territory type="PS">فلسطيني علائقا</territory>
@@ -782,15 +786,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SG">سنگاپور</territory>
 			<territory type="SH">سينٽ ھيلينا</territory>
 			<territory type="SI">سلوینیا</territory>
-			<territory type="SJ">سوالبارڊ ۽ جان ماین</territory>
+			<territory type="SJ">سوالبارڊ ۽ يان ماین</territory>
 			<territory type="SK">سلوواڪيا</territory>
 			<territory type="SL">سيرا ليون</territory>
-			<territory type="SM">سین مرینو</territory>
+			<territory type="SM">سان مرینو</territory>
 			<territory type="SN">سينيگال</territory>
 			<territory type="SO">سوماليا</territory>
 			<territory type="SR">سورينام</territory>
 			<territory type="SS">ڏکڻ سوڊان</territory>
-			<territory type="ST">سائو ٽوم ۽ پرنسپیي</territory>
+			<territory type="ST">سائو ٽومي ۽ پرنسپیي</territory>
 			<territory type="SV">ال سلواڊور</territory>
 			<territory type="SX">سنٽ مارٽن</territory>
 			<territory type="SY">شام</territory>
@@ -810,7 +814,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TN">تيونيسيا</territory>
 			<territory type="TO">ٽونگا</territory>
 			<territory type="TR">ترڪييي</territory>
-			<territory type="TT">ٽريني ڊيڊ ۽ ٽوباگو ٻيٽ</territory>
+			<territory type="TT">ٽرينيڊاڊ ۽ ٽوباگو</territory>
 			<territory type="TV">توالو</territory>
 			<territory type="TW">تائیوان</territory>
 			<territory type="TZ">تنزانيا</territory>
@@ -854,44 +858,85 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">سڪي جو فارميٽ</key>
 			<key type="collation">ترتيب ڇانٽي</key>
 			<key type="currency">سڪو</key>
+			<key type="em">ايموجي پيشڪاري</key>
 			<key type="hc">ڪلاڪ سائيڪل</key>
 			<key type="lb">لائن ٽوڙڻ انداز</key>
+			<key type="lw">لفظن وچ ۾ لڪير ٽوڙ</key>
 			<key type="ms">ماپڻ جو نظام</key>
 			<key type="numbers">انگ</key>
+			<key type="ss">تخفيف کانپوءِ جملو ٽوڙ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ٻڌ ڌرم جو ڪئلينڊر</type>
+			<type key="calendar" type="buddhist" scope="core">ٻوڌي</type>
 			<type key="calendar" type="chinese">چيني ڪئلينڊر</type>
+			<type key="calendar" type="chinese" scope="core">چيني</type>
 			<type key="calendar" type="coptic">ڪاپٽڪ ڪئلينڊر</type>
+			<type key="calendar" type="coptic" scope="core">ڪاپٽڪ</type>
 			<type key="calendar" type="dangi">دانگي ڪئلينڊر</type>
+			<type key="calendar" type="dangi" scope="core">دانگي</type>
 			<type key="calendar" type="ethiopic">ايٿوپيائي ڪئلينڊر</type>
+			<type key="calendar" type="ethiopic" scope="core">ايٿيوپيائي</type>
 			<type key="calendar" type="ethiopic-amete-alem">ايٿوپڪ اميٽي عليم ڪئلينڊر</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ايٿيوپيائي اميٽي اليم</type>
 			<type key="calendar" type="gregorian">جارجيائي ڪئلينڊر</type>
+			<type key="calendar" type="gregorian" scope="core">جارجيائي</type>
 			<type key="calendar" type="hebrew">عبراني ڪئلينڊر</type>
+			<type key="calendar" type="hebrew" scope="core">عبراني</type>
 			<type key="calendar" type="indian">هندوستاني قومي ڪئلينڊر</type>
+			<type key="calendar" type="indian" scope="core">هندستاني قومي</type>
 			<type key="calendar" type="islamic">هجري ڪئلينڊر</type>
+			<type key="calendar" type="islamic" scope="core">هجري</type>
 			<type key="calendar" type="islamic-civil">هجري ڪئلينڊر (ٽيبل وارو، شهري دور)</type>
+			<type key="calendar" type="islamic-civil" scope="core">هجري (ٽيبليائي، شهري دور)</type>
 			<type key="calendar" type="islamic-tbla">هجري ڪئلينڊر (ٽيبلر، فلڪياتي دور)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">هجري (ٽيبليائي، فلڪياتي دور)</type>
 			<type key="calendar" type="islamic-umalqura">هجري ڪئلينڊر (اُم القرا)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">هجري (اُم القری)</type>
 			<type key="calendar" type="iso8601">ISO-8601 ڪئلينڊر</type>
 			<type key="calendar" type="japanese">جاپاني ڪئلينڊر</type>
+			<type key="calendar" type="japanese" scope="core">جاپاني</type>
 			<type key="calendar" type="persian">فارسي ڪئلينڊر</type>
+			<type key="calendar" type="persian" scope="core">فارسي</type>
 			<type key="calendar" type="roc">منگوو ڪئلينڊر</type>
+			<type key="calendar" type="roc" scope="core">منگوو</type>
 			<type key="cf" type="account">اڪائونٽنگ سڪو فارميٽ</type>
+			<type key="cf" type="account" scope="core">اڪائونٽنگ</type>
 			<type key="cf" type="standard">معياري سڪو فارميٽ</type>
+			<type key="cf" type="standard" scope="core">معياري</type>
 			<type key="collation" type="ducet">ڊفالٽ يوني ڪوڊ ترتيب ڇانٽي</type>
+			<type key="collation" type="ducet" scope="core">ڊفالٽ يونيڪوڊ</type>
 			<type key="collation" type="search">عام مقصد جي ڳولا</type>
+			<type key="collation" type="search" scope="core">ڳولا</type>
 			<type key="collation" type="standard">معياري ترتيب ڇانٽي</type>
+			<type key="collation" type="standard" scope="core">معياري</type>
+			<type key="em" type="default" scope="core">ڊفالٽ</type>
+			<type key="em" type="emoji" scope="core">ايموجي</type>
+			<type key="em" type="text" scope="core">متن</type>
 			<type key="hc" type="h11">12 ڪلاڪ جو سسٽم (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 ڪلاڪ جو سسٽم (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 ڪلاڪ جو سسٽم (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 ڪلاڪ جو سسٽم (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">لوز لائن ٽوڙ انداز</type>
+			<type key="lb" type="loose" scope="core">ڍرو</type>
 			<type key="lb" type="normal">عام لائن ٽوڙ انداز</type>
+			<type key="lb" type="normal" scope="core">عام</type>
 			<type key="lb" type="strict">سخت لائن ٽوڙ انداز</type>
+			<type key="lb" type="strict" scope="core">سخت</type>
+			<type key="lw" type="breakall" scope="core">سڀ ٽوڙ</type>
+			<type key="lw" type="keepall" scope="core">سڀ رک</type>
+			<type key="lw" type="normal" scope="core">عام</type>
+			<type key="lw" type="phrase" scope="core">محاورن وچ ۾ رک</type>
 			<type key="ms" type="metric">ميٽرڪ نظام</type>
+			<type key="ms" type="metric" scope="core">ميٽرڪ</type>
 			<type key="ms" type="uksystem">امپيريل ماپڻ جو نظام</type>
+			<type key="ms" type="uksystem" scope="core">برطانيا</type>
 			<type key="ms" type="ussystem">آمريڪا جو ماپڻ جو نظام</type>
+			<type key="ms" type="ussystem" scope="core">آمريڪا</type>
 			<type key="numbers" type="arab">عربي-هندي عدد</type>
 			<type key="numbers" type="arabext">وڌايل عربي-هندي عدد</type>
 			<type key="numbers" type="armn">ارمينيائي انگ</type>
@@ -932,6 +977,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">ٿائي عدد</type>
 			<type key="numbers" type="tibt">تبتي عدد</type>
 			<type key="numbers" type="vaii">وائي انگ اکر</type>
+			<type key="ss" type="none" scope="core">بند</type>
+			<type key="ss" type="standard" scope="core">چالو</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ميٽرڪ</measurementSystemName>
@@ -953,7 +1000,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[ء آ ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ ف ڦ ق ک ڪ گ {گھ} ڱ ڳ ل م ن ڻ ه ھ و ي]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[َ ُ ِ ئ]</exemplarCharacters>
 		<exemplarCharacters type="index">[ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ ف ڦ ق ک ڪ گ {گھ} ڱ ڳ ل م ن ڻ ه ھ و ي]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[⹁ ⁏ \: ! ۔ ‘ ( ) \[ \] \{ \} /]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ ، ؛ \: ! ؟ … ‘’ &quot;” ( ) \[ \] ٭ /]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@@ -1011,6 +1058,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</months>
 				<days>
 					<dayContext type="format">
+						<dayWidth type="narrow">
+							<day type="sun">آچر</day>
+							<day type="mon">سو</day>
+							<day type="tue">اڱ</day>
+							<day type="wed">اربع</day>
+							<day type="thu">خم</day>
+							<day type="fri">جم</day>
+							<day type="sat">ڇن</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">آچر</day>
 							<day type="mon">سومر</day>
@@ -1025,21 +1081,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dayWidth type="narrow">
 							<day type="sun">آچر</day>
 							<day type="mon">سو</day>
-							<day type="tue">اڱارو</day>
+							<day type="tue">اڱ</day>
 							<day type="wed">اربع</day>
 							<day type="thu">خم</day>
-							<day type="fri">جمعو</day>
-							<day type="sat">ڇنڇر</day>
+							<day type="fri">جم</day>
+							<day type="sat">ڇن</day>
 						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q5</quarter>
+							<quarter type="1">پهرين ٽماهي</quarter>
+							<quarter type="2">ٻين ٽماهي</quarter>
+							<quarter type="3">ٽين ٽماهي</quarter>
+							<quarter type="4">چوٿين ٽماهي</quarter>
 						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">پهرين ٽي ماهي</quarter>
@@ -1050,22 +1106,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</quarterContext>
 					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
+							<quarter type="1">پهرين ٽماهي</quarter>
+							<quarter type="2">ٻين ٽماهي</quarter>
+							<quarter type="3">ٽين ٽماهي</quarter>
+							<quarter type="4">چوٿين ٽماهي</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">صبح، منجهند</dayPeriod>
-							<dayPeriod type="pm">شام، منجهند</dayPeriod>
+							<dayPeriod type="am">صبح</dayPeriod>
+							<dayPeriod type="pm">شام</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">صبح، منجهند</dayPeriod>
-							<dayPeriod type="pm">منجهند، شام</dayPeriod>
+							<dayPeriod type="am">صبح</dayPeriod>
+							<dayPeriod type="pm">شام</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">صبح، منجهند</dayPeriod>
@@ -1074,8 +1130,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">صبح، منجهند</dayPeriod>
-							<dayPeriod type="pm">منجهند، شام</dayPeriod>
+							<dayPeriod type="am">صبح</dayPeriod>
+							<dayPeriod type="pm">شام</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">صبح</dayPeriod>
+							<dayPeriod type="pm">شام</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="am">صبح، منجهند</dayPeriod>
@@ -1091,10 +1151,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="1" alt="variant">عام دور</era>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="0" alt="variant">BCE</era>
-						<era type="1">CD</era>
-						<era type="1" alt="variant">CE</era>
+						<era type="0">ق م</era>
+						<era type="1">ع</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
@@ -1167,7 +1225,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">ھفتو W جو MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">ھفتو W جو MMMM</dateFormatItem>
 						<dateFormatItem id="yw" count="one">ھفتو w جو Y</dateFormatItem>
@@ -1293,7 +1354,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">پويون سال</relative>
 				<relative type="1">پويون سال</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سالن ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سال ۾</relativeTimePattern>
 					<relativeTimePattern count="other">{0} سالن ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
@@ -1305,11 +1366,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">پوئين سال</relative>
 				<relative type="0">هن سال</relative>
 				<relative type="1">اڳين سال</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} سال ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سالن ۾</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="year-narrow">
 				<relative type="-1">پوئين سال</relative>
 				<relative type="0">هن سال</relative>
 				<relative type="1">اڳيئن سال</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}سال ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0}سالن ۾</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0}سال پهرين</relativeTimePattern>
+					<relativeTimePattern count="other">{0}سال پهرين</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="quarter">
 				<displayName>ٽي ماهي</displayName>
@@ -1317,21 +1390,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">هن ٽي ماهي</relative>
 				<relative type="1">اڳين ٽي ماهي</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} ٽي ماهي ۾</relativeTimePattern>
-					<relativeTimePattern count="other">{0} ٽي ماهي ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ٽماهي ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ٽماهين ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ٽي ماهي پهرين</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ٽي ماهي پهرين</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} ٽماهي ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ٽماهين ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="month">
 				<displayName>مهينو</displayName>
 				<relative type="-1">پوئين مهيني</relative>
 				<relative type="0">هن مهيني</relative>
 				<relative type="1">اڳين مهيني</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} مهينن ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} مهيني ۾</relativeTimePattern>
 					<relativeTimePattern count="other">{0} مهينن ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
@@ -1345,14 +1424,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">هن هفتي</relative>
 				<relative type="1">اڳين هفتي</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} هفتن ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} هفتي ۾</relativeTimePattern>
 					<relativeTimePattern count="other">{0} هفتن ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} هفتا پهرين</relativeTimePattern>
+					<relativeTimePattern count="one">{0} هفتو پهرين</relativeTimePattern>
 					<relativeTimePattern count="other">{0} هفتا پهرين</relativeTimePattern>
 				</relativeTime>
-				<relativePeriod>{0} جي هفتي</relativePeriod>
+				<relativePeriod>{0} واري هفتي</relativePeriod>
+			</field>
+			<field type="week-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} هفتي ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} هفتن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0}هفتي ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0}هفتن ۾</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>مهيني جي هفتي</displayName>
@@ -1393,12 +1484,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} آچر پهرين</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="sun-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} آچر ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} آچرن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} آچر ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} آچرن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="mon">
 				<relative type="-1">پوئين سومر</relative>
 				<relative type="0">هن سومر</relative>
 				<relative type="1">اڳين سومر</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سومرن ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سومر ۾</relativeTimePattern>
 					<relativeTimePattern count="other">{0} سومرن ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
@@ -1406,6 +1509,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} سومر پهرين</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="mon-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} سومر ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سومرن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="tue">
 				<relative type="-1">پوئين اڱاري</relative>
 				<relative type="0">هن اڱاري</relative>
@@ -1419,17 +1528,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} اڱارا پهرين</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="tue-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} اڱاري ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اڱارن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="wed">
 				<relative type="-1">پوئين اربع</relative>
 				<relative type="0">هن اربع</relative>
 				<relative type="1">اڳين اربع</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} اربعن ۾</relativeTimePattern>
-					<relativeTimePattern count="other">{0} اربعن ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} اربع ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اربعائن ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} اربعا پهرين</relativeTimePattern>
-					<relativeTimePattern count="other">{0} اربعا پهرين</relativeTimePattern>
+					<relativeTimePattern count="one">{0} اربع پهرين</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اربعائون پهرين</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} اربع ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اربعائن ۾</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="one">{0} اربع پهرين</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اربعائون پهرين</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} اربع ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} اربعائن ۾</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="thu">
@@ -1445,6 +1576,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} خميس پهرين</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="thu-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} خميس ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} خميسن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="fri">
 				<relative type="-1">پوئين جمعي</relative>
 				<relative type="0">هن جمعي</relative>
@@ -1507,11 +1644,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} منٽن ۾</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="minute-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} منٽ ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} منٽن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="second">
 				<displayName>سيڪنڊ</displayName>
 				<relative type="0">هاڻي</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} سيڪنڊن ۾</relativeTimePattern>
+					<relativeTimePattern count="one">{0} سيڪنڊ ۾</relativeTimePattern>
 					<relativeTimePattern count="other">{0} سيڪنڊن ۾</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
@@ -1519,11 +1662,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} سيڪنڊ پهرين</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="second-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} سيڪنڊ ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سيڪنڊن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} سيڪنڊ ۾</relativeTimePattern>
+					<relativeTimePattern count="other">{0} سيڪنڊن ۾</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="zone">
 				<displayName>ٽائيم زون</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
+			<gmtUnknownFormat>GMT+؟</gmtUnknownFormat>
 			<regionFormat>{0} وقت</regionFormat>
 			<regionFormat type="daylight">{0} ڏينهن جو وقت</regionFormat>
 			<regionFormat type="standard">{0} معياري وقت</regionFormat>
@@ -1635,7 +1791,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>پاگو پاگو</exemplarCity>
 			</zone>
 			<zone type="Europe/Vienna">
-				<exemplarCity>وينا</exemplarCity>
+				<exemplarCity>ويئينا</exemplarCity>
 			</zone>
 			<zone type="Australia/Perth">
 				<exemplarCity>پرٿ</exemplarCity>
@@ -1883,6 +2039,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>ايسٽر</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ڪوئيئيڪي</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>پنٽا اريناس</exemplarCity>
 			</zone>
@@ -2148,10 +2307,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>فنام پينه</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>اينڊربري</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>ڪانٽن</exemplarCity>
+				<exemplarCity>ڪانٽن ٻيٽ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>ڪريٽمٽي</exemplarCity>
@@ -2820,9 +2976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>اولهه آفريقا جو وقت</generic>
-					<standard>اولهه آفريقا جو معياري وقت</standard>
-					<daylight>اولهه آفريقا جي اونهاري جو وقت</daylight>
+					<standard>اولهه آفريقا جو وقت</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3172,6 +3326,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>گيانائي وقت</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>هوائي اليوٽين جو معياري وقت</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>هوائي اليوٽين جو وقت</generic>
@@ -3745,63 +3904,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤0هزار</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0هزار</pattern>
-					<pattern type="1000" count="other">¤0هزار</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0هزار</pattern>
-					<pattern type="10000" count="one">¤00هزار</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00هزار</pattern>
-					<pattern type="10000" count="other">¤00هزار</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00هزار</pattern>
-					<pattern type="100000" count="one">¤000لک</pattern>
-					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000لک</pattern>
-					<pattern type="100000" count="other">¤000لک</pattern>
-					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000لک</pattern>
-					<pattern type="1000000" count="one">¤00لک</pattern>
-					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 00لک</pattern>
-					<pattern type="1000000" count="other">¤00لک</pattern>
-					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00لک</pattern>
-					<pattern type="10000000" count="one">¤0ڪروڙ</pattern>
-					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 0ڪروڙ</pattern>
-					<pattern type="10000000" count="other">¤0ڪروڙ</pattern>
-					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0ڪروڙ</pattern>
-					<pattern type="100000000" count="one">¤00ڪروڙ</pattern>
-					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 00ڪروڙ</pattern>
-					<pattern type="100000000" count="other">¤00ڪروڙ</pattern>
-					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 00ڪروڙ</pattern>
-					<pattern type="1000000000" count="one">¤0ارب</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0ارب</pattern>
-					<pattern type="1000000000" count="other">¤0ارب</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0ارب</pattern>
-					<pattern type="10000000000" count="one">¤00ارب</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00ارب</pattern>
-					<pattern type="10000000000" count="other">¤00ارب</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00ارب</pattern>
-					<pattern type="100000000000" count="one">¤0کرب</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 0کرب</pattern>
-					<pattern type="100000000000" count="other">¤0کرب</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0کرب</pattern>
-					<pattern type="1000000000000" count="one">¤0ٽرلين</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0ٽرلين</pattern>
-					<pattern type="1000000000000" count="other">¤0ٽرلين</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0ٽرلين</pattern>
-					<pattern type="10000000000000" count="one">¤00ٽرلين</pattern>
-					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00ٽرلين</pattern>
-					<pattern type="10000000000000" count="other">¤00ٽرلين</pattern>
-					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00ٽرلين</pattern>
-					<pattern type="100000000000000" count="one">¤000ٽرلين</pattern>
-					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000ٽرلين</pattern>
-					<pattern type="100000000000000" count="other">¤000ٽرلين</pattern>
-					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000ٽرلين</pattern>
+					<pattern type="1000" count="one">¤ 0 هزار</pattern>
+					<pattern type="1000" count="other">¤ 0 هزار</pattern>
+					<pattern type="10000" count="one">¤ 00 هزار</pattern>
+					<pattern type="10000" count="other">¤ 00 هزار</pattern>
+					<pattern type="100000" count="one">¤ 000 هزار</pattern>
+					<pattern type="100000" count="other">¤ 000 هزار</pattern>
+					<pattern type="1000000" count="one">¤ 0 ملين</pattern>
+					<pattern type="1000000" count="other">¤ 0 ملين</pattern>
+					<pattern type="10000000" count="one">¤ 00 ملين</pattern>
+					<pattern type="10000000" count="other">¤ 00 ملين</pattern>
+					<pattern type="100000000" count="one">¤ 000 ملين</pattern>
+					<pattern type="100000000" count="other">¤ 000 ملين</pattern>
+					<pattern type="1000000000" count="one">¤ 0 بلين</pattern>
+					<pattern type="1000000000" count="other">¤ 0 بلين</pattern>
+					<pattern type="10000000000" count="one">¤ 00 بلين</pattern>
+					<pattern type="10000000000" count="other">¤ 00 بلين</pattern>
+					<pattern type="100000000000" count="one">¤ 000 بلين</pattern>
+					<pattern type="100000000000" count="other">¤ 000 بلين</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 ٽرلين</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 ٽرلين</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 ٽرلين</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 ٽرلين</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 ٽرلين</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 ٽرلين</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4203,8 +4353,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SLL">
 				<displayName>سیرا لیونيائي لیون (1964—2022)</displayName>
-				<displayName count="one">سیرا لیونيائي لیون (1964—2022)</displayName>
-				<displayName count="other">سیرا لیونيائي لیون (1964—2022)</displayName>
 			</currency>
 			<currency type="SOS">
 				<displayName>سومالي شلنگ</displayName>
@@ -4222,9 +4370,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>سائو ٽوم ۽ پرنسپي دوبرا</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName>سيريائي پائونڊ</displayName>
+				<displayName>شامي پائونڊ</displayName>
 				<displayName count="one">شامي پائونڊ</displayName>
-				<displayName count="other">سيريائي پائونڊ</displayName>
+				<displayName count="other">شامي پائونڊ</displayName>
 			</currency>
 			<currency type="SZL">
 				<displayName>سوازي للانگيني</displayName>
@@ -4296,6 +4444,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>اوڀر ڪيريبين ڊالر</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ڪريبيئن گلڊر</displayName>
+				<displayName count="one">ڪريبيئن گلڊر</displayName>
+				<displayName count="other">ڪريبيئن گلڊر</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>اولهه آفريڪا فرينڪ</displayName>
 			</currency>
@@ -4314,6 +4467,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZMW">
 				<displayName>زمبائي ڪواچا</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>زمبابوي سون</displayName>
+				<displayName count="one">زمبابوي سون</displayName>
+				<displayName count="other">زمبابوي سون</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} ڪتاب</pluralMinimalPairs>
@@ -4453,7 +4611,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} مليگرام في ڊيسيليٽر</unitPattern>
 				<unitPattern count="other">{0} ملي گرامز في ڊيسي ليٽر</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>حصا</displayName>
+				<unitPattern count="one">{0} حصو</unitPattern>
+				<unitPattern count="other">{0} حصا</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>حصا في ملين</displayName>
 				<unitPattern count="one">{0} حصو في ملين</unitPattern>
 				<unitPattern count="other">{0} حصا في ملين</unitPattern>
@@ -4467,6 +4630,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مولز</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>گلوڪوز جو</displayName>
+				<unitPattern count="one">گلوڪوز جو {0}</unitPattern>
+				<unitPattern count="other">گلوڪوز جو {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0} ليٽرز في ڪلو ميٽر</unitPattern>
 				<unitPattern count="other">{0} ليٽرز في ڪلو ميٽر</unitPattern>
@@ -4542,18 +4710,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-quarter">
 				<displayName>ٽه ماهيون</displayName>
-				<unitPattern count="one">{0} ٽه ماهيون</unitPattern>
-				<unitPattern count="other">{0} ٽه ماهيون</unitPattern>
-				<perUnitPattern>{0}/ٽه ماهي</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
-				<unitPattern count="one">{0} مهينو</unitPattern>
-				<unitPattern count="other">{0} مهينا</unitPattern>
 				<perUnitPattern>{0} في مهينو</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<unitPattern count="one">{0} هفتو</unitPattern>
-				<unitPattern count="other">{0} هفتا</unitPattern>
 				<perUnitPattern>{0} في هفتو</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
@@ -4752,6 +4913,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">مرڪري جو {0} ملي ميٽر</unitPattern>
 				<unitPattern count="other">مرڪري جو {0} ملي ميٽر</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>مرڪيوري جو</displayName>
+				<unitPattern count="one">مرڪيوري جو {0}</unitPattern>
+				<unitPattern count="other">مرڪيوري جو {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>پائونڊز في اسڪوائر انچ</displayName>
 				<unitPattern count="one">{0} پائونڊ في اسڪوائر انچ</unitPattern>
@@ -4840,20 +5006,77 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} بيريلز</unitPattern>
 				<unitPattern count="other">{0} بيريلز</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>نوري</displayName>
-				<unitPattern count="one">{0} نوري</unitPattern>
-				<unitPattern count="other">{0} نوري</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>اسٽيراڊيئن</displayName>
+				<unitPattern count="one">{0} اسٽيراڊيئن</unitPattern>
+				<unitPattern count="other">{0} اسٽيراڊيئن</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>ڪيٽال</displayName>
+				<unitPattern count="one">{0} ڪيٽال</unitPattern>
+				<unitPattern count="other">{0} ڪيٽال</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ڪولمبس</displayName>
+				<unitPattern count="one">{0} ڪولمب</unitPattern>
+				<unitPattern count="other">{0} ڪولمبس</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>فيراڊ</displayName>
+				<unitPattern count="one">{0} فيراڊ</unitPattern>
+				<unitPattern count="other">{0} فيراڊ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>هينري</displayName>
+				<unitPattern count="one">{0} هينري</unitPattern>
+				<unitPattern count="other">{0} هينري</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>سيمنز</displayName>
+				<unitPattern count="one">{0} سيمنز</unitPattern>
+				<unitPattern count="other">{0} سيمنز</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ڪيلوريز [IT]</displayName>
+				<unitPattern count="one">{0} ڪيلوريز [IT]</unitPattern>
+				<unitPattern count="other">{0} ڪيلوريز [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>بيڪرل</displayName>
+				<unitPattern count="one">{0} بيڪرل</unitPattern>
+				<unitPattern count="other">{0} بيڪرل</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>سيورٽس</displayName>
+				<unitPattern count="one">{0} سيورٽ</unitPattern>
+				<unitPattern count="other">{0} سيورٽ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>گري</displayName>
+				<unitPattern count="one">{0} گري</unitPattern>
+				<unitPattern count="other">{0} گري</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ڪلوگرام فورس</displayName>
+				<unitPattern count="one">{0} ڪلوگرام فورس</unitPattern>
+				<unitPattern count="other">{0} ڪلوگرام فورس</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ٽيسلا</displayName>
+				<unitPattern count="one">{0} ٽيسلا</unitPattern>
+				<unitPattern count="other">{0} ٽيسلا</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ويبر</displayName>
+				<unitPattern count="one">{0} ويبر</unitPattern>
+				<unitPattern count="other">{0} ويبر</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>حصا في ارب</displayName>
 				<unitPattern count="one">{0} حصو في ارب</unitPattern>
 				<unitPattern count="other">{0} حصا في ارب</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>راتيون</displayName>
-				<unitPattern count="one">{0} رات</unitPattern>
-				<unitPattern count="other">{0} راتيون</unitPattern>
 				<perUnitPattern>{0} في رات</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -4967,12 +5190,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} آئٽم</unitPattern>
 				<unitPattern count="other">{0} آئٽم</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>حصو</displayName>
+				<unitPattern count="one">{0} حصو</unitPattern>
+				<unitPattern count="other">{0} حصو</unitPattern>
+			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>پيرمائيرڊ</displayName>
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>مول</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ليٽرز في ڪلو ميٽر</displayName>
 			</unit>
@@ -5371,6 +5604,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mm Hg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>Hg جو</displayName>
+				<unitPattern count="one">Hg جو {0}</unitPattern>
+				<unitPattern count="other">Hg جو {0}</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<displayName>بار</displayName>
 				<unitPattern count="one">{0} بار</unitPattern>
@@ -5524,12 +5762,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-barrel">
 				<displayName>بيريل</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>نوري</displayName>
 				<unitPattern count="one">{0} نوري</unitPattern>
 				<unitPattern count="other">{0} نوري</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>حصا/ارب</displayName>
 				<unitPattern count="one">{0} ح ف ا</unitPattern>
 				<unitPattern count="other">{0} ح ف ا</unitPattern>
@@ -5569,7 +5852,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}m²</unitPattern>
 			</unit>
 			<unit type="duration-century">
-				<displayName>ص</displayName>
 				<unitPattern count="one">{0}ص</unitPattern>
 				<unitPattern count="other">{0}ص</unitPattern>
 			</unit>
@@ -5580,29 +5862,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-year">
 				<unitPattern count="one">{0}س</unitPattern>
 				<unitPattern count="other">{0}س</unitPattern>
-				<perUnitPattern>{0}/س</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<unitPattern count="one">{0}ٽه ماهي</unitPattern>
 				<unitPattern count="other">{0}ٽه ماهي</unitPattern>
-				<perUnitPattern>{0}/ٽه ماهي</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>مهينو</displayName>
 				<unitPattern count="one">{0}مهينو</unitPattern>
 				<unitPattern count="other">{0}مهينا</unitPattern>
-				<perUnitPattern>{0}/مهينو</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<displayName>هفتو</displayName>
 				<unitPattern count="one">{0}هفتو</unitPattern>
 				<unitPattern count="other">{0}هفتا</unitPattern>
-				<perUnitPattern>{0}/هفتو</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
 				<unitPattern count="one">{0}ڏينهن</unitPattern>
 				<unitPattern count="other">{0}ڏينهن</unitPattern>
-				<perUnitPattern>{0}/ڏينهن</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<unitPattern count="one">{0}سيڪنڊ</unitPattern>
@@ -5698,21 +5975,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} km/h</unitPattern>
 				<unitPattern count="other">{0} km/h</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>نوري</displayName>
 				<unitPattern count="one">{0}نوري</unitPattern>
 				<unitPattern count="other">{0}نوري</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ح ف ا</displayName>
 				<unitPattern count="one">{0}ح ف ا</unitPattern>
 				<unitPattern count="other">{0}ح ف ا</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>راتيون</displayName>
 				<unitPattern count="one">{0}رات</unitPattern>
 				<unitPattern count="other">{0}راتيون</unitPattern>
-				<perUnitPattern>{0}/رات</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -5728,15 +6005,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="2">{0} يا {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="standard-narrow">
-			<listPatternPart type="middle">{0}، {1}</listPatternPart>
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}، {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="middle">{0}، {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="unit-short">
-			<listPatternPart type="middle">{0}، {1}</listPatternPart>
 			<listPatternPart type="end">{0}, {1}</listPatternPart>
 			<listPatternPart type="2">{0}، {1}</listPatternPart>
 		</listPattern>
diff --git a/make/data/cldr/common/main/sd_Deva.xml b/make/data/cldr/common/main/sd_Deva.xml
index 9b331766891..280a8c48036 100644
--- a/make/data/cldr/common/main/sd_Deva.xml
+++ b/make/data/cldr/common/main/sd_Deva.xml
@@ -247,11 +247,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="sun">आर्त</day>
 							<day type="mon">सू</day>
 							<day type="tue">मंग</day>
-							<day type="wed">बु॒ध</day>
+							<day type="wed">ॿुध</day>
 							<day type="thu">विस</day>
 							<day type="fri">जुम</day>
 							<day type="sat">छंछ</day>
 						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">आ</day>
+							<day type="mon">सू</day>
+							<day type="tue">मं</day>
+							<day type="wed">ॿु</day>
+							<day type="thu">वि</day>
+							<day type="fri">जु</day>
+							<day type="sat">छं</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">आर्तवार</day>
 							<day type="mon">सूमर</day>
@@ -434,15 +443,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="year">
 				<displayName>साल</displayName>
+				<relative type="-1">पोएं साल</relative>
+				<relative type="0">हिन साल</relative>
+				<relative type="1">ईंदड़ साल</relative>
 			</field>
 			<field type="quarter">
 				<displayName>टिमाही</displayName>
 			</field>
 			<field type="month">
 				<displayName>महिनो</displayName>
+				<relative type="-1">पोएं महिने</relative>
+				<relative type="0">हिन महिने</relative>
+				<relative type="1">ईंदड़ महिने</relative>
 			</field>
 			<field type="week">
 				<displayName>हफ्तो</displayName>
+				<relative type="-1">पोएं हफ़्ते</relative>
+				<relative type="0">हिन हफ़्ते</relative>
+				<relative type="1">ईंदड़ हफ़्ते</relative>
 			</field>
 			<field type="day">
 				<displayName>दीं॒हुं</displayName>
@@ -453,6 +471,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekday">
 				<displayName>हफ्ते जो दीं॒हुं</displayName>
 			</field>
+			<field type="sun">
+				<relative type="-1">पोएं आर्तवार</relative>
+				<relative type="0">हिन आर्तवार</relative>
+				<relative type="1">ईंदड़ आर्तवार</relative>
+			</field>
 			<field type="dayperiod">
 				<displayName>दीं॒हुं/ रातु</displayName>
 			</field>
@@ -518,6 +541,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>अटलांटिक दीं॒ह जो वक्त</daylight>
 				</long>
 			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>वक़्तु</generic>
+					<standard>एज़ोर्स मइयारी वक़्तु</standard>
+					<daylight>एज़ोर्स ऊनहारे जो वक़्तु</daylight>
+				</long>
+			</metazone>
 			<metazone type="Europe_Central">
 				<long>
 					<generic>मरकज़ी यूरोपी वक्त</generic>
diff --git a/make/data/cldr/common/main/se.xml b/make/data/cldr/common/main/se.xml
index bdc806c27e5..cfeb48cffa3 100644
--- a/make/data/cldr/common/main/se.xml
+++ b/make/data/cldr/common/main/se.xml
@@ -934,6 +934,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/se_FI.xml b/make/data/cldr/common/main/se_FI.xml
index aae2f5a8890..778b687cae4 100644
--- a/make/data/cldr/common/main/se_FI.xml
+++ b/make/data/cldr/common/main/se_FI.xml
@@ -1190,9 +1190,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Oarje-Afrihká áigi</generic>
-					<standard>Oarje-Afrihká dálveáigi</standard>
-					<daylight>Oarje-Afrihká geasseáigi</daylight>
+					<standard>Oarje-Afrihká áigi</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1542,6 +1540,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyana áigi</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-aleuhtalaš dálveáigi</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-aleuhtalaš áigi</generic>
diff --git a/make/data/cldr/common/main/sg.xml b/make/data/cldr/common/main/sg.xml
index 629d51fe367..e4d68482ec4 100644
--- a/make/data/cldr/common/main/sg.xml
+++ b/make/data/cldr/common/main/sg.xml
@@ -577,6 +577,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;¤-#,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/sgs.xml b/make/data/cldr/common/main/sgs.xml
new file mode 100644
index 00000000000..b19983727eb
--- /dev/null
+++ b/make/data/cldr/common/main/sgs.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="sgs"/>
+	</identity>
+	<localeDisplayNames>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">Kalba: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">Skripts: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">Regijuons: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a ā b c č d e ē ė {ė̄} f g h i ī j k l m n o ō p r s š t u ū v z ž]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[{ch} {dz} {dž}]</exemplarCharacters>
+		<exemplarCharacters type="index">[A Ā B C Č D E Ē Ė {Ė̄} F G H I Ī J K L M N O Ō P R S Š T U Ū V Z Ž]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[, % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … “„ ( ) \[ \] \{ \}]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart>„</quotationStart>
+		<quotationEnd>“</quotationEnd>
+		<alternateQuotationStart>„</alternateQuotationStart>
+		<alternateQuotationEnd>“</alternateQuotationEnd>
+	</delimiters>
+	<posix>
+		<messages>
+			<yesstr>tēp:t</yesstr>
+			<nostr>nē:n</nostr>
+		</messages>
+	</posix>
+</ldml>
diff --git a/make/data/cldr/common/main/sgs_LT.xml b/make/data/cldr/common/main/sgs_LT.xml
new file mode 100644
index 00000000000..c01f0c14bdb
--- /dev/null
+++ b/make/data/cldr/common/main/sgs_LT.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="sgs"/>
+		<territory type="LT"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/shn.xml b/make/data/cldr/common/main/shn.xml
index 75b20be6149..324f3b29bb7 100644
--- a/make/data/cldr/common/main/shn.xml
+++ b/make/data/cldr/common/main/shn.xml
@@ -11,22 +11,11108 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<language type="shn"/>
 	</identity>
 	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localeSeparator>{0}၊ {1}</localeSeparator>
+		</localeDisplayPattern>
 		<languages>
-			<language type="shn" draft="contributed">တႆး</language>
+			<language type="aa">ဢႃးၾႃႇ</language>
+			<language type="ab">ဢပ်ႇၶႃးၸီႇယႅၼ်ႇ</language>
+			<language type="af">ဢၾရိၵၢၼ်း</language>
+			<language type="agq">ဢၵ်ႉႁဵမ်</language>
+			<language type="ak">ဢႃးၵၼ်ႇ</language>
+			<language type="am">ဢမ်ႇႁႄးရိၵ်ႉ</language>
+			<language type="an">ဢရၵၼိတ်ႉ</language>
+			<language type="ann">ဢူဝ်ႇပူဝ်ႇလူဝ်ႇ</language>
+			<language type="apc">လႄႇဝၼ်ႇတိၼ်း ဢႃႇရၢပ်ႉ</language>
+			<language type="ar">ဢႃႇရၢပ်ႈ</language>
+			<language type="ar_001">လၵ်းၸဵင် ဢႃႇရၢပ်ႈ ပၢၼ်မႂ်ႇ</language>
+			<language type="arn">မပူးၶျီႇ</language>
+			<language type="as">ဢႃႇသမ်ႇ</language>
+			<language type="asa">ဢသူး</language>
+			<language type="ast">ဢတိူဝ်ႇရီႇယႅၼ်ႇ</language>
+			<language type="az">ဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</language>
+			<language type="ba">ပၢတ်ႇသျ်ၵေးသ်</language>
+			<language type="bal">ပလူးၶျီႇ</language>
+			<language type="bas">ပႃးသႃႇ</language>
+			<language type="be">ပႄႇလႃႇရုတ်ႈ</language>
+			<language type="bem">ပႅမ်ႇပႃႇ</language>
+			<language type="bew">ပႅတ်ႉထဝီႇ</language>
+			<language type="bez">ပႅၼ်းၼႃႈ</language>
+			<language type="bg">ပူႇၵႃႇရီႇယႃႇ</language>
+			<language type="bgc">ႁႃႇယၼ်ႇဝီႇ</language>
+			<language type="bgn">ပလူးၶျီႇ ပွတ်းတူၵ်း</language>
+			<language type="bho">ပူဝ်ႉၵျ်ပူႇရီႇ</language>
+			<language type="blo">ဢႃးၼီႈ</language>
+			<language type="blt">တႆးလမ်</language>
+			<language type="bm">ပႅမ်ပႃရႃႇ</language>
+			<language type="bn">ပင်းၵလႃႇ</language>
+			<language type="bo">ထိပႅတ်ႉ</language>
+			<language type="bqi">ပၵ်းထီႇဢႃးရီႇ</language>
+			<language type="br">ပရႅတ်ႉတၼ်ႇ</language>
+			<language type="brx">ပူဝ်တူဝ်</language>
+			<language type="bs">ပေႃးသၼီးယႃး</language>
+			<language type="bss">ဢၵ်ႉၶူးသ်</language>
+			<language type="bua">ပိူဝ်းယႅတ်ႇ</language>
+			<language type="byn">ပလိၼ်ႇ</language>
+			<language type="ca">ၶႅတ်ႇတလၼ်ႇ</language>
+			<language type="cad">ၶႅတ်ႇတူဝ်း</language>
+			<language type="cch">ဢႅတ်ႉသမ်ႇ</language>
+			<language type="ccp">ၶျၵ်ႉမႃး</language>
+			<language type="ce">ၶျႅတ်ႉၶျႅၼ်ႇ</language>
+			<language type="ceb">သိုပ်ႇပႂႃးၼူဝ်ႇ</language>
+			<language type="cgg">ၶျီၵႃႇ</language>
+			<language type="cho">ၶျွၵ်ႉတေႃႇ</language>
+			<language type="chr">ၶျေရၵီႇ</language>
+			<language type="cic">ၶျိၵ်ႉၵသေႃး</language>
+			<language type="ckb">ၶိူဝ်းတိတ်ႉသျ် ပွတ်းၵၢင်</language>
+			<language type="ckb" alt="variant">ၶိူဝ်းတိတ်ႉသျ်၊ သူဝ်ႇရၼ်းၼီႇ</language>
+			<language type="co">ၵေႃသီၵၼ်ႇ</language>
+			<language type="cop">ၶွပ်းထိၵ်ႇ</language>
+			<language type="cs">ၶျႅၵ်ႈ</language>
+			<language type="csw">သွမ်ႇပီႇၶရိ</language>
+			<language type="cu">ၶျၢတ်ႉသလႃးဝိၵ်ႉ</language>
+			<language type="cv">ၶျူးဝၢတ်ႇ</language>
+			<language type="cy">ဝႄးလ်သျ်</language>
+			<language type="da">တေးၼိတ်ႉသျ်</language>
+			<language type="dav">တၢႆးတႃႇ</language>
+			<language type="de">ၵျႃႇမၼ်ႇ</language>
+			<language type="de_AT">ၵျႃႇမၼ်ႇ (ဢေႃးသထရီးယႃး)</language>
+			<language type="de_CH">ၵျႃႇမၼ်ႇ (သဝိတ်ႈၸႃႇလႅၼ်ႇ)</language>
+			<language type="dje">ၸႃမႃႇ</language>
+			<language type="doi">တွၵ်ႉၵရိပ်ႉ</language>
+			<language type="dsb">လူဝ်းဝႃးသေႃႇပီႇယႅၼ်ႇ</language>
+			<language type="dua">တူးဝႃးလႃႇ</language>
+			<language type="dv">တီႇဝႄးႁီႇ</language>
+			<language type="dyo">ၵျူဝ်လႃ-ၾူင်းၼီႇ</language>
+			<language type="dz">ၸွင်းၵႃႇ</language>
+			<language type="ebu">ဢႅမ်းပူး</language>
+			<language type="ee">ယူး</language>
+			<language type="el">ၵရိတ်ႈ</language>
+			<language type="en">ဢိင်းၵလဵတ်ႈ</language>
+			<language type="en_AU">ဢိင်းၵလဵတ်ႈ (ဢေႃႉသထရေးလီးယႃး)</language>
+			<language type="en_CA">ဢိင်းၵလဵတ်ႈ (ၶႅၼ်ႇၼေႇတႃႇ)</language>
+			<language type="en_GB">ဢိင်းၵလဵတ်ႈ (မိူင်းႁူမ်ႈတုမ်ႁေႃၶမ်း ပရိတ်ႈတဵၼ်ႇ)</language>
+			<language type="en_GB" alt="short">ဢိင်းၵလဵတ်ႈ (ယူႇၶေႇ)</language>
+			<language type="en_US">ဢိင်းၵလဵတ်ႈ (မိူင်းႁူမ်ႈတုမ် ဢမႄႇရိၵ)</language>
+			<language type="en_US" alt="short">ဢိင်းၵလဵတ်ႈ (ယူႇဢႅတ်ႉသ်)</language>
+			<language type="eo">ဢႅတ်ႉသ်ပရႅၼ်တူဝ်ႇ</language>
+			<language type="es">သပဵၼ်ႇ</language>
+			<language type="es_419">သပဵၼ်ႇ လတိၼ်ႇ ဢမႄႇရိၵၢၼ်ႇ</language>
+			<language type="es_ES">သပဵၼ် (ယူးရူပ်ႉ)</language>
+			<language type="es_MX">သပဵၼ်ႇ (မႅၵ်ႇသီႇၵူဝ်ႇ)</language>
+			<language type="et">ဢႄႇသတူဝ်းၼီးယႃး</language>
+			<language type="eu">ပႃႉသ်</language>
+			<language type="ewo">ဢဝၢၼ်တူဝ်ႇ</language>
+			<language type="fa">ပႃႇသျႃး</language>
+			<language type="fa_AF">ပႃႇသျႃး (ဢႃႇၾၵၢၼ်ႇၼီႇသတၢၼ်ႇ)</language>
+			<language type="ff">ၾူလႃႇ</language>
+			<language type="fi">ၾိၼ်ႇလႅၼ်ႇ</language>
+			<language type="fil">ၾီလိပ်ႈပိၼ်း</language>
+			<language type="fo">ၾႄးရူဝ်းဢီးသ်</language>
+			<language type="fr">ၾရၢင်ႇသဵတ်ႈ</language>
+			<language type="fr_CA">ၾရၢင်ႇသဵတ်ႈ (ၶႅၼ်ႇၼေႇတႃႇ)</language>
+			<language type="fr_CH">ၾရၢင်ႇသဵတ်ႈ (သဝိတ်ႈၸႃႇလႅၼ်ႇ)</language>
+			<language type="frc">ၾရၢင်ႇသဵတ်ႈ ၶေးၵျုၼ်ႇ</language>
+			<language type="frr">ၾရီႇသီႇယႅၼ်ႇ ပွတ်းႁွင်ႇ</language>
+			<language type="fur">ၾရီႇယူးလီယႅၼ်ႇ</language>
+			<language type="fy">ၾရီႇသီႇယႅၼ်ႇ ပွတ်းတူၵ်း</language>
+			<language type="ga">ဢၢႆးရိတ်ႉသျ်</language>
+			<language type="gaa">ၵႃႉ</language>
+			<language type="gd">ၵေးလိၵ်ႉ သၵွတ်ႉတိသျ်</language>
+			<language type="gez">ၵျီႉသ်</language>
+			<language type="gl">ၵလီးသီယႅၼ်ႇ</language>
+			<language type="gn">ၵႂႃႇရႃၼီး</language>
+			<language type="gsw">ၵျႃႇမၼ်ႇသဝိတ်ႉ</language>
+			<language type="gu">ၵူးၵျရႃႇတီႇ</language>
+			<language type="guz">ၵတ်ႉသီး</language>
+			<language type="gv">မႅၼ်ႉ</language>
+			<language type="ha">ႁၢဝ်းသႃႇ</language>
+			<language type="haw">ႁဝၢႆႇယၼ်ႇ</language>
+			<language type="he">ႁီးပရူး</language>
+			<language type="hi">ႁိၼ်ႇတီႇ</language>
+			<language type="hi_Latn">ႁိၼ်ႇတီႇ (လတိၼ်ႇ)</language>
+			<language type="hi_Latn" alt="variant">ႁိင်းၵလဵတ်ႈ</language>
+			<language type="hnj">မင်းၼိဝ်းဝႃႇ</language>
+			<language type="hr">ၶရူဝ်ႇဢေးသျႃး</language>
+			<language type="hsb">သေႃးပီးယႅၼ်း ပွတ်းၼိူဝ်</language>
+			<language type="ht">ႁေးသျုၼ်း ၶရီးဢူဝ်ႇ</language>
+			<language type="hu">ႁၢင်ႇၵေႇရီႇ</language>
+			<language type="hy">ဢႃႇမေးၼီးယႃး</language>
+			<language type="ia">ဢိၼ်ထႃလိၼ်းၵႂႃႇ</language>
+			<language type="id">ဢိၼ်ႇတူဝ်ႇၼီးသျႃး</language>
+			<language type="ie">ဢိၼ်ႇထႃႇလိၼ်းၵူၺ်ႇ</language>
+			<language type="ig">ဢိၵ်ႉပူဝ်း</language>
+			<language type="ii">သိသျွၼ်ယီႈ</language>
+			<language type="io">ဢီးတူဝ်ႇ</language>
+			<language type="is">ဢၢႆးသလႅၼ်ႇ</language>
+			<language type="it">ဢီႇတႃႇလီႇ</language>
+			<language type="iu">ဢီၼွၵ်းတီတုတ်ႈ</language>
+			<language type="ja">ၵျႃႇပၢၼ်ႇ</language>
+			<language type="jbo">လူဝ်ၸပႅၼ်ႇ</language>
+			<language type="jgo">ဢၢမ်းၵူမ်ႈပႃႇ</language>
+			<language type="jmc">မၶျၢမ်း</language>
+			<language type="jv">ၵျႃးဝၼိတ်ႉ</language>
+			<language type="ka">ၵျေႃႇၵျႃႇ</language>
+			<language type="kaa">ၶရႃး-ၶႄႇလ်ၽၵ်ႉ</language>
+			<language type="kab">ၶပၢႆယႂ်ႇ</language>
+			<language type="kaj">ၵျူး</language>
+			<language type="kam">ၶမ်းပႃႇ</language>
+			<language type="kcg">တႃယႅပ်ႉ</language>
+			<language type="kde">မၢၵ်ႈၶွၼ်းတေႇ</language>
+			<language type="kea">ၶပ်ႉပူဝႃႇတီႇယႃႇၼူဝ်ႇ</language>
+			<language type="kek">ၶႅၵ်ႉၶျီႇ</language>
+			<language type="ken">ၶႅၼ်ယင်ႇ</language>
+			<language type="kgp">ၶဵင်းၵင်ႇ</language>
+			<language type="khq">ၶူဝ်းရၶျိၼ်းၼၢႆး</language>
+			<language type="ki">ၶူႇၶူးယူႇ</language>
+			<language type="kk">ၵႃးၸႅၵ်ႇ</language>
+			<language type="kkj">ၵႃးၵူဝ်ႇ</language>
+			<language type="kl">ၵလႃႈလီးသုတ်ႇ</language>
+			<language type="kln">ၵႄလႅၼ်ႈၵျိၼ်ႇ</language>
+			<language type="km">ၶမဵၼ်</language>
+			<language type="kn">ၶၼႃးတႃႇ</language>
+			<language type="ko">ၵၢဝ်းလီ</language>
+			<language type="kok">ၶွၼ်းၶႃၼီး</language>
+			<language type="kpe">ၽႄႈလႄႈ</language>
+			<language type="ks">ၶႅသ်ႉမီးရီႇ</language>
+			<language type="ksb">သျမ်ပလႃႇ</language>
+			<language type="ksf">ပဵပ်ႉၾီးယႃး</language>
+			<language type="ksh">ၵူဝ်ႇလူဝ်ၼီယႅၼ်ႇ</language>
+			<language type="ku">ၶိူဝ်းတိတ်ႉသျ်</language>
+			<language type="ku" menu="core">ၶိူဝ်းတိတ်ႉသျ်</language>
+			<language type="ku" menu="extension">ၵူႇရမၼ်ႇၵျီႇ</language>
+			<language type="kw">ၶူဝ်းၼိတ်ႉသျ်</language>
+			<language type="kxv">ၵူႇဝီႇ</language>
+			<language type="ky">ၶေးလ်ၵဵတ်ႇ</language>
+			<language type="la">လတိၼ်ႇ</language>
+			<language type="lag">လႅင်းၵျီႇ</language>
+			<language type="lb">လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</language>
+			<language type="lg">ၵႅၼ်တႃႇ</language>
+			<language type="lij">လီႇၵူးရီႇယႅၼ်ႇ</language>
+			<language type="lkt">လၶူဝ်တႃႇ</language>
+			<language type="lld">လႃႇတိၼ်ႇ</language>
+			<language type="lmo">လွမ်းပၢတ်ႉ</language>
+			<language type="ln">လိင်ႇၵႄလ်လႃႇ</language>
+			<language type="lo">လၢဝ်း</language>
+			<language type="lou">လူႇဝီႇသီႇယႃးၼႃးၶရီးဢူဝ်ႇ</language>
+			<language type="lrc">လူႇရီႇ ပွတ်းႁွင်ႇ</language>
+			<language type="lt">လီႉတူႇဝေးၼီးယႃး</language>
+			<language type="ltg">လတ်ႉၵေႇလီႇယႅၼ်ႇ</language>
+			<language type="lu">လူႇပႃႇ-ၵႃႇတၢၼ်ႇၵႃႇ</language>
+			<language type="luo">လူဝ်</language>
+			<language type="luy">လူးယီယႃး</language>
+			<language type="lv">လၢတ်ႈဝီႇယႃႇ</language>
+			<language type="lzz">လၢတ်ႉၸ်</language>
+			<language type="mai">မၢႆႇတီႇလီႇ</language>
+			<language type="mas">မၸၢႆႇ</language>
+			<language type="mdf">မူၵ်ႉသျႃႇ</language>
+			<language type="mer">မေရူႇ</language>
+			<language type="mfe">မူဝ်ရိသျႅၼ်ႇ</language>
+			<language type="mg">မလၵႅတ်ႉသီႇ</language>
+			<language type="mgh">မၵ်ႉၶႂႃး-မီထူဝ်ႇ</language>
+			<language type="mgo">မႅတ်ႉထႃႇ</language>
+			<language type="mhn">မေႃႇၶျီႇၼူဝ်ႇ</language>
+			<language type="mi">မၢဝ်းရီႇ</language>
+			<language type="mic">မီးၵမႃႇ</language>
+			<language type="mk">မႄႇၶေႇတူဝ်းၼီးယႃး</language>
+			<language type="ml">မလေႇယႃလမ်ႇ</language>
+			<language type="mn">မူင်ႇၵူဝ်းလီးယႃး</language>
+			<language type="mni">မၼိပူႇရ်</language>
+			<language type="moh">မူဝ်ႉႁၢၵ်ႇ</language>
+			<language type="mr">မရႃႉတီႇ</language>
+			<language type="ms">မလေး</language>
+			<language type="mt">မႄးလ်ထီး</language>
+			<language type="mua">မုၼ်းတင်ႈ</language>
+			<language type="mul">ၽႃႇသႃႇလၢႆလၢႆဢၼ်</language>
+			<language type="mus">မတ်ႉသ်ၶူဝ်းၵီႇ</language>
+			<language type="mww">မင်းတေႃႇ</language>
+			<language type="my">မၢၼ်ႈ</language>
+			<language type="myv">ဢႄရၸီးယႃး</language>
+			<language type="mzn">မႃၸၼ်တႃရၼ်ၼီႇ</language>
+			<language type="nan">ၶႄႇမိၼ်းၼၢၼ်</language>
+			<language type="naq">ၼႃးမႃႈ</language>
+			<language type="nb">ၼေႃႇဝူၺ်း ပွၵ်ႉၶ်မေႃႇ</language>
+			<language type="nd">ဢိၼ်တပႄႇလႃႇ ပွတ်းႁွင်ႇ</language>
+			<language type="nds">ၵျႃႇမၼ်ႇပွတ်းတႂ်ႈ</language>
+			<language type="nds_NL">ၵျႃႇမၼ်ႇပွတ်းတႂ်ႈ (ၼႄႇတႃႇလႅၼ်ႇ)</language>
+			<language type="ne">ၼေႇပႃႇလီႇ</language>
+			<language type="nl">တၢတ်ႉၶျ်</language>
+			<language type="nl_BE">တၢတ်ႉၶျ် (ပႄႇၵျီႇယမ်ႇ)</language>
+			<language type="nmg">ၶႂႃႇသျိဝ်း</language>
+			<language type="nn">ၼေႃႇဝူၺ်း ၼၢႆးၼေႃႉၸ်ၶ်</language>
+			<language type="nnh">ဢႅၼ်ၵျႅၼ်းပုၼ်း</language>
+			<language type="no">ၼေႃႇဝူၺ်း</language>
+			<language type="nqo">ဢင်းၶူဝ်း</language>
+			<language type="nr">ဢိၼ်တပႄႇလႃႇ ပွတ်းၸၢၼ်း</language>
+			<language type="nso">သူဝ်​ထူဝ်ႇ ပွတ်းႁွင်ႇ</language>
+			<language type="nus">ၼူဝ်းဝႃႇ</language>
+			<language type="nv">ၼႃးဝႁူဝ်ႇ</language>
+			<language type="ny">ၺႅၼ်ၵျႃႇ</language>
+			<language type="nyn">ၺၢၼ်ၶေႃးလႄႇ</language>
+			<language type="oc">ဢွၵ်ႉသီထႅၼ်ႈ</language>
+			<language type="oka">ဢူဝ်ႇၵႃႇၼႃႇၵၼ်ႇ</language>
+			<language type="om">ဢူဝ်ရူဝ်မူဝ်</language>
+			<language type="or">ဢူဝ်ႇတီးယႃး</language>
+			<language type="os">ဢေႃႈသႅတ်ႉထိၵ်ႉ</language>
+			<language type="osa">ဢူဝ်းသဵတ်ႉ</language>
+			<language type="pa">ပုၼ်ႇၵျႃႇပီႇ</language>
+			<language type="pap">ပႃပီယႃမႅၼ်းတူဝ်ႇ</language>
+			<language type="pcm">ၼၢႆႇၵျီးရီးယႅၼ်းၽိတ်ႉၵျိၼ်ႇ</language>
+			<language type="pi">ပႃႇလိ</language>
+			<language type="pis">ၽိၵျိၼ်ႇ</language>
+			<language type="pl">ပူဝ်ႇလႅၼ်ႇ</language>
+			<language type="pms">ၽိတ်ႉမွၼ်းထိတ်ႉသ်</language>
+			<language type="prg">ၽရတ်ႉသီႇယႅၼ်ႇ</language>
+			<language type="ps">ၽတ်ႉသ်ျတူဝ်ႇ</language>
+			<language type="pt">ပေႃးတူႉၵၢဝ်ႇ</language>
+			<language type="pt_BR">ပေႃးတူႉၵၢဝ်ႇ ပရႃႇၸီး</language>
+			<language type="pt_PT">ပေႃးတူႉၵၢဝ်ႇ ယူးရူပ်ႉ</language>
+			<language type="qu">ၶႅတ်ႉၶျူႇဝႃႇ</language>
+			<language type="quc">ၶေးသ်ျ</language>
+			<language type="raj">ရၵျသထႃးၼီႇ</language>
+			<language type="rhg">ရူဝ်ႇႁိၼ်ႇၵျႃႇ</language>
+			<language type="rif">ရပ်ႉၾီႇယႅၼ်ႇ</language>
+			<language type="rm">ရူဝ်မႅၼ်ႇသ်ျ</language>
+			<language type="rn">ရုၼ်းတီႇ</language>
+			<language type="ro">ရူဝ်ႇမေးၼီးယႃး</language>
+			<language type="ro_MD">ရူဝ်ႇမေးၼီးယႃး (မေႃႇတူဝ်းဝႃး)</language>
+			<language type="rof">ရွမ်ႇပူဝ်ႇ</language>
+			<language type="ru">ရတ်ႈသျႃး</language>
+			<language type="rw">ၶိၼ်ၺႃဝၼ်းတႃႇ</language>
+			<language type="rwk">ရဝႃ</language>
+			<language type="sa">သၼ်းသၶရိတ်ႉ</language>
+			<language type="sah">ယႃႇၵုတ်ႉ</language>
+			<language type="saq">သႅမ်ပူးရူး</language>
+			<language type="sat">သၼ်ႇတႃႇလီႇ</language>
+			<language type="sbp">သၼ်ၵူး</language>
+			<language type="sc">သႃတီးၼီးယႅၼ်း</language>
+			<language type="scn">သီႇသီးလီးယႅၼ်း</language>
+			<language type="sd">သိၼ်းတီႇ</language>
+			<language type="sdh">ၶိူဝ်းတိတ်ႉသ်ျ ပွတ်းၸၢၼ်း</language>
+			<language type="se">သႃးမီး ပွတ်းႁွင်ႇ</language>
+			<language type="seh">သႄၼႃႇ</language>
+			<language type="ses">ၶူဝ်ရႃပူဝ်ႇရူဝ်ႇသႅၼ်ၼီႇ</language>
+			<language type="sg">သၼ်ၵူဝ်ႇ</language>
+			<language type="sgs">သမူဝ်ႇၵျိတ်ႉသျၼ်ႇ</language>
+			<language type="shi">တႃႉၶျႄႇလ်ႁိတ်ႉ</language>
+			<language type="shn">တႆး</language>
+			<language type="si">သိၼ်ႁႃးလႃႇ</language>
+			<language type="sid">သီတႃးမူဝ်း</language>
+			<language type="sk">သလူဝ်ႇဝၵ်ႉ</language>
+			<language type="skr">သရၢႆးၵီႇ</language>
+			<language type="sl">သလူဝ်ႇဝီးၼီးယႃး</language>
+			<language type="sma">သႃးမီး ပွတ်းၸၢၼ်း</language>
+			<language type="smj">လူးသႅမ်းမီး</language>
+			<language type="smn">ဢိၼ်းၼရီႇသႃးမီး</language>
+			<language type="sms">သၵွတ်ႉသႃးမီး</language>
+			<language type="sn">သျူဝ်းၼႃႇ</language>
+			<language type="so">သူဝ်ႇမႃႇလီႇ</language>
+			<language type="sq">ဢႃႇပႃးၼီးယႃး</language>
+			<language type="sr">သႃးပီးယႃး</language>
+			<language type="ss">သဝႃတီ</language>
+			<language type="ssy">သႁူဝ်ႇ</language>
+			<language type="st">သူဝ်ထူဝ်ႇ ပွတ်းၸၢၼ်း</language>
+			<language type="su">သုၼ်းတၼိတ်ႉသ်</language>
+			<language type="suz">သုၼ်ႇဝႃႇ</language>
+			<language type="sv">သုၺ်းတိတ်ႉသျ်</language>
+			<language type="sw">သုၺ်ႇႁီးလီႇ</language>
+			<language type="sw_CD">သုၺ်ႇႁီးလီႇ (ၶွင်ႇၵူဝ်ႇ - ၶိၼ်သျႃးသႃႇ)</language>
+			<language type="syr">သီးရီးဢႅၵ်ႉ</language>
+			<language type="szl">သၢႆလီးသီႇယႅၼ်ႇ ပွတ်းတႂ်ႈ</language>
+			<language type="ta">တမီးလ်</language>
+			<language type="te">ထႄးလူႇၵူႇ</language>
+			<language type="teo">ထႄးသူဝ်ႇ</language>
+			<language type="tg">တႃၵျိၵ်ႉ</language>
+			<language type="th">ထႆး</language>
+			<language type="ti">ထီႇၵရိၼ်းၺႃႇ</language>
+			<language type="tig">ထီးၵရီႇ</language>
+			<language type="tk">ထၢၵ်ႉမႅၼ်ႇ</language>
+			<language type="tn">သဝႃးၼႃႇ</language>
+			<language type="to">ထွင်းၵၼ်ႇ</language>
+			<language type="tok">ထူဝ်ႇၶီႇၽူဝ်းၼႃႇ</language>
+			<language type="tpi">ထွၵ်ႉၽိသိၼ်ႇ</language>
+			<language type="tr">တိူဝ်ႇၵီႇ</language>
+			<language type="trv">တႃႇရူဝ်ႇၵူဝ်ႇ</language>
+			<language type="trw">ထေႃးဝႃႇလီႇ</language>
+			<language type="ts">သွင်းၵႃႇ</language>
+			<language type="tt">ထထႃး</language>
+			<language type="twq">ထႅတ်ႉသဝၢၵ်ႉ</language>
+			<language type="tyv">ထူးဝႃႇ</language>
+			<language type="tzm">ဢတ်ႉလႅတ်ႉ ထမၸိတ်ႉ ပွတ်းၵၢင်</language>
+			<language type="ug">ဝီႇၵႃႇ</language>
+			<language type="uk">ယူႇၶရဵၼ်း</language>
+			<language type="und">ဢမ်ႇႁူႉၸၵ်း ၽႃႇသႃႇ</language>
+			<language type="ur">ဢူးတူႇ</language>
+			<language type="uz">ဢူးၸပၵ်ႉ</language>
+			<language type="vai">ဝၢႆး</language>
+			<language type="ve">ဝႅၼ်းတႃႇ</language>
+			<language type="vec">ဝႅၼ်ႇၼီးသျၼ်ႇ</language>
+			<language type="vi">ဝႅတ်ႉၼမ်း</language>
+			<language type="vmw">မၵ်ႉၶႂႃး</language>
+			<language type="vo">ဝေႃးလၽုၵ်း</language>
+			<language type="vun">ဝၼ်ၵျူဝ်</language>
+			<language type="wa">ဝေႃးလုၼ်း</language>
+			<language type="wae">ဝေႃးသႃႇ</language>
+			<language type="wal">ဝူဝ်လေတႃႇ</language>
+			<language type="wbp">ဝေႃးပီႇရီႇ</language>
+			<language type="wo">ဝေႃးလွပ်ႇ</language>
+			<language type="xh">ႁူဝ်းသႃႇ</language>
+			<language type="xnr">ၵင်ႇၵရီႇ</language>
+			<language type="xog">သူဝ်းၵႃႇ</language>
+			<language type="yav">ယၢင်းပႅၼ်</language>
+			<language type="yi">ယိတ်ႉတိတ်ႉသျ်</language>
+			<language type="yo">ယေႃးရူႇပႃႇ</language>
+			<language type="yrl">ၼိၼ်းၵႃတူႇ</language>
+			<language type="yue">ၶႅၼ်းထူၼ်းၼိတ်ႉသ်</language>
+			<language type="za">ၸႂၢင်ႈ</language>
+			<language type="zgh">လၵ်းၸဵင် မူဝ်ရူဝ်ၵၼ်ႇ ထမၸိတ်ႉ</language>
+			<language type="zh">ၶႄႇ</language>
+			<language type="zh_Hans">ၶႄႇ (ပၢၼ်မႂ်ႇ)</language>
+			<language type="zh_Hans" alt="long">ၶႄႇမၼ်းတရိၼ်း ပၢၼ်မႂ်ႇ</language>
+			<language type="zh_Hant">ၶႄႇ (ပၢၼ်ၵဝ်ႇ)</language>
+			<language type="zu">ၸူးလူး</language>
+			<language type="zxx">ဢမ်ႇမီးၶေႃႈၼမ်းၽႃႇသႃႇ</language>
 		</languages>
 		<scripts>
-			<script type="Mymr" draft="contributed">မျၢၼ်ႇမႃႇ</script>
+			<script type="Adlm">ဢတ်ႉလမ်ႇ</script>
+			<script type="Aghb">ၶႃႇၶေးသီးသႅၼ်း ဢႃႇပႃးၼီးယႅၼ်း</script>
+			<script type="Ahom">ဢႃႇႁူမ်ႇ</script>
+			<script type="Arab">ဢႃႇရၢပ်ႈ</script>
+			<script type="Aran">ၼၢတ်ႉတလိၵ်ႉ</script>
+			<script type="Armi">ဢႅမ်ႇပႃႇရႃႇ ဢႃႇရၢမ်ႇ</script>
+			<script type="Armn">ဢႃႇမေးၼီးယႃး</script>
+			<script type="Avst">ဢဝႅတ်ႉသတၼ်ႇ</script>
+			<script type="Bali">ပႃႇလီႇ</script>
+			<script type="Bamu">ပမ်မုမ်ႇ</script>
+			<script type="Bass">ပၢတ်ႉသ်သဝႃႇ</script>
+			<script type="Batk">ပႃတၢၵ်ႇ</script>
+			<script type="Beng">ပင်းၵလႃး</script>
+			<script type="Berf">ပီးရီးယႃးဢိူပ်ႉၾ်</script>
+			<script type="Bhks">ပႁၢႆသူၶီႇ</script>
+			<script type="Bopo">ပူဝ်ႇပူဝ်ႇမူဝ်ႇၾူဝ်ႇ</script>
+			<script type="Brah">ပရႃမီႇ</script>
+			<script type="Brai">ပရႄးလ်</script>
+			<script type="Bugi">ပူႇၵီးၼီးၸ်</script>
+			<script type="Buhd">ပူးႁိတ်ႉ</script>
+			<script type="Cakm">ၶျႅၵ်ႉမႃး</script>
+			<script type="Cans">တူဝ်လိၵ်ႈ ၵူၼ်းၶိူဝ်းဢႅပ်ႉပူဝ်းရီႇၵျိၼ်ႇၼႄႇ ၶႅၼ်ႇၼေႇတႃႇ ဢၼ်ႁူမ်ႈၵၼ်ဝႆႉ</script>
+			<script type="Cari">ၶျႃရီယႅၼ်ႇ</script>
+			<script type="Cham">ၶျႅမ်</script>
+			<script type="Cher">ၶျႄးရူဝ်ၵီႇ</script>
+			<script type="Chrs">ၶူဝ်ရသမီးယႅၼ်ႇ</script>
+			<script type="Copt">ၶွပ်းထိၵ်ႉ</script>
+			<script type="Cpmn">သၢႆႉပရူဝ်-မိၼ်ၼူဝ်းဢႅၼ်ႇ</script>
+			<script type="Cprt">သိပ်းပရဵတ်ႉ</script>
+			<script type="Cyrl">သရီးရိၵ်ႉ</script>
+			<script type="Cyrs">သရီးရိၵ်ႉသလႃႇဝူဝ်းၼိၵ်ႉၶျၢတ်ႉၵဝ်ႇ</script>
+			<script type="Deva">တႄဝၼႃးၵရီႇ</script>
+			<script type="Diak">တၢႆႉၾ်ဢၵ်ႉၶူးလူႇ</script>
+			<script type="Dogr">တွၵ်ႉၵရႃႇ</script>
+			<script type="Dsrt">တႅတ်ႉသရႅတ်ႉ</script>
+			<script type="Dupl">လိၵ်ႈပွတ်း တူႇပလူဝ်ႇယၼ်ႇ</script>
+			<script type="Egyp">ႁၢႆးရူဝ်ႇၵလိပ်ႉဢီးၵျိပ်ႈ</script>
+			<script type="Elba">ဢႄႇလ်ပႃႇသၼ်ႇ</script>
+			<script type="Elym">ဢႄးလႃးမိၵ်ႉ</script>
+			<script type="Ethi">ဢီႇတီႇယူဝ်းၽိၵ်ႉ</script>
+			<script type="Gara">ၵႃႇရေး</script>
+			<script type="Geor">​ၵျေႃၵျၼ်ႇၶတ်ႉသူႇရီႇ</script>
+			<script type="Glag">ၵလႃႉၵူဝ်လိတ်ႉထိၵ်ႉ</script>
+			<script type="Gong">ၵုၼ်ၵျႃလႃၵွၼ်းတီႇ</script>
+			<script type="Gonm">မသႃရမ်ႇ ၵွၼ်းတီႇ</script>
+			<script type="Goth">ၵွတ်ႉတိၵ်ႉ</script>
+			<script type="Gran">ၵရၼ်းထ</script>
+			<script type="Grek">ၵရိတ်ႈ</script>
+			<script type="Gujr">ၵူးၵျရႃႇတီႇ</script>
+			<script type="Gukh">ၵူႇရူင်ႇၶေႇမ</script>
+			<script type="Guru">ၵူရမုၵ်ႉၶီႇ</script>
+			<script type="Hanb">ႁၢၼ် ဢိၵ်ႇတင်း ပူဝ်ႇပူဝ်ႇမူဝ်ႇၾူဝ်ႇ</script>
+			<script type="Hang">ႁင်းၵူးလ်</script>
+			<script type="Hani">ႁၢၼ်</script>
+			<script type="Hano">ႁၼ်ၼုၼ်းဢူး</script>
+			<script type="Hans">ပၢၼ်မႂ်ႇ</script>
+			<script type="Hans" alt="stand-alone">ႁၢၼ်ပၢၼ်မႂ်ႇ</script>
+			<script type="Hant">ပၢၼ်ၵဝ်ႇ</script>
+			<script type="Hant" alt="stand-alone">ႁၢၼ်ပၢၼ်ၵဝ်ႇ</script>
+			<script type="Hatr">ႁႅတ်ႉတရၼ်ႇ</script>
+			<script type="Hebr">ႁီးပရူး</script>
+			<script type="Hira">ႁီးရၵႃးၼႃႇ</script>
+			<script type="Hluw">ႁၢႆးရူဝ်ႇၵလိပ်ႉ ဢႅၼ်ႇၼထူဝ်းလီးယႅၼ်း</script>
+			<script type="Hmng">ပႁၢဝ်ႉၸၢဝ်းမူင်း</script>
+			<script type="Hmnp">ၺႃႇၵဵင်းပႂႃႈၶျူႈၸၢဝ်းမူင်း</script>
+			<script type="Hrkt">တူဝ်လိၵ်ႈ ၵျႃႇပၢၼ်ႇ</script>
+			<script type="Hung">ႁၢင်ႇၵေႇရီႇၵဝ်ႇ</script>
+			<script type="Ital">လိၵ်ႈၵဝ်ႇ</script>
+			<script type="Jamo">ၵျေးမူဝ်</script>
+			<script type="Java">ၵျႃႇဝႃး</script>
+			<script type="Jpan">ၵျႃႇပၢၼ်ႇ</script>
+			<script type="Kali">ၵယႃးလီ</script>
+			<script type="Kana">ၶႃႇတႃႉၵႃႉၼႃႉ</script>
+			<script type="Kawi">ၵဝီႇ</script>
+			<script type="Khar">ၶရူတ်ႉထိ</script>
+			<script type="Khmr">ၶမဵၼ်</script>
+			<script type="Khoj">ၶုတ်းၸ်ၵီႇ</script>
+			<script type="Kits">တူဝ်လိၵ်ႈဢွၼ်ႇ ၶိတ်ႉတၢၼ်ႇ</script>
+			<script type="Knda">ၶၼ်ၼႃးတႃႇ</script>
+			<script type="Kore">ၵၢဝ်းလီ</script>
+			<script type="Krai">ၵီႇရတ်ႉရၢႆး</script>
+			<script type="Kthi">ၵၢႆးထီႇ</script>
+			<script type="Lana">လၢၼ်ႉၼႃး</script>
+			<script type="Laoo">လၢဝ်း</script>
+			<script type="Latf">လတိၼ်ႇ ၾရၢၵ်ႇထိူဝ်း</script>
+			<script type="Latg">လတိၼ်ႇ ၵေးလိၵ်ႉ</script>
+			<script type="Latn">လတိၼ်ႇ</script>
+			<script type="Lepc">လိပ်ႉၶျႃႇ</script>
+			<script type="Limb">လိမ်ပူး</script>
+			<script type="Lina">ထႅဝ် ဢေႇ</script>
+			<script type="Linb">ထႅဝ် ပီႇ</script>
+			<script type="Lisu">ၾရေးသႃႇ</script>
+			<script type="Lyci">လၢႆႉသီႇယႅၼ်ႇ</script>
+			<script type="Lydi">လၢႆႉတီႇယႅၼ်ႇ</script>
+			<script type="Mahj">မႁႃႇၸၼိ</script>
+			<script type="Maka">မၵၢတ်ႉသႃႇ</script>
+			<script type="Mand">မၼ်တီးယႅၼ်ႇ</script>
+			<script type="Mani">မၼီးၶီးယႅၼ်ႇ</script>
+			<script type="Marc">မႃးၶျႅၼ်ႇ</script>
+			<script type="Medf">မေတေၾႃဢိတရိၼ်</script>
+			<script type="Mend">မႅၼ်ႉတႄ</script>
+			<script type="Merc">မႄႇရူဝ်ႇတိၵ်ႉ ၶႃးသိပ်ႉ</script>
+			<script type="Mero">မႄႇရူဝ်ႇတိၵ်ႉ</script>
+			<script type="Mlym">မလေးယႃးလမ်ႇ</script>
+			<script type="Modi">မူဝ်ႇတီႇ</script>
+			<script type="Mong">မူင်ႇၵူဝ်းလီးယႃး</script>
+			<script type="Mroo">မရူဝ်ႇ</script>
+			<script type="Mtei">မေးတေးမယႅၵ်ႉ</script>
+			<script type="Mult">မႃတၼ်ၼိ</script>
+			<script type="Mymr">မျၢၼ်ႇမႃႇ</script>
+			<script type="Nagm">ၼၢၵ်ႉမုၼ်ႇတရီႇ</script>
+			<script type="Nand">ၼၼ်တီၼၵရီ</script>
+			<script type="Narb">ဢႃႇရပီးယႅၼ်းႁွင်ႇၵဝ်ႇ</script>
+			<script type="Nbat">ၼပထီးယႅၼ်း</script>
+			<script type="Newa">ၼႄးဝႃႇ</script>
+			<script type="Nkoo">ဢိၼ်းၶူဝ်း</script>
+			<script type="Nshu">ၼူသျူး</script>
+			<script type="Ogam">ဢူဝ်ႇႁမ်ႇ</script>
+			<script type="Olck">ဢူဝ်းၶျိၶီ</script>
+			<script type="Onao">ဢူဝ်ႇလ်ဢူဝ်ႇၼႃႇလ်</script>
+			<script type="Orkh">ဢေႃၶွၼ်ႇ</script>
+			<script type="Orya">ဢူဝ်းတီးယႃႇ</script>
+			<script type="Osge">ဢူဝ်းသဵတ်ႉ</script>
+			<script type="Osma">ဢေႃသမႅၼ်းၺႃႇ</script>
+			<script type="Ougr">ဝီႇၵႃႇၵဝ်ႇ</script>
+			<script type="Palm">ပႄးလ်မၢႆရႄႇၼီႇ</script>
+			<script type="Pauc">ၽၢဝ်းသိၼ်းႁၢဝ်း</script>
+			<script type="Perm">ပႃႇမိၵ်ႉၶ်ၵဝ်ႇ</script>
+			<script type="Phag">ၽႅၵ်ႉ-ပႃႉ</script>
+			<script type="Phli">လိၵ်ႈႁိၼ် ပႃႇႁလႃႇဝီႇ</script>
+			<script type="Phlp">လိၵ်ႈထမ်း ပႃႇႁလႃႇဝီႇ</script>
+			<script type="Phnx">ၽူဝ်ႇၼီးသီႇယႅၼ်ႇ</script>
+			<script type="Plrd">ၽူဝ်ၼႅတ်ႉထိၵ်ႉ ၽေႃးလၢတ်ႉ</script>
+			<script type="Prti">လိၵ်ႈႁိၼ် ၽၢတ်ႉထီႇယႅၼ်ႇ</script>
+			<script type="Qaag">ၸေႃႇၵျီႇ</script>
+			<script type="Rjng">ရတ်ႉၵျင်ႇ</script>
+			<script type="Rohg">ႁၼ်ၼီၾီး</script>
+			<script type="Runr">ရုၼ်းၼိၵ်ႉ</script>
+			<script type="Samr">သမႃးရိတၼ်ႇ</script>
+			<script type="Sarb">ဢႃႇရပီးယႅၼ်းၸၢၼ်းၵဝ်ႇ</script>
+			<script type="Saur">သေႃရတ်ႉသ်ျထရႃႇ</script>
+			<script type="Sgnw">လွင်ႈတႅမ်ႈပၢႆႉ</script>
+			<script type="Shaw">သျေးပီးယႅၼ်း</script>
+			<script type="Shrd">သျႃရႃးတႃႇ</script>
+			<script type="Sidd">သိတ်ႉတမ်ႇ</script>
+			<script type="Sidt">သၢႆႉတႄးတိၵ်ႉ</script>
+			<script type="Sind">ၶူႇတႃႇဝႃႇတီႇ</script>
+			<script type="Sinh">သိၼ်ႁႃးလႃႇ</script>
+			<script type="Sogd">သူၵ်ႉတီႇယႅၼ်ႇ</script>
+			<script type="Sogo">သူၵ်ႉတီႇယႅၼ်ႇၵဝ်ႇ</script>
+			<script type="Sora">သူဝ်ႇရႃႇသူမ်ႈပႅင်း</script>
+			<script type="Soyo">သူဝ်ယွမ်ပူဝ်ႇ</script>
+			<script type="Sund">သုၼ်တၼိတ်ႉ</script>
+			<script type="Sunu">သုၼုဝႃႈ</script>
+			<script type="Sylo">သလွတ်ႉတီႇၼႃၵႃးရိ</script>
+			<script type="Syrc">သီးရီးဢႅၵ်ႉ</script>
+			<script type="Syre">ဢႅတ်ႉသထရႅၼ်ႇၵျီႇလူဝ်ႇ သီးရီးဢႅၵ်ႉ</script>
+			<script type="Syrj">သီးရီးဢႅၵ်ႉ ပွတ်းတူၵ်း</script>
+			<script type="Syrn">သီးရီးဢႅၵ်ႉ ပွတ်းဢွၵ်ႇ</script>
+			<script type="Tagb">ထႅၵ်ႉပၢၼ်ႇဝႃႇ</script>
+			<script type="Takr">တၵ်ႉၵရီႇ</script>
+			<script type="Tale">တႆးၼိူဝ်</script>
+			<script type="Talu">တႆးလိုဝ်ႉမႂ်ႇ</script>
+			<script type="Taml">တမီးလ်</script>
+			<script type="Tang">တင်းၵုတ်ႇ</script>
+			<script type="Tavt">တႆးဝႅတ်ႉ</script>
+			<script type="Tayo">တႆးယူဝ်</script>
+			<script type="Telu">ထႄးလူႇၵူႇ</script>
+			<script type="Tfng">တိၾိၼ်ႇၼႃႇ</script>
+			<script type="Tglg">တၵႃးလွၵ်ႉ</script>
+			<script type="Thaa">ထၢၼ်းၼ</script>
+			<script type="Thai">ထႆး</script>
+			<script type="Tibt">ထိပႅတ်ႉ</script>
+			<script type="Tirh">တီႇႁူးတႃႇ</script>
+			<script type="Tnsa">ထႅင်းသႃႇ</script>
+			<script type="Todr">တူဝ်ႇထရီႇ</script>
+			<script type="Tols">တူဝ်ႇလူင်သီႇၵီႇ</script>
+			<script type="Toto">ထူဝ်းထူဝ်ႇ</script>
+			<script type="Tutg">တူႇလူႇ-တိၵႃႇလႃႇရီႇ</script>
+			<script type="Ugar">ဢူးၵရိတ်ႈထိၵ်ႉ</script>
+			<script type="Vaii">ဝၢႆး</script>
+			<script type="Vith">ဝိတ်ႉၶူးၶျီႇ</script>
+			<script type="Wara">ဝႃႇရၢင်းၶျိတ်ႉတီႇ</script>
+			<script type="Wcho">ဝၼ်ႉၶျၢဝ်</script>
+			<script type="Xpeo">ပႃႇသျႃးၵဝ်ႇ</script>
+			<script type="Xsux">သူးမီးရူဝ်-ဢၵ်ႉၵႃးတီးယၼ်း ၶိဝ်ႇၼီႇၾွမ်း</script>
+			<script type="Yezi">ယႄးၸီႇတီႇ</script>
+			<script type="Yiii">ယီႈ</script>
+			<script type="Zanb">ၸၼ်ၼပၸႃႇသၵႂႄး</script>
+			<script type="Zinh">သိုပ်ႇယိုၼ်ႈမႃး</script>
+			<script type="Zmth">မၢႆပိူင် ပၢႆးၼပ်ႉ</script>
+			<script type="Zsye">ဢီႇမူဝ်းၵျိ</script>
+			<script type="Zsym">တူဝ်မၢႆ</script>
+			<script type="Zxxx">ဢၼ်ဢမ်ႇတႅမ်ႈဝႆႉ</script>
+			<script type="Zyyy">ဢၼ်ၸႂ်ႉၼမ်</script>
+			<script type="Zzzz">တူဝ်လိၵ်ႈ ဢၼ်ဢမ်ႇႁူႉၸၵ်း</script>
 		</scripts>
 		<territories>
-			<territory type="MM" draft="contributed">မျၢၼ်ႇမႃႇ (မိူင်းမၢၼ်ႈ)</territory>
-			<territory type="TH" draft="contributed">မိူင်းထႆး</territory>
+			<territory type="001">ၵမ်ႇၽႃႇ</territory>
+			<territory type="002">ဢႃႇၾရိၵ</territory>
+			<territory type="003">ဢမႄႇရိၵႁွင်ႇ</territory>
+			<territory type="005">ဢမႄႇရိၵၸၢၼ်း</territory>
+			<territory type="009">ဢူဝ်းသီးၼီးယႃး</territory>
+			<territory type="011">ဢႃႇၾရိၵ ပွတ်းတူၵ်း</territory>
+			<territory type="013">ဢမႄႇရိၵ ပွတ်းၵၢင်</territory>
+			<territory type="014">ဢႃႇၾရိၵ ပွတ်းဢွၵ်ႇ</territory>
+			<territory type="015">ဢႃႇၾရိၵ ပွတ်းႁွင်ႇ</territory>
+			<territory type="017">ဢႃႇၾရိၵ တွၼ်ႈၵၢင်</territory>
+			<territory type="018">ဢႃႇၾရိၵ ပွတ်းၸၢၼ်း</territory>
+			<territory type="019">ဢမႄႇရိၵ</territory>
+			<territory type="021">ဢမႄႇရိၵ ပွတ်းႁွင်ႇ</territory>
+			<territory type="029">ၶႃႇရိပ်ႈပီႇယၼ်ႇ</territory>
+			<territory type="030">ဢေးသျႃး ပွတ်းဢွၵ်ႇ</territory>
+			<territory type="034">ဢေးသျႃး ပွတ်းၸၢၼ်း</territory>
+			<territory type="035">ဢေးသျႃး ၸဵင်ႇၸၢၼ်းဝၼ်းဢွၵ်ႇ</territory>
+			<territory type="039">ယူးရူပ်ႉ ပွတ်းၸၢၼ်း</territory>
+			<territory type="053">ဢေႃႉသထရႃႇလေးသျႃး</territory>
+			<territory type="054">မႄႇလၼ်ႇၼီးသျႃး</territory>
+			<territory type="057">ၼႃႈလိၼ် မၢႆႇၶရူဝ်ႇၼေးသျၼ်း</territory>
+			<territory type="061">ပေႃႇလီႇၼေးသျႃး</territory>
+			<territory type="142">ဢေးသျႃး</territory>
+			<territory type="143">ဢေးသျႃး ပွတ်းၵၢင်</territory>
+			<territory type="145">ဢေးသျႃး ပွတ်းတူၵ်း</territory>
+			<territory type="150">ယူးရူပ်ႉ</territory>
+			<territory type="151">ယူးရူပ်ႉ ပွတ်းဢွၵ်ႇ</territory>
+			<territory type="154">ယူးရူပ်ႉ ပွတ်းႁွင်ႇ</territory>
+			<territory type="155">ယူးရူပ်ႉ ပွတ်းတူၵ်း</territory>
+			<territory type="202">ဢႃႇၾရိၵ သႃႇႁႃႇရၽႄ</territory>
+			<territory type="419">လတိၼ်ႇ ဢမႄႇရိၵ</territory>
+			<territory type="AC">ၵုၼ်ဢေႇသႅၼ်းသျိၼ်ႇ</territory>
+			<territory type="AD">ဢႅၼ်ႇတူဝ်ႇရႃႇ</territory>
+			<territory type="AE">မိူင်းႁူမ်ႈတုမ် ၸဝ်ႈၾႃႉ ဢႃႇရၢပ်ႈ</territory>
+			<territory type="AF">ဢႃႇၾၵၢၼ်ႇၼီႇသတၢၼ်ႇ</territory>
+			<territory type="AG">ဢႅၼ်ႇထီႇၵႂႃႇ လႄႈ ပႃႇပူးတႃႇ</territory>
+			<territory type="AI">ဢႅၼ်ႇၵုၺ်ႇလႃႇ</territory>
+			<territory type="AL">ဢႃႇပႃးၼီးယႃး</territory>
+			<territory type="AM">ဢႃႇမေးၼီးယႃး</territory>
+			<territory type="AO">ဢႅၼ်ႇၵူဝ်ႇလႃႇ</territory>
+			<territory type="AQ">ဢႅၼ်ႇတၢၵ်ႈတီးၵႃႈ</territory>
+			<territory type="AR">ဢႃႇၵျႅၼ်ႇတီးၼႃး</territory>
+			<territory type="AS">သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ</territory>
+			<territory type="AT">ဢေႃးသထရီးယႃး</territory>
+			<territory type="AU">ဢေႃႉသထရေးလီးယႃး</territory>
+			<territory type="AW">ဢႃႇရူးပႃး</territory>
+			<territory type="AX">မူႇၵုၼ် ဢေႃးလႅၼ်ႇ</territory>
+			<territory type="AZ">ဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</territory>
+			<territory type="BA">ပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး</territory>
+			<territory type="BB">ပႃးပေႇတူတ်ႈ</territory>
+			<territory type="BD">ပင်းၵလႃးတဵတ်ႈ</territory>
+			<territory type="BE">ပႄႇၵျီႇယမ်ႇ</territory>
+			<territory type="BF">ပူႇၵီႇၼႃးၾႃးသူဝ်ႇ</territory>
+			<territory type="BG">ပူႇၵႃႇရီႇယႃႇ</territory>
+			<territory type="BH">ပႃႇရဵၼ်း</territory>
+			<territory type="BI">ပူႇရုၼ်းတီႇ</territory>
+			<territory type="BJ">ပႄႇၼိၼ်း</territory>
+			<territory type="BL">သဵင်ႉပႃႇထႄးလႄႇမီႇ</territory>
+			<territory type="BM">ပႃႇမိဝ်းတႃး</territory>
+			<territory type="BN">ပရူႇၼၢႆး</territory>
+			<territory type="BO">ပူဝ်ႇလီးပီးယႃး</territory>
+			<territory type="BQ">ၼႄႇတႃႇလႅၼ်ႇ တီႈ ၶႃႇရိပ်ႈပီႇယၼ်ႇ</territory>
+			<territory type="BR">ပရႃႇၸီး</territory>
+			<territory type="BS">ပႃႇႁႃးမႃး</territory>
+			<territory type="BT">ၽူႇတၢၼ်ႇ</territory>
+			<territory type="BV">မူႇၵုၼ် ပူးဝႅတ်ႉ</territory>
+			<territory type="BW">ပွတ်ႉသဝႃႇၼႃႇ</territory>
+			<territory type="BY">ပႄႇလႃႇရုတ်ႈ</territory>
+			<territory type="BZ">ပႄႇလိတ်ႈ</territory>
+			<territory type="CA">ၶႅၼ်ႇၼေႇတႃႇ</territory>
+			<territory type="CC">မူႇၵုၼ် ၶူဝ်းၵတ်ႉ (ၶီးလိင်း)</territory>
+			<territory type="CD">ၶွင်ႇၵူဝ်ႇ - ၶိၼ်သျႃးသႃႇ</territory>
+			<territory type="CD" alt="variant">ၶွင်ႇၵူဝ်ႇ (DRC)</territory>
+			<territory type="CF">မိူင်းႁူမ်ႈပွင်လူၺ်ႈၵူၼ်းလၢႆ ဢႃႇၾရိၵ ပွတ်းၵၢင်</territory>
+			<territory type="CG">ၶွင်ႇၵူဝ်ႇ - ပရႃၸဝီးလ်</territory>
+			<territory type="CG" alt="variant">ၶွင်ႇၵူဝ်ႇ (မိူင်းႁူမ်ႈပွင်လူၺ်ႈၵူၼ်းလၢႆ)</territory>
+			<territory type="CH">သဝိတ်ႈၸႃႇလႅၼ်ႇ</territory>
+			<territory type="CI">ဢၢႆႇဝူဝ်ႇရီႇၶူတ်ႈ</territory>
+			<territory type="CK">မူႇၵုၼ် ၶုၵ်ႈ</territory>
+			<territory type="CL">ၶျီႇလီႇ</territory>
+			<territory type="CM">ၶႅမ်းမႃးရုၼ်း</territory>
+			<territory type="CN">ၶႄႇ</territory>
+			<territory type="CO">ၵူဝ်ႇလမ်ႇပီႇယႃႇ</territory>
+			<territory type="CP">ၵုၼ်ၶလိပ်ႉပႃႇတၼ်ႇ</territory>
+			<territory type="CQ">သၢၵ်ႉၶ်</territory>
+			<territory type="CR">ၵေႃးသတႃႇရိၵႃႇ</territory>
+			<territory type="CU">ၵူးပႃး</territory>
+			<territory type="CV">ၶဵပ်ႉဝႄႇတီႇ</territory>
+			<territory type="CW">ၵူးရႃႇသၢဝ်ႇ</territory>
+			<territory type="CX">ၵုၼ်ၶရိတ်ႉသမၢတ်ႉ</territory>
+			<territory type="CY">သၢႆႉပရႅတ်ႈ</territory>
+			<territory type="CZ">ၶျႅၵ်ႈ</territory>
+			<territory type="CZ" alt="variant">မိူင်းၸွမ်ပွင်ၸိုင်ႈ ၶျႅၵ်ႈ</territory>
+			<territory type="DE">ၵျႃႇမၼီႇ</territory>
+			<territory type="DG">တီႇယေးၵူဝ်း ၵရႃႇသီးယႃး</territory>
+			<territory type="DJ">ၵျီႇပူးတီႇ</territory>
+			<territory type="DK">တႅၼ်းမၢၵ်ႈ</territory>
+			<territory type="DM">တူဝ်ႇမီႇၼိၵ</territory>
+			<territory type="DO">တူဝ်ႇမီႇၼီႇၵၼ်ႇ</territory>
+			<territory type="DZ">ဢႄးၵျီးရီးယႃး</territory>
+			<territory type="EA">သူးတ လႄႈ မႄႇလီႇလႃႇ</territory>
+			<territory type="EC">ဢေႇၵႂႃႇတေႃႇ</territory>
+			<territory type="EE">ဢႄႇသတူဝ်းၼီးယႃး</territory>
+			<territory type="EG">ဢီးၵျိပ်ႈ</territory>
+			<territory type="EH">သႃႇႁႃႇရႃႇ ပွတ်းတူၵ်း</territory>
+			<territory type="ER">ဢႄႇရီႇထရီးယႃး</territory>
+			<territory type="ES">သပဵၼ်ႇ</territory>
+			<territory type="ET">ဢီႇတီႇယူဝ်းပီးယႃး</territory>
+			<territory type="EU">ၸုမ်းၽွမ်ႉႁူမ်ႈ ယူးရူပ်ႉ</territory>
+			<territory type="EZ">ၸူၼ်ႇယူးရူပ်ႉ</territory>
+			<territory type="FI">ၾိၼ်ႇလႅၼ်ႇ</territory>
+			<territory type="FJ">ၾီႇၵျီႇ</territory>
+			<territory type="FK">မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ</territory>
+			<territory type="FK" alt="variant">မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ (ဢၢႆးသလတ်ႉသ် မႄႇလ်ဝီးၼတ်ႉသ်)</territory>
+			<territory type="FM">ၼႃႈလိၼ် မၢႆႇၶရူဝ်ႇၼေးသျၼ်း</territory>
+			<territory type="FO">မူႇၵုၼ် ၾႄးရူဝ်း</territory>
+			<territory type="FR">ၾရၢင်ႇသဵတ်ႈ</territory>
+			<territory type="GA">ၵႄးပုၼ်ႇ</territory>
+			<territory type="GB">မိူင်းႁူမ်ႈတုမ်ႁေႃၶမ်း ပရိတ်ႈတဵၼ်ႇ</territory>
+			<territory type="GB" alt="short">ယူႇၶေႇ</territory>
+			<territory type="GD">ၵရႄႇၼႃႇတႃႇ</territory>
+			<territory type="GE">ၵျေႃႇၵျႃႇ</territory>
+			<territory type="GF">ၵုၺ်ႇယႃႇၼႃႇ ၶွင် ၾရၢင်ႇသဵတ်ႈ</territory>
+			<territory type="GG">ၵႂၢၼ်းသီ</territory>
+			<territory type="GH">ၵႃႇၼႃႇ</territory>
+			<territory type="GI">ၵျီႇပရေႃးတႃး</territory>
+			<territory type="GL">ၵရိၼ်းလႅၼ်း</territory>
+			<territory type="GM">ၵမ်ႇပီးယႃး</territory>
+			<territory type="GN">ၵီးၼီး</territory>
+			<territory type="GP">ၵႂႃးတီႇလုပ်ႈ</territory>
+			<territory type="GQ">ဢီႇၵူၺ်ႇတေႃႇရီႇယႃႇ ၵီးၼီး</territory>
+			<territory type="GR">ၵရိတ်ႈ</territory>
+			<territory type="GS">ၵျေႃႇၵျႃႇ ပွတ်းၸၢၼ်း လႄႈ မူႇၵုၼ် သၢၼ်းဝိတ်ႉ ပွတ်းၸၢတ်း</territory>
+			<territory type="GT">ၵႂႃႇတမႃႇလႃႇ</territory>
+			<territory type="GU">ၵႂၢမ်ႇ</territory>
+			<territory type="GW">ၵီးၼီး-ပိတ်ႈသၢဝ်ႇ</territory>
+			<territory type="GY">ၵၢႆႇယႃးၼႃႇ</territory>
+			<territory type="HK">ႁွင်းၵွင်း ၼႃႈလိၵ်ႈဢုပ်ႉပိူင်ႇၶိုၵ်ႉတွၼ်း ၶႄႇ</territory>
+			<territory type="HK" alt="short">ႁွင်းၵွင်း</territory>
+			<territory type="HM">မူႇၵုၼ် ႁိူတ်ႉ လႄႈ မူႇၵုၼ် မႅၵ်ႇတေႃႇၼႄႇ</territory>
+			<territory type="HN">ႁွၼ်ႇတူးရႅတ်ႈ</territory>
+			<territory type="HR">ၶရူဝ်ႇဢေးသျႃး</territory>
+			<territory type="HT">ႁေးတီႇ</territory>
+			<territory type="HU">ႁၢင်ႇၵေႇရီႇ</territory>
+			<territory type="IC">မူႇၵုၼ် ၶႅၼ်ႇၼရီႇ</territory>
+			<territory type="ID">ဢိၼ်ႇတူဝ်ႇၼီးသျႃး</territory>
+			<territory type="IE">ဢၢႆႇယႃႇလႅၼ်ႇ</territory>
+			<territory type="IL">ဢိတ်ႇသရေး</territory>
+			<territory type="IM">ၵုၼ်မႅၼ်း</territory>
+			<territory type="IN">ဢိၼ်းတီးယႃး</territory>
+			<territory type="IO">ၼႃႈလိၼ် သမုၵ်ႉတရႃႇဢိၼ်းတီးယႃး ၶွင် ဢိင်းၵလဵတ်ႈ</territory>
+			<territory type="IO" alt="chagos">မူႇၵုၼ်ၶျႃးၵူဝ်ႉသ်</territory>
+			<territory type="IQ">ဢီႇရၢၵ်ႈ</territory>
+			<territory type="IR">ဢီႇရၢၼ်း</territory>
+			<territory type="IS">ဢၢႆးသလႅၼ်ႇ</territory>
+			<territory type="IT">ဢီႇတႃႇလီႇ</territory>
+			<territory type="JE">ၵျႃႇသီႇ</territory>
+			<territory type="JM">ၵျႃႇမေႇၵႃႇ</territory>
+			<territory type="JO">ၵျေႃႇတၼ်ႇ</territory>
+			<territory type="JP">ၵျႃႇပၢၼ်ႇ</territory>
+			<territory type="KE">ၶႅၼ်ႇၺႃႇ</territory>
+			<territory type="KG">ၵႃႇၵိတ်ႈသတၼ်ႇ</territory>
+			<territory type="KH">ၵမ်ႇပေႃးတီးယႃး</territory>
+			<territory type="KI">ၵိရိပတီႇ</territory>
+			<territory type="KM">ၶူဝ်ႇမူဝ်ႇရူတ်ႈ</territory>
+			<territory type="KN">သဵင်ႉၶိတ်ႈ လႄႈ ၼႄးဝိတ်ႈ</territory>
+			<territory type="KP">ၵၢဝ်းလီႁွင်ႇ</territory>
+			<territory type="KR">ၵၢဝ်းလီၸၢၼ်း</territory>
+			<territory type="KW">ၶူႇဝဵတ်ႈ</territory>
+			<territory type="KY">မူႇၵုၼ် ၶေးမႅၼ်း</territory>
+			<territory type="KZ">ၵႃႇၸၢၵ်ႈသတၼ်ႇ</territory>
+			<territory type="LA">လၢဝ်း</territory>
+			<territory type="LB">လႄႇပႃႇၼွၼ်ႇ</territory>
+			<territory type="LC">သဵင်ႉလူႉသျႃႇ</territory>
+			<territory type="LI">လိၵ်ႈတိၼ်ႇသတၢႆႇ</territory>
+			<territory type="LK">သီႇရိလင်းၵႃ</territory>
+			<territory type="LR">လၢႆႇပေးရီးယႃး</territory>
+			<territory type="LS">လႄႇသူဝ်းတူဝ်ႇ</territory>
+			<territory type="LT">လီႉတူႇဝေးၼီးယႃး</territory>
+			<territory type="LU">လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</territory>
+			<territory type="LV">လၢတ်ႈဝီႇယႃႇ</territory>
+			<territory type="LY">လိပ်ႉပျႃး</territory>
+			<territory type="MA">မေႃႇရူဝ်ႇၵူဝ်ႇ</territory>
+			<territory type="MC">မူဝ်ႇၼႃႉၶူဝ်ႇ</territory>
+			<territory type="MD">မေႃႇတူဝ်းဝႃး</territory>
+			<territory type="ME">မွၼ်ႇတေႇၼေးၵရူဝ်ႇ</territory>
+			<territory type="MF">သဵင်ႉမႃႇတိၼ်</territory>
+			<territory type="MG">မၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ</territory>
+			<territory type="MH">မူႇၵုၼ် မႃးသျႄႇ</territory>
+			<territory type="MK">မႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ</territory>
+			<territory type="ML">မႃႇလီႇ</territory>
+			<territory type="MM">မျၢၼ်ႇမႃႇ (မိူင်းမၢၼ်ႈ)</territory>
+			<territory type="MN">မူင်ႇၵူဝ်းလီးယႃး</territory>
+			<territory type="MO">မႃႇၵၢဝ်ႈ ၼႃႈလိၼ်ဢုပ်ႉပိူင်ႇၶိုၵ်ႉတွၼ်း ၶႄႇ</territory>
+			<territory type="MO" alt="short">မႃႇၵၢဝ်ႈ</territory>
+			<territory type="MP">မူႇၵုၼ် မေႇရီႇယႃႇၼႃႇ ပွတ်းႁွင်ႇ</territory>
+			<territory type="MQ">မႃးတိၼ်ႇၼိၵ်ႈ</territory>
+			<territory type="MR">မေႃႇရီႇတေးၼီးယႃး</territory>
+			<territory type="MS">မွၼ်းသိူဝ်းရၢတ်ႈ</territory>
+			<territory type="MT">မေႃးတႃႇ</territory>
+			<territory type="MU">မေႃးရီႇသႃႇ</territory>
+			<territory type="MV">မေႃႇတိပ်ႈ</territory>
+			<territory type="MW">မႃႇလႃႇဝီႇ</territory>
+			<territory type="MX">မႅၵ်ႇသီႇၵူဝ်ႇ</territory>
+			<territory type="MY">မလေးသျႃး</territory>
+			<territory type="MZ">မူဝ်ႇၸမ်းပိၵ်ႈ</territory>
+			<territory type="NA">ၼႃႇမီးပီးယႃး</territory>
+			<territory type="NC">ၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး</territory>
+			<territory type="NE">ၼၢႆးၵျႃး</territory>
+			<territory type="NF">ၵုၼ်ၼေႃႇၾုၵ်ႉ</territory>
+			<territory type="NG">ၼၢႆႇၵျီးရီးယႃး</territory>
+			<territory type="NI">ၼီႇၵႃႇရႃႇၵႂႃႇ</territory>
+			<territory type="NL">ၼႄႇတႃႇလႅၼ်ႇ</territory>
+			<territory type="NO">ၼေႃႇဝူၺ်း</territory>
+			<territory type="NP">ၼေႇပေႃး</territory>
+			<territory type="NR">ၼၢဝ်ရူး</territory>
+			<territory type="NU">ၼီးဝႄႇ</territory>
+			<territory type="NZ">ၼိဝ်းၸီႇလႅၼ်ႇ</territory>
+			<territory type="NZ" alt="variant">ဢဝ်တႄးရူဝ်း ၼိဝ်းၸီႇလႅၼ်ႇ</territory>
+			<territory type="OM">ဢူဝ်ႇမၢၼ်ႇ</territory>
+			<territory type="PA">ပႃႈၼႃးမႃး</territory>
+			<territory type="PE">ပေႇရူႉ</territory>
+			<territory type="PF">ပေႃႇလီႇၼေးသျႃး ၶွင် ၾရၢင်ႇသဵတ်ႈ</territory>
+			<territory type="PG">ပႃးပႂႃႇၼိဝ်းၵီးၼီး</territory>
+			<territory type="PH">ၾီလိပ်ႈပိၼ်း</territory>
+			<territory type="PK">ပႃႇၵိတ်ႈသတၼ်ႇ</territory>
+			<territory type="PL">ပူဝ်ႇလႅၼ်ႇ</territory>
+			<territory type="PM">သဵင်ႉပီးယႃး လႄႈ မိၵ်ႈၵွႆႇလွၼ်ႇ</territory>
+			<territory type="PN">မူႇၵုၼ် ၽိတ်ႉၶႅၼ်ႇ</territory>
+			<territory type="PR">ပေႃႇတူဝ်ႇရီးၵူဝ်း</territory>
+			<territory type="PS">ၼႃႈလိၼ် ပႃႇလႅတ်ႇသတိၼ်းၼီးယႅၼ်း</territory>
+			<territory type="PS" alt="short">ပႃးလဵတ်ႈသတၢႆး</territory>
+			<territory type="PT">ပေႃးတူႉၵၢဝ်ႇ</territory>
+			<territory type="PW">ပႃႇလၢဝ်း</territory>
+			<territory type="PY">ပႃႇရႃႇၵူၺ်း</territory>
+			<territory type="QA">ၶႃႇတႃႇ</territory>
+			<territory type="QO">ဢွၵ်ႉလၢႆးယိၼ်း ဢူဝ်းသီးၼီးယႃး</territory>
+			<territory type="RE">ရေႇၼီႇယၼ်ႇ</territory>
+			<territory type="RO">ရူဝ်ႇမေးၼီးယႃး</territory>
+			<territory type="RS">သႃးပီးယႃး</territory>
+			<territory type="RU">ရတ်ႈသျႃး</territory>
+			<territory type="RW">ရဝၢၼ်းတႃႇ</territory>
+			<territory type="SA">သေႃႇတီႇဢႃႇရေးပီးယႃး</territory>
+			<territory type="SB">မူႇၵုၼ် သေႃႇလေႃႇမၼ်ႇ</territory>
+			<territory type="SC">သေးသျႄႇ</territory>
+			<territory type="SD">သူႇတၼ်ႇ</territory>
+			<territory type="SE">သုၺ်ႇတိၼ်ႇ</territory>
+			<territory type="SG">သိင်ႇၵႃႇပူဝ်ႇ</territory>
+			<territory type="SH">သဵင်ႉႁႄးလႄးၼႃႇ</territory>
+			<territory type="SI">သလူဝ်ႇဝေးၼီးယႃး</territory>
+			<territory type="SJ">သဝႃးလ်ပၢတ်ႇ လႄႈ ၸၼ်မၢႆးယႅၼ်ႇ</territory>
+			<territory type="SK">သလူဝ်ႇဝႃးၵီးယႃး</territory>
+			<territory type="SL">သီႇဢႄႇရႃႇလီႇယူၼ်ႇ</territory>
+			<territory type="SM">သၼ်းမႃႇရီႇၼေႃႇ</territory>
+			<territory type="SN">သီႇၼီႇၵႃႇ</territory>
+			<territory type="SO">သူဝ်ႇမႃႇလီႇယႃး</territory>
+			<territory type="SR">သျူးရီးၼႃႇမႄႇ</territory>
+			<territory type="SS">သူႇတၼ်ႇၸၢၼ်း</territory>
+			<territory type="ST">သူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ</territory>
+			<territory type="SV">ဢႄႇသႃႇဝႃႇတေႃႇ</territory>
+			<territory type="SX">သိၼ်ႉမႃႇတိၼ်ႇ</territory>
+			<territory type="SY">သီးရီးယႃး</territory>
+			<territory type="SZ">ဢႅတ်ႇသ်ဝႃႇတီးၼီႇ</territory>
+			<territory type="SZ" alt="variant">သႂႃႇၸီႇလႅၼ်ႇ</territory>
+			<territory type="TA">ထရီႇသၼ်ႇ တႃႇ ၶုၼ်းၺႃႇ</territory>
+			<territory type="TC">မူႇၵုၼ် ထၢၵ်ႈ လႄႈ ၶေးၶတ်ႉ</territory>
+			<territory type="TD">ၶျၢတ်ႈ</territory>
+			<territory type="TF">ၼႃႈလိၼ် ၾရၢင်ႇသဵတ်ႈ ပွတ်းၸၢၼ်း</territory>
+			<territory type="TG">ထူဝ်းၵူဝ်ႇ</territory>
+			<territory type="TH">မိူင်းထႆး</territory>
+			<territory type="TJ">တႃႇၵျီႇၵီႇသတၼ်ႇ</territory>
+			<territory type="TK">ထူဝ်းၵေႇလၢဝ်ႇ</territory>
+			<territory type="TL">တီႇမေႃး-လႅတ်ႉသ်တႄး</territory>
+			<territory type="TL" alt="variant">တီႇမေႃးပွတ်းဢွၵ်ႇ</territory>
+			<territory type="TM">တၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ</territory>
+			<territory type="TN">တူႇၼီးသျႃး</territory>
+			<territory type="TO">ထွင်းၵႃႇ</territory>
+			<territory type="TR">တိူဝ်ႇၵီႇ</territory>
+			<territory type="TT">ထရီႇၼီႇတၢတ်ႈ လႄႈ ထူဝ်ႇပေးၵူဝ်ႇ</territory>
+			<territory type="TV">ထူးဝႃႇလူႇ</territory>
+			<territory type="TW">ထၢႆႇဝၢၼ်း</territory>
+			<territory type="TZ">ထၼ်ႇၸၼ်းၼီးယႃး</territory>
+			<territory type="UA">ယူႇၶရဵၼ်း</territory>
+			<territory type="UG">ယူႇၵၼ်ႇတႃႇ</territory>
+			<territory type="UM">မူႇၵုၼ်ဢွၼ်ႇ ဢၼ်မီးၽၢႆႇၼွၵ်ႈ ယူႇဢႅတ်ႉသ်</territory>
+			<territory type="UN">ၸၢတ်ႈၸိုင်ႈလုမ်ႈၾႃႉ</territory>
+			<territory type="US">မိူင်းႁူမ်ႈတုမ် ဢမႄႇရိၵ</territory>
+			<territory type="US" alt="short">ယူႇဢႅတ်ႉသ်</territory>
+			<territory type="UY">ဢုရုၵူၺ်း</territory>
+			<territory type="UZ">ဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ</territory>
+			<territory type="VA">ဝႃႇတီႇၵၼ်ႇသီးတီး</territory>
+			<territory type="VC">သဵင်ႉဝိၼ်းသႅၼ်ႉ လႄႈ ၵရႄးၼႃးတိၼ်း</territory>
+			<territory type="VE">ဝႄႇၼေႇၸွႆးလႃး</territory>
+			<territory type="VG">မူႇၵုၼ် ဝႃႇၵျိၼ်ႇ ၶွင် ဢိင်းၵလဵတ်ႈ</territory>
+			<territory type="VI">မူႇၵုၼ် ဝႃႇၵျိၼ်ႇ ၶွင် ယူႇဢႅတ်ႉသ်</territory>
+			<territory type="VN">ဝႅတ်ႉၼမ်း</territory>
+			<territory type="VU">ဝႅၼ်ႇၼူးဝႃႇထူႇ</territory>
+			<territory type="WF">ဝႃးလိတ်ႈ လႄႈ ၾူႇတူးၼႃး</territory>
+			<territory type="WS">သႃႇမူဝ်းဝႃႇ</territory>
+			<territory type="XA">သူႇတူဝ်ႇ-ဢႅၵ်ႉသႅၼ်ႉ</territory>
+			<territory type="XB">သူႇတူဝ်ႇ-ပီးတီႇ</territory>
+			<territory type="XK">ၵူဝ်ႇသူဝ်ႇဝူဝ်ႇ</territory>
+			<territory type="YE">ယႄႇမႅၼ်ႇ</territory>
+			<territory type="YT">မႃႇယူတ်ႈ</territory>
+			<territory type="ZA">ဢႃႇၾရိၵၸၢၼ်း</territory>
+			<territory type="ZM">ၸမ်းပီးယႃး</territory>
+			<territory type="ZW">ၸိမ်ႇပႃႇပူၺ်ႇ</territory>
+			<territory type="ZZ">ၼႃႈလိၼ် ဢမ်ႇႁူႉၸၵ်း</territory>
 		</territories>
+		<variants>
+			<variant type="1901">လၢႆးတႅမ်ႈလိၵ်ႈၾိင်ႈထုင်းၵျႃႇမၼ်ႇ</variant>
+			<variant type="1994">လိၵ်ႈလၢႆး ရီႇသျႅၼ်ႇ ဢၼ်မီးပိူင်တၢႆ</variant>
+			<variant type="1996">လိၵ်ႈၵျႃႇမၼ်ႇ မိူဝ်ႈပီ 1996</variant>
+			<variant type="1606NICT">ဝၢႆးလင် ၾရၢင်ႇသဵတ်ႈ ပွတ်းၵၢင် တေႃႇထိုင် 1606</variant>
+			<variant type="1694ACAD">ၾရၢင်ႇသဵတ်ႈပၢၼ်မႂ်ႇမိူဝ်ႈၸဝ်ႉ</variant>
+			<variant type="1959ACAD">ပၢႆးပၺ်ႇၺႃႇ</variant>
+			<variant type="ABL1943">ပိူင်ၽွတ်ႇၶွတ်ႈ လွင်ႈတႅမ်ႈလိၵ်ႈ မိူဝ်ႈပီ 1943</variant>
+			<variant type="ALALC97">ALA-LC လွင်ႈႁဵတ်းႁႂ်ႈပဵၼ် ရူဝ်ႇမႅၼ်ႇ မိူဝ်ႈပီ 1997</variant>
+			<variant type="ALUKU">ၵႂၢမ်းလၢတ်ႈဢႃႇလူႇၵူႇ</variant>
+			<variant type="AO1990">လိၵ်ႈႁူမ်ႈမၢႆ ၽႃႇသႃႇၵႂၢမ်းလၢတ်ႈ ပေႃးတူႉၵၢဝ်ႇ မိူဝ်ႈပီ 1990</variant>
+			<variant type="BAKU1926">တူဝ်မႄႈလိၵ်ႈလတိၼ်ႇ တိူဝ်ႇၵီႇၽွမ်ႉႁူမ်ႈ</variant>
+			<variant type="BALANKA">ၵႂၢမ်းလၢတ်ႈ ပႃႇလၼ်ၵႃ ဢၼီႇ</variant>
+			<variant type="BARLA">ၸုမ်းၵႂၢမ်းလၢတ်ႈ ပႃႇလႃႇဝႅၼ်ႇတူဝ်ႇ ၶွင် ၵႃႇပူဝ်ႇဝႃႇတီႇဢႃႇၼူႇ</variant>
+			<variant type="BISKE">ၵႂၢမ်းလၢတ်ႈ ၵျူဝ်းၵျီဢူဝ်/ပီႇလႃႇ</variant>
+			<variant type="BOHORIC">တူဝ်မႄႈလိၵ်ႈ ပူဝ်ႁူဝ်ရိၵ်ႉ</variant>
+			<variant type="BOONT">ပူၼ်းတလိၼ်ႇ</variant>
+			<variant type="COLB1945">ပၢင်ၵုမ်လူင် ၵၢၼ်တႅမ်ႈလိၵ်ႈ ၽႃႇသႃႇပေႃးတူႉၵၢဝ်ႇ-ပရႃႇၸီး မိူဝ်ႈပီ 1945</variant>
+			<variant type="DAJNKO">တူဝ်မႄႈလိၵ်ႈ တၢၼ်ၵူဝ်</variant>
+			<variant type="EKAVSK">သႃးပီးယႅၼ်း ဢၼ်မီးသဵင်ဢွၵ်ႇ ဢီႇၵႃႇဝီႇယႅၼ်ႇ</variant>
+			<variant type="EMODENG">ဢိင်းၵလဵတ်ႈပၢၼ်မႂ်ႇမိူဝ်ႈၸဝ်ႉ</variant>
+			<variant type="FONIPA">ပၢႆးသဵင် IPA</variant>
+			<variant type="FONUPA">ပၢႆးသဵင် UPA</variant>
+			<variant type="HEPBURN">ႁႅပ်ႉပၢၼ်ႇ ႁဵတ်းႁႂ်ႈပဵၼ် ရူဝ်ႇမႅၼ်ႇ</variant>
+			<variant type="IJEKAVSK">သႃးပီးယႅၼ်း ဢၼ်မီးသဵင်ဢွၵ်ႇ ဢီႇၸႅၵ်ႉဝီႇယႅၼ်ႇ</variant>
+			<variant type="KKCOR">လၢႆးတႅမ်ႈလိၵ်ႈ ဢၼ်ၸႂ်ႉတိုဝ်းၼမ်</variant>
+			<variant type="KSCOR">လၵ်းၸဵင် လၢႆးတႅမ်ႈလိၵ်ႈ</variant>
+			<variant type="LIPAW">ၵႂၢမ်းလၢတ်ႈ လီႇပူဝ်ႇဝႃႇၸ် ၶွင် ရီႇသျႅၼ်ႇ</variant>
+			<variant type="METELKO">တူဝ်မႄႈလိၵ်ႈ မႅတ်ႉတႄႇလ်ၵူဝ်ႇ</variant>
+			<variant type="MONOTON">သဵင်လဵဝ်</variant>
+			<variant type="NDYUKA">ၵႂၢမ်းလၢတ်ႈ ဢိၼ်ႇတူးၵ</variant>
+			<variant type="NEDIS">ၵႂၢမ်းလၢတ်ႈ ၼႃတီသွၼ်</variant>
+			<variant type="NJIVA">ၵႂၢမ်းလၢတ်ႈ ၼိဝႃႇ/ၵျိဝႃႇ</variant>
+			<variant type="NULIK">ဝူဝ်ႇလႃႇပူၵ်ႉ ၵၢပ်ႈပၢၼ်မႂ်ႇ</variant>
+			<variant type="OSOJS">ၵႂၢမ်းလၢတ်ႈ ဢူဝ်ႇသီးယႃးၵူဝ်ႇ/ဢူဝ်ႇသူဝ်ႇၸႅၼ်ႇ</variant>
+			<variant type="OXENDICT">လွင်ႈတႅမ်ႈလိၵ်ႈ ပပ်ႉပိုတ်ႇတႅတ်ႈ ဢိင်းၵလဵတ်ႈ ဢွၵ်ႉသ်ၾူတ်ႉ</variant>
+			<variant type="PAMAKA">ၵႂၢမ်းလၢတ်ႈပႃႇမၵ</variant>
+			<variant type="PINYIN">ပိၼ်းယိၼ်း ရူဝ်ႇမႅၼ်ႇ</variant>
+			<variant type="POLYTON">ပူဝ်ႇလီတွၼ်းၼိၵ်ႉ</variant>
+			<variant type="POSIX">ၶွမ်ႇပိဝ်ႇတႃႇ</variant>
+			<variant type="REVISED">လၢႆးတႅမ်ႈလိၵ်ႈဢၼ်ၶိုၼ်းမႄးထတ်းဝႆႉ</variant>
+			<variant type="RIGIK">ၶလၢတ်ႉသိၵ်ႉ ဝူဝ်ႇလႃႇပူၵ်ႉ</variant>
+			<variant type="ROZAJ">ရီႇသျႅၼ်ႇ</variant>
+			<variant type="SAAHO">သႃႇႁူဝ်ႇ</variant>
+			<variant type="SCOTLAND">ၽႃႇသႃႇဢိင်းၵလဵတ်ႈ ပိူင်သၵွတ်ႉ</variant>
+			<variant type="SCOUSE">သၵၢဝ်ႉ</variant>
+			<variant type="SOLBA">ၵႂၢမ်းလၢတ်ႈ သတူဝ်းလ်ဝီႇၸႃႇ/သူဝ်ႇလ်ပီႇၵႃႇ</variant>
+			<variant type="SOTAV">ၸုမ်းၵႂၢမ်းလၢတ်ႈ သူဝ်ႇတႃႇဝႅၼ်ႇတူဝ်ႇ ၶွင် ၵႃႇပူႇဝႃႇတီႇဢႃၼူႇ</variant>
+			<variant type="TARASK">လိၵ်ႈလၢႆး တႃရႃသၵီးဝီႇၵႃႇ</variant>
+			<variant type="UCCOR">လၢႆးတႅမ်ႈလိၵ်ႈၽွမ်ႉႁူမ်ႈ</variant>
+			<variant type="UCRCOR">လၢႆးတႅမ်ႈလိၵ်ႈ ဢၼ်ၽွမ်ႉႁူမ်ႈၶိုၼ်းမႄးထတ်းဝႆႉ</variant>
+			<variant type="UNIFON">တူဝ်လိၵ်ႈယူႇၼီႇၾူၼ်းပၢႆးသဵင်</variant>
+			<variant type="VALENCIA">ဝႃလႅၼ်သီႇယႅၼ်ႇ</variant>
+			<variant type="WADEGILE">ဝဵတ်ႉ-ၵိဝ်းသ် ရူဝ်ႇမႅၼ်ႇ</variant>
+		</variants>
+		<keys>
+			<key type="calendar">ပၵ်းယဵမ်ႈဝၼ်း</key>
+			<key type="cf">ပိူင်ၽၢင်ငိုၼ်းတွင်း</key>
+			<key type="collation">ၸႅၵ်ႇၶပ်ႉ</key>
+			<key type="currency">ငိုၼ်းတွင်း</key>
+			<key type="em">လွင်ႈၼႄဢီႇမူဝ်းၵျိ</key>
+			<key type="hc">တူင်ႇဝူင်းယၢမ်းမူင်း (12 လႄႈ 24)</key>
+			<key type="lb">လွင်ႈၶဵင်ႈၶႅင် ၼႂ်းၵၢၼ်တတ်းထႅဝ်လိၵ်ႈ</key>
+			<key type="lw">လွင်ႈတတ်းထႅဝ်ၼႂ်းၶေႃႈၵႂၢမ်း</key>
+			<key type="ms">ပိူင်ၵၢၼ်တႅၵ်ႈ</key>
+			<key type="numbers">တူဝ်ၼပ်ႉ</key>
+			<key type="ss">တတ်းတူၼ်ႈထႅဝ်လိၵ်ႈဝၢႆးၵႂၢမ်းယေႃႈ</key>
+		</keys>
+		<types>
+			<type key="calendar" type="buddhist">ပၵ်းယဵမ်ႈဝၼ်း ၸၢဝ်းပုတ်ႉထ</type>
+			<type key="calendar" type="buddhist" scope="core">ၸၢဝ်းပုတ်ႉထ</type>
+			<type key="calendar" type="chinese">ပၵ်းယဵမ်ႈဝၼ်းၶႄႇ</type>
+			<type key="calendar" type="chinese" scope="core">ၶႄႇ</type>
+			<type key="calendar" type="coptic">ပၵ်းယဵမ်ႈဝၼ်း ၶွပ်ႉတိၵ်ႉ</type>
+			<type key="calendar" type="coptic" scope="core">ၶွပ်ႉတိၵ်ႉ</type>
+			<type key="calendar" type="dangi">ပၵ်းယဵမ်ႈဝၼ်း တႅင်းၵီႇ</type>
+			<type key="calendar" type="dangi" scope="core">တႅင်းၵီႇ</type>
+			<type key="calendar" type="ethiopic">ပၵ်းယဵမ်ႈဝၼ်း ဢီႇတီႇယူဝ်းပီးယႃး</type>
+			<type key="calendar" type="ethiopic" scope="core">ၸၢဝ်းဢီႇတီႇယူဝ်းပီးယႃး</type>
+			<type key="calendar" type="ethiopic-amete-alem">ပၵ်းယဵမ်ႈဝၼ်း ဢမိတ်ႉဢလႅမ်း ဢီႇတီႇယူဝ်းပီးယႃး</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ဢမိတ်ႉဢလႅမ်း ဢီႇတီႇယူဝ်းပီးယႃး</type>
+			<type key="calendar" type="gregorian">ပၵ်းယဵမ်ႈဝၼ်း ၵရႅၵ်ႉၵူဝ်ႇရီႇယၼ်ႇ</type>
+			<type key="calendar" type="gregorian" scope="core">ၵရႅၵ်ႉၵူဝ်ႇရီႇယၼ်ႇ</type>
+			<type key="calendar" type="hebrew">ပပ်ႉယဵမ်ႈဝၼ်း ႁီးပရူး</type>
+			<type key="calendar" type="hebrew" scope="core">ႁီးပရူး</type>
+			<type key="calendar" type="indian">ပၵ်းယဵမ်ႈဝၼ်းၸိူဝ်ႉၸၢတ်ႈဢိၼ်းတီးယႃး</type>
+			<type key="calendar" type="indian" scope="core">ၸိူဝ်ႉၸၢတ်ႈဢိၼ်းတီးယႃး</type>
+			<type key="calendar" type="islamic">ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ</type>
+			<type key="calendar" type="islamic" scope="core">ႁိၸရိ</type>
+			<type key="calendar" type="islamic-civil">ပပ်ႉယဵမ်ႈဝၼ်းႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ၵူၼ်းမိူင်း)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ၵူၼ်းမိူင်း)</type>
+			<type key="calendar" type="islamic-rgsa">ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ (သေႃႇတီႇဢႃႇရေးပီးယႃး၊ လွင်ႈႁၼ်)</type>
+			<type key="calendar" type="islamic-tbla">ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ပၢႆးလႅင်လၢဝ်)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">ႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ပၢႆးလႅင်လၢဝ်)</type>
+			<type key="calendar" type="islamic-umalqura">ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ (ဢုမ်ဢႄလ်ၵူးရႃႇ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ႁိၸရိ (ဢုမ်ဢႄလ်ၵူးရႃႇ)</type>
+			<type key="calendar" type="iso8601">ပၵ်းယဵမ်ႈဝၼ်း ၵရႅၵ်ႉၵူဝ်ႇရီႇယၼ်ႇ (ပီဢွၼ်တၢင်းသုတ်း)</type>
+			<type key="calendar" type="japanese">ပၵ်းယဵမ်ႈဝၼ်းၵျႃႇပၢၼ်ႇ</type>
+			<type key="calendar" type="japanese" scope="core">ၸၢဝ်းၵျႃႇပၢၼ်ႇ</type>
+			<type key="calendar" type="persian">ပၵ်းယဵမ်ႈဝၼ်းပႃႇသျႃး</type>
+			<type key="calendar" type="persian" scope="core">ပႃႇသျႃး</type>
+			<type key="calendar" type="roc">ပၵ်းယဵမ်ႈဝၼ်းမိင်းၵူႈ</type>
+			<type key="calendar" type="roc" scope="core">မိင်းၵူႈ</type>
+			<type key="cf" type="account">ပိူင်ငိုၼ်း ၵၢၼ်ၼပ်ႉသွၼ်ႇ</type>
+			<type key="cf" type="account" scope="core">ၵၢၼ်ၼပ်ႉသွၼ်ႇ</type>
+			<type key="cf" type="standard">လၵ်းၸဵင် ပိူင်ၽၢင်ငိုၼ်းတွင်း</type>
+			<type key="cf" type="standard" scope="core">လၵ်းၸဵင်</type>
+			<type key="collation" type="compat">ၸႅၵ်ႇၶပ်ႉ ဢၼ်ပူၼ်ႉမႃး တႃႇႁႂ်ႈမၼ်း ၵိုင်ႇငၢမ်ႇၵၼ်</type>
+			<type key="collation" type="compat" scope="core">လွင်ႈငမ်ႇမႅၼ်ႈ</type>
+			<type key="collation" type="dictionary">ၸႅၵ်ႇၶပ်ႉ ပပ်ႉပိုတ်ႇတႅတ်ႈ</type>
+			<type key="collation" type="dictionary" scope="core">ပပ်ႉပိုတ်ႇတႅတ်ႈ</type>
+			<type key="collation" type="ducet">လၵ်းၸဵင် ၸႅၵ်ႇၶပ်ႉ ယူႇၼီႇၶူတ်ႉ</type>
+			<type key="collation" type="ducet" scope="core">လၵ်းၸဵင် ယူႇၼီႇၶူတ်ႉ</type>
+			<type key="collation" type="emoji">ၸႅၵ်ႇၶပ်ႉ ဢီႇမူဝ်းၵျိ</type>
+			<type key="collation" type="eor">ပိူင်ၶပ်ႉၸႅၼ်ႇမိူင်းယူးရူပ်ႉ</type>
+			<type key="collation" type="phonebook">ၸႅၵ်ႇၶပ်ႉပပ်ႉၽူၼ်း</type>
+			<type key="collation" type="phonebook" scope="core">ပပ်ႉၽူၼ်း</type>
+			<type key="collation" type="phonetic" scope="core">ပၢႆးသဵင်</type>
+			<type key="collation" type="pinyin">ၸႅၵ်ႇၶပ်ႉ ပိၼ်းယိၼ်း</type>
+			<type key="collation" type="pinyin" scope="core">ပိၼ်းယိၼ်း</type>
+			<type key="collation" type="search">ၵၢၼ်ၶူၼ်ႉႁႃ ဢၼ်ၸႂ်ႉတိုဝ်း ၵူႈလွင်ႈလွင်ႈ</type>
+			<type key="collation" type="search" scope="core">ၶူၼ်ႉႁႃ</type>
+			<type key="collation" type="searchjl">ၶူၼ်ႉႁႃၸွမ်း တူဝ်မႄႈလိၵ်ႈတႄႇ ႁင်းၵူးလ်</type>
+			<type key="collation" type="standard">ၸႅၵ်ႇၶပ်ႉလၵ်းၸဵင်</type>
+			<type key="collation" type="standard" scope="core">လၵ်းၸဵင်</type>
+			<type key="collation" type="stroke">ၸႅၵ်ႇၶပ်ႉ ႁွႆးမိုဝ်းၸၼ်</type>
+			<type key="collation" type="stroke" scope="core">ႁွႆးမိုဝ်းၸၼ်</type>
+			<type key="collation" type="traditional">ၸႅၵ်ႇၶပ်ႉၽိင်ႈထုင်း</type>
+			<type key="collation" type="traditional" scope="core">ၽိင်ႈထုင်း</type>
+			<type key="collation" type="unihan">ၸႅၵ်ႇၶပ်ႉ ႁွႆးမိုဝ်း-ငဝ်ႈပိုၼ်ႉ</type>
+			<type key="collation" type="unihan" scope="core">ႁွႆးမိုဝ်း-ငဝ်ႈပိုၼ်ႉ</type>
+			<type key="collation" type="zhuyin">ၸႅၵ်ႇၶပ်ႉ ၸူးယိၼ်း</type>
+			<type key="collation" type="zhuyin" scope="core">ၸူးယိၼ်း</type>
+			<type key="em" type="default" scope="core">ငဝ်ႈပိုင်း</type>
+			<type key="em" type="emoji" scope="core">ဢီႇမူဝ်းၵျိ</type>
+			<type key="em" type="text" scope="core">လိၵ်ႈ</type>
+			<type key="hc" type="h11">ပိူင်ယၢမ်းမူင်း 12 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
+			<type key="hc" type="h12">ပိူင်ယၢမ်းမူင်း 12 (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
+			<type key="hc" type="h23">ပိူင်ယၢမ်းမူင်း 24 (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
+			<type key="hc" type="h24">ပိူင်ယၢမ်းမူင်း 24 (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">လၢႆးတတ်းထႅဝ်လိၵ်ႈ ဝႆႉလူမ်</type>
+			<type key="lb" type="loose" scope="core">ဝႆႉလူမ်</type>
+			<type key="lb" type="normal">လၢႆးတတ်းထႅဝ်လိၵ်ႈ ပၵတိ</type>
+			<type key="lb" type="normal" scope="core">ပၵတိ</type>
+			<type key="lb" type="strict">လၢႆးတတ်းထႅဝ်လိၵ်ႈ ၶဵင်ႈၶႅင်</type>
+			<type key="lb" type="strict" scope="core">ၶဵင်ႈၶႅင်</type>
+			<type key="lw" type="breakall" scope="core">တတ်းမူတ်း</type>
+			<type key="lw" type="keepall" scope="core">ဝႆႉမူတ်း</type>
+			<type key="lw" type="normal" scope="core">ပၵတိ</type>
+			<type key="lw" type="phrase" scope="core">သိမ်းဝႆႉၼႂ်း ပွင်ႈလိၵ်ႈ</type>
+			<type key="ms" type="metric">ပိူင်မႅတ်ႉထရိတ်ႉ</type>
+			<type key="ms" type="metric" scope="core">မႅတ်ႉထရိတ်ႉ</type>
+			<type key="ms" type="uksystem">ပိူင်ၵၢၼ်တႅၵ်ႈ ဢိမ်ႇၽီးရီးယႄးလ်</type>
+			<type key="ms" type="uksystem" scope="core">ယူႇၶေႇ</type>
+			<type key="ms" type="ussystem">ပိူင်ၵၢၼ်တႅၵ်ႈ ယူႇဢႅတ်ႉသ်</type>
+			<type key="ms" type="ussystem" scope="core">ယူႇဢႅတ်ႉသ်</type>
+			<type key="numbers" type="ahom">တူဝ်ၼပ်ႉ ဢႃႇႁူမ်ႇ</type>
+			<type key="numbers" type="arab">တူဝ်ၼပ်ႉ ဢႃရပိၵ်ႉ-ဢိၼ်တိၵ်ႉ</type>
+			<type key="numbers" type="arabext">တူဝ်ၼပ်ႉ ဢႃရပိၵ်ႉ-ဢိၼ်တိၵ်ႉ ဢၼ်ၶႂၢၵ်ႈဝႆႉ</type>
+			<type key="numbers" type="armn">တူဝ်ၼပ်ႉ ဢႃႇမေးၼီးယႃး</type>
+			<type key="numbers" type="armnlow">တူဝ်ၼပ်ႉတူဝ်ဢွၼ်ႇ ဢႃႇမေးၼီးယႃး</type>
+			<type key="numbers" type="bali">တူဝ်ၼပ်ႉ ပႃႇလီႇ</type>
+			<type key="numbers" type="beng">တူဝ်ၼပ်ႉ ပင်းၵလႃး</type>
+			<type key="numbers" type="brah">တူဝ်ၼပ်ႉ ပရႃမီႇ</type>
+			<type key="numbers" type="cakm">တူဝ်ၼပ်ႉ ၶျႅၵ်ႉမႃး</type>
+			<type key="numbers" type="cham">တူဝ်ၼပ်ႉ ၶျႅမ်</type>
+			<type key="numbers" type="cyrl">တူဝ်ၼပ်ႉ သရီးရိၵ်ႉ</type>
+			<type key="numbers" type="deva">တူဝ်ၼပ်ႉ တႄဝၼႃးၵရီႇ</type>
+			<type key="numbers" type="diak">တူဝ်ၼပ်ႉ တၢႆႉၾ်ဢၵ်ႉၶူးလူႇ</type>
+			<type key="numbers" type="ethi">တူဝ်ၼပ်ႉ ဢီႇတီႇယူဝ်းပီးယႃး</type>
+			<type key="numbers" type="fullwide">တူဝ်ၼပ်ႉ တၢင်းၵႂၢင်ႈတဵမ်ထူၼ်ႈ</type>
+			<type key="numbers" type="gara">တူဝ်ၼပ်ႉ ၵႃႇရေး</type>
+			<type key="numbers" type="geor">တူဝ်ၼပ်ႉ ၵျေႃႇၵျႃႇ</type>
+			<type key="numbers" type="gong">တူဝ်ၼပ်ႉ ၵုၼ်ၵျႃလႃၵွၼ်းတီႇ</type>
+			<type key="numbers" type="gonm">တူဝ်ၼပ်ႉ မသႃရမ်ႇၵွၼ်းတီႇ</type>
+			<type key="numbers" type="grek">တူဝ်ၼပ်ႉ ၵရိတ်ႈ</type>
+			<type key="numbers" type="greklow">တူဝ်ၼပ်ႉတူဝ်ဢွၼ်ႇ ၵရိတ်ႈ</type>
+			<type key="numbers" type="gujr">တူဝ်ၼပ်ႉ ၵူးၵျရႃႇတီႇ</type>
+			<type key="numbers" type="gukh">တူဝ်ၼပ်ႉ ၵူႇရုင်ႇၶေႇမ</type>
+			<type key="numbers" type="guru">တူဝ်ၼပ်ႉ ၵူရမုၵ်ႉၶီႇ</type>
+			<type key="numbers" type="hanidec">တူဝ်ၼပ်ႉ ၸုတ်ႉၶႄႇ</type>
+			<type key="numbers" type="hans">တူဝ်ၼပ်ႉ ၶႄႇမႂ်ႇ</type>
+			<type key="numbers" type="hansfin">တူဝ်ၼပ်ႉ ၵၢၼ်ငိုၼ်းတွင်း ၶႄႇမႂ်ႇ</type>
+			<type key="numbers" type="hant">တူဝ်ၼပ်ႉ ၶႄႇၵဝ်ႇ</type>
+			<type key="numbers" type="hantfin">တူဝ်ၼပ်ႉ ၵၢၼ်ငိုၼ်းတွင်း ၶႄႇၵဝ်ႇ</type>
+			<type key="numbers" type="hebr">တူဝ်ၼပ်ႉ ႁီးပရူး</type>
+			<type key="numbers" type="hmng">တူဝ်ၼပ်ႉ ပႃႁႃမူင်း</type>
+			<type key="numbers" type="hmnp">တူဝ်ၼပ်ႉ ၺႃႇၵဵင်းပႂႃႈၶျူႈမူင်း</type>
+			<type key="numbers" type="java">တူဝ်ၼပ်ႉ ၵျႃႇဝႃး</type>
+			<type key="numbers" type="jpan">တူဝ်ၼပ်ႉ ၵျႃႇပၢၼ်ႇ</type>
+			<type key="numbers" type="jpanfin">တူဝ်ၼပ်ႉ ၵၢၼ်ငိုၼ်းတွင်း ၵျႃႇပၢၼ်ႇ</type>
+			<type key="numbers" type="kali">တူဝ်ၼပ်ႉ ၵယႃးလီ</type>
+			<type key="numbers" type="kawi">တူဝ်ၼပ်ႉ ၶႃးဝီ</type>
+			<type key="numbers" type="khmr">တူဝ်ၼပ်ႉ ၶမဵၼ်</type>
+			<type key="numbers" type="knda">တူဝ်ၼပ်ႉ ၶၼ်ၼႃးတႃႇ</type>
+			<type key="numbers" type="krai">တူဝ်ၼပ်ႉ ၵီႇရတ်ႉရၢႆး</type>
+			<type key="numbers" type="lana">တူဝ်ၼပ်ႉ တႆးထမ်း ႁူဝ်ႇရႃႇ</type>
+			<type key="numbers" type="lanatham">တူဝ်ၼပ်ႉ တႆးထမ်း</type>
+			<type key="numbers" type="laoo">တူဝ်ၼပ်ႉ လၢဝ်း</type>
+			<type key="numbers" type="latn">တူဝ်ၼပ်ႉမိူင်းဝၼ်းတူၵ်း</type>
+			<type key="numbers" type="lepc">တူဝ်ၼပ်ႉ လိပ်ႉၶျႃႇ</type>
+			<type key="numbers" type="limb">တူဝ်ၼပ်ႉ လိမ်ပူး</type>
+			<type key="numbers" type="mathbold">တူဝ်ၼပ်ႉ ပၢႆးၼပ်ႉ ဢၼ်ၼႃ</type>
+			<type key="numbers" type="mathdbl">တူဝ်ၼပ်ႉ ပၢႆးၼပ်ႉ ဢၼ်ပႃးသွင်ႁွႆး</type>
+			<type key="numbers" type="mathmono">တူဝ်ၼပ်ႉ ပၢႆးၼပ်ႉ မူဝ်ႇၼူဝ်ႇသပေႉသ်</type>
+			<type key="numbers" type="mathsanb">တူဝ်ၼပ်ႉ ပၢႆးၼပ်ႉ သႅၼ်းသႄႇရိပ်ႉ ဢၼ်ၼႃ</type>
+			<type key="numbers" type="mathsans">တူဝ်ၼပ်ႉ ပၢႆးၼပ်ႉ သႅၼ်းသႄႇရိပ်ႉ</type>
+			<type key="numbers" type="mlym">တူဝ်ၼပ်ႉ မလေးယႃးလမ်ႇ</type>
+			<type key="numbers" type="modi">တူဝ်ၼပ်ႉ မူဝ်ႇတီႇ</type>
+			<type key="numbers" type="mong">တူဝ်ၼပ်ႉ မူင်ႇၵူဝ်းလီးယႃး</type>
+			<type key="numbers" type="mroo">တူဝ်ၼပ်ႉ မရူဝ်ႇ</type>
+			<type key="numbers" type="mtei">တူဝ်ၼပ်ႉ မီး​တီးမယဵၵ်ႇၶ်</type>
+			<type key="numbers" type="mymr">တူဝ်ၼပ်ႉမၢၼ်ႈ</type>
+			<type key="numbers" type="mymrepka">တူဝ်ၼပ်ႉ ယၢင်းပူဝ်း မျၢၼ်ႇမႃႇ ပွတ်းဢွၵ်ႇ</type>
+			<type key="numbers" type="mymrpao">တူဝ်ၼပ်ႉ ပဢူဝ်း</type>
+			<type key="numbers" type="mymrshan">တူဝ်ၼပ်ႉတႆး</type>
+			<type key="numbers" type="mymrtlng">တူဝ်ၼပ်ႉ တႆးလႅင်</type>
+			<type key="numbers" type="nagm">တူဝ်ၼပ်ႉ ၼၢၵ်ႉမုၼ်ႇတရီႇ</type>
+			<type key="numbers" type="nkoo">တူဝ်ၼပ်ႉ ဢိၼ်းၶူဝ်း</type>
+			<type key="numbers" type="olck">တူဝ်ၼပ်ႉ ဢူဝ်းၶျိၶီ</type>
+			<type key="numbers" type="onao">တူဝ်ၼပ်ႉ ဢူဝ်ႇလ်ဢူဝ်ႇၼႃႇလ်</type>
+			<type key="numbers" type="orya">တူဝ်ၼပ်ႉ ဢူဝ်းတီးယႃႇ</type>
+			<type key="numbers" type="osma">တူဝ်ၼပ်ႉ ဢေႃသမႅၼ်းၺႃႇ</type>
+			<type key="numbers" type="outlined">တူဝ်ၼပ်ႉ ဢၢဝ်ႉလၢႆး</type>
+			<type key="numbers" type="rohg">တူဝ်ၼပ်ႉ ရူဝ်ႇႁိၼ်ႇၵျႃႇ ႁၼ်ၼီၾီး</type>
+			<type key="numbers" type="roman">တူဝ်ၼပ်ႉ ရူဝ်ႇမႅၼ်ႇ</type>
+			<type key="numbers" type="romanlow">တူဝ်ၼပ်ႉ တူဝ်ဢွၼ်ႇရူဝ်ႇမႅၼ်ႇ</type>
+			<type key="numbers" type="saur">တူဝ်ၼပ်ႉ သေႃရတ်ႉသ်ျထရႃႇ</type>
+			<type key="numbers" type="shrd">တူဝ်ၼပ်ႉ သျႃရႃးတႃႇ</type>
+			<type key="numbers" type="sind">တူဝ်ၼပ်ႉ ၶူးတဝႃႇတီႇ</type>
+			<type key="numbers" type="sinh">တူဝ်ၼပ်ႉ သိၼ်ႇႁႃႇလႃႇလိတ်ႉ</type>
+			<type key="numbers" type="sora">တူဝ်ၼပ်ႉ သူဝ်ႇရႃႇသူမ်ႈပႅင်း</type>
+			<type key="numbers" type="sund">တူဝ်ၼပ်ႉ သုၼ်တၼိတ်ႉ</type>
+			<type key="numbers" type="sunu">တူဝ်ၼပ်ႉ သုၼုဝႃႇ</type>
+			<type key="numbers" type="takr">တူဝ်ၼပ်ႉ တၵ်ႉၵရီႇ</type>
+			<type key="numbers" type="talu">တူဝ်ၼပ်ႉ တႆးလိုဝ်ႉ</type>
+			<type key="numbers" type="taml">တူဝ်ၼပ်ႉ တမီးလ်ၵဝ်ႇ</type>
+			<type key="numbers" type="tamldec">တူဝ်ၼပ်ႉ တမီးလ်</type>
+			<type key="numbers" type="telu">တူဝ်ၼပ်ႉ ထႄးလူႇၵူႇ</type>
+			<type key="numbers" type="thai">တူဝ်ၼပ်ႉ ထႆး</type>
+			<type key="numbers" type="tibt">တူဝ်ၼပ်ႉ တိပႅတ်ႉ</type>
+			<type key="numbers" type="tirh">တူဝ်ၼပ်ႉ တီႇႁူးတႃႇ</type>
+			<type key="numbers" type="tnsa">တူဝ်ၼပ်ႉ ထႅင်းသႃႇ</type>
+			<type key="numbers" type="tols">တူဝ်ၼပ်ႉ တူဝ်ႇလူင်သီႇၵီႇ</type>
+			<type key="numbers" type="vaii">တူဝ်ၼပ်ႉ ဝၢႆး</type>
+			<type key="numbers" type="wara">တူဝ်ၼပ်ႉ ဝႃႇရၢင်းသီႇတီႇ</type>
+			<type key="numbers" type="wcho">တူဝ်ၼပ်ႉ ဝၼ်ႉၶျၢဝ်</type>
+			<type key="ss" type="none" scope="core">ဢိုတ်း</type>
+			<type key="ss" type="standard" scope="core">ပိုတ်ႇ</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">မႅတ်ႉထရိတ်ႉ</measurementSystemName>
+			<measurementSystemName type="UK">ယူႇၶေႇ</measurementSystemName>
+			<measurementSystemName type="US">ယူႇဢႅတ်ႉသ်</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">ၽႃႇသႃႇ: {0}</codePattern>
+			<codePattern type="script">သၶရိပ်ႉ: {0}</codePattern>
+			<codePattern type="territory">တူင်ႇ: {0}</codePattern>
+		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters draft="contributed">[\u200Bး ႞ ႟ ၵ ၶ ၷ င ၸ ၺ ꧣ တ ထ ၻ ၼ ပ ၽ ၾ ၿ ꧤ မ ယ ျ ရ ြ လ ဝ ွ ႂ ႀ သ ႁ ဢ ႃ ိ ီ ု ူ ေ ႄ ꧥ ် ႇ ႈ ႉ ႊ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary" draft="contributed">[ꩡ ꩦ ꩧ ꩨ ꩩ ꩮ]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="contributed">[ၵ ၶ ၷ ꧠ င ၸ ꩡ ꧡ ꧢ ၺ ꩦ ꩧ ꩨ ꩩ တ ထ ၻ ၼ ပ ၽ ၾ ၿ ꧤ မ ယ ရ လ ဝ ႀ သ ႁ ꩮ ဢ]</exemplarCharacters>
-		<exemplarCharacters type="numbers" draft="contributed">[႐ ႑ ႒ ႓ ႔ ႕ ႖ ႗ ႘ ႙]</exemplarCharacters>
-		<exemplarCharacters type="punctuation" draft="contributed">[၊ ။ ‘’ “”]</exemplarCharacters>
+		<exemplarCharacters>[ံး ႞ ႟ ၵ ၶ ၷ ꧠ င ၸ ꩡ ၺ ꩦ ꩧ ꩨ ꩩ ꧣ တ ထ ၻ ꩪ ၼ ပ ၽ ၾ ၿ ꧤ မ ယ ျ ရ ြ လ ဝ ွ ႂ ႀ သ ႁ ꩮ ဢ ႃ ိ ီ ု ူ ေ ႄ ဵ ႅ ႆ ၢ ꧥ ် ႇ ႈ ႉ ႊ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[၀႐ ၁႑ ၂႒ ၃႓ ၄႔ ၅႕ ၆႖ ၇႗ ၈႘ ၉႙ ၚ ၐ ၑ ၥ ၒ ၓ ၔ ၕ ဨ ဳ ၖ ၗ ၘ ၙ ဴ]</exemplarCharacters>
+		<exemplarCharacters type="index">[႞ ႟ ၵ ၶ ၷ ꧠ င ၸ ꩡ ၺ ꧣ တ ထ ၻ ꩪ ၼ ပ ၽ ၾ ၿ မ ယ ရ လ ဝ ႀ သ ႁ ꩮ ဢ]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0၀႐ 1၁႑ 2၂႒ 3၃႓ 4၄႔ 5၅႕ 6၆႖ 7၇႗ 8၈႘ 9၉႙]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — … ၊ ။ ‘’ “” ( ) \[ \] \{ \} @ * / #]</exemplarCharacters>
 	</characters>
+	<dates>
+		<calendars>
+			<calendar type="buddhist">
+				<eras>
+					<eraNames>
+						<era type="0">ပီသႃႇသၼႃႇ</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ပ.သ.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ပ.သ.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="chinese">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>r(U) MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>r(U) MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>r MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>r-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">r MMM d - E</dateFormatItem>
+						<dateFormatItem id="GyMMMMEd">r(U) MMMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">r-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">r MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMEd">r(U) MMMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">U MMM d၊ E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">U MMM d၊ E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">U MMM d၊ E – U MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="coptic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ထွၵ်ႉ</month>
+							<month type="2">ပႃႇပႃႇ</month>
+							<month type="3">ႁတ်ႉထေႃး</month>
+							<month type="4">ၵိၶ်</month>
+							<month type="5">တူဝ်ႇပႃႇ</month>
+							<month type="6">ဢႅမ်းသႄးရ်</month>
+							<month type="7">ပရမ်ႇႁတ်ႉ</month>
+							<month type="8">ပႃႇရႃႇမူဝ်ႇတႃႇ</month>
+							<month type="9">ပႃႇသၢၼ်ႇ</month>
+							<month type="10">ပဝ်းၼႃး</month>
+							<month type="11">ဢႅပ်ႉပႅပ်ႉ</month>
+							<month type="12">မႅတ်ႉသရႃႇ</month>
+							<month type="13">ၼႃႇသီႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ထွၵ်ႉ</month>
+							<month type="2">ပႃႇပႃႇ</month>
+							<month type="3">ႁတ်ႉထေႃး</month>
+							<month type="4">ၵိၶ်</month>
+							<month type="5">တူဝ်ႇပႃႇ</month>
+							<month type="6">ဢႅမ်းသႄးရ်</month>
+							<month type="7">ပရမ်ႇႁတ်ႉ</month>
+							<month type="8">ပႃႇရႃႇမူဝ်ႇတႃႇ</month>
+							<month type="9">ပႃႇသၢၼ်ႇ</month>
+							<month type="10">ပဝ်းၼႃး</month>
+							<month type="11">ဢႅပ်ႉပႅပ်ႉ</month>
+							<month type="12">မႅတ်ႉသရႃႇ</month>
+							<month type="13">ၼႃႇသီႇ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ထွၵ်ႉ</month>
+							<month type="2">ပႃႇပႃႇ</month>
+							<month type="3">ႁတ်ႉထေႃး</month>
+							<month type="4">ၵိၶ်</month>
+							<month type="5">တူဝ်ႇပႃႇ</month>
+							<month type="6">ဢႅမ်းသႄးရ်</month>
+							<month type="7">ပရမ်ႇႁတ်ႉ</month>
+							<month type="8">ပႃႇရႃႇမူဝ်ႇတႃႇ</month>
+							<month type="9">ပႃႇသၢၼ်ႇ</month>
+							<month type="10">ပဝ်းၼႃး</month>
+							<month type="11">ဢႅပ်ႉပႅပ်ႉ</month>
+							<month type="12">မႅတ်ႉသရႃႇ</month>
+							<month type="13">ၼႃႇသီႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ထွၵ်ႉ</month>
+							<month type="2">ပႃႇပႃႇ</month>
+							<month type="3">ႁတ်ႉထေႃး</month>
+							<month type="4">ၵိၶ်</month>
+							<month type="5">တူဝ်ႇပႃႇ</month>
+							<month type="6">ဢႅမ်းသႄးရ်</month>
+							<month type="7">ပရမ်ႇႁတ်ႉ</month>
+							<month type="8">ပႃႇရႃႇမူဝ်ႇတႃႇ</month>
+							<month type="9">ပႃႇသၢၼ်ႇ</month>
+							<month type="10">ပဝ်းၼႃး</month>
+							<month type="11">ဢႅပ်ႉပႅပ်ႉ</month>
+							<month type="12">မႅတ်ႉသရႃႇ</month>
+							<month type="13">ၼႃႇသီႇ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyM">
+							<greatestDifference id="G">GGGGG y-MM – GGGGG y-MM</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd – GGGGG y-MM-dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HHမ v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="dangi">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">လိူၼ်ထူၼ်ႈၼိုင်ႈ</month>
+							<month type="2">လိူၼ်ထူၼ်ႈသွင်</month>
+							<month type="3">လိူၼ်ထူၼ်ႈသၢမ်</month>
+							<month type="4">လိူၼ်ထူၼ်ႈသီႇ</month>
+							<month type="5">လိူၼ်ထူၼ်ႈႁႃႈ</month>
+							<month type="6">လိူၼ်ထူၼ်ႈႁူၵ်း</month>
+							<month type="7">လိူၼ်ထူၼ်ႈၸဵတ်း</month>
+							<month type="8">လိူၼ်ထူၼ်ႈပႅတ်ႇ</month>
+							<month type="9">လိူၼ်ထူၼ်ႈၵဝ်ႈ</month>
+							<month type="10">လိူၼ်ထူၼ်ႈသိပ်း</month>
+							<month type="11">လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း</month>
+							<month type="12">လိူၼ်ထူၼ်ႈသိပ်းသွင်</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>r(U) MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>r(U) MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>r MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>r-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">r MMM d - E</dateFormatItem>
+						<dateFormatItem id="GyMMMMEd">r(U) MMMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">r-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">r MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMMEd">r(U) MMMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">U MMM d၊ E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">U MMM d၊ E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">U MMM d၊ E – U MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="ethiopic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">မႅတ်ႉသ်ရႅမ်ႇ</month>
+							<month type="2">တႅၵ်ႉၵမ်ႇ</month>
+							<month type="3">ႁႄႇတႃႇ</month>
+							<month type="4">တႃးသတ်ႉသ်</month>
+							<month type="5">တႄးလ်</month>
+							<month type="6">ယေႇၵတိတ်ႉ</month>
+							<month type="7">မႅၵ်ႇၵႃႇပိတ်ႉ</month>
+							<month type="8">မိယႃႇၸီႇယႃႇ</month>
+							<month type="9">ၵႅၼ်ႇပၢတ်ႉ</month>
+							<month type="10">သိၼ်း</month>
+							<month type="11">ႁႅမ်းလႄး</month>
+							<month type="12">ၼႁၢတ်ႉသ်</month>
+							<month type="13">ပႃႇၵူႇမႅၼ်ႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">မႅတ်ႉသ်ရႅမ်ႇ</month>
+							<month type="2">တႅၵ်ႉၵမ်ႇ</month>
+							<month type="3">ႁႄႇတႃႇ</month>
+							<month type="4">တႃးသတ်ႉသ်</month>
+							<month type="5">တႄးလ်</month>
+							<month type="6">ယေႇၵတိတ်ႉ</month>
+							<month type="7">မႅၵ်ႇၵႃႇပိတ်ႉ</month>
+							<month type="8">မိယႃႇၸီႇယႃႇ</month>
+							<month type="9">ၵႅၼ်ႇပၢတ်ႉ</month>
+							<month type="10">သိၼ်း</month>
+							<month type="11">ႁႅမ်းလႄး</month>
+							<month type="12">ၼႁၢတ်ႉသ်</month>
+							<month type="13">ပႃႇၵူႇမႅၼ်ႇ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">မႅတ်ႉသ်ရႅမ်ႇ</month>
+							<month type="2">တႅၵ်ႉၵမ်ႇ</month>
+							<month type="3">ႁႄႇတႃႇ</month>
+							<month type="4">တႃးသတ်ႉသ်</month>
+							<month type="5">တႄးလ်</month>
+							<month type="6">ယေႇၵတိတ်ႉ</month>
+							<month type="7">မႅၵ်ႇၵႃႇပိတ်ႉ</month>
+							<month type="8">မိယႃႇၸီႇယႃႇ</month>
+							<month type="9">ၵႅၼ်ႇပၢတ်ႉ</month>
+							<month type="10">သိၼ်း</month>
+							<month type="11">ႁႅမ်းလႄး</month>
+							<month type="12">ၼႁၢတ်ႉသ်</month>
+							<month type="13">ပႃႇၵူႇမႅၼ်ႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">မႅတ်ႉသ်ရႅမ်ႇ</month>
+							<month type="2">တႅၵ်ႉၵမ်ႇ</month>
+							<month type="3">ႁႄႇတႃႇ</month>
+							<month type="4">တႃးသတ်ႉသ်</month>
+							<month type="5">တႄးလ်</month>
+							<month type="6">ယေႇၵတိတ်ႉ</month>
+							<month type="7">မႅၵ်ႇၵႃႇပိတ်ႉ</month>
+							<month type="8">မိယႃႇၸီႇယႃႇ</month>
+							<month type="9">ၵႅၼ်ႇပၢတ်ႉ</month>
+							<month type="10">သိၼ်း</month>
+							<month type="11">ႁႅမ်းလႄး</month>
+							<month type="12">ၼႁၢတ်ႉသ်</month>
+							<month type="13">ပႃႇၵူႇမႅၼ်ႇ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ၸၼ်ႇ</month>
+							<month type="2">ၾႅပ်ႇ</month>
+							<month type="3">မၢတ်ႉၶ်ျ</month>
+							<month type="4">ဢေႇ</month>
+							<month type="5">မေႇ</month>
+							<month type="6">ၸုၼ်ႇ</month>
+							<month type="7">ၸူႇ</month>
+							<month type="8">ဢေႃး</month>
+							<month type="9">သႅပ်ႇ</month>
+							<month type="10">ဢွၵ်ႇ</month>
+							<month type="11">ၼူဝ်ႇ</month>
+							<month type="12">တီႇ</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">ၸ.</month>
+							<month type="2">ၾ.</month>
+							<month type="3">မ.</month>
+							<month type="4">ဢ.</month>
+							<month type="5">မ.</month>
+							<month type="6">ၸ.</month>
+							<month type="7">ၸ.</month>
+							<month type="8">ဢ.</month>
+							<month type="9">သ.</month>
+							<month type="10">ဢ.</month>
+							<month type="11">ၼ.</month>
+							<month type="12">တ.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ၸၼ်ႇဝႃႇရီႇ</month>
+							<month type="2">ၾႅပ်ႇဝႃႇရီႇ</month>
+							<month type="3">မၢတ်ႉၶ်ျ</month>
+							<month type="4">ဢေႇပရႄႇ</month>
+							<month type="5">မေႇ</month>
+							<month type="6">ၸုၼ်ႇ</month>
+							<month type="7">ၸူႇလၢႆႇ</month>
+							<month type="8">ဢေႃးၵၢတ်ႉ</month>
+							<month type="9">သႅပ်ႇထႅမ်ႇပႃႇ</month>
+							<month type="10">ဢွၵ်ႇထူဝ်ႇပႃႇ</month>
+							<month type="11">ၼူဝ်ႇဝႅမ်ႇပႃႇ</month>
+							<month type="12">တီႇသႅမ်ႇပႃႇ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ၸၼ်ႇ</month>
+							<month type="2">ၾႅပ်ႇ</month>
+							<month type="3">မၢတ်ႉၶ်ျ</month>
+							<month type="4">ဢေႇ</month>
+							<month type="5">မေႇ</month>
+							<month type="6">ၸုၼ်ႇ</month>
+							<month type="7">ၸူႇ</month>
+							<month type="8">ဢေႃး</month>
+							<month type="9">သႅပ်ႇ</month>
+							<month type="10">ဢွၵ်ႇ</month>
+							<month type="11">ၼူဝ်ႇ</month>
+							<month type="12">တီႇ</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">ၸ.</month>
+							<month type="2">ၾ.</month>
+							<month type="3">မ.</month>
+							<month type="4">ဢ.</month>
+							<month type="5">မ.</month>
+							<month type="6">ၸ.</month>
+							<month type="7">ၸ.</month>
+							<month type="8">ဢ.</month>
+							<month type="9">သ.</month>
+							<month type="10">ဢ.</month>
+							<month type="11">ၼ.</month>
+							<month type="12">တ.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ၸၼ်ႇဝႃႇရီႇ</month>
+							<month type="2">ၾႅပ်ႇဝႃႇရီႇ</month>
+							<month type="3">မၢတ်ႉၶ်ျ</month>
+							<month type="4">ဢေႇပရႄႇ</month>
+							<month type="5">မေႇ</month>
+							<month type="6">ၸုၼ်ႇ</month>
+							<month type="7">ၸူႇလၢႆႇ</month>
+							<month type="8">ဢေႃးၵၢတ်ႉ</month>
+							<month type="9">သႅပ်ႇထႅမ်ႇပႃႇ</month>
+							<month type="10">ဢွၵ်ႇထူဝ်ႇပႃႇ</month>
+							<month type="11">ၼူဝ်ႇဝႅမ်ႇပႃႇ</month>
+							<month type="12">တီႇသႅမ်ႇပႃႇ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">တိတ်ႉ</day>
+							<day type="mon">ၸၼ်</day>
+							<day type="tue">ၵၢၼ်း</day>
+							<day type="wed">ပုတ်ႉ</day>
+							<day type="thu">ၽတ်း</day>
+							<day type="fri">သုၵ်း</day>
+							<day type="sat">သဝ်</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">တိ.</day>
+							<day type="mon">ၸ.</day>
+							<day type="tue">ၵ.</day>
+							<day type="wed">ပု.</day>
+							<day type="thu">ၽ.</day>
+							<day type="fri">သု.</day>
+							<day type="sat">သ.</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">တိတ်ႉ</day>
+							<day type="mon">ၸၼ်</day>
+							<day type="tue">ၵၢၼ်း</day>
+							<day type="wed">ပုတ်ႉ</day>
+							<day type="thu">ၽတ်း</day>
+							<day type="fri">သုၵ်း</day>
+							<day type="sat">သဝ်</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">ဝၼ်းဢႃးတိတ်ႉ</day>
+							<day type="mon">ဝၼ်းၸၼ်</day>
+							<day type="tue">ဝၼ်းဢင်းၵၢၼ်း</day>
+							<day type="wed">ဝၼ်းပုတ်ႉ</day>
+							<day type="thu">ဝၼ်းၽတ်း</day>
+							<day type="fri">ဝၼ်းသုၵ်း</day>
+							<day type="sat">ဝၼ်းသဝ်</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">တိတ်ႉ</day>
+							<day type="mon">ၸၼ်</day>
+							<day type="tue">ၵၢၼ်း</day>
+							<day type="wed">ပုတ်ႉ</day>
+							<day type="thu">ၽတ်း</day>
+							<day type="fri">သုၵ်း</day>
+							<day type="sat">သဝ်</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">တိ.</day>
+							<day type="mon">ၸ.</day>
+							<day type="tue">ၵ.</day>
+							<day type="wed">ပု.</day>
+							<day type="thu">ၽ.</day>
+							<day type="fri">သု.</day>
+							<day type="sat">သ.</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">တိတ်ႉ</day>
+							<day type="mon">ၸၼ်</day>
+							<day type="tue">ၵၢၼ်း</day>
+							<day type="wed">ပုတ်ႉ</day>
+							<day type="thu">ၽတ်း</day>
+							<day type="fri">သုၵ်း</day>
+							<day type="sat">သဝ်</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">တိတ်ႉ</day>
+							<day type="mon">ၸၼ်</day>
+							<day type="tue">ၵၢၼ်း</day>
+							<day type="wed">ပုတ်ႉ</day>
+							<day type="thu">ၽတ်း</day>
+							<day type="fri">သုၵ်း</day>
+							<day type="sat">သဝ်</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">သၢမ်လိူၼ်ႁွပ်ႈ 1</quarter>
+							<quarter type="2">သၢမ်လိူၼ်ႁွပ်ႈ 2</quarter>
+							<quarter type="3">သၢမ်လိူၼ်ႁွပ်ႈ 3</quarter>
+							<quarter type="4">သၢမ်လိူၼ်ႁွပ်ႈ 4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">သၢမ်လိူၼ်ႁွပ်ႈ 1</quarter>
+							<quarter type="2">သၢမ်လိူၼ်ႁွပ်ႈ 2</quarter>
+							<quarter type="3">သၢမ်လိူၼ်ႁွပ်ႈ 3</quarter>
+							<quarter type="4">သၢမ်လိူၼ်ႁွပ်ႈ 4</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">ႁွပ်ႈ1</quarter>
+							<quarter type="2">ႁွပ်ႈ2</quarter>
+							<quarter type="3">ႁွပ်ႈ3</quarter>
+							<quarter type="4">ႁွပ်ႈ4</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">သၢမ်လိူၼ်ႁွပ်ႈ 1</quarter>
+							<quarter type="2">သၢမ်လိူၼ်ႁွပ်ႈ 2</quarter>
+							<quarter type="3">သၢမ်လိူၼ်ႁွပ်ႈ 3</quarter>
+							<quarter type="4">သၢမ်လိူၼ်ႁွပ်ႈ 4</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">တၸ.</dayPeriod>
+							<dayPeriod type="pm">တလ.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">ၸ.</dayPeriod>
+							<dayPeriod type="pm">လ.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">တွၼ်ႈၸဝ်ႉ</dayPeriod>
+							<dayPeriod type="pm">တွၼ်ႈလႃႈ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">တၸ.</dayPeriod>
+							<dayPeriod type="pm">တလ.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">တၸ.</dayPeriod>
+							<dayPeriod type="pm">တလ.</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">တွၼ်ႈၸဝ်ႉ</dayPeriod>
+							<dayPeriod type="pm">တွၼ်ႈလႃႈ</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0">ဢွၼ်ၼႃႈၸဝ်ႈၶရိတ်ႉ</era>
+						<era type="0" alt="variant">ဢွၼ်ၼႃႈပၢၼ်ၵၢင်လၢႆ</era>
+						<era type="1">ပီၶရိတ်ႉ</era>
+						<era type="1" alt="variant">ပၢၼ်ၵၢင်လၢႆ</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ပီႇၸီႇ</era>
+						<era type="0" alt="variant">ပီႇၸီႇဢီး</era>
+						<era type="1">ဢေႇတီႇ</era>
+						<era type="1" alt="variant">ၸီႇဢီး</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ပီႇၸီႇ</era>
+						<era type="0" alt="variant">ပီႇၸီႇဢီး</era>
+						<era type="1">ဢေႇတီႇ</era>
+						<era type="1" alt="variant">ၸီႇဢီး</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">ဝူင်ႈထူၼ်ႈ W ၶွင်လိူၼ် MMMM</dateFormatItem>
+						<dateFormatItem id="yMEd">y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y MMM d - E</dateFormatItem>
+						<dateFormatItem id="yw" count="other">ဝူင်ႈထူၼ်ႈ w ၶွင်ပီ Y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="hebrew">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">တိသျရိ</month>
+							<month type="2">ႁေႇသျဝၼ်ႇ</month>
+							<month type="3">ၶိတ်ႉသလႅပ်ႉ</month>
+							<month type="4">တႄႇဝႅတ်ႉ</month>
+							<month type="5">သျေႇဝတ်ႉ</month>
+							<month type="6">ဢႃႇတႃႇ I</month>
+							<month type="7">ဢႃႇတႃႇ</month>
+							<month type="7" yeartype="leap">ဢႃႇတႃႇ II</month>
+							<month type="8">ၼီႇသၢၼ်း</month>
+							<month type="9">ဢီႇယႃႇ</month>
+							<month type="10">သီႇဝၼ်ႇ</month>
+							<month type="11">တမ်ႇမုတ်ႉၸ်</month>
+							<month type="12">ဢၢပ်ႉၾ်</month>
+							<month type="13">ဢႄႇလူးလ်</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">တိသျရိ</month>
+							<month type="2">ႁေႇသျဝၼ်ႇ</month>
+							<month type="3">ၶိတ်ႉသလႅပ်ႉ</month>
+							<month type="4">တႄႇဝႅတ်ႉ</month>
+							<month type="5">သျေႇဝတ်ႉ</month>
+							<month type="6">ဢႃႇတႃႇ I</month>
+							<month type="7">ဢႃႇတႃႇ</month>
+							<month type="7" yeartype="leap">ဢႃႇတႃႇ II</month>
+							<month type="8">ၼီႇသၢၼ်း</month>
+							<month type="9">ဢီႇယႃႇ</month>
+							<month type="10">သီႇဝၼ်ႇ</month>
+							<month type="11">တမ်ႇမုတ်ႉၸ်</month>
+							<month type="12">ဢၢပ်ႉၾ်</month>
+							<month type="13">ဢႄႇလူးလ်</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">တိသျရိ</month>
+							<month type="2">ႁေႇသျဝၼ်ႇ</month>
+							<month type="3">ၶိတ်ႉသလႅပ်ႉ</month>
+							<month type="4">တႄႇဝႅတ်ႉ</month>
+							<month type="5">သျေႇဝတ်ႉ</month>
+							<month type="6">ဢႃႇတႃႇ I</month>
+							<month type="7">ဢႃႇတႃႇ</month>
+							<month type="7" yeartype="leap">ဢႃႇတႃႇ II</month>
+							<month type="8">ၼီႇသၢၼ်း</month>
+							<month type="9">ဢီႇယႃႇ</month>
+							<month type="10">သီႇဝၼ်ႇ</month>
+							<month type="11">တမ်ႇမုတ်ႉၸ်</month>
+							<month type="12">ဢၢပ်ႉၾ်</month>
+							<month type="13">ဢႄႇလူးလ်</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">တိသျရိ</month>
+							<month type="2">ႁေႇသျဝၼ်ႇ</month>
+							<month type="3">ၶိတ်ႉသလႅပ်ႉ</month>
+							<month type="4">တႄႇဝႅတ်ႉ</month>
+							<month type="5">သျေႇဝတ်ႉ</month>
+							<month type="6">ဢႃႇတႃႇ I</month>
+							<month type="7">ဢႃႇတႃႇ</month>
+							<month type="7" yeartype="leap">ဢႃႇတႃႇ II</month>
+							<month type="8">ၼီႇသၢၼ်း</month>
+							<month type="9">ဢီႇယႃႇ</month>
+							<month type="10">သီႇဝၼ်ႇ</month>
+							<month type="11">တမ်ႇမုတ်ႉၸ်</month>
+							<month type="12">ဢၢပ်ႉၾ်</month>
+							<month type="13">ဢႄႇလူးလ်</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">တ.ၸ.</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">တ.ၸ.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">တ.ၸ.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="indian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ၵျၢႆးတရႃႇ</month>
+							<month type="2">ဝၢႆးသႃၶႃႇ</month>
+							<month type="3">ၵျႅတ်ႉသ်ထႃႇ</month>
+							<month type="4">ဢသႃထႃ</month>
+							<month type="5">သရဝၼ</month>
+							<month type="6">ၽႃႇတရႃႇ</month>
+							<month type="7">ဢသဝိၼႃႇ</month>
+							<month type="8">ၵႃတိၵႃႇ</month>
+							<month type="9">ဢၵရႃႇႁႃယႃၼႃႇ</month>
+							<month type="10">​ပေႃးသႃႇ</month>
+							<month type="11">မႃႇၵႃႇ</month>
+							<month type="12">ၽႃလ်ၵူၼႃႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ၵျၢႆးတရႃႇ</month>
+							<month type="2">ဝၢႆးသႃၶႃႇ</month>
+							<month type="3">ၵျႅတ်ႉသ်ထႃႇ</month>
+							<month type="4">ဢသႃထႃ</month>
+							<month type="5">သရဝၼ</month>
+							<month type="6">ၽႃႇတရႃႇ</month>
+							<month type="7">ဢသဝိၼႃႇ</month>
+							<month type="8">ၵႃတိၵႃႇ</month>
+							<month type="9">ဢၵရႃႇႁႃယႃၼႃႇ</month>
+							<month type="10">​ပေႃးသႃႇ</month>
+							<month type="11">မႃႇၵႃႇ</month>
+							<month type="12">ၽႃလ်ၵူၼႃႇ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ၵျၢႆးတရႃႇ</month>
+							<month type="2">ဝၢႆးသႃၶႃႇ</month>
+							<month type="3">ၵျႅတ်ႉသ်ထႃႇ</month>
+							<month type="4">ဢသႃထႃ</month>
+							<month type="5">သရဝၼ</month>
+							<month type="6">ၽႃႇတရႃႇ</month>
+							<month type="7">ဢသဝိၼႃႇ</month>
+							<month type="8">ၵႃတိၵႃႇ</month>
+							<month type="9">ဢၵရႃႇႁႃယႃၼႃႇ</month>
+							<month type="10">​ပေႃးသႃႇ</month>
+							<month type="11">မႃႇၵႃႇ</month>
+							<month type="12">ၽႃလ်ၵူၼႃႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ၵျၢႆးတရႃႇ</month>
+							<month type="2">ဝၢႆးသႃၶႃႇ</month>
+							<month type="3">ၵျႅတ်ႉသ်ထႃႇ</month>
+							<month type="4">ဢသႃထႃ</month>
+							<month type="5">သရဝၼ</month>
+							<month type="6">ၽႃႇတရႃႇ</month>
+							<month type="7">ဢသဝိၼႃႇ</month>
+							<month type="8">ၵႃတိၵႃႇ</month>
+							<month type="9">ဢၵရႃႇႁႃယႃၼႃႇ</month>
+							<month type="10">​ပေႃးသႃႇ</month>
+							<month type="11">မႃႇၵႃႇ</month>
+							<month type="12">ၽႃလ်ၵူၼႃႇ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">သၵ်ႉၵႃႇ</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">သၵ်ႉၵႃႇ</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">သၵ်ႉၵႃႇ</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">မူႇ.</month>
+							<month type="2">သႃႇ.</month>
+							<month type="3">ရႃႇ. I</month>
+							<month type="4">ရႃႇ. II</month>
+							<month type="5">ၵျူႇ. I</month>
+							<month type="6">ၵျူႇ. II</month>
+							<month type="7">ရႃႇၸ်.</month>
+							<month type="8">သျႃး.</month>
+							<month type="9">ရႃ.</month>
+							<month type="10">သျေႃး.</month>
+							<month type="11">ၻူဝ်ႇလ်.ၵ.</month>
+							<month type="12">ၻူဝ်ႇလ်.ႁ.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">မူႇႁႃႇရမ်ႇ</month>
+							<month type="2">သႃႇၾႃႇ</month>
+							<month type="3">ရႃႇပီႇ I</month>
+							<month type="4">ရႃႇပီႇ II</month>
+							<month type="5">ၵျူႇမႃႇတႃႇ I</month>
+							<month type="6">ၵျူႇမႃႇတႃႇ II</month>
+							<month type="7">ရႃႇၸၢပ်ႉ</month>
+							<month type="8">သျႃးပၢၼ်ႇ</month>
+							<month type="9">ရႃႇမႃႇတၢၼ်ႇ</month>
+							<month type="10">သျေႃးဝႃႇလ်</month>
+							<month type="11">ၻူဝ်ႇလ်-ၵိတ</month>
+							<month type="12">ၻူဝ်ႇလ်ႁိတ်ႉၸႃႇ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">မူႇ.</month>
+							<month type="2">သႃႇ.</month>
+							<month type="3">ရႃႇ. I</month>
+							<month type="4">ရႃႇ. II</month>
+							<month type="5">ၵျူႇ. I</month>
+							<month type="6">ၵျူႇ. II</month>
+							<month type="7">ရႃႇၸ်.</month>
+							<month type="8">သျႃး.</month>
+							<month type="9">ရႃ.</month>
+							<month type="10">သျေႃး.</month>
+							<month type="11">ၻူဝ်ႇလ်.ၵ.</month>
+							<month type="12">ၻူဝ်ႇလ်.ႁ.</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">မူႇႁႃႇရမ်ႇ</month>
+							<month type="2">သႃႇၾႃႇ</month>
+							<month type="3">ရႃႇပီႇ I</month>
+							<month type="4">ရႃႇပီႇ II</month>
+							<month type="5">ၵျူႇမႃႇတႃႇ I</month>
+							<month type="6">ၵျူႇမႃႇတႃႇ II</month>
+							<month type="7">ရႃႇၸၢပ်ႉ</month>
+							<month type="8">သျႃးပၢၼ်ႇ</month>
+							<month type="9">ရႃႇမႃႇတၢၼ်ႇ</month>
+							<month type="10">သျေႃးဝႃႇလ်</month>
+							<month type="11">ၻူဝ်ႇလ်-ၵိတ</month>
+							<month type="12">ၻူဝ်ႇလ်ႁိတ်ႉၸႃႇ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">ပီႁေးၵျိရႃႇ</era>
+						<era type="1">ဢွၼ်ၼႃႈ ႁေးၵျိရႃႇ</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ပ.ႁ.</era>
+						<era type="1">ဢ.ႁ.</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ပ.ႁ.</era>
+						<era type="1">ဢ.ႁ.</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="japanese">
+				<eras>
+					<eraNames>
+						<era type="0">တႆးၵႃႇ (645–650)</era>
+						<era type="1">ႁၵုၶျိ (650–671)</era>
+						<era type="2">ႁၵုႁူဝ်ႇ (672–686)</era>
+						<era type="3">သူးၶျူဝ်ႇ (686–701)</era>
+						<era type="4">တႆးႁူဝ်ႇ (701–704)</era>
+						<era type="5">ၵေးယိုင်ႇ (704–708)</era>
+						<era type="6">ဝႃးတူဝ်ႇ (708–715)</era>
+						<era type="7">ရေးၵီႇ (715–717)</era>
+						<era type="8">ယူဝ်းရူဝ်ႇ (717–724)</era>
+						<era type="9">ၸိၼ်ႈၵီႇ (724–729)</era>
+						<era type="10">တႅၼ်းပျူဝ်ႇ (729–749)</era>
+						<era type="11">တႅၼ်းပျူဝ်ႇ-ၵၼ်းပူဝ်ႇ (749–749)</era>
+						<era type="12">တႅၼ်းပျူဝ်ႇ-သျူဝ်းႁူဝ်ႇ (749–757)</era>
+						<era type="13">တႅၼ်းပျူဝ်ႇ-ႁူဝ်ႇၸီႇ (757–765)</era>
+						<era type="14">တႅၼ်းပျူဝ်ႇ-ၸိၼ်းၵူဝ်ႇ (765–767)</era>
+						<era type="15">ၸိၼ်းၵူဝ်ႇ-ၵေးယိုင်ႇ (767–770)</era>
+						<era type="16">ႁူဝ်ၵီႇ (770–780)</era>
+						<era type="17">တႅၼ်းဢူဝ်ႇ (781–782)</era>
+						<era type="18">ဢႅၼ်ရိယႃၵု (782–806)</era>
+						<era type="19">တႆးတူဝ်ႇ (806–810)</era>
+						<era type="20">ၶူဝ်းၼိၼ်ႇ (810–824)</era>
+						<era type="21">တႅၼ်းၶျူဝ်ႇ (824–834)</era>
+						<era type="22">ၸူဝ်းဝႃႇ (834–848)</era>
+						<era type="23">ၵႃးသျူဝ်ႇ (848–851)</era>
+						<era type="24">ၼိၼ်းၸူႇ (851–854)</era>
+						<era type="25">သၢႆးၵူဝ်ႇ (854–857)</era>
+						<era type="26">တႅၼ်းဢၼ်ႇ (857–859)</era>
+						<era type="27">ၸူဝ်းၵၼ်ႇ (859–877)</era>
+						<era type="28">ၵၼ်းၵျူဝ်ႇ (877–885)</era>
+						<era type="29">ၼိၼ်းၼႃႇ (885–889)</era>
+						<era type="30">ၵၼ်းပျူဝ်ႇ (889–898)</era>
+						<era type="31">သျူဝ်းတႆႇ (898–901)</era>
+						<era type="32">ဢႅၼ်းၵီႇ (901–923)</era>
+						<era type="33">ဢႅၼ်းၶျူဝ်ႇ (923–931)</era>
+						<era type="34">ၸူဝ်းႁေႇ (931–938)</era>
+						<era type="35">တႅၼ်းၵျူဝ်ႇ (938–947)</era>
+						<era type="36">တႅၼ်းရိယႃၵု (947–957)</era>
+						<era type="37">တႅၼ်းတူဝ်ၵု (957–961)</era>
+						<era type="38">ဢူဝ်းဝႃႇ (961–964)</era>
+						<era type="39">ၵူဝ်းႁူဝ်ႇ (964–968)</era>
+						<era type="40">ဢၼ်းၼႃႇ (968–970)</era>
+						<era type="41">တႅၼ်းရိယႃၵု (970–973)</era>
+						<era type="42">တႅၼ်းဢႅၼ်ႇ (973–976)</era>
+						<era type="43">ၸူဝ်းၵႅၼ်ႇ (976–978)</era>
+						<era type="44">တႅၼ်းၵႅၼ်ႇ (978–983)</era>
+						<era type="45">ဢီးၵၼ်ႇ (983–985)</era>
+						<era type="46">ၶၢၼ်းၼႃႉ (985–987)</era>
+						<era type="47">ဢီးဢႅၼ်ႇ (987–989)</era>
+						<era type="48">ဢီးသူဝ်ႇ (989–990)</era>
+						<era type="49">သျူဝ်းရိယႃၵု (990–995)</era>
+						<era type="50">ၶျူဝ်းတူဝ်ၵု (995–999)</era>
+						<era type="51">ၶျူဝ်းႁူဝ်ႇ (999–1004)</era>
+						<era type="52">ၶၢၼ်းၵူဝ်ႇ (1004–1012)</era>
+						<era type="53">ၶျူဝ်းဝႃႇ (1012–1017)</era>
+						<era type="54">ၶၢၼ်းၼိၼ်ႇ (1017–1021)</era>
+						<era type="55">ၸီးဢၼ်ႇ (1021–1024)</era>
+						<era type="56">မၼ်းၸူႇ (1024–1028)</era>
+						<era type="57">ၶျူဝ်းၵႅၼ်ႇ (1028–1037)</era>
+						<era type="58">ၶျူဝ်းရိယႃၵု (1037–1040)</era>
+						<era type="59">ၶျူဝ်းၵျူႇ (1040–1044)</era>
+						<era type="60">ၶၢၼ်းတူဝ်ၵု (1044–1046)</era>
+						<era type="61">ဢီးသျူဝ်ႇ (1046–1053)</era>
+						<era type="62">တႅၼ်းၵီႇ (1053–1058)</era>
+						<era type="63">ၶူဝ်းႁေႇ (1058–1065)</era>
+						<era type="64">ၸီးရိယႃၵု (1065–1069)</era>
+						<era type="65">ဢႅၼ်းၵျူႇ (1069–1074)</era>
+						<era type="66">ၸူဝ်းႁူဝ်ႇ (1074–1077)</era>
+						<era type="67">သျူဝ်းရိယႃၵု (1077–1081)</era>
+						<era type="68">ဢီးႁူဝ်ႇ (1081–1084)</era>
+						<era type="69">ဢူဝ်းတူဝ်ၵု (1084–1087)</era>
+						<era type="70">ၶၢၼ်းၸီႇ (1087–1094)</era>
+						<era type="71">ၵႃးႁူဝ်ႇ (1094–1096)</era>
+						<era type="72">ဢီးၶျူဝ်ႇ (1096–1097)</era>
+						<era type="73">ၸူဝ်းတူဝ်ၵု (1097–1099)</era>
+						<era type="74">ၵူဝ်းဝႃႇ (1099–1104)</era>
+						<era type="75">ၶျူဝ်းၸီႇ (1104–1106)</era>
+						<era type="76">ၵႃးသျူဝ်ႇ (1106–1108)</era>
+						<era type="77">တႅၼ်းၼိၼ်ႇ (1108–1110)</era>
+						<era type="78">တႅၼ်းဢီႇ (1110–1113)</era>
+						<era type="79">ဢီးၵျူႇ (1113–1118)</era>
+						<era type="80">ၵႅၼ်းဢီႇ (1118–1120)</era>
+						<era type="81">ႁူဝ်းဢၼ်ႇ (1120–1124)</era>
+						<era type="82">တႅၼ်းၸီႇ (1124–1126)</era>
+						<era type="83">တႆးၸီႇ (1126–1131)</era>
+						<era type="84">တႅၼ်းသျူဝ်ႇ (1131–1132)</era>
+						<era type="85">ၶျူဝ်းသျူဝ်ႇ (1132–1135)</era>
+						<era type="86">ႁူဝ်းဢႅၼ်ႇ (1135–1141)</era>
+						<era type="87">ဢီးၸီႇ (1141–1142)</era>
+						<era type="88">ၵူဝ်းၸီႇ (1142–1144)</era>
+						<era type="89">တႅၼ်းယူဝ်ႇ (1144–1145)</era>
+						<era type="90">ၵျူးဢၼ်ႇ (1145–1151)</era>
+						<era type="91">ၼိၼ်းပေႇ (1151–1154)</era>
+						<era type="92">ၵျူးၸူႇ (1154–1156)</era>
+						<era type="93">ႁူဝ်းၵႅၼ်ႇ (1156–1159)</era>
+						<era type="94">ႁေးၸီႇ (1159–1160)</era>
+						<era type="95">ဢီးရိယႃၵု (1160–1161)</era>
+						<era type="96">ဢူဝ်းႁူဝ်ႇ (1161–1163)</era>
+						<era type="97">ၶျူဝ်းၵၼ်ႇ (1163–1165)</era>
+						<era type="98">ဢီးမၼ်ႇ (1165–1166)</era>
+						<era type="99">ၼိၼ်းဢၼ်ႇ (1166–1169)</era>
+						<era type="100">ၵႃးဢူဝ်ႇ (1169–1171)</era>
+						<era type="101">သျူဝ်းဢၼ်ႇ (1171–1175)</era>
+						<era type="102">ဢၼ်းၵႅၼ်ႇ (1175–1177)</era>
+						<era type="103">ၸီးသျူဝ်ႇ (1177–1181)</era>
+						<era type="104">ယူဝ်းဝႃႇ (1181–1182)</era>
+						<era type="105">ၸူးဢီႇ (1182–1184)</era>
+						<era type="106">ၵႅၼ်းရိယႃၵု (1184–1185)</era>
+						<era type="107">ပုၼ်းၸီႇ (1185–1190)</era>
+						<era type="108">ၵႅၼ်းၵျူႇ (1190–1199)</era>
+						<era type="109">သျူဝ်းၸီႇ (1199–1201)</era>
+						<era type="110">ၵႅၼ်းၼိၼ်ႇ (1201–1204)</era>
+						<era type="111">ၵႅၼ်းၵျူႇ (1204–1206)</era>
+						<era type="112">ၵႅၼ်းဢီႇ (1206–1207)</era>
+						<era type="113">ၸူဝ်းၵႅၼ်ႇ (1207–1211)</era>
+						<era type="114">ၵႅၼ်းရိယႃၵု (1211–1213)</era>
+						<era type="115">ၵႅၼ်းပူဝ်ႇ (1213–1219)</era>
+						<era type="116">ၸူဝ်းၵျူႇ (1219–1222)</era>
+						<era type="117">ၸူဝ်းဢူဝ်ႇ (1222–1224)</era>
+						<era type="118">ၵႅၼ်းၼိၼ်ႇ (1224–1225)</era>
+						<era type="119">ၵႃးရူဝ်ၵု (1225–1227)</era>
+						<era type="120">ဢၼ်းတေႇ (1227–1229)</era>
+						<era type="121">ၶၢၼ်းၵီႇ (1229–1232)</era>
+						<era type="122">ၸူဝ်းဢီႇ (1232–1233)</era>
+						<era type="123">တႅၼ်းပုၵု (1233–1234)</era>
+						<era type="124">ပုၼ်းရိယႃၵု (1234–1235)</era>
+						<era type="125">ၵႃးတေႇ (1235–1238)</era>
+						<era type="126">ယႃးၵုၼိၼ်း (1238–1239)</era>
+						<era type="127">ဢၼ်းဢူဝ်ႇ (1239–1240)</era>
+						<era type="128">ၼိၼ်းၸီႇ (1240–1243)</era>
+						<era type="129">ၵၼ်းၵႅၼ်ႇ (1243–1247)</era>
+						<era type="130">ႁူဝ်းၸီႇ (1247–1249)</era>
+						<era type="131">ၵႅၼ်းၶျူဝ်ႇ (1249–1256)</era>
+						<era type="132">ၵူဝ်းၵႅၼ်ႇ (1256–1257)</era>
+						<era type="133">သျူဝ်းၵႃႇ (1257–1259)</era>
+						<era type="134">သျူဝ်းၵႅၼ်ႇ (1259–1260)</era>
+						<era type="135">ပုၼ်းဢူဝ်ႇ (1260–1261)</era>
+						<era type="136">ၵူဝ်းၶျူဝ်ႇ (1261–1264)</era>
+						<era type="137">ပုၼ်းဢီႇ (1264–1275)</era>
+						<era type="138">ၶၢၼ်းၸီႇ (1275–1278)</era>
+						<era type="139">ၶူဝ်းဢၼ်ႇ (1278–1288)</era>
+						<era type="140">သျူဝ်းဢူဝ်ႇ (1288–1293)</era>
+						<era type="141">ဢီးၼိၼ်ႇ (1293–1299)</era>
+						<era type="142">သျူဝ်းဢၼ်ႇ (1299–1302)</era>
+						<era type="143">ၵႅၼ်းၵႅၼ်ႇ (1302–1303)</era>
+						<era type="144">ၵႃးၵႅၼ်ႇ (1303–1306)</era>
+						<era type="145">တူဝ်းၵုၸိ (1306–1308)</era>
+						<era type="146">ဢၼ်းၵျူဝ်ႇ (1308–1311)</era>
+						<era type="147">ဢူဝ်းၶျူဝ်ႇ (1311–1312)</era>
+						<era type="148">သျူဝ်းဝႃႇ (1312–1317)</era>
+						<era type="149">ပုၼ်းပူဝ်ႇ (1317–1319)</era>
+						<era type="150">ၵႅၼ်းဢူဝ်ႇ (1319–1321)</era>
+						<era type="151">ၵႅၼ်းၵူဝ်ႇ (1321–1324)</era>
+						<era type="152">သျူဝ်းၶျူႇ (1324–1326)</era>
+						<era type="153">ၵႃးရိယႃၵု (1326–1329)</era>
+						<era type="154">ၵႅၼ်းတူဝ်ၵု (1329–1331)</era>
+						<era type="155">ၵႅၼ်းၵူဝ်ႇ (1331–1334)</era>
+						<era type="156">ၵႅၼ်းမူႇ (1334–1336)</era>
+						<era type="157">ဢၼ်းၵႅၼ်ႇ (1336–1340)</era>
+						<era type="158">ၵူဝ်းၵူဝ်ၵု (1340–1346)</era>
+						<era type="159">သျူဝ်းႁေႇ (1346–1370)</era>
+						<era type="160">ၵႅၼ်းတူဝ်ၵု (1370–1372)</era>
+						<era type="161">ပုၼ်းၶျူႇ (1372–1375)</era>
+						<era type="162">တႅၼ်းၸူႇ (1375–1379)</era>
+						<era type="163">ၵူဝ်းရိယႃၵု (1379–1381)</era>
+						<era type="164">ၵူဝ်းဝႃႇ (1381–1384)</era>
+						<era type="165">ၵႅၼ်းၶျူႇ (1384–1392)</era>
+						<era type="166">သျီးတူဝ်ၵု (1384–1387)</era>
+						<era type="167">ၵႃးၵေႇ (1387–1389)</era>
+						<era type="168">ၵူဝ်းဢူဝ်ႇ (1389–1390)</era>
+						<era type="169">မေးတူဝ်ၵု (1390–1394)</era>
+						<era type="170">ဢူဝ်းဢီႇ (1394–1428)</era>
+						<era type="171">သျူဝ်းၶျူဝ်ႇ (1428–1429)</era>
+						<era type="172">ဢီးၶျူဝ်ႇ (1429–1441)</era>
+						<era type="173">ၵႃးၵိသု (1441–1444)</era>
+						<era type="174">ပုၼ်းဢၼ်ႇ (1444–1449)</era>
+						<era type="175">ႁူဝ်းတူဝ်ႇၵု (1449–1452)</era>
+						<era type="176">ၵျူဝ်းတူဝ်ၵု (1452–1455)</era>
+						<era type="177">ၵူဝ်းသျူဝ်ႇ (1455–1457)</era>
+						<era type="178">ၶျူဝ်းရူဝ်ၵု (1457–1460)</era>
+						<era type="179">ၵၼ်းသျူဝ်ႇ (1460–1466)</era>
+						<era type="180">ပုၼ်းသျူဝ်ႇ (1466–1467)</era>
+						<era type="181">ဢူဝ်းၼိၼ်ႇ (1467–1469)</era>
+						<era type="182">ပုၼ်းမေႇ (1469–1487)</era>
+						<era type="183">ၶျူဝ်းၵျူဝ်ႇ (1487–1489)</era>
+						<era type="184">ဢၼ်းတူဝ်ၵု (1489–1492)</era>
+						<era type="185">မေးဢူဝ်ႇ (1492–1501)</era>
+						<era type="186">ပုၼ်းၵီႇ (1501–1504)</era>
+						<era type="187">ဢီးသျူဝ်ႇ (1504–1521)</era>
+						<era type="188">တႆးဢီႇ (1521–1528)</era>
+						<era type="189">ၵျူဝ်းရူဝ်ၵု (1528–1532)</era>
+						<era type="190">တႅၼ်းပုၼ်ႇ (1532–1555)</era>
+						<era type="191">ၵူဝ်းၸီႇ (1555–1558)</era>
+						<era type="192">ဢီးရူဝ်ၵု (1558–1570)</era>
+						<era type="193">ၵႅၼ်းၵီႇ (1570–1573)</era>
+						<era type="194">တႅၼ်းသျူဝ်ႇ (1573–1592)</era>
+						<era type="195">ပုၼ်းရူဝ်ၵု (1592–1596)</era>
+						<era type="196">ၵေးၶျူဝ်ႇ (1596–1615)</era>
+						<era type="197">ၵႅၼ်းၼႃႇ (1615–1624)</era>
+						<era type="198">ၶၢၼ်းဢီႇ (1624–1644)</era>
+						<era type="199">သျူဝ်းႁူဝ်ႇ (1644–1648)</era>
+						<era type="200">ၵေးဢၼ်ႇ (1648–1652)</era>
+						<era type="201">ၸူဝ်းဢူဝ်ႇ (1652–1655)</era>
+						<era type="202">မေးရေၵိ (1655–1658)</era>
+						<era type="203">မၼ်းၸီႇ (1658–1661)</era>
+						<era type="204">ၶၢၼ်းပုၼ်ႇ (1661–1673)</era>
+						<era type="205">ဢၼ်းပူဝ်ႇ (1673–1681)</era>
+						<era type="206">တႅၼ်းၼႃႇ (1681–1684)</era>
+						<era type="207">ၸူဝ်းၵျူဝ်ႇ (1684–1688)</era>
+						<era type="208">ၵႅၼ်းရူဝ်ၵု (1688–1704)</era>
+						<era type="209">ႁူဝ်းဢီႇ (1704–1711)</era>
+						<era type="210">သျူဝ်းတူဝ်ၵု (1711–1716)</era>
+						<era type="211">ၵျူဝ်းႁူဝ်ႇ (1716–1736)</era>
+						<era type="212">ၵႅၼ်းပုၼ်ႇ (1736–1741)</era>
+						<era type="213">ၶၢၼ်းပူဝ်ႇ (1741–1744)</era>
+						<era type="214">ဢၼ်းၵျူဝ်ႇ (1744–1748)</era>
+						<era type="215">ၶၢၼ်းဢႅၼ်ႇ (1748–1751)</era>
+						<era type="216">ႁူဝ်းရေၵိ (1751–1764)</era>
+						<era type="217">မေးဝႃႇ (1764–1772)</era>
+						<era type="218">ဢၼ်းဢီႇ (1772–1781)</era>
+						<era type="219">တႅၼ်းမေႇ (1781–1789)</era>
+						<era type="220">ၶၢၼ်းသေႇ (1789–1801)</era>
+						<era type="221">ၵျူဝ်းဝႃႇ (1801–1804)</era>
+						<era type="222">ပုၼ်းၵႃႇ (1804–1818)</era>
+						<era type="223">ပုၼ်းသေႇ (1818–1830)</era>
+						<era type="224">တၼ်းပူဝ်ႇ (1830–1844)</era>
+						<era type="225">ၵူဝ်းၵႃႇ (1844–1848)</era>
+						<era type="226">ၵႃးဢီႇ (1848–1854)</era>
+						<era type="227">ဢၼ်းသေႇ (1854–1860)</era>
+						<era type="228">မၼ်းဢႅၼ်ႇ (1860–1861)</era>
+						<era type="229">ပုၼ်းၵျူႇ (1861–1864)</era>
+						<era type="230">ၵႅၼ်းၸီႇ (1864–1865)</era>
+						<era type="231">ၵေးဢူဝ်ႇ (1865–1868)</era>
+						<era type="232">မေးၸီႇ</era>
+						<era type="233">တႆးသျူဝ်ႇ</era>
+						<era type="234">သျူဝ်းဝႃႇ</era>
+						<era type="235">ႁေးသႄႇ</era>
+						<era type="236">ရေးဝႃႇ</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">တႆးၵႃႇ (645–650)</era>
+						<era type="1">ႁၵုၶျိ (650–671)</era>
+						<era type="2">ႁၵုႁူဝ်ႇ (672–686)</era>
+						<era type="3">သူးၶျူဝ်ႇ (686–701)</era>
+						<era type="4">တႆးႁူဝ်ႇ (701–704)</era>
+						<era type="5">ၵေးယိုင်ႇ (704–708)</era>
+						<era type="6">ဝႃးတူဝ်ႇ (708–715)</era>
+						<era type="7">ရေးၵီႇ (715–717)</era>
+						<era type="8">ယူဝ်းရူဝ်ႇ (717–724)</era>
+						<era type="9">ၸိၼ်ႈၵီႇ (724–729)</era>
+						<era type="10">တႅၼ်းပျူဝ်ႇ (729–749)</era>
+						<era type="11">တႅၼ်းပျူဝ်ႇ-ၵၼ်းပူဝ်ႇ (749–749)</era>
+						<era type="12">တႅၼ်းပျူဝ်ႇ-သျူဝ်းႁူဝ်ႇ (749–757)</era>
+						<era type="13">တႅၼ်းပျူဝ်ႇ-ႁူဝ်ႇၸီႇ (757–765)</era>
+						<era type="14">တႅၼ်းပျူဝ်ႇ-ၸိၼ်းၵူဝ်ႇ (765–767)</era>
+						<era type="15">ၸိၼ်းၵူဝ်ႇ-ၵေးယိုင်ႇ (767–770)</era>
+						<era type="16">ႁူဝ်ၵီႇ (770–780)</era>
+						<era type="17">တႅၼ်းဢူဝ်ႇ (781–782)</era>
+						<era type="18">ဢႅၼ်ရိယႃၵု (782–806)</era>
+						<era type="19">တႆးတူဝ်ႇ (806–810)</era>
+						<era type="20">ၶူဝ်းၼိၼ်ႇ (810–824)</era>
+						<era type="21">တႅၼ်းၶျူဝ်ႇ (824–834)</era>
+						<era type="22">ၸူဝ်းဝႃႇ (834–848)</era>
+						<era type="23">ၵႃးသျူဝ်ႇ (848–851)</era>
+						<era type="24">ၼိၼ်းၸူႇ (851–854)</era>
+						<era type="25">သၢႆးၵူဝ်ႇ (854–857)</era>
+						<era type="26">တႅၼ်းဢၼ်ႇ (857–859)</era>
+						<era type="27">ၸူဝ်းၵၼ်ႇ (859–877)</era>
+						<era type="28">ၵၼ်းၵျူဝ်ႇ (877–885)</era>
+						<era type="29">ၼိၼ်းၼႃႇ (885–889)</era>
+						<era type="30">ၵၼ်းပျူဝ်ႇ (889–898)</era>
+						<era type="31">သျူဝ်းတႆႇ (898–901)</era>
+						<era type="32">ဢႅၼ်းၵီႇ (901–923)</era>
+						<era type="33">ဢႅၼ်းၶျူဝ်ႇ (923–931)</era>
+						<era type="34">ၸူဝ်းႁေႇ (931–938)</era>
+						<era type="35">တႅၼ်းၵျူဝ်ႇ (938–947)</era>
+						<era type="36">တႅၼ်းရိယႃၵု (947–957)</era>
+						<era type="37">တႅၼ်းတူဝ်ၵု (957–961)</era>
+						<era type="38">ဢူဝ်းဝႃႇ (961–964)</era>
+						<era type="39">ၵူဝ်းႁူဝ်ႇ (964–968)</era>
+						<era type="40">ဢၼ်းၼႃႇ (968–970)</era>
+						<era type="41">တႅၼ်းရိယႃၵု (970–973)</era>
+						<era type="42">တႅၼ်းဢႅၼ်ႇ (973–976)</era>
+						<era type="43">ၸူဝ်းၵႅၼ်ႇ (976–978)</era>
+						<era type="44">တႅၼ်းၵႅၼ်ႇ (978–983)</era>
+						<era type="45">ဢီးၵၼ်ႇ (983–985)</era>
+						<era type="46">ၶၢၼ်းၼႃႉ (985–987)</era>
+						<era type="47">ဢီးဢႅၼ်ႇ (987–989)</era>
+						<era type="48">ဢီးသူဝ်ႇ (989–990)</era>
+						<era type="49">သျူဝ်းရိယႃၵု (990–995)</era>
+						<era type="50">ၶျူဝ်းတူဝ်ၵု (995–999)</era>
+						<era type="51">ၶျူဝ်းႁူဝ်ႇ (999–1004)</era>
+						<era type="52">ၶၢၼ်းၵူဝ်ႇ (1004–1012)</era>
+						<era type="53">ၶျူဝ်းဝႃႇ (1012–1017)</era>
+						<era type="54">ၶၢၼ်းၼိၼ်ႇ (1017–1021)</era>
+						<era type="55">ၸီးဢၼ်ႇ (1021–1024)</era>
+						<era type="56">မၼ်းၸူႇ (1024–1028)</era>
+						<era type="57">ၶျူဝ်းၵႅၼ်ႇ (1028–1037)</era>
+						<era type="58">ၶျူဝ်းရိယႃၵု (1037–1040)</era>
+						<era type="59">ၶျူဝ်းၵျူႇ (1040–1044)</era>
+						<era type="60">ၶၢၼ်းတူဝ်ၵု (1044–1046)</era>
+						<era type="61">ဢီးသျူဝ်ႇ (1046–1053)</era>
+						<era type="62">တႅၼ်းၵီႇ (1053–1058)</era>
+						<era type="63">ၶူဝ်းႁေႇ (1058–1065)</era>
+						<era type="64">ၸီးရိယႃၵု (1065–1069)</era>
+						<era type="65">ဢႅၼ်းၵျူႇ (1069–1074)</era>
+						<era type="66">ၸူဝ်းႁူဝ်ႇ (1074–1077)</era>
+						<era type="67">သျူဝ်းရိယႃၵု (1077–1081)</era>
+						<era type="68">ဢီးႁူဝ်ႇ (1081–1084)</era>
+						<era type="69">ဢူဝ်းတူဝ်ၵု (1084–1087)</era>
+						<era type="70">ၶၢၼ်းၸီႇ (1087–1094)</era>
+						<era type="71">ၵႃးႁူဝ်ႇ (1094–1096)</era>
+						<era type="72">ဢီးၶျူဝ်ႇ (1096–1097)</era>
+						<era type="73">ၸူဝ်းတူဝ်ၵု (1097–1099)</era>
+						<era type="74">ၵူဝ်းဝႃႇ (1099–1104)</era>
+						<era type="75">ၶျူဝ်းၸီႇ (1104–1106)</era>
+						<era type="76">ၵႃးသျူဝ်ႇ (1106–1108)</era>
+						<era type="77">တႅၼ်းၼိၼ်ႇ (1108–1110)</era>
+						<era type="78">တႅၼ်းဢီႇ (1110–1113)</era>
+						<era type="79">ဢီးၵျူႇ (1113–1118)</era>
+						<era type="80">ၵႅၼ်းဢီႇ (1118–1120)</era>
+						<era type="81">ႁူဝ်းဢၼ်ႇ (1120–1124)</era>
+						<era type="82">တႅၼ်းၸီႇ (1124–1126)</era>
+						<era type="83">တႆးၸီႇ (1126–1131)</era>
+						<era type="84">တႅၼ်းသျူဝ်ႇ (1131–1132)</era>
+						<era type="85">ၶျူဝ်းသျူဝ်ႇ (1132–1135)</era>
+						<era type="86">ႁူဝ်းဢႅၼ်ႇ (1135–1141)</era>
+						<era type="87">ဢီးၸီႇ (1141–1142)</era>
+						<era type="88">ၵူဝ်းၸီႇ (1142–1144)</era>
+						<era type="89">တႅၼ်းယူဝ်ႇ (1144–1145)</era>
+						<era type="90">ၵျူးဢၼ်ႇ (1145–1151)</era>
+						<era type="91">ၼိၼ်းပေႇ (1151–1154)</era>
+						<era type="92">ၵျူးၸူႇ (1154–1156)</era>
+						<era type="93">ႁူဝ်းၵႅၼ်ႇ (1156–1159)</era>
+						<era type="94">ႁေးၸီႇ (1159–1160)</era>
+						<era type="95">ဢီးရိယႃၵု (1160–1161)</era>
+						<era type="96">ဢူဝ်းႁူဝ်ႇ (1161–1163)</era>
+						<era type="97">ၶျူဝ်းၵၼ်ႇ (1163–1165)</era>
+						<era type="98">ဢီးမၼ်ႇ (1165–1166)</era>
+						<era type="99">ၼိၼ်းဢၼ်ႇ (1166–1169)</era>
+						<era type="100">ၵႃးဢူဝ်ႇ (1169–1171)</era>
+						<era type="101">သျူဝ်းဢၼ်ႇ (1171–1175)</era>
+						<era type="102">ဢၼ်းၵႅၼ်ႇ (1175–1177)</era>
+						<era type="103">ၸီးသျူဝ်ႇ (1177–1181)</era>
+						<era type="104">ယူဝ်းဝႃႇ (1181–1182)</era>
+						<era type="105">ၸူးဢီႇ (1182–1184)</era>
+						<era type="106">ၵႅၼ်းရိယႃၵု (1184–1185)</era>
+						<era type="107">ပုၼ်းၸီႇ (1185–1190)</era>
+						<era type="108">ၵႅၼ်းၵျူႇ (1190–1199)</era>
+						<era type="109">သျူဝ်းၸီႇ (1199–1201)</era>
+						<era type="110">ၵႅၼ်းၼိၼ်ႇ (1201–1204)</era>
+						<era type="111">ၵႅၼ်းၵျူႇ (1204–1206)</era>
+						<era type="112">ၵႅၼ်းဢီႇ (1206–1207)</era>
+						<era type="113">ၸူဝ်းၵႅၼ်ႇ (1207–1211)</era>
+						<era type="114">ၵႅၼ်းရိယႃၵု (1211–1213)</era>
+						<era type="115">ၵႅၼ်းပူဝ်ႇ (1213–1219)</era>
+						<era type="116">ၸူဝ်းၵျူႇ (1219–1222)</era>
+						<era type="117">ၸူဝ်းဢူဝ်ႇ (1222–1224)</era>
+						<era type="118">ၵႅၼ်းၼိၼ်ႇ (1224–1225)</era>
+						<era type="119">ၵႃးရူဝ်ၵု (1225–1227)</era>
+						<era type="120">ဢၼ်းတေႇ (1227–1229)</era>
+						<era type="121">ၶၢၼ်းၵီႇ (1229–1232)</era>
+						<era type="122">ၸူဝ်းဢီႇ (1232–1233)</era>
+						<era type="123">တႅၼ်းပုၵု (1233–1234)</era>
+						<era type="124">ပုၼ်းရိယႃၵု (1234–1235)</era>
+						<era type="125">ၵႃးတေႇ (1235–1238)</era>
+						<era type="126">ယႃးၵုၼိၼ်း (1238–1239)</era>
+						<era type="127">ဢၼ်းဢူဝ်ႇ (1239–1240)</era>
+						<era type="128">ၼိၼ်းၸီႇ (1240–1243)</era>
+						<era type="129">ၵၼ်းၵႅၼ်ႇ (1243–1247)</era>
+						<era type="130">ႁူဝ်းၸီႇ (1247–1249)</era>
+						<era type="131">ၵႅၼ်းၶျူဝ်ႇ (1249–1256)</era>
+						<era type="132">ၵူဝ်းၵႅၼ်ႇ (1256–1257)</era>
+						<era type="133">သျူဝ်းၵႃႇ (1257–1259)</era>
+						<era type="134">သျူဝ်းၵႅၼ်ႇ (1259–1260)</era>
+						<era type="135">ပုၼ်းဢူဝ်ႇ (1260–1261)</era>
+						<era type="136">ၵူဝ်းၶျူဝ်ႇ (1261–1264)</era>
+						<era type="137">ပုၼ်းဢီႇ (1264–1275)</era>
+						<era type="138">ၶၢၼ်းၸီႇ (1275–1278)</era>
+						<era type="139">ၶူဝ်းဢၼ်ႇ (1278–1288)</era>
+						<era type="140">သျူဝ်းဢူဝ်ႇ (1288–1293)</era>
+						<era type="141">ဢီးၼိၼ်ႇ (1293–1299)</era>
+						<era type="142">သျူဝ်းဢၼ်ႇ (1299–1302)</era>
+						<era type="143">ၵႅၼ်းၵႅၼ်ႇ (1302–1303)</era>
+						<era type="144">ၵႃးၵႅၼ်ႇ (1303–1306)</era>
+						<era type="145">တူဝ်းၵုၸိ (1306–1308)</era>
+						<era type="146">ဢၼ်းၵျူဝ်ႇ (1308–1311)</era>
+						<era type="147">ဢူဝ်းၶျူဝ်ႇ (1311–1312)</era>
+						<era type="148">သျူဝ်းဝႃႇ (1312–1317)</era>
+						<era type="149">ပုၼ်းပူဝ်ႇ (1317–1319)</era>
+						<era type="150">ၵႅၼ်းဢူဝ်ႇ (1319–1321)</era>
+						<era type="151">ၵႅၼ်းၵူဝ်ႇ (1321–1324)</era>
+						<era type="152">သျူဝ်းၶျူႇ (1324–1326)</era>
+						<era type="153">ၵႃးရိယႃၵု (1326–1329)</era>
+						<era type="154">ၵႅၼ်းတူဝ်ၵု (1329–1331)</era>
+						<era type="155">ၵႅၼ်းၵူဝ်ႇ (1331–1334)</era>
+						<era type="156">ၵႅၼ်းမူႇ (1334–1336)</era>
+						<era type="157">ဢၼ်းၵႅၼ်ႇ (1336–1340)</era>
+						<era type="158">ၵူဝ်းၵူဝ်ၵု (1340–1346)</era>
+						<era type="159">သျူဝ်းႁေႇ (1346–1370)</era>
+						<era type="160">ၵႅၼ်းတူဝ်ၵု (1370–1372)</era>
+						<era type="161">ပုၼ်းၶျူႇ (1372–1375)</era>
+						<era type="162">တႅၼ်းၸူႇ (1375–1379)</era>
+						<era type="163">ၵူဝ်းရိယႃၵု (1379–1381)</era>
+						<era type="164">ၵူဝ်းဝႃႇ (1381–1384)</era>
+						<era type="165">ၵႅၼ်းၶျူႇ (1384–1392)</era>
+						<era type="166">သျီးတူဝ်ၵု (1384–1387)</era>
+						<era type="167">ၵႃးၵေႇ (1387–1389)</era>
+						<era type="168">ၵူဝ်းဢူဝ်ႇ (1389–1390)</era>
+						<era type="169">မေးတူဝ်ၵု (1390–1394)</era>
+						<era type="170">ဢူဝ်းဢီႇ (1394–1428)</era>
+						<era type="171">သျူဝ်းၶျူဝ်ႇ (1428–1429)</era>
+						<era type="172">ဢီးၶျူဝ်ႇ (1429–1441)</era>
+						<era type="173">ၵႃးၵိသု (1441–1444)</era>
+						<era type="174">ပုၼ်းဢၼ်ႇ (1444–1449)</era>
+						<era type="175">ႁူဝ်းတူဝ်ႇၵု (1449–1452)</era>
+						<era type="176">ၵျူဝ်းတူဝ်ၵု (1452–1455)</era>
+						<era type="177">ၵူဝ်းသျူဝ်ႇ (1455–1457)</era>
+						<era type="178">ၶျူဝ်းရူဝ်ၵု (1457–1460)</era>
+						<era type="179">ၵၼ်းသျူဝ်ႇ (1460–1466)</era>
+						<era type="180">ပုၼ်းသျူဝ်ႇ (1466–1467)</era>
+						<era type="181">ဢူဝ်းၼိၼ်ႇ (1467–1469)</era>
+						<era type="182">ပုၼ်းမေႇ (1469–1487)</era>
+						<era type="183">ၶျူဝ်းၵျူဝ်ႇ (1487–1489)</era>
+						<era type="184">ဢၼ်းတူဝ်ၵု (1489–1492)</era>
+						<era type="185">မေးဢူဝ်ႇ (1492–1501)</era>
+						<era type="186">ပုၼ်းၵီႇ (1501–1504)</era>
+						<era type="187">ဢီးသျူဝ်ႇ (1504–1521)</era>
+						<era type="188">တႆးဢီႇ (1521–1528)</era>
+						<era type="189">ၵျူဝ်းရူဝ်ၵု (1528–1532)</era>
+						<era type="190">တႅၼ်းပုၼ်ႇ (1532–1555)</era>
+						<era type="191">ၵူဝ်းၸီႇ (1555–1558)</era>
+						<era type="192">ဢီးရူဝ်ၵု (1558–1570)</era>
+						<era type="193">ၵႅၼ်းၵီႇ (1570–1573)</era>
+						<era type="194">တႅၼ်းသျူဝ်ႇ (1573–1592)</era>
+						<era type="195">ပုၼ်းရူဝ်ၵု (1592–1596)</era>
+						<era type="196">ၵေးၶျူဝ်ႇ (1596–1615)</era>
+						<era type="197">ၵႅၼ်းၼႃႇ (1615–1624)</era>
+						<era type="198">ၶၢၼ်းဢီႇ (1624–1644)</era>
+						<era type="199">သျူဝ်းႁူဝ်ႇ (1644–1648)</era>
+						<era type="200">ၵေးဢၼ်ႇ (1648–1652)</era>
+						<era type="201">ၸူဝ်းဢူဝ်ႇ (1652–1655)</era>
+						<era type="202">မေးရေၵိ (1655–1658)</era>
+						<era type="203">မၼ်းၸီႇ (1658–1661)</era>
+						<era type="204">ၶၢၼ်းပုၼ်ႇ (1661–1673)</era>
+						<era type="205">ဢၼ်းပူဝ်ႇ (1673–1681)</era>
+						<era type="206">တႅၼ်းၼႃႇ (1681–1684)</era>
+						<era type="207">ၸူဝ်းၵျူဝ်ႇ (1684–1688)</era>
+						<era type="208">ၵႅၼ်းရူဝ်ၵု (1688–1704)</era>
+						<era type="209">ႁူဝ်းဢီႇ (1704–1711)</era>
+						<era type="210">သျူဝ်းတူဝ်ၵု (1711–1716)</era>
+						<era type="211">ၵျူဝ်းႁူဝ်ႇ (1716–1736)</era>
+						<era type="212">ၵႅၼ်းပုၼ်ႇ (1736–1741)</era>
+						<era type="213">ၶၢၼ်းပူဝ်ႇ (1741–1744)</era>
+						<era type="214">ဢၼ်းၵျူဝ်ႇ (1744–1748)</era>
+						<era type="215">ၶၢၼ်းဢႅၼ်ႇ (1748–1751)</era>
+						<era type="216">ႁူဝ်းရေၵိ (1751–1764)</era>
+						<era type="217">မေးဝႃႇ (1764–1772)</era>
+						<era type="218">ဢၼ်းဢီႇ (1772–1781)</era>
+						<era type="219">တႅၼ်းမေႇ (1781–1789)</era>
+						<era type="220">ၶၢၼ်းသေႇ (1789–1801)</era>
+						<era type="221">ၵျူဝ်းဝႃႇ (1801–1804)</era>
+						<era type="222">ပုၼ်းၵႃႇ (1804–1818)</era>
+						<era type="223">ပုၼ်းသေႇ (1818–1830)</era>
+						<era type="224">တၼ်းပူဝ်ႇ (1830–1844)</era>
+						<era type="225">ၵူဝ်းၵႃႇ (1844–1848)</era>
+						<era type="226">ၵႃးဢီႇ (1848–1854)</era>
+						<era type="227">ဢၼ်းသေႇ (1854–1860)</era>
+						<era type="228">မၼ်းဢႅၼ်ႇ (1860–1861)</era>
+						<era type="229">ပုၼ်းၵျူႇ (1861–1864)</era>
+						<era type="230">ၵႅၼ်းၸီႇ (1864–1865)</era>
+						<era type="231">ၵေးဢူဝ်ႇ (1865–1868)</era>
+						<era type="232">မေးၸီႇ</era>
+						<era type="233">တႆးသျူဝ်ႇ</era>
+						<era type="234">သျူဝ်းဝႃႇ</era>
+						<era type="235">ႁေးသီႇ</era>
+						<era type="236">ရေးဝႃႇ</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">တႆးၵႃႇ</era>
+						<era type="1">ႁၵုၶျိ</era>
+						<era type="2">ႁႃးၵုႁူဝ်</era>
+						<era type="3">သူးၶျူဝ်ႇ</era>
+						<era type="4">တႆးႁူဝ်ႇ</era>
+						<era type="5">ၵေးယိုင်ႇ</era>
+						<era type="6">ဝႃးတူဝ်ႇ</era>
+						<era type="7">ရေးၵီႇ</era>
+						<era type="8">ယူဝ်းရူဝ်ႇ</era>
+						<era type="9">ၸိၼ်းၵီႇ</era>
+						<era type="10">တႅၼ်းပျူဝ်ႇ</era>
+						<era type="11">တႅၼ်းပျူဝ်ႇ-ၵမ်းပူဝ်ႇ</era>
+						<era type="12">တႅၼ်းပျူဝ်ႇ-သျူဝ်းႁူဝ်ႇ</era>
+						<era type="13">တႅၼ်းပျူဝ်ႇ-ႁူဝ်းၸီႇ</era>
+						<era type="14">တႅၼ်းပျူဝ်ႇ-ၸိၼ်းၵူဝ်ႇ</era>
+						<era type="15">ၸိၼ်းၵူဝ်ႇ-ၵေးယိုင်ႇ</era>
+						<era type="16">ႁူဝ်ၵီႇ</era>
+						<era type="17">တႅၼ်းဢူဝ်ႇ</era>
+						<era type="18">ဢႅၼ်ရိယႃၵု</era>
+						<era type="19">တၢႆတူဝ်ႇ</era>
+						<era type="20">ၶူဝ်းၼိၼ်ႇ</era>
+						<era type="21">တႅၼ်းၶျူဝ်ႇ</era>
+						<era type="22">ၸူဝ်းဝႃႇ</era>
+						<era type="23">ၵႃသျူဝ်ႇ</era>
+						<era type="24">ၼိၼ်းၸူႇ</era>
+						<era type="25">သၢႆၵူဝ်ႇ</era>
+						<era type="26">တႅၼ်းဢၼ်ႇ</era>
+						<era type="27">ၸူဝ်းၵၼ်</era>
+						<era type="28">ၵၼ်းၵျူဝ်ႇ</era>
+						<era type="29">ၼိၼ်းၼႃႇ</era>
+						<era type="30">ၵၼ်းပျူဝ်ႇ</era>
+						<era type="31">သျူဝ်းတႆႇ</era>
+						<era type="32">ဢႅၼ်းၵီႇ</era>
+						<era type="33">ဢႅၼ်းၶျူဝ်ႇ</era>
+						<era type="34">ၸူဝ်းႁေႇ</era>
+						<era type="35">တႅၼ်းၵျူဝ်ႇ</era>
+						<era type="36">တႅၼ်ရိယႃၵု</era>
+						<era type="37">တႅၼ်းတူဝ်ၵု</era>
+						<era type="38">ဢူဝ်းဝႃႇ</era>
+						<era type="39">ၵူဝ်းႁူဝ်ႇ</era>
+						<era type="40">ဢၼ်းၼႃႇ</era>
+						<era type="41">တႅၼ်းရူဝ်ၵု</era>
+						<era type="42">တႅၼ်းဢႅၼ်ႇ</era>
+						<era type="43">ၸူဝ်းၵႅၼ်ႇ</era>
+						<era type="44">တႅၼ်းၵႅၼ်ႇ</era>
+						<era type="45">ဢီးၵၼ်ႇ</era>
+						<era type="46">ၵၼ်းၼႃႉ</era>
+						<era type="47">ဢီးဢႅၼ်ႇ</era>
+						<era type="48">ဢီးသူဝ်ႇ</era>
+						<era type="49">သျူဝ်ရိယႃၵု</era>
+						<era type="50">ၶျူဝ်းတူဝ်ၵု</era>
+						<era type="51">ၶျူဝ်းႁူဝ်ႇ</era>
+						<era type="52">ၵၼ်းၵူဝ်ႇ</era>
+						<era type="53">ၶျူဝ်းဝႃႇ</era>
+						<era type="54">ၵၼ်းၼိၼ်ႇ</era>
+						<era type="55">ၸီးဢၼ်ႇ</era>
+						<era type="56">မၼ်းၸူႇ</era>
+						<era type="57">ၶျူဝ်းၵႅၼ်ႇ</era>
+						<era type="58">ၶျူဝ်ရိယႃၵု</era>
+						<era type="59">ၶျူဝ်းၵျူႇ</era>
+						<era type="60">ၵၼ်းတူဝ်ၵု</era>
+						<era type="61">ဢီးသျူဝ်ႇ (1046–1053)</era>
+						<era type="62">တႅၼ်းၵီႇ</era>
+						<era type="63">ၵူဝ်းႁေႇ</era>
+						<era type="64">ၸီရိယႃၵု</era>
+						<era type="65">ဢႅၼ်းၵျူႇ</era>
+						<era type="66">ၸူဝ်းႁူဝ်ႇ</era>
+						<era type="67">ၸူဝ်ရိယႃၵု</era>
+						<era type="68">ဢီးႁူဝ်ႇ</era>
+						<era type="69">ဢူဝ်းတူဝ်ၵု</era>
+						<era type="70">ၵၼ်းၸီႇ</era>
+						<era type="71">ၵႃႁူဝ်ႇ</era>
+						<era type="72">ဢီးၶျူဝ်ႇ</era>
+						<era type="73">ၸူဝ်းတူဝ်ၵု</era>
+						<era type="74">ၵူဝ်းဝႃႇ</era>
+						<era type="75">ၶျူဝ်းၸီႇ</era>
+						<era type="76">ၵႃၸူဝ်ႇ</era>
+						<era type="77">တႅၼ်းၼိၼ်ႇ</era>
+						<era type="78">တႅၼ်းဢီႇ</era>
+						<era type="79">ဢီးၵျူႇ</era>
+						<era type="80">ၵႅၼ်းဢီႇ</era>
+						<era type="81">ႁူဝ်းဢၼ်ႇ</era>
+						<era type="82">တႅၼ်းၸီႇ</era>
+						<era type="83">တႆးၸီႇ</era>
+						<era type="84">တႅၼ်းသျူဝ်ႇ</era>
+						<era type="85">ၶျူဝ်းသျူဝ်ႇ</era>
+						<era type="86">ႁူဝ်းဢႅၼ်ႇ</era>
+						<era type="87">ဢီးၸီႇ</era>
+						<era type="88">ၵူဝ်းၸီႇ</era>
+						<era type="89">တႅၼ်းယူဝ်ႇ</era>
+						<era type="90">ၵျူးဢၼ်ႇ</era>
+						<era type="91">ၼိၼ်းပေႇ</era>
+						<era type="92">ၵျူးၸူႇ</era>
+						<era type="93">ႁူင်းၵႅၼ်ႇ</era>
+						<era type="94">ႁေးၸီႇ</era>
+						<era type="95">ဢိရယႃၵု</era>
+						<era type="96">ဢူဝ်းႁူဝ်ႇ</era>
+						<era type="97">ၶျူဝ်းၵၼ်ႇ</era>
+						<era type="98">ဢီးမၼ်ႇ</era>
+						<era type="99">ၼိၼ်းဢၼ်ႇ</era>
+						<era type="100">ၵႃဢူဝ်ႇ</era>
+						<era type="101">ၸူဝ်းဢၼ်ႇ</era>
+						<era type="102">ဢၼ်းၵႅၼ်ႇ</era>
+						<era type="103">ၸီးသျူဝ်ႇ</era>
+						<era type="104">ယူဝ်းဝႃႇ</era>
+						<era type="105">ၵျူးဢီႇ</era>
+						<era type="106">ၵႅၼ်ရိယႃၵု</era>
+						<era type="107">ပုၼ်းၸီႇ</era>
+						<era type="108">ၵႅၼ်းၵျူႇ</era>
+						<era type="109">သျူဝ်းၸီႇ</era>
+						<era type="110">ၵႅၼ်းၼိၼ်ႇ</era>
+						<era type="111">ၵႅၼ်းၵျူႇ</era>
+						<era type="112">ၵႅၼ်းဢီႇ</era>
+						<era type="113">ၸူဝ်းၵႅၼ်ႇ</era>
+						<era type="114">ၵႅၼ်ရိယႃၵု</era>
+						<era type="115">ၵႅမ်းပူဝ်ႇ</era>
+						<era type="116">ၸူဝ်းၵျူႇ</era>
+						<era type="117">ၸူဝ်းဢူဝ်ႇ</era>
+						<era type="118">ၵႅၼ်းၼိၼ်ႇ</era>
+						<era type="119">ၵႃးရူဝ်ၵု</era>
+						<era type="120">ဢၼ်းတေႇ</era>
+						<era type="121">ၵၢၼ်းၵီႇ</era>
+						<era type="122">ၸူဝ်းဢီႇ</era>
+						<era type="123">တႅၼ်းပုၵု</era>
+						<era type="124">ပုၼ်ရိယႃၵု</era>
+						<era type="125">ၵႃးတေႇ</era>
+						<era type="126">ယႃႉၵုၼိၼ်း</era>
+						<era type="127">ဢႅၼ်းဢူဝ်ႇ</era>
+						<era type="128">ၼိၼ်းၸီႇ</era>
+						<era type="129">ၵၼ်းၵႅၼ်ႇ</era>
+						<era type="130">ႁူဝ်းၸီႇ</era>
+						<era type="131">ၵႅၼ်းၶျူဝ်ႇ</era>
+						<era type="132">ၵူဝ်းၵႅၼ်ႇ</era>
+						<era type="133">သျူဝ်းၵႃႇ</era>
+						<era type="134">သျူဝ်းၵႅၼ်ႇ</era>
+						<era type="135">ပုၼ်းဢူဝ်ႇ</era>
+						<era type="136">ၵူဝ်းၶျူဝ်ႇ</era>
+						<era type="137">ပုၼ်းဢီႇ</era>
+						<era type="138">ၵႅၼ်းၸီႇ</era>
+						<era type="139">ၵူဝ်းဢၼ်ႇ</era>
+						<era type="140">သျူဝ်းဢူဝ်ႇ</era>
+						<era type="141">ဢီးၼိၼ်ႇ</era>
+						<era type="142">သျူဝ်းဢၼ်ႇ</era>
+						<era type="143">ၵႅၼ်းၵႅၼ်ႇ</era>
+						<era type="144">ၵႃးၵႅၼ်ႇ</era>
+						<era type="145">တူဝ်ၵုၸိ</era>
+						<era type="146">ဢႅၼ်းၵျူဝ်ႇ</era>
+						<era type="147">ဢူဝ်းၶျူဝ်ႇ</era>
+						<era type="148">သျူဝ်းဝႃႇ</era>
+						<era type="149">ပုၼ်းပူဝ်ႇ</era>
+						<era type="150">ၵႅၼ်းဢူဝ်ႇ</era>
+						<era type="151">ၵႅၼ်းၵူဝ်ႇ</era>
+						<era type="152">သျူဝ်းၶျူႇ</era>
+						<era type="153">ၵႃရိယႃၵု</era>
+						<era type="154">ၵႅၼ်တူဝ်ၵု</era>
+						<era type="155">ၵႅၼ်းၵူဝ်ႇ</era>
+						<era type="156">ၵႅၼ်းမူႇ</era>
+						<era type="157">ဢႅၼ်းၵႅၼ်ႇ</era>
+						<era type="158">ၵူဝ်းၵူဝ်ၵု</era>
+						<era type="159">သျူဝ်းႁေႇ</era>
+						<era type="160">ၵႅၼ်တူဝ်ၵု</era>
+						<era type="161">ပုၼ်းၶျူႇ</era>
+						<era type="162">တႅၼ်းၸူႇ</era>
+						<era type="163">ၵူဝ်ရိယႃၵု</era>
+						<era type="164">ၵူဝ်းဝႃႇ</era>
+						<era type="165">ၵႅၼ်းၶျူႇ</era>
+						<era type="166">သျိတူဝ်ၵု</era>
+						<era type="167">ၵႃးၵေႇ</era>
+						<era type="168">ၵူဝ်းဢူဝ်ႇ</era>
+						<era type="169">မေတူဝ်ၵု</era>
+						<era type="170">ဢူဝ်းဢီႇ</era>
+						<era type="171">သျူဝ်းၶျူဝ်ႇ</era>
+						<era type="172">ဢီးၵျူဝ်ႇ</era>
+						<era type="173">ၵႃးၵိသု</era>
+						<era type="174">ပုၼ်းဢၼ်ႇ</era>
+						<era type="175">ႁူဝ်တူဝ်ၵု</era>
+						<era type="176">ၵျူဝ်တူဝ်ၵု</era>
+						<era type="177">ၵူဝ်းသျူဝ်ႇ</era>
+						<era type="178">ၶျူဝ်းရူဝ်ၵု</era>
+						<era type="179">ၵၼ်းသျူဝ်ႇ</era>
+						<era type="180">ပုၼ်းသျူဝ်ႇ</era>
+						<era type="181">ဢူဝ်းၼိၼ်ႇ</era>
+						<era type="182">ပုၼ်းမေႇ</era>
+						<era type="183">ၶျူဝ်းၵျူဝ်ႇ</era>
+						<era type="184">ဢၼ်းတူဝ်ၵု</era>
+						<era type="185">မေးဢူဝ်ႇ</era>
+						<era type="186">ပုၼ်းၵီႇ</era>
+						<era type="187">ဢီးၶျူဝ်ႇ</era>
+						<era type="188">တႆးဢီႇ</era>
+						<era type="189">ၵျူဝ်းရူဝ်ၵု</era>
+						<era type="190">တႅၼ်းပုၼ်ႇ</era>
+						<era type="191">ၵူဝ်းၸီႇ</era>
+						<era type="192">ဢီးရူဝ်ၵု</era>
+						<era type="193">ၵႅၼ်းၵီႇ</era>
+						<era type="194">တႅၼ်းသျူဝ်ႇ</era>
+						<era type="195">ပုၼ်းရူဝ်ၵု</era>
+						<era type="196">ၵေးၶျူဝ်ႇ</era>
+						<era type="197">ၵႅၼ်းၼႃႉ</era>
+						<era type="198">ၵၼ်းဢီႇ</era>
+						<era type="199">သျူဝ်းႁူဝ်ႇ</era>
+						<era type="200">ၵေးဢၼ်ႇ</era>
+						<era type="201">ၸူဝ်းဢူဝ်ႇ</era>
+						<era type="202">မေးရႄၵိ</era>
+						<era type="203">မၼ်းၸီႇ</era>
+						<era type="204">ၵၼ်းပုၼ်ႇ</era>
+						<era type="205">ဢႅၼ်းပူဝ်ႇ</era>
+						<era type="206">တႅၼ်းၼႃႉ</era>
+						<era type="207">ၸူဝ်းၵျူဝ်ႇ</era>
+						<era type="208">ၵႅၼ်းရူဝ်ၵု</era>
+						<era type="209">ႁူဝ်းဢီႇ</era>
+						<era type="210">သျူဝ်းတူဝ်ၵု</era>
+						<era type="211">ၵျူဝ်းႁူဝ်ႇ</era>
+						<era type="212">ၵႅၼ်းပုၼ်ႇ</era>
+						<era type="213">ၵၼ်းပူဝ်ႇ</era>
+						<era type="214">ဢႅၼ်းၵျူဝ်ႇ</era>
+						<era type="215">ၵၼ်းဢႅၼ်ႇ</era>
+						<era type="216">ႁူဝ်းရႄၵိ</era>
+						<era type="217">မေးဝႃႇ</era>
+						<era type="218">ဢၼ်းဢီႇ</era>
+						<era type="219">တႅၼ်းမေႇ</era>
+						<era type="220">ၵၼ်းသေႇ</era>
+						<era type="221">ၵျူဝ်းဝႃႇ</era>
+						<era type="222">ပုၼ်းၵႃႇ</era>
+						<era type="223">ပုၼ်းသေႇ</era>
+						<era type="224">တႅၼ်းပူဝ်ႇ</era>
+						<era type="225">ၵူဝ်းၵႃႇ</era>
+						<era type="226">ၵႃးဢီႇ</era>
+						<era type="227">ဢၼ်းသေႇ</era>
+						<era type="228">မၼ်းဢႅၼ်ႇ</era>
+						<era type="229">ပုၼ်းၵျူႇ</era>
+						<era type="230">ၵႅၼ်းၸီႇ</era>
+						<era type="231">ၵေးဢူဝ်ႇ</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="persian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">ၾႃႇဝႃႇတိၼ်ႇ</month>
+							<month type="2">ဢေႃးတီႇပႄႇႁႅတ်ႉ</month>
+							<month type="3">ၶူဝ်ႇရၢတ်ႉ</month>
+							<month type="4">တီးရ်</month>
+							<month type="5">မေႃႇတတ်ႉ</month>
+							<month type="6">သျႃးရိဝႃႇ</month>
+							<month type="7">မႄးႁႃႇ</month>
+							<month type="8">ဢပၢၼ်ႇ</month>
+							<month type="9">ဢႃႇၸႃႇ</month>
+							<month type="10">တေႇ</month>
+							<month type="11">ပႃႇမၢၼ်ႇ</month>
+							<month type="12">ဢႅတ်ႉၾႅၼ်ႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ၾႃႇဝႃႇတိၼ်ႇ</month>
+							<month type="2">ဢေႃးတီႇပႄႇႁႅတ်ႉ</month>
+							<month type="3">ၶူဝ်ႇရၢတ်ႉ</month>
+							<month type="4">တီးရ်</month>
+							<month type="5">မေႃႇတတ်ႉ</month>
+							<month type="6">သျႃးရိဝႃႇ</month>
+							<month type="7">မႄးႁႃႇ</month>
+							<month type="8">ဢပၢၼ်ႇ</month>
+							<month type="9">ဢႃႇၸႃႇ</month>
+							<month type="10">တေႇ</month>
+							<month type="11">ပႃႇမၢၼ်ႇ</month>
+							<month type="12">ဢႅတ်ႉၾႅၼ်ႇ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">ၾႃႇဝႃႇတိၼ်ႇ</month>
+							<month type="2">ဢေႃးတီႇပႄႇႁႅတ်ႉ</month>
+							<month type="3">ၶူဝ်ႇရၢတ်ႉ</month>
+							<month type="4">တီးရ်</month>
+							<month type="5">မေႃႇတတ်ႉ</month>
+							<month type="6">သျႃးရိဝႃႇ</month>
+							<month type="7">မႄးႁႃႇ</month>
+							<month type="8">ဢပၢၼ်ႇ</month>
+							<month type="9">ဢႃႇၸႃႇ</month>
+							<month type="10">တေႇ</month>
+							<month type="11">ပႃႇမၢၼ်ႇ</month>
+							<month type="12">ဢႅတ်ႉၾႅၼ်ႇ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">ၾႃႇဝႃႇတိၼ်ႇ</month>
+							<month type="2">ဢေႃးတီႇပႄႇႁႅတ်ႉ</month>
+							<month type="3">ၶူဝ်ႇရၢတ်ႉ</month>
+							<month type="4">တီးရ်</month>
+							<month type="5">မေႃႇတတ်ႉ</month>
+							<month type="6">သျႃးရိဝႃႇ</month>
+							<month type="7">မႄးႁႃႇ</month>
+							<month type="8">ဢပၢၼ်ႇ</month>
+							<month type="9">ဢႃႇၸႃႇ</month>
+							<month type="10">တေႇ</month>
+							<month type="11">ပႃႇမၢၼ်ႇ</month>
+							<month type="12">ဢႅတ်ႉၾႅၼ်ႇ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<eras>
+					<eraNames>
+						<era type="0">ပီပႃႇသျႃး</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ပီပႃႇသျႃး</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ပီပႃႇသျႃး</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="roc">
+				<eras>
+					<eraNames>
+						<era type="0">ပီဢွၼ်တၢင်းထၢႆႇဝၢၼ်း</era>
+						<era type="1">ထၢႆႇဝၢၼ်း</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ပဢတ. ထၢႆႇဝၢၼ်း</era>
+						<era type="1">ထၢႆႇဝၢၼ်း</era>
+					</eraAbbr>
+					<eraNarrow>
+						<era type="0">ပဢတ. ထၢႆႇဝၢၼ်း</era>
+						<era type="1">ထၢႆႇဝၢၼ်း</era>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d - EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>G y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} ၶၢဝ်းယၢမ်း {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="Ed">d - E</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d - E</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd - E</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d - E</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd - E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d - E</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="G">GGGGG y-MM-dd - E – GGGGG y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="G">G y MMM d - E – G y MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd - E – MM-dd - E</greatestDifference>
+							<greatestDifference id="M">MM-dd - E – MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">MMM d - E – MMM d - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd - E – y-MM-dd - E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="M">G y MMM d - E – MMM d - E</greatestDifference>
+							<greatestDifference id="y">G y MMM d - E – y MMM d - E</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>ပၢၼ်</displayName>
+			</field>
+			<field type="era-short">
+				<displayName>ပၢၼ်</displayName>
+			</field>
+			<field type="era-narrow">
+				<displayName>ပၢၼ်</displayName>
+			</field>
+			<field type="year">
+				<displayName>ပီ</displayName>
+				<relative type="-1">ပီၵၢႆ</relative>
+				<relative type="0">ပီၼႆႉ</relative>
+				<relative type="1">ပီၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ပီ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ပီ ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>ပီ</displayName>
+				<relative type="-1">ပီၵၢႆ</relative>
+				<relative type="0">ပီၼႆႉ</relative>
+				<relative type="1">ပီၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ပီ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ပီ ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-narrow">
+				<displayName>ပီ</displayName>
+				<relative type="-1">ပီၵၢႆ</relative>
+				<relative type="0">ပီၼႆႉ</relative>
+				<relative type="1">ပီၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ပီ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ပီ ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter">
+				<displayName>သၢမ်လိူၼ်ႁွပ်ႈ</displayName>
+				<relative type="-1">သၢမ်လိူၼ်ႁွပ်ႈ လိုၼ်းသုတ်း</relative>
+				<relative type="0">သၢမ်လိူၼ်ႁွမ်ႈၼႆႉ</relative>
+				<relative type="1">သၢမ်လိူၼ်ႁွပ်ႈၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} သၢမ်လိူၼ်ႁွပ်ႈ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} သၢမ်လိူၼ်ႁွပ်ႈ ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-short">
+				<displayName>သၢမ်လိူၼ်ႁွပ်ႈ</displayName>
+				<relative type="-1">သလႁ. လိုၼ်းသုတ်း</relative>
+				<relative type="0">သလႁ. ၼႆႉ</relative>
+				<relative type="1">သလႁ. ၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} သလႁ.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} သလႁ. ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>သၢမ်လိူၼ်ႁွပ်ႈ</displayName>
+				<relative type="-1">သလႁ. လိုၼ်းသုတ်း</relative>
+				<relative type="0">သၢမ်လိူၼ်ႁွပ်ႈၼႆႉ</relative>
+				<relative type="1">သလႁ. ၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} သလႁ.</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} သလႁ. ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>လိူၼ်</displayName>
+				<relative type="-1">လိူၼ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">လိူၼ်ၼႆႉ</relative>
+				<relative type="1">လိူၼ်ၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} လိူၼ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} လိူၼ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>လိူၼ်</displayName>
+				<relative type="-1">လိူၼ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">လိူၼ်ၼႆႉ</relative>
+				<relative type="1">လိူၼ်ၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} လိူၼ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} လိူၼ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-narrow">
+				<displayName>လိူၼ်</displayName>
+				<relative type="-1">လိူၼ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">လိူၼ်ၼႆႉ</relative>
+				<relative type="1">လိူၼ်ၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} လိူၼ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} လိူၼ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>ဝူင်ႈ</displayName>
+				<relative type="-1">ဝူင်ႈပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝူင်ႈၼႆႉ</relative>
+				<relative type="1">ဝူင်ႈၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝူင်ႈ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝူင်ႈပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>ဝူင်ႈ {0}</relativePeriod>
+			</field>
+			<field type="week-short">
+				<displayName>ဝူင်ႈ</displayName>
+				<relative type="-1">ဝူင်ႈပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝူင်ႈၼႆႉ</relative>
+				<relative type="1">ဝူင်ႈၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝူင်ႈ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝူင်ႈပူၼ်မႃး</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>ဝူင်ႈ {0}</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<displayName>ဝူင်ႈ</displayName>
+				<relative type="-1">ဝူင်ႈပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝူင်ႈၼႆႉ</relative>
+				<relative type="1">ဝူင်ႈၼႃႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝူင်ႈ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝူင်ႈပူၼ်မႃး</relativeTimePattern>
+				</relativeTime>
+				<relativePeriod>ဝူင်ႈ {0}</relativePeriod>
+			</field>
+			<field type="weekOfMonth">
+				<displayName>ဝူင်ႈၶွင်လိူၼ်</displayName>
+			</field>
+			<field type="weekOfMonth-short">
+				<displayName>ဝူင်ႈၶွင်လိူၼ်</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName>ဝူင်ႈၶွင်လိူၼ်</displayName>
+			</field>
+			<field type="day">
+				<displayName>ဝၼ်း</displayName>
+				<relative type="-1">မိူဝ်ႈဝႃး</relative>
+				<relative type="0">မိူဝ်ႈၼႆႉ</relative>
+				<relative type="1">မိူဝ်ႈၽုၵ်ႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>ဝၼ်း</displayName>
+				<relative type="-1">မိူဝ်ႈဝႃး</relative>
+				<relative type="0">မိူဝ်ႈၼႆႉ</relative>
+				<relative type="1">မိူဝ်ႈၽုၵ်ႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-narrow">
+				<displayName>ဝၼ်း</displayName>
+				<relative type="-1">မိူဝ်ႈဝႃး</relative>
+				<relative type="0">မိူဝ်ႈၼႆႉ</relative>
+				<relative type="1">မိူဝ်ႈၽုၵ်ႈ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayOfYear">
+				<displayName>ဝၼ်းၶွင်ပီ</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName>ဝၼ်းၶွင်ပီ</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName>ဝၼ်းၶွင်ပီ</displayName>
+			</field>
+			<field type="weekday">
+				<displayName>ဝၼ်းၶွင်ဝူင်ႈ</displayName>
+			</field>
+			<field type="weekday-short">
+				<displayName>ဝၼ်းၶွင်ဝူင်ႈ</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName>ဝၼ်းၶွင်ဝူင်ႈ</displayName>
+			</field>
+			<field type="weekdayOfMonth">
+				<displayName>ဝၼ်းၼႂ်းဝူင်ႈၶွင်လိူၼ်</displayName>
+			</field>
+			<field type="weekdayOfMonth-short">
+				<displayName>ဝၼ်းၼႂ်းဝူင်ႈၶွင်လိူၼ်</displayName>
+			</field>
+			<field type="weekdayOfMonth-narrow">
+				<displayName>ဝၼ်းၼႂ်းဝူင်ႈၶွင်လိူၼ်</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းဢႃးတိတ်ႉၼႆႉ</relative>
+				<relative type="1">ဝၼ်းဢႃးတိတ်ႉတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢႃးတိတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းဢႃးတိတ်ႉၼႆႉ</relative>
+				<relative type="1">ဝၼ်းဢႃးတိတ်ႉတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢႃးတိတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းဢႃးတိတ်ႉၼႆႉ</relative>
+				<relative type="1">ဝၼ်းဢႃးတိတ်ႉတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢႃးတိတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon">
+				<relative type="-1">ဝၼ်းၸၼ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းၸၼ်ၼႆႉ</relative>
+				<relative type="1">ဝၼ်းၸၼ်တေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၸၼ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းၸၼ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">ဝၼ်းၸၼ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းၸၼ်ၼႆႉ</relative>
+				<relative type="1">ဝၼ်းၸၼ်တေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၸၼ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းၸၼ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">ဝၼ်းၸၼ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းၸၼ်ၼႆႉ</relative>
+				<relative type="1">ဝၼ်းၸၼ်တေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၸၼ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းၸၼ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue">
+				<relative type="-1">ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းဢင်းၵၢၼ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းဢင်းၵၢၼ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢင်းၵၢၼ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းဢင်းၵၢၼ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းဢင်းၵၢၼ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢင်းၵၢၼ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းဢင်းၵၢၼ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းဢင်းၵၢၼ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢင်းၵၢၼ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed">
+				<relative type="-1">ဝၼ်းပုတ်ႉပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းပုတ်ႉၼႆႉ</relative>
+				<relative type="1">ဝၼ်းပုတ်ႉတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းပုတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းပုတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">ဝၼ်းပုတ်ႉပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းပုတ်ႉၼႆႉ</relative>
+				<relative type="1">ဝၼ်းပုတ်ႉတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းပုတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းပုတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">ဝၼ်းပုတ်ႉပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းပုတ်ႉၼႆႉ</relative>
+				<relative type="1">ဝၼ်းပုတ်ႉတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းပုတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းပုတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu">
+				<relative type="-1">ဝၼ်းၽတ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းၽတ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းၽတ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၽတ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းၽတ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">ဝၼ်းၽတ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းၽတ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းၽတ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၽတ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းၽတ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">ဝၼ်းၽတ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းၽတ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းၽတ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၽတ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းၽတ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri">
+				<relative type="-1">ဝၼ်းသုၵ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းသုၵ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းသုၵ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">ဝၼ်းသုၵ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းသုၵ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းသုၵ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">ဝၼ်းသုၵ်းပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းသုၵ်းၼႆႉ</relative>
+				<relative type="1">ဝၼ်းသုၵ်းတေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat">
+				<relative type="-1">ဝၼ်းသဝ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းသဝ်ၼႆႉ</relative>
+				<relative type="1">ဝၼ်းသဝ်တေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသဝ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းသဝ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">ဝၼ်းသဝ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းသဝ်ၼႆႉ</relative>
+				<relative type="1">ဝၼ်းသဝ်တေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသဝ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းသဝ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">ဝၼ်းသဝ်ပူၼ်ႉမႃး</relative>
+				<relative type="0">ဝၼ်းသဝ်ၼႆႉ</relative>
+				<relative type="1">ဝၼ်းသဝ်တေမႃး</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသဝ်</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ဝၼ်းသဝ်ပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="dayperiod-short">
+				<displayName>ၶၢဝ်းယၢမ်းဝၼ်း</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName>ၶၢဝ်းယၢမ်းဝၼ်း</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>ၶၢဝ်းယၢမ်းဝၼ်း</displayName>
+			</field>
+			<field type="hour">
+				<displayName>မူင်း</displayName>
+				<relative type="0">ၸူဝ်ႈမူင်းၼႆႉ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ၸူဝ်ႈမူင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ၸူဝ်ႈမူင်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-short">
+				<displayName>မူင်း</displayName>
+				<relative type="0">ၸူဝ်ႈမူင်းၼႆႉ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ၸူဝ်ႈမူင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ၸူဝ်ႈမူင်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="hour-narrow">
+				<displayName>မူင်း</displayName>
+				<relative type="0">ၸူဝ်ႈမူင်းၼႆႉ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ၸူဝ်ႈမူင်း</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ၸူဝ်ႈမူင်းပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>မိၼိတ်ႉ</displayName>
+				<relative type="0">မိၼိတ်ႉ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} မိၼိတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} မိၼိတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-short">
+				<displayName>မိၼိတ်ႉ</displayName>
+				<relative type="0">မိၼိတ်ႉ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} မိၼိတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} မိၼိတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute-narrow">
+				<displayName>မိၼိတ်ႉ</displayName>
+				<relative type="0">မိၼိတ်ႉ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} မိၼိတ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} မိၼိတ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>သႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<relative type="0">ယၢမ်းလဵဝ်</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ၸႅၵ်ႉၵၢၼ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ၸႅၵ်ၵၢၼ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-short">
+				<displayName>သႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<relative type="0">ယၢမ်းလဵဝ်</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ၸႅၵ်ႉၵၢၼ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ၸႅၵ်ၵၢၼ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second-narrow">
+				<displayName>သႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<relative type="0">ယၢမ်းလဵဝ်</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">ၼႂ်းၶၢဝ်းတၢင်း {0} ၸႅၵ်ႉၵၢၼ်ႉ</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">{0} ၸႅၵ်ၵၢၼ်ႉပူၼ်ႉမႃး</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>ၸူၼ်ႇၶၢဝ်းယၢမ်း</displayName>
+			</field>
+			<field type="zone-short">
+				<displayName>ၸူၼ်ႇ</displayName>
+			</field>
+			<field type="zone-narrow">
+				<displayName>ၸူၼ်ႇ</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat>ၶၢဝ်းယၢမ်း {0}</regionFormat>
+			<regionFormat type="daylight">ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း {0}</regionFormat>
+			<regionFormat type="standard">လၵ်းၸဵင် ၶၢဝ်းယၢမ်း {0}</regionFormat>
+			<zone type="Etc/UTC">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်းလုမ်ႈၾႃႉ</standard>
+				</long>
+			</zone>
+			<zone type="Etc/Unknown">
+				<exemplarCity>ဢမ်ႇႁူႉ ဢွင်ႈတီႈ</exemplarCity>
+			</zone>
+			<zone type="Europe/Andorra">
+				<exemplarCity>ဢႅၼ်ႇတူဝ်ႇရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dubai">
+				<exemplarCity>တူႇပၢႆး</exemplarCity>
+			</zone>
+			<zone type="Asia/Kabul">
+				<exemplarCity>ၵႃႇပူး</exemplarCity>
+			</zone>
+			<zone type="America/Antigua">
+				<exemplarCity>ဢႅၼ်ႇထီႇၵႂႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Anguilla">
+				<exemplarCity>ဢႅၼ်ႇၵုၺ်ႇလႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Tirane">
+				<exemplarCity>တီႇရႃႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Yerevan">
+				<exemplarCity>ယႄႇရႄႇဝၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Luanda">
+				<exemplarCity>လူႇဢၼ်ႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Rothera">
+				<exemplarCity>တႃႈ ရူဝ်ႇထႄႇရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Palmer">
+				<exemplarCity>ပၢမ်းမႃႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Troll">
+				<exemplarCity>တႃႈ ထရူဝ်း</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Syowa">
+				<exemplarCity>တႃႈ သျူဝ်းဝႃႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Mawson">
+				<exemplarCity>တႃႈ မေႃသၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Davis">
+				<exemplarCity>တေးဝိတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Vostok">
+				<exemplarCity>တႃႈ ဝေႃႉသ်တွၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Casey">
+				<exemplarCity>တႃႈ ၶေႇသီႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/DumontDUrville">
+				<exemplarCity>တႃႈ တူႇမွၼ်ႉ တဝီႇလ်</exemplarCity>
+			</zone>
+			<zone type="Antarctica/McMurdo">
+				<exemplarCity>တႃႈ မႅၵ်ႉမူႇတူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Rio_Gallegos">
+				<exemplarCity>ရီႇယူဝ်ၵႃလႄႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Mendoza">
+				<exemplarCity>မႅၼ်ႇတူဝ်ႇၸႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Juan">
+				<exemplarCity>သႅၼ်းႁွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Ushuaia">
+				<exemplarCity>ဢူသဝၢႆးဢႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/La_Rioja">
+				<exemplarCity>လႃႇရီႇယူဝ်ႇႁႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/San_Luis">
+				<exemplarCity>သႅၼ်းလူးဝိတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Catamarca">
+				<exemplarCity>ၶႃႇတႃႇမႃႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Salta">
+				<exemplarCity>သႃႇလ်တႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Jujuy">
+				<exemplarCity>ႁူႁုၺ်း</exemplarCity>
+			</zone>
+			<zone type="America/Argentina/Tucuman">
+				<exemplarCity>တူႇၵူဝ်ႇမၢၼ်ႈ</exemplarCity>
+			</zone>
+			<zone type="America/Cordoba">
+				<exemplarCity>ၶူဝ်ႇတူဝ်ႇပႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Buenos_Aires">
+				<exemplarCity>ပူၺ်းၼူဝ်ႇဢၢႆးရႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pago_Pago">
+				<exemplarCity>ပႃးၵူဝ်းပႃးၵူဝ်း</exemplarCity>
+			</zone>
+			<zone type="Europe/Vienna">
+				<exemplarCity>ဝီႇယႅၼ်ႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="Australia/Perth">
+				<exemplarCity>ၽိူတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Australia/Eucla">
+				<exemplarCity>ဢိဝ်းၵလႃး</exemplarCity>
+			</zone>
+			<zone type="Australia/Darwin">
+				<exemplarCity>တႃႇဝိၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Australia/Adelaide">
+				<exemplarCity>ဢတႄလဵတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Australia/Broken_Hill">
+				<exemplarCity>ပရူၵ်ႉၵႅၼ်းႁေးလ်</exemplarCity>
+			</zone>
+			<zone type="Australia/Melbourne">
+				<exemplarCity>မႄးလ်ပူၼ်း</exemplarCity>
+			</zone>
+			<zone type="Australia/Hobart">
+				<exemplarCity>ႁူဝ်ပၢတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Australia/Lindeman">
+				<exemplarCity>လိၼ်ႇတီႇမႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Australia/Sydney">
+				<exemplarCity>သိတ်ႇတၼီႇ</exemplarCity>
+			</zone>
+			<zone type="Australia/Brisbane">
+				<exemplarCity>ပရိတ်ႉသပႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>မႅၵ်ႉၶႂႃရီႇ</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>ၵုၼ်လွတ်ႉႁၢဝ်း</exemplarCity>
+			</zone>
+			<zone type="America/Aruba">
+				<exemplarCity>ဢႃႇရူးပႃး</exemplarCity>
+			</zone>
+			<zone type="Europe/Mariehamn">
+				<exemplarCity>မႃႇရီႇႁၢမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Baku">
+				<exemplarCity>ပႃၵူႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Sarajevo">
+				<exemplarCity>သႃႇရႃႇယေႇဝူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Barbados">
+				<exemplarCity>ပႃးပေႇတူတ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dhaka">
+				<exemplarCity>ၻႃႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Brussels">
+				<exemplarCity>ပရတ်ႈသႄးလ်</exemplarCity>
+			</zone>
+			<zone type="Africa/Ouagadougou">
+				<exemplarCity>ဢူဝ်ႇၵႃႇတူဝ်ႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Sofia">
+				<exemplarCity>သူဝ်ႇၾီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bahrain">
+				<exemplarCity>ပႃႇႁဵၼ်း</exemplarCity>
+			</zone>
+			<zone type="Africa/Bujumbura">
+				<exemplarCity>ပူၸုမ်ပူရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Porto-Novo">
+				<exemplarCity>ပူဝ်ႇတူဝ်ႇ-ၼူဝ်ႇဝူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>သဵင်ႉပၢတ်ႉထႄးလႄးမီႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Bermuda">
+				<exemplarCity>ပႃႇမိဝ်းတႃး</exemplarCity>
+			</zone>
+			<zone type="Asia/Brunei">
+				<exemplarCity>ပရူႇၼၢႆး</exemplarCity>
+			</zone>
+			<zone type="America/La_Paz">
+				<exemplarCity>လႃႉပႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Kralendijk">
+				<exemplarCity>ၶရႃးလႅၼ်းတႅၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Eirunepe">
+				<exemplarCity>ဢီရူၼႄပႄႇ</exemplarCity>
+			</zone>
+			<zone type="America/Rio_Branco">
+				<exemplarCity>ရီႇယူဝ်ႇပရၼ်ႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Porto_Velho">
+				<exemplarCity>ပွတ်ႈတူဝ်းဝႄႇႁူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Boa_Vista">
+				<exemplarCity>ပူဝ်ႇဢႃႇဝီႇသတႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Manaus">
+				<exemplarCity>မၼၢဝ်းသ်</exemplarCity>
+			</zone>
+			<zone type="America/Cuiaba">
+				<exemplarCity>ၶူယႃးပႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Santarem">
+				<exemplarCity>သၼ်ႇတႃႇရႅမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Campo_Grande">
+				<exemplarCity>ၶႅမ်ႇပူဝ်ႇၵရႅၼ်ႇတီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Belem">
+				<exemplarCity>ပႄႇလႅမ်း</exemplarCity>
+			</zone>
+			<zone type="America/Araguaina">
+				<exemplarCity>ဢႃႇရႃႇၵႂႃႇဢီႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Sao_Paulo">
+				<exemplarCity>သၢဝ်ပၢဝ်းလူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Bahia">
+				<exemplarCity>ပႁီးယႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Fortaleza">
+				<exemplarCity>ၾူတ်ႉတလႄၸႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Maceio">
+				<exemplarCity>မႃးသေးဢူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Recife">
+				<exemplarCity>ရႅတ်ႉသီႇၾီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>ၾႃႇၼႅၼ်ႇတူဝ်ႇ တႄႇၼူဝ်ႇရွၼ်ႇႁႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Nassau">
+				<exemplarCity>ၼၢတ်ႉသ်သေႃ</exemplarCity>
+			</zone>
+			<zone type="Asia/Thimphu">
+				<exemplarCity>ထိမ်းၽူး</exemplarCity>
+			</zone>
+			<zone type="Africa/Gaborone">
+				<exemplarCity>ၵႃႇပူဝ်ႇရူဝ်ႇၼႄႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Minsk">
+				<exemplarCity>မိၼ်ႉသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="America/Belize">
+				<exemplarCity>ပႄႇလိတ်ႈ</exemplarCity>
+			</zone>
+			<zone type="America/Dawson">
+				<exemplarCity>တေႃးသၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Whitehorse">
+				<exemplarCity>ဝၢႆႉႁွတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Inuvik">
+				<exemplarCity>ဢီႇၼူးဝိၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Vancouver">
+				<exemplarCity>ဝႅၼ်ႇၵူဝ်ႇဝႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Fort_Nelson">
+				<exemplarCity>ၾူတ်ႉၼႄႇလ်သၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Dawson_Creek">
+				<exemplarCity>တေႃးသၼ်ႇၶရိၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Creston">
+				<exemplarCity>ၶရႅတ်ႉသတၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Edmonton">
+				<exemplarCity>ဢႅတ်ႉမွၼ်ႇတွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Swift_Current">
+				<exemplarCity>သဝိတ်ႉၶႃးရႅၼ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Cambridge_Bay">
+				<exemplarCity>ၶႅမ်းပရိတ်ႉပေး</exemplarCity>
+			</zone>
+			<zone type="America/Regina">
+				<exemplarCity>ရီႇၵျိၼ်ႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Winnipeg">
+				<exemplarCity>ဝိၼ်းၼီႇပႅၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Resolute">
+				<exemplarCity>ရႅတ်ႉသူဝ်ႇလုတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Rankin_Inlet">
+				<exemplarCity>ရၼ်ၵိၼ်းဢိၼ်းလႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>ဢႃႇတီႇၵူဝ်ႇၵၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Toronto">
+				<exemplarCity>တူဝ်ႇရွၼ်ႇတူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Iqaluit">
+				<exemplarCity>ဢီႇၶႃးလူးဝိတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Moncton">
+				<exemplarCity>မွၼ်ႉတွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Halifax">
+				<exemplarCity>ႁႄႇလီႇၾႅၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Goose_Bay">
+				<exemplarCity>ၵုတ်ႉသ်ပေး</exemplarCity>
+			</zone>
+			<zone type="America/Glace_Bay">
+				<exemplarCity>ၵလဵတ်ႉသ်ပေး</exemplarCity>
+			</zone>
+			<zone type="America/Blanc-Sablon">
+				<exemplarCity>ပလၼ်ႇ-သႅပ်ႉပလုၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/St_Johns">
+				<exemplarCity>သဵင်ႉၵျွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>မူႇၵုၼ် ၵူဝ်ႇၵူဝ်းသ်</exemplarCity>
+			</zone>
+			<zone type="Africa/Kinshasa">
+				<exemplarCity>ၶိၼ်သျႃးသႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lubumbashi">
+				<exemplarCity>လူႇပုမ်ႇပႃႇသျီႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bangui">
+				<exemplarCity>ပင်ၵီႈ</exemplarCity>
+			</zone>
+			<zone type="Africa/Brazzaville">
+				<exemplarCity>ပရႃၸဝီးလ်</exemplarCity>
+			</zone>
+			<zone type="Europe/Zurich">
+				<exemplarCity>ၸူႇရိတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Abidjan">
+				<exemplarCity>ဢႃႇပီႇၸၢၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Rarotonga">
+				<exemplarCity>ရႃရူဝ်ထွင်းၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>ၵုၼ်ဢီႇသတႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ၵူဝ်ႇႁႆၵေး</exemplarCity>
+			</zone>
+			<zone type="America/Punta_Arenas">
+				<exemplarCity>ပုၼ်းတႃႉဢရႅၼ်ႇၼတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="America/Santiago">
+				<exemplarCity>သႅၼ်ႇတီႇယႃႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Douala">
+				<exemplarCity>တူဝ်ႇဢႃႇလႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Urumqi">
+				<exemplarCity>ဢူႇရုမ်ၶီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Shanghai">
+				<exemplarCity>သျၢင်ႉႁၢႆး</exemplarCity>
+			</zone>
+			<zone type="America/Bogota">
+				<exemplarCity>ပူဝ်ႇၵူဝ်ႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Costa_Rica">
+				<exemplarCity>ၵေႃးသတႃႇရိၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Havana">
+				<exemplarCity>ႁႃႇဝႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Cape_Verde">
+				<exemplarCity>ၶဵပ်ႉဝႄႇတီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>ၵူးရႃႇသၢဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>မူႇၵုၼ် ၶရိတ်ႉသမၢတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Nicosia">
+				<exemplarCity>ၼိၵူဝ်ႇသျႃး</exemplarCity>
+			</zone>
+			<zone type="Asia/Famagusta">
+				<exemplarCity>ၾႃႇမႃႇၵူးသတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Prague">
+				<exemplarCity>ပရၢၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Busingen">
+				<exemplarCity>ပူႇသိင်ႇၵႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Berlin">
+				<exemplarCity>ပႃႇလိၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Djibouti">
+				<exemplarCity>ၵျီႇပူးတီႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Copenhagen">
+				<exemplarCity>ၵူဝ်ႇပႅၼ်ႇႁေႇၵႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Dominica">
+				<exemplarCity>တူဝ်ႇမီႇၼိၵ</exemplarCity>
+			</zone>
+			<zone type="America/Santo_Domingo">
+				<exemplarCity>သႅၼ်ႇတူဝ်ႇ တူဝ်ႇမိၼ်ႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Algiers">
+				<exemplarCity>ဢႄးလ်ၸီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Galapagos">
+				<exemplarCity>ၵုၼ်ၵႃလႃပၵူဝ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Guayaquil">
+				<exemplarCity>ၵူဝ်ႇယႃႇၶိဝ်း</exemplarCity>
+			</zone>
+			<zone type="Europe/Tallinn">
+				<exemplarCity>တႃႇလိၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Cairo">
+				<exemplarCity>ၶၢႆႇရူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/El_Aaiun">
+				<exemplarCity>ဢႄးလ်ဢၢႆႈယုၼ်း</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>ဢတ်ႉသ်မႃႇရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Canary">
+				<exemplarCity>ၶႅၼ်ႇၼႃႇရီႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Ceuta">
+				<exemplarCity>သူးတ</exemplarCity>
+			</zone>
+			<zone type="Europe/Madrid">
+				<exemplarCity>မတ်ႉတရိတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Addis_Ababa">
+				<exemplarCity>ဢႅတ်ႉတိတ်ႉသ်ဢႃႇပႃႇပႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Helsinki">
+				<exemplarCity>ႁႄႇလ်သိင်းၵီႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fiji">
+				<exemplarCity>ၾီႇၵျီႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Stanley">
+				<exemplarCity>သတႅၼ်းလီႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>ၶျူၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>ပူၼ်းပေႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kosrae">
+				<exemplarCity>ၵွတ်ႉသ်ရေး</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>ၾႃႇရူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Paris">
+				<exemplarCity>ၽႄးရိတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="Africa/Libreville">
+				<exemplarCity>လီပရႄႇဝီးလ်</exemplarCity>
+			</zone>
+			<zone type="Europe/London">
+				<long>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢိင်းၵလဵတ်ႈ</daylight>
+				</long>
+				<exemplarCity>လၼ်ႇတၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Grenada">
+				<exemplarCity>ၵရႄႇၼႃႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tbilisi">
+				<exemplarCity>တပီႇလီႇသီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Cayenne">
+				<exemplarCity>ၶႃယႅၼ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Europe/Guernsey">
+				<exemplarCity>ၵႂၢၼ်းသီ</exemplarCity>
+			</zone>
+			<zone type="Africa/Accra">
+				<exemplarCity>ဢၵ်ႉၵရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Gibraltar">
+				<exemplarCity>ၵျီႇပရေႃးတႃး</exemplarCity>
+			</zone>
+			<zone type="America/Thule">
+				<exemplarCity>ထူႇလႄႇ</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>ၼုၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>ဢိတ်ႉတူဝ်ၵူဝ်တူဝ်မိတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Danmarkshavn">
+				<exemplarCity>တႅၼ်းမၢၵ်ႈသျၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Banjul">
+				<exemplarCity>ပၼ်ႇၸူႇလ်</exemplarCity>
+			</zone>
+			<zone type="Africa/Conakry">
+				<exemplarCity>ၶူဝ်ႇၼႃႇၵရီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Guadeloupe">
+				<exemplarCity>ၵႂႃးတီႇလုပ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Africa/Malabo">
+				<exemplarCity>မႃႇလႃႇပူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Athens">
+				<exemplarCity>ဢေႇတိၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/South_Georgia">
+				<exemplarCity>ၵျေႃႇၵျႃႇ ပွတ်းၸၢၼ်း</exemplarCity>
+			</zone>
+			<zone type="America/Guatemala">
+				<exemplarCity>ၵႂႃႇတမႃႇလႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guam">
+				<exemplarCity>ၵႂၢမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bissau">
+				<exemplarCity>ပိတ်ႈသၢဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Guyana">
+				<exemplarCity>ၵၢႆႇယႃးၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Hong_Kong">
+				<exemplarCity>ႁွင်းၵွင်း</exemplarCity>
+			</zone>
+			<zone type="America/Tegucigalpa">
+				<exemplarCity>တေႇၵူႇသီႇၵႃႇပႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Zagreb">
+				<exemplarCity>ၸႃႇၵရႅပ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Port-au-Prince">
+				<exemplarCity>ၽူတ်ႉဢူဝ်ပရိၼ်ႉၸ်</exemplarCity>
+			</zone>
+			<zone type="Europe/Budapest">
+				<exemplarCity>ပူႇတႃႇပႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Jakarta">
+				<exemplarCity>ၵျႃႇၵႃႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Pontianak">
+				<exemplarCity>ပွၼ်းတီႇယႃႇၼၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Makassar">
+				<exemplarCity>မႃႇၵႃႇသႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Jayapura">
+				<exemplarCity>ၵျႃႉယပူႇရ</exemplarCity>
+			</zone>
+			<zone type="Europe/Dublin">
+				<long>
+					<daylight>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢၢႆးရိတ်ႉ</daylight>
+				</long>
+				<exemplarCity>တၢပ်ႇလိၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Jerusalem">
+				<exemplarCity>ယေႇရုသလႅမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Isle_of_Man">
+				<exemplarCity>ၵုၼ်မႅၼ်း</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>ၵူဝ်ႇၵႃႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Chagos">
+				<exemplarCity>ၵုၼ်ၶျႃးၵူဝ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Baghdad">
+				<exemplarCity>ပႅၵ်ႉတႅၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tehran">
+				<exemplarCity>တႁႃႇရၢၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Reykjavik">
+				<exemplarCity>ရီႇၵျႃႇဝိၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Rome">
+				<exemplarCity>ရူမ်း</exemplarCity>
+			</zone>
+			<zone type="Europe/Jersey">
+				<exemplarCity>ၵျႃႇသီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Jamaica">
+				<exemplarCity>ၵျႃႇမေႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Amman">
+				<exemplarCity>ဢမ်မၢၼ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tokyo">
+				<exemplarCity>တူဝ်ႇၵျူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Nairobi">
+				<exemplarCity>ၼၢႆႇရူဝ်ႇပီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bishkek">
+				<exemplarCity>ပိတ်ႉသၵႅၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Phnom_Penh">
+				<exemplarCity>ၽၼူမ်းပဵၼ်</exemplarCity>
+			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>ၵုၼ်ၶႅၼ်းတွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kiritimati">
+				<exemplarCity>ၶိရိတ်ႉတိမႃႇတီႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tarawa">
+				<exemplarCity>တႃႇရႃႇဝႃႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Comoro">
+				<exemplarCity>ၶူဝ်ႇမူဝ်ႇရူတ်ႈ</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>သဵင်ႉၶိတ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Asia/Pyongyang">
+				<exemplarCity>ၽျွင်းယၢင်း</exemplarCity>
+			</zone>
+			<zone type="Asia/Seoul">
+				<exemplarCity>သူဝ်းလ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuwait">
+				<exemplarCity>ၶူႇဝဵတ်ႈ</exemplarCity>
+			</zone>
+			<zone type="America/Cayman">
+				<exemplarCity>ၶေးမႅၼ်း</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtau">
+				<exemplarCity>ဢႅၵ်ႉတၢဝ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Oral">
+				<exemplarCity>ဢေႃႇရႄႇလ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Atyrau">
+				<exemplarCity>ဢႃႇတီးရၢဝ်း</exemplarCity>
+			</zone>
+			<zone type="Asia/Aqtobe">
+				<exemplarCity>ဢႅၵ်ႉတူဝ်ႇပီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qostanay">
+				<exemplarCity>ၶူတ်ႉသတၼ်ႇၼေႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qyzylorda">
+				<exemplarCity>ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Almaty">
+				<exemplarCity>ဢႄးလ်မႃႇတီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Vientiane">
+				<exemplarCity>ဝဵင်းၸၼ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Beirut">
+				<exemplarCity>ပႄႇရုတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>သဵင်ႉလူႉသျႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vaduz">
+				<exemplarCity>ဝႃႇတူႇၸ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Colombo">
+				<exemplarCity>ၵူဝ်ႇလမ်ႇပူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Monrovia">
+				<exemplarCity>မွၼ်ႇရူဝ်ႇဝီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Maseru">
+				<exemplarCity>မႃႇသႄႇရူႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vilnius">
+				<exemplarCity>ဝီးလ်ၼီးယႅတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="Europe/Luxembourg">
+				<exemplarCity>လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Europe/Riga">
+				<exemplarCity>ရီႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Tripoli">
+				<exemplarCity>ထရီႇပူဝ်ႇလီႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Casablanca">
+				<exemplarCity>ၶႃႇသႃႇပလၼ်ႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Monaco">
+				<exemplarCity>မူဝ်ႇၼႃႉၶူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Chisinau">
+				<exemplarCity>ၶိသိၼေႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Podgorica">
+				<exemplarCity>ပူဝ်ႇၵူဝ်ႇရီႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Marigot">
+				<exemplarCity>မႃႇရိၵူတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Indian/Antananarivo">
+				<exemplarCity>ဢႅၼ်ႇတၼႃႇၼႃႇရီႇဝူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kwajalein">
+				<exemplarCity>ၶႂႃးၵျလၢႆး</exemplarCity>
+			</zone>
+			<zone type="Pacific/Majuro">
+				<exemplarCity>မၵျူးရူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Skopje">
+				<exemplarCity>သၵူပ်ႉပီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Bamako">
+				<exemplarCity>ပႃႇမႃႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Rangoon">
+				<exemplarCity>တႃႈၵုင်ႈ</exemplarCity>
+			</zone>
+			<zone type="Asia/Hovd">
+				<exemplarCity>ၶူဝ်ဝေတေး</exemplarCity>
+			</zone>
+			<zone type="Asia/Ulaanbaatar">
+				<exemplarCity>ဢူလၼ်ပႃတႃ</exemplarCity>
+			</zone>
+			<zone type="Asia/Macau">
+				<exemplarCity>မႃႇၵၢဝ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Saipan">
+				<exemplarCity>သၢႆပၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Martinique">
+				<exemplarCity>မႃးတိၼ်ႇၼိၵ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Africa/Nouakchott">
+				<exemplarCity>ၼူဝ်ႇဢႅၵ်ႉၸွတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Montserrat">
+				<exemplarCity>မွၼ်ႇသႄးရႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Malta">
+				<exemplarCity>မေႃးတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Mauritius">
+				<exemplarCity>မေႃးရီႇသႃႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Maldives">
+				<exemplarCity>မေႃႇတိပ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Africa/Blantyre">
+				<exemplarCity>ပလႅၼ်ႇတၢႆႇ</exemplarCity>
+			</zone>
+			<zone type="America/Tijuana">
+				<exemplarCity>တီႇႁူဝ်ႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Hermosillo">
+				<exemplarCity>ဢႄ​ရမူဝ်သီးလူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Ciudad_Juarez">
+				<exemplarCity>သီႇယူဝ်ႇတတ်ႉ ၸူဝ်ႇရႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Mazatlan">
+				<exemplarCity>မႃႇၸတ်ႇလၼ်း</exemplarCity>
+			</zone>
+			<zone type="America/Chihuahua">
+				<exemplarCity>ၶျီႇဝႃႇဝႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Bahia_Banderas">
+				<exemplarCity>ပႃႇႁီးယႃး တႄႇ ပၼ်ႇတႄႇရႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Ojinaga">
+				<exemplarCity>ဢူဝ်ႇၸီႇၼႃႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Monterrey">
+				<exemplarCity>မွၼ်ႇတႄႇရီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Mexico_City">
+				<exemplarCity>ဝဵင်းလူင်မႅၵ်ႇသီႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Matamoros">
+				<exemplarCity>မႃႇတႃႇမေႃးရူဝ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="America/Merida">
+				<exemplarCity>မႄႇရီႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Cancun">
+				<exemplarCity>ၵႅၼ်ႇၵူၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuala_Lumpur">
+				<exemplarCity>ၵႂႃႇလႃႇလုမ်းပူႈ</exemplarCity>
+			</zone>
+			<zone type="Asia/Kuching">
+				<exemplarCity>ၵူႇၶျိင်း</exemplarCity>
+			</zone>
+			<zone type="Africa/Maputo">
+				<exemplarCity>မႃႇပူႇတူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Windhoek">
+				<exemplarCity>ဝိၼ်းႁွၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Noumea">
+				<exemplarCity>ၼူမေးယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Niamey">
+				<exemplarCity>ၼီးယႃးမေႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>ၵုၼ်ၼေႃႇၾုၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lagos">
+				<exemplarCity>လႃႇၵွတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="America/Managua">
+				<exemplarCity>မၼႃးၵႂႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Amsterdam">
+				<exemplarCity>ဢႅမ်ႇသတႃႇတမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Oslo">
+				<exemplarCity>ဢွတ်ႉသလူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>ၵၢတ်ႈမၢၼ်ႈတူႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Nauru">
+				<exemplarCity>ၼၢဝ်ရူး</exemplarCity>
+			</zone>
+			<zone type="Pacific/Niue">
+				<exemplarCity>ၼီးဝႄႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Chatham">
+				<exemplarCity>မူႇၵုၼ် ၶျႅတ်ႉထမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Auckland">
+				<exemplarCity>ဢွၵ်ႉလႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Muscat">
+				<exemplarCity>မတ်ႉသၵႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Panama">
+				<exemplarCity>ပႃႈၼႃးမႃး</exemplarCity>
+			</zone>
+			<zone type="America/Lima">
+				<exemplarCity>လိမႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tahiti">
+				<exemplarCity>တႁီႇတီႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Marquesas">
+				<exemplarCity>မႃၶေးသႅတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="Pacific/Gambier">
+				<exemplarCity>ၵမ်ႇပီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Port_Moresby">
+				<exemplarCity>ပွတ်ႉမွတ်ႉသ်ပီႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Bougainville">
+				<exemplarCity>ပူးၵိၼ်ဝႄႇလ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Manila">
+				<exemplarCity>မၼီႇလႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Karachi">
+				<exemplarCity>ၵႃႇရႃႇၶျီႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Warsaw">
+				<exemplarCity>ဝေႃးသေႃး</exemplarCity>
+			</zone>
+			<zone type="America/Miquelon">
+				<exemplarCity>သဵင်ႉပီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Pitcairn">
+				<exemplarCity>ၽိတ်ႉၶႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Puerto_Rico">
+				<exemplarCity>ပေႃႇတူဝ်ႇရီးၵူဝ်း</exemplarCity>
+			</zone>
+			<zone type="Asia/Gaza">
+				<exemplarCity>ၵႃႇၸႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Hebron">
+				<exemplarCity>ႁႄႇပရွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Azores">
+				<exemplarCity>ဢႃႇၸူဝ်ႇရႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Madeira">
+				<exemplarCity>မႃႇတီႇရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Lisbon">
+				<exemplarCity>လိတ်ႉသ်ပွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Palau">
+				<exemplarCity>ပႃႇလၢဝ်း</exemplarCity>
+			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>ဢႃးသုၼ်းသီႇဢွၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Qatar">
+				<exemplarCity>ၶႃႇတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>ရေႇၼီႇယၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Bucharest">
+				<exemplarCity>ပူႇၶႃႇရႅတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Belgrade">
+				<exemplarCity>ပႄႇလ်ၵရဵတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Kaliningrad">
+				<exemplarCity>ၵလိၼ်းဢိၼ်းၵရတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Moscow">
+				<exemplarCity>မွတ်ႉသ်ၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Volgograd">
+				<exemplarCity>ဝူဝ်ႇၵူဝ်ႇၵရၢတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Europe/Saratov">
+				<exemplarCity>သႃႇရႃႇတၢပ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Europe/Astrakhan">
+				<exemplarCity>ဢႅတ်ႉသထရႃႇၶၢၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Ulyanovsk">
+				<exemplarCity>ဢူလီယႃၼူဝ်ႇသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Europe/Kirov">
+				<exemplarCity>ၶီးႁွပ်ႇၾ်</exemplarCity>
+			</zone>
+			<zone type="Europe/Samara">
+				<exemplarCity>သႃႇမႃႇရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Yekaterinburg">
+				<exemplarCity>ယေႇၵႃႇတႄႇရိၼ်ႇပၢၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Omsk">
+				<exemplarCity>ဢူမ်းသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Novosibirsk">
+				<exemplarCity>ၼူဝ်ႇဝူဝ်ႇသီႇပၢတ်ႉသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Barnaul">
+				<exemplarCity>ပႃႇၼေႃး</exemplarCity>
+			</zone>
+			<zone type="Asia/Tomsk">
+				<exemplarCity>တွမ်းသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Novokuznetsk">
+				<exemplarCity>ၼူဝ်ဝူဝ်ၵုတ်ႉၸ်ၼႅတ်ႉသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Krasnoyarsk">
+				<exemplarCity>ၶရတ်ႉၼူဝ်ႇယႃႇသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Irkutsk">
+				<exemplarCity>ဢိရၶုတ်ႉသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Chita">
+				<exemplarCity>ၶျိတ်ႉတႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Yakutsk">
+				<exemplarCity>ယၵုတ်ႉသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Vladivostok">
+				<exemplarCity>ဝလႃႇတီႇဝူဝ်ႇသတွၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Asia/Khandyga">
+				<exemplarCity>ၶၼ်ႇတီႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Sakhalin">
+				<exemplarCity>သႃႇၶႃႇလိၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Ust-Nera">
+				<exemplarCity>ယူးဢိတ်ႉသ်ၼႄႇရႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Magadan">
+				<exemplarCity>မႃႇၵႃႇတၢၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Srednekolymsk">
+				<exemplarCity>သရႅတ်ႉၼႄၵူဝ်ႇလိမ်ႇသ်ၶ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Kamchatka">
+				<exemplarCity>ၵမ်းၶျၢတ်ႉၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Anadyr">
+				<exemplarCity>ဢႃႇၼႃႇတီႇယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Kigali">
+				<exemplarCity>ၵိၵႃႇလီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Riyadh">
+				<exemplarCity>ရီႇယၢတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Guadalcanal">
+				<exemplarCity>ၵႂႃးတႄႇလ်ၶႅၼ်ႇၼႄးလ်</exemplarCity>
+			</zone>
+			<zone type="Indian/Mahe">
+				<exemplarCity>မႁေႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Khartoum">
+				<exemplarCity>ၶႃးတုမ်း</exemplarCity>
+			</zone>
+			<zone type="Europe/Stockholm">
+				<exemplarCity>သတွၵ်ႉႁွမ်း</exemplarCity>
+			</zone>
+			<zone type="Asia/Singapore">
+				<exemplarCity>သိင်ႇၵႃႇပူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>သဵင်ႉႁႄးလႄးၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Ljubljana">
+				<exemplarCity>လူႇပလီႇယႃႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="Arctic/Longyearbyen">
+				<exemplarCity>လွင်းယီးယႃးပဵၼ်း</exemplarCity>
+			</zone>
+			<zone type="Europe/Bratislava">
+				<exemplarCity>ပရႃႇတိတ်ႉသလႃႇဝႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Freetown">
+				<exemplarCity>ၾရီးတၢဝ်း</exemplarCity>
+			</zone>
+			<zone type="Europe/San_Marino">
+				<exemplarCity>သၼ်းမႃႇရီႇၼေႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Dakar">
+				<exemplarCity>တၢၵ်ႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Mogadishu">
+				<exemplarCity>မူဝ်ၵႃတီးသျူး</exemplarCity>
+			</zone>
+			<zone type="America/Paramaribo">
+				<exemplarCity>ပႃႇရႃႇမႃႇရီႇပူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Juba">
+				<exemplarCity>ယူးပႃး</exemplarCity>
+			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>သူၼ်ႇတူဝ်ႇမေး</exemplarCity>
+			</zone>
+			<zone type="America/El_Salvador">
+				<exemplarCity>ဢႄႇသႃႇဝႃႇတေႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>လူဝ်းဝႃးပရိၼ်ႉသ်ၶႂႃႇတႃး</exemplarCity>
+			</zone>
+			<zone type="Asia/Damascus">
+				<exemplarCity>တမ်ႇမတ်ႉသၵတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Mbabane">
+				<exemplarCity>ပႃပႃၼႄႇ</exemplarCity>
+			</zone>
+			<zone type="America/Grand_Turk">
+				<exemplarCity>ၵရႅၼ်းထိူၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Ndjamena">
+				<exemplarCity>ဢႅၼ်ႇၸႃႇမႅၼ်ႇၼႃႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Kerguelen">
+				<exemplarCity>မူႇၵုၼ်ၶိူဝ်ႇၵူႇလႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lome">
+				<exemplarCity>​လူဝ်ႇမႄႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Bangkok">
+				<exemplarCity>ၵုင်းထဵပ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dushanbe">
+				<exemplarCity>တူႇသျႅၼ်ႇပႄႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Fakaofo">
+				<exemplarCity>ၾႃးၵဝ်ႇၾူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Dili">
+				<exemplarCity>တီႇလီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Ashgabat">
+				<exemplarCity>ဢႅတ်ႉသ်ၵႃႇပတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Tunis">
+				<exemplarCity>တူးၼိတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="Pacific/Tongatapu">
+				<exemplarCity>ထွင်းၵႃႇတႃႇပူႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Istanbul">
+				<exemplarCity>ဢိတ်ႉသတၼ်ႇပူး</exemplarCity>
+			</zone>
+			<zone type="America/Port_of_Spain">
+				<exemplarCity>တႃႈႁိူဝ်းသပဵၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Funafuti">
+				<exemplarCity>ၾူၼႃၾူးတီႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Taipei">
+				<exemplarCity>ထၢႆးပႄႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Dar_es_Salaam">
+				<exemplarCity>တႃႇဢႅတ်ႉသႃႇလမ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Kiev">
+				<exemplarCity>ၶိပ်ႉၾ်</exemplarCity>
+			</zone>
+			<zone type="Europe/Simferopol">
+				<exemplarCity>သိမ်ႇၾႃႇရူဝ်ႇပူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Kampala">
+				<exemplarCity>ၵမ်ႇပႃႇလႃႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Midway">
+				<exemplarCity>မိတ်ႉဝေး</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>ဝဵၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Adak">
+				<exemplarCity>ဢတၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Nome">
+				<exemplarCity>ၼူမ်း</exemplarCity>
+			</zone>
+			<zone type="America/Anchorage">
+				<exemplarCity>ဢႅၼ်ႇၶျူဝ်ႇရဵတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Yakutat">
+				<exemplarCity>ယႃႇၵုတတ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Sitka">
+				<exemplarCity>သိတ်ႉၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Juneau">
+				<exemplarCity>ၸူႇၼူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Metlakatla">
+				<exemplarCity>မႅတ်ႉလၶႅတ်ႉလႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/Los_Angeles">
+				<exemplarCity>လွတ်ႉသ်ဢႅၼ်းၵျႄးလႄႉသ်</exemplarCity>
+			</zone>
+			<zone type="America/Boise">
+				<exemplarCity>ပွႆးသီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Phoenix">
+				<exemplarCity>ၽီးၼိၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Denver">
+				<exemplarCity>တႅၼ်ႇဝႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>ပႄႇယူဝ်ႇလႃႇ၊ တႃႇၵူဝ်ႇတႃႇႁွင်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/New_Salem">
+				<exemplarCity>ၼိဝ်းသႄႇလမ်ႇ၊ တႃႇၵူဝ်ႇတႃႇႁွင်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Center">
+				<exemplarCity>ပွတ်းၵၢင်၊ တႃႇၵူဝ်ႇတႃႇႁွင်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Chicago">
+				<exemplarCity>ၶျီႇၵႃႇၵူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Menominee">
+				<exemplarCity>မႄၼွမ်းမၼီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vincennes">
+				<exemplarCity>ဝိၼ်းသႅၼ်ႉ၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Petersburg">
+				<exemplarCity>ပီႇတႃႇသ်ပၢၵ်ႉ၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Tell_City">
+				<exemplarCity>တႄးလ်သီးတီး၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Knox">
+				<exemplarCity>ၼွၵ်ႉသ်၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Winamac">
+				<exemplarCity>ဝီႇၼႃႇမႅၵ်ႉ၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Marengo">
+				<exemplarCity>မရႅၼ်းၵူဝ်ႇ၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Indianapolis">
+				<exemplarCity>ဢိၼ်းတီးယႃးၼႃးပူဝ်ႇလိတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="America/Louisville">
+				<exemplarCity>လူးဝိတ်ႉဝီးလ်</exemplarCity>
+			</zone>
+			<zone type="America/Indiana/Vevay">
+				<exemplarCity>ဝီးဝီႇ၊ ဢိၼ်းတီးယႃးၼႃး</exemplarCity>
+			</zone>
+			<zone type="America/Kentucky/Monticello">
+				<exemplarCity>မွၼ်ႇတီႇသႄႇလူဝ်ႇ၊ ၶႅၼ်ႇတၢၵ်ႇၵီႇ</exemplarCity>
+			</zone>
+			<zone type="America/Detroit">
+				<exemplarCity>တီးတရွႆႉ</exemplarCity>
+			</zone>
+			<zone type="America/New_York">
+				<exemplarCity>ၼိဝ်းယွၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="America/Montevideo">
+				<exemplarCity>မွၼ်ႇတီႇဝီးတႄးဢူဝ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Samarkand">
+				<exemplarCity>သႃႇမႃႇၶႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Tashkent">
+				<exemplarCity>တၢတ်ႉသၵႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Europe/Vatican">
+				<exemplarCity>ဝႃႇတီႇၵၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>သဵင်ႉဝိၼ်ႇသႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="America/Caracas">
+				<exemplarCity>ၶႃႇရႃႇၵႅတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="America/Tortola">
+				<exemplarCity>တူဝ်ႇတူဝ်ႇလႃႇ</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>သဵင်ႉထေႃးမတ်ႉသ်</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>ႁူဝ်ၶျီမိၼ်း</exemplarCity>
+			</zone>
+			<zone type="Pacific/Efate">
+				<exemplarCity>ဢီႇၾႃးတႄႇ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wallis">
+				<exemplarCity>ဝႃးလိတ်ႈ လႄႈ ၾူႇတူးၼႃး</exemplarCity>
+			</zone>
+			<zone type="Pacific/Apia">
+				<exemplarCity>ဢႃပီယႃႇ</exemplarCity>
+			</zone>
+			<zone type="Asia/Aden">
+				<exemplarCity>ဢေႇတႅၼ်ႇ</exemplarCity>
+			</zone>
+			<zone type="Indian/Mayotte">
+				<exemplarCity>မႃႇယူတ်ႈ</exemplarCity>
+			</zone>
+			<zone type="Africa/Johannesburg">
+				<exemplarCity>ၵျူဝ်ႇႁၼ်ႇၼႅတ်ႉသ်ပၢၵ်ႉ</exemplarCity>
+			</zone>
+			<zone type="Africa/Lusaka">
+				<exemplarCity>လူႇသႃႇၵႃႇ</exemplarCity>
+			</zone>
+			<zone type="Africa/Harare">
+				<exemplarCity>ႁႃႇရႃႇရႄႇ</exemplarCity>
+			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢေႇၵႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢေႇၵႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢေႇၵႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Afghanistan">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢႃႇၾၵၢၼ်ႇၼီႇသတၢၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Central">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢႃႇၾရိၵ ပွတ်းၵၢင်</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Eastern">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢႃႇၾရိၵ ပွတ်းဢွၵ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Southern">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇၾရိၵၸၢၼ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Africa_Western">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢႃႇၾရိၵ ပွတ်းတူၵ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Alaska">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢလႅတ်ႉသၵႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢလႅတ်ႉသၵႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်းၵၢင်ဝၼ်း ဢလႅတ်ႉသၵႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Almaty">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႄးလ်မႃႇတီႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႄးလ်မႃႇတီႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႄးလ်မႃႇတီႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Amazon">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢမၸွၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢမၸွၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢမၸွၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Central">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပွတ်းၵၢင်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပွတ်းၵၢင်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပွတ်းၵၢင်</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Eastern">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပွတ်းဢွၵ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပွတ်းဢွၵ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပွတ်းဢွၵ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Mountain">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း သၼ်လွႆ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သၼ်လွႆ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း သၼ်လွႆ</daylight>
+				</long>
+			</metazone>
+			<metazone type="America_Pacific">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပၸိၾိၵ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပၸိၾိၵ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပၸိၾိၵ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Anadyr">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇၼႃႇတီႇယႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇၼႃႇတီႇယႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႃႇၼႃႇတီႇယႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Apia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း သႃႇမူဝ်းဝႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သႃႇမူဝ်းဝႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း သႃႇမူဝ်းဝႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtau">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတၢဝ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတၢဝ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႅၵ်ႉတၢဝ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Aqtobe">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတူဝ်ႇပီႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတူဝ်ႇပီႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႅၵ်ႉတူဝ်ႇပီႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Arabian">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇရၢပ်ႈ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇရၢပ်ႈ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢႃႇရၢပ်ႈ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇၵျႅၼ်ႇတီးၼႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇၵျႅၼ်ႇတီးၼႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢႃႇၵျႅၼ်ႇတီးၼႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Argentina_Western">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇၵျႅၼ်ႇတီးၼႃး ပွတ်းတူၵ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇၵျႅၼ်ႇတီးၼႃး ပွတ်းတူၵ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢႃႇၵျႅၼ်ႇတီးၼႃး ပွတ်းတူၵ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Armenia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇမေးၼီးယႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇမေးၼီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႃႇမေးၼီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Atlantic">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႅတ်ႉလႅၼ်းတိၵ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႅတ်ႉလႅၼ်းတိၵ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢႅတ်ႉလႅၼ်းတိၵ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Central">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢေႃႉသထရေးလီးယႃး ပွတ်းၵၢင်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢေႃႉသထရေးလီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢေႃႉသထရေးလီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_CentralWestern">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပွတ်းတူၵ်း တွၼ်ႈၵၢင် ဢေႃႉသထရေးလီးယႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပွတ်းတူၵ်း တွၼ်ႈၵၢင် ဢေႃႉသထရေးလီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ပွတ်းတူၵ်း တွၼ်ႈၵၢင် ၶၢဝ်းမႆႈ ဢေႃႉသထရေးလီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Eastern">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပွတ်းဢွၵ်ႇ ဢေႃႉသထရေးလီးယႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပွတ်းဢွၵ်ႇ ဢေႃႉသထရေးလီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ပွတ်းဢွၵ်ႇ ၵၢင်ဝၼ်း ဢေႃႉသထရေးလီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Australia_Western">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပွတ်းတူၵ်း ဢေႃႉသထရေးလီးယႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပွတ်းတူၵ်း ဢေႃႉသထရေးလီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ပွတ်းတူၵ်း ၵၢင်ဝၼ်း ဢေႃႉသထရေးလီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azerbaijan">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Azores">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢႃႇၸူဝ်ႇရႅတ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႃႇၸူဝ်ႇရႅတ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႃႇၸူဝ်ႇရႅတ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bangladesh">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပင်းၵလႃးတဵတ်ႈ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပင်းၵလႃးတဵတ်ႈ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ပင်းၵလႃးတဵတ်ႈ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Bhutan">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၽူႇတၢၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Bolivia">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ပူဝ်ႇလီးပီးယႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="Brasilia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပရႃႇၸီးလီးယႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပရႃႇၸီးလီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပရႃႇၸီးလီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Brunei">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ပရူႇၼၢႆး</standard>
+				</long>
+			</metazone>
+			<metazone type="Cape_Verde">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶဵပ်ႉဝႄႇတီႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶဵပ်ႉဝႄႇတီႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၶဵပ်ႉဝႄႇတီႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Casey">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၶေႇသီႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Chamorro">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶျမ်ႇမူဝ်ႇရူဝ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Chatham">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶျႅတ်ႉထမ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶျႅတ်ႉထမ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၶျႅတ်ႉထမ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Chile">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶျီႇလီႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶျီႇလီႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၶျီႇလီႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="China">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶႄႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶႄႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၶႄႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Christmas">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵုၼ်ၶရိတ်ႉသမၢတ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Cocos">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မူႇၵုၼ်ၵူဝ်ႇၵူဝ်းသ်</standard>
+				</long>
+			</metazone>
+			<metazone type="Colombia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵူဝ်ႇလမ်ႇပီႇယႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵူဝ်ႇလမ်ႇပီႇယႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵူဝ်ႇလမ်ႇပီႇယႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cook">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မူႇၵုၼ်ၶုၵ်ႈ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မူႇၵုၼ်ၶုၵ်ႈ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ မူႇၵုၼ်ၶုၵ်ႈ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Cuba">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵူးပႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵူးပႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵူးပႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Davis">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း တေးဝိတ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="DumontDUrville">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း တူႇမွၼ်ႉ တဝီႇလ်</standard>
+				</long>
+			</metazone>
+			<metazone type="East_Timor">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း တီႇမေႃးလႅတ်ႉသ်တႄး</standard>
+				</long>
+			</metazone>
+			<metazone type="Easter">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵုၼ်ဢီႇသတႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵုၼ်ဢီႇသတႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵုၼ်ဢီႇသတႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Ecuador">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢေႇၵႂႃႇတေႃႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Central">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းၵၢင်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းၵၢင်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ယူးရူပ်ႉ ပွတ်းၵၢင်</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Eastern">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းဢွၵ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းဢွၵ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ယူးရူပ်ႉ ပွတ်းဢွၵ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Europe_Further_Eastern">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းဢွၵ်ႇ ဢၼ်ၵႆတိူဝ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Europe_Western">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းတူၵ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ယူးရူပ်ႉ ပွတ်းတူၵ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ယူးရူပ်ႉ ပွတ်းတူၵ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Falkland">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Fiji">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၾီႇၵျီႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၾီႇၵျီႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၾီႇၵျီႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="French_Guiana">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵုၺ်ႇယႃႇၼႃႇ ၶွင် ၾရၢင်ႇသဵတ်ႈ</standard>
+				</long>
+			</metazone>
+			<metazone type="French_Southern">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၾရၢင်ႇသဵတ်ႈ ပွတ်းၸၢၼ်း လႄႈ ဢႅၼ်ႇတၢၵ်ႈတီးၵႃႈ</standard>
+				</long>
+			</metazone>
+			<metazone type="Galapagos">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵႃႇလႃႇပၵူဝ်ႉသ်</standard>
+				</long>
+			</metazone>
+			<metazone type="Gambier">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵမ်ႇပီႇယႃႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Georgia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵျေႃႇၵျႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵျေႃႇၵျႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၵျေႃႇၵျႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Gilbert_Islands">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵိလ်ပႅတ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="GMT">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၽတ်ႉၽဵင်ႇ ၵရိၼ်းဝိတ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵရိၼ်းလႅၼ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵရိၼ်းလႅၼ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၵရိၼ်းလႅၼ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Eastern">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵရိၼ်းလႅၼ်း ပွတ်းဢွၵ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵရိၼ်းလႅၼ်း ပွတ်းဢွၵ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵရိၼ်းလႅၼ်း ပွတ်းဢွၵ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Greenland_Western">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵရိၼ်းလႅၼ်း ပွတ်းတူၵ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵရိၼ်းလႅၼ်း ပွတ်းတူၵ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵရိၼ်းလႅၼ်း ပွတ်းတူၵ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Guam">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵႂၢမ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Gulf">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢၢဝ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Guyana">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵၢႆႇယႃးၼႃႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ႁႃႇဝၢႆးဢီး-ဢလူးသျၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Hawaii_Aleutian">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ႁႃႇဝၢႆးဢီး-ဢလူးသျၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ႁႃႇဝၢႆးဢီး-ဢလူးသျၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ႁႃႇဝၢႆးဢီး-ဢလူးသျၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hong_Kong">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ႁွင်းၵွင်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ႁွင်းၵွင်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ႁွင်းၵွင်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Hovd">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶူဝ်ဝေတေး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶူဝ်ဝေတေး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၶူဝ်ဝေတေး</daylight>
+				</long>
+			</metazone>
+			<metazone type="India">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢိၼ်းတီးယႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="Indian_Ocean">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း သမုၵ်ႉတရႃႇဢိၼ်းတီးယႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="Indochina">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢိၼ်ႇတူဝ်ႇၶႄႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Central">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢိၼ်ႇတူဝ်ႇၼီးသျႃး ပွတ်းၵၢင်</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Eastern">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢိၼ်ႇတူဝ်ႇၼီးသျႃး ပွတ်းဢွၵ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Indonesia_Western">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဢိၼ်ႇတူဝ်ႇၼီးသျႃး ပွတ်းတူၵ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Iran">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢီႇရၢၼ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢီႇရၢၼ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢီႇရၢၼ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Irkutsk">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢိရၶုတ်ႉသ်ၶ်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢိရၶုတ်ႉသ်ၶ်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢိရၶုတ်ႉသ်ၶ်</daylight>
+				</long>
+			</metazone>
+			<metazone type="Israel">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢိတ်ႇသရေး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢိတ်ႇသရေး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢိတ်ႇသရေး</daylight>
+				</long>
+			</metazone>
+			<metazone type="Japan">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵျႃႇပၢၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵျႃႇပၢၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵျႃႇပၢၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kamchatka">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵမ်ႇၶျတ်ႉၵႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵမ်ႇၶျတ်ႉၵႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၵမ်ႇၶျတ်ႉၵႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵႃႇၸၢၵ်ႈသတၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Eastern">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵႃႇၸၢၵ်ႈသတၼ်ႇ ပွတ်းဢွၵ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Kazakhstan_Western">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵႃႇၸၢၵ်ႈသတၼ်ႇ ပွတ်းတူၵ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Korea">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵၢဝ်းလီ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵၢဝ်းလီ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵၢဝ်းလီ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kosrae">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵွတ်ႉသ်ရေး</standard>
+				</long>
+			</metazone>
+			<metazone type="Krasnoyarsk">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶရတ်ႉၼူဝ်ႇယႃႇသ်ၶ်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶရတ်ႉၼူဝ်ႇယႃႇသ်ၶ်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၶရတ်ႉၼူဝ်ႇယႃႇသ်ၶ်</daylight>
+				</long>
+			</metazone>
+			<metazone type="Kyrgystan">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵႃႇၵိတ်ႈသတၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Lanka">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း လင်းၵႃ</standard>
+				</long>
+			</metazone>
+			<metazone type="Line_Islands">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မူႇၵုၼ်လၢႆး</standard>
+				</long>
+			</metazone>
+			<metazone type="Lord_Howe">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း လွတ်ႉႁၢဝ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း လွတ်ႉႁၢဝ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း လွတ်ႉႁၢဝ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Macau">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မႃႇၵၢဝ်ႈ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မႃႇၵၢဝ်ႈ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ မႃႇၵၢဝ်ႈ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Magadan">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မႃႇၵႃႇတၢၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မႃႇၵႃႇတၢၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ မႃႇၵႃႇတၢၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Malaysia">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မလေးသျႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="Maldives">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မေႃႇတိပ်ႈ</standard>
+				</long>
+			</metazone>
+			<metazone type="Marquesas">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မႃၶေးသႅတ်ႉသ်</standard>
+				</long>
+			</metazone>
+			<metazone type="Marshall_Islands">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မူႇၵုၼ်မႃးသျႄႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Mauritius">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မေႃးရီႇသႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မေႃးရီႇသႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ မေႃးရီႇသႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mawson">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မေႃသၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Mexico_Pacific">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မႅၵ်ႇသီႇၵူဝ်ႇ ပၸိၾိၵ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မႅၵ်ႇသီႇၵူဝ်ႇ ပၸိၾိၵ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း မႅၵ်ႇသီႇၵူဝ်ႇ ပၸိၾိၵ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Mongolia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢူလၼ်ပႃတႃ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢူလၼ်ပႃတႃ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢူလၼ်ပႃတႃ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Moscow">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း မွတ်ႉသ်ၵူဝ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မွတ်ႉသ်ၵူဝ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ မွတ်ႉသ်ၵူဝ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Myanmar">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မျၢၼ်ႇမႃႇ</standard>
+				</long>
+				<short>
+					<standard draft="contributed">MMT</standard>
+				</short>
+			</metazone>
+			<metazone type="Nauru">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၼၢဝ်ရူး</standard>
+				</long>
+			</metazone>
+			<metazone type="Nepal">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၼေႇပေႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="New_Caledonia">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး</daylight>
+				</long>
+			</metazone>
+			<metazone type="New_Zealand">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၼိဝ်းၸီႇလႅၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၼိဝ်းၸီႇလႅၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၼိဝ်းၸီႇလႅၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Newfoundland">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၼိဝ်းၾွမ်ႇလႅၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၼိဝ်းၾွမ်ႇလႅၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၼိဝ်းၾွမ်ႇလႅၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Niue">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၼီးဝႄႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Norfolk">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၵုၼ်ၼေႃႇၾုၵ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵုၼ်ၼေႃႇၾုၵ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵုၼ်ၼေႃႇၾုၵ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Noronha">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၾႃႇၼႅၼ်ႇတူဝ်ႇ တႄႇ တီႇၼူဝ်ႇရွၼ်ႇႁႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၾႃႇၼႅၼ်ႇတူဝ်ႇ တႄႇ တီႇၼူဝ်ႇရွၼ်ႇႁႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၾႃႇၼႅၼ်ႇတူဝ်ႇ တႄႇ တီႇၼူဝ်ႇရွၼ်ႇႁႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="North_Mariana">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မူႇၵုၼ်မႃႇရီႇယႃႇၼႃႇ ပွတ်းႁွင်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Novosibirsk">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၼူဝ်ႇဝူဝ်ႇသီႇပၢတ်ႉသ်ၶ်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၼူဝ်ႇဝူဝ်ႇသီႇပၢတ်ႉသ်ၶ်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၼူဝ်ႇဝူဝ်ႇသီႇပၢတ်ႉသ်ၶ်</daylight>
+				</long>
+			</metazone>
+			<metazone type="Omsk">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢူမ်းသ်ၶ်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢူမ်းသ်ၶ်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢူမ်းသ်ၶ်</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pakistan">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပႃႇၵိတ်ႈသတၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပႃႇၵိတ်ႈသတၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ပႃႇၵိတ်ႈသတၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Palau">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ပႃႇလၢဝ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Papua_New_Guinea">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ပႃးပႂႃႇၼိဝ်းၵီးၼီး</standard>
+				</long>
+			</metazone>
+			<metazone type="Paraguay">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပႃႇရႃႇၵူၺ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပႃႇရႃႇၵူၺ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပႃႇရႃႇၵူၺ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Peru">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ပေႇရူႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ပေႇရူႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပေႇရူႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Philippines">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၾီလိပ်ႈပိၼ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၾီလိပ်ႈပိၼ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၾီလိပ်ႈပိၼ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Phoenix_Islands">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မူႇၵုၼ်ၽီးၼိၵ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Pierre_Miquelon">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း သဵင်ႉပီးယႃး လႄႈ မိၵ်ႈၵွႆႇလွၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သဵင်ႉပီးယႃး လႄႈ မိၵ်ႈၵွႆႇလွၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း သဵင်ႉပီးယႃး လႄႈ မိၵ်ႈၵွႆႇလွၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Pitcairn">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၽိတ်ႉၶႅၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Ponape">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ပူၼ်းပေႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Pyongyang">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵၢဝ်းလီႁွင်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Qyzylorda">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Reunion">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ရေႇၼီႇယၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Rothera">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ရူဝ်ႇထႄႇရႃႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Sakhalin">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း သႃႇၶႃႇလိၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သႃႇၶႃႇလိၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ သႃႇၶႃႇလိၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samara">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း သႃႇမႃႇရႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သႃႇမႃႇရႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ သႃႇမႃႇရႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Samoa">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Seychelles">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း သေးသျႄႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Singapore">
+				<long>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သိင်ႇၵႃႇပူဝ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Solomon">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း မူႇၵုၼ်သေႃႇလေႃႇမၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="South_Georgia">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵျေႃႇၵျႃႇ ပွတ်းၸၢၼ်း</standard>
+				</long>
+			</metazone>
+			<metazone type="Suriname">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း သျူးရီးၼႃႇမႄႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Syowa">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း သၢႆးဢူဝ်ႇဝႃႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Tahiti">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း တႁီႇတီႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Taipei">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ထၢႆႇဝၢၼ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ထၢႆႇဝၢၼ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ထၢႆႇဝၢၼ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tajikistan">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း တႃႇၵျီႇၵီႇသတၼ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Tokelau">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ထူဝ်းၵေႇလၢဝ်ႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Tonga">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ထွင်းၵႃႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ထွင်းၵႃႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ထွင်းၵႃႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Truk">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၶျူၵ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Turkmenistan">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း တၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း တၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ တၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Tuvalu">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ထူးဝႃႇလူႇ</standard>
+				</long>
+			</metazone>
+			<metazone type="Uruguay">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢုရုၵူၺ်း</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢုရုၵူၺ်း</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢုရုၵူၺ်း</daylight>
+				</long>
+			</metazone>
+			<metazone type="Uzbekistan">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vanuatu">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဝႅၼ်ႇၼူးဝႃႇထူႇ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဝႅၼ်ႇၼူးဝႃႇထူႇ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဝႅၼ်ႇၼူးဝႃႇထူႇ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Venezuela">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဝႄႇၼေႇၸွႆးလႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="Vladivostok">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဝလႃႇတီႇဝူဝ်ႇသတွၵ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဝလႃႇတီႇဝူဝ်ႇသတွၵ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဝလႃႇတီႇဝူဝ်ႇသတွၵ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Volgograd">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ဝူဝ်ႇၵူဝ်ႇၵရၢတ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဝူဝ်ႇၵူဝ်ႇၵရၢတ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဝူဝ်ႇၵူဝ်ႇၵရၢတ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Vostok">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဝေႃႉသ်တွၵ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Wake">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ၵုၼ်ဝဵၵ်ႉ</standard>
+				</long>
+			</metazone>
+			<metazone type="Wallis">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ဝႃးလိတ်ႈ လႄႈ ၾူႇတူးၼႃး</standard>
+				</long>
+			</metazone>
+			<metazone type="Yakutsk">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ယၵုတ်ႉသ်ၶ်</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ယၵုတ်ႉသ်ၶ်</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ယၵုတ်ႉသ်ၶ်</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yekaterinburg">
+				<long>
+					<generic>ၶၢဝ်းယၢမ်း ယေႇၵႃႇတႄႇရိၼ်ႇပၢၵ်ႉ</generic>
+					<standard>လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ယေႇၵႃႇတႄႇရိၼ်ႇပၢၵ်ႉ</standard>
+					<daylight>ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ယေႇၵႃႇတႄႇရိၼ်ႇပၢၵ်ႉ</daylight>
+				</long>
+			</metazone>
+			<metazone type="Yukon">
+				<long>
+					<standard>ၶၢဝ်းယၢမ်း ယူးၵွၼ်ႇ</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<decimalFormats numberSystem="latn">
+			<decimalFormatLength type="long">
+				<decimalFormat>
+					<pattern type="1000" count="other">0 ႁဵင်</pattern>
+					<pattern type="10000" count="other">0 မိုၼ်ႇ</pattern>
+					<pattern type="100000" count="other">0 သႅၼ်</pattern>
+					<pattern type="1000000" count="other">0 လၢၼ်ႉ</pattern>
+					<pattern type="10000000" count="other">00 လၢၼ်ႉ</pattern>
+					<pattern type="100000000" count="other">000 လၢၼ်ႉ</pattern>
+					<pattern type="1000000000" count="other">0 ႁဵင်လၢၼ်ႉ</pattern>
+					<pattern type="10000000000" count="other">0 မိုၼ်ႇလၢၼ်ႉ</pattern>
+					<pattern type="100000000000" count="other">0 သႅၼ်လၢၼ်ႉ</pattern>
+					<pattern type="1000000000000" count="other">0 လၢၼ်ႉလၢၼ်ႉ</pattern>
+					<pattern type="10000000000000" count="other">00 လၢၼ်ႉလၢၼ်ႉ</pattern>
+					<pattern type="100000000000000" count="other">000 လၢၼ်ႉလၢၼ်ႉ</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<currencies>
+			<currency type="ADP">
+				<displayName>ပေႇသႄႇတႃႇဢႅၼ်ႇတူဝ်ႇရႃႇ</displayName>
+				<displayName count="other">ပေႇသႄႇတႃႇဢႅၼ်ႇတူဝ်ႇရႃႇ</displayName>
+			</currency>
+			<currency type="AED">
+				<displayName>တီႇရမ်ႇမိူင်းႁူမ်ႈတုမ် ၸဝ်ႈၾႃႉ ဢႃႇရၢပ်ႈ</displayName>
+				<displayName count="other">တီႇရမ်ႇမိူင်းႁူမ်ႈတုမ် ၸဝ်ႈၾႃႉ ဢႃႇရၢပ်ႈ</displayName>
+			</currency>
+			<currency type="AFA">
+				<displayName>ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ (1927–2002)</displayName>
+				<displayName count="other">ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ (1927–2002)</displayName>
+			</currency>
+			<currency type="AFN">
+				<displayName>ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ</displayName>
+				<displayName count="other">ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ</displayName>
+			</currency>
+			<currency type="ALK">
+				<displayName>လႅၵ်ႈဢႃႇပႃးၼီးယႃး (1946–1965)</displayName>
+				<displayName count="other">လႅၵ်ႈဢႃႇပႃးၼီးယႃး (1946–1965)</displayName>
+			</currency>
+			<currency type="ALL">
+				<displayName>လႅၵ်ႈဢႃႇပႃးၼီးယႃး</displayName>
+				<displayName count="other">လႅၵ်ႈဢႃႇပႃးၼီးယႃး</displayName>
+			</currency>
+			<currency type="AMD">
+				<displayName>တရၢမ်ႇဢႃႇမေးၼီးယႃး</displayName>
+				<displayName count="other">တရၢမ်ႇဢႃႇမေးၼီးယႃး</displayName>
+			</currency>
+			<currency type="ANG">
+				<displayName>ၵဵဝ်းတႃႇၼႄႇတႃႇလႅၼ်ႇ ဢၼ်ထေးလ်လိသ်</displayName>
+				<displayName count="other">ၵဵဝ်းတႃႇၼႄႇတႃႇလႅၼ်ႇ ဢၼ်ထေးလ်လိသ်</displayName>
+			</currency>
+			<currency type="AOA">
+				<displayName>ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ</displayName>
+				<displayName count="other">ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ</displayName>
+			</currency>
+			<currency type="AOK">
+				<displayName>ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1977–1991)</displayName>
+				<displayName count="other">ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1977–1991)</displayName>
+			</currency>
+			<currency type="AON">
+				<displayName>ၶႂၼ်ႇၸႃႇမႂ်ႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1990–2000)</displayName>
+				<displayName count="other">ၶႂၼ်ႇၸႃႇမႂ်ႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1990–2000)</displayName>
+			</currency>
+			<currency type="AOR">
+				<displayName>ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ ဢၼ်ၶိုၼ်းမူၼ်ႉမႄးဝႆႉ (1995–1999)</displayName>
+				<displayName count="other">ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ ဢၼ်ၶိုၼ်းမူၼ်ႉမႄးဝႆႉ (1995–1999)</displayName>
+			</currency>
+			<currency type="ARA">
+				<displayName>ဢေႃႉသထရႄႇလ်ဢႃႇၵျႅၼ်ႇတီးၼႃး</displayName>
+				<displayName count="other">ဢေႃႉသထရႄႇလ်ဢႃႇၵျႅၼ်ႇတီးၼႃး</displayName>
+			</currency>
+			<currency type="ARL">
+				<displayName>ပေႇသူဝ်ႇလေးဢႃႇၵျႅၼ်ႇတီးၼႃး (1970–1983)</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇလေးဢႃႇၵျႅၼ်ႇတီးၼႃး (1970–1983)</displayName>
+			</currency>
+			<currency type="ARM">
+				<displayName>ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1881–1970)</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1881–1970)</displayName>
+			</currency>
+			<currency type="ARP">
+				<displayName>ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1983–1985)</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1983–1985)</displayName>
+			</currency>
+			<currency type="ARS">
+				<displayName>ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး</displayName>
+			</currency>
+			<currency type="ATS">
+				<displayName>သျီႇလင်ႇဢေႃးသထရီးယႃး</displayName>
+				<displayName count="other">သျီႇလင်ႇဢေႃးသထရီးယႃး</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName>တေႃႇလႃႇဢေႃႉသထရေးလီးယႃး</displayName>
+				<displayName count="other">တေႃႇလႃႇဢေႃႉသထရေးလီးယႃး</displayName>
+			</currency>
+			<currency type="AWG">
+				<displayName>ၽလေႃးရိၼ်ႇဢႃႇရူးပႃး</displayName>
+				<displayName count="other">ၽလေႃးရိၼ်ႇဢႃႇရူးပႃး</displayName>
+			</currency>
+			<currency type="AZM">
+				<displayName>မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ (1993–2006)</displayName>
+				<displayName count="other">မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ (1993–2006)</displayName>
+			</currency>
+			<currency type="AZN">
+				<displayName>မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</displayName>
+				<displayName count="other">မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ</displayName>
+			</currency>
+			<currency type="BAD">
+				<displayName>တီႇၼႃႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1992–1994)</displayName>
+				<displayName count="other">တီႇၼႃႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1992–1994)</displayName>
+			</currency>
+			<currency type="BAM">
+				<displayName>မၢၵ်ႉၶ်ပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး ဢၼ်လႅၵ်ႈလႆႈ</displayName>
+				<displayName count="other">မၢၵ်ႉၶ်ပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး ဢၼ်လႅၵ်ႈလႆႈ</displayName>
+			</currency>
+			<currency type="BAN">
+				<displayName>တီႇၼႃႇမႂ်ႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1994–1997)</displayName>
+				<displayName count="other">တီႇၼႃႇမႂ်ႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1994–1997)</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName>တေႃႇလႃႇပႃးပေႇတူတ်ႈ</displayName>
+				<displayName count="other">တေႃႇလႃႇပႃးပေႇတူတ်ႈ</displayName>
+			</currency>
+			<currency type="BDT">
+				<displayName>တႃႇၵႃႇပင်းၵလႃးတဵတ်ႈ</displayName>
+				<displayName count="other">တႃႇၵႃႇပင်းၵလႃးတဵတ်ႈ</displayName>
+			</currency>
+			<currency type="BEC">
+				<displayName>ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ဢၼ်လႅၵ်ႈလႆႈ)</displayName>
+				<displayName count="other">ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ဢၼ်လႅၵ်ႈလႆႈ)</displayName>
+			</currency>
+			<currency type="BEF">
+				<displayName>ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ</displayName>
+			</currency>
+			<currency type="BEL">
+				<displayName>ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ၵၢၼ်ငိုၼ်းတွင်း)</displayName>
+				<displayName count="other">ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ၵၢၼ်ငိုၼ်းတွင်း)</displayName>
+			</currency>
+			<currency type="BGL">
+				<displayName>လႅပ်ႉၾ်ၶႅင်ပူႇၵႃႇရီႇယႃႇ</displayName>
+				<displayName count="other">လႅပ်ႉၾ်ၶႅင်ပူႇၵႃႇရီႇယႃႇ</displayName>
+			</currency>
+			<currency type="BGM">
+				<displayName>လႅပ်ႉၾ်သူဝ်ႇသျႄႇလိတ်ႉပူႇၵႃႇရီႇယႃႇ</displayName>
+				<displayName count="other">လႅပ်ႉၾ်သူဝ်ႇသျႄႇလိတ်ႉပူႇၵႃႇရီႇယႃႇ</displayName>
+			</currency>
+			<currency type="BGN">
+				<displayName>လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ</displayName>
+				<displayName count="other">လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ</displayName>
+			</currency>
+			<currency type="BGO">
+				<displayName>လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ (1879–1952)</displayName>
+				<displayName count="other">လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ (1879–1952)</displayName>
+			</currency>
+			<currency type="BHD">
+				<displayName>တီႇၼႃႇပႃႇရဵၼ်း</displayName>
+				<displayName count="other">တီႇၼႃႇပႃႇရဵၼ်း</displayName>
+			</currency>
+			<currency type="BIF">
+				<displayName>ၾရၼ်ႉပူႇရုၼ်းတီႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉပူႇရုၼ်းတီႇ</displayName>
+			</currency>
+			<currency type="BMD">
+				<displayName>တေႃႇလႃႇပႃႇမိဝ်းတႃး</displayName>
+				<displayName count="other">တေႃႇလႃႇပႃႇမိဝ်းတႃး</displayName>
+			</currency>
+			<currency type="BND">
+				<displayName>တေႃႇလႃႇပရူႇၼၢႆး</displayName>
+				<displayName count="other">တေႃႇလႃႇပရူႇၼၢႆး</displayName>
+			</currency>
+			<currency type="BOB">
+				<displayName>ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး</displayName>
+				<displayName count="other">ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး</displayName>
+			</currency>
+			<currency type="BOL">
+				<displayName>ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး (1863–1963)</displayName>
+				<displayName count="other">ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး (1863–1963)</displayName>
+			</currency>
+			<currency type="BOP">
+				<displayName>ပေႇသူဝ်ႇပူဝ်ႇလီးပီးယႃး</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇပူဝ်ႇလီးပီးယႃး</displayName>
+			</currency>
+			<currency type="BOV">
+				<displayName>ဢႅမ်ႇဝီႇတေႃးပူဝ်ႇလီးပီးယႃး</displayName>
+				<displayName count="other">ဢႅမ်ႇဝီႇတေႃးပူဝ်ႇလီးပီးယႃး</displayName>
+			</currency>
+			<currency type="BRB">
+				<displayName>ၶရူႇၸႄရူဝ်ႇမႂ်ႇပရႃႇၸီး (1967–1986)</displayName>
+				<displayName count="other">ၶရူႇၸႄရူဝ်ႇမႂ်ႇပရႃႇၸီး (1967–1986)</displayName>
+			</currency>
+			<currency type="BRC">
+				<displayName>ၶရူႇၸႃတူဝ်ႇပရႃႇၸီး (1986–1989)</displayName>
+				<displayName count="other">ၶရူႇၸႃတူဝ်ႇပရႃႇၸီး (1986–1989)</displayName>
+			</currency>
+			<currency type="BRE">
+				<displayName>ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1990–1993)</displayName>
+				<displayName count="other">ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1990–1993)</displayName>
+			</currency>
+			<currency type="BRL">
+				<displayName>ရီးဢႄႇလ်ပရႃႇၸီး</displayName>
+				<displayName count="other">ရီးဢႄႇလ်ပရႃႇၸီး</displayName>
+			</currency>
+			<currency type="BRN">
+				<displayName>ၶရူႇၸႃတူဝ်ႇမႂ်ႇပရႃႇၸီး (1989–1990)</displayName>
+				<displayName count="other">ၶရူႇၸႃတူဝ်ႇမႂ်ႇပရႃႇၸီး (1989–1990)</displayName>
+			</currency>
+			<currency type="BRR">
+				<displayName>ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1993–1994)</displayName>
+				<displayName count="other">ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1993–1994)</displayName>
+			</currency>
+			<currency type="BRZ">
+				<displayName>ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1942–1967)</displayName>
+				<displayName count="other">ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1942–1967)</displayName>
+			</currency>
+			<currency type="BSD">
+				<displayName>တေႃႇလႃႇပႃႇႁႃးမႃး</displayName>
+				<displayName count="other">တေႃႇလႃႇပႃႇႁႃးမႃး</displayName>
+			</currency>
+			<currency type="BTN">
+				<displayName>ဢိၼ်ၵူးလ်ထရမ်ႇၽူႇတၢၼ်ႇ</displayName>
+				<displayName count="other">ဢိၼ်ၵူးလ်ထရမ်ႇၽူႇတၢၼ်ႇ</displayName>
+			</currency>
+			<currency type="BUK">
+				<displayName>ၵျၢပ်ႈမၢၼ်ႈ</displayName>
+				<displayName count="other">ၵျၢပ်ႈမၢၼ်ႈ</displayName>
+			</currency>
+			<currency type="BWP">
+				<displayName>ပူႇလႃႇပွတ်ႉသဝႃႇၼႃႇ</displayName>
+				<displayName count="other">ပူႇလႃႇပွတ်ႉသဝႃႇၼႃႇ</displayName>
+			</currency>
+			<currency type="BYB">
+				<displayName>ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (1994–1999)</displayName>
+				<displayName count="other">ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (1994–1999)</displayName>
+			</currency>
+			<currency type="BYN">
+				<displayName>ရူႇပႄႇပႄႇလႃႇရုတ်ႈ</displayName>
+				<displayName count="other">ရူႇပႄႇပႄႇလႃႇရုတ်ႈ</displayName>
+			</currency>
+			<currency type="BYR">
+				<displayName>ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (2000–2016)</displayName>
+				<displayName count="other">ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (2000–2016)</displayName>
+			</currency>
+			<currency type="BZD">
+				<displayName>တေႃႇလႃႇပႄႇလိတ်ႈ</displayName>
+				<displayName count="other">တေႃႇလႃႇပႄႇလိတ်ႈ</displayName>
+			</currency>
+			<currency type="CAD">
+				<displayName>တေႃႇလႃႇၶႅၼ်ႇၼေႇတႃႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇၶႅၼ်ႇၼေႇတႃႇ</displayName>
+			</currency>
+			<currency type="CDF">
+				<displayName>ၾရၼ်ႉၶွင်ႇၵူဝ်ႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉၶွင်ႇၵူဝ်ႇ</displayName>
+			</currency>
+			<currency type="CHE">
+				<displayName>ယူႇရူဝ်ႇ WIR</displayName>
+				<displayName count="other">ယူႇရူဝ်ႇ WIR</displayName>
+			</currency>
+			<currency type="CHF">
+				<displayName>ၾရၼ်ႉသဝိတ်ႈၸႃႇလႅၼ်ႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉသဝိတ်ႈၸႃႇလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="CHW">
+				<displayName>ၾရၼ်ႉ WIR</displayName>
+				<displayName count="other">ၾရၼ်ႉ WIR</displayName>
+			</currency>
+			<currency type="CLE">
+				<displayName>ဢႅတ်ႉသၵူႇတူဝ်ႇၶျီႇလီႇ</displayName>
+				<displayName count="other">ဢႅတ်ႉသၵူႇတူဝ်ႇၶျီႇလီႇ</displayName>
+			</currency>
+			<currency type="CLF">
+				<displayName>ယူႇၼီႉၶွင်ဢၶွင်ႉၶျီႇလီႇ</displayName>
+				<displayName count="other">ယူႇၼီႉၶွင်ဢၶွင်ႉၶျီႇလီႇ</displayName>
+			</currency>
+			<currency type="CLP">
+				<displayName>ပေႇသူဝ်ႇၶျီႇလီႇ</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇၶျီႇလီႇ</displayName>
+			</currency>
+			<currency type="CNH">
+				<displayName>ယွၼ်ႇၶႄႇ (ၼွၵ်ႈၽၢင်ႇပၢင်ႇလၢႆႇ)</displayName>
+				<displayName count="other">ယွၼ်ႇၶႄႇ (ၼွၵ်ႈၽၢင်ႇပၢင်ႇလၢႆႇ)</displayName>
+			</currency>
+			<currency type="CNX">
+				<displayName>တေႃႇလႃႇယေးငိုၼ်းၵူၼ်းမိူင်းၶႄႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇယေးငိုၼ်းၵူၼ်းမိူင်းၶႄႇ</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName>ယွၼ်ႇၶႄႇ</displayName>
+				<displayName count="other">ယွၼ်ႇၶႄႇ</displayName>
+			</currency>
+			<currency type="COP">
+				<displayName>ပေႇသူဝ်ႇၵူဝ်ႇလမ်ႇပီႇယႃႇ</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇၵူဝ်ႇလမ်ႇပီႇယႃႇ</displayName>
+			</currency>
+			<currency type="COU">
+				<displayName>ယူႇၼိတ်ႉၵႃႈၶၼ်တႄႉတႄႉၵူဝ်ႇလမ်ႇပီႇယႃႇ</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉၵႃႈၶၼ်တႄႉတႄႉၵူဝ်ႇလမ်ႇပီႇယႃႇ</displayName>
+			</currency>
+			<currency type="CRC">
+				<displayName>ၵူဝ်ႇလူၼ်ႇၵေႃးသတႃႇရိၵႃႇ</displayName>
+				<displayName count="other">ၵူဝ်ႇလူၼ်ႇၵေႃးသတႃႇရိၵႃႇ</displayName>
+			</currency>
+			<currency type="CSD">
+				<displayName>တီႇၼႃႇသႃးပီးယႃး (2002–2006)</displayName>
+				<displayName count="other">တီႇၼႃႇသႃးပီးယႃး (2002–2006)</displayName>
+			</currency>
+			<currency type="CSK">
+				<displayName>ၵူဝ်ႇရူႇၼႃႇၶႅင်ၶျႅၵ်ႈ</displayName>
+				<displayName count="other">ၵူဝ်ႇရူႇၼႃႇၶႅင်ၶျႅၵ်ႈ</displayName>
+			</currency>
+			<currency type="CUC">
+				<displayName>ပေႇသူဝ်ႇၵူးပႃး ဢၼ်လႅၵ်ႈလႆႈ</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇၵူးပႃး ဢၼ်လႅၵ်ႈလႆႈ</displayName>
+			</currency>
+			<currency type="CUP">
+				<displayName>ပေႇသူဝ်ႇၵူးပႃး</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇၵူးပႃး</displayName>
+			</currency>
+			<currency type="CVE">
+				<displayName>ဢိသ်ၵူႇတူဝ်ႇၶဵပ်ႉဝႄႇတီႇ</displayName>
+				<displayName count="other">ဢိသ်ၵူႇတူဝ်ႇၶဵပ်ႉဝႄႇတီႇ</displayName>
+			</currency>
+			<currency type="CYP">
+				<displayName>ပွၼ်းသၢႆႉပရႅတ်ႈ</displayName>
+				<displayName count="other">ပွၼ်းသၢႆႉပရႅတ်ႈ</displayName>
+			</currency>
+			<currency type="CZK">
+				<displayName>ၵူဝ်ႇရူႇၼႃႇၶျႅၵ်ႈ</displayName>
+				<displayName count="other">ၵူဝ်ႇရူႇၼႃႇၶျႅၵ်ႈ</displayName>
+			</currency>
+			<currency type="DDM">
+				<displayName>မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇပွတ်းဢွၵ်ႇ</displayName>
+				<displayName count="other">မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇပွတ်းဢွၵ်ႇ</displayName>
+			</currency>
+			<currency type="DEM">
+				<displayName>မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇ</displayName>
+				<displayName count="other">မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇ</displayName>
+			</currency>
+			<currency type="DJF">
+				<displayName>ၾရၼ်ႉၵျီႇပူးတီႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉၵျီႇပူးတီႇ</displayName>
+			</currency>
+			<currency type="DKK">
+				<displayName>ၶရူၼ်းတႅၼ်းမၢၵ်ႈ</displayName>
+				<displayName count="other">ၶရူၼ်းတႅၼ်းမၢၵ်ႈ</displayName>
+			</currency>
+			<currency type="DOP">
+				<displayName>ပေႇသူဝ်ႇတူဝ်ႇမီႇၼီႇၵၼ်ႇ</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇတူဝ်ႇမီႇၼီႇၵၼ်ႇ</displayName>
+			</currency>
+			<currency type="DZD">
+				<displayName>တီႇၼႃႇဢႄးၵျီးရီးယႃး</displayName>
+				<displayName count="other">တီႇၼႃႇဢႄးၵျီးရီးယႃး</displayName>
+			</currency>
+			<currency type="ECS">
+				<displayName>သုၶရေႇဢေႇၵႂႃႇတေႃႇ</displayName>
+				<displayName count="other">သုၶရေႇဢေႇၵႂႃႇတေႃႇ</displayName>
+			</currency>
+			<currency type="ECV">
+				<displayName>ယူးၼိတ်ႉၵႃႈၶၼ်ဢေႇၵႂႃႇတေႃႇ ဢၼ်ဢမ်ႇလႅၵ်ႈလၢႆႈ</displayName>
+				<displayName count="other">ယူးၼိတ်ႉၵႃႈၶၼ်ဢေႇၵႂႃႇတေႃႇ ဢၼ်ဢမ်ႇလႅၵ်ႈလၢႆႈ</displayName>
+			</currency>
+			<currency type="EEK">
+				<displayName>ၶရူၼ်းဢႄႇသတူဝ်းၼီးယႃး</displayName>
+				<displayName count="other">ၶရူၼ်းဢႄႇသတူဝ်းၼီးယႃး</displayName>
+			</currency>
+			<currency type="EGP">
+				<displayName>ပွၼ်းဢီးၵျိပ်ႈ</displayName>
+				<displayName count="other">ပွၼ်းဢီးၵျိပ်ႈ</displayName>
+			</currency>
+			<currency type="ERN">
+				<displayName>ၼၢၵ်ႉၾႃႉဢႄႇရီႇထရီးယႃး</displayName>
+				<displayName count="other">ၼၢၵ်ႉၾႃႉဢႄႇရီႇထရီးယႃး</displayName>
+			</currency>
+			<currency type="ESA">
+				<displayName>ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉ)</displayName>
+				<displayName count="other">ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉ)</displayName>
+			</currency>
+			<currency type="ESB">
+				<displayName>ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉဢၼ်လႅၵ်ႈလႆႈ)</displayName>
+				<displayName count="other">ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉဢၼ်လႅၵ်ႈလႆႈ)</displayName>
+			</currency>
+			<currency type="ESP">
+				<displayName>ပေႇသႄႇတႃႇသပဵၼ်ႇ</displayName>
+				<displayName count="other">ပေႇသႄႇတႃႇသပဵၼ်ႇ</displayName>
+			</currency>
+			<currency type="ETB">
+				<displayName>ပႄးရ်ဢီႇတီႇယူဝ်းပီးယႃး</displayName>
+				<displayName count="other">ပႄးရ်ဢီႇတီႇယူဝ်းပီးယႃး</displayName>
+			</currency>
+			<currency type="EUR">
+				<displayName>ယူႇရူဝ်ႇ</displayName>
+				<displayName count="other">ယူႇရူဝ်ႇ</displayName>
+			</currency>
+			<currency type="FIM">
+				<displayName>မႃႇၶႃႇၾိၼ်ႇလႅၼ်ႇ</displayName>
+				<displayName count="other">မႃႇၶႃႇၾိၼ်ႇလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="FJD">
+				<displayName>တေႃႇလႃႇၾီႇၵျီႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇၾီႇၵျီႇ</displayName>
+			</currency>
+			<currency type="FKP">
+				<displayName>ပွၼ်းမူႇၵုၼ်ၾွၵ်ႉလႅၼ်ႇ</displayName>
+				<displayName count="other">ပွၼ်းမူႇၵုၼ်ၾွၵ်ႉလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="FRF">
+				<displayName>ၾရၼ်ႉၾရၢင်ႇသဵတ်ႈ</displayName>
+				<displayName count="other">ၾရၼ်ႉၾရၢင်ႇသဵတ်ႈ</displayName>
+			</currency>
+			<currency type="GBP">
+				<displayName>ပွၼ်းဢိင်းၵလဵတ်ႈ</displayName>
+				<displayName count="other">ပွၼ်းဢိင်းၵလဵတ်ႈ</displayName>
+			</currency>
+			<currency type="GEK">
+				<displayName>ၵူႇပုၼ်ႇလႃႇရိတ်ႉၵျေႃႇၵျႃႇ</displayName>
+				<displayName count="other">ၵူႇပုၼ်ႇလႃႇရိတ်ႉၵျေႃႇၵျႃႇ</displayName>
+			</currency>
+			<currency type="GEL">
+				<displayName>လႃႇရီႇၵျေႃႇၵျႃႇ</displayName>
+				<displayName count="other">လႃႇရီႇၵျေႃႇၵျႃႇ</displayName>
+			</currency>
+			<currency type="GHC">
+				<displayName>သေႇတီႇၵႃႇၼႃႇ (1979–2007)</displayName>
+				<displayName count="other">သေႇတီႇၵႃႇၼႃႇ (1979–2007)</displayName>
+			</currency>
+			<currency type="GHS">
+				<displayName>သေႇတီႇၵႃႇၼႃႇ</displayName>
+				<displayName count="other">သေႇတီႇၵႃႇၼႃႇ</displayName>
+			</currency>
+			<currency type="GIP">
+				<displayName>ပွၼ်း ၵျီႇပရေႃးတႃး</displayName>
+				<displayName count="other">ပွၼ်း ၵျီႇပရေႃးတႃး</displayName>
+			</currency>
+			<currency type="GMD">
+				<displayName>တႃႇလႃႇသီႇၵမ်ႇပီးယႃး</displayName>
+				<displayName count="other">တႃႇလႃႇသီႇၵမ်ႇပီးယႃး</displayName>
+			</currency>
+			<currency type="GNF">
+				<displayName>ၾရၼ်ႉၵီးၼီး</displayName>
+				<displayName count="other">ၾရၼ်ႉၵီးၼီး</displayName>
+			</currency>
+			<currency type="GNS">
+				<displayName>သီႇလီႇၵီးၼီး</displayName>
+				<displayName count="other">သီႇလီႇၵီးၼီး</displayName>
+			</currency>
+			<currency type="GQE">
+				<displayName>ဢႅၵ်ႉဝႄႇလႄႇဢီႇၵူၺ်ႇတေႃႇရီႇယႃႇၵီးၼီး</displayName>
+				<displayName count="other">ဢႅၵ်ႉဝႄႇလႄႇဢီႇၵူၺ်ႇတေႃႇရီႇယႃႇၵီးၼီး</displayName>
+			</currency>
+			<currency type="GRD">
+				<displayName>တရၢၵ်ႉမႃႇၵရိတ်ႈ</displayName>
+				<displayName count="other">တရၢၵ်ႉမႃႇၵရိတ်ႈ</displayName>
+			</currency>
+			<currency type="GTQ">
+				<displayName>ၶႅတ်ႉၸႄးလ်ၵႂႃႇတမႃႇလႃႇ</displayName>
+				<displayName count="other">ၶႅတ်ႉၸႄးလ်ၵႂႃႇတမႃႇလႃႇ</displayName>
+			</currency>
+			<currency type="GWE">
+				<displayName>ဢႅတ်ႉၵူႇတူဝ်ႇၵီးၼီးပေႃးတူႉၵၢဝ်ႇ</displayName>
+				<displayName count="other">ဢႅတ်ႉၵူႇတူဝ်ႇၵီးၼီးပေႃးတူႉၵၢဝ်ႇ</displayName>
+			</currency>
+			<currency type="GWP">
+				<displayName>ပေႇသူဝ်ႇၵီးၼီး-ပိတ်ႈသၢဝ်ႇ</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇၵီးၼီး-ပိတ်ႈသၢဝ်ႇ</displayName>
+			</currency>
+			<currency type="GYD">
+				<displayName>တေႃႇလႃႇၵၢႆႇယႃးၼႃႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇၵၢႆႇယႃးၼႃႇ</displayName>
+			</currency>
+			<currency type="HKD">
+				<displayName>တေႃႇလႃႇႁွင်းၵွင်း</displayName>
+				<displayName count="other">တေႃႇလႃႇႁွင်းၵွင်း</displayName>
+			</currency>
+			<currency type="HNL">
+				<displayName>လႅမ်းပီႇရႃႇႁွၼ်ႇတူးရႅတ်ႈ</displayName>
+				<displayName count="other">လႅမ်းပီႇရႃႇႁွၼ်ႇတူးရႅတ်ႈ</displayName>
+			</currency>
+			<currency type="HRD">
+				<displayName>တီႇၼႃႇၶရူဝ်ႇဢေးသျႃး</displayName>
+				<displayName count="other">တီႇၼႃႇၶရူဝ်ႇဢေးသျႃး</displayName>
+			</currency>
+			<currency type="HRK">
+				<displayName>ၵူႇၼႃႇၶရူဝ်ႇဢေးသျႃး</displayName>
+				<displayName count="other">ၵူႇၼႃႇၶရူဝ်ႇဢေးသျႃး</displayName>
+			</currency>
+			<currency type="HTG">
+				<displayName>ၵုတ်ႉထ်ႁေးတီႇ</displayName>
+				<displayName count="other">ၵုတ်ႉထ်ႁေးတီႇ</displayName>
+			</currency>
+			<currency type="HUF">
+				<displayName>ၾူဝ်ႇရိၼ်ႇႁၢင်ႇၵေႇရီႇ</displayName>
+				<displayName count="other">ၾူဝ်ႇရိၼ်ႇႁၢင်ႇၵေႇရီႇ</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName>ရူႇပီးယႃးဢိၼ်ႇတူဝ်ႇၼီးသျႃး</displayName>
+				<displayName count="other">ရူႇပီးယႃးဢိၼ်ႇတူဝ်ႇၼီးသျႃး</displayName>
+			</currency>
+			<currency type="IEP">
+				<displayName>ပွၼ်းဢၢႆႇယႃႇလႅၼ်ႇ</displayName>
+				<displayName count="other">ပွၼ်းဢၢႆႇယႃႇလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="ILP">
+				<displayName>ပွၼ်းဢိတ်ႇသရေး</displayName>
+				<displayName count="other">ပွၼ်းဢိတ်ႇသရေး</displayName>
+			</currency>
+			<currency type="ILR">
+				<displayName>သျႅၵ်ႈၵႄႇလ်ဢိတ်ႇသရေး (1980–1985)</displayName>
+				<displayName count="other">သျႅၵ်ႈၵႄႇလ်ဢိတ်ႇသရေး (1980–1985)</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName>သျႅၵ်ႈၵႄႇလ်မႂ်ႇဢိတ်ႇသရေး</displayName>
+				<displayName count="other">သျႅၵ်ႈၵႄႇလ်မႂ်ႇဢိတ်ႇသရေး</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName>ရူႇပီးဢိၼ်းတီးယႃး</displayName>
+				<displayName count="other">ရူႇပီးဢိၼ်းတီးယႃး</displayName>
+			</currency>
+			<currency type="IQD">
+				<displayName>တီႇၼႃႇဢီႇရၢၵ်ႈ</displayName>
+				<displayName count="other">တီႇၼႃႇဢီႇရၢၵ်ႈ</displayName>
+			</currency>
+			<currency type="IRR">
+				<displayName>ရီဢႄလ်ဢီႇရၢၼ်း</displayName>
+				<displayName count="other">ရီဢႄလ်ဢီႇရၢၼ်း</displayName>
+			</currency>
+			<currency type="ISJ">
+				<displayName>ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ (1918–1981)</displayName>
+				<displayName count="other">ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ (1918–1981)</displayName>
+			</currency>
+			<currency type="ISK">
+				<displayName>ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ</displayName>
+				<displayName count="other">ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="ITL">
+				<displayName>လီႇရႃႇဢီႇတႃႇလီႇ</displayName>
+				<displayName count="other">လီႇရႃႇဢီႇတႃႇလီႇ</displayName>
+			</currency>
+			<currency type="JMD">
+				<displayName>တေႃႇလႃႇၵျႃႇမေႇၵႃႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇၵျႃႇမေႇၵႃႇ</displayName>
+			</currency>
+			<currency type="JOD">
+				<displayName>တီႇၼႃႇၵျေႃႇတၼ်ႇ</displayName>
+				<displayName count="other">တီႇၼႃႇၵျေႃႇတၼ်ႇ</displayName>
+			</currency>
+			<currency type="JPY">
+				<displayName>ယႅၼ်းၵျႃႇပၢၼ်ႇ</displayName>
+				<displayName count="other">ယႅၼ်းၵျႃႇပၢၼ်ႇ</displayName>
+			</currency>
+			<currency type="KES">
+				<displayName>သျီႇလိင်ႇၶႅၼ်ႇၺႃႇ</displayName>
+				<displayName count="other">သျီႇလိင်ႇၶႅၼ်ႇၺႃႇ</displayName>
+			</currency>
+			<currency type="KGS">
+				<displayName>သွမ်ႇၵႃႇၵိတ်ႈသတၼ်ႇ</displayName>
+				<displayName count="other">သွမ်ႇၵႃႇၵိတ်ႈသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName>ရိဢႄလ်ၵမ်ႇပေႃးတီးယႃး</displayName>
+				<displayName count="other">ရိဢႄလ်ၵမ်ႇပေႃးတီးယႃး</displayName>
+			</currency>
+			<currency type="KMF">
+				<displayName>ၽရၼ်ႉၶူဝ်ႇမူဝ်ႇရူတ်ႈ</displayName>
+				<displayName count="other">ၽရၼ်ႉၶူဝ်ႇမူဝ်ႇရူတ်ႈ</displayName>
+			</currency>
+			<currency type="KPW">
+				<displayName>ဝွၼ်ႇၵၢဝ်းလီႁွင်ႇ</displayName>
+				<displayName count="other">ဝွၼ်ႇၵၢဝ်းလီႁွင်ႇ</displayName>
+			</currency>
+			<currency type="KRH">
+				<displayName>ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1953–1962)</displayName>
+				<displayName count="other">ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1953–1962)</displayName>
+			</currency>
+			<currency type="KRO">
+				<displayName>ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1945–1953)</displayName>
+				<displayName count="other">ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1945–1953)</displayName>
+			</currency>
+			<currency type="KRW">
+				<displayName>ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း</displayName>
+				<displayName count="other">ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း</displayName>
+			</currency>
+			<currency type="KWD">
+				<displayName>တီႇၼႃႇၶူႇဝဵတ်ႈ</displayName>
+				<displayName count="other">တီႇၼႃႇၶူႇဝဵတ်ႈ</displayName>
+			</currency>
+			<currency type="KYD">
+				<displayName>တေႃႇလႃႇမူႇၵုၼ်ၶေးမႅၼ်း</displayName>
+				<displayName count="other">တေႃႇလႃႇမူႇၵုၼ်ၶေးမႅၼ်း</displayName>
+			</currency>
+			<currency type="KZT">
+				<displayName>ထႅင်ၵႄႇၵႃႇၸၢၵ်ႈသတၼ်ႇ</displayName>
+				<displayName count="other">ထႅင်ၵႄႇၵႃႇၸၢၵ်ႈသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName>ၵိပ်ႇလၢဝ်း</displayName>
+				<displayName count="other">ၵိပ်ႇလၢဝ်း</displayName>
+			</currency>
+			<currency type="LBP">
+				<displayName>ပွၼ်းလႄႇပႃႇၼွၼ်ႇ</displayName>
+				<displayName count="other">ပွၼ်းလႄႇပႃႇၼွၼ်ႇ</displayName>
+			</currency>
+			<currency type="LKR">
+				<displayName>ရူႇပီးသီႇရိလင်းၵႃ</displayName>
+				<displayName count="other">ရူႇပီးသီႇရိလင်းၵႃ</displayName>
+			</currency>
+			<currency type="LRD">
+				<displayName>တေႃႇလႃႇလၢႆႇပေးရီးယႃး</displayName>
+				<displayName count="other">တေႃႇလႃႇလၢႆႇပေးရီးယႃး</displayName>
+			</currency>
+			<currency type="LSL">
+				<displayName>လူဝ်ႇတီႇလႄႇသူဝ်းတူဝ်ႇ</displayName>
+				<displayName count="other">လူဝ်ႇတီႇလႄႇသူဝ်းတူဝ်ႇ</displayName>
+			</currency>
+			<currency type="LTL">
+				<displayName>လိတတ်ႉသ်လီႉတူႇဝေးၼီးယႃး</displayName>
+				<displayName count="other">လိတတ်ႉသ်လီႉတူႇဝေးၼီးယႃး</displayName>
+			</currency>
+			<currency type="LTT">
+				<displayName>တႄႇလူဝ်ႇၼတ်ႉလီႉတူႇဝေးၼီးယႃး</displayName>
+				<displayName count="other">တႄႇလူဝ်ႇၼတ်ႉလီႉတူႇဝေးၼီးယႃး</displayName>
+			</currency>
+			<currency type="LUC">
+				<displayName>ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ ဢၼ်လႅၵ်ႈလႆႈ</displayName>
+				<displayName count="other">ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ ဢၼ်လႅၵ်ႈလႆႈ</displayName>
+			</currency>
+			<currency type="LUF">
+				<displayName>ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</displayName>
+				<displayName count="other">ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</displayName>
+			</currency>
+			<currency type="LUL">
+				<displayName>ၾရၼ်ႉၵၢၼ်ငိုၼ်းတွင်း လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</displayName>
+				<displayName count="other">ၾရၼ်ႉၵၢၼ်ငိုၼ်းတွင်း လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ</displayName>
+			</currency>
+			<currency type="LVL">
+				<displayName>လတ်ႉသ်လၢတ်ႈဝီႇယႃႇ</displayName>
+				<displayName count="other">လတ်ႉသ်လၢတ်ႈဝီႇယႃႇ</displayName>
+			</currency>
+			<currency type="LVR">
+				<displayName>ရူႇပႄႇလၢတ်ႉဝီႇယႃႇ</displayName>
+				<displayName count="other">ရူႇပႄႇလၢတ်ႉဝီႇယႃႇ</displayName>
+			</currency>
+			<currency type="LYD">
+				<displayName>တီႇၼႃႇလိပ်ႉပျႃး</displayName>
+				<displayName count="other">တီႇၼႃႇလိပ်ႉပျႃး</displayName>
+			</currency>
+			<currency type="MAD">
+				<displayName>တီႇရမ်ႇမေႃႇရူဝ်ႇၵူဝ်ႇ</displayName>
+				<displayName count="other">တီႇရမ်ႇမေႃႇရူဝ်ႇၵူဝ်ႇ</displayName>
+			</currency>
+			<currency type="MAF">
+				<displayName>ၾရၼ်ႉမေႃႇရူဝ်ႇၵူဝ်ႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉမေႃႇရူဝ်ႇၵူဝ်ႇ</displayName>
+			</currency>
+			<currency type="MCF">
+				<displayName>ၾရၼ်ႉမူဝ်ႇၼႃႉၶူဝ်ႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉမူဝ်ႇၼႃႉၶူဝ်ႇ</displayName>
+			</currency>
+			<currency type="MDC">
+				<displayName>ၶူႇပွၼ်ႇမေႃႇတူဝ်းဝႃး</displayName>
+				<displayName count="other">ၶူႇပွၼ်ႇမေႃႇတူဝ်းဝႃး</displayName>
+			</currency>
+			<currency type="MDL">
+				<displayName>လဵဝ်းမေႃႇတူဝ်းဝႃး</displayName>
+				<displayName count="other">လဵဝ်းမေႃႇတူဝ်းဝႃး</displayName>
+			</currency>
+			<currency type="MGA">
+				<displayName>ဢႃႇရီႇယႃႇရီႇမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ</displayName>
+				<displayName count="other">ဢႃႇရီႇယႃႇရီႇမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ</displayName>
+			</currency>
+			<currency type="MGF">
+				<displayName>ၾရၼ်ႉမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ</displayName>
+			</currency>
+			<currency type="MKD">
+				<displayName>တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ</displayName>
+				<displayName count="other">တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ</displayName>
+			</currency>
+			<currency type="MKN">
+				<displayName>တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ (1992–1993)</displayName>
+				<displayName count="other">တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ (1992–1993)</displayName>
+			</currency>
+			<currency type="MLF">
+				<displayName>ၾရၼ်ႉမႃႇလီႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉမႃႇလီႇ</displayName>
+			</currency>
+			<currency type="MMK">
+				<displayName>ၵျၢပ်ႈမျၢၼ်ႇမႃႇ</displayName>
+				<displayName count="other">ၵျၢပ်ႈမျၢၼ်ႇမႃႇ</displayName>
+			</currency>
+			<currency type="MNT">
+				<displayName>တူႉၵရိၵ်ႉမူင်ႇၵူဝ်းလီးယႃး</displayName>
+				<displayName count="other">တူႉၵရိၵ်ႉမူင်ႇၵူဝ်းလီးယႃး</displayName>
+			</currency>
+			<currency type="MOP">
+				<displayName>ပႃႇတႃႇၵႃႇမႃႇၵၢဝ်ႈ</displayName>
+				<displayName count="other">ပႃႇတႃႇၵႃႇမႃႇၵၢဝ်ႈ</displayName>
+			</currency>
+			<currency type="MRO">
+				<displayName>ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး (1973–2017)</displayName>
+				<displayName count="other">ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး (1973–2017)</displayName>
+			</currency>
+			<currency type="MRU">
+				<displayName>ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး</displayName>
+				<displayName count="other">ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး</displayName>
+			</currency>
+			<currency type="MTL">
+				<displayName>လီႇရႃႇမေႃးတႃႇ</displayName>
+				<displayName count="other">လီႇရႃႇမေႃးတႃႇ</displayName>
+			</currency>
+			<currency type="MTP">
+				<displayName>ပွၼ်းမေႃးတႃႇ</displayName>
+				<displayName count="other">ပွၼ်းမေႃးတႃႇ</displayName>
+			</currency>
+			<currency type="MUR">
+				<displayName>ရူႇပီးမေႃးရီႇသႃႇ</displayName>
+				<displayName count="other">ရူႇပီးမေႃးရီႇသႃႇ</displayName>
+			</currency>
+			<currency type="MVP">
+				<displayName>ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ (1947–1981)</displayName>
+				<displayName count="other">ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ (1947–1981)</displayName>
+			</currency>
+			<currency type="MVR">
+				<displayName>ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ</displayName>
+				<displayName count="other">ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ</displayName>
+			</currency>
+			<currency type="MWK">
+				<displayName>ၶႂႃႇၶျႃႇမႃႇလႃႇဝီႇ</displayName>
+				<displayName count="other">ၶႂႃႇၶျႃႇမႃႇလႃႇဝီႇ</displayName>
+			</currency>
+			<currency type="MXN">
+				<displayName>ပေႇသူဝ်ႇမႅၵ်ႇသီႇၵူဝ်ႇ</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇမႅၵ်ႇသီႇၵူဝ်ႇ</displayName>
+			</currency>
+			<currency type="MXP">
+				<displayName>ပေႇသူဝ်ႇငိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ (1861–1992)</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇငိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ (1861–1992)</displayName>
+			</currency>
+			<currency type="MXV">
+				<displayName>ယူႇၼိတ်ႉလူင်းတိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉလူင်းတိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ</displayName>
+			</currency>
+			<currency type="MYR">
+				<displayName>ရိင်းၵိတ်ႉမလေးသျႃး</displayName>
+				<displayName count="other">ရိင်းၵိတ်ႉမလေးသျႃး</displayName>
+			</currency>
+			<currency type="MZE">
+				<displayName>ဢႅတ်ႉသၵူတူဝ်ႇမူဝ်ႇၸမ်းပိၵ်ႈ</displayName>
+				<displayName count="other">ဢႅတ်ႉသၵူတူဝ်ႇမူဝ်ႇၸမ်းပိၵ်ႈ</displayName>
+			</currency>
+			<currency type="MZM">
+				<displayName>မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ (1980–2006)</displayName>
+				<displayName count="other">မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ (1980–2006)</displayName>
+			</currency>
+			<currency type="MZN">
+				<displayName>မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ</displayName>
+				<displayName count="other">မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ</displayName>
+			</currency>
+			<currency type="NAD">
+				<displayName>တေႃႇလႃႇၼႃႇမီးပီးယႃး</displayName>
+				<displayName count="other">တေႃႇလႃႇၼႃႇမီးပီးယႃး</displayName>
+			</currency>
+			<currency type="NGN">
+				<displayName>ၼေးရႃႇၼၢႆႇၵျီးရီးယႃး</displayName>
+				<displayName count="other">ၼေးရႃႇၼၢႆႇၵျီးရီးယႃး</displayName>
+			</currency>
+			<currency type="NIC">
+				<displayName>ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ (1988–1991)</displayName>
+				<displayName count="other">ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ (1988–1991)</displayName>
+			</currency>
+			<currency type="NIO">
+				<displayName>ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ</displayName>
+				<displayName count="other">ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ</displayName>
+			</currency>
+			<currency type="NLG">
+				<displayName>ၵိလ်တႃႇတၢတ်ႉၶျ်</displayName>
+				<displayName count="other">ၵိလ်တႃႇတၢတ်ႉၶျ်</displayName>
+			</currency>
+			<currency type="NOK">
+				<displayName>ၶရူၼ်းၼေႃႇဝူၺ်း</displayName>
+				<displayName count="other">ၶရူၼ်းၼေႃႇဝူၺ်း</displayName>
+			</currency>
+			<currency type="NPR">
+				<displayName>ရူႇပီးၼေႇပေႃး</displayName>
+				<displayName count="other">ရူႇပီးၼေႇပေႃး</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName>တေႃႇလႃႇၼိဝ်းၸီႇလႅၼ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇၼိဝ်းၸီႇလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="OMR">
+				<displayName>ရီဢႄလ်ဢူဝ်ႇမၢၼ်ႇ</displayName>
+				<displayName count="other">ရီဢႄလ်ဢူဝ်ႇမၢၼ်ႇ</displayName>
+			</currency>
+			<currency type="PAB">
+				<displayName>ပႄးလ်ပူဝ်ႇဢႃႇပႃႈၼႃးမႃး</displayName>
+				<displayName count="other">ပႄးလ်ပူဝ်ႇဢႃႇပႃႈၼႃးမႃး</displayName>
+			</currency>
+			<currency type="PEI">
+				<displayName>ဢိၼ်ႇတီႇပေႇရူႉ</displayName>
+				<displayName count="other">ဢိၼ်ႇတီႇပေႇရူႉ</displayName>
+			</currency>
+			<currency type="PEN">
+				<displayName>သူဝ်းလ်ပေႇရူႉ</displayName>
+				<displayName count="other">သူဝ်းလ်ပေႇရူႉ</displayName>
+			</currency>
+			<currency type="PES">
+				<displayName>သူဝ်းလ်ပေႇရူႉ (1863–1965)</displayName>
+				<displayName count="other">သူဝ်းလ်ပေႇရူႉ (1863–1965)</displayName>
+			</currency>
+			<currency type="PGK">
+				<displayName>ၶိၼႃႇပႃးပႂႃႇၼိဝ်းၵီးၼီး</displayName>
+				<displayName count="other">ၶိၼႃႇပႃးပႂႃႇၼိဝ်းၵီးၼီး</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName>ပေႇသူဝ်ႇၾီလိပ်ႈပိၼ်း</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇၾီလိပ်ႈပိၼ်း</displayName>
+			</currency>
+			<currency type="PKR">
+				<displayName>ရူႇပီးပႃႇၵိတ်ႈသတၼ်ႇ</displayName>
+				<displayName count="other">ရူႇပီးပႃႇၵိတ်ႈသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="PLN">
+				<displayName>ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ</displayName>
+				<displayName count="other">ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="PLZ">
+				<displayName>ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ (1950–1995)</displayName>
+				<displayName count="other">ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ (1950–1995)</displayName>
+			</currency>
+			<currency type="PTE">
+				<displayName>ဢိသ်ၵူႇတူဝ်ႇ တိူဝ်ႇၵီႇ</displayName>
+				<displayName count="other">ဢိသ်ၵူႇတူဝ်ႇ တိူဝ်ႇၵီႇ</displayName>
+			</currency>
+			<currency type="PYG">
+				<displayName>ၵႂႃႇရႃႇၼီပႃႇရႃႇၵူၺ်း</displayName>
+				<displayName count="other">ၵႂႃႇရႃႇၼီပႃႇရႃႇၵူၺ်း</displayName>
+			</currency>
+			<currency type="QAR">
+				<displayName>ရီယႄႇလ်ၶႃႇတႃႇ</displayName>
+				<displayName count="other">ရီယႄႇလ်ၶႃႇတႃႇ</displayName>
+			</currency>
+			<currency type="RHD">
+				<displayName>တေႃႇလႃႇရူဝ်ႇတႄႇသီႇယႅၼ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇရူဝ်ႇတႄႇသီႇယႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="ROL">
+				<displayName>လဵဝ်းရူဝ်ႇမေးၼီးယႃး (1952–2006)</displayName>
+				<displayName count="other">လဵဝ်းရူဝ်ႇမေးၼီးယႃး (1952–2006)</displayName>
+			</currency>
+			<currency type="RON">
+				<displayName>လဵဝ်းရူဝ်ႇမေးၼီးယႃး</displayName>
+				<displayName count="other">လဵဝ်းရူဝ်ႇမေးၼီးယႃး</displayName>
+			</currency>
+			<currency type="RSD">
+				<displayName>တီႇၼႃႇ သႃးပီးယႃး</displayName>
+				<displayName count="other">တီႇၼႃႇ သႃးပီးယႃး</displayName>
+			</currency>
+			<currency type="RUB">
+				<displayName>ရူႇပႄႇရတ်ႈသျႃး</displayName>
+				<displayName count="other">ရူႇပႄႇရတ်ႈသျႃး</displayName>
+			</currency>
+			<currency type="RUR">
+				<displayName>ရူႇပႄႇရတ်ႈသျႃး (1991–1998)</displayName>
+				<displayName count="other">ရူႇပႄႇရတ်ႈသျႃး (1991–1998)</displayName>
+			</currency>
+			<currency type="RWF">
+				<displayName>ၾရၼ်ႉရဝၢၼ်းတႃႇ</displayName>
+				<displayName count="other">ၾရၼ်ႉရဝၢၼ်းတႃႇ</displayName>
+			</currency>
+			<currency type="SAR">
+				<displayName>ရီယႄႇလ်သေႃႇတီႇ</displayName>
+				<displayName count="other">ရီယႄႇလ်သေႃႇတီႇ</displayName>
+			</currency>
+			<currency type="SBD">
+				<displayName>တေႃႇလႃႇမူႇၵုၼ်သေႃႇလေႃႇမၼ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇမူႇၵုၼ်သေႃႇလေႃႇမၼ်ႇ</displayName>
+			</currency>
+			<currency type="SCR">
+				<displayName>ရူႇပီးသေးသျႄႇ</displayName>
+				<displayName count="other">ရူႇပီးသေးသျႄႇ</displayName>
+			</currency>
+			<currency type="SDD">
+				<displayName>တီႇၼႃႇသူႇတၼ်ႇ (1992–2007)</displayName>
+				<displayName count="other">တီႇၼႃႇသူႇတၼ်ႇ (1992–2007)</displayName>
+			</currency>
+			<currency type="SDG">
+				<displayName>ပွၼ်းသူႇတၼ်ႇ</displayName>
+				<displayName count="other">ပွၼ်းသူႇတၼ်ႇ</displayName>
+			</currency>
+			<currency type="SDP">
+				<displayName>ပွၼ်းသူႇတၼ်ႇ (1957–1998)</displayName>
+				<displayName count="other">ပွၼ်းသူႇတၼ်ႇ (1957–1998)</displayName>
+			</currency>
+			<currency type="SEK">
+				<displayName>ၶရူဝ်ႇၼႃႇသုၺ်ႇတိၼ်ႇ</displayName>
+				<displayName count="other">ၶရူဝ်ႇၼႃႇသုၺ်ႇတိၼ်ႇ</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName>တေႃႇလႃႇသိင်ႇၵႃႇပူဝ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇသိင်ႇၵႃႇပူဝ်ႇ</displayName>
+			</currency>
+			<currency type="SHP">
+				<displayName>ပွၼ်းသဵင်ႉႁႄးလႄးၼႃႇ</displayName>
+				<displayName count="other">ပွၼ်းသဵင်ႉႁႄးလႄးၼႃႇ</displayName>
+			</currency>
+			<currency type="SIT">
+				<displayName>တူဝ်ႇလႃႇ သလူဝ်ႇဝေးၼီးယႃး</displayName>
+				<displayName count="other">တူဝ်ႇလႃႇ သလူဝ်ႇဝေးၼီးယႃး</displayName>
+			</currency>
+			<currency type="SKK">
+				<displayName>ၶူဝ်ႇရူႇၼႃႇသလူဝ်ႇဝႃးၵီးယႃး</displayName>
+				<displayName count="other">ၶူဝ်ႇရူႇၼႃႇသလူဝ်ႇဝႃးၵီးယႃး</displayName>
+			</currency>
+			<currency type="SLE">
+				<displayName>လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ</displayName>
+				<displayName count="other">လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ</displayName>
+			</currency>
+			<currency type="SLL">
+				<displayName>လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ (1964–2022)</displayName>
+				<displayName count="other">လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ (1964–2022)</displayName>
+			</currency>
+			<currency type="SOS">
+				<displayName>သျီႇလိင်ႇသူဝ်ႇမႃးလီးယႃး</displayName>
+				<displayName count="other">သျီႇလိင်ႇသူဝ်ႇမႃးလီးယႃး</displayName>
+			</currency>
+			<currency type="SRD">
+				<displayName>တေႃႇလႃသျူးရီးၼႃႇမႄႇ</displayName>
+				<displayName count="other">တေႃႇလႃသျူးရီးၼႃႇမႄႇ</displayName>
+			</currency>
+			<currency type="SRG">
+				<displayName>ၵိလ်တႃႇသျူးရီးၼႃႇမႄႇ</displayName>
+				<displayName count="other">ၵိလ်တႃႇသျူးရီးၼႃႇမႄႇ</displayName>
+			</currency>
+			<currency type="SSP">
+				<displayName>ပွၼ်းသူႇတၼ်ႇၸၢၼ်း</displayName>
+				<displayName count="other">ပွၼ်းသူႇတၼ်ႇၸၢၼ်း</displayName>
+			</currency>
+			<currency type="STD">
+				<displayName>တူဝ်ပရႃႇ သူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ (1997–2017)</displayName>
+				<displayName count="other">တူဝ်ပရႃႇ သူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ (1997–2017)</displayName>
+			</currency>
+			<currency type="STN">
+				<displayName>တူဝ်ႇပရႃႇသူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ</displayName>
+				<displayName count="other">တူဝ်ႇပရႃႇသူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ</displayName>
+			</currency>
+			<currency type="SUR">
+				<displayName>ရူႇပႄႇသူဝ်ႇဝီႇယႅတ်ႉ</displayName>
+				<displayName count="other">ရူႇပႄႇသူဝ်ႇဝီႇယႅတ်ႉ</displayName>
+			</currency>
+			<currency type="SVC">
+				<displayName>ၵူဝ်ႇလူၼ်ႇဢႄႇသႃႇဝႃႇတေႃႇ</displayName>
+				<displayName count="other">ၵူဝ်ႇလူၼ်ႇဢႄႇသႃႇဝႃႇတေႃႇ</displayName>
+			</currency>
+			<currency type="SYP">
+				<displayName>ပွၼ်းသီးရီးယႃး</displayName>
+				<displayName count="other">ပွၼ်းသီးရီးယႃး</displayName>
+			</currency>
+			<currency type="SZL">
+				<displayName>လီႇလႅၼ်ႇၵျႅၼ်ႇၼီႇဢႅတ်ႇသ်ဝႃႇတီးၼီႇ</displayName>
+				<displayName count="other">လီႇလႅၼ်ႇၵျႅၼ်ႇၼီႇဢႅတ်ႇသ်ဝႃႇတီးၼီႇ</displayName>
+			</currency>
+			<currency type="THB">
+				<displayName>ဝၢတ်ႇထႆး</displayName>
+				<displayName count="other">ဝၢတ်ႇထႆး</displayName>
+			</currency>
+			<currency type="TJR">
+				<displayName>ရူႇပႄႇတႃႇၵျီႇၵီႇသတၼ်ႇ</displayName>
+				<displayName count="other">ရူႇပႄႇတႃႇၵျီႇၵီႇသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="TJS">
+				<displayName>သူဝ်ႇမူဝ်ႇၼီႇတႃႇၵျီႇၵီႇသတၼ်ႇ</displayName>
+				<displayName count="other">သူဝ်ႇမူဝ်ႇၼီႇတႃႇၵျီႇၵီႇသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="TMM">
+				<displayName>မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ (1993–2009)</displayName>
+				<displayName count="other">မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ (1993–2009)</displayName>
+			</currency>
+			<currency type="TMT">
+				<displayName>မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ</displayName>
+				<displayName count="other">မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="TND">
+				<displayName>တီႇၼႃႇတူႇၼီးသျႃး</displayName>
+				<displayName count="other">တီႇၼႃႇတူႇၼီးသျႃး</displayName>
+			</currency>
+			<currency type="TOP">
+				<displayName>ပႃဢင်ၵႃႉထွင်းၵႃႇ</displayName>
+				<displayName count="other">ပႃဢင်ၵႃႉထွင်းၵႃႇ</displayName>
+			</currency>
+			<currency type="TPE">
+				<displayName>ဢႅတ်ႉၵူႇတူဝ်ႇတီႇမေႃး</displayName>
+				<displayName count="other">ဢႅတ်ႉၵူႇတူဝ်ႇတီႇမေႃး</displayName>
+			</currency>
+			<currency type="TRL">
+				<displayName>လီႇရႃႇတိူဝ်ႇၵီႇ (1922–2005)</displayName>
+				<displayName count="other">လီႇရႃႇတိူဝ်ႇၵီႇ (1922–2005)</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName>လီႇရႃႇတိူဝ်ႇၵီႇ</displayName>
+				<displayName count="other">လီႇရႃႇတိူဝ်ႇၵီႇ</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName>တေႃႇလႃႇထရီႇၼီႇတၢတ်ႈ လႄႈ ထူဝ်ႇပေးၵူဝ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇထရီႇၼီႇတၢတ်ႈ လႄႈ ထူဝ်ႇပေးၵူဝ်ႇ</displayName>
+			</currency>
+			<currency type="TWD">
+				<displayName>တေႃႇလႃႇထၢႆႇဝၢၼ်းမႂ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇထၢႆႇဝၢၼ်းမႂ်ႇ</displayName>
+			</currency>
+			<currency type="TZS">
+				<displayName>သျီႇလိင်ႇထၼ်ႇၸၼ်းၼီးယႃး</displayName>
+				<displayName count="other">သျီႇလိင်ႇထၼ်ႇၸၼ်းၼီးယႃး</displayName>
+			</currency>
+			<currency type="UAH">
+				<displayName>ႁရီႇဝၼီႇယႃႇယူႇၶရဵၼ်း</displayName>
+				<displayName count="other">ႁရီႇဝၼီႇယႃႇယူႇၶရဵၼ်း</displayName>
+			</currency>
+			<currency type="UAK">
+				<displayName>ၶႃႇပူဝ်ႇဝႅၼ်ႇၼႅတ်ႉယူႇၶရဵၼ်း</displayName>
+				<displayName count="other">ၶႃႇပူဝ်ႇဝႅၼ်ႇၼႅတ်ႉယူႇၶရဵၼ်း</displayName>
+			</currency>
+			<currency type="UGS">
+				<displayName>သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ (2966–1987)</displayName>
+				<displayName count="other">သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ (2966–1987)</displayName>
+			</currency>
+			<currency type="UGX">
+				<displayName>သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ</displayName>
+				<displayName count="other">သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ</displayName>
+			</currency>
+			<currency type="USD">
+				<displayName>တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ</displayName>
+			</currency>
+			<currency type="USN">
+				<displayName>တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ထႅင်ႈဝၼ်းၼိုင်ႈ)</displayName>
+				<displayName count="other">တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ထႅင်ႈဝၼ်းၼိုင်ႈ)</displayName>
+			</currency>
+			<currency type="USS">
+				<displayName>တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ဝၼ်းလဵဝ်ၵၼ်)</displayName>
+				<displayName count="other">တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ဝၼ်းလဵဝ်ၵၼ်)</displayName>
+			</currency>
+			<currency type="UYI">
+				<displayName>ပေႇသူဝ်ဢုရုၵူၺ်း(ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ)</displayName>
+				<displayName count="other">ပေႇသူဝ်ဢုရုၵူၺ်း(ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ)</displayName>
+			</currency>
+			<currency type="UYP">
+				<displayName>ပေႇသူဝ်ႇဢုရုၵူၺ်း (1975–1993)</displayName>
+				<displayName count="other">ပေႇသူဝ်ႇဢုရုၵူၺ်း (1975–1993)</displayName>
+			</currency>
+			<currency type="UYU">
+				<displayName>ပေႇသူဝ်ဢုရုၵူၺ်း</displayName>
+				<displayName count="other">ပေႇသူဝ်ဢုရုၵူၺ်း</displayName>
+			</currency>
+			<currency type="UYW">
+				<displayName>ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ ငိုၼ်းလိူၼ်ဢုရုၵူၺ်း</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ ငိုၼ်းလိူၼ်ဢုရုၵူၺ်း</displayName>
+			</currency>
+			<currency type="UZS">
+				<displayName>သွမ်ႇဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ</displayName>
+				<displayName count="other">သွမ်ႇဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ</displayName>
+			</currency>
+			<currency type="VEB">
+				<displayName>ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး (1871–2008)</displayName>
+				<displayName count="other">ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး (1871–2008)</displayName>
+			</currency>
+			<currency type="VED">
+				<displayName>ပူဝ်ႇလီႇဝႃႇသူဝ်ႇပႃႇရႃႇၼူဝ်ႇ</displayName>
+				<displayName count="other">ပူဝ်ႇလီႇဝႃႇသူဝ်ႇပႃႇရႃႇၼူဝ်ႇ</displayName>
+			</currency>
+			<currency type="VEF">
+				<displayName>Venezuelan Bolívar (2008–2018)</displayName>
+				<displayName count="other">Venezuelan Bolívar (2008–2018)</displayName>
+			</currency>
+			<currency type="VES">
+				<displayName>ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး</displayName>
+				<displayName count="other">ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName>တွင်ႇဝႅတ်ႉၼမ်း</displayName>
+				<displayName count="other">တွင်ႇဝႅတ်ႉၼမ်း</displayName>
+			</currency>
+			<currency type="VNN">
+				<displayName>တွင်ႇဝႅတ်ႉၼမ်း (1978–1985)</displayName>
+				<displayName count="other">တွင်ႇဝႅတ်ႉၼမ်း (1978–1985)</displayName>
+			</currency>
+			<currency type="VUV">
+				<displayName>ဝႃႇထူႇဝႅၼ်ႇၼူးဝႃႇထူႇ</displayName>
+				<displayName count="other">ဝႃႇထူႇဝႅၼ်ႇၼူးဝႃႇထူႇ</displayName>
+			</currency>
+			<currency type="WST">
+				<displayName>တႃလႃႉသႃႇမူဝ်းဝႃႇ</displayName>
+				<displayName count="other">တႃလႃႉသႃႇမူဝ်းဝႃႇ</displayName>
+			</currency>
+			<currency type="XAF">
+				<displayName>ၾရၼ်ႉၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းၵၢင်</displayName>
+				<displayName count="other">ၾရၼ်ႉၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းၵၢင်</displayName>
+			</currency>
+			<currency type="XAG">
+				<displayName>ငိုၼ်း</displayName>
+				<displayName count="other">ငိုၼ်း</displayName>
+			</currency>
+			<currency type="XAU">
+				<displayName>ၶမ်း</displayName>
+				<displayName count="other">ၶမ်း</displayName>
+			</currency>
+			<currency type="XBA">
+				<displayName>ယူႇၼိတ်ႉၶွမ်းပူဝ်းသိတ်ႉယူးရူပ်ႉ</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉၶွမ်းပူဝ်းသိတ်ႉယူးရူပ်ႉ</displayName>
+			</currency>
+			<currency type="XBB">
+				<displayName>ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ</displayName>
+			</currency>
+			<currency type="XBC">
+				<displayName>ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBC)</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBC)</displayName>
+			</currency>
+			<currency type="XBD">
+				<displayName>ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBD)</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBD)</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName>တေႃႇလႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇပွတ်းဢွၵ်ႇ</displayName>
+				<displayName count="other">တေႃႇလႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇပွတ်းဢွၵ်ႇ</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>ၵဵဝ်းတႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇ</displayName>
+				<displayName count="other">ၵဵဝ်းတႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇ</displayName>
+			</currency>
+			<currency type="XDR">
+				<displayName>သုၼ်ႇထွၼ်ငိုၼ်းၶိုၵ်ႉတွၼ်း</displayName>
+				<displayName count="other">သုၼ်ႇထွၼ်ငိုၼ်းၶိုၵ်ႉတွၼ်း</displayName>
+			</currency>
+			<currency type="XEU">
+				<displayName>ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ</displayName>
+			</currency>
+			<currency type="XFO">
+				<displayName>ၾရၼ်ႉၶမ်းၾရၢင်ႇသဵတ်ႈ</displayName>
+				<displayName count="other">ၾရၼ်ႉၶမ်းၾရၢင်ႇသဵတ်ႈ</displayName>
+			</currency>
+			<currency type="XFU">
+				<displayName>ၾရၼ်ႉ-UIC ၾရၢင်ႇသဵတ်ႈ</displayName>
+				<displayName count="other">ၾရၼ်ႉ-UIC ၾရၢင်ႇသဵတ်ႈ</displayName>
+			</currency>
+			<currency type="XOF">
+				<displayName>ၾရၼ်ႉ ၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းတူၵ်း</displayName>
+				<displayName count="other">ၾရၼ်ႉ ၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းတူၵ်း</displayName>
+			</currency>
+			<currency type="XPD">
+				<displayName>ပႄႇလတ်ႇတီႇယမ်ႇ</displayName>
+				<displayName count="other">ပႄႇလတ်ႇတီႇယမ်ႇ</displayName>
+			</currency>
+			<currency type="XPF">
+				<displayName>ၾရၼ်ႉၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး</displayName>
+				<displayName count="other">ၾရၼ်ႉၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး</displayName>
+			</currency>
+			<currency type="XPT">
+				<displayName>ပလတ်ႇတီႇၼမ်ႇ</displayName>
+				<displayName count="other">ပလတ်ႇတီႇၼမ်ႇ</displayName>
+			</currency>
+			<currency type="XRE">
+				<displayName>ငိုၼ်းၵွင်ၵၢင် RINET</displayName>
+				<displayName count="other">ငိုၼ်းၵွင်ၵၢင် RINET</displayName>
+			</currency>
+			<currency type="XSU">
+				<displayName>သုၶရေႇ</displayName>
+				<displayName count="other">သုၶရေႇ</displayName>
+			</currency>
+			<currency type="XTS">
+				<displayName>မၢႆငိုၼ်းတွင်းဢၼ်တိုၵ်ႉၸၢမ်းယူႇ</displayName>
+				<displayName count="other">မၢႆငိုၼ်းတွင်းဢၼ်တိုၵ်ႉၸၢမ်းယူႇ</displayName>
+			</currency>
+			<currency type="XUA">
+				<displayName>ယူႇၼိတ်ႉဢၶွင်ႉ ADB</displayName>
+				<displayName count="other">ယူႇၼိတ်ႉဢၶွင်ႉ ADB</displayName>
+			</currency>
+			<currency type="XXX">
+				<displayName>ငိုၼ်းဢၼ်ဢမ်ႇႁူႉၸိုဝ်ႈ</displayName>
+				<displayName count="other">ငိုၼ်းဢၼ်ဢမ်ႇႁူႉၸိုဝ်ႈ</displayName>
+			</currency>
+			<currency type="YDD">
+				<displayName>တီႇၼႃႇယႄႇမႅၼ်ႇ</displayName>
+				<displayName count="other">တီႇၼႃႇယႄႇမႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="YER">
+				<displayName>ရီဢႄလ်ယႄႇမႅၼ်ႇ</displayName>
+				<displayName count="other">ရီဢႄလ်ယႄႇမႅၼ်ႇ</displayName>
+			</currency>
+			<currency type="YUD">
+				<displayName>တီႇၼႃႇၶႅင် ယူႇၵူဝ်ႇသလႃးဝီးယႃး(1966–1990)</displayName>
+				<displayName count="other">တီႇၼႃႇၶႅင် ယူႇၵူဝ်ႇသလႃးဝီးယႃး(1966–1990)</displayName>
+			</currency>
+			<currency type="YUM">
+				<displayName>တီႇၼႃႇမႂ်ႇ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1994–2002)</displayName>
+				<displayName count="other">တီႇၼႃႇမႂ်ႇ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1994–2002)</displayName>
+			</currency>
+			<currency type="YUN">
+				<displayName>တီႇၼႃႇဢၼ်လႅၵ်ႈလႆႈ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1990–1992)</displayName>
+				<displayName count="other">တီႇၼႃႇဢၼ်လႅၵ်ႈလႆႈ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1990–1992)</displayName>
+			</currency>
+			<currency type="YUR">
+				<displayName>တီႇၼႃႇဢၼ်ၶိုၼ်းမႄးဝႆႉ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1992–1993)</displayName>
+				<displayName count="other">တီႇၼႃႇဢၼ်ၶိုၼ်းမႄးဝႆႉ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1992–1993)</displayName>
+			</currency>
+			<currency type="ZAL">
+				<displayName>ရၼ်းဢႃႇၾရိၵၸၢၼ်း (ၵၢၼ်ငိုၼ်းတွင်း)</displayName>
+				<displayName count="other">ရၼ်းဢႃႇၾရိၵၸၢၼ်း (ၵၢၼ်ငိုၼ်းတွင်း)</displayName>
+			</currency>
+			<currency type="ZAR">
+				<displayName>ရၼ်းဢႃႇၾရိၵၸၢၼ်း</displayName>
+				<displayName count="other">ရၼ်းဢႃႇၾရိၵၸၢၼ်း</displayName>
+			</currency>
+			<currency type="ZMK">
+				<displayName>ၶႂႃႇၶျႃႇၸမ်းပီးယႃး (1968–2012)</displayName>
+				<displayName count="other">ၶႂႃႇၶျႃႇၸမ်းပီးယႃး (1968–2012)</displayName>
+			</currency>
+			<currency type="ZMW">
+				<displayName>ၶႂႃႇၶျႃႇၸမ်းပီးယႃး</displayName>
+				<displayName count="other">ၶႂႃႇၶျႃႇၸမ်းပီးယႃး</displayName>
+			</currency>
+			<currency type="ZRN">
+				<displayName>ၸၢႆႇရႄႇမႂ်ႇၸၢႆႇရႄႇယႅၼ်ႇ (1993–1998)</displayName>
+				<displayName count="other">ၸၢႆႇရႄႇမႂ်ႇၸၢႆႇရႄႇယႅၼ်ႇ (1993–1998)</displayName>
+			</currency>
+			<currency type="ZRZ">
+				<displayName>ၸၢႆႇရႄႇၸၢႆႇရႄႇယႅၼ်ႇ (1971–1993)</displayName>
+				<displayName count="other">ၸၢႆႇရႄႇၸၢႆႇရႄႇယႅၼ်ႇ (1971–1993)</displayName>
+			</currency>
+			<currency type="ZWD">
+				<displayName>တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (1980–2008)</displayName>
+				<displayName count="other">တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (1980–2008)</displayName>
+			</currency>
+			<currency type="ZWG">
+				<displayName>ၶမ်းၸိမ်ႇပႃႇပူၺ်ႇ</displayName>
+				<displayName count="other">ၶမ်းၸိမ်ႇပႃႇပူၺ်ႇ</displayName>
+			</currency>
+			<currency type="ZWL">
+				<displayName>တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2009–2024)</displayName>
+				<displayName count="other">တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2009–2024)</displayName>
+			</currency>
+			<currency type="ZWR">
+				<displayName>တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2008)</displayName>
+				<displayName count="other">တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2008)</displayName>
+			</currency>
+		</currencies>
+		<minimalPairs>
+			<pluralMinimalPairs count="other" draft="contributed">{0} ဝၼ်း</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">ငွၵ်းၶႂႃ တီႈငွၵ်း ထိ {0}</ordinalMinimalPairs>
+		</minimalPairs>
+	</numbers>
+	<units>
+		<unitLength type="long">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>တႅတ်ႇသီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>သႅၼ်ႇတီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>မီႇလီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>မၢႆႇၶရူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>ၼႃႇၼူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>ပီႇၵူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>ၾႅမ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>ဢႅတ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>ၸႅပ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>ယွၵ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>ရွၼ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>ၶွတ်ႉတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>တႅၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>ႁႅၵ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>ၵီႇလူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>မႅၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>ၵိၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>ထႄႇရႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>ပီႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>ဢႅၵ်ႇၸႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>ၸႅတ်ႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>ယူတ်ႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ရွၼ်ႇၼႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>ၶွတ်ႉတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>ၵီႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>မႄႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>ၵိပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>ထႄႇပီ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>ပႄႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>ဢႅၵ်ႉသ်ပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>ၸႅပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>ယွပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0} တေႃႇ {1}</compoundUnitPattern>
+			</compoundUnit>
+			<compoundUnit type="power2">
+				<compoundUnitPattern1 count="other">သီႇၸဵင်ႇၽဵင်ႇ{0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="other">ၶိဝ်းပိၵ်ႉ{0}</compoundUnitPattern1>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>ႁႅင်း G</displayName>
+				<unitPattern count="other">{0} ႁႅင်း G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>မီႇတႃႇတေႃႇသႅၵ်ႉၵၢၼ်ႉသွင်ပုၼ်ႈ</displayName>
+				<unitPattern count="other">{0} မီႇတႃႇတေႃႇသႅၵ်ႉၵၢၼ်ႉသွင်ပုၼ်ႈ</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>ႁွပ်ႈ</displayName>
+				<unitPattern count="other">{0} ႁွပ်ႈ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ရေႇတီႇယၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ရေႇတီႇယၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>တီႇၵရီႇ</displayName>
+				<unitPattern count="other">{0} တီႇၵရီႇ</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>ဢၢၵ်ႉမိၼိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ဢၢၵ်ႉမိၼိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇၵီႇလူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇၵီႇလူဝ်ႇမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇၵီႇလူဝ်ႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ႁႅၵ်ႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ႁႅၵ်ႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇသႅၼ်ႇတီႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇသႅၼ်ႇတီႇမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇသႅၼ်ႇတီႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇလၵ်း</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇလၵ်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇလၵ်း</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ဢေႇၵ</displayName>
+				<unitPattern count="other">{0} ဢေႇၵ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇဝၢႆႈ</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇဝၢႆႈ</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇထတ်း</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇထတ်း</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>သီႇၸဵင်ႇၽဵင်ႇၼိဝ်ႉ</displayName>
+				<unitPattern count="other">{0} သီႇၸဵင်ႇၽဵင်ႇၼိဝ်ႉ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇၼိဝ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>တူးၼမ်ႇ</displayName>
+				<unitPattern count="other">{0} တူးၼမ်ႇ</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>ၵရၢတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵရၢတ်ႉ</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>မီႇလီႇၵရမ်ႇ တေႃႇ တႅတ်ႇသီႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇၵရမ်ႇ တေႃႇ တႅတ်ႇသီႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>မီႇလီႇမူဝ်း တေႃႇ လီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇမူဝ်း တေႃႇ လီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>ဢၼ်</displayName>
+				<unitPattern count="other">{0} ဢၼ်</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>တွၼ်ႈ</displayName>
+				<unitPattern count="other">{0} တွၼ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>တွၼ်ႈတေႃႇလၢၼ်ႉတွၼ်ႈ</displayName>
+				<unitPattern count="other">{0} တွၼ်ႈတေႃႇလၢၼ်ႉတွၼ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>ဝၢၵ်ႈ</displayName>
+				<unitPattern count="other">{0} ဝၢၵ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>ပႃႇမီးလ်</displayName>
+				<unitPattern count="other">{0} ပႃႇမီးလ်</unitPattern>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>ပႃႇမီးရိယႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} ပႃႇမီးရိယႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>မူဝ်း</displayName>
+				<unitPattern count="other">{0} မူဝ်း</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ၵလူးၵူတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵလူးၵူတ်ႉ</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>လီႇတႃႇ တေႃႇ ၵီႇလူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} လီႇတႃႇ တေႃႇ ၵီႇလူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>လီႇတႃႇ တေႃႇ 100 ၵီႇလူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} လီႇတႃႇ တေႃႇ 100 ၵီႇလူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>လၵ်းတေႃႇၵႃႇလၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} လၵ်းတေႃႇၵႃႇလၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="digital-petabyte">
+				<displayName>ပီႇတႃႇပၢႆႉ</displayName>
+				<unitPattern count="other">{0} ပီႇတႃႇပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<displayName>ထႄႇရႃႇပၢႆႉ</displayName>
+				<unitPattern count="other">{0} ထႄႇရႃႇပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-terabit">
+				<displayName>ထႄႇရႃႇပိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ထႄႇရႃႇပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<displayName>ၵိၵ်ႇၵႃႇပၢႆႉ</displayName>
+				<unitPattern count="other">{0} ၵိၵ်ႇၵႃႇပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<displayName>ၵိၵ်ႇၵႃႇပိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵိၵ်ႇၵႃႇပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<displayName>မႅၵ်ႇၵႃႇပၢႆႉ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<displayName>မႅၵ်ႇၵႃႇပိတ်ႉ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<displayName>ၵီႇလူဝ်ႇပၢႆႉ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<displayName>ၵီႇလူဝ်ႇပိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ပၢႆႉ</displayName>
+				<unitPattern count="other">{0} ပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ပိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ႁူဝ်ပၢၵ်ႇပီ</displayName>
+				<unitPattern count="other">{0} ႁူဝ်ပၢၵ်ႇပီ</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>ႁူဝ်သိပ်းပီ</displayName>
+				<unitPattern count="other">{0} ႁူဝ်သိပ်းပီ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ပီ</displayName>
+				<unitPattern count="other">{0} ပီ</unitPattern>
+				<perUnitPattern>{0} တေႃႇပီ</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>သၢမ်လိူၼ်ႁွပ်ႈ</displayName>
+				<unitPattern count="other">{0} သၢမ်လိူၼ်ႁွပ်ႈ</unitPattern>
+				<perUnitPattern>{0}/သၢမ်လိူၼ်ႁွပ်ႈ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>လိူၼ်</displayName>
+				<unitPattern count="other">{0} လိူၼ်</unitPattern>
+				<perUnitPattern>{0} တေႃႇလိူၼ်</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ဝူင်ႈ</displayName>
+				<unitPattern count="other">{0} ဝူင်ႈ</unitPattern>
+				<perUnitPattern>{0} တေႃႇဝူင်ႈ</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>ဝၼ်း</displayName>
+				<unitPattern count="other">{0} ဝၼ်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇဝၼ်း</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>မူင်း</displayName>
+				<unitPattern count="other">{0} မူင်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇမူင်း</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>မိၼိတ်ႉ</displayName>
+				<unitPattern count="other">{0} မိၼိတ်ႉ</unitPattern>
+				<perUnitPattern>{0} တေႃႇမိၼိတ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} ၸႅၵ်ႉၵၢၼ်ႉ</unitPattern>
+				<perUnitPattern>{0}/ၸႅၵ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>မီႇလီႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇၸႅၵ်ႉၵၢၼ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>မၢႆႇၶရူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} မၢႆႇၶရူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ၼႃႇၼူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼႃႇၼူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>ဢႅမ်ႇပီႇယႃႇ</displayName>
+				<unitPattern count="other">{0} ဢႅမ်ႇပီႇယႃႇ</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>မီႇလီႇဢႅမ်ႇပီႇယႃႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇဢႅမ်ႇပီႇယႃႇ</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ဢူမ်း</displayName>
+				<unitPattern count="other">{0} ဢူမ်း</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>ဝူဝ်ႉ</displayName>
+				<unitPattern count="other">{0} ဝူဝ်ႉ</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>ၵႄႇလူဝ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0} ၵႄႇလူဝ်ႇရီႇ</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>ၵီႇလူဝ်ႇၵျူဝ်း</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵျူဝ်း</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ၵျူဝ်း</displayName>
+				<unitPattern count="other">{0} ၵျူဝ်း</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉ-ၸူဝ်ႈမူင်း</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇဝတ်ႉ-ၸူဝ်ႈမူင်း</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>ဢီႇလႅတ်ႇထရွၼ်ႇဝူဝ်ႉ</displayName>
+				<unitPattern count="other">{0} ဢီႇလႅတ်ႇထရွၼ်ႇဝူဝ်ႉ</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>ႁႅင်းမႆးယူႇဢႅတ်ႉသ်</displayName>
+				<unitPattern count="other">{0} ႁႅင်းမႆးယူႇဢႅတ်ႉသ်</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>ႁႅင်းပွၼ်း</displayName>
+				<unitPattern count="other">{0} ႁႅင်းပွၼ်း</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>ၼိဝ်ႇတၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႇတၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉ-ၸူဝ်ႈမူင်း တေႃႇ 100 ၵီႇလူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇဝတ်ႉ-ၸူဝ်ႈမူင်း တေႃႇ 100 ၵီႇလူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>ၵိၵ်ႇၵႃႇႁႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵိၵ်ႇၵႃႇႁႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>မႅၵ်ႇၵႃႇႁႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇႁႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>ၵီႇလူဝ်ႇႁႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇႁႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>ႁႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} ႁႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName>ၵၢၼ်ပေႃႉလိၵ်ႈ ems</displayName>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName>ၽိၵ်ႇသႄႇလ်</displayName>
+				<unitPattern count="other">{0} ၽိၵ်ႇသႄႇလ်</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName>မႅၵ်ႇၵႃႇၽိၵ်ႇသႄႇလ်</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇၽိၵ်ႇသႄႇလ်</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName>ၽိၵ်ႇသႄႇလ် တေႃႇ သႅၼ်ႇတီႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၽိၵ်ႇသႄႇလ် တေႃႇ သႅၼ်ႇတီႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>ၽိၵ်ႇသႄႇလ် တေႃႇ ၼိဝ်ႉ</displayName>
+				<unitPattern count="other">{0} ၽိၵ်ႇသႄႇလ် တေႃႇ ၼိဝ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName>ထႅဝ်ၽိတ်ႇလုမ်ႈၾႃႉ</displayName>
+				<unitPattern count="other">{0} ထႅဝ်ၽိတ်ႇလုမ်ႈၾႃႉ</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>ၵီႇလူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇၵီႇလူဝ်ႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>မီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>တႅတ်ႇသီႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} တႅတ်ႇသီႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>သႅၼ်ႇတီႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} သႅၼ်ႇတီႇမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇသႅၼ်ႇတီႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>မီႇလီႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>မၢႆႇၶရူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မၢႆႇၶရူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>ၼႃႇၼူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၼႃႇၼူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>ပီႇၵူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ပီႇၵူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>လၵ်း</displayName>
+				<unitPattern count="other">{0} လၵ်း</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ဝၢႆႈ</displayName>
+				<unitPattern count="other">{0} ဝၢႆႈ</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ထတ်း</displayName>
+				<unitPattern count="other">{0} ထတ်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇထတ်း</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ၼိဝ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႉ</unitPattern>
+				<perUnitPattern>{0} တေႃႇၼိဝ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ပႃႇသႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0} ပႃႇသႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ပီလႅင်း</displayName>
+				<unitPattern count="other">{0} ပီလႅင်း</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ်</displayName>
+				<unitPattern count="other">{0} ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ်</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ၾႃႇလူင်ႇ</displayName>
+				<unitPattern count="other">{0} ၾႃႇလူင်ႇ</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ၾႃႇထွမ်ႇ</displayName>
+				<unitPattern count="other">{0} ၾႃႇထွမ်ႇ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>လၵ်းၼမ်ႉ</displayName>
+				<unitPattern count="other">{0} လၵ်းၼမ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>လၵ်းသၵႅၼ်ႇတီႇၼေႇဝီႇယႅၼ်ႇ</displayName>
+				<unitPattern count="other">{0} လၵ်းသၵႅၼ်ႇတီႇၼေႇဝီႇယႅၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>ၸုတ်း</displayName>
+				<unitPattern count="other">{0} ၸုတ်း</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>ထႅဝ်ၽိတ်ႇလႅတ်ႇ</displayName>
+				<unitPattern count="other">{0} ထႅဝ်ၽိတ်ႇလႅတ်ႇ</unitPattern>
+			</unit>
+			<unit type="light-lux">
+				<displayName>လၵ်ႉသ်</displayName>
+				<unitPattern count="other">{0} လၵ်ႉသ်</unitPattern>
+			</unit>
+			<unit type="light-candela">
+				<displayName>ၶႅၼ်ႇတႄႇလႃႇ</displayName>
+				<unitPattern count="other">{0} ၶႅၼ်ႇတႄႇလႃႇ</unitPattern>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>လူႇမႅၼ်ႇ</displayName>
+				<unitPattern count="other">{0} လူႇမႅၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ</displayName>
+				<unitPattern count="other">{0} လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>မႅတ်ႉထရိတ်ႉတၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} မႅတ်ႉထရိတ်ႉ တၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>ၵီႇလူဝ်ႇၵရမ်ႇ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵရမ်ႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇၵီႇလူဝ်ႇၵရမ်ႇ</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ၵရမ်ႇ</displayName>
+				<unitPattern count="other">{0} ၵရမ်ႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇၵရမ်ႇ</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>မီႇလီႇၵရမ်ႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇၵရမ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>မၢႆႇၶရူဝ်ႇၵရမ်ႇ</displayName>
+				<unitPattern count="other">{0} မၢႆႇၶရူဝ်ႇၵရမ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>တၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} တၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>သတူၼ်း</displayName>
+				<unitPattern count="other">{0} သတူၼ်း</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ပွၼ်း</displayName>
+				<unitPattern count="other">{0} ပွၼ်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇပွၼ်း</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ဢွၼ်း</displayName>
+				<unitPattern count="other">{0} ဢွၼ်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇဢွၼ်း</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ထရွႆႉဢွၼ်း</displayName>
+				<unitPattern count="other">{0} ထရွႆႉဢွၼ်း</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ၵရၢတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၵရၢတ်ႈ</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>တႄႇလ်တၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} တႄႇလ်တၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>ၼႅၼ်ႈၼႃလုမ်ႈၾႃႉ</displayName>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>ၼႅၼ်ႈၼႃလႅတ်ႇ</displayName>
+				<unitPattern count="other">{0} ၼႅၼ်ႈၼႃလႅတ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>မဵတ်ႉၽၼ်း</displayName>
+				<unitPattern count="other">{0} မဵတ်ႉၽၼ်း</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ၵိၵ်ႇၵႃႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵိၵ်ႇၵႃႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>မႅၵ်ႇၵႃႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>ဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} ဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>မီႇလီႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ႁႅင်းမႃႉ</displayName>
+				<unitPattern count="other">{0} ႁႅင်းမႃႉ</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>မီႇလီႇမီႇတႃႇမႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇမီႇတႃႇမႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>မႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} မႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ပွၼ်းတေႃႇၼိဝ်ႉသွင်ပုၼ်ႈ</displayName>
+				<unitPattern count="other">{0} ပွၼ်းတေႃႇၼိဝ်ႉသွင်ပုၼ်ႈ</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>ၼိဝ်ႉမႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႉမႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>ပႃးရ်</displayName>
+				<unitPattern count="other">{0} ပႃးရ်</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>မီႇလီႇပႃးရ်</displayName>
+				<unitPattern count="other">{0} မီႇလီႇပႃးရ်</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>ႁႅင်းၼႅၼ်ႈလူမ်း</displayName>
+				<unitPattern count="other">{0} ႁႅင်းၼႅၼ်ႈလူမ်း</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>ပၢတ်ႉသၵႄးလ်</displayName>
+				<unitPattern count="other">{0} ပၢတ်ႉသၵႄးလ်</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>ႁႅၵ်ႇတူဝ်ႇပၢတ်ႉသၵႄးလ်</displayName>
+				<unitPattern count="other">{0} ႁႅၵ်ႇတူဝ်ႇပၢတ်ႉသၵႄးလ်'</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName>ၵီႇလူဝ်ႇပၢတ်ႉသၵႄးလ်</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇပၢတ်ႉသၵႄးလ်</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName>မႅၵ်ႇၵႃႇပၢတ်ႉသၵႄးလ်</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇပၢတ်ႉသၵႄးလ်</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>ၵီႇလူဝ်ႇမီႇတႃႇတေႃႇၸူဝ်ႈမူင်း</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇမီႇတႃႇတေႃႇၸူဝ်ႈမူင်း</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>မီႇတႃႇတေႃႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} မီႇတႃႇတေႃႇၸႅၵ်ႉၵၢၼ်ႉ</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>လၵ်းတေႃႇၸူဝ်ႈမူင်း</displayName>
+				<unitPattern count="other">{0} လၵ်းတေႃႇၸူဝ်ႈမူင်း</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>ၼွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>ပူဝ်ၾူတ်ႉ</displayName>
+				<unitPattern count="other">ပူဝ်ၾူတ်ႉ {0}</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>တီႇၵရီႇသႄးသီးယႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} တီႇၵရီႇသႄးသီးယႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ</displayName>
+				<unitPattern count="other">{0} တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>ၶႄႇလ်ဝိၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ၶႄႇလ်ဝိၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="torque-pound-force-foot">
+				<displayName>ႁႅင်းပွၼ်း-ထတ်း</displayName>
+				<unitPattern count="other">{0} ႁႅင်းပွၼ်း-ထတ်း</unitPattern>
+			</unit>
+			<unit type="torque-newton-meter">
+				<displayName>ၼိဝ်ႇတၼ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႇတၼ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>ၶိဝ်းပိၵ်ႉၵီႇလူဝ်ႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၶိဝ်းပိၵ်ႉၵီႇလူဝ်ႇမီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>ၶိဝ်းပိၵ်ႉမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၶိဝ်းပိၵ်ႉမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ ၶိဝ်းပိၵ်ႉမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>ၶိဝ်းပိၵ်ႉသႅၼ်ႇတီႇမီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ၶိဝ်းပိၵ်ႉသႅၼ်ႇတီႇမီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ ၶိဝ်းပိၵ်ႉသႅၼ်ႇတီႇမီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>လၵ်းၶိဝ်းပိၵ်ႉ</displayName>
+				<unitPattern count="other">{0} လၵ်းၶိဝ်းပိၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ဝၢႆႈၶိဝ်းပိၵ်ႉ</displayName>
+				<unitPattern count="other">{0} ဝၢႆႈၶိဝ်းပိၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ထတ်းၶိဝ်းပိၵ်ႉ</displayName>
+				<unitPattern count="other">{0} ထတ်းၶိဝ်းပိၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>ၼိဝ်ႉၶိဝ်းပိၵ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႉၶိဝ်းပိၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>မႅၵ်ႇၵႃႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>ႁႅၵ်ႇတူဝ်ႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ႁႅၵ်ႇတတူဝ်လီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>လီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} လီႇတႃႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇလီႇတႃႇ</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>တႅတ်ႇသီႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} တႅတ်ႇသီႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>သႅၼ်ႇတီႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} သႅၼ်ႇတီႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>မီႇလီႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>ပၢႆးမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ပၢႆးမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ၵွၵ်းမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵွၵ်းမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ထတ်းဢေႇၵ</displayName>
+				<unitPattern count="other">{0} ထတ်းဢေႇၵ</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>ၶႂၢႆး</displayName>
+				<unitPattern count="other">{0} ၶႂၢႆး</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ၵႃႇလၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ၵႃႇလၢၼ်ႇ</unitPattern>
+				<perUnitPattern>{0} တေႃႇၵႃႇလၢၼ်ႇ</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</unitPattern>
+				<perUnitPattern>{0} တေႃႇ ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ၶွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၶွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>ပၢႆး</displayName>
+				<unitPattern count="other">{0} ပၢႆး</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>ပၢႆး ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0}ပၢႆး ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ၵွၵ်း</displayName>
+				<unitPattern count="other">{0} ၵွၵ်း</unitPattern>
+			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>ၵွၵ်း ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၵွၵ်း ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇ</displayName>
+				<unitPattern count="other">{0} ဢွၼ်းၼမ်ႉယၢင်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-imperial">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ဢွၼ်းၼမ်ႉယၢင်ႇ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ၸေႃႉၵိၼ်ၶဝ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉၵိၼ်ၶဝ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ၸေႃႉၼမ်ႉၼဵင်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉၼမ်ႉၼဵင်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>ပႃႇရႄႇလ်</displayName>
+				<unitPattern count="other">{0} ပႃႇရႄႇလ်</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>ၸေႃႉႁၢတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉႁၢတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>ယွတ်ႇ</displayName>
+				<unitPattern count="other">{0} ယွတ်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>တရမ်ႇ</displayName>
+				<unitPattern count="other">{0} တရမ်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>ၸိၵ်ႇၵႃႇ</displayName>
+				<unitPattern count="other">{0} ၸိၵ်ႇၵႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>ယွပ်း</displayName>
+				<unitPattern count="other">{0} ယွပ်း</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>သတီးရေႇတီႇယၼ်ႇ</displayName>
+				<unitPattern count="other">{0} သတီးရေႇတီႇယၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ၶႃႇတႄႇလ်</displayName>
+				<unitPattern count="other">{0} ၶႃႇတႄႇလ်</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ၶူဝ်ႇလွမ်ႇ</displayName>
+				<unitPattern count="other">{0} ၶူဝ်ႇလွမ်ႇ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ၾႃႇရတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၾႃႇရတ်ႉ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ႁႅၼ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0} ႁႅၼ်ႇရီႇ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>သီႇမႅၼ်း</displayName>
+				<unitPattern count="other">{0} သီႇမႅၼ်း</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ]</displayName>
+				<unitPattern count="other">{0} ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ]</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ [ဢၢႆႇထီႇ]</displayName>
+				<unitPattern count="other">{0} ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ [ဢၢႆႇထီႇ]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ပႅၵ်ႉၶႄႇရႄႇလ်</displayName>
+				<unitPattern count="other">{0} ပႅၵ်ႉၶႄႇရႄႇလ်</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>သီႇဝႅတ်ႉ</displayName>
+				<unitPattern count="other">{0} သီႇဝႅတ်ႉ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ၵရေး</displayName>
+				<unitPattern count="other">{0} ၵရေး</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>ရွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ရွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ၶျဵၼ်း</displayName>
+				<unitPattern count="other">{0} ၶျဵၼ်း</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>တႅတ်ႉသလႃႇ</displayName>
+				<unitPattern count="other">{0} တႅတ်ႉသလႃႇ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ဝႅပ်ႉပႃႇ</displayName>
+				<unitPattern count="other">{0} ဝႅပ်ႉပႃႇ</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName>ရႅၼ်ႇၵိၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ရႅၼ်ႇၵိၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>ၽၢၵ်ႇလိူၼ်</displayName>
+				<unitPattern count="other">{0} ၽၢၵ်ႇလိူၼ်</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>သလၢၵ်ႉ</displayName>
+				<unitPattern count="other">{0} သလၢၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ်</displayName>
+				<unitPattern count="other">{0} ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ်</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>ရိၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ရိၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>သုၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သုၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>သျၵ်ၵု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>သျၵ်ၵု [ၶူဝ်း၊ ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၶူဝ်း၊ ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ၵႅၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵႅၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>ၸူဝ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၸူဝ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ရီ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ရီ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>ပု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ပု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>သႄ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သႄ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>ၶျူဝ် [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၶျူဝ် [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>ၵူဝ်ၸႃးၵျိ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵူဝ်ၸႃးၵျိ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>ဢူဝ်ၸႃးၵျိ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ဢူဝ်ၸႃးၵျိ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>ၵွပ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵွပ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>သၢႆႉ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သၢႆႉ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>တူဝ်ႇ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} တူဝ်ႇ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>ၵွၵ်ၵု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵွၵ်ၵု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>လႅင်း</displayName>
+				<unitPattern count="other">{0} လႅင်း</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>ၾုၼ်ႉ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၾုၼ်ႉ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>တွၼ်ႈတေႃႇႁဵင်လၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} တွၼ်ႈတေႃႇႁဵင်လၢၼ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>ၶိုၼ်း</displayName>
+				<unitPattern count="other">{0} ၶိုၼ်း</unitPattern>
+				<perUnitPattern>{0}/ၶိုၼ်း</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>သီႇမုင်ႈၼႃႈ</displayName>
+				<coordinateUnitPattern type="east">{0} တၢင်းဢွၵ်ႇ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} တၢင်းႁွင်ႇ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} တၢင်းၸၢၼ်း</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} တၢင်းတူၵ်း</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>တႅတ်ႇသီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>သႅၼ်ႇတီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>မီႇလီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>မၢႆႇၶရူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>ၼႃႇၼူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>ပီႇၵူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>ၾႅမ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>ဢႅတ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>ၸႅပ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>ယွၵ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>ရွၼ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>ၶွတ်ႉတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>တႅၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>ႁႅၵ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>ၵီႇလူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>မႅၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>ၵိၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>ထႄႇရႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>ပီႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>ဢႅၵ်ႇၸႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>ၸႅတ်ႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>ယူတ်ႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ရွၼ်ႇၼႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>ၶွတ်ႉတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>ၵီႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>မႄႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>ၵိပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>ထႄႇပီ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>ပႄႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>ဢႅၵ်ႉသ်ပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>ၸႅပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>ယွပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>ႁႅင်း G</displayName>
+				<unitPattern count="other">{0} ႁႅင်း G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>မီႇတႃႇ/သႅၵ်ႉၵၢၼ်ႉ²</displayName>
+				<unitPattern count="other">{0} မ./သႅၵ်ႉ.²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>ႁွပ်ႈ</displayName>
+				<unitPattern count="other">{0} ႁွပ်ႈ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ရေႇတီႇယၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ရေႇ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>တီႇၵရီႇ</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>ဢၢၵ်ႉမိၼိတ်ႉ</displayName>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ</displayName>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>ၵမ.²</displayName>
+				<unitPattern count="other">{0} ၵမ.²</unitPattern>
+				<perUnitPattern>{0}/ၵမ.²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ႁႅၵ်ႇတႃႇ</displayName>
+				<unitPattern count="other">{0} ႁႅၵ်ႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>မ.²</displayName>
+				<unitPattern count="other">{0} မ.²</unitPattern>
+				<perUnitPattern>{0}/မ.²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>သမ.²</displayName>
+				<unitPattern count="other">{0} သမ.²</unitPattern>
+				<perUnitPattern>{0}/သမ.²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>လ.²</displayName>
+				<unitPattern count="other">{0} လ.²</unitPattern>
+				<perUnitPattern>{0}/လ.²</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ဢေႇၵ</displayName>
+				<unitPattern count="other">{0} ဢေႇၵ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ဝ.²</displayName>
+				<unitPattern count="other">{0} ဝ.²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ထ.²</displayName>
+				<unitPattern count="other">{0} ထ.²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>ၼ.²</displayName>
+				<unitPattern count="other">{0} ၼ.²</unitPattern>
+				<perUnitPattern>{0}/ၼ.²</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>တူးၼမ်ႇ</displayName>
+				<unitPattern count="other">{0} တူးၼမ်ႇ</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>ၵရၢတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵရၢတ်ႉ</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>မၵ./တလ.</displayName>
+				<unitPattern count="other">{0} မၵ./တလ.</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>မလမ./လ</displayName>
+				<unitPattern count="other">{0} မလမ./လ</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>ဢၼ်</displayName>
+				<unitPattern count="other">{0} ဢၼ်</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>တွၼ်ႈ</displayName>
+				<unitPattern count="other">{0} တွၼ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>ဝၢၵ်ႈ</displayName>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>ပႃႇမီးလ်</displayName>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>ပႃႇမီးရိယႅတ်ႉ</displayName>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>မူဝ်း</displayName>
+				<unitPattern count="other">{0} မူဝ်း</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ၵလူးၵူတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵလူးၵူတ်ႉ</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>လီႇတႃႇ/ၵမ.</displayName>
+				<unitPattern count="other">{0} လ./ၵမ.</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>လ./100 ၵမ.</displayName>
+				<unitPattern count="other">{0} လ./100 ၵမ.</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>လၵ်း/ၵႃႇလၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} လၵ်း/ၵႃႇလၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>လၵ်း/ၵႃႇလၢၼ်ႇဢိင်ႈၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ပၢႆႉ</displayName>
+				<unitPattern count="other">{0} ပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ပိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ႁူဝ်ပၢၵ်ႇပီ</displayName>
+				<unitPattern count="other">{0} ႁူဝ်ပၢၵ်ႇပီ</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>ႁူဝ်သိပ်းပီ</displayName>
+				<unitPattern count="other">{0} ႁူဝ်သိပ်းပီ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ပီ</displayName>
+				<unitPattern count="other">{0} ပီ</unitPattern>
+				<perUnitPattern>{0}/ပီ</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>သၢမ်လိူၼ်ႁွပ်ႈ</displayName>
+				<unitPattern count="other">{0} သၢမ်လိူၼ်ႁွပ်ႈ</unitPattern>
+				<perUnitPattern>{0}/သၢမ်လိူၼ်ႁွပ်ႈ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>လိူၼ်</displayName>
+				<unitPattern count="other">{0} လိူၼ်</unitPattern>
+				<perUnitPattern>{0}/လိူၼ်</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ဝူင်ႈ</displayName>
+				<unitPattern count="other">{0} ဝူင်ႈ</unitPattern>
+				<perUnitPattern>{0}/ဝူင်ႈ</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>ဝၼ်း</displayName>
+				<unitPattern count="other">{0} ဝၼ်း</unitPattern>
+				<perUnitPattern>{0}/ဝၼ်း</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>မူင်း</displayName>
+				<unitPattern count="other">{0} မူင်း</unitPattern>
+				<perUnitPattern>{0}/မူင်း</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>မိၼိတ်ႉ</displayName>
+				<unitPattern count="other">{0} မိၼိတ်ႉ</unitPattern>
+				<perUnitPattern>{0}/မိၼိတ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} ၸႅၵ်ႉ</unitPattern>
+				<perUnitPattern>{0}/ၸႅၵ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>မီႇလီႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>မၢႆႇၶရူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} မၢႆႇၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ၼႃႇၼူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼႃႇၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>ဢႅမ်ႇပီႇယႃႇ</displayName>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>မီႇလီႇဢႅမ်ႇပီႇယႃႇ</displayName>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ဢူမ်း</displayName>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>ဝူဝ်ႉ</displayName>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>ၵႄႇလူဝ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0} ၵႄႇလူဝ်ႇရီႇ</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>ၵီႇလူဝ်ႇၵျူဝ်း</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵျူဝ်း</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ၵျူဝ်း</displayName>
+				<unitPattern count="other">{0} ၵျူဝ်း</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>ၵဝ.မူင်း</displayName>
+				<unitPattern count="other">{0} ၵဝ.မူင်း</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<displayName>ဢီႇလႅတ်ႇထရွၼ်ႇဝူဝ်ႉ</displayName>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>ပီႇထီႇယူႇ</displayName>
+				<unitPattern count="other">{0} ပီႇထီႇယူႇ</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>ႁႅင်းမႆးယူႇဢႅတ်ႉသ်</displayName>
+				<unitPattern count="other">{0} ႁႅင်းမႆးယူႇဢႅတ်ႉသ်</unitPattern>
+			</unit>
+			<unit type="force-pound-force">
+				<displayName>ႁႅင်းပွၼ်း</displayName>
+			</unit>
+			<unit type="force-newton">
+				<displayName>ၼိဝ်ႇတၼ်ႇ</displayName>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉမူင်း/100ၵမ.</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇဝတ်ႉမူင်း/100ၵမ.</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>ၵမ.</displayName>
+				<unitPattern count="other">{0} ၵမ.</unitPattern>
+				<perUnitPattern>{0}/ၵမ.</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>မီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မ.</unitPattern>
+				<perUnitPattern>{0}/မ.</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>တမ.</displayName>
+				<unitPattern count="other">{0} တမ.</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>သမ.</displayName>
+				<unitPattern count="other">{0} သမ.</unitPattern>
+				<perUnitPattern>{0}/သမ.</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>မမ.</displayName>
+				<unitPattern count="other">{0} မမ.</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>မၢႆႇၶရူဝ်ႇမီႇတႃႇ</displayName>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>ၼမ.</displayName>
+				<unitPattern count="other">{0} ၼမ.</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>ပမ.</displayName>
+				<unitPattern count="other">{0} ပမ.</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>လၵ်း</displayName>
+				<unitPattern count="other">{0} လၵ်း</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ဝၢႆႈ</displayName>
+				<unitPattern count="other">{0} ဝၢႆႈ</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ထတ်း</displayName>
+				<unitPattern count="other">{0} ထတ်း</unitPattern>
+				<perUnitPattern>{0}/ထတ်း</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ၼိဝ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႉ</unitPattern>
+				<perUnitPattern>{0}/ၼိဝ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ပႃႇသႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0} ပႃႇသႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ပီလႅင်း</displayName>
+				<unitPattern count="other">{0} ပီလႅင်း</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ်</displayName>
+				<unitPattern count="other">{0} ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ်</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ၾႃႇလူင်ႇ</displayName>
+				<unitPattern count="other">{0} ၾႃႇလူင်ႇ</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ၾႃႇထွမ်ႇ</displayName>
+				<unitPattern count="other">{0} ၾႃႇထွမ်ႇ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>လၵ်းၼမ်ႉ</displayName>
+				<unitPattern count="other">{0} လၵ်းၼမ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName>လၵ်းသၵႅၼ်ႇတီႇၼေႇဝီႇယႅၼ်ႇ</displayName>
+			</unit>
+			<unit type="length-point">
+				<displayName>ၸုတ်း</displayName>
+				<unitPattern count="other">{0} ၸုတ်း</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>ထႅဝ်ၽိတ်ႇလႅတ်ႇ</displayName>
+			</unit>
+			<unit type="light-lux">
+				<displayName>လၵ်ႉသ်</displayName>
+			</unit>
+			<unit type="light-candela">
+				<displayName>ၶႅၼ်ႇတႄႇလႃႇ</displayName>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>လူႇမႅၼ်ႇ</displayName>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ</displayName>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>တ.</displayName>
+				<unitPattern count="other">{0} တ.</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>ၵၵ.</displayName>
+				<unitPattern count="other">{0} ၵၵ.</unitPattern>
+				<perUnitPattern>{0}/ၵၵ.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ၵရမ်ႇ</displayName>
+				<unitPattern count="other">{0} ၵ.</unitPattern>
+				<perUnitPattern>{0}/ၵ.</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>မၵ.</displayName>
+				<unitPattern count="other">{0} မၵ.</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>μၵ.</displayName>
+				<unitPattern count="other">{0} μၵ.</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>တၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} တၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>သတူၼ်း</displayName>
+				<unitPattern count="other">{0} သတ.</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ပွၼ်း</displayName>
+				<unitPattern count="other">{0} ပွၼ်း</unitPattern>
+				<perUnitPattern>{0}/ပွၼ်း</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ဢွၼ်း</displayName>
+				<unitPattern count="other">{0} ဢွၼ်း</unitPattern>
+				<perUnitPattern>{0} တေႃႇဢွၼ်း</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ထရွႆႉဢွၼ်း</displayName>
+				<unitPattern count="other">{0} ဢထရ.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ၵရၢတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၵရၢတ်ႈ</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<displayName>တႄႇလ်တၢၼ်ႇ</displayName>
+			</unit>
+			<unit type="mass-earth-mass">
+				<displayName>ၼႅၼ်ႈၼႃလုမ်ႈၾႃႉ</displayName>
+			</unit>
+			<unit type="mass-solar-mass">
+				<displayName>ၼႅၼ်ႈၼႃလႅတ်ႇ</displayName>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>မဵတ်ႉၽၼ်း</displayName>
+				<unitPattern count="other">{0} မဵတ်ႉၽၼ်း</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ၵိၵ်ႇၵႃႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵိၵ်ႇၵႃႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>မႅၵ်ႇၵႃႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>ဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} ဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>မီႇလီႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0} မီႇလီႇဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ႁႅင်းမႃႉ</displayName>
+				<unitPattern count="other">{0} ႁႅင်းမႃႉ</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>မမ. မႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} မမ. မႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>မႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} မႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>ၼိဝ်ႉမႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} ၼိဝ်ႉမႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>ပႃးရ်</displayName>
+				<unitPattern count="other">{0} ပႃးရ်</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>မီႇလီႇပႃးရ်</displayName>
+				<unitPattern count="other">{0} မီႇလီႇပႃးရ်</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>ႁႅင်းၼႅၼ်ႈလူမ်း</displayName>
+				<unitPattern count="other">{0} ႁႅင်းၼႅၼ်ႈလူမ်း</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>ပၢတ်ႉသၵႄးလ်</displayName>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>ၵမ./ၸူဝ်ႈမူင်း</displayName>
+				<unitPattern count="other">{0} ၵမ./မူင်း</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>မီႇတႃႇ/ၸႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0} မ./ၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>လၵ်း/မူင်း</displayName>
+				<unitPattern count="other">{0} လ./မူင်း</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>ၼွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>ပူဝ်ၾူတ်ႉ</displayName>
+				<unitPattern count="other">ပူဝ်ၾူတ်ႉ {0}</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>တီႇၵရီႇသႄးသီးယႅတ်ႉ</displayName>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ</displayName>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>ၵမ.³</displayName>
+				<unitPattern count="other">{0} ၵမ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>မ.³</displayName>
+				<unitPattern count="other">{0} မ.³</unitPattern>
+				<perUnitPattern>{0}/မ.³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>သမ.³</displayName>
+				<unitPattern count="other">{0} သမ.³</unitPattern>
+				<perUnitPattern>{0}/သမ.³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>လ.³</displayName>
+				<unitPattern count="other">{0} လ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ဝ.³</displayName>
+				<unitPattern count="other">{0} ဝ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ထ.³</displayName>
+				<unitPattern count="other">{0} ထ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>ၼ.³</displayName>
+				<unitPattern count="other">{0} ၼ.³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>မႅၵ်ႇၵႃႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} မႅၵ်ႇၵႃႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>ႁလ.</displayName>
+				<unitPattern count="other">{0} ႁလ.</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>လီႇတႃႇ</displayName>
+				<unitPattern count="other">{0} လ.</unitPattern>
+				<perUnitPattern>{0}/လ.</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>တလ.</displayName>
+				<unitPattern count="other">{0} တလ.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>သလ.</displayName>
+				<unitPattern count="other">{0} သလ.</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>မလ.</displayName>
+				<unitPattern count="other">{0} မလ.</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>ပၢႆးမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ပၢႆးမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ၵွၵ်းမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵွၵ်းမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ထတ်းဢေႇၵ</displayName>
+				<unitPattern count="other">{0} ထတ်းဢေႇၵ</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>ၶႂၢႆး</displayName>
+				<unitPattern count="other">{0} ၶႂၢႆး</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ၵႃႇလၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} ၵႃႇလၢၼ်ႇ</unitPattern>
+				<perUnitPattern>{0}/ၵႃႇလၢၼ်ႇ</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</unitPattern>
+				<perUnitPattern>{0}/ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ၶွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၶွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>ပၢႆး</displayName>
+				<unitPattern count="other">{0} ပၢႆး</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>ပၢႆး ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ပၢႆး ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ၵွၵ်း</displayName>
+				<unitPattern count="other">{0} ၵွၵ်း</unitPattern>
+			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>ၵွၵ်း ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၵွၵ်း ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇ</displayName>
+				<unitPattern count="other">{0} ဢွၼ်းၼမ်ႉယၢင်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ၸေႃႉၵိၼ်ၶဝ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉၵိၼ်ၶဝ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ၸေႃႉၼမ်ႉၼဵင်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉၼမ်ႉၼဵင်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>ပႃႇရႄႇလ်</displayName>
+				<unitPattern count="other">{0} ပႃႇရႄႇလ်</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>ၸေႃႉႁၢတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉႁၢတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>ယွတ်ႇ</displayName>
+				<unitPattern count="other">{0} ယွတ်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>တရမ်ႇ</displayName>
+				<unitPattern count="other">{0} တရမ်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>ၸိၵ်ႇၵႃႇ</displayName>
+				<unitPattern count="other">{0} ၸိၵ်ႇၵႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>ယွပ်း</displayName>
+				<unitPattern count="other">{0} ယွပ်း</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ၶႃႇတႄႇလ်</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ၶူဝ်ႇလွမ်ႇ</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ၾႃႇရတ်ႉ</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ႁႅၼ်ႇရီႇ</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>သီႇမႅၼ်း</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ]</displayName>
+				<unitPattern count="other">{0} ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ]</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>ပီႇထီႇယူႇ-ဢၢႆႇထီႇ</displayName>
+				<unitPattern count="other">{0} ပီႇထီႇယူႇ-ဢၢႆႇထီႇ</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ပႅၵ်ႉၶႄႇရႄႇလ်</displayName>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>သီႇဝႅတ်ႉ</displayName>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ၵရေး</displayName>
+				<unitPattern count="other">{0} ၵရေး</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>ရွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ရွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ၶျဵၼ်း</displayName>
+				<unitPattern count="other">{0} ၶျဵၼ်း</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>တႅတ်ႉသလႃႇ</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ဝႅပ်ႉပႃႇ</displayName>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>ၽၢၵ်ႇလိူၼ်</displayName>
+				<unitPattern count="other">{0} ၽၢၵ်ႇလိူၼ်</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>သလၢၵ်ႉ</displayName>
+				<unitPattern count="other">{0} သလၢၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ်</displayName>
+				<unitPattern count="other">{0} gas-equiv</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>ရိၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ရိၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>သုၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သုၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>သျၵ်ၵု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>သျၵ်ၵု [ၶူဝ်း၊ ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၶူဝ်း၊ ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ၵႅၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵႅၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>ၸူဝ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၸူဝ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ရီ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ရီ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>ပု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ပု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>သႄ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သႄ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>ၶျူဝ် [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၶျူဝ် [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>ၵူဝ်ၸႃးၵျိ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵူဝ်ၸႃးၵျိ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>ဢူဝ်ၸႃးၵျိ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ဢူဝ်ၸႃးၵျိ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>ၵွပ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵွပ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>သၢႆႉ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သၢႆႉ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>တူဝ်ႇ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} တူဝ်ႇ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>ၵွၵ်ၵု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵွၵ်ၵု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>လႅင်း</displayName>
+				<unitPattern count="other">{0} လႅင်း</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>ၾုၼ်ႉ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၾုၼ်ႉ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>တွၼ်ႈ/ႁဵင်လၢၼ်ႉ</displayName>
+				<unitPattern count="other">{0} တတႁလ.</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>ၶိုၼ်း</displayName>
+				<unitPattern count="other">{0} ၶိုၼ်း</unitPattern>
+				<perUnitPattern>{0}/ၶိုၼ်း</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>မုင်ႈၼႃႈ</displayName>
+				<coordinateUnitPattern type="east">{0} ဢ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ႁ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ၸ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} တ</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<compoundUnit type="10p-1">
+				<unitPrefixPattern>တႅတ်ႇသီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-2">
+				<unitPrefixPattern>သႅၼ်ႇတီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-3">
+				<unitPrefixPattern>မီႇလီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>မၢႆႇၶရူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-9">
+				<unitPrefixPattern>ၼႃႇၼူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-12">
+				<unitPrefixPattern>ပီႇၵူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-15">
+				<unitPrefixPattern>ၾႅမ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-18">
+				<unitPrefixPattern>ဢႅတ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-21">
+				<unitPrefixPattern>ၸႅပ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-24">
+				<unitPrefixPattern>ယွၵ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-27">
+				<unitPrefixPattern>ရွၼ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p-30">
+				<unitPrefixPattern>ၶွတ်ႉတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p1">
+				<unitPrefixPattern>တႅၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p2">
+				<unitPrefixPattern>ႁႅၵ်ႇတူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>ၵီႇလူဝ်ႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p6">
+				<unitPrefixPattern>မႅၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p9">
+				<unitPrefixPattern>ၵိၵ်ႇၵႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p12">
+				<unitPrefixPattern>ထႄႇရႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p15">
+				<unitPrefixPattern>ပီႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p18">
+				<unitPrefixPattern>ဢႅၵ်ႇၸႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>ၸႅတ်ႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>ယူတ်ႇတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ရွၼ်ႇၼႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p30">
+				<unitPrefixPattern>ၶွတ်ႉတႃႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p1">
+				<unitPrefixPattern>ၵီႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p2">
+				<unitPrefixPattern>မႄႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p3">
+				<unitPrefixPattern>ၵိပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p4">
+				<unitPrefixPattern>ထႄႇပီ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p5">
+				<unitPrefixPattern>ပႄႇပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p6">
+				<unitPrefixPattern>ဢႅၵ်ႉသ်ပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p7">
+				<unitPrefixPattern>ၸႅပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>ယွပ်ႉပီႇ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<displayName>ႁႅင်း G</displayName>
+				<unitPattern count="other">{0} ႁႅင်း G</unitPattern>
+			</unit>
+			<unit type="acceleration-meter-per-square-second">
+				<displayName>မ./သႅၵ်ႉ.²</displayName>
+				<unitPattern count="other">{0} မ./သႅၵ်ႉ.²</unitPattern>
+			</unit>
+			<unit type="angle-revolution">
+				<displayName>ႁွပ်ႈ</displayName>
+				<unitPattern count="other">{0}ႁွပ်ႈ</unitPattern>
+			</unit>
+			<unit type="angle-radian">
+				<displayName>ရေႇတီႇယၼ်ႇ</displayName>
+				<unitPattern count="other">{0}ရေႇ</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<displayName>တီႇၵရီႇ</displayName>
+			</unit>
+			<unit type="angle-arc-minute">
+				<displayName>ဢၢၵ်ႉမိၼိတ်ႉ</displayName>
+			</unit>
+			<unit type="angle-arc-second">
+				<displayName>ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ</displayName>
+			</unit>
+			<unit type="area-square-kilometer">
+				<displayName>ၵမ.²</displayName>
+				<unitPattern count="other">{0}ၵမ.²</unitPattern>
+				<perUnitPattern>{0}/ၵမ.²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName>ႁႅၵ်ႇတႃႇ</displayName>
+				<unitPattern count="other">{0}ႁႅၵ်ႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName>မ.²</displayName>
+				<unitPattern count="other">{0}မ.²</unitPattern>
+				<perUnitPattern>{0}/မ.²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName>သမ.²</displayName>
+				<unitPattern count="other">{0}သမ.²</unitPattern>
+				<perUnitPattern>{0}/သမ.²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName>လ.²</displayName>
+				<unitPattern count="other">{0}လ.²</unitPattern>
+				<perUnitPattern>{0}/လ.²</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName>ဢေႇၵ</displayName>
+				<unitPattern count="other">{0}ဢေႇၵ</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName>ဝ.²</displayName>
+				<unitPattern count="other">{0}ဝ.²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName>ထ.²</displayName>
+				<unitPattern count="other">{0}ထ.²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName>ၼ.²</displayName>
+				<unitPattern count="other">{0}ၼ.²</unitPattern>
+				<perUnitPattern>{0}/ၼ.²</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName>တူးၼမ်ႇ</displayName>
+				<unitPattern count="other">{0}တူးၼမ်ႇ</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<displayName>ၵရၢတ်ႉ</displayName>
+				<unitPattern count="other">{0}ၵရၢတ်ႉ</unitPattern>
+			</unit>
+			<unit type="concentr-milligram-ofglucose-per-deciliter">
+				<displayName>မၵ./တလ.</displayName>
+				<unitPattern count="other">{0}မၵ./တလ.</unitPattern>
+			</unit>
+			<unit type="concentr-millimole-per-liter">
+				<displayName>မလမ./လ</displayName>
+				<unitPattern count="other">{0}မလမ./လ</unitPattern>
+			</unit>
+			<unit type="concentr-item">
+				<displayName>ဢၼ်</displayName>
+				<unitPattern count="other">{0}ဢၼ်</unitPattern>
+			</unit>
+			<unit type="concentr-part">
+				<displayName>တွၼ်ႈ</displayName>
+				<unitPattern count="other">{0}တွၼ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-percent">
+				<displayName>ဝၢၵ်ႈ</displayName>
+			</unit>
+			<unit type="concentr-permille">
+				<displayName>ပႃႇမီးလ်</displayName>
+			</unit>
+			<unit type="concentr-permyriad">
+				<displayName>ပႃႇမီးရိယႅတ်ႉ</displayName>
+			</unit>
+			<unit type="concentr-mole">
+				<displayName>မူဝ်း</displayName>
+				<unitPattern count="other">{0}မူဝ်း</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ၵလူးၵူတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၵလူးၵူတ်ႉ</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<displayName>လ./ၵမ.</displayName>
+				<unitPattern count="other">{0}လ./ၵမ.</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100-kilometer">
+				<displayName>လ./100ၵမ.</displayName>
+				<unitPattern count="other">{0} လ./100ၵမ.</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<displayName>mpg</displayName>
+				<unitPattern count="other">{0}mpg</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<displayName>လၵ်း/ၵႃႇလၢၼ်ႇဢိင်ႈၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="digital-terabyte">
+				<unitPattern count="other">{0}TB</unitPattern>
+			</unit>
+			<unit type="digital-gigabyte">
+				<unitPattern count="other">{0}GB</unitPattern>
+			</unit>
+			<unit type="digital-gigabit">
+				<unitPattern count="other">{0}Gb</unitPattern>
+			</unit>
+			<unit type="digital-megabyte">
+				<unitPattern count="other">{0}MB</unitPattern>
+			</unit>
+			<unit type="digital-megabit">
+				<unitPattern count="other">{0}Mb</unitPattern>
+			</unit>
+			<unit type="digital-kilobyte">
+				<unitPattern count="other">{0}kB</unitPattern>
+			</unit>
+			<unit type="digital-kilobit">
+				<unitPattern count="other">{0}kb</unitPattern>
+			</unit>
+			<unit type="digital-byte">
+				<displayName>ပၢႆႉ</displayName>
+				<unitPattern count="other">{0}ပၢႆႉ</unitPattern>
+			</unit>
+			<unit type="digital-bit">
+				<displayName>ပိတ်ႉ</displayName>
+				<unitPattern count="other">{0}ပိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName>ႁူဝ်ပၢၵ်ႇပီ</displayName>
+				<unitPattern count="other">{0} ႁူဝ်ပၢၵ်ႇပီ</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName>ႁူဝ်သိပ်းပီ</displayName>
+				<unitPattern count="other">{0} ႁူဝ်သိပ်းပီ</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName>ပီ</displayName>
+				<unitPattern count="other">{0}ပီ</unitPattern>
+				<perUnitPattern>{0}/ပီ</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName>သၢမ်လိူၼ်ႁွပ်ႈ</displayName>
+				<unitPattern count="other">{0}သၢမ်လိူၼ်ႁွပ်ႈ</unitPattern>
+				<perUnitPattern>{0}/သၢမ်လိူၼ်ႁွပ်ႈ</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName>လိူၼ်</displayName>
+				<unitPattern count="other">{0}လိူၼ်</unitPattern>
+				<perUnitPattern>{0}/လိူၼ်</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName>ဝူင်ႈ</displayName>
+				<unitPattern count="other">{0}ဝူင်ႈ</unitPattern>
+				<perUnitPattern>{0}/ဝူင်ႈ</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName>ဝၼ်း</displayName>
+				<unitPattern count="other">{0}ဝၼ်း</unitPattern>
+				<perUnitPattern>{0}/ဝၼ်း</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName>မူင်း</displayName>
+				<unitPattern count="other">{0}မူင်း</unitPattern>
+				<perUnitPattern>{0}/မူင်း</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName>မိၼိတ်ႉ</displayName>
+				<unitPattern count="other">{0}မိၼိတ်ႉ</unitPattern>
+				<perUnitPattern>{0}/မိၼိတ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName>ၸႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0}ၸႅၵ်ႉ</unitPattern>
+				<perUnitPattern>{0}/ၸႅၵ်ႉၵၢၼ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName>မီႇလီႇၸႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0}မီႇလီႇၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName>မၢႆႇၶရူဝ်ႇၸႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0}မၢႆႇၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName>ၼႃႇၼူဝ်ႇၸႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0}ၼႃႇၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="electric-ampere">
+				<displayName>ဢႅမ်ႇပီႇယႃႇ</displayName>
+				<unitPattern count="other">{0}A</unitPattern>
+			</unit>
+			<unit type="electric-milliampere">
+				<displayName>မီႇလီႇဢႅမ်ႇပီႇယႃႇ</displayName>
+				<unitPattern count="other">{0}mA</unitPattern>
+			</unit>
+			<unit type="electric-ohm">
+				<displayName>ဢူမ်း</displayName>
+				<unitPattern count="other">{0}Ω</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>ဝူဝ်ႉ</displayName>
+				<unitPattern count="other">{0}V</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0}kcal</unitPattern>
+			</unit>
+			<unit type="energy-calorie">
+				<displayName>ၵႄႇလူဝ်ႇရီႇ</displayName>
+				<unitPattern count="other">{0}ၵႄႇလူဝ်ႇရီႇ</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>ၵီႇလူဝ်ႇၵျူဝ်း</displayName>
+				<unitPattern count="other">{0}ၵီႇလူဝ်ႇၵျူဝ်း</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ၵျူဝ်း</displayName>
+				<unitPattern count="other">{0}ၵျူဝ်း</unitPattern>
+			</unit>
+			<unit type="energy-kilowatt-hour">
+				<displayName>ၵဝ.မူင်း</displayName>
+				<unitPattern count="other">{0}ၵဝ.မူင်း</unitPattern>
+			</unit>
+			<unit type="energy-electronvolt">
+				<unitPattern count="other">{0}eV</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<displayName>ပီႇထီႇယူႇ</displayName>
+				<unitPattern count="other">{0} ပီႇထီႇယူႇ</unitPattern>
+			</unit>
+			<unit type="energy-therm-us">
+				<displayName>ႁႅင်းမႆးယူႇဢႅတ်ႉသ်</displayName>
+				<unitPattern count="other">{0}ႁႅင်းမႆးယူႇဢႅတ်ႉသ်</unitPattern>
+			</unit>
+			<unit type="force-newton">
+				<displayName>ၼိဝ်ႇတၼ်ႇ</displayName>
+			</unit>
+			<unit type="force-kilowatt-hour-per-100-kilometer">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉမူင်း/100ၵမ.</displayName>
+				<unitPattern count="other">{0} ၵီႇလူဝ်ႇဝတ်ႉမူင်း/100ၵမ.</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<unitPattern count="other">{0}GHz</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<unitPattern count="other">{0}MHz</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<unitPattern count="other">{0}kHz</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<unitPattern count="other">{0}Hz</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName>ၵမ.</displayName>
+				<unitPattern count="other">{0} ၵမ.</unitPattern>
+				<perUnitPattern>{0}/ၵမ.</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName>မီႇတႃႇ</displayName>
+				<unitPattern count="other">{0}မ.</unitPattern>
+				<perUnitPattern>{0}/မ</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName>တမ.</displayName>
+				<unitPattern count="other">{0}တမ.</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName>သမ.</displayName>
+				<unitPattern count="other">{0}သမ.</unitPattern>
+				<perUnitPattern>{0}/သမ.</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName>မမ.</displayName>
+				<unitPattern count="other">{0}မမ.</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName>မၢႆႇၶရူဝ်ႇမီႇတႃႇ</displayName>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName>ၼမ.</displayName>
+				<unitPattern count="other">{0}ၼမ.</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName>ပမ.</displayName>
+				<unitPattern count="other">{0}ပမ.</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName>လၵ်း</displayName>
+				<unitPattern count="other">{0}လၵ်း</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName>ဝၢႆႈ</displayName>
+				<unitPattern count="other">{0}ဝၢႆႈ</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName>ထတ်း</displayName>
+				<unitPattern count="other">{0}′</unitPattern>
+				<perUnitPattern>{0}/ထတ်း</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName>ၼိဝ်ႉ</displayName>
+				<unitPattern count="other">{0}″</unitPattern>
+				<perUnitPattern>{0}/ၼိဝ်ႉ</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName>ပႃႇသႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0}ပႃႇသႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName>ပီလႅင်း</displayName>
+				<unitPattern count="other">{0}ပီလႅင်း</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName>ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ်</displayName>
+				<unitPattern count="other">{0}au</unitPattern>
+			</unit>
+			<unit type="length-furlong">
+				<displayName>ၾႃႇလူင်ႇ</displayName>
+				<unitPattern count="other">{0}ၾႃႇလူင်ႇ</unitPattern>
+			</unit>
+			<unit type="length-fathom">
+				<displayName>ၾႃႇထွမ်ႇ</displayName>
+				<unitPattern count="other">{0}ၾႃႇထွမ်ႇ</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName>လၵ်းၼမ်ႉ</displayName>
+				<unitPattern count="other">{0}လၵ်းၼမ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName>ၸုတ်း</displayName>
+				<unitPattern count="other">{0}ၸုတ်း</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName>ထႅဝ်ၽိတ်ႇလႅတ်ႇ</displayName>
+			</unit>
+			<unit type="light-lux">
+				<displayName>လၵ်ႉသ်</displayName>
+			</unit>
+			<unit type="light-candela">
+				<displayName>ၶႅၼ်ႇတႄႇလႃႇ</displayName>
+			</unit>
+			<unit type="light-lumen">
+				<displayName>လူႇမႅၼ်ႇ</displayName>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<displayName>လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ</displayName>
+			</unit>
+			<unit type="mass-tonne">
+				<displayName>တ.</displayName>
+				<unitPattern count="other">{0} တ.</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName>ၵၵ.</displayName>
+				<unitPattern count="other">{0} ၵၵ.</unitPattern>
+				<perUnitPattern>{0}/ၵၵ.</perUnitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName>ၵရမ်ႇ</displayName>
+				<unitPattern count="other">{0}ၵ.</unitPattern>
+				<perUnitPattern>{0}/ၵ.</perUnitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<displayName>မၵ.</displayName>
+				<unitPattern count="other">{0}မၵ.</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<displayName>μၵ.</displayName>
+				<unitPattern count="other">{0}μၵ.</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<displayName>တၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0} တၢၼ်ႇ</unitPattern>
+			</unit>
+			<unit type="mass-stone">
+				<displayName>သတူၼ်း</displayName>
+				<unitPattern count="other">{0}သတ.</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<displayName>ပွၼ်း</displayName>
+				<unitPattern count="other">{0}ပွၼ်း</unitPattern>
+				<perUnitPattern>{0}/ပွၼ်း</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<displayName>ဢွၼ်း</displayName>
+				<unitPattern count="other">{0}ဢွၼ်း</unitPattern>
+				<perUnitPattern>{0}/ဢွၼ်း</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce-troy">
+				<displayName>ဢထရ.</displayName>
+				<unitPattern count="other">{0}ဢထရ.</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<displayName>ၵရၢတ်ႈ</displayName>
+				<unitPattern count="other">{0}ၵရၢတ်ႈ</unitPattern>
+			</unit>
+			<unit type="mass-dalton">
+				<unitPattern count="other">{0}Da</unitPattern>
+			</unit>
+			<unit type="mass-grain">
+				<displayName>မဵတ်ႉၽၼ်း</displayName>
+				<unitPattern count="other">{0}မဵတ်ႉၽၼ်း</unitPattern>
+			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ၵိၵ်ႇၵႃႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0}GW</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>မႅၵ်ႇၵႃႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0}MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>ၵီႇလူဝ်ႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0}kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<displayName>ဝတ်ႉ</displayName>
+				<unitPattern count="other">{0}ဝတ်ႉ</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>မီႇလီႇဝတ်ႉ</displayName>
+				<unitPattern count="other">{0}mW</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<displayName>ႁႅင်းမႃႉ</displayName>
+				<unitPattern count="other">{0}ႁႅင်းမႃႉ</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>မမ. မႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0}မမ. မႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>မႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0} မႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-inch-ofhg">
+				<displayName>ၼိဝ်ႉမႃႇၵျူႇရီႇ</displayName>
+				<unitPattern count="other">{0}ၼိဝ်ႉမႃႇၵျူႇရီႇ</unitPattern>
+			</unit>
+			<unit type="pressure-bar">
+				<displayName>ပႃးရ်</displayName>
+				<unitPattern count="other">{0}ပႃးရ်</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<displayName>မီႇလီႇပႃးရ်</displayName>
+				<unitPattern count="other">{0}မီႇလီႇပႃးရ်</unitPattern>
+			</unit>
+			<unit type="pressure-atmosphere">
+				<displayName>ႁႅင်းၼႅၼ်ႈလူမ်း</displayName>
+				<unitPattern count="other">{0}ႁႅင်းၼႅၼ်ႈလူမ်း</unitPattern>
+			</unit>
+			<unit type="pressure-pascal">
+				<displayName>ပၢတ်ႉသၵႄးလ်</displayName>
+				<unitPattern count="other">{0}Pa</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<unitPattern count="other">{0}kPa</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<unitPattern count="other">{0}MPa</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<displayName>ၵမ./မူင်း</displayName>
+				<unitPattern count="other">{0} ၵမ./မူင်း</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<displayName>မ./ၸႅၵ်ႉ</displayName>
+				<unitPattern count="other">{0} မ./ၸႅၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<displayName>လ./မူင်း</displayName>
+				<unitPattern count="other">{0} လ./မူင်း</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<displayName>ၼွတ်ႉ</displayName>
+				<unitPattern count="other">{0} ၼွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="speed-beaufort">
+				<displayName>ပူဝ်ၾူတ်ႉ</displayName>
+				<unitPattern count="other">ပူဝ်ၾူတ်ႉ {0}</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<displayName>တီႇၵရီႇသႄးသီးယႅတ်ႉ</displayName>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<displayName>တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ</displayName>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<unitPattern count="other">{0}K</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName>ၵမ.³</displayName>
+				<unitPattern count="other">{0}ၵမ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName>မ.³</displayName>
+				<unitPattern count="other">{0}မ.³</unitPattern>
+				<perUnitPattern>{0}/မ.³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName>သမ.³</displayName>
+				<unitPattern count="other">{0}သမ.³</unitPattern>
+				<perUnitPattern>{0}/သမ.³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<displayName>လ.³</displayName>
+				<unitPattern count="other">{0}လ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ဝ.³</displayName>
+				<unitPattern count="other">{0}ဝ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<displayName>ထ.³</displayName>
+				<unitPattern count="other">{0}ထ.³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<displayName>ၼ.³</displayName>
+				<unitPattern count="other">{0}ၼ.³</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>မႅၵ်ႇၵႃႇလီႇတႃႇ</displayName>
+				<unitPattern count="other">{0}မႅၵ်ႇၵႃႇလီႇတႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>ႁလ.</displayName>
+				<unitPattern count="other">{0} ႁလ.</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName>လီႇတႃႇ</displayName>
+				<unitPattern count="other">{0}လ.</unitPattern>
+				<perUnitPattern>{0}/လ.</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName>တလ.</displayName>
+				<unitPattern count="other">{0}တလ.</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName>သလ.</displayName>
+				<unitPattern count="other">{0}သလ.</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName>မလ.</displayName>
+				<unitPattern count="other">{0}မလ.</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName>ပၢႆးမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0}ပၢႆးမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName>ၵွၵ်းမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0}ၵွၵ်းမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ</displayName>
+				<unitPattern count="other">{0} ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-acre-foot">
+				<displayName>ထတ်းဢေႇၵ</displayName>
+				<unitPattern count="other">{0}ထတ်းဢေႇၵ</unitPattern>
+			</unit>
+			<unit type="volume-bushel">
+				<displayName>ၶႂၢႆး</displayName>
+				<unitPattern count="other">{0}ၶႂၢႆး</unitPattern>
+			</unit>
+			<unit type="volume-gallon">
+				<displayName>ၵႃႇလၢၼ်ႇ</displayName>
+				<unitPattern count="other">{0}ၵႃႇလၢၼ်ႇ</unitPattern>
+				<perUnitPattern>{0}/ၵႃႇလၢၼ်ႇ</perUnitPattern>
+			</unit>
+			<unit type="volume-gallon-imperial">
+				<displayName>ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0}ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</unitPattern>
+				<perUnitPattern>{0}/ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ၶွတ်ႉ</displayName>
+				<unitPattern count="other">{0}ၶွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="volume-pint">
+				<displayName>ပၢႆး</displayName>
+				<unitPattern count="other">{0}ပၢႆး</unitPattern>
+			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName>ပၢႆး ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0}ပၢႆး ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ၵွၵ်း</displayName>
+				<unitPattern count="other">{0}ၵွၵ်း</unitPattern>
+			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName>ၵွၵ်း ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0}ၵွၵ်း ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<displayName>ဢွၼ်းၼမ်ႉယၢင်ႇ</displayName>
+				<unitPattern count="other">{0}ဢွၼ်းၼမ်ႉယၢင်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>ၸေႃႉၵိၼ်ၶဝ်ႈ</displayName>
+				<unitPattern count="other">{0}ၸေႃႉၵိၼ်ၶဝ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>ၸေႃႉၼမ်ႉၼဵင်ႈ</displayName>
+				<unitPattern count="other">{0}ၸေႃႉၼမ်ႉၼဵင်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-barrel">
+				<displayName>ပႃႇရႄႇလ်</displayName>
+				<unitPattern count="other">{0}ပႃႇရႄႇလ်</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon">
+				<displayName>ၸေႃႉႁၢတ်ႈ</displayName>
+				<unitPattern count="other">{0}ၸေႃႉႁၢတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-dessert-spoon-imperial">
+				<displayName>ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0} ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="volume-drop">
+				<displayName>ယွတ်ႇ</displayName>
+				<unitPattern count="other">{0}ယွတ်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-dram">
+				<displayName>တရမ်ႇ</displayName>
+				<unitPattern count="other">{0}တရမ်ႇ</unitPattern>
+			</unit>
+			<unit type="volume-jigger">
+				<displayName>ၸိၵ်ႇၵႃႇ</displayName>
+				<unitPattern count="other">{0}ၸိၵ်ႇၵႃႇ</unitPattern>
+			</unit>
+			<unit type="volume-pinch">
+				<displayName>ယွပ်း</displayName>
+				<unitPattern count="other">{0}ယွပ်း</unitPattern>
+			</unit>
+			<unit type="volume-quart-imperial">
+				<displayName>ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ</displayName>
+				<unitPattern count="other">{0}ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ၶႃႇတႄႇလ်</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ၶူဝ်ႇလွမ်ႇ</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ၾႃႇရတ်ႉ</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ႁႅၼ်ႇရီႇ</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>သီႇမႅၼ်း</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ]</displayName>
+				<unitPattern count="other">{0}ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ]</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit-it">
+				<displayName>ပီႇထီႇယူႇ-ဢၢႆႇထီႇ</displayName>
+				<unitPattern count="other">{0}ပီႇထီႇယူႇ-ဢၢႆႇထီႇ</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ပႅၵ်ႉၶႄႇရႄႇလ်</displayName>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>သီႇဝႅတ်ႉ</displayName>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ၵရေး</displayName>
+				<unitPattern count="other">{0} ၵရေး</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း</displayName>
+				<unitPattern count="other">{0}ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName>ရွတ်ႉ</displayName>
+				<unitPattern count="other">{0}ရွတ်ႉ</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName>ၶျဵၼ်း</displayName>
+				<unitPattern count="other">{0}ၶျဵၼ်း</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>တႅတ်ႉသလႃႇ</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ဝႅပ်ႉပႃႇ</displayName>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName>ၽၢၵ်ႇလိူၼ်</displayName>
+				<unitPattern count="other">{0} ၽၢၵ်ႇလိူၼ်</unitPattern>
+			</unit>
+			<unit type="mass-slug">
+				<displayName>သလၢၵ်ႉ</displayName>
+				<unitPattern count="other">{0}သလၢၵ်ႉ</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName>ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ်</displayName>
+				<unitPattern count="other">{0}gas-equiv</unitPattern>
+			</unit>
+			<unit type="length-rin">
+				<displayName>ရိၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ရိၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-sun">
+				<displayName>သုၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0}သုၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-shaku-length">
+				<displayName>သျၵ်ၵု [ၵပ.]</displayName>
+				<unitPattern count="other">{0}သျၵ်ၵု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-shaku-cloth">
+				<displayName>သျၵ်ၵု [ၶူဝ်း၊ ၵပ.]</displayName>
+				<unitPattern count="other">{0}သျၵ်ၵု [ၶူဝ်း၊ ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-ken">
+				<displayName>ၵႅၼ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ၵႅၼ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-jo-jp">
+				<displayName>ၸူဝ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ၸူဝ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="length-ri-jp">
+				<displayName>ရီ [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ရီ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-bu-jp">
+				<displayName>ပု [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ပု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-se-jp">
+				<displayName>သႄ [ၵပ.]</displayName>
+				<unitPattern count="other">{0}သႄ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="area-cho">
+				<displayName>ၶျူဝ် [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ၶျူဝ် [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-kosaji">
+				<displayName>ၵူဝ်ၸႃးၵျိ [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ၵူဝ်ၸႃးၵျိ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-osaji">
+				<displayName>ဢူဝ်ၸႃးၵျိ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ဢူဝ်ၸႃးၵျိ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-cup-jp">
+				<displayName>ၵွပ်း [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵွပ်း [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-shaku">
+				<displayName>သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.]</displayName>
+				<unitPattern count="other">{0} သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-sai">
+				<displayName>သၢႆႉ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} သၢႆႉ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-to-jp">
+				<displayName>တူဝ်ႇ [ၵပ.]</displayName>
+				<unitPattern count="other">{0} တူဝ်ႇ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="volume-koku">
+				<displayName>ၵွၵ်ၵု [ၵပ.]</displayName>
+				<unitPattern count="other">{0} ၵွၵ်ၵု [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>လႅင်း</displayName>
+				<unitPattern count="other">{0} လႅင်း</unitPattern>
+			</unit>
+			<unit type="mass-fun">
+				<displayName>ၾုၼ်ႉ [ၵပ.]</displayName>
+				<unitPattern count="other">{0}ၾုၼ်ႉ [ၵပ.]</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>တတႁလ.</displayName>
+				<unitPattern count="other">{0}တတႁလ.</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName>ၶိုၼ်း</displayName>
+				<unitPattern count="other">{0} ၶိုၼ်း</unitPattern>
+				<perUnitPattern>{0}/ၶိုၼ်း</perUnitPattern>
+			</unit>
+			<coordinateUnit>
+				<displayName>မုင်ႈၼႃႈ</displayName>
+				<coordinateUnitPattern type="east">{0}ဢ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0}ႁ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0}ၸ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0}တ</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0} လႄႈ {1}</listPatternPart>
+			<listPatternPart type="2">{0} လႄႈ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0}၊ ႁိုဝ် {1}</listPatternPart>
+			<listPatternPart type="2">{0} ႁိုဝ် {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-narrow">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0}၊ ႁိုဝ် {1}</listPatternPart>
+			<listPatternPart type="2">{0} ႁိုဝ် {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0}၊ ႁိုဝ် {1}</listPatternPart>
+			<listPatternPart type="2">{0} ႁိုဝ် {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-narrow">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0} လႄႈ {1}</listPatternPart>
+			<listPatternPart type="2">{0} လႄႈ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0} လႄႈ {1}</listPatternPart>
+			<listPatternPart type="2">{0} လႄႈ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0} လႄႈ {1}</listPatternPart>
+			<listPatternPart type="2">{0} လႄႈ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0} လႄႈ {1}</listPatternPart>
+			<listPatternPart type="2">{0} လႄႈ {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-short">
+			<listPatternPart type="start">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="middle">{0}၊ {1}</listPatternPart>
+			<listPatternPart type="end">{0} လႄႈ {1}</listPatternPart>
+			<listPatternPart type="2">{0} လႄႈ {1}</listPatternPart>
+		</listPattern>
+	</listPatterns>
+	<characterLabels>
+		<characterLabelPattern type="all">{0} - တင်းမူတ်း</characterLabelPattern>
+		<characterLabelPattern type="compatibility">{0} - လွင်ႈငမ်ႇမႅၼ်ႈ</characterLabelPattern>
+		<characterLabelPattern type="enclosed">{0} - လွမ်ႉႁွပ်ႈ</characterLabelPattern>
+		<characterLabelPattern type="extended">{0} - မႄႇၶႂၢၵ်ႈ</characterLabelPattern>
+		<characterLabelPattern type="facing-left">{0} မုင်ႈသၢႆႉ</characterLabelPattern>
+		<characterLabelPattern type="facing-right">{0} မုင်ႈၶႂႃ</characterLabelPattern>
+		<characterLabelPattern type="historic">{0} — ၵိုၵ်းပိုၼ်း</characterLabelPattern>
+		<characterLabelPattern type="miscellaneous">{0} — တိတေႃႉ</characterLabelPattern>
+		<characterLabelPattern type="other">{0} — တၢင်ႇၸိူဝ်း</characterLabelPattern>
+		<characterLabelPattern type="scripts">သၶရိပ်ႉ — {0}</characterLabelPattern>
+		<characterLabelPattern type="strokes" count="other">{0} ႁွႆးမင်ႈ</characterLabelPattern>
+		<characterLabelPattern type="subscript">တူဝ်ႁွႆႈ {0}</characterLabelPattern>
+		<characterLabelPattern type="superscript">တူဝ်တၢင်ႇ {0}</characterLabelPattern>
+		<characterLabel type="activities">လွင်ႈတူင်ႉၼိုင်</characterLabel>
+		<characterLabel type="african_scripts">သၶရိပ်ႉဢႃႇၾရိၵၢၼ်ႇ</characterLabel>
+		<characterLabel type="american_scripts">သၶရိပ်ႉဢမႄႇရိၵၢၼ်ႇ</characterLabel>
+		<characterLabel type="animal">သတ်း</characterLabel>
+		<characterLabel type="animals_nature">သတ်း ႁိုဝ် သၽႃႇဝ</characterLabel>
+		<characterLabel type="arrows">ပိုၼ်ၵၢင်ႇ</characterLabel>
+		<characterLabel type="body">တူဝ်ၶိင်း</characterLabel>
+		<characterLabel type="box_drawing">ၸၼ်ႁၢင်ႈတိူၵ်ႈ</characterLabel>
+		<characterLabel type="braille">လိၵ်ႈတႃမွတ်ႇ</characterLabel>
+		<characterLabel type="building">ႁူင်းၵေႃႇသၢင်ႈ</characterLabel>
+		<characterLabel type="bullets_stars">ပူးလႅတ်ႉ ႁိုဝ် လၢဝ်</characterLabel>
+		<characterLabel type="consonantal_jamo">တူဝ်မႄႈလိၵ်ႈၵၢဝ်းလီ</characterLabel>
+		<characterLabel type="currency_symbols">တူဝ်မၢႆငိုၼ်း</characterLabel>
+		<characterLabel type="dash_connector">ၶိတ်ႇၵၢင် ႁိုဝ် တူဝ်ၵွင်ႉသၢၼ်</characterLabel>
+		<characterLabel type="digits">တူဝ်ၼပ်ႉ</characterLabel>
+		<characterLabel type="dingbats">တိင်းပႅတ်ႉ</characterLabel>
+		<characterLabel type="divination_symbols">တူဝ်မၢႆၵႃႇလႃး</characterLabel>
+		<characterLabel type="downwards_arrows">ပိုၼ်ၸီႉလူင်း</characterLabel>
+		<characterLabel type="downwards_upwards_arrows">ပိုၼ်ၸီႉၶိုၼ်ႈၸီႉလူင်း</characterLabel>
+		<characterLabel type="east_asian_scripts">သၶရိပ်ႉ ၸၢဝ်းဢေးသျႃးပွတ်းဢွၵ်ႇ</characterLabel>
+		<characterLabel type="emoji">ဢီႇမူဝ်းၵျိ</characterLabel>
+		<characterLabel type="european_scripts">သၶရိပ်ႉယူးရူပ်ႉ</characterLabel>
+		<characterLabel type="female">ယိင်း</characterLabel>
+		<characterLabel type="flag">ၸွမ်ပိဝ်</characterLabel>
+		<characterLabel type="flags">ၸွမ်ပိဝ်</characterLabel>
+		<characterLabel type="food_drink">တၢင်းၵိၼ်တၢင်းယႅမ်ႉ</characterLabel>
+		<characterLabel type="format">ပိူင်တမ်း</characterLabel>
+		<characterLabel type="format_whitespace">ပိူင်တမ်း လႄႈ လွၵ်းပဝ်ႇ</characterLabel>
+		<characterLabel type="full_width_form_variant">ပိူင်ပႅၵ်ႇတူဝ်တဵမ်</characterLabel>
+		<characterLabel type="geometric_shapes">ၽၢင်ႁၢင်ႈၵျေႃႇမႅတ်ႇထရီႇ</characterLabel>
+		<characterLabel type="half_width_form_variant">ပိူင်ပႅၵ်ႇၶိုင်ႈတူဝ်</characterLabel>
+		<characterLabel type="han_characters">တူဝ်မႄႈလိၵ်ႈႁၢၼ်ႉ</characterLabel>
+		<characterLabel type="han_radicals">ငိူၼ်ႈငဝ်ႈႁၢၼ်ႉ</characterLabel>
+		<characterLabel type="hanja">ႁၢၼ်ႉၸႃႉ</characterLabel>
+		<characterLabel type="hanzi_simplified">ႁၢၼ်ႉၸိုဝ်ႉ (ပၢၼ်မႂ်ႇ)</characterLabel>
+		<characterLabel type="hanzi_traditional">ႁၢၼ်ႉၸိုဝ်ႉ (ပၢၼ်ၵဝ်ႇ)</characterLabel>
+		<characterLabel type="heart">ႁူဝ်ၸႂ်</characterLabel>
+		<characterLabel type="historic_scripts">သၶရိပ်ႉၵိုၵ်းပိုၼ်း</characterLabel>
+		<characterLabel type="ideographic_desc_characters">ဢၵ်ႉၶရႃႇၸိူဝ်းပဵၼ်တူဝ်တႅၼ်း ပၢႆးဝူၼ်ႉ</characterLabel>
+		<characterLabel type="japanese_kana">ၶႃႉၼႃႉၵျႃႇပၢၼ်ႇ</characterLabel>
+		<characterLabel type="kanbun">ၶၢၼ်းပုၼ်</characterLabel>
+		<characterLabel type="kanji">ၶၢၼ်းၵျိ</characterLabel>
+		<characterLabel type="keycap">ၼဵၼ်ၼဵၵ်း</characterLabel>
+		<characterLabel type="leftwards_arrows">ပိုၼ်ဝၢႆႇသၢႆႉ</characterLabel>
+		<characterLabel type="leftwards_rightwards_arrows">ပိုၼ်ဝၢႆႇသၢႆႉဝၢႆႇၶႂႃ</characterLabel>
+		<characterLabel type="letterlike_symbols">တူဝ်မၢႆမိူၼ်တူဝ်လိၵ်ႈ</characterLabel>
+		<characterLabel type="limited_use">ၸႂ်ႉတိုဝ်းဢၼ်မၵ်းၶၼ်ႈ</characterLabel>
+		<characterLabel type="male">ၸၢႆး</characterLabel>
+		<characterLabel type="math_symbols">တူဝ်မၢႆပၢႆးၼပ်ႉ</characterLabel>
+		<characterLabel type="middle_eastern_scripts">တူဝ်လိၵ်ႈပွတ်းဢွၵ်ႇတွၼ်ႈၵၢင်</characterLabel>
+		<characterLabel type="miscellaneous">တိတေႃႉ</characterLabel>
+		<characterLabel type="modern_scripts">သၶရိပ်ႉပၢၼ်မႂ်ႇ</characterLabel>
+		<characterLabel type="modifier">တူဝ်ၵမ်ႉ</characterLabel>
+		<characterLabel type="musical_symbols">တူဝ်မၢႆၽဵင်း</characterLabel>
+		<characterLabel type="nature">သၽႃႇဝ</characterLabel>
+		<characterLabel type="nonspacing">ဢမ်ႇၶႅၼ်ႈပဝ်ႇ</characterLabel>
+		<characterLabel type="numbers">မၢႆၼပ်ႉ</characterLabel>
+		<characterLabel type="objects">ၶူဝ်းၶွင်</characterLabel>
+		<characterLabel type="other">တၢင်ႇၸိူဝ်း</characterLabel>
+		<characterLabel type="paired">ဢၼ်ၵွင်ႉၵၼ်ဝႆႉ</characterLabel>
+		<characterLabel type="person">ၵူၼ်း</characterLabel>
+		<characterLabel type="phonetic_alphabet">ဢၵ်ႉၶရႃႇ ပၢႆးသဵင်</characterLabel>
+		<characterLabel type="pictographs">ၵရပ်ႉၼႄႁၢင်ႈ</characterLabel>
+		<characterLabel type="place">ဢွင်ႈတီႈ</characterLabel>
+		<characterLabel type="plant">တူၼ်ႈမႆႉ</characterLabel>
+		<characterLabel type="punctuation">တူဝ်တႅပ်းၶေႃႈၵႂၢမ်း</characterLabel>
+		<characterLabel type="rightwards_arrows">ပိုၼ်ဝၢႆႇၶႂႃ</characterLabel>
+		<characterLabel type="sign_standard_symbols">တီႈမၢႆတွင်း ႁိုဝ် တူဝ်မၢႆ</characterLabel>
+		<characterLabel type="small_form_variant">ပိူင်ပႅၵ်ႇဢွၼ်ႇ</characterLabel>
+		<characterLabel type="smiley">ႁၢင်ႈၼႃႈယုမ်ႉ</characterLabel>
+		<characterLabel type="smileys_people">ႁၢင်ႈၼႃႈယုမ်ႉ ႁိုဝ် ၵူၼ်း</characterLabel>
+		<characterLabel type="south_asian_scripts">သၶရိပ်ႉ ၸၢဝ်းဢေးသျႃးပွတ်းၸၢၼ်း</characterLabel>
+		<characterLabel type="southeast_asian_scripts">သၶရိပ်ႉ ၸၢဝ်းဢေးသျႃးၸဵင်ႇၸၢၼ်းဝၼ်းဢွၵ်ႇ</characterLabel>
+		<characterLabel type="spacing">ၶႅၼ်ႈပဝ်ႇ</characterLabel>
+		<characterLabel type="sport">ၵၢၼ်လဵၼ်ႈႁႅင်း</characterLabel>
+		<characterLabel type="symbols">တူဝ်မၢႆ</characterLabel>
+		<characterLabel type="technical_symbols">တူဝ်မၢႆ ပၢႆးထႅၵ်ႉၼိၵ်ႉ</characterLabel>
+		<characterLabel type="tone_marks">မၢႆတူၼ်းသဵင်</characterLabel>
+		<characterLabel type="travel">ဢွၵ်ႇတၢင်း</characterLabel>
+		<characterLabel type="travel_places">ဢွၵ်ႇတၢင်း ႁိုဝ် ဢွင်ႈတီႈ</characterLabel>
+		<characterLabel type="upwards_arrows">ပိုၼ်ဝၢႆႇၼိူဝ်</characterLabel>
+		<characterLabel type="variant_forms">ပိူင်ပႅၵ်ႇ</characterLabel>
+		<characterLabel type="vocalic_jamo">မႄႈၵပ်းငဝ်ႈၸမူဝ်ႇ</characterLabel>
+		<characterLabel type="weather">သၢႆငၢႆၾႃႉၽူၼ်</characterLabel>
+		<characterLabel type="western_asian_scripts">သၶရိပ်ႉ ၸၢဝ်းဢေးသျႃးပွတ်းတူၵ်း</characterLabel>
+		<characterLabel type="whitespace">လွၵ်းပဝ်ႇ</characterLabel>
+	</characterLabels>
+	<typographicNames>
+		<axisName type="ital">ၵိူင်း</axisName>
+		<axisName type="opsz">သႅၼ်းတူဝ်လိၵ်ႈ ႁႂ်းႁၼ်လီ</axisName>
+		<axisName type="slnt">ၸိူၼ်း</axisName>
+		<axisName type="wdth">တၢင်းၵႂၢင်ႈ</axisName>
+		<axisName type="wght">တၢင်းၼႃ</axisName>
+		<styleName type="ital" subtype="1">လဵၼ်ႈႁၢင်</styleName>
+		<styleName type="opsz" subtype="8">ၶေႃႈသပ်းလႅင်းၶႅပ်းႁၢင်ႈ</styleName>
+		<styleName type="opsz" subtype="12">လိၵ်ႈ</styleName>
+		<styleName type="opsz" subtype="18">လွင်ႈသႂ်ႇႁူဝ်ၶေႃႈ</styleName>
+		<styleName type="opsz" subtype="72">ၵၢၼ်ၼႄ</styleName>
+		<styleName type="opsz" subtype="144">ႁၢင်ႈပူဝ်ႇသ်တႃႇ</styleName>
+		<styleName type="slnt" subtype="-12">ၸိူၼ်းလင်</styleName>
+		<styleName type="slnt" subtype="0">တင်ႈသိုဝ်ႈ</styleName>
+		<styleName type="slnt" subtype="12">ၸိူၼ်းဝႆႉ</styleName>
+		<styleName type="slnt" subtype="24">တိူဝ်းၸိူၼ်း</styleName>
+		<styleName type="wdth" subtype="50">ဢၼ်သတ်ႉဝႆႉႁႅင်း</styleName>
+		<styleName type="wdth" subtype="62.5">ဢၼ်တိူဝ်းသတ်ႉဝႆႉႁႅင်း</styleName>
+		<styleName type="wdth" subtype="75">သတ်ႉဝႆႉ</styleName>
+		<styleName type="wdth" subtype="87.5">သတ်ႉဝႆႉၶိုင်ႈၼိုင်ႈ</styleName>
+		<styleName type="wdth" subtype="100">ပၵတိ</styleName>
+		<styleName type="wdth" subtype="112.5">ယၢၼ်ဝႆႉၶိုင်ႈၼိုင်ႈ</styleName>
+		<styleName type="wdth" subtype="125">ယၢၼ်ဝႆႉ</styleName>
+		<styleName type="wdth" subtype="150">တိူဝ်းယၢၼ်ဝႆႉ</styleName>
+		<styleName type="wdth" subtype="200">ယၢၼ်ဝႆႉႁႅင်း</styleName>
+		<styleName type="wght" subtype="100">မၢင်</styleName>
+		<styleName type="wght" subtype="200">တိူဝ်းသဝ်ႈ</styleName>
+		<styleName type="wght" subtype="300">သဝ်ႈ</styleName>
+		<styleName type="wght" subtype="350">သဝ်ႈၶိုင်ႈၼိုင်ႈ</styleName>
+		<styleName type="wght" subtype="380">ပပ်ႉ</styleName>
+		<styleName type="wght" subtype="400">ပိူင်ၵဝ်ႇ</styleName>
+		<styleName type="wght" subtype="500">ပၢၼ်ၵၢင်</styleName>
+		<styleName type="wght" subtype="600">ၼႃၶိုင်ႈၼိုင်ႈ</styleName>
+		<styleName type="wght" subtype="700">ၼႃ</styleName>
+		<styleName type="wght" subtype="800">ၼႃႁႅင်း</styleName>
+		<styleName type="wght" subtype="900">လမ်</styleName>
+		<styleName type="wght" subtype="950">လမ်ႁႅင်း</styleName>
+		<featureName type="afrc">ၵၢၼ်လေႃးထွၼ်ထႅဝ်တင်ႈ</featureName>
+		<featureName type="cpsp">လွင်ႈႁၢင်ႇ တူဝ်လိၵ်ႈယႂ်ႇ</featureName>
+		<featureName type="dlig">တၢင်းတိူၵ်ႈ ၵၢၼ်သွၼ်ႉ</featureName>
+		<featureName type="frac">လေႃးထွၼ်ၽႃႇၸဵင်ႇ</featureName>
+		<featureName type="lnum">တူဝ်ၼပ်ႉ ဢၼ်မီးၼိူဝ်ထႅဝ်</featureName>
+		<featureName type="onum">ႁၢင်ႈတူဝ်လိၵ်ႈမိူဝ်ႈၵွၼ်ႇ</featureName>
+		<featureName type="ordn">တူဝ်ၶပ်ႉမၢႆ</featureName>
+		<featureName type="pnum">တူဝ်ၼပ်ႉပုၼ်ႈတေႃႇ</featureName>
+		<featureName type="smcp">တူဝ်လိၵ်ႈလူင် သႅၼ်းလဵၵ်ႉ</featureName>
+		<featureName type="tnum">တူဝ်ၼပ်ႉဢၼ်ပဵၼ်လွၵ်းသဵၼ်ႈ</featureName>
+		<featureName type="zero">သုၼ်ထႅဝ်ၵိူင်း</featureName>
+	</typographicNames>
+	<personNames>
+		<nameOrderLocales order="givenFirst">und shn</nameOrderLocales>
+		<sampleName item="nativeG">
+			<nameField type="given">ၸႅၼ်ႇတေႇယႃႇ</nameField>
+		</sampleName>
+		<sampleName item="nativeGS">
+			<nameField type="given">ဢၢႆႇရိၼ်း</nameField>
+			<nameField type="surname">ဢႅတ်ႉလႃႇ</nameField>
+		</sampleName>
+		<sampleName item="nativeGGS">
+			<nameField type="given">မေႇရီႇသူး</nameField>
+			<nameField type="given2">ႁေးမိသျ်</nameField>
+			<nameField type="surname">ဝတ်ႉသၼ်ႇ</nameField>
+		</sampleName>
+		<sampleName item="nativeFull">
+			<nameField type="title">မိတ်ႇသတႃႇ</nameField>
+			<nameField type="given">ပႃႇထရမ်ႇ ဝီလ်ပႃႇၾူတ်ႉ</nameField>
+			<nameField type="given-informal">ပႃတီႇ</nameField>
+			<nameField type="given2">ႁႅၼ်ႇၼရီႇ ရေႃးပၢတ်ႉ</nameField>
+			<nameField type="surname-prefix">∅∅∅</nameField>
+			<nameField type="surname-core">ဝုတ်ႉသ်တႃႇ</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
+			<nameField type="generation">ၵျူႇၼီႇယႃႇ</nameField>
+			<nameField type="credentials">မေႃယႃ</nameField>
+		</sampleName>
+		<sampleName item="foreignG">
+			<nameField type="given">သိၼ်းပၢတ်ႉ</nameField>
+		</sampleName>
+		<sampleName item="foreignGS">
+			<nameField type="given">ၶေးတႃႇ</nameField>
+			<nameField type="surname">မူးလႃႇ</nameField>
+		</sampleName>
+		<sampleName item="foreignGGS">
+			<nameField type="given">ၸၸီးလီႇယႃႇ</nameField>
+			<nameField type="given2">ႁေးမိသျ်</nameField>
+			<nameField type="surname">သတူႇပႃႇ</nameField>
+		</sampleName>
+		<sampleName item="foreignFull">
+			<nameField type="title">ၶူးမေႃယႃ</nameField>
+			<nameField type="given">ဢေႇတႃႇ ၶူဝ်ႇၼီႇလီႇယႃႇ</nameField>
+			<nameField type="given-informal">ၼီးဢႄႇလ်</nameField>
+			<nameField type="given2">သီႇသႃႇ မႃႇတိၼ်ႇ</nameField>
+			<nameField type="surname-prefix">ဝွၼ်း</nameField>
+			<nameField type="surname-core">ပရူဝ်ႇလ်</nameField>
+			<nameField type="surname2">ၵွၼ်ႇၸႃႇလႅတ်ႉ တူဝ်ႇမိၼ်ႇၵူဝ်</nameField>
+			<nameField type="generation">ၵျူႇၼီႇယႃႇ</nameField>
+			<nameField type="credentials">မေႃယႃ</nameField>
+		</sampleName>
+	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/si.xml b/make/data/cldr/common/main/si.xml
index 6c2531cf14c..0c89e58b884 100644
--- a/make/data/cldr/common/main/si.xml
+++ b/make/data/cldr/common/main/si.xml
@@ -45,6 +45,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">අසර්බයිජාන්</language>
 			<language type="az" alt="short">අසීරී</language>
 			<language type="ba">බාෂ්කිර්</language>
+			<language type="bal">බලුචි</language>
 			<language type="ban">බැලිනීස්</language>
 			<language type="bas">බසා</language>
 			<language type="be">බෙලරුසියානු</language>
@@ -235,6 +236,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">බාෆියා</language>
 			<language type="ksh">කොලොග්නියන්</language>
 			<language type="ku">කුර්දි</language>
+			<language type="ku" menu="core">කුර්දි</language>
+			<language type="ku" menu="extension">කුර්මන්ජි</language>
 			<language type="kum">කුමික්</language>
 			<language type="kv">කොමි</language>
 			<language type="kw">කෝනීසියානු</language>
@@ -631,6 +634,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">චීනය</territory>
 			<territory type="CO">කොළොම්බියාව</territory>
 			<territory type="CP">ක්ලීපර්ටන් දූපත</territory>
+			<territory type="CQ">සාර්ක්</territory>
 			<territory type="CR">කොස්ටරිකාව</territory>
 			<territory type="CU">කියුබාව</territory>
 			<territory type="CV">කේප් වර්ඩ්</territory>
@@ -861,47 +865,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<subdivision type="gbwls">වේල්සය</subdivision>
 		</subdivisions>
 		<keys>
-			<key type="calendar">දින දර්ශනය</key>
+			<key type="calendar">දින දසුන</key>
 			<key type="cf">මුදල් ආකෘති</key>
 			<key type="collation">පෙළගැස්ම</key>
 			<key type="currency">විනිමය</key>
-			<key type="hc">පැය චක්‍රය</key>
+			<key type="em">ඉමොජි ඉදිරිපත් කිරීම</key>
+			<key type="hc">පැය චක්‍රය (12 එදිරිව 24)</key>
 			<key type="lb">පේළි කඩන විලාසය</key>
+			<key type="lw">වචන තුළ රේඛා බිඳීම්</key>
 			<key type="ms">මිනුම් ක්‍රමය</key>
 			<key type="numbers">ඉලක්කම්</key>
+			<key type="ss">කෙටි යෙදු. පසු වාක්‍ය බිඳීම</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist">බොදු දින දර්ශනය</type>
-			<type key="calendar" type="chinese">චීන දින දර්ශනය</type>
-			<type key="calendar" type="coptic">කොප්ටික් දින දර්ශනය</type>
-			<type key="calendar" type="dangi">ඩැන්ගී දින දර්ශනය</type>
-			<type key="calendar" type="ethiopic">ඉතියෝපියානු දින දර්ශනය</type>
-			<type key="calendar" type="ethiopic-amete-alem">ඉතියෝපික් ඇමේට් ඇලම් දින දර්ශනය</type>
-			<type key="calendar" type="gregorian">ග්‍රෙගරියානු දින දර්ශනය</type>
-			<type key="calendar" type="hebrew">හීබෲ දින දර්ශනය</type>
-			<type key="calendar" type="islamic">හිජ්රි දින දර්ශනය</type>
-			<type key="calendar" type="islamic-civil">හිජ්රි දින දර්ශනය (වගුව, සිවිල් වීර කාව්‍යය)</type>
-			<type key="calendar" type="islamic-umalqura">හිජ්රි දින දර්ශනය (උම් අල් කුරා)</type>
-			<type key="calendar" type="iso8601">අඑස්ඔ-8601 දින දර්ශනය</type>
-			<type key="calendar" type="japanese">ජපන් දින දර්ශනය</type>
-			<type key="calendar" type="persian">පර්සියානු දින දර්ශනය</type>
-			<type key="calendar" type="roc">මින්ගා දින දර්ශනය</type>
+			<type key="calendar" type="buddhist">බෞද්ධ දින දසුන</type>
+			<type key="calendar" type="buddhist" scope="core">බෞද්ධ</type>
+			<type key="calendar" type="chinese">චීන දින දසුන</type>
+			<type key="calendar" type="chinese" scope="core">චීන</type>
+			<type key="calendar" type="coptic">කොප්ටික් දින දසුන</type>
+			<type key="calendar" type="coptic" scope="core">කොප්ටික්</type>
+			<type key="calendar" type="dangi">ඩැන්ගී දින දසුන</type>
+			<type key="calendar" type="dangi" scope="core">ඩැන්ගී</type>
+			<type key="calendar" type="ethiopic">ඉතියෝපියානු දින දසුන</type>
+			<type key="calendar" type="ethiopic" scope="core">ඉතියෝපියානු</type>
+			<type key="calendar" type="ethiopic-amete-alem">ඉතියෝපියානු ඇමෙට් ඇලෙම් දින දසුන</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ඉතියෝපියානු ඇමෙට් ඇලෙම්</type>
+			<type key="calendar" type="gregorian">ග්‍රෙගරියානු දින දසුන</type>
+			<type key="calendar" type="gregorian" scope="core">ග්‍රෙගරියානු</type>
+			<type key="calendar" type="hebrew">හීබෲ දින දසුන</type>
+			<type key="calendar" type="hebrew" scope="core">හීබෲ</type>
+			<type key="calendar" type="islamic">හිජ්රි දින දසුන</type>
+			<type key="calendar" type="islamic" scope="core">හිජ්රි</type>
+			<type key="calendar" type="islamic-civil">හිජ්රි දින දසුන (වගුව, සිවිල් වීර කාව්‍යය)</type>
+			<type key="calendar" type="islamic-civil" scope="core">හිජ්රි දින දසුන (වගුව, සිවිල් වීර කාව්‍යය)</type>
+			<type key="calendar" type="islamic-umalqura">හිජ්රි දින දසුන (උම් අල් කුරා)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">හිජ්රි (උම් අල් කුරා)</type>
+			<type key="calendar" type="iso8601">අයිඑස්ඕ-8601 දින දසුන</type>
+			<type key="calendar" type="japanese">ජපන් දින දසුන</type>
+			<type key="calendar" type="japanese" scope="core">ජපන්</type>
+			<type key="calendar" type="persian">පර්සියානු දින දසුන</type>
+			<type key="calendar" type="persian" scope="core">පර්සියානු</type>
+			<type key="calendar" type="roc">මින්ගා දින දසුන</type>
+			<type key="calendar" type="roc" scope="core">මින්ගා</type>
 			<type key="cf" type="account">ගිණුම්කරණ මුදල් ආකෘති</type>
+			<type key="cf" type="account" scope="core">ගිණුම්කරණය</type>
 			<type key="cf" type="standard">සම්මත මුදල් ආකෘති</type>
-			<type key="collation" type="dictionary">ශබ්දකෝෂ පෙළගැස්ම</type>
-			<type key="collation" type="ducet">යුනිකේත පෙරනිමි පෙළගැස්ම</type>
+			<type key="cf" type="standard" scope="core">සම්මත</type>
+			<type key="collation" type="dictionary">අකාරාදිය පෙළගැස්ම</type>
+			<type key="collation" type="dictionary" scope="core">අකාරාදිය</type>
+			<type key="collation" type="ducet">පෙරනිමි යුනිකේත පෙළගැස්ම</type>
+			<type key="collation" type="ducet" scope="core">පෙරනිමි යුනිකේත</type>
 			<type key="collation" type="search">සාමාන්‍ය සෙවීම</type>
+			<type key="collation" type="search" scope="core">සෙවීම</type>
 			<type key="collation" type="standard">සම්මත පෙළගැස්ම</type>
-			<type key="hc" type="h11">පැය 12 ක්‍රමය</type>
-			<type key="hc" type="h12">පැය 12 ක්‍රමය</type>
+			<type key="collation" type="standard" scope="core">සම්මත</type>
+			<type key="em" type="default" scope="core">පෙරනිමිය</type>
+			<type key="em" type="emoji" scope="core">ඉමොජි</type>
+			<type key="em" type="text" scope="core">පෙළ</type>
+			<type key="hc" type="h11">පැය 12 ක්‍රමය (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
+			<type key="hc" type="h12">පැය 12 ක්‍රමය (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">පැය 24 ක්‍රමය</type>
-			<type key="hc" type="h24">පැය 24 ක්‍රමය</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
+			<type key="hc" type="h24">පැය 24 ක්‍රමය (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ලිහිල් කඩන විලාසය</type>
+			<type key="lb" type="loose" scope="core">ලිහිල්</type>
 			<type key="lb" type="normal">සාමාන්‍ය පේළි කඩන විලාසය</type>
+			<type key="lb" type="normal" scope="core">සාමාන්‍ය</type>
 			<type key="lb" type="strict">තද පේළි කඩන විලාසය</type>
+			<type key="lb" type="strict" scope="core">දැඩි</type>
+			<type key="lw" type="breakall" scope="core">සියල්ල බිඳ දමන්න</type>
+			<type key="lw" type="keepall" scope="core">සියල්ල තබා ගන්න</type>
+			<type key="lw" type="normal" scope="core">සාමාන්‍ය</type>
+			<type key="lw" type="phrase" scope="core">වාක්‍ය ඛණ්ඩ තුළ තබා ගන්න</type>
 			<type key="ms" type="metric">මෙට්‍රික් ක්‍රමය</type>
+			<type key="ms" type="metric" scope="core">මෙට්‍රික්</type>
 			<type key="ms" type="uksystem">රාජකීය මිනුම් ක්‍රමය</type>
+			<type key="ms" type="uksystem" scope="core">එරා</type>
 			<type key="ms" type="ussystem">එජ මිනුම් ක්‍රමය</type>
+			<type key="ms" type="ussystem" scope="core">එජ</type>
 			<type key="numbers" type="arab">ඉන්දු අරාබි ඉලක්කම්</type>
 			<type key="numbers" type="arabext">වැඩි කළ ඉන්දු අරාබි ඉලක්කම්</type>
 			<type key="numbers" type="armn">ඇමරිකානු සංඛ්‍යාංකන</type>
@@ -942,6 +986,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">තායි ඉලක්කම්</type>
 			<type key="numbers" type="tibt">ටිබෙට ඉලක්කම්</type>
 			<type key="numbers" type="vaii">වායි ඉලක්කම්</type>
+			<type key="ss" type="none" scope="core">ක්‍රියාවිරහිතයි</type>
+			<type key="ss" type="standard" scope="core">ක්‍රියාත්මකයි</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">මෙට්රික්</measurementSystemName>
@@ -987,7 +1033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1028,12 +1074,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="h">a h</dateFormatItem>
 						<dateFormatItem id="hm">a h.mm</dateFormatItem>
 						<dateFormatItem id="hms">a h.mm.ss</dateFormatItem>
+						<dateFormatItem id="hv">v a h</dateFormatItem>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">M-d, E</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d E</dateFormatItem>
@@ -1116,62 +1165,90 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<months>
 					<monthContext type="format">
 						<monthWidth type="abbreviated">
-							<month type="1">ජන</month>
-							<month type="2">පෙබ</month>
-							<month type="3">මාර්තු</month>
-							<month type="4">අප්‍රේල්</month>
-							<month type="5">මැයි</month>
-							<month type="6">ජූනි</month>
-							<month type="7">ජූලි</month>
-							<month type="8">අගෝ</month>
-							<month type="9">සැප්</month>
-							<month type="10">ඔක්</month>
-							<month type="11">නොවැ</month>
-							<month type="12">දෙසැ</month>
+							<month type="1">දුරුතු</month>
+							<month type="2">නවම්</month>
+							<month type="3">මැදින්</month>
+							<month type="4">බක්</month>
+							<month type="5">වෙසක්</month>
+							<month type="6">පොසොන්</month>
+							<month type="7">ඇසළ</month>
+							<month type="8">නිකිණි</month>
+							<month type="9">බිනර</month>
+							<month type="10">වප්</month>
+							<month type="11">ඉල්</month>
+							<month type="12">උඳුවප්</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">දු</month>
+							<month type="2">න</month>
+							<month type="3">මැ</month>
+							<month type="4">බ</month>
+							<month type="5">වෙ</month>
+							<month type="6">පො</month>
+							<month type="7">ඇ</month>
+							<month type="8">නි</month>
+							<month type="9">බි</month>
+							<month type="10">ව</month>
+							<month type="11">ඉ</month>
+							<month type="12">උ</month>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">ජනවාරි</month>
-							<month type="2">පෙබරවාරි</month>
-							<month type="3">මාර්තු</month>
-							<month type="4">අප්‍රේල්</month>
-							<month type="5">මැයි</month>
-							<month type="6">ජූනි</month>
-							<month type="7">ජූලි</month>
-							<month type="8">අගෝස්තු</month>
-							<month type="9">සැප්තැම්බර්</month>
-							<month type="10">ඔක්තෝබර්</month>
-							<month type="11">නොවැම්බර්</month>
-							<month type="12">දෙසැම්බර්</month>
+							<month type="1">දුරුතු</month>
+							<month type="2">නවම්</month>
+							<month type="3">මැදින්</month>
+							<month type="4">බක්</month>
+							<month type="5">වෙසක්</month>
+							<month type="6">පොසොන්</month>
+							<month type="7">ඇසළ</month>
+							<month type="8">නිකිණි</month>
+							<month type="9">බිනර</month>
+							<month type="10">වප්</month>
+							<month type="11">ඉල්</month>
+							<month type="12">උඳුවප්</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
 						<monthWidth type="abbreviated">
-							<month type="1">ජන</month>
-							<month type="2">පෙබ</month>
-							<month type="3">මාර්</month>
-							<month type="4">අප්‍රේල්</month>
-							<month type="5">මැයි</month>
-							<month type="6">ජූනි</month>
-							<month type="7">ජූලි</month>
-							<month type="8">අගෝ</month>
-							<month type="9">සැප්</month>
-							<month type="10">ඔක්</month>
-							<month type="11">නොවැ</month>
-							<month type="12">දෙසැ</month>
+							<month type="1">දුරුතු</month>
+							<month type="2">නවම්</month>
+							<month type="3">මැදින්</month>
+							<month type="4">බක්</month>
+							<month type="5">වෙසක්</month>
+							<month type="6">පොසොන්</month>
+							<month type="7">ඇසළ</month>
+							<month type="8">නිකිණි</month>
+							<month type="9">බිනර</month>
+							<month type="10">වප්</month>
+							<month type="11">ඉල්</month>
+							<month type="12">උඳුවප්</month>
 						</monthWidth>
 						<monthWidth type="narrow">
-							<month type="1">ජ</month>
-							<month type="2">පෙ</month>
-							<month type="3">මා</month>
-							<month type="4">අ</month>
-							<month type="5">මැ</month>
-							<month type="6">ජූ</month>
-							<month type="7">ජූ</month>
-							<month type="8">අ</month>
-							<month type="9">සැ</month>
-							<month type="10">ඔ</month>
-							<month type="11">නෙ</month>
-							<month type="12">දෙ</month>
+							<month type="1">දු</month>
+							<month type="2">න</month>
+							<month type="3">මැ</month>
+							<month type="4">බ</month>
+							<month type="5">වෙ</month>
+							<month type="6">පො</month>
+							<month type="7">ඇ</month>
+							<month type="8">නි</month>
+							<month type="9">බි</month>
+							<month type="10">ව</month>
+							<month type="11">ඉ</month>
+							<month type="12">උ</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">දුරුතු</month>
+							<month type="2">නවම්</month>
+							<month type="3">මැදින්</month>
+							<month type="4">බක්</month>
+							<month type="5">වෙසක්</month>
+							<month type="6">පොසොන්</month>
+							<month type="7">ඇසළ</month>
+							<month type="8">නිකිණි</month>
+							<month type="9">බිනර</month>
+							<month type="10">වප්</month>
+							<month type="11">ඉල්</month>
+							<month type="12">උඳුවප්</month>
 						</monthWidth>
 					</monthContext>
 				</months>
@@ -1327,6 +1404,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} දින {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} දින {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1335,6 +1415,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} දින {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} දින {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1343,6 +1426,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1351,9 +1437,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">B h</dateFormatItem>
+						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
+						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
+						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h.mm</dateFormatItem>
 						<dateFormatItem id="EHm">E HH.mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h.mm.ss</dateFormatItem>
@@ -1363,10 +1459,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">a h.mm.ss</dateFormatItem>
 						<dateFormatItem id="Hms">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="hmsv">h.mm.ss a v</dateFormatItem>
-						<dateFormatItem id="Hmsv">HH.mm.ss v</dateFormatItem>
-						<dateFormatItem id="hmv">h.mm a v</dateFormatItem>
-						<dateFormatItem id="Hmv">HH.mm v</dateFormatItem>
+						<dateFormatItem id="hmsv">v a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hmsv">v HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="hmv">v a h.mm</dateFormatItem>
+						<dateFormatItem id="Hmv">v HH.mm</dateFormatItem>
+						<dateFormatItem id="hv">v a h</dateFormatItem>
+						<dateFormatItem id="Hv">v HH'h'</dateFormatItem>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">M-d, E</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMM d E</dateFormatItem>
@@ -1758,7 +1856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="minute">
-				<displayName>මිනිත්තුව</displayName>
+				<displayName>විනාඩිය</displayName>
 				<relative type="0">මෙම මිනිත්තුව</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">මිනිත්තු {0}කින්</relativeTimePattern>
@@ -1770,7 +1868,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="minute-short">
-				<displayName>මිනි.</displayName>
+				<displayName>විනා.</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName>විනා.</displayName>
 			</field>
 			<field type="second">
 				<displayName>තත්පරය</displayName>
@@ -1798,6 +1899,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HH.mm;-HH.mm</hourFormat>
 			<gmtFormat>ග්‍රිමවේ{0}</gmtFormat>
 			<gmtZeroFormat>ග්‍රිමවේ</gmtZeroFormat>
+			<gmtUnknownFormat>ග්‍රිමවේ+?</gmtUnknownFormat>
 			<regionFormat>{0} වේලාව</regionFormat>
 			<regionFormat type="daylight">{0} දිවාආලෝක වේලාව</regionFormat>
 			<regionFormat type="standard">{0} සම්මත වේලාව</regionFormat>
@@ -2154,6 +2256,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ඊස්ටර්</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>කොයිහයික්</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>පුන්ටා ඇරිනාස්</exemplarCity>
 			</zone>
@@ -2419,9 +2524,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>නොම් පෙන්</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>එන්ඩර්බරි</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>කැන්ටන්</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3091,9 +3193,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>බටහිර අප්‍රිකානු වේලාව</generic>
-					<standard>බටහිර අප්‍රිකානු සම්මත වේලාව</standard>
-					<daylight>බටහිර අප්‍රිකානු ග්‍රීෂ්ම කාලය</daylight>
+					<standard>බටහිර අප්‍රිකානු වේලාව</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3443,6 +3543,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ගයනා වේලාව</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>හවායි-අලෙයුතියාන් සම්මත වේලාව</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>හවායි-අලෙයුතියාන් වේලාව</generic>
@@ -4021,7 +4126,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4573,6 +4677,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>නැගෙනහිර කැරිබියානු ඩොලර්</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>කැරිබියානු ගිල්ඩර්</displayName>
+				<displayName count="one">කැරිබියානු ගිල්ඩර්</displayName>
+				<displayName count="other">කැරිබියානු ගිල්ඩර්ස්</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>සිෆ්එ ෆ්රෑන්ක් බිසීඊඑඔ</displayName>
 				<symbol>සිෆ්එ</symbol>
@@ -4597,6 +4706,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>සැම්බියානු ක්වාචා</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>සිම්බාබ්වේ රත්තරන්</displayName>
+				<displayName count="one">සිම්බාබ්වේ රත්තරන්</displayName>
+				<displayName count="other">සිම්බාබ්වේ රත්තරන්</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4604,7 +4718,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} පොතක් ඇත. එය කියවීමි.</pluralMinimalPairs>
 			<pluralMinimalPairs count="other">පොත් {0}ක් ඇත. ඒවා කියවීමි.</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other">{0} වන හැරවුම දකුණට</ordinalMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">{0} වෙනි දකුණට යන්න.</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
@@ -4774,7 +4888,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<displayName>අයිතම</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>කොටස</displayName>
+				<unitPattern count="one">කොටස {0}</unitPattern>
+				<unitPattern count="other">කොටස {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>මිලියනයට කොටස්</displayName>
 				<unitPattern count="one">මිලියනයට කොටස් {0}</unitPattern>
 				<unitPattern count="other">මිලියනයට කොටස් {0}</unitPattern>
@@ -4792,6 +4911,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} පර්මැරියඩ්</unitPattern>
 				<unitPattern count="other">{0} පර්මැරියඩ්</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ග්ලූකෝස්</displayName>
+				<unitPattern count="one">ග්ලූකෝස් {0}</unitPattern>
+				<unitPattern count="other">ග්ලූකෝස් {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>කිලෝ මීටරයට ලීටරය</displayName>
 				<unitPattern count="one">කිලෝ මීටරයට ලීටරය {0}</unitPattern>
@@ -5238,6 +5362,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">රසදිය මිලිමීටර {0}</unitPattern>
 				<unitPattern count="other">රසදිය මිලිමීටර {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>රසදිය</displayName>
+				<unitPattern count="one">රසදිය {0}</unitPattern>
+				<unitPattern count="other">රසදිය {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>වර්ග අඟලකට රාත්තල්</displayName>
 				<unitPattern count="one">වර්ග අඟලකට රාත්තල් {0}</unitPattern>
@@ -5399,6 +5528,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">මෙට්‍රික් කෝප්ප {0}</unitPattern>
 				<unitPattern count="other">මෙට්‍රික් කෝප්ප {0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>මෙට්‍රික් තරල අවුන්ස</displayName>
+				<unitPattern count="one">මෙට්‍රික් තරල අවුන්ස {0}</unitPattern>
+				<unitPattern count="other">මෙට්‍රික් තරල අවුන්ස {0}</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">අක්කර-අඩි {0}</unitPattern>
 				<unitPattern count="other">අක්කර-අඩි {0}</unitPattern>
@@ -5480,21 +5614,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ඉම්පීරියල් නැළිය</unitPattern>
 				<unitPattern count="other">ඉම්පීරියල් නැළි {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ස්ටරේඩියන</displayName>
+				<unitPattern count="one">ස්ටරේඩියන {0}</unitPattern>
+				<unitPattern count="other">ස්ටරේඩියන {0}</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>කැටල්</displayName>
+				<unitPattern count="one">කැටල් {0}</unitPattern>
+				<unitPattern count="other">කැටල් {0}</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>කූලෝම්බ්</displayName>
+				<unitPattern count="one">කූලෝම්බ් {0}</unitPattern>
+				<unitPattern count="other">කූලෝම්බ් {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ෆැරඩ</displayName>
+				<unitPattern count="one">ෆැරඩ {0}</unitPattern>
+				<unitPattern count="other">ෆැරඩ {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>හෙන්රි</displayName>
+				<unitPattern count="one">හෙන්රි {0}</unitPattern>
+				<unitPattern count="other">හෙන්රි {0}</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>සීමන්</displayName>
+				<unitPattern count="one">සීමන් {0}</unitPattern>
+				<unitPattern count="other">සීමන් {0}</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>කැලරි [IT]</displayName>
+				<unitPattern count="one">කැලරි [IT] {0}</unitPattern>
+				<unitPattern count="other">කැලරි [IT] {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>බෙකරල්</displayName>
+				<unitPattern count="one">බෙකරල් {0}</unitPattern>
+				<unitPattern count="other">බෙකරල් {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>සීවර්ට්</displayName>
+				<unitPattern count="one">සීවර්ට් {0}</unitPattern>
+				<unitPattern count="other">සීවර්ට් {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>අළු</displayName>
+				<unitPattern count="one">අළු {0}</unitPattern>
+				<unitPattern count="other">අළු {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>කිලෝග්‍රෑම්-බලය</displayName>
+				<unitPattern count="one">කිලෝග්‍රෑම්-බලය {0}</unitPattern>
+				<unitPattern count="other">කිලෝග්‍රෑම්-බලය {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ටෙස්ලා</displayName>
+				<unitPattern count="one">ටෙස්ලා {0}</unitPattern>
+				<unitPattern count="other">ටෙස්ලා {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>වේබර</displayName>
+				<unitPattern count="one">වේබරය {0}</unitPattern>
+				<unitPattern count="other">වේබරය {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ආලෝකය</displayName>
 				<unitPattern count="one">{0} ආලෝකය</unitPattern>
 				<unitPattern count="other">ආලෝකය {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>බිලියනයකට කොටස්</displayName>
 				<unitPattern count="one">බිලියනයකට කොටස් {0}</unitPattern>
 				<unitPattern count="other">බිලියනයකට කොටස් {0}</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>රාත්‍රිය</displayName>
 				<unitPattern count="one">{0} රාත්‍රිය</unitPattern>
 				<unitPattern count="other">රාත්‍රිය {0}</unitPattern>
-				<perUnitPattern>{0}/රාත්‍රිය</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>කාර්ඩිනල් දිශාව</displayName>
@@ -5702,7 +5898,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} අයිතමයක්</unitPattern>
 				<unitPattern count="other">අයිතම {0}ක්</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>කොටස</displayName>
+				<unitPattern count="one">කොටස {0}</unitPattern>
+				<unitPattern count="other">කොටස {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>කොටස්/මිලියනය</displayName>
 				<unitPattern count="one">{0} මිලිකො</unitPattern>
 				<unitPattern count="other">{0} මිලිකො</unitPattern>
@@ -5718,6 +5919,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} මවුල</unitPattern>
 				<unitPattern count="other">{0} මවුල</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ග්ලූකෝ</displayName>
+				<unitPattern count="one">ග්ලූකෝ {0}</unitPattern>
+				<unitPattern count="other">ග්ලූකෝ {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ලීටරය/කිමී</displayName>
 				<unitPattern count="one">ලී/කිමී {0}</unitPattern>
@@ -6229,6 +6435,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">ර මිමී {0}</unitPattern>
 				<unitPattern count="other">ර මිමී {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ර</displayName>
+				<unitPattern count="one">ර {0}</unitPattern>
+				<unitPattern count="other">ර {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>වඅරා</displayName>
 				<unitPattern count="one">වඅරා {0}</unitPattern>
@@ -6402,6 +6613,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">මෙකෝ {0}</unitPattern>
 				<unitPattern count="other">මෙකෝ {0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>මෙට්‍රි තර අවු.</displayName>
+				<unitPattern count="one">මෙට්‍රි තර අවු. {0}</unitPattern>
+				<unitPattern count="other">මෙට්‍රි තර අවු. {0}</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>අක්කර-අඩි</displayName>
 				<unitPattern count="one">අක්-අඩි {0}</unitPattern>
@@ -6499,12 +6715,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">ඉම්පීරියල් නැළි {0}</unitPattern>
 				<unitPattern count="other">ඉම්පීරියල් නැළි {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ස්ට</displayName>
+				<unitPattern count="one">ස්ට {0}</unitPattern>
+				<unitPattern count="other">ස්ට {0}</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>කැට</displayName>
+				<unitPattern count="one">කැට {0}</unitPattern>
+				<unitPattern count="other">කැට {0}</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>කූ</displayName>
+				<unitPattern count="one">කූ {0}</unitPattern>
+				<unitPattern count="other">කූ {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ෆැ</displayName>
+				<unitPattern count="one">ෆැ {0}</unitPattern>
+				<unitPattern count="other">ෆැ {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>හෙ</displayName>
+				<unitPattern count="one">හෙ {0}</unitPattern>
+				<unitPattern count="other">හෙ {0}</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>සී</displayName>
+				<unitPattern count="one">සී {0}</unitPattern>
+				<unitPattern count="other">සී {0}</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>කැල [IT]</displayName>
+				<unitPattern count="one">කැල [IT] {0}</unitPattern>
+				<unitPattern count="other">කැල [IT] {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>බෙක</displayName>
+				<unitPattern count="one">බෙක {0}</unitPattern>
+				<unitPattern count="other">බෙක {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>සීව</displayName>
+				<unitPattern count="one">සීව {0}</unitPattern>
+				<unitPattern count="other">සීව {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>අළු</displayName>
+				<unitPattern count="one">අළු {0}</unitPattern>
+				<unitPattern count="other">අළු {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>කිග්‍රෑබ</displayName>
+				<unitPattern count="one">කිග්‍රෑබ {0}</unitPattern>
+				<unitPattern count="other">කිග්‍රෑබ {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ටෙ</displayName>
+				<unitPattern count="one">ටෙ {0}</unitPattern>
+				<unitPattern count="other">ටෙ {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>වේබ</displayName>
+				<unitPattern count="one">වේබ {0}</unitPattern>
+				<unitPattern count="other">වේබ {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ආලෝකය</displayName>
 				<unitPattern count="one">ආලෝකය {0}</unitPattern>
 				<unitPattern count="other">ආලෝකය {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>කොටස්/බිලියනය</displayName>
 				<unitPattern count="one">බිකො {0}</unitPattern>
 				<unitPattern count="other">බිකො {0}</unitPattern>
@@ -6608,7 +6889,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}වඅඟ²</unitPattern>
 				<perUnitPattern>{0}/වඅඟ²</perUnitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>කොටස</displayName>
+				<unitPattern count="one">කොටස {0}</unitPattern>
+				<unitPattern count="other">කොටස {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>මිලිකො</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6617,6 +6903,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ග්ලූ</displayName>
+				<unitPattern count="one">ග්ලූ {0}</unitPattern>
+				<unitPattern count="other">ග්ලූ {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">ලී/කිමී100 {0}</unitPattern>
 				<unitPattern count="other">ලී/කිමී100 {0}</unitPattern>
@@ -6744,6 +7035,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">ඇ {0}</unitPattern>
 				<unitPattern count="other">ඇ {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ර</displayName>
+				<unitPattern count="one">ර {0}</unitPattern>
+				<unitPattern count="other">ර {0}</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>&quot; ර</displayName>
 				<unitPattern count="one">ර {0}&quot;</unitPattern>
@@ -6753,10 +7049,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">මි.බා. {0}</unitPattern>
 				<unitPattern count="other">මි.බා. {0}</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
-			</unit>
 			<unit type="speed-meter-per-second">
 				<displayName>මී/තත්</displayName>
 			</unit>
@@ -6785,24 +7077,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cubic-inch">
 				<displayName>අල්³</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>මෙ ත අ.</displayName>
+				<unitPattern count="one">මෙ ත අ. {0}</unitPattern>
+				<unitPattern count="other">මෙ ත අ. {0}</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>ඉම්පී. අතුරුපස හැඳි</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ආලෝකය</displayName>
-				<unitPattern count="one">ආලෝකය {0}</unitPattern>
-				<unitPattern count="other">ආලෝකය {0}</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ස්ට</displayName>
+				<unitPattern count="one">ස්ට {0}</unitPattern>
+				<unitPattern count="other">ස්ට {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>කැට</displayName>
+				<unitPattern count="one">කැට {0}</unitPattern>
+				<unitPattern count="other">කැට {0}</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>කූ</displayName>
+				<unitPattern count="one">කූ {0}</unitPattern>
+				<unitPattern count="other">කූ {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ෆැ</displayName>
+				<unitPattern count="one">ෆැ {0}</unitPattern>
+				<unitPattern count="other">ෆැ {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>හෙ</displayName>
+				<unitPattern count="one">හෙ {0}</unitPattern>
+				<unitPattern count="other">හෙ {0}</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>සී</displayName>
+				<unitPattern count="one">සී {0}</unitPattern>
+				<unitPattern count="other">සී {0}</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>කැ [IT]</displayName>
+				<unitPattern count="one">කැ [IT] {0}</unitPattern>
+				<unitPattern count="other">කැ [IT] {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>බෙක</displayName>
+				<unitPattern count="one">බෙක {0}</unitPattern>
+				<unitPattern count="other">බෙක {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>සීව</displayName>
+				<unitPattern count="one">සීව {0}</unitPattern>
+				<unitPattern count="other">සීව {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>අළු</displayName>
+				<unitPattern count="one">අළු {0}</unitPattern>
+				<unitPattern count="other">අළු {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>කිග්‍රෑබ</displayName>
+				<unitPattern count="one">කිග්‍රෑබ {0}</unitPattern>
+				<unitPattern count="other">කිග්‍රෑබ {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ටෙ</displayName>
+				<unitPattern count="one">ටෙ {0}</unitPattern>
+				<unitPattern count="other">ටෙ {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>වේබ</displayName>
+				<unitPattern count="one">වේබ {0}</unitPattern>
+				<unitPattern count="other">වේබ {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>බිකො</displayName>
-				<unitPattern count="one">බිකො {0}</unitPattern>
-				<unitPattern count="other">බිකො {0}</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>රාත්‍රිය</displayName>
-				<unitPattern count="one">රාත්‍රිය {0}</unitPattern>
-				<unitPattern count="other">රාත්‍රිය {0}</unitPattern>
-				<perUnitPattern>{0}/රාත්‍රිය</perUnitPattern>
 			</unit>
 		</unitLength>
 		<durationUnit type="hm">
diff --git a/make/data/cldr/common/main/sk.xml b/make/data/cldr/common/main/sk.xml
index 735603fd65d..45331d5c8ae 100644
--- a/make/data/cldr/common/main/sk.xml
+++ b/make/data/cldr/common/main/sk.xml
@@ -288,6 +288,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kolínčina</language>
 			<language type="ku">kurdčina</language>
+			<language type="ku" menu="core">kurdčina</language>
+			<language type="ku" menu="extension">kurmandži</language>
 			<language type="kum">kumyčtina</language>
 			<language type="kut">kutenajčina</language>
 			<language type="kv">komijčina</language>
@@ -749,6 +751,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Čína</territory>
 			<territory type="CO">Kolumbia</territory>
 			<territory type="CP">Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kapverdy</territory>
@@ -995,33 +998,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">číselné radenie</key>
 			<key type="colStrength">sila radenia</key>
 			<key type="currency">mena</key>
+			<key type="em">prezentácia emodži</key>
 			<key type="hc">hodinový cyklus (12 vs 24)</key>
 			<key type="lb">štýl koncov riadka</key>
+			<key type="lw">zlom riadka v slovách</key>
 			<key type="ms">merná sústava</key>
 			<key type="numbers">čísla</key>
+			<key type="ss">veta po skrat.</key>
 			<key type="timezone">časové pásmo</key>
 			<key type="va">variant miestneho nastavenia</key>
 			<key type="x">súkromné použitie</key>
 		</keys>
 		<types>
-			<type key="calendar" type="buddhist">buddhistický kalendár</type>
+			<type key="calendar" type="buddhist">budhistický kalendár</type>
+			<type key="calendar" type="buddhist" scope="core">budhistický</type>
 			<type key="calendar" type="chinese">čínsky kalendár</type>
+			<type key="calendar" type="chinese" scope="core">čínsky</type>
 			<type key="calendar" type="coptic">koptský kalendár</type>
+			<type key="calendar" type="coptic" scope="core">koptský</type>
 			<type key="calendar" type="dangi">kórejský kalendár</type>
+			<type key="calendar" type="dangi" scope="core">kórejský</type>
 			<type key="calendar" type="ethiopic">etiópsky kalendár</type>
+			<type key="calendar" type="ethiopic" scope="core">etiópsky</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiópsky kalendár Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiópsky Amete Alem</type>
 			<type key="calendar" type="gregorian">gregoriánsky kalendár</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriánsky</type>
 			<type key="calendar" type="hebrew">židovský kalendár</type>
+			<type key="calendar" type="hebrew" scope="core">židovský</type>
 			<type key="calendar" type="indian" draft="contributed">Indický národný kalendár</type>
 			<type key="calendar" type="islamic">kalendár podľa hidžry</type>
+			<type key="calendar" type="islamic" scope="core">podľa hidžry</type>
 			<type key="calendar" type="islamic-civil">kalendár podľa hidžry (občiansky)</type>
+			<type key="calendar" type="islamic-civil" scope="core">podľa hidžry (občiansky)</type>
 			<type key="calendar" type="islamic-umalqura">kalendár podľa hidžry (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">podľa hidžry (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">kalendár ISO 8601</type>
 			<type key="calendar" type="japanese">japonský kalendár</type>
+			<type key="calendar" type="japanese" scope="core">japonský</type>
 			<type key="calendar" type="persian">perzský kalendár</type>
+			<type key="calendar" type="persian" scope="core">perzský</type>
 			<type key="calendar" type="roc">čínsky republikánsky kalendár</type>
+			<type key="calendar" type="roc" scope="core">čínsky republikánsky</type>
 			<type key="cf" type="account">účtovný formát meny</type>
+			<type key="cf" type="account" scope="core">účtovný</type>
 			<type key="cf" type="standard">štandardný formát meny</type>
+			<type key="cf" type="standard" scope="core">štandardný</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Radiť symboly</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Pri radení ignorovať symboly</type>
 			<type key="colBackwards" type="no" draft="contributed">Normálne radenie akcentov</type>
@@ -1031,22 +1053,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Najprv radiť veľké písmená</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Pri radení nerozlišovať veľké a malé písmená</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Pri radení rozlišovať veľké a malé písmená</type>
-			<type key="collation" type="big5han">tradičné čínske zoradenie – Big5</type>
 			<type key="collation" type="compat">predchádzajúce zoradenie, kompatibilita</type>
+			<type key="collation" type="compat" scope="core">kompatibilita</type>
 			<type key="collation" type="dictionary">slovníkové zoradenie</type>
+			<type key="collation" type="dictionary" scope="core">slovníkové</type>
 			<type key="collation" type="ducet">predvolené zoradenie unicode</type>
+			<type key="collation" type="ducet" scope="core">predvolené, unicode</type>
 			<type key="collation" type="eor" draft="contributed">európske zoradenie</type>
-			<type key="collation" type="gb2312han">zjednodušené čínske zoradenie – GB2312</type>
 			<type key="collation" type="phonebook">lexikografické zoradenie</type>
+			<type key="collation" type="phonebook" scope="core">lexikografické</type>
 			<type key="collation" type="phonetic">fonetické zoradenie</type>
+			<type key="collation" type="phonetic" scope="core">fonetické</type>
 			<type key="collation" type="pinyin">zoradenie pchin-jin</type>
+			<type key="collation" type="pinyin" scope="core">pchin-jin</type>
 			<type key="collation" type="search">všeobecné vyhľadávanie</type>
+			<type key="collation" type="search" scope="core">vyhľadávanie</type>
 			<type key="collation" type="searchjl" draft="contributed">Hľadať podľa počiatočnej spoluhlásky písma Hangul</type>
 			<type key="collation" type="standard">štandardné zoradenie</type>
+			<type key="collation" type="standard" scope="core">štandardné</type>
 			<type key="collation" type="stroke">zoradenie podľa ťahov</type>
+			<type key="collation" type="stroke" scope="core">podľa ťahov</type>
 			<type key="collation" type="traditional">tradičné poradie zoradenia</type>
+			<type key="collation" type="traditional" scope="core">tradičné</type>
 			<type key="collation" type="unihan">zoradenie podľa znakov radikál</type>
+			<type key="collation" type="unihan" scope="core">podľa znakov radikál</type>
 			<type key="collation" type="zhuyin">zoradenie zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Radiť bez normalizácie</type>
 			<type key="colNormalization" type="yes" draft="contributed">Radenie podľa normalizovaného kódovania Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Radiť číslice jednotlivo</type>
@@ -1059,18 +1091,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">celá šírka</type>
 			<type key="d0" type="hwidth">polovičná šírka</type>
 			<type key="d0" type="npinyin" draft="contributed">Číslice</type>
+			<type key="em" type="default" scope="core">predvolené</type>
+			<type key="em" type="emoji" scope="core">emodži</type>
+			<type key="em" type="text" scope="core">text</type>
 			<type key="hc" type="h11">12-hodinový cyklus (0 – 11)</type>
+			<type key="hc" type="h11" scope="core">12 (0 – 11)</type>
 			<type key="hc" type="h12">12-hodinový cyklus (1 – 12)</type>
+			<type key="hc" type="h12" scope="core">12 (1 – 12)</type>
 			<type key="hc" type="h23">24-hodinový cyklus (0 – 23)</type>
+			<type key="hc" type="h23" scope="core">24 (0 – 23)</type>
 			<type key="hc" type="h24">24-hodinový cyklus (1 – 24)</type>
+			<type key="hc" type="h24" scope="core">24 (1 – 24)</type>
 			<type key="lb" type="loose">voľný štýl koncov riadka</type>
+			<type key="lb" type="loose" scope="core">voľný</type>
 			<type key="lb" type="normal">bežný štýl koncov riadka</type>
+			<type key="lb" type="normal" scope="core">bežný</type>
 			<type key="lb" type="strict">presný štýl koncov riadka</type>
+			<type key="lb" type="strict" scope="core">presný</type>
+			<type key="lw" type="breakall" scope="core">zalomiť všetko</type>
+			<type key="lw" type="keepall" scope="core">ponechať všetko</type>
+			<type key="lw" type="normal" scope="core">bežné</type>
+			<type key="lw" type="phrase" scope="core">ponechať vo frázach</type>
 			<type key="m0" type="bgn">americká transliterácia BGN</type>
 			<type key="m0" type="ungegn">medzinárodná transliterácia GEGN</type>
 			<type key="ms" type="metric">metrická sústava</type>
+			<type key="ms" type="metric" scope="core">metrická</type>
 			<type key="ms" type="uksystem">britská merná sústava</type>
+			<type key="ms" type="uksystem" scope="core">britská</type>
 			<type key="ms" type="ussystem">americká merná sústava</type>
+			<type key="ms" type="ussystem" scope="core">americká</type>
 			<type key="numbers" type="arab">arabsko-indické číslice</type>
 			<type key="numbers" type="arabext">rozšírené arabsko-indické číslice</type>
 			<type key="numbers" type="armn">arménske číslice</type>
@@ -1115,6 +1164,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">tibetské číslice</type>
 			<type key="numbers" type="traditional" draft="contributed">Tradičné číslovky</type>
 			<type key="numbers" type="vaii">vaiské číslice</type>
+			<type key="ss" type="none" scope="core">vypnuté</type>
+			<type key="ss" type="standard" scope="core">zapnuté</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrický</measurementSystemName>
@@ -1154,9 +1205,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1281,12 +1329,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMMd">d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d. M. y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h', v</dateFormatItem>
 						<dateFormatItem id="M">M.</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
 						<dateFormatItem id="MEd">E d. M.</dateFormatItem>
@@ -1724,7 +1773,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMMd">d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMMMd">d. M. y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
@@ -1811,7 +1859,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E d. M. y – E d. M. y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1836,7 +1883,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">H:mm – H:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -2636,11 +2682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<regionFormat>časové pásmo {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="contributed">HST</generic>
-					<standard draft="contributed">HST</standard>
-					<daylight draft="contributed">HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2657,18 +2698,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kabul">
 				<exemplarCity>Kábul</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Syowa">
 				<exemplarCity>Šówa</exemplarCity>
 			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viedeň</exemplarCity>
 			</zone>
@@ -2690,24 +2725,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Brunei">
 				<exemplarCity>Brunej</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
 			<zone type="Indian/Cocos">
 				<exemplarCity>Kokosové ostrovy</exemplarCity>
 			</zone>
@@ -2723,9 +2740,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Shanghai">
 				<exemplarCity>Šanghaj</exemplarCity>
 			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Kostarika</exemplarCity>
 			</zone>
@@ -2741,9 +2755,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Praha</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Europe/Berlin">
 				<exemplarCity>Berlín</exemplarCity>
 			</zone>
@@ -2854,9 +2865,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Phnom Pénh</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komory</exemplarCity>
 			</zone>
@@ -2932,9 +2940,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldivy</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
 			<zone type="America/Bahia_Banderas">
 				<exemplarCity>Bahia Banderas</exemplarCity>
 			</zone>
@@ -2944,9 +2949,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kuching">
 				<exemplarCity>Kučing</exemplarCity>
 			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Káthmandu</exemplarCity>
 			</zone>
@@ -3019,9 +3021,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Riyadh">
 				<exemplarCity>Rijád</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Africa/Khartoum">
 				<exemplarCity>Chartúm</exemplarCity>
 			</zone>
@@ -3052,15 +3051,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damask</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kergueleny</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dušanbe</exemplarCity>
 			</zone>
@@ -3126,9 +3119,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>západoafrický čas</generic>
-					<standard>západoafrický štandardný čas</standard>
-					<daylight>západoafrický letný čas</daylight>
+					<standard>západoafrický čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3521,6 +3512,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>guyanský čas</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>havajsko-aleutský štandardný čas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>havajsko-aleutský čas</generic>
@@ -4158,10 +4154,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -6163,6 +6160,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">východokaribského dolára</displayName>
 				<displayName count="other">východokaribských dolárov</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibský gulden</displayName>
+				<displayName count="one">karibský gulden</displayName>
+				<displayName count="few">karibské guldeny</displayName>
+				<displayName count="many">karibského guldena</displayName>
+				<displayName count="other">karibských guldenov</displayName>
+				<symbol>Cg</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>SDR</displayName>
 			</currency>
@@ -6338,6 +6343,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">zimbabwianskeho dolára (1980 – 2008)</displayName>
 				<displayName count="other">zimbabwianskych dolárov (1980 – 2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabwiansky zlatý</displayName>
+				<displayName count="one">zimbabwiansky zlatý</displayName>
+				<displayName count="few">zimbabwianske zlaté</displayName>
+				<displayName count="many">zimbabwianskeho zlatého</displayName>
+				<displayName count="other">zimbabwianskych zlatých</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>zimbabwiansky dolár (2009)</displayName>
 				<displayName count="one">zimbabwiansky dolár (2009)</displayName>
@@ -7087,7 +7099,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} položkami</unitPattern>
 				<unitPattern count="other" case="locative">{0} položkách</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>častice</displayName>
+				<unitPattern count="one">{0} častica</unitPattern>
+				<unitPattern count="few">{0} častice</unitPattern>
+				<unitPattern count="many">{0} častice</unitPattern>
+				<unitPattern count="other">{0} častíc</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>milióntiny</displayName>
 				<unitPattern count="one">{0} milióntina</unitPattern>
@@ -7227,6 +7246,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} molmi</unitPattern>
 				<unitPattern count="other" case="locative">{0} moloch</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukózy</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>inanimate</gender>
 				<displayName>litre na kilometer</displayName>
@@ -9426,6 +9448,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} milimetrami ortuťového stĺpca</unitPattern>
 				<unitPattern count="other" case="locative">{0} milimetroch ortuťového stĺpca</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ortute</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libry sily na štvorcový palec</displayName>
 				<unitPattern count="one">{0} libra sily na štvorcový palec</unitPattern>
@@ -10178,6 +10203,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} metrickými hrnčekmi</unitPattern>
 				<unitPattern count="other" case="locative">{0} metrických hrnčekoch</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrické tekuté unce</displayName>
+				<unitPattern count="one">{0} metrická tekutá unca</unitPattern>
+				<unitPattern count="few">{0} metrické tekuté unce</unitPattern>
+				<unitPattern count="many">{0} metrickej tekutej unce</unitPattern>
+				<unitPattern count="other">{0} metrických tekutých uncí</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akrové stopy</displayName>
 				<unitPattern count="one">{0} akrová stopa</unitPattern>
@@ -10299,7 +10331,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} britského kvartu</unitPattern>
 				<unitPattern count="other">{0} britských kvartov</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradiány</displayName>
+				<unitPattern count="one">{0} steradián</unitPattern>
+				<unitPattern count="few">{0} steradiány</unitPattern>
+				<unitPattern count="many">{0} steradiánu</unitPattern>
+				<unitPattern count="other">{0} steradiánov</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>kataly</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} kataly</unitPattern>
+				<unitPattern count="many">{0} katalu</unitPattern>
+				<unitPattern count="other">{0} katalov</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomby</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="few">{0} coulomby</unitPattern>
+				<unitPattern count="many">{0} coulombu</unitPattern>
+				<unitPattern count="other">{0} coulombov</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farady</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farady</unitPattern>
+				<unitPattern count="many">{0} faradu</unitPattern>
+				<unitPattern count="other">{0} faradov</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="few">{0} henry</unitPattern>
+				<unitPattern count="many">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemensy</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="few">{0} siemensy</unitPattern>
+				<unitPattern count="many">{0} siemensu</unitPattern>
+				<unitPattern count="other">{0} siemensov</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalória [IT]</displayName>
+				<unitPattern count="one">{0} kalória [IT]</unitPattern>
+				<unitPattern count="few">{0} kalórie [IT]</unitPattern>
+				<unitPattern count="many">{0} kalórie [IT]</unitPattern>
+				<unitPattern count="other">{0} kalórií [IT]</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopondy</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="few">{0} kilopondy</unitPattern>
+				<unitPattern count="many">{0} kilopondu</unitPattern>
+				<unitPattern count="other">{0} kilopondov</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webery</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="few">{0} webery</unitPattern>
+				<unitPattern count="many">{0} weberu</unitPattern>
+				<unitPattern count="other">{0} weberov</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
 				<displayName>častice na miliardu</displayName>
 				<unitPattern count="one">{0} častica na miliardu</unitPattern>
@@ -10329,7 +10424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noci</displayName>
 				<unitPattern count="one">{0} noc</unitPattern>
 				<unitPattern count="one" case="accusative">{0} noc</unitPattern>
 				<unitPattern count="one" case="dative">noci</unitPattern>
@@ -10354,7 +10448,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} nocí</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} nocami</unitPattern>
 				<unitPattern count="other" case="locative">{0} nociach</unitPattern>
-				<perUnitPattern>{0}/noc</perUnitPattern>
 			</unit>
 		</unitLength>
 		<unitLength type="short">
@@ -10429,6 +10522,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -10711,6 +10807,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<displayName>mc</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m</displayName>
+				<unitPattern count="one">{0} fl oz m</unitPattern>
+				<unitPattern count="few">{0} fl oz m</unitPattern>
+				<unitPattern count="many">{0} fl oz m</unitPattern>
+				<unitPattern count="other">{0} fl oz m</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gal</displayName>
 				<unitPattern count="one">{0} gal</unitPattern>
@@ -10778,6 +10881,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} qt Imp</unitPattern>
 				<unitPattern count="other">{0} qt Imp</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="few">{0} kp</unitPattern>
+				<unitPattern count="many">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>noci</displayName>
 				<unitPattern count="one">{0} noc</unitPattern>
@@ -10808,6 +10921,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-acre">
 				<displayName>ac</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>l/100 km</displayName>
 			</unit>
@@ -10838,13 +10954,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} d.</unitPattern>
 				<perUnitPattern>{0}/d.</perUnitPattern>
 			</unit>
-			<unit type="force-kilowatt-hour-per-100-kilometer">
-				<displayName>kWh/100 km</displayName>
-				<unitPattern count="one">{0} kWh/100 km</unitPattern>
-				<unitPattern count="few">{0} kWh/100 km</unitPattern>
-				<unitPattern count="many">{0} kWh/100 km</unitPattern>
-				<unitPattern count="other">{0} kWh/100 km</unitPattern>
-			</unit>
 			<unit type="graphics-dot">
 				<displayName>bod</displayName>
 			</unit>
@@ -10866,13 +10975,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} mb</unitPattern>
 				<unitPattern count="other">{0} mb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>noci</displayName>
-				<unitPattern count="one">{0} noc</unitPattern>
-				<unitPattern count="few">{0} noci</unitPattern>
-				<unitPattern count="many">{0} noci</unitPattern>
-				<unitPattern count="other">{0} nocí</unitPattern>
-				<perUnitPattern>{0}/noc</perUnitPattern>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>fl oz m</displayName>
+				<unitPattern count="one">{0} fl oz m</unitPattern>
+				<unitPattern count="few">{0} fl oz m</unitPattern>
+				<unitPattern count="many">{0} fl oz m</unitPattern>
+				<unitPattern count="other">{0} fl oz m</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="few">{0} kp</unitPattern>
+				<unitPattern count="many">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/sl.xml b/make/data/cldr/common/main/sl.xml
index 9dfffbeee15..29a34200ee1 100644
--- a/make/data/cldr/common/main/sl.xml
+++ b/make/data/cldr/common/main/sl.xml
@@ -282,6 +282,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölnsko narečje</language>
 			<language type="ku">kurdščina</language>
+			<language type="ku" menu="core">kurdščina</language>
+			<language type="ku" menu="extension">kurmanščina</language>
 			<language type="kum">kumiščina</language>
 			<language type="kut">kutenajščina</language>
 			<language type="kv">komijščina</language>
@@ -759,7 +761,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="AT">Avstrija</territory>
 			<territory type="AU">Avstralija</territory>
 			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ålandski otoki</territory>
+			<territory type="AX">Alandski otoki</territory>
 			<territory type="AZ">Azerbajdžan</territory>
 			<territory type="BA">Bosna in Hercegovina</territory>
 			<territory type="BB">Barbados</territory>
@@ -770,7 +772,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="BH">Bahrajn</territory>
 			<territory type="BI">Burundi</territory>
 			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
+			<territory type="BL">Sveti Bartolomej</territory>
 			<territory type="BM">Bermudi</territory>
 			<territory type="BN">Brunej</territory>
 			<territory type="BO">Bolivija</territory>
@@ -798,6 +800,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kitajska</territory>
 			<territory type="CO">Kolumbija</territory>
 			<territory type="CP">Otok Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Zelenortski otoki</territory>
@@ -842,12 +845,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="GL">Grenlandija</territory>
 			<territory type="GM">Gambija</territory>
 			<territory type="GN">Gvineja</territory>
-			<territory type="GP">Guadeloupe</territory>
+			<territory type="GP">Gvadelup</territory>
 			<territory type="GQ">Ekvatorialna Gvineja</territory>
 			<territory type="GR">Grčija</territory>
 			<territory type="GS">Južna Georgia in Južni Sandwichevi otoki</territory>
 			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Guam</territory>
+			<territory type="GU">Gvam</territory>
 			<territory type="GW">Gvineja Bissau</territory>
 			<territory type="GY">Gvajana</territory>
 			<territory type="HK">Posebno upravno območje Ljudske republike Kitajske Hongkong</territory>
@@ -878,15 +881,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="KH">Kambodža</territory>
 			<territory type="KI">Kiribati</territory>
 			<territory type="KM">Komori</territory>
-			<territory type="KN">Saint Kitts in Nevis</territory>
+			<territory type="KN">Sveti Krištof in Nevis</territory>
 			<territory type="KP">Severna Koreja</territory>
 			<territory type="KR">Južna Koreja</territory>
 			<territory type="KW">Kuvajt</territory>
-			<territory type="KY">Kajmanski otoki</territory>
+			<territory type="KY">Kajmanji otoki</territory>
 			<territory type="KZ">Kazahstan</territory>
 			<territory type="LA">Laos</territory>
 			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lucia</territory>
+			<territory type="LC">Sveta Lucija</territory>
 			<territory type="LI">Lihtenštajn</territory>
 			<territory type="LK">Šrilanka</territory>
 			<territory type="LR">Liberija</territory>
@@ -899,21 +902,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="MC">Monako</territory>
 			<territory type="MD">Moldavija</territory>
 			<territory type="ME">Črna gora</territory>
-			<territory type="MF">Saint Martin</territory>
+			<territory type="MF">Francoski Sveti Martin</territory>
 			<territory type="MG">Madagaskar</territory>
 			<territory type="MH">Marshallovi otoki</territory>
 			<territory type="MK">Severna Makedonija</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Mjanmar (Burma)</territory>
 			<territory type="MN">Mongolija</territory>
-			<territory type="MO">Posebno upravno območje Ljudske republike Kitajske Macao</territory>
-			<territory type="MO" alt="short">Macao</territory>
+			<territory type="MO">Posebno upravno območje Kitajske Makav</territory>
+			<territory type="MO" alt="short">Makav</territory>
 			<territory type="MP">Severni Marianski otoki</territory>
 			<territory type="MQ">Martinik</territory>
 			<territory type="MR">Mavretanija</territory>
 			<territory type="MS">Montserrat</territory>
 			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
+			<territory type="MU">Mavricij</territory>
 			<territory type="MV">Maldivi</territory>
 			<territory type="MW">Malavi</territory>
 			<territory type="MX">Mehika</territory>
@@ -940,13 +943,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="PH">Filipini</territory>
 			<territory type="PK">Pakistan</territory>
 			<territory type="PL">Poljska</territory>
-			<territory type="PM">Saint Pierre in Miquelon</territory>
+			<territory type="PM">Sveta Peter in Mihael</territory>
 			<territory type="PN">Pitcairn</territory>
 			<territory type="PR">Portoriko</territory>
 			<territory type="PS">Palestinsko ozemlje</territory>
 			<territory type="PS" alt="short">Palestina</territory>
 			<territory type="PT">Portugalska</territory>
-			<territory type="PW">Palau</territory>
+			<territory type="PW">Palav</territory>
 			<territory type="PY">Paragvaj</territory>
 			<territory type="QA">Katar</territory>
 			<territory type="QO">Ostala oceanija</territory>
@@ -971,9 +974,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SO">Somalija</territory>
 			<territory type="SR">Surinam</territory>
 			<territory type="SS">Južni Sudan</territory>
-			<territory type="ST">Sao Tome in Principe</territory>
+			<territory type="ST">Sveti Tomaž in Princ</territory>
 			<territory type="SV">Salvador</territory>
-			<territory type="SX">Sint Maarten</territory>
+			<territory type="SX">Nizozemski Sveti Martin</territory>
 			<territory type="SY">Sirija</territory>
 			<territory type="SZ">Esvatini</territory>
 			<territory type="SZ" alt="variant">Svazi</territory>
@@ -984,7 +987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="TG">Togo</territory>
 			<territory type="TH">Tajska</territory>
 			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
+			<territory type="TK">Tokelav</territory>
 			<territory type="TL">Timor-Leste</territory>
 			<territory type="TL" alt="variant">Vzhodni Timor</territory>
 			<territory type="TM">Turkmenistan</territory>
@@ -1006,7 +1009,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="UY">Urugvaj</territory>
 			<territory type="UZ">Uzbekistan</territory>
 			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent in Grenadine</territory>
+			<territory type="VC">Sveti Vincencij in Grenadine</territory>
 			<territory type="VE">Venezuela</territory>
 			<territory type="VG">Britanski Deviški otoki</territory>
 			<territory type="VI">Ameriški Deviški otoki</territory>
@@ -1076,35 +1079,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Številsko razvrščanje</key>
 			<key type="colStrength">Moč razvrščanja</key>
 			<key type="currency">valuta</key>
+			<key type="em">Prikaz emodžija</key>
 			<key type="hc">urni prikaz (12 ali 24)</key>
 			<key type="lb">Slog preloma vrstic</key>
+			<key type="lw">Prelomi vrstic znotraj besed</key>
 			<key type="ms">merski sistem</key>
 			<key type="numbers">številke</key>
+			<key type="ss">Konec stavka po okrajšavi</key>
 			<key type="timezone">Časovni pas</key>
 			<key type="va">Različica območnih nastavitev</key>
 			<key type="x">Zasebna-uporaba</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistični koledar</type>
+			<type key="calendar" type="buddhist" scope="core">budistični</type>
 			<type key="calendar" type="chinese">kitajski koledar</type>
+			<type key="calendar" type="chinese" scope="core">kitajski</type>
 			<type key="calendar" type="coptic">koptski koledar</type>
+			<type key="calendar" type="coptic" scope="core">koptski</type>
 			<type key="calendar" type="dangi">stari korejski koledar</type>
+			<type key="calendar" type="dangi" scope="core">stari korejski</type>
 			<type key="calendar" type="ethiopic">etiopski koledar</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopski</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopsko ametsko alemski koledar</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopsko ametsko alemski</type>
 			<type key="calendar" type="gregorian">gregorijanski koledar</type>
+			<type key="calendar" type="gregorian" scope="core">gregorijanski</type>
 			<type key="calendar" type="hebrew">hebrejski koledar</type>
+			<type key="calendar" type="hebrew" scope="core">hebrejski</type>
 			<type key="calendar" type="indian">indijanski koledar</type>
 			<type key="calendar" type="islamic">islamski koledar</type>
+			<type key="calendar" type="islamic" scope="core">islamski</type>
 			<type key="calendar" type="islamic-civil">islamski civilni koledar</type>
+			<type key="calendar" type="islamic-civil" scope="core">islamski civilni</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">islamski koledar ( Saudova Arabija, opazovalni)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">islamski koledar (tabelarni, astronomska epoha)</type>
 			<type key="calendar" type="islamic-umalqura">islamski koledar Umm al-Qura</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islamski (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">koledar ISO-8601</type>
 			<type key="calendar" type="japanese">japonski koledar</type>
+			<type key="calendar" type="japanese" scope="core">japonski</type>
 			<type key="calendar" type="persian">perzijski koledar</type>
+			<type key="calendar" type="persian" scope="core">perzijski</type>
 			<type key="calendar" type="roc">koledar Minguo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">oblika zapisa valute v računovodstvu</type>
+			<type key="cf" type="account" scope="core">računovodska</type>
 			<type key="cf" type="standard">standardna oblika zapisa valute</type>
+			<type key="cf" type="standard" scope="core">standardna</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Razvrščanje simbolov</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Razvrščanje s prezrtjem simbolov</type>
 			<type key="colBackwards" type="no" draft="contributed">Navadno razvrščanje naglasov</type>
@@ -1114,23 +1136,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Razvrščanje velikih črk najprej</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Razvrščanje ne glede na velike/male črke</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Razvrščanje ob upoštevanju velikih/malih črk</type>
-			<type key="collation" type="big5han">razvrščanje po sistemu tradicionalne kitajščine - Big5</type>
 			<type key="collation" type="compat">prej uporabljeno razvrščanje za združljivost</type>
+			<type key="collation" type="compat" scope="core">združljivostno</type>
 			<type key="collation" type="dictionary">slovarsko razvrščanje</type>
-			<type key="collation" type="ducet">Privzeto razvrščanje Unicode</type>
+			<type key="collation" type="dictionary" scope="core">slovarsko</type>
+			<type key="collation" type="ducet">privzeto razvrščanje Unicode</type>
+			<type key="collation" type="ducet" scope="core">privzeto Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">razvrščanje čustvenčkov</type>
 			<type key="collation" type="eor" draft="contributed">evropska pravila razvrščanja</type>
-			<type key="collation" type="gb2312han">razvrščanje po sistemu poenostavljene kitajščine - GB2312</type>
 			<type key="collation" type="phonebook">razvrščanje po sistemu telefonskega imenika</type>
+			<type key="collation" type="phonebook" scope="core">po sistemu telefonskega imenika</type>
 			<type key="collation" type="phonetic">fonetično razvrščanje</type>
+			<type key="collation" type="phonetic" scope="core">fonetično</type>
 			<type key="collation" type="pinyin">razvrščanje po sistemu pinjin</type>
+			<type key="collation" type="pinyin" scope="core">po sistemu pinjin</type>
 			<type key="collation" type="search">Splošno iskanje</type>
+			<type key="collation" type="search" scope="core">splošno</type>
 			<type key="collation" type="searchjl" draft="contributed">Iskanje po začetnem soglasniku hangul</type>
-			<type key="collation" type="standard">Standardno razvrščanje</type>
+			<type key="collation" type="standard">standardno razvrščanje</type>
+			<type key="collation" type="standard" scope="core">standardno</type>
 			<type key="collation" type="stroke">razvrščanje po zaporedju pisanja pismenk</type>
+			<type key="collation" type="stroke" scope="core">po zaporedju pisanja pismenk</type>
 			<type key="collation" type="traditional">razvrščanje po tradicionalnem sistemu</type>
+			<type key="collation" type="traditional" scope="core">po tradicionalnem sistemu</type>
 			<type key="collation" type="unihan">razvrščanje po radikalih in potezah</type>
+			<type key="collation" type="unihan" scope="core">po radikalih in potezah</type>
 			<type key="collation" type="zhuyin">razvrščanje po pismenkah zhuyin</type>
+			<type key="collation" type="zhuyin" scope="core">po pismenkah zhuyin</type>
 			<type key="colNormalization" type="no" draft="contributed">Razvrščanje brez normaliziranja</type>
 			<type key="colNormalization" type="yes" draft="contributed">Normalizirano razvrščanje Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">Ločeno razvrščanje številk</type>
@@ -1143,18 +1175,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Polna širina</type>
 			<type key="d0" type="hwidth">Polovična širina</type>
 			<type key="d0" type="npinyin" draft="contributed">Številsko</type>
+			<type key="em" type="default" scope="core">privzeto</type>
+			<type key="em" type="emoji" scope="core">emodži</type>
+			<type key="em" type="text" scope="core">besedilo</type>
 			<type key="hc" type="h11">12-urni sistem (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-urni sistem (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-urni sistem (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-urni sistem (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Prosti slog preloma vrstic</type>
+			<type key="lb" type="loose" scope="core">Prosti slog</type>
 			<type key="lb" type="normal">Običajni slog preloma vrstic</type>
+			<type key="lb" type="normal" scope="core">Običajni slog</type>
 			<type key="lb" type="strict">Strogi slog preloma vrstic</type>
+			<type key="lb" type="strict" scope="core">Strogi slog</type>
+			<type key="lw" type="breakall" scope="core">prelomi vse</type>
+			<type key="lw" type="keepall" scope="core">obdrži vse</type>
+			<type key="lw" type="normal" scope="core">običajno</type>
+			<type key="lw" type="phrase" scope="core">obdrži v frazah</type>
 			<type key="m0" type="bgn">BGN</type>
 			<type key="m0" type="ungegn">UNGEGN</type>
 			<type key="ms" type="metric">metrični sistem</type>
+			<type key="ms" type="metric" scope="core">metrični</type>
 			<type key="ms" type="uksystem">imperialni merski sistem</type>
+			<type key="ms" type="uksystem" scope="core">ZK</type>
 			<type key="ms" type="ussystem">merski sistem Združenih držav</type>
+			<type key="ms" type="ussystem" scope="core">ZDA</type>
 			<type key="numbers" type="ahom" draft="contributed">števke ahom</type>
 			<type key="numbers" type="arab">arabskoindijske števke</type>
 			<type key="numbers" type="arabext">razširjene arabskoindijske števke</type>
@@ -1232,6 +1281,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="traditional" draft="contributed">Tradicionalne številke</type>
 			<type key="numbers" type="vaii">števke vai</type>
 			<type key="numbers" type="wara" draft="contributed">Warang Citi števke</type>
+			<type key="ss" type="none" scope="core">Izklopljeno</type>
+			<type key="ss" type="standard" scope="core">Vklopljeno</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrični</measurementSystemName>
@@ -1250,11 +1301,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="index">[A B C Č Ć D Đ E F G H I J K L M N O P Q R S Š T U V W X Y Z Ž]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[, . % ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‑ – , ; \: ! ? . … ' &quot;„‟ « » ( ) \[ \] \{ \} @ *]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[{&lt;&gt;\\|/#\&amp;}]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
 			<parseLenient sample="₹">[₹ {Rs}₨]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
@@ -1321,6 +1372,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ob' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ob' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1329,6 +1383,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ob' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ob' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1337,6 +1394,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1345,11 +1405,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
@@ -1357,10 +1422,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d. M. y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
@@ -1654,7 +1719,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="morning1">jut.</dayPeriod>
 							<dayPeriod type="morning2">dop.</dayPeriod>
 							<dayPeriod type="afternoon1">pop.</dayPeriod>
-							<dayPeriod type="evening1">zveč.</dayPeriod>
+							<dayPeriod type="evening1">več.</dayPeriod>
 							<dayPeriod type="night1">noč</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
@@ -1715,7 +1780,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>d. M. yy</pattern>
+							<pattern>d. M. y</pattern>
 							<datetimeSkeleton>yyMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -1750,6 +1815,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ob' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ob' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1758,6 +1826,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ob' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ob' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1771,7 +1842,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d.</dateFormatItem>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d.</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
@@ -1779,11 +1852,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d. M. y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d. M. y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
-						<dateFormatItem id="H">HH'h'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1832,16 +1904,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">MM. y–MM. y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">d. MM. y–d. MM. y GGGGG</greatestDifference>
-							<greatestDifference id="G">d. MM. y GGGGG–d. MM. y GGGGG</greatestDifference>
-							<greatestDifference id="M">d. MM. y–d. MM. y GGGGG</greatestDifference>
-							<greatestDifference id="y">d. MM. y–d. MM. y GGGGG</greatestDifference>
+							<greatestDifference id="d">d.–d. M. y GGGGG</greatestDifference>
+							<greatestDifference id="G">d. M. y GGGGG–d. M. y GGGGG</greatestDifference>
+							<greatestDifference id="M">d. M. y–d. M. y GGGGG</greatestDifference>
+							<greatestDifference id="y">d. M. y–d. M. y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, d. MM. y–E, d. MM. y GGGGG</greatestDifference>
-							<greatestDifference id="G">E, d. MM. y GGGGG–E, d. MM. y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d. MM. y–E, d. MM. y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d. MM. y–E, d. MM. y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d. M. y–E, d. M. y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, d. M. y GGGGG–E, d. M. y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d. M. y–E, d. M. y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d. M. y–E, d. M. y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G–MMM y G</greatestDifference>
@@ -1862,7 +1934,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a–h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">H–H</greatestDifference>
@@ -1885,10 +1956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H">H:mm–H:mm v</greatestDifference>
 							<greatestDifference id="m">H:mm–H:mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">H–H v</greatestDifference>
 						</intervalFormatItem>
@@ -1919,7 +1986,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">M. y–M. y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d. M. y–d. M. y</greatestDifference>
+							<greatestDifference id="d">d.–d. M. y</greatestDifference>
 							<greatestDifference id="M">d. M.–d. M. y</greatestDifference>
 							<greatestDifference id="y">d. M. y–d. M. y</greatestDifference>
 						</intervalFormatItem>
@@ -1938,7 +2005,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">d. MMM y–d. MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. MMM–E, d. MMM y</greatestDifference>
+							<greatestDifference id="d">E, d.–E, d. MMM y</greatestDifference>
 							<greatestDifference id="M">E, d. MMM–E, d. MMM y</greatestDifference>
 							<greatestDifference id="y">E, d. MMM y–E, d. MMM y</greatestDifference>
 						</intervalFormatItem>
@@ -2546,9 +2613,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<hourFormat>+HH.mm;-HH.mm</hourFormat>
 			<gmtFormat>GMT {0}</gmtFormat>
-			<regionFormat>{0} čas</regionFormat>
-			<regionFormat type="daylight">{0} poletni čas</regionFormat>
-			<regionFormat type="standard">{0} standardni čas</regionFormat>
+			<gmtUnknownFormat>GMT +?</gmtUnknownFormat>
+			<regionFormat>{0} (lokalni čas)</regionFormat>
+			<regionFormat type="daylight">{0} (poletni čas)</regionFormat>
+			<regionFormat type="standard">{0} (standardni čas)</regionFormat>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -2569,9 +2637,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angvila</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erevan</exemplarCity>
 			</zone>
@@ -2742,7 +2807,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Biškek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kanton</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komori</exemplarCity>
@@ -2970,9 +3035,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Zahodnoafriški čas</generic>
-					<standard>Zahodnoafriški standardni čas</standard>
-					<daylight>Zahodnoafriški poletni čas</daylight>
+					<standard>Zahodnoafriški čas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3329,6 +3392,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Gvajanski čas</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havajski aleutski standardni čas</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havajski aleutski čas</generic>
@@ -3755,6 +3823,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Čas: Otok Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turški čas</generic>
+					<standard>Turški standardni čas</standard>
+					<daylight>Turški poletni čas</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistanski čas</generic>
@@ -3868,11 +3943,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="100000" count="other">000 tisoč</pattern>
 					<pattern type="1000000" count="one">0 milijon</pattern>
 					<pattern type="1000000" count="two">0 milijona</pattern>
-					<pattern type="1000000" count="few">0 milijone</pattern>
+					<pattern type="1000000" count="few">0 milijoni</pattern>
 					<pattern type="1000000" count="other">0 milijonov</pattern>
 					<pattern type="10000000" count="one">00 milijon</pattern>
 					<pattern type="10000000" count="two">00 milijona</pattern>
-					<pattern type="10000000" count="few">00 milijoni</pattern>
+					<pattern type="10000000" count="few">00 milijona</pattern>
 					<pattern type="10000000" count="other">00 milijonov</pattern>
 					<pattern type="100000000" count="one">000 milijon</pattern>
 					<pattern type="100000000" count="two">000 milijona</pattern>
@@ -3944,9 +4019,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber" draft="contributed">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber" draft="contributed">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -5373,8 +5450,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">venezuelskih bolivarjev</displayName>
 			</currency>
 			<currency type="VND">
-				<displayName>vientnamski dong</displayName>
-				<displayName count="one">vientnamski dong</displayName>
+				<displayName>vietnamski dong</displayName>
+				<displayName count="one">vietnamski dong</displayName>
 				<displayName count="two">vietnamska donga</displayName>
 				<displayName count="few">vietnamski dongi</displayName>
 				<displayName count="other">vietnamskih dongov</displayName>
@@ -5426,6 +5503,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">vzhodnokaribskih dolarjev</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibski gulden</displayName>
+				<displayName count="one">karibski gulden</displayName>
+				<displayName count="two">karibska guldna</displayName>
+				<displayName count="few">karibski guldni</displayName>
+				<displayName count="other">karibskih guldnov</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>posebne pravice črpanja</displayName>
 			</currency>
@@ -5516,6 +5600,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>zimbabvejski dolar</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabvejsko zlato</displayName>
+				<displayName count="one">zimbabvejsko zlato</displayName>
+				<displayName count="two">zimbabvejska zlata</displayName>
+				<displayName count="few">zimbabvejska zlata</displayName>
+				<displayName count="other">zimbabvejsko zlato</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>zimbabvejski dolar (2009)</displayName>
 			</currency>
@@ -5652,7 +5743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="one" gender="feminine" case="dative">kvadratni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="feminine" case="genitive">kvadratne {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="feminine" case="instrumental">kvadratno {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="one" gender="feminine" case="locative">kvadratnem {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="one" gender="feminine" case="locative">kvadratni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="masculine">kvadratni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="masculine" case="accusative">kvadratni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="one" gender="masculine" case="dative">kvadratnemu {0}</compoundUnitPattern1>
@@ -5689,7 +5780,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<compoundUnitPattern1 count="few" gender="feminine" case="genitive">kvadratnih {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="feminine" case="instrumental">kvadratnimi {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="feminine" case="locative">kvadratnih {0}</compoundUnitPattern1>
-				<compoundUnitPattern1 count="few" gender="masculine">kvadratne {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="few" gender="masculine">kvadratni {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="masculine" case="accusative">kvadratne {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="masculine" case="dative">kvadratnim {0}</compoundUnitPattern1>
 				<compoundUnitPattern1 count="few" gender="masculine" case="genitive">kvadratnih {0}</compoundUnitPattern1>
@@ -6246,7 +6337,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} elementi</unitPattern>
 				<unitPattern count="other" case="locative">{0} elementih</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>deli</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="two">{0} dela</unitPattern>
+				<unitPattern count="few">{0} deli</unitPattern>
+				<unitPattern count="other">{0} delov</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>masculine</gender>
 				<displayName>delci na milijon</displayName>
 				<unitPattern count="one">{0} delec na milijon</unitPattern>
@@ -6384,6 +6482,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} moli</unitPattern>
 				<unitPattern count="other" case="locative">{0} molih</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoze</displayName>
+				<unitPattern count="one">{0} glukoze</unitPattern>
+				<unitPattern count="two">{0} glukoze</unitPattern>
+				<unitPattern count="few">{0} glukoze</unitPattern>
+				<unitPattern count="other">{0} glukoze</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>litri na kilometer</displayName>
@@ -7576,8 +7681,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-em">
 				<gender>masculine</gender>
-				<unitPattern count="one">{0} emov</unitPattern>
-				<unitPattern count="one" case="accusative">{0} emov</unitPattern>
+				<unitPattern count="one">{0} em</unitPattern>
+				<unitPattern count="one" case="accusative">{0} em</unitPattern>
 				<unitPattern count="one" case="dative">{0} emu</unitPattern>
 				<unitPattern count="one" case="genitive">{0} ema</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} emom</unitPattern>
@@ -8033,7 +8138,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-point">
 				<gender>feminine</gender>
-				<displayName>točke</displayName>
 				<unitPattern count="one">{0} točka</unitPattern>
 				<unitPattern count="one" case="accusative">{0} točko</unitPattern>
 				<unitPattern count="one" case="dative">{0} točki</unitPattern>
@@ -8559,6 +8663,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} milimetri živega srebra</unitPattern>
 				<unitPattern count="other" case="locative">{0} milimetrih živega srebra</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>živega srebra</displayName>
+				<unitPattern count="one" draft="contributed">{0} živega srebra</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} živega srebra</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} živega srebra</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} živega srebra</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funti na kvadratni palec</displayName>
 				<unitPattern count="one">{0} funt na kvadratni palec</unitPattern>
@@ -9258,7 +9369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>feminine</gender>
 				<displayName>metrične pinte</displayName>
 				<unitPattern count="one">{0} metrična pinta</unitPattern>
-				<unitPattern count="one" case="accusative">{0} metrična pinta</unitPattern>
+				<unitPattern count="one" case="accusative">{0} metrično pinto</unitPattern>
 				<unitPattern count="one" case="dative">{0} metrični pinti</unitPattern>
 				<unitPattern count="one" case="genitive">{0} metrične pinte</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} metrično pinto</unitPattern>
@@ -9310,6 +9421,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} metričnimi skodelicami</unitPattern>
 				<unitPattern count="other" case="locative">{0} metričnih skodelicah</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrične tekočinske unče</displayName>
+				<unitPattern count="one">{0} metrična tekočinska unča</unitPattern>
+				<unitPattern count="two">{0} metrični tekočinski unči</unitPattern>
+				<unitPattern count="few">{0} metrične tekočinske unče</unitPattern>
+				<unitPattern count="other">{0} metričnih tekočinskih unč</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>aker-čevelj</displayName>
 				<unitPattern count="one">{0} aker-čevelj</unitPattern>
@@ -9409,9 +9527,99 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} imp. kvarti</unitPattern>
 				<unitPattern count="other">{0} imp. kvartov</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiani</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="two">{0} steradiana</unitPattern>
+				<unitPattern count="few">{0} steradiani</unitPattern>
+				<unitPattern count="other">{0} steradianov</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katali</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="two">{0} katala</unitPattern>
+				<unitPattern count="few">{0} katali</unitPattern>
+				<unitPattern count="other">{0} katalov</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kuloni</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="two">{0} kulona</unitPattern>
+				<unitPattern count="few">{0} kuloni</unitPattern>
+				<unitPattern count="other">{0} kulonov</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradi</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="two">{0} farada</unitPattern>
+				<unitPattern count="few">{0} faradi</unitPattern>
+				<unitPattern count="other">{0} faradov</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henri</displayName>
+				<unitPattern count="one">{0} henri</unitPattern>
+				<unitPattern count="two">{0} henrija</unitPattern>
+				<unitPattern count="few">{0} henriji</unitPattern>
+				<unitPattern count="other">{0} henrijev</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simens</displayName>
+				<unitPattern count="one">{0} simens</unitPattern>
+				<unitPattern count="two">{0} simensa</unitPattern>
+				<unitPattern count="few">{0} simensi</unitPattern>
+				<unitPattern count="other">{0} simensov</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>mednarodne kalorije</displayName>
+				<unitPattern count="one">{0} mednarodna kalorija</unitPattern>
+				<unitPattern count="two">{0} mednarodni kaloriji</unitPattern>
+				<unitPattern count="few">{0} mednarodne kalorije</unitPattern>
+				<unitPattern count="other">{0} mednarodnih kalorij</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereli</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="two">{0} bekerela</unitPattern>
+				<unitPattern count="few">{0} bekereli</unitPattern>
+				<unitPattern count="other">{0} bekerelov</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sivert</displayName>
+				<unitPattern count="one">{0} sivert</unitPattern>
+				<unitPattern count="two">{0} siverta</unitPattern>
+				<unitPattern count="few">{0} siverti</unitPattern>
+				<unitPattern count="other">{0} sivertov</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grej</displayName>
+				<unitPattern count="one">{0} grej</unitPattern>
+				<unitPattern count="two">{0} greja</unitPattern>
+				<unitPattern count="few">{0} greji</unitPattern>
+				<unitPattern count="other">{0} grejev</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopondi</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="two">{0} kiloponda</unitPattern>
+				<unitPattern count="few">{0} kilopondi</unitPattern>
+				<unitPattern count="other">{0} kilopondov</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="two">{0} tesli</unitPattern>
+				<unitPattern count="few">{0} tesle</unitPattern>
+				<unitPattern count="other">{0} tesel</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veber</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="two">{0} vebra</unitPattern>
+				<unitPattern count="few">{0} vebri</unitPattern>
+				<unitPattern count="other">{0} vebrov</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>svetloba</displayName>
 				<unitPattern count="one">{0} svetloba</unitPattern>
 				<unitPattern count="one" case="accusative">{0} svetlobo</unitPattern>
 				<unitPattern count="one" case="dative">{0} svetlobi</unitPattern>
@@ -9437,7 +9645,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} svetlobami</unitPattern>
 				<unitPattern count="other" case="locative">{0} svetlobah</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>delci na milijardo</displayName>
 				<unitPattern count="one">{0} delec na milijardo</unitPattern>
@@ -9467,7 +9675,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noči</displayName>
 				<unitPattern count="one">{0} noč</unitPattern>
 				<unitPattern count="one" case="accusative">{0} noč</unitPattern>
 				<unitPattern count="one" case="dative">{0} noči</unitPattern>
@@ -9560,6 +9767,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} elementi</unitPattern>
 				<unitPattern count="other">{0} elementov</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>del</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="two">{0} dela</unitPattern>
+				<unitPattern count="few">{0} deli</unitPattern>
+				<unitPattern count="other">{0} delov</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>odstotek</displayName>
 				<unitPattern count="one">{0} %</unitPattern>
@@ -9580,6 +9794,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -9686,7 +9903,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>J</displayName>
 			</unit>
 			<unit type="graphics-em">
-				<unitPattern count="one">{0} emov</unitPattern>
+				<unitPattern count="one">{0} em</unitPattern>
 				<unitPattern count="two">{0} ema</unitPattern>
 				<unitPattern count="few">{0} emi</unitPattern>
 				<unitPattern count="other">{0} emov</unitPattern>
@@ -9839,6 +10056,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} m. skod.</unitPattern>
 				<unitPattern count="other">{0} m. skod.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. fl. oz.</displayName>
+				<unitPattern count="one">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="two">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="few">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="other">{0} m. fl. oz.</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>bušel</displayName>
 			</unit>
@@ -9938,6 +10162,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} imp. qt</unitPattern>
 				<unitPattern count="other">{0} imp. qt</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="two">{0} kp</unitPattern>
+				<unitPattern count="few">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>svetloba</displayName>
 				<unitPattern count="one">{0} svetloba</unitPattern>
@@ -9965,9 +10199,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-dunam">
 				<displayName>dunum</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>del</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="two">{0} dela</unitPattern>
+				<unitPattern count="few">{0} deli</unitPattern>
+				<unitPattern count="other">{0} delov</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="digital-byte">
 				<unitPattern count="one">{0} bajt</unitPattern>
 				<unitPattern count="two">{0} bajta</unitPattern>
@@ -10010,7 +10254,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} s</unitPattern>
 			</unit>
 			<unit type="graphics-em">
-				<unitPattern count="one">{0} emov</unitPattern>
+				<unitPattern count="one">{0} em</unitPattern>
 				<unitPattern count="two">{0} ema</unitPattern>
 				<unitPattern count="few">{0} emi</unitPattern>
 				<unitPattern count="other">{0} emov</unitPattern>
@@ -10039,6 +10283,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} m. sk.</unitPattern>
 				<unitPattern count="other">{0} m. sk.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>m. fl. oz.</displayName>
+				<unitPattern count="one">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="two">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="few">{0} m. fl. oz.</unitPattern>
+				<unitPattern count="other">{0} m. fl. oz.</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon">
 				<displayName>des. žl.</displayName>
 				<unitPattern count="one">{0} des. žl.</unitPattern>
@@ -10053,20 +10304,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} imp. des. žl.</unitPattern>
 				<unitPattern count="other">{0} imp. des. žl.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>svetloba</displayName>
-				<unitPattern count="one">{0} svetloba</unitPattern>
-				<unitPattern count="two">{0} svetlobi</unitPattern>
-				<unitPattern count="few">{0} svetlobe</unitPattern>
-				<unitPattern count="other">{0} svetlob</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kp</displayName>
+				<unitPattern count="one">{0} kp</unitPattern>
+				<unitPattern count="two">{0} kp</unitPattern>
+				<unitPattern count="few">{0} kp</unitPattern>
+				<unitPattern count="other">{0} kp</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>noči</displayName>
 				<unitPattern count="one">{0} n</unitPattern>
 				<unitPattern count="two">{0} n</unitPattern>
 				<unitPattern count="few">{0} n</unitPattern>
 				<unitPattern count="other">{0} n</unitPattern>
-				<perUnitPattern>{0}/noč</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/smn.xml b/make/data/cldr/common/main/smn.xml
index 4127fb6e100..39c4c67aa5d 100644
--- a/make/data/cldr/common/main/smn.xml
+++ b/make/data/cldr/common/main/smn.xml
@@ -1245,6 +1245,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/so.xml b/make/data/cldr/common/main/so.xml
index 487a3476f90..dd8d382e5f8 100644
--- a/make/data/cldr/common/main/so.xml
+++ b/make/data/cldr/common/main/so.xml
@@ -40,6 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ay">U dhashay Aymar</language>
 			<language type="az">Asarbayjan</language>
 			<language type="ba">Bashkir</language>
+			<language type="bal">Baluchi</language>
 			<language type="ban">U dhashay Baline</language>
 			<language type="bas">Basaa</language>
 			<language type="be">Beleruusiyaan</language>
@@ -223,6 +224,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Kologniyaan</language>
 			<language type="ku">Kurdishka</language>
+			<language type="ku" menu="core">Kurdish</language>
+			<language type="ku" menu="extension">Kurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kv">Komi</language>
 			<language type="kw">Kornish</language>
@@ -723,6 +726,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Shiinaha</territory>
 			<territory type="CO">Koloombiya</territory>
 			<territory type="CP">Jasiiradda Kilibarton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuuba</territory>
 			<territory type="CV">Jasiiradda Kayb Faarde</territory>
@@ -1003,58 +1007,96 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Habka Lacagta</key>
 			<key type="collation">Kala Soocidda Dalabka</key>
 			<key type="currency">Lacagta</key>
+			<key type="em">Soo bandhiga Imoji</key>
 			<key type="hc">Wareegga Saacadda (12 ilaa 24)</key>
 			<key type="lb">Habka Jebinta Xariiqda</key>
+			<key type="lw">Bar Dhamaadyada Khadadka ee gudaha Erayada</key>
 			<key type="ms">Nidaamka Cabbiraadda</key>
 			<key type="numbers">Tirooyinka</key>
+			<key type="ss">Bar Dhamaadka Jumlada Kadib Xarfo Soo Gaabinta</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Habeentiriska Buudhist</type>
+			<type key="calendar" type="buddhist" scope="core">Qof Buddhi ah</type>
 			<type key="calendar" type="chinese">Habeetiriska Shiinaha</type>
+			<type key="calendar" type="chinese" scope="core">Shinees</type>
 			<type key="calendar" type="coptic">Habeentiriska Koptiga</type>
+			<type key="calendar" type="coptic" scope="core">Coptic</type>
 			<type key="calendar" type="dangi">Habeetiriska Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Habeentiriska Itoobiya</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Taariikhda Itoobiya ee Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Habeetiriska Geregoriyaan</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Habeentiriska yuhuudda</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrew</type>
 			<type key="calendar" type="indian">Habeentiris Qarameedka Hindiya</type>
 			<type key="calendar" type="islamic">Habeentiriska islaamka</type>
+			<type key="calendar" type="islamic" scope="core">Taariikhda Islaamiga</type>
 			<type key="calendar" type="islamic-civil">Taariikhda Islaamiga (shax ahaan, waayo madaniyeed)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Taariikhda Islaamiga (shax ahaan, taariikh madaniyeed jaan go’an)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Habeentiriska Islaamka (Sacuudiga, aragtida)</type>
 			<type key="calendar" type="islamic-tbla">Taariikhda Islaamiga (shax ahaan, waayo xiddigeed)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Taariikh Islaamiyeed (shax ahaan, waayo xiddigeed)</type>
 			<type key="calendar" type="islamic-umalqura">Taariikhda Islaamiga(Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Taariikhda Islaamiga (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Habeentiriska ISO-8601</type>
 			<type key="calendar" type="japanese">Habeentiriska jabbaanka</type>
+			<type key="calendar" type="japanese" scope="core">Jabaniis</type>
 			<type key="calendar" type="persian">Habeentiriska Baarshiyaanka</type>
+			<type key="calendar" type="persian" scope="core">U dhashay Faariis</type>
 			<type key="calendar" type="roc">Habeentiriska Minguwo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Habka Xisaabinta Lacagta</type>
+			<type key="cf" type="account" scope="core">Xisaabaadka</type>
 			<type key="cf" type="standard">Habka Heerka Lacagta</type>
-			<type key="collation" type="big5han">Isku hagaajinta Shiineeskii Hore - Big5</type>
+			<type key="cf" type="standard" scope="core">Heerka</type>
 			<type key="collation" type="compat">Iswaafajinta Isku hajintii hore</type>
 			<type key="collation" type="dictionary">Isku hagaajinta Qaamuuska</type>
 			<type key="collation" type="ducet">Lambar Sireedka Caalamiga ee Kala Soocidda Dalabka</type>
+			<type key="collation" type="ducet" scope="core">Lambar Sireedka Caalamiga ee Asaliga ah</type>
 			<type key="collation" type="emoji">Isku hagaajinta Emojiga</type>
 			<type key="collation" type="eor">Xeerarka Dalabka Yurub</type>
-			<type key="collation" type="gb2312han">Isku hagaajinta Farta shiineeska</type>
 			<type key="collation" type="phonebook">Isku hagaajinta foonbuuga</type>
 			<type key="collation" type="pinyin">Isku hagaajinta Pinyin</type>
 			<type key="collation" type="search">Raadinta Guud</type>
+			<type key="collation" type="search" scope="core">Raadi</type>
 			<type key="collation" type="searchjl">Raadinta Shibanaha Hangul</type>
 			<type key="collation" type="standard">Amarka Kala Soocidda Caadiga ah</type>
+			<type key="collation" type="standard" scope="core">Caadiga</type>
 			<type key="collation" type="stroke">Isku hagaajinta Farta</type>
 			<type key="collation" type="traditional">Isku hagaajin Fareedkii Hore</type>
 			<type key="collation" type="unihan">Isku hagaajinta Farta Radical-Stroke</type>
 			<type key="collation" type="zhuyin">Isku hagaajinta Farta Zhuyin</type>
+			<type key="em" type="default" scope="core">Asaliga</type>
+			<type key="em" type="emoji" scope="core">Imoji</type>
+			<type key="em" type="text" scope="core">Qoraal</type>
 			<type key="hc" type="h11">12 Saac ee Nidaamka Saacadda (0–12)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Saac ee Nidaamka Saacadda (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 Saac ee Nidaamka Saacadda (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 Saac ee Nidaamka Saacadda (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Habka Jabinta Xariiqda Dabacsan</type>
+			<type key="lb" type="loose" scope="core">Dabacsan</type>
 			<type key="lb" type="normal">Habka Jabinta Xariiqda Caadiga ah</type>
+			<type key="lb" type="normal" scope="core">Caadi ah</type>
 			<type key="lb" type="strict">Habka Jabinta Xariiqda Adag</type>
+			<type key="lb" type="strict" scope="core">Adag</type>
+			<type key="lw" type="breakall" scope="core">Jebi dhamaan</type>
+			<type key="lw" type="keepall" scope="core">Heyso dhamaan</type>
+			<type key="lw" type="normal" scope="core">Caadi ah</type>
+			<type key="lw" type="phrase" scope="core">Weedho ahaan ku heyso</type>
 			<type key="ms" type="metric">Nidaamka Metric</type>
+			<type key="ms" type="metric" scope="core">Cabbir</type>
 			<type key="ms" type="uksystem">Nidaamka Cabbirka Imperial-ka</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Nidaamka Cabbirka ee US</type>
+			<type key="ms" type="ussystem" scope="core">Mareykanka</type>
 			<type key="numbers" type="ahom">Godadka Ahom</type>
 			<type key="numbers" type="arab">Gdadka Carabi-Hindiya</type>
 			<type key="numbers" type="arabext">Tirooyinka Dheeraadka ah ee Godadka Carabi-Hindiya</type>
@@ -1134,6 +1176,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="vaii">Godadka Vai</type>
 			<type key="numbers" type="wara">Godadka Warang Citi</type>
 			<type key="numbers" type="wcho">Godadka Wancho</type>
+			<type key="ss" type="none" scope="core">Dami</type>
+			<type key="ss" type="standard" scope="core">Daar</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1422,11 +1466,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ee' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ee' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1446,7 +1496,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -1727,16 +1779,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="pm">d</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">GH</dayPeriod>
-							<dayPeriod type="pm">GD</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">GH</dayPeriod>
-							<dayPeriod type="pm">GD</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
 					<eraNames>
@@ -1816,6 +1858,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ee' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ee' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1824,6 +1869,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ee' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ee' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1832,6 +1880,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ee' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1840,10 +1891,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
@@ -2146,6 +2202,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</monthContext>
 				</months>
 				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, M/d/y G</dateFormatItem>
+					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
 							<greatestDifference id="B">h B – h B</greatestDifference>
@@ -2247,7 +2307,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="year-narrow">
-				<displayName>Snd</displayName>
 				<relative type="-1">Sannadkii la soo dhaafay</relative>
 				<relative type="0">Sannadkan</relative>
 				<relative type="1">Sannadka xiga</relative>
@@ -2371,13 +2430,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>maalinta sannadka</displayName>
 			</field>
 			<field type="dayOfYear-short">
-				<displayName>mlnta sndka</displayName>
+				<displayName>maalinta sndka</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName>maalinta sndka</displayName>
 			</field>
 			<field type="weekday">
 				<displayName>maalinta toddobaadka</displayName>
 			</field>
 			<field type="weekday-short">
-				<displayName>mlnta tdbdka</displayName>
+				<displayName>maalinta tdbdka</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName>maalinta tdbdka</displayName>
 			</field>
 			<field type="weekdayOfMonth">
 				<displayName>maalinta-toddobaadka bisha</displayName>
@@ -2960,9 +3025,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Douala">
 				<exemplarCity>Douaala</exemplarCity>
 			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Shanghaay</exemplarCity>
-			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Kosta Riika</exemplarCity>
 			</zone>
@@ -3107,9 +3169,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Guyana">
 				<exemplarCity>Guyaana</exemplarCity>
 			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hoong Koong</exemplarCity>
-			</zone>
 			<zone type="America/Tegucigalpa">
 				<exemplarCity>Tegusigalba</exemplarCity>
 			</zone>
@@ -3180,9 +3239,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Benom Ben</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderburi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Kantoon</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3194,12 +3250,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/St_Kitts">
 				<exemplarCity>St. Kitis</exemplarCity>
 			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Boyongyang</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Soul</exemplarCity>
-			</zone>
 			<zone type="Asia/Kuwait">
 				<exemplarCity>Kuweyt</exemplarCity>
 			</zone>
@@ -3284,12 +3334,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Bamako">
 				<exemplarCity>Bamaako</exemplarCity>
 			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Hofud</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makow</exemplarCity>
-			</zone>
 			<zone type="Pacific/Saipan">
 				<exemplarCity>Seyban</exemplarCity>
 			</zone>
@@ -3590,9 +3634,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Boort of Isbayn</exemplarCity>
 			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Teybey</exemplarCity>
-			</zone>
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daresalaam</exemplarCity>
 			</zone>
@@ -3763,9 +3804,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Waqtiga Galbeedka Afrika</generic>
-					<standard>Waqtiga Caadiga Ah ee Galbeedka Afrika</standard>
-					<daylight>Waqtiga Xagaaga ee Galbeedka Afrika</daylight>
+					<standard>Waqtiga Galbeedka Afrika</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3826,9 +3865,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Waqtiga Abiya</generic>
-					<standard>Waqtiga Caadiga Ah ee Abiya</standard>
-					<daylight>Waqtiga Dharaarta ee Abiya</daylight>
+					<generic>Wakhtiga Samoa</generic>
+					<standard>Waqtiga Caadiga Ah ee Samoa</standard>
+					<daylight>Waqtiga Dharaarta ee Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3948,7 +3987,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Waqtiga Buruney Daarusalaam</standard>
+					<standard>Wakhtiga Brunei</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -3960,7 +3999,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Chamorro">
 				<long>
-					<standard>Waqtiga Jamoro</standard>
+					<standard>Wakhtiga Caadiga ah ee Chamorro</standard>
 				</long>
 			</metazone>
 			<metazone type="Chatham">
@@ -4003,9 +4042,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Cook">
 				<long>
-					<generic>Waqtiga Kuuk Aylaanis</generic>
-					<standard>Waqtiga Caadiga Ah ee Kuuk Aylaanis</standard>
-					<daylight>Waqtiga Nus Xagaaga ah ee Kuuk Aylaanis</daylight>
+					<generic>Wakhtiga Jasiiradaha Cook</generic>
+					<standard>Waqtiga Caadiga Ah ee Jasiiradaha Cook</standard>
+					<daylight>Waqtiga Caadiga Ah ee Jasiiradaha Cook</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -4017,7 +4056,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Davis">
 				<long>
-					<standard>Waqtiga Dafis</standard>
+					<standard>Wakhtiga Davis</standard>
 				</long>
 			</metazone>
 			<metazone type="DumontDUrville">
@@ -4027,7 +4066,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>Waqtiga Iist Timoor</standard>
+					<standard>Wakhtiga Timor-Leste</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
@@ -4143,6 +4182,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Waqtiga Guyaana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Waqtiga Caadiga Ah ee Hawaay-Alutiyaan</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Waqtiga Hawaay-Alutiyaan</generic>
@@ -4181,7 +4228,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Indochina">
 				<long>
-					<standard>Waqtiga Indoshiina</standard>
+					<standard>Wakhtiga Indochina</standard>
 				</long>
 			</metazone>
 			<metazone type="Indonesia_Central">
@@ -4471,7 +4518,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Waqtiga Bonabe</standard>
+					<standard>Wakhtiga Pohnpei</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
@@ -4512,9 +4559,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Waqtiga Samoa</generic>
-					<standard>Waqtiga Caadiga Ah ee Samoa</standard>
-					<daylight>Waqtiga Dharaarta ee Samoa</daylight>
+					<generic>Wakhtiga American Samoa</generic>
+					<standard>Waqtiga Caadiga Ah ee American Samoa</standard>
+					<daylight>Waqtiga Dharaarta ee American Samoa</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -4554,8 +4601,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Waqtiga Teybey</generic>
-					<standard>Waqtiga Caadiga Ah ee Teybey</standard>
+					<generic>Waqtiga Taiwan</generic>
+					<standard>Waqtiga Caadiga Ah ee Taiwan</standard>
 					<daylight>Waqtiga Dharaarta ee Teybey</daylight>
 				</long>
 			</metazone>
@@ -4874,7 +4921,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5792,6 +5838,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">doolarka Iist Kaaribyan</displayName>
 				<displayName count="other">doolarada Iist Kaaribyan</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribbean guilder</displayName>
+				<displayName count="one">Galdarada karabiyaan</displayName>
+				<displayName count="other">Galdarayaasha karabiyaan</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Faranka CFA Galbeedka Afrika</displayName>
 				<displayName count="one">faranka CFA Galbeedka Afrika</displayName>
@@ -5820,6 +5871,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">Kawaja Sambiya</displayName>
 				<displayName count="other">Kawajada Sambiya</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Dahabka Zimbabwe</displayName>
+				<displayName count="one">Dahabka Zimbabwe</displayName>
+				<displayName count="other">Dahabka Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one" draft="contributed">{0} maalin</pluralMinimalPairs>
@@ -6027,7 +6083,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} shay</unitPattern>
 				<unitPattern count="other">{0} shayo</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>qeybo</displayName>
+				<unitPattern count="one">{0} qeyb</unitPattern>
+				<unitPattern count="other">{0} qeybo</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>qeyb milyankiiba</displayName>
 				<unitPattern count="one">{0} qeyb milyankiiba</unitPattern>
 				<unitPattern count="other">{0} qeyb milyankiiba</unitPattern>
@@ -6044,6 +6105,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} bermiraad</unitPattern>
 				<unitPattern count="other">{0} bermiraad</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ee kulukoos</displayName>
+				<unitPattern count="one">{0} ee kulukoos</unitPattern>
+				<unitPattern count="other">{0} ee kulukoos</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litar kiilomitirkiiba</displayName>
 				<unitPattern count="one">litar kiilomitirkiiba</unitPattern>
@@ -6370,12 +6436,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} unuga xidigiska</unitPattern>
 			</unit>
 			<unit type="length-furlong">
-				<displayName>furlongs</displayName>
 				<unitPattern count="one">{0} furlong</unitPattern>
 				<unitPattern count="other">{0} furlongs</unitPattern>
 			</unit>
 			<unit type="length-fathom">
-				<displayName>fathoms</displayName>
 				<unitPattern count="one">{0} fathom</unitPattern>
 				<unitPattern count="other">{0} fathoms</unitPattern>
 			</unit>
@@ -6402,12 +6466,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} laks</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName>candela</displayName>
 				<unitPattern count="one">{0} candela</unitPattern>
 				<unitPattern count="other">{0} candela</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<displayName>lumen</displayName>
 				<unitPattern count="one">{0} lumen</unitPattern>
 				<unitPattern count="other">{0} lumen</unitPattern>
 			</unit>
@@ -6447,7 +6509,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} tan</unitPattern>
 			</unit>
 			<unit type="mass-stone">
-				<displayName>dhagaxo</displayName>
 				<unitPattern count="one">{0} dhagax</unitPattern>
 				<unitPattern count="other">{0} dhagaxo</unitPattern>
 			</unit>
@@ -6521,6 +6582,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} milimitir maarkuri</unitPattern>
 				<unitPattern count="other">{0} milimitir maarkuri</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ee merkuriga</displayName>
+				<unitPattern count="one">{0} ee merkuri</unitPattern>
+				<unitPattern count="other">{0} ee merkuri</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>rodol halkii inji ee Isku weer ah</displayName>
 				<unitPattern count="one">{0} rodol halkii inji ee Isku weer ah</unitPattern>
@@ -6682,6 +6748,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">metrik koob</unitPattern>
 				<unitPattern count="other">{0} merik koob</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>wiqaayadaha cabbirka dareeraha</displayName>
+				<unitPattern count="one">{0} wiqaayada cabbirka dareeraha</unitPattern>
+				<unitPattern count="other">{0} mwiqaayadaha cabbirka dareeraha</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akre-fiit</displayName>
 				<unitPattern count="one">{0} akre-fiit</unitPattern>
@@ -6745,20 +6816,77 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} dram</unitPattern>
 				<unitPattern count="other">{0} dram</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>nal</displayName>
-				<unitPattern count="one">{0} nal</unitPattern>
-				<unitPattern count="other">{0} nal</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradians</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farads</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henrys</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalooriyo [IT]</displayName>
+				<unitPattern count="one">{0} kaloori [IT]</unitPattern>
+				<unitPattern count="other">{0} kalooriyo [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerels</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerels</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sieverts</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograms-force</displayName>
+				<unitPattern count="one">{0} kilogram-force</unitPattern>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} teslas</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>qeybaha bilyankiiba</displayName>
 				<unitPattern count="one">{0} qeybaha bilyankiiba</unitPattern>
 				<unitPattern count="other">{0} qeybaha bilyankiiba</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>habeeno</displayName>
-				<unitPattern count="one">{0} habeen</unitPattern>
-				<unitPattern count="other">{0} habeeno</unitPattern>
 				<perUnitPattern>{0} halkii habeen</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6844,7 +6972,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} shay</unitPattern>
 				<unitPattern count="other">{0} shay</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>qeyb</displayName>
+				<unitPattern count="one">{0} qeyb</unitPattern>
+				<unitPattern count="other">{0} qeyb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>qeyb/milyankiiba</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6861,6 +6994,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mool</unitPattern>
 				<unitPattern count="other">{0} mool</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litar/km</displayName>
 			</unit>
@@ -7178,6 +7314,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ee Hg</displayName>
+				<unitPattern count="one">{0} ee Hg</unitPattern>
+				<unitPattern count="other">{0} ee Hg</unitPattern>
+			</unit>
 			<unit type="pressure-atmosphere">
 				<displayName>ha</displayName>
 				<unitPattern count="one">{0} ha</unitPattern>
@@ -7321,12 +7462,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-dram">
 				<displayName>dareere dram</displayName>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>nal</displayName>
 				<unitPattern count="one">{0} nal</unitPattern>
 				<unitPattern count="other">{0} nal</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>qeybaha/bilyan</displayName>
 				<unitPattern count="one">{0} qb</unitPattern>
 				<unitPattern count="other">{0} qb</unitPattern>
@@ -7357,7 +7521,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}shay</unitPattern>
 				<unitPattern count="other">{0}shay</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>qeyb</displayName>
+				<unitPattern count="one">{0} qeyb</unitPattern>
+				<unitPattern count="other">{0} qeyb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm#</unitPattern>
@@ -7365,6 +7534,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>L/100km</displayName>
 				<unitPattern count="one">{0}L/100km</unitPattern>
@@ -7470,7 +7642,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}cd</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<displayName>lumen</displayName>
 				<unitPattern count="one">{0}lm</unitPattern>
 				<unitPattern count="other">{0}lm</unitPattern>
 			</unit>
@@ -7496,6 +7667,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ee Hg</displayName>
+				<unitPattern count="one">{0} ee Hg</unitPattern>
+				<unitPattern count="other">{0} ee Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -7562,21 +7738,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>nal</displayName>
 				<unitPattern count="one">{0}nal</unitPattern>
 				<unitPattern count="other">{0}nal</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>qb</displayName>
 				<unitPattern count="one">{0}qb</unitPattern>
 				<unitPattern count="other">{0}qb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>habeeno</displayName>
 				<unitPattern count="one">{0}habeen</unitPattern>
 				<unitPattern count="other">{0}habeeno</unitPattern>
-				<perUnitPattern>{0}/habeen</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}B</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/sq.xml b/make/data/cldr/common/main/sq.xml
index b812532db36..2696ea472bc 100644
--- a/make/data/cldr/common/main/sq.xml
+++ b/make/data/cldr/common/main/sq.xml
@@ -44,6 +44,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">azerbajxhanisht</language>
 			<language type="az" alt="short">azerisht</language>
 			<language type="ba">bashkirisht</language>
+			<language type="bal">balukisht</language>
 			<language type="ban">balinezisht</language>
 			<language type="bas">basaisht</language>
 			<language type="be">bjellorusisht</language>
@@ -230,6 +231,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafianisht</language>
 			<language type="ksh">këlnisht</language>
 			<language type="ku">kurdisht</language>
+			<language type="ku" menu="core">kurdisht</language>
+			<language type="ku" menu="extension">kurmanjisht</language>
 			<language type="kum">kumikisht</language>
 			<language type="kv">komisht</language>
 			<language type="kw">kornisht</language>
@@ -243,7 +246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lez">lezgianisht</language>
 			<language type="lg">gandaisht</language>
 			<language type="li">limburgisht</language>
-			<language type="lij">ligurianisht</language>
+			<language type="lij">ligurisht</language>
 			<language type="lil">lilluetisht</language>
 			<language type="lkt">lakotisht</language>
 			<language type="lmo">lombardisht</language>
@@ -545,7 +548,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Hrkt">alfabet rrokjesor japonez</script>
 			<script type="Hung">hungarishte e vjetër</script>
 			<script type="Ital">italishte e vjetër</script>
-			<script type="Jamo">jamosisht</script>
+			<script type="Jamo">xhamosisht</script>
 			<script type="Java">java</script>
 			<script type="Jpan">japonez</script>
 			<script type="Kali">kajali</script>
@@ -747,6 +750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kinë</territory>
 			<territory type="CO">Kolumbi</territory>
 			<territory type="CP">Ishulli Klipërton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta-Rikë</territory>
 			<territory type="CU">Kubë</territory>
 			<territory type="CV">Kepi i Gjelbër</territory>
@@ -981,58 +985,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Formati valutor</key>
 			<key type="collation">Radhitja</key>
 			<key type="currency">Valuta</key>
+			<key type="em">Prezantimi i emoji-ve</key>
 			<key type="hc">Cikli orar (12 - 24)</key>
 			<key type="lb">Stili i gjerësisë së rreshtave</key>
+			<key type="lw">Ndarja e rreshtit brenda fjalëve</key>
 			<key type="ms">Sistemi i njësive matëse</key>
 			<key type="numbers">Numrat/shifrat</key>
+			<key type="ss">Ndërprerja e fjalisë pas shkurtimit</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">kalendar budist</type>
+			<type key="calendar" type="buddhist" scope="core">budist</type>
 			<type key="calendar" type="chinese">kalendar kinez</type>
+			<type key="calendar" type="chinese" scope="core">kinez</type>
 			<type key="calendar" type="coptic">kalendar koptik</type>
+			<type key="calendar" type="coptic" scope="core">koptik</type>
 			<type key="calendar" type="dangi">kalendar dangi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">kalendari etiopik</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopik</type>
 			<type key="calendar" type="ethiopic-amete-alem">kalendar etiopik amete-alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopik amete-alem</type>
 			<type key="calendar" type="gregorian">kalendar gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
 			<type key="calendar" type="hebrew">kalendar hebraik</type>
+			<type key="calendar" type="hebrew" scope="core">hebraik</type>
 			<type key="calendar" type="indian">Kalendari Kombëtar Indian</type>
 			<type key="calendar" type="islamic">kalendar islam</type>
+			<type key="calendar" type="islamic" scope="core">islam</type>
 			<type key="calendar" type="islamic-civil">kalendar islam (tabelor, epoka civile)</type>
+			<type key="calendar" type="islamic-civil" scope="core">islam (tabelor, epoka civile)</type>
 			<type key="calendar" type="islamic-rgsa">kalendar islamik (Arabi Saudite, shikim)</type>
 			<type key="calendar" type="islamic-tbla">kalendar islam (tabelor, epoka astronomike)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">islam (tabelor, epoka astronomike)</type>
 			<type key="calendar" type="islamic-umalqura">kalendar islam (um al-qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islam (um al-qura)</type>
 			<type key="calendar" type="iso8601">kalendar ISO-8601</type>
 			<type key="calendar" type="japanese">kalendar japonez</type>
+			<type key="calendar" type="japanese" scope="core">japonez</type>
 			<type key="calendar" type="persian">kalendar persian</type>
+			<type key="calendar" type="persian" scope="core">persian</type>
 			<type key="calendar" type="roc">kalendar minguo</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">format valutor llogaritës</type>
+			<type key="cf" type="account" scope="core">llogaritës</type>
 			<type key="cf" type="standard">format valutor standard</type>
-			<type key="collation" type="big5han">Radhitje e kinezishtes tradicionale - Big5</type>
+			<type key="cf" type="standard" scope="core">standard</type>
 			<type key="collation" type="compat">Radhitja e mëparshme, për pajtueshmëri</type>
 			<type key="collation" type="dictionary">Radhitje fjalori</type>
 			<type key="collation" type="ducet">radhitje unikode e parazgjedhur</type>
+			<type key="collation" type="ducet" scope="core">unikode e parazgjedhur</type>
 			<type key="collation" type="emoji">Radhitje Emoji</type>
 			<type key="collation" type="eor">Rregulla evropiane radhitjeje</type>
-			<type key="collation" type="gb2312han">Radhitje e kinezishtes së thjeshtësuar - GB2312</type>
 			<type key="collation" type="phonebook">Radhitje libri telefonik</type>
 			<type key="collation" type="pinyin">Radhitje pinini</type>
 			<type key="collation" type="search">kërkim i përgjithshëm</type>
+			<type key="collation" type="search" scope="core">kërkim</type>
 			<type key="collation" type="searchjl">kërkim sipas bashkëtingëllores fillestare hangul</type>
 			<type key="collation" type="standard">radhitje standarde</type>
+			<type key="collation" type="standard" scope="core">standarde</type>
 			<type key="collation" type="stroke">radhitje me vijëzim</type>
 			<type key="collation" type="traditional">radhitje tradicionale</type>
 			<type key="collation" type="unihan">radhitje me vijëzim radikal</type>
 			<type key="collation" type="zhuyin">radhitje zhujin</type>
+			<type key="em" type="default" scope="core">e parazgjedhur</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">mesazh me tekst</type>
 			<type key="hc" type="h11">sistem 12-orësh (0 - 11)</type>
+			<type key="hc" type="h11" scope="core">12-orësh (0 - 11)</type>
 			<type key="hc" type="h12">sistem 12-orësh (1 - 12)</type>
+			<type key="hc" type="h12" scope="core">12-orësh (0 - 12)</type>
 			<type key="hc" type="h23">sistem 24-orësh (0 - 23)</type>
+			<type key="hc" type="h23" scope="core">24-orësh (0 - 23)</type>
 			<type key="hc" type="h24">sistem 24-orësh (1 - 24)</type>
+			<type key="hc" type="h24" scope="core">24-orësh (0 - 24)</type>
 			<type key="lb" type="loose">stil i gjerësisë së rreshtave - i larguar</type>
+			<type key="lb" type="loose" scope="core">i larguar</type>
 			<type key="lb" type="normal">stil i gjerësisë së rreshtave - normal</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">stil i gjerësisë së rreshtave - i ngushtuar</type>
+			<type key="lb" type="strict" scope="core">i ngushtuar</type>
+			<type key="lw" type="breakall" scope="core">ndarje kudo</type>
+			<type key="lw" type="keepall" scope="core">jo ndarje</type>
+			<type key="lw" type="normal" scope="core">ndarje normale</type>
+			<type key="lw" type="phrase" scope="core">jo ndarje e frazave</type>
 			<type key="ms" type="metric">sistem metrik</type>
+			<type key="ms" type="metric" scope="core">metrik</type>
 			<type key="ms" type="uksystem">sistem imperial (britanik) i njësive matëse</type>
+			<type key="ms" type="uksystem" scope="core">britanik</type>
 			<type key="ms" type="ussystem">sistem amerikan i njësive matëse</type>
+			<type key="ms" type="ussystem" scope="core">amerikan</type>
 			<type key="numbers" type="ahom">shifra ahom</type>
 			<type key="numbers" type="arab">shifra indo-arabe</type>
 			<type key="numbers" type="arabext">shifra indo-arabe të zgjatura</type>
@@ -1115,6 +1157,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">shifra vai</type>
 			<type key="numbers" type="wara">shifra varang citi</type>
 			<type key="numbers" type="wcho">shifra vanço</type>
+			<type key="ss" type="none" scope="core">joaktive</type>
+			<type key="ss" type="standard" scope="core">aktive</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrik</measurementSystemName>
@@ -1123,7 +1167,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">Gjuha: {0}</codePattern>
-			<codePattern type="script">Skripti: {0}</codePattern>
+			<codePattern type="script">Shkrimi: {0}</codePattern>
 			<codePattern type="territory">Rajoni: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
@@ -1133,13 +1177,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="index">[A B C Ç D {DH} E Ë F G {GJ} H I J K L {LL} M N {NJ} O P Q R {RR} S {SH} T {TH} U V X {XH} Y Z {ZH}]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” « » ( ) \[ \] § @ * / \&amp; # ′ ″ ~]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‑ , \: . ' “” « » /]</exemplarCharacters>
 	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>”</alternateQuotationEnd>
-	</delimiters>
 	<dates>
 		<calendars>
 			<calendar type="generic">
@@ -1176,6 +1215,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'në' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, 'ora' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1184,6 +1226,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'në' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, 'ora' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1196,21 +1241,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
 						<dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH, v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
@@ -1232,11 +1282,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1282,7 +1330,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
@@ -1296,7 +1343,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
@@ -1596,23 +1642,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y GGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a, v</dateFormatItem>
 						<dateFormatItem id="Hmsv">HH:mm:ss, v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a, v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm, v</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH, v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMdd">d.M</dateFormatItem>
@@ -1639,11 +1690,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -1689,7 +1738,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1872,6 +1920,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d.M.y G</dateFormatItem>
@@ -1917,6 +1967,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} tremujorë më parë</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter-short">
+				<displayName>tmj.</displayName>
+			</field>
 			<field type="month">
 				<displayName>muaj</displayName>
 				<relative type="-1">muajin e kaluar</relative>
@@ -2389,6 +2442,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pashkë</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Koihaiku</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Punta-Arenas</exemplarCity>
 			</zone>
@@ -2599,7 +2655,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Pnom-Pen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbur</exemplarCity>
+				<exemplarCity>Ishulli i Kantonit</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kiritimat</exemplarCity>
@@ -3035,9 +3091,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora e Afrikës Perëndimore</generic>
-					<standard>Ora standarde e Afrikës Perëndimore</standard>
-					<daylight>Ora verore e Afrikës Perëndimore</daylight>
+					<standard>Ora e Afrikës Perëndimore</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3425,6 +3479,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ora e Guajanës</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora standarde e Ishujve Hauai-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora e Ishujve Hauai-Aleutian</generic>
@@ -4032,9 +4091,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4956,6 +5017,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">dollarë të Karaibeve Lindore</displayName>
 				<symbol alt="narrow">XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>gilder karaibian</displayName>
+				<displayName count="one">gilder karaibian</displayName>
+				<displayName count="other">gilderë karaibianë</displayName>
+				<symbol>ANG</symbol>
+			</currency>
 			<currency type="XOF">
 				<displayName>Franga e Bregut të Fildishtë</displayName>
 				<displayName count="one">frangë e Bregut të Fildishtë</displayName>
@@ -4983,11 +5050,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol alt="narrow">ZAR</symbol>
 			</currency>
 			<currency type="ZMW">
-				<displayName>Kuaça e Zambikut</displayName>
-				<displayName count="one">kuaçë zambiku</displayName>
-				<displayName count="other">kuaça zambiku</displayName>
+				<displayName>Kuaça e Zambisë</displayName>
+				<displayName count="one">kuaçë zambie</displayName>
+				<displayName count="other">kuaça zambie</displayName>
 				<symbol alt="narrow">ZMW</symbol>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Ari i Zimbabves</displayName>
+				<displayName count="one">ar i Zimbabves</displayName>
+				<displayName count="other">arë të Zimbabves</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
@@ -5215,7 +5287,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milimol për litër</unitPattern>
 				<unitPattern count="other">{0} milimolë për litër</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>pjesë</displayName>
+				<unitPattern count="one">{0} pjesë</unitPattern>
+				<unitPattern count="other">{0} pjesë</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>pjesë për milion</displayName>
 				<unitPattern count="one">{0} pjesë për milion</unitPattern>
 				<unitPattern count="other">{0} pjesë për milion</unitPattern>
@@ -5240,6 +5317,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} molë</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoze</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litra për kilometër</displayName>
 				<unitPattern count="one">{0} litër për kilometër</unitPattern>
@@ -5716,6 +5796,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milimetër mërkuri</unitPattern>
 				<unitPattern count="other">{0} milimetra mërkuri</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>mërkuri</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>paund për inç në katror</displayName>
 				<unitPattern count="one">{0} paund për inç në katror</unitPattern>
@@ -5889,6 +5972,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} kupë metrike</unitPattern>
 				<unitPattern count="other">{0} kupa metrike</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>onsë të lëngshëm metrikë</displayName>
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} onsë të lëngshëm metrikë</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>këmbë-akër</displayName>
 				<unitPattern count="one">{0} këmbë-akër</unitPattern>
@@ -5981,17 +6069,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} çerek imperial</unitPattern>
 				<unitPattern count="other">{0} çerekë imperialë</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>steradianë</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradianë</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katalë</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katalë</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradë</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} faradë</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori [IT]</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kalori [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekuerelë</displayName>
+				<unitPattern count="one">{0} bekuerel</unitPattern>
+				<unitPattern count="other">{0} bekuerelë</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievertë</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievertë</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grej</displayName>
+				<unitPattern count="one">{0} grej</unitPattern>
+				<unitPattern count="other">{0} grej</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram-forcë</displayName>
+				<unitPattern count="one">{0} kilogram-forcë</unitPattern>
+				<unitPattern count="other">{0} kilogram-forcë</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veberë</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="other">{0} veberë</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>dritë</displayName>
+				<unitPattern count="one">{0} dritë</unitPattern>
+				<unitPattern count="other">{0} dritë</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>pjesë për miliard</displayName>
 				<unitPattern count="one">{0} pjesë për miliard</unitPattern>
 				<unitPattern count="other">{0} pjesë për miliard</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>net</displayName>
-				<unitPattern count="one">{0} natë</unitPattern>
-				<unitPattern count="other">{0} net</unitPattern>
-				<perUnitPattern>{0}/natë</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>drejtimi kardinal</displayName>
 				<coordinateUnitPattern type="east">{0} Lindje</coordinateUnitPattern>
@@ -6038,6 +6190,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} njësi</unitPattern>
 				<unitPattern count="other">{0} njësi</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>pjesë</displayName>
+				<unitPattern count="one">{0} pjesë</unitPattern>
+				<unitPattern count="other">{0} pjesë</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>pjesë/milion</displayName>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mi/gal</displayName>
 				<unitPattern count="one">{0} mi/gal</unitPattern>
@@ -6253,6 +6416,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} pisk</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} pinch</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>dritë</displayName>
+				<unitPattern count="one">{0} dritë</unitPattern>
+				<unitPattern count="other">{0} dritë</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>pjesë/miliard</displayName>
+			</unit>
 			<unit type="duration-night">
 				<displayName>net</displayName>
 				<unitPattern count="one">{0} natë</unitPattern>
@@ -6283,10 +6457,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-acre">
 				<displayName>akër</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>pjesë</displayName>
+				<unitPattern count="one">{0} pjesë</unitPattern>
+				<unitPattern count="other">{0} pjesë</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>pjesë/milion</displayName>
+			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} molë</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>mpg</displayName>
 				<unitPattern count="one">{0} mpg</unitPattern>
@@ -6409,11 +6594,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} pisk</unitPattern>
 				<unitPattern count="other">{0} piska</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>net</displayName>
-				<unitPattern count="one">{0} natë</unitPattern>
-				<unitPattern count="other">{0} net</unitPattern>
-				<perUnitPattern>{0}/natë</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>dritë</displayName>
+				<unitPattern count="one">{0} dritë</unitPattern>
+				<unitPattern count="other">{0} dritë</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>pjesë/miliard</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/sr.xml b/make/data/cldr/common/main/sr.xml
index 19e590d21fa..7586e6ca2db 100644
--- a/make/data/cldr/common/main/sr.xml
+++ b/make/data/cldr/common/main/sr.xml
@@ -154,7 +154,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="enm">средњеенглески</language>
 			<language type="eo">есперанто</language>
 			<language type="es">шпански</language>
-			<language type="es_ES">шпански (Европа)</language>
+			<language type="es_419">латиноамерички шпански</language>
+			<language type="es_ES">европски шпански</language>
+			<language type="es_MX">мексички шпански</language>
 			<language type="et">естонски</language>
 			<language type="eu">баскијски</language>
 			<language type="ewo">евондо</language>
@@ -169,6 +171,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="fo">фарски</language>
 			<language type="fon">фон</language>
 			<language type="fr">француски</language>
+			<language type="fr_CA">канадски француски</language>
+			<language type="fr_CH">швајцарски француски</language>
 			<language type="frc">кајунски француски</language>
 			<language type="frm">средњефранцуски</language>
 			<language type="fro">старофранцуски</language>
@@ -281,6 +285,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафија</language>
 			<language type="ksh">келнски</language>
 			<language type="ku">курдски</language>
+			<language type="ku" menu="core">курдски</language>
+			<language type="ku" menu="extension">курманџи</language>
 			<language type="kum">кумички</language>
 			<language type="kut">кутенај</language>
 			<language type="kv">коми</language>
@@ -417,7 +423,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ps">паштунски</language>
 			<language type="ps" alt="variant">пашто</language>
 			<language type="pt">португалски</language>
-			<language type="pt_PT">португалски (Португал)</language>
+			<language type="pt_BR">бразилски португалски</language>
+			<language type="pt_PT">европски португалски</language>
 			<language type="qu">кечуа</language>
 			<language type="quc">киче</language>
 			<language type="raj">раџастански</language>
@@ -808,6 +815,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Кина</territory>
 			<territory type="CO">Колумбија</territory>
 			<territory type="CP">Острво Клипертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Костарика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Зеленортска Острва</territory>
@@ -1081,34 +1089,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">нумеричко сортирање</key>
 			<key type="colStrength">сортирање према јачини</key>
 			<key type="currency">валута</key>
+			<key type="em">презентација емоџија</key>
 			<key type="hc">приказивање времена (12- или 24-часовно)</key>
 			<key type="lb">стил прелома реда</key>
+			<key type="lw">преломи редова унутар речи</key>
 			<key type="ms">систем мерних јединица</key>
 			<key type="numbers">бројеви</key>
+			<key type="ss">Прелом реченице после скраћенице</key>
 			<key type="timezone">Временска зона</key>
 			<key type="va">Варијанта локалитета</key>
 			<key type="x">Приватна употреба</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">будистички календар</type>
+			<type key="calendar" type="buddhist" scope="core">будистички</type>
 			<type key="calendar" type="chinese">кинески календар</type>
+			<type key="calendar" type="chinese" scope="core">кинески</type>
 			<type key="calendar" type="coptic">коптски календар</type>
+			<type key="calendar" type="coptic" scope="core">коптски</type>
 			<type key="calendar" type="dangi">данги календар</type>
+			<type key="calendar" type="dangi" scope="core">данги</type>
 			<type key="calendar" type="ethiopic">етиопски календар</type>
+			<type key="calendar" type="ethiopic" scope="core">етиопски</type>
 			<type key="calendar" type="ethiopic-amete-alem">етиопски амет алем календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">етиопски амет алем</type>
 			<type key="calendar" type="gregorian">грегоријански календар</type>
+			<type key="calendar" type="gregorian" scope="core">грегоријански</type>
 			<type key="calendar" type="hebrew">хебрејски календар</type>
+			<type key="calendar" type="hebrew" scope="core">хебрејски</type>
 			<type key="calendar" type="indian">Индијски национални календар</type>
 			<type key="calendar" type="islamic">исламски календар</type>
+			<type key="calendar" type="islamic" scope="core">исламски</type>
 			<type key="calendar" type="islamic-civil">исламски цивилни календар</type>
+			<type key="calendar" type="islamic-civil" scope="core">исламски цивилни</type>
 			<type key="calendar" type="islamic-tbla">исламски астрономски календар</type>
+			<type key="calendar" type="islamic-tbla" scope="core">исламски астрономски</type>
 			<type key="calendar" type="islamic-umalqura">исламски календар (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">исламски (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 календар</type>
 			<type key="calendar" type="japanese">јапански календар</type>
+			<type key="calendar" type="japanese" scope="core">јапански</type>
 			<type key="calendar" type="persian">персијски календар</type>
+			<type key="calendar" type="persian" scope="core">персијски</type>
 			<type key="calendar" type="roc">календар Републике Кине</type>
+			<type key="calendar" type="roc" scope="core">мингуо</type>
 			<type key="cf" type="account">рачуноводствени формат валуте</type>
+			<type key="cf" type="account" scope="core">рачуноводство</type>
 			<type key="cf" type="standard">стандардни формат валуте</type>
+			<type key="cf" type="standard" scope="core">стандардно</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Сортирај симболе</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Сортирање уз игнорисање симбола</type>
 			<type key="colBackwards" type="no" draft="contributed">Сортирај акценте нормално</type>
@@ -1118,22 +1146,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Сортирај прво велика слова</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Сортирај без обзира на велика и мала слова</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Сортирај мала и велика слова</type>
-			<type key="collation" type="big5han">традиционално кинеско сортирање</type>
 			<type key="collation" type="compat">претходни редослед сортирања, због компатибилности</type>
+			<type key="collation" type="compat" scope="core">компатибилност</type>
 			<type key="collation" type="dictionary">редослед сортирања у речнику</type>
+			<type key="collation" type="dictionary" scope="core">речник</type>
 			<type key="collation" type="ducet">подразумевани Unicode редослед сортирања</type>
+			<type key="collation" type="ducet" scope="core">подразумевани Unicode</type>
 			<type key="collation" type="eor" draft="contributed">европска правила редоследа</type>
-			<type key="collation" type="gb2312han">поједностављено кинеско сортирање</type>
 			<type key="collation" type="phonebook">сортирање као телефонски именик</type>
+			<type key="collation" type="phonebook" scope="core">телефонски именик</type>
 			<type key="collation" type="phonetic">фонетски редослед сортирања</type>
+			<type key="collation" type="phonetic" scope="core">фонетски</type>
 			<type key="collation" type="pinyin">пинјин сортирање</type>
+			<type key="collation" type="pinyin" scope="core">пинјин</type>
 			<type key="collation" type="search">претрага опште намене</type>
+			<type key="collation" type="search" scope="core">претрага</type>
 			<type key="collation" type="searchjl" draft="contributed">Претрага према хангул почетном сугласнику</type>
 			<type key="collation" type="standard">стандардни редослед сортирања</type>
+			<type key="collation" type="standard" scope="core">стандардни</type>
 			<type key="collation" type="stroke">сортирање по броју потеза</type>
+			<type key="collation" type="stroke" scope="core">потези</type>
 			<type key="collation" type="traditional">традиционално сортирање</type>
+			<type key="collation" type="traditional" scope="core">традиционално</type>
 			<type key="collation" type="unihan">редослед сортирања радикалних потеза</type>
+			<type key="collation" type="unihan" scope="core">радикални потези</type>
 			<type key="collation" type="zhuyin">жујин</type>
+			<type key="collation" type="zhuyin" scope="core">жујин</type>
 			<type key="colNormalization" type="no" draft="contributed">Сортирај без нормализације</type>
 			<type key="colNormalization" type="yes" draft="contributed">Сортирај Unicode нормализовано</type>
 			<type key="colNumeric" type="no" draft="contributed">Сортирај цифре појединачно</type>
@@ -1146,18 +1184,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">пуна ширина</type>
 			<type key="d0" type="hwidth">пола ширине</type>
 			<type key="d0" type="npinyin" draft="contributed">Нумеричка</type>
+			<type key="em" type="default" scope="core">подразумевано</type>
+			<type key="em" type="emoji" scope="core">емоџи</type>
+			<type key="em" type="text" scope="core">текст</type>
 			<type key="hc" type="h11">12-часовни систем (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-часовни систем (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-часовни систем (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-часовни систем (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">размакнути стил прелома реда</type>
+			<type key="lb" type="loose" scope="core">размакнути</type>
 			<type key="lb" type="normal">нормални стил прелома реда</type>
+			<type key="lb" type="normal" scope="core">нормални</type>
 			<type key="lb" type="strict">строги стил прелома реда</type>
+			<type key="lb" type="strict" scope="core">строги</type>
+			<type key="lw" type="breakall" scope="core">прелом свега</type>
+			<type key="lw" type="keepall" scope="core">задржи све</type>
+			<type key="lw" type="normal" scope="core">нормално</type>
+			<type key="lw" type="phrase" scope="core">задржи у фразама</type>
 			<type key="m0" type="bgn">БГН (BGN)</type>
 			<type key="m0" type="ungegn">УНГЕГН (BGN)</type>
-			<type key="ms" type="metric">метрички</type>
+			<type key="ms" type="metric">метрички систем</type>
+			<type key="ms" type="metric" scope="core">метрички</type>
 			<type key="ms" type="uksystem">империјални</type>
-			<type key="ms" type="ussystem">амерички</type>
+			<type key="ms" type="uksystem" scope="core">УК</type>
+			<type key="ms" type="ussystem">амерички систем</type>
+			<type key="ms" type="ussystem" scope="core">САД</type>
 			<type key="numbers" type="arab">арапско-индијске цифре</type>
 			<type key="numbers" type="arabext">продужене арапско-индијске цифре</type>
 			<type key="numbers" type="armn">јерменски бројеви</type>
@@ -1202,6 +1257,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">тибетанске цифре</type>
 			<type key="numbers" type="traditional" draft="contributed">Традиционални бројеви</type>
 			<type key="numbers" type="vaii">ваи цифре</type>
+			<type key="ss" type="none" scope="core">Укључено</type>
+			<type key="ss" type="standard" scope="core">Искључено</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрички</measurementSystemName>
@@ -1222,9 +1279,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1339,13 +1393,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E hh:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
+						<dateFormatItem id="GyM">M. y. G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd. MM. y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'č'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
@@ -1372,7 +1428,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
@@ -1573,22 +1628,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">увече</dayPeriod>
 							<dayPeriod type="night1">ноћу</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight">поноћ</dayPeriod>
-							<dayPeriod type="noon">подне</dayPeriod>
-							<dayPeriod type="morning1">ујутру</dayPeriod>
-							<dayPeriod type="afternoon1">по подне</dayPeriod>
-							<dayPeriod type="evening1">увече</dayPeriod>
-							<dayPeriod type="night1">ноћу</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight">поноћ</dayPeriod>
-							<dayPeriod type="noon">подне</dayPeriod>
-							<dayPeriod type="morning1">ујутру</dayPeriod>
-							<dayPeriod type="afternoon1">по подне</dayPeriod>
-							<dayPeriod type="evening1">увече</dayPeriod>
-							<dayPeriod type="night1">ноћу</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
@@ -1697,11 +1736,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d. M.</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM.</dateFormatItem>
@@ -1733,7 +1772,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1747,7 +1785,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1907,6 +1944,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="0">АХ</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">M. y. G</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd. MM. y, E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
 				<eras>
@@ -3038,6 +3081,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Ускршње острво</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Којајке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта Аренас</exemplarCity>
 			</zone>
@@ -3303,9 +3349,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пном Пен</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3982,9 +4025,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западно-афричко време</generic>
-					<standard>Западно-афричко стандардно време</standard>
-					<daylight>Западно-афричко летње време</daylight>
+					<standard>Западно-афричко време</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4385,6 +4426,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гвајана време</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавајско-алеутско стандардно време</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавајско-алеутско време</generic>
@@ -4835,6 +4881,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Чуук време</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Турска време</generic>
+					<standard>Турска стандардно време</standard>
+					<daylight>Турска летње рачунање времена</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Туркменистан време</generic>
@@ -5002,9 +5055,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -6703,6 +6758,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="few">источнокарипскa доларa</displayName>
 				<displayName count="other">источнокарипскиx доларa</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>карипски гулден</displayName>
+				<displayName count="one">карипски гулден</displayName>
+				<displayName count="few">карипски гулден</displayName>
+				<displayName count="other">карипски гулден</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Посебна цртаћа права</displayName>
 				<displayName count="one">посебно цртаће право</displayName>
@@ -6847,6 +6908,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="few">зимбабвејска долара (1980–2008)</displayName>
 				<displayName count="other">зимбабвејских долара (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>зимбабвеанско злато</displayName>
+				<displayName count="one">зимбабвеанско злато</displayName>
+				<displayName count="few">зимбабвеанско злато</displayName>
+				<displayName count="other">зимбабвеанско злато</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Зимбабвеански долар (2009)</displayName>
 				<displayName count="one">зимбабвејски долар (2009)</displayName>
@@ -7318,7 +7385,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} ставки</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} ставки</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>делови</displayName>
+				<unitPattern count="one">{0} део</unitPattern>
+				<unitPattern count="few">{0} дела</unitPattern>
+				<unitPattern count="other">{0} делова</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>честица на милион</displayName>
 				<unitPattern count="one">{0} честица на милион</unitPattern>
@@ -7383,6 +7456,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} мола</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} мола</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глукозе</displayName>
+				<unitPattern count="one">{0} глукозе</unitPattern>
+				<unitPattern count="few">{0} глукозе</unitPattern>
+				<unitPattern count="other">{0} глукозе</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>inanimate</gender>
 				<displayName>литри по километру</displayName>
@@ -8353,7 +8432,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-point">
 				<gender>feminine</gender>
-				<displayName>типографске тачке</displayName>
 				<unitPattern count="one">{0} типографска тачка</unitPattern>
 				<unitPattern count="one" case="accusative">{0} типографску тачку</unitPattern>
 				<unitPattern count="one" case="genitive">{0} типографске тачке</unitPattern>
@@ -8674,6 +8752,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} милиметара живиног стуба</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} милиметара живиног стуба</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>живе</displayName>
+				<unitPattern count="one">{0} живе</unitPattern>
+				<unitPattern count="few">{0} живе</unitPattern>
+				<unitPattern count="other">{0} живе</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунте по квадратном инчу</displayName>
 				<unitPattern count="one">{0} фунта по квадратном инчу</unitPattern>
@@ -8843,7 +8927,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="speed-beaufort">
 				<displayName>Бофор</displayName>
 				<unitPattern count="one">Бофор {0}</unitPattern>
-				<unitPattern count="few">Б {0}</unitPattern>
+				<unitPattern count="few">B {0}</unitPattern>
 				<unitPattern count="other">Бофор {0}</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
@@ -9108,6 +9192,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} метричких шоља</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} метричких шоља</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>течне унце</displayName>
+				<unitPattern count="one">{0} течна унца</unitPattern>
+				<unitPattern count="few">{0} течне унце</unitPattern>
+				<unitPattern count="other">{0} течних унци</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акер стопе</displayName>
 				<unitPattern count="one">{0} акер стопа</unitPattern>
@@ -9204,9 +9294,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} империјске четвртине</unitPattern>
 				<unitPattern count="other">{0} империјских четвртина</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>стерадианси</displayName>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>катали</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="few">{0} катала</unitPattern>
+				<unitPattern count="other">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулони</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="few">{0} кулона</unitPattern>
+				<unitPattern count="other">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фаради</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="few">{0} фарада</unitPattern>
+				<unitPattern count="other">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>хенрији</displayName>
+				<unitPattern count="one">{0} хенри</unitPattern>
+				<unitPattern count="few">{0} хенрија</unitPattern>
+				<unitPattern count="other">{0} хенрија</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сименси</displayName>
+				<unitPattern count="one">{0} сименс</unitPattern>
+				<unitPattern count="few">{0} сименса</unitPattern>
+				<unitPattern count="other">{0} сименса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калорије [IT]</displayName>
+				<unitPattern count="one">{0} калорија [IT]</unitPattern>
+				<unitPattern count="few">{0} калорије [IT]</unitPattern>
+				<unitPattern count="other">{0} калорија [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерели</displayName>
+				<unitPattern count="one">{0} бекерел</unitPattern>
+				<unitPattern count="few">{0} бекерела</unitPattern>
+				<unitPattern count="other">{0} бекерела</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>сиверти</displayName>
+				<unitPattern count="one">{0} сиверт</unitPattern>
+				<unitPattern count="few">{0} сиверта</unitPattern>
+				<unitPattern count="other">{0} сиверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>греји</displayName>
+				<unitPattern count="one">{0} греј</unitPattern>
+				<unitPattern count="few">{0} греја</unitPattern>
+				<unitPattern count="other">{0} грејева</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килопонд</displayName>
+				<unitPattern count="one">{0} килопонд</unitPattern>
+				<unitPattern count="few">{0} килопонда</unitPattern>
+				<unitPattern count="other">{0} килопонда</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесле</displayName>
+				<unitPattern count="one">{0} тесла</unitPattern>
+				<unitPattern count="few">{0} тесле</unitPattern>
+				<unitPattern count="other">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебери</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="few">{0} вебера</unitPattern>
+				<unitPattern count="other">{0} вебера</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>светло</displayName>
 				<unitPattern count="one">{0} светло</unitPattern>
 				<unitPattern count="one" case="accusative">{0} светло</unitPattern>
 				<unitPattern count="one" case="genitive">{0} светла</unitPattern>
@@ -9220,7 +9384,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} светала</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} светала</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>inanimate</gender>
 				<displayName>делови на милијарду</displayName>
 				<unitPattern count="one">{0} део на милијарду</unitPattern>
@@ -9238,7 +9402,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>ноћ</displayName>
 				<unitPattern count="one">{0} ноћ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ноћ</unitPattern>
 				<unitPattern count="one" case="genitive">{0} ноћи</unitPattern>
@@ -9251,14 +9414,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ноћи</unitPattern>
 				<unitPattern count="other" case="genitive">{0} ноћи</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} ноћи</unitPattern>
-				<perUnitPattern>{0}/ноћ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>страна света</displayName>
-				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
@@ -9301,12 +9459,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} ставке</unitPattern>
 				<unitPattern count="other">{0} ставки</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>део</displayName>
+				<unitPattern count="one">{0} део</unitPattern>
+				<unitPattern count="few">{0} дела</unitPattern>
+				<unitPattern count="other">{0} делова</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>проценат</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>промил</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>L/100 km</displayName>
 				<unitPattern count="one">{0} L/100 km</unitPattern>
@@ -9511,9 +9678,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="speed-beaufort">
 				<displayName>Bf</displayName>
-				<unitPattern count="one">Б {0}</unitPattern>
-				<unitPattern count="few">Б {0}</unitPattern>
-				<unitPattern count="other">Б {0}</unitPattern>
+				<unitPattern count="one">B {0}</unitPattern>
+				<unitPattern count="few">B {0}</unitPattern>
+				<unitPattern count="other">B {0}</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
 				<displayName>степени Фаренхајта</displayName>
@@ -9585,13 +9752,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} прстохвата</unitPattern>
 				<unitPattern count="other">{0} прстохвата</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>светло</displayName>
 				<unitPattern count="one">{0} светло</unitPattern>
 				<unitPattern count="few">{0} светла</unitPattern>
 				<unitPattern count="other">{0} светала</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>делови/милијарда</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -9610,9 +9780,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="concentr-part">
+				<displayName>део</displayName>
+				<unitPattern count="one">{0} део</unitPattern>
+				<unitPattern count="few">{0} дела</unitPattern>
+				<unitPattern count="other">{0} делова</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>L/100km</displayName>
 				<unitPattern count="one">{0} L/100km</unitPattern>
@@ -9712,6 +9891,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} кс</unitPattern>
 				<unitPattern count="other">{0} кс</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">B {0}</unitPattern>
+				<unitPattern count="few">B {0}</unitPattern>
+				<unitPattern count="other">B {0}</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName>l</displayName>
 			</unit>
@@ -9743,18 +9927,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0} qt Imp</unitPattern>
 				<unitPattern count="other">{0} qt Imp</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>светло</displayName>
-				<unitPattern count="one">{0} светло</unitPattern>
-				<unitPattern count="few">{0} светла</unitPattern>
-				<unitPattern count="other">{0} светала</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>ноћ</displayName>
-				<unitPattern count="one">{0} ноћ</unitPattern>
-				<unitPattern count="few">{0} ноћи</unitPattern>
-				<unitPattern count="other">{0} ноћи</unitPattern>
-				<perUnitPattern>{0}/ноћ</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/sr_Cyrl_BA.xml b/make/data/cldr/common/main/sr_Cyrl_BA.xml
index d112a24c27f..c84ba99659a 100644
--- a/make/data/cldr/common/main/sr_Cyrl_BA.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_BA.xml
@@ -602,9 +602,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западно-афричко вријеме</generic>
-					<standard>Западно-афричко стандардно вријеме</standard>
-					<daylight>Западно-афричко љетње вријеме</daylight>
+					<standard>Западно-афричко вријеме</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -949,6 +947,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гвајана вријеме</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавајско-алеутско стандардно вријеме</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавајско-алеутско вријеме</generic>
@@ -1595,7 +1598,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} свјетала</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} свјетала</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>дијелови на милијарду</displayName>
 				<unitPattern count="one">{0} дио на милијарду</unitPattern>
 				<unitPattern count="one" case="accusative">{0} дио на милијарду</unitPattern>
@@ -1627,18 +1630,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} грана</unitPattern>
 				<unitPattern count="other">{0} гранова</unitPattern>
 			</unit>
-			<unit type="speed-beaufort">
-				<unitPattern count="one">B {0}</unitPattern>
-				<unitPattern count="few">B {0}</unitPattern>
-				<unitPattern count="other">Б {0}</unitPattern>
-			</unit>
 			<unit type="speed-light-speed">
 				<displayName>свјетло</displayName>
 				<unitPattern count="one">{0} свјетло</unitPattern>
 				<unitPattern count="few">{0} свјетла</unitPattern>
 				<unitPattern count="other">{0} свјетала</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>дијелови/милијарда</displayName>
 			</unit>
 		</unitLength>
@@ -1670,9 +1668,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="speed-beaufort">
 				<displayName>Bft</displayName>
-				<unitPattern count="one">B {0}</unitPattern>
-				<unitPattern count="few">B {0}</unitPattern>
-				<unitPattern count="other">B {0}</unitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<unitPattern count="one">{0}/gal Imp</unitPattern>
@@ -1702,7 +1697,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} свјетла</unitPattern>
 				<unitPattern count="other">{0} свјетала</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>дијелови/милијарда</displayName>
 			</unit>
 		</unitLength>
diff --git a/make/data/cldr/common/main/sr_Cyrl_ME.xml b/make/data/cldr/common/main/sr_Cyrl_ME.xml
index 058e55d769d..3d1a4984a81 100644
--- a/make/data/cldr/common/main/sr_Cyrl_ME.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_ME.xml
@@ -129,11 +129,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</eras>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="MMMMW" count="one" draft="contributed">MMMM: W. 'недеља'</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="few" draft="contributed">MMMM: W. 'недеља'</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one" draft="contributed">W. 'сједмица' 'у' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="few" draft="contributed">W. 'сједмица' 'у' MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other" draft="contributed">W. 'сједмица' 'у' MMMM</dateFormatItem>
-						<dateFormatItem id="yw" count="one" draft="contributed">w. 'недеља' 'у' Y.</dateFormatItem>
-						<dateFormatItem id="yw" count="few" draft="contributed">w. 'недеља' 'у' Y.</dateFormatItem>
+						<dateFormatItem id="yw" count="one" draft="contributed">w. 'сједмица' 'у' Y.</dateFormatItem>
+						<dateFormatItem id="yw" count="few" draft="contributed">w. 'сједмица' 'у' Y.</dateFormatItem>
 						<dateFormatItem id="yw" count="other" draft="contributed">w. 'сједмица' 'у' Y.</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
diff --git a/make/data/cldr/common/main/sr_Latn.xml b/make/data/cldr/common/main/sr_Latn.xml
index edbc0fa8ae9..54655b62fdd 100644
--- a/make/data/cldr/common/main/sr_Latn.xml
+++ b/make/data/cldr/common/main/sr_Latn.xml
@@ -153,7 +153,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="enm">srednjeengleski</language>
 			<language type="eo">esperanto</language>
 			<language type="es">španski</language>
-			<language type="es_ES">španski (Evropa)</language>
+			<language type="es_419">latinoamerički španski</language>
+			<language type="es_ES">evropski španski</language>
+			<language type="es_MX">meksički španski</language>
 			<language type="et">estonski</language>
 			<language type="eu">baskijski</language>
 			<language type="ewo">evondo</language>
@@ -168,6 +170,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fo">farski</language>
 			<language type="fon">fon</language>
 			<language type="fr">francuski</language>
+			<language type="fr_CA">kanadski francuski</language>
+			<language type="fr_CH">švajcarski francuski</language>
 			<language type="frc">kajunski francuski</language>
 			<language type="frm">srednjefrancuski</language>
 			<language type="fro">starofrancuski</language>
@@ -280,6 +284,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafija</language>
 			<language type="ksh">kelnski</language>
 			<language type="ku">kurdski</language>
+			<language type="ku" menu="core">kurdski</language>
+			<language type="ku" menu="extension">kurmandži</language>
 			<language type="kum">kumički</language>
 			<language type="kut">kutenaj</language>
 			<language type="kv">komi</language>
@@ -416,7 +422,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ps">paštunski</language>
 			<language type="ps" alt="variant">pašto</language>
 			<language type="pt">portugalski</language>
-			<language type="pt_PT">portugalski (Portugal)</language>
+			<language type="pt_BR">brazilski portugalski</language>
+			<language type="pt_PT">evropski portugalski</language>
 			<language type="qu">kečua</language>
 			<language type="quc">kiče</language>
 			<language type="raj">radžastanski</language>
@@ -807,6 +814,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Kina</territory>
 			<territory type="CO">Kolumbija</territory>
 			<territory type="CP">Ostrvo Kliperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Zelenortska Ostrva</territory>
@@ -1080,34 +1088,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="colNumeric">numeričko sortiranje</key>
 			<key type="colStrength">sortiranje prema jačini</key>
 			<key type="currency">valuta</key>
+			<key type="em">prezentacija emodžija</key>
 			<key type="hc">prikazivanje vremena (12- ili 24-časovno)</key>
 			<key type="lb">stil preloma reda</key>
+			<key type="lw">prelomi redova unutar reči</key>
 			<key type="ms">sistem mernih jedinica</key>
 			<key type="numbers">brojevi</key>
+			<key type="ss">Prelom rečenice posle skraćenice</key>
 			<key type="timezone">Vremenska zona</key>
 			<key type="va">Varijanta lokaliteta</key>
 			<key type="x">Privatna upotreba</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">budistički kalendar</type>
+			<type key="calendar" type="buddhist" scope="core">budistički</type>
 			<type key="calendar" type="chinese">kineski kalendar</type>
+			<type key="calendar" type="chinese" scope="core">kineski</type>
 			<type key="calendar" type="coptic">koptski kalendar</type>
+			<type key="calendar" type="coptic" scope="core">koptski</type>
 			<type key="calendar" type="dangi">dangi kalendar</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">etiopski kalendar</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopski</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopski amet alem kalendar</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopski amet alem</type>
 			<type key="calendar" type="gregorian">gregorijanski kalendar</type>
+			<type key="calendar" type="gregorian" scope="core">gregorijanski</type>
 			<type key="calendar" type="hebrew">hebrejski kalendar</type>
+			<type key="calendar" type="hebrew" scope="core">hebrejski</type>
 			<type key="calendar" type="indian">Indijski nacionalni kalendar</type>
 			<type key="calendar" type="islamic">islamski kalendar</type>
+			<type key="calendar" type="islamic" scope="core">islamski</type>
 			<type key="calendar" type="islamic-civil">islamski civilni kalendar</type>
+			<type key="calendar" type="islamic-civil" scope="core">islamski civilni</type>
 			<type key="calendar" type="islamic-tbla">islamski astronomski kalendar</type>
+			<type key="calendar" type="islamic-tbla" scope="core">islamski astronomski</type>
 			<type key="calendar" type="islamic-umalqura">islamski kalendar (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islamski (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 kalendar</type>
 			<type key="calendar" type="japanese">japanski kalendar</type>
+			<type key="calendar" type="japanese" scope="core">japanski</type>
 			<type key="calendar" type="persian">persijski kalendar</type>
+			<type key="calendar" type="persian" scope="core">persijski</type>
 			<type key="calendar" type="roc">kalendar Republike Kine</type>
+			<type key="calendar" type="roc" scope="core">minguo</type>
 			<type key="cf" type="account">računovodstveni format valute</type>
+			<type key="cf" type="account" scope="core">računovodstvo</type>
 			<type key="cf" type="standard">standardni format valute</type>
+			<type key="cf" type="standard" scope="core">standardno</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Sortiraj simbole</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Sortiranje uz ignorisanje simbola</type>
 			<type key="colBackwards" type="no" draft="contributed">Sortiraj akcente normalno</type>
@@ -1117,22 +1145,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="colCaseFirst" type="upper" draft="contributed">Sortiraj prvo velika slova</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Sortiraj bez obzira na velika i mala slova</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Sortiraj mala i velika slova</type>
-			<type key="collation" type="big5han">tradicionalno kinesko sortiranje</type>
 			<type key="collation" type="compat">prethodni redosled sortiranja, zbog kompatibilnosti</type>
+			<type key="collation" type="compat" scope="core">kompatibilnost</type>
 			<type key="collation" type="dictionary">redosled sortiranja u rečniku</type>
+			<type key="collation" type="dictionary" scope="core">rečnik</type>
 			<type key="collation" type="ducet">podrazumevani Unicode redosled sortiranja</type>
+			<type key="collation" type="ducet" scope="core">podrazumevani Unicode</type>
 			<type key="collation" type="eor" draft="contributed">evropska pravila redosleda</type>
-			<type key="collation" type="gb2312han">pojednostavljeno kinesko sortiranje</type>
 			<type key="collation" type="phonebook">sortiranje kao telefonski imenik</type>
+			<type key="collation" type="phonebook" scope="core">telefonski imenik</type>
 			<type key="collation" type="phonetic">fonetski redosled sortiranja</type>
+			<type key="collation" type="phonetic" scope="core">fonetski</type>
 			<type key="collation" type="pinyin">pinjin sortiranje</type>
+			<type key="collation" type="pinyin" scope="core">pinjin</type>
 			<type key="collation" type="search">pretraga opšte namene</type>
+			<type key="collation" type="search" scope="core">pretraga</type>
 			<type key="collation" type="searchjl" draft="contributed">Pretraga prema hangul početnom suglasniku</type>
 			<type key="collation" type="standard">standardni redosled sortiranja</type>
+			<type key="collation" type="standard" scope="core">standardni</type>
 			<type key="collation" type="stroke">sortiranje po broju poteza</type>
+			<type key="collation" type="stroke" scope="core">potezi</type>
 			<type key="collation" type="traditional">tradicionalno sortiranje</type>
+			<type key="collation" type="traditional" scope="core">tradicionalno</type>
 			<type key="collation" type="unihan">redosled sortiranja radikalnih poteza</type>
+			<type key="collation" type="unihan" scope="core">radikalni potezi</type>
 			<type key="collation" type="zhuyin">žujin</type>
+			<type key="collation" type="zhuyin" scope="core">žujin</type>
 			<type key="colNormalization" type="no" draft="contributed">Sortiraj bez normalizacije</type>
 			<type key="colNormalization" type="yes" draft="contributed">Sortiraj Unicode normalizovano</type>
 			<type key="colNumeric" type="no" draft="contributed">Sortiraj cifre pojedinačno</type>
@@ -1145,18 +1183,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="d0" type="fwidth">puna širina</type>
 			<type key="d0" type="hwidth">pola širine</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerička</type>
+			<type key="em" type="default" scope="core">podrazumevano</type>
+			<type key="em" type="emoji" scope="core">emodži</type>
+			<type key="em" type="text" scope="core">tekst</type>
 			<type key="hc" type="h11">12-časovni sistem (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-časovni sistem (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-časovni sistem (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-časovni sistem (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">razmaknuti stil preloma reda</type>
+			<type key="lb" type="loose" scope="core">razmaknuti</type>
 			<type key="lb" type="normal">normalni stil preloma reda</type>
+			<type key="lb" type="normal" scope="core">normalni</type>
 			<type key="lb" type="strict">strogi stil preloma reda</type>
+			<type key="lb" type="strict" scope="core">strogi</type>
+			<type key="lw" type="breakall" scope="core">prelom svega</type>
+			<type key="lw" type="keepall" scope="core">zadrži sve</type>
+			<type key="lw" type="normal" scope="core">normalno</type>
+			<type key="lw" type="phrase" scope="core">zadrži u frazama</type>
 			<type key="m0" type="bgn">BGN (BGN)</type>
 			<type key="m0" type="ungegn">UNGEGN (BGN)</type>
-			<type key="ms" type="metric">metrički</type>
+			<type key="ms" type="metric">metrički sistem</type>
+			<type key="ms" type="metric" scope="core">metrički</type>
 			<type key="ms" type="uksystem">imperijalni</type>
-			<type key="ms" type="ussystem">američki</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
+			<type key="ms" type="ussystem">američki sistem</type>
+			<type key="ms" type="ussystem" scope="core">SAD</type>
 			<type key="numbers" type="arab">arapsko-indijske cifre</type>
 			<type key="numbers" type="arabext">produžene arapsko-indijske cifre</type>
 			<type key="numbers" type="armn">jermenski brojevi</type>
@@ -1201,6 +1256,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="tibt">tibetanske cifre</type>
 			<type key="numbers" type="traditional" draft="contributed">Tradicionalni brojevi</type>
 			<type key="numbers" type="vaii">vai cifre</type>
+			<type key="ss" type="none" scope="core">Uključeno</type>
+			<type key="ss" type="standard" scope="core">Isključeno</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">metrički</measurementSystemName>
@@ -1222,9 +1279,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1339,13 +1393,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E hh:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E hh:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y. G</dateFormatItem>
+						<dateFormatItem id="GyM">M. y. G</dateFormatItem>
 						<dateFormatItem id="GyMd">d.M.y. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd. MM. y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
 						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'č'. v</dateFormatItem>
 						<dateFormatItem id="Md">d.M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
 						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
@@ -1372,7 +1428,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
@@ -1573,22 +1628,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="evening1">uveče</dayPeriod>
 							<dayPeriod type="night1">noću</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight">ponoć</dayPeriod>
-							<dayPeriod type="noon">podne</dayPeriod>
-							<dayPeriod type="morning1">ujutru</dayPeriod>
-							<dayPeriod type="afternoon1">po podne</dayPeriod>
-							<dayPeriod type="evening1">uveče</dayPeriod>
-							<dayPeriod type="night1">noću</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight">ponoć</dayPeriod>
-							<dayPeriod type="noon">podne</dayPeriod>
-							<dayPeriod type="morning1">ujutru</dayPeriod>
-							<dayPeriod type="afternoon1">po podne</dayPeriod>
-							<dayPeriod type="evening1">uveče</dayPeriod>
-							<dayPeriod type="night1">noću</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
@@ -1697,11 +1736,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d. MMM y. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d. MMM y. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'h' v</dateFormatItem>
 						<dateFormatItem id="Md">d. M.</dateFormatItem>
 						<dateFormatItem id="MEd">E, d. M.</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM.</dateFormatItem>
@@ -1733,7 +1772,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1747,7 +1785,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1907,6 +1944,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="0">AH</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">M. y. G</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd. MM. y, E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
 				<eras>
@@ -3038,6 +3081,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Uskršnje ostrvo</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Kojajke</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Punta Arenas</exemplarCity>
 			</zone>
@@ -3303,9 +3349,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Pnom Pen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderberi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Kanton</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3982,9 +4025,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Zapadno-afričko vreme</generic>
-					<standard>Zapadno-afričko standardno vreme</standard>
-					<daylight>Zapadno-afričko letnje vreme</daylight>
+					<standard>Zapadno-afričko vreme</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4385,6 +4426,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Gvajana vreme</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havajsko-aleutsko standardno vreme</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havajsko-aleutsko vreme</generic>
@@ -4835,6 +4881,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Čuuk vreme</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Turska vreme</generic>
+					<standard>Turska standardno vreme</standard>
+					<daylight>Turska letnje računanje vremena</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Turkmenistan vreme</generic>
@@ -5002,9 +5055,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -6703,6 +6758,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">istočnokaripska dolara</displayName>
 				<displayName count="other">istočnokaripskix dolara</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karipski gulden</displayName>
+				<displayName count="one">karipski gulden</displayName>
+				<displayName count="few">karipski gulden</displayName>
+				<displayName count="other">karipski gulden</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Posebna crtaća prava</displayName>
 				<displayName count="one">posebno crtaće pravo</displayName>
@@ -6847,6 +6908,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="few">zimbabvejska dolara (1980–2008)</displayName>
 				<displayName count="other">zimbabvejskih dolara (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabveansko zlato</displayName>
+				<displayName count="one">zimbabveansko zlato</displayName>
+				<displayName count="few">zimbabveansko zlato</displayName>
+				<displayName count="other">zimbabveansko zlato</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabveanski dolar (2009)</displayName>
 				<displayName count="one">zimbabvejski dolar (2009)</displayName>
@@ -7216,7 +7283,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} stavki</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} stavki</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>delovi</displayName>
+				<unitPattern count="one">{0} deo</unitPattern>
+				<unitPattern count="few">{0} dela</unitPattern>
+				<unitPattern count="other">{0} delova</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
 				<displayName>čestica na milion</displayName>
 				<unitPattern count="one">{0} čestica na milion</unitPattern>
@@ -7272,6 +7345,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} mola</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} mola</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukoze</displayName>
+				<unitPattern count="one">{0} glukoze</unitPattern>
+				<unitPattern count="few">{0} glukoze</unitPattern>
+				<unitPattern count="other">{0} glukoze</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>inanimate</gender>
 				<displayName>litri po kilometru</displayName>
@@ -7806,15 +7885,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<gender>inanimate</gender>
 				<displayName>kilovat-sati na 100 kilometara</displayName>
 				<unitPattern count="one">{0} kilovat-sat na 100 kilometara</unitPattern>
-				<unitPattern count="one" case="accusative">{0} kilovat-sat na 100 kilometara</unitPattern>
 				<unitPattern count="one" case="genitive">{0} kilovat-sata na 100 kilometara</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} kilovat-satom na 100 kilometara</unitPattern>
 				<unitPattern count="few">{0} kilovat-sata na 100 kilometara</unitPattern>
-				<unitPattern count="few" case="accusative">{0} kilovat-sata na 100 kilometara</unitPattern>
 				<unitPattern count="few" case="genitive">{0} kilovat-sata na 100 kilometara</unitPattern>
 				<unitPattern count="few" case="instrumental">{0} kilovat-sata na 100 kilometara</unitPattern>
 				<unitPattern count="other">{0} kilovat-sati na 100 kilometara</unitPattern>
-				<unitPattern count="other" case="accusative">{0} kilovat-sati na 100 kilometara</unitPattern>
 				<unitPattern count="other" case="genitive">{0} kilovat-sati na 100 kilometara</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} kilovat-sati na 100 kilometara</unitPattern>
 			</unit>
@@ -8110,7 +8186,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="length-point">
 				<gender>feminine</gender>
-				<displayName>tipografske tačke</displayName>
 				<unitPattern count="one">{0} tipografska tačka</unitPattern>
 				<unitPattern count="one" case="accusative">{0} tipografsku tačku</unitPattern>
 				<unitPattern count="one" case="genitive">{0} tipografske tačke</unitPattern>
@@ -8398,6 +8473,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} milimetara živinog stuba</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} milimetara živinog stuba</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>žive</displayName>
+				<unitPattern count="one">{0} žive</unitPattern>
+				<unitPattern count="few">{0} žive</unitPattern>
+				<unitPattern count="other">{0} žive</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funte po kvadratnom inču</displayName>
 				<unitPattern count="one">{0} funta po kvadratnom inču</unitPattern>
@@ -8772,6 +8853,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} metričkih šolja</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} metričkih šolja</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>tečne unce</displayName>
+				<unitPattern count="one">{0} tečna unca</unitPattern>
+				<unitPattern count="few">{0} tečne unce</unitPattern>
+				<unitPattern count="other">{0} tečnih unci</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>aker stope</displayName>
 				<unitPattern count="one">{0} aker stopa</unitPattern>
@@ -8868,61 +8955,114 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} imperijske četvrtine</unitPattern>
 				<unitPattern count="other">{0} imperijskih četvrtina</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradiansi</displayName>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katali</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="few">{0} katala</unitPattern>
+				<unitPattern count="other">{0} katala</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kuloni</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="few">{0} kulona</unitPattern>
+				<unitPattern count="other">{0} kulona</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>faradi</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="few">{0} farada</unitPattern>
+				<unitPattern count="other">{0} farada</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henriji</displayName>
+				<unitPattern count="one">{0} henri</unitPattern>
+				<unitPattern count="few">{0} henrija</unitPattern>
+				<unitPattern count="other">{0} henrija</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simensi</displayName>
+				<unitPattern count="one">{0} simens</unitPattern>
+				<unitPattern count="few">{0} simensa</unitPattern>
+				<unitPattern count="other">{0} simensa</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalorije [IT]</displayName>
+				<unitPattern count="one">{0} kalorija [IT]</unitPattern>
+				<unitPattern count="few">{0} kalorije [IT]</unitPattern>
+				<unitPattern count="other">{0} kalorija [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereli</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="few">{0} bekerela</unitPattern>
+				<unitPattern count="other">{0} bekerela</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>siverti</displayName>
+				<unitPattern count="one">{0} sivert</unitPattern>
+				<unitPattern count="few">{0} siverta</unitPattern>
+				<unitPattern count="other">{0} siverta</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greji</displayName>
+				<unitPattern count="one">{0} grej</unitPattern>
+				<unitPattern count="few">{0} greja</unitPattern>
+				<unitPattern count="other">{0} grejeva</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilopond</displayName>
+				<unitPattern count="one">{0} kilopond</unitPattern>
+				<unitPattern count="few">{0} kiloponda</unitPattern>
+				<unitPattern count="other">{0} kiloponda</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesle</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="few">{0} tesle</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veberi</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="few">{0} vebera</unitPattern>
+				<unitPattern count="other">{0} vebera</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>svetlo</displayName>
-				<unitPattern count="one">{0} svetlo</unitPattern>
-				<unitPattern count="one" case="accusative">{0} svetlo</unitPattern>
 				<unitPattern count="one" case="genitive">{0} svetla</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} svetlom</unitPattern>
-				<unitPattern count="few">{0} svetla</unitPattern>
-				<unitPattern count="few" case="accusative">{0} svetla</unitPattern>
 				<unitPattern count="few" case="genitive">{0} svetla</unitPattern>
 				<unitPattern count="few" case="instrumental">{0} svetla</unitPattern>
-				<unitPattern count="other">{0} svetala</unitPattern>
-				<unitPattern count="other" case="accusative">{0} svetala</unitPattern>
 				<unitPattern count="other" case="genitive">{0} svetala</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} svetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>inanimate</gender>
 				<displayName>delovi na milijardu</displayName>
 				<unitPattern count="one">{0} deo na milijardu</unitPattern>
-				<unitPattern count="one" case="accusative">{0} deo na milijardu</unitPattern>
 				<unitPattern count="one" case="genitive">{0} dela na milijardu</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} delom na milijardu</unitPattern>
 				<unitPattern count="few">{0} dela na milijardu</unitPattern>
-				<unitPattern count="few" case="accusative">{0} dela na milijardu</unitPattern>
 				<unitPattern count="few" case="genitive">{0} dela na milijardu</unitPattern>
 				<unitPattern count="few" case="instrumental">{0} dela na milijardu</unitPattern>
 				<unitPattern count="other">{0} delova na milijardu</unitPattern>
-				<unitPattern count="other" case="accusative">{0} delova na milijardu</unitPattern>
 				<unitPattern count="other" case="genitive">{0} delova na milijardu</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} delova na milijardu</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>noć</displayName>
-				<unitPattern count="one">{0} noć</unitPattern>
-				<unitPattern count="one" case="accusative">{0} noć</unitPattern>
 				<unitPattern count="one" case="genitive">{0} noći</unitPattern>
 				<unitPattern count="one" case="instrumental">{0} noći</unitPattern>
-				<unitPattern count="few">{0} noći</unitPattern>
-				<unitPattern count="few" case="accusative">{0} noći</unitPattern>
 				<unitPattern count="few" case="genitive">{0} noći</unitPattern>
 				<unitPattern count="few" case="instrumental">{0} noći</unitPattern>
-				<unitPattern count="other">{0} noći</unitPattern>
-				<unitPattern count="other" case="accusative">{0} noći</unitPattern>
 				<unitPattern count="other" case="genitive">{0} noći</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} noći</unitPattern>
-				<perUnitPattern>{0}/noć</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>strana sveta</displayName>
-				<coordinateUnitPattern type="east">{0} E</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} N</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} S</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} W</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
@@ -8965,12 +9105,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} stavke</unitPattern>
 				<unitPattern count="other">{0} stavki</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>deo</displayName>
+				<unitPattern count="one">{0} deo</unitPattern>
+				<unitPattern count="few">{0} dela</unitPattern>
+				<unitPattern count="other">{0} delova</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>procenat</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>promil</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>L/100 km</displayName>
 				<unitPattern count="one">{0} L/100 km</unitPattern>
@@ -9249,13 +9398,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} prstohvata</unitPattern>
 				<unitPattern count="other">{0} prstohvata</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>svetlo</displayName>
 				<unitPattern count="one">{0} svetlo</unitPattern>
 				<unitPattern count="few">{0} svetla</unitPattern>
 				<unitPattern count="other">{0} svetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>delovi/milijarda</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -9274,9 +9426,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="concentr-part">
+				<displayName>deo</displayName>
+				<unitPattern count="one">{0} deo</unitPattern>
+				<unitPattern count="few">{0} dela</unitPattern>
+				<unitPattern count="other">{0} delova</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>L/100km</displayName>
 				<unitPattern count="one">{0} L/100km</unitPattern>
@@ -9376,6 +9537,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} ks</unitPattern>
 				<unitPattern count="other">{0} ks</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">B {0}</unitPattern>
+				<unitPattern count="few">B {0}</unitPattern>
+				<unitPattern count="other">B {0}</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName>l</displayName>
 			</unit>
@@ -9407,18 +9573,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} qt Imp</unitPattern>
 				<unitPattern count="other">{0} qt Imp</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>svetlo</displayName>
-				<unitPattern count="one">{0} svetlo</unitPattern>
-				<unitPattern count="few">{0} svetla</unitPattern>
-				<unitPattern count="other">{0} svetala</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>noć</displayName>
-				<unitPattern count="one">{0} noć</unitPattern>
-				<unitPattern count="few">{0} noći</unitPattern>
-				<unitPattern count="other">{0} noći</unitPattern>
-				<perUnitPattern>{0}/noć</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal [IT]</displayName>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/sr_Latn_BA.xml b/make/data/cldr/common/main/sr_Latn_BA.xml
index 80475ab0366..9605eb3aaba 100644
--- a/make/data/cldr/common/main/sr_Latn_BA.xml
+++ b/make/data/cldr/common/main/sr_Latn_BA.xml
@@ -602,9 +602,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Zapadno-afričko vrijeme</generic>
-					<standard>Zapadno-afričko standardno vrijeme</standard>
-					<daylight>Zapadno-afričko ljetnje vrijeme</daylight>
+					<standard>Zapadno-afričko vrijeme</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -949,6 +947,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Gvajana vrijeme</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havajsko-aleutsko standardno vrijeme</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havajsko-aleutsko vrijeme</generic>
@@ -1595,7 +1598,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other" case="genitive">{0} svjetala</unitPattern>
 				<unitPattern count="other" case="instrumental">{0} svjetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>dijelovi na milijardu</displayName>
 				<unitPattern count="one">{0} dio na milijardu</unitPattern>
 				<unitPattern count="one" case="accusative">{0} dio na milijardu</unitPattern>
@@ -1627,18 +1630,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} grana</unitPattern>
 				<unitPattern count="other">{0} granova</unitPattern>
 			</unit>
-			<unit type="speed-beaufort">
-				<unitPattern count="one">B {0}</unitPattern>
-				<unitPattern count="few">B {0}</unitPattern>
-				<unitPattern count="other">B {0}</unitPattern>
-			</unit>
 			<unit type="speed-light-speed">
 				<displayName>svjetlo</displayName>
 				<unitPattern count="one">{0} svjetlo</unitPattern>
 				<unitPattern count="few">{0} svjetla</unitPattern>
 				<unitPattern count="other">{0} svjetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>dijelovi/milijarda</displayName>
 			</unit>
 		</unitLength>
@@ -1670,9 +1668,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="speed-beaufort">
 				<displayName>Bft</displayName>
-				<unitPattern count="one">B {0}</unitPattern>
-				<unitPattern count="few">B {0}</unitPattern>
-				<unitPattern count="other">B {0}</unitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<unitPattern count="one">{0}/gal Imp</unitPattern>
@@ -1702,7 +1697,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="few">{0} svjetla</unitPattern>
 				<unitPattern count="other">{0} svjetala</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>dijelovi/milijarda</displayName>
 			</unit>
 		</unitLength>
diff --git a/make/data/cldr/common/main/sr_Latn_ME.xml b/make/data/cldr/common/main/sr_Latn_ME.xml
index 7ee454af022..b70f80cd6b1 100644
--- a/make/data/cldr/common/main/sr_Latn_ME.xml
+++ b/make/data/cldr/common/main/sr_Latn_ME.xml
@@ -129,11 +129,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</eras>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="MMMMW" count="one" draft="contributed">MMMM: W. 'nedelja'</dateFormatItem>
-						<dateFormatItem id="MMMMW" count="few" draft="contributed">MMMM: W. 'nedelja'</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one" draft="contributed">W. 'sjedmica' 'u' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="few" draft="contributed">W. 'sjedmica' 'u' MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other" draft="contributed">W. 'sjedmica' 'u' MMMM</dateFormatItem>
-						<dateFormatItem id="yw" count="one" draft="contributed">w. 'nedelja' 'u' Y.</dateFormatItem>
-						<dateFormatItem id="yw" count="few" draft="contributed">w. 'nedelja' 'u' Y.</dateFormatItem>
+						<dateFormatItem id="yw" count="one" draft="contributed">w. 'sjedmica' 'u' Y.</dateFormatItem>
+						<dateFormatItem id="yw" count="few" draft="contributed">w. 'sjedmica' 'u' Y.</dateFormatItem>
 						<dateFormatItem id="yw" count="other" draft="contributed">w. 'sjedmica' 'u' Y.</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
diff --git a/make/data/cldr/common/main/st.xml b/make/data/cldr/common/main/st.xml
index 108fdb84ffe..acf154963ee 100644
--- a/make/data/cldr/common/main/st.xml
+++ b/make/data/cldr/common/main/st.xml
@@ -23,7 +23,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bs" draft="unconfirmed">Se-bosnia</language>
 			<language type="ca" draft="unconfirmed">Se-catalia</language>
 			<language type="cs" draft="unconfirmed">Se-czech</language>
-			<language type="cy" draft="unconfirmed">Se-welsh</language>
+			<language type="cy">Sewelsh</language>
 			<language type="da" draft="unconfirmed">Se-dutch</language>
 			<language type="de" draft="unconfirmed">Se-jeremane</language>
 			<language type="el" draft="unconfirmed">Se-greek</language>
@@ -137,7 +137,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<monthWidth type="abbreviated">
 							<month type="1">Phe</month>
 							<month type="2">Kol</month>
-							<month type="3">Ube</month>
+							<month type="3">Hlb</month>
 							<month type="4">Mme</month>
 							<month type="5">Mot</month>
 							<month type="6">Jan</month>
diff --git a/make/data/cldr/common/main/su.xml b/make/data/cldr/common/main/su.xml
index f59f6ad3b9c..c1048b99a3e 100644
--- a/make/data/cldr/common/main/su.xml
+++ b/make/data/cldr/common/main/su.xml
@@ -346,7 +346,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
@@ -384,9 +383,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">taun ieu</relative>
 				<relative type="1">taun payun</relative>
 			</field>
-			<field type="year-short">
-				<displayName>tn.</displayName>
-			</field>
 			<field type="quarter">
 				<displayName>triwulan</displayName>
 			</field>
diff --git a/make/data/cldr/common/main/suz.xml b/make/data/cldr/common/main/suz.xml
new file mode 100644
index 00000000000..dff7c0d267d
--- /dev/null
+++ b/make/data/cldr/common/main/suz.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="suz"/>
+	</identity>
+	<characters>
+		<exemplarCharacters>[अ आ इ उ ए ओ {क्} {ख्} {ग्} {च्} {छ्} {ज्} {ट्} {ठ्} {ड्} {त्} {थ्} {द्} {न्} {प्} {फ्} ब {ब्} {म्} {य्} {र्} {ल्} {व्} {श्} {स्} {ह्} ्]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[० १ २ ३ ४ ५ ६ ७ ८ ९]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[, \: ! ? । “”]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/suz_Deva.xml b/make/data/cldr/common/main/suz_Deva.xml
new file mode 100644
index 00000000000..97ecbfca916
--- /dev/null
+++ b/make/data/cldr/common/main/suz_Deva.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="suz"/>
+		<script type="Deva"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/suz_Deva_NP.xml b/make/data/cldr/common/main/suz_Deva_NP.xml
new file mode 100644
index 00000000000..b3e04173ea4
--- /dev/null
+++ b/make/data/cldr/common/main/suz_Deva_NP.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="suz"/>
+		<script type="Deva"/>
+		<territory type="NP"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/suz_Sunu.xml b/make/data/cldr/common/main/suz_Sunu.xml
new file mode 100644
index 00000000000..4061705ef9a
--- /dev/null
+++ b/make/data/cldr/common/main/suz_Sunu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="suz"/>
+		<script type="Sunu"/>
+	</identity>
+	<characters>
+		<exemplarCharacters>[𑯀 𑯁 𑯂 𑯃 𑯄 𑯅 𑯆 𑯇 𑯈 𑯉 𑯊 𑯋 𑯌 𑯍 𑯎 𑯏 𑯐 𑯑 𑯒 𑯓 𑯔 𑯕 𑯖 𑯗 𑯘 𑯙 𑯚 𑯛 𑯜 𑯝 𑯞 𑯟 𑯠]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[𑯰 𑯱 𑯲 𑯳 𑯴 𑯵 𑯶 𑯷 𑯸 𑯹]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[, \: ! ? . “” 𑯡]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/suz_Sunu_NP.xml b/make/data/cldr/common/main/suz_Sunu_NP.xml
new file mode 100644
index 00000000000..a6972823226
--- /dev/null
+++ b/make/data/cldr/common/main/suz_Sunu_NP.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="suz"/>
+		<script type="Sunu"/>
+		<territory type="NP"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/sv.xml b/make/data/cldr/common/main/sv.xml
index 0aa70680a30..15c82618222 100644
--- a/make/data/cldr/common/main/sv.xml
+++ b/make/data/cldr/common/main/sv.xml
@@ -332,6 +332,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">kölniska</language>
 			<language type="ku">kurdiska</language>
+			<language type="ku" menu="core">kurdiska</language>
+			<language type="ku" menu="extension">kurmandji</language>
 			<language type="kum">kumykiska</language>
 			<language type="kut">kutenaj</language>
 			<language type="kv">kome</language>
@@ -906,7 +908,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="151">Östeuropa</territory>
 			<territory type="154">Nordeuropa</territory>
 			<territory type="155">Västeuropa</territory>
-			<territory type="202">Subsahariska Afrika</territory>
+			<territory type="202">subsahariska Afrika</territory>
 			<territory type="419">Latinamerika</territory>
 			<territory type="AC">Ascension</territory>
 			<territory type="AD">Andorra</territory>
@@ -962,6 +964,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Kina</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Clippertonön</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kap Verde</territory>
@@ -1304,35 +1307,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Numerisk sortering</key>
 			<key type="colStrength">Sorteringsstyrka</key>
 			<key type="currency">valuta</key>
+			<key type="em">emojipresentation</key>
 			<key type="hc">12- eller 24-timmarsklocka</key>
 			<key type="lb">radbrytningstyp</key>
+			<key type="lw">radbrytningar inom ord</key>
 			<key type="ms">enhetssystem</key>
 			<key type="numbers">siffror</key>
+			<key type="ss">meningsgräns efter förkortn.</key>
 			<key type="timezone">Tidszon</key>
 			<key type="va">Språkvariant</key>
 			<key type="x">privat</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddistisk kalender</type>
+			<type key="calendar" type="buddhist" scope="core">buddistisk</type>
 			<type key="calendar" type="chinese">kinesisk kalender</type>
+			<type key="calendar" type="chinese" scope="core">kinesisk</type>
 			<type key="calendar" type="coptic">koptisk kalender</type>
+			<type key="calendar" type="coptic" scope="core">koptisk</type>
 			<type key="calendar" type="dangi">koreansk kalender</type>
+			<type key="calendar" type="dangi" scope="core">koreansk</type>
 			<type key="calendar" type="ethiopic">etiopisk kalender</type>
+			<type key="calendar" type="ethiopic" scope="core">etiopisk</type>
 			<type key="calendar" type="ethiopic-amete-alem">etiopisk amete-alem-kalender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">etiopisk amete-alem</type>
 			<type key="calendar" type="gregorian">gregoriansk kalender</type>
+			<type key="calendar" type="gregorian" scope="core">gregoriansk</type>
 			<type key="calendar" type="hebrew">hebreisk kalender</type>
+			<type key="calendar" type="hebrew" scope="core">hebreisk</type>
 			<type key="calendar" type="indian">indisk kalender</type>
 			<type key="calendar" type="islamic">islamisk kalender</type>
+			<type key="calendar" type="islamic" scope="core">islamisk</type>
 			<type key="calendar" type="islamic-civil">islamisk civil kalender</type>
+			<type key="calendar" type="islamic-civil" scope="core">islamisk civil</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">islamisk kalender, Saudi-Arabien</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">islamisk kalender, astronomisk</type>
 			<type key="calendar" type="islamic-umalqura">islamisk kalender, Umm al-Qura</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">islamisk, Umm al-Qura</type>
 			<type key="calendar" type="iso8601">ISO 8601-kalender</type>
 			<type key="calendar" type="japanese">japansk kalender</type>
+			<type key="calendar" type="japanese" scope="core">japansk</type>
 			<type key="calendar" type="persian">persisk kalender</type>
+			<type key="calendar" type="persian" scope="core">persisk</type>
 			<type key="calendar" type="roc">kinesiska republikens kalender</type>
+			<type key="calendar" type="roc" scope="core">kinesiska republikens</type>
 			<type key="cf" type="account">redovisningsformat</type>
+			<type key="cf" type="account" scope="core">redovisning</type>
 			<type key="cf" type="standard">normalt format</type>
+			<type key="cf" type="standard" scope="core">normalt</type>
 			<type key="colAlternate" type="non-ignorable">sortera symboler</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Sortera oavsett symboler</type>
 			<type key="colBackwards" type="no">sortera accenter normalt</type>
@@ -1342,23 +1364,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Sortera versaler först</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Sortera oavsett skiftläge</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Sortera efter skiftläge</type>
-			<type key="collation" type="big5han">big5-sorteringsordning</type>
 			<type key="collation" type="compat">bakåtkompatibel sorteringsordning</type>
+			<type key="collation" type="compat" scope="core">bakåtkompatibel</type>
 			<type key="collation" type="dictionary">ordbokssorteringsordning</type>
+			<type key="collation" type="dictionary" scope="core">ordbok</type>
 			<type key="collation" type="ducet">grundläggande Unicode-sorteringsordning</type>
+			<type key="collation" type="ducet" scope="core">grundläggande Unicode</type>
 			<type key="collation" type="emoji">emojisorteringsordning</type>
 			<type key="collation" type="eor" draft="contributed">sorteringsordning för flerspråkliga europeiska dokument</type>
-			<type key="collation" type="gb2312han">gb2312-sorteringsordning</type>
 			<type key="collation" type="phonebook">telefonkatalogssorteringsordning</type>
+			<type key="collation" type="phonebook" scope="core">telefonkatalog</type>
 			<type key="collation" type="phonetic">fonetisk sorteringsordning</type>
+			<type key="collation" type="phonetic" scope="core">fonetisk</type>
 			<type key="collation" type="pinyin">pinyin-sorteringsordning</type>
+			<type key="collation" type="pinyin" scope="core">pinyin</type>
 			<type key="collation" type="search">allmän sökning</type>
+			<type key="collation" type="search" scope="core">sökning</type>
 			<type key="collation" type="searchjl" draft="contributed">söksorteringsordning för att söka på inledande Hangul-konsonant</type>
 			<type key="collation" type="standard">normal sorteringsordning</type>
+			<type key="collation" type="standard" scope="core">normal</type>
 			<type key="collation" type="stroke">strecksorteringsordning</type>
+			<type key="collation" type="stroke" scope="core">streck</type>
 			<type key="collation" type="traditional">traditionell sorteringsordning</type>
+			<type key="collation" type="traditional" scope="core">traditionell</type>
 			<type key="collation" type="unihan">radikal-streck-sorteringsordning</type>
+			<type key="collation" type="unihan" scope="core">radikal-streck</type>
 			<type key="collation" type="zhuyin">zhuyin-sorteringsordning</type>
+			<type key="collation" type="zhuyin" scope="core">zhuyin</type>
 			<type key="colNormalization" type="no">sortera utan normalisering</type>
 			<type key="colNormalization" type="yes">sortera med Unicode-normalisering</type>
 			<type key="colNumeric" type="no" draft="contributed">Sortera siffror för sig</type>
@@ -1371,18 +1403,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">till helbreda</type>
 			<type key="d0" type="hwidth">till halvbreda</type>
 			<type key="d0" type="npinyin" draft="contributed">Numerisk</type>
+			<type key="em" type="default" scope="core">standard</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">text</type>
 			<type key="hc" type="h11">12-timmarsklocka (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-timmarsklocka (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-timmarsklocka (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-timmarsklocka (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">fri radbrytning</type>
+			<type key="lb" type="loose" scope="core">fri</type>
 			<type key="lb" type="normal">normal radbrytning</type>
+			<type key="lb" type="normal" scope="core">normal</type>
 			<type key="lb" type="strict">strikt radbrytning</type>
+			<type key="lb" type="strict" scope="core">strikt</type>
+			<type key="lw" type="breakall" scope="core">radbryt alla</type>
+			<type key="lw" type="keepall" scope="core">behåll alla</type>
+			<type key="lw" type="normal" scope="core">normal</type>
+			<type key="lw" type="phrase" scope="core">behåll i fraser</type>
 			<type key="m0" type="bgn">enligt USA:s geografiska namnkommitté</type>
 			<type key="m0" type="ungegn">enligt FN:s geografiska namnkommitté</type>
 			<type key="ms" type="metric">metersystem</type>
+			<type key="ms" type="metric" scope="core">meter</type>
 			<type key="ms" type="uksystem">brittiskt måttsystem</type>
+			<type key="ms" type="uksystem" scope="core">brittiskt</type>
 			<type key="ms" type="ussystem">USA:s måttsystem</type>
+			<type key="ms" type="ussystem" scope="core">USA:s</type>
 			<type key="numbers" type="ahom">ahom-siffror</type>
 			<type key="numbers" type="arab">indo-arabiska siffror</type>
 			<type key="numbers" type="arabext">utökade indo-arabiska siffror</type>
@@ -1465,6 +1514,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">vai-siffror</type>
 			<type key="numbers" type="wara">varang kshiti-siffror</type>
 			<type key="numbers" type="wcho" draft="contributed">wanchosiffror</type>
+			<type key="ss" type="none" scope="core">av</type>
+			<type key="ss" type="standard" scope="core">på</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">SI-enheter</measurementSystemName>
@@ -1561,12 +1612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyMM" draft="contributed">y-MM G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G" draft="contributed">y-MM GGGGG – y-MM GGGGG</greatestDifference>
 							<greatestDifference id="M" draft="contributed">y-MM – y-MM GGGGG</greatestDifference>
@@ -1875,6 +1920,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1883,6 +1931,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1899,11 +1950,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMd">y-MM-dd GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E y-MM-dd G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
@@ -1973,10 +2025,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E d MMM – E d MMM y G</greatestDifference>
 							<greatestDifference id="y">E d MMM y – E d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h" draft="contributed">h:mm–h:mm a</greatestDifference>
@@ -1995,10 +2043,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="H" draft="contributed">HH:mm – HH:mm v</greatestDifference>
 							<greatestDifference id="m" draft="contributed">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2212,8 +2256,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="night1">natt</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">förmiddag</dayPeriod>
-							<dayPeriod type="pm">eftermiddag</dayPeriod>
 							<dayPeriod type="morning1">morgon</dayPeriod>
 							<dayPeriod type="morning2">förmiddag</dayPeriod>
 							<dayPeriod type="afternoon1">eftermiddag</dayPeriod>
@@ -2292,6 +2334,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2300,11 +2345,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'kl'. {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'kl'. {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -2316,11 +2367,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">y-MM G</dateFormatItem>
 						<dateFormatItem id="GyMd">y-MM-dd GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E M-d-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -2347,6 +2399,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">'vecka' w, Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
 						<intervalFormatItem id="Bh">
 							<greatestDifference id="B">h B–h B</greatestDifference>
 						</intervalFormatItem>
@@ -2377,35 +2430,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, d/M/y–E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G–MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM–MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y–MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
 							<greatestDifference id="d">d–d MMM y G</greatestDifference>
-							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="y">d MMM y G – d MMM y</greatestDifference>
+							<greatestDifference id="G">d MMM y G–d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM–d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y–d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">E d MMM y G – E d MMM</greatestDifference>
-							<greatestDifference id="G">d MMM y G, E – d MMM y G, E</greatestDifference>
-							<greatestDifference id="M">E d MMM y G – E d MMM</greatestDifference>
-							<greatestDifference id="y">E d MMM y G – E d MMM y</greatestDifference>
+							<greatestDifference id="d">E d MMM–E d MMM y G</greatestDifference>
+							<greatestDifference id="G">E d MMM y G–E d MMM y G</greatestDifference>
+							<greatestDifference id="M">E d MMM–E d MMM y G</greatestDifference>
+							<greatestDifference id="y">E d MMM y–E d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="h">h–h a</greatestDifference>
+							<greatestDifference id="a">h a–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="a">h:mm a–h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="a">h:mm a–h:mm a v</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a–h a v</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
 						</intervalFormatItem>
@@ -2414,37 +2470,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">d/M–d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
-							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
+							<greatestDifference id="d">E d/M–E d/M</greatestDifference>
+							<greatestDifference id="M">E d/M–E d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM–MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM–d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d – E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
+							<greatestDifference id="d">E d–E d MMM</greatestDifference>
+							<greatestDifference id="M">E d MMM–E d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y-MM – MM</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="M">y-MM–MM</greatestDifference>
+							<greatestDifference id="y">y-MM–y-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="d">y-MM-dd–dd</greatestDifference>
+							<greatestDifference id="M">y-MM-dd–MM-dd</greatestDifference>
+							<greatestDifference id="y">y-MM-dd–y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, y-MM-dd – E, y-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, y-MM-dd – E, y-MM-dd</greatestDifference>
+							<greatestDifference id="d">E y-MM-dd–E y-MM-dd</greatestDifference>
+							<greatestDifference id="M">E y-MM-dd–E y-MM-dd</greatestDifference>
+							<greatestDifference id="y">E y-MM-dd–E y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y–MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d–d MMM y</greatestDifference>
@@ -2458,7 +2514,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y–MMMM y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2787,7 +2843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="year">
 				<displayName>år</displayName>
-				<relative type="-1">i fjol</relative>
+				<relative type="-1">förra året</relative>
 				<relative type="0">i år</relative>
 				<relative type="1">nästa år</relative>
 				<relativeTime type="future">
@@ -2882,6 +2938,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="month-narrow">
+				<displayName>m</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} mån.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} mån.</relativeTimePattern>
@@ -2921,6 +2978,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="week-narrow">
+				<displayName>v</displayName>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">+{0} v.</relativeTimePattern>
 					<relativeTimePattern count="other">+{0} v.</relativeTimePattern>
@@ -3392,11 +3450,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0} (sommartid)</regionFormat>
 			<regionFormat type="standard">{0} (normaltid)</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="contributed">Honolulutid</generic>
-					<standard draft="contributed">Honolulunormaltid</standard>
-					<daylight draft="contributed">Honolulusommartid</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3407,24 +3460,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>okänd stad</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Jerevan</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
 			<zone type="America/Jujuy">
 				<exemplarCity>San Salvador de Jujuy</exemplarCity>
 			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
@@ -3434,30 +3475,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint-Barthélemy</exemplarCity>
 			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>Fernando de Noronha</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>Saint John’s</exemplarCity>
 			</zone>
@@ -3470,12 +3487,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Påskön</exemplarCity>
 			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
 			<zone type="America/Havana">
 				<exemplarCity>Havanna</exemplarCity>
 			</zone>
@@ -3497,9 +3508,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Algiers">
 				<exemplarCity>Alger</exemplarCity>
 			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
 			<zone type="Africa/Cairo">
 				<exemplarCity>Kairo</exemplarCity>
 			</zone>
@@ -3553,7 +3561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bisjkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Kantonatollen</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komorerna</exemplarCity>
@@ -3579,21 +3587,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Luxembourg">
 				<exemplarCity>Luxemburg</exemplarCity>
 			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chișinău</exemplarCity>
-			</zone>
 			<zone type="Asia/Hovd">
 				<exemplarCity>Chovd</exemplarCity>
 			</zone>
 			<zone type="Indian/Maldives">
 				<exemplarCity>Maldiverna</exemplarCity>
 			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Katmandu</exemplarCity>
 			</zone>
@@ -3651,24 +3650,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Kamchatka">
 				<exemplarCity>Kamtjatka</exemplarCity>
 			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>Sankt Helena</exemplarCity>
 			</zone>
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskus</exemplarCity>
 			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>N’Djamena</exemplarCity>
-			</zone>
 			<zone type="Indian/Kerguelen">
 				<exemplarCity>Kerguelenöarna</exemplarCity>
 			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
 			<zone type="Asia/Dushanbe">
 				<exemplarCity>Dusjanbe</exemplarCity>
 			</zone>
@@ -3731,9 +3721,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>västafrikansk tid</generic>
-					<standard>västafrikansk normaltid</standard>
-					<daylight>västafrikansk sommartid</daylight>
+					<standard>västafrikansk tid</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4139,11 +4127,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyanatid</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Honolulu, normaltid</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Honolulutid</generic>
-					<standard>Honolulu, normaltid</standard>
-					<daylight>Honolulu, sommartid</daylight>
+					<generic>aleutisk tid</generic>
+					<standard>aleutisk normaltid</standard>
+					<daylight>aleutisk sommartid</daylight>
 				</long>
 			</metazone>
 			<metazone type="Hong_Kong">
@@ -4589,6 +4582,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuuktid</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">turkisk tid</generic>
+					<standard draft="contributed">turkisk normaltid</standard>
+					<daylight draft="contributed">turkisk sommartid</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>turkmensk tid</generic>
@@ -4769,7 +4769,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -6181,6 +6184,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">östkaribisk dollar</displayName>
 				<displayName count="other">östkaribiska dollar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karibisk gulden</displayName>
+				<displayName count="one" draft="contributed">karibisk gulden</displayName>
+				<displayName count="other" draft="contributed">karibisk gulden</displayName>
+				<symbol>XCG</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>IMF särskild dragningsrätt</displayName>
 				<displayName count="one">IMF särskild dragningsrätt</displayName>
@@ -6303,6 +6312,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Zimbabwe-dollar</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>zimbabwiskt guld</displayName>
+				<displayName count="one">zimbabwiskt guld</displayName>
+				<displayName count="other">zimbabwiskt guld</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwe-dollar (2009)</displayName>
 			</currency>
@@ -6312,7 +6326,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
-			<pattern type="range">{0}‒{1}</pattern>
 		</miscPatterns>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">om {0} dag</pluralMinimalPairs>
@@ -6569,12 +6582,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} karats</unitPattern>
 			</unit>
 			<unit type="concentr-milligram-ofglucose-per-deciliter">
-				<gender draft="contributed">neuter</gender>
+				<gender>neuter</gender>
 				<displayName>milligram per deciliter</displayName>
 				<unitPattern count="one">{0} milligram per deciliter</unitPattern>
-				<unitPattern count="one" case="genitive" draft="contributed">{0} milligram per deciliters</unitPattern>
+				<unitPattern count="one" case="genitive">{0} milligram per deciliters</unitPattern>
 				<unitPattern count="other">{0} milligram per deciliter</unitPattern>
-				<unitPattern count="other" case="genitive" draft="contributed">{0} milligram per deciliters</unitPattern>
+				<unitPattern count="other" case="genitive">{0} milligram per deciliters</unitPattern>
 			</unit>
 			<unit type="concentr-millimole-per-liter">
 				<gender>common</gender>
@@ -6591,7 +6604,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} objekt</unitPattern>
 				<unitPattern count="other" case="genitive">{0} objekts</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>delar</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} delar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>common</gender>
 				<unitPattern count="one">{0} miljondel</unitPattern>
 				<unitPattern count="one" case="genitive">{0} miljondels</unitPattern>
@@ -6629,6 +6647,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mol</unitPattern>
 				<unitPattern count="other" case="genitive">{0} mols</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glukos</displayName>
+				<unitPattern count="one">{0} glukos</unitPattern>
+				<unitPattern count="other">{0} glukos</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>common</gender>
 				<displayName>liter per kilometer</displayName>
@@ -6768,12 +6791,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0} per år</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<gender>common</gender>
-				<displayName>kvartar</displayName>
-				<unitPattern count="one">{0} kvart</unitPattern>
-				<unitPattern count="one" case="genitive">{0} kvarts</unitPattern>
-				<unitPattern count="other">{0} kvartar</unitPattern>
-				<unitPattern count="other" case="genitive">{0} kvarts</unitPattern>
+				<gender>neuter</gender>
+				<displayName>kvartal</displayName>
+				<unitPattern count="one">{0} kvartal</unitPattern>
+				<unitPattern count="one" case="genitive">{0} kvartals</unitPattern>
+				<unitPattern count="other">{0} kvartal</unitPattern>
+				<unitPattern count="other" case="genitive">{0} kvartals</unitPattern>
+				<perUnitPattern>{0}/kvartal</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<gender>common</gender>
@@ -7156,9 +7180,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-point">
 				<gender>common</gender>
-				<unitPattern count="one">{0} pkt</unitPattern>
+				<unitPattern count="one">{0} punkt</unitPattern>
 				<unitPattern count="one" case="genitive">{0} punkts</unitPattern>
-				<unitPattern count="other">{0} pkt</unitPattern>
+				<unitPattern count="other">{0} punkter</unitPattern>
 				<unitPattern count="other" case="genitive">{0} punkters</unitPattern>
 			</unit>
 			<unit type="length-solar-radius">
@@ -7334,9 +7358,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>common</gender>
 				<displayName>millimeter kvicksilver</displayName>
 				<unitPattern count="one">{0} millimeter kvicksilver</unitPattern>
-				<unitPattern count="one" case="genitive" draft="contributed">{0} millimeter kvicksilvers</unitPattern>
+				<unitPattern count="one" case="genitive">{0} millimeter kvicksilvers</unitPattern>
 				<unitPattern count="other">{0} millimeter kvicksilver</unitPattern>
-				<unitPattern count="other" case="genitive" draft="contributed">{0} millimeter kvicksilvers</unitPattern>
+				<unitPattern count="other" case="genitive">{0} millimeter kvicksilvers</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>kvicksilver</displayName>
+				<unitPattern count="one">{0} kvicksilver</unitPattern>
+				<unitPattern count="other">{0} kvicksilver</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pund per kvadrattum</displayName>
@@ -7461,9 +7490,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="genitive">{0} kelvins</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
-				<displayName>pound-feet</displayName>
+				<displayName>pound-force-feet</displayName>
 				<unitPattern count="one">{0} pound-force-foot</unitPattern>
-				<unitPattern count="other">{0} pound-feet</unitPattern>
+				<unitPattern count="other">{0} pound-force-feet</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
 				<gender>common</gender>
@@ -7585,6 +7614,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} metriska koppar</unitPattern>
 				<unitPattern count="other" case="genitive">{0} metriska koppars</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metriska flytande uns</displayName>
+				<unitPattern count="one">{0} metriskt flytande uns</unitPattern>
+				<unitPattern count="other">{0} metriska flytande uns</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>engelska tunnland gånger fot</displayName>
 				<unitPattern count="one">{0} engelskt tunnland gånger fot</unitPattern>
@@ -7621,14 +7655,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-fluid-ounce">
 				<gender>neuter</gender>
 				<displayName>flytande uns</displayName>
-				<unitPattern count="one">{0} flytande uns</unitPattern>
+				<unitPattern count="one">{0} fluid ounce</unitPattern>
 				<unitPattern count="other">{0} fluid ounces</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<gender>neuter</gender>
-				<displayName>Br. flytande uns</displayName>
-				<unitPattern count="one">{0} br. fl oz</unitPattern>
-				<unitPattern count="other">{0} br. flytande uns</unitPattern>
+				<displayName>Imp. fluid ounces</displayName>
+				<unitPattern count="one">{0} Imp. fluid ounce</unitPattern>
+				<unitPattern count="other">{0} Imp. fluid ounces</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<gender>common</gender>
@@ -7677,15 +7711,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} brittisk quart</unitPattern>
 				<unitPattern count="other">{0} brittiska quarts</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>steradianer</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradianer</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">{0} coulomb</unitPattern>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">{0} henry</unitPattern>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">{0} siemens</unitPattern>
+				<unitPattern count="other">{0} siemens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>IT-kalorier</displayName>
+				<unitPattern count="one">{0} IT-kalori</unitPattern>
+				<unitPattern count="other">{0} IT-kalorier</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="one">{0} becquerel</unitPattern>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramkraft</displayName>
+				<unitPattern count="one">{0} kilogramkraft</unitPattern>
+				<unitPattern count="other">{0} kilogramkrafter</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>neuter</gender>
-				<displayName>ljus</displayName>
-				<unitPattern count="one">{0} ljus</unitPattern>
-				<unitPattern count="one" case="genitive">{0} ljus</unitPattern>
-				<unitPattern count="other">{0} ljus</unitPattern>
-				<unitPattern count="other" case="genitive">{0} ljus</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>common</gender>
 				<displayName>miljarddelar</displayName>
 				<unitPattern count="one">{0} miljarddel</unitPattern>
@@ -7695,7 +7789,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>common</gender>
-				<displayName>nätter</displayName>
 				<unitPattern count="one">{0} natt</unitPattern>
 				<unitPattern count="one" case="genitive">{0} natts</unitPattern>
 				<unitPattern count="other">{0} nätter</unitPattern>
@@ -7776,7 +7869,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} objekt</unitPattern>
 				<unitPattern count="other">{0} objekt</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>del</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} delar</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>miljondelar</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -7791,6 +7889,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ‱</unitPattern>
 				<unitPattern count="other">{0} ‱</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glc</displayName>
+				<unitPattern count="one">{0} glc</unitPattern>
+				<unitPattern count="other">{0} glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>liter/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -7837,10 +7940,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/år</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
-				<displayName>k</displayName>
-				<unitPattern count="one">{0} k</unitPattern>
-				<unitPattern count="other">{0} k</unitPattern>
-				<perUnitPattern>{0}/k</perUnitPattern>
+				<displayName>kv</displayName>
+				<unitPattern count="one">{0} kv</unitPattern>
+				<unitPattern count="other">{0} kv</unitPattern>
+				<perUnitPattern>{0}/kv</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>mån</displayName>
@@ -7861,6 +7964,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>tim</displayName>
 				<unitPattern count="one">{0} tim</unitPattern>
 				<unitPattern count="other">{0} tim</unitPattern>
+				<perUnitPattern>{0}/tim</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>sek</displayName>
@@ -8037,6 +8141,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} hk</unitPattern>
 				<unitPattern count="other">{0} hk</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>tum Hg</displayName>
 				<unitPattern count="one">{0} tum Hg</unitPattern>
@@ -8105,6 +8213,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mcup</unitPattern>
 				<unitPattern count="other">{0} mcup</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>eng. t:land·fot</displayName>
 				<unitPattern count="one">{0} eng. t:d·fot</unitPattern>
@@ -8145,8 +8257,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} fl oz</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<unitPattern count="one">{0} br. fl oz</unitPattern>
-				<unitPattern count="other">{0} br. fl oz</unitPattern>
+				<unitPattern count="one">{0} fl oz Imp.</unitPattern>
+				<unitPattern count="other">{0} fl oz Imp.</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<displayName>msk</displayName>
@@ -8198,6 +8310,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} br. qt</unitPattern>
 				<unitPattern count="other">{0} br. qt</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ljus</displayName>
 				<unitPattern count="one">{0} ljus</unitPattern>
@@ -8301,7 +8446,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmol/l</unitPattern>
 				<unitPattern count="other">{0}mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>del</displayName>
+				<unitPattern count="one">{0} del</unitPattern>
+				<unitPattern count="other">{0} del</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -8321,6 +8471,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mol</unitPattern>
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glc</displayName>
+				<unitPattern count="one">{0} glc</unitPattern>
+				<unitPattern count="other">{0} glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0}l/km</unitPattern>
@@ -8403,6 +8558,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>m</displayName>
 				<unitPattern count="one">{0}m</unitPattern>
 				<unitPattern count="other">{0}m</unitPattern>
+				<perUnitPattern>{0}/m</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<displayName>v</displayName>
@@ -8591,8 +8747,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}fot</unitPattern>
 			</unit>
 			<unit type="length-inch">
-				<unitPattern count="one">{0} tum</unitPattern>
-				<unitPattern count="other">{0}&quot;</unitPattern>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>parsek</displayName>
@@ -8738,6 +8894,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">{0}psi</unitPattern>
 				<unitPattern count="other">{0}psi</unitPattern>
@@ -8873,6 +9033,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mcup</unitPattern>
 				<unitPattern count="other">{0}mcup</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0}en.td·fot</unitPattern>
 				<unitPattern count="other">{0}en.td·fot</unitPattern>
@@ -8907,9 +9071,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}fl oz</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
-				<displayName>Br. fl oz</displayName>
-				<unitPattern count="one">{0}br. fl oz</unitPattern>
-				<unitPattern count="other">{0}br. fl oz</unitPattern>
+				<displayName>Imp fl oz</displayName>
+				<unitPattern count="one">{0}fl oz Im</unitPattern>
+				<unitPattern count="other">{0}fl oz Im</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="one">{0}msk</unitPattern>
@@ -8954,12 +9118,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}br.qt</unitPattern>
 				<unitPattern count="other">{0}br.qt</unitPattern>
 			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calIT</displayName>
+				<unitPattern count="one">{0} calIT</unitPattern>
+				<unitPattern count="other">{0} calIT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ljs</displayName>
 				<unitPattern count="one">{0}ljs</unitPattern>
 				<unitPattern count="other">{0}ljs</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/sv_AX.xml b/make/data/cldr/common/main/sv_AX.xml
index db98dd1dca1..c175c3d1898 100644
--- a/make/data/cldr/common/main/sv_AX.xml
+++ b/make/data/cldr/common/main/sv_AX.xml
@@ -11,4 +11,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<language type="sv"/>
 		<territory type="AX"/>
 	</identity>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y G</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">d.M.y–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="M">d.M.y–d.M.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<dateFormats>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">d.M.y–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="G">d.M.y GGGGG–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="M">d.M.y–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="y">d.M.y–d.M.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E, d.M.y–E, d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, d.M.y GGGGG–E, d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d.M.y–E, d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d.M.y–E, d.M.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+	</dates>
 </ldml>
diff --git a/make/data/cldr/common/main/sv_FI.xml b/make/data/cldr/common/main/sv_FI.xml
index 99ddaf2d923..c150cec1e28 100644
--- a/make/data/cldr/common/main/sv_FI.xml
+++ b/make/data/cldr/common/main/sv_FI.xml
@@ -13,32 +13,99 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<localeDisplayNames>
 		<scripts>
-			<script type="Arab" alt="variant" draft="contributed">persisk-arabiska</script>
+			<script type="Arab" alt="variant">persisk-arabiska</script>
 		</scripts>
 		<keys>
 			<key type="timezone" draft="contributed">tidszon</key>
 		</keys>
 		<types>
-			<type key="collation" type="big5han" draft="unconfirmed">kinesiska i big5-sorteringsordning</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">kinesiska i gb2312-sorteringsordning</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">kinesiska i pinyin-sorteringsordning</type>
 			<type key="collation" type="stroke" draft="unconfirmed">kinesiska i strecksorteringsordning</type>
 		</types>
 	</localeDisplayNames>
+	<characters>
+		<ellipsis type="word-final">{0}…</ellipsis>
+		<ellipsis type="word-initial">…{0}</ellipsis>
+		<ellipsis type="word-medial">{0}…{1}</ellipsis>
+	</characters>
 	<dates>
 		<calendars>
 			<calendar type="gregorian">
 				<quarters>
-					<quarterContext type="format">
+					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="contributed">Q1</quarter>
-							<quarter type="2" draft="contributed">Q2</quarter>
-							<quarter type="3" draft="contributed">Q3</quarter>
-							<quarter type="4" draft="contributed">Q4</quarter>
+							<quarter type="1">K1</quarter>
+							<quarter type="2">K2</quarter>
+							<quarter type="3">K3</quarter>
+							<quarter type="4">K4</quarter>
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>EEEE d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>d MMMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>d MMM y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>d.M.y</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH.mm.ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>H.mm.ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>H.mm.ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>H.mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bhm">h.mm B</dateFormatItem>
 						<dateFormatItem id="Bhms">h.mm.ss B</dateFormatItem>
@@ -48,6 +115,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="EHm">E HH.mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E h.mm.ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E HH.mm.ss</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d.M.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d.M.y G</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h.mm a</dateFormatItem>
 						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
 						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
@@ -61,10 +132,85 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="MMd">d.M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
 						<dateFormatItem id="ms">mm.ss</dateFormatItem>
+						<dateFormatItem id="yM">L.y</dateFormatItem>
+						<dateFormatItem id="yMd">d.M.y</dateFormatItem>
+						<dateFormatItem id="yMEd">E d.M.y</dateFormatItem>
+						<dateFormatItem id="yMM">M.y</dateFormatItem>
 					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">h.mm B–h.mm B</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm B</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm B</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMd">
+							<greatestDifference id="d">d.M.y–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="G">d.M.y GGGGG–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="M">d.M.y–d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="y">d.M.y–d.M.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMEd">
+							<greatestDifference id="d">E d.M.y–E d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="G">E d.M.y GGGGG–E d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="M">E d.M.y–E d.M.y GGGGG</greatestDifference>
+							<greatestDifference id="y">E d.M.y–E d.M.y GGGGG</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h.mm a–h.mm a</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">H.mm–H.mm</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h.mm a–h.mm a v</greatestDifference>
+							<greatestDifference id="h">h.mm–h.mm a v</greatestDifference>
+							<greatestDifference id="m">h.mm–h.mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH.mm–HH.mm v</greatestDifference>
+							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">d–d.M</greatestDifference>
+							<greatestDifference id="M">d.M–d.M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">E d.M–E d.M</greatestDifference>
+							<greatestDifference id="M">E d.M–E d.M</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">MMM–MMM y</greatestDifference>
+							<greatestDifference id="y">MMMM y–MMMM y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">d–d.M.y</greatestDifference>
+							<greatestDifference id="M">d.M–d.M.y</greatestDifference>
+							<greatestDifference id="y">d.M.y–d.M.y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">E d.M.y–E d.M.y</greatestDifference>
+							<greatestDifference id="M">E d.M.y–E d.M.y</greatestDifference>
+							<greatestDifference id="y">E d.M.y–E d.M.y</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<fields>
+			<field type="year-short">
+				<relative type="-1">förra året</relative>
+				<relative type="0">i år</relative>
+				<relative type="1">nästa år</relative>
+			</field>
+			<field type="year-narrow">
+				<relative type="-1">förra året</relative>
+				<relative type="0">i år</relative>
+				<relative type="1">nästa år</relative>
+			</field>
+		</fields>
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
diff --git a/make/data/cldr/common/main/sw.xml b/make/data/cldr/common/main/sw.xml
index 26779a6c82c..11473266ce7 100644
--- a/make/data/cldr/common/main/sw.xml
+++ b/make/data/cldr/common/main/sw.xml
@@ -49,6 +49,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">Kiazerbaijani</language>
 			<language type="az" alt="short">Kiazeri</language>
 			<language type="ba">Kibashkiri</language>
+			<language type="bal">Kibaluchi</language>
 			<language type="ban">Kibali</language>
 			<language type="bas">Kibasaa</language>
 			<language type="bax">Kibamun</language>
@@ -59,14 +60,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bez">Kibena</language>
 			<language type="bfd">Kibafut</language>
 			<language type="bg">Kibulgaria</language>
-			<language type="bgc" draft="contributed">Kiharyanvi</language>
+			<language type="bgc">Kiharyanvi</language>
 			<language type="bgn">Kibalochi cha Magharibi</language>
 			<language type="bho">Kibhojpuri</language>
 			<language type="bi">Kibislama</language>
 			<language type="bin">Kibini</language>
 			<language type="bkm">Kikom</language>
 			<language type="bla">Kisiksika</language>
-			<language type="blo" draft="contributed">Kianii</language>
+			<language type="blo">Kianii</language>
 			<language type="bm">Kibambara</language>
 			<language type="bn">Kibengali</language>
 			<language type="bo">Kitibeti</language>
@@ -128,9 +129,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="eka">Kiekajuk</language>
 			<language type="el">Kigiriki</language>
 			<language type="en">Kiingereza</language>
-			<language type="en_CA">Kiingereza (Canada)</language>
 			<language type="en_GB">Kiingereza (Uingereza)</language>
-			<language type="en_GB" alt="short">Kiingereza (UK)</language>
 			<language type="eo">Kiesperanto</language>
 			<language type="es">Kihispania</language>
 			<language type="es_419">Kihispania (Amerika ya Latini)</language>
@@ -147,7 +146,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="fo">Kifaroe</language>
 			<language type="fon">Kifon</language>
 			<language type="fr">Kifaransa</language>
-			<language type="fr_CA">Kifaransa (Canada)</language>
 			<language type="frc">Kifaransa cha Kajuni</language>
 			<language type="fro">Kifaransa cha Kale</language>
 			<language type="frr">Kifrisia cha Kaskazini</language>
@@ -244,11 +242,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Kibafia</language>
 			<language type="ksh">Kicologne</language>
 			<language type="ku">Kikurdi</language>
+			<language type="ku" menu="core">Kikurdi</language>
+			<language type="ku" menu="extension">Kikurmanji</language>
 			<language type="kum">Kumyk</language>
 			<language type="kv">Kikomi</language>
 			<language type="kw">Kikorni</language>
 			<language type="kwk">Kikwakʼwala</language>
-			<language type="kxv" draft="contributed">Kikuvi</language>
+			<language type="kxv">Kikuvi</language>
 			<language type="ky">Kikyrgyz</language>
 			<language type="la">Kilatini</language>
 			<language type="lad">Kiladino</language>
@@ -258,10 +258,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="lez">Kilezighian</language>
 			<language type="lg">Kiganda</language>
 			<language type="li">Limburgish</language>
-			<language type="lij" draft="contributed">Kiliguria</language>
+			<language type="lij">Kiliguria</language>
 			<language type="lil">Kilillooet</language>
 			<language type="lkt">Kilakota</language>
-			<language type="lmo" draft="contributed">Kilongobardi</language>
+			<language type="lmo">Kilongobardi</language>
 			<language type="ln">Kilingala</language>
 			<language type="lo">Kilaosi</language>
 			<language type="lol">Kimongo</language>
@@ -368,7 +368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="pt_PT">Kireno (Ulaya)</language>
 			<language type="qu">Kikechua</language>
 			<language type="quc">Kʼicheʼ</language>
-			<language type="raj" draft="contributed">Kirajasthani</language>
+			<language type="raj">Kirajasthani</language>
 			<language type="rap">Kirapanui</language>
 			<language type="rar">Kirarotonga</language>
 			<language type="rhg">Kirohingya</language>
@@ -428,7 +428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="sw">Kiswahili</language>
 			<language type="swb">Shikomor</language>
 			<language type="syr">Lugha ya Syriac</language>
-			<language type="szl" draft="contributed">Kisilesia</language>
+			<language type="szl">Kisilesia</language>
 			<language type="ta">Kitamili</language>
 			<language type="tce">Kitutchone cha Kusini</language>
 			<language type="te">Kitelugu</language>
@@ -469,9 +469,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="uz">Kiuzbeki</language>
 			<language type="vai">Kivai</language>
 			<language type="ve">Kivenda</language>
-			<language type="vec" draft="contributed">Kivenisi</language>
+			<language type="vec">Kivenisi</language>
 			<language type="vi">Kivietinamu</language>
-			<language type="vmw" draft="contributed">Kimakhuwa</language>
+			<language type="vmw">Kimakhuwa</language>
 			<language type="vo">Kivolapuk</language>
 			<language type="vun">Kivunjo</language>
 			<language type="wa">Kiwaloon</language>
@@ -483,7 +483,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="wuu">Kichina cha Wu</language>
 			<language type="xal">Kikalmyk</language>
 			<language type="xh">Kixhosa</language>
-			<language type="xnr" draft="contributed">Kikangri</language>
+			<language type="xnr">Kikangri</language>
 			<language type="xog">Kisoga</language>
 			<language type="yao">Kiyao</language>
 			<language type="yav">Kiyangben</language>
@@ -493,7 +493,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="yrl">Kinheengatu</language>
 			<language type="yue">Kikantoni</language>
 			<language type="yue" alt="menu">Kichina, Kikantoni</language>
-			<language type="za" draft="contributed">Kizhuang</language>
+			<language type="za">Kizhuang</language>
 			<language type="zgh">Kiberber Sanifu cha Moroko</language>
 			<language type="zh">Kichina</language>
 			<language type="zh" alt="menu">Kichina sanifu</language>
@@ -534,7 +534,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Hebr">Kiebrania</script>
 			<script type="Hira">Hiragana</script>
 			<script type="Hrkt">Hati za Kijapani</script>
-			<script type="Jamo">Jamo</script>
 			<script type="Jpan">Kijapani</script>
 			<script type="Kana">Kikatakana</script>
 			<script type="Khmr">Kikambodia</script>
@@ -640,7 +639,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Kanada</territory>
 			<territory type="CC">Visiwa vya Cocos (Keeling)</territory>
-			<territory type="CD">Jamhuri ya Kidemokrasia ya Kongo</territory>
+			<territory type="CD">Kongo - Kinshasa</territory>
 			<territory type="CD" alt="variant">Kongo (DRC)</territory>
 			<territory type="CF">Jamhuri ya Afrika ya Kati</territory>
 			<territory type="CG">Kongo - Brazzaville</territory>
@@ -654,6 +653,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Uchina</territory>
 			<territory type="CO">Kolombia</territory>
 			<territory type="CP">Kisiwa cha Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kostarika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Cape Verde</territory>
@@ -718,7 +718,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="IL">Israeli</territory>
 			<territory type="IM">Kisiwa cha Man</territory>
 			<territory type="IN">India</territory>
-			<territory type="IO" draft="contributed">Eneo la Uingereza katika Bahari Hindi</territory>
+			<territory type="IO">Eneo la Uingereza katika Bahari Hindi</territory>
 			<territory type="IQ">Iraki</territory>
 			<territory type="IR">Iran</territory>
 			<territory type="IS">Aisilandi</territory>
@@ -854,7 +854,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="UM">Visiwa Vidogo vya Nje vya Marekani</territory>
 			<territory type="UN">Umoja wa Mataifa</territory>
 			<territory type="US">Marekani</territory>
-			<territory type="US" alt="short">US</territory>
 			<territory type="UY">Uruguay</territory>
 			<territory type="UZ">Uzibekistani</territory>
 			<territory type="VA">Mji wa Vatican</territory>
@@ -893,33 +892,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Upangaji kwa Nambari</key>
 			<key type="colStrength">Nguvu ya Upangaji</key>
 			<key type="currency">Sarafu</key>
+			<key type="em">Uwasilishaji wa Emoji</key>
 			<key type="hc">Kipindi cha saa (12 au 24)</key>
 			<key type="lb">Mtindo wa Kukata Mstari</key>
+			<key type="lw">Nafasi kati ya mistari kwa maneno</key>
 			<key type="ms">Mfumo wa Vipimo</key>
 			<key type="numbers">Nambari</key>
+			<key type="ss">Nafasi ya Sentensi Baada ya Ufupisho</key>
 			<key type="timezone">Saa za Eneo</key>
 			<key type="va">Lahaja za Lugha</key>
 			<key type="x">Matumizi ya Kibinafsi</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kalenda ya Kibuddha</type>
+			<type key="calendar" type="buddhist" scope="core">Kibudha</type>
 			<type key="calendar" type="chinese">Kalenda ya Kichina</type>
+			<type key="calendar" type="chinese" scope="core">Uchina</type>
 			<type key="calendar" type="coptic">Kalenda ya Koptiki</type>
+			<type key="calendar" type="coptic" scope="core">Kikhufti</type>
 			<type key="calendar" type="dangi">Kalenda ya Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kalenda ya Kiethiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Kiethiopia</type>
 			<type key="calendar" type="ethiopic-amete-alem">Kalenda ya Kiethiopia ya Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem ya Ethiopia</type>
 			<type key="calendar" type="gregorian">Kalenda ya Kigregori</type>
+			<type key="calendar" type="gregorian" scope="core">Kigregori</type>
 			<type key="calendar" type="hebrew">Kalenda ya Kiebrania</type>
+			<type key="calendar" type="hebrew" scope="core">Kiebrania</type>
 			<type key="calendar" type="indian">Kalenda ya Taifa ya India</type>
-			<type key="calendar" type="islamic" draft="contributed">Kalenda ya Hijra</type>
-			<type key="calendar" type="islamic-civil" draft="contributed">Kalenda ya Hijra (inayoanza usiku wa manane)</type>
-			<type key="calendar" type="islamic-umalqura" draft="contributed">Kalenda ya Hijra (Umm ul-Qura)</type>
+			<type key="calendar" type="islamic">Kalenda ya Hijra</type>
+			<type key="calendar" type="islamic" scope="core">Hijra</type>
+			<type key="calendar" type="islamic-civil">Kalenda ya Hijra (inayoanza usiku wa manane)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijra (inayotegemea hesabu)</type>
+			<type key="calendar" type="islamic-umalqura">Kalenda ya Hijra (Umm ul-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijra (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Kalenda ya ISO-8601</type>
 			<type key="calendar" type="japanese">Kalenda ya Kijapani</type>
+			<type key="calendar" type="japanese" scope="core">Kijapani</type>
 			<type key="calendar" type="persian">Kalenda ya Kiajemi</type>
+			<type key="calendar" type="persian" scope="core">Kiajemi</type>
 			<type key="calendar" type="roc">Kalenda ya Jamhuri ya Uchina</type>
+			<type key="calendar" type="roc" scope="core">Kiminguo</type>
 			<type key="cf" type="account">Mpangilio wa Kihasibu wa Sarafu</type>
+			<type key="cf" type="account" scope="core">Uhasibu</type>
 			<type key="cf" type="standard">Mpangilio wa Kawaida wa Sarafu</type>
+			<type key="cf" type="standard" scope="core">Kawaida</type>
 			<type key="colAlternate" type="non-ignorable">Panga Alama</type>
 			<type key="colAlternate" type="shifted">Panga Alama za Kupuuza</type>
 			<type key="colBackwards" type="no">Panga Viinitoni kwa Kawaida</type>
@@ -929,16 +947,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Panga Herufi kubwa Kwanza</type>
 			<type key="colCaseLevel" type="no">Panga Isiyoathiriwa na Herufi</type>
 			<type key="colCaseLevel" type="yes">Panga kwa Inayoathiriwa na Herufi</type>
-			<type key="collation" type="big5han">Mpangilio wa Kichina cha Jadi - Big5</type>
 			<type key="collation" type="dictionary">Mpangilio wa Kamusi</type>
 			<type key="collation" type="ducet">Mpangilio Chaguo-Msingi wa Unicode</type>
-			<type key="collation" type="gb2312han">Mpangilio wa Kichina Rahisi - GB2312</type>
+			<type key="collation" type="ducet" scope="core">Chaguomsingi ya Unicode</type>
 			<type key="collation" type="phonebook">Mpangilio wa Orodha za Nambari za Simu</type>
 			<type key="collation" type="phonetic">Utaratibu wa Kupanga Fonetiki</type>
 			<type key="collation" type="pinyin">Mpangilio wa Kipinyin</type>
 			<type key="collation" type="search">Utafutaji wa Kijumla</type>
+			<type key="collation" type="search" scope="core">Utafutaji</type>
 			<type key="collation" type="searchjl">Tafuta kwa Konsonanti Halisi ya Hangul</type>
 			<type key="collation" type="standard">Mpangilio wa Kawaida</type>
+			<type key="collation" type="standard" scope="core">Kawaida</type>
 			<type key="collation" type="stroke">Mpangilio wa Mikwaju</type>
 			<type key="collation" type="traditional">Mpangilio wa Kawaida</type>
 			<type key="collation" type="unihan">Mpangilio wa Mikwaju ya Shina</type>
@@ -954,18 +973,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Upana kamili</type>
 			<type key="d0" type="hwidth">Nusu upana</type>
 			<type key="d0" type="npinyin">Ya Nambari</type>
+			<type key="em" type="default" scope="core">Chaguomsingi</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Maandiko</type>
 			<type key="hc" type="h11">Kipindi cha saa 12 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Kipindi cha saa 12 (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Kipindi cha saa 24 (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Kipindi cha saa 24 (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Mtindo Pana wa Kukata Mstari</type>
+			<type key="lb" type="loose" scope="core">Usio kaza</type>
 			<type key="lb" type="normal">Mtindo wa Kawaida wa Kukata Mstari</type>
+			<type key="lb" type="normal" scope="core">Kawaida</type>
 			<type key="lb" type="strict">Mtindo Finyu wa Kukata Mstari</type>
+			<type key="lb" type="strict" scope="core">Usio legevu</type>
+			<type key="lw" type="breakall" scope="core">Katisha yote</type>
+			<type key="lw" type="keepall" scope="core">Dumisha yote</type>
+			<type key="lw" type="normal" scope="core">Kawaida</type>
+			<type key="lw" type="phrase" scope="core">Weka katika vifungu</type>
 			<type key="m0" type="bgn">Mtindo wa kunukuu wa US BGN</type>
 			<type key="m0" type="ungegn">Mtindo wa kunukuu wa UN GEGN</type>
 			<type key="ms" type="metric">Mfumo wa Metriki</type>
+			<type key="ms" type="metric" scope="core">Metriki</type>
 			<type key="ms" type="uksystem">Mfumo wa Vipimo wa Uingereza</type>
+			<type key="ms" type="uksystem" scope="core">Uingereza</type>
 			<type key="ms" type="ussystem">Mfumo wa Vipimo wa Marekani</type>
+			<type key="ms" type="ussystem" scope="core">Marekani</type>
 			<type key="numbers" type="arab">Nambari za Kiarabu/Kihindi</type>
 			<type key="numbers" type="arabext">Nambari za Kiarabu/Kihindi Zilizopanuliwa</type>
 			<type key="numbers" type="armn">Nambari za Kiarmenia</type>
@@ -1013,6 +1049,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">Nambari za Kitibeti</type>
 			<type key="numbers" type="traditional">Tarakimu za Jadi</type>
 			<type key="numbers" type="vaii">Nambari za Kivai</type>
+			<type key="ss" type="none" scope="core">Imezimwa</type>
+			<type key="ss" type="standard" scope="core">Imewashwa</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Mfumo wa Mita</measurementSystemName>
@@ -1030,9 +1068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[c q x]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B {CH} D E F G H I J K L M N O P R S T U V W Y Z]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . ' &quot; ( ) \[ \] \{ \}]</exemplarCharacters>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1074,6 +1109,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'saa' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1082,6 +1120,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'saa' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1090,6 +1131,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1104,11 +1148,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d-M</dateFormatItem>
@@ -1487,11 +1532,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">G MM-y</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1559,7 +1605,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1584,7 +1629,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1916,9 +1960,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Saa za Majira ya Joto za Ayalandi</daylight>
 				</long>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
 			</zone>
@@ -1968,9 +2009,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Saa za Afrika Magharibi</generic>
-					<standard>Saa za Wastani za Afrika Magharibi</standard>
-					<daylight>Saa za Majira ya joto za Afrika Magharibi</daylight>
+					<standard>Saa za Afrika Magharibi</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2327,6 +2366,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Saa za Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Saa za Wastani za Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Saa za Hawaii-Aleutian</generic>
@@ -2903,30 +2947,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ elfu0</pattern>
-					<pattern type="1000" count="other">¤ elfu0</pattern>
-					<pattern type="10000" count="one">¤ elfu00;¤elfu -00</pattern>
-					<pattern type="10000" count="other">¤ elfu00;¤elfu -00</pattern>
-					<pattern type="100000" count="one">¤ laki000;¤laki -000</pattern>
-					<pattern type="100000" count="other">¤ laki000;¤laki -000</pattern>
-					<pattern type="1000000" count="one">¤ 0M;¤-0M</pattern>
+					<pattern type="1000" count="one">¤ elfu 0;¤ elfu -0</pattern>
+					<pattern type="1000" count="other">¤ elfu 0;¤ elfu -0</pattern>
+					<pattern type="10000" count="one">¤ elfu 00;¤ elfu -00</pattern>
+					<pattern type="10000" count="other">¤ elfu 00;¤ elfu -00</pattern>
+					<pattern type="100000" count="one">¤ elfu 000;¤ elfu -000</pattern>
+					<pattern type="100000" count="other">¤ elfu 000;¤ elfu -000</pattern>
+					<pattern type="1000000" count="one">¤ 0M;¤ -0M</pattern>
 					<pattern type="1000000" count="other">¤ 0M</pattern>
-					<pattern type="10000000" count="one">¤ 00M;¤M-00M</pattern>
-					<pattern type="10000000" count="other">¤ 00M;¤-00M</pattern>
-					<pattern type="100000000" count="one">¤ 000M;¤Milioni-000</pattern>
+					<pattern type="10000000" count="one">¤ 00M;¤ -00M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="one">¤ 000M;¤ -000M</pattern>
 					<pattern type="100000000" count="other">¤ 000M</pattern>
-					<pattern type="1000000000" count="one">¤ 0B;¤-0B</pattern>
-					<pattern type="1000000000" count="other">¤ 0B;¤-0B</pattern>
-					<pattern type="10000000000" count="one">¤ 00B;¤-00B</pattern>
-					<pattern type="10000000000" count="other">¤ 00B;¤-00B</pattern>
-					<pattern type="100000000000" count="one">¤ 000B;¤-000B</pattern>
-					<pattern type="100000000000" count="other">¤ 000B;¤-000B</pattern>
-					<pattern type="1000000000000" count="one">¤ 0T;¤-0T</pattern>
+					<pattern type="1000000000" count="one">¤ 0B;¤ -0B</pattern>
+					<pattern type="1000000000" count="other">¤ 0B;¤ -0B</pattern>
+					<pattern type="10000000000" count="one">¤ 00B;¤ -00B</pattern>
+					<pattern type="10000000000" count="other">¤ 00B;¤ -00B</pattern>
+					<pattern type="100000000000" count="one">¤ 000B;¤ -000B</pattern>
+					<pattern type="100000000000" count="other">¤ 000B;¤ -000B</pattern>
+					<pattern type="1000000000000" count="one">¤ 0T;¤ -0T</pattern>
 					<pattern type="1000000000000" count="other">¤ 0T</pattern>
-					<pattern type="10000000000000" count="one">¤ 00T;¤-00T</pattern>
+					<pattern type="10000000000000" count="one">¤ 00T;¤ -00T</pattern>
 					<pattern type="10000000000000" count="other">¤ 00T</pattern>
-					<pattern type="100000000000000" count="one">¤ 000T;¤-000T</pattern>
-					<pattern type="100000000000000" count="other">¤ 000T;¤-000T</pattern>
+					<pattern type="100000000000000" count="one">¤ 000T;¤ -000T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
@@ -3745,6 +3789,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">dola ya Karibi Mashariki</displayName>
 				<displayName count="other">dola za Karibi Mashariki</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder ya Karibe</displayName>
+				<displayName count="one">Guilder ya Karibe</displayName>
+				<displayName count="other">Guilder ya Karibe</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Faranga ya Afrika Magharibi CFA</displayName>
 				<displayName count="one">faranga ya Afrika Magharibi CFA</displayName>
@@ -3781,6 +3830,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Dola ya Zimbabwe</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Dhahabu ya Zimbabwe</displayName>
+				<displayName count="one">Dhahabu ya Zimbabwe</displayName>
+				<displayName count="other">Dhahabu ya Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -3863,7 +3917,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">milimoli {0} kwa kila lita</unitPattern>
 				<unitPattern count="other">milimoli {0} kwa kila lita</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>vipande</displayName>
+				<unitPattern count="one">kipande {0}</unitPattern>
+				<unitPattern count="other">vipande {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">sehemu {0} kwa kila milioni</unitPattern>
 				<unitPattern count="other">sehemu {0} kwa kila milioni</unitPattern>
 			</unit>
@@ -3875,6 +3934,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">permyriadi {0}</unitPattern>
 				<unitPattern count="other">permyriadi {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ya glukosi</displayName>
+				<unitPattern count="one">{0} ya glukosi</unitPattern>
+				<unitPattern count="other">{0} ya glukosi</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">lita {0} kwa kilomita 100</unitPattern>
 				<unitPattern count="other">lita {0} kwa kilomita 100</unitPattern>
@@ -4072,6 +4136,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">milimita {0} ya zebaki</unitPattern>
 				<unitPattern count="other">milimita {0} za zebaki</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ya zebaki</displayName>
+				<unitPattern count="one">{0} ya zebaki</unitPattern>
+				<unitPattern count="other">{0} ya zebaki</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="one">pauni {0} kwa kila inchi mraba</unitPattern>
 				<unitPattern count="other">pauni {0} kwa kila inchi mraba</unitPattern>
@@ -4228,20 +4297,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">kwati {0} ya Uingereza</unitPattern>
 				<unitPattern count="other">kwati {0} za Uingereza</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>mwanga</displayName>
-				<unitPattern count="one">mwanga {0}</unitPattern>
-				<unitPattern count="other">mianga {0}</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="one">steradian {0}</unitPattern>
+				<unitPattern count="other">steradian {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">katal {0}</unitPattern>
+				<unitPattern count="other">katal {0}</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="one">coulomb {0}</unitPattern>
+				<unitPattern count="other">coulomb {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">farad {0}</unitPattern>
+				<unitPattern count="other">farad {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="one">henry {0}</unitPattern>
+				<unitPattern count="other">henry {0}</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+				<unitPattern count="one">siemens {0}</unitPattern>
+				<unitPattern count="other">siemens {0}</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calorie [IT]</displayName>
+				<unitPattern count="one">calorie [IT] {0}</unitPattern>
+				<unitPattern count="other">calorie [IT] {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekereli</displayName>
+				<unitPattern count="one">bekereli {0}</unitPattern>
+				<unitPattern count="other">bekereli {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">sievert {0}</unitPattern>
+				<unitPattern count="other">sievert {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grei</displayName>
+				<unitPattern count="one">grei {0}</unitPattern>
+				<unitPattern count="other">grei {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramu za kani</displayName>
+				<unitPattern count="one">kilogramu za kani {0}</unitPattern>
+				<unitPattern count="other">kilogramu za kani {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">tesla {0}</unitPattern>
+				<unitPattern count="other">tesla {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">weber {0}</unitPattern>
+				<unitPattern count="other">weber {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>sehemu kwa kila bilioni</displayName>
 				<unitPattern count="one">sehemu {0} kwa kila bilioni</unitPattern>
 				<unitPattern count="other">sehemu {0} kwa kila bilioni</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>usiku</displayName>
-				<unitPattern count="one">usiku {0}</unitPattern>
-				<unitPattern count="other">usiku {0}</unitPattern>
 				<perUnitPattern>{0} kila usiku</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -4433,7 +4559,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">kipengee {0}</unitPattern>
 				<unitPattern count="other">vipengee {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>kipande</displayName>
+				<unitPattern count="one">kipande {0}</unitPattern>
+				<unitPattern count="other">kipande {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>sehemu kwa kila milioni</displayName>
 				<unitPattern count="one">ppm {0}</unitPattern>
 				<unitPattern count="other">ppm {0}</unitPattern>
@@ -4456,6 +4587,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">moli {0}</unitPattern>
 				<unitPattern count="other">moli {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">Glc {0}</unitPattern>
+				<unitPattern count="other">Glc {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lita kwa kila kilomita</displayName>
 				<unitPattern count="one">lita {0} kwa kilomita</unitPattern>
@@ -4971,6 +5107,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">mmHg {0}</unitPattern>
 				<unitPattern count="other">mmHg {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} ya Hg</unitPattern>
+				<unitPattern count="other">{0} za Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pauni kwa kila inchi mraba</displayName>
 				<unitPattern count="one">psi {0}</unitPattern>
@@ -5213,12 +5353,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">qt Imp. {0}</unitPattern>
 				<unitPattern count="other">qt Imp. {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">sr {0}</unitPattern>
+				<unitPattern count="other">sr {0}</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">kat {0}</unitPattern>
+				<unitPattern count="other">kat {0}</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">C {0}</unitPattern>
+				<unitPattern count="other">C {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">F {0}</unitPattern>
+				<unitPattern count="other">F {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">H {0}</unitPattern>
+				<unitPattern count="other">H {0}</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">S {0}</unitPattern>
+				<unitPattern count="other">S {0}</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">cal-IT {0}</unitPattern>
+				<unitPattern count="other">cal-IT {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">Bq {0}</unitPattern>
+				<unitPattern count="other">Bq {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">Sv {0}</unitPattern>
+				<unitPattern count="other">Sv {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">Gy {0}</unitPattern>
+				<unitPattern count="other">Gy {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">kgf {0}</unitPattern>
+				<unitPattern count="other">kgf {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">T {0}</unitPattern>
+				<unitPattern count="other">T {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">Wb {0}</unitPattern>
+				<unitPattern count="other">Wb {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>mwanga</displayName>
 				<unitPattern count="one">mwanga {0}</unitPattern>
 				<unitPattern count="other">mianga {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>sehemu kwa bilioni</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -5268,9 +5461,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">mmol {0}/L</unitPattern>
 				<unitPattern count="other">mmol {0}/L</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>kipande</displayName>
+				<unitPattern count="one">kipande {0}</unitPattern>
+				<unitPattern count="other">kipande {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">Glc {0}</unitPattern>
+				<unitPattern count="other">Glc {0}</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">L/100km {0}</unitPattern>
 				<unitPattern count="other">L/100km {0}</unitPattern>
@@ -5343,6 +5546,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">Wati {0}</unitPattern>
 				<unitPattern count="other">Wati {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">Hg {0}</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} za Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="one">{0} inHg</unitPattern>
 				<unitPattern count="other">{0} inHg</unitPattern>
@@ -5358,20 +5565,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>mwanga</displayName>
-				<unitPattern count="one">mwanga {0}</unitPattern>
-				<unitPattern count="other">mianga {0}</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">sr {0}</unitPattern>
+				<unitPattern count="other">sr {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<unitPattern count="one">kat {0}</unitPattern>
+				<unitPattern count="other">kat {0}</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">C {0}</unitPattern>
+				<unitPattern count="other">C {0}</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">F {0}</unitPattern>
+				<unitPattern count="other">F {0}</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">H {0}</unitPattern>
+				<unitPattern count="other">H {0}</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">S {0}</unitPattern>
+				<unitPattern count="other">S {0}</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
+				<unitPattern count="one">cal-IT {0}</unitPattern>
+				<unitPattern count="other">cal-IT {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">Bq {0}</unitPattern>
+				<unitPattern count="other">Bq {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">Sv {0}</unitPattern>
+				<unitPattern count="other">Sv {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">Gy {0}</unitPattern>
+				<unitPattern count="other">Gy {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">kgf {0}</unitPattern>
+				<unitPattern count="other">kgf {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">T{0}</unitPattern>
+				<unitPattern count="other">T{0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">Wb{0}</unitPattern>
+				<unitPattern count="other">Wb{0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>sehemu kwa kila bilioni</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>usiku</displayName>
-				<unitPattern count="one">usiku {0}</unitPattern>
-				<unitPattern count="other">usiku {0}</unitPattern>
-				<perUnitPattern>{0}/usiku</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/sw_KE.xml b/make/data/cldr/common/main/sw_KE.xml
index 5ab87eb56a6..54b133ee29f 100644
--- a/make/data/cldr/common/main/sw_KE.xml
+++ b/make/data/cldr/common/main/sw_KE.xml
@@ -42,7 +42,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en_AU">Kiingereza cha Australia</language>
 			<language type="en_CA">Kiingereza cha Kanada</language>
 			<language type="en_GB">Kiingereza cha Uingereza</language>
-			<language type="en_GB" alt="short">Kiingereza cha Uingereza</language>
 			<language type="en_US">Kiingereza cha Marekani</language>
 			<language type="en_US" alt="short">Kiingereza cha Marekani)</language>
 			<language type="es_419">Kihispania cha Amerika Kusini</language>
@@ -221,7 +220,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BT">Bhutani</territory>
 			<territory type="BY">Belarusi</territory>
 			<territory type="CC">Visiwa vya Kokos (Keeling)</territory>
-			<territory type="CD">Kongo - Kinshasa</territory>
 			<territory type="CV">Kepuvede</territory>
 			<territory type="CW">Kurakao</territory>
 			<territory type="EA">Keuta na Melilla</territory>
@@ -505,13 +503,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saa za Afghanistani</standard>
 				</long>
 			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>Saa za Afrika Magharibi</generic>
-					<standard>Saa za Wastani za Afrika Magharibi</standard>
-					<daylight>Saa za Majira ya Joto za Afrika Magharibi</daylight>
-				</long>
-			</metazone>
 			<metazone type="Amazon">
 				<long>
 					<generic>Saa za Amazon</generic>
@@ -989,29 +980,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000000" count="one">¤ M0;¤-M0</pattern>
+					<pattern type="1000" count="one">¤ elfu 0</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ elfu 0</pattern>
+					<pattern type="1000" count="other">¤ elfu 0</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ elfu 0</pattern>
+					<pattern type="10000" count="one">¤ elfu 00</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ elfu 00</pattern>
+					<pattern type="10000" count="other">¤ elfu 00</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ elfu 00</pattern>
+					<pattern type="100000" count="one">¤ elfu 000</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ elfu 000</pattern>
+					<pattern type="100000" count="other">¤ elfu 000</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ elfu 000</pattern>
+					<pattern type="1000000" count="one">¤ M0</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ M0</pattern>
 					<pattern type="1000000" count="other">¤ M0</pattern>
-					<pattern type="10000000" count="one">¤ M00;¤M-M00</pattern>
-					<pattern type="10000000" count="other">¤ M00;¤-M00</pattern>
-					<pattern type="100000000" count="one">¤ M000;¤M-000</pattern>
+					<pattern type="10000000" count="one">¤ M00</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ M00</pattern>
+					<pattern type="10000000" count="other">¤ M00</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ M00</pattern>
+					<pattern type="100000000" count="one">¤ M000</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ M000</pattern>
 					<pattern type="100000000" count="other">¤ M000</pattern>
-					<pattern type="1000000000" count="one">¤ B0;¤-B0</pattern>
-					<pattern type="1000000000" count="other">¤ B0;¤-B0</pattern>
-					<pattern type="10000000000" count="one">¤ B00;¤-B00</pattern>
-					<pattern type="10000000000" count="other">¤ B00;¤-B00</pattern>
-					<pattern type="100000000000" count="one">¤ B000;¤-B000</pattern>
-					<pattern type="100000000000" count="other">¤ B000;¤-B000</pattern>
-					<pattern type="1000000000000" count="one">¤ T0;¤-T0</pattern>
+					<pattern type="1000000000" count="one">¤ B0</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ B0</pattern>
+					<pattern type="1000000000" count="other">¤ B0</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ B0</pattern>
+					<pattern type="10000000000" count="one">¤ B00</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ B00</pattern>
+					<pattern type="10000000000" count="other">¤ B00</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ B00</pattern>
+					<pattern type="100000000000" count="one">¤ B000</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ B000</pattern>
+					<pattern type="100000000000" count="other">¤ B000</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ B000</pattern>
+					<pattern type="1000000000000" count="one">¤ T0</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ T0</pattern>
 					<pattern type="1000000000000" count="other">¤ T0</pattern>
-					<pattern type="10000000000000" count="one">¤ T00;¤-T00</pattern>
+					<pattern type="10000000000000" count="one">¤ T00</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ T00</pattern>
 					<pattern type="10000000000000" count="other">¤ T00</pattern>
-					<pattern type="100000000000000" count="one">¤ T000;¤-T000</pattern>
-					<pattern type="100000000000000" count="other">¤ T000;¤-T000</pattern>
+					<pattern type="100000000000000" count="one">¤ T000</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ T000</pattern>
+					<pattern type="100000000000000" count="other">¤ T000</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ T000</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/syr.xml b/make/data/cldr/common/main/syr.xml
index de89e87770a..e91005bc79f 100644
--- a/make/data/cldr/common/main/syr.xml
+++ b/make/data/cldr/common/main/syr.xml
@@ -34,7 +34,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fa">ܦܪܣܝܬ</language>
 			<language type="ff">ܦܘܠܐܗܝܬ</language>
 			<language type="fi">ܦܝܢܠܢܕܝܬ</language>
-			<language type="fil" draft="unconfirmed">ܦܝܠܝܦܝܢܝܬ</language>
+			<language type="fil">ܦܝܠܝܦܝܢܝܬ</language>
 			<language type="fon">ܦܘܢܝܬ</language>
 			<language type="fr">ܦܪܢܣܝܬ</language>
 			<language type="gaa">ܓܐܝܬ</language>
@@ -42,12 +42,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="gu">ܓܘܓܐܪܝܬ</language>
 			<language type="he">ܥܒܪܐܝܬ</language>
 			<language type="hi">ܗܢܕܝܐ</language>
+			<language type="hi_Latn">ܗܢܕܝܐ (ܪܗܘܡܝܐ)</language>
 			<language type="hy">ܐܪܡܢܝܬ</language>
-			<language type="id" draft="unconfirmed">ܐܢܕܘܢܝܬ</language>
+			<language type="id">ܐܢܕܘܢܝܬ</language>
 			<language type="it">ܐܝܛܠܝܬ</language>
-			<language type="ja" draft="unconfirmed">ܝܦܢܝܐ</language>
+			<language type="ja">ܝܦܢܝܐ</language>
 			<language type="ka">ܓܘܪܓܝܐܝܬ</language>
-			<language type="ko" draft="unconfirmed">ܟܘܪܐܝܬ</language>
+			<language type="ko">ܟܘܪܝܐܝܬ</language>
 			<language type="ku">ܩܘܪܕܝܬ</language>
 			<language type="la">ܠܬܝܢܝܬ</language>
 			<language type="lg">ܓܢܕܝܬ</language>
@@ -68,18 +69,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sv">ܣܘܝܕܐܝܬ</language>
 			<language type="sw">ܣܘܐܗܝܠܐܝܬ</language>
 			<language type="syr">ܣܘܪܝܝܐ</language>
-			<language type="th" draft="unconfirmed">ܬܝܠܢܕܐܝܬ</language>
+			<language type="th">ܬܝܠܢܕܐܝܬ</language>
 			<language type="tr">ܬܘܪܟܝܬ</language>
 			<language type="uk">ܐܘܟܪܐܝܢܐܝܬ</language>
 			<language type="und">ܠܫܢܐ ܠܐ ܝܕܝܥܐ</language>
 			<language type="ur">ܐܘܪܕܘܝܬ</language>
 			<language type="vi">ܒܝܬܢܐܡܐܝܬ</language>
 			<language type="yi">ܝܕܝܬܝܬ</language>
-			<language type="zh">ܨܝܢܝܬ</language>
-			<language type="zh" alt="menu">ܨܝܢܝܬ (ܡܐܢܕܘܪܝܐ)</language>
-			<language type="zh_Hans">ܨܝܢܝܬ (ܦܫܝܛܐ)</language>
-			<language type="zh_Hans" alt="long">ܨܝܢܝܬ (ܡܐܢܕܘܪܝܐ ܦܫܝܛܐ)</language>
-			<language type="zh_Hant">ܨܝܢܐܝܬ</language>
+			<language type="zh">ܨܝܢܐܝܬ</language>
+			<language type="zh_Hans">ܨܝܢܐܝܬ ܦܫܝܛܐ</language>
+			<language type="zh_Hant">ܨܝܢܐܝܬ ܝܘܒܠܝܐ</language>
 		</languages>
 		<scripts>
 			<script type="Arab">ܥܪܒܝܬ</script>
@@ -87,58 +86,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Armn">ܐܪܡܢܝܬ</script>
 			<script type="Beng" draft="unconfirmed">ܒܢܓܠܝܬ</script>
 			<script type="Bopo" draft="unconfirmed">ܒܘܦܘܡܘܦܘܐܝܬ</script>
-			<script type="Cyrl" draft="unconfirmed">ܣܝܪܝܠܝܐ</script>
+			<script type="Cyrl">ܩܘܪܠܝܐ</script>
 			<script type="Ethi" draft="unconfirmed">ܟܘܫܝܬ</script>
 			<script type="Geor">ܓܘܪܓܝܬ</script>
 			<script type="Grek">ܝܘܢܝܬ</script>
 			<script type="Gujr">ܓܘܓܐܪܝܬ</script>
-			<script type="Hans" draft="unconfirmed">ܗܢܙ</script>
-			<script type="Hant" draft="unconfirmed">ܗܢܙ ܦܫܝܛܐ</script>
+			<script type="Hans">ܦܫܝܛܐ</script>
+			<script type="Hans" alt="stand-alone">ܨܝܢܐܝܬ ܦܫܝܛܐ</script>
+			<script type="Hant">ܝܘܒܠܝܐ</script>
+			<script type="Hant" alt="stand-alone">ܨܝܢܐܝܬ ܝܘܒܠܝܐ</script>
 			<script type="Hebr">ܥܒܪܝܬ</script>
-			<script type="Jpan" draft="unconfirmed">ܝܦܢܝܐ</script>
+			<script type="Jpan">ܝܦܢܐܝܬ</script>
 			<script type="Knda" draft="unconfirmed">ܟܢܕܐܝܬ</script>
-			<script type="Kore" draft="unconfirmed">ܟܘܪܐܝܬ</script>
-			<script type="Latn" draft="unconfirmed">ܠܬܝܢܝܐ</script>
+			<script type="Kore">ܟܘܪܝܐܝܬ</script>
+			<script type="Latn">ܪܗܘܡܝܐ</script>
 			<script type="Syrc">ܣܘܪܝܬ</script>
 			<script type="Zsye">ܐܝܡܘܓܝ</script>
-			<script type="Zxxx">ܠܝܬ ܟܬܝܒܘܬܐ</script>
-			<script type="Zzzz">ܠܝܬ ܛܟܣܐ ܕܟܬܝܒܬܐ</script>
+			<script type="Zxxx">ܕܠܐ ܟܬܒܐ</script>
+			<script type="Zzzz">ܟܬܝܒܘܬܐ ܠܐ ܝܕܝܥܬܐ</script>
 		</scripts>
 		<territories>
-			<territory type="001">ܬܐܒܝܠ</territory>
+			<territory type="001">ܥܠܡܐ</territory>
 			<territory type="002">ܐܦܪܝܩܐ</territory>
 			<territory type="003">ܐܡܪܝܟܐ ܓܪܒܝܝܬܐ</territory>
 			<territory type="005">ܐܡܪܝܟܐ ܬܝܡܢܝܬܐ</territory>
 			<territory type="009">ܐܘܩܝܢܘܣܝܐ</territory>
-			<territory type="011">ܐܦܪܝܩܐ ܡܥܪܒܝܬܐ</territory>
+			<territory type="011">ܡܥܪܒ ܐܦܪܝܩܐ</territory>
 			<territory type="013">ܐܡܪܝܟܐ ܡܨܥܝܬܐ</territory>
-			<territory type="014">ܐܦܪܝܩܐ ܡܕܢܚܝܬܐ</territory>
-			<territory type="015">ܐܦܪܝܩܐ ܓܪܒܝܝܬܐ</territory>
-			<territory type="017">ܐܦܪܝܩܐ ܡܨܥܝܬܐ</territory>
-			<territory type="018">ܐܦܪܝܩܐ ܬܝܡܢܝܬܐ</territory>
+			<territory type="014">ܡܕܢܚ ܐܦܪܝܩܐ</territory>
+			<territory type="015">ܓܪܒܐ ܐܦܪܝܩܐ</territory>
+			<territory type="017">ܡܨܥܬ ܐܦܪܝܩܐ</territory>
+			<territory type="018">ܬܝܡܢ ܐܦܪܝܩܐ</territory>
 			<territory type="019">ܐܡܪ̈ܝܟܐ</territory>
-			<territory type="021">ܓܪܒܝܐ ܐܡܪܝܟܐ</territory>
-			<territory type="029">ܟܐܪܝܒܝܢ</territory>
-			<territory type="030">ܐܣܝܐ ܡܕܢܚܝܬܐ</territory>
-			<territory type="034">ܐܣܝܐ ܬܝܡܢܝܬܐ</territory>
+			<territory type="021">ܓܪܒܐ ܐܡܪܝܟܐ</territory>
+			<territory type="029">ܟܐܪܝܒܐ</territory>
+			<territory type="030">ܡܕܢܚ ܐܣܝܐ</territory>
+			<territory type="034">ܬܝܡܢ ܐܣܝܐ</territory>
 			<territory type="035">ܬܝܡܢ ܡܕܢܚ ܐܣܝܐ</territory>
-			<territory type="039">ܐܘܪܘܦܐ ܬܝܡܢܝܬܐ</territory>
+			<territory type="039">ܬܝܡܢ ܐܘܪܘܦܐ</territory>
 			<territory type="053">ܐܘܣܛܪܐܠܐܣܝܐ</territory>
 			<territory type="054">ܡܝܠܐܢܝܣܝܐ</territory>
 			<territory type="057">ܡܝܟܪܘܢܝܙܝܐ</territory>
 			<territory type="061">ܦܘܠܢܝܣܝܐ</territory>
 			<territory type="142">ܐܣܝܐ</territory>
-			<territory type="143">ܐܣܝܐ ܡܨܥܝܬܐ</territory>
-			<territory type="145">ܐܣܝܐ ܡܥܪܒܝܬܐ</territory>
+			<territory type="143">ܡܨܥܬ ܐܣܝܐ</territory>
+			<territory type="145">ܡܥܪܒ ܐܣܝܐ</territory>
 			<territory type="150">ܐܘܪܘܦܐ</territory>
-			<territory type="151">ܐܘܪܘܦܐ ܡܕܢܚܝܬܐ</territory>
-			<territory type="154">ܐܘܪܘܦܐ ܓܪܒܝܝܬܐ</territory>
-			<territory type="155">ܐܘܪܘܦܐ ܡܥܪܒ݂ܝܬܐ</territory>
-			<territory type="202">ܐܦܪܝܩܐ ܨܚܪܐ ܬܝܡܢܝܬܐ</territory>
+			<territory type="151">ܡܕܢܚ ܐܘܪܘܦܐ</territory>
+			<territory type="154">ܓܪܒܐ ܐܘܪܘܦܐ</territory>
+			<territory type="155">ܡܥܪܒ ܐܘܪܘܦܐ</territory>
+			<territory type="202">ܐܦܪܝܩܐ ܬܝܡܢ ܨܚܪܐ</territory>
 			<territory type="419">ܐܡܪܝܟܐ ܠܬܝܢܝܬܐ</territory>
-			<territory type="AC" draft="unconfirmed">ܓܙܪܬܐ ܕܐܣܝܢܫܘܢ</territory>
+			<territory type="AC">ܓܙܪܬܐ ܕܣܘܠܩܐ</territory>
 			<territory type="AD">ܐܢܕܘܪܐ</territory>
-			<territory type="AE">ܐܡܝܪ̈ܘܬܐ ܡܚܝܕ̈ܬܐ ܥܪ̈ܒܝܐ</territory>
+			<territory type="AE">ܐܡܝܪ̈ܘܬܐ ܥܪ̈ܒܝܬܐ ܡܚܝ̈ܕܬܐ</territory>
 			<territory type="AF">ܐܦܓܐܢܣܬܐܢ</territory>
 			<territory type="AG">ܐܢܬܝܓܘܐ ܘܒܐܪܒܘܕܐ</territory>
 			<territory type="AI">ܐܢܓܘܝܠܐ</territory>
@@ -147,11 +148,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AO">ܐܢܓܘܠܐ</territory>
 			<territory type="AQ">ܐܢܬܪܬܝܟܐ</territory>
 			<territory type="AR">ܐܪܓܢܬܝܢܐ</territory>
-			<territory type="AS">ܣܡܘܐ ܐܡܝܖ̈ܟܝܐ</territory>
+			<territory type="AS">ܣܡܘܐ ܐܡܪܝܟܝܬܐ</territory>
 			<territory type="AT">ܐܘܣܛܪܝܐ</territory>
 			<territory type="AU">ܐܘܣܬܪܠܝܐ</territory>
 			<territory type="AW">ܐܪܘܒܐ</territory>
-			<territory type="AX">ܓܙܝܖ̈ܐ ܕܐܠܐܢܕ</territory>
+			<territory type="AX">ܓܙܪ̈ܬܐ ܕܐܠܐܢܕ</territory>
 			<territory type="AZ">ܐܙܪܒܝܓܐܢ</territory>
 			<territory type="BA">ܒܘܣܢܐ ܘܗܪܬܣܓܘܒܝܢܐ</territory>
 			<territory type="BB">ܒܪܒܐܕܘܣ</territory>
@@ -162,11 +163,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BH">ܒܚܪܝܢ</territory>
 			<territory type="BI">ܒܘܪܘܢܕܝ</territory>
 			<territory type="BJ">ܒܢܝܢ</territory>
-			<territory type="BL">ܡܪܬܝ ܒܪ ܬܘܠܡܝ</territory>
-			<territory type="BM">ܒܪܡܘܕܐ</territory>
+			<territory type="BL">ܡܪܝ ܒܪ ܬܘܠܡܝ</territory>
+			<territory type="BM">ܒܝܪܡܘܕܐ</territory>
 			<territory type="BN">ܒܪܘܢܐܝ</territory>
 			<territory type="BO">ܒܘܠܝܒܝܐ</territory>
-			<territory type="BQ">ܟܐܪܝܒܝܢ ܕܢܝܬܝܪܠܐܢܕܣ</territory>
+			<territory type="BQ">ܟܐܪܝܒܐ ܕܢܝܬܝܪܠܐܢܕܣ</territory>
 			<territory type="BR">ܒܪܐܙܝܠ</territory>
 			<territory type="BS">ܒܗܐܡܣ</territory>
 			<territory type="BT">ܒܘܬܐܢ</territory>
@@ -175,7 +176,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BY">ܒܠܐܪܘܣ</territory>
 			<territory type="BZ">ܒܠܝܙ</territory>
 			<territory type="CA">ܟܢܕܐ</territory>
-			<territory type="CC">ܓܙܝܖ̈ܐ ܕܟܘܟܘܣ</territory>
+			<territory type="CC">ܓܙܪ̈ܬܐ ܕܟܘܟܘܣ</territory>
 			<territory type="CD">ܟܘܢܓܘ - ܟܝܢܫܐܣܐ</territory>
 			<territory type="CD" alt="variant">ܩܘܛܢܝܘܬܐ ܕܝܡܘܩܪܛܝܬܐ ܕܟܘܢܓܘ</territory>
 			<territory type="CF">ܩܘܛܢܝܘܬܐ ܕܐܦܪܝܩܐ ܡܨܥܝܬܐ</territory>
@@ -184,14 +185,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CH">ܣܘܝܣܪܐ</territory>
 			<territory type="CI">ܩܘܛ ܕܝܒܘܐܪ</territory>
 			<territory type="CI" alt="variant">ܣܘܦܐ ܕܓܪܡܦܝܠܐ</territory>
-			<territory type="CK">ܓܙܪܬܐ ܟܘܟ</territory>
+			<territory type="CK">ܓܙܪ̈ܬܐ ܟܘܟ</territory>
 			<territory type="CL">ܬܫܝܠܝ</territory>
 			<territory type="CM">ܟܐܡܪܘܢ</territory>
 			<territory type="CN">ܨܝܢ</territory>
 			<territory type="CO">ܟܘܠܘܡܒܝܐ</territory>
-			<territory type="CP" draft="unconfirmed">ܓܙܪܬܐ ܕܟܠܝܦܝܪܬܘܢ</territory>
-			<territory type="CR">ܟܘܣܬܐ ܪܝܩܐ</territory>
-			<territory type="CU">ܟܘܒܐ</territory>
+			<territory type="CP">ܓܙܪܬܐ ܕܟܠܝܦܝܪܬܘܢ</territory>
+			<territory type="CQ">ܣܐܪܟ</territory>
+			<territory type="CR">ܟܘܣܬܐ ܪܝܟܐ</territory>
+			<territory type="CU">ܩܘܒܐ</territory>
 			<territory type="CV">ܟܐܦ ܒܝܪܕܝ (ܪܝܫܐ ܝܘܪܩܐ)</territory>
 			<territory type="CW">ܟܘܪܐܟܘ</territory>
 			<territory type="CX">ܓܙܪܬܐ ܕܟܪܝܣܬܡܣ</territory>
@@ -199,7 +201,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CZ">ܬܫܝܟܝܐ</territory>
 			<territory type="CZ" alt="variant">ܬܫܝܟ</territory>
 			<territory type="DE">ܐܠܡܢܝܐ</territory>
-			<territory type="DG" draft="unconfirmed">ܕܐܝܓܘ ܓܪܣܝܐ</territory>
+			<territory type="DG">ܕܝܐܓܘ ܓܐܪܣܝܐ</territory>
 			<territory type="DJ">ܓܝܒܘܛܝ</territory>
 			<territory type="DK">ܕܐܢܡܐܪܩ</territory>
 			<territory type="DM">ܕܘܡܝܢܝܩܐ</territory>
@@ -217,10 +219,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="EZ">ܩܠܝܡܐ ܕܐܘܪܘ</territory>
 			<territory type="FI">ܦܝܢܠܢܕ</territory>
 			<territory type="FJ">ܦܝܓܝ</territory>
-			<territory type="FK">ܓܙܪܬܐ ܕܦܠܟܠܢܕ</territory>
-			<territory type="FK" alt="variant">ܓܙܪܬܐ ܕܡܠܒܢܐܣ</territory>
-			<territory type="FM">ܐܬܪܘܬܐ ܦܕܪܠܝܐ ܕܡܝܩܪܘܢܝܣܝܐ</territory>
-			<territory type="FO">ܓܙܝܖ̈ܐ ܕܦܪܘ</territory>
+			<territory type="FK">ܓܙܪ̈ܬܐ ܕܦܠܟܠܢܕ</territory>
+			<territory type="FK" alt="variant">ܓܙܪ̈ܬܐ ܕܡܠܒܢܐܣ</territory>
+			<territory type="FM">ܐܬܪ̈ܘܬܐ ܦܕܪܠܝܐ ܕܡܝܩܪܘܢܝܣܝܐ</territory>
+			<territory type="FO">ܓܙܪ̈ܬܐ ܕܦܪܘ</territory>
 			<territory type="FR">ܦܪܢܣܐ</territory>
 			<territory type="GA">ܓܒܘܢ</territory>
 			<territory type="GB">ܡܠܟܘܬܐ ܡܚܝܕܬܐ</territory>
@@ -236,42 +238,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GP">ܓܘܐܕܘܠܘܦܐܝ</territory>
 			<territory type="GQ">ܓܝܢܝܐ ܫܘܝܬܐ</territory>
 			<territory type="GR">ܝܘܢ</territory>
-			<territory type="GS">ܓܙܝܖ̈ܐ ܕܓܘܪܓܝܐ ܘܣܐܢܕܘܝܟ ܬܝܡܢܝ̈ܐ</territory>
+			<territory type="GS">ܓܙܪ̈ܬܐ ܕܓܘܪܓܝܐ ܘܣܐܢܕܘܝܟ ܬܝܡܢܝ̈ܐ</territory>
 			<territory type="GT">ܓܘܐܬܝܡܐܠܐ</territory>
 			<territory type="GU">ܓܘܐܡ</territory>
 			<territory type="GW">ܓܝܢܝܐ ܒܝܣܐܘ</territory>
 			<territory type="GY">ܓܘܝܐܢܐ</territory>
 			<territory type="HK">ܗܘܢܓ ܟܘܢܓ</territory>
-			<territory type="HM" draft="unconfirmed">ܓܙܝܪ̈ܐ ܕܗܪܕ ܘܡܟܕܘܢܠܕ</territory>
+			<territory type="HM">ܓܙܪ̈ܬܐ ܕܗܪܕ ܘܡܟܕܘܢܠܕ</territory>
 			<territory type="HN">ܗܘܢܕܘܪܣ</territory>
 			<territory type="HR">ܩܪܘܐܛܝܐ</territory>
 			<territory type="HT">ܗܐܝܬܝ</territory>
 			<territory type="HU">ܡܓܪ</territory>
-			<territory type="IC">ܓܙܝܖ̈ܐ ܕܟܐܢܪܝ</territory>
+			<territory type="IC">ܓܙܝܪ̈ܐ ܕܟܐܢܪܝ</territory>
 			<territory type="ID">ܐܝܢܕܘܢܝܣܝܐ</territory>
 			<territory type="IE">ܐܝܪܠܢܕ</territory>
 			<territory type="IL">ܐܝܣܪܐܝܠ</territory>
 			<territory type="IM">ܓܙܪܬܐ ܕܡܐܢ</territory>
 			<territory type="IN">ܗܢܕܘ</territory>
-			<territory type="IO">ܩܠܝܡܐ ܕܒܪܝܛܢܝܐ ܓܘ ܐܘܩܝܢܘܣ ܗܢܕܘܝܐ</territory>
+			<territory type="IO">ܐܬܪܐ ܕܐܘܩܝܢܘܣ ܗܢܕܘܝܐ ܕܒܪܝܛܢܝܐ</territory>
+			<territory type="IO" alt="chagos">ܓܙܪ̈ܬܐ ܕܟܐܓܘܣ</territory>
 			<territory type="IQ">ܥܝܪܩ</territory>
 			<territory type="IR">ܐܝܪܐܢ</territory>
 			<territory type="IS">ܐܝܣܠܢܕ</territory>
 			<territory type="IT">ܐܝܛܠܝܐ</territory>
 			<territory type="JE">ܓܝܪܙܝ</territory>
 			<territory type="JM">ܓܡܝܟܐ</territory>
-			<territory type="JO">ܐܘܪܕܘܢ</territory>
+			<territory type="JO">ܝܘܪܕܢܢ</territory>
 			<territory type="JP">ܝܦܢ</territory>
-			<territory type="KE">ܩܝܢܝܐ</territory>
+			<territory type="KE">ܟܝܢܝܐ</territory>
 			<territory type="KG">ܩܝܪܓܝܙܣܬܐܢ</territory>
 			<territory type="KH">ܟܡܒܘܕܝܐ</territory>
 			<territory type="KI">ܟܝܪܝܒܬܝ</territory>
 			<territory type="KM">ܓܙܪܬܐ ܕܩܡܪ</territory>
 			<territory type="KN">ܣܐܢܬ ܟܝܬܣ ܘܢܝܒܝܣ</territory>
-			<territory type="KP">ܟܘܪܝܐ ܕܓܪܒܝܐ</territory>
-			<territory type="KR">ܟܘܪܝܐ ܕܬܝܡܢܝܐ</territory>
+			<territory type="KP">ܟܘܪܝܐ ܓܪܒܝܝܬܐ</territory>
+			<territory type="KR">ܟܘܪܝܐ ܬܝܡܢܝܬܐ</territory>
 			<territory type="KW">ܟܘܝܬ</territory>
-			<territory type="KY">ܓܙܝܖ̈ܐ ܕܟܐܝܡܐܢ</territory>
+			<territory type="KY">ܓܙܪ̈ܬܐ ܕܟܐܝܡܐܢ</territory>
 			<territory type="KZ">ܟܙܩܣܬܐܢ</territory>
 			<territory type="LA">ܠܐܘܣ</territory>
 			<territory type="LB">ܠܒܢܢ</territory>
@@ -290,13 +293,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ME">ܡܘܢܛܝܢܝܓܪܘ</territory>
 			<territory type="MF">ܣܐܢܬ ܡܐܪܬܝܢ</territory>
 			<territory type="MG">ܡܕܓܣܩܪ</territory>
-			<territory type="MH">ܓܙܪܬܐ ܡܐܪܫܐܠ</territory>
+			<territory type="MH">ܓܙܪ̈ܬܐ ܡܐܪܫܐܠ</territory>
 			<territory type="MK">ܓܪܒܝ ܡܩܕܘܢܝܐ</territory>
 			<territory type="ML">ܡܐܠܝ</territory>
 			<territory type="MM">ܡܝܐܢܡܐܪ (ܒܘܪܡܐ)</territory>
-			<territory type="MN">ܡܘܢܓܘܠܝܐ</territory>
-			<territory type="MO" draft="unconfirmed">ܡܐܟܐܘ</territory>
-			<territory type="MP">ܓܙܝܖ̈ܐ ܕܡܪܝܢܐ ܓܪܒܝܐ</territory>
+			<territory type="MN">ܡܘܓܠܝܐ</territory>
+			<territory type="MO">ܐܬܪܐ ܡܕܒܪܢܝܐ ܦܪܝܫܐ ܕܡܐܟܐܘ</territory>
+			<territory type="MP">ܓܙܪ̈ܬܐ ܕܡܪܝܢܐ ܓܪ̈ܒܝܝܬܐ</territory>
 			<territory type="MQ">ܡܐܪܬܝܢܝܩ</territory>
 			<territory type="MR">ܡܘܪܝܛܢܝܐ</territory>
 			<territory type="MS">ܡܘܢܣܝܪܐܬ</territory>
@@ -308,30 +311,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MY">ܡܠܝܙܝܐ</territory>
 			<territory type="MZ">ܡܘܙܡܒܝܩ</territory>
 			<territory type="NA">ܢܡܝܒܝܐ</territory>
-			<territory type="NC" draft="unconfirmed">ܢܝܘ ܟܠܝܕܘܢܝܐ</territory>
+			<territory type="NC">ܢܝܘ ܟܠܝܕܘܢܝܐ</territory>
 			<territory type="NE">ܢܝܓܪ</territory>
-			<territory type="NF" draft="unconfirmed">ܓܙܪܬܐ ܕܢܘܪܦܠܟ</territory>
+			<territory type="NF">ܓܙܪܬܐ ܕܢܘܪܦܘܠܟ</territory>
 			<territory type="NG">ܢܝܓܝܪܝܐ</territory>
 			<territory type="NI">ܢܝܟܪܐܓܘܐ</territory>
 			<territory type="NL">ܗܘܠܢܕܐ</territory>
 			<territory type="NO">ܢܘܪܒܝܓ</territory>
 			<territory type="NP">ܢܝܦܐܠ</territory>
 			<territory type="NR">ܢܐܘܪܘ</territory>
-			<territory type="NU" draft="unconfirmed">ܢܘܥ</territory>
+			<territory type="NU">ܢܝܘܐܝ</territory>
 			<territory type="NZ">ܢܝܘ ܙܝܠܢܕ</territory>
-			<territory type="NZ" alt="variant" draft="unconfirmed">ܐܬܝܐܐܪܐܘ ܢܝܘ ܙܝܠܢܕ</territory>
+			<territory type="NZ" alt="variant">ܐܘܬܝܐܪܘܐ ܢܝܘ ܙܝܠܢܕ</territory>
 			<territory type="OM">ܥܘܡܐܢ</territory>
 			<territory type="PA">ܦܢܡܐ</territory>
 			<territory type="PE">ܦܝܪܘ</territory>
-			<territory type="PF" draft="unconfirmed">ܦܘܠܝܢܝܣܝܐ ܦܪܢܣܝܐ</territory>
+			<territory type="PF">ܦܘܠܝܢܝܣܝܐ ܦܪܢܣܝܬܐ</territory>
 			<territory type="PG">ܦܐܦܘܐ ܓܝܢܝܐ ܚܕܬܐ</territory>
 			<territory type="PH">ܦܝܠܝܦܝܢܝܐ</territory>
 			<territory type="PK">ܦܐܟܣܬܐܢ</territory>
 			<territory type="PL">ܦܘܠܢܕ</territory>
-			<territory type="PM">ܣܐܢܬ ܦܝܥܪ ܘܡܩܘܠܘܢ</territory>
-			<territory type="PN" draft="unconfirmed">ܓܙܝܪ̈ܐ ܕܦܝܬܟܐܝܪܢ</territory>
+			<territory type="PM">ܡܪܝ ܦܛܪܘܣ ܘܡܝܩܝܠܘܢ</territory>
+			<territory type="PN">ܓܙܝܪ̈ܬܐ ܕܦܝܬܟܐܪܢ</territory>
 			<territory type="PR">ܦܘܐܪܛܘ ܪܝܩܘ</territory>
-			<territory type="PS">ܐܬܖ̈ܘܬܐ ܕܦܠܣܛܝܢ</territory>
+			<territory type="PS">ܐܬܪ̈ܘܬܐ ܕܦܠܣܛܝܢ</territory>
 			<territory type="PS" alt="short">ܦܠܣܛܝܢ</territory>
 			<territory type="PT">ܦܘܪܛܘܓܠ</territory>
 			<territory type="PW">ܦܠܐܘ</territory>
@@ -365,16 +368,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SY">ܣܘܪܝܐ</territory>
 			<territory type="SZ">ܐܣܘܐܛܝܢܝ</territory>
 			<territory type="SZ" alt="variant">ܣܘܐܙܝܠܢܕ</territory>
-			<territory type="TA" draft="unconfirmed">ܬܪܝܣܬܢ ܕܟܘܢܗܐ</territory>
-			<territory type="TC">ܓܙܝܖ̈ܐ ܕܬܘܪܟܣ ܘܟܐܝܟܘܣ</territory>
+			<territory type="TA">ܬܪܝܣܬܢ ܕܟܘܢܗܐ</territory>
+			<territory type="TC">ܓܙܝܪ̈ܐ ܕܬܘܪܟܣ ܘܟܐܝܟܘܣ</territory>
 			<territory type="TD">ܬܫܐܕ</territory>
-			<territory type="TF">ܩܠܝܡ̈ܐ ܕܦܪܢܣܐ ܬܝܡܢܝܬܐ</territory>
+			<territory type="TF">ܐܬܪ̈ܘܬܐ ܬܝܡܢܝ̈ܬܐ ܕܦܪܢܣܐ</territory>
 			<territory type="TG">ܬܘܓܘ</territory>
 			<territory type="TH">ܬܐܝܠܢܕ</territory>
 			<territory type="TJ">ܬܐܓܝܟܣܬܐܢ</territory>
-			<territory type="TK" draft="unconfirmed">ܬܘܟܝܠܐܘ</territory>
-			<territory type="TL">ܬܝܡܘܪ-ܠܣܬܝ</territory>
-			<territory type="TL" alt="variant">ܬܝܡܘܪ ܡܕܢܚܐ</territory>
+			<territory type="TK">ܬܘܟܝܠܐܘ</territory>
+			<territory type="TL">ܡܕܢܚ ܬܝܡܘܪ</territory>
 			<territory type="TM">ܬܘܪܟܡܢܣܬܐܢ</territory>
 			<territory type="TN">ܬܘܢܣ</territory>
 			<territory type="TO">ܬܘܢܓܐ</territory>
@@ -385,7 +387,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="TZ">ܛܢܙܢܝܐ</territory>
 			<territory type="UA">ܐܘܩܪܐܝܢܐ</territory>
 			<territory type="UG">ܐܘܓܢܕܐ</territory>
-			<territory type="UM" draft="unconfirmed">ܓܙܝܪ̈ܐ ܪ̈ܚܝܩܐ ܕܐܘܚܕ̈ܢܐ ܡܚܝܕ̈ܐ</territory>
+			<territory type="UM">ܓܙܪ̈ܬܐ ܒܪ̈ܝܬܐ ܕܐܘܚܕ̈ܢܐ ܡܚܝܕ̈ܐ</territory>
 			<territory type="UN">ܐܡ̈ܘܬܐ ܡܚܝ̈ܕܬܐ</territory>
 			<territory type="US">ܐܘܚܕ̈ܢܐ ܡܚܝܕ̈ܐ</territory>
 			<territory type="UY">ܐܘܪܘܓܘܐܝ</territory>
@@ -393,11 +395,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="VA">ܡܕܝܢܬܐ ܕܘܛܝܩܢ</territory>
 			<territory type="VC">ܣܐܢܬ ܒܝܢܣܝܢܬ ܘܓܪܝܢܐܕܝܢܐܣ</territory>
 			<territory type="VE">ܒܢܙܘܝܠܐ</territory>
-			<territory type="VG">ܓܙܖ̈ܝܐ ܒܬܘ̈ܠܐ ܕܒܪܝܛܢܝܐ</territory>
-			<territory type="VI">ܓܙܖ̈ܝܐ ܒܬܘ̈ܠܐ ܕܐܡܝܪܟܐ</territory>
+			<territory type="VG">ܓܙܪ̈ܬܐ ܕܒܬܘ̈ܠܐ ܕܒܪܝܛܢܝܐ</territory>
+			<territory type="VI">ܓܙܪ̈ܬܐ ܕܒܬܘ̈ܠܐ ܕܐܡܪܝܟܐ</territory>
 			<territory type="VN">ܒܝܬܢܐܡ</territory>
 			<territory type="VU">ܒܐܢܘܐܛܘ</territory>
-			<territory type="WF" draft="unconfirmed">ܘܝܠܝܣ ܘܦܘܬܘܢܐ</territory>
+			<territory type="WF">ܘܐܠܝܣ ܘܦܘܬܘܢܐ</territory>
 			<territory type="WS">ܣܡܘܐ</territory>
 			<territory type="XK">ܩܘܣܘܒܘ</territory>
 			<territory type="YE">ܝܡܢ</territory>
@@ -405,7 +407,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ZA">ܬܝܡܢ ܐܦܪܝܩܐ</territory>
 			<territory type="ZM">ܙܐܡܒܝܐ</territory>
 			<territory type="ZW">ܙܝܡܒܐܒܘܝ</territory>
-			<territory type="ZZ" draft="unconfirmed">ܩܠܝܡܐ ܠܐ ܝܕܝܥܐ</territory>
+			<territory type="ZZ">ܐܬܪܐ ܠܐ ܝܕܝܥܐ</territory>
 		</territories>
 		<keys>
 			<key type="calendar">ܣܘܪܓܕܐ</key>
@@ -423,10 +425,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="dangi">ܣܘܪܓܕܐ ܕܢܓܝ</type>
 			<type key="calendar" type="ethiopic">ܣܘܪܓܕܐ ܟܘܫܝܐ</type>
 			<type key="calendar" type="gregorian">ܣܘܪܓܕܐ ܓܪܝܓܘܪܝܐ</type>
+			<type key="calendar" type="gregorian" scope="core">ܓܪܝܓܘܪܝܐ</type>
 			<type key="calendar" type="hebrew">ܣܘܪܓܕܐ ܝܗܘܕܝܐ</type>
 			<type key="calendar" type="indian">ܣܘܪܓܕܐ ܐܘܡܬܢܝܐ ܗܢܕܘܝܐ</type>
-			<type key="calendar" type="islamic">ܣܘܪܓܕܐ ܡܫܠܡܢܝܐ</type>
-			<type key="calendar" type="islamic-civil">ܣܘܪܓܕܐ ܡܫܠܡܢܝܐ ܡܕܝܢܝܐ</type>
+			<type key="calendar" type="islamic">ܣܘܪܓܕܐ ܡܫܠܡܢܐ</type>
+			<type key="calendar" type="islamic" scope="core">ܣܘܪܓܕܐ ܡܫܠܡܢܐ</type>
+			<type key="calendar" type="islamic-civil">ܣܘܪܓܕܐ ܡܫܠܡܢܐ ܡܕܝܢܝܐ</type>
+			<type key="calendar" type="islamic-civil" scope="core">ܣܘܪܓܕܐ ܡܫܠܡܢܐ ܡܕܝܢܝܐ</type>
 			<type key="calendar" type="iso8601">ܣܘܪܓܕܐ ISO-8601</type>
 			<type key="calendar" type="japanese">ܣܘܪܓܕܐ ܝܦܢܝܐ</type>
 			<type key="calendar" type="persian">ܣܘܪܓܕܐ ܦܪܣܝܐ</type>
@@ -451,14 +456,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="grek">ܡܢܝ̈ܢܐ ܕܝܘܢܝ̈ܐ</type>
 			<type key="numbers" type="hebr">ܡܢܝ̈ܢܐ ܕܝܗܘܕܝ̈ܐ</type>
 			<type key="numbers" type="jpan">ܡܢܝ̈ܢܐ ܕܝܦܢܝ̈ܐ</type>
-			<type key="numbers" type="latn">ܡܢܝ̈ܢܐ ܡܥܪܒܝܐ</type>
+			<type key="numbers" type="latn">ܡܢܝ̈ܢܐ ܡܥܪ̈ܒܝܐ</type>
 			<type key="numbers" type="mong">ܡܢܝ̈ܢܐ ܕܡܘܢܓܘܠܢܝ̈ܐ</type>
 			<type key="numbers" type="roman">ܡܢܝ̈ܢܐ ܪܗܘܡܝܐ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ܛܟܣܐ ܡܝܬܪܝܐ</measurementSystemName>
 			<measurementSystemName type="UK">ܛܟܣܐ ܒܪܝܛܢܝܐ</measurementSystemName>
-			<measurementSystemName type="US">ܛܟܣܐ ܐܡܝܪܟܐ</measurementSystemName>
+			<measurementSystemName type="US">ܛܟܣܐ ܐܡܪܝܟܝܐ</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
 			<codePattern type="language">ܠܫܢܐ:‌ {0}</codePattern>
@@ -474,9 +479,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<characters>
 		<exemplarCharacters>[݀ ݃ ݄ ݇ ݈ ݉ ݊ ݁ ݅ ݂ ݆ ܑ ܰ ܱ ܲ ܳ ܴ ܵ ܶ ܷ ܸ ܹ ܺ ܻ ܼ ܽ ܾ ܿ ܃ ܄ ܅ ܆ ܇ ܈ ܉ ܁ ܂ ܀ ܊ ܋ ܌ ܍ ܐ ܒ ܓܔ ܖ ܕ ܗ ܘ ܙ ܚ ܛܜ ܝ ܞ ܟ ܠ ܡ ܢ ܣܤ ܥ ܦܧ ܨ ܩ ܪ ܫ ܬ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[܏\u200C\u200D ܭ ܮ ܯ ݍ ݎ ݏ]</exemplarCharacters>
-		<exemplarCharacters type="index" draft="contributed">[ܐ ܒ ܓ ܖ ܕ ܗ ܘ ܙ ܚ ܛ ܝ ܟ ܠ ܡ ܢ ܣ ܥ ܦ ܨ ܩ ܪ ܫ ܬ]</exemplarCharacters>
-		<exemplarCharacters type="numbers" draft="contributed">[\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]</exemplarCharacters>
-		<exemplarCharacters type="punctuation" draft="contributed">[\- ‐‑ – — ، ؛ \: ܃ ܄ ܅ ܆ ܇ ܈ ! ؟ ܉ . … ܁ ܂ ܀ '‘’ &quot;“” « » ( ) \[ \] ܊ ܋ ܌ ܍]</exemplarCharacters>
+		<exemplarCharacters type="index">[ܐ ܒ ܓ ܖ ܕ ܗ ܘ ܙ ܚ ܛ ܝ ܟ ܠ ܡ ܢ ܣ ܥ ܦ ܨ ܩ ܪ ܫ ܬ]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — ، ؛ \: ܃ ܄ ܅ ܆ ܇ ܈ ! ؟ ܉ . … ܁ ܂ ܀ '‘’ &quot;“” « » ( ) \[ \] ܊ ܋ ܌ ܍]</exemplarCharacters>
 		<moreInformation>؟</moreInformation>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":" draft="contributed">[\: ∶]</parseLenient>
@@ -748,8 +753,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="3">ܐ</month>
 							<month type="4">ܢ</month>
 							<month type="5">ܐ</month>
-							<month type="6">ܬ</month>
-							<month type="7">ܚ</month>
+							<month type="6">ܚ</month>
+							<month type="7">ܬ</month>
 							<month type="8">ܐ</month>
 							<month type="9">ܐ</month>
 							<month type="10">ܬ</month>
@@ -793,6 +798,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</days>
 				<quarters>
 					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">܏ܪ ܐ</quarter>
+							<quarter type="2">܏ܪ ܒ</quarter>
+							<quarter type="3">܏ܪ ܓ</quarter>
+							<quarter type="4">܏ܪ ܕ</quarter>
+						</quarterWidth>
 						<quarterWidth type="wide">
 							<quarter type="1">ܪܘܒܥܐ ܩܕܡܝܐ</quarter>
 							<quarter type="2">ܪܘܒܥܐ ܬܪܝܢܐ</quarter>
@@ -800,6 +811,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<quarter type="4">ܪܘܒܥܐ ܪܒܝܥܝܐ</quarter>
 						</quarterWidth>
 					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">܏ܪ ܐ</quarter>
+							<quarter type="2">܏ܪ ܒ</quarter>
+							<quarter type="3">܏ܪ ܓ</quarter>
+							<quarter type="4">܏ܪ ܕ</quarter>
+						</quarterWidth>
+					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
@@ -912,6 +931,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d ܒMMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">EEEE، d ܒMMM y G</dateFormatItem>
+						<dateFormatItem id="Hv">v HH܏ܫܥ</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">EEEE، dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d ܒMMM</dateFormatItem>
@@ -1027,6 +1047,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="islamic">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">ܡܘܚܪܡ</month>
+							<month type="2">ܨܦܪ</month>
+							<month type="3">ܪܒܝܥ ܩܕܡܝܐ</month>
+							<month type="4">ܪܒܝܥ ܬܪܝܢܐ</month>
+							<month type="5">ܓܘܡܕܐ ܩܕܡܝܐ</month>
+							<month type="6">ܓܘܡܕܐ ܬܪܝܢܐ</month>
+							<month type="7">ܪܓܒ</month>
+							<month type="8">ܫܥܒܐܢ</month>
+							<month type="9">ܪܡܨܐܢ</month>
+							<month type="10">ܫܘܐܠ</month>
+							<month type="11">ܕܘܠܩܥܕܗ</month>
+							<month type="12">ܕܘܠܚܓܗ</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="wide">
+							<month type="1">ܡܘܚܪܡ</month>
+							<month type="2">ܨܦܪ</month>
+							<month type="3">ܪܒܝܥ ܩܕܡܝܐ</month>
+							<month type="4">ܪܒܝܥ ܬܪܝܢܐ</month>
+							<month type="5">ܓܘܡܕܐ ܩܕܡܝܐ</month>
+							<month type="6">ܓܘܡܕܐ ܬܪܝܢܐ</month>
+							<month type="7">ܪܓܒ</month>
+							<month type="8">ܫܥܒܐܢ</month>
+							<month type="9">ܪܡܨܐܢ</month>
+							<month type="10">ܫܘܐܠ</month>
+							<month type="11">ܕܘܠܩܥܕܗ</month>
+							<month type="12">ܕܘܠܚܓܗ</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
 		</calendars>
 		<fields>
 			<field type="era">
@@ -1036,7 +1092,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ܫܢܬܐ</displayName>
 				<relative type="-1">ܐܫܬܩܕܝ</relative>
 				<relative type="0">ܗܕܐ ܫܢܬܐ</relative>
-				<relative type="1">ܫܢܬܐ ܐܚܪܬܐ</relative>
+				<relative type="1">ܫܢܬܐ ܕܐܬܝܐ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">ܒܚܕܐ ܫܢܬܐ</relativeTimePattern>
 					<relativeTimePattern count="other">ܒ{0} ܫܢܝ̈ܐ</relativeTimePattern>
@@ -1046,6 +1102,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܫܢܝ̈ܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="year-short">
+				<displayName>܏ܫܢ</displayName>
+				<relative type="-1">܏ܫܬܩܕ</relative>
+				<relative type="0">ܗܕ ܏ܫܢ</relative>
+				<relative type="1">܏ܫܢ ܕܐܬܝܐ</relative>
+			</field>
+			<field type="year-narrow">
+				<displayName>܏ܫܢ</displayName>
+				<relative type="-1">܏ܫܬܩܕ</relative>
+				<relative type="0">ܗܕ ܏ܫܢ</relative>
+				<relative type="1">܏ܫܢ ܕܐܬܝܐ</relative>
+			</field>
 			<field type="quarter">
 				<displayName>ܪܘܒܥܐ ܕܫܢܬܐ</displayName>
 				<relative type="-1">ܪܘܒܥܐ ܕܥܒܪ</relative>
@@ -1060,9 +1128,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܪ̈ܘܒܥܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter-short">
+				<displayName>ܪܒܘܥ ܏ܫܢ</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>ܪܒܘܥ ܏ܫܢ</displayName>
+			</field>
 			<field type="month">
 				<displayName>ܝܪܚܐ</displayName>
-				<relative type="-1">ܝܪܚܐ ܕܕܥܒܪ</relative>
+				<relative type="-1">ܝܪܚܐ ܐܚܪܝܐ</relative>
 				<relative type="0">ܗܢܐ ܝܪܚܐ</relative>
 				<relative type="1">ܝܪܚܐ ܕܐܬܐ</relative>
 				<relativeTime type="future">
@@ -1075,15 +1149,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="month-short">
+				<displayName>܏ܝܪܚ</displayName>
+				<relative type="-1">܏ܝܪܚ ܏ܐܚܪ</relative>
+				<relative type="0">ܗܢ ܏ܝܪܚ</relative>
+				<relative type="1">܏ܝܪܚ ܕܐܬܐ</relative>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">ܡ̣ܢ ܩܕܡ ܚܕ ܝܪܚܐ</relativeTimePattern>
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܝܖ̈ܚܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="month-narrow">
+				<displayName>܏ܝܪܚ</displayName>
+				<relative type="-1">܏ܝܪܚ ܏ܐܚܪ</relative>
+				<relative type="0">ܗܢ ܏ܝܪܚ</relative>
+				<relative type="1">܏ܝܪܚ ܕܐܬܐ</relative>
+			</field>
 			<field type="week">
 				<displayName>ܫܒܘܥܐ</displayName>
-				<relative type="-1">ܫܒܘܥܐ ܕܕܥܒܪ</relative>
-				<relative type="0">ܗܕܐ ܫܒܘܥܐ</relative>
+				<relative type="-1">ܫܒܘܥܐ ܐܚܪܝܐ</relative>
+				<relative type="0">ܗܢܐ ܫܒܘܥܐ</relative>
 				<relative type="1">ܫܒܘܥܐ ܕܐܬܐ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">ܒܚܕ ܫܒܘܥܐ</relativeTimePattern>
@@ -1096,19 +1180,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relativePeriod>ܫܒܘܥܐ ܕ{0}</relativePeriod>
 			</field>
 			<field type="week-short">
-				<displayName>ܫܒܐ</displayName>
+				<displayName>܏ܫܒܘ</displayName>
+				<relative type="-1">܏ܫܒܘ ܏ܐܚܪ</relative>
+				<relative type="0">ܗܢ ܏ܫܒܘ</relative>
+				<relative type="1">܏ܫܒܘ ܕܐܬܐ</relative>
+				<relativePeriod>܏ܫܒܘ ܕ{0}</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<displayName>܏ܫܒܘ</displayName>
+				<relative type="-1">܏ܫܒܘ ܏ܐܚܪ</relative>
+				<relative type="0">ܗܢ ܏ܫܒܘ</relative>
+				<relative type="1">܏ܫܒܘ ܕܐܬܐ</relative>
+				<relativePeriod>܏ܫܒܘ {0}</relativePeriod>
 			</field>
 			<field type="weekOfMonth">
 				<displayName>ܫܒܘܥܐ ܕܝܪܚܐ</displayName>
 			</field>
 			<field type="weekOfMonth-short">
-				<displayName>ܫܒܐ ܕܝܪܚܐ</displayName>
+				<displayName>ܫܒܘܥ ܝܪܚܐ</displayName>
+			</field>
+			<field type="weekOfMonth-narrow">
+				<displayName>ܫܒܘܥ ܝܪܚܐ</displayName>
 			</field>
 			<field type="day">
 				<displayName>ܝܘܡܐ</displayName>
 				<relative type="-1">ܐܬܡܠܝ</relative>
 				<relative type="0">ܐܕܝܘܡ</relative>
-				<relative type="1">ܝܘܡܐ ܕܐܬܐ</relative>
+				<relative type="1">ܩܘܕܡܐ</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">ܒܚܕ ܝܘܡܐ</relativeTimePattern>
 					<relativeTimePattern count="other">ܒ{0} ܝܘܡܢ̈ܐ</relativeTimePattern>
@@ -1118,9 +1216,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܝܘܡܢ̈ܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="day-short">
+				<displayName>܏ܝܘܡ</displayName>
+				<relative type="-1">܏ܬܡܠ</relative>
+				<relative type="0">ܐܕܝܘܡ</relative>
+				<relative type="1">܏ܩܘܕܡ</relative>
+			</field>
+			<field type="day-narrow">
+				<displayName>܏ܝܘܡ</displayName>
+				<relative type="-1">܏ܬܡܠ</relative>
+				<relative type="0">ܐܕܝܘܡ</relative>
+				<relative type="1">܏ܩܘܕܡ</relative>
+			</field>
 			<field type="dayOfYear">
 				<displayName>ܝܘܡܐ ܕܫܢܬܐ</displayName>
 			</field>
+			<field type="dayOfYear-short">
+				<displayName>ܝܘܡ ܫܢܬܐ</displayName>
+			</field>
 			<field type="weekday">
 				<displayName>ܝܘܡܐ ܕܫܒܘܥܐ</displayName>
 			</field>
@@ -1134,11 +1247,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ܝܘܡܐ ܦܘܠܚܢܐ ܕܫܒܐ</displayName>
 			</field>
 			<field type="sun">
-				<relative type="-1">ܚܕܒܫܒܐ ܕܕܥܒܪ</relative>
-				<relative type="0">ܗܕܐ ܚܕܒܫܒܐ</relative>
+				<relative type="-1">ܚܕܒܫܒܐ ܐܚܪܝܐ</relative>
+				<relative type="0">ܗܢܐ ܚܕܒܫܒܐ</relative>
 				<relative type="1">ܚܕܒܫܒܐ ܕܐܬܐ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">ܒܚܕ ܚܕܒܫܒܐ</relativeTimePattern>
+					<relativeTimePattern count="one">ܒ{0} ܚܕܒܫܒ̈ܐ</relativeTimePattern>
 					<relativeTimePattern count="other">ܒ{0} ܚܕܒܫܒ̈ܐ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
@@ -1242,6 +1355,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܫܥ̈ܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="hour-short">
+				<displayName>܏ܫܥ</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName>܏ܫܥ</displayName>
+			</field>
 			<field type="minute">
 				<displayName>ܩܛܝܢܬܐ</displayName>
 				<relative type="0">ܗܢܐ ܩܛܝܢܬܐ</relative>
@@ -1254,6 +1373,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܩܛܝ̈ܢܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="minute-short">
+				<displayName>܏ܩܛܝܢ</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName>܏ܩܛܝܢ</displayName>
+			</field>
 			<field type="second">
 				<displayName>ܪܦܦܐ</displayName>
 				<relative type="0">ܗܫܐ</relative>
@@ -1266,27 +1391,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ܡ̣ܢ ܩܕܡ {0} ܖ̈ܦܦܐ</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="second-short">
+				<displayName>܏ܪܦ</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName>܏ܪܦ</displayName>
+			</field>
 			<field type="zone">
 				<displayName>ܦܢܝܬܐ ܕܙܒܢܐ</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<regionFormat>ܥܕܢܐ {0}</regionFormat>
-			<regionFormat type="daylight">ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ {0}</regionFormat>
-			<regionFormat type="standard">ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ {0}</regionFormat>
+			<regionFormat>ܥܕܢܐ ܕ{0}</regionFormat>
+			<regionFormat type="daylight">ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕ{0}</regionFormat>
+			<regionFormat type="standard">ܥܕܢ {0} ܡܫܘܚܬܢܝܬܐ</regionFormat>
 			<zone type="Etc/UTC">
 				<long>
-					<standard>ܥܕܢܘܬܐ ܬܒܠܝܬܐ ܡܛܟܘܣܬܐ</standard>
+					<standard>ܥܕܢܐ ܬܒܠܝܬܐ ܡܛܘܟܣܬܐ</standard>
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>ܡܕܝܢܬܐ ܠܐ ܝܕܥܝܬܐ</exemplarCity>
+				<exemplarCity>ܐܬܪܐ ܠܐ ܝܕܝܥܐ</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>ܐܢܕܘܪܐ</exemplarCity>
 			</zone>
 			<zone type="Asia/Dubai">
-				<exemplarCity>ܕܘܒܐܝ</exemplarCity>
+				<exemplarCity>ܕܘܒܝ</exemplarCity>
 			</zone>
 			<zone type="Asia/Kabul">
 				<exemplarCity>ܟܐܒܘܠ</exemplarCity>
@@ -1451,10 +1582,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܦܘܪܬܘ-ܢܘܒܘ</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
-				<exemplarCity>ܡܪ ܒܪ ܬܘܠܡܝ</exemplarCity>
+				<exemplarCity>ܡܪܝ ܒܪ ܬܘܠܡܝ</exemplarCity>
 			</zone>
 			<zone type="Atlantic/Bermuda">
-				<exemplarCity>ܒܝܪܡܝܘܕܐ</exemplarCity>
+				<exemplarCity>ܒܝܪܡܘܕܐ</exemplarCity>
 			</zone>
 			<zone type="Asia/Brunei">
 				<exemplarCity>ܒܪܘܢܐܝ</exemplarCity>
@@ -1595,7 +1726,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܒܠܐܢܟ-ܣܐܒܠܘܢ</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>ܡܪ ܝܘܚܢܢ</exemplarCity>
+				<exemplarCity>ܡܪܝ ܝܘܚܢܢ</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
 				<exemplarCity>ܟܘܟܘܣ</exemplarCity>
@@ -1613,7 +1744,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܒܪܐܙܐܒܝܠ</exemplarCity>
 			</zone>
 			<zone type="Europe/Zurich">
-				<exemplarCity>ܙܝܘܪܚ</exemplarCity>
+				<exemplarCity>ܙܝܘܪܟ</exemplarCity>
 			</zone>
 			<zone type="Africa/Abidjan">
 				<exemplarCity>ܐܒܕܓܢ</exemplarCity>
@@ -1624,6 +1755,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>ܦܨܚܐ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ܟܘܝܐܝܟܐ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ܦܘܢܬܐ ܥܪܝܢܣ</exemplarCity>
 			</zone>
@@ -1697,7 +1831,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܬܐܠܝܢ</exemplarCity>
 			</zone>
 			<zone type="Africa/Cairo">
-				<exemplarCity>ܩܐܗܖ̈ܗ</exemplarCity>
+				<exemplarCity>ܩܐܗܪܗ</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
 				<exemplarCity>ܐܠ ܥܝܘܢ</exemplarCity>
@@ -1746,7 +1880,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</zone>
 			<zone type="Europe/London">
 				<long>
-					<daylight>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܒܪܝܛܢܝܐ</daylight>
+					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܒܪܝܛܢܝܐ</daylight>
 				</long>
 				<exemplarCity>ܠܘܢܕܘܢ</exemplarCity>
 			</zone>
@@ -1865,7 +1999,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܪܐܝܟܒܝܟ</exemplarCity>
 			</zone>
 			<zone type="Europe/Rome">
-				<exemplarCity>ܪܘܡܝ</exemplarCity>
+				<exemplarCity>ܪܗܘܡܐ</exemplarCity>
 			</zone>
 			<zone type="Europe/Jersey">
 				<exemplarCity>ܓܝܪܙܝ</exemplarCity>
@@ -1888,7 +2022,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>ܦܢܘܡ ܦܢ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>ܟܐܢܬܘܢ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2276,7 +2410,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܟܝܓܐܠܝ</exemplarCity>
 			</zone>
 			<zone type="Asia/Riyadh">
-				<exemplarCity>ܪܝܐܕ</exemplarCity>
+				<exemplarCity>ܪܝܐܨ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Guadalcanal">
 				<exemplarCity>ܓܘܐܕܐܠܟܐܢܐܠ</exemplarCity>
@@ -2498,7 +2632,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܘܐܬܝܩܐܢ</exemplarCity>
 			</zone>
 			<zone type="America/St_Vincent">
-				<exemplarCity>ܡܪ ܒܢܣܢܬ</exemplarCity>
+				<exemplarCity>ܡܪܝ ܒܢܣܢܬ</exemplarCity>
 			</zone>
 			<zone type="America/Caracas">
 				<exemplarCity>ܟܐܪܐܟܣ</exemplarCity>
@@ -2507,7 +2641,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ܬܘܪܬܘܠܐ</exemplarCity>
 			</zone>
 			<zone type="America/St_Thomas">
-				<exemplarCity>ܡܪ ܬܐܘܡܐ</exemplarCity>
+				<exemplarCity>ܡܪܝ ܬܐܘܡܐ</exemplarCity>
 			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>ܡܕܝܢܬܐ ܕܗܘ ܟܝ ܡܝܢ</exemplarCity>
@@ -2565,9 +2699,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ܥܕܢܐ ܕܡܥܪܒ ܐܦܪܝܩܐ</generic>
-					<standard>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܡܥܪܒ ܐܦܪܝܩܐ</standard>
-					<daylight>ܥܕܢܐ ܩܝܬܝܬܐ ܕܡܥܪܒ ܐܦܪܝܩܐ</daylight>
+					<standard>ܥܕܢܐ ܕܡܥܪܒ ܐܦܪܝܩܐ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2649,9 +2781,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Arabian">
 				<long>
-					<generic draft="unconfirmed">ܥܕܢܐ ܕܐܪܒܝܐ</generic>
-					<standard draft="unconfirmed">ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܪܒܝܐ</standard>
-					<daylight draft="unconfirmed">ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܪܒܝܐ</daylight>
+					<generic>ܥܕܢܐ ܕܐܪܒܝܐ</generic>
+					<standard>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܪܒܝܐ</standard>
+					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܪܒܝܐ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina">
@@ -2798,7 +2930,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Cocos">
 				<long>
-					<standard>ܥܕܢܐ ܕܓܙܝܖ̈ܐ ܕܟܘܟܘܣ</standard>
+					<standard>ܥܕܢܐ ܕܓܙܝܪ̈ܐ ܕܟܘܟܘܣ</standard>
 				</long>
 			</metazone>
 			<metazone type="Colombia">
@@ -2817,9 +2949,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic>ܥܕܢܐ ܕܟܘܒܐ</generic>
-					<standard>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܟܘܒܐ</standard>
-					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܟܘܒܐ</daylight>
+					<generic>ܥܕܢܐ ܕܩܘܒܐ</generic>
+					<standard>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܩܘܒܐ</standard>
+					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܩܘܒܐ</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -2955,6 +3087,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ܥܕܢܐ ܕܓܘܝܐܢܐ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܗܐܘܐܝܝ ܐܠܘܫܝܢ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ܥܕܢܐ ܕܗܐܘܐܝܝ ܐܠܘܫܝܢ</generic>
@@ -3041,6 +3178,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܦܝܬܪܘܦܒܠܒܣܟܝ-ܟܐܡܟܬܣܟܝ</daylight>
 				</long>
 			</metazone>
+			<metazone type="Kazakhstan">
+				<long>
+					<standard>ܥܕܢܐ ܕܟܙܩܣܬܐܢ</standard>
+				</long>
+			</metazone>
 			<metazone type="Kazakhstan_Eastern">
 				<long>
 					<standard>ܥܕܢܐ ܕܡܕܢܚ ܟܙܩܣܬܐܢ</standard>
@@ -3060,7 +3202,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Kosrae">
 				<long>
-					<standard draft="unconfirmed">ܥܕܢܐ ܟܘܣܪܐܝ</standard>
+					<standard>ܥܕܢܐ ܟܘܣܪܐܝ</standard>
 				</long>
 			</metazone>
 			<metazone type="Krasnoyarsk">
@@ -3490,21 +3632,314 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<nan draft="unconfirmed">ܠܝܬ ܡܢܝܢܐ</nan>
+			<nan>ܠܝܬ ܡܢܝܢܐ</nan>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
+			<currency type="AMD">
+				<displayName>ܕܪܗܡ ܕܐܪܡܢܝܐ</displayName>
+				<displayName count="one">ܕܪܗܡ ܕܐܪܡܢܝܐ</displayName>
+				<displayName count="other">ܕܪ̈ܗܡܐ ܕܐܪܡܢܝܐ</displayName>
+			</currency>
+			<currency type="ANG">
+				<displayName>ܦܠܘܪܝܢ ܐܢܬܝܠܝܣܝܐ ܕܗܘܠܢܕܐ</displayName>
+				<displayName count="one">ܦܠܘܪܝܢ ܐܢܬܝܠܝܣܝܐ ܕܗܘܠܢܕܐ</displayName>
+				<displayName count="other">ܦܠܘܪ̈ܝܢܐ ܐܢܬܝܠܝܣܝܐ ܕܗܘܠܢܕܐ</displayName>
+			</currency>
+			<currency type="ARS">
+				<displayName>ܦܝܣܘ ܕܐܪܓܢܬܝܢܐ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܐܪܓܢܬܝܢܐ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܐܪܓܢܬܝܢܐ</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName>ܕܘܠܪ ܕܐܘܣܬܪܠܝܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܐܘܣܬܪܠܝܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܐܘܣܬܪܠܝܐ</displayName>
+			</currency>
+			<currency type="AWG">
+				<displayName>ܦܠܘܪܝܢ ܕܐܪܘܒܐ</displayName>
+				<displayName count="one">ܦܠܘܪܝܢ ܕܐܪܘܒܐ</displayName>
+				<displayName count="other">ܦܠܘܪ̈ܝܢܐ ܕܐܪܘܒܐ</displayName>
+			</currency>
+			<currency type="BBD">
+				<displayName>ܕܘܠܪ ܕܒܪܒܐܕܘܣ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܒܪܒܐܕܘܣ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܒܪܒܐܕܘܣ</displayName>
+			</currency>
+			<currency type="BHD">
+				<displayName>ܕܝܢܪܐ ܕܒܚܪܝܢ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܒܚܪܝܢ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܒܚܪܝܢ</displayName>
+			</currency>
+			<currency type="BMD">
+				<displayName>ܕܘܠܪ ܕܒܝܪܡܘܕܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܒܝܪܡܘܕܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܒܝܪܡܘܕܐ</displayName>
+			</currency>
+			<currency type="BND">
+				<displayName>ܕܘܠܪ ܕܒܪܘܢܐܝ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܒܪܘܢܐܝ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܒܪܘܢܐܝ</displayName>
+			</currency>
+			<currency type="BSD">
+				<displayName>ܕܘܠܪ ܕܒܗܐܡܣ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܒܗܐܡܣ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܒܗܐܡܣ</displayName>
+			</currency>
+			<currency type="BZD">
+				<displayName>ܕܘܠܪ ܕܒܠܝܙ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܒܠܝܙ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܒܠܝܙ</displayName>
+			</currency>
+			<currency type="CAD">
+				<displayName>ܕܘܠܪ ܕܟܢܕܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܟܢܕܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܟܢܕܐ</displayName>
+			</currency>
+			<currency type="CNY">
+				<displayName>ܝܘܐܢ ܕܨܝܢ</displayName>
+				<displayName count="one">ܝܘܐܢ ܕܨܝܢ</displayName>
+				<displayName count="other">ܝܘܐܢ̈ܐ ܕܨܝܢ</displayName>
+			</currency>
+			<currency type="COP">
+				<displayName>ܦܝܣܘ ܕܟܘܠܘܡܒܝܐ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܟܘܠܘܡܒܝܐ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܟܘܠܘܡܒܝܐ</displayName>
+			</currency>
+			<currency type="CRC">
+				<displayName>ܟܘܠܘܢ ܕܟܘܣܬܐ ܪܝܟܐ</displayName>
+				<displayName count="one">ܟܘܠܘܢ ܕܟܘܣܬܐ ܪܝܟܐ</displayName>
+				<displayName count="other">ܟܘܠܘܢ̈ܐ ܕܟܘܣܬܐ ܪܝܟܐ</displayName>
+			</currency>
+			<currency type="CUC">
+				<displayName>ܦܝܣܘ ܡܬܥܪܦܢܝܬܐ ܕܩܘܒܐ</displayName>
+				<displayName count="one">ܦܝܣܘ ܡܬܥܪܦܢܝܬܐ ܕܩܘܒܐ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܡܬܥܪ̈ܦܢܝܬܐ ܕܩܘܒܐ</displayName>
+			</currency>
+			<currency type="CUP">
+				<displayName>ܦܝܣܘ ܕܩܘܒܐ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܩܘܒܐ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܩܘܒܐ</displayName>
+			</currency>
+			<currency type="DOP">
+				<displayName>ܦܝܣܘ ܕܕܘܡܝܢܝܟܐܢ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܕܘܡܝܢܝܟܐܢ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܕܘܡܝܢܝܟܐܢ</displayName>
+			</currency>
+			<currency type="DZD">
+				<displayName>ܕܝܢܪܐ ܕܓܙܐܪ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܓܙܐܪ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܓܙܐܪ</displayName>
+			</currency>
+			<currency type="EGP">
+				<displayName>ܠܝܛܪܐ ܕܡܨܪܝܢ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܡܨܪܝܢ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܡܨܪܝܢ</displayName>
+			</currency>
+			<currency type="EUR">
+				<displayName>ܐܘܪܘ</displayName>
+				<displayName count="one">ܐܘܪܘ</displayName>
+				<displayName count="other">ܐܘܪ̈ܘܣ</displayName>
+			</currency>
+			<currency type="FJD">
+				<displayName>ܕܘܠܪ ܕܦܝܓܝ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܦܝܓܝ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܦܝܓܝ</displayName>
+			</currency>
+			<currency type="FKP">
+				<displayName>ܠܝܛܪܐ ܕܓܙܪ̈ܬܐ ܕܦܠܟܠܢܕ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܓܙܪ̈ܬܐ ܕܦܠܟܠܢܕ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܓܙܪ̈ܬܐ ܕܦܠܟܠܢܕ</displayName>
+			</currency>
+			<currency type="GIP">
+				<displayName>ܠܝܛܪܐ ܕܓܒܪܠܛܪ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܓܒܪܠܛܪ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܓܒܪܠܛܪ</displayName>
+			</currency>
+			<currency type="GTQ">
+				<displayName>ܟܝܬܙܠ ܕܓܘܐܬܝܡܐܠܐ</displayName>
+				<displayName count="one">ܟܝܬܙܠ ܕܓܘܐܬܝܡܐܠܐ</displayName>
+				<displayName count="other">ܟܝܬܙ̈ܠܐ ܕܓܘܐܬܝܡܐܠܐ</displayName>
+			</currency>
+			<currency type="GYD">
+				<displayName>ܕܘܠܪ ܕܓܘܝܐܢܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܓܘܝܐܢܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܓܘܝܐܢܐ</displayName>
+			</currency>
+			<currency type="HKD">
+				<displayName>ܕܘܠܪ ܕܗܘܢܓ ܟܘܢܓ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܗܘܢܓ ܟܘܢܓ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܗܘܢܓ ܟܘܢܓ</displayName>
+			</currency>
+			<currency type="HNL">
+				<displayName>ܠܝܡܦܝܪܐ ܕܗܘܢܕܘܪܣ</displayName>
+				<displayName count="one">ܠܝܡܦܝܪܐ ܕܗܘܢܕܘܪܣ</displayName>
+				<displayName count="other">ܠܝܡܦܝܪ̈ܐ ܕܗܘܢܕܘܪܣ</displayName>
+			</currency>
+			<currency type="HTG">
+				<displayName>ܓܘܪܕ ܕܗܐܝܬܝ</displayName>
+				<displayName count="one">ܓܘܪܕ ܕܗܐܝܬܝ</displayName>
+				<displayName count="other">ܓܘܪ̈ܕܐ ܕܗܐܝܬܝ</displayName>
+			</currency>
+			<currency type="ILS">
+				<displayName>ܬܩܠܐ ܚܕܬܐ ܕܐܝܣܪܐܝܠ</displayName>
+				<displayName count="one">ܬܩܠܐ ܚܕܬܐ ܕܐܝܣܪܐܝܠ</displayName>
+				<displayName count="other">ܬܩ̈ܠܐ ܚܕ̈ܬܐ ܕܐܝܣܪܐܝܠ</displayName>
+			</currency>
+			<currency type="IQD">
+				<displayName>ܕܝܢܪܐ ܕܥܝܪܐܩ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܥܝܪܐܩ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܥܝܪܐܩ</displayName>
+			</currency>
+			<currency type="JMD">
+				<displayName>ܕܘܠܪ ܕܓܡܝܟܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܓܡܝܟܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܓܡܝܟܐ</displayName>
+			</currency>
+			<currency type="JOD">
+				<displayName>ܕܝܢܪܐ ܕܝܘܪܕܢܢ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܝܘܪܕܢܢ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܝܘܪܕܢܢ</displayName>
+			</currency>
+			<currency type="KPW">
+				<displayName>ܘܘܢ ܕܟܘܪܝܐ ܓܪܒܝܝܬܐ</displayName>
+				<displayName count="one">ܘܘܢ ܕܟܘܪܝܐ ܓܪܒܝܝܬܐ</displayName>
+				<displayName count="other">ܘܘܢ̈ܐ ܕܟܘܪܝܐ ܓܪܒܝܝܬܐ</displayName>
+			</currency>
+			<currency type="KRW">
+				<displayName>ܘܘܢ ܕܟܘܪܝܐ ܬܝܡܢܝܬܐ</displayName>
+				<displayName count="one">ܘܘܢ ܕܟܘܪܝܐ ܬܝܡܢܝܬܐ</displayName>
+				<displayName count="other">ܘܘܢ̈ܐ ܕܟܘܪܝܐ ܬܝܡܢܝܬܐ</displayName>
+			</currency>
+			<currency type="KWD">
+				<displayName>ܕܝܢܪܐ ܕܟܘܝܬ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܟܘܝܬ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܟܘܝܬ</displayName>
+			</currency>
+			<currency type="KYD">
+				<displayName>ܕܘܠܪ ܕܓܙܪ̈ܬܐ ܕܟܐܝܡܐܢ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܓܙܪ̈ܬܐ ܕܟܐܝܡܐܢ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܓܙܪ̈ܬܐ ܕܟܐܝܡܐܢ</displayName>
+			</currency>
+			<currency type="LBP">
+				<displayName>ܠܝܛܪܐ ܕܠܒܢܢ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܠܒܢܢ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܠܒܢܢ</displayName>
+			</currency>
+			<currency type="LYD">
+				<displayName>ܕܝܢܪܐ ܕܠܘܒܐ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܠܘܒܐ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܠܘܒܐ</displayName>
+			</currency>
+			<currency type="MAD">
+				<displayName>ܕܪܗܡ ܕܡܓܪܒ</displayName>
+				<displayName count="one">ܕܪܗܡ ܕܡܓܪܒ</displayName>
+				<displayName count="other">ܕܪ̈ܗܡܐ ܕܡܓܪܒ</displayName>
+			</currency>
+			<currency type="MKD">
+				<displayName>ܕܝܢܪܐ ܕܡܩܕܘܢܝܐ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܡܩܕܘܢܝܐ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܡܩܕܘܢܝܐ</displayName>
+			</currency>
+			<currency type="MXN">
+				<displayName>ܦܝܣܘ ܕܡܟܣܝܟܘ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܡܟܣܝܟܘ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܡܟܣܝܟܘ</displayName>
+			</currency>
+			<currency type="NIO">
+				<displayName>ܩܘܪܕܘܒܝ ܕܢܝܟܐܪܐܓܘܐ</displayName>
+				<displayName count="one">ܩܘܪܕܘܒܝ ܕܢܝܟܐܪܐܓܘܐ</displayName>
+				<displayName count="other">ܩܘܪ̈ܕܘܒܐ ܕܢܝܟܐܪܐܓܘܐ</displayName>
+			</currency>
+			<currency type="PAB">
+				<displayName>ܒܐܠܒܘܐ ܕܦܐܢܡܐ</displayName>
+				<displayName count="one">ܒܐܠܒܘܐ ܕܦܐܢܡܐ</displayName>
+				<displayName count="other">ܒܐܠܒܘ̈ܐ ܕܦܐܢܡܐ</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName>ܦܝܣܘ ܕܦܝܠܝܦܝܐ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܦܝܠܝܦܝܐ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܦܝܠܝܦܝܐ</displayName>
+			</currency>
+			<currency type="RSD">
+				<displayName>ܕܝܢܪܐ ܕܣܪܒܝܐ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܣܪܒܝܐ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܣܪܒܝܐ</displayName>
+			</currency>
+			<currency type="SBD">
+				<displayName>ܕܘܠܪ ܕܓܙܪ̈ܬܐ ܕܫܠܝܡܘܢ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܓܙܪ̈ܬܐ ܕܫܠܝܡܘܢ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܓܙܪ̈ܬܐ ܕܫܠܝܡܘܢ</displayName>
+			</currency>
+			<currency type="SDG">
+				<displayName>ܠܝܛܪܐ ܕܣܘܕܐܢ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܣܘܕܐܢ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܣܘܕܐܢ</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName>ܕܘܠܪ ܕܣܝܢܓܐܦܘܪ</displayName>
+				<displayName count="one">ܕܘܠܪ̈ܐ ܕܣܝܢܓܐܦܘܪ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܣܝܢܓܐܦܘܪ</displayName>
+			</currency>
 			<currency type="SYP">
-				<symbol draft="unconfirmed">ل.س.‏</symbol>
+				<displayName>ܠܝܛܪܐ ܕܣܘܪܝܐ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܣܘܪܝܐ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܣܘܪܝܐ</displayName>
+				<symbol draft="contributed">ل.س.‏</symbol>
+			</currency>
+			<currency type="TND">
+				<displayName>ܕܝܢܪܐ ܕܬܘܢܣ</displayName>
+				<displayName count="one">ܕܝܢܪܐ ܕܬܘܢܣ</displayName>
+				<displayName count="other">ܕܝܢܪ̈ܐ ܕܬܘܢܣ</displayName>
+			</currency>
+			<currency type="TRY">
+				<displayName>ܠܝܛܪܐ ܕܬܘܪܟܝܐ</displayName>
+				<displayName count="one">ܠܝܛܪܐ ܕܬܘܪܟܝܐ</displayName>
+				<displayName count="other">ܠܝܛܪ̈ܐ ܕܬܘܪܟܝܐ</displayName>
+			</currency>
+			<currency type="TTD">
+				<displayName>ܕܘܠܪ ܕܬܪܝܢܝܕܐܕ ܘܬܘܒܐܓܘ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܬܪܝܢܝܕܐܕ ܘܬܘܒܐܓܘ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܬܪܝܢܝܕܐܕ ܘܬܘܒܐܓܘ</displayName>
+			</currency>
+			<currency type="USD">
+				<displayName>ܕܘܠܪ ܕܐܘܚܕܢ̈ܐ ܡܚܘܝܕ̈ܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܐܘܚܕܢ̈ܐ ܡܚܘܝܕ̈ܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܐܘܚܕܢ̈ܐ ܡܚܘܝܕ̈ܐ</displayName>
+			</currency>
+			<currency type="UYU">
+				<displayName>ܦܝܣܘ ܕܐܘܪܘܓܘܐܝ</displayName>
+				<displayName count="one">ܦܝܣܘ ܕܐܘܪܘܓܘܐܝ</displayName>
+				<displayName count="other">ܦܝ̈ܣܘܣ ܕܐܘܪܘܓܘܐܝ</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName>ܕܘܢܓ ܕܒܝܬܢܐܡ</displayName>
+				<displayName count="one">ܕܘܢܓ ܕܒܝܬܢܐܡ</displayName>
+				<displayName count="other">ܕܘܢܓ̈ܐ ܕܒܝܬܢܐܡ</displayName>
+			</currency>
+			<currency type="XCD">
+				<displayName>ܕܘܠܪ ܕܡܕܢܚ ܟܐܪܝܒܐ</displayName>
+				<displayName count="one">ܕܘܠܪ ܕܡܕܢܚ ܟܐܪܝܒܐ</displayName>
+				<displayName count="other">ܕܘܠܪ̈ܐ ܕܡܕܢܚ ܟܐܪܝܒܐ</displayName>
+			</currency>
+			<currency type="XCG">
+				<displayName>ܦܠܘܪܝܢ ܕܩܘܒܐ</displayName>
+				<displayName count="one">ܦܠܘܪܝܢ ܕܩܘܒܐ</displayName>
+				<displayName count="other">ܦܠܘܪ̈ܝܢܐ ܕܩܘܒܐ</displayName>
+			</currency>
+			<currency type="XXX">
+				<displayName>ܟܣܦܐ ܠܐ ܝܕܝܥܐ</displayName>
+				<displayName count="one">(ܟܣܦܐ ܠܐ ܝܕܝܥܐ)</displayName>
+				<displayName count="other">(ܟܣܦܐ ܠܐ ܝܕܝܥܐ)</displayName>
 			</currency>
 		</currencies>
 		<minimalPairs>
-			<pluralMinimalPairs count="one" draft="contributed">ܝܠܐ ܝܠܗ ܥܬܝܕܐ</pluralMinimalPairs>
-			<pluralMinimalPairs count="other" draft="contributed">ܝܠ̈ܐ ܝܢܐ ܥܬܝܕ̈ܐ &lt;RLM&gt;{0}</pluralMinimalPairs>
-			<ordinalMinimalPairs ordinal="other" draft="unconfirmed">ܫܩܘܠ ܦܬܠܐ ܕ{0} ܝܡܝܢܐ</ordinalMinimalPairs>
+			<pluralMinimalPairs count="one">ܚܕ ܝܘܡܐ</pluralMinimalPairs>
+			<pluralMinimalPairs count="other">{0} ܝܘܡܢ̈ܐ</pluralMinimalPairs>
+			<ordinalMinimalPairs ordinal="other">ܫܩܘܠ ܦܬܠܐ ܝܡܝܢܐ ܕ{0}</ordinalMinimalPairs>
 		</minimalPairs>
 	</numbers>
 	<units>
@@ -3676,7 +4111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">ܚܕ ܡܠܘܐܐ</unitPattern>
 				<unitPattern count="other">{0} ܡܠܘܐ̈ܐ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ</displayName>
 				<unitPattern count="one">{0} ܡܢܬܐ ܒܡܠܝܘܢ</unitPattern>
 				<unitPattern count="other">{0} ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ</unitPattern>
@@ -4292,7 +4727,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<coordinateUnitPattern type="east">{0} ܡܕܢܚܐ</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} ܓܪܒܝܐ</coordinateUnitPattern>
 				<coordinateUnitPattern type="south">{0} ܬܝܡܢܐ</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} ܡܥܪܒ݂ܐ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ܡܥܪܒܐ</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
@@ -4491,7 +4926,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} °F</unitPattern>
 			</unit>
 			<coordinateUnit>
-				<displayName>ܦܢܝܬܐ ܫܪܫܢܝܬܐ</displayName>
+				<displayName>ܦܢܝܬܐ</displayName>
+				<coordinateUnitPattern type="east">{0} ܏ܡܕܢ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ܏ܓܪܒ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ܏ܬܝܡ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ܏ܡܥܪ</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
@@ -4564,10 +5003,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>☉R</displayName>
 			</unit>
 			<coordinateUnit>
-				<coordinateUnitPattern type="east">{0} ܡܕܢܚܐ</coordinateUnitPattern>
-				<coordinateUnitPattern type="north">{0} ܓܪܒܝܐ</coordinateUnitPattern>
-				<coordinateUnitPattern type="south">{0} ܬܝܡܢܐ</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} ܡܥܪܒ݂ܐ</coordinateUnitPattern>
+				<displayName>ܦܢܝܬܐ</displayName>
+				<coordinateUnitPattern type="east">{0} ܏ܡܕܢܚ</coordinateUnitPattern>
+				<coordinateUnitPattern type="north">{0} ܏ܓܪܒܝ</coordinateUnitPattern>
+				<coordinateUnitPattern type="south">{0} ܏ܬܝܡܢ</coordinateUnitPattern>
+				<coordinateUnitPattern type="west">{0} ܏ܡܥܪܒ</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
 	</units>
@@ -4607,10 +5047,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="monogram" formality="formal">
-			<namePattern>{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram-allCaps}</namePattern>
+			<namePattern>{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram-allCaps}.</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
-			<namePattern>{given-informal-monogram-allCaps}.{surname-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}.{surname-monogram-allCaps}.</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
 			<namePattern>{title} {given} {given2-initial} {surname}</namePattern>
@@ -4625,28 +5065,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern draft="provisional">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern>{given-monogram-allCaps}.{surname-monogram-allCaps}</namePattern>
+			<namePattern>{given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram-allCaps}.</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="formal">
-			<namePattern draft="provisional">{title} {given-initial} {surname}</namePattern>
+			<namePattern>{title} {given-initial} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="referring" formality="informal">
 			<namePattern>{given-informal-initial}. {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
-			<namePattern draft="provisional">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
-			<namePattern draft="provisional">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
-			<namePattern>{given-monogram-allCaps}.{surname-monogram-allCaps}</namePattern>
+			<namePattern>{given-monogram-allCaps}.{surname-monogram-allCaps}.</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
 			<namePattern>{surname}، {given} {given2}</namePattern>
@@ -4655,16 +5095,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="addressing" formality="formal">
-			<namePattern draft="provisional">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="addressing" formality="informal">
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="monogram" formality="formal">
-			<namePattern>{surname-monogram-allCaps}.{given-monogram-allCaps}.{given2-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}.{given-monogram-allCaps}.{given2-monogram-allCaps}.</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
-			<namePattern>{surname-monogram-allCaps}.{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}.{given-informal-monogram-allCaps}.</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
 			<namePattern>{surname}، {given} {given2-initial}</namePattern>
@@ -4679,10 +5119,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern draft="provisional">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern draft="provisional">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
 			<namePattern>{surname}، {given-initial} {given2-initial}</namePattern>
@@ -4691,16 +5131,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{surname} {given-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="addressing" formality="formal">
-			<namePattern draft="provisional">{title} {surname}</namePattern>
+			<namePattern>{title} {surname}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="addressing" formality="informal">
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="monogram" formality="formal">
-			<namePattern draft="provisional">{surname-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="monogram" formality="informal">
-			<namePattern draft="provisional">{given-informal-monogram-allCaps}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="formal">
 			<namePattern>{surname-prefix} {surname-core}، {given} {given2}</namePattern>
diff --git a/make/data/cldr/common/main/szl.xml b/make/data/cldr/common/main/szl.xml
index 09b54dc4dae..1aee26a3e65 100644
--- a/make/data/cldr/common/main/szl.xml
+++ b/make/data/cldr/common/main/szl.xml
@@ -1831,9 +1831,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Bishkek">
 				<exemplarCity draft="unconfirmed">Biszkek</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity draft="unconfirmed">Enderbury</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity draft="unconfirmed">Kōmory</exemplarCity>
 			</zone>
@@ -2195,9 +2192,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">zachodnioafrykański czas</generic>
-					<standard draft="unconfirmed">zachodnioafrykański sztandardowy czas</standard>
-					<daylight draft="unconfirmed">zachodnioafrykański latowy czas</daylight>
+					<standard draft="unconfirmed">zachodnioafrykański czas</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2561,6 +2556,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Gujana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Hawaje-Aleuty (sztandardowy czas)</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Hawaje-Aleuty</generic>
@@ -2953,9 +2953,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -3069,7 +3071,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">milimole na liter</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} milimola na liter</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">czyńści na milijōn</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} czyńści na milijōn</unitPattern>
 			</unit>
@@ -3681,7 +3683,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">milimole/liter</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">czyńści/miliōn</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} cz/mln</unitPattern>
 			</unit>
diff --git a/make/data/cldr/common/main/ta.xml b/make/data/cldr/common/main/ta.xml
index 43a2779bebd..d03477a393b 100644
--- a/make/data/cldr/common/main/ta.xml
+++ b/make/data/cldr/common/main/ta.xml
@@ -242,7 +242,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="is">ஐஸ்லேண்டிக்</language>
 			<language type="it">இத்தாலியன்</language>
 			<language type="iu">இனுகிடூட்</language>
-			<language type="ja">ஜப்பானியம்</language>
+			<language type="ja">ஜாப்பனீஸ்</language>
 			<language type="jbo">லோஜ்பன்</language>
 			<language type="jgo">நகொம்பா</language>
 			<language type="jmc">மாசெம்</language>
@@ -289,6 +289,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">பாஃபியா</language>
 			<language type="ksh">கொலோக்னியன்</language>
 			<language type="ku">குர்திஷ்</language>
+			<language type="ku" menu="core">குர்திஷ்</language>
+			<language type="ku" menu="extension">குர்மாஞ்சி</language>
 			<language type="kum">கும்யிக்</language>
 			<language type="kut">குடேனை</language>
 			<language type="kv">கொமி</language>
@@ -768,7 +770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="419">லத்தீன் அமெரிக்கா</territory>
 			<territory type="AC">அஷன்ஷியன் தீவு</territory>
 			<territory type="AD">அன்டோரா</territory>
-			<territory type="AE">ஐக்கிய அரபு எமிரேட்ஸ்</territory>
+			<territory type="AE">ஐக்கிய அரபு அமீரகம்</territory>
 			<territory type="AF">ஆஃப்கானிஸ்தான்</territory>
 			<territory type="AG">ஆண்டிகுவா மற்றும் பார்புடா</territory>
 			<territory type="AI">அங்கியுலா</territory>
@@ -820,6 +822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">சீனா</territory>
 			<territory type="CO">கொலம்பியா</territory>
 			<territory type="CP">கிலிப்பர்டன் தீவு</territory>
+			<territory type="CQ" draft="contributed">சார்க்</territory>
 			<territory type="CR">கோஸ்டாரிகா</territory>
 			<territory type="CU">கியூபா</territory>
 			<territory type="CV">கேப் வெர்டே</territory>
@@ -892,7 +895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="IS">ஐஸ்லாந்து</territory>
 			<territory type="IT">இத்தாலி</territory>
 			<territory type="JE">ஜெர்சி</territory>
-			<territory type="JM">ஜமைகா</territory>
+			<territory type="JM">ஜமைக்கா</territory>
 			<territory type="JO">ஜோர்டான்</territory>
 			<territory type="JP">ஜப்பான்</territory>
 			<territory type="KE">கென்யா</territory>
@@ -926,7 +929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="MH">மார்ஷல் தீவுகள்</territory>
 			<territory type="MK">வடக்கு மாசிடோனியா</territory>
 			<territory type="ML">மாலி</territory>
-			<territory type="MM">மியான்மார் (பர்மா)</territory>
+			<territory type="MM">மியான்மர் (பர்மா)</territory>
 			<territory type="MN">மங்கோலியா</territory>
 			<territory type="MO">மகாவ் எஸ்ஏஆர் சீனா</territory>
 			<territory type="MO" alt="short">மகாவ்</territory>
@@ -1057,42 +1060,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="calendar">நாள்காட்டி</key>
 			<key type="cf">நாணய வடிவம்</key>
 			<key type="colAlternate">சின்னங்கள் வரிசைப்படுத்தலைப் புறக்கணி</key>
-			<key type="colBackwards">நேர்மறையான உச்சரிப்பு வரிசைபடுத்துதல்</key>
-			<key type="colCaseFirst">பெரெழுத்து/சிற்றெழுத்து வரிசைமுறை</key>
+			<key type="colBackwards">தலைகீழ் உச்சரிப்பு வரிசைப்படுத்தல்</key>
+			<key type="colCaseFirst">பேரெழுத்து/சிற்றெழுத்து வரிசைமுறை</key>
 			<key type="colCaseLevel">எழுத்து உணர்ந்து வரிசைபடுத்துதல்</key>
 			<key type="collation">வரிசை முறை</key>
 			<key type="colNormalization">இயல்பாக்கப்பட்ட வரிசைபடுத்துதல்</key>
 			<key type="colNumeric">எண்முறை வரிசைபடுத்துதல்</key>
 			<key type="colStrength">வரிசைப்படுத்தல் வலிமை</key>
 			<key type="currency">நாணயம்</key>
+			<key type="em" draft="contributed">இமோஜி வெளிப்பாடு</key>
 			<key type="hc">மணிநேர சுழற்சி (12, 24)</key>
 			<key type="lb">வரி முறிப்பு ஸ்டைல்</key>
+			<key type="lw">வவ</key>
 			<key type="ms">அளவீட்டு முறை</key>
 			<key type="numbers">எண்கள்</key>
+			<key type="ss">வமு</key>
 			<key type="timezone">நேர மண்டலம்</key>
 			<key type="va">மொழி மாறிலி</key>
 			<key type="x">தனிப்பட்ட பயன்</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">புத்த நாள்காட்டி</type>
+			<type key="calendar" type="buddhist" scope="core">பௌத்தம்</type>
 			<type key="calendar" type="chinese">சீன நாள்காட்டி</type>
+			<type key="calendar" type="chinese" scope="core">சீனம்</type>
 			<type key="calendar" type="coptic">காப்டிக் நாள்காட்டி</type>
+			<type key="calendar" type="coptic" scope="core" draft="contributed">காப்டிக்</type>
 			<type key="calendar" type="dangi">டேங்கி நாள்காட்டி</type>
+			<type key="calendar" type="dangi" scope="core" draft="contributed">டேங்கி</type>
 			<type key="calendar" type="ethiopic">எத்தியோப்பிய நாள்காட்டி</type>
+			<type key="calendar" type="ethiopic" scope="core">எத்தியோப்பிக்</type>
 			<type key="calendar" type="ethiopic-amete-alem">எத்தியோபிக் அமேதே ஆலெம் நாள்காட்டி</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">எத்தியோப்பிய அமீத்தி ஆலெம்</type>
 			<type key="calendar" type="gregorian">கிரிகோரியன் நாள்காட்டி</type>
+			<type key="calendar" type="gregorian" scope="core" draft="contributed">கிரிகோரியன்</type>
 			<type key="calendar" type="hebrew">ஹீப்ரு நாள்காட்டி</type>
-			<type key="calendar" type="indian">இந்திய தேச நாள்காட்டி</type>
+			<type key="calendar" type="hebrew" scope="core" draft="contributed">எபிரேயம்</type>
+			<type key="calendar" type="indian">இந்திய தேசிய நாள்காட்டி</type>
+			<type key="calendar" type="indian" scope="core">இந்திய தேசியம்</type>
 			<type key="calendar" type="islamic">இஸ்லாமிய நாள்காட்டி</type>
+			<type key="calendar" type="islamic" scope="core" draft="contributed">ஹிஜ்ரி</type>
 			<type key="calendar" type="islamic-civil">இஸ்லாமிய சிவில் நாள்காட்டி</type>
+			<type key="calendar" type="islamic-civil" scope="core">ஹிஜ்ரி(அட்டவணை, சிவில் இபோக்)</type>
 			<type key="calendar" type="islamic-tbla">இஸ்லாமிய வானியல் நாள்காட்டி</type>
+			<type key="calendar" type="islamic-tbla" scope="core">ஹிஜ்ரி(அட்டவணை, வானவியல் இபோக்)</type>
 			<type key="calendar" type="islamic-umalqura">இஸ்லாமிய நாள்காட்டி (உம்-அல்-குரா)</type>
-			<type key="calendar" type="iso8601">ISO-8601 நாள்காட்டி</type>
+			<type key="calendar" type="islamic-umalqura" scope="core" draft="contributed">ஹிஜ்ரி (உம்முல் குறா)</type>
+			<type key="calendar" type="iso8601">கிரிகோரிய நாள்காட்டி</type>
 			<type key="calendar" type="japanese">ஜப்பானிய நாள்காட்டி</type>
+			<type key="calendar" type="japanese" scope="core">ஜப்பானியம்</type>
 			<type key="calendar" type="persian">பாரசீக நாள்காட்டி</type>
+			<type key="calendar" type="persian" scope="core">பாரசீகம்</type>
 			<type key="calendar" type="roc">மின்கோ நாள்காட்டி</type>
+			<type key="calendar" type="roc" scope="core">மின்குவோ</type>
 			<type key="cf" type="account">கணக்கிடல் நாணய வடிவம்</type>
+			<type key="cf" type="account" scope="core">கணக்கியல்</type>
 			<type key="cf" type="standard">நிலையான நாணய வடிவம்</type>
+			<type key="cf" type="standard" scope="core">வழக்கமானது</type>
 			<type key="colAlternate" type="non-ignorable">சின்னங்களை வரிசைப்படுத்து</type>
 			<type key="colAlternate" type="shifted">சின்னங்களைப் புறக்கணித்து வரிசைப்படுத்து</type>
 			<type key="colBackwards" type="no">உச்சரிப்புகளை இயல்பாக வரிசைபடுத்து</type>
@@ -1102,18 +1126,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">முதலில் பேரெழுத்துகளை வரிசைப்படுத்து</type>
 			<type key="colCaseLevel" type="no">எழுத்து உணர்வின்றி வரிசைபடுத்து</type>
 			<type key="colCaseLevel" type="yes">எழுத்து உணர்வில் வரிசைபடுத்து</type>
-			<type key="collation" type="big5han">பாரம்பரிய சீன வரிசை வடிவம் - Big5</type>
 			<type key="collation" type="compat" draft="contributed">முந்தைய வரிசை வடிவம், இணக்கத்தன்மைக்கு</type>
 			<type key="collation" type="dictionary">அகராதி வரிசை முறை</type>
 			<type key="collation" type="ducet">இயல்புநிலை யுனிகோட் வரிசை முறை</type>
+			<type key="collation" type="ducet" scope="core" draft="contributed">இயல்புநிலை ஒருங்குறி</type>
 			<type key="collation" type="eor" draft="contributed">ஐரோப்பிய வரிசைப்படுத்தல் விதிகள்</type>
-			<type key="collation" type="gb2312han">எளிமையாக்கப்பட்ட சீன வரிசை வடிவம் - GB2312</type>
 			<type key="collation" type="phonebook">தொலைபேசி புத்தக வரிசை முறை</type>
 			<type key="collation" type="phonetic">ஒலியியல் வரிசைப்படுத்தல் முறை</type>
 			<type key="collation" type="pinyin">பின்யின் வரிசை முறை</type>
 			<type key="collation" type="search">பொதுப்படையான தேடல்</type>
+			<type key="collation" type="search" scope="core">தேடல்</type>
 			<type key="collation" type="searchjl">ஹங்குல் முதன்மை மெய்யெழுத்தின்படி தேடு</type>
 			<type key="collation" type="standard">நிலையான வரிசை முறை</type>
+			<type key="collation" type="standard" scope="core">வழக்கமானது</type>
 			<type key="collation" type="stroke">ஸ்ட்ரோக் வரிசை முறை</type>
 			<type key="collation" type="traditional">பாரம்பரிய வரிசை முறை</type>
 			<type key="collation" type="unihan">ரேடியன் ஸ்ட்ரோக் வரிசை முறை</type>
@@ -1129,18 +1154,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">முழு அகலம்</type>
 			<type key="d0" type="hwidth">அரை அகலம்</type>
 			<type key="d0" type="npinyin">எண்</type>
+			<type key="em" type="default" scope="core">இயல்புநிலை</type>
+			<type key="em" type="emoji" scope="core">இமோஜி</type>
+			<type key="em" type="text" scope="core">வார்த்தை</type>
 			<type key="hc" type="h11">12 மணிநேர முறைமை (0–11)</type>
+			<type key="hc" type="h11" scope="core" draft="contributed">12 (0–11)</type>
 			<type key="hc" type="h12">12 மணிநேர முறைமை (1–12)</type>
+			<type key="hc" type="h12" scope="core" draft="contributed">12 (1–12)</type>
 			<type key="hc" type="h23">24 மணிநேர முறைமை (0–23)</type>
+			<type key="hc" type="h23" scope="core" draft="contributed">24 (0–23)</type>
 			<type key="hc" type="h24">24 மணிநேர முறைமை (1–24)</type>
+			<type key="hc" type="h24" scope="core" draft="contributed">24 (1–24)</type>
 			<type key="lb" type="loose">தளர்வான வரி முறிப்பு ஸ்டைல்</type>
+			<type key="lb" type="loose" scope="core">தளர்த்தியது</type>
 			<type key="lb" type="normal">சாதாரண வரி முறிப்பு ஸ்டைல்</type>
+			<type key="lb" type="normal" scope="core">இயல்பு</type>
 			<type key="lb" type="strict">கண்டிப்பான வரி முறிப்பு ஸ்டைல்</type>
+			<type key="lb" type="strict" scope="core">கடுமையானது</type>
+			<type key="lw" type="breakall" scope="core">அனைத்தும் உடைத்தல்</type>
+			<type key="lw" type="keepall" scope="core">அனைத்தும் தக்கவைத்தல்</type>
+			<type key="lw" type="normal" scope="core">இயல்பானது</type>
+			<type key="lw" type="phrase" scope="core">வாக்கியங்களில் தக்கவைத்தல்</type>
 			<type key="m0" type="bgn">யூஎஸ் பிஜிஎன் ஒலிபெயர்ப்பு</type>
 			<type key="m0" type="ungegn">யூஎன் ஜிஇஜிஎன் ஒலிபெயர்ப்பு</type>
 			<type key="ms" type="metric">மெட்ரிக் முறை</type>
+			<type key="ms" type="metric" scope="core">மெட்ரிக்</type>
 			<type key="ms" type="uksystem">இம்பீரியல் அளவீட்டு முறை</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">அமெரிக்க அளவீட்டு முறை</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">அரபிய-இந்திய இலக்கங்கள்</type>
 			<type key="numbers" type="arabext">நீட்டிக்கப்பட்ட அரபிய-இந்திய இலக்கங்கள்</type>
 			<type key="numbers" type="armn">ஆர்மேனியன் எண்கள்</type>
@@ -1152,8 +1194,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="finance">நிதி எண்கள்</type>
 			<type key="numbers" type="fullwide">முழு-அகல இலக்கங்கள்</type>
 			<type key="numbers" type="geor">ஜார்ஜியன் எண்கள்</type>
-			<type key="numbers" type="grek">கிரீக் எண்கள்</type>
-			<type key="numbers" type="greklow">கிரீக் சிற்றெழுத்து எண்கள்</type>
+			<type key="numbers" type="grek">கிரேக்க எண்கள்</type>
+			<type key="numbers" type="greklow">கிரேக்கச் சிற்றெழுத்து எண்கள்</type>
 			<type key="numbers" type="gujr">குஜராத்தி இலக்கங்கள்</type>
 			<type key="numbers" type="guru">குர்முகி இலக்கங்கள்</type>
 			<type key="numbers" type="hanidec">சீன பின்ன எண்கள்</type>
@@ -1174,7 +1216,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="mtei">மீடீ மயக் இலக்கங்கள்</type>
 			<type key="numbers" type="mymr">மியான்மர் இலக்கங்கள்</type>
 			<type key="numbers" type="native">சொந்த இலக்கங்கள்</type>
-			<type key="numbers" type="olck">ஓல் சிக்கி இலக்கங்கள்</type>
+			<type key="numbers" type="olck">ஒல் சிக்கி இலக்கங்கள்</type>
 			<type key="numbers" type="orya">ஒடியா இலக்கங்கள்</type>
 			<type key="numbers" type="roman">ரோமன் எண்கள்</type>
 			<type key="numbers" type="romanlow">ரோமன் சிற்றெழுத்து எண்கள்</type>
@@ -1185,6 +1227,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">திபெத்திய இலக்கங்கள்</type>
 			<type key="numbers" type="traditional">பாரம்பரிய எண்கள்</type>
 			<type key="numbers" type="vaii">வை இலக்கங்கள்</type>
+			<type key="ss" type="none" scope="core">முடக்கம்</type>
+			<type key="ss" type="standard" scope="core">இயக்கம்</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">மெட்ரிக்</measurementSystemName>
@@ -1202,13 +1246,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[\u200C\u200D]</exemplarCharacters>
 		<exemplarCharacters type="index">[அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0௦ 1௧ 2௨ 3௩ 4௪ 5௫ 6௬ 7௭ 8௮ 9௯]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[{எண்கள்\-துணை}]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1639,20 +1681,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<quarter type="4">நான்காம் காலாண்டு</quarter>
 						</quarterWidth>
 					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">கா.1</quarter>
-							<quarter type="2">கா.2</quarter>
-							<quarter type="3">கா.3</quarter>
-							<quarter type="4">கா.4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">முதல் காலாண்டு</quarter>
-							<quarter type="2">இரண்டாம் காலாண்டு</quarter>
-							<quarter type="3">மூன்றாம் காலாண்டு</quarter>
-							<quarter type="4">நான்காம் காலாண்டு</quarter>
-						</quarterWidth>
-					</quarterContext>
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
@@ -1670,7 +1698,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="midnight">நள்.</dayPeriod>
 							<dayPeriod type="noon">நண்.</dayPeriod>
-							<dayPeriod type="morning1">அதி.</dayPeriod>
+							<dayPeriod type="morning1">காலை</dayPeriod>
 							<dayPeriod type="morning2">கா.</dayPeriod>
 							<dayPeriod type="afternoon1">மதி.</dayPeriod>
 							<dayPeriod type="afternoon2">பிற்.</dayPeriod>
@@ -1792,7 +1820,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">dd-MM, E</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one">MMMM W -ஆம் வாரம்</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM W -ஆம் வாரம்</dateFormatItem>
@@ -2092,17 +2119,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="quarter-short">
-				<displayName>காலா.</displayName>
+				<displayName>கா.</displayName>
 				<relative type="-1">இறுதி காலாண்டு</relative>
 				<relative type="0">இந்த காலாண்டு</relative>
 				<relative type="1">அடுத்த காலாண்டு</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} காலா.</relativeTimePattern>
-					<relativeTimePattern count="other">{0} காலா.</relativeTimePattern>
-				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} காலா. முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} காலா. முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} கா. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} கா. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="quarter-narrow">
@@ -2196,7 +2219,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="day">
 				<displayName>நாள்</displayName>
-				<relative type="-2">நேற்று முன் தினம்</relative>
+				<relative type="-2">நேற்று முன்தினம்</relative>
 				<relative type="-1">நேற்று</relative>
 				<relative type="0">இன்று</relative>
 				<relative type="1">நாளை</relative>
@@ -2448,13 +2471,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="dayperiod-short">
-				<displayName>முற்./பிற்.</displayName>
+				<displayName>AM/PM</displayName>
 			</field>
 			<field type="dayperiod">
-				<displayName>முற்பகல்/பிற்பகல்</displayName>
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>AM/PM</displayName>
 			</field>
 			<field type="hour">
-				<displayName>மணி</displayName>
+				<displayName>மணிநேரம்</displayName>
 				<relative type="0">இந்த ஒரு மணிநேரத்தில்</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">{0} மணிநேரத்தில்</relativeTimePattern>
@@ -2466,14 +2492,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="hour-short">
-				<displayName>மணி.</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} மணி.</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மணி.</relativeTimePattern>
-				</relativeTime>
+				<displayName>ம.</displayName>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} மணி. முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} மணி. முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} ம. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} ம. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="hour-narrow">
@@ -2533,14 +2555,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="second-short">
-				<displayName>விநா.</displayName>
-				<relativeTime type="future">
-					<relativeTimePattern count="one">{0} விநா.</relativeTimePattern>
-					<relativeTimePattern count="other">{0} விநா.</relativeTimePattern>
-				</relativeTime>
+				<displayName>வி.</displayName>
 				<relativeTime type="past">
-					<relativeTimePattern count="one">{0} விநா. முன்</relativeTimePattern>
-					<relativeTimePattern count="other">{0} விநா. முன்</relativeTimePattern>
+					<relativeTimePattern count="one">{0} வி. முன்</relativeTimePattern>
+					<relativeTimePattern count="other">{0} வி. முன்</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="second-narrow">
@@ -2918,6 +2936,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ஈஸ்டர்</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">கொயாய்கே</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>புன்டா அரீனாஸ்</exemplarCity>
 			</zone>
@@ -3183,9 +3204,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ஃப்னோம் பென்</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>எண்டர்பரி</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>கேன்டன்</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3862,9 +3880,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>மேற்கு ஆப்பிரிக்க நேரம்</generic>
-					<standard>மேற்கு ஆப்பிரிக்க நிலையான நேரம்</standard>
-					<daylight>மேற்கு ஆப்பிரிக்க கோடை நேரம்</daylight>
+					<standard>மேற்கு ஆப்பிரிக்க நேரம்</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4247,6 +4263,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>கயானா நேரம்</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ஹவாய்-அலேஷியன் நிலையான நேரம்</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ஹவாய்-அலேஷியன் நேரம்</generic>
@@ -4673,7 +4694,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>தாய்பே நேரம்</generic>
+					<generic>தைவான் நேரம்</generic>
 					<standard>தாய்பே நிலையான நேரம்</standard>
 					<daylight>தாய்பே பகலொளி நேரம்</daylight>
 				</long>
@@ -4700,6 +4721,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>சுக் நேரம்</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>துருக்கி நேரம்</generic>
+					<standard>துருக்கி தர நேரம்</standard>
+					<daylight>துருக்கி கோடை நேரம்</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>துர்க்மெனிஸ்தான் நேரம்</generic>
@@ -4856,6 +4884,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="tamldec">
+			<rationalUsage>never</rationalUsage>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -4867,6 +4898,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 					<pattern alt="noCurrency" draft="contributed">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
@@ -4877,34 +4909,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ 0ஆ</pattern>
-					<pattern type="1000" count="other">¤ 0ஆ</pattern>
-					<pattern type="10000" count="one">¤ 00ஆ</pattern>
-					<pattern type="10000" count="other">¤ 00ஆ</pattern>
-					<pattern type="100000" count="one">¤ 000ஆ</pattern>
-					<pattern type="100000" count="other">¤ 000ஆ</pattern>
-					<pattern type="1000000" count="one">¤ 0மி</pattern>
-					<pattern type="1000000" count="other">¤ 0மி</pattern>
-					<pattern type="10000000" count="one">¤ 00மி</pattern>
-					<pattern type="10000000" count="other">¤ 00மி</pattern>
-					<pattern type="100000000" count="one">¤ 000மி</pattern>
-					<pattern type="100000000" count="other">¤ 000மி</pattern>
-					<pattern type="1000000000" count="one">¤ 0பி</pattern>
-					<pattern type="1000000000" count="one" alt="alphaNextToNumber" draft="contributed">¤ 0பி</pattern>
+					<pattern type="1000" count="one">¤0ஆ</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0ஆ</pattern>
+					<pattern type="1000" count="other">¤0ஆ</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0ஆ</pattern>
+					<pattern type="10000" count="one">¤00ஆ</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00ஆ</pattern>
+					<pattern type="10000" count="other">¤00ஆ</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00ஆ</pattern>
+					<pattern type="100000" count="one">¤000ஆ</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000ஆ</pattern>
+					<pattern type="100000" count="other">¤000ஆ</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000ஆ</pattern>
+					<pattern type="1000000" count="one">¤0மி</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0மி</pattern>
+					<pattern type="1000000" count="other">¤0மி</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0மி</pattern>
+					<pattern type="10000000" count="one">¤00மி</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00மி</pattern>
+					<pattern type="10000000" count="other">¤00மி</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00மி</pattern>
+					<pattern type="100000000" count="one">¤000மி</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000மி</pattern>
+					<pattern type="100000000" count="other">¤000மி</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000மி</pattern>
+					<pattern type="1000000000" count="one">¤0பி</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0பி</pattern>
 					<pattern type="1000000000" count="other">¤0பி</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber" draft="contributed">¤ 0பி</pattern>
-					<pattern type="10000000000" count="one">¤ 00பி</pattern>
-					<pattern type="10000000000" count="other">¤ 00பி</pattern>
-					<pattern type="100000000000" count="one">¤ 000பி</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber" draft="contributed">¤ 000பி</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0பி</pattern>
+					<pattern type="10000000000" count="one">¤00பி</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00பி</pattern>
+					<pattern type="10000000000" count="other">¤00பி</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00பி</pattern>
+					<pattern type="100000000000" count="one">¤000பி</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000பி</pattern>
 					<pattern type="100000000000" count="other">¤000பி</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber" draft="contributed">¤ 000பி</pattern>
-					<pattern type="1000000000000" count="one">¤ 0டி</pattern>
-					<pattern type="1000000000000" count="other">¤ 0டி</pattern>
-					<pattern type="10000000000000" count="one">¤ 00டி</pattern>
-					<pattern type="10000000000000" count="other">¤ 00டி</pattern>
-					<pattern type="100000000000000" count="one">¤ 000டி</pattern>
-					<pattern type="100000000000000" count="other">¤ 000டி</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000பி</pattern>
+					<pattern type="1000000000000" count="one">¤0டி</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0டி</pattern>
+					<pattern type="1000000000000" count="other">¤0டி</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0டி</pattern>
+					<pattern type="10000000000000" count="one">¤00டி</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00டி</pattern>
+					<pattern type="10000000000000" count="other">¤00டி</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00டி</pattern>
+					<pattern type="100000000000000" count="one">¤000டி</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000டி</pattern>
+					<pattern type="100000000000000" count="other">¤000டி</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000டி</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4912,7 +4964,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="noCurrency">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5685,6 +5738,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">கிழக்கு கரீபியன் டாலர்</displayName>
 				<displayName count="other">கிழக்கு கரீபியன் டாலர்கள்</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">கரீபியன் கில்டர்</displayName>
+				<displayName count="one" draft="contributed">கரீபியன் கில்டர்</displayName>
+				<displayName count="other" draft="contributed">கரீபியன் கில்டர்</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>மேற்கு ஆப்பிரிக்க CFA ஃப்ராங்க்</displayName>
 				<displayName count="one">மேற்கு ஆப்பிரிக்க CFA ஃப்ராங்க்</displayName>
@@ -5716,6 +5774,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">ஸாம்பியன் குவாச்சா</displayName>
 				<displayName count="other">ஸாம்பியன் குவாச்சாக்கள்</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">ஜிம்பாப்வே தங்கம்</displayName>
+				<displayName count="one" draft="contributed">ஜிம்பாப்வே தங்கம்</displayName>
+				<displayName count="other" draft="contributed">ஜிம்பாப்வே தங்கம்</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -6016,7 +6079,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} உருப்படிகளை</unitPattern>
 				<unitPattern count="other" case="dative">{0} உருப்படிகளுக்கு</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>பகுதிகள்</displayName>
+				<unitPattern count="one">{0} பகுதி</unitPattern>
+				<unitPattern count="other">{0} பகுதிகள்</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>பகுதிகள்/மில்லியன்</displayName>
 				<unitPattern count="one">{0} பகுதி/மில்லியன்</unitPattern>
 				<unitPattern count="one" case="ablative">{0} பகுதி/மில்லியனில்</unitPattern>
@@ -6068,6 +6136,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} மோல்ஸை</unitPattern>
 				<unitPattern count="other" case="dative">{0} மோல்ஸுக்கு</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>குளுக்கோஸ்</displayName>
+				<unitPattern count="one">{0} குளுக்கோஸ்</unitPattern>
+				<unitPattern count="other">{0} குளுக்கோஸ்</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>லிட்டர்கள்/கிலோமீட்டர்</displayName>
 				<unitPattern count="one">{0} லிட்டர்/கிலோமீட்டர்</unitPattern>
@@ -6312,20 +6385,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative">{0} நாட்களுக்கு</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>மணிநேரங்கள்</displayName>
-				<unitPattern count="one">{0} மணிநேரம்</unitPattern>
+				<displayName>மணிநேரம்</displayName>
+				<unitPattern count="one">{0} ம.</unitPattern>
 				<unitPattern count="one" case="ablative">{0} மணிநேரத்தில்</unitPattern>
 				<unitPattern count="one" case="accusative">{0} மணிநேரத்தை</unitPattern>
 				<unitPattern count="one" case="dative">{0} மணிநேரத்திற்கு</unitPattern>
-				<unitPattern count="other">{0} மணிநேரங்கள்</unitPattern>
-				<unitPattern count="other" case="ablative">{0} மணிநேரங்களில்</unitPattern>
-				<unitPattern count="other" case="accusative">{0} மணிநேரங்களை</unitPattern>
-				<unitPattern count="other" case="dative">{0} மணிநேரங்களுக்கு</unitPattern>
+				<unitPattern count="other">{0} ம.</unitPattern>
+				<unitPattern count="other" case="ablative">{0} மணிநேரத்தில்</unitPattern>
+				<unitPattern count="other" case="accusative">{0} மணிநேரத்தை</unitPattern>
+				<unitPattern count="other" case="dative">{0} மணிநேரத்திற்கு</unitPattern>
 				<perUnitPattern>{0} / மணிநேரம்</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
 				<displayName>நிமிடங்கள்</displayName>
-				<unitPattern count="one">{0} நிமிடம்</unitPattern>
+				<unitPattern count="one">{0} நிமி.</unitPattern>
 				<unitPattern count="one" case="ablative">{0} நிமிடத்தில்</unitPattern>
 				<unitPattern count="one" case="accusative">{0} நிமிடத்தை</unitPattern>
 				<unitPattern count="one" case="dative">{0} நிமிடத்திற்கு</unitPattern>
@@ -7012,6 +7085,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative" draft="contributed">{0} மில்லிமீட்டர் பாதரசத்தை</unitPattern>
 				<unitPattern count="other" case="dative" draft="contributed">{0} மில்லிமீட்டர் பாதரசத்திற்கு</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>பாதரசம்</displayName>
+				<unitPattern count="one">{0} பாதரசம்</unitPattern>
+				<unitPattern count="other">{0} பாதரசம்</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>பவுண்டுகள்/சதுர அங்குலம்</displayName>
 				<unitPattern count="one">{0} பவுண்டு/சதுர அங்குலம்</unitPattern>
@@ -7137,14 +7215,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">பியூஃபோர்ட் {0}</unitPattern>
 			</unit>
 			<unit type="temperature-generic">
-				<unitPattern count="one">{0} டிகிரி</unitPattern>
+				<unitPattern count="one">{0} டிகிரி வெப்பநிலை</unitPattern>
 				<unitPattern count="one" case="ablative">{0} டிகிரியில்</unitPattern>
 				<unitPattern count="one" case="accusative">{0} டிகிரியை</unitPattern>
 				<unitPattern count="one" case="dative">{0} டிகிரிக்கு</unitPattern>
-				<unitPattern count="other">{0} டிகிரீஸ்</unitPattern>
-				<unitPattern count="other" case="ablative">{0} டிகிரீஸில்</unitPattern>
-				<unitPattern count="other" case="accusative">{0} டிகிரீஸை</unitPattern>
-				<unitPattern count="other" case="dative">{0} டிகிரீஸுக்கு</unitPattern>
+				<unitPattern count="other">{0} டிகிரி</unitPattern>
+				<unitPattern count="other" case="ablative">{0} டிகிரியில்</unitPattern>
+				<unitPattern count="other" case="accusative">{0} டிகிரியை</unitPattern>
+				<unitPattern count="other" case="dative">{0} டிகிரிக்கு</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>டிகிரி செல்சியஸ்</displayName>
@@ -7332,6 +7410,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} மெட்ரிக் கோப்பைகளை</unitPattern>
 				<unitPattern count="other" case="dative">{0} மெட்ரிக் கோப்பைகளுக்கு</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">மெட்ரிக் திரவ அவுன்ஸ்</displayName>
+				<unitPattern count="one" draft="contributed">{0} மெட்ரிக் திரவ அவுன்ஸ்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} மெட்ரிக் திரவ அவுன்ஸ்</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ஏக்கர் அடி</displayName>
 				<unitPattern count="one">{0} ஏக்கர் அடி</unitPattern>
@@ -7427,8 +7510,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} இம்பீரியல் குவார்ட்</unitPattern>
 				<unitPattern count="other">{0} இம்பீரியல் குவார்ட்ஸ்</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="contributed">ஸ்டெரேடியன்</displayName>
+				<unitPattern count="one" draft="contributed">{0} ஸ்டெரேடியன்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ஸ்டெரேடியன்</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">கட்டல்கள்</displayName>
+				<unitPattern count="one">{0} கட்டல்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} கட்டல்கள்</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">கூலும்</displayName>
+				<unitPattern count="one" draft="contributed">{0} கூலும்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} கூலும்</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">ஃபாரட்</displayName>
+				<unitPattern count="one" draft="contributed">{0} ஃபாரட்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ஃபாரட்</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">ஹென்றி</displayName>
+				<unitPattern count="one" draft="contributed">{0} ஹென்றி</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ஹென்றி</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">சீமென்</displayName>
+				<unitPattern count="one" draft="contributed">{0} சீமென்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} சீமென்</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">கலோரி [IT]</displayName>
+				<unitPattern count="one" draft="contributed">{0} கலோரி [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} கலோரி-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">பெக்கொரல்</displayName>
+				<unitPattern count="one" draft="contributed">{0} பெக்கொரல்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} பெக்கொரல்</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">சீவர்ட்</displayName>
+				<unitPattern count="one" draft="contributed">{0} சீவர்ட்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} சீவர்ட்</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">கிரே</displayName>
+				<unitPattern count="one" draft="contributed">{0} கிரே</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} கிரே</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">கிலோகிராம் விசை</displayName>
+				<unitPattern count="one" draft="contributed">{0} கிலோகிராம் விசை</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} கிலோகிராம் விசை</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">டெஸ்லா</displayName>
+				<unitPattern count="one" draft="contributed">{0} டெஸ்லா</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} டெஸ்லா</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">வெபர்</displayName>
+				<unitPattern count="one" draft="contributed">வெபர்</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} வெபர்</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ஒளிவேகம்</displayName>
 				<unitPattern count="one">{0} ஒளிவேகம்</unitPattern>
 				<unitPattern count="one" case="ablative" draft="contributed">{0} ஒளிவேகத்தில்</unitPattern>
 				<unitPattern count="one" case="accusative" draft="contributed">{0} ஒளிவேகத்தை</unitPattern>
@@ -7438,7 +7585,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative" draft="contributed">{0} ஒளிவேகத்தை</unitPattern>
 				<unitPattern count="other" case="dative" draft="contributed">{0} ஒளிவேகத்திற்கு</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>பார்ட்ஸ்/பில்லியன்</displayName>
 				<unitPattern count="one" draft="contributed">{0} பார்ட்ஸ்/பில்லியன்</unitPattern>
 				<unitPattern count="one" case="ablative" draft="contributed">{0} பார்ட்ஸ்/பில்லியனில்</unitPattern>
@@ -7450,7 +7597,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="dative" draft="contributed">{0} பார்ட்ஸ்/பில்லியனுக்கு</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>இரவுகள்</displayName>
 				<unitPattern count="one">{0} இரவு</unitPattern>
 				<unitPattern count="one" case="ablative" draft="contributed">{0} இரவில்</unitPattern>
 				<unitPattern count="one" case="accusative" draft="contributed">{0} இரவை</unitPattern>
@@ -7459,7 +7605,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="ablative" draft="contributed">{0} இரவுகளில்</unitPattern>
 				<unitPattern count="other" case="accusative" draft="contributed">{0} இரவுகளை</unitPattern>
 				<unitPattern count="other" case="dative" draft="contributed">{0} இரவுகளுக்கு</unitPattern>
-				<perUnitPattern>{0}/இரவு</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>கார்டினல் திசை</displayName>
@@ -7599,20 +7744,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ஆர்க்விநா.</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<displayName>கி.மீ.²</displayName>
-				<unitPattern count="one">{0} கி.மீ.²</unitPattern>
-				<unitPattern count="other">{0} கி.மீ.²</unitPattern>
-				<perUnitPattern>{0}/கி.மீ.²</perUnitPattern>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
 				<displayName>ஹெக்டேர்</displayName>
-				<unitPattern count="one">{0} ஹெக்.</unitPattern>
-				<unitPattern count="other">{0} ஹெக்.</unitPattern>
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
 				<displayName>மீட்டர்கள்²</displayName>
-				<unitPattern count="one">{0} மீ²</unitPattern>
-				<unitPattern count="other">{0} மீ²</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
 				<perUnitPattern>{0}/மீ²</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
@@ -7625,7 +7768,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>சதுர மைல்கள்</displayName>
 				<unitPattern count="one">{0} ச. மை.</unitPattern>
 				<unitPattern count="other">{0} ச. மை.</unitPattern>
-				<perUnitPattern>{0}/மை.²</perUnitPattern>
 			</unit>
 			<unit type="area-acre">
 				<displayName>ஏக்கர்</displayName>
@@ -7673,7 +7815,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} உருப்படி</unitPattern>
 				<unitPattern count="other">{0} உருப்படி</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>பகுதி</displayName>
+				<unitPattern count="one">{0} பகுதி</unitPattern>
+				<unitPattern count="other">{0} பகுதி</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ப./மி.</displayName>
 				<unitPattern count="one">{0} ப./மி.</unitPattern>
 				<unitPattern count="other">{0} ப./மி.</unitPattern>
@@ -7692,6 +7839,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} மோல்</unitPattern>
 				<unitPattern count="other">{0} மோல்</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>லி./கி.மீ.</displayName>
 				<unitPattern count="one">{0} லி./கி.மீ.</unitPattern>
@@ -7784,16 +7936,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/நா</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>மணிநேர.</displayName>
-				<unitPattern count="one">{0} மணிநேரம்</unitPattern>
-				<unitPattern count="other">{0} மணிநேரம்</unitPattern>
+				<displayName>மணிநேரம்</displayName>
+				<unitPattern count="one">{0} ம.</unitPattern>
+				<unitPattern count="other">{0} ம.</unitPattern>
 				<perUnitPattern>{0} /ம.நே</perUnitPattern>
 			</unit>
 			<unit type="duration-minute">
-				<displayName>நிமிட.</displayName>
-				<unitPattern count="one">{0} நிமிடம்</unitPattern>
-				<unitPattern count="other">{0} நிமிட</unitPattern>
-				<perUnitPattern>{0}/நிமிட</perUnitPattern>
+				<displayName>நிமி.</displayName>
+				<unitPattern count="one">{0} நிமி.</unitPattern>
+				<unitPattern count="other">{0} நிமி.</unitPattern>
+				<perUnitPattern>{0}/நிமி.</perUnitPattern>
 			</unit>
 			<unit type="duration-second">
 				<displayName>விநாடிகள்</displayName>
@@ -7833,9 +7985,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} வோ.</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<displayName>கி.கலோ.</displayName>
-				<unitPattern count="one">{0} கி.கலோ.</unitPattern>
-				<unitPattern count="other">{0} கி.கலோ.</unitPattern>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<displayName>கலோ.</displayName>
@@ -7848,19 +7999,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} கலோ.</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<displayName>கி.ஜூ.</displayName>
-				<unitPattern count="one">{0} கி.ஜூ.</unitPattern>
-				<unitPattern count="other">{0} கி.ஜூ.</unitPattern>
+				<displayName>கிலோஜூல்</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
 			<unit type="energy-joule">
 				<displayName>ஜூல்</displayName>
-				<unitPattern count="one">{0} ஜூ.</unitPattern>
-				<unitPattern count="other">{0} ஜூ.</unitPattern>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>கி.வா-ம.நே.</displayName>
-				<unitPattern count="one">{0} கி.வா.ம.நே.</unitPattern>
-				<unitPattern count="other">{0} கி.வா.ம.நே.</unitPattern>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName>எலக்ட்ரான்வோல்ட்</displayName>
@@ -7882,8 +8033,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="force-newton">
 				<displayName>நியூட்டன்</displayName>
-				<unitPattern count="one">{0} நியூ</unitPattern>
-				<unitPattern count="other">{0} நியூ</unitPattern>
+				<unitPattern count="one">{0} N</unitPattern>
+				<unitPattern count="other">{0} N</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>கி.வா-ம.நே./100கி.மி.</displayName>
@@ -7891,24 +8042,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} கி.வா-ம.நே./100கி.மி.</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<displayName>ஜி.ஹெஸ்.</displayName>
-				<unitPattern count="one">{0} ஜி.ஹெஸ்.</unitPattern>
-				<unitPattern count="other">{0} ஜி.ஹெஸ்.</unitPattern>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<displayName>மெ.ஹெஸ்.</displayName>
-				<unitPattern count="one">{0} மெ.ஹெஸ்.</unitPattern>
-				<unitPattern count="other">{0} மெ.ஹெஸ்.</unitPattern>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<displayName>கி.ஹெஸ்.</displayName>
-				<unitPattern count="one">{0} கி.ஹெஸ்.</unitPattern>
-				<unitPattern count="other">{0} கி.ஹெஸ்.</unitPattern>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<displayName>ஹெஸ்.</displayName>
-				<unitPattern count="one">{0} ஹெஸ்.</unitPattern>
-				<unitPattern count="other">{0} ஹெஸ்.</unitPattern>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="graphics-em">
 				<displayName>எம்</displayName>
@@ -7922,18 +8069,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="graphics-megapixel">
 				<displayName>மெகாபிக்சல்கள்</displayName>
-				<unitPattern count="one">{0} எம்.பி</unitPattern>
-				<unitPattern count="other">{0} எம்.பி</unitPattern>
+				<unitPattern count="one">{0} MP</unitPattern>
+				<unitPattern count="other">{0} MP</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
-				<displayName>பிக். / செ.மீ</displayName>
-				<unitPattern count="one">{0} பிக். / செ.மீ</unitPattern>
-				<unitPattern count="other">{0} பிக். / செ.மீ</unitPattern>
+				<unitPattern count="one">{0} ppcm</unitPattern>
+				<unitPattern count="other">{0} ppcm</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<displayName>பிக். / அங்.</displayName>
-				<unitPattern count="one">{0} பிக். / அங்.</unitPattern>
-				<unitPattern count="other">{0} பிக். / அங்.</unitPattern>
+				<unitPattern count="one">{0} ppi</unitPattern>
+				<unitPattern count="other">{0} ppi</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>பு / செ.மீ</displayName>
@@ -7941,9 +8086,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} பு / செ.மீ</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
-				<displayName>பு / அங்.</displayName>
-				<unitPattern count="one">{0} பு / அங்.</unitPattern>
-				<unitPattern count="other">{0} பு / அங்.</unitPattern>
+				<displayName>dpi</displayName>
+				<unitPattern count="one">{0} dpi</unitPattern>
+				<unitPattern count="other">{0} dpi</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>புள்ளி</displayName>
@@ -7979,9 +8124,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} மி.மீ.</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<displayName>μமீ.</displayName>
-				<unitPattern count="one">{0} μமீ.</unitPattern>
-				<unitPattern count="other">{0} μமீ.</unitPattern>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
 				<displayName>நா.மீ.</displayName>
@@ -7995,8 +8139,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-mile">
 				<displayName>மைல்கள்</displayName>
-				<unitPattern count="one">{0} மை.</unitPattern>
-				<unitPattern count="other">{0} மை.</unitPattern>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
 			</unit>
 			<unit type="length-yard">
 				<displayName>கெஜ.</displayName>
@@ -8011,14 +8155,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-inch">
 				<displayName>அங்குலங்கள்</displayName>
-				<unitPattern count="one">{0} அங்.</unitPattern>
-				<unitPattern count="other">{0} அங்.</unitPattern>
 				<perUnitPattern>{0}/அங்.</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>பு.நொ.</displayName>
-				<unitPattern count="one">{0} பு.நொ.</unitPattern>
-				<unitPattern count="other">{0} பு.நொ.</unitPattern>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ஒளி ஆண்டுகள்</displayName>
@@ -8026,9 +8168,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ஒ.ஆ.</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<displayName>வா.அ.</displayName>
-				<unitPattern count="one">{0} வா.அ.</unitPattern>
-				<unitPattern count="other">{0} வா.அ.</unitPattern>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
 			</unit>
 			<unit type="length-furlong">
 				<displayName>பர்</displayName>
@@ -8041,9 +8182,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ஃபே.</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<displayName>க.மை.</displayName>
-				<unitPattern count="one">{0} க.மை.</unitPattern>
-				<unitPattern count="other">{0} க.மை.</unitPattern>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
 				<displayName>ஸ்.மை.</displayName>
@@ -8070,8 +8210,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="light-lumen">
 				<displayName>லூம.</displayName>
-				<unitPattern count="one">{0} லூம.</unitPattern>
-				<unitPattern count="other">{0} லூம.</unitPattern>
+				<unitPattern count="one">{0} lm</unitPattern>
+				<unitPattern count="other">{0} lm</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>சூரிய ஒளிர்வுத்தன்மை</displayName>
@@ -8082,10 +8222,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ட.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
-				<displayName>கி.கி.</displayName>
-				<unitPattern count="one">{0} கி.கி.</unitPattern>
-				<unitPattern count="other">{0} கி.கி.</unitPattern>
-				<perUnitPattern>{0}/கி.கி.</perUnitPattern>
+				<unitPattern count="one">{0} kg</unitPattern>
+				<unitPattern count="other">{0} kg</unitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>கிராம்கள்</displayName>
@@ -8094,14 +8232,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/கி.</perUnitPattern>
 			</unit>
 			<unit type="mass-milligram">
-				<displayName>மி.கி.</displayName>
-				<unitPattern count="one">{0} மி.கி.</unitPattern>
-				<unitPattern count="other">{0} மி.கி.</unitPattern>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
-				<displayName>μகி</displayName>
-				<unitPattern count="one">{0} μகி</unitPattern>
-				<unitPattern count="other">{0} μகி</unitPattern>
+				<unitPattern count="one">{0} μg</unitPattern>
+				<unitPattern count="other">{0} μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<displayName>டன்</displayName>
@@ -8115,14 +8251,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="mass-pound">
 				<displayName>பவு.</displayName>
-				<unitPattern count="one">{0} பவு.</unitPattern>
+				<unitPattern count="one">{0} lb</unitPattern>
 				<unitPattern count="other">{0} பவு.</unitPattern>
-				<perUnitPattern>{0}/பவு.</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<displayName>அவு.</displayName>
-				<unitPattern count="one">{0} அவு.</unitPattern>
-				<unitPattern count="other">{0} அவு.</unitPattern>
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
 				<perUnitPattern>{0}/அவு.</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
@@ -8152,44 +8287,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} கிரைன்</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<displayName>கி.வாட்.</displayName>
-				<unitPattern count="one">{0} கி.வாட்.</unitPattern>
-				<unitPattern count="other">{0} கி.வாட்.</unitPattern>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName>மெ.வா.</displayName>
-				<unitPattern count="one">{0} மெ.வா.</unitPattern>
-				<unitPattern count="other">{0} மெ.வா.</unitPattern>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName>கி.வா.</displayName>
-				<unitPattern count="one">{0} கி.வா.</unitPattern>
-				<unitPattern count="other">{0} கி.வா.</unitPattern>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>வா.</displayName>
-				<unitPattern count="one">{0} வா.</unitPattern>
-				<unitPattern count="other">{0} வா.</unitPattern>
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<displayName>மி.வா.</displayName>
-				<unitPattern count="one">{0} மி.வா.</unitPattern>
-				<unitPattern count="other">{0} மி.வா.</unitPattern>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<displayName>கு.தி.</displayName>
-				<unitPattern count="one">{0} கு.தி.</unitPattern>
-				<unitPattern count="other">{0} கு.தி.</unitPattern>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
-				<displayName>பாத. மி.மீ.</displayName>
-				<unitPattern count="one">{0} பாத. மி.மீ.</unitPattern>
-				<unitPattern count="other">{0} பாத. மி.மீ.</unitPattern>
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName>பாத. அங்.</displayName>
-				<unitPattern count="one">{0} பாத. அங்.</unitPattern>
-				<unitPattern count="other">{0} பாத. அங்.</unitPattern>
+				<unitPattern count="one">{0} inHg</unitPattern>
+				<unitPattern count="other">{0} inHg</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<displayName>பார்</displayName>
@@ -8198,28 +8327,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="pressure-millibar">
 				<displayName>மி.பா.</displayName>
-				<unitPattern count="one">{0} மி.பா.</unitPattern>
-				<unitPattern count="other">{0} மி.பா.</unitPattern>
+				<unitPattern count="one">{0} mbar</unitPattern>
+				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
-				<displayName>பா.</displayName>
-				<unitPattern count="one">{0} பா.</unitPattern>
-				<unitPattern count="other">{0} பா.</unitPattern>
+				<unitPattern count="one">{0} Pa</unitPattern>
+				<unitPattern count="other">{0} Pa</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<displayName>ஹெ.பாஸ்.</displayName>
-				<unitPattern count="one">{0} ஹெ.பாஸ்.</unitPattern>
-				<unitPattern count="other">{0} ஹெ.பாஸ்.</unitPattern>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
-				<displayName>கிபா</displayName>
-				<unitPattern count="one">{0} கிபா</unitPattern>
-				<unitPattern count="other">{0} கிபா</unitPattern>
+				<unitPattern count="one">{0} kPa</unitPattern>
+				<unitPattern count="other">{0} kPa</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
-				<displayName>மெபா</displayName>
-				<unitPattern count="one">{0} மெபா</unitPattern>
-				<unitPattern count="other">{0} மெபா</unitPattern>
+				<unitPattern count="one">{0} MPa</unitPattern>
+				<unitPattern count="other">{0} MPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>கி.மீ./மணிநேரம்</displayName>
@@ -8242,24 +8367,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} நா.</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName>பியூ.</displayName>
-				<unitPattern count="one">பியூ. {0}</unitPattern>
-				<unitPattern count="other">பியூ. {0}</unitPattern>
+				<unitPattern count="one">B {0}</unitPattern>
+				<unitPattern count="other">B {0}</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>டிகிரி செ.</displayName>
-				<unitPattern count="one">{0}°செ.</unitPattern>
-				<unitPattern count="other">{0}°செ.</unitPattern>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>டி. ஃபா.</displayName>
-				<unitPattern count="one">{0}°ஃபா.</unitPattern>
-				<unitPattern count="other">{0}°ஃபா.</unitPattern>
+				<unitPattern count="one">{0}°F</unitPattern>
+				<unitPattern count="other">{0}°F</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>கெல்.</displayName>
-				<unitPattern count="one">{0} கெல்.</unitPattern>
-				<unitPattern count="other">{0} கெல்.</unitPattern>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName>ப.அடி</displayName>
@@ -8267,9 +8388,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ப.அடி</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<displayName>நியூ.மீ</displayName>
-				<unitPattern count="one">{0} நியூ.மீ</unitPattern>
-				<unitPattern count="other">{0} நியூ.மீ</unitPattern>
+				<unitPattern count="one">{0} N⋅m</unitPattern>
+				<unitPattern count="other">{0} N⋅m</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<displayName>கிமீ³</displayName>
@@ -8289,9 +8409,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<perUnitPattern>{0}/செ.மீ.³</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<displayName>மை³</displayName>
-				<unitPattern count="one">{0} மை³</unitPattern>
-				<unitPattern count="other">{0} மை³</unitPattern>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<displayName>யா.³</displayName>
@@ -8346,8 +8465,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="volume-cup-metric">
 				<displayName>மெ.கோப்பை</displayName>
-				<unitPattern count="one">{0} மெ.கோ.</unitPattern>
-				<unitPattern count="other">{0} மெ.கோ.</unitPattern>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ஏக். அடி</displayName>
@@ -8446,15 +8565,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} குவாட். இம்பீ.</unitPattern>
 				<unitPattern count="other">{0} குவாட். இம்பீ.</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">கட்</displayName>
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>கலோரி-IT</displayName>
+				<unitPattern count="one">{0} கலோரி [IT]</unitPattern>
+				<unitPattern count="other">{0} கலோரி-IT</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="contributed">ஒளிவேகம்</displayName>
 				<unitPattern count="one">{0} ஒளிவேகம்</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} ஒளிவேகம்</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName draft="contributed">பார்ட்ஸ்/பில்லியன்</displayName>
 				<unitPattern count="one">{0} பார்ட்ஸ்/பில்லியன்</unitPattern>
-				<unitPattern count="other" draft="contributed">{0} பார்ட்ஸ்/பில்லியன்</unitPattern>
+				<unitPattern count="other">{0} ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName draft="contributed">இரவுகள்</displayName>
@@ -8500,29 +8629,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="area-square-kilometer">
-				<unitPattern count="one">{0} ச.கிமீ.</unitPattern>
-				<unitPattern count="other">{0} ச.கிமீ.</unitPattern>
+				<displayName>km²</displayName>
+				<unitPattern count="one">{0} km²</unitPattern>
+				<unitPattern count="other">{0} km²</unitPattern>
+				<perUnitPattern>{0}/km²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="one">{0} ha</unitPattern>
+				<unitPattern count="other">{0} ha</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<unitPattern count="one">{0} ச.மீ.</unitPattern>
-				<unitPattern count="other">{0} ச.மீ.</unitPattern>
+				<unitPattern count="one">{0} m²</unitPattern>
+				<unitPattern count="other">{0} m²</unitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
 				<unitPattern count="one">{0}செ.மீ.²</unitPattern>
 				<unitPattern count="other">{0}செ.மீ.²</unitPattern>
 			</unit>
+			<unit type="area-square-mile">
+				<displayName>mi²</displayName>
+				<unitPattern count="one">{0} mi²</unitPattern>
+				<unitPattern count="other">{0} mi²</unitPattern>
+				<perUnitPattern>{0}/mi²</perUnitPattern>
+			</unit>
 			<unit type="area-square-yard">
 				<displayName>யா²</displayName>
 				<unitPattern count="one">{0}யா²</unitPattern>
 				<unitPattern count="other">{0}யா²</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>ச.அ.</displayName>
+				<displayName>ft²</displayName>
+				<unitPattern count="one">{0} ft²</unitPattern>
+				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<displayName>அங்.²</displayName>
-				<unitPattern count="one">{0}அங்.²</unitPattern>
-				<unitPattern count="other">{0}அங்.²</unitPattern>
+				<unitPattern count="one">{0} in²</unitPattern>
+				<unitPattern count="other">{0} in²</unitPattern>
 			</unit>
 			<unit type="area-dunam">
 				<displayName>ட்யூனம்</displayName>
@@ -8546,7 +8689,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}உருப்படி</unitPattern>
 				<unitPattern count="other">{0}உருப்படி</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>பகுதி</displayName>
+				<unitPattern count="one">{0} பகுதி</unitPattern>
+				<unitPattern count="other">{0} பகுதி</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ப./மி.</unitPattern>
 				<unitPattern count="other">{0}ப./மி.</unitPattern>
 			</unit>
@@ -8563,6 +8711,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}மோல்</unitPattern>
 				<unitPattern count="other">{0}மோல்</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="one">{0}லி./கி.மீ.</unitPattern>
 				<unitPattern count="other">{0}லி./கி.மீ.</unitPattern>
@@ -8668,7 +8819,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} நா</unitPattern>
 			</unit>
 			<unit type="duration-hour">
-				<displayName>மணி</displayName>
+				<displayName>மணிநேரம்</displayName>
 				<unitPattern count="one">{0} ம.நே.</unitPattern>
 				<unitPattern count="other">{0} ம.நே.</unitPattern>
 			</unit>
@@ -8701,7 +8852,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ஆம்.</unitPattern>
 			</unit>
 			<unit type="electric-milliampere">
-				<displayName>மி.ஆ.</displayName>
+				<displayName>mA</displayName>
 				<unitPattern count="one">{0}மி.ஆ.</unitPattern>
 				<unitPattern count="other">{0}மி.ஆ.</unitPattern>
 			</unit>
@@ -8716,8 +8867,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}வோ.</unitPattern>
 			</unit>
 			<unit type="energy-kilocalorie">
-				<unitPattern count="one">{0}கி.கலோ.</unitPattern>
-				<unitPattern count="other">{0}கி.கலோ.</unitPattern>
+				<displayName>kcal</displayName>
+				<unitPattern count="one">{0} kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
 			<unit type="energy-calorie">
 				<unitPattern count="one">{0}கலோ.</unitPattern>
@@ -8728,16 +8880,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}கலோ.</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
-				<unitPattern count="one">{0}கி.ஜூ.</unitPattern>
-				<unitPattern count="other">{0}கி.ஜூ.</unitPattern>
+				<displayName>kJ</displayName>
+				<unitPattern count="one">{0} kJ</unitPattern>
+				<unitPattern count="other">{0} kJ</unitPattern>
 			</unit>
 			<unit type="energy-joule">
-				<unitPattern count="one">{0}ஜூ.</unitPattern>
-				<unitPattern count="other">{0}ஜூ.</unitPattern>
+				<unitPattern count="one">{0} J</unitPattern>
+				<unitPattern count="other">{0} J</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
-				<unitPattern count="one">{0}கி.வா.ம.</unitPattern>
-				<unitPattern count="other">{0}கி.வா.ம.</unitPattern>
+				<displayName>kWh</displayName>
+				<unitPattern count="one">{0} kWh</unitPattern>
+				<unitPattern count="other">{0} kWh</unitPattern>
 			</unit>
 			<unit type="energy-electronvolt">
 				<displayName>eV</displayName>
@@ -8758,9 +8912,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ப.வி</unitPattern>
 			</unit>
 			<unit type="force-newton">
-				<displayName>நியூ.</displayName>
-				<unitPattern count="one">{0}நியூ.</unitPattern>
-				<unitPattern count="other">{0}நியூ.</unitPattern>
+				<displayName>N</displayName>
+				<unitPattern count="one">{0}N</unitPattern>
+				<unitPattern count="other">{0}N</unitPattern>
 			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<displayName>கி.வா.ம./100கி.மி.</displayName>
@@ -8768,20 +8922,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}கி.வா.ம./100கி.மி.</unitPattern>
 			</unit>
 			<unit type="frequency-gigahertz">
-				<unitPattern count="one">{0}ஜி.ஹெ.</unitPattern>
-				<unitPattern count="other">{0}ஜி.ஹெ.</unitPattern>
+				<displayName>GHz</displayName>
+				<unitPattern count="one">{0} GHz</unitPattern>
+				<unitPattern count="other">{0} GHz</unitPattern>
 			</unit>
 			<unit type="frequency-megahertz">
-				<unitPattern count="one">{0}மெ.ஹெ.</unitPattern>
-				<unitPattern count="other">{0}மெ.ஹெ.</unitPattern>
+				<displayName>MHz</displayName>
+				<unitPattern count="one">{0} MHz</unitPattern>
+				<unitPattern count="other">{0} MHz</unitPattern>
 			</unit>
 			<unit type="frequency-kilohertz">
-				<unitPattern count="one">{0}கி.ஹெ.</unitPattern>
-				<unitPattern count="other">{0}கி.ஹெ.</unitPattern>
+				<displayName>kHz</displayName>
+				<unitPattern count="one">{0} kHz</unitPattern>
+				<unitPattern count="other">{0} kHz</unitPattern>
 			</unit>
 			<unit type="frequency-hertz">
-				<unitPattern count="one">{0}ஹெ.</unitPattern>
-				<unitPattern count="other">{0}ஹெ.</unitPattern>
+				<displayName>Hz</displayName>
+				<unitPattern count="one">{0} Hz</unitPattern>
+				<unitPattern count="other">{0} Hz</unitPattern>
 			</unit>
 			<unit type="graphics-em">
 				<unitPattern count="one">{0}எம்</unitPattern>
@@ -8792,25 +8950,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}பிக்</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
-				<displayName>மெ.பிக்.</displayName>
-				<unitPattern count="one">{0}எம்.பி</unitPattern>
-				<unitPattern count="other">{0}எம்.பி</unitPattern>
+				<displayName>MP</displayName>
+				<unitPattern count="one">{0} MP</unitPattern>
+				<unitPattern count="other">{0} MP</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-centimeter">
-				<unitPattern count="one">{0}பி/செ.மீ</unitPattern>
-				<unitPattern count="other">{0}பி/செ.மீ</unitPattern>
+				<displayName>ppcm</displayName>
+				<unitPattern count="one">{0} ppcm</unitPattern>
+				<unitPattern count="other">{0} ppcm</unitPattern>
 			</unit>
 			<unit type="graphics-pixel-per-inch">
-				<unitPattern count="one">{0}பி/அங்.</unitPattern>
-				<unitPattern count="other">{0}பி/அங்.</unitPattern>
+				<displayName>ppi</displayName>
+				<unitPattern count="one">{0} ppi</unitPattern>
+				<unitPattern count="other">{0} ppi</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-centimeter">
 				<unitPattern count="one">{0}பு/செ.மீ</unitPattern>
 				<unitPattern count="other">{0}பு/செ.மீ</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
-				<unitPattern count="one">{0}பு/அங்.</unitPattern>
-				<unitPattern count="other">{0}பு/அங்.</unitPattern>
+				<displayName>dpi</displayName>
+				<unitPattern count="one">{0} dpi</unitPattern>
+				<unitPattern count="other">{0} dpi</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<unitPattern count="one">{0}புள்ளி</unitPattern>
@@ -8837,30 +8998,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}மி.மீ.</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
-				<displayName>மை.மீ.</displayName>
-				<unitPattern count="one">{0}μமீ.</unitPattern>
-				<unitPattern count="other">{0}μமீ.</unitPattern>
+				<displayName>μm</displayName>
+				<unitPattern count="one">{0} μm</unitPattern>
+				<unitPattern count="other">{0} μm</unitPattern>
 			</unit>
 			<unit type="length-nanometer">
 				<unitPattern count="one">{0}நா.மீ.</unitPattern>
 				<unitPattern count="other">{0}நா.மீ.</unitPattern>
 			</unit>
 			<unit type="length-mile">
-				<displayName>மை.</displayName>
+				<displayName>mi</displayName>
+				<unitPattern count="one">{0} mi</unitPattern>
+				<unitPattern count="other">{0} mi</unitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>அங்.</displayName>
+				<unitPattern count="one">{0}″</unitPattern>
+				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
 			<unit type="length-parsec">
-				<unitPattern count="one">{0}பு.நொ.</unitPattern>
-				<unitPattern count="other">{0}பு.நொ.</unitPattern>
+				<unitPattern count="one">{0} pc</unitPattern>
+				<unitPattern count="other">{0} pc</unitPattern>
 			</unit>
 			<unit type="length-light-year">
 				<displayName>ஒ.ஆ.</displayName>
 			</unit>
 			<unit type="length-astronomical-unit">
-				<unitPattern count="one">{0}வா.அ.</unitPattern>
-				<unitPattern count="other">{0}வா.அ.</unitPattern>
+				<displayName>au</displayName>
+				<unitPattern count="one">{0} au</unitPattern>
+				<unitPattern count="other">{0} au</unitPattern>
 			</unit>
 			<unit type="length-furlong">
 				<unitPattern count="one">{0}பர்</unitPattern>
@@ -8871,8 +9037,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ஃபே.</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
-				<unitPattern count="one">{0}க.மை.</unitPattern>
-				<unitPattern count="other">{0}க.மை.</unitPattern>
+				<displayName>nmi</displayName>
+				<unitPattern count="one">{0} nmi</unitPattern>
+				<unitPattern count="other">{0} nmi</unitPattern>
 			</unit>
 			<unit type="length-point">
 				<unitPattern count="one">{0}அ.பு.</unitPattern>
@@ -8892,8 +9059,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>கே.</displayName>
 			</unit>
 			<unit type="light-lumen">
-				<unitPattern count="one">{0}லூம.</unitPattern>
-				<unitPattern count="other">{0}லூம.</unitPattern>
+				<displayName>lm</displayName>
+				<unitPattern count="one">{0} lm</unitPattern>
+				<unitPattern count="other">{0} lm</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<displayName>L☉</displayName>
@@ -8905,24 +9073,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}ட.</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
+				<displayName>kg</displayName>
 				<unitPattern count="one">{0}கி.கி.</unitPattern>
 				<unitPattern count="other">{0}கி.கி.</unitPattern>
+				<perUnitPattern>{0}/kg</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<displayName>கிராம்</displayName>
 			</unit>
 			<unit type="mass-milligram">
-				<unitPattern count="one">{0}மி.கி.</unitPattern>
-				<unitPattern count="other">{0}மி.கி.</unitPattern>
+				<displayName>mg</displayName>
+				<unitPattern count="one">{0} mg</unitPattern>
+				<unitPattern count="other">{0} mg</unitPattern>
 			</unit>
 			<unit type="mass-microgram">
-				<unitPattern count="one">{0}μகி</unitPattern>
-				<unitPattern count="other">{0}μகி</unitPattern>
+				<displayName>μg</displayName>
+				<unitPattern count="one">{0} μg</unitPattern>
+				<unitPattern count="other">{0} μg</unitPattern>
 			</unit>
 			<unit type="mass-ton">
 				<unitPattern count="one">{0}டன்</unitPattern>
 				<unitPattern count="other">{0}டன்</unitPattern>
 			</unit>
+			<unit type="mass-pound">
+				<displayName>lb</displayName>
+				<perUnitPattern>{0}/lb</perUnitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="one">{0} oz</unitPattern>
+				<unitPattern count="other">{0} oz</unitPattern>
+			</unit>
 			<unit type="mass-ounce-troy">
 				<unitPattern count="one">{0}அவு. டி.</unitPattern>
 				<unitPattern count="other">{0}அவு. டி.</unitPattern>
@@ -8951,49 +9131,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}கிரைன்</unitPattern>
 			</unit>
 			<unit type="power-gigawatt">
-				<unitPattern count="one">{0}கி.வாட்.</unitPattern>
-				<unitPattern count="other">{0}கி.வாட்.</unitPattern>
+				<displayName>GW</displayName>
+				<unitPattern count="one">{0} GW</unitPattern>
+				<unitPattern count="other">{0} GW</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<unitPattern count="one">{0}மெ.வா.</unitPattern>
-				<unitPattern count="other">{0}மெ.வா.</unitPattern>
+				<displayName>MW</displayName>
+				<unitPattern count="one">{0} MW</unitPattern>
+				<unitPattern count="other">{0} MW</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<displayName>kW</displayName>
+				<unitPattern count="one">{0} kW</unitPattern>
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="one">{0} W</unitPattern>
+				<unitPattern count="other">{0} W</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<unitPattern count="one">{0}மி.வா.</unitPattern>
-				<unitPattern count="other">{0}மி.வா.</unitPattern>
+				<displayName>mW</displayName>
+				<unitPattern count="one">{0} mW</unitPattern>
+				<unitPattern count="other">{0} mW</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
-				<unitPattern count="one">{0} கு.வே.</unitPattern>
-				<unitPattern count="other">{0} கு.வே.</unitPattern>
+				<displayName>hp</displayName>
+				<unitPattern count="one">{0} hp</unitPattern>
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<displayName>mmHg</displayName>
+				<unitPattern count="one">{0} mmHg</unitPattern>
+				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>பா. அங்.</displayName>
-				<unitPattern count="one">{0} பா.அங்.</unitPattern>
-				<unitPattern count="other">{0} பா.அங்.</unitPattern>
+				<unitPattern count="one">{0}″ Hg</unitPattern>
+				<unitPattern count="other">{0}″ Hg</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<unitPattern count="one">{0}பார்</unitPattern>
 				<unitPattern count="other">{0}பார்</unitPattern>
 			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="one">{0} mb</unitPattern>
+				<unitPattern count="other">{0} mb</unitPattern>
+			</unit>
 			<unit type="pressure-atmosphere">
 				<unitPattern count="one">{0}atm</unitPattern>
 				<unitPattern count="other">{0}atm</unitPattern>
 			</unit>
 			<unit type="pressure-pascal">
-				<unitPattern count="one">{0}பா.</unitPattern>
-				<unitPattern count="other">{0}பா.</unitPattern>
+				<displayName>Pa</displayName>
+				<unitPattern count="one">{0} Pa</unitPattern>
+				<unitPattern count="other">{0} Pa</unitPattern>
 			</unit>
 			<unit type="pressure-hectopascal">
-				<unitPattern count="one">{0} ஹெ.பா.</unitPattern>
-				<unitPattern count="other">{0} ஹெ.பா.</unitPattern>
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
 			</unit>
 			<unit type="pressure-kilopascal">
-				<unitPattern count="one">{0}கிபா</unitPattern>
-				<unitPattern count="other">{0}கிபா</unitPattern>
+				<displayName>kPa</displayName>
+				<unitPattern count="one">{0} kPa</unitPattern>
+				<unitPattern count="other">{0} kPa</unitPattern>
 			</unit>
 			<unit type="pressure-megapascal">
-				<unitPattern count="one">{0}மெபா</unitPattern>
-				<unitPattern count="other">{0}மெபா</unitPattern>
+				<displayName>MPa</displayName>
+				<unitPattern count="one">{0} MPa</unitPattern>
+				<unitPattern count="other">{0} MPa</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>கி.மீ./ம.</displayName>
@@ -9005,22 +9211,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}நா.</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<unitPattern count="one">பியூ.{0}</unitPattern>
-				<unitPattern count="other">பியூ.{0}</unitPattern>
+				<displayName>Bft</displayName>
+				<unitPattern count="one">B {0}</unitPattern>
+				<unitPattern count="other">B {0}</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>°செ</displayName>
+				<displayName>°C</displayName>
+				<unitPattern count="one">{0}°C</unitPattern>
+				<unitPattern count="other">{0}°C</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>°ஃபா</displayName>
+				<displayName>°F</displayName>
+				<unitPattern count="one">{0}°</unitPattern>
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
 			</unit>
 			<unit type="torque-pound-force-foot">
 				<unitPattern count="one">{0}ப.அடி</unitPattern>
 				<unitPattern count="other">{0}ப.அடி</unitPattern>
 			</unit>
 			<unit type="torque-newton-meter">
-				<unitPattern count="one">{0}நியூ.மீ</unitPattern>
-				<unitPattern count="other">{0}நியூ.மீ</unitPattern>
+				<displayName>N⋅m</displayName>
+				<unitPattern count="one">{0}N⋅m</unitPattern>
+				<unitPattern count="other">{0}N⋅m</unitPattern>
 			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="one">{0} க.கி.மீ.</unitPattern>
@@ -9035,8 +9252,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}செ.மீ.³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
-				<unitPattern count="one">{0} க.மை.</unitPattern>
-				<unitPattern count="other">{0} க.மை.</unitPattern>
+				<displayName>mi³</displayName>
+				<unitPattern count="one">{0} mi³</unitPattern>
+				<unitPattern count="other">{0} mi³</unitPattern>
 			</unit>
 			<unit type="volume-cubic-yard">
 				<unitPattern count="one">{0}யா.³</unitPattern>
@@ -9080,8 +9298,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}மெ.பி.</unitPattern>
 			</unit>
 			<unit type="volume-cup-metric">
-				<unitPattern count="one">{0}மெ.கோ.</unitPattern>
-				<unitPattern count="other">{0}மெ.கோ.</unitPattern>
+				<unitPattern count="one">{0} mc</unitPattern>
+				<unitPattern count="other">{0} mc</unitPattern>
 			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0}ஏக். அடி</unitPattern>
@@ -9163,21 +9381,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}கு. இம்.</unitPattern>
 				<unitPattern count="other">{0}கு. இம்.</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<displayName draft="contributed">கட்</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>கலோரி-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ஒளிவேகம்</displayName>
 				<unitPattern count="one" draft="contributed">{0}ஒ.வே</unitPattern>
 				<unitPattern count="other" draft="contributed">{0}ஒ.வே</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName draft="contributed">பா/பி</displayName>
 				<unitPattern count="one" draft="contributed">{0} பா/பி</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} பா/பி</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>இரவுகள்</displayName>
 				<unitPattern count="one" draft="contributed">{0} இ</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} இ</unitPattern>
-				<perUnitPattern>{0}/இரவு</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/ta_MY.xml b/make/data/cldr/common/main/ta_MY.xml
index f24cc219fb4..78b5b9c0c6c 100644
--- a/make/data/cldr/common/main/ta_MY.xml
+++ b/make/data/cldr/common/main/ta_MY.xml
@@ -49,6 +49,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/ta_SG.xml b/make/data/cldr/common/main/ta_SG.xml
index 5e37f8039e7..e7d800f8602 100644
--- a/make/data/cldr/common/main/ta_SG.xml
+++ b/make/data/cldr/common/main/ta_SG.xml
@@ -49,6 +49,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/te.xml b/make/data/cldr/common/main/te.xml
index cd6d965ae18..8c6003b89d8 100644
--- a/make/data/cldr/common/main/te.xml
+++ b/make/data/cldr/common/main/te.xml
@@ -53,7 +53,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">అజర్బైజాని</language>
 			<language type="az" alt="short">అజెరి</language>
 			<language type="ba">బాష్కిర్</language>
-			<language type="bal">బాలుచి</language>
+			<language type="bal">బలూచి</language>
 			<language type="ban">బాలినీస్</language>
 			<language type="bas">బసా</language>
 			<language type="be">బెలారుషియన్</language>
@@ -168,7 +168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="fa_AF">డారి</language>
 			<language type="fan">ఫాంగ్</language>
 			<language type="fat">ఫాంటి</language>
-			<language type="ff">ఫ్యుల</language>
+			<language type="ff">ఫూలా</language>
 			<language type="fi">ఫిన్నిష్</language>
 			<language type="fil">ఫిలిపినో</language>
 			<language type="fj">ఫిజియన్</language>
@@ -212,7 +212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hak">హక్కా చైనీస్</language>
 			<language type="haw">హవాయియన్</language>
 			<language type="hax">దక్షిణ హైదా</language>
-			<language type="he">హిబ్రూ</language>
+			<language type="he">హీబ్రూ</language>
 			<language type="hi">హిందీ</language>
 			<language type="hi_Latn" alt="variant">హింగ్లీష్</language>
 			<language type="hil">హిలిగెనాన్</language>
@@ -290,6 +290,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">బాఫియ</language>
 			<language type="ksh">కొలోనియన్</language>
 			<language type="ku">కుర్దిష్</language>
+			<language type="ku" menu="core">కర్డిష్</language>
+			<language type="ku" menu="extension">కర్మాంజి</language>
 			<language type="kum">కుమ్యిక్</language>
 			<language type="kut">కుటేనై</language>
 			<language type="kv">కోమి</language>
@@ -425,7 +427,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="prg">ప్రష్యన్</language>
 			<language type="pro">ప్రాచీన ప్రోవెంసాల్</language>
 			<language type="ps">పాష్టో</language>
-			<language type="ps" alt="variant">పుష్టో</language>
 			<language type="pt">పోర్చుగీస్</language>
 			<language type="pt_BR">బ్రెజీలియన్ పోర్చుగీస్</language>
 			<language type="pt_PT">యూరోపియన్ పోర్చుగీస్</language>
@@ -770,7 +771,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="AD">ఆండోరా</territory>
 			<territory type="AE">యునైటెడ్ అరబ్ ఎమిరేట్స్</territory>
 			<territory type="AF">ఆఫ్ఘనిస్తాన్</territory>
-			<territory type="AG">ఆంటిగ్వా మరియు బార్బుడా</territory>
+			<territory type="AG">ఆంటిగ్వా &amp; బార్బుడా</territory>
 			<territory type="AI">ఆంగ్విల్లా</territory>
 			<territory type="AL">అల్బేనియా</territory>
 			<territory type="AM">ఆర్మేనియా</territory>
@@ -783,7 +784,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="AW">అరుబా</territory>
 			<territory type="AX">ఆలాండ్ దీవులు</territory>
 			<territory type="AZ">అజర్బైజాన్</territory>
-			<territory type="BA">బోస్నియా మరియు హెర్జిగోవినా</territory>
+			<territory type="BA">బోస్నియా &amp; హెర్జిగోవినా</territory>
 			<territory type="BB">బార్బడోస్</territory>
 			<territory type="BD">బంగ్లాదేశ్</territory>
 			<territory type="BE">బెల్జియం</territory>
@@ -820,6 +821,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">చైనా</territory>
 			<territory type="CO">కొలంబియా</territory>
 			<territory type="CP">క్లిప్పర్టన్ దీవి</territory>
+			<territory type="CQ">సార్క్</territory>
 			<territory type="CR">కోస్టా రికా</territory>
 			<territory type="CU">క్యూబా</territory>
 			<territory type="CV">కేప్ వెర్డె</territory>
@@ -854,7 +856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="FR">ఫ్రాన్స్‌</territory>
 			<territory type="GA">గేబన్</territory>
 			<territory type="GB">యునైటెడ్ కింగ్‌డమ్</territory>
-			<territory type="GB" alt="short">యు.కె.</territory>
+			<territory type="GB" alt="short">UK</territory>
 			<territory type="GD">గ్రెనడా</territory>
 			<territory type="GE">జార్జియా</territory>
 			<territory type="GF">ఫ్రెంచ్ గియానా</territory>
@@ -872,7 +874,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="GU">గ్వామ్</territory>
 			<territory type="GW">గినియా-బిస్సావ్</territory>
 			<territory type="GY">గయానా</territory>
-			<territory type="HK">హాంకాంగ్ ఎస్ఏఆర్ చైనా</territory>
+			<territory type="HK">హాంకాంగ్ SAR చైనా</territory>
 			<territory type="HK" alt="short">హాంకాంగ్</territory>
 			<territory type="HM">హెర్డ్ దీవి మరియు మెక్‌డొనాల్డ్ దీవులు</territory>
 			<territory type="HN">హోండురాస్</territory>
@@ -899,7 +901,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="KH">కంబోడియా</territory>
 			<territory type="KI">కిరిబాటి</territory>
 			<territory type="KM">కొమొరోస్</territory>
-			<territory type="KN">సెయింట్ కిట్స్ మరియు నెవిస్</territory>
+			<territory type="KN">సెయింట్ కిట్స్ &amp; నెవిస్</territory>
 			<territory type="KP">ఉత్తర కొరియా</territory>
 			<territory type="KR">దక్షిణ కొరియా</territory>
 			<territory type="KW">కువైట్</territory>
@@ -927,7 +929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="ML">మాలి</territory>
 			<territory type="MM">మయన్మార్</territory>
 			<territory type="MN">మంగోలియా</territory>
-			<territory type="MO">మకావ్ ఎస్ఏఆర్ చైనా</territory>
+			<territory type="MO">మకావ్ SAR చైనా</territory>
 			<territory type="MO" alt="short">మకావ్</territory>
 			<territory type="MP">ఉత్తర మరియానా దీవులు</territory>
 			<territory type="MQ">మార్టినీక్</territory>
@@ -941,7 +943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="MY">మలేషియా</territory>
 			<territory type="MZ">మొజాంబిక్</territory>
 			<territory type="NA">నమీబియా</territory>
-			<territory type="NC">క్రొత్త కాలెడోనియా</territory>
+			<territory type="NC">కొత్త కాలెడోనియా</territory>
 			<territory type="NE">నైజర్</territory>
 			<territory type="NF">నార్ఫోక్ దీవి</territory>
 			<territory type="NG">నైజీరియా</territory>
@@ -999,7 +1001,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="SZ">ఈస్వాటిని</territory>
 			<territory type="SZ" alt="variant">స్వాజిల్యాండ్</territory>
 			<territory type="TA">ట్రిస్టన్ డ కన్హా</territory>
-			<territory type="TC">టర్క్స్ మరియు కైకోస్ దీవులు</territory>
+			<territory type="TC">టర్క్స్ &amp; కైకోస్ దీవులు</territory>
 			<territory type="TD">చాద్</territory>
 			<territory type="TF">ఫ్రెంచ్ దక్షిణ ప్రాంతాలు</territory>
 			<territory type="TG">టోగో</territory>
@@ -1018,7 +1020,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="TZ">టాంజానియా</territory>
 			<territory type="UA">ఉక్రెయిన్</territory>
 			<territory type="UG">ఉగాండా</territory>
-			<territory type="UM">సంయుక్త రాజ్య అమెరికా బయట ఉన్న దీవులు</territory>
+			<territory type="UM">U.S. బయట ఉన్న దీవులు</territory>
 			<territory type="UN">యునైటెడ్ నేషన్స్</territory>
 			<territory type="UN" alt="short">యు.ఎన్</territory>
 			<territory type="US">యునైటెడ్ స్టేట్స్</territory>
@@ -1071,35 +1073,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">సంఖ్యాత్మక క్రమబద్ధీకరణ</key>
 			<key type="colStrength">క్రమబద్ధీకరణ సామర్థ్యం</key>
 			<key type="currency">కరెన్సీ</key>
+			<key type="em" draft="contributed">ఎమోజీ ప్రెజెంటేషన్</key>
 			<key type="hc">గంటల పద్ధతి (12 వర్సెస్ 24)</key>
 			<key type="lb">లైన్ బ్రేక్ శైలి</key>
+			<key type="lw" draft="contributed">పదాల మధ్య లైన్ బ్రేక్స్</key>
 			<key type="ms">కొలమాన పద్ధతి</key>
 			<key type="numbers">సంఖ్యలు</key>
+			<key type="ss" draft="contributed">సంక్షిప్తీకరణ తర్వాత వాక్య విరామం</key>
 			<key type="timezone">సమయ మండలి</key>
 			<key type="va">లొకేల్ రూపాంతరం</key>
 			<key type="x">ప్రైవేట్-ఉపయోగం</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">బుద్ధుల క్యాలెండర్‌</type>
+			<type key="calendar" type="buddhist" scope="core" draft="contributed">బుద్ధులు</type>
 			<type key="calendar" type="chinese">చైనీస్ క్యాలెండర్</type>
+			<type key="calendar" type="chinese" scope="core">చైనీస్</type>
 			<type key="calendar" type="coptic">కాప్టిక్ క్యాలెండర్</type>
+			<type key="calendar" type="coptic" scope="core">కాప్టిక్</type>
 			<type key="calendar" type="dangi">దాంగీ క్యాలెండర్</type>
-			<type key="calendar" type="ethiopic">ఎథియోపిక్ క్యాలెండర్</type>
-			<type key="calendar" type="ethiopic-amete-alem">ఎథోపిక్ అమేటే అలెమ్ క్యాలెండర్</type>
+			<type key="calendar" type="dangi" scope="core">దాంగీ</type>
+			<type key="calendar" type="ethiopic">ఇథియోపియన్ క్యాలెండర్</type>
+			<type key="calendar" type="ethiopic" scope="core">ఇథియోపిక్</type>
+			<type key="calendar" type="ethiopic-amete-alem">ఇథియోపియన్ అమెటె ఆలెమ్ క్యాలెండర్</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ఇథియోపిక్ అమటే ఆలెమ్</type>
 			<type key="calendar" type="gregorian">గ్రేగోరియన్ క్యాలెండర్</type>
+			<type key="calendar" type="gregorian" scope="core">గ్రేగోరియన్</type>
 			<type key="calendar" type="hebrew">హీబ్రూ క్యాలెండర్</type>
-			<type key="calendar" type="indian">భారతీయ జాతీయ క్యాలెండర్</type>
+			<type key="calendar" type="hebrew" scope="core">హీబ్రూ</type>
+			<type key="calendar" type="indian">భారతదేశ జాతీయ క్యాలెండర్</type>
+			<type key="calendar" type="indian" scope="core">భారతదేశ జాతీయం</type>
 			<type key="calendar" type="islamic">ఇస్లామిక్ క్యాలెండర్</type>
+			<type key="calendar" type="islamic" scope="core" draft="contributed">ఇస్లామిక్</type>
 			<type key="calendar" type="islamic-civil">ఇస్లామిక్-సివిల్ క్యాలెండర్</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="contributed">ఇస్లామిక్ (సివిల్)</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ఇస్లామిక్ క్యాలెండర్ (సౌదీ అరేబియా)</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">ఇస్లామిక్ క్యాలెండర్</type>
-			<type key="calendar" type="islamic-umalqura" draft="contributed">ఇస్లామిక్ క్యాలెండర్ (ఉమ్ అల్-ఖురా)</type>
+			<type key="calendar" type="islamic-umalqura">ఇస్లామిక్ క్యాలెండర్ (ఉమ్ అల్-ఖురా)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core" draft="contributed">ఇస్లామిక్ (ఉమ్ అల్-ఖురా)</type>
 			<type key="calendar" type="iso8601">ISO-8601 క్యాలెండర్</type>
-			<type key="calendar" type="japanese">జపానీయుల క్యాలెండర్</type>
+			<type key="calendar" type="japanese">జపనీస్ క్యాలెండర్</type>
+			<type key="calendar" type="japanese" scope="core">జపనీస్</type>
 			<type key="calendar" type="persian">పర్షియన్ క్యాలెండర్</type>
+			<type key="calendar" type="persian" scope="core">పర్షియన్</type>
 			<type key="calendar" type="roc">మింగ్యూ క్యాలెండర్</type>
+			<type key="calendar" type="roc" scope="core">మీన్‌గ్వా</type>
 			<type key="cf" type="account">అకౌంటింగ్ కరెన్సీ ఫార్మాట్</type>
+			<type key="cf" type="account" scope="core">అకౌంటింగ్</type>
 			<type key="cf" type="standard">ప్రామాణిక కరెన్సీ ఫార్మాట్</type>
+			<type key="cf" type="standard" scope="core">ప్రామాణికం</type>
 			<type key="colAlternate" type="non-ignorable">చిహ్నాలను క్రమబద్ధీకరించు</type>
 			<type key="colAlternate" type="shifted">చిహ్నాలను విస్మరించడాన్ని క్రమబద్ధీకరించు</type>
 			<type key="colBackwards" type="no">ఉచ్ఛారణలను సాధారణంగా క్రమబద్ధీకరించు</type>
@@ -1109,18 +1131,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">ముందు అప్పర్‌కేస్‌ని క్రమబద్ధీకరించు</type>
 			<type key="colCaseLevel" type="no">కేస్ ఇన్‌సెన్సిటివ్‌ను క్రమబద్ధీకరించు</type>
 			<type key="colCaseLevel" type="yes">కేస్ సెన్సిటివ్‌ని క్రమబద్ధీకరించు</type>
-			<type key="collation" type="big5han">సాంప్రదాయ చైనీస్ క్రమబద్ధీకరణ క్రమం - Big5</type>
 			<type key="collation" type="compat" draft="contributed">మునుపటి క్రమబద్ధీకరణ క్రమం, అనుకూలం</type>
 			<type key="collation" type="dictionary">నిఘంటువు క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="ducet">డిఫాల్ట్ యూనీకోడ్ క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="ducet" scope="core" draft="contributed">డిఫాల్ట్ యూనికోడ్</type>
 			<type key="collation" type="eor" draft="contributed">యురోపియన్ క్రమబద్ధీకరణ నిబంధనలు</type>
-			<type key="collation" type="gb2312han">సరళీకృత చైనీస్ క్రమబద్ధీకరణ క్రమం - GB2312</type>
 			<type key="collation" type="phonebook">ఫోన్‌బుక్ క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="phonetic">ధ్వని ఉచ్ఛారిత క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="pinyin">పిన్‌యిన్ క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="search">సాధారణ-ప్రయోజన శోధన</type>
+			<type key="collation" type="search" scope="core">శోధన</type>
 			<type key="collation" type="searchjl">హాంగుల్ ప్రారంభ హల్లు ద్వారా శోధించు</type>
 			<type key="collation" type="standard">ప్రామాణిక క్రమబద్ధీకరణ క్రమం</type>
+			<type key="collation" type="standard" scope="core">ప్రామాణికం</type>
 			<type key="collation" type="stroke">స్ట్రోక్ క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="traditional">సాంప్రదాయ క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="unihan">రాడికల్-స్ట్రోక్ క్రమబద్ధీకరణ క్రమం</type>
@@ -1136,18 +1159,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">పూర్తి వెడల్పు</type>
 			<type key="d0" type="hwidth">సగం వెడల్పు</type>
 			<type key="d0" type="npinyin">సంఖ్య</type>
+			<type key="em" type="default" scope="core" draft="contributed">డిఫాల్ట్</type>
+			<type key="em" type="emoji" scope="core">ఎమోజీ</type>
+			<type key="em" type="text" scope="core">టెక్స్ట్</type>
 			<type key="hc" type="h11">12 గంటల పద్ధతి (0–11)</type>
+			<type key="hc" type="h11" scope="core" draft="contributed">12 (0–11)</type>
 			<type key="hc" type="h12">12 గంటల పద్ధతి (1–12)</type>
+			<type key="hc" type="h12" scope="core" draft="contributed">12 (1–12)</type>
 			<type key="hc" type="h23">24 గంటల పద్ధతి (0–23)</type>
+			<type key="hc" type="h23" scope="core" draft="contributed">24 (0–23)</type>
 			<type key="hc" type="h24">24 గంటల పద్ధతి (1–24)</type>
+			<type key="hc" type="h24" scope="core" draft="contributed">24 (1–24)</type>
 			<type key="lb" type="loose">అపక్రమ లైన్ బ్రేక్ శైలి</type>
+			<type key="lb" type="loose" scope="core" draft="contributed">అపక్రమం</type>
 			<type key="lb" type="normal">సాధారణ లైన్ బ్రేక్ శైలి</type>
+			<type key="lb" type="normal" scope="core" draft="contributed">సాధారణం</type>
 			<type key="lb" type="strict">క్రమ లైన్ బ్రేక్ శైలి</type>
+			<type key="lb" type="strict" scope="core" draft="contributed">క్రమం</type>
+			<type key="lw" type="breakall" scope="core" draft="contributed">మొత్తం విభజించండి</type>
+			<type key="lw" type="keepall" scope="core" draft="contributed">మొత్తం అలాగే ఉంచండి</type>
+			<type key="lw" type="normal" scope="core" draft="contributed">సాధారణం</type>
+			<type key="lw" type="phrase" scope="core" draft="contributed">పదబంధాలలో అలాగే ఉంచండి</type>
 			<type key="m0" type="bgn">US BGN ట్రాన్స్‌లిటరేషన్</type>
 			<type key="m0" type="ungegn">UN GEGN ట్రాన్స్‌లిటరేషన్</type>
 			<type key="ms" type="metric">మెట్రిక్ పద్ధతి</type>
+			<type key="ms" type="metric" scope="core">మెట్రిక్</type>
 			<type key="ms" type="uksystem">ఇంపీరియల్ కొలమాన పద్ధతి</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">యు.ఎస్. కొలమాన పద్ధతి</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">అరబిక్-ఇండిక్ అంకెలు</type>
 			<type key="numbers" type="arabext">పొడిగించబడిన అరబిక్-ఇండిక్ అంకెలు</type>
 			<type key="numbers" type="armn">ఆర్మేనియన్ సంఖ్యలు</type>
@@ -1192,6 +1232,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">టిబిటన్ అంకెలు</type>
 			<type key="numbers" type="traditional">సాంప్రదాయ సంఖ్యలు</type>
 			<type key="numbers" type="vaii">వాయ్ అంకెలు</type>
+			<type key="ss" type="none" scope="core">ఆఫ్</type>
+			<type key="ss" type="standard" scope="core">ఆన్</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">దశాంశం</measurementSystemName>
@@ -1209,6 +1251,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[\u200C\u200D ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯]</exemplarCharacters>
 		<exemplarCharacters type="index">[అ ఆ ఇ ఈ ఉ ఊ ఋ ౠ ఎ ఏ ఐ ఒ ఓ ఔ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల వ శ ష స హ ళ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0౦ 1౧ 2౨ 3౩ 4౪ 5౫ 6౬ 7౭ 8౮ 9౯]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . '‘’ &quot;“” ( ) \[ \] \{ \} \&amp; #]</exemplarCharacters>
 		<parseLenients scope="general" level="lenient">
 			<parseLenient sample="₹">[₹ {రూ} {రూ.} {Rp} {Rs}₨]</parseLenient>
@@ -1293,11 +1336,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}కి</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}కి</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1313,10 +1362,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh" draft="contributed">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">B E h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">B E h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d, MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d, MMM y G</dateFormatItem>
@@ -1528,10 +1580,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">సాయంత్రం</dayPeriod>
 							<dayPeriod type="night1">రాత్రి</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">ఉ</dayPeriod>
-							<dayPeriod type="pm">సా</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -1605,6 +1653,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} {0}కి</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}కి</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1613,6 +1664,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} {0}కి</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}కి</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1625,6 +1679,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d, MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G, d MMM, y, E</dateFormatItem>
@@ -1969,7 +2026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>నెలలో వారం</displayName>
 			</field>
 			<field type="day">
-				<displayName>దినం</displayName>
+				<displayName>రోజు</displayName>
 				<relative type="-2">మొన్న</relative>
 				<relative type="-1">నిన్న</relative>
 				<relative type="0">ఈ రోజు</relative>
@@ -1984,11 +2041,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} రోజుల క్రితం</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="day-short">
+				<displayName>రోజు</displayName>
+			</field>
 			<field type="day-narrow">
 				<displayName>రోజు</displayName>
 			</field>
 			<field type="dayOfYear">
-				<displayName>సంవత్సరంలో దినం</displayName>
+				<displayName>సంవత్సరంలో రోజు</displayName>
+			</field>
+			<field type="dayOfYear-short">
+				<displayName>సంవత్సరంలో రోజు</displayName>
+			</field>
+			<field type="dayOfYear-narrow">
+				<displayName>సంవత్సరంలో రోజు</displayName>
 			</field>
 			<field type="weekday">
 				<displayName>వారంలో రోజు</displayName>
@@ -2303,7 +2369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0} సమయం</regionFormat>
-			<regionFormat type="daylight">{0} పగటి వెలుతురు సమయం</regionFormat>
+			<regionFormat type="daylight">{0} పగటి కాంతి సమయం</regionFormat>
 			<regionFormat type="standard">{0} ప్రామాణిక సమయం</regionFormat>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>హోనోలులు</exemplarCity>
@@ -2314,7 +2380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>తెలియని నగరం</exemplarCity>
+				<exemplarCity>తెలియని లొకేషన్</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>అండోరా</exemplarCity>
@@ -2443,10 +2509,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>బ్రిస్‌బెయిన్</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity>మకారీ</exemplarCity>
+				<exemplarCity>మకారీ దీవి</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
-				<exemplarCity>లార్డ్ హౌ</exemplarCity>
+				<exemplarCity>లార్డ్ హౌ దీవి</exemplarCity>
 			</zone>
 			<zone type="America/Aruba">
 				<exemplarCity>అరుబా</exemplarCity>
@@ -2632,7 +2698,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>సెయింట్ జాన్స్</exemplarCity>
 			</zone>
 			<zone type="Indian/Cocos">
-				<exemplarCity>కోకోస్</exemplarCity>
+				<exemplarCity>కోకోస్ దీవులు</exemplarCity>
 			</zone>
 			<zone type="Africa/Kinshasa">
 				<exemplarCity>కిన్షాసా</exemplarCity>
@@ -2658,6 +2724,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ఈస్టర్</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>కొయాయ్కె</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>పుంటా అరీనస్</exemplarCity>
 			</zone>
@@ -2689,7 +2758,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>కురాకవో</exemplarCity>
 			</zone>
 			<zone type="Indian/Christmas">
-				<exemplarCity>క్రిస్మస్</exemplarCity>
+				<exemplarCity>క్రిస్మస్ దీవి</exemplarCity>
 			</zone>
 			<zone type="Asia/Nicosia">
 				<exemplarCity>నికోసియా</exemplarCity>
@@ -2707,7 +2776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>బెర్లిన్</exemplarCity>
 			</zone>
 			<zone type="Africa/Djibouti">
-				<exemplarCity>డిజ్బౌటి</exemplarCity>
+				<exemplarCity>జిబూటి</exemplarCity>
 			</zone>
 			<zone type="Europe/Copenhagen">
 				<exemplarCity>కోపెన్హాగన్</exemplarCity>
@@ -2923,10 +2992,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>నోమ్‌పెన్హ్</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ఎండర్బెరీ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
-				<exemplarCity>కాంతోన్</exemplarCity>
+				<exemplarCity>క్యాంటన్ దీవి</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>కిరీటిమాటి</exemplarCity>
@@ -3127,7 +3193,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>నియామే</exemplarCity>
 			</zone>
 			<zone type="Pacific/Norfolk">
-				<exemplarCity>నోర్ఫోక్</exemplarCity>
+				<exemplarCity>నార్ఫక్ దీవి</exemplarCity>
 			</zone>
 			<zone type="Africa/Lagos">
 				<exemplarCity>లాగోస్</exemplarCity>
@@ -3151,7 +3217,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>నియూ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Chatham">
-				<exemplarCity>చాథమ్</exemplarCity>
+				<exemplarCity>చాథమ్ దీవులు</exemplarCity>
 			</zone>
 			<zone type="Pacific/Auckland">
 				<exemplarCity>ఆక్లాండ్</exemplarCity>
@@ -3436,7 +3502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>మిడ్వే</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
-				<exemplarCity>వేక్</exemplarCity>
+				<exemplarCity>వేక్ దీవి</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
 				<exemplarCity>అడాక్</exemplarCity>
@@ -3553,7 +3619,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ఇఫేట్</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wallis">
-				<exemplarCity>వాల్లిస్</exemplarCity>
+				<exemplarCity>వాల్లిస్ &amp; ఫ్యూటునా</exemplarCity>
 			</zone>
 			<zone type="Pacific/Apia">
 				<exemplarCity>ఏపియా</exemplarCity>
@@ -3602,9 +3668,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>పశ్చిమ ఆఫ్రికా సమయం</generic>
-					<standard>పశ్చిమ ఆఫ్రికా ప్రామాణిక సమయం</standard>
-					<daylight>పశ్చిమ ఆఫ్రికా వేసవి సమయం</daylight>
+					<standard>పశ్చిమ ఆఫ్రికా సమయం</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3665,9 +3729,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>ఏపియా సమయం</generic>
-					<standard>ఏపియా ప్రామాణిక సమయం</standard>
-					<daylight>ఏపియా పగటి సమయం</daylight>
+					<generic>సమోవా సమయం</generic>
+					<standard>సమోవా ప్రామాణిక సమయం</standard>
+					<daylight>సమోవా పగటి వెలుతురు సమయం</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -3787,7 +3851,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>బ్రూనే దరుసలామ్ సమయం</standard>
+					<standard>బ్రూనై దారుసలామ్ సమయం</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -3987,6 +4051,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>గయానా సమయం</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>హవాయ్-అల్యూషియన్ ప్రామాణిక సమయం</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>హవాయ్-అల్యూషియన్ సమయం</generic>
@@ -4129,7 +4198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>లార్డ్ హోవ్ సమయం</generic>
 					<standard>లార్డ్ హోవ్ ప్రామాణిక సమయం</standard>
-					<daylight>లార్డ్ హోవ్ పగటి సమయం</daylight>
+					<daylight>లార్డ్ హోవ్ పగటి వెలుతురు సమయం</daylight>
 				</long>
 			</metazone>
 			<metazone type="Macau">
@@ -4244,7 +4313,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<long>
 					<generic>నార్ఫోక్ దీవి సమయం</generic>
 					<standard>నార్ఫోక్ దీవి ప్రామాణిక సమయం</standard>
-					<daylight>నార్ఫోక్ దీవి పగటి సమయం</daylight>
+					<daylight>నార్ఫోక్ దీవి పగటి వెలుతురు సమయం</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
@@ -4335,7 +4404,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>ప్యోంగాంగ్ సమయం</standard>
+					<standard>ఉత్తర కొరియా సమయం</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -4413,9 +4482,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>తైపీ సమయం</generic>
-					<standard>తైపీ ప్రామాణిక సమయం</standard>
-					<daylight>తైపీ పగటి వెలుతురు సమయం</daylight>
+					<generic>తైవాన్ సమయం</generic>
+					<standard>తైవాన్ ప్రామాణిక సమయం</standard>
+					<daylight>తైవాన్ పగటి వెలుతురు సమయం</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -4440,6 +4509,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>చక్ సమయం</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>టర్కీ సమయం</generic>
+					<standard>టర్కీ ప్రామాణిక సమయం</standard>
+					<daylight>టర్కీ వేసవి సమయం</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>తుర్క్‌మెనిస్తాన్ సమయం</generic>
@@ -4602,12 +4678,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="telu">
+			<rationalUsage draft="contributed">never</rationalUsage>
+		</rationalFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4802,8 +4881,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">కెనడియన్ డాలర్‌లు</displayName>
 			</currency>
 			<currency type="CDF">
-				<displayName>కొంగోలిస్ ఫ్రాంక్</displayName>
-				<displayName count="one">కొంగోలిస్ ఫ్రాంక్</displayName>
+				<displayName>కాంగోలీస్ ఫ్రాంక్</displayName>
+				<displayName count="one">కాంగోలీస్ ఫ్రాంక్</displayName>
 				<displayName count="other">కొంగోలిస్ ఫ్రాంక్‌లు</displayName>
 			</currency>
 			<currency type="CHF">
@@ -4820,7 +4899,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>చైనీస్ యువాన్ (ఆఫ్‌షోర్)</displayName>
 			</currency>
 			<currency type="CNY">
-				<displayName>చైనా దేశ యువాన్</displayName>
+				<displayName>చైనీస్ యువాన్</displayName>
+				<displayName count="one">చైనీస్ యువాన్</displayName>
+				<displayName count="other">చైనీస్ యువాన్</displayName>
 			</currency>
 			<currency type="COP">
 				<displayName>కొలంబియన్ పెసో</displayName>
@@ -4888,9 +4969,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">ఇథియోపియన్ బర్‌లు</displayName>
 			</currency>
 			<currency type="EUR">
-				<displayName>యురొ</displayName>
-				<displayName count="one">యురొ</displayName>
-				<displayName count="other">యురోలు</displayName>
+				<displayName>యూరో</displayName>
+				<displayName count="one">యూరో</displayName>
+				<displayName count="other">యూరోలు</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>ఫీజియన్ డాలర్</displayName>
@@ -4934,8 +5015,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="GTQ">
 				<displayName>గ్యుటెమాలన్ క్వెట్‌జల్</displayName>
-				<displayName count="one">గ్యుటెమాలన్ క్వెట్‌జల్</displayName>
-				<displayName count="other">గ్యుటెమాలన్ క్వెట్‌జల్‌లు</displayName>
+				<displayName count="one">గ్వాటెమాలన్ క్వెట్‌జల్</displayName>
+				<displayName count="other">గ్వాటెమాలన్ క్వెట్‌జల్‌లు</displayName>
 			</currency>
 			<currency type="GYD">
 				<displayName>గుయనియాస్ డాలర్</displayName>
@@ -4948,9 +5029,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">హాంకాంగ్ డాలర్‌లు</displayName>
 			</currency>
 			<currency type="HNL">
-				<displayName>హోండురన్ లెమిపిరా</displayName>
-				<displayName count="one">హోండురన్ లెమిపిరా</displayName>
-				<displayName count="other">హోండురన్ లెమిపిరాలు</displayName>
+				<displayName>హోండురన్ లెంపిరా</displayName>
+				<displayName count="one">హోండురన్ లెంపిరా</displayName>
+				<displayName count="other">హోండురన్ లెంపిరాలు</displayName>
 			</currency>
 			<currency type="HRK">
 				<displayName>క్రొయేషియన్ క్యూన</displayName>
@@ -5008,7 +5089,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">జోర్‌డానియన్ దీనార్‌లు</displayName>
 			</currency>
 			<currency type="JPY">
-				<displayName>జపాను దేశ యెన్</displayName>
+				<displayName>జపనీస్ యెన్</displayName>
+				<displayName count="one">జపనీస్ యెన్</displayName>
+				<displayName count="other">జపనీస్ యెన్</displayName>
 			</currency>
 			<currency type="KES">
 				<displayName>కెన్యాన్ షిల్లింగ్</displayName>
@@ -5052,9 +5135,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">ఖజికిస్థాన్ టెంగేలు</displayName>
 			</currency>
 			<currency type="LAK">
-				<displayName>లాటియన్ కిప్</displayName>
-				<displayName count="one">లాటియన్ కిప్</displayName>
-				<displayName count="other">లాటియన్ కిప్‌లు</displayName>
+				<displayName>లావోషన్ కిప్</displayName>
+				<displayName count="one">లావోషన్ కిప్</displayName>
+				<displayName count="other">లావోషన్ కిప్‌లు</displayName>
 			</currency>
 			<currency type="LBP">
 				<displayName>లెబనీస్ పౌండ్</displayName>
@@ -5093,7 +5176,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="MAD">
 				<displayName>మోరోకన్ దిర్హామ్</displayName>
-				<displayName count="one">మోరోకన్ దిర్హామ్</displayName>
+				<displayName count="one">మొరాకన్ దిర్హామ్</displayName>
 				<displayName count="other">మోరోకన్ దిర్హామ్‌లు</displayName>
 			</currency>
 			<currency type="MDL">
@@ -5183,11 +5266,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="NIO">
 				<displayName>నికరగ్యుయన్ కొర్‌డుబు</displayName>
-				<displayName count="one">నికరగ్యుయన్ కొర్‌డుబు</displayName>
+				<displayName count="one">నికరాగ్వన్ కోర్డబా</displayName>
 				<displayName count="other">నికరగ్యుయన్ కొర్‌డుబులు</displayName>
 			</currency>
 			<currency type="NOK">
-				<displayName>నార్వేజీయన్ క్రోన్</displayName>
+				<displayName>నార్వేజియన్ క్రోన్</displayName>
 				<displayName count="one">నార్వేజీయన్ క్రోన్</displayName>
 				<displayName count="other">నార్వేజీయన్ క్రోనర్</displayName>
 			</currency>
@@ -5218,6 +5301,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="PGK">
 				<displayName>పప్యూ న్యూ గ్యినియన్ కినా</displayName>
+				<displayName count="one">ప్యాపువా న్యూ గినియన్ కినా</displayName>
+				<displayName count="other">పప్యూ న్యూ గ్యినియన్ కినా</displayName>
 			</currency>
 			<currency type="PHP">
 				<displayName>ఫిలిప్పిన్ పెసో</displayName>
@@ -5241,12 +5326,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">పరగ్వాయన్ గ్వారనీలు</displayName>
 			</currency>
 			<currency type="QAR">
-				<displayName>క్వాటరి రీయల్</displayName>
-				<displayName count="one">క్వాటరి రీయల్</displayName>
-				<displayName count="other">క్వాటరి రీయల్‌లు</displayName>
+				<displayName>ఖతారి రియాల్</displayName>
+				<displayName count="one">ఖతారి రియాల్</displayName>
+				<displayName count="other">ఖతారి రియాల్‌లు</displayName>
 			</currency>
 			<currency type="RON">
-				<displayName>రోమానియాన్ లెయు</displayName>
+				<displayName>రొమేనియన్ లెయు</displayName>
 				<displayName count="one">రోమానియాన్ లెయు</displayName>
 				<displayName count="other">రోమానియాన్ లీ</displayName>
 			</currency>
@@ -5336,9 +5421,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రాలు</displayName>
 			</currency>
 			<currency type="SYP">
-				<displayName>సిరీయన్ పౌండ్</displayName>
-				<displayName count="one">సిరీయన్ పౌండ్</displayName>
-				<displayName count="other">సిరీయన్ పౌండ్‌లు</displayName>
+				<displayName>సిరియన్ పౌండ్</displayName>
+				<displayName count="one">సిరియన్ పౌండ్</displayName>
+				<displayName count="other">సిరియన్ పౌండ్‌లు</displayName>
 			</currency>
 			<currency type="SZL">
 				<displayName>స్వాజి లిలాన్గేని</displayName>
@@ -5366,7 +5451,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>టోంగాన్ పాంʻగా</displayName>
 			</currency>
 			<currency type="TRY">
-				<displayName>టర్కిస్ లీరా</displayName>
+				<displayName>టర్కిష్ లీరా</displayName>
+				<displayName count="one">టర్కిష్ లీరా</displayName>
+				<displayName count="other">టర్కిష్ లీరా</displayName>
 			</currency>
 			<currency type="TTD">
 				<displayName>ట్రినిడాడ్ మరియు టొబాగో డాలర్</displayName>
@@ -5385,9 +5472,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">టాంజానియన్ షిల్లింగ్‌లు</displayName>
 			</currency>
 			<currency type="UAH">
-				<displayName>ఉక్రయినియన్ హ్రివ్‌నియా</displayName>
-				<displayName count="one">ఉక్రయినియన్ హ్రివ్‌నియా</displayName>
-				<displayName count="other">ఉక్రయినియన్ హ్రివ్‌నియాలు</displayName>
+				<displayName>ఉక్రేనియన్ హ్రివ్నియా</displayName>
+				<displayName count="one">ఉక్రేనియన్ హ్రివ్నియా</displayName>
+				<displayName count="other">ఉక్రేనియన్ హ్రివ్నియాలు</displayName>
 			</currency>
 			<currency type="UGX">
 				<displayName>ఉగాండన్ షిల్లింగ్</displayName>
@@ -5445,6 +5532,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">తూర్పు కరీబియన్ డాలర్</displayName>
 				<displayName count="other">తూర్పు కరీబియన్ డాలర్‌లు</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>కరీబియన్ గిల్‌డర్</displayName>
+				<displayName count="one">కరీబియన్ గిల్‌డర్</displayName>
+				<displayName count="other">కరీబియన్ గిల్‌డర్‌లు</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>పశ్చిమ ఆఫ్రికన్ సిఏఫ్ఏ ఫ్రాంక్</displayName>
 				<displayName count="one">పశ్చిమ ఆఫ్రికన్ సిఏఫ్ఏ ఫ్రాంక్</displayName>
@@ -5465,7 +5557,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="YER">
 				<displayName>ఎమునీ రీయల్</displayName>
-				<displayName count="one">ఎమునీ రీయల్</displayName>
+				<displayName count="one">యెమనీ రియాల్</displayName>
 				<displayName count="other">ఎమునీ రీయల్‌లు</displayName>
 			</currency>
 			<currency type="ZAR">
@@ -5479,6 +5571,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">జాంబియన్ క్వాచా</displayName>
 				<displayName count="other">జాంబియన్ క్వాచాలు</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>జింబాబ్వేయన్ గోల్డ్</displayName>
+				<displayName count="one">జింబాబ్వేయన్ గోల్డ్</displayName>
+				<displayName count="other">జింబాబ్వేయన్ గోల్డ్</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5705,7 +5802,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ఐటమ్</unitPattern>
 				<unitPattern count="other">{0} ఐటమ్‌లు</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>పార్ట్‌లు</displayName>
+				<unitPattern count="one" draft="contributed">{0} పార్ట్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} పార్ట్‌లు</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0} భాగం/మిలియన్</unitPattern>
 				<unitPattern count="other">{0} భాగాలు/మిలియన్</unitPattern>
 			</unit>
@@ -5726,6 +5828,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} మోల్</unitPattern>
 				<unitPattern count="other">{0} మోల్‌లు</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">గ్లూకోజ్</displayName>
+				<unitPattern count="one" draft="contributed">{0} గ్లూకోజ్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} గ్లూకోజ్</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>లీటర్లు/కిలోమీటరు</displayName>
 				<unitPattern count="one">{0} లీటరు/కిలోమీటరు</unitPattern>
@@ -6218,6 +6325,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} మిల్లీమీటర్ పాదరసం</unitPattern>
 				<unitPattern count="other">{0} మిల్లీమీటర్ల పాదరసం</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">పాదరసం</displayName>
+				<unitPattern count="one" draft="contributed">{0} పాదరసం</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} పాదరసం</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>చదరపు అంగుళానికి పౌండ్లు</displayName>
 				<unitPattern count="one">చదరపు అంగుళానికి {0} పౌండు</unitPattern>
@@ -6389,6 +6501,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} మెట్రిక్ కప్పు</unitPattern>
 				<unitPattern count="other">{0} మెట్రిక్ కప్పులు</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">మెట్రిక్ ఫ్లూయిడ్ ఔన్స్‌లు</displayName>
+				<unitPattern count="one" draft="contributed">{0} మెట్రిక్ ఫ్లూయిడ్ ఔన్స్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} మెట్రిక్ ఫ్లూయిడ్ ఔన్స్‌లు</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ఎకరా-అడుగులు</displayName>
 				<unitPattern count="one">{0} ఎకరా-అడుగు</unitPattern>
@@ -6450,7 +6567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} బారెల్‌లు</unitPattern>
 			</unit>
 			<unit type="volume-dessert-spoon">
-				<displayName>డెసర్ట్ స్పూన్</displayName>
+				<displayName>డెజర్ట్ స్పూన్‌లు</displayName>
 				<unitPattern count="one">{0} డెసర్ట్ స్పూన్</unitPattern>
 				<unitPattern count="other">{0} డెసర్ట్ స్పూన్</unitPattern>
 			</unit>
@@ -6460,29 +6577,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ఇంపీరియల్ డెసర్ట్ స్పూన్</unitPattern>
 			</unit>
 			<unit type="volume-dram">
-				<displayName>డ్రామ్</displayName>
+				<displayName>డ్రామ్‌లు</displayName>
 				<unitPattern count="one">{0} డ్రామ్</unitPattern>
-				<unitPattern count="other">{0} డ్రామ్</unitPattern>
+				<unitPattern count="other">{0} డ్రామ్‌లు</unitPattern>
 			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>ఇంపీరియల్ చతుర్ధాంశం</displayName>
 				<unitPattern count="one">{0} ఇంపీరియల్ చతుర్ధాంశం</unitPattern>
 				<unitPattern count="other">{0} ఇంపీరియల్ చతుర్ధాంశం</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>లైట్</displayName>
-				<unitPattern count="one">{0} లైట్</unitPattern>
-				<unitPattern count="other">{0} లైట్</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>స్టెరేడియన్‌లు</displayName>
+				<unitPattern count="one">{0} స్టెరేడియన్</unitPattern>
+				<unitPattern count="other">{0} స్టెరేడియన్‌లు</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName draft="contributed">క్యాటల్‌లు</displayName>
+				<unitPattern count="one" draft="contributed">{0} క్యాటల్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} క్యాటల్‌లు</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">కూలంబ్స్</displayName>
+				<unitPattern count="one" draft="contributed">{0} కూలంబ్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} కూలంబ్స్</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">ఫారెడ్స్</displayName>
+				<unitPattern count="one" draft="contributed">{0} ఫారెడ్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ఫారెడ్స్</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">హెన్రీస్</displayName>
+				<unitPattern count="one" draft="contributed">{0} హెన్రీ</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} హెన్రీస్</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">సీమెన్స్</displayName>
+				<unitPattern count="one" draft="contributed">{0} సీమెన్స్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} సీమెన్స్</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">క్యాలరీలు [IT]</displayName>
+				<unitPattern count="one" draft="contributed">{0} క్యాలరీ [IT]</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} క్యాలరీలు [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="contributed">బెకారెల్స్</displayName>
+				<unitPattern count="one" draft="contributed">{0} బెకారెల్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} బెకారెల్‌లు</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="contributed">సీవర్ట్స్</displayName>
+				<unitPattern count="one" draft="contributed">{0} సీవర్ట్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} సీవర్ట్స్</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="contributed">గ్రేస్</displayName>
+				<unitPattern count="one" draft="contributed">{0} గ్రే</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} గ్రేస్</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="contributed">కిలోగ్రామ్‌లు-బలం</displayName>
+				<unitPattern count="one" draft="contributed">{0} కిలోగ్రామ్-బలం</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} కిలోగ్రామ్‌లు-బలం</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">టెస్లాలు</displayName>
+				<unitPattern count="one" draft="contributed">{0} టెస్లా</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} టెస్లాలు</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">వెబర్‌లు</displayName>
+				<unitPattern count="one" draft="contributed">{0} వెబర్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} వెబర్‌లు</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ప్రతి బిలియన్‌కి భాగాలు</displayName>
 				<unitPattern count="one">ప్రతి బిలియన్‌కి {0} భాగం</unitPattern>
 				<unitPattern count="other">ప్రతి బిలియన్‌కి {0} భాగాలు</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>రాత్రి</displayName>
-				<unitPattern count="one">{0} రాత్రి</unitPattern>
-				<unitPattern count="other">{0} రాత్రులు</unitPattern>
 				<perUnitPattern>ఒక రాత్రికి {0}</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6506,9 +6680,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p-6">
 				<unitPrefixPattern>మై.{0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="10p-9">
-				<unitPrefixPattern>నా.{0}</unitPrefixPattern>
-			</compoundUnit>
 			<compoundUnit type="10p-15">
 				<unitPrefixPattern>ఫె{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -6694,7 +6865,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ఐటమ్</unitPattern>
 				<unitPattern count="other">{0} ఐటమ్</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>పార్ట్</displayName>
+				<unitPattern count="one" draft="contributed">{0} పార్ట్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} పార్ట్</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>భాగాలు/మిలియన్</displayName>
 				<unitPattern count="one">{0} భా./మి.</unitPattern>
 				<unitPattern count="other">{0} భా./మి.</unitPattern>
@@ -6711,6 +6887,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>మోల్</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glc</displayName>
+				<unitPattern count="one" draft="contributed">{0} Glc</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>లీటర్లు/కి.మీ</displayName>
 				<unitPattern count="one">{0} లీ./కి.మీ</unitPattern>
@@ -7207,6 +7388,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} మిమీ. పాద</unitPattern>
 				<unitPattern count="other">{0} మిమీ. పాద</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one" draft="contributed">{0} Hg</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>పౌ/చ.అం</displayName>
 				<unitPattern count="one">{0} పౌ/చ.అం</unitPattern>
@@ -7368,6 +7553,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}/మె.క.</unitPattern>
 				<unitPattern count="other">{0}/మె.క.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one" draft="contributed">{0} fl oz m.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ఎ.అ.</displayName>
 				<unitPattern count="one">{0} ఎ.అ.</unitPattern>
@@ -7460,12 +7649,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} చతు. ఇంపీరియల్</unitPattern>
 				<unitPattern count="other">{0} చతు. ఇంపీరియల్</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one" draft="contributed">{0} sr</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one" draft="contributed">{0} kat</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one" draft="contributed">{0} C</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one" draft="contributed">{0} H</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one" draft="contributed">{0} S</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
+				<unitPattern count="one" draft="contributed">{0} cal-IT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one" draft="contributed">{0} Bq</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one" draft="contributed">{0} Sv</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one" draft="contributed">{0} Gy</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one" draft="contributed">{0} kgf</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>లైట్</displayName>
 				<unitPattern count="one">{0} లైట్</unitPattern>
 				<unitPattern count="other">{0} లైట్</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>భాగాలు/బిలియన్</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7496,7 +7738,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPrefixPattern>మై{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-9">
-				<unitPrefixPattern>నా{0}</unitPrefixPattern>
+				<unitPrefixPattern>n{0}</unitPrefixPattern>
 			</compoundUnit>
 			<compoundUnit type="10p-12">
 				<unitPrefixPattern>పి{0}</unitPrefixPattern>
@@ -7596,6 +7838,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ఐటమ్</unitPattern>
 				<unitPattern count="other">{0}ఐటమ్</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>పార్ట్</displayName>
+				<unitPattern count="one" draft="contributed">{0} పార్ట్</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} పార్ట్</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
@@ -7606,6 +7853,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} మోల్</unitPattern>
 				<unitPattern count="other">{0} మోల్</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName draft="contributed">Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>లీ/100కి.మీ.</displayName>
 				<unitPattern count="one">{0}లీ/100కి.మీ.</unitPattern>
@@ -7798,8 +8048,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}లీ</unitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
-				<unitPattern count="one">{0}గ్యా. ఇం.</unitPattern>
-				<unitPattern count="other">{0}గ్యా. ఇం.</unitPattern>
+				<unitPattern count="one">{0}gal-Im</unitPattern>
+				<unitPattern count="other">{0}gal-Im</unitPattern>
 			</unit>
 			<unit type="volume-quart">
 				<unitPattern count="one">{0}పావు వం.</unitPattern>
@@ -7825,16 +8075,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}చతు.ఇం.</unitPattern>
 				<unitPattern count="other">{0}చతు.ఇం.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>లైట్</displayName>
-				<unitPattern count="one">{0} లైట్</unitPattern>
-				<unitPattern count="other">{0} లైట్</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName draft="contributed">cal-IT</displayName>
 			</unit>
 			<unit type="duration-night">
-				<displayName>రాత్రులు</displayName>
 				<unitPattern count="one">{0}రాత్రి</unitPattern>
 				<unitPattern count="other">{0}రాత్రులు</unitPattern>
-				<perUnitPattern>రాత్రికి {0}</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/tg.xml b/make/data/cldr/common/main/tg.xml
index 99d34be7f21..2538ce1db16 100644
--- a/make/data/cldr/common/main/tg.xml
+++ b/make/data/cldr/common/main/tg.xml
@@ -452,6 +452,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Хитой</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">Ҷазираи Клиппертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -674,10 +675,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 		<types>
 			<type key="calendar" type="gregorian">Тақвими грегорианӣ</type>
+			<type key="calendar" type="gregorian" scope="core">Грегорианӣ</type>
 			<type key="calendar" type="islamic-civil">Тақвими ҳиҷрӣ (ҷадвал, давраи шаҳрвандӣ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Ҳиҷрӣ (ҷадвалӣ, давраи шаҳрвандӣ)</type>
 			<type key="calendar" type="islamic-tbla">Тақвими ҳиҷрӣ (ҷадвал, давраи ситорашиносӣ)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Ҳиҷрӣ (ҷадвал, давраи ситорашиносӣ)</type>
 			<type key="calendar" type="iso8601">Тақвими ISO-8601</type>
 			<type key="collation" type="standard">Тартиби мураттабсозии стандартӣ</type>
+			<type key="collation" type="standard" scope="core">Стандартӣ</type>
 			<type key="numbers" type="arab">Рақамҳои ҳинду-арабӣ</type>
 			<type key="numbers" type="latn">Рақамҳои ғарбӣ</type>
 		</types>
@@ -722,7 +727,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>dd/MM/yy GGGGG</pattern>
+							<pattern>d.MM.y G</pattern>
 							<datetimeSkeleton>GGGGGyyMMdd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -735,6 +740,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'соати' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'соати' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -743,6 +751,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'соати' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'соати' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -751,6 +762,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -759,28 +773,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d.MM.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.MM.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Md">dd-MM</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd-MM</dateFormatItem>
+						<dateFormatItem id="Md">MM/d</dateFormatItem>
+						<dateFormatItem id="MEd">E, MM/d</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
 						<dateFormatItem id="y">y G</dateFormatItem>
 						<dateFormatItem id="yyyy">y G</dateFormatItem>
 						<dateFormatItem id="yyyyM">MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMd">d-MM-y GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">E, d-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="yyyyMd">d.MM.y G</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">E, d.MM.y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">E, d MMM y G</dateFormatItem>
@@ -789,7 +807,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yyyyQQQQ">QQQQ y G</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="Bh">
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
@@ -805,21 +822,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M/y GGGGG – M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">MM/y G – MM/y G</greatestDifference>
+							<greatestDifference id="M">MM/y – MM/y G</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G">M/d/y GGGGG – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">d.MM.y – d.MM.y G</greatestDifference>
+							<greatestDifference id="G">d.MM.y G – d.MM.y G</greatestDifference>
+							<greatestDifference id="M">d.MM.y – d.MM.y G</greatestDifference>
+							<greatestDifference id="y">d.MM.y – d.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="G">E, M/d/y GGGGG – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d.MM.y – E, d.MM.y G</greatestDifference>
+							<greatestDifference id="G">E, d.MM.y G – E, d.MM.y G</greatestDifference>
+							<greatestDifference id="M">E, d.MM.y – E, d.MM.y G</greatestDifference>
+							<greatestDifference id="y">E, d.MM.y – E, d.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
@@ -827,72 +844,73 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">MMM d – d, y G</greatestDifference>
-							<greatestDifference id="G">MMM d, y G – MMM d, y G</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d, y G</greatestDifference>
-							<greatestDifference id="y">MMM d, y – MMM d, y G</greatestDifference>
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="G">d MMM y G – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="G">E, MMM d, y G – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G">E, d MMM y G – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">M – M</greatestDifference>
+							<greatestDifference id="M">MM – MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d – M/d</greatestDifference>
-							<greatestDifference id="M">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">d/MM – d/MM</greatestDifference>
+							<greatestDifference id="M">d/MM – d/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
-							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
+							<greatestDifference id="d">E, d/MM – E, d/MM</greatestDifference>
+							<greatestDifference id="M">E, d/MM – E, d/MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d – d</greatestDifference>
+							<greatestDifference id="d">MMM d – d</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y – y G</greatestDifference>
+							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/y – M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/y – M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">MM/y – MM/y G</greatestDifference>
+							<greatestDifference id="y">MM/y – MM/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">d.MM.y – d.MM.y G</greatestDifference>
+							<greatestDifference id="M">d.MM.y – d.MM.y G</greatestDifference>
+							<greatestDifference id="y">d.MM.y – d.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d.MM.y – E, d.MM.y G</greatestDifference>
+							<greatestDifference id="M">E, d.MM.y – E, d.MM.y G</greatestDifference>
+							<greatestDifference id="y">E, d.MM.y – E, d.MM.y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d – d, y G</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d, y G</greatestDifference>
-							<greatestDifference id="y">MMM d, y – MMM d, y G</greatestDifference>
+							<greatestDifference id="d">d – d MMM y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y G</greatestDifference>
+							<greatestDifference id="y">d MMM y – d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM – MMMM'и' y G</greatestDifference>
-							<greatestDifference id="y">MMMM'и' y – MMMM'и' y G</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
+							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -1088,6 +1106,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">y-MM G</dateFormatItem>
+						<dateFormatItem id="GyMd">y-MM-dd G</dateFormatItem>
+						<dateFormatItem id="GyMEd">y-MM-dd G, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
@@ -2131,6 +2152,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Истер</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Койҳайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта Аренас</exemplarCity>
 			</zone>
@@ -2395,7 +2419,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Пномпен</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3065,9 +3089,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Вақти Африқои Ғарбӣ</generic>
-					<standard>Вақти стандартии Африқои Ғарбӣ</standard>
-					<daylight>Вақти тобистонаи Африқои Ғарбӣ</daylight>
+					<standard>Вақти Африқои Ғарбӣ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3417,6 +3439,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Вақти Гайана</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Вақти стандартии Ҳавайӣ-Алеутӣ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Вақти Ҳавайӣ-Алеутӣ</generic>
@@ -3956,23 +3983,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0 ҳазор</pattern>
-					<pattern type="10000" count="other">¤00 ҳазор</pattern>
-					<pattern type="100000" count="other">¤000 ҳазор</pattern>
-					<pattern type="1000000" count="other">¤0 млн</pattern>
-					<pattern type="10000000" count="other">¤00 млн</pattern>
-					<pattern type="100000000" count="other">¤000 млн</pattern>
+					<pattern type="1000" count="other">0 ҳзр'.' ¤</pattern>
+					<pattern type="10000" count="other">00 ҳзр'.' ¤</pattern>
+					<pattern type="100000" count="other">000 ҳзр'.' ¤</pattern>
+					<pattern type="1000000" count="other">0 млн'.' ¤</pattern>
+					<pattern type="10000000" count="other">00 млн'.' ¤</pattern>
+					<pattern type="100000000" count="other">000 млн'.' ¤</pattern>
 					<pattern type="1000000000" count="other">0 млрд'.' ¤</pattern>
 					<pattern type="10000000000" count="other">00 млрд'.' ¤</pattern>
 					<pattern type="100000000000" count="other">000 млрд'.' ¤</pattern>
@@ -4593,6 +4633,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Доллари Кариби Шарқӣ</displayName>
 				<displayName count="other">доллари Кариби Шарқӣ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>гулдени Кариб</displayName>
+				<displayName count="other">гулдени Кариб</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Франки Африқои Ғарбӣ</displayName>
 				<displayName count="other">франки Африқои Ғарбӣ</displayName>
@@ -4617,6 +4661,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Квачаи Замбия</displayName>
 				<displayName count="other">квачаи Замбия</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>тиллоии Зимбабве</displayName>
+				<displayName count="other">тиллоии Зимбабве</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
diff --git a/make/data/cldr/common/main/th.xml b/make/data/cldr/common/main/th.xml
index ea1a00e3d0f..f5a89b75752 100644
--- a/make/data/cldr/common/main/th.xml
+++ b/make/data/cldr/common/main/th.xml
@@ -331,6 +331,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">บาเฟีย</language>
 			<language type="ksh">โคโลญ</language>
 			<language type="ku">เคิร์ด</language>
+			<language type="ku" menu="core">เคิร์ด</language>
+			<language type="ku" menu="extension">กุรมันชี</language>
 			<language type="kum">คูมืยค์</language>
 			<language type="kut">คูเทไน</language>
 			<language type="kv">โกมิ</language>
@@ -939,6 +941,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">จีน</territory>
 			<territory type="CO">โคลอมเบีย</territory>
 			<territory type="CP">เกาะคลิปเปอร์ตัน</territory>
+			<territory type="CQ">ซาร์ก</territory>
 			<territory type="CR">คอสตาริกา</territory>
 			<territory type="CU">คิวบา</territory>
 			<territory type="CV">เคปเวิร์ด</territory>
@@ -1245,35 +1248,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">การจัดเรียงตัวเลข</key>
 			<key type="colStrength">ความแม่นยำในการจัดเรียง</key>
 			<key type="currency">สกุลเงิน</key>
+			<key type="em">การแสดงอีโมจิ</key>
 			<key type="hc">วงจรชั่วโมง (เทียบ 12 และ 24)</key>
 			<key type="lb">รูปแบบการขึ้นบรรทัดใหม่</key>
+			<key type="lw">การขึ้นบรรทัดใหม่ภายในคำ</key>
 			<key type="ms">ระบบการวัด</key>
 			<key type="numbers">ตัวเลข</key>
+			<key type="ss">การตัดประโยคหลังจากคำย่อ</key>
 			<key type="timezone">เขตเวลา</key>
 			<key type="va">ตัวแปรภาษาถิ่น</key>
 			<key type="x">ใช้งานส่วนบุคคล</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ปฏิทินพุทธ</type>
+			<type key="calendar" type="buddhist" scope="core">พุทธ</type>
 			<type key="calendar" type="chinese">ปฏิทินจีน</type>
+			<type key="calendar" type="chinese" scope="core">จีน</type>
 			<type key="calendar" type="coptic">ปฏิทินคอปติก</type>
+			<type key="calendar" type="coptic" scope="core">คอปติก</type>
 			<type key="calendar" type="dangi">ปฏิทินเกาหลี</type>
+			<type key="calendar" type="dangi" scope="core">เกาหลี</type>
 			<type key="calendar" type="ethiopic">ปฏิทินเอธิโอเปีย</type>
+			<type key="calendar" type="ethiopic" scope="core">เอธิโอเปีย</type>
 			<type key="calendar" type="ethiopic-amete-alem">ปฏิทินปีโลกเอธิโอเปีย</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ปีโลกเอธิโอเปีย</type>
 			<type key="calendar" type="gregorian">ปฏิทินเกรกอเรียน</type>
+			<type key="calendar" type="gregorian" scope="core">เกรกอเรียน</type>
 			<type key="calendar" type="hebrew">ปฏิทินฮิบรู</type>
+			<type key="calendar" type="hebrew" scope="core">ฮิบรู</type>
 			<type key="calendar" type="indian">ปฏิทินแห่งชาติอินเดีย</type>
 			<type key="calendar" type="islamic">ปฏิทินอิสลาม</type>
+			<type key="calendar" type="islamic" scope="core">อิสลาม</type>
 			<type key="calendar" type="islamic-civil">ปฏิทินอิสลามซีวิล</type>
+			<type key="calendar" type="islamic-civil" scope="core">อิสลามซีวิล</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">ปฏิทินอิสลาม (ซาอุดีอาระเบีย แบบพระจันทร์เสี้ยว)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">ปฏิทินอิสลาม (แบบตาราง สมัยดาราศาสตร์)</type>
 			<type key="calendar" type="islamic-umalqura">ปฏิทินอิสลาม (อุมม์อัลกุรา)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">อิสลาม (อุมม์อัลกุรา)</type>
 			<type key="calendar" type="iso8601">ปฏิทิน ISO-8601</type>
 			<type key="calendar" type="japanese">ปฏิทินญี่ปุ่น</type>
+			<type key="calendar" type="japanese" scope="core">ญี่ปุ่น</type>
 			<type key="calendar" type="persian">ปฏิทินเปอร์เชีย</type>
+			<type key="calendar" type="persian" scope="core">เปอร์เชีย</type>
 			<type key="calendar" type="roc">ปฏิทินไต้หวัน</type>
+			<type key="calendar" type="roc" scope="core">ไต้หวัน</type>
 			<type key="cf" type="account">รูปแบบสกุลเงินบัญชี</type>
+			<type key="cf" type="account" scope="core">บัญชี</type>
 			<type key="cf" type="standard">รูปแบบสกุลเงินมาตรฐาน</type>
+			<type key="cf" type="standard" scope="core">มาตรฐาน</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">จัดเรียงสัญลักษณ์</type>
 			<type key="colAlternate" type="shifted" draft="contributed">จัดเรียงสัญลักษณ์ที่ละไว้</type>
 			<type key="colBackwards" type="no" draft="contributed">จัดเรียงเสียงหนักเบาตามปกติ</type>
@@ -1283,22 +1305,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">จัดเรียงตัวพิมพ์ใหญ่ก่อน</type>
 			<type key="colCaseLevel" type="no" draft="contributed">จัดเรียงตามความสำคัญของตัวพิมพ์</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">จัดเรียงความสำคัญของตัวพิมพ์</type>
-			<type key="collation" type="big5han">ลำดับการจัดเรียงตามอักษรจีนดั้งเดิม</type>
 			<type key="collation" type="compat">ลำดับการจัดเรียงก่อนหน้านี้ ตามความเหมาะสม</type>
+			<type key="collation" type="compat" scope="core">ความเหมาะสม</type>
 			<type key="collation" type="dictionary">ลำดับการจัดเรียงตามพจนานุกรม</type>
+			<type key="collation" type="dictionary" scope="core">พจนานุกรม</type>
 			<type key="collation" type="ducet">ลำดับการจัดเรียงตาม Unicode เริ่มต้น</type>
+			<type key="collation" type="ducet" scope="core">Unicode เริ่มต้น</type>
 			<type key="collation" type="eor" draft="contributed">กฎการเรียงลำดับตามแบบยุโรป</type>
-			<type key="collation" type="gb2312han">ลำดับการจัดเรียงตามอักษรจีนประยุกต์</type>
 			<type key="collation" type="phonebook">ลำดับการจัดเรียงตามสมุดโทรศัพท์</type>
+			<type key="collation" type="phonebook" scope="core">สมุดโทรศัพท์</type>
 			<type key="collation" type="phonetic">ลำดับการจัดเรียงตามการออกเสียง</type>
+			<type key="collation" type="phonetic" scope="core">การออกเสียง</type>
 			<type key="collation" type="pinyin">ลำดับการจัดเรียงตามการถอดเสียงภาษาจีน</type>
+			<type key="collation" type="pinyin" scope="core">การถอดเสียงภาษาจีน</type>
 			<type key="collation" type="search">การค้นหาทั่วไป</type>
+			<type key="collation" type="search" scope="core">การค้นหา</type>
 			<type key="collation" type="searchjl" draft="contributed">ค้นหาตามพยัญชนะขึ้นต้นที่เป็นฮันกึล</type>
 			<type key="collation" type="standard">ลำดับการจัดเรียงแบบมาตรฐาน</type>
+			<type key="collation" type="standard" scope="core">มาตรฐาน</type>
 			<type key="collation" type="stroke">ลำดับการจัดเรียงตามการลากเส้น</type>
+			<type key="collation" type="stroke" scope="core">การลากเส้น</type>
 			<type key="collation" type="traditional">ลำดับการจัดเรียงตามแบบดั้งเดิม</type>
+			<type key="collation" type="traditional" scope="core">ดั้งเดิม</type>
 			<type key="collation" type="unihan">ลำดับการจัดเรียงตามจำนวนขีด</type>
+			<type key="collation" type="unihan" scope="core">จำนวนขีด</type>
 			<type key="collation" type="zhuyin">ลำดับการจัดเรียงตามการสะกดแบบจู้อิน</type>
+			<type key="collation" type="zhuyin" scope="core">การสะกดแบบจู้อิน</type>
 			<type key="colNormalization" type="no" draft="contributed">จัดเรียงโดยไม่ต้องทำให้เป็นแบบปกติ</type>
 			<type key="colNormalization" type="yes" draft="contributed">จัดเรียงยูนิโค้ดแบบที่เป็นปกติ</type>
 			<type key="colNumeric" type="no" draft="contributed">จัดเรียงตัวเลขแยก</type>
@@ -1311,18 +1343,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ตัวเต็ม</type>
 			<type key="d0" type="hwidth">ตัวย่อ</type>
 			<type key="d0" type="npinyin" draft="contributed">ตัวเลข</type>
+			<type key="em" type="default" scope="core">ค่าเริ่มต้น</type>
+			<type key="em" type="emoji" scope="core">อีโมจิ</type>
+			<type key="em" type="text" scope="core">ข้อความ</type>
 			<type key="hc" type="h11">ระบบ 12 ชั่วโมง (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">ระบบ 12 ชั่วโมง (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">ระบบ 24 ชั่วโมง (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">ระบบ 24 ชั่วโมง (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">รูปแบบที่ยืดหยุ่นของการขึ้นบรรทัดใหม่</type>
+			<type key="lb" type="loose" scope="core">ยืดหยุ่น</type>
 			<type key="lb" type="normal">รูปแบบปกติของการขึ้นบรรทัดใหม่</type>
+			<type key="lb" type="normal" scope="core">ปกติ</type>
 			<type key="lb" type="strict">รูปแบบที่เคร่งครัดของการขึ้นบรรทัดใหม่</type>
+			<type key="lb" type="strict" scope="core">เคร่งครัด</type>
+			<type key="lw" type="breakall" scope="core">ขึ้นบรรทัดใหม่ได้ในทุกคำ</type>
+			<type key="lw" type="keepall" scope="core">ป้องกันการขึ้นบรรทัดใหม่ในทุกคำ</type>
+			<type key="lw" type="normal" scope="core">ขึ้นบรรทัดใหม่ปกติ</type>
+			<type key="lw" type="phrase" scope="core">ไม่ขึ้นบรรทัดใหม่ในวลี</type>
 			<type key="m0" type="bgn">ชื่อมาตรฐานอังกฤษ (BGN)</type>
 			<type key="m0" type="ungegn">ชื่อภูมิศาสตร์มาตรฐาน UN (UNGEGN)</type>
 			<type key="ms" type="metric">ระบบเมตริก</type>
+			<type key="ms" type="metric" scope="core">เมตริก</type>
 			<type key="ms" type="uksystem">ระบบการวัดอิมพีเรียล</type>
+			<type key="ms" type="uksystem" scope="core">อังกฤษ</type>
 			<type key="ms" type="ussystem">ระบบการวัดอเมริกัน</type>
+			<type key="ms" type="ussystem" scope="core">อเมริกัน</type>
 			<type key="numbers" type="arab">ตัวเลขอารบิก-อินดิก</type>
 			<type key="numbers" type="arabext">ตัวเลขอารบิก-อินดิกแบบขยาย</type>
 			<type key="numbers" type="armn">ตัวเลขอาร์เมเนีย</type>
@@ -1384,6 +1433,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">ตัวเลขทิเบต</type>
 			<type key="numbers" type="traditional" draft="contributed">ตัวเลขแบบดั้งเดิม</type>
 			<type key="numbers" type="vaii">ตัวเลขไว</type>
+			<type key="ss" type="none" scope="core">ปิด</type>
+			<type key="ss" type="standard" scope="core">เปิด</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">เมตริก</measurementSystemName>
@@ -1408,7 +1459,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</parseLenients>
 		<parseLenients scope="general" level="lenient">
 			<parseLenient sample=".">[.․﹒．。︒｡]</parseLenient>
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-﹣－‑‒ −⁻₋ ➖]</parseLenient>
@@ -1457,7 +1507,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">M/G y</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/GGGGG y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E ที่ d/M/G y</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMEEEEd">EEEEที่ d MMMM</dateFormatItem>
 						<dateFormatItem id="yyyyM">M/y</dateFormatItem>
@@ -1768,6 +1820,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} เวลา {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} เวลา {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1776,6 +1831,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} เวลา {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} เวลา {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1789,7 +1847,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E ที่ d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM G y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM G y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM G y</dateFormatItem>
@@ -1979,6 +2039,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<days>
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
+							<day type="sun">อาทิตย์</day>
+							<day type="mon">จันทร์</day>
+							<day type="tue">อังคาร</day>
+							<day type="wed">พุธ</day>
+							<day type="thu">พฤหัส</day>
+							<day type="fri">ศุกร์</day>
+							<day type="sat">เสาร์</day>
+						</dayWidth>
+						<dayWidth type="short">
 							<day type="sun">อา.</day>
 							<day type="mon">จ.</day>
 							<day type="tue">อ.</day>
@@ -1998,6 +2067,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">อาทิตย์</day>
+							<day type="mon">จันทร์</day>
+							<day type="tue">อังคาร</day>
+							<day type="wed">พุธ</day>
+							<day type="thu">พฤหัส</day>
+							<day type="fri">ศุกร์</day>
+							<day type="sat">เสาร์</day>
+						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">อา</day>
 							<day type="mon">จ</day>
@@ -2007,6 +2085,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri">ศ</day>
 							<day type="sat">ส</day>
 						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">อา.</day>
+							<day type="mon">จ.</day>
+							<day type="tue">อ.</day>
+							<day type="wed">พ.</day>
+							<day type="thu">พฤ.</day>
+							<day type="fri">ศ.</day>
+							<day type="sat">ส.</day>
+						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
@@ -2151,6 +2238,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} เวลา {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} เวลา {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2159,6 +2249,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} เวลา {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} เวลา {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2174,6 +2267,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="EHm">E HH:mm น.</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/GGGGG y</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/G y</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM G y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM G y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM G y</dateFormatItem>
@@ -3438,6 +3532,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>อีสเตอร์</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>โกไยเก</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ปุนตาอาเรนัส</exemplarCity>
 			</zone>
@@ -3703,9 +3800,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>พนมเปญ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>เอนเดอร์เบอรี</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>แคนทอน</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4382,9 +4476,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>เวลาแอฟริกาตะวันตก</generic>
-					<standard>เวลามาตรฐานแอฟริกาตะวันตก</standard>
-					<daylight>เวลาฤดูร้อนแอฟริกาตะวันตก</daylight>
+					<standard>เวลาแอฟริกาตะวันตก</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4772,6 +4864,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>เวลากายอานา</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>เวลามาตรฐานฮาวาย-อะลูเชียน</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>เวลาฮาวาย-อะลูเชียน</generic>
@@ -5222,6 +5319,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>เวลาชุก</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">เวลาตุรกี</generic>
+					<standard draft="contributed">เวลามาตรฐานตุรกี</standard>
+					<daylight draft="contributed">เวลาฤดูร้อนตุรกี</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>เวลาเติร์กเมนิสถาน</generic>
@@ -5343,8 +5447,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -6202,6 +6304,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ดอลลาร์แคริบเบียนตะวันออก</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>กิลเดอร์แคริบเบียน</displayName>
+				<displayName count="other">กิลเดอร์แคริบเบียน</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>สิทธิถอนเงินพิเศษ</displayName>
 			</currency>
@@ -6282,6 +6388,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>ดอลลาร์ซิมบับเว</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ทองซิมบับเว</displayName>
+				<displayName count="other">ทองซิมบับเว</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">ดอลลาร์ซิมบับเว (2009)</displayName>
 			</currency>
@@ -6359,7 +6469,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>มิลลิโมลต่อลิตร</displayName>
 				<unitPattern count="other">{0} มิลลิโมลต่อลิตร</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ส่วน</displayName>
+				<unitPattern count="other">{0} ส่วน</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ส่วนต่อล้าน</displayName>
 				<unitPattern count="other">{0} ส่วนต่อล้าน</unitPattern>
 			</unit>
@@ -6372,6 +6486,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<unitPattern count="other">{0} เปอร์มีเรียด</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>กลูโคส</displayName>
+				<unitPattern count="other">{0} กลูโคส</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ลิตรต่อกิโลเมตร</displayName>
 				<unitPattern count="other">{0} ลิตรต่อกิโลเมตร</unitPattern>
@@ -6636,6 +6754,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>มิลลิเมตรปรอท</displayName>
 				<unitPattern count="other">{0} มิลลิเมตรปรอท</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ปรอท</displayName>
+				<unitPattern count="other">{0} ปรอท</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ปอนด์ต่อตารางนิ้ว</displayName>
 				<unitPattern count="other">{0} ปอนด์ต่อตารางนิ้ว</unitPattern>
@@ -6739,6 +6861,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ถ้วยเมตริก</displayName>
 				<unitPattern count="other">{0} ถ้วยเมตริก</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ฟลูอิดออนซ์เมตริก</displayName>
+				<unitPattern count="other">{0} ฟลูอิดออนซ์เมตริก</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="other">{0} บุชเชล</unitPattern>
 			</unit>
@@ -6778,19 +6904,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ควอร์ตอังกฤษ</displayName>
 				<unitPattern count="other">{0} ควอร์ตอังกฤษ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>แสง</displayName>
-				<unitPattern count="other">{0} แสง</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>สเตอเรเดียน</displayName>
+				<unitPattern count="other">{0} สเตอเรเดียน</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>คาทัล</displayName>
+				<unitPattern count="other">{0} คาทัล</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>คูลอมบ์</displayName>
+				<unitPattern count="other">{0} คูลอมบ์</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ฟารัด</displayName>
+				<unitPattern count="other">{0} ฟารัด</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>เฮนรี</displayName>
+				<unitPattern count="other">{0} เฮนรี</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ซีเมนส์</displayName>
+				<unitPattern count="other">{0} ซีเมนส์</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>แคลอรี [IT]</displayName>
+				<unitPattern count="other">{0} แคลอรี [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>เบ็กเคอเรล</displayName>
+				<unitPattern count="other">{0} เบ็กเคอเรล</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ซีเวิร์ต</displayName>
+				<unitPattern count="other">{0} ซีเวิร์ต</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>เกรย์</displayName>
+				<unitPattern count="other">{0} เกรย์</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>กิโลกรัมแรง</displayName>
+				<unitPattern count="other">{0} กิโลกรัมแรง</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>เทสลา</displayName>
+				<unitPattern count="other">{0} เทสลา</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>เวเบอร์</displayName>
+				<unitPattern count="other">{0} เวเบอร์</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ส่วนต่อพันล้าน</displayName>
 				<unitPattern count="other">{0} ส่วนต่อพันล้าน</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>คืน</displayName>
-				<unitPattern count="other">{0} คืน</unitPattern>
-				<perUnitPattern>{0}/คืน</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>สี่ทิศหลัก</displayName>
 				<coordinateUnitPattern type="east">{0}ตะวันออก</coordinateUnitPattern>
@@ -6983,7 +7152,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>รายการ</displayName>
 				<unitPattern count="other">{0} รายการ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ส่วน</displayName>
+				<unitPattern count="other">{0} ส่วน</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ส่วน/ล้าน</displayName>
 				<unitPattern count="other">{0} สตล.</unitPattern>
 			</unit>
@@ -7000,6 +7173,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>โมล</displayName>
 				<unitPattern count="other">{0} โมล</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>กลูโคส</displayName>
+				<unitPattern count="other">{0} กลูโคส</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ลิตร/กม.</displayName>
 				<unitPattern count="other">{0} ล./กม.</unitPattern>
@@ -7334,6 +7511,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>มม. ปรอท</displayName>
 				<unitPattern count="other">{0} มม. ปรอท</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ปรอท</displayName>
+				<unitPattern count="other">{0} ปรอท</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ปอนด์/ตร.นิ้ว</displayName>
 				<unitPattern count="other">{0} ปอนด์/ตร.นิ้ว</unitPattern>
@@ -7443,6 +7624,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ถ. เมตริก</displayName>
 				<unitPattern count="other">{0} ถ. เมตริก</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>เอเคอร์-ฟุต</displayName>
 				<unitPattern count="other">{0} เอเคอร์-ฟุต</unitPattern>
@@ -7510,11 +7694,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>หยิบมือ</displayName>
 				<unitPattern count="other">{0} หยิบมือ</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>สเตอเรเดียน</displayName>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>คาทัล</displayName>
+				<unitPattern count="other">{0} คาทัล</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>คูลอมบ์</displayName>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ฟารัด</displayName>
+				<unitPattern count="other">{0} ฟารัด</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>เฮนรี</displayName>
+				<unitPattern count="other">{0} เฮนรี</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ซีเมนส์</displayName>
+				<unitPattern count="other">{0} ซีเมนส์</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>แคลอรี-IT</displayName>
+				<unitPattern count="other">{0} แคลอรี-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>เบ็กเคอเรล</displayName>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ซีเวิร์ต</displayName>
+				<unitPattern count="other">{0} ซีเวิร์ต</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>เกรย์</displayName>
+				<unitPattern count="other">{0} เกรย์</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>กิโลกรัมแรง</displayName>
+				<unitPattern count="other">{0} กิโลกรัมแรง</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>เทสลา</displayName>
+				<unitPattern count="other">{0} เทสลา</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>เวเบอร์</displayName>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>แสง</displayName>
 				<unitPattern count="other">{0} แสง</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ส่วน/พันล้าน</displayName>
 				<unitPattern count="other">{0} สตพล.</unitPattern>
 			</unit>
@@ -7594,7 +7830,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<unitPattern count="other">{0}รายการ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ส่วน</displayName>
+				<unitPattern count="other">{0} ส่วน</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>สตล.</displayName>
 				<unitPattern count="other">{0}สตล.</unitPattern>
 			</unit>
@@ -7607,6 +7847,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0}โมล</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>กลูโคส</displayName>
+				<unitPattern count="other">{0} กลูโคส</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ล./กม.</displayName>
 				<unitPattern count="other">{0}ล./กม.</unitPattern>
@@ -7936,6 +8180,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="pressure-millimeter-ofhg">
 				<unitPattern count="other">{0}มม. ปรอท</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ปรอท</displayName>
+				<unitPattern count="other">{0} ปรอท</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
@@ -8103,18 +8351,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>สเตอเรเดียน</displayName>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>คาทัล</displayName>
+				<unitPattern count="other">{0} คาทัล</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>คูลอมบ์</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ฟารัด</displayName>
+				<unitPattern count="other">{0} ฟารัด</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>เฮนรี</displayName>
+				<unitPattern count="other">{0} เฮนรี</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ซีเมนส์</displayName>
+				<unitPattern count="other">{0} ซีเมนส์</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>แคลอรี-IT</displayName>
+				<unitPattern count="other">{0} แคลอรี-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>เบ็กเคอเรล</displayName>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ซีเวิร์ต</displayName>
+				<unitPattern count="other">{0} ซีเวิร์ต</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>เกรย์</displayName>
+				<unitPattern count="other">{0} เกรย์</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>กิโลกรัมแรง</displayName>
+				<unitPattern count="other">{0} กิโลกรัมแรง</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>เทสลา</displayName>
+				<unitPattern count="other">{0} เทสลา</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>เวเบอร์</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>แสง</displayName>
 				<unitPattern count="other">{0}แสง</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>สตพล.</displayName>
 				<unitPattern count="other">{0}สตพล.</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>คืน</displayName>
 				<unitPattern count="other">{0}คืน</unitPattern>
-				<perUnitPattern>{0}/คืน</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>ทิศ</displayName>
diff --git a/make/data/cldr/common/main/ti.xml b/make/data/cldr/common/main/ti.xml
index 767bdcbe280..f34e86a651e 100644
--- a/make/data/cldr/common/main/ti.xml
+++ b/make/data/cldr/common/main/ti.xml
@@ -16,7 +16,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<localeKeyTypePattern>{0}፦ {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<languages>
-			<language type="aa">አፋር</language>
+			<language type="aa">ዓፋር</language>
 			<language type="ab">ኣብካዝኛ</language>
 			<language type="ace">ኣቸኒዝኛ</language>
 			<language type="ada">ኣዳንግሜ</language>
@@ -39,7 +39,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ars">ናጅዲ ዓረብኛ</language>
 			<language type="as">ኣሳሜዝኛ</language>
 			<language type="asa">ኣሱ</language>
-			<language type="ast">ኣስቱርያን</language>
+			<language type="ast">ኣስቱርኛ</language>
 			<language type="atj">ኣቲካመክ</language>
 			<language type="av">ኣቫርኛ</language>
 			<language type="awa">ኣዋዲ</language>
@@ -66,14 +66,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bm">ባምባራ</language>
 			<language type="bn">በንጋሊ</language>
 			<language type="bo">ቲበታንኛ</language>
+			<language type="bqi">ባኽትያሪ</language>
 			<language type="br">ብረቶንኛ</language>
 			<language type="brx">ቦዶ</language>
 			<language type="bs">ቦዝንኛ</language>
 			<language type="bss">ኣኮስ</language>
+			<language type="bua">ቡርያትኛ</language>
 			<language type="bug">ቡጊንኛ</language>
 			<language type="byn">ብሊን</language>
 			<language type="ca">ካታላን</language>
-			<language type="cad">ካድዶ</language>
+			<language type="cad">ካዶ</language>
 			<language type="cay">ካዩጋ</language>
 			<language type="cch">ኣትሳም</language>
 			<language type="ccp">ቻክማ</language>
@@ -88,17 +90,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="chr">ቸሮኪ</language>
 			<language type="chy">ሻያን</language>
 			<language type="cic">ቺካሳው</language>
-			<language type="ckb">ማእከላይ ኩርዲሽ</language>
-			<language type="ckb" alt="menu">ኩርዲሽ፣ ማእከላይ</language>
-			<language type="ckb" alt="variant">ኩርዲሽ፣ ሶራኒ</language>
+			<language type="ckb">ኩርዲሽ ሶራኒ</language>
 			<language type="clc">ቺልኮቲን</language>
 			<language type="co">ኮርስኛ</language>
+			<language type="cop">ቁብጥኛ</language>
 			<language type="crg">ሚቺፍ</language>
 			<language type="crj">ደቡባዊ ምብራቕ ክሪ</language>
-			<language type="crk">ክሪ ፕሌንስ</language>
+			<language type="crk">ክሪ ቆላታት</language>
 			<language type="crl">ሰሜናዊ ምብራቕ ክሪ</language>
 			<language type="crm">ሙስ ክሪ</language>
-			<language type="crr">ካሮሊና አልጎንጉያኛ</language>
+			<language type="crr">ኣልጎንክኛ ካሮሊና</language>
 			<language type="cs">ቸክኛ</language>
 			<language type="csw">ክሪ ረግረግ</language>
 			<language type="cu">ቤተ-ክርስትያን ስላቭኛ</language>
@@ -109,6 +110,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dar">ዳርግዋ</language>
 			<language type="dav">ታይታ</language>
 			<language type="de">ጀርመን</language>
+			<language type="de_AT">ኦስትርያዊ ጀርመን</language>
+			<language type="de_CH">ስዊዘርላንዳዊ ላዕለዋይ ጀርመን</language>
 			<language type="dgr">ዶግሪብ</language>
 			<language type="dje">ዛርማ</language>
 			<language type="doi">ዶግሪ</language>
@@ -124,10 +127,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eka">ኤካጁክ</language>
 			<language type="el">ግሪኽኛ</language>
 			<language type="en">እንግሊዝኛ</language>
-			<language type="en_US" alt="short">እንግሊዝኛ (ሕ.መ.)</language>
+			<language type="en_AU">ኣውስትራልያዊ እንግሊዝኛ</language>
+			<language type="en_CA">ካናዳዊ እንግሊዝኛ</language>
+			<language type="en_GB">ብሪጣንያዊ እንግሊዝኛ</language>
+			<language type="en_US">ኣመሪካዊ እንግሊዝኛ</language>
 			<language type="eo">ኤስፐራንቶ</language>
 			<language type="es">ስጳንኛ</language>
+			<language type="es_419">ላቲን ኣመሪካዊ ስጳንኛ</language>
 			<language type="es_ES">ስጳንኛ (ኤውሮጳዊ)</language>
+			<language type="es_MX">ስጳንኛ ሜክሲኮ</language>
 			<language type="et">ኤስቶንኛ</language>
 			<language type="eu">ባስክኛ</language>
 			<language type="ewo">ኤዎንዶ</language>
@@ -140,7 +148,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fo">ፋሮእይና</language>
 			<language type="fon">ፎን</language>
 			<language type="fr">ፈረንሳይኛ</language>
-			<language type="frc">ካጁን ፈረንሳይ</language>
+			<language type="fr_CA">ካናዳዊ ፈረንሳይኛ</language>
+			<language type="fr_CH">ስዊዘርላንዳዊ ፈረንሳይኛ</language>
+			<language type="frc">ካጁን ፈረንሳይኛ</language>
 			<language type="frr">ሰሜናዊ ፍሪስኛ</language>
 			<language type="fur">ፍርዩልኛ</language>
 			<language type="fy">ምዕራባዊ ፍሪስኛ</language>
@@ -204,6 +214,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kcg">ታያፕ</language>
 			<language type="kde">ማኮንደ</language>
 			<language type="kea">ክርዮል ኬፕ ቨርድኛ</language>
+			<language type="kek">ቄቅቺ</language>
 			<language type="ken">ኬንያንግ</language>
 			<language type="kfo">ኮሮ</language>
 			<language type="kgp">ካይንጋንግ</language>
@@ -228,8 +239,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ks">ካሽሚሪ</language>
 			<language type="ksb">ሻምባላ</language>
 			<language type="ksf">ባፍያ</language>
-			<language type="ksh">ኮሎግኒያን</language>
+			<language type="ksh">ኮልሽ</language>
 			<language type="ku">ኩርዲሽ</language>
+			<language type="ku" menu="core">ኩርዲሽ</language>
+			<language type="ku" menu="extension">ኰርማንጂ</language>
 			<language type="kum">ኩሚይክ</language>
 			<language type="kv">ኮሚ</language>
 			<language type="kw">ኮርንኛ</language>
@@ -254,7 +267,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="lrc">ሰሜናዊ ሉሪ</language>
 			<language type="lsm">ሳምያ</language>
 			<language type="lt">ሊትዌንኛ</language>
-			<language type="ltg">ላትጋላዊ</language>
+			<language type="ltg">ላትጋልኛ</language>
 			<language type="lu">ሉባ-ካታንጋ</language>
 			<language type="lua">ሉባ-ሉልዋ</language>
 			<language type="lun">ሉንዳ</language>
@@ -296,7 +309,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="myv">ኤርዝያ</language>
 			<language type="mzn">ማዛንደራኒ</language>
 			<language type="na">ናውርዋንኛ</language>
-			<language type="nap">ኒያፖሊታንኛ</language>
+			<language type="nap">ናፖሊታንኛ</language>
 			<language type="naq">ናማ</language>
 			<language type="nb">ኖርወያዊ ቦክማል</language>
 			<language type="nd">ሰሜን ኤንደበለ</language>
@@ -337,12 +350,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pap">ፓፕያመንቶ</language>
 			<language type="pau">ፓላውኛ</language>
 			<language type="pcm">ፒጂን ናይጀርያ</language>
+			<language type="pi">ፓሊ</language>
 			<language type="pis">ፒጂን</language>
 			<language type="pl">ፖሊሽ</language>
+			<language type="pms">ፒድሞንትኛ</language>
 			<language type="pqm">ማሊሲት-ፓሳማኳዲ</language>
 			<language type="prg">ፕሩስኛ</language>
 			<language type="ps">ፓሽቶ</language>
 			<language type="pt">ፖርቱጊዝኛ</language>
+			<language type="pt_BR">ፖርቱጊዝኛ ብራዚል</language>
+			<language type="pt_PT">ፖርቱጊዝኛ ፖርቱጋል</language>
 			<language type="qu">ቀችዋ</language>
 			<language type="quc">ኪቼ</language>
 			<language type="raj">ራጃስታኒ</language>
@@ -375,11 +392,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="seh">ሰና</language>
 			<language type="ses">ኮይራቦሮ ሰኒ</language>
 			<language type="sg">ሳንጎ</language>
+			<language type="sgs">ሳሞጂትኛ</language>
 			<language type="sh">ሰርቦ-ክሮኤሽያኛ</language>
 			<language type="shi">ታቸልሂት</language>
 			<language type="shn">ሻን</language>
 			<language type="si">ሲንሃላ</language>
-			<language type="sid">ሲዳመኛ</language>
+			<language type="sid">ሲዳሞ</language>
 			<language type="sk">ስሎቫክኛ</language>
 			<language type="sl">ስሎቬንኛ</language>
 			<language type="slh">ደቡባዊ ሉሹትሲድ</language>
@@ -392,7 +410,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="snk">ሶኒንከ</language>
 			<language type="so">ሶማሊ</language>
 			<language type="sq">ኣልባንኛ</language>
-			<language type="sr">ሰርቢያኛ</language>
+			<language type="sr">ሰርብኛ</language>
 			<language type="srn">ስራናን ቶንጎ</language>
 			<language type="ss">ስዋዚ</language>
 			<language type="ssy">ሳሆ</language>
@@ -402,10 +420,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="suk">ሱኩማ</language>
 			<language type="sv">ስዊድንኛ</language>
 			<language type="sw">ስዋሂሊ</language>
-			<language type="sw_CD">ስዋሂሊ (ኮንጎ)</language>
+			<language type="sw_CD">ስዋሂሊ ኮንጎ</language>
 			<language type="swb">ኮሞርኛ</language>
-			<language type="syr">ሶርያኛ</language>
-			<language type="szl">ሲሌሲያን</language>
+			<language type="syr">ሶርይኛ</language>
+			<language type="szl">ሲለዝኛ</language>
 			<language type="ta">ታሚል</language>
 			<language type="tce">ደቡባዊ ታትቾን</language>
 			<language type="te">ተሉጉ</language>
@@ -427,7 +445,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="tpi">ቶክ ፒሲን</language>
 			<language type="tr">ቱርክኛ</language>
 			<language type="trv">ታሮኮ</language>
-			<language type="trw">ቶርዋሊኛ</language>
+			<language type="trw">ቶርዋሊ</language>
 			<language type="ts">ሶንጋ</language>
 			<language type="tt">ታታር</language>
 			<language type="ttm">ሰሜናዊ ታትቾን</language>
@@ -447,21 +465,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="uz">ኡዝበክኛ</language>
 			<language type="vai">ቫይ</language>
 			<language type="ve">ቨንዳ</language>
-			<language type="vec">ቬንቲያንኛ</language>
+			<language type="vec">ቬነትኛ</language>
 			<language type="vi">ቬትናምኛ</language>
 			<language type="vmw">ማክሁዋ</language>
 			<language type="vo">ቮላፑክ</language>
 			<language type="vun">ቩንጆ</language>
 			<language type="wa">ዋሎን</language>
 			<language type="wae">ዋልሰር</language>
-			<language type="wal">ዎላይታኛ</language>
+			<language type="wal">ወላይታ</language>
 			<language type="war">ዋራይ</language>
 			<language type="wbp">ዋርልፒሪ</language>
 			<language type="wo">ዎሎፍ</language>
 			<language type="wuu">ቻይናዊ ዉ</language>
 			<language type="xal">ካልምይክ</language>
 			<language type="xh">ኮሳ</language>
-			<language type="xnr">ካንጋሪኛ</language>
+			<language type="xnr">ካንግሪ</language>
 			<language type="xog">ሶጋ</language>
 			<language type="yav">ያንግበን</language>
 			<language type="ybb">የምባ</language>
@@ -861,43 +879,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">ቅርጺ ባጤራ</key>
 			<key type="collation">ስርዓት ምድላው</key>
 			<key type="currency">ባጤራ</key>
+			<key type="em">ኣቀራርባ ኢሞጂ</key>
 			<key type="hc">ዑደት ሰዓት (12 ኣንጻር 24)</key>
 			<key type="lb">ቅዲ ምብታኽ መስመር</key>
+			<key type="lw">መስመር ምብታኽ ኣብ ውሽጢ ቃላት</key>
 			<key type="ms">ስርዓት መለክዒ</key>
 			<key type="numbers">ቁጽርታት</key>
+			<key type="ss">ምቁራጽ ሓረግ ድሕሪ ኣሕጽሮተ ቃል</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ናይ ቡድሃ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="buddhist" scope="core">ቡድሃ</type>
 			<type key="calendar" type="chinese">ናይ ቻይናዊ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="chinese" scope="core">ቻይናዊ</type>
 			<type key="calendar" type="coptic">ናይ ቅብጣዊ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="coptic" scope="core">ቅብጣዊ</type>
 			<type key="calendar" type="dangi">ናይ ዳንጊ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="dangi" scope="core">ዳንጊ</type>
 			<type key="calendar" type="ethiopic">ናይ ግእዝ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="ethiopic" scope="core">ግእዝ</type>
 			<type key="calendar" type="ethiopic-amete-alem">ግእዝ ኣመተ ኣለም ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ግእዝ ኣመተ ኣለም</type>
 			<type key="calendar" type="gregorian">ጎርጎርዮሳዊ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="gregorian" scope="core">ጎርጎርዮሳዊ</type>
 			<type key="calendar" type="hebrew">ናይ እብራይስጢ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="hebrew" scope="core">እብራይስጢ</type>
 			<type key="calendar" type="islamic">ናይ ሂጅሪ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="islamic" scope="core">ሂጅሪ</type>
 			<type key="calendar" type="islamic-civil">ናይ ሂጅሪ ዓውደ ኣዋርሕ (ሰንጠረዥ፣ ሲቪላዊ ዘመን)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ሂጅሪ ዓውደ ኣዋርሕ (ሰንጠረዥ፣ ሲቪላዊ ዘመን)</type>
 			<type key="calendar" type="islamic-tbla">ናይ ሂጅሪ ዓውደ ኣዋርሕ (ሰንጠረዥ፣ ስነ-ፍልጠታዊ ዘመን)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">ሂጅሪ (ሰንጠረዥ፣ ስነ-ፍልጠታዊ ዘመን)</type>
 			<type key="calendar" type="islamic-umalqura">ናይ ሂጅሪ ዓውደ ኣዋርሕ (ኡም ኣል-ቁራ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ሂጅሪ (ኡም ኣል-ቁራ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 ዓውደ ኣዋርሕ</type>
 			<type key="calendar" type="japanese">ናይ ጃፓናዊ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="japanese" scope="core">ጃፓናዊ</type>
 			<type key="calendar" type="persian">ናይ ፋርስ ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="persian" scope="core">ፋርስ</type>
 			<type key="calendar" type="roc">ናይ ሪፓብሊክ ቻይና ዓውደ ኣዋርሕ</type>
+			<type key="calendar" type="roc" scope="core">ሪፓብሊክ ቻይና</type>
 			<type key="cf" type="account">ቅርጺ ባጤራ ሕሳብ</type>
+			<type key="cf" type="account" scope="core">ሕሳብ</type>
 			<type key="cf" type="standard">መደበኛ ቅርጺ ባጤራ</type>
+			<type key="cf" type="standard" scope="core">መደበኛ</type>
 			<type key="collation" type="ducet">ነባሪ ዩኒኮድ ስርዓት ምድላው</type>
+			<type key="collation" type="ducet" scope="core">ነባሪ ዩኒኮድ</type>
 			<type key="collation" type="search">ሓፈሻዊ-ዕላማ ምድላይ</type>
+			<type key="collation" type="search" scope="core">ምድላይ</type>
 			<type key="collation" type="standard">መደበኛ ምድላው ስርዓት</type>
+			<type key="collation" type="standard" scope="core">መደበኛ</type>
+			<type key="em" type="default" scope="core">ነባሪ</type>
+			<type key="em" type="emoji" scope="core">ኢሞጂ</type>
+			<type key="em" type="text" scope="core">ጽሑፍ</type>
 			<type key="hc" type="h11">ስርዓት 12 ሰዓታት (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11) 12 (0–11)</type>
 			<type key="hc" type="h12">ስርዓት 12 ሰዓታት (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12) 12 (1–12)</type>
 			<type key="hc" type="h23">ናይ 24 ሰዓታት ስርዓት (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">ናይ 24 ሰዓታት ስርዓት (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ልሕሉሕ መስመር ምብታኽ ቅዲ</type>
+			<type key="lb" type="loose" scope="core">ልሕሉሕ</type>
 			<type key="lb" type="normal">ንቡር ቅዲ ምብታኽ መስመር</type>
+			<type key="lb" type="normal" scope="core">ንቡር</type>
 			<type key="lb" type="strict">ቅዲ ስጡም መስመር ምብታኽ</type>
+			<type key="lb" type="strict" scope="core">ስጡም</type>
+			<type key="lw" type="breakall" scope="core">ኩሉ ስበር</type>
+			<type key="lw" type="keepall" scope="core">ኩሉ ሓልዎ</type>
+			<type key="lw" type="normal" scope="core">ንቡር</type>
+			<type key="lw" type="phrase" scope="core">ብሓረጋት ምሓዝ</type>
 			<type key="ms" type="metric">ሜትሪክ ስርዓት</type>
+			<type key="ms" type="metric" scope="core">ሜትሪክ</type>
 			<type key="ms" type="uksystem">ስርዓተ መለክዒ ሃጸያዊ</type>
+			<type key="ms" type="uksystem" scope="core">ዓባይ ብሪጣንያ</type>
 			<type key="ms" type="ussystem">ስርዓት መለክዒ ኣሜሪካ</type>
+			<type key="ms" type="ussystem" scope="core">ኣሜሪካ</type>
 			<type key="numbers" type="arab">ዓረብ-ህንዳዊ ኣሃዛት</type>
 			<type key="numbers" type="arabext">ዝተዘርግሐ ኣሃዛት ዓረብ-ህንዳዊ</type>
 			<type key="numbers" type="armn">ኣርመንያዊ ቁጽርታት</type>
@@ -938,6 +996,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">ናይ ታይላንዳዊ ኣሃዛት</type>
 			<type key="numbers" type="tibt">ናይ ትቤቲ ኣሃዛት</type>
 			<type key="numbers" type="vaii">ቫይ ኣሃዛት</type>
+			<type key="ss" type="none" scope="core">ጠፊኡ</type>
+			<type key="ss" type="standard" scope="core">በሪሑ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ሜትሪክ</measurementSystemName>
@@ -954,6 +1014,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[፟ ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጷ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፇ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ⶏ ⶐ ⶑ ᎈ ᎉ ᎊ ᎋ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ]</exemplarCharacters>
 		<exemplarCharacters type="index">[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ ቐ ቘ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ዀ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary" draft="contributed">[% ‰ + − 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary" draft="contributed">[፣ ፤ ፦]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person" draft="contributed">[\- ‐‑ ፣ ። /]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>«</quotationStart>
@@ -1065,6 +1128,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} ሰዓት {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} ሰዓት {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1073,24 +1139,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} ሰዓት {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} ሰዓት {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}፣ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}፣ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd፣ E</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E፣ d MMM y G</dateFormatItem>
+						<dateFormatItem id="Hv">HHሰ v</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E፣ d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
@@ -1420,11 +1497,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}፣ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}፣ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
@@ -1434,6 +1517,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="EHms">E፣ HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E፣ M/d/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E፣ d MMM y G</dateFormatItem>
@@ -1587,6 +1671,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd፣ E</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
@@ -1819,8 +1904,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">ቅድሚ {0} ቀዳም</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="dayperiod-short">
+				<displayName>ኤ.ኤም/ፒ.ኤም</displayName>
+			</field>
 			<field type="dayperiod">
-				<displayName>AM/PM</displayName>
+				<displayName>ኤ.ኤም/ፒ.ኤም</displayName>
+			</field>
+			<field type="dayperiod-narrow">
+				<displayName>ኤ.ኤም/ፒ.ኤም</displayName>
 			</field>
 			<field type="hour">
 				<displayName>ሰዓት</displayName>
@@ -2231,6 +2322,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>ደሴት ፋሲካ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>ኮሃይክ</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>ፑንታ ኣረናስ</exemplarCity>
 			</zone>
@@ -2496,9 +2590,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>ፕኖም ፐን</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ኤንደርበሪ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ካንቶን</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3175,9 +3266,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>ግዜ ምዕራብ ኣፍሪቃ</generic>
-					<standard>ናይ መደበኛ ግዘ ምዕራብ ኣፍሪቃ</standard>
-					<daylight>ግዜ ክረምቲ ምዕራብ ኣፍሪቃ</daylight>
+					<standard>ግዜ ምዕራብ ኣፍሪቃ</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3527,6 +3616,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ግዜ ጉያና</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ናይ መደበኛ ሃዋይ-ኣሌውቲያን ግዘ</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ናይ ሃዋይ-ኣሌውቲያን ግዘ</generic>
@@ -4935,6 +5029,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">ምብራቕ ካሪብያን ዶላር</displayName>
 				<displayName count="other">ምብራቕ ካሪብያን ዶላር</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ካሪብያን ጊልደር</displayName>
+				<displayName count="one">ካሪብያን ጊልደር</displayName>
+				<displayName count="other">ካሪብያን ጊልደር</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>ምዕራብ ኣፍሪቃ CFA ፍራንክ</displayName>
 				<displayName count="one">ምዕራብ ኣፍሪቃ ሲኤፍኤ ፍራንክ</displayName>
@@ -4965,6 +5064,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">ዛምብያዊ ኳቻ</displayName>
 				<displayName count="other">ዛምብያዊ ኳቻ</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>ዚምባብወ ወርቂ</displayName>
+				<displayName count="one">ዚምባብወ ወርቂ</displayName>
+				<displayName count="other">ዚምባብወ ወርቂ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
@@ -5192,7 +5296,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ኣቕሓ</unitPattern>
 				<unitPattern count="other">{0} ኣቕሑ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ክፋል</displayName>
+				<unitPattern count="one">{0} ክፋል</unitPattern>
+				<unitPattern count="other">{0} ክፋል</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ክፍልታት ኣብ ሚልዮን</displayName>
 				<unitPattern count="one">{0} ክፍልታት ኣብ ሚልዮን</unitPattern>
 				<unitPattern count="other">{0} ክፍልታት ኣብ ሚልዮን</unitPattern>
@@ -5217,6 +5326,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ሞል</unitPattern>
 				<unitPattern count="other">{0} ሞል</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊትሮ ኣብ ኪሎሜትር</displayName>
 				<unitPattern count="one">{0} ሊትሮ አብ ኪሎሜትር</unitPattern>
@@ -5301,7 +5415,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} ዓሰርተታት ዓመታት</unitPattern>
 			</unit>
 			<unit type="duration-year">
-				<displayName>ዓመታት</displayName>
 				<unitPattern count="one">{0} ዓመት</unitPattern>
 				<unitPattern count="other">{0} ዓመታት</unitPattern>
 				<perUnitPattern>{0}/ዓመታት</perUnitPattern>
@@ -5314,7 +5427,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-month">
 				<displayName>ኣዋርሕ</displayName>
-				<unitPattern count="one">{0}/ወርሒ</unitPattern>
+				<unitPattern count="one">{0} ወርሒ</unitPattern>
 				<unitPattern count="other">{0}/ኣዋርሕ</unitPattern>
 				<perUnitPattern>{0}/ወርሒ</perUnitPattern>
 			</unit>
@@ -5702,6 +5815,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ሚሊሜተር ሜርኩሪ</unitPattern>
 				<unitPattern count="other">{0} ሚሊሜተር ሜርኩሪ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ሜርኩሪ</displayName>
+				<unitPattern count="one">{0} ሜርኩሪ</unitPattern>
+				<unitPattern count="other">{0} ሜርኩሪ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>ፓውንድ-ሓይሊ ኣብ ሓደ ካሬ ኢንች</displayName>
 				<unitPattern count="one">{0} ፓውንድ-ሓይሊ ኣብ ሓደ ካሬ ኢንች</unitPattern>
@@ -5870,6 +5988,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ሜትሪክ ፓይንት</unitPattern>
 				<unitPattern count="other">{0} ሜትሪክ ፓይንት</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ሜትሪክ ፈሳሲ ኦውንስ</displayName>
+				<unitPattern count="one">{0} ሜትሪክ ፈሳሲ ኦውንስ</unitPattern>
+				<unitPattern count="other">{0} ሜትሪክ ፈሳሲ ኦውንስ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>acre-ጫማ</displayName>
 				<unitPattern count="one">{0} acre ጫማ</unitPattern>
@@ -5967,12 +6090,77 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ኢምፒ. ርብዒ ጋሎን</unitPattern>
 				<unitPattern count="other">{0} ኢምፒ. ርብዒ ጋሎን</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ስትራዲያን</displayName>
+				<unitPattern count="one">{0} ስትራዲያን</unitPattern>
+				<unitPattern count="other">{0} ስትራዲያን</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ካታል</displayName>
+				<unitPattern count="one">{0} ካታል</unitPattern>
+				<unitPattern count="other">{0} ካታል</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ኮለምብ</displayName>
+				<unitPattern count="one">{0} ኮለምብ</unitPattern>
+				<unitPattern count="other">{0} ኮለምብ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ፋራድ</displayName>
+				<unitPattern count="one">{0} ፋራድ</unitPattern>
+				<unitPattern count="other">{0} ፋራድ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄነሪ</displayName>
+				<unitPattern count="one">{0} ሄነሪ</unitPattern>
+				<unitPattern count="other">{0} ሄነሪ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ሲመን</displayName>
+				<unitPattern count="one">{0} ሲመን</unitPattern>
+				<unitPattern count="other">{0} ሲመን</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ [IT]</displayName>
+				<unitPattern count="one">{0} ካሎሪ [IT]</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>ቤክዌርሌስ</displayName>
+				<unitPattern count="one">{0} ቤክዌርሌስ</unitPattern>
+				<unitPattern count="other">{0} ቤክዌርሌስ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ሴቨርትስ</displayName>
+				<unitPattern count="one">{0} ሴቨርት</unitPattern>
+				<unitPattern count="other">{0} ሴቨርትስ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>ግሬይስ</displayName>
+				<unitPattern count="one">{0} ግሬይ</unitPattern>
+				<unitPattern count="other">{0} ግሬይስ</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪሎግራም-ሓይሊ</displayName>
+				<unitPattern count="one">{0} ኪሎግራም-ሓይሊ</unitPattern>
+				<unitPattern count="other">{0} ኪሎግራም-ሓይሊ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴስላ</displayName>
+				<unitPattern count="one">{0} ቴስላ</unitPattern>
+				<unitPattern count="other">{0} ቴስላ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበር</displayName>
+				<unitPattern count="one">{0} ዌበር</unitPattern>
+				<unitPattern count="other">{0} ዌበር</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ብርሃን</displayName>
 				<unitPattern count="one">{0} ብርሃን</unitPattern>
 				<unitPattern count="other">{0} ብርሃን</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ክፍልታት ኣብ ሓደ ቢልዮን</displayName>
 				<unitPattern count="one">{0} ክፍልታት ኣብ ሓደ ቢልዮን</unitPattern>
 				<unitPattern count="other">{0} ክፍልታት ኣብ ሓደ ቢልዮን</unitPattern>
@@ -6190,7 +6378,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ኣቕሓ</unitPattern>
 				<unitPattern count="other">{0} ኣቕሑ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ክፋል</displayName>
+				<unitPattern count="one">{0} ክፋል</unitPattern>
+				<unitPattern count="other">{0} ክፋል</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ክፍልታት/ሚልዮን</displayName>
 				<unitPattern count="one">{0} ክፍልታት ኣብ ሚልዮን</unitPattern>
 				<unitPattern count="other">{0} ክፍልታት ኣብ ሚልዮን</unitPattern>
@@ -6209,6 +6402,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ሞል</unitPattern>
 				<unitPattern count="other">{0} ሞል</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊትሮ/ኪሎሜትር</displayName>
 				<unitPattern count="one">{0} ሊትሮ/ኪሜ</unitPattern>
@@ -6667,6 +6865,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ሚሜ ሜርኩሪ</unitPattern>
 				<unitPattern count="other">{0} ሚሜ ሜርኩሪ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ሜርኩሪ</displayName>
+				<unitPattern count="one">{0} ሜርኩሪ</unitPattern>
+				<unitPattern count="other">{0} ሜርኩሪ</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ፒ.ኤስ.አይ</displayName>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>ኢንች ሜርኩሪ</displayName>
 				<unitPattern count="one">{0} ኢንች ሜርኩሪ</unitPattern>
@@ -6925,12 +7131,62 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} ኢምፒ. ርብዒ ጋሎን</unitPattern>
 				<unitPattern count="other">{0} ኢምፒ. ርብዒ ጋሎን</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ስትራዲያን</displayName>
+				<unitPattern count="one">{0} ስትራዲያን</unitPattern>
+				<unitPattern count="other">{0} ስትራዲያን</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ካታል</displayName>
+				<unitPattern count="one">{0} ካታል</unitPattern>
+				<unitPattern count="other">{0} ካታል</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ኮለምብ</displayName>
+				<unitPattern count="one">{0} ኮለምብ</unitPattern>
+				<unitPattern count="other">{0} ኮለምብ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ፋራድ</displayName>
+				<unitPattern count="one">{0} ፋራድ</unitPattern>
+				<unitPattern count="other">{0} ፋራድ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄነሪ</displayName>
+				<unitPattern count="one">{0} ሄነሪ</unitPattern>
+				<unitPattern count="other">{0} ሄነሪ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ሲመን</displayName>
+				<unitPattern count="one">{0} ሲመን</unitPattern>
+				<unitPattern count="other">{0} ሲመን</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካል-IT</displayName>
+				<unitPattern count="one">{0} ካል-IT</unitPattern>
+				<unitPattern count="other">{0} ካል-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪሎግ-ሓ</displayName>
+				<unitPattern count="one">{0} ኪሎግ-ሓ</unitPattern>
+				<unitPattern count="other">{0} ኪሎግ-ሓ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴስላ</displayName>
+				<unitPattern count="one">{0} ቴስላ</unitPattern>
+				<unitPattern count="other">{0} ቴስላ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበር</displayName>
+				<unitPattern count="one">{0} ዌበር</unitPattern>
+				<unitPattern count="other">{0} ዌበር</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ብርሃን</displayName>
 				<unitPattern count="one">{0} ብርሃን</unitPattern>
 				<unitPattern count="other">{0} ብርሃን</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ክፍልታት/ሓደ ቢልዮን</displayName>
 				<unitPattern count="one">{0} ክፍልታት ኣብ ሓደ ቢልዮን</unitPattern>
 				<unitPattern count="other">{0} ክፍልታት ኣብ ሓደ ቢልዮን</unitPattern>
@@ -7144,7 +7400,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}ኣቕሓ</unitPattern>
 				<unitPattern count="other">{0}ኣቕሑ</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ክፋል</displayName>
+				<unitPattern count="one">{0} ክፋል</unitPattern>
+				<unitPattern count="other">{0} ክፋል</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ክፍልታት ኣብ ሚልዮን</displayName>
 				<unitPattern count="one">{0}ክፍልታት ኣብ ሚልዮን</unitPattern>
 				<unitPattern count="other">{0}ክፍልታት ኣብ ሚልዮን</unitPattern>
@@ -7154,6 +7415,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}ሞል</unitPattern>
 				<unitPattern count="other">{0}ሞል</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊትሮ/ኪሜ</displayName>
 				<unitPattern count="one">{0}ሊትሮ/ኪሜ</unitPattern>
@@ -7608,6 +7874,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}ሚሜ ሜርኩሪ</unitPattern>
 				<unitPattern count="other">{0}ሚሜ ሜርኩሪ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ሜርኩሪ</displayName>
+				<unitPattern count="one">{0} ሜርኩሪ</unitPattern>
+				<unitPattern count="other">{0} ሜርኩሪ</unitPattern>
+			</unit>
+			<unit type="pressure-pound-force-per-square-inch">
+				<displayName>ፒ.ኤስ.አይ</displayName>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ ሜርኩሪ</displayName>
 				<unitPattern count="one">{0}″ ሜርኩሪ</unitPattern>
@@ -7866,12 +8140,62 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}ኢምፒ. ርብዒ ጋሎን</unitPattern>
 				<unitPattern count="other">{0}ኢምፒ. ርብዒ ጋሎን</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ስትራዲያን</displayName>
+				<unitPattern count="one">{0} ስትራዲያን</unitPattern>
+				<unitPattern count="other">{0} ስትራዲያን</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>ካታል</displayName>
+				<unitPattern count="one">{0} ካታል</unitPattern>
+				<unitPattern count="other">{0} ካታል</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>ኮለምብ</displayName>
+				<unitPattern count="one">{0} ኮለምብ</unitPattern>
+				<unitPattern count="other">{0} ኮለምብ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ፋራድ</displayName>
+				<unitPattern count="one">{0} ፋራድ</unitPattern>
+				<unitPattern count="other">{0} ፋራድ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄነሪ</displayName>
+				<unitPattern count="one">{0} ሄነሪ</unitPattern>
+				<unitPattern count="other">{0} ሄነሪ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ሲመን</displayName>
+				<unitPattern count="one">{0} ሲመን</unitPattern>
+				<unitPattern count="other">{0} ሲመን</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካል-IT</displayName>
+				<unitPattern count="one">{0} ካል-IT</unitPattern>
+				<unitPattern count="other">{0} ካል-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪሎግ-ሓ</displayName>
+				<unitPattern count="one">{0} ኪሎግ-ሓ</unitPattern>
+				<unitPattern count="other">{0} ኪሎግ-ሓ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴስላ</displayName>
+				<unitPattern count="one">{0} ቴስላ</unitPattern>
+				<unitPattern count="other">{0} ቴስላ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበር</displayName>
+				<unitPattern count="one">{0} ዌበር</unitPattern>
+				<unitPattern count="other">{0} ዌበር</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ብርሃን</displayName>
 				<unitPattern count="one">{0}ብርሃን</unitPattern>
 				<unitPattern count="other">{0}ብርሃን</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ክፍልታት ኣብ ሓደ ቢልዮን</displayName>
 				<unitPattern count="one">{0}ክፍልታት ኣብ ሓደ ቢልዮን</unitPattern>
 				<unitPattern count="other">{0}ክፍልታት ኣብ ሓደ ቢልዮን</unitPattern>
@@ -8183,13 +8507,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{surname-core}፣ {given} {given2} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
-			<namePattern>{surname}, {given-informal}</namePattern>
+			<namePattern>{surname}፣ {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="formal">
-			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
+			<namePattern>{surname-core}፣ {given} {given2-initial} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="informal">
-			<namePattern>{surname}, {given-informal}</namePattern>
+			<namePattern>{surname}፣ {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="formal">
 			<namePattern>{surname-core}፣ {given} {given2} {surname-prefix}</namePattern>
diff --git a/make/data/cldr/common/main/ti_ER.xml b/make/data/cldr/common/main/ti_ER.xml
index c0fb0e068e6..eca0d671a6e 100644
--- a/make/data/cldr/common/main/ti_ER.xml
+++ b/make/data/cldr/common/main/ti_ER.xml
@@ -11,11 +11,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<language type="ti"/>
 		<territory type="ER"/>
 	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="sr">ሰርብኛ</language>
-		</languages>
-	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters draft="unconfirmed">[፟ ፡ ፣ ፤ ፥ ፦ ፧ ። ፠ ፨ ፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ ፲ ፳ ፴ ፵ ፶ ፷ ፸ ፹ ፺ ፻ ፼ ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary" draft="unconfirmed">[᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ⶏ ⶐ ⶑ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፇ ᎈ ᎉ ᎊ ᎋ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ]</exemplarCharacters>
diff --git a/make/data/cldr/common/main/tk.xml b/make/data/cldr/common/main/tk.xml
index 79104bb6449..92694e0cebf 100644
--- a/make/data/cldr/common/main/tk.xml
+++ b/make/data/cldr/common/main/tk.xml
@@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">azerbaýjan dili</language>
 			<language type="az" alt="short">azeri dili</language>
 			<language type="ba">başgyrt dili</language>
+			<language type="bal">buluç dili</language>
 			<language type="ban">baliý dili</language>
 			<language type="bas">basaa dili</language>
 			<language type="be">belarus dili</language>
@@ -152,6 +153,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hax">günorta haýda dili</language>
 			<language type="he">ýewreý dili</language>
 			<language type="hi">hindi dili</language>
+			<language type="hi_Latn" alt="variant">hingliş</language>
 			<language type="hil">hiligaýnon dili</language>
 			<language type="hmn">hmong dili</language>
 			<language type="hr">horwat dili</language>
@@ -215,6 +217,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">bafia dili</language>
 			<language type="ksh">keln dili</language>
 			<language type="ku">kürt dili</language>
+			<language type="ku" menu="core">kürt dili</language>
+			<language type="ku" menu="extension">kurmanji dili</language>
 			<language type="kum">kumyk dili</language>
 			<language type="kv">komi dili</language>
 			<language type="kw">korn dili</language>
@@ -322,8 +326,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pis">pijin dili</language>
 			<language type="pl">polýak dili</language>
 			<language type="pqm">malisit-passamakwodi dili</language>
-			<language type="prg">prussiýa dili</language>
-			<language type="ps">peştun dili</language>
+			<language type="prg">prus dili</language>
+			<language type="ps">puştu dili</language>
 			<language type="pt">portugal dili</language>
 			<language type="pt_PT">portugal dili (Ýewropa)</language>
 			<language type="qu">keçua dili</language>
@@ -607,6 +611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Hytaý</territory>
 			<territory type="CO">Kolumbiýa</territory>
 			<territory type="CP">Klipperton adasy</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta-Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kabo-Werde</territory>
@@ -839,43 +844,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Pul birliginiň formaty</key>
 			<key type="collation">Tertip rejesi</key>
 			<key type="currency">Pul birligi</key>
+			<key type="em">Emoji aňlatmasy</key>
 			<key type="hc">Sagat aýlawy (12–24 sagat)</key>
 			<key type="lb">Setirden setire geçiş stili</key>
+			<key type="lw">Sözleriň içinde setir bölünmeleri</key>
 			<key type="ms">Ölçeg ulgamy</key>
 			<key type="numbers">Sanlar</key>
+			<key type="ss">Gysgaltmadan soň sözlemi bölmek</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddist senenamasy</type>
+			<type key="calendar" type="buddhist" scope="core">Buddist</type>
 			<type key="calendar" type="chinese">Hytaý senenamasy</type>
+			<type key="calendar" type="chinese" scope="core">Hytaý</type>
 			<type key="calendar" type="coptic">Kopt senenamasy</type>
+			<type key="calendar" type="coptic" scope="core">Kopt</type>
 			<type key="calendar" type="dangi">Dangi senenamasy</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Efiop senenamasy</type>
+			<type key="calendar" type="ethiopic" scope="core">Efiopiýa</type>
 			<type key="calendar" type="ethiopic-amete-alem">Efiopiýa Amete Alem senenamasy</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Efiopiýa amete alem</type>
 			<type key="calendar" type="gregorian">Grigorian senenamasy</type>
+			<type key="calendar" type="gregorian" scope="core">Grigorian</type>
 			<type key="calendar" type="hebrew">Ýewreý senenamasy</type>
+			<type key="calendar" type="hebrew" scope="core">Ýewreý</type>
 			<type key="calendar" type="islamic">Hijri-kamary senenamasy</type>
+			<type key="calendar" type="islamic" scope="core">Hijri-kamary</type>
 			<type key="calendar" type="islamic-civil">Hijri-kamary senenamasy (tablisaly, raýat eýýamy)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri-kamary (tablisaly, raýat eýýamy)</type>
 			<type key="calendar" type="islamic-tbla">Hijri-kamary senenamasy (tablisaly, astronomik eýýam)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hijri-kamary (tablisaly, astronomil eýýam)</type>
 			<type key="calendar" type="islamic-umalqura">Hijri-kamary senenamasy (Umm al-Kura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri-kamary (Umm al-Kura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 senenamasy</type>
 			<type key="calendar" type="japanese">Ýapon senenamasy</type>
+			<type key="calendar" type="japanese" scope="core">Ýapon</type>
 			<type key="calendar" type="persian">Pars senenamasy</type>
+			<type key="calendar" type="persian" scope="core">Pars</type>
 			<type key="calendar" type="roc">Minguo senenamasy</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Pul birliginiň buhgalterçilik formaty</type>
+			<type key="cf" type="account" scope="core">Buhgalterçilik</type>
 			<type key="cf" type="standard">Pul birliginiň standart formaty</type>
+			<type key="cf" type="standard" scope="core">Standart</type>
 			<type key="collation" type="ducet">Deslapky Ýunikod tertip rejesi</type>
+			<type key="collation" type="ducet" scope="core">Deslapky ýunikod</type>
 			<type key="collation" type="search">Umumy maksatly gözleg</type>
+			<type key="collation" type="search" scope="core">Gözleg</type>
 			<type key="collation" type="standard">Standart tertip rejesi</type>
+			<type key="collation" type="standard" scope="core">Standart</type>
+			<type key="em" type="default" scope="core">Deslapky</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Tekst</type>
 			<type key="hc" type="h11">12 sagat ulgamy (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 sagat ulgamy (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 sagat ulgamy (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 sagat ulgamy (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Setirden setire geçişiň gowşak stili</type>
+			<type key="lb" type="loose" scope="core">Gowşak</type>
 			<type key="lb" type="normal">Setirden setire geçişiň adaty stili</type>
+			<type key="lb" type="normal" scope="core">Adaty</type>
 			<type key="lb" type="strict">Setirden setire geçişiň berk stili</type>
+			<type key="lb" type="strict" scope="core">Berk</type>
+			<type key="lw" type="breakall" scope="core">Hemmesi geçsin</type>
+			<type key="lw" type="keepall" scope="core">Hemmesi galsyn</type>
+			<type key="lw" type="normal" scope="core">Adaty</type>
+			<type key="lw" type="phrase" scope="core">Sözlemler galsyn</type>
 			<type key="ms" type="metric">Metrik ulgam</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">Imperial ölçeg ulgamy</type>
+			<type key="ms" type="uksystem" scope="core">Iňlis</type>
 			<type key="ms" type="ussystem">ABŞ ölçeg ulgamy</type>
+			<type key="ms" type="ussystem" scope="core">ABŞ</type>
 			<type key="numbers" type="arab">Arap-hindi sanlary</type>
 			<type key="numbers" type="arabext">Arap-hindi sanlarynyň giňeldilen görnüşi</type>
 			<type key="numbers" type="armn">Ermeni sanlary</type>
@@ -916,6 +961,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">Taý sanlary</type>
 			<type key="numbers" type="tibt">Tibet sanlary</type>
 			<type key="numbers" type="vaii">Waý sanlary</type>
+			<type key="ss" type="none" scope="core">öçürilen</type>
+			<type key="ss" type="standard" scope="core">açyk</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -938,13 +985,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="auxiliary">[c q v x]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B Ç D E Ä F G H I J Ž K L M N Ň O Ö P R S Ş T U Ü W Y Ý Z]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‑ – — , ; \: ! ? . … &quot;“” ( ) \[ \] \{ \} § @ * #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ – — , ; \: ! ? . … ' &quot;“” ( ) \[ \] \{ \} § @ * / {\&amp;,} #]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary" draft="contributed">[· / &lt; = &gt; ~ №]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -990,6 +1035,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'sagat' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -998,6 +1046,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'sagat' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1006,6 +1057,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1014,14 +1068,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
+						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="GyM">G M.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y E</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">'sagat' HH, v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1039,12 +1101,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
 							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
@@ -1407,18 +1463,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyM">G MM.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">'sagat' HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">dd.MM E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1440,11 +1499,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h B – h B</greatestDifference>
 							<greatestDifference id="h">h – h B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
@@ -1481,10 +1538,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">G d MMM, E – d MMM, E y</greatestDifference>
 							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1495,10 +1548,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">MM – MM</greatestDifference>
 						</intervalFormatItem>
@@ -1612,7 +1661,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>d/M/y GGGGG</pattern>
+							<pattern>d.M.y GGGGG</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1620,7 +1669,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">d, E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">d.M.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyM">M.y G</dateFormatItem>
+						<dateFormatItem id="GyMd">d.M.y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
@@ -2182,9 +2233,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Anguilla">
 				<exemplarCity>Angilýa</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Ýerewan</exemplarCity>
 			</zone>
@@ -2437,6 +2485,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pasha adasy</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Koýýaik</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Punta-Arenas</exemplarCity>
 			</zone>
@@ -2646,7 +2697,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Pnompen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderberi</exemplarCity>
+				<exemplarCity>Kanton adasy</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komor adalary</exemplarCity>
@@ -3107,6 +3158,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Johannesburg">
 				<exemplarCity>Ýohannesburg</exemplarCity>
 			</zone>
+			<metazone type="Acre">
+				<long>
+					<generic>Akri wagty</generic>
+					<standard>Akri standart wagty</standard>
+					<daylight>Akri tomusky wagty</daylight>
+				</long>
+			</metazone>
 			<metazone type="Afghanistan">
 				<long>
 					<standard>Owganystan wagty</standard>
@@ -3129,9 +3187,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Günbatar Afrika wagty</generic>
-					<standard>Günbatar Afrika standart wagty</standard>
-					<daylight>Günbatar Afrika tomusky wagty</daylight>
+					<standard>Günbatar Afrika wagty</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3179,6 +3235,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Anadyr">
 				<long>
 					<generic>Anadyr wagty</generic>
+					<daylight>Anadyr tomusky wagty</daylight>
 				</long>
 			</metazone>
 			<metazone type="Apia">
@@ -3486,6 +3543,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Gaýana wagty</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Gawaý-Aleut standart wagty</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Gawaý-Aleut wagty</generic>
@@ -3568,6 +3630,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Kamchatka">
 				<long>
 					<generic>Petropavlowsk-Kamçatskiý wagty</generic>
+					<daylight>Kamçatka tomusky wagty</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
@@ -3835,6 +3898,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<metazone type="Samara">
 				<long>
 					<generic>Samara wagty</generic>
+					<daylight>Samara tomusky wagty</daylight>
 				</long>
 			</metazone>
 			<metazone type="Samoa">
@@ -4075,13 +4139,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4891,6 +4968,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">gündogar karib dollary</displayName>
 				<displayName count="other">gündogar karib dollary</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>karib guldeni</displayName>
+				<displayName count="one">karib guldeni</displayName>
+				<displayName count="other">karib guldeni</displayName>
+				<symbol>Kg.</symbol>
+			</currency>
 			<currency type="XOF">
 				<displayName>KFA BCEAO franky</displayName>
 			</currency>
@@ -4919,6 +5002,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">zambiýa kwaçasy</displayName>
 				<displayName count="other">zambiýa kwaçasy</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwe altyny</displayName>
+				<displayName count="one">Zimbabwe altyny</displayName>
+				<displayName count="other">Zimbabwe altyny</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} gün</pluralMinimalPairs>
@@ -5120,7 +5208,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} millimol/litr</unitPattern>
 				<unitPattern count="other">{0} millimol/litr</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>bölek</displayName>
+				<unitPattern count="one">{0} bölek</unitPattern>
+				<unitPattern count="other">{0} bölek</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0} bölejik/million</unitPattern>
 				<unitPattern count="other">{0} bölejik/million</unitPattern>
 			</unit>
@@ -5139,6 +5232,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-mole">
 				<displayName>mollar</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>gýukoza</displayName>
+				<unitPattern count="one">{0} glýukoza</unitPattern>
+				<unitPattern count="other">{0} glýukoza</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/kilometr</displayName>
 				<unitPattern count="one">{0} litr/kilometr</unitPattern>
@@ -5395,7 +5493,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="graphics-dot-per-centimeter">
 				<displayName>santimetr başyna nokat</displayName>
 				<unitPattern count="one">santimetr başyna {0} nokat</unitPattern>
-				<unitPattern count="other">santimetr başyna {0} nokat</unitPattern>
+				<unitPattern count="other">{0} nokat santimetr başyna</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
 				<displayName>nokat dýuým başyna</displayName>
@@ -5627,6 +5725,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} millimetr simap sütüni</unitPattern>
 				<unitPattern count="other">{0} millimetr simap sütüni</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>simap sütüni</displayName>
+				<unitPattern count="one">{0} simap sütüni</unitPattern>
+				<unitPattern count="other">{0} simap sütüni</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funt/inedördül dýuým</displayName>
 				<unitPattern count="one">{0} funt/inedördül dýuým</unitPattern>
@@ -5800,6 +5903,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} metrik käse</unitPattern>
 				<unitPattern count="other">{0} metrik käse</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrik suwuk unsiýa</displayName>
+				<unitPattern count="one">{0} metrik suwuk unsiýa</unitPattern>
+				<unitPattern count="other">{0} metrik suwuk unsiýa</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akr-fut</displayName>
 				<unitPattern count="one">{0} akr-fut</unitPattern>
@@ -5880,21 +5988,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} Imp. kwarta</unitPattern>
 				<unitPattern count="other">{0} Imp. kwarta</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ýagtylyk</displayName>
-				<unitPattern count="one">{0} ýagtylyk</unitPattern>
-				<unitPattern count="other">{0} ýagtylyk</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradian</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>bölejik/milliard</displayName>
-				<unitPattern count="one">milliardda {0} bölejik</unitPattern>
-				<unitPattern count="other">milliardda {0} bölejik</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>gije</displayName>
-				<unitPattern count="one">{0} gije</unitPattern>
-				<unitPattern count="other">{0} gije</unitPattern>
-				<perUnitPattern>{0}/gije</perUnitPattern>
+			<unit type="electric-coulomb">
+				<displayName>kulon</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="other">{0} kulon</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>genri</displayName>
+				<unitPattern count="one">{0} genri</unitPattern>
+				<unitPattern count="other">{0} genri</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simens</displayName>
+				<unitPattern count="one">{0} simens</unitPattern>
+				<unitPattern count="other">{0} simens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kaloriýa [IT]</displayName>
+				<unitPattern count="one">{0} kaloriýa [IT]</unitPattern>
+				<unitPattern count="other">{0} kaloriýa [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekkerel</displayName>
+				<unitPattern count="one">{0} bekkerel</unitPattern>
+				<unitPattern count="other">{0} bekkerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>ziwert</displayName>
+				<unitPattern count="one">{0} ziwert</unitPattern>
+				<unitPattern count="other">{0} ziwert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>greý</displayName>
+				<unitPattern count="one">{0} greý</unitPattern>
+				<unitPattern count="other">{0} greý</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram-güýç</displayName>
+				<unitPattern count="one">{0} kilogram-güýç</unitPattern>
+				<unitPattern count="other">{0} kilogram-güýç</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>esasy ugur</displayName>
@@ -5962,8 +6119,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-millimole-per-liter">
 				<displayName>millimol/litr</displayName>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>bölejik/million</displayName>
+			<unit type="concentr-part">
+				<displayName>bölek</displayName>
+				<unitPattern count="one">{0} bölek</unitPattern>
+				<unitPattern count="other">{0} bölek</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>böl/mln.</displayName>
+				<unitPattern count="one">{0} böl/mln.</unitPattern>
+				<unitPattern count="other">{0} böl/mln.</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>göterim</displayName>
@@ -5974,6 +6138,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-permyriad">
 				<displayName>permiriad</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glýuk</displayName>
+				<unitPattern count="one">{0} Glýuk</unitPattern>
+				<unitPattern count="other">{0} Glýuk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6334,6 +6503,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>simap sütüni</displayName>
+				<unitPattern count="one">{0} simap süt.</unitPattern>
+				<unitPattern count="other">{0} simap süt.</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>dý sim.süt.</displayName>
 				<unitPattern count="one">{0} dý sim.süt.</unitPattern>
@@ -6362,6 +6536,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} dü.</unitPattern>
 				<unitPattern count="other">{0} dü.</unitPattern>
 			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">Bft {0}</unitPattern>
+				<unitPattern count="other">Bft {0}</unitPattern>
+			</unit>
 			<unit type="volume-cubic-centimeter">
 				<displayName>sm³</displayName>
 				<unitPattern count="one">{0} sm³</unitPattern>
@@ -6411,6 +6589,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mkä</unitPattern>
 				<unitPattern count="other">{0} mkä</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>suw uns m.</displayName>
+				<unitPattern count="one">{0} suw uns m.</unitPattern>
+				<unitPattern count="other">{0} suw uns m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akr-ft</displayName>
 				<unitPattern count="one">{0} ak-ft</unitPattern>
@@ -6481,15 +6664,75 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} kt Imp.</unitPattern>
 				<unitPattern count="other">{0} kt Imp.</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Kl</displayName>
+				<unitPattern count="one">{0} Kl</unitPattern>
+				<unitPattern count="other">{0} Kl</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Gn</displayName>
+				<unitPattern count="one">{0} Gn</unitPattern>
+				<unitPattern count="other">{0} Gn</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>Sm</displayName>
+				<unitPattern count="one">{0} Sm</unitPattern>
+				<unitPattern count="other">{0} Sm</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">{0} Bk</unitPattern>
+				<unitPattern count="other">{0} Bk</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Zw</displayName>
+				<unitPattern count="one">{0} Zw</unitPattern>
+				<unitPattern count="other">{0} Zw</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gr</displayName>
+				<unitPattern count="one">{0} Gr</unitPattern>
+				<unitPattern count="other">{0} Gr</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kgg</displayName>
+				<unitPattern count="one">{0} kgg</unitPattern>
+				<unitPattern count="other">{0} kgg</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ýagtylyk</displayName>
 				<unitPattern count="one">{0} ýagtylyk</unitPattern>
 				<unitPattern count="other">{0} ýagtylyk</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>bölejik/milliard</displayName>
-				<unitPattern count="one">{0} bölejik/milliard</unitPattern>
-				<unitPattern count="other">{0} bölejik/milliard</unitPattern>
+			<unit type="concentr-part-per-1e9">
+				<displayName>böl/mlrd.</displayName>
+				<unitPattern count="one">{0} böl/mlrd</unitPattern>
+				<unitPattern count="other">{0} böl/mlrd</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>gije</displayName>
@@ -6519,9 +6762,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>bölek</displayName>
+				<unitPattern count="one">{0} bölek</unitPattern>
+				<unitPattern count="other">{0} bölek</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>bmln</displayName>
+				<unitPattern count="one">{0} bmln</unitPattern>
+				<unitPattern count="other">{0} bmln</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glýuk</displayName>
+				<unitPattern count="one">{0} Glýuk</unitPattern>
+				<unitPattern count="other">{0} Glýuk</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0}m/gUK</unitPattern>
 				<unitPattern count="other">{0}m/gUK</unitPattern>
@@ -6623,6 +6881,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mmHg</unitPattern>
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>simap süt.</displayName>
+				<unitPattern count="one">{0} sim. süt.</unitPattern>
+				<unitPattern count="other">{0} sim. süt.</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ Hg</displayName>
 				<unitPattern count="one">{0}″ Hg</unitPattern>
@@ -6636,10 +6899,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="speed-meter-per-second">
 				<displayName>m/s</displayName>
 			</unit>
+			<unit type="speed-beaufort">
+				<unitPattern count="one">Bft {0}</unitPattern>
+				<unitPattern count="other">Bft {0}</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one">{0}l</unitPattern>
 				<unitPattern count="other">{0}l</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>suw uns m.</displayName>
+				<unitPattern count="one">{0} suw uns m.</unitPattern>
+				<unitPattern count="other">{0} suw uns m.</unitPattern>
+			</unit>
 			<unit type="volume-gallon-imperial">
 				<unitPattern count="one">{0}galIm</unitPattern>
 				<unitPattern count="other">{0}galIm</unitPattern>
@@ -6678,22 +6950,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} kt-Imp.</unitPattern>
 				<unitPattern count="other">{0} kt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ýagtylyk</displayName>
-				<unitPattern count="one">{0} ýagtylyk</unitPattern>
-				<unitPattern count="other">{0} ýagtylyk</unitPattern>
+			<unit type="electric-coulomb">
+				<displayName>Kl</displayName>
+				<unitPattern count="one">{0} Kl</unitPattern>
+				<unitPattern count="other">{0} Kl</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="electric-henry">
+				<displayName>Gn</displayName>
+				<unitPattern count="one">{0} Gn</unitPattern>
+				<unitPattern count="other">{0} Gn</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>Sm</displayName>
+				<unitPattern count="one">{0} Sm</unitPattern>
+				<unitPattern count="other">{0} Sm</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">{0} Bk</unitPattern>
+				<unitPattern count="other">{0} Bk</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Zw</displayName>
+				<unitPattern count="one">{0} Zw</unitPattern>
+				<unitPattern count="other">{0} Zw</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gr</displayName>
+				<unitPattern count="one">{0} Gr</unitPattern>
+				<unitPattern count="other">{0} Gr</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kgg</displayName>
+				<unitPattern count="one">{0} kgg</unitPattern>
+				<unitPattern count="other">{0} kgg</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>bmlrd</displayName>
 				<unitPattern count="one">{0} bmlrd</unitPattern>
 				<unitPattern count="other">{0} bmlrd</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>gije</displayName>
-				<unitPattern count="one">{0} gije</unitPattern>
-				<unitPattern count="other">{0} gije</unitPattern>
-				<perUnitPattern>{0}/gije</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}gd</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0}dg</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/tn.xml b/make/data/cldr/common/main/tn.xml
index e157138b2a5..7d8cbf92728 100644
--- a/make/data/cldr/common/main/tn.xml
+++ b/make/data/cldr/common/main/tn.xml
@@ -336,6 +336,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">monongwaga</relative>
 				<relative type="1">ngwaga o tlang</relative>
 			</field>
+			<field type="month">
+				<relative type="-1">kgwedi e fetileng</relative>
+				<relative type="0">kgwedi eno</relative>
+				<relative type="1">kgwedi e tlang</relative>
+			</field>
+			<field type="week">
+				<relative type="-1">beke e fetileng</relative>
+				<relative type="0">beke eno</relative>
+				<relative type="1">beke e tlang</relative>
+			</field>
+			<field type="day">
+				<relative type="-1">maabane</relative>
+				<relative type="0">gompieno</relative>
+				<relative type="1">kamoso</relative>
+			</field>
+			<field type="sun">
+				<relative type="-1">Tshipi e fetileng</relative>
+				<relative type="0">Tshipi eno</relative>
+				<relative type="1">Tshipi e tlang</relative>
+			</field>
 		</fields>
 		<timeZoneNames>
 			<metazone type="GMT">
@@ -347,7 +367,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<symbols numberSystem="latn">
-			<group>’</group>
+			<group>'</group>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
diff --git a/make/data/cldr/common/main/to.xml b/make/data/cldr/common/main/to.xml
index e3010060c94..adea3915467 100644
--- a/make/data/cldr/common/main/to.xml
+++ b/make/data/cldr/common/main/to.xml
@@ -696,6 +696,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Bass">tohinima fakapasa-vā</script>
 			<script type="Batk">tohinima fakapātaki</script>
 			<script type="Beng">tohinima fakapāngilā</script>
+			<script type="Berf" draft="unconfirmed">tohinima fakapeliaʻēfe</script>
 			<script type="Bhks" draft="unconfirmed">tohinima fakapaikisuki</script>
 			<script type="Blis">tohinima fakaʻilonga-pilisi</script>
 			<script type="Bopo">tohinima fakapopomofo</script>
@@ -842,6 +843,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Shaw">tohinima fakasiavi</script>
 			<script type="Shrd">tohinima fakasiālatā</script>
 			<script type="Sidd">tohinima fakasititami</script>
+			<script type="Sidt" draft="unconfirmed">tohinima fakasitetika</script>
 			<script type="Sind">tohinima fakakutauāti</script>
 			<script type="Sinh">tohinima fakasingihala</script>
 			<script type="Sogd" draft="unconfirmed">tohinima fakasokitia</script>
@@ -862,6 +864,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Taml">tohinima fakatamili</script>
 			<script type="Tang">tohinima fakatanguti</script>
 			<script type="Tavt">tohinima fakatai-vieti</script>
+			<script type="Tayo" draft="unconfirmed">tohinima fakataiio</script>
 			<script type="Telu">tohinima fakaʻinitia-teluku</script>
 			<script type="Teng">tohinima fakatengiuali</script>
 			<script type="Tfng">tohinima fakatifināki</script>
@@ -872,6 +875,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Tirh">tohinima fakatīhuta</script>
 			<script type="Tnsa" draft="unconfirmed">tohinima fakatangisā</script>
 			<script type="Todr" draft="unconfirmed">tohinima fakatotili</script>
+			<script type="Tols" draft="unconfirmed">tohinima fakatolongisiki</script>
 			<script type="Toto" draft="unconfirmed">tohinima fakatoto</script>
 			<script type="Tutg" draft="unconfirmed">tohinima fakatulutikalāli</script>
 			<script type="Ugar">tohinima fakaʻūkaliti</script>
@@ -1351,14 +1355,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="persian">fakapēsia</type>
 			<type key="calendar" type="roc">fakalepupelika siaina</type>
 			<type key="cf" type="account">anga paʻanga-kalake</type>
+			<type key="cf" type="account" scope="core" draft="unconfirmed">paʻanga-kalake</type>
 			<type key="cf" type="standard">anga paʻanga-sīpinga</type>
-			<type key="collation" type="big5han" draft="unconfirmed">siaina-nimalahi</type>
+			<type key="cf" type="standard" scope="core" draft="unconfirmed">sīpinga</type>
 			<type key="collation" type="compat" draft="unconfirmed">ki muʻa, hoa</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">tikisinale</type>
 			<type key="collation" type="ducet">ʻunikōti</type>
 			<type key="collation" type="emoji" draft="unconfirmed">ngaahi ongo</type>
 			<type key="collation" type="eor" draft="unconfirmed">fakaʻeulope</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">siaina-fakafaingofua</type>
 			<type key="collation" type="phonebook">fika telefoni</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">piniini</type>
 			<type key="collation" type="reformed" draft="unconfirmed">fakafoʻou</type>
@@ -1370,15 +1374,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="unihan" draft="unconfirmed">tongi tefitoʻi</type>
 			<type key="collation" type="zhuyin" draft="unconfirmed">sūini</type>
 			<type key="hc" type="h11">takai houa 0–11</type>
+			<type key="hc" type="h11" scope="core" draft="unconfirmed">12 (0–11)</type>
 			<type key="hc" type="h12">takai houa 1–12</type>
+			<type key="hc" type="h12" scope="core" draft="unconfirmed">12 (1–12)</type>
 			<type key="hc" type="h23">takai houa 0–23</type>
+			<type key="hc" type="h23" scope="core" draft="unconfirmed">24 (0–23)</type>
 			<type key="hc" type="h24">takai houa 1–24</type>
+			<type key="hc" type="h24" scope="core" draft="unconfirmed">24 (1–24)</type>
 			<type key="lb" type="loose">fesiʻilaine ngaloku</type>
+			<type key="lb" type="loose" scope="core" draft="unconfirmed">ngaloku</type>
 			<type key="lb" type="normal">fesiʻilaine faʻafai</type>
+			<type key="lb" type="normal" scope="core" draft="unconfirmed">faʻafai</type>
 			<type key="lb" type="strict">fesiʻilaine mafao</type>
+			<type key="lb" type="strict" scope="core" draft="unconfirmed">mafao</type>
 			<type key="ms" type="metric">founga fakamita</type>
+			<type key="ms" type="metric" scope="core" draft="unconfirmed">fakamita</type>
 			<type key="ms" type="uksystem">founga fakapilitānia</type>
+			<type key="ms" type="uksystem" scope="core" draft="unconfirmed">fakapilitānia</type>
 			<type key="ms" type="ussystem">founga fakaʻamelika</type>
+			<type key="ms" type="ussystem" scope="core" draft="unconfirmed">fakaʻamelika</type>
 			<type key="numbers" type="ahom" draft="unconfirmed">fika fakaʻahomi</type>
 			<type key="numbers" type="arab">fika fakaʻalepea</type>
 			<type key="numbers" type="arabext">fika fakaʻalepea fakalahi</type>
@@ -1577,16 +1591,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</cyclicNameSet>
 				</cyclicNameSets>
 			</calendar>
-			<calendar type="coptic">
-				<eras>
-					<eraNames>
-						<era type="0" draft="unconfirmed">Taʻu maletile</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="unconfirmed">TMT</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
 			<calendar type="ethiopic">
 				<eras>
 					<eraNames>
@@ -2719,11 +2723,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat type="daylight">{0} Taimi liliu</regionFormat>
 			<regionFormat type="standard">{0} Taimi totonu</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="unconfirmed">HTT</generic>
-					<standard draft="unconfirmed">HTT</standard>
-					<daylight draft="unconfirmed">HTL</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2797,9 +2796,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>Loma</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ʻEnitipulī</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Kanitoni</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2924,9 +2920,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>houa fakaʻafelika-hihifo</generic>
-					<standard>houa fakaʻafelika-hihifo taimi totonu</standard>
-					<daylight>houa fakaʻafelika-hihifo taimi liliu</daylight>
+					<standard>houa fakaʻafelika-hihifo</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3314,6 +3308,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>houa fakakuiana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>houa fakahauaiʻi-aleuti taimi totonu</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>houa fakahauaiʻi-aleuti</generic>
@@ -4281,7 +4280,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>kongokonga</displayName>
 				<unitPattern count="other">kongokonga ʻe {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="unconfirmed">paati</displayName>
+				<unitPattern count="other" draft="unconfirmed">paati ʻe {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>konga he miliona</displayName>
 				<unitPattern count="other">konga ʻe {0} he miliona</unitPattern>
 			</unit>
@@ -4695,6 +4698,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>milimita meakuli</displayName>
 				<unitPattern count="other">milimita meakuli ʻe {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="unconfirmed">meakuli</displayName>
+				<unitPattern count="other" draft="unconfirmed">meakuli ʻe {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pāuni he ʻinisi sikuea</displayName>
 				<unitPattern count="other">pāuni he ʻinisi sikuea ʻe {0}</unitPattern>
@@ -4834,6 +4841,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ipu fakamita</displayName>
 				<unitPattern count="other">ipu fakamita ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">ʻaunisetafe fakamita</displayName>
+				<unitPattern count="other" draft="unconfirmed">ʻaunisetafe fakamita ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ʻeka-fute</displayName>
 				<unitPattern count="other">ʻeka-fute ʻe {0}</unitPattern>
@@ -4860,10 +4871,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>painite</displayName>
 				<unitPattern count="other">painite ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName draft="unconfirmed">painite fakaʻemipaea</displayName>
+				<unitPattern count="other" draft="unconfirmed">painite fakaʻemipaea ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>ipu</displayName>
 				<unitPattern count="other">ipu ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName draft="unconfirmed">ipu fakaʻemipaea</displayName>
+				<unitPattern count="other" draft="unconfirmed">ipu fakaʻemipaea ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>ʻaunise tafe</displayName>
 				<unitPattern count="other">ʻaunise tafe ʻe {0}</unitPattern>
@@ -4900,11 +4919,59 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>kuata fakaʻemipaea</displayName>
 				<unitPattern count="other">kuata fakaʻemipaea ʻe {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="unconfirmed">lētiani sikuea</displayName>
+				<unitPattern count="other" draft="unconfirmed">lētiani sikuea ʻe {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="unconfirmed">pekeleli</displayName>
+				<unitPattern count="other" draft="unconfirmed">pekeleli ʻe {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName draft="unconfirmed">sīveti</displayName>
+				<unitPattern count="other" draft="unconfirmed">sīveti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="unconfirmed">kelē</displayName>
+				<unitPattern count="other" draft="unconfirmed">kelē ʻe {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="unconfirmed">kilokalami-mālohi</displayName>
+				<unitPattern count="other" draft="unconfirmed">kilokalami-mālohi ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName draft="unconfirmed">loti</displayName>
+				<unitPattern count="other" draft="unconfirmed">loti ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName draft="unconfirmed">sēini</displayName>
+				<unitPattern count="other" draft="unconfirmed">sēini ʻe {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="unconfirmed">tesila</displayName>
+				<unitPattern count="other" draft="unconfirmed">tesila ʻe {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="unconfirmed">Uepe</displayName>
+				<unitPattern count="other" draft="unconfirmed">Uepe ʻe {0}</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName draft="unconfirmed">lanikine</displayName>
+				<unitPattern count="other" draft="unconfirmed">lanikine ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName draft="unconfirmed">fakahiliuike</displayName>
+				<unitPattern count="other" draft="unconfirmed">fakahiliuike ʻe {0}</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName draft="unconfirmed">penisini-tatau</displayName>
+				<unitPattern count="other" draft="unconfirmed">penisini-tatau ʻe {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="unconfirmed">vavemaama</displayName>
 				<unitPattern count="other" draft="unconfirmed">vavemaama ʻe {0}</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName draft="unconfirmed">konga ʻi he piliona</displayName>
 				<unitPattern count="other" draft="unconfirmed">konga ʻe {0} ʻi he piliona</unitPattern>
 			</unit>
@@ -5015,7 +5082,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>kkonga</displayName>
 				<unitPattern count="other">kkonga ʻe {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>khm</displayName>
 				<unitPattern count="other">khm ʻe {0}</unitPattern>
 			</unit>
@@ -5427,6 +5494,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>mm-Hg</displayName>
 				<unitPattern count="other">mm-Hg ʻe {0}</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other" draft="unconfirmed">Hg ʻe {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pā/in²</displayName>
 				<unitPattern count="other">pā/in² ʻe {0}</unitPattern>
@@ -5552,6 +5622,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ipm</displayName>
 				<unitPattern count="other">ipm ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">ʻau-tf-m</displayName>
+				<unitPattern count="other" draft="unconfirmed">ʻau-tf-m ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ʻe-ft</displayName>
 				<unitPattern count="other">ʻe-ft ʻe {0}</unitPattern>
@@ -5577,10 +5651,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-pint">
 				<unitPattern count="other">pt ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName draft="unconfirmed">pt-ʻem</displayName>
+				<unitPattern count="other" draft="unconfirmed">pt-ʻem ʻe {0}</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<displayName>ip</displayName>
 				<unitPattern count="other">ip ʻe {0}</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName draft="unconfirmed">ip-ʻem</displayName>
+				<unitPattern count="other" draft="unconfirmed">ip-ʻem ʻre {0}</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<displayName>ʻau-tf</displayName>
 				<unitPattern count="other">ʻau-tf ʻe {0}</unitPattern>
@@ -5629,6 +5711,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ku-ʻem</displayName>
 				<unitPattern count="other">ku-ʻem ʻe {0}</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="unconfirmed">lēt²</displayName>
+				<unitPattern count="other" draft="unconfirmed">lēt² ʻe {0}</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="unconfirmed">Pq</displayName>
+				<unitPattern count="other" draft="unconfirmed">Pq ʻe {0}</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other" draft="unconfirmed">Sv ʻe {0}</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="unconfirmed">Ky</displayName>
+				<unitPattern count="other" draft="unconfirmed">Ky ʻe {0}</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="unconfirmed">kk-m</displayName>
+				<unitPattern count="other" draft="unconfirmed">kk-m ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName draft="unconfirmed">lt</displayName>
+				<unitPattern count="other" draft="unconfirmed">lt ʻe {0}</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName draft="unconfirmed">sn</displayName>
+				<unitPattern count="other" draft="unconfirmed">sn ʻe {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other" draft="unconfirmed">T ʻe {0}</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="unconfirmed">Up</displayName>
+				<unitPattern count="other" draft="unconfirmed">Up ʻe {0}</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName draft="unconfirmed">°L</displayName>
+				<unitPattern count="other" draft="unconfirmed">°L ʻe {0}</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName draft="unconfirmed">fhu</displayName>
+				<unitPattern count="other" draft="unconfirmed">fhu ʻe {0}</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName draft="unconfirmed">pe-t</displayName>
+				<unitPattern count="other" draft="unconfirmed">pe-t ʻe {0}</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="unconfirmed">vm</displayName>
 				<unitPattern count="other" draft="unconfirmed">vm ʻe {0}</unitPattern>
@@ -5715,7 +5843,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>kk</displayName>
 				<unitPattern count="other">kk ʻe {0}</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0} khm</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
@@ -6071,6 +6199,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="pressure-millimeter-ofhg">
 				<unitPattern count="other">{0} mm-Hg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other" draft="unconfirmed">Hg ʻe {0}</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">{0} pā/in²</unitPattern>
 			</unit>
@@ -6173,6 +6304,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} ipm</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">ʻau-tf-m</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ʻau-tf-m</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="other">{0} ʻe-ft</unitPattern>
 			</unit>
@@ -6193,9 +6328,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-pint">
 				<unitPattern count="other">{0} pt</unitPattern>
 			</unit>
+			<unit type="volume-pint-imperial">
+				<displayName draft="unconfirmed">pt-ʻem</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} pt-ʻem</unitPattern>
+			</unit>
 			<unit type="volume-cup">
 				<unitPattern count="other">{0} ip</unitPattern>
 			</unit>
+			<unit type="volume-cup-imperial">
+				<displayName draft="unconfirmed">ip-ʻem</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ip-ʻem</unitPattern>
+			</unit>
 			<unit type="volume-fluid-ounce">
 				<unitPattern count="other">{0} ʻau-tf</unitPattern>
 			</unit>
@@ -6233,6 +6376,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0} ku-ʻem</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName draft="unconfirmed">lēt²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} lēt²</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName draft="unconfirmed">Pq</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Pq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other" draft="unconfirmed">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName draft="unconfirmed">Ky</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Ky</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName draft="unconfirmed">kk-m</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} kk-m</unitPattern>
+			</unit>
+			<unit type="length-rod">
+				<displayName draft="unconfirmed">lt</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} lt</unitPattern>
+			</unit>
+			<unit type="length-chain">
+				<displayName draft="unconfirmed">sn</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} sn</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other" draft="unconfirmed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="unconfirmed">Up</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Up</unitPattern>
+			</unit>
+			<unit type="temperature-rankine">
+				<displayName draft="unconfirmed">°L</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} °L</unitPattern>
+			</unit>
+			<unit type="duration-fortnight">
+				<displayName draft="unconfirmed">fhu</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} fhu</unitPattern>
+			</unit>
+			<unit type="pressure-gasoline-energy-density">
+				<displayName draft="unconfirmed">pe-t</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} pe-t</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName draft="unconfirmed">vm</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} vm</unitPattern>
diff --git a/make/data/cldr/common/main/tok.xml b/make/data/cldr/common/main/tok.xml
index 59db8671691..c1c54695adf 100644
--- a/make/data/cldr/common/main/tok.xml
+++ b/make/data/cldr/common/main/tok.xml
@@ -11,74 +11,160 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<language type="tok"/>
 	</identity>
 	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} pi {1}</localePattern>
-			<localeSeparator>{0} pi {1}</localeSeparator>
-		</localeDisplayPattern>
 		<languages>
-			<language type="ar" draft="unconfirmed">toki Alapi</language>
-			<language type="bn" draft="unconfirmed">toki Panla</language>
-			<language type="de" draft="unconfirmed">toki Tosi</language>
+			<language type="af">toki Apikan</language>
+			<language type="am">toki Amali</language>
+			<language type="ar">toki Alapi</language>
+			<language type="bn">toki Panla</language>
+			<language type="bs">toki Posuna</language>
+			<language type="ceb">toki Supo</language>
+			<language type="de">toki Tosi</language>
+			<language type="el">toki Elin</language>
 			<language type="en">toki Inli</language>
-			<language type="en_CA" draft="unconfirmed">toki Inli pi ma Kanata</language>
-			<language type="en_GB" draft="unconfirmed">toki Inli pi ma Piten</language>
-			<language type="en_GB" alt="short" draft="unconfirmed">toki Inli pi ma Juke</language>
-			<language type="es" draft="unconfirmed">toki Epanja</language>
-			<language type="es_419" draft="unconfirmed">toki Epanja pi ma Amelika</language>
-			<language type="fr" draft="unconfirmed">toki Kanse</language>
-			<language type="fr_CA" draft="unconfirmed">toki Kanse pi ma Kanata</language>
-			<language type="hi" draft="unconfirmed">toki Insi</language>
-			<language type="id" draft="unconfirmed">toki Intonesija</language>
-			<language type="it" draft="unconfirmed">toki Italija</language>
-			<language type="ja" draft="unconfirmed">toki Nijon</language>
-			<language type="ko" draft="unconfirmed">toki Anku</language>
-			<language type="nl" draft="unconfirmed">toki Netelan</language>
-			<language type="pl" draft="unconfirmed">toki Posuka</language>
-			<language type="pt" draft="unconfirmed">toki Potuke</language>
-			<language type="ru" draft="unconfirmed">toki Lusi</language>
-			<language type="th" draft="unconfirmed">toki Tawi</language>
+			<language type="en_AU">toki Inli pi ma Oseja</language>
+			<language type="en_CA">toki Inli pi ma Kanata</language>
+			<language type="en_GB">toki Inli pi ma Juke</language>
+			<language type="eo">toki Epelanto</language>
+			<language type="es">toki Epanjo</language>
+			<language type="es_419">toki Epanjo pi ma Amelika</language>
+			<language type="es_ES">toki Epanjo pi ma Epanja</language>
+			<language type="es_MX">toki Epanjo pi ma Mesiko</language>
+			<language type="eu">toki Esuka</language>
+			<language type="fa">toki Pasi</language>
+			<language type="fa_AF">toki Pasi pi ma Akan</language>
+			<language type="fi">toki Sumi</language>
+			<language type="fil">toki Takalo</language>
+			<language type="fr">toki Kanse</language>
+			<language type="fr_CA">toki Kanse pi ma Kanata</language>
+			<language type="fy">toki Lise</language>
+			<language type="gu">toki Kusalasi</language>
+			<language type="he">toki Iwi</language>
+			<language type="hi">toki Insi</language>
+			<language type="hr">toki Kowata</language>
+			<language type="hu">toki Maja</language>
+			<language type="ia">toki Intelinwa</language>
+			<language type="id">toki Intonesija</language>
+			<language type="io">toki Ito</language>
+			<language type="it">toki Italija</language>
+			<language type="ja">toki Nijon</language>
+			<language type="jbo">toki Losupan</language>
+			<language type="jv">toki Sowa</language>
+			<language type="km">toki Kame</language>
+			<language type="ko">toki Anku</language>
+			<language type="kw">toki Kenuwe</language>
+			<language type="la">toki Lasina</language>
+			<language type="mas">toki Ma</language>
+			<language type="mi">toki Majoli</language>
+			<language type="mr">toki Malasi</language>
+			<language type="ms">toki Melaju</language>
+			<language type="mul">toki mute</language>
+			<language type="my">toki Mijama</language>
+			<language type="nan">toki Pan pi ma seli</language>
+			<language type="nb">toki Nosiki lipu</language>
+			<language type="nl">toki Netelan</language>
+			<language type="nn">toki Nosiki sin</language>
+			<language type="no">toki Nosiki</language>
+			<language type="pl">toki Posuka</language>
+			<language type="pt">toki Potuke</language>
+			<language type="ru">toki Lusi</language>
+			<language type="so">toki Somali</language>
+			<language type="sr">toki Sepi</language>
+			<language type="ss">toki Suwasi</language>
+			<language type="sv">toki Sensa</language>
+			<language type="sw">toki Suwawili</language>
+			<language type="sw_CD">toki Suwawili pi ma Konko</language>
+			<language type="ta">toki Tami</language>
+			<language type="te">toki Teluku</language>
+			<language type="th">toki Tawi</language>
+			<language type="tn">toki Suwana</language>
 			<language type="tok">toki pona</language>
-			<language type="tr" draft="unconfirmed">toki Tuki</language>
+			<language type="tr">toki Tuki</language>
+			<language type="ts">toki Sonka</language>
+			<language type="uk">toki Ukawina</language>
 			<language type="und" draft="unconfirmed">toki ante</language>
+			<language type="ur">toki Utu</language>
 			<language type="uz">toki Opeki</language>
-			<language type="zh" draft="unconfirmed">toki Sonko</language>
+			<language type="ve">toki Wenta</language>
+			<language type="vi">toki Wije</language>
+			<language type="vo">toki Olapu</language>
+			<language type="xh">toki Kosa</language>
+			<language type="yo">toki Jolupa</language>
+			<language type="yue">toki Ju</language>
+			<language type="yue" alt="menu">toki Konton</language>
+			<language type="zh">toki Sonko</language>
+			<language type="zh" alt="menu">toki Sonko kulupu</language>
+			<language type="zh_Hans">toki Sonko pi linja lili</language>
+			<language type="zh_Hans" alt="long">toki An pi linja lili</language>
+			<language type="zh_Hant">toki Sonko pi linja mute</language>
+			<language type="zh_Hant" alt="long">toki An pi linja mute</language>
+			<language type="zu">toki Sulu</language>
+			<language type="zxx">toki ala</language>
 		</languages>
 		<scripts>
 			<script type="Arab">sitelen Alapi</script>
-			<script type="Cyrl" draft="unconfirmed">sitelen Kililita</script>
-			<script type="Hans" draft="unconfirmed">sitelen Sonko</script>
+			<script type="Beng">sitelen Panla</script>
+			<script type="Cyrl">sitelen Kililisa</script>
+			<script type="Grek">sitelen Elin</script>
+			<script type="Gujr">sitelen Kusalasi</script>
+			<script type="Hang">sitelen Anku</script>
+			<script type="Hani">sitelen An</script>
+			<script type="Hans">linja lili</script>
+			<script type="Hans" alt="stand-alone">sitelen Sonko pi linja lili</script>
+			<script type="Hant">linja mute</script>
+			<script type="Hant" alt="stand-alone">sitelen Sonko pi linja mute</script>
+			<script type="Hebr">sitelen Iwi</script>
+			<script type="Java">sitelen Sowa</script>
 			<script type="Jpan">sitelen Nijon</script>
+			<script type="Khmr">sitelen Kame</script>
 			<script type="Kore" draft="unconfirmed">sitelen Anku</script>
 			<script type="Latn">sitelen Lasina</script>
+			<script type="Mymr">sitelen Mijama</script>
+			<script type="Taml" draft="unconfirmed">sitelen Tami</script>
+			<script type="Telu">sitelen Teluku</script>
+			<script type="Thai">sitelen Tawi</script>
+			<script type="Zinh">sitelen poka</script>
+			<script type="Zmth">sitelen nanpa</script>
+			<script type="Zsye">sitelen Emosi</script>
+			<script type="Zsym">sitelen ijo</script>
 			<script type="Zxxx">sitelen ala</script>
+			<script type="Zyyy">sitelen ale</script>
 			<script type="Zzzz">sitelen ante</script>
 		</scripts>
 		<territories>
 			<territory type="001">ma ale</territory>
-			<territory type="002" draft="unconfirmed">ma Apika</territory>
-			<territory type="009" draft="unconfirmed">ma Osijanija</territory>
-			<territory type="019" draft="unconfirmed">ma Amelika</territory>
-			<territory type="142" draft="unconfirmed">ma Asija</territory>
-			<territory type="150" draft="unconfirmed">ma Elopa</territory>
+			<territory type="002">ma Apika</territory>
+			<territory type="003">ma Amelika lete</territory>
+			<territory type="005">ma Amelika seli</territory>
+			<territory type="009">ma Osejanija</territory>
+			<territory type="013">ma Amelika insa</territory>
+			<territory type="019">ma Amelika</territory>
+			<territory type="039">ma Elopa seli</territory>
+			<territory type="142">ma Asija</territory>
+			<territory type="150">ma Elopa</territory>
+			<territory type="151">ma Elopa pi kama suno</territory>
+			<territory type="154">ma Elopa lete</territory>
+			<territory type="155">ma Elopa pi pini suno</territory>
 			<territory type="AD" draft="unconfirmed">ma Antola</territory>
-			<territory type="AF" draft="unconfirmed">ma Akanisan</territory>
+			<territory type="AE">ma Imala</territory>
+			<territory type="AF">ma Akan</territory>
 			<territory type="AL" draft="unconfirmed">ma Sipe</territory>
 			<territory type="AM" draft="unconfirmed">ma Aja</territory>
 			<territory type="AO" draft="unconfirmed">ma Ankola</territory>
-			<territory type="AQ" draft="unconfirmed">ma Antasika</territory>
+			<territory type="AQ">ma Antasika</territory>
 			<territory type="AR" draft="unconfirmed">ma Alensina</territory>
-			<territory type="AT" draft="unconfirmed">ma Esalasi</territory>
-			<territory type="AU" draft="unconfirmed">ma Oselija</territory>
+			<territory type="AT">ma Esalasi</territory>
+			<territory type="AU">ma Oseja</territory>
 			<territory type="BA" draft="unconfirmed">ma Posan</territory>
-			<territory type="BD" draft="unconfirmed">ma Panla</territory>
-			<territory type="BE" draft="unconfirmed">ma Pesije</territory>
+			<territory type="BD">ma Panla</territory>
+			<territory type="BE">ma Pelije</territory>
 			<territory type="BF" draft="unconfirmed">ma Pukinapaso</territory>
 			<territory type="BG" draft="unconfirmed">toki Pokasi</territory>
 			<territory type="BH" draft="unconfirmed">ma Palani</territory>
 			<territory type="BJ" draft="unconfirmed">ma Penen</territory>
-			<territory type="BR" draft="unconfirmed">ma Pasiju</territory>
-			<territory type="BW" draft="unconfirmed">ma Posuwana</territory>
+			<territory type="BR">ma Pasiju</territory>
+			<territory type="BW">ma Suwana</territory>
 			<territory type="BY" draft="unconfirmed">ma Pelalusi</territory>
+			<territory type="CA">ma Kanata</territory>
 			<territory type="CD" draft="unconfirmed">ma Konko pi ma tomo Kinsasa</territory>
 			<territory type="CF" draft="unconfirmed">ma Santapiken</territory>
 			<territory type="CG" draft="unconfirmed">ma Konko pi ma tomo Pasapi</territory>
@@ -86,57 +172,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CI" draft="unconfirmed">ma Kosiwa</territory>
 			<territory type="CL" draft="unconfirmed">ma Sile</territory>
 			<territory type="CM" draft="unconfirmed">ma Kamelun</territory>
-			<territory type="CN" draft="unconfirmed">ma Sonko</territory>
+			<territory type="CN">ma Sonko</territory>
 			<territory type="CO" draft="unconfirmed">ma Kolonpija</territory>
 			<territory type="CY" draft="unconfirmed">ma Kiposi</territory>
 			<territory type="CZ" draft="unconfirmed">ma Seki</territory>
-			<territory type="DE" draft="unconfirmed">ma Tosi</territory>
+			<territory type="DE">ma Tosi</territory>
 			<territory type="DJ" draft="unconfirmed">ma Sipusi</territory>
 			<territory type="DK" draft="unconfirmed">ma Tansi</territory>
 			<territory type="DZ" draft="unconfirmed">ma Sasali</territory>
-			<territory type="EC" draft="unconfirmed">ma Ekato</territory>
+			<territory type="EC">ma Ekuwato</territory>
 			<territory type="EE" draft="unconfirmed">ma Esi</territory>
-			<territory type="EG" draft="unconfirmed">ma Masu</territory>
+			<territory type="EG">ma Masi</territory>
 			<territory type="ER" draft="unconfirmed">ma Eliteja</territory>
-			<territory type="ES" draft="unconfirmed">ma Epanja</territory>
+			<territory type="ES">ma Epanja</territory>
 			<territory type="ET" draft="unconfirmed">ma Isijopija</territory>
 			<territory type="EU" draft="unconfirmed">kulupu ma Elopa</territory>
-			<territory type="FI" draft="unconfirmed">ma Sumi</territory>
+			<territory type="FI">ma Sumi</territory>
 			<territory type="FJ" draft="unconfirmed">ma Pisi</territory>
-			<territory type="FR" draft="unconfirmed">ma Kanse</territory>
+			<territory type="FR">ma Kanse</territory>
 			<territory type="GA" draft="unconfirmed">ma Kapon</territory>
+			<territory type="GB">ma Juke</territory>
 			<territory type="GE" draft="unconfirmed">ma Katelo</territory>
 			<territory type="GH" draft="unconfirmed">ma Kana</territory>
 			<territory type="GM" draft="unconfirmed">ma Kanpija</territory>
 			<territory type="GN" draft="unconfirmed">ma Kine</territory>
 			<territory type="GQ" draft="unconfirmed">ma Kinejekatolija</territory>
-			<territory type="GR" draft="unconfirmed">ma Elena</territory>
+			<territory type="GR">ma Elin</territory>
 			<territory type="GW" draft="unconfirmed">ma Kinepisa</territory>
-			<territory type="HK" draft="unconfirmed">ma Onkon</territory>
-			<territory type="HR" draft="unconfirmed">ma Lowasi</territory>
-			<territory type="HU" draft="unconfirmed">ma Mosijo</territory>
-			<territory type="ID" draft="unconfirmed">ma Intonesija</territory>
+			<territory type="HK">ma Onkon</territory>
+			<territory type="HR">ma Kowata</territory>
+			<territory type="HU">ma Maja</territory>
+			<territory type="ID">ma Intonesija</territory>
 			<territory type="IE" draft="unconfirmed">ma Alan</territory>
-			<territory type="IL" draft="unconfirmed">ma Isale</territory>
-			<territory type="IN" draft="unconfirmed">ma Palata</territory>
-			<territory type="IQ" draft="unconfirmed">ma Ilakija</territory>
-			<territory type="IR" draft="unconfirmed">ma Ilan</territory>
+			<territory type="IL">ma Isale</territory>
+			<territory type="IN">ma Palata</territory>
+			<territory type="IQ">ma Ilaki</territory>
+			<territory type="IR">ma Ilan</territory>
 			<territory type="IS" draft="unconfirmed">ma Isilan</territory>
-			<territory type="IT" draft="unconfirmed">ma Italija</territory>
+			<territory type="IT">ma Italija</territory>
 			<territory type="JO" draft="unconfirmed">ma Utun</territory>
-			<territory type="JP" draft="unconfirmed">ma Nijon</territory>
-			<territory type="KE" draft="unconfirmed">ma Kenja</territory>
-			<territory type="KH" draft="unconfirmed">ma Kanpusi</territory>
+			<territory type="JP">ma Nijon</territory>
+			<territory type="KE">ma Kenja</territory>
+			<territory type="KH">ma Kame</territory>
 			<territory type="KI" draft="unconfirmed">ma Kilipasi</territory>
 			<territory type="KM" draft="unconfirmed">ma Komo</territory>
-			<territory type="KP" draft="unconfirmed">ma Anku</territory>
-			<territory type="KR" draft="unconfirmed">ma Soson</territory>
+			<territory type="KP">ma Soson</territory>
+			<territory type="KR">ma Anku</territory>
 			<territory type="KW" draft="unconfirmed">ma Kuwasi</territory>
 			<territory type="LB" draft="unconfirmed">ma Lunpan</territory>
 			<territory type="LI" draft="unconfirmed">ma Lisensan</territory>
 			<territory type="LK" draft="unconfirmed">ma Lanka</territory>
 			<territory type="LR" draft="unconfirmed">ma Lapewija</territory>
-			<territory type="LS" draft="unconfirmed">ma Lesoto</territory>
+			<territory type="LS">ma Sutu</territory>
 			<territory type="LT" draft="unconfirmed">ma Lijatuwa</territory>
 			<territory type="LU" draft="unconfirmed">ma Lusepu</territory>
 			<territory type="LV" draft="unconfirmed">ma Lawi</territory>
@@ -146,70 +233,119 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MG" draft="unconfirmed">ma Malakasi</territory>
 			<territory type="MK" draft="unconfirmed">ma Maketonija</territory>
 			<territory type="ML" draft="unconfirmed">ma Mali</territory>
-			<territory type="MM" draft="unconfirmed">ma Mijama</territory>
+			<territory type="MM">ma Mijama</territory>
 			<territory type="MR" draft="unconfirmed">ma Mulitanija</territory>
 			<territory type="MU" draft="unconfirmed">ma Mowisi</territory>
 			<territory type="MW" draft="unconfirmed">ma Malawi</territory>
-			<territory type="MX" draft="unconfirmed">ma Mesiko</territory>
-			<territory type="MY" draft="unconfirmed">ma Malasija</territory>
+			<territory type="MX">ma Mesiko</territory>
+			<territory type="MY">ma Malesija</territory>
 			<territory type="MZ" draft="unconfirmed">ma Mosanpi</territory>
 			<territory type="NA" draft="unconfirmed">ma Namipija</territory>
 			<territory type="NE" draft="unconfirmed">ma Nise</territory>
-			<territory type="NG" draft="unconfirmed">ma Naselija</territory>
-			<territory type="NL" draft="unconfirmed">ma Netelan</territory>
-			<territory type="NO" draft="unconfirmed">ma Nosiki</territory>
-			<territory type="NZ" draft="unconfirmed">ma Nusilan</territory>
+			<territory type="NG">ma Nasilija</territory>
+			<territory type="NL">ma Netelan</territory>
+			<territory type="NO">ma Nosiki</territory>
+			<territory type="NZ">ma Awatejalowa</territory>
 			<territory type="OM" draft="unconfirmed">ma Uman</territory>
-			<territory type="PE" draft="unconfirmed">ma Pelu</territory>
+			<territory type="PE">ma Pelu</territory>
 			<territory type="PG" draft="unconfirmed">ma Papuwanijukini</territory>
-			<territory type="PH" draft="unconfirmed">ma Pilipina</territory>
-			<territory type="PK" draft="unconfirmed">ma Pakisan</territory>
-			<territory type="PL" draft="unconfirmed">ma Posuka</territory>
-			<territory type="PS" draft="unconfirmed">ma Pilisin</territory>
-			<territory type="PT" draft="unconfirmed">ma Potuke</territory>
+			<territory type="PH">ma Pilipina</territory>
+			<territory type="PK">ma Pakitan</territory>
+			<territory type="PL">ma Posuka</territory>
+			<territory type="PS">ma Palasin</territory>
+			<territory type="PT">ma Potuke</territory>
+			<territory type="QA">ma Kita</territory>
 			<territory type="RO" draft="unconfirmed">ma Lomani</territory>
-			<territory type="RS" draft="unconfirmed">ma Sopisi</territory>
-			<territory type="RU" draft="unconfirmed">ma Lusi</territory>
+			<territory type="RS">ma Sepi</territory>
+			<territory type="RU">ma Lusi</territory>
 			<territory type="RW" draft="unconfirmed">ma Luwanta</territory>
-			<territory type="SA" draft="unconfirmed">ma Sawusi</territory>
+			<territory type="SA">ma Sajusi</territory>
 			<territory type="SD" draft="unconfirmed">ma Sutan</territory>
-			<territory type="SE" draft="unconfirmed">ma Sensa</territory>
-			<territory type="SG" draft="unconfirmed">ma Sinkapo</territory>
+			<territory type="SE">ma Sensa</territory>
+			<territory type="SG">ma Sinkapo</territory>
 			<territory type="SI" draft="unconfirmed">ma Lowensina</territory>
 			<territory type="SK" draft="unconfirmed">ma Lowenki</territory>
 			<territory type="SL" draft="unconfirmed">ma Sijelalijon</territory>
 			<territory type="SM" draft="unconfirmed">ma Samalino</territory>
 			<territory type="SN" draft="unconfirmed">ma Seneka</territory>
-			<territory type="SO" draft="unconfirmed">ma Somalija</territory>
+			<territory type="SO">ma Somali</territory>
 			<territory type="SS" draft="unconfirmed">ma Sasutan</territory>
-			<territory type="SY" draft="unconfirmed">ma Sulija</territory>
-			<territory type="SZ">ma Sawasi</territory>
+			<territory type="SV">ma Sawato</territory>
+			<territory type="SY">ma Suli</territory>
+			<territory type="SZ">ma Suwasi</territory>
 			<territory type="TD" draft="unconfirmed">ma Sate</territory>
 			<territory type="TG" draft="unconfirmed">ma Toko</territory>
-			<territory type="TH" draft="unconfirmed">ma Tawi</territory>
+			<territory type="TH">ma Tawi</territory>
 			<territory type="TN" draft="unconfirmed">ma Tunisi</territory>
 			<territory type="TO" draft="unconfirmed">ma Tona</territory>
-			<territory type="TR" draft="unconfirmed">ma Tuki</territory>
+			<territory type="TR">ma Tuki</territory>
 			<territory type="TV" draft="unconfirmed">ma Tuwalu</territory>
-			<territory type="TZ" draft="unconfirmed">ma Tansanija</territory>
-			<territory type="UA" draft="unconfirmed">ma Ukawina</territory>
+			<territory type="TW">ma Tawan</territory>
+			<territory type="TZ">ma Tansanija</territory>
+			<territory type="UA">ma Ukawina</territory>
 			<territory type="UG" draft="unconfirmed">ma Ukanta</territory>
 			<territory type="UN" draft="unconfirmed">kulupu pi ma ale</territory>
-			<territory type="US" draft="unconfirmed">ma Mewika</territory>
-			<territory type="UZ">ma Opekisan</territory>
+			<territory type="US">ma Mewika</territory>
+			<territory type="UZ">ma Opeki</territory>
 			<territory type="VA" draft="unconfirmed">ma Wasikano</territory>
 			<territory type="VE" draft="unconfirmed">ma Penesuwela</territory>
-			<territory type="VN" draft="unconfirmed">ma Wije</territory>
+			<territory type="VN">ma Wije</territory>
 			<territory type="VU" draft="unconfirmed">ma Wanuwatu</territory>
 			<territory type="WS" draft="unconfirmed">ma Samowa</territory>
 			<territory type="YE" draft="unconfirmed">ma Jamanija</territory>
-			<territory type="ZA" draft="unconfirmed">ma Setapika</territory>
+			<territory type="ZA">ma Unsansi</territory>
 			<territory type="ZM" draft="unconfirmed">ma Sanpija</territory>
 			<territory type="ZW" draft="unconfirmed">ma Sinpapuwe</territory>
+			<territory type="ZZ">ma ante</territory>
 		</territories>
+		<variants>
+			<variant type="FONIPA">sitelen IPA</variant>
+			<variant type="FONUPA">sitelen UPA</variant>
+		</variants>
+		<keys>
+			<key type="calendar">nasin tenpo</key>
+			<key type="cf">nasin mani</key>
+			<key type="collation">nasin nimi</key>
+			<key type="currency">mani</key>
+			<key type="ms">nasin nanpa pi suli ijo</key>
+			<key type="numbers">sitelen nanpa</key>
+		</keys>
 		<types>
-			<type key="numbers" type="arab">sitelen nanpa Alapi</type>
+			<type key="calendar" type="japanese">nasin tenpo Nijon</type>
+			<type key="calendar" type="japanese" scope="core">nasin Nijon</type>
+			<type key="collation" type="ducet">nasin nimi Juniko</type>
+			<type key="collation" type="ducet" scope="core">nasin Juniko</type>
+			<type key="collation" type="emoji">nasin nimi Emosi</type>
+			<type key="collation" type="pinyin">nasin nimi Pinin</type>
+			<type key="collation" type="pinyin" scope="core">nasin Pinin</type>
+			<type key="em" type="default" scope="core">nasin sitelen</type>
+			<type key="em" type="emoji" scope="core">nasin sitelen Emosi</type>
+			<type key="em" type="text" scope="core">nasin sitelen Emosi ala</type>
+			<type key="ms" type="metric">nasin nanpa pi kulupu SI</type>
+			<type key="ms" type="metric" scope="core">nasin SI</type>
+			<type key="ms" type="uksystem">nasin nanpa pi ma Juke</type>
+			<type key="ms" type="uksystem" scope="core">nasin Juke</type>
+			<type key="ms" type="ussystem">nasin nanpa pi ma Mewika</type>
+			<type key="ms" type="ussystem" scope="core">nasin Mewika</type>
+			<type key="numbers" type="arab">nasin nanpa Alapi</type>
+			<type key="numbers" type="beng">sitelen nanpa Panla</type>
+			<type key="numbers" type="grek">sitelen nanpa Elin</type>
+			<type key="numbers" type="gujr">sitelen nanpa Kusalasi</type>
+			<type key="numbers" type="hanidec">sitelen nanpa Sonko</type>
+			<type key="numbers" type="hans">sitelen nanpa Sonko pi linja lili</type>
+			<type key="numbers" type="hansfin">sitelen nanpa mani Sonko pi linja lili</type>
+			<type key="numbers" type="hant">sitelen nanpa Sonko pi linja mute</type>
+			<type key="numbers" type="hantfin">sitelen nanpa mani Sonko pi linja mute</type>
+			<type key="numbers" type="hebr">sitelen nanpa Iwi</type>
+			<type key="numbers" type="java">sitelen nanpa Sowa</type>
+			<type key="numbers" type="jpan">sitelen nanpa Nijon</type>
+			<type key="numbers" type="jpanfin">sitelen nanpa mani Nijon</type>
+			<type key="numbers" type="knda">sitelen nanpa Kanata</type>
 			<type key="numbers" type="latn">sitelen nanpa Lasina</type>
+			<type key="numbers" type="mymr">sitelen nanpa Mijama</type>
+			<type key="numbers" type="telu">sitelen nanpa Teluku</type>
+			<type key="numbers" type="thai">sitelen nanpa Tawi</type>
+			<type key="numbers" type="tibt">sitelen nanpa Po</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">nasin pi ma ale</measurementSystemName>
@@ -217,16 +353,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<measurementSystemName type="US">nasin pi ma Mewika</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
-			<codePattern type="language">toki li {0}</codePattern>
-			<codePattern type="script">sitelen li {0}</codePattern>
-			<codePattern type="territory">ma li {0}</codePattern>
+			<codePattern type="language">toki: {0}</codePattern>
+			<codePattern type="script">sitelen: {0}</codePattern>
+			<codePattern type="territory">ma: {0}</codePattern>
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[a e i j k l m n o p s t u w]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[b c d f g h q r v x y z]</exemplarCharacters>
 		<exemplarCharacters type="index">[A E I J K L M N O P S T U W]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- ‑ / # % + 0 1 2 3 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\- ‑ / # % + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . '‘’ &quot;“” ( ) \[ \] @ * / #]</exemplarCharacters>
 	</characters>
 	<dates>
@@ -235,23 +371,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<months>
 					<monthContext type="format">
 						<monthWidth type="wide">
-							<month type="1">mun #1</month>
-							<month type="2">mun #2</month>
-							<month type="3">mun #3</month>
-							<month type="4">mun #4</month>
-							<month type="5">mun #5</month>
-							<month type="6">mun #6</month>
-							<month type="7">mun #7</month>
-							<month type="8">mun #8</month>
-							<month type="9">mun #9</month>
-							<month type="10">mun #10</month>
-							<month type="11">mun #11</month>
-							<month type="12">mun #12</month>
+							<month type="1">tenpo mun #1</month>
+							<month type="2">tenpo mun #2</month>
+							<month type="3">tenpo mun #3</month>
+							<month type="4">tenpo mun #4</month>
+							<month type="5">tenpo mun #5</month>
+							<month type="6">tenpo mun #6</month>
+							<month type="7">tenpo mun #7</month>
+							<month type="8">tenpo mun #8</month>
+							<month type="9">tenpo mun #9</month>
+							<month type="10">tenpo mun #10</month>
+							<month type="11">tenpo mun #11</month>
+							<month type="12">tenpo mun #12</month>
 						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
+						<dayWidth type="narrow">
+							<day type="sun">7</day>
+							<day type="mon">1</day>
+							<day type="tue">2</day>
+							<day type="wed">3</day>
+							<day type="thu">4</day>
+							<day type="fri">5</day>
+							<day type="sat">6</day>
+						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">suno esun #7</day>
 							<day type="mon">suno esun #1</day>
@@ -262,6 +407,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="sat">suno esun #6</day>
 						</dayWidth>
 					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun">7</day>
+							<day type="mon">1</day>
+							<day type="tue">2</day>
+							<day type="wed">3</day>
+							<day type="thu">4</day>
+							<day type="fri">5</day>
+							<day type="sat">6</day>
+						</dayWidth>
+					</dayContext>
 				</days>
 				<dayPeriods>
 					<dayPeriodContext type="format">
@@ -270,23 +426,228 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="pm">pi pini suno</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">open suno</dayPeriod>
+							<dayPeriod type="pm">pini suno</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
 				</dayPeriods>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>'sike' #y 'la' MMM 'la' 'suno' #d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>'tenpo' 'sike' #y 'la' 'tenpo' MMMM 'la' 'tenpo' 'suno' #d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>'sike' #y 'la' MMM 'la' 'suno' #d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>zzzz 'la' HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>z 'la' HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
 				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Bh">'tenpo' 'ilo' #h B</dateFormatItem>
+						<dateFormatItem id="d">#d</dateFormatItem>
+						<dateFormatItem id="h">'tenpo' 'ilo' #h a</dateFormatItem>
 						<dateFormatItem id="hm">#h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">#HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">#h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Hms">#HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">#h:mm:ss a 'lon' v</dateFormatItem>
 						<dateFormatItem id="Hmsv">#HH:mm:ss 'lon' v</dateFormatItem>
+						<dateFormatItem id="hmv">#h:mm a 'lon' v</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM 'la' 'sike' 'esun' #W</dateFormatItem>
+						<dateFormatItem id="y">#y</dateFormatItem>
 						<dateFormatItem id="yMd">#y)#M)#d</dateFormatItem>
 						<dateFormatItem id="yMMMd">'sike' #y ) #M ) #d</dateFormatItem>
+						<dateFormatItem id="yMMMM">#y 'la' MMMM</dateFormatItem>
+						<dateFormatItem id="yQQQ">#y 'la' QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">#y 'la' QQQQ</dateFormatItem>
+						<dateFormatItem id="yw" count="other">Y 'la' 'sike' 'esun' #w</dateFormatItem>
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>tenpo</displayName>
+			</field>
+			<field type="year">
+				<displayName>tenpo sike</displayName>
+				<relative type="-1">tenpo sike pini</relative>
+				<relative type="0">tenpo sike ni</relative>
+				<relative type="1">tenpo sike wan</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">tenpo sike kama {0}</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">tenpo sike pini {0}</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="year-short">
+				<displayName>sike</displayName>
+			</field>
+			<field type="year-narrow">
+				<displayName>sike</displayName>
+			</field>
+			<field type="month">
+				<displayName>tenpo mun</displayName>
+				<relative type="-1">tenpo mun pini</relative>
+				<relative type="0">tenpo mun ni</relative>
+				<relative type="1">tenpo mun kama</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">tenpo mun kama {0}</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">tenpo mun pini {0}</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month-short">
+				<displayName>mun</displayName>
+			</field>
+			<field type="month-narrow">
+				<displayName>mun</displayName>
+			</field>
+			<field type="week">
+				<displayName>tenpo esun</displayName>
+				<relative type="-1">tenpo esun pini</relative>
+				<relative type="0">tenpo esun ni</relative>
+				<relative type="1">tenpo esun kama</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">tenpo esun kama {0}</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">tenpo esun pini {0}</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week-short">
+				<displayName>esun</displayName>
+			</field>
+			<field type="week-narrow">
+				<displayName>esun</displayName>
+			</field>
+			<field type="day">
+				<displayName>tenpo suno</displayName>
+				<relative type="-1">tenpo suno pini</relative>
+				<relative type="0">tenpo suno ni</relative>
+				<relative type="1">tenpo suno kama</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">tenpo suno kama {0}</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">tenpo suno pini {0}</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day-short">
+				<displayName>suno</displayName>
+			</field>
+			<field type="day-narrow">
+				<displayName>suno</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">tenpo esun #7 pini</relative>
+				<relative type="0">tenpo esun #7 ni</relative>
+				<relative type="1">tenpo esun #7 kama</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">tenpo esun #1 pini</relative>
+				<relative type="0">tenpo esun #1 ni</relative>
+				<relative type="1">tenpo esun #1 kama</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">tenpo esun #2 pini</relative>
+				<relative type="0">tenpo esun #2 ni</relative>
+				<relative type="1">tenpo esun #2 kama</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">tenpo esun #3 pini</relative>
+				<relative type="0">tenpo esun #3 ni</relative>
+				<relative type="1">tenpo esun #3 kama</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">tenpo esun #4 pini</relative>
+				<relative type="0">tenpo esun #4 ni</relative>
+				<relative type="1">tenpo esun #4 kama</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">tenpo esun #5 pini</relative>
+				<relative type="0">tenpo esun #5 ni</relative>
+				<relative type="1">tenpo esun #5 kama</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">tenpo esun #6 pini</relative>
+				<relative type="0">tenpo esun #6 ni</relative>
+				<relative type="1">tenpo esun #6 kama</relative>
+			</field>
+			<field type="hour">
+				<displayName>tenpo ilo</displayName>
+				<relative type="0">tenpo ilo ni</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">tenpo ilo kama {0}</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">tenpo ilo pini {0}</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>nasin tenpo</displayName>
+			</field>
+		</fields>
 		<timeZoneNames>
-			<gmtFormat>tenpo UTC{0}</gmtFormat>
+			<gmtFormat>tenpo GMT{0}</gmtFormat>
 			<gmtZeroFormat>tenpo UTC</gmtZeroFormat>
 			<regionFormat>tenpo pi {0}</regionFormat>
 			<regionFormat type="daylight">tenpo seli suno pi {0}</regionFormat>
@@ -310,19 +671,91 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>%#,#0</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,#0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,#0.00</pattern>
+					<pattern alt="noCurrency">#,#0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,#0.00</pattern>
+					<pattern alt="noCurrency">#,#0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
+		<currencies>
+			<currency type="AFN">
+				<displayName count="other">mani Akan</displayName>
+			</currency>
+			<currency type="AUD">
+				<displayName count="other">mani Oseja</displayName>
+			</currency>
+			<currency type="BDT">
+				<displayName count="other">mani Panla</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName count="other">mani Intonesija</displayName>
+			</currency>
+			<currency type="INR">
+				<displayName count="other">mani Palata</displayName>
+			</currency>
+			<currency type="IRR">
+				<displayName count="other">mani Ilan</displayName>
+			</currency>
+			<currency type="KHR">
+				<displayName count="other">mani Kame</displayName>
+			</currency>
+			<currency type="LKR">
+				<displayName count="other">mani Lanka</displayName>
+			</currency>
+			<currency type="MMK">
+				<displayName count="other">mani Mijama</displayName>
+			</currency>
+			<currency type="MYR">
+				<displayName count="other">mani Malesija</displayName>
+			</currency>
+			<currency type="NZD">
+				<displayName count="other">mani Awatejalowa</displayName>
+			</currency>
+			<currency type="PHP">
+				<displayName count="other">mani Pilipina</displayName>
+			</currency>
+			<currency type="PKR">
+				<displayName count="other">mani Pakitan</displayName>
+			</currency>
+			<currency type="SGD">
+				<displayName count="other">mani Sinkapo</displayName>
+			</currency>
+			<currency type="THB">
+				<displayName count="other">mani Tawi</displayName>
+			</currency>
+			<currency type="VND">
+				<displayName count="other">mani Wije</displayName>
+			</currency>
+		</currencies>
+		<minimalPairs>
+			<pluralMinimalPairs count="other" draft="contributed">tenpo suno {0}</pluralMinimalPairs>
+		</minimalPairs>
 	</numbers>
+	<units>
+		<durationUnit type="hm">
+			<durationUnitPattern>hh:mm</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>hh:mm:ss</durationUnitPattern>
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>mm:ss</durationUnitPattern>
+		</durationUnit>
+	</units>
+	<posix>
+		<messages>
+			<yesstr>lon:l:y</yesstr>
+			<nostr>ala:a:n</nostr>
+		</messages>
+	</posix>
+	<personNames>
+		<parameterDefault parameter="formality">informal</parameterDefault>
+	</personNames>
 </ldml>
diff --git a/make/data/cldr/common/main/tpi.xml b/make/data/cldr/common/main/tpi.xml
index becca68770f..4916be29031 100644
--- a/make/data/cldr/common/main/tpi.xml
+++ b/make/data/cldr/common/main/tpi.xml
@@ -199,6 +199,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/tr.xml b/make/data/cldr/common/main/tr.xml
index 21e58dc9a8b..5bed509b4fd 100644
--- a/make/data/cldr/common/main/tr.xml
+++ b/make/data/cldr/common/main/tr.xml
@@ -333,6 +333,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Bafia</language>
 			<language type="ksh">Köln lehçesi</language>
 			<language type="ku">Kürtçe</language>
+			<language type="ku" menu="core">Kürtçe</language>
+			<language type="ku" menu="extension">Kurmanci</language>
 			<language type="kum">Kumukça</language>
 			<language type="kut">Kutenai dili</language>
 			<language type="kv">Komi</language>
@@ -938,6 +940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Çin</territory>
 			<territory type="CO">Kolombiya</territory>
 			<territory type="CP">Clipperton Adası</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Küba</territory>
 			<territory type="CV">Cabo Verde</territory>
@@ -1215,35 +1218,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Sayısal Sıralama</key>
 			<key type="colStrength">Sıralama Gücü</key>
 			<key type="currency">Para Birimi</key>
+			<key type="em">Emoji Gösterimi</key>
 			<key type="hc">Saat Sistemi (12 - 24)</key>
 			<key type="lb">Satır Sonu Stili</key>
+			<key type="lw">Sözcükler İçindeki Satır Sonları</key>
 			<key type="ms">Ölçü Sistemi</key>
 			<key type="numbers">Rakamlar</key>
+			<key type="ss">Kısaltmadan Sonra Cümle Sonu</key>
 			<key type="timezone">Saat Dilimi</key>
 			<key type="va">Yerel Varyant</key>
 			<key type="x">Özel Kullanım</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Budist Takvimi</type>
+			<type key="calendar" type="buddhist" scope="core">Budist</type>
 			<type key="calendar" type="chinese">Çin Takvimi</type>
+			<type key="calendar" type="chinese" scope="core">Çin</type>
 			<type key="calendar" type="coptic">Kıpti Takvim</type>
+			<type key="calendar" type="coptic" scope="core">Kıpti</type>
 			<type key="calendar" type="dangi">Dangi Takvimi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Etiyopik Takvim</type>
+			<type key="calendar" type="ethiopic" scope="core">Etiyopik</type>
 			<type key="calendar" type="ethiopic-amete-alem">Etiyopik Amete Alem Takvimi</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Etiyopik Amete Alem</type>
 			<type key="calendar" type="gregorian">Miladi Takvim</type>
+			<type key="calendar" type="gregorian" scope="core">Miladi</type>
 			<type key="calendar" type="hebrew">İbrani Takvimi</type>
+			<type key="calendar" type="hebrew" scope="core">İbrani</type>
 			<type key="calendar" type="indian">Ulusal Hint Takvimi</type>
 			<type key="calendar" type="islamic">Hicri Takvim</type>
+			<type key="calendar" type="islamic" scope="core">Hicri</type>
 			<type key="calendar" type="islamic-civil">Hicri Takvim (16 Temmuz 622)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hicri (16 Temmuz 622)</type>
 			<type key="calendar" type="islamic-rgsa">Hicri Takvim (Suudi)</type>
 			<type key="calendar" type="islamic-tbla">Hicri Takvim (15 Temmuz 622)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hicri (15 Temmuz 622)</type>
 			<type key="calendar" type="islamic-umalqura">Hicri Takvim (Ümmü-l Kurra Takvimi)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hicri (Ümmü-l Kurra Takvimi)</type>
 			<type key="calendar" type="iso8601">ISO-8601 Takvimi</type>
 			<type key="calendar" type="japanese">Japon Takvimi</type>
+			<type key="calendar" type="japanese" scope="core">Japon</type>
 			<type key="calendar" type="persian">İran Takvimi</type>
+			<type key="calendar" type="persian" scope="core">İran</type>
 			<type key="calendar" type="roc">Çin Cumhuriyeti Takvimi</type>
+			<type key="calendar" type="roc" scope="core">Çin Cumhuriyeti</type>
 			<type key="cf" type="account">Muhasebe Para Biçimi</type>
+			<type key="cf" type="account" scope="core">Muhasebe</type>
 			<type key="cf" type="standard">Standart Para Biçimi</type>
+			<type key="cf" type="standard" scope="core">Standart</type>
 			<type key="colAlternate" type="non-ignorable">Sembolleri Sıralama</type>
 			<type key="colAlternate" type="shifted">Sembolleri Yoksayarak Sıralama</type>
 			<type key="colBackwards" type="no">Aksanları Normal Olarak Sıralama</type>
@@ -1253,23 +1276,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Önce Büyük Harfleri Sıralama</type>
 			<type key="colCaseLevel" type="no">Büyük/Küçük Harfe Duyarlı Olmadan Sıralama</type>
 			<type key="colCaseLevel" type="yes">Büyük/Küçük Harfe Duyarla Sıralama</type>
-			<type key="collation" type="big5han">Geleneksel Çince Sıralama Düzeni - Big5</type>
 			<type key="collation" type="compat">Önceki Sıralama Düzeni (uyumluluk için)</type>
+			<type key="collation" type="compat" scope="core">Uyumluluk</type>
 			<type key="collation" type="dictionary">Sözlük Sıralama Düzeni</type>
+			<type key="collation" type="dictionary" scope="core">Sözlük</type>
 			<type key="collation" type="ducet">Saptanmış Unicode Sıralama Düzeni</type>
+			<type key="collation" type="ducet" scope="core">Saptanmış Unicode</type>
 			<type key="collation" type="emoji">Emoji Sıralama Düzeni</type>
 			<type key="collation" type="eor">Avrupa Sıralama Kuralları</type>
-			<type key="collation" type="gb2312han">Basitleştirilmiş Çince Sıralama Düzeni - GB2312</type>
 			<type key="collation" type="phonebook">Telefon Defteri Sıralama Düzeni</type>
+			<type key="collation" type="phonebook" scope="core">Telefon Defteri</type>
 			<type key="collation" type="phonetic">Fonetik Sıralama Düzeni</type>
+			<type key="collation" type="phonetic" scope="core">Fonetik</type>
 			<type key="collation" type="pinyin">Pinyin Sıralama Düzeni</type>
+			<type key="collation" type="pinyin" scope="core">Pinyin</type>
 			<type key="collation" type="search">Genel Amaçlı Arama</type>
+			<type key="collation" type="search" scope="core">Arama</type>
 			<type key="collation" type="searchjl">Hangul İlk Sessiz Harfe Göre Arama</type>
 			<type key="collation" type="standard">Standart Sıralama Düzeni</type>
+			<type key="collation" type="standard" scope="core">Standart</type>
 			<type key="collation" type="stroke">Vuruş Sıralama Düzeni</type>
+			<type key="collation" type="stroke" scope="core">Vuruş</type>
 			<type key="collation" type="traditional">Geleneksel Sıralama Düzeni</type>
+			<type key="collation" type="traditional" scope="core">Geleneksel</type>
 			<type key="collation" type="unihan">Radikal-Vuruş Sıralama Düzeni</type>
+			<type key="collation" type="unihan" scope="core">Radikal-Vuruş</type>
 			<type key="collation" type="zhuyin">Zhuyin Sıralama Düzeni</type>
+			<type key="collation" type="zhuyin" scope="core">Zhuyin</type>
 			<type key="colNormalization" type="no">Normalleştirme Olmadan Sıralama</type>
 			<type key="colNormalization" type="yes">Unicode Normalleştirilmiş Olarak Sıralama</type>
 			<type key="colNumeric" type="no">Rakamları Ayrı Sıralama</type>
@@ -1282,18 +1315,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Tam Genişlik</type>
 			<type key="d0" type="hwidth">Yarım genişlik</type>
 			<type key="d0" type="npinyin">Rakam</type>
+			<type key="em" type="default" scope="core">Varsayılan</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Metin</type>
 			<type key="hc" type="h11">12 Saat Sistemi (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Saat Sistemi (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 Saat Sistemi (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 Saat Sistemi (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Serbest Satır Sonu Stili</type>
+			<type key="lb" type="loose" scope="core">Serbest</type>
 			<type key="lb" type="normal">Normal Satır Sonu Stili</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Katı Satır Sonu Stili</type>
+			<type key="lb" type="strict" scope="core">Katı</type>
+			<type key="lw" type="breakall" scope="core">Tümünü kes</type>
+			<type key="lw" type="keepall" scope="core">Tümünü koru</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">Sözcük öbeklerinde koru</type>
 			<type key="m0" type="bgn">US BGN Transliterasyon</type>
 			<type key="m0" type="ungegn">UN GEGN Transliterasyon</type>
 			<type key="ms" type="metric">Metrik Sistem</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">İngiliz Ölçü Sistemi</type>
+			<type key="ms" type="uksystem" scope="core">İngiliz</type>
 			<type key="ms" type="ussystem">ABD Ölçü Sistemi</type>
+			<type key="ms" type="ussystem" scope="core">ABD</type>
 			<type key="numbers" type="ahom">Ahom Rakamları</type>
 			<type key="numbers" type="arab">Hint-Arap Rakamları</type>
 			<type key="numbers" type="arabext">Genişletilmiş Hint-Arap Rakamları</type>
@@ -1371,6 +1421,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="traditional">Geleneksel Rakamlar</type>
 			<type key="numbers" type="vaii">Vai Rakamları</type>
 			<type key="numbers" type="wara">Warang Citi Rakamları</type>
+			<type key="ss" type="none" scope="core">Kapalı</type>
+			<type key="ss" type="standard" scope="core">Açık</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1504,11 +1556,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">G M.y</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
@@ -1573,10 +1626,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">G d MMM E – d MMM E y</greatestDifference>
 							<greatestDifference id="y">G d MMM y E – d MMM y E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1587,10 +1636,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd/MM – dd/MM</greatestDifference>
 							<greatestDifference id="M">dd/MM – dd/MM</greatestDifference>
@@ -1877,7 +1922,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMd">G dd.MM.y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd.MM.y E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y E</dateFormatItem>
@@ -1886,8 +1933,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="Hv">HH v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">d/MM E</dateFormatItem>
+						<dateFormatItem id="MEd">d/M E</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">d MMM E</dateFormatItem>
 						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
@@ -1919,19 +1967,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG MM.y – GGGGG MM.y</greatestDifference>
 							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
-							<greatestDifference id="y">GGGGG MM.y – MM.y</greatestDifference>
+							<greatestDifference id="y">G MM.y – MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
+							<greatestDifference id="d">G dd.MM.y – dd.MM.y</greatestDifference>
 							<greatestDifference id="G">GGGGG dd.MM.y – GGGGG dd.MM.y</greatestDifference>
 							<greatestDifference id="M">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
 							<greatestDifference id="y">GGGGG dd.MM.y – dd.MM.y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="d">G dd.MM.y E – dd.MM.y E</greatestDifference>
 							<greatestDifference id="G">GGGGG dd.MM.y E – GGGGG dd.MM.y E</greatestDifference>
-							<greatestDifference id="M">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
-							<greatestDifference id="y">GGGGG dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="M">G dd.MM.y E – dd.MM.y E</greatestDifference>
+							<greatestDifference id="y">G dd.MM.y E – dd.MM.y E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">G MMM y – G MMM y</greatestDifference>
@@ -2085,6 +2133,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="0">Hicri</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">G M.y</dateFormatItem>
+						<dateFormatItem id="GyMd">G d/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
 				<dateFormats>
@@ -2518,9 +2573,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Yerevan">
 				<exemplarCity>Erivan</exemplarCity>
 			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Showa</exemplarCity>
-			</zone>
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viyana</exemplarCity>
 			</zone>
@@ -2578,9 +2630,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Prague">
 				<exemplarCity>Prag</exemplarCity>
 			</zone>
-			<zone type="Europe/Busingen">
-				<exemplarCity>Büsingen</exemplarCity>
-			</zone>
 			<zone type="Africa/Djibouti">
 				<exemplarCity>Cibuti</exemplarCity>
 			</zone>
@@ -2668,7 +2717,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Bişkek</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Canton Adası</exemplarCity>
 			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Komor</exemplarCity>
@@ -2897,9 +2946,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Batı Afrika Saati</generic>
-					<standard>Batı Afrika Standart Saati</standard>
-					<daylight>Batı Afrika Yaz Saati</daylight>
+					<standard>Batı Afrika Saati</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3287,6 +3334,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Guyana Saati</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleut Standart Saati</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleut Saati</generic>
@@ -3737,6 +3789,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Chuuk Saati</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Türkiye Saati</generic>
+					<standard>Türkiye Standart Saati</standard>
+					<daylight>Türkiye Yaz Saati</daylight>
+				</long>
+				<short>
+					<generic>TSİ</generic>
+				</short>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Türkmenistan Saati</generic>
@@ -3899,41 +3961,64 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">0 B ¤</pattern>
-					<pattern type="1000" count="other">0 B ¤</pattern>
-					<pattern type="10000" count="one">00 B ¤</pattern>
-					<pattern type="10000" count="other">00 B ¤</pattern>
-					<pattern type="100000" count="one">000 B ¤</pattern>
-					<pattern type="100000" count="other">000 B ¤</pattern>
-					<pattern type="1000000" count="one">0 Mn ¤</pattern>
-					<pattern type="1000000" count="other">0 Mn ¤</pattern>
-					<pattern type="10000000" count="one">00 Mn ¤</pattern>
-					<pattern type="10000000" count="other">00 Mn ¤</pattern>
-					<pattern type="100000000" count="one">000 Mn ¤</pattern>
-					<pattern type="100000000" count="other">000 Mn ¤</pattern>
-					<pattern type="1000000000" count="one">0 Mr ¤</pattern>
-					<pattern type="1000000000" count="other">0 Mr ¤</pattern>
-					<pattern type="10000000000" count="one">00 Mr ¤</pattern>
-					<pattern type="10000000000" count="other">00 Mr ¤</pattern>
-					<pattern type="100000000000" count="one">000 Mr ¤</pattern>
-					<pattern type="100000000000" count="other">000 Mr ¤</pattern>
-					<pattern type="1000000000000" count="one">0 Tn ¤</pattern>
-					<pattern type="1000000000000" count="other">0 Tn ¤</pattern>
-					<pattern type="10000000000000" count="one">00 Tn ¤</pattern>
-					<pattern type="10000000000000" count="other">00 Tn ¤</pattern>
-					<pattern type="100000000000000" count="one">000 Tn ¤</pattern>
-					<pattern type="100000000000000" count="other">000 Tn ¤</pattern>
+					<pattern type="1000" count="one">¤0 B</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0 B</pattern>
+					<pattern type="1000" count="other">¤0 B</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 B</pattern>
+					<pattern type="10000" count="one">¤00 B</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 B</pattern>
+					<pattern type="10000" count="other">¤00 B</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 B</pattern>
+					<pattern type="100000" count="one">¤000 B</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000 B</pattern>
+					<pattern type="100000" count="other">¤000 B</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000 B</pattern>
+					<pattern type="1000000" count="one">¤0 Mn</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0 Mn</pattern>
+					<pattern type="1000000" count="other">¤0 Mn</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0 Mn</pattern>
+					<pattern type="10000000" count="one">¤00 Mn</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00 Mn</pattern>
+					<pattern type="10000000" count="other">¤00 Mn</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00 Mn</pattern>
+					<pattern type="100000000" count="one">¤000 Mn</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000 Mn</pattern>
+					<pattern type="100000000" count="other">¤000 Mn</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000 Mn</pattern>
+					<pattern type="1000000000" count="one">¤0 Mr</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0 Mr</pattern>
+					<pattern type="1000000000" count="other">¤0 Mr</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 Mr</pattern>
+					<pattern type="10000000000" count="one">¤00 Mr</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 Mr</pattern>
+					<pattern type="10000000000" count="other">¤00 Mr</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 Mr</pattern>
+					<pattern type="100000000000" count="one">¤000 Mr</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000 Mr</pattern>
+					<pattern type="100000000000" count="other">¤000 Mr</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000 Mr</pattern>
+					<pattern type="1000000000000" count="one">¤0 Tn</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0 Tn</pattern>
+					<pattern type="1000000000000" count="other">¤0 Tn</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 Tn</pattern>
+					<pattern type="10000000000000" count="one">¤00 Tn</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00 Tn</pattern>
+					<pattern type="10000000000000" count="other">¤00 Tn</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 Tn</pattern>
+					<pattern type="100000000000000" count="one">¤000 Tn</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000 Tn</pattern>
+					<pattern type="100000000000000" count="other">¤000 Tn</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 Tn</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4826,6 +4911,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Doğu Karayip doları</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karayip guldeni</displayName>
+				<displayName count="one">Karayip guldeni</displayName>
+				<displayName count="other">Karayip guldeni</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Özel Çekme Hakkı (SDR)</displayName>
 			</currency>
@@ -4910,6 +5000,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>Zimbabve Doları</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabve altını</displayName>
+				<displayName count="one">Zimbabve altını</displayName>
+				<displayName count="other">Zimbabve altını</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabve Doları (2009)</displayName>
 			</currency>
@@ -5125,7 +5220,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milimol/litre</unitPattern>
 				<unitPattern count="other">{0} milimol/litre</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>parça/milyon</displayName>
 				<unitPattern count="one">{0} parça/milyon</unitPattern>
 				<unitPattern count="other">{0} parça/milyon</unitPattern>
@@ -5144,6 +5239,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">onbinde {0}</unitPattern>
 				<unitPattern count="other">onbinde {0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glikoz</displayName>
+				<unitPattern count="one">{0} glikoz</unitPattern>
+				<unitPattern count="other">{0} glikoz</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litre/kilometre</displayName>
 				<unitPattern count="one">{0} litre/kilometre</unitPattern>
@@ -5574,6 +5674,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} milimetre cıva</unitPattern>
 				<unitPattern count="other">{0} milimetre cıva</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>cıva</displayName>
+				<unitPattern count="one">{0} cıva</unitPattern>
+				<unitPattern count="other">{0} cıva</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>libre/inç kare</displayName>
 				<unitPattern count="one">{0} libre/inç kare</unitPattern>
@@ -5744,6 +5849,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} metrik su bardağı</unitPattern>
 				<unitPattern count="other">{0} metrik su bardağı</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrik sıvı ons</displayName>
+			</unit>
 			<unit type="volume-bushel">
 				<unitPattern count="one">{0} buşel</unitPattern>
 				<unitPattern count="other">{0} buşel</unitPattern>
@@ -5802,22 +5910,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>İng. quart</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ışık</displayName>
-				<unitPattern count="one">{0} ışık</unitPattern>
-				<unitPattern count="other">{0} ışık</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradyan</displayName>
+				<unitPattern count="one">{0} steradyan</unitPattern>
+				<unitPattern count="other">{0} steradyan</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>parça/milyar</displayName>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori [IT]</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kalori [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekerel</displayName>
+				<unitPattern count="one">{0} bekerel</unitPattern>
+				<unitPattern count="other">{0} bekerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="one">{0} sievert</unitPattern>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="one">{0} gray</unitPattern>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogram-kuvvet</displayName>
+				<unitPattern count="one">{0} kilogram-kuvvet</unitPattern>
+				<unitPattern count="other">{0} kilogram-kuvvet</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="one">{0} weber</unitPattern>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0} parça/milyar</unitPattern>
 				<unitPattern count="other">{0} parça/milyar</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>gece</displayName>
-				<unitPattern count="one">{0} gece</unitPattern>
-				<unitPattern count="other">{0} gece</unitPattern>
-				<perUnitPattern>{0}/gece</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>ana yön</displayName>
 				<coordinateUnitPattern type="east">{0}Doğu</coordinateUnitPattern>
@@ -5882,6 +6035,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} öğe</unitPattern>
 				<unitPattern count="other">{0} öğe</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>parça/milyon</displayName>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">%{0}</unitPattern>
 				<unitPattern count="other">%{0}</unitPattern>
@@ -5895,6 +6051,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">‱{0}</unitPattern>
 				<unitPattern count="other">‱{0}</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6327,12 +6486,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} İng. quart</unitPattern>
 				<unitPattern count="other">{0} İng. quart</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ışık</displayName>
 				<unitPattern count="one">{0} ışık</unitPattern>
 				<unitPattern count="other">{0} ışık</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>parça/milyar</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6364,6 +6526,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmol/L</unitPattern>
 				<unitPattern count="other">{0} mmol/L</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>l/100km</displayName>
 				<unitPattern count="one">{0} l/100km</unitPattern>
@@ -6508,16 +6673,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} İng. qt.</unitPattern>
 				<unitPattern count="other">{0} İng. qt.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ışık</displayName>
-				<unitPattern count="one">{0} ışık</unitPattern>
-				<unitPattern count="other">{0} ışık</unitPattern>
-			</unit>
-			<unit type="duration-night">
-				<displayName>gece</displayName>
-				<unitPattern count="one">{0} gece</unitPattern>
-				<unitPattern count="other">{0} gece</unitPattern>
-				<perUnitPattern>{0}/gece</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/trv.xml b/make/data/cldr/common/main/trv.xml
index 655cbab6b0e..9f224542e48 100644
--- a/make/data/cldr/common/main/trv.xml
+++ b/make/data/cldr/common/main/trv.xml
@@ -105,7 +105,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="provisional">GGGGG y-MM-dd</pattern>
+							<pattern draft="provisional">G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
diff --git a/make/data/cldr/common/main/trw.xml b/make/data/cldr/common/main/trw.xml
index f6c91fe2759..b1eefb14bf1 100644
--- a/make/data/cldr/common/main/trw.xml
+++ b/make/data/cldr/common/main/trw.xml
@@ -2370,9 +2370,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">مغربی افریقہ ٹائم</generic>
-					<standard draft="unconfirmed">مغربی افریقہ سٹینڈرڈ ٹائم</standard>
-					<daylight draft="unconfirmed">مغربی افریقہ سمر ٹائم</daylight>
+					<standard draft="unconfirmed">مغربی افریقہ ٹائم</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2722,6 +2720,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">گیانا سی وَخ</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">ہوائی الیوٹیئن اسٹینڈرڈ ٹائم</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">ہوائی الیوٹیئن ٹائم</generic>
@@ -3850,7 +3853,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">ملی مولس فی لیٹر</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} ملی مول فی لیٹر</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">فی ملین حصے</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} فی ملین حصے</unitPattern>
 			</unit>
@@ -4445,7 +4448,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-millimole-per-liter">
 				<displayName draft="unconfirmed">ملی مول/لیٹر</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">حصے/ملین</displayName>
 			</unit>
 			<unit type="concentr-percent">
diff --git a/make/data/cldr/common/main/tt.xml b/make/data/cldr/common/main/tt.xml
index 51b999e428d..98976250131 100644
--- a/make/data/cldr/common/main/tt.xml
+++ b/make/data/cldr/common/main/tt.xml
@@ -13,20 +13,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<localeDisplayNames>
 		<languages>
 			<language type="af">африкаанс</language>
+			<language type="ak" draft="unconfirmed">акан</language>
 			<language type="am">амхар</language>
-			<language type="ar">гарәп</language>
-			<language type="ar_001">Заманча стандарт гарәп</language>
+			<language type="ar">гарәпчә</language>
+			<language type="ar_001">заманча стандарт гарәпчә</language>
 			<language type="arn">мапуче</language>
 			<language type="as">ассам</language>
+			<language type="ast" draft="unconfirmed">астурианча</language>
 			<language type="az">әзәрбайҗан</language>
+			<language type="az" alt="short" draft="unconfirmed">азәричә</language>
 			<language type="ba">башкорт</language>
+			<language type="bal" draft="unconfirmed">бәлүҗчә</language>
 			<language type="ban">бали</language>
 			<language type="be">белорус</language>
 			<language type="bem">бемба</language>
 			<language type="bg">болгар</language>
-			<language type="bn">бенгали</language>
+			<language type="bgc" draft="unconfirmed">һарианви</language>
+			<language type="bho" draft="unconfirmed">бһоҗпури</language>
+			<language type="blo" draft="unconfirmed">ании</language>
+			<language type="bn">бенгалча</language>
 			<language type="bo">тибет</language>
 			<language type="br">бретон</language>
+			<language type="brx" draft="unconfirmed">бодо</language>
 			<language type="bs">босния</language>
 			<language type="ca">каталан</language>
 			<language type="ceb">себуано</language>
@@ -35,13 +43,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ckb">үзәк көрд</language>
 			<language type="co">корсика</language>
 			<language type="cs">чех</language>
+			<language type="csw" draft="unconfirmed">сазлык кричәсе</language>
+			<language type="cv" draft="unconfirmed">чуашча</language>
 			<language type="cy">уэльс</language>
 			<language type="da">дания</language>
 			<language type="de">алман</language>
 			<language type="de_CH">югары алман (Швейцария)</language>
+			<language type="doi" draft="unconfirmed">догри</language>
 			<language type="dsb">түбән сорб</language>
 			<language type="dv">мальдив</language>
 			<language type="dz">дзонг-кха</language>
+			<language type="ee" draft="unconfirmed">әвәчә</language>
 			<language type="el">грек</language>
 			<language type="en">инглиз</language>
 			<language type="en_GB">Британия инглизчәсе</language>
@@ -60,7 +72,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="fil">филиппин</language>
 			<language type="fo">фарер</language>
 			<language type="fr">француз</language>
+			<language type="fy" draft="unconfirmed">көнбатыш фризчәсе</language>
 			<language type="ga">ирланд</language>
+			<language type="gaa" draft="unconfirmed">га</language>
 			<language type="gd">шотланд гэль</language>
 			<language type="gl">галисия</language>
 			<language type="gn">гуарани</language>
@@ -77,14 +91,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="hu">венгр</language>
 			<language type="hy">әрмән</language>
 			<language type="hz">гереро</language>
+			<language type="ia" draft="unconfirmed">интерлингуа</language>
 			<language type="ibb">ибибио</language>
 			<language type="id">индонезия</language>
+			<language type="ie" draft="unconfirmed">интерлингве</language>
 			<language type="ig">игбо</language>
+			<language type="ii" draft="unconfirmed">сичуан йи</language>
 			<language type="is">исланд</language>
 			<language type="it">итальян</language>
 			<language type="iu">инуктикут</language>
 			<language type="ja">япон</language>
+			<language type="jv" draft="unconfirmed">җавача</language>
 			<language type="ka">грузин</language>
+			<language type="kea" draft="unconfirmed">кабувердиану</language>
+			<language type="kgp" draft="unconfirmed">каинганг</language>
 			<language type="kk">казакъ</language>
 			<language type="km">кхмер</language>
 			<language type="kn">каннада</language>
@@ -94,12 +114,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kru">курух</language>
 			<language type="ks">кашмири</language>
 			<language type="ku">көрд</language>
+			<language type="ku" menu="core" draft="unconfirmed">көрдчә</language>
+			<language type="ku" menu="extension" draft="unconfirmed">курманҗи</language>
+			<language type="kxv" draft="unconfirmed">куви</language>
 			<language type="ky">кыргыз</language>
 			<language type="la">латин</language>
 			<language type="lb">люксембург</language>
+			<language type="lij" draft="unconfirmed">лигурча</language>
+			<language type="lmo" draft="unconfirmed">ломбардча</language>
 			<language type="lo">лаос</language>
 			<language type="lt">литва</language>
 			<language type="lv">латыш</language>
+			<language type="mai" draft="unconfirmed">маитһили</language>
 			<language type="men">менде</language>
 			<language type="mg">малагаси</language>
 			<language type="mi">маори</language>
@@ -111,23 +137,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mr">маратхи</language>
 			<language type="ms">малай</language>
 			<language type="mt">мальта</language>
+			<language type="mul" draft="unconfirmed">Берничә тел</language>
 			<language type="my">бирма</language>
+			<language type="nds" draft="unconfirmed">түбән алманча</language>
 			<language type="ne">непали</language>
 			<language type="niu">ниуэ</language>
 			<language type="nl">голланд</language>
 			<language type="nl_BE">фламандча</language>
+			<language type="nn" draft="unconfirmed">нурвәҗчә нүнорск</language>
+			<language type="no" draft="unconfirmed">нурвәҗчә</language>
+			<language type="nqo" draft="unconfirmed">нко</language>
+			<language type="nso" draft="unconfirmed">төньяк сото</language>
 			<language type="ny">ньянҗа</language>
 			<language type="oc">окситан</language>
 			<language type="om">оромо</language>
 			<language type="or">ория</language>
 			<language type="pa">пәнҗаби</language>
 			<language type="pap">папьяменто</language>
+			<language type="pcm" draft="unconfirmed">Нигерия пидҗине</language>
 			<language type="pl">поляк</language>
+			<language type="prg" draft="unconfirmed">прусча</language>
 			<language type="ps">пушту</language>
 			<language type="pt">португал</language>
 			<language type="pt_PT">португал (Европа)</language>
 			<language type="qu">кечуа</language>
 			<language type="quc">киче</language>
+			<language type="raj" draft="unconfirmed">раҗастһани</language>
 			<language type="rm">ретороман</language>
 			<language type="ro">румын</language>
 			<language type="ru">рус</language>
@@ -135,6 +170,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="sa">санскрит</language>
 			<language type="sah">саха</language>
 			<language type="sat">сантали</language>
+			<language type="sc" draft="unconfirmed">сардинчә</language>
 			<language type="sd">синдһи</language>
 			<language type="se">төньяк саам</language>
 			<language type="si">сингал</language>
@@ -147,14 +183,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="so">сомали</language>
 			<language type="sq">албан</language>
 			<language type="sr">серб</language>
+			<language type="st" draft="unconfirmed">көньяк сото</language>
+			<language type="su" draft="unconfirmed">сундача</language>
 			<language type="sv">швед</language>
+			<language type="sw" draft="unconfirmed">суаһили</language>
 			<language type="syr">сүрия</language>
+			<language type="szl" draft="unconfirmed">силезиячә</language>
 			<language type="ta">тамил</language>
 			<language type="te">телугу</language>
 			<language type="tg">таҗик</language>
 			<language type="th">тай</language>
 			<language type="ti">тигринья</language>
 			<language type="tk">төрекмән</language>
+			<language type="tn" draft="unconfirmed">тсвана</language>
 			<language type="to">тонга</language>
 			<language type="tr">төрек</language>
 			<language type="tt">татар</language>
@@ -165,28 +206,87 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ur">урду</language>
 			<language type="uz">үзбәк</language>
 			<language type="ve">венда</language>
+			<language type="vec" draft="unconfirmed">вәнәтчә</language>
 			<language type="vi">вьетнам</language>
+			<language type="vmw" draft="unconfirmed">махувача</language>
 			<language type="wo">волоф</language>
+			<language type="xh" draft="unconfirmed">кхоса</language>
+			<language type="xnr" draft="unconfirmed">кангричә</language>
 			<language type="yi">идиш</language>
 			<language type="yo">йоруба</language>
-			<language type="zh">кытай</language>
+			<language type="yrl" draft="unconfirmed">ньеңату</language>
+			<language type="yue" draft="unconfirmed">кантунча</language>
+			<language type="yue" alt="menu" draft="unconfirmed">кытайча, кантунча</language>
+			<language type="za" draft="unconfirmed">жуаңча</language>
+			<language type="zh">кытайча</language>
 			<language type="zh" alt="menu">мандарин кытайчасы</language>
 			<language type="zh_Hans">гадиләштерелгән кытай</language>
 			<language type="zh_Hans" alt="long">гадиләштерелгән мандарин кытайчасы</language>
 			<language type="zh_Hant">традицион кытай</language>
 			<language type="zh_Hant" alt="long">традицион мандарин кытайчасы</language>
+			<language type="zu" draft="unconfirmed">зулуча</language>
+			<language type="zxx" draft="unconfirmed">Лингвистик эчтәлек юк</language>
 		</languages>
 		<scripts>
+			<script type="Adlm" draft="unconfirmed">адлам</script>
 			<script type="Arab">гарәп</script>
+			<script type="Aran" draft="unconfirmed">нәстәликъ</script>
+			<script type="Armn" draft="unconfirmed">әрмәни</script>
+			<script type="Beng" draft="unconfirmed">бенгал</script>
+			<script type="Bopo" draft="unconfirmed">бопомофо</script>
+			<script type="Brai" draft="unconfirmed">брайл</script>
+			<script type="Cakm" draft="unconfirmed">чакма</script>
+			<script type="Cans" draft="unconfirmed">UCAS</script>
+			<script type="Cher" draft="unconfirmed">чероки</script>
 			<script type="Cyrl">кирилл</script>
+			<script type="Deva" draft="unconfirmed">деванагари</script>
+			<script type="Ethi" draft="unconfirmed">хәбәши</script>
+			<script type="Geor" draft="unconfirmed">гөрҗи</script>
+			<script type="Grek" draft="unconfirmed">юнан</script>
+			<script type="Gujr" draft="unconfirmed">гөҗәрат</script>
+			<script type="Guru" draft="unconfirmed">гурмукхи</script>
+			<script type="Hanb" draft="unconfirmed">һан - бопомофо</script>
+			<script type="Hang" draft="unconfirmed">һангыл</script>
+			<script type="Hani" draft="unconfirmed">һан</script>
 			<script type="Hans">гадиләштерелгән</script>
 			<script type="Hans" alt="stand-alone">гадиләштерелгән кытай</script>
 			<script type="Hant">традицион</script>
 			<script type="Hant" alt="stand-alone">традицион кытай</script>
+			<script type="Hebr" draft="unconfirmed">гыйбрани</script>
+			<script type="Hira" draft="unconfirmed">һирагана</script>
+			<script type="Hrkt" draft="unconfirmed">япун иҗек әлифбалары</script>
+			<script type="Jamo" draft="unconfirmed">җамо</script>
 			<script type="Jpan">япон</script>
+			<script type="Kana" draft="unconfirmed">катакана</script>
+			<script type="Khmr" draft="unconfirmed">кмәр</script>
+			<script type="Knda" draft="unconfirmed">каннада</script>
 			<script type="Kore">корея</script>
+			<script type="Laoo" draft="unconfirmed">лао</script>
 			<script type="Latn">латин</script>
+			<script type="Mlym" draft="unconfirmed">малаялам</script>
+			<script type="Mong" draft="unconfirmed">могыл</script>
+			<script type="Mtei" draft="unconfirmed">мейтей маек</script>
+			<script type="Mymr" draft="unconfirmed">бурма</script>
+			<script type="Nkoo" draft="unconfirmed">нко</script>
+			<script type="Olck" draft="unconfirmed">ол чики</script>
+			<script type="Orya" draft="unconfirmed">ория</script>
+			<script type="Rohg" draft="unconfirmed">хәнифи</script>
+			<script type="Sinh" draft="unconfirmed">синһала</script>
+			<script type="Sund" draft="unconfirmed">сунда</script>
+			<script type="Syrc" draft="unconfirmed">сүрияни</script>
+			<script type="Taml" draft="unconfirmed">тамил</script>
+			<script type="Telu" draft="unconfirmed">телугу</script>
+			<script type="Tfng" draft="unconfirmed">тифинаг</script>
+			<script type="Thaa" draft="unconfirmed">тана</script>
+			<script type="Thai" draft="unconfirmed">тай</script>
+			<script type="Tibt" draft="unconfirmed">төбет</script>
+			<script type="Vaii" draft="unconfirmed">вай</script>
+			<script type="Yiii" draft="unconfirmed">йи</script>
+			<script type="Zmth" draft="unconfirmed">математик күргәзү</script>
+			<script type="Zsye" draft="unconfirmed">эмоҗи</script>
+			<script type="Zsym" draft="unconfirmed">симболлар</script>
 			<script type="Zxxx">язусыз</script>
+			<script type="Zyyy" draft="unconfirmed">уртак</script>
 			<script type="Zzzz">билгесез язу</script>
 		</scripts>
 		<territories>
@@ -273,6 +373,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Кытай</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">Клиппертон утравы</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -493,11 +594,125 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ZW">Зимбабве</territory>
 			<territory type="ZZ">билгесез төбәк</territory>
 		</territories>
+		<keys>
+			<key type="calendar" draft="unconfirmed">тәкъвим</key>
+			<key type="cf" draft="unconfirmed">валюта форматы</key>
+			<key type="collation" draft="unconfirmed">сортлау тәртибе</key>
+			<key type="currency" draft="unconfirmed">валюта</key>
+			<key type="hc" draft="unconfirmed">сәгать системасы (12 - 24)</key>
+			<key type="lb" draft="unconfirmed">юл ахыры стиле</key>
+			<key type="ms" draft="unconfirmed">үлчәү системасы</key>
+			<key type="numbers" draft="unconfirmed">саннар</key>
+		</keys>
 		<types>
+			<type key="calendar" type="buddhist" draft="unconfirmed">буддист тәкъвиме</type>
+			<type key="calendar" type="buddhist" scope="core" draft="unconfirmed">буддист</type>
+			<type key="calendar" type="chinese" draft="unconfirmed">кытай тәкъвиме</type>
+			<type key="calendar" type="chinese" scope="core" draft="unconfirmed">кытай</type>
+			<type key="calendar" type="coptic" draft="unconfirmed">кыйбти тәкъвим</type>
+			<type key="calendar" type="coptic" scope="core" draft="unconfirmed">кыйбти</type>
+			<type key="calendar" type="dangi" draft="unconfirmed">данги тәкъвиме</type>
+			<type key="calendar" type="dangi" scope="core" draft="unconfirmed">данги</type>
+			<type key="calendar" type="ethiopic" draft="unconfirmed">хәбәши тәкъвим</type>
+			<type key="calendar" type="ethiopic" scope="core" draft="unconfirmed">хәбәши</type>
+			<type key="calendar" type="ethiopic-amete-alem" draft="unconfirmed">хәбәши амәте галәм тәкъвим</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core" draft="unconfirmed">хәбәши амәте галәм</type>
 			<type key="calendar" type="gregorian">григориан ел исәбе</type>
+			<type key="calendar" type="gregorian" scope="core">милади</type>
+			<type key="calendar" type="hebrew" draft="unconfirmed">гыйбрани тәкъвиме</type>
+			<type key="calendar" type="hebrew" scope="core" draft="unconfirmed">гыйбрани</type>
+			<type key="calendar" type="islamic" draft="unconfirmed">һиҗри тәкъвим</type>
+			<type key="calendar" type="islamic" scope="core" draft="unconfirmed">һиҗри</type>
+			<type key="calendar" type="islamic-civil" draft="unconfirmed">һиҗри тәкъвим (15 йүл 622)</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="unconfirmed">һиҗри (15.07.622)</type>
+			<type key="calendar" type="islamic-umalqura" draft="unconfirmed">һиҗри тәкъвим (Өммелкора)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core" draft="unconfirmed">һиҗри (Өммелкора)</type>
 			<type key="calendar" type="iso8601">ISO-8601 календаре</type>
+			<type key="calendar" type="japanese" draft="unconfirmed">япун тәкъвиме</type>
+			<type key="calendar" type="japanese" scope="core" draft="unconfirmed">япун</type>
+			<type key="calendar" type="persian" draft="unconfirmed">иран тәкъвиме</type>
+			<type key="calendar" type="persian" scope="core" draft="unconfirmed">иран</type>
+			<type key="calendar" type="roc" draft="unconfirmed">Кытай җөмһүрияте тәкъвиме</type>
+			<type key="calendar" type="roc" scope="core" draft="unconfirmed">мингуо</type>
+			<type key="cf" type="account" draft="unconfirmed">хисапчылык валюта форматы</type>
+			<type key="cf" type="account" scope="core" draft="unconfirmed">хисапчылык</type>
+			<type key="cf" type="standard" draft="unconfirmed">гадәти валюта форматы</type>
+			<type key="cf" type="standard" scope="core" draft="unconfirmed">гадәти</type>
+			<type key="collation" type="ducet" draft="unconfirmed">беренчел юникод сортлау тәртибе</type>
+			<type key="collation" type="ducet" scope="core" draft="unconfirmed">беренчел юникод</type>
+			<type key="collation" type="search" draft="unconfirmed">гомуми максатлы эзләү</type>
+			<type key="collation" type="search" scope="core" draft="unconfirmed">эзләү</type>
 			<type key="collation" type="standard">гадәти тәртипләү ысулы</type>
+			<type key="collation" type="standard" scope="core">гадәти</type>
+			<type key="em" type="default" scope="core" draft="unconfirmed">беренчел</type>
+			<type key="em" type="emoji" scope="core" draft="unconfirmed">эмоҗи</type>
+			<type key="em" type="text" scope="core" draft="unconfirmed">мәтен</type>
+			<type key="hc" type="h11" draft="unconfirmed">12 сәгать системасы (0–11)</type>
+			<type key="hc" type="h11" scope="core" draft="unconfirmed">12 (0–11)</type>
+			<type key="hc" type="h12" draft="unconfirmed">12 сәгать системасы (1–12)</type>
+			<type key="hc" type="h12" scope="core" draft="unconfirmed">12 (1–12)</type>
+			<type key="hc" type="h23" draft="unconfirmed">24 сәгать системасы (0–23)</type>
+			<type key="hc" type="h23" scope="core" draft="unconfirmed">24 (0–23)</type>
+			<type key="hc" type="h24" draft="unconfirmed">24 сәгать системасы (1–24)</type>
+			<type key="hc" type="h24" scope="core" draft="unconfirmed">24 (1–24)</type>
+			<type key="lb" type="loose" draft="unconfirmed">ирекле юл ахыры стиле</type>
+			<type key="lb" type="loose" scope="core" draft="unconfirmed">ирекле</type>
+			<type key="lb" type="normal" draft="unconfirmed">гадәти юл ахыры стиле</type>
+			<type key="lb" type="normal" scope="core" draft="unconfirmed">гадәти</type>
+			<type key="lb" type="strict" draft="unconfirmed">кискен юл ахыры стиле</type>
+			<type key="lb" type="strict" scope="core" draft="unconfirmed">кискен</type>
+			<type key="lw" type="breakall" scope="core" draft="unconfirmed">барын күчерү</type>
+			<type key="lw" type="keepall" scope="core" draft="unconfirmed">барын калдыру</type>
+			<type key="lw" type="normal" scope="core" draft="unconfirmed">гадәти</type>
+			<type key="lw" type="phrase" scope="core" draft="unconfirmed">гыйбарәләрдә калдыру</type>
+			<type key="ms" type="metric" draft="unconfirmed">метрик система</type>
+			<type key="ms" type="metric" scope="core" draft="unconfirmed">метрик</type>
+			<type key="ms" type="uksystem" draft="unconfirmed">инглиз үлчәү системасы</type>
+			<type key="ms" type="uksystem" scope="core" draft="unconfirmed">БП</type>
+			<type key="ms" type="ussystem" draft="unconfirmed">БШ үлчәү системасы</type>
+			<type key="ms" type="ussystem" scope="core" draft="unconfirmed">БШ</type>
+			<type key="numbers" type="arab" draft="unconfirmed">һинд-гарәп рәкымнары</type>
+			<type key="numbers" type="arabext" draft="unconfirmed">киңәйтелгән һинд-гарәп рәкымнары</type>
+			<type key="numbers" type="armn" draft="unconfirmed">әрмәни рәкымнары</type>
+			<type key="numbers" type="armnlow" draft="unconfirmed">кече хәреф әрмәни рәкымнары</type>
+			<type key="numbers" type="beng" draft="unconfirmed">бенгал рәкымнары</type>
+			<type key="numbers" type="cakm" draft="unconfirmed">чакма рәкымнары</type>
+			<type key="numbers" type="deva" draft="unconfirmed">деванагари рәкымнары</type>
+			<type key="numbers" type="ethi" draft="unconfirmed">хәбәши рәкымнар</type>
+			<type key="numbers" type="fullwide" draft="unconfirmed">тулы киңлектә рәкымнар</type>
+			<type key="numbers" type="geor" draft="unconfirmed">гөрҗи рәкымнары</type>
+			<type key="numbers" type="grek" draft="unconfirmed">юнан рәкымнары</type>
+			<type key="numbers" type="greklow" draft="unconfirmed">кече хәреф юнан рәкымнары</type>
+			<type key="numbers" type="gujr" draft="unconfirmed">гөҗәрат рәкымнары</type>
+			<type key="numbers" type="guru" draft="unconfirmed">гурмухи рәкымнары</type>
+			<type key="numbers" type="hanidec" draft="unconfirmed">кытай унарлы рәкымнары</type>
+			<type key="numbers" type="hans" draft="unconfirmed">гадиләштерелгән кытай рәкымнары</type>
+			<type key="numbers" type="hansfin" draft="unconfirmed">финанс гадиләштерелгән кытай рәкымнары</type>
+			<type key="numbers" type="hant" draft="unconfirmed">горфи кытай рәкымнары</type>
+			<type key="numbers" type="hantfin" draft="unconfirmed">финанс горфи кытай рәкымнары</type>
+			<type key="numbers" type="hebr" draft="unconfirmed">гыйбрани рәкымнары</type>
+			<type key="numbers" type="java" draft="unconfirmed">җава рәкымнары</type>
+			<type key="numbers" type="jpan" draft="unconfirmed">япун рәкымнары</type>
+			<type key="numbers" type="jpanfin" draft="unconfirmed">финанс япун рәкымнары</type>
+			<type key="numbers" type="khmr" draft="unconfirmed">кмәр рәкымнары</type>
+			<type key="numbers" type="knda" draft="unconfirmed">каннада рәкымнары</type>
+			<type key="numbers" type="laoo" draft="unconfirmed">лао рәкымнары</type>
 			<type key="numbers" type="latn">көнбатыш цифрлары</type>
+			<type key="numbers" type="mlym" draft="unconfirmed">малаялам рәкымнары</type>
+			<type key="numbers" type="mtei" draft="unconfirmed">меетей майек рәкымнары</type>
+			<type key="numbers" type="mymr" draft="unconfirmed">мьянмар рәкымнары</type>
+			<type key="numbers" type="olck" draft="unconfirmed">ол чики рәкымнары</type>
+			<type key="numbers" type="orya" draft="unconfirmed">одия рәкымнары</type>
+			<type key="numbers" type="roman" draft="unconfirmed">рум рәкымнары</type>
+			<type key="numbers" type="romanlow" draft="unconfirmed">кече хәреф рум рәкымнары</type>
+			<type key="numbers" type="taml" draft="unconfirmed">горфи тамил рәкымнары</type>
+			<type key="numbers" type="tamldec" draft="unconfirmed">тамил рәкымнары</type>
+			<type key="numbers" type="telu" draft="unconfirmed">телугу рәкымнары</type>
+			<type key="numbers" type="thai" draft="unconfirmed">тай рәкымнары</type>
+			<type key="numbers" type="tibt" draft="unconfirmed">төбет рәкымнары</type>
+			<type key="numbers" type="vaii" draft="unconfirmed">вай рәкымнары</type>
+			<type key="ss" type="none" scope="core" draft="unconfirmed">сүн</type>
+			<type key="ss" type="standard" scope="core" draft="unconfirmed">каб</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрик</measurementSystemName>
@@ -547,21 +762,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Gy">G y 'ел'</dateFormatItem>
@@ -832,6 +1059,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} {0} 'сәгатьтә'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -840,22 +1070,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} {0} 'сәгатьтә'</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y 'ел'</dateFormatItem>
-						<dateFormatItem id="GyMMM">G y 'ел', MMM</dateFormatItem>
+						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y 'ел', d MMM</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y 'ел', d MMM, E</dateFormatItem>
 						<dateFormatItem id="h">h a</dateFormatItem>
@@ -1645,6 +1884,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>Пасха утравы</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Куяйкә</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Аренас</exemplarCity>
 			</zone>
@@ -1909,7 +2151,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2586,9 +2828,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Көнбатыш Африка вакыты</generic>
-					<standard>Көнбатыш Африка стандарт вакыты</standard>
-					<daylight>Көнбатыш Африка җәйге вакыты</daylight>
+					<standard>Көнбатыш Африка вакыты</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2945,6 +3185,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гайана вакыты</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавай-Алеут стандарт вакыты</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавай-Алеут вакыты</generic>
@@ -3509,22 +3754,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0 мең</pattern>
-					<pattern type="10000" count="other">¤00 мең</pattern>
-					<pattern type="100000" count="other">¤000 мең</pattern>
-					<pattern type="1000000" count="other">¤0 млн</pattern>
-					<pattern type="10000000" count="other">¤00 млн</pattern>
-					<pattern type="100000000" count="other">¤000 млн</pattern>
-					<pattern type="1000000000" count="other">¤0 млрд</pattern>
-					<pattern type="10000000000" count="other">¤00 млрд</pattern>
-					<pattern type="100000000000" count="other">¤000 млрд</pattern>
-					<pattern type="1000000000000" count="other">¤0 трлн</pattern>
-					<pattern type="10000000000000" count="other">¤00 трлн</pattern>
-					<pattern type="100000000000000" count="other">¤000 трлн</pattern>
+					<pattern type="1000" count="other">0 мең ¤</pattern>
+					<pattern type="10000" count="other">00 мең ¤</pattern>
+					<pattern type="100000" count="other">000 мең ¤</pattern>
+					<pattern type="1000000" count="other">0 млн ¤</pattern>
+					<pattern type="10000000" count="other">00 млн ¤</pattern>
+					<pattern type="100000000" count="other">000 млн ¤</pattern>
+					<pattern type="1000000000" count="other">0 млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00 млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000млрд ¤</pattern>
+					<pattern type="1000000000000" count="other">0 трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00 трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000 трлн ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4137,6 +4386,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Көнчыгыш Кариб доллары</displayName>
 				<displayName count="other">Көнчыгыш Кариб долларлары</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>кариб гульдены</displayName>
+				<displayName count="other">кариб гульдены</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Көнбатыш Африка КФА франкы</displayName>
 				<displayName count="other">Көнбатыш Африка КФА франклары</displayName>
@@ -4161,6 +4414,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Замбия квачасы</displayName>
 				<displayName count="other">Замбия квачалары</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Зимбабве алтыны</displayName>
+				<displayName count="other">Зимбабве алтыны</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4176,6 +4433,272 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0} һәр {1}</compoundUnitPattern>
 			</compoundUnit>
+			<unit type="area-square-kilometer">
+				<displayName draft="unconfirmed">квадрат километр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат километр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/км²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName draft="unconfirmed">гектар</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} гектар</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="unconfirmed">квадрат метр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат метр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/квадрат метр</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName draft="unconfirmed">квадрат сантиметр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат сантиметр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/квадрат сантиметр</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="unconfirmed">квадрат миль</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат миль</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/квадрат миль</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="unconfirmed">акр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="unconfirmed">квадрат ярд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат ярд</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="unconfirmed">квадрат фут</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат фут</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName draft="unconfirmed">квадрат дюйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} квадрат дюйм</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/квадрат дюйм</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName draft="unconfirmed">дунам</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дунам</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">гасыр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} гасыр</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName draft="unconfirmed">унъеллык</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} унъеллык</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">ел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ел</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ел</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName draft="unconfirmed">чирек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} чирек</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ч</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">ай</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ай</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ай</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">атна</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} атна</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/атна</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="unconfirmed">көн</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} көн</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/көн</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="unconfirmed">сәгать</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сәгать</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/сәгать</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="unconfirmed">минут</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} минут</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/минут</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="unconfirmed">секунд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} секунд</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/секунд</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">миллисекунд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} миллисекунд</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName draft="unconfirmed">микросекунд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} микросекунд</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="unconfirmed">наносекунд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} наносекунд</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName draft="unconfirmed">типографик эм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} эм</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName draft="unconfirmed">пиксел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пиксел</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName draft="unconfirmed">мегапиксел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мегапиксел</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName draft="unconfirmed">пиксел/сантиметрә</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пиксел/сантиметрә</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName draft="unconfirmed">пиксел/дүйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пиксел/дүйм</unitPattern>
+			</unit>
+			<unit type="length-earth-radius">
+				<displayName draft="unconfirmed">Җир радиусы</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Җир радиусы</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName draft="unconfirmed">километр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} километр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/километр</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName draft="unconfirmed">метр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} метр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/метр</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">дециметр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дециметр</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">сантиметр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сантиметр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName draft="unconfirmed">миллиметр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} миллиметр</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">микрометр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} микрометр</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="unconfirmed">нанометр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} нанометр</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName draft="unconfirmed">пикометр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пикометр</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">миль</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} миль</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="unconfirmed">ярд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ярд</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">фут</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} фут</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">дюйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дюйм</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">парсек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} парсек</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">яктылык елы</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} яктылык елы</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">астрономик берәмлек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} астрономик берәмлек</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">диңгез миле</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} диңгез миле</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">скандинав миле</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} скандинав миле</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName draft="unconfirmed">пункт</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пкт</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName draft="unconfirmed">Кояш радиусы</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Кояш радиусы</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName draft="unconfirmed">кубик километр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} кубик километр</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName draft="unconfirmed">кубик метр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} кубик метр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/кубик метр</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="unconfirmed">кубик сантиметр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} кубик сантиметр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/кубик сантиметр</perUnitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName draft="unconfirmed">мегалитр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мегалитр</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="unconfirmed">гектолитр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} гектолитр</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName draft="unconfirmed">литр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} литр</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/литр</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName draft="unconfirmed">децилитр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} децилитр</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="unconfirmed">сантилитр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сантилитр</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName draft="unconfirmed">миллилитр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} миллилитр</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">метрик пинт</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} метрик пинт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">метрик чынаяк</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} метрик чынаяк</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">метрик сыек унция</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} метрик сыек унция</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName draft="unconfirmed">төн</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} төн</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/төн</perUnitPattern>
+			</unit>
 			<coordinateUnit>
 				<displayName>кардиналь юнәлеш</displayName>
 				<coordinateUnitPattern type="east">{0} көнчыгыш</coordinateUnitPattern>
@@ -4185,6 +4708,267 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
+			<unit type="area-square-kilometer">
+				<displayName draft="unconfirmed">км²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} км²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/км²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName draft="unconfirmed">гектар</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} га</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="unconfirmed">м²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/м²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName draft="unconfirmed">см²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} см²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="unconfirmed">ми²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ми²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ми²</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="unconfirmed">акр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="unconfirmed">ярд²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ярд²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="unconfirmed">фут²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} фут²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName draft="unconfirmed">дюйм²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дюйм²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/дюйм²</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName draft="unconfirmed">дунам</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дунам</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">г</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} г</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName draft="unconfirmed">унъеллык</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} унъеллык</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">ел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ел</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/е</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName draft="unconfirmed">чирек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} чир.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ч</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">ай</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ай</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ай</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">атна</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ат.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ат.</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="unconfirmed">көн</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} көн</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/көн</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="unconfirmed">сәгать</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сг</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/сг</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="unconfirmed">минут</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мин</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/минут</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="unconfirmed">секунд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сек</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ск</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">миллисекунд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мск</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName draft="unconfirmed">μсек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} μск</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="unconfirmed">наносек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} нск</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName draft="unconfirmed">эм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} эм</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName draft="unconfirmed">пиксел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пкс</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName draft="unconfirmed">мегапиксел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} МП</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName draft="unconfirmed">пкс/см</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пкс/см</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName draft="unconfirmed">пкс/дүйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пкс/дүйм</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName draft="unconfirmed">км</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} км</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/км</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName draft="unconfirmed">м</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/м</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">дм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дм</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">см</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} см</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName draft="unconfirmed">мм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мм</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">микрон</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мкм</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="unconfirmed">нм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} нм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName draft="unconfirmed">пм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">миль</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ми</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="unconfirmed">ярд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ярд</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">фут</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} фут</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">дюйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дюйм</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">парсек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">яктылык елы</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} якт. елы</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">а. б.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} а. б.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">диң. ми</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} д. ми</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">ск. ми</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ск. ми</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName draft="unconfirmed">пункт</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пкт</unitPattern>
+			</unit>
+			<unit type="length-solar-radius">
+				<displayName draft="unconfirmed">Кояш радиусы</displayName>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName draft="unconfirmed">км³</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} км³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName draft="unconfirmed">м³</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="unconfirmed">см³</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} см³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см³</perUnitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName draft="unconfirmed">Мл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Мл</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="unconfirmed">гл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} гл</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName draft="unconfirmed">литр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} л</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/л</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName draft="unconfirmed">дл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="unconfirmed">сл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сл</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName draft="unconfirmed">мл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мл</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">мпт</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мпт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">м. чын.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м. чын.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">м. сыек унц.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м. сыек унц.</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName draft="unconfirmed">төн</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} төн</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/төн</perUnitPattern>
+			</unit>
 			<coordinateUnit>
 				<displayName>юнәлеш</displayName>
 				<coordinateUnitPattern type="east">{0} көнчыгыш</coordinateUnitPattern>
@@ -4193,6 +4977,266 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<coordinateUnitPattern type="west">{0} көнбатыш</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
+		<unitLength type="narrow">
+			<unit type="area-square-kilometer">
+				<displayName draft="unconfirmed">км²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} км²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/км²</perUnitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<displayName draft="unconfirmed">гектар</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} га</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<displayName draft="unconfirmed">м²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/м²</perUnitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<displayName draft="unconfirmed">см²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} см²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см²</perUnitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<displayName draft="unconfirmed">ми²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ми²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ми²</perUnitPattern>
+			</unit>
+			<unit type="area-acre">
+				<displayName draft="unconfirmed">акр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} акр</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<displayName draft="unconfirmed">ярд²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ярд²</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<displayName draft="unconfirmed">фут²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} фут²</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<displayName draft="unconfirmed">дюйм²</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дюйм²</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/дюйм²</perUnitPattern>
+			</unit>
+			<unit type="area-dunam">
+				<displayName draft="unconfirmed">дунам</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дунам</unitPattern>
+			</unit>
+			<unit type="duration-century">
+				<displayName draft="unconfirmed">г</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}г</unitPattern>
+			</unit>
+			<unit type="duration-decade">
+				<displayName draft="unconfirmed">унъеллык</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}унъеллык</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="unconfirmed">ел</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}е</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/е</perUnitPattern>
+			</unit>
+			<unit type="duration-quarter">
+				<displayName draft="unconfirmed">чир.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}ч</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ч</perUnitPattern>
+			</unit>
+			<unit type="duration-month">
+				<displayName draft="unconfirmed">ай</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}а</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ай</perUnitPattern>
+			</unit>
+			<unit type="duration-week">
+				<displayName draft="unconfirmed">атна</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}ат.</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ат.</perUnitPattern>
+			</unit>
+			<unit type="duration-day">
+				<displayName draft="unconfirmed">көн</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}к</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/к</perUnitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<displayName draft="unconfirmed">сг</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}с</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/сг</perUnitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<displayName draft="unconfirmed">мин</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}м</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/минут</perUnitPattern>
+			</unit>
+			<unit type="duration-second">
+				<displayName draft="unconfirmed">сек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}ск</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/ск</perUnitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<displayName draft="unconfirmed">мсек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мск</unitPattern>
+			</unit>
+			<unit type="duration-microsecond">
+				<displayName draft="unconfirmed">μсек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}μск</unitPattern>
+			</unit>
+			<unit type="duration-nanosecond">
+				<displayName draft="unconfirmed">нск</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}нск</unitPattern>
+			</unit>
+			<unit type="graphics-em">
+				<displayName draft="unconfirmed">эм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}эм</unitPattern>
+			</unit>
+			<unit type="graphics-pixel">
+				<displayName draft="unconfirmed">пкс</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}пкс</unitPattern>
+			</unit>
+			<unit type="graphics-megapixel">
+				<displayName draft="unconfirmed">МП</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}МП</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-centimeter">
+				<displayName draft="unconfirmed">пкс/см</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}пкс/см</unitPattern>
+			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName draft="unconfirmed">пкс/дүйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}пкс/дүйм</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<displayName draft="unconfirmed">км</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}км</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/км</perUnitPattern>
+			</unit>
+			<unit type="length-meter">
+				<displayName draft="unconfirmed">м</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}м</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/м</perUnitPattern>
+			</unit>
+			<unit type="length-decimeter">
+				<displayName draft="unconfirmed">дм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}дм</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<displayName draft="unconfirmed">см</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}см</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см</perUnitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<displayName draft="unconfirmed">мм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}мм</unitPattern>
+			</unit>
+			<unit type="length-micrometer">
+				<displayName draft="unconfirmed">мкм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}мкм</unitPattern>
+			</unit>
+			<unit type="length-nanometer">
+				<displayName draft="unconfirmed">нм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}нм</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<displayName draft="unconfirmed">пм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}пм</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<displayName draft="unconfirmed">ми</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ми</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<displayName draft="unconfirmed">ярд</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} ярд</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<displayName draft="unconfirmed">фут</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} фут</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/фут</perUnitPattern>
+			</unit>
+			<unit type="length-inch">
+				<displayName draft="unconfirmed">дюйм</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дюйм</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/дюйм</perUnitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<displayName draft="unconfirmed">парсек</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} пк</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<displayName draft="unconfirmed">якт. елы</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} якт. елы</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<displayName draft="unconfirmed">а. б.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} а.б.</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<displayName draft="unconfirmed">д. ми</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} д. ми</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<displayName draft="unconfirmed">ск. ми</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}ск. ми</unitPattern>
+			</unit>
+			<unit type="length-point">
+				<displayName draft="unconfirmed">пкт</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0}пкт</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<displayName draft="unconfirmed">км³</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} км³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<displayName draft="unconfirmed">м³</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/м³</perUnitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<displayName draft="unconfirmed">см³</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} см³</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/см³</perUnitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName draft="unconfirmed">Мл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} Мл</unitPattern>
+			</unit>
+			<unit type="volume-hectoliter">
+				<displayName draft="unconfirmed">гл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} гл</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<displayName draft="unconfirmed">литр</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} л</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/л</perUnitPattern>
+			</unit>
+			<unit type="volume-deciliter">
+				<displayName draft="unconfirmed">дл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} дл</unitPattern>
+			</unit>
+			<unit type="volume-centiliter">
+				<displayName draft="unconfirmed">сл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} сл</unitPattern>
+			</unit>
+			<unit type="volume-milliliter">
+				<displayName draft="unconfirmed">мл</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мл</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<displayName draft="unconfirmed">мпт</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} мпт</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<displayName draft="unconfirmed">м. чын.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м. чын.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="unconfirmed">м. сыек унц.</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} м. сыек унц.</unitPattern>
+			</unit>
+			<unit type="duration-night">
+				<displayName draft="unconfirmed">төн</displayName>
+				<unitPattern count="other" draft="unconfirmed">{0} төн</unitPattern>
+				<perUnitPattern draft="unconfirmed">{0}/төн</perUnitPattern>
+			</unit>
+		</unitLength>
 	</units>
 	<listPatterns>
 		<listPattern>
diff --git a/make/data/cldr/common/main/tyv.xml b/make/data/cldr/common/main/tyv.xml
index 4457e457a04..86e5ca8a3fe 100644
--- a/make/data/cldr/common/main/tyv.xml
+++ b/make/data/cldr/common/main/tyv.xml
@@ -10,9 +10,717 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<version number="$Revision$"/>
 		<language type="tyv"/>
 	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="ar">Араб</language>
+			<language type="ar_001">Амгы стандарт араб</language>
+			<language type="bn">Бенгал</language>
+			<language type="de">Немец</language>
+			<language type="de_AT">Немец (AT)</language>
+			<language type="de_CH">Немец (CH)</language>
+			<language type="en">Англи</language>
+			<language type="en_AU">Англи (AU)</language>
+			<language type="en_CA">Англи (CA)</language>
+			<language type="en_GB">Англи (GB)</language>
+			<language type="en_US">Англи (US)</language>
+			<language type="es">Испан</language>
+			<language type="es_419">Латин Америкада Испан</language>
+			<language type="es_ES">Европей Испан</language>
+			<language type="es_MX">Мексикан Испан</language>
+			<language type="fr">Француз</language>
+			<language type="fr_CA">Француз (CA)</language>
+			<language type="fr_CH">Француз (CH)</language>
+			<language type="hi_Latn">Хинди (латин)</language>
+			<language type="hi_Latn" alt="variant">Хинглиш</language>
+			<language type="id">Индонези</language>
+			<language type="it">Итали</language>
+			<language type="ja">Япон</language>
+			<language type="ko">Көрей</language>
+			<language type="nl">Нидерланд</language>
+			<language type="nl_BE">Фламанд</language>
+			<language type="pl">Поляк</language>
+			<language type="pt">Португал</language>
+			<language type="pt_BR">Бразилияда Португал</language>
+			<language type="pt_PT">Европей Португал</language>
+			<language type="ru">Орус</language>
+			<language type="th">Тай</language>
+			<language type="tr">Турк</language>
+			<language type="tyv">Тыва</language>
+			<language type="zh">Кыдат</language>
+			<language type="zh" alt="menu">Кыдат Мандарин</language>
+			<language type="zh_Hans">Кыдат (бөдүүнчүткен)</language>
+			<language type="zh_Hans" alt="long">Кыдат Мандарин (бөдүүнчүткен)</language>
+			<language type="zh_Hant">Кыдат (чаңчылчаан)</language>
+			<language type="zh_Hant" alt="long">Кыдат Мандарин (чаңчылчаан)</language>
+		</languages>
+		<scripts>
+			<script type="Arab">Арабица</script>
+			<script type="Cyrl">Кириллица</script>
+			<script type="Hans">Бөдүүнчүткен</script>
+			<script type="Hans" alt="stand-alone">Бөдүүнчүткен Кыдат</script>
+			<script type="Hant">Чаңчылчаан</script>
+			<script type="Hant" alt="stand-alone">Чаңчылчаан Кыдат</script>
+			<script type="Jpan">Япон</script>
+			<script type="Kore">Көрей</script>
+			<script type="Latn">Латиница</script>
+			<script type="Zxxx">Бижик чок</script>
+			<script type="Zzzz">Билдинмес Бижик</script>
+		</scripts>
+		<territories>
+			<territory type="001">Бүгү Делегей</territory>
+			<territory type="002">Африка</territory>
+			<territory type="003">Соңгу Америка</territory>
+			<territory type="005">Мурнуу Америка</territory>
+			<territory type="009">Океания</territory>
+			<territory type="011">Барыын Африка</territory>
+			<territory type="013">Төп Америка</territory>
+			<territory type="014">Чөөн Африка</territory>
+			<territory type="015">Соңгу Африка</territory>
+			<territory type="017">Төп Африка</territory>
+			<territory type="018">Мурнуу Африка</territory>
+			<territory type="019">Америкалар</territory>
+			<territory type="021">Соңгу Америка кезээ</territory>
+			<territory type="029">Карибтер</territory>
+			<territory type="030">Чөөн Азия</territory>
+			<territory type="034">Мурнуу Азия</territory>
+			<territory type="035">Мурнуу-Чөөн Азия</territory>
+			<territory type="039">Мурнуу Европа</territory>
+			<territory type="053">Австралия</territory>
+			<territory type="054">Меланезия</territory>
+			<territory type="057">Микронезия</territory>
+			<territory type="061">Полинезия</territory>
+			<territory type="142">Азия</territory>
+			<territory type="143">Төп Азия</territory>
+			<territory type="145">Барыын Азия</territory>
+			<territory type="150">Европа</territory>
+			<territory type="151">Чөөн Европа</territory>
+			<territory type="154">Соңгу Европа</territory>
+			<territory type="155">Барыын Европа</territory>
+			<territory type="202">Тропик Африка</territory>
+			<territory type="419">Латин Америка</territory>
+			<territory type="AG">Антигуа &amp; Барбуда</territory>
+			<territory type="AI">Ангилья</territory>
+			<territory type="AO">Ангола</territory>
+			<territory type="AR">Аргентина</territory>
+			<territory type="AW">Аруба</territory>
+			<territory type="BB">Барбадос</territory>
+			<territory type="BF">Буркина-Фасо</territory>
+			<territory type="BI">Бурунди</territory>
+			<territory type="BJ">Бенин</territory>
+			<territory type="BL">Сен-Бартелеми</territory>
+			<territory type="BM">Бермуд Ортулуктар</territory>
+			<territory type="BO">Боливия</territory>
+			<territory type="BQ">Кариб Нидерландтар</territory>
+			<territory type="BR">Бразилия</territory>
+			<territory type="BS">Багамнар</territory>
+			<territory type="BV">Буве Ортулуктар</territory>
+			<territory type="BW">Ботсвана</territory>
+			<territory type="BZ">Белиз</territory>
+			<territory type="CA">Канада</territory>
+			<territory type="CD">Конго - Киншаса</territory>
+			<territory type="CD" alt="variant">Конго (ДРК)</territory>
+			<territory type="CF">Төп-Африкан Республика</territory>
+			<territory type="CG">Конго - Браззавиль</territory>
+			<territory type="CG" alt="variant">Республика Конго</territory>
+			<territory type="CI">Кот-д’Ивуар</territory>
+			<territory type="CL">Чили</territory>
+			<territory type="CM">Камерун</territory>
+			<territory type="CO">Колумбия</territory>
+			<territory type="CR">Коста-Рика</territory>
+			<territory type="CU">Куба</territory>
+			<territory type="CV">Кабо-Верде</territory>
+			<territory type="CW">Кюрасао</territory>
+			<territory type="DJ">Джибути</territory>
+			<territory type="DM">Доминика</territory>
+			<territory type="DO">Доминикан Республика</territory>
+			<territory type="DZ">Алжир</territory>
+			<territory type="EA">Сеута &amp; Мелилья</territory>
+			<territory type="EC">Эквадор</territory>
+			<territory type="EG">Египет</territory>
+			<territory type="EH">Барыын Сахара</territory>
+			<territory type="ER">Эритрея</territory>
+			<territory type="ET">Эфиопия</territory>
+			<territory type="EU">Европа Эвилели</territory>
+			<territory type="EZ">Еврозона</territory>
+			<territory type="FK">Фолкленд Ортулуктар</territory>
+			<territory type="FK" alt="variant">Фолкленд (Мальвин) Ортулуктар</territory>
+			<territory type="GA">Габон</territory>
+			<territory type="GD">Гренада</territory>
+			<territory type="GF">Француз Гвиана</territory>
+			<territory type="GH">Гана</territory>
+			<territory type="GL">Гренландия</territory>
+			<territory type="GM">Гамбия</territory>
+			<territory type="GN">Гвинея</territory>
+			<territory type="GP">Гваделупа</territory>
+			<territory type="GQ">Экваторда Гвинея</territory>
+			<territory type="GS">Мурнуу Георгия &amp; Мурнуу Сандвич Ортулуктар</territory>
+			<territory type="GT">Гватемала</territory>
+			<territory type="GW">Гвинея-Бисау</territory>
+			<territory type="GY">Гайана</territory>
+			<territory type="HN">Гондурас</territory>
+			<territory type="HT">Гаити</territory>
+			<territory type="IC">Канар Ортулуктар</territory>
+			<territory type="IO">Британ девискээр Инди океанда</territory>
+			<territory type="IO" alt="chagos">Архипелаг Чагос</territory>
+			<territory type="JM">Ямайка</territory>
+			<territory type="KE">Кения</territory>
+			<territory type="KM">Коморлар</territory>
+			<territory type="KN">Сент-Китс &amp; Невис</territory>
+			<territory type="KY">Кайман Ортулуктар</territory>
+			<territory type="LC">Сент-Люсия</territory>
+			<territory type="LR">Либерия</territory>
+			<territory type="LS">Лесото</territory>
+			<territory type="LY">Ливия</territory>
+			<territory type="MA">Морокко</territory>
+			<territory type="MF">Сен-Мартен</territory>
+			<territory type="MG">Мадагаскар</territory>
+			<territory type="ML">Мали</territory>
+			<territory type="MQ">Мартиника</territory>
+			<territory type="MR">Мавритания</territory>
+			<territory type="MS">Монтсеррат</territory>
+			<territory type="MU">Маврикий</territory>
+			<territory type="MW">Малави</territory>
+			<territory type="MX">Мексика</territory>
+			<territory type="MZ">Мозамбик</territory>
+			<territory type="NA">Намибия</territory>
+			<territory type="NE">Нигер</territory>
+			<territory type="NG">Нигерия</territory>
+			<territory type="NI">Никарагуа</territory>
+			<territory type="PA">Панама</territory>
+			<territory type="PE">Перу</territory>
+			<territory type="PM">Сен-Пьер &amp; Микелон</territory>
+			<territory type="PR">Пуэрто-Рико</territory>
+			<territory type="PY">Парагвай</territory>
+			<territory type="QO">Дашкаар Океания</territory>
+			<territory type="RE">Реюньон</territory>
+			<territory type="RU">Россия Федерациязы</territory>
+			<territory type="RW">Руанда</territory>
+			<territory type="SC">Сейшелдер</territory>
+			<territory type="SD">Судан</territory>
+			<territory type="SH">Ыдыктыг Елена Ортулуктары</territory>
+			<territory type="SL">Сьерра-Леоне</territory>
+			<territory type="SN">Сенегал</territory>
+			<territory type="SO">Сомали</territory>
+			<territory type="SR">Суринам</territory>
+			<territory type="SS">Мурнуу Судан</territory>
+			<territory type="ST">Сан-Томе &amp; Принсипи</territory>
+			<territory type="SV">Сальвадор</territory>
+			<territory type="SX">Синт-Мартен</territory>
+			<territory type="SZ">Эсватини</territory>
+			<territory type="SZ" alt="variant">Свазиленд</territory>
+			<territory type="TC">Түрктер &amp; Кайкос</territory>
+			<territory type="TD">Чад</territory>
+			<territory type="TF">Француз Мурнуу девискээрлер</territory>
+			<territory type="TG">Того</territory>
+			<territory type="TN">Тунис</territory>
+			<territory type="TT">Тринидад &amp; Тобаго</territory>
+			<territory type="TZ">Танзания</territory>
+			<territory type="UG">Уганда</territory>
+			<territory type="UN">Каттышкан Нациялар</territory>
+			<territory type="US">Каттышкан Штаттар</territory>
+			<territory type="US" alt="short">АКШ</territory>
+			<territory type="UY">Уругвай</territory>
+			<territory type="VC">Сент-Винсент &amp; Гренадиннер</territory>
+			<territory type="VE">Венесуэла</territory>
+			<territory type="VG">Виргин Ортулуктар (Великобритания)</territory>
+			<territory type="VI">Виргин Ортулуктар (АКШ)</territory>
+			<territory type="XA">Псевдо-Акценттер</territory>
+			<territory type="XB">Псевдо-Bidi</territory>
+			<territory type="YT">Майотта</territory>
+			<territory type="ZA">Мурнуу Африкан Республика</territory>
+			<territory type="ZM">Замбия</territory>
+			<territory type="ZW">Зимбабве</territory>
+			<territory type="ZZ">Билдинмес Регион</territory>
+		</territories>
+		<types>
+			<type key="calendar" type="gregorian">Григориан Календарь</type>
+			<type key="calendar" type="gregorian" scope="core">Григориан</type>
+			<type key="calendar" type="iso8601">Календарь ISO-8601</type>
+			<type key="collation" type="standard">Стандарт сортал</type>
+			<type key="collation" type="standard" scope="core">Стандарт</type>
+			<type key="numbers" type="latn">араб чурагайлар</type>
+		</types>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Метрик</measurementSystemName>
+			<measurementSystemName type="UK">Англи</measurementSystemName>
+			<measurementSystemName type="US">Американ</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language">Дыл: {0}</codePattern>
+			<codePattern type="script">Бижимел: {0}</codePattern>
+			<codePattern type="territory">Регион: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[а б в г д её ж з и й к л м н ң о ө п р с т у ү ф х ц ч ш щ ъ ы ь э ю я]</exemplarCharacters>
 		<exemplarCharacters type="index">[А Б В Г Д ЕЁ Ж З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary" draft="contributed">[. / A B C D E F I L M V X]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” « » ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary" draft="contributed">[– · + &lt; = &gt; ~ №]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person" draft="contributed">[\- ‑ – . '’ ( )]</exemplarCharacters>
 	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>„</alternateQuotationStart>
+		<alternateQuotationEnd>“</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1">Янв.</month>
+							<month type="2">Февр.</month>
+							<month type="3">Мар.</month>
+							<month type="4">Апр.</month>
+							<month type="5">Май</month>
+							<month type="6">Июн.</month>
+							<month type="7">Июл.</month>
+							<month type="8">Авг.</month>
+							<month type="9">Сент.</month>
+							<month type="10">Окт.</month>
+							<month type="11">Нояб.</month>
+							<month type="12">Дек.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">Я</month>
+							<month type="2">Ф</month>
+							<month type="3">М</month>
+							<month type="4">А</month>
+							<month type="5">М</month>
+							<month type="6">И</month>
+							<month type="7">И</month>
+							<month type="8">А</month>
+							<month type="9">С</month>
+							<month type="10">О</month>
+							<month type="11">Н</month>
+							<month type="12">Д</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Январь</month>
+							<month type="2">Февраль</month>
+							<month type="3">Март</month>
+							<month type="4">Апрель</month>
+							<month type="5">Май</month>
+							<month type="6">Июнь</month>
+							<month type="7">Июль</month>
+							<month type="8">Август</month>
+							<month type="9">Сентябрь</month>
+							<month type="10">Октябрь</month>
+							<month type="11">Ноябрь</month>
+							<month type="12">Декабрь</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<month type="1">Янв.</month>
+							<month type="2">Февр.</month>
+							<month type="3">Мар.</month>
+							<month type="4">Апр.</month>
+							<month type="5">Май</month>
+							<month type="6">Июн.</month>
+							<month type="7">Июл.</month>
+							<month type="8">Авг.</month>
+							<month type="9">Сент.</month>
+							<month type="10">Окт.</month>
+							<month type="11">Нояб.</month>
+							<month type="12">Дек.</month>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">Я</month>
+							<month type="2">Ф</month>
+							<month type="3">М</month>
+							<month type="4">А</month>
+							<month type="5">М</month>
+							<month type="6">И</month>
+							<month type="7">И</month>
+							<month type="8">А</month>
+							<month type="9">С</month>
+							<month type="10">О</month>
+							<month type="11">Н</month>
+							<month type="12">Д</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">Январь</month>
+							<month type="2">Февраль</month>
+							<month type="3">Март</month>
+							<month type="4">Апрель</month>
+							<month type="5">Май</month>
+							<month type="6">Июнь</month>
+							<month type="7">Июль</month>
+							<month type="8">Август</month>
+							<month type="9">Сентябрь</month>
+							<month type="10">Октябрь</month>
+							<month type="11">Ноябрь</month>
+							<month type="12">Декабрь</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun">УХ</day>
+							<day type="mon">ПН</day>
+							<day type="tue">ВТ</day>
+							<day type="wed">СР</day>
+							<day type="thu">ЧТ</day>
+							<day type="fri">ПТ</day>
+							<day type="sat">СБ</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">У</day>
+							<day type="mon">П</day>
+							<day type="tue">В</day>
+							<day type="wed">С</day>
+							<day type="thu">Ч</day>
+							<day type="fri">П</day>
+							<day type="sat">С</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">УХ</day>
+							<day type="mon">ПН</day>
+							<day type="tue">ВТ</day>
+							<day type="wed">СР</day>
+							<day type="thu">ЧТ</day>
+							<day type="fri">ПТ</day>
+							<day type="sat">СБ</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">Улуг-хүн</day>
+							<day type="mon">Понедельник</day>
+							<day type="tue">Вторник</day>
+							<day type="wed">Среда</day>
+							<day type="thu">Четверг</day>
+							<day type="fri">Пятница</day>
+							<day type="sat">Суббота</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="abbreviated">
+							<day type="sun">УХ</day>
+							<day type="mon">ПН</day>
+							<day type="tue">ВТ</day>
+							<day type="wed">СР</day>
+							<day type="thu">ЧТ</day>
+							<day type="fri">ПТ</day>
+							<day type="sat">СБ</day>
+						</dayWidth>
+						<dayWidth type="narrow">
+							<day type="sun">У</day>
+							<day type="mon">П</day>
+							<day type="tue">В</day>
+							<day type="wed">С</day>
+							<day type="thu">Ч</day>
+							<day type="fri">П</day>
+							<day type="sat">С</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<day type="sun">УХ</day>
+							<day type="mon">ПН</day>
+							<day type="tue">ВТ</day>
+							<day type="wed">СР</day>
+							<day type="thu">ЧТ</day>
+							<day type="fri">ПТ</day>
+							<day type="sat">СБ</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">Улуг-хүн</day>
+							<day type="mon">Понедельник</day>
+							<day type="tue">Вторник</day>
+							<day type="wed">Среда</day>
+							<day type="thu">Четверг</day>
+							<day type="fri">Пятница</day>
+							<day type="sat">Суббота</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<quarters>
+					<quarterContext type="format">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1ги кв.</quarter>
+							<quarter type="2">2ги кв.</quarter>
+							<quarter type="3">3кү кв.</quarter>
+							<quarter type="4">4кү кв.</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1ги квартал</quarter>
+							<quarter type="2">2ги квартал</quarter>
+							<quarter type="3">3кү квартал</quarter>
+							<quarter type="4">4кү квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+					<quarterContext type="stand-alone">
+						<quarterWidth type="abbreviated">
+							<quarter type="1">1ги кв.</quarter>
+							<quarter type="2">2ги кв.</quarter>
+							<quarter type="3">3кү кв.</quarter>
+							<quarter type="4">4кү кв.</quarter>
+						</quarterWidth>
+						<quarterWidth type="wide">
+							<quarter type="1">1ги квартал</quarter>
+							<quarter type="2">2ги квартал</quarter>
+							<quarter type="3">3кү квартал</quarter>
+							<quarter type="4">4кү квартал</quarter>
+						</quarterWidth>
+					</quarterContext>
+				</quarters>
+				<eras>
+					<eraNames>
+						<era type="0">Христос бертинде</era>
+						<era type="0" alt="variant">Бистиң Эрага чедир</era>
+						<era type="1">Христос төрүмелинден</era>
+						<era type="1" alt="variant">Бистиң эрада</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">БЭЧ</era>
+						<era type="1">БЭ</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>y'ч' MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>y'ч' MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>y'ч' MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
+						<dateFormatItem id="EBhm">E, h:mm B</dateFormatItem>
+						<dateFormatItem id="EBhms">E, h:mm:ss B</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
+						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="H">HH'ш'</dateFormatItem>
+						<dateFormatItem id="hv">h a, v</dateFormatItem>
+						<dateFormatItem id="Hv">HH'ш' v</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">MMMM, W 'чедилик'</dateFormatItem>
+						<dateFormatItem id="yMMM">y'ч' MMM</dateFormatItem>
+						<dateFormatItem id="yMMMd">y'ч' MMM d</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y'ч' MMM d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y'ч' MMMM</dateFormatItem>
+						<dateFormatItem id="yQQQ">y'ч' QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">y'ч' QQQQ</dateFormatItem>
+						<dateFormatItem id="yw" count="other">Y'ч', w 'чедилик'</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="Gy">
+							<greatestDifference id="G">G y'ч' – G y'ч'</greatestDifference>
+							<greatestDifference id="y">G y–y'чч'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH'ш'</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH'ш' v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">y'ч' MMM–MMM</greatestDifference>
+							<greatestDifference id="y">y'ч' MMM – y'ч' MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">y'ч' MMM d–d</greatestDifference>
+							<greatestDifference id="M">y'ч' MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">y'ч' MMM d – y'ч' MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">y'ч' MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">y'ч' MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">y'ч' MMM d, E – y'ч' MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">y'ч' MMMM–MMMM</greatestDifference>
+							<greatestDifference id="y">y'ч' MMMM – y'ч' MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>эра</displayName>
+			</field>
+			<field type="year">
+				<displayName>чыл</displayName>
+				<relative type="-1">эрткен чыл</relative>
+				<relative type="0">амгы чыл</relative>
+				<relative type="1">келир чыл</relative>
+			</field>
+			<field type="year-short">
+				<displayName>ч.</displayName>
+			</field>
+			<field type="year-narrow">
+				<displayName>ч.</displayName>
+			</field>
+			<field type="quarter">
+				<displayName>квартал</displayName>
+			</field>
+			<field type="quarter-short">
+				<displayName>кв.</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName>кв.</displayName>
+			</field>
+			<field type="month">
+				<displayName>ай</displayName>
+			</field>
+			<field type="month-short">
+				<displayName>ай</displayName>
+			</field>
+			<field type="month-narrow">
+				<displayName>ай</displayName>
+			</field>
+			<field type="week">
+				<displayName>чедилик</displayName>
+			</field>
+			<field type="week-short">
+				<displayName>чед.</displayName>
+			</field>
+			<field type="week-narrow">
+				<displayName>чед.</displayName>
+			</field>
+			<field type="day">
+				<displayName>хүн</displayName>
+			</field>
+			<field type="day-short">
+				<displayName>х.</displayName>
+			</field>
+			<field type="day-narrow">
+				<displayName>х.</displayName>
+			</field>
+			<field type="weekday">
+				<displayName>чедилик хүнү</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName>AM/PM</displayName>
+			</field>
+			<field type="hour">
+				<displayName>шак</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName>ш.</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName>ш.</displayName>
+			</field>
+			<field type="minute">
+				<displayName>минута</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName>мин.</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName>мин</displayName>
+			</field>
+			<field type="second">
+				<displayName>секунда</displayName>
+			</field>
+			<field type="second-short">
+				<displayName>сек.</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName>с</displayName>
+			</field>
+			<field type="zone">
+				<displayName>шак куржаа</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<regionFormat type="daylight">{0}, чайгы үе</regionFormat>
+			<regionFormat type="standard">{0}, стандарт үе</regionFormat>
+			<metazone type="GMT">
+				<long>
+					<standard>Гринвичтиң ортаа үези</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<group> </group>
+		</symbols>
+	</numbers>
 </ldml>
diff --git a/make/data/cldr/common/main/tzm.xml b/make/data/cldr/common/main/tzm.xml
index c0c00692564..cc039d9d407 100644
--- a/make/data/cldr/common/main/tzm.xml
+++ b/make/data/cldr/common/main/tzm.xml
@@ -541,6 +541,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ug.xml b/make/data/cldr/common/main/ug.xml
index 685a49e71cf..1311752b41c 100644
--- a/make/data/cldr/common/main/ug.xml
+++ b/make/data/cldr/common/main/ug.xml
@@ -1056,11 +1056,9 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 			<type key="calendar" type="japanese" draft="contributed">ياپونىيە يىلنامەسى</type>
 			<type key="calendar" type="persian" draft="contributed">پارىس يىلنامەسى</type>
 			<type key="calendar" type="roc" draft="contributed">مىنگو يىلنامەسى</type>
-			<type key="collation" type="big5han" draft="contributed">مۇرەككەپ خەنچە تىزىش تەرتىپى - Big5</type>
 			<type key="collation" type="dictionary" draft="contributed">لۇغەت تىزىش تەرتىپى</type>
 			<type key="collation" type="ducet" draft="contributed">كۆڭۈلدىكى يۇنىكود تىزىش تەرتىپى</type>
 			<type key="collation" type="eor" draft="contributed">ياۋروپا تەرتىپلەش قائىدىسى</type>
-			<type key="collation" type="gb2312han" draft="contributed">ئاددىي خەنچە تىزىش تەرتىپى - GB2312</type>
 			<type key="collation" type="phonebook" draft="contributed">تېلېفون نومۇر تىزىش تەرتىپى</type>
 			<type key="collation" type="pinyin" draft="contributed">پىنيىن تىزىش تەرتىپى</type>
 			<type key="collation" type="reformed" draft="contributed">ياخشىلانغان تەرتىپلەش تەرتىپى</type>
@@ -1968,9 +1966,7 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="contributed">غەربىي ئافرىقا ۋاقتى</generic>
-					<standard draft="contributed">غەربىي ئافرىقا ئۆلچەملىك ۋاقتى</standard>
-					<daylight draft="contributed">غەربىي ئافرىقا يازلىق ۋاقتى</daylight>
+					<standard draft="contributed">غەربىي ئافرىقا ۋاقتى</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2346,6 +2342,11 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 					<standard draft="contributed">گىۋىيانا ۋاقتى</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="contributed">ھاۋاي-ئالېيۇت ئۆلچەملىك ۋاقتى</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="contributed">ھاۋاي-ئالېيۇت ۋاقتى</generic>
diff --git a/make/data/cldr/common/main/uk.xml b/make/data/cldr/common/main/uk.xml
index ed07b15f361..220d142488b 100644
--- a/make/data/cldr/common/main/uk.xml
+++ b/make/data/cldr/common/main/uk.xml
@@ -45,7 +45,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ars">надждійська арабська</language>
 			<language type="ars" alt="menu">арабська, надждійська</language>
 			<language type="arw">аравакська</language>
-			<language type="as">асамська</language>
+			<language type="as">ассамська</language>
 			<language type="asa">асу</language>
 			<language type="ase">американська мова рухів</language>
 			<language type="ast">астурійська</language>
@@ -297,6 +297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафіа</language>
 			<language type="ksh">кельнська</language>
 			<language type="ku">курдська</language>
+			<language type="ku" menu="core">курдська</language>
+			<language type="ku" menu="extension">курманджі</language>
 			<language type="kum">кумицька</language>
 			<language type="kut">кутенаї</language>
 			<language type="kv">комі</language>
@@ -843,6 +845,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Китай</territory>
 			<territory type="CO">Колумбія</territory>
 			<territory type="CP">Острів Кліппертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо-Верде</territory>
@@ -1120,35 +1123,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">цифрове сортування</key>
 			<key type="colStrength">інтенсивність сортування</key>
 			<key type="currency">валюта</key>
+			<key type="em">емодзі</key>
 			<key type="hc">формат часу (12 або 24 години)</key>
 			<key type="lb">стиль розриву рядка</key>
+			<key type="lw">розриви рядків у словах</key>
 			<key type="ms">система вимірювання</key>
 			<key type="numbers">цифри</key>
+			<key type="ss">розрив речення після скорочення</key>
 			<key type="timezone">часовий пояс</key>
 			<key type="va">варіант мовного коду</key>
 			<key type="x">особисте використання</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">буддійський календар</type>
+			<type key="calendar" type="buddhist" scope="core">буддійський</type>
 			<type key="calendar" type="chinese">китайський календар</type>
+			<type key="calendar" type="chinese" scope="core">китайський</type>
 			<type key="calendar" type="coptic">коптський календар</type>
+			<type key="calendar" type="coptic" scope="core">коптський</type>
 			<type key="calendar" type="dangi">корейський календар</type>
+			<type key="calendar" type="dangi" scope="core">корейський</type>
 			<type key="calendar" type="ethiopic">ефіопський календар</type>
+			<type key="calendar" type="ethiopic" scope="core">ефіопський</type>
 			<type key="calendar" type="ethiopic-amete-alem">ефіопський амете алем календар</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ефіопський амете алем</type>
 			<type key="calendar" type="gregorian">григоріанський календар</type>
+			<type key="calendar" type="gregorian" scope="core">григоріанський</type>
 			<type key="calendar" type="hebrew">єврейський календар</type>
+			<type key="calendar" type="hebrew" scope="core">єврейський</type>
 			<type key="calendar" type="indian">індійський світський календар</type>
 			<type key="calendar" type="islamic">календар Хіджра</type>
+			<type key="calendar" type="islamic" scope="core">Хіджра</type>
 			<type key="calendar" type="islamic-civil">календар Хіджра, світський</type>
+			<type key="calendar" type="islamic-civil" scope="core">Хіджра, світський</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">ісламський календар Саудівської Аравії</type>
 			<type key="calendar" type="islamic-tbla" draft="contributed">ісламський астрономічний календар</type>
 			<type key="calendar" type="islamic-umalqura">календар Хіджра (Умм аль-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Хіджра (Умм аль-Кура)</type>
 			<type key="calendar" type="iso8601">календар ISO-8601</type>
 			<type key="calendar" type="japanese">японський календар</type>
+			<type key="calendar" type="japanese" scope="core">японський</type>
 			<type key="calendar" type="persian">перський календар</type>
+			<type key="calendar" type="persian" scope="core">перський</type>
 			<type key="calendar" type="roc">календар Китайської Республіки</type>
+			<type key="calendar" type="roc" scope="core">Китайської Республіки</type>
 			<type key="cf" type="account">обліковий грошовий формат</type>
+			<type key="cf" type="account" scope="core">обліковий</type>
 			<type key="cf" type="standard">стандартний грошовий формат</type>
+			<type key="cf" type="standard" scope="core">стандартний</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">сортувати за символами</type>
 			<type key="colAlternate" type="shifted" draft="contributed">сортувати, ігноруючи символи</type>
 			<type key="colBackwards" type="no">сортувати за діакритичними знаками уніфіковано</type>
@@ -1158,23 +1180,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">сортувати спершу за великими символами</type>
 			<type key="colCaseLevel" type="no" draft="contributed">сортувати без урахування регістру</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">сортувати з урахуванням регістру</type>
-			<type key="collation" type="big5han">китайський традиційний порядок сортування Big5</type>
 			<type key="collation" type="compat">попередній порядок сортування, для сумісності</type>
+			<type key="collation" type="compat" scope="core">сумісність</type>
 			<type key="collation" type="dictionary">порядок сортування за словником</type>
+			<type key="collation" type="dictionary" scope="core">за словником</type>
 			<type key="collation" type="ducet">типовий порядок сортування Юнікод</type>
+			<type key="collation" type="ducet" scope="core">типовий Юнікод</type>
 			<type key="collation" type="emoji" draft="contributed">порядок сортування за емодзі</type>
 			<type key="collation" type="eor" draft="contributed">європейські правила упорядкування</type>
-			<type key="collation" type="gb2312han">китайський спрощений порядок сортування - GB2312</type>
 			<type key="collation" type="phonebook">порядок сортування за телефонним довідником</type>
+			<type key="collation" type="phonebook" scope="core">за телефонним довідником</type>
 			<type key="collation" type="phonetic">фонетичний порядок сортування</type>
+			<type key="collation" type="phonetic" scope="core">фонетичний</type>
 			<type key="collation" type="pinyin">порядок сортування піньїнь</type>
+			<type key="collation" type="pinyin" scope="core">піньїнь</type>
 			<type key="collation" type="search">універсальний пошук</type>
+			<type key="collation" type="search" scope="core">пошук</type>
 			<type key="collation" type="searchjl" draft="contributed">пошук за початковою приголосною хангул</type>
 			<type key="collation" type="standard">стандартний порядок сортування</type>
+			<type key="collation" type="standard" scope="core">стандартний</type>
 			<type key="collation" type="stroke">порядок сортування за рисками</type>
+			<type key="collation" type="stroke" scope="core">за рисками</type>
 			<type key="collation" type="traditional">традиційний порядок сортування</type>
+			<type key="collation" type="traditional" scope="core">традиційний</type>
 			<type key="collation" type="unihan">порядок сортування за ключами ієрогліфів</type>
+			<type key="collation" type="unihan" scope="core">за ключами ієрогліфів</type>
 			<type key="collation" type="zhuyin">порядок сортування чжуїнь</type>
+			<type key="collation" type="zhuyin" scope="core">чжуїнь</type>
 			<type key="colNormalization" type="no" draft="contributed">сортувати без уніфікації</type>
 			<type key="colNormalization" type="yes" draft="contributed">сортувати за Unicode уніфіковано</type>
 			<type key="colNumeric" type="no">сортувати цифри окремо</type>
@@ -1187,18 +1219,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">повна ширина</type>
 			<type key="d0" type="hwidth">половинна ширина</type>
 			<type key="d0" type="npinyin" draft="contributed">цифри</type>
+			<type key="em" type="default" scope="core">типово</type>
+			<type key="em" type="emoji" scope="core">емодзі</type>
+			<type key="em" type="text" scope="core">текст</type>
 			<type key="hc" type="h11">12-годинний формат (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12-годинний формат (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24-годинний формат (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24-годинний формат (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">неточний стиль розриву рядка</type>
+			<type key="lb" type="loose" scope="core">неточний</type>
 			<type key="lb" type="normal">звичайний стиль розриву рядка</type>
+			<type key="lb" type="normal" scope="core">звичайний</type>
 			<type key="lb" type="strict">точний стиль розриву рядка</type>
+			<type key="lb" type="strict" scope="core">точний</type>
+			<type key="lw" type="breakall" scope="core">розривати всі</type>
+			<type key="lw" type="keepall" scope="core">залишати всі</type>
+			<type key="lw" type="normal" scope="core">звичайний</type>
+			<type key="lw" type="phrase" scope="core">залишати фразами</type>
 			<type key="m0" type="bgn">транслітерація РГН США</type>
 			<type key="m0" type="ungegn">транслітерація ГЕГН ООН</type>
 			<type key="ms" type="metric">метрична система</type>
+			<type key="ms" type="metric" scope="core">метрична</type>
 			<type key="ms" type="uksystem">англійська система мір</type>
+			<type key="ms" type="uksystem" scope="core">англійська</type>
 			<type key="ms" type="ussystem">американська система мір</type>
+			<type key="ms" type="ussystem" scope="core">американська</type>
 			<type key="numbers" type="arab">арабсько-індійські цифри</type>
 			<type key="numbers" type="arabext">арабсько-індійські розширені цифри</type>
 			<type key="numbers" type="armn">вірменські цифри</type>
@@ -1243,6 +1292,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">тибетські цифри</type>
 			<type key="numbers" type="traditional" draft="contributed">традиційні символи чисел</type>
 			<type key="numbers" type="vaii">цифри ваї</type>
+			<type key="ss" type="none" scope="core">вимкнено</type>
+			<type key="ss" type="standard" scope="core">увімкнено</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Метрична</measurementSystemName>
@@ -1297,9 +1348,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1503,13 +1551,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y, G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y 'р'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'р'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'р'. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'год' v</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1570,7 +1620,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
@@ -1584,7 +1633,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1781,22 +1829,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening1">вечора</dayPeriod>
 							<dayPeriod type="night1">ночі</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="midnight">ночі</dayPeriod>
-							<dayPeriod type="noon">дня</dayPeriod>
-							<dayPeriod type="morning1">ранку</dayPeriod>
-							<dayPeriod type="afternoon1">дня</dayPeriod>
-							<dayPeriod type="evening1">вечора</dayPeriod>
-							<dayPeriod type="night1">ночі</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="midnight">ночі</dayPeriod>
-							<dayPeriod type="noon">дня</dayPeriod>
-							<dayPeriod type="morning1">ранку</dayPeriod>
-							<dayPeriod type="afternoon1">дня</dayPeriod>
-							<dayPeriod type="evening1">вечора</dayPeriod>
-							<dayPeriod type="night1">ночі</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
@@ -1878,6 +1910,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'о' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'о' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1886,6 +1921,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'о' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'о' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1902,15 +1940,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd-MM-y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">dd-MM-y, E, G</dateFormatItem>
 						<dateFormatItem id="GyMMM">LLL y 'р'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y 'р'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'р'. G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'год' v</dateFormatItem>
 						<dateFormatItem id="M">LL</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, dd.MM</dateFormatItem>
@@ -1978,7 +2019,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH 'год'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1992,7 +2035,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH 'год' v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -3547,6 +3592,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Острів Пасхи</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Кояїке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Аренас</exemplarCity>
 			</zone>
@@ -3812,9 +3860,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пномпень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербері</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4491,9 +4536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>за західноафриканським часом</generic>
-					<standard>за західноафриканським стандартним часом</standard>
-					<daylight>за західноафриканським літнім часом</daylight>
+					<standard>за західноафриканським часом</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4855,6 +4898,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>за часом у Ґаяні</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>за стандартним гавайсько-алеутським часом</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>за гавайсько-алеутським часом</generic>
@@ -5100,9 +5148,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Norfolk">
 				<long>
-					<generic draft="contributed">за часом на острові Норфолк</generic>
-					<standard draft="contributed">за стандартним часом на острові Норфолк</standard>
-					<daylight draft="contributed">за літнім часом на острові Норфолк</daylight>
+					<generic>за часом на острові Норфолк</generic>
+					<standard>за стандартним часом на острові Норфолк</standard>
+					<daylight>за літнім часом на острові Норфолк</daylight>
 				</long>
 			</metazone>
 			<metazone type="Noronha">
@@ -5293,6 +5341,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>за часом на островах Чуук</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">за турецьким часом</generic>
+					<standard draft="contributed">за турецьким стандартним часом</standard>
+					<daylight draft="contributed">за турецьким літнім часом</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>за часом у Туркменістані</generic>
@@ -5376,7 +5431,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Yukon">
 				<long>
-					<standard draft="contributed">за стандартним часом на Юконі</standard>
+					<standard>за стандартним часом на Юконі</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
@@ -5473,7 +5528,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -7005,6 +7063,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">східнокарибського долара</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>карибський гульден</displayName>
+				<displayName count="one">карибський гульден</displayName>
+				<displayName count="few">карибські гульдени</displayName>
+				<displayName count="many">карибських гульденів</displayName>
+				<displayName count="other">карибського гульдена</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>спеціальні права запозичення</displayName>
 				<displayName count="one" draft="provisional">СПЗ</displayName>
@@ -7110,6 +7175,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many" draft="contributed">зімбабвійських доларів</displayName>
 				<displayName count="other" draft="contributed">зімбабвійські долари</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>зімбабвійський золотий</displayName>
+				<displayName count="one">зімбабвійський золотий</displayName>
+				<displayName count="few">зімбабвійські золоті</displayName>
+				<displayName count="many">зімбабвійських золотих</displayName>
+				<displayName count="other">зімбабвійського золотого</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>зімбабвійський долар (2009)</displayName>
 				<displayName count="one">зімбабвійський долар (2009)</displayName>
@@ -7822,35 +7894,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} елемента</unitPattern>
 				<unitPattern count="other" case="locative">{0} елемента</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>частки</displayName>
+				<unitPattern count="one">{0} частка</unitPattern>
+				<unitPattern count="few">{0} частки</unitPattern>
+				<unitPattern count="many">{0} часток</unitPattern>
+				<unitPattern count="other">{0} частки</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<gender>feminine</gender>
-				<unitPattern count="one">{0} мільйонна доля</unitPattern>
-				<unitPattern count="one" case="accusative">{0} мільйонну долю</unitPattern>
-				<unitPattern count="one" case="dative">{0} мільйонній долі</unitPattern>
-				<unitPattern count="one" case="genitive">{0} мільйонної долі</unitPattern>
-				<unitPattern count="one" case="instrumental">{0} мільйонною долею</unitPattern>
-				<unitPattern count="one" case="locative">{0} мільйонній долі</unitPattern>
-				<unitPattern count="few">{0} мільйонні долі</unitPattern>
-				<unitPattern count="few" case="accusative">{0} мільйонні долі</unitPattern>
-				<unitPattern count="few" case="dative">{0} мільйонним долям</unitPattern>
-				<unitPattern count="few" case="genitive">{0} мільйонних доль</unitPattern>
-				<unitPattern count="few" case="instrumental">{0} мільйонними долями</unitPattern>
-				<unitPattern count="few" case="locative">{0} мільйонних долях</unitPattern>
-				<unitPattern count="many">{0} мільйонних доль</unitPattern>
-				<unitPattern count="many" case="accusative">{0} мільйонних доль</unitPattern>
-				<unitPattern count="many" case="dative">{0} мільйонним долям</unitPattern>
-				<unitPattern count="many" case="genitive">{0} мільйонних доль</unitPattern>
-				<unitPattern count="many" case="instrumental">{0} мільйонними долями</unitPattern>
-				<unitPattern count="many" case="locative">{0} мільйонних долях</unitPattern>
-				<unitPattern count="other">{0} мільйонної долі</unitPattern>
-				<unitPattern count="other" case="accusative">{0} мільйонної долі</unitPattern>
-				<unitPattern count="other" case="dative">{0} мільйонної долі</unitPattern>
-				<unitPattern count="other" case="genitive">{0} мільйонної долі</unitPattern>
-				<unitPattern count="other" case="instrumental">{0} мільйонної долі</unitPattern>
-				<unitPattern count="other" case="locative">{0} мільйонної долі</unitPattern>
+				<displayName>мільйонні частки</displayName>
+				<unitPattern count="one">{0} мільйонна частка</unitPattern>
+				<unitPattern count="one" case="accusative">{0} мільйонну частку</unitPattern>
+				<unitPattern count="one" case="dative">{0} мільйонній частці</unitPattern>
+				<unitPattern count="one" case="genitive">{0} мільйонної частки</unitPattern>
+				<unitPattern count="one" case="instrumental">{0} мільйонною часткою</unitPattern>
+				<unitPattern count="one" case="locative">{0} мільйонній частці</unitPattern>
+				<unitPattern count="few">{0} мільйонні частки</unitPattern>
+				<unitPattern count="few" case="accusative">{0} мільйонні частки</unitPattern>
+				<unitPattern count="few" case="dative">{0} мільйонним часткам</unitPattern>
+				<unitPattern count="few" case="genitive">{0} мільйонних часток</unitPattern>
+				<unitPattern count="few" case="instrumental">{0} мільйонними частками</unitPattern>
+				<unitPattern count="few" case="locative">{0} мільйонних частках</unitPattern>
+				<unitPattern count="many">{0} мільйонних часток</unitPattern>
+				<unitPattern count="many" case="accusative">{0} мільйонних часток</unitPattern>
+				<unitPattern count="many" case="dative">{0} мільйонним часткам</unitPattern>
+				<unitPattern count="many" case="genitive">{0} мільйонних часток</unitPattern>
+				<unitPattern count="many" case="instrumental">{0} мільйонними частками</unitPattern>
+				<unitPattern count="many" case="locative">{0} мільйонних частках</unitPattern>
+				<unitPattern count="other">{0} мільйонної частки</unitPattern>
+				<unitPattern count="other" case="accusative">{0} мільйонної частки</unitPattern>
+				<unitPattern count="other" case="dative">{0} мільйонної частки</unitPattern>
+				<unitPattern count="other" case="genitive">{0} мільйонної частки</unitPattern>
+				<unitPattern count="other" case="instrumental">{0} мільйонної частки</unitPattern>
+				<unitPattern count="other" case="locative">{0} мільйонної частки</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<gender>masculine</gender>
+				<displayName>відсотки</displayName>
 				<unitPattern count="one">{0} відсоток</unitPattern>
 				<unitPattern count="one" case="accusative">{0} відсоток</unitPattern>
 				<unitPattern count="one" case="dative">{0} відсотку</unitPattern>
@@ -7878,6 +7959,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-permille">
 				<gender>masculine</gender>
+				<displayName>проміле</displayName>
 				<unitPattern count="one">{0} проміле</unitPattern>
 				<unitPattern count="one" case="accusative">{0} проміле</unitPattern>
 				<unitPattern count="one" case="dative">{0} проміле</unitPattern>
@@ -7959,6 +8041,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} моля</unitPattern>
 				<unitPattern count="other" case="locative">{0} моля</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>одиниці глюкози</displayName>
+				<unitPattern count="one">{0} одиниця глюкози</unitPattern>
+				<unitPattern count="few">{0} одиниці глюкози</unitPattern>
+				<unitPattern count="many">{0} одиниць глюкози</unitPattern>
+				<unitPattern count="other">{0} одиниці глюкози</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>літри на кілометр</displayName>
@@ -8511,6 +8600,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-day">
 				<gender>masculine</gender>
+				<displayName>дні</displayName>
 				<unitPattern count="one">{0} день</unitPattern>
 				<unitPattern count="one" case="accusative">{0} день</unitPattern>
 				<unitPattern count="one" case="dative">{0} дню</unitPattern>
@@ -9936,6 +10026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="mass-carat">
 				<gender>masculine</gender>
+				<displayName>карати</displayName>
 				<unitPattern count="one">{0} карат</unitPattern>
 				<unitPattern count="one" case="accusative">{0} карат</unitPattern>
 				<unitPattern count="one" case="dative">{0} карату</unitPattern>
@@ -10157,6 +10248,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} міліметра ртутного стовпа</unitPattern>
 				<unitPattern count="other" case="locative">{0} міліметра ртутного стовпа</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ртутного стовпа</displayName>
+				<unitPattern count="one">{0} ртутного стовпа</unitPattern>
+				<unitPattern count="few">{0} ртутного стовпа</unitPattern>
+				<unitPattern count="many">{0} ртутного стовпа</unitPattern>
+				<unitPattern count="other">{0} ртутного стовпа</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунти на квадратний дюйм</displayName>
 				<unitPattern count="one">{0} фунт на квадратний дюйм</unitPattern>
@@ -10884,6 +10982,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="instrumental">{0} метричної чашки</unitPattern>
 				<unitPattern count="other" case="locative">{0} метричної чашки</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метричні рідинні унції</displayName>
+				<unitPattern count="one">{0} метрична рідинна унція</unitPattern>
+				<unitPattern count="few">{0} метричні рідинні унції</unitPattern>
+				<unitPattern count="many">{0} метричних рідинних унцій</unitPattern>
+				<unitPattern count="other">{0} метричної рідинної унції</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} акр-фут</unitPattern>
 				<unitPattern count="few">{0} акр-фути</unitPattern>
@@ -10987,6 +11092,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мірних склянок</unitPattern>
 				<unitPattern count="other">{0} мірна склянка</unitPattern>
 			</unit>
+			<unit type="volume-pinch">
+				<displayName>дрібки</displayName>
+				<unitPattern count="one">{0} дрібка</unitPattern>
+				<unitPattern count="few">{0} дрібки</unitPattern>
+				<unitPattern count="many">{0} дрібок</unitPattern>
+				<unitPattern count="other">{0} дрібки</unitPattern>
+			</unit>
 			<unit type="volume-quart-imperial">
 				<displayName>англійські кварти</displayName>
 				<unitPattern count="one">{0} англійська кварта</unitPattern>
@@ -10994,33 +11106,131 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} англійських кварт</unitPattern>
 				<unitPattern count="other">{0} англійської кварти</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>стерадіани</displayName>
+				<unitPattern count="one">{0} стерадіан</unitPattern>
+				<unitPattern count="few">{0} стерадіани</unitPattern>
+				<unitPattern count="many">{0} стерадіанів</unitPattern>
+				<unitPattern count="other">{0} стерадіана</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>катали</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="few">{0} катали</unitPattern>
+				<unitPattern count="many">{0} каталів</unitPattern>
+				<unitPattern count="other">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулони</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="few">{0} кулони</unitPattern>
+				<unitPattern count="many">{0} кулонів</unitPattern>
+				<unitPattern count="other">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фаради</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="few">{0} фаради</unitPattern>
+				<unitPattern count="many">{0} фарадів</unitPattern>
+				<unitPattern count="other">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генрі</displayName>
+				<unitPattern count="one">{0} генрі</unitPattern>
+				<unitPattern count="few">{0} генрі</unitPattern>
+				<unitPattern count="many">{0} генрі</unitPattern>
+				<unitPattern count="other">{0} генрі</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сіменси</displayName>
+				<unitPattern count="one">{0} сіменс</unitPattern>
+				<unitPattern count="few">{0} сіменси</unitPattern>
+				<unitPattern count="many">{0} сіменсів</unitPattern>
+				<unitPattern count="other">{0} сіменса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>міжнародні калорії</displayName>
+				<unitPattern count="one">{0} міжнародна калорія</unitPattern>
+				<unitPattern count="few">{0} міжнародні калорії</unitPattern>
+				<unitPattern count="many">{0} міжнародних калорій</unitPattern>
+				<unitPattern count="other">{0} міжнародної калорії</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерелі</displayName>
+				<unitPattern count="one">{0} бекерель</unitPattern>
+				<unitPattern count="few">{0} бекерелі</unitPattern>
+				<unitPattern count="many">{0} бекерелів</unitPattern>
+				<unitPattern count="other">{0} бекереля</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зіверти</displayName>
+				<unitPattern count="one">{0} зіверт</unitPattern>
+				<unitPattern count="few">{0} зіверти</unitPattern>
+				<unitPattern count="many">{0} зівертів</unitPattern>
+				<unitPattern count="other">{0} зіверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>греї</displayName>
+				<unitPattern count="one">{0} грей</unitPattern>
+				<unitPattern count="few">{0} греї</unitPattern>
+				<unitPattern count="many">{0} греїв</unitPattern>
+				<unitPattern count="other">{0} грея</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кілограм-сили</displayName>
+				<unitPattern count="one">{0} кілограм-сила</unitPattern>
+				<unitPattern count="few">{0} кілограм-сили</unitPattern>
+				<unitPattern count="many">{0} кілограм-сил</unitPattern>
+				<unitPattern count="other">{0} кілограм-сили</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тесли</displayName>
+				<unitPattern count="one">{0} тесла</unitPattern>
+				<unitPattern count="few">{0} тесли</unitPattern>
+				<unitPattern count="many">{0} тесл</unitPattern>
+				<unitPattern count="other">{0} тесли</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>вебери</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="few">{0} вебери</unitPattern>
+				<unitPattern count="many">{0} веберів</unitPattern>
+				<unitPattern count="other">{0} вебера</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>швидкості світла</displayName>
+				<unitPattern count="one">{0} швидкість світла</unitPattern>
+				<unitPattern count="few">{0} швидкості світла</unitPattern>
+				<unitPattern count="many">{0} швидкостей світла</unitPattern>
+				<unitPattern count="other">{0} швидкості світла</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<gender>feminine</gender>
-				<displayName>частини на мільярд</displayName>
-				<unitPattern count="one">{0} частина на мільярд</unitPattern>
-				<unitPattern count="one" case="accusative">{0} частину на мільярд</unitPattern>
-				<unitPattern count="one" case="dative">{0} частині на мільярд</unitPattern>
-				<unitPattern count="one" case="genitive">{0} частини на мільярд</unitPattern>
-				<unitPattern count="one" case="instrumental">{0} частиною на мільярд</unitPattern>
-				<unitPattern count="one" case="locative">{0} частині на мільярд</unitPattern>
-				<unitPattern count="few">{0} частини на мільярд</unitPattern>
-				<unitPattern count="few" case="accusative">{0} частини на мільярд</unitPattern>
-				<unitPattern count="few" case="dative">{0} частинам на мільярд</unitPattern>
-				<unitPattern count="few" case="genitive">{0} частин на мільярд</unitPattern>
-				<unitPattern count="few" case="instrumental">{0} частинами на мільярд</unitPattern>
-				<unitPattern count="few" case="locative">{0} частинах на мільярд</unitPattern>
-				<unitPattern count="many">{0} частин на мільярд</unitPattern>
-				<unitPattern count="many" case="accusative">{0} частин на мільярд</unitPattern>
-				<unitPattern count="many" case="dative">{0} частинам на мільярд</unitPattern>
-				<unitPattern count="many" case="genitive">{0} частин на мільярд</unitPattern>
-				<unitPattern count="many" case="instrumental">{0} частинами на мільярд</unitPattern>
-				<unitPattern count="many" case="locative">{0} частинах на мільярд</unitPattern>
-				<unitPattern count="other">{0} частини на мільярд</unitPattern>
-				<unitPattern count="other" case="accusative">{0} частини на мільярд</unitPattern>
-				<unitPattern count="other" case="dative">{0} частини на мільярд</unitPattern>
-				<unitPattern count="other" case="genitive">{0} частини на мільярд</unitPattern>
-				<unitPattern count="other" case="instrumental">{0} частини на мільярд</unitPattern>
-				<unitPattern count="other" case="locative">{0} частини на мільярд</unitPattern>
+				<displayName>мільярдні частки</displayName>
+				<unitPattern count="one">{0} мільярдна частка</unitPattern>
+				<unitPattern count="one" case="accusative">{0} мільярдну частку</unitPattern>
+				<unitPattern count="one" case="dative">{0} мільярдній частці</unitPattern>
+				<unitPattern count="one" case="genitive">{0} мільярдної частки</unitPattern>
+				<unitPattern count="one" case="instrumental">{0} мільярдною часткою</unitPattern>
+				<unitPattern count="one" case="locative">{0} мільярдній частці</unitPattern>
+				<unitPattern count="few">{0} мільярдні частки</unitPattern>
+				<unitPattern count="few" case="accusative">{0} мільярдні частки</unitPattern>
+				<unitPattern count="few" case="dative">{0} мільярдним часткам</unitPattern>
+				<unitPattern count="few" case="genitive">{0} мільярдних часток</unitPattern>
+				<unitPattern count="few" case="instrumental">{0} мільярдними частками</unitPattern>
+				<unitPattern count="few" case="locative">{0} мільярдних частках</unitPattern>
+				<unitPattern count="many">{0} мільярдних часток</unitPattern>
+				<unitPattern count="many" case="accusative">{0} мільярдних часток</unitPattern>
+				<unitPattern count="many" case="dative">{0} мільярдним часткам</unitPattern>
+				<unitPattern count="many" case="genitive">{0} мільярдних часток</unitPattern>
+				<unitPattern count="many" case="instrumental">{0} мільярдними частками</unitPattern>
+				<unitPattern count="many" case="locative">{0} мільярдних частках</unitPattern>
+				<unitPattern count="other">{0} мільярдної частки</unitPattern>
+				<unitPattern count="other" case="accusative">{0} мільярдної частки</unitPattern>
+				<unitPattern count="other" case="dative">{0} мільярдної частки</unitPattern>
+				<unitPattern count="other" case="genitive">{0} мільярдної частки</unitPattern>
+				<unitPattern count="other" case="instrumental">{0} мільярдної частки</unitPattern>
+				<unitPattern count="other" case="locative">{0} мільярдної частки</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
@@ -11304,12 +11514,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} ел.</unitPattern>
 				<unitPattern count="other">{0} ел.</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>м. д.</displayName>
-				<unitPattern count="one">{0} м. д.</unitPattern>
-				<unitPattern count="few">{0} м. д.</unitPattern>
-				<unitPattern count="many">{0} м. д.</unitPattern>
-				<unitPattern count="other">{0} м. д.</unitPattern>
+			<unit type="concentr-part">
+				<displayName>част.</displayName>
+				<unitPattern count="one">{0} част.</unitPattern>
+				<unitPattern count="few">{0} част.</unitPattern>
+				<unitPattern count="many">{0} част.</unitPattern>
+				<unitPattern count="other">{0} част.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>ч/млн</displayName>
+				<unitPattern count="one">{0} ч/млн</unitPattern>
+				<unitPattern count="few">{0} ч/млн</unitPattern>
+				<unitPattern count="many">{0} ч/млн</unitPattern>
+				<unitPattern count="other">{0} ч/млн</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
@@ -11336,6 +11553,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} моль</unitPattern>
 				<unitPattern count="other">{0} моль</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>од. глюкози</displayName>
+				<unitPattern count="one">{0} од. глюкози</unitPattern>
+				<unitPattern count="few">{0} од. глюкози</unitPattern>
+				<unitPattern count="many">{0} од. глюкози</unitPattern>
+				<unitPattern count="other">{0} од. глюкози</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>літри/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -12048,6 +12272,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мм рт. ст.</unitPattern>
 				<unitPattern count="other">{0} мм рт. ст.</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. ст</displayName>
+				<unitPattern count="one">{0} рт. ст.</unitPattern>
+				<unitPattern count="few">{0} рт. ст.</unitPattern>
+				<unitPattern count="many">{0} рт. ст.</unitPattern>
+				<unitPattern count="other">{0} рт. ст.</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунт/дюйм²</displayName>
 				<unitPattern count="one">{0} фунт/дюйм²</unitPattern>
@@ -12287,6 +12518,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} метр. чашок</unitPattern>
 				<unitPattern count="other">{0} метр. чашки</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ун. рід. метр.</displayName>
+				<unitPattern count="one">{0} ун. рід. метр.</unitPattern>
+				<unitPattern count="few">{0} ун. рід. метр.</unitPattern>
+				<unitPattern count="many">{0} ун. рід. метр.</unitPattern>
+				<unitPattern count="other">{0} ун. рід. метр.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акр-фути</displayName>
 				<unitPattern count="one">{0} акр-фт</unitPattern>
@@ -12422,12 +12660,110 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} англ. кварт</unitPattern>
 				<unitPattern count="other">{0} англ. кварти</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>частини/млрд</displayName>
-				<unitPattern count="one">{0} част/млрд</unitPattern>
-				<unitPattern count="few">{0} част/млрд</unitPattern>
-				<unitPattern count="many">{0} част/млрд</unitPattern>
-				<unitPattern count="other">{0} част/млрд</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="few">{0} ср</unitPattern>
+				<unitPattern count="many">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="few">{0} кат</unitPattern>
+				<unitPattern count="many">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="few">{0} Кл</unitPattern>
+				<unitPattern count="many">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="few">{0} Ф</unitPattern>
+				<unitPattern count="many">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="few">{0} Гн</unitPattern>
+				<unitPattern count="many">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="few">{0} См</unitPattern>
+				<unitPattern count="many">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калмн</displayName>
+				<unitPattern count="one">{0} калмн</unitPattern>
+				<unitPattern count="few">{0} калмн</unitPattern>
+				<unitPattern count="many">{0} калмн</unitPattern>
+				<unitPattern count="other">{0} калмн</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="few">{0} Бк</unitPattern>
+				<unitPattern count="many">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="few">{0} Зв</unitPattern>
+				<unitPattern count="many">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="few">{0} Гр</unitPattern>
+				<unitPattern count="many">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="few">{0} Тл</unitPattern>
+				<unitPattern count="many">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="few">{0} Вб</unitPattern>
+				<unitPattern count="many">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>шв. св.</displayName>
+				<unitPattern count="one">{0} шв. св.</unitPattern>
+				<unitPattern count="few">{0} шв. св.</unitPattern>
+				<unitPattern count="many">{0} шв. св.</unitPattern>
+				<unitPattern count="other">{0} шв. св.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ч/млрд</displayName>
+				<unitPattern count="one">{0} ч/млрд</unitPattern>
+				<unitPattern count="few">{0} ч/млрд</unitPattern>
+				<unitPattern count="many">{0} ч/млрд</unitPattern>
+				<unitPattern count="other">{0} ч/млрд</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>нч.</displayName>
@@ -12582,21 +12918,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}ел.</unitPattern>
 				<unitPattern count="other">{0}ел.</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<displayName>м.д.</displayName>
-				<unitPattern count="one">{0}м.д.</unitPattern>
-				<unitPattern count="few">{0}м.д.</unitPattern>
-				<unitPattern count="many">{0}м.д.</unitPattern>
-				<unitPattern count="other">{0}м.д.</unitPattern>
+			<unit type="concentr-part">
+				<displayName>ч.</displayName>
+				<unitPattern count="one">{0}ч.</unitPattern>
+				<unitPattern count="few">{0}ч.</unitPattern>
+				<unitPattern count="many">{0}ч.</unitPattern>
+				<unitPattern count="other">{0}ч.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>ч/млн</displayName>
+				<unitPattern count="one">{0}ч/млн</unitPattern>
+				<unitPattern count="few">{0}ч/млн</unitPattern>
+				<unitPattern count="many">{0}ч/млн</unitPattern>
+				<unitPattern count="other">{0}ч/млн</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
-				<displayName>%</displayName>
+				<unitPattern count="one">{0}%</unitPattern>
+				<unitPattern count="few">{0}%</unitPattern>
+				<unitPattern count="many">{0}%</unitPattern>
+				<unitPattern count="other">{0}%</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
-				<displayName>‰</displayName>
+				<unitPattern count="one">{0}‰</unitPattern>
+				<unitPattern count="few">{0}‰</unitPattern>
+				<unitPattern count="many">{0}‰</unitPattern>
+				<unitPattern count="other">{0}‰</unitPattern>
 			</unit>
 			<unit type="concentr-permyriad">
-				<displayName>‱</displayName>
+				<unitPattern count="one">{0}‱</unitPattern>
+				<unitPattern count="few">{0}‱</unitPattern>
+				<unitPattern count="many">{0}‱</unitPattern>
+				<unitPattern count="other">{0}‱</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="one">{0}моль</unitPattern>
@@ -12604,6 +12956,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}моль</unitPattern>
 				<unitPattern count="other">{0}моль</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>од.гл.</displayName>
+				<unitPattern count="one">{0}од.гл.</unitPattern>
+				<unitPattern count="few">{0}од.гл.</unitPattern>
+				<unitPattern count="many">{0}од.гл.</unitPattern>
+				<unitPattern count="other">{0}од.гл.</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
 				<unitPattern count="one">{0}л/км</unitPattern>
@@ -13289,6 +13648,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}ммрс</unitPattern>
 				<unitPattern count="other">{0}ммрс</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рс</displayName>
+				<unitPattern count="one">{0}рс</unitPattern>
+				<unitPattern count="few">{0}рс</unitPattern>
+				<unitPattern count="many">{0}рс</unitPattern>
+				<unitPattern count="other">{0}рс</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фнт/дюйм²</displayName>
 				<unitPattern count="one">{0}фнт/дюйм²</unitPattern>
@@ -13373,7 +13739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}вуз.</unitPattern>
 			</unit>
 			<unit type="speed-beaufort">
-				<displayName>Бофорт</displayName>
+				<displayName>бали</displayName>
 				<unitPattern count="one">{0} бал</unitPattern>
 				<unitPattern count="few">{0} бали</unitPattern>
 				<unitPattern count="many">{0} балів</unitPattern>
@@ -13503,6 +13869,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}м.чаш.</unitPattern>
 				<unitPattern count="other">{0}м.чаш.</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ун. рід. метр.</displayName>
+				<unitPattern count="one">{0}ун.рід.м.</unitPattern>
+				<unitPattern count="few">{0}ун.рід.м.</unitPattern>
+				<unitPattern count="many">{0}ун.рід.м.</unitPattern>
+				<unitPattern count="other">{0}ун.рід.м.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акр-фт</displayName>
 				<unitPattern count="one">{0}акр-фт</unitPattern>
@@ -13522,7 +13895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="few">{0}гал.</unitPattern>
 				<unitPattern count="many">{0}гал.</unitPattern>
 				<unitPattern count="other">{0}гал.</unitPattern>
-				<perUnitPattern>{0}/гал</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<displayName>англ. гал.</displayName>
@@ -13623,7 +13995,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}мір.</unitPattern>
 			</unit>
 			<unit type="volume-pinch">
-				<displayName>дріб.</displayName>
 				<unitPattern count="one">{0}дріб.</unitPattern>
 				<unitPattern count="few">{0}дріб.</unitPattern>
 				<unitPattern count="many">{0}дріб.</unitPattern>
@@ -13636,12 +14007,110 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0}англ.квар.</unitPattern>
 				<unitPattern count="other">{0}англ.квар.</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0}ср</unitPattern>
+				<unitPattern count="few">{0}ср</unitPattern>
+				<unitPattern count="many">{0}ср</unitPattern>
+				<unitPattern count="other">{0}ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0}кат</unitPattern>
+				<unitPattern count="few">{0}кат</unitPattern>
+				<unitPattern count="many">{0}кат</unitPattern>
+				<unitPattern count="other">{0}кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0}Кл</unitPattern>
+				<unitPattern count="few">{0}Кл</unitPattern>
+				<unitPattern count="many">{0}Кл</unitPattern>
+				<unitPattern count="other">{0}Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0}Ф</unitPattern>
+				<unitPattern count="few">{0}Ф</unitPattern>
+				<unitPattern count="many">{0}Ф</unitPattern>
+				<unitPattern count="other">{0}Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="one">{0}Гн</unitPattern>
+				<unitPattern count="few">{0}Гн</unitPattern>
+				<unitPattern count="many">{0}Гн</unitPattern>
+				<unitPattern count="other">{0}Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="one">{0}См</unitPattern>
+				<unitPattern count="few">{0}См</unitPattern>
+				<unitPattern count="many">{0}См</unitPattern>
+				<unitPattern count="other">{0}См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калмн</displayName>
+				<unitPattern count="one">{0}калмн</unitPattern>
+				<unitPattern count="few">{0}калмн</unitPattern>
+				<unitPattern count="many">{0}калмн</unitPattern>
+				<unitPattern count="other">{0}калмн</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0}Бк</unitPattern>
+				<unitPattern count="few">{0}Бк</unitPattern>
+				<unitPattern count="many">{0}Бк</unitPattern>
+				<unitPattern count="other">{0}Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0}Зв</unitPattern>
+				<unitPattern count="few">{0}Зв</unitPattern>
+				<unitPattern count="many">{0}Зв</unitPattern>
+				<unitPattern count="other">{0}Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0}Гр</unitPattern>
+				<unitPattern count="few">{0}Гр</unitPattern>
+				<unitPattern count="many">{0}Гр</unitPattern>
+				<unitPattern count="other">{0}Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0}кгс</unitPattern>
+				<unitPattern count="few">{0}кгс</unitPattern>
+				<unitPattern count="many">{0}кгс</unitPattern>
+				<unitPattern count="other">{0}кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0}Тл</unitPattern>
+				<unitPattern count="few">{0}Тл</unitPattern>
+				<unitPattern count="many">{0}Тл</unitPattern>
+				<unitPattern count="other">{0}Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0}Вб</unitPattern>
+				<unitPattern count="few">{0}Вб</unitPattern>
+				<unitPattern count="many">{0}Вб</unitPattern>
+				<unitPattern count="other">{0}Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>шв.св.</displayName>
+				<unitPattern count="one">{0}шв.св.</unitPattern>
+				<unitPattern count="few">{0}шв.св.</unitPattern>
+				<unitPattern count="many">{0}шв.св.</unitPattern>
+				<unitPattern count="other">{0}шв.св.</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ч/млрд</displayName>
-				<unitPattern count="one">{0} ч/млрд</unitPattern>
-				<unitPattern count="few">{0} ч/млрд</unitPattern>
-				<unitPattern count="many">{0} ч/млрд</unitPattern>
-				<unitPattern count="other">{0} ч/млрд</unitPattern>
+				<unitPattern count="one">{0}ч/млрд</unitPattern>
+				<unitPattern count="few">{0}ч/млрд</unitPattern>
+				<unitPattern count="many">{0}ч/млрд</unitPattern>
+				<unitPattern count="other">{0}ч/млрд</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>нч</displayName>
diff --git a/make/data/cldr/common/main/ur.xml b/make/data/cldr/common/main/ur.xml
index b56793e017c..a018ec0621a 100644
--- a/make/data/cldr/common/main/ur.xml
+++ b/make/data/cldr/common/main/ur.xml
@@ -49,6 +49,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az" alt="short">ازیری</language>
 			<language type="az_Arab">آزربائیجانی (عربی)</language>
 			<language type="ba">باشکیر</language>
+			<language type="bal">بلوچی</language>
 			<language type="ban">بالینیز</language>
 			<language type="bas">باسا</language>
 			<language type="be">بیلاروسی</language>
@@ -235,7 +236,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksb">شامبالا</language>
 			<language type="ksf">بافيا</language>
 			<language type="ksh">کولوگنیائی</language>
-			<language type="ku">کردش</language>
+			<language type="ku">کردی</language>
+			<language type="ku" menu="core">کردی</language>
+			<language type="ku" menu="extension">کرمانجی</language>
 			<language type="kum">کومیک</language>
 			<language type="kv">کومی</language>
 			<language type="kw">کورنش</language>
@@ -284,7 +287,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mic">مکمیک</language>
 			<language type="min">منانگکباؤ</language>
 			<language type="mk">مقدونیائی</language>
-			<language type="ml">مالایالم</language>
+			<language type="ml">ملیالم</language>
 			<language type="mn">منگولین</language>
 			<language type="mni">منی پوری</language>
 			<language type="moe">انو ایمن</language>
@@ -636,6 +639,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">چین</territory>
 			<territory type="CO">کولمبیا</territory>
 			<territory type="CP">کلپرٹن آئلینڈ</territory>
+			<territory type="CQ">سارک</territory>
 			<territory type="CR">کوسٹا ریکا</territory>
 			<territory type="CU">کیوبا</territory>
 			<territory type="CV">کیپ ورڈی</territory>
@@ -877,34 +881,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">عددی چھانٹی</key>
 			<key type="colStrength">چھانٹی کی قوت</key>
 			<key type="currency">کرنسی</key>
+			<key type="em">ایموجی پریزینٹیشن</key>
 			<key type="hc">گھنٹہ سائیکل (12 بنام 24)</key>
 			<key type="lb">لائن بریک انداز</key>
+			<key type="lw">الفاظ کے اندر لائن بریکس</key>
 			<key type="ms">پیمائش کا نظام</key>
 			<key type="numbers">اعداد</key>
+			<key type="ss">مخففات کے بعد سنٹینس بریک</key>
 			<key type="timezone">منطقۂ وقت</key>
 			<key type="va">مقام کا متغیرہ</key>
 			<key type="x">نجی-استعمال</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">بودھ کلینڈر</type>
+			<type key="calendar" type="buddhist" scope="core">بودھ</type>
 			<type key="calendar" type="chinese">چینی کیلنڈر</type>
+			<type key="calendar" type="chinese" scope="core">چینی</type>
 			<type key="calendar" type="coptic">کاپٹک کیلنڈر</type>
+			<type key="calendar" type="coptic" scope="core">قبطی</type>
 			<type key="calendar" type="dangi">ڈانگی کیلنڈر</type>
+			<type key="calendar" type="dangi" scope="core">ڈانگی</type>
 			<type key="calendar" type="ethiopic">ایتھوپیائی کیلنڈر</type>
+			<type key="calendar" type="ethiopic" scope="core">ایتھوپیائی</type>
 			<type key="calendar" type="ethiopic-amete-alem">ایتھوپک امیٹ الیم کیلنڈر</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ایتھوپیائی امیٹ الیم</type>
 			<type key="calendar" type="gregorian">گریگورین کیلنڈر</type>
+			<type key="calendar" type="gregorian" scope="core">گریگورین</type>
 			<type key="calendar" type="hebrew">عبرانی کیلنڈر</type>
-			<type key="calendar" type="indian">ہندوستانی قومی کیلنڈر</type>
-			<type key="calendar" type="islamic">اسلامی کیلنڈر</type>
+			<type key="calendar" type="hebrew" scope="core">عبرانی</type>
+			<type key="calendar" type="indian">بھارتی قومی کیلنڈر</type>
+			<type key="calendar" type="indian" scope="core">بھارتی قومی</type>
+			<type key="calendar" type="islamic">ہجری کیلنڈر</type>
+			<type key="calendar" type="islamic" scope="core">ہجری</type>
 			<type key="calendar" type="islamic-civil">اسلامی شہری کیلنڈر (ٹیبیولر، مدنی دور)</type>
-			<type key="calendar" type="islamic-tbla">اسلامی کیلنڈر (ٹیبولر، فلکیاتی دور)</type>
-			<type key="calendar" type="islamic-umalqura">اسلامی کیلنڈر (ام القراہ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ہجری (شہری تقویم)</type>
+			<type key="calendar" type="islamic-tbla">ہجری کیلنڈر (لوحی، ایسٹرونومیکل ایپوک)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">ہجری (فلکیاتی تقویم)</type>
+			<type key="calendar" type="islamic-umalqura">ہجری کیلنڈر (ام القریٰ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ہجری (ام القریٰ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 کیلنڈر</type>
 			<type key="calendar" type="japanese">جاپانی کیلنڈر</type>
+			<type key="calendar" type="japanese" scope="core">جاپانی</type>
 			<type key="calendar" type="persian">فارسی کیلنڈر</type>
+			<type key="calendar" type="persian" scope="core">فارسی</type>
 			<type key="calendar" type="roc">منگوو کیلنڈر</type>
+			<type key="calendar" type="roc" scope="core">مینگوو</type>
 			<type key="cf" type="account">اکاؤنٹنگ کرنسی فارمیٹ</type>
+			<type key="cf" type="account" scope="core">اکاؤنٹنگ</type>
 			<type key="cf" type="standard">اسٹینڈرڈ کرنسی فارمیٹ</type>
+			<type key="cf" type="standard" scope="core">اسٹینڈرڈ</type>
 			<type key="colAlternate" type="non-ignorable">علامات کی چھٹائی کریں</type>
 			<type key="colAlternate" type="shifted">علامات کو نظرانداز کرکے چھٹائی کریں</type>
 			<type key="colBackwards" type="no">لہجوں کی چھٹائی معمول کے انداز میں کریں</type>
@@ -914,18 +939,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">پہلے بالائی حروف کی چھٹائی کریں</type>
 			<type key="colCaseLevel" type="no">حروف کی عدم حساسیت کی چھٹائی کریں</type>
 			<type key="colCaseLevel" type="yes">حروف کے تئیں حساس کی چھٹائی کریں</type>
-			<type key="collation" type="big5han">روایتی چینی کی چھٹائی کی ترتیب - Big5</type>
 			<type key="collation" type="compat" draft="contributed">سابقہ چھٹائی کی ترتیب، مطابقت کیلئے</type>
 			<type key="collation" type="dictionary">لغت کی چھٹنی کی ترتیب</type>
 			<type key="collation" type="ducet">ڈیفالٹ یونی کوڈ چھانٹی کی ترتیب</type>
+			<type key="collation" type="ducet" scope="core">ڈیفالٹ یونی کوڈ</type>
 			<type key="collation" type="eor" draft="contributed">یورپی ترتیبی قوانین</type>
-			<type key="collation" type="gb2312han">آسان چینی کی چھٹائی کی ترتیب - GB2312</type>
 			<type key="collation" type="phonebook">فون بک کی چھٹنی کی ترتیب</type>
 			<type key="collation" type="phonetic">صوتی چھٹائی کی ترتیب</type>
 			<type key="collation" type="pinyin">پن ین کی چھٹنی کی ترتیب</type>
 			<type key="collation" type="search">عمومی تلاش</type>
+			<type key="collation" type="search" scope="core">تلاش</type>
 			<type key="collation" type="searchjl">Hangul Initial Consonant کے لحاظ سے تلاش کریں</type>
 			<type key="collation" type="standard">معیاری چھانٹی کی ترتیب</type>
+			<type key="collation" type="standard" scope="core">معیاری</type>
 			<type key="collation" type="stroke">سٹروک کی چھٹنی کی ترتیب</type>
 			<type key="collation" type="traditional">روایتی چھٹنی کی ترتیب</type>
 			<type key="collation" type="unihan">اساسی-سٹروک کی چھٹنی کی ترتیب</type>
@@ -941,18 +967,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">پورا عرض</type>
 			<type key="d0" type="hwidth">نصف عرض</type>
 			<type key="d0" type="npinyin">عددی</type>
+			<type key="em" type="default" scope="core">ڈیفالٹ</type>
+			<type key="em" type="emoji" scope="core">ایموجی</type>
+			<type key="em" type="text" scope="core">متن</type>
 			<type key="hc" type="h11">12 گھنٹے کا نظام (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 گھنٹے کا نظام (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 گھنٹے کا نظام (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 گھنٹے کا نظام (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ڈھیلا لائن بریک انداز</type>
+			<type key="lb" type="loose" scope="core">ڈھیلا</type>
 			<type key="lb" type="normal">عمومی لائن بریک انداز</type>
+			<type key="lb" type="normal" scope="core">عمومی</type>
 			<type key="lb" type="strict">سخت لائن بریک انداز</type>
+			<type key="lb" type="strict" scope="core">سخت</type>
+			<type key="lw" type="breakall" scope="core">سبھی کو بریک کریں</type>
+			<type key="lw" type="keepall" scope="core">سبھی کو رکھیں</type>
+			<type key="lw" type="normal" scope="core">عمومی</type>
+			<type key="lw" type="phrase" scope="core">فقروں میں رکھیں</type>
 			<type key="m0" type="bgn">US BGN ٹرانسلٹریشن</type>
 			<type key="m0" type="ungegn">UN GEGN ٹرانسلٹریشن</type>
 			<type key="ms" type="metric">میٹرک نظام</type>
+			<type key="ms" type="metric" scope="core">میٹرک</type>
 			<type key="ms" type="uksystem">پیمائش کا امپیریل نظام</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">پیمائش کا امریکی نظام</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">عربی ہندی ہندسے</type>
 			<type key="numbers" type="arabext">توسیع شدہ عربی ہندی ہندسے</type>
 			<type key="numbers" type="armn">آرمینیائی اعداد</type>
@@ -997,6 +1040,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">تبتی اعداد</type>
 			<type key="numbers" type="traditional">روایتی اعداد</type>
 			<type key="numbers" type="vaii">وائی ہندسے</type>
+			<type key="ss" type="none" scope="core">آف</type>
+			<type key="ss" type="standard" scope="core">آن</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">میٹرک</measurementSystemName>
@@ -1019,7 +1064,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters type="auxiliary">[؀؁؂؃\u200C\u200D\u200E\u200F ً ٌ ٍ َ ُ ِ ّ ْ ٔ ٖ ٗ ٘ ٰ أ آ ں ؤ ۂ ۃ ئ ٻ ة ٺ ټ ٽ ه ي]</exemplarCharacters>
 		<exemplarCharacters type="index">[ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\u200E \- ‑ , ٫ ٬ . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[، ؍ ٫ ٬ ؛ \: ؟ . ۔ ( ) \[ \]]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[\- ‑ – — ، ؛ \: ! ؟ … ۔ ‘’ “” ( ) \[ \] § @ * / \\ \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‑ , . /]</exemplarCharacters>
 		<moreInformation>؟</moreInformation>
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
@@ -1060,12 +1108,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">دور0</era>
-						<era type="1" draft="contributed">دور1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
@@ -1087,12 +1129,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0" draft="contributed">دور0</era>
-						<era type="1" draft="contributed">دور1</era>
-					</eraAbbr>
-				</eras>
 			</calendar>
 			<calendar type="generic">
 				<dateFormats>
@@ -1123,6 +1159,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} پر</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1131,6 +1170,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} کو {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} پر</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1139,6 +1181,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}، {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1147,11 +1192,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}، {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">h E B</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM، y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E، d MMM، y G</dateFormatItem>
@@ -1345,8 +1396,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="night1">رات</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="midnight">نصف شب</dayPeriod>
 							<dayPeriod type="am">a</dayPeriod>
 							<dayPeriod type="pm">p</dayPeriod>
+							<dayPeriod type="morning1">صبح</dayPeriod>
+							<dayPeriod type="afternoon1">دوپہر</dayPeriod>
+							<dayPeriod type="afternoon2">سہ پہر</dayPeriod>
+							<dayPeriod type="evening1">شام</dayPeriod>
+							<dayPeriod type="night1">رات</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="midnight">آدھی رات</dayPeriod>
@@ -1427,6 +1484,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} کو {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} {0} پر</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1435,6 +1495,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} کو {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} کو {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1443,6 +1506,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}، {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1451,11 +1517,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}، {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}، {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E، d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM، y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E، d MMM، y G</dateFormatItem>
@@ -1713,6 +1784,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="0">ہجری</era>
 					</eraAbbr>
 				</eras>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E، d/M/y G</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="persian">
 				<months>
@@ -2409,6 +2486,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ایسٹر</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>کویائیکے</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>پنٹا اریناس</exemplarCity>
 			</zone>
@@ -2674,9 +2754,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>پنوم پن</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>اینڈربری</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>کانٹن</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3346,9 +3423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>مغربی افریقہ ٹائم</generic>
-					<standard>مغربی افریقہ سٹینڈرڈ ٹائم</standard>
-					<daylight>مغربی افریقہ سمر ٹائم</daylight>
+					<standard>مغربی افریقہ ٹائم</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3705,6 +3780,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>گیانا کا وقت</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>ہوائی الیوٹیئن اسٹینڈرڈ ٹائم</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>ہوائی الیوٹیئن ٹائم</generic>
@@ -4296,18 +4376,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
-		<currencyFormats numberSystem="arabext">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4317,32 +4389,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤ 0 ہزار</pattern>
-					<pattern type="1000" count="other">¤ 0 ہزار</pattern>
-					<pattern type="10000" count="one">¤ 00 ہزار</pattern>
-					<pattern type="10000" count="other">¤ 00 ہزار</pattern>
-					<pattern type="100000" count="one">¤ 0 لاکھ</pattern>
-					<pattern type="100000" count="other">¤ 0 لاکھ</pattern>
-					<pattern type="1000000" count="one">¤ 00 لاکھ</pattern>
-					<pattern type="1000000" count="other">¤ 00 لاکھ</pattern>
-					<pattern type="10000000" count="one">¤ 0 کروڑ</pattern>
-					<pattern type="10000000" count="other">¤ 0 کروڑ</pattern>
-					<pattern type="100000000" count="one">¤ 00 کروڑ</pattern>
-					<pattern type="100000000" count="other">¤ 00 کروڑ</pattern>
-					<pattern type="1000000000" count="one">¤ 0 ارب</pattern>
-					<pattern type="1000000000" count="other">¤ 0 ارب</pattern>
-					<pattern type="10000000000" count="one">¤ 00 ارب</pattern>
-					<pattern type="10000000000" count="other">¤ 00 ارب</pattern>
-					<pattern type="100000000000" count="one">¤ 0 کھرب</pattern>
-					<pattern type="100000000000" count="other">¤ 0 کھرب</pattern>
-					<pattern type="1000000000000" count="one">¤0 ٹریلین</pattern>
-					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0 ٹریلین</pattern>
-					<pattern type="1000000000000" count="other">¤0 ٹریلین</pattern>
-					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0 ٹریلین</pattern>
-					<pattern type="10000000000000" count="one">¤ 00 ٹریلین</pattern>
-					<pattern type="10000000000000" count="other">¤ 00 ٹریلین</pattern>
-					<pattern type="100000000000000" count="one">¤ 000 ٹریلین</pattern>
-					<pattern type="100000000000000" count="other">¤ 000 ٹریلین</pattern>
+					<pattern type="1000" count="one">¤0 ہزار</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0 ہزار</pattern>
+					<pattern type="1000" count="other">¤0 ہزار</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 ہزار</pattern>
+					<pattern type="10000" count="one">¤00 ہزار</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00 ہزار</pattern>
+					<pattern type="10000" count="other">¤00 ہزار</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 ہزار</pattern>
+					<pattern type="100000" count="one">¤0 لاکھ</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 0 لاکھ</pattern>
+					<pattern type="100000" count="other">¤0 لاکھ</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 0 لاکھ</pattern>
+					<pattern type="1000000" count="one">¤00 لاکھ</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 00 لاکھ</pattern>
+					<pattern type="1000000" count="other">¤00 لاکھ</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00 لاکھ</pattern>
+					<pattern type="10000000" count="one">¤0 کروڑ</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 0 کروڑ</pattern>
+					<pattern type="10000000" count="other">¤0 کروڑ</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0 کروڑ</pattern>
+					<pattern type="100000000" count="one">¤00 کروڑ</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 00 کروڑ</pattern>
+					<pattern type="100000000" count="other">¤00 کروڑ</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 00 کروڑ</pattern>
+					<pattern type="1000000000" count="one">¤0 ارب</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0 ارب</pattern>
+					<pattern type="1000000000" count="other">¤0 ارب</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 ارب</pattern>
+					<pattern type="10000000000" count="one">¤00 ارب</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00 ارب</pattern>
+					<pattern type="10000000000" count="other">¤00 ارب</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 ارب</pattern>
+					<pattern type="100000000000" count="one">¤0 کھرب</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 0 کھرب</pattern>
+					<pattern type="100000000000" count="other">¤0 کھرب</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0 کھرب</pattern>
+					<pattern type="1000000000000" count="one">¤00 کھرب</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 00 کھرب</pattern>
+					<pattern type="1000000000000" count="other">¤00 کھرب</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 00 کھرب</pattern>
+					<pattern type="10000000000000" count="one">¤00 ٹریلین</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00 ٹریلین</pattern>
+					<pattern type="10000000000000" count="other">¤00 ٹریلین</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00 ٹریلین</pattern>
+					<pattern type="100000000000000" count="one">¤000 ٹریلین</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000 ٹریلین</pattern>
+					<pattern type="100000000000000" count="other">¤000 ٹریلین</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000 ٹریلین</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4366,7 +4460,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>انگولا کا کوانزا</displayName>
 			</currency>
 			<currency type="ARS">
-				<displayName>ارجنٹائن پیسہ</displayName>
+				<displayName>ارجنٹائن پیسو</displayName>
+				<displayName count="one">ارجنٹائن پیسو</displayName>
+				<displayName count="other">ارجنٹائن پیسو</displayName>
 			</currency>
 			<currency type="AUD">
 				<displayName>آسٹریلین ڈالر</displayName>
@@ -4438,7 +4534,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>سوئس فرانکس</displayName>
 			</currency>
 			<currency type="CLP">
-				<displayName>چلّین پیسہ</displayName>
+				<displayName>چلین پیسو</displayName>
+				<displayName count="one">چلین پیسو</displayName>
+				<displayName count="other">چلین پیسو</displayName>
 			</currency>
 			<currency type="CNH">
 				<displayName>چینی یوآن (آف شور)</displayName>
@@ -4447,7 +4545,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>چینی یوآن</displayName>
 			</currency>
 			<currency type="COP">
-				<displayName>کولمبین پیسہ</displayName>
+				<displayName>کولمبین پیسو</displayName>
+				<displayName count="one">کولمبین پیسو</displayName>
+				<displayName count="other">کولمبین پیسو</displayName>
 			</currency>
 			<currency type="CRC">
 				<displayName>کوسٹا ریکا کا کولن</displayName>
@@ -4665,7 +4765,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>ملاوی کواچا</displayName>
 			</currency>
 			<currency type="MXN">
-				<displayName>میکسیکی پیسہ</displayName>
+				<displayName>میکسیکی پیسو</displayName>
+				<displayName count="one">میکسیکی پیسو</displayName>
+				<displayName count="other">میکسیکی پیسو</displayName>
 			</currency>
 			<currency type="MYR">
 				<displayName>ملیشیائی رنگِٹ</displayName>
@@ -4706,8 +4808,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>پاپوآ نیو گنی کا کینا</displayName>
 			</currency>
 			<currency type="PHP">
-				<displayName>فلپائینی پیسہ</displayName>
-				<displayName count="one">فلپائینی پیسہ</displayName>
+				<displayName>فلپائنی پیسو</displayName>
+				<displayName count="one">فلپائنی پیسو</displayName>
 				<displayName count="other">فلپائنی پیسو</displayName>
 				<symbol>PHP</symbol>
 			</currency>
@@ -4865,6 +4967,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>مشرقی کریبیا کا ڈالر</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>کیریبین گلڈر</displayName>
+				<displayName count="one">کیریبین گلڈر</displayName>
+				<displayName count="other">کیریبین گلڈرز</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>مغربی افریقی [CFA] فرانک</displayName>
 			</currency>
@@ -4890,6 +4997,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>زامبیائی کواچا</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>زمبابوے گولڈ</displayName>
+				<displayName count="one">زمبابوے گولڈ</displayName>
+				<displayName count="other">زمبابوے گولڈ</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">{0} گھنٹہ</pluralMinimalPairs>
@@ -5110,8 +5222,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<gender>masculine</gender>
 				<displayName>آئٹمز</displayName>
 			</unit>
-			<unit type="concentr-permillion">
-				<gender>feminine</gender>
+			<unit type="concentr-part">
+				<displayName>پارٹس</displayName>
+				<unitPattern count="one">{0} پارٹ</unitPattern>
+				<unitPattern count="other">{0} پارٹس</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<gender>masculine</gender>
 				<displayName>فی ملین حصے</displayName>
 				<unitPattern count="one">{0} فی ملین حصے</unitPattern>
 				<unitPattern count="other">{0} فی ملین حصے</unitPattern>
@@ -5137,6 +5254,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مولز</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>گلوکوز کے</displayName>
+				<unitPattern count="one">{0} گلوکوز کے</unitPattern>
+				<unitPattern count="other">{0} گلوکوز کے</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<gender>masculine</gender>
 				<displayName>لیٹر فی کلومیٹر</displayName>
@@ -5645,6 +5767,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ملی میٹر مرکری</unitPattern>
 				<unitPattern count="other">{0} ملی میٹر مرکری</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>مرکری کے</displayName>
+				<unitPattern count="one">{0} مرکری کے</unitPattern>
+				<unitPattern count="other">{0} مرکری کے</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>پاؤنڈز فی مربع انچ</displayName>
 				<unitPattern count="one">{0} پاؤنڈ فی مربع انچ</unitPattern>
@@ -5823,6 +5950,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} میٹرک کپ</unitPattern>
 				<unitPattern count="other">{0} میٹرک کپ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>میٹرک فلوئیڈ آؤنس</displayName>
+				<unitPattern count="one">{0} میٹرک فلوئیڈ آؤنس</unitPattern>
+				<unitPattern count="other">{0} میٹرک فلوئیڈ آؤنسز</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} ایکڑ فٹ</unitPattern>
 				<unitPattern count="other">{0} ایکڑ فٹ</unitPattern>
@@ -5901,13 +6033,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} امپیریئل کوارٹ</unitPattern>
 				<unitPattern count="other">{0} امپیریئل کوارٹ</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>سٹرڈئینز</displayName>
+				<unitPattern count="one">{0} سٹرڈئین</unitPattern>
+				<unitPattern count="other">{0} سٹرڈئینز</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>کاتلز</displayName>
+				<unitPattern count="one">{0} کاتل</unitPattern>
+				<unitPattern count="other">{0} کاتلز</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>کولمبز</displayName>
+				<unitPattern count="one">{0} کولمب</unitPattern>
+				<unitPattern count="other">{0} کولمبز</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>فیراڈ</displayName>
+				<unitPattern count="one">{0} فیراڈ</unitPattern>
+				<unitPattern count="other">{0} فیراڈ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ہینریز</displayName>
+				<unitPattern count="one">{0} ہینری</unitPattern>
+				<unitPattern count="other">{0} ہینریز</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>سیمنز</displayName>
+				<unitPattern count="one">{0} سیمنز</unitPattern>
+				<unitPattern count="other">{0} سیمنز</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>کیلوریز [IT]</displayName>
+				<unitPattern count="one">{0} کیلوری [IT]</unitPattern>
+				<unitPattern count="other">{0} کیلوریز [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>بیکوریل</displayName>
+				<unitPattern count="one">{0} بیکوریل</unitPattern>
+				<unitPattern count="other">{0} بیکوریلز</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>سیورٹس</displayName>
+				<unitPattern count="one">{0} سیورٹ</unitPattern>
+				<unitPattern count="other">{0} سیورٹس</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>گریز</displayName>
+				<unitPattern count="one">{0} گرے</unitPattern>
+				<unitPattern count="other">{0} گریز</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>کلوگرامز فورس</displayName>
+				<unitPattern count="one">{0} کلوگرم فورس</unitPattern>
+				<unitPattern count="other">{0} کلوگرامز فورس</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ٹیسلاز</displayName>
+				<unitPattern count="one">{0} ٹیسلا</unitPattern>
+				<unitPattern count="other">{0} ٹیسلاز</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ویبرز</displayName>
+				<unitPattern count="one">{0} ویبر</unitPattern>
+				<unitPattern count="other">{0} ویبرز</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<gender>feminine</gender>
-				<displayName>روشنی</displayName>
-				<unitPattern count="one">{0} روشنی</unitPattern>
-				<unitPattern count="other">{0} روشنی</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<gender>masculine</gender>
 				<displayName>اجزا فی بلین</displayName>
 				<unitPattern count="one">{0} جزو فی بلین</unitPattern>
@@ -5915,9 +6109,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="duration-night">
 				<gender>feminine</gender>
-				<displayName>راتیں</displayName>
-				<unitPattern count="one">{0} رات</unitPattern>
-				<unitPattern count="other">{0} راتیں</unitPattern>
 				<perUnitPattern>{0} فی رات</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -6019,7 +6210,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} آئٹم</unitPattern>
 				<unitPattern count="other">{0} آئٹمز</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>پارٹ</displayName>
+				<unitPattern count="one">{0} پارٹ</unitPattern>
+				<unitPattern count="other">{0} پارٹ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>حصے/ملین</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6036,6 +6232,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} مول</unitPattern>
 				<unitPattern count="other">{0} مول</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>لیٹر/100 کلو میٹر</displayName>
 			</unit>
@@ -6308,6 +6509,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} واٹ</unitPattern>
 				<unitPattern count="other">{0} واٹ</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>of Hg</displayName>
+				<unitPattern count="one">{0} of Hg</unitPattern>
+				<unitPattern count="other">{0} of Hg</unitPattern>
+			</unit>
 			<unit type="pressure-bar">
 				<displayName>بار</displayName>
 				<unitPattern count="one">{0} بار</unitPattern>
@@ -6368,6 +6574,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-centiliter">
 				<displayName>سینٹی لیٹر</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="one">{0} fl oz m.</unitPattern>
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ایکڑ فٹ</displayName>
 			</unit>
@@ -6419,12 +6629,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} چٹکی</unitPattern>
 				<unitPattern count="other">{0} چٹکی</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>روشنی</displayName>
 				<unitPattern count="one">{0} روشنی</unitPattern>
 				<unitPattern count="other">{0} روشنی</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>اجزا/بلین</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6493,7 +6756,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-dunam">
 				<displayName>دُنام</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>پارٹ</displayName>
+				<unitPattern count="one">{0} پارٹ</unitPattern>
+				<unitPattern count="other">{0} پارٹ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -6505,6 +6773,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}L/100km</unitPattern>
 				<unitPattern count="other">{0}L/100km</unitPattern>
@@ -6651,6 +6924,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}hp</unitPattern>
 				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>of Hg</displayName>
+				<unitPattern count="one">{0} of Hg</unitPattern>
+				<unitPattern count="other">{0} of Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ Hg</displayName>
 				<unitPattern count="one">{0} انچ مرکری</unitPattern>
@@ -6745,21 +7023,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}fl.dr.</unitPattern>
 				<unitPattern count="other">{0}fl.dr.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>روشنی</displayName>
-				<unitPattern count="one">{0} روشنی</unitPattern>
-				<unitPattern count="other">{0} روشنی</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>راتیں</displayName>
-				<unitPattern count="one">{0} رات</unitPattern>
-				<unitPattern count="other">{0} راتیں</unitPattern>
-				<perUnitPattern>{0}/رات</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>
diff --git a/make/data/cldr/common/main/ur_IN.xml b/make/data/cldr/common/main/ur_IN.xml
index e5a965fba35..e9cb92998d3 100644
--- a/make/data/cldr/common/main/ur_IN.xml
+++ b/make/data/cldr/common/main/ur_IN.xml
@@ -481,8 +481,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="arabext">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern>¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/uz.xml b/make/data/cldr/common/main/uz.xml
index af0dbd54840..99ca6fb6ee8 100644
--- a/make/data/cldr/common/main/uz.xml
+++ b/make/data/cldr/common/main/uz.xml
@@ -44,6 +44,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">ozarbayjon</language>
 			<language type="az" alt="short">ozar</language>
 			<language type="ba">boshqird</language>
+			<language type="bal">baluj</language>
 			<language type="ban">bali</language>
 			<language type="bas">basa</language>
 			<language type="be">belarus</language>
@@ -230,6 +231,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafiya</language>
 			<language type="ksh">kyoln</language>
 			<language type="ku">kurdcha</language>
+			<language type="ku" menu="core">kurd</language>
+			<language type="ku" menu="extension">kurmanji</language>
 			<language type="kum">qo‘miq</language>
 			<language type="kv">komi</language>
 			<language type="kw">korn</language>
@@ -467,7 +470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="zgh">tamazigxt</language>
 			<language type="zh">xitoy</language>
 			<language type="zh" alt="menu">xitoy, mandarin</language>
-			<language type="zh_Hans">zh_Hans</language>
 			<language type="zh_Hans" alt="long">xitoy (soddalashtirilgan mandarin)</language>
 			<language type="zh_Hant">xitoy (an’anaviy)</language>
 			<language type="zh_Hant" alt="long">xitoy (an’anaviy mandarin)</language>
@@ -624,6 +626,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Xitoy</territory>
 			<territory type="CO">Kolumbiya</territory>
 			<territory type="CP">Klipperton oroli</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Kosta-Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kabo-Verde</territory>
@@ -857,43 +860,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">valyuta formati</key>
 			<key type="collation">saralash tartibi</key>
 			<key type="currency">valyuta</key>
+			<key type="em">emoji namoyishi</key>
 			<key type="hc">soat tizimi (12 yoki 24)</key>
 			<key type="lb">qatorni uzish uslubi</key>
+			<key type="lw">so‘z ko‘chirish uslubi</key>
 			<key type="ms">o‘lchov tizimi</key>
 			<key type="numbers">raqamlar</key>
+			<key type="ss">qisqartirilgandan keyin gapning uzilishi</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">buddizm taqvimi</type>
+			<type key="calendar" type="buddhist" scope="core">buddist</type>
 			<type key="calendar" type="chinese">xitoy taqvimi</type>
+			<type key="calendar" type="chinese" scope="core">xitoy</type>
 			<type key="calendar" type="coptic">qibtiy taqvim</type>
+			<type key="calendar" type="coptic" scope="core">qibtiy</type>
 			<type key="calendar" type="dangi">dangi taqvimi</type>
+			<type key="calendar" type="dangi" scope="core">dangi</type>
 			<type key="calendar" type="ethiopic">habash taqvimi</type>
+			<type key="calendar" type="ethiopic" scope="core">habash</type>
 			<type key="calendar" type="ethiopic-amete-alem">Amete Alem habash taqvimi</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Amete Alem habash</type>
 			<type key="calendar" type="gregorian">grigorian taqvimi</type>
+			<type key="calendar" type="gregorian" scope="core">grigorian</type>
 			<type key="calendar" type="hebrew">yahudiy taqvimi</type>
+			<type key="calendar" type="hebrew" scope="core">yahudiy</type>
 			<type key="calendar" type="islamic">hijriy taqvim</type>
+			<type key="calendar" type="islamic" scope="core">hijriy</type>
 			<type key="calendar" type="islamic-civil">jadvalli hijriy taqvim</type>
+			<type key="calendar" type="islamic-civil" scope="core">jadvalli hijriy</type>
 			<type key="calendar" type="islamic-tbla">jadvalli hijriy taqvim (astronomik davr)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">jadvalli hijriy (atronomik davr)</type>
 			<type key="calendar" type="islamic-umalqura">hijriy taqvim (Ummul Quro)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">hijriy (Ummul Quro)</type>
 			<type key="calendar" type="iso8601">ISO-8601 taqvimi</type>
 			<type key="calendar" type="japanese">yapon taqvimi</type>
+			<type key="calendar" type="japanese" scope="core">yapon</type>
 			<type key="calendar" type="persian">fors taqvimi</type>
+			<type key="calendar" type="persian" scope="core">fors</type>
 			<type key="calendar" type="roc">mingo taqvimi</type>
+			<type key="calendar" type="roc" scope="core">mingo</type>
 			<type key="cf" type="account">moliyaviy valyuta formati</type>
+			<type key="cf" type="account" scope="core">moliyaviy</type>
 			<type key="cf" type="standard">standart valyuta formati</type>
+			<type key="cf" type="standard" scope="core">standart</type>
 			<type key="collation" type="ducet">standart Unicode saralash tartibi</type>
+			<type key="collation" type="ducet" scope="core">standart Unicode</type>
 			<type key="collation" type="search">qidiruv</type>
+			<type key="collation" type="search" scope="core">qidiruv</type>
 			<type key="collation" type="standard">standart saralash tartibi</type>
+			<type key="collation" type="standard" scope="core">standart</type>
+			<type key="em" type="default" scope="core">birlamchi</type>
+			<type key="em" type="emoji" scope="core">emoji</type>
+			<type key="em" type="text" scope="core">matn</type>
 			<type key="hc" type="h11">12 soatlik tizim (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 soatlik tizim (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 soatlik tizim (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 soatlik tizim (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">qatorni yumshoq uzish</type>
+			<type key="lb" type="loose" scope="core">yumshoq</type>
 			<type key="lb" type="normal">qatorni odatiy uzish</type>
+			<type key="lb" type="normal" scope="core">odatiy</type>
 			<type key="lb" type="strict">qatorni qat’iy uzish</type>
+			<type key="lb" type="strict" scope="core">qatʼiy</type>
+			<type key="lw" type="breakall" scope="core">hammasini koʻchirish</type>
+			<type key="lw" type="keepall" scope="core">hammasini saqlash</type>
+			<type key="lw" type="normal" scope="core">oddiy uslub</type>
+			<type key="lw" type="phrase" scope="core">iboralarda saqlash</type>
 			<type key="ms" type="metric">metrik tizim</type>
+			<type key="ms" type="metric" scope="core">metrik</type>
 			<type key="ms" type="uksystem">Britaniya o‘lchov tizimi</type>
+			<type key="ms" type="uksystem" scope="core">Birlashgan Qirollik</type>
 			<type key="ms" type="ussystem">AQSH o‘lchov tizimi</type>
+			<type key="ms" type="ussystem" scope="core">AQSH</type>
 			<type key="numbers" type="arab">arab-hind raqamlari</type>
 			<type key="numbers" type="arabext">kengaytirilgan arab-hind raqamlari</type>
 			<type key="numbers" type="armn">arman raqamlari</type>
@@ -934,6 +977,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">tay raqamlari</type>
 			<type key="numbers" type="tibt">tibet raqamlari</type>
 			<type key="numbers" type="vaii">vay raqamlari</type>
+			<type key="ss" type="none" scope="core">oʻchiq</type>
+			<type key="ss" type="standard" scope="core">yoniq</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1049,9 +1094,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
 							<greatestDifference id="m">B h:mm – h:mm</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">M/y (GGGGG) – M/y (GGGGG)</greatestDifference>
 							<greatestDifference id="M">M/y – M/y (GGGGG)</greatestDifference>
@@ -1376,17 +1418,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E, B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E, B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E, B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, dd-MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d-MMM, G y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d-MMM, G y</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a (v)</dateFormatItem>
@@ -1423,9 +1468,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">B h:mm – h:mm</greatestDifference>
 							<greatestDifference id="m">B h:mm – h:mm</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">G y – G y</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">M/y (G) – M/y (G)</greatestDifference>
 							<greatestDifference id="M">M/y – M/y (G)</greatestDifference>
@@ -1460,10 +1502,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d-MMM – E, d-MMM, G y</greatestDifference>
 							<greatestDifference id="y">E, d-MMM, y – E, d-MMM, y (G)</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1574,36 +1612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="12">Zulhijja</month>
 						</monthWidth>
 					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Muh.</month>
-							<month type="2">Saf.</month>
-							<month type="3">Rab. avv.</month>
-							<month type="4">Rab. son.</month>
-							<month type="5">Jum. avv.</month>
-							<month type="6">Jum. son.</month>
-							<month type="7">Raj.</month>
-							<month type="8">Sha.</month>
-							<month type="9">Ram.</month>
-							<month type="10">Shav.</month>
-							<month type="11">Zulq.</month>
-							<month type="12">Zulh.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Muharram</month>
-							<month type="2">Safar</month>
-							<month type="3">Rabiʼul avval</month>
-							<month type="4">Rabiʼus soniy</month>
-							<month type="5">Jumodul avval</month>
-							<month type="6">Jumodus soniy</month>
-							<month type="7">Rajab</month>
-							<month type="8">Sha’bon</month>
-							<month type="9">Ramazon</month>
-							<month type="10">Shavvol</month>
-							<month type="11">Zulqaʼda</month>
-							<month type="12">Zulhijja</month>
-						</monthWidth>
-					</monthContext>
 				</months>
 				<eras>
 					<eraAbbr>
@@ -1947,9 +1955,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angilya</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Antarctica/Rothera">
 				<exemplarCity>Rotera</exemplarCity>
 			</zone>
@@ -2392,9 +2397,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Pnompen</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderberi oroli</exemplarCity>
-			</zone>
 			<zone type="Pacific/Tarawa">
 				<exemplarCity>Tarava</exemplarCity>
 			</zone>
@@ -2828,9 +2830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Gʻarbiy Afrika vaqti</generic>
-					<standard>Gʻarbiy Afrika standart vaqti</standard>
-					<daylight>Gʻarbiy Afrika yozgi vaqti</daylight>
+					<standard>Gʻarbiy Afrika vaqti</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3180,6 +3180,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Gayana vaqti</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Gavayi-aleut standart vaqti</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Gavayi-aleut vaqti</generic>
@@ -3753,13 +3758,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4276,6 +4290,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Sharqiy Karib dollari</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karib guldeni</displayName>
+				<displayName count="one">Karib guldeni</displayName>
+				<displayName count="other">Karib guldeni</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>G‘arbiy Afrika CFA franki</displayName>
 			</currency>
@@ -4296,6 +4315,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>Zambiya kvachasi</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabve oltini</displayName>
+				<displayName count="one">Zimbabve oltini</displayName>
+				<displayName count="other">Zimbabve oltini</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one">Bu jildda {0} ta fayl bor. Uni oʻchirib tashlaysizmi?</pluralMinimalPairs>
@@ -4498,6 +4522,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<displayName>elementlar</displayName>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>qism</displayName>
+				<unitPattern count="one">{0} qismi</unitPattern>
+				<unitPattern count="other">{0} qismi</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<unitPattern count="one">{0} milliondan ulush</unitPattern>
+				<unitPattern count="other">{0} milliondan ulush</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} foiz</unitPattern>
 				<unitPattern count="other">{0} foiz</unitPattern>
@@ -4510,6 +4543,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} promiriada</unitPattern>
 				<unitPattern count="other">{0} promiriada</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>glyukoza</displayName>
+				<unitPattern count="one">{0} glyukoza</unitPattern>
+				<unitPattern count="other">{0} glyukoza</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/kilometr</displayName>
 				<unitPattern count="one">{0} litr/kilometr</unitPattern>
@@ -4872,6 +4910,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mm simob ustuni</unitPattern>
 				<unitPattern count="other">{0} mm simob ustuni</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>simob</displayName>
+				<unitPattern count="one">{0} simob</unitPattern>
+				<unitPattern count="other">{0} simob</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funt/duym kvadrat</displayName>
 				<unitPattern count="one">{0} funt/duym kvadrat</unitPattern>
@@ -5003,6 +5046,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} metrik piyola</unitPattern>
 				<unitPattern count="other">{0} metrik piyola</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrik suyuqlik unsiyasi</displayName>
+				<unitPattern count="one">{0} metrik suyuqlik unsiyasi</unitPattern>
+				<unitPattern count="other">{0} metrik suyuqlik unsiyasi</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gallon</displayName>
 				<unitPattern count="one">{0} gallon</unitPattern>
@@ -5019,29 +5067,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ingliz suyuq unsiyasi</unitPattern>
 				<unitPattern count="other">{0} ingliz suyuq unsiyasi</unitPattern>
 			</unit>
-			<unit type="volume-dessert-spoon-imperial">
-				<displayName>imp. desert qoshiq</displayName>
-				<unitPattern count="one">{0} imp. desert qoshiq</unitPattern>
-				<unitPattern count="other">{0} imp. desert qoshiq</unitPattern>
-			</unit>
 			<unit type="volume-dram">
 				<displayName>draxma</displayName>
 				<unitPattern count="one">{0} draxma</unitPattern>
 				<unitPattern count="other">{0} draxma</unitPattern>
 			</unit>
-			<unit type="volume-quart-imperial">
-				<displayName>imp.kvarta</displayName>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="one">{0} steradian</unitPattern>
+				<unitPattern count="other">{0} steradian</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>qism/milliard</displayName>
-				<unitPattern count="one">{0} ta qism/milliard</unitPattern>
-				<unitPattern count="other">{0} ta qism/milliard</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="one">{0} katal</unitPattern>
+				<unitPattern count="other">{0} katal</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>kecha</displayName>
-				<unitPattern count="one">{0} kecha</unitPattern>
-				<unitPattern count="other">{0} kecha</unitPattern>
-				<perUnitPattern>{0}/kecha</perUnitPattern>
+			<unit type="electric-coulomb">
+				<displayName>kulon</displayName>
+				<unitPattern count="one">{0} kulon</unitPattern>
+				<unitPattern count="other">{0} kulon</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+				<unitPattern count="one">{0} farad</unitPattern>
+				<unitPattern count="other">{0} farad</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>genri</displayName>
+				<unitPattern count="one">{0} genri</unitPattern>
+				<unitPattern count="other">{0} genri</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simens</displayName>
+				<unitPattern count="one">{0} simens</unitPattern>
+				<unitPattern count="other">{0} simens</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kaloriya-IT</displayName>
+				<unitPattern count="one">{0} kaloriya-IT</unitPattern>
+				<unitPattern count="other">{0} kaloriya-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekkerel</displayName>
+				<unitPattern count="one">{0} bekkerel</unitPattern>
+				<unitPattern count="other">{0} bekkerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>zivert</displayName>
+				<unitPattern count="one">{0} zivert</unitPattern>
+				<unitPattern count="other">{0} zivert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Grey</displayName>
+				<unitPattern count="one">{0} grey</unitPattern>
+				<unitPattern count="other">{0} grey</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilogramm-kuch</displayName>
+				<unitPattern count="one">{0} kilogramm-kuch</unitPattern>
+				<unitPattern count="other">{0} kilogramm-kuch</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="one">{0} tesla</unitPattern>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veber</displayName>
+				<unitPattern count="one">{0} veber</unitPattern>
+				<unitPattern count="other">{0} veber</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>yorug‘lik</displayName>
+				<unitPattern count="one">{0} yorug‘lik tezligi</unitPattern>
+				<unitPattern count="other">{0} yorug‘lik tezligi</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>milliarddan ulush</displayName>
+				<unitPattern count="one">{0} milliarddan ulush</unitPattern>
+				<unitPattern count="other">{0} milliarddan ulush</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} sharqiy uzunlik</coordinateUnitPattern>
@@ -5138,7 +5242,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} element</unitPattern>
 				<unitPattern count="other">{0} ta element</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>qism</displayName>
+				<unitPattern count="one">{0} qismi</unitPattern>
+				<unitPattern count="other">{0} qismi</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>milliondan ulush</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -5150,6 +5259,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>promiriada</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/km</displayName>
 			</unit>
@@ -5542,6 +5656,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mmHg</unitPattern>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funt/dy.kv</displayName>
 				<unitPattern count="one">{0} funt/dy.kv</unitPattern>
@@ -5716,10 +5834,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} imp. kvarta</unitPattern>
 				<unitPattern count="other">{0} imp. kvarta</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>qism/milliard</displayName>
-				<unitPattern count="one">{0} ta qism/mlrd</unitPattern>
-				<unitPattern count="other">{0} ta qism/mlrd</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="one">{0} sr</unitPattern>
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="one">{0} C</unitPattern>
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="one">{0} F</unitPattern>
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="one">{0} H</unitPattern>
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="one">{0} S</unitPattern>
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Gr</displayName>
+				<unitPattern count="one">{0} Gr</unitPattern>
+				<unitPattern count="other">{0} Gr</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one">{0} T</unitPattern>
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one">{0} Wb</unitPattern>
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>yorug‘lik</displayName>
+				<unitPattern count="one">{0} yorug‘lik</unitPattern>
+				<unitPattern count="other">{0} yorug‘lik</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>milliarddan ulush</displayName>
+				<unitPattern count="one">{0} ppb</unitPattern>
+				<unitPattern count="other">{0} ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>kecha</displayName>
@@ -5760,7 +5937,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>qism</displayName>
+				<unitPattern count="one">{0} qismi</unitPattern>
+				<unitPattern count="other">{0} qismi</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -5768,6 +5950,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glk</displayName>
+				<unitPattern count="one">{0} Glk</unitPattern>
+				<unitPattern count="other">{0} Glk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}L/100km</unitPattern>
 				<unitPattern count="other">{0}L/100km</unitPattern>
@@ -5815,6 +6002,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} o.k.</unitPattern>
 				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="one">{0} Hg</unitPattern>
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<unitPattern count="one">{0} mi/h</unitPattern>
 				<unitPattern count="other">{0} mi/h</unitPattern>
@@ -5831,22 +6022,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}L</unitPattern>
 				<unitPattern count="other">{0}L</unitPattern>
 			</unit>
-			<unit type="volume-dessert-spoon-imperial">
-				<unitPattern count="one">{0} imp. desert qoshiq</unitPattern>
-				<unitPattern count="other">{0} imp. desert qoshiq</unitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
 			</unit>
-			<unit type="volume-quart-imperial">
-				<displayName>imp.kvarta</displayName>
+			<unit type="energy-gray">
+				<displayName>Gr</displayName>
+				<unitPattern count="one">{0} Gr</unitPattern>
+				<unitPattern count="other">{0} Gr</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>qism/milliard</displayName>
-				<unitPattern count="one">{0} ta qism/mlrd</unitPattern>
-				<unitPattern count="other">{0} ta qism/mlrd</unitPattern>
+			<unit type="speed-light-speed">
+				<displayName>yorug‘lik</displayName>
+				<unitPattern count="one">{0} yorug‘lik</unitPattern>
+				<unitPattern count="other">{0} yorug‘lik</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
+				<unitPattern count="one">{0}ppb</unitPattern>
+				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>kecha</displayName>
-				<unitPattern count="one">{0} kecha</unitPattern>
-				<unitPattern count="other">{0} kecha</unitPattern>
 				<perUnitPattern>{0}/nkecha</perUnitPattern>
 			</unit>
 		</unitLength>
diff --git a/make/data/cldr/common/main/uz_Arab.xml b/make/data/cldr/common/main/uz_Arab.xml
index c69396e1118..739972de648 100644
--- a/make/data/cldr/common/main/uz_Arab.xml
+++ b/make/data/cldr/common/main/uz_Arab.xml
@@ -215,6 +215,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/uz_Cyrl.xml b/make/data/cldr/common/main/uz_Cyrl.xml
index 6def99fbf5a..5e12f439c3b 100644
--- a/make/data/cldr/common/main/uz_Cyrl.xml
+++ b/make/data/cldr/common/main/uz_Cyrl.xml
@@ -1290,9 +1290,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ғарбий Африка вақти</generic>
-					<standard>Ғарбий Африка стандарт вақти</standard>
-					<daylight>Ғарбий Африка ёзги вақти</daylight>
+					<standard>Ғарбий Африка вақти</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1630,6 +1628,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гайана вақти</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайи-алеут стандарт вақти</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавайи-алеут вақти</generic>
@@ -2182,38 +2185,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one" draft="provisional">¤ 0минг</pattern>
-					<pattern type="1000" count="other" draft="provisional">¤ 0минг</pattern>
-					<pattern type="10000" count="one" draft="provisional">¤ 00минг</pattern>
-					<pattern type="10000" count="other" draft="provisional">¤ 00минг</pattern>
-					<pattern type="100000" count="one" draft="provisional">¤ 000минг</pattern>
-					<pattern type="100000" count="other" draft="provisional">¤ 000минг</pattern>
-					<pattern type="1000000" count="one" draft="provisional">¤ 0млн</pattern>
-					<pattern type="1000000" count="other" draft="provisional">¤ 0млн</pattern>
-					<pattern type="10000000" count="one" draft="provisional">¤ 00млн</pattern>
-					<pattern type="10000000" count="other" draft="provisional">¤ 00млн</pattern>
-					<pattern type="100000000" count="one" draft="provisional">¤ 000млн</pattern>
-					<pattern type="100000000" count="other" draft="provisional">¤ 000млн</pattern>
-					<pattern type="1000000000" count="one" draft="provisional">¤ 0млрд</pattern>
-					<pattern type="1000000000" count="other" draft="provisional">¤ 0млрд</pattern>
-					<pattern type="10000000000" count="one" draft="provisional">¤ 00млрд</pattern>
-					<pattern type="10000000000" count="other" draft="provisional">¤ 00млрд</pattern>
-					<pattern type="100000000000" count="one" draft="provisional">¤ 000млрд</pattern>
-					<pattern type="100000000000" count="other" draft="provisional">¤ 000млрд</pattern>
-					<pattern type="1000000000000" count="one" draft="provisional">¤ 0трлн</pattern>
-					<pattern type="1000000000000" count="other" draft="provisional">¤ 0трлн</pattern>
-					<pattern type="10000000000000" count="one" draft="provisional">¤ 00трлн</pattern>
-					<pattern type="10000000000000" count="other" draft="provisional">¤ 00трлн</pattern>
-					<pattern type="100000000000000" count="one" draft="provisional">¤ 000трлн</pattern>
-					<pattern type="100000000000000" count="other" draft="provisional">¤ 000трлн</pattern>
+					<pattern type="1000" count="one">0минг ¤</pattern>
+					<pattern type="1000" count="other">0минг ¤</pattern>
+					<pattern type="10000" count="one">00минг ¤</pattern>
+					<pattern type="10000" count="other">00минг ¤</pattern>
+					<pattern type="100000" count="one">000минг ¤</pattern>
+					<pattern type="100000" count="other">000минг ¤</pattern>
+					<pattern type="1000000" count="one">0млн ¤</pattern>
+					<pattern type="1000000" count="other">0млн ¤</pattern>
+					<pattern type="10000000" count="one">00млн ¤</pattern>
+					<pattern type="10000000" count="other">00млн ¤</pattern>
+					<pattern type="100000000" count="one">000млн ¤</pattern>
+					<pattern type="100000000" count="other">000млн ¤</pattern>
+					<pattern type="1000000000" count="one">0млрд ¤</pattern>
+					<pattern type="1000000000" count="other">0млрд ¤</pattern>
+					<pattern type="10000000000" count="one">00млрд ¤</pattern>
+					<pattern type="10000000000" count="other">00млрд ¤</pattern>
+					<pattern type="100000000000" count="one">000млрд ¤</pattern>
+					<pattern type="100000000000" count="other">000млрд ¤</pattern>
+					<pattern type="1000000000000" count="one">0трлн ¤</pattern>
+					<pattern type="1000000000000" count="other">0трлн ¤</pattern>
+					<pattern type="10000000000000" count="one">00трлн ¤</pattern>
+					<pattern type="10000000000000" count="other">00трлн ¤</pattern>
+					<pattern type="100000000000000" count="one">000трлн ¤</pattern>
+					<pattern type="100000000000000" count="other">000трлн ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/vec.xml b/make/data/cldr/common/main/vec.xml
index df905e32262..b73420ede1a 100644
--- a/make/data/cldr/common/main/vec.xml
+++ b/make/data/cldr/common/main/vec.xml
@@ -1028,6 +1028,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="ethiopic">lunaro etiòpego</type>
 			<type key="calendar" type="ethiopic-amete-alem">lunaro etiòpego (amete alem)</type>
 			<type key="calendar" type="gregorian">lunaro gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">gregorian</type>
 			<type key="calendar" type="hebrew">lunaro ebràego</type>
 			<type key="calendar" type="islamic">lunaro izlàmego</type>
 			<type key="calendar" type="islamic-civil">lunaro izlàmego (tabular)</type>
@@ -1041,6 +1042,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="ducet">òrdane predefenìo Unicode</type>
 			<type key="collation" type="search">reserca jenèrega</type>
 			<type key="collation" type="standard">òrdane standard</type>
+			<type key="collation" type="standard" scope="core">standard</type>
 			<type key="hc" type="h11">sistema a 12 ore (0–11)</type>
 			<type key="hc" type="h12">sistema a 12 ore (1–12)</type>
 			<type key="hc" type="h23">sistema a 24 ore (0–23)</type>
@@ -1141,6 +1143,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'le' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'le' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1149,6 +1154,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'a' 'le' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'a' 'le' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1163,10 +1171,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
+						<dateFormatItem id="Hv">'h'HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1502,7 +1513,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd/MM/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E dd/MM/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem>
@@ -1510,6 +1523,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="Hmsv">HH:mm:ss (v)</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a (v)</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm (v)</dateFormatItem>
+						<dateFormatItem id="Hv">'h'HH v</dateFormatItem>
 						<dateFormatItem id="Md">dd/MM</dateFormatItem>
 						<dateFormatItem id="MEd">E dd/MM</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -2301,6 +2315,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<gmtFormat>UTC{0}</gmtFormat>
 			<gmtZeroFormat>UTC</gmtZeroFormat>
+			<gmtUnknownFormat>UTC+?</gmtUnknownFormat>
 			<regionFormat>Ora {0}</regionFormat>
 			<regionFormat type="daylight">Ora d’istà {0}</regionFormat>
 			<regionFormat type="standard">Ora normale {0}</regionFormat>
@@ -2584,7 +2599,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Pnom Pen</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>Atolo Canton</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3008,9 +3023,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Ora de l’Àfrega osidentale</generic>
-					<standard>Ora normale de l’Àfrega osidentale</standard>
-					<daylight>Ora d’istà de l’Àfrega osidentale</daylight>
+					<standard>Ora de l’Àfrega osidentale</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3360,6 +3373,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora de la Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Ora normale de Hawai e Aleutine</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Ora de Hawai e Aleutine</generic>
@@ -3927,34 +3945,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="one">0</pattern>
-					<pattern type="1000" count="other">0</pattern>
-					<pattern type="10000" count="one">0</pattern>
-					<pattern type="10000" count="other">0</pattern>
-					<pattern type="100000" count="one">0</pattern>
-					<pattern type="100000" count="other">0</pattern>
-					<pattern type="1000000" count="one">0 mln ¤</pattern>
-					<pattern type="1000000" count="other">0 mln ¤</pattern>
-					<pattern type="10000000" count="one">00 mln ¤</pattern>
-					<pattern type="10000000" count="other">00 mln ¤</pattern>
-					<pattern type="100000000" count="one">000 mln ¤</pattern>
-					<pattern type="100000000" count="other">000 mln ¤</pattern>
-					<pattern type="1000000000" count="one">0 mld ¤</pattern>
-					<pattern type="1000000000" count="other">0 mld ¤</pattern>
-					<pattern type="10000000000" count="one">00 mld ¤</pattern>
-					<pattern type="10000000000" count="other">00 mld ¤</pattern>
-					<pattern type="100000000000" count="one">000 mld ¤</pattern>
-					<pattern type="100000000000" count="other">000 mld ¤</pattern>
-					<pattern type="1000000000000" count="one">0 bln ¤</pattern>
-					<pattern type="1000000000000" count="other">0 bln ¤</pattern>
-					<pattern type="10000000000000" count="one">00 bln ¤</pattern>
-					<pattern type="10000000000000" count="other">00 bln ¤</pattern>
-					<pattern type="100000000000000" count="one">000 bln ¤</pattern>
-					<pattern type="100000000000000" count="other">000 bln ¤</pattern>
+					<pattern type="1000" count="other">0 mila ¤</pattern>
+					<pattern type="10000" count="one">00 mila ¤</pattern>
+					<pattern type="10000" count="other">00 mila ¤</pattern>
+					<pattern type="100000" count="one">000 mila ¤</pattern>
+					<pattern type="100000" count="other">000 mila ¤</pattern>
+					<pattern type="1000000" count="one">0 mln ¤</pattern>
+					<pattern type="1000000" count="other">0 mln ¤</pattern>
+					<pattern type="10000000" count="one">00 mln ¤</pattern>
+					<pattern type="10000000" count="other">00 mln ¤</pattern>
+					<pattern type="100000000" count="one">000 mln ¤</pattern>
+					<pattern type="100000000" count="other">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one">0 mld ¤</pattern>
+					<pattern type="1000000000" count="other">0 mld ¤</pattern>
+					<pattern type="10000000000" count="one">00 mld ¤</pattern>
+					<pattern type="10000000000" count="other">00 mld ¤</pattern>
+					<pattern type="100000000000" count="one">000 mld ¤</pattern>
+					<pattern type="100000000000" count="other">000 mld ¤</pattern>
+					<pattern type="1000000000000" count="one">0 bln ¤</pattern>
+					<pattern type="1000000000000" count="other">0 bln ¤</pattern>
+					<pattern type="10000000000000" count="one">00 bln ¤</pattern>
+					<pattern type="10000000000000" count="other">00 bln ¤</pattern>
+					<pattern type="100000000000000" count="one">000 bln ¤</pattern>
+					<pattern type="100000000000000" count="other">000 bln ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -4737,6 +4759,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="other">dòlari caraìbeghi</displayName>
 				<symbol draft="contributed">XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>fiorin caraìbego</displayName>
+				<displayName count="one">fiorin caraìbego</displayName>
+				<displayName count="other">fiorini caraìbeghi</displayName>
+				<symbol>Cf</symbol>
+			</currency>
 			<currency type="XOF">
 				<displayName>franco CFA de l’Àfrega osidentale</displayName>
 				<displayName count="one">franco CFA de l’Àfrega osidentale</displayName>
@@ -4769,6 +4797,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">kwacha zanbian</displayName>
 				<displayName count="other">kwacha zanbiani</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>oro de Zimbabwe</displayName>
+				<displayName count="one">oro de Zimbabwe</displayName>
+				<displayName count="other">ori de Zimbabwe</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="range">{0}-{1}</pattern>
diff --git a/make/data/cldr/common/main/vi.xml b/make/data/cldr/common/main/vi.xml
index 3f709432953..fa08b4ff0b5 100644
--- a/make/data/cldr/common/main/vi.xml
+++ b/make/data/cldr/common/main/vi.xml
@@ -57,7 +57,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">Tiếng Azerbaijan</language>
 			<language type="az" alt="short">Tiếng Azeri</language>
 			<language type="ba">Tiếng Bashkir</language>
-			<language type="bal">Tiếng Baluchi</language>
+			<language type="bal">Tiếng Baloch</language>
 			<language type="ban">Tiếng Bali</language>
 			<language type="bar">Tiếng Bavaria</language>
 			<language type="bas">Tiếng Basaa</language>
@@ -312,6 +312,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">Tiếng Bafia</language>
 			<language type="ksh">Tiếng Cologne</language>
 			<language type="ku">Tiếng Kurd</language>
+			<language type="ku" menu="core">Tiếng Kurd</language>
+			<language type="ku" menu="extension">Tiếng Kurmanji</language>
 			<language type="kum">Tiếng Kumyk</language>
 			<language type="kut">Tiếng Kutenai</language>
 			<language type="kv">Tiếng Komi</language>
@@ -412,7 +414,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="non">Tiếng Na Uy cổ</language>
 			<language type="nqo">Tiếng N’Ko</language>
 			<language type="nr">Tiếng Ndebele Miền Nam</language>
-			<language type="nso">Tiếng Sotho Miền Bắc</language>
+			<language type="nso">Tiếng Bắc Sotho</language>
 			<language type="nus">Tiếng Nuer</language>
 			<language type="nv">Tiếng Navajo</language>
 			<language type="nwc">Tiếng Newari cổ</language>
@@ -515,7 +517,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="srr">Tiếng Serer</language>
 			<language type="ss">Tiếng Swati</language>
 			<language type="ssy">Tiếng Saho</language>
-			<language type="st">Tiếng Sotho Miền Nam</language>
+			<language type="st">Tiếng Nam Sotho</language>
 			<language type="str">Tiếng Straits Salish</language>
 			<language type="su">Tiếng Sunda</language>
 			<language type="suk">Tiếng Sukuma</language>
@@ -833,7 +835,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="AR">Argentina</territory>
 			<territory type="AS">Samoa thuộc Mỹ</territory>
 			<territory type="AT">Áo</territory>
-			<territory type="AU">Australia</territory>
+			<territory type="AU">Úc</territory>
 			<territory type="AW">Aruba</territory>
 			<territory type="AX">Quần đảo Åland</territory>
 			<territory type="AZ">Azerbaijan</territory>
@@ -874,6 +876,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Trung Quốc</territory>
 			<territory type="CO">Colombia</territory>
 			<territory type="CP">Đảo Clipperton</territory>
+			<territory type="CQ">Sark</territory>
 			<territory type="CR">Costa Rica</territory>
 			<territory type="CU">Cuba</territory>
 			<territory type="CV">Cape Verde</territory>
@@ -1166,35 +1169,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Sắp xếp theo số</key>
 			<key type="colStrength">Cường độ sắp xếp</key>
 			<key type="currency">Tiền tệ</key>
+			<key type="em">Trình bày emoji</key>
 			<key type="hc">Chu kỳ giờ (12 với 24)</key>
 			<key type="lb">Kiểu xuống dòng</key>
+			<key type="lw">Ngắt dòng trong từ</key>
 			<key type="ms">Hệ thống đo lường</key>
 			<key type="numbers">Số</key>
+			<key type="ss">Ngắt câu sau khi viết tắt.</key>
 			<key type="timezone">Múi giờ</key>
 			<key type="va">Biến thể ngôn ngữ</key>
 			<key type="x">Sử dụng cá nhân</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Lịch Phật Giáo</type>
+			<type key="calendar" type="buddhist" scope="core">Phật giáo</type>
 			<type key="calendar" type="chinese">Lịch Trung Quốc</type>
+			<type key="calendar" type="chinese" scope="core">Trung Quốc</type>
 			<type key="calendar" type="coptic">Lịch Copts</type>
+			<type key="calendar" type="coptic" scope="core">Copts</type>
 			<type key="calendar" type="dangi">Lịch Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Lịch Ethiopia</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">Lịch Ethiopic Amete Alem</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">Lịch Gregory</type>
+			<type key="calendar" type="gregorian" scope="core">Gregory</type>
 			<type key="calendar" type="hebrew">Lịch Do Thái</type>
+			<type key="calendar" type="hebrew" scope="core">Do Thái</type>
 			<type key="calendar" type="indian">Lịch Quốc gia Ấn Độ</type>
 			<type key="calendar" type="islamic">Lịch Hồi Giáo</type>
+			<type key="calendar" type="islamic" scope="core">Hồi giáo</type>
 			<type key="calendar" type="islamic-civil">Lịch Hồi Giáo (dạng bảng, kỷ nguyên dân sự)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hồi giáo (dạng bảng, kỷ nguyên dân sự)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Lịch Hồi Giáo - Ả Rập Xê-út</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">Lịch Hồi Giáo - Thiên văn</type>
 			<type key="calendar" type="islamic-umalqura">Lịch Hồi Giáo (Umm al-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hồi giáo (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Lịch ISO-8601</type>
 			<type key="calendar" type="japanese">Lịch Nhật Bản</type>
+			<type key="calendar" type="japanese" scope="core">Nhật Bản</type>
 			<type key="calendar" type="persian">Lịch Ba Tư</type>
+			<type key="calendar" type="persian" scope="core">Ba Tư</type>
 			<type key="calendar" type="roc">Lịch Trung Hoa Dân Quốc</type>
+			<type key="calendar" type="roc" scope="core">Trung Hoa Dân Quốc</type>
 			<type key="cf" type="account">Định dạng tiền tệ kế toán</type>
+			<type key="cf" type="account" scope="core">Kế toán</type>
 			<type key="cf" type="standard">Định dạng tiền tệ chuẩn</type>
+			<type key="cf" type="standard" scope="core">Chuẩn</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">Sắp xếp biểu tượng</type>
 			<type key="colAlternate" type="shifted" draft="contributed">Sắp xếp biểu tượng bỏ qua</type>
 			<type key="colBackwards" type="no" draft="contributed">Sắp xếp dấu trọng âm bình thường</type>
@@ -1204,23 +1226,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Sắp xếp chữ hoa đầu tiên</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Sắp xếp không phân biệt chữ hoa/chữ thường</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Sắp xếp phân biệt chữ hoa/chữ thường</type>
-			<type key="collation" type="big5han">Thứ tự sắp xếp theo tiếng Trung phồn thể - Big5</type>
 			<type key="collation" type="compat">Thứ tự sắp xếp trước đây, để tương thích</type>
+			<type key="collation" type="compat" scope="core">Khả năng tương thích</type>
 			<type key="collation" type="dictionary">Thứ tự sắp xếp theo từ điển</type>
+			<type key="collation" type="dictionary" scope="core">Từ điển</type>
 			<type key="collation" type="ducet">Thứ tự sắp xếp unicode mặc định</type>
+			<type key="collation" type="ducet" scope="core">Unicode mặc định</type>
 			<type key="collation" type="emoji" draft="contributed">Thứ tự sắp xếp biểu tượng</type>
 			<type key="collation" type="eor" draft="contributed">Quy tắc sắp xếp Châu Âu</type>
-			<type key="collation" type="gb2312han">Thứ tự sắp xếp theo tiếng Trung giản thể - GB2312</type>
 			<type key="collation" type="phonebook">Thứ tự sắp xếp theo danh bạ điện thoại</type>
+			<type key="collation" type="phonebook" scope="core">Danh bạ điện thoại</type>
 			<type key="collation" type="phonetic">Thứ tự sắp xếp theo ngữ âm</type>
+			<type key="collation" type="phonetic" scope="core">Ngữ âm</type>
 			<type key="collation" type="pinyin">Thứ tự sắp xếp theo bính âm</type>
+			<type key="collation" type="pinyin" scope="core">Bính âm</type>
 			<type key="collation" type="search">Tìm kiếm mục đích chung</type>
+			<type key="collation" type="search" scope="core">Tìm kiếm</type>
 			<type key="collation" type="searchjl" draft="contributed">Tìm kiếm theo Phụ âm Đầu Hangul</type>
 			<type key="collation" type="standard">Thứ tự sắp xếp chuẩn</type>
+			<type key="collation" type="standard" scope="core">Chuẩn</type>
 			<type key="collation" type="stroke">Thứ tự sắp xếp theo nét chữ</type>
+			<type key="collation" type="stroke" scope="core">Nét chữ</type>
 			<type key="collation" type="traditional">Thứ tự sắp xếp truyền thống</type>
+			<type key="collation" type="traditional" scope="core">Truyền thống</type>
 			<type key="collation" type="unihan">Trình tự sắp xếp theo bộ-nét</type>
+			<type key="collation" type="unihan" scope="core">Bộ-nét</type>
 			<type key="collation" type="zhuyin">Thứ tự sắp xếp theo chú âm phù hiệu</type>
+			<type key="collation" type="zhuyin" scope="core">Chú âm phù hiệu</type>
 			<type key="colNormalization" type="no" draft="contributed">Sắp xếp không theo chuẩn hóa</type>
 			<type key="colNormalization" type="yes" draft="contributed">Sắp xếp unicode được chuẩn hóa</type>
 			<type key="colNumeric" type="no" draft="contributed">Sắp xếp từng chữ số</type>
@@ -1233,18 +1265,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">Độ rộng tối đa</type>
 			<type key="d0" type="hwidth">Nửa độ rộng</type>
 			<type key="d0" type="npinyin" draft="contributed">Số</type>
+			<type key="em" type="default" scope="core">Mặc định</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Văn bản</type>
 			<type key="hc" type="h11">Hệ thống 12 giờ (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Hệ thống 12 giờ (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Hệ thống 24 giờ (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Hệ thống 24 giờ (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Kiểu xuống dòng thoáng</type>
+			<type key="lb" type="loose" scope="core">Thoáng</type>
 			<type key="lb" type="normal">Kiểu xuống dòng thường</type>
+			<type key="lb" type="normal" scope="core">Bình thường</type>
 			<type key="lb" type="strict">Kiểu xuống dòng hẹp</type>
+			<type key="lb" type="strict" scope="core">Hẹp</type>
+			<type key="lw" type="breakall" scope="core">Ngắt tất cả</type>
+			<type key="lw" type="keepall" scope="core">Giữ tất cả</type>
+			<type key="lw" type="normal" scope="core">Bình thường</type>
+			<type key="lw" type="phrase" scope="core">Giữ trong cụm từ</type>
 			<type key="m0" type="bgn">Chuyển tự US BGN</type>
 			<type key="m0" type="ungegn">Chuyển tự UN GEGN</type>
 			<type key="ms" type="metric">Hệ mét</type>
+			<type key="ms" type="metric" scope="core">Mét</type>
 			<type key="ms" type="uksystem">Hệ đo lường Anh</type>
+			<type key="ms" type="uksystem" scope="core">Anh</type>
 			<type key="ms" type="ussystem">Hệ đo lường Mỹ</type>
+			<type key="ms" type="ussystem" scope="core">Mỹ</type>
 			<type key="numbers" type="ahom" draft="contributed">Chữ số Ahom</type>
 			<type key="numbers" type="arab">Chữ số Ả Rập - Ấn Độ</type>
 			<type key="numbers" type="arabext">Chữ số Ả Rập - Ấn Độ mở rộng</type>
@@ -1326,6 +1375,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Chữ số Vai</type>
 			<type key="numbers" type="wara" draft="contributed">Chữ số Wara</type>
 			<type key="numbers" type="wcho" draft="contributed">Chữ số Wancho</type>
+			<type key="ss" type="none" scope="core">Tắt</type>
+			<type key="ss" type="standard" scope="core">Bật</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Hệ mét</measurementSystemName>
@@ -1352,9 +1403,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 		</parseLenients>
@@ -1597,6 +1645,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h 'giờ' B</dateFormatItem>
+						<dateFormatItem id="EBh">h 'giờ' B E</dateFormatItem>
 						<dateFormatItem id="EBhm">h:mm B E</dateFormatItem>
 						<dateFormatItem id="EBhms">h:mm:ss B E</dateFormatItem>
 						<dateFormatItem id="Ed">E, 'ngày' d</dateFormatItem>
@@ -1706,69 +1755,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B" draft="contributed">h B – h B</greatestDifference>
 							<greatestDifference id="h" draft="contributed">h – h B</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B" draft="contributed">h:mm B – h:mm B</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a" draft="contributed">h a – h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a" draft="contributed">h:mm a – h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">h a – h a v</greatestDifference>
-							<greatestDifference id="h" draft="contributed">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d" draft="contributed">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d" draft="contributed">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M" draft="contributed">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d" draft="contributed">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M" draft="contributed">y-MM – y-MM</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd – y-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y" draft="contributed">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y" draft="contributed">U MMM – U MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M" draft="contributed">U MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y" draft="contributed">U MMM d – U MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d" draft="contributed">U MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M" draft="contributed">U MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="y" draft="contributed">U MMM d, E – U MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y" draft="contributed">U MMMM – U MMMM</greatestDifference>
-						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -1828,6 +1822,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>'lúc' {0} {1}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>'lúc' {0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1836,6 +1833,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>'lúc' {0} {1}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>'lúc' {0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1849,22 +1849,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h 'giờ' B</dateFormatItem>
+						<dateFormatItem id="EBh">h 'giờ' B E</dateFormatItem>
 						<dateFormatItem id="EBhm">h:mm B E</dateFormatItem>
 						<dateFormatItem id="EBhms">h:mm:ss B E</dateFormatItem>
 						<dateFormatItem id="Ed">E, 'ngày' d</dateFormatItem>
+						<dateFormatItem id="Eh">h a E</dateFormatItem>
 						<dateFormatItem id="Ehm">h:mm a E</dateFormatItem>
 						<dateFormatItem id="EHm">HH:mm E</dateFormatItem>
 						<dateFormatItem id="Ehms">h:mm:ss a E</dateFormatItem>
 						<dateFormatItem id="EHms">HH:mm:ss E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH 'giờ'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hv">h 'giờ' a v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd" draft="contributed">dd-MM</dateFormatItem>
@@ -1891,7 +1895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h – h 'giờ' B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
-							<greatestDifference id="B">h:mm B – h:mm B</greatestDifference>
 							<greatestDifference id="h">h:mm – h:mm B</greatestDifference>
 							<greatestDifference id="m">h:mm – h:mm B</greatestDifference>
 						</intervalFormatItem>
@@ -2084,12 +2087,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dayContext type="format">
 						<dayWidth type="abbreviated">
 							<day type="sun">CN</day>
-							<day type="mon">Th 2</day>
-							<day type="tue">Th 3</day>
-							<day type="wed">Th 4</day>
-							<day type="thu">Th 5</day>
-							<day type="fri">Th 6</day>
-							<day type="sat">Th 7</day>
+							<day type="mon">Thứ 2</day>
+							<day type="tue">Thứ 3</day>
+							<day type="wed">Thứ 4</day>
+							<day type="thu">Thứ 5</day>
+							<day type="fri">Thứ 6</day>
+							<day type="sat">Thứ 7</day>
 						</dayWidth>
 						<dayWidth type="short">
 							<day type="sun">CN</day>
@@ -2253,6 +2256,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>'lúc' {0} {1}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>'lúc' {0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2261,6 +2267,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>'lúc' {0} {1}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>'lúc' {0} {1}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2274,25 +2283,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">h 'giờ' B</dateFormatItem>
+						<dateFormatItem id="EBh">h 'giờ' B E</dateFormatItem>
 						<dateFormatItem id="EBhm">h:mm B E</dateFormatItem>
 						<dateFormatItem id="EBhms">h:mm:ss B E</dateFormatItem>
 						<dateFormatItem id="Ed">E, 'ngày' d</dateFormatItem>
+						<dateFormatItem id="Eh">h 'giờ' a E</dateFormatItem>
 						<dateFormatItem id="Ehm">h:mm a E</dateFormatItem>
 						<dateFormatItem id="EHm">HH:mm E</dateFormatItem>
 						<dateFormatItem id="Ehms">h:mm:ss a E</dateFormatItem>
 						<dateFormatItem id="EHms">HH:mm:ss E</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="H">HH 'giờ'</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="hv">h 'giờ' a v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
@@ -2364,10 +2377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">E, d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="y">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -2378,10 +2387,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">'Tháng' M – M</greatestDifference>
 						</intervalFormatItem>
@@ -2818,11 +2823,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">Giờ mùa hè {0}</regionFormat>
 			<regionFormat type="standard">Giờ chuẩn {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic draft="contributed">Giờ HST</generic>
-					<standard draft="contributed">HST</standard>
-					<daylight draft="contributed">HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -2859,7 +2859,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Đảo Man</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
+				<exemplarCity>Đảo Canton</exemplarCity>
 			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Bình Nhưỡng</exemplarCity>
@@ -2938,9 +2938,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Giờ Tây Phi</generic>
-					<standard>Giờ Chuẩn Tây Phi</standard>
-					<daylight>Giờ Mùa Hè Tây Phi</daylight>
+					<standard>Giờ Tây Phi</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3358,6 +3356,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Giờ Chuẩn Hawaii-Aleut</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Giờ Hawaii-Aleut</generic>
@@ -3813,6 +3819,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ Chuuk</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic draft="contributed">Giờ Thổ Nhĩ Kỳ</generic>
+					<standard draft="contributed">Giờ Chuẩn Thổ Nhĩ Kỳ</standard>
+					<daylight draft="contributed">Giờ Mùa Hè Thổ Nhĩ Kỳ</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Giờ Turkmenistan</generic>
@@ -3944,10 +3957,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -4572,7 +4586,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</currency>
 			<currency type="MVP">
 				<displayName>Rupee Maldives (1947–1981)</displayName>
-				<displayName count="other">Rupee Maldives (1947–1981)</displayName>
 			</currency>
 			<currency type="MVR">
 				<displayName>Rufiyaa Maldives</displayName>
@@ -4928,6 +4941,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>Đô la Đông Caribê</displayName>
 				<displayName count="other">đô la Đông Caribê</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Guilder Caribe</displayName>
+				<displayName count="other">Guilder Caribe</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName draft="contributed">Quyền Rút vốn Đặc biệt</displayName>
 			</currency>
@@ -5007,6 +5024,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName draft="contributed">Đồng Đô la Zimbabwe (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwean Gold</displayName>
+				<displayName count="other">Zimbabwean Gold</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName draft="contributed">Đồng Đô la Zimbabwe (2009)</displayName>
 			</currency>
@@ -5186,9 +5207,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>carat</displayName>
 				<unitPattern count="other">{0} carat</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>phần</displayName>
+				<unitPattern count="other">{0} phần</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>phần triệu</displayName>
+				<unitPattern count="other">{0} phần triệu</unitPattern>
+			</unit>
 			<unit type="concentr-permyriad">
 				<unitPattern count="other">{0} phần vạn</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="other">{0} glucose</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>lít/km</displayName>
 				<unitPattern count="other">{0} lít/km</unitPattern>
@@ -5487,6 +5519,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>milimét thủy ngân</displayName>
 				<unitPattern count="other">{0} milimét thủy ngân</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>thuỷ ngân</displayName>
+				<unitPattern count="other">{0} thuỷ ngân</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>pound/inch vuông</displayName>
 				<unitPattern count="other">{0} pound/inch vuông</unitPattern>
@@ -5619,6 +5655,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>cup khối</displayName>
 				<unitPattern count="other">{0} cup khối</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ao-xơ chất lỏng hệ mét</displayName>
+				<unitPattern count="other">{0} ao-xơ chất lỏng hệ mét</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gallon</displayName>
 				<unitPattern count="other">{0} gallon</unitPattern>
@@ -5648,14 +5688,64 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>dram</displayName>
 				<unitPattern count="other">{0} dram</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>phần tỷ</displayName>
-				<unitPattern count="other">{0} phần tỷ</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
+				<unitPattern count="other">{0} steradian</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>đêm</displayName>
-				<unitPattern count="other">{0} đêm</unitPattern>
-				<perUnitPattern>{0}/đêm</perUnitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
+				<unitPattern count="other">{0} katal</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulomb</displayName>
+				<unitPattern count="other">{0} coulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>fara</displayName>
+				<unitPattern count="other">{0} fara</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henry</displayName>
+				<unitPattern count="other">{0} henry</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemen</displayName>
+				<unitPattern count="other">{0} siemen</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>calo [IT]</displayName>
+				<unitPattern count="other">{0} calo [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>becquerel</displayName>
+				<unitPattern count="other">{0} becquerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sievert</displayName>
+				<unitPattern count="other">{0} sievert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>gray</displayName>
+				<unitPattern count="other">{0} gray</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>lực kilôgam</displayName>
+				<unitPattern count="other">{0} lực kilôgam</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+				<unitPattern count="other">{0} tesla</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>weber</displayName>
+				<unitPattern count="other">{0} weber</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ánh sáng</displayName>
+				<unitPattern count="other">{0} ánh sáng</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="other">{0} phần tỷ</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>phương trời</displayName>
@@ -5693,9 +5783,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mục</displayName>
 				<unitPattern count="other">{0} mục</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>phần</displayName>
+				<unitPattern count="other">{0} phần</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>phần triệu</displayName>
+				<unitPattern count="other">{0} phần triệu</unitPattern>
+			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>phần vạn</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="other">{0} l/km</unitPattern>
@@ -5881,6 +5983,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-watt">
 				<displayName>W</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>of Hg</displayName>
+				<unitPattern count="other">{0} of Hg</unitPattern>
+			</unit>
 			<unit type="speed-mile-per-hour">
 				<unitPattern count="other">{0} mph</unitPattern>
 			</unit>
@@ -5889,6 +5995,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} L</unitPattern>
 				<perUnitPattern>{0}/L</perUnitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<displayName>gal</displayName>
 				<unitPattern count="other">{0} gal</unitPattern>
@@ -5946,8 +6055,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>lít Anh</displayName>
 				<unitPattern count="other">{0} lít Anh</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0} sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ánh sáng</displayName>
+				<unitPattern count="other">{0} ánh sáng</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>phần tỷ</displayName>
+				<unitPattern count="other">{0} phần tỷ</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>đêm</displayName>
@@ -5969,9 +6123,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-hectare">
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>phần</displayName>
+				<unitPattern count="other">{0} phần</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>phần triệu</displayName>
+				<unitPattern count="other">{0} phần triệu</unitPattern>
+			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="other">{0} Glc</unitPattern>
+			</unit>
 			<unit type="digital-petabyte">
 				<displayName>PB</displayName>
 			</unit>
@@ -5979,9 +6145,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>B</displayName>
 				<unitPattern count="other">{0} B</unitPattern>
 			</unit>
-			<unit type="duration-millisecond">
-				<unitPattern count="other">{0}miligiây</unitPattern>
-			</unit>
 			<unit type="energy-electronvolt">
 				<displayName>eV</displayName>
 			</unit>
@@ -6046,6 +6209,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="power-horsepower">
 				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">of Hg</displayName>
+				<unitPattern count="other" draft="contributed">{0} of Hg</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<unitPattern count="other">{0}&quot; Hg</unitPattern>
 			</unit>
@@ -6062,19 +6229,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}L</unitPattern>
 				<perUnitPattern>{0}/l</perUnitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<unitPattern count="other">{0} fl oz m.</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>{0}/gal</perUnitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<unitPattern count="other">{0} fl ozIm</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<unitPattern count="other">{0}ppb</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0} sr</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>đêm</displayName>
-				<unitPattern count="other">{0} đêm</unitPattern>
-				<perUnitPattern>{0}/đêm</perUnitPattern>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other">{0} C</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other">{0} F</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<unitPattern count="other">{0} H</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<unitPattern count="other">{0} S</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other">{0} Wb</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ánh sáng</displayName>
+				<unitPattern count="other">{0} ánh sáng</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="other">{0} phần tỷ</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -6141,7 +6350,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<characterLabel type="downwards_arrows">mũi tên hướng xuống</characterLabel>
 		<characterLabel type="downwards_upwards_arrows">mũi tên lên xuống</characterLabel>
 		<characterLabel type="east_asian_scripts">chữ viết Đông Á</characterLabel>
-		<characterLabel type="emoji">biểu tượng</characterLabel>
+		<characterLabel type="emoji">biểu tượng cảm xúc</characterLabel>
 		<characterLabel type="european_scripts">chữ viết Châu Âu</characterLabel>
 		<characterLabel type="female">nữ</characterLabel>
 		<characterLabel type="flag">cờ</characterLabel>
diff --git a/make/data/cldr/common/main/vmw.xml b/make/data/cldr/common/main/vmw.xml
index 0ee0670414f..f232efec747 100644
--- a/make/data/cldr/common/main/vmw.xml
+++ b/make/data/cldr/common/main/vmw.xml
@@ -80,7 +80,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMd" draft="contributed">d MMM y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback draft="contributed">{0} ‘mpakha’ {1}</intervalFormatFallback>
+						<intervalFormatFallback draft="contributed">{0} mpakha {1}</intervalFormatFallback>
 					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
@@ -106,6 +106,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="contributed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/vo.xml b/make/data/cldr/common/main/vo.xml
index 94fd4835ca3..3a121014dc1 100644
--- a/make/data/cldr/common/main/vo.xml
+++ b/make/data/cldr/common/main/vo.xml
@@ -78,7 +78,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern draft="unconfirmed">GGGGG y-MM-dd</pattern>
+							<pattern draft="unconfirmed">G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
diff --git a/make/data/cldr/common/main/wae.xml b/make/data/cldr/common/main/wae.xml
index ac04028d196..9009f112dbf 100644
--- a/make/data/cldr/common/main/wae.xml
+++ b/make/data/cldr/common/main/wae.xml
@@ -1354,7 +1354,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<symbols numberSystem="latn">
 			<decimal draft="contributed">,</decimal>
-			<group draft="contributed">’</group>
+			<group draft="contributed">'</group>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<unitPattern count="one" draft="contributed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/wal.xml b/make/data/cldr/common/main/wal.xml
index 70297ce0897..9be1f34aa0e 100644
--- a/make/data/cldr/common/main/wal.xml
+++ b/make/data/cldr/common/main/wal.xml
@@ -340,7 +340,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<traditional>ethi</traditional>
 		</otherNumberingSystems>
 		<symbols numberSystem="latn">
-			<group draft="unconfirmed">’</group>
+			<group draft="unconfirmed">'</group>
 		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
diff --git a/make/data/cldr/common/main/wo.xml b/make/data/cldr/common/main/wo.xml
index 5b75bfa0907..ba992d3bdf3 100644
--- a/make/data/cldr/common/main/wo.xml
+++ b/make/data/cldr/common/main/wo.xml
@@ -15,7 +15,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="af">Afrikaans</language>
 			<language type="am">Amharik</language>
 			<language type="ar">Arabic</language>
-			<language type="ar_001">Araab</language>
 			<language type="as">Asame</language>
 			<language type="az">Aserbayjane</language>
 			<language type="ba">Baskir</language>
@@ -277,6 +276,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Siin</territory>
 			<territory type="CO">Kolombi</territory>
 			<territory type="CP">Ile Clipperton</territory>
+			<territory type="CQ">Guernsey Pound</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kabo Werde</territory>
@@ -494,8 +494,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 		<types>
 			<type key="calendar" type="gregorian">Arminaatu Gregoriyee</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="iso8601">ISO-8601 Calendar</type>
 			<type key="collation" type="standard">SSO (Toftalin wiñ gën a xam)</type>
+			<type key="collation" type="standard" scope="core">Njàng miir</type>
 			<type key="numbers" type="latn">Siifari Tugal</type>
 		</types>
 		<measurementSystemNames>
@@ -767,7 +769,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1238,9 +1239,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Waxtu sowwu Afrique</generic>
-					<standard>Waxtu buñ miin ci sowwu Afrique</standard>
-					<daylight>Afrique du sowwu jant</daylight>
+					<standard>Waxtu sowwu Afrique</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1590,6 +1589,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Waxtu Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Waxtu buñ jagleel Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Waxtu Hawaii-Aleutian</generic>
@@ -2121,18 +2125,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0K</pattern>
-					<pattern type="10000" count="other">¤00K</pattern>
-					<pattern type="100000" count="other">¤000K</pattern>
-					<pattern type="1000000" count="other">¤0M</pattern>
-					<pattern type="10000000" count="other">¤00M</pattern>
-					<pattern type="100000000" count="other">¤000M</pattern>
-					<pattern type="1000000000" count="other">¤0B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="1000000000000" count="other">¤0T</pattern>
-					<pattern type="10000000000000" count="other">¤00T</pattern>
-					<pattern type="100000000000000" count="other">¤000T</pattern>
+					<pattern type="1000" count="other">¤ 0K</pattern>
+					<pattern type="10000" count="other">¤ 00K</pattern>
+					<pattern type="100000" count="other">¤ 000K</pattern>
+					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="100000000" count="other">¤ 000M</pattern>
+					<pattern type="1000000000" count="other">¤ 0B</pattern>
+					<pattern type="10000000000" count="other">¤ 00B</pattern>
+					<pattern type="100000000000" count="other">¤ 000B</pattern>
+					<pattern type="1000000000000" count="other">¤ 0T</pattern>
+					<pattern type="10000000000000" count="other">¤ 00T</pattern>
+					<pattern type="100000000000000" count="other">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2199,7 +2203,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BIF">
 				<displayName>Burundian Franc</displayName>
-				<displayName count="other">Burundian francs</displayName>
 			</currency>
 			<currency type="BMD">
 				<displayName>Vote BMD</displayName>
@@ -2207,7 +2210,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BND">
 				<displayName>Brunei Dollar</displayName>
-				<displayName count="other">Brunei dollars</displayName>
 			</currency>
 			<currency type="BOB">
 				<displayName>Bolivian Boliviano</displayName>
@@ -2223,7 +2225,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BTN">
 				<displayName>Bhutanese Ngultrum</displayName>
-				<displayName count="other">Bhutanese ngultrums</displayName>
 			</currency>
 			<currency type="BWP">
 				<displayName>Botswanan Pula</displayName>
@@ -2235,7 +2236,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="BZD">
 				<displayName>Belize Dollar</displayName>
-				<displayName count="other">Belize dollars</displayName>
 			</currency>
 			<currency type="CAD">
 				<displayName>Vote CAD</displayName>
@@ -2268,7 +2268,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="CRC">
 				<displayName>Costa Rican Colón</displayName>
-				<displayName count="other">Costa Rican colóns</displayName>
 			</currency>
 			<currency type="CUC">
 				<displayName>Cuban Convertible Peso</displayName>
@@ -2309,7 +2308,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrean Nakfa</displayName>
-				<displayName count="other">Eritrean nakfas</displayName>
 			</currency>
 			<currency type="ETB">
 				<displayName>Ethiopian Birr</displayName>
@@ -2317,7 +2315,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="EUR">
 				<displayName>Euro</displayName>
-				<displayName count="other">euro</displayName>
 			</currency>
 			<currency type="FJD">
 				<displayName>Fijian Dollar</displayName>
@@ -2333,7 +2330,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="GEL">
 				<displayName>Georgian Lari</displayName>
-				<displayName count="other">Georgian laris</displayName>
 			</currency>
 			<currency type="GHS">
 				<displayName>Ghanaian Cedi</displayName>
@@ -2422,7 +2418,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="KES">
 				<displayName>Kenyan Shilling</displayName>
-				<displayName count="other">Kenyan shillings</displayName>
 			</currency>
 			<currency type="KGS">
 				<displayName>Kyrgystani Som</displayName>
@@ -2434,7 +2429,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="KMF">
 				<displayName>Comorian Franc</displayName>
-				<displayName count="other">Comorian francs</displayName>
 			</currency>
 			<currency type="KPW">
 				<displayName>North Korean Won</displayName>
@@ -2466,7 +2460,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankan Rupee</displayName>
-				<displayName count="other">Sri Lankan rupees</displayName>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberian Dollar</displayName>
@@ -2482,7 +2475,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="MAD">
 				<displayName>Moroccan dirhams</displayName>
-				<displayName count="other">Moroccan dirhams</displayName>
 			</currency>
 			<currency type="MDL">
 				<displayName>Moldovan Leu</displayName>
@@ -2515,15 +2507,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="MUR">
 				<displayName>Mauritian Rupee</displayName>
-				<displayName count="other">Mauritian rupees</displayName>
 			</currency>
 			<currency type="MVR">
 				<displayName>Maldivian Rufiyaa</displayName>
-				<displayName count="other">Maldivian rufiyaas</displayName>
 			</currency>
 			<currency type="MWK">
 				<displayName>Malawian Kwacha</displayName>
-				<displayName count="other">Malawian kwachas</displayName>
 			</currency>
 			<currency type="MXN">
 				<displayName>Mexican Peso</displayName>
@@ -2556,7 +2545,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalese Rupee</displayName>
-				<displayName count="other">Nepalese rupees</displayName>
 			</currency>
 			<currency type="NZD">
 				<displayName>New Zealand Dollar</displayName>
@@ -2580,11 +2568,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="PHP">
 				<displayName>Philippine Peso</displayName>
-				<displayName count="other">Philippine pesos</displayName>
 			</currency>
 			<currency type="PKR">
 				<displayName>Pakistani Rupee</displayName>
-				<displayName count="other">Pakistani rupees</displayName>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polish Zloty</displayName>
@@ -2637,7 +2623,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapore Dollar</displayName>
-				<displayName count="other">Singapore dollars</displayName>
 			</currency>
 			<currency type="SHP">
 				<displayName>St. Helena Pound</displayName>
@@ -2677,7 +2662,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="THB">
 				<displayName>Thai Baht</displayName>
-				<displayName count="other">Thai baht</displayName>
 			</currency>
 			<currency type="TJS">
 				<displayName>Tajikistani Somoni</displayName>
@@ -2697,7 +2681,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="TRY">
 				<displayName>Turkish Lira</displayName>
-				<displayName count="other">Turkish Lira</displayName>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad &amp; Tobago Dollar</displayName>
@@ -2756,6 +2739,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>East Caribbean Dollar</displayName>
 				<displayName count="other">East Caribbean dollars</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Gildiye Karayib</displayName>
+				<displayName count="other">Gildiye Karayib</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Franc CFA bu Afrik Sowwu-jant</displayName>
 				<displayName count="other">Franc CFA yu Afrik Sowwu-jant</displayName>
@@ -2766,11 +2753,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="XXX">
 				<displayName>Xaalis buñ Xamul</displayName>
-				<displayName count="other">(xaalis buñ xamul)</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>Yemeni Rial</displayName>
-				<displayName count="other">Yemeni rials</displayName>
 			</currency>
 			<currency type="ZAR">
 				<displayName>South African Rand</displayName>
@@ -2780,6 +2765,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Zambian Kwacha</displayName>
 				<displayName count="other">Zambian kwachas</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwean ZiG</displayName>
+				<displayName count="other">Zimbabwean ZiG</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">⩾{0}</pattern>
diff --git a/make/data/cldr/common/main/xh.xml b/make/data/cldr/common/main/xh.xml
index e4dec18f57d..3bd9a1e8b15 100644
--- a/make/data/cldr/common/main/xh.xml
+++ b/make/data/cldr/common/main/xh.xml
@@ -16,21 +16,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="am">IsiAmharic</language>
 			<language type="ar">Isi-Arabhu</language>
 			<language type="ar_001">Isi-Arabhu (Sale mihla)</language>
-			<language type="as" draft="unconfirmed">isiAssamese</language>
-			<language type="az" draft="unconfirmed">Isi-Azerbaijani</language>
-			<language type="be" draft="unconfirmed">Isi-Belarusian</language>
-			<language type="bg" draft="unconfirmed">Isi-Bulgaria</language>
+			<language type="as">IsiAssamese</language>
+			<language type="az">Isi-Azerbaijani</language>
+			<language type="be">Isi-Belarusian</language>
+			<language type="bg">Isi-Bulgaria</language>
 			<language type="bn">IsiBangla</language>
-			<language type="br" draft="unconfirmed">Breton</language>
-			<language type="bs" draft="unconfirmed">Isi-Bosnia</language>
-			<language type="ca" draft="unconfirmed">Isi-Calatan</language>
-			<language type="cs" draft="unconfirmed">Isi-Czech</language>
-			<language type="cy" draft="unconfirmed">Isi-Welsh</language>
-			<language type="da" draft="unconfirmed">Isi-Danish</language>
+			<language type="br">IsiBreton</language>
+			<language type="bs">Isi-Bosnia</language>
+			<language type="ca">Isi-Calatan</language>
+			<language type="cs">Isi-Czech</language>
+			<language type="cy">Isi-Welsh</language>
+			<language type="da">Isi-Danish</language>
 			<language type="de">IsiJamani</language>
 			<language type="de_AT">IsiJamani Sase-Austria</language>
 			<language type="de_CH">IsiJamani Esiyi-High Swiss</language>
-			<language type="el" draft="unconfirmed">Isi-Greek</language>
+			<language type="el">Isi-Greek</language>
 			<language type="en">IsiNgesi</language>
 			<language type="en_AU">IsiNgesi Sase-Australia</language>
 			<language type="en_CA">IsiNgesi SaseKhanada</language>
@@ -38,99 +38,99 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en_GB" alt="short">IsiNgesi sase-UK</language>
 			<language type="en_US">Isingesi SaseMelika</language>
 			<language type="en_US" alt="short">IsiNgesi Sase-US</language>
-			<language type="eo" draft="unconfirmed">Isi-Esperanto</language>
+			<language type="eo">Isi-Esperanto</language>
 			<language type="es">Isi-Spanish</language>
 			<language type="es_419">IsiSpanish SaseLatin America</language>
 			<language type="es_ES">IsiSpanish SaseYurophu</language>
 			<language type="es_MX">IsiSpanish SaseMexico</language>
-			<language type="et" draft="unconfirmed">Isi-Estonian</language>
-			<language type="eu" draft="unconfirmed">Isi-Basque</language>
-			<language type="fa" draft="unconfirmed">Isi-Persia</language>
-			<language type="fi" draft="unconfirmed">Isi-Finnish</language>
-			<language type="fil" draft="unconfirmed">Isi-Taglog</language>
-			<language type="fo" draft="unconfirmed">Isi-Faroese</language>
+			<language type="et">Isi-Estonian</language>
+			<language type="eu">Isi-Basque</language>
+			<language type="fa">Isi-Persia</language>
+			<language type="fi">Isi-Finnish</language>
+			<language type="fil">Isi-Taglog</language>
+			<language type="fo">Isi-Faroese</language>
 			<language type="fr">IsiFrentshi</language>
 			<language type="fr_CA">IsiFrentshi SaseKhanada</language>
 			<language type="fr_CH">IsiFrentshi SaseSwitzerland</language>
-			<language type="fy" draft="unconfirmed">Isi-Frisian</language>
-			<language type="ga" draft="unconfirmed">Isi-Irish</language>
-			<language type="gd" draft="unconfirmed">Scots Gaelic</language>
-			<language type="gl" draft="unconfirmed">Isi-Galician</language>
+			<language type="fy">Isi-Frisian</language>
+			<language type="ga">Isi-Irish</language>
+			<language type="gd">Scots Gaelic</language>
+			<language type="gl">Isi-Galician</language>
 			<language type="gn" draft="unconfirmed">Guarani</language>
-			<language type="gu" draft="unconfirmed">Isi-Gujarati</language>
-			<language type="he" draft="unconfirmed">Isi-Hebrew</language>
+			<language type="gu">Isi-Gujarati</language>
+			<language type="he">Isi-Hebrew</language>
 			<language type="hi">IsiHindi</language>
 			<language type="hi_Latn">IsiHindi (Latin)</language>
 			<language type="hi_Latn" alt="variant">IsiHinglish</language>
-			<language type="hr" draft="unconfirmed">Isi-Croatia</language>
-			<language type="hu" draft="unconfirmed">Isi-Hungarian</language>
-			<language type="hy" draft="unconfirmed">isiArmenian</language>
-			<language type="ia" draft="unconfirmed">Interlingua</language>
+			<language type="hr">Isi-Croatia</language>
+			<language type="hu">Isi-Hungarian</language>
+			<language type="hy">IsiArmenia</language>
+			<language type="ia">Isi-Interlingua</language>
 			<language type="id">Isi-Indonesia</language>
-			<language type="ie" draft="unconfirmed">isiInterlingue</language>
-			<language type="is" draft="unconfirmed">Isi-Icelandic</language>
+			<language type="ie">Isi-Interlingue</language>
+			<language type="is">Isi-Icelandic</language>
 			<language type="it">IsiTaliyane</language>
 			<language type="ja">IsiJapan</language>
-			<language type="jv" draft="unconfirmed">Isi-Javanese</language>
-			<language type="ka" draft="unconfirmed">Isi-Georgia</language>
-			<language type="km" draft="unconfirmed">isiCambodia</language>
-			<language type="kn" draft="unconfirmed">Isi-Kannada</language>
+			<language type="jv">Isi-Javanese</language>
+			<language type="ka">Isi-Georgia</language>
+			<language type="km">IsiCambodia</language>
+			<language type="kn">Isi-Kannada</language>
 			<language type="ko">Isi-Korean</language>
-			<language type="ku" draft="unconfirmed">Kurdish</language>
-			<language type="ky" draft="unconfirmed">Kyrgyz</language>
+			<language type="ku">IsiKurdish</language>
+			<language type="ky">IsiKyrgz</language>
 			<language type="la" draft="unconfirmed">Isi-Latin</language>
 			<language type="ln" draft="unconfirmed">Iilwimi</language>
-			<language type="lo" draft="unconfirmed">IsiLoathian</language>
-			<language type="lt" draft="unconfirmed">Isi-Lithuanian</language>
-			<language type="lv" draft="unconfirmed">Isi-Latvian</language>
-			<language type="mk" draft="unconfirmed">Isi-Macedonian</language>
-			<language type="ml" draft="unconfirmed">Isi-Malayalam</language>
-			<language type="mn" draft="unconfirmed">IsiMongolian</language>
-			<language type="mr" draft="unconfirmed">Isi-Marathi</language>
-			<language type="ms" draft="unconfirmed">Isi-Malay</language>
-			<language type="mt" draft="unconfirmed">Isi-Maltese</language>
-			<language type="ne" draft="unconfirmed">Isi-Nepali</language>
+			<language type="lo">IsiLoathian</language>
+			<language type="lt">Isi-Lithuanian</language>
+			<language type="lv">Isi-Latvian</language>
+			<language type="mk">Isi-Macedonian</language>
+			<language type="ml">Isi-Malayalam</language>
+			<language type="mn">IsiMongolian</language>
+			<language type="mr">Isi-Marathi</language>
+			<language type="ms">Isi-Malay</language>
+			<language type="mt">Isi-Maltese</language>
+			<language type="ne">Isi-Nepali</language>
 			<language type="nl">IsiDatshi</language>
 			<language type="nl_BE">IsiFlemish</language>
-			<language type="nn" draft="unconfirmed">Isi-Norwegia (Nynorsk)</language>
-			<language type="no" draft="unconfirmed">Isi-Norwegian</language>
-			<language type="oc" draft="unconfirmed">Iso-Occitan</language>
-			<language type="or" draft="unconfirmed">Oriya</language>
-			<language type="pa" draft="unconfirmed">Isi-Punjabi</language>
+			<language type="nn">Isi-Norwegia (Nynorsk)</language>
+			<language type="no">Isi-Norwegian</language>
+			<language type="oc">Iso-Occitan</language>
+			<language type="or">Oriya</language>
+			<language type="pa">Isi-Punjabi</language>
 			<language type="pl">Isi-Polish</language>
-			<language type="ps" draft="unconfirmed">Pashto</language>
+			<language type="ps">IsiPashto</language>
 			<language type="pt">IsiPhuthukezi</language>
 			<language type="pt_BR">IsiPhuthukezi SaseBrazil</language>
 			<language type="pt_PT">IsiPhuthukezi SasePortugal</language>
-			<language type="ro" draft="unconfirmed">Isi-Romanian</language>
+			<language type="ro">Isi-Romanian</language>
 			<language type="ru">Isi-Russian</language>
-			<language type="sa" draft="unconfirmed">iSanskrit</language>
-			<language type="sd" draft="unconfirmed">isiSindhi</language>
+			<language type="sa">IsiSanskrit</language>
+			<language type="sd">IsiSindhi</language>
 			<language type="sh" draft="unconfirmed">Serbo-Croatian</language>
-			<language type="si" draft="unconfirmed">Isi-Sinhalese</language>
-			<language type="sk" draft="unconfirmed">Isi-Slovak</language>
-			<language type="sl" draft="unconfirmed">Isi-Slovenian</language>
-			<language type="so" draft="unconfirmed">IsiSomaliya</language>
+			<language type="si">Isi-Sinhalese</language>
+			<language type="sk">Isi-Slovak</language>
+			<language type="sl">Isi-Slovenian</language>
+			<language type="so">IsiSomaliya</language>
 			<language type="sq">IsiAlbania</language>
-			<language type="sr" draft="unconfirmed">Isi-Serbia</language>
-			<language type="st" draft="unconfirmed">Sesotho</language>
-			<language type="su" draft="unconfirmed">Isi-Sudanese</language>
-			<language type="sv" draft="unconfirmed">Isi-Swedish</language>
-			<language type="sw" draft="unconfirmed">Isi-Swahili</language>
-			<language type="ta" draft="unconfirmed">Isi-Tamil</language>
-			<language type="te" draft="unconfirmed">Isi-Telegu</language>
+			<language type="sr">Isi-Serbia</language>
+			<language type="st">Sesotho</language>
+			<language type="su">Isi-Sudanese</language>
+			<language type="sv">Isi-Swedish</language>
+			<language type="sw">Isi-Swahili</language>
+			<language type="ta">Isi-Tamil</language>
+			<language type="te">Isi-Telegu</language>
 			<language type="th">Isi-Thai</language>
-			<language type="ti" draft="unconfirmed">Isi-Tigrinya</language>
-			<language type="tk" draft="unconfirmed">Turkmen</language>
+			<language type="ti">Isi-Tigrinya</language>
+			<language type="tk">IsiTurkmen</language>
 			<language type="tlh" draft="unconfirmed">Klingon</language>
 			<language type="tr">Isi-Turkish</language>
 			<language type="tw" draft="unconfirmed">Twi</language>
-			<language type="ug" draft="unconfirmed">Isi Uighur</language>
-			<language type="uk" draft="unconfirmed">Isi-Ukranian</language>
-			<language type="und">Unknown language</language>
-			<language type="ur" draft="unconfirmed">Urdu</language>
-			<language type="uz" draft="unconfirmed">Isi-Uzbek</language>
-			<language type="vi" draft="unconfirmed">Isi-Vietnamese</language>
+			<language type="ug">Isi Uighur</language>
+			<language type="uk">Isi-Ukranian</language>
+			<language type="und">Ulwimi olungaziwayo</language>
+			<language type="ur">IsiUrdu</language>
+			<language type="uz">Isi-Uzbek</language>
+			<language type="vi">Isi-Vietnamese</language>
 			<language type="xh">IsiXhosa</language>
 			<language type="yi" draft="unconfirmed">Yiddish</language>
 			<language type="zh">IsiMandarin</language>
@@ -139,7 +139,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="zh_Hans" alt="long">IsiMandarin Esenziwe Lula</language>
 			<language type="zh_Hant">IsiTshayina Esiqhelekileyo</language>
 			<language type="zh_Hant" alt="long">IsiMandarin Esiqhelekileyo</language>
-			<language type="zu" draft="contributed">isiZulu</language>
+			<language type="zu">IsiZulu</language>
 		</languages>
 		<scripts>
 			<script type="Arab">Isi-Arabhu</script>
@@ -240,6 +240,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">ETshayina</territory>
 			<territory type="CO">EColombia</territory>
 			<territory type="CP">EClipperton Island</territory>
+			<territory type="CQ">ESark</territory>
 			<territory type="CR">ECosta Rica</territory>
 			<territory type="CU">ECuba</territory>
 			<territory type="CV">ECape Verde</territory>
@@ -466,9 +467,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="ZZ">Ingingqi Engaziwayo</territory>
 		</territories>
 		<types>
-			<type key="calendar" type="gregorian">Ngokwekhalenda YeGregorian</type>
-			<type key="calendar" type="iso8601">Ikhalenda ye-ISO-8601</type>
+			<type key="calendar" type="gregorian">Ngokwekhalenda KaGregorian</type>
+			<type key="calendar" type="gregorian" scope="core">IGregorian</type>
+			<type key="calendar" type="iso8601">Ikhalenda kaGregorian</type>
 			<type key="collation" type="standard">Standard Sort Order</type>
+			<type key="collation" type="standard" scope="core">Eqhelekileyo</type>
 			<type key="numbers" type="latn">Western Digits</type>
 		</types>
 		<codePatterns>
@@ -544,7 +547,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
@@ -620,7 +622,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
@@ -681,6 +682,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">Nov</month>
 							<month type="12">Dis</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">J</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">J</month>
+							<month type="7">J</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Janyuwari</month>
 							<month type="2">Februwari</month>
@@ -711,6 +726,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">Nov</month>
 							<month type="12">Dis</month>
 						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">J</month>
+							<month type="2">F</month>
+							<month type="3">M</month>
+							<month type="4">A</month>
+							<month type="5">M</month>
+							<month type="6">J</month>
+							<month type="7">J</month>
+							<month type="8">A</month>
+							<month type="9">S</month>
+							<month type="10">O</month>
+							<month type="11">N</month>
+							<month type="12">D</month>
+						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">Janyuwari</month>
 							<month type="2">Februwari</month>
@@ -740,7 +769,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">C</day>
-							<day type="mon">M</day>
+							<day type="mon">Mv</day>
 							<day type="tue">Sb</day>
 							<day type="wed">Tht</day>
 							<day type="thu">Sin</day>
@@ -769,7 +798,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">C</day>
-							<day type="mon">M</day>
+							<day type="mon">Mv</day>
 							<day type="tue">Sb</day>
 							<day type="wed">St</day>
 							<day type="thu">Sin</day>
@@ -796,7 +825,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</quarters>
 				<eras>
 					<eraNames>
+						<era type="0">Phambi KoKristu</era>
 						<era type="0" alt="variant">Phambi Kwexesha Eliqhelekileyo</era>
+						<era type="1">Anno Domino</era>
 						<era type="1" alt="variant">Ixesha Eliqhelekileyo</era>
 					</eraNames>
 					<eraAbbr>
@@ -855,42 +886,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1} 'ngo' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{1} 'kwi' {0}</pattern>
+							<pattern>{1} 'ngo' {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ngo' {0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyMd">M/d/y G</dateFormatItem>
-						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
-						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="one">'iveki' W 'ka' MMMM</dateFormatItem>
+						<dateFormatItem id="MMMMW" count="other">'iveki' W 'ka' MMMM</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">M/d/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
@@ -900,53 +941,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
 						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
 						<dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem>
+						<dateFormatItem id="yw" count="one">'iveki' w 'ka' Y</dateFormatItem>
+						<dateFormatItem id="yw" count="other">'iveki' w 'ka' Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="Gy">
-							<greatestDifference id="G">y G – y G</greatestDifference>
-							<greatestDifference id="y">y – y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
-							<greatestDifference id="M">M/y – M/y G</greatestDifference>
-							<greatestDifference id="y">M/y – M/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMd">
-							<greatestDifference id="d">M/d/y – M/d/y G</greatestDifference>
-							<greatestDifference id="G">M/d/y G – M/d/y G</greatestDifference>
-							<greatestDifference id="M">M/d/y – M/d/y G</greatestDifference>
-							<greatestDifference id="y">M/d/y – M/d/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, M/d/y – E, M/d/y G</greatestDifference>
-							<greatestDifference id="G">E, M/d/y G – E, M/d/y G</greatestDifference>
-							<greatestDifference id="M">E, M/d/y – E, M/d/y G</greatestDifference>
-							<greatestDifference id="y">E, M/d/y – E, M/d/y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
-							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMd">
-							<greatestDifference id="d">MMM d – d, y G</greatestDifference>
-							<greatestDifference id="G">MMM d, y G – MMM d, y G</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d, y G</greatestDifference>
-							<greatestDifference id="y">MMM d, y – MMM d, y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="G">E, MMM d, y G – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -955,9 +956,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<intervalFormatItem id="hmv">
 							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
 						</intervalFormatItem>
@@ -974,7 +972,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
@@ -1043,6 +1040,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="quarter">
 				<displayName>ikota</displayName>
+				<relative type="-1">ikota edlulileyo</relative>
+				<relative type="0">ikota esikuyo</relative>
+				<relative type="1">ikota elandelayp</relative>
 			</field>
 			<field type="quarter-short">
 				<displayName>kot.</displayName>
@@ -1097,11 +1097,117 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekday">
 				<displayName>usuku lweveki</displayName>
 			</field>
+			<field type="sun">
+				<relative type="-1">kwiCawa edlulileyo</relative>
+				<relative type="0">kule iCawa</relative>
+				<relative type="1">kwiCawa ezayo</relative>
+			</field>
+			<field type="sun-short">
+				<relative type="-1">kwiCawa edlulileyo</relative>
+				<relative type="0">kule iCawa</relative>
+				<relative type="1">kwiCawa ezayo</relative>
+			</field>
+			<field type="sun-narrow">
+				<relative type="-1">kwiCawa edlulileyo</relative>
+				<relative type="0">kule iCawa</relative>
+				<relative type="1">kwiCawa ezayo</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">uMvulo odlulileyo</relative>
+				<relative type="0">ngalo Mvulo</relative>
+				<relative type="1">ngoMvulo ozayi</relative>
+			</field>
+			<field type="mon-short">
+				<relative type="-1">uMvulo odlulileyo</relative>
+				<relative type="0">ngalo Mvulo</relative>
+				<relative type="1">ngoMvulo ozayi</relative>
+			</field>
+			<field type="mon-narrow">
+				<relative type="-1">uMvulo odlulileyo</relative>
+				<relative type="0">ngalo Mvulo</relative>
+				<relative type="1">ngoMvulo ozayi</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">ngoLwesibini odlulileyo</relative>
+				<relative type="0">ngalo uLwesibini</relative>
+				<relative type="1">ngoLwesibini ozayo</relative>
+			</field>
+			<field type="tue-short">
+				<relative type="-1">ngoLwesibini odlulileyo</relative>
+				<relative type="0">ngalo uLwesibini</relative>
+				<relative type="1">ngoLwesibini ozayo</relative>
+			</field>
+			<field type="tue-narrow">
+				<relative type="-1">ngoLwesibini odlulileyo</relative>
+				<relative type="0">ngalo uLwesibini</relative>
+				<relative type="1">ngoLwesibini ozayo</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">ngoLwesithathu odlulileyo</relative>
+				<relative type="0">ngalo Lwesithathu</relative>
+				<relative type="1">ngoLwesithathu ozayo</relative>
+			</field>
+			<field type="wed-short">
+				<relative type="-1">ngoLwesithathu odlulileyo</relative>
+				<relative type="0">ngalo Lwesithathu</relative>
+				<relative type="1">ngoLwesithathu ozayo</relative>
+			</field>
+			<field type="wed-narrow">
+				<relative type="-1">ngoLwesithathu odlulileyo</relative>
+				<relative type="0">ngalo Lwesithathu</relative>
+				<relative type="1">lwest ozay</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">ngoLwesine odlulileyo</relative>
+				<relative type="0">ngalo Lwesine</relative>
+				<relative type="1">ngoLwesine ozayo</relative>
+			</field>
+			<field type="thu-short">
+				<relative type="-1">ngoLwesine odlulileyo</relative>
+				<relative type="0">ngalo Lwesine</relative>
+				<relative type="1">ngoLwesine ozayo</relative>
+			</field>
+			<field type="thu-narrow">
+				<relative type="-1">ngoLwesine odlulileyo</relative>
+				<relative type="0">ngalo Lwesine</relative>
+				<relative type="1">ngoLwesine ozayo</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">ngoLwesihlanu odlulileyo</relative>
+				<relative type="0">ngalo Lwesihlanu</relative>
+				<relative type="1">ngoLwesihlanu ozayo</relative>
+			</field>
+			<field type="fri-short">
+				<relative type="-1">ngoLwesihlanu odlulileyo</relative>
+				<relative type="0">ngalo Lwesihlanu</relative>
+				<relative type="1">ngoLwesihlanu ozayo</relative>
+			</field>
+			<field type="fri-narrow">
+				<relative type="-1">ngoLwesihlanu odlulileyo</relative>
+				<relative type="0">ngalo Lwesihlanu</relative>
+				<relative type="1">ngoLwesihlanu ozayo</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">ngoMgqibelo odlulileyo</relative>
+				<relative type="0">ngalo Mgqibelo</relative>
+				<relative type="1">ngoMgqibelo ozayo</relative>
+			</field>
+			<field type="sat-short">
+				<relative type="-1">ngoMgqibelo odlulileyo</relative>
+				<relative type="0">ngalo Mgqibelo</relative>
+				<relative type="1">ngoMgqibelo ozayo</relative>
+			</field>
+			<field type="sat-narrow">
+				<relative type="-1">ngoMgqibelo odlulileyo</relative>
+				<relative type="0">ngalo Mgqibelo</relative>
+				<relative type="1">ngoMgqibelo ozayo</relative>
+			</field>
 			<field type="dayperiod">
 				<displayName>Kusasa/Emva kwemini</displayName>
 			</field>
 			<field type="hour">
 				<displayName>iyure</displayName>
+				<relative type="0">ngale yure</relative>
 			</field>
 			<field type="hour-short">
 				<displayName>yur.</displayName>
@@ -1111,6 +1217,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="minute">
 				<displayName>umzuzu</displayName>
+				<relative type="0">ngalo mzuzu</relative>
 			</field>
 			<field type="minute-short">
 				<displayName>umz.</displayName>
@@ -1120,6 +1227,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="second">
 				<displayName>umzuzwana</displayName>
+				<relative type="0">ngoku</relative>
 			</field>
 			<field type="second-short">
 				<displayName>zuzwa.</displayName>
@@ -1141,7 +1249,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown City</exemplarCity>
+				<exemplarCity>Indawo Engaziwayo</exemplarCity>
 			</zone>
 			<zone type="Europe/London">
 				<long>
@@ -1153,6 +1261,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Irish Standard Time</daylight>
 				</long>
 			</zone>
+			<zone type="Pacific/Enderbury">
+				<exemplarCity>ICanton Island</exemplarCity>
+			</zone>
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
 			</zone>
@@ -1190,9 +1301,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>West Africa Time</generic>
-					<standard>West Africa Standard Time</standard>
-					<daylight>West Africa Summer Time</daylight>
+					<standard>West Africa Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1542,6 +1651,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyana Time</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaii-Aleutian Standard Time</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaii-Aleutian Time</generic>
@@ -2050,7 +2164,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="one">¤0K</pattern>
+					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0K</pattern>
+					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0K</pattern>
+					<pattern type="10000" count="one">¤00K</pattern>
+					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00K</pattern>
+					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00K</pattern>
+					<pattern type="100000" count="one">¤000K</pattern>
+					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 000K</pattern>
+					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K</pattern>
+					<pattern type="1000000" count="one">¤0M</pattern>
+					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
+					<pattern type="10000000" count="one">¤00M</pattern>
+					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
+					<pattern type="100000000" count="one">¤000M</pattern>
+					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000M</pattern>
+					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
+					<pattern type="1000000000" count="one">¤0G</pattern>
+					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 0G</pattern>
+					<pattern type="1000000000" count="other">¤0G</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0G</pattern>
+					<pattern type="10000000000" count="one">¤00G</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 00G</pattern>
+					<pattern type="10000000000" count="other">¤00G</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00G</pattern>
+					<pattern type="100000000000" count="one">¤000G</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 000G</pattern>
+					<pattern type="100000000000" count="other">¤000G</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000G</pattern>
+					<pattern type="1000000000000" count="one">¤0T</pattern>
+					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0T</pattern>
+					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
+					<pattern type="10000000000000" count="one">¤00T</pattern>
+					<pattern type="10000000000000" count="one" alt="alphaNextToNumber">¤ 00T</pattern>
+					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
+					<pattern type="100000000000000" count="one">¤000T</pattern>
+					<pattern type="100000000000000" count="one" alt="alphaNextToNumber">¤ 000T</pattern>
+					<pattern type="100000000000000" count="other">¤000T</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -2818,6 +2983,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">East Caribbean dollar</displayName>
 				<displayName count="other">East Caribbean dollars</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>ICaribbean guilder</displayName>
+				<displayName count="one">ICaribbean guilder</displayName>
+				<displayName count="other">ICaribbean guilder</displayName>
+				<symbol draft="contributed">ICg.</symbol>
+			</currency>
 			<currency type="XOF">
 				<displayName>ICFA Franc yaseWest Africa</displayName>
 				<displayName count="one">ICFA franc yaseWest Africa</displayName>
@@ -2849,6 +3020,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName count="one">I-kwacha yaseZambia</displayName>
 				<displayName count="other">I-kwacha yaseZambia</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>IZimbabwean Gold</displayName>
+				<displayName count="one">IZimbabwean gold</displayName>
+				<displayName count="other">IZimbabwean gold</displayName>
+				<symbol draft="contributed">IZWG</symbol>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="one" draft="contributed">usuku {0}</pluralMinimalPairs>
@@ -2858,6 +3035,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</numbers>
 	<units>
 		<unitLength type="long">
+			<compoundUnit type="power2">
+				<compoundUnitPattern1 count="one">square {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">square {0}</compoundUnitPattern1>
+			</compoundUnit>
+			<compoundUnit type="power3">
+				<compoundUnitPattern1 count="one">cubic {0}</compoundUnitPattern1>
+				<compoundUnitPattern1 count="other">cubic {0}</compoundUnitPattern1>
+			</compoundUnit>
 			<coordinateUnit>
 				<displayName>cardinal direction</displayName>
 				<coordinateUnitPattern type="east">{0} east</coordinateUnitPattern>
@@ -2871,6 +3056,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="pressure-pascal">
+				<unitPattern count="one">{0} Pa</unitPattern>
+				<unitPattern count="other">{0}Pa</unitPattern>
+			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="south">{0}S</coordinateUnitPattern>
 			</coordinateUnit>
diff --git a/make/data/cldr/common/main/xnr.xml b/make/data/cldr/common/main/xnr.xml
index 1bc080f23d7..486f0f029c6 100644
--- a/make/data/cldr/common/main/xnr.xml
+++ b/make/data/cldr/common/main/xnr.xml
@@ -893,9 +893,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">चीनी गणतंत्र पंचांग</type>
 			<type key="cf" type="account">लेखांकन मुद्रा प्रारूप</type>
 			<type key="cf" type="standard">मानक मुद्रा प्रारूप</type>
-			<type key="collation" type="big5han">पारम्पारिक चीनी वर्गीकरण</type>
 			<type key="collation" type="ducet">डिफ़ॉल्ट यूनिकोड सॉर्ट क्रम</type>
-			<type key="collation" type="gb2312han">सरलीकृत चीनी वर्गीकरण</type>
 			<type key="collation" type="phonebook">फोनबुक छंटाई क्रम</type>
 			<type key="collation" type="pinyin">पिनयीन वर्गीकरण</type>
 			<type key="collation" type="search">सामान्य-उद्देश्य खोज</type>
@@ -906,7 +904,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="hc" type="h12">12 घंटेयां दी प्रणाली (1–12)</type>
 			<type key="hc" type="h23">24 घंटेयां दी प्रणाली (0–23)</type>
 			<type key="hc" type="h24">24 घंटेयां दी प्रणाली (1–24)</type>
-			<type key="lb" type="loose">ढीली लैंण विच्छेद शैली&lt;</type>
+			<type key="lb" type="loose">ढीली लैंण विच्छेद शैली</type>
 			<type key="lb" type="normal">सामान्य लैंण विच्छेद शैली</type>
 			<type key="lb" type="strict">सख्त लैंण विच्छेद शैली</type>
 			<type key="ms" type="metric">मेट्रिक प्रणाली</type>
@@ -2156,7 +2154,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>कायरो</exemplarCity>
 			</zone>
 			<zone type="Africa/El_Aaiun">
-				<exemplarCity>अल आइयून&lt;</exemplarCity>
+				<exemplarCity>अल आइयून</exemplarCity>
 			</zone>
 			<zone type="Africa/Asmera">
 				<exemplarCity>अस्मारा</exemplarCity>
@@ -2344,7 +2342,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>नोम पेन्ह</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity>कैंटन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3011,9 +3009,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>पश्चिम अफ़्रीका दा टैम</generic>
-					<standard>पश्चिम अफ़्रीका दा मानक टैम</standard>
-					<daylight>पश्चिम अफ़्रीका दी तोंदिया दा टैम</daylight>
+					<standard>पश्चिम अफ़्रीका दा टैम</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3363,6 +3359,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>गुयाना दा टैम</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हवाई–आल्यूशन दा मानक टैम</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हवाई–आल्यूशन दा टैम</generic>
@@ -3908,29 +3909,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">¤0 हज़ार</pattern>
-					<pattern type="10000" count="other">¤00 हज़ार</pattern>
+					<pattern type="1000" count="other">¤0 हजार</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0 हजार</pattern>
+					<pattern type="10000" count="other">¤00 हजार</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00 हजार</pattern>
 					<pattern type="100000" count="other">¤0 लख</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 0 लख</pattern>
 					<pattern type="1000000" count="other">¤00 लख</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 00 लख</pattern>
 					<pattern type="10000000" count="other">¤0 क॰</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0 क॰</pattern>
 					<pattern type="100000000" count="other">¤00 क॰</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 00 क॰</pattern>
 					<pattern type="1000000000" count="other">¤0 अ॰</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0 अ॰</pattern>
 					<pattern type="10000000000" count="other">¤00 अ॰</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00 अ॰</pattern>
 					<pattern type="100000000000" count="other">¤0 ख॰</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0 ख॰</pattern>
 					<pattern type="1000000000000" count="other">¤00 ख॰</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 00 ख॰</pattern>
 					<pattern type="10000000000000" count="other">¤0 नील</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 0 नील</pattern>
 					<pattern type="100000000000000" count="other">¤00 नील</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 00 नील</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
diff --git a/make/data/cldr/common/main/xog.xml b/make/data/cldr/common/main/xog.xml
index fc983490a00..9b83503d664 100644
--- a/make/data/cldr/common/main/xog.xml
+++ b/make/data/cldr/common/main/xog.xml
@@ -552,6 +552,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/yav.xml b/make/data/cldr/common/main/yav.xml
index 88d7b957533..9246f963d23 100644
--- a/make/data/cldr/common/main/yav.xml
+++ b/make/data/cldr/common/main/yav.xml
@@ -558,9 +558,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
diff --git a/make/data/cldr/common/main/yo.xml b/make/data/cldr/common/main/yo.xml
index 056ec4d0f17..e160441da34 100644
--- a/make/data/cldr/common/main/yo.xml
+++ b/make/data/cldr/common/main/yo.xml
@@ -27,7 +27,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ann">Èdè Obolo</language>
 			<language type="anp">Èdè Angika</language>
 			<language type="ar">Èdè Lárúbáwá</language>
-			<language type="ar_001">Èdè Lárúbáwá (Agbáyé)</language>
 			<language type="arn">Èdè Mapushe</language>
 			<language type="arp">Èdè Arapaho</language>
 			<language type="ars">Èdè Arabiki ti Najidi</language>
@@ -41,6 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az">Èdè Asabaijani</language>
 			<language type="az" alt="short">Èdè Aseri</language>
 			<language type="ba">Èdè Bashiri</language>
+			<language type="bal">Èdè Belúṣì</language>
 			<language type="ban">Èdè Balini</language>
 			<language type="bas">Èdè Basaa</language>
 			<language type="be">Èdè Belarusi</language>
@@ -221,6 +221,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf">Èdè Báfíà</language>
 			<language type="ksh">Èdè Colognian</language>
 			<language type="ku">Kọdiṣì</language>
+			<language type="ku" menu="core">Èdè Kọ́dìṣì</language>
+			<language type="ku" menu="extension">Èdè Kùmáǹjì</language>
 			<language type="kum">Èdè Kumiki</language>
 			<language type="kv">Èdè Komi</language>
 			<language type="kw">Èdè Kọ́nììṣì</language>
@@ -611,7 +613,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CF">Àrin gùngun Áfíríkà</territory>
 			<territory type="CG">Kóńgò – Brazaville</territory>
 			<territory type="CG" alt="variant">Kóńgò (Olómìnira)</territory>
-			<territory type="CH">switiṣilandi</territory>
+			<territory type="CH">Súwísìlanìdì</territory>
 			<territory type="CI">Kóútè forà</territory>
 			<territory type="CK">Etíokun Kùúkù</territory>
 			<territory type="CL">Ṣílè</territory>
@@ -619,6 +621,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">Ṣáínà</territory>
 			<territory type="CO">Kòlómíbìa</territory>
 			<territory type="CP">Erékùsù Clipperston</territory>
+			<territory type="CQ">Sáàkì</territory>
 			<territory type="CR">Kuusita Ríkà</territory>
 			<territory type="CU">Kúbà</territory>
 			<territory type="CV">Etíokun Kápé féndè</territory>
@@ -788,7 +791,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="SL">Siria looni</territory>
 			<territory type="SM">Sani Marino</territory>
 			<territory type="SN">Sẹnẹga</territory>
-			<territory type="SO">Somalia</territory>
+			<territory type="SO">Sòmálíà</territory>
 			<territory type="SR">Surinami</territory>
 			<territory type="SS">Gúúsù Sudan</territory>
 			<territory type="ST">Sao tomi ati piriiṣipi</territory>
@@ -852,42 +855,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="cf">Ònà Ìgbekalẹ̀ owó</key>
 			<key type="collation">Ètò Ẹlẹ́sẹẹsẹ</key>
 			<key type="currency">Owó</key>
+			<key type="em">Ìgbékalẹ̀ Ẹ̀mójì</key>
 			<key type="hc">Òbíríkiti Wákàtí (12 vs 24)</key>
 			<key type="lb">Àra Ìda Ìlà</key>
+			<key type="lw">Àwọn Ìdá Ìlà Láàárín Àwọn Ọ̀rọ̀</key>
 			<key type="ms">Èto Ìdiwọ̀n</key>
 			<key type="numbers">Àwọn nọ́ńbà</key>
+			<key type="ss">Ìdá Gbólóhùn Lẹ́yìn Ìgékúrú</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kàlẹ́ńdà Buddhist</type>
+			<type key="calendar" type="buddhist" scope="core">Ti Búdà</type>
 			<type key="calendar" type="chinese">Kàlẹ́ńdà ti Ṣáìnà</type>
+			<type key="calendar" type="chinese" scope="core">Ti Ṣáínà</type>
 			<type key="calendar" type="coptic">Èdè Kopti</type>
+			<type key="calendar" type="coptic" scope="core">Kọ́pítíìkì</type>
 			<type key="calendar" type="dangi">Kàlẹ́ńdà dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Kàlẹ́ńdà Ẹtíópíìkì</type>
+			<type key="calendar" type="ethiopic" scope="core">ti Etiópíà</type>
 			<type key="calendar" type="ethiopic-amete-alem">Èdè Kalenda Alem Amete tio Etiopia</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Kàlẹ́ńdà Etiópíà</type>
 			<type key="calendar" type="gregorian">Kàlẹ́ńdà Gregory</type>
+			<type key="calendar" type="gregorian" scope="core">Ti Gregory</type>
 			<type key="calendar" type="hebrew">Kàlẹ́ńdà Hébérù</type>
+			<type key="calendar" type="hebrew" scope="core">Hébérù</type>
 			<type key="calendar" type="islamic">Kàlẹ́ńdà Lárúbáwá</type>
+			<type key="calendar" type="islamic" scope="core">Híjìrì</type>
 			<type key="calendar" type="islamic-civil">Kàlẹ́ńdà ti Musulumi</type>
+			<type key="calendar" type="islamic-civil" scope="core">Híjìrí (kàlẹ́ńdà oní-àtòkọ ti arà-ìlú)</type>
 			<type key="calendar" type="islamic-umalqura">Kàlẹ́ńdà Musulumi</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Híjìrí (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Kàlẹ́ńdà ISO-8601</type>
 			<type key="calendar" type="japanese">Kàlẹ́ńdà ti Jàpánù</type>
+			<type key="calendar" type="japanese" scope="core">Ti Japan</type>
 			<type key="calendar" type="persian">Kàlẹ́ńdà Pásíànù</type>
+			<type key="calendar" type="persian" scope="core">Ti Páṣíà</type>
 			<type key="calendar" type="roc">Kàlẹ́ńdà Minguo</type>
+			<type key="calendar" type="roc" scope="core">Kàlẹ́ńdà Ṣáínà</type>
 			<type key="cf" type="account">Ìgúnrégé Ìṣirò Owó Kọ́rẹ́ńsì</type>
+			<type key="cf" type="account" scope="core">Ìṣirò owó</type>
 			<type key="cf" type="standard">Ònà ìgbekalẹ̀ owó tó jẹ́ àjùmọ̀lò</type>
+			<type key="cf" type="standard" scope="core">Àjùmọ̀lò</type>
 			<type key="collation" type="ducet">Ètò Ẹlẹ́sẹẹsẹ Àkùàyàn Unicode</type>
+			<type key="collation" type="ducet" scope="core">Unicode Àkùnyàn</type>
 			<type key="collation" type="search">Ìṣàwárí Ète-Gbogbogbò</type>
+			<type key="collation" type="search" scope="core">Ṣàwárí</type>
 			<type key="collation" type="standard">Ìlànà Onírúurú Ètò</type>
+			<type key="collation" type="standard" scope="core">Àjùmọ̀lò</type>
+			<type key="em" type="default" scope="core">Àkùnàyàn</type>
+			<type key="em" type="emoji" scope="core">Ẹ̀mójì</type>
+			<type key="em" type="text" scope="core">àtẹ̀jíṣẹ́</type>
 			<type key="hc" type="h11">Èto Wákàtí 12 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">Èto Wákàtí 12 (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">Èto Wákàtí 24 (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">Èto Wákàtí 24 (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Àra Ìda Ìlà Títú</type>
+			<type key="lb" type="loose" scope="core">Tó dẹ̀</type>
 			<type key="lb" type="normal">Àra Ìda Ìlà Déédéé</type>
+			<type key="lb" type="normal" scope="core">Déédéé</type>
 			<type key="lb" type="strict">Àra Ìda Ìlà Mímúná</type>
+			<type key="lb" type="strict" scope="core">Pàtó</type>
+			<type key="lw" type="breakall" scope="core">Fọ́ gbogbo ẹ̀</type>
+			<type key="lw" type="keepall" scope="core">Pa gbogbo ẹ̀ mọ́</type>
+			<type key="lw" type="normal" scope="core">Déédéé</type>
+			<type key="lw" type="phrase" scope="core">Fi sílẹ̀ ní àpólà</type>
 			<type key="ms" type="metric">Èto Mẹ́tíríìkì</type>
+			<type key="ms" type="metric" scope="core">Mẹ́tíríìkì</type>
 			<type key="ms" type="uksystem">Èto Ìdiwọ̀n Ọba</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">Èto Ìdiwọ̀n US</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="arab">àwọn díjítì Làrubáwá-Índíà</type>
 			<type key="numbers" type="arabext">Àwọn Díjíìtì Lárúbáwá-Índíà fífẹ̀</type>
 			<type key="numbers" type="armn">Àwọn nọ́ńbà Àmẹ́níà</type>
@@ -928,6 +970,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="thai">Àwọn díjíìtì Thai</type>
 			<type key="numbers" type="tibt">Àwọn díjíìtì Tibetán</type>
 			<type key="numbers" type="vaii">Àwọn díjíìtì Fai</type>
+			<type key="ss" type="none" scope="core">Pípa</type>
+			<type key="ss" type="standard" scope="core">Títàn</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Mẹ́tíríìkì</measurementSystemName>
@@ -981,6 +1025,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ní' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ní' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -989,6 +1036,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ní' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ní' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -997,6 +1047,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1005,6 +1058,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
@@ -1043,20 +1099,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Oṣù Ṣẹ́rẹ́</month>
-							<month type="2">Oṣù Èrèlè</month>
-							<month type="3">Oṣù Ẹrẹ̀nà</month>
-							<month type="4">Oṣù Ìgbé</month>
-							<month type="5">Oṣù Ẹ̀bibi</month>
-							<month type="6">Oṣù Òkúdu</month>
-							<month type="7">Oṣù Agẹmọ</month>
-							<month type="8">Oṣù Ògún</month>
-							<month type="9">Oṣù Owewe</month>
-							<month type="10">Oṣù Ọ̀wàrà</month>
-							<month type="11">Oṣù Bélú</month>
-							<month type="12">Oṣù Ọ̀pẹ̀</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">S</month>
 							<month type="2">È</month>
@@ -1084,15 +1126,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Ẹtì</day>
 							<day type="sat">Àbámẹ́ta</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsẹ́gun</day>
-							<day type="wed">Ọjọ́rú</day>
-							<day type="thu">Ọjọ́bọ</day>
-							<day type="fri">Ẹtì</day>
-							<day type="sat">Àbámẹ́ta</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Ọjọ́ Àìkú</day>
 							<day type="mon">Ọjọ́ Ajé</day>
@@ -1104,15 +1137,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsẹ́gun</day>
-							<day type="wed">Ọjọ́rú</day>
-							<day type="thu">Ọjọ́bọ</day>
-							<day type="fri">Ẹtì</day>
-							<day type="sat">Àbámẹ́ta</day>
-						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">À</day>
 							<day type="mon">A</day>
@@ -1122,15 +1146,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Ẹ</day>
 							<day type="sat">À</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsẹ́gun</day>
-							<day type="wed">Ọjọ́rú</day>
-							<day type="thu">Ọjọ́bọ</day>
-							<day type="fri">Ẹtì</day>
-							<day type="sat">Àbámẹ́ta</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Àìkú</day>
 							<day type="mon">Ajé</day>
@@ -1236,6 +1251,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ní' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ní' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1244,6 +1262,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'ní' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'ní' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1252,6 +1273,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1260,13 +1284,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="GyM">MM-y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d/M/y G</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1325,10 +1353,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">E, MMM d – E, MMM d, y G</greatestDifference>
 							<greatestDifference id="y">E, MMM d, y – E, MMM d, y G</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1339,46 +1363,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
-							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">MM-y – MM-y</greatestDifference>
-							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
-							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d">E, dd-MM-y – E dd-MM-y, E</greatestDifference>
-							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">MMM d–d y</greatestDifference>
 							<greatestDifference id="M">MMM d – MMM d y</greatestDifference>
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
 							<greatestDifference id="d">MMM d, E – MMM d, E y</greatestDifference>
@@ -1416,17 +1409,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">Ọdún tó kọjá</relative>
 				<relative type="0">Ọdún yìí</relative>
 				<relative type="1">Ọdún tó ńbọ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">ní {0} Ọdún</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">Ọdún {0} sẹ́yìn</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other">ní {0} Ọdún</relativeTimePattern>
-				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">Ọdún {0} sẹ́yìn</relativeTimePattern>
 				</relativeTime>
@@ -1467,9 +1449,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="dayOfYear-short">
 				<displayName>Ọjọ́ inú ọdún.</displayName>
 			</field>
-			<field type="dayOfYear-narrow">
-				<displayName>Ọjọ́ inú ọdún.</displayName>
-			</field>
 			<field type="weekday">
 				<displayName>Ọjọ́ tó wà láàárín ọ̀sẹ̀</displayName>
 			</field>
@@ -1494,11 +1473,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ọjọ́ Ajé yìí</relative>
 				<relative type="1">next Monday</relative>
 			</field>
-			<field type="mon-narrow">
-				<relative type="-1">ọjọ́ Ajé tó kọjá</relative>
-				<relative type="0">ọjọ́ Ajé yìí</relative>
-				<relative type="1">next Monday</relative>
-			</field>
 			<field type="tue">
 				<relative type="-1">Ìṣẹ́gun tókọ́já</relative>
 				<relative type="0">Ìṣẹ́gun èyí</relative>
@@ -1554,17 +1528,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} Ojọ́ tẹ́lẹ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="wed-narrow">
-				<relative type="-1">O àná</relative>
-				<relative type="0">O yì</relative>
-				<relative type="1">O tóńbọ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">ní {0} O</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} W tẹ́lẹ̀</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu">
 				<relative type="-1">Ojọ́bọ̀ kẹyìn</relative>
 				<relative type="0">Ojọ́bọ̀ eyì</relative>
@@ -1576,23 +1539,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">-{0} Àwọn Ojọ́bọ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="thu-short">
-				<relative type="-1">Ojọ́ sẹ́yìn</relative>
-				<relative type="0">Ojọ́ èyí</relative>
-				<relative type="1">Ojọ́ tónbọ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">+ {0} Ojọ́</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Ojọ́ èyìn</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu-narrow">
+				<relative type="-1">Ojọ́bọ̀ kẹyìn</relative>
+				<relative type="0">Ojọ́bọ̀ eyì</relative>
+				<relative type="1">Ojọ́bọ̀ tónbọ̀</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} Ojọ́</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} Ojọ́bọ̀</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Ojọ́ sẹ́yìn</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} Àwọn Ojọ́bọ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri">
@@ -1607,22 +1562,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</relativeTime>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">Etì àná</relative>
-				<relative type="0">Etì yì</relative>
-				<relative type="1">Et tónbọ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} Et</relativeTimePattern>
-				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} Et sẹ́yìn</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-narrow">
-				<relative type="-1">F tóko̩já</relative>
-				<relative type="0">F èyí</relative>
-				<relative type="1">F tómbò̩</relative>
+				<relative type="-1">E̩tì tóko̩já</relative>
+				<relative type="0">E̩tì èyí</relative>
+				<relative type="1">E̩tì tómbò̩</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} F</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Àwo̩n Eti</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} F tẹ́lẹ̀</relativeTimePattern>
@@ -1639,26 +1588,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} Abameta tokoja</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sat-short">
-				<relative type="-1">Aba tókojá</relative>
-				<relative type="0">Aba èyí</relative>
-				<relative type="1">Aba tónbọ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} Aba</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Aba. sẹ́yìn</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="sat-narrow">
-				<relative type="-1">Ab sẹ́yìn</relative>
-				<relative type="0">Ab èyí</relative>
-				<relative type="1">Ab tónbò</relative>
+				<relative type="-1">Abameta tóko̩já</relative>
+				<relative type="0">Abameta eyi</relative>
+				<relative type="1">Abameta tombo</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} Ab</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Awon Abameta</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Ab ẹ̀yí</relativeTimePattern>
+					<relativeTimePattern count="other">{0} Abameta tokoja</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="dayperiod">
@@ -1682,9 +1620,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="zone-short">
 				<displayName>Agbègbè</displayName>
 			</field>
-			<field type="zone-narrow">
-				<displayName>Agbègbè</displayName>
-			</field>
 		</fields>
 		<timeZoneNames>
 			<gmtFormat>WAT{0}</gmtFormat>
@@ -2044,9 +1979,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Àkókò Ìwọ̀-Oòrùn Afírikà</generic>
-					<standard>Àkókò Ìwọ̀-Oòrùn Àfẹnukò Afírikà</standard>
-					<daylight>Àkókò Ìwọ̀-Oòrùn Ooru Afírikà</daylight>
+					<standard>Àkókò Ìwọ̀-Oòrùn Afírikà</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2396,6 +2329,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Àkókò Gúyànà</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Àkókò Àfẹnukò Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Àkókò Hawaii-Aleutian</generic>
@@ -2922,7 +2860,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -2944,12 +2881,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="100000000" count="other">¤000M</pattern>
 					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
-					<pattern type="1000000000" count="other">¤0B</pattern>
-					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
+					<pattern type="1000000000" count="other">¤0G</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0G</pattern>
+					<pattern type="10000000000" count="other">¤00G</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00G</pattern>
+					<pattern type="100000000000" count="other">¤000G</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000G</pattern>
 					<pattern type="1000000000000" count="other">¤0T</pattern>
 					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="10000000000000" count="other">¤00T</pattern>
@@ -3526,6 +3463,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Dọ́là Ilà Oòrùn Karíbíà</displayName>
 				<displayName count="other">àwọn dọ́là Ilà Oòrùn Karíbíà</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Owó ìlú Kùrásọ̀ àti Saint Mátìnì</displayName>
+				<displayName count="other">Owó ìlú Kùrásọ̀ àti Saint Mátìnì</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Faransì ìwọ̀-oorùn Afíríkà</displayName>
 				<displayName count="other">àwọn faransì ìwọ̀-oorùn Afíríkà</displayName>
@@ -3553,6 +3494,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZWD">
 				<displayName>Dọla ti Orílẹ́ède Siibabuwe</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Owó ìlú Sìnbábúwè</displayName>
+				<displayName count="other">Owó ìlú Sìnbábúwè</displayName>
+			</currency>
 		</currencies>
 		<minimalPairs>
 			<pluralMinimalPairs count="other">Àwọn ọjọ́ {0}</pluralMinimalPairs>
@@ -3663,19 +3608,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="power3">
 				<compoundUnitPattern1 count="other">kubiki {0}</compoundUnitPattern1>
 			</compoundUnit>
-			<unit type="area-hectare">
-				<displayName>hekita</displayName>
-			</unit>
-			<unit type="area-acre">
-				<displayName>sare</displayName>
-			</unit>
 			<unit type="concentr-item">
 				<displayName>àwọ́n ohun</displayName>
 				<unitPattern count="other">{0} àwon ohun</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ìpín</displayName>
+				<unitPattern count="other">ìpín {0}</unitPattern>
+			</unit>
 			<unit type="concentr-permille">
 				<unitPattern count="other">{0} ìdákan nínú ẹgbẹ̀rún</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>nínú èròjà gúlúkóòsì</displayName>
+				<unitPattern count="other">{0} nínú èròjà gúlúkóósì</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>maili ninu ami galọọnu kan</displayName>
 			</unit>
@@ -3733,6 +3680,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-year">
 				<displayName>ọ̀dún</displayName>
 				<unitPattern count="other">{0} ọ̀dún</unitPattern>
+				<perUnitPattern>{0} lọ́dún</perUnitPattern>
 			</unit>
 			<unit type="duration-quarter">
 				<displayName>idamerin</displayName>
@@ -3760,9 +3708,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ìdinwọ̀n ayé</displayName>
 				<unitPattern count="other">{0} ìdinwọ̀n ayé</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>mita</displayName>
-			</unit>
 			<unit type="length-furlong">
 				<displayName>àwọn fọ́lọ́ọ̀ngì</displayName>
 				<unitPattern count="other">{0} àwọn fọ́lọ́ọ̀ngì</unitPattern>
@@ -3772,7 +3717,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} fátọ́ọ̀mù</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName>kandẹ́là</displayName>
 				<unitPattern count="other">{0} kandẹ́là</unitPattern>
 			</unit>
 			<unit type="light-lumen">
@@ -3791,13 +3735,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>milimita ti makuiri</displayName>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ti makuiri</displayName>
+				<unitPattern count="other">{0} ti makuiri</unitPattern>
+			</unit>
 			<unit type="speed-beaufort">
 				<displayName>Beaufort</displayName>
 				<unitPattern count="other">Beaufort {0}</unitPattern>
 			</unit>
-			<unit type="volume-liter">
-				<displayName>lita</displayName>
-			</unit>
 			<unit type="volume-bushel">
 				<displayName>búsẹ́ẹ̀li</displayName>
 				<unitPattern count="other">{0} búsẹ́ẹ̀li</unitPattern>
@@ -3816,18 +3761,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ìdásímérin</displayName>
 				<unitPattern count="other">{0} ìdásímérin</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ìmọ́lẹ̀</displayName>
-				<unitPattern count="other">{0} ìmọ́lẹ̀</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradians</displayName>
+				<unitPattern count="other">{0} steradians</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>katals</displayName>
+				<unitPattern count="other">{0} katals</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>coulombs</displayName>
+				<unitPattern count="other">{0} coulombs</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farads</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henrys</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>siemens</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kálórì [IT]</displayName>
+				<unitPattern count="other">kálórì {0} [IT]</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>sieverts</displayName>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>grays</displayName>
+				<unitPattern count="other">{0} grays</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kilograms-force</displayName>
+				<unitPattern count="other">{0} kilograms-force</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>teslas</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>webers</displayName>
+				<unitPattern count="other">{0} webers</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ẹ̀yà nínú ìdá blíọ̀nù</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>àwọn alẹ́</displayName>
-				<unitPattern count="other">àwọn alẹ́ {0}</unitPattern>
-				<perUnitPattern>{0}/alẹ́</perUnitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="1024p1">
@@ -3864,13 +3843,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ohun</displayName>
 				<unitPattern count="other">{0} ohun</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ìpín</displayName>
+				<unitPattern count="other">ìpín {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ara/milíọ̀nù</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>ìdákan nínú ẹgbẹ̀rún</displayName>
 				<unitPattern count="other">{0} pasenti</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="digital-petabyte">
 				<displayName>Píbáìtì</displayName>
 				<unitPattern count="other">{0} Píbáìtì</unitPattern>
@@ -3990,6 +3976,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>gíréènì</displayName>
 				<unitPattern count="other">{0} gíréènì</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} ti Hg</unitPattern>
+			</unit>
 			<unit type="volume-liter">
 				<displayName>lita</displayName>
 			</unit>
@@ -4027,6 +4016,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>àmì ìdásímérin</displayName>
 				<unitPattern count="other">{0} àmì ìdásímérin</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ìmọ́lẹ̀</displayName>
 				<unitPattern count="other">{0} ìmọ́lẹ̀</unitPattern>
@@ -4063,7 +4055,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}km²</unitPattern>
 			</unit>
 			<unit type="area-hectare">
-				<displayName>hekita</displayName>
 				<unitPattern count="other">{0}ha</unitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
@@ -4073,7 +4064,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}mi²</unitPattern>
 			</unit>
 			<unit type="area-acre">
-				<displayName>sare</displayName>
 				<unitPattern count="other">{0}ac</unitPattern>
 			</unit>
 			<unit type="area-square-yard">
@@ -4100,7 +4090,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-item">
 				<unitPattern count="other">{0}ohun</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ìpín</displayName>
+				<unitPattern count="other">ìpín {0}</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
 			<unit type="concentr-permille">
@@ -4109,6 +4103,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
@@ -4163,10 +4160,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>bit</displayName>
 				<unitPattern count="other">{0}bíìtì</unitPattern>
 			</unit>
-			<unit type="duration-year">
-				<displayName>ọd</displayName>
-				<unitPattern count="other">{0} ọd</unitPattern>
-			</unit>
 			<unit type="duration-quarter">
 				<unitPattern count="other">{0} i</unitPattern>
 			</unit>
@@ -4254,9 +4247,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>R⊕</displayName>
 				<unitPattern count="other">{0}R⊕</unitPattern>
 			</unit>
-			<unit type="length-meter">
-				<displayName>mita</displayName>
-			</unit>
 			<unit type="length-furlong">
 				<unitPattern count="other">{0}fur</unitPattern>
 			</unit>
@@ -4409,7 +4399,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}hL</unitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<displayName>lita</displayName>
 				<perUnitPattern>{0}/L</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
@@ -4452,7 +4441,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}pt</unitPattern>
 			</unit>
 			<unit type="volume-cup">
-				<displayName>ife</displayName>
 				<unitPattern count="other">{0}c</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce">
@@ -4493,14 +4481,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0}àmì ìdásímérin</unitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ìmọ́lẹ̀</displayName>
 				<unitPattern count="other">{0}ìmọ́lẹ̀</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>àwọn alẹ́</displayName>
 				<unitPattern count="other">àwọn alẹ́{0}</unitPattern>
-				<perUnitPattern>{0}/alẹ́</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -4512,9 +4500,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<listPatternPart type="end">{0}, tabi {1}</listPatternPart>
 			<listPatternPart type="2">{0} tàbí {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="start">{0}, {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="standard-short">
 			<listPatternPart type="end">{0} àti {1}</listPatternPart>
 		</listPattern>
diff --git a/make/data/cldr/common/main/yo_BJ.xml b/make/data/cldr/common/main/yo_BJ.xml
index 0523124f50a..19168d7adba 100644
--- a/make/data/cldr/common/main/yo_BJ.xml
+++ b/make/data/cldr/common/main/yo_BJ.xml
@@ -14,6 +14,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<localeDisplayNames>
 		<languages>
 			<language type="agq">Èdè Ágɛ̀ɛ̀mù</language>
+			<language type="bal">Èdè Belúshì</language>
 			<language type="bez">Èdè Bɛ́nà</language>
 			<language type="chr">Èdè Shɛ́rókiì</language>
 			<language type="cu">Èdè Síláfííkì Ilé Ìjɔ́sìn</language>
@@ -47,6 +48,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ks">Kashímirì</language>
 			<language type="ksb">Sháńbálà</language>
 			<language type="ku">Kɔdishì</language>
+			<language type="ku" menu="core">Èdè Kɔ́dìshì</language>
 			<language type="kw">Èdè Kɔ́nììshì</language>
 			<language type="lb">Lùshɛ́mbɔ́ɔ̀gì</language>
 			<language type="mul">Ɔlɔ́pɔ̀ èdè</language>
@@ -144,7 +146,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BQ">Kàríbíánì ti Nɛ́dálándì</territory>
 			<territory type="BW">Bɔ̀tìsúwánà</territory>
 			<territory type="BZ">Bèlísɛ̀</territory>
-			<territory type="CH">switishilandi</territory>
 			<territory type="CL">Shílè</territory>
 			<territory type="CN">Sháínà</territory>
 			<territory type="CZ">Shɛ́ɛ́kì</territory>
@@ -232,28 +233,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="calendar">Kàlɛ́ńdà</key>
 			<key type="cf">Ònà Ìgbekalɛ̀ owó</key>
 			<key type="collation">Ètò Ɛlɛ́sɛɛsɛ</key>
+			<key type="em">Ìgbékalɛ̀ Ɛ̀mójì</key>
+			<key type="lw">Àwɔn Ìdá Ìlà Láàárín Àwɔn Ɔ̀rɔ̀</key>
 			<key type="ms">Èto Ìdiwɔ̀n</key>
 			<key type="numbers">Àwɔn nɔ́ńbà</key>
+			<key type="ss">Ìdá Gbólóhùn Lɛ́yìn Ìgékúrú</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Kàlɛ́ńdà Buddhist</type>
 			<type key="calendar" type="chinese">Kàlɛ́ńdà ti Sháìnà</type>
+			<type key="calendar" type="chinese" scope="core">Ti Sháínà</type>
+			<type key="calendar" type="coptic" scope="core">Kɔ́pítíìkì</type>
 			<type key="calendar" type="dangi">Kàlɛ́ńdà dangi</type>
 			<type key="calendar" type="ethiopic">Kàlɛ́ńdà Ɛtíópíìkì</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Kàlɛ́ńdà Etiópíà</type>
 			<type key="calendar" type="gregorian">Kàlɛ́ńdà Gregory</type>
 			<type key="calendar" type="hebrew">Kàlɛ́ńdà Hébérù</type>
 			<type key="calendar" type="islamic">Kàlɛ́ńdà Lárúbáwá</type>
 			<type key="calendar" type="islamic-civil">Kàlɛ́ńdà ti Musulumi</type>
+			<type key="calendar" type="islamic-civil" scope="core">Híjìrí (kàlɛ́ńdà oní-àtòkɔ ti arà-ìlú)</type>
 			<type key="calendar" type="islamic-umalqura">Kàlɛ́ńdà Musulumi</type>
 			<type key="calendar" type="iso8601">Kàlɛ́ńdà ISO-8601</type>
 			<type key="calendar" type="japanese">Kàlɛ́ńdà ti Jàpánù</type>
 			<type key="calendar" type="persian">Kàlɛ́ńdà Pásíànù</type>
+			<type key="calendar" type="persian" scope="core">Ti Páshíà</type>
 			<type key="calendar" type="roc">Kàlɛ́ńdà Minguo</type>
+			<type key="calendar" type="roc" scope="core">Kàlɛ́ńdà Sháínà</type>
 			<type key="cf" type="account">Ìgúnrégé Ìshirò Owó Kɔ́rɛ́ńsì</type>
+			<type key="cf" type="account" scope="core">Ìshirò owó</type>
 			<type key="cf" type="standard">Ònà ìgbekalɛ̀ owó tó jɛ́ àjùmɔ̀lò</type>
+			<type key="cf" type="standard" scope="core">Àjùmɔ̀lò</type>
 			<type key="collation" type="ducet">Ètò Ɛlɛ́sɛɛsɛ Àkùàyàn Unicode</type>
 			<type key="collation" type="search">Ìshàwárí Ète-Gbogbogbò</type>
+			<type key="collation" type="search" scope="core">Shàwárí</type>
+			<type key="collation" type="standard" scope="core">Àjùmɔ̀lò</type>
+			<type key="em" type="emoji" scope="core">Ɛ̀mójì</type>
+			<type key="em" type="text" scope="core">àtɛ̀jíshɛ́</type>
+			<type key="lb" type="loose" scope="core">Tó dɛ̀</type>
+			<type key="lw" type="breakall" scope="core">Fɔ́ gbogbo ɛ̀</type>
+			<type key="lw" type="keepall" scope="core">Pa gbogbo ɛ̀ mɔ́</type>
+			<type key="lw" type="phrase" scope="core">Fi sílɛ̀ ní àpólà</type>
 			<type key="ms" type="metric">Èto Mɛ́tíríìkì</type>
+			<type key="ms" type="metric" scope="core">Mɛ́tíríìkì</type>
 			<type key="ms" type="uksystem">Èto Ìdiwɔ̀n Ɔba</type>
 			<type key="ms" type="ussystem">Èto Ìdiwɔ̀n US</type>
 			<type key="numbers" type="arab">àwɔn díjítì Làrubáwá-Índíà</type>
@@ -328,20 +349,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Oshù Shɛ́rɛ́</month>
-							<month type="2">Oshù Èrèlè</month>
-							<month type="3">Oshù Ɛrɛ̀nà</month>
-							<month type="4">Oshù Ìgbé</month>
-							<month type="5">Oshù Ɛ̀bibi</month>
-							<month type="6">Oshù Òkúdu</month>
-							<month type="7">Oshù Agɛmɔ</month>
-							<month type="8">Oshù Ògún</month>
-							<month type="9">Oshù Owewe</month>
-							<month type="10">Oshù Ɔ̀wàrà</month>
-							<month type="11">Oshù Bélú</month>
-							<month type="12">Oshù Ɔ̀pɛ̀</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">S</month>
 							<month type="2">È</month>
@@ -369,15 +376,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Ɛtì</day>
 							<day type="sat">Àbámɛ́ta</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsɛ́gun</day>
-							<day type="wed">Ɔjɔ́rú</day>
-							<day type="thu">Ɔjɔ́bɔ</day>
-							<day type="fri">Ɛtì</day>
-							<day type="sat">Àbámɛ́ta</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Ɔjɔ́ Àìkú</day>
 							<day type="mon">Ɔjɔ́ Ajé</day>
@@ -389,15 +387,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsɛ́gun</day>
-							<day type="wed">Ɔjɔ́rú</day>
-							<day type="thu">Ɔjɔ́bɔ</day>
-							<day type="fri">Ɛtì</day>
-							<day type="sat">Àbámɛ́ta</day>
-						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun">À</day>
 							<day type="mon">A</day>
@@ -407,15 +396,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri">Ɛ</day>
 							<day type="sat">À</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsɛ́gun</day>
-							<day type="wed">Ɔjɔ́rú</day>
-							<day type="thu">Ɔjɔ́bɔ</day>
-							<day type="fri">Ɛtì</day>
-							<day type="sat">Àbámɛ́ta</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">Àìkú</day>
 							<day type="mon">Ajé</day>
@@ -475,17 +455,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="-1">Ɔdún tó kɔjá</relative>
 				<relative type="0">Ɔdún yìí</relative>
 				<relative type="1">Ɔdún tó ńbɔ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">ní {0} Ɔdún</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">Ɔdún {0} sɛ́yìn</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="year-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="other">ní {0} Ɔdún</relativeTimePattern>
-				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">Ɔdún {0} sɛ́yìn</relativeTimePattern>
 				</relativeTime>
@@ -524,9 +493,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="dayOfYear-short">
 				<displayName>Ɔjɔ́ inú ɔdún.</displayName>
 			</field>
-			<field type="dayOfYear-narrow">
-				<displayName>Ɔjɔ́ inú ɔdún.</displayName>
-			</field>
 			<field type="weekday">
 				<displayName>Ɔjɔ́ tó wà láàárín ɔ̀sɛ̀</displayName>
 			</field>
@@ -551,11 +517,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0">ɔjɔ́ Ajé yìí</relative>
 				<relative type="1">next Monday</relative>
 			</field>
-			<field type="mon-narrow">
-				<relative type="-1">ɔjɔ́ Ajé tó kɔjá</relative>
-				<relative type="0">ɔjɔ́ Ajé yìí</relative>
-				<relative type="1">next Monday</relative>
-			</field>
 			<field type="tue">
 				<relative type="-1">Ìshɛ́gun tókɔ́já</relative>
 				<relative type="0">Ìshɛ́gun èyí</relative>
@@ -608,14 +569,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} Ojɔ́ tɛ́lɛ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="wed-narrow">
-				<relative type="-1">O àná</relative>
-				<relative type="0">O yì</relative>
-				<relative type="1">O tóńbɔ̀</relative>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} W tɛ́lɛ̀</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu">
 				<relative type="-1">Ojɔ́bɔ̀ kɛyìn</relative>
 				<relative type="0">Ojɔ́bɔ̀ eyì</relative>
@@ -627,29 +580,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">-{0} Àwɔn Ojɔ́bɔ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="thu-short">
-				<relative type="-1">Ojɔ́ sɛ́yìn</relative>
-				<relative type="0">Ojɔ́ èyí</relative>
-				<relative type="1">Ojɔ́ tónbɔ̀</relative>
-				<relativeTime type="future">
-					<relativeTimePattern count="other">+ {0} Ojɔ́</relativeTimePattern>
-				</relativeTime>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Ojɔ́ èyìn</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="thu-narrow">
+				<relative type="-1">Ojɔ́bɔ̀ kɛyìn</relative>
+				<relative type="0">Ojɔ́bɔ̀ eyì</relative>
+				<relative type="1">Ojɔ́bɔ̀ tónbɔ̀</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="other">{0} Ojɔ́</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} Ojɔ́bɔ̀</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Ojɔ́ sɛ́yìn</relativeTimePattern>
+					<relativeTimePattern count="other">-{0} Àwɔn Ojɔ́bɔ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
 			<field type="fri-short">
-				<relative type="-1">Etì àná</relative>
-				<relative type="0">Etì yì</relative>
-				<relative type="1">Et tónbɔ̀</relative>
 				<relativeTime type="past">
 					<relativeTimePattern count="other">{0} Et sɛ́yìn</relativeTimePattern>
 				</relativeTime>
@@ -659,22 +601,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<relativeTimePattern count="other">{0} F tɛ́lɛ̀</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="sat-short">
-				<relative type="-1">Aba tókojá</relative>
-				<relative type="0">Aba èyí</relative>
-				<relative type="1">Aba tónbɔ̀</relative>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Aba. sɛ́yìn</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="sat-narrow">
-				<relative type="-1">Ab sɛ́yìn</relative>
-				<relative type="0">Ab èyí</relative>
-				<relative type="1">Ab tónbò</relative>
-				<relativeTime type="past">
-					<relativeTimePattern count="other">{0} Ab ɛ̀yí</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="dayperiod">
 				<displayName>Àárɔ̀/ɔ̀sán</displayName>
 			</field>
@@ -771,9 +697,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</zone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Àkókò Ìwɔ̀-Oòrùn Afírikà</generic>
-					<standard>Àkókò Ìwɔ̀-Oòrùn Àfɛnukò Afírikà</standard>
-					<daylight>Àkókò Ìwɔ̀-Oòrùn Ooru Afírikà</daylight>
+					<standard>Àkókò Ìwɔ̀-Oòrùn Afírikà</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -1027,6 +951,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Àkókò Àfɛnukò Gulf</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Àkókò Àfɛnukò Hawaii-Aleutian</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Àkókò Hawaii-Aleutian</generic>
@@ -1814,6 +1743,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Dɔ́là Ilà Oòrùn Karíbíà</displayName>
 				<displayName count="other">àwɔn dɔ́là Ilà Oòrùn Karíbíà</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Owó ìlú Kùrásɔ̀ àti Saint Mátìnì</displayName>
+				<displayName count="other">Owó ìlú Kùrásɔ̀ àti Saint Mátìnì</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>Faransì ìwɔ̀-oorùn Afíríkà</displayName>
 				<displayName count="other">àwɔn faransì ìwɔ̀-oorùn Afíríkà</displayName>
@@ -1919,6 +1852,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-year">
 				<displayName>ɔ̀dún</displayName>
 				<unitPattern count="other">{0} ɔ̀dún</unitPattern>
+				<perUnitPattern>{0} lɔ́dún</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
 				<perUnitPattern>{0}/ɔsh</perUnitPattern>
@@ -1947,7 +1881,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} fátɔ́ɔ̀mù</unitPattern>
 			</unit>
 			<unit type="light-candela">
-				<displayName>kandɛ́là</displayName>
 				<unitPattern count="other">{0} kandɛ́là</unitPattern>
 			</unit>
 			<unit type="light-lumen">
@@ -1971,21 +1904,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>shíbí oúnjɛ kékeré</displayName>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ìmɔ́lɛ̀</displayName>
-				<unitPattern count="other">{0} ìmɔ́lɛ̀</unitPattern>
-			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>ɛ̀yà nínú ìdá blíɔ̀nù</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>àwɔn alɛ́</displayName>
-				<unitPattern count="other">àwɔn alɛ́ {0}</unitPattern>
-				<perUnitPattern>{0}/alɛ́</perUnitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ara/milíɔ̀nù</displayName>
 			</unit>
 			<unit type="concentr-permille">
@@ -2087,10 +2011,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
-			<unit type="duration-year">
-				<displayName>ɔd</displayName>
-				<unitPattern count="other">{0} ɔd</unitPattern>
-			</unit>
 			<unit type="duration-week">
 				<displayName>ɔshɛ́</displayName>
 				<perUnitPattern>{0}/ɔ̀shɛ̀</perUnitPattern>
@@ -2112,13 +2032,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0}búsɛ́ɛ̀li</unitPattern>
 			</unit>
 			<unit type="speed-light-speed">
-				<displayName>ìmɔ́lɛ̀</displayName>
 				<unitPattern count="other">{0}ìmɔ́lɛ̀</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>àwɔn alɛ́</displayName>
 				<unitPattern count="other">àwɔn alɛ́{0}</unitPattern>
-				<perUnitPattern>{0}/alɛ́</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/yrl.xml b/make/data/cldr/common/main/yrl.xml
index a82d832c7dc..e769a85c96c 100644
--- a/make/data/cldr/common/main/yrl.xml
+++ b/make/data/cldr/common/main/yrl.xml
@@ -1089,12 +1089,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">Reyupurawaka turusuwa rupí</type>
 			<type key="colCaseLevel" type="no" draft="contributed">Yupurawakasawa mirĩwa yuí turusúwa ãmurupí</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">Yupurawakasawa mirĩwa yuí turusúwa amũrupisawa</type>
-			<type key="collation" type="big5han">Xinanhẽẽga rikusawarupí muakaresawa - Big5</type>
 			<type key="collation" type="compat" draft="contributed">Muakaresawa rinũdewa nũgarásawa</type>
 			<type key="collation" type="dictionary">Disiunariu muakaresawa</type>
 			<type key="collation" type="ducet">Unicode muakaresawa retewa</type>
 			<type key="collation" type="eor" draft="contributed">Tekô eurupawara muakarésawa supé</type>
-			<type key="collation" type="gb2312han">Xinanheẽga iwasuĩma muakarewa - GB2312</type>
 			<type key="collation" type="phonebook">Terefuni sesewara muakaresawa</type>
 			<type key="collation" type="phonetic" draft="contributed">Yupurawakasawa terefuniara mukaresawa</type>
 			<type key="collation" type="pinyin">Pin-yin mukaresawa</type>
@@ -2830,9 +2828,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Pinõ Pẽi</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ẽdeburi</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>Kumure-ita</exemplarCity>
 			</zone>
@@ -3455,9 +3450,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Afirikia Usidẽtawara Hurariyu</generic>
-					<standard>Afirika Usidẽtawara Hurariyu Retewa</standard>
-					<daylight>Afirika Usidẽtawara Kurasí Ara Hurariyu</daylight>
+					<standard>Afirikia Usidẽtawara Hurariyu</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3850,6 +3843,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giyana Hurariyu</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawaí asuí Kapuã-ita Areuta-ita Hurariyu Retewa</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawaí asuí Kapuã-ita Areuta-ita Hurariyu</generic>
@@ -6089,7 +6087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mirimol irerú-pukú rupi</unitPattern>
 				<unitPattern count="other">{0} mirimol-ita irerú-pukú rupi</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pisawera-ita miliãu rupi</displayName>
 				<unitPattern count="one">{0} pisawera miliãu rupi</unitPattern>
 				<unitPattern count="other">{0} pisawera-ita miliãu rupi</unitPattern>
@@ -6884,7 +6882,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mirimol/ritru</displayName>
 				<unitPattern count="other">{0} mmol/l</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pisawera miliãu rupi</displayName>
 			</unit>
 			<unit type="concentr-percent">
diff --git a/make/data/cldr/common/main/yrl_CO.xml b/make/data/cldr/common/main/yrl_CO.xml
index a8607444c93..c120bce318e 100644
--- a/make/data/cldr/common/main/yrl_CO.xml
+++ b/make/data/cldr/common/main/yrl_CO.xml
@@ -59,8 +59,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<variant type="KKCOR" draft="contributed">kuatiasawasupí pañé-yara</variant>
 		</variants>
 		<types>
-			<type key="collation" type="big5han">Xinañẽẽga rikusawarupí muakaresawa - Big5</type>
-			<type key="collation" type="gb2312han">Xinañeẽga iwasuĩma muakarewa - GB2312</type>
 			<type key="collation" type="search">Sikaisá purusawa pañérupí</type>
 			<type key="colStrength" type="primary" draft="contributed">Reyupurawaka letera básika ñũtú</type>
 		</types>
@@ -239,7 +237,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} milla kuadaradu-ita</unitPattern>
 				<perUnitPattern>{0} milla kuadaradu rupi</perUnitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pisawera-ita millón rupi</displayName>
 				<unitPattern count="one">{0} pisawera millón rupi</unitPattern>
 				<unitPattern count="other">{0} pisawera-ita millón rupi</unitPattern>
@@ -284,7 +282,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-mile">
 				<displayName>milla-itá²</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pisawera millón rupi</displayName>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
diff --git a/make/data/cldr/common/main/yrl_VE.xml b/make/data/cldr/common/main/yrl_VE.xml
index d6663f73a9b..79276b33a6a 100644
--- a/make/data/cldr/common/main/yrl_VE.xml
+++ b/make/data/cldr/common/main/yrl_VE.xml
@@ -59,8 +59,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<variant type="KKCOR" draft="contributed">kuatiasawasupí pañé-yara</variant>
 		</variants>
 		<types>
-			<type key="collation" type="big5han">Xinañẽẽga rikusawarupí muakaresawa - Big5</type>
-			<type key="collation" type="gb2312han">Xinañeẽga iwasuĩma muakarewa - GB2312</type>
 			<type key="collation" type="search">Sikaisá purusawa pañérupí</type>
 			<type key="colStrength" type="primary" draft="contributed">Reyupurawaka letera básika ñũtú</type>
 		</types>
@@ -239,7 +237,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} milla kuadaradu-ita</unitPattern>
 				<perUnitPattern>{0} milla kuadaradu rupi</perUnitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pisawera-ita millón rupi</displayName>
 				<unitPattern count="one">{0} pisawera millón rupi</unitPattern>
 				<unitPattern count="other">{0} pisawera-ita millón rupi</unitPattern>
@@ -284,7 +282,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="area-square-mile">
 				<displayName>milla-itá²</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>pisawera millón rupi</displayName>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
diff --git a/make/data/cldr/common/main/yue.xml b/make/data/cldr/common/main/yue.xml
index 30024be998e..3615cb547d8 100644
--- a/make/data/cldr/common/main/yue.xml
+++ b/make/data/cldr/common/main/yue.xml
@@ -317,7 +317,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksb">尚巴拉文</language>
 			<language type="ksf">巴菲亞文</language>
 			<language type="ksh">科隆文</language>
-			<language type="ku">庫爾德文</language>
+			<language type="ku">庫德文</language>
+			<language type="ku" menu="core">庫德文</language>
+			<language type="ku" menu="extension">北庫德文</language>
 			<language type="kum">庫密克文</language>
 			<language type="kut">庫特奈文</language>
 			<language type="kv">科米文</language>
@@ -919,6 +921,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CN">中國</territory>
 			<territory type="CO">哥倫比亞</territory>
 			<territory type="CP">克里派頓島</territory>
+			<territory type="CQ">薩克</territory>
 			<territory type="CR">哥斯大黎加</territory>
 			<territory type="CU">古巴</territory>
 			<territory type="CV">維德角</territory>
@@ -1215,35 +1218,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="colNumeric">數字排序</key>
 			<key type="colStrength">排序強度</key>
 			<key type="currency">貨幣</key>
+			<key type="em">Emoji 顯示方式</key>
 			<key type="hc">時間週期（12 小時制與 24 小時制）</key>
 			<key type="lb">換行樣式</key>
+			<key type="lw">單字強制換行</key>
 			<key type="ms">度量單位系統</key>
 			<key type="numbers">數字</key>
+			<key type="ss">縮寫後斷句</key>
 			<key type="timezone">時區</key>
 			<key type="va">區域變異</key>
 			<key type="x">專用區</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">佛曆</type>
+			<type key="calendar" type="buddhist" scope="core">佛曆</type>
 			<type key="calendar" type="chinese">農曆</type>
+			<type key="calendar" type="chinese" scope="core">農曆</type>
 			<type key="calendar" type="coptic">科普特曆</type>
+			<type key="calendar" type="coptic" scope="core">科普特曆</type>
 			<type key="calendar" type="dangi">檀紀曆</type>
-			<type key="calendar" type="ethiopic">衣索比亞曆</type>
-			<type key="calendar" type="ethiopic-amete-alem">衣索比亞曆 (Amete Alem)</type>
+			<type key="calendar" type="dangi" scope="core">檀紀曆</type>
+			<type key="calendar" type="ethiopic">埃塞俄比亞曆</type>
+			<type key="calendar" type="ethiopic" scope="core">埃塞俄比亞曆</type>
+			<type key="calendar" type="ethiopic-amete-alem">埃塞俄比亞阿美德阿萊姆曆</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">埃塞俄比亞阿美德阿萊姆</type>
 			<type key="calendar" type="gregorian">公曆</type>
+			<type key="calendar" type="gregorian" scope="core">公曆</type>
 			<type key="calendar" type="hebrew">希伯來曆</type>
+			<type key="calendar" type="hebrew" scope="core">希伯來曆</type>
 			<type key="calendar" type="indian">印度國曆</type>
 			<type key="calendar" type="islamic">伊斯蘭曆</type>
-			<type key="calendar" type="islamic-civil">伊斯蘭民用曆</type>
+			<type key="calendar" type="islamic" scope="core">伊斯蘭曆</type>
+			<type key="calendar" type="islamic-civil">伊斯蘭民用曆 (表格式)</type>
+			<type key="calendar" type="islamic-civil" scope="core">伊斯蘭民用曆 (表格式)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">伊斯蘭新月曆</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">伊斯蘭天文曆</type>
 			<type key="calendar" type="islamic-umalqura">伊斯蘭曆 (烏姆庫拉)</type>
-			<type key="calendar" type="iso8601">國際標準 ISO 8601</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">伊斯蘭曆 (烏姆庫拉)</type>
+			<type key="calendar" type="iso8601">公曆 (元年)</type>
 			<type key="calendar" type="japanese">日本曆</type>
+			<type key="calendar" type="japanese" scope="core">日本曆</type>
 			<type key="calendar" type="persian">波斯曆</type>
+			<type key="calendar" type="persian" scope="core">波斯曆</type>
 			<type key="calendar" type="roc">民國曆</type>
+			<type key="calendar" type="roc" scope="core">民國曆</type>
 			<type key="cf" type="account">會計貨幣格式</type>
+			<type key="cf" type="account" scope="core">會計</type>
 			<type key="cf" type="standard">標準貨幣格式</type>
+			<type key="cf" type="standard" scope="core">標準</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">排序符號</type>
 			<type key="colAlternate" type="shifted" draft="contributed">略過符號排序</type>
 			<type key="colBackwards" type="no" draft="contributed">正常排序重音</type>
@@ -1253,17 +1275,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="colCaseFirst" type="upper" draft="contributed">優先排序大寫</type>
 			<type key="colCaseLevel" type="no" draft="contributed">不分大小寫排序</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">依大小寫排序</type>
-			<type key="collation" type="big5han">繁體中文排序 - Big5</type>
 			<type key="collation" type="dictionary">字典排序</type>
 			<type key="collation" type="ducet">預設 Unicode 排序</type>
+			<type key="collation" type="ducet" scope="core">預設 Unicode</type>
 			<type key="collation" type="eor" draft="contributed">歐洲排序規則</type>
-			<type key="collation" type="gb2312han">簡體中文排序 - GB2312</type>
 			<type key="collation" type="phonebook">電話簿排序</type>
 			<type key="collation" type="phonetic">發音排序</type>
 			<type key="collation" type="pinyin">拼音排序</type>
 			<type key="collation" type="search">一般用途搜尋</type>
+			<type key="collation" type="search" scope="core">搜尋</type>
 			<type key="collation" type="searchjl" draft="contributed">韓文子音排序</type>
 			<type key="collation" type="standard">標準排序</type>
+			<type key="collation" type="standard" scope="core">標準</type>
 			<type key="collation" type="stroke">筆畫排序</type>
 			<type key="collation" type="traditional">傳統排序</type>
 			<type key="collation" type="unihan">部首筆畫排序</type>
@@ -1280,18 +1303,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="d0" type="fwidth">全形</type>
 			<type key="d0" type="hwidth">半形</type>
 			<type key="d0" type="npinyin" draft="contributed">數值</type>
+			<type key="em" type="default" scope="core">預設</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">文字</type>
 			<type key="hc" type="h11">12 小時制 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 小時制 (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 小時制 (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 小時制 (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">寬鬆換行樣式</type>
+			<type key="lb" type="loose" scope="core">寬鬆</type>
 			<type key="lb" type="normal">一般換行樣式</type>
+			<type key="lb" type="normal" scope="core">一般</type>
 			<type key="lb" type="strict">強制換行樣式</type>
+			<type key="lb" type="strict" scope="core">強制</type>
+			<type key="lw" type="breakall" scope="core">任意換行</type>
+			<type key="lw" type="keepall" scope="core">全部保留</type>
+			<type key="lw" type="normal" scope="core">一般</type>
+			<type key="lw" type="phrase" scope="core">唔拆開詞組</type>
 			<type key="m0" type="bgn">美國地名委員會</type>
 			<type key="m0" type="ungegn">聯合國地名專家組</type>
 			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="metric" scope="core">公制</type>
 			<type key="ms" type="uksystem">英制度量單位系統</type>
+			<type key="ms" type="uksystem" scope="core">英制</type>
 			<type key="ms" type="ussystem">美制度量單位系統</type>
+			<type key="ms" type="ussystem" scope="core">美制</type>
 			<type key="numbers" type="arab">阿拉伯-印度數字</type>
 			<type key="numbers" type="arabext">阿拉伯-印度擴充數字</type>
 			<type key="numbers" type="armn">亞美尼亞數字</type>
@@ -1353,6 +1393,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="tibt">西藏數字</type>
 			<type key="numbers" type="traditional" draft="contributed">傳統數字</type>
 			<type key="numbers" type="vaii">瓦伊文數字</type>
+			<type key="ss" type="none" scope="core">閂</type>
+			<type key="ss" type="standard" scope="core">開</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">公制</measurementSystemName>
@@ -1964,6 +2006,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1972,30 +2017,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">Bh時</dateFormatItem>
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EBh點</dateFormatItem>
+						<dateFormatItem id="EBhm">EBh:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">EBh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">ah:mmE</dateFormatItem>
-						<dateFormatItem id="Ehms">ah:mm:ssE</dateFormatItem>
+						<dateFormatItem id="Eh">Eah點</dateFormatItem>
+						<dateFormatItem id="Ehm">Eah:mm</dateFormatItem>
+						<dateFormatItem id="EHm">EHH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">Eah:mm:ss</dateFormatItem>
+						<dateFormatItem id="EHms">EHH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y年</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
+						<dateFormatItem id="GyMd">G d/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y (E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y年M月d日 E</dateFormatItem>
-						<dateFormatItem id="h">ah時</dateFormatItem>
-						<dateFormatItem id="H">H時</dateFormatItem>
+						<dateFormatItem id="h">ah點</dateFormatItem>
+						<dateFormatItem id="H">H點</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">ah 點 (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH點 (v)</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
@@ -2220,8 +2282,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="midnight">午夜</dayPeriod>
-							<dayPeriod type="am">上午</dayPeriod>
-							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="am">上晝</dayPeriod>
+							<dayPeriod type="pm">下晝</dayPeriod>
 							<dayPeriod type="morning1">清晨</dayPeriod>
 							<dayPeriod type="morning2">朝早</dayPeriod>
 							<dayPeriod type="afternoon1">中午</dayPeriod>
@@ -2229,6 +2291,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="evening1">夜晚</dayPeriod>
 							<dayPeriod type="night1">凌晨</dayPeriod>
 						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">上晝</dayPeriod>
+							<dayPeriod type="pm">下晝</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">上晝</dayPeriod>
+							<dayPeriod type="pm">下晝</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">上晝</dayPeriod>
+							<dayPeriod type="pm">下晝</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">上晝</dayPeriod>
+							<dayPeriod type="pm">下晝</dayPeriod>
+						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -2299,6 +2379,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2307,6 +2390,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2315,34 +2401,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Bh">Bh時</dateFormatItem>
+						<dateFormatItem id="Bh">Bh點</dateFormatItem>
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EBh點</dateFormatItem>
 						<dateFormatItem id="EBhm">E Bh:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">Eah 點</dateFormatItem>
 						<dateFormatItem id="Ehm">E ah:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">GM/y</dateFormatItem>
+						<dateFormatItem id="GyMd">Gd/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gd/M/y (E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日 E</dateFormatItem>
 						<dateFormatItem id="h">ah時</dateFormatItem>
-						<dateFormatItem id="H">H時</dateFormatItem>
+						<dateFormatItem id="H">H點</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">ah:mm:ss [v]</dateFormatItem>
 						<dateFormatItem id="Hmsv">HH:mm:ss [v]</dateFormatItem>
 						<dateFormatItem id="hmv">ah:mm [v]</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm [v]</dateFormatItem>
+						<dateFormatItem id="hv">ah點 (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH點 (v)</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
@@ -3605,6 +3704,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>復活島</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>科伊艾克</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>蓬塔阿雷納斯</exemplarCity>
 			</zone>
@@ -3870,9 +3972,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>金邊</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>恩得伯理島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>坎頓</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4549,9 +4648,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>西非時間</generic>
-					<standard>西非標準時間</standard>
-					<daylight>西非夏令時間</daylight>
+					<standard>西非時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4939,6 +5036,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>蓋亞那時間</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>夏威夷-阿留申標準時間</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>夏威夷-阿留申時間</generic>
@@ -5508,7 +5610,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5519,17 +5620,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other">¤0千</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0千</pattern>
 					<pattern type="10000" count="other">¤0萬</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 0萬</pattern>
 					<pattern type="100000" count="other">¤00萬</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 00萬</pattern>
 					<pattern type="1000000" count="other">¤000萬</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 000萬</pattern>
 					<pattern type="10000000" count="other">¤0000萬</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0000萬</pattern>
 					<pattern type="100000000" count="other">¤0億</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 0億</pattern>
 					<pattern type="1000000000" count="other">¤00億</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 00億</pattern>
 					<pattern type="10000000000" count="other">¤000億</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 000億</pattern>
 					<pattern type="100000000000" count="other">¤0000億</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0000億</pattern>
 					<pattern type="1000000000000" count="other">¤0兆</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0兆</pattern>
 					<pattern type="10000000000000" count="other">¤00兆</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00兆</pattern>
 					<pattern type="100000000000000" count="other">¤000兆</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000兆</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -6363,6 +6476,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>格瑞那達元</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>加勒比盾</displayName>
+				<displayName count="other">加勒比盾</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>特殊提款權</displayName>
 			</currency>
@@ -6443,6 +6560,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZWD">
 				<displayName>辛巴威元 (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>辛巴威金</displayName>
+				<displayName count="other">辛巴威金</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>辛巴威元 (2009)</displayName>
 			</currency>
@@ -6479,6 +6600,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="area-square-inch">
 				<perUnitPattern>每平方英吋 {0}</perUnitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
+			</unit>
 			<unit type="duration-century">
 				<unitPattern count="other">{0} 個世紀</unitPattern>
 			</unit>
@@ -6557,6 +6686,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="mass-grain">
 				<unitPattern count="other">{0}格令</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>水銀柱</displayName>
+				<unitPattern count="other">{0} 水銀柱</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
 			</unit>
@@ -6584,6 +6717,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-liter">
 				<perUnitPattern>每公升 {0}</perUnitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量安士</displayName>
+				<unitPattern count="other">{0} 公制液量安士</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>每加侖 {0}</perUnitPattern>
 			</unit>
@@ -6593,19 +6730,62 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-dessert-spoon-imperial">
 				<unitPattern count="other">英制甜品匙{0}匙</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>光速</displayName>
-				<unitPattern count="other">{0} 光速</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>開特</displayName>
+				<unitPattern count="other">{0} 開特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>庫侖</displayName>
+				<unitPattern count="other">{0} 庫侖</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法拉</displayName>
+				<unitPattern count="other">{0} 法拉</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨利</displayName>
+				<unitPattern count="other">{0} 亨利</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西門子</displayName>
+				<unitPattern count="other">{0} 西門子</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>國際蒸汽表卡路里</displayName>
+				<unitPattern count="other">{0} 國際蒸汽表卡路里</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克勒爾</displayName>
+				<unitPattern count="other">{0} 貝克勒爾</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希沃特</displayName>
+				<unitPattern count="other">{0} 希沃特</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈瑞</displayName>
+				<unitPattern count="other">{0} 戈瑞</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特斯拉</displayName>
+				<unitPattern count="other">{0} 特斯拉</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韋伯</displayName>
+				<unitPattern count="other">{0} 韋伯</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>十億分點濃度</displayName>
 				<unitPattern count="other">{0} 十億分點濃度</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>晚</displayName>
-				<unitPattern count="other">{0} 晚</unitPattern>
-				<perUnitPattern>{0}/晚</perUnitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="10p-1">
@@ -6801,7 +6981,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>項</displayName>
 				<unitPattern count="other">{0} 項</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>百萬分率</displayName>
 				<unitPattern count="other">{0} 百萬分率</unitPattern>
 			</unit>
@@ -6813,6 +6997,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>摩爾</displayName>
 				<unitPattern count="other">{0} 摩爾</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>公升/公里</displayName>
 				<unitPattern count="other">{0} 公升/公里</unitPattern>
@@ -7194,6 +7382,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>毫米汞柱</displayName>
 				<unitPattern count="other">{0} 毫米汞柱</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>磅力/平方英吋</displayName>
 				<unitPattern count="other">每平方吋{0}磅</unitPattern>
@@ -7327,6 +7518,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>公制量杯</displayName>
 				<unitPattern count="other">{0} 公制杯</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量安士</displayName>
+				<unitPattern count="other">{0} 公制液量安士</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>英畝英呎</displayName>
 				<unitPattern count="other">{0} 英畝英呎</unitPattern>
@@ -7405,11 +7600,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>英制夸脫</displayName>
 				<unitPattern count="other">{0} 英制夸脫</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>開特</displayName>
+				<unitPattern count="other">{0} 開特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>庫</displayName>
+				<unitPattern count="other">{0} 庫</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法</displayName>
+				<unitPattern count="other">{0} 法</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨</displayName>
+				<unitPattern count="other">{0} 亨</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西</displayName>
+				<unitPattern count="other">{0} 西</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>國際蒸汽表卡</displayName>
+				<unitPattern count="other">{0} 國際蒸汽表卡</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克</displayName>
+				<unitPattern count="other">{0} 貝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希</displayName>
+				<unitPattern count="other">{0} 希</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈</displayName>
+				<unitPattern count="other">{0} 戈</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特</displayName>
+				<unitPattern count="other">{0} 特</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韋</displayName>
+				<unitPattern count="other">{0} 韋</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>光速</displayName>
 				<unitPattern count="other">{0} 光速</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>濃度/十億</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7426,6 +7673,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
+			</unit>
 			<unit type="digital-byte">
 				<displayName>B</displayName>
 				<unitPattern count="other">{0}B</unitPattern>
@@ -7462,6 +7717,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="mass-ounce">
 				<perUnitPattern>每安士 {0}</perUnitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
 			</unit>
@@ -7477,17 +7735,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量安士</displayName>
+				<unitPattern count="other">{0} 公制液量安士</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>開特</displayName>
+				<unitPattern count="other">{0} 開特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>庫</displayName>
+				<unitPattern count="other">{0} 庫</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法</displayName>
+				<unitPattern count="other">{0} 法</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨</displayName>
+				<unitPattern count="other">{0} 亨</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西</displayName>
+				<unitPattern count="other">{0} 西</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>卡路里-IT</displayName>
+				<unitPattern count="other">{0} 卡路里-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克</displayName>
+				<unitPattern count="other">{0} 貝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希</displayName>
+				<unitPattern count="other">{0} 希</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈</displayName>
+				<unitPattern count="other">{0} 戈</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特</displayName>
+				<unitPattern count="other">{0} 特</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韋</displayName>
+				<unitPattern count="other">{0} 韋</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>光速</displayName>
 				<unitPattern count="other">{0}光速</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>晚</displayName>
 				<unitPattern count="other">{0}晚</unitPattern>
-				<perUnitPattern>{0}/晚</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/yue_Hans.xml b/make/data/cldr/common/main/yue_Hans.xml
index b7c29be1597..75da3270126 100644
--- a/make/data/cldr/common/main/yue_Hans.xml
+++ b/make/data/cldr/common/main/yue_Hans.xml
@@ -147,7 +147,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="dar">达尔格瓦文</language>
 			<language type="dav">台塔文</language>
 			<language type="de">德文</language>
-			<language type="de_CH">高地德文（瑞士）</language>
+			<language type="de_CH">高地德文 (瑞士)</language>
 			<language type="del">德拉瓦文</language>
 			<language type="den">斯拉夫</language>
 			<language type="dgr">多格里布文</language>
@@ -210,7 +210,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="gd">苏格兰盖尔文</language>
 			<language type="gez">吉兹文</language>
 			<language type="gil">吉尔伯特群岛文</language>
-			<language type="gl">加利西亚文</language>
+			<language type="gl">加里西亚文</language>
 			<language type="glk">吉拉基文</language>
 			<language type="gmh">中古高地德文</language>
 			<language type="gn">瓜拉尼文</language>
@@ -245,7 +245,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ht">海地文</language>
 			<language type="hu">匈牙利文</language>
 			<language type="hup">胡帕文</language>
-			<language type="hur">哈尔科梅勒姆文</language>
+			<language type="hur">哈尔魁梅林语</language>
 			<language type="hy">亚美尼亚文</language>
 			<language type="hz">赫雷罗文</language>
 			<language type="ia">国际文</language>
@@ -261,7 +261,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="inh">印古什文</language>
 			<language type="io">伊多文</language>
 			<language type="is">冰岛文</language>
-			<language type="it">意大利文</language>
+			<language type="it">义大利文</language>
 			<language type="iu">因纽特文</language>
 			<language type="izh">英格里亚文</language>
 			<language type="ja">日文</language>
@@ -318,7 +318,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksb">尚巴拉文</language>
 			<language type="ksf">巴菲亚文</language>
 			<language type="ksh">科隆文</language>
-			<language type="ku">库尔德文</language>
+			<language type="ku">库德文</language>
+			<language type="ku" menu="core">库德文</language>
+			<language type="ku" menu="extension">北库德文</language>
 			<language type="kum">库密克文</language>
 			<language type="kut">库特奈文</language>
 			<language type="kv">科米文</language>
@@ -883,7 +885,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="AU">澳洲</territory>
 			<territory type="AW">荷属阿鲁巴</territory>
 			<territory type="AX">奥兰群岛</territory>
-			<territory type="AZ">亚塞拜然</territory>
+			<territory type="AZ">阿塞拜疆</territory>
 			<territory type="BA">波斯尼亚同黑塞哥维那</territory>
 			<territory type="BB">巴贝多</territory>
 			<territory type="BD">孟加拉</territory>
@@ -917,9 +919,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CK">库克群岛</territory>
 			<territory type="CL">智利</territory>
 			<territory type="CM">喀麦隆</territory>
-			<territory type="CN">中华人民共和国</territory>
+			<territory type="CN">中国</territory>
 			<territory type="CO">哥伦比亚</territory>
 			<territory type="CP">克里派顿岛</territory>
+			<territory type="CQ">萨克</territory>
 			<territory type="CR">哥斯大黎加</territory>
 			<territory type="CU">古巴</territory>
 			<territory type="CV">维德角</territory>
@@ -955,7 +958,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GA">加彭</territory>
 			<territory type="GB">英国</territory>
 			<territory type="GD">格瑞那达</territory>
-			<territory type="GE">乔治亚共和国</territory>
+			<territory type="GE">格鲁吉亚</territory>
 			<territory type="GF">法属圭亚那</territory>
 			<territory type="GG">根西岛</territory>
 			<territory type="GH">迦纳</territory>
@@ -971,7 +974,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="GU">关岛</territory>
 			<territory type="GW">几内亚比索</territory>
 			<territory type="GY">盖亚那</territory>
-			<territory type="HK">中华人民共和国香港特别行政区</territory>
+			<territory type="HK">中国香港特别行政区</territory>
 			<territory type="HK" alt="short">香港</territory>
 			<territory type="HM">赫德岛同麦克唐纳群岛</territory>
 			<territory type="HN">宏都拉斯</territory>
@@ -989,7 +992,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IQ">伊拉克</territory>
 			<territory type="IR">伊朗</territory>
 			<territory type="IS">冰岛</territory>
-			<territory type="IT">义大利</territory>
+			<territory type="IT">意大利</territory>
 			<territory type="JE">泽西岛</territory>
 			<territory type="JM">牙买加</territory>
 			<territory type="JO">约旦</territory>
@@ -1005,7 +1008,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="KW">科威特</territory>
 			<territory type="KY">开曼群岛</territory>
 			<territory type="KZ">哈萨克</territory>
-			<territory type="LA">寮国</territory>
+			<territory type="LA">老挝</territory>
 			<territory type="LB">黎巴嫩</territory>
 			<territory type="LC">圣露西亚</territory>
 			<territory type="LI">列支敦斯登</territory>
@@ -1023,11 +1026,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MF">法属圣马丁</territory>
 			<territory type="MG">马达加斯加</territory>
 			<territory type="MH">马绍尔群岛</territory>
-			<territory type="MK">马其顿</territory>
+			<territory type="MK">北马其顿</territory>
 			<territory type="ML">马利</territory>
 			<territory type="MM">缅甸</territory>
 			<territory type="MN">蒙古</territory>
-			<territory type="MO">中华人民共和国澳门特别行政区</territory>
+			<territory type="MO">中国澳门特别行政区</territory>
 			<territory type="MO" alt="short">澳门</territory>
 			<territory type="MP">北马里亚纳群岛</territory>
 			<territory type="MQ">马丁尼克岛</territory>
@@ -1051,7 +1054,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="NP">尼泊尔</territory>
 			<territory type="NR">诺鲁</territory>
 			<territory type="NU">纽埃岛</territory>
-			<territory type="NZ">纽西兰</territory>
+			<territory type="NZ">新西兰</territory>
 			<territory type="OM">阿曼王国</territory>
 			<territory type="PA">巴拿马</territory>
 			<territory type="PE">秘鲁</territory>
@@ -1075,7 +1078,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="RS">塞尔维亚</territory>
 			<territory type="RU">俄罗斯</territory>
 			<territory type="RW">卢安达</territory>
-			<territory type="SA">沙乌地阿拉伯</territory>
+			<territory type="SA">沙特阿拉伯</territory>
 			<territory type="SB">索罗门群岛</territory>
 			<territory type="SC">塞席尔</territory>
 			<territory type="SD">苏丹</territory>
@@ -1133,7 +1136,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="XA">伪口音</territory>
 			<territory type="XB">伪 Bidi</territory>
 			<territory type="XK">科索沃</territory>
-			<territory type="YE">叶门</territory>
+			<territory type="YE">也门</territory>
 			<territory type="YT">马约特</territory>
 			<territory type="ZA">南非</territory>
 			<territory type="ZM">尚比亚</territory>
@@ -1216,35 +1219,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<key type="colNumeric">数字排序</key>
 			<key type="colStrength">排序强度</key>
 			<key type="currency">货币</key>
+			<key type="em">Emoji 显示方式</key>
 			<key type="hc">时间周期（12 小时制与 24 小时制）</key>
 			<key type="lb">换行样式</key>
+			<key type="lw">单字强制换行</key>
 			<key type="ms">度量单位系统</key>
 			<key type="numbers">数字</key>
+			<key type="ss">缩写后断句</key>
 			<key type="timezone">时区</key>
 			<key type="va">区域变异</key>
 			<key type="x">专用区</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">佛历</type>
+			<type key="calendar" type="buddhist" scope="core">佛历</type>
 			<type key="calendar" type="chinese">农历</type>
+			<type key="calendar" type="chinese" scope="core">农历</type>
 			<type key="calendar" type="coptic">科普特历</type>
+			<type key="calendar" type="coptic" scope="core">科普特历</type>
 			<type key="calendar" type="dangi">檀纪历</type>
-			<type key="calendar" type="ethiopic">衣索比亚历</type>
-			<type key="calendar" type="ethiopic-amete-alem">衣索比亚历 (Amete Alem)</type>
+			<type key="calendar" type="dangi" scope="core">檀纪历</type>
+			<type key="calendar" type="ethiopic">埃塞俄比亚历</type>
+			<type key="calendar" type="ethiopic" scope="core">埃塞俄比亚历</type>
+			<type key="calendar" type="ethiopic-amete-alem">埃塞俄比亚阿美德阿莱姆历</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">埃塞俄比亚阿美德阿莱姆</type>
 			<type key="calendar" type="gregorian">公历</type>
+			<type key="calendar" type="gregorian" scope="core">公历</type>
 			<type key="calendar" type="hebrew">希伯来历</type>
+			<type key="calendar" type="hebrew" scope="core">希伯来历</type>
 			<type key="calendar" type="indian">印度国历</type>
 			<type key="calendar" type="islamic">伊斯兰历</type>
-			<type key="calendar" type="islamic-civil">伊斯兰民用历</type>
+			<type key="calendar" type="islamic" scope="core">伊斯兰历</type>
+			<type key="calendar" type="islamic-civil">伊斯兰民用历 (表格式)</type>
+			<type key="calendar" type="islamic-civil" scope="core">伊斯兰民用历 (表格式)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">伊斯兰新月历</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">伊斯兰天文历</type>
-			<type key="calendar" type="islamic-umalqura">乌姆库拉历</type>
-			<type key="calendar" type="iso8601">国际标准 ISO 8601</type>
+			<type key="calendar" type="islamic-umalqura">伊斯兰历 (乌姆库拉)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">伊斯兰历 (乌姆库拉)</type>
+			<type key="calendar" type="iso8601">公历 (元年)</type>
 			<type key="calendar" type="japanese">日本历</type>
+			<type key="calendar" type="japanese" scope="core">日本历</type>
 			<type key="calendar" type="persian">波斯历</type>
+			<type key="calendar" type="persian" scope="core">波斯历</type>
 			<type key="calendar" type="roc">民国历</type>
+			<type key="calendar" type="roc" scope="core">民国历</type>
 			<type key="cf" type="account">会计货币格式</type>
+			<type key="cf" type="account" scope="core">会计</type>
 			<type key="cf" type="standard">标准货币格式</type>
+			<type key="cf" type="standard" scope="core">标准</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">排序符号</type>
 			<type key="colAlternate" type="shifted" draft="contributed">略过符号排序</type>
 			<type key="colBackwards" type="no" draft="contributed">正常排序重音</type>
@@ -1254,17 +1276,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="colCaseFirst" type="upper" draft="contributed">优先排序大写</type>
 			<type key="colCaseLevel" type="no" draft="contributed">不分大小写排序</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">依大小写排序</type>
-			<type key="collation" type="big5han">繁体中文排序 - Big5</type>
 			<type key="collation" type="dictionary">字典排序</type>
 			<type key="collation" type="ducet">预设 Unicode 排序</type>
+			<type key="collation" type="ducet" scope="core">预设 Unicode</type>
 			<type key="collation" type="eor" draft="contributed">欧洲排序规则</type>
-			<type key="collation" type="gb2312han">简体中文排序 - GB2312</type>
 			<type key="collation" type="phonebook">电话簿排序</type>
 			<type key="collation" type="phonetic">发音排序</type>
 			<type key="collation" type="pinyin">拼音排序</type>
 			<type key="collation" type="search">一般用途搜寻</type>
+			<type key="collation" type="search" scope="core">搜寻</type>
 			<type key="collation" type="searchjl" draft="contributed">韩文子音排序</type>
 			<type key="collation" type="standard">标准排序</type>
+			<type key="collation" type="standard" scope="core">标准</type>
 			<type key="collation" type="stroke">笔画排序</type>
 			<type key="collation" type="traditional">传统排序</type>
 			<type key="collation" type="unihan">部首笔画排序</type>
@@ -1281,18 +1304,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="d0" type="fwidth">全形</type>
 			<type key="d0" type="hwidth">半形</type>
 			<type key="d0" type="npinyin" draft="contributed">数值</type>
+			<type key="em" type="default" scope="core">预设</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">文字</type>
 			<type key="hc" type="h11">12 小时制 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 小时制 (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 小时制 (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 小时制 (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">宽松换行样式</type>
+			<type key="lb" type="loose" scope="core">宽松</type>
 			<type key="lb" type="normal">一般换行样式</type>
+			<type key="lb" type="normal" scope="core">一般</type>
 			<type key="lb" type="strict">强制换行样式</type>
+			<type key="lb" type="strict" scope="core">强制</type>
+			<type key="lw" type="breakall" scope="core">任意换行</type>
+			<type key="lw" type="keepall" scope="core">全部保留</type>
+			<type key="lw" type="normal" scope="core">一般</type>
+			<type key="lw" type="phrase" scope="core">唔拆开词组</type>
 			<type key="m0" type="bgn">美国地名委员会</type>
 			<type key="m0" type="ungegn">联合国地名专家组</type>
 			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="metric" scope="core">公制</type>
 			<type key="ms" type="uksystem">英制度量单位系统</type>
+			<type key="ms" type="uksystem" scope="core">英制</type>
 			<type key="ms" type="ussystem">美制度量单位系统</type>
+			<type key="ms" type="ussystem" scope="core">美制</type>
 			<type key="numbers" type="arab">阿拉伯-印度数字</type>
 			<type key="numbers" type="arabext">阿拉伯-印度扩充数字</type>
 			<type key="numbers" type="armn">亚美尼亚数字</type>
@@ -1354,6 +1394,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="numbers" type="tibt">西藏数字</type>
 			<type key="numbers" type="traditional" draft="contributed">传统数字</type>
 			<type key="numbers" type="vaii">瓦伊文数字</type>
+			<type key="ss" type="none" scope="core">闩</type>
+			<type key="ss" type="standard" scope="core">开</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">公制</measurementSystemName>
@@ -1372,11 +1414,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[﹉﹊﹋﹌ _＿﹍﹎﹏︳︴ \-－﹣ ‐‑ – —︱ ― ,，﹐ 、﹑ ;；﹔ \:：﹕ !！﹗ ?？﹖ .．﹒ ‥︰ … 。 · ＇‘’ &quot;＂“”〝〞 (（﹙︵ )）﹚︶ \[［ \]］ \{｛﹛︷ \}｝﹜︸ 〈︿ 〉﹀ 《︽ 》︾ 「﹁ 」﹂ 『﹃ 』﹄ 【︻ 】︼ 〔﹝︹ 〕﹞︺ 〖 〗 ‖ § @＠﹫ *＊﹡ /／ \\＼﹨ \&amp;＆﹠ #＃﹟ %％﹪ ‰ ′ ″ ‵ 〃 ※]</exemplarCharacters>
-		<ellipsis type="word-final">{0}…</ellipsis>
-		<ellipsis type="word-initial">…{0}</ellipsis>
-		<ellipsis type="word-medial">{0}…{1}</ellipsis>
 		<moreInformation>？</moreInformation>
 	</characters>
+	<delimiters>
+		<quotationStart>「</quotationStart>
+		<quotationEnd>」</quotationEnd>
+		<alternateQuotationStart>『</alternateQuotationStart>
+		<alternateQuotationEnd>』</alternateQuotationEnd>
+	</delimiters>
 	<dates>
 		<calendars>
 			<calendar type="buddhist">
@@ -1389,43 +1434,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gy-M-d</pattern>
+							<pattern>Gy/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="M">M月</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">M-dE</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="yyyyM">Gy-M</dateFormatItem>
-						<dateFormatItem id="yyyyMd">Gy-M-d</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">Gy-M-d（E）</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -1620,14 +1663,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern numbers="d=hanidays">rU年MMMdEEEE</pattern>
-							<datetimeSkeleton numbers="d=hanidays">rMMMEEEEd</datetimeSkeleton>
+							<pattern numbers="d=hanidays">U (r) 年MMMdEEEE</pattern>
+							<datetimeSkeleton numbers="d=hanidays">UMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern numbers="d=hanidays">rU年MMMd</pattern>
-							<datetimeSkeleton numbers="d=hanidays">rMMMd</datetimeSkeleton>
+							<pattern numbers="d=hanidays">U (r) 年MMMd</pattern>
+							<datetimeSkeleton numbers="d=hanidays">UMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -1651,8 +1694,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMMMd">r年MMMd</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">rU年MMMdE</dateFormatItem>
 						<dateFormatItem id="M">MMM</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">M-dE</dateFormatItem>
+						<dateFormatItem id="Md">M/d</dateFormatItem>
+						<dateFormatItem id="MEd">M/dE</dateFormatItem>
 						<dateFormatItem id="MMMd">MMMd日</dateFormatItem>
 						<dateFormatItem id="MMMEd">MMMd日E</dateFormatItem>
 						<dateFormatItem id="MMMMd">MMMMd日</dateFormatItem>
@@ -1674,13 +1717,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yyyyQQQQ">rU年QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
+						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
 							<greatestDifference id="d">d日至d日</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">ah至ah时</greatestDifference>
-							<greatestDifference id="h">ah至h时</greatestDifference>
+							<greatestDifference id="a">ah时至ah时</greatestDifference>
+							<greatestDifference id="h">ah时至h时</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">ah:mm至ah:mm</greatestDifference>
@@ -1688,28 +1731,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="contributed">vah:mm至ah:mm</greatestDifference>
-							<greatestDifference id="h" draft="contributed">vah:mm至h:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">vah:mm至h:mm</greatestDifference>
+							<greatestDifference id="a" draft="contributed">ah:mm至ah:mm [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
+							<greatestDifference id="m" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">HH:mm至HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm至HH:mm v</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm [v]</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">vah至ah时</greatestDifference>
-							<greatestDifference id="h" draft="contributed">vah至h时</greatestDifference>
+							<greatestDifference id="a" draft="contributed">ah时至ah时 [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah时至h时 [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">L至L</greatestDifference>
+							<greatestDifference id="M">MMM至MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M-d至M-d</greatestDifference>
-							<greatestDifference id="M">M-d至M-d</greatestDifference>
+							<greatestDifference id="d">M/d至M/d</greatestDifference>
+							<greatestDifference id="M">M/d至M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M-dE至M-dE</greatestDifference>
-							<greatestDifference id="M">M-dE至M-dE</greatestDifference>
+							<greatestDifference id="d">M/dE至M/dE</greatestDifference>
+							<greatestDifference id="M">M/dE至M/dE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">LLL至LLL</greatestDifference>
@@ -1729,18 +1775,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">rU至rU</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">r-M至r-M</greatestDifference>
-							<greatestDifference id="y">r-M至r-M</greatestDifference>
+							<greatestDifference id="M">r/M至r/M</greatestDifference>
+							<greatestDifference id="y">r/M至r/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">r-M-d至r-M-d</greatestDifference>
-							<greatestDifference id="M">r-M-d至r-M-d</greatestDifference>
-							<greatestDifference id="y">r-M-d至r-M-d</greatestDifference>
+							<greatestDifference id="d">r/M/d至r/M/d</greatestDifference>
+							<greatestDifference id="M">r/M/d至r/M/d</greatestDifference>
+							<greatestDifference id="y">r/M/d至r/M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">r-M-dE至r-M-dE</greatestDifference>
-							<greatestDifference id="M">r-M-dE至r-M-dE</greatestDifference>
-							<greatestDifference id="y">r-M-dE至r-M-dE</greatestDifference>
+							<greatestDifference id="d">r/M/dE至r/M/dE</greatestDifference>
+							<greatestDifference id="M">r/M/dE至r/M/dE</greatestDifference>
+							<greatestDifference id="y">r/M/dE至r/M/dE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">rU年MMM至MMM</greatestDifference>
@@ -1879,13 +1925,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>U年MMMd日EEEE</pattern>
-							<datetimeSkeleton>UMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>U年MMMd日</pattern>
-							<datetimeSkeleton>UMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -1927,25 +1971,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>Gy年MM月d日EEEE</pattern>
+							<pattern>G y年M月d日 EEEE</pattern>
 							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>Gy年MM月d日</pattern>
+							<pattern>G y年M月d日</pattern>
 							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>Gy年MM月d日</pattern>
+							<pattern>G y年M月d日</pattern>
 							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gy/M/d</pattern>
+							<pattern>G y/M/d</pattern>
 							<datetimeSkeleton>GyMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -1953,7 +1997,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -1963,6 +2007,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1971,48 +2018,67 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">Bh时</dateFormatItem>
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
-						<dateFormatItem id="Ed">d日E</dateFormatItem>
-						<dateFormatItem id="Ehm">ah:mmE</dateFormatItem>
-						<dateFormatItem id="Ehms">ah:mm:ssE</dateFormatItem>
-						<dateFormatItem id="Gy">Gy年</dateFormatItem>
-						<dateFormatItem id="GyMMM">Gy年MM月</dateFormatItem>
-						<dateFormatItem id="GyMMMd">Gy年MM月d日</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">Gy年MM月d日E</dateFormatItem>
-						<dateFormatItem id="h">ah时</dateFormatItem>
-						<dateFormatItem id="H">H时</dateFormatItem>
+						<dateFormatItem id="EBh">EBh点</dateFormatItem>
+						<dateFormatItem id="EBhm">EBh:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">EBh:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">Eah点</dateFormatItem>
+						<dateFormatItem id="Ehm">Eah:mm</dateFormatItem>
+						<dateFormatItem id="EHm">EHH:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">Eah:mm:ss</dateFormatItem>
+						<dateFormatItem id="EHms">EHH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Gy">G y年</dateFormatItem>
+						<dateFormatItem id="GyM">G M/y</dateFormatItem>
+						<dateFormatItem id="GyMd">G d/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d/M/y (E)</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y年M月</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y年M月d日</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="h">ah点</dateFormatItem>
+						<dateFormatItem id="H">H点</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
+						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">ah 点 (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH点 (v)</dateFormatItem>
+						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">M/dE</dateFormatItem>
-						<dateFormatItem id="MMM">LL</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
 						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="y">Gy年</dateFormatItem>
-						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
-						<dateFormatItem id="yyyyM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="y">G y年</dateFormatItem>
+						<dateFormatItem id="yyyy">G y年</dateFormatItem>
+						<dateFormatItem id="yyyyM">G y/M</dateFormatItem>
 						<dateFormatItem id="yyyyMd">G y/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">G y/M/dE</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">Gy年MM月</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">Gy年MM月d日</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">Gy年MM月d日E</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">Gy年第Q季度</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">Gy年第Q季度</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">G y/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y年M月</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y年M月d日</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">G y年M月</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y年QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y年QQQQ</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
 						<intervalFormatItem id="Bh">
 							<greatestDifference id="B">Bh时至Bh时</greatestDifference>
 							<greatestDifference id="h">Bh至h时</greatestDifference>
@@ -2023,7 +2089,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m">Bh:mm至h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d">d至d日</greatestDifference>
+							<greatestDifference id="d">d日至d日</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">G y年至G y年</greatestDifference>
@@ -2073,31 +2139,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a" draft="contributed">vah:mm至ah:mm</greatestDifference>
-							<greatestDifference id="h" draft="contributed">vah:mm至h:mm</greatestDifference>
-							<greatestDifference id="m" draft="contributed">vah:mm至h:mm</greatestDifference>
+							<greatestDifference id="a" draft="contributed">ah:mm至ah:mm [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
+							<greatestDifference id="m" draft="contributed">ah:mm至h:mm [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">v HH:mm – HH:mm</greatestDifference>
-							<greatestDifference id="m">v HH:mm – HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm [v]</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a" draft="contributed">vah时至ah时</greatestDifference>
-							<greatestDifference id="h" draft="contributed">vah时至h时</greatestDifference>
+							<greatestDifference id="a" draft="contributed">ah时至ah时 [v]</greatestDifference>
+							<greatestDifference id="h" draft="contributed">ah时至h时 [v]</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M月</greatestDifference>
+							<greatestDifference id="M">M月至M月</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d – M/d</greatestDifference>
-							<greatestDifference id="M">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">M/d至M/d</greatestDifference>
+							<greatestDifference id="M">M/d至M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M/dE至M/dE</greatestDifference>
-							<greatestDifference id="M">M/dE至M/dE</greatestDifference>
+							<greatestDifference id="d">d/M (E) 至 d/M (E)</greatestDifference>
+							<greatestDifference id="M">d/M (E) 至 d/M (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM – MMM</greatestDifference>
+							<greatestDifference id="M">LLL至LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">M月d日至d日</greatestDifference>
@@ -2111,39 +2180,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">Gy–y年</greatestDifference>
+							<greatestDifference id="y">G y至y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
-							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">G y/M至y/M</greatestDifference>
+							<greatestDifference id="y">G y/M至y/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">Gy/M/d – y/M/d</greatestDifference>
-							<greatestDifference id="M">Gy/M/d – y/M/d</greatestDifference>
-							<greatestDifference id="y">Gy/M/d – y/M/d</greatestDifference>
+							<greatestDifference id="d">G y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="M">G y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="y">G y/M/d至y/M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">Gy/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="M">Gy/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="y">Gy/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="d">G y/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="M">G y/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="y">G y/M/dE至y/M/dE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
-							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">G y年M月至M月</greatestDifference>
+							<greatestDifference id="y">G y年M月至y年M月</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">Gy年M月d日至d日</greatestDifference>
-							<greatestDifference id="M">Gy年M月d日至M月d日</greatestDifference>
-							<greatestDifference id="y">Gy年M月d日至y年M月d日</greatestDifference>
+							<greatestDifference id="d">G y年M月d日至d日</greatestDifference>
+							<greatestDifference id="M">G y年M月d日至M月d日</greatestDifference>
+							<greatestDifference id="y">G y年M月d日至y年M月d日</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">Gy年M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">Gy年M月d日E至M月d日E</greatestDifference>
-							<greatestDifference id="y">Gy年M月d日E至y年M月d日E</greatestDifference>
+							<greatestDifference id="d">G y年M月d日E至d日E</greatestDifference>
+							<greatestDifference id="M">G y年M月d日E至M月d日E</greatestDifference>
+							<greatestDifference id="y">G y年M月d日E至y年M月d日E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">Gy年M月至M月</greatestDifference>
-							<greatestDifference id="y">Gy年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">G y年M月至M月</greatestDifference>
+							<greatestDifference id="y">G y年M月至y年M月</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2151,7 +2220,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
+						<monthWidth type="wide">
 							<month type="1">1月</month>
 							<month type="2">2月</month>
 							<month type="3">3月</month>
@@ -2165,32 +2234,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">11月</month>
 							<month type="12">12月</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">一月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">九月</month>
-							<month type="10">十月</month>
-							<month type="11">十一月</month>
-							<month type="12">十二月</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
 					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">周日</day>
-							<day type="mon">周一</day>
-							<day type="tue">周二</day>
-							<day type="wed">周三</day>
-							<day type="thu">周四</day>
-							<day type="fri">周五</day>
-							<day type="sat">周六</day>
+						<dayWidth type="short">
+							<day type="sun">日</day>
+							<day type="mon">一</day>
+							<day type="tue">二</day>
+							<day type="wed">三</day>
+							<day type="thu">四</day>
+							<day type="fri">五</day>
+							<day type="sat">六</day>
 						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun">星期日</day>
@@ -2228,8 +2283,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="midnight">午夜</dayPeriod>
-							<dayPeriod type="am">上午</dayPeriod>
-							<dayPeriod type="pm">下午</dayPeriod>
+							<dayPeriod type="am">上昼</dayPeriod>
+							<dayPeriod type="pm">下昼</dayPeriod>
 							<dayPeriod type="morning1">清晨</dayPeriod>
 							<dayPeriod type="morning2">朝早</dayPeriod>
 							<dayPeriod type="afternoon1">中午</dayPeriod>
@@ -2237,6 +2292,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="evening1">夜晚</dayPeriod>
 							<dayPeriod type="night1">凌晨</dayPeriod>
 						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">上昼</dayPeriod>
+							<dayPeriod type="pm">下昼</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">上昼</dayPeriod>
+							<dayPeriod type="pm">下昼</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am">上昼</dayPeriod>
+							<dayPeriod type="pm">下昼</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">上昼</dayPeriod>
+							<dayPeriod type="pm">下昼</dayPeriod>
+						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -2250,7 +2323,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>y年M月d日EEEE</pattern>
+							<pattern>y年M月d日 EEEE</pattern>
 							<datetimeSkeleton>yMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
@@ -2276,22 +2349,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>zzzz HH:mm:ss</pattern>
+							<pattern>HH:mm:ss [zzzz]</pattern>
+							<datetimeSkeleton>HHmmssz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>z HH:mm:ss</pattern>
+							<pattern>HH:mm:ss [z]</pattern>
+							<datetimeSkeleton>HHmmssz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
 							<pattern>HH:mm:ss</pattern>
+							<datetimeSkeleton>HHmmss</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
 							<pattern>HH:mm</pattern>
+							<datetimeSkeleton>HHmm</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
@@ -2303,6 +2380,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -2311,6 +2391,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -2319,62 +2402,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateTimeFormat type="atTime">
 							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="Bh">Bh时</dateFormatItem>
+						<dateFormatItem id="Bh">Bh点</dateFormatItem>
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EBh点</dateFormatItem>
 						<dateFormatItem id="EBhm">E Bh:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E Bh:mm:ss</dateFormatItem>
-						<dateFormatItem id="Ed">d日E</dateFormatItem>
-						<dateFormatItem id="Ehm">Eah:mm</dateFormatItem>
-						<dateFormatItem id="EHm">EHH:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">Eah:mm:ss</dateFormatItem>
-						<dateFormatItem id="EHms">EHH:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">Eah 点</dateFormatItem>
+						<dateFormatItem id="Ehm">E ah:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">E ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">GM/y</dateFormatItem>
+						<dateFormatItem id="GyMd">Gd/M/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gd/M/y (E)</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
-						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">Gy年M月d日 E</dateFormatItem>
 						<dateFormatItem id="h">ah时</dateFormatItem>
-						<dateFormatItem id="H">H时</dateFormatItem>
+						<dateFormatItem id="H">H点</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="hmsv">v ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hmsv">v HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="hmv">v ah:mm</dateFormatItem>
-						<dateFormatItem id="Hmv">v HH:mm</dateFormatItem>
+						<dateFormatItem id="hmsv">ah:mm:ss [v]</dateFormatItem>
+						<dateFormatItem id="Hmsv">HH:mm:ss [v]</dateFormatItem>
+						<dateFormatItem id="hmv">ah:mm [v]</dateFormatItem>
+						<dateFormatItem id="Hmv">HH:mm [v]</dateFormatItem>
+						<dateFormatItem id="hv">ah点 (v)</dateFormatItem>
+						<dateFormatItem id="Hv">HH点 (v)</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">M/dE</dateFormatItem>
+						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
 						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
 						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">M月第W个星期</dateFormatItem>
 						<dateFormatItem id="y">y年</dateFormatItem>
-						<dateFormatItem id="yM">y年M月</dateFormatItem>
+						<dateFormatItem id="yM">y/M</dateFormatItem>
 						<dateFormatItem id="yMd">y/M/d</dateFormatItem>
-						<dateFormatItem id="yMEd">y/M/dE</dateFormatItem>
-						<dateFormatItem id="yMM">y年M月</dateFormatItem>
+						<dateFormatItem id="yMEd">y/M/d（E）</dateFormatItem>
+						<dateFormatItem id="yMM">y/MM</dateFormatItem>
 						<dateFormatItem id="yMMM">y年M月</dateFormatItem>
 						<dateFormatItem id="yMMMd">y年M月d日</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y年M月d日E</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y年M月d日 E</dateFormatItem>
 						<dateFormatItem id="yMMMM">y年M月</dateFormatItem>
 						<dateFormatItem id="yQQQ">y年QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y年QQQQ</dateFormatItem>
 						<dateFormatItem id="yw" count="other">Y年第w个星期</dateFormatItem>
 					</availableFormats>
-					<appendItems>
-						<appendItem request="Timezone">{1}{0}</appendItem>
-					</appendItems>
 					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
 						<intervalFormatItem id="Bh">
 							<greatestDifference id="B">Bh时至Bh时</greatestDifference>
 							<greatestDifference id="h">Bh至h时</greatestDifference>
@@ -2385,7 +2476,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="m">Bh:mm至h:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d日</greatestDifference>
+							<greatestDifference id="d">d日至d日</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">Gy年至Gy年</greatestDifference>
@@ -2434,35 +2525,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="h">ah:mm至h:mm</greatestDifference>
 							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
 						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="m">HH:mm至HH:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">vah:mm至ah:mm</greatestDifference>
-							<greatestDifference id="h">vah:mm至h:mm</greatestDifference>
-							<greatestDifference id="m">vah:mm至h:mm</greatestDifference>
+							<greatestDifference id="a">ah:mm至ah:mm [v]</greatestDifference>
+							<greatestDifference id="h">ah:mm至h:mm [v]</greatestDifference>
+							<greatestDifference id="m">ah:mm至h:mm [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
-							<greatestDifference id="H">v HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">v HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="H">HH:mm–HH:mm [v]</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">vah时至ah时</greatestDifference>
-							<greatestDifference id="h">vah时至h时</greatestDifference>
+							<greatestDifference id="a">ah时至ah时 [v]</greatestDifference>
+							<greatestDifference id="h">ah时至h时 [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">v HH–HH</greatestDifference>
+							<greatestDifference id="H">HH–HH [v]</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M月</greatestDifference>
+							<greatestDifference id="M">M月至M月</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d – M/d</greatestDifference>
-							<greatestDifference id="M">M/d – M/d</greatestDifference>
+							<greatestDifference id="d">M/d至M/d</greatestDifference>
+							<greatestDifference id="M">M/d至M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M/dE至M/dE</greatestDifference>
-							<greatestDifference id="M">M/dE至M/dE</greatestDifference>
+							<greatestDifference id="d">d/M (E) 至 d/M (E)</greatestDifference>
+							<greatestDifference id="M">d/M (E) 至 d/M (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM – MMM</greatestDifference>
+							<greatestDifference id="M">LLL至LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">M月d日至d日</greatestDifference>
@@ -2476,21 +2570,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y年</greatestDifference>
+							<greatestDifference id="y">y至y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y年M月至M月</greatestDifference>
-							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">y/M至y/M</greatestDifference>
+							<greatestDifference id="y">y/M至y/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y/M/d – y/M/d</greatestDifference>
-							<greatestDifference id="M">y/M/d – y/M/d</greatestDifference>
-							<greatestDifference id="y">y/M/d – y/M/d</greatestDifference>
+							<greatestDifference id="d">y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="M">y/M/d至y/M/d</greatestDifference>
+							<greatestDifference id="y">y/M/d至y/M/d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="M">y/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="y">y/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="d">d/M/y (E) 至 d/M/y (E)</greatestDifference>
+							<greatestDifference id="M">d/M/y (E) 至 d/M/y (E)</greatestDifference>
+							<greatestDifference id="y">d/M/y (E) 至 d/M/y (E)</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
 							<greatestDifference id="M">y年M月至M月</greatestDifference>
@@ -2543,24 +2637,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gy-M-d</pattern>
+							<pattern>Gy/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -2632,19 +2723,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2656,19 +2744,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="M">M月</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">M-dE</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
 						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
 						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
 						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -2920,25 +3009,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gyy-MM-dd</pattern>
-							<datetimeSkeleton>GyyMMdd</datetimeSkeleton>
+							<pattern>Gy/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -2964,19 +3049,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="M">M月</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">M-dE</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="yyyyM">Gy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">Gy-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">Gy-M-d（E）</dateFormatItem>
+						<dateFormatItem id="Hm" draft="contributed">HH:mm</dateFormatItem>
+						<dateFormatItem id="Hms" draft="contributed">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="MMMd" draft="contributed">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="MMMMd" draft="contributed">MMMM d</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -3017,41 +3108,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
+							<pattern>Gy年M月d日 EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>Gyy/M/d</pattern>
-							<datetimeSkeleton>GyyMd</datetimeSkeleton>
+							<pattern>Gy/M/d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
+						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
-						<dateFormatItem id="M">M月</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
+						<dateFormatItem id="y">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyy">Gy年</dateFormatItem>
+						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
 						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">Gy/M/dE</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">Gy/M/d（E）</dateFormatItem>
 						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="yyyyMMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="yyyyQQQ">Gy年QQQ</dateFormatItem>
 						<dateFormatItem id="yyyyQQQQ">Gy年QQQQ</dateFormatItem>
 					</availableFormats>
@@ -3258,6 +3350,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0}时间</regionFormat>
+			<regionFormat type="daylight">{0}夏令时间</regionFormat>
+			<regionFormat type="standard">{0}标准时间</regionFormat>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>檀香山</exemplarCity>
 			</zone>
@@ -3611,6 +3705,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Easter">
 				<exemplarCity>复活岛</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>科伊艾克</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>蓬塔阿雷纳斯</exemplarCity>
 			</zone>
@@ -3876,9 +3973,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>金边</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>恩得伯理岛</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>坎顿</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4555,9 +4649,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>西非时间</generic>
-					<standard>西非标准时间</standard>
-					<daylight>西非夏令时间</daylight>
+					<standard>西非时间</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4945,6 +5037,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>盖亚那时间</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>夏威夷-阿留申标准时间</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>夏威夷-阿留申时间</generic>
@@ -5486,8 +5583,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	<numbers>
 		<otherNumberingSystems>
 			<native>hanidec</native>
-			<traditional>hans</traditional>
-			<finance>hansfin</finance>
+			<traditional>hant</traditional>
+			<finance>hantfin</finance>
 		</otherNumberingSystems>
 		<symbols numberSystem="latn">
 			<nan>非数值</nan>
@@ -5495,7 +5592,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<decimalFormats numberSystem="latn">
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="other">0</pattern>
+					<pattern type="1000" count="other">0千</pattern>
 					<pattern type="10000" count="other">0万</pattern>
 					<pattern type="100000" count="other">00万</pattern>
 					<pattern type="1000000" count="other">000万</pattern>
@@ -5514,7 +5611,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5524,18 +5620,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="other">0</pattern>
+					<pattern type="1000" count="other">¤0千</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0千</pattern>
 					<pattern type="10000" count="other">¤0万</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 0万</pattern>
 					<pattern type="100000" count="other">¤00万</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 00万</pattern>
 					<pattern type="1000000" count="other">¤000万</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 000万</pattern>
 					<pattern type="10000000" count="other">¤0000万</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0000万</pattern>
 					<pattern type="100000000" count="other">¤0亿</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 0亿</pattern>
 					<pattern type="1000000000" count="other">¤00亿</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 00亿</pattern>
 					<pattern type="10000000000" count="other">¤000亿</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 000亿</pattern>
 					<pattern type="100000000000" count="other">¤0000亿</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0000亿</pattern>
 					<pattern type="1000000000000" count="other">¤0兆</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0兆</pattern>
 					<pattern type="10000000000000" count="other">¤00兆</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00兆</pattern>
 					<pattern type="100000000000000" count="other">¤000兆</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000兆</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
@@ -5743,7 +5851,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="CNY">
 				<displayName>人民币</displayName>
-				<symbol draft="contributed">￥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>哥伦比亚披索</displayName>
@@ -5939,6 +6046,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="JPY">
 				<displayName>日圆</displayName>
+				<symbol>¥</symbol>
 			</currency>
 			<currency type="KES">
 				<displayName>肯尼亚先令</displayName>
@@ -6328,7 +6436,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>委内瑞拉玻利瓦 (1871–2008)</displayName>
 			</currency>
 			<currency type="VEF">
-				<displayName>委内瑞拉玻利瓦 (2008–2018)</displayName>
+				<displayName>委内瑞拉玻利瓦 (VEF)</displayName>
 			</currency>
 			<currency type="VES">
 				<displayName>委内瑞拉玻利瓦</displayName>
@@ -6369,6 +6477,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="XCD">
 				<displayName>格瑞那达元</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>加勒比盾</displayName>
+				<displayName count="other">加勒比盾</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>特殊提款权</displayName>
 			</currency>
@@ -6449,6 +6561,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZWD">
 				<displayName>辛巴威元 (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>辛巴威金</displayName>
+				<displayName count="other">辛巴威金</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>辛巴威元 (2009)</displayName>
 			</currency>
@@ -6470,10 +6586,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="per">
 				<compoundUnitPattern>每 {1} {0}</compoundUnitPattern>
 			</compoundUnit>
-			<unit type="acceleration-meter-per-square-second">
-				<displayName>每平方秒公尺</displayName>
-				<unitPattern count="other">每平方秒 {0} 米</unitPattern>
-			</unit>
 			<unit type="area-square-kilometer">
 				<perUnitPattern>每平方公里 {0}</perUnitPattern>
 			</unit>
@@ -6487,19 +6599,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>每平方英里 {0}</perUnitPattern>
 			</unit>
 			<unit type="area-square-inch">
-				<perUnitPattern>每平方吋 {0}</perUnitPattern>
+				<perUnitPattern>每平方英寸 {0}</perUnitPattern>
 			</unit>
-			<unit type="consumption-liter-per-kilometer">
-				<displayName>每公里公升</displayName>
-				<unitPattern count="other">每公里 {0} 公升</unitPattern>
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
 			</unit>
-			<unit type="consumption-liter-per-100-kilometer">
-				<displayName>每 100 公里公升</displayName>
-				<unitPattern count="other">每 100 公里 {0} 公升</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<displayName>每加仑英里</displayName>
-				<unitPattern count="other">每加仑 {0} 英里</unitPattern>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
 			</unit>
 			<unit type="duration-century">
 				<unitPattern count="other">{0} 个世纪</unitPattern>
@@ -6514,10 +6622,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>每月 {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-week">
-				<perUnitPattern>每星期 {0}</perUnitPattern>
+				<perUnitPattern>每周 {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-day">
-				<perUnitPattern>每日 {0}</perUnitPattern>
+				<perUnitPattern>每天 {0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<perUnitPattern>每小时 {0}</perUnitPattern>
@@ -6531,25 +6639,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="electric-volt">
 				<unitPattern count="other">{0} 伏特</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>千卡路里</displayName>
-				<unitPattern count="other">{0} 千卡路里</unitPattern>
-			</unit>
-			<unit type="energy-calorie">
-				<unitPattern count="other">{0} 卡路里</unitPattern>
-			</unit>
-			<unit type="energy-foodcalorie">
-				<displayName>卡路里</displayName>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="other">{0} 千焦耳</unitPattern>
 			</unit>
-			<unit type="energy-joule">
-				<unitPattern count="other">{0} 焦耳</unitPattern>
-			</unit>
 			<unit type="graphics-em">
 				<displayName>字体 em</displayName>
 			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<displayName>每吋像素</displayName>
+				<unitPattern count="other">{0} 像素/吋</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-centimeter">
+				<displayName>每厘米点数</displayName>
+				<unitPattern count="other">{0} 点/厘米</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-inch">
+				<displayName>每吋点数</displayName>
+				<unitPattern count="other">{0} 点/吋</unitPattern>
+			</unit>
 			<unit type="length-kilometer">
 				<perUnitPattern>每公里 {0}</perUnitPattern>
 			</unit>
@@ -6560,18 +6667,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>每厘米 {0}</perUnitPattern>
 			</unit>
 			<unit type="length-foot">
-				<unitPattern count="other">{0} 英尺</unitPattern>
-				<perUnitPattern>每呎 {0}</perUnitPattern>
+				<perUnitPattern>每英呎 {0}</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
-				<unitPattern count="other">{0} 英寸</unitPattern>
-				<perUnitPattern>每吋 {0}</perUnitPattern>
-			</unit>
-			<unit type="length-astronomical-unit">
-				<displayName>天文单位</displayName>
-			</unit>
-			<unit type="length-fathom">
-				<displayName>英寻</displayName>
+				<perUnitPattern>每英寸 {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<perUnitPattern>每公斤 {0}</perUnitPattern>
@@ -6579,9 +6678,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="mass-gram">
 				<perUnitPattern>每克 {0}</perUnitPattern>
 			</unit>
-			<unit type="mass-stone">
-				<displayName>英石</displayName>
-			</unit>
 			<unit type="mass-pound">
 				<perUnitPattern>每磅 {0}</perUnitPattern>
 			</unit>
@@ -6591,53 +6687,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="mass-grain">
 				<unitPattern count="other">{0}格令</unitPattern>
 			</unit>
-			<unit type="power-megawatt">
-				<displayName>百万瓦特</displayName>
-				<unitPattern count="other">{0} 百万瓦特</unitPattern>
-			</unit>
-			<unit type="power-kilowatt">
-				<displayName>千瓦特</displayName>
-				<unitPattern count="other">{0} 千瓦特</unitPattern>
-			</unit>
-			<unit type="power-watt">
-				<unitPattern count="other">{0} 瓦特</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>毫瓦特</displayName>
-				<unitPattern count="other">{0} 毫瓦特</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<displayName>马力</displayName>
-				<unitPattern count="other">{0} 匹马力</unitPattern>
+			<unit type="pressure-ofhg">
+				<displayName>水银柱</displayName>
+				<unitPattern count="other">{0} 水银柱</unitPattern>
 			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<displayName>每平方英寸磅力</displayName>
 				<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<displayName>每小时公里</displayName>
 				<unitPattern count="other">每小时 {0} 公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>每秒公尺</displayName>
 				<unitPattern count="other">每秒 {0} 米</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<displayName>每小时英里</displayName>
 				<unitPattern count="other">每小时 {0} 英里</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
-				<displayName>摄氏度数</displayName>
 				<unitPattern count="other">摄氏 {0} 度</unitPattern>
 			</unit>
 			<unit type="temperature-fahrenheit">
-				<displayName>华氏度数</displayName>
 				<unitPattern count="other">华氏 {0} 度</unitPattern>
 			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>克耳文</displayName>
-				<unitPattern count="other">{0} 克耳文</unitPattern>
-			</unit>
 			<unit type="volume-cubic-meter">
 				<perUnitPattern>每立方米 {0}</perUnitPattern>
 			</unit>
@@ -6645,11 +6716,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>每立方厘米 {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-liter">
-				<unitPattern count="other">{0} 公升</unitPattern>
 				<perUnitPattern>每公升 {0}</perUnitPattern>
 			</unit>
-			<unit type="volume-bushel">
-				<displayName>蒲式耳</displayName>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量安士</displayName>
+				<unitPattern count="other">{0} 公制液量安士</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>每加仑 {0}</perUnitPattern>
@@ -6660,19 +6731,62 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-dessert-spoon-imperial">
 				<unitPattern count="other">英制甜品匙{0}匙</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>光速</displayName>
-				<unitPattern count="other">{0} 光速</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>开特</displayName>
+				<unitPattern count="other">{0} 开特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>库仑</displayName>
+				<unitPattern count="other">{0} 库仑</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法拉</displayName>
+				<unitPattern count="other">{0} 法拉</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨利</displayName>
+				<unitPattern count="other">{0} 亨利</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西门子</displayName>
+				<unitPattern count="other">{0} 西门子</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>国际蒸汽表卡路里</displayName>
+				<unitPattern count="other">{0} 国际蒸汽表卡路里</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>贝克勒尔</displayName>
+				<unitPattern count="other">{0} 贝克勒尔</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希沃特</displayName>
+				<unitPattern count="other">{0} 希沃特</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈瑞</displayName>
+				<unitPattern count="other">{0} 戈瑞</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特斯拉</displayName>
+				<unitPattern count="other">{0} 特斯拉</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韦伯</displayName>
+				<unitPattern count="other">{0} 韦伯</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>十亿分点浓度</displayName>
 				<unitPattern count="other">{0} 十亿分点浓度</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>晚</displayName>
-				<unitPattern count="other">{0} 晚</unitPattern>
-				<perUnitPattern>{0}/晚</perUnitPattern>
-			</unit>
 		</unitLength>
 		<unitLength type="short">
 			<compoundUnit type="10p-1">
@@ -6784,11 +6898,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} G 力</unitPattern>
 			</unit>
 			<unit type="acceleration-meter-per-square-second">
-				<displayName>公尺/平方秒</displayName>
-				<unitPattern count="other">每平方秒{0}米</unitPattern>
+				<displayName>米/平方秒</displayName>
+				<unitPattern count="other">每平方秒 {0} 米</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>圈数</displayName>
+				<displayName>圈</displayName>
 				<unitPattern count="other">{0} 圈</unitPattern>
 			</unit>
 			<unit type="angle-radian">
@@ -6817,13 +6931,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 公顷</unitPattern>
 			</unit>
 			<unit type="area-square-meter">
-				<displayName>平方公尺</displayName>
-				<unitPattern count="other">{0} 平方公尺</unitPattern>
+				<displayName>平方米</displayName>
+				<unitPattern count="other">{0} 平方米</unitPattern>
 				<perUnitPattern>每平方米{0}</perUnitPattern>
 			</unit>
 			<unit type="area-square-centimeter">
-				<displayName>平方公分</displayName>
-				<unitPattern count="other">{0} 平方公分</unitPattern>
+				<displayName>平方厘米</displayName>
+				<unitPattern count="other">{0} 平方厘米</unitPattern>
 				<perUnitPattern>每平方厘米{0}</perUnitPattern>
 			</unit>
 			<unit type="area-square-mile">
@@ -6840,13 +6954,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 平方码</unitPattern>
 			</unit>
 			<unit type="area-square-foot">
-				<displayName>平方英尺</displayName>
-				<unitPattern count="other">{0} 平方英尺</unitPattern>
+				<displayName>平方英呎</displayName>
+				<unitPattern count="other">{0} 平方英呎</unitPattern>
 			</unit>
 			<unit type="area-square-inch">
 				<displayName>平方英寸</displayName>
 				<unitPattern count="other">{0} 平方英寸</unitPattern>
-				<perUnitPattern>每平方吋{0}</perUnitPattern>
+				<perUnitPattern>每平方英寸{0}</perUnitPattern>
 			</unit>
 			<unit type="area-dunam">
 				<displayName>德南</displayName>
@@ -6868,7 +6982,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>项</displayName>
 				<unitPattern count="other">{0} 项</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>百万分率</displayName>
 				<unitPattern count="other">{0} 百万分率</unitPattern>
 			</unit>
@@ -6880,17 +6998,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>摩尔</displayName>
 				<unitPattern count="other">{0} 摩尔</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>公升/公里</displayName>
-				<unitPattern count="other">每公里{0}公升</unitPattern>
+				<unitPattern count="other">{0} 公升/公里</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
-				<displayName>升/100 公里</displayName>
-				<unitPattern count="other">每100公里 {0} 升</unitPattern>
+				<displayName>公升/100 公里</displayName>
+				<unitPattern count="other">{0} 公升/100 公里</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
 				<displayName>英里/加仑</displayName>
-				<unitPattern count="other">每加仑{0}英里</unitPattern>
+				<unitPattern count="other">{0} 英里/加仑</unitPattern>
 			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<displayName>英里/英制加仑</displayName>
@@ -6927,7 +7049,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-day">
 				<displayName>天</displayName>
 				<unitPattern count="other">{0} 天</unitPattern>
-				<perUnitPattern>每日{0}</perUnitPattern>
+				<perUnitPattern>每天{0}</perUnitPattern>
 			</unit>
 			<unit type="duration-hour">
 				<displayName>小时</displayName>
@@ -6978,7 +7100,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-calorie">
 				<displayName>卡路里</displayName>
-				<unitPattern count="other">{0} 卡</unitPattern>
+				<unitPattern count="other">{0} 卡路里</unitPattern>
 			</unit>
 			<unit type="energy-foodcalorie">
 				<displayName>大卡</displayName>
@@ -6990,7 +7112,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="energy-joule">
 				<displayName>焦耳</displayName>
-				<unitPattern count="other">{0} 焦</unitPattern>
+				<unitPattern count="other">{0} 焦耳</unitPattern>
 			</unit>
 			<unit type="energy-kilowatt-hour">
 				<displayName>千瓦小时</displayName>
@@ -7048,17 +7170,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>每厘米像素</displayName>
 				<unitPattern count="other">{0} 像素/厘米</unitPattern>
 			</unit>
-			<unit type="graphics-pixel-per-inch">
-				<displayName>每吋像素</displayName>
-				<unitPattern count="other">{0} 像素/吋</unitPattern>
-			</unit>
 			<unit type="graphics-dot-per-centimeter">
-				<displayName>每厘米点数</displayName>
-				<unitPattern count="other">{0} 点/厘米</unitPattern>
+				<displayName>dpcm</displayName>
+				<unitPattern count="other">{0} dpcm</unitPattern>
 			</unit>
 			<unit type="graphics-dot-per-inch">
-				<displayName>每吋点数</displayName>
-				<unitPattern count="other">{0} 点/吋</unitPattern>
+				<displayName>dpi</displayName>
+				<unitPattern count="other">{0} dpi</unitPattern>
 			</unit>
 			<unit type="graphics-dot">
 				<displayName>圆点</displayName>
@@ -7074,8 +7192,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>每公里{0}</perUnitPattern>
 			</unit>
 			<unit type="length-meter">
-				<displayName>公尺</displayName>
-				<unitPattern count="other">{0} 公尺</unitPattern>
+				<displayName>米</displayName>
+				<unitPattern count="other">{0} 米</unitPattern>
 				<perUnitPattern>每米{0}</perUnitPattern>
 			</unit>
 			<unit type="length-decimeter">
@@ -7083,13 +7201,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 公寸</unitPattern>
 			</unit>
 			<unit type="length-centimeter">
-				<displayName>公分</displayName>
-				<unitPattern count="other">{0} 公分</unitPattern>
+				<displayName>厘米</displayName>
+				<unitPattern count="other">{0} 厘米</unitPattern>
 				<perUnitPattern>每厘米{0}</perUnitPattern>
 			</unit>
 			<unit type="length-millimeter">
-				<displayName>公厘</displayName>
-				<unitPattern count="other">{0} 公厘</unitPattern>
+				<displayName>毫米</displayName>
+				<unitPattern count="other">{0} 毫米</unitPattern>
 			</unit>
 			<unit type="length-micrometer">
 				<displayName>微米</displayName>
@@ -7112,14 +7230,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 码</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<displayName>英尺</displayName>
-				<unitPattern count="other">{0} 呎</unitPattern>
-				<perUnitPattern>每呎{0}</perUnitPattern>
+				<displayName>英呎</displayName>
+				<unitPattern count="other">{0} 英呎</unitPattern>
+				<perUnitPattern>每英呎{0}</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>英寸</displayName>
-				<unitPattern count="other">{0} 吋</unitPattern>
-				<perUnitPattern>每吋{0}</perUnitPattern>
+				<unitPattern count="other">{0} 英寸</unitPattern>
+				<perUnitPattern>每英寸{0}</perUnitPattern>
 			</unit>
 			<unit type="length-parsec">
 				<displayName>秒差距</displayName>
@@ -7130,6 +7248,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 光年</unitPattern>
 			</unit>
 			<unit type="length-astronomical-unit">
+				<displayName>天文单位</displayName>
 				<unitPattern count="other">{0} 天文单位</unitPattern>
 			</unit>
 			<unit type="length-furlong">
@@ -7137,6 +7256,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 化朗</unitPattern>
 			</unit>
 			<unit type="length-fathom">
+				<displayName>英寻</displayName>
 				<unitPattern count="other">{0} 英寻</unitPattern>
 			</unit>
 			<unit type="length-nautical-mile">
@@ -7198,6 +7318,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 英吨</unitPattern>
 			</unit>
 			<unit type="mass-stone">
+				<displayName>英石</displayName>
 				<unitPattern count="other">{0} 英石</unitPattern>
 			</unit>
 			<unit type="mass-pound">
@@ -7206,13 +7327,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<perUnitPattern>每磅{0}</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
-				<displayName>盎司</displayName>
-				<unitPattern count="other">{0} 盎司</unitPattern>
+				<displayName>安士</displayName>
+				<unitPattern count="other">{0} 安士</unitPattern>
 				<perUnitPattern>每安士{0}</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce-troy">
-				<displayName>金衡盎司</displayName>
-				<unitPattern count="other">{0} 金衡盎司</unitPattern>
+				<displayName>金衡安士</displayName>
+				<unitPattern count="other">{0} 金衡安士</unitPattern>
 			</unit>
 			<unit type="mass-carat">
 				<displayName>克拉</displayName>
@@ -7239,20 +7360,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 吉瓦</unitPattern>
 			</unit>
 			<unit type="power-megawatt">
-				<displayName>百万瓦</displayName>
-				<unitPattern count="other">{0} 百万瓦</unitPattern>
+				<displayName>百万瓦特</displayName>
+				<unitPattern count="other">{0} 百万瓦特</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
-				<displayName>千瓦</displayName>
-				<unitPattern count="other">{0} 千瓦</unitPattern>
+				<displayName>千瓦特</displayName>
+				<unitPattern count="other">{0} 千瓦特</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName>瓦特</displayName>
-				<unitPattern count="other">{0} 瓦</unitPattern>
+				<unitPattern count="other">{0} 瓦特</unitPattern>
 			</unit>
 			<unit type="power-milliwatt">
-				<displayName>毫瓦</displayName>
-				<unitPattern count="other">{0} 毫瓦</unitPattern>
+				<displayName>毫瓦特</displayName>
+				<unitPattern count="other">{0} 毫瓦特</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<displayName>匹</displayName>
@@ -7262,6 +7383,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>毫米汞柱</displayName>
 				<unitPattern count="other">{0} 毫米汞柱</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>磅力/平方英寸</displayName>
 				<unitPattern count="other">每平方吋{0}磅</unitPattern>
@@ -7299,7 +7423,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">每小时{0}公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<displayName>公尺/秒</displayName>
+				<displayName>米/秒</displayName>
 				<unitPattern count="other">每秒{0}米</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
@@ -7320,6 +7444,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="temperature-fahrenheit">
 				<displayName>华氏</displayName>
 			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>克耳文</displayName>
+				<unitPattern count="other">{0} 克耳文</unitPattern>
+			</unit>
 			<unit type="torque-pound-force-foot">
 				<displayName>尺磅</displayName>
 				<unitPattern count="other">{0} 尺磅</unitPattern>
@@ -7333,13 +7461,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 立方公里</unitPattern>
 			</unit>
 			<unit type="volume-cubic-meter">
-				<displayName>立方公尺</displayName>
-				<unitPattern count="other">{0} 立方公尺</unitPattern>
+				<displayName>立方米</displayName>
+				<unitPattern count="other">{0} 立方米</unitPattern>
 				<perUnitPattern>每立方米{0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-centimeter">
-				<displayName>立方公分</displayName>
-				<unitPattern count="other">{0} 立方公分</unitPattern>
+				<displayName>立方厘米</displayName>
+				<unitPattern count="other">{0} 立方厘米</unitPattern>
 				<perUnitPattern>每立方厘米{0}</perUnitPattern>
 			</unit>
 			<unit type="volume-cubic-mile">
@@ -7351,8 +7479,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} 立方码</unitPattern>
 			</unit>
 			<unit type="volume-cubic-foot">
-				<displayName>立方英尺</displayName>
-				<unitPattern count="other">{0} 立方英尺</unitPattern>
+				<displayName>立方英呎</displayName>
+				<unitPattern count="other">{0} 立方英呎</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
 				<displayName>立方英寸</displayName>
@@ -7368,8 +7496,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-liter">
 				<displayName>公升</displayName>
-				<unitPattern count="other">{0} 升</unitPattern>
-				<perUnitPattern>每升{0}</perUnitPattern>
+				<unitPattern count="other">{0} 公升</unitPattern>
+				<perUnitPattern>每公升{0}</perUnitPattern>
 			</unit>
 			<unit type="volume-deciliter">
 				<displayName>公合</displayName>
@@ -7391,11 +7519,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>公制量杯</displayName>
 				<unitPattern count="other">{0} 公制杯</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量安士</displayName>
+				<unitPattern count="other">{0} 公制液量安士</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
-				<displayName>英亩英尺</displayName>
-				<unitPattern count="other">{0} 英亩英尺</unitPattern>
+				<displayName>英亩英呎</displayName>
+				<unitPattern count="other">{0} 英亩英呎</unitPattern>
 			</unit>
 			<unit type="volume-bushel">
+				<displayName>蒲式耳</displayName>
 				<unitPattern count="other">{0} 蒲式耳</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
@@ -7468,11 +7601,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>英制夸脱</displayName>
 				<unitPattern count="other">{0} 英制夸脱</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>开特</displayName>
+				<unitPattern count="other">{0} 开特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>库</displayName>
+				<unitPattern count="other">{0} 库</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法</displayName>
+				<unitPattern count="other">{0} 法</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨</displayName>
+				<unitPattern count="other">{0} 亨</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西</displayName>
+				<unitPattern count="other">{0} 西</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>国际蒸汽表卡</displayName>
+				<unitPattern count="other">{0} 国际蒸汽表卡</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>贝克</displayName>
+				<unitPattern count="other">{0} 贝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希</displayName>
+				<unitPattern count="other">{0} 希</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈</displayName>
+				<unitPattern count="other">{0} 戈</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特</displayName>
+				<unitPattern count="other">{0} 特</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韦</displayName>
+				<unitPattern count="other">{0} 韦</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>光速</displayName>
 				<unitPattern count="other">{0} 光速</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>浓度/十亿</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7489,15 +7674,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<unit type="acceleration-meter-per-square-second">
-				<unitPattern count="other">{0}m/s²</unitPattern>
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
 			</unit>
-			<unit type="consumption-liter-per-100-kilometer">
-				<displayName>升/100公里</displayName>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
 			</unit>
 			<unit type="digital-byte">
 				<displayName>B</displayName>
-				<unitPattern count="other">{0}byte</unitPattern>
+				<unitPattern count="other">{0}B</unitPattern>
 			</unit>
 			<unit type="graphics-megapixel">
 				<displayName>MP</displayName>
@@ -7507,53 +7694,112 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>ppcm</displayName>
 				<unitPattern count="other">{0}ppcm</unitPattern>
 			</unit>
+			<unit type="graphics-pixel-per-inch">
+				<unitPattern count="other">{0}ppi</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-centimeter">
+				<unitPattern count="other">{0}dpcm</unitPattern>
+			</unit>
+			<unit type="graphics-dot-per-inch">
+				<unitPattern count="other">{0}dpi</unitPattern>
+			</unit>
 			<unit type="length-inch">
 				<perUnitPattern>每英寸 {0}</perUnitPattern>
 			</unit>
-			<unit type="length-fathom">
-				<displayName>英寻</displayName>
-			</unit>
 			<unit type="mass-kilogram">
 				<perUnitPattern>每公斤 {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-gram">
 				<perUnitPattern>每克 {0}</perUnitPattern>
 			</unit>
-			<unit type="mass-stone">
-				<displayName>英石</displayName>
-			</unit>
 			<unit type="mass-pound">
 				<perUnitPattern>每磅 {0}</perUnitPattern>
 			</unit>
 			<unit type="mass-ounce">
 				<perUnitPattern>每安士 {0}</perUnitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0} Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
-				<unitPattern count="other">{0}psi</unitPattern>
+				<unitPattern count="other">每平方吋 {0} 磅</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
-				<unitPattern count="other">{0}公里/小时</unitPattern>
+				<unitPattern count="other">每小时 {0} 公里</unitPattern>
 			</unit>
 			<unit type="speed-meter-per-second">
-				<unitPattern count="other">{0}m/s</unitPattern>
+				<unitPattern count="other">每秒 {0} 米</unitPattern>
 			</unit>
 			<unit type="speed-mile-per-hour">
-				<unitPattern count="other">{0}英里/小时</unitPattern>
+				<unitPattern count="other">每小时 {0} 英里</unitPattern>
 			</unit>
 			<unit type="temperature-celsius">
 				<displayName>°C</displayName>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量安士</displayName>
+				<unitPattern count="other">{0} 公制液量安士</unitPattern>
+			</unit>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>开特</displayName>
+				<unitPattern count="other">{0} 开特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>库</displayName>
+				<unitPattern count="other">{0} 库</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法</displayName>
+				<unitPattern count="other">{0} 法</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨</displayName>
+				<unitPattern count="other">{0} 亨</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西</displayName>
+				<unitPattern count="other">{0} 西</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>卡路里-IT</displayName>
+				<unitPattern count="other">{0} 卡路里-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>贝克</displayName>
+				<unitPattern count="other">{0} 贝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希</displayName>
+				<unitPattern count="other">{0} 希</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈</displayName>
+				<unitPattern count="other">{0} 戈</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特</displayName>
+				<unitPattern count="other">{0} 特</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韦</displayName>
+				<unitPattern count="other">{0} 韦</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>光速</displayName>
 				<unitPattern count="other">{0}光速</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>晚</displayName>
 				<unitPattern count="other">{0}晚</unitPattern>
-				<perUnitPattern>{0}/晚</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -7673,7 +7919,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabel type="sign_standard_symbols">标记/标准符号</characterLabel>
 		<characterLabel type="small_form_variant">小写变体</characterLabel>
 		<characterLabel type="smiley">表情符号</characterLabel>
-		<characterLabel type="smileys_people">表情符号与人</characterLabel>
+		<characterLabel type="smileys_people">表情符号同人</characterLabel>
 		<characterLabel type="south_asian_scripts">南亚字体</characterLabel>
 		<characterLabel type="southeast_asian_scripts">东南亚字体</characterLabel>
 		<characterLabel type="spacing">空位</characterLabel>
@@ -7682,7 +7928,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<characterLabel type="technical_symbols">技术符号</characterLabel>
 		<characterLabel type="tone_marks">声调符号</characterLabel>
 		<characterLabel type="travel">旅游</characterLabel>
-		<characterLabel type="travel_places">旅游和地点</characterLabel>
+		<characterLabel type="travel_places">旅游同地点</characterLabel>
 		<characterLabel type="upwards_arrows">向上箭咀</characterLabel>
 		<characterLabel type="variant_forms">变化型</characterLabel>
 		<characterLabel type="vocalic_jamo">元音字母</characterLabel>
@@ -7760,27 +8006,64 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</typographicNames>
 	<personNames>
 		<nativeSpaceReplacement xml:space="preserve"/>
+		<foreignSpaceReplacement xml:space="preserve">·</foreignSpaceReplacement>
 		<initialPattern type="initial">{0}</initialPattern>
+		<personName order="givenFirst" length="long" usage="referring" formality="formal">
+			<namePattern>{title} {given} {given2} {surname} {generation}，{credentials}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="referring" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="formal">
 			<namePattern>{surname}{title}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="long" usage="addressing" formality="informal">
 			<namePattern>{given-informal}</namePattern>
 		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="formal">
+			<namePattern>{given2-monogram-allCaps}{surname-monogram-allCaps}{given-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="long" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="formal">
+			<namePattern>{given} {credentials}，{generation} {given2-initial}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="referring" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
 		<personName order="givenFirst" length="medium" usage="addressing" formality="formal">
 			<namePattern>{surname}{title}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="medium" usage="addressing" formality="informal">
 			<namePattern>{given-informal}</namePattern>
 		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="medium" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="formal">
+			<namePattern>{given-initial} {given2-initial} {surname}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="referring" formality="informal">
+			<namePattern>{given-informal}</namePattern>
+		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="formal">
 			<namePattern>{surname}{title}</namePattern>
 		</personName>
 		<personName order="givenFirst" length="short" usage="addressing" formality="informal">
 			<namePattern>{given-informal}</namePattern>
 		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="formal">
+			<namePattern>{surname-monogram-allCaps}</namePattern>
+		</personName>
+		<personName order="givenFirst" length="short" usage="monogram" formality="informal">
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
+		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {credentials} {given2}</namePattern>
+			<namePattern>{surname} {given} {title}，{generation} {given2} {credentials}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="referring" formality="informal">
 			<namePattern>{surname} {given-informal}</namePattern>
@@ -7792,10 +8075,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="long" usage="monogram" formality="informal">
-			<namePattern>{surname-monogram-allCaps}{given-monogram-allCaps}</namePattern>
+			<namePattern>{surname-monogram-allCaps}{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {credentials} {given2-initial}</namePattern>
+			<namePattern>{surname} {given} {credentials}，{generation} {given2-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="referring" formality="informal">
 			<namePattern>{surname} {given-informal}</namePattern>
@@ -7807,13 +8090,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-informal}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="formal">
-			<namePattern>{surname-monogram}</namePattern>
+			<namePattern>{surname-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="medium" usage="monogram" formality="informal">
-			<namePattern>{given-informal-monogram}</namePattern>
+			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {given2-initial}</namePattern>
+			<namePattern>{surname} {given}，{given2-initial}</namePattern>
 		</personName>
 		<personName order="surnameFirst" length="short" usage="referring" formality="informal">
 			<namePattern>{surname} {given}</namePattern>
@@ -7831,34 +8114,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<namePattern>{given-informal-monogram-allCaps}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {credentials} {given2}</namePattern>
+			<namePattern>{surname-core} {given} {given2}</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
 			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
-		<personName order="sorting" length="medium" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {credentials} {given2-initial}</namePattern>
-		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="informal">
 			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="formal">
-			<namePattern>{surname} {given} {given2-initial}</namePattern>
+			<namePattern>{surname-core} {given-initial} {given2-initial}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="informal">
 			<namePattern>{surname} {given-informal}</namePattern>
 		</personName>
 		<sampleName item="nativeG">
-			<nameField type="given">大文</nameField>
+			<nameField type="given">文杰</nameField>
 		</sampleName>
 		<sampleName item="nativeGS">
-			<nameField type="given">大文</nameField>
-			<nameField type="surname">陈</nameField>
+			<nameField type="given">雅婷</nameField>
+			<nameField type="surname">张</nameField>
 		</sampleName>
 		<sampleName item="nativeGGS">
-			<nameField type="given">大文</nameField>
+			<nameField type="given">家豪</nameField>
 			<nameField type="given2">明德</nameField>
-			<nameField type="surname">陈</nameField>
+			<nameField type="surname">林</nameField>
 		</sampleName>
 		<sampleName item="nativeFull">
 			<nameField type="title">先生</nameField>
@@ -7884,9 +8164,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<nameField type="surname">吴</nameField>
 		</sampleName>
 		<sampleName item="foreignFull">
-			<nameField type="title">先生</nameField>
-			<nameField type="given">大文</nameField>
-			<nameField type="given-informal">小二</nameField>
+			<nameField type="title">教授</nameField>
+			<nameField type="given">怡君</nameField>
+			<nameField type="given-informal">小君</nameField>
+			<nameField type="given2">达印</nameField>
+			<nameField type="surname-prefix">陈</nameField>
+			<nameField type="surname-core">陈</nameField>
+			<nameField type="surname2">∅∅∅</nameField>
 			<nameField type="generation">小</nameField>
 			<nameField type="credentials">博士</nameField>
 		</sampleName>
diff --git a/make/data/cldr/common/main/zh.xml b/make/data/cldr/common/main/zh.xml
index 533073cf9f7..6ab65938589 100644
--- a/make/data/cldr/common/main/zh.xml
+++ b/make/data/cldr/common/main/zh.xml
@@ -305,13 +305,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">巴菲亚语</language>
 			<language type="ksh">科隆语</language>
 			<language type="ku">库尔德语</language>
+			<language type="ku" menu="core">库尔德语</language>
+			<language type="ku" menu="extension">北库尔德语</language>
 			<language type="kum">库梅克语</language>
 			<language type="kut">库特奈语</language>
 			<language type="kv">科米语</language>
 			<language type="kw">康沃尔语</language>
 			<language type="kwk">夸夸瓦拉语</language>
 			<language type="kxv">库维语</language>
-			<language type="ky">柯尔克孜语</language>
+			<language type="ky">吉尔吉斯语</language>
 			<language type="la">拉丁语</language>
 			<language type="lad">拉迪诺语</language>
 			<language type="lag">朗吉语</language>
@@ -907,6 +909,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">中国</territory>
 			<territory type="CO">哥伦比亚</territory>
 			<territory type="CP">克利珀顿岛</territory>
+			<territory type="CQ">萨克岛</territory>
 			<territory type="CR">哥斯达黎加</territory>
 			<territory type="CU">古巴</territory>
 			<territory type="CV">佛得角</territory>
@@ -1255,35 +1258,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">数字排序</key>
 			<key type="colStrength">排序强度</key>
 			<key type="currency">货币</key>
+			<key type="em">表情符号表示法</key>
 			<key type="hc">小时制（12或24）</key>
-			<key type="lb">换行符样式</key>
+			<key type="lb">中文、日文及韩语换行规则</key>
+			<key type="lw">词内换行规则</key>
 			<key type="ms">度量衡制</key>
 			<key type="numbers">数字</key>
+			<key type="ss">在缩写后断句</key>
 			<key type="timezone">时区</key>
 			<key type="va">语言区域别名</key>
 			<key type="x">专用</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">佛历</type>
+			<type key="calendar" type="buddhist" scope="core">佛历</type>
 			<type key="calendar" type="chinese">农历</type>
+			<type key="calendar" type="chinese" scope="core">农历</type>
 			<type key="calendar" type="coptic">科普特历</type>
+			<type key="calendar" type="coptic" scope="core">科普特历</type>
 			<type key="calendar" type="dangi">檀纪历</type>
+			<type key="calendar" type="dangi" scope="core">檀纪历</type>
 			<type key="calendar" type="ethiopic">埃塞俄比亚历</type>
+			<type key="calendar" type="ethiopic" scope="core">埃塞俄比亚历</type>
 			<type key="calendar" type="ethiopic-amete-alem">埃塞俄比亚阿米特阿莱姆日历</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">埃塞俄比亚阿米特阿莱姆日历</type>
 			<type key="calendar" type="gregorian">公历</type>
+			<type key="calendar" type="gregorian" scope="core">公历</type>
 			<type key="calendar" type="hebrew">希伯来历</type>
+			<type key="calendar" type="hebrew" scope="core">希伯来历</type>
 			<type key="calendar" type="indian">印度国定历</type>
 			<type key="calendar" type="islamic">伊斯兰历</type>
+			<type key="calendar" type="islamic" scope="core">伊斯兰历</type>
 			<type key="calendar" type="islamic-civil">表格式伊斯兰历（民用纪元）</type>
+			<type key="calendar" type="islamic-civil" scope="core">表格式伊斯兰历（民用纪元）</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">沙特阿拉伯伊斯兰历</type>
 			<type key="calendar" type="islamic-tbla">表格式伊斯兰历（天文纪元）</type>
+			<type key="calendar" type="islamic-tbla" scope="core">表格式伊斯兰历（天文纪元）</type>
 			<type key="calendar" type="islamic-umalqura">伊斯兰历（乌姆库拉）</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">伊斯兰历（乌姆库拉）</type>
 			<type key="calendar" type="iso8601">国际标准历法</type>
 			<type key="calendar" type="japanese">和历</type>
+			<type key="calendar" type="japanese" scope="core">和历</type>
 			<type key="calendar" type="persian">波斯历</type>
+			<type key="calendar" type="persian" scope="core">波斯历</type>
 			<type key="calendar" type="roc">民国纪年</type>
+			<type key="calendar" type="roc" scope="core">民国纪年</type>
 			<type key="cf" type="account">会计货币格式</type>
+			<type key="cf" type="account" scope="core">会计</type>
 			<type key="cf" type="standard">标准货币格式</type>
+			<type key="cf" type="standard" scope="core">标准</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">对符号进行排序</type>
 			<type key="colAlternate" type="shifted" draft="contributed">忽略符号进行排序</type>
 			<type key="colBackwards" type="no" draft="contributed">对重音进行正常排序</type>
@@ -1293,23 +1316,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">先对大写字母进行排序</type>
 			<type key="colCaseLevel" type="no" draft="contributed">不区分大小写进行排序</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">区分大小写进行排序</type>
-			<type key="collation" type="big5han">繁体中文排序 - Big5</type>
 			<type key="collation" type="compat">基于兼容性沿用既往排序</type>
+			<type key="collation" type="compat" scope="core">兼容性</type>
 			<type key="collation" type="dictionary">字典排序</type>
-			<type key="collation" type="ducet">默认 Unicode 排序</type>
+			<type key="collation" type="dictionary" scope="core">字典</type>
+			<type key="collation" type="ducet">默认Unicode排序</type>
+			<type key="collation" type="ducet" scope="core">默认Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">表情符号排序</type>
 			<type key="collation" type="eor">欧洲排序规则</type>
-			<type key="collation" type="gb2312han">简体中文排序 - GB2312</type>
 			<type key="collation" type="phonebook">电话簿排序</type>
+			<type key="collation" type="phonebook" scope="core">电话簿</type>
 			<type key="collation" type="phonetic">语音排序</type>
+			<type key="collation" type="phonetic" scope="core">语音</type>
 			<type key="collation" type="pinyin">拼音排序</type>
+			<type key="collation" type="pinyin" scope="core">拼音</type>
 			<type key="collation" type="search">常规搜索</type>
-			<type key="collation" type="searchjl">按韩文字开首辅音来搜索</type>
+			<type key="collation" type="search" scope="core">搜索</type>
+			<type key="collation" type="searchjl">按谚文初声辅音搜索</type>
 			<type key="collation" type="standard">标准排序</type>
+			<type key="collation" type="standard" scope="core">标准</type>
 			<type key="collation" type="stroke">笔画排序</type>
+			<type key="collation" type="stroke" scope="core">笔画</type>
 			<type key="collation" type="traditional">传统排序</type>
+			<type key="collation" type="traditional" scope="core">传统</type>
 			<type key="collation" type="unihan">部首笔画排序</type>
+			<type key="collation" type="unihan" scope="core">部首笔画</type>
 			<type key="collation" type="zhuyin">注音排序</type>
+			<type key="collation" type="zhuyin" scope="core">注音</type>
 			<type key="colNormalization" type="no" draft="contributed">非规范化排序</type>
 			<type key="colNormalization" type="yes" draft="contributed">对 Unicode 进行规范化排序</type>
 			<type key="colNumeric" type="no" draft="contributed">对数字进行单独排序</type>
@@ -1322,18 +1355,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">全角</type>
 			<type key="d0" type="hwidth">半角</type>
 			<type key="d0" type="npinyin">数字</type>
+			<type key="em" type="default" scope="core">默认</type>
+			<type key="em" type="emoji" scope="core">表情符号</type>
+			<type key="em" type="text" scope="core">文字</type>
 			<type key="hc" type="h11">12小时制（0–11）</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12小时制（1–12）</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24小时制（0–23）</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24小时制（1–24）</type>
-			<type key="lb" type="loose">宽松换行符样式</type>
-			<type key="lb" type="normal">正常换行符样式</type>
-			<type key="lb" type="strict">严格换行符样式</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
+			<type key="lb" type="loose">宽松换行样式</type>
+			<type key="lb" type="loose" scope="core">宽松</type>
+			<type key="lb" type="normal">正常换行样式</type>
+			<type key="lb" type="normal" scope="core">正常</type>
+			<type key="lb" type="strict">严格换行样式</type>
+			<type key="lb" type="strict" scope="core">严格</type>
+			<type key="lw" type="breakall" scope="core">允许断词换行</type>
+			<type key="lw" type="keepall" scope="core">不允许断词换行</type>
+			<type key="lw" type="normal" scope="core">正常</type>
+			<type key="lw" type="phrase" scope="core">保留短语</type>
 			<type key="m0" type="bgn">美国地名委员会 (BGN)</type>
 			<type key="m0" type="ungegn">联合国地名专家组 (UNGEGN)</type>
 			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="metric" scope="core">公制</type>
 			<type key="ms" type="uksystem">英制</type>
+			<type key="ms" type="uksystem" scope="core">英制</type>
 			<type key="ms" type="ussystem">美制</type>
+			<type key="ms" type="ussystem" scope="core">美制</type>
 			<type key="numbers" type="ahom">阿霍姆数字</type>
 			<type key="numbers" type="arab">阿拉伯-印度数字</type>
 			<type key="numbers" type="arabext">扩展阿拉伯-印度数字</type>
@@ -1418,6 +1468,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">瓦伊文数字</type>
 			<type key="numbers" type="wara" draft="contributed">瓦郎奇蒂数字</type>
 			<type key="numbers" type="wcho" draft="contributed">万秋数字</type>
+			<type key="ss" type="none" scope="core">关闭</type>
+			<type key="ss" type="standard" scope="core">开启</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">公制</measurementSystemName>
@@ -1434,8 +1486,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<exemplarCharacters>[一 丁 七 万 丈 三 上 下 丌 不 与 丑 专 且 世 丘 丙 业 东 丝 丢 两 严 丧 个 中 丰 串 临 丸 丹 为 主 丽 举 乃 久 么 义 之 乌 乍 乎 乏 乐 乔 乖 乘 乙 九 也 习 乡 书 买 乱 乾 了 予 争 事 二 于 亏 云 互 五 井 亚 些 亡 交 亥 亦 产 亨 享 京 亮 亲 人 亿 什 仁 仅 仇 今 介 仍 从 仔 他 付 仙 代 令 以 仪 们 仰 仲 件 价 任 份 仿 企 伊 伍 伏 伐 休 众 优 伙 会 伟 传 伤 伦 伯 估 伴 伸 似 伽 但 位 低 住 佐 佑 体 何 余 佛 作 你 佤 佩 佳 使 例 供 依 侠 侦 侧 侨 侬 侯 侵 便 促 俄 俊 俗 保 信 俩 修 俱 俾 倍 倒 候 倚 借 倦 值 倾 假 偌 偏 做 停 健 偶 偷 储 催 傲 傻 像 僧 儒 儿 允 元 兄 充 兆 先 光 克 免 兑 兔 党 入 全 八 公 六 兮 兰 共 关 兴 兵 其 具 典 兹 养 兼 兽 内 冈 册 再 冒 写 军 农 冠 冬 冰 冲 决 况 冷 准 凌 减 凝 几 凡 凤 凭 凯 凰 出 击 函 刀 分 切 刊 刑 划 列 刘 则 刚 创 初 判 利 别 到 制 刷 券 刺 刻 剂 前 剑 剧 剩 剪 副 割 力 劝 办 功 加 务 劣 动 助 努 劫 励 劲 劳 势 勇 勉 勋 勒 勤 勾 勿 包 匆 匈 化 北 匙 匹 区 医 十 千 升 午 半 华 协 卒 卓 单 卖 南 博 占 卡 卢 卫 卯 印 危 即 却 卷 厂 厄 厅 历 厉 压 厌 厍 厚 原 去 县 参 又 叉 及 友 双 反 发 叔 取 受 变 叙 口 古 句 另 只 叫 召 叭 可 台 史 右 叶 号 司 叹 吃 各 合 吉 吊 同 名 后 吐 向 吓 吗 君 吝 吟 否 吧 含 听 启 吵 吸 吹 吻 吾 呀 呆 呈 告 呐 员 呜 呢 呦 周 味 呵 呼 命 和 咖 咦 咧 咨 咪 咬 咯 咱 哀 品 哇 哈 哉 响 哎 哟 哥 哦 哩 哪 哭 哲 唉 唐 唤 唬 售 唯 唱 唷 商 啊 啡 啥 啦 啪 喀 喂 善 喇 喊 喏 喔 喜 喝 喵 喷 喻 嗒 嗨 嗯 嘉 嘛 嘴 嘻 嘿 器 四 回 因 团 园 困 围 固 国 图 圆 圈 土 圣 在 圭 地 圳 场 圾 址 均 坎 坐 坑 块 坚 坛 坜 坡 坤 坦 坪 垂 垃 型 垒 埃 埋 城 埔 域 培 基 堂 堆 堕 堡 堪 塑 塔 塞 填 境 增 墨 壁 壤 士 壬 壮 声 处 备 复 夏 夕 外 多 夜 够 夥 大 天 太 夫 央 失 头 夷 夸 夹 夺 奇 奈 奉 奋 奏 契 奔 奖 套 奥 女 奴 奶 她 好 如 妇 妈 妖 妙 妥 妨 妮 妹 妻 姆 姊 始 姐 姑 姓 委 姿 威 娃 娄 娘 娜 娟 娱 婆 婚 媒 嫁 嫌 嫩 子 孔 孕 字 存 孙 孜 孝 孟 季 孤 学 孩 宁 它 宇 守 安 宋 完 宏 宗 官 宙 定 宛 宜 宝 实 审 客 宣 室 宪 害 宴 家 容 宽 宾 宿 寂 寄 寅 密 寇 富 寒 寝 寞 察 寡 寨 寸 对 寻 导 寿 封 射 将 尊 小 少 尔 尖 尘 尚 尝 尤 就 尺 尼 尽 尾 局 屁 层 居 屋 屏 展 属 屠 山 岁 岂 岗 岘 岚 岛 岳 岸 峡 峰 崇 崩 崴 川 州 巡 工 左 巧 巨 巫 差 己 已 巳 巴 巷 币 市 布 帅 师 希 帐 帕 帖 帝 带 席 帮 常 帽 幅 幕 干 平 年 并 幸 幻 幼 幽 广 庆 床 序 库 应 底 店 庙 庚 府 庞 废 度 座 庭 康 庸 廉 廖 延 廷 建 开 异 弃 弄 弊 式 引 弗 弘 弟 张 弥 弦 弯 弱 弹 强 归 当 录 彝 形 彩 彬 彭 彰 影 彷 役 彻 彼 往 征 径 待 很 律 後 徐 徒 得 循 微 徵 德 心 必 忆 忌 忍 志 忘 忙 忠 忧 快 念 忽 怀 态 怎 怒 怕 怖 思 怡 急 性 怨 怪 总 恋 恐 恢 恨 恩 恭 息 恰 恶 恼 悄 悉 悔 悟 悠 患 您 悲 情 惑 惜 惠 惧 惨 惯 想 惹 愁 愈 愉 意 愚 感 愧 慈 慎 慕 慢 慧 慰 憾 懂 懒 戈 戊 戌 戏 成 我 戒 或 战 截 戴 户 房 所 扁 扇 手 才 扎 扑 打 托 扣 执 扩 扫 扬 扭 扮 扯 批 找 承 技 抄 把 抑 抓 投 抗 折 抢 护 报 披 抬 抱 抵 抹 抽 担 拆 拉 拍 拒 拔 拖 拘 招 拜 拟 拥 拦 拨 择 括 拳 拷 拼 拾 拿 持 指 按 挑 挖 挝 挡 挤 挥 挪 振 挺 捉 捐 捕 损 捡 换 据 捷 授 掉 掌 排 探 接 控 推 掩 措 掸 描 提 插 握 援 搜 搞 搬 搭 摄 摆 摊 摔 摘 摩 摸 撒 撞 播 操 擎 擦 支 收 改 攻 放 政 故 效 敌 敏 救 教 敝 敢 散 敦 敬 数 敲 整 文 斋 斐 斗 料 斜 斥 断 斯 新 方 於 施 旁 旅 旋 族 旗 无 既 日 旦 旧 旨 早 旭 时 旺 昂 昆 昌 明 昏 易 星 映 春 昨 昭 是 显 晃 晋 晒 晓 晚 晨 普 景 晴 晶 智 暂 暑 暖 暗 暮 暴 曰 曲 更 曹 曼 曾 替 最 月 有 朋 服 朗 望 朝 期 木 未 末 本 札 术 朱 朵 机 杀 杂 权 杉 李 材 村 杜 束 条 来 杨 杯 杰 松 板 极 构 析 林 果 枝 枢 枪 枫 架 柏 某 染 柔 查 柬 柯 柳 柴 标 栋 栏 树 校 样 核 根 格 桃 框 案 桌 桑 档 桥 梁 梅 梦 梯 械 梵 检 棉 棋 棒 棚 森 椅 植 椰 楚 楼 概 榜 模 樱 檀 欠 次 欢 欣 欧 欲 欺 款 歉 歌 止 正 此 步 武 歪 死 殊 残 段 毅 母 每 毒 比 毕 毛 毫 氏 民 气 氛 水 永 求 汇 汉 汗 汝 江 池 污 汤 汪 汶 汽 沃 沈 沉 沙 沟 没 沧 河 油 治 沿 泉 泊 法 泛 泡 波 泣 泥 注 泰 泳 泽 洋 洗 洛 洞 津 洪 洲 活 洽 派 流 浅 测 济 浏 浑 浓 浙 浦 浩 浪 浮 浴 海 涅 消 涉 涛 涨 涯 液 涵 淋 淑 淘 淡 深 混 添 清 渐 渡 渣 温 港 渴 游 湖 湾 源 溜 溪 滋 滑 满 滥 滨 滴 漂 漏 演 漠 漫 潘 潜 潮 澎 澳 激 灌 火 灭 灯 灰 灵 灿 炉 炎 炮 炸 点 烂 烈 烤 烦 烧 热 焦 然 煌 煞 照 煮 熊 熟 燃 燕 爆 爪 爬 爱 爵 父 爷 爸 爽 片 版 牌 牙 牛 牡 牢 牧 物 牲 牵 特 牺 犯 状 犹 狂 狐 狗 狠 独 狮 狱 狼 猛 猜 猪 献 猴 玄 率 玉 王 玛 玩 玫 环 现 玲 玻 珀 珊 珍 珠 班 球 理 琊 琪 琳 琴 琼 瑙 瑜 瑞 瑟 瑰 瑶 璃 瓜 瓦 瓶 甘 甚 甜 生 用 田 由 甲 申 电 男 甸 画 畅 界 留 略 番 疆 疏 疑 疗 疯 疲 疼 疾 病 痕 痛 痴 癸 登 白 百 的 皆 皇 皮 盈 益 监 盒 盖 盘 盛 盟 目 直 相 盼 盾 省 眉 看 真 眠 眼 着 睛 睡 督 瞧 矛 矣 知 短 石 矶 码 砂 砍 研 破 础 硕 硬 确 碍 碎 碗 碟 碧 碰 磁 磅 磨 示 礼 社 祖 祚 祝 神 祥 票 祯 祸 禁 禅 福 离 秀 私 秋 种 科 秒 秘 租 秤 秦 秩 积 称 移 稀 程 稍 税 稣 稳 稿 穆 究 穷 穹 空 穿 突 窗 窝 立 站 竞 竟 章 童 端 竹 笑 笔 笛 符 笨 第 等 筋 筑 答 策 筹 签 简 算 管 箭 箱 篇 篮 簿 籍 米 类 粉 粒 粗 粤 粹 精 糊 糕 糖 糟 系 素 索 紧 紫 累 繁 红 约 级 纪 纯 纲 纳 纵 纷 纸 纽 线 练 组 细 织 终 绍 经 结 绕 绘 给 络 绝 统 继 绩 绪 续 维 绵 综 绿 缅 缓 编 缘 缠 缩 缴 缶 缸 缺 罐 网 罕 罗 罚 罢 罪 置 署 羊 美 羞 群 羯 羽 翁 翅 翔 翘 翠 翰 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 职 联 聘 聚 聪 肉 肖 肚 股 肤 肥 肩 肯 育 胁 胆 背 胎 胖 胜 胞 胡 胶 胸 能 脆 脑 脱 脸 腊 腐 腓 腰 腹 腾 腿 臂 臣 自 臭 至 致 舌 舍 舒 舞 舟 航 般 舰 船 良 色 艺 艾 节 芒 芝 芦 芬 芭 花 芳 苍 苏 苗 若 苦 英 茂 范 茨 茫 茶 草 荐 荒 荣 药 荷 莉 莎 莪 莫 莱 莲 获 菜 菩 菲 萄 萍 萤 营 萧 萨 落 著 葛 葡 蒂 蒋 蒙 蓉 蓝 蓬 蔑 蔡 薄 薪 藉 藏 藤 虎 虑 虫 虹 虽 虾 蚁 蛇 蛋 蛙 蛮 蜂 蜜 蝶 融 蟹 蠢 血 行 街 衡 衣 补 表 袋 被 袭 裁 裂 装 裕 裤 西 要 覆 见 观 规 视 览 觉 角 解 言 誉 誓 警 计 订 认 讨 让 训 议 讯 记 讲 讷 许 论 设 访 证 评 识 诉 词 译 试 诗 诚 话 诞 询 该 详 语 误 说 请 诸 诺 读 课 谁 调 谅 谈 谊 谋 谓 谜 谢 谨 谱 谷 豆 象 豪 貌 贝 贞 负 贡 财 责 贤 败 货 质 贩 贪 购 贯 贱 贴 贵 贸 费 贺 贼 贾 资 赋 赌 赏 赐 赔 赖 赚 赛 赞 赠 赢 赤 赫 走 赵 起 趁 超 越 趋 趣 足 跃 跌 跑 距 跟 路 跳 踏 踢 踩 身 躲 车 轨 轩 转 轮 软 轰 轻 载 较 辅 辆 辈 辉 辑 输 辛 辞 辨 辩 辰 辱 边 达 迁 迅 过 迈 迎 运 近 返 还 这 进 远 违 连 迟 迦 迪 迫 述 迷 追 退 送 适 逃 逆 选 逊 透 逐 递 途 通 逛 逝 速 造 逢 逸 逻 逼 遇 遍 道 遗 遭 遮 遵 避 邀 邓 那 邦 邪 邮 邱 邻 郎 郑 部 郭 都 鄂 酉 酋 配 酒 酷 酸 醉 醒 采 释 里 重 野 量 金 针 钓 钟 钢 钦 钱 钻 铁 铃 铜 铢 铭 银 铺 链 销 锁 锅 锋 错 锡 锦 键 锺 镇 镜 镭 长 门 闪 闭 问 闰 闲 间 闷 闹 闻 阁 阅 阐 阔 队 阮 防 阳 阴 阵 阶 阻 阿 陀 附 际 陆 陈 降 限 院 除 险 陪 陵 陶 陷 隆 随 隐 隔 障 难 雄 雅 集 雉 雨 雪 雯 雳 零 雷 雾 需 震 霍 霖 露 霸 霹 青 靖 静 非 靠 面 革 靼 鞋 鞑 韦 韩 音 页 顶 项 顺 须 顽 顾 顿 预 领 颇 频 颗 题 额 风 飘 飙 飞 食 餐 饭 饮 饰 饱 饼 馆 首 香 馨 马 驱 驶 驻 驾 验 骑 骗 骚 骤 骨 高 鬼 魂 魅 魔 鱼 鲁 鲜 鸟 鸡 鸣 鸭 鸿 鹅 鹤 鹰 鹿 麦 麻 黄 黎 黑 默 鼓 鼠 鼻 齐 齿 龄 龙 龟]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[丐 丛 丫 乒 乓 乞 乳 亢 亩 亭 仂 仆 仑 仓 仗 伞 伪 伶 伺 佃 佣 侄 侈 侍 侣 侥 侮 俏 俐 俘 俭 俯 俺 倔 倘 倡 债 偎 偿 傅 傈 傍 傣 僚 僳 僵 僻 兜 兢 冀 冉 冗 冤 冥 冯 冶 冻 净 凄 凉 凑 凛 凳 凶 凸 凹 凿 刁 刃 删 刨 刮 刹 剃 削 剔 剖 剥 剽 剿 劈 勃 勘 募 勺 匀 匕 匠 匣 匪 匮 匾 匿 卉 卑 卜 卞 卤 卦 卧 卵 卸 卿 厕 厘 厢 厦 厨 叁 叛 叠 叨 叩 叮 叼 叽 吁 吆 吏 吕 吞 吠 吨 吩 吭 吮 吱 吴 吼 呕 呛 呣 呻 咄 咋 咏 咐 咒 咕 咙 咳 咸 咽 哄 哆 哑 哗 哨 哮 哺 哼 唁 唆 唇 唠 唧 唾 啃 啄 啤 啮 啰 啸 啼 喉 喘 喧 喱 喳 嗅 嗓 嗜 嗡 嗦 嗽 嘀 嘘 嘟 嘱 嘲 嘶 嘹 噘 噜 噢 噩 噪 嚎 嚏 嚣 嚷 嚼 囊 囚 囤 囱 圃 坊 坏 坝 坟 坠 坯 坷 垄 垛 垢 垦 垫 垮 埂 埠 堤 堰 堵 塌 塘 墅 墓 墙 墟 墩 壳 壶 壹 夭 夯 奎 奠 奢 奸 妃 妄 妆 妒 妓 姚 姜 姥 姨 姻 娇 娥 娶 婉 婪 婴 婶 婿 媚 媳 嫂 嫉 孪 孵 孽 宅 宠 宦 宫 宰 宵 寓 寥 寺 尉 尧 尬 尴 尸 尿 屈 屉 届 屎 屑 屡 履 屯 屹 屿 岔 岖 岩 岭 峦 峨 峭 峻 崎 崔 崖 崛 崭 嵌 巅 巍 巢 巩 巽 巾 帆 帘 帚 帜 帧 帷 幌 幢 庄 庇 庐 庵 庶 廊 廓 弓 弛 弧 彗 彤 彪 徊 徘 徙 御 徽 忱 忿 怔 怜 怠 怯 恃 恍 恒 恕 恤 恬 恳 悍 悖 悦 悬 悯 悴 悼 惊 惋 惕 惟 惦 惩 惫 惭 惰 惶 愕 愣 愤 愿 慌 慨 慷 憋 憎 憔 憨 懈 懊 懦 戎 戚 戟 戳 扒 扔 扛 扰 扳 扶 扼 抒 抖 抚 抛 抠 抡 押 拂 拄 拇 拌 拎 拐 拓 拗 拙 拢 拣 拧 拭 拯 拱 拴 拽 挂 挎 挚 挟 挠 挣 挨 挫 挽 捂 捅 捆 捌 捍 捎 捏 捞 捣 捧 捶 捺 捻 掀 掂 掏 掐 掘 掠 掰 掷 掺 揉 揍 揣 揩 揪 揭 揽 搀 搁 搂 搅 搏 搓 搔 携 摇 摧 摹 撅 撇 撑 撕 撤 撩 撬 撮 撰 撵 撼 擂 擅 擒 攀 敛 敞 敷 斌 斑 斟 斤 斧 斩 旬 旱 旷 昔 昙 昧 昼 晌 晕 晦 晰 晾 暇 曙 曝 朔 朦 朴 朽 杆 杏 杖 杠 杭 枉 枕 枚 枣 枯 柄 柑 柒 柜 柠 柩 柱 柿 栅 栈 栓 栖 栗 株 栽 桂 桐 桔 桦 桨 桩 桶 梆 梗 梢 梧 梨 梭 梳 棍 棕 棘 棠 棱 棵 棺 椎 椒 椭 椿 楔 楠 楷 榄 榆 榈 榔 榕 榨 榴 槌 槐 槛 槟 槽 槿 樟 横 橄 橇 橘 橙 橡 橱 檐 檬 歇 歧 歹 歼 殃 殉 殖 殴 殷 殿 毁 毙 毡 毯 氓 氢 氧 氨 氮 氯 汁 汛 汞 汰 汹 沁 沐 沛 沥 沦 沪 沫 沮 沸 沼 沽 沾 泄 泌 泞 泪 泵 泻 泼 洁 洒 洼 浆 浇 浊 浣 浸 涂 涌 涎 涕 涝 涡 涣 涤 润 涧 涩 涮 淀 淆 淇 淌 淤 淫 淮 淳 淹 渊 渔 渗 渝 渠 渤 渲 渺 湃 湘 湿 溃 溅 溉 溢 溯 溶 溺 滇 滔 滕 滚 滞 滤 滩 漆 漓 漱 漾 潇 潭 澄 澈 澜 澡 濒 瀑 灶 灸 灼 灾 炊 炒 炕 炫 炬 炭 炼 炽 烁 烘 烙 烛 烟 烫 烹 焉 焊 焕 焙 焚 焰 煎 煤 煽 熄 熏 熔 熙 熬 燥 爹 犀 犁 犄 犬 犸 狈 狞 狡 狭 狰 狸 猎 猕 猖 猩 猫 猬 猾 猿 獭 獾 玖 玷 琅 琉 琐 琢 瑚 璧 瓢 瓣 瓤 瓮 瓷 甥 甩 甫 畏 畔 畜 畴 畸 疙 疚 疟 疤 疫 疮 疹 症 痊 痒 痘 痢 痪 痰 痹 瘟 瘤 瘦 瘩 瘪 瘫 瘸 瘾 癌 癣 皂 皓 皖 皱 皿 盆 盏 盐 盔 盗 盥 盯 盲 盹 眨 眩 眯 眶 眷 睁 睐 睦 睫 睬 睹 睿 瞄 瞅 瞌 瞎 瞒 瞩 瞪 瞬 瞭 瞳 瞻 矗 矢 矩 矫 矮 矾 矿 砌 砖 砚 砰 砸 砾 硅 硝 硫 碌 碑 碘 碱 碳 碾 磊 磕 磷 礁 祀 祈 祟 祠 祭 祷 禀 禄 禹 禽 禾 秃 秆 秉 秧 秸 秽 稚 稠 稻 稼 稽 穗 穴 窃 窄 窍 窑 窒 窖 窘 窜 窟 窥 窿 竖 竣 竭 竿 笆 笋 笙 笺 笼 筏 筐 筒 筛 筝 筷 箕 箩 箫 箸 篓 篡 篱 篷 簇 簧 簸 籽 粑 粘 粟 粥 粪 粮 粱 粽 糙 糠 糯 紊 絮 纠 纤 纫 纬 纱 纹 纺 绅 绊 绎 绑 绒 绚 绞 绢 绣 绰 绳 绷 绸 绽 缀 缄 缆 缉 缎 缔 缕 缚 缝 缤 缭 缰 罩 羔 羚 羡 羹 翩 翱 耕 耘 耙 耸 耻 耽 耿 聂 聆 聋 肃 肆 肇 肋 肌 肘 肛 肝 肠 肢 肪 肮 肴 肺 肾 肿 胀 胃 胚 胧 胰 胳 脂 脉 脊 脏 脐 脓 脖 脚 脯 脾 腋 腔 腕 腥 腮 腺 腻 膀 膊 膏 膛 膜 膝 膨 臀 臊 臼 舀 舅 舆 舔 舱 舵 舶 艇 艘 艮 艰 艳 芋 芙 芜 芥 芯 芹 芽 苇 苑 苔 苛 苜 苞 苟 苣 苹 茁 茄 茅 茉 茎 茧 茬 茵 茸 荆 荔 荡 荤 荧 荫 莓 莴 莹 莺 莽 菇 菊 菌 菠 菱 萌 萎 萝 董 葩 葫 葬 葱 葵 蒜 蒲 蒸 蓄 蓿 蔓 蔗 蔚 蔬 蔼 蔽 蕉 蕊 蕴 蕾 薇 薛 薯 藐 藕 藻 蘑 虏 虐 虚 蚀 蚂 蚊 蚌 蚓 蚕 蚝 蚣 蚤 蚪 蚯 蛀 蛆 蛎 蛐 蛛 蛤 蛰 蛾 蜀 蜈 蜒 蜓 蜕 蜗 蜘 蜡 蜥 蜴 蜻 蝇 蝉 蝌 蝎 蝗 蝙 蝠 蝴 螂 螃 螺 蟀 蟆 蟋 蟑 蠕 衅 衍 衔 衙 衫 衬 衰 衷 袁 袄 袍 袖 袜 袱 裙 裳 裸 裹 褂 褐 褒 褥 褪 襟 觅 触 誊 譬 讥 讳 讶 讹 讼 讽 诀 诈 诊 诡 诫 诬 诱 诲 诵 诽 谆 谍 谎 谐 谚 谣 谤 谦 谬 谭 谴 豁 豌 豚 豫 豹 豺 账 贫 贬 贮 贰 贷 贻 贿 赁 赂 赃 赎 赘 赡 赣 赦 赴 赶 趟 趴 趾 跆 跋 跛 跤 跨 跪 践 跷 跺 踊 踪 踱 蹂 蹄 蹈 蹋 蹦 蹬 蹭 蹲 躁 躏 躬 躯 躺 轧 轴 轿 辐 辖 辗 辙 辜 辟 辣 辫 辽 迂 迄 迢 迭 迹 逗 逞 逮 逾 遂 遏 遣 遥 邑 郁 郊 鄙 酌 酗 酝 酢 酣 酥 酪 酬 酱 酵 酿 醇 醋 醺 鉴 钉 钙 钝 钞 钠 钥 钧 钩 钮 钯 钳 钾 铂 铅 铐 铛 铝 铰 铲 铸 锄 锈 锌 锐 锑 锚 锣 锤 锥 锯 锰 锹 锻 镀 镐 镑 镖 镰 镶 闯 闸 闺 闽 阀 阎 阱 陋 陌 陕 陡 陨 隅 隋 隘 隙 隧 隶 雀 雁 雇 雌 雏 雕 雹 霄 霉 霎 霜 霞 霾 靡 靴 靶 鞍 鞠 鞭 韧 韭 韵 顷 颁 颂 颅 颈 颊 颓 颖 颜 颠 颤 飓 饥 饪 饲 饵 饶 饺 饿 馁 馅 馈 馋 馍 馏 馒 驮 驯 驰 驳 驴 驹 驼 骂 骄 骆 骇 骏 骡 骰 骷 骼 髅 髓 髦 鬈 鬓 魁 魄 魏 鱿 鲍 鲤 鲨 鲫 鲸 鳄 鳍 鳖 鳞 鸢 鸥 鸦 鸯 鸳 鸵 鸽 鹃 鹉 鹊 鹏 鹦 黏 黔 黛 黯 鼎 鼬 龇]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[﹉﹊﹋﹌ _＿﹍﹎﹏︳︴ \-－﹣ ‐‑ – —︱ ― ,，﹐ 、﹑ ;；﹔ \:：﹕ !！﹗ ?？﹖ .．﹒ ‥︰ … 。 · ＇‘’ &quot;＂“”〝〞 (（﹙︵ )）﹚︶ \[［ \]］ \{｛﹛︷ \}｝﹜︸ 〈︿ 〉﹀ 《︽ 》︾ 「﹁ 」﹂ 『﹃ 』﹄ 【︻ 】︼ 〔﹝︹ 〕﹞︺ 〖 〗 ‖ § @＠﹫ *＊﹡ /／ \\＼﹨ \&amp;＆﹠ #＃﹟ %％﹪ ‰ ′ ″ ‵ 〃 ※]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 十 四]</exemplarCharacters>
+		<exemplarCharacters type="numbers-auxiliary">[伍 叁 壹 拾 捌 柒 玖 肆 贰 陆 零]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ – — ,， 、 ;； \:： !！ ?？ . … 。 · '‘’ &quot;“” (（ )） \[ \] \{ \} 《 》 「 」 【 】 @ * \\ \&amp; # % ` \^ + &lt; = &gt; |｜ ~～]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-auxiliary">[﹉﹊﹋﹌ ＿﹍﹎﹏︳︴ －﹣ ‐ ― ﹐ ﹑ ﹔ ﹕ ﹗ ﹖ ．﹒ ‥︰ ＇ ＂〝〞 ﹙︵ ﹚︶ ［ ］ ｛﹛︷ ｝﹜︸ 〈︿ 〉﹀ ︽ ︾ ﹁ ﹂ 『﹃ 』﹄ ︻ ︼ 〔﹝︹ 〕﹞︺ 〖 〗 ‖ § ＠﹫ ＊﹡ ／ ＼﹨ ＆﹠ ＃﹟ ％﹪ ‰ ′ ″ ‵ 〃 ※]</exemplarCharacters>
+		<exemplarCharacters type="punctuation-person">[\- ‐‑ , . {/·}]</exemplarCharacters>
 		<ellipsis type="word-final">{0}…</ellipsis>
 		<ellipsis type="word-initial">…{0}</ellipsis>
 		<ellipsis type="word-medial">{0}…{1}</ellipsis>
@@ -1443,9 +1498,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1777,6 +1829,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EBh时</dateFormatItem>
 						<dateFormatItem id="EBhm">EB h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">EB h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
@@ -1790,6 +1843,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="h">ah时</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">vah时</dateFormatItem>
+						<dateFormatItem id="Hv">vH时</dateFormatItem>
 						<dateFormatItem id="M">MMM</dateFormatItem>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">M-dE</dateFormatItem>
@@ -1958,7 +2013,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</months>
 				<eras>
 					<eraAbbr>
-						<era type="0">科普特历前</era>
 						<era type="1">科普特历</era>
 					</eraAbbr>
 				</eras>
@@ -2006,16 +2060,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0">埃塞俄比亚历前</era>
-						<era type="1">埃塞俄比亚历</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="contributed">埃历前</era>
-						<era type="1" draft="contributed">埃历</era>
-					</eraAbbr>
-				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -2025,13 +2069,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 				</dateFormats>
 			</calendar>
-			<calendar type="ethiopic-amete-alem">
-				<eras>
-					<eraNames>
-						<era type="0">埃塞俄比亚阿米特阿莱姆历</era>
-					</eraNames>
-				</eras>
-			</calendar>
 			<calendar type="generic">
 				<dateFormats>
 					<dateFormatLength type="full">
@@ -2085,13 +2122,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
-						<dateFormatItem id="EBhm">EB h:mm</dateFormatItem>
+						<dateFormatItem id="EBh">EBh时</dateFormatItem>
+						<dateFormatItem id="EBhm">EBh:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">EB h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="Eh">Eah时</dateFormatItem>
 						<dateFormatItem id="Ehm">Ea h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">Ea h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">Gy/M</dateFormatItem>
 						<dateFormatItem id="GyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy/M/d E</dateFormatItem>
 						<dateFormatItem id="GyMEEEEd">Gy年M月d日EEEE</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
@@ -2100,6 +2141,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">H时</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">vah时</dateFormatItem>
+						<dateFormatItem id="Hv">vH时</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/dE</dateFormatItem>
 						<dateFormatItem id="MMM">LL</dateFormatItem>
@@ -2438,14 +2481,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EBh时</dateFormatItem>
 						<dateFormatItem id="EBhm">EBh:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">EBh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="Eh">Eah时</dateFormatItem>
 						<dateFormatItem id="Ehm">Eah:mm</dateFormatItem>
 						<dateFormatItem id="EHm">EHH:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">Eah:mm:ss</dateFormatItem>
 						<dateFormatItem id="EHms">EHH:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMd">Gy-MM-dd</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy-MM-ddE</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
@@ -2453,10 +2501,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">H时</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="hmsv">v ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hmsv">v HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="hmv">v ah:mm</dateFormatItem>
+						<dateFormatItem id="hmsv">vah:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hmsv">vHH:mm:ss</dateFormatItem>
+						<dateFormatItem id="hmv">vah:mm</dateFormatItem>
 						<dateFormatItem id="Hmv">v HH:mm</dateFormatItem>
+						<dateFormatItem id="hv">vah时</dateFormatItem>
+						<dateFormatItem id="Hv">vH时</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/dE</dateFormatItem>
@@ -2585,8 +2635,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">y–y年</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y年M月至M月</greatestDifference>
-							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">y/M – y/M</greatestDifference>
+							<greatestDifference id="y">y/M – y/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
 							<greatestDifference id="d">y/M/d – y/M/d</greatestDifference>
@@ -2596,25 +2646,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="yMEd">
 							<greatestDifference id="d">y/M/dE至y/M/dE</greatestDifference>
 							<greatestDifference id="M">y/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="y">y/M/dE至y/M/dE</greatestDifference>
+							<greatestDifference id="y">y/M/dE – y/M/dE</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y年M月至M月</greatestDifference>
-							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">y年MMM – MMM</greatestDifference>
+							<greatestDifference id="y">y年MMM – y年MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y年M月d日至d日</greatestDifference>
-							<greatestDifference id="M">y年M月d日至M月d日</greatestDifference>
-							<greatestDifference id="y">y年M月d日至y年M月d日</greatestDifference>
+							<greatestDifference id="d">y年MMMd日 – d日</greatestDifference>
+							<greatestDifference id="M">y年MMMd日 – MMMd日</greatestDifference>
+							<greatestDifference id="y">y年MMMd日 – y年MMMd日</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y年M月d日E至d日E</greatestDifference>
+							<greatestDifference id="d">y年MMMd日E – MMMd日E</greatestDifference>
 							<greatestDifference id="M">y年M月d日E至M月d日E</greatestDifference>
 							<greatestDifference id="y">y年M月d日E至y年M月d日E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y年M月至M月</greatestDifference>
-							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
+							<greatestDifference id="M">y年M月 – M月</greatestDifference>
+							<greatestDifference id="y">y年M月 – y年M月</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2818,6 +2868,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</eras>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">Gy/M</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy-MM-dd E</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M-d</dateFormatItem>
 						<dateFormatItem id="MEd">M-dE</dateFormatItem>
@@ -2828,6 +2880,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="iso8601">
+				<dateTimeFormats>
+					<intervalFormats>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="M" draft="contributed">MMMd日 E – MMMd日 E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d" draft="contributed">y-MM-dd E – y-MM-dd E</greatestDifference>
+							<greatestDifference id="M" draft="contributed">y-MM-dd E – y-MM-dd E</greatestDifference>
+							<greatestDifference id="y" draft="contributed">y-MM-dd E – y-MM-dd E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M" draft="contributed">y年MMM–MMM</greatestDifference>
+							<greatestDifference id="y" draft="contributed">y年MMM – y年MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d" draft="contributed">y年MMMd–d日</greatestDifference>
+							<greatestDifference id="M" draft="contributed">y年MMMd日 – MMMd日</greatestDifference>
+							<greatestDifference id="y" draft="contributed">y年MMMd日 – y年MMMd日</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d" draft="contributed">y年MMMd日 E – MMMd日 E</greatestDifference>
+							<greatestDifference id="M" draft="contributed">y年MMMd日 E – MMMd日 E</greatestDifference>
+							<greatestDifference id="y" draft="contributed">y年MMMd日 E – y年MMMd日 E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M" draft="contributed">y年MMM–MMM</greatestDifference>
+							<greatestDifference id="y" draft="contributed">y年MMMM – y年MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
 			<calendar type="japanese">
 				<eras>
 					<eraAbbr>
@@ -3345,6 +3429,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</eras>
 				<dateTimeFormats>
 					<availableFormats>
+						<dateFormatItem id="GyM">Gy年M月</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy-MM-dd E</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
@@ -3438,12 +3524,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekday">
 				<displayName>星期</displayName>
 			</field>
-			<field type="weekday-short">
-				<displayName>星期</displayName>
-			</field>
-			<field type="weekday-narrow">
-				<displayName>星期</displayName>
-			</field>
 			<field type="weekdayOfMonth">
 				<displayName>月中日</displayName>
 			</field>
@@ -3586,7 +3666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</long>
 			</zone>
 			<zone type="Etc/Unknown">
-				<exemplarCity>未知城市</exemplarCity>
+				<exemplarCity>未知地点</exemplarCity>
 			</zone>
 			<zone type="Europe/Andorra">
 				<exemplarCity>安道尔</exemplarCity>
@@ -3715,7 +3795,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>布里斯班</exemplarCity>
 			</zone>
 			<zone type="Antarctica/Macquarie">
-				<exemplarCity>麦格理</exemplarCity>
+				<exemplarCity>麦夸里岛</exemplarCity>
 			</zone>
 			<zone type="Australia/Lord_Howe">
 				<exemplarCity>豪勋爵岛</exemplarCity>
@@ -3930,6 +4010,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>复活节岛</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>科伊艾克</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>蓬塔阿雷纳斯</exemplarCity>
 			</zone>
@@ -4195,9 +4278,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>金边</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>恩德伯里</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>坎顿岛</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4558,7 +4638,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>雅库茨克</exemplarCity>
 			</zone>
 			<zone type="Asia/Vladivostok">
-				<exemplarCity>符拉迪沃斯托克</exemplarCity>
+				<exemplarCity>海参崴</exemplarCity>
 			</zone>
 			<zone type="Asia/Khandyga">
 				<exemplarCity>汉德加</exemplarCity>
@@ -4874,9 +4954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>西部非洲时间</generic>
-					<standard>西部非洲标准时间</standard>
-					<daylight>西部非洲夏令时间</daylight>
+					<standard>西部非洲时间</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -5264,6 +5342,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>圭亚那时间</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>夏威夷-阿留申标准时间</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>夏威夷-阿留申时间</generic>
@@ -5714,6 +5797,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>楚克时间</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>土耳其时间</generic>
+					<standard>土耳其标准时间</standard>
+					<daylight>土耳其夏令时间</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>土库曼斯坦时间</generic>
@@ -5896,8 +5986,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -5909,16 +5997,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">¤0万</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 0万</pattern>
 					<pattern type="100000" count="other">¤00万</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 00万</pattern>
 					<pattern type="1000000" count="other">¤000万</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 000万</pattern>
 					<pattern type="10000000" count="other">¤0000万</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0000万</pattern>
 					<pattern type="100000000" count="other">¤0亿</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 0亿</pattern>
 					<pattern type="1000000000" count="other">¤00亿</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 00亿</pattern>
 					<pattern type="10000000000" count="other">¤000亿</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 000亿</pattern>
 					<pattern type="100000000000" count="other">¤0000亿</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0000亿</pattern>
 					<pattern type="1000000000000" count="other">¤0万亿</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0万亿</pattern>
 					<pattern type="10000000000000" count="other">¤00万亿</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00万亿</pattern>
 					<pattern type="100000000000000" count="other">¤000万亿</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000万亿</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0}{1}</unitPattern>
@@ -6830,6 +6929,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>东加勒比元</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>加勒比盾</displayName>
+				<displayName count="other">加勒比盾</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>特别提款权</displayName>
 			</currency>
@@ -6910,6 +7013,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>津巴布韦元 (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>津巴布韦金元</displayName>
+				<displayName count="other">津巴布韦金元</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>津巴布韦元 (2009)</displayName>
 			</currency>
@@ -7034,13 +7141,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>毫摩尔/升</displayName>
 				<unitPattern count="other">每升{0}毫摩尔</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>份</displayName>
+				<unitPattern count="other">{0}份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">百万分之{0}</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>摩尔</displayName>
 				<unitPattern count="other">{0}摩尔</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0}葡萄糖</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>升/公里</displayName>
 				<unitPattern count="other">每公里{0}升</unitPattern>
@@ -7276,6 +7391,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>毫米汞柱</displayName>
 				<unitPattern count="other">{0}毫米汞柱</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>汞柱</displayName>
+				<unitPattern count="other">{0}汞柱</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>磅/平方英寸</displayName>
 				<unitPattern count="other">每平方英寸{0}磅</unitPattern>
@@ -7352,6 +7471,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>牛顿米</displayName>
 				<unitPattern count="other">{0}牛顿米</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量盎司</displayName>
+				<unitPattern count="other">{0}公制液量盎司</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon-imperial">
 				<displayName>英制甜点匙</displayName>
 				<unitPattern count="other">{0}英制甜点匙</unitPattern>
@@ -7364,19 +7487,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>英制夸脱</displayName>
 				<unitPattern count="other">{0}英制夸脱</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>光</displayName>
-				<unitPattern count="other">{0}光</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0}球面度</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>开特</displayName>
+				<unitPattern count="other">{0}开特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>库仑</displayName>
+				<unitPattern count="other">{0}库仑</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法拉</displayName>
+				<unitPattern count="other">{0}法拉</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨利</displayName>
+				<unitPattern count="other">{0}亨利</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西门子</displayName>
+				<unitPattern count="other">{0}西门子</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>国际蒸汽表卡路里</displayName>
+				<unitPattern count="other">{0}国际蒸汽表卡路里</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>贝克勒尔</displayName>
+				<unitPattern count="other">{0}贝克勒尔</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>西弗</displayName>
+				<unitPattern count="other">{0} 西弗</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈瑞</displayName>
+				<unitPattern count="other">{0}戈瑞</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>千克力</displayName>
+				<unitPattern count="other">{0}千克力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特斯拉</displayName>
+				<unitPattern count="other">{0}特斯拉</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韦伯</displayName>
+				<unitPattern count="other">{0}韦伯</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>十亿分比</displayName>
 				<unitPattern count="other">十亿分之{0}</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>晚</displayName>
-				<unitPattern count="other">{0}晚</unitPattern>
-				<perUnitPattern>{0}/晚</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>主方向</displayName>
 			</coordinateUnit>
@@ -7454,9 +7620,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>项</displayName>
 				<unitPattern count="other">{0}项</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>份</displayName>
+				<unitPattern count="other">{0}份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="other">{0}Glc</unitPattern>
+			</unit>
 			<unit type="digital-byte">
 				<displayName>B</displayName>
 				<unitPattern count="other">{0} B</unitPattern>
@@ -7709,6 +7883,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>mmHg</displayName>
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0}Hg</unitPattern>
+			</unit>
 			<unit type="temperature-kelvin">
 				<unitPattern count="other">{0}K</unitPattern>
 			</unit>
@@ -7779,6 +7956,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>公制杯</displayName>
 				<unitPattern count="other">{0}公制杯</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液量盎司</displayName>
+				<unitPattern count="other">{0}公制液量盎司</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>英亩英尺</displayName>
 				<unitPattern count="other">{0}英亩英尺</unitPattern>
@@ -7849,10 +8030,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>撮</displayName>
 				<unitPattern count="other">{0}撮</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0}sr</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0}kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>国际蒸汽表卡</displayName>
+				<unitPattern count="other">{0}国际蒸汽表卡</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>贝克</displayName>
+				<unitPattern count="other">{0}贝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>西弗</displayName>
+				<unitPattern count="other">{0}西弗</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈瑞</displayName>
+				<unitPattern count="other">{0}戈瑞</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other">{0}Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>光</displayName>
 				<unitPattern count="other">{0}光</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="other">{0}ppb</unitPattern>
+			</unit>
 			<unit type="duration-night">
 				<displayName>晚</displayName>
 				<unitPattern count="other">{0}晚</unitPattern>
@@ -7928,9 +8143,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-millimole-per-liter">
 				<unitPattern count="other">{0}mmol/L</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>份</displayName>
+				<unitPattern count="other">{0}份</unitPattern>
+			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0}mol</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="other">{0}Glc</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other">{0}L/km</unitPattern>
 			</unit>
@@ -8201,6 +8424,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="pressure-millimeter-ofhg">
 				<unitPattern count="other">{0}mmHg</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<unitPattern count="other">{0}Hg</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="other">{0}psi</unitPattern>
 			</unit>
@@ -8369,14 +8595,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>英制夸脱</displayName>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>光</displayName>
-				<unitPattern count="other">{0}光</unitPattern>
+			<unit type="angle-steradian">
+				<unitPattern count="other">{0}sr</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>晚</displayName>
-				<unitPattern count="other">{0}晚</unitPattern>
-				<perUnitPattern>{0}/晚</perUnitPattern>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0}kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="other">{0}cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="other">{0}Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="other">{0}Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="other">{0}Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="other">{0}kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="other">{0}T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="other">{0}Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/zh_Hans_MY.xml b/make/data/cldr/common/main/zh_Hans_MY.xml
index 6a8050439d9..a47e65a3193 100644
--- a/make/data/cldr/common/main/zh_Hans_MY.xml
+++ b/make/data/cldr/common/main/zh_Hans_MY.xml
@@ -12,6 +12,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<script type="Hans"/>
 		<territory type="MY"/>
 	</identity>
+	<localeDisplayNames>
+		<territories>
+			<territory type="BN" draft="unconfirmed">汶莱</territory>
+			<territory type="LA" draft="unconfirmed">寮国</territory>
+			<territory type="NZ" draft="unconfirmed">纽西兰</territory>
+		</territories>
+		<types>
+			<type key="calendar" type="islamic" scope="core" draft="unconfirmed">回历</type>
+			<type key="calendar" type="islamic-civil" scope="core" draft="unconfirmed">表格式回历（民用纪元）</type>
+			<type key="calendar" type="islamic-tbla" scope="core" draft="unconfirmed">表格式回历（天文纪元）</type>
+		</types>
+	</localeDisplayNames>
 	<dates>
 		<calendars>
 			<calendar type="gregorian">
@@ -53,9 +65,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<currencies>
+			<currency type="BND">
+				<displayName draft="unconfirmed">汶莱元</displayName>
+				<displayName count="other" draft="unconfirmed">汶莱元</displayName>
+			</currency>
+			<currency type="IDR">
+				<displayName draft="unconfirmed">印度尼西亚盾</displayName>
+				<displayName count="other" draft="unconfirmed">印度尼西亚盾</displayName>
+			</currency>
+			<currency type="LAK">
+				<displayName draft="unconfirmed">寮国基普</displayName>
+				<displayName count="other" draft="unconfirmed">寮国基普</displayName>
+			</currency>
 			<currency type="MYR">
-				<displayName draft="unconfirmed">马来西亚令吉</displayName>
-				<displayName count="other" draft="unconfirmed">马来西亚令吉</displayName>
+				<displayName>马来西亚令吉</displayName>
 			</currency>
 		</currencies>
 	</numbers>
diff --git a/make/data/cldr/common/main/zh_Hant.xml b/make/data/cldr/common/main/zh_Hant.xml
index 4dac776e727..14ee02051f3 100644
--- a/make/data/cldr/common/main/zh_Hant.xml
+++ b/make/data/cldr/common/main/zh_Hant.xml
@@ -92,7 +92,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="bkm">康姆文</language>
 			<language type="bla">錫克錫卡文</language>
 			<language type="blo">阿尼文</language>
-			<language type="blt" draft="unconfirmed">黑傣語</language>
+			<language type="blt" draft="contributed">黑傣語</language>
 			<language type="bm">班巴拉文</language>
 			<language type="bn">孟加拉文</language>
 			<language type="bo">藏文</language>
@@ -329,6 +329,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">巴菲亞文</language>
 			<language type="ksh">科隆文</language>
 			<language type="ku">庫德文</language>
+			<language type="ku" menu="core">庫德語</language>
+			<language type="ku" menu="extension">北庫德語</language>
 			<language type="kum">庫密克文</language>
 			<language type="kut">庫特奈文</language>
 			<language type="kv">科米文</language>
@@ -406,7 +408,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="mt">馬爾他文</language>
 			<language type="mua">蒙當文</language>
 			<language type="mul">多種語言</language>
-			<language type="mus">克里克文</language>
+			<language type="mus">馬斯科吉文</language>
 			<language type="mwl">米蘭德斯文</language>
 			<language type="mwr">馬瓦里文</language>
 			<language type="mwv">明打威文</language>
@@ -589,7 +591,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="tk">土庫曼文</language>
 			<language type="tkl">托克勞文</language>
 			<language type="tkr">查庫爾文</language>
-			<language type="tl">塔加路族文</language>
+			<language type="tl">他加祿文</language>
 			<language type="tlh">克林貢文</language>
 			<language type="tli">特林基特文</language>
 			<language type="tly">塔里什文</language>
@@ -786,7 +788,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<script type="Newa" draft="contributed">Vote 尼瓦爾文</script>
 			<script type="Nkgb" draft="contributed">納西格巴文</script>
 			<script type="Nkoo">西非書面語言 (N’Ko)</script>
-			<script type="Nshu" draft="contributed">女書</script>
+			<script type="Nshu">女書</script>
 			<script type="Ogam">歐甘文</script>
 			<script type="Olck">桑塔利文</script>
 			<script type="Orkh">鄂爾渾文</script>
@@ -946,6 +948,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">中國</territory>
 			<territory type="CO">哥倫比亞</territory>
 			<territory type="CP">克里派頓島</territory>
+			<territory type="CQ">薩克島</territory>
 			<territory type="CR">哥斯大黎加</territory>
 			<territory type="CU">古巴</territory>
 			<territory type="CV">維德角</territory>
@@ -1260,35 +1263,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">數字排序</key>
 			<key type="colStrength">排序強度</key>
 			<key type="currency">貨幣</key>
+			<key type="em">表情符號展示</key>
 			<key type="hc">時間週期（12 小時制與 24 小時制）</key>
 			<key type="lb">換行樣式</key>
+			<key type="lw">單字內的換行</key>
 			<key type="ms">度量單位系統</key>
 			<key type="numbers">數字</key>
+			<key type="ss">縮寫後斷句</key>
 			<key type="timezone">時區</key>
 			<key type="va">區域變異</key>
 			<key type="x">私人使用</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">佛曆</type>
+			<type key="calendar" type="buddhist" scope="core">佛曆</type>
 			<type key="calendar" type="chinese">農曆</type>
+			<type key="calendar" type="chinese" scope="core">農曆</type>
 			<type key="calendar" type="coptic">科普特曆</type>
+			<type key="calendar" type="coptic" scope="core">科普特曆</type>
 			<type key="calendar" type="dangi">檀紀曆</type>
+			<type key="calendar" type="dangi" scope="core">檀紀曆</type>
 			<type key="calendar" type="ethiopic">衣索比亞曆</type>
+			<type key="calendar" type="ethiopic" scope="core">衣索比亞曆</type>
 			<type key="calendar" type="ethiopic-amete-alem">衣索比亞曆 (Amete Alem)</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">衣索比亞曆 (Amete Alem)</type>
 			<type key="calendar" type="gregorian">公曆</type>
+			<type key="calendar" type="gregorian" scope="core">公曆</type>
 			<type key="calendar" type="hebrew">希伯來曆</type>
+			<type key="calendar" type="hebrew" scope="core">希伯來曆</type>
 			<type key="calendar" type="indian">印度國曆</type>
 			<type key="calendar" type="islamic">伊斯蘭曆</type>
+			<type key="calendar" type="islamic" scope="core">伊斯蘭曆</type>
 			<type key="calendar" type="islamic-civil">伊斯蘭民用曆</type>
+			<type key="calendar" type="islamic-civil" scope="core">表格式伊斯蘭曆（民用紀元）</type>
 			<type key="calendar" type="islamic-rgsa" draft="contributed">伊斯蘭新月曆</type>
 			<type key="calendar" type="islamic-tbla">伊斯蘭天文曆</type>
+			<type key="calendar" type="islamic-tbla" scope="core">表格式伊斯蘭曆（天文紀元）</type>
 			<type key="calendar" type="islamic-umalqura">伊斯蘭曆（烏姆庫拉）</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">伊斯蘭曆（烏姆庫拉）</type>
 			<type key="calendar" type="iso8601">ISO 8601 國際曆法</type>
-			<type key="calendar" type="japanese">日本曆</type>
+			<type key="calendar" type="japanese">和曆</type>
+			<type key="calendar" type="japanese" scope="core">和曆</type>
 			<type key="calendar" type="persian">波斯曆</type>
+			<type key="calendar" type="persian" scope="core">波斯曆</type>
 			<type key="calendar" type="roc">國曆</type>
+			<type key="calendar" type="roc" scope="core">國曆</type>
 			<type key="cf" type="account">會計貨幣格式</type>
+			<type key="cf" type="account" scope="core">會計</type>
 			<type key="cf" type="standard">標準貨幣格式</type>
+			<type key="cf" type="standard" scope="core">標準</type>
 			<type key="colAlternate" type="non-ignorable" draft="contributed">排序符號</type>
 			<type key="colAlternate" type="shifted" draft="contributed">略過符號排序</type>
 			<type key="colBackwards" type="no" draft="contributed">正常排序重音</type>
@@ -1298,23 +1321,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper" draft="contributed">優先排序大寫</type>
 			<type key="colCaseLevel" type="no" draft="contributed">不分大小寫排序</type>
 			<type key="colCaseLevel" type="yes" draft="contributed">依大小寫排序</type>
-			<type key="collation" type="big5han">繁體中文排序 - Big5</type>
 			<type key="collation" type="compat">舊制排序</type>
+			<type key="collation" type="compat" scope="core">相容性</type>
 			<type key="collation" type="dictionary">字典排序</type>
+			<type key="collation" type="dictionary" scope="core">字典</type>
 			<type key="collation" type="ducet">預設 Unicode 排序</type>
+			<type key="collation" type="ducet" scope="core">預設 Unicode</type>
 			<type key="collation" type="emoji" draft="contributed">表情符號</type>
 			<type key="collation" type="eor" draft="contributed">歐洲排序規則</type>
-			<type key="collation" type="gb2312han">簡體中文排序 - GB2312</type>
 			<type key="collation" type="phonebook">電話簿排序</type>
+			<type key="collation" type="phonebook" scope="core">電話簿</type>
 			<type key="collation" type="phonetic">發音排序</type>
+			<type key="collation" type="phonetic" scope="core">發音</type>
 			<type key="collation" type="pinyin">拼音排序</type>
+			<type key="collation" type="pinyin" scope="core">拼音</type>
 			<type key="collation" type="search">一般用途搜尋</type>
+			<type key="collation" type="search" scope="core">搜尋</type>
 			<type key="collation" type="searchjl">依諺文聲母搜尋</type>
 			<type key="collation" type="standard">標準排序</type>
+			<type key="collation" type="standard" scope="core">標準</type>
 			<type key="collation" type="stroke">筆畫排序</type>
+			<type key="collation" type="stroke" scope="core">筆畫</type>
 			<type key="collation" type="traditional">傳統排序</type>
+			<type key="collation" type="traditional" scope="core">傳統</type>
 			<type key="collation" type="unihan">部首筆畫排序</type>
+			<type key="collation" type="unihan" scope="core">部首筆畫</type>
 			<type key="collation" type="zhuyin">注音排序</type>
+			<type key="collation" type="zhuyin" scope="core">注音</type>
 			<type key="colNormalization" type="no" draft="contributed">非正規化排序</type>
 			<type key="colNormalization" type="yes" draft="contributed">依正規化排序 Unicode</type>
 			<type key="colNumeric" type="no" draft="contributed">個別排序數字</type>
@@ -1327,18 +1360,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">全形</type>
 			<type key="d0" type="hwidth">半形</type>
 			<type key="d0" type="npinyin" draft="contributed">數字</type>
+			<type key="em" type="default" scope="core">預設</type>
+			<type key="em" type="emoji" scope="core">表情符號</type>
+			<type key="em" type="text" scope="core">文字</type>
 			<type key="hc" type="h11">12 小時制 (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 小時制 (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 小時制 (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 小時制 (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">寬鬆換行樣式</type>
+			<type key="lb" type="loose" scope="core">寬鬆</type>
 			<type key="lb" type="normal">一般換行樣式</type>
+			<type key="lb" type="normal" scope="core">一般</type>
 			<type key="lb" type="strict">強制換行樣式</type>
+			<type key="lb" type="strict" scope="core">強制</type>
+			<type key="lw" type="breakall" scope="core">任意字元強迫換行</type>
+			<type key="lw" type="keepall" scope="core">保留完整單字換行</type>
+			<type key="lw" type="normal" scope="core">一般</type>
+			<type key="lw" type="phrase" scope="core">維持詞組</type>
 			<type key="m0" type="bgn">美國地名委員會</type>
 			<type key="m0" type="ungegn">聯合國地名專家組</type>
-			<type key="ms" type="metric">公制</type>
+			<type key="ms" type="metric">公制系統</type>
+			<type key="ms" type="metric" scope="core">公制</type>
 			<type key="ms" type="uksystem">英制度量單位系統</type>
+			<type key="ms" type="uksystem" scope="core">英制</type>
 			<type key="ms" type="ussystem">美制度量單位系統</type>
+			<type key="ms" type="ussystem" scope="core">美制</type>
 			<type key="numbers" type="ahom" draft="contributed">阿洪姆數字</type>
 			<type key="numbers" type="arab">阿拉伯-印度數字</type>
 			<type key="numbers" type="arabext">阿拉伯-印度擴充數字</type>
@@ -1418,6 +1468,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="traditional" draft="contributed">傳統數字</type>
 			<type key="numbers" type="vaii">瓦伊文數字</type>
 			<type key="numbers" type="wara" draft="contributed">瓦蘭齊地數字</type>
+			<type key="ss" type="none" scope="core">關閉</type>
+			<type key="ss" type="standard" scope="core">開啟</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">公制</measurementSystemName>
@@ -1754,6 +1806,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EBh時</dateFormatItem>
 						<dateFormatItem id="EBhm">E Bh:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
@@ -1768,6 +1821,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">HH時</dateFormatItem>
 						<dateFormatItem id="hm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="hms">Bh:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">ah v</dateFormatItem>
 						<dateFormatItem id="M">MMM</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/dE</dateFormatItem>
@@ -2115,29 +2169,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">Bh時</dateFormatItem>
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
+						<dateFormatItem id="EBh">EB h</dateFormatItem>
 						<dateFormatItem id="EBhm">E Bh:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
+						<dateFormatItem id="Eh">E ah </dateFormatItem>
 						<dateFormatItem id="Ehm">E Bh:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">G y年</dateFormatItem>
 						<dateFormatItem id="GyMd">G y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">G y-MM-dd E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G y年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G y年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y年M月d日 E</dateFormatItem>
@@ -2147,6 +2213,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">H:mm</dateFormatItem>
 						<dateFormatItem id="hms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">ah v</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
@@ -2406,22 +2473,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="atTime">
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
@@ -2429,13 +2517,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bhm">Bh:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">Bh:mm:ss</dateFormatItem>
 						<dateFormatItem id="d">d日</dateFormatItem>
-						<dateFormatItem id="EBhm">E Bh:mm</dateFormatItem>
-						<dateFormatItem id="EBhms">E Bh:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">EBh時</dateFormatItem>
+						<dateFormatItem id="EBhm">EBh:mm</dateFormatItem>
+						<dateFormatItem id="EBhms">EBh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">E Bh:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E Bh:mm:ss</dateFormatItem>
+						<dateFormatItem id="Eh">Eah時</dateFormatItem>
+						<dateFormatItem id="Ehm">EBh:mm</dateFormatItem>
+						<dateFormatItem id="Ehms">EBh:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">Gy/M</dateFormatItem>
 						<dateFormatItem id="GyMd">G y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy/M/d（E）</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日 E</dateFormatItem>
@@ -2447,12 +2539,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">HH:mm:ss [v]</dateFormatItem>
 						<dateFormatItem id="hmv">Bh:mm [v]</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm [v]</dateFormatItem>
+						<dateFormatItem id="hv">ah v</dateFormatItem>
 						<dateFormatItem id="M">M月</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">M/d（E）</dateFormatItem>
 						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
 						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日 E</dateFormatItem>
+						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
 						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">MMMM的第W週</dateFormatItem>
 						<dateFormatItem id="y">y年</dateFormatItem>
@@ -2463,7 +2556,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yMM">y/MM</dateFormatItem>
 						<dateFormatItem id="yMMM">y年M月</dateFormatItem>
 						<dateFormatItem id="yMMMd">y年M月d日</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y年M月d日 E</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y年M月d日E</dateFormatItem>
 						<dateFormatItem id="yMMMM">y年M月</dateFormatItem>
 						<dateFormatItem id="yQQQ">y年QQQ</dateFormatItem>
 						<dateFormatItem id="yQQQQ">y年QQQQ</dateFormatItem>
@@ -2799,7 +2892,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ed">d日（E）</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">Gy/M</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG y/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy-MM-dd E</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
@@ -3437,7 +3532,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
+						<dateFormatItem id="GyM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMd">Gy/M/d</dateFormatItem>
+						<dateFormatItem id="GyMEd">Gy年M月d日（E）</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
@@ -3461,12 +3558,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="era">
 				<displayName>紀元</displayName>
 			</field>
-			<field type="era-short">
-				<displayName>紀元</displayName>
-			</field>
-			<field type="era-narrow">
-				<displayName>紀元</displayName>
-			</field>
 			<field type="year">
 				<displayName>年</displayName>
 				<relative type="-1">去年</relative>
@@ -3522,9 +3613,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="weekOfMonth-short">
 				<displayName>月週次</displayName>
 			</field>
-			<field type="weekOfMonth-narrow">
-				<displayName>月週次</displayName>
-			</field>
 			<field type="day">
 				<displayName>日</displayName>
 				<relative type="-2">前天</relative>
@@ -3542,30 +3630,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="dayOfYear">
 				<displayName>該年第幾天</displayName>
 			</field>
-			<field type="dayOfYear-short">
-				<displayName>該年第幾天</displayName>
-			</field>
-			<field type="dayOfYear-narrow">
-				<displayName>該年第幾天</displayName>
-			</field>
 			<field type="weekday">
 				<displayName>星期</displayName>
 			</field>
-			<field type="weekday-short">
-				<displayName>星期</displayName>
-			</field>
-			<field type="weekday-narrow">
-				<displayName>星期</displayName>
-			</field>
 			<field type="weekdayOfMonth">
 				<displayName>該月第幾週</displayName>
 			</field>
-			<field type="weekdayOfMonth-short">
-				<displayName>該月第幾週</displayName>
-			</field>
-			<field type="weekdayOfMonth-narrow">
-				<displayName>該月第幾週</displayName>
-			</field>
 			<field type="sun">
 				<relative type="-1">上週日</relative>
 				<relative type="0">本週日</relative>
@@ -3643,15 +3713,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} 個週六前</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="dayperiod-short">
-				<displayName>時段</displayName>
-			</field>
 			<field type="dayperiod">
 				<displayName>時段</displayName>
 			</field>
-			<field type="dayperiod-narrow">
-				<displayName>時段</displayName>
-			</field>
 			<field type="hour">
 				<displayName>小時</displayName>
 				<relative type="0">這一小時</relative>
@@ -3665,9 +3729,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="hour-short">
 				<displayName>時</displayName>
 			</field>
-			<field type="hour-narrow">
-				<displayName>時</displayName>
-			</field>
 			<field type="minute">
 				<displayName>分鐘</displayName>
 				<relative type="0">這一分鐘</relative>
@@ -3681,9 +3742,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="minute-short">
 				<displayName>分</displayName>
 			</field>
-			<field type="minute-narrow">
-				<displayName>分</displayName>
-			</field>
 			<field type="second">
 				<displayName>秒</displayName>
 				<relative type="0">現在</relative>
@@ -4054,6 +4112,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>復活島</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>科伊艾克</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>蓬塔阿雷納斯</exemplarCity>
 			</zone>
@@ -4319,9 +4380,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>金邊</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>恩得伯理島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>坎頓島</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -4998,9 +5056,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>西非時間</generic>
-					<standard>西非標準時間</standard>
-					<daylight>西非夏令時間</daylight>
+					<standard>西非時間</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -5421,6 +5477,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>蓋亞那時間</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>夏威夷-阿留申標準時間</standard>
+				</long>
+				<short>
+					<standard draft="contributed">HAST</standard>
+				</short>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>夏威夷-阿留申時間</generic>
@@ -5876,6 +5940,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>楚克島時間</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>土耳其時間</generic>
+					<standard>土耳其標準時間</standard>
+					<daylight>土耳其夏令時間</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>土庫曼時間</generic>
@@ -6003,8 +6074,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -6016,16 +6085,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other">0</pattern>
 					<pattern type="10000" count="other">¤0萬</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 0萬</pattern>
 					<pattern type="100000" count="other">¤00萬</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 00萬</pattern>
 					<pattern type="1000000" count="other">¤000萬</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 000萬</pattern>
 					<pattern type="10000000" count="other">¤0000萬</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 0000萬</pattern>
 					<pattern type="100000000" count="other">¤0億</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 0億</pattern>
 					<pattern type="1000000000" count="other">¤00億</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 00億</pattern>
 					<pattern type="10000000000" count="other">¤000億</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 000億</pattern>
 					<pattern type="100000000000" count="other">¤0000億</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 0000億</pattern>
 					<pattern type="1000000000000" count="other">¤0兆</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0兆</pattern>
 					<pattern type="10000000000000" count="other">¤00兆</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00兆</pattern>
 					<pattern type="100000000000000" count="other">¤000兆</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000兆</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -6294,7 +6374,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>埃及鎊</displayName>
 			</currency>
 			<currency type="ERN">
-				<displayName>厄立特里亞納克法</displayName>
+				<displayName>厄利垂亞納可法</displayName>
+				<displayName count="other">厄利垂亞納可法</displayName>
 			</currency>
 			<currency type="ESA">
 				<displayName draft="contributed">西班牙比塞塔（會計單位）</displayName>
@@ -6515,7 +6596,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName draft="contributed">摩爾多瓦券</displayName>
 			</currency>
 			<currency type="MDL">
-				<displayName>摩杜雲列伊</displayName>
+				<displayName>摩爾多瓦列伊</displayName>
+				<displayName count="other">摩爾多瓦列伊</displayName>
 			</currency>
 			<currency type="MGA">
 				<displayName>馬達加斯加阿里亞里</displayName>
@@ -6596,7 +6678,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>尼加拉瓜科多巴</displayName>
 			</currency>
 			<currency type="NIO">
-				<displayName>尼加拉瓜金科多巴</displayName>
+				<displayName>尼加拉瓜科多巴</displayName>
+				<displayName count="other">尼加拉瓜科多巴</displayName>
 			</currency>
 			<currency type="NLG">
 				<displayName>荷蘭盾</displayName>
@@ -6838,7 +6921,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>西薩摩亞塔拉</displayName>
 			</currency>
 			<currency type="XAF">
-				<displayName>法郎 (CFA–BEAC)</displayName>
+				<displayName>中非法郎</displayName>
+				<displayName count="other">中非法郎</displayName>
 			</currency>
 			<currency type="XAG">
 				<displayName draft="contributed">白銀</displayName>
@@ -6861,6 +6945,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>格瑞那達元</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>加勒比盾</displayName>
+				<displayName count="other">加勒比盾</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>特殊提款權</displayName>
 			</currency>
@@ -6874,13 +6962,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>法國法郎 (UIC)</displayName>
 			</currency>
 			<currency type="XOF">
-				<displayName>法郎 (CFA–BCEAO)</displayName>
+				<displayName>西非法郎</displayName>
+				<displayName count="other">西非法郎</displayName>
 			</currency>
 			<currency type="XPD">
 				<displayName draft="contributed">帕拉狄昂</displayName>
 			</currency>
 			<currency type="XPF">
-				<displayName>法郎 (CFP)</displayName>
+				<displayName>太平洋法郎</displayName>
+				<displayName count="other">太平洋法郎</displayName>
 			</currency>
 			<currency type="XPT">
 				<displayName draft="contributed">白金</displayName>
@@ -6941,6 +7031,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>辛巴威元 (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>辛巴威金</displayName>
+				<displayName count="other">辛巴威金</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>辛巴威元 (2009)</displayName>
 			</currency>
@@ -7022,6 +7116,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>每公升毫莫耳</displayName>
 				<unitPattern count="other">每公升 {0} 毫莫耳</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>比例</displayName>
+				<unitPattern count="other">{0} 比例</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+				<unitPattern count="other">{0} 葡萄糖</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>每公里公升</displayName>
 				<unitPattern count="other">每公里 {0} 公升</unitPattern>
@@ -7118,10 +7220,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} 英寸</unitPattern>
 				<perUnitPattern>每英寸 {0}</perUnitPattern>
 			</unit>
-			<unit type="length-mile-scandinavian">
-				<displayName>斯堪地那維亞里</displayName>
-				<unitPattern count="other">{0} 斯堪地那維亞里</unitPattern>
-			</unit>
 			<unit type="length-solar-radius">
 				<displayName>太陽半徑</displayName>
 				<unitPattern count="other">{0} 太陽半徑</unitPattern>
@@ -7161,6 +7259,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>馬力</displayName>
 				<unitPattern count="other">{0} 匹馬力</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>汞柱</displayName>
+				<unitPattern count="other">{0} 汞柱</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>每平方英寸磅力</displayName>
 				<unitPattern count="other">每平方英寸 {0} 磅力</unitPattern>
@@ -7203,21 +7305,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} 公升</unitPattern>
 				<perUnitPattern>每公升 {0}</perUnitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液盎司</displayName>
+				<unitPattern count="other">{0}公制液盎司</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>每加侖 {0}</perUnitPattern>
 			</unit>
 			<unit type="volume-gallon-imperial">
 				<perUnitPattern>每英制加侖 {0}</perUnitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0} 球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>開特</displayName>
+				<unitPattern count="other">{0} 開特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>庫侖</displayName>
+				<unitPattern count="other">{0} 庫侖</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法拉</displayName>
+				<unitPattern count="other">{0} 法拉</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨利</displayName>
+				<unitPattern count="other">{0} 亨利</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西門子</displayName>
+				<unitPattern count="other">{0} 西門子</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>卡路里-IT</displayName>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克勒</displayName>
+				<unitPattern count="other">{0} 貝克勒</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>西弗</displayName>
+				<unitPattern count="other">{0} 西弗</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈雷</displayName>
+				<unitPattern count="other">{0} 戈雷</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0} 公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特斯拉</displayName>
+				<unitPattern count="other">{0} 特斯拉</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韋伯</displayName>
+				<unitPattern count="other">{0} 韋伯</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>光速</displayName>
+				<unitPattern count="other">{0} 倍光速</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>十億分點濃度</displayName>
 				<unitPattern count="other">{0} 十億分點濃度</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>夜</displayName>
-				<unitPattern count="other">{0} 夜</unitPattern>
-				<perUnitPattern>{0}/夜</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>基本方向</displayName>
 			</coordinateUnit>
@@ -7384,7 +7540,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>個項目</displayName>
 				<unitPattern count="other">{0} 個項目</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>比例</displayName>
+				<unitPattern count="other">{0}比例</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>百萬分率</displayName>
 				<unitPattern count="other">{0} 百萬分率</unitPattern>
 			</unit>
@@ -7398,6 +7558,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>莫耳</displayName>
 				<unitPattern count="other">{0} 莫耳</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>公升/公里</displayName>
 				<unitPattern count="other">{0} 升/公里</unitPattern>
@@ -7595,8 +7758,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="length-foot">
 				<displayName>英尺</displayName>
-				<unitPattern count="other">{0} 呎</unitPattern>
-				<perUnitPattern>{0}/呎</perUnitPattern>
+				<unitPattern count="other">{0}英尺</unitPattern>
+				<perUnitPattern>{0}/英尺</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<displayName>英寸</displayName>
@@ -7645,7 +7808,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="light-lumen">
 				<displayName>流明</displayName>
-				<unitPattern count="other">{0} 流明</unitPattern>
 			</unit>
 			<unit type="mass-tonne">
 				<displayName>公噸</displayName>
@@ -7872,6 +8034,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>公制量杯</displayName>
 				<unitPattern count="other">{0} 公制杯</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液盎司</displayName>
+				<unitPattern count="other">{0}公制液盎司</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>英畝英尺</displayName>
 				<unitPattern count="other">{0} 英畝英尺</unitPattern>
@@ -7950,7 +8116,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>英制夸脫</displayName>
 				<unitPattern count="other">{0} 英制夸脫</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>開特</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>庫侖</displayName>
+				<unitPattern count="other">{0} 庫侖</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法拉</displayName>
+				<unitPattern count="other">{0} 法拉</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨利</displayName>
+				<unitPattern count="other">{0} 亨利</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西門子</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>卡路里-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>光速</displayName>
+				<unitPattern count="other">{0} 倍光速</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>濃度/十億</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -8030,12 +8221,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<unitPattern count="other">{0}個項目</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>比例</displayName>
+				<unitPattern count="other">{0} 比例</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="other">{0}百萬分率</unitPattern>
 			</unit>
 			<unit type="concentr-mole">
 				<unitPattern count="other">{0}莫耳</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>葡萄糖</displayName>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other">{0}升/公里</unitPattern>
 			</unit>
@@ -8206,7 +8404,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}碼</unitPattern>
 			</unit>
 			<unit type="length-foot">
-				<unitPattern count="other">{0}呎</unitPattern>
+				<unitPattern count="other">{0}英尺</unitPattern>
+				<perUnitPattern>{0}/英尺</perUnitPattern>
 			</unit>
 			<unit type="length-inch">
 				<unitPattern count="other">{0}吋</unitPattern>
@@ -8230,7 +8429,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}nmi</unitPattern>
 			</unit>
 			<unit type="length-mile-scandinavian">
-				<displayName>斯堪地那維亞里</displayName>
 				<unitPattern count="other">{0}smi</unitPattern>
 			</unit>
 			<unit type="length-point">
@@ -8246,7 +8444,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0}燭光</unitPattern>
 			</unit>
 			<unit type="light-lumen">
-				<unitPattern count="other">{0}流明</unitPattern>
+				<displayName>lm</displayName>
+				<unitPattern count="other">{0}lm</unitPattern>
 			</unit>
 			<unit type="light-solar-luminosity">
 				<unitPattern count="other">{0}L☉</unitPattern>
@@ -8416,6 +8615,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0}公制杯</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液盎司</displayName>
+				<unitPattern count="other">{0}公制液盎司</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="other">{0}英畝英尺</unitPattern>
 			</unit>
@@ -8473,13 +8676,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<unitPattern count="other">{0}英制夸脫</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>開特</displayName>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>庫侖</displayName>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>法拉</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>亨利</displayName>
+				<unitPattern count="other">{0} 亨利</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>西門子</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>卡路里-IT</displayName>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>光速</displayName>
+				<unitPattern count="other">{0}倍光速</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>夜</displayName>
 				<unitPattern count="other">{0}夜</unitPattern>
-				<perUnitPattern>{0}/夜</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
diff --git a/make/data/cldr/common/main/zh_Hant_HK.xml b/make/data/cldr/common/main/zh_Hant_HK.xml
index 8d6ffd863bb..1a49e48c798 100644
--- a/make/data/cldr/common/main/zh_Hant_HK.xml
+++ b/make/data/cldr/common/main/zh_Hant_HK.xml
@@ -50,6 +50,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="kiu">扎扎其文</language>
 			<language type="kn">坎納達文</language>
 			<language type="kri">克裡奧爾文</language>
+			<language type="ku" menu="core">庫德文</language>
+			<language type="ku" menu="extension">北庫德文</language>
 			<language type="lo">老撾文</language>
 			<language type="luo">盧歐文</language>
 			<language type="mfe">毛里裘斯克里奧爾文</language>
@@ -203,10 +205,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</keys>
 		<types>
 			<type key="calendar" type="ethiopic">埃塞俄比亞曆</type>
+			<type key="calendar" type="ethiopic" scope="core">埃塞俄比亞曆</type>
 			<type key="calendar" type="ethiopic-amete-alem">埃塞俄比亞阿美德阿萊姆曆</type>
-			<type key="collation" type="big5han">繁體中文排序 (Big5)</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">埃塞俄比亞阿美德阿萊姆曆</type>
+			<type key="calendar" type="islamic-civil" scope="core">伊斯蘭曆（表格曆，民用紀元）</type>
+			<type key="calendar" type="islamic-tbla" scope="core">伊斯蘭曆（表格式，天文紀元）</type>
 			<type key="collation" type="dictionary">詞典排序</type>
-			<type key="collation" type="gb2312han">簡體中文排序 (GB2312)</type>
+			<type key="collation" type="dictionary" scope="core">詞典</type>
 			<type key="ms" type="uksystem">英制</type>
 			<type key="ms" type="ussystem">美制</type>
 			<type key="numbers" type="deva">天城體數字</type>
@@ -329,6 +334,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">ah:mm</dateFormatItem>
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">ah時 v</dateFormatItem>
 						<dateFormatItem id="yyyyMMMMd">r(U)年MMMMd日</dateFormatItem>
 						<dateFormatItem id="yyyyMMMMEd">r(U)年MMMMd日 E</dateFormatItem>
 					</availableFormats>
@@ -399,12 +405,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
+						<dateFormatItem id="EBh">EB h時</dateFormatItem>
 						<dateFormatItem id="Ed">d日E</dateFormatItem>
+						<dateFormatItem id="Eh">E ah 時</dateFormatItem>
 						<dateFormatItem id="Ehm">E ah:mm</dateFormatItem>
 						<dateFormatItem id="Gy">Gy年</dateFormatItem>
 						<dateFormatItem id="GyMMM">Gy年M月</dateFormatItem>
 						<dateFormatItem id="GyMMMd">Gy年M月d日</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">Gy年M月d日E</dateFormatItem>
+						<dateFormatItem id="hv">ah時 v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">d/M（E）</dateFormatItem>
 						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
@@ -566,22 +575,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dateTimeFormats>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
+							<pattern>{1}{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
@@ -593,16 +602,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv">ah:mm:ss [v]</dateFormatItem>
 						<dateFormatItem id="hmv">ah:mm [v]</dateFormatItem>
+						<dateFormatItem id="hv">vah時</dateFormatItem>
+						<dateFormatItem id="Hv">vH時</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">d/M（E）</dateFormatItem>
 						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日E</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other">M月第W週</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
 						<dateFormatItem id="yMEd">d/M/y（E）</dateFormatItem>
 						<dateFormatItem id="yMM">MM/y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y年M月d日E</dateFormatItem>
 						<dateFormatItem id="yw" count="other">Y年第w週</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
@@ -748,6 +757,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="weekday">
 				<displayName>星期幾</displayName>
 			</field>
+			<field type="weekday-short">
+				<displayName>星期幾</displayName>
+			</field>
+			<field type="weekday-narrow">
+				<displayName>星期幾</displayName>
+			</field>
 			<field type="sun">
 				<relative type="-1">上星期日</relative>
 				<relative type="0">本星期日</relative>
@@ -1096,9 +1111,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Bishkek">
 				<exemplarCity>比斯凱克</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>恩德伯里島</exemplarCity>
-			</zone>
 			<zone type="Indian/Comoro">
 				<exemplarCity>科摩羅</exemplarCity>
 			</zone>
@@ -1566,17 +1578,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
 					<pattern type="1000" count="other">¤0K</pattern>
+					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0K</pattern>
 					<pattern type="10000" count="other">¤00K</pattern>
+					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00K</pattern>
 					<pattern type="100000" count="other">¤000K</pattern>
+					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K</pattern>
 					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="100000000" count="other">¤000M</pattern>
+					<pattern type="100000000" count="other" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="1000000000" count="other">¤0B</pattern>
+					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 0B</pattern>
 					<pattern type="10000000000" count="other">¤00B</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 00B</pattern>
 					<pattern type="100000000000" count="other">¤000B</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 000B</pattern>
 					<pattern type="1000000000000" count="other">¤0T</pattern>
+					<pattern type="1000000000000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
 					<pattern type="10000000000000" count="other">¤00T</pattern>
+					<pattern type="10000000000000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="100000000000000" count="other">¤000T</pattern>
+					<pattern type="100000000000000" count="other" alt="alphaNextToNumber">¤ 000T</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -1683,9 +1707,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="LTL">
 				<displayName count="other">立陶宛里塔</displayName>
 			</currency>
-			<currency type="MDL">
-				<displayName>摩爾多瓦列伊</displayName>
-			</currency>
 			<currency type="MRO">
 				<displayName>毛里塔尼亞烏吉亞 (1973–2017)</displayName>
 			</currency>
@@ -1773,18 +1794,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="VUV">
 				<displayName>瓦努阿圖瓦圖</displayName>
 			</currency>
-			<currency type="XAF">
-				<displayName>中非法郎</displayName>
-			</currency>
 			<currency type="XCD">
 				<displayName>東加勒比元</displayName>
 			</currency>
 			<currency type="XOF">
 				<displayName>多哥非洲共同體法郎</displayName>
-				<displayName count="other">西非法郎</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>太平洋法郎</displayName>
 			</currency>
 			<currency type="YER">
 				<displayName>也門里雅</displayName>
@@ -1792,6 +1806,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="ZMW">
 				<displayName>贊比亞克瓦查</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>津布巴韋金</displayName>
+				<displayName count="other">津布巴韋金</displayName>
+			</currency>
 		</currencies>
 	</numbers>
 	<units>
@@ -1831,6 +1849,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>每公升毫摩爾</displayName>
 				<unitPattern count="other">每公升 {0} 毫摩爾</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0} 等份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>百萬分比</displayName>
+				<unitPattern count="other">{0} 百萬分比</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>公升/公里</displayName>
 				<unitPattern count="other">{0} 公升/公里</unitPattern>
@@ -1988,9 +2014,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-liter">
 				<perUnitPattern>{0} 每公升</perUnitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液安士</displayName>
+				<unitPattern count="other">{0} 公制液安士</unitPattern>
+			</unit>
 			<unit type="volume-gallon">
 				<perUnitPattern>{0} 每加侖</perUnitPattern>
 			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>國際蒸汽表卡路里</displayName>
+				<unitPattern count="other">{0} 國際蒸汽表卡路里</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克勒爾</displayName>
+				<unitPattern count="other">{0} 貝克勒爾</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希沃特</displayName>
+				<unitPattern count="other">{0} 希沃特</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈瑞</displayName>
+				<unitPattern count="other">{0} 戈瑞</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>十億分比</displayName>
+				<unitPattern count="other">十億分之{0}</unitPattern>
+			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">東經 {0}</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">北緯 {0}</coordinateUnitPattern>
@@ -2090,6 +2140,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>毫摩爾/公升</displayName>
 				<unitPattern count="other">{0} 毫摩爾/公升</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0}等份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>百萬分比</displayName>
+				<unitPattern count="other">{0} 百萬分比</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="other">{0}葡萄糖</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<unitPattern count="other">{0} 升每公里</unitPattern>
 			</unit>
@@ -2272,6 +2333,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} 公制量杯</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液安士</displayName>
+				<unitPattern count="other">{0} 公制液安士</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>英畝呎</displayName>
 				<unitPattern count="other">{0} 英畝呎</unitPattern>
@@ -2290,6 +2355,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>英制液安士</displayName>
 				<unitPattern count="other">{0} 英制液安士</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0}球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0}開特</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>國際蒸汽表卡</displayName>
+				<unitPattern count="other">{0} 國際蒸汽表卡</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克</displayName>
+				<unitPattern count="other">{0} 貝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希</displayName>
+				<unitPattern count="other">{0} 希</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈</displayName>
+				<unitPattern count="other">{0} 戈</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0}公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特斯拉</displayName>
+				<unitPattern count="other">{0}特斯拉</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韋伯</displayName>
+				<unitPattern count="other">{0}韋伯</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>十億分比</displayName>
+			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} 東</coordinateUnitPattern>
 				<coordinateUnitPattern type="north">{0} 北</coordinateUnitPattern>
@@ -2310,9 +2413,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="concentr-item">
 				<unitPattern count="other">{0} 個項目</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>等份</displayName>
+				<unitPattern count="other">{0}等份</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
+				<displayName>百萬分比</displayName>
 				<unitPattern count="other">{0} ppm</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<unitPattern count="other">{0}葡萄糖</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="other">{0}L/100km</unitPattern>
 			</unit>
@@ -2406,8 +2517,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-cup-metric">
 				<unitPattern count="other">{0} 量杯</unitPattern>
 			</unit>
-			<unit type="volume-gallon">
-				<perUnitPattern>{0} 每加侖</perUnitPattern>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>公制液穴士</displayName>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<unitPattern count="other">{0}英液安士</unitPattern>
@@ -2415,11 +2526,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="volume-dessert-spoon-imperial">
 				<unitPattern count="other">{0}英制甜品匙</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>球面度</displayName>
+				<unitPattern count="other">{0}球面度</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="other">{0}開特</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<unitPattern count="other">{0} 庫侖</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<unitPattern count="other">{0} 法拉</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<unitPattern count="other">{0} 卡路里-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>貝克</displayName>
+				<unitPattern count="other">{0}貝克</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>希</displayName>
+				<unitPattern count="other">{0}希</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>戈</displayName>
+				<unitPattern count="other">{0}戈</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>公斤力</displayName>
+				<unitPattern count="other">{0}公斤力</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>特斯拉</displayName>
+				<unitPattern count="other">{0}特斯拉</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>韋伯</displayName>
+				<unitPattern count="other">{0}韋伯</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<unitPattern count="other">{0}夜</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>濃度/十億</displayName>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0}E</coordinateUnitPattern>
diff --git a/make/data/cldr/common/main/zu.xml b/make/data/cldr/common/main/zu.xml
index bd893062aa9..c2469190306 100644
--- a/make/data/cldr/common/main/zu.xml
+++ b/make/data/cldr/common/main/zu.xml
@@ -45,6 +45,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="az">isi-Azerbaijani</language>
 			<language type="az" alt="short">isi-Azeria</language>
 			<language type="ba">isi-Bashkir</language>
+			<language type="bal">IsiBaluchi</language>
 			<language type="ban">isi-Balinese</language>
 			<language type="bas">isi-Basaa</language>
 			<language type="be">isi-Belarusian</language>
@@ -90,7 +91,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="crr">isi-Carolina Algonquian</language>
 			<language type="crs">i-Seselwa Creole French</language>
 			<language type="cs">isi-Czech</language>
-			<language type="csw">Swampy Cree</language>
+			<language type="csw">isi-Swampy Cree</language>
 			<language type="cu">isi-Church Slavic</language>
 			<language type="cv">isi-Chuvash</language>
 			<language type="cy">isi-Welsh</language>
@@ -233,11 +234,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">isi-Bafia</language>
 			<language type="ksh">isi-Colognian</language>
 			<language type="ku">isi-Kurdish</language>
+			<language type="ku" menu="core">isiKurdish</language>
+			<language type="ku" menu="extension">isiKurmanji</language>
 			<language type="kum">isi-Kumyk</language>
 			<language type="kv">isi-Komi</language>
 			<language type="kw">isi-Cornish</language>
 			<language type="kwk">Kwakʼwala</language>
-			<language type="kxv">Kuvi</language>
+			<language type="kxv">isiKuvi</language>
 			<language type="ky">isi-Kyrgyz</language>
 			<language type="la">isi-Latin</language>
 			<language type="lad">isi-Ladino</language>
@@ -449,9 +452,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="uz">isi-Uzbek</language>
 			<language type="vai">isi-Vai</language>
 			<language type="ve">isi-Venda</language>
-			<language type="vec">IsiVenetian</language>
+			<language type="vec">isiVenetian</language>
 			<language type="vi">isi-Vietnamese</language>
-			<language type="vmw">Makhuwa</language>
+			<language type="vmw">isiMakhuwa</language>
 			<language type="vo">isi-Volapük</language>
 			<language type="vun">isiVunjo</language>
 			<language type="wa">isi-Walloon</language>
@@ -689,7 +692,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="151">i-Eastern Europe</territory>
 			<territory type="154">i-Northern Europe</territory>
 			<territory type="155">i-Western Europe</territory>
-			<territory type="202">Sub-Saharan Africa</territory>
+			<territory type="202">i-Sub-Saharan Africa</territory>
 			<territory type="419">i-Latin America</territory>
 			<territory type="AC">i-Ascension Island</territory>
 			<territory type="AD">i-Andorra</territory>
@@ -745,6 +748,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">i-China</territory>
 			<territory type="CO">i-Colombia</territory>
 			<territory type="CP">i-Clipperton Island</territory>
+			<territory type="CQ">i-Sark</territory>
 			<territory type="CR">i-Costa Rica</territory>
 			<territory type="CU">i-Cuba</territory>
 			<territory type="CV">i-Cape Verde</territory>
@@ -960,8 +964,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="VU">i-Vanuatu</territory>
 			<territory type="WF">i-Wallis ne-Futuna</territory>
 			<territory type="WS">i-Samoa</territory>
-			<territory type="XA">Pseudo-Accents</territory>
-			<territory type="XB">Pseudo-Bidi</territory>
+			<territory type="XA">i-Pseudo-Accents</territory>
+			<territory type="XB">i-Pseudo-Bidi</territory>
 			<territory type="XK">i-Kosovo</territory>
 			<territory type="YE">i-Yemen</territory>
 			<territory type="YT">i-Mayotte</territory>
@@ -1090,35 +1094,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Ukuhlelwa Ngezinombolo</key>
 			<key type="colStrength">Amandla Okuhlelwa</key>
 			<key type="currency">Imali</key>
+			<key type="em">Emoji Presentation</key>
 			<key type="hc">Umjikelezo wehora (12 vs 24</key>
 			<key type="lb">I-Line Break Style</key>
+			<key type="lw">Umugqa Uyanqamuka phakathi Kwamagama</key>
 			<key type="ms">Isistimu yokulinganisa</key>
 			<key type="numbers">Izinombolo</key>
+			<key type="ss">Sentence Break After Abbr.</key>
 			<key type="timezone">Isikhathi Sendawo</key>
 			<key type="va">Okokwehlukanisa Kwasendaweni</key>
 			<key type="x">Yokusetshenziswa Ngasese</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">ikhalenda lesi-Buddhist</type>
+			<type key="calendar" type="buddhist" scope="core">Buddhist</type>
 			<type key="calendar" type="chinese">Ikhalenda lesi-Chinese</type>
+			<type key="calendar" type="chinese" scope="core">Chinese</type>
 			<type key="calendar" type="coptic">i-Coptic Calender</type>
+			<type key="calendar" type="coptic" scope="core">Coptic</type>
 			<type key="calendar" type="dangi">Ikhalenda lesi-Dangi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Ikhalenda lesi-Ethiopic</type>
+			<type key="calendar" type="ethiopic" scope="core">Ethiopic</type>
 			<type key="calendar" type="ethiopic-amete-alem">i-Ethiopic Amete Alem Calender</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Ethiopic Amete Alem</type>
 			<type key="calendar" type="gregorian">ikhalenda lesi-Gregorian</type>
+			<type key="calendar" type="gregorian" scope="core">Gregorian</type>
 			<type key="calendar" type="hebrew">Ikhalenda lesi-Hebrew</type>
+			<type key="calendar" type="hebrew" scope="core">Hebrew</type>
 			<type key="calendar" type="indian">i-Indian National Calender</type>
 			<type key="calendar" type="islamic">Ikhalenda lesi-Hijri</type>
+			<type key="calendar" type="islamic" scope="core">Hijri</type>
 			<type key="calendar" type="islamic-civil">Ikhalenda lesiHijri (tabular, civil epoch)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hijri (tabular, civil epoch)</type>
 			<type key="calendar" type="islamic-rgsa" draft="provisional">Ikhalenda yesi-Islamic (Saudi Arabia, sighting)</type>
 			<type key="calendar" type="islamic-tbla" draft="provisional">Ikhalenda yesi-Islamic (tabular, astronomical epoch)</type>
 			<type key="calendar" type="islamic-umalqura">Ikhalenda lesiHijri (Umm al-Qura))</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hijri (Umm al-Qura)</type>
 			<type key="calendar" type="iso8601">Ikhalenda le-ISO-8601</type>
 			<type key="calendar" type="japanese">Ikhalenda lesi-Japanese</type>
+			<type key="calendar" type="japanese" scope="core">Japanese</type>
 			<type key="calendar" type="persian">Ikhalenda lesi-Persian</type>
+			<type key="calendar" type="persian" scope="core">Persian</type>
 			<type key="calendar" type="roc">Ikhalenda lesi-Minguo</type>
+			<type key="calendar" type="roc" scope="core">Minguo</type>
 			<type key="cf" type="account">Ifomethi yemali ye-Accounting</type>
+			<type key="cf" type="account" scope="core">Accounting</type>
 			<type key="cf" type="standard">Ifomethi yemali ejwayelekile</type>
+			<type key="cf" type="standard" scope="core">Standard</type>
 			<type key="colAlternate" type="non-ignorable">Hlela Izimpawu</type>
 			<type key="colAlternate" type="shifted">Hlela Ukuziba Izimpawu</type>
 			<type key="colBackwards" type="no">Hlela Izindlela Zokuphimisela Ngokujwayelekile</type>
@@ -1128,19 +1151,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Hlela Izinhlamvu Ezinkulu Kuqala</type>
 			<type key="colCaseLevel" type="no">Hlela Okungancikile Ezinkinobhweni</type>
 			<type key="colCaseLevel" type="yes">Hlela Okuncike Ekumeni Kwezinkinobho</type>
-			<type key="collation" type="big5han">Ukuhlunga kwe-Traditional Chinese - Big5</type>
 			<type key="collation" type="compat">Ukuhlunga Kwangaphambilini, ngokusebenzisana</type>
 			<type key="collation" type="dictionary">Uhlelo Lokuhlunga Lesichazamazwi</type>
 			<type key="collation" type="ducet">Ukuhlunga okuzenzakalelayo kwe-Unicode</type>
+			<type key="collation" type="ducet" scope="core">Default Unicode</type>
 			<type key="collation" type="emoji">Uhlelo Lokuhlunga le-Emoji</type>
 			<type key="collation" type="eor">Imithetho Yokuhlunga ye-European</type>
-			<type key="collation" type="gb2312han">Ukuhlunga kwe-Simplified Chinese - GB2312</type>
 			<type key="collation" type="phonebook">Ukuhlunga kwebhuku lefoni</type>
 			<type key="collation" type="phonetic">Hlela Ngokwefonetiki</type>
 			<type key="collation" type="pinyin">Ukuhlunga nge-Pinyin</type>
 			<type key="collation" type="search">Usesho olujwayelekile</type>
+			<type key="collation" type="search" scope="core">Sesha</type>
 			<type key="collation" type="searchjl">Sesha nge-Hangul Ongwaqa Basekuqaleni</type>
 			<type key="collation" type="standard">I-oda yokuhlunga ejwayelekile</type>
+			<type key="collation" type="standard" scope="core">Standard</type>
 			<type key="collation" type="stroke">Ukuhlunga kwe-Stroke</type>
 			<type key="collation" type="traditional">Ukuhlunga ngokisiko</type>
 			<type key="collation" type="unihan">Ukuhlunga kwe-Radical-Stroke</type>
@@ -1157,18 +1181,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">i-Fullwidth</type>
 			<type key="d0" type="hwidth">Ubude obuhhafu</type>
 			<type key="d0" type="npinyin">Okwezinombolo</type>
+			<type key="em" type="default" scope="core">Default</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Umbhalo</type>
 			<type key="hc" type="h11">isistimu yamahora angu-12 (0-11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">isistimu yamahora angu-12 (1-12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">isistimu yamahora angu-24 (0-23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">isistimu yamahora angu-24 (1-24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">i-Line Break Style exegayo</type>
+			<type key="lb" type="loose" scope="core">Khulula</type>
 			<type key="lb" type="normal">i-Line Break Style ekahle</type>
+			<type key="lb" type="normal" scope="core">Okujwayelekile</type>
 			<type key="lb" type="strict">i-Line Break Style enomthetho oqinile</type>
+			<type key="lb" type="strict" scope="core">Qinile</type>
+			<type key="lw" type="breakall" scope="core">Phula konke</type>
+			<type key="lw" type="keepall" scope="core">Gcina konke</type>
+			<type key="lw" type="normal" scope="core">Okujwayelekile</type>
+			<type key="lw" type="phrase" scope="core">Gcina emishwaneni</type>
 			<type key="m0" type="bgn">I-BGN</type>
 			<type key="m0" type="ungegn">I-UNGEGN</type>
 			<type key="ms" type="metric">isistimu ye-Metric</type>
+			<type key="ms" type="metric" scope="core">Metric</type>
 			<type key="ms" type="uksystem">isistimu yokulinganisa ebusayo</type>
+			<type key="ms" type="uksystem" scope="core">UK</type>
 			<type key="ms" type="ussystem">isistimu yokulinganisa yase-US</type>
+			<type key="ms" type="ussystem" scope="core">US</type>
 			<type key="numbers" type="ahom">Izinombolo ze-Ahom</type>
 			<type key="numbers" type="arab">amadijithi esi-Arabic-Indic</type>
 			<type key="numbers" type="arabext">amadijithi esi-Arabic-Indic eluliwe</type>
@@ -1251,6 +1292,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="vaii">Izinhlazu Zezinombolo ze-Vai</type>
 			<type key="numbers" type="wara">Izinombolo ze-Warang Citi</type>
 			<type key="numbers" type="wcho">Izinombolo ze-Wancho</type>
+			<type key="ss" type="none" scope="core">Cishiwe</type>
+			<type key="ss" type="standard" scope="core">Vuliwe</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">i-Metric</measurementSystemName>
@@ -1347,7 +1390,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -1380,7 +1423,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, MMM d, y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
@@ -1441,7 +1483,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">MMM d – d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
@@ -1691,7 +1732,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="GyMd">M/d/y GGGGG</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1706,7 +1746,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
 							<greatestDifference id="h">h – h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
@@ -1731,7 +1770,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
 							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
@@ -1751,9 +1789,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
 							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
@@ -2770,9 +2805,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>i-Phnom Penh</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>i-Enderbury</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>i-Kiritimati</exemplarCity>
 			</zone>
@@ -3434,9 +3466,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Isikhathi saseNtshonalanga Afrika</generic>
-					<standard>Isikhathi esivamile saseNtshonalanga Afrika</standard>
-					<daylight>Isikhathi sasehlobo saseNtshonalanga Afrika</daylight>
+					<standard>Isikhathi saseNtshonalanga Afrika</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3793,6 +3823,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Isikhathi sase-Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Isikhathi sase-Hawaii-Aleutia esijwayelekile</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Isikhathi sase-Hawaii-Aleutia</generic>
@@ -4352,7 +4387,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4376,10 +4410,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="100000" count="other" alt="alphaNextToNumber">¤ 000K</pattern>
 					<pattern type="1000000" count="one">¤0M</pattern>
 					<pattern type="1000000" count="one" alt="alphaNextToNumber">¤ 0M</pattern>
-					<pattern type="1000000" count="other">¤ 0M</pattern>
+					<pattern type="1000000" count="other">¤0M</pattern>
+					<pattern type="1000000" count="other" alt="alphaNextToNumber">¤ 0M</pattern>
 					<pattern type="10000000" count="one">¤00M</pattern>
 					<pattern type="10000000" count="one" alt="alphaNextToNumber">¤ 00M</pattern>
-					<pattern type="10000000" count="other">¤ 00M</pattern>
+					<pattern type="10000000" count="other">¤00M</pattern>
+					<pattern type="10000000" count="other" alt="alphaNextToNumber">¤ 00M</pattern>
 					<pattern type="100000000" count="one">¤000M</pattern>
 					<pattern type="100000000" count="one" alt="alphaNextToNumber">¤ 000M</pattern>
 					<pattern type="100000000" count="other">¤000M</pattern>
@@ -4917,6 +4953,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>i-East Caribbean Dollar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribbean guilder</displayName>
+				<displayName count="one">Caribbean guilder</displayName>
+				<displayName count="other">Caribbean guilders</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>i-West African CFA Franc</displayName>
 				<displayName count="one">i-West African CFA Franc</displayName>
@@ -4941,6 +4982,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>i-Zambian Kwacha</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabwean Gold</displayName>
+				<displayName count="one">Zimbabwean gold</displayName>
+				<displayName count="other">Zimbabwean gold</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -5056,7 +5102,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} i-karat</unitPattern>
 				<unitPattern count="other">{0} ama-karats</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 			</unit>
 			<unit type="concentr-permille">
@@ -5212,7 +5258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-karat">
 				<displayName>karats</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>izingxenye/izigidi</displayName>
 			</unit>
 			<unit type="consumption-mile-per-gallon">
@@ -5385,7 +5431,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}mg/dL</unitPattern>
 				<unitPattern count="other">{0}mg/dL</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}item</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>
@@ -5470,7 +5516,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} w</unitPattern>
 			</unit>
 			<unit type="duration-day">
-				<unitPattern count="one">{0}</unitPattern>
+				<unitPattern count="one">{0} usuku</unitPattern>
 				<unitPattern count="other">{0} suku</unitPattern>
 			</unit>
 			<unit type="duration-hour">
diff --git a/make/data/cldr/common/properties/coverageLevels.txt b/make/data/cldr/common/properties/coverageLevels.txt
index e8d75b8af16..a4997d08963 100644
--- a/make/data/cldr/common/properties/coverageLevels.txt
+++ b/make/data/cldr/common/properties/coverageLevels.txt
@@ -9,29 +9,31 @@
 		
 		
 af ;	modern ;	Afrikaans
-ak ;	moderate ;	Akan
+ak ;	modern ;	Akan
 am ;	modern ;	Amharic
 ar ;	modern ;	Arabic
 as ;	modern ;	Assamese
 ast ;	basic ;	Asturian
 az ;	modern ;	Azerbaijani
-bal_Latn ;	moderate ;	Baluchi (Latin)
+ba ;	modern ;	Bashkir
+bal_Latn ;	basic ;	Baluchi (Latin)
 be ;	modern ;	Belarusian
 bg ;	modern ;	Bulgarian
 bgc ;	basic ;	Haryanvi
 bho ;	basic ;	Bhojpuri
-blo ;	basic ;	Anii
+blo ;	moderate ;	Anii
 bn ;	modern ;	Bangla
 br ;	moderate ;	Breton
 brx ;	basic ;	Bodo
 bs ;	modern ;	Bosnian
 bs_Cyrl ;	basic ;	Bosnian (Cyrillic)
+bua ;	basic ;	Buriat
 ca ;	modern ;	Catalan
 ceb ;	moderate ;	Cebuano
 chr ;	modern ;	Cherokee
 cs ;	modern ;	Czech
 csw ;	basic ;	Swampy Cree
-cv ;	basic ;	Chuvash
+cv ;	modern ;	Chuvash
 cy ;	modern ;	Welsh
 da ;	modern ;	Danish
 de ;	modern ;	German
@@ -40,7 +42,7 @@ dsb ;	modern ;	Lower Sorbian
 ee ;	basic ;	Ewe
 el ;	modern ;	Greek
 en ;	modern ;	English
-eo ;	basic ;	Esperanto
+eo ;	moderate ;	Esperanto
 es ;	modern ;	Spanish
 et ;	modern ;	Estonian
 eu ;	modern ;	Basque
@@ -77,6 +79,7 @@ ka ;	modern ;	Georgian
 kea ;	basic ;	Kabuverdianu
 kgp ;	basic ;	Kaingang
 kk ;	modern ;	Kazakh
+kk_Arab ;	modern ;	Kazakh (Arabic)
 km ;	modern ;	Khmer
 kn ;	modern ;	Kannada
 ko ;	modern ;	Korean
@@ -84,7 +87,7 @@ kok ;	modern ;	Konkani
 kok_Latn ;	basic ;	Konkani (Latin)
 ks ;	basic ;	Kashmiri
 ks_Deva ;	basic ;	Kashmiri (Devanagari)
-ku ;	moderate ;	Kurdish
+ku ;	basic ;	Kurdish
 kxv ;	basic ;	Kuvi
 kxv_Deva ;	basic ;	Kuvi (Devanagari)
 kxv_Orya ;	basic ;	Kuvi (Odia)
@@ -119,11 +122,12 @@ or ;	modern ;	Odia
 pa ;	modern ;	Punjabi
 pcm ;	modern ;	Nigerian Pidgin
 pl ;	modern ;	Polish
+pms ;	basic ;	Piedmontese
 ps ;	modern ;	Pashto
 pt ;	modern ;	Portuguese
-qu ;	moderate ;	Quechua
+qu ;	modern ;	Quechua
 raj ;	basic ;	Rajasthani
-rm ;	basic ;	Romansh
+rm ;	modern ;	Romansh
 ro ;	modern ;	Romanian
 ru ;	modern ;	Russian
 rw ;	basic ;	Kinyarwanda
@@ -131,8 +135,10 @@ sa ;	basic ;	Sanskrit
 sah ;	basic ;	Yakut
 sat ;	basic ;	Santali
 sc ;	moderate ;	Sardinian
+scn ;	basic ;	Sicilian
 sd ;	modern ;	Sindhi
 sd_Deva ;	basic ;	Sindhi (Devanagari)
+shn ;	modern ;	Shan
 si ;	modern ;	Sinhala
 sk ;	modern ;	Slovak
 sl ;	modern ;	Slovenian
@@ -156,6 +162,7 @@ tn ;	basic ;	Tswana
 to ;	basic ;	Tongan
 tr ;	modern ;	Turkish
 tt ;	moderate ;	Tatar
+tyv ;	basic ;	Tuvinian
 ug ;	basic ;	Uyghur
 uk ;	modern ;	Ukrainian
 ur ;	modern ;	Urdu
diff --git a/make/data/cldr/common/supplemental/attributeValueValidity.xml b/make/data/cldr/common/supplemental/attributeValueValidity.xml
index 10f314f7fd3..33158da3595 100644
--- a/make/data/cldr/common/supplemental/attributeValueValidity.xml
+++ b/make/data/cldr/common/supplemental/attributeValueValidity.xml
@@ -65,7 +65,7 @@
 			<!-- The following have not yet made it to Basic -->
 			<variable id='$languageNonTcLtBasic' type='choice'>
 				 aa ab agq ak an ann apc arn asa
-				 ba bal bas bem bew bez bgn blt bm bo bss byn
+				 ba bal bas bem bew bez bgn blt bm bo bqi bss byn bua
 				 cad cch ccp ce cgg cho cic ckb co cop cu
 				 dav dje dua dv dyo dz
 				 ebu ee ewo
@@ -74,15 +74,15 @@
 				 haw hnj ht
 				 ii io iu
 				 jbo jgo jmc
-				 kaa kab kaj kam kcg kde ken khq ki kkj kl kln kpe ksb ksf ksh kw
-				 la lag lg lkt lld ln lrc ltg lu luo luy
-				 mas mdf mer mfe mhn mg mgh mgo mic moh mua mus myv mzn
-				 naq nb nd nmg nnh nr nso nus nv ny nyn om
-				 os osa
-				 pap pis
+				 kaa kab kaj kam kcg kde kek ken khq ki kkj kl kln kpe ksb ksf ksh kw
+				 la lag lg lkt lld ln lrc ltg lu luo luy lzz
+				 mas mdf mer mfe mhn mg mgh mgo mic moh mua mus mww myv mzn
+				 nan naq nb nd nmg nnh nr nso nus nv ny nyn om
+				 oka os osa
+				 pap pi pis pms
 				 quc
 				 rhg rif rn rof rw rwk
-				 saq sbp scn sdh se seh ses sg shi shn sid skr sma smj smn sms sn ss ssy st
+				 saq sbp scn sdh se seh ses sg sgs shi shn sid skr sma smj smn sms sn ss ssy st suz
 				 teo tig tn tok tpi trv trw ts twq tyv tzm
 				 vai ve vo vun
 				 wa wae wal wbp
@@ -146,7 +146,7 @@
 				Maldivian Mongolian Oriya Pashto Persian Pinyin Russian Serbian Simplified Syriac Tamil Telugu Thai ThaiLogical Turkmen Ukrainian Uzbek az ch cs
 				cs_FONIPA dsb el es es_419 es_FONIPA it ja_Latn la lt nl pl pl_FONIPA ro ro_FONIPA ru sk sk_FONIPA tlh tr ug uz_Cyrl yo zh_Latn_PINYIN ASCII
 				Accents Armenian Bengali Bopomofo CanadianAboriginal ConjoiningJamo Devanagari Ethiopic Gujarati Gurmukhi Halfwidth Hangul InterIndic Jamo Kannada
-				Katakana Latin Lower Malayalam NumericPinyin Oriya Publishing Spacedhan Tamil Telugu Thaana Thai ThaiLogical ThaiSemi Title Traditional Upper
+				Katakana Latin Lower Malayalam NumericPinyin Oriya Publishing Spacedhan Sunuwar Tamil Telugu Thaana Thai ThaiLogical ThaiSemi Title Traditional Upper
 				XSampa am ch_FONIPA cs_FONIPA dsb_FONIPA es_419_FONIPA es_FONIPA ja ko la_FONIPA pl_FONIPA ro_FONIPA ru sk_FONIPA tlh_FONIPA uz_Latn yo_BJ zh</variable>
 			<attributeValues attributes='alt' type='choice'>$alt</attributeValues>
 			<attributeValues attributes='_q' type='choice'>$integer</attributeValues>
@@ -193,7 +193,6 @@
 			<attributeValues dtds='supplementalData' elements='info' attributes='rounding' type='regex'>[0-9]+</attributeValues>
 			<attributeValues dtds='ldml' elements='key' attributes='type'>$_bcp47_keys</attributeValues>
 			<attributeValues dtds='supplementalData' elements='language' attributes='scripts' type='list'>$_script</attributeValues>
-			<attributeValues dtds='supplementalData' elements='language' attributes='territories' type='list'>$_region</attributeValues>
 			<attributeValues dtds='ldml' elements='language' attributes='type'>$localeOrDeprecated</attributeValues>
 			<attributeValues dtds='supplementalData' elements='language' attributes='variants'>$_variant</attributeValues>
 			<attributeValues dtds='supplementalData' elements='languageAlias' attributes='replacement' type='locale'/>
diff --git a/make/data/cldr/common/supplemental/coverageLevels.xml b/make/data/cldr/common/supplemental/coverageLevels.xml
index 2db941b8529..58ce64dd3ba 100644
--- a/make/data/cldr/common/supplemental/coverageLevels.xml
+++ b/make/data/cldr/common/supplemental/coverageLevels.xml
@@ -8,6 +8,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 <!--
 	Note: For an explanation of the coverage level numbers (e.g. 80) see org/unicode/cldr/util/Level.java
+	Also, most of the attributes with regex quantifiers (?, +, *) will be possessive (without backtrack).
 -->
 <supplementalData>
 	<version number="$Revision$"/>
@@ -54,9 +55,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%CJK_Languages" value="(ja|ko|zh)"/>
 		<coverageVariable key="%chineseCalendarTerritories" value="(CN|CX|HK|MO|SG|TW)"/>
 		<coverageVariable key="%collationType80" value="(ducet|search)"/>
-		<coverageVariable key="%collationType80ForTopLangs" value="(big5han|compat|dictionary|gb2312han|phonebook|phonetic|pinyin|stroke|traditional|unihan|zhuyin)"/>
+		<coverageVariable key="%collationType80ForTopLangs" value="(compat|dictionary|phonebook|phonetic|pinyin|stroke|traditional|unihan|zhuyin)"/>
 		<coverageVariable key="%collationType80TopLangs" value="(ar|bg|ca|cs|da|de|el|en|es|fi|fr|he|hi|hr|hu|id|it|ja|ko|ms|nl|no|pl|pt|ro|ru|sk|sl|sr|sv|th|tr|uk|vi|zh)"/>
-		<coverageVariable key="%collationType100" value="(big5han|compat|dictionary|emoji|eor|gb2312han|phonebook|phonetic|pinyin|searchjl|stroke|traditional|unihan|zhuyin)"/>
+		<coverageVariable key="%collationType100" value="(compat|dictionary|emoji|eor|phonebook|phonetic|pinyin|searchjl|stroke|traditional|unihan|zhuyin)"/>
 		<coverageVariable key="%collationAlternateValues" value="(non-ignorable|shifted)"/>
 		<coverageVariable key="%collationCases" value="(upper|lower)"/>
 		<coverageVariable key="%collationStrengths" value="(primary|secondary|tertiary|quaternary|identical)"/>
@@ -68,9 +69,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%currency40" value="(BRL|CNY|EUR|GBP|INR|JPY|RUB|USD)"/>
 		<coverageVariable key="%currency60" value="(AUD|CAD|CHF|DKK|HKD|IDR|KRW|MXN|NOK|PLN|SAR|SEK|THB|TRY|TWD|ZAR)"/>
 		<coverageVariable key="%currency60_EU" value="(CZK|HUF)"/>
-		<!-- Restore ZWG to currency80 in next submission cycle https://unicode-org.atlassian.net/browse/CLDR-18258 -->
-		<coverageVariable key="%currency80" value="(AED|AFN|ALL|AMD|ANG|AOA|ARS|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BSD|BTN|BWP|BYN|BZD|CDF|CLP|CNH|COP|CRC|CUC|CUP|CVE|CZK|DJF|DOP|DZD|EGP|ERN|ETB|FJD|FKP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HNL|HRK|HTG|HUF|ILS|IQD|IRR|ISK|JMD|JOD|KES|KGS|KHR|KMF|KPW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRU|MUR|MVR|MWK|MYR|MZN|NAD|NGN|NIO|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PYG|QAR|RON|RSD|RWF|SBD|SCR|SDG|SGD|SHP|SL[EL]|SOS|SRD|SSP|STN|SYP|SZL|TJS|TMT|TND|TOP|TTD|TZS|UAH|UGX|UYU|UZS|VES|VND|VUV|WST|XCD|XAF|XOF|XPF|YER|ZMW)"/>
-		<coverageVariable key="%currency100" value="(AFA|ADP|ALK|AO[KNR]|AR[ALMP]|ATS|AZM|BA[DN]|BE[CFL]|BG[LM]|BGO|BO[LPV]|BR[BCENRZ]|BUK|BY[BR]|CH[EW]|CL[EF]|CNX|COU|CS[DK]|CYP|DDM|DEM|EC[SV]|EEK|ES[ABP]|FIM|FRF|GEK|GHC|GNS|GQE|GRD|GW[EP]|HRD|IEP|IL[PR]|ISJ|ITL|KR[HO]|LT[LT]|LU[CFL]|LV[LR]|MAF|MCF|MDC|MGF|MKN|MLF|MRO|MT[LP]|MVP|MX[PV]|MZ[EM]|NIC|NLG|PE[IS]|PLZ|PTE|RHD|ROL|RUR|SD[DP]|SIT|SKK|SRG|STD|SUR|SVC|TJR|TMM|TPE|TRL|UAK|UGS|US[NS]|UY[IPW]|VE[BF]|VNN|XA[GU]|XB[ABCD]|XDR|XEU|XF[OU]|XP[DT]|XRE|XSU|XTS|XUA|YDD|YU[DMNR]|ZAL|ZMK|ZR[NZ]|ZW[DLRG])"/>
+		<coverageVariable key="%currency80" value="(AED|AFN|ALL|AMD|ANG|AOA|ARS|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BSD|BTN|BWP|BYN|BZD|CDF|CLP|CNH|COP|CRC|CUC|CUP|CVE|CZK|DJF|DOP|DZD|EGP|ERN|ETB|FJD|FKP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HNL|HRK|HTG|HUF|ILS|IQD|IRR|ISK|JMD|JOD|KES|KGS|KHR|KMF|KPW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRU|MUR|MVR|MWK|MYR|MZN|NAD|NGN|NIO|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PYG|QAR|RON|RSD|RWF|SBD|SCR|SDG|SGD|SHP|SL[EL]|SOS|SRD|SSP|STN|SYP|SZL|TJS|TMT|TND|TOP|TTD|TZS|UAH|UGX|UYU|UZS|VES|VND|VUV|WST|XCD|XCG|XAF|XOF|XPF|YER|ZMW|ZWG)"/>
+		<coverageVariable key="%currency100" value="(AFA|ADP|ALK|AO[KNR]|AR[ALMP]|ATS|AZM|BA[DN]|BE[CFL]|BG[LM]|BGO|BO[LPV]|BR[BCENRZ]|BUK|BY[BR]|CH[EW]|CL[EF]|CNX|COU|CS[DK]|CYP|DDM|DEM|EC[SV]|EEK|ES[ABP]|FIM|FRF|GEK|GHC|GNS|GQE|GRD|GW[EP]|HRD|IEP|IL[PR]|ISJ|ITL|KR[HO]|LT[LT]|LU[CFL]|LV[LR]|MAF|MCF|MDC|MGF|MKN|MLF|MRO|MT[LP]|MVP|MX[PV]|MZ[EM]|NIC|NLG|PE[IS]|PLZ|PTE|RHD|ROL|RUR|SD[DP]|SIT|SKK|SRG|STD|SUR|SVC|TJR|TMM|TPE|TRL|UAK|UGS|US[NS]|UY[IPW]|VE[BF]|VNN|XA[GU]|XB[ABCD]|XDR|XEU|XF[OU]|XP[DT]|XRE|XSU|XTS|XUA|YDD|YU[DMNR]|ZAL|ZMK|ZR[NZ]|ZW[DLR])"/>
 		<coverageVariable key="%cyclicNameTypes" value="([1-9]?[0-9])"/>
 		<coverageVariable key="%d0Types80" value="(ascii|fwidth|hwidth|lower|title|upper)"/>
 		<coverageVariable key="%dateFormatItems" value="((E|d|Ed|EEEEd)|((Gy|y|yyyy|U)?(M|Md|MEd|MEEEEd|MMM|MMMd|MMMEd|MMMEEEEd|MMMM|MMMMd|MMMMEd|MMMMEEEEd))|((Gy|y|yyyy)(QQQ|QQQQ)?))"/>
@@ -81,7 +81,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%fullShort" value="(full|short)"/>
 		<coverageVariable key="%futurePast" value="(future|past)"/>
 		<coverageVariable key="%fwTypes" value="(fri|mon|sat|sun|thu|tue|wed)"/>
-		<coverageVariable key="%timeFormatItems" value="(E?(H|h)(ms?)?|ms)"/>
+		<coverageVariable key="%timeFormatItems" value="(E?(H|h)(ms?)?|ms|(H|h)v)"/>
 		<coverageVariable key="%timeFormatItemsDayPer" value="(E?Bh(ms?)?)"/>
 		<coverageVariable key="%dayFieldTypes" value="(era|year|year-short|year-narrow|quarter|quarter-short|quarter-narrow|month|month-short|month-narrow|week|week-short|week-narrow|day|day-short|day-narrow|weekday|hour|hour-short|hour-narrow|minute|minute-short|minute-narrow|second|second-short|second-narrow|dayperiod|zone)"/>
 		<coverageVariable key="%fieldTypesForModern" value="(era-short|era-narrow|weekOfMonth|weekOfMonth-short|weekOfMonth-narrow|dayOfYear|dayOfYear-short|dayOfYear-narrow|weekday-short|weekday-narrow|weekdayOfMonth|weekdayOfMonth-short|weekdayOfMonth-narrow|dayperiod-short|dayperiod-narrow|zone-short|zone-narrow)"/>
@@ -100,7 +100,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%keys100" value="(col(Alternate|Backwards|CaseFirst|CaseLevel|HiraganaQuaternary|Normalization|Numeric|Reorder|Strength)|kv|sd|timezone|va|variableTop|x)"/>
 		<coverageVariable key="%language30" value="und"/>
 		<coverageVariable key="%language40" value="(de(_(AT|CH))?|en(_(AU|CA|GB|US))?|es(_(ES|419|MX))?|fr(_(CA|CH))?|it|ja|pt(_(BR|PT))?|ru|zh(_(Hans|Hant))?)"/>
-		<coverageVariable key="%language60" value="(ar(_001)?|bn|hi(_Latn)|id|ko|nl(_BE)?|pl|th|tr)"/>
+		<coverageVariable key="%language60" value="(ar(_001)?|bn|hi(_Latn)?|id|ko|nl(_BE)?|pl|th|tr)"/>
 		<coverageVariable key="%language60_CM" value="(bas|bax|bbj|bfd|bkm|bss|bum|byv|ewo|ff|kkj|maf|nnh|yav|ybb)"/>
 		<coverageVariable key="%language60_EU" value="(cs|da|e[lt]|fi|hu|lv|mt|s[klv])"/>
 		<coverageVariable key="%language60_GA" value="(fan|mye)"/>
@@ -108,7 +108,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%language60_TD" value="(shu|dzg|kbl|mde|mua|sba)"/>
 		<!-- See CLDR-16673: All basic+ locales (per coverageLevels.txt) MUST have their language's name at least at level 80 (modern), except for those on exception list -->
 		<!-- Can use MinimizeRegex.java to "unpack" the compressed lists that are painful to edit -->
-		<coverageVariable key="%language80" value="(af|ak|am|ar|as|az|be|bg|bgc|bho|bn|brx|bs|ca|ceb|cs|cv|cy|da|de|doi|ee|el|en|es|et|eu|fa|fi|fil|fr|ga|gaa|gd|gl|gu|ha|he|hi|hr|hu|hy|id|ig|ii|is|it|ja|jv|ka|kk|km|kn|ko|kok|ks|ky|lo|lt|lv|mai|mi|mk|ml|mn|mni|mr|ms|my|ne|nl|nn|no|nso|om|or|pa|pcm|pl|ps|pt|raj|ro|ru|rw|sa|sat|sd|si|sk|sl|so|sq|sr|st|su|sv|sw|ta|te|tg|th|ti|tk|tn|tr|tt|uk|ur|uz|vi|wo|xh|yo|yue|zh|zu|ast|blo|br|chr|csw|dsb|eo|ff|fo|fy|hsb|ia|ie|kea|kgp|ku|kxv|lb|lij|lmo|mt|nds|nqo|oc|prg|qu|rm|sah|sc|syr|szl|to|ug|vec|vmw|xnr|yrl|za|mul|root|zxx|und)"/>
+		<coverageVariable key="%language80" value="(af|ak|am|ar|as|az|bal|be|bg|bgc|bho|bn|brx|bs|ca|ceb|cs|cv|cy|da|de|doi|ee|el|en|es|et|eu|fa|fi|fil|fr|ga|gaa|gd|gl|gu|ha|he|hi|hr|hu|hy|id|ig|ii|is|it|ja|jv|ka|kk|km|kn|ko|kok|ks|ky|lo|lt|lv|mai|mi|mk|ml|mn|mni|mr|ms|my|ne|nl|nn|no|nso|om|or|pa|pcm|pl|ps|pt|raj|ro|ru|rw|sa|sat|sd|si|sk|sl|so|sq|sr|st|su|sv|sw|ta|te|tg|th|ti|tk|tn|tr|tt|uk|ur|uz|vi|wo|xh|yo|yue|zh|zu|ast|blo|br|chr|csw|dsb|eo|ff|fo|fy|hsb|ia|ie|kea|kgp|ku|kxv|lb|lij|lmo|mt|nds|nqo|oc|prg|qu|rm|sah|sc|syr|szl|to|ug|vec|vmw|xnr|yrl|za|mul|root|zxx|und)"/>
 		<coverageVariable key="%lbTypes80" value="(strict|normal|loose)"/>
 		<coverageVariable key="%lwTypes" value="(normal|breakall|keepall|phrase)"/>
 		<coverageVariable key="%m0Types80" value="(bgn|prprname|ungegn)"/>
@@ -124,31 +124,33 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%metazone30_RU" value="(Europe_Eastern|Moscow|Yekaterinburg|Omsk|Novosibirsk|Krasnoyarsk|Irkutsk|Yakutsk|Vladivostok|Magadan)"/>
 		<coverageVariable key="%metazone30_RU_stdonly" value="Europe_Further_Eastern"/>
 		<coverageVariable key="%metazone30_US" value="(America_(Eastern|Central|Mountain|Pacific)|Alaska|Hawaii_Aleutian)"/>
+		<coverageVariable key="%metazone30_US_stdonly" value="Hawaii"/>
 		<coverageVariable key="%metazone40" value="(America_(Eastern|Central|Mountain|Pacific)|Europe_(Central|(East|West)ern)|Atlantic)"/>
-		<coverageVariable key="%metazone60" value="(Africa_Western|Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/>
-		<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/>
+		<coverageVariable key="%metazone60" value="(Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/>
+		<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South|West)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/>
 		<coverageVariable key="%metazone60_AE_stdonly" value="Gulf"/>
 		<coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Norfolk|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
-		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan(_(East|West)ern)?|Kosrae|Kyrgystan|Line_Islands|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis|Yukon)"/>
+		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Hawaii|Indian_Ocean|Kazakhstan(_(East|West)ern)?|Kosrae|Kyrgystan|Line_Islands|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis|Yukon)"/>
 		<coverageVariable key="%metazone100" value="(Acre|Almaty|Anadyr|Aqtau|Aqtobe|Kamchatka|Macau|Qyzylorda|Samara)"/>
 		<coverageVariable key="%metazone100_stdonly" value="(Casey|Guam|Lanka|North_Mariana)"/>
 		<coverageVariable key="%miscPatternTypes" value="(atLeast|range)"/>
 		<coverageVariable key="%monthTypes" value="(1[0-3]?|[2-9])"/>
 		<coverageVariable key="%msTypes80" value="(metric|u[ks]system)"/>
 		<coverageVariable key="%numberingSystem80" value="(adlm|arab(ext)?|armn(low)?|beng|cakm|deva|ethi|fullwide|geor|grek(low)?|gujr|guru|hanidec|han[st](fin)?|hebr|java|jpan(fin)?|khmr|knda|laoo|mlym|mtei|mymr|native|olck|orya|roman(low)?|taml(dec)?|telu|thai|tibt|vaii)"/>
-		<coverageVariable key="%numberingSystem100" value="(finance|traditional|bali|brah|cham|diak|gara|gong|gonm|gukh|hanidays|hmnp|jpanyear|kali|kawi|krai|lana(tham)?|lepc|limb|mong|mymrepka|mymrpao|mymrshan|nagm|nkoo|onao|osma|outlined|rohg|saur|shrd|sora|sund|sunu|takr|talu|tnsa|wcho)"/>
+		<coverageVariable key="%numberingSystem100" value="(finance|traditional|bali|brah|cham|diak|gara|gong|gonm|gukh|hanidays|hmnp|jpanyear|kali|kawi|krai|lana(tham)?|lepc|limb|mong|mymrepka|mymrpao|mymrshan|nagm|nkoo|onao|osma|outlined|rohg|saur|shrd|sora|sund|sunu|takr|talu|tnsa|tols|wcho)"/>
 		<coverageVariable key="%persianCalendarTerritories" value="(AF|IR)"/>
 		<coverageVariable key="%personNameLanguages" value="(ar|de|en|es|fr|hu|id|is|ja|ko|nl|ru|uk|zh)"/> <!-- currently unused -->
 		<coverageVariable key="%phonebookCollationLanguages" value="(de|fi)"/>
 		<coverageVariable key="%ptVariants" value="(ABL1943|AO1990|COLB1945)"/>
 		<coverageVariable key="%quarterTypes" value="([1-4])"/>
 		<coverageVariable key="%regionFormatTypes" value="(daylight|standard)"/>
+		<coverageVariable key="%relativePattern" value="[@type='relative']/pattern[@type='standard']"/>
 		<coverageVariable key="%relativeTimeTypes" value="(year|year-short|year-narrow|quarter|quarter-short|quarter-narrow|month|month-short|month-narrow|week|week-short|week-narrow|day|day-short|day-narrow|hour|hour-short|hour-narrow|minute|minute-short|minute-narrow|second|second-short|second-narrow)"/>
 		<coverageVariable key="%script30" value="(Zxxx|Zzzz)"/>
 		<coverageVariable key="%script40" value="(Latn|Hans|Hant|Cyrl|Arab)"/>
 		<coverageVariable key="%script60" value="(Jpan|Kore)"/>
 		<coverageVariable key="%script80" value="(Adlm|Aran|Armn|Beng|Bopo|Brai|Cakm|Cans|Cher|Deva|Ethi|Geor|Grek|Gujr|Guru|Hani|Hang|Hebr|Hira|Knda|Kana|Khmr|Laoo|Mlym|Mong|Mtei|Mymr|Nkoo|Olck|Orya|Rohg|Sinh|Sund|Syrc|Taml|Telu|Tfng|Thaa|Thai|Tibt|Vaii|Yiii|Hanb|Hrkt|Jamo|Jpan|Kore|Zmth|Zsye|Zsym|Zxxx|Zyyy|Zzzz)"/>
-		<coverageVariable key="%script100" value="(Afak|Aghb|Ahom|Armi|Avst|Bali|Bamu|Bass|Batk|Blis|Brah|Bugi|Buhd|Cari|Cham|Chrs|Cirt|Copt|Cpmn|Cprt|Cyrs|Diak|Dogr|Dsrt|Dupl|Egy[dhp]|Elba|Elym|Gara|Geok|Glag|Gong|Gonm|Goth|Gran|Gukh|Hatr|Hano|Hluw|Hmng|Hmnp|Hrkt|Hung|Inds|Ital|Java|Jurc|Kali|Kawi|Khar|Khoj|Kits|Kpel|Kthi|Krai|Lana|Lat[fg]|Lepc|Limb|Lin[ab]|Lisu|Loma|Ly[cd]i|Mahj|Maka|Man[di]|Maya|Medf|Mend|Mer[co]|Modi|Moon|Mroo|Mult|Nagm|Nand|Narb|Nbat|Nkgb|Nshu|Ogam|Onao|Orkh|Osma|Ougr|Palm|Pauc|Perm|Phag|Phl[ipv]|Phnx|Plrd|Prti|Rjng|Roro|Runr|Samr|Sar[ab]|Saur|Sgnw|Shaw|Shrd|Sidd|Sind|Sogd|Sogo|Sora|Soyo|Sunu|Sylo|Syr[cejn]|Tagb|Takr|Tal[eu]|Tang|Tavt|Teng|Tglg|Tirh|Tnsa|Todr|Toto|Tutg|Ugar|Visp|Vith|Wara|Wcho|Wole|Xpeo|Xsux|Yezi|Zanb|Zinh|Zmth)"/>
+		<coverageVariable key="%script100" value="(Afak|Aghb|Ahom|Armi|Avst|Bali|Bamu|Bass|Batk|Berf|Blis|Brah|Bugi|Buhd|Cari|Cham|Chrs|Cirt|Copt|Cpmn|Cprt|Cyrs|Diak|Dogr|Dsrt|Dupl|Egy[dhp]|Elba|Elym|Gara|Geok|Glag|Gong|Gonm|Goth|Gran|Gukh|Hatr|Hano|Hluw|Hmng|Hmnp|Hrkt|Hung|Inds|Ital|Java|Jurc|Kali|Kawi|Khar|Khoj|Kits|Kpel|Kthi|Krai|Lana|Lat[fg]|Lepc|Limb|Lin[ab]|Lisu|Loma|Ly[cd]i|Mahj|Maka|Man[di]|Maya|Medf|Mend|Mer[co]|Modi|Moon|Mroo|Mult|Nagm|Nand|Narb|Nbat|Nkgb|Nshu|Ogam|Onao|Orkh|Osma|Ougr|Palm|Pauc|Perm|Phag|Phl[ipv]|Phnx|Plrd|Prti|Rjng|Roro|Runr|Samr|Sar[ab]|Saur|Sgnw|Shaw|Shrd|Sidd|Sidt|Sind|Sogd|Sogo|Sora|Soyo|Sunu|Sylo|Syr[cejn]|Tagb|Takr|Tal[eu]|Tang|Tavt|Tayo|Teng|Tglg|Tirh|Tnsa|Todr|Tols|Toto|Tutg|Ugar|Visp|Vith|Wara|Wcho|Wole|Xpeo|Xsux|Yezi|Zanb|Zinh|Zmth)"/>
 		<coverageVariable key="%shortLong" value="(short|long)"/>
 		<coverageVariable key="%anyAlphaNum" value="([-a-zA-Z0-9]+)"/>
 		<coverageVariable key="%ssTypes" value="(standard|none)"/>
@@ -159,27 +161,24 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%territory40" value="(BR|CN|DE|GB|FR|IN|IT|JP|RU|US)"/>
 		<coverageVariable key="%territory60" value="(AT|AU|BE|CA|CH|DK|ES|FI|GR|HK|ID|IE|KR|MX|NL|NO|PL|PT|SA|SE|TH|TR|TW|ZA|XA|XB)"/>
 		<coverageVariable key="%territory60_EU" value="(CZ|EE|HU|LT|LU|LV|MT|SI|SK)"/>
-		<coverageVariable key="%territory80" value="(419|202|0(0[12359]|1[1345789]|2[19]|3[0459]|5[347]|61)|1(4[235]|5[01459])|A[CDEFGILMOQRSWXZ]|B[ABDFGHIJLMNOQSTUVWYZ]|C[CDFGIKLMOPRUVWXYZ]|D[GJMOZ]|E[ACEGHRTUZ]|F[JKMO]|G[ADEFGHILMNPQSTUWY]|H[MNRTU]|I[CLMOQRS]|J[EMO]|K[EGHIMNPWYZ]|L[ABCIKRSTUVY]|M[ACDEFGHKLMNOPQRSTUVWYZ]|N[ACEFGIPRUZ]|OM|P[AEFGHKMNRSWY]|Q[AO]|R[EOSW]|S[BCDGHIJKLMNORSTVXYZ]|T[ACDFGJKLMNOPTVZ]|U[AGMNYZ]|V[ACEGINU]|W[FS]|XK|Y[ET]|Z[MW])"/>
+		<coverageVariable key="%territory80" value="(419|202|0(0[12359]|1[1345789]|2[19]|3[0459]|5[347]|61)|1(4[235]|5[01459])|A[CDEFGILMOQRSWXZ]|B[ABDFGHIJLMNOQSTUVWYZ]|C[CDFGIKLMOPQRUVWXYZ]|D[GJMOZ]|E[ACEGHRTUZ]|F[JKMO]|G[ADEFGHILMNPQSTUWY]|H[MNRTU]|I[CLMOQRS]|J[EMO]|K[EGHIMNPWYZ]|L[ABCIKRSTUVY]|M[ACDEFGHKLMNOPQRSTUVWYZ]|N[ACEFGIPRUZ]|OM|P[AEFGHKMNRSWY]|Q[AO]|R[EOSW]|S[BCDGHIJKLMNORSTVXYZ]|T[ACDFGJKLMNOPTVZ]|U[AGMNYZ]|V[ACEGINU]|W[FS]|XK|Y[ET]|Z[MW])"/>
 		<coverageVariable key="%territory80short" value="(GB|HK|MO|PS|SA|US)"/>
 		<coverageVariable key="%territory100" value="AN"/>
 		<coverageVariable key="%timeZones" value="(Africa|America|Antarctica|Arctic|Asia|Australia|Atlantic|Europe|Indian|Pacific)(/[A-Za-z_\-]++){1,2}"/>
 		<coverageVariable key="%traditionalCollationLanguages" value="(bn|es|kn|sa)"/>
 		<coverageVariable key="%transformNameTypes" value="(BGN|Numeric|Tone|UNGEGN|x-(Accents|Fullwidth|Halfwidth|Jamo|Pinyin|Publishing))"/>
+		
 		<coverageVariable key="%unitDurationTypes" value="duration-(year|month|week|day|hour|minute|second|millisecond)"/>
 		<coverageVariable key="%unitLengths" value="(long|short|narrow)"/>
-		<coverageVariable key="%unitNonNarrowLengths" value="(long|short)"/>
-		<coverageVariable key="%unitsCommonMetric" value="(concentr-percent|consumption-liter-per-100-kilometer|length-(centi|milli|kilo)?meter|mass-(kilo)?gram|temperature-celsius|speed-kilometer-per-hour|volume-liter)"/>
-		<coverageVariable key="%unitsCommonUS" value="(length-(inch|foot|yard|mile)|mass-(ounce|pound)|temperature-fahrenheit|speed-mile-per-hour)"/>
-		<coverageVariable key="%unitsEnglish" value="(length-fathom|length-furlong|mass-stone|volume-bushel|energy-british-thermal-unit)"/>
-		<coverageVariable key="%unitsNonEnglish" value="[a-z]++-(?!(furlong|fathom|stone|bushel|mile-nautical))([a-z]++([-a-z]++)?)"/>
-		<coverageVariable key="%unitsNonLightSpeed" value="[a-z]++-(?!(light-speed))"/>
-		<coverageVariable key="%unitsOther" value="(length-(picometer|light-year)|pressure-(hectopascal|inch-ofhg|millibar)|acceleration-g-force|angle-(degree|minute|second)|area-(acre|hectare|square-(foot|kilometer|meter|mile))|power-(horsepower|kilowatt|watt)|speed-meter-per-second|volume-cubic-(mile|kilometer))"/>
-		<coverageVariable key="%unitBeaufortRegions" value="(CN|DE|GB|GR|HK|MO|MT|NL|TW|US)"/>
+		<coverageVariable key="%unitsEnglish" value="(length-fathom|length-furlong|mass-stone|volume-bushel|energy-british-thermal-unit|volume-pint-imperial|volume-cup-imperial|temperature-rankine|mass-slug|pressure-gasoline-energy-density|energy-british-thermal-unit-it|length-rod|length-chain|duration-fortnight)"/>
+		<coverageVariable key="%unitsJapanese" value="(area-bu-jp|area-cho|area-se-jp|length-jo-jp|length-ken|length-ri-jp|length-rin|length-shaku-cloth|length-shaku-length|length-sun|mass-fun|volume-cup-jp|volume-koku|volume-kosaji|volume-osaji|volume-sai|volume-shaku|volume-to-jp)"/>
+
 		<coverageVariable key="%variantTypes" value="([A-Z0-9]++)"/>
 		<coverageVariable key="%wideAbbr" value="(wide|abbreviated)"/>
 		<coverageVariable key="%yesNo" value="(yes|no)"/>
 
 		<coverageVariable key="%anyAttribute" value='([^\x{22}]++)'/>
+		<coverageVariable key="%A" value='([^\x{22}]++)'/>
 
 		<!-- Number system coverage by language and/or script; default number system items at various levels, native & finance system items at moderate (for content) or modern -->
 		<coverageVariable key="%adlmDefaultScripts" value="(Adlm)"/>
@@ -230,38 +229,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 		<coverageLevel value="moderate" match="characters/exemplarCharacters[@type='%anyAlphaNum']"/>
 
-
 		<!-- *********************
-		Temporary overrides for https://unicode-org.atlassian.net/browse/CLDR-18258
-
-		These overrides help us ignore values that were added not during a submission cycle. If interpreted normally, it
-		would cause many supported locales to drop in coverage. During the next regular submission cycle, please remove these rules
-		and encourage linguists to fix these values.
+		Temporary overrides to avoid values that were added in a non-submission cycle
+		This avoids a temporary drop in coverage. 
+		Make this empty for submission cycles.
 		********************* -->
-		<!-- <coverageLevel	value="modern" inLanguage="de"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute']/[@case='%anyAttribute']"/>
-		<coverageLevel	value="modern"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel	value="modern"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/displayName"/> -->
-		<coverageLevel	value="comprehensive"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
-
-		<!-- <coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
-		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute']"/>
-		//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"]
-modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"][@case="accusative"]
-//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"][@case="accusative"] -->
-		<coverageLevel	value="comprehensive"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel	value="comprehensive"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/displayName"/>
-
-    <!-- TestCoverageCompleteness {
-      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"]
-      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="short"]/unit[@type="speed-light-speed"]/displayName
-      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="short"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"]
-      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="short"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]
-      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/displayName
-      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]
-	   Error: (TestCoverageLevel.java:849) de (0) Broken Logical Grouping: comprehensive => [//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]]
-      Error: (TestCoverageLevel.java:849) pl (0) Broken Logical Grouping: modern => [//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="few"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="few"][@case="genitive"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="many"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="many"][@case="genitive"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"][@case="genitive"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"][@case="genitive"]]
-      Error: (TestCoverageLevel.java:849) pl (0) Broken Logical Grouping: comprehensive => [//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="few"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="many"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]]
-    } (1.309s) FAILED (4 failure(s)) -->
+		
+		<!--  currently empty -->
+		
 		<!-- *********************
 		Modified Basic rules (v41)
 		These contain a mixture of basic and moderate.
@@ -281,13 +256,21 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel	value="basic"	 	match="localeDisplayNames/codePatterns/codePattern[@type='(language|script|territory)']"/>
 
 		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='${Target-Language}']"/>
+		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='${Target-Language}'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='${Target-Language}'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='${Target-Language}'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='en']"/>
+		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='en'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='en'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="basic"	 	match="localeDisplayNames/languages/language[@type='en'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language30']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language30'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language30'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language30'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language40']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language40'][@menu='%anyAttribute']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language40'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/languages/language[@type='%language40'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 
 		<coverageLevel	value="basic"	 	match="localeDisplayNames/scripts/script[@type='${Target-Scripts}']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/scripts/script[@type='%script30']"/>
@@ -307,46 +290,87 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/annotationPatterns/annotationPattern[@type='(flag|keycap|emoji|combined)']"/>
 
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/localeDisplayPattern/localeKeyTypePattern"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='calendar'][@type='${Calendar-List}'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='calendar'][@type='${Calendar-List}']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='calendar'][@type='gregorian'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='calendar'][@type='gregorian']"/>
-		<coverageLevel	value="moderate"	inLanguage="zh"	match="localeDisplayNames/types/type[@key='collation'][@type='(big5han|gb2312han|pinyin|stroke|zhuyin)']"/>
+		<coverageLevel	value="moderate"	inLanguage="zh"	match="localeDisplayNames/types/type[@key='collation'][@type='(pinyin|stroke|zhuyin)'][@scope='%A']"/>
+		<coverageLevel	value="moderate"	inLanguage="zh"	match="localeDisplayNames/types/type[@key='collation'][@type='(pinyin|stroke|zhuyin)']"/>
+		<coverageLevel	value="moderate"	inLanguage="si"	match="localeDisplayNames/types/type[@key='collation'][@type='dictionary'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="si"	match="localeDisplayNames/types/type[@key='collation'][@type='dictionary']"/>
+		<coverageLevel	value="moderate"	inLanguage="%phonebookCollationLanguages"	match="localeDisplayNames/types/type[@key='collation'][@type='phonebook'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="%phonebookCollationLanguages"	match="localeDisplayNames/types/type[@key='collation'][@type='phonebook']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='collation'][@type='standard'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='collation'][@type='standard']"/>
+		<coverageLevel	value="moderate"	inLanguage="%traditionalCollationLanguages"	match="localeDisplayNames/types/type[@key='collation'][@type='traditional'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="%traditionalCollationLanguages"	match="localeDisplayNames/types/type[@key='collation'][@type='traditional']"/>
+		<coverageLevel	value="moderate"	inLanguage="%CJK_Languages"	match="localeDisplayNames/types/type[@key='collation'][@type='unihan'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="%CJK_Languages"	match="localeDisplayNames/types/type[@key='collation'][@type='unihan']"/>
+		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='numbers'][@type='latn'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='numbers'][@type='latn']"/>
+		<coverageLevel	value="moderate"	inLanguage="%hanidecNativeLanguages"	match="localeDisplayNames/types/type[@key='numbers'][@type='(hanidec|hans|hansfin|hant|hantfin)'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="%hanidecNativeLanguages"	match="localeDisplayNames/types/type[@key='numbers'][@type='(hanidec|hans|hansfin|hant|hantfin)']"/>
+		<coverageLevel	value="moderate"	inScript="Arab"	match="localeDisplayNames/types/type[@key='numbers'][@type='arab'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Arab"	match="localeDisplayNames/types/type[@key='numbers'][@type='arab']"/>
+		<coverageLevel	value="moderate"	inLanguage="%arabextAllLanguages"	match="localeDisplayNames/types/type[@key='numbers'][@type='arabext'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="%arabextAllLanguages"	match="localeDisplayNames/types/type[@key='numbers'][@type='arabext']"/>
+		<coverageLevel	value="moderate"	inScript="Armn"	match="localeDisplayNames/types/type[@key='numbers'][@type='armn(low)?'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Armn"	match="localeDisplayNames/types/type[@key='numbers'][@type='armn(low)?']"/>
+		<coverageLevel	value="moderate"	inScript="Beng"	match="localeDisplayNames/types/type[@key='numbers'][@type='beng'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Beng"	match="localeDisplayNames/types/type[@key='numbers'][@type='beng']"/>
+		<coverageLevel	value="moderate"	inScript="Cakm"	match="localeDisplayNames/types/type[@key='numbers'][@type='cakm'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Cakm"	match="localeDisplayNames/types/type[@key='numbers'][@type='cakm']"/>
+		<coverageLevel	value="moderate"	inScript="Deva"	match="localeDisplayNames/types/type[@key='numbers'][@type='deva'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Deva"	match="localeDisplayNames/types/type[@key='numbers'][@type='deva']"/>
+		<coverageLevel	value="moderate"	inScript="Ethi"	match="localeDisplayNames/types/type[@key='numbers'][@type='ethi'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Ethi"	match="localeDisplayNames/types/type[@key='numbers'][@type='ethi']"/>
+		<coverageLevel	value="moderate"	inLanguage="%CJK_Languages"	match="localeDisplayNames/types/type[@key='numbers'][@type='fullwide'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="%CJK_Languages"	match="localeDisplayNames/types/type[@key='numbers'][@type='fullwide']"/>
+		<coverageLevel	value="moderate"	inScript="Geor"	match="localeDisplayNames/types/type[@key='numbers'][@type='geor'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Geor"	match="localeDisplayNames/types/type[@key='numbers'][@type='geor']"/>
+		<coverageLevel	value="moderate"	inScript="Grek"	match="localeDisplayNames/types/type[@key='numbers'][@type='grek(low)?'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Grek"	match="localeDisplayNames/types/type[@key='numbers'][@type='grek(low)?']"/>
+		<coverageLevel	value="moderate"	inScript="Gujr"	match="localeDisplayNames/types/type[@key='numbers'][@type='gujr'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Gujr"	match="localeDisplayNames/types/type[@key='numbers'][@type='gujr']"/>
+		<coverageLevel	value="moderate"	inScript="Guru"	match="localeDisplayNames/types/type[@key='numbers'][@type='guru'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Guru"	match="localeDisplayNames/types/type[@key='numbers'][@type='guru']"/>
+		<coverageLevel	value="moderate"	inScript="Hebr"	match="localeDisplayNames/types/type[@key='numbers'][@type='hebr'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Hebr"	match="localeDisplayNames/types/type[@key='numbers'][@type='hebr']"/>
+		<coverageLevel	value="moderate"	inScript="Hmnp"	match="localeDisplayNames/types/type[@key='numbers'][@type='hmnp'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Hmnp"	match="localeDisplayNames/types/type[@key='numbers'][@type='hmnp']"/>
+		<coverageLevel	value="moderate"	inLanguage="ja"	match="localeDisplayNames/types/type[@key='numbers'][@type='jpan(fin)?'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="ja"	match="localeDisplayNames/types/type[@key='numbers'][@type='jpan(fin)?']"/>
+		<coverageLevel	value="moderate"	inLanguage="jv"	match="localeDisplayNames/types/type[@key='numbers'][@type='java'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="jv"	match="localeDisplayNames/types/type[@key='numbers'][@type='java']"/>
+		<coverageLevel	value="moderate"	inScript="Khmr"	match="localeDisplayNames/types/type[@key='numbers'][@type='khmr'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Khmr"	match="localeDisplayNames/types/type[@key='numbers'][@type='khmr']"/>
+		<coverageLevel	value="moderate"	inScript="Knda"	match="localeDisplayNames/types/type[@key='numbers'][@type='knda'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Knda"	match="localeDisplayNames/types/type[@key='numbers'][@type='knda']"/>
+		<coverageLevel	value="moderate"	inScript="Laoo"	match="localeDisplayNames/types/type[@key='numbers'][@type='laoo'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Laoo"	match="localeDisplayNames/types/type[@key='numbers'][@type='laoo']"/>
+		<coverageLevel	value="moderate"	inScript="Mlym"	match="localeDisplayNames/types/type[@key='numbers'][@type='mlym'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Mlym"	match="localeDisplayNames/types/type[@key='numbers'][@type='mlym']"/>
+		<coverageLevel	value="moderate"	inScript="Mong"	match="localeDisplayNames/types/type[@key='numbers'][@type='mong'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Mong"	match="localeDisplayNames/types/type[@key='numbers'][@type='mong']"/>
+		<coverageLevel	value="moderate"	inScript="Mtei"	match="localeDisplayNames/types/type[@key='numbers'][@type='mtei'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Mtei"	match="localeDisplayNames/types/type[@key='numbers'][@type='mtei']"/>
+		<coverageLevel	value="moderate"	inScript="Mymr"	match="localeDisplayNames/types/type[@key='numbers'][@type='mymr(shan)?'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Mymr"	match="localeDisplayNames/types/type[@key='numbers'][@type='mymr(shan)?']"/>
+		<coverageLevel	value="moderate"	inScript="Nkoo"	match="localeDisplayNames/types/type[@key='numbers'][@type='nkoo'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Nkoo"	match="localeDisplayNames/types/type[@key='numbers'][@type='nkoo']"/>
+		<coverageLevel	value="moderate"	inScript="Olck"	match="localeDisplayNames/types/type[@key='numbers'][@type='olck'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Olck"	match="localeDisplayNames/types/type[@key='numbers'][@type='olck']"/>
+		<coverageLevel	value="moderate"	inScript="Orya"	match="localeDisplayNames/types/type[@key='numbers'][@type='orya'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Orya"	match="localeDisplayNames/types/type[@key='numbers'][@type='orya']"/>
+		<coverageLevel	value="moderate"	inScript="Taml"	match="localeDisplayNames/types/type[@key='numbers'][@type='taml(dec)?'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Taml"	match="localeDisplayNames/types/type[@key='numbers'][@type='taml(dec)?']"/>
+		<coverageLevel	value="moderate"	inScript="Telu"	match="localeDisplayNames/types/type[@key='numbers'][@type='telu'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Telu"	match="localeDisplayNames/types/type[@key='numbers'][@type='telu']"/>
+		<coverageLevel	value="moderate"	inScript="Thai"	match="localeDisplayNames/types/type[@key='numbers'][@type='thai'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Thai"	match="localeDisplayNames/types/type[@key='numbers'][@type='thai']"/>
+		<coverageLevel	value="moderate"	inScript="Tibt"	match="localeDisplayNames/types/type[@key='numbers'][@type='tibt'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inScript="Tibt"	match="localeDisplayNames/types/type[@key='numbers'][@type='tibt']"/>
+		<coverageLevel	value="moderate"	inLanguage="vai"	match="localeDisplayNames/types/type[@key='numbers'][@type='vaii'][@scope='%A']"/>
 		<coverageLevel	value="moderate"	inLanguage="vai"	match="localeDisplayNames/types/type[@key='numbers'][@type='vaii']"/>
 
 		<coverageLevel	value="basic"		match="dates/calendars/calendar[@type='gregorian']/months/monthContext[@type='format']/monthWidth[@type='wide']/month[@type='%monthTypes']"/>
@@ -384,13 +408,15 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%stdPattern"/>
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%atTimePattern"/>
+		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%relativePattern"/>
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='generic']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%stdPattern"/>
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='generic']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%atTimePattern"/>
+		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='generic']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%relativePattern"/>
 
 		<coverageLevel	value="basic"	 	match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='generic']/dateTimeFormats/intervalFormats/intervalFormatFallback"/>
 
-		<coverageLevel	value="basic"	 	match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%basicDateSkeletons']"/>
+		<coverageLevel	value="basic"	 	    match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%basicDateSkeletons']"/>
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%anyAttribute']"/>
 
 		<coverageLevel	value="moderate"	 	match="dates/calendars/calendar[@type='gregorian']/eras/eraAbbr/era[@type='(0|1)']"/>
@@ -418,6 +444,7 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel	value="basic"	 	match="dates/timeZoneNames/hourFormat"/>
 		<coverageLevel	value="basic"	 	match="dates/timeZoneNames/metazone[@type='GMT']/long/standard"/>
 
+		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/gmtUnknownFormat"/>
 		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/zone[@type='Etc/UTC']/long/standard"/>
 		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/zone[@type='Etc/Unknown']/exemplarCity"/>
 		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/zone[@type='${Target-TimeZones}']/exemplarCity"/>
@@ -455,6 +482,7 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel	value="moderate"	inTerritory="US"	match="dates/timeZoneNames/metazone[@type='%metazone30_US']/long/daylight"/>
 		<coverageLevel	value="moderate"	inTerritory="US"	match="dates/timeZoneNames/metazone[@type='%metazone30_US']/long/generic"/>
 		<coverageLevel	value="moderate"	inTerritory="US"	match="dates/timeZoneNames/metazone[@type='%metazone30_US']/long/standard"/>
+		<coverageLevel	value="moderate"	inTerritory="US"	match="dates/timeZoneNames/metazone[@type='%metazone30_US_stdonly']/long/standard"/>
 		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/metazone[@type='%metazone40']/long/daylight"/>
 		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/metazone[@type='%metazone40']/long/generic"/>
 		<coverageLevel	value="moderate"	 	match="dates/timeZoneNames/metazone[@type='%metazone40']/long/standard"/>
@@ -549,10 +577,11 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel	value="moderate"	match="numbers/currencyFormats[@numberSystem='latn']/unitPattern[@count='%anyAttribute']"/>
 
 		<!-- Moved compact decimal/currency formats for latn up from below, chnage base forms to moderate -->
+		
 		<coverageLevel	value="modern"		match="numbers/currencyFormats[@numberSystem='latn']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
 		<coverageLevel	value="moderate"	match="numbers/currencyFormats[@numberSystem='latn']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
-		<coverageLevel	value="moderate"	match="numbers/decimalFormats[@numberSystem='latn']/decimalFormatLength[@type='%shortLong']/decimalFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
-
+		<coverageLevel	value="moderate"	match="numbers/decimalFormats[@numberSystem='latn']/decimalFormatLength[@type='%shortLong']/decimalFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>		
+		
 		<!-- non-latn default number systems, standard formats for decimal/currency/percent/etc also at basic per TC 2024-05-08 -->
 
 		<!-- *********************
@@ -682,28 +711,47 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel	value="moderate"	inTerritory="JP"	match="dates/calendars/calendar[@type='japanese']/dateFormats/dateFormatLength[@type='%dateTimeFormatLengths']/dateFormat%stdPattern"/>
 		<coverageLevel	value="moderate"	inTerritory="JP"	match="dates/calendars/calendar[@type='japanese']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%stdPattern"/>
 		<coverageLevel	value="moderate"	inTerritory="JP"	match="dates/calendars/calendar[@type='japanese']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%atTimePattern"/>
+		<coverageLevel	value="moderate"	inTerritory="JP"	match="dates/calendars/calendar[@type='japanese']/dateTimeFormats/dateTimeFormatLength[@type='%dateTimeFormatLengths']/dateTimeFormat%relativePattern"/>
 		<coverageLevel	value="moderate"	inTerritory="TW"	match="dates/calendars/calendar[@type='roc']/dateFormats/dateFormatLength[@type='%dateTimeFormatLengths']/dateFormat%stdPattern"/>
 
 		<coverageLevel value="moderate" match="localeDisplayNames/languages/language[@type='%language60']"/>
+		<coverageLevel value="moderate" match="localeDisplayNames/languages/language[@type='%language60'][@menu='%anyAttribute']"/>
 		<coverageLevel value="moderate" match="localeDisplayNames/languages/language[@type='%language60'][@alt='%anyAttribute']"/>
+		<coverageLevel value="moderate" match="localeDisplayNames/languages/language[@type='%language60'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="CF" value="moderate" match="localeDisplayNames/languages/language[@type='sg']"/>
+		<coverageLevel inTerritory="CF" value="moderate" match="localeDisplayNames/languages/language[@type='sg'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="CF" value="moderate" match="localeDisplayNames/languages/language[@type='sg'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="CF" value="moderate" match="localeDisplayNames/languages/language[@type='sg'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="CG" value="moderate" match="localeDisplayNames/languages/language[@type='(kg|ln)']"/>
+		<coverageLevel inTerritory="CG" value="moderate" match="localeDisplayNames/languages/language[@type='(kg|ln)'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="CG" value="moderate" match="localeDisplayNames/languages/language[@type='(kg|ln)'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="CG" value="moderate" match="localeDisplayNames/languages/language[@type='(kg|ln)'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="CM" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_CM']"/>
+		<coverageLevel inTerritory="CM" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_CM'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="CM" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_CM'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="CM" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_CM'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_EU']"/>
+		<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_EU'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_EU'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_EU'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="GA" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_GA']"/>
+		<coverageLevel inTerritory="GA" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_GA'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="GA" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_GA'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="GA" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_GA'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="NG" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_NG']"/>
+		<coverageLevel inTerritory="NG" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_NG'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="NG" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_NG'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="NG" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_NG'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="TD" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_TD']"/>
+		<coverageLevel inTerritory="TD" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_TD'][@menu='%anyAttribute']"/>
 		<coverageLevel inTerritory="TD" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_TD'][@alt='%anyAttribute']"/>
+		<coverageLevel inTerritory="TD" value="moderate" match="localeDisplayNames/languages/language[@type='%language60_TD'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel value="moderate" match="localeDisplayNames/scripts/script[@type='%script60']"/>
 		<coverageLevel value="moderate" match="localeDisplayNames/territories/territory[@type='%territory60']"/>
 		<coverageLevel inTerritory="EU" value="moderate" match="localeDisplayNames/territories/territory[@type='%territory60_EU']"/>
+		<coverageLevel value="moderate" match="localeDisplayNames/types/type[@key='calendar'][@type='iso8601'][@scope='%A']"/>
 		<coverageLevel value="moderate" match="localeDisplayNames/types/type[@key='calendar'][@type='iso8601']"/>
+		<coverageLevel value="moderate" match="localeDisplayNames/types/type[@key='calendar'][@type='iso8601'][@alt='variant']"/>
 		<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/symbol"/>
 		<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/symbol[@alt='(narrow|variant)']"/>
 		<coverageLevel value="moderate" match="numbers/currencies/currency[@type='%currency60']/displayName"/>
@@ -959,6 +1007,7 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel inTerritory="%islamicCalendarTerritories" value="modern" match="dates/calendars/calendar[@type='islamic']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItems']"/>
 		<coverageLevel inTerritory="JP" value="modern" match="dates/calendars/calendar[@type='japanese']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItems']"/>
 		<coverageLevel inTerritory="TW" value="modern" match="dates/calendars/calendar[@type='roc']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItems']"/>
+		
 		<coverageLevel value="moderate" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatDateItems']/greatestDifference[@id='%intervalFormatGDiff']"/>
 		<coverageLevel value="moderate" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatTimeItems']/greatestDifference[@id='%intervalFormatGDiff']"/>
 		<coverageLevel value="moderate" match="dates/calendars/calendar[@type='generic']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatDateItems']/greatestDifference[@id='%intervalFormatGDiff']"/>
@@ -971,17 +1020,6 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel value="moderate" match="dates/timeZoneNames/metazone[@type='%metazone60']/long/daylight"/>
 		<coverageLevel value="moderate" match="dates/timeZoneNames/metazone[@type='%metazone60_stdonly']/long/standard"/>
 		<coverageLevel inTerritory="AE" value="moderate" match="dates/timeZoneNames/metazone[@type='%metazone60_AE_stdonly']/long/standard"/>
-		<coverageLevel inTerritory="AE" value="moderate" match="dates/timeZoneNames/metazone[@type='%metazone60_AE_stdonly']/short/standard"/>
-
-		<!--
-		Move to modern to avoid crossing logical groups
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitDurationTypes']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitDurationTypes']/displayName"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonMetric']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonMetric']/displayName"/>
-		<coverageLevel inTerritory="US" value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonUS']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel inTerritory="US" value="moderate" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonUS']/displayName"/>
-		  -->
 
 		<coverageLevel value="moderate" match="listPatterns/listPattern[@type='%anyAlphaNum']/listPatternPart[@type='%anyAlphaNum']"/>
 		<coverageLevel value="moderate" match="numbers/minimalPairs/pluralMinimalPairs[@count='%anyAlphaNum']"/>
@@ -991,6 +1029,7 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel value="moderate" match="characters/ellipsis[@type='%ellipsisTypes']"/>
 		<coverageLevel value="moderate" match="characters/moreInformation"/>
 		<coverageLevel value="moderate" match="characters/parseLenients[@scope='%anyAttribute'][@level='%anyAttribute']/parseLenient[@sample='%anyAttribute']"/>
+		
 		<coverageLevel value="moderate" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%anyAttribute'][@count='%anyAttribute']"/>
 		<coverageLevel value="moderate" match="dates/calendars/calendar[@type='gregorian']/days/dayContext[@type='%contextTypes']/dayWidth[@type='short']/day[@type='%dayTypes']"/>
 		<coverageLevel value="moderate" match="dates/calendars/calendar[@type='gregorian']/dayPeriods/dayPeriodContext[@type='%anyAlphaNum']/dayPeriodWidth[@type='%allWidths']/dayPeriod[@type='%anyAlphaNum']"/>
@@ -1022,41 +1061,48 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel value="moderate" match="numbers/symbols[@numberSystem='latn']/perMille"/>
 		<coverageLevel value="moderate" match="numbers/symbols[@numberSystem='latn']/infinity"/>
 		<coverageLevel value="moderate" match="numbers/symbols[@numberSystem='latn']/nan"/>
-		<!--
-		Move to modern to avoid crossing logical groups
 
-		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute']"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/unitPrefixPattern"/>
-
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/displayName"/>
-		<coverageLevel value="moderate" match="units/unitLength[@type='%unitNonNarrowLengths']/unit[@type='%unitsNonEnglish']/perUnitPattern"/>
-		-->
 		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern"/>
 		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/coordinateUnit/coordinateUnitPattern[@type='%anyAlphaNum']"/>
 		<coverageLevel value="moderate" match="units/unitLength[@type='%unitLengths']/coordinateUnit/displayName"/>
 
 		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80'][@menu='%anyAttribute']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80'][@alt='%anyAttribute']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/languages/language[@type='%language80'][@alt='%anyAttribute'][@menu='%anyAttribute']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/scripts/script[@type='%script80']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/scripts/script[@type='%script80'][@alt='%anyAttribute']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/keys/key[@type='%anyAttribute']"/>
 		<coverageLevel inLanguage="pt" value="modern" match="localeDisplayNames/variants/variant[@type='%ptVariants']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType80']"/>
+		<coverageLevel inLanguage="%collationType80TopLangs" value="modern" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType80ForTopLangs'][@scope='%A']"/>
 		<coverageLevel inLanguage="%collationType80TopLangs" value="modern" match="localeDisplayNames/types/type[@key='collation'][@type='%collationType80ForTopLangs']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='numbers'][@type='%numberingSystem80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='numbers'][@type='%numberingSystem80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='cf'][@type='%cfTypes'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='cf'][@type='%cfTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='em'][@type='%emTypes'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='em'][@type='%emTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='fw'][@type='%fwTypes'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='fw'][@type='%fwTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='lw'][@type='%lwTypes'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='lw'][@type='%lwTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='lb'][@type='%lbTypes80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='lb'][@type='%lbTypes80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='hc'][@type='%hcTypes80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='hc'][@type='%hcTypes80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='ms'][@type='%msTypes80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='ms'][@type='%msTypes80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='ss'][@type='%ssTypes'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='ss'][@type='%ssTypes']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='d0'][@type='%d0Types80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='d0'][@type='%d0Types80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='m0'][@type='%m0Types80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='m0'][@type='%m0Types80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='t0'][@type='%t0Types80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='t0'][@type='%t0Types80']"/>
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='kr'][@type='(currency|digit|punct|space|symbol)'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='kr'][@type='(currency|digit|punct|space|symbol)']"/>
 		<coverageLevel value="modern" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatTimeItemsDayPer']/greatestDifference[@id='%intervalFormatGDiff']"/>
 		<coverageLevel value="modern" match="dates/calendars/calendar[@type='generic']/dateTimeFormats/intervalFormats/intervalFormatItem[@id='%intervalFormatTimeItemsDayPer']/greatestDifference[@id='%intervalFormatGDiff']"/>
@@ -1084,78 +1130,142 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel value="modern" match="dates/fields/field[@type='second']/relative[@type='0']"/>
 		<coverageLevel value="modern" match="dates/fields/field[@type='quarter']/relative[@type='(-1|0|1)']"/>
 
+		<coverageLevel	value="modern"		match="numbers/rationalFormats[@numberSystem='latn']/rationalPattern"/>
+		<coverageLevel	value="modern"		match="numbers/rationalFormats[@numberSystem='latn']/rationalUsage"/>
+		<coverageLevel	value="modern"		match="numbers/rationalFormats[@numberSystem='latn']/integerAndRationalPattern"/>
+		<coverageLevel	value="modern"		match="numbers/rationalFormats[@numberSystem='latn']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+		
 		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='adlm']/approximatelySign"/>
 		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='adlm']/exponential"/>
 		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='adlm']/superscriptingExponent"/>
 		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='adlm']/perMille"/>
 		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='adlm']/infinity"/>
 		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='adlm']/nan"/>
+		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='adlm']/rationalPattern"/>
+		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='adlm']/rationalUsage"/>
+		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='adlm']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%adlmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='adlm']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+		
 		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/approximatelySign"/>
 		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/exponential"/>
 		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/perMille"/>
 		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/infinity"/>
 		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/nan"/>
+		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/rationalPattern"/>
+		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/rationalUsage"/>
+		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%arabDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/approximatelySign"/>
 		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/exponential"/>
 		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/perMille"/>
 		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/infinity"/>
 		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/nan"/>
+		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/rationalPattern"/>
+		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/rationalUsage"/>
+		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%arabextDefaultLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='beng']/approximatelySign"/>
 		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='beng']/exponential"/>
 		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='beng']/superscriptingExponent"/>
 		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='beng']/perMille"/>
 		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='beng']/infinity"/>
 		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='beng']/nan"/>
+		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='beng']/rationalPattern"/>
+		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='beng']/rationalUsage"/>
+		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='beng']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%bengDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='beng']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='cakm']/approximatelySign"/>
 		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='cakm']/exponential"/>
 		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='cakm']/superscriptingExponent"/>
 		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='cakm']/perMille"/>
 		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='cakm']/infinity"/>
 		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='cakm']/nan"/>
+		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='cakm']/rationalPattern"/>
+		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='cakm']/rationalUsage"/>
+		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='cakm']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%cakmDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='cakm']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/approximatelySign"/>
 		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/exponential"/>
 		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/perMille"/>
 		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/infinity"/>
 		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/nan"/>
+		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numb/rationalUsage/rationalPattern"/>
+		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/rationalUsage"/>
+		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%devaDefaultLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='hmnp']/approximatelySign"/>
 		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='hmnp']/exponential"/>
 		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='hmnp']/superscriptingExponent"/>
 		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='hmnp']/perMille"/>
 		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='hmnp']/infinity"/>
 		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='hmnp']/nan"/>
+		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hmnp']/rationalPattern"/>
+		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hmnp']/rationalUsage"/>
+		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hmnp']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%hmnpDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hmnp']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='mtei']/approximatelySign"/>
 		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='mtei']/exponential"/>
 		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='mtei']/superscriptingExponent"/>
 		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='mtei']/perMille"/>
 		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='mtei']/infinity"/>
 		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='mtei']/nan"/>
+		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mtei']/rationalPattern"/>
+		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mtei']/rationalUsage"/>
+		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mtei']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%mteiDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mtei']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='mymr']/approximatelySign"/>
 		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='mymr']/exponential"/>
 		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='mymr']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='mymr']/perMille"/>
 		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='mymr']/infinity"/>
 		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='mymr']/nan"/>
+		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mymr']/rationalPattern"/>
+		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mymr']/rationalUsage"/>
+		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mymr']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%mymrDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mymr']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='nkoo']/approximatelySign"/>
 		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='nkoo']/exponential"/>
 		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='nkoo']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='nkoo']/perMille"/>
 		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='nkoo']/infinity"/>
 		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='nkoo']/nan"/>
+		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/rationalPattern"/>
+		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/rationalUsage"/>
+		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%nkooDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='olck']/approximatelySign"/>
 		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='olck']/exponential"/>
 		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='olck']/superscriptingExponent"/>
 		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='olck']/perMille"/>
 		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='olck']/infinity"/>
 		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/symbols[@numberSystem='olck']/nan"/>
+		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='olck']/rationalPattern"/>
+		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='olck']/rationalUsage"/>
+		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='olck']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%olckDefaultScripts" value="modern" match="numbers/rationalFormats[@numberSystem='olck']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/approximatelySign"/>
 		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/exponential"/>
 		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/perMille"/>
 		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/infinity"/>
 		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/nan"/>
+		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/rationalPattern"/>
+		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/rationalUsage"/>
+		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%tibtDefaultLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/integerAndRationalPattern[@alt='%anyAttribute']"/>
 
 		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/approximatelySign"/>
 		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/exponential"/>
@@ -1163,18 +1273,33 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/perMille"/>
 		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/infinity"/>
 		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arab']/nan"/>
+		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/rationalPattern"/>
+		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/rationalUsage"/>
+		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%arabNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arab']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/approximatelySign"/>
 		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/exponential"/>
 		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/perMille"/>
 		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/infinity"/>
 		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/symbols[@numberSystem='arabext']/nan"/>
+		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/rationalPattern"/>
+		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/rationalUsage"/>
+		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%arabextNativeLanguages" inScript="Arab" value="modern" match="numbers/rationalFormats[@numberSystem='arabext']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/approximatelySign"/>
 		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/exponential"/>
 		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/perMille"/>
 		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/infinity"/>
 		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/symbols[@numberSystem='deva']/nan"/>
+		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/rationalPattern"/>
+		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/rationalUsage"/>
+		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%devaNativeLanguages" inScript="Deva" value="modern" match="numbers/rationalFormats[@numberSystem='deva']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%gujrNativeScripts" value="modern" match="numbers/symbols[@numberSystem='gujr']/approximatelySign"/>
 		<coverageLevel inScript="%gujrNativeScripts" value="modern" match="numbers/symbols[@numberSystem='gujr']/exponential"/>
 		<coverageLevel inScript="%gujrNativeScripts" value="modern" match="numbers/symbols[@numberSystem='gujr']/superscriptingExponent"/>
@@ -1187,12 +1312,22 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/symbols[@numberSystem='guru']/perMille"/>
 		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/symbols[@numberSystem='guru']/infinity"/>
 		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/symbols[@numberSystem='guru']/nan"/>
+		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='guru']/rationalPattern"/>
+		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='guru']/rationalUsage"/>
+		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='guru']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%guruNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='guru']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='hanidec']/approximatelySign"/>
 		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='hanidec']/exponential"/>
 		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='hanidec']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='hanidec']/perMille"/>
 		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='hanidec']/infinity"/>
 		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='hanidec']/nan"/>
+		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='hanidec']/rationalPattern"/>
+		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='hanidec']/rationalUsage"/>
+		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='hanidec']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%hanidecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='hanidec']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%hansfinFinanceScripts" value="modern" match="numbers/symbols[@numberSystem='hansfin']/approximatelySign"/>
 		<coverageLevel inScript="%hansfinFinanceScripts" value="modern" match="numbers/symbols[@numberSystem='hansfin']/exponential"/>
 		<coverageLevel inScript="%hansfinFinanceScripts" value="modern" match="numbers/symbols[@numberSystem='hansfin']/superscriptingExponent"/>
@@ -1205,125 +1340,216 @@ modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/uni
 		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/symbols[@numberSystem='hantfin']/perMille"/>
 		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/symbols[@numberSystem='hantfin']/infinity"/>
 		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/symbols[@numberSystem='hantfin']/nan"/>
+		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hantfin']/rationalPattern"/>
+		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hantfin']/rationalUsage"/>
+		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hantfin']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%hantfinFinanceScripts" value="modern" match="numbers/rationalFormats[@numberSystem='hantfin']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/symbols[@numberSystem='jpanfin']/approximatelySign"/>
 		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/symbols[@numberSystem='jpanfin']/exponential"/>
 		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/symbols[@numberSystem='jpanfin']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/symbols[@numberSystem='jpanfin']/perMille"/>
 		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/symbols[@numberSystem='jpanfin']/infinity"/>
 		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/symbols[@numberSystem='jpanfin']/nan"/>
+		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='jpanfin']/rationalPattern"/>
+		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='jpanfin']/rationalUsage"/>
+		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='jpanfin']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%jpanfinFinanceLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='jpanfin']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='java']/approximatelySign"/>
 		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='java']/exponential"/>
 		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='java']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='java']/perMille"/>
 		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='java']/infinity"/>
 		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='java']/nan"/>
+		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='java']/rationalPattern"/>
+		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='java']/rationalUsage"/>
+		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='java']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%javaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='java']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='khmr']/approximatelySign"/>
 		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='khmr']/exponential"/>
 		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='khmr']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='khmr']/perMille"/>
 		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='khmr']/infinity"/>
 		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='khmr']/nan"/>
+		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='khmr']/rationalPattern"/>
+		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='khmr']/rationalUsage"/>
+		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='khmr']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%khmrNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='khmr']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='knda']/approximatelySign"/>
 		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='knda']/exponential"/>
 		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='knda']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='knda']/perMille"/>
 		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='knda']/infinity"/>
 		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='knda']/nan"/>
+		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='knda']/rationalPattern"/>
+		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='knda']/rationalUsage"/>
+		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='knda']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%kndaNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='knda']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='laoo']/approximatelySign"/>
 		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='laoo']/exponential"/>
 		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='laoo']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='laoo']/perMille"/>
 		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='laoo']/infinity"/>
 		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='laoo']/nan"/>
+		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='laoo']/rationalPattern"/>
+		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='laoo']/rationalUsage"/>
+		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='laoo']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%laooNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='laoo']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='mlym']/approximatelySign"/>
 		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='mlym']/exponential"/>
 		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='mlym']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='mlym']/perMille"/>
 		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='mlym']/infinity"/>
 		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='mlym']/nan"/>
+		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mlym']/rationalPattern"/>
+		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mlym']/rationalUsage"/>
+		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mlym']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%mlymNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='mlym']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/symbols[@numberSystem='mong']/approximatelySign"/>
 		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/symbols[@numberSystem='mong']/exponential"/>
 		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/symbols[@numberSystem='mong']/superscriptingExponent"/>
 		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/symbols[@numberSystem='mong']/perMille"/>
 		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/symbols[@numberSystem='mong']/infinity"/>
 		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/symbols[@numberSystem='mong']/nan"/>
+		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mong']/rationalPattern"/>
+		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mong']/rationalUsage"/>
+		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mong']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%mongNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='mong']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/symbols[@numberSystem='nkoo']/approximatelySign"/>
 		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/symbols[@numberSystem='nkoo']/exponential"/>
 		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/symbols[@numberSystem='nkoo']/superscriptingExponent"/>
 		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/symbols[@numberSystem='nkoo']/perMille"/>
 		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/symbols[@numberSystem='nkoo']/infinity"/>
 		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/symbols[@numberSystem='nkoo']/nan"/>
+		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/rationalPattern"/>
+		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/rationalUsage"/>
+		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%nkooNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='nkoo']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/symbols[@numberSystem='orya']/approximatelySign"/>
 		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/symbols[@numberSystem='orya']/exponential"/>
 		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/symbols[@numberSystem='orya']/superscriptingExponent"/>
 		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/symbols[@numberSystem='orya']/perMille"/>
 		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/symbols[@numberSystem='orya']/infinity"/>
 		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/symbols[@numberSystem='orya']/nan"/>
+		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='orya']/rationalPattern"/>
+		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='orya']/rationalUsage"/>
+		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='orya']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%oryaNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='orya']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tamldec']/approximatelySign"/>
 		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tamldec']/exponential"/>
 		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tamldec']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tamldec']/perMille"/>
 		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tamldec']/infinity"/>
 		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tamldec']/nan"/>
+		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tamldec']/rationalPattern"/>
+		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tamldec']/rationalUsage"/>
+		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tamldec']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%tamldecNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tamldec']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/symbols[@numberSystem='telu']/approximatelySign"/>
 		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/symbols[@numberSystem='telu']/exponential"/>
 		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/symbols[@numberSystem='telu']/superscriptingExponent"/>
 		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/symbols[@numberSystem='telu']/perMille"/>
 		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/symbols[@numberSystem='telu']/infinity"/>
 		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/symbols[@numberSystem='telu']/nan"/>
+		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='telu']/rationalPattern"/>
+		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='telu']/rationalUsage"/>
+		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='telu']/integerAndRationalPattern"/>
+		<coverageLevel inScript="%teluNativeScripts" value="modern" match="numbers/rationalFormats[@numberSystem='telu']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='thai']/approximatelySign"/>
 		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='thai']/exponential"/>
 		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='thai']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='thai']/perMille"/>
 		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='thai']/infinity"/>
 		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='thai']/nan"/>
+		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='thai']/rationalPattern"/>
+		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='thai']/rationalUsage"/>
+		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='thai']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%thaiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='thai']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/approximatelySign"/>
 		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/exponential"/>
 		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/perMille"/>
 		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/infinity"/>
 		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='tibt']/nan"/>
+		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/rationalPattern"/>
+		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/rationalUsage"/>
+		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%tibtNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='tibt']/integerAndRationalPattern[@alt='%anyAttribute']"/>
+
 		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='vaii']/approximatelySign"/>
 		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='vaii']/exponential"/>
 		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='vaii']/superscriptingExponent"/>
 		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='vaii']/perMille"/>
 		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='vaii']/infinity"/>
 		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/symbols[@numberSystem='vaii']/nan"/>
+		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='vaii']/rationalPattern"/>
+		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='vaii']/rationalUsage"/>
+		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='vaii']/integerAndRationalPattern"/>
+		<coverageLevel inLanguage="%vaiiNativeLanguages" value="modern" match="numbers/rationalFormats[@numberSystem='vaii']/integerAndRationalPattern[@alt='%anyAttribute']"/>
 
 		<!-- Moved compact decimal/currency formats for latn up with other base formats -->
 		<coverageLevel value="modern" match="numbers/currencyFormats[@numberSystem='latn']/currencyPatternAppendISO"/>
 
-		<!-- Make Beaufort modern for selected regions -->
-		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
-		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/displayName"/>
-		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/gender"/>
-		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/perUnitPattern"/>
-		<!-- Then make Beaufort explicitly  comprehensive for other regions -->
-		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
-		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute']"/>
-		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/displayName"/>
-		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/gender"/>
-		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/perUnitPattern"/>
-		<!-- Then handle other units -->
-
+		<!--  make English-specific units (%unitsEnglish) Modern for "en", otherwise Comprehensive -->
+		
+		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/unitPattern[@count='%anyAttribute']"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/displayName"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/gender"/>
 		<coverageLevel inLanguage="en" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/perUnitPattern"/>
-
-		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute'][@gender='%anyAttribute'][@case='%anyAttribute']"/>
-		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute'][@gender='%anyAttribute']"/>
-		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute'][@case='%anyAttribute']"/>
-		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute']"/>
+		
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/unitPattern[@count='%anyAttribute']"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/displayName"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/gender"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsEnglish']/perUnitPattern"/>
+		
+		<!--  make Japanese-specific units (%unitsJapanese) Modern for "ja" and "en", otherwise Comprehensive.  -->
+		
+		<coverageLevel inLanguage="(ja|en)" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
+		<coverageLevel inLanguage="(ja|en)" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/unitPattern[@count='%anyAttribute']"/>
+		<coverageLevel inLanguage="(ja|en)" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/displayName"/>
+		<coverageLevel inLanguage="(ja|en)" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/gender"/>
+		<coverageLevel inLanguage="(ja|en)" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/perUnitPattern"/>
+		
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/unitPattern[@count='%anyAttribute']"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/displayName"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/gender"/>
+		<coverageLevel value="comprehensive" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsJapanese']/perUnitPattern"/>
+		
+		<!-- Other Units, all locales -->
 
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%anyAttribute']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%anyAttribute']/unitPattern[@count='%anyAttribute']"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%anyAttribute']/displayName"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%anyAttribute']/gender"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='%anyAttribute']/perUnitPattern"/>
+		
+		<!-- Compound units (all locales) -->
+		
+		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute'][@gender='%anyAttribute'][@case='%anyAttribute']"/>
+		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute'][@gender='%anyAttribute']"/>
+		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute'][@case='%anyAttribute']"/>
+		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/compoundUnitPattern1[@count='%anyAttribute']"/>
 		<coverageLevel value="modern" match="units/unitLength[@type='%unitLengths']/compoundUnit[@type='%anyAttribute']/unitPrefixPattern"/>
 
+		
+		<!--  END Other Units -->
+
+		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='calendar'][@type='%calendarType80'][@scope='%A']"/>
 		<coverageLevel value="modern" match="localeDisplayNames/types/type[@key='calendar'][@type='%calendarType80']"/>
 
 		<coverageLevel value="modern" match="characterLabels/characterLabel[@type='%anyAttribute']"/>
diff --git a/make/data/cldr/common/supplemental/dayPeriods.xml b/make/data/cldr/common/supplemental/dayPeriods.xml
index a19e6779d87..256230d80b5 100644
--- a/make/data/cldr/common/supplemental/dayPeriods.xml
+++ b/make/data/cldr/common/supplemental/dayPeriods.xml
@@ -13,13 +13,13 @@
 			<dayPeriodRule type="am" from="00:00" before="12:00"/>	<!-- AM -->
 			<dayPeriodRule type="pm" from="12:00" before="24:00"/>	<!-- PM -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="en">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnight -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon -->
-			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night -->
+		<dayPeriodRules locales="en km">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnight/កណ្តាលអាធ្រាត្រ-->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon/ៃ​ត្រង -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning/ព្រឹក -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon/រសៀល -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening/ល្ងាច -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night/យប់ -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="af">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- middernag -->
@@ -52,13 +52,13 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- Abend -->
 			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- Nacht -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="da">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnat -->
-			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgen -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aften -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nat -->
+		<dayPeriodRules locales="da sv">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnat/midnatt -->
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgen/morgon -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag/förmiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag/eftermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aften/kväll -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nat/natt -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="nb nn no">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnatt -->
@@ -68,29 +68,21 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kveld -->
 			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- natt -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="sv">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnatt -->
-			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgon -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- förmiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kväll -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- natt -->
+		<dayPeriodRules locales="is it lt hy am">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- miðnætti/mezzanotte/vidurnaktis/կեսգիշեր/እኩለ ሌሊት -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- hádegi/mezzogiorno/vidurdienis/կեսօր/ቀትር -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morgunn/mattina/rytas/առավոտ/ጥዋት1 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftir hádegi/pomeriggio/diena/ցերեկ/ከሰዓት በኋላ -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kvöld/sera/vakaras/երեկո/ማታ -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nótt/notte/naktis/գիշեր/ሌሊት -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="is">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- miðnætti -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- hádegi -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morgunn -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftir hádegi -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kvöld -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nótt -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="pt">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- meia-noite -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- meio-dia -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- manhã -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- tarde -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- noite -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- madrugada -->
+		<dayPeriodRules locales="pt kgp yrl">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- meia-noite/kuty-si/pituna pyterupé -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- meio-dia/kurã-kuju/iandé-ara-pyturepé -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- manhã/kusãg ki/kuêma ramẽ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- tarde/rãkãnh kỹ/karuka ramẽ -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- noite/kuty kỹ/pituna ramẽ-->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- madrugada/kurã ge/pitunaeté ramẽ -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="gl">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- medianoite -->
@@ -122,14 +114,6 @@
 			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- vespre -->
 			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- nit -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="it">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- mezzanotte -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- mezzogiorno -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- mattina -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pomeriggio -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- sera -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- notte -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="lij">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- mëzaneutte -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- mëzogiorno -->
@@ -146,13 +130,13 @@
 			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- seară -->
 			<dayPeriodRule type="night1" from="22:00" before="05:00"/>	<!-- noapte -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="fr">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- minuit -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- midi -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- matin -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- après-midi -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- soir -->
-			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- nuit -->
+		<dayPeriodRules locales="fr scn uk">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- minuit//північ -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- midi//полудень -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- matin//ранок -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- après-midi//день -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- soir//вечір -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- nuit//ніч -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="ru">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- полночь -->
@@ -162,14 +146,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- вечер -->
 			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- ночь -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="uk">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- північ -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- полудень -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- ранок -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- день -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- вечір -->
-			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- ніч -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="bg">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- полунощ -->
 			<dayPeriodRule type="morning1" from="04:00" before="11:00"/>	<!-- сутринта -->
@@ -187,29 +163,21 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- навечер -->
 			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- по полноќ -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="sr">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- поноћ -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- подне -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- јутро -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- поподне -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- вече -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ноћ -->
+		<dayPeriodRules locales="sr kk ky mn">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- поноћ/түн жарымы/түн ортосу/шөнө дунд -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- подне/талтүс/чак түш/үд дунд -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- јутро/таң/эртең менен/өглөө -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- поподне/түстен кейін/түштөн кийин/өдөр -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- вече/кеш/кечкурун/орой -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ноћтүн/түншөнө -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="hr">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ponoć -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- podne -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popodne -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- večer -->
-			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="bs">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- u ponoć -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- podne -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- poslijepodne -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- veče -->
-			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
+		<dayPeriodRules locales="hr bs vi">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ponoć/u ponoć/nửa đêm -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- podne/podne/trưa -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro/jutro/sáng -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popodne/poslijepodne/chiều -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- večer/veče/tối -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć/noć/đêm -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="sl">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- polnoč -->
@@ -220,23 +188,14 @@
 			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- zvečer -->
 			<dayPeriodRule type="night1" from="22:00" before="06:00"/>	<!-- ponoči -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="cs">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- půlnoc -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- poledne -->
-			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
-			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoledne -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- odpoledne -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sk">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- polnoc -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- poludnie -->
-			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
-			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoludnie -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popoludnie -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
+		<dayPeriodRules locales="cs sk">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- půlnoc/polnoc -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- poledne/poludnie -->
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno/ráno -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoledne/dopoludnie -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- odpoledne/popoludnie -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer/večer -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc/noc -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="pl">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- północ -->
@@ -247,14 +206,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- wieczór -->
 			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- noc -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="lt">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- vidurnaktis -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- vidurdienis -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rytas -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- diena -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- vakaras -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- naktis -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="lv">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- pusnakts -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- pusdienlaiks -->
@@ -271,21 +222,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- شام -->
 			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- رات -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="hi">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- आधी रात -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- सुबह -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दोपहर -->
-			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- शाम -->
-			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- रात -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="hi_Latn"> <!-- Also needs noon defined since it inherits from en_IN -->
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- आधी रात -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- सुबह -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दोपहर -->
-			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- शाम -->
-			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- रात -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="bn ccp">
 			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- ভোর -->
 			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- সকাল -->
@@ -294,13 +230,21 @@
 			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- সন্ধ্যা -->
 			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- রাত্রি -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="gu">
+		<dayPeriodRules locales="gu hi kok kok_Latn">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- મધ્યરાત્રિ -->
 			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- સવાર -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- બપોર -->
 			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- સાંજ -->
 			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- રાત્રિ -->
 		</dayPeriodRules>
+		<dayPeriodRules locales="hi_Latn"> <!-- Also needs noon defined since it inherits from en_IN -->
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- आधी रात -->
+			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon -->
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- सुबह -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दोपहर -->
+			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- शाम -->
+			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- रात -->
+		</dayPeriodRules>
 		<dayPeriodRules locales="mr">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- मध्यरात्र -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- मध्यान्ह -->
@@ -351,14 +295,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- mbrëmje -->
 			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- natë -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="hy">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- կեսգիշեր -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- կեսօր -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- առավոտ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ցերեկ -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- երեկո -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- գիշեր -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="fa">
 			<dayPeriodRule type="morning1" from="01:00" before="04:00"/> <!-- بامداد -->
 			<dayPeriodRule type="morning2" from="04:00" before="12:00"/> <!-- صبح -->
@@ -366,7 +302,7 @@
 			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/> <!-- عصر -->
 			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- شب -->
 			<dayPeriodRule type="night2" from="00:00" before="01:00"/> <!-- نیمه‌شب -->
-        </dayPeriodRules>
+		</dayPeriodRules>
 		<dayPeriodRules locales="ta">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- நள்ளிரவு -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- நண்பகல் -->
@@ -378,12 +314,12 @@
 			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- அந்தி மாலை -->
 			<dayPeriodRule type="night1" from="21:00" before="03:00"/>	<!-- இரவு -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="te">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- అర్థరాత్రి -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ఉదయం -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- మధ్యాహ్నం -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- సాయంత్రం -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- రాత్రి -->
+		<dayPeriodRules locales="kn te">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ಮಧ್ಯರಾತ್ರಿ/అర్థరాత్రి -->
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ಬೆಳಗ್ಗೆ/ఉదయం -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ಮಧ್ಯಾಹ್ನ/మధ్యాహ్నం -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ಸಂಜೆ/సాయంత్రం -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ರಾತ್ರಿ/రాత్రి -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="ml">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- അർദ്ധരാത്രി -->
@@ -396,13 +332,6 @@
 			<dayPeriodRule type="evening2" from="18:00" before="19:00"/>	<!-- സന്ധ്യ -->
 			<dayPeriodRule type="night1" from="19:00" before="03:00"/>	<!-- രാത്രി -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="kn">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- ಮಧ್ಯರಾತ್ರಿ -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ಬೆಳಗ್ಗೆ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ಮಧ್ಯಾಹ್ನ -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ಸಂಜೆ -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ರಾತ್ರಿ -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="fi">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- keskiyö -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- keskipäivä -->
@@ -430,23 +359,14 @@
 			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- éjjel -->
 			<dayPeriodRule type="night2" from="04:00" before="06:00"/>	<!-- hajnal -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="zh">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 午夜 -->
-			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上 -->
-			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下午 -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 晚上 -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="yue">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 午夜 -->
-			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 清晨 -->
-			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 朝早 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下晝 -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 夜晚 -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
+		<dayPeriodRules locales="zh yue">
+			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 午夜/午夜 -->
+			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上/清晨 -->
+			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午/朝早 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午/中午 -->
+			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下午/下晝 -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 晚上/夜晚 -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨/凌晨 -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="ja">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- 真夜中 -->
@@ -536,22 +456,6 @@
 			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- axşam -->
 			<dayPeriodRule type="night2" from="00:00" before="04:00"/>	<!-- gecə -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="kk">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- түн жарымы -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- талтүс -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- таң -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түстен кейін -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кеш -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ky">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- түн ортосу -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- чак түш -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- эртең менен -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түштөн кийин -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кечкурун -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="uz">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- yarim kechasi -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- tush payti -->
@@ -578,30 +482,6 @@
 			<dayPeriodRule type="night1" from="22:00" before="03:00"/>	<!-- לילה -->
 			<dayPeriodRule type="night2" from="03:00" before="06:00"/>	<!-- לפנות בוקר -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="am">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- እኩለ ሌሊት -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- ቀትር -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ጥዋት1 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ከሰዓት በኋላ -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- ማታ -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- ሌሊት -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="vi">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- nửa đêm -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- trưa -->
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- sáng -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- chiều -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- tối -->
-			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- đêm -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="km">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- កណ្តាលអាធ្រាត្រ -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- ថ្ងៃ​ត្រង់ -->
-			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ព្រឹក -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- រសៀល -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ល្ងាច -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- យប់ -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="sw">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- saa sita za usiku -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- saa sita za mchana -->
@@ -635,14 +515,6 @@
 			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- iluntzea -->
 			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- gaua -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="mn">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- шөнө дунд -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- үд дунд -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- өглөө -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- өдөр -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- орой -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- шөнө -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="chr">
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- ᎢᎦ -->
 			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ᏌᎾᎴ -->
@@ -663,22 +535,6 @@
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- afternoon -->
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- evening -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="kgp">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- kuty-si -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- kurã-kuju -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- kusãg ki -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- rãkãnh kỹ -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- kuty kỹ -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- kurã ge -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="yrl">
-			<dayPeriodRule type="midnight" at="00:00"/>	<!-- pituna pyterupé -->
-			<dayPeriodRule type="noon" at="12:00"/>	<!-- iandé-ara-pyturepé -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- kuêma ramẽ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- karuka ramẽ -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- pituna ramẽ -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- pitunaeté ramẽ -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="blo">
 			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- gajanɩ -->
 			<dayPeriodRule type="morning1" from="04:00" before="07:00"/>	<!-- asʊbaa -->
@@ -693,11 +549,11 @@
 			<dayPeriodRule type="am" from="00:00" before="12:00"/>	<!-- AM -->
 			<dayPeriodRule type="pm" from="12:00" before="24:00"/>	<!-- PM -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="en">
-			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night -->
+		<dayPeriodRules locales="en km">
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning/ព្រឹក -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon/រសៀល -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening/ល្ងាច -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night/យប់ -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="af">
 			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- oggend -->
@@ -705,12 +561,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aand -->
 			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nag -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="nl">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ochtend -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- middag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- avond -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nacht -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="gsw">
 			<dayPeriodRule type="midnight" at="00:00"/>			<!-- Mitternacht -->
 			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- Morge -->
@@ -727,12 +577,12 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- Abend -->
 			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- Nacht -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="da">
-			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgen -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aften -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nat -->
+		<dayPeriodRules locales="da sv">
+			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgen/morgon -->
+			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- formiddag/förmiddag -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag/eftermiddag -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- aften/kväll -->
+			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- nat/natt -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="nb nn no">
 			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- morgen -->
@@ -741,24 +591,17 @@
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kveld -->
 			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- natt -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="sv">
-			<dayPeriodRule type="morning1" from="05:00" before="10:00"/>	<!-- morgon -->
-			<dayPeriodRule type="morning2" from="10:00" before="12:00"/>	<!-- förmiddag -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftermiddag -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kväll -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- natt -->
+		<dayPeriodRules locales="nl is it lt hy am">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ochtend/morgunn/mattin/rytas/առավոտ/ጥዋት1 -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- middag/eftir hádegi/pomeriggio/diena/ցերեկ/ከሰዓት በኋላ -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- avond/kvöld/sera/vakaras/երեկո/ማታ -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nacht/nótt/notte/naktis/գիշեր/ሌሊት -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="is">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morgunn -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- eftir hádegi -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- kvöld -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- nótt -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="pt">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- manhã -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- tarde -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- noite -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- madrugada -->
+		<dayPeriodRules locales="pt kgp yrl">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- manhã/kusãg ki/kuêma ramẽ -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- tarde/rãkãnh kỹ/karuka ramẽ -->
+			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- noite/kuty kỹ/pituna ramẽ -->
+			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- madrugadakurã ge/pitunaeté ramẽ -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="gl">
 			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- madrugada -->
@@ -786,12 +629,6 @@
 			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- vespre -->
 			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- nit -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="it">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- mattina -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pomeriggio -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- sera -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- notte -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="lij">
 			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- mattin -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- depoidisnâ -->
@@ -804,29 +641,23 @@
 			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- seară -->
 			<dayPeriodRule type="night1" from="22:00" before="05:00"/>	<!-- noapte -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="fr">
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- matin -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- après-midi -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- soir -->
-			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- nuit -->
+		<dayPeriodRules locales="fr scn uk">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- matin//ранок -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- après-midi//день -->
+			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- soir//вечір -->
+			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- nuit//ніч -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="hr">
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popodne -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- večer -->
-			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
+		<dayPeriodRules locales="hr bs vi">
+			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro/jutro/sáng -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popodne/poslijepodne/chiều -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- večer/veče/tối -->
+			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć/noć/đêm -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="bs">
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- jutro -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- poslijepodne -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- veče -->
-			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- noć -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sr">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- јутро -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- поподне -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- вече -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ноћ -->
+		<dayPeriodRules locales="sr kk ky mn kn te">
+			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- јутро/таң/эртең менен/өглөө/ಬೆಳಗ್ಗೆ/ఉదయం -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- поподне/түстен кейін/түштөн кийин/өдөр/ಮಧ್ಯಾಹ್ನ/మధ్యాహ్నం -->
+			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- вече/кеш/кечкурун/орой/ಸಂಜೆ/సాయంత్రం -->
+			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ноћ/түн/түн/шөнө/ರಾತ್ರಿ/రాత్రి -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="sl">
 			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- zjutraj -->
@@ -835,19 +666,12 @@
 			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- zvečer -->
 			<dayPeriodRule type="night1" from="22:00" before="06:00"/>	<!-- ponoči -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="cs">
-			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
-			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoledne -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- odpoledne -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="sk">
-			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno -->
-			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoludnie -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- popoludnie -->
-			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer -->
-			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc -->
+		<dayPeriodRules locales="cs sk">
+			<dayPeriodRule type="morning1" from="04:00" before="09:00"/>	<!-- ráno/ráno -->
+			<dayPeriodRule type="morning2" from="09:00" before="12:00"/>	<!-- dopoledne/dopoludnie -->
+			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- odpoledne/popoludnie -->
+			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- večer/večer -->
+			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- noc/noc -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="pl">
 			<dayPeriodRule type="morning1" from="06:00" before="10:00"/>	<!-- rano -->
@@ -876,18 +700,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="22:00"/>	<!-- вечер -->
 			<dayPeriodRule type="night1" from="22:00" before="04:00"/>	<!-- ночь -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="uk">
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- ранок -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- день -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- вечір -->
-			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- ніч -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="lt">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rytas -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- diena -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- vakaras -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- naktis -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="lv">
 			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- rīts -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- pēcpusdiena -->
@@ -908,12 +720,6 @@
 			<dayPeriodRule type="night1" from="19:00" before="24:00"/> <!-- شب -->
 			<dayPeriodRule type="night2" from="00:00" before="01:00"/> <!-- نیمه‌شب -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="hy">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- առավոտ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ցերեկ -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- երեկո -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- գիշեր -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="ka">
 			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- დილა -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ნაშუადღევი -->
@@ -934,12 +740,6 @@
 			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- شام -->
 			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- رات -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="hi">
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- सुबह -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- दोपहर -->
-			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- शाम -->
-			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- रात -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="bn ccp">
 			<dayPeriodRule type="morning1" from="04:00" before="06:00"/>	<!-- ভোর -->
 			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- সকাল -->
@@ -948,7 +748,7 @@
 			<dayPeriodRule type="evening1" from="18:00" before="20:00"/>	<!-- সন্ধ্যা -->
 			<dayPeriodRule type="night1" from="20:00" before="04:00"/>	<!-- রাত্রি -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="gu">
+		<dayPeriodRules locales="gu hi hi_Latn kok kok_Latn">
 			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- સવાર -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- બપોર -->
 			<dayPeriodRule type="evening1" from="16:00" before="20:00"/>	<!-- સાંજ -->
@@ -991,12 +791,6 @@
 			<dayPeriodRule type="evening2" from="18:00" before="21:00"/>	<!-- அந்தி மாலை -->
 			<dayPeriodRule type="night1" from="21:00" before="03:00"/>	<!-- இரவு -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="te">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ఉదయం -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- మధ్యాహ్నం -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- సాయంత్రం -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- రాత్రి -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="ml">
 			<dayPeriodRule type="morning1" from="03:00" before="06:00"/>	<!-- പുലർച്ചെ -->
 			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- രാവിലെ -->
@@ -1006,21 +800,7 @@
 			<dayPeriodRule type="evening2" from="18:00" before="19:00"/>	<!-- സന്ധ്യ -->
 			<dayPeriodRule type="night1" from="19:00" before="03:00"/>	<!-- രാത്രി -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="kn">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ಬೆಳಗ್ಗೆ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ಮಧ್ಯಾಹ್ನ -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ಸಂಜೆ -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- ರಾತ್ರಿ -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="zh">
-			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上 -->
-			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
-			<dayPeriodRule type="afternoon2" from="13:00" before="19:00"/>	<!-- 下午 -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- 晚上 -->
-			<dayPeriodRule type="night1" from="00:00" before="05:00"/>	<!-- 凌晨 -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="yue">
+		<dayPeriodRules locales="zh yue">
 			<dayPeriodRule type="morning1" from="05:00" before="08:00"/>	<!-- 早上 -->
 			<dayPeriodRule type="morning2" from="08:00" before="12:00"/>	<!-- 上午 -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="13:00"/>	<!-- 中午 -->
@@ -1058,18 +838,6 @@
 			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- axşam -->
 			<dayPeriodRule type="night2" from="00:00" before="04:00"/>	<!-- gecə -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="kk">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- таң -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түстен кейін -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кеш -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="ky">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- эртең менен -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- түштөн кийин -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- кечкурун -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- түн -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="uz">
 			<dayPeriodRule type="morning1" from="06:00" before="11:00"/>	<!-- ertalab -->
 			<dayPeriodRule type="afternoon1" from="11:00" before="18:00"/>	<!-- kunduzi -->
@@ -1148,18 +916,6 @@
 			<dayPeriodRule type="evening1" from="16:00" before="18:00"/>	<!-- hapon -->
 			<dayPeriodRule type="night1" from="18:00" before="24:00"/>	<!-- gabi -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="vi">
-			<dayPeriodRule type="morning1" from="04:00" before="12:00"/>	<!-- sáng -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- chiều -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- tối -->
-			<dayPeriodRule type="night1" from="21:00" before="04:00"/>	<!-- đêm -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="km">
-			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- ព្រឹក -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- រសៀល -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- ល្ងាច -->
-			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- យប់ -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="sw">
 			<dayPeriodRule type="morning1" from="04:00" before="07:00"/>	<!-- alfajiri -->
 			<dayPeriodRule type="morning2" from="07:00" before="12:00"/>	<!-- asubuhi -->
@@ -1174,12 +930,6 @@
 			<dayPeriodRule type="evening1" from="13:00" before="19:00"/>	<!-- ebusuku1 -->
 			<dayPeriodRule type="night1" from="19:00" before="24:00"/>	<!-- ebusuku -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="am">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- ጥዋት1 -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- ከሰዓት በኋላ -->
-			<dayPeriodRule type="evening1" from="18:00" before="24:00"/>	<!-- ማታ -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- ሌሊት -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="eu">
 			<dayPeriodRule type="morning1" from="00:00" before="06:00"/>	<!-- goizaldea -->
 			<dayPeriodRule type="morning2" from="06:00" before="12:00"/>	<!-- goiza -->
@@ -1188,12 +938,6 @@
 			<dayPeriodRule type="evening1" from="19:00" before="21:00"/>	<!-- iluntzea -->
 			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- gaua -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="mn">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- өглөө -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- өдөр -->
-			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- орой -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- шөнө -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="my">
 			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- နံနက် -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="16:00"/>	<!-- နေ့လည် -->
@@ -1217,18 +961,6 @@
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/> <!-- afternoon -->
 			<dayPeriodRule type="evening1" from="18:00" before="24:00"/> <!-- evening -->
 		</dayPeriodRules>
-		<dayPeriodRules locales="kgp">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- kusãg ki -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- rãkãnh kỹ -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- kuty kỹ -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- kurã ge -->
-		</dayPeriodRules>
-		<dayPeriodRules locales="yrl">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- kuêma ramẽ -->
-			<dayPeriodRule type="afternoon1" from="12:00" before="19:00"/>	<!-- karuka ramẽ -->
-			<dayPeriodRule type="evening1" from="19:00" before="24:00"/>	<!-- pituna ramẽ -->
-			<dayPeriodRule type="night1" from="00:00" before="06:00"/>	<!-- pitunaeté ramẽ -->
-		</dayPeriodRules>
 		<dayPeriodRules locales="blo">
 			<dayPeriodRule type="night1" from="00:00" before="04:00"/>	<!-- gajanɩ -->
 			<dayPeriodRule type="morning1" from="04:00" before="07:00"/>	<!-- asʊbaa -->
diff --git a/make/data/cldr/common/supplemental/languageGroup.xml b/make/data/cldr/common/supplemental/languageGroup.xml
index d3d4a89e290..c6d165124a3 100644
--- a/make/data/cldr/common/supplemental/languageGroup.xml
+++ b/make/data/cldr/common/supplemental/languageGroup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -8,117 +8,119 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <supplementalData>
 	<version number="$Revision$"/>
 	<languageGroups>
-		<languageGroup parent="aav">bbh bfw bru brv hre irr kdt ktv kuf mkh mmj mun ncq ngt nyl oog pac phg ply sct sss tth tto zng</languageGroup>
-		<languageGroup parent="afa">aal ber btf bvw bxe cdc ckq cus egx glo hdy hig hwo jaf kbz kul kvj mes mlw mmf omv sem tdk tsh ttr xdm</languageGroup>
-		<languageGroup parent="alg">aaq abe alq arp ats bla chy ciw cr crr del dep etc kic mez mia mic mjy moe nnt oj ojb ojc ojs ojw otw pim pot pqm psy qyp sac sjw unm wam xlb xlo xnt xpq</languageGroup>
-		<languageGroup parent="alv">aaa aab aba abi abm abn abo abr abu acd acp ada ade adj adq adu afn afu agb agc agq aha ahl ahp aik aiy ajg ak akd akf akp aku ala anf ann anv anw any aqd aqk asg asj ass ati ato aug avi avn awc ayb ayg ayi ayu azo bab bad bai bax bba bbk bbp bbs bcb bce bcg bci bcn bcs bcv bcz bda bdj bdt bec beh bes bfd bfl bfo bga bgf bgj bgo bgu bif bim bin biv bjg bjt bju bkc bkm ble blo bly bmd bme bmf bmq bnt bnz boe bok bom bov box bqa bqj brm brt bsc bse bsp bsx btc bud buy buz bvi bvj bwh bwj bwu bwy byb byc byf byj bzv bzw bzz cae cbj cbo cbq ccg cch ccj cfd cib cko cli cll cou cpn cry cwt dag dai dam dbg dbi dbt dbu dbv dbw dds deg deq dga dgb dgd dgi dir djm dmb dmm doh doo dop doy dtk dtm dto dts dtu dur duz dya dyi dym dyo dza ebg ebr ee efa efi ega ego ehu eja eka eke eki ekp ekr elm ema emn enn env enw eot epi erh esm etb ets etu etx evh eza eze fah fak fal fam fap fer ff ffm fir fll fni fod fon fub fue fuf fuh fui fuj fum fuq fuv gaa gba gbg gbh gbp gbq gbr gbs gbx gby gdi ged gej gel geq gix gjn gke gkn glc gmd gmm gmz gnh gnz gol gox goy grh gsl gso gur guw gux gvm gwa gwx gye gyg hag hhr hoe ibb ibe ibm ibn ibr ich idc ide idr ids idu ig igb igl ihi ijo iki ikk iko ikw ilv iqw ish isi iso isu itm its itw izr izz jab jer jid jmr jms jni juh juk juo juw kaj kbp kcc kcg kcj kcq kdh kdm kdx kdz kef ken kes keu kez kfl kfn kgt khj kia kid kkm kku klc klk klo kma kmi kmy knf knp kou kov kow kph kpk kpl kpo kqg kqk kqm kqs krh kro krp krx kss kub kvm kxb kye kza kzc kzr lan lar las ldg ldh ldm ldq lee lef lgq lia lip lma lmp lns lob lof lro luq mae mbv mcj mcs mcu mdd mea mfc mfd mff mfn mfq mfv mgj mgn mgo mhk mij mkl mko mlo moj mor mos mql mru msj msw mtk mua muc muo mxl myg myj myk mzk mzm mzv mzw naj nat naw nbm nbo nbp nbr nbv nbw ncr ncu ndd ndi ndr ndt ndv ndz ned nfr nfu nga ngb nge ngg nhu nie nin njr nko nkq nku nkz nlu nmj nmr nmz nnu nnw noy nqk nsc nti ntm nuh nup nuv nyb nza nzi nzz obu oda odu ofu ogb ogc ogg ogo ogu okb oke oku opa orx otr pbl pbo pbp pcn pil pmb png pnl pnq pny pnz pug pwb pym res ruy saf sav scv sde sef sev sfw sha shw shz sig sil snf snj snw soy spp sqm srr ssl swf sxw tbm tbz tcd tde tdl tem tfi tgw tgy thy tik tiq tiv tkq tnr toz tsp tsw ttb tug tui tuz tvd twn uda uiv ukq ukw ula umm urh usk uta uth utr uya vag vit vkn vor vut wbf wci wem wib wlx wo wof wom wrn wss wwa www xab xkb xoc xrb xsm xsn xwe xwl yam yav yay yaz yba ybj ybl yer yky yng ynq yo zna</languageGroup>
+		<languageGroup parent="aav">bbh bru brv hre irr kdt ktv kuf mkh mmj mun ncq ngt nyl oog pac phg ply sct sss tth tto zng</languageGroup>
+		<languageGroup parent="afa">ber cdc cus egx omv sem</languageGroup>
+		<languageGroup parent="alg">aaq abe alq arp ats bla chy ciw cr crr del etc kic mez mia mic mjy moe nnt oj ojb ojc ojs ojw otw pim pot pqm psy qyp sac sjw tqw unm wam xnt xpq</languageGroup>
+		<languageGroup parent="alv">aaa aab aba abi abm abn abo abr abu acd acp ada ade adj adq adu afe afn afu agb agc agq aha ahl ahp aik aiy ajg ak akd akf akp aku ala alf anf ann anv anw any aqd aqk asg asj ass ati ato aug avi avn awc ayb ayg ayi ayu azo bab bad bai bax bba bbk bbp bbs bcb bce bcg bci bcn bcs bcv bcz bda bdj bdt bec beh bes bfd bfl bfo bga bgf bgj bgo bgu bif bim bin biv bjg bjt bju bkc bkm bkv bky ble blo bly bmd bme bmf bmq bnt bnz boe bok bom bov box bqa bqj brm brt bsc bse bsp bsx btc btt bud buy buz bvi bvj bwh bwj bwu bwy byb byc byf byj bzv bzw bzy bzz cae cbj cbo cbq ccg cch ccj cfd cib cko cli cll cou cpn cry cwt dag dai dam dbg dbi dbt dbu dbv dbw dds deg deq dga dgb dgd dgi dir djm dmb dmm doh doo dop doy dtk dtm dto dts dtu dur duz dya dyi dym dyo dza ebg ebr ee efa efi ega ego ehu eja eka eke eki ekp ekr elm ema emn enn env enw eot epi erh esm etb ets etu etx evh eza eze fah fak fal fam fap fer ff ffm fir fll fni fod fon fub fue fuh fui fuj fum fuq fuv gaa gba gbg gbh gbp gbq gbr gbs gbx gby gdi ged gej gel geq gix gjn gke gkn glc gmd gmm gmz gnh gnz gol gox goy grh gsl gso gur guw gux gvm gwa gwx gye gyg hag hhr hoe ibb ibe ibm ibn ibr ich idc ide idr ids idu ig igb igl ihi ijo iki ikk iko ikw ilv iqw ish isi iso isu itm its itw izr izz jab jer jid jmr jms jni juh juk juo juw kaj kbp kcc kcg kcj kcq kdh kdm kdx kdz kef ken kes keu kez kfl kfn kgt khj kia kid kkm kku klc klk klo kma kmi kmy knf knp kou kov kow kph kpk kpl kpo kqg kqk kqm kqs krh kro krp krx kss kub kvm kxb kye kza kzc kzr lan lar las ldg ldh ldm ldq lee lef lgq lia lip lma lmp lns lob lof lro luq mae mbv mcj mcs mcu mdd mea mfc mfd mff mfn mfq mfv mgj mgn mgo mhk mij mkl mko mlo moj mor mos mql mru msj msw mtk mua muc muo mxl myg myj myk mzk mzm mzv mzw naj nat naw nbm nbo nbp nbr nbv nbw ncr ncu ndd ndi ndr ndt ndv ndz ned nfr nfu nga ngb nge ngg nhu nie nin njr nko nkq nku nkz nlu nmj nmr nmz nnu nnw noy nqk nsc nti ntm nuh nup nuv nyb nza nzi nzz obu oda odu ofu ogb ogc ogg ogo ogu okb oke oku opa orx otr pbl pbo pbp pcn pil pmb png pnl pnq pny pnz pug pwb pym res ruy saf sav scv sde sef sev sfw sha shw shz sig sil snf snj snw soy spp sqm srr ssl swf sxw tbm tbz tcd tde tdl tem tfi tgw tgy thy tik tiq tiv tkq tnr toz tsp tsw ttb tug tui tuz tvd twn uba uda uiv ukp ukq ukw ula umm urh usk uta uth utr uya vag vit vkn vor vut wbf wci wem wib wlx wo wof wom wrn wss wwa www xab xkb xoc xrb xsm xsn xwe xwl yam yav yay yaz yba ybj ybl yer yky yng ynq yo zna znd</languageGroup>
 		<languageGroup parent="apa">apj apk apl apm apw nv</languageGroup>
 		<languageGroup parent="aqa">alc</languageGroup>
 		<languageGroup parent="aql">alg wiy yur</languageGroup>
 		<languageGroup parent="art">afh avk bzt dws eo ia ie igs io isv jbo ldn lfn neu nov qya rmv sjn tlh tok tzl vo zba zbl</languageGroup>
 		<languageGroup parent="ath">aht apa bcr bea caf chp clc coq crx den dgr gce gwi haa hup ing kkz koy ktw kuu mvb qwt scs sek srs taa tau tcb tce tfn tgx tht tol ttm tuu txc wlk xup</languageGroup>
 		<languageGroup parent="auf">aru cul dny jaa pad swx</languageGroup>
-		<languageGroup parent="aus">adg adt aea aer aid alh aly amx amy amz ant ard are avm awg awk axe axl ayd bck bdy bia bjb bjy bpt bxi bxj bxn bym bzr dax dda ddj ddr dhg dhl dhr dhu dhx dif dja djb djd djf dji djr dmd dmw drl dth dwu dwy dyn dyy dze eaa fln gbb gbd gbu gbw gdc gdh gdj gdt ggd gia gih gjm gko gll gmr gni gnl gnn gnr gtu gue guf gvn gvy gwm gwu gyf gyy hrp iin ikr jan jao jay jbi jig jui kba kbe kdd kgl kgs kjn kkp kky kld ktd ktg kux kuy lby lja ljw lkm lku llj lnj lnw mem mep mpj mvl mwf mwp nam nay nbj ngk nha nhf nji nju nly nmv nnr nrk nrl ntg ntj nwg nwo nxn nys nyt nyx okg olk pit piu pjt pkn pmd pnj pnv pnw pti rbp rit rkw rnr rrt rsm rxd rxw tbh tgz thd tjp tju tjw typ ugb uky umd umg ump urf uwa vka vku vma vmb vml vmu wbp wbt wbv wdj wdk wdu wdy wga wgg wgu wgy wie wig wih wij wik wim wkw wky wmb wmi wmt wnm wnn wrb wrg wrh wri wrl wrm wrw wth wua wyb wyi xbb xbe xbg xbp xby xda xdk xgd xgi xgm xgw xjb xmh xmp xmy xni xnk xnu xny xpa xpj xpt xrd xrg xth xul xut xwd xwj xwk xwt xww xya xyb xyj xyk xyt xyy yda yga ygi yia yii yij yil ylr ynd yrm yry yty yub ywg yww yxg yxl zku zmc zmk zmu zmv</languageGroup>
-		<languageGroup parent="awd">aca ame aox apu arw avo bae brg bvv bwi cab cbb ccc cjo cni cot cox cpc crb cuj gae gqn guc ign inp kav kpc mcb mht mmh mpd mpw mzx not pab pbg pib pio plu pnk rgr sar tae ter tnq trn unk wap wau xir yaw ycn yvt</languageGroup>
+		<languageGroup parent="aus">adt aea aid ajn alh amg amy amz ant aoi ard avm awg awk axl ayd bcj bck bdy bia bjb bjy bpt bxi bxj bxn bym bzr dax dda ddr dgn dhg dhl dhr dhu dhx dif dja djb djd djf dji djn djr djw dmd dmw drl dth dwu dwy dyb dyd dyn dyy dze eaa err fln gbb gbd gbu gbw gdc gdh gdj gdt ggd ggk gia gih gjm gko gll gma gmr gni gnl gnn gnr gtu guf gup gvn gvy gwm gwu gww gyf gyy hrp ibd iin ikr ilg jan jao jay jbi jbw jig jng jui kba kbe kdd kgl kgs kjn kkp kky kld ktd ktg kux kuy lby lja ljw lkm lku llj lmc lnj lnw mem mep mfr mhg mph mpj mvl mwf mwp nam nay ngk nha nhf nig nji nju nly nmp nmv nnr nrk nrl ntg ntj nuy nwg nwo nxn nyh nys nyt nyv nyx okg olk pit piu pjt pkn pmd pnj pnv pnw pti rbp rit rkw rmb rnr rrt rsm rxd rxw tbh tgz thd tiw tjp tju tjw typ ugb uky umd umg ump ung urc urf uwa vka vku vma vmb vmi vml vmu wbt wbv wdj wdk wdu wdy wga wgg wgu wgy wie wig wih wij wik wil wim wkw wky wlg wmb wmi wmt wnm wnn wny wrb wrg wrh wri wrk wrm wro wrr wrw wrz wth wua wub wux wwr wyb wyi xbb xbe xbg xbp xda xdk xgd xgi xgm xgw xjb xmh xmp xmu xmy xni xnk xnu xny xpa xpj xpt xpz xrd xrg xru xth xul xut xwd xwj xwk xwt xww xya xyb xyj xyk xyt xyy yda yga ygi yia yii yij yil ylr ynd yrm yry yty yub ywg ywr yww yxg yxl zku zma zmc zmd zme zmg zmj zmk zml zmm zmt zmu zmv zmy</languageGroup>
+		<languageGroup parent="awd">aca ame aox apu arw auf avo bae brg bvv bwi cab caj cbb ccc cjo cni cot cox cpc crb cuj gae gqn guc ign inp kav kpc mcb mht mmh mpd mpw mzx not pab pbg pib pio plu pnk rgr sar tae ter tnq trn unk wap wau xir yaw ycn yvt</languageGroup>
 		<languageGroup parent="azc">chl cok com crn cup hch hop lui mfy mnr nah ncx nhi npl ntp ood opt pao par pia ser shh stp tac tar tbu tcu tep thh tla tub twr ute var xaw xgf xpo yaq</languageGroup>
 		<languageGroup parent="bad">bjo kuw lna lnl mnh nue tor</languageGroup>
 		<languageGroup parent="bai">bbj bko byv fmp jgo nla nnh nnz nwe xmg ybb</languageGroup>
-		<languageGroup parent="bat">lsl lt ltg lv olt prg sgs svx sxl xcu xgl xsv xzm</languageGroup>
-		<languageGroup parent="ber">auj cnu gha gho gnc grr jbe jbn kab mzb nxm oua rif sds shi shy siz sjs swn taq tez thv thz tia tjo tmh tzm zen zgh</languageGroup>
-		<languageGroup parent="bnt">abb agh asa auh axk baf bag bas bau bbg bbi bbm bbu bbx bdp beb bem beq bez bip biw biz bja bkf bkh bkj bkw bli blv bmb bmg bml bmv bmw bng bni bnm bnx boh bou boy bpj bqm bqu bqz brf bri brl bsi bss buf bui bum buu bvb bvx bwc bwg bwl bwt bww bwz bxg bxp byi bzm cce ccl cgg chw cjk coh cuh cwa cwb cwe dav dbm dbo dde dez dhm dhs dig dii diu diz dma dmx dne doe dov dua dug dzn ebo ebu ekm eko eto ewo fip flr fng fom fwe gev gey gmx gog gua guz gwb gwe gwr gyi haq hav hay hba heh hem hij hka hke hng hol hoo hz ifm ikz ilb isn iyx jgk jit jjr jku jmc job kam kbj kbs kck kcu kcv kcz kdc kde kdn keb ked kel kg khu khx khy ki kiv kiz kki kkj kkw kmb kme kmw kny koo koq kqn ksb ksf ksv ktf ktu kty kuj kwm kwn kws kwu kwy kzn kzo kzy lag lai lch ldi lea lel leo lfa lg lgm lie lik lke llb lli ln lnb lnz lol lon loo loq loz lse lsm lu lua lue luj lum lun lup luy lwa lyn mbo mck mcp mcx mdp mdq mdt mdw mer mfo mfu mgg mgh mgq mgr mgs mgv mgw mgy mgz mhb mhd mhm mho mhw mjh mkk mkw mlk mma mmu mmz mny mow mpa mvw mwe mwn mws mwz mxc mxg mxo myc mye myx mzd nba nd ndc ndh ndj ndk ndq ndw ngc ngl ngp ngv nih nim njd njx njy nka nkn nkt nkv nle nlj nmg nmq nnb nne nnq noq now nql nr nra nse nso nsx nte ntk nto nui nuj nvo nxi nxo ny nyc nye nyf nyg nyj nyk nym nyn nyo nyr nyu nyy nzb nzd nzu okc old olu ozm pae pbr pem phm pic piw pkb pnd pof poy ppp puu rag rim rn rnd rng rnw rof rub ruc ruf rui rw rwk rwm sak sbk sbm sbp sbs sdj seg seh sgm shc shq shr sie skt slx smx sn sng snq soc soo sop sox soz ss ssc st sub suj suk suw sw swj swk sxb sxe syi szv tap tbt tck teg tek tga thk tke tlj tll tmv tn tny tog toh toi ts tsc tsv ttf ttj tum tvs tvu twl two twx tyi tyx ukh umb vau ve vid vif vin vmk vmr vmw vum vun wbh wbi wdd wlc wmw wni won wum wun xdo xh xku xkv xma xmb xmc xog xsq yaf yao yat yax yel yey yko ymg ymk yns yom zaj zdj zga zin ziw zmf zms zmw zmx zu</languageGroup>
+		<languageGroup parent="bat">lt ltg lv olt prg sgs svx sxl xcu xgl xsv xzm</languageGroup>
+		<languageGroup parent="ber">auj cnu gha gho gnc grr jbe jbn kab mzb nxm oua rif sds shi shy siz sjs swn taq tez thz tia tjo tmh zen zgh</languageGroup>
+		<languageGroup parent="bnt">abb agh asa auh axk baf bag bas bau bbg bbi bbm bbu bbx bdp beb bem beq bez bip biw biz bja bkf bkh bkj bkt bkw bli blv bmb bmg bml bmv bmw bng bni bnm bnx boh bou boy bpj bqm bqu bqz brf bri brl bsi bss buf bui bum buu bvb bvx bwc bwg bwl bwt bww bwz bxg bxp byi bzm cce ccl cgg chw cjk coh cuh cwa cwb cwe dav dbm dbo dde dez dhm dhs dig dii diu diz dma dmx dne doe dov dua dug dzn ebo ebu ekm eko eto fip flr fng fom fwe gev gey gmx gog gua guz gwb gwe gwr gyi haq hav hay hba heh hem hij hka hke hng hol hoo hz ifm ikz ilb isn iyx jgk jit jjr jku jmc job kam kbj kbs kck kcu kcv kcw kcz kdc kde kdn keb ked kel kg khu khx khy ki kiv kiz kki kkj kkw kmb kme kmw kny koo koq kqn ksb ksf ksv ktf ktu kty kuj kwm kwn kws kwu kwy kzn kzo kzy lag lai lch ldi lea lel lem leo lfa lg lgm lgz lie lik lke llb lli ln lnb lnz lol lon loo loq loz lse lsm lu lua lue luj lum lun lup luy lwa lwg lyn mbo mck mcp mcx mdp mdq mdt mdw mer mfo mfu mgg mgh mgq mgr mgs mgv mgw mgy mgz mhb mhd mhm mho mhw mjh mkk mkw mlk mma mmu mmz mny mow mpa mvw mwe mwn mws mwz mxc mxg mxo myc mye myx mzd nba nbd nd ndc ndh ndj ndk ndq ndw ngc ngl ngp ngv nih nim njd njx njy nka nkn nkt nkv nle nlj nmg nmq nnb nne nnq noq now nql nr nra nse nso nsx ntk nto nui nuj nvo nxi nxo ny nyc nye nyf nyg nyj nyk nym nyn nyo nyr nyu nyy nzb nzd nzu okc old olu ozm pae pbr pem phm pic piw pkb pnd pof poy ppp puu rag rim rnd rng rnw rof rub ruc ruf rui rwk rwm sak sbk sbm sbp sbs sdj seg seh sgm shc shq shr sie skt slx smx sn sng snq soc soo sop sox soz ss ssc st sub suj suk suw sw swj swk sxb sxe syi szv tap tbt tck teg tek tga thk tke tlj tll tmv tn tny tog toh toi ts tsc tsv ttf ttj tum tvs tvu twl two twx tyi tyx ukh umb vau ve vid vif vin vmk vmr vmw vum vun wbh wbi wdd wlc wmw wni won wum wun xdo xh xku xkv xma xmb xmc xnj xnq xog xsq yaf yao yas yat yax yel yey yko ymg ymk yns yom zaj zga zin ziw zmf zms zmw zmx zu</languageGroup>
 		<languageGroup parent="btk">akb bbc btd btm bts btx btz</languageGroup>
+		<languageGroup parent="cai">jic myn omq</languageGroup>
 		<languageGroup parent="cau">agx akv ani aqc av bbl bdk bph ccn ccs ce cji dar ddo gdo gin huz inh kap khv kjj kpt kry kva lbe lez rut tab tin tkr udi ugh xag xdq</languageGroup>
 		<languageGroup parent="cba">arh brn bzd cbg chb cjp cuk gut gym kog kvn mbp mot pay rma sab tbn tfr tnb tnd</languageGroup>
 		<languageGroup parent="ccn">ab abq ady kbd uby</languageGroup>
 		<languageGroup parent="ccs">jge ka lzz oge sva xmf</languageGroup>
-		<languageGroup parent="cdc">ajw anc ank bcw bcy bde bdm bdn bid bol bta bvf bvh bwr bxq ckl cky cla daa dbb dbq dot dwa dzd fie fkk fli gab gde gdk gdu gea gek gew gid gis giz glw gnd gqa grd gwn gyz ha hed hia hna jeu jie jim jmb jmi juu kai kcs ker kil kna kof kot kpa kqx kso ksq kuh kvf kvi kwl ldd lln lme maf mcn mcw mew mfl mif mkf mlj mmy moz mpg mpi mpk mqb mse msv mug muj muy mxf mxu nbh ndm ngi ngw ngx nja nnc nnn nqt pbi pip piy pqa saa say scw sir sok sor sur swq swy tak tan tax tmc trj ubi udl xed xmj zah zaz zbu zim ziz zns zrn zuy</languageGroup>
+		<languageGroup parent="cdc">aal ajw anc ank bcw bcy bde bdm bdn bid bol bta btf bvf bvh bvw bwr bxq ckl ckq cky cla cxh daa dbb dbq dot dwa dzd fie fkk fli gab gde gdk gdu gea gek gew gid gis giz glo glw gnd gqa grd gwn gyz ha hed hia hig hna hwo jaf jeu jie jim jmb jmi juu kai kbz kcs ker kil kna kof kot kpa kqx kso ksq kuh kul kvf kvi kvj kwl ldd lln lme maf mcn mcw mes mew mfl mif mkf mlj mlw mmf mmy moz mpg mpi mpk mqb mse msv mug muj muy mxf mxu nbh ndm ngi ngw ngx nja nnc nnn nqt pbi pip piy pqa saa say scw sir sok sor sur swq swy tak tan tax tdk tmc trj tsh ttr ubi udl xed xmj zah zaz zbu zim ziz zns zrn zuy</languageGroup>
 		<languageGroup parent="cdd">ari cad kii paw wic</languageGroup>
-		<languageGroup parent="cel">br cnx cy ga gd ghc gv kw nrc oco owl pgl sth wlm xcb xce xga xlp xpi</languageGroup>
+		<languageGroup parent="cel">br cnx cy ga gd ghc gv kw nrc oco pgl sth xcb xce xga xlp xpi</languageGroup>
 		<languageGroup parent="cmc">ace cja cje cjm hro huq ibh jra ocm rad rgs rog</languageGroup>
-		<languageGroup parent="cpe">afs aig bah bi bzj bzk cpi djk fpe gcl gul gyn hwc icr jam kri kww ngm pcm pih pis rop srn tch tcs tpi trf vic wes</languageGroup>
+		<languageGroup parent="cpe">bzk djk gcl gyn hwc kww ngm pcm pis rop tcs trf wes</languageGroup>
 		<languageGroup parent="cpf">acf cks crs gcf gcr ht lou mfe rcf scf</languageGroup>
-		<languageGroup parent="cpp">aoa cri fab idb kea mcm mzs pov pre vkp</languageGroup>
+		<languageGroup parent="cpp">aoa cri fab idb kea mcm mzs pov pre tvy vkp</languageGroup>
 		<languageGroup parent="cr">csw</languageGroup>
 		<languageGroup parent="csu">aja avu bdh bex blm bmi bot bvq bxv dsi efe fgr fuu gbn gqr hor jyy kah kcm krs kwg kwv kxj lap led les lgg lmi log mdi mdj mgc mge mhi mne mwm mwu myb ndp niy nwm sba sbz snm yul</languageGroup>
-		<languageGroup parent="cus">aa aas ahg arv awn bds bej bji bnl bob bsw byn dal dox drs dsh elo gax gdl gex gii gow gwd hae irk kxc om orc rel sid so ssn ssy tqq tsb wbj wka xan ymm</languageGroup>
+		<languageGroup parent="cus">aa aas ahg arv awn bds bej bji bnl bob bsw bxe byn dal dox drs dsh elo gax gdl gex gii gow gwd hae hdy irk kxc om orc rel sid so ssn ssy tqq tsb wbj wka xan ymm</languageGroup>
 		<languageGroup parent="day">bei bth byd lra sdo sne sre</languageGroup>
-		<languageGroup parent="dmn">bbo bib bm boo boz bqc bqp bwq bxl bxw bze bzx cpo dnj dnn dux dyu ggu gkp gnj goa jek jod jud kao kfo kga knk kno knu kpe lig llc lok lom man men mku mlq moa msc mwk mxx mzj rkm sbd sho skq snk sos stj sus sym tjn tod vai xgb xkg yal zil</languageGroup>
-		<languageGroup parent="dra">aaf all bfq bha brh brw cde ctt cty dwk emu era esg fmu gau gdb gon hoy ima iru kej kep kev kfa kfb kfc kfd kff kfh kfi kmj kn kpb kru kxv mha mjo mjp mjq mjr mjt mju mjv ml mmk mrr mut muv nbg nit oty pcf pcg pci pkr ptq pty sle ta tcy te thn udg ull url vis vmd wkb wkl wku wsg xis xua xub xuj yea yeu ymr</languageGroup>
+		<languageGroup parent="dmn">bbo bib bm boo boz bqc bqp bwq bxl bxw bze bzx cpo dnj dnn dux dyu ggu gkp gnj goa jek jod jud kfo kga knk kno knu kpe lda lig llc lok lom man men mev mnk moa mwk mxx mzj nqo rkm sbd sho skq snk sos stj sus sym tjn tod vai xgb xkg yal zil</languageGroup>
+		<languageGroup parent="dra">aaf all bfq bha brh brw cde ctt cty emu era esg fmu gon hoy ima iru kej kep kev kfa kfb kfc kfd kff kfh kfi kmj kn kpb kru mha mjo mjp mjq mjr mju mjv ml mmk mrr mut muv nbg nit oty pcf pcg pkr ptq pty sle ta tcy te thn udg ull url vis vmd wkb wkl wku wsg xis xua xub xuj yea yeu ymr</languageGroup>
 		<languageGroup parent="egx">cop egy</languageGroup>
 		<languageGroup parent="esx">ale iu kl ysr</languageGroup>
 		<languageGroup parent="euq">emx eu</languageGroup>
-		<languageGroup parent="fiu">chm et fi fit fkv hu izh kca koi krl kv liv lud mdf mns mrj myv olo smi udm vep vot vro zkv</languageGroup>
-		<languageGroup parent="fox">ami bnn byq bzg ckv dru fos kae ppu pwn pyu pzh ssf sxr szy tay trv tsu tvx xnb xsy</languageGroup>
+		<languageGroup parent="fiu">chm et fi fit fkv hu izh kca koi krl kv liv lud mdf mns mrj myv olo smi udm vep vot zkv</languageGroup>
+		<languageGroup parent="fox">ami bnn byq bzg ckv dru fos kae ppu pwn pyu pzh ssf sxr szy tay trv tsu tvx uon xnb xsy</languageGroup>
 		<languageGroup parent="gem">gme gmq gmw</languageGroup>
 		<languageGroup parent="gme">got xvn</languageGroup>
-		<languageGroup parent="gmq">da fo is jut nb nn no non nrn ovd sv</languageGroup>
-		<languageGroup parent="gmw">act af ang bar cim dcr de drt dum en enm frk frr frs fy gct geh gmh gml goh gpe gsw ksh lb li lng mhn nds nl odt ofs oor osx pdc pdt pfl sco sdz sli sth stl stq swg vel vls wae wep wym yec yi yih yol zea</languageGroup>
-		<languageGroup parent="grk">cpg el gmy grc pnt tsd</languageGroup>
+		<languageGroup parent="gmq">da fo is nb nn no non nrn ovd sv</languageGroup>
+		<languageGroup parent="gmw">af ang bar cim dcr de dum en enm frk frr fy gct geh gmh goh gpe gsw ksh lb li lng mhn nds nl odt ofs oor osx pdc pdt pfl pld sco sth swg vls wae wep wym yec yi yih yol zea</languageGroup>
+		<languageGroup parent="grk">cpg el gmy grc pnt</languageGroup>
 		<languageGroup parent="hmx">bje bmt bpn buh bwn bwx cqd hma hmc hmd hme hmf hmg hmh hmi hmj hml hmm hmn hmp hmq hms hmv hmw hmy hmz hnj hrm huj ium mji mmr muq mww neo pha pnu sfm shx</languageGroup>
 		<languageGroup parent="hok">acv atw boi chd cid clo coc coj crz dih esq inz kju klb kyh mov mrc obi peb pef pej peq pom poo ppi puy sei sht sln veo was ynn yuf yum</languageGroup>
 		<languageGroup parent="iir">ask bdz bsh inc ira prn trm wbk xvi</languageGroup>
 		<languageGroup parent="ijo">iby ijc ije ijn ijs nkx okd okr orr</languageGroup>
-		<languageGroup parent="inc">aeq ahr as awa bdv bfy bfz bgc bgq bgw bha bhb bhe bhi bho bht bjj bmj bn bns bpy bra ccp cih ctg dhw dmk doi dry dub duh dv dwz emx gbl gda ghr gig gjk gju goj gu haj hi hif hii hlb hne hns jog kbu keq key kfy khn kok kra ks kxp kyw lrk mag mai mjz mkb mke mki mr mtr mwr ne nhh nlx noe noi or ort pa paq pcl pgd pld pmh pra pwr raj rei rge rhg rjs rkt rmc rme rmf rmi rml rmn rmo rmq rmt rom rsb rtw rwr sa saz sck sd sdr si sjp skr smm soi spv srx ssi sts swv syl tdb the thl thq thr tkb tkt tnv trw ur ved wry wtm xnr</languageGroup>
-		<languageGroup parent="ine">aln axm bat cel cms gem grk hit hlu htx hy hyw hyx iir imy itc nei oht plq rmd rmu scx sla sq sqj sxo txb txh xcr xdc xil xlc xld xlg xli xln xls xlu xmk xpg xps xsd xto yms</languageGroup>
-		<languageGroup parent="ira">ae atn avd bal bgn bhh bjm bqi bsg ckb def deh esh fa fay gbz glk goz gzi hac hrz isk jdt jpr kfm kgn kho kiu ku lki lrc lrl lsa luz mnj mzn ntz nyq okh oru os pal peo prc ps rat rdb sdb sdf sdh sgh sgr sgy shm siy smy sog soj sqo srh srz tg tks tly tov ttt vaf vmh wbl wne xbc xco xkc xkj xkp xme xmn xpr xsc yah yai ydg ysc zum zza</languageGroup>
+		<languageGroup parent="inc">aeq ahr anp as awa bdv bfy bgc bgw bha bhb bhe bhi bho bht bjj bmj bn bns bpy bra ccp cih ctg dhw dmk doi dry dub duh dv dwz emx gbl gda ghr gjk goj gu haj hi hif hii hlb hne hns jog keq key kfy khn kok kra ks ksy kvx kxp kyw lrk mag mai mjz mkb mke mki mr ne nhh nlx noe noi oak odk or ort pa pcl pgd pld pmh pra pwr raj rei rge rhg rjs rmd rme rmf rmi rmq rmt rom rsb rtw sa saz sck sd sdr si skr smm soi spv srx ssi sts syl tdb the thl thq thr tkb tkt tnv trl trw ur ved wry xnr</languageGroup>
+		<languageGroup parent="ine">bat cel cms gem grk hit hlu htx hy hyw hyx iir imy itc nei oht plq scx sla sqj sxo txb txh xcr xdc xil xlc xld xlg xli xln xls xlu xmk xpg xps xsd xto yms</languageGroup>
+		<languageGroup parent="ira">ae atn avd bal bgn bhh bjm bqi bsg ckb def deh esh fa fay gbz glk goz gzi hac hrz isk jdt jpr kfm kgn kho kiu ku lki lrc lrl lsa luz mnj mzn ntz nyq okh oru os pal peo prc ps rat rdb sdb sdf sdh sgr shm siy smy sog soj sqo srz tg tks tly tov ttt vaf vmh wbl wne xbc xco xkc xkj xkp xme xmn xpr xsc xtq yah yai ydg ysc zza</languageGroup>
 		<languageGroup parent="iro">cay chr lre moh ntw one ono see sqn tus</languageGroup>
 		<languageGroup parent="itc">la osc roa spx umc xae xfa xhr xum xve xvo xvs</languageGroup>
 		<languageGroup parent="jpx">ja</languageGroup>
 		<languageGroup parent="kar">blk bwe eky ghk jkm jkp kjp kjt ksw kvl kvq kvt kvu kvy kxf kxk pdu pwo pww wea</languageGroup>
 		<languageGroup parent="kdo">acz eli lmd taz tlo</languageGroup>
-		<languageGroup parent="khi">gku gnk gwj hgm hio hnh hts huc knw kqu kqz ktz kwz naq ngh nhr nmn sad shg tyu vaj xam xii xuu</languageGroup>
+		<languageGroup parent="khi">gku gnk gwj hgm hio hnh hts huc kqu kqz ktz kwz naq ngh nhr nmn sad shg tyu vaj xam xii xuu</languageGroup>
 		<languageGroup parent="kro">ahm ald bet bev bsq btg das dee dic gec ggb god grb grj grv gud gxx krw ktj kwp kyf ney nwb pye ted wec</languageGroup>
-		<languageGroup parent="map">aaw agn agz bbn bnd don fox iba kvo kzl laz lbq lnd mli mqx mth mvp mvv myw plc plw poz put pwm riu rjg sew slu snc tkd trb trx tvm wah waz wrx ymn</languageGroup>
+		<languageGroup parent="map">aaw agn agz bbn bnd bpq bve don fox iba itd knx kvo kzl laz lbq lnd mli mqg mqx mth mvp mvv myw plc plw poz put pwm riu rjg sew slu snc tkd trb trx tvm vkt wah waz wrx xmm ymn</languageGroup>
 		<languageGroup parent="mkh">aem bgk bgl blr brb btq caq cbn cmo cog crv crw cwg dnu hkn hnu huo jah jhi kfj kha kjg kjm km kns kpm krr krv kxm lbn lcp lnh lwl mhe mlf mml mnq mnw mqt mra mtq mzt ncb nik nuo omx oyb pbv pcb pce pkt pll pnx prk prt rbb ril rka rmx sbo scb scq sea sed smu sqq ssm stg sti stt sxm syo sza szc tdf tea tef tgr thm tlq tmo tnz tou tpu tyh ukk uuu vi vwa wbm xao xkk xko xnh yin</languageGroup>
 		<languageGroup parent="mno">cgc mbb mbd mbi mqk msm mta</languageGroup>
-		<languageGroup parent="mul">aav afa aqa aql art auf aus awd azc cau cba cdd cpe crp dra esx euq hmx hok ine iro jpx kgp khi ko map myn nic omq paa qwe sal sgn sio sit ssa tai tup tut und urj wak xnd ypk</languageGroup>
-		<languageGroup parent="mun">agi asr biy cdz ekl gaq gbj hoc jun kfp kfq khr ksz mjx pcj sat srb trd unr</languageGroup>
+		<languageGroup parent="mul">aav afa art aus cai cau cpe crp dra esx euq hmx ine jpx kgp khi ko map nai nic paa sai sgn sit ssa tai tup tut und urj ypk</languageGroup>
+		<languageGroup parent="mun">agi asr bfw bix biy cdz ekl gaq gbj hoc jun kfp kfq khr ksz mjx pcj sat srb trd unr</languageGroup>
 		<languageGroup parent="myn">acr agu caa cac cak chf cob ctu emy hus itz ixl jac kek kjb knj lac mam mhc mop poc poh quc qum quv toj ttc tzh tzj tzo usp yua</languageGroup>
 		<languageGroup parent="nah">azd azn azz naz nch nci ncj ncl ngu nhc nhe nhg nhk nhm nhn nhp nhq nht nhv nhw nhx nhy nhz nlv nsu nuz ppl</languageGroup>
+		<languageGroup parent="nai">aes akz aql azc cdd chh cho cic cku csi csm css cst csz git hok iml iro kla krb kyl lmw mbe mik mjd mkq mus ncg nez nmu nol nrt nsq nsz pmw pwi sal sio sis skd sxk tkm tqn tsi uma vmv waa wac wak wnw xap xcy xnd yak yok</languageGroup>
 		<languageGroup parent="ngb">sg</languageGroup>
-		<languageGroup parent="ngf">aac abg abz adn aez ahh aip aqm asx asy ate auu auy aws awu awv bbb bbr bdf beu bfn bhl bie bir bjz bmh bmp bmu bmz bop boq bql bwk bxz cns dah daz ddg dev dge dgx dgz diy dna dni dnt dnw dof dui duk eip ekg ena enq eri fad fag fai faj fiw foi for frq gaf gah gaj gao gap gaw gcn gka gkd gmg grg gsn gvf hhi hhy hmu imo ipo irx iwo jbj jka kbk kbq kcb kco kdw kew kgf kgq khe kjy kkl klp klt klz kpq kpx kqi kti kts ktt kue kvd kvw kwr kyo kyt kyy kzm kzv lev luf mbw mcz med mgu mhf miw mjj mlh mmq mpt mpv mqv mrz mso msx msz mtc mtg mtv mux mvq mze nbk nca nec nej net nkg nkj nks nlc nlk nnf nps nwr nxr oia okv omw onj opk opm pda pla pmr prw psa rmp rwo sbq sej six smc sra sst ssu stm sue sug sui swm swt szb tbg tbv tif tkx tlf tml tnh tpg trh twg ubu ufi uhn ukg urm usu wei whg wmc wms wnc wng wno wnu woi wrv wtf xow xsp xte yac ybm ygm ygr yir yli yon yrb yrw ytw</languageGroup>
-		<languageGroup parent="nic">afe alf alv aqg baw bff bka bkv bky btt bun bxc bza bzy dmn gng kdo kfz kni kus lam maw mev nqo ras syx tag uba ukp xon xxb znd</languageGroup>
+		<languageGroup parent="ngf">aac abg abz adn aez ahh aip aqm asx asy ate auu auy aws awu awv bbb bbr bdf beu bfn bhl bie bir bjz bmh bmp bmu bmz bop boq bql bwk bxz cns dah daz ddg dev dge dgx dgz diy dna dni dnt dnw dof dui duk eip ekg ena enq eri fad fag fai faj fiw foi for frq gaf gah gaj gao gap gaw gcn gka gkd gmg grg gsn gvf hhi hhy hmu ihp imo ipo irx iwo jbj jka kbk kbq kcb kco kdw kew kgf kgq kgv khe kjy kkl klp klt klz kpq kpx kqi kti kts ktt kue kvd kvw kwr kyo kyt kyy kzm kzv lev luf mbw mcz med mgu mhf miw mjj mlh mmq mnz mpt mpv mqv mrz mso msx msz mtc mtg mtv mux mvq mze nbk nca nec nej net nkg nkj nks nlc nlk nnf nps nwr nxr oia okv omw onj opk opm pda pla pmr prw psa rmp rwo sbq sej six smc sra sst ssu stm sue sug sui swm swt szb tbg tbv tif tkx tlf tml tnh tpg trh twg ubu ufi uhn ukg urm usu wei whg wmc wms wnc wng wno wnu woi wrv wtf xow xsp xte yac ybm ygm ygr yir yli ynb yon yrb yrw ytw</languageGroup>
+		<languageGroup parent="nic">alv aqg baw bff bka bun bxc bza dmn gng kdo kfz kni kus lam maw ras syx tag xon xxb</languageGroup>
 		<languageGroup parent="nub">dgl dil drb elh fia ghl kdu kko onw wll xnz</languageGroup>
 		<languageGroup parent="omq">amu azg azm cco chj chq chz cip cly cnl cnt coz csa cso cta cte ctl ctp ctz cuc cut cux cvn czn ixc jmx mab maj maq mat mau mce mdv mib mie mig mih mii mil mim mio mip mit miu mix miy miz mjc mks mom mpm mqh mtu mtx mvg mxa mxb mxs mxt mxv mxy ocu oto pbe pbf pbs pca pei pls pmq pmz poe pow pps sut tcf tpc tpl tpx trc trq trs vmc vmm vmq vmx vmy vmz xta xtb xti xtj xtl xtn xtt xtu xty zaa zab zac zad zae zaf zam zao zap zaq zar zas zat zav zaw zoo zpb zpc zpd zpe zpf zph zpi zpl zpm zpo zpp zpq zpr zps zpt zpu zpw zpy zpz zsr zte ztg ztm ztn ztp ztq ztt ztx zty</languageGroup>
-		<languageGroup parent="omv">aiw amf bcq bst bwo cra dim doz dwr gmv gof gyl jnj kbr kcx kqy kxh mdy mfx myo oyd wal zay</languageGroup>
+		<languageGroup parent="omv">aiw amf bcq bst bwo cra dim doz dwr gmv gof gyl jnj kbr kcx kqy kxh mdy mfx moy myo oyd wal zay</languageGroup>
 		<languageGroup parent="oto">maz mmc ote otl otm otn otq ots ott otx otz</languageGroup>
-		<languageGroup parent="paa">aad aag aah aau adb ado aew afd afi afk afp afz agl ago aif ail aki akq alx amn amp anj anz aod aof aog aoj aon aos ape auk aun auw avt awr aww aya ayq bcf beo bey bit bnv bnw bow bqq bqs brq bry buo but bvn bye byx bzf can cjn dbf dia dju dnd dol duv eit ele elk ert etr fau flh gai gak gbe gbf gbi gcc geb gnu grq ham ian ibu igg igm imn iwm iws jet kax kcd kct keh khd kih kiw kiy kjd kjx kkb kkc klq kmn kmo kms kmx knr kps kqa krz kwj kxq kxt kxw kyx kzz lei lgt lkl lll lnm loa lpe mbx mcr mdb mej mfw mgt mkc mle mmi mok mqo mqs msg msy mtf mty mwb mxk mxn mxw mzu nac naf nas nby ncm nco ner nex ngf nib nii niz nkm nmx nnk nnm nqn nud nux oin okk omo ong onk onr osu pgi pgu pin psq pup rac rao ret rhp rmh rmk roo saj sbg sbi sdk sim siq siu siv siw skc skm sll smb smf smg smq snr snu snx sny snz sow spi spk spm ssd ssj ssx stf tad tbp tbs tby tci tcq tds tei tft tgu tlb tmu tqm tqo tsx tua tuj tvo tyn tzx uis upi urg uri uro urt urx utu van waj wax wbe wdg wgi wii wli wmo wnb wnp wog wos wrs wtk xbi xoi xop xrw xse xxt yde yee yev ygl yis yla ylg yll ynl yss ywa yyu zmh zuh</languageGroup>
-		<languageGroup parent="phi">abd agk agt agy akl alj aqn atk atl atm atp att atz ayt azt bfx bik bks blf bln bnc bne bnj bno bnq bpr bps btn bto btw bvy bya ceb cts cyo daw dgc dul duo ebk fbl fil gad gdg gor hil hnn ibg ibl ifu ify ilk ilm ilo ilp inn iry isd iti itt itv ity ivb ivv kak klg kll kmd kmk kml knb kne kqe krj ksc ksn kyj kyk kyn laa lbl llq loc mdh mlz mmn mno mog mrw mry msb msk mtw obk pag pam plv rbk rbl rol rth sbl sgb sgd skn smk snl srg srv stb suc sxn syb tao tbk tbl tbw tdn tdy tgn tgt tis tiu tnt tnw tom tsg twb txs ubl vbk war xnn xsb</languageGroup>
-		<languageGroup parent="plf">aaz alo alp amq amv aoz apx asl baj bay bgy bkx bvt bzn emw frd gal hbu heg hrk hti huk huw idt ilu jal jmd kei kem kje krd kuv kvp kvv kwh kzb kzd kzx lcd lcl lcq lex lhh lka llg lox lti lva mgm mhs mqp mss mxz nae nil nni nxa nxl oni plh rgu row sgu skz spb spr srw sve sws szn tdt tet tev tlt tlu tlv tre tve twu txn txq tzn udj urn vme weo wet wha wmh</languageGroup>
-		<languageGroup parent="poz">abl abs adr akg aol bdb bdl bdx beg bhp bjn bnu bny btk bug cml day dkk dro dup emb end eno gay hvn id ila jak jas jax jv jvn kaw kdg kge kjc kjk kod ksx kuk kvh kvr kxn kyd kyi kys kzi lce ley lgi liw ljl ljp llk lmq lmy lur lwt mak mdr mel mfp mg min mkn mnb mqj mqy ms mui mvd mwv mxr nea nfa nia nrm nrz nsy nxe nxg omy orn ors osi pel pez phi ple plf pne pnm pqe pqw pse psn puc puf reb ree rej rob ror sas sau sda sdx sge skh ski sko skx smr smw snv spg ssq tes tln tmw ttg ttw ulu umi urk vkk wew whk wnk xbr xdy xkd xkl xky xxk zbc zbe zbw zlm zmi</languageGroup>
-		<languageGroup parent="pqe">adz aek agf agw ahb aia aie aix aji akr alm alu and ane anx aok aor apb app apr aps aqr asz aty aua aud aul auq aut axx baa bch bcm bcu bed bek bgt bhc bhw biq bjk bjl bjp bki blp blq bmc bmn bnk bnp bnr bpa bpg bpk brj brr btj btp btr buk bvc bvd bwa bwd bwf bxa bxf bzh bzq cal cam chk cir crc dac ddi dgg dhv dob dor dsn duf dva dww elu emi erg erk erw etn faf far fj fnb frt fud fut fwa gar gdd gei gfk gga ggt ghn gil gip gmb goc goo gop gri grw grz gve gzn hah hao haw hiw hla ho hoa hot hul hvk iai iff ire irh ism jae jaj jaz kbm kbw kcl kdk kgb khl kij kis kji kkk klv koa kos kpg kqw krf ksd ksg ksl ktm kud kvc kwd kwf kxa kxr kzk kzu lbb lbu lbv lcc lek ler let leu lga lgb lgk lgl lgr lgu lht lib lid lio lkn lle llf llp llu llx lmb lmg lml lmu lmv lnn loj los lpa lrv lrz lww lxm lzl mcy mee mek met meu mft mgl mh mhz mi mjm mkj mkt mkv mky mla mll mln mlu mlv mlx mme mmg mmm mmo mmt mmw mmx mna mnl mnv mox mpl mpn mpo mpr mpy mqa mqm mqz mrb mrk mrl mrm mrn mrp mrq mrs mrv msn msq msu mte mtt mva mvo mvt mvx mwa mwc mwg mwh mwi mwo mxe mxm na nak nal nbn ncc ncf ncn nee nek nem nen nfl ngr nho niu nke nkk nkp nkr nlg nlz nmb nmk nms nmt nnd npn npx nrg nsn nss nsw ntu nua num nuq nur nuw nvh nwi ojv olr omb onu ora orz oum pek pex pfa pgk pif piv pix piz pkg pkp plb pma pme pmt pnh pon pop ppm ppn pri pss psw ptp ptr ptv puw pwg rai rak rap rar ray rga rkh roe rpn rri rro rtm rug sax sbb sbc sbe sbh sgz sih sij sjr ske sku sky slz sm sns sob sol sov spe sps srf sry ssg sso ssv ssz stn stw svb swp sww szw tbc tbe tbf tbj tbx tgc tgi tgp tgs tio tkl tkp tkv tkw tlm tlr tls tlx tmb tmi tmq tmt tmy tni tnk tnl tnn tnp tns tnx to tox tpa tpf tpv tpz tql tqp tsr tti ttu ttv tuc tva tvk tvl twp ty ubr uge uli una unu upv urr urv utp uur uve uvl val vao vlp vmg vnk vnm vnp vra vrs vrt wab wad wag wat wbb wbw wed wgb wgo wiv wlr wls wmn woc woe wsa wuv wuy wwo wyy xkx xsi yap yki ykk ykm ylb yly zeg zgr</languageGroup>
-		<languageGroup parent="pqw">abx ban bdg bdr bep bgb bhq bhz bkz bna brs bsb bsu bsy bup bzl ch cia cmc dbj dms dmv dok dpp drg dtb dtp dtr gnq itd kgx khc klw kly kqr kqv ktq kxi kzf kzs law lbw lew lix lji loe low mkm mqn mqq mwt myl mzq npy osn pau pdo pee pmf pnp raz ruu sjm slm sml srk ssb sse su tdi tdj tgb tih tlk ttp txe txm txx ues ums unz vkl vko wlo wow wru wtw xkq xks xmz yka zbt</languageGroup>
-		<languageGroup parent="pra">pi</languageGroup>
+		<languageGroup parent="paa">aad aag aah aau adb ado aew afd afi afk afp afz agl ago aif ail air aki akq alx amn amp anj anz aod aof aog aoj aon aos ape auk aun auw avt awr aww aya ayq bcf beo bey bit bnv bnw bow bqb bqq bqs brq bry but bvn bye byx bzf can cjn dbf dia dju dnd dol duv eit eiv ele elk ert etr fau flh gai gak gbe gbf gbi gcc geb gnu grq ham ian ibu igg igm imn iwm iws jet kax kcd kct keh khd kih kiw kiy kjd kjx kkb kkc klq kmn kmo kms kmx knr kps kqa kqj krz kwe kwj kxq kxt kxw kyx kzz lei lgt lkl lll lni lnm loa lpe mbx mcr mdb mej mfw mgt mkc mle mmi mok mqo mqs msg msy mtf mty mwb mxk mxn mxw mzu nac naf nas nby ncm nco ner nex ngf nib nii niz nkm nmx nnk nnm nqn nud nux oin okk omo ong onk onr osu oue pgi pgu pin psq pup rac rao ret rhp rmh rmk roo saj sbg sbi sdk sim siq siu siv skc skm sll smb smf smg smq smz snr snu snx sny snz sow spi spk spm srl ssd ssj ssx stf tad tbp tbs tby tci tcq tds tei tft tgu tip tlb tmj tmu tqm tqo tsx tua tuj tvo tyn tzx uis upi urg uri uro urt urx utu van waj wax wbe wdg wgi wii wli wmo wnb wnp wog wos wrs wtk xau xbi xoi xop xrw xse xwr xxt yde yee yev ygl yis yla ylg yll ynl yss ywa yyu zmh zuh</languageGroup>
+		<languageGroup parent="phi">abd agk agt agy akl alj aqn atk atl atm atp att atz ayt azt bfx bik bks blf bln bnc bne bnj bno bnq bpr bps btn bto btw bvy bya ceb cts cyo daw dgc dul duo ebk fbl fil gad gdg gor hil hnn ibg ibl ifu ify ilk ilm ilo ilp inn iry isd iti itt itv ity ivb ivv kak klg kll kmd kmk kml knb kne kqe krj ksc ksn kyj kyk kyn laa lbl llq loc mdh mmn mno mog mrw mry msb msk mtw obk pag pam plv rbk rbl rol rth sbl sgb sgd skn smk snl srg srv stb suc sxn syb tao tbk tbl tbw tdn tdy tgn tgt tis tiu tnt tnw tom tsg twb txs ubl vbk war xnn xsb</languageGroup>
+		<languageGroup parent="plf">aaz alo alp amq amv aoz apx asl baj bay bgy bkx bvt bzn emw frd gal hbu heg hrk hti huk huw idt ilu jal jmd kei kem kje krd kuv kvp kvv kwh kzb kzd kzx lcd lcl lcq lex lhh lka llg lox lti lva mgm mhs mqp mss mxz nae nil nni nxa nxl oni plh rgu rmm row sgu skz spb spr srw sve sws szn tdt tet tev tlt tlu tlv tre tve twu txn txq tzn udj urn vme weo wet wha wmh</languageGroup>
+		<languageGroup parent="poz">abl abs adr akg aol bdb beg bew bhp bhr bhv bjn bmm bny btk bzc coa day dro dun dup duq duw end eno gay hvn iba id ila jak jas jax jv jvn kaw kdg kge kkx kod ksx kuk kvh kvr kxd kxn kyd kyi kys kzi lbx lce lgi liw ljl ljp lkj llk lmq lmy lur lwt mel mfp mg mhy mkn mnb mqy ms msh mtd mui mvd mwv mxr nea nfa nia nij nrm nrz nsy nxe nxg omy orn ors osi otd pea pel pez phi pku ple plf pne pnm pqe pqw pse puc puf reb ree rej ror sas sau sdx sge skg skh ski smr smw snv spg ssq sya tdx tes tjg tkg tmw ttg ttw twy txy ulu umi urk vkk wew whk wnk xbr xdy xkd xkl xky xmv xmw xxk zbc zbe zbw zlm</languageGroup>
+		<languageGroup parent="pqe">adz aek agf agw ahb aia aie aix aji akr alm alu and ane anx aok aor apb app apr aps aqr asz aty aua aud aul auq aut axx baa bch bcm bcu bed bek bgt bhc bhw biq bjk bjl bjp bki blp blq bmc bmn bnk bnp bnr bpa bpg bpk brj brr btj btp btr buk bvc bvd bwa bwd bwf bxa bxf bzh bzq cal cam chk cir crc dac ddi dgg dhv dob dor dsn duf dva dww elu emi erg erk erw etn faf far fj fnb frt fud fut fwa gar gdd gei gfk gga ggt ghn gil gip gmb goc goo gop gri grw grz gve gzn hah hao haw hiw hla ho hoa hot hul hvk iai iff ire irh ism jae jaj jaz kbm kbw kcl kdk kgb khl kij kis kji kkk klv koa kos kpg kqw krf ksd ksg ksl ktm kud kvc kwd kwf kxa kxr kzk kzu lbb lbu lbv lcc lcm lek ler let leu lga lgb lgk lgl lgr lgu lht lib lid lio lkn lle llf llp llu llx lmb lmg lml lmu lmv lnn loj los lpa lrv lrz lww lxm lzl mcy mee mek met meu mft mgl mh mhz mi mjm mkj mkt mkv mky mla mll mln mlu mlv mlx mme mmg mmm mmo mmt mmw mmx mna mnl mnv mox mpl mpn mpo mpr mpy mqa mqm mqz mrb mrk mrl mrm mrn mrp mrq mrs mrv msn msq msu mte mtt mva mvo mvt mvx mwa mwc mwg mwh mwi mwo mxe mxm na nak nal nbn ncc ncf ncn nee nek nem nen nfl ngr nho niu nke nkk nkp nkr nlg nlz nmb nmk nms nmt nnd npn npx nrg nsn nss nsw ntu nua num nuq nur nuw nvh nwi ojv olr omb onu ora orz oum pek pex pfa pgk pif piv pix piz pkg pkp plb pma pme pmt pnh pon pop ppm ppn pri pss psw ptp ptr ptv puw pwg rai rak rap rar ray rga rkh roe rpn rri rrm rro rtm rug sax sbb sbc sbe sbh sgz sih sij sjr ske sku sky slz sm sns sob sol sov spe sps srf sry ssg sso ssv ssz stn stw svb swp sww szw tbc tbe tbf tbj tbx tgc tgi tgp tgs tio tkl tkp tkv tkw tlm tlr tls tlx tmb tmi tmq tmt tmy tni tnk tnl tnn tnp tns tnx to tox tpa tpf tpv tpz tql tqp tsr tti ttu ttv tuc tva tvk tvl twp ty ubr uge uli una unu upv urr urv utp uur uve uvl val vao vlp vmg vnk vnm vnp vra vrs vrt wab wad wag wat wbb wbw wed wgb wgo wiv wlr wls wmn woc woe wsa wuv wuy wwo wyy xkx xsi yap yki ykk ykm ylb yly zeg zgr</languageGroup>
+		<languageGroup parent="pqw">abx ban bdg bdl bdr bdx bep bgb bhq bhz bkz bna bnu brs bsb bsu bsy bug bup bzl ch cia cmc cml dbj dkk dms dmv dok dpp drg dtb dtp dtr emb kgx khc kjc kjk kkv klw kly kqr ktq kzf kzs law lbw lew ley lix lji loe low mad mak mdr mkm mqj mqn mqq mwt myl mzq npy osn pau pdo pee pmf pnp psn raz rob ruu sda sjm sko skx slm sml srk ssb sse su tdi tdj tgb tlk tln ttp txe txm ues ums unz vkl vko wlo wow wru wtw xkq xks xmz yka zbt</languageGroup>
 		<languageGroup parent="qwe">inb inj qu qub qud quf qug quh quk qul qup qur qus quw qux quy qva qvc qve qvh qvi qvj qvl qvm qvn qvo qvp qvs qvw qvz qwa qwc qwh qws qxc qxh qxl qxn qxo qxp qxr qxt qxu qxw</languageGroup>
-		<languageGroup parent="roa">an ast ca cbk co cpf cpp dlm drc egl es ext fax fr frc frm fro frp fur gl ist it itk lad lij lld lmo mwl mxi nap nrf oc osp pcd pld pln pml pms pro pt rgn rm rmq ro ruo rup ruq sc scn sdc sdn sdt sro vec wa xno zrp</languageGroup>
+		<languageGroup parent="roa">an ca cbk co cpf cpp dlm drc egl es ext fax fr frc frm fro frp fur gl ist it itk lad lij lld lmo mxi nap nrf oc osp pcd pld pln pml pms pro pt rgn rm rmq ro ruo rup ruq sc scn sdc sdn sdt vec wa zrp</languageGroup>
+		<languageGroup parent="sai">aap acs acu agr ake ako amc amr anb aoc apn apy aqa arj ark arl aro atc atr atx avs awd axb ay ayc bao bkq bor bsn cah cao car cav cax cba cbc cbi cbr cbs cbt cbu ciy coe cof crq crt cub cui cuo des ese fun gob gta guh gum guo guu gvc gvp hix hub hug iqu isc jbt jeb jiv jqr jru kaq kbb kbc knt kpj kqq kre ktx kui kwi mbc mbl mbn mca mcd mcf mcg mch mcl mmv moc mpq mtp mts myy mzo mzr nuc omc omu opy ore oti otu pbc pbh pcp pev pig pir plg pno pok puq pyn qwe ram rem rey rkb sey shb shp sik sni snn spc sri suy tav tba teb ten tna tnc tno tob tri ttk tue tuo tux txi txu umo vkm waw way wca wlv xav xer xkr xok xor xpk xra xre xri xsu yaa yad yar yme ynu yro yui yup ywn zro</languageGroup>
 		<languageGroup parent="sal">blc cea cjh clm col coo cow crd fla hur lil lut nok oka ptw qun sec shs ska slh sno spo squ str thp til twa</languageGroup>
 		<languageGroup parent="sdv">ach adh alz anu atu bdi bfa bxb byg dau ddd dib din dip diw dks enb eyo jum kdj keo kln koe kpz liu lky loh lot lpx lth luo mas mfz mhi mqu mur muz mym niq njl nnj nsg nub nus oki omt pko saq sgc shj shk soh suq tbi tcc tec teo teq tex toq tuv tuy ukv xel xmr xwg zmo</languageGroup>
-		<languageGroup parent="sem">aao abh acm acq acw acy adf aeb aec afb agj aii akk am amw apc apd ar arq ars ary auz avl ayh ayl ayn ayp bhm bhn dlk fif gdq gez gru har hbo he hoh hrt hss inm ior isr jpa jrb jye kqd lhs mey mid mt mvz mys myz oar obm phn rzh sgw shu shv sqr sqt ssh syc syr ti tig tru uga wle xaa xeb xha xhd xna xpu xqt xsa yhd yud zwa</languageGroup>
+		<languageGroup parent="sem">aao abh acm acy aeb aec agj aii akk am amw apc ar arq ars ary arz auz avl ayl ayp bhm bhn dlk fif gdq gez gru har hbo he hoh hrt hss inm ior isr jpa jrb jye kcn kqd lhs mey mid mvz mys myz oar obm phn rzh sgw shv smp sqr sqt ssh stv syr ti tig tru uga wle xaa xdm xeb xha xhd xna xpu xqt xsa yhd yud zwa</languageGroup>
 		<languageGroup parent="sgn">ncs</languageGroup>
 		<languageGroup parent="sio">asb bll chc cmm cro dak hid iow ksk lkt mhq ofo oma osa qua sto tta win xwc</languageGroup>
-		<languageGroup parent="sit">acn aeu ahk aim anm aot aph atb aub bap bca bfc bgg bgr bhj biu bo brd bxd byh byo byw bzi cdf cdm cfm ckh ckn clj clk cmr cnc cng cnh cnk csh csj ctd cth ctn cur cuw cvg dao der dhi dis drq dus emg enu ero ers gan gnb goe gqi grt hle hmr hni hpo hsn ii jee jih jiu jiy jkr jnl jya kac kaf kar kdq kfw kgj kif kip kix kjl kjz kkt kle klr kmm ktp lax lay lbg lbr lep lgh lhi lhp lhu lif lis lkc llh lmh lov lpo lrr lsh lsi lus lwm lwu mhu mjw mni mpz mrh mro muk mxj my nbe nbi nbu ncd new njb njh njm njn njo nkb nkd nkf nkh nki nma nme nmo nmy nng nnl nnp nos npb npg nph npo npu nqy nre nri nru nsf nsm nst ntx nty nwc nxk nxq nzm obr pck phh pho phq pkh pmi pmj pmx pub pum pzn qvy qxs raa rab raf rah raq rau rav ria rji rki rmz rtc ruh sch sdp sgk sgp shl sjl slt smh smt ssk suv suz sxg taj tbq tcl tco tcz tdh tge thf tij tji tjs tpe tro trp tvn txg txo ugo usi vap vay weu wme wuh xac ybh ybi ych ycl ycp yif yig yim yiq yiv yiz ykt ylo ymc ymd ymi ymq ymx ymz yna ypa yph ypn ypo ypp ypz ysd ysp ysy yta ytl ywl ywq ywt zal zhx zkd zkn zkr zom</languageGroup>
-		<languageGroup parent="sla">rsk zle zls zlw</languageGroup>
+		<languageGroup parent="sit">acn aeu ahk aim anm aot aph atb aub bap bca bfc bgg bgr bhj biu bo brd bxd byh byo byw bzi cdf cdm cfm ckh ckn clj clk cmr cnc cng cnh cnk csh csj ctd cth ctn cur cuw cvg dao der dhi dis drq dus emg enu ero ers gan gnb goe gqi grt hle hmr hni hpo hsn ii jee jih jiu jiy jkr jnl jya kac kaf kar kdq kfw kgj kif kip kix kjl kjz kkt kle klr kmm ktp lax lay lbg lbr lep lgh lhi lhp lhu lif lis lkc llh lmh lov lpo lrr lsh lsi lus lwm lwu mhu mjw mni mpz mrh mro muk mxj my nbe nbi nbu ncd new njb njh njm njn njo nkb nkd nkf nkh nki nma nme nmo nmy nng nnl nnp nos npb npg nph npo npu nqy nre nri nru nsf nsm nst ntx nty nwc nxk nxq nzm obr pck phh pho phq pkh pmi pmj pmx pub pum pzn qvy qxs raa rab raf rah raq rau rav ria rji rki rmz rtc ruh sch sdp sgk sgp shl sjl slt smh smt ssk suv suz sxg taj tbq tcl tco tcz tdh tge thf tij tji tjs tpe tro trp tvn txg txo ugo usi vap vay weu wme wuh wuu xac ybh ybi ych ycl ycp yif yig yim yiq yiv yiz ykt ylo ymc ymd ymi ymq ymx ymz yna ypa yph ypn ypo ypp ypz ysd ysp ysy yta ytl yue ywl ywq ywt zal zhx zkd zkn zkr zom</languageGroup>
+		<languageGroup parent="sla">csb pl pox rsk zle zls zlw</languageGroup>
 		<languageGroup parent="smi">se sia sjd sje sjk sjt sju sma smj smn sms</languageGroup>
 		<languageGroup parent="son">ddn dje dsq hmb kcy khq ses tda tst twq</languageGroup>
 		<languageGroup parent="ssa">amj bdo bms csu dgk dzg fvr gly ikx kbl kbo kby kcp kec kgo kie klf kmq kr krt kth laj lgn mde mdg mgd mls mxh nrb nyp rou sdv son tbr teu tey tuq udu wti xom zag</languageGroup>
 		<languageGroup parent="sw">swc</languageGroup>
 		<languageGroup parent="syd">enf enh kjh mtm nio sel xas yrk</languageGroup>
-		<languageGroup parent="tai">aho aio blt eee kht ksu lo nod nrr nut pdi phk shn soa tdd th thi tnu tpo tsl tyj tyr tyz za zch zeh zln zlq</languageGroup>
-		<languageGroup parent="tbq">adi adl apt bee bft bfu bqh bro brx cda cdn cgk chx dka drd duu dz dzl ghe ghh ght gro gvr gyo hut jda jna jul kbg kfk khg kkf kte kzq lae lbf lbj lhm lkh loy mrg nbt neh njz nmm npa nun ola ole prx rgk rnp sbu scp scu sgt sip skj spt syw taj tdg tgf tgj ths tpq tsj tsk ttz twm xkf xkz xns xsr xzh zau</languageGroup>
+		<languageGroup parent="tai">aho aio blt eee khb kht ksu lo nod nrr nut pcc pdi phk shn soa tdd th thi tjl tnu tpo tsl tyj tyr tyz za zch zeh zgb zgm zgn zhn zlj zln zlq zyg zyj</languageGroup>
+		<languageGroup parent="tbq">adi adl apt bee bft bfu bqh bro brx cda cdn cgk chx dka drd dre duu dz dzl ghe ghh ght gro gvr gyo hut jda jna jul kbg kfk kgy khg kkf kte kzq lae lbf lhm lkh loy mrg nbt neh njz nmm npa nun ola ole prx rgk rnp sbu scp scu sgt sip skj spt syw taj tdg tgf tgj ths tpq tsj tsk ttz twm xkf xkz xns xsr xzh zau</languageGroup>
 		<languageGroup parent="trk">aib alt atv az azb ba bgx chg cjs clw crh cv dlg gag ili jct kaa kdr kim kjh kk klj kmz krc kum ky nog otk oui qwm qxq sah slr sty tk tr tt tyv ug uum uz xbo xpc xqa ybe zkh zkz</languageGroup>
-		<languageGroup parent="tup">aan ait ama api aqz arr arx asn asu aux avv awe awt cin cod eme gn gnw gub gui gun guq gvj gvo gyr jor jua jur kay kgk kpn ktn kuq kyr kyz mav mdz mnd mpu msp myu nhd omg oym paf pah pak pog psm pta pto skf srq sru taf tpj tpk tpn tpr tqb twt urb uru urz wir wyr xaj xiy xmo yrl yuq</languageGroup>
-		<languageGroup parent="tut">ain ams jje kzg mvi ojp okm okn oko pkc ryn rys ryu tkn trk tuw xgn xhc xpy xug yoi yox zkg zkt</languageGroup>
+		<languageGroup parent="tup">aan ait ama api aqz arr arx asn asu aux avv awe awt cin cod eme gn gnw gub gui gun guq gvj gvo gyr jor jua jur kay kgk kpn ktn kuq kyr kyz mav mdz mnd mpu msp myu nhd omg oym paf pah pak pog psm pta pto skf srq sru taf tkf tpj tpk tpn tpr tqb twt urb uru urz wir wyr xaj xiy xmo yrl yuq</languageGroup>
+		<languageGroup parent="tut">ain ams jje kzg mvi ojp okm okn oko pkc ryn rys ryu tkn trk tuw xgn xpy xug yoi yox zkg zkt</languageGroup>
 		<languageGroup parent="tuw">eve evn gld juc mnc neg oaa oac orh sjo ude ulc</languageGroup>
 		<languageGroup parent="urj">fiu omk rts syd xcv ykg yux</languageGroup>
 		<languageGroup parent="wak">dtd has hei kwk myh nuk</languageGroup>
 		<languageGroup parent="wen">dsb hsb</languageGroup>
 		<languageGroup parent="xgn">bua bxm bxu cmg dta kxs mhj mjg mn mvf peh sce xal xng ykh yuy</languageGroup>
 		<languageGroup parent="xnd">ath eya hoi tli</languageGroup>
-		<languageGroup parent="ypk">ess esu ynk</languageGroup>
-		<languageGroup parent="zhx">cdo cjy cnp cpx csp czh czo ltc mnp nan och wuu wxa yue zh</languageGroup>
+		<languageGroup parent="ypk">ess ynk</languageGroup>
+		<languageGroup parent="zhx">cdo cjy cnp cpx csp czh czo ltc mnp nan och wxa zh</languageGroup>
 		<languageGroup parent="zle">be orv ru rue uk</languageGroup>
 		<languageGroup parent="zls">bg bs cu hr kjv mk sl sr svm</languageGroup>
-		<languageGroup parent="zlw">cs csb czk pl pox sk szl wen</languageGroup>
+		<languageGroup parent="zlw">cs czk sk szl wen</languageGroup>
 		<languageGroup parent="znd">zne</languageGroup>
 	</languageGroups>
 </supplementalData>
diff --git a/make/data/cldr/common/supplemental/languageInfo.xml b/make/data/cldr/common/supplemental/languageInfo.xml
index 3c106149481..a6b98049470 100644
--- a/make/data/cldr/common/supplemental/languageInfo.xml
+++ b/make/data/cldr/common/supplemental/languageInfo.xml
@@ -357,15 +357,20 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<!-- Encompassed by Chinese, Mandarin -->
 			<languageMatch desired="cdo" supported="zh" distance="10" oneway="true"/>	<!-- Min Dong Chinese -->
 			<languageMatch desired="cjy" supported="zh" distance="10" oneway="true"/>	<!-- Jinyu Chinese -->
+			<languageMatch desired="cnp" supported="zh" distance="10" oneway="true"/>	<!-- Northern Ping Chinese -->
 			<languageMatch desired="cpx" supported="zh" distance="10" oneway="true"/>	<!-- Pu-Xian Chinese -->
+			<languageMatch desired="csp" supported="zh" distance="10" oneway="true"/>	<!-- Southern Ping Chinese -->
 			<languageMatch desired="czh" supported="zh" distance="10" oneway="true"/>	<!-- Huizhou Chinese -->
 			<languageMatch desired="czo" supported="zh" distance="10" oneway="true"/>	<!-- Min Zhong Chinese -->
 			<languageMatch desired="gan" supported="zh" distance="10" oneway="true"/>	<!-- Gan Chinese -->
 			<languageMatch desired="hak" supported="zh" distance="10" oneway="true"/>	<!-- Hakka Chinese -->
+			<languageMatch desired="hnm" supported="zh" distance="10" oneway="true"/>	<!-- Hainanese -->
 			<languageMatch desired="hsn" supported="zh" distance="10" oneway="true"/>	<!-- Xiang Chinese -->
+			<languageMatch desired="luh" supported="zh" distance="10" oneway="true"/>	<!-- Leizhou Chinese -->
 			<languageMatch desired="lzh" supported="zh" distance="10" oneway="true"/>	<!-- Literary Chinese -->
 			<languageMatch desired="mnp" supported="zh" distance="10" oneway="true"/>	<!-- Min Bei Chinese -->
 			<languageMatch desired="nan" supported="zh" distance="10" oneway="true"/>	<!-- Min Nan Chinese -->
+			<languageMatch desired="sjc" supported="zh" distance="10" oneway="true"/>	<!-- Shaojiang Chinese -->
 			<languageMatch desired="wuu" supported="zh" distance="10" oneway="true"/>	<!-- Wu Chinese -->
 			<languageMatch desired="yue" supported="zh" distance="10" oneway="true"/>	<!-- Chinese, Cantonese -->
 			<!-- END generated by GenerateLanguageMatches.java -->
diff --git a/make/data/cldr/common/supplemental/likelySubtags.xml b/make/data/cldr/common/supplemental/likelySubtags.xml
index 8b87d7e23d7..76e215255fd 100644
--- a/make/data/cldr/common/supplemental/likelySubtags.xml
+++ b/make/data/cldr/common/supplemental/likelySubtags.xml
@@ -16,15 +16,20 @@ not be patched by hand, as any changes made in that fashion may be lost.
     <likelySubtags>
 		<likelySubtag from="aa" to="aa_Latn_ET"/>		<!--Afar‧?‧?	➡ Afar‧Latin‧Ethiopia-->
 		<likelySubtag from="ab" to="ab_Cyrl_GE"/>		<!--Abkhazian‧?‧?	➡ Abkhazian‧Cyrillic‧Georgia-->
+		<likelySubtag from="abq" to="abq_Cyrl_RU"/>		<!--Abaza‧?‧?	➡ Abaza‧Cyrillic‧Russia-->
+		<likelySubtag from="abq_TR" to="abq_Latn_TR"/>		<!--Abaza‧?‧Türkiye	➡ Abaza‧Latin‧Türkiye-->
+		<likelySubtag from="abq_Latn" to="abq_Latn_TR"/>		<!--Abaza‧Latin‧?	➡ Abaza‧Latin‧Türkiye-->
 		<likelySubtag from="abr" to="abr_Latn_GH"/>		<!--Abron‧?‧?	➡ Abron‧Latin‧Ghana-->
 		<likelySubtag from="ace" to="ace_Latn_ID"/>		<!--Acehnese‧?‧?	➡ Acehnese‧Latin‧Indonesia-->
 		<likelySubtag from="ach" to="ach_Latn_UG"/>		<!--Acoli‧?‧?	➡ Acoli‧Latin‧Uganda-->
+		<likelySubtag from="acr" to="acr_Latn_GT"/>		<!--Achi‧?‧?	➡ Achi‧Latin‧Guatemala-->
 		<likelySubtag from="ada" to="ada_Latn_GH"/>		<!--Adangme‧?‧?	➡ Adangme‧Latin‧Ghana-->
 		<likelySubtag from="ady" to="ady_Cyrl_RU"/>		<!--Adyghe‧?‧?	➡ Adyghe‧Cyrillic‧Russia-->
 		<likelySubtag from="ae" to="ae_Avst_IR"/>		<!--Avestan‧?‧?	➡ Avestan‧Avestan‧Iran-->
 		<likelySubtag from="aeb" to="aeb_Arab_TN"/>		<!--Tunisian Arabic‧?‧?	➡ Tunisian Arabic‧Arabic‧Tunisia-->
 		<likelySubtag from="af" to="af_Latn_ZA"/>		<!--Afrikaans‧?‧?	➡ Afrikaans‧Latin‧South Africa-->
 		<likelySubtag from="agq" to="agq_Latn_CM"/>		<!--Aghem‧?‧?	➡ Aghem‧Latin‧Cameroon-->
+		<likelySubtag from="agu" to="agu_Latn_GT"/>		<!--Aguacateco‧?‧?	➡ Aguacateco‧Latin‧Guatemala-->
 		<likelySubtag from="aho" to="aho_Ahom_IN"/>		<!--Ahom‧?‧?	➡ Ahom‧Ahom‧India-->
 		<likelySubtag from="ak" to="ak_Latn_GH"/>		<!--Akan‧?‧?	➡ Akan‧Latin‧Ghana-->
 		<likelySubtag from="akk" to="akk_Xsux_IQ"/>		<!--Akkadian‧?‧?	➡ Akkadian‧Sumero-Akkadian Cuneiform‧Iraq-->
@@ -112,7 +117,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="brx" to="brx_Deva_IN"/>		<!--Bodo‧?‧?	➡ Bodo‧Devanagari‧India-->
 		<likelySubtag from="bs" to="bs_Latn_BA"/>		<!--Bosnian‧?‧?	➡ Bosnian‧Latin‧Bosnia & Herzegovina-->
 		<likelySubtag from="bsc" to="bsc_Latn_SN"/>		<!--Bassari‧?‧?	➡ Bassari‧Latin‧Senegal-->
-		<likelySubtag from="bsq" to="bsq_Bass_LR"/>		<!--Bassa‧?‧?	➡ Bassa‧Bassa Vah‧Liberia-->
+		<likelySubtag from="bsq" to="bsq_Latn_LR"/>		<!--Bassa‧?‧?	➡ Bassa‧Latin‧Liberia-->
 		<likelySubtag from="bss" to="bss_Latn_CM"/>		<!--Akoose‧?‧?	➡ Akoose‧Latin‧Cameroon-->
 		<likelySubtag from="bto" to="bto_Latn_PH"/>		<!--Rinconada Bikol‧?‧?	➡ Rinconada Bikol‧Latin‧Philippines-->
 		<likelySubtag from="btv" to="btv_Deva_PK"/>		<!--Bateri‧?‧?	➡ Bateri‧Devanagari‧Pakistan-->
@@ -123,9 +128,15 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="bvb" to="bvb_Latn_GQ"/>		<!--Bube‧?‧?	➡ Bube‧Latin‧Equatorial Guinea-->
 		<likelySubtag from="byn" to="byn_Ethi_ER"/>		<!--Blin‧?‧?	➡ Blin‧Ethiopic‧Eritrea-->
 		<likelySubtag from="byv" to="byv_Latn_CM"/>		<!--Medumba‧?‧?	➡ Medumba‧Latin‧Cameroon-->
+		<likelySubtag from="bza" to="bza_Latn_LR"/>		<!--Bandi‧?‧?	➡ Bandi‧Latin‧Liberia-->
 		<likelySubtag from="bze" to="bze_Latn_ML"/>		<!--Jenaama Bozo‧?‧?	➡ Jenaama Bozo‧Latin‧Mali-->
+		<likelySubtag from="bzj" to="bzj_Latn_BZ"/>		<!--Belize Kriol English‧?‧?	➡ Belize Kriol English‧Latin‧Belize-->
 		<likelySubtag from="ca" to="ca_Latn_ES"/>		<!--Catalan‧?‧?	➡ Catalan‧Latin‧Spain-->
+		<likelySubtag from="caa" to="caa_Latn_GT"/>		<!--Chortí‧?‧?	➡ Chortí‧Latin‧Guatemala-->
+		<likelySubtag from="cab" to="cab_Latn_HN"/>		<!--Garifuna‧?‧?	➡ Garifuna‧Latin‧Honduras-->
+		<likelySubtag from="cac" to="cac_Latn_GT"/>		<!--Chuj‧?‧?	➡ Chuj‧Latin‧Guatemala-->
 		<likelySubtag from="cad" to="cad_Latn_US"/>		<!--Caddo‧?‧?	➡ Caddo‧Latin‧United States-->
+		<likelySubtag from="cak" to="cak_Latn_GT"/>		<!--Kaqchikel‧?‧?	➡ Kaqchikel‧Latin‧Guatemala-->
 		<likelySubtag from="cch" to="cch_Latn_NG"/>		<!--Atsam‧?‧?	➡ Atsam‧Latin‧Nigeria-->
 		<likelySubtag from="ccp" to="ccp_Cakm_BD"/>		<!--Chakma‧?‧?	➡ Chakma‧Chakma‧Bangladesh-->
 		<likelySubtag from="ccr" to="ccr_Latn_SV"/>		<!--Cacaopera‧?‧?	➡ Cacaopera‧Latin‧El Salvador-->
@@ -142,6 +153,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="cja" to="cja_Arab_KH"/>		<!--Western Cham‧?‧?	➡ Western Cham‧Arabic‧Cambodia-->
 		<likelySubtag from="cjm" to="cjm_Cham_VN"/>		<!--Eastern Cham‧?‧?	➡ Eastern Cham‧Cham‧Vietnam-->
 		<likelySubtag from="ckb" to="ckb_Arab_IQ"/>		<!--Central Kurdish‧?‧?	➡ Central Kurdish‧Arabic‧Iraq-->
+		<likelySubtag from="ckz" to="ckz_Latn_GT"/>		<!--Cakchiquel-Quiché Mixed Language‧?‧?	➡ Cakchiquel-Quiché Mixed Language‧Latin‧Guatemala-->
 		<likelySubtag from="clc" to="clc_Latn_CA"/>		<!--Chilcotin‧?‧?	➡ Chilcotin‧Latin‧Canada-->
 		<likelySubtag from="cmg" to="cmg_Soyo_MN"/>		<!--Classical Mongolian‧?‧?	➡ Classical Mongolian‧Soyombo‧Mongolia-->
 		<likelySubtag from="co" to="co_Latn_FR"/>		<!--Corsican‧?‧?	➡ Corsican‧Latin‧France-->
@@ -248,7 +260,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="gor" to="gor_Latn_ID"/>		<!--Gorontalo‧?‧?	➡ Gorontalo‧Latin‧Indonesia-->
 		<likelySubtag from="gos" to="gos_Latn_NL"/>		<!--Gronings‧?‧?	➡ Gronings‧Latin‧Netherlands-->
 		<likelySubtag from="got" to="got_Goth_UA"/>		<!--Gothic‧?‧?	➡ Gothic‧Gothic‧Ukraine-->
+		<likelySubtag from="grb" to="grb_Latn_LR"/>		<!--Grebo‧?‧?	➡ Grebo‧Latin‧Liberia-->
 		<likelySubtag from="grc" to="grc_Grek_GR"/>		<!--Ancient Greek‧?‧?	➡ Ancient Greek‧Greek‧Greece-->
+		<likelySubtag from="grr" to="grr_Arab_DZ"/>		<!--Taznatit‧?‧?	➡ Taznatit‧Arabic‧Algeria-->
 		<likelySubtag from="grt" to="grt_Beng_IN"/>		<!--Garo‧?‧?	➡ Garo‧Bangla‧India-->
 		<likelySubtag from="gsw" to="gsw_Latn_CH"/>		<!--Swiss German‧?‧?	➡ Swiss German‧Latin‧Switzerland-->
 		<likelySubtag from="gu" to="gu_Gujr_IN"/>		<!--Gujarati‧?‧?	➡ Gujarati‧Gujarati‧India-->
@@ -305,10 +319,13 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="io" to="io_Latn_001"/>		<!--Ido‧?‧?	➡ Ido‧Latin‧world-->
 		<likelySubtag from="is" to="is_Latn_IS"/>		<!--Icelandic‧?‧?	➡ Icelandic‧Latin‧Iceland-->
 		<likelySubtag from="it" to="it_Latn_IT"/>		<!--Italian‧?‧?	➡ Italian‧Latin‧Italy-->
+		<likelySubtag from="itz" to="itz_Latn_GT"/>		<!--Itzá‧?‧?	➡ Itzá‧Latin‧Guatemala-->
 		<likelySubtag from="iu" to="iu_Cans_CA"/>		<!--Inuktitut‧?‧?	➡ Inuktitut‧Unified Canadian Aboriginal Syllabics‧Canada-->
 		<likelySubtag from="iw" to="iw_Hebr_IL"/>		<!--Hebrew‧?‧?	➡ Hebrew‧Hebrew‧Israel-->
+		<likelySubtag from="ixl" to="ixl_Latn_GT"/>		<!--Ixil‧?‧?	➡ Ixil‧Latin‧Guatemala-->
 		<likelySubtag from="izh" to="izh_Latn_RU"/>		<!--Ingrian‧?‧?	➡ Ingrian‧Latin‧Russia-->
 		<likelySubtag from="ja" to="ja_Jpan_JP"/>		<!--Japanese‧?‧?	➡ Japanese‧Japanese‧Japan-->
+		<likelySubtag from="jac" to="jac_Latn_GT"/>		<!--Popti'‧?‧?	➡ Popti'‧Latin‧Guatemala-->
 		<likelySubtag from="jam" to="jam_Latn_JM"/>		<!--Jamaican Creole English‧?‧?	➡ Jamaican Creole English‧Latin‧Jamaica-->
 		<likelySubtag from="jbo" to="jbo_Latn_001"/>		<!--Lojban‧?‧?	➡ Lojban‧Latin‧world-->
 		<likelySubtag from="jgo" to="jgo_Latn_CM"/>		<!--Ngomba‧?‧?	➡ Ngomba‧Latin‧Cameroon-->
@@ -334,6 +351,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kdh" to="kdh_Latn_TG"/>		<!--Tem‧?‧?	➡ Tem‧Latin‧Togo-->
 		<likelySubtag from="kdt" to="kdt_Thai_TH"/>		<!--Kuy‧?‧?	➡ Kuy‧Thai‧Thailand-->
 		<likelySubtag from="kea" to="kea_Latn_CV"/>		<!--Kabuverdianu‧?‧?	➡ Kabuverdianu‧Latin‧Cape Verde-->
+		<likelySubtag from="kek" to="kek_Latn_GT"/>		<!--Qʼeqchiʼ‧?‧?	➡ Qʼeqchiʼ‧Latin‧Guatemala-->
 		<likelySubtag from="ken" to="ken_Latn_CM"/>		<!--Kenyang‧?‧?	➡ Kenyang‧Latin‧Cameroon-->
 		<likelySubtag from="kfo" to="kfo_Latn_CI"/>		<!--Koro‧?‧?	➡ Koro‧Latin‧Côte d’Ivoire-->
 		<likelySubtag from="kfr" to="kfr_Deva_IN"/>		<!--Kachhi‧?‧?	➡ Kachhi‧Devanagari‧India-->
@@ -350,6 +368,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ki" to="ki_Latn_KE"/>		<!--Kikuyu‧?‧?	➡ Kikuyu‧Latin‧Kenya-->
 		<likelySubtag from="kiu" to="kiu_Latn_TR"/>		<!--Kirmanjki‧?‧?	➡ Kirmanjki‧Latin‧Türkiye-->
 		<likelySubtag from="kj" to="kj_Latn_NA"/>		<!--Kuanyama‧?‧?	➡ Kuanyama‧Latin‧Namibia-->
+		<likelySubtag from="kjb" to="kjb_Latn_GT"/>		<!--Q'anjob'al‧?‧?	➡ Q'anjob'al‧Latin‧Guatemala-->
 		<likelySubtag from="kjg" to="kjg_Laoo_LA"/>		<!--Khmu‧?‧?	➡ Khmu‧Lao‧Laos-->
 		<likelySubtag from="kk" to="kk_Cyrl_KZ"/>		<!--Kazakh‧?‧?	➡ Kazakh‧Cyrillic‧Kazakhstan-->
 		<likelySubtag from="kk_AF" to="kk_Arab_AF"/>		<!--Kazakh‧?‧Afghanistan	➡ Kazakh‧Arabic‧Afghanistan-->
@@ -364,6 +383,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kmb" to="kmb_Latn_AO"/>		<!--Kimbundu‧?‧?	➡ Kimbundu‧Latin‧Angola-->
 		<likelySubtag from="kn" to="kn_Knda_IN"/>		<!--Kannada‧?‧?	➡ Kannada‧Kannada‧India-->
 		<likelySubtag from="knf" to="knf_Latn_GW"/>		<!--Mankanya‧?‧?	➡ Mankanya‧Latin‧Guinea-Bissau-->
+		<likelySubtag from="knj" to="knj_Latn_GT"/>		<!--Western Kanjobal‧?‧?	➡ Western Kanjobal‧Latin‧Guatemala-->
 		<likelySubtag from="knn" to="knn_Deva_IN"/>		<!--Konkani (individual language)‧?‧?	➡ Konkani (individual language)‧Devanagari‧India-->
 		<likelySubtag from="ko" to="ko_Kore_KR"/>		<!--Korean‧?‧?	➡ Korean‧Korean‧South Korea-->
 		<likelySubtag from="koi" to="koi_Cyrl_RU"/>		<!--Komi-Permyak‧?‧?	➡ Komi-Permyak‧Cyrillic‧Russia-->
@@ -375,14 +395,23 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kri" to="kri_Latn_SL"/>		<!--Krio‧?‧?	➡ Krio‧Latin‧Sierra Leone-->
 		<likelySubtag from="krj" to="krj_Latn_PH"/>		<!--Kinaray-a‧?‧?	➡ Kinaray-a‧Latin‧Philippines-->
 		<likelySubtag from="krl" to="krl_Latn_RU"/>		<!--Karelian‧?‧?	➡ Karelian‧Latin‧Russia-->
+		<likelySubtag from="kro" to="kro_Latn_LR"/>		<!--Kru‧?‧?	➡ Kru‧Latin‧Liberia-->
 		<likelySubtag from="kru" to="kru_Deva_IN"/>		<!--Kurukh‧?‧?	➡ Kurukh‧Devanagari‧India-->
 		<likelySubtag from="ks" to="ks_Arab_IN"/>		<!--Kashmiri‧?‧?	➡ Kashmiri‧Arabic‧India-->
 		<likelySubtag from="ksb" to="ksb_Latn_TZ"/>		<!--Shambala‧?‧?	➡ Shambala‧Latin‧Tanzania-->
 		<likelySubtag from="ksf" to="ksf_Latn_CM"/>		<!--Bafia‧?‧?	➡ Bafia‧Latin‧Cameroon-->
 		<likelySubtag from="ksh" to="ksh_Latn_DE"/>		<!--Colognian‧?‧?	➡ Colognian‧Latin‧Germany-->
+		<likelySubtag from="kss" to="kss_Latn_LR"/>		<!--Southern Kisi‧?‧?	➡ Southern Kisi‧Latin‧Liberia-->
 		<likelySubtag from="ku" to="ku_Latn_TR"/>		<!--Kurdish‧?‧?	➡ Kurdish‧Latin‧Türkiye-->
+		<likelySubtag from="ku_AM" to="ku_Cyrl_AM"/>		<!--Kurdish‧?‧Armenia	➡ Kurdish‧Cyrillic‧Armenia-->
+		<likelySubtag from="ku_AZ" to="ku_Cyrl_AZ"/>		<!--Kurdish‧?‧Azerbaijan	➡ Kurdish‧Cyrillic‧Azerbaijan-->
+		<likelySubtag from="ku_GE" to="ku_Cyrl_GE"/>		<!--Kurdish‧?‧Georgia	➡ Kurdish‧Cyrillic‧Georgia-->
+		<likelySubtag from="ku_IQ" to="ku_Arab_IQ"/>		<!--Kurdish‧?‧Iraq	➡ Kurdish‧Arabic‧Iraq-->
+		<likelySubtag from="ku_IR" to="ku_Arab_IR"/>		<!--Kurdish‧?‧Iran	➡ Kurdish‧Arabic‧Iran-->
 		<likelySubtag from="ku_LB" to="ku_Arab_LB"/>		<!--Kurdish‧?‧Lebanon	➡ Kurdish‧Arabic‧Lebanon-->
+		<likelySubtag from="ku_TM" to="ku_Cyrl_TM"/>		<!--Kurdish‧?‧Turkmenistan	➡ Kurdish‧Cyrillic‧Turkmenistan-->
 		<likelySubtag from="ku_Arab" to="ku_Arab_IQ"/>		<!--Kurdish‧Arabic‧?	➡ Kurdish‧Arabic‧Iraq-->
+		<likelySubtag from="ku_Cyrl" to="ku_Cyrl_AM"/>		<!--Kurdish‧Cyrillic‧?	➡ Kurdish‧Cyrillic‧Armenia-->
 		<likelySubtag from="ku_Yezi" to="ku_Yezi_GE"/>		<!--Kurdish‧Yezidi‧?	➡ Kurdish‧Yezidi‧Georgia-->
 		<likelySubtag from="kum" to="kum_Cyrl_RU"/>		<!--Kumyk‧?‧?	➡ Kumyk‧Cyrillic‧Russia-->
 		<likelySubtag from="kv" to="kv_Cyrl_RU"/>		<!--Komi‧?‧?	➡ Komi‧Cyrillic‧Russia-->
@@ -398,6 +427,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ky_TR" to="ky_Latn_TR"/>		<!--Kyrgyz‧?‧Türkiye	➡ Kyrgyz‧Latin‧Türkiye-->
 		<likelySubtag from="ky_Arab" to="ky_Arab_CN"/>		<!--Kyrgyz‧Arabic‧?	➡ Kyrgyz‧Arabic‧China-->
 		<likelySubtag from="ky_Latn" to="ky_Latn_TR"/>		<!--Kyrgyz‧Latin‧?	➡ Kyrgyz‧Latin‧Türkiye-->
+		<likelySubtag from="kyw" to="kyw_Deva_IN"/>		<!--Kudmali‧?‧?	➡ Kudmali‧Devanagari‧India-->
 		<likelySubtag from="la" to="la_Latn_VA"/>		<!--Latin‧?‧?	➡ Latin‧Latin‧Vatican City-->
 		<likelySubtag from="lab" to="lab_Lina_GR"/>		<!--Linear A‧?‧?	➡ Linear A‧Linear A‧Greece-->
 		<likelySubtag from="lad" to="lad_Hebr_IL"/>		<!--Ladino‧?‧?	➡ Ladino‧Hebrew‧Israel-->
@@ -418,6 +448,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="lif_Limb" to="lif_Limb_IN"/>		<!--Limbu‧Limbu‧?	➡ Limbu‧Limbu‧India-->
 		<likelySubtag from="lij" to="lij_Latn_IT"/>		<!--Ligurian‧?‧?	➡ Ligurian‧Latin‧Italy-->
 		<likelySubtag from="lil" to="lil_Latn_CA"/>		<!--Lillooet‧?‧?	➡ Lillooet‧Latin‧Canada-->
+		<likelySubtag from="lir" to="lir_Latn_LR"/>		<!--Liberian English‧?‧?	➡ Liberian English‧Latin‧Liberia-->
 		<likelySubtag from="lis" to="lis_Lisu_CN"/>		<!--Lisu‧?‧?	➡ Lisu‧Fraser‧China-->
 		<likelySubtag from="ljp" to="ljp_Latn_ID"/>		<!--Lampung Api‧?‧?	➡ Lampung Api‧Latin‧Indonesia-->
 		<likelySubtag from="lki" to="lki_Arab_IR"/>		<!--Laki‧?‧?	➡ Laki‧Arabic‧Iran-->
@@ -441,7 +472,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="luz" to="luz_Arab_IR"/>		<!--Southern Luri‧?‧?	➡ Southern Luri‧Arabic‧Iran-->
 		<likelySubtag from="lv" to="lv_Latn_LV"/>		<!--Latvian‧?‧?	➡ Latvian‧Latin‧Latvia-->
 		<likelySubtag from="lwl" to="lwl_Thai_TH"/>		<!--Eastern Lawa‧?‧?	➡ Eastern Lawa‧Thai‧Thailand-->
-		<likelySubtag from="lzh" to="lzh_Hans_CN"/>		<!--Literary Chinese‧?‧?	➡ Literary Chinese‧Simplified‧China-->
+		<likelySubtag from="lzh" to="lzh_Hant_CN"/>		<!--Literary Chinese‧?‧?	➡ Literary Chinese‧Traditional‧China-->
 		<likelySubtag from="lzz" to="lzz_Latn_TR"/>		<!--Laz‧?‧?	➡ Laz‧Latin‧Türkiye-->
 		<likelySubtag from="lzz_GE" to="lzz_Geor_GE"/>		<!--Laz‧?‧Georgia	➡ Laz‧Georgian‧Georgia-->
 		<likelySubtag from="lzz_Geor" to="lzz_Geor_GE"/>		<!--Laz‧Georgian‧?	➡ Laz‧Georgian‧Georgia-->
@@ -450,6 +481,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mag" to="mag_Deva_IN"/>		<!--Magahi‧?‧?	➡ Magahi‧Devanagari‧India-->
 		<likelySubtag from="mai" to="mai_Deva_IN"/>		<!--Maithili‧?‧?	➡ Maithili‧Devanagari‧India-->
 		<likelySubtag from="mak" to="mak_Latn_ID"/>		<!--Makasar‧?‧?	➡ Makasar‧Latin‧Indonesia-->
+		<likelySubtag from="mam" to="mam_Latn_GT"/>		<!--Mam‧?‧?	➡ Mam‧Latin‧Guatemala-->
 		<likelySubtag from="man" to="man_Latn_GM"/>		<!--Mandingo‧?‧?	➡ Mandingo‧Latin‧Gambia-->
 		<likelySubtag from="man_Nkoo" to="man_Nkoo_GN"/>		<!--Mandingo‧N’Ko‧?	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="mas" to="mas_Latn_KE"/>		<!--Masai‧?‧?	➡ Masai‧Latin‧Kenya-->
@@ -459,7 +491,10 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mdr" to="mdr_Latn_ID"/>		<!--Mandar‧?‧?	➡ Mandar‧Latin‧Indonesia-->
 		<likelySubtag from="men" to="men_Latn_SL"/>		<!--Mende‧?‧?	➡ Mende‧Latin‧Sierra Leone-->
 		<likelySubtag from="mer" to="mer_Latn_KE"/>		<!--Meru‧?‧?	➡ Meru‧Latin‧Kenya-->
-		<likelySubtag from="mey" to="mey_Latn_SN"/>		<!--Hassaniyya‧?‧?	➡ Hassaniyya‧Latin‧Senegal-->
+		<likelySubtag from="mev" to="mev_Latn_LR"/>		<!--Mano‧?‧?	➡ Mano‧Latin‧Liberia-->
+		<likelySubtag from="mey" to="mey_Arab_DZ"/>		<!--Hassaniyya‧?‧?	➡ Hassaniyya‧Arabic‧Algeria-->
+		<likelySubtag from="mey_SN" to="mey_Latn_SN"/>		<!--Hassaniyya‧?‧Senegal	➡ Hassaniyya‧Latin‧Senegal-->
+		<likelySubtag from="mey_Latn" to="mey_Latn_SN"/>		<!--Hassaniyya‧Latin‧?	➡ Hassaniyya‧Latin‧Senegal-->
 		<likelySubtag from="mfa" to="mfa_Arab_TH"/>		<!--Pattani Malay‧?‧?	➡ Pattani Malay‧Arabic‧Thailand-->
 		<likelySubtag from="mfe" to="mfe_Latn_MU"/>		<!--Morisyen‧?‧?	➡ Morisyen‧Latin‧Mauritius-->
 		<likelySubtag from="mfv" to="mfv_Latn_SN"/>		<!--Mandjak‧?‧?	➡ Mandjak‧Latin‧Senegal-->
@@ -469,7 +504,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mgp" to="mgp_Deva_NP"/>		<!--Eastern Magar‧?‧?	➡ Eastern Magar‧Devanagari‧Nepal-->
 		<likelySubtag from="mgy" to="mgy_Latn_TZ"/>		<!--Mbunga‧?‧?	➡ Mbunga‧Latin‧Tanzania-->
 		<likelySubtag from="mh" to="mh_Latn_MH"/>		<!--Marshallese‧?‧?	➡ Marshallese‧Latin‧Marshall Islands-->
-		<likelySubtag from="mhn" to="mhn_Latn_IT"/>		<!--Mócheno‧?‧?	➡ Mócheno‧Latin‧Italy-->
+		<likelySubtag from="mhn" to="mhn_Latn_IT"/>		<!--Mòcheno‧?‧?	➡ Mòcheno‧Latin‧Italy-->
 		<likelySubtag from="mi" to="mi_Latn_NZ"/>		<!--Māori‧?‧?	➡ Māori‧Latin‧New Zealand-->
 		<likelySubtag from="mic" to="mic_Latn_CA"/>		<!--Mi'kmaw‧?‧?	➡ Mi'kmaw‧Latin‧Canada-->
 		<likelySubtag from="min" to="min_Latn_ID"/>		<!--Minangkabau‧?‧?	➡ Minangkabau‧Latin‧Indonesia-->
@@ -484,6 +519,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mo" to="mo_Latn_RO"/>		<!--Moldavian‧?‧?	➡ Moldavian‧Latin‧Romania-->
 		<likelySubtag from="moe" to="moe_Latn_CA"/>		<!--Innu-aimun‧?‧?	➡ Innu-aimun‧Latin‧Canada-->
 		<likelySubtag from="moh" to="moh_Latn_CA"/>		<!--Mohawk‧?‧?	➡ Mohawk‧Latin‧Canada-->
+		<likelySubtag from="mop" to="mop_Latn_BZ"/>		<!--Mopán Maya‧?‧?	➡ Mopán Maya‧Latin‧Belize-->
 		<likelySubtag from="mos" to="mos_Latn_BF"/>		<!--Mossi‧?‧?	➡ Mossi‧Latin‧Burkina Faso-->
 		<likelySubtag from="mr" to="mr_Deva_IN"/>		<!--Marathi‧?‧?	➡ Marathi‧Devanagari‧India-->
 		<likelySubtag from="mrd" to="mrd_Deva_NP"/>		<!--Western Magar‧?‧?	➡ Western Magar‧Devanagari‧Nepal-->
@@ -505,9 +541,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="myv" to="myv_Cyrl_RU"/>		<!--Erzya‧?‧?	➡ Erzya‧Cyrillic‧Russia-->
 		<likelySubtag from="myx" to="myx_Latn_UG"/>		<!--Masaaba‧?‧?	➡ Masaaba‧Latin‧Uganda-->
 		<likelySubtag from="myz" to="myz_Mand_IR"/>		<!--Classical Mandaic‧?‧?	➡ Classical Mandaic‧Mandaean‧Iran-->
+		<likelySubtag from="mzb" to="mzb_Arab_DZ"/>		<!--Tumzabt‧?‧?	➡ Tumzabt‧Arabic‧Algeria-->
 		<likelySubtag from="mzn" to="mzn_Arab_IR"/>		<!--Mazanderani‧?‧?	➡ Mazanderani‧Arabic‧Iran-->
 		<likelySubtag from="na" to="na_Latn_NR"/>		<!--Nauru‧?‧?	➡ Nauru‧Latin‧Nauru-->
 		<likelySubtag from="nan" to="nan_Hans_CN"/>		<!--Min Nan Chinese‧?‧?	➡ Min Nan Chinese‧Simplified‧China-->
+		<likelySubtag from="nan_MO" to="nan_Hant_MO"/>		<!--Min Nan Chinese‧?‧Macao SAR China	➡ Min Nan Chinese‧Traditional‧Macao SAR China-->
 		<likelySubtag from="nan_TW" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧?‧Taiwan	➡ Min Nan Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="nan_Hant" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧Traditional‧?	➡ Min Nan Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="nap" to="nap_Latn_IT"/>		<!--Neapolitan‧?‧?	➡ Neapolitan‧Latin‧Italy-->
@@ -574,7 +612,17 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pdt" to="pdt_Latn_CA"/>		<!--Plautdietsch‧?‧?	➡ Plautdietsch‧Latin‧Canada-->
 		<likelySubtag from="peo" to="peo_Xpeo_IR"/>		<!--Old Persian‧?‧?	➡ Old Persian‧Old Persian‧Iran-->
 		<likelySubtag from="pfl" to="pfl_Latn_DE"/>		<!--Palatine German‧?‧?	➡ Palatine German‧Latin‧Germany-->
+		<likelySubtag from="pgd" to="pgd_Khar_PK"/>		<!--Gāndhārī‧?‧?	➡ Gāndhārī‧Kharoshthi‧Pakistan-->
 		<likelySubtag from="phn" to="phn_Phnx_LB"/>		<!--Phoenician‧?‧?	➡ Phoenician‧Phoenician‧Lebanon-->
+		<likelySubtag from="pi" to="pi_Latn_GB"/>		<!--Pali‧?‧?	➡ Pali‧Latin‧United Kingdom-->
+		<likelySubtag from="pi_IN" to="pi_Deva_IN"/>		<!--Pali‧?‧India	➡ Pali‧Devanagari‧India-->
+		<likelySubtag from="pi_LK" to="pi_Sinh_LK"/>		<!--Pali‧?‧Sri Lanka	➡ Pali‧Sinhala‧Sri Lanka-->
+		<likelySubtag from="pi_MM" to="pi_Mymr_MM"/>		<!--Pali‧?‧Myanmar (Burma)	➡ Pali‧Myanmar‧Myanmar (Burma)-->
+		<likelySubtag from="pi_TH" to="pi_Thai_TH"/>		<!--Pali‧?‧Thailand	➡ Pali‧Thai‧Thailand-->
+		<likelySubtag from="pi_Deva" to="pi_Deva_IN"/>		<!--Pali‧Devanagari‧?	➡ Pali‧Devanagari‧India-->
+		<likelySubtag from="pi_Mymr" to="pi_Mymr_MM"/>		<!--Pali‧Myanmar‧?	➡ Pali‧Myanmar‧Myanmar (Burma)-->
+		<likelySubtag from="pi_Sinh" to="pi_Sinh_LK"/>		<!--Pali‧Sinhala‧?	➡ Pali‧Sinhala‧Sri Lanka-->
+		<likelySubtag from="pi_Thai" to="pi_Thai_TH"/>		<!--Pali‧Thai‧?	➡ Pali‧Thai‧Thailand-->
 		<likelySubtag from="pis" to="pis_Latn_SB"/>		<!--Pijin‧?‧?	➡ Pijin‧Latin‧Solomon Islands-->
 		<likelySubtag from="pka" to="pka_Brah_IN"/>		<!--Ardhamāgadhī Prākrit‧?‧?	➡ Ardhamāgadhī Prākrit‧Brahmi‧India-->
 		<likelySubtag from="pko" to="pko_Latn_KE"/>		<!--Pökoot‧?‧?	➡ Pökoot‧Latin‧Kenya-->
@@ -585,10 +633,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pnt_TR" to="pnt_Latn_TR"/>		<!--Pontic‧?‧Türkiye	➡ Pontic‧Latin‧Türkiye-->
 		<likelySubtag from="pnt_Cyrl" to="pnt_Cyrl_RU"/>		<!--Pontic‧Cyrillic‧?	➡ Pontic‧Cyrillic‧Russia-->
 		<likelySubtag from="pnt_Latn" to="pnt_Latn_TR"/>		<!--Pontic‧Latin‧?	➡ Pontic‧Latin‧Türkiye-->
+		<likelySubtag from="poc" to="poc_Latn_GT"/>		<!--Poqomam‧?‧?	➡ Poqomam‧Latin‧Guatemala-->
+		<likelySubtag from="poh" to="poh_Latn_GT"/>		<!--Poqomchi'‧?‧?	➡ Poqomchi'‧Latin‧Guatemala-->
 		<likelySubtag from="pon" to="pon_Latn_FM"/>		<!--Pohnpeian‧?‧?	➡ Pohnpeian‧Latin‧Micronesia-->
 		<likelySubtag from="ppl" to="ppl_Latn_SV"/>		<!--Pipil‧?‧?	➡ Pipil‧Latin‧El Salvador-->
 		<likelySubtag from="pqm" to="pqm_Latn_CA"/>		<!--Maliseet-Passamaquoddy‧?‧?	➡ Maliseet-Passamaquoddy‧Latin‧Canada-->
-		<likelySubtag from="pra" to="pra_Khar_PK"/>		<!--Prakrit languages‧?‧?	➡ Prakrit languages‧Kharoshthi‧Pakistan-->
 		<likelySubtag from="prd" to="prd_Arab_IR"/>		<!--Parsi-Dari‧?‧?	➡ Parsi-Dari‧Arabic‧Iran-->
 		<likelySubtag from="prg" to="prg_Latn_PL"/>		<!--Prussian‧?‧?	➡ Prussian‧Latin‧Poland-->
 		<likelySubtag from="ps" to="ps_Arab_AF"/>		<!--Pashto‧?‧?	➡ Pashto‧Arabic‧Afghanistan-->
@@ -597,6 +646,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="qu" to="qu_Latn_PE"/>		<!--Quechua‧?‧?	➡ Quechua‧Latin‧Peru-->
 		<likelySubtag from="quc" to="quc_Latn_GT"/>		<!--Kʼicheʼ‧?‧?	➡ Kʼicheʼ‧Latin‧Guatemala-->
 		<likelySubtag from="qug" to="qug_Latn_EC"/>		<!--Chimborazo Highland Quichua‧?‧?	➡ Chimborazo Highland Quichua‧Latin‧Ecuador-->
+		<likelySubtag from="qum" to="qum_Latn_GT"/>		<!--Sipacapense‧?‧?	➡ Sipacapense‧Latin‧Guatemala-->
+		<likelySubtag from="quv" to="quv_Latn_GT"/>		<!--Sacapulteco‧?‧?	➡ Sacapulteco‧Latin‧Guatemala-->
 		<likelySubtag from="raj" to="raj_Deva_IN"/>		<!--Rajasthani‧?‧?	➡ Rajasthani‧Devanagari‧India-->
 		<likelySubtag from="rcf" to="rcf_Latn_RE"/>		<!--Réunion Creole French‧?‧?	➡ Réunion Creole French‧Latin‧Réunion-->
 		<likelySubtag from="rej" to="rej_Latn_ID"/>		<!--Rejang‧?‧?	➡ Rejang‧Latin‧Indonesia-->
@@ -673,6 +724,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="sog" to="sog_Sogd_UZ"/>		<!--Sogdien‧?‧?	➡ Sogdien‧Sogdian‧Uzbekistan-->
 		<likelySubtag from="sou" to="sou_Thai_TH"/>		<!--Southern Thai‧?‧?	➡ Southern Thai‧Thai‧Thailand-->
 		<likelySubtag from="sq" to="sq_Latn_AL"/>		<!--Albanian‧?‧?	➡ Albanian‧Latin‧Albania-->
+		<likelySubtag from="sqm" to="sqm_Latn_CF"/>		<!--Suma‧?‧?	➡ Suma‧Latin‧Central African Republic-->
 		<likelySubtag from="sr" to="sr_Cyrl_RS"/>		<!--Serbian‧?‧?	➡ Serbian‧Cyrillic‧Serbia-->
 		<likelySubtag from="sr_ME" to="sr_Latn_ME"/>		<!--Serbian‧?‧Montenegro	➡ Serbian‧Latin‧Montenegro-->
 		<likelySubtag from="sr_RO" to="sr_Latn_RO"/>		<!--Serbian‧?‧Romania	➡ Serbian‧Latin‧Romania-->
@@ -685,10 +737,13 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ssy" to="ssy_Latn_ER"/>		<!--Saho‧?‧?	➡ Saho‧Latin‧Eritrea-->
 		<likelySubtag from="st" to="st_Latn_ZA"/>		<!--Southern Sotho‧?‧?	➡ Southern Sotho‧Latin‧South Africa-->
 		<likelySubtag from="stq" to="stq_Latn_DE"/>		<!--Saterland Frisian‧?‧?	➡ Saterland Frisian‧Latin‧Germany-->
+		<likelySubtag from="stu" to="stu_Lana_MM"/>		<!--Samtao‧?‧?	➡ Samtao‧Lanna‧Myanmar (Burma)-->
+		<likelySubtag from="stu_CN" to="stu_Tale_CN"/>		<!--Samtao‧?‧China	➡ Samtao‧Tai Le‧China-->
+		<likelySubtag from="stu_Tale" to="stu_Tale_CN"/>		<!--Samtao‧Tai Le‧?	➡ Samtao‧Tai Le‧China-->
 		<likelySubtag from="su" to="su_Latn_ID"/>		<!--Sundanese‧?‧?	➡ Sundanese‧Latin‧Indonesia-->
 		<likelySubtag from="suk" to="suk_Latn_TZ"/>		<!--Sukuma‧?‧?	➡ Sukuma‧Latin‧Tanzania-->
 		<likelySubtag from="sus" to="sus_Latn_GN"/>		<!--Susu‧?‧?	➡ Susu‧Latin‧Guinea-->
-		<likelySubtag from="suz" to="suz_Sunu_NP"/>		<!--Sunwar‧?‧?	➡ Sunwar‧Sunuwar‧Nepal-->
+		<likelySubtag from="suz" to="suz_Deva_NP"/>		<!--Sunwar‧?‧?	➡ Sunwar‧Devanagari‧Nepal-->
 		<likelySubtag from="sv" to="sv_Latn_SE"/>		<!--Swedish‧?‧?	➡ Swedish‧Latin‧Sweden-->
 		<likelySubtag from="sw" to="sw_Latn_TZ"/>		<!--Swahili‧?‧?	➡ Swahili‧Latin‧Tanzania-->
 		<likelySubtag from="swb" to="swb_Arab_YT"/>		<!--Comorian‧?‧?	➡ Comorian‧Arabic‧Mayotte-->
@@ -720,7 +775,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tig" to="tig_Ethi_ER"/>		<!--Tigre‧?‧?	➡ Tigre‧Ethiopic‧Eritrea-->
 		<likelySubtag from="tiv" to="tiv_Latn_NG"/>		<!--Tiv‧?‧?	➡ Tiv‧Latin‧Nigeria-->
 		<likelySubtag from="tk" to="tk_Latn_TM"/>		<!--Turkmen‧?‧?	➡ Turkmen‧Latin‧Turkmenistan-->
-		<likelySubtag from="tkl" to="tkl_Latn_TK"/>		<!--Tokelau‧?‧?	➡ Tokelau‧Latin‧Tokelau-->
+		<likelySubtag from="tkl" to="tkl_Latn_TK"/>		<!--Tokelauan‧?‧?	➡ Tokelauan‧Latin‧Tokelau-->
 		<likelySubtag from="tkr" to="tkr_Latn_AZ"/>		<!--Tsakhur‧?‧?	➡ Tsakhur‧Latin‧Azerbaijan-->
 		<likelySubtag from="tkt" to="tkt_Deva_NP"/>		<!--Kathoriya Tharu‧?‧?	➡ Kathoriya Tharu‧Devanagari‧Nepal-->
 		<likelySubtag from="tl" to="tl_Latn_PH"/>		<!--Tagalog‧?‧?	➡ Tagalog‧Latin‧Philippines-->
@@ -742,6 +797,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tsg" to="tsg_Latn_PH"/>		<!--Tausug‧?‧?	➡ Tausug‧Latin‧Philippines-->
 		<likelySubtag from="tsj" to="tsj_Tibt_BT"/>		<!--Tshangla‧?‧?	➡ Tshangla‧Tibetan‧Bhutan-->
 		<likelySubtag from="tt" to="tt_Cyrl_RU"/>		<!--Tatar‧?‧?	➡ Tatar‧Cyrillic‧Russia-->
+		<likelySubtag from="ttc" to="ttc_Latn_GT"/>		<!--Tektiteko‧?‧?	➡ Tektiteko‧Latin‧Guatemala-->
 		<likelySubtag from="ttj" to="ttj_Latn_UG"/>		<!--Tooro‧?‧?	➡ Tooro‧Latin‧Uganda-->
 		<likelySubtag from="tts" to="tts_Thai_TH"/>		<!--Northeastern Thai‧?‧?	➡ Northeastern Thai‧Thai‧Thailand-->
 		<likelySubtag from="ttt" to="ttt_Latn_AZ"/>		<!--Muslim Tat‧?‧?	➡ Muslim Tat‧Latin‧Azerbaijan-->
@@ -751,7 +807,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="txg" to="txg_Tang_CN"/>		<!--Tangut‧?‧?	➡ Tangut‧Tangut‧China-->
 		<likelySubtag from="txo" to="txo_Toto_IN"/>		<!--Toto‧?‧?	➡ Toto‧Toto‧India-->
 		<likelySubtag from="ty" to="ty_Latn_PF"/>		<!--Tahitian‧?‧?	➡ Tahitian‧Latin‧French Polynesia-->
+		<likelySubtag from="tyj" to="tyj_Latn_VN"/>		<!--Tai Do‧?‧?	➡ Tai Do‧Latin‧Vietnam-->
 		<likelySubtag from="tyv" to="tyv_Cyrl_RU"/>		<!--Tuvinian‧?‧?	➡ Tuvinian‧Cyrillic‧Russia-->
+		<likelySubtag from="tzj" to="tzj_Latn_GT"/>		<!--Tz'utujil‧?‧?	➡ Tz'utujil‧Latin‧Guatemala-->
 		<likelySubtag from="tzm" to="tzm_Latn_MA"/>		<!--Central Atlas Tamazight‧?‧?	➡ Central Atlas Tamazight‧Latin‧Morocco-->
 		<likelySubtag from="udm" to="udm_Cyrl_RU"/>		<!--Udmurt‧?‧?	➡ Udmurt‧Cyrillic‧Russia-->
 		<likelySubtag from="ug" to="ug_Arab_CN"/>		<!--Uyghur‧?‧?	➡ Uyghur‧Arabic‧China-->
@@ -767,6 +825,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="unr_Deva" to="unr_Deva_NP"/>		<!--Mundari‧Devanagari‧?	➡ Mundari‧Devanagari‧Nepal-->
 		<likelySubtag from="unx" to="unx_Beng_IN"/>		<!--Munda‧?‧?	➡ Munda‧Bangla‧India-->
 		<likelySubtag from="ur" to="ur_Arab_PK"/>		<!--Urdu‧?‧?	➡ Urdu‧Arabic‧Pakistan-->
+		<likelySubtag from="usp" to="usp_Latn_GT"/>		<!--Uspanteco‧?‧?	➡ Uspanteco‧Latin‧Guatemala-->
 		<likelySubtag from="uz" to="uz_Latn_UZ"/>		<!--Uzbek‧?‧?	➡ Uzbek‧Latin‧Uzbekistan-->
 		<likelySubtag from="uz_AF" to="uz_Arab_AF"/>		<!--Uzbek‧?‧Afghanistan	➡ Uzbek‧Arabic‧Afghanistan-->
 		<likelySubtag from="uz_CN" to="uz_Cyrl_CN"/>		<!--Uzbek‧?‧China	➡ Uzbek‧Cyrillic‧China-->
@@ -802,6 +861,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="xco" to="xco_Chrs_UZ"/>		<!--Chorasmian‧?‧?	➡ Chorasmian‧Chorasmian‧Uzbekistan-->
 		<likelySubtag from="xcr" to="xcr_Cari_TR"/>		<!--Carian‧?‧?	➡ Carian‧Carian‧Türkiye-->
 		<likelySubtag from="xh" to="xh_Latn_ZA"/>		<!--Xhosa‧?‧?	➡ Xhosa‧Latin‧South Africa-->
+		<likelySubtag from="xin" to="xin_Latn_GT"/>		<!--Xinca‧?‧?	➡ Xinca‧Latin‧Guatemala-->
 		<likelySubtag from="xlc" to="xlc_Lyci_TR"/>		<!--Lycian‧?‧?	➡ Lycian‧Lycian‧Türkiye-->
 		<likelySubtag from="xld" to="xld_Lydi_TR"/>		<!--Lydian‧?‧?	➡ Lydian‧Lydian‧Türkiye-->
 		<likelySubtag from="xmf" to="xmf_Geor_GE"/>		<!--Mingrelian‧?‧?	➡ Mingrelian‧Georgian‧Georgia-->
@@ -812,6 +872,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="xog" to="xog_Latn_UG"/>		<!--Soga‧?‧?	➡ Soga‧Latin‧Uganda-->
 		<likelySubtag from="xpr" to="xpr_Prti_IR"/>		<!--Parthian‧?‧?	➡ Parthian‧Inscriptional Parthian‧Iran-->
 		<likelySubtag from="xsa" to="xsa_Sarb_YE"/>		<!--Sabaean‧?‧?	➡ Sabaean‧Old South Arabian‧Yemen-->
+		<likelySubtag from="xsd" to="xsd_Sidt_TR"/>		<!--Sidetic‧?‧?	➡ Sidetic‧Sidetic‧Türkiye-->
 		<likelySubtag from="xsr" to="xsr_Deva_NP"/>		<!--Sherpa‧?‧?	➡ Sherpa‧Devanagari‧Nepal-->
 		<likelySubtag from="yao" to="yao_Latn_MZ"/>		<!--Yao‧?‧?	➡ Yao‧Latin‧Mozambique-->
 		<likelySubtag from="yap" to="yap_Latn_FM"/>		<!--Yapese‧?‧?	➡ Yapese‧Latin‧Micronesia-->
@@ -848,7 +909,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="zh_Bopo" to="zh_Bopo_TW"/>		<!--Chinese‧Bopomofo‧?	➡ Chinese‧Bopomofo‧Taiwan-->
 		<likelySubtag from="zh_Hanb" to="zh_Hanb_TW"/>		<!--Chinese‧Han with Bopomofo‧?	➡ Chinese‧Han with Bopomofo‧Taiwan-->
 		<likelySubtag from="zh_Hant" to="zh_Hant_TW"/>		<!--Chinese‧Traditional‧?	➡ Chinese‧Traditional‧Taiwan-->
-		<likelySubtag from="zhx" to="zhx_Nshu_CN"/>		<!--Chinese (family)‧?‧?	➡ Chinese (family)‧Nüshu‧China-->
 		<likelySubtag from="zkt" to="zkt_Kits_CN"/>		<!--Kitan‧?‧?	➡ Kitan‧Khitan small script‧China-->
 		<likelySubtag from="zlm" to="zlm_Latn_MY"/>		<!--Malay (individual language)‧?‧?	➡ Malay (individual language)‧Latin‧Malaysia-->
 		<likelySubtag from="zmi" to="zmi_Latn_MY"/>		<!--Negeri Sembilan Malay‧?‧?	➡ Negeri Sembilan Malay‧Latin‧Malaysia-->
@@ -884,7 +944,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_BR" to="pt_Latn_BR"/>		<!--?‧?‧Brazil	➡ Portuguese‧Latin‧Brazil-->
 		<likelySubtag from="und_BT" to="dz_Tibt_BT"/>		<!--?‧?‧Bhutan	➡ Dzongkha‧Tibetan‧Bhutan-->
 		<likelySubtag from="und_BV" to="no_Latn_BV"/>		<!--?‧?‧Bouvet Island	➡ Norwegian‧Latin‧Bouvet Island-->
-		<likelySubtag from="und_BY" to="be_Cyrl_BY"/>		<!--?‧?‧Belarus	➡ Belarusian‧Cyrillic‧Belarus-->
+		<likelySubtag from="und_BY" to="ru_Cyrl_BY"/>		<!--?‧?‧Belarus	➡ Russian‧Cyrillic‧Belarus-->
 		<likelySubtag from="und_CC" to="ms_Arab_CC"/>		<!--?‧?‧Cocos (Keeling) Islands	➡ Malay‧Arabic‧Cocos (Keeling) Islands-->
 		<likelySubtag from="und_CD" to="fr_Latn_CD"/>		<!--?‧?‧Congo - Kinshasa	➡ French‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="und_CF" to="sg_Latn_CF"/>		<!--?‧?‧Central African Republic	➡ Sango‧Latin‧Central African Republic-->
@@ -1026,7 +1086,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_TG" to="fr_Latn_TG"/>		<!--?‧?‧Togo	➡ French‧Latin‧Togo-->
 		<likelySubtag from="und_TH" to="th_Thai_TH"/>		<!--?‧?‧Thailand	➡ Thai‧Thai‧Thailand-->
 		<likelySubtag from="und_TJ" to="tg_Cyrl_TJ"/>		<!--?‧?‧Tajikistan	➡ Tajik‧Cyrillic‧Tajikistan-->
-		<likelySubtag from="und_TK" to="tkl_Latn_TK"/>		<!--?‧?‧Tokelau	➡ Tokelau‧Latin‧Tokelau-->
+		<likelySubtag from="und_TK" to="tkl_Latn_TK"/>		<!--?‧?‧Tokelau	➡ Tokelauan‧Latin‧Tokelau-->
 		<likelySubtag from="und_TL" to="pt_Latn_TL"/>		<!--?‧?‧Timor-Leste	➡ Portuguese‧Latin‧Timor-Leste-->
 		<likelySubtag from="und_TM" to="tk_Latn_TM"/>		<!--?‧?‧Turkmenistan	➡ Turkmen‧Latin‧Turkmenistan-->
 		<likelySubtag from="und_TN" to="ar_Arab_TN"/>		<!--?‧?‧Tunisia	➡ Arabic‧Arabic‧Tunisia-->
@@ -1080,6 +1140,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Bass" to="bsq_Bass_LR"/>		<!--?‧Bassa Vah‧?	➡ Bassa‧Bassa Vah‧Liberia-->
 		<likelySubtag from="und_Batk" to="bbc_Batk_ID"/>		<!--?‧Batak‧?	➡ Batak Toba‧Batak‧Indonesia-->
 		<likelySubtag from="und_Beng" to="bn_Beng_BD"/>		<!--?‧Bangla‧?	➡ Bangla‧Bangla‧Bangladesh-->
+		<likelySubtag from="und_Berf" to="zag_Berf_SD"/>		<!--?‧Beria Erfe‧?	➡ Zaghawa‧Beria Erfe‧Sudan-->
 		<likelySubtag from="und_Bhks" to="sa_Bhks_IN"/>		<!--?‧Bhaiksuki‧?	➡ Sanskrit‧Bhaiksuki‧India-->
 		<likelySubtag from="und_Bopo" to="zh_Bopo_TW"/>		<!--?‧Bopomofo‧?	➡ Chinese‧Bopomofo‧Taiwan-->
 		<likelySubtag from="und_Brah" to="pka_Brah_IN"/>		<!--?‧Brahmi‧?	➡ Ardhamāgadhī Prākrit‧Brahmi‧India-->
@@ -1101,7 +1162,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Cyrl_AZ" to="az_Cyrl_AZ"/>		<!--?‧Cyrillic‧Azerbaijan	➡ Azerbaijani‧Cyrillic‧Azerbaijan-->
 		<likelySubtag from="und_Cyrl_BA" to="sr_Cyrl_BA"/>		<!--?‧Cyrillic‧Bosnia & Herzegovina	➡ Serbian‧Cyrillic‧Bosnia & Herzegovina-->
 		<likelySubtag from="und_Cyrl_BG" to="bg_Cyrl_BG"/>		<!--?‧Cyrillic‧Bulgaria	➡ Bulgarian‧Cyrillic‧Bulgaria-->
-		<likelySubtag from="und_Cyrl_BY" to="be_Cyrl_BY"/>		<!--?‧Cyrillic‧Belarus	➡ Belarusian‧Cyrillic‧Belarus-->
 		<likelySubtag from="und_Cyrl_GE" to="ab_Cyrl_GE"/>		<!--?‧Cyrillic‧Georgia	➡ Abkhazian‧Cyrillic‧Georgia-->
 		<likelySubtag from="und_Cyrl_GR" to="mk_Cyrl_GR"/>		<!--?‧Cyrillic‧Greece	➡ Macedonian‧Cyrillic‧Greece-->
 		<likelySubtag from="und_Cyrl_IR" to="kaa_Cyrl_IR"/>		<!--?‧Cyrillic‧Iran	➡ Kara-Kalpak‧Cyrillic‧Iran-->
@@ -1160,7 +1220,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Hira" to="ja_Hira_JP"/>		<!--?‧Hiragana‧?	➡ Japanese‧Hiragana‧Japan-->
 		<likelySubtag from="und_Hluw" to="hlu_Hluw_TR"/>		<!--?‧Anatolian Hieroglyphs‧?	➡ Hieroglyphic Luwian‧Anatolian Hieroglyphs‧Türkiye-->
 		<likelySubtag from="und_Hmng" to="hnj_Hmng_LA"/>		<!--?‧Pahawh Hmong‧?	➡ Hmong Njua‧Pahawh Hmong‧Laos-->
-		<likelySubtag from="und_Hmnp" to="hnj_Hmnp_US"/>		<!--?‧Nyiakeng Puachue Hmong‧?	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧United States-->
+		<likelySubtag from="und_Hmnp" to="mww_Hmnp_US"/>		<!--?‧Nyiakeng Puachue Hmong‧?	➡ Hmong Daw‧Nyiakeng Puachue Hmong‧United States-->
+		<likelySubtag from="und_Hmnp_AU" to="hnj_Hmnp_AU"/>		<!--?‧Nyiakeng Puachue Hmong‧Australia	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧Australia-->
+		<likelySubtag from="und_Hmnp_FR" to="hnj_Hmnp_FR"/>		<!--?‧Nyiakeng Puachue Hmong‧France	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧France-->
+		<likelySubtag from="und_Hmnp_GF" to="hnj_Hmnp_GF"/>		<!--?‧Nyiakeng Puachue Hmong‧French Guiana	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧French Guiana-->
+		<likelySubtag from="und_Hmnp_LA" to="hnj_Hmnp_LA"/>		<!--?‧Nyiakeng Puachue Hmong‧Laos	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧Laos-->
+		<likelySubtag from="und_Hmnp_MM" to="hnj_Hmnp_MM"/>		<!--?‧Nyiakeng Puachue Hmong‧Myanmar (Burma)	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧Myanmar (Burma)-->
+		<likelySubtag from="und_Hmnp_SR" to="hnj_Hmnp_SR"/>		<!--?‧Nyiakeng Puachue Hmong‧Suriname	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧Suriname-->
+		<likelySubtag from="und_Hmnp_TH" to="hnj_Hmnp_TH"/>		<!--?‧Nyiakeng Puachue Hmong‧Thailand	➡ Hmong Njua‧Nyiakeng Puachue Hmong‧Thailand-->
 		<likelySubtag from="und_Hung" to="hu_Hung_HU"/>		<!--?‧Old Hungarian‧?	➡ Hungarian‧Old Hungarian‧Hungary-->
 		<likelySubtag from="und_Ital" to="ett_Ital_IT"/>		<!--?‧Old Italic‧?	➡ Etruscan‧Old Italic‧Italy-->
 		<likelySubtag from="und_Jamo" to="ko_Jamo_KR"/>		<!--?‧Jamo‧?	➡ Korean‧Jamo‧South Korea-->
@@ -1169,7 +1236,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Kali" to="eky_Kali_MM"/>		<!--?‧Kayah Li‧?	➡ Eastern Kayah‧Kayah Li‧Myanmar (Burma)-->
 		<likelySubtag from="und_Kana" to="ja_Kana_JP"/>		<!--?‧Katakana‧?	➡ Japanese‧Katakana‧Japan-->
 		<likelySubtag from="und_Kawi" to="kaw_Kawi_ID"/>		<!--?‧Kawi‧?	➡ Kawi‧Kawi‧Indonesia-->
-		<likelySubtag from="und_Khar" to="pra_Khar_PK"/>		<!--?‧Kharoshthi‧?	➡ Prakrit languages‧Kharoshthi‧Pakistan-->
+		<likelySubtag from="und_Khar" to="pgd_Khar_PK"/>		<!--?‧Kharoshthi‧?	➡ Gāndhārī‧Kharoshthi‧Pakistan-->
 		<likelySubtag from="und_Khmr" to="km_Khmr_KH"/>		<!--?‧Khmer‧?	➡ Khmer‧Khmer‧Cambodia-->
 		<likelySubtag from="und_Khoj" to="sd_Khoj_IN"/>		<!--?‧Khojki‧?	➡ Sindhi‧Khojki‧India-->
 		<likelySubtag from="und_Kits" to="zkt_Kits_CN"/>		<!--?‧Khitan small script‧?	➡ Kitan‧Khitan small script‧China-->
@@ -1178,6 +1245,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Krai" to="bap_Krai_IN"/>		<!--?‧Kirat Rai‧?	➡ Bantawa‧Kirat Rai‧India-->
 		<likelySubtag from="und_Kthi" to="bho_Kthi_IN"/>		<!--?‧Kaithi‧?	➡ Bhojpuri‧Kaithi‧India-->
 		<likelySubtag from="und_Lana" to="nod_Lana_TH"/>		<!--?‧Lanna‧?	➡ Northern Thai‧Lanna‧Thailand-->
+		<likelySubtag from="und_Lana_MM" to="stu_Lana_MM"/>		<!--?‧Lanna‧Myanmar (Burma)	➡ Samtao‧Lanna‧Myanmar (Burma)-->
 		<likelySubtag from="und_Laoo" to="lo_Laoo_LA"/>		<!--?‧Lao‧?	➡ Lao‧Lao‧Laos-->
 		<likelySubtag from="und_Latn_AE" to="en_Latn_AE"/>		<!--?‧Latin‧United Arab Emirates	➡ English‧Latin‧United Arab Emirates-->
 		<likelySubtag from="und_Latn_AF" to="tk_Latn_AF"/>		<!--?‧Latin‧Afghanistan	➡ Turkmen‧Latin‧Afghanistan-->
@@ -1192,7 +1260,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_EG" to="en_Latn_EG"/>		<!--?‧Latin‧Egypt	➡ English‧Latin‧Egypt-->
 		<likelySubtag from="und_Latn_ER" to="en_Latn_ER"/>		<!--?‧Latin‧Eritrea	➡ English‧Latin‧Eritrea-->
 		<likelySubtag from="und_Latn_ET" to="en_Latn_ET"/>		<!--?‧Latin‧Ethiopia	➡ English‧Latin‧Ethiopia-->
-		<likelySubtag from="und_Latn_GE" to="ku_Latn_GE"/>		<!--?‧Latin‧Georgia	➡ Kurdish‧Latin‧Georgia-->
 		<likelySubtag from="und_Latn_GR" to="en_Latn_GR"/>		<!--?‧Latin‧Greece	➡ English‧Latin‧Greece-->
 		<likelySubtag from="und_Latn_HK" to="en_Latn_HK"/>		<!--?‧Latin‧Hong Kong SAR China	➡ English‧Latin‧Hong Kong SAR China-->
 		<likelySubtag from="und_Latn_IL" to="en_Latn_IL"/>		<!--?‧Latin‧Israel	➡ English‧Latin‧Israel-->
@@ -1254,7 +1321,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Newa" to="new_Newa_NP"/>		<!--?‧Newa‧?	➡ Newari‧Newa‧Nepal-->
 		<likelySubtag from="und_Nkoo" to="man_Nkoo_GN"/>		<!--?‧N’Ko‧?	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="und_Nkoo_ML" to="bm_Nkoo_ML"/>		<!--?‧N’Ko‧Mali	➡ Bambara‧N’Ko‧Mali-->
-		<likelySubtag from="und_Nshu" to="zhx_Nshu_CN"/>		<!--?‧Nüshu‧?	➡ Chinese (family)‧Nüshu‧China-->
 		<likelySubtag from="und_Ogam" to="sga_Ogam_IE"/>		<!--?‧Ogham‧?	➡ Old Irish‧Ogham‧Ireland-->
 		<likelySubtag from="und_Olck" to="sat_Olck_IN"/>		<!--?‧Ol Chiki‧?	➡ Santali‧Ol Chiki‧India-->
 		<likelySubtag from="und_Onao" to="unr_Onao_IN"/>		<!--?‧Ol Onal‧?	➡ Mundari‧Ol Onal‧India-->
@@ -1282,6 +1348,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Shaw" to="en_Shaw_GB"/>		<!--?‧Shavian‧?	➡ English‧Shavian‧United Kingdom-->
 		<likelySubtag from="und_Shrd" to="sa_Shrd_IN"/>		<!--?‧Sharada‧?	➡ Sanskrit‧Sharada‧India-->
 		<likelySubtag from="und_Sidd" to="sa_Sidd_IN"/>		<!--?‧Siddham‧?	➡ Sanskrit‧Siddham‧India-->
+		<likelySubtag from="und_Sidt" to="xsd_Sidt_TR"/>		<!--?‧Sidetic‧?	➡ Sidetic‧Sidetic‧Türkiye-->
 		<likelySubtag from="und_Sind" to="sd_Sind_IN"/>		<!--?‧Khudawadi‧?	➡ Sindhi‧Khudawadi‧India-->
 		<likelySubtag from="und_Sinh" to="si_Sinh_LK"/>		<!--?‧Sinhala‧?	➡ Sinhala‧Sinhala‧Sri Lanka-->
 		<likelySubtag from="und_Sogd" to="sog_Sogd_UZ"/>		<!--?‧Sogdian‧?	➡ Sogdien‧Sogdian‧Uzbekistan-->
@@ -1299,6 +1366,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Taml" to="ta_Taml_IN"/>		<!--?‧Tamil‧?	➡ Tamil‧Tamil‧India-->
 		<likelySubtag from="und_Tang" to="txg_Tang_CN"/>		<!--?‧Tangut‧?	➡ Tangut‧Tangut‧China-->
 		<likelySubtag from="und_Tavt" to="blt_Tavt_VN"/>		<!--?‧Tai Viet‧?	➡ Tai Dam‧Tai Viet‧Vietnam-->
+		<likelySubtag from="und_Tayo" to="tyj_Tayo_VN"/>		<!--?‧Tai Yo‧?	➡ Tai Do‧Tai Yo‧Vietnam-->
 		<likelySubtag from="und_Telu" to="te_Telu_IN"/>		<!--?‧Telugu‧?	➡ Telugu‧Telugu‧India-->
 		<likelySubtag from="und_Tfng" to="zgh_Tfng_MA"/>		<!--?‧Tifinagh‧?	➡ Standard Moroccan Tamazight‧Tifinagh‧Morocco-->
 		<likelySubtag from="und_Tglg" to="fil_Tglg_PH"/>		<!--?‧Tagalog‧?	➡ Filipino‧Tagalog‧Philippines-->
@@ -1312,6 +1380,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Tirh" to="mai_Tirh_IN"/>		<!--?‧Tirhuta‧?	➡ Maithili‧Tirhuta‧India-->
 		<likelySubtag from="und_Tnsa" to="nst_Tnsa_IN"/>		<!--?‧Tangsa‧?	➡ Tase Naga‧Tangsa‧India-->
 		<likelySubtag from="und_Todr" to="sq_Todr_AL"/>		<!--?‧Todhri‧?	➡ Albanian‧Todhri‧Albania-->
+		<likelySubtag from="und_Tols" to="kru_Tols_IN"/>		<!--?‧Tolong Siki‧?	➡ Kurukh‧Tolong Siki‧India-->
 		<likelySubtag from="und_Toto" to="txo_Toto_IN"/>		<!--?‧Toto‧?	➡ Toto‧Toto‧India-->
 		<likelySubtag from="und_Tutg" to="sa_Tutg_IN"/>		<!--?‧Tulu-Tigalari‧?	➡ Sanskrit‧Tulu-Tigalari‧India-->
 		<likelySubtag from="und_Ugar" to="uga_Ugar_SY"/>		<!--?‧Ugaritic‧?	➡ Ugaritic‧Ugaritic‧Syria-->
@@ -1376,7 +1445,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="acn" to="acn_Latn_CN" origin="sil1"/>		<!--Achang‧?‧?	➡ Achang‧Latin‧China-->
 		<likelySubtag from="acp" to="acp_Latn_NG" origin="sil1"/>		<!--Eastern Acipa‧?‧?	➡ Eastern Acipa‧Latin‧Nigeria-->
 		<likelySubtag from="acq" to="acq_Arab_YE" origin="sil1"/>		<!--Ta'izzi-Adeni Arabic‧?‧?	➡ Ta'izzi-Adeni Arabic‧Arabic‧Yemen-->
-		<likelySubtag from="acr" to="acr_Latn_GT" origin="sil1"/>		<!--Achi‧?‧?	➡ Achi‧Latin‧Guatemala-->
 		<likelySubtag from="acs" to="acs_Latn_BR" origin="sil1"/>		<!--Acroá‧?‧?	➡ Acroá‧Latin‧Brazil-->
 		<likelySubtag from="act" to="act_Latn_NL" origin="sil1"/>		<!--Achterhoeks‧?‧?	➡ Achterhoeks‧Latin‧Netherlands-->
 		<likelySubtag from="acu" to="acu_Latn_EC" origin="sil1"/>		<!--Achuar-Shiwiar‧?‧?	➡ Achuar-Shiwiar‧Latin‧Ecuador-->
@@ -1411,6 +1479,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="aem" to="aem_Latn_VN" origin="sil1"/>		<!--Arem‧?‧?	➡ Arem‧Latin‧Vietnam-->
 		<likelySubtag from="aeq" to="aeq_Arab_PK" origin="sil1"/>		<!--Aer‧?‧?	➡ Aer‧Arabic‧Pakistan-->
 		<likelySubtag from="aer" to="aer_Latn_AU" origin="sil1"/>		<!--Eastern Arrernte‧?‧?	➡ Eastern Arrernte‧Latin‧Australia-->
+		<likelySubtag from="aes" to="aes_Latn_US" origin="sil1"/>		<!--Alsea‧?‧?	➡ Alsea‧Latin‧United States-->
 		<likelySubtag from="aeu" to="aeu_Latn_CN" origin="sil1"/>		<!--Akeu‧?‧?	➡ Akeu‧Latin‧China-->
 		<likelySubtag from="aew" to="aew_Latn_PG" origin="sil1"/>		<!--Ambakich‧?‧?	➡ Ambakich‧Latin‧Papua New Guinea-->
 		<likelySubtag from="aey" to="aey_Latn_PG" origin="sil1"/>		<!--Amele‧?‧?	➡ Amele‧Latin‧Papua New Guinea-->
@@ -1445,7 +1514,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="agr" to="agr_Latn_PE" origin="sil1"/>		<!--Aguaruna‧?‧?	➡ Aguaruna‧Latin‧Peru-->
 		<likelySubtag from="ags" to="ags_Latn_CM" origin="sil1"/>		<!--Esimbi‧?‧?	➡ Esimbi‧Latin‧Cameroon-->
 		<likelySubtag from="agt" to="agt_Latn_PH" origin="sil1"/>		<!--Central Cagayan Agta‧?‧?	➡ Central Cagayan Agta‧Latin‧Philippines-->
-		<likelySubtag from="agu" to="agu_Latn_GT" origin="sil1"/>		<!--Aguacateco‧?‧?	➡ Aguacateco‧Latin‧Guatemala-->
 		<likelySubtag from="agv" to="agv_Latn_PH" origin="sil1"/>		<!--Remontado Dumagat‧?‧?	➡ Remontado Dumagat‧Latin‧Philippines-->
 		<likelySubtag from="agw" to="agw_Latn_SB" origin="sil1"/>		<!--Kahua‧?‧?	➡ Kahua‧Latin‧Solomon Islands-->
 		<likelySubtag from="agx" to="agx_Cyrl_RU" origin="sil1"/>		<!--Aghul‧?‧?	➡ Aghul‧Cyrillic‧Russia-->
@@ -1635,6 +1703,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="arp" to="arp_Latn_US" origin="sil1"/>		<!--Arapaho‧?‧?	➡ Arapaho‧Latin‧United States-->
 		<likelySubtag from="arr" to="arr_Latn_BR" origin="sil1"/>		<!--Karo (Brazil)‧?‧?	➡ Karo (Brazil)‧Latin‧Brazil-->
 		<likelySubtag from="aru" to="aru_Latn_BR" origin="sil1"/>		<!--Aruá (Amazonas State)‧?‧?	➡ Aruá (Amazonas State)‧Latin‧Brazil-->
+		<likelySubtag from="arv" to="arv_Latn_ET" origin="sil1"/>		<!--Arbore‧?‧?	➡ Arbore‧Latin‧Ethiopia-->
 		<likelySubtag from="arw" to="arw_Latn_SR" origin="sil1"/>		<!--Arawak‧?‧?	➡ Arawak‧Latin‧Suriname-->
 		<likelySubtag from="arx" to="arx_Latn_BR" origin="sil1"/>		<!--Aruá (Rodonia State)‧?‧?	➡ Aruá (Rodonia State)‧Latin‧Brazil-->
 		<likelySubtag from="asb" to="asb_Latn_CA" origin="sil1"/>		<!--Assiniboine‧?‧?	➡ Assiniboine‧Latin‧Canada-->
@@ -1934,6 +2003,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="biu" to="biu_Latn_IN" origin="sil1"/>		<!--Biete‧?‧?	➡ Biete‧Latin‧India-->
 		<likelySubtag from="biv" to="biv_Latn_GH" origin="sil1"/>		<!--Southern Birifor‧?‧?	➡ Southern Birifor‧Latin‧Ghana-->
 		<likelySubtag from="biw" to="biw_Latn_CM" origin="sil1"/>		<!--Kol (Cameroon)‧?‧?	➡ Kol (Cameroon)‧Latin‧Cameroon-->
+		<likelySubtag from="bix" to="bix_Deva_IN" origin="sil1"/>		<!--Bijori‧?‧?	➡ Bijori‧Devanagari‧India-->
 		<likelySubtag from="biy" to="biy_Deva_IN" origin="sil1"/>		<!--Birhor‧?‧?	➡ Birhor‧Devanagari‧India-->
 		<likelySubtag from="biz" to="biz_Latn_CD" origin="sil1"/>		<!--Baloi‧?‧?	➡ Baloi‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="bja" to="bja_Latn_CD" origin="sil1"/>		<!--Budza‧?‧?	➡ Budza‧Latin‧Congo - Kinshasa-->
@@ -2095,7 +2165,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="bqg" to="bqg_Latn_TG" origin="sil1"/>		<!--Bago-Kusuntu‧?‧?	➡ Bago-Kusuntu‧Latin‧Togo-->
 		<likelySubtag from="bqj" to="bqj_Latn_SN" origin="sil1"/>		<!--Bandial‧?‧?	➡ Bandial‧Latin‧Senegal-->
 		<likelySubtag from="bqk" to="bqk_Latn_CF" origin="sil1"/>		<!--Banda-Mbrès‧?‧?	➡ Banda-Mbrès‧Latin‧Central African Republic-->
-		<likelySubtag from="bql" to="bql_Latn_PG" origin="sil1"/>		<!--Bilakura‧?‧?	➡ Bilakura‧Latin‧Papua New Guinea-->
+		<likelySubtag from="bql" to="bql_Latn_PG" origin="sil1"/>		<!--Karian‧?‧?	➡ Karian‧Latin‧Papua New Guinea-->
 		<likelySubtag from="bqm" to="bqm_Latn_CM" origin="sil1"/>		<!--Wumboko‧?‧?	➡ Wumboko‧Latin‧Cameroon-->
 		<likelySubtag from="bqo" to="bqo_Latn_CM" origin="sil1"/>		<!--Balo‧?‧?	➡ Balo‧Latin‧Cameroon-->
 		<likelySubtag from="bqp" to="bqp_Latn_NG" origin="sil1"/>		<!--Busa‧?‧?	➡ Busa‧Latin‧Nigeria-->
@@ -2273,14 +2343,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="byw" to="byw_Deva_NP" origin="sil1"/>		<!--Belhariya‧?‧?	➡ Belhariya‧Devanagari‧Nepal-->
 		<likelySubtag from="byx" to="byx_Latn_PG" origin="sil1"/>		<!--Qaqet‧?‧?	➡ Qaqet‧Latin‧Papua New Guinea-->
 		<likelySubtag from="byz" to="byz_Latn_PG" origin="sil1"/>		<!--Banaro‧?‧?	➡ Banaro‧Latin‧Papua New Guinea-->
-		<likelySubtag from="bza" to="bza_Latn_LR" origin="sil1"/>		<!--Bandi‧?‧?	➡ Bandi‧Latin‧Liberia-->
 		<likelySubtag from="bzb" to="bzb_Latn_ID" origin="sil1"/>		<!--Andio‧?‧?	➡ Andio‧Latin‧Indonesia-->
 		<likelySubtag from="bzc" to="bzc_Latn_MG" origin="sil1"/>		<!--Southern Betsimisaraka Malagasy‧?‧?	➡ Southern Betsimisaraka Malagasy‧Latin‧Madagascar-->
 		<likelySubtag from="bzd" to="bzd_Latn_CR" origin="sil1"/>		<!--Bribri‧?‧?	➡ Bribri‧Latin‧Costa Rica-->
 		<likelySubtag from="bzf" to="bzf_Latn_PG" origin="sil1"/>		<!--Boikin‧?‧?	➡ Boikin‧Latin‧Papua New Guinea-->
 		<likelySubtag from="bzh" to="bzh_Latn_PG" origin="sil1"/>		<!--Mapos Buang‧?‧?	➡ Mapos Buang‧Latin‧Papua New Guinea-->
 		<likelySubtag from="bzi" to="bzi_Thai_TH" origin="sil1"/>		<!--Bisu‧?‧?	➡ Bisu‧Thai‧Thailand-->
-		<likelySubtag from="bzj" to="bzj_Latn_BZ" origin="sil1"/>		<!--Belize Kriol English‧?‧?	➡ Belize Kriol English‧Latin‧Belize-->
 		<likelySubtag from="bzk" to="bzk_Latn_NI" origin="sil1"/>		<!--Nicaragua Creole English‧?‧?	➡ Nicaragua Creole English‧Latin‧Nicaragua-->
 		<likelySubtag from="bzl" to="bzl_Latn_ID" origin="sil1"/>		<!--Boano (Sulawesi)‧?‧?	➡ Boano (Sulawesi)‧Latin‧Indonesia-->
 		<likelySubtag from="bzm" to="bzm_Latn_CD" origin="sil1"/>		<!--Bolondo‧?‧?	➡ Bolondo‧Latin‧Congo - Kinshasa-->
@@ -2296,15 +2364,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="bzx" to="bzx_Latn_ML" origin="sil1"/>		<!--Kɛlɛngaxo Bozo‧?‧?	➡ Kɛlɛngaxo Bozo‧Latin‧Mali-->
 		<likelySubtag from="bzy" to="bzy_Latn_NG" origin="sil1"/>		<!--Obanliku‧?‧?	➡ Obanliku‧Latin‧Nigeria-->
 		<likelySubtag from="bzz" to="bzz_Latn_NG" origin="sil1"/>		<!--Evant‧?‧?	➡ Evant‧Latin‧Nigeria-->
-		<likelySubtag from="caa" to="caa_Latn_GT" origin="sil1"/>		<!--Chortí‧?‧?	➡ Chortí‧Latin‧Guatemala-->
-		<likelySubtag from="cab" to="cab_Latn_HN" origin="sil1"/>		<!--Garifuna‧?‧?	➡ Garifuna‧Latin‧Honduras-->
-		<likelySubtag from="cac" to="cac_Latn_GT" origin="sil1"/>		<!--Chuj‧?‧?	➡ Chuj‧Latin‧Guatemala-->
 		<likelySubtag from="cae" to="cae_Latn_SN" origin="sil1"/>		<!--Lehar‧?‧?	➡ Lehar‧Latin‧Senegal-->
 		<likelySubtag from="caf" to="caf_Latn_CA" origin="sil1"/>		<!--Southern Carrier‧?‧?	➡ Southern Carrier‧Latin‧Canada-->
 		<likelySubtag from="cag" to="cag_Latn_PY" origin="sil1"/>		<!--Nivaclé‧?‧?	➡ Nivaclé‧Latin‧Paraguay-->
 		<likelySubtag from="cah" to="cah_Latn_PE" origin="sil1"/>		<!--Cahuarano‧?‧?	➡ Cahuarano‧Latin‧Peru-->
 		<likelySubtag from="caj" to="caj_Latn_BO" origin="sil1"/>		<!--Chané‧?‧?	➡ Chané‧Latin‧Bolivia-->
-		<likelySubtag from="cak" to="cak_Latn_GT" origin="sil1"/>		<!--Kaqchikel‧?‧?	➡ Kaqchikel‧Latin‧Guatemala-->
 		<likelySubtag from="cal" to="cal_Latn_MP" origin="sil1"/>		<!--Carolinian‧?‧?	➡ Carolinian‧Latin‧Northern Mariana Islands-->
 		<likelySubtag from="cam" to="cam_Latn_NC" origin="sil1"/>		<!--Cemuhî‧?‧?	➡ Cemuhî‧Latin‧New Caledonia-->
 		<likelySubtag from="can" to="can_Latn_PG" origin="sil1"/>		<!--Chambri‧?‧?	➡ Chambri‧Latin‧Papua New Guinea-->
@@ -2350,6 +2414,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="cdi" to="cdi_Gujr_IN" origin="sil1"/>		<!--Chodri‧?‧?	➡ Chodri‧Gujarati‧India-->
 		<likelySubtag from="cdj" to="cdj_Deva_IN" origin="sil1"/>		<!--Churahi‧?‧?	➡ Churahi‧Devanagari‧India-->
 		<likelySubtag from="cdm" to="cdm_Deva_NP" origin="sil1"/>		<!--Chepang‧?‧?	➡ Chepang‧Devanagari‧Nepal-->
+		<likelySubtag from="cdn" to="cdn_Deva_IN" origin="sil1"/>		<!--Chaudangsi‧?‧?	➡ Chaudangsi‧Devanagari‧India-->
 		<likelySubtag from="cdo" to="cdo_Hans_CN" origin="sil1"/>		<!--Min Dong Chinese‧?‧?	➡ Min Dong Chinese‧Simplified‧China-->
 		<likelySubtag from="cdr" to="cdr_Latn_NG" origin="sil1"/>		<!--Cinda-Regi-Tiyal‧?‧?	➡ Cinda-Regi-Tiyal‧Latin‧Nigeria-->
 		<likelySubtag from="cdz" to="cdz_Beng_IN" origin="sil1"/>		<!--Koda‧?‧?	➡ Koda‧Bangla‧India-->
@@ -2412,7 +2477,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ckv" to="ckv_Latn_TW" origin="sil1"/>		<!--Kavalan‧?‧?	➡ Kavalan‧Latin‧Taiwan-->
 		<likelySubtag from="ckx" to="ckx_Latn_CM" origin="sil1"/>		<!--Caka‧?‧?	➡ Caka‧Latin‧Cameroon-->
 		<likelySubtag from="cky" to="cky_Latn_NG" origin="sil1"/>		<!--Cakfem-Mushere‧?‧?	➡ Cakfem-Mushere‧Latin‧Nigeria-->
-		<likelySubtag from="ckz" to="ckz_Latn_GT" origin="sil1"/>		<!--Cakchiquel-Quiché Mixed Language‧?‧?	➡ Cakchiquel-Quiché Mixed Language‧Latin‧Guatemala-->
 		<likelySubtag from="cla" to="cla_Latn_NG" origin="sil1"/>		<!--Ron‧?‧?	➡ Ron‧Latin‧Nigeria-->
 		<likelySubtag from="cle" to="cle_Latn_MX" origin="sil1"/>		<!--Lealao Chinantec‧?‧?	➡ Lealao Chinantec‧Latin‧Mexico-->
 		<likelySubtag from="clh" to="clh_Arab_PK" origin="sil1"/>		<!--Chilisso‧?‧?	➡ Chilisso‧Arabic‧Pakistan-->
@@ -2420,7 +2484,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="clj" to="clj_Latn_MM" origin="sil1"/>		<!--Laitu Chin‧?‧?	➡ Laitu Chin‧Latin‧Myanmar (Burma)-->
 		<likelySubtag from="clk" to="clk_Latn_IN" origin="sil1"/>		<!--Idu-Mishmi‧?‧?	➡ Idu-Mishmi‧Latin‧India-->
 		<likelySubtag from="cll" to="cll_Latn_GH" origin="sil1"/>		<!--Chala‧?‧?	➡ Chala‧Latin‧Ghana-->
-		<likelySubtag from="clm" to="clm_Latn_US" origin="sil1"/>		<!--Clallam‧?‧?	➡ Clallam‧Latin‧United States-->
+		<likelySubtag from="clm" to="clm_Latn_US" origin="sil1"/>		<!--Klallam‧?‧?	➡ Klallam‧Latin‧United States-->
 		<likelySubtag from="clo" to="clo_Latn_MX" origin="sil1"/>		<!--Lowland Oaxaca Chontal‧?‧?	➡ Lowland Oaxaca Chontal‧Latin‧Mexico-->
 		<likelySubtag from="clt" to="clt_Latn_MM" origin="sil1"/>		<!--Lautu Chin‧?‧?	➡ Lautu Chin‧Latin‧Myanmar (Burma)-->
 		<likelySubtag from="clu" to="clu_Latn_PH" origin="sil1"/>		<!--Caluyanun‧?‧?	➡ Caluyanun‧Latin‧Philippines-->
@@ -2567,7 +2631,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="dau" to="dau_Latn_TD" origin="sil1"/>		<!--Dar Sila Daju‧?‧?	➡ Dar Sila Daju‧Latin‧Chad-->
 		<likelySubtag from="daw" to="daw_Latn_PH" origin="sil1"/>		<!--Davawenyo‧?‧?	➡ Davawenyo‧Latin‧Philippines-->
 		<likelySubtag from="dax" to="dax_Latn_AU" origin="sil1"/>		<!--Dayi‧?‧?	➡ Dayi‧Latin‧Australia-->
-		<likelySubtag from="daz" to="daz_Latn_ID" origin="sil1"/>		<!--Dao‧?‧?	➡ Dao‧Latin‧Indonesia-->
+		<likelySubtag from="daz" to="daz_Latn_ID" origin="sil1"/>		<!--Moi-Wadea‧?‧?	➡ Moi-Wadea‧Latin‧Indonesia-->
 		<likelySubtag from="dba" to="dba_Latn_ML" origin="sil1"/>		<!--Bangime‧?‧?	➡ Bangime‧Latin‧Mali-->
 		<likelySubtag from="dbb" to="dbb_Latn_NG" origin="sil1"/>		<!--Deno‧?‧?	➡ Deno‧Latin‧Nigeria-->
 		<likelySubtag from="dbd" to="dbd_Latn_NG" origin="sil1"/>		<!--Dadiya‧?‧?	➡ Dadiya‧Latin‧Nigeria-->
@@ -2606,7 +2670,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="deg" to="deg_Latn_NG" origin="sil1"/>		<!--Degema‧?‧?	➡ Degema‧Latin‧Nigeria-->
 		<likelySubtag from="deh" to="deh_Arab_PK" origin="sil1"/>		<!--Dehwari‧?‧?	➡ Dehwari‧Arabic‧Pakistan-->
 		<likelySubtag from="dei" to="dei_Latn_ID" origin="sil1"/>		<!--Demisa‧?‧?	➡ Demisa‧Latin‧Indonesia-->
-		<likelySubtag from="dek" to="dek_Latn_CM" origin="sil1"/>		<!--Dek‧?‧?	➡ Dek‧Latin‧Cameroon-->
 		<likelySubtag from="del" to="del_Latn_US" origin="sil1"/>		<!--Delaware‧?‧?	➡ Delaware‧Latin‧United States-->
 		<likelySubtag from="dem" to="dem_Latn_ID" origin="sil1"/>		<!--Dem‧?‧?	➡ Dem‧Latin‧Indonesia-->
 		<likelySubtag from="deq" to="deq_Latn_CF" origin="sil1"/>		<!--Dendi (Central African Republic)‧?‧?	➡ Dendi (Central African Republic)‧Latin‧Central African Republic-->
@@ -2635,7 +2698,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="dhl" to="dhl_Latn_AU" origin="sil1"/>		<!--Dhalandji‧?‧?	➡ Dhalandji‧Latin‧Australia-->
 		<likelySubtag from="dhm" to="dhm_Latn_AO" origin="sil1"/>		<!--Zemba‧?‧?	➡ Zemba‧Latin‧Angola-->
 		<likelySubtag from="dhn" to="dhn_Gujr_IN" origin="sil1"/>		<!--Dhanki‧?‧?	➡ Dhanki‧Gujarati‧India-->
-		<likelySubtag from="dho" to="dho_Deva_IN" origin="sil1"/>		<!--Dhodia‧?‧?	➡ Dhodia‧Devanagari‧India-->
+		<likelySubtag from="dho" to="dho_Gujr_IN" origin="sil1"/>		<!--Dhodia‧?‧?	➡ Dhodia‧Gujarati‧India-->
 		<likelySubtag from="dhr" to="dhr_Latn_AU" origin="sil1"/>		<!--Dhargari‧?‧?	➡ Dhargari‧Latin‧Australia-->
 		<likelySubtag from="dhs" to="dhs_Latn_TZ" origin="sil1"/>		<!--Dhaiso‧?‧?	➡ Dhaiso‧Latin‧Tanzania-->
 		<likelySubtag from="dhu" to="dhu_Latn_AU" origin="sil1"/>		<!--Dhurga‧?‧?	➡ Dhurga‧Latin‧Australia-->
@@ -3163,7 +3226,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="gqn" to="gqn_Latn_BR" origin="sil1"/>		<!--Guana (Brazil)‧?‧?	➡ Guana (Brazil)‧Latin‧Brazil-->
 		<likelySubtag from="gqr" to="gqr_Latn_TD" origin="sil1"/>		<!--Gor‧?‧?	➡ Gor‧Latin‧Chad-->
 		<likelySubtag from="gra" to="gra_Deva_IN" origin="sil1"/>		<!--Rajput Garasia‧?‧?	➡ Rajput Garasia‧Devanagari‧India-->
-		<likelySubtag from="grb" to="grb_Latn_LR" origin="sil1"/>		<!--Grebo‧?‧?	➡ Grebo‧Latin‧Liberia-->
 		<likelySubtag from="grd" to="grd_Latn_NG" origin="sil1"/>		<!--Guruntum-Mbaaru‧?‧?	➡ Guruntum-Mbaaru‧Latin‧Nigeria-->
 		<likelySubtag from="grg" to="grg_Latn_PG" origin="sil1"/>		<!--Madi‧?‧?	➡ Madi‧Latin‧Papua New Guinea-->
 		<likelySubtag from="grh" to="grh_Latn_NG" origin="sil1"/>		<!--Gbiri-Niragu‧?‧?	➡ Gbiri-Niragu‧Latin‧Nigeria-->
@@ -3245,7 +3307,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="gza" to="gza_Latn_SD" origin="sil1"/>		<!--Ganza‧?‧?	➡ Ganza‧Latin‧Sudan-->
 		<likelySubtag from="gzi" to="gzi_Arab_IR" origin="sil1"/>		<!--Gazi‧?‧?	➡ Gazi‧Arabic‧Iran-->
 		<likelySubtag from="gzn" to="gzn_Latn_ID" origin="sil1"/>		<!--Gane‧?‧?	➡ Gane‧Latin‧Indonesia-->
-		<likelySubtag from="haa" to="haa_Latn_US" origin="sil1"/>		<!--Han‧?‧?	➡ Han‧Latin‧United States-->
+		<likelySubtag from="haa" to="haa_Latn_US" origin="sil1"/>		<!--Hän‧?‧?	➡ Hän‧Latin‧United States-->
 		<likelySubtag from="hac" to="hac_Arab_IR" origin="sil1"/>		<!--Gurani‧?‧?	➡ Gurani‧Arabic‧Iran-->
 		<likelySubtag from="had" to="had_Latn_ID" origin="sil1"/>		<!--Hatam‧?‧?	➡ Hatam‧Latin‧Indonesia-->
 		<likelySubtag from="hae" to="hae_Latn_ET" origin="sil1"/>		<!--Eastern Oromo‧?‧?	➡ Eastern Oromo‧Latin‧Ethiopia-->
@@ -3323,6 +3385,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="hng" to="hng_Latn_AO" origin="sil1"/>		<!--Hungu‧?‧?	➡ Hungu‧Latin‧Angola-->
 		<likelySubtag from="hnh" to="hnh_Latn_BW" origin="sil1"/>		<!--ǁAni‧?‧?	➡ ǁAni‧Latin‧Botswana-->
 		<likelySubtag from="hni" to="hni_Latn_CN" origin="sil1"/>		<!--Hani‧?‧?	➡ Hani‧Latin‧China-->
+		<likelySubtag from="hnm" to="hnm_Hans_CN" origin="sil1"/>		<!--Hainanese‧?‧?	➡ Hainanese‧Simplified‧China-->
 		<likelySubtag from="hns" to="hns_Latn_SR" origin="sil1"/>		<!--Caribbean Hindustani‧?‧?	➡ Caribbean Hindustani‧Latin‧Suriname-->
 		<likelySubtag from="hoa" to="hoa_Latn_SB" origin="sil1"/>		<!--Hoava‧?‧?	➡ Hoava‧Latin‧Solomon Islands-->
 		<likelySubtag from="hob" to="hob_Latn_PG" origin="sil1"/>		<!--Mari (Madang Province)‧?‧?	➡ Mari (Madang Province)‧Latin‧Papua New Guinea-->
@@ -3517,7 +3580,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="itw" to="itw_Latn_NG" origin="sil1"/>		<!--Ito‧?‧?	➡ Ito‧Latin‧Nigeria-->
 		<likelySubtag from="itx" to="itx_Latn_ID" origin="sil1"/>		<!--Itik‧?‧?	➡ Itik‧Latin‧Indonesia-->
 		<likelySubtag from="ity" to="ity_Latn_PH" origin="sil1"/>		<!--Moyadan Itneg‧?‧?	➡ Moyadan Itneg‧Latin‧Philippines-->
-		<likelySubtag from="itz" to="itz_Latn_GT" origin="sil1"/>		<!--Itzá‧?‧?	➡ Itzá‧Latin‧Guatemala-->
 		<likelySubtag from="ium" to="ium_Latn_CN" origin="sil1"/>		<!--Iu Mien‧?‧?	➡ Iu Mien‧Latin‧China-->
 		<likelySubtag from="ivb" to="ivb_Latn_PH" origin="sil1"/>		<!--Ibatan‧?‧?	➡ Ibatan‧Latin‧Philippines-->
 		<likelySubtag from="ivv" to="ivv_Latn_PH" origin="sil1"/>		<!--Ivatan‧?‧?	➡ Ivatan‧Latin‧Philippines-->
@@ -3526,7 +3588,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="iwo" to="iwo_Latn_ID" origin="sil1"/>		<!--Iwur‧?‧?	➡ Iwur‧Latin‧Indonesia-->
 		<likelySubtag from="iws" to="iws_Latn_PG" origin="sil1"/>		<!--Sepik Iwam‧?‧?	➡ Sepik Iwam‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ixc" to="ixc_Latn_MX" origin="sil1"/>		<!--Ixcatec‧?‧?	➡ Ixcatec‧Latin‧Mexico-->
-		<likelySubtag from="ixl" to="ixl_Latn_GT" origin="sil1"/>		<!--Ixil‧?‧?	➡ Ixil‧Latin‧Guatemala-->
 		<likelySubtag from="iya" to="iya_Latn_NG" origin="sil1"/>		<!--Iyayu‧?‧?	➡ Iyayu‧Latin‧Nigeria-->
 		<likelySubtag from="iyo" to="iyo_Latn_CM" origin="sil1"/>		<!--Mesaka‧?‧?	➡ Mesaka‧Latin‧Cameroon-->
 		<likelySubtag from="iyx" to="iyx_Latn_CG" origin="sil1"/>		<!--Yaka (Congo)‧?‧?	➡ Yaka (Congo)‧Latin‧Congo - Brazzaville-->
@@ -3535,7 +3596,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="izz" to="izz_Latn_NG" origin="sil1"/>		<!--Izii‧?‧?	➡ Izii‧Latin‧Nigeria-->
 		<likelySubtag from="jaa" to="jaa_Latn_BR" origin="sil1"/>		<!--Jamamadí‧?‧?	➡ Jamamadí‧Latin‧Brazil-->
 		<likelySubtag from="jab" to="jab_Latn_NG" origin="sil1"/>		<!--Hyam‧?‧?	➡ Hyam‧Latin‧Nigeria-->
-		<likelySubtag from="jac" to="jac_Latn_GT" origin="sil1"/>		<!--Popti'‧?‧?	➡ Popti'‧Latin‧Guatemala-->
 		<likelySubtag from="jad" to="jad_Arab_GN" origin="sil1"/>		<!--Jahanka‧?‧?	➡ Jahanka‧Arabic‧Guinea-->
 		<likelySubtag from="jae" to="jae_Latn_PG" origin="sil1"/>		<!--Yabem‧?‧?	➡ Yabem‧Latin‧Papua New Guinea-->
 		<likelySubtag from="jaf" to="jaf_Latn_NG" origin="sil1"/>		<!--Jara‧?‧?	➡ Jara‧Latin‧Nigeria-->
@@ -3689,7 +3749,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kce" to="kce_Latn_NG" origin="sil1"/>		<!--Kaivi‧?‧?	➡ Kaivi‧Latin‧Nigeria-->
 		<likelySubtag from="kcf" to="kcf_Latn_NG" origin="sil1"/>		<!--Ukaan‧?‧?	➡ Ukaan‧Latin‧Nigeria-->
 		<likelySubtag from="kch" to="kch_Latn_NG" origin="sil1"/>		<!--Vono‧?‧?	➡ Vono‧Latin‧Nigeria-->
-		<likelySubtag from="kci" to="kci_Latn_NG" origin="sil1"/>		<!--Kamantan‧?‧?	➡ Kamantan‧Latin‧Nigeria-->
+		<likelySubtag from="kci" to="kci_Latn_NG" origin="sil1"/>		<!--Ngyian‧?‧?	➡ Ngyian‧Latin‧Nigeria-->
 		<likelySubtag from="kcj" to="kcj_Latn_GW" origin="sil1"/>		<!--Kobiana‧?‧?	➡ Kobiana‧Latin‧Guinea-Bissau-->
 		<likelySubtag from="kcl" to="kcl_Latn_PG" origin="sil1"/>		<!--Kela (Papua New Guinea)‧?‧?	➡ Kela (Papua New Guinea)‧Latin‧Papua New Guinea-->
 		<likelySubtag from="kcm" to="kcm_Latn_CF" origin="sil1"/>		<!--Gula (Central African Republic)‧?‧?	➡ Gula (Central African Republic)‧Latin‧Central African Republic-->
@@ -3730,7 +3790,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="keg" to="keg_Latn_SD" origin="sil1"/>		<!--Tese‧?‧?	➡ Tese‧Latin‧Sudan-->
 		<likelySubtag from="keh" to="keh_Latn_PG" origin="sil1"/>		<!--Keak‧?‧?	➡ Keak‧Latin‧Papua New Guinea-->
 		<likelySubtag from="kei" to="kei_Latn_ID" origin="sil1"/>		<!--Kei‧?‧?	➡ Kei‧Latin‧Indonesia-->
-		<likelySubtag from="kek" to="kek_Latn_GT" origin="sil1"/>		<!--Kekchí‧?‧?	➡ Kekchí‧Latin‧Guatemala-->
 		<likelySubtag from="kel" to="kel_Latn_CD" origin="sil1"/>		<!--Kela (Democratic Republic of Congo)‧?‧?	➡ Kela (Democratic Republic of Congo)‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="kem" to="kem_Latn_TL" origin="sil1"/>		<!--Kemak‧?‧?	➡ Kemak‧Latin‧Timor-Leste-->
 		<likelySubtag from="keo" to="keo_Latn_UG" origin="sil1"/>		<!--Kakwa‧?‧?	➡ Kakwa‧Latin‧Uganda-->
@@ -3779,7 +3838,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kgv" to="kgv_Latn_ID" origin="sil1"/>		<!--Karas‧?‧?	➡ Karas‧Latin‧Indonesia-->
 		<likelySubtag from="kgw" to="kgw_Latn_ID" origin="sil1"/>		<!--Karon Dori‧?‧?	➡ Karon Dori‧Latin‧Indonesia-->
 		<likelySubtag from="kgx" to="kgx_Latn_ID" origin="sil1"/>		<!--Kamaru‧?‧?	➡ Kamaru‧Latin‧Indonesia-->
-		<likelySubtag from="kgy" to="kgy_Deva_NP" origin="sil1"/>		<!--Kyerung‧?‧?	➡ Kyerung‧Devanagari‧Nepal-->
+		<likelySubtag from="kgy" to="kgy_Tibt_NP" origin="sil1"/>		<!--Kyerung‧?‧?	➡ Kyerung‧Tibetan‧Nepal-->
 		<likelySubtag from="khc" to="khc_Latn_ID" origin="sil1"/>		<!--Tukang Besi North‧?‧?	➡ Tukang Besi North‧Latin‧Indonesia-->
 		<likelySubtag from="khd" to="khd_Latn_ID" origin="sil1"/>		<!--Bädi Kanum‧?‧?	➡ Bädi Kanum‧Latin‧Indonesia-->
 		<likelySubtag from="khe" to="khe_Latn_ID" origin="sil1"/>		<!--Korowai‧?‧?	➡ Korowai‧Latin‧Indonesia-->
@@ -3819,7 +3878,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kiy" to="kiy_Latn_ID" origin="sil1"/>		<!--Kirikiri‧?‧?	➡ Kirikiri‧Latin‧Indonesia-->
 		<likelySubtag from="kiz" to="kiz_Latn_TZ" origin="sil1"/>		<!--Kisi‧?‧?	➡ Kisi‧Latin‧Tanzania-->
 		<likelySubtag from="kja" to="kja_Latn_ID" origin="sil1"/>		<!--Mlap‧?‧?	➡ Mlap‧Latin‧Indonesia-->
-		<likelySubtag from="kjb" to="kjb_Latn_GT" origin="sil1"/>		<!--Q'anjob'al‧?‧?	➡ Q'anjob'al‧Latin‧Guatemala-->
 		<likelySubtag from="kjc" to="kjc_Latn_ID" origin="sil1"/>		<!--Coastal Konjo‧?‧?	➡ Coastal Konjo‧Latin‧Indonesia-->
 		<likelySubtag from="kjd" to="kjd_Latn_PG" origin="sil1"/>		<!--Southern Kiwai‧?‧?	➡ Southern Kiwai‧Latin‧Papua New Guinea-->
 		<likelySubtag from="kje" to="kje_Latn_ID" origin="sil1"/>		<!--Kisar‧?‧?	➡ Kisar‧Latin‧Indonesia-->
@@ -3918,7 +3976,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="knd" to="knd_Latn_ID" origin="sil1"/>		<!--Konda‧?‧?	➡ Konda‧Latin‧Indonesia-->
 		<likelySubtag from="kne" to="kne_Latn_PH" origin="sil1"/>		<!--Kankanaey‧?‧?	➡ Kankanaey‧Latin‧Philippines-->
 		<likelySubtag from="kni" to="kni_Latn_NG" origin="sil1"/>		<!--Kanufi‧?‧?	➡ Kanufi‧Latin‧Nigeria-->
-		<likelySubtag from="knj" to="knj_Latn_GT" origin="sil1"/>		<!--Western Kanjobal‧?‧?	➡ Western Kanjobal‧Latin‧Guatemala-->
 		<likelySubtag from="knk" to="knk_Latn_SL" origin="sil1"/>		<!--Kuranko‧?‧?	➡ Kuranko‧Latin‧Sierra Leone-->
 		<likelySubtag from="knl" to="knl_Latn_ID" origin="sil1"/>		<!--Keninjal‧?‧?	➡ Keninjal‧Latin‧Indonesia-->
 		<likelySubtag from="knm" to="knm_Latn_BR" origin="sil1"/>		<!--Kanamarí‧?‧?	➡ Kanamarí‧Latin‧Brazil-->
@@ -4030,7 +4087,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ksp" to="ksp_Latn_CF" origin="sil1"/>		<!--Kaba‧?‧?	➡ Kaba‧Latin‧Central African Republic-->
 		<likelySubtag from="ksq" to="ksq_Latn_NG" origin="sil1"/>		<!--Kwaami‧?‧?	➡ Kwaami‧Latin‧Nigeria-->
 		<likelySubtag from="ksr" to="ksr_Latn_PG" origin="sil1"/>		<!--Borong‧?‧?	➡ Borong‧Latin‧Papua New Guinea-->
-		<likelySubtag from="kss" to="kss_Latn_LR" origin="sil1"/>		<!--Southern Kisi‧?‧?	➡ Southern Kisi‧Latin‧Liberia-->
 		<likelySubtag from="kst" to="kst_Latn_BF" origin="sil1"/>		<!--Winyé‧?‧?	➡ Winyé‧Latin‧Burkina Faso-->
 		<likelySubtag from="ksu" to="ksu_Mymr_IN" origin="sil1"/>		<!--Khamyang‧?‧?	➡ Khamyang‧Myanmar‧India-->
 		<likelySubtag from="ksv" to="ksv_Latn_CD" origin="sil1"/>		<!--Kusu‧?‧?	➡ Kusu‧Latin‧Congo - Kinshasa-->
@@ -4127,6 +4183,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kwu" to="kwu_Latn_CM" origin="sil1"/>		<!--Kwakum‧?‧?	➡ Kwakum‧Latin‧Cameroon-->
 		<likelySubtag from="kwv" to="kwv_Latn_TD" origin="sil1"/>		<!--Sara Kaba Náà‧?‧?	➡ Sara Kaba Náà‧Latin‧Chad-->
 		<likelySubtag from="kww" to="kww_Latn_SR" origin="sil1"/>		<!--Kwinti‧?‧?	➡ Kwinti‧Latin‧Suriname-->
+		<likelySubtag from="kwx" to="kwx_Deva_IN" origin="sil1"/>		<!--Khirwar‧?‧?	➡ Khirwar‧Devanagari‧India-->
 		<likelySubtag from="kwy" to="kwy_Latn_AO" origin="sil1"/>		<!--San Salvador Kongo‧?‧?	➡ San Salvador Kongo‧Latin‧Angola-->
 		<likelySubtag from="kwz" to="kwz_Latn_AO" origin="sil1"/>		<!--Kwadi‧?‧?	➡ Kwadi‧Latin‧Angola-->
 		<likelySubtag from="kxa" to="kxa_Latn_PG" origin="sil1"/>		<!--Kairiru‧?‧?	➡ Kairiru‧Latin‧Papua New Guinea-->
@@ -4167,7 +4224,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kyt" to="kyt_Latn_ID" origin="sil1"/>		<!--Kayagar‧?‧?	➡ Kayagar‧Latin‧Indonesia-->
 		<likelySubtag from="kyu" to="kyu_Kali_MM" origin="sil1"/>		<!--Western Kayah‧?‧?	➡ Western Kayah‧Kayah Li‧Myanmar (Burma)-->
 		<likelySubtag from="kyv" to="kyv_Deva_NP" origin="sil1"/>		<!--Kayort‧?‧?	➡ Kayort‧Devanagari‧Nepal-->
-		<likelySubtag from="kyw" to="kyw_Deva_IN" origin="sil1"/>		<!--Kudmali‧?‧?	➡ Kudmali‧Devanagari‧India-->
 		<likelySubtag from="kyx" to="kyx_Latn_PG" origin="sil1"/>		<!--Rapoisi‧?‧?	➡ Rapoisi‧Latin‧Papua New Guinea-->
 		<likelySubtag from="kyy" to="kyy_Latn_PG" origin="sil1"/>		<!--Kambaira‧?‧?	➡ Kambaira‧Latin‧Papua New Guinea-->
 		<likelySubtag from="kyz" to="kyz_Latn_BR" origin="sil1"/>		<!--Kayabí‧?‧?	➡ Kayabí‧Latin‧Brazil-->
@@ -4303,7 +4359,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="lio" to="lio_Latn_ID" origin="sil1"/>		<!--Liki‧?‧?	➡ Liki‧Latin‧Indonesia-->
 		<likelySubtag from="lip" to="lip_Latn_GH" origin="sil1"/>		<!--Sekpele‧?‧?	➡ Sekpele‧Latin‧Ghana-->
 		<likelySubtag from="liq" to="liq_Latn_ET" origin="sil1"/>		<!--Libido‧?‧?	➡ Libido‧Latin‧Ethiopia-->
-		<likelySubtag from="lir" to="lir_Latn_LR" origin="sil1"/>		<!--Liberian English‧?‧?	➡ Liberian English‧Latin‧Liberia-->
 		<likelySubtag from="liu" to="liu_Latn_SD" origin="sil1"/>		<!--Logorik‧?‧?	➡ Logorik‧Latin‧Sudan-->
 		<likelySubtag from="liv" to="liv_Latn_LV" origin="sil1"/>		<!--Livonian‧?‧?	➡ Livonian‧Latin‧Latvia-->
 		<likelySubtag from="liw" to="liw_Latn_ID" origin="sil1"/>		<!--Col‧?‧?	➡ Col‧Latin‧Indonesia-->
@@ -4436,6 +4491,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="luc" to="luc_Latn_UG" origin="sil1"/>		<!--Aringa‧?‧?	➡ Aringa‧Latin‧Uganda-->
 		<likelySubtag from="lud" to="lud_Latn_RU" origin="sil1"/>		<!--Ludian‧?‧?	➡ Ludian‧Latin‧Russia-->
 		<likelySubtag from="luf" to="luf_Latn_PG" origin="sil1"/>		<!--Laua‧?‧?	➡ Laua‧Latin‧Papua New Guinea-->
+		<likelySubtag from="luh" to="luh_Hans_CN" origin="sil1"/>		<!--Leizhou Chinese‧?‧?	➡ Leizhou Chinese‧Simplified‧China-->
 		<likelySubtag from="lui" to="lui_Latn_US" origin="sil1"/>		<!--Luiseno‧?‧?	➡ Luiseno‧Latin‧United States-->
 		<likelySubtag from="luj" to="luj_Latn_CD" origin="sil1"/>		<!--Luna‧?‧?	➡ Luna‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="luk" to="luk_Tibt_BT" origin="sil1"/>		<!--Lunanakha‧?‧?	➡ Lunanakha‧Tibetan‧Bhutan-->
@@ -4471,7 +4527,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mab" to="mab_Latn_MX" origin="sil1"/>		<!--Yutanduchi Mixtec‧?‧?	➡ Yutanduchi Mixtec‧Latin‧Mexico-->
 		<likelySubtag from="mae" to="mae_Latn_NG" origin="sil1"/>		<!--Bo-Rukul‧?‧?	➡ Bo-Rukul‧Latin‧Nigeria-->
 		<likelySubtag from="maj" to="maj_Latn_MX" origin="sil1"/>		<!--Jalapa De Díaz Mazatec‧?‧?	➡ Jalapa De Díaz Mazatec‧Latin‧Mexico-->
-		<likelySubtag from="mam" to="mam_Latn_GT" origin="sil1"/>		<!--Mam‧?‧?	➡ Mam‧Latin‧Guatemala-->
 		<likelySubtag from="maq" to="maq_Latn_MX" origin="sil1"/>		<!--Chiquihuitlán Mazatec‧?‧?	➡ Chiquihuitlán Mazatec‧Latin‧Mexico-->
 		<likelySubtag from="mat" to="mat_Latn_MX" origin="sil1"/>		<!--San Francisco Matlatzinca‧?‧?	➡ San Francisco Matlatzinca‧Latin‧Mexico-->
 		<likelySubtag from="mau" to="mau_Latn_MX" origin="sil1"/>		<!--Huautla Mazatec‧?‧?	➡ Huautla Mazatec‧Latin‧Mexico-->
@@ -4565,7 +4620,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mes" to="mes_Latn_TD" origin="sil1"/>		<!--Masmaje‧?‧?	➡ Masmaje‧Latin‧Chad-->
 		<likelySubtag from="met" to="met_Latn_PG" origin="sil1"/>		<!--Mato‧?‧?	➡ Mato‧Latin‧Papua New Guinea-->
 		<likelySubtag from="meu" to="meu_Latn_PG" origin="sil1"/>		<!--Motu‧?‧?	➡ Motu‧Latin‧Papua New Guinea-->
-		<likelySubtag from="mev" to="mev_Latn_LR" origin="sil1"/>		<!--Mano‧?‧?	➡ Mano‧Latin‧Liberia-->
 		<likelySubtag from="mew" to="mew_Latn_NG" origin="sil1"/>		<!--Maaka‧?‧?	➡ Maaka‧Latin‧Nigeria-->
 		<likelySubtag from="mez" to="mez_Latn_US" origin="sil1"/>		<!--Menominee‧?‧?	➡ Menominee‧Latin‧United States-->
 		<likelySubtag from="mfb" to="mfb_Latn_ID" origin="sil1"/>		<!--Bangka‧?‧?	➡ Bangka‧Latin‧Indonesia-->
@@ -4692,7 +4746,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mkr" to="mkr_Latn_PG" origin="sil1"/>		<!--Malas‧?‧?	➡ Malas‧Latin‧Papua New Guinea-->
 		<likelySubtag from="mks" to="mks_Latn_MX" origin="sil1"/>		<!--Silacayoapan Mixtec‧?‧?	➡ Silacayoapan Mixtec‧Latin‧Mexico-->
 		<likelySubtag from="mkt" to="mkt_Latn_NC" origin="sil1"/>		<!--Vamale‧?‧?	➡ Vamale‧Latin‧New Caledonia-->
-		<likelySubtag from="mku" to="mku_Latn_GN" origin="sil1"/>		<!--Konyanka Maninka‧?‧?	➡ Konyanka Maninka‧Latin‧Guinea-->
 		<likelySubtag from="mkv" to="mkv_Latn_VU" origin="sil1"/>		<!--Mafea‧?‧?	➡ Mafea‧Latin‧Vanuatu-->
 		<likelySubtag from="mkw" to="mkw_Latn_CG" origin="sil1"/>		<!--Kituba (Congo)‧?‧?	➡ Kituba (Congo)‧Latin‧Congo - Brazzaville-->
 		<likelySubtag from="mkx" to="mkx_Latn_PH" origin="sil1"/>		<!--Kinamiging Manobo‧?‧?	➡ Kinamiging Manobo‧Latin‧Philippines-->
@@ -4711,7 +4764,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mln" to="mln_Latn_SB" origin="sil1"/>		<!--Malango‧?‧?	➡ Malango‧Latin‧Solomon Islands-->
 		<likelySubtag from="mlo" to="mlo_Latn_SN" origin="sil1"/>		<!--Mlomp‧?‧?	➡ Mlomp‧Latin‧Senegal-->
 		<likelySubtag from="mlp" to="mlp_Latn_PG" origin="sil1"/>		<!--Bargam‧?‧?	➡ Bargam‧Latin‧Papua New Guinea-->
-		<likelySubtag from="mlq" to="mlq_Latn_SN" origin="sil1"/>		<!--Western Maninkakan‧?‧?	➡ Western Maninkakan‧Latin‧Senegal-->
 		<likelySubtag from="mlr" to="mlr_Latn_CM" origin="sil1"/>		<!--Vame‧?‧?	➡ Vame‧Latin‧Cameroon-->
 		<likelySubtag from="mlu" to="mlu_Latn_SB" origin="sil1"/>		<!--To'abaita‧?‧?	➡ To'abaita‧Latin‧Solomon Islands-->
 		<likelySubtag from="mlv" to="mlv_Latn_VU" origin="sil1"/>		<!--Motlav‧?‧?	➡ Motlav‧Latin‧Vanuatu-->
@@ -4726,7 +4778,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mmf" to="mmf_Latn_NG" origin="sil1"/>		<!--Mundat‧?‧?	➡ Mundat‧Latin‧Nigeria-->
 		<likelySubtag from="mmg" to="mmg_Latn_VU" origin="sil1"/>		<!--North Ambrym‧?‧?	➡ North Ambrym‧Latin‧Vanuatu-->
 		<likelySubtag from="mmh" to="mmh_Latn_BR" origin="sil1"/>		<!--Mehináku‧?‧?	➡ Mehináku‧Latin‧Brazil-->
-		<likelySubtag from="mmi" to="mmi_Latn_PG" origin="sil1"/>		<!--Musar‧?‧?	➡ Musar‧Latin‧Papua New Guinea-->
+		<likelySubtag from="mmi" to="mmi_Latn_PG" origin="sil1"/>		<!--Hember Avu‧?‧?	➡ Hember Avu‧Latin‧Papua New Guinea-->
 		<likelySubtag from="mmm" to="mmm_Latn_VU" origin="sil1"/>		<!--Maii‧?‧?	➡ Maii‧Latin‧Vanuatu-->
 		<likelySubtag from="mmn" to="mmn_Latn_PH" origin="sil1"/>		<!--Mamanwa‧?‧?	➡ Mamanwa‧Latin‧Philippines-->
 		<likelySubtag from="mmo" to="mmo_Latn_PG" origin="sil1"/>		<!--Mangga Buang‧?‧?	➡ Mangga Buang‧Latin‧Papua New Guinea-->
@@ -4749,6 +4801,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mng" to="mng_Latn_VN" origin="sil1"/>		<!--Eastern Mnong‧?‧?	➡ Eastern Mnong‧Latin‧Vietnam-->
 		<likelySubtag from="mnh" to="mnh_Latn_CD" origin="sil1"/>		<!--Mono (Democratic Republic of Congo)‧?‧?	➡ Mono (Democratic Republic of Congo)‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="mnj" to="mnj_Arab_AF" origin="sil1"/>		<!--Munji‧?‧?	➡ Munji‧Arabic‧Afghanistan-->
+		<likelySubtag from="mnk" to="mnk_Latn_GM" origin="sil1"/>		<!--Mandinka‧?‧?	➡ Mandinka‧Latin‧Gambia-->
 		<likelySubtag from="mnl" to="mnl_Latn_VU" origin="sil1"/>		<!--Tiale‧?‧?	➡ Tiale‧Latin‧Vanuatu-->
 		<likelySubtag from="mnm" to="mnm_Latn_PG" origin="sil1"/>		<!--Mapena‧?‧?	➡ Mapena‧Latin‧Papua New Guinea-->
 		<likelySubtag from="mnn" to="mnn_Latn_VN" origin="sil1"/>		<!--Southern Mnong‧?‧?	➡ Southern Mnong‧Latin‧Vietnam-->
@@ -4770,7 +4823,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mok" to="mok_Latn_ID" origin="sil1"/>		<!--Morori‧?‧?	➡ Morori‧Latin‧Indonesia-->
 		<likelySubtag from="mom" to="mom_Latn_NI" origin="sil1"/>		<!--Mangue‧?‧?	➡ Mangue‧Latin‧Nicaragua-->
 		<likelySubtag from="moo" to="moo_Latn_VN" origin="sil1"/>		<!--Monom‧?‧?	➡ Monom‧Latin‧Vietnam-->
-		<likelySubtag from="mop" to="mop_Latn_BZ" origin="sil1"/>		<!--Mopán Maya‧?‧?	➡ Mopán Maya‧Latin‧Belize-->
 		<likelySubtag from="moq" to="moq_Latn_ID" origin="sil1"/>		<!--Mor (Bomberai Peninsula)‧?‧?	➡ Mor (Bomberai Peninsula)‧Latin‧Indonesia-->
 		<likelySubtag from="mor" to="mor_Latn_SD" origin="sil1"/>		<!--Moro‧?‧?	➡ Moro‧Latin‧Sudan-->
 		<likelySubtag from="mot" to="mot_Latn_CO" origin="sil1"/>		<!--Barí‧?‧?	➡ Barí‧Latin‧Colombia-->
@@ -4823,6 +4875,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mqq" to="mqq_Latn_MY" origin="sil1"/>		<!--Minokok‧?‧?	➡ Minokok‧Latin‧Malaysia-->
 		<likelySubtag from="mqr" to="mqr_Latn_ID" origin="sil1"/>		<!--Mander‧?‧?	➡ Mander‧Latin‧Indonesia-->
 		<likelySubtag from="mqs" to="mqs_Latn_ID" origin="sil1"/>		<!--West Makian‧?‧?	➡ West Makian‧Latin‧Indonesia-->
+		<likelySubtag from="mqt" to="mqt_Latn_TH" origin="sil1"/>		<!--Mok‧?‧?	➡ Mok‧Latin‧Thailand-->
 		<likelySubtag from="mqu" to="mqu_Latn_SS" origin="sil1"/>		<!--Mandari‧?‧?	➡ Mandari‧Latin‧South Sudan-->
 		<likelySubtag from="mqv" to="mqv_Latn_PG" origin="sil1"/>		<!--Mosimo‧?‧?	➡ Mosimo‧Latin‧Papua New Guinea-->
 		<likelySubtag from="mqw" to="mqw_Latn_PG" origin="sil1"/>		<!--Murupi‧?‧?	➡ Murupi‧Latin‧Papua New Guinea-->
@@ -4851,7 +4904,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mry" to="mry_Latn_PH" origin="sil1"/>		<!--Mandaya‧?‧?	➡ Mandaya‧Latin‧Philippines-->
 		<likelySubtag from="mrz" to="mrz_Latn_ID" origin="sil1"/>		<!--Marind‧?‧?	➡ Marind‧Latin‧Indonesia-->
 		<likelySubtag from="msb" to="msb_Latn_PH" origin="sil1"/>		<!--Masbatenyo‧?‧?	➡ Masbatenyo‧Latin‧Philippines-->
-		<likelySubtag from="msc" to="msc_Latn_GN" origin="sil1"/>		<!--Sankaran Maninka‧?‧?	➡ Sankaran Maninka‧Latin‧Guinea-->
 		<likelySubtag from="mse" to="mse_Latn_TD" origin="sil1"/>		<!--Musey‧?‧?	➡ Musey‧Latin‧Chad-->
 		<likelySubtag from="msf" to="msf_Latn_ID" origin="sil1"/>		<!--Mekwei‧?‧?	➡ Mekwei‧Latin‧Indonesia-->
 		<likelySubtag from="msg" to="msg_Latn_ID" origin="sil1"/>		<!--Moraid‧?‧?	➡ Moraid‧Latin‧Indonesia-->
@@ -5347,7 +5399,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="nsy" to="nsy_Latn_ID" origin="sil1"/>		<!--Nasal‧?‧?	➡ Nasal‧Latin‧Indonesia-->
 		<likelySubtag from="nsz" to="nsz_Latn_US" origin="sil1"/>		<!--Nisenan‧?‧?	➡ Nisenan‧Latin‧United States-->
 		<likelySubtag from="ntd" to="ntd_Latn_MY" origin="sil1"/>		<!--Northern Tidung‧?‧?	➡ Northern Tidung‧Latin‧Malaysia-->
-		<likelySubtag from="nte" to="nte_Latn_MZ" origin="sil1"/>		<!--Nathembo‧?‧?	➡ Nathembo‧Latin‧Mozambique-->
 		<likelySubtag from="ntg" to="ntg_Latn_AU" origin="sil1"/>		<!--Ngantangarra‧?‧?	➡ Ngantangarra‧Latin‧Australia-->
 		<likelySubtag from="nti" to="nti_Latn_BF" origin="sil1"/>		<!--Natioro‧?‧?	➡ Natioro‧Latin‧Burkina Faso-->
 		<likelySubtag from="ntj" to="ntj_Latn_AU" origin="sil1"/>		<!--Ngaanyatjarra‧?‧?	➡ Ngaanyatjarra‧Latin‧Australia-->
@@ -5363,7 +5414,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="nua" to="nua_Latn_NC" origin="sil1"/>		<!--Yuanga‧?‧?	➡ Yuanga‧Latin‧New Caledonia-->
 		<likelySubtag from="nuc" to="nuc_Latn_BR" origin="sil1"/>		<!--Nukuini‧?‧?	➡ Nukuini‧Latin‧Brazil-->
 		<likelySubtag from="nud" to="nud_Latn_PG" origin="sil1"/>		<!--Ngala‧?‧?	➡ Ngala‧Latin‧Papua New Guinea-->
-		<likelySubtag from="nue" to="nue_Latn_CD" origin="sil1"/>		<!--Ngundu‧?‧?	➡ Ngundu‧Latin‧Congo - Kinshasa-->
+		<likelySubtag from="nue" to="nue_Latn_CF" origin="sil1"/>		<!--Ngundu‧?‧?	➡ Ngundu‧Latin‧Central African Republic-->
 		<likelySubtag from="nuf" to="nuf_Latn_CN" origin="sil1"/>		<!--Nusu‧?‧?	➡ Nusu‧Latin‧China-->
 		<likelySubtag from="nug" to="nug_Latn_AU" origin="sil1"/>		<!--Nungali‧?‧?	➡ Nungali‧Latin‧Australia-->
 		<likelySubtag from="nuh" to="nuh_Latn_NG" origin="sil1"/>		<!--Ndunda‧?‧?	➡ Ndunda‧Latin‧Nigeria-->
@@ -5401,6 +5452,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="nxe" to="nxe_Latn_ID" origin="sil1"/>		<!--Nage‧?‧?	➡ Nage‧Latin‧Indonesia-->
 		<likelySubtag from="nxg" to="nxg_Latn_ID" origin="sil1"/>		<!--Ngad'a‧?‧?	➡ Ngad'a‧Latin‧Indonesia-->
 		<likelySubtag from="nxi" to="nxi_Latn_TZ" origin="sil1"/>		<!--Nindi‧?‧?	➡ Nindi‧Latin‧Tanzania-->
+		<likelySubtag from="nxk" to="nxk_Latn_MM" origin="sil1"/>		<!--Koki Naga‧?‧?	➡ Koki Naga‧Latin‧Myanmar (Burma)-->
 		<likelySubtag from="nxl" to="nxl_Latn_ID" origin="sil1"/>		<!--South Nuaulu‧?‧?	➡ South Nuaulu‧Latin‧Indonesia-->
 		<likelySubtag from="nxn" to="nxn_Latn_AU" origin="sil1"/>		<!--Ngawun‧?‧?	➡ Ngawun‧Latin‧Australia-->
 		<likelySubtag from="nxo" to="nxo_Latn_GA" origin="sil1"/>		<!--Ndambomo‧?‧?	➡ Ndambomo‧Latin‧Gabon-->
@@ -5576,6 +5628,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ovd" to="ovd_Latn_SE" origin="sil1"/>		<!--Elfdalian‧?‧?	➡ Elfdalian‧Latin‧Sweden-->
 		<likelySubtag from="owi" to="owi_Latn_PG" origin="sil1"/>		<!--Owiniga‧?‧?	➡ Owiniga‧Latin‧Papua New Guinea-->
 		<likelySubtag from="owl" to="owl_Latn_GB" origin="sil1"/>		<!--Old Welsh‧?‧?	➡ Old Welsh‧Latin‧United Kingdom-->
+		<likelySubtag from="oyb" to="oyb_Laoo_LA" origin="sil1"/>		<!--Oy‧?‧?	➡ Oy‧Lao‧Laos-->
 		<likelySubtag from="oyd" to="oyd_Latn_ET" origin="sil1"/>		<!--Oyda‧?‧?	➡ Oyda‧Latin‧Ethiopia-->
 		<likelySubtag from="oym" to="oym_Latn_BR" origin="sil1"/>		<!--Wayampi‧?‧?	➡ Wayampi‧Latin‧Brazil-->
 		<likelySubtag from="oyy" to="oyy_Latn_PG" origin="sil1"/>		<!--Oya'oya‧?‧?	➡ Oya'oya‧Latin‧Papua New Guinea-->
@@ -5649,7 +5702,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pfa" to="pfa_Latn_FM" origin="sil1"/>		<!--Pááfang‧?‧?	➡ Pááfang‧Latin‧Micronesia-->
 		<likelySubtag from="pfe" to="pfe_Latn_CM" origin="sil1"/>		<!--Pere‧?‧?	➡ Pere‧Latin‧Cameroon-->
 		<likelySubtag from="pga" to="pga_Latn_SS" origin="sil1"/>		<!--Sudanese Creole Arabic‧?‧?	➡ Sudanese Creole Arabic‧Latin‧South Sudan-->
-		<likelySubtag from="pgd" to="pgd_Khar_PK" origin="sil1"/>		<!--Gāndhārī‧?‧?	➡ Gāndhārī‧Kharoshthi‧Pakistan-->
 		<likelySubtag from="pgg" to="pgg_Deva_IN" origin="sil1"/>		<!--Pangwali‧?‧?	➡ Pangwali‧Devanagari‧India-->
 		<likelySubtag from="pgi" to="pgi_Latn_PG" origin="sil1"/>		<!--Pagi‧?‧?	➡ Pagi‧Latin‧Papua New Guinea-->
 		<likelySubtag from="pgk" to="pgk_Latn_VU" origin="sil1"/>		<!--Rerep‧?‧?	➡ Rerep‧Latin‧Vanuatu-->
@@ -5669,7 +5721,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="phu" to="phu_Thai_TH" origin="sil1"/>		<!--Phuan‧?‧?	➡ Phuan‧Thai‧Thailand-->
 		<likelySubtag from="phv" to="phv_Arab_AF" origin="sil1"/>		<!--Pahlavani‧?‧?	➡ Pahlavani‧Arabic‧Afghanistan-->
 		<likelySubtag from="phw" to="phw_Deva_NP" origin="sil1"/>		<!--Phangduwali‧?‧?	➡ Phangduwali‧Devanagari‧Nepal-->
-		<likelySubtag from="pi" to="pi_Sinh_IN" origin="sil1"/>		<!--Pali‧?‧?	➡ Pali‧Sinhala‧India-->
 		<likelySubtag from="pia" to="pia_Latn_MX" origin="sil1"/>		<!--Pima Bajo‧?‧?	➡ Pima Bajo‧Latin‧Mexico-->
 		<likelySubtag from="pib" to="pib_Latn_PE" origin="sil1"/>		<!--Yine‧?‧?	➡ Yine‧Latin‧Peru-->
 		<likelySubtag from="pic" to="pic_Latn_GA" origin="sil1"/>		<!--Pinji‧?‧?	➡ Pinji‧Latin‧Gabon-->
@@ -5756,11 +5807,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pnw" to="pnw_Latn_AU" origin="sil1"/>		<!--Banyjima‧?‧?	➡ Banyjima‧Latin‧Australia-->
 		<likelySubtag from="pny" to="pny_Latn_CM" origin="sil1"/>		<!--Pinyin‧?‧?	➡ Pinyin‧Latin‧Cameroon-->
 		<likelySubtag from="pnz" to="pnz_Latn_CF" origin="sil1"/>		<!--Pana (Central African Republic)‧?‧?	➡ Pana (Central African Republic)‧Latin‧Central African Republic-->
-		<likelySubtag from="poc" to="poc_Latn_GT" origin="sil1"/>		<!--Poqomam‧?‧?	➡ Poqomam‧Latin‧Guatemala-->
 		<likelySubtag from="poe" to="poe_Latn_MX" origin="sil1"/>		<!--San Juan Atzingo Popoloca‧?‧?	➡ San Juan Atzingo Popoloca‧Latin‧Mexico-->
 		<likelySubtag from="pof" to="pof_Latn_CD" origin="sil1"/>		<!--Poke‧?‧?	➡ Poke‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="pog" to="pog_Latn_BR" origin="sil1"/>		<!--Potiguára‧?‧?	➡ Potiguára‧Latin‧Brazil-->
-		<likelySubtag from="poh" to="poh_Latn_GT" origin="sil1"/>		<!--Poqomchi'‧?‧?	➡ Poqomchi'‧Latin‧Guatemala-->
 		<likelySubtag from="poi" to="poi_Latn_MX" origin="sil1"/>		<!--Highland Popoluca‧?‧?	➡ Highland Popoluca‧Latin‧Mexico-->
 		<likelySubtag from="pok" to="pok_Latn_BR" origin="sil1"/>		<!--Pokangá‧?‧?	➡ Pokangá‧Latin‧Brazil-->
 		<likelySubtag from="pom" to="pom_Latn_US" origin="sil1"/>		<!--Southeastern Pomo‧?‧?	➡ Southeastern Pomo‧Latin‧United States-->
@@ -5861,13 +5910,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="qui" to="qui_Latn_US" origin="sil1"/>		<!--Quileute‧?‧?	➡ Quileute‧Latin‧United States-->
 		<likelySubtag from="quk" to="quk_Latn_PE" origin="sil1"/>		<!--Chachapoyas Quechua‧?‧?	➡ Chachapoyas Quechua‧Latin‧Peru-->
 		<likelySubtag from="qul" to="qul_Latn_BO" origin="sil1"/>		<!--North Bolivian Quechua‧?‧?	➡ North Bolivian Quechua‧Latin‧Bolivia-->
-		<likelySubtag from="qum" to="qum_Latn_GT" origin="sil1"/>		<!--Sipacapense‧?‧?	➡ Sipacapense‧Latin‧Guatemala-->
 		<likelySubtag from="qun" to="qun_Latn_US" origin="sil1"/>		<!--Quinault‧?‧?	➡ Quinault‧Latin‧United States-->
 		<likelySubtag from="qup" to="qup_Latn_PE" origin="sil1"/>		<!--Southern Pastaza Quechua‧?‧?	➡ Southern Pastaza Quechua‧Latin‧Peru-->
 		<likelySubtag from="quq" to="quq_Latn_ES" origin="sil1"/>		<!--Quinqui‧?‧?	➡ Quinqui‧Latin‧Spain-->
 		<likelySubtag from="qur" to="qur_Latn_PE" origin="sil1"/>		<!--Yanahuanca Pasco Quechua‧?‧?	➡ Yanahuanca Pasco Quechua‧Latin‧Peru-->
 		<likelySubtag from="qus" to="qus_Latn_AR" origin="sil1"/>		<!--Santiago del Estero Quichua‧?‧?	➡ Santiago del Estero Quichua‧Latin‧Argentina-->
-		<likelySubtag from="quv" to="quv_Latn_GT" origin="sil1"/>		<!--Sacapulteco‧?‧?	➡ Sacapulteco‧Latin‧Guatemala-->
 		<likelySubtag from="quw" to="quw_Latn_EC" origin="sil1"/>		<!--Tena Lowland Quichua‧?‧?	➡ Tena Lowland Quichua‧Latin‧Ecuador-->
 		<likelySubtag from="qux" to="qux_Latn_PE" origin="sil1"/>		<!--Yauyos Quechua‧?‧?	➡ Yauyos Quechua‧Latin‧Peru-->
 		<likelySubtag from="quy" to="quy_Latn_PE" origin="sil1"/>		<!--Ayacucho Quechua‧?‧?	➡ Ayacucho Quechua‧Latin‧Peru-->
@@ -6170,6 +6217,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="siz" to="siz_Arab_EG" origin="sil1"/>		<!--Siwi‧?‧?	➡ Siwi‧Arabic‧Egypt-->
 		<likelySubtag from="sja" to="sja_Latn_CO" origin="sil1"/>		<!--Epena‧?‧?	➡ Epena‧Latin‧Colombia-->
 		<likelySubtag from="sjb" to="sjb_Latn_ID" origin="sil1"/>		<!--Sajau Basap‧?‧?	➡ Sajau Basap‧Latin‧Indonesia-->
+		<likelySubtag from="sjc" to="sjc_Hans_CN" origin="sil1"/>		<!--Shaojiang Chinese‧?‧?	➡ Shaojiang Chinese‧Simplified‧China-->
 		<likelySubtag from="sjd" to="sjd_Cyrl_RU" origin="sil1"/>		<!--Kildin Sami‧?‧?	➡ Kildin Sami‧Cyrillic‧Russia-->
 		<likelySubtag from="sje" to="sje_Latn_SE" origin="sil1"/>		<!--Pite Sami‧?‧?	➡ Pite Sami‧Latin‧Sweden-->
 		<likelySubtag from="sjg" to="sjg_Latn_TD" origin="sil1"/>		<!--Assangori‧?‧?	➡ Assangori‧Latin‧Chad-->
@@ -6288,7 +6336,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="spv" to="spv_Orya_IN" origin="sil1"/>		<!--Sambalpuri‧?‧?	➡ Sambalpuri‧Odia‧India-->
 		<likelySubtag from="sqa" to="sqa_Latn_NG" origin="sil1"/>		<!--Shama-Sambuga‧?‧?	➡ Shama-Sambuga‧Latin‧Nigeria-->
 		<likelySubtag from="sqh" to="sqh_Latn_NG" origin="sil1"/>		<!--Shau‧?‧?	➡ Shau‧Latin‧Nigeria-->
-		<likelySubtag from="sqm" to="sqm_Latn_CF" origin="sil1"/>		<!--Suma‧?‧?	➡ Suma‧Latin‧Central African Republic-->
 		<likelySubtag from="sqo" to="sqo_Arab_IR" origin="sil1"/>		<!--Sorkhei‧?‧?	➡ Sorkhei‧Arabic‧Iran-->
 		<likelySubtag from="sqq" to="sqq_Laoo_LA" origin="sil1"/>		<!--Sou‧?‧?	➡ Sou‧Lao‧Laos-->
 		<likelySubtag from="sqt" to="sqt_Arab_YE" origin="sil1"/>		<!--Soqotri‧?‧?	➡ Soqotri‧Arabic‧Yemen-->
@@ -6465,7 +6512,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tci" to="tci_Latn_PG" origin="sil1"/>		<!--Wára‧?‧?	➡ Wára‧Latin‧Papua New Guinea-->
 		<likelySubtag from="tck" to="tck_Latn_GA" origin="sil1"/>		<!--Tchitchege‧?‧?	➡ Tchitchege‧Latin‧Gabon-->
 		<likelySubtag from="tcm" to="tcm_Latn_ID" origin="sil1"/>		<!--Tanahmerah‧?‧?	➡ Tanahmerah‧Latin‧Indonesia-->
-		<likelySubtag from="tcn" to="tcn_Tibt_NP" origin="sil1"/>		<!--Tichurong‧?‧?	➡ Tichurong‧Tibetan‧Nepal-->
+		<likelySubtag from="tcn" to="tcn_Deva_NP" origin="sil1"/>		<!--Tichurong‧?‧?	➡ Tichurong‧Devanagari‧Nepal-->
 		<likelySubtag from="tco" to="tco_Mymr_MM" origin="sil1"/>		<!--Taungyo‧?‧?	➡ Taungyo‧Myanmar‧Myanmar (Burma)-->
 		<likelySubtag from="tcp" to="tcp_Latn_MM" origin="sil1"/>		<!--Tawr Chin‧?‧?	➡ Tawr Chin‧Latin‧Myanmar (Burma)-->
 		<likelySubtag from="tcq" to="tcq_Latn_ID" origin="sil1"/>		<!--Kaiy‧?‧?	➡ Kaiy‧Latin‧Indonesia-->
@@ -6738,7 +6785,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tsx" to="tsx_Latn_PG" origin="sil1"/>		<!--Mubami‧?‧?	➡ Mubami‧Latin‧Papua New Guinea-->
 		<likelySubtag from="tsz" to="tsz_Latn_MX" origin="sil1"/>		<!--Purepecha‧?‧?	➡ Purepecha‧Latin‧Mexico-->
 		<likelySubtag from="ttb" to="ttb_Latn_NG" origin="sil1"/>		<!--Gaa‧?‧?	➡ Gaa‧Latin‧Nigeria-->
-		<likelySubtag from="ttc" to="ttc_Latn_GT" origin="sil1"/>		<!--Tektiteko‧?‧?	➡ Tektiteko‧Latin‧Guatemala-->
 		<likelySubtag from="ttd" to="ttd_Latn_PG" origin="sil1"/>		<!--Tauade‧?‧?	➡ Tauade‧Latin‧Papua New Guinea-->
 		<likelySubtag from="tte" to="tte_Latn_PG" origin="sil1"/>		<!--Bwanabwana‧?‧?	➡ Bwanabwana‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ttf" to="ttf_Latn_CM" origin="sil1"/>		<!--Tuotomb‧?‧?	➡ Tuotomb‧Latin‧Cameroon-->
@@ -6797,7 +6843,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="twg" to="twg_Latn_ID" origin="sil1"/>		<!--Tereweng‧?‧?	➡ Tereweng‧Latin‧Indonesia-->
 		<likelySubtag from="twh" to="twh_Latn_VN" origin="sil1"/>		<!--Tai Dón‧?‧?	➡ Tai Dón‧Latin‧Vietnam-->
 		<likelySubtag from="twl" to="twl_Latn_MZ" origin="sil1"/>		<!--Tawara‧?‧?	➡ Tawara‧Latin‧Mozambique-->
-		<likelySubtag from="twm" to="twm_Deva_IN" origin="sil1"/>		<!--Tawang Monpa‧?‧?	➡ Tawang Monpa‧Devanagari‧India-->
+		<likelySubtag from="twm" to="twm_Tibt_IN" origin="sil1"/>		<!--Tawang Monpa‧?‧?	➡ Tawang Monpa‧Tibetan‧India-->
 		<likelySubtag from="twn" to="twn_Latn_CM" origin="sil1"/>		<!--Twendi‧?‧?	➡ Twendi‧Latin‧Cameroon-->
 		<likelySubtag from="two" to="two_Latn_BW" origin="sil1"/>		<!--Tswapong‧?‧?	➡ Tswapong‧Latin‧Botswana-->
 		<likelySubtag from="twp" to="twp_Latn_PG" origin="sil1"/>		<!--Ere‧?‧?	➡ Ere‧Latin‧Papua New Guinea-->
@@ -6823,7 +6869,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tye" to="tye_Latn_NG" origin="sil1"/>		<!--Kyanga‧?‧?	➡ Kyanga‧Latin‧Nigeria-->
 		<likelySubtag from="tyh" to="tyh_Latn_VN" origin="sil1"/>		<!--O'du‧?‧?	➡ O'du‧Latin‧Vietnam-->
 		<likelySubtag from="tyi" to="tyi_Latn_CG" origin="sil1"/>		<!--Teke-Tsaayi‧?‧?	➡ Teke-Tsaayi‧Latin‧Congo - Brazzaville-->
-		<likelySubtag from="tyj" to="tyj_Latn_VN" origin="sil1"/>		<!--Tai Do‧?‧?	➡ Tai Do‧Latin‧Vietnam-->
 		<likelySubtag from="tyl" to="tyl_Latn_VN" origin="sil1"/>		<!--Thu Lao‧?‧?	➡ Thu Lao‧Latin‧Vietnam-->
 		<likelySubtag from="tyn" to="tyn_Latn_ID" origin="sil1"/>		<!--Kombai‧?‧?	➡ Kombai‧Latin‧Indonesia-->
 		<likelySubtag from="typ" to="typ_Latn_AU" origin="sil1"/>		<!--Thaypan‧?‧?	➡ Thaypan‧Latin‧Australia-->
@@ -6835,7 +6880,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tyy" to="tyy_Latn_NG" origin="sil1"/>		<!--Tiyaa‧?‧?	➡ Tiyaa‧Latin‧Nigeria-->
 		<likelySubtag from="tyz" to="tyz_Latn_VN" origin="sil1"/>		<!--Tày‧?‧?	➡ Tày‧Latin‧Vietnam-->
 		<likelySubtag from="tzh" to="tzh_Latn_MX" origin="sil1"/>		<!--Tzeltal‧?‧?	➡ Tzeltal‧Latin‧Mexico-->
-		<likelySubtag from="tzj" to="tzj_Latn_GT" origin="sil1"/>		<!--Tz'utujil‧?‧?	➡ Tz'utujil‧Latin‧Guatemala-->
 		<likelySubtag from="tzl" to="tzl_Latn_001" origin="sil1"/>		<!--Talossan‧?‧?	➡ Talossan‧Latin‧world-->
 		<likelySubtag from="tzn" to="tzn_Latn_ID" origin="sil1"/>		<!--Tugun‧?‧?	➡ Tugun‧Latin‧Indonesia-->
 		<likelySubtag from="tzo" to="tzo_Latn_MX" origin="sil1"/>		<!--Tzotzil‧?‧?	➡ Tzotzil‧Latin‧Mexico-->
@@ -6935,7 +6979,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ush" to="ush_Arab_PK" origin="sil1"/>		<!--Ushojo‧?‧?	➡ Ushojo‧Arabic‧Pakistan-->
 		<likelySubtag from="usi" to="usi_Latn_BD" origin="sil1"/>		<!--Usui‧?‧?	➡ Usui‧Latin‧Bangladesh-->
 		<likelySubtag from="usk" to="usk_Latn_CM" origin="sil1"/>		<!--Usaghade‧?‧?	➡ Usaghade‧Latin‧Cameroon-->
-		<likelySubtag from="usp" to="usp_Latn_GT" origin="sil1"/>		<!--Uspanteco‧?‧?	➡ Uspanteco‧Latin‧Guatemala-->
 		<likelySubtag from="uss" to="uss_Latn_NG" origin="sil1"/>		<!--us-Saare‧?‧?	➡ us-Saare‧Latin‧Nigeria-->
 		<likelySubtag from="usu" to="usu_Latn_PG" origin="sil1"/>		<!--Uya‧?‧?	➡ Uya‧Latin‧Papua New Guinea-->
 		<likelySubtag from="uta" to="uta_Latn_NG" origin="sil1"/>		<!--Otank‧?‧?	➡ Otank‧Latin‧Nigeria-->
@@ -7274,7 +7317,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="xhm" to="xhm_Khmr_KH" origin="sil1"/>		<!--Middle Khmer (1400 to 1850 CE)‧?‧?	➡ Middle Khmer (1400 to 1850 CE)‧Khmer‧Cambodia-->
 		<likelySubtag from="xhv" to="xhv_Latn_VN" origin="sil1"/>		<!--Khua‧?‧?	➡ Khua‧Latin‧Vietnam-->
 		<likelySubtag from="xii" to="xii_Latn_ZA" origin="sil1"/>		<!--Xiri‧?‧?	➡ Xiri‧Latin‧South Africa-->
-		<likelySubtag from="xin" to="xin_Latn_GT" origin="sil1"/>		<!--Xinca‧?‧?	➡ Xinca‧Latin‧Guatemala-->
 		<likelySubtag from="xir" to="xir_Latn_BR" origin="sil1"/>		<!--Xiriâna‧?‧?	➡ Xiriâna‧Latin‧Brazil-->
 		<likelySubtag from="xis" to="xis_Orya_IN" origin="sil1"/>		<!--Kisan‧?‧?	➡ Kisan‧Odia‧India-->
 		<likelySubtag from="xiy" to="xiy_Latn_BR" origin="sil1"/>		<!--Xipaya‧?‧?	➡ Xipaya‧Latin‧Brazil-->
@@ -7539,6 +7581,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ymo" to="ymo_Latn_PG" origin="sil1"/>		<!--Yangum Mon‧?‧?	➡ Yangum Mon‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ymp" to="ymp_Latn_PG" origin="sil1"/>		<!--Yamap‧?‧?	➡ Yamap‧Latin‧Papua New Guinea-->
 		<likelySubtag from="yna" to="yna_Plrd_CN" origin="sil1"/>		<!--Aluo‧?‧?	➡ Aluo‧Pollard Phonetic‧China-->
+		<likelySubtag from="ynb" to="ynb_Latn_PG" origin="sil1"/>		<!--Yamben‧?‧?	➡ Yamben‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ynd" to="ynd_Latn_AU" origin="sil1"/>		<!--Yandruwandha‧?‧?	➡ Yandruwandha‧Latin‧Australia-->
 		<likelySubtag from="yng" to="yng_Latn_CD" origin="sil1"/>		<!--Yango‧?‧?	➡ Yango‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="ynk" to="ynk_Cyrl_RU" origin="sil1"/>		<!--Naukan Yupik‧?‧?	➡ Naukan Yupik‧Cyrillic‧Russia-->
@@ -7681,7 +7724,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="zmm" to="zmm_Latn_AU" origin="sil1"/>		<!--Marimanindji‧?‧?	➡ Marimanindji‧Latin‧Australia-->
 		<likelySubtag from="zmn" to="zmn_Latn_GA" origin="sil1"/>		<!--Mbangwe‧?‧?	➡ Mbangwe‧Latin‧Gabon-->
 		<likelySubtag from="zmo" to="zmo_Latn_SD" origin="sil1"/>		<!--Molo‧?‧?	➡ Molo‧Latin‧Sudan-->
-		<likelySubtag from="zmp" to="zmp_Latn_CD" origin="sil1"/>		<!--Mpuono‧?‧?	➡ Mpuono‧Latin‧Congo - Kinshasa-->
+		<likelySubtag from="zmp" to="zmp_Latn_CD" origin="sil1"/>		<!--Mbuun‧?‧?	➡ Mbuun‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="zmq" to="zmq_Latn_CD" origin="sil1"/>		<!--Mituku‧?‧?	➡ Mituku‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="zmr" to="zmr_Latn_AU" origin="sil1"/>		<!--Maranunggu‧?‧?	➡ Maranunggu‧Latin‧Australia-->
 		<likelySubtag from="zms" to="zms_Latn_CD" origin="sil1"/>		<!--Mbesa‧?‧?	➡ Mbesa‧Latin‧Congo - Kinshasa-->
diff --git a/make/data/cldr/common/supplemental/metaZones.xml b/make/data/cldr/common/supplemental/metaZones.xml
index 9a610defca1..710934fef81 100644
--- a/make/data/cldr/common/supplemental/metaZones.xml
+++ b/make/data/cldr/common/supplemental/metaZones.xml
@@ -146,8 +146,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone mzone="Africa_Eastern"/>
 			</timezone>
 			<timezone type="Africa/Monrovia">
-				<usesMetazone mzone="Liberia" to="1972-05-01 00:45"/>
-				<usesMetazone mzone="GMT" from="1972-05-01 00:45"/>
+				<usesMetazone mzone="Liberia" to="1972-01-07 00:45"/>
+				<!-- actual transition at 00:44:30, but ICU4C cannot parse that -->
+				<usesMetazone mzone="GMT" from="1972-01-07 00:45"/>
 			</timezone>
 			<timezone type="Africa/Nairobi">
 				<usesMetazone mzone="Africa_Eastern"/>
@@ -187,7 +188,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="Africa/Windhoek">
 				<usesMetazone to="1990-03-20 22:00" mzone="Africa_Southern"/>
 				<usesMetazone to="1994-03-20 22:00" from="1990-03-20 22:00" mzone="Africa_Central"/>
-				<usesMetazone to="2017-10-23 22:00" from="1994-03-20 22:00" mzone="Africa_Western"/>
+				<usesMetazone to="2017-10-23 22:00" from="1994-03-20 22:00" mzone="Africa_Western" stdOffset="+01" dstOffset="+02"/>
 				<usesMetazone from="2017-10-23 22:00" mzone="Africa_Central"/>
 			</timezone>
 			<timezone type="America/Adak">
@@ -645,6 +646,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/Punta_Arenas">
 				<usesMetazone to="2016-12-03 23:00" mzone="Chile"/>
 			</timezone>
+			<timezone type="America/Coyhaique">
+				<usesMetazone to="2025-03-20 03:00" mzone="Chile"/>
+			</timezone>
 			<timezone type="America/Rankin_Inlet">
 				<usesMetazone to="2000-10-29 07:00" mzone="America_Central"/>
 				<usesMetazone to="2001-04-01 08:00" from="2000-10-29 07:00" mzone="America_Eastern"/>
@@ -779,7 +783,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Antarctica/Palmer">
 				<usesMetazone to="1982-05-01 03:00" mzone="Argentina"/>
-				<usesMetazone to="2016-12-03 23:00" from="1982-05-01 03:00" mzone="Chile"/>
+				<usesMetazone to="2016-12-04 03:00" from="1982-05-01 03:00" mzone="Chile"/>
 			</timezone>
 			<timezone type="Antarctica/Rothera">
 				<usesMetazone mzone="Rothera"/>
@@ -809,8 +813,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Asia/Anadyr">
 				<usesMetazone to="2010-03-27 14:00" mzone="Anadyr"/>
-				<usesMetazone from="2010-03-27 14:00" to="2014-10-25 14:00" mzone="Magadan"/>
-				<usesMetazone from="2014-10-25 14:00" mzone="Anadyr"/>
+				<usesMetazone from="2010-03-27 14:00" to="2011-03-26 15:00" mzone="Magadan"/>
+				<usesMetazone from="2011-03-26 15:00" mzone="Kamchatka" />
 			</timezone>
 			<timezone type="Asia/Aqtau">
 				<usesMetazone to="1991-12-15 19:00" mzone="Shevchenko"/>
@@ -825,8 +829,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="2024-02-29 18:00" mzone="Kazakhstan"/>
 			</timezone>
 			<timezone type="Asia/Ashgabat">
-				<usesMetazone to="1991-10-26 20:00" mzone="Ashkhabad"/>
-				<usesMetazone from="1991-10-26 20:00" mzone="Turkmenistan"/>
+				<usesMetazone to="1992-01-18 22:00" mzone="Ashkhabad"/>
+				<usesMetazone from="1992-01-18 22:00" mzone="Turkmenistan"/>
 			</timezone>
 			<timezone type="Asia/Atyrau">
 				<usesMetazone to="2024-02-29 18:00" from="2004-10-30 22:00" mzone="Kazakhstan_Western"/>
@@ -840,22 +844,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1972-05-31 20:00" mzone="Arabian"/>
 			</timezone>
 			<timezone type="Asia/Baku">
-				<usesMetazone to="1991-08-29 20:00" mzone="Baku"/>
-				<usesMetazone from="1991-08-29 20:00" mzone="Azerbaijan"/>
+				<usesMetazone to="1991-03-30 22:00" mzone="Baku"/>
+				<usesMetazone from="1991-03-30 22:00" mzone="Azerbaijan"/>
 			</timezone>
 			<timezone type="Asia/Bangkok">
 				<usesMetazone mzone="Indochina"/>
 			</timezone>
-<!-- No mappings for now
 			<timezone type="Asia/Barnaul">
+				<usesMetazone from="2016-03-26 20:00" mzone="Krasnoyarsk"/>
 			</timezone>
--->
 			<timezone type="Asia/Beirut">
 				<usesMetazone mzone="Europe_Eastern"/>
 			</timezone>
 			<timezone type="Asia/Bishkek">
-				<usesMetazone to="1991-08-30 20:00" mzone="Frunze"/>
-				<usesMetazone from="1991-08-30 20:00" mzone="Kyrgystan"/>
+				<usesMetazone to="1991-03-30 20:00" mzone="Frunze"/>
+				<usesMetazone from="1991-03-30 20:00" mzone="Kyrgystan"/>
 			</timezone>
 			<timezone type="Asia/Brunei">
 				<usesMetazone mzone="Brunei"/>
@@ -865,7 +868,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Asia/Chita">
 				<usesMetazone to="2014-10-25 16:00" mzone="Yakutsk"/>
-				<usesMetazone to="2016-03-26 18:00" from="2014-10-25 16:00" mzone="Irkutsk"/>
+				<usesMetazone to="2016-03-26 18:00" from="2014-10-25 17:00" mzone="Irkutsk"/>
 				<usesMetazone from="2016-03-26 18:00" mzone="Yakutsk"/>
 			</timezone>
 			<timezone type="Asia/Colombo">
@@ -894,6 +897,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Asia/Famagusta">
 				<usesMetazone to="2016-09-07 21:00" mzone="Europe_Eastern"/>
+				<usesMetazone from="2017-10-29 01:00" mzone="Europe_Eastern"/>
 			</timezone>
 			<timezone type="Asia/Gaza">
 				<usesMetazone to="1995-12-31 22:00" mzone="Israel"/>
@@ -939,10 +943,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone to="2011-09-12 13:00" from="2003-12-31 15:00" mzone="Vladivostok"/>
 				<usesMetazone from="2011-09-12 13:00" mzone="Yakutsk"/>
 			</timezone>
-<!-- No mappings for now
-			<timezone type="Asia/Kirov">
+			<timezone type="Europe/Kirov">
+				<usesMetazone from="2014-10-25 22:00" mzone="Moscow" />
 			</timezone>
--->
 			<timezone type="Asia/Krasnoyarsk">
 				<usesMetazone mzone="Krasnoyarsk"/>
 			</timezone>
@@ -982,7 +985,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="2014-10-25 19:00" mzone="Krasnoyarsk"/>
 			</timezone>
 			<timezone type="Asia/Novosibirsk">
-				<usesMetazone mzone="Novosibirsk"/>
+				<usesMetazone to="2016-07-23 20:00" mzone="Novosibirsk"/>
+				<usesMetazone from="2016-07-23 20:00" mzone="Krasnoyarsk"/>
 			</timezone>
 			<timezone type="Asia/Omsk">
 				<usesMetazone mzone="Omsk"/>
@@ -1030,7 +1034,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1975-06-12 16:00" mzone="Indochina"/>
 			</timezone>
 			<timezone type="Asia/Sakhalin">
-				<usesMetazone mzone="Sakhalin"/>
+				<usesMetazone to="2014-10-25 15:00" mzone="Sakhalin"/>
+				<usesMetazone from="2014-10-25 15:00" to="2016-03-26 16:00" mzone="Magadan"/>
+				<usesMetazone from="2016-04-26 16:00" mzone="Magadan"/>
 			</timezone>
 			<timezone type="Asia/Samarkand">
 				<usesMetazone to="1981-09-30 18:00" mzone="Samarkand"/>
@@ -1049,17 +1055,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Asia/Srednekolymsk">
 				<usesMetazone to="2014-10-25 14:00" mzone="Magadan"/>
+				<usesMetazone from="2016-04-23 16:00" mzone="Magadan" />
 			</timezone>
 			<timezone type="Asia/Taipei">
 				<usesMetazone mzone="Taipei"/>
 			</timezone>
 			<timezone type="Asia/Tashkent">
-				<usesMetazone to="1991-08-31 18:00" mzone="Tashkent"/>
-				<usesMetazone from="1991-08-31 18:00" mzone="Uzbekistan"/>
+				<usesMetazone to="1991-03-30 20:00" mzone="Tashkent"/>
+				<usesMetazone from="1991-03-30 20:00" mzone="Uzbekistan"/>
 			</timezone>
 			<timezone type="Asia/Tbilisi">
-				<usesMetazone to="1991-04-08 20:00" mzone="Tbilisi"/>
-				<usesMetazone from="1991-04-08 20:00" mzone="Georgia"/>
+				<usesMetazone to="1991-03-30 22:00" mzone="Tbilisi"/>
+				<usesMetazone from="1991-03-30 22:00" mzone="Georgia"/>
 			</timezone>
 			<timezone type="Asia/Tehran">
 				<usesMetazone mzone="Iran"/>
@@ -1071,10 +1078,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="Asia/Tokyo">
 				<usesMetazone mzone="Japan"/>
 			</timezone>
-<!-- No mappings for now
 			<timezone type="Asia/Tomsk">
+				<usesMetazone from="2016-05-28 20:00" mzone="Krasnoyarsk"/>
 			</timezone>
--->
 			<timezone type="Asia/Ulaanbaatar">
 				<usesMetazone mzone="Mongolia"/>
 			</timezone>
@@ -1100,8 +1106,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1992-01-18 22:00" mzone="Yekaterinburg"/>
 			</timezone>
 			<timezone type="Asia/Yerevan">
-				<usesMetazone to="1991-09-22 20:00" mzone="Yerevan"/>
-				<usesMetazone from="1991-09-22 20:00" mzone="Armenia"/>
+				<usesMetazone to="1991-03-30 22:00" mzone="Yerevan"/>
+				<usesMetazone from="1991-03-30 22:00" mzone="Armenia"/>
 			</timezone>
 			<timezone type="Atlantic/Azores">
 				<usesMetazone to="1992-12-27 02:00" mzone="Azores"/>
@@ -1180,6 +1186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Europe/Astrakhan">
 				<usesMetazone to="2016-03-26 23:00" from="1992-03-28 22:00" mzone="Moscow"/>
+				<usesMetazone from="2016-03-26 23:00" mzone="Samara"/>
 			</timezone>
 			<timezone type="Europe/Athens">
 				<usesMetazone mzone="Europe_Eastern"/>
@@ -1206,15 +1213,15 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone mzone="Europe_Central"/>
 			</timezone>
 			<timezone type="Europe/Chisinau">
-				<usesMetazone to="1990-05-05 21:00" mzone="Moscow"/>
-				<usesMetazone from="1990-05-05 21:00" mzone="Europe_Eastern"/>
+				<usesMetazone to="1990-05-05 22:00" mzone="Moscow"/>
+				<usesMetazone from="1990-05-05 22:00" mzone="Europe_Eastern"/>
 			</timezone>
 			<timezone type="Europe/Copenhagen">
 				<usesMetazone mzone="Europe_Central"/>
 			</timezone>
 			<timezone type="Europe/Dublin">
-				<usesMetazone mzone="Irish" to="1971-10-31 02:00"/>
-				<usesMetazone mzone="GMT" from="1971-10-31 02:00"/>
+				<usesMetazone mzone="Irish" to="1971-10-31 02:00" stdOffset="+00" dstOffset="+01"/>
+				<usesMetazone mzone="GMT" from="1971-10-31 02:00" stdOffset="+00" dstOffset="+01"/>
 			</timezone>
 			<timezone type="Europe/Gibraltar">
 				<usesMetazone mzone="Europe_Central"/>
@@ -1232,8 +1239,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Europe/Istanbul">
 				<usesMetazone to="1978-06-28 21:00" mzone="Europe_Eastern"/>
-				<usesMetazone to="1985-04-19 21:00" from="1978-06-28 21:00" mzone="Turkey"/>
-				<usesMetazone to="2016-09-06 21:00" from="1985-04-19 21:00" mzone="Europe_Eastern"/>
+				<usesMetazone to="1984-10-31 23:00" from="1978-06-28 21:00" mzone="Turkey"/>
+				<usesMetazone to="2016-09-06 21:00" from="1984-10-31 23:00" mzone="Europe_Eastern"/>
 				<usesMetazone from="2016-09-06 21:00" mzone="Turkey"/>
 			</timezone>
 			<timezone type="Europe/Jersey">
@@ -1322,6 +1329,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Europe/Saratov">
 				<usesMetazone to="2016-12-03 23:00" from="1992-03-28 22:00" mzone="Moscow"/>
+				<usesMetazone from="2016-12-03 23:00" mzone="Samara"/>
 			</timezone>
 			<timezone type="Europe/Simferopol">
 				<usesMetazone to="1990-06-30 23:00" mzone="Moscow"/>
@@ -1348,6 +1356,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Europe/Ulyanovsk">
 				<usesMetazone to="2016-03-26 23:00" from="1992-01-19 00:00" mzone="Moscow"/>
+				<usesMetazone from="2016-03-26 23:00" mzone="Samara"/>
 			</timezone>
 			<timezone type="Europe/Vaduz">
 				<usesMetazone mzone="Europe_Central"/>
@@ -1365,7 +1374,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1999-10-31 01:00" mzone="Europe_Eastern"/>
 			</timezone>
 			<timezone type="Europe/Volgograd">
-				<usesMetazone mzone="Volgograd"/>
+				<usesMetazone to="2020-12-26 22:00" mzone="Volgograd"/>
+				<usesMetazone from="2020-12-26 22:00" mzone="Moscow" />
 			</timezone>
 			<timezone type="Europe/Warsaw">
 				<usesMetazone mzone="Europe_Central"/>
@@ -1454,8 +1464,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="2000-12-22 14:00" mzone="Chamorro"/>
 			</timezone>
 			<timezone type="Pacific/Honolulu">
-				<usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/>
-				<usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/>
+				<usesMetazone mzone="Hawaii"/>
 			</timezone>
 			<timezone type="Pacific/Kiritimati">
 				<usesMetazone mzone="Line_Islands"/>
@@ -1743,7 +1752,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Gulf" territory="001" type="Asia/Dubai"/>
 			<mapZone other="Gulf" territory="OM" type="Asia/Muscat"/>
 			<mapZone other="Guyana" territory="001" type="America/Guyana"/>
-			<mapZone other="Hawaii_Aleutian" territory="001" type="Pacific/Honolulu"/>
+			<mapZone other="Hawaii_Aleutian" territory="001" type="America/Adak"/>
+			<mapZone other="Hawaii" territory="001" type="Pacific/Honolulu"/>
 			<mapZone other="Hong_Kong" territory="001" type="Asia/Hong_Kong"/>
 			<mapZone other="Hovd" territory="001" type="Asia/Hovd"/>
 			<mapZone other="India" territory="001" type="Asia/Calcutta"/>
@@ -1926,6 +1936,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazoneId shortId="gulf" longId="Gulf" />
 			<metazoneId shortId="guya" longId="Guyana" />
 			<metazoneId shortId="haal" longId="Hawaii_Aleutian" />
+			<metazoneId shortId="hwai" longId="Hawaii" />
 			<metazoneId shortId="hoko" longId="Hong_Kong" />
 			<metazoneId shortId="hovd" longId="Hovd" />
 			<metazoneId shortId="indi" longId="India" />
diff --git a/make/data/cldr/common/supplemental/numberingSystems.xml b/make/data/cldr/common/supplemental/numberingSystems.xml
index 13b3ad5b7eb..e0bdfe12b5c 100644
--- a/make/data/cldr/common/supplemental/numberingSystems.xml
+++ b/make/data/cldr/common/supplemental/numberingSystems.xml
@@ -101,6 +101,7 @@ For terms of use, see http://www.unicode.org/copyright.html
         <numberingSystem id="thai" type="numeric" digits="๐๑๒๓๔๕๖๗๘๙"/>
         <numberingSystem id="tibt" type="numeric" digits="༠༡༢༣༤༥༦༧༨༩"/>
         <numberingSystem id="tirh" type="numeric" digits="&#x114D0;&#x114D1;&#x114D2;&#x114D3;&#x114D4;&#x114D5;&#x114D6;&#x114D7;&#x114D8;&#x114D9;"/>
+        <numberingSystem id="tols" type="numeric" digits="&#x11DE0;&#x11DE1;&#x11DE2;&#x11DE3;&#x11DE4;&#x11DE5;&#x11DE6;&#x11DE7;&#x11DE8;&#x11DE9;"/>
         <numberingSystem id="vaii" type="numeric" digits="꘠꘡꘢꘣꘤꘥꘦꘧꘨꘩"/>
         <numberingSystem id="wara" type="numeric" digits="&#x118E0;&#x118E1;&#x118E2;&#x118E3;&#x118E4;&#x118E5;&#x118E6;&#x118E7;&#x118E8;&#x118E9;"/>
         <numberingSystem id="wcho" type="numeric" digits="&#x1E2F0;&#x1E2F1;&#x1E2F2;&#x1E2F3;&#x1E2F4;&#x1E2F5;&#x1E2F6;&#x1E2F7;&#x1E2F8;&#x1E2F9;"/>
diff --git a/make/data/cldr/common/supplemental/ordinals.xml b/make/data/cldr/common/supplemental/ordinals.xml
index a6636b8df25..c8ea54b9386 100644
--- a/make/data/cldr/common/supplemental/ordinals.xml
+++ b/make/data/cldr/common/supplemental/ordinals.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -13,7 +13,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
         <!-- 1: other -->
 
-        <pluralRules locales="af am an ar ast bg bs ce cs da de dsb el es et eu fa fi fy gl gsw he hr hsb ia id in is iw ja km kn ko ky lt lv ml mn my nb nl no pa pl prg ps pt root ru sd sh si sk sl sr sw ta te th tpi tr ur uz yue zh zu">
+        <pluralRules locales="af am an ar ast bg bs ce cs cv da de dsb el es et eu fa fi fy gl gsw he hr hsb ia id ie in is iw ja km kn ko ky lt lv ml mn my nb nl no pa pl prg ps pt root ru sd sh si sk sl sr sw ta te th tpi tr ur uz yue zh zu">
             <pluralRule count="other"> @integer 0~15, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
         </pluralRules>
 
@@ -57,11 +57,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
             <pluralRule count="many">n % 10 = 6 or n % 10 = 9 or n % 10 = 0 and n != 0 @integer 6, 9, 10, 16, 19, 20, 26, 29, 30, 36, 39, 40, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
             <pluralRule count="other"> @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="it lld sc scn vec">
+        <pluralRules locales="it lld sc vec">
             <pluralRule count="many">n = 11,8,80,800 @integer 8, 11, 80, 800</pluralRule>
             <pluralRule count="other"> @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="lij">
+        <pluralRules locales="lij scn">
             <pluralRule count="many">n = 11,8,80..89,800..899 @integer 8, 11, 80~89, 800~803</pluralRule>
             <pluralRule count="other"> @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
         </pluralRules>
@@ -101,7 +101,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
             <pluralRule count="few">n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83, 103, 1003, …</pluralRule>
             <pluralRule count="other"> @integer 0, 4~18, 100, 1000, 10000, 100000, 1000000, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="mr">
+        <pluralRules locales="kok kok_Latn mr">
             <pluralRule count="one">n = 1 @integer 1</pluralRule>
             <pluralRule count="two">n = 2,3 @integer 2, 3</pluralRule>
             <pluralRule count="few">n = 4 @integer 4</pluralRule>
diff --git a/make/data/cldr/common/supplemental/plurals.xml b/make/data/cldr/common/supplemental/plurals.xml
index 9b1100a2832..26cca25551f 100644
--- a/make/data/cldr/common/supplemental/plurals.xml
+++ b/make/data/cldr/common/supplemental/plurals.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -19,7 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
         <!-- 2: one,other -->
 
-        <pluralRules locales="am as bn doi fa gu hi kn pcm zu">
+        <pluralRules locales="am as bn doi fa gu hi kn kok kok_Latn pcm zu">
             <pluralRule count="one">i = 0 or n = 1 @integer 0, 1 @decimal 0.0~1.0, 0.00~0.04</pluralRule>
             <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 1.1~2.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
@@ -27,7 +27,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
             <pluralRule count="one">i = 0,1 @integer 0, 1 @decimal 0.0~1.5</pluralRule>
             <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="ast de en et fi fy gl ia io ji lij nl sc sv sw ur yi">
+        <pluralRules locales="ast de en et fi fy gl ia ie io ji lij nl sc sv sw ur yi">
             <pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
             <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
@@ -76,12 +76,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
             <pluralRule count="one">i = 0,1 and n != 0 @integer 1 @decimal 0.1~1.6</pluralRule>
             <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
         </pluralRules>
-        <pluralRules locales="blo">
-            <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000</pluralRule>
-            <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000</pluralRule>
-            <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
-        </pluralRules>
-        <pluralRules locales="ksh">
+        <pluralRules locales="blo cv ksh">
             <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000</pluralRule>
             <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000</pluralRule>
             <pluralRule count="other"> @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
@@ -197,6 +192,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
         <!-- 5: one,two,few,many,other -->
 
+        <pluralRules locales="sgs">
+            <pluralRule count="one">n % 10 = 1 and n % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0, 41.0, 51.0, 61.0, 71.0, 81.0, 101.0, 1001.0, …</pluralRule>
+            <pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000</pluralRule>
+            <pluralRule count="few">n != 2 and n % 10 = 2..9 and n % 100 != 11..19 @integer 3~9, 22~29, 32, 102, 1002, … @decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 22.0, 102.0, 1002.0, …</pluralRule>
+            <pluralRule count="many">f != 0   @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.1, 1000.1, …</pluralRule>
+            <pluralRule count="other"> @integer 0, 10~20, 30, 40, 50, 60, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+        </pluralRules>
         <pluralRules locales="br">
             <pluralRule count="one">n % 10 = 1 and n % 100 != 11,71,91 @integer 1, 21, 31, 41, 51, 61, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0, 41.0, 51.0, 61.0, 81.0, 101.0, 1001.0, …</pluralRule>
             <pluralRule count="two">n % 10 = 2 and n % 100 != 12,72,92 @integer 2, 22, 32, 42, 52, 62, 82, 102, 1002, … @decimal 2.0, 22.0, 32.0, 42.0, 52.0, 62.0, 82.0, 102.0, 1002.0, …</pluralRule>
diff --git a/make/data/cldr/common/supplemental/rgScope.xml b/make/data/cldr/common/supplemental/rgScope.xml
index d7731d7949e..06469310947 100644
--- a/make/data/cldr/common/supplemental/rgScope.xml
+++ b/make/data/cldr/common/supplemental/rgScope.xml
@@ -8,21 +8,21 @@ For terms of use, see http://www.unicode.org/copyright.html
 <supplementalData>
     <version number='$Revision$'/>
 	<rgScope>
-		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*'][@cashDigits='*'][@cashRounding='*']" draft="provisional" />
-		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*'][@cashRounding='*']" draft="provisional" />
-		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*']" draft="provisional" />
-		<rgPath path="//supplementalData/calendarPreferenceData/calendarPreference[@territories='#'][@ordering='*']" draft="provisional" />
-		<rgPath path="//supplementalData/weekData/firstDay[@day='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/weekData/minDays[@count='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/weekData/weekendStart[@day='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/weekData/weekendEnd[@day='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/timeData/hours[@allowed='*'][@preferred='*'][@regions='#']" draft="provisional" />
-		<rgPath path="//supplementalData/measurementData/measurementSystem[@type='*'][@category='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/measurementData/measurementSystem[@type='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/measurementData/paperSize[@type='*'][@territories='#']" draft="provisional" />
-		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*'][@scope='*']/unitPreference[@regions='#'][@alt='*']" draft="provisional" />
-		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*'][@scope='*']/unitPreference[@regions='#']" draft="provisional" />
-		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*']/unitPreference[@regions='#'][@alt='*']" draft="provisional" />
-		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*']/unitPreference[@regions='#']" draft="provisional" />
+		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*'][@cashDigits='*'][@cashRounding='*']"/>
+		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*'][@cashRounding='*']"/>
+		<rgPath path="//supplementalData/currencyData/fractions/info[@iso4217='#'][@digits='*'][@rounding='*']"/>
+		<rgPath path="//supplementalData/calendarPreferenceData/calendarPreference[@territories='#'][@ordering='*']"/>
+		<rgPath path="//supplementalData/weekData/firstDay[@day='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/weekData/minDays[@count='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/weekData/weekendStart[@day='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/weekData/weekendEnd[@day='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/timeData/hours[@allowed='*'][@preferred='*'][@regions='#']"/>
+		<rgPath path="//supplementalData/measurementData/measurementSystem[@type='*'][@category='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/measurementData/measurementSystem[@type='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/measurementData/paperSize[@type='*'][@territories='#']"/>
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*'][@scope='*']/unitPreference[@regions='#'][@alt='*']"/>
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*'][@scope='*']/unitPreference[@regions='#']"/>
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*']/unitPreference[@regions='#'][@alt='*']"/>
+		<rgPath path="//supplementalData/unitPreferenceData/unitPreferences[@category='*'][@usage='*']/unitPreference[@regions='#']"/>
 	</rgScope>
 </supplementalData>
diff --git a/make/data/cldr/common/supplemental/subdivisions.xml b/make/data/cldr/common/supplemental/subdivisions.xml
index db8fbad9213..47b17e85213 100644
--- a/make/data/cldr/common/supplemental/subdivisions.xml
+++ b/make/data/cldr/common/supplemental/subdivisions.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE supplementalData SYSTEM '../../common/dtd/ldmlSupplemental.dtd'>
 <!--
-	Copyright © 1991-2024 Unicode, Inc.
+	Copyright © 1991-2025 Unicode, Inc.
 	For terms of use, see http://www.unicode.org/copyright.html
 	SPDX-License-Identifier: Unicode-3.0
 	CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/supplemental/supplementalData.xml b/make/data/cldr/common/supplemental/supplementalData.xml
index 1c9a5a0c62e..25684d36c6e 100644
--- a/make/data/cldr/common/supplemental/supplementalData.xml
+++ b/make/data/cldr/common/supplemental/supplementalData.xml
@@ -22,7 +22,7 @@ For terms of use, see https://www.unicode.org/copyright.html
             <info iso4217="CHF" digits="2" rounding="0" cashRounding="5"/>
             <info iso4217="CLF" digits="4" rounding="0"/>
             <info iso4217="CLP" digits="0" rounding="0"/>
-            <info iso4217="COP" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
+            <info iso4217="COP" digits="0" rounding="0"/>
             <info iso4217="CRC" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
             <info iso4217="CZK" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
             <info iso4217="DEFAULT" digits="2" rounding="0"/>
@@ -31,8 +31,8 @@ For terms of use, see https://www.unicode.org/copyright.html
             <info iso4217="ESP" digits="0" rounding="0"/>
             <info iso4217="GNF" digits="0" rounding="0"/>
             <info iso4217="GYD" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
-            <info iso4217="HUF" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
-            <info iso4217="IDR" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
+            <info iso4217="HUF" digits="0" rounding="0" cashRounding="5"/>
+            <info iso4217="IDR" digits="0" rounding="0"/>
             <info iso4217="IQD" digits="0" rounding="0"/>
             <info iso4217="IRR" digits="0" rounding="0"/>
             <info iso4217="ISK" digits="0" rounding="0"/>
@@ -55,7 +55,7 @@ For terms of use, see https://www.unicode.org/copyright.html
             <info iso4217="MUR" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
             <info iso4217="NOK" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
             <info iso4217="OMR" digits="3" rounding="0"/>
-            <info iso4217="PKR" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
+            <info iso4217="PKR" digits="0" rounding="0"/>
             <info iso4217="PYG" digits="0" rounding="0"/>
             <info iso4217="RSD" digits="0" rounding="0"/>
             <info iso4217="RWF" digits="0" rounding="0"/>
@@ -77,7 +77,9 @@ For terms of use, see https://www.unicode.org/copyright.html
             <info iso4217="VEF" digits="2" rounding="0" cashDigits="0" cashRounding="0"/>
             <info iso4217="VND" digits="0" rounding="0"/>
             <info iso4217="VUV" digits="0" rounding="0"/>
+			<info iso4217="XAD" digits="2" rounding="0"/>
             <info iso4217="XAF" digits="0" rounding="0"/>
+			<info iso4217="XAU" digits="2" rounding="0"/>
             <info iso4217="XOF" digits="0" rounding="0"/>
             <info iso4217="XPF" digits="0" rounding="0"/>
             <info iso4217="YER" digits="0" rounding="0"/>
@@ -220,7 +222,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="XOF" from="1984-08-04"/>
         </region>
         <region iso3166="BG">
-            <currency iso4217="BGN" from="1999-07-05"/>
+            <currency iso4217="EUR" from="2026-01-01" />
+            <currency iso4217="BGN" from="1999-07-05" to="2026-01-31"/>
             <currency iso4217="BGL" from="1962-01-01" to="1999-07-05"/>
             <currency iso4217="BGM" from="1952-05-12" to="1962-01-01"/>
             <currency iso4217="BGO" from="1879-07-08" to="1952-05-12"/>
@@ -354,7 +357,7 @@ The printed version of ISO-4217:2001
         </region>
         <region iso3166="CU">
             <currency iso4217="CUP" from="1859-01-01"/>
-            <currency iso4217="CUC" from="1994-01-01" to="2021-01-01"/>
+            <currency iso4217="CUC" from="1994-01-01" to="2021-06-01"/>
             <!-- currency iso4217="USD" from="1994"/ --><!-- Unofficially used -->
             <currency iso4217="USD" from="1899-01-01" to="1959-01-01"/>
         </region>
@@ -1188,6 +1191,7 @@ The printed version of ISO-4217:2001
             <currency iso4217="RHD" from="1970-02-17" to="1980-04-18"/>
         </region>
         <region iso3166="ZZ">
+            <currency iso4217="XAD" from="2025-05-12" tender="false"/>
             <currency iso4217="XAG" tender="false"/>
             <currency iso4217="XAU" tender="false"/>
             <currency iso4217="XBA" tender="false"/>
@@ -1277,38 +1281,28 @@ XXX Code for transations where no currency is involved
     <!-- Start of Generated Data: see https://cldr.unicode.org/development/updating-codes/update-languagescriptregion-subtags -->
 	<languageData>
 		<language type="aa" scripts="Latn"/>
-		<language type="aa" territories="DJ ET" alt="secondary"/>
 		<language type="ab" scripts="Cyrl"/>
-		<language type="ab" territories="GE" alt="secondary"/>
 		<language type="abq" scripts="Cyrl"/>
+		<language type="abq" scripts="Latn" alt="secondary"/>
 		<language type="abr" scripts="Latn"/>
-		<language type="abr" territories="GH" alt="secondary"/>
 		<language type="ace" scripts="Latn"/>
-		<language type="ace" territories="ID" alt="secondary"/>
 		<language type="ach" scripts="Latn"/>
-		<language type="ach" territories="UG" alt="secondary"/>
 		<language type="ada" scripts="Latn"/>
-		<language type="ada" territories="GH" alt="secondary"/>
 		<language type="ady" scripts="Cyrl"/>
-		<language type="ady" territories="RU" alt="secondary"/>
 		<language type="ae" scripts="Avst"/>
 		<language type="aeb" scripts="Arab"/>
-		<language type="aeb" territories="TN" alt="secondary"/>
 		<language type="af" scripts="Latn"/>
-		<language type="af" territories="NA ZA" alt="secondary"/>
 		<language type="agq" scripts="Latn"/>
 		<language type="aii" scripts="Cyrl"/>
 		<language type="aii" scripts="Syrc" alt="secondary"/>
 		<language type="ain" scripts="Kana Latn" alt="secondary"/>
 		<language type="ak" scripts="Latn"/>
-		<language type="ak" territories="GH" alt="secondary"/>
 		<language type="akk" scripts="Xsux"/>
 		<language type="akz" scripts="Latn"/>
 		<language type="ale" scripts="Latn"/>
 		<language type="aln" scripts="Latn"/>
-		<language type="aln" territories="XK" alt="secondary"/>
 		<language type="alt" scripts="Cyrl"/>
-		<language type="am" scripts="Ethi" territories="ET"/>
+		<language type="am" scripts="Ethi"/>
 		<language type="amo" scripts="Latn"/>
 		<language type="an" scripts="Latn"/>
 		<language type="ang" scripts="Latn"/>
@@ -1316,91 +1310,64 @@ XXX Code for transations where no currency is involved
 		<language type="anp" scripts="Deva"/>
 		<language type="aoz" scripts="Latn"/>
 		<language type="apc" scripts="Arab"/>
-		<language type="apc" territories="IL JO LB PS SY TR" alt="secondary"/>
 		<language type="apd" scripts="Arab"/>
-		<language type="apd" territories="SD" alt="secondary"/>
-		<language type="ar" scripts="Arab" territories="AE BH DJ DZ EG EH ER IL IQ JO KM KW LB LY MA MR OM PS QA SA SD SO SY TD TN YE"/>
-		<language type="ar" scripts="Syrc" territories="IR SS" alt="secondary"/>
+		<language type="ar" scripts="Arab"/>
+		<language type="ar" scripts="Syrc" alt="secondary"/>
 		<language type="arc" scripts="Armi Nbat Palm" alt="secondary"/>
 		<language type="arn" scripts="Latn"/>
 		<language type="aro" scripts="Latn"/>
 		<language type="arp" scripts="Latn"/>
 		<language type="arq" scripts="Arab"/>
-		<language type="arq" territories="DZ" alt="secondary"/>
 		<language type="ars" scripts="Arab"/>
-		<language type="ars" territories="SA" alt="secondary"/>
 		<language type="arw" scripts="Latn"/>
 		<language type="ary" scripts="Arab"/>
-		<language type="ary" territories="MA" alt="secondary"/>
 		<language type="arz" scripts="Arab"/>
-		<language type="arz" territories="EG" alt="secondary"/>
 		<language type="as" scripts="Beng"/>
-		<language type="as" territories="IN" alt="secondary"/>
 		<language type="asa" scripts="Latn"/>
 		<language type="ast" scripts="Latn"/>
-		<language type="ast" territories="ES" alt="secondary"/>
 		<language type="atj" scripts="Latn"/>
 		<language type="av" scripts="Cyrl"/>
-		<language type="av" territories="RU" alt="secondary"/>
 		<language type="avk" scripts="Latn"/>
 		<language type="awa" scripts="Deva"/>
-		<language type="awa" territories="IN" alt="secondary"/>
-		<language type="ay" scripts="Latn" territories="BO"/>
-		<language type="az" scripts="Latn Arab Cyrl" territories="AZ"/>
-		<language type="az" territories="IQ IR RU" alt="secondary"/>
+		<language type="ay" scripts="Latn"/>
+		<language type="az" scripts="Latn"/>
+		<language type="az" scripts="Arab Cyrl" alt="secondary"/>
 		<language type="ba" scripts="Cyrl"/>
-		<language type="ba" territories="RU" alt="secondary"/>
 		<language type="bal" scripts="Arab"/>
-		<language type="bal" scripts="Latn" territories="IR PK" alt="secondary"/>
+		<language type="bal" scripts="Latn" alt="secondary"/>
 		<language type="ban" scripts="Latn"/>
-		<language type="ban" scripts="Bali" territories="ID" alt="secondary"/>
+		<language type="ban" scripts="Bali" alt="secondary"/>
 		<language type="bap" scripts="Deva"/>
 		<language type="bar" scripts="Latn"/>
-		<language type="bar" territories="AT DE" alt="secondary"/>
 		<language type="bas" scripts="Latn"/>
 		<language type="bax" scripts="Bamu"/>
 		<language type="bbc" scripts="Latn"/>
-		<language type="bbc" scripts="Batk" territories="ID" alt="secondary"/>
+		<language type="bbc" scripts="Batk" alt="secondary"/>
 		<language type="bbj" scripts="Latn"/>
 		<language type="bci" scripts="Latn"/>
-		<language type="bci" territories="CI" alt="secondary"/>
-		<language type="be" scripts="Cyrl" territories="BY"/>
+		<language type="be" scripts="Cyrl"/>
 		<language type="bej" scripts="Arab"/>
-		<language type="bej" territories="SD" alt="secondary"/>
 		<language type="bem" scripts="Latn"/>
-		<language type="bem" territories="ZM" alt="secondary"/>
 		<language type="bew" scripts="Latn"/>
-		<language type="bew" territories="ID" alt="secondary"/>
 		<language type="bez" scripts="Latn"/>
-		<language type="bez" territories="TZ" alt="secondary"/>
 		<language type="bfd" scripts="Latn"/>
 		<language type="bfq" scripts="Taml"/>
 		<language type="bft" scripts="Arab"/>
 		<language type="bft" scripts="Tibt" alt="secondary"/>
 		<language type="bfy" scripts="Deva"/>
-		<language type="bg" scripts="Cyrl" territories="BG"/>
+		<language type="bg" scripts="Cyrl"/>
 		<language type="bgc" scripts="Deva"/>
-		<language type="bgc" territories="IN" alt="secondary"/>
 		<language type="bgn" scripts="Arab"/>
-		<language type="bgn" territories="PK" alt="secondary"/>
 		<language type="bgx" scripts="Grek"/>
 		<language type="bhb" scripts="Deva"/>
-		<language type="bhb" territories="IN" alt="secondary"/>
 		<language type="bhi" scripts="Deva"/>
-		<language type="bhi" territories="IN" alt="secondary"/>
 		<language type="bho" scripts="Deva"/>
-		<language type="bho" territories="IN NP" alt="secondary"/>
-		<language type="bi" scripts="Latn" territories="VU"/>
+		<language type="bi" scripts="Latn"/>
 		<language type="bik" scripts="Latn"/>
-		<language type="bik" territories="PH" alt="secondary"/>
 		<language type="bin" scripts="Latn"/>
-		<language type="bin" territories="NG" alt="secondary"/>
 		<language type="bjj" scripts="Deva"/>
-		<language type="bjj" territories="IN" alt="secondary"/>
 		<language type="bjn" scripts="Latn"/>
-		<language type="bjn" territories="ID" alt="secondary"/>
 		<language type="bjt" scripts="Latn"/>
-		<language type="bjt" territories="SN" alt="secondary"/>
 		<language type="bkm" scripts="Latn"/>
 		<language type="bku" scripts="Latn"/>
 		<language type="bku" scripts="Buhd" alt="secondary"/>
@@ -1408,42 +1375,35 @@ XXX Code for transations where no currency is involved
 		<language type="blo" scripts="Latn"/>
 		<language type="blt" scripts="Tavt"/>
 		<language type="bm" scripts="Latn Nkoo"/>
-		<language type="bm" territories="ML" alt="secondary"/>
 		<language type="bmq" scripts="Latn"/>
-		<language type="bn" scripts="Beng" territories="BD"/>
-		<language type="bn" territories="IN" alt="secondary"/>
+		<language type="bn" scripts="Beng"/>
 		<language type="bo" scripts="Tibt"/>
-		<language type="bo" territories="CN" alt="secondary"/>
 		<language type="bpy" scripts="Beng"/>
 		<language type="bqi" scripts="Arab"/>
-		<language type="bqi" territories="IR" alt="secondary"/>
 		<language type="bqv" scripts="Latn"/>
 		<language type="br" scripts="Latn"/>
 		<language type="bra" scripts="Deva"/>
 		<language type="brh" scripts="Arab"/>
-		<language type="brh" scripts="Latn" territories="PK" alt="secondary"/>
+		<language type="brh" scripts="Latn" alt="secondary"/>
 		<language type="brx" scripts="Deva"/>
-		<language type="brx" territories="IN" alt="secondary"/>
-		<language type="bs" scripts="Latn Cyrl" territories="BA"/>
+		<language type="bs" scripts="Latn Cyrl"/>
 		<language type="bsc" scripts="Latn"/>
-		<language type="bsc" territories="SN" alt="secondary"/>
+		<language type="bsq" scripts="Latn"/>
+		<language type="bsq" scripts="Bass" alt="secondary"/>
 		<language type="bss" scripts="Latn"/>
 		<language type="bto" scripts="Latn"/>
 		<language type="btv" scripts="Deva"/>
 		<language type="bua" scripts="Cyrl"/>
 		<language type="buc" scripts="Latn"/>
-		<language type="buc" territories="YT" alt="secondary"/>
 		<language type="bug" scripts="Latn"/>
-		<language type="bug" scripts="Bugi" territories="ID" alt="secondary"/>
+		<language type="bug" scripts="Bugi" alt="secondary"/>
 		<language type="bum" scripts="Latn"/>
-		<language type="bum" territories="CM" alt="secondary"/>
 		<language type="bvb" scripts="Latn"/>
 		<language type="byn" scripts="Ethi"/>
 		<language type="byv" scripts="Latn"/>
 		<language type="bze" scripts="Latn"/>
 		<language type="bzx" scripts="Latn"/>
-		<language type="ca" scripts="Latn" territories="AD"/>
-		<language type="ca" territories="ES" alt="secondary"/>
+		<language type="ca" scripts="Latn"/>
 		<language type="cad" scripts="Latn"/>
 		<language type="car" scripts="Latn"/>
 		<language type="cay" scripts="Latn"/>
@@ -1451,19 +1411,15 @@ XXX Code for transations where no currency is involved
 		<language type="ccp" scripts="Cakm Beng"/>
 		<language type="ccr" scripts="Latn"/>
 		<language type="ce" scripts="Cyrl"/>
-		<language type="ce" territories="RU" alt="secondary"/>
 		<language type="ceb" scripts="Latn"/>
-		<language type="ceb" territories="PH" alt="secondary"/>
 		<language type="cgg" scripts="Latn"/>
-		<language type="cgg" territories="UG" alt="secondary"/>
-		<language type="ch" scripts="Latn" territories="GU"/>
+		<language type="ch" scripts="Latn"/>
 		<language type="chk" scripts="Latn"/>
-		<language type="chk" territories="FM" alt="secondary"/>
 		<language type="chm" scripts="Cyrl"/>
 		<language type="chn" scripts="Latn"/>
 		<language type="cho" scripts="Latn"/>
 		<language type="chp" scripts="Latn"/>
-		<language type="chp" scripts="Cans" territories="CA" alt="secondary"/>
+		<language type="chp" scripts="Cans" alt="secondary"/>
 		<language type="chr" scripts="Cher"/>
 		<language type="chy" scripts="Latn"/>
 		<language type="cic" scripts="Latn"/>
@@ -1473,11 +1429,10 @@ XXX Code for transations where no currency is involved
 		<language type="cjm" scripts="Arab" alt="secondary"/>
 		<language type="cjs" scripts="Cyrl"/>
 		<language type="ckb" scripts="Arab"/>
-		<language type="ckb" territories="IQ IR" alt="secondary"/>
 		<language type="ckt" scripts="Cyrl"/>
 		<language type="clc" scripts="Latn"/>
 		<language type="co" scripts="Latn"/>
-		<language type="cop" scripts="Copt Arab Grek" territories="EG" alt="secondary"/>
+		<language type="cop" scripts="Copt Arab Grek" alt="secondary"/>
 		<language type="cps" scripts="Latn"/>
 		<language type="cr" scripts="Cans Latn"/>
 		<language type="crg" scripts="Latn"/>
@@ -1485,249 +1440,190 @@ XXX Code for transations where no currency is involved
 		<language type="crj" scripts="Cans"/>
 		<language type="crj" scripts="Latn" alt="secondary"/>
 		<language type="crk" scripts="Cans"/>
-		<language type="crk" territories="CA" alt="secondary"/>
 		<language type="crl" scripts="Cans"/>
 		<language type="crl" scripts="Latn" alt="secondary"/>
 		<language type="crm" scripts="Cans"/>
 		<language type="crs" scripts="Latn"/>
-		<language type="crs" territories="SC" alt="secondary"/>
-		<language type="cs" scripts="Latn" territories="CZ"/>
-		<language type="cs" territories="SK" alt="secondary"/>
+		<language type="cs" scripts="Latn"/>
 		<language type="csb" scripts="Latn"/>
-		<language type="csb" territories="PL" alt="secondary"/>
 		<language type="csw" scripts="Cans"/>
 		<language type="ctd" scripts="Latn"/>
 		<language type="cu" scripts="Cyrl"/>
 		<language type="cv" scripts="Cyrl"/>
-		<language type="cv" territories="RU" alt="secondary"/>
 		<language type="cy" scripts="Latn"/>
-		<language type="cy" territories="GB" alt="secondary"/>
-		<language type="da" scripts="Latn" territories="DK"/>
-		<language type="da" territories="DE" alt="secondary"/>
+		<language type="da" scripts="Latn"/>
 		<language type="dak" scripts="Latn"/>
 		<language type="dar" scripts="Cyrl"/>
 		<language type="dav" scripts="Latn"/>
 		<language type="dcc" scripts="Arab"/>
-		<language type="dcc" territories="IN" alt="secondary"/>
-		<language type="de" scripts="Latn" territories="AT BE CH DE LI LU"/>
-		<language type="de" scripts="Runr" territories="BR CZ DK FI FR GB HU KZ NL PL SI SK US" alt="secondary"/>
+		<language type="de" scripts="Latn"/>
+		<language type="de" scripts="Runr" alt="secondary"/>
 		<language type="del" scripts="Latn"/>
 		<language type="den" scripts="Latn"/>
-		<language type="den" scripts="Cans" territories="CA" alt="secondary"/>
+		<language type="den" scripts="Cans" alt="secondary"/>
 		<language type="dgr" scripts="Latn"/>
-		<language type="dgr" territories="CA" alt="secondary"/>
 		<language type="din" scripts="Latn"/>
 		<language type="dje" scripts="Latn"/>
-		<language type="dje" territories="NE" alt="secondary"/>
 		<language type="dng" scripts="Cyrl"/>
 		<language type="dnj" scripts="Latn"/>
-		<language type="dnj" territories="CI" alt="secondary"/>
 		<language type="doi" scripts="Deva"/>
-		<language type="doi" scripts="Arab Takr" territories="IN" alt="secondary"/>
+		<language type="doi" scripts="Arab Takr" alt="secondary"/>
 		<language type="dsb" scripts="Latn"/>
 		<language type="dtm" scripts="Latn"/>
 		<language type="dtp" scripts="Latn"/>
 		<language type="dty" scripts="Deva"/>
 		<language type="dua" scripts="Latn"/>
 		<language type="dum" scripts="Latn"/>
-		<language type="dv" scripts="Thaa" territories="MV"/>
+		<language type="dv" scripts="Thaa"/>
 		<language type="dyo" scripts="Latn"/>
-		<language type="dyo" scripts="Arab" territories="SN" alt="secondary"/>
+		<language type="dyo" scripts="Arab" alt="secondary"/>
 		<language type="dyu" scripts="Latn"/>
-		<language type="dyu" territories="BF" alt="secondary"/>
-		<language type="dz" scripts="Tibt" territories="BT"/>
+		<language type="dz" scripts="Tibt"/>
 		<language type="ebu" scripts="Latn"/>
 		<language type="ecy" scripts="Cprt"/>
 		<language type="ee" scripts="Latn"/>
-		<language type="ee" territories="GH TG" alt="secondary"/>
 		<language type="efi" scripts="Latn"/>
-		<language type="efi" territories="NG" alt="secondary"/>
 		<language type="egl" scripts="Latn"/>
 		<language type="egy" scripts="Egyp"/>
 		<language type="eka" scripts="Latn"/>
 		<language type="eky" scripts="Kali"/>
-		<language type="el" scripts="Grek" territories="CY GR"/>
-		<language type="en" scripts="Latn" territories="AG AI AS AU BB BI BM BS BW BZ CA CC CK CM CQ CX DG DM ER FJ FK FM GB GD GG GH GI GM GS GU GY HK IE IM IN IO JE JM KE KI KN KY LC LR LS MG MH MP MS MT MU MW NA NF NG NR NU NZ PG PH PK PN PR PW RW SB SC SD SG SH SL SS SX SZ TC TK TO TT TV TZ UG UM US VC VG VI VU WS ZA ZM ZW"/>
-		<language type="en" scripts="Dsrt Shaw" territories="AC AE AR AT BA BD BE BG BR CH CL CY CZ DE DK DZ EE EG ES ET FI FR GR HR HU IL IQ IT JO KZ LB LK LT LU LV MA MO MV MX MY NL PL PT RO SE SI SK TA TH TR YE" alt="secondary"/>
+		<language type="el" scripts="Grek"/>
+		<language type="en" scripts="Latn"/>
+		<language type="en" scripts="Dsrt Shaw" alt="secondary"/>
 		<language type="enm" scripts="Latn"/>
 		<language type="eo" scripts="Latn"/>
-		<language type="es" scripts="Latn" territories="AR BO CL CO CR CU DO EA EC ES GQ GT HN IC MX NI PA PE PR PY SV UY VE"/>
-		<language type="es" territories="AD BZ CA DE FR GB GI PH PT RO US" alt="secondary"/>
+		<language type="es" scripts="Latn"/>
 		<language type="esu" scripts="Latn"/>
-		<language type="et" scripts="Latn" territories="EE"/>
+		<language type="et" scripts="Latn"/>
 		<language type="ett" scripts="Ital Latn" alt="secondary"/>
 		<language type="eu" scripts="Latn"/>
-		<language type="eu" territories="ES" alt="secondary"/>
 		<language type="evn" scripts="Cyrl"/>
 		<language type="ewo" scripts="Latn"/>
 		<language type="ext" scripts="Latn"/>
-		<language type="fa" scripts="Arab" territories="AF IR"/>
-		<language type="fa" territories="PK" alt="secondary"/>
+		<language type="fa" scripts="Arab"/>
 		<language type="fan" scripts="Latn"/>
-		<language type="fan" territories="GQ" alt="secondary"/>
-		<language type="fbl" territories="PH" alt="secondary"/>
 		<language type="ff" scripts="Latn"/>
-		<language type="ff" scripts="Adlm" territories="CM GN SN" alt="secondary"/>
+		<language type="ff" scripts="Adlm" alt="secondary"/>
 		<language type="ffm" scripts="Latn"/>
-		<language type="ffm" territories="ML" alt="secondary"/>
-		<language type="fi" scripts="Latn" territories="FI"/>
-		<language type="fi" territories="EE SE" alt="secondary"/>
+		<language type="fi" scripts="Latn"/>
 		<language type="fia" scripts="Arab"/>
-		<language type="fil" scripts="Latn" territories="PH"/>
-		<language type="fil" scripts="Tglg" territories="US" alt="secondary"/>
+		<language type="fil" scripts="Latn"/>
+		<language type="fil" scripts="Tglg" alt="secondary"/>
 		<language type="fit" scripts="Latn"/>
-		<language type="fj" scripts="Latn" territories="FJ"/>
-		<language type="fo" scripts="Latn" territories="FO"/>
+		<language type="fj" scripts="Latn"/>
+		<language type="fo" scripts="Latn"/>
 		<language type="fon" scripts="Latn"/>
-		<language type="fon" territories="BJ" alt="secondary"/>
-		<language type="fr" scripts="Latn" territories="BE BF BI BJ BL CA CD CF CG CH CI CM DJ DZ FR GA GF GN GP GQ HT KM LU MA MC MF MG ML MQ MU NC NE PF PM RE RW SC SN TD TG TN VU WF YT"/>
-		<language type="fr" scripts="Dupl" territories="AT DE GB IT LB NL PT RO ST SY TF US" alt="secondary"/>
+		<language type="fr" scripts="Latn"/>
+		<language type="fr" scripts="Dupl" alt="secondary"/>
 		<language type="frc" scripts="Latn"/>
 		<language type="frm" scripts="Latn"/>
 		<language type="fro" scripts="Latn"/>
 		<language type="frp" scripts="Latn"/>
 		<language type="frr" scripts="Latn"/>
-		<language type="frr" territories="DE" alt="secondary"/>
 		<language type="frs" scripts="Latn"/>
 		<language type="fud" scripts="Latn"/>
-		<language type="fud" territories="WF" alt="secondary"/>
 		<language type="fuq" scripts="Latn"/>
-		<language type="fuq" territories="NE" alt="secondary"/>
 		<language type="fur" scripts="Latn"/>
 		<language type="fuv" scripts="Latn"/>
-		<language type="fuv" territories="NG" alt="secondary"/>
 		<language type="fvr" scripts="Latn"/>
-		<language type="fvr" territories="SD" alt="secondary"/>
 		<language type="fy" scripts="Latn"/>
-		<language type="fy" territories="NL" alt="secondary"/>
-		<language type="ga" scripts="Latn" territories="IE"/>
-		<language type="ga" territories="GB" alt="secondary"/>
+		<language type="ga" scripts="Latn"/>
 		<language type="gaa" scripts="Latn"/>
-		<language type="gaa" territories="GH" alt="secondary"/>
 		<language type="gag" scripts="Latn"/>
 		<language type="gag" scripts="Cyrl" alt="secondary"/>
 		<language type="gan" scripts="Hans"/>
-		<language type="gan" territories="CN" alt="secondary"/>
 		<language type="gay" scripts="Latn"/>
 		<language type="gba" scripts="Latn"/>
 		<language type="gbm" scripts="Deva"/>
-		<language type="gbm" territories="IN" alt="secondary"/>
 		<language type="gbz" scripts="Arab"/>
 		<language type="gcr" scripts="Latn"/>
-		<language type="gcr" territories="GF" alt="secondary"/>
 		<language type="gd" scripts="Latn"/>
-		<language type="gd" territories="GB" alt="secondary"/>
 		<language type="gez" scripts="Ethi"/>
-		<language type="gil" scripts="Latn" territories="KI"/>
+		<language type="gil" scripts="Latn"/>
 		<language type="gjk" scripts="Arab"/>
 		<language type="gju" scripts="Arab"/>
 		<language type="gl" scripts="Latn"/>
-		<language type="gl" territories="ES" alt="secondary"/>
 		<language type="gld" scripts="Cyrl"/>
 		<language type="glk" scripts="Arab"/>
-		<language type="glk" territories="IR" alt="secondary"/>
 		<language type="gmh" scripts="Latn"/>
 		<language type="gmy" scripts="Linb"/>
-		<language type="gn" scripts="Latn" territories="PY"/>
+		<language type="gn" scripts="Latn"/>
 		<language type="goh" scripts="Latn"/>
 		<language type="gon" scripts="Deva Telu"/>
-		<language type="gon" territories="IN" alt="secondary"/>
 		<language type="gor" scripts="Latn"/>
-		<language type="gor" territories="ID" alt="secondary"/>
 		<language type="gos" scripts="Latn"/>
 		<language type="got" scripts="Goth"/>
 		<language type="grb" scripts="Latn"/>
 		<language type="grc" scripts="Grek"/>
+		<language type="grr" scripts="Arab"/>
+		<language type="grr" scripts="Tfng" alt="secondary"/>
 		<language type="grt" scripts="Beng"/>
-		<language type="gsw" scripts="Latn" territories="CH LI"/>
-		<language type="gsw" territories="DE" alt="secondary"/>
+		<language type="gsw" scripts="Latn"/>
 		<language type="gu" scripts="Gujr"/>
-		<language type="gu" territories="GB IN" alt="secondary"/>
 		<language type="gub" scripts="Latn"/>
 		<language type="guc" scripts="Latn"/>
 		<language type="gur" scripts="Latn"/>
-		<language type="gur" territories="GH" alt="secondary"/>
 		<language type="guz" scripts="Latn"/>
-		<language type="guz" territories="KE" alt="secondary"/>
-		<language type="gv" scripts="Latn" territories="IM"/>
+		<language type="gv" scripts="Latn"/>
 		<language type="gvr" scripts="Deva"/>
 		<language type="gwi" scripts="Latn"/>
-		<language type="gwi" territories="CA" alt="secondary"/>
 		<language type="ha" scripts="Latn Arab"/>
-		<language type="ha" territories="NE NG" alt="secondary"/>
 		<language type="hai" scripts="Latn"/>
-		<language type="hak" scripts="Hans Hant" territories="TW"/>
-		<language type="hak" territories="CN" alt="secondary"/>
+		<language type="hak" scripts="Hans"/>
+		<language type="hak" scripts="Hant" alt="secondary"/>
 		<language type="haw" scripts="Latn"/>
-		<language type="haw" territories="US" alt="secondary"/>
 		<language type="haz" scripts="Arab"/>
-		<language type="haz" territories="AF" alt="secondary"/>
-		<language type="he" scripts="Hebr" territories="IL"/>
-		<language type="hi" scripts="Deva" territories="IN"/>
-		<language type="hi" scripts="Latn Mahj" territories="FJ IN ZA" alt="secondary"/>
-		<language type="hif" scripts="Deva Latn" territories="FJ"/>
+		<language type="he" scripts="Hebr"/>
+		<language type="hi" scripts="Deva"/>
+		<language type="hi" scripts="Latn Mahj" alt="secondary"/>
+		<language type="hif" scripts="Deva Latn"/>
 		<language type="hil" scripts="Latn"/>
-		<language type="hil" territories="PH" alt="secondary"/>
 		<language type="hit" scripts="Xsux"/>
 		<language type="hmd" scripts="Plrd"/>
 		<language type="hmn" scripts="Latn"/>
 		<language type="hmn" scripts="Hmng" alt="secondary"/>
 		<language type="hnd" scripts="Arab"/>
-		<language type="hnd" territories="PK" alt="secondary"/>
 		<language type="hne" scripts="Deva"/>
-		<language type="hne" territories="IN" alt="secondary"/>
 		<language type="hnj" scripts="Laoo"/>
 		<language type="hnn" scripts="Latn"/>
 		<language type="hnn" scripts="Hano" alt="secondary"/>
 		<language type="hno" scripts="Arab"/>
-		<language type="hno" territories="PK" alt="secondary"/>
-		<language type="ho" scripts="Latn" territories="PG"/>
+		<language type="ho" scripts="Latn"/>
 		<language type="hoc" scripts="Deva"/>
-		<language type="hoc" scripts="Wara" territories="IN" alt="secondary"/>
+		<language type="hoc" scripts="Wara" alt="secondary"/>
 		<language type="hoj" scripts="Deva"/>
-		<language type="hoj" territories="IN" alt="secondary"/>
 		<language type="hop" scripts="Latn"/>
-		<language type="hr" scripts="Latn" territories="BA HR"/>
-		<language type="hr" territories="AT RS SI" alt="secondary"/>
+		<language type="hr" scripts="Latn"/>
 		<language type="hsb" scripts="Latn"/>
 		<language type="hsn" scripts="Hans"/>
-		<language type="hsn" territories="CN" alt="secondary"/>
-		<language type="ht" scripts="Latn" territories="HT"/>
-		<language type="hu" scripts="Latn" territories="HU"/>
-		<language type="hu" territories="AT RO RS" alt="secondary"/>
+		<language type="ht" scripts="Latn"/>
+		<language type="hu" scripts="Latn"/>
 		<language type="hup" scripts="Latn"/>
 		<language type="hur" scripts="Latn"/>
-		<language type="hy" scripts="Armn" territories="AM"/>
-		<language type="hy" territories="RU" alt="secondary"/>
+		<language type="hy" scripts="Armn"/>
 		<language type="hz" scripts="Latn"/>
 		<language type="ia" scripts="Latn"/>
 		<language type="iba" scripts="Latn"/>
 		<language type="ibb" scripts="Latn"/>
-		<language type="ibb" territories="NG" alt="secondary"/>
-		<language type="id" scripts="Latn" territories="ID"/>
+		<language type="id" scripts="Latn"/>
 		<language type="id" scripts="Arab" alt="secondary"/>
 		<language type="ie" scripts="Latn"/>
 		<language type="ife" scripts="Latn"/>
 		<language type="ig" scripts="Latn"/>
-		<language type="ig" territories="NG" alt="secondary"/>
 		<language type="ii" scripts="Yiii"/>
-		<language type="ii" scripts="Latn" territories="CN" alt="secondary"/>
+		<language type="ii" scripts="Latn" alt="secondary"/>
 		<language type="ik" scripts="Latn"/>
 		<language type="ikt" scripts="Latn"/>
 		<language type="ilo" scripts="Latn"/>
-		<language type="ilo" territories="PH" alt="secondary"/>
 		<language type="inh" scripts="Cyrl"/>
-		<language type="inh" scripts="Arab Latn" territories="RU" alt="secondary"/>
+		<language type="inh" scripts="Arab Latn" alt="secondary"/>
 		<language type="io" scripts="Latn"/>
-		<language type="is" scripts="Latn" territories="IS"/>
-		<language type="it" scripts="Latn" territories="CH IT SM VA"/>
-		<language type="it" territories="DE FR HR MT US" alt="secondary"/>
+		<language type="is" scripts="Latn"/>
+		<language type="it" scripts="Latn"/>
 		<language type="iu" scripts="Cans Latn"/>
-		<language type="iu" territories="CA" alt="secondary"/>
 		<language type="izh" scripts="Latn"/>
-		<language type="ja" scripts="Jpan" territories="JP"/>
+		<language type="ja" scripts="Jpan"/>
 		<language type="jam" scripts="Latn"/>
-		<language type="jam" territories="JM" alt="secondary"/>
 		<language type="jbo" scripts="Latn"/>
 		<language type="jgo" scripts="Latn"/>
 		<language type="jmc" scripts="Latn"/>
@@ -1736,134 +1632,102 @@ XXX Code for transations where no currency is involved
 		<language type="jrb" scripts="Hebr"/>
 		<language type="jut" scripts="Latn"/>
 		<language type="jv" scripts="Latn"/>
-		<language type="jv" scripts="Java" territories="ID" alt="secondary"/>
-		<language type="ka" scripts="Geor" territories="GE"/>
+		<language type="jv" scripts="Java" alt="secondary"/>
+		<language type="ka" scripts="Geor"/>
 		<language type="kaa" scripts="Cyrl Latn"/>
 		<language type="kab" scripts="Latn"/>
-		<language type="kab" territories="DZ" alt="secondary"/>
 		<language type="kac" scripts="Latn"/>
 		<language type="kaj" scripts="Latn"/>
 		<language type="kam" scripts="Latn"/>
-		<language type="kam" territories="KE" alt="secondary"/>
 		<language type="kao" scripts="Latn"/>
 		<language type="kaw" scripts="Bali"/>
 		<language type="kaw" scripts="Java Kawi" alt="secondary"/>
 		<language type="kbd" scripts="Cyrl"/>
-		<language type="kbd" territories="RU" alt="secondary"/>
 		<language type="kca" scripts="Cyrl"/>
 		<language type="kcg" scripts="Latn"/>
 		<language type="kck" scripts="Latn"/>
 		<language type="kde" scripts="Latn"/>
-		<language type="kde" territories="TZ" alt="secondary"/>
 		<language type="kdt" scripts="Thai"/>
 		<language type="kea" scripts="Latn"/>
-		<language type="kea" territories="CV" alt="secondary"/>
 		<language type="ken" scripts="Latn"/>
 		<language type="kfo" scripts="Latn"/>
 		<language type="kfr" scripts="Deva"/>
-		<language type="kfr" territories="IN" alt="secondary"/>
 		<language type="kfy" scripts="Deva"/>
-		<language type="kfy" territories="IN" alt="secondary"/>
 		<language type="kg" scripts="Latn"/>
-		<language type="kg" territories="CD" alt="secondary"/>
 		<language type="kge" scripts="Latn"/>
 		<language type="kgp" scripts="Latn"/>
 		<language type="kha" scripts="Latn"/>
-		<language type="kha" scripts="Beng" territories="IN" alt="secondary"/>
+		<language type="kha" scripts="Beng" alt="secondary"/>
 		<language type="khb" scripts="Talu"/>
 		<language type="khn" scripts="Deva"/>
-		<language type="khn" territories="IN" alt="secondary"/>
 		<language type="khq" scripts="Latn"/>
 		<language type="kht" scripts="Mymr"/>
 		<language type="khw" scripts="Arab"/>
 		<language type="ki" scripts="Latn"/>
-		<language type="ki" territories="KE" alt="secondary"/>
 		<language type="kiu" scripts="Latn"/>
 		<language type="kj" scripts="Latn"/>
-		<language type="kj" territories="NA" alt="secondary"/>
 		<language type="kjg" scripts="Laoo"/>
 		<language type="kjg" scripts="Latn" alt="secondary"/>
 		<language type="kjh" scripts="Cyrl"/>
-		<language type="kk" scripts="Cyrl Arab" territories="KZ"/>
-		<language type="kk" territories="CN" alt="secondary"/>
+		<language type="kk" scripts="Cyrl Arab"/>
 		<language type="kkj" scripts="Latn"/>
-		<language type="kl" scripts="Latn" territories="GL"/>
-		<language type="kl" territories="DK" alt="secondary"/>
+		<language type="kl" scripts="Latn"/>
 		<language type="kln" scripts="Latn"/>
-		<language type="kln" territories="KE" alt="secondary"/>
-		<language type="km" scripts="Khmr" territories="KH"/>
+		<language type="km" scripts="Khmr"/>
 		<language type="kmb" scripts="Latn"/>
-		<language type="kmb" territories="AO" alt="secondary"/>
 		<language type="kn" scripts="Knda"/>
-		<language type="kn" territories="IN" alt="secondary"/>
 		<language type="knf" scripts="Latn"/>
-		<language type="knf" territories="SN" alt="secondary"/>
 		<language type="knn" scripts="Deva"/>
-		<language type="knn" territories="IN" alt="secondary"/>
-		<language type="ko" scripts="Kore" territories="KP KR"/>
-		<language type="ko" territories="CN US" alt="secondary"/>
+		<language type="ko" scripts="Kore"/>
 		<language type="koi" scripts="Cyrl"/>
-		<language type="koi" territories="RU" alt="secondary"/>
 		<language type="kok" scripts="Deva Latn"/>
-		<language type="kok" territories="IN" alt="secondary"/>
 		<language type="kos" scripts="Latn"/>
 		<language type="kpe" scripts="Latn"/>
 		<language type="kpy" scripts="Cyrl"/>
 		<language type="kr" scripts="Latn"/>
 		<language type="krc" scripts="Cyrl"/>
-		<language type="krc" territories="RU" alt="secondary"/>
 		<language type="kri" scripts="Latn"/>
-		<language type="kri" territories="SL" alt="secondary"/>
 		<language type="krj" scripts="Latn"/>
 		<language type="krl" scripts="Latn"/>
+		<language type="kro" scripts="Latn"/>
 		<language type="kru" scripts="Deva"/>
-		<language type="kru" territories="IN" alt="secondary"/>
 		<language type="ks" scripts="Arab Deva"/>
-		<language type="ks" territories="IN" alt="secondary"/>
 		<language type="ksb" scripts="Latn"/>
-		<language type="ksb" territories="TZ" alt="secondary"/>
 		<language type="ksf" scripts="Latn"/>
 		<language type="ksh" scripts="Latn"/>
-		<language type="ku" scripts="Latn Arab Cyrl"/>
-		<language type="ku" territories="SY TR" alt="secondary"/>
+		<language type="ku" scripts="Latn"/>
+		<language type="ku" scripts="Arab Cyrl" alt="secondary"/>
 		<language type="kum" scripts="Cyrl"/>
-		<language type="kum" territories="RU" alt="secondary"/>
 		<language type="kut" scripts="Latn"/>
 		<language type="kv" scripts="Cyrl"/>
-		<language type="kv" scripts="Perm" territories="RU" alt="secondary"/>
+		<language type="kv" scripts="Perm" alt="secondary"/>
 		<language type="kvr" scripts="Latn"/>
 		<language type="kvx" scripts="Arab"/>
 		<language type="kw" scripts="Latn"/>
 		<language type="kwk" scripts="Latn"/>
 		<language type="kxm" scripts="Thai"/>
-		<language type="kxm" territories="TH" alt="secondary"/>
 		<language type="kxp" scripts="Arab"/>
 		<language type="kxv" scripts="Latn"/>
 		<language type="kxv" scripts="Deva Orya Telu" alt="secondary"/>
-		<language type="ky" scripts="Cyrl Arab Latn" territories="KG"/>
+		<language type="ky" scripts="Cyrl Arab Latn"/>
 		<language type="kyu" scripts="Kali"/>
 		<language type="la" scripts="Latn"/>
-		<language type="la" territories="VA" alt="secondary"/>
 		<language type="lab" scripts="Lina"/>
 		<language type="lad" scripts="Hebr"/>
 		<language type="lag" scripts="Latn"/>
 		<language type="lah" scripts="Arab"/>
-		<language type="lah" territories="PK" alt="secondary"/>
 		<language type="laj" scripts="Latn"/>
-		<language type="laj" territories="UG" alt="secondary"/>
 		<language type="lam" scripts="Latn"/>
-		<language type="lb" scripts="Latn" territories="LU"/>
+		<language type="lb" scripts="Latn"/>
 		<language type="lbe" scripts="Cyrl"/>
-		<language type="lbe" territories="RU" alt="secondary"/>
 		<language type="lbw" scripts="Latn"/>
 		<language type="lcp" scripts="Thai"/>
 		<language type="len" scripts="Latn"/>
 		<language type="lep" scripts="Lepc"/>
 		<language type="lez" scripts="Cyrl"/>
-		<language type="lez" scripts="Aghb" territories="RU" alt="secondary"/>
+		<language type="lez" scripts="Aghb" alt="secondary"/>
 		<language type="lfn" scripts="Latn Cyrl" alt="secondary"/>
 		<language type="lg" scripts="Latn"/>
-		<language type="lg" territories="UG" alt="secondary"/>
 		<language type="li" scripts="Latn"/>
 		<language type="lif" scripts="Deva Limb"/>
 		<language type="lij" scripts="Latn"/>
@@ -1871,518 +1735,399 @@ XXX Code for transations where no currency is involved
 		<language type="lis" scripts="Lisu"/>
 		<language type="liv" scripts="Latn"/>
 		<language type="ljp" scripts="Latn"/>
-		<language type="ljp" territories="ID" alt="secondary"/>
 		<language type="lki" scripts="Arab"/>
 		<language type="lkt" scripts="Latn"/>
 		<language type="lld" scripts="Latn"/>
 		<language type="lmn" scripts="Telu"/>
-		<language type="lmn" territories="IN" alt="secondary"/>
 		<language type="lmo" scripts="Latn"/>
-		<language type="lmo" territories="IT" alt="secondary"/>
 		<language type="ln" scripts="Latn"/>
-		<language type="ln" territories="CD" alt="secondary"/>
-		<language type="lo" scripts="Laoo" territories="LA"/>
+		<language type="lo" scripts="Laoo"/>
 		<language type="lol" scripts="Latn"/>
 		<language type="loz" scripts="Latn"/>
-		<language type="loz" territories="ZM" alt="secondary"/>
 		<language type="lrc" scripts="Arab"/>
-		<language type="lrc" territories="IR" alt="secondary"/>
-		<language type="lt" scripts="Latn" territories="LT"/>
-		<language type="lt" territories="PL" alt="secondary"/>
+		<language type="lt" scripts="Latn"/>
 		<language type="ltg" scripts="Latn"/>
 		<language type="lu" scripts="Latn"/>
-		<language type="lu" territories="CD" alt="secondary"/>
 		<language type="lua" scripts="Latn"/>
-		<language type="lua" territories="CD" alt="secondary"/>
 		<language type="lui" scripts="Latn"/>
 		<language type="lun" scripts="Latn"/>
 		<language type="luo" scripts="Latn"/>
-		<language type="luo" territories="KE" alt="secondary"/>
 		<language type="lus" scripts="Beng"/>
 		<language type="lut" scripts="Latn"/>
 		<language type="luy" scripts="Latn"/>
-		<language type="luy" territories="KE" alt="secondary"/>
 		<language type="luz" scripts="Arab"/>
-		<language type="luz" territories="IR" alt="secondary"/>
-		<language type="lv" scripts="Latn" territories="LV"/>
+		<language type="lv" scripts="Latn"/>
 		<language type="lwl" scripts="Thai"/>
-		<language type="lzh" scripts="Hans"/>
+		<language type="lzh" scripts="Hant"/>
 		<language type="lzz" scripts="Latn"/>
 		<language type="lzz" scripts="Geor" alt="secondary"/>
 		<language type="mad" scripts="Latn"/>
-		<language type="mad" territories="ID" alt="secondary"/>
 		<language type="maf" scripts="Latn"/>
 		<language type="mag" scripts="Deva"/>
-		<language type="mag" territories="IN" alt="secondary"/>
 		<language type="mai" scripts="Deva"/>
-		<language type="mai" scripts="Tirh" territories="IN NP" alt="secondary"/>
+		<language type="mai" scripts="Tirh" alt="secondary"/>
 		<language type="mak" scripts="Latn"/>
-		<language type="mak" scripts="Bugi" territories="ID" alt="secondary"/>
+		<language type="mak" scripts="Bugi" alt="secondary"/>
 		<language type="man" scripts="Latn Nkoo"/>
-		<language type="man" territories="GM GN" alt="secondary"/>
 		<language type="mas" scripts="Latn"/>
 		<language type="maz" scripts="Latn"/>
 		<language type="mdf" scripts="Cyrl"/>
-		<language type="mdf" territories="RU" alt="secondary"/>
 		<language type="mdh" scripts="Latn"/>
-		<language type="mdh" territories="PH" alt="secondary"/>
 		<language type="mdr" scripts="Latn"/>
 		<language type="mdr" scripts="Bugi" alt="secondary"/>
 		<language type="mdt" scripts="Latn"/>
 		<language type="men" scripts="Latn"/>
-		<language type="men" scripts="Mend" territories="SL" alt="secondary"/>
+		<language type="men" scripts="Mend" alt="secondary"/>
 		<language type="mer" scripts="Latn"/>
-		<language type="mer" territories="KE" alt="secondary"/>
-		<language type="mey" territories="SN" alt="secondary"/>
+		<language type="mey" scripts="Arab"/>
+		<language type="mey" scripts="Latn" alt="secondary"/>
 		<language type="mfa" scripts="Arab"/>
-		<language type="mfa" territories="TH" alt="secondary"/>
 		<language type="mfe" scripts="Latn"/>
-		<language type="mfe" territories="MU" alt="secondary"/>
 		<language type="mfv" scripts="Latn"/>
-		<language type="mfv" territories="SN" alt="secondary"/>
-		<language type="mg" scripts="Latn" territories="MG"/>
+		<language type="mg" scripts="Latn"/>
 		<language type="mgh" scripts="Latn"/>
-		<language type="mgh" territories="MZ" alt="secondary"/>
 		<language type="mgo" scripts="Latn"/>
 		<language type="mgp" scripts="Deva"/>
 		<language type="mgy" scripts="Latn"/>
-		<language type="mh" scripts="Latn" territories="MH"/>
+		<language type="mh" scripts="Latn"/>
 		<language type="mhn" scripts="Latn"/>
-		<language type="mi" scripts="Latn" territories="NZ"/>
+		<language type="mi" scripts="Latn"/>
 		<language type="mic" scripts="Latn"/>
 		<language type="min" scripts="Latn"/>
-		<language type="min" territories="ID" alt="secondary"/>
-		<language type="mk" scripts="Cyrl" territories="MK"/>
+		<language type="mk" scripts="Cyrl"/>
 		<language type="ml" scripts="Mlym"/>
-		<language type="ml" territories="IN" alt="secondary"/>
 		<language type="mls" scripts="Latn"/>
-		<language type="mn" scripts="Cyrl" territories="MN"/>
-		<language type="mn" scripts="Mong Phag" territories="CN" alt="secondary"/>
+		<language type="mn" scripts="Cyrl"/>
+		<language type="mn" scripts="Mong Phag" alt="secondary"/>
 		<language type="mnc" scripts="Mong"/>
 		<language type="mni" scripts="Beng"/>
-		<language type="mni" scripts="Mtei" territories="IN" alt="secondary"/>
+		<language type="mni" scripts="Mtei" alt="secondary"/>
 		<language type="mns" scripts="Cyrl"/>
 		<language type="mnw" scripts="Mymr"/>
 		<language type="moe" scripts="Latn"/>
 		<language type="moh" scripts="Latn"/>
 		<language type="mos" scripts="Latn"/>
-		<language type="mos" territories="BF" alt="secondary"/>
 		<language type="mr" scripts="Deva"/>
-		<language type="mr" scripts="Modi" territories="IN" alt="secondary"/>
+		<language type="mr" scripts="Modi" alt="secondary"/>
 		<language type="mrd" scripts="Deva"/>
 		<language type="mrj" scripts="Cyrl"/>
 		<language type="mro" scripts="Latn"/>
 		<language type="mro" scripts="Mroo" alt="secondary"/>
-		<language type="ms" scripts="Latn Arab" territories="BN MY SG"/>
-		<language type="ms" territories="CC ID" alt="secondary"/>
-		<language type="mt" scripts="Latn" territories="MT"/>
+		<language type="ms" scripts="Latn Arab"/>
+		<language type="mt" scripts="Latn"/>
 		<language type="mtr" scripts="Deva"/>
-		<language type="mtr" territories="IN" alt="secondary"/>
 		<language type="mua" scripts="Latn"/>
 		<language type="mus" scripts="Latn"/>
 		<language type="mvy" scripts="Arab"/>
 		<language type="mwk" scripts="Latn"/>
-		<language type="mwk" territories="ML" alt="secondary"/>
 		<language type="mwl" scripts="Latn"/>
 		<language type="mwr" scripts="Deva"/>
-		<language type="mwr" territories="IN" alt="secondary"/>
 		<language type="mwv" scripts="Latn"/>
+		<language type="mww" scripts="Latn"/>
+		<language type="mww" scripts="Hmnp" alt="secondary"/>
 		<language type="mxc" scripts="Latn"/>
-		<language type="mxc" territories="ZW" alt="secondary"/>
-		<language type="my" scripts="Mymr" territories="MM"/>
+		<language type="my" scripts="Mymr"/>
 		<language type="myv" scripts="Cyrl"/>
-		<language type="myv" territories="RU" alt="secondary"/>
 		<language type="myx" scripts="Latn"/>
-		<language type="myx" territories="UG" alt="secondary"/>
 		<language type="myz" scripts="Mand"/>
+		<language type="mzb" scripts="Arab"/>
+		<language type="mzb" scripts="Latn" alt="secondary"/>
 		<language type="mzn" scripts="Arab"/>
-		<language type="mzn" territories="IR" alt="secondary"/>
-		<language type="na" scripts="Latn" territories="NR"/>
-		<language type="nan" scripts="Hans Hant" territories="TW"/>
-		<language type="nan" territories="CN" alt="secondary"/>
+		<language type="na" scripts="Latn"/>
+		<language type="nan" scripts="Hans"/>
+		<language type="nan" scripts="Hant" alt="secondary"/>
 		<language type="nap" scripts="Latn"/>
 		<language type="naq" scripts="Latn"/>
-		<language type="nb" scripts="Latn" territories="NO SJ"/>
+		<language type="nb" scripts="Latn"/>
 		<language type="nch" scripts="Latn"/>
-		<language type="nd" scripts="Latn" territories="ZW"/>
+		<language type="nd" scripts="Latn"/>
 		<language type="ndc" scripts="Latn"/>
-		<language type="ndc" territories="MZ ZW" alt="secondary"/>
 		<language type="nds" scripts="Latn"/>
-		<language type="nds" territories="DE NL" alt="secondary"/>
-		<language type="ne" scripts="Deva" territories="NP"/>
-		<language type="ne" territories="IN" alt="secondary"/>
+		<language type="ne" scripts="Deva"/>
 		<language type="new" scripts="Deva"/>
-		<language type="new" territories="NP" alt="secondary"/>
 		<language type="ng" scripts="Latn"/>
-		<language type="ng" territories="NA" alt="secondary"/>
 		<language type="ngl" scripts="Latn"/>
-		<language type="ngl" territories="MZ" alt="secondary"/>
 		<language type="nhe" scripts="Latn"/>
 		<language type="nhw" scripts="Latn"/>
 		<language type="nia" scripts="Latn"/>
 		<language type="nij" scripts="Latn"/>
-		<language type="nij" territories="ID" alt="secondary"/>
-		<language type="niu" scripts="Latn" territories="NU"/>
+		<language type="niu" scripts="Latn"/>
 		<language type="njo" scripts="Latn"/>
-		<language type="nl" scripts="Latn" territories="AW BE BQ CW NL SR SX"/>
-		<language type="nl" territories="DE" alt="secondary"/>
+		<language type="nl" scripts="Latn"/>
 		<language type="nmg" scripts="Latn"/>
-		<language type="nn" scripts="Latn" territories="NO"/>
+		<language type="nn" scripts="Latn"/>
 		<language type="nnh" scripts="Latn"/>
-		<language type="no" scripts="Latn" territories="NO"/>
-		<language type="no" territories="BV" alt="secondary"/>
+		<language type="no" scripts="Latn"/>
 		<language type="nod" scripts="Lana"/>
-		<language type="nod" territories="TH" alt="secondary"/>
 		<language type="noe" scripts="Deva"/>
-		<language type="noe" territories="IN" alt="secondary"/>
 		<language type="nog" scripts="Cyrl"/>
 		<language type="non" scripts="Runr"/>
 		<language type="nov" scripts="Latn"/>
 		<language type="nqo" scripts="Nkoo"/>
 		<language type="nr" scripts="Latn"/>
-		<language type="nr" territories="ZA" alt="secondary"/>
 		<language type="nsk" scripts="Cans"/>
 		<language type="nsk" scripts="Latn" alt="secondary"/>
 		<language type="nso" scripts="Latn"/>
-		<language type="nso" territories="ZA" alt="secondary"/>
 		<language type="nus" scripts="Latn"/>
 		<language type="nv" scripts="Latn"/>
 		<language type="nxq" scripts="Latn"/>
-		<language type="ny" scripts="Latn" territories="MW"/>
-		<language type="ny" territories="ZM" alt="secondary"/>
+		<language type="ny" scripts="Latn"/>
 		<language type="nym" scripts="Latn"/>
-		<language type="nym" territories="TZ" alt="secondary"/>
 		<language type="nyn" scripts="Latn"/>
-		<language type="nyn" territories="UG" alt="secondary"/>
 		<language type="nyo" scripts="Latn"/>
 		<language type="nzi" scripts="Latn"/>
 		<language type="oc" scripts="Latn"/>
-		<language type="oc" territories="ES FR" alt="secondary"/>
 		<language type="oj" scripts="Cans"/>
 		<language type="oj" scripts="Latn" alt="secondary"/>
 		<language type="ojs" scripts="Cans"/>
 		<language type="ojw" scripts="Latn"/>
 		<language type="oka" scripts="Latn"/>
 		<language type="om" scripts="Latn"/>
-		<language type="om" scripts="Ethi" territories="ET" alt="secondary"/>
+		<language type="om" scripts="Ethi" alt="secondary"/>
 		<language type="or" scripts="Orya"/>
-		<language type="or" territories="IN" alt="secondary"/>
 		<language type="os" scripts="Cyrl"/>
-		<language type="os" territories="GE" alt="secondary"/>
 		<language type="osa" scripts="Osge"/>
 		<language type="osa" scripts="Latn" alt="secondary"/>
 		<language type="osc" scripts="Ital Latn" alt="secondary"/>
 		<language type="otk" scripts="Orkh"/>
-		<language type="pa" scripts="Guru Arab"/>
-		<language type="pa" territories="CA GB IN PK" alt="secondary"/>
+		<language type="pa" scripts="Guru"/>
+		<language type="pa" scripts="Arab" alt="secondary"/>
 		<language type="pag" scripts="Latn"/>
-		<language type="pag" territories="PH" alt="secondary"/>
 		<language type="pal" scripts="Phli Phlp" alt="secondary"/>
 		<language type="pam" scripts="Latn"/>
-		<language type="pam" territories="PH" alt="secondary"/>
-		<language type="pap" scripts="Latn" territories="AW CW"/>
-		<language type="pap" territories="BQ" alt="secondary"/>
-		<language type="pau" scripts="Latn" territories="PW"/>
+		<language type="pap" scripts="Latn"/>
+		<language type="pau" scripts="Latn"/>
 		<language type="pcd" scripts="Latn"/>
 		<language type="pcm" scripts="Latn"/>
-		<language type="pcm" territories="NG" alt="secondary"/>
 		<language type="pdc" scripts="Latn"/>
 		<language type="pdt" scripts="Latn"/>
 		<language type="peo" scripts="Xpeo"/>
 		<language type="pfl" scripts="Latn"/>
 		<language type="phn" scripts="Phnx"/>
-		<language type="pi" scripts="Mymr"/>
-		<language type="pi" scripts="Sinh Deva Thai" alt="secondary"/>
+		<language type="pi" scripts="Latn"/>
+		<language type="pi" scripts="Deva Mymr Sinh Thai" alt="secondary"/>
 		<language type="pis" scripts="Latn"/>
-		<language type="pis" territories="SB" alt="secondary"/>
 		<language type="pko" scripts="Latn"/>
-		<language type="pl" scripts="Latn" territories="PL"/>
-		<language type="pl" territories="GB" alt="secondary"/>
+		<language type="pl" scripts="Latn"/>
 		<language type="pms" scripts="Latn"/>
 		<language type="pnt" scripts="Grek"/>
 		<language type="pnt" scripts="Cyrl Latn" alt="secondary"/>
 		<language type="pon" scripts="Latn"/>
-		<language type="pon" territories="FM" alt="secondary"/>
 		<language type="ppl" scripts="Latn"/>
 		<language type="pqm" scripts="Latn"/>
 		<language type="prd" scripts="Arab"/>
 		<language type="prg" scripts="Latn"/>
 		<language type="pro" scripts="Latn"/>
-		<language type="ps" scripts="Arab" territories="AF"/>
-		<language type="ps" territories="PK" alt="secondary"/>
-		<language type="pt" scripts="Latn" territories="AO BR CV GQ GW MO MZ PT ST TL"/>
+		<language type="ps" scripts="Arab"/>
+		<language type="pt" scripts="Latn"/>
 		<language type="puu" scripts="Latn"/>
-		<language type="qu" scripts="Latn" territories="BO EC PE"/>
+		<language type="qu" scripts="Latn"/>
 		<language type="quc" scripts="Latn"/>
-		<language type="quc" territories="GT" alt="secondary"/>
 		<language type="qug" scripts="Latn"/>
-		<language type="qug" territories="EC" alt="secondary"/>
 		<language type="raj" scripts="Deva"/>
-		<language type="raj" territories="IN" alt="secondary"/>
 		<language type="rap" scripts="Latn"/>
 		<language type="rar" scripts="Latn"/>
 		<language type="rcf" scripts="Latn"/>
-		<language type="rcf" territories="RE" alt="secondary"/>
 		<language type="rej" scripts="Latn"/>
-		<language type="rej" scripts="Rjng" territories="ID" alt="secondary"/>
+		<language type="rej" scripts="Rjng" alt="secondary"/>
 		<language type="rgn" scripts="Latn"/>
 		<language type="rhg" scripts="Rohg"/>
 		<language type="rhg" scripts="Arab Latn" alt="secondary"/>
 		<language type="ria" scripts="Latn"/>
 		<language type="rif" scripts="Latn Tfng"/>
-		<language type="rif" territories="MA" alt="secondary"/>
 		<language type="rjs" scripts="Deva"/>
 		<language type="rkt" scripts="Beng"/>
-		<language type="rkt" territories="BD IN" alt="secondary"/>
 		<language type="rm" scripts="Latn"/>
-		<language type="rm" territories="CH" alt="secondary"/>
 		<language type="rmf" scripts="Latn"/>
 		<language type="rmo" scripts="Latn"/>
 		<language type="rmt" scripts="Arab"/>
-		<language type="rmt" territories="IR" alt="secondary"/>
 		<language type="rmu" scripts="Latn"/>
-		<language type="rn" scripts="Latn" territories="BI"/>
+		<language type="rn" scripts="Latn"/>
 		<language type="rng" scripts="Latn"/>
-		<language type="rng" territories="MZ" alt="secondary"/>
-		<language type="ro" scripts="Latn" territories="MD RO"/>
-		<language type="ro" scripts="Cyrl" territories="RS" alt="secondary"/>
+		<language type="ro" scripts="Latn"/>
+		<language type="ro" scripts="Cyrl" alt="secondary"/>
 		<language type="rob" scripts="Latn"/>
 		<language type="rof" scripts="Latn"/>
 		<language type="rom" scripts="Latn"/>
 		<language type="rom" scripts="Cyrl" alt="secondary"/>
 		<language type="rtm" scripts="Latn"/>
-		<language type="ru" scripts="Cyrl" territories="BY KG KZ RU UA"/>
-		<language type="ru" territories="BG DE EE IL LT LV PL SJ TJ UZ" alt="secondary"/>
+		<language type="ru" scripts="Cyrl"/>
 		<language type="rue" scripts="Cyrl"/>
 		<language type="rug" scripts="Latn"/>
 		<language type="rup" scripts="Latn"/>
-		<language type="rw" scripts="Latn" territories="RW"/>
-		<language type="rw" territories="UG" alt="secondary"/>
+		<language type="rw" scripts="Latn"/>
 		<language type="rwk" scripts="Latn"/>
 		<language type="ryu" scripts="Kana"/>
-		<language type="sa" scripts="Deva Gran Shrd Sidd Sinh" territories="IN" alt="secondary"/>
+		<language type="sa" scripts="Deva Gran Shrd Sidd Sinh" alt="secondary"/>
 		<language type="sad" scripts="Latn"/>
 		<language type="saf" scripts="Latn"/>
 		<language type="sah" scripts="Cyrl"/>
-		<language type="sah" territories="RU" alt="secondary"/>
 		<language type="sam" scripts="Samr Hebr" alt="secondary"/>
 		<language type="saq" scripts="Latn"/>
 		<language type="sas" scripts="Latn"/>
-		<language type="sas" territories="ID" alt="secondary"/>
 		<language type="sat" scripts="Olck"/>
-		<language type="sat" scripts="Beng Deva Latn Orya" territories="IN" alt="secondary"/>
-		<language type="sav" territories="SN" alt="secondary"/>
+		<language type="sat" scripts="Beng Deva Latn Orya" alt="secondary"/>
 		<language type="saz" scripts="Saur"/>
 		<language type="sbp" scripts="Latn"/>
 		<language type="sc" scripts="Latn"/>
-		<language type="sc" territories="IT" alt="secondary"/>
 		<language type="sck" scripts="Deva"/>
-		<language type="sck" territories="IN" alt="secondary"/>
 		<language type="scn" scripts="Latn"/>
 		<language type="sco" scripts="Latn"/>
-		<language type="sco" territories="GB" alt="secondary"/>
 		<language type="scs" scripts="Latn"/>
 		<language type="sd" scripts="Arab Deva"/>
-		<language type="sd" scripts="Khoj Sind" territories="IN PK" alt="secondary"/>
+		<language type="sd" scripts="Khoj Sind" alt="secondary"/>
 		<language type="sdc" scripts="Latn"/>
 		<language type="sdh" scripts="Arab"/>
-		<language type="sdh" territories="IR" alt="secondary"/>
 		<language type="se" scripts="Latn"/>
-		<language type="se" scripts="Cyrl" territories="NO" alt="secondary"/>
+		<language type="se" scripts="Cyrl" alt="secondary"/>
 		<language type="see" scripts="Latn"/>
 		<language type="sef" scripts="Latn"/>
-		<language type="sef" territories="CI" alt="secondary"/>
 		<language type="seh" scripts="Latn"/>
-		<language type="seh" territories="MZ" alt="secondary"/>
 		<language type="sei" scripts="Latn"/>
 		<language type="sel" scripts="Cyrl"/>
 		<language type="ses" scripts="Latn"/>
-		<language type="sg" scripts="Latn" territories="CF"/>
+		<language type="sg" scripts="Latn"/>
 		<language type="sga" scripts="Latn"/>
 		<language type="sga" scripts="Ogam" alt="secondary"/>
 		<language type="sgs" scripts="Latn"/>
 		<language type="shi" scripts="Tfng Latn Arab"/>
-		<language type="shi" territories="MA" alt="secondary"/>
 		<language type="shn" scripts="Mymr"/>
-		<language type="shn" territories="MM" alt="secondary"/>
-		<language type="si" scripts="Sinh" territories="LK"/>
+		<language type="si" scripts="Sinh"/>
 		<language type="sid" scripts="Latn"/>
-		<language type="sid" territories="ET" alt="secondary"/>
-		<language type="sk" scripts="Latn" territories="SK"/>
-		<language type="sk" territories="CZ RS" alt="secondary"/>
+		<language type="sk" scripts="Latn"/>
 		<language type="skr" scripts="Arab"/>
-		<language type="skr" territories="PK" alt="secondary"/>
-		<language type="sl" scripts="Latn" territories="SI"/>
-		<language type="sl" territories="AT" alt="secondary"/>
+		<language type="sl" scripts="Latn"/>
 		<language type="sli" scripts="Latn"/>
 		<language type="sly" scripts="Latn"/>
-		<language type="sm" scripts="Latn" territories="AS WS"/>
-		<language type="sm" territories="TK" alt="secondary"/>
+		<language type="sm" scripts="Latn"/>
 		<language type="sma" scripts="Latn"/>
 		<language type="smj" scripts="Latn"/>
 		<language type="smn" scripts="Latn"/>
 		<language type="smp" scripts="Samr"/>
 		<language type="sms" scripts="Latn"/>
-		<language type="sms" territories="FI" alt="secondary"/>
-		<language type="sn" scripts="Latn" territories="ZW"/>
+		<language type="sn" scripts="Latn"/>
 		<language type="snf" scripts="Latn"/>
-		<language type="snf" territories="SN" alt="secondary"/>
 		<language type="snk" scripts="Latn"/>
-		<language type="snk" territories="ML" alt="secondary"/>
-		<language type="so" scripts="Latn" territories="SO"/>
-		<language type="so" scripts="Arab Osma" territories="DJ ET" alt="secondary"/>
+		<language type="so" scripts="Latn"/>
+		<language type="so" scripts="Arab Osma" alt="secondary"/>
 		<language type="sou" scripts="Thai"/>
-		<language type="sou" territories="TH" alt="secondary"/>
-		<language type="sq" scripts="Latn" territories="AL XK"/>
-		<language type="sq" scripts="Elba" territories="MK RS" alt="secondary"/>
-		<language type="sr" scripts="Cyrl Latn" territories="BA ME RS XK"/>
+		<language type="sq" scripts="Latn"/>
+		<language type="sq" scripts="Elba" alt="secondary"/>
+		<language type="sr" scripts="Cyrl Latn"/>
 		<language type="srb" scripts="Latn"/>
 		<language type="srb" scripts="Sora" alt="secondary"/>
 		<language type="srn" scripts="Latn"/>
-		<language type="srn" territories="SR" alt="secondary"/>
 		<language type="srr" scripts="Latn"/>
-		<language type="srr" territories="SN" alt="secondary"/>
 		<language type="srx" scripts="Deva"/>
-		<language type="ss" scripts="Latn" territories="SZ"/>
-		<language type="ss" territories="ZA" alt="secondary"/>
+		<language type="ss" scripts="Latn"/>
 		<language type="ssy" scripts="Latn"/>
-		<language type="st" scripts="Latn" territories="LS"/>
-		<language type="st" territories="ZA" alt="secondary"/>
+		<language type="st" scripts="Latn"/>
 		<language type="stq" scripts="Latn"/>
+		<language type="stu" scripts="Lana"/>
+		<language type="stu" scripts="Tale" alt="secondary"/>
 		<language type="su" scripts="Latn"/>
-		<language type="su" scripts="Sund" territories="ID" alt="secondary"/>
+		<language type="su" scripts="Sund" alt="secondary"/>
 		<language type="suk" scripts="Latn"/>
-		<language type="suk" territories="TZ" alt="secondary"/>
 		<language type="sus" scripts="Latn"/>
-		<language type="sus" scripts="Arab" territories="GN" alt="secondary"/>
-		<language type="sv" scripts="Latn" territories="AX FI SE"/>
-		<language type="sw" scripts="Latn" territories="KE TZ UG"/>
-		<language type="sw" territories="CD" alt="secondary"/>
+		<language type="sus" scripts="Arab" alt="secondary"/>
+		<language type="suz" scripts="Deva"/>
+		<language type="suz" scripts="Sunu" alt="secondary"/>
+		<language type="sv" scripts="Latn"/>
+		<language type="sw" scripts="Latn"/>
 		<language type="swb" scripts="Arab"/>
-		<language type="swb" scripts="Latn" territories="YT" alt="secondary"/>
+		<language type="swb" scripts="Latn" alt="secondary"/>
 		<language type="swg" scripts="Latn"/>
 		<language type="swv" scripts="Deva"/>
-		<language type="swv" territories="IN" alt="secondary"/>
 		<language type="sxn" scripts="Latn"/>
 		<language type="syi" scripts="Latn"/>
 		<language type="syl" scripts="Beng"/>
-		<language type="syl" scripts="Sylo" territories="BD" alt="secondary"/>
+		<language type="syl" scripts="Sylo" alt="secondary"/>
 		<language type="syr" scripts="Syrc"/>
 		<language type="szl" scripts="Latn"/>
-		<language type="ta" scripts="Taml" territories="LK SG"/>
-		<language type="ta" territories="GB IN MY" alt="secondary"/>
+		<language type="ta" scripts="Taml"/>
 		<language type="tab" scripts="Cyrl"/>
 		<language type="taj" scripts="Deva"/>
 		<language type="taj" scripts="Tibt" alt="secondary"/>
 		<language type="tbw" scripts="Latn"/>
 		<language type="tbw" scripts="Tagb" alt="secondary"/>
 		<language type="tcy" scripts="Knda"/>
-		<language type="tcy" territories="IN" alt="secondary"/>
 		<language type="tdd" scripts="Tale"/>
 		<language type="tdg" scripts="Deva"/>
 		<language type="tdg" scripts="Tibt" alt="secondary"/>
 		<language type="tdh" scripts="Deva"/>
 		<language type="te" scripts="Telu"/>
-		<language type="te" territories="IN" alt="secondary"/>
 		<language type="tem" scripts="Latn"/>
-		<language type="tem" territories="SL" alt="secondary"/>
 		<language type="teo" scripts="Latn"/>
-		<language type="teo" territories="UG" alt="secondary"/>
 		<language type="ter" scripts="Latn"/>
-		<language type="tet" scripts="Latn" territories="TL"/>
-		<language type="tg" scripts="Cyrl Arab Latn" territories="TJ"/>
-		<language type="th" scripts="Thai" territories="TH"/>
+		<language type="tet" scripts="Latn"/>
+		<language type="tg" scripts="Cyrl Arab Latn"/>
+		<language type="th" scripts="Thai"/>
 		<language type="thl" scripts="Deva"/>
 		<language type="thq" scripts="Deva"/>
 		<language type="thr" scripts="Deva"/>
-		<language type="ti" scripts="Ethi" territories="ER"/>
-		<language type="ti" territories="ET" alt="secondary"/>
+		<language type="ti" scripts="Ethi"/>
 		<language type="tig" scripts="Ethi"/>
-		<language type="tig" territories="ER" alt="secondary"/>
 		<language type="tiv" scripts="Latn"/>
-		<language type="tiv" territories="NG" alt="secondary"/>
-		<language type="tk" scripts="Latn Arab Cyrl" territories="TM"/>
-		<language type="tk" territories="AF IR" alt="secondary"/>
-		<language type="tkl" scripts="Latn" territories="TK"/>
+		<language type="tk" scripts="Latn Arab Cyrl"/>
+		<language type="tkl" scripts="Latn"/>
 		<language type="tkr" scripts="Latn"/>
 		<language type="tkr" scripts="Cyrl" alt="secondary"/>
 		<language type="tkt" scripts="Deva"/>
 		<language type="tli" scripts="Latn"/>
 		<language type="tly" scripts="Latn"/>
-		<language type="tly" scripts="Arab Cyrl" territories="AZ" alt="secondary"/>
+		<language type="tly" scripts="Arab Cyrl" alt="secondary"/>
 		<language type="tmh" scripts="Latn"/>
-		<language type="tmh" territories="NE" alt="secondary"/>
-		<language type="tn" scripts="Latn" territories="BW"/>
-		<language type="tn" territories="ZA" alt="secondary"/>
+		<language type="tn" scripts="Latn"/>
 		<language type="tnr" scripts="Latn"/>
-		<language type="tnr" territories="SN" alt="secondary"/>
-		<language type="to" scripts="Latn" territories="TO"/>
+		<language type="to" scripts="Latn"/>
 		<language type="tog" scripts="Latn"/>
-		<language type="toi" territories="ZM" alt="secondary"/>
 		<language type="tok" scripts="Latn"/>
-		<language type="tpi" scripts="Latn" territories="PG"/>
-		<language type="tr" scripts="Latn" territories="CY TR"/>
-		<language type="tr" scripts="Arab" territories="DE" alt="secondary"/>
+		<language type="tpi" scripts="Latn"/>
+		<language type="tr" scripts="Latn"/>
+		<language type="tr" scripts="Arab" alt="secondary"/>
 		<language type="tru" scripts="Latn"/>
 		<language type="tru" scripts="Syrc" alt="secondary"/>
 		<language type="trv" scripts="Latn"/>
 		<language type="trw" scripts="Arab"/>
 		<language type="ts" scripts="Latn"/>
-		<language type="ts" territories="MZ ZA" alt="secondary"/>
 		<language type="tsd" scripts="Grek"/>
 		<language type="tsg" scripts="Latn"/>
-		<language type="tsg" territories="PH" alt="secondary"/>
 		<language type="tsi" scripts="Latn"/>
 		<language type="tsj" scripts="Tibt"/>
 		<language type="tt" scripts="Cyrl"/>
-		<language type="tt" territories="RU" alt="secondary"/>
 		<language type="ttj" scripts="Latn"/>
 		<language type="tts" scripts="Thai"/>
-		<language type="tts" territories="TH" alt="secondary"/>
 		<language type="ttt" scripts="Latn"/>
 		<language type="ttt" scripts="Arab Cyrl" alt="secondary"/>
 		<language type="tum" scripts="Latn"/>
-		<language type="tum" territories="MW" alt="secondary"/>
-		<language type="tvl" scripts="Latn" territories="TV"/>
+		<language type="tvl" scripts="Latn"/>
 		<language type="twq" scripts="Latn"/>
-		<language type="ty" scripts="Latn" territories="PF"/>
+		<language type="ty" scripts="Latn"/>
 		<language type="tyv" scripts="Cyrl"/>
-		<language type="tyv" territories="RU" alt="secondary"/>
-		<language type="tzm" scripts="Latn Tfng" territories="MA"/>
+		<language type="tzm" scripts="Latn Tfng"/>
 		<language type="ude" scripts="Cyrl"/>
 		<language type="udm" scripts="Cyrl"/>
-		<language type="udm" scripts="Latn" territories="RU" alt="secondary"/>
+		<language type="udm" scripts="Latn" alt="secondary"/>
 		<language type="ug" scripts="Arab Cyrl"/>
-		<language type="ug" scripts="Latn" territories="CN" alt="secondary"/>
+		<language type="ug" scripts="Latn" alt="secondary"/>
 		<language type="uga" scripts="Ugar"/>
-		<language type="uk" scripts="Cyrl" territories="UA"/>
-		<language type="uk" territories="RS" alt="secondary"/>
+		<language type="uk" scripts="Cyrl"/>
 		<language type="uli" scripts="Latn"/>
 		<language type="umb" scripts="Latn"/>
-		<language type="umb" territories="AO" alt="secondary"/>
-		<language type="und" territories="AQ CP HM" alt="secondary"/>
 		<language type="unr" scripts="Beng Deva"/>
-		<language type="unr" territories="IN" alt="secondary"/>
 		<language type="unx" scripts="Beng Deva"/>
-		<language type="ur" scripts="Arab" territories="PK"/>
-		<language type="ur" territories="GB IN" alt="secondary"/>
-		<language type="uz" scripts="Latn Cyrl Arab" territories="UZ"/>
-		<language type="uz" territories="AF" alt="secondary"/>
+		<language type="ur" scripts="Arab"/>
+		<language type="uz" scripts="Latn Cyrl Arab"/>
 		<language type="vai" scripts="Vaii Latn"/>
 		<language type="ve" scripts="Latn"/>
-		<language type="ve" territories="ZA" alt="secondary"/>
 		<language type="vec" scripts="Latn"/>
-		<language type="vec" territories="BR HR IT SI" alt="secondary"/>
 		<language type="vep" scripts="Latn"/>
-		<language type="vi" scripts="Latn" territories="VN"/>
-		<language type="vi" scripts="Hani" territories="US" alt="secondary"/>
+		<language type="vi" scripts="Latn"/>
+		<language type="vi" scripts="Hani" alt="secondary"/>
 		<language type="vic" scripts="Latn"/>
 		<language type="vls" scripts="Latn"/>
-		<language type="vls" territories="BE" alt="secondary"/>
 		<language type="vmf" scripts="Latn"/>
-		<language type="vmf" territories="DE" alt="secondary"/>
 		<language type="vmw" scripts="Latn"/>
-		<language type="vmw" territories="MZ" alt="secondary"/>
 		<language type="vo" scripts="Latn"/>
 		<language type="vot" scripts="Latn"/>
 		<language type="vro" scripts="Latn"/>
@@ -2390,29 +2135,21 @@ XXX Code for transations where no currency is involved
 		<language type="wa" scripts="Latn"/>
 		<language type="wae" scripts="Latn"/>
 		<language type="wal" scripts="Ethi"/>
-		<language type="wal" territories="ET" alt="secondary"/>
 		<language type="war" scripts="Latn"/>
-		<language type="war" territories="PH" alt="secondary"/>
 		<language type="was" scripts="Latn"/>
 		<language type="wbp" scripts="Latn"/>
 		<language type="wbq" scripts="Telu"/>
-		<language type="wbq" territories="IN" alt="secondary"/>
 		<language type="wbr" scripts="Deva"/>
-		<language type="wbr" territories="IN" alt="secondary"/>
 		<language type="wls" scripts="Latn"/>
-		<language type="wls" territories="WF" alt="secondary"/>
-		<language type="wni" scripts="Arab" territories="KM"/>
-		<language type="wo" scripts="Latn" territories="SN"/>
+		<language type="wni" scripts="Arab"/>
+		<language type="wo" scripts="Latn"/>
 		<language type="wo" scripts="Arab" alt="secondary"/>
 		<language type="wtm" scripts="Deva"/>
-		<language type="wtm" territories="IN" alt="secondary"/>
 		<language type="wuu" scripts="Hans"/>
-		<language type="wuu" territories="CN" alt="secondary"/>
 		<language type="xal" scripts="Cyrl"/>
 		<language type="xav" scripts="Latn"/>
 		<language type="xcr" scripts="Cari"/>
 		<language type="xh" scripts="Latn"/>
-		<language type="xh" territories="ZA" alt="secondary"/>
 		<language type="xlc" scripts="Lyci"/>
 		<language type="xld" scripts="Lydi"/>
 		<language type="xmf" scripts="Geor"/>
@@ -2420,9 +2157,7 @@ XXX Code for transations where no currency is involved
 		<language type="xmr" scripts="Merc"/>
 		<language type="xna" scripts="Narb"/>
 		<language type="xnr" scripts="Deva"/>
-		<language type="xnr" territories="IN" alt="secondary"/>
 		<language type="xog" scripts="Latn"/>
-		<language type="xog" territories="UG" alt="secondary"/>
 		<language type="xpr" scripts="Prti"/>
 		<language type="xsa" scripts="Sarb"/>
 		<language type="xsr" scripts="Deva"/>
@@ -2432,36 +2167,34 @@ XXX Code for transations where no currency is involved
 		<language type="yav" scripts="Latn"/>
 		<language type="ybb" scripts="Latn"/>
 		<language type="yi" scripts="Hebr"/>
-		<language type="yo" scripts="Latn" territories="NG"/>
+		<language type="yo" scripts="Latn"/>
 		<language type="yrk" scripts="Cyrl"/>
 		<language type="yrl" scripts="Latn"/>
 		<language type="yua" scripts="Latn"/>
-		<language type="yue" scripts="Hant Hans" territories="MO"/>
-		<language type="yue" territories="CN HK" alt="secondary"/>
+		<language type="yue" scripts="Hant"/>
+		<language type="yue" scripts="Hans" alt="secondary"/>
 		<language type="za" scripts="Latn"/>
-		<language type="za" scripts="Hans" territories="CN" alt="secondary"/>
+		<language type="za" scripts="Hans" alt="secondary"/>
 		<language type="zag" scripts="Latn"/>
 		<language type="zap" scripts="Latn"/>
-		<language type="zdj" scripts="Arab" territories="KM"/>
+		<language type="zdj" scripts="Arab"/>
 		<language type="zea" scripts="Latn"/>
 		<language type="zen" scripts="Tfng"/>
 		<language type="zgh" scripts="Tfng"/>
-		<language type="zgh" territories="MA" alt="secondary"/>
-		<language type="zh" scripts="Hans Hant" territories="CN HK MO SG TW"/>
-		<language type="zh" scripts="Bopo Latn Phag" territories="CA ID MY TH US VN" alt="secondary"/>
+		<language type="zh" scripts="Hans"/>
+		<language type="zh" scripts="Hant Bopo Latn Phag" alt="secondary"/>
 		<language type="zmi" scripts="Latn"/>
 		<language type="zu" scripts="Latn"/>
-		<language type="zu" territories="ZA" alt="secondary"/>
 		<language type="zun" scripts="Latn"/>
 		<language type="zza" scripts="Latn"/>
-		<language type="zza" territories="TR" alt="secondary"/>
 	</languageData>
 	<scriptData>
 		<scriptVariant type="compound" id='Hanb' base='Hani Bopo'/> <!-- Han with Bopomofo (alias for Han + Bopomofo) -->
 		<scriptVariant type="compound" id='Jpan' base='Hani Hira Kana'/> <!-- Japanese (alias for Han + Hiragana + Katakana) -->
 		<scriptVariant type="compound" id='Hrkt' base='Hira Kana'/> <!-- Japanese syllabaries (alias for Hiragana + Katakana) -->
 		<scriptVariant type="compound" id='Kore' base='Hang Hani'/> <!-- Korean (alias for Hangul + Han) -->
-	
+		<scriptVariant type="compound" id='Hntl' base='Hant Latn'/> <!-- Han (Traditional variant) with Latin (alias for Hant + Latn) -->
+
 		<scriptVariant type="visual" id='Aran' base='Arab'/> <!-- Arabic (Nastaliq variant) -->
 		<scriptVariant type="visual" id='Cyrs' base='Cyrl'/> <!-- Cyrillic (Old Church Slavonic variant) -->
 		<scriptVariant type="visual" id='Latf' base='Latn'/> <!-- Latin (Fraktur variant) -->
@@ -2469,7 +2202,7 @@ XXX Code for transations where no currency is involved
 		<scriptVariant type="visual" id='Syrn' base='Syrc'/> <!-- Syriac (Eastern variant) -->
 		<scriptVariant type="visual" id='Syre' base='Syrc'/> <!-- Syriac (Estrangelo variant) -->
 		<scriptVariant type="visual" id='Syrj' base='Syrc'/> <!-- Syriac (Western variant) -->
-	
+
 		<scriptVariant type="subset" id='Jamo' base='Hang'/> <!-- Jamo (alias for Jamo subset of Hangul) -->
 		<scriptVariant type="subset" id='Hans' base='Hani'/> <!-- Han (Simplified variant) -->
 		<scriptVariant type="subset" id='Hant' base='Hani'/> <!-- Han (Traditional variant) -->
@@ -2517,8 +2250,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="mk" populationPercent="0.47"/>	<!--Macedonian-->
 		</territory>
 		<territory type="AM" gdp="57730000000" literacyPercent="99.6" population="2976770">	<!--Armenia-->
-			<languagePopulation type="hy" populationPercent="98" officialStatus="official"/>	<!--Armenian-->
-			<languagePopulation type="ku" populationPercent="3.3"/>	<!--Kurdish-->
+			<languagePopulation type="hy" populationPercent="99" officialStatus="official" references="R1041"/>	<!--Armenian-->
+			<languagePopulation type="ru" populationPercent="65" references="R1041"/>	<!--Russian-->
+			<languagePopulation type="ku" writingPercent="5" populationPercent="3.3" references="R1346"/>	<!--Kurdish-->
+			<languagePopulation type="ku_Cyrl" populationPercent="3.3" references="R1376"/>	<!--Kurdish (Cyrillic)-->
 			<languagePopulation type="az" populationPercent="0" references="R1290"/>	<!--Azerbaijani-->
 		</territory>
 		<territory type="AO" gdp="265900000000" literacyPercent="70.4" population="37202100">	<!--Angola-->
@@ -2569,7 +2304,8 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="az" populationPercent="89" officialStatus="official" references="R1120"/>	<!--Azerbaijani-->
 			<languagePopulation type="az_Cyrl" populationPercent="9.9" officialStatus="official" references="R1121"/>	<!--Azerbaijani (Cyrillic)-->
 			<languagePopulation type="tly" populationPercent="9.8"/>	<!--Talysh-->
-			<languagePopulation type="ku" populationPercent="0.24"/>	<!--Kurdish-->
+			<languagePopulation type="ku" writingPercent="5" populationPercent="0.24" references="R1377"/>	<!--Kurdish-->
+			<languagePopulation type="ku_Cyrl" populationPercent="0.24" references="R1378"/>	<!--Kurdish (Cyrillic)-->
 			<languagePopulation type="ttt" populationPercent="0.22"/>	<!--Muslim Tat-->
 			<languagePopulation type="tkr" populationPercent="0.16"/>	<!--Tsakhur-->
 		</territory>
@@ -2690,74 +2426,78 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="af" populationPercent="0.24"/>	<!--Afrikaans-->
 		</territory>
 		<territory type="BY" gdp="254400000000" literacyPercent="99.6" population="9501450">	<!--Belarus-->
-			<languagePopulation type="be" populationPercent="100" officialStatus="official"/>	<!--Belarusian-->
-			<languagePopulation type="ru" populationPercent="12" officialStatus="official"/>	<!--Russian-->
+			<languagePopulation type="ru" populationPercent="71" officialStatus="official" references="R1130"/>	<!--Russian-->
+			<languagePopulation type="be" populationPercent="26" officialStatus="official" references="R1130"/>	<!--Belarusian-->
 		</territory>
 		<territory type="BZ" gdp="5257000000" literacyPercent="76.9" population="415789">	<!--Belize-->
-			<languagePopulation type="en" populationPercent="100" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="es" populationPercent="28"/>	<!--Spanish-->
+			<languagePopulation type="en" populationPercent="77" officialStatus="official" references="R1161"/>	<!--English-->
+			<languagePopulation type="es" populationPercent="55" references="R1161"/>	<!--Spanish-->
+			<languagePopulation type="bzj" populationPercent="50" references="R1161"/>	<!--Belize Kriol English-->
+			<languagePopulation type="kek" populationPercent="6.5" references="R1161"/>	<!--Qʼeqchiʼ-->
+			<languagePopulation type="mop" populationPercent="4" references="R1161"/>	<!--Mopán Maya-->
+			<languagePopulation type="cab" populationPercent="1.9" references="R1161"/>	<!--Garifuna-->
 		</territory>
 		<territory type="CA" gdp="2238000000000" literacyPercent="99" population="38794800">	<!--Canada-->
-			<languagePopulation type="en" populationPercent="87" officialStatus="official" references="R1019"/>	<!--English-->
+			<languagePopulation type="en" populationPercent="87" officialStatus="official" references="R1374"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1341"/>	<!--French-->
-			<languagePopulation type="es" populationPercent="3.2" references="R1019"/>	<!--Spanish-->
-			<languagePopulation type="zh" populationPercent="2.7" references="R1019"/>	<!--Chinese-->
-			<languagePopulation type="pa" populationPercent="2.6" references="R1019"/>	<!--Punjabi-->
-			<languagePopulation type="ar" populationPercent="2.3" references="R1019"/>	<!--Arabic-->
-			<languagePopulation type="hi" populationPercent="2.1" references="R1019"/>	<!--Hindi-->
-			<languagePopulation type="fil" populationPercent="2" references="R1019"/>	<!--Filipino-->
-			<languagePopulation type="yue" populationPercent="2" references="R1019"/>	<!--Cantonese-->
-			<languagePopulation type="it" populationPercent="1.5" references="R1019"/>	<!--Italian-->
-			<languagePopulation type="de" populationPercent="1.2" references="R1019"/>	<!--German-->
-			<languagePopulation type="ur" populationPercent="1.1" references="R1019"/>	<!--Urdu-->
-			<languagePopulation type="pt" populationPercent="0.93" references="R1019"/>	<!--Portuguese-->
-			<languagePopulation type="ru" populationPercent="0.85" references="R1019"/>	<!--Russian-->
-			<languagePopulation type="ta" populationPercent="0.65" references="R1019"/>	<!--Tamil-->
-			<languagePopulation type="vi" populationPercent="0.64" references="R1019"/>	<!--Vietnamese-->
-			<languagePopulation type="fa" populationPercent="0.61" references="R1019"/>	<!--Persian-->
-			<languagePopulation type="gu" populationPercent="0.58" references="R1019"/>	<!--Gujarati-->
-			<languagePopulation type="pl" populationPercent="0.56" references="R1019"/>	<!--Polish-->
-			<languagePopulation type="ko" populationPercent="0.56" references="R1019"/>	<!--Korean-->
-			<languagePopulation type="el" populationPercent="0.4" references="R1019"/>	<!--Greek-->
-			<languagePopulation type="uk" populationPercent="0.36" references="R1019"/>	<!--Ukrainian-->
-			<languagePopulation type="bn" populationPercent="0.33" references="R1019"/>	<!--Bangla-->
-			<languagePopulation type="ro" populationPercent="0.32" references="R1019"/>	<!--Romanian-->
-			<languagePopulation type="nl" populationPercent="0.3" references="R1019"/>	<!--Dutch-->
-			<languagePopulation type="ja" populationPercent="0.27" references="R1019"/>	<!--Japanese-->
-			<languagePopulation type="sr" populationPercent="0.23" references="R1019"/>	<!--Serbian-->
-			<languagePopulation type="tr" populationPercent="0.22" references="R1019"/>	<!--Turkish-->
-			<languagePopulation type="hr" populationPercent="0.2" references="R1019"/>	<!--Croatian-->
-			<languagePopulation type="hu" populationPercent="0.18" references="R1019"/>	<!--Hungarian-->
-			<languagePopulation type="so" populationPercent="0.16" references="R1019"/>	<!--Somali-->
-			<languagePopulation type="iu" literacyPercent="30" populationPercent="0.11" officialStatus="official_regional" references="R1019"/>	<!--Inuktitut-->
-			<languagePopulation type="iu_Latn" literacyPercent="30" populationPercent="0.11" officialStatus="official_regional" references="R1019"/>	<!--Inuktitut (Latin)-->
-			<languagePopulation type="pdt" populationPercent="0.11" references="R1019"/>	<!--Plautdietsch-->
-			<languagePopulation type="oj" populationPercent="0.072" references="R1019"/>	<!--Ojibwa-->
-			<languagePopulation type="ojs" populationPercent="0.042" references="R1019"/>	<!--Oji-Cree-->
-			<languagePopulation type="crk" populationPercent="0.033" officialStatus="official_regional" references="R1019"/>	<!--Plains Cree-->
-			<languagePopulation type="chp" populationPercent="0.032" officialStatus="official_regional" references="R1019"/>	<!--Chipewyan-->
-			<languagePopulation type="moe" populationPercent="0.03" references="R1019"/>	<!--Innu-aimun-->
-			<languagePopulation type="mic" populationPercent="0.024" references="R1019"/>	<!--Mi'kmaw-->
-			<languagePopulation type="atj" populationPercent="0.018" references="R1019"/>	<!--Atikamekw-->
-			<languagePopulation type="bla" populationPercent="0.017" references="R1019"/>	<!--Siksiká-->
-			<languagePopulation type="cr" populationPercent="0.013" references="R1019"/>	<!--Cree-->
-			<languagePopulation type="crl" populationPercent="0.013" references="R1019"/>	<!--Northern East Cree-->
-			<languagePopulation type="csw" populationPercent="0.012" references="R1019"/>	<!--Swampy Cree-->
-			<languagePopulation type="war" populationPercent="0.012" references="R1019"/>	<!--Waray-->
-			<languagePopulation type="ojw" populationPercent="0.0094" references="R1019"/>	<!--Western Ojibwa-->
-			<languagePopulation type="den" populationPercent="0.006" officialStatus="official_regional" references="R1019"/>	<!--Slave-->
-			<languagePopulation type="dgr" populationPercent="0.0055" officialStatus="official_regional" references="R1019"/>	<!--Dogrib-->
-			<languagePopulation type="crg" populationPercent="0.0049" references="R1019"/>	<!--Michif-->
-			<languagePopulation type="moh" populationPercent="0.0041" references="R1019"/>	<!--Mohawk-->
-			<languagePopulation type="dak" populationPercent="0.0039" references="R1019"/>	<!--Dakota-->
-			<languagePopulation type="hur" populationPercent="0.0036" references="R1019"/>	<!--Halkomelem-->
-			<languagePopulation type="nsk" populationPercent="0.0027" references="R1019"/>	<!--Naskapi-->
-			<languagePopulation type="clc" populationPercent="0.0022" references="R1019"/>	<!--Chilcotin-->
-			<languagePopulation type="kwk" populationPercent="0.0021" references="R1019"/>	<!--Kwakʼwala-->
-			<languagePopulation type="pqm" populationPercent="0.0021" references="R1019"/>	<!--Maliseet-Passamaquoddy-->
-			<languagePopulation type="oka" populationPercent="0.0018" references="R1019"/>	<!--Okanagan-->
-			<languagePopulation type="lil" populationPercent="0.0015" references="R1019"/>	<!--Lillooet-->
-			<languagePopulation type="gwi" populationPercent="0.0008" officialStatus="official_regional" references="R1019"/>	<!--Gwichʼin-->
+			<languagePopulation type="es" populationPercent="3.2" references="R1374"/>	<!--Spanish-->
+			<languagePopulation type="zh" populationPercent="2.7" references="R1374"/>	<!--Chinese-->
+			<languagePopulation type="pa" populationPercent="2.6" references="R1374"/>	<!--Punjabi-->
+			<languagePopulation type="ar" populationPercent="2.3" references="R1374"/>	<!--Arabic-->
+			<languagePopulation type="hi" populationPercent="2.1" references="R1374"/>	<!--Hindi-->
+			<languagePopulation type="fil" populationPercent="2" references="R1374"/>	<!--Filipino-->
+			<languagePopulation type="yue" populationPercent="2" references="R1374"/>	<!--Cantonese-->
+			<languagePopulation type="it" populationPercent="1.5" references="R1374"/>	<!--Italian-->
+			<languagePopulation type="de" populationPercent="1.2" references="R1374"/>	<!--German-->
+			<languagePopulation type="ur" populationPercent="1.1" references="R1374"/>	<!--Urdu-->
+			<languagePopulation type="pt" populationPercent="0.93" references="R1374"/>	<!--Portuguese-->
+			<languagePopulation type="ru" populationPercent="0.85" references="R1374"/>	<!--Russian-->
+			<languagePopulation type="ta" populationPercent="0.65" references="R1374"/>	<!--Tamil-->
+			<languagePopulation type="vi" populationPercent="0.64" references="R1374"/>	<!--Vietnamese-->
+			<languagePopulation type="fa" populationPercent="0.61" references="R1374"/>	<!--Persian-->
+			<languagePopulation type="gu" populationPercent="0.58" references="R1374"/>	<!--Gujarati-->
+			<languagePopulation type="pl" populationPercent="0.56" references="R1374"/>	<!--Polish-->
+			<languagePopulation type="ko" populationPercent="0.56" references="R1374"/>	<!--Korean-->
+			<languagePopulation type="el" populationPercent="0.4" references="R1374"/>	<!--Greek-->
+			<languagePopulation type="uk" populationPercent="0.36" references="R1374"/>	<!--Ukrainian-->
+			<languagePopulation type="bn" populationPercent="0.33" references="R1374"/>	<!--Bangla-->
+			<languagePopulation type="ro" populationPercent="0.32" references="R1374"/>	<!--Romanian-->
+			<languagePopulation type="nl" populationPercent="0.3" references="R1374"/>	<!--Dutch-->
+			<languagePopulation type="ja" populationPercent="0.27" references="R1374"/>	<!--Japanese-->
+			<languagePopulation type="sr" populationPercent="0.23" references="R1374"/>	<!--Serbian-->
+			<languagePopulation type="tr" populationPercent="0.22" references="R1374"/>	<!--Turkish-->
+			<languagePopulation type="hr" populationPercent="0.2" references="R1374"/>	<!--Croatian-->
+			<languagePopulation type="hu" populationPercent="0.18" references="R1374"/>	<!--Hungarian-->
+			<languagePopulation type="so" populationPercent="0.16" references="R1374"/>	<!--Somali-->
+			<languagePopulation type="iu" literacyPercent="30" populationPercent="0.11" officialStatus="official_regional" references="R1374"/>	<!--Inuktitut-->
+			<languagePopulation type="iu_Latn" literacyPercent="30" populationPercent="0.11" officialStatus="official_regional" references="R1374"/>	<!--Inuktitut (Latin)-->
+			<languagePopulation type="pdt" populationPercent="0.11" references="R1374"/>	<!--Plautdietsch-->
+			<languagePopulation type="oj" populationPercent="0.072" references="R1374"/>	<!--Ojibwa-->
+			<languagePopulation type="ojs" populationPercent="0.042" references="R1374"/>	<!--Oji-Cree-->
+			<languagePopulation type="crk" populationPercent="0.033" officialStatus="official_regional" references="R1374"/>	<!--Plains Cree-->
+			<languagePopulation type="chp" populationPercent="0.032" officialStatus="official_regional" references="R1374"/>	<!--Chipewyan-->
+			<languagePopulation type="moe" populationPercent="0.03" references="R1374"/>	<!--Innu-aimun-->
+			<languagePopulation type="mic" populationPercent="0.024" references="R1374"/>	<!--Mi'kmaw-->
+			<languagePopulation type="atj" populationPercent="0.018" references="R1374"/>	<!--Atikamekw-->
+			<languagePopulation type="bla" populationPercent="0.017" references="R1374"/>	<!--Siksiká-->
+			<languagePopulation type="cr" populationPercent="0.013" references="R1374"/>	<!--Cree-->
+			<languagePopulation type="crl" populationPercent="0.013" references="R1374"/>	<!--Northern East Cree-->
+			<languagePopulation type="csw" populationPercent="0.012" references="R1374"/>	<!--Swampy Cree-->
+			<languagePopulation type="war" populationPercent="0.012" references="R1374"/>	<!--Waray-->
+			<languagePopulation type="ojw" populationPercent="0.0094" references="R1374"/>	<!--Western Ojibwa-->
+			<languagePopulation type="den" populationPercent="0.006" officialStatus="official_regional" references="R1374"/>	<!--Slave-->
+			<languagePopulation type="dgr" populationPercent="0.0055" officialStatus="official_regional" references="R1374"/>	<!--Dogrib-->
+			<languagePopulation type="crg" populationPercent="0.0049" references="R1374"/>	<!--Michif-->
+			<languagePopulation type="moh" populationPercent="0.0041" references="R1374"/>	<!--Mohawk-->
+			<languagePopulation type="dak" populationPercent="0.0039" references="R1374"/>	<!--Dakota-->
+			<languagePopulation type="hur" populationPercent="0.0036" references="R1374"/>	<!--Halkomelem-->
+			<languagePopulation type="nsk" populationPercent="0.0027" references="R1374"/>	<!--Naskapi-->
+			<languagePopulation type="clc" populationPercent="0.0022" references="R1374"/>	<!--Chilcotin-->
+			<languagePopulation type="kwk" populationPercent="0.0021" references="R1374"/>	<!--Kwakʼwala-->
+			<languagePopulation type="pqm" populationPercent="0.0021" references="R1374"/>	<!--Maliseet-Passamaquoddy-->
+			<languagePopulation type="oka" populationPercent="0.0018" references="R1374"/>	<!--Okanagan-->
+			<languagePopulation type="lil" populationPercent="0.0015" references="R1374"/>	<!--Lillooet-->
+			<languagePopulation type="gwi" populationPercent="0.0008" officialStatus="official_regional" references="R1374"/>	<!--Gwichʼin-->
 		</territory>
 		<territory type="CC" gdp="35090000" literacyPercent="99" population="593">	<!--Cocos (Keeling) Islands-->
 			<languagePopulation type="ms_Arab" populationPercent="84"/>	<!--Malay (Arabic)-->
@@ -2784,7 +2524,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="CH" gdp="733800000000" literacyPercent="99" population="8860570">	<!--Switzerland-->
 			<languagePopulation type="de" populationPercent="76" officialStatus="official" references="R1345"/>	<!--German-->
-			<languagePopulation type="gsw" writingPercent="5" populationPercent="66" officialStatus="de_facto_official" references="R1346"/>	<!--Swiss German-->
+			<languagePopulation type="gsw" writingPercent="5" populationPercent="66" officialStatus="de_facto_official" references="R1019"/>	<!--Swiss German-->
 			<languagePopulation type="en" populationPercent="45" references="R1345"/>	<!--English-->
 			<languagePopulation type="fr" populationPercent="39" officialStatus="official" references="R1345"/>	<!--French-->
 			<languagePopulation type="it" populationPercent="15" officialStatus="official" references="R1345"/>	<!--Italian-->
@@ -2861,12 +2601,14 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="nxq" populationPercent="0.024"/>	<!--Naxi-->
 			<languagePopulation type="khb" populationPercent="0.019" references="R1094"/>	<!--Lü-->
 			<languagePopulation type="tdd" populationPercent="0.019"/>	<!--Tai Nüa-->
+			<languagePopulation type="mww" populationPercent="0.017" references="R1385"/>	<!--Hmong Daw-->
 			<languagePopulation type="lcp" populationPercent="0.0058"/>	<!--Western Lawa-->
 			<languagePopulation type="en" populationPercent="0.0045"/>	<!--English-->
 			<languagePopulation type="hnj" populationPercent="0.004" references="R1107"/>	<!--Hmong Njua-->
 			<languagePopulation type="ru" populationPercent="0.001"/>	<!--Russian-->
 			<languagePopulation type="vi" populationPercent="0.0005"/>	<!--Vietnamese-->
 			<languagePopulation type="uz_Cyrl" populationPercent="0.0004"/>	<!--Uzbek (Cyrillic)-->
+			<languagePopulation type="stu_Tale" populationPercent="0" references="R1386"/>	<!--Samtao (Tai Le)-->
 			<languagePopulation type="lzh" populationPercent="0" references="R1150"/>	<!--Literary Chinese-->
 		</territory>
 		<territory type="CO" gdp="978000000000" literacyPercent="93.6" population="49588400">	<!--Colombia-->
@@ -2970,8 +2712,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="arq" populationPercent="83"/>	<!--Algerian Arabic-->
 			<languagePopulation type="ar" populationPercent="74" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="33" officialStatus="official" references="R1349"/>	<!--French-->
+			<languagePopulation type="mey" populationPercent="11" references="R1379"/>	<!--Hassaniyya-->
 			<languagePopulation type="kab" literacyPercent="10" populationPercent="7.8" references="R1293"/>	<!--Kabyle-->
 			<languagePopulation type="en" populationPercent="7"/>	<!--English-->
+			<languagePopulation type="mzb" populationPercent="0.36" references="R1386"/>	<!--Tumzabt-->
+			<languagePopulation type="grr" populationPercent="0.026" references="R1386"/>	<!--Taznatit-->
 		</territory>
 		<territory type="EA" gdp="7113000000" literacyPercent="97.7" population="150000">	<!--Ceuta & Melilla-->
 			<languagePopulation type="es" populationPercent="98" officialStatus="official" references="R1067"/>	<!--Spanish-->
@@ -2998,6 +2743,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="EH" gdp="906500000" literacyPercent="50" population="652271">	<!--Western Sahara-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official"/>	<!--Arabic-->
+			<languagePopulation type="mey" populationPercent="0.0002" references="R1150"/>	<!--Hassaniyya-->
 		</territory>
 		<territory type="ER" gdp="9702000000" literacyPercent="68.9" population="6343960">	<!--Eritrea-->
 			<languagePopulation type="ti" populationPercent="60" officialStatus="de_facto_official" references="R1223"/>	<!--Tigrinya-->
@@ -3080,6 +2826,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="nl" populationPercent="0.13"/>	<!--Dutch-->
 			<languagePopulation type="eu" populationPercent="0.13"/>	<!--Basque-->
 			<languagePopulation type="frp" populationPercent="0.094"/>	<!--Arpitan-->
+			<languagePopulation type="mww" populationPercent="0.015" references="R1385"/>	<!--Hmong Daw-->
 			<languagePopulation type="ia" populationPercent="0.0002" references="R1298"/>	<!--Interlingua-->
 		</territory>
 		<territory type="GA" gdp="48200000000" literacyPercent="89" population="2455110">	<!--Gabon-->
@@ -3110,6 +2857,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ga" populationPercent="0.15" officialStatus="official_regional" references="R1330"/>	<!--Irish-->
 			<languagePopulation type="gd" writingPercent="5" populationPercent="0.11" officialStatus="official_regional" references="R1330"/>	<!--Scottish Gaelic-->
 			<languagePopulation type="kw" populationPercent="0.0029" references="R1140"/>	<!--Cornish-->
+			<languagePopulation type="pi" populationPercent="0.0002" references="R1073"/>	<!--Pali-->
 			<languagePopulation type="en_Shaw" populationPercent="0"/>	<!--English (Shavian)-->
 		</territory>
 		<territory type="GD" gdp="2008000000" literacyPercent="96" population="114621">	<!--Grenada-->
@@ -3122,7 +2870,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="hy" populationPercent="7" references="R1038"/>	<!--Armenian-->
 			<languagePopulation type="ab" populationPercent="2.2" officialStatus="official_regional"/>	<!--Abkhazian-->
 			<languagePopulation type="os" populationPercent="2.2" officialStatus="official_regional"/>	<!--Ossetic-->
-			<languagePopulation type="ku" populationPercent="0.89"/>	<!--Kurdish-->
+			<languagePopulation type="ku_Cyrl" populationPercent="0.89"/>	<!--Kurdish (Cyrillic)-->
 			<languagePopulation type="lzz_Geor" populationPercent="0.002" references="R1334"/>	<!--Laz (Georgian)-->
 		</territory>
 		<territory type="GF" gdp="1551000000" literacyPercent="83" population="199509">	<!--French Guiana-->
@@ -3201,8 +2949,32 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="en" populationPercent="100" officialStatus="official" references="R1338"/>	<!--English-->
 		</territory>
 		<territory type="GT" gdp="223200000000" literacyPercent="75.9" population="18255200">	<!--Guatemala-->
-			<languagePopulation type="es" populationPercent="93" officialStatus="official" references="R1227"/>	<!--Spanish-->
-			<languagePopulation type="quc" populationPercent="7" officialStatus="official_regional" references="R1289"/>	<!--Kʼicheʼ-->
+			<languagePopulation type="es" populationPercent="88" officialStatus="official" references="R1168"/>	<!--Spanish-->
+			<languagePopulation type="cak" populationPercent="8.8" officialStatus="official_regional" references="R1170"/>	<!--Kaqchikel-->
+			<languagePopulation type="kek" populationPercent="8.8" references="R1168"/>	<!--Qʼeqchiʼ-->
+			<languagePopulation type="quc" populationPercent="8.6" officialStatus="official_regional" references="R1252"/>	<!--Kʼicheʼ-->
+			<languagePopulation type="mam" populationPercent="4.6" references="R1168"/>	<!--Mam-->
+			<languagePopulation type="en" populationPercent="3.1" references="R1168"/>	<!--English-->
+			<languagePopulation type="kjb" populationPercent="1.2" references="R1168"/>	<!--Q'anjob'al-->
+			<languagePopulation type="poh" populationPercent="1.2" references="R1168"/>	<!--Poqomchi'-->
+			<languagePopulation type="acr" populationPercent="1.1" references="R1168"/>	<!--Achi-->
+			<languagePopulation type="ixl" populationPercent="0.89" officialStatus="official_regional" references="R1271"/>	<!--Ixil-->
+			<languagePopulation type="tzj" populationPercent="0.61" references="R1168"/>	<!--Tz'utujil-->
+			<languagePopulation type="knj" populationPercent="0.58" references="R1168"/>	<!--Western Kanjobal-->
+			<languagePopulation type="cac" populationPercent="0.43" references="R1168"/>	<!--Chuj-->
+			<languagePopulation type="jac" populationPercent="0.31" references="R1168"/>	<!--Popti'-->
+			<languagePopulation type="agu" populationPercent="0.26" references="R1168"/>	<!--Aguacateco-->
+			<languagePopulation type="caa" populationPercent="0.13" officialStatus="official_regional" references="R1329"/>	<!--Chortí-->
+			<languagePopulation type="poc" populationPercent="0.09" references="R1168"/>	<!--Poqomam-->
+			<languagePopulation type="quv" populationPercent="0.054" officialStatus="official_regional" references="R1271"/>	<!--Sacapulteco-->
+			<languagePopulation type="usp" populationPercent="0.045" officialStatus="official_regional" references="R1271"/>	<!--Uspanteco-->
+			<languagePopulation type="qum" populationPercent="0.036" references="R1168"/>	<!--Sipacapense-->
+			<languagePopulation type="cab" populationPercent="0.027" references="R1168"/>	<!--Garifuna-->
+			<languagePopulation type="ttc" populationPercent="0.027" references="R1168"/>	<!--Tektiteko-->
+			<languagePopulation type="xin" populationPercent="0.027" officialStatus="official_regional" references="R1331"/>	<!--Xinca-->
+			<languagePopulation type="ckz" populationPercent="0.018" references="R1371"/>	<!--Cakchiquel-Quiché Mixed Language-->
+			<languagePopulation type="mop" populationPercent="0.018" references="R1168"/>	<!--Mopán Maya-->
+			<languagePopulation type="itz" populationPercent="0.0091" references="R1168"/>	<!--Itzá-->
 		</territory>
 		<territory type="GU" gdp="5793000000" literacyPercent="99" population="169532">	<!--Guam-->
 			<languagePopulation type="en" populationPercent="91" officialStatus="de_facto_official"/>	<!--English-->
@@ -3228,7 +3000,8 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="und" literacyPercent="100" populationPercent="100" references="R1064"/>	<!--Unknown language-->
 		</territory>
 		<territory type="HN" gdp="68850000000" literacyPercent="85.1" population="9529190">	<!--Honduras-->
-			<languagePopulation type="es" populationPercent="78" officialStatus="official"/>	<!--Spanish-->
+			<languagePopulation type="es" populationPercent="91" officialStatus="official" references="R1372"/>	<!--Spanish-->
+			<languagePopulation type="cab" populationPercent="0.47" references="R1373"/>	<!--Garifuna-->
 			<languagePopulation type="en" populationPercent="0.44"/>	<!--English-->
 		</territory>
 		<territory type="HR" gdp="159300000000" literacyPercent="98.9" population="4150120">	<!--Croatia-->
@@ -3392,6 +3165,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="kht" populationPercent="0.0006"/>	<!--Khamti-->
 			<languagePopulation type="dv" populationPercent="0.0003"/>	<!--Divehi-->
 			<languagePopulation type="dz" populationPercent="0.0002"/>	<!--Dzongkha-->
+			<languagePopulation type="pi_Deva" populationPercent="0" references="R1006"/>	<!--Pali (Devanagari)-->
 		</territory>
 		<territory type="IO" gdp="189200000" literacyPercent="99" population="3500">	<!--British Indian Ocean Territory-->
 			<languagePopulation type="en" literacyPercent="100" populationPercent="100" officialStatus="official" references="R1179"/>	<!--English-->
@@ -3399,7 +3173,8 @@ XXX Code for transations where no currency is involved
 		<territory type="IQ" gdp="572900000000" literacyPercent="78.5" population="42083400">	<!--Iraq-->
 			<languagePopulation type="ar" populationPercent="68" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="35"/>	<!--English-->
-			<languagePopulation type="ckb" populationPercent="20" officialStatus="official_regional" references="R1073"/>	<!--Central Kurdish-->
+			<languagePopulation type="ckb" populationPercent="12" officialStatus="official_regional" references="R1382"/>	<!--Central Kurdish-->
+			<languagePopulation type="ku_Arab" populationPercent="10" references="R1382"/>	<!--Kurdish (Arabic)-->
 			<languagePopulation type="az_Arab" populationPercent="1.8" officialStatus="official_regional"/>	<!--Azerbaijani (Arabic)-->
 			<languagePopulation type="fa" populationPercent="0.87"/>	<!--Persian-->
 			<languagePopulation type="lrc" populationPercent="0.61" references="R1310"/>	<!--Northern Luri-->
@@ -3410,8 +3185,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="az_Arab" populationPercent="24"/>	<!--Azerbaijani (Arabic)-->
 			<languagePopulation type="mzn" populationPercent="5"/>	<!--Mazanderani-->
 			<languagePopulation type="glk" populationPercent="4.6"/>	<!--Gilaki-->
-			<languagePopulation type="ckb" populationPercent="3.9" references="R1212"/>	<!--Central Kurdish-->
-			<languagePopulation type="sdh" populationPercent="3.7" references="R1312"/>	<!--Southern Kurdish-->
+			<languagePopulation type="sdh" populationPercent="4.5" references="R1383"/>	<!--Southern Kurdish-->
 			<languagePopulation type="tk" populationPercent="2.8"/>	<!--Turkmen-->
 			<languagePopulation type="lrc" literacyPercent="10" populationPercent="2.1"/>	<!--Northern Luri-->
 			<languagePopulation type="ar" populationPercent="2"/>	<!--Arabic-->
@@ -3421,6 +3195,8 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="luz" populationPercent="1.2"/>	<!--Southern Luri-->
 			<languagePopulation type="lki" populationPercent="0.76" references="R1212"/>	<!--Laki-->
 			<languagePopulation type="kaa" populationPercent="0.67" references="R1199"/>	<!--Kara-Kalpak-->
+			<languagePopulation type="ckb" populationPercent="0.63" references="R1383"/>	<!--Central Kurdish-->
+			<languagePopulation type="ku_Arab" populationPercent="0.56" references="R1383"/>	<!--Kurdish (Arabic)-->
 			<languagePopulation type="bgn" writingPercent="5" populationPercent="0.56" references="R1209"/>	<!--Western Balochi-->
 			<languagePopulation type="prd" populationPercent="0.5"/>	<!--Parsi-Dari-->
 			<languagePopulation type="hy" populationPercent="0.24"/>	<!--Armenian-->
@@ -3441,6 +3217,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sc" populationPercent="1.7"/>	<!--Sardinian-->
 			<languagePopulation type="de" populationPercent="1.6" references="R1251"/>	<!--German-->
 			<languagePopulation type="vec" populationPercent="1.3" officialStatus="official_regional" references="R1295"/>	<!--Venetian-->
+			<languagePopulation type="pms" populationPercent="1.1" references="R1375"/>	<!--Piedmontese-->
 			<languagePopulation type="nap" writingPercent="5" populationPercent="0.97" references="R1148"/>	<!--Neapolitan-->
 			<languagePopulation type="lij" populationPercent="0.86"/>	<!--Ligurian-->
 			<languagePopulation type="scn" writingPercent="5" populationPercent="0.82" references="R1149"/>	<!--Sicilian-->
@@ -3451,7 +3228,6 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lld" populationPercent="0.048" references="R1249"/>	<!--Ladin-->
 			<languagePopulation type="ca" populationPercent="0.035"/>	<!--Catalan-->
 			<languagePopulation type="el" populationPercent="0.035"/>	<!--Greek-->
-			<languagePopulation type="pms" populationPercent="0.01"/>	<!--Piedmontese-->
 			<languagePopulation type="hr" populationPercent="0.0057"/>	<!--Croatian-->
 			<languagePopulation type="mhn" populationPercent="0.0023"/>	<!--Mócheno-->
 			<languagePopulation type="rgn" populationPercent="0" references="R1150"/>	<!--Romagnol-->
@@ -3542,6 +3318,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lo" populationPercent="69" officialStatus="official"/>	<!--Lao-->
 			<languagePopulation type="kjg" populationPercent="5.8" references="R1230"/>	<!--Khmu-->
 			<languagePopulation type="hnj" populationPercent="3" references="R1107"/>	<!--Hmong Njua-->
+			<languagePopulation type="mww" populationPercent="2.3" references="R1385"/>	<!--Hmong Daw-->
 			<languagePopulation type="kdt" populationPercent="0.96" references="R1231"/>	<!--Kuy-->
 		</territory>
 		<territory type="LB" gdp="65820000000" literacyPercent="89.6" population="5364480">	<!--Lebanon-->
@@ -3564,12 +3341,21 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="si" populationPercent="68" officialStatus="official"/>	<!--Sinhala-->
 			<languagePopulation type="ta" populationPercent="15" officialStatus="official"/>	<!--Tamil-->
 			<languagePopulation type="en" populationPercent="10"/>	<!--English-->
+			<languagePopulation type="pi_Sinh" populationPercent="0" references="R1006"/>	<!--Pali (Sinhala)-->
 		</territory>
 		<territory type="LR" gdp="8884000000" literacyPercent="60.8" population="5437250">	<!--Liberia-->
 			<languagePopulation type="en" populationPercent="83" officialStatus="official" references="R1046"/>	<!--English-->
-			<languagePopulation type="kpe" populationPercent="14"/>	<!--Kpelle-->
-			<languagePopulation type="vai" populationPercent="2.6" references="R1271"/>	<!--Vai-->
-			<languagePopulation type="men" populationPercent="0.48"/>	<!--Mende-->
+			<languagePopulation type="lir" populationPercent="74" references="R1084"/>	<!--Liberian English-->
+			<languagePopulation type="kpe" populationPercent="20" references="R1124"/>	<!--Kpelle-->
+			<languagePopulation type="bsq" populationPercent="14" references="R1124"/>	<!--Bassa-->
+			<languagePopulation type="kro" populationPercent="10" references="R1124"/>	<!--Kru-->
+			<languagePopulation type="grb" populationPercent="9.9" references="R1124"/>	<!--Grebo-->
+			<languagePopulation type="dnj" literacyPercent="1" populationPercent="7.9" references="R1124"/>	<!--Dan-->
+			<languagePopulation type="mev" populationPercent="7.2" references="R1124"/>	<!--Mano-->
+			<languagePopulation type="kss" populationPercent="4.3" references="R1124"/>	<!--Southern Kisi-->
+			<languagePopulation type="vai" populationPercent="3.8" references="R1124"/>	<!--Vai-->
+			<languagePopulation type="bza" populationPercent="2.9" references="R1124"/>	<!--Bandi-->
+			<languagePopulation type="men" populationPercent="1.7" references="R1124"/>	<!--Mende-->
 			<languagePopulation type="ff" populationPercent="0" references="R1150"/>	<!--Fula-->
 			<languagePopulation type="ff_Adlm" populationPercent="0" references="R1150"/>	<!--Fula (Adlam)-->
 			<languagePopulation type="vai_Latn" populationPercent="0" references="R1272"/>	<!--Vai (Latin)-->
@@ -3615,6 +3401,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="shi_Latn" writingPercent="5" populationPercent="8.7" references="R1181"/>	<!--Tachelhit (Latin)-->
 			<languagePopulation type="rif" writingPercent="5" populationPercent="4.9"/>	<!--Riffian-->
 			<languagePopulation type="rif_Tfng" writingPercent="5" populationPercent="4.9"/>	<!--Riffian (Tifinagh)-->
+			<languagePopulation type="mey" populationPercent="0.82" references="R1380"/>	<!--Hassaniyya-->
 			<languagePopulation type="es" populationPercent="0.065"/>	<!--Spanish-->
 		</territory>
 		<territory type="MC" gdp="7672000000" literacyPercent="99" population="31813">	<!--Monaco-->
@@ -3672,7 +3459,9 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="rhg" populationPercent="1.7"/>	<!--Rohingya-->
 			<languagePopulation type="mnw" populationPercent="1.5"/>	<!--Mon-->
 			<languagePopulation type="hnj" populationPercent="0.022" references="R1107"/>	<!--Hmong Njua-->
+			<languagePopulation type="stu" populationPercent="0.017" references="R1387"/>	<!--Samtao-->
 			<languagePopulation type="kht" populationPercent="0.0074"/>	<!--Khamti-->
+			<languagePopulation type="pi_Mymr" populationPercent="0" references="R1006"/>	<!--Pali (Myanmar)-->
 		</territory>
 		<territory type="MN" gdp="56260000000" literacyPercent="97.4" population="3281680">	<!--Mongolia-->
 			<languagePopulation type="mn" populationPercent="93" officialStatus="official"/>	<!--Mongolian-->
@@ -3686,7 +3475,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="yue" populationPercent="86" officialStatus="de_facto_official" references="R1085"/>	<!--Cantonese-->
 			<languagePopulation type="en" populationPercent="23" references="R1085"/>	<!--English-->
 			<languagePopulation type="zh" populationPercent="5" references="R1143"/>	<!--Chinese-->
-			<languagePopulation type="nan" populationPercent="3.7" references="R1273"/>	<!--Min Nan Chinese-->
+			<languagePopulation type="nan_Hant" populationPercent="3.7" references="R1273"/>	<!--Min Nan Chinese (Traditional)-->
 			<languagePopulation type="fil" populationPercent="3.1" references="R1085"/>	<!--Filipino-->
 			<languagePopulation type="pt" populationPercent="2.3" officialStatus="official" references="R1085"/>	<!--Portuguese-->
 		</territory>
@@ -3698,6 +3487,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="fr" populationPercent="81" officialStatus="official" references="R1361"/>	<!--French-->
 		</territory>
 		<territory type="MR" gdp="30400000000" literacyPercent="58.6" population="4328040">	<!--Mauritania-->
+			<languagePopulation type="mey" populationPercent="87" references="R1381"/>	<!--Hassaniyya-->
 			<languagePopulation type="ar" populationPercent="85" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="fr" populationPercent="13" references="R1339"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="5.7"/>	<!--Fula-->
@@ -3866,6 +3656,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="gvr" populationPercent="0.29"/>	<!--Gurung-->
 			<languagePopulation type="bo" populationPercent="0.24"/>	<!--Tibetan-->
 			<languagePopulation type="tkt" populationPercent="0.24"/>	<!--Kathoriya Tharu-->
+			<languagePopulation type="suz" populationPercent="0.13" references="R1312"/>	<!--Sunwar-->
 			<languagePopulation type="tdh" populationPercent="0.12"/>	<!--Thulung-->
 			<languagePopulation type="bn" populationPercent="0.094"/>	<!--Bangla-->
 			<languagePopulation type="unr_Deva" populationPercent="0.018"/>	<!--Mundari (Devanagari)-->
@@ -4048,7 +3839,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="kbd" populationPercent="0.31" officialStatus="official_regional"/>	<!--Kabardian-->
 			<languagePopulation type="myv" populationPercent="0.31" officialStatus="official_regional"/>	<!--Erzya-->
 			<languagePopulation type="dar" populationPercent="0.26"/>	<!--Dargwa-->
-			<languagePopulation type="bua" populationPercent="0.22"/>	<!--Buriat-->
+			<languagePopulation type="bua" populationPercent="0.22" officialStatus="official_regional" references="R1040"/>	<!--Buriat-->
 			<languagePopulation type="mdf" populationPercent="0.21" officialStatus="official_regional"/>	<!--Moksha-->
 			<languagePopulation type="kum" populationPercent="0.2" officialStatus="official_regional"/>	<!--Kumyk-->
 			<languagePopulation type="kv" populationPercent="0.18" officialStatus="official_regional"/>	<!--Komi-->
@@ -4063,6 +3854,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="koi" populationPercent="0.045" officialStatus="official_regional"/>	<!--Komi-Permyak-->
 			<languagePopulation type="pnt_Cyrl" populationPercent="0.04" references="R1335"/>	<!--Pontic (Cyrillic)-->
 			<languagePopulation type="mrj" populationPercent="0.021"/>	<!--Western Mari-->
+			<languagePopulation type="abq" populationPercent="0.021" references="R1040"/>	<!--Abaza-->
 			<languagePopulation type="alt" populationPercent="0.014"/>	<!--Southern Altai-->
 			<languagePopulation type="fi" populationPercent="0.012"/>	<!--Finnish-->
 			<languagePopulation type="sr" populationPercent="0.0041" references="R1040"/>	<!--Serbian-->
@@ -4172,7 +3964,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="snf" literacyPercent="10" populationPercent="0.24" officialStatus="official_regional" references="R1281"/>	<!--Noon-->
 			<languagePopulation type="knf" literacyPercent="10" populationPercent="0.21" officialStatus="official_regional" references="R1281"/>	<!--Mankanya-->
 			<languagePopulation type="bsc" literacyPercent="10" populationPercent="0.097" officialStatus="official_regional" references="R1281"/>	<!--Bassari-->
-			<languagePopulation type="mey" literacyPercent="10" populationPercent="0.038" officialStatus="official_regional" references="R1281"/>	<!--Hassaniyya-->
+			<languagePopulation type="mey_Latn" literacyPercent="10" populationPercent="0.038" officialStatus="official_regional" references="R1281"/>	<!--Hassaniyya (Latin)-->
 			<languagePopulation type="tnr" literacyPercent="10" populationPercent="0.018" officialStatus="official_regional" references="R1281"/>	<!--Ménik-->
 			<languagePopulation type="ff_Adlm" populationPercent="0" references="R1150"/>	<!--Fula (Adlam)-->
 		</territory>
@@ -4199,9 +3991,9 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="SV" gdp="71960000000" literacyPercent="84.5" population="6628700">	<!--El Salvador-->
 			<languagePopulation type="es" populationPercent="89" officialStatus="official"/>	<!--Spanish-->
-			<languagePopulation type="ccr" populationPercent="0.056"/>	<!--Cacaopera-->
-			<languagePopulation type="ppl" populationPercent="0.041"/>	<!--Pipil-->
-			<languagePopulation type="len" populationPercent="0.02"/>	<!--Lenca-->
+			<languagePopulation type="ccr" populationPercent="0.056" references="R1227"/>	<!--Cacaopera-->
+			<languagePopulation type="ppl" populationPercent="0.041" references="R1289"/>	<!--Pipil-->
+			<languagePopulation type="len" populationPercent="0.02" references="R1289"/>	<!--Lenca-->
 		</territory>
 		<territory type="SX" gdp="1912000000" literacyPercent="99" population="46215">	<!--Sint Maarten-->
 			<languagePopulation type="en" populationPercent="68" officialStatus="official" references="R1238"/>	<!--English-->
@@ -4255,8 +4047,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="mnw" populationPercent="0.17"/>	<!--Mon-->
 			<languagePopulation type="hnj" populationPercent="0.098" references="R1107"/>	<!--Hmong Njua-->
 			<languagePopulation type="shn" populationPercent="0.096"/>	<!--Shan-->
+			<languagePopulation type="mww" populationPercent="0.047" references="R1385"/>	<!--Hmong Daw-->
 			<languagePopulation type="lcp" literacyPercent="25" populationPercent="0.01"/>	<!--Western Lawa-->
 			<languagePopulation type="lwl" populationPercent="0.01"/>	<!--Eastern Lawa-->
+			<languagePopulation type="pi_Thai" populationPercent="0" references="R1006"/>	<!--Pali (Thai)-->
 		</territory>
 		<territory type="TJ" gdp="46470000000" literacyPercent="99.7" population="10394100">	<!--Tajikistan-->
 			<languagePopulation type="tg" populationPercent="100" officialStatus="official"/>	<!--Tajik-->
@@ -4265,7 +4059,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ar" populationPercent="0.0096"/>	<!--Arabic-->
 		</territory>
 		<territory type="TK" gdp="7712000" literacyPercent="99.6" population="1647">	<!--Tokelau-->
-			<languagePopulation type="tkl" literacyPercent="71" populationPercent="69" officialStatus="official" references="R1104"/>	<!--Tokelau-->
+			<languagePopulation type="tkl" literacyPercent="71" populationPercent="69" officialStatus="official" references="R1104"/>	<!--Tokelauan-->
 			<languagePopulation type="en" literacyPercent="90" populationPercent="38" officialStatus="official" references="R1104"/>	<!--English-->
 			<languagePopulation type="sm" populationPercent="20" references="R1104"/>	<!--Samoan-->
 		</territory>
@@ -4277,7 +4071,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="tk" populationPercent="70" officialStatus="official"/>	<!--Turkmen-->
 			<languagePopulation type="ru" populationPercent="12"/>	<!--Russian-->
 			<languagePopulation type="uz" populationPercent="9"/>	<!--Uzbek-->
-			<languagePopulation type="ku" populationPercent="0.4"/>	<!--Kurdish-->
+			<languagePopulation type="ku_Cyrl" populationPercent="0.4"/>	<!--Kurdish (Cyrillic)-->
 			<languagePopulation type="kaa" populationPercent="0.1" references="R1199"/>	<!--Kara-Kalpak-->
 		</territory>
 		<territory type="TN" gdp="153600000000" literacyPercent="79.1" population="12048800">	<!--Tunisia-->
@@ -4307,8 +4101,9 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="hy" populationPercent="0.056"/>	<!--Armenian-->
 			<languagePopulation type="ka" populationPercent="0.056"/>	<!--Georgian-->
 			<languagePopulation type="sr_Latn" writingPercent="5" populationPercent="0.028" references="R1017"/>	<!--Serbian (Latin)-->
-			<languagePopulation type="lzz" populationPercent="0.028"/>	<!--Laz-->
+			<languagePopulation type="lzz" literacyPercent="73" populationPercent="0.025" references="R1137"/>	<!--Laz-->
 			<languagePopulation type="sq" populationPercent="0.021"/>	<!--Albanian-->
+			<languagePopulation type="abq_Latn" populationPercent="0.015" references="R1388"/>	<!--Abaza (Latin)-->
 			<languagePopulation type="pnt_Latn" populationPercent="0.0061" references="R1336"/>	<!--Pontic (Latin)-->
 			<languagePopulation type="ab" populationPercent="0.0048" references="R1079"/>	<!--Abkhazian-->
 			<languagePopulation type="el" populationPercent="0.0048"/>	<!--Greek-->
@@ -4392,6 +4187,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="vi" populationPercent="0.34"/>	<!--Vietnamese-->
 			<languagePopulation type="ko" populationPercent="0.3"/>	<!--Korean-->
 			<languagePopulation type="ru" populationPercent="0.24"/>	<!--Russian-->
+			<languagePopulation type="mww" populationPercent="0.068" references="R1385"/>	<!--Hmong Daw-->
 			<languagePopulation type="nv" populationPercent="0.05"/>	<!--Navajo-->
 			<languagePopulation type="yi" populationPercent="0.049" references="R1262"/>	<!--Yiddish-->
 			<languagePopulation type="pdc" populationPercent="0.039"/>	<!--Pennsylvania German-->
@@ -4405,6 +4201,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lkt" populationPercent="0.0024" references="R1240"/>	<!--Lakota-->
 			<languagePopulation type="ik" writingPercent="5" populationPercent="0.0023" references="R1017"/>	<!--Inupiaq-->
 			<languagePopulation type="mus" populationPercent="0.0012"/>	<!--Muscogee-->
+			<languagePopulation type="oka" populationPercent="0.0001" references="R1384"/>	<!--Okanagan-->
 			<languagePopulation type="io" populationPercent="0"/>	<!--Ido-->
 			<languagePopulation type="cic" populationPercent="0"/>	<!--Chickasaw-->
 			<languagePopulation type="cad" populationPercent="0"/>	<!--Caddo-->
@@ -4440,6 +4237,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="VN" gdp="1354000000000" literacyPercent="93.4" population="105759000">	<!--Vietnam-->
 			<languagePopulation type="vi" populationPercent="86" officialStatus="official" references="R1218"/>	<!--Vietnamese-->
+			<languagePopulation type="mww" populationPercent="1.4" references="R1385"/>	<!--Hmong Daw-->
 			<languagePopulation type="zh_Hant" populationPercent="1.1"/>	<!--Chinese (Traditional)-->
 			<languagePopulation type="blt" populationPercent="0.69"/>	<!--Tai Dam-->
 			<languagePopulation type="hnj" populationPercent="0.17" references="R1107"/>	<!--Hmong Njua-->
@@ -4522,16 +4320,16 @@ XXX Code for transations where no currency is involved
         <calendar type="gregorian">
            <calendarSystem type="solar" />
            <eras>
-               <era type="0" end="0-12-31" code="gregory-inverse" aliases="bc bce"/>
-               <era type="1" start="1-01-01" code="gregory" aliases="ad ce"/>
+               <era type="0" end="0-12-31" code="bce" aliases="bc"/> <!-- Before Common Era, Before Christ -->
+               <era type="1" start="1-01-01" code="ce" aliases="ad"/> <!-- Common Era, Anno Domini -->
            </eras>
         </calendar>
         <calendar type="generic"/>
-                <!-- gregorian territories are assumed, so these are all in addition -->
         <calendar type="japanese">
           <calendarSystem type="solar" />
           <inheritEras calendar="gregorian" />
           <eras>
+              <!-- Warning: these historical eras are known to use incorrect start dates -->
               <era type="0" start="645-6-19"/>
               <era type="1" start="650-2-15"/>
               <era type="2" start="672-1-1"/>
@@ -4764,101 +4562,106 @@ XXX Code for transations where no currency is involved
               <era type="229" start="1861-2-19"/>
               <era type="230" start="1864-2-20"/>
               <era type="231" start="1865-4-7"/>
-              <era type="232" start="1868-9-8" code="meiji"/>
-              <era type="233" start="1912-7-30" code="taisho"/>
+
+              <era type="232" start="1868-10-23" code="meiji"/>
+              <era type="233" start="1912-07-30" code="taisho"/>
               <era type="234" start="1926-12-25" code="showa"/>
-              <era type="235" start="1989-1-8" code="heisei"/>
-              <era type="236" start="2019-5-1" code="reiwa"/>
+              <era type="235" start="1989-01-08" code="heisei"/>
+              <era type="236" start="2019-05-01" code="reiwa"/>
           </eras>
         </calendar>
         <calendar type="islamic">
           <calendarSystem type="lunar" />
           <eras>
-              <era type="0" start="622-7-15" code="islamic" aliases="ah"/>
+              <era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
+              <era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
           </eras>
         </calendar>
         <calendar type="islamic-civil">
           <calendarSystem type="lunar" />
           <eras>
-              <era type="0" start="622-7-16" code="islamic-civil" aliases="islamicc ah"/>
+              <era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
+              <era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
           </eras>
         </calendar>
         <calendar type="islamic-rgsa">
           <calendarSystem type="lunar" />
           <eras>
-              <era type="0" start="622-7-15" code="islamic-rgsa" aliases="ah"/>
+              <era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
+              <era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
           </eras>
         </calendar>
         <calendar type="islamic-tbla">
           <calendarSystem type="lunar" />
           <eras>
-              <era type="0" start="622-7-15" code="islamic-tbla" aliases="ah"/>
+              <era type="0" start="622-07-18" code="ah"/> <!-- Anno Hegirae -->
+              <era type="1" end="622-07-17" code="bh"/> <!-- Before Hijrah -->
           </eras>
         </calendar>
         <calendar type="islamic-umalqura">
           <calendarSystem type="lunar" />
           <eras>
-              <era type="0" start="622-7-15" code="islamic-umalqura" aliases="ah"/>
+              <era type="0" start="622-07-19" code="ah"/> <!-- Anno Hegirae -->
+              <era type="1" end="622-07-18" code="bh"/> <!-- Before Hijrah -->
           </eras>
         </calendar>
         <calendar type="chinese">
           <calendarSystem type="lunisolar"/>
           <eras>
-              <era type="0" start="-2636-01-01" code="chinese"/> <!-- 'sequential' year -->
+              <era type="0" start="-2636-02-15"/> <!-- 'sequential' year -->
           </eras>
         </calendar>
         <calendar type="hebrew">
           <calendarSystem type="lunisolar"/>
           <eras>
-              <era type="0" start="-3760-10-7" code="hebrew" aliases="am"/>
+              <era type="0" start="-3760-09-07" code="am"/> <!-- Anno Mundi -->
           </eras>
         </calendar>
         <calendar type="buddhist">
           <calendarSystem type="solar" />
           <eras>
-              <era type="0" start="-542-01-01" code="buddhist" aliases="be"/>
+              <era type="0" start="-542-01-01" code="be"/> <!-- Buddhist Era -->
           </eras>
         </calendar>
         <calendar type="coptic">
           <calendarSystem type="other"/>
           <eras>
-              <era type="0" end="284-08-28" code="coptic-inverse"/>
-              <era type="1" start="284-08-29" code="coptic"/>
+              <era type="1" start="284-08-29" code="am"/> <!-- Anno Martyrum -->
           </eras>
         </calendar>
         <calendar type="persian">
           <calendarSystem type="solar"/>
           <eras>
-              <era type="0" start="622-01-01" code="persian" aliases="ap"/>
+              <era type="0" start="622-03-21" code="ap"/> <!-- Anno Persico -->
           </eras>
         </calendar>
         <calendar type="dangi">
           <calendarSystem type="lunisolar"/>
           <eras>
-              <era type="0" start="-2332-01-01" code="dangi"/> <!-- 'sequential' year -->
+              <era type="0" start="-2332-02-15"/> <!-- 'sequential' year -->
           </eras>
         </calendar>
         <calendar type="ethiopic">
           <calendarSystem type="other"/>
           <eras>
-              <era type="0" end="8-08-28" code="ethioaa" aliases="ethiopic-amete-alem mundi"/>
-              <era type="1" start="8-08-29" code="ethiopic" aliases="incar"/>
+              <era type="0" start="-5492-07-17" code="aa"/> <!-- Amete Alem -->
+              <era type="1" start="8-08-27" code="am"/> <!-- Amete Mihret -->
           </eras>
         </calendar>
         <calendar type="ethiopic-amete-alem">
           <eras>
-              <era type="0" end="-5492-08-29" code="ethioaa" aliases="ethiopic-amete-alem mundi"/>
+              <era type="0" start="-5492-07-17" code="aa"/> <!-- Amete Alem -->
           </eras>
         </calendar>
         <calendar type="indian">
           <eras>
-              <era type="0" start="79-01-01" code="indian" aliases="saka"/>
+              <era type="0" start="79-03-22" code="shaka"/>
           </eras>
         </calendar>
         <calendar type="roc">
           <eras>
-              <era type="0" end="1911-12-31" code="roc-inverse" aliases="before-roc"/>
-              <era type="1" start="1912-01-01" code="roc" aliases="minguo"/>
+              <era type="0" end="1911-12-31" code="broc"/>
+              <era type="1" start="1912-01-01" code="roc"/>
           </eras>
         </calendar>
 
@@ -4915,7 +4718,7 @@ XXX Code for transations where no currency is involved
 			FI FJ FO FR
 			GB GE GF GP GR
 			HR HU
-			IE IS IT
+			IE IT
 			KG KZ
 			LB LI LK LT LU LV
 			MC MD ME MK MN MQ MY
@@ -4938,7 +4741,7 @@ XXX Code for transations where no currency is involved
 			ET
 			GT GU
 			HK HN
-			ID IL IN
+			ID IL IN IS
 			JM JP
 			KE KH KR
 			LA
@@ -4993,7 +4796,7 @@ XXX Code for transations where no currency is involved
 		<hours preferred="H" allowed="H K h" regions="JP"/>
 		<hours preferred="H" allowed="H hb hB h" regions="AF LA"/>
 		<hours preferred="H" allowed="H hB"
-			regions="AD AM AO AT AW BE BF BJ BL BR CG CI CV CW DE EE FR GA GF GN GP GW HR IL IT KZ MC MD MF MQ MZ NC NL PM PT RE RO SI SR ST TG TR WF YT"/>
+			regions="AD AM AO AT AW BE BF BJ BL BR CG CI CV CW DE EE FR GA GF GN GP GW HR IL IT KZ MC MD MF MQ MZ NC NL PM PT RE RO SI SR ST TG TR WF YT ku_SY"/>
 		<hours preferred="H" allowed="H hB h" regions="AZ BA BG CH GE LI ME RS UA UZ XK"/>
 		<hours preferred="H" allowed="H hB h hb" regions="ES GQ"/>
 		<hours preferred="H" allowed="H hB hb h" regions="CN LV TL zu_ZA"/>
@@ -5526,9 +5329,9 @@ XXX Code for transations where no currency is involved
     </codeMappings>
 
 	<parentLocales>
-		<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kaa_Latn kk_Arab kok_Latn ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
+		<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kaa_Latn kk_Arab kok_Latn ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab suz_Sunu tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
 		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GS en_GY en_HK en_ID en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MV en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
-		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_CZ en_DE en_DK en_ES en_FI en_FR en_HU en_IT en_NL en_NO en_PL en_PT en_RO en_SE en_SI en_SK"/>
+		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_CZ en_DE en_DK en_EE en_ES en_FI en_FR en_GE en_HU en_IT en_LT en_LV en_NL en_NO en_PL en_PT en_RO en_SE en_SI en_SK en_UA"/>
 		<parentLocale parent="en_IN" locales="hi_Latn"/>
 		<parentLocale parent="es_419" locales="es_AR es_BO es_BR es_BZ es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_JP es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"/>
 		<parentLocale parent="fr_HT" locales="ht"/>
@@ -5571,7 +5374,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1016" uri="http://www.ethnologue.com/show_language.asp?code=sco">100k+ native, plus 1.5 mil 2nd lang speakers. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1017">For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1018" uri="https://www.cia.gov/cia/publications/factbook/geos/gj.html">English official; the figure is derived from literacy * lang pop</reference>
-		<reference type="R1019" uri="https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601">Canada 2021 Census language &quot;Knowledge of Language&quot;; official status from Wikipedia Languages_of_Canada</reference>
+		<reference type="R1019" uri="https://www.bfs.admin.ch/bfs/de/home/statistiken/bevoelkerung/sprachen-religionen/sprachen.html">Regelmässig verwendete Sprachen - Percent of people that regularly use the language; literacy is mostly in standard German. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1020" uri="http://en.wikipedia.org/wiki/Ascension_Island">[missing]</reference>
 		<reference type="R1021">Actually literacy in Nko writing unknown but historically they used the Latin script</reference>
 		<reference type="R1022" uri="https://www.cia.gov/cia/publications/factbook/geos/gi.html">English official, the figure is derived from literacy * lang pop</reference>
@@ -5593,6 +5396,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1038" uri="https://www.cia.gov/cia/publications/factbook/fields/2098.html">[missing]</reference>
 		<reference type="R1039" uri="https://www.cia.gov/cia/publications/factbook/geos/ls.html">German official</reference>
 		<reference type="R1040" uri="http://rosstat.gov.ru/vpn_popul">2020 Russian Census</reference>
+		<reference type="R1041" uri="https://www.armstat.am/en/?nid=82&amp;id=2623">2022 Census</reference>
 		<reference type="R1042" uri="https://www.cia.gov/cia/publications/factbook/geos/nl.html">Used CIA literacy figure times population, added 'Vlaams' population</reference>
 		<reference type="R1043" uri="http://www.cso.ie/census/documents/Final%20Principal%20Demographic%20Results%202006.pdf">[missing]</reference>
 		<reference type="R1044" uri="http://www.ethnologue.com/show_language.asp?code=mri">70,000 in 1991, 100,000 who understand it, but do not speak it ; ethnic pop 530,000 in 2002</reference>
@@ -5624,7 +5428,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1070" uri="http://en.wikipedia.org/wiki/List_of_countries_by_English-speaking_population">The figure is from Wikipedia article on http://en.wikipedia.org/wiki/List_of_countries_by_English-speaking_population The figure is from Wikipedia article on English-speaking populations</reference>
 		<reference type="R1071" uri="https://www.cia.gov/cia/publications/factbook/geos/wz.html">[missing]</reference>
 		<reference type="R1072" uri="http://en.wikipedia.org/wiki/List_of_countries_by_English-speaking_population"> The figure is from Wikipedia article on English-speaking populations</reference>
-		<reference type="R1073" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/iz.html">Lang pop est, CIA factbook 15-20% country pop</reference>
+		<reference type="R1073">Precise data not available -- listed with 2 speakers as a tie-breaker</reference>
 		<reference type="R1074" uri="https://www.cia.gov/cia/publications/factbook/geos/sv.html">CIA Factbook</reference>
 		<reference type="R1075" uri="http://en.wikipedia.org/wiki/Canary_islands">[missing]</reference>
 		<reference type="R1076" uri="https://www.cia.gov/cia/publications/factbook/geos/tt.html">CIA Factbook. See also http://www.jsmp.minihub.org/Reports/jsmpreports/Language%20Report/LanguageReport(english).pdf</reference>
@@ -5635,6 +5439,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1081" uri="https://www.cia.gov/cia/publications/factbook/geos/tz.html">English (official, primary language of commerce, administration, and higher education)</reference>
 		<reference type="R1082" uri="http://www.ethnologue.com/show_language.asp?code=eng">Ethnologue lists 1 million 2nd lang users of English; no other good figures found.</reference>
 		<reference type="R1083" uri="http://www.bhas.ba/index.php?option=com_content&amp;view=article&amp;id=52&amp;itemid=80&amp;lang=en&amp;Itemid="> also: http://en.wikipedia.org/wiki/Bosnian_language</reference>
+		<reference type="R1084" uri="https://en.wikipedia.org/wiki/Liberian_Kreyol">[missing]</reference>
 		<reference type="R1085" uri="https://www.dsec.gov.mo/getAttachment/6cb29f2f-524a-488f-aed3-4d7207bb109e/E_CEN_PUB_2021_Y.aspx">2021 Census, counting people who are fluent in the language</reference>
 		<reference type="R1086">5% writing pop estimated in absence of other data</reference>
 		<reference type="R1087" uri="http://www.ethnologue.com/show_language.asp?code=rkt">[missing]</reference>
@@ -5674,17 +5479,20 @@ XXX Code for transations where no currency is involved
 		<reference type="R1121" uri="http://www.nvtc.gov/lotw/months/march/Azerbaijani.html#writ">Latin script official, used 98.8% of pop * 90% for the usage figure</reference>
 		<reference type="R1122" uri="http://en.wikipedia.org/wiki/Swahili_language">- five eastern provinces of the DRC are Swahili speaking. Nearly half the 66 million Congolese speak it.</reference>
 		<reference type="R1123" uri="http://en.wikipedia.org/wiki/Kazakh_language">[missing]</reference>
+		<reference type="R1124" uri="https://lisgis.gov.lr/censusreport/thematic/ThematicReportonPopulationSizeDistributionandStructure.pdf">2022 Census number of people in Ethnic group</reference>
 		<reference type="R1125" uri="http://en.wikipedia.org/wiki/Alsatian_language">[missing]</reference>
 		<reference type="R1126" uri="http://www.ethnologue.com/show_language.asp?code=rwr">[missing]</reference>
 		<reference type="R1127" uri="http://en.wikipedia.org/wiki/Swahili_language">- Most educated Kenyans are able to communicate fluently in Swahili, since it is a compulsory subject in school</reference>
 		<reference type="R1128" uri="http://en.wikipedia.org/wiki/Gagauz_language">[missing]</reference>
 		<reference type="R1129" uri="http://www.ethnologue.com/show_language.asp?code=skr">[missing]</reference>
+		<reference type="R1130" uri="https://www.belstat.gov.by/upload/iblock/345/34515eeb3bb5f4ea5ca53b72290e9595.pdf">2019 Belarus Census</reference>
 		<reference type="R1131" uri="http://en.wikipedia.org/wiki/Singapore">  English is the first language learned by half the children by the time they reach preschool age; using 92.6% of pop for the English figure</reference>
 		<reference type="R1132" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2012 and 2016 Eurostat studies on first and second language usage across Europe</reference>
 		<reference type="R1133" uri="http://en.wikipedia.org/wiki/Swahili_language">- 90 percent of approximately 39 million Tanzanians speak Swahili</reference>
 		<reference type="R1134" uri="http://en.wikipedia.org/wiki/Swahili_language">- Baganda generally don't speak Swahili, but it is in common use among the 25 million people elsewhere in the country, and is currently being implemented in schools nationwide (use 75% of Cpop for this figure)</reference>
 		<reference type="R1135" uri="https://en.wikipedia.org/wiki/Talian_dialect">[missing]</reference>
 		<reference type="R1136" uri="https://en.wikipedia.org/wiki/Chipilo_Venetian_dialect">[missing]</reference>
+		<reference type="R1137">Salminen, T. (2007). Europe and North Asia. In Encyclopedia of the world’s endangered languages (pp. 211-280). Routledge.</reference>
 		<reference type="R1138" uri="http://en.wikipedia.org/wiki/Breton_language">http://www.ofis-bzh.org/fr/langue_bretonne/chiffres_cles/index.php France blocks other languages in state schools; 1.4% attended Breton schools and 3% is estimated as family transmission rate</reference>
 		<reference type="R1139" uri="http://en.wikipedia.org/wiki/Pashto_language">15.8% of population</reference>
 		<reference type="R1140" uri="http://en.wikipedia.org/wiki/Cornish_language">The 2008 estimate is ~2000 speakers due to revival efforts</reference>
@@ -5708,13 +5516,16 @@ XXX Code for transations where no currency is involved
 		<reference type="R1158" uri="http://en.wikipedia.org/wiki/Languages_of_Pakistan#Punjabi">Spoken by 70% of population, assumed to use Arabic script in Pakistan</reference>
 		<reference type="R1159" uri="http://en.wikipedia.org/wiki/Chuvash_language#Language_use">Reported to be (regional) official in Chuvashia, central Russia: taught at schools. However: http://cv.wikipedia.org/ Chuvash Wikipedia on-line.</reference>
 		<reference type="R1160" uri="https://www.ethnologue.com/language/pis">[missing]</reference>
+		<reference type="R1161" uri="https://sib.org.bz/census/2022-census/">2022 Belize Census</reference>
 		<reference type="R1162" uri="https://www.cia.gov/cia/publications/factbook/fields/2098.html">'A lingua franca and a first language for 10% of the population but understood by 95%' http://en.wikipedia.org/wiki/Krio_language</reference>
 		<reference type="R1163" uri="http://en.wikipedia.org/wiki/Suriname#Languages">Dutch is spoken as a mother tongue by about 60% of the Surinamese, while most others speak it as a second or third language.</reference>
 		<reference type="R1164" uri="http://en.wikipedia.org/wiki/Isan_language">main language of trade and comm. in Isan region, except ... media where it gives way to Thai; now largely an unwritten language. 10% writing pop estimated in absence of other data</reference>
 		<reference type="R1165" uri="http://en.wikipedia.org/wiki/Uyghur_language">- primarily written using an Arabic-derived alphabet</reference>
 		<reference type="R1166" uri="https://en.wikipedia.org/wiki/Sark#Economy">and https://islandstudies.com/files/2016/11/Guernsey-Herm-Sark.pdf - extrapolated GDP from per capita x population</reference>
 		<reference type="R1167" uri="http://www.ethnologue.com/show_language.asp?code=nds">understood by 10 million, perhaps. Figure is questionable writing pop artificially set to 5% see also: http://en.wikipedia.org/wiki/Low_German (understood by 10 million people, and native to about 3 million people all around northern Germany)</reference>
+		<reference type="R1168" uri="https://www.censopoblacion.gt/archivos/resultados_censo2018.pdf">2018 Census, counting both maternal and secondary language usage</reference>
 		<reference type="R1169" uri="http://en.wikipedia.org/wiki/Mayotte#Languages">See the 2006 language survey data for 2nd langs = Shimaore</reference>
+		<reference type="R1170" uri="https://www.censopoblacion.gt/archivos/resultados_censo2018.pdf">2018 Census, counting both maternal and secondary language usage. Co-official in Sacatepéquez</reference>
 		<reference type="R1171">Common lingua franca, widely used. High literacy.</reference>
 		<reference type="R1172" uri="https://en.wikipedia.org/wiki/Lombard_language#Usage">but subtracting 270,000 per https://en.wikipedia.org/wiki/Swiss_Italian</reference>
 		<reference type="R1173" uri="https://en.wikipedia.org/wiki/Levantine_Arabic#Speakers_by_country">[missing]</reference>
@@ -5771,7 +5582,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1224" uri="http://en.wikipedia.org/wiki/Blin_language">[missing]</reference>
 		<reference type="R1225" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/gh.html">English official in education, 36.1% 2000 census</reference>
 		<reference type="R1226" uri="http://www.ethnologue.com/show_language.asp?code=saf">no other info available for now</reference>
-		<reference type="R1227" uri="http://en.wikipedia.org/wiki/Guatemala#Language">https://www.cia.gov/cia/publications/factbook/geos/gt.html Spanish official</reference>
+		<reference type="R1227" uri="ttps://translatorswithoutborders.org/language-data-for-el-salvador">[missing]</reference>
 		<reference type="R1228" uri="http://www.ethnologue.com/show_language.asp?code=rkt">language also called Kamta in India</reference>
 		<reference type="R1229" uri="http://en.wikipedia.org/wiki/Languages_of_Brunei">Modern use of Arabic (Jawi) seems to be minimal, but is co-official with ms; set to 5% for now.</reference>
 		<reference type="R1230" uri="http://en.wikipedia.org/wiki/Khmu_language">[missing]</reference>
@@ -5796,6 +5607,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1249" uri="https://en.wikipedia.org/wiki/Ladin_language">population figure from CLDR-17483 ticket</reference>
 		<reference type="R1250">No Data Available at present.</reference>
 		<reference type="R1251">co-official in South Tyrol</reference>
+		<reference type="R1252" uri="https://www.censopoblacion.gt/archivos/resultados_censo2018.pdf">2018 Census, counting both maternal and secondary language usage. Co-official in Quiché and Totonicapán</reference>
 		<reference type="R1253">in Trieste and  Gorizia</reference>
 		<reference type="R1254" uri="http://unicode.org/cldr/trac/attachment/ticket/5887/zgh-ISO639-2-certif.pdf">[missing]</reference>
 		<reference type="R1255">Information on the Latin/Cyrillic script percentages for Montenegro not currently found.</reference>
@@ -5814,7 +5626,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1268" uri="http://en.wikipedia.org/wiki/Esperanto">http://en.wikipedia.org/wiki/Akademio_Internacia_de_la_Sciencoj_San_Marino - estimate 100% of the academy can use Esperanto; the language is used as 1st language of instruction; academy has 300 &quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;members&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;.</reference>
 		<reference type="R1269" uri="https://en.wikipedia.org/wiki/Sundanese_language">recognized in West Java</reference>
 		<reference type="R1270">Mainly unwritten</reference>
-		<reference type="R1271">Vai script is the main script for this language.</reference>
+		<reference type="R1271" uri="https://www.censopoblacion.gt/archivos/resultados_censo2018.pdf">2018 Census, counting both maternal and secondary language usage. Co-official in Quiché</reference>
 		<reference type="R1272">Latin listed as being used (Scriptsource) but no pop figures available.</reference>
 		<reference type="R1273" uri="https://www.dsec.gov.mo/getAttachment/7a3b17c2-22cc-4197-9bd5-ccc6eec388a2/E_CEN_PUB_2011_Y.aspx">2011 Census -- the language is not distinguished in the 2021 census</reference>
 		<reference type="R1274" uri="http://www.ethnologue.com/language/mgh">but no literacy data</reference>
@@ -5832,7 +5644,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1286">No figures available for this language.  Estimating at 5%.</reference>
 		<reference type="R1287" uri="http://en.wikipedia.org/wiki/Mapuche_language">[missing]</reference>
 		<reference type="R1288" uri="http://en.wikipedia.org/wiki/Quechua_language">[missing]</reference>
-		<reference type="R1289" uri="http://en.wikipedia.org/wiki/K'iche'_language">[missing]</reference>
+		<reference type="R1289" uri="https://translatorswithoutborders.org/language-data-for-el-salvador">[missing]</reference>
 		<reference type="R1290" uri="http://en.wikipedia.org/wiki/Census_in_Armenia">- near-zero Azeri population in last census http://en.wikipedia.org/wiki/Azerbaijanis_in_Armenia#Current_situation</reference>
 		<reference type="R1291">No figures available for breakdown of Latin vs. N'Ko for Bambara.  The 2% figure is an estimate.</reference>
 		<reference type="R1292" uri="http://www.ethnologue.com/show_language.asp?code=hsb">pop 13k. Figure is questionable writing pop artificially set to 5% see also http://en.wikipedia.org/wiki/Upper_Sorbian</reference>
@@ -5855,7 +5667,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1309" uri="https://en.wikipedia.org/wiki/Faroese_language">[missing]</reference>
 		<reference type="R1310" uri="http://www.ethnologue.com/language/lrc">[missing]</reference>
 		<reference type="R1311" uri="http://www.ethnologue.com/show_language.asp?code=cld">syr is a macrolang containing cld and aii)</reference>
-		<reference type="R1312" uri="http://www.ethnologue.com/language/sdh">[missing]</reference>
+		<reference type="R1312" uri="https://cbs.gov.np/wp-content/upLoads/2018/12/Volume05Part02.pdf">[missing]</reference>
 		<reference type="R1313" uri="https://www.ethnologue.com/language/wni">[missing]</reference>
 		<reference type="R1314" uri="http://www.axl.cefan.ulaval.ca/afrique/soudan.htm">[missing]</reference>
 		<reference type="R1315" uri="https://en.wikipedia.org/wiki/Languages_of_Brazil">[missing]</reference>
@@ -5872,7 +5684,9 @@ XXX Code for transations where no currency is involved
 		<reference type="R1326" uri="https://www.ethnologue.com/language/osa">[missing]</reference>
 		<reference type="R1327" uri="https://pt.wikipedia.org/wiki/Nheengatu">[missing]</reference>
 		<reference type="R1328">Mainly in Guangdong Prov, ~70-80 million. Script unspecified so both listed</reference>
+		<reference type="R1329" uri="https://www.censopoblacion.gt/archivos/resultados_censo2018.pdf">2018 Census, counting both maternal and secondary language usage. Co-official in Chiquimula</reference>
 		<reference type="R1330" uri="https://en.wikipedia.org/wiki/Languages_of_the_United_Kingdom">Analyzed from 2011 UK census and other sources</reference>
+		<reference type="R1331" uri="https://www.censopoblacion.gt/archivos/resultados_censo2018.pdf">2018 Census, counting both maternal and secondary language usage. Co-official in Suchitepéquez</reference>
 		<reference type="R1332" uri="https://statisticsmaldives.gov.mv/statistical-release-iii-education">2014 Maldives: 98% literacy in Divehi, 75% in English</reference>
 		<reference type="R1333" uri="https://en.wikipedia.org/wiki/Taiwanese_Hakka">[missing]</reference>
 		<reference type="R1334" uri="https://en.wikipedia.org/wiki/Laz_people#cite_note-ethnologue-1">[missing]</reference>
@@ -5887,7 +5701,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1343" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 1994 study</reference>
 		<reference type="R1344" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2009 and 2012 studies</reference>
 		<reference type="R1345" uri="https://www.bfs.admin.ch/bfs/de/home/statistiken/bevoelkerung/sprachen-religionen/sprachen.html">Regelmässig verwendete Sprachen - Percent of people that regularly use the language</reference>
-		<reference type="R1346" uri="https://www.bfs.admin.ch/bfs/de/home/statistiken/bevoelkerung/sprachen-religionen/sprachen.html">Regelmässig verwendete Sprachen - Percent of people that regularly use the language; literacy is mostly in standard German. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.&quot;</reference>
+		<reference type="R1346">Latin alphabet usage for Kurdish also present but actual amount unknown</reference>
 		<reference type="R1347" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014 census</reference>
 		<reference type="R1348" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2010 questionnaire</reference>
 		<reference type="R1349" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2008 Census</reference>
@@ -5912,5 +5726,23 @@ XXX Code for transations where no currency is involved
 		<reference type="R1368" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014</reference>
 		<reference type="R1369" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2010 census</reference>
 		<reference type="R1370" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2007 Census</reference>
+		<reference type="R1371" uri="https://www.ethnologue.com/country/gt/languages">1998 SIL study, cited in Ethnologue</reference>
+		<reference type="R1372" uri="https://www.ethnologue.com/sample/ess/HN/">from Instituto Cervantes 2021</reference>
+		<reference type="R1373" uri="https://www.ethnologue.com/sample/ess/HN/">from 2013 Honduras census</reference>
+		<reference type="R1374" uri="https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601">Canada 2021 Census language 'Knowledge of Language'; official status from Wikipedia Languages_of_Canada</reference>
+		<reference type="R1375">Regis, Riccardo. 'Su pianificazione, standardizzazione, polinomia: due esempi' Zeitschrift für romanische Philologie, vol. 128, no. 1, 2012, pp. 88-133.</reference>
+		<reference type="R1376">Number &amp; script usage hard to pin down because of many speakers in contested Nagorno Karabakh region.</reference>
+		<reference type="R1377">Latin alphabet usage also present but exact breakdown unknown</reference>
+		<reference type="R1378">Cyrillic usage for Kurdish may no longer be as dominant but it used to be</reference>
+		<reference type="R1379" uri="https://www.ethnologue.com/country/dz/languages">citation from 2016</reference>
+		<reference type="R1380" uri="https://www.ethnologue.com/country/MA/languages">2026 citation</reference>
+		<reference type="R1381" uri="https://www.ethnologue.com/country/mr/languages">Citation from 2016</reference>
+		<reference type="R1382" uri="https://www.axl.cefan.ulaval.ca/asie/irak-1general.htm">[missing]</reference>
+		<reference type="R1383" uri="https://www.axl.cefan.ulaval.ca/asie/iran.htm">[missing]</reference>
+		<reference type="R1384" uri="https://www.census.gov/data/tables/2013/demo/2009-2013-lang-tables.html">[missing]</reference>
+		<reference type="R1385" uri="https://www.ethnologue.com/language/mww/">[missing]</reference>
+		<reference type="R1386" uri="https://www.ethnologue.com/country/dz/languages">[missing]</reference>
+		<reference type="R1387" uri="https://www.ethnologue.com/country/mm/languages">[missing]</reference>
+		<reference type="R1388">Leclerc (2014)</reference>
 	</references>
 </supplementalData>
diff --git a/make/data/cldr/common/supplemental/supplementalMetadata.xml b/make/data/cldr/common/supplemental/supplementalMetadata.xml
index d8e5052adef..4f1f1804fdd 100644
--- a/make/data/cldr/common/supplemental/supplementalMetadata.xml
+++ b/make/data/cldr/common/supplemental/supplementalMetadata.xml
@@ -304,7 +304,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageAlias type="zsm" replacement="ms" reason="macrolanguage"/> <!-- Standard Malay ⇒ Malay -->
 			<languageAlias type="zyb" replacement="za" reason="macrolanguage"/> <!-- Yongbei Zhuang ⇒ Zhuang -->
 			<languageAlias type="him" replacement="srx" reason="macrolanguage"/> <!-- Himachali ⇒ Sirmauri (= Pahari, Himachali) -->
-			<languageAlias type="mnk" replacement="man" reason="macrolanguage"/> <!-- Mandinka ⇒ Mandingo -->
 			<languageAlias type="bh" replacement="bho" reason="macrolanguage"/> <!-- Bihari ⇒ Bhojpuri -->
 			<languageAlias type="cls" replacement="sa" reason="macrolanguage"/> <!-- Classical Sanskrit ⇒ Sanskrit -->
 			<!-- Special case <languageAlias type="nb" replacement="no" reason="macrolanguage"/> <! - - Norwegian Bokmål ⇒ Norwegian -->
@@ -552,6 +551,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageAlias type="xss" replacement="zko" reason="deprecated"/> <!-- Assan ⇒ Kott -->
 			<languageAlias type="zkb" replacement="kjh" reason="deprecated"/> <!-- Koibal ⇒ Khakas -->
 
+			<!-- more deprecated 2024-09-09 -->
+			<languageAlias type="dek" replacement="sqm" reason="deprecated"/> <!-- South Levantine Arabic ⇒ Suma -->
+			<languageAlias type="nte" replacement="eko" reason="deprecated"/> <!-- Nathembo ⇒ Koti -->
+
             <!-- scripts -->
             <scriptAlias type="Qaai" replacement="Zinh" reason="deprecated"/>
             <!-- deprecated ISO territories in 3066 + CLDR ones (older deprecated ISO codes -->
@@ -1527,6 +1530,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<!-- <subdivisionAlias type="gtsu" replacement="gt?" reason="deprecated"/> <!- - Suchitepéquez => ?? -->
 			<!-- <subdivisionAlias type="gtto" replacement="gt?" reason="deprecated"/> <!- - Totonicapán => ?? -->
 			<!-- <subdivisionAlias type="gtza" replacement="gt?" reason="deprecated"/> <!- - Zacapa => ?? -->
+			<!-- <subdivisionAlias type="inct" replacement="in?" reason="deprecated"/> <!- - Chhattisgarh => ?? -->
 			<!-- <subdivisionAlias type="indd" replacement="in?" reason="deprecated"/> <!- - Daman and Diu => ?? -->
 			<!-- <subdivisionAlias type="indn" replacement="in?" reason="deprecated"/> <!- - Dadra and Nagar Haveli => ?? -->
 			<!-- <subdivisionAlias type="inor" replacement="in?" reason="deprecated"/> <!- - Odisha => ?? -->
@@ -1880,8 +1884,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			aa_ET ab_GE af_ZA agq_CM ak_GH am_ET an_ES ann_NG apc_SY ar_001 arn_CL as_IN
 			asa_TZ ast_ES az_Arab_IR az_Cyrl_AZ az_Latn az_Latn_AZ
 			ba_RU bal_Arab bal_Arab_PK bal_Latn_PK bas_CM be_BY bem_ZM bew_ID bez_TZ bg_BG
-			bgc_IN bgn_PK bho_IN blo_BJ blt_VN bm_ML bm_Nkoo_ML bn_BD bo_CN br_FR brx_IN
-			bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM byn_ER
+			bgc_IN bgn_PK bho_IN blo_BJ blt_VN bm_ML bm_Nkoo_ML bn_BD bo_CN bqi_IR br_FR brx_IN
+			bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM bua_RU byn_ER
 			ca_ES cad_US cch_NG ccp_BD ce_RU ceb_PH cgg_UG cho_US chr_US cic_US ckb_IQ
 			co_FR cop_EG cs_CZ csw_CA cu_RU cv_RU cy_GB
 			da_DK dav_KE de_DE dje_NE doi_IN dsb_DE dua_CM dv_MV dyo_SN dz_BT
@@ -1893,27 +1897,28 @@ For terms of use, see http://www.unicode.org/copyright.html
 			hsb_DE ht_HT hu_HU hy_AM
 			ia_001 id_ID ie_EE ife_TG ig_NG ii_CN io_001 is_IS it_IT iu_CA iu_Latn_CA
 			ja_JP jbo_001 jgo_CM jmc_TZ jv_ID
-			ka_GE kaa_Cyrl kaa_Cyrl_UZ kaa_Latn_UZ kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV ken_CM kgp_BR
+			ka_GE kaa_Cyrl kaa_Cyrl_UZ kaa_Latn_UZ kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV kek_GT ken_CM kgp_BR
 			khq_ML ki_KE
 			kk_Arab_CN kk_Cyrl kk_Cyrl_KZ
 			kkj_CM kl_GL kln_KE km_KH kn_IN ko_KR kok_Deva kok_Deva_IN kok_Latn_IN kpe_LR ks_Arab
-			ks_Arab_IN ks_Deva_IN ksb_TZ ksf_CM ksh_DE ku_TR kw_GB kxv_Deva_IN kxv_Latn
+			ks_Arab_IN ks_Deva_IN ksb_TZ ksf_CM ksh_DE ku_Arab_IQ ku_Latn ku_Latn_TR kw_GB kxv_Deva_IN kxv_Latn
 			kxv_Latn_IN	kxv_Orya_IN kxv_Telu_IN ky_KG
 			la_VA lag_TZ lb_LU lg_UG lij_IT lkt_US lld_IT lmo_IT ln_CD lo_LA lrc_IR
-			lt_LT ltg_LV lu_CD luo_KE luy_KE lv_LV
+			lt_LT ltg_LV lu_CD luo_KE luy_KE lv_LV lzz_TR
 			mai_IN mas_KE mdf_RU mer_KE mfe_MU mg_MG mgh_MZ mgo_CM mhn_IT mi_NZ mic_CA mk_MK ml_IN
 			mn_MN mn_Mong_CN mni_Beng mni_Beng_IN mni_Mtei_IN moh_CA mr_IN ms_Arab_MY ms_MY
-			mt_MT mua_CM mus_US my_MM myv_RU mzn_IR
+			mt_MT mua_CM mus_US mww_Hmnp mww_Hmnp_US my_MM myv_RU mzn_IR
 			naq_NA nb nb_NO nd_ZW nds_DE ne_NP nl_NL nmg_CM nn_NO nnh_CM nqo_GN nr_ZA
 			nso_ZA nus_SS nv_US ny_MW nyn_UG
-			oc_FR om_ET or_IN os_GE osa_US
-			pa_Arab_PK pa_Guru pa_Guru_IN pap_CW pcm_NG pis_SB pl_PL prg_PL ps_AF pt_BR
+			oc_FR oka_CA om_ET or_IN os_GE osa_US
+			pa_Arab_PK pa_Guru pa_Guru_IN pap_CW pcm_NG pi_Latn pi_Latn_GB pis_SB pl_PL pms_IT prg_PL ps_AF pt_BR
 			qu_PE quc_GT
 			raj_IN rhg_Rohg rhg_Rohg_MM rif_MA rm_CH rn_BI ro_RO rof_TZ ru_RU rw_RW rwk_TZ
 			sa_IN sah_RU saq_KE sat_Deva_IN sat_Olck sat_Olck_IN sbp_TZ sc_IT scn_IT
-			sd_Arab sd_Arab_PK sd_Deva_IN sdh_IR se_NO seh_MZ ses_ML sg_CF shi_Latn_MA
+			sd_Arab sd_Arab_PK sd_Deva_IN sdh_IR se_NO seh_MZ ses_ML sg_CF sgs_LT shi_Latn_MA
 			shi_Tfng shi_Tfng_MA shn_MM si_LK sid_ET sk_SK skr_PK sl_SI sma_SE smj_SE
 			smn_FI sms_FI sn_ZW so_SO sq_AL sr_Cyrl sr_Cyrl_RS sr_Latn_RS ss_ZA ssy_ER
+			suz_Deva suz_Sunu_NP suz_Deva_NP
 			st_ZA su_Latn su_Latn_ID sv_SE sw_TZ syr_IQ szl_PL
 			ta_IN te_IN teo_UG tg_TJ th_TH ti_ET tig_ER tk_TM tn_ZA to_TO tok_001 tpi_PG
 			tr_TR trv_TW trw_PK ts_ZA tt_RU twq_NE tyv_RU tzm_MA
diff --git a/make/data/cldr/common/supplemental/units.xml b/make/data/cldr/common/supplemental/units.xml
index 747b5d79ee5..89b8524a69b 100644
--- a/make/data/cldr/common/supplemental/units.xml
+++ b/make/data/cldr/common/supplemental/units.xml
@@ -136,7 +136,7 @@ For terms of use, see http://www.unicode.org/copyright.html
         
         <unitQuantity baseUnit='per-second' quantity='radioactivity'/>
 
-        <unitQuantity baseUnit='portion' quantity='portion' status='simple'/>
+        <unitQuantity baseUnit='part' quantity='portion' status='simple'/>
         
         <unitQuantity baseUnit='bit' quantity='digital' status='simple'/>
         
@@ -181,10 +181,12 @@ For terms of use, see http://www.unicode.org/copyright.html
         <convertUnit source='dram' baseUnit='cubic-meter' factor='gal_to_m3/128*8' systems="ussystem"/>
         <convertUnit source='teaspoon' baseUnit='cubic-meter' factor='gal_to_m3/16*48' systems="ussystem"/>
         <convertUnit source='tablespoon' baseUnit='cubic-meter' factor='gal_to_m3/256' systems="ussystem"/>
+        <convertUnit source='fluid-ounce-metric' baseUnit='cubic-meter' factor='0.03*0.001' systems="metric_adjacent"/>
         <convertUnit source='fluid-ounce-imperial' baseUnit='cubic-meter' factor='gal_imp_to_m3/160' systems="uksystem"/>
         <convertUnit source='fluid-ounce' baseUnit='cubic-meter' factor='gal_to_m3/128' systems="ussystem"/>
         <convertUnit source='jigger' baseUnit='cubic-meter' factor='gal_to_m3*3/128*2' systems="ussystem"/>
         <convertUnit source='cup' baseUnit='cubic-meter' factor='gal_to_m3/16' systems="ussystem"/>
+        <convertUnit source='cup-imperial' baseUnit='cubic-meter' factor='gal_imp_to_m3/16' systems="uksystem"/>
         <convertUnit source='cup-metric' baseUnit='cubic-meter' factor='0.00025'  systems="metric_adjacent"/>
         <convertUnit source='pint' baseUnit='cubic-meter' factor='gal_to_m3/8' systems="ussystem"/>
         <convertUnit source='pint-metric' baseUnit='cubic-meter' factor='0.0005' systems="metric_adjacent"/>
@@ -215,7 +217,7 @@ For terms of use, see http://www.unicode.org/copyright.html
         <convertUnit source='mile' baseUnit='meter' factor='ft_to_m*5280' systems="ussystem uksystem"/>
         <convertUnit source='nautical-mile' baseUnit='meter' factor='1852' systems="ussystem uksystem si_acceptable"/>
         <convertUnit source='mile-scandinavian' baseUnit='meter' factor='10000' systems="metric_adjacent"/>
-        <convertUnit source='100-kilometer' baseUnit='meter' factor='100000' systems="si metric"/>
+        <!--  <convertUnit source='100-kilometer' baseUnit='meter' factor='100000' systems="si metric"/> -->
         <convertUnit source='earth-radius' baseUnit='meter' factor='6.3781E6' systems="astronomical"/>
         <convertUnit source='solar-radius' baseUnit='meter' factor='695700000' systems="astronomical"/>
         <convertUnit source='astronomical-unit' baseUnit='meter' factor='meters_per_AU' systems="astronomical si_acceptable"/>
@@ -265,12 +267,11 @@ For terms of use, see http://www.unicode.org/copyright.html
         <convertUnit source='mole' baseUnit='item' factor='item_per_mole' systems="si metric prefixable"/>
         
         <!-- portion -->
-        <convertUnit source='permillion' baseUnit='portion' factor='1/1000000' systems="metric_adjacent ussystem uksystem"/>
-        <convertUnit source='permyriad' baseUnit='portion' factor='1/10000' systems="metric_adjacent ussystem uksystem"/>
-        <convertUnit source='permille' baseUnit='portion' factor='1/1000' systems="metric_adjacent ussystem uksystem"/>
-        <convertUnit source='percent' baseUnit='portion' factor='1/100' systems="metric_adjacent ussystem uksystem"/>
-        <convertUnit source='karat' baseUnit='portion' factor='1/24' systems="metric_adjacent ussystem uksystem"/>
-        <convertUnit source='portion' baseUnit='portion' systems="metric_adjacent ussystem uksystem"/>
+        <convertUnit source='permyriad' baseUnit='part' factor='1/10000' systems="metric_adjacent ussystem uksystem"/>
+        <convertUnit source='permille' baseUnit='part' factor='1/1000' systems="metric_adjacent ussystem uksystem"/>
+        <convertUnit source='percent' baseUnit='part' factor='1/100' systems="metric_adjacent ussystem uksystem"/>
+        <convertUnit source='karat' baseUnit='part' factor='1/24' systems="metric_adjacent ussystem uksystem"/>
+        <convertUnit source='part' baseUnit='part' systems="metric_adjacent ussystem uksystem"/>
         
         <!-- digital -->
         <convertUnit source='bit' baseUnit='bit' systems="metric_adjacent prefixable ussystem uksystem"/>
@@ -621,15 +622,17 @@ For terms of use, see http://www.unicode.org/copyright.html
             <unitAlias type="liter-per-100kilometers" replacement="liter-per-100-kilometer" reason="deprecated"/>
             <unitAlias type="meter-per-second-squared" replacement="meter-per-square-second" reason="deprecated"/>
             <unitAlias type="millimeter-of-mercury" replacement="millimeter-ofhg" reason="deprecated"/>
-            <unitAlias type="part-per-million" replacement="permillion" reason="deprecated"/>
+            <unitAlias type="part-per-million" replacement="part-per-1e6" reason="deprecated"/>
             <unitAlias type="pound-foot" replacement="pound-force-foot" reason="deprecated"/>
             <unitAlias type="pound-per-square-inch" replacement="pound-force-per-square-inch" reason="deprecated"/>
             <unitAlias type="milligram-per-deciliter" replacement="milligram-ofglucose-per-deciliter" reason="deprecated"/>
             <unitAlias type="metric-ton" replacement="tonne" reason="deprecated"/>
+            <unitAlias type="permillion" replacement="part-per-1e6" reason="deprecated"/>
+            <unitAlias type="portion-per-1e9" replacement="part-per-1e9" reason="deprecated"/>
+            <unitAlias type="portion" replacement="part" reason="deprecated"/>
+            <unitAlias type="million" replacement="1e6" reason="deprecated"/>
          
-            <!-- 
-            <unitAlias type="emu-of-inductance" replacement="abhenry" reason="deprecated"/>
-             -->
+            <!-- Usage aliases -->
             
             <usageAlias type="music-track" replacement="media" reason="deprecated"/>
             <usageAlias type="tv-program" replacement="media" reason="deprecated"/>
diff --git a/make/data/cldr/common/supplemental/windowsZones.xml b/make/data/cldr/common/supplemental/windowsZones.xml
index 7ec2ab619ad..26a62c3f064 100644
--- a/make/data/cldr/common/supplemental/windowsZones.xml
+++ b/make/data/cldr/common/supplemental/windowsZones.xml
@@ -235,7 +235,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-03:00) Punta Arenas -->
 			<mapZone other="Magallanes Standard Time" territory="001" type="America/Punta_Arenas"/>
-			<mapZone other="Magallanes Standard Time" territory="CL" type="America/Punta_Arenas"/>
+			<mapZone other="Magallanes Standard Time" territory="CL" type="America/Punta_Arenas America/Coyhaique"/>
 
 			<!-- (UTC-03:00) Saint Pierre and Miquelon -->
 			<mapZone other="Saint Pierre Standard Time" territory="001" type="America/Miquelon"/>
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
index c4aaa28193a..a181625c293 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
@@ -541,9 +541,12 @@ class Bundle {
                         pattern = (String) parentsMap.remove(key);
                     }
                     if (pattern != null) {
+                        // escape reserved chars, excluding date/time patterns, eg, "{1} {0}"
+                        String transPattern = key.endsWith("-dateTime") ? pattern : escapeReservedChars(pattern);
+
                         // Perform date-time format pattern conversion which is
                         // applicable to both SimpleDateFormat and j.t.f.DateTimeFormatter.
-                        String transPattern = translateDateFormatLetters(calendarType, key, pattern, this::convertDateTimePatternLetter);
+                        transPattern = translateDateFormatLetters(calendarType, key, transPattern, this::convertDateTimePatternLetter);
                         dateTimePatterns.add(i, transPattern);
                         // Additionally, perform SDF specific date-time format pattern conversion
                         sdfPatterns.add(i, translateDateFormatLetters(calendarType, key, transPattern, this::convertSDFLetter));
@@ -780,7 +783,7 @@ class Bundle {
                 e -> calendarPrefix + e.getKey(),
                 e -> translateDateFormatLetters(calendarType,
                         e.getKey(),
-                        (String)e.getValue(),
+                        escapeReservedChars((String)e.getValue()),
                         this::convertDateTimePatternLetter)
             ))
         );
@@ -844,4 +847,39 @@ class Bundle {
                 ))
         );
     }
+
+    /**
+     * Escape reserved pattern characters or optional start/ends,
+     * '#', '{', '}', '[', and ']' in the pattern string.
+     *
+     * @param pattern original pattern string
+     * @return escaped pattern string
+     * @see DateTimeFormatterBuilder#appendPattern
+     */
+    private static String escapeReservedChars(String pattern) {
+        StringBuilder out = new StringBuilder();
+        boolean inQuote = false;
+
+        for (int i = 0; i < pattern.length(); i++) {
+            char c = pattern.charAt(i);
+            if (c == '\'') {
+                if (i + 1 < pattern.length() && pattern.charAt(i + 1) == '\'') {
+                    // single quote literal
+                    out.append("''");
+                    i++;
+                } else {
+                    inQuote = !inQuote;
+                    out.append(c);
+                }
+            } else if (!inQuote &&
+                (c == '#' || c == '{' || c == '}' || c == '[' || c == ']')) {
+                // escape the reserved char
+                out.append('\'').append(c).append('\'');
+            } else {
+                out.append(c);
+            }
+        }
+
+        return out.toString();
+    }
 }
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java b/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
index c6016c7cb8f..e2fdb103669 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,43 +42,53 @@ class CopyrightHeaders {
         " * Copyright (c) 2012, %d, Oracle and/or its affiliates. All rights reserved.\n" +
         " */\n";
 
-    // Last updated:  - 4/06/2022
+    // Last updated:  - 11/03/2025
     private static final String UNICODE =
-        "/*\n" +
-        " * COPYRIGHT AND PERMISSION NOTICE\n" +
-        " *\n" +
-        " * Copyright (c) 1991-2022 Unicode, Inc. All rights reserved.\n" +
-        " * Distributed under the Terms of Use in https://www.unicode.org/copyright.html.\n" +
-        " *\n" +
-        " * Permission is hereby granted, free of charge, to any person obtaining\n" +
-        " * a copy of the Unicode data files and any associated documentation\n" +
-        " * (the \"Data Files\") or Unicode software and any associated documentation\n" +
-        " * (the \"Software\") to deal in the Data Files or Software\n" +
-        " * without restriction, including without limitation the rights to use,\n" +
-        " * copy, modify, merge, publish, distribute, and/or sell copies of\n" +
-        " * the Data Files or Software, and to permit persons to whom the Data Files\n" +
-        " * or Software are furnished to do so, provided that either\n" +
-        " * (a) this copyright and permission notice appear with all copies\n" +
-        " * of the Data Files or Software, or\n" +
-        " * (b) this copyright and permission notice appear in associated\n" +
-        " * Documentation.\n" +
-        " *\n" +
-        " * THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n" +
-        " * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" +
-        " * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" +
-        " * NONINFRINGEMENT OF THIRD PARTY RIGHTS.\n" +
-        " * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS\n" +
-        " * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL\n" +
-        " * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\n" +
-        " * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n" +
-        " * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n" +
-        " * PERFORMANCE OF THE DATA FILES OR SOFTWARE.\n" +
-        " *\n" +
-        " * Except as contained in this notice, the name of a copyright holder\n" +
-        " * shall not be used in advertising or otherwise to promote the sale,\n" +
-        " * use or other dealings in these Data Files or Software without prior\n" +
-        " * written authorization of the copyright holder.\n" +
-        " */\n";
+        """
+        /*
+         * UNICODE LICENSE V3
+         *
+         * COPYRIGHT AND PERMISSION NOTICE
+         *
+         * Copyright © 1991-2025 Unicode, Inc.
+         *
+         * NOTICE TO USER: Carefully read the following legal agreement. BY
+         * DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+         * SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+         * TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+         * DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+         *
+         * Permission is hereby granted, free of charge, to any person obtaining a
+         * copy of data files and any associated documentation (the "Data Files") or
+         * software and any associated documentation (the "Software") to deal in the
+         * Data Files or Software without restriction, including without limitation
+         * the rights to use, copy, modify, merge, publish, distribute, and/or sell
+         * copies of the Data Files or Software, and to permit persons to whom the
+         * Data Files or Software are furnished to do so, provided that either (a)
+         * this copyright and permission notice appear with all copies of the Data
+         * Files or Software, or (b) this copyright and permission notice appear in
+         * associated Documentation.
+         *
+         * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+         * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+         * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+         * THIRD PARTY RIGHTS.
+         *
+         * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+         * BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+         * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+         * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+         * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+         * FILES OR SOFTWARE.
+         *
+         * Except as contained in this notice, the name of a copyright holder shall
+         * not be used in advertising or otherwise to promote the sale, use or other
+         * dealings in these Data Files or Software without prior written
+         * authorization of the copyright holder.
+         *
+         * SPDX-License-Identifier: Unicode-3.0
+         */
+        """;
 
     private static String OPENJDK2012 =
         "/*\n" +
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
index 98c0605f8b7..f41dbad6c6c 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
@@ -123,12 +123,14 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
         case "type":
             // for LocaleNames/CalendarNames
             // copy string
+            // ignore scope="core"
             {
                 String key = convertOldKeyName(attributes.getValue("key"));
-                if (key.length() == 2) {
+                String scope = attributes.getValue("scope");
+                if (key.length() == 2 && scope == null) {
                     pushStringEntry(qName, attributes,
-                    CLDRConverter.LOCALE_TYPE_PREFIX + key + "." +
-                    attributes.getValue("type"));
+                        CLDRConverter.LOCALE_TYPE_PREFIX + key + "." +
+                        attributes.getValue("type"));
                 } else {
                     pushIgnoredContainer(qName);
                 }
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 452b621ea05..97278cdbafa 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -2364,27 +2364,22 @@ public final class Locale implements Cloneable, Serializable {
 
         if (ret == null || ret.equals(type)) {
             // no localization for this type. try combining key/type separately
-            String displayType = type;
-            switch (key) {
-            case "cu":
-                displayType = lr.getCurrencyName(type.toLowerCase(Locale.ROOT));
-                break;
-            case "rg":
-                if (type != null &&
-                    // UN M.49 code should not be allowed here
-                    type.matches("^[a-zA-Z]{2}[zZ]{4}$")) {
-                        displayType = lr.getLocaleName(type.substring(0, 2).toUpperCase(Locale.ROOT));
-                }
-                break;
-            case "tz":
-                displayType = TimeZoneNameUtility.convertLDMLShortID(type)
-                    .map(id -> TimeZoneNameUtility.retrieveGenericDisplayName(id, TimeZone.LONG, inLocale))
-                    .orElse(type);
-                break;
-            }
             ret = MessageFormat.format(lr.getLocaleName("ListKeyTypePattern"),
                 getDisplayString(key, null, inLocale, DISPLAY_UEXT_KEY),
-                Optional.ofNullable(displayType).orElse(type));
+                switch (key) {
+                    case "cu" -> {
+                        var cname = lr.getCurrencyName(type.toLowerCase(Locale.ROOT));
+                        yield cname != null ? cname : type;
+                    }
+                    case "rg" -> type != null && type.matches("^[a-zA-Z]{2}[zZ]{4}$") ?
+                        // UN M.49 code should not be allowed here
+                        lr.getLocaleName(type.substring(0, 2).toUpperCase(Locale.ROOT)) :
+                        type;
+                    case "tz" -> TimeZoneNameUtility.convertLDMLShortID(type)
+                        .map(id -> TimeZoneNameUtility.retrieveGenericDisplayName(id, TimeZone.LONG, inLocale))
+                        .orElse(type);
+                    default -> type;
+                });
         }
 
         return ret;
diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
index cf629a7d57c..5e7b61e6c57 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -181,6 +181,8 @@ import java.util.Locale;
  *     <th scope="col">CLDR version</th></tr>
  * </thead>
  * <tbody>
+ * <tr><th scope="row" style="text-align:left">JDK 26</th>
+ *     <td>CLDR 48</td></tr>
  * <tr><th scope="row" style="text-align:left">JDK 25</th>
  *     <td>CLDR 47</td></tr>
  * <tr><th scope="row" style="text-align:left">JDK 24</th>
diff --git a/src/java.base/share/legal/cldr.md b/src/java.base/share/legal/cldr.md
index f020d8f51ae..6e609f35302 100644
--- a/src/java.base/share/legal/cldr.md
+++ b/src/java.base/share/legal/cldr.md
@@ -1,4 +1,4 @@
-## Unicode Common Local Data Repository (CLDR) v47
+## Unicode Common Local Data Repository (CLDR) v48
 
 ### CLDR License
 
diff --git a/src/jdk.localedata/share/legal/cldr.md b/src/jdk.localedata/share/legal/cldr.md
index f020d8f51ae..6e609f35302 100644
--- a/src/jdk.localedata/share/legal/cldr.md
+++ b/src/jdk.localedata/share/legal/cldr.md
@@ -1,4 +1,4 @@
-## Unicode Common Local Data Repository (CLDR) v47
+## Unicode Common Local Data Repository (CLDR) v48
 
 ### CLDR License
 
diff --git a/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java b/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java
index b81226c00db..83687d39bed 100644
--- a/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java
@@ -23,6 +23,7 @@
 /*
  * @test
  * @bug 8177552 8217721 8222756 8295372 8306116 8319990 8338690 8363972
+ *      8354548
  * @summary Checks the functioning of compact number format
  * @modules jdk.localedata
  * @run junit/othervm TestCompactNumber
@@ -116,26 +117,26 @@ public class TestCompactNumber {
     Object[][] compactFormatData() {
         return new Object[][]{
             // compact number format instance, number to format, formatted output
-            {FORMAT_DZ_LONG, 1000.09, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55"
-                + "\u0FB2\u0F42 \u0F21"},
-            {FORMAT_DZ_LONG, -999.99, "-\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55"
-                + "\u0FB2\u0F42 \u0F21"},
-            {FORMAT_DZ_LONG, -0.0, "-\u0F20"},
-            {FORMAT_DZ_LONG, 3000L, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55"
-                + "\u0FB2\u0F42 \u0F23"},
-            {FORMAT_DZ_LONG, new BigInteger("12345678901234567890"), "\u0F51"
-                + "\u0F74\u0F44\u0F0B\u0F55\u0FB1\u0F74\u0F62\u0F0B\u0F66"
-                + "\u0F0B\u0F61\u0F0B \u0F21\u0F22\u0F23\u0F24\u0F25\u0F27"},
+            {FORMAT_DZ_LONG, 1000.09, "སྟོང་ཕ"
+                + "ྲག ༡"},
+            {FORMAT_DZ_LONG, -999.99, "-སྟོང་ཕ"
+                + "ྲག ༡"},
+            {FORMAT_DZ_LONG, -0.0, "-༠"},
+            {FORMAT_DZ_LONG, 3000L, "སྟོང་ཕ"
+                + "ྲག ༣"},
+            {FORMAT_DZ_LONG, new BigInteger("12345678901234567890"), "ད"
+                + "ུང་ཕྱུར་ས"
+                + "་ཡ་ ༡༢༣༤༥༧"},
             // negative
-            {FORMAT_DZ_LONG, new BigInteger("-12345678901234567890"), "-\u0F51"
-                + "\u0F74\u0F44\u0F0B\u0F55\u0FB1\u0F74\u0F62\u0F0B\u0F66"
-                + "\u0F0B\u0F61\u0F0B \u0F21\u0F22\u0F23\u0F24\u0F25\u0F27"},
-            {FORMAT_DZ_LONG, new BigDecimal("12345678901234567890.89"), "\u0F51"
-                + "\u0F74\u0F44\u0F0B\u0F55\u0FB1\u0F74\u0F62\u0F0B\u0F66"
-                + "\u0F0B\u0F61\u0F0B \u0F21\u0F22\u0F23\u0F24\u0F25\u0F27"},
-            {FORMAT_DZ_LONG, new BigDecimal("-12345678901234567890.89"), "-\u0F51"
-                + "\u0F74\u0F44\u0F0B\u0F55\u0FB1\u0F74\u0F62\u0F0B\u0F66"
-                + "\u0F0B\u0F61\u0F0B \u0F21\u0F22\u0F23\u0F24\u0F25\u0F27"},
+            {FORMAT_DZ_LONG, new BigInteger("-12345678901234567890"), "-ད"
+                + "ུང་ཕྱུར་ས"
+                + "་ཡ་ ༡༢༣༤༥༧"},
+            {FORMAT_DZ_LONG, new BigDecimal("12345678901234567890.89"), "ད"
+                + "ུང་ཕྱུར་ས"
+                + "་ཡ་ ༡༢༣༤༥༧"},
+            {FORMAT_DZ_LONG, new BigDecimal("-12345678901234567890.89"), "-ད"
+                + "ུང་ཕྱུར་ས"
+                + "་ཡ་ ༡༢༣༤༥༧"},
             // Zeros
             {FORMAT_EN_US_SHORT, 0, "0"},
             {FORMAT_EN_US_SHORT, 0.0, "0"},
@@ -236,88 +237,88 @@ public class TestCompactNumber {
             // Less than 1000 no suffix
             {FORMAT_HI_IN_LONG, -999, "-999"},
             // Round the value with 0 fraction digits and format it
-            {FORMAT_HI_IN_LONG, -999.99, "-1 \u0939\u091C\u093C\u093E\u0930"},
+            {FORMAT_HI_IN_LONG, -999.99, "-1 हज़ार"},
             // 10 thousand
-            {FORMAT_HI_IN_LONG, 99000, "99 \u0939\u091C\u093C\u093E\u0930"},
+            {FORMAT_HI_IN_LONG, 99000, "99 हज़ार"},
             // Long path
-            {FORMAT_HI_IN_LONG, 330000, "3 \u0932\u093E\u0916"},
+            {FORMAT_HI_IN_LONG, 330000, "3 लाख"},
             // Double path
-            {FORMAT_HI_IN_LONG, 3000.90, "3 \u0939\u091C\u093C\u093E\u0930"},
+            {FORMAT_HI_IN_LONG, 3000.90, "3 हज़ार"},
             // BigInteger path
             {FORMAT_HI_IN_LONG, new BigInteger("12345678901234567890"),
-                "123456789 \u0916\u0930\u092C"},
+                "123456789 खरब"},
             // BigDecimal path
             {FORMAT_HI_IN_LONG, new BigDecimal("12345678901234567890.89"),
-                "123456789 \u0916\u0930\u092C"},
+                "123456789 खरब"},
             // 1000 does not have any suffix in "ja" locale
             {FORMAT_JA_JP_SHORT, -999.99, "-1,000"},
             // 0-9999 does not have any suffix
             {FORMAT_JA_JP_SHORT, 9999, "9,999"},
-            // 99000/10000 => 9.9\u4E07 rounded to 10\u4E07
-            {FORMAT_JA_JP_SHORT, 99000, "10\u4E07"},
+            // 99000/10000 => 9.9万 rounded to 10万
+            {FORMAT_JA_JP_SHORT, 99000, "10万"},
             // Negative
-            {FORMAT_JA_JP_SHORT, -99000, "-10\u4E07"},
+            {FORMAT_JA_JP_SHORT, -99000, "-10万"},
             // Long path
-            {FORMAT_JA_JP_SHORT, 330000, "33\u4E07"},
+            {FORMAT_JA_JP_SHORT, 330000, "33万"},
             // Double path
             {FORMAT_JA_JP_SHORT, 3000.90, "3,001"},
             // BigInteger path
             {FORMAT_JA_JP_SHORT, new BigInteger("12345678901234567890"),
-                "1235\u4EAC"},
+                "1235京"},
             // BigDecimal path
             {FORMAT_JA_JP_SHORT, new BigDecimal("12345678901234567890.89"),
-                "1235\u4EAC"},
+                "1235京"},
             // less than 1000 no suffix
             {FORMAT_IT_SHORT, 499, "499"},
             // Boundary number
-            {FORMAT_IT_SHORT, 1000, "1.000"},
+            {FORMAT_IT_SHORT, 1000, "1K"},
             // Long path
-            {FORMAT_IT_SHORT, 3000000L, "3\u00a0Mln"},
+            {FORMAT_IT_SHORT, 3000000L, "3 Mln"},
             // Double path
-            {FORMAT_IT_SHORT, 3000000.0, "3\u00a0Mln"},
+            {FORMAT_IT_SHORT, 3000000.0, "3 Mln"},
             // BigInteger path
             {FORMAT_IT_SHORT, new BigInteger("12345678901234567890"),
-                "12345679\u00a0Bln"},
+                "12345679 Bln"},
             // BigDecimal path
             {FORMAT_IT_SHORT, new BigDecimal("12345678901234567890.89"),
-                "12345679\u00a0Bln"},
+                "12345679 Bln"},
             {FORMAT_CA_LONG, 999, "999"},
             {FORMAT_CA_LONG, 999.99, "1 miler"},
             {FORMAT_CA_LONG, 99000, "99 milers"},
             {FORMAT_CA_LONG, 330000, "330 milers"},
             {FORMAT_CA_LONG, 3000.90, "3 milers"},
-            {FORMAT_CA_LONG, 1000000, "1 mili\u00f3"},
+            {FORMAT_CA_LONG, 1000000, "1 milió"},
             {FORMAT_CA_LONG, new BigInteger("12345678901234567890"),
                 "12345679 bilions"},
             {FORMAT_CA_LONG, new BigDecimal("12345678901234567890.89"),
                 "12345679 bilions"},
-            {FORMAT_AS_LONG, 5000.0, "\u09eb \u09b9\u09be\u099c\u09be\u09f0"},
-            {FORMAT_AS_LONG, 50000.0, "\u09eb\u09e6 \u09b9\u09be\u099c\u09be\u09f0"},
-            {FORMAT_AS_LONG, 500000.0, "\u09eb \u09b2\u09be\u0996"},
-            {FORMAT_AS_LONG, 5000000.0, "\u09eb \u09a8\u09bf\u09af\u09c1\u09a4"},
-            {FORMAT_AS_LONG, 50000000.0, "\u09eb\u09e6 \u09a8\u09bf\u09af\u09c1\u09a4"},
-            {FORMAT_AS_LONG, 500000000.0, "\u09eb\u09e6\u09e6 \u09a8\u09bf\u09af\u09c1\u09a4"},
-            {FORMAT_AS_LONG, 5000000000.0, "\u09eb \u09b6\u09a4 \u0995\u09cb\u099f\u09bf"},
-            {FORMAT_AS_LONG, 50000000000.0, "\u09eb\u09e6 \u09b6\u09a4 \u0995\u09cb\u099f\u09bf"},
-            {FORMAT_AS_LONG, 500000000000.0, "\u09eb\u09e6\u09e6 \u09b6\u09a4 \u0995\u09cb\u099f\u09bf"},
-            {FORMAT_AS_LONG, 5000000000000.0, "\u09eb \u09b6\u09a4 \u09aa\u09f0\u09be\u09f0\u09cd\u09a6\u09cd\u09a7"},
-            {FORMAT_AS_LONG, 50000000000000.0, "\u09eb\u09e6 \u09b6\u09a4 \u09aa\u09f0\u09be\u09f0\u09cd\u09a6\u09cd\u09a7"},
-            {FORMAT_AS_LONG, 500000000000000.0, "\u09eb\u09e6\u09e6 \u09b6\u09a4 \u09aa\u09f0\u09be\u09f0\u09cd\u09a6\u09cd\u09a7"},
-            {FORMAT_AS_LONG, 5000000000000000.0, "\u09eb\u09e6\u09e6\u09e6 \u09b6\u09a4 \u09aa\u09f0\u09be\u09f0\u09cd\u09a6\u09cd\u09a7"},
+            {FORMAT_AS_LONG, 5000.0, "৫ হাজাৰ"},
+            {FORMAT_AS_LONG, 50000.0, "৫০ হাজাৰ"},
+            {FORMAT_AS_LONG, 500000.0, "৫ লাখ"},
+            {FORMAT_AS_LONG, 5000000.0, "৫ নিযুত"},
+            {FORMAT_AS_LONG, 50000000.0, "৫০ নিযুত"},
+            {FORMAT_AS_LONG, 500000000.0, "৫০০ নিযুত"},
+            {FORMAT_AS_LONG, 5000000000.0, "৫ শত কোটি"},
+            {FORMAT_AS_LONG, 50000000000.0, "৫০ শত কোটি"},
+            {FORMAT_AS_LONG, 500000000000.0, "৫০০ শত কোটি"},
+            {FORMAT_AS_LONG, 5000000000000.0, "৫ শত পৰাৰ্দ্ধ"},
+            {FORMAT_AS_LONG, 50000000000000.0, "৫০ শত পৰাৰ্দ্ধ"},
+            {FORMAT_AS_LONG, 500000000000000.0, "৫০০ শত পৰাৰ্দ্ধ"},
+            {FORMAT_AS_LONG, 5000000000000000.0, "৫০০০ শত পৰাৰ্দ্ধ"},
             {FORMAT_AS_LONG, new BigInteger("12345678901234567890"),
-                "\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ef \u09b6\u09a4 \u09aa\u09f0\u09be\u09f0\u09cd\u09a6\u09cd\u09a7"},
+                "১২৩৪৫৬৭৯ শত পৰাৰ্দ্ধ"},
             {FORMAT_AS_LONG, new BigDecimal("12345678901234567890123466767.89"),
-                "\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ee\u09ef\u09e6\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ee \u09b6\u09a4 \u09aa\u09f0\u09be\u09f0\u09cd\u09a6\u09cd\u09a7"},
+                "১২৩৪৫৬৭৮৯০১২৩৪৫৬৮ শত পৰাৰ্দ্ধ"},
             {FORMAT_BRX_SHORT, 999, "999"},
-            {FORMAT_BRX_SHORT, 999.99, "1\u0915\u0947"},
-            {FORMAT_BRX_SHORT, 99000, "99\u0915\u0947"},
-            {FORMAT_BRX_SHORT, 330000, "330\u0915\u0947"},
-            {FORMAT_BRX_SHORT, 3000.90, "3\u0915\u0947"},
-            {FORMAT_BRX_SHORT, 1000000, "1\u090f\u092e"},
+            {FORMAT_BRX_SHORT, 999.99, "1के"},
+            {FORMAT_BRX_SHORT, 99000, "99के"},
+            {FORMAT_BRX_SHORT, 330000, "330के"},
+            {FORMAT_BRX_SHORT, 3000.90, "3के"},
+            {FORMAT_BRX_SHORT, 1000000, "1एम"},
             {FORMAT_BRX_SHORT, new BigInteger("12345678901234567890"),
-                    "12345679\u0924\u093f"},
+                    "12345679ति"},
             {FORMAT_BRX_SHORT, new BigDecimal("12345678901234567890.89"),
-                    "12345679\u0924\u093f"},
+                    "12345679ति"},
             // Less than 1000 no suffix
             {FORMAT_SW_LONG, 499, "499"},
             // Boundary number
@@ -340,24 +341,24 @@ public class TestCompactNumber {
             // No compact form
             {FORMAT_SE_SHORT, 999, "999"},
             // Long
-            {FORMAT_SE_SHORT, 8000000L, "8\u00a0mn"},
+            {FORMAT_SE_SHORT, 8000000L, "8 mn"},
             // Double
-            {FORMAT_SE_SHORT, 8000.98, "8\u00a0dt"},
+            {FORMAT_SE_SHORT, 8000.98, "8 dt"},
             // Big integer
-            {FORMAT_SE_SHORT, new BigInteger("12345678901234567890"), "12345679\u00a0bn"},
+            {FORMAT_SE_SHORT, new BigInteger("12345678901234567890"), "12345679 bn"},
             // Big decimal
-            {FORMAT_SE_SHORT, new BigDecimal("12345678901234567890.98"), "12345679\u00a0bn"},
+            {FORMAT_SE_SHORT, new BigDecimal("12345678901234567890.98"), "12345679 bn"},
             // Negatives
             // No compact form
-            {FORMAT_SE_SHORT, -999, "\u2212999"},
+            {FORMAT_SE_SHORT, -999, "−999"},
             // Long
-            {FORMAT_SE_SHORT, -8000000L, "\u22128\u00a0mn"},
+            {FORMAT_SE_SHORT, -8000000L, "−8 mn"},
             // Double
-            {FORMAT_SE_SHORT, -8000.98, "\u22128\u00a0dt"},
+            {FORMAT_SE_SHORT, -8000.98, "−8 dt"},
             // BigInteger
-            {FORMAT_SE_SHORT, new BigInteger("-12345678901234567890"), "\u221212345679\u00a0bn"},
+            {FORMAT_SE_SHORT, new BigInteger("-12345678901234567890"), "−12345679 bn"},
             // BigDecimal
-            {FORMAT_SE_SHORT, new BigDecimal("-12345678901234567890.98"), "\u221212345679\u00a0bn"},
+            {FORMAT_SE_SHORT, new BigDecimal("-12345678901234567890.98"), "−12345679 bn"},
 
             // Plurals
             // DE: one:i = 1 and v = 0
@@ -368,17 +369,17 @@ public class TestCompactNumber {
             //     few:v = 0 and i % 100 = 3..4 or v != 0
             {FORMAT_SL_LONG, 1_000_000, "1 milijon"},
             {FORMAT_SL_LONG, 2_000_000, "2 milijona"},
-            {FORMAT_SL_LONG, 3_000_000, "3 milijone"},
+            {FORMAT_SL_LONG, 3_000_000, "3 milijoni"},
             {FORMAT_SL_LONG, 5_000_000, "5 milijonov"},
             // Fractional plurals
             {FORMAT_ES_LONG_FD1, 1_234_500, "1,2 millones"},
             {FORMAT_DE_LONG_FD2, 1_234_500, "1,23 Millionen"},
             {FORMAT_IT_LONG_FD3, 1_234_500, "1,234 milioni"},
-            {FORMAT_PT_LONG_FD4, 1_234_500, "1,2345 milh\u00f5es"},
+            {FORMAT_PT_LONG_FD4, 1_234_500, "1,2345 milhões"},
 
             // 8338690
-            {FORMAT_PL_LONG, 5_000, "5 tysi\u0119cy"},
-            {FORMAT_PL_LONG, 4_949, "5 tysi\u0119cy"},
+            {FORMAT_PL_LONG, 5_000, "5 tysięcy"},
+            {FORMAT_PL_LONG, 4_949, "5 tysięcy"},
             {FORMAT_FR_LONG, 1_949, "2 mille"},
             {FORMAT_IT_LONG, 1_949, "2 mila"},
         };
@@ -387,16 +388,16 @@ public class TestCompactNumber {
     Object[][] compactParseData() {
         return new Object[][]{
                 // compact number format instance, string to parse, parsed number, return type
-                {FORMAT_DZ_LONG, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2"
-                        + "\u0F42 \u0F21", 1000L, Long.class},
-                {FORMAT_DZ_LONG, "-\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2"
-                        + "\u0F42 \u0F23", -3000L, Long.class},
-                {FORMAT_DZ_LONG, "\u0F51\u0F74\u0F44\u0F0B\u0F55\u0FB1\u0F74\u0F62"
-                        + "\u0F0B\u0F66\u0F0B\u0F61\u0F0B \u0F21"
-                        + "\u0F22\u0F23\u0F24\u0F25\u0F27", 1.23457E19, Double.class},
-                {FORMAT_DZ_LONG, "-\u0F51\u0F74\u0F44\u0F0B\u0F55\u0FB1\u0F74\u0F62"
-                        + "\u0F0B\u0F66\u0F0B\u0F61\u0F0B \u0F21"
-                        + "\u0F22\u0F23\u0F24\u0F25\u0F27", -1.23457E19, Double.class},
+                {FORMAT_DZ_LONG, "སྟོང་ཕྲ"
+                        + "ག ༡", 1000L, Long.class},
+                {FORMAT_DZ_LONG, "-སྟོང་ཕྲ"
+                        + "ག ༣", -3000L, Long.class},
+                {FORMAT_DZ_LONG, "དུང་ཕྱུར"
+                        + "་ས་ཡ་ ༡"
+                        + "༢༣༤༥༧", 1.23457E19, Double.class},
+                {FORMAT_DZ_LONG, "-དུང་ཕྱུར"
+                        + "་ས་ཡ་ ༡"
+                        + "༢༣༤༥༧", -1.23457E19, Double.class},
                 {FORMAT_EN_US_SHORT, "-0.0", -0.0, Double.class},
                 {FORMAT_EN_US_SHORT, "-0", -0.0, Double.class},
                 {FORMAT_EN_US_SHORT, "0", 0L, Long.class},
@@ -427,23 +428,23 @@ public class TestCompactNumber {
                 {FORMAT_EN_LONG, "12345679 trillion", 1.2345679E19, Double.class},
                 {FORMAT_HI_IN_LONG, "999", 999L, Long.class},
                 {FORMAT_HI_IN_LONG, "-999", -999L, Long.class},
-                {FORMAT_HI_IN_LONG, "1 \u0939\u091C\u093C\u093E\u0930", 1000L, Long.class},
-                {FORMAT_HI_IN_LONG, "-1 \u0939\u091C\u093C\u093E\u0930", -1000L, Long.class},
-                {FORMAT_HI_IN_LONG, "3 \u0939\u091C\u093C\u093E\u0930", 3000L, Long.class},
-                {FORMAT_HI_IN_LONG, "12345679 \u0916\u0930\u092C", 1234567900000000000L, Long.class},
-                {FORMAT_HI_IN_LONG, "-12345679 \u0916\u0930\u092C", -1234567900000000000L, Long.class},
+                {FORMAT_HI_IN_LONG, "1 हज़ार", 1000L, Long.class},
+                {FORMAT_HI_IN_LONG, "-1 हज़ार", -1000L, Long.class},
+                {FORMAT_HI_IN_LONG, "3 हज़ार", 3000L, Long.class},
+                {FORMAT_HI_IN_LONG, "12345679 खरब", 1234567900000000000L, Long.class},
+                {FORMAT_HI_IN_LONG, "-12345679 खरब", -1234567900000000000L, Long.class},
                 {FORMAT_JA_JP_SHORT, "-99", -99L, Long.class},
-                {FORMAT_JA_JP_SHORT, "1\u4E07", 10000L, Long.class},
-                {FORMAT_JA_JP_SHORT, "30\u4E07", 300000L, Long.class},
-                {FORMAT_JA_JP_SHORT, "-30\u4E07", -300000L, Long.class},
-                {FORMAT_JA_JP_SHORT, "12345679\u5146", 1.2345679E19, Double.class},
-                {FORMAT_JA_JP_SHORT, "-12345679\u5146", -1.2345679E19, Double.class},
+                {FORMAT_JA_JP_SHORT, "1万", 10000L, Long.class},
+                {FORMAT_JA_JP_SHORT, "30万", 300000L, Long.class},
+                {FORMAT_JA_JP_SHORT, "-30万", -300000L, Long.class},
+                {FORMAT_JA_JP_SHORT, "12345679兆", 1.2345679E19, Double.class},
+                {FORMAT_JA_JP_SHORT, "-12345679兆", -1.2345679E19, Double.class},
                 {FORMAT_IT_SHORT, "-99", -99L, Long.class},
-                {FORMAT_IT_SHORT, "1\u00a0Mln", 1000000L, Long.class},
-                {FORMAT_IT_SHORT, "30\u00a0Mln", 30000000L, Long.class},
-                {FORMAT_IT_SHORT, "-30\u00a0Mln", -30000000L, Long.class},
-                {FORMAT_IT_SHORT, "12345679\u00a0Bln", 1.2345679E19, Double.class},
-                {FORMAT_IT_SHORT, "-12345679\u00a0Bln", -1.2345679E19, Double.class},
+                {FORMAT_IT_SHORT, "1 Mln", 1000000L, Long.class},
+                {FORMAT_IT_SHORT, "30 Mln", 30000000L, Long.class},
+                {FORMAT_IT_SHORT, "-30 Mln", -30000000L, Long.class},
+                {FORMAT_IT_SHORT, "12345679 Bln", 1.2345679E19, Double.class},
+                {FORMAT_IT_SHORT, "-12345679 Bln", -1.2345679E19, Double.class},
                 {FORMAT_SW_LONG, "-0.0", -0.0, Double.class},
                 {FORMAT_SW_LONG, "499", 499L, Long.class},
                 {FORMAT_SW_LONG, "elfu 1", 1000L, Long.class},
@@ -461,17 +462,17 @@ public class TestCompactNumber {
                 {FORMAT_SW_LONG, "elfu 599.01", 599010L, Long.class},
                 {FORMAT_SW_LONG, "elfu -599.01", -599010L, Long.class},
                 {FORMAT_SE_SHORT, "999", 999L, Long.class},
-                {FORMAT_SE_SHORT, "8\u00a0mn", 8000000L, Long.class},
-                {FORMAT_SE_SHORT, "8\u00a0dt", 8000L, Long.class},
-                {FORMAT_SE_SHORT, "12345679\u00a0bn", 1.2345679E19, Double.class},
-                {FORMAT_SE_SHORT, "12345679,89\u00a0bn", 1.2345679890000001E19, Double.class},
+                {FORMAT_SE_SHORT, "8 mn", 8000000L, Long.class},
+                {FORMAT_SE_SHORT, "8 dt", 8000L, Long.class},
+                {FORMAT_SE_SHORT, "12345679 bn", 1.2345679E19, Double.class},
+                {FORMAT_SE_SHORT, "12345679,89 bn", 1.2345679890000001E19, Double.class},
                 {FORMAT_SE_SHORT, "\u2212999", -999L, Long.class},
                 {FORMAT_SE_SHORT, "\u22128\u00a0mn", -8000000L, Long.class},
                 // lenient parsing. Hyphen-minus should match the localized minus sign
-                {FORMAT_SE_SHORT, "-8\u00a0mn", -8000000L, Long.class},
-                {FORMAT_SE_SHORT, "\u22128\u00a0dt", -8000L, Long.class},
-                {FORMAT_SE_SHORT, "\u221212345679\u00a0bn", -1.2345679E19, Double.class},
-                {FORMAT_SE_SHORT, "\u221212345679,89\u00a0bn", -1.2345679890000001E19, Double.class},
+                {FORMAT_SE_SHORT, "−8 mn", -8000000L, Long.class},
+                {FORMAT_SE_SHORT, "\u22128 dt", -8000L, Long.class},
+                {FORMAT_SE_SHORT, "\u221212345679 bn", -1.2345679E19, Double.class},
+                {FORMAT_SE_SHORT, "\u221212345679,89 bn", -1.2345679890000001E19, Double.class},
 
                 // Plurals
                 // DE: one:i = 1 and v = 0
@@ -482,15 +483,15 @@ public class TestCompactNumber {
                 //     few:v = 0 and i % 100 = 3..4 or v != 0
                 {FORMAT_SL_LONG, "1 milijon",   1_000_000L, Long.class},
                 {FORMAT_SL_LONG, "2 milijona",  2_000_000L, Long.class},
-                {FORMAT_SL_LONG, "3 milijone",  3_000_000L, Long.class},
+                {FORMAT_SL_LONG, "3 milijoni",  3_000_000L, Long.class},
                 {FORMAT_SL_LONG, "5 milijonov", 5_000_000L, Long.class},
                 // Fractional plurals
                 {FORMAT_ES_LONG_FD1, "1,2 millones", 1_200_000L, Long.class},
                 {FORMAT_DE_LONG_FD2, "1,23 Millionen", 1_230_000L, Long.class},
                 {FORMAT_IT_LONG_FD3, "1,234 milioni", 1_234_000L, Long.class},
-                {FORMAT_PT_LONG_FD4, "1,2345 milh\u00f5es", 1_234_500L, Long.class},
+                {FORMAT_PT_LONG_FD4, "1,2345 milhões", 1_234_500L, Long.class},
                 // 8338690
-                {FORMAT_PL_LONG, "5 tysi\u0119cy", 5_000L, Long.class},
+                {FORMAT_PL_LONG, "5 tysięcy", 5_000L, Long.class},
                 {FORMAT_FR_LONG, "2 mille", 2_000L, Long.class},
                 {FORMAT_IT_LONG, "2 mila", 2_000L, Long.class},
         };
@@ -500,15 +501,15 @@ public class TestCompactNumber {
         return new Object[][]{
             // compact number instance, string to parse, null (no o/p; must throw exception)
             // no number
-            {FORMAT_DZ_LONG, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2"
-                + "\u0F42", null},
+            {FORMAT_DZ_LONG, "སྟོང་ཕྲ"
+                + "ག", null},
             // Invalid prefix
-            {FORMAT_DZ_LONG, "-\u0F66\u0F9F\u0F7C\u0F44,\u0F0B\u0F55\u0FB2"
-                + "\u0F42 \u0F23", null},
+            {FORMAT_DZ_LONG, "-སྟོང,་ཕྲ"
+                + "ག ༣", null},
             // Invalid prefix for en_US
             {FORMAT_EN_US_SHORT, "K12,347", null},
             // Invalid prefix for ja_JP
-            {FORMAT_JA_JP_SHORT, "\u4E071", null},
+            {FORMAT_JA_JP_SHORT, "万1", null},
         };
     }
 
@@ -516,8 +517,8 @@ public class TestCompactNumber {
         return new Object[][]{
             // compact number instance, string to parse, parsed number
             // Prefix and suffix do not match
-            {FORMAT_DZ_LONG, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2"
-                + "\u0F42 \u0F21 KM", 1000L},
+            {FORMAT_DZ_LONG, "སྟོང་ཕྲ"
+                + "ག ༡ KM", 1000L},
             // Exponents are unparseable
             {FORMAT_EN_US_SHORT, "-1.05E4K", -1.05},
             // Default instance does not allow grouping
@@ -525,15 +526,15 @@ public class TestCompactNumber {
             // Take partial suffix "K" as 1000 for en_US_SHORT patterns
             {FORMAT_EN_US_SHORT, "12KM", 12000L},
             // Invalid suffix
-            {FORMAT_HI_IN_LONG, "-1 \u00a0\u0915.", -1L},
+            {FORMAT_HI_IN_LONG, "-1  क.", -1L},
 
             // invalid plurals
             {FORMAT_DE_LONG, "2 Million", 2L},
             {FORMAT_SL_LONG, "2 milijon", 2L},
             {FORMAT_SL_LONG, "2 milijone", 2L},
             {FORMAT_SL_LONG, "2 milijonv", 2L},
+            {FORMAT_SL_LONG, "5 milijona", 5L},
             {FORMAT_SL_LONG, "3 milijon", 3L},
-            {FORMAT_SL_LONG, "3 milijona", 3L},
             {FORMAT_SL_LONG, "3 milijonv", 3L},
             {FORMAT_SL_LONG, "5 milijon", 5L},
             {FORMAT_SL_LONG, "5 milijona", 5L},
@@ -548,14 +549,14 @@ public class TestCompactNumber {
     Object[][] formatFieldPositionData() {
         return new Object[][]{
             //compact number instance, number to format, field, start position, end position, formatted string
-            {FORMAT_DZ_LONG, -3500, NumberFormat.Field.SIGN, 0, 1, "-\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2\u0F42 \u0F24"},
-            {FORMAT_DZ_LONG, 3500, NumberFormat.Field.INTEGER, 9, 10, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2\u0F42 \u0F24"},
-            {FORMAT_DZ_LONG, -3500, NumberFormat.Field.INTEGER, 10, 11, "-\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2\u0F42 \u0F24"},
-            {FORMAT_DZ_LONG, 999, NumberFormat.Field.INTEGER, 0, 3, "\u0F29\u0F29\u0F29"},
-            {FORMAT_DZ_LONG, -999, NumberFormat.Field.INTEGER, 1, 4, "-\u0F29\u0F29\u0F29"},
-            {FORMAT_DZ_LONG, 3500, NumberFormat.Field.PREFIX, 0, 9, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2\u0F42 \u0F24"},
-            {FORMAT_DZ_LONG, -3500, NumberFormat.Field.PREFIX, 0, 10, "-\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2\u0F42 \u0F24"},
-            {FORMAT_DZ_LONG, 999, NumberFormat.Field.PREFIX, 0, 0, "\u0F29\u0F29\u0F29"},
+            {FORMAT_DZ_LONG, -3500, NumberFormat.Field.SIGN, 0, 1, "-སྟོང་ཕྲག ༤"},
+            {FORMAT_DZ_LONG, 3500, NumberFormat.Field.INTEGER, 9, 10, "སྟོང་ཕྲག ༤"},
+            {FORMAT_DZ_LONG, -3500, NumberFormat.Field.INTEGER, 10, 11, "-སྟོང་ཕྲག ༤"},
+            {FORMAT_DZ_LONG, 999, NumberFormat.Field.INTEGER, 0, 3, "༩༩༩"},
+            {FORMAT_DZ_LONG, -999, NumberFormat.Field.INTEGER, 1, 4, "-༩༩༩"},
+            {FORMAT_DZ_LONG, 3500, NumberFormat.Field.PREFIX, 0, 9, "སྟོང་ཕྲག ༤"},
+            {FORMAT_DZ_LONG, -3500, NumberFormat.Field.PREFIX, 0, 10, "-སྟོང་ཕྲག ༤"},
+            {FORMAT_DZ_LONG, 999, NumberFormat.Field.PREFIX, 0, 0, "༩༩༩"},
             {FORMAT_EN_US_SHORT, -3500, NumberFormat.Field.SIGN, 0, 1, "-4K"},
             {FORMAT_EN_US_SHORT, 3500, NumberFormat.Field.INTEGER, 0, 1, "4K"},
             {FORMAT_EN_US_SHORT, 14900000067L, NumberFormat.Field.INTEGER, 0, 2, "15B"},
@@ -566,49 +567,49 @@ public class TestCompactNumber {
             {FORMAT_EN_LONG, 14900000067L, NumberFormat.Field.INTEGER, 0, 2, "15 billion"},
             {FORMAT_EN_LONG, 3500, NumberFormat.Field.SUFFIX, 1, 10, "4 thousand"},
             {FORMAT_EN_LONG, 14900000067L, NumberFormat.Field.SUFFIX, 2, 10, "15 billion"},
-            {FORMAT_JA_JP_SHORT, 14900000067L, NumberFormat.Field.INTEGER, 0, 3, "149\u5104"},
+            {FORMAT_JA_JP_SHORT, 14900000067L, NumberFormat.Field.INTEGER, 0, 3, "149億"},
             {FORMAT_JA_JP_SHORT, -999.99, NumberFormat.Field.INTEGER, 1, 6, "-1,000"},
-            {FORMAT_JA_JP_SHORT, 14900000067L, NumberFormat.Field.SUFFIX, 3, 4, "149\u5104"},
+            {FORMAT_JA_JP_SHORT, 14900000067L, NumberFormat.Field.SUFFIX, 3, 4, "149億"},
             {FORMAT_JA_JP_SHORT, -999.99, NumberFormat.Field.SUFFIX, 0, 0, "-1,000"},
             {FORMAT_JA_JP_SHORT, -999.99, NumberFormat.Field.SIGN, 0, 1, "-1,000"},
             {FORMAT_HI_IN_LONG, -14900000067L, NumberFormat.Field.SIGN, 0, 1,
-                "-15 \u0905\u0930\u092C"},
+                "-15 अरब"},
             {FORMAT_HI_IN_LONG, 3500, NumberFormat.Field.INTEGER, 0, 1,
-                "4 \u0939\u091C\u093C\u093E\u0930"},
+                "4 हज़ार"},
             {FORMAT_HI_IN_LONG, 14900000067L, NumberFormat.Field.INTEGER, 0, 2,
-                "15 \u0905\u0930\u092C"},
+                "15 अरब"},
             {FORMAT_HI_IN_LONG, 3500, NumberFormat.Field.SUFFIX, 1, 7,
-                "4 \u0939\u091C\u093C\u093E\u0930"},
+                "4 हज़ार"},
             {FORMAT_HI_IN_LONG, 14900000067L, NumberFormat.Field.SUFFIX, 2, 6,
-                "15 \u0905\u0930\u092C"},
-            {FORMAT_SE_SHORT, 8000000L, NumberFormat.Field.SUFFIX, 1, 4, "8\u00a0mn"},
-            {FORMAT_SE_SHORT, 8000.98, NumberFormat.Field.SUFFIX, 1, 4, "8\u00a0dt"},
-            {FORMAT_SE_SHORT, new BigInteger("12345678901234567890"), NumberFormat.Field.SUFFIX, 8, 11, "12345679\u00a0bn"},
-            {FORMAT_SE_SHORT, new BigDecimal("12345678901234567890.98"), NumberFormat.Field.SUFFIX, 8, 11, "12345679\u00a0bn"},
-            {FORMAT_SE_SHORT, -8000000L, NumberFormat.Field.INTEGER, 1, 2, "\u22128\u00a0mn"},
-            {FORMAT_SE_SHORT, -8000.98, NumberFormat.Field.SIGN, 0, 1, "\u22128\u00a0dt"},
-            {FORMAT_SE_SHORT, new BigDecimal("-48982865901234567890.98"), NumberFormat.Field.INTEGER, 1, 9, "\u221248982866\u00a0bn"},};
+                "15 अरब"},
+            {FORMAT_SE_SHORT, 8000000L, NumberFormat.Field.SUFFIX, 1, 4, "8 mn"},
+            {FORMAT_SE_SHORT, 8000.98, NumberFormat.Field.SUFFIX, 1, 4, "8 dt"},
+            {FORMAT_SE_SHORT, new BigInteger("12345678901234567890"), NumberFormat.Field.SUFFIX, 8, 11, "12345679 bn"},
+            {FORMAT_SE_SHORT, new BigDecimal("12345678901234567890.98"), NumberFormat.Field.SUFFIX, 8, 11, "12345679 bn"},
+            {FORMAT_SE_SHORT, -8000000L, NumberFormat.Field.INTEGER, 1, 2, "−8 mn"},
+            {FORMAT_SE_SHORT, -8000.98, NumberFormat.Field.SIGN, 0, 1, "−8 dt"},
+            {FORMAT_SE_SHORT, new BigDecimal("-48982865901234567890.98"), NumberFormat.Field.INTEGER, 1, 9, "−48982866 bn"},};
     }
 
     Object[][] varParsePosition() {
         return new Object[][]{
                 // compact number instance, parse string, parsed number,
                 // start position, end position, error index
-                {FORMAT_DZ_LONG, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2"
-                        + "\u0F42 \u0F21 KM", 1000L, 0, 10, -1},
+                {FORMAT_DZ_LONG, "སྟོང་ཕྲ"
+                        + "ག ༡ KM", 1000L, 0, 10, -1},
                 // Invalid prefix returns null
-                {FORMAT_DZ_LONG, "Number is: -\u0F66\u0F9F\u0F7C\u0F44,\u0F0B\u0F55\u0FB2"
-                        + "\u0F42 \u0F23", null, 11, 11, 11},
+                {FORMAT_DZ_LONG, "Number is: -སྟོང,་ཕྲ"
+                        + "ག ༣", null, 11, 11, 11},
                 // Returns null
-                {FORMAT_DZ_LONG, "\u0F66\u0F9F\u0F7C\u0F44\u0F0B\u0F55\u0FB2"
-                        + "\u0F42", null, 0, 0, 0},
+                {FORMAT_DZ_LONG, "སྟོང་ཕྲ"
+                        + "ག", null, 0, 0, 0},
                 {FORMAT_EN_US_SHORT, "Exponent: -1.05E4K", -1.05, 10, 15, -1},
                 // Default instance does not allow grouping
                 {FORMAT_EN_US_SHORT, "12,347", 12L, 0, 2, -1},
                 // Invalid suffix "KM" for en_US_SHORT patterns
                 {FORMAT_EN_US_SHORT, "12KM", 12000L, 0, 3, -1},
                 // Invalid suffix
-                {FORMAT_HI_IN_LONG, "-1 \u00a0\u0915.", -1L, 0, 2, -1},
+                {FORMAT_HI_IN_LONG, "-1  क.", -1L, 0, 2, -1},
                 {FORMAT_EN_LONG, "Number is: 12345679 trillion",
                         1.2345679E19, 11, 28, -1},
                 {FORMAT_EN_LONG, "Number is: -12345679 trillion",
diff --git a/test/jdk/java/text/Format/NumberFormat/Bug8132125.java b/test/jdk/java/text/Format/NumberFormat/Bug8132125.java
index 1f702a9ba24..00e4db74bad 100644
--- a/test/jdk/java/text/Format/NumberFormat/Bug8132125.java
+++ b/test/jdk/java/text/Format/NumberFormat/Bug8132125.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8132125 8202537
+ * @bug 8132125 8202537 8354548
  * @summary Checks Swiss' number elements
  * @modules jdk.localedata
  * @run junit Bug8132125
@@ -44,8 +44,8 @@ public class Bug8132125 {
         Locale deCH = Locale.of("de", "CH");
         NumberFormat nf = NumberFormat.getInstance(deCH);
 
-        // "\u002E" as decimal separator, "\u2019" as grouping separator
-        String expected = "54\u2019839\u2019483.142";
+        // "\u002E" as decimal separator, "\u0027" as grouping separator
+        String expected = "54'839'483.142";
         String actual = nf.format(54839483.1415);
         assertEquals(expected, actual, "incorrect number elements for de_CH");
     }
diff --git a/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java b/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java
index 291eab833c4..4e20ceb5495 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ import static org.testng.Assert.assertFalse;
  * chrono implementation.
  * Note: The exact result may depend on locale data provider's implementation.
  *
- * @bug 8171049 8224105 8240626
+ * @bug 8171049 8224105 8240626 8354548
  */
 @Test
 public class TestEraDisplayName {
@@ -132,7 +132,7 @@ public class TestEraDisplayName {
             { MinguoEra.ROC,        TextStyle.NARROW,   Locale.TAIWAN,  "\u6c11\u570b" },
 
             // HijrahEra
-            { HijrahEra.AH, TextStyle.FULL,     Locale.US,  "AH" },
+            { HijrahEra.AH, TextStyle.FULL,     Locale.US,  "Anno Hegirae" },
             { HijrahEra.AH, TextStyle.FULL,     EGYPT,      "\u0647\u0640" },
             { HijrahEra.AH, TextStyle.SHORT,    Locale.US,  "AH" },
             { HijrahEra.AH, TextStyle.SHORT,    EGYPT,      "\u0647\u0640" },
diff --git a/test/jdk/java/time/test/java/time/format/Skeletons_en_US.properties b/test/jdk/java/time/test/java/time/format/Skeletons_en_US.properties
index af3d46e308c..c274ffc0b32 100644
--- a/test/jdk/java/time/test/java/time/format/Skeletons_en_US.properties
+++ b/test/jdk/java/time/test/java/time/format/Skeletons_en_US.properties
@@ -1,3 +1,26 @@
+#
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 H=15
 h=3 PM
 j=3 PM
@@ -38,8 +61,8 @@ yM=1/2022
 yMEd=Wed, 1/26/2022
 yMMM=Jan 2022
 yMMMMEd=Wed, Jan 26, 2022
-GyM=Jan 2022 AD
-GyMEd=Wed, Jan 26, 2022 AD
+GyM=1/2022 AD
+GyMEd=Wed, 1/26/2022 AD
 GyMMM=Jan 2022 AD
 GyMMMMEd=Wed, Jan 26, 2022 AD
 yQQQ=Q1 2022
diff --git a/test/jdk/java/time/test/java/time/format/Skeletons_ja.properties b/test/jdk/java/time/test/java/time/format/Skeletons_ja.properties
index 1b8823d369e..98a2460d075 100644
--- a/test/jdk/java/time/test/java/time/format/Skeletons_ja.properties
+++ b/test/jdk/java/time/test/java/time/format/Skeletons_ja.properties
@@ -1,3 +1,26 @@
+#
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 H=15時
 h=午後3時
 j=15時
@@ -32,8 +55,8 @@ yM=4/1
 yMEd=4/1/26(水)
 yMMM=4年1月
 yMMMMEd=4年1月26日(水)
-GyM=令和4年1月
-GyMEd=令和4年1月26日(水)
+GyM=令和4/1
+GyMEd=令和4/1/26(水)
 GyMMM=令和4年1月
 GyMMMMEd=令和4年1月26日(水)
 
diff --git a/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java b/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java
index 4071d210191..aa8ff763aad 100644
--- a/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java
+++ b/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ import org.testng.annotations.Test;
 
 /**
  * Test DateTimeFormatter.ofLocalizedPattern() related methods.
- * @bug 8176706 8284840
+ * @bug 8176706 8284840 8354548
  */
 @Test
 public class TestLocalizedPattern {
diff --git a/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java b/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
index 550dc5b31c2..6b99fea5c7c 100644
--- a/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
+++ b/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8176841 8202537 8244245 8265315 8284840 8296248 8306116 8333582
- *      8346948
+ *      8346948 8354548
  * @summary Tests java.time classes deals with Unicode extensions
  *      correctly.
  * @modules jdk.localedata
@@ -104,41 +104,41 @@ public class TestUnicodeExtension {
             // Locale, Chrono override, Zone override, Expected Chrono, Expected Zone,
             // Expected formatted string
             {Locale.JAPAN, null, null, ISO, null,
-            "2017\u5e748\u670810\u65e5\u6728\u66dc\u65e5 15\u664215\u520600\u79d2 " +
-            "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593"
+            "2017年8月10日木曜日 15時15分00秒 " +
+            "米国太平洋夏時間"
             },
             {Locale.JAPAN, JAPANESE, null, ISO, null,
-            "2017\u5e748\u670810\u65e5\u6728\u66dc\u65e5 15\u664215\u520600\u79d2 " +
-            "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593"
+            "2017年8月10日木曜日 15時15分00秒 " +
+            "米国太平洋夏時間"
             },
             {Locale.JAPAN, JAPANESE, ASIATOKYO, ISO, ASIATOKYO,
-            "2017\u5e748\u670811\u65e5\u91d1\u66dc\u65e5 7\u664215\u520600\u79d2 " +
-            "\u65e5\u672c\u6a19\u6e96\u6642"
+            "2017年8月11日金曜日 7時15分00秒 " +
+            "日本標準時"
             },
 
             {JCAL, null, null, JAPANESE, null,
-            "Thursday, August 10, 29 Heisei, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 29 Heisei, 3:15:00 PM Pacific Daylight Time"
             },
             {JCAL, HIJRAH, null, JAPANESE, null,
-            "Thursday, August 10, 29 Heisei, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 29 Heisei, 3:15:00 PM Pacific Daylight Time"
             },
             {HCAL, JAPANESE, null, HIJRAH, null,
-            "Thursday, Dhu\u02bbl-Qi\u02bbdah 18, 1438 AH, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, Dhuʻl-Qiʻdah 18, 1438 AH, 3:15:00 PM Pacific Daylight Time"
             },
 
 
             {JPTYO, null, null, ISO, ASIATOKYO,
-            "Friday, August 11, 2017, 7:15:00\u202fAM Japan Standard Time"
+            "Friday, August 11, 2017, 7:15:00 AM Japan Standard Time"
             },
             {JPTYO, null, AMLA, ISO, ASIATOKYO,
-            "Friday, August 11, 2017, 7:15:00\u202fAM Japan Standard Time"
+            "Friday, August 11, 2017, 7:15:00 AM Japan Standard Time"
             },
             // invalid tz
             {Locale.forLanguageTag("en-US-u-tz-jpzzz"), null, null, ISO, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             {Locale.forLanguageTag("en-US-u-tz-jpzzz"), null, AMLA, ISO, AMLA,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
 
             {RG_GB, null, null, ISO, null,
@@ -147,43 +147,43 @@ public class TestUnicodeExtension {
 
             // DecimalStyle
             {Locale.forLanguageTag("en-US-u-nu-thai"), null, null, ISO, null,
-            "Thursday, August \u0e51\u0e50, \u0e52\u0e50\u0e51\u0e57, \u0e53:\u0e51\u0e55:" +
-            "\u0e50\u0e50\u202fPM Pacific Daylight Time"
+            "Thursday, August ๑๐, ๒๐๑๗, ๓:๑๕:" +
+            "๐๐ PM Pacific Daylight Time"
             },
             // DecimalStyle, "nu" vs "rg"
             {Locale.forLanguageTag("en-US-u-nu-thai-rg-uszzzz"), null, null, ISO, null,
-            "Thursday, August \u0e51\u0e50, \u0e52\u0e50\u0e51\u0e57, \u0e53:\u0e51\u0e55:" +
-            "\u0e50\u0e50\u202fPM Pacific Daylight Time"
+            "Thursday, August ๑๐, ๒๐๑๗, ๓:๑๕:" +
+            "๐๐ PM Pacific Daylight Time"
             },
             // DecimalStyle, invalid
             {Locale.forLanguageTag("en-US-u-nu-foo"), null, null, ISO, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             // DecimalStyle, locale default
             // Farsi uses Extended Arabic-Indic numbering system
             {Locale.forLanguageTag("fa"), null, null, ISO, null,
-            "\u067e\u0646\u062c\u0634\u0646\u0628\u0647 \u06f1\u06f0 \u0627\u0648\u062a " +
-            "\u06f2\u06f0\u06f1\u06f7\u060c \u0633\u0627\u0639\u062a \u06f1\u06f5:\u06f1\u06f5:" +
-            "\u06f0\u06f0 (\u0648\u0642\u062a \u062a\u0627\u0628\u0633\u062a\u0627\u0646\u06cc " +
-            "\u063a\u0631\u0628 \u0627\u0645\u0631\u06cc\u06a9\u0627)"
+            "پنجشنبه ۱۰ اوت " +
+            "۲۰۱۷، ساعت ۱۵:۱۵:" +
+            "۰۰ (وقت تابستانی " +
+            "غرب امریکا)"
             },
             // Farsi uses Extended Arabic-Indic numbering system
             // (should not be overridden with it, as "latn" is explicitly specified)
             {Locale.forLanguageTag("fa-u-nu-latn"), null, null, ISO, null,
-            "\u067e\u0646\u062c\u0634\u0646\u0628\u0647 10 \u0627\u0648\u062a 2017\u060c " +
-            "\u0633\u0627\u0639\u062a 15:15:00 (\u0648\u0642\u062a \u062a\u0627\u0628\u0633" +
-            "\u062a\u0627\u0646\u06cc \u063a\u0631\u0628 \u0627\u0645\u0631\u06cc\u06a9\u0627)"
+            "پنجشنبه 10 اوت 2017، " +
+            "ساعت 15:15:00 (وقت تابس" +
+            "تانی غرب امریکا)"
             },
             // Dzongkha uses Tibetan numbering system
             {Locale.forLanguageTag("dz"), null, null, ISO, null,
-            "\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b, \u0f66\u0fa4\u0fb1" +
-            "\u0f72\u0f0b\u0f63\u0f7c\u0f0b\u0f22\u0f20\u0f21\u0f27 \u0f5f\u0fb3\u0f0b\u0f56" +
-            "\u0f62\u0f92\u0fb1\u0f51\u0f0b\u0f54\u0f0b \u0f5a\u0f7a\u0f66\u0f0b\u0f21\u0f20 " +
-            "\u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51\u0f0b \u0f23 \u0f66\u0f90\u0f62\u0f0b\u0f58" +
-            "\u0f0b \u0f21\u0f25:\u0f20\u0f20 \u0f55\u0fb1\u0f72\u0f0b\u0f46\u0f0b \u0f56\u0fb1" +
-            "\u0f44\u0f0b\u0f68\u0f0b\u0f58\u0f72\u0f0b\u0f62\u0f72\u0f0b\u0f40\u0f0b\u0f54\u0f7a" +
-            "\u0f0b\u0f66\u0f72\u0f0b\u0f55\u0f72\u0f42\u0f0b\u0f49\u0f72\u0f53\u0f0b\u0f66\u0fb2" +
-            "\u0f74\u0f44\u0f0b\u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51"
+            "གཟའ་པ་སངས་, སྤྱ" +
+            "ི་ལོ་༢༠༡༧ ཟླ་བ" +
+            "རྒྱད་པ་ ཚེས་༡༠ " +
+            "ཆུ་ཚོད་ ༣ སྐར་མ" +
+            "་ ༡༥:༠༠ ཕྱི་ཆ་ བྱ" +
+            "ང་ཨ་མི་རི་ཀ་པེ" +
+            "་སི་ཕིག་ཉིན་སྲ" +
+            "ུང་ཆུ་ཚོད"
             },
         };
     }
@@ -194,41 +194,41 @@ public class TestUnicodeExtension {
             // Locale, Chrono override, Zone override, Expected Chrono, Expected Zone,
             // Expected formatted string
             {Locale.JAPAN, null, null, null, null,
-            "2017\u5e748\u670810\u65e5\u6728\u66dc\u65e5 15\u664215\u520600\u79d2 " +
-            "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593"
+            "2017年8月10日木曜日 15時15分00秒 " +
+            "米国太平洋夏時間"
             },
             {Locale.JAPAN, JAPANESE, null, JAPANESE, null,
-            "\u5e73\u621029\u5e748\u670810\u65e5\u6728\u66dc\u65e5 15\u664215\u520600\u79d2 " +
-            "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593"
+            "平成29年8月10日木曜日 15時15分00秒 " +
+            "米国太平洋夏時間"
             },
             {Locale.JAPAN, JAPANESE, ASIATOKYO, JAPANESE, ASIATOKYO,
-            "\u5e73\u621029\u5e748\u670811\u65e5\u91d1\u66dc\u65e5 7\u664215\u520600\u79d2 " +
-            "\u65e5\u672c\u6a19\u6e96\u6642"
+            "平成29年8月11日金曜日 7時15分00秒 " +
+            "日本標準時"
             },
 
             {JCAL, null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             {JCAL, HIJRAH, null, HIJRAH, null,
-            "Thursday, Dhu\u02bbl-Qi\u02bbdah 18, 1438 AH, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, Dhuʻl-Qiʻdah 18, 1438 AH, 3:15:00 PM Pacific Daylight Time"
             },
             {HCAL, JAPANESE, null, JAPANESE, null,
-            "Thursday, August 10, 29 Heisei, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 29 Heisei, 3:15:00 PM Pacific Daylight Time"
             },
 
 
             {JPTYO, null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             {JPTYO, null, AMLA, null, AMLA,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             // invalid tz
             {Locale.forLanguageTag("en-US-u-tz-jpzzz"), null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             {Locale.forLanguageTag("en-US-u-tz-jpzzz"), null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
 
             {RG_GB, null, null, null, null,
@@ -237,42 +237,42 @@ public class TestUnicodeExtension {
 
             // DecimalStyle
             {Locale.forLanguageTag("en-US-u-nu-thai"), null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             // DecimalStyle, "nu" vs "rg"
             {Locale.forLanguageTag("en-US-u-nu-thai-rg-uszzzz"), null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             // DecimalStyle, invalid
             {Locale.forLanguageTag("en-US-u-nu-foo"), null, null, null, null,
-            "Thursday, August 10, 2017, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 2017, 3:15:00 PM Pacific Daylight Time"
             },
             // DecimalStyle, locale default
             // Farsi uses Extended Arabic-Indic numbering system
             // (should not be overridden with it)
             {Locale.forLanguageTag("fa"), null, null, null, null,
-            "\u067e\u0646\u062c\u0634\u0646\u0628\u0647 10 \u0627\u0648\u062a 2017\u060c " +
-            "\u0633\u0627\u0639\u062a 15:15:00 (\u0648\u0642\u062a \u062a\u0627\u0628\u0633" +
-            "\u062a\u0627\u0646\u06cc \u063a\u0631\u0628 \u0627\u0645\u0631\u06cc\u06a9\u0627)"
+            "پنجشنبه 10 اوت 2017، " +
+            "ساعت 15:15:00 (وقت تابس" +
+            "تانی غرب امریکا)"
             },
             // Farsi uses Extended Arabic-Indic numbering system
             // (should not be overridden with it)
             {Locale.forLanguageTag("fa-u-nu-latn"), null, null, null, null,
-            "\u067e\u0646\u062c\u0634\u0646\u0628\u0647 10 \u0627\u0648\u062a 2017\u060c " +
-            "\u0633\u0627\u0639\u062a 15:15:00 (\u0648\u0642\u062a \u062a\u0627\u0628\u0633" +
-            "\u062a\u0627\u0646\u06cc \u063a\u0631\u0628 \u0627\u0645\u0631\u06cc\u06a9\u0627)"
+            "پنجشنبه 10 اوت 2017، " +
+            "ساعت 15:15:00 (وقت تابس" +
+            "تانی غرب امریکا)"
             },
             // Dzongkha uses Tibetan numbering system
             // (should not be overridden with it)
             {Locale.forLanguageTag("dz"), null, null, null, null,
-            "\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b, \u0f66\u0fa4\u0fb1" +
-            "\u0f72\u0f0b\u0f63\u0f7c\u0f0b2017 \u0f5f\u0fb3\u0f0b\u0f56\u0f62\u0f92\u0fb1" +
-            "\u0f51\u0f0b\u0f54\u0f0b \u0f5a\u0f7a\u0f66\u0f0b10 \u0f46\u0f74\u0f0b\u0f5a" +
-            "\u0f7c\u0f51\u0f0b 3 \u0f66\u0f90\u0f62\u0f0b\u0f58\u0f0b 15:00 \u0f55\u0fb1" +
-            "\u0f72\u0f0b\u0f46\u0f0b \u0f56\u0fb1\u0f44\u0f0b\u0f68\u0f0b\u0f58\u0f72\u0f0b" +
-            "\u0f62\u0f72\u0f0b\u0f40\u0f0b\u0f54\u0f7a\u0f0b\u0f66\u0f72\u0f0b\u0f55\u0f72" +
-            "\u0f42\u0f0b\u0f49\u0f72\u0f53\u0f0b\u0f66\u0fb2\u0f74\u0f44\u0f0b\u0f46\u0f74" +
-            "\u0f0b\u0f5a\u0f7c\u0f51"
+            "གཟའ་པ་སངས་, སྤྱ" +
+            "ི་ལོ་2017 ཟླ་བརྒྱ" +
+            "ད་པ་ ཚེས་10 ཆུ་ཚ" +
+            "ོད་ 3 སྐར་མ་ 15:00 ཕྱ" +
+            "ི་ཆ་ བྱང་ཨ་མི་" +
+            "རི་ཀ་པེ་སི་ཕི" +
+            "ག་ཉིན་སྲུང་ཆུ" +
+            "་ཚོད"
             },
         };
     }
@@ -346,7 +346,7 @@ public class TestUnicodeExtension {
     Object[][] shortTZID() {
         return new Object[][] {
             // LDML's short ID, Expected Zone,
-            // Based on timezone.xml from CLDR v47
+            // Based on timezone.xml from CLDR v48
             {"adalv", "Europe/Andorra"},
             {"aedxb", "Asia/Dubai"},
             {"afkbl", "Asia/Kabul"},
@@ -356,7 +356,7 @@ public class TestUnicodeExtension {
             {"amevn", "Asia/Yerevan"},
             {"ancur", "America/Curacao"},
             {"aolad", "Africa/Luanda"},
-            {"aqams", "Pacific/Auckland"},
+            {"aqams", "Antarctica/McMurdo"},
             {"aqcas", "Antarctica/Casey"},
             {"aqdav", "Antarctica/Davis"},
             {"aqddu", "Antarctica/DumontDUrville"},
@@ -821,10 +821,10 @@ public class TestUnicodeExtension {
     Object[][] getLocalizedDateTimePattern() {
         return new Object[][] {
             // Locale, Expected pattern,
-            {Locale.US, FormatStyle.FULL, "EEEE, MMMM d, y, h:mm:ss\u202fa zzzz"},
-            {Locale.US, FormatStyle.LONG, "MMMM d, y, h:mm:ss\u202fa z"},
-            {Locale.US, FormatStyle.MEDIUM, "MMM d, y, h:mm:ss\u202fa"},
-            {Locale.US, FormatStyle.SHORT, "M/d/yy, h:mm\u202fa"},
+            {Locale.US, FormatStyle.FULL, "EEEE, MMMM d, y, h:mm:ss a zzzz"},
+            {Locale.US, FormatStyle.LONG, "MMMM d, y, h:mm:ss a z"},
+            {Locale.US, FormatStyle.MEDIUM, "MMM d, y, h:mm:ss a"},
+            {Locale.US, FormatStyle.SHORT, "M/d/yy, h:mm a"},
             {RG_GB, FormatStyle.FULL, "EEEE, d MMMM y, HH:mm:ss zzzz"},
             {RG_GB, FormatStyle.LONG, "d MMMM y, HH:mm:ss z"},
             {RG_GB, FormatStyle.MEDIUM, "d MMM y, HH:mm:ss"},
diff --git a/test/jdk/java/util/Calendar/CalendarDataTest.java b/test/jdk/java/util/Calendar/CalendarDataTest.java
index 2fa767b081a..8d3678bbba9 100644
--- a/test/jdk/java/util/Calendar/CalendarDataTest.java
+++ b/test/jdk/java/util/Calendar/CalendarDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8190918 8202537 8221432 8231273 8265315 8284840 8333582
+ *      8354548
  * @summary Tests for region dependent calendar data, i.e.,
  *      firstDayOfWeek and minimalDaysInFirstWeek.
  * @modules jdk.localedata
@@ -41,12 +42,12 @@ public class CalendarDataTest {
     // golden data from CLDR
     private static final List<List<String>> FIRSTDAYDATA = List.of(
         List.of("1", "AG AS BD BR BS BT BW BZ CA CO DM DO ET GT " +
-            "GU HK HN ID IL IN JM JP KE KH KR LA MH MM MO MT MX MZ " +
+            "GU HK HN ID IL IN IS JM JP KE KH KR LA MH MM MO MT MX MZ " +
             "NI NP PA PE PH PK PR PT PY SA SG SV TH TT TW UM US VE " +
             "VI WS YE ZA ZW"),
         List.of("2",   "001 AD AE AI AL AM AN AR AT AU AX AZ BA BE BG BM BN BY " +
             "CH CL CM CN CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP " +
-            "GR HR HU IE IS IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ " +
+            "GR HR HU IE IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ " +
             "MY NL NO NZ PL RE RO RS RU SE SI SK SM TJ TM TR UA UY UZ " +
             "VA VN XK"),
         List.of("6", "MV"),
diff --git a/test/jdk/java/util/Calendar/CldrFormatNamesTest.java b/test/jdk/java/util/Calendar/CldrFormatNamesTest.java
index 36369bef8a7..52d64185269 100644
--- a/test/jdk/java/util/Calendar/CldrFormatNamesTest.java
+++ b/test/jdk/java/util/Calendar/CldrFormatNamesTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8004489 8006509 8008577 8145136 8202537 8306116
+ * @bug 8004489 8006509 8008577 8145136 8202537 8306116 8354548
  * @summary Unit test for CLDR FormatData resources
  * @modules java.base/sun.util.locale.provider
  *          jdk.localedata
@@ -47,42 +47,42 @@ public class CldrFormatNamesTest {
     static final Object[][] CLDR_DATA = {
         {
             Locale.JAPAN,
-            "field.zone", "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3",
+            "field.zone", "タイムゾーン",
             "java.time.japanese.DatePatterns", new String[] {
-                "Gy\u5e74M\u6708d\u65e5EEEE",
-                "Gy\u5e74M\u6708d\u65e5",
-                "Gy\u5e74M\u6708d\u65e5",
+                "Gy年M月d日EEEE",
+                "Gy年M月d日",
+                "Gy年M月d日",
                 "GGGGGy/M/d",
             },
             "java.time.roc.DatePatterns", new String[] {
-                "Gy\u5e74M\u6708d\u65e5EEEE",
-                "Gy\u5e74M\u6708d\u65e5",
+                "Gy年M月d日EEEE",
+                "Gy年M月d日",
                 "Gy/MM/dd",
                 "Gy/MM/dd",
             },
-            "calendarname.buddhist", "\u4ecf\u66a6",
+            "calendarname.buddhist", "仏暦",
         },
         {
             Locale.PRC,
-            "field.zone", "\u65f6\u533a",
+            "field.zone", "时区",
             "java.time.islamic.DatePatterns", new String[] {
-                "Gy\u5e74M\u6708d\u65e5EEEE",
-                "Gy\u5e74M\u6708d\u65e5",
-                "Gy\u5e74M\u6708d\u65e5",
+                "Gy年M月d日EEEE",
+                "Gy年M月d日",
+                "Gy年M月d日",
                 "Gy/M/d",
             },
-            "calendarname.islamic", "\u4f0a\u65af\u5170\u5386",
+            "calendarname.islamic", "伊斯兰历",
         },
         {
             Locale.GERMANY,
-            "field.dayperiod", "Tagesh\u00e4lfte",
+            "field.dayperiod", "Tageshälfte",
             "java.time.islamic.DatePatterns", new String[] {
                 "EEEE, d. MMMM y G",
                 "d. MMMM y G",
                 "dd.MM.y G",
                 "dd.MM.yy GGGGG",
             },
-            "calendarname.islamic", "Hidschri-Kalender",
+            "calendarname.islamic", "Hidschra-Kalender",
         },
         {
             Locale.FRANCE,
@@ -93,34 +93,34 @@ public class CldrFormatNamesTest {
                 "d MMM y G",
                 "dd/MM/y GGGGG",
             },
-            "calendarname.islamic", "calendrier h\u00e9girien",
+            "calendarname.islamic", "calendrier hégirien",
         },
     };
 
     // Islamic calendar symbol names in ar
     private static final String[] ISLAMIC_MONTH_NAMES = {
-        "\u0645\u062d\u0631\u0645",
-        "\u0635\u0641\u0631",
-        "\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644",
-        "\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631",
-        "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649",
-        "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629",
-        "\u0631\u062c\u0628",
-        "\u0634\u0639\u0628\u0627\u0646",
-        "\u0631\u0645\u0636\u0627\u0646",
-        "\u0634\u0648\u0627\u0644",
-        "\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629",
-        "\u0630\u0648 \u0627\u0644\u062d\u062c\u0629",
+        "محرم",
+        "صفر",
+        "ربيع الأول",
+        "ربيع الآخر",
+        "جمادى الأولى",
+        "جمادى الآخرة",
+        "رجب",
+        "شعبان",
+        "رمضان",
+        "شوال",
+        "ذو القعدة",
+        "ذو الحجة",
     };
     private static final String[] ISLAMIC_ERA_NAMES = {
         "",
-        "\u0647\u0640",
+        "هـ",
     };
 
     // Minguo calendar symbol names in zh_Hant
     private static final String[] ROC_ERA_NAMES = {
-        "\u6c11\u570b\u524d",
-        "\u6c11\u570b",
+        "民國前",
+        "民國",
     };
 
     private static int errors = 0;
diff --git a/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java b/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java
index 71606933bfb..7e40985e326 100644
--- a/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java
@@ -24,7 +24,7 @@
 /*
  *
  * @test
- * @bug 8176841 8202537
+ * @bug 8176841 8202537 8354548
  * @summary Tests the display names for BCP 47 U extensions
  * @modules jdk.localedata
  * @run junit DisplayNameTests
@@ -78,11 +78,11 @@ public class DisplayNameTests {
         return new Object[][] {
             // Locale for display, Test Locale, Expected output,
             {Locale.US, loc1,
-            "English (Latin, United States, Japanese Calendar, Accounting Currency Format, Pinyin Sort Order, Currency: Japanese Yen, Prefer Emoji Presentation For Emoji Characters, First Day of Week Is Wednesday, 24 Hour System (0\u201323), Loose Line Break Style, Allow Line Breaks In All Words, Imperial Measurement System, Roman Numerals, Region For Supplemental Data: United Kingdom, Region Subdivision: gbsct, Suppress Sentence Breaks After Standard Abbreviations, Time Zone: Japan Time, POSIX Compliant Locale)"},
+            "English (Latin, United States, Japanese Calendar, Accounting Currency Format, Pinyin Sort Order, Currency: Japanese Yen, Emoji Presentation For Emoji, First day of week: Wednesday, 24 Hour System (0–23), Loose Line Break Style, Allow Line Breaks In All Words, Imperial Measurement System, Roman Numerals, Region For Supplemental Data: United Kingdom, Region Subdivision: gbsct, Suppress Sentence Breaks After Standard Abbreviations, Time Zone: Japan Time, POSIX Compliant Locale)"},
             {Locale.JAPAN, loc1,
-            "\u82f1\u8a9e (\u30e9\u30c6\u30f3\u6587\u5b57\u3001\u30a2\u30e1\u30ea\u30ab\u5408\u8846\u56fd\u3001\u548c\u66a6\u3001\u4f1a\u8a08\u901a\u8ca8\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3001\u30d4\u30f3\u30a4\u30f3\u9806\u3001\u901a\u8ca8: \u65e5\u672c\u5186\u3001em: emoji\u3001fw: wed\u300124\u6642\u9593\u5236(0\u301c23)\u3001\u7981\u5247\u51e6\u7406(\u5f31)\u3001lw: breakall\u3001\u30e4\u30fc\u30c9\u30fb\u30dd\u30f3\u30c9\u6cd5\u3001\u30ed\u30fc\u30de\u6570\u5b57\u3001rg: \u30a4\u30ae\u30ea\u30b9\u3001sd: gbsct\u3001ss: standard\u3001\u30bf\u30a4\u30e0\u30be\u30fc\u30f3: \u65e5\u672c\u6642\u9593\u3001\u30ed\u30b1\u30fc\u30eb\u306e\u30d0\u30ea\u30a2\u30f3\u30c8: posix)"},
+            "英語 (ラテン文字、アメリカ合衆国、和暦、会計通貨フォーマット、ピンイン順、通貨: 日本円、絵文字表示方法: emoji、fw: wed、24時間制(0〜23)、禁則処理(弱)、単語途中の改行: breakall、ヤード・ポンド法、ローマ数字、rg: イギリス、sd: gbsct、略語の後の文分割: standard、タイムゾーン: 日本時間、ロケールのバリアント: posix)"},
             {Locale.forLanguageTag("hi-IN"), loc1,
-            "\u0905\u0902\u0917\u094d\u0930\u0947\u091c\u093c\u0940 (\u0932\u0948\u091f\u093f\u0928, \u0938\u0902\u092f\u0941\u0915\u094d\u0924 \u0930\u093e\u091c\u094d\u092f, \u091c\u093e\u092a\u093e\u0928\u0940 \u092a\u0902\u091a\u093e\u0902\u0917, \u0932\u0947\u0916\u093e\u0902\u0915\u0928 \u092e\u0941\u0926\u094d\u0930\u093e \u092a\u094d\u0930\u093e\u0930\u0942\u092a, \u092a\u093f\u0928\u092f\u093f\u0928 \u0935\u0930\u094d\u0917\u0940\u0915\u0930\u0923 \u0915\u094d\u0930\u092e, \u092e\u0941\u0926\u094d\u0930\u093e: \u091c\u093e\u092a\u093e\u0928\u0940 \u092f\u0947\u0928, em: emoji, fw: wed, 24 \u0918\u0902\u091f\u094b\u0902 \u0915\u0940 \u092a\u094d\u0930\u0923\u093e\u0932\u0940 (0\u201323), \u0922\u0940\u0932\u0940 \u092a\u0902\u0915\u094d\u0924\u093f \u0935\u093f\u091a\u094d\u091b\u0947\u0926 \u0936\u0948\u0932\u0940, lw: breakall, \u0907\u092e\u094d\u092a\u0940\u0930\u093f\u092f\u0932 \u092e\u093e\u092a\u0928 \u092a\u094d\u0930\u0923\u093e\u0932\u0940, \u0930\u094b\u092e\u0928 \u0938\u0902\u0916\u094d\u092f\u093e\u090f\u0901, rg: \u092f\u0942\u0928\u093e\u0907\u091f\u0947\u0921 \u0915\u093f\u0902\u0917\u0921\u092e, sd: gbsct, ss: standard, \u0938\u092e\u092f \u0915\u094d\u0937\u0947\u0924\u094d\u0930: \u091c\u093e\u092a\u093e\u0928 \u0938\u092e\u092f, \u0938\u094d\u0925\u093e\u0928\u0940\u092f \u092a\u094d\u0930\u0915\u093e\u0930: posix)"},
+            "अंग्रेज़ी (लैटिन, संयुक्त राज्य, जापानी पंचांग, लेखांकन मुद्रा प्रारूप, पिनयिन वर्गीकरण क्रम, मुद्रा: जापानी येन, इमोजी का प्रज़ेंटेशन: emoji, fw: wed, 24 घंटों की प्रणाली (0–23), ढीली पंक्ति विच्छेद शैली, शब्दों के बीच पंक्ति विच्छेद: breakall, इम्पीरियल मापन प्रणाली, रोमन संख्याएँ, rg: यूनाइटेड किंगडम, sd: gbsct, संक्षेपण के बाद वाक्य विच्छेद: standard, समय क्षेत्र: जापान समय, स्थानीय प्रकार: posix)"},
 
             // cases where no localized types are available. fall back to "key: type"
             {Locale.US, Locale.forLanguageTag("en-u-ca-unknown"), "English (Calendar: unknown)"},
@@ -93,8 +93,8 @@ public class DisplayNameTests {
             {Locale.US, loc4, "United States (Japanese Calendar)"},
             {Locale.US, loc5, ""},
 
-            // invalid cases
-            {loc6, loc6, "\u4e2d\u6587 (\u4e2d\u56fd\uff0c\u65e5\u5386\uff1adddd\uff0c\u8d27\u5e01\uff1addd\uff0cfw\uff1amoq\uff0c\u6570\u5b57\uff1addd\uff0crg\uff1atwzz\uff0c\u65f6\u533a\uff1aunknown)"},
+            // non localizable cases
+            {loc6, loc6, "中文 (中国，日历：dddd，货币：ddd，fw：moq，数字：ddd，rg：twzz，时区：unknown)"},
             {Locale.US, loc6, "Chinese (China, Calendar: dddd, Currency: ddd, First day of week: moq, Numbers: ddd, Region For Supplemental Data: twzz, Time Zone: unknown)"},
         };
     }
diff --git a/test/jdk/java/util/Locale/bcp47u/FormatTests.java b/test/jdk/java/util/Locale/bcp47u/FormatTests.java
index 4ad676e56c5..952a8c47821 100644
--- a/test/jdk/java/util/Locale/bcp47u/FormatTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/FormatTests.java
@@ -24,7 +24,7 @@
 /*
  *
  * @test
- * @bug 8176841 8194148 8284840 8306116 8333582
+ * @bug 8176841 8194148 8284840 8306116 8333582 8354548
  * @summary Tests *Format class deals with Unicode extensions
  *      correctly.
  * @modules jdk.localedata
@@ -96,7 +96,7 @@ public class FormatTests {
 
             // -ca
             {JCAL, "java.util.JapaneseImperialCalendar", null,
-            "Thursday, August 10, 29 Heisei, 3:15:00\u202fPM Pacific Daylight Time"
+            "Thursday, August 10, 29 Heisei at 3:15:00\u202fPM Pacific Daylight Time"
             },
 
             // -tz
diff --git a/test/jdk/java/util/Locale/bcp47u/spi/LocaleNameProviderTests.java b/test/jdk/java/util/Locale/bcp47u/spi/LocaleNameProviderTests.java
index 2ff229fa1c9..f39ca802530 100644
--- a/test/jdk/java/util/Locale/bcp47u/spi/LocaleNameProviderTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/spi/LocaleNameProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  *
  * @test
- * @bug 8176841
+ * @bug 8176841 8354548
  * @summary Tests LocaleNameProvider SPIs
  * @library provider
  * @build provider/module-info provider/foo.LocaleNameProviderImpl
@@ -40,7 +40,7 @@ import java.util.Locale;
  * LocaleNameProvider works.
  */
 public class LocaleNameProviderTests {
-    private static final String expected = "foo (foo_ca:foo_japanese)";
+    private static final String expected = "foo (foo_ca=foo_japanese)";
 
     public static void main(String... args) {
         String name = Locale.forLanguageTag("foo-u-ca-japanese").getDisplayName(Locale.of("foo"));
diff --git a/test/jdk/java/util/Locale/bcp47u/spi/provider/foo/LocaleNameProviderImpl.java b/test/jdk/java/util/Locale/bcp47u/spi/provider/foo/LocaleNameProviderImpl.java
index 8bf1a8e597d..6a9fa06557a 100644
--- a/test/jdk/java/util/Locale/bcp47u/spi/provider/foo/LocaleNameProviderImpl.java
+++ b/test/jdk/java/util/Locale/bcp47u/spi/provider/foo/LocaleNameProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,6 @@ public class LocaleNameProviderImpl extends LocaleNameProvider {
 
     @Override
     public String getDisplayUnicodeExtensionType(String extType, String key, Locale target) {
-        return "foo_" + key + ":foo_" + extType;
+        return "foo_" + key + "=foo_" + extType;
     }
 }
diff --git a/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java b/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
index b6c80b6d7d0..0114c42375d 100644
--- a/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
+++ b/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
@@ -24,7 +24,7 @@
  /*
  * @test
  * @bug 8005471 8008577 8129881 8130845 8136518 8181157 8210490 8220037
- *      8234347 8236548 8317979
+ *      8234347 8236548 8317979 8354548
  * @modules jdk.localedata
  * @run main CLDRDisplayNamesTest
  * @summary Make sure that localized time zone names of CLDR are used
@@ -47,34 +47,28 @@ public class CLDRDisplayNamesTest {
     static final String[][] CLDR_DATA = {
         {
             "ja-JP",
-            "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u6a19\u6e96\u6642",
+            "米国太平洋標準時",
             "PST",
-            "\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u590f\u6642\u9593",
+            "米国太平洋夏時間",
             "PDT",
-            //"\u30a2\u30e1\u30ea\u30ab\u592a\u5e73\u6d0b\u6642\u9593",
-        //"PT"
         },
         {
             "zh-CN",
-            "\u5317\u7f8e\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4",
+            "北美太平洋标准时间",
             "PST",
-            "\u5317\u7f8e\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6\u95f4",
+            "北美太平洋夏令时间",
             "PDT",
-            //"\u5317\u7f8e\u592a\u5e73\u6d0b\u65f6\u95f4",
-        //"PT",
         },
         {
             "de-DE",
-            "Nordamerikanische Westk\u00fcsten-Normalzeit",
+            "Nordamerikanische Westküsten-Normalzeit",
             "PST",
-            "Nordamerikanische Westk\u00fcsten-Sommerzeit",
+            "Nordamerikanische Westküsten-Sommerzeit",
             "PDT",
-            //"Nordamerikanische Westk\u00fcstenzeit",
-        //"PT",
         },
     };
 
-    private static final String NO_INHERITANCE_MARKER = "\u2205\u2205\u2205";
+    private static final String NO_INHERITANCE_MARKER = "∅∅∅";
 
     public static void main(String[] args) {
         // Make sure that localized time zone names of CLDR are used
diff --git a/test/jdk/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr
index c56ad663798..9d81c50ae1e 100644
--- a/test/jdk/sun/text/resources/LocaleData.cldr
+++ b/test/jdk/sun/text/resources/LocaleData.cldr
@@ -1,5 +1,26 @@
 #
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 #
 # List of locale data for locale-data test
 #
@@ -2384,15 +2405,15 @@ FormatData/zh_HK/DayAbbreviations/1=週一
 FormatData/zh_HK/DayAbbreviations/2=週二
 FormatData/zh_HK/latn.NumberPatterns/1=¤#,##0.00
 CurrencyNames/zh_HK/HKD=HK$
-FormatData/zh_HK/TimePatterns/0=ah:mm:ss [zzzz]
-FormatData/zh_HK/TimePatterns/1=ah:mm:ss [z]
+FormatData/zh_HK/TimePatterns/0=ah:mm:ss '['zzzz']'
+FormatData/zh_HK/TimePatterns/1=ah:mm:ss '['z']'
 FormatData/zh_HK/TimePatterns/2=ah:mm:ss
 FormatData/zh_HK/TimePatterns/3=ah:mm
 FormatData/zh_HK/DatePatterns/0=y年M月d日EEEE
 FormatData/zh_HK/DatePatterns/1=y年M月d日
 FormatData/zh_HK/DatePatterns/2=y年M月d日
 FormatData/zh_HK/DatePatterns/3=d/M/y
-FormatData/zh_HK/DateTimePatterns/0={1} {0}
+FormatData/zh_HK/DateTimePatterns/0={1}{0}
 
 #bug #4149569
 LocaleNames/tr/TR=Türkiye
@@ -3216,8 +3237,8 @@ LocaleNames/es_US/kk=kazajo
 LocaleNames/es_US/km=jemer
 LocaleNames/es_US/kn=canarés
 LocaleNames/es_US/kr=kanuri
-LocaleNames/es_US/ks=cachemiro
-LocaleNames/es_US/ku=kurdo
+LocaleNames/es_US/ks=cachemir
+LocaleNames/es_US/ku=kurdo kurmanyi
 LocaleNames/es_US/kv=komi
 LocaleNames/es_US/kw=córnico
 LocaleNames/es_US/ky=kirguís
@@ -3249,7 +3270,7 @@ LocaleNames/es_US/sn=shona
 LocaleNames/es_US/ss=siswati
 LocaleNames/es_US/st=sesotho del sur
 LocaleNames/es_US/su=sundanés
-LocaleNames/es_US/sw=swahili
+LocaleNames/es_US/sw=suajili
 LocaleNames/es_US/tg=tayiko
 LocaleNames/es_US/tn=setsuana
 LocaleNames/es_US/to=tongano
@@ -3344,7 +3365,7 @@ LocaleNames/pt/gu=guzerate
 LocaleNames/pt/gv=manx
 LocaleNames/pt/ha=hauçá
 LocaleNames/pt/he=hebraico
-LocaleNames/pt/hi=híndi
+LocaleNames/pt/hi=hindi
 LocaleNames/pt/ho=hiri motu
 LocaleNames/pt/hr=croata
 LocaleNames/pt/ht=haitiano
@@ -3372,7 +3393,7 @@ LocaleNames/pt/kn=canarim
 LocaleNames/pt/ko=coreano
 LocaleNames/pt/kr=canúri
 LocaleNames/pt/ks=caxemira
-LocaleNames/pt/ku=curdo
+LocaleNames/pt/ku=curmânji
 LocaleNames/pt/kv=komi
 LocaleNames/pt/kw=córnico
 LocaleNames/pt/ky=quirguiz
@@ -3859,7 +3880,7 @@ LocaleNames/ga/CD=Poblacht Dhaonlathach an Chongó
 LocaleNames/ga/CF=Poblacht na hAfraice Láir
 LocaleNames/ga/CG=Congó-Brazzaville
 LocaleNames/ga/CH=an Eilvéis
-LocaleNames/ga/CI=An Cósta Eabhair
+LocaleNames/ga/CI=Côte d’Ivoire
 LocaleNames/ga/CK=Oileáin Cook
 LocaleNames/ga/CL=an tSile
 LocaleNames/ga/CM=Camarún
@@ -3867,7 +3888,7 @@ LocaleNames/ga/CN=an tSín
 LocaleNames/ga/CO=an Cholóim
 LocaleNames/ga/CR=Cósta Ríce
 LocaleNames/ga/CU=Cúba
-LocaleNames/ga/CV=Rinn Verde
+LocaleNames/ga/CV=Poblacht Cabo Verde
 LocaleNames/ga/CX=Oileán na Nollag
 LocaleNames/ga/CY=an Chipir
 LocaleNames/ga/CZ=an tSeicia
@@ -3875,11 +3896,11 @@ LocaleNames/ga/DE=an Ghearmáin
 LocaleNames/ga/DK=an Danmhairg
 LocaleNames/ga/DM=Doiminice
 LocaleNames/ga/DO=an Phoblacht Dhoiminiceach
-LocaleNames/ga/DZ=An Ailgéir
+LocaleNames/ga/DZ=an Ailgéir
 LocaleNames/ga/EC=Eacuadór
 LocaleNames/ga/EE=an Eastóin
-LocaleNames/ga/EG=An Éigipt
-LocaleNames/ga/EH=An Sahára Thiar
+LocaleNames/ga/EG=an Éigipt
+LocaleNames/ga/EH=an Sahára Thiar
 LocaleNames/ga/ES=an Spáinn
 LocaleNames/ga/ET=an Aetóip
 LocaleNames/ga/FI=an Fhionlainn
@@ -3895,8 +3916,8 @@ LocaleNames/ga/GF=Guáin na Fraince
 LocaleNames/ga/GH=Gána
 LocaleNames/ga/GI=Giobráltar
 LocaleNames/ga/GL=an Ghraonlainn
-LocaleNames/ga/GM=An Ghaimbia
-LocaleNames/ga/GN=An Ghuine
+LocaleNames/ga/GM=an Ghaimbia
+LocaleNames/ga/GN=an Ghuine
 LocaleNames/ga/GP=Guadalúip
 LocaleNames/ga/GQ=an Ghuine Mheánchiorclach
 LocaleNames/ga/GR=an Ghréig
@@ -3935,12 +3956,12 @@ LocaleNames/ga/KZ=an Chasacstáin
 LocaleNames/ga/LB=an Liobáin
 LocaleNames/ga/LI=Lichtinstéin
 LocaleNames/ga/LK=Srí Lanca
-LocaleNames/ga/LR=An Libéir
+LocaleNames/ga/LR=an Libéir
 LocaleNames/ga/LS=Leosóta
 LocaleNames/ga/LT=an Liotuáin
 LocaleNames/ga/LU=Lucsamburg
 LocaleNames/ga/LV=an Laitvia
-LocaleNames/ga/LY=An Libia
+LocaleNames/ga/LY=an Libia
 LocaleNames/ga/MA=Maracó
 LocaleNames/ga/MC=Monacó
 LocaleNames/ga/MD=an Mholdóiv
@@ -3950,7 +3971,7 @@ LocaleNames/ga/ML=Mailí
 LocaleNames/ga/MM=Maenmar (Burma)
 LocaleNames/ga/MN=an Mhongóil
 LocaleNames/ga/MP=Na hOileáin Mháirianacha Thuaidh
-LocaleNames/ga/MR=An Mháratái
+LocaleNames/ga/MR=an Mháratáin
 LocaleNames/ga/MS=Montsarat
 LocaleNames/ga/MT=Málta
 LocaleNames/ga/MU=Oileán Mhuirís
@@ -3961,9 +3982,9 @@ LocaleNames/ga/MY=an Mhalaeisia
 LocaleNames/ga/MZ=Mósaimbíc
 LocaleNames/ga/NA=an Namaib
 LocaleNames/ga/NC=an Nua-Chaladóin
-LocaleNames/ga/NE=An Nígir
+LocaleNames/ga/NE=an Nígir
 LocaleNames/ga/NF=Oileán Norfolk
-LocaleNames/ga/NG=An Nigéir
+LocaleNames/ga/NG=an Nigéir
 LocaleNames/ga/NI=Nicearagua
 LocaleNames/ga/NL=an Ísiltír
 LocaleNames/ga/NO=an Iorua
@@ -3989,7 +4010,7 @@ LocaleNames/ga/RW=Ruanda
 LocaleNames/ga/SA=an Araib Shádach
 LocaleNames/ga/SB=Oileáin Sholaimh
 LocaleNames/ga/SC=na Séiséil
-LocaleNames/ga/SD=An tSúdáin
+LocaleNames/ga/SD=an tSúdáin
 LocaleNames/ga/SE=an tSualainn
 LocaleNames/ga/SG=Singeapór
 LocaleNames/ga/SH=San Héilin
@@ -3998,13 +4019,13 @@ LocaleNames/ga/SJ=Svalbard agus Jan Mayen
 LocaleNames/ga/SK=an tSlóvaic
 LocaleNames/ga/SL=Siarra Leon
 LocaleNames/ga/SM=San Mairíne
-LocaleNames/ga/SN=An tSeineagáil
+LocaleNames/ga/SN=an tSeineagáil
 LocaleNames/ga/SO=an tSomáil
 LocaleNames/ga/SR=Suranam
 LocaleNames/ga/ST=São Tomé agus Príncipe
 LocaleNames/ga/SV=An tSalvadóir
 LocaleNames/ga/SY=an tSiria
-LocaleNames/ga/SZ=eSuaitíní
+LocaleNames/ga/SZ=Esuaitíní
 LocaleNames/ga/TC=Oileáin na dTurcach agus Caicos
 LocaleNames/ga/TD=Sead
 LocaleNames/ga/TF=Críocha Francacha Dheisceart an Domhain
@@ -4014,7 +4035,7 @@ LocaleNames/ga/TJ=an Táidsíceastáin
 LocaleNames/ga/TK=Tócalá
 LocaleNames/ga/TL=Tíomór Thoir
 LocaleNames/ga/TM=an Tuircméanastáin
-LocaleNames/ga/TN=An Tuinéis
+LocaleNames/ga/TN=an Tuinéis
 LocaleNames/ga/TR=an Tuirc
 LocaleNames/ga/TT=Oileán na Tríonóide agus Tobága
 LocaleNames/ga/TV=Túvalú
@@ -4133,7 +4154,7 @@ LocaleNames/sr/ja=јапански
 LocaleNames/sr/ka=грузијски
 LocaleNames/sr/km=кмерски
 LocaleNames/sr/ko=корејски
-LocaleNames/sr/ku=курдски
+LocaleNames/sr/ku=курманџи
 LocaleNames/sr/ky=киргиски
 LocaleNames/sr/la=латински
 LocaleNames/sr/lt=литвански
@@ -5328,7 +5349,7 @@ LocaleNames/es/kk=kazajo
 LocaleNames/es/km=jemer
 LocaleNames/es/kn=canarés
 LocaleNames/es/ks=cachemir
-LocaleNames/es/ku=kurdo
+LocaleNames/es/ku=kurmanji
 LocaleNames/es/ky=kirguís
 LocaleNames/es/lu=luba-katanga
 LocaleNames/es/mr=maratí
@@ -5447,7 +5468,7 @@ LocaleNames/nl/kn=Kannada
 LocaleNames/nl/ko=Koreaans
 LocaleNames/nl/kr=Kanuri
 LocaleNames/nl/ks=Kasjmiri
-LocaleNames/nl/ku=Koerdisch
+LocaleNames/nl/ku=Kurmanci
 LocaleNames/nl/kv=Komi
 LocaleNames/nl/kw=Cornish
 LocaleNames/nl/ky=Kirgizisch
@@ -6504,7 +6525,7 @@ CurrencyNames/zh_TW/mxn=墨西哥披索
 CurrencyNames/zh_TW/mxv=墨西哥轉換單位 (UDI)
 CurrencyNames/zh_TW/myr=馬來西亞令吉
 CurrencyNames/zh_TW/mzn=莫三比克梅蒂卡爾
-CurrencyNames/zh_TW/nio=尼加拉瓜金科多巴
+CurrencyNames/zh_TW/nio=尼加拉瓜科多巴
 CurrencyNames/zh_TW/rol=舊羅馬尼亞列伊
 CurrencyNames/zh_TW/ron=羅馬尼亞列伊
 CurrencyNames/zh_TW/rsd=塞爾維亞戴納
@@ -6521,9 +6542,9 @@ CurrencyNames/zh_TW/tzs=坦尚尼亞先令
 CurrencyNames/zh_TW/uzs=烏茲別克索姆
 CurrencyNames/zh_TW/veb=委內瑞拉玻利瓦 (1871–2008)
 CurrencyNames/zh_TW/vef=委內瑞拉玻利瓦 (2008–2018)
-CurrencyNames/zh_TW/xaf=法郎 (CFA–BEAC)
+CurrencyNames/zh_TW/xaf=中非法郎
 CurrencyNames/zh_TW/xag=白銀
-CurrencyNames/zh_TW/xof=法郎 (CFA–BCEAO)
+CurrencyNames/zh_TW/xof=西非法郎
 CurrencyNames/zh_TW/xpd=帕拉狄昂
 CurrencyNames/zh_TW/xpt=白金
 CurrencyNames/zh_TW/xts=測試用貨幣代碼
@@ -7867,7 +7888,7 @@ FormatData/nn/latn.NumberElements/0=,
 FormatData/nn/latn.NumberElements/1= 
 
 # CalendarData consolidated to root
-CalendarData//firstDayOfWeek=1: AG AS BD BR BS BT BW BZ CA CO DM DO ET GT GU HK HN ID IL IN JM JP KE KH KR LA MH MM MO MT MX MZ NI NP PA PE PH PK PR PT PY SA SG SV TH TT TW UM US VE VI WS YE ZA ZW;2: 001 AD AE AI AL AM AN AR AT AU AX AZ BA BE BG BM BN BY CH CL CM CN CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP GR HR HU IE IS IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ MY NL NO NZ PL RE RO RS RU SE SI SK SM TJ TM TR UA UY UZ VA VN XK;6: MV;7: AF BH DJ DZ EG IQ IR JO KW LY OM QA SD SY
+CalendarData//firstDayOfWeek=1: AG AS BD BR BS BT BW BZ CA CO DM DO ET GT GU HK HN ID IL IN IS JM JP KE KH KR LA MH MM MO MT MX MZ NI NP PA PE PH PK PR PT PY SA SG SV TH TT TW UM US VE VI WS YE ZA ZW;2: 001 AD AE AI AL AM AN AR AT AU AX AZ BA BE BG BM BN BY CH CL CM CN CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP GR HR HU IE IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ MY NL NO NZ PL RE RO RS RU SE SI SK SM TJ TM TR UA UY UZ VA VN XK;6: MV;7: AF BH DJ DZ EG IQ IR JO KW LY OM QA SD SY
 CalendarData//minimalDaysInFirstWeek=1: 001 GU UM US VI;4: AD AN AT AX BE BG CH CZ DE DK EE ES FI FJ FO FR GB GF GG GI GP GR HU IE IM IS IT JE LI LT LU MC MQ NL NO PL PT RE RU SE SJ SK SM VA
 
 # tzdata2022f
@@ -7876,3 +7897,9 @@ TimeZoneNames/en/America\/Chihuahua/1=Central Standard Time
 
 # bug 8303472
 LocaleNames/en/TR=Türkiye
+
+# tok locale has '#' literals. Verify they are correctly escaped
+FormatData/tok/DatePatterns/0='sike' '#'y 'la' MMM 'la' 'suno' '#'d
+FormatData/tok/DatePatterns/1='tenpo' 'sike' '#'y 'la' 'tenpo' MMMM 'la' 'tenpo' 'suno' '#'d
+FormatData/tok/DatePatterns/2='sike' '#'y 'la' MMM 'la' 'suno' '#'d
+FormatData/tok/DatePatterns/3=y-MM-dd
diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
index 40182034854..472576f327c 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java
@@ -42,6 +42,7 @@
  *      8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
  *      8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840 8296715
  *      8301206 8303472 8317979 8306116 8174269 8333582 8357075 8357882 8367021
+        8354548
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata
diff --git a/test/jdk/sun/util/resources/TimeZone/Bug6317929.java b/test/jdk/sun/util/resources/TimeZone/Bug6317929.java
index e952b3f1be3..8b0eba1760e 100644
--- a/test/jdk/sun/util/resources/TimeZone/Bug6317929.java
+++ b/test/jdk/sun/util/resources/TimeZone/Bug6317929.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6317929 6409419 8008577 8174269
+ * @bug 6317929 6409419 8008577 8174269 8354548
  * @modules jdk.localedata
  * @summary Test case for tzdata2005m support for 9 locales
  * @run main Bug6317929
@@ -59,25 +59,25 @@ public class Bug6317929 {
                                        "\"Eastern Standard Time\"");
         tzLocale = locales2Test[1];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("Nordamerikanische Ostk\u00fcsten-Normalzeit"))
+           ("Nordamerikanische Ostküsten-Normalzeit"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"Nordamerikanische Ostk\u00fcsten-Normalzeit\"");
+                                       "\"Nordamerikanische Ostküsten-Normalzeit\"");
         tzLocale = locales2Test[2];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("hora est\u00e1ndar oriental"))
+           ("hora estándar oriental"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"hora est\u00e1ndar oriental\"");
+                                       "\"hora estándar oriental\"");
         tzLocale = locales2Test[3];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("heure normale de l\u2019Est nord-am\u00e9ricain"))
+           ("heure normale de l’Est nord-américain"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"heure normale de l\u2019Est nord-am\u00e9ricain\"");
+                                       "\"heure normale de l’Est nord-américain\"");
         tzLocale = locales2Test[4];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
            ("Ora standard orientale USA"))
@@ -86,40 +86,39 @@ public class Bug6317929 {
                                        "America/Coral_Harbour should be " +
                                        "\"Ora standard orientale USA\"");
         tzLocale = locales2Test[5];
-        if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u30a2\u30e1\u30ea\u30ab\u6771\u90e8\u6a19\u6e96\u6642"))
+        if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals("米国東部標準時"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"\u30a2\u30e1\u30ea\u30ab\u6771\u90e8\u6a19\u6e96\u6642\"");
+                                       "\"米国東部標準時\"");
         tzLocale = locales2Test[6];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\ubbf8 \ub3d9\ubd80 \ud45c\uc900\uc2dc"))
+           ("미 동부 표준시"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"\ubbf8 \ub3d9\ubd80 \ud45c\uc900\uc2dc\"");
+                                       "\"미 동부 표준시\"");
         tzLocale = locales2Test[7];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u00f6stnordamerikansk normaltid"))
+           ("östnordamerikansk normaltid"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"\u00f6stnordamerikansk normaltid\"");
+                                       "\"östnordamerikansk normaltid\"");
         tzLocale = locales2Test[8];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u5317\u7f8e\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4"))
+           ("北美东部标准时间"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"\u5317\u7f8e\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\"");
+                                       "\"北美东部标准时间\"");
         tzLocale = locales2Test[9];
         if (!Coral_Harbour.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u6771\u90e8\u6a19\u6e96\u6642\u9593"))
+           ("東部標準時間"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "America/Coral_Harbour should be " +
-                                       "\"\u6771\u90e8\u6a19\u6e96\u6642\u9593\"");
+                                       "\"東部標準時間\"");
 
         TimeZone Currie = TimeZone.getTimeZone("Australia/Currie");
         tzLocale = locales2Test[0];
@@ -138,59 +137,59 @@ public class Bug6317929 {
                                        "\"Ostaustralische Normalzeit\"");
         tzLocale = locales2Test[2];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("hora est\u00e1ndar de Australia oriental"))
+           ("hora estándar de Australia oriental"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"hora est\u00e1ndar de Australia oriental\"");
+                                       "\"hora estándar de Australia oriental\"");
         tzLocale = locales2Test[3];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("heure normale de l\u2019Est de l\u2019Australie"))
+           ("heure normale de l’Est de l’Australie"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"heure normale de l\u2019Est de l\u2019Australie\"");
+                                       "\"heure normale de l’Est de l’Australie\"");
         tzLocale = locales2Test[4];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("Ora standard dell\u2019Australia orientale"))
+           ("Ora standard dell’Australia orientale"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"Ora standard dell\u2019Australia orientale\"");
+                                       "\"Ora standard dell’Australia orientale\"");
         tzLocale = locales2Test[5];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2\u6771\u90e8\u6a19\u6e96\u6642"))
+           ("オーストラリア東部標準時"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2\u6771\u90e8\u6a19\u6e96\u6642\"");
+                                       "\"オーストラリア東部標準時\"");
         tzLocale = locales2Test[6];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544 \ub3d9\ubd80 \ud45c\uc900\uc2dc"))
+           ("호주 동부 표준시"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544 \ub3d9\ubd80 \ud45c\uc900\uc2dc\"");
+                                       "\"호주 동부 표준시\"");
         tzLocale = locales2Test[7];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u00f6staustralisk normaltid"))
+           ("östaustralisk normaltid"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"\u00f6staustralisk normaltid\"");
+                                       "\"östaustralisk normaltid\"");
         tzLocale = locales2Test[8];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4"))
+           ("澳大利亚东部标准时间"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"\u6fb3\u5927\u5229\u4e9a\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\"");
+                                       "\"澳大利亚东部标准时间\"");
         tzLocale = locales2Test[9];
         if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-           ("\u6fb3\u6d32\u6771\u90e8\u6a19\u6e96\u6642\u9593"))
+           ("澳洲東部標準時間"))
             throw new RuntimeException("\n" + tzLocale + ": LONG, " +
                                        "non-daylight saving name for " +
                                        "Australia/Currie should be " +
-                                       "\"\u6fb3\u6d32\u6771\u90e8\u6a19\u6e96\u6642\u9593\"");
+                                       "\"澳洲東部標準時間\"");
    }
 }
diff --git a/test/jdk/sun/util/resources/TimeZone/Bug6442006.java b/test/jdk/sun/util/resources/TimeZone/Bug6442006.java
index 982347093be..074e2d8060f 100644
--- a/test/jdk/sun/util/resources/TimeZone/Bug6442006.java
+++ b/test/jdk/sun/util/resources/TimeZone/Bug6442006.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6442006 8008577 8174269
+ * @bug 6442006 8008577 8174269 8354548
  * @modules jdk.localedata
  * @summary Test case for verifying timezone display name for Asia/Taipei
  * @run main Bug6442006
@@ -38,8 +38,8 @@ public class Bug6442006 {
 
         TimeZone tz = TimeZone.getTimeZone("Asia/Taipei");
         Locale tzLocale = Locale.JAPANESE;
-        String jaStdName = "\u53f0\u5317\u6a19\u6e96\u6642";
-        String jaDstName = "\u53f0\u5317\u590f\u6642\u9593";
+        String jaStdName = "台湾標準時";
+        String jaDstName = "台湾夏時間";
 
         if (!tz.getDisplayName(false, TimeZone.LONG, tzLocale).equals
            (jaStdName))
diff --git a/test/jdk/sun/util/resources/TimeZone/Bug8139107.java b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java
index 3a65569ad98..e00d4c88889 100644
--- a/test/jdk/sun/util/resources/TimeZone/Bug8139107.java
+++ b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java
@@ -23,13 +23,14 @@
 
 /*
  * @test
- * @bug 8139107 8174269
+ * @bug 8139107 8174269 8354548
  * @summary Test that date parsing with DateTimeFormatter pattern
  *   that contains timezone field doesn't trigger NPE. All supported
  *   locales are tested.
  * @run testng/timeout=480 Bug8139107
  */
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.Locale;
 import org.testng.annotations.Test;
 
@@ -48,7 +49,16 @@ public class Bug8139107 {
         DateTimeFormatter inputDateTimeFormat = DateTimeFormatter
                 .ofPattern(pattern)
                 .withLocale(tl);
-        System.out.println("Parse result: " + inputDateTimeFormat.parse(inputDate));
+        try {
+            System.out.println("Parse result: " + inputDateTimeFormat.parse(inputDate));
+        } catch (DateTimeParseException dateTimeParseException) {
+            // Short tz name "MSK" no longer resides in the root locale since CLDR 48
+            // as the zone "Europe/Kirov" became the link to "moscow" metazone.
+            // Prior to that, "Europe/Kirov" had no l10n, thus only the short
+            // names were retrieved from TZDB, and placed in the root (thus
+            // guaranteed to be parsed in any locale before).
+            System.out.println(dateTimeParseException.getMessage());
+        }
     }
 
     // Input date time string with short time zone name
diff --git a/test/jdk/sun/util/resources/cldr/DateTimeRoundTripTest.java b/test/jdk/sun/util/resources/cldr/DateTimeRoundTripTest.java
new file mode 100644
index 00000000000..0c9879c8fd9
--- /dev/null
+++ b/test/jdk/sun/util/resources/cldr/DateTimeRoundTripTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8354548
+ * @modules jdk.localedata
+ * @summary Tests DateTimeFormatter format/parse round trips; some locale
+ *      may contain reserved characters, eg '#', which should correctly
+ *      be escaped
+ * @run junit DateTimeRoundTripTest
+ */
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+public class DateTimeRoundTripTest {
+    private static Stream<Locale> availableLocales() {
+        return Locale.availableLocales();
+    }
+
+    @ParameterizedTest
+    @MethodSource("availableLocales")
+    public void testDateTimeRoundTripTest(Locale locale) {
+        Arrays.stream(FormatStyle.values()).forEach(style -> {
+            assertDoesNotThrow(() ->
+                Instant.parse("2018-07-16T23:58:59.000000200Z")
+                    .atZone(ZoneId.of("UTC"))
+                    .format(DateTimeFormatter.ofLocalizedDate(style).withLocale(locale)));
+        });
+    }
+}
diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
index ed6fb2a58d8..05b0114f1b4 100644
--- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
+++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
@@ -24,6 +24,7 @@
  /*
  * @test
  * @bug 8181157 8202537 8234347 8236548 8261279 8322647 8174269 8346948
+ *      8354548
  * @modules jdk.localedata
  * @summary Checks CLDR time zone names are generated correctly at
  * either build or runtime
@@ -51,21 +52,22 @@ public class TimeZoneNamesTest {
         return new Object[][] {
             // tzid, locale, style, expected
 
-            // This list is as of CLDR version 47, and should be examined
+            // This list is as of CLDR version 48, and should be examined
             // on the CLDR data upgrade.
 
-            // no "metazone" zones
-            {"Asia/Srednekolymsk",      Locale.US, "Srednekolymsk Standard Time",
+            // no "metazone" zones (some of them were assigned metazones
+            // over time, thus they are not "generated" per se
+            {"Asia/Srednekolymsk",      Locale.US, "Magadan Standard Time",
                                                     "GMT+11:00",
-                                                    "Srednekolymsk Daylight Time",
+                                                    "Magadan Summer Time",
                                                     "GMT+12:00",
-                                                    "Srednekolymsk Time",
+                                                    "Magadan Time",
                                                     "GMT+11:00"},
-            {"Asia/Srednekolymsk",      Locale.FRANCE, "Srednekolymsk (heure standard)",
+            {"Asia/Srednekolymsk",      Locale.FRANCE, "heure normale de Magadan",
                                                     "UTC+11:00",
-                                                    "Srednekolymsk (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure d’été de Magadan",
                                                     "UTC+12:00",
-                                                    "heure : Srednekolymsk",
+                                                    "heure de Magadan",
                                                     "UTC+11:00"},
             {"America/Punta_Arenas",    Locale.US, "Punta Arenas Standard Time",
                                                     "GMT-03:00",
@@ -74,58 +76,58 @@ public class TimeZoneNamesTest {
                                                     "Punta Arenas Time",
                                                     "GMT-03:00"},
             {"America/Punta_Arenas",    Locale.FRANCE, "Punta Arenas (heure standard)",
-                                                    "UTC\u221203:00",
-                                                    "Punta Arenas (heure d\u2019\u00e9t\u00e9)",
-                                                    "UTC\u221202:00",
+                                                    "UTC−03:00",
+                                                    "Punta Arenas (heure d’été)",
+                                                    "UTC−02:00",
                                                     "heure : Punta Arenas",
-                                                    "UTC\u221203:00"},
-            {"Asia/Famagusta",          Locale.US, "Famagusta Standard Time",
+                                                    "UTC−03:00"},
+            {"Asia/Famagusta",          Locale.US, "Eastern European Standard Time",
                                                     "EET",
-                                                    "Famagusta Daylight Time",
+                                                    "Eastern European Summer Time",
                                                     "EEST",
-                                                    "Famagusta Time",
+                                                    "Eastern European Time",
                                                     "EET"},
-            {"Asia/Famagusta",          Locale.FRANCE, "Famagouste (heure standard)",
+            {"Asia/Famagusta",          Locale.FRANCE, "heure normale d’Europe de l’Est",
                                                     "EET",
-                                                    "Famagouste (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure d’été d’Europe de l’Est",
                                                     "EEST",
-                                                    "heure : Famagouste",
+                                                    "heure d’Europe de l’Est",
                                                     "EET"},
-            {"Europe/Astrakhan",        Locale.US, "Astrakhan Standard Time",
+            {"Europe/Astrakhan",        Locale.US, "Samara Standard Time",
                                                     "GMT+04:00",
-                                                    "Astrakhan Daylight Time",
+                                                    "Samara Summer Time",
                                                     "GMT+05:00",
-                                                    "Astrakhan Time",
+                                                    "Samara Time",
                                                     "GMT+04:00"},
-            {"Europe/Astrakhan",        Locale.FRANCE, "Astrakhan (heure standard)",
+            {"Europe/Astrakhan",        Locale.FRANCE, "heure normale de Samara",
                                                     "UTC+04:00",
-                                                    "Astrakhan (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure d’été de Samara",
                                                     "UTC+05:00",
-                                                    "heure : Astrakhan",
+                                                    "heure de Samara",
                                                     "UTC+04:00"},
-            {"Europe/Saratov",          Locale.US, "Saratov Standard Time",
+            {"Europe/Saratov",          Locale.US, "Samara Standard Time",
                                                     "GMT+04:00",
-                                                    "Saratov Daylight Time",
+                                                    "Samara Summer Time",
                                                     "GMT+05:00",
-                                                    "Saratov Time",
+                                                    "Samara Time",
                                                     "GMT+04:00"},
-            {"Europe/Saratov",          Locale.FRANCE, "Saratov (heure standard)",
+            {"Europe/Saratov",          Locale.FRANCE, "heure normale de Samara",
                                                     "UTC+04:00",
-                                                    "Saratov (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure d’été de Samara",
                                                     "UTC+05:00",
-                                                    "heure : Saratov",
+                                                    "heure de Samara",
                                                     "UTC+04:00"},
-            {"Europe/Ulyanovsk",        Locale.US, "Ulyanovsk Standard Time",
+            {"Europe/Ulyanovsk",        Locale.US, "Samara Standard Time",
                                                     "GMT+04:00",
-                                                    "Ulyanovsk Daylight Time",
+                                                    "Samara Summer Time",
                                                     "GMT+05:00",
-                                                    "Ulyanovsk Time",
+                                                    "Samara Time",
                                                     "GMT+04:00"},
-            {"Europe/Ulyanovsk",        Locale.FRANCE, "Oulianovsk (heure standard)",
+            {"Europe/Ulyanovsk",        Locale.FRANCE, "heure normale de Samara",
                                                     "UTC+04:00",
-                                                    "Oulianovsk (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure d’été de Samara",
                                                     "UTC+05:00",
-                                                    "heure : Oulianovsk",
+                                                    "heure de Samara",
                                                     "UTC+04:00"},
             {"Pacific/Bougainville",    Locale.US, "Bougainville Standard Time",
                                                     "GMT+11:00",
@@ -135,45 +137,45 @@ public class TimeZoneNamesTest {
                                                     "GMT+11:00"},
             {"Pacific/Bougainville",    Locale.FRANCE, "Bougainville (heure standard)",
                                                     "UTC+11:00",
-                                                    "Bougainville (heure d\u2019\u00e9t\u00e9)",
+                                                    "Bougainville (heure d’été)",
                                                     "UTC+11:00",
                                                     "heure : Bougainville",
                                                     "UTC+11:00"},
-            {"Europe/Istanbul",    Locale.US, "Istanbul Standard Time",
+            {"Europe/Istanbul",    Locale.US, "Türkiye Standard Time",
                                                     "GMT+03:00",
-                                                    "Istanbul Daylight Time",
+                                                    "Türkiye Summer Time",
                                                     "GMT+04:00",
-                                                    "Istanbul Time",
+                                                    "Türkiye Time",
                                                     "GMT+03:00"},
-            {"Europe/Istanbul",    Locale.FRANCE, "Istanbul (heure standard)",
+            {"Europe/Istanbul",    Locale.FRANCE, "heure normale de Turquie",
                                                     "UTC+03:00",
-                                                    "Istanbul (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure avancée de Turquie",
                                                     "UTC+04:00",
-                                                    "heure : Istanbul",
+                                                    "heure de Turquie",
                                                     "UTC+03:00"},
-            {"Asia/Istanbul",    Locale.US, "Istanbul Standard Time",
+            {"Asia/Istanbul",    Locale.US, "Türkiye Standard Time",
                                                     "GMT+03:00",
-                                                    "Istanbul Daylight Time",
+                                                    "Türkiye Summer Time",
                                                     "GMT+04:00",
-                                                    "Istanbul Time",
+                                                    "Türkiye Time",
                                                     "GMT+03:00"},
-            {"Asia/Istanbul",    Locale.FRANCE, "Istanbul (heure standard)",
+            {"Asia/Istanbul",    Locale.FRANCE, "heure normale de Turquie",
                                                     "UTC+03:00",
-                                                    "Istanbul (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure avancée de Turquie",
                                                     "UTC+04:00",
-                                                    "heure : Istanbul",
+                                                    "heure de Turquie",
                                                     "UTC+03:00"},
-            {"Turkey",    Locale.US, "Istanbul Standard Time",
+            {"Turkey",    Locale.US, "Türkiye Standard Time",
                                                     "GMT+03:00",
-                                                    "Istanbul Daylight Time",
+                                                    "Türkiye Summer Time",
                                                     "GMT+04:00",
-                                                    "Istanbul Time",
+                                                    "Türkiye Time",
                                                     "GMT+03:00"},
-            {"Turkey",    Locale.FRANCE, "Istanbul (heure standard)",
+            {"Turkey",    Locale.FRANCE, "heure normale de Turquie",
                                                     "UTC+03:00",
-                                                    "Istanbul (heure d\u2019\u00e9t\u00e9)",
+                                                    "heure avancée de Turquie",
                                                     "UTC+04:00",
-                                                    "heure : Istanbul",
+                                                    "heure de Turquie",
                                                     "UTC+03:00"},
 
             // Short names derived from TZDB at build time
diff --git a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
index d2c3f2800a8..5551d54a1ea 100644
--- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @test
  * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
  *      8179071 8202537 8221432 8222098 8251317 8258794 8265315
- *      8296248 8306116 8174269 8347146 8346948
+ *      8296248 8306116 8174269 8347146 8346948 8354548
  * @summary IncludeLocalesPlugin tests
  * @author Naoto Sato
  * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
@@ -139,15 +139,15 @@ public class IncludeLocalesPluginTest {
                         "(root)", "en", "en_001", "en_150", "en_AG", "en_AI",
                         "en_AT", "en_AU", "en_BB", "en_BE", "en_BM", "en_BS", "en_BW", "en_BZ",
                         "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_CZ", "en_DE",
-                        "en_DG", "en_DK", "en_DM", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
-                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GY", "en_HK", "en_HU", "en_ID",
+                        "en_DG", "en_DK", "en_DM", "en_EE", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
+                        "en_GB", "en_GD", "en_GE", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GY", "en_HK", "en_HU", "en_ID",
                         "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_IT", "en_JE", "en_JM", "en_KE",
-                        "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG", "en_MO",
+                        "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_LT", "en_LV", "en_MG", "en_MO",
                         "en_MS", "en_MT", "en_MU", "en_MV", "en_MW", "en_MY", "en_NA", "en_NF", "en_NG",
                         "en_NL", "en_NO", "en_NR", "en_NU", "en_NZ", "en_PG", "en_PK", "en_PL", "en_PN", "en_PT",
                         "en_PW", "en_RO", "en_RW", "en_SB", "en_SC", "en_SD", "en_SE", "en_SG", "en_SH",
                         "en_SI", "en_SK", "en_SL", "en_SS", "en_SX", "en_SZ", "en_TC", "en_TK", "en_TO",
-                        "en_TT", "en_TV", "en_TZ", "en_UG", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VU", "en_WS",
+                        "en_TT", "en_TV", "en_TZ", "en_UA", "en_UG", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VU", "en_WS",
                         "en_ZA", "en_ZM", "en_ZW", "es", "es_419", "es_AR", "es_BO", "es_BR", "es_BZ",
                         "es_CL", "es_CO", "es_CR", "es_CU", "es_DO", "es_EC", "es_GT", "es_HN",
                         "es_MX", "es_NI", "es_PA", "es_PE", "es_PR", "es_PY", "es_SV", "es_US",
@@ -176,15 +176,15 @@ public class IncludeLocalesPluginTest {
                         "(root)", "en", "en_001", "en_150", "en_AE", "en_AG", "en_AI", "en_AS", "en_AT",
                         "en_AU", "en_BB", "en_BE", "en_BI", "en_BM", "en_BS", "en_BW", "en_BZ",
                         "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_CZ", "en_DE",
-                        "en_DG", "en_DK", "en_DM", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
-                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GU", "en_GY",
+                        "en_DG", "en_DK", "en_DM", "en_EE", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
+                        "en_GB", "en_GD", "en_GE", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GU", "en_GY",
                         "en_HK", "en_HU", "en_ID", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_IT", "en_JE", "en_JM",
-                        "en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG",
+                        "en_JP", "en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_LT", "en_LV", "en_MG",
                         "en_MH", "en_MO", "en_MP", "en_MS", "en_MT", "en_MU", "en_MV", "en_MW", "en_MY",
                         "en_NA", "en_NF", "en_NG", "en_NL", "en_NO", "en_NR", "en_NU", "en_NZ", "en_PG",
                         "en_PH", "en_PK", "en_PL", "en_PN", "en_PR", "en_PT", "en_PW", "en_RO", "en_RW", "en_SB", "en_SC",
                         "en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SK", "en_SL", "en_SS", "en_SX",
-                        "en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UG",
+                        "en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UA","en_UG",
                         "en_UM", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VI", "en_VU",
                         "en_WS", "en_ZA", "en_ZM", "en_ZW", "ja", "ja_JP", "ja_JP_#Jpan",
                         "ja_JP_JP_#u-ca-japanese"),
@@ -356,15 +356,15 @@ public class IncludeLocalesPluginTest {
                         "(root)", "en", "en_001", "en_150", "en_AE", "en_AG", "en_AI", "en_AS", "en_AT",
                         "en_AU", "en_BB", "en_BE", "en_BI", "en_BM", "en_BS", "en_BW", "en_BZ",
                         "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_CZ", "en_DE",
-                        "en_DG", "en_DK", "en_DM", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
-                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GU", "en_GY",
+                        "en_DG", "en_DK", "en_DM", "en_EE", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
+                        "en_GB", "en_GD", "en_GE", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GU", "en_GY",
                         "en_HK", "en_HU", "en_ID", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_IT", "en_JE", "en_JM",
-                        "en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG",
+                        "en_JP", "en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_LT", "en_LV", "en_MG",
                         "en_MH", "en_MO", "en_MP", "en_MS", "en_MT", "en_MU", "en_MV", "en_MW", "en_MY",
                         "en_NA", "en_NF", "en_NG", "en_NL", "en_NO", "en_NR", "en_NU", "en_NZ", "en_PG",
                         "en_PH", "en_PK", "en_PL", "en_PN", "en_PR", "en_PT", "en_PW", "en_RO", "en_RW", "en_SB", "en_SC",
                         "en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SK", "en_SL", "en_SS", "en_SX",
-                        "en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UG",
+                        "en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UA","en_UG",
                         "en_UM", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VI", "en_VU",
                         "en_WS", "en_ZA", "en_ZM", "en_ZW"),
                 ""),

From 066810c877b206a66cc87537487b17f0481646c3 Mon Sep 17 00:00:00 2001
From: Lawrence Andrews <lawrence.andrews@oracle.com>
Date: Fri, 7 Nov 2025 20:36:13 +0000
Subject: [PATCH 089/512] 8371485: ProblemList
 awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java for linux

Reviewed-by: azvegint
---
 test/jdk/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index f7b8939ac6a..5132d012d7f 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -179,7 +179,7 @@ java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java 8158801 windows-al
 java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java 8158801 windows-all
 java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java 8158801 windows-all
 java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java 8158801 windows-all
+java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java 8158801,8357360 windows-all,linux-all
 java/awt/Mixing/AWT_Mixing/JTableOverlapping.java 8158801 windows-all
 java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java 8158801 windows-all
 java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java 8158801 windows-all

From 88c4678eed818cbe9380f35352e90883fed27d33 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Sat, 8 Nov 2025 21:30:58 +0000
Subject: [PATCH 090/512] 8371103:
 vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java
 failing

Reviewed-by: amenkov, sspitsyn
---
 src/hotspot/share/prims/jvmtiEventController.cpp | 7 ++++---
 test/hotspot/jtreg/ProblemList.txt               | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp
index 2b44c069dc5..169ccbe035f 100644
--- a/src/hotspot/share/prims/jvmtiEventController.cpp
+++ b/src/hotspot/share/prims/jvmtiEventController.cpp
@@ -792,9 +792,6 @@ void JvmtiEventControllerPrivate::set_event_callbacks(JvmtiEnvBase *env,
   assert(Threads::number_of_threads() == 0 || JvmtiThreadState_lock->is_locked(), "sanity check");
   EC_TRACE(("[*] # set event callbacks"));
 
-  // May be changing the event handler for ObjectFree.
-  flush_object_free_events(env);
-
   env->set_event_callbacks(callbacks, size_of_callbacks);
 
   jlong enabled_bits = env->env_event_enable()->_event_callback_enabled.get_bits();
@@ -1107,6 +1104,8 @@ JvmtiEventController::set_event_callbacks(JvmtiEnvBase *env,
     // call the functionality without holding the JvmtiThreadState_lock.
     JvmtiEventControllerPrivate::set_event_callbacks(env, callbacks, size_of_callbacks);
   } else {
+    JvmtiEventControllerPrivate::flush_object_free_events(env);
+
     MutexLocker mu(JvmtiThreadState_lock);
     JvmtiEventControllerPrivate::set_event_callbacks(env, callbacks, size_of_callbacks);
   }
@@ -1194,6 +1193,8 @@ JvmtiEventController::env_dispose(JvmtiEnvBase *env) {
     // call the functionality without holding the JvmtiThreadState_lock.
     JvmtiEventControllerPrivate::env_dispose(env);
   } else {
+    JvmtiEventControllerPrivate::flush_object_free_events(env);
+
     MutexLocker mu(JvmtiThreadState_lock);
     JvmtiEventControllerPrivate::env_dispose(env);
   }
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 1e4ac9e2848..bc163ae8197 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -171,7 +171,6 @@ vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
 
 vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
 vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/TestDescription.java 8288911 macosx-all
-vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java 8371103 generic-all
 
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java 8208259 generic-all

From ebd1c03829c354007a4ca9971be313d19eac2373 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Sun, 9 Nov 2025 07:22:45 +0000
Subject: [PATCH 091/512] 8371163: Make GlyphView/TestGlyphBGHeight.java
 headless 8371377: javax/swing/text/GlyphView/TestGlyphBGHeight.java fails in
 Ubuntu 24.04 X11

Reviewed-by: aivanov
---
 .../text/GlyphView/TestGlyphBGHeight.java     | 87 ++++++++-----------
 1 file changed, 34 insertions(+), 53 deletions(-)

diff --git a/test/jdk/javax/swing/text/GlyphView/TestGlyphBGHeight.java b/test/jdk/javax/swing/text/GlyphView/TestGlyphBGHeight.java
index 000ba16339e..b9062cef0c8 100644
--- a/test/jdk/javax/swing/text/GlyphView/TestGlyphBGHeight.java
+++ b/test/jdk/javax/swing/text/GlyphView/TestGlyphBGHeight.java
@@ -24,85 +24,66 @@
 /*
  * @test
  * @bug 8017266
- * @key headful
  * @summary Verifies if Background is painted taller than needed for styled text.
  * @run main TestGlyphBGHeight
  */
 
 import java.io.File;
-import java.awt.Graphics2D;
+import java.awt.Graphics;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.image.BufferedImage;
-import java.awt.Robot;
 import javax.imageio.ImageIO;
 import javax.swing.JFrame;
 import javax.swing.JTextPane;
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
-import javax.swing.SwingUtilities;
 
 public class TestGlyphBGHeight {
 
-    static JFrame frame;
+    private static final int WIDTH = 100;
+    private static final int HEIGHT = 100;
+    private static final int FONTSIZE = 32;
+    private static final Color EMPTY_PIXEL = new Color(0xFFFFFFFF);
+
+    static BufferedImage createImage() throws Exception {
+        final BufferedImage img = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_ARGB);
+        Graphics g = img.getGraphics();
+        g.setColor(EMPTY_PIXEL);
+        g.fillRect(0, 0, WIDTH, HEIGHT);
+        return img;
+    }
 
     public static void main(String[] args) throws Exception {
-        int width = 100;
-        int height = 100;
 
+        final BufferedImage img = createImage();
+        final JTextPane textPane = new JTextPane();
+        final StyledDocument doc = textPane.getStyledDocument();
+
+        Style style = textPane.addStyle("superscript", null);
+        StyleConstants.setSuperscript(style, true);
+        StyleConstants.setFontSize(style, FONTSIZE);
+        StyleConstants.setBackground(style, Color.YELLOW);
         try {
-            Robot robot = new Robot();
-            SwingUtilities.invokeAndWait(() -> {
-                frame = new JFrame("TestGlyphBGHeight");
-                frame.setSize(width, height);
-                frame.getContentPane().setLayout(new BorderLayout());
+            doc.insertString(doc.getLength(), "hello", style);
+        } catch (Exception e) {}
 
-                final JTextPane comp = new JTextPane();
-                final StyledDocument doc = comp.getStyledDocument();
+        textPane.setSize(WIDTH, HEIGHT);
+        textPane.setBackground(Color.RED);
 
-                Style style = comp.addStyle("superscript", null);
-                StyleConstants.setSuperscript(style, true);
-                StyleConstants.setFontSize(style, 32);
-                StyleConstants.setBackground(style, Color.YELLOW);
-                try {
-                    doc.insertString(doc.getLength(), "hello", style);
-                } catch (Exception e) {}
+        textPane.paint(img.getGraphics());
 
-                comp.setDocument(doc);
-                comp.setBackground(Color.RED);
+        ImageIO.write(img, "png", new File("AppTest.png"));
 
-                frame.getContentPane().add(comp, BorderLayout.CENTER);
-
-                frame.setLocationRelativeTo(null);
-                frame.setVisible(true);
-            });
-            robot.waitForIdle();
-            robot.delay(1000);
-
-            BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D g2d = (Graphics2D) img.getGraphics();
-            frame.paint(g2d);
-            ImageIO.write(img, "png", new File("AppTest.png"));
-            g2d.dispose();
-
-            BufferedImage bimg = img.getSubimage(0, 80, width, 1);
-            ImageIO.write(bimg, "png", new File("AppTest1.png"));
-            robot.waitForIdle();
-            robot.delay(1000);
-            for (int x = 10; x < width / 2; x++) {
-                Color col = new Color(bimg.getRGB(x, 0));
-                System.out.println(Integer.toHexString(bimg.getRGB(x, 0)));
-                if (col.equals(Color.YELLOW)) {
-                    throw new RuntimeException(" Background is painted taller than needed for styled text");
-                }
+        BufferedImage bimg = img.getSubimage(0, FONTSIZE + 20, WIDTH, 1);
+        ImageIO.write(bimg, "png", new File("AppTest1.png"));
+        for (int x = 10; x < WIDTH / 2; x++) {
+            int col = bimg.getRGB(x, 0);
+            System.out.println(Integer.toHexString(col));
+            if (col == Color.YELLOW.getRGB()) {
+                throw new RuntimeException(" Background is painted taller than needed for styled text");
             }
-        } finally {
-            SwingUtilities.invokeAndWait(() -> {
-                if (frame != null) {
-                    frame.dispose();
-                }
-            });
         }
     }
 }

From 4a14c81a06ab2be1d56cd01288135fbd369eb9c7 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Sun, 9 Nov 2025 07:23:10 +0000
Subject: [PATCH 092/512] 8299304: Test
 "java/awt/print/PrinterJob/PageDialogTest.java" fails on macOS 13 x64 because
 the Page Dialog blocks the Toolkit

Reviewed-by: tr
---
 .../jdk/java/awt/print/PrinterJob/PageDialogTest.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java b/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java
index eea118733de..ed02c64b48e 100644
--- a/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java
@@ -22,11 +22,12 @@
  */
 
 /*
-   @test
-   @bug 6302514
-   @key printer
-   @run main/manual PageDialogTest
-   @summary A toolkit modal dialog should not be blocked by Page/Print dialog.
+ *  @test
+ *  @bug 6302514
+ *  @key printer
+ *  @requires (os.family != "mac")
+ *  @run main/manual PageDialogTest
+ *  @summary A toolkit modal dialog should not be blocked by Page/Print dialog.
 */
 
 import java.awt.BorderLayout;

From 66e5a68a33dcd6b23c73c892d51b3efed162b8f8 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 10 Nov 2025 05:53:36 +0000
Subject: [PATCH 093/512] 8371343: ZGC: Remove dependency on test execution
 order for gtests

Reviewed-by: stefank, eosterlund
---
 src/hotspot/share/gc/z/zAddress.hpp       | 2 --
 test/hotspot/gtest/gc/z/test_zAddress.cpp | 9 ++++-----
 test/hotspot/gtest/gc/z/test_zLiveMap.cpp | 7 +++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/z/zAddress.hpp b/src/hotspot/share/gc/z/zAddress.hpp
index de97c17d089..ca904f69277 100644
--- a/src/hotspot/share/gc/z/zAddress.hpp
+++ b/src/hotspot/share/gc/z/zAddress.hpp
@@ -309,8 +309,6 @@ public:
 };
 
 class ZGlobalsPointers : public AllStatic {
-  friend class ZAddressTest;
-
 private:
   static void set_good_masks();
   static void pd_set_good_masks();
diff --git a/test/hotspot/gtest/gc/z/test_zAddress.cpp b/test/hotspot/gtest/gc/z/test_zAddress.cpp
index 9f5c8e1f0bc..0df77b01ad2 100644
--- a/test/hotspot/gtest/gc/z/test_zAddress.cpp
+++ b/test/hotspot/gtest/gc/z/test_zAddress.cpp
@@ -23,9 +23,9 @@
 
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
-#include "unittest.hpp"
+#include "zunittest.hpp"
 
-class ZAddressTest : public ::testing::Test {
+class ZAddressTest : public ZTest {
 protected:
   static zpointer color(uintptr_t value, uintptr_t color) {
     return ZAddress::color(zaddress(value | ZAddressHeapBase), color);
@@ -374,8 +374,7 @@ protected:
   static void is_checks() {
     int young_phase = 0;
     int old_phase = 0;
-    // Setup
-    ZGlobalsPointers::initialize();
+
     test_is_checks_on_all();
 
     advance_and_test_old_phase(old_phase, 4);
@@ -431,6 +430,6 @@ protected:
   }
 };
 
-TEST_F(ZAddressTest, is_checks) {
+TEST_VM_F(ZAddressTest, is_checks) {
   is_checks();
 }
diff --git a/test/hotspot/gtest/gc/z/test_zLiveMap.cpp b/test/hotspot/gtest/gc/z/test_zLiveMap.cpp
index 18b90f5f149..da956b70b2a 100644
--- a/test/hotspot/gtest/gc/z/test_zLiveMap.cpp
+++ b/test/hotspot/gtest/gc/z/test_zLiveMap.cpp
@@ -24,9 +24,9 @@
 #include "gc/z/zGenerationId.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zLiveMap.inline.hpp"
-#include "unittest.hpp"
+#include "zunittest.hpp"
 
-class ZLiveMapTest : public ::testing::Test {
+class ZLiveMapTest : public ZTest {
 private:
   // Setup and tear down
   ZHeap*            _old_heap;
@@ -36,7 +36,6 @@ private:
 public:
 
   virtual void SetUp() {
-    ZGlobalsPointers::initialize();
     _old_heap = ZHeap::_heap;
     ZHeap::_heap = (ZHeap*)os::malloc(sizeof(ZHeap), mtTest);
 
@@ -84,6 +83,6 @@ protected:
   }
 };
 
-TEST_F(ZLiveMapTest, strongly_live_for_large_zpage) {
+TEST_VM_F(ZLiveMapTest, strongly_live_for_large_zpage) {
   strongly_live_for_large_zpage();
 }

From a8b35bf5a60c26e8975a468d4ebe6aac557e4d85 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 10 Nov 2025 05:53:55 +0000
Subject: [PATCH 094/512] 8367317: ZGC:
 ZVirtualMemoryReserver::force_reserve_discontiguous arithmetic underflow

Reviewed-by: jsikstro, eosterlund
---
 src/hotspot/share/gc/z/zVirtualMemoryManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zVirtualMemoryManager.cpp b/src/hotspot/share/gc/z/zVirtualMemoryManager.cpp
index 2f81a5cfe09..aec54818a68 100644
--- a/src/hotspot/share/gc/z/zVirtualMemoryManager.cpp
+++ b/src/hotspot/share/gc/z/zVirtualMemoryManager.cpp
@@ -100,9 +100,10 @@ size_t ZVirtualMemoryReserver::force_reserve_discontiguous(size_t size) {
 
     if (reserve_contiguous(to_zoffset(reserve_start), reserve_size)) {
       reserved += reserve_size;
+      end -= reserve_size;
     }
 
-    end -= reserve_size * 2;
+    end -= MIN2(end, reserve_size);
   }
 
   // If (reserved < size) attempt to reserve the rest via normal divide and conquer

From 4e4cced710a8e4cd5bb8f49b08798c87b21e8b78 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 10 Nov 2025 05:55:34 +0000
Subject: [PATCH 095/512] 8371341: ZGC: Improve gtest interoperability with
 instrumented builds (ASAN)

Reviewed-by: stefank, eosterlund
---
 .../share/gc/z/zVirtualMemoryManager.hpp      |  1 +
 test/hotspot/gtest/gc/z/test_zForwarding.cpp  | 77 ++++++++-----------
 .../gtest/gc/z/test_zMapper_windows.cpp       | 20 +++--
 .../gtest/gc/z/test_zVirtualMemoryManager.cpp | 24 +++---
 test/hotspot/gtest/gc/z/zunittest.hpp         | 45 +++++++++++
 5 files changed, 101 insertions(+), 66 deletions(-)

diff --git a/src/hotspot/share/gc/z/zVirtualMemoryManager.hpp b/src/hotspot/share/gc/z/zVirtualMemoryManager.hpp
index a9ab86761ac..0fd6045d633 100644
--- a/src/hotspot/share/gc/z/zVirtualMemoryManager.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemoryManager.hpp
@@ -33,6 +33,7 @@
 using ZVirtualMemoryRegistry = ZRangeRegistry<ZVirtualMemory>;
 
 class ZVirtualMemoryReserver {
+  friend class ZTest;
   friend class ZMapperTest;
   friend class ZVirtualMemoryManagerTest;
 
diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index f22eef50858..3a69ff3cbb7 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -28,9 +28,10 @@
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeap.hpp"
 #include "gc/z/zPage.inline.hpp"
+#include "gc/z/zRangeRegistry.inline.hpp"
 #include "gc/z/zVirtualMemory.inline.hpp"
 #include "runtime/os.hpp"
-#include "unittest.hpp"
+#include "zunittest.hpp"
 
 using namespace testing;
 
@@ -40,35 +41,21 @@ using namespace testing;
 
 #define CAPTURE(expression) CAPTURE1(expression)
 
-class ZForwardingTest : public Test {
+class ZForwardingTest : public ZTest {
 public:
   // Setup and tear down
   ZHeap*            _old_heap;
   ZGenerationOld*   _old_old;
   ZGenerationYoung* _old_young;
-  char*             _reserved;
-  static size_t     _page_offset;
-
-  char* reserve_page_memory() {
-    // Probe for a free 2MB region inside the usable address range.
-    // Inspired by ZVirtualMemoryManager::reserve_contiguous.
-    const size_t unused = ZAddressOffsetMax - ZGranuleSize;
-    const size_t increment = MAX2(align_up(unused / 100, ZGranuleSize), ZGranuleSize);
-
-    for (uintptr_t start = 0; start + ZGranuleSize <= ZAddressOffsetMax; start += increment) {
-      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, mtTest);
-      if (reserved != nullptr) {
-        // Success
-        return reserved;
-      }
-    }
-
-    // Failed
-    return nullptr;
-  }
+  ZAddressReserver  _zaddress_reserver;
+  zoffset           _page_offset;
 
   virtual void SetUp() {
-    ZGlobalsPointers::initialize();
+    // Only run test on supported Windows versions
+    if (!is_os_supported()) {
+      GTEST_SKIP() << "OS not supported";
+    }
+
     _old_heap = ZHeap::_heap;
     ZHeap::_heap = (ZHeap*)os::malloc(sizeof(ZHeap), mtTest);
 
@@ -84,36 +71,34 @@ public:
     ZGeneration::_old->_seqnum = 1;
     ZGeneration::_young->_seqnum = 2;
 
-    // Preconditions for reserve_free_granule()
-    ASSERT_NE(ZAddressHeapBase, 0u);
-    ASSERT_NE(ZAddressOffsetMax, 0u);
-    ASSERT_NE(ZGranuleSize, 0u);
+    _zaddress_reserver.SetUp(ZGranuleSize);
+    _page_offset = _zaddress_reserver.registry()->peek_low_address();
 
-    _reserved = nullptr;
+    if (_page_offset == zoffset::invalid) {
+      GTEST_SKIP() << "Unable to reserve memory";
+    }
 
-    // Find a suitable address for the testing page
-    char* reserved = reserve_page_memory();
-
-    ASSERT_NE(reserved, nullptr) << "Failed to reserve the page granule. Test needs tweaking";
-    ASSERT_GE(reserved, (char*)ZAddressHeapBase);
-    ASSERT_LT(reserved, (char*)ZAddressHeapBase + ZAddressOffsetMax);
-
-    _reserved = reserved;
-
-    os::commit_memory((char*)_reserved, ZGranuleSize, false /* executable */);
-
-    _page_offset = uintptr_t(_reserved) - ZAddressHeapBase;
+    char* const addr = (char*)untype(ZOffset::address_unsafe(_page_offset));
+    os::commit_memory(addr, ZGranuleSize, /* executable */ false);
   }
 
   virtual void TearDown() {
+    if (!is_os_supported()) {
+      // Test skipped, nothing to cleanup
+      return;
+    }
+
     os::free(ZHeap::_heap);
     ZHeap::_heap = _old_heap;
     ZGeneration::_old = _old_old;
     ZGeneration::_young = _old_young;
-    if (_reserved != nullptr) {
-      os::uncommit_memory((char*)_reserved, ZGranuleSize, false /* executable */);
-      os::release_memory((char*)_reserved, ZGranuleSize);
+
+    if (_page_offset != zoffset::invalid) {
+      char* const addr = (char*)untype(ZOffset::address_unsafe(_page_offset));
+      os::uncommit_memory(addr, ZGranuleSize, false /* executable */);
     }
+
+    _zaddress_reserver.TearDown();
   }
 
   // Helper functions
@@ -219,7 +204,7 @@ public:
     }
   }
 
-  static void test(void (*function)(ZForwarding*), uint32_t size) {
+  void test(void (*function)(ZForwarding*), uint32_t size) {
     // Create page
     const ZVirtualMemory vmem(zoffset(_page_offset), ZPageSizeSmall);
     ZPage page(ZPageType::small, ZPageAge::eden, vmem, 0u);
@@ -257,7 +242,7 @@ public:
   }
 
   // Run the given function with a few different input values.
-  static void test(void (*function)(ZForwarding*)) {
+  void test(void (*function)(ZForwarding*)) {
     test(function, 1);
     test(function, 2);
     test(function, 3);
@@ -285,5 +270,3 @@ TEST_VM_F(ZForwardingTest, find_full) {
 TEST_VM_F(ZForwardingTest, find_every_other) {
   test(&ZForwardingTest::find_every_other);
 }
-
-size_t ZForwardingTest::_page_offset;
diff --git a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
index ea43859b051..1789d2e3b43 100644
--- a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
+++ b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
@@ -34,8 +34,9 @@ using namespace testing;
 
 class ZMapperTest : public ZTest {
 private:
-  static constexpr size_t ReservationSize = 32 * M;
+  static constexpr size_t ReservationSize = 3 * ZGranuleSize;
 
+  ZAddressReserver        _zaddress_reserver;
   ZVirtualMemoryReserver* _reserver;
   ZVirtualMemoryRegistry* _registry;
 
@@ -46,9 +47,14 @@ public:
       GTEST_SKIP() << "OS not supported";
     }
 
-    _reserver = (ZVirtualMemoryReserver*)os::malloc(sizeof(ZVirtualMemoryManager), mtTest);
-    _reserver = ::new (_reserver) ZVirtualMemoryReserver(ReservationSize);
-    _registry = &_reserver->_registry;
+    _zaddress_reserver.SetUp(ReservationSize);
+    _reserver = _zaddress_reserver.reserver();
+    _registry = _zaddress_reserver.registry();
+
+    if (_reserver->reserved() < ReservationSize || !_registry->is_contiguous()) {
+      GTEST_SKIP() << "Fixture failed to reserve adequate memory, reserved "
+          << (_reserver->reserved() >> ZGranuleSizeShift) << " * ZGranuleSize";
+    }
   }
 
   virtual void TearDown() {
@@ -58,9 +64,9 @@ public:
     }
 
     // Best-effort cleanup
-    _reserver->unreserve_all();
-    _reserver->~ZVirtualMemoryReserver();
-    os::free(_reserver);
+    _registry = nullptr;
+    _reserver = nullptr;
+    _zaddress_reserver.TearDown();
   }
 
   void test_unreserve() {
diff --git a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
index b6b827aa0b7..2b6fbc198ca 100644
--- a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
+++ b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
@@ -56,6 +56,7 @@ class ZVirtualMemoryManagerTest : public ZTest {
 private:
   static constexpr size_t ReservationSize = 32 * M;
 
+  ZAddressReserver        _zaddress_reserver;
   ZVirtualMemoryReserver* _reserver;
   ZVirtualMemoryRegistry* _registry;
 
@@ -66,9 +67,14 @@ public:
       GTEST_SKIP() << "OS not supported";
     }
 
-    _reserver = (ZVirtualMemoryReserver*)os::malloc(sizeof(ZVirtualMemoryManager), mtTest);
-    _reserver = ::new (_reserver) ZVirtualMemoryReserver(ReservationSize);
-    _registry = &_reserver->_registry;
+    _zaddress_reserver.SetUp(ReservationSize);
+    _reserver = _zaddress_reserver.reserver();
+    _registry = _zaddress_reserver.registry();
+
+    if (_reserver->reserved() < ReservationSize || !_registry->is_contiguous()) {
+      GTEST_SKIP() << "Fixture failed to reserve adequate memory, reserved "
+          << (_reserver->reserved() >> ZGranuleSizeShift) << " * ZGranuleSize";
+    }
   }
 
   virtual void TearDown() {
@@ -77,10 +83,9 @@ public:
       return;
     }
 
-    // Best-effort cleanup
-    _reserver->unreserve_all();
-    _reserver->~ZVirtualMemoryReserver();
-    os::free(_reserver);
+    _registry = nullptr;
+    _reserver = nullptr;
+    _zaddress_reserver.TearDown();
   }
 
   void test_reserve_discontiguous_and_coalesce() {
@@ -112,11 +117,6 @@ public:
     // to separate the fetched memory from the memory left in the manager. This
     // used to fail because the memory was already split into two placeholders.
 
-    if (_reserver->reserved() < 4 * ZGranuleSize || !_registry->is_contiguous()) {
-      GTEST_SKIP() << "Fixture failed to reserve adequate memory, reserved "
-          << (_reserver->reserved() >> ZGranuleSizeShift) << " * ZGranuleSize";
-    }
-
     // Start at the offset we reserved.
     const zoffset base_offset = _registry->peek_low_address();
 
diff --git a/test/hotspot/gtest/gc/z/zunittest.hpp b/test/hotspot/gtest/gc/z/zunittest.hpp
index c732b7d4f7e..a4586d51a0e 100644
--- a/test/hotspot/gtest/gc/z/zunittest.hpp
+++ b/test/hotspot/gtest/gc/z/zunittest.hpp
@@ -30,6 +30,7 @@
 #include "gc/z/zNUMA.hpp"
 #include "gc/z/zRangeRegistry.hpp"
 #include "gc/z/zVirtualMemory.inline.hpp"
+#include "gc/z/zVirtualMemoryManager.hpp"
 #include "runtime/os.hpp"
 #include "unittest.hpp"
 
@@ -60,6 +61,50 @@ public:
 };
 
 class ZTest : public testing::Test {
+public:
+  class ZAddressReserver {
+    ZVirtualMemoryReserver* _reserver;
+    bool _active;
+
+    public:
+      ZAddressReserver()
+        : _reserver(nullptr),
+          _active(false) {}
+
+      ~ZAddressReserver() {
+        GTEST_EXPECT_FALSE(_active) << "ZAddressReserver deconstructed without calling TearDown";
+      }
+
+      void SetUp(size_t reservation_size) {
+        GTEST_EXPECT_TRUE(ZArguments::is_os_supported()) << "Should not use SetUp on unsupported systems";
+        GTEST_EXPECT_FALSE(_active) << "SetUp called twice without a TearDown";
+        _active = true;
+
+        _reserver = (ZVirtualMemoryReserver*)os::malloc(sizeof(ZVirtualMemoryManager), mtTest);
+        _reserver = ::new (_reserver) ZVirtualMemoryReserver(reservation_size);
+      }
+
+      void TearDown() {
+        GTEST_EXPECT_TRUE(_active) << "TearDown called without a preceding SetUp";
+        _active = false;
+
+        // Best-effort cleanup
+        _reserver->unreserve_all();
+        _reserver->~ZVirtualMemoryReserver();
+        os::free(_reserver);
+      }
+
+      ZVirtualMemoryReserver* reserver() {
+        GTEST_EXPECT_TRUE(_active) << "Should only use HeapReserver while active";
+        return _reserver;
+      }
+
+      ZVirtualMemoryRegistry* registry() {
+        GTEST_EXPECT_TRUE(_active) << "Should only use HeapReserver while active";
+        return &_reserver->_registry;
+      }
+  };
+
 private:
   ZAddressOffsetMaxSetter _zaddress_offset_max_setter;
   unsigned int _rand_seed;

From f77a5117db2d01a935762e948aef2d0ade3512a3 Mon Sep 17 00:00:00 2001
From: Jasmine Karthikeyan <jkarthikeyan@openjdk.org>
Date: Mon, 10 Nov 2025 06:16:02 +0000
Subject: [PATCH 096/512] 8350468: x86: Improve implementation of vectorized
 numberOfLeadingZeros for int and long

Co-authored-by: Raffaello Giulietti <rgiulietti@openjdk.org>
Reviewed-by: sviswanathan, qamai, vlivanov
---
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 99 ++++++++-----------
 .../TestNumberOfContinuousZeros.java          | 93 +++++++++++++++--
 .../bench/vm/compiler/LeadingZeros.java       | 81 +++++++++++++++
 3 files changed, 208 insertions(+), 65 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/LeadingZeros.java

diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 51b2eff2cfb..3de7f473fea 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -6119,77 +6119,64 @@ void C2_MacroAssembler::vector_count_leading_zeros_short_avx(XMMRegister dst, XM
 
 void C2_MacroAssembler::vector_count_leading_zeros_int_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
                                                            XMMRegister xtmp2, XMMRegister xtmp3, int vec_enc) {
-  // Since IEEE 754 floating point format represents mantissa in 1.0 format
-  // hence biased exponent can be used to compute leading zero count as per
-  // following formula:-
-  // LZCNT = 31 - (biased_exp - 127)
-  // Special handling has been introduced for Zero, Max_Int and -ve source values.
-
-  // Broadcast 0xFF
-  vpcmpeqd(xtmp1, xtmp1, xtmp1, vec_enc);
-  vpsrld(xtmp1, xtmp1, 24, vec_enc);
+  // By converting the integer to a float, we can obtain the number of leading zeros based on the exponent of the float.
+  // As the float exponent contains a bias of 127 for nonzero values, the bias must be removed before interpreting the
+  // exponent as the leading zero count.
 
   // Remove the bit to the right of the highest set bit ensuring that the conversion to float cannot round up to a higher
   // power of 2, which has a higher exponent than the input. This transformation is valid as only the highest set bit
   // contributes to the leading number of zeros.
-  vpsrld(xtmp2, src, 1, vec_enc);
-  vpandn(xtmp3, xtmp2, src, vec_enc);
+  vpsrld(dst, src, 1, vec_enc);
+  vpandn(dst, dst, src, vec_enc);
 
-  // Extract biased exponent.
-  vcvtdq2ps(dst, xtmp3, vec_enc);
+  vcvtdq2ps(dst, dst, vec_enc);
+
+  // By comparing the register to itself, all the bits in the destination are set.
+  vpcmpeqd(xtmp1, xtmp1, xtmp1, vec_enc);
+
+  // Move the biased exponent to the low end of the lane and mask with 0xFF to discard the sign bit.
+  vpsrld(xtmp2, xtmp1, 24, vec_enc);
   vpsrld(dst, dst, 23, vec_enc);
-  vpand(dst, dst, xtmp1, vec_enc);
+  vpand(dst, xtmp2, dst, vec_enc);
 
-  // Broadcast 127.
-  vpsrld(xtmp1, xtmp1, 1, vec_enc);
-  // Exponent = biased_exp - 127
-  vpsubd(dst, dst, xtmp1, vec_enc);
+  // Subtract 127 from the exponent, which removes the bias from the exponent.
+  vpsrld(xtmp2, xtmp1, 25, vec_enc);
+  vpsubd(dst, dst, xtmp2, vec_enc);
 
-  // Exponent_plus_one = Exponent + 1
-  vpsrld(xtmp3, xtmp1, 6, vec_enc);
-  vpaddd(dst, dst, xtmp3, vec_enc);
+  vpsrld(xtmp2, xtmp1, 27, vec_enc);
 
-  // Replace -ve exponent with zero, exponent is -ve when src
-  // lane contains a zero value.
-  vpxor(xtmp2, xtmp2, xtmp2, vec_enc);
-  vblendvps(dst, dst, xtmp2, dst, vec_enc);
+  // If the original value is 0 the exponent would not have bias, so the subtraction creates a negative number. If this
+  // is found in any of the lanes, replace the lane with -1 from xtmp1.
+  vblendvps(dst, dst, xtmp1, dst, vec_enc, true, xtmp3);
 
-  // Rematerialize broadcast 32.
-  vpslld(xtmp1, xtmp3, 5, vec_enc);
-  // Exponent is 32 if corresponding source lane contains max_int value.
-  vpcmpeqd(xtmp2, dst, xtmp1, vec_enc);
-  // LZCNT = 32 - exponent_plus_one
-  vpsubd(dst, xtmp1, dst, vec_enc);
+  // If the original value is negative, replace the lane with 31.
+  vblendvps(dst, dst, xtmp2, src, vec_enc, true, xtmp3);
 
-  // Replace LZCNT with a value 1 if corresponding source lane
-  // contains max_int value.
-  vpblendvb(dst, dst, xtmp3, xtmp2, vec_enc);
-
-  // Replace biased_exp with 0 if source lane value is less than zero.
-  vpxor(xtmp2, xtmp2, xtmp2, vec_enc);
-  vblendvps(dst, dst, xtmp2, src, vec_enc);
+  // Subtract the exponent from 31, giving the final result. For 0, the result is 32 as the exponent was replaced with -1,
+  // and for negative numbers the result is 0 as the exponent was replaced with 31.
+  vpsubd(dst, xtmp2, dst, vec_enc);
 }
 
 void C2_MacroAssembler::vector_count_leading_zeros_long_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
                                                             XMMRegister xtmp2, XMMRegister xtmp3, Register rtmp, int vec_enc) {
-  vector_count_leading_zeros_short_avx(dst, src, xtmp1, xtmp2, xtmp3, rtmp, vec_enc);
-  // Add zero counts of lower word and upper word of a double word if
-  // upper word holds a zero value.
-  vpsrld(xtmp3, src, 16, vec_enc);
-  // xtmp1 is set to all zeros by vector_count_leading_zeros_byte_avx.
-  vpcmpeqd(xtmp3, xtmp1, xtmp3, vec_enc);
-  vpslld(xtmp2, dst, 16, vec_enc);
-  vpaddd(xtmp2, xtmp2, dst, vec_enc);
-  vpblendvb(dst, dst, xtmp2, xtmp3, vec_enc);
-  vpsrld(dst, dst, 16, vec_enc);
-  // Add zero counts of lower doubleword and upper doubleword of a
-  // quadword if upper doubleword holds a zero value.
-  vpsrlq(xtmp3, src, 32, vec_enc);
-  vpcmpeqq(xtmp3, xtmp1, xtmp3, vec_enc);
-  vpsllq(xtmp2, dst, 32, vec_enc);
-  vpaddq(xtmp2, xtmp2, dst, vec_enc);
-  vpblendvb(dst, dst, xtmp2, xtmp3, vec_enc);
-  vpsrlq(dst, dst, 32, vec_enc);
+  // Find the leading zeros of the top and bottom halves of the long individually.
+  vector_count_leading_zeros_int_avx(dst, src, xtmp1, xtmp2, xtmp3, vec_enc);
+
+  // Move the top half result to the bottom half of xtmp1, setting the top half to 0.
+  vpsrlq(xtmp1, dst, 32, vec_enc);
+  // By moving the top half result to the right by 6 bits, if the top half was empty (i.e. 32 is returned) the result bit will
+  // be in the most significant position of the bottom half.
+  vpsrlq(xtmp2, dst, 6, vec_enc);
+
+  // In the bottom half, add the top half and bottom half results.
+  vpaddq(dst, xtmp1, dst, vec_enc);
+
+  // For the bottom half, choose between the values using the most significant bit of xtmp2.
+  // If the MSB is set, then bottom+top in dst is the resulting value. If the top half is less than 32 xtmp1 is chosen,
+  // which contains only the top half result.
+  // In the top half the MSB is always zero, so the value in xtmp1 is always chosen. This value is always 0, which clears
+  // the lane as required.
+  vblendvps(dst, xtmp1, dst, xtmp2, vec_enc, true, xtmp3);
 }
 
 void C2_MacroAssembler::vector_count_leading_zeros_avx(BasicType bt, XMMRegister dst, XMMRegister src,
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index 9eda6f85e3d..e9773e8ac07 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -46,7 +46,8 @@ import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 
 public class TestNumberOfContinuousZeros {
-    private static final int[] SPECIAL = { 0x01FFFFFF, 0x03FFFFFE, 0x07FFFFFC, 0x0FFFFFF8, 0x1FFFFFF0, 0x3FFFFFE0, 0xFFFFFFFF };
+    private static final int[] SPECIAL_INT = { 0, 0x01FFFFFF, 0x03FFFFFE, 0x07FFFFFC, 0x0FFFFFF8, 0x1FFFFFF0, 0x3FFFFFE0, 0xFFFFFFFF };
+    private static final long[] SPECIAL_LONG = { 0, 0xFF, 0xFFFF, 0x01FFFFFF, 0x03FFFFFE, 0x07FFFFFC, 0x0FFFFFF8, 0x1FFFFFF0, 0x3FFFFFE0, 0xFFFFFFFF, 0xFFFFFFFFFFFFFFFFL, 0x7FFFFFFFFFFFFFFFL };
     private long[] inputLong;
     private int[] outputLong;
     private int[] inputInt;
@@ -134,7 +135,18 @@ public class TestNumberOfContinuousZeros {
         int[] res = new int[LEN];
 
         for (int i = 0; i < LEN; i++) {
-            res[i] = SPECIAL[i % SPECIAL.length];
+            res[i] = SPECIAL_INT[i % SPECIAL_INT.length];
+        }
+
+        return new Object[] { res };
+    }
+
+    @Setup
+    static Object[] setupSpecialLongArray() {
+        long[] res = new long[LEN];
+
+        for (int i = 0; i < LEN; i++) {
+            res[i] = SPECIAL_LONG[i % SPECIAL_LONG.length];
         }
 
         return new Object[] { res };
@@ -167,23 +179,51 @@ public class TestNumberOfContinuousZeros {
         }
     }
 
-    private static final VectorSpecies<Integer> SPECIES = IntVector.SPECIES_PREFERRED;
+    @Test
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    @Arguments(setup = "setupSpecialLongArray")
+    public Object[] testSpecialLongLeadingZeros(long[] longs) {
+        int[] res = new int[LEN];
+
+        for (int i = 0; i < LEN; ++i) {
+            res[i] = Long.numberOfLeadingZeros(longs[i]);
+        }
+
+        return new Object[] { longs, res };
+    }
+
+    @Check(test = "testSpecialLongLeadingZeros")
+    public void checkSpecialLongLeadingZeros(Object[] vals) {
+        long[] in = (long[]) vals[0];
+        int[] out = (int[]) vals[1];
+
+        for (int i = 0; i < LEN; ++i) {
+            int value = Long.numberOfLeadingZeros(in[i]);
+
+            if (out[i] != value) {
+                throw new IllegalStateException("Expected lzcnt(" + in[i] + ") to be " + value + " but got " + out[i]);
+            }
+        }
+    }
+
+    private static final VectorSpecies<Integer> SPECIES_INT = IntVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Long> SPECIES_LONG = LongVector.SPECIES_PREFERRED;
 
     @Test
     @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VI, "> 0"})
     @Arguments(setup = "setupSpecialIntArray")
-    public Object[] checkSpecialIntLeadingZerosVector(int[] ints) {
+    public Object[] testIntLeadingZerosVector(int[] ints) {
         int[] res = new int[LEN];
 
-        for (int i = 0; i < ints.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, ints, i);
+        for (int i = 0; i < ints.length; i += SPECIES_INT.length()) {
+            IntVector av = IntVector.fromArray(SPECIES_INT, ints, i);
             av.lanewise(VectorOperators.LEADING_ZEROS_COUNT).intoArray(res, i);
         }
 
         return new Object[] { ints, res };
     }
 
-    @Check(test = "checkSpecialIntLeadingZerosVector")
+    @Check(test = "testIntLeadingZerosVector")
     public void checkSpecialIntLeadingZerosVector(Object[] vals) {
         int[] ints = (int[]) vals[0];
         int[] res = (int[]) vals[1];
@@ -192,8 +232,43 @@ public class TestNumberOfContinuousZeros {
 
         int[] check = new int[LEN];
 
-        for (int i = 0; i < ints.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, ints, i);
+        for (int i = 0; i < ints.length; i += SPECIES_INT.length()) {
+            IntVector av = IntVector.fromArray(SPECIES_INT, ints, i);
+            av.lanewise(VectorOperators.LEADING_ZEROS_COUNT).intoArray(check, i);
+        }
+
+        for (int i = 0; i < LEN; i++) {
+            if (res[i] != check[i]) {
+                throw new IllegalStateException("Expected " + check[i] + " but got " + res[i]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    @Arguments(setup = "setupSpecialLongArray")
+    public Object[] testLongLeadingZerosVector(long[] longs) {
+        long[] res = new long[LEN];
+
+        for (int i = 0; i < longs.length; i += SPECIES_LONG.length()) {
+            LongVector av = LongVector.fromArray(SPECIES_LONG, longs, i);
+            av.lanewise(VectorOperators.LEADING_ZEROS_COUNT).intoArray(res, i);
+        }
+
+        return new Object[] { longs, res };
+    }
+
+    @Check(test = "testLongLeadingZerosVector")
+    public void checkSpecialLongLeadingZerosVector(Object[] vals) {
+        long[] longs = (long[]) vals[0];
+        long[] res = (long[]) vals[1];
+
+        // Verification
+
+        long[] check = new long[LEN];
+
+        for (int i = 0; i < longs.length; i += SPECIES_LONG.length()) {
+            LongVector av = LongVector.fromArray(SPECIES_LONG, longs, i);
             av.lanewise(VectorOperators.LEADING_ZEROS_COUNT).intoArray(check, i);
         }
 
diff --git a/test/micro/org/openjdk/bench/vm/compiler/LeadingZeros.java b/test/micro/org/openjdk/bench/vm/compiler/LeadingZeros.java
new file mode 100644
index 00000000000..5ecdbcf28db
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/LeadingZeros.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Measurement(iterations = 5, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Warmup(iterations = 5, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(3)
+public class LeadingZeros {
+    private static final int SIZE = 512;
+
+    @Benchmark
+    public void testInt(Blackhole blackhole, BenchState state) {
+        for (int i = 0; i < SIZE; i++) {
+            state.result[i] = Integer.numberOfLeadingZeros(state.ints[i]);
+        }
+
+        blackhole.consume(state.result);
+    }
+
+    @Benchmark
+    public void testLong(Blackhole blackhole, BenchState state) {
+        for (int i = 0; i < SIZE; i++) {
+            state.result[i] = Long.numberOfLeadingZeros(state.longs[i]);
+        }
+
+        blackhole.consume(state.result);
+    }
+
+    @State(Scope.Benchmark)
+    public static class BenchState {
+        private final int[] ints = new int[SIZE];
+        private final long[] longs = new long[SIZE];
+
+        private final int[] result = new int[SIZE];
+
+        private Random random;
+
+        public BenchState() {
+        }
+
+        @Setup
+        public void setup() {
+            this.random = new Random(1000);
+
+            for (int i = 0; i < SIZE; i++) {
+                ints[i] = this.random.nextInt();
+
+                longs[i] = this.random.nextLong();
+            }
+        }
+    }
+}

From d570765e2720a11c88c806554df9b13587a041a2 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 10 Nov 2025 06:19:27 +0000
Subject: [PATCH 097/512] 8367149: Add convenient construction for creating
 ad-hoc VMErrorCallback

Reviewed-by: ayang, stefank
---
 src/hotspot/share/utilities/vmError.hpp | 48 +++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/hotspot/share/utilities/vmError.hpp b/src/hotspot/share/utilities/vmError.hpp
index 5e5e074fb20..04cea6de47c 100644
--- a/src/hotspot/share/utilities/vmError.hpp
+++ b/src/hotspot/share/utilities/vmError.hpp
@@ -251,4 +251,52 @@ public:
   ~VMErrorCallbackMark();
 };
 
+// Convenient construction for creating ad-hoc VMErrorCallback which automatically
+// calls the provided invocable f if a VM crash occurs within its lifetime.
+// Can be used to instrument a build for more detailed contextual information
+// gathering. Especially useful when hunting down intermittent bugs, or issues
+// only reproducible in environments where access to a debugger is not readily
+// available. Example use:
+/*
+  {
+    // Note the lambda is invoked after an error occurs within this thread,
+    // and during on_error's lifetime. If state prior to the crash is required,
+    // capture a copy of it first.
+    auto important_value = get_the_value();
+
+    OnVMError on_error([&](outputStream* st) {
+      // Dump the important bits.
+      st->print("Prior value: ");
+      important_value.print_on(st);
+      st->print("During crash: ")
+      get_the_value().print_on(st);
+      // Dump whole the whole state.
+      this->print_on(st);
+    });
+
+    // When VM crashes, the above lambda will be invoked and print relevant info.
+    might_cause_vm_crash();
+  }
+*/
+template <typename CallableType>
+class OnVMError : public VMErrorCallback {
+  CallableType _callable;
+  VMErrorCallbackMark _mark;
+
+  void call(outputStream* st) final { _callable(st); }
+
+public:
+  template <typename Callable>
+  OnVMError(Callable&& callable) : VMErrorCallback(), _callable(static_cast<Callable&&>(callable)), _mark(this) {}
+};
+
+// This deduction rule enables creating a type with out using auto, decltype
+// and/or helping construction functions. It enables the generic template type
+// to be deduced in the following code:
+//   OnVMError on_error([&](outputStream* st) { ... })
+// Rather than having to something along the lines of:
+//   auto f = [&](outputStream* st) { ... };
+//   OnVMError<decltype(f)> on_error(f);
+template <typename CallableType> OnVMError(CallableType) -> OnVMError<CallableType>;
+
 #endif // SHARE_UTILITIES_VMERROR_HPP

From 79fee607fd77320cd5deb8e424582e2f6c2b31a2 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 10 Nov 2025 07:58:13 +0000
Subject: [PATCH 098/512] 8371473: Problem list TestEmergencyDumpAtOOM.java on
 ppc64 platforms related to JDK-8371014

Reviewed-by: mdoerr, phubner
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 5132d012d7f..b01460c3816 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -748,6 +748,7 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 # jdk_jfr
 
 jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-all
+jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java             8371014 aix-ppc64,linux-ppc64le
 jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
 jdk/jfr/jvm/TestWaste.java                                      8369949 generic-all

From 5e8bf7a283f75464dbd906454c852e4d1db497dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <bmaillard@openjdk.org>
Date: Mon, 10 Nov 2025 08:39:21 +0000
Subject: [PATCH 099/512] 8369646: Detection of redundant conversion patterns
 in add_users_of_use_to_worklist is too restrictive

Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/phaseX.cpp                | 13 ++++++++-----
 src/hotspot/share/opto/phaseX.hpp                | 16 ++++++++++++++++
 ...estEliminateRedundantConversionSequences.java | 11 +++++++++--
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index b5b15275e21..5fcb2a62682 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2566,13 +2566,16 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
   // ConvI2F->ConvF2I->ConvI2F
   // Note: there may be other 3-nodes conversion chains that would require to be added here, but these
   // are the only ones that are known to trigger missed optimizations otherwise
-  if ((n->Opcode() == Op_ConvD2L && use_op == Op_ConvL2D) ||
-      (n->Opcode() == Op_ConvF2I && use_op == Op_ConvI2F) ||
-      (n->Opcode() == Op_ConvF2L && use_op == Op_ConvL2F) ||
-      (n->Opcode() == Op_ConvI2F && use_op == Op_ConvF2I)) {
+  if (use_op == Op_ConvL2D ||
+      use_op == Op_ConvI2F ||
+      use_op == Op_ConvL2F ||
+      use_op == Op_ConvF2I) {
     for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
       Node* u = use->fast_out(i2);
-      if (u->Opcode() == n->Opcode()) {
+      if ((use_op == Op_ConvL2D && u->Opcode() == Op_ConvD2L) ||
+          (use_op == Op_ConvI2F && u->Opcode() == Op_ConvF2I) ||
+          (use_op == Op_ConvL2F && u->Opcode() == Op_ConvF2L) ||
+          (use_op == Op_ConvF2I && u->Opcode() == Op_ConvI2F)) {
         worklist.push(u);
       }
     }
diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp
index 300c8fc2757..083e77bf6d9 100644
--- a/src/hotspot/share/opto/phaseX.hpp
+++ b/src/hotspot/share/opto/phaseX.hpp
@@ -528,7 +528,23 @@ public:
 
   // Add users of 'n' to worklist
   static void add_users_to_worklist0(Node* n, Unique_Node_List& worklist);
+
+  // Add one or more users of 'use' to the worklist if it appears that a
+  // known optimization could be applied to those users.
+  // Node 'n' is a node that was modified or is about to get replaced,
+  // and 'use' is one use of 'n'.
+  // Certain optimizations have dependencies that extend beyond a node's
+  // direct inputs, so it is necessary to ensure the appropriate
+  // notifications are made here.
   static void add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_List& worklist);
+
+  // Add users of 'n', and any other nodes that could be directly
+  // affected by changes to 'n', to the worklist.
+  // Node 'n' may be a node that is about to get replaced. In this
+  // case, 'n' should not be considered part of the new graph.
+  // Passing the old node (as 'n'), rather than the new node,
+  // prevents unnecessary notifications when the new node already
+  // has other users.
   void add_users_to_worklist(Node* n);
 
   // Replace old node with new one.
diff --git a/test/hotspot/jtreg/compiler/c2/TestEliminateRedundantConversionSequences.java b/test/hotspot/jtreg/compiler/c2/TestEliminateRedundantConversionSequences.java
index b452b8f67dd..f7bcaa94230 100644
--- a/test/hotspot/jtreg/compiler/c2/TestEliminateRedundantConversionSequences.java
+++ b/test/hotspot/jtreg/compiler/c2/TestEliminateRedundantConversionSequences.java
@@ -23,13 +23,20 @@
 
 /*
  * @test
- * @bug 8359603
+ * @bug 8359603 8369646
  * @summary Redundant ConvX2Y->ConvY2X->ConvX2Y sequences should be
  *          simplified to a single ConvX2Y operation when applicable
  *          VerifyIterativeGVN checks that this optimization was applied
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:CompileCommand=compileonly,compiler.c2.TestEliminateRedundantConversionSequences::test*
- *      -XX:-TieredCompilation -Xbatch -XX:VerifyIterativeGVN=1110 compiler.c2.TestEliminateRedundantConversionSequences
+ *      -XX:-TieredCompilation -Xbatch -XX:VerifyIterativeGVN=1110
+ *      -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN
+ *      compiler.c2.TestEliminateRedundantConversionSequences
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,compiler.c2.TestEliminateRedundantConversionSequences::test*
+ *      -XX:-TieredCompilation -Xbatch -XX:VerifyIterativeGVN=1110
+ *      -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:StressSeed=115074401
+ *      compiler.c2.TestEliminateRedundantConversionSequences
  * @run main compiler.c2.TestEliminateRedundantConversionSequences
  *
  */

From 0c1b7267e374192f30322a45a1a34f734565cc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <bmaillard@openjdk.org>
Date: Mon, 10 Nov 2025 08:41:13 +0000
Subject: [PATCH 100/512] 8366990: C2: Compilation hits the memory limit when
 verifying loop opts in Split-If code

Reviewed-by: chagedorn, dfenacci
---
 src/hotspot/share/ci/ciInstanceKlass.cpp      |  42 ++++++--
 src/hotspot/share/ci/ciInstanceKlass.hpp      |   3 +
 src/hotspot/share/opto/type.cpp               |  12 +--
 ...stVerifyLoopOptimizationsHitsMemLimit.java | 101 ++++++++++++++++++
 4 files changed, 144 insertions(+), 14 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java

diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp
index c367170f2c2..9bbf005356c 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.cpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.cpp
@@ -391,17 +391,21 @@ bool ciInstanceKlass::contains_field_offset(int offset) {
   return get_instanceKlass()->contains_field_offset(offset);
 }
 
+ciField* ciInstanceKlass::get_non_static_field_by_offset(const int field_offset) {
+  for (int i = 0, len = nof_nonstatic_fields(); i < len; i++) {
+    ciField* field = _nonstatic_fields->at(i);
+    int field_off = field->offset_in_bytes();
+    if (field_off == field_offset)
+      return field;
+  }
+  return nullptr;
+}
+
 // ------------------------------------------------------------------
 // ciInstanceKlass::get_field_by_offset
 ciField* ciInstanceKlass::get_field_by_offset(int field_offset, bool is_static) {
   if (!is_static) {
-    for (int i = 0, len = nof_nonstatic_fields(); i < len; i++) {
-      ciField* field = _nonstatic_fields->at(i);
-      int  field_off = field->offset_in_bytes();
-      if (field_off == field_offset)
-        return field;
-    }
-    return nullptr;
+    return get_non_static_field_by_offset(field_offset);
   }
   VM_ENTRY_MARK;
   InstanceKlass* k = get_instanceKlass();
@@ -427,6 +431,30 @@ ciField* ciInstanceKlass::get_field_by_name(ciSymbol* name, ciSymbol* signature,
   return field;
 }
 
+// This is essentially a shortcut for:
+//   get_field_by_offset(field_offset, is_static)->layout_type()
+// except this does not require allocating memory for a new ciField
+BasicType ciInstanceKlass::get_field_type_by_offset(const int field_offset, const bool is_static) {
+  if (!is_static) {
+    ciField* field = get_non_static_field_by_offset(field_offset);
+    return field != nullptr ? field->layout_type() : T_ILLEGAL;
+  }
+
+  // Avoid allocating a new ciField by obtaining the field type directly
+  VM_ENTRY_MARK;
+  InstanceKlass* k = get_instanceKlass();
+  fieldDescriptor fd;
+  if (!k->find_field_from_offset(field_offset, is_static, &fd)) {
+    return T_ILLEGAL;
+  }
+
+  // Reproduce the behavior of ciField::layout_type
+  BasicType field_type = fd.field_type();
+  if (is_reference_type(field_type)) {
+    return T_OBJECT;
+  }
+  return type2field[make(field_type)->basic_type()];
+}
 
 // ------------------------------------------------------------------
 // ciInstanceKlass::compute_nonstatic_fields
diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp
index d3d988e8735..ec8fc789c7d 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp
@@ -82,6 +82,8 @@ private:
   bool compute_injected_fields_helper();
   void compute_transitive_interfaces();
 
+  ciField* get_non_static_field_by_offset(int field_offset);
+
 protected:
   ciInstanceKlass(Klass* k);
   ciInstanceKlass(ciSymbol* name, jobject loader);
@@ -204,6 +206,7 @@ public:
   ciInstanceKlass* get_canonical_holder(int offset);
   ciField* get_field_by_offset(int field_offset, bool is_static);
   ciField* get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static);
+  BasicType get_field_type_by_offset(int field_offset, bool is_static);
 
   // total number of nonstatic fields (including inherited):
   int nof_nonstatic_fields() {
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index f62eea893cd..96fee925e5d 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -3478,13 +3478,12 @@ TypeOopPtr::TypeOopPtr(TYPES t, PTR ptr, ciKlass* k, const TypeInterfaces* inter
         } else if (klass() == ciEnv::current()->Class_klass() &&
                    _offset >= InstanceMirrorKlass::offset_of_static_fields()) {
           // Static fields
-          ciField* field = nullptr;
+          BasicType basic_elem_type = T_ILLEGAL;
           if (const_oop() != nullptr) {
             ciInstanceKlass* k = const_oop()->as_instance()->java_lang_Class_klass()->as_instance_klass();
-            field = k->get_field_by_offset(_offset, true);
+            basic_elem_type = k->get_field_type_by_offset(_offset, true);
           }
-          if (field != nullptr) {
-            BasicType basic_elem_type = field->layout_type();
+          if (basic_elem_type != T_ILLEGAL) {
             _is_ptr_to_narrowoop = UseCompressedOops && ::is_reference_type(basic_elem_type);
           } else {
             // unsafe access
@@ -3492,9 +3491,8 @@ TypeOopPtr::TypeOopPtr(TYPES t, PTR ptr, ciKlass* k, const TypeInterfaces* inter
           }
         } else {
           // Instance fields which contains a compressed oop references.
-          ciField* field = ik->get_field_by_offset(_offset, false);
-          if (field != nullptr) {
-            BasicType basic_elem_type = field->layout_type();
+          BasicType basic_elem_type = ik->get_field_type_by_offset(_offset, false);
+          if (basic_elem_type != T_ILLEGAL) {
             _is_ptr_to_narrowoop = UseCompressedOops && ::is_reference_type(basic_elem_type);
           } else if (klass()->equals(ciEnv::current()->Object_klass())) {
             // Compile::find_alias_type() cast exactness on all types to verify
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java b/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
new file mode 100644
index 00000000000..a2834c26dcc
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts;
+
+/**
+ * @test
+ * @bug 8366990
+ * @summary Loop optimizations verification results in hitting the memory limit.
+ *          This is caused by the high number of verification passes triggered
+ *          in PhaseIdealLoop::split_if_with_blocks_post and repetitive memory
+ *          allocations while building the ideal loop tree in preparation for
+ *          the verification.
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -XX:CompileCommand=compileonly,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test
+ *      -XX:CompileCommand=memlimit,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test,100M~crash
+ *      -XX:-TieredCompilation -Xcomp -XX:PerMethodTrapLimit=0
+ *      -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations
+ *      -XX:StressSeed=1870557292
+ *      compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -XX:CompileCommand=compileonly,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test
+ *      -XX:CompileCommand=memlimit,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test,100M~crash
+ *      -XX:-TieredCompilation -Xcomp -XX:PerMethodTrapLimit=0
+ *      -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations
+ *      compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
+ * @run main compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
+ */
+
+public class TestVerifyLoopOptimizationsHitsMemLimit {
+    final int a = 400;
+    int b;
+    float c;
+    static double d;
+    static byte f;
+    long g[];
+    volatile int h[];
+
+    void test() {
+        int j, k = 2, l, o[] = new int[a];
+        short m = 10492;
+        for (j = 1;; ++j) {
+            l = 1;
+            do {
+                g[j] = l;
+                switch (j) {
+                    case 45:
+                        o[1] = b;
+                    case 163:
+                    case 62:
+                    case 72:
+                    case 319:
+                        h[1] -= k;
+                    case 109:
+                    case 47:
+                    case 91:
+                    case 68:
+                    case 162:
+                    case 76:
+                    case 60:
+                    case 66:
+                    case 83:
+                        d = m;
+                    case 2314:
+                        f = (byte) c;
+                }
+            } while (++l < 4);
+        }
+    }
+
+    public static void main(String[] args) {
+        try {
+            TestVerifyLoopOptimizationsHitsMemLimit test = new TestVerifyLoopOptimizationsHitsMemLimit();
+            test.test();
+            throw new RuntimeException("Expected a NPE for uninitialized array");
+        } catch (NullPointerException e) {
+            // expected
+        }
+    }
+}

From 2c378e26d7319b6b0e273d2409dd3f591c5f5f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 10 Nov 2025 08:54:04 +0000
Subject: [PATCH 101/512] 8370813: Deprecate AggressiveHeap

Reviewed-by: ayang, shade
---
 src/hotspot/share/gc/shared/gc_globals.hpp |  5 +++--
 src/hotspot/share/runtime/arguments.cpp    |  1 +
 src/java.base/share/man/java.md            | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 938544b9a2c..4fb72f4102a 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -270,11 +270,12 @@
                                                                             \
   product(uint64_t, MaxRAM, 0,                                              \
           "(Deprecated) Real memory size (in bytes) used to set maximum "   \
-          "heap size")                                                     \
+          "heap size")                                                      \
           range(0, 0XFFFFFFFFFFFFFFFF)                                      \
                                                                             \
   product(bool, AggressiveHeap, false,                                      \
-          "Optimize heap options for long-running memory intensive apps")   \
+          "(Deprecated) Optimize heap options for long-running memory "     \
+          "intensive apps")                                                 \
                                                                             \
   product(size_t, ErgoHeapSizeLimit, 0,                                     \
           "Maximum ergonomically set heap size (in bytes); zero means use " \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 6ab2b7a887c..730bb7871e2 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -536,6 +536,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "ParallelRefProcBalancingEnabled", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "PSChunkLargeArrays",           JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "MaxRAM",                       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
+  { "AggressiveHeap",               JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
   { "CreateMinidumpOnCrash",        JDK_Version::jdk(9),  JDK_Version::undefined(), JDK_Version::undefined() },
 
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 1e9eaa67d6d..0f9d8e89bfc 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -2309,12 +2309,6 @@ perform extensive debugging.
 These `java` options control how garbage collection (GC) is performed by the
 Java HotSpot VM.
 
-`-XX:+AggressiveHeap`
-:   Enables Java heap optimization. This sets various parameters to be
-    optimal for long-running jobs with intensive memory allocation, based on
-    the configuration of the computer (RAM and CPU). By default, the option
-    is disabled and the heap sizes are configured less aggressively.
-
 `-XX:+AlwaysPreTouch`
 :   Requests the VM to touch every page on the Java heap after requesting it from
     the operating system and before handing memory out to the application.
@@ -2951,6 +2945,12 @@ they're used.
 
     >   `-XX:MaxRAM=2G`
 
+`-XX:+AggressiveHeap`
+:   Enables Java heap optimization. This sets various parameters to be
+    optimal for long-running jobs with intensive memory allocation, based on
+    the configuration of the computer (RAM and CPU). By default, the option
+    is disabled and the heap sizes are configured less aggressively.
+
 ## Obsolete Java Options
 
 These `java` options are still accepted but ignored, and a warning is issued

From f48ad21ecc288c280db3ffb2e098df12518e2a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20H=C3=BCbner?= <phubner@openjdk.org>
Date: Mon, 10 Nov 2025 09:24:45 +0000
Subject: [PATCH 102/512] 8371216: oopDesc::print_value_on breaks if klass is
 garbage

Reviewed-by: coleenp, mdoerr
---
 src/hotspot/share/oops/oop.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
index f874a39bf31..5f453241c3d 100644
--- a/src/hotspot/share/oops/oop.cpp
+++ b/src/hotspot/share/oops/oop.cpp
@@ -83,7 +83,10 @@ char* oopDesc::print_value_string() {
 
 void oopDesc::print_value_on(outputStream* st) const {
   oop obj = const_cast<oopDesc*>(this);
-  if (java_lang_String::is_instance(obj)) {
+  // We can't use java_lang_String::is_instance since that has klass assertions enabled.
+  // If the klass is garbage we want to just fail the check and continue printing, as
+  // opposed to aborting the VM entirely.
+  if (obj != nullptr && obj->klass_without_asserts() == vmClasses::String_klass()) {
     java_lang_String::print(obj, st);
     print_address_on(st);
   } else {

From c0b82ff2e5b696371de62e0f4fcbba61361fc6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 10 Nov 2025 09:41:55 +0000
Subject: [PATCH 103/512] 8370843: Deprecate AlwaysActAsServerClassMachine and
 NeverActAsServerClassMachine

Reviewed-by: ayang, kvn
---
 src/hotspot/share/gc/shared/gc_globals.hpp |  4 +--
 src/hotspot/share/runtime/arguments.cpp    |  2 ++
 src/java.base/share/man/java.md            | 40 +++++++++++-----------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 4fb72f4102a..e86a8744847 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -263,10 +263,10 @@
           "before pushing a continuation entry")                            \
                                                                             \
   product_pd(bool, NeverActAsServerClassMachine,                            \
-          "Never act like a server-class machine")                          \
+          "(Deprecated) Never act like a server-class machine")             \
                                                                             \
   product(bool, AlwaysActAsServerClassMachine, false,                       \
-          "Always act like a server-class machine")                         \
+          "(Deprecated) Always act like a server-class machine")            \
                                                                             \
   product(uint64_t, MaxRAM, 0,                                              \
           "(Deprecated) Real memory size (in bytes) used to set maximum "   \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 730bb7871e2..79027cf113f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -537,6 +537,8 @@ static SpecialFlag const special_jvm_flags[] = {
   { "PSChunkLargeArrays",           JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "MaxRAM",                       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "AggressiveHeap",               JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
+  { "NeverActAsServerClassMachine", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
+  { "AlwaysActAsServerClassMachine", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
   { "CreateMinidumpOnCrash",        JDK_Version::jdk(9),  JDK_Version::undefined(), JDK_Version::undefined() },
 
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 0f9d8e89bfc..43719ff619a 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -1235,26 +1235,6 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
     This option is only supported on Linux with GNU C Library (glibc).
 
-`-XX:+NeverActAsServerClassMachine`
-:   Enable the "Client VM emulation" mode which only uses the C1 JIT compiler,
-    a 32Mb CodeCache and the Serial GC. The maximum amount of memory that the
-    JVM may use (controlled by the `-XX:MaxRAM=n` flag) is set to 1GB by default.
-    The string "emulated-client" is added to the JVM version string.
-
-    By default the flag is set to `true` only on Windows in 32-bit mode and
-    `false` in all other cases.
-
-    The "Client VM emulation" mode will not be enabled if any of the following
-    flags are used on the command line:
-
-    ```
-    -XX:{+|-}TieredCompilation
-    -XX:CompilationMode=mode
-    -XX:TieredStopAtLevel=n
-    -XX:{+|-}EnableJVMCI
-    -XX:{+|-}UseJVMCICompiler
-    ```
-
 `-XX:ObjectAlignmentInBytes=`*alignment*
 :   Sets the memory alignment of Java objects (in bytes). By default, the value
     is set to 8 bytes. The specified value should be a power of 2, and must be
@@ -2951,6 +2931,26 @@ they're used.
     the configuration of the computer (RAM and CPU). By default, the option
     is disabled and the heap sizes are configured less aggressively.
 
+`-XX:+NeverActAsServerClassMachine`
+:   Enable the "Client VM emulation" mode which only uses the C1 JIT compiler,
+    a 32Mb CodeCache and the Serial GC. The maximum amount of memory that the
+    JVM may use (controlled by the `-XX:MaxRAM=n` flag) is set to 1GB by default.
+    The string "emulated-client" is added to the JVM version string.
+
+    By default the flag is set to `true` only on Windows in 32-bit mode and
+    `false` in all other cases.
+
+    The "Client VM emulation" mode will not be enabled if any of the following
+    flags are used on the command line:
+
+    ```
+    -XX:{+|-}TieredCompilation
+    -XX:CompilationMode=mode
+    -XX:TieredStopAtLevel=n
+    -XX:{+|-}EnableJVMCI
+    -XX:{+|-}UseJVMCICompiler
+    ```
+
 ## Obsolete Java Options
 
 These `java` options are still accepted but ignored, and a warning is issued

From 49f51f9450ac3b923f83ba7d9089e5560e25ec7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 10 Nov 2025 10:06:09 +0000
Subject: [PATCH 104/512] 8370612: Simplify implementation of dark theme
 8371021: Tab order in theme picker is broken

Reviewed-by: jlamperth, liach
---
 .../doclets/formats/html/Navigation.java      |  39 ++-
 .../formats/html/resources/highlight.css      | 126 +---------
 .../formats/html/resources/script.js.template |  46 ++--
 .../formats/html/resources/stylesheet.css     | 226 +++---------------
 .../CheckStylesheetClasses.java               |   3 -
 .../testNavigation/TestModuleNavigation.java  |  37 +--
 .../doclet/testNavigation/TestNavigation.java |  46 +---
 .../doclet/testSpecTag/TestSpecTag.java       |   6 +-
 .../doclet/testStylesheet/TestStylesheet.java |   2 +-
 9 files changed, 113 insertions(+), 418 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index 1938a4838f5..30318bbaeea 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -500,14 +500,28 @@ public class Navigation {
     private void addThemeSwitcher(Content target) {
         var selectTheme = contents.getContent("doclet.theme.select_theme");
         target.add(HtmlTree.LI(HtmlTree.BUTTON(HtmlIds.THEME_BUTTON)
-                .add(HtmlTree.IMG(pathToRoot.resolve(DocPaths.RESOURCE_FILES).resolve(DocPaths.SUN_SVG),
-                        selectTheme.toString()).addStyle(HtmlIds.THEME_LIGHT.name()))
-                .add(HtmlTree.IMG(pathToRoot.resolve(DocPaths.RESOURCE_FILES).resolve(DocPaths.MOON_SVG),
-                        selectTheme.toString()).addStyle(HtmlIds.THEME_DARK.name()))
                 .put(HtmlAttr.ARIA_LABEL, selectTheme.toString())
                 .put(HtmlAttr.TITLE, selectTheme.toString())));
     }
 
+    private void addThemePanel(Content target) {
+        var selectTheme = contents.getContent("doclet.theme.select_theme");
+        target.add(HtmlTree.DIV(HtmlIds.THEME_PANEL)
+                .add(HtmlTree.DIV(selectTheme))
+                .add(HtmlTree.DIV(HtmlTree.LABEL(HtmlIds.THEME_LIGHT.name(), Text.EMPTY)
+                                .add(HtmlTree.INPUT(HtmlAttr.InputType.RADIO, HtmlIds.THEME_LIGHT)
+                                        .put(HtmlAttr.NAME, "theme").put(HtmlAttr.VALUE, HtmlIds.THEME_LIGHT.name()))
+                                .add(HtmlTree.SPAN(contents.getContent("doclet.theme.light"))))
+                        .add(HtmlTree.LABEL(HtmlIds.THEME_DARK.name(), Text.EMPTY)
+                                .add(HtmlTree.INPUT(HtmlAttr.InputType.RADIO, HtmlIds.THEME_DARK)
+                                        .put(HtmlAttr.NAME, "theme").put(HtmlAttr.VALUE, HtmlIds.THEME_DARK.name()))
+                                .add(HtmlTree.SPAN(contents.getContent("doclet.theme.dark"))))
+                        .add(HtmlTree.LABEL(HtmlIds.THEME_OS.name(), Text.EMPTY)
+                                .add(HtmlTree.INPUT(HtmlAttr.InputType.RADIO, HtmlIds.THEME_OS)
+                                        .put(HtmlAttr.NAME, "theme").put(HtmlAttr.VALUE, HtmlIds.THEME_OS.name()))
+                                .add(HtmlTree.SPAN(contents.getContent("doclet.theme.system"))))));
+    }
+
     private void addSearch(Content target) {
         var resources = configuration.getDocResources();
         var inputText = HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlIds.SEARCH_INPUT)
@@ -557,6 +571,7 @@ public class Navigation {
                 .put(HtmlAttr.TITLE, rowListTitle);
         addMainNavLinks(navList);
         navContent.add(navList);
+        addThemePanel(navContent);
         var aboutDiv = HtmlTree.DIV(HtmlStyles.aboutLanguage, aboutContent);
         navContent.add(aboutDiv);
         navigationBar.add(HtmlTree.DIV(HtmlStyles.topNav, navContent).setId(HtmlIds.NAVBAR_TOP));
@@ -574,22 +589,6 @@ public class Navigation {
         breadcrumbNav.addAll(subNavLinks, HtmlTree::LI);
         subNavContent.addUnchecked(breadcrumbNav);
 
-        var selectTheme = contents.getContent("doclet.theme.select_theme");
-        subNavContent.add(HtmlTree.DIV(HtmlIds.THEME_PANEL)
-                .add(HtmlTree.DIV(selectTheme))
-                .add(HtmlTree.DIV(HtmlTree.LABEL(HtmlIds.THEME_LIGHT.name(), Text.EMPTY)
-                                .add(HtmlTree.INPUT(HtmlAttr.InputType.RADIO, HtmlIds.THEME_LIGHT)
-                                        .put(HtmlAttr.NAME, "theme").put(HtmlAttr.VALUE, HtmlIds.THEME_LIGHT.name()))
-                                .add(HtmlTree.SPAN(contents.getContent("doclet.theme.light"))))
-                        .add(HtmlTree.LABEL(HtmlIds.THEME_DARK.name(), Text.EMPTY)
-                                .add(HtmlTree.INPUT(HtmlAttr.InputType.RADIO, HtmlIds.THEME_DARK)
-                                        .put(HtmlAttr.NAME, "theme").put(HtmlAttr.VALUE, HtmlIds.THEME_DARK.name()))
-                                .add(HtmlTree.SPAN(contents.getContent("doclet.theme.dark"))))
-                        .add(HtmlTree.LABEL(HtmlIds.THEME_OS.name(), Text.EMPTY)
-                                .add(HtmlTree.INPUT(HtmlAttr.InputType.RADIO, HtmlIds.THEME_OS)
-                                        .put(HtmlAttr.NAME, "theme").put(HtmlAttr.VALUE, HtmlIds.THEME_OS.name()))
-                                .add(HtmlTree.SPAN(contents.getContent("doclet.theme.system"))))));
-
         if (options.createIndex() && documentedPage != PageMode.SEARCH) {
             addSearch(subNavContent);
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css
index 77c32543049..54ee304478e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css
@@ -65,7 +65,7 @@
     /* ignored */
 }
 
-body.theme-dark {
+:root[data-theme="theme-dark"] {
     .hljs-title.function_,
     .hljs-template-variable {
         color: #66bcce;
@@ -126,127 +126,3 @@ body.theme-dark {
         /* ignored */
     }
 }
-
-@media (prefers-color-scheme: dark) {
-    .hljs-title.function_,
-    .hljs-template-variable {
-        color: #66bcce;
-    }
-    .hljs-code,
-    .hljs-comment,
-    .hljs-quote {
-        color:#9d9d9d;
-        font-style: italic;
-    }
-    .hljs-meta {
-        color: #836F00;
-    }
-    .hljs-symbol,
-    .hljs-template-tag,
-    .hljs-keyword,
-    .hljs-literal,
-    .hljs-name,
-    .hljs-built_in,
-    .hljs-char.escape_ {
-        color: #88aece;
-    }
-    .hljs-variable,
-    .hljs-property,
-    .hljs-attr,
-    .hljs-section {
-        color: #c59bc1;
-    }
-    .hljs-attribute {
-        color:  #c59bc1;
-    }
-    .hljs-regexp,
-    .hljs-number {
-        color: #cfe374;
-    }
-    .hljs-link {
-        color: #b5bd68;
-    }
-    .hljs-string {
-        color: #b5bd68;
-    }
-    .hljs-doctag {
-        text-decoration: underline;
-    }
-    .hljs-emphasis {
-        font-style: italic;
-    }
-    .hljs-strong {
-        font-weight: bold;
-    }
-    .hljs-subst,
-    .hljs-title,
-    .hljs-params,
-    .hljs-bullet,
-    .hljs-formula,
-    .hljs-tag,
-    .hljs-type {
-        /* ignored */
-    }
-
-    body.theme-light {
-        .hljs-title.function_,
-        .hljs-template-variable {
-            color: #00738F;
-        }
-        .hljs-code,
-        .hljs-comment,
-        .hljs-quote {
-            color: #6e6e71;
-            font-style: italic;
-        }
-        .hljs-meta {
-            color: #836F00;
-        }
-        .hljs-symbol,
-        .hljs-template-tag,
-        .hljs-keyword,
-        .hljs-literal,
-        .hljs-name,
-        .hljs-built_in,
-        .hljs-char.escape_ {
-            color: #0C40C2;
-        }
-        .hljs-variable,
-        .hljs-property,
-        .hljs-attr,
-        .hljs-section {
-            color: #841191;
-        }
-        .hljs-attribute {
-            color: #164ad9;
-        }
-        .hljs-regexp,
-        .hljs-number {
-            color: #104BEB;
-        }
-        .hljs-link {
-            color: #47688a;
-        }
-        .hljs-string {
-            color: #008313;
-        }
-        .hljs-doctag {
-            text-decoration: underline;
-        }
-        .hljs-emphasis {
-            font-style: italic;
-        }
-        .hljs-strong {
-            font-weight: bold;
-        }
-        .hljs-subst,
-        .hljs-title,
-        .hljs-params,
-        .hljs-bullet,
-        .hljs-formula,
-        .hljs-tag,
-        .hljs-type {
-            /* ignored */
-        }
-    }
-}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
index 235d0a87d24..f4c54714986 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
@@ -17,7 +17,9 @@ const sortAsc = "sort-asc";
 const sortDesc = "sort-desc";
 const tableTab = "table-tab";
 const activeTableTab = "active-table-tab";
-const THEMES = Object.freeze(["theme-light", "theme-dark", "theme-os"]);
+const THEME_LIGHT = "theme-light";
+const THEME_DARK = "theme-dark";
+const THEME_OS = "theme-os";
 
 const linkIcon = "##REPLACE:doclet.Link_icon##";
 const linkToSection = "##REPLACE:doclet.Link_to_section##";
@@ -320,12 +322,21 @@ function makeFilterWidget(sidebar, updateToc) {
     return sidebar;
 }
 
+const osDarkTheme = window.matchMedia("(prefers-color-scheme: dark)");
+osDarkTheme.addEventListener("change", e => {
+    if (getTheme() === THEME_OS) {
+        setTheme(THEME_OS);
+    }
+});
 function getTheme() {
-    return localStorage.getItem('theme') || THEMES[0];
+    return localStorage.getItem("theme") || THEME_LIGHT;
+}
+function setTheme(theme) {
+    var value = theme !== THEME_OS ? theme : osDarkTheme.matches ? THEME_DARK : THEME_LIGHT;
+    document.documentElement.setAttribute("data-theme", value);
 }
-
 function initTheme() {
-    document.body.classList.add(getTheme());
+    setTheme(getTheme());
 }
 
 function setTopMargin() {
@@ -347,7 +358,6 @@ document.addEventListener("readystatechange", (e) => {
 
 document.addEventListener("DOMContentLoaded", function(e) {
     setTopMargin();
-    const subnav = document.querySelector("ol.sub-nav-list");
     const keymap = new Map();
     const searchInput = document.getElementById("search-input")
                    || document.getElementById("page-search-input");
@@ -360,10 +370,9 @@ document.addEventListener("DOMContentLoaded", function(e) {
         keymap.set(".", filterInput);
     }
     // Clone TOC sidebar to header for mobile navigation
-    const navbar = document.querySelector("div#navbar-top");
     const sidebar = document.querySelector(".main-grid nav.toc");
     const main = document.querySelector(".main-grid main");
-    const mainnav = navbar.querySelector("ul.nav-list");
+    const mainnav = document.querySelector("div#navbar-top ul.nav-list");
     const toggleButton = document.querySelector("button#navbar-toggle-button");
     const tocMenu = sidebar ? sidebar.cloneNode(true) : null;
     const themeButton = document.querySelector("button#theme-button");
@@ -401,19 +410,22 @@ document.addEventListener("DOMContentLoaded", function(e) {
         }
         input.addEventListener("change", e => {
             setTheme(e.target.value);
+            localStorage.setItem("theme", e.target.value);
         })
     });
-    function setTheme(theme) {
-        THEMES.forEach(t => {
-            if (t !== theme) document.body.classList.remove(t);
-        });
-        document.body.classList.add(theme);
-        localStorage.setItem("theme", theme);
-        document.getElementById(theme).checked = true;
-    }
+    themePanel.addEventListener("focusout", e => {
+        if (e.relatedTarget && !themePanel.contains(e.relatedTarget) && !themeButton.contains(e.relatedTarget)) {
+            closeThemePanel();
+        }
+    });
+    themePanel.addEventListener("keydown", e => {
+        if (e.key === "Escape" || e.key === "Enter") {
+            closeThemePanel();
+        }
+    });
     makeFilterWidget(sidebar, updateToc);
     if (tocMenu) {
-        navbar.appendChild(tocMenu);
+        document.querySelector("div#navbar-top").appendChild(tocMenu);
         makeFilterWidget(tocMenu, updateToc);
         var menuInput = tocMenu.querySelector("input.filter-input");
     }
@@ -473,7 +485,7 @@ document.addEventListener("DOMContentLoaded", function(e) {
         expanded = true;
         mainnav.style.display = "block";
         mainnav.style.removeProperty("height");
-        var maxHeight = window.innerHeight - subnav.offsetTop + 4;
+        var maxHeight = window.innerHeight - document.querySelector("div.sub-nav").offsetTop;
         var expandedHeight = Math.min(maxHeight, mainnav.scrollHeight + 10);
         if (tocMenu) {
             tocMenu.style.display = "flex";
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index 8da885a12cc..53b9d8ca6b2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -34,22 +34,6 @@
     --nav-height: calc(var(--top-nav-height) + var(--sub-nav-height));
     --max-content-width: 1500px;
     --content-margin: 0 auto;
-    /* Inline SVG icons for dark theme */
-    --right-svg-dark: url('data:image/svg+xml; utf8, \
-    <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"> \
-    <path d="m35.763 5.058 38.675 36.885a12.596 12.596 90 0 1 0 18.23L35.763 97.058v-18.32l27.055-25.431a2.975 2.975 90.09 0 0 .007-4.33L35.763 23.38Z" \
-    style="fill:%23fff;stroke-width:.285806" transform="translate(-5.292 -1.058)"/> \
-    </svg>');
-    --glass-svg-dark: url('data:image/svg+xml; utf8, \
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"> \
-    <path d="M66.37 55.005C64.415 58.958 60.147 63.321 56.153 66l32.478 33.456L99.377 88.99Z" style="fill:%23a1d3ff"/>\
-    <circle cx="35.072" cy="35.072" r="30.635" style="fill:none;stroke:%23a1d3ff;stroke-width:8"/></svg>');
-    --x-svg-dark: url('data:image/svg+xml; utf8, \
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">\
-    <path d="m8 8 84 84" style="stroke:%23e0e0e0;stroke-width:15"/>\
-    <path d="M8 92 92 8" style="stroke:%23e0e0e0;stroke-width:15"/></svg>');
-}
-body {
     /* Text colors for body and block elements */
     --body-text-color: #181818;
     --block-text-color: #181818;
@@ -111,9 +95,14 @@ body {
     --invalid-tag-text-color: #000000;
     --icon-filter: none;
     --caption-link-color: var(--subnav-link-color);
+    /* SVG icons for light theme */
+    --right-svg: url("right.svg");
+    --glass-svg: url("glass.svg");
+    --x-svg: url("x.svg");
+    --current-theme-svg: url("sun.svg");
 }
-
-body.theme-dark {
+/* Dark theme variables */
+:root[data-theme="theme-dark"] {
     --body-text-color: #e8e8e8;
     --block-text-color: #e8e8e8;
     --body-background-color: #1f2124;
@@ -159,107 +148,21 @@ body.theme-dark {
     --invalid-tag-text-color: #000000;
     --icon-filter: invert(100%) brightness(160%);
     --caption-link-color: var(--link-color);
-}
-
-/*
- * Dark theme
- */
-@media (prefers-color-scheme: dark) {
-    body {
-        --body-text-color: #e8e8e8;
-        --block-text-color: #e8e8e8;
-        --body-background-color: #1f2124;
-        --section-background-color: var(--body-background-color);
-        --detail-background-color: var(--body-background-color);
-        --code-background-color: #303940;
-        --mark-background-color: #313131;
-        --detail-block-color: #31363c;
-        --navbar-background-color: #395A6F;
-        --navbar-text-color: #ffffff;
-        --subnav-background-color: #3d454d;
-        --subnav-link-color: #d8dcdf;
-        --member-heading-background-color: var(--subnav-background-color);
-        --selected-background-color: #f8981d;
-        --selected-text-color: #253441;
-        --selected-link-color: #4a698a;
-        --table-header-color: #38444d;
-        --even-row-color: #222528;
-        --odd-row-color: #2d3135;
-        --title-color: #fff;
-        --link-color: #94badb;
-        --link-color-active: #e8a351;
-        --toc-background-color: #2f3439;
-        --toc-highlight-color: var(--subnav-background-color);
-        --toc-hover-color: #3f4146;
-        --snippet-background-color: #2c353b;
-        --snippet-text-color: var(--block-text-color);
-        --snippet-highlight-color: #f7c590;
-        --pre-background-color: var(--snippet-background-color);
-        --pre-text-color: var(--snippet-text-color);
-        --border-color: #444444;
-        --table-border-color: #717171;
-        --tab-border-radius: 2px 2px 0 0;
-        --search-input-background-color: #303030;
-        --search-input-text-color: #d0d0d0;
-        --search-input-placeholder-color: #979797;
-        --search-tag-background-color: #c6c61e;
-        --search-tag-text-color: #282828;
-        --button-border-color: #909090;
-        --button-active-filter: brightness(96%);
-        --button-focus-filter: brightness(104%);
-        --invalid-tag-background-color: #ffe6e6;
-        --invalid-tag-text-color: #000000;
-        --icon-filter: invert(100%) brightness(160%);
-        --caption-link-color: var(--link-color);
-    }
-
-    body.theme-light {
-        --body-text-color: #181818;
-        --block-text-color: #181818;
-        --body-background-color: #ffffff;
-        --section-background-color: var(--body-background-color);
-        --detail-background-color: var(--body-background-color);
-        --code-background-color: #f5f5f5;
-        --mark-background-color: #f7f7f7;
-        --detail-block-color: #f4f4f4;
-        --navbar-background-color: #4D7A97;
-        --navbar-text-color: #ffffff;
-        --subnav-background-color: #dee3e9;
-        --subnav-link-color: #47688a;
-        --member-heading-background-color: var(--subnav-background-color);
-        --selected-background-color: #f8981d;
-        --selected-text-color: #253441;
-        --selected-link-color: #4a698a;
-        --table-header-color: #ebeff4;
-        --even-row-color: #fdfdfe;
-        --odd-row-color: #f0f0f2;
-        --title-color: #2c4557;
-        --link-color: #437291;
-        --link-color-active: #bb7a2a;
-        --toc-background-color: #f8f8f8;
-        --toc-highlight-color: var(--subnav-background-color);
-        --toc-hover-color: #e9ecf0;
-        --snippet-background-color: #f2f2f4;
-        --snippet-text-color: var(--block-text-color);
-        --snippet-highlight-color: #f7c590;
-        --pre-background-color: var(--snippet-background-color);
-        --pre-text-color: var(--snippet-text-color);
-        --border-color: #e6e6e6;
-        --table-border-color: #000000;
-        --tab-border-radius: 2px 2px 0 0;
-        --search-input-background-color: #ffffff;
-        --search-input-text-color: #000000;
-        --search-input-placeholder-color: #757575;
-        --search-tag-background-color: #ffff66;
-        --search-tag-text-color: var(--block-text-color);
-        --button-border-color: #b0b8c8;
-        --button-active-filter: brightness(96%);
-        --button-focus-filter: brightness(104%);
-        --invalid-tag-background-color: #ffe6e6;
-        --invalid-tag-text-color: #000000;
-        --icon-filter: none;
-        --caption-link-color: var(--subnav-link-color);
-    }
+    /* Inline SVG icons for dark theme */
+    --right-svg: url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"> \
+    <path d="m35.763 5.058 38.675 36.885a12.596 12.596 90 0 1 0 18.23L35.763 97.058v-18.32l27.055-25.431a2.975 2.975 90.09 0 0 .007-4.33L35.763 23.38Z" \
+    style="fill:%23fff;stroke-width:.285806" transform="translate(-5.292 -1.058)"/> \
+    </svg>');
+    --glass-svg: url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"> \
+    <path d="M66.37 55.005C64.415 58.958 60.147 63.321 56.153 66l32.478 33.456L99.377 88.99Z" style="fill:%23a1d3ff"/>\
+    <circle cx="35.072" cy="35.072" r="30.635" style="fill:none;stroke:%23a1d3ff;stroke-width:8"/></svg>');
+    --x-svg: url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">\
+    <path d="m8 8 84 84" style="stroke:%23e0e0e0;stroke-width:15"/>\
+    <path d="M8 92 92 8" style="stroke:%23e0e0e0;stroke-width:15"/></svg>');
+    --current-theme-svg: url("moon.svg");
 }
 /*
  * Styles for individual HTML elements.
@@ -386,7 +289,6 @@ hr {
     height: 100%;
     max-width: var(--max-content-width);
     margin: var(--content-margin);
-    position: relative;
 }
 .top-nav {
     background-color:var(--navbar-background-color);
@@ -415,6 +317,8 @@ button#theme-button {
     height: 32px;
     padding: 6px;
     margin-left: -6px;
+    background: var(--current-theme-svg) no-repeat 6px;
+    background-size: 18px 18px;
     background-color: transparent;
     border: 1px solid transparent;
     border-radius: 6px;
@@ -424,26 +328,6 @@ button#theme-button:hover,
 button#theme-button:focus-visible {
     border: 1px solid var(--button-border-color);
 }
-button#theme-button img {
-    display: none;
-    width: 18px;
-}
-body.theme-light button#theme-button img.theme-light {
-    display: inline;
-}
-body.theme-dark button#theme-button img.theme-dark {
-    display: inline;
-}
-@media (prefers-color-scheme: dark) {
-    body.theme-os button#theme-button img.theme-dark {
-        display: inline;
-    }
-}
-@media (prefers-color-scheme: light) {
-    body.theme-os button#theme-button img.theme-light {
-        display: inline;
-    }
-}
 div#theme-panel {
     display: none;
     position: fixed;
@@ -507,22 +391,11 @@ ol.sub-nav-list li {
     margin-right: -4px;
 }
 ol.sub-nav-list li:not(:first-child) {
-    background: url("right.svg") no-repeat 3px;
+    background: var(--right-svg) no-repeat 3px;
     background-size: 10px;
     padding-left: 17px;
     list-style: none;
 }
-body.theme-dark ol.sub-nav-list li:not(:first-child) {
-    background-image: var(--right-svg-dark);
-}
-@media (prefers-color-scheme: dark) {
-    ol.sub-nav-list li:not(:first-child) {
-        background-image: var(--right-svg-dark);
-    }
-    body.theme-light ol.sub-nav-list li:not(:first-child) {
-        background-image: url("right.svg");
-    }
-}
 ol.sub-nav-list a {
     padding: 3px;
 }
@@ -683,13 +556,10 @@ dl.name-value > dd {
     padding: 15px 20px;
 }
 .main-grid nav.toc > ol.toc-list {
-    max-height: calc(100vh - var(--nav-height) - 100px);
+    max-height: calc(100vh - var(--nav-height) - 110px);
     padding-left: 12px;
 }
 .main-grid nav.toc button {
-    position: absolute;
-    bottom: 16px;
-    z-index: 3;
     background-color: var(--toc-background-color);
     color: #666666;
     font-size: 0.76rem;
@@ -697,12 +567,19 @@ dl.name-value > dd {
     padding: 6px 10px;
     white-space: nowrap;
     border: 1px solid transparent;
+    border-radius: 3px;
 }
 .main-grid nav.toc button > img {
     vertical-align: middle;
     width: 16px;
     height: 16px;
 }
+.main-grid nav.toc button.hide-sidebar,
+.main-grid nav.toc button.show-sidebar {
+    position: absolute;
+    bottom: 15px;
+    z-index: 3;
+}
 .main-grid nav.toc button.hide-sidebar {
     right: 0;
 }
@@ -716,7 +593,7 @@ dl.name-value > dd {
 .main-grid nav.toc button:hover,
 .main-grid nav.toc button:focus {
     color: var(--body-text-color);
-    border: 1px solid var(--subnav-background-color);
+    border: 1px solid var(--button-border-color);
 }
 .main-grid nav.toc button:active {
     background-color: var(--subnav-background-color);
@@ -758,6 +635,7 @@ nav.toc div.toc-header {
 nav.toc > ol.toc-list {
     overflow: hidden auto;
     overscroll-behavior: contain;
+    height: inherit;
 }
 nav.toc ol.toc-list {
     list-style: none;
@@ -1281,7 +1159,7 @@ li.ui-static-link a, li.ui-static-link a:visited {
     padding: 3px 4px;
 }
 input[type="text"] {
-    background-image:url('glass.svg');
+    background-image:var(--glass-svg);
     background-size:13px;
     background-repeat:no-repeat;
     background-position:3px 4px;
@@ -1294,17 +1172,6 @@ input[type="text"] {
     font-size: var(--nav-font-size);
     height: 19px;
 }
-body.theme-dark input[type="text"] {
-    background-image: var(--glass-svg-dark);
-}
-@media (prefers-color-scheme: dark) {
-    input[type="text"] {
-        background-image: var(--glass-svg-dark);
-    }
-    body.theme-light input[type="text"] {
-        background-image: url('glass.svg');
-    }
-}
 input#page-search-input {
     width: calc(180px + 10vw);
     margin: 10px 0;
@@ -1320,7 +1187,7 @@ input.filter-input {
 }
 input#reset-search, input.reset-filter, input#page-search-reset {
     background-color: transparent;
-    background-image:url('x.svg');
+    background-image:var(--x-svg);
     background-repeat:no-repeat;
     background-size:contain;
     border:0;
@@ -1332,21 +1199,6 @@ input#reset-search, input.reset-filter, input#page-search-reset {
     font-size:0;
     visibility:hidden;
 }
-body.theme-dark input#reset-search,
-body.theme-dark input.reset-filter,
-body.theme-dark input#page-search-reset {
-    background-image: var(--x-svg-dark);
-}
-@media (prefers-color-scheme: dark) {
-    input#reset-search, input.reset-filter, input#page-search-reset {
-        background-image: var(--x-svg-dark);
-    }
-    body.theme-light input#reset-search,
-    body.theme-light input.reset-filter,
-    body.theme-light input#page-search-reset {
-        background-image: url('x.svg');
-    }
-}
 input#reset-search {
     position:absolute;
     right:5px;
@@ -1801,7 +1653,7 @@ table.striped > tbody > tr > th {
         top: var(--top-nav-height);
         left: 40vw;
         width: 60vw;
-        z-index: 7;
+        z-index: 5;
         background-color: var(--toc-background-color);
         box-sizing: border-box;
     }
@@ -1973,7 +1825,7 @@ nav.toc div.toc-header .toc-sort-toggle {
     position: static;
     display: inline-flex;
     align-items: center;
-    padding: .5em;
+    padding: 4px;
     cursor: pointer;
 }
 
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index ba846c293a2..ee1fa538a57 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -143,9 +143,6 @@ public class CheckStylesheetClasses {
                 "search-result-desc", "search-result-label", "search-result-link", "selected",
                 "sort-asc", "sort-desc", "two-column-search-results", "visible");
 
-        // used for themes
-        removeAll(styleSheetNames, "theme-dark", "theme-light", "theme-os");
-
         // very JDK specific
         styleSheetNames.remove("module-graph");
         styleSheetNames.remove("sealed-graph");
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java
index b4f28b36f3f..4f13bfb6d3a 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8196027 8196202 8320458 8342705
+ * @bug 8196027 8196202 8320458 8342705 8371021
  * @summary test navigation links
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -36,7 +36,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import javadoc.tester.JavadocTester;
 import toolbox.ModuleBuilder;
@@ -87,9 +86,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#module">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("overview-tree.html", true,
@@ -101,9 +98,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#tree">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("deprecated-list.html", true,
@@ -115,9 +110,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#deprecated">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("index-all.html", true,
@@ -129,9 +122,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li class="nav-bar-cell1-rev">Index</li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#index">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("search.html", true,
@@ -143,9 +134,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li class="nav-bar-cell1-rev">Search</li>
                     <li><a href="help-doc.html#search">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("help-doc.html", true,
@@ -157,9 +146,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li class="nav-bar-cell1-rev">Help</li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("m/p1/package-summary.html", true,
@@ -172,9 +159,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="../../index-all.html">Index</a></li>
                     <li><a href="../../search.html">Search</a></li>
                     <li><a href="../../help-doc.html#package">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /../resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../../resour\
-                    ce-files/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("m/p1/A.html", true,
@@ -187,9 +172,7 @@ public class TestModuleNavigation extends JavadocTester {
                     <li><a href="../../index-all.html">Index</a></li>
                     <li><a href="../../search.html">Search</a></li>
                     <li><a href="../../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /../resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../../resour\
-                    ce-files/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
     }
 
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
index 5be754a3163..f0a045f1a51 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
@@ -25,7 +25,7 @@
  * @test
  * @bug      7025314 8023700 7198273 8025633 8026567 8081854 8196027 8182765
  *           8196200 8196202 8223378 8258659 8261976 8320458 8329537 8350638
- *           8342705
+ *           8342705 8371021
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @library  /tools/lib ../../lib
@@ -71,9 +71,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#overview">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/package-summary.html", true,
@@ -85,9 +83,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#package">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/A.html", true,
@@ -99,9 +95,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/C.html", true,
@@ -113,9 +107,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/E.html", true,
@@ -127,9 +119,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/I.html", true,
@@ -355,9 +345,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#package">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/A.html", true,
@@ -369,9 +357,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/C.html", true,
@@ -383,9 +369,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/E.html", true,
@@ -397,9 +381,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="../index-all.html">Index</a></li>
                     <li><a href="../search.html">Search</a></li>
                     <li><a href="../help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="..\
-                    /resource-files/sun.svg" alt="Select Theme" class="theme-light"><img src="../resource-fil\
-                    es/moon.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""");
 
         checkOutput("pkg/I.html", true,
@@ -439,9 +421,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#package">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""",
                 """
                     <ol class="sub-nav-list">
@@ -457,9 +437,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#class">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></button></li>
                     </ul>""",
                 """
                     <ol class="sub-nav-list">
diff --git a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
index 16cd506e1da..e914f8022fd 100644
--- a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
@@ -126,10 +126,8 @@ public class TestSpecTag extends JavadocTester {
                     <li><a href="index-all.html">Index</a></li>
                     <li><a href="search.html">Search</a></li>
                     <li><a href="help-doc.html#external-specs">Help</a></li>
-                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"><img src="re\
-                    source-files/sun.svg" alt="Select Theme" class="theme-light"><img src="resource-files/moo\
-                    n.svg" alt="Select Theme" class="theme-dark"></button></li>
-                    </ul>
+                    <li><button id="theme-button" aria-label="Select Theme" title="Select Theme"></b\
+                    utton></li>
                     """);
     }
 
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index d63220f5c4b..012e9ce00de 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -121,7 +121,7 @@ public class TestStylesheet extends JavadocTester {
                 """
                     input#reset-search, input.reset-filter, input#page-search-reset {
                         background-color: transparent;
-                        background-image:url('x.svg');
+                        background-image:var(--x-svg);
                         background-repeat:no-repeat;
                         background-size:contain;
                         border:0;

From 681dab7205190176b842bd42914b1cb9fe752e44 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 10 Nov 2025 10:22:59 +0000
Subject: [PATCH 105/512] 8365972: JFR: ThreadDump and ClassLoaderStatistics
 events may cause back to back rotations

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/PlatformEventType.java   |  16 +++
 .../jdk/jfr/internal/PlatformRecorder.java    |   6 +-
 .../jfr/internal/periodic/PeriodicEvents.java |   6 +-
 .../runtime/TestBackToBackSensitive.java      | 122 ++++++++++++++++++
 4 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index c4f0a8e9a0e..30bd96ba86a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -48,6 +48,7 @@ public final class PlatformEventType extends Type {
     private final boolean isJDK;
     private final boolean isMethodSampling;
     private final boolean isCPUTimeMethodSampling;
+    private final boolean isBackToBackSensitive;
     private final List<SettingDescriptor> settings = new ArrayList<>(5);
     private final boolean dynamicSettings;
     private final int stackTraceOffset;
@@ -81,10 +82,25 @@ public final class PlatformEventType extends Type {
         this.isJVM = Type.isDefinedByJVM(id);
         this.isMethodSampling = determineMethodSampling();
         this.isCPUTimeMethodSampling = isJVM && name.equals(Type.EVENT_NAME_PREFIX + "CPUTimeSample");
+        this.isBackToBackSensitive = determineBackToBackSensitive();
         this.isJDK = isJDK;
         this.stackTraceOffset = determineStackTraceOffset();
     }
 
+    private boolean determineBackToBackSensitive() {
+        if (getName().equals(Type.EVENT_NAME_PREFIX + "ThreadDump")) {
+            return true;
+        }
+        if (getName().equals(Type.EVENT_NAME_PREFIX + "ClassLoaderStatistics")) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isBackToBackSensitive() {
+        return isBackToBackSensitive;
+    }
+
     private boolean isExceptionEvent() {
         switch (getName()) {
             case Type.EVENT_NAME_PREFIX + "JavaErrorThrow" :
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
index 2184d85cf34..cf46c05b804 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
@@ -263,7 +263,7 @@ public final class PlatformRecorder {
         if (toDisk) {
             PeriodicEvents.setFlushInterval(streamInterval);
         }
-        PeriodicEvents.doChunkBegin();
+        PeriodicEvents.doChunkBegin(true);
         Duration duration = recording.getDuration();
         if (duration != null) {
             recording.setStopTime(startTime.plus(duration));
@@ -335,7 +335,7 @@ public final class PlatformRecorder {
                 finishChunk(currentChunk, stopTime, null);
             }
             currentChunk = newChunk;
-            PeriodicEvents.doChunkBegin();
+            PeriodicEvents.doChunkBegin(false);
         }
 
         if (toDisk) {
@@ -390,7 +390,7 @@ public final class PlatformRecorder {
             finishChunk(currentChunk, timestamp, null);
         }
         currentChunk = newChunk;
-        PeriodicEvents.doChunkBegin();
+        PeriodicEvents.doChunkBegin(false);
     }
 
     private List<PlatformRecording> getRunningRecordings() {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java
index 8cbf6334e64..92033dcce70 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java
@@ -69,12 +69,14 @@ public final class PeriodicEvents {
         return taskRepository.removeTask(runnable);
     }
 
-    public static void doChunkBegin() {
+    public static void doChunkBegin(boolean startRecording) {
         long timestamp = JVM.counterTime();
         for (EventTask task : taskRepository.getTasks()) {
             var eventType = task.getEventType();
             if (eventType.isEnabled() && eventType.isBeginChunk()) {
-                task.run(timestamp, PeriodicType.BEGIN_CHUNK);
+                if (!eventType.isBackToBackSensitive() || startRecording) {
+                    task.run(timestamp, PeriodicType.BEGIN_CHUNK);
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java b/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java
new file mode 100644
index 00000000000..91fcd60f87d
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jfr.event.runtime;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import jdk.jfr.Configuration;
+import jdk.jfr.Event;
+import jdk.jfr.Recording;
+import jdk.jfr.StackTrace;
+import jdk.jfr.consumer.RecordedClassLoader;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary The test verifies that jdk.ClassLoaderStatistics and
+ *          jdk.ThreadThreadDump are not emitted at the beginning of a chunk
+ *          when the period is everyChunk, as is the case in default.jfc
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main/othervm jdk.jfr.event.runtime.TestBackToBackSensitive
+ */
+public class TestBackToBackSensitive {
+    @StackTrace(false)
+    static class FillEvent extends Event {
+        String message;
+    }
+
+    public static void main(String... arg) throws Exception {
+        Set<Instant> threadDumps = Collections.synchronizedSet(new LinkedHashSet<>());
+        Set<Instant> classLoaderStatistics = Collections.synchronizedSet(new LinkedHashSet<>());
+        Set<Instant> physicalMemory = Collections.synchronizedSet(new LinkedHashSet<>());
+
+        Configuration configuration = Configuration.getConfiguration("default");
+        try (RecordingStream r1 = new RecordingStream(configuration)) {
+            r1.setMaxSize(Long.MAX_VALUE);
+            r1.onEvent("jdk.ThreadDump", e -> threadDumps.add(e.getStartTime()));
+            r1.onEvent("jdk.ClassLoaderStatistics", e -> {
+                RecordedClassLoader cl = e.getValue("classLoader");
+                if (cl != null) {
+                    if (cl.getType().getName().contains("PlatformClassLoader")) {
+                        classLoaderStatistics.add(e.getStartTime());
+                    }
+                }
+            });
+            r1.onEvent("jdk.PhysicalMemory", e -> physicalMemory.add(e.getStartTime()));
+            // Start chunk 1
+            r1.startAsync();
+            try (Recording r2 = new Recording()) {
+                // Start chunk 2
+                r2.start();
+                // Starts chunk 3
+                r2.stop();
+            }
+            // Start chunk 4 by filling up chunk 3
+            for (int i = 0; i < 1_500_000; i++) {
+                FillEvent f = new FillEvent();
+                f.commit();
+            }
+            r1.stop();
+            long chunkFiles = filesInRepository();
+            System.out.println("Number of chunk files: " + chunkFiles);
+            // When jdk.ClassLoaderStatistics and jdk.ThreadThreadDump are expected to be
+            // emitted:
+            // Chunk 1: begin, end
+            // Chunk 2: begin, end
+            // Chunk 3: end
+            // Chunk 4: end
+            assertCount("jdk.ThreadDump", threadDumps, 2 + 2 + (chunkFiles - 2));
+            assertCount("jdk.ClassLoaderStatistics", classLoaderStatistics, 2 + 2 + (chunkFiles - 2));
+            // When jdk.PhysicalMemory is expected to be emitted:
+            // Chunk 1: begin, end
+            // Chunk 2: begin, end
+            // Chunk 3: begin, end
+            // Chunk 4: begin, end
+            assertCount("jdk.PhysicalMemory", physicalMemory, 2 * chunkFiles);
+        }
+    }
+
+    private static long filesInRepository() throws IOException {
+        Path repository = Path.of(System.getProperty("jdk.jfr.repository"));
+        return Files.list(repository).filter(p -> p.toString().endsWith(".jfr")).count();
+    }
+
+    private static void assertCount(String eventName, Set<Instant> timestamps, long expected) throws Exception {
+        System.out.println("Timestamps for " + eventName + ":");
+        for (Instant timestamp : timestamps) {
+            System.out.println(timestamp);
+        }
+        int count = timestamps.size();
+        if (count != expected) {
+            throw new Exception("Expected " + expected + "  timestamps for event " + eventName + ", but got " + count);
+        }
+    }
+}

From 98f40e4575538d91f509c85d9d657a8973f464be Mon Sep 17 00:00:00 2001
From: Kerem Kat <krk@openjdk.org>
Date: Mon, 10 Nov 2025 11:33:56 +0000
Subject: [PATCH 106/512] 8371425: Include folder names in vscode workspace
 virtual folders

Reviewed-by: erikj, jvernee, shade
---
 make/ide/vscode/hotspot/CreateVSCodeProject.gmk  | 2 ++
 make/ide/vscode/hotspot/template-workspace.jsonc | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
index 11f25c152f6..9e5671b8250 100644
--- a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
+++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
@@ -84,6 +84,8 @@ define CreateFromTemplate
 	$(SED) -e 's!{{TOPDIR}}!$(call SedEscape,$(call FixPath,$(TOPDIR)))!g' \
 	    -e 's!{{TOPDIR_RELATIVE}}!$(call SedEscape,$(call FixPath,$(strip \
 	        $(call RelativePath,$(OUTPUTDIR),$(TOPDIR)))))!g' \
+	    -e 's!{{TOPDIR_BASE}}!$(notdir $(TOPDIR))!g' \
+	    -e 's!{{OUTPUT_BASE}}!$(notdir $(OUTPUTDIR))!g' \
 	    -e 's!{{WORKSPACE_ROOT}}!$(call SedEscape,$(call FixPath,$(WORKSPACE_ROOT)))!g' \
 	    -e 's!{{OUTPUTDIR}}!$(call SedEscape,$(call FixPath,$(OUTPUTDIR)))!g' \
 	    -e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \
diff --git a/make/ide/vscode/hotspot/template-workspace.jsonc b/make/ide/vscode/hotspot/template-workspace.jsonc
index 8a349b232ce..271b079f553 100644
--- a/make/ide/vscode/hotspot/template-workspace.jsonc
+++ b/make/ide/vscode/hotspot/template-workspace.jsonc
@@ -1,12 +1,12 @@
 {
 	"folders": [
 		{
-			"name": "Source root",
+			"name": "Source root ({{TOPDIR_BASE}})",
 			"path": "{{TOPDIR}}"
 		},
 		// {{EXTRA_WORKSPACE_ROOT}}
 		{
-			"name": "Build artifacts",
+			"name": "Build artifacts ({{OUTPUT_BASE}})",
 			"path": "{{OUTPUTDIR}}"
 		}
 	],

From 1142d299439bdf71de41b872a9b3d7775d0c692b Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 10 Nov 2025 13:05:07 +0000
Subject: [PATCH 107/512] 8369920: HttpClient QuicSelectorThread could be a
 VirtualThread

Reviewed-by: vyazici, djelinski
---
 .../internal/net/http/quic/QuicEndpoint.java  |   9 +-
 .../internal/net/http/quic/QuicSelector.java  |  64 ++++-
 .../net/httpclient/http3/H3QuicVTTest.java    | 225 ++++++++++++++++++
 3 files changed, 287 insertions(+), 11 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/http3/H3QuicVTTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
index 3df9b599f82..d9bf5fe6dcf 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
@@ -116,6 +116,8 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
     static final boolean DGRAM_SEND_ASYNC;
     static final int MAX_BUFFERED_HIGH;
     static final int MAX_BUFFERED_LOW;
+    enum UseVTForSelector { ALWAYS, NEVER, DEFAULT }
+    static final UseVTForSelector USE_VT_FOR_SELECTOR;
     static {
         // This default value is the maximum payload size of
         // an IPv6 datagram, which is 65527 (which is bigger
@@ -142,6 +144,11 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
         if (maxBufferLow >= maxBufferHigh) maxBufferLow = maxBufferHigh >> 1;
         MAX_BUFFERED_HIGH = maxBufferHigh;
         MAX_BUFFERED_LOW = maxBufferLow;
+        String useVtForSelector =
+                System.getProperty("jdk.internal.httpclient.quic.selector.useVirtualThreads", "default");
+        USE_VT_FOR_SELECTOR = Stream.of(UseVTForSelector.values())
+                .filter((v) -> v.name().equalsIgnoreCase(useVtForSelector))
+                .findFirst().orElse(UseVTForSelector.DEFAULT);
     }
 
     /**
@@ -821,7 +828,7 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
                             // to the selector to process the event queue
                             assert this instanceof QuicEndpoint.QuicSelectableEndpoint
                                     : "unexpected endpoint type: " + this.getClass() + "@[" + name + "]";
-                            assert Thread.currentThread() instanceof QuicSelector.QuicSelectorThread;
+                            assert QuicSelector.isSelectorThread();
                             if (Log.quicRetransmit() || Log.quicTimer()) {
                                 Log.logQuic(name() + ": reschedule needed: " + Utils.debugDeadline(now, pending)
                                         + ", totalpkt: " + totalpkt
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java
index 2bce3415b17..9fa825459ff 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java
@@ -47,6 +47,9 @@ import jdk.internal.net.http.common.TimeSource;
 import jdk.internal.net.http.common.Utils;
 import jdk.internal.net.http.quic.QuicEndpoint.QuicVirtualThreadedEndpoint;
 import jdk.internal.net.http.quic.QuicEndpoint.QuicSelectableEndpoint;
+import jdk.internal.net.http.quic.QuicEndpoint.UseVTForSelector;
+
+import static jdk.internal.net.http.quic.QuicEndpoint.USE_VT_FOR_SELECTOR;
 
 
 /**
@@ -62,6 +65,9 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
     public static final long IDLE_PERIOD_MS = 1500;
 
     private static final TimeLine source = TimeSource.source();
+    private static final ScopedValue<Boolean> IS_SELECTOR =
+            ScopedValue.newInstance();
+
     final Logger debug = Utils.getDebugLogger(this::name);
 
     private final String name;
@@ -74,7 +80,11 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
         this.instance = instance;
         this.name = name;
         this.timerQueue = new QuicTimerQueue(this::wakeup, debug);
-        this.thread = new QuicSelectorThread(this);
+        this.thread = QuicSelectorThread.of(USE_VT_FOR_SELECTOR, this);
+    }
+
+    public static boolean isSelectorThread() {
+        return IS_SELECTOR.orElse(Boolean.FALSE);
     }
 
     public String name() {
@@ -95,6 +105,13 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
         return timerQueue;
     }
 
+    @Override
+    public final void run() {
+        ScopedValue.where(IS_SELECTOR, true).run(this::runSelector);
+    }
+
+    abstract void runSelector();
+
     /**
      * A {@link QuicSelector} implementation based on blocking
      * {@linkplain DatagramChannel Datagram Channels} and using a
@@ -116,6 +133,7 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
                 this.endpoints = endpoints;
             }
 
+            @Override
             public void run() {
                 try {
                     endpoint.channelReadLoop();
@@ -200,7 +218,7 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
         }
 
         @Override
-        public void run() {
+        void runSelector() {
             try {
                 if (debug.on()) debug.log("started");
                 long waited = 0;
@@ -321,7 +339,7 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
         }
 
         @Override
-        public void run() {
+        void runSelector() {
             try {
                 if (debug.on()) debug.log("started");
                 while (!done()) {
@@ -455,7 +473,8 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
      * @param unit    the timeout unit
      */
     public void awaitTermination(long timeout, TimeUnit unit) {
-        if (Thread.currentThread() == thread) {
+        if (isSelectorThread()) {
+            assert Thread.currentThread() == thread.thread();
             return;
         }
         try {
@@ -488,12 +507,37 @@ public abstract sealed class QuicSelector<T extends QuicEndpoint> implements Run
         shutdown();
     }
 
-    static class QuicSelectorThread extends Thread {
-        QuicSelectorThread(QuicSelector<?> selector)  {
-            super(null, selector,
-                    "Thread(%s)".formatted(selector.name()),
-                    0, false);
-            this.setDaemon(true);
+    private record QuicSelectorThread(Thread thread) {
+        void start() {
+            thread.start();
+        }
+        void join(long millis) throws InterruptedException {
+            thread.join(millis);
+        }
+        static QuicSelectorThread ofPlatform(QuicSelector<?> selector) {
+            Thread thread = Thread.ofPlatform()
+                    .name("Thread(%s)".formatted(selector.name()))
+                    .stackSize(0)
+                    .inheritInheritableThreadLocals(false)
+                    .daemon()
+                    .unstarted(selector);
+            return new QuicSelectorThread(thread);
+        }
+        static QuicSelectorThread ofVirtual(QuicSelector<?> selector) {
+            Thread thread = Thread.ofVirtual()
+                    .name("Thread(%s)".formatted(selector.name()))
+                    .inheritInheritableThreadLocals(false)
+                    .unstarted(selector);
+            return new QuicSelectorThread(thread);
+        }
+        static QuicSelectorThread of(UseVTForSelector config, QuicSelector<?> selector) {
+            return switch (config) {
+                case ALWAYS -> ofVirtual(selector);
+                case NEVER -> ofPlatform(selector);
+                default -> selector instanceof QuicNioSelector
+                        ? ofPlatform(selector)
+                        : ofVirtual(selector);
+            };
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java b/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
new file mode 100644
index 00000000000..c9af069c728
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLContext;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.test.lib.Platform;
+import jdk.test.lib.net.SimpleSSLContext;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_3;
+import static java.net.http.HttpOption.H3_DISCOVERY;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+
+/*
+ * @test id=default
+ * @bug 8369920
+ * @summary Verifies whether `QuicSelector` uses virtual threads
+ *          as expected when no explicit configuration is provided
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors,http3
+ *              H3QuicVTTest
+ */
+/*
+ * @test id=never
+ * @bug 8369920
+ * @summary Verifies that `QuicSelector` does *not* use virtual threads
+            when explicitly configured to "never" use them
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.quic.selector.useVirtualThreads=never
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors,http3
+ *              H3QuicVTTest
+ */
+/*
+ * @test id=always
+ * @bug 8369920
+ * @summary Verifies that `QuicSelector` does *always* use virtual threads
+            when explicitly configured to "always" use them
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.quic.selector.useVirtualThreads=always
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors,http3
+ *              H3QuicVTTest
+ */
+/*
+ * @test id=explicit-default
+ * @bug 8369920
+ * @summary Verifies whether `QuicSelector` uses virtual threads
+ *          as expected when `default` is explicitly configured
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.quic.selector.useVirtualThreads=default
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors,http3
+ *              H3QuicVTTest
+ */
+/*
+ * @test id=garbage
+ * @bug 8369920
+ * @summary Verifies whether `QuicSelector` uses virtual threads when
+            it is configured using an invalid value
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.quic.selector.useVirtualThreads=garbage
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors,http3
+ *              H3QuicVTTest
+ */
+// -Djava.security.debug=all
+class H3QuicVTTest implements HttpServerAdapters {
+
+    private static SSLContext sslContext;
+    private static HttpTestServer h3Server;
+    private static String requestURI;
+
+    enum UseVTForSelector { ALWAYS, NEVER, DEFAULT }
+    private static final String PROP_NAME = "jdk.internal.httpclient.quic.selector.useVirtualThreads";
+    private static final UseVTForSelector USE_VT_FOR_SELECTOR;
+    static {
+        String useVtForSelector =
+                System.getProperty(PROP_NAME, "default");
+        USE_VT_FOR_SELECTOR = Stream.of(UseVTForSelector.values())
+                .filter((v) -> v.name().equalsIgnoreCase(useVtForSelector))
+                .findFirst().orElse(UseVTForSelector.DEFAULT);
+    }
+
+    private static boolean isQuicSelectorThreadVirtual() {
+        return switch (USE_VT_FOR_SELECTOR) {
+            case ALWAYS -> true;
+            case NEVER  -> false;
+            default     -> !Platform.isWindows();
+        };
+    }
+
+    @BeforeAll
+    static void beforeClass() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null) {
+            throw new AssertionError("Unexpected null sslContext");
+        }
+        // create an H3 only server
+        h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
+        h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
+        h3Server.start();
+        System.out.println("Server started at " + h3Server.getAddress());
+        requestURI = "https://" + h3Server.serverAuthority() + "/hello";
+    }
+
+    @AfterAll
+    static void afterClass() throws Exception {
+        if (h3Server != null) {
+            System.out.println("Stopping server " + h3Server.getAddress());
+            h3Server.stop();
+        }
+    }
+
+    /**
+     * Issues various HTTP3 requests and verifies the responses are received
+     */
+    @Test
+    void testBasicRequests() throws Exception {
+        try (final HttpClient client = newClientBuilderForH3()
+                .proxy(NO_PROXY)
+                .version(HTTP_3)
+                .sslContext(sslContext).build()) {
+            final URI reqURI = new URI(requestURI);
+            final HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(reqURI)
+                    .version(HTTP_3)
+                    .setOption(H3_DISCOVERY, HTTP_3_URI_ONLY);
+
+            // GET
+            final HttpRequest req1 = reqBuilder.copy().GET().build();
+            System.out.println("\nIssuing request: " + req1);
+            final HttpResponse<Void> resp1 = client.send(req1, BodyHandlers.discarding());
+            Assertions.assertEquals(200, resp1.statusCode(), "unexpected response code for GET request");
+            assertSelectorThread(client);
+
+            // POST
+            final HttpRequest req2 = reqBuilder.copy().POST(BodyPublishers.ofString("foo")).build();
+            System.out.println("\nIssuing request: " + req2);
+            final HttpResponse<Void> resp2 = client.send(req2, BodyHandlers.discarding());
+            Assertions.assertEquals(200, resp2.statusCode(), "unexpected response code for POST request");
+            assertSelectorThread(client);
+
+            // HEAD
+            final HttpRequest req3 = reqBuilder.copy().HEAD().build();
+            System.out.println("\nIssuing request: " + req3);
+            final HttpResponse<Void> resp3 = client.send(req3, BodyHandlers.discarding());
+            Assertions.assertEquals(200, resp3.statusCode(), "unexpected response code for HEAD request");
+            assertSelectorThread(client);
+        }
+    }
+
+    private static void assertSelectorThread(HttpClient client) {
+        String clientId = client.toString().substring(client.toString().indexOf('('));
+        String name = "Thread(QuicSelector(HttpClientImpl" + clientId + "))";
+        Set<String> threads = new HashSet<>(Thread.getAllStackTraces().keySet().stream()
+                .map(Thread::getName)
+                .toList());
+        boolean found = threads.contains(name);
+        String status = found == isQuicSelectorThreadVirtual() ? "ERROR" : "SUCCESS";
+        String propval = System.getProperty(PROP_NAME);
+        if (propval == null) {
+            System.out.printf("%s not defined, virtual=%s, thread found=%s%n",
+                    PROP_NAME, isQuicSelectorThreadVirtual(), found);
+        } else {
+            System.out.printf("%s=%s, virtual=%s, thread found=%s%n",
+                    PROP_NAME, propval, isQuicSelectorThreadVirtual(), found);
+        }
+        final String msg;
+        if (found) {
+            msg = "%s found in %s".formatted(name, threads);
+            System.out.printf("%s: %s%n", status, msg);
+        } else {
+            msg = "%s not found in %s".formatted(name, threads);
+            System.out.printf("%s: %s%n", status, msg);
+        }
+        Assertions.assertEquals(!isQuicSelectorThreadVirtual(), found, msg);
+    }
+}

From 9d2fa8fe22652cbf1c70b953247bd154b363b383 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 10 Nov 2025 14:29:35 +0000
Subject: [PATCH 108/512] 8371321: Remove unused last arg of
 BarrierSetAssembler::arraycopy_epilogue

Reviewed-by: fandreuzzi, tschatzl
---
 .../cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp    | 3 +--
 .../cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp    | 2 +-
 .../cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp  | 2 +-
 .../gc/shared/cardTableBarrierSetAssembler_aarch64.cpp     | 7 +++----
 .../gc/shared/cardTableBarrierSetAssembler_aarch64.hpp     | 4 ++--
 .../shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp   | 6 +++---
 .../shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp   | 4 ++--
 src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp          | 7 +++----
 .../cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp        | 3 +--
 .../cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp        | 2 +-
 .../cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp      | 2 +-
 .../riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp | 7 +++----
 .../riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp | 4 ++--
 .../gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp  | 6 +++---
 .../gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp  | 4 ++--
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp              | 7 +++----
 16 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
index 3138c76c593..d7884c27a2c 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
@@ -90,8 +90,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
                                                              DecoratorSet decorators,
                                                              Register start,
                                                              Register count,
-                                                             Register scratch,
-                                                             RegSet saved_regs) {
+                                                             Register scratch) {
 
   Label done;
   Label loop;
diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
index 777a86e804b..bbcbb6bff1a 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp
@@ -39,7 +39,7 @@ protected:
   void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                        Register addr, Register count, RegSet saved_regs);
   void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                        Register start, Register count, Register tmp, RegSet saved_regs);
+                                        Register start, Register count, Register tmp);
 
   void g1_write_barrier_pre(MacroAssembler* masm,
                             Register obj,
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
index fa093a6ef69..8de9b77d608 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
@@ -47,7 +47,7 @@ public:
   virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
                                   Register src, Register dst, Register count, RegSet saved_regs) {}
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs) {}
+                                  Register start, Register count, Register tmp) {}
 
   virtual void copy_load_at(MacroAssembler* masm,
                             DecoratorSet decorators,
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
index c039e55cd4d..0bfc320179d 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
@@ -41,10 +41,9 @@ void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Deco
 }
 
 void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                      Register start, Register count, Register tmp,
-                                                      RegSet saved_regs) {
+                                                      Register start, Register count, Register tmp) {
   if (is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp);
   }
 }
 
@@ -80,7 +79,7 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
 }
 
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                                    Register start, Register count, Register scratch, RegSet saved_regs) {
+                                                                    Register start, Register count, Register scratch) {
   Label L_loop, L_done;
   const Register end = count;
 
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
index 91a65710f45..cdad45b9ead 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
@@ -34,7 +34,7 @@ protected:
                                                Register addr, Register count, RegSet saved_regs) {}
 
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register start, Register count, Register tmp, RegSet saved_regs);
+                                                Register start, Register count, Register tmp);
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 
@@ -42,7 +42,7 @@ protected:
                                   Register src, Register dst, Register count, RegSet saved_regs);
 
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs);
+                                  Register start, Register count, Register tmp);
   virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index 200c4217134..9a035d9f40e 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -79,9 +79,9 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
 }
 
 void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                       Register start, Register count, Register tmp, RegSet saved_regs) {
+                                                       Register start, Register count, Register tmp) {
   if (ShenandoahCardBarrier && is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp);
   }
 }
 
@@ -607,7 +607,7 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
 }
 
 void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                                     Register start, Register count, Register scratch, RegSet saved_regs) {
+                                                                     Register start, Register count, Register scratch) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
 
   Label L_loop, L_done;
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
index c89847b9d52..c0e708e1292 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
@@ -64,7 +64,7 @@ private:
 
   void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                         Register start, Register count,
-                                        Register scratch, RegSet saved_regs);
+                                        Register scratch);
 
 public:
   virtual NMethodPatchingType nmethod_patching_type() { return NMethodPatchingType::conc_instruction_and_data_patch; }
@@ -79,7 +79,7 @@ public:
   virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
                                   Register src, Register dst, Register count, RegSet saved_regs);
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs);
+                                  Register start, Register count, Register tmp);
   virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                        Register dst, Address src, Register tmp1, Register tmp2);
   virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index ffe5afd93cb..8dbc5dbac03 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -1647,7 +1647,7 @@ class StubGenerator: public StubCodeGenerator {
         verify_oop_array(size, d, count, r16);
     }
 
-    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1, RegSet());
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1);
 
     __ leave();
     __ mov(r0, zr); // return 0
@@ -1807,7 +1807,7 @@ class StubGenerator: public StubCodeGenerator {
       if (VerifyOops)
         verify_oop_array(size, d, count, r16);
     }
-    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1, RegSet());
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1);
     __ leave();
     __ mov(r0, zr); // return 0
     __ ret(lr);
@@ -1874,7 +1874,6 @@ class StubGenerator: public StubCodeGenerator {
     const Register ckval       = c_rarg4;   // super_klass
 
     RegSet wb_pre_saved_regs = RegSet::range(c_rarg0, c_rarg4);
-    RegSet wb_post_saved_regs = RegSet::of(count);
 
     // Registers used as temps (r19, r20, r21, r22 are save-on-entry)
     const Register copied_oop  = r22;       // actual oop copied
@@ -2000,7 +1999,7 @@ class StubGenerator: public StubCodeGenerator {
     __ br(Assembler::EQ, L_done_pop);
 
     __ BIND(L_do_card_marks);
-    bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, rscratch1, wb_post_saved_regs);
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, rscratch1);
 
     __ bind(L_done_pop);
     __ pop(RegSet::of(r19, r20, r21, r22), sp);
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
index 966afde4cb0..cf7cb98d2d4 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
@@ -91,8 +91,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
                                                              DecoratorSet decorators,
                                                              Register start,
                                                              Register count,
-                                                             Register tmp,
-                                                             RegSet saved_regs) {
+                                                             Register tmp) {
   assert_different_registers(start, count, tmp);
 
   Label loop, next, done;
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
index d2d2f4d49bc..2010e58cc89 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
@@ -42,7 +42,7 @@ protected:
   void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                        Register addr, Register count, RegSet saved_regs);
   void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                        Register start, Register count, Register tmp, RegSet saved_regs);
+                                        Register start, Register count, Register tmp);
 
   void g1_write_barrier_pre(MacroAssembler* masm,
                             Register obj,
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
index 63a7032bb84..bc0b14f1365 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
@@ -48,7 +48,7 @@ public:
   virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
                                   Register src, Register dst, Register count, RegSet saved_regs) {}
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs) {}
+                                  Register start, Register count, Register tmp) {}
 
   virtual void copy_load_at(MacroAssembler* masm,
                             DecoratorSet decorators,
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
index 408620dc56f..d94bf428fd2 100644
--- a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
@@ -41,10 +41,9 @@ void CardTableBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Deco
 }
 
 void CardTableBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                      Register start, Register count, Register tmp,
-                                                      RegSet saved_regs) {
+                                                      Register start, Register count, Register tmp) {
   if (is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp);
   }
 }
 
@@ -81,7 +80,7 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
 }
 
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                                    Register start, Register count, Register tmp, RegSet saved_regs) {
+                                                                    Register start, Register count, Register tmp) {
   assert_different_registers(start, tmp);
   assert_different_registers(count, tmp);
 
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
index 98737c3623f..cf97d0ff5cb 100644
--- a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
@@ -37,7 +37,7 @@ protected:
                                                Register addr, Register count, RegSet saved_regs) {}
 
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                Register start, Register count, Register tmp, RegSet saved_regs);
+                                                Register start, Register count, Register tmp);
 
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                             Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
@@ -47,7 +47,7 @@ public:
                                   Register src, Register dst, Register count, RegSet saved_regs);
 
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs);
+                                  Register start, Register count, Register tmp);
 
   virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
index f1236bc183a..dd6c8556307 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -82,9 +82,9 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
 }
 
 void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                                       Register start, Register count, Register tmp, RegSet saved_regs) {
+                                                       Register start, Register count, Register tmp) {
   if (ShenandoahCardBarrier && is_oop) {
-    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp);
   }
 }
 
@@ -550,7 +550,7 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
 }
 
 void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
-                                                                     Register start, Register count, Register tmp, RegSet saved_regs) {
+                                                                     Register start, Register count, Register tmp) {
   assert(ShenandoahCardBarrier, "Did you mean to enable ShenandoahCardBarrier?");
 
   Label L_loop, L_done;
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
index 3fe7c8d1740..c8a7c35fb83 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
@@ -65,7 +65,7 @@ private:
 
   void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                         Register start, Register count,
-                                        Register tmp, RegSet saved_regs);
+                                        Register tmp);
 
 public:
 
@@ -82,7 +82,7 @@ public:
                                   Register src, Register dst, Register count, RegSet saved_regs);
 
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
-                                  Register start, Register count, Register tmp, RegSet saved_regs);
+                                  Register start, Register count, Register tmp);
 
   virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                        Register dst, Address src, Register tmp1, Register tmp2);
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index ec268d9bb65..e5eb15cb8e4 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -1239,7 +1239,7 @@ class StubGenerator: public StubCodeGenerator {
       }
     }
 
-    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, t0, RegSet());
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, t0);
 
     __ leave();
     __ mv(x10, zr); // return 0
@@ -1401,7 +1401,7 @@ class StubGenerator: public StubCodeGenerator {
         verify_oop_array(size, d, count, t2);
       }
     }
-    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, t0, RegSet());
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, t0);
     __ leave();
     __ mv(x10, zr); // return 0
     __ ret();
@@ -1467,7 +1467,6 @@ class StubGenerator: public StubCodeGenerator {
     const Register ckval       = c_rarg4;   // super_klass
 
     RegSet wb_pre_saved_regs   = RegSet::range(c_rarg0, c_rarg4);
-    RegSet wb_post_saved_regs  = RegSet::of(count);
 
     // Registers used as temps (x7, x9, x18 are save-on-entry)
     const Register count_save  = x19;       // orig elementscount
@@ -1588,7 +1587,7 @@ class StubGenerator: public StubCodeGenerator {
     __ beqz(count, L_done_pop);
 
     __ BIND(L_do_card_marks);
-    bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, t0, wb_post_saved_regs);
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, t0);
 
     __ bind(L_done_pop);
     __ pop_reg(RegSet::of(x7, x9, x18, x19), sp);

From 1877ff996b67849205fd6cde1285461c4db1b359 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Mon, 10 Nov 2025 14:34:29 +0000
Subject: [PATCH 109/512] 8331195: Improve com.sun.net.httpserver.HttpExchange
 usability

Reviewed-by: jpai, dfuchs
---
 .../com/sun/net/httpserver/HttpExchange.java  | 50 +++++++++++++++----
 .../com/sun/net/httpserver/HttpHandlers.java  |  7 +--
 .../sun/net/httpserver/AuthFilter.java        |  7 +--
 .../sun/net/httpserver/ExchangeImpl.java      | 12 +++--
 .../simpleserver/FileServerHandler.java       | 15 +++---
 .../sun/net/httpserver/BasicAuthToken.java    |  7 +--
 .../com/sun/net/httpserver/EchoHandler.java   |  8 +--
 .../net/httpserver/ExchangeAttributeTest.java |  5 +-
 .../sun/net/httpserver/FileServerHandler.java | 12 +++--
 .../Http10KeepAliveMaxParamTest.java          |  5 +-
 .../sun/net/httpserver/HttpServerTest.java    |  5 +-
 .../HttpsParametersClientAuthTest.java        |  7 ++-
 .../com/sun/net/httpserver/InputNotRead.java  |  9 ++--
 .../net/httpserver/MissingTrailingSpace.java  |  5 +-
 .../httpserver/ServerStopTerminationTest.java |  5 +-
 .../sun/net/httpserver/TaskRejectedTest.java  |  6 +--
 test/jdk/com/sun/net/httpserver/Test10.java   |  5 +-
 test/jdk/com/sun/net/httpserver/Test2.java    |  5 +-
 test/jdk/com/sun/net/httpserver/Test3.java    |  5 +-
 test/jdk/com/sun/net/httpserver/Test4.java    |  5 +-
 test/jdk/com/sun/net/httpserver/Test5.java    |  5 +-
 test/jdk/com/sun/net/httpserver/Test6.java    |  5 +-
 test/jdk/com/sun/net/httpserver/Test6a.java   |  5 +-
 test/jdk/com/sun/net/httpserver/Test7.java    |  5 +-
 test/jdk/com/sun/net/httpserver/Test7a.java   |  5 +-
 test/jdk/com/sun/net/httpserver/Test8.java    |  5 +-
 .../8199849/BasicAuthenticatorCharset.java    |  5 +-
 .../bugs/8199849/TestHttpUnicode.java         |  5 +-
 .../bugs/8300268/MaxIdleConnectionsTest.java  |  5 +-
 .../com/sun/net/httpserver/bugs/B6341616.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6361557.java |  3 +-
 .../com/sun/net/httpserver/bugs/B6393710.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6401598.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6421581.java |  8 +--
 .../com/sun/net/httpserver/bugs/B6433018.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6526158.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6526913.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6529200.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6744329.java |  5 +-
 .../com/sun/net/httpserver/bugs/B6886436.java |  5 +-
 .../com/sun/net/httpserver/bugs/B8211420.java |  7 +--
 .../httpserver/bugs/ExceptionKeepAlive.java   |  9 ++--
 .../bugs/FixedLengthInputStream.java          |  5 +-
 .../net/httpserver/bugs/HeadKeepAlive.java    |  9 ++--
 .../com/sun/net/httpserver/bugs/HeadTest.java |  7 +--
 .../AutoCloseableHttpExchange.java            |  6 +--
 .../httpserver/bugs/TruncatedRequestBody.java |  5 +-
 .../bugs/ZeroLengthOutputStream.java          |  5 +-
 48 files changed, 210 insertions(+), 129 deletions(-)

diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
index ea2845f56f5..7ea43c0418e 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,27 @@ import java.net.URI;
 
 public abstract class HttpExchange implements AutoCloseable, Request {
 
+    /*
+     * Symbolic values for the responseLength parameter of
+     * sendResponseHeaders(int,long)
+     */
+
+    /**
+     * No response body is being sent with this response
+     *
+     * @see #sendResponseHeaders(int, long)
+     * @since 26
+     */
+    public static final long RSPBODY_EMPTY = -1l;
+
+    /**
+     * The response body length is unspecified and will be chunk encoded
+     *
+     * @see #sendResponseHeaders(int, long)
+     * @since 26
+     */
+    public static final long RSPBODY_CHUNKED = 0;
+
     /**
      * Constructor for subclasses to call.
      */
@@ -163,19 +184,19 @@ public abstract class HttpExchange implements AutoCloseable, Request {
      */
     public abstract OutputStream getResponseBody();
 
-
     /**
      * Starts sending the response back to the client using the current set of
      * response headers and the numeric response code as specified in this
      * method. The response body length is also specified as follows. If the
      * response length parameter is greater than {@code zero}, this specifies an
      * exact number of bytes to send and the application must send that exact
-     * amount of data. If the response length parameter is {@code zero}, then
-     * chunked transfer encoding is used and an arbitrary amount of data may be
+     * amount of data. If the response length parameter has the value
+     * {@link #RSPBODY_CHUNKED} (zero) then the response body uses
+     * chunked transfer encoding and an arbitrary amount of data may be
      * sent. The application terminates the response body by closing the
      * {@link OutputStream}.
-     * If response length has the value {@code -1} then no response body is
-     * being sent.
+     * If response length has the value {@link #RSPBODY_EMPTY} then no
+     * response body is being sent.
      *
      * <p> If the content-length response header has not already been set then
      * this is set to the appropriate value depending on the response length
@@ -183,6 +204,16 @@ public abstract class HttpExchange implements AutoCloseable, Request {
      *
      * <p> This method must be called prior to calling {@link #getResponseBody()}.
      *
+     * @apiNote If a response body is to be sent from a byte array and the
+     * length of the array is used as the responseLength parameter, then note
+     * the behavior in the case when the array is empty. In that case, the
+     * responseLength will be zero which is the value of {@link #RSPBODY_CHUNKED}
+     * resulting in a zero length, but chunked encoded response body. While this
+     * is not incorrect, it may be preferable to check for an empty array and set
+     * responseLength to {@link #RSPBODY_EMPTY} instead. Also, when sending a
+     * chunked encoded response body, whatever length, the output stream must
+     * be explicitly closed by the handler.
+     *
      * @implNote This implementation allows the caller to instruct the
      * server to force a connection close after the exchange terminates, by
      * supplying a {@code Connection: close} header to the {@linkplain
@@ -193,10 +224,11 @@ public abstract class HttpExchange implements AutoCloseable, Request {
      * @param responseLength if {@literal > 0}, specifies a fixed response body
      *                       length and that exact number of bytes must be written
      *                       to the stream acquired from {@link #getResponseCode()}
-     *                       If {@literal == 0}, then chunked encoding is used,
+     *                       If equal to {@link #RSPBODY_CHUNKED}, then chunked encoding is used,
      *                       and an arbitrary number of bytes may be written.
-     *                       If {@literal <= -1}, then no response body length is
-     *                       specified and no response body may be written.
+     *                       If equal to {@link #RSPBODY_EMPTY}, then no response body length is
+     *                       specified and no response body may be written. Any value {@literal <= -1}
+     *                       is treated the same as {@link #RSPBODY_EMPTY}.
      * @throws IOException   if the response headers have already been sent or an I/O error occurs
      * @see   HttpExchange#getResponseBody()
      */
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandlers.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandlers.java
index 03642033914..03d5e32f741 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandlers.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandlers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ package com.sun.net.httpserver;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.function.Predicate;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Implementations of {@link com.sun.net.httpserver.HttpHandler HttpHandler}
@@ -155,10 +156,10 @@ public final class HttpHandlers {
                 exchange.getResponseHeaders().putAll(headersCopy);
                 if (exchange.getRequestMethod().equals("HEAD")) {
                     exchange.getResponseHeaders().set("Content-Length", Integer.toString(bytes.length));
-                    exchange.sendResponseHeaders(statusCode, -1);
+                    exchange.sendResponseHeaders(statusCode, RSPBODY_EMPTY);
                 }
                 else if (bytes.length == 0) {
-                    exchange.sendResponseHeaders(statusCode, -1);
+                    exchange.sendResponseHeaders(statusCode, RSPBODY_EMPTY);
                 } else {
                     exchange.sendResponseHeaders(statusCode, bytes.length);
                     exchange.getResponseBody().write(bytes);
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
index a6f03fdc542..468fa19fe16 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package sun.net.httpserver;
 
 import com.sun.net.httpserver.*;
 import java.io.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class AuthFilter extends Filter {
 
@@ -66,11 +67,11 @@ public class AuthFilter extends Filter {
             } else if (r instanceof Authenticator.Retry) {
                 Authenticator.Retry ry = (Authenticator.Retry)r;
                 consumeInput (t);
-                t.sendResponseHeaders (ry.getResponseCode(), -1);
+                t.sendResponseHeaders (ry.getResponseCode(), RSPBODY_EMPTY);
             } else if (r instanceof Authenticator.Failure) {
                 Authenticator.Failure f = (Authenticator.Failure)r;
                 consumeInput (t);
-                t.sendResponseHeaders (f.getResponseCode(), -1);
+                t.sendResponseHeaders (f.getResponseCode(), RSPBODY_EMPTY);
             }
         } else {
             chain.doFilter (t);
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
index 0899952b495..17dff13d4e5 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -38,6 +38,8 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.stream.Stream;
 import com.sun.net.httpserver.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 class ExchangeImpl {
 
@@ -227,12 +229,12 @@ class ExchangeImpl {
             ||(rCode == 204)           /* no content */
             ||(rCode == 304))          /* not modified */
         {
-            if (contentLen != -1) {
+            if (contentLen != RSPBODY_EMPTY) {
                 String msg = "sendResponseHeaders: rCode = "+ rCode
-                    + ": forcing contentLen = -1";
+                    + ": forcing contentLen = RSPBODY_EMPTY";
                 logger.log (Level.WARNING, msg);
             }
-            contentLen = -1;
+            contentLen = RSPBODY_EMPTY;
             noContentLengthHeader = (rCode != 304);
         }
 
@@ -249,7 +251,7 @@ class ExchangeImpl {
             contentLen = 0;
             o.setWrappedStream (new FixedLengthOutputStream (this, ros, contentLen));
         } else { /* not a HEAD request or 304 response */
-            if (contentLen == 0) {
+            if (contentLen == RSPBODY_CHUNKED) {
                 if (http10) {
                     o.setWrappedStream (new UndefLengthOutputStream (this, ros));
                     close = true;
@@ -258,7 +260,7 @@ class ExchangeImpl {
                     o.setWrappedStream (new ChunkedOutputStream (this, ros));
                 }
             } else {
-                if (contentLen == -1) {
+                if (contentLen == RSPBODY_EMPTY) {
                     noContentToSend = true;
                     contentLen = 0;
                 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
index 6e2683737e6..3a3654d4a73 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpHandlers;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * A basic HTTP file server handler for static content.
@@ -122,11 +123,11 @@ public final class FileServerHandler implements HttpHandler {
 
     private void handleMovedPermanently(HttpExchange exchange) throws IOException {
         exchange.getResponseHeaders().set("Location", getRedirectURI(exchange.getRequestURI()));
-        exchange.sendResponseHeaders(301, -1);
+        exchange.sendResponseHeaders(301, RSPBODY_EMPTY);
     }
 
     private void handleForbidden(HttpExchange exchange) throws IOException {
-        exchange.sendResponseHeaders(403, -1);
+        exchange.sendResponseHeaders(403, RSPBODY_EMPTY);
     }
 
     private void handleNotFound(HttpExchange exchange) throws IOException {
@@ -139,7 +140,7 @@ public final class FileServerHandler implements HttpHandler {
 
         if (exchange.getRequestMethod().equals("HEAD")) {
             exchange.getResponseHeaders().set("Content-Length", Integer.toString(bytes.length));
-            exchange.sendResponseHeaders(404, -1);
+            exchange.sendResponseHeaders(404, RSPBODY_EMPTY);
         } else {
             exchange.sendResponseHeaders(404, bytes.length);
             try (OutputStream os = exchange.getResponseBody()) {
@@ -260,7 +261,7 @@ public final class FileServerHandler implements HttpHandler {
                 }
             } else {
                 respHdrs.set("Content-Length", Integer.toString(bytes.length));
-                exchange.sendResponseHeaders(200, -1);
+                exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
             }
         }
     }
@@ -280,7 +281,7 @@ public final class FileServerHandler implements HttpHandler {
             }
         } else {
             respHdrs.set("Content-Length", Long.toString(Files.size(path)));
-            exchange.sendResponseHeaders(200, -1);
+            exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
         }
     }
 
@@ -298,7 +299,7 @@ public final class FileServerHandler implements HttpHandler {
             }
         } else {
             respHdrs.set("Content-Length", Integer.toString(bodyBytes.length));
-            exchange.sendResponseHeaders(200, -1);
+            exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
         }
     }
 
diff --git a/test/jdk/com/sun/net/httpserver/BasicAuthToken.java b/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
index a393ac4c5dd..18d8225f483 100644
--- a/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
+++ b/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ import java.util.Base64;
 import com.sun.net.httpserver.Authenticator;
 import com.sun.net.httpserver.BasicAuthenticator;
 import com.sun.net.httpserver.HttpServer;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class BasicAuthToken {
     private static final String CRLF = "\r\n";
@@ -59,11 +60,11 @@ public class BasicAuthToken {
         HttpServer server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
         server.createContext(someContext, exchange -> {
             if (authenticator.authenticate(exchange) instanceof Authenticator.Failure) {
-                exchange.sendResponseHeaders(401, -1);
+                exchange.sendResponseHeaders(401, RSPBODY_EMPTY);
                 exchange.close();
                 return;
             }
-            exchange.sendResponseHeaders(200, -1);
+            exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
             exchange.close();
         }).setAuthenticator(authenticator);
         server.start();
diff --git a/test/jdk/com/sun/net/httpserver/EchoHandler.java b/test/jdk/com/sun/net/httpserver/EchoHandler.java
index c3bbea78195..b6ee1f23e87 100644
--- a/test/jdk/com/sun/net/httpserver/EchoHandler.java
+++ b/test/jdk/com/sun/net/httpserver/EchoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@ import java.nio.charset.StandardCharsets;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 /**
  * Implements a basic static EchoHandler for an HTTP server
@@ -50,9 +52,9 @@ public class EchoHandler implements HttpHandler {
             in = Integer.toString(in.length).getBytes(StandardCharsets.UTF_8);
         }
         if (fixedrequest != null) {
-            t.sendResponseHeaders(200, in.length == 0 ? -1 : in.length);
+            t.sendResponseHeaders(200, in.length == 0 ? RSPBODY_EMPTY : in.length);
         } else {
-            t.sendResponseHeaders(200, 0);
+            t.sendResponseHeaders(200, RSPBODY_CHUNKED);
         }
         os.write(in);
         close(t, os);
diff --git a/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java b/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java
index e7bea2814db..2b701a0cbc8 100644
--- a/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java
+++ b/test/jdk/com/sun/net/httpserver/ExchangeAttributeTest.java
@@ -51,6 +51,7 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -117,10 +118,10 @@ public class ExchangeAttributeTest {
                 }
                 exchange.setAttribute("attr", null);
                 assertNull(exchange.getAttribute("attr"));
-                exchange.sendResponseHeaders(200, -1);
+                exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
             } catch (Throwable t) {
                 t.printStackTrace();
-                exchange.sendResponseHeaders(500, -1);
+                exchange.sendResponseHeaders(500, RSPBODY_EMPTY);
             }
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/FileServerHandler.java b/test/jdk/com/sun/net/httpserver/FileServerHandler.java
index 509adf7bf72..1035ee5c970 100644
--- a/test/jdk/com/sun/net/httpserver/FileServerHandler.java
+++ b/test/jdk/com/sun/net/httpserver/FileServerHandler.java
@@ -25,6 +25,8 @@ import java.io.*;
 import java.net.*;
 
 import com.sun.net.httpserver.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 /**
  * Implements a basic static content HTTP file server handler
@@ -65,10 +67,10 @@ public class FileServerHandler implements HttpHandler {
         String method = t.getRequestMethod();
         if (method.equals ("HEAD")) {
             rmap.set ("Content-Length", Long.toString (f.length()));
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         } else if (!method.equals("GET")) {
-            t.sendResponseHeaders (405, -1);
+            t.sendResponseHeaders (405, RSPBODY_EMPTY);
             t.close();
             return;
         }
@@ -84,7 +86,7 @@ public class FileServerHandler implements HttpHandler {
                 return;
             }
             rmap.set ("Content-Type", "text/html");
-            t.sendResponseHeaders (200, 0);
+            t.sendResponseHeaders (200, RSPBODY_CHUNKED);
             String[] list = f.list();
             try (final OutputStream os = t.getResponseBody();
                  final PrintStream p = new PrintStream (os)) {
@@ -127,13 +129,13 @@ public class FileServerHandler implements HttpHandler {
         String location = "http://"+host+uri.getPath() + "/";
         map.set ("Content-Type", "text/html");
         map.set ("Location", location);
-        t.sendResponseHeaders (301, -1);
+        t.sendResponseHeaders (301, RSPBODY_EMPTY);
         t.close();
     }
 
     void notfound (HttpExchange t, String p) throws IOException {
         t.getResponseHeaders().set ("Content-Type", "text/html");
-        t.sendResponseHeaders (404, 0);
+        t.sendResponseHeaders (404, RSPBODY_CHUNKED);
         OutputStream os = t.getResponseBody();
         String s = "<h2>File not found</h2>";
         s = s + p + "<p>";
diff --git a/test/jdk/com/sun/net/httpserver/Http10KeepAliveMaxParamTest.java b/test/jdk/com/sun/net/httpserver/Http10KeepAliveMaxParamTest.java
index 25d809058ff..c1da7647c4b 100644
--- a/test/jdk/com/sun/net/httpserver/Http10KeepAliveMaxParamTest.java
+++ b/test/jdk/com/sun/net/httpserver/Http10KeepAliveMaxParamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 /*
  * @test
@@ -54,7 +55,7 @@ public class Http10KeepAliveMaxParamTest {
         final HttpServer server = HttpServer.create(bindAddr, backlog);
         server.createContext("/", (exchange) -> {
             System.out.println("Sending response for request " + exchange.getRequestURI());
-            exchange.sendResponseHeaders(200, 0);
+            exchange.sendResponseHeaders(200, RSPBODY_CHUNKED);
             exchange.getResponseBody().close();
         });
         server.start();
diff --git a/test/jdk/com/sun/net/httpserver/HttpServerTest.java b/test/jdk/com/sun/net/httpserver/HttpServerTest.java
index b272bafc241..c4be110a269 100644
--- a/test/jdk/com/sun/net/httpserver/HttpServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class HttpServerTest implements HttpHandler {
     private static final int HTTP_STATUS_CODE_OK = 200;
@@ -66,7 +67,7 @@ public class HttpServerTest implements HttpHandler {
 
     private void sendHttpStatusCode(int httpCode, HttpExchange ex) {
         try {
-            ex.sendResponseHeaders(httpCode, 0);
+            ex.sendResponseHeaders(httpCode, RSPBODY_CHUNKED);
             ex.close();
         } catch (IOException e) {
             throw new RuntimeException("Server couldn't send response: " + e, e);
diff --git a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
index dc1f573c4e4..37ec2701e07 100644
--- a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@ import jdk.test.lib.net.URIBuilder;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -392,12 +393,10 @@ public class HttpsParametersClientAuthTest {
     // A HttpHandler which just returns 200 response code
     private static final class AllOKHandler implements HttpHandler {
 
-        private static final int NO_RESPONSE_BODY = -1;
-
         @Override
         public void handle(final HttpExchange exchange) throws IOException {
             System.out.println("responding to request: " + exchange.getRequestURI());
-            exchange.sendResponseHeaders(200, NO_RESPONSE_BODY);
+            exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
         }
     }
 }
diff --git a/test/jdk/com/sun/net/httpserver/InputNotRead.java b/test/jdk/com/sun/net/httpserver/InputNotRead.java
index 5b67f8d8b24..3d5bfad83c3 100644
--- a/test/jdk/com/sun/net/httpserver/InputNotRead.java
+++ b/test/jdk/com/sun/net/httpserver/InputNotRead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@ import com.sun.net.httpserver.HttpServer;
 import org.testng.annotations.Test;
 
 import static java.nio.charset.StandardCharsets.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class InputNotRead {
 
@@ -91,7 +92,8 @@ public class InputNotRead {
                     try {
                         msg.getRequestBody().read();
                         try {
-                            msg.sendResponseHeaders(msgCode, reply.length == 0 ? -1 : reply.length);
+                            msg.sendResponseHeaders(msgCode, reply.length == 0
+                                                        ? RSPBODY_EMPTY : reply.length);
                         } catch(IOException ioe) {
                             ioe.printStackTrace();
                         }
@@ -132,7 +134,8 @@ public class InputNotRead {
                         BufferedReader r = new BufferedReader(new InputStreamReader(msg.getRequestBody()));
                         r.read();
                         try {
-                            msg.sendResponseHeaders(msgCode, reply.length == 0 ? -1 : reply.length);
+                            msg.sendResponseHeaders(msgCode, reply.length == 0
+                                                        ? RSPBODY_EMPTY : reply.length);
                             msg.getResponseBody().write(reply);
                             msg.getResponseBody().close();
                             Thread.sleep(50);
diff --git a/test/jdk/com/sun/net/httpserver/MissingTrailingSpace.java b/test/jdk/com/sun/net/httpserver/MissingTrailingSpace.java
index 6671105aac4..f3759de0f4a 100644
--- a/test/jdk/com/sun/net/httpserver/MissingTrailingSpace.java
+++ b/test/jdk/com/sun/net/httpserver/MissingTrailingSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ import java.util.concurrent.Executors;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class MissingTrailingSpace {
 
@@ -59,7 +60,7 @@ public class MissingTrailingSpace {
                 public void handle(HttpExchange msg) {
                     try {
                         try {
-                            msg.sendResponseHeaders(noMsgCode, -1);
+                            msg.sendResponseHeaders(noMsgCode, RSPBODY_EMPTY);
                         } catch(IOException ioe) {
                             ioe.printStackTrace();
                         }
diff --git a/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java b/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java
index e8f365b715b..69f4e8742d5 100644
--- a/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java
+++ b/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java
@@ -42,6 +42,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static org.junit.jupiter.api.Assertions.fail;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /*
  * @test
@@ -88,7 +89,7 @@ public class ServerStopTerminationTest {
             try {
                 // Wait for test to signal that we can complete the exchange
                 complete.await();
-                exchange.sendResponseHeaders(200, 0);
+                exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
                 exchange.close();
             } catch (final InterruptedException e) {
                 throw new IOException(e);
@@ -191,7 +192,7 @@ public class ServerStopTerminationTest {
         server = HttpServer.create(new InetSocketAddress(loopbackAddress, 0),
                 0,
                 "/", exchange -> {
-                    exchange.sendResponseHeaders(200, 0);
+                    exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
                     exchange.close();
                 });
         final Duration executorSleepTime = Duration.ofSeconds(Utils.adjustTimeout(20));
diff --git a/test/jdk/com/sun/net/httpserver/TaskRejectedTest.java b/test/jdk/com/sun/net/httpserver/TaskRejectedTest.java
index f3558d95a75..6b6d53fd3a3 100644
--- a/test/jdk/com/sun/net/httpserver/TaskRejectedTest.java
+++ b/test/jdk/com/sun/net/httpserver/TaskRejectedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class TaskRejectedTest {
 
@@ -92,7 +92,7 @@ public class TaskRejectedTest {
         httpServer.setExecutor(executor);
 
         httpServer.createContext(REQUEST_PATH, exc -> {
-            exc.sendResponseHeaders(200, 0);
+            exc.sendResponseHeaders(200, RSPBODY_EMPTY);
             exc.close();
         });
 
diff --git a/test/jdk/com/sun/net/httpserver/Test10.java b/test/jdk/com/sun/net/httpserver/Test10.java
index d43480e8b8d..a256acbca11 100644
--- a/test/jdk/com/sun/net/httpserver/Test10.java
+++ b/test/jdk/com/sun/net/httpserver/Test10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import com.sun.net.httpserver.*;
 import java.io.*;
 import java.net.*;
 import java.util.concurrent.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /*
  * Test handling of empty Http headers
@@ -72,7 +73,7 @@ public class Test10 extends Test {
             InputStream is = t.getRequestBody();
             while (is.read() != -1);
             Headers map = t.getRequestHeaders();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test2.java b/test/jdk/com/sun/net/httpserver/Test2.java
index 1e7710162fd..a61d37eba3a 100644
--- a/test/jdk/com/sun/net/httpserver/Test2.java
+++ b/test/jdk/com/sun/net/httpserver/Test2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test authentication
@@ -120,7 +121,7 @@ public class Test2 extends Test {
             Headers rmap = t.getResponseHeaders();
             while (is.read () != -1) ;
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             HttpPrincipal p = t.getPrincipal ();
             if (!p.getUsername().equals("fred")) {
                 error = true;
diff --git a/test/jdk/com/sun/net/httpserver/Test3.java b/test/jdk/com/sun/net/httpserver/Test3.java
index ed5b46781fd..bbb307dc9f2 100644
--- a/test/jdk/com/sun/net/httpserver/Test3.java
+++ b/test/jdk/com/sun/net/httpserver/Test3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import java.util.concurrent.*;
 import java.util.regex.*;
 import java.io.*;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test pipe-lining over http
@@ -94,7 +95,7 @@ public class Test3 extends Test {
                 checkBody (is, body4);
                 break;
             }
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test4.java b/test/jdk/com/sun/net/httpserver/Test4.java
index a3502dec22e..ba2f5b4ec82 100644
--- a/test/jdk/com/sun/net/httpserver/Test4.java
+++ b/test/jdk/com/sun/net/httpserver/Test4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import java.util.concurrent.*;
 import java.util.regex.*;
 import java.io.*;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test pipe-lining (block after read)
@@ -93,7 +94,7 @@ public class Test4 extends Test {
                 checkBody (is, body4);
                 break;
             }
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test5.java b/test/jdk/com/sun/net/httpserver/Test5.java
index 68556bbb888..68b7d7b357b 100644
--- a/test/jdk/com/sun/net/httpserver/Test5.java
+++ b/test/jdk/com/sun/net/httpserver/Test5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import java.util.concurrent.*;
 import java.util.regex.*;
 import java.io.*;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test pipe-lining (no block)
@@ -92,7 +93,7 @@ public class Test5 extends Test {
                 checkBody (is, body4);
                 break;
             }
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test6.java b/test/jdk/com/sun/net/httpserver/Test6.java
index b69bc57b640..737e2cf79c1 100644
--- a/test/jdk/com/sun/net/httpserver/Test6.java
+++ b/test/jdk/com/sun/net/httpserver/Test6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test POST large file via chunked encoding (unusually small chunks)
@@ -107,7 +108,7 @@ public class Test6 extends Test {
                 error = true;
             }
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test6a.java b/test/jdk/com/sun/net/httpserver/Test6a.java
index bbe107f5e2f..676edeb7b60 100644
--- a/test/jdk/com/sun/net/httpserver/Test6a.java
+++ b/test/jdk/com/sun/net/httpserver/Test6a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@ import javax.net.ssl.*;
 import jdk.test.lib.net.SimpleSSLContext;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test https POST large file via chunked encoding (unusually small chunks)
@@ -115,7 +116,7 @@ public class Test6a extends Test {
                 error = true;
             }
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test7.java b/test/jdk/com/sun/net/httpserver/Test7.java
index 4b997411316..1a3497bee48 100644
--- a/test/jdk/com/sun/net/httpserver/Test7.java
+++ b/test/jdk/com/sun/net/httpserver/Test7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test POST large file via chunked encoding (large chunks)
@@ -106,7 +107,7 @@ public class Test7 extends Test {
                 error = true;
             }
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test7a.java b/test/jdk/com/sun/net/httpserver/Test7a.java
index 5ff01ade9a0..90c0615972e 100644
--- a/test/jdk/com/sun/net/httpserver/Test7a.java
+++ b/test/jdk/com/sun/net/httpserver/Test7a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ import java.net.*;
 import javax.net.ssl.*;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test POST large file via chunked encoding (large chunks)
@@ -118,7 +119,7 @@ public class Test7a extends Test {
                 error = true;
             }
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/Test8.java b/test/jdk/com/sun/net/httpserver/Test8.java
index 58f3dc2b3b4..7097191b7ba 100644
--- a/test/jdk/com/sun/net/httpserver/Test8.java
+++ b/test/jdk/com/sun/net/httpserver/Test8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test POST large file via fixed len encoding
@@ -109,7 +110,7 @@ public class Test8 extends Test {
                 error = true;
             }
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/8199849/BasicAuthenticatorCharset.java b/test/jdk/com/sun/net/httpserver/bugs/8199849/BasicAuthenticatorCharset.java
index 67578624211..8c0936b081f 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/8199849/BasicAuthenticatorCharset.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/8199849/BasicAuthenticatorCharset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,7 @@ import java.nio.charset.Charset;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * Test authentication
@@ -67,7 +68,7 @@ public class BasicAuthenticatorCharset {
             InputStream is = t.getRequestBody();
             while (is.read() != -1) ;
             is.close();
-            t.sendResponseHeaders(200, -1);
+            t.sendResponseHeaders(200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/8199849/TestHttpUnicode.java b/test/jdk/com/sun/net/httpserver/bugs/8199849/TestHttpUnicode.java
index bd608e71ca2..9db6cd18bf4 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/8199849/TestHttpUnicode.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/8199849/TestHttpUnicode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import jdk.test.lib.net.URIBuilder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class TestHttpUnicode {
 
@@ -55,7 +56,7 @@ public class TestHttpUnicode {
 
             HttpPrincipal p = t.getPrincipal();
             if (p.getUsername().equals(TEST_USER)) {
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, RSPBODY_EMPTY);
             }
             t.close();
         }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/8300268/MaxIdleConnectionsTest.java b/test/jdk/com/sun/net/httpserver/bugs/8300268/MaxIdleConnectionsTest.java
index 3394dc3c6a9..191a19f26e3 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/8300268/MaxIdleConnectionsTest.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/8300268/MaxIdleConnectionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class MaxIdleConnectionsTest {
@@ -132,7 +133,7 @@ public class MaxIdleConnectionsTest {
             System.out.println("Request " + exchange.getRequestURI() + " received");
             System.out.println("Sending response for request " + exchange.getRequestURI() + " from " + exchange.getRemoteAddress());
             reqFinishedProcessing.countDown();
-            exchange.sendResponseHeaders(200, 0);
+            exchange.sendResponseHeaders(200, RSPBODY_CHUNKED);
             exchange.getResponseBody().close();
         });
 
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6341616.java b/test/jdk/com/sun/net/httpserver/bugs/B6341616.java
index 8a5cb98f298..8ee085ee69a 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6341616.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6341616.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class B6341616 {
 
@@ -101,7 +102,7 @@ public class B6341616 {
             Headers rmap = t.getResponseHeaders();
             while (is.read () != -1) ;
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6361557.java b/test/jdk/com/sun/net/httpserver/bugs/B6361557.java
index 66094230d69..a92bb9adfdc 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6361557.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6361557.java
@@ -36,6 +36,7 @@ import java.io.*;
 import java.nio.*;
 import java.nio.channels.*;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * The test simply opens 1,000 separate connections
@@ -59,7 +60,7 @@ public class B6361557 {
             Headers rmap = t.getResponseHeaders();
             while (is.read () != -1) ;
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6393710.java b/test/jdk/com/sun/net/httpserver/bugs/B6393710.java
index 89170e9aad9..68a3bac259f 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6393710.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6393710.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.Utils;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /*
  * Test checks for following bug(s) when a POST containing a request body
@@ -150,7 +151,7 @@ public class B6393710 {
                 ok = false;
             }
             is.close();
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
             requests ++;
         }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6401598.java b/test/jdk/com/sun/net/httpserver/bugs/B6401598.java
index 3a7821dbf51..89f07d81630 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6401598.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6401598.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ import jdk.test.lib.net.URIBuilder;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class B6401598 {
 
@@ -66,7 +67,7 @@ public class B6401598 {
 
                                 DataOutputStream dos = new DataOutputStream(os);
 
-                                arg0.sendResponseHeaders(200, 0);
+                                arg0.sendResponseHeaders(200, RSPBODY_CHUNKED);
 
                                 dos.writeShort(input);
 
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6421581.java b/test/jdk/com/sun/net/httpserver/bugs/B6421581.java
index 933af30d084..b635cc36769 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6421581.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6421581.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@ import com.sun.net.httpserver.*;
 import java.net.*;
 import java.io.*;
 import java.util.concurrent.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class B6421581 {
 
@@ -59,7 +61,7 @@ public class B6421581 {
                     /* close output stream without opening inpustream */
                     /* chunked encoding */
                     try {
-                        msg.sendResponseHeaders(200, 0);
+                        msg.sendResponseHeaders(200, RSPBODY_CHUNKED);
                         OutputStream out = msg.getResponseBody();
                         out.write("hello".getBytes());
                         out.close();
@@ -86,7 +88,7 @@ public class B6421581 {
                 case 3:
                     /* close exchange without opening any stream */
                     try {
-                        msg.sendResponseHeaders(200, -1);
+                        msg.sendResponseHeaders(200, RSPBODY_EMPTY);
                         msg.close();
                     } catch(Exception e) {
                         error = true;
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6433018.java b/test/jdk/com/sun/net/httpserver/bugs/B6433018.java
index 1a8e52cc34c..1f6876bf872 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6433018.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6433018.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import com.sun.net.httpserver.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class B6433018 {
 
@@ -100,7 +101,7 @@ public class B6433018 {
                 Headers rmap = t.getResponseHeaders();
                 while (is.read() != -1);
             }
-            t.sendResponseHeaders(200, -1);
+            t.sendResponseHeaders(200, RSPBODY_EMPTY);
             t.close();
             finished.countDown();
         }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6526158.java b/test/jdk/com/sun/net/httpserver/bugs/B6526158.java
index 5c25911d87a..3807b3388ba 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6526158.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6526158.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class B6526158 {
 
@@ -97,7 +98,7 @@ public class B6526158 {
                 e.printStackTrace();
                 error = true;
             }
-            t.sendResponseHeaders (200, -1);
+            t.sendResponseHeaders (200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6526913.java b/test/jdk/com/sun/net/httpserver/bugs/B6526913.java
index de2bd398e33..394be75b85d 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6526913.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6526913.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class B6526913 {
 
@@ -94,7 +95,7 @@ public class B6526913 {
             /* send a chunked response, but wait a while before
              * sending the final empty chunk
              */
-            t.sendResponseHeaders (200, 0);
+            t.sendResponseHeaders (200, RSPBODY_CHUNKED);
             OutputStream os = t.getResponseBody();
             byte[] bb = new byte [32 * 1024];
             os.write (bb);
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6529200.java b/test/jdk/com/sun/net/httpserver/bugs/B6529200.java
index 774eeb93d0d..62301c84f5f 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6529200.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6529200.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import com.sun.net.httpserver.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class B6529200 {
 
@@ -127,7 +128,7 @@ public class B6529200 {
                 is = t.getRequestBody();
                 while (is.read() != -1) ;
                 is.close();
-                t.sendResponseHeaders (200, 0);
+                t.sendResponseHeaders (200, RSPBODY_CHUNKED);
                 os = t.getResponseBody();
                 os.write ("hello world".getBytes());
                 os.close();
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6744329.java b/test/jdk/com/sun/net/httpserver/bugs/B6744329.java
index 8a6290441ac..3c4a808a2b4 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6744329.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6744329.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class B6744329 {
 
@@ -93,7 +94,7 @@ public class B6744329 {
             while (is.read () != -1) ;
             is.close();
             /* chunked response */
-            t.sendResponseHeaders (200, 0);
+            t.sendResponseHeaders (200, RSPBODY_CHUNKED);
             OutputStream os = t.getResponseBody();
             byte[] first = new byte [CHUNK_SIZE * 2];
             byte[] second = new byte [2];
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B6886436.java b/test/jdk/com/sun/net/httpserver/bugs/B6886436.java
index 050d2b20d5d..5081a81c4c1 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B6886436.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6886436.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.util.logging.*;
 import java.io.*;
 import java.net.*;
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
 
 public class B6886436 {
 
@@ -96,7 +97,7 @@ public class B6886436 {
             while (is.read () != -1) ;
             is.close();
             // send a 204 response with an empty chunked body
-            t.sendResponseHeaders (204, 0);
+            t.sendResponseHeaders (204, RSPBODY_CHUNKED);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/B8211420.java b/test/jdk/com/sun/net/httpserver/bugs/B8211420.java
index 1a322e7945d..297aed43bec 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/B8211420.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/B8211420.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ import java.io.*;
 import java.net.*;
 
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class B8211420 {
 
@@ -105,12 +106,12 @@ public class B8211420 {
             is.close();
             if (invocation++ == 1) {
                 // send a 204 response with no body
-                t.sendResponseHeaders(204, -1);
+                t.sendResponseHeaders(204, RSPBODY_EMPTY);
                 t.close();
             } else {
                 // send a 304 response with no body but with content - length
                 rmap.add("Content-length", "99");
-                t.sendResponseHeaders(304, -1);
+                t.sendResponseHeaders(304, RSPBODY_EMPTY);
                 t.close();
             }
         }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/ExceptionKeepAlive.java b/test/jdk/com/sun/net/httpserver/bugs/ExceptionKeepAlive.java
index ea3ec9cea28..865e3b7509d 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/ExceptionKeepAlive.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/ExceptionKeepAlive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@ import java.util.logging.SimpleFormatter;
 import java.util.logging.StreamHandler;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class ExceptionKeepAlive
 {
@@ -111,7 +112,7 @@ public class ExceptionKeepAlive
                 System.out.println("First connection on client port = " + port1);
 
                 // send response
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, RSPBODY_EMPTY);
                 // response is completed now; throw exception
                 throw new NumberFormatException();
                 // the connection should still be reusable
@@ -120,9 +121,9 @@ public class ExceptionKeepAlive
                 System.out.println("Second connection on client port = " + port2);
 
                 if (port1 == port2) {
-                    t.sendResponseHeaders(200, -1);
+                    t.sendResponseHeaders(200, RSPBODY_EMPTY);
                 } else {
-                    t.sendResponseHeaders(500, -1);
+                    t.sendResponseHeaders(500, RSPBODY_EMPTY);
                 }
             }
             t.close();
diff --git a/test/jdk/com/sun/net/httpserver/bugs/FixedLengthInputStream.java b/test/jdk/com/sun/net/httpserver/bugs/FixedLengthInputStream.java
index 7df66d8e15e..c2195b3568f 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/FixedLengthInputStream.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/FixedLengthInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,7 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class FixedLengthInputStream
 {
@@ -132,7 +133,7 @@ public class FixedLengthInputStream
 
             debug("Received " + count + " bytes");
 
-            t.sendResponseHeaders(200, -1);
+            t.sendResponseHeaders(200, RSPBODY_EMPTY);
             t.close();
         }
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/HeadKeepAlive.java b/test/jdk/com/sun/net/httpserver/bugs/HeadKeepAlive.java
index cc6fbea90b9..4d987ada173 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/HeadKeepAlive.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/HeadKeepAlive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@ import java.util.logging.SimpleFormatter;
 import java.util.logging.StreamHandler;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class HeadKeepAlive
 {
@@ -111,15 +112,15 @@ public class HeadKeepAlive
                 port1 = t.getRemoteAddress().getPort();
                 System.out.println("First connection on client port = " + port1);
                 // send response
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, RSPBODY_EMPTY);
                 // the connection should still be reusable
             } else if (path.equals("/secondCall")) {
                 int port2 = t.getRemoteAddress().getPort();
                 System.out.println("Second connection on client port = " + port2);
                 if (port1 == port2) {
-                    t.sendResponseHeaders(200, -1);
+                    t.sendResponseHeaders(200, RSPBODY_EMPTY);
                 } else {
-                    t.sendResponseHeaders(500, -1);
+                    t.sendResponseHeaders(500, RSPBODY_EMPTY);
                 }
             }
             t.close();
diff --git a/test/jdk/com/sun/net/httpserver/bugs/HeadTest.java b/test/jdk/com/sun/net/httpserver/bugs/HeadTest.java
index b20b786decf..452a8060593 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/HeadTest.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/HeadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.URIBuilder;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class HeadTest {
 
@@ -65,7 +66,7 @@ public class HeadTest {
                             if (msg.getRequestMethod().equals("HEAD")) {
                                 msg.getRequestBody().close();
                                 msg.getResponseHeaders().add("Transfer-encoding", "chunked");
-                                msg.sendResponseHeaders(200, -1);
+                                msg.sendResponseHeaders(200, RSPBODY_EMPTY);
                             }
                         } catch(IOException ioe) {
                             ioe.printStackTrace();
@@ -84,7 +85,7 @@ public class HeadTest {
                             if (msg.getRequestMethod().equals("HEAD")) {
                                 msg.getRequestBody().close();
                                 msg.getResponseHeaders().add("Content-length", "1024");
-                                msg.sendResponseHeaders(200, -1);
+                                msg.sendResponseHeaders(200, RSPBODY_EMPTY);
                             }
                         } catch(IOException ioe) {
                             ioe.printStackTrace();
diff --git a/test/jdk/com/sun/net/httpserver/bugs/HttpExchange/AutoCloseableHttpExchange.java b/test/jdk/com/sun/net/httpserver/bugs/HttpExchange/AutoCloseableHttpExchange.java
index b25854c5921..f9bd802176a 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/HttpExchange/AutoCloseableHttpExchange.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/HttpExchange/AutoCloseableHttpExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import jdk.test.lib.net.URIBuilder;
 import sun.net.httpserver.HttpExchangeAccess;
-
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /**
  * @test
@@ -63,7 +63,7 @@ public class AutoCloseableHttpExchange {
             InputStream is = t.getRequestBody();
             try (HttpExchange e = t) {
                 while (is.read() != -1) ;
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, RSPBODY_EMPTY);
             }
             if (!HttpExchangeAccess.isClosed(t)) {
                 exchangeCloseFail.set(true);
diff --git a/test/jdk/com/sun/net/httpserver/bugs/TruncatedRequestBody.java b/test/jdk/com/sun/net/httpserver/bugs/TruncatedRequestBody.java
index 9ceb7108f5c..824428755a4 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/TruncatedRequestBody.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/TruncatedRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ import java.util.concurrent.Executors;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 /*
  * Send two POST requests to the server which are both trucated
@@ -75,7 +76,7 @@ public class TruncatedRequestBody {
             latch.countDown();
             System.out.println("Read " + count + " bytes");
             is.close();
-            exch.sendResponseHeaders(200, -1);
+            exch.sendResponseHeaders(200, RSPBODY_EMPTY);
         }
 
     }
diff --git a/test/jdk/com/sun/net/httpserver/bugs/ZeroLengthOutputStream.java b/test/jdk/com/sun/net/httpserver/bugs/ZeroLengthOutputStream.java
index ff446104e3d..33bbe0479db 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/ZeroLengthOutputStream.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/ZeroLengthOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,7 @@ import java.util.logging.SimpleFormatter;
 import java.util.logging.StreamHandler;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
 public class ZeroLengthOutputStream
 {
@@ -101,7 +102,7 @@ public class ZeroLengthOutputStream
         public void handle(HttpExchange t) throws IOException {
             try {
                 OutputStream os = t.getResponseBody();
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, RSPBODY_EMPTY);
                 os.write(new byte[0]);
                 os.close();
                 System.out.println("Output stream closed");

From 2d4f2fde2281affd90bdd608d49a021f6cac2fed Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Mon, 10 Nov 2025 14:39:22 +0000
Subject: [PATCH 110/512] 8349732: Add support for JARs signed with ML-DSA

Reviewed-by: mullan
---
 .../classes/sun/security/pkcs/PKCS7.java      |  47 ++++-
 .../classes/sun/security/pkcs/SignerInfo.java | 148 +++++++-------
 .../classes/sun/security/util/KeyUtil.java    |   4 +-
 .../sun/security/util/SignatureUtil.java      |  26 +--
 .../sun/security/x509/AlgorithmId.java        |  14 ++
 src/jdk.jartool/share/man/jarsigner.md        |  40 ++--
 .../pkcs/pkcs7/MLDSADigestConformance.java    | 105 ++++++++++
 .../sun/security/provider/acvp/Launcher.java  |   6 +-
 .../sun/security/provider/pqc/ML_DSA_CMS.java |  98 ++++++++++
 .../sun/security/tools/jarsigner/ML_DSA.java  | 181 ++++++++++++++++++
 .../lib/security/RepositoryFileReader.java    | 151 +++++++++++++++
 11 files changed, 717 insertions(+), 103 deletions(-)
 create mode 100644 test/jdk/sun/security/pkcs/pkcs7/MLDSADigestConformance.java
 create mode 100644 test/jdk/sun/security/provider/pqc/ML_DSA_CMS.java
 create mode 100644 test/jdk/sun/security/tools/jarsigner/ML_DSA.java
 create mode 100644 test/lib/jdk/test/lib/security/RepositoryFileReader.java

diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS7.java b/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
index 324cc3e7cec..a6cd5eba474 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -530,8 +530,23 @@ public class PKCS7 {
      * @exception SignatureException on signature handling errors.
      */
     public SignerInfo verify(SignerInfo info, byte[] bytes)
-    throws NoSuchAlgorithmException, SignatureException {
-        return info.verify(this, bytes);
+            throws NoSuchAlgorithmException, SignatureException {
+        return info.verify(this, bytes, null);
+    }
+
+    /**
+     * This verifies a given SignerInfo.
+     *
+     * @param info the signer information.
+     * @param bytes the DER encoded content information.
+     * @param cert certificate used to verify; find one inside the block if null
+     *
+     * @exception NoSuchAlgorithmException on unrecognized algorithms.
+     * @exception SignatureException on signature handling errors.
+     */
+    public SignerInfo verify(SignerInfo info, byte[] bytes, X509Certificate cert)
+            throws NoSuchAlgorithmException, SignatureException {
+        return info.verify(this, bytes, cert);
     }
 
     /**
@@ -715,6 +730,19 @@ public class PKCS7 {
         return this.oldStyle;
     }
 
+    // Generate signed data without a specified digAlgID.
+    public static byte[] generateSignedData(
+            String sigalg, Provider sigProvider,
+            PrivateKey privateKey, X509Certificate[] signerChain,
+            byte[] content, boolean internalsf, boolean directsign,
+            Function<byte[], PKCS9Attributes> ts)
+            throws SignatureException, InvalidKeyException, IOException,
+            NoSuchAlgorithmException {
+        return generateSignedData(sigalg, sigProvider, privateKey, signerChain,
+                content, internalsf, directsign,
+                null, ts);
+    }
+
     /**
      * Generate a PKCS7 data block.
      *
@@ -725,6 +753,7 @@ public class PKCS7 {
      * @param content the content to sign
      * @param internalsf whether the content should be included in output
      * @param directsign if the content is signed directly or through authattrs
+     * @param digAlgID digest alg to use; derive from other arguments if null
      * @param ts (optional) timestamper
      * @return the pkcs7 output in an array
      * @throws SignatureException if signing failed
@@ -736,14 +765,17 @@ public class PKCS7 {
             String sigalg, Provider sigProvider,
             PrivateKey privateKey, X509Certificate[] signerChain,
             byte[] content, boolean internalsf, boolean directsign,
+            AlgorithmId digAlgID,
             Function<byte[], PKCS9Attributes> ts)
                 throws SignatureException, InvalidKeyException, IOException,
                     NoSuchAlgorithmException {
 
         Signature signer = SignatureUtil.fromKey(sigalg, privateKey, sigProvider);
 
-        AlgorithmId digAlgID = SignatureUtil.getDigestAlgInPkcs7SignerInfo(
-                signer, sigalg, privateKey, signerChain[0].getPublicKey(), directsign);
+        if (digAlgID == null) {
+            digAlgID = SignatureUtil.getDigestAlgInPkcs7SignerInfo(
+                    signer, sigalg, privateKey, signerChain[0].getPublicKey(), directsign);
+        }
         AlgorithmId sigAlgID = SignatureUtil.fromSignature(signer, privateKey);
 
         PKCS9Attributes authAttrs = null;
@@ -751,8 +783,9 @@ public class PKCS7 {
             // MessageDigest
             byte[] md;
             String digAlgName = digAlgID.getName();
-            if (digAlgName.equals("SHAKE256") || digAlgName.equals("SHAKE256-LEN")) {
-                // No MessageDigest impl for SHAKE256 yet
+            if (digAlgName.equals("SHAKE256-LEN")) {
+                // We don't check the LEN here. Usually it is returned
+                // by SignatureUtil.getDigestAlgInPkcs7SignerInfo
                 var shaker = new SHAKE256(64);
                 shaker.update(content, 0, content.length);
                 md = shaker.digest();
diff --git a/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
index b1b8fea8353..36139d4f4a0 100644
--- a/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
+++ b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -303,15 +303,20 @@ public class SignerInfo implements DerEncoder {
         return certList;
     }
 
-    /* Returns null if verify fails, this signerInfo if
-       verify succeeds. */
-    SignerInfo verify(PKCS7 block, byte[] data)
-    throws NoSuchAlgorithmException, SignatureException {
+    /**
+     * Verify this signerInfo in a PKCS7 block.
+     *
+     * @param block the PKCS7 object
+     * @param data the content to verify against; read from block if null
+     * @param cert certificate to verify with; read from block if null
+     * @return null if verify fails, this signerInfo if verify succeeds.
+     */
+    SignerInfo verify(PKCS7 block, byte[] data, X509Certificate cert)
+            throws NoSuchAlgorithmException, SignatureException {
 
         try {
-            Timestamp timestamp = null;
             try {
-                timestamp = getTimestamp();
+                getTimestamp();
             } catch (Exception e) {
                 // Log exception and continue. This allows for the case
                 // where, if there are no other errors, the code is
@@ -356,22 +361,19 @@ public class SignerInfo implements DerEncoder {
                     return null;
 
                 byte[] computedMessageDigest;
-                if (digestAlgName.equals("SHAKE256")
-                        || digestAlgName.equals("SHAKE256-LEN")) {
-                    if (digestAlgName.equals("SHAKE256-LEN")) {
-                        // RFC8419: for EdDSA in CMS, the id-shake256-len
-                        // algorithm id must contain parameter value 512
-                        // encoded as a positive integer value
-                        byte[] params = digestAlgorithmId.getEncodedParams();
-                        if (params == null) {
-                            throw new SignatureException(
-                                    "id-shake256-len oid missing length");
-                        }
-                        int v = new DerValue(params).getInteger();
-                        if (v != 512) {
-                            throw new SignatureException(
-                                    "Unsupported id-shake256-" + v);
-                        }
+                if (digestAlgName.equals("SHAKE256-LEN")) {
+                    // RFC8419: for EdDSA in CMS, the id-shake256-len
+                    // algorithm id must contain parameter value 512
+                    // encoded as a positive integer value
+                    byte[] params = digestAlgorithmId.getEncodedParams();
+                    if (params == null) {
+                        throw new SignatureException(
+                                "id-shake256-len oid missing length");
+                    }
+                    int v = new DerValue(params).getInteger();
+                    if (v != 512) {
+                        throw new SignatureException(
+                                "Unsupported id-shake256-" + v);
                     }
                     var md = new SHAKE256(64);
                     md.update(data, 0, data.length);
@@ -410,9 +412,11 @@ public class SignerInfo implements DerEncoder {
                         "SignerInfo digestEncryptionAlgorithm field", true));
             }
 
-            X509Certificate cert = getCertificate(block);
             if (cert == null) {
-                return null;
+                cert = getCertificate(block);
+                if (cert == null) {
+                    return null;
+                }
             }
             PublicKey key = cert.getPublicKey();
 
@@ -503,29 +507,59 @@ public class SignerInfo implements DerEncoder {
                 }
 
                 if (!AlgorithmId.get(spec.getDigestAlgorithm()).equals(digAlgId)) {
-                    throw new NoSuchAlgorithmException("Incompatible digest algorithm");
+                    throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
                 }
                 break;
             case "Ed25519":
-                if (!digAlgId.equals(SignatureUtil.EdDSADigestAlgHolder.sha512)) {
-                    throw new NoSuchAlgorithmException("Incompatible digest algorithm");
+                if (!digAlgId.equalsOID(AlgorithmId.SHA512_oid)) {
+                    throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
                 }
                 break;
             case "Ed448":
                 if (directSign) {
-                    if (!digAlgId.equals(SignatureUtil.EdDSADigestAlgHolder.shake256)) {
-                        throw new NoSuchAlgorithmException("Incompatible digest algorithm");
+                    if (!digAlgId.equalsOID(AlgorithmId.SHAKE256_512_oid)) {
+                        throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
                     }
                 } else {
-                    if (!digAlgId.equals(SignatureUtil.EdDSADigestAlgHolder.shake256$512)) {
-                        throw new NoSuchAlgorithmException("Incompatible digest algorithm");
+                    if (!digAlgId.equals(SignatureUtil.DigestAlgHolder.shake256lenWith512)) {
+                        throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
                     }
                 }
                 break;
             case "HSS/LMS":
                 // RFC 8708 requires the same hash algorithm used as in the HSS/LMS algorithm
-                if (!digAlgId.equals(AlgorithmId.get(KeyUtil.hashAlgFromHSS(key)))) {
-                    throw new NoSuchAlgorithmException("Incompatible digest algorithm");
+                if (!digAlgId.equalsOID(KeyUtil.hashAlgFromHSS(key))) {
+                    throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
+                }
+                break;
+            case "ML-DSA-44":
+                // Following 3 from Table 1 inside
+                // https://datatracker.ietf.org/doc/html/rfc9882#name-signerinfo-content
+                if (!digAlgId.equalsOID(AlgorithmId.SHA256_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA384_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA512_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA3_256_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA3_384_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA3_512_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHAKE128_256_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHAKE256_512_oid)) {
+                    throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
+                }
+                break;
+            case "ML-DSA-65":
+                if (!digAlgId.equalsOID(AlgorithmId.SHA384_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA512_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA3_384_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA3_512_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHAKE256_512_oid)) {
+                    throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
+                }
+                break;
+            case "ML-DSA-87":
+                if (!digAlgId.equalsOID(AlgorithmId.SHA512_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHA3_512_oid)
+                        && !digAlgId.equalsOID(AlgorithmId.SHAKE256_512_oid)) {
+                    throw new NoSuchAlgorithmException("Incompatible digest algorithm " + digAlgId);
                 }
                 break;
         }
@@ -538,9 +572,9 @@ public class SignerInfo implements DerEncoder {
      * The digest algorithm is in the form "DIG", and the encryption
      * algorithm can be in any of the 3 forms:
      *
-     * 1. Old style key algorithm like RSA, DSA, EC, this method returns
+     * 1. Simple key algorithm like RSA, DSA, EC, this method returns
      *    DIGwithKEY.
-     * 2. New style signature algorithm in the form of HASHwithKEY, this
+     * 2. Traditional signature algorithm in the form of HASHwithKEY, this
      *    method returns DIGwithKEY. Please note this is not HASHwithKEY.
      * 3. Modern signature algorithm like RSASSA-PSS and EdDSA, this method
      *    returns the signature algorithm itself.
@@ -550,40 +584,26 @@ public class SignerInfo implements DerEncoder {
      */
     public static String makeSigAlg(AlgorithmId digAlgId, AlgorithmId encAlgId) {
         String encAlg = encAlgId.getName();
-        switch (encAlg) {
-            case "RSASSA-PSS":
-            case "Ed25519":
-            case "Ed448":
-            case "HSS/LMS":
-                return encAlg;
-            default:
-                String digAlg = digAlgId.getName();
-                String keyAlg = SignatureUtil.extractKeyAlgFromDwithE(encAlg);
-                if (keyAlg == null) {
-                    // The encAlg used to be only the key alg
-                    keyAlg = encAlg;
-                }
-                if (digAlg.startsWith("SHA-")) {
-                    digAlg = "SHA" + digAlg.substring(4);
-                }
-                if (keyAlg.equals("EC")) keyAlg = "ECDSA";
-                String sigAlg = digAlg + "with" + keyAlg;
-                try {
-                    Signature.getInstance(sigAlg);
-                    return sigAlg;
-                } catch (NoSuchAlgorithmException e) {
-                    // Possibly an unknown modern signature algorithm,
-                    // in this case, encAlg should already be a signature
-                    // algorithm.
-                    return encAlg;
-                }
+        String keyAlg = SignatureUtil.extractKeyAlgFromDwithE(encAlg);
+        if (keyAlg == null) { // No "WITH" inside
+            if (encAlg.equals("RSA") || encAlg.equals("DSA") || encAlg.equals("EC")) {
+                keyAlg = encAlg; // Sometimes encAlgId is just the enc alg
+            } else {
+                return encAlg; // Must be a modern algorithm like EdDSA or ML-DSA
+            }
         }
+        String digAlg = digAlgId.getName();
+        if (digAlg.startsWith("SHA-")) {
+            digAlg = "SHA" + digAlg.substring(4);
+        }
+        if (keyAlg.equals("EC")) keyAlg = "ECDSA";
+        return digAlg + "with" + keyAlg;
     }
 
     /* Verify the content of the pkcs7 block. */
     SignerInfo verify(PKCS7 block)
         throws NoSuchAlgorithmException, SignatureException {
-        return verify(block, null);
+        return verify(block, null, null);
     }
 
     public BigInteger getVersion() {
diff --git a/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index dd27b5f02d8..ccc72ea6ea2 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -431,7 +431,7 @@ public final class KeyUtil {
      * @return the hash algorithm
      * @throws NoSuchAlgorithmException if key is from an unknown configuration
      */
-    public static String hashAlgFromHSS(PublicKey publicKey)
+    public static ObjectIdentifier hashAlgFromHSS(PublicKey publicKey)
             throws NoSuchAlgorithmException {
         try {
             DerValue val = new DerValue(publicKey.getEncoded());
@@ -450,7 +450,7 @@ public final class KeyUtil {
                     + ((rawKey[6] & 0xff) << 8) + (rawKey[7] & 0xff);
             return switch (num) {
                 // RFC 8554 only supports SHA_256 hash algorithm
-                case 5, 6, 7, 8, 9 -> "SHA-256";
+                case 5, 6, 7, 8, 9 -> AlgorithmId.SHA256_oid;
                 default -> throw new NoSuchAlgorithmException("Unknown LMS type: " + num);
             };
         } catch (IOException e) {
diff --git a/src/java.base/share/classes/sun/security/util/SignatureUtil.java b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
index 05cad48c042..000051a702c 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureUtil.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,16 +190,16 @@ public class SignatureUtil {
         SharedSecrets.getJavaSecuritySignatureAccess().initSign(s, key, params, sr);
     }
 
-    public static class EdDSADigestAlgHolder {
+    public static class DigestAlgHolder {
         public static final AlgorithmId sha512;
-        public static final AlgorithmId shake256;
-        public static final AlgorithmId shake256$512;
+        public static final AlgorithmId shake256_512;
+        public static final AlgorithmId shake256lenWith512;
 
         static {
             try {
-                sha512 = new AlgorithmId(ObjectIdentifier.of(KnownOIDs.SHA_512));
-                shake256 = new AlgorithmId(ObjectIdentifier.of(KnownOIDs.SHAKE256_512));
-                shake256$512 = new AlgorithmId(
+                sha512 = new AlgorithmId(AlgorithmId.SHA512_oid);
+                shake256_512 = new AlgorithmId(AlgorithmId.SHAKE256_512_oid);
+                shake256lenWith512 = new AlgorithmId(
                         ObjectIdentifier.of(KnownOIDs.SHAKE256_LEN),
                         new DerValue((byte) 2, new byte[]{2, 0})); // int 512
             } catch (IOException e) {
@@ -233,18 +233,22 @@ public class SignatureUtil {
             // https://www.rfc-editor.org/rfc/rfc8419.html#section-3
             switch (kAlg.toUpperCase(Locale.ENGLISH)) {
                 case "ED25519":
-                    digAlgID = EdDSADigestAlgHolder.sha512;
+                    digAlgID = DigestAlgHolder.sha512;
                     break;
                 case "ED448":
                     if (directsign) {
-                        digAlgID = EdDSADigestAlgHolder.shake256;
+                        digAlgID = DigestAlgHolder.shake256_512;
                     } else {
-                        digAlgID = EdDSADigestAlgHolder.shake256$512;
+                        digAlgID = DigestAlgHolder.shake256lenWith512;
                     }
                     break;
                 default:
                     throw new AssertionError("Unknown curve name: " + kAlg);
             }
+        } else if (kAlg.toUpperCase(Locale.ENGLISH).startsWith("ML-DSA")) {
+            // https://datatracker.ietf.org/doc/html/rfc9882#name-signerinfo-content
+            // Just use SHA-512
+            digAlgID = DigestAlgHolder.sha512;
         } else if (sigalg.equalsIgnoreCase("RSASSA-PSS")) {
             try {
                 digAlgID = AlgorithmId.get(signer.getParameters()
@@ -254,7 +258,7 @@ public class SignatureUtil {
                 throw new AssertionError("Should not happen", e);
             }
         } else if (sigalg.equalsIgnoreCase("HSS/LMS")) {
-            digAlgID = AlgorithmId.get(KeyUtil.hashAlgFromHSS(publicKey));
+            digAlgID = new AlgorithmId(KeyUtil.hashAlgFromHSS(publicKey));
         } else {
             digAlgID = AlgorithmId.get(extractDigestAlgFromDwithE(sigalg));
         }
diff --git a/src/java.base/share/classes/sun/security/x509/AlgorithmId.java b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
index 8d2c761a011..7cbb5484b37 100644
--- a/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
+++ b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
@@ -307,6 +307,14 @@ public class AlgorithmId implements Serializable, DerEncoder {
             Arrays.equals(encodedParams, other.encodedParams);
     }
 
+    /**
+     * Returns true if this AlgorithmID only has the specified ObjectIdentifier
+     * and a NULL params. Note the encoded params might be ASN.1 NULL or absent.
+     */
+    public boolean equalsOID(ObjectIdentifier oid) {
+        return algid.equals(oid) && encodedParams == null;
+    }
+
     /**
      * Compares this AlgorithmID to another.  If algorithm parameters are
      * available, they are compared.  Otherwise, just the object IDs
@@ -628,6 +636,12 @@ public class AlgorithmId implements Serializable, DerEncoder {
     public static final ObjectIdentifier SHA3_512_oid =
             ObjectIdentifier.of(KnownOIDs.SHA3_512);
 
+    public static final ObjectIdentifier SHAKE128_256_oid =
+            ObjectIdentifier.of(KnownOIDs.SHAKE128_256);
+
+    public static final ObjectIdentifier SHAKE256_512_oid =
+            ObjectIdentifier.of(KnownOIDs.SHAKE256_512);
+
     public static final ObjectIdentifier DSA_oid =
             ObjectIdentifier.of(KnownOIDs.DSA);
 
diff --git a/src/jdk.jartool/share/man/jarsigner.md b/src/jdk.jartool/share/man/jarsigner.md
index 2c921775505..0ecc159a037 100644
--- a/src/jdk.jartool/share/man/jarsigner.md
+++ b/src/jdk.jartool/share/man/jarsigner.md
@@ -255,29 +255,35 @@ the private key:
 
 Table: Default Signature Algorithms and Block File Extensions
 
-keyalg      key size    default sigalg              block file extension
--------     --------    --------------              --------------------
-DSA         any size    SHA256withDSA               .DSA
-RSA         \< 624      SHA256withRSA               .RSA
-            \<= 7680    SHA384withRSA
-            \> 7680     SHA512withRSA
-EC          \< 512      SHA384withECDSA             .EC
-            \>= 512     SHA512withECDSA
-RSASSA-PSS  \< 624      RSASSA-PSS (with SHA-256)   .RSA
-            \<= 7680    RSASSA-PSS (with SHA-384)
-            \> 7680     RSASSA-PSS (with SHA-512)
-EdDSA       255         Ed25519                     .EC
-            448         Ed448
--------     --------    --------------              ------
+keyalg          key size    default sigalg              block file extension
+-------         --------    --------------              --------------------
+DSA             any size    SHA256withDSA               .DSA
+RSA             \< 624      SHA256withRSA               .RSA
+                \<= 7680    SHA384withRSA
+                \> 7680     SHA512withRSA
+EC              \< 512      SHA384withECDSA             .EC
+                \>= 512     SHA512withECDSA
+RSASSA-PSS^1^   \< 624      RSASSA-PSS (with SHA-256)   .RSA
+                \<= 7680    RSASSA-PSS (with SHA-384)
+                \> 7680     RSASSA-PSS (with SHA-512)
+EdDSA^2^                    EdDSA                       .EC
+ML-DSA^2^                   ML-DSA                      .DSA
+-------         --------    --------------              ------
 
-* If an RSASSA-PSS key is encoded with parameters, then jarsigner will use the
+1. If an RSASSA-PSS key is encoded with parameters, then jarsigner will use the
 same parameters in the signature. Otherwise, jarsigner will use parameters that
 are determined by the size of the key as specified in the table above.
 For example, an 3072-bit RSASSA-PSS key will use RSASSA-PSS as the signature
 algorithm and SHA-384 as the hash and MGF1 algorithms.
 
-* If a key algorithm is not listed in this table, the `.DSA` extension
-is used when signing a JAR file.
+2. Modern digital signature algorithms such as EdDSA and ML-DSA use the same
+name for both the key and signature algorithms. Only the signature algorithm
+with the same name can be used with a given key algorithm. The specific
+signature parameter set (for example, Ed25519 or Ed448 for EdDSA) is the
+same as that of the key.
+
+If a key algorithm is not listed in this table, the `.DSA` block file extension
+is always used.
 
 These default signature algorithms can be overridden by using the `-sigalg`
 option.
diff --git a/test/jdk/sun/security/pkcs/pkcs7/MLDSADigestConformance.java b/test/jdk/sun/security/pkcs/pkcs7/MLDSADigestConformance.java
new file mode 100644
index 00000000000..80aa0c96281
--- /dev/null
+++ b/test/jdk/sun/security/pkcs/pkcs7/MLDSADigestConformance.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8349732
+ * @summary ML-DSA digest alg conformance check
+ * @modules java.base/sun.security.pkcs
+ *          java.base/sun.security.tools.keytool
+ *          java.base/sun.security.x509
+ * @library /test/lib
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.pkcs.PKCS7;
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.x509.AlgorithmId;
+import sun.security.x509.X500Name;
+
+import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Map;
+
+public class MLDSADigestConformance {
+
+    static String[] ALL_KEY_ALGS = {"ML-DSA-44", "ML-DSA-65", "ML-DSA-87"};
+    static String[] ALL_DIGEST_ALGS = {
+            "SHA-1", "SHA-224", "SHA-256", "SHA-384", "SHA-512",
+            "SHA3-224", "SHA3-256", "SHA3-384", "SHA3-512",
+            "SHAKE128-256", "SHAKE256-512"};
+    static Map<String, List<String>> SUPPORTED = Map.of(
+            "ML-DSA-44", List.of("SHA-256", "SHA-384", "SHA-512",
+                    "SHA3-256", "SHA3-384", "SHA3-512",
+                    "SHAKE128-256", "SHAKE256-512"),
+            "ML-DSA-65", List.of("SHA-384", "SHA-512",
+                    "SHA3-384", "SHA3-512", "SHAKE256-512"),
+            "ML-DSA-87", List.of("SHA-512", "SHA3-512", "SHAKE256-512")
+    );
+
+    public static void main(String[] args) throws Exception {
+        testSig("ML-DSA-44");
+        testSig("ML-DSA-65");
+        testSig("ML-DSA-87");
+    }
+
+    static void testSig(String keyAlg) throws Exception {
+        System.out.println("Testing " + keyAlg);
+        var cag = new CertAndKeyGen(keyAlg, keyAlg);
+        cag.generate(keyAlg);
+        var sk = cag.getPrivateKey();
+        var certs = new X509Certificate[] {
+                cag.getSelfCertificate(new X500Name("CN=Me"), 1000)
+        };
+        var count = testDigest(keyAlg, sk, certs, null);
+        System.out.println("   digestAlg default: " + count);
+        Asserts.assertEQ(count, 1);
+        for (var da : ALL_DIGEST_ALGS) {
+            count = testDigest(keyAlg, sk, certs, da);
+            System.out.println("   digestAlg " + da + ": " + count);
+            if (SUPPORTED.get(keyAlg).contains(da)) {
+                Asserts.assertEQ(count, 1);
+            } else {
+                Asserts.assertEQ(count, 0);
+            }
+        }
+    }
+
+    static int testDigest(String keyAlg, PrivateKey sk,
+            X509Certificate[] certs, String digestAlg) throws Exception {
+        var content = "hello".getBytes(StandardCharsets.UTF_8);
+        var p7 = PKCS7.generateSignedData(keyAlg, null,
+                sk, certs,
+                content, true, false,
+                digestAlg == null ? null : AlgorithmId.get(digestAlg),
+                null);
+        try {
+            return new PKCS7(p7).verify(null).length;
+        } catch (NoSuchAlgorithmException e) {
+            return 0;
+        }
+    }
+}
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
index 2f25b370c11..680d1026275 100644
--- a/test/jdk/sun/security/provider/acvp/Launcher.java
+++ b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -37,15 +37,17 @@ import java.util.zip.ZipFile;
 /*
  * @test
  * @bug 8342442 8345057
+ * @summary Test default implementation. Use othervm because
+ *      ML_DSA_Impls.version might be modified
  * @library /test/lib
  * @modules java.base/sun.security.provider
- * @run main/timeout=480 Launcher
+ * @run main/othervm/timeout=480 Launcher
  */
 
 /*
  * @test
- * @summary Test verifying the intrinsic implementation.
  * @bug 8342442 8345057
+ * @summary Test verifying the intrinsic implementation.
  * @library /test/lib
  * @modules java.base/sun.security.provider
  * @run main/othervm/timeout=480 -Xcomp Launcher
diff --git a/test/jdk/sun/security/provider/pqc/ML_DSA_CMS.java b/test/jdk/sun/security/provider/pqc/ML_DSA_CMS.java
new file mode 100644
index 00000000000..f7469847b3f
--- /dev/null
+++ b/test/jdk/sun/security/provider/pqc/ML_DSA_CMS.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8349732
+ * @library /test/lib
+ * @summary Add support for JARs signed with ML-DSA
+ * @modules java.base/sun.security.pkcs
+ */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.security.RepositoryFileReader;
+import sun.security.pkcs.PKCS7;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Base64;
+import java.util.stream.Collectors;
+
+import static jdk.test.lib.security.RepositoryFileReader.*;
+
+public class ML_DSA_CMS {
+    public static void main(String[] args) throws Exception {
+        // Example signed-data encodings from RFC 9882, Appendix B
+        // (https://datatracker.ietf.org/doc/html/rfc9882#name-examples), which
+        // can be verified by example certificates from RFC 9881, Appendix C.3
+        // (https://datatracker.ietf.org/doc/html/rfc9881#name-example-certificates)
+        //
+        // These data can be retrieved from the following GitHub releases:
+        //   https://github.com/lamps-wg/cms-ml-dsa/releases/tag/draft-ietf-lamps-cms-ml-dsa-07
+        //   https://github.com/lamps-wg/dilithium-certificates/releases/tag/draft-ietf-lamps-dilithium-certificates-13
+        //
+        // Although the release tags include "draft", these values are the
+        // same as those in the final RFCs 9881 and 9882.
+        try (var cmsReader = RepositoryFileReader.of(CMS_ML_DSA.class,
+                    "cms-ml-dsa-draft-ietf-lamps-cms-ml-dsa-07/");
+            var dsaReader = RepositoryFileReader.of(DILITHIUM_CERTIFICATES.class,
+                    "dilithium-certificates-draft-ietf-lamps-dilithium-certificates-13/")) {
+            test(readCMS(cmsReader, "mldsa44-signed-attrs.pem"),
+                    readCert(dsaReader, "ML-DSA-44.crt"));
+            test(readCMS(cmsReader, "mldsa65-signed-attrs.pem"),
+                    readCert(dsaReader, "ML-DSA-65.crt"));
+            test(readCMS(cmsReader, "mldsa87-signed-attrs.pem"),
+                    readCert(dsaReader, "ML-DSA-87.crt"));
+        }
+    }
+
+    /// Verifies a signed file.
+    /// @param data the signed data in PKCS #7 format
+    /// @param cert the certificate used to verify
+    static void test(byte[] data, X509Certificate cert) throws Exception {
+        var p7 = new PKCS7(data);
+        for (var si : p7.getSignerInfos()) {
+            Asserts.assertTrue(p7.verify(si, null, cert).getIssuerName() != null);
+        }
+    }
+
+    // Read data in https://datatracker.ietf.org/doc/html/rfc9882#name-examples
+    static byte[] readCMS(RepositoryFileReader f, String entry) throws IOException  {
+        var data = f.read("examples/" + entry);
+        var pem = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data)))
+                .lines()
+                .filter(s -> !s.contains("-----"))
+                .collect(Collectors.joining());
+        return Base64.getMimeDecoder().decode(pem);
+    }
+
+    // Read data in https://datatracker.ietf.org/doc/html/rfc9881#name-example-certificates
+    static X509Certificate readCert(RepositoryFileReader f, String entry) throws Exception {
+        var data = f.read("examples/" + entry);
+        var cf = CertificateFactory.getInstance("X.509");
+        return (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(data));
+    }
+}
diff --git a/test/jdk/sun/security/tools/jarsigner/ML_DSA.java b/test/jdk/sun/security/tools/jarsigner/ML_DSA.java
new file mode 100644
index 00000000000..55758b761b3
--- /dev/null
+++ b/test/jdk/sun/security/tools/jarsigner/ML_DSA.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8298387
+ * @summary signing with ML-DSA
+ * @library /test/lib
+ * @modules java.base/sun.security.util
+ */
+
+import jdk.security.jarsigner.JarSigner;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.process.Proc;
+import jdk.test.lib.security.DerUtils;
+import jdk.test.lib.util.JarUtils;
+import sun.security.util.KnownOIDs;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+import java.util.List;
+import java.util.jar.JarFile;
+import java.util.zip.ZipFile;
+
+public class ML_DSA {
+
+    static List<String> SIGNERS = List.of("44", "65", "87");
+
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0) {
+            // Launched by testDisabled() in a sub-process to count signers
+            var expectedCount = Integer.parseInt(args[0]);
+            try (var jf = new JarFile("a.jar")) {
+                var je = jf.getJarEntry("a");
+                jf.getInputStream(je).readAllBytes();
+                var signers = je.getCodeSigners();
+                var count = signers == null ? 0 : signers.length;
+                if (expectedCount != count) {
+                    throw new RuntimeException("Expected: " + expectedCount
+                            + ", actual " + count);
+                }
+            }
+        } else {
+            prepare();
+            testAPI();
+            testTool(); // call this last, as it modifies a.jar.
+            testDisabled();
+        }
+    }
+
+    private static void prepare() throws Exception {
+        for (var signer : SIGNERS) {
+            SecurityTools.keytool("-keystore ks -storepass changeit -genkeypair -alias "
+                            + signer + " -keyalg ML-DSA-" + signer + " -dname CN=" + signer)
+                    .shouldHaveExitValue(0);
+        }
+        JarUtils.createJarFile(Path.of("a.jar"), Path.of("."),
+                Files.write(Path.of("a"), new byte[10]));
+    }
+
+    static void testAPI() throws Exception {
+        var pass = "changeit".toCharArray();
+        var ks = KeyStore.getInstance(new File("ks"), pass);
+        for (var signer : SIGNERS) {
+            var jsb = new JarSigner.Builder((KeyStore.PrivateKeyEntry)
+                    ks.getEntry(signer, new KeyStore.PasswordProtection(pass)));
+            try (var zf = new ZipFile("a.jar");
+                 var of = Files.newOutputStream(Path.of(signer + ".jar"))) {
+                jsb.signerName(signer).build().sign(zf, of);
+            }
+            try (var jf = new JarFile(signer + ".jar")) {
+                var je = jf.getJarEntry("a");
+                jf.getInputStream(je).readAllBytes();
+                Asserts.assertEquals(1, je.getCodeSigners().length);
+                checkDigestAlgorithm(jf, signer, KnownOIDs.SHA_512);
+            }
+        }
+    }
+
+    static void testTool() throws Exception {
+        for (var signer : SIGNERS) {
+            SecurityTools.jarsigner("-keystore ks -storepass changeit a.jar " + signer)
+                    .shouldHaveExitValue(0);
+        }
+        SecurityTools.jarsigner("-verify a.jar -verbose -certs")
+                .shouldHaveExitValue(0)
+                .shouldContain("jar verified");
+
+        try (var jf = new JarFile("a.jar")) {
+            var je = jf.getJarEntry("a");
+            jf.getInputStream(je).readAllBytes();
+            Asserts.assertEquals(3, je.getCodeSigners().length);
+            for (var signer : SIGNERS) {
+                checkDigestAlgorithm(jf, signer, KnownOIDs.SHA_512);
+            }
+        }
+    }
+
+    static void testDisabled() throws Exception {
+
+        // All disabled
+        Files.writeString(Paths.get("my.security"),
+                "jdk.jar.disabledAlgorithms=ML-DSA");
+        SecurityTools.jarsigner("-J-Djava.security.properties=my.security" +
+                        " -keystore ks -storepass changeit" +
+                        " -verify a.jar -verbose -certs -strict")
+                .shouldHaveExitValue(16)
+                .shouldContain("ML-DSA-44 key (disabled)")
+                .shouldContain("ML-DSA-65 key (disabled)")
+                .shouldContain("ML-DSA-87 key (disabled)")
+                .shouldContain("The jar will be treated as unsigned");
+        // Need to launch in a new process because security property is
+        // read at the beginning
+        Proc.create("ML_DSA")
+                .secprop("jdk.jar.disabledAlgorithms", "ML-DSA")
+                .args("0")
+                .start()
+                .waitFor(0);
+
+        // One disabled, one made weak
+        Files.writeString(Paths.get("my.security"), """
+                        jdk.jar.disabledAlgorithms=ML-DSA-44
+                        jdk.security.legacyAlgorithms=ML-DSA-65
+                        """);
+        SecurityTools.jarsigner("-J-Djava.security.properties=my.security" +
+                        " -keystore ks -storepass changeit" +
+                        " -verify a.jar -verbose -certs -strict")
+                .shouldHaveExitValue(0)
+                .shouldContain("ML-DSA-44 key (disabled)")
+                .shouldContain("ML-DSA-65 key (weak)")
+                .shouldContain("ML-DSA-87 key")
+                .shouldNotContain("ML-DSA-87 key (disabled)")
+                .shouldContain("jar verified.");
+        Proc.create("ML_DSA")
+                .secprop("jdk.jar.disabledAlgorithms", "ML-DSA-44")
+                .secprop("jdk.security.legacyAlgorithms", "ML-DSA-65")
+                .args("2") // weak still considered signer, disabled not
+                .start()
+                .waitFor(0);
+    }
+
+    static void checkDigestAlgorithm(JarFile jf, String alias, KnownOIDs digAlg)
+            throws Exception {
+        var p7 = jf.getInputStream(jf.getEntry("META-INF/" + alias + ".DSA"))
+                .readAllBytes();
+        // SignedData - digestAlgorithms
+        DerUtils.checkAlg(p7, "10100", digAlg);
+        // SignedData - signerInfos - digestAlgorithm
+        DerUtils.checkAlg(p7, "104020", digAlg);
+        // SignedData - signerInfos - signatureAlgorithm
+        DerUtils.checkAlg(p7, "104040", KnownOIDs.valueOf("ML_DSA_" + alias));
+        // SignedData - signerInfos - signedAttrs - CMSAlgorithmProtection - digestAlgorithm
+        DerUtils.checkAlg(p7, "1040321000", digAlg);
+        // SignedData - signerInfos - signedAttrs - CMSAlgorithmProtection - signatureAlgorithm
+        DerUtils.checkAlg(p7, "1040321010", KnownOIDs.valueOf("ML_DSA_" + alias));
+    }
+}
diff --git a/test/lib/jdk/test/lib/security/RepositoryFileReader.java b/test/lib/jdk/test/lib/security/RepositoryFileReader.java
new file mode 100644
index 00000000000..4eefc7d82db
--- /dev/null
+++ b/test/lib/jdk/test/lib/security/RepositoryFileReader.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.test.lib.security;
+
+import jdk.test.lib.artifacts.Artifact;
+import jdk.test.lib.artifacts.ArtifactResolver;
+import jdk.test.lib.artifacts.ArtifactResolverException;
+import jtreg.SkippedException;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+/// A helper class to read files from a code repository.
+///
+/// By default, the code repository is stored on the artifact server
+/// as a ZIP file.
+///
+/// Users can specify the "jdk.tests.repos.pattern" system property to read
+/// the files from an alternative location. The value of this system property
+/// represents the URL for each file entry where:
+/// - "%o" maps to the last part of [organization name][Artifact#organization()],
+/// - "%n" maps to [name][Artifact#name()],
+/// - "%r" maps to [version][Artifact#revision()],
+/// - "%e" maps to the name of the file entry to read.
+///
+/// For example, with the [CMS_ML_DSA] class inside this test:
+/// - The pattern `file:///Users/tester/repos/external/%o/%n/%e` resolves to
+///   a local file like `/Users/tester/repos/external/lamps-wg/cms-ml-dsa/entry`.
+/// - The pattern `https://raw.repos.com/%o/%n/%r/%e` resolves to
+///   `https://raw.repos.com/lamps-wg/cms-ml-dsa/c8f0cf7/entry`.
+///
+public sealed interface RepositoryFileReader extends AutoCloseable {
+
+    /// Reads the content of `entry` as a byte array.
+    byte[] read(String entry) throws IOException;
+
+    /// Overrides the method with a different exception type
+    /// to avoid compiler warnings about `InterruptedException`.
+    @Override
+    void close() throws IOException;
+
+    /// Returns a `RepositoryFileReader`.
+    /// @param klass the `Artifact` class
+    /// @param zipPrefix the prefix used in the ZIP file. See
+    ///         [ZipReader#ZipReader(ZipFile, String)].
+    static RepositoryFileReader of(Class<?> klass, String zipPrefix) {
+        Artifact artifact = klass.getAnnotation(Artifact.class);
+        var org = artifact.organization();
+        var prop = System.getProperty("jdk.tests.repos.pattern");
+        if (prop != null && org.startsWith("jpg.tests.jdk.repos.")) {
+            prop = prop.replace("%o", org.substring(org.lastIndexOf('.') + 1));
+            prop = prop.replace("%n", artifact.name());
+            prop = prop.replace("%r", artifact.revision());
+            System.out.println("Creating URLReader on " + prop);
+            return new URLReader(prop);
+        } else {
+            try {
+                Path p = ArtifactResolver.resolve(klass).entrySet().stream()
+                        .findAny().get().getValue();
+                System.out.println("Creating ZipReader on " + p);
+                return new ZipReader(new ZipFile(p.toFile()), zipPrefix);
+            } catch (ArtifactResolverException | IOException e) {
+                throw new SkippedException("Cannot find " + artifact.name(), e);
+            }
+        }
+    }
+
+    /// A `RepositoryFileReader` to read file from a URL.
+    /// @param base the base URL string, contains "%e" mapping to entry name
+    record URLReader(String base) implements RepositoryFileReader {
+        @Override
+        public void close() {
+            // nothing to do
+        }
+
+        @Override
+        public byte[] read(String entry) throws IOException {
+            System.out.println("Reading " + entry + "...");
+            try (var is = new URI(base.replace("%e", entry)).toURL().openStream()) {
+                return is.readAllBytes();
+            } catch (URISyntaxException e) {
+                throw new IOException("Cannot create URI", e);
+            }
+        }
+    }
+
+    /// A `RepositoryFileReader` to read file from a ZIP file.
+    /// @param zf the `ZipFile`
+    /// @param zipPrefix optional prefix string inside the ZIP file. For example,
+    ///     if an entry "folder/file" is represented as "archive/folder/file"
+    ///     inside the ZIP, "archive/" should be provided as `zipPrefix`.
+    record ZipReader(ZipFile zf, String zipPrefix) implements RepositoryFileReader {
+        @Override
+        public void close() throws IOException {
+            zf.close();
+        }
+
+        @Override
+        public byte[] read(String entry) throws IOException {
+            System.out.println("Reading " + entry + "...");
+            ZipEntry ze = zf.getEntry(zipPrefix + entry);
+            if (ze != null) {
+                return zf.getInputStream(ze).readAllBytes();
+            } else {
+                throw new RuntimeException("Entry not found: " + entry);
+            }
+        }
+    }
+
+    @Artifact(
+            organization = "jpg.tests.jdk.repos.lamps-wg",
+            name = "dilithium-certificates",
+            revision = "785a549",
+            extension = "zip",
+            unpack = false)
+    public static class DILITHIUM_CERTIFICATES {
+    }
+
+    @Artifact(
+            organization = "jpg.tests.jdk.repos.lamps-wg",
+            name = "cms-ml-dsa",
+            revision = "c8f0cf7",
+            extension = "zip",
+            unpack = false)
+    public static class CMS_ML_DSA {
+    }
+}

From 6e838d6f9a59e4f14d4d1a6d4ff6ea857c0615e9 Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Mon, 10 Nov 2025 14:57:27 +0000
Subject: [PATCH 111/512] 8371474: Wrong object class or methodID passed to JNI
 call in TestSharedCloseJvmti with -Xshare:off

Reviewed-by: alanb, mdoerr
---
 .../java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java | 5 +++--
 .../java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java b/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
index b7106da24e8..b2bfdd18b50 100644
--- a/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
+++ b/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
@@ -72,7 +72,6 @@ public class TestSharedCloseJvmti {
 
         static final CountDownLatch MAIN_LATCH = new CountDownLatch(1);
         static final CountDownLatch TARGET_LATCH = new CountDownLatch(1);
-        static final MemorySegment OTHER_SEGMENT = Arena.global().allocate(4);
 
         static volatile int SINK;
 
@@ -107,7 +106,9 @@ public class TestSharedCloseJvmti {
                 addFrames(0);
             } else {
                 reentrant = true;
-                SINK = OTHER_SEGMENT.get(ValueLayout.JAVA_INT, 0);
+                try (Arena arena = Arena.ofConfined()) {
+                    SINK = arena.allocate(4).get(ValueLayout.JAVA_INT, 0);
+                }
                 reentrant = false;
             }
         }
diff --git a/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp b/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
index 6406c46f61c..a82818e0280 100644
--- a/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
+++ b/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
@@ -35,7 +35,7 @@ static const char* TARGET_METHOD_SIG = "()V";
 static const char* INTERCEPT_CLASS_NAME = "Ljdk/internal/foreign/MemorySessionImpl;";
 static const char* INTERCEPT_METHOD_NAME = "checkValidStateRaw";
 
-void start(jvmtiEnv *jvmti_env, JNIEnv* jni_env) {
+void start(jvmtiEnv*, JNIEnv* jni_env, jthread) {
 
   jclass cls = jni_env->FindClass(TARGET_CLASS_NAME);
   if (cls == nullptr) {
@@ -111,7 +111,7 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
   }
 
   jvmtiEventCallbacks callbacks;
-  callbacks.VMStart = start;
+  callbacks.VMInit = start;
   callbacks.MethodExit = method_exit;
 
   err = env->SetEventCallbacks(&callbacks, (jint) sizeof(callbacks));
@@ -124,7 +124,7 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
     return err;
   }
 
-  err = env->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_START, nullptr);
+  err = env->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, nullptr);
   if (err != JVMTI_ERROR_NONE) {
     return err;
   }

From 72989e0fac7dae1bfec40e3017ba89aa201cc8ee Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 10 Nov 2025 15:56:49 +0000
Subject: [PATCH 112/512] 8340093: C2 SuperWord: implement cost model

Reviewed-by: kvn, qamai
---
 src/hotspot/cpu/aarch64/aarch64_vector.ad     |   14 +-
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4  |   14 +-
 src/hotspot/share/opto/superword.cpp          |  104 +-
 src/hotspot/share/opto/superword.hpp          |    2 -
 .../share/opto/traceAutoVectorizationTag.hpp  |    4 +-
 src/hotspot/share/opto/vectorization.cpp      |  104 +-
 src/hotspot/share/opto/vectorization.hpp      |   53 +-
 src/hotspot/share/opto/vtransform.cpp         |  173 +-
 src/hotspot/share/opto/vtransform.hpp         |   27 +
 .../compiler/c2/cr7200264/TestIntVect.java    |   10 +-
 ...utoVectorizationOverrideProfitability.java |   17 +-
 .../loopopts/superword/TestReductions.java    | 2452 +++++++++++++++++
 .../bench/vm/compiler/VectorReduction2.java   |    4 +
 13 files changed, 2884 insertions(+), 94 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java

diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 3379041b2cc..9809d096233 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -129,18 +129,24 @@ source %{
   bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
     if (UseSVE == 0) {
       // These operations are not profitable to be vectorized on NEON, because no direct
-      // NEON instructions support them. But the match rule support for them is profitable for
-      // Vector API intrinsics.
+      // NEON instructions support them. They use multiple instructions which is more
+      // expensive in almost all cases where we would auto vectorize.
+      // But the match rule support for them is profitable for Vector API intrinsics.
       if ((opcode == Op_VectorCastD2X && (bt == T_INT || bt == T_SHORT)) ||
           (opcode == Op_VectorCastL2X && bt == T_FLOAT) ||
           (opcode == Op_CountLeadingZerosV && bt == T_LONG) ||
           (opcode == Op_CountTrailingZerosV && bt == T_LONG) ||
+          opcode == Op_MulVL ||
           // The implementations of Op_AddReductionVD/F in Neon are for the Vector API only.
           // They are not suitable for auto-vectorization because the result would not conform
           // to the JLS, Section Evaluation Order.
+          // Note: we could implement sequential reductions for these reduction operators, but
+          //       this will still almost never lead to speedups, because the sequential
+          //       reductions are latency limited along the reduction chain, and not
+          //       throughput limited. This is unlike unordered reductions (associative op)
+          //       and element-wise ops which are usually throughput limited.
           opcode == Op_AddReductionVD || opcode == Op_AddReductionVF ||
-          opcode == Op_MulReductionVD || opcode == Op_MulReductionVF ||
-          opcode == Op_MulVL) {
+          opcode == Op_MulReductionVD || opcode == Op_MulReductionVF) {
         return false;
       }
     }
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 6d296cbdb3a..a9f42e1bc08 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -119,18 +119,24 @@ source %{
   bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
     if (UseSVE == 0) {
       // These operations are not profitable to be vectorized on NEON, because no direct
-      // NEON instructions support them. But the match rule support for them is profitable for
-      // Vector API intrinsics.
+      // NEON instructions support them. They use multiple instructions which is more
+      // expensive in almost all cases where we would auto vectorize.
+      // But the match rule support for them is profitable for Vector API intrinsics.
       if ((opcode == Op_VectorCastD2X && (bt == T_INT || bt == T_SHORT)) ||
           (opcode == Op_VectorCastL2X && bt == T_FLOAT) ||
           (opcode == Op_CountLeadingZerosV && bt == T_LONG) ||
           (opcode == Op_CountTrailingZerosV && bt == T_LONG) ||
+          opcode == Op_MulVL ||
           // The implementations of Op_AddReductionVD/F in Neon are for the Vector API only.
           // They are not suitable for auto-vectorization because the result would not conform
           // to the JLS, Section Evaluation Order.
+          // Note: we could implement sequential reductions for these reduction operators, but
+          //       this will still almost never lead to speedups, because the sequential
+          //       reductions are latency limited along the reduction chain, and not
+          //       throughput limited. This is unlike unordered reductions (associative op)
+          //       and element-wise ops which are usually throughput limited.
           opcode == Op_AddReductionVD || opcode == Op_AddReductionVF ||
-          opcode == Op_MulReductionVD || opcode == Op_MulReductionVF ||
-          opcode == Op_MulVL) {
+          opcode == Op_MulReductionVD || opcode == Op_MulReductionVF) {
         return false;
       }
     }
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index cc4a94aa054..7a2e6bc7fbd 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -42,9 +42,7 @@ SuperWord::SuperWord(const VLoopAnalyzer &vloop_analyzer) :
            ),
   _vpointer_for_main_loop_alignment(nullptr),
   _aw_for_main_loop_alignment(0),
-  _do_vector_loop(phase()->C->do_vector_loop()),            // whether to do vectorization/simd style
-  _num_work_vecs(0),                                        // amount of vector work we have
-  _num_reductions(0)                                        // amount of reduction work we have
+  _do_vector_loop(phase()->C->do_vector_loop())             // whether to do vectorization/simd style
 {
 }
 
@@ -1567,18 +1565,6 @@ void SuperWord::filter_packs_for_implemented() {
 
 // Remove packs that are not profitable.
 void SuperWord::filter_packs_for_profitable() {
-  // Count the number of reductions vs other vector ops, for the
-  // reduction profitability heuristic.
-  for (int i = 0; i < _packset.length(); i++) {
-    Node_List* pack = _packset.at(i);
-    Node* n = pack->at(0);
-    if (is_marked_reduction(n)) {
-      _num_reductions++;
-    } else {
-      _num_work_vecs++;
-    }
-  }
-
   // Remove packs that are not profitable
   auto filter = [&](const Node_List* pack) {
     return profitable(pack);
@@ -1595,31 +1581,7 @@ bool SuperWord::implemented(const Node_List* pack, const uint size) const {
   if (p0 != nullptr) {
     int opc = p0->Opcode();
     if (is_marked_reduction(p0)) {
-      const Type *arith_type = p0->bottom_type();
-      // This heuristic predicts that 2-element reductions for INT/LONG are not
-      // profitable. This heuristic was added in JDK-8078563. The argument
-      // was that reductions are not just a single instruction, but multiple, and
-      // hence it is not directly clear that they are profitable. If we only have
-      // two elements per vector, then the performance gains from non-reduction
-      // vectors are at most going from 2 scalar instructions to 1 vector instruction.
-      // But a 2-element reduction vector goes from 2 scalar instructions to
-      // 3 instructions (1 shuffle and two reduction ops).
-      // However, this optimization assumes that these reductions stay in the loop
-      // which may not be true any more in most cases after the introduction of:
-      // See: VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop
-      // Hence, this heuristic has room for improvement.
-      bool is_two_element_int_or_long_reduction = (size == 2) &&
-                                                  (arith_type->basic_type() == T_INT ||
-                                                   arith_type->basic_type() == T_LONG);
-      if (is_two_element_int_or_long_reduction && AutoVectorizationOverrideProfitability != 2) {
-#ifndef PRODUCT
-        if (is_trace_superword_rejections()) {
-          tty->print_cr("\nPerformance heuristic: 2-element INT/LONG reduction not profitable.");
-          tty->print_cr("  Can override with AutoVectorizationOverrideProfitability=2");
-        }
-#endif
-        return false;
-      }
+      const Type* arith_type = p0->bottom_type();
       retValue = ReductionNode::implemented(opc, size, arith_type->basic_type());
     } else if (VectorNode::is_convert_opcode(opc)) {
       retValue = VectorCastNode::implemented(opc, size, velt_basic_type(p0->in(1)), velt_basic_type(p0));
@@ -1791,26 +1753,6 @@ bool SuperWord::profitable(const Node_List* p) const {
       // The second input has to be the vector we wanted to reduce,
       // but it was not packed.
       return false;
-    } else if (_num_work_vecs == _num_reductions && AutoVectorizationOverrideProfitability != 2) {
-      // This heuristic predicts that the reduction is not profitable.
-      // Reduction vectors can be expensive, because they require multiple
-      // operations to fold all the lanes together. Hence, vectorizing the
-      // reduction is not profitable on its own. Hence, we need a lot of
-      // other "work vectors" that deliver performance improvements to
-      // balance out the performance loss due to reductions.
-      // This heuristic is a bit simplistic, and assumes that the reduction
-      // vector stays in the loop. But in some cases, we can move the
-      // reduction out of the loop, replacing it with a single vector op.
-      // See: VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop
-      // Hence, this heuristic has room for improvement.
-#ifndef PRODUCT
-        if (is_trace_superword_rejections()) {
-          tty->print_cr("\nPerformance heuristic: not enough vectors in the loop to make");
-          tty->print_cr("  reduction profitable.");
-          tty->print_cr("  Can override with AutoVectorizationOverrideProfitability=2");
-        }
-#endif
-      return false;
     } else if (second_pk->size() != p->size()) {
       return false;
     }
@@ -1969,19 +1911,53 @@ bool SuperWord::do_vtransform() const {
   vtransform.optimize();
 
   if (!vtransform.schedule()) { return false; }
-  if (vtransform.has_store_to_load_forwarding_failure()) { return false; }
+
+  if (!vtransform.is_profitable()) { return false; }
+
+  vtransform.apply();
+  return true;
+}
+
+// Check Cost-Model, and other heuristics.
+// Can be overridden with AutoVectorizationOverrideProfitability.
+bool VTransform::is_profitable() const {
+  assert(_graph.is_scheduled(), "must already be scheduled");
 
   if (AutoVectorizationOverrideProfitability == 0) {
 #ifndef PRODUCT
-    if (is_trace_superword_any()) {
+    if (_trace._info) {
       tty->print_cr("\nForced bailout of vectorization (AutoVectorizationOverrideProfitability=0).");
     }
 #endif
     return false;
   }
 
-  vtransform.apply();
-  return true;
+  if (AutoVectorizationOverrideProfitability == 2) {
+#ifndef PRODUCT
+    if (_trace._info) {
+      tty->print_cr("\nForced vectorization, ignoring profitability (AutoVectorizationOverrideProfitability=2).");
+    }
+#endif
+    return true;
+  }
+
+  // Note: currently we only do throughput-based cost-modeling. In the future, we could
+  //       also implement latency-based cost-modeling and take store-to-load-forwarding
+  //       failures into account as the latency between the load and store. This would
+  //       allow a more precise tradeoff between the forwarding failure penalty versus
+  //       the vectorization gains.
+  if (has_store_to_load_forwarding_failure()) { return false; }
+
+  // Cost-model
+  float scalar_cost = _vloop_analyzer.cost_for_scalar_loop();
+  float vector_cost = cost_for_vector_loop();
+#ifndef PRODUCT
+  if (_trace._info) {
+    tty->print_cr("\nVTransform: scalar_cost = %.2f vs vector_cost = %.2f",
+                  scalar_cost, vector_cost);
+  }
+#endif
+  return vector_cost < scalar_cost;
 }
 
 // Apply the vectorization, i.e. we irreversibly edit the C2 graph. At this point, all
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index 118e0aa042c..9654465220b 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -549,8 +549,6 @@ class SuperWord : public ResourceObj {
 
  private:
   bool           _do_vector_loop;  // whether to do vectorization/simd style
-  int            _num_work_vecs;   // Number of non memory vector operations
-  int            _num_reductions;  // Number of reduction expressions applied
 
   // Accessors
   Arena* arena()                   { return &_arena; }
diff --git a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
index d996173aeb4..4f67aff9b07 100644
--- a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
+++ b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
@@ -38,7 +38,7 @@
   flags(MEMORY_SLICES,              "Trace VLoopMemorySlices") \
   flags(BODY,                       "Trace VLoopBody") \
   flags(TYPES,                      "Trace VLoopTypes") \
-  flags(POINTERS,                   "Trace VLoopPointers") \
+  flags(POINTERS,                   "Trace VLoopVPointers") \
   flags(DEPENDENCY_GRAPH,           "Trace VLoopDependencyGraph") \
   flags(SW_ADJACENT_MEMOPS,         "Trace SuperWord::find_adjacent_memop_pairs") \
   flags(SW_REJECTIONS,              "Trace SuperWord rejections (non vectorizations)") \
@@ -47,6 +47,8 @@
   flags(SW_VERBOSE,                 "Trace SuperWord verbose (all SW tags enabled)") \
   flags(VTRANSFORM,                 "Trace VTransform Graph") \
   flags(OPTIMIZATION,               "Trace VTransform::optimize") \
+  flags(COST,                       "Trace cost of VLoop (scalar) and VTransform (vector)") \
+  flags(COST_VERBOSE,               "Trace like COST, but more verbose") \
   flags(ALIGN_VECTOR,               "Trace AlignVector") \
   flags(SPECULATIVE_ALIASING_ANALYSIS, "Trace Speculative Aliasing Analysis") \
   flags(SPECULATIVE_RUNTIME_CHECKS, "Trace VTransform::apply_speculative_runtime_checks") \
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 5c4e15fdbb9..98f3d79c9f5 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -287,7 +287,7 @@ void VLoopVPointers::compute_and_cache_vpointers() {
   int pointers_idx = 0;
   _body.for_each_mem([&] (MemNode* const mem, int bb_idx) {
     // Placement new: construct directly into the array.
-    ::new (&_vpointers[pointers_idx]) VPointer(mem, _vloop);
+    ::new (&_vpointers[pointers_idx]) VPointer(mem, _vloop, _pointer_expression_nodes);
     _bb_idx_to_vpointer.at_put(bb_idx, pointers_idx);
     pointers_idx++;
   });
@@ -541,6 +541,108 @@ void VLoopDependencyGraph::PredsIterator::next() {
   }
 }
 
+// Cost-model heuristic for nodes that do not contribute to computational
+// cost inside the loop.
+bool VLoopAnalyzer::has_zero_cost(Node* n) const {
+  // Outside body?
+  if (!_vloop.in_bb(n)) { return true; }
+
+  // Internal nodes of pointer expressions are most likely folded into
+  // the load / store and have no additional cost.
+  if (vpointers().is_in_pointer_expression(n)) { return true; }
+
+  // Not all AddP nodes can be detected in VPointer parsing, so
+  // we filter them out here.
+  // We don't want to explicitly model the cost of control flow,
+  // since we have the same CFG structure before and after
+  // vectorization: A loop head, a loop exit, with a backedge.
+  if (n->is_AddP() || // Pointer expression
+      n->is_CFG() ||  // CFG
+      n->is_Phi() ||  // CFG
+      n->is_Cmp() ||  // CFG
+      n->is_Bool()) { // CFG
+    return true;
+  }
+
+  // All other nodes have a non-zero cost.
+  return false;
+}
+
+// Compute the cost over all operations in the (scalar) loop.
+float VLoopAnalyzer::cost_for_scalar_loop() const {
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("\nVLoopAnalyzer::cost_for_scalar_loop:");
+  }
+#endif
+
+  float sum = 0;
+  for (int j = 0; j < body().body().length(); j++) {
+    Node* n = body().body().at(j);
+    if (!has_zero_cost(n)) {
+      float c = cost_for_scalar_node(n->Opcode());
+      sum += c;
+#ifndef PRODUCT
+      if (_vloop.is_trace_cost_verbose()) {
+        tty->print_cr("  -> cost = %.2f for %d %s", c, n->_idx, n->Name());
+      }
+#endif
+    }
+  }
+
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("  total_cost = %.2f", sum);
+  }
+#endif
+  return sum;
+}
+
+// For now, we use unit cost. We might refine that in the future.
+// If needed, we could also use platform specific costs, if the
+// default here is not accurate enough.
+float VLoopAnalyzer::cost_for_scalar_node(int opcode) const {
+  float c = 1;
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("  cost = %.2f opc=%s", c, NodeClassNames[opcode]);
+  }
+#endif
+  return c;
+}
+
+// For now, we use unit cost. We might refine that in the future.
+// If needed, we could also use platform specific costs, if the
+// default here is not accurate enough.
+float VLoopAnalyzer::cost_for_vector_node(int opcode, int vlen, BasicType bt) const {
+  float c = 1;
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("  cost = %.2f opc=%s vlen=%d bt=%s",
+                  c, NodeClassNames[opcode], vlen, type2name(bt));
+  }
+#endif
+  return c;
+}
+
+// For now, we use unit cost, i.e. we count the number of backend instructions
+// that the vtnode will use. We might refine that in the future.
+// If needed, we could also use platform specific costs, if the
+// default here is not accurate enough.
+float VLoopAnalyzer::cost_for_vector_reduction_node(int opcode, int vlen, BasicType bt, bool requires_strict_order) const {
+  // Each reduction is composed of multiple instructions, each estimated with a unit cost.
+  //                                Linear: shuffle and reduce    Recursive: shuffle and reduce
+  float c = requires_strict_order ? 2 * vlen                    : 2 * exact_log2(vlen);
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("  cost = %.2f opc=%s vlen=%d bt=%s requires_strict_order=%s",
+                  c, NodeClassNames[opcode], vlen, type2name(bt),
+                  requires_strict_order ? "true" : "false");
+  }
+#endif
+  return c;
+}
+
 // Computing aliasing runtime check using init and last of main-loop
 // -----------------------------------------------------------------
 //
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index b1be52d531a..f7099b5b7c0 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -209,6 +209,14 @@ public:
     return _vtrace.is_trace(TraceAutoVectorizationTag::OPTIMIZATION);
   }
 
+  bool is_trace_cost() const {
+    return _vtrace.is_trace(TraceAutoVectorizationTag::COST);
+  }
+
+  bool is_trace_cost_verbose() const {
+    return _vtrace.is_trace(TraceAutoVectorizationTag::COST_VERBOSE);
+  }
+
   bool is_trace_speculative_runtime_checks() const {
     return _vtrace.is_trace(TraceAutoVectorizationTag::SPECULATIVE_RUNTIME_CHECKS);
   }
@@ -584,6 +592,32 @@ private:
   const Type* container_type(Node* n) const;
 };
 
+// Mark all nodes from the loop that are part of any VPointer expression.
+class PointerExpressionNodes : public MemPointerParserCallback {
+private:
+  const VLoop&     _vloop;
+  const VLoopBody& _body;
+  VectorSet        _in_pointer_expression;
+
+public:
+  PointerExpressionNodes(Arena* arena,
+                         const VLoop& vloop,
+                         const VLoopBody& body) :
+    _vloop(vloop),
+    _body(body),
+    _in_pointer_expression(arena) {}
+
+  virtual void callback(Node* n) override {
+    if (!_vloop.in_bb(n)) { return; }
+    _in_pointer_expression.set(_body.bb_idx(n));
+  }
+
+  bool contains(const Node* n) const {
+    if (!_vloop.in_bb(n)) { return false; }
+    return _in_pointer_expression.test(_body.bb_idx(n));
+  }
+};
+
 // Submodule of VLoopAnalyzer.
 // We compute and cache the VPointer for every load and store.
 class VLoopVPointers : public StackObj {
@@ -599,6 +633,9 @@ private:
   // Map bb_idx -> index in _vpointers. -1 if not mapped.
   GrowableArray<int> _bb_idx_to_vpointer;
 
+  // Mark all nodes that are part of any pointers expression.
+  PointerExpressionNodes _pointer_expression_nodes;
+
 public:
   VLoopVPointers(Arena* arena,
                  const VLoop& vloop,
@@ -610,13 +647,18 @@ public:
     _bb_idx_to_vpointer(arena,
                         vloop.estimated_body_length(),
                         vloop.estimated_body_length(),
-                        -1) {}
+                        -1),
+    _pointer_expression_nodes(arena, _vloop, _body) {}
   NONCOPYABLE(VLoopVPointers);
 
   void compute_vpointers();
   const VPointer& vpointer(const MemNode* mem) const;
   NOT_PRODUCT( void print() const; )
 
+  bool is_in_pointer_expression(const Node* n) const {
+    return _pointer_expression_nodes.contains(n);
+  }
+
 private:
   void count_vpointers();
   void allocate_vpointers_array();
@@ -810,6 +852,15 @@ public:
   const VLoopVPointers& vpointers()              const { return _vpointers; }
   const VLoopDependencyGraph& dependency_graph() const { return _dependency_graph; }
 
+  // Compute the cost of the (scalar) body.
+  float cost_for_scalar_loop() const;
+  bool has_zero_cost(Node* n) const;
+
+  // Cost-modeling with tracing.
+  float cost_for_scalar_node(int opcode) const;
+  float cost_for_vector_node(int opcode, int vlen, BasicType bt) const;
+  float cost_for_vector_reduction_node(int opcode, int vlen, BasicType bt, bool requires_strict_order) const;
+
 private:
   bool setup_submodules();
   VStatus setup_submodules_helper();
diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
index 46e8f43cb65..9fd6ad1089c 100644
--- a/src/hotspot/share/opto/vtransform.cpp
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -186,6 +186,99 @@ int VTransformGraph::count_alive_vtnodes() const {
   return count;
 }
 
+// Find all nodes that in the loop, in a 2-phase process:
+// - First, find all nodes that are not before the loop:
+//   - loop-phis
+//   - loads and stores that are in the loop
+//   - and all their transitive uses.
+// - Second, we find all nodes that are not after the loop:
+//   - backedges
+//   - loads and stores that are in the loop
+//   - and all their transitive uses.
+//
+// in_loop: vtn->_idx -> bool
+void VTransformGraph::mark_vtnodes_in_loop(VectorSet& in_loop) const {
+  assert(is_scheduled(), "must already be scheduled");
+
+  // Phase 1: find all nodes that are not before the loop.
+  VectorSet is_not_before_loop;
+  for (int i = 0; i < _schedule.length(); i++) {
+    VTransformNode* vtn = _schedule.at(i);
+    // Is vtn a loop-phi?
+    if (vtn->isa_LoopPhi() != nullptr ||
+        vtn->is_load_or_store_in_loop()) {
+      is_not_before_loop.set(vtn->_idx);
+      continue;
+    }
+    // Or one of its transitive uses?
+    for (uint j = 0; j < vtn->req(); j++) {
+      VTransformNode* def = vtn->in_req(j);
+      if (def != nullptr && is_not_before_loop.test(def->_idx)) {
+        is_not_before_loop.set(vtn->_idx);
+        break;
+      }
+    }
+  }
+
+  // Phase 2: find all nodes that are not after the loop.
+  for (int i = _schedule.length()-1; i >= 0; i--) {
+    VTransformNode* vtn = _schedule.at(i);
+    if (!is_not_before_loop.test(vtn->_idx)) { continue; }
+    // Is load or store?
+    if (vtn->is_load_or_store_in_loop()) {
+        in_loop.set(vtn->_idx);
+        continue;
+    }
+    for (uint i = 0; i < vtn->out_strong_edges(); i++) {
+      VTransformNode* use = vtn->out_strong_edge(i);
+      // Or is vtn a backedge or one of its transitive defs?
+      if (in_loop.test(use->_idx) ||
+          use->isa_LoopPhi() != nullptr) {
+        in_loop.set(vtn->_idx);
+        break;
+      }
+    }
+  }
+}
+
+float VTransformGraph::cost_for_vector_loop() const {
+  assert(is_scheduled(), "must already be scheduled");
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("\nVTransformGraph::cost_for_vector_loop:");
+  }
+#endif
+
+  // We only want to count the cost of nodes that are in the loop.
+  // This is especially important for cases where we were able to move
+  // some nodes outside the loop during VTransform::optimize, e.g.:
+  // VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop
+  ResourceMark rm;
+  VectorSet in_loop; // vtn->_idx -> bool
+  mark_vtnodes_in_loop(in_loop);
+
+  float sum = 0;
+  for (int i = 0; i < _schedule.length(); i++) {
+    VTransformNode* vtn = _schedule.at(i);
+    if (!in_loop.test(vtn->_idx)) { continue; }
+    float c = vtn->cost(_vloop_analyzer);
+    sum += c;
+#ifndef PRODUCT
+    if (c != 0 && _vloop.is_trace_cost_verbose()) {
+      tty->print("  -> cost = %.2f for ", c);
+      vtn->print();
+    }
+#endif
+  }
+
+#ifndef PRODUCT
+  if (_vloop.is_trace_cost()) {
+    tty->print_cr("  total_cost = %.2f", sum);
+  }
+#endif
+  return sum;
+}
+
 #ifndef PRODUCT
 void VTransformGraph::trace_schedule_cycle(const GrowableArray<VTransformNode*>& stack,
                                            const VectorSet& pre_visited,
@@ -831,6 +924,12 @@ void VTransformNode::apply_vtn_inputs_to_node(Node* n, VTransformApplyState& app
   }
 }
 
+float VTransformMemopScalarNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  // This is an identity transform, but loads and stores must be counted.
+  assert(!vloop_analyzer.has_zero_cost(_node), "memop nodes must be counted");
+  return vloop_analyzer.cost_for_scalar_node(_node->Opcode());
+}
+
 VTransformApplyResult VTransformMemopScalarNode::apply(VTransformApplyState& apply_state) const {
   apply_vtn_inputs_to_node(_node, apply_state);
   // The memory state has to be applied separately: the vtn does not hold it. This allows reordering.
@@ -843,6 +942,16 @@ VTransformApplyResult VTransformMemopScalarNode::apply(VTransformApplyState& app
   return VTransformApplyResult::make_scalar(_node);
 }
 
+float VTransformDataScalarNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  // Since this is an identity transform, we may have nodes that also
+  // VLoopAnalyzer::cost does not count for the scalar loop.
+  if (vloop_analyzer.has_zero_cost(_node)) {
+    return 0;
+  } else {
+    return vloop_analyzer.cost_for_scalar_node(_node->Opcode());
+  }
+}
+
 VTransformApplyResult VTransformDataScalarNode::apply(VTransformApplyState& apply_state) const {
   apply_vtn_inputs_to_node(_node, apply_state);
   return VTransformApplyResult::make_scalar(_node);
@@ -895,6 +1004,10 @@ VTransformApplyResult VTransformOuterNode::apply(VTransformApplyState& apply_sta
   return VTransformApplyResult::make_scalar(_node);
 }
 
+float VTransformReplicateNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  return vloop_analyzer.cost_for_vector_node(Op_Replicate, _vlen, _element_type);
+}
+
 VTransformApplyResult VTransformReplicateNode::apply(VTransformApplyState& apply_state) const {
   Node* val = apply_state.transformed_node(in_req(1));
   VectorNode* vn = VectorNode::scalar2vector(val, _vlen, _element_type);
@@ -902,6 +1015,10 @@ VTransformApplyResult VTransformReplicateNode::apply(VTransformApplyState& apply
   return VTransformApplyResult::make_vector(vn);
 }
 
+float VTransformConvI2LNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  return vloop_analyzer.cost_for_scalar_node(Op_ConvI2L);
+}
+
 VTransformApplyResult VTransformConvI2LNode::apply(VTransformApplyState& apply_state) const {
   Node* val = apply_state.transformed_node(in_req(1));
   Node* n = new ConvI2LNode(val);
@@ -909,6 +1026,12 @@ VTransformApplyResult VTransformConvI2LNode::apply(VTransformApplyState& apply_s
   return VTransformApplyResult::make_scalar(n);
 }
 
+float VTransformShiftCountNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  int shift_count_opc = VectorNode::shift_count_opcode(_shift_opcode);
+  return vloop_analyzer.cost_for_scalar_node(Op_AndI) +
+         vloop_analyzer.cost_for_vector_node(shift_count_opc, _vlen, _element_bt);
+}
+
 VTransformApplyResult VTransformShiftCountNode::apply(VTransformApplyState& apply_state) const {
   PhaseIdealLoop* phase = apply_state.phase();
   Node* shift_count_in = apply_state.transformed_node(in_req(1));
@@ -924,6 +1047,9 @@ VTransformApplyResult VTransformShiftCountNode::apply(VTransformApplyState& appl
   return VTransformApplyResult::make_vector(vn);
 }
 
+float VTransformPopulateIndexNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  return vloop_analyzer.cost_for_vector_node(Op_PopulateIndex, _vlen, _element_bt);
+}
 
 VTransformApplyResult VTransformPopulateIndexNode::apply(VTransformApplyState& apply_state) const {
   PhaseIdealLoop* phase = apply_state.phase();
@@ -936,6 +1062,10 @@ VTransformApplyResult VTransformPopulateIndexNode::apply(VTransformApplyState& a
   return VTransformApplyResult::make_vector(vn);
 }
 
+float VTransformElementWiseVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  return vloop_analyzer.cost_for_vector_node(_vector_opcode, vector_length(), element_basic_type());
+}
+
 VTransformApplyResult VTransformElementWiseVectorNode::apply(VTransformApplyState& apply_state) const {
   assert(2 <= req() && req() <= 4, "Must have 1-3 inputs");
   const TypeVect* vt = TypeVect::make(element_basic_type(), vector_length());
@@ -954,6 +1084,12 @@ VTransformApplyResult VTransformElementWiseVectorNode::apply(VTransformApplyStat
   return VTransformApplyResult::make_vector(vn);
 }
 
+float VTransformElementWiseLongOpWithCastToIntVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  int vopc = VectorNode::opcode(scalar_opcode(), element_basic_type());
+  return vloop_analyzer.cost_for_vector_node(vopc, vector_length(), element_basic_type()) +
+         vloop_analyzer.cost_for_vector_node(Op_VectorCastL2X, vector_length(), T_INT);
+}
+
 VTransformApplyResult VTransformElementWiseLongOpWithCastToIntVectorNode::apply(VTransformApplyState& apply_state) const {
   uint vlen = vector_length();
   int sopc  = scalar_opcode();
@@ -969,6 +1105,10 @@ VTransformApplyResult VTransformElementWiseLongOpWithCastToIntVectorNode::apply(
   return VTransformApplyResult::make_vector(vn);
 }
 
+float VTransformReinterpretVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  return vloop_analyzer.cost_for_vector_node(Op_VectorReinterpret, vector_length(), element_basic_type());
+}
+
 VTransformApplyResult VTransformReinterpretVectorNode::apply(VTransformApplyState& apply_state) const {
   const TypeVect* dst_vt = TypeVect::make(element_basic_type(), vector_length());
   const TypeVect* src_vt = TypeVect::make(_src_bt,              vector_length());
@@ -981,6 +1121,11 @@ VTransformApplyResult VTransformReinterpretVectorNode::apply(VTransformApplyStat
   return VTransformApplyResult::make_vector(vn);
 }
 
+float VTransformBoolVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  assert(scalar_opcode() == Op_Bool, "");
+  return vloop_analyzer.cost_for_vector_node(Op_VectorMaskCmp, vector_length(), element_basic_type());
+}
+
 VTransformApplyResult VTransformBoolVectorNode::apply(VTransformApplyState& apply_state) const {
   const TypeVect* vt = TypeVect::make(element_basic_type(), vector_length());
   assert(scalar_opcode() == Op_Bool, "");
@@ -1101,10 +1246,10 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   const BasicType bt = element_basic_type();
   const int ropc     = vector_reduction_opcode();
   const int vopc     = VectorNode::opcode(sopc, bt);
-  if (!Matcher::match_rule_supported_vector(vopc, vlen, bt)) {
-    DEBUG_ONLY( this->print(); )
-    assert(false, "do not have normal vector op for this reduction");
-    return false; // not implemented
+  if (!Matcher::match_rule_supported_auto_vectorization(vopc, vlen, bt)) {
+    // The element-wise vector operation needed for the vector accumulator
+    // is not implemented / supported.
+    return false;
   }
 
   // Traverse up the chain of non strict order reductions, checking that it loops
@@ -1236,6 +1381,14 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   return true; // success
 }
 
+float VTransformReductionVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  uint vlen    = vector_length();
+  BasicType bt = element_basic_type();
+  int vopc = vector_reduction_opcode();
+  bool requires_strict_order = ReductionNode::auto_vectorization_requires_strict_order(vopc);
+  return vloop_analyzer.cost_for_vector_reduction_node(vopc, vlen, bt, requires_strict_order);
+}
+
 VTransformApplyResult VTransformReductionVectorNode::apply(VTransformApplyState& apply_state) const {
   Node* init = apply_state.transformed_node(in_req(1));
   Node* vec  = apply_state.transformed_node(in_req(2));
@@ -1245,6 +1398,12 @@ VTransformApplyResult VTransformReductionVectorNode::apply(VTransformApplyState&
   return VTransformApplyResult::make_vector(vn, vn->vect_type());
 }
 
+float VTransformLoadVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  uint vlen    = vector_length();
+  BasicType bt = element_basic_type();
+  return vloop_analyzer.cost_for_vector_node(Op_LoadVector, vlen, bt);
+}
+
 VTransformApplyResult VTransformLoadVectorNode::apply(VTransformApplyState& apply_state) const {
   int sopc     = scalar_opcode();
   uint vlen    = vector_length();
@@ -1274,6 +1433,12 @@ VTransformApplyResult VTransformLoadVectorNode::apply(VTransformApplyState& appl
   return VTransformApplyResult::make_vector(vn, vn->vect_type());
 }
 
+float VTransformStoreVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
+  uint vlen    = vector_length();
+  BasicType bt = element_basic_type();
+  return vloop_analyzer.cost_for_vector_node(Op_StoreVector, vlen, bt);
+}
+
 VTransformApplyResult VTransformStoreVectorNode::apply(VTransformApplyState& apply_state) const {
   int sopc  = scalar_opcode();
   uint vlen = vector_length();
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index 7ad7b432e9b..a30f0ff098f 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -51,6 +51,10 @@
 //   - Compute linearization of the VTransformGraph, into an order that respects
 //     all edges in the graph (bailout if cycle detected).
 //
+// - Cost-Model:
+//   - We use a cost-model as a heuristic to determine if vectorization is profitable.
+//     Compute the cost of the loop with and without vectorization.
+//
 // - Apply:
 //   - Changes to the C2 IR are only made once the "apply" method is called.
 //   - Align the main loop, by adjusting pre loop limit.
@@ -190,6 +194,7 @@ public:
   void optimize(VTransform& vtransform);
   bool schedule();
   bool has_store_to_load_forwarding_failure(const VLoopAnalyzer& vloop_analyzer) const;
+  float cost_for_vector_loop() const;
   void apply_vectorization_for_each_vtnode(uint& max_vector_length, uint& max_vector_width) const;
 
 private:
@@ -200,6 +205,7 @@ private:
 
   void collect_nodes_without_strong_in_edges(GrowableArray<VTransformNode*>& stack) const;
   int count_alive_vtnodes() const;
+  void mark_vtnodes_in_loop(VectorSet& in_loop) const;
 
 #ifndef PRODUCT
   void print_vtnodes() const;
@@ -252,6 +258,8 @@ public:
 
   void optimize() { return _graph.optimize(*this); }
   bool schedule() { return _graph.schedule(); }
+  bool is_profitable() const;
+  float cost_for_vector_loop() const { return _graph.cost_for_vector_loop(); }
   bool has_store_to_load_forwarding_failure() const { return _graph.has_store_to_load_forwarding_failure(_vloop_analyzer); }
   void apply();
 
@@ -549,6 +557,8 @@ public:
 
   virtual bool optimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) { return false; }
 
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const = 0;
+
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const = 0;
   virtual void apply_backedge(VTransformApplyState& apply_state) const {};
   void apply_vtn_inputs_to_node(Node* n, VTransformApplyState& apply_state) const;
@@ -579,6 +589,7 @@ public:
   virtual bool is_load_or_store_in_loop() const override { return true; }
 
   virtual const VPointer& vpointer() const override { return _vpointer; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "MemopScalar"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -595,6 +606,7 @@ public:
     assert(!_node->is_Mem() && !_node->is_Phi() && !_node->is_CFG(), "must be data node: %s", _node->Name());
   }
 
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "DataScalar"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -612,6 +624,7 @@ public:
   }
 
   virtual VTransformLoopPhiNode* isa_LoopPhi() override { return this; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override { return 0; }
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   virtual void apply_backedge(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "LoopPhi"; };)
@@ -629,6 +642,7 @@ public:
     assert(_node->is_CFG(), "must be CFG node: %s", _node->Name());
   }
 
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override { return 0; }
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "CFG"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -655,6 +669,7 @@ public:
     VTransformNode(vtransform, n->req()), _node(n) {}
 
   virtual VTransformOuterNode* isa_Outer() override { return this; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override { ShouldNotReachHere(); }
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "Outer"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -668,6 +683,7 @@ private:
 public:
   VTransformReplicateNode(VTransform& vtransform, int vlen, BasicType element_type) :
     VTransformNode(vtransform, 2), _vlen(vlen), _element_type(element_type) {}
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "Replicate"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -677,6 +693,7 @@ public:
 class VTransformConvI2LNode : public VTransformNode {
 public:
   VTransformConvI2LNode(VTransform& vtransform) : VTransformNode(vtransform, 2) {}
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ConvI2L"; };)
 };
@@ -691,6 +708,7 @@ private:
 public:
   VTransformShiftCountNode(VTransform& vtransform, int vlen, BasicType element_bt, juint mask, int shift_opcode) :
     VTransformNode(vtransform, 2), _vlen(vlen), _element_bt(element_bt), _mask(mask), _shift_opcode(shift_opcode) {}
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ShiftCount"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -704,6 +722,7 @@ private:
 public:
   VTransformPopulateIndexNode(VTransform& vtransform, int vlen, const BasicType element_bt) :
     VTransformNode(vtransform, 2), _vlen(vlen), _element_bt(element_bt) {}
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "PopulateIndex"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -769,6 +788,7 @@ public:
   VTransformElementWiseVectorNode(VTransform& vtransform, uint req, const VTransformVectorNodeProperties properties, const int vector_opcode) :
     VTransformVectorNode(vtransform, req, properties), _vector_opcode(vector_opcode) {}
   virtual VTransformElementWiseVectorNode* isa_ElementWiseVector() override { return this; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ElementWiseVector"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -781,6 +801,7 @@ class VTransformElementWiseLongOpWithCastToIntVectorNode : public VTransformVect
 public:
   VTransformElementWiseLongOpWithCastToIntVectorNode(VTransform& vtransform, const VTransformVectorNodeProperties properties) :
     VTransformVectorNode(vtransform, 2, properties) {}
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ElementWiseLongOpWithCastToIntVector"; };)
 };
@@ -791,6 +812,7 @@ private:
 public:
   VTransformReinterpretVectorNode(VTransform& vtransform, const VTransformVectorNodeProperties properties, const BasicType src_bt) :
     VTransformVectorNode(vtransform, 2, properties), _src_bt(src_bt) {}
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ReinterpretVector"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -811,6 +833,7 @@ public:
   VTransformCmpVectorNode(VTransform& vtransform, const VTransformVectorNodeProperties properties) :
     VTransformVectorNode(vtransform, 3, properties) {}
   virtual VTransformCmpVectorNode* isa_CmpVector() override { return this; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override { return 0; }
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override { return VTransformApplyResult::make_empty(); }
   NOT_PRODUCT(virtual const char* name() const override { return "CmpVector"; };)
 };
@@ -823,6 +846,7 @@ public:
     VTransformVectorNode(vtransform, 2, properties), _test(test) {}
   VTransformBoolTest test() const { return _test; }
   virtual VTransformBoolVectorNode* isa_BoolVector() override { return this; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "BoolVector"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
@@ -835,6 +859,7 @@ public:
     VTransformVectorNode(vtransform, 3, properties) {}
   virtual VTransformReductionVectorNode* isa_ReductionVector() override { return this; }
   virtual bool optimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) override;
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ReductionVector"; };)
 
@@ -877,6 +902,7 @@ public:
   LoadNode::ControlDependency control_dependency() const;
   virtual VTransformLoadVectorNode* isa_LoadVector() override { return this; }
   virtual bool is_load_in_loop() const override { return true; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "LoadVector"; };)
 };
@@ -888,6 +914,7 @@ public:
     VTransformMemVectorNode(vtransform, 4, properties, vpointer, adr_type) {}
   virtual VTransformStoreVectorNode* isa_StoreVector() override { return this; }
   virtual bool is_load_in_loop() const override { return false; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "StoreVector"; };)
 };
diff --git a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
index 457e33667b2..76c33ec1b07 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
@@ -410,12 +410,12 @@ public class TestIntVect {
 
     }
 
-    // Not vectorized: simple addition not profitable, see JDK-8307516. NOTE:
-    // This check does not document the _desired_ behavior of the system but
-    // the current behavior (no vectorization)
     @Test
-    @IR(counts = { IRNode.LOAD_VECTOR_I, "= 0",
-                   IRNode.STORE_VECTOR,  "= 0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_I,     "> 0",
+                   IRNode.ADD_REDUCTION_VI,  "> 0",
+                   IRNode.ADD_VI,            "> 0" })
+    // The reduction is moved outside the loop, and we use a
+    // element-wise accumulator inside the loop.
     int test_sum(int[] a1) {
         int sum = 0;
         for (int i = 0; i < a1.length; i+=1) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java
index 10ad19d03a7..89b46871cb5 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java
@@ -115,17 +115,18 @@ public class TestAutoVectorizationOverrideProfitability {
     @Test
     @Warmup(10)
     @IR(applyIfCPUFeatureOr = {"avx", "true"},
-        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"},
         counts = {IRNode.ADD_REDUCTION_VI, "> 0", IRNode.ADD_VI, "> 0"})
     @IR(applyIfCPUFeatureOr = {"avx", "true"},
-        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"},
         counts = {IRNode.ADD_REDUCTION_VI, "= 0", IRNode.ADD_VI, "= 0"})
-    // Current heuristics say that this simple int reduction is not profitable.
-    // But it would actually be profitable, since we are able to move the
-    // reduction out of the loop (we can reorder the reduction). When moving
-    // the reduction out of the loop, we instead accumulate with a simple
-    // ADD_VI inside the loop.
-    // See: JDK-8307516 JDK-8345044
+    // We are able to vectorize the reduction. But on its own, that would
+    // not reduce the cost sufficiently in all cases, because vectorized
+    // reduction nodes are expensive. But since integer addition is associative
+    // we can move the reduction vector out of the loop. Instead, we accumulate
+    // with a simple ADD_VI inside the loop, which is very cheap. After the
+    // loop, we only need to use the vectorized reduction once, to collapse
+    // the partial sums contained in the lanes.
     private static int simpleIntReduction() {
         int sum = 0;
         for (int i = 0; i < aI.length; i++) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java
new file mode 100644
index 00000000000..1cd5cfa1e75
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java
@@ -0,0 +1,2452 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=no-vectorization
+ * @bug 8340093
+ * @summary Test vectorization of reduction loops.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestReductions P0
+ */
+
+/*
+ * @test id=vanilla
+ * @bug 8340093
+ * @summary Test vectorization of reduction loops.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestReductions P1
+ */
+
+/*
+ * @test id=force-vectorization
+ * @bug 8340093
+ * @summary Test vectorization of reduction loops.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestReductions P2
+ */
+
+package compiler.loopopts.superword;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.verify.*;
+import static compiler.lib.generators.Generators.G;
+import compiler.lib.generators.Generator;
+
+/**
+ * Note: there is a corresponding JMH benchmark:
+ * test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
+ */
+public class TestReductions {
+    private static int SIZE = 1024*8;
+    private static final Generator<Integer> GEN_I = G.ints();
+    private static final Generator<Long>    GEN_L = G.longs();
+    private static final Generator<Float>   GEN_F = G.floats();
+    private static final Generator<Double>  GEN_D = G.doubles();
+
+    private static byte[] in1B   = fillRandom(new byte[SIZE]);
+    private static byte[] in2B   = fillRandom(new byte[SIZE]);
+    private static byte[] in3B   = fillRandom(new byte[SIZE]);
+    private static char[] in1C   = fillRandom(new char[SIZE]);
+    private static char[] in2C   = fillRandom(new char[SIZE]);
+    private static char[] in3C   = fillRandom(new char[SIZE]);
+    private static short[] in1S  = fillRandom(new short[SIZE]);
+    private static short[] in2S  = fillRandom(new short[SIZE]);
+    private static short[] in3S  = fillRandom(new short[SIZE]);
+
+    private static int[] in1I    = fillRandom(new int[SIZE]);
+    private static int[] in2I    = fillRandom(new int[SIZE]);
+    private static int[] in3I    = fillRandom(new int[SIZE]);
+    private static long[] in1L   = fillRandom(new long[SIZE]);
+    private static long[] in2L   = fillRandom(new long[SIZE]);
+    private static long[] in3L   = fillRandom(new long[SIZE]);
+
+    private static float[] in1F  = fillRandom(new float[SIZE]);
+    private static float[] in2F  = fillRandom(new float[SIZE]);
+    private static float[] in3F  = fillRandom(new float[SIZE]);
+    private static double[] in1D = fillRandom(new double[SIZE]);
+    private static double[] in2D = fillRandom(new double[SIZE]);
+    private static double[] in3D = fillRandom(new double[SIZE]);
+
+    interface TestFunction {
+        Object run();
+    }
+
+    // Map of test names to tests.
+    Map<String,TestFunction> tests = new HashMap<String,TestFunction>();
+
+    // Map of gold, the results from the first run (before compilation), one per tests entry.
+    Map<String,Object> golds = new HashMap<String,Object>();
+
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestReductions.class);
+        switch (args[0]) {
+            case "P0" -> { framework.addFlags("-XX:+UnlockDiagnosticVMOptions", "-XX:AutoVectorizationOverrideProfitability=0"); }
+            case "P1" -> { framework.addFlags("-XX:+UnlockDiagnosticVMOptions", "-XX:AutoVectorizationOverrideProfitability=1"); }
+            // Note: increasing the node count limit also helps in some cases.
+            case "P2" -> { framework.addFlags("-XX:+UnlockDiagnosticVMOptions", "-XX:AutoVectorizationOverrideProfitability=2", "-XX:LoopUnrollLimit=1000"); }
+            default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
+        };
+        framework.start();
+    }
+
+    public TestReductions() {
+        // Add all tests to list
+        tests.put("byteAndSimple",       TestReductions::byteAndSimple);
+        tests.put("byteOrSimple",        TestReductions::byteOrSimple);
+        tests.put("byteXorSimple",       TestReductions::byteXorSimple);
+        tests.put("byteAddSimple",       TestReductions::byteAddSimple);
+        tests.put("byteMulSimple",       TestReductions::byteMulSimple);
+        tests.put("byteMinSimple",       TestReductions::byteMinSimple);
+        tests.put("byteMaxSimple",       TestReductions::byteMaxSimple);
+        tests.put("byteAndDotProduct",   TestReductions::byteAndDotProduct);
+        tests.put("byteOrDotProduct",    TestReductions::byteOrDotProduct);
+        tests.put("byteXorDotProduct",   TestReductions::byteXorDotProduct);
+        tests.put("byteAddDotProduct",   TestReductions::byteAddDotProduct);
+        tests.put("byteMulDotProduct",   TestReductions::byteMulDotProduct);
+        tests.put("byteMinDotProduct",   TestReductions::byteMinDotProduct);
+        tests.put("byteMaxDotProduct",   TestReductions::byteMaxDotProduct);
+        tests.put("byteAndBig",          TestReductions::byteAndBig);
+        tests.put("byteOrBig",           TestReductions::byteOrBig);
+        tests.put("byteXorBig",          TestReductions::byteXorBig);
+        tests.put("byteAddBig",          TestReductions::byteAddBig);
+        tests.put("byteMulBig",          TestReductions::byteMulBig);
+        tests.put("byteMinBig",          TestReductions::byteMinBig);
+        tests.put("byteMaxBig",          TestReductions::byteMaxBig);
+
+        tests.put("charAndSimple",       TestReductions::charAndSimple);
+        tests.put("charOrSimple",        TestReductions::charOrSimple);
+        tests.put("charXorSimple",       TestReductions::charXorSimple);
+        tests.put("charAddSimple",       TestReductions::charAddSimple);
+        tests.put("charMulSimple",       TestReductions::charMulSimple);
+        tests.put("charMinSimple",       TestReductions::charMinSimple);
+        tests.put("charMaxSimple",       TestReductions::charMaxSimple);
+        tests.put("charAndDotProduct",   TestReductions::charAndDotProduct);
+        tests.put("charOrDotProduct",    TestReductions::charOrDotProduct);
+        tests.put("charXorDotProduct",   TestReductions::charXorDotProduct);
+        tests.put("charAddDotProduct",   TestReductions::charAddDotProduct);
+        tests.put("charMulDotProduct",   TestReductions::charMulDotProduct);
+        tests.put("charMinDotProduct",   TestReductions::charMinDotProduct);
+        tests.put("charMaxDotProduct",   TestReductions::charMaxDotProduct);
+        tests.put("charAndBig",          TestReductions::charAndBig);
+        tests.put("charOrBig",           TestReductions::charOrBig);
+        tests.put("charXorBig",          TestReductions::charXorBig);
+        tests.put("charAddBig",          TestReductions::charAddBig);
+        tests.put("charMulBig",          TestReductions::charMulBig);
+        tests.put("charMinBig",          TestReductions::charMinBig);
+        tests.put("charMaxBig",          TestReductions::charMaxBig);
+
+        tests.put("shortAndSimple",      TestReductions::shortAndSimple);
+        tests.put("shortOrSimple",       TestReductions::shortOrSimple);
+        tests.put("shortXorSimple",      TestReductions::shortXorSimple);
+        tests.put("shortAddSimple",      TestReductions::shortAddSimple);
+        tests.put("shortMulSimple",      TestReductions::shortMulSimple);
+        tests.put("shortMinSimple",      TestReductions::shortMinSimple);
+        tests.put("shortMaxSimple",      TestReductions::shortMaxSimple);
+        tests.put("shortAndDotProduct",  TestReductions::shortAndDotProduct);
+        tests.put("shortOrDotProduct",   TestReductions::shortOrDotProduct);
+        tests.put("shortXorDotProduct",  TestReductions::shortXorDotProduct);
+        tests.put("shortAddDotProduct",  TestReductions::shortAddDotProduct);
+        tests.put("shortMulDotProduct",  TestReductions::shortMulDotProduct);
+        tests.put("shortMinDotProduct",  TestReductions::shortMinDotProduct);
+        tests.put("shortMaxDotProduct",  TestReductions::shortMaxDotProduct);
+        tests.put("shortAndBig",         TestReductions::shortAndBig);
+        tests.put("shortOrBig",          TestReductions::shortOrBig);
+        tests.put("shortXorBig",         TestReductions::shortXorBig);
+        tests.put("shortAddBig",         TestReductions::shortAddBig);
+        tests.put("shortMulBig",         TestReductions::shortMulBig);
+        tests.put("shortMinBig",         TestReductions::shortMinBig);
+        tests.put("shortMaxBig",         TestReductions::shortMaxBig);
+
+        tests.put("intAndSimple",        TestReductions::intAndSimple);
+        tests.put("intOrSimple",         TestReductions::intOrSimple);
+        tests.put("intXorSimple",        TestReductions::intXorSimple);
+        tests.put("intAddSimple",        TestReductions::intAddSimple);
+        tests.put("intMulSimple",        TestReductions::intMulSimple);
+        tests.put("intMinSimple",        TestReductions::intMinSimple);
+        tests.put("intMaxSimple",        TestReductions::intMaxSimple);
+        tests.put("intAndDotProduct",    TestReductions::intAndDotProduct);
+        tests.put("intOrDotProduct",     TestReductions::intOrDotProduct);
+        tests.put("intXorDotProduct",    TestReductions::intXorDotProduct);
+        tests.put("intAddDotProduct",    TestReductions::intAddDotProduct);
+        tests.put("intMulDotProduct",    TestReductions::intMulDotProduct);
+        tests.put("intMinDotProduct",    TestReductions::intMinDotProduct);
+        tests.put("intMaxDotProduct",    TestReductions::intMaxDotProduct);
+        tests.put("intAndBig",           TestReductions::intAndBig);
+        tests.put("intOrBig",            TestReductions::intOrBig);
+        tests.put("intXorBig",           TestReductions::intXorBig);
+        tests.put("intAddBig",           TestReductions::intAddBig);
+        tests.put("intMulBig",           TestReductions::intMulBig);
+        tests.put("intMinBig",           TestReductions::intMinBig);
+        tests.put("intMaxBig",           TestReductions::intMaxBig);
+
+        tests.put("longAndSimple",       TestReductions::longAndSimple);
+        tests.put("longOrSimple",        TestReductions::longOrSimple);
+        tests.put("longXorSimple",       TestReductions::longXorSimple);
+        tests.put("longAddSimple",       TestReductions::longAddSimple);
+        tests.put("longMulSimple",       TestReductions::longMulSimple);
+        tests.put("longMinSimple",       TestReductions::longMinSimple);
+        tests.put("longMaxSimple",       TestReductions::longMaxSimple);
+        tests.put("longAndDotProduct",   TestReductions::longAndDotProduct);
+        tests.put("longOrDotProduct",    TestReductions::longOrDotProduct);
+        tests.put("longXorDotProduct",   TestReductions::longXorDotProduct);
+        tests.put("longAddDotProduct",   TestReductions::longAddDotProduct);
+        tests.put("longMulDotProduct",   TestReductions::longMulDotProduct);
+        tests.put("longMinDotProduct",   TestReductions::longMinDotProduct);
+        tests.put("longMaxDotProduct",   TestReductions::longMaxDotProduct);
+        tests.put("longAndBig",          TestReductions::longAndBig);
+        tests.put("longOrBig",           TestReductions::longOrBig);
+        tests.put("longXorBig",          TestReductions::longXorBig);
+        tests.put("longAddBig",          TestReductions::longAddBig);
+        tests.put("longMulBig",          TestReductions::longMulBig);
+        tests.put("longMinBig",          TestReductions::longMinBig);
+        tests.put("longMaxBig",          TestReductions::longMaxBig);
+
+        tests.put("floatAddSimple",      TestReductions::floatAddSimple);
+        tests.put("floatMulSimple",      TestReductions::floatMulSimple);
+        tests.put("floatMinSimple",      TestReductions::floatMinSimple);
+        tests.put("floatMaxSimple",      TestReductions::floatMaxSimple);
+        tests.put("floatAddDotProduct",  TestReductions::floatAddDotProduct);
+        tests.put("floatMulDotProduct",  TestReductions::floatMulDotProduct);
+        tests.put("floatMinDotProduct",  TestReductions::floatMinDotProduct);
+        tests.put("floatMaxDotProduct",  TestReductions::floatMaxDotProduct);
+        tests.put("floatAddBig",         TestReductions::floatAddBig);
+        tests.put("floatMulBig",         TestReductions::floatMulBig);
+        tests.put("floatMinBig",         TestReductions::floatMinBig);
+        tests.put("floatMaxBig",         TestReductions::floatMaxBig);
+
+        tests.put("doubleAddSimple",     TestReductions::doubleAddSimple);
+        tests.put("doubleMulSimple",     TestReductions::doubleMulSimple);
+        tests.put("doubleMinSimple",     TestReductions::doubleMinSimple);
+        tests.put("doubleMaxSimple",     TestReductions::doubleMaxSimple);
+        tests.put("doubleAddDotProduct", TestReductions::doubleAddDotProduct);
+        tests.put("doubleMulDotProduct", TestReductions::doubleMulDotProduct);
+        tests.put("doubleMinDotProduct", TestReductions::doubleMinDotProduct);
+        tests.put("doubleMaxDotProduct", TestReductions::doubleMaxDotProduct);
+        tests.put("doubleAddBig",        TestReductions::doubleAddBig);
+        tests.put("doubleMulBig",        TestReductions::doubleMulBig);
+        tests.put("doubleMinBig",        TestReductions::doubleMinBig);
+        tests.put("doubleMaxBig",        TestReductions::doubleMaxBig);
+
+        // Compute gold value for all test methods before compilation
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            Object gold = test.run();
+            golds.put(name, gold);
+        }
+    }
+
+    @Warmup(100)
+    @Run(test = {"byteAndSimple",
+                 "byteOrSimple",
+                 "byteXorSimple",
+                 "byteAddSimple",
+                 "byteMulSimple",
+                 "byteMinSimple",
+                 "byteMaxSimple",
+                 "byteAndDotProduct",
+                 "byteOrDotProduct",
+                 "byteXorDotProduct",
+                 "byteAddDotProduct",
+                 "byteMulDotProduct",
+                 "byteMinDotProduct",
+                 "byteMaxDotProduct",
+                 "byteAndBig",
+                 "byteOrBig",
+                 "byteXorBig",
+                 "byteAddBig",
+                 "byteMulBig",
+                 "byteMinBig",
+                 "byteMaxBig",
+
+                 "charAndSimple",
+                 "charOrSimple",
+                 "charXorSimple",
+                 "charAddSimple",
+                 "charMulSimple",
+                 "charMinSimple",
+                 "charMaxSimple",
+                 "charAndDotProduct",
+                 "charOrDotProduct",
+                 "charXorDotProduct",
+                 "charAddDotProduct",
+                 "charMulDotProduct",
+                 "charMinDotProduct",
+                 "charMaxDotProduct",
+                 "charAndBig",
+                 "charOrBig",
+                 "charXorBig",
+                 "charAddBig",
+                 "charMulBig",
+                 "charMinBig",
+                 "charMaxBig",
+
+                 "shortAndSimple",
+                 "shortOrSimple",
+                 "shortXorSimple",
+                 "shortAddSimple",
+                 "shortMulSimple",
+                 "shortMinSimple",
+                 "shortMaxSimple",
+                 "shortAndDotProduct",
+                 "shortOrDotProduct",
+                 "shortXorDotProduct",
+                 "shortAddDotProduct",
+                 "shortMulDotProduct",
+                 "shortMinDotProduct",
+                 "shortMaxDotProduct",
+                 "shortAndBig",
+                 "shortOrBig",
+                 "shortXorBig",
+                 "shortAddBig",
+                 "shortMulBig",
+                 "shortMinBig",
+                 "shortMaxBig",
+
+                 "intAndSimple",
+                 "intOrSimple",
+                 "intXorSimple",
+                 "intAddSimple",
+                 "intMulSimple",
+                 "intMinSimple",
+                 "intMaxSimple",
+                 "intAndDotProduct",
+                 "intOrDotProduct",
+                 "intXorDotProduct",
+                 "intAddDotProduct",
+                 "intMulDotProduct",
+                 "intMinDotProduct",
+                 "intMaxDotProduct",
+                 "intAndBig",
+                 "intOrBig",
+                 "intXorBig",
+                 "intAddBig",
+                 "intMulBig",
+                 "intMinBig",
+                 "intMaxBig",
+
+                 "longAndSimple",
+                 "longOrSimple",
+                 "longXorSimple",
+                 "longAddSimple",
+                 "longMulSimple",
+                 "longMinSimple",
+                 "longMaxSimple",
+                 "longAndDotProduct",
+                 "longOrDotProduct",
+                 "longXorDotProduct",
+                 "longAddDotProduct",
+                 "longMulDotProduct",
+                 "longMinDotProduct",
+                 "longMaxDotProduct",
+                 "longAndBig",
+                 "longOrBig",
+                 "longXorBig",
+                 "longAddBig",
+                 "longMulBig",
+                 "longMinBig",
+                 "longMaxBig",
+
+                 "floatAddSimple",
+                 "floatMulSimple",
+                 "floatMinSimple",
+                 "floatMaxSimple",
+                 "floatAddDotProduct",
+                 "floatMulDotProduct",
+                 "floatMinDotProduct",
+                 "floatMaxDotProduct",
+                 "floatAddBig",
+                 "floatMulBig",
+                 "floatMinBig",
+                 "floatMaxBig",
+
+                 "doubleAddSimple",
+                 "doubleMulSimple",
+                 "doubleMinSimple",
+                 "doubleMaxSimple",
+                 "doubleAddDotProduct",
+                 "doubleMulDotProduct",
+                 "doubleMinDotProduct",
+                 "doubleMaxDotProduct",
+                 "doubleAddBig",
+                 "doubleMulBig",
+                 "doubleMinBig",
+                 "doubleMaxBig"})
+    public void runTests() {
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            // Recall gold value from before compilation
+            Object gold = golds.get(name);
+            // Compute new result
+            Object result = test.run();
+            // Compare gold and new result
+            try {
+                Verify.checkEQ(gold, result);
+            } catch (VerifyException e) {
+                throw new RuntimeException("Verify failed for " + name, e);
+            }
+        }
+    }
+
+    static byte[] fillRandom(byte[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = (byte)(int)GEN_I.next();
+        }
+        return a;
+    }
+
+    static char[] fillRandom(char[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = (char)(int)GEN_I.next();
+        }
+        return a;
+    }
+
+    static short[] fillRandom(short[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = (short)(int)GEN_I.next();
+        }
+        return a;
+    }
+
+    static int[] fillRandom(int[] a) {
+        G.fill(GEN_I, a);
+        return a;
+    }
+
+    static long[] fillRandom(long[] a) {
+        G.fill(GEN_L, a);
+        return a;
+    }
+
+    static float[] fillRandom(float[] a) {
+        G.fill(GEN_F, a);
+        return a;
+    }
+
+    static double[] fillRandom(double[] a) {
+        G.fill(GEN_D, a);
+        return a;
+    }
+
+    // ---------byte***Simple ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteAndSimple() {
+        byte acc = (byte)0xFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteOrSimple() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteXorSimple() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteAddSimple() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMulSimple() {
+        byte acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMinSimple() {
+        byte acc = Byte.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc = (byte)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMaxSimple() {
+        byte acc = Byte.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = in1B[i];
+            acc = (byte)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------byte***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteAndDotProduct() {
+        byte acc = (byte)0xFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteOrDotProduct() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteXorDotProduct() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteAddDotProduct() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMulDotProduct() {
+        byte acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMinDotProduct() {
+        byte acc = Byte.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc = (byte)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMaxDotProduct() {
+        byte acc = Byte.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)(in1B[i] * in2B[i]);
+            acc = (byte)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------byte***Big ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteAndBig() {
+        byte acc = (byte)0xFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteOrBig() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteXorBig() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteAddBig() {
+        byte acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMulBig() {
+        byte acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMinBig() {
+        byte acc = Byte.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc = (byte)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    private static byte byteMaxBig() {
+        byte acc = Byte.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            byte val = (byte)((in1B[i] * in2B[i]) + (in1B[i] * in3B[i]) + (in2B[i] * in3B[i]));
+            acc = (byte)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------char***Simple ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charAndSimple() {
+        char acc = (char)0xFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charOrSimple() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charXorSimple() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charAddSimple() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMulSimple() {
+        char acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMinSimple() {
+        char acc = Character.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc = (char)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMaxSimple() {
+        char acc = Character.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = in1C[i];
+            acc = (char)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------char***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charAndDotProduct() {
+        char acc = (char)0xFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charOrDotProduct() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charXorDotProduct() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charAddDotProduct() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMulDotProduct() {
+        char acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMinDotProduct() {
+        char acc = Character.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc = (char)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMaxDotProduct() {
+        char acc = Character.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)(in1C[i] * in2C[i]);
+            acc = (char)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------char***Big ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charAndBig() {
+        char acc = (char)0xFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charOrBig() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charXorBig() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charAddBig() {
+        char acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMulBig() {
+        char acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMinBig() {
+        char acc = Character.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc = (char)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_C) // does not vectorize for now, might in the future.
+    private static char charMaxBig() {
+        char acc = Character.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            char val = (char)((in1C[i] * in2C[i]) + (in1C[i] * in3C[i]) + (in2C[i] * in3C[i]));
+            acc = (char)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------short***Simple ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortAndSimple() {
+        short acc = (short)0xFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortOrSimple() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortXorSimple() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortAddSimple() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMulSimple() {
+        short acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMinSimple() {
+        short acc = Short.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc = (short)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMaxSimple() {
+        short acc = Short.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = in1S[i];
+            acc = (short)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------short***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortAndDotProduct() {
+        short acc = (short)0xFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortOrDotProduct() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortXorDotProduct() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortAddDotProduct() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMulDotProduct() {
+        short acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMinDotProduct() {
+        short acc = Short.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc = (short)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMaxDotProduct() {
+        short acc = Short.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)(in1S[i] * in2S[i]);
+            acc = (short)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------short***Big ------------------------------------------------------------
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortAndBig() {
+        short acc = (short)0xFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortOrBig() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortXorBig() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortAddBig() {
+        short acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMulBig() {
+        short acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMinBig() {
+        short acc = Short.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc = (short)Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    private static short shortMaxBig() {
+        short acc = Short.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            short val = (short)((in1S[i] * in2S[i]) + (in1S[i] * in3S[i]) + (in2S[i] * in3S[i]));
+            acc = (short)Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------int***Simple ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intAndSimple() {
+        int acc = 0xFFFFFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,  "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intOrSimple() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intXorSimple() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0",
+                  IRNode.ADD_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intAddSimple() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.MUL_REDUCTION_VI, "> 0",
+                  IRNode.MUL_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMulSimple() {
+        int acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMinSimple() {
+        int acc = Integer.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMaxSimple() {
+        int acc = Integer.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------int***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intAndDotProduct() {
+        int acc = 0xFFFFFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,  "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intOrDotProduct() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intXorDotProduct() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0",
+                  IRNode.ADD_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intAddDotProduct() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.MUL_REDUCTION_VI, "> 0",
+                  IRNode.MUL_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMulDotProduct() {
+        int acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMinDotProduct() {
+        int acc = Integer.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMaxDotProduct() {
+        int acc = Integer.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = in1I[i] * in2I[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------int***Big ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intAndBig() {
+        int acc = 0xFFFFFFFF; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,  "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intOrBig() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intXorBig() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0",
+                  IRNode.ADD_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intAddBig() {
+        int acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.MUL_REDUCTION_VI, "> 0",
+                  IRNode.MUL_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMulBig() {
+        int acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMinBig() {
+        int acc = Integer.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_I,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static int intMaxBig() {
+        int acc = Integer.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            int val = (in1I[i] * in2I[i]) + (in1I[i] * in3I[i]) + (in2I[i] * in3I[i]);
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------long***Simple ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VL,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longAndSimple() {
+        long acc = 0xFFFFFFFFFFFFFFFFL; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,  "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VL,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longOrSimple() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VL,          "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longXorSimple() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.ADD_REDUCTION_VL, "> 0",
+                  IRNode.ADD_VL,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longAddSimple() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.MUL_REDUCTION_VL, "> 0",
+                  IRNode.MUL_VL,           "> 0"}, // vector accumulator
+        applyIfCPUFeature = {"avx512dq", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512dq", "false", "sse4.1", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370673
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.MUL_REDUCTION_VL, "> 0",
+                  IRNode.MUL_VL,           "= 0"}, // Reduction NOT moved out of loop
+        applyIfCPUFeatureOr = {"asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    // Note: NEON does not support MulVL for auto vectorization. There is
+    //       a scalarized implementation, but that is not profitable for
+    //       auto vectorization in almost all cases, and would not be
+    //       profitable here at any rate.
+    //       Hence, we have to keep the reduction inside the loop, and
+    //       cannot use the MulVL as the vector accumulator.
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMulSimple() {
+        long acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VL,          "> 0"},
+        applyIfCPUFeatureOr = {"avx512", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512", "false", "avx2", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370671
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMinSimple() {
+        long acc = Long.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VL,          "> 0"},
+        applyIfCPUFeatureOr = {"avx512", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512", "false", "avx2", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370671
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMaxSimple() {
+        long acc = Long.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------long***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VL,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While AndReductionV is implemented in NEON (see longAndSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longAndDotProduct() {
+        long acc = 0xFFFFFFFFFFFFFFFFL; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,  "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VL,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While OrReductionV is implemented in NEON (see longOrSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longOrDotProduct() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VL,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longXorSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longXorDotProduct() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.ADD_REDUCTION_VL, "> 0",
+                  IRNode.ADD_VL,           "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longAddSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longAddDotProduct() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.MUL_REDUCTION_VL, "> 0",
+                  IRNode.MUL_VL,           "> 0"},
+        applyIfCPUFeature = {"avx512dq", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512dq", "false", "sse4.1", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370673
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // MulVL is not implemented on NEON, so we also not have the reduction.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMulDotProduct() {
+        long acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VL,          "> 0"},
+        applyIfCPUFeature = {"avx512", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512", "false", "avx2", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370671
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longMinSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMinDotProduct() {
+        long acc = Long.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VL,          "> 0"},
+        applyIfCPUFeature = {"avx512", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512", "false", "avx2", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370671
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longMaxSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMaxDotProduct() {
+        long acc = Long.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = in1L[i] * in2L[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------long***Big ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VL,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While AndReductionV is implemented in NEON (see longAndSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longAndBig() {
+        long acc = 0xFFFFFFFFFFFFFFFFL; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc &= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,  "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VL,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While OrReductionV is implemented in NEON (see longOrSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longOrBig() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc |= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VL,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longXorSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longXorBig() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc ^= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.ADD_REDUCTION_VL, "> 0",
+                  IRNode.ADD_VL,           "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longAddSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longAddBig() {
+        long acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,    "> 0",
+                  IRNode.MUL_REDUCTION_VL, "> 0",
+                  IRNode.MUL_VL,           "> 0"},
+        applyIfCPUFeature = {"avx512dq", "true"},
+        applyIfAnd = {"AutoVectorizationOverrideProfitability", "> 0",
+                      "LoopUnrollLimit", ">= 1000"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeature = {"avx512dq", "true"},
+        applyIfAnd = {"AutoVectorizationOverrideProfitability", "> 0",
+                      "LoopUnrollLimit", "< 1000"})
+    // Increasing the body limit seems to help. Filed for investigation: JDK-8370685
+    // If you can eliminate this exception for LoopUnrollLimit, please remove
+    // the flag completely from the test, also the "addFlags" at the top.
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // MulVL is not implemented on NEON, so we also not have the reduction.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMulBig() {
+        long acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VL,          "> 0"},
+        applyIfCPUFeature = {"avx512", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512", "false", "avx2", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370671
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longMinSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMinBig() {
+        long acc = Long.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VL,          "> 0"},
+        applyIfCPUFeature = {"avx512", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"avx512", "false", "avx2", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370671
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // While MaxReductionV is implemented in NEON (see longMaxSimple), MulVL is not.
+    // Filed: JDK-8370686
+    @IR(failOn = IRNode.LOAD_VECTOR_L,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static long longMaxBig() {
+        long acc = Long.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            long val = (in1L[i] * in2L[i]) + (in1L[i] * in3L[i]) + (in2L[i] * in3L[i]);
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------float***Simple ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.ADD_VF,          "= 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"})
+    // Not considered profitable by cost model, but if forced we can vectorize.
+    // Scalar: n loads + n adds
+    // Vector: n loads + n adds + n extract (sequential order of reduction)
+    private static float floatAddSimple() {
+        float acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,    "> 0",
+                  IRNode.MUL_REDUCTION_VF, "> 0",
+                  IRNode.MUL_VF,           "= 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"})
+    // Not considered profitable by cost model, but if forced we can vectorize.
+    // Scalar: n loads + n mul
+    // Vector: n loads + n mul + n extract (sequential order of reduction)
+    private static float floatMulSimple() {
+        float acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VF,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMinSimple() {
+        float acc = Float.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VF,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMaxSimple() {
+        float acc = Float.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------float***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.ADD_VF,          "= 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatAddDotProduct() {
+        float acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i] * in2F[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,    "> 0",
+                  IRNode.MUL_REDUCTION_VF, "> 0",
+                  IRNode.MUL_VF,           "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMulDotProduct() {
+        float acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i] * in2F[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VF,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMinDotProduct() {
+        float acc = Float.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i] * in2F[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VF,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMaxDotProduct() {
+        float acc = Float.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = in1F[i] * in2F[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------float***Big ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.ADD_VF,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatAddBig() {
+        float acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = (in1F[i] * in2F[i]) + (in1F[i] * in3F[i]) + (in2F[i] * in3F[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,    "> 0",
+                  IRNode.MUL_REDUCTION_VF, "> 0",
+                  IRNode.MUL_VF,           "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMulBig() {
+        float acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = (in1F[i] * in2F[i]) + (in1F[i] * in3F[i]) + (in2F[i] * in3F[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VF,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMinBig() {
+        float acc = Float.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = (in1F[i] * in2F[i]) + (in1F[i] * in3F[i]) + (in2F[i] * in3F[i]);
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VF,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_F,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static float floatMaxBig() {
+        float acc = Float.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            float val = (in1F[i] * in2F[i]) + (in1F[i] * in3F[i]) + (in2F[i] * in3F[i]);
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------double***Simple ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,    "> 0",
+                  IRNode.ADD_REDUCTION_VD, "> 0",
+                  IRNode.ADD_VD,           "= 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"})
+    // Not considered profitable by cost model, but if forced we can vectorize.
+    // Scalar: n loads + n adds
+    // Vector: n loads + n adds + n extract (sequential order of reduction)
+    private static double doubleAddSimple() {
+        double acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,    "> 0",
+                  IRNode.MUL_REDUCTION_VD, "> 0",
+                  IRNode.MUL_VD,           "= 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"})
+    // Not considered profitable by cost model, but if forced we can vectorize.
+    // Scalar: n loads + n mul
+    // Vector: n loads + n mul + n extract (sequential order of reduction)
+    private static double doubleMulSimple() {
+        double acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VD,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMinSimple() {
+        double acc = Double.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VD,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMaxSimple() {
+        double acc = Double.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------double***DotProduct ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.ADD_VD,          "= 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleAddDotProduct() {
+        double acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i] * in2D[i];
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,    "> 0",
+                  IRNode.MUL_REDUCTION_VD, "> 0",
+                  IRNode.MUL_VD,           "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMulDotProduct() {
+        double acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i] * in2D[i];
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VD,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMinDotProduct() {
+        double acc = Double.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i] * in2D[i];
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VD,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMaxDotProduct() {
+        double acc = Double.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = in1D[i] * in2D[i];
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+    // ---------double***Big ------------------------------------------------------------
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.ADD_VD,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleAddBig() {
+        double acc = 0; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = (in1D[i] * in2D[i]) + (in1D[i] * in3D[i]) + (in2D[i] * in3D[i]);
+            acc += val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,    "> 0",
+                  IRNode.MUL_REDUCTION_VD, "> 0",
+                  IRNode.MUL_VD,           "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIfCPUFeatureAnd = {"asimd", "true"})
+    // I think this could vectorize, but currently does not. Filed: JDK-8370677
+    // But: it is not clear that it would be profitable, given the sequential reduction.
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMulBig() {
+        double acc = 1; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = (in1D[i] * in2D[i]) + (in1D[i] * in3D[i]) + (in2D[i] * in3D[i]);
+            acc *= val;
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VD,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMinBig() {
+        double acc = Double.MAX_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = (in1D[i] * in2D[i]) + (in1D[i] * in3D[i]) + (in2D[i] * in3D[i]);
+            acc = Math.min(acc, val);
+        }
+        return acc;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_D,   "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VD,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_D,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
+    private static double doubleMaxBig() {
+        double acc = Double.MIN_VALUE; // neutral element
+        for (int i = 0; i < SIZE; i++) {
+            double val = (in1D[i] * in2D[i]) + (in1D[i] * in3D[i]) + (in2D[i] * in3D[i]);
+            acc = Math.max(acc, val);
+        }
+        return acc;
+    }
+
+
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java b/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
index ec614cb324b..63fbf030083 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
@@ -28,6 +28,10 @@ import org.openjdk.jmh.infra.*;
 import java.util.concurrent.TimeUnit;
 import java.util.Random;
 
+/**
+ * Note: there is a corresponding IR test:
+ * test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java
+ */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)

From 0bae56b6149f87e8ebd09291f96033d3e558263b Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Mon, 10 Nov 2025 16:34:31 +0000
Subject: [PATCH 113/512] 8367857: Implement JEP 525: Structured Concurrency
 (Sixth Preview)

Reviewed-by: vklang
---
 .../classes/java/util/concurrent/Joiners.java |  77 +--
 .../util/concurrent/StructuredTaskScope.java  | 395 ++++++++------
 .../concurrent/StructuredTaskScopeImpl.java   | 115 ++--
 .../jdk/internal/javac/PreviewFeature.java    |   2 +-
 .../StressCancellation.java                   |   2 +-
 .../StructuredTaskScopeTest.java              | 504 +++++++++++++++---
 6 files changed, 783 insertions(+), 312 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/Joiners.java b/src/java.base/share/classes/java/util/concurrent/Joiners.java
index 768e260803e..5d2a0f23ad7 100644
--- a/src/java.base/share/classes/java/util/concurrent/Joiners.java
+++ b/src/java.base/share/classes/java/util/concurrent/Joiners.java
@@ -34,7 +34,6 @@ import java.util.Objects;
 import java.util.concurrent.StructuredTaskScope.Joiner;
 import java.util.concurrent.StructuredTaskScope.Subtask;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 import jdk.internal.invoke.MhUtil;
 
 /**
@@ -64,29 +63,30 @@ class Joiners {
     }
 
     /**
-     * A joiner that returns a stream of all subtasks when all subtasks complete
+     * A joiner that returns a list of all results when all subtasks complete
      * successfully. Cancels the scope if any subtask fails.
      */
-    static final class AllSuccessful<T> implements Joiner<T, Stream<Subtask<T>>> {
+    static final class AllSuccessful<T> implements Joiner<T, List<T>> {
         private static final VarHandle FIRST_EXCEPTION =
                 MhUtil.findVarHandle(MethodHandles.lookup(), "firstException", Throwable.class);
 
-        // list of forked subtasks, only accessed by owner thread
-        private final List<Subtask<T>> subtasks = new ArrayList<>();
+        // list of forked subtasks, created lazily, only accessed by owner thread
+        private List<Subtask<T>> subtasks;
 
         private volatile Throwable firstException;
 
         @Override
-        public boolean onFork(Subtask<? extends T> subtask) {
+        public boolean onFork(Subtask<T> subtask) {
             ensureUnavailable(subtask);
-            @SuppressWarnings("unchecked")
-            var s = (Subtask<T>) subtask;
-            subtasks.add(s);
+            if (subtasks == null) {
+                subtasks = new ArrayList<>();
+            }
+            subtasks.add(subtask);
             return false;
         }
 
         @Override
-        public boolean onComplete(Subtask<? extends T> subtask) {
+        public boolean onComplete(Subtask<T> subtask) {
             Subtask.State state = ensureCompleted(subtask);
             return (state == Subtask.State.FAILED)
                     && (firstException == null)
@@ -94,12 +94,17 @@ class Joiners {
         }
 
         @Override
-        public Stream<Subtask<T>> result() throws Throwable {
+        public List<T> result() throws Throwable {
             Throwable ex = firstException;
-            if (ex != null) {
-                throw ex;
-            } else {
-                return subtasks.stream();
+            try {
+                if (ex != null) {
+                    throw ex;
+                }
+                return (subtasks != null)
+                        ? subtasks.stream().map(Subtask::get).toList()
+                        : List.of();
+            } finally {
+                subtasks = null;  // allow subtasks to be GC'ed
             }
         }
     }
@@ -130,7 +135,7 @@ class Joiners {
         }
 
         @Override
-        public boolean onComplete(Subtask<? extends T> subtask) {
+        public boolean onComplete(Subtask<T> subtask) {
             Subtask.State state = ensureCompleted(subtask);
             Subtask<T> s;
             while (((s = this.subtask) == null)
@@ -166,7 +171,7 @@ class Joiners {
         private volatile Throwable firstException;
 
         @Override
-        public boolean onComplete(Subtask<? extends T> subtask) {
+        public boolean onComplete(Subtask<T> subtask) {
             Subtask.State state = ensureCompleted(subtask);
             return (state == Subtask.State.FAILED)
                     && (firstException == null)
@@ -185,36 +190,48 @@ class Joiners {
     }
 
     /**
-     * A joiner that returns a stream of all subtasks.
+     * A joiner that returns a list of all subtasks.
      */
-    static final class AllSubtasks<T> implements Joiner<T, Stream<Subtask<T>>> {
-        private final Predicate<Subtask<? extends T>> isDone;
+    static final class AllSubtasks<T> implements Joiner<T, List<Subtask<T>>> {
+        private final Predicate<Subtask<T>> isDone;
 
-        // list of forked subtasks, only accessed by owner thread
-        private final List<Subtask<T>> subtasks = new ArrayList<>();
+        // list of forked subtasks, created lazily, only accessed by owner thread
+        private List<Subtask<T>> subtasks;
 
-        AllSubtasks(Predicate<Subtask<? extends T>> isDone) {
+        AllSubtasks(Predicate<Subtask<T>> isDone) {
             this.isDone = Objects.requireNonNull(isDone);
         }
 
         @Override
-        public boolean onFork(Subtask<? extends T> subtask) {
+        public boolean onFork(Subtask<T> subtask) {
             ensureUnavailable(subtask);
-            @SuppressWarnings("unchecked")
-            var s = (Subtask<T>) subtask;
-            subtasks.add(s);
+            if (subtasks == null) {
+                subtasks = new ArrayList<>();
+            }
+            subtasks.add(subtask);
             return false;
         }
 
         @Override
-        public boolean onComplete(Subtask<? extends T> subtask) {
+        public boolean onComplete(Subtask<T> subtask) {
             ensureCompleted(subtask);
             return isDone.test(subtask);
         }
 
         @Override
-        public Stream<Subtask<T>> result() {
-            return subtasks.stream();
+        public void onTimeout() {
+            // do nothing, this joiner does not throw TimeoutException
+        }
+
+        @Override
+        public List<Subtask<T>> result() {
+            if (subtasks != null) {
+                List<Subtask<T>> result = List.copyOf(subtasks);
+                subtasks = null;  // allow subtasks to be GC'ed
+                return result;
+            } else {
+                return List.of();
+            }
         }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
index 0088e486d4a..941d6bd55cb 100644
--- a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
+++ b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
@@ -25,10 +25,10 @@
 package java.util.concurrent;
 
 import java.time.Duration;
-import java.util.function.Function;
+import java.util.List;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.stream.Stream;
+import java.util.function.UnaryOperator;
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -51,9 +51,9 @@ import jdk.internal.javac.PreviewFeature;
  * To ensure correct usage, the {@code fork}, {@code join} and {@code close} methods may
  * only be invoked by the <em>owner thread</em> (the thread that opened the {@code
  * StructuredTaskScope}), the {@code fork} method may not be called after {@code join},
- * the {@code join} method may only be invoked once, and the {@code close} method throws
- * an exception after closing if the owner did not invoke the {@code join} method after
- * forking subtasks.
+ * the {@code join} method must be invoked to get the outcome after forking subtasks, and
+ * the {@code close} method throws an exception after closing if the owner did not invoke
+ * the {@code join} method after forking subtasks.
  *
  * <p> As a first example, consider a task that splits into two subtasks to concurrently
  * fetch resources from two URL locations "left" and "right". Both subtasks may complete
@@ -107,10 +107,10 @@ import jdk.internal.javac.PreviewFeature;
  * implements the desired policy. A {@code Joiner} handles subtask completion and produces
  * the outcome for the {@link #join() join} method. In the example above, {@code join}
  * returns {@code null}. Depending on the {@code Joiner}, {@code join} may return a
- * result, a stream of elements, or some other object. The {@code Joiner} interface defines
+ * result, a list of elements, or some other object. The {@code Joiner} interface defines
  * factory methods to create {@code Joiner}s for some common cases.
  *
- * <p> A {@code Joiner} may <a id="Cancallation">cancel</a> the scope (sometimes called
+ * <p> A {@code Joiner} may <a id="Cancellation">cancel</a> the scope (sometimes called
  * "short-circuiting") when some condition is reached that does not require the result of
  * subtasks that are still executing. Cancelling the scope prevents new threads from being
  * started to execute further subtasks, {@linkplain Thread#interrupt() interrupts} the
@@ -124,13 +124,13 @@ import jdk.internal.javac.PreviewFeature;
  * <p> Now consider another example that splits into two subtasks. In this example,
  * each subtask produces a {@code String} result and the task is only interested in
  * the result from the first subtask to complete successfully. The example uses {@link
- * Joiner#anySuccessfulResultOrThrow() Joiner.anySuccessfulResultOrThrow()} to
- * create a {@code Joiner} that makes available the result of the first subtask to
- * complete successfully. The type parameter in the example is "{@code String}" so that
- * only subtasks that return a {@code String} can be forked.
+ * Joiner#anySuccessfulOrThrow() Joiner.anySuccessfulOrThrow()} to create a {@code Joiner}
+ * that makes available the result of the first subtask to complete successfully. The type
+ * parameter in the example is "{@code String}" so that only subtasks that return a
+ * {@code String} can be forked.
  * {@snippet lang=java :
  *    // @link substring="open" target="#open(Joiner)" :
- *    try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow())) {
+ *    try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulOrThrow())) {
  *
  *        scope.fork(callable1);
  *        scope.fork(callable2);
@@ -154,8 +154,9 @@ import jdk.internal.javac.PreviewFeature;
  * the {@code Joiner} and usage. Some {@code Joiner} implementations are suited to subtasks
  * that return results of the same type and where the {@code join} method returns a result
  * for the task to use. Code that forks subtasks that return results of different
- * types, and uses a {@code Joiner} such as {@code Joiner.awaitAllSuccessfulOrThrow()} that
- * does not return a result, will use {@link Subtask#get() Subtask.get()} after joining.
+ * types, and uses a {@code Joiner} such as {@link Joiner#awaitAllSuccessfulOrThrow()
+ * awaitAllSuccessfulOrThrow} that does not return a result, will use {@link Subtask#get()
+ * Subtask.get()} after joining.
  *
  * <h2>Exception handling</h2>
  *
@@ -198,23 +199,22 @@ import jdk.internal.javac.PreviewFeature;
  *
  * <h2>Configuration</h2>
  *
- *
  * A {@code StructuredTaskScope} is opened with {@linkplain Configuration configuration}
- * that consists of a {@link ThreadFactory} to create threads, an optional name for
- * monitoring and management purposes, and an optional timeout.
+ * that consists of a {@link ThreadFactory} to create threads, an optional name for the
+ * scope, and an optional timeout. The name is intended for monitoring and management
+ * purposes.
  *
  * <p> The {@link #open()} and {@link #open(Joiner)} methods create a {@code StructuredTaskScope}
  * with the <a id="DefaultConfiguration"> <em>default configuration</em></a>. The default
- * configuration has a {@code ThreadFactory} that creates unnamed
- * <a href="{@docRoot}/java.base/java/lang/Thread.html#virtual-threads">virtual threads</a>,
- * is unnamed for monitoring and management purposes, and has no timeout.
+ * configuration has a {@code ThreadFactory} that creates unnamed {@linkplain
+ * Thread##virtual-threads virtual threads}, does not name the scope, and has no timeout.
  *
- * <p> The 2-arg {@link #open(Joiner, Function) open} method can be used to create a
- * {@code StructuredTaskScope} that uses a different {@code ThreadFactory}, has a name for
- * the purposes of monitoring and management, or has a timeout that cancels the scope if
- * the timeout expires before or while waiting for subtasks to complete. The {@code open}
- * method is called with a {@linkplain Function function} that is applied to the default
- * configuration and returns a {@link Configuration Configuration} for the
+ * <p> The 2-arg {@link #open(Joiner, UnaryOperator) open} method can be used to create a
+ * {@code StructuredTaskScope} that uses a different {@code ThreadFactory}, is named for
+ * monitoring and management purposes, or has a timeout that cancels the scope if the
+ * timeout expires before or while waiting for subtasks to complete. The {@code open}
+ * method is called with an {@linkplain UnaryOperator operator} that is applied to the
+ * default configuration and returns a {@link Configuration Configuration} for the
  * {@code StructuredTaskScope} under construction.
  *
  * <p> The following example opens a new {@code StructuredTaskScope} with a {@code
@@ -237,9 +237,9 @@ import jdk.internal.javac.PreviewFeature;
  *
  * <p> A second example sets a timeout, represented by a {@link Duration}. The timeout
  * starts when the new scope is opened. If the timeout expires before the {@code join}
- * method has completed then the scope is <a href="#Cancallation">cancelled</a>. This
- * interrupts the threads executing the two subtasks and causes the {@link #join() join}
- * method to throw {@link TimeoutException}.
+ * method has completed then the scope is {@linkplain ##Cancellation cancelled} (this
+ * interrupts the threads executing the two subtasks), and the {@code join} method
+ * throws {@link TimeoutException TimeoutException}.
  * {@snippet lang=java :
  *    Duration timeout = Duration.ofSeconds(10);
  *
@@ -251,9 +251,7 @@ import jdk.internal.javac.PreviewFeature;
  *        scope.fork(callable1);
  *        scope.fork(callable2);
  *
- *        List<String> result = scope.join()
- *                                   .map(Subtask::get)
- *                                   .toList();
+ *        List<String> results = scope.join();
  *
  *   }
  * }
@@ -314,11 +312,10 @@ import jdk.internal.javac.PreviewFeature;
  *     });
  * }
  *
- * <p> A scoped value inherited into a subtask may be
- * <a href="{@docRoot}/java.base/java/lang/ScopedValue.html#rebind">rebound</a> to a new
- * value in the subtask for the bounded execution of some method executed in the subtask.
- * When the method completes, the value of the {@code ScopedValue} reverts to its previous
- * value, the value inherited from the thread executing the task.
+ * <p> A scoped value inherited into a subtask may be {@linkplain ScopedValue##rebind
+ * rebound} to a new value in the subtask for the bounded execution of some method executed
+ * in the subtask. When the method completes, the value of the {@code ScopedValue} reverts
+ * to its previous value, the value inherited from the thread executing the task.
  *
  * <p> A subtask may execute code that itself opens a new {@code StructuredTaskScope}.
  * A task executing in thread T1 opens a {@code StructuredTaskScope} and forks a
@@ -331,11 +328,15 @@ import jdk.internal.javac.PreviewFeature;
  *
  * <h2>Memory consistency effects</h2>
  *
- * <p> Actions in the owner thread of a {@code StructuredTaskScope} prior to
- * {@linkplain #fork forking} of a subtask
- * <a href="{@docRoot}/java.base/java/util/concurrent/package-summary.html#MemoryVisibility">
- * <i>happen-before</i></a> any actions taken by that subtask, which in turn
- * <i>happen-before</i> the subtask result is {@linkplain Subtask#get() retrieved}.
+ * <p> Actions in the owner thread of a {@code StructuredTaskScope} prior to {@linkplain
+ * #fork forking} of a subtask {@linkplain java.util.concurrent##MemoryVisibility
+ * <i>happen-before</i>} any actions taken by the thread that executes the subtask, which
+ * in turn <i>happen-before</i> actions in any thread that successfully obtains the
+ * subtask outcome with {@link Subtask#get() Subtask.get()} or {@link Subtask#exception()
+ * Subtask.exception()}. If a subtask's outcome contributes to the result or exception
+ * from {@link #join()}, then any actions taken by the thread executing that subtask
+ * <i>happen-before</i> the owner thread returns from {@code join} with a result or
+ * {@link FailedException FailedException}.
  *
  * <h2>General exceptions</h2>
  *
@@ -405,16 +406,20 @@ public sealed interface StructuredTaskScope<T, R>
          * {@link #fork(Runnable) fork(Runnable)} then {@code null} is returned.
          *
          * <p> Code executing in the scope owner thread can use this method to get the
-         * result of a successful subtask only after it has {@linkplain #join() joined}.
+         * result of a successful subtask after it has {@linkplain #join() joined}.
          *
          * <p> Code executing in the {@code Joiner} {@link Joiner#onComplete(Subtask)
          * onComplete} method should test that the {@linkplain #state() subtask state} is
          * {@link State#SUCCESS SUCCESS} before using this method to get the result.
          *
+         * <p> This method may be invoked by any thread after the scope owner has joined.
+         * The only case where this method can be used to get the result before the scope
+         * owner has joined is when called from the {@code onComplete(Subtask)} method.
+         *
          * @return the possibly-null result
-         * @throws IllegalStateException if the subtask has not completed, did not complete
-         * successfully, or the current thread is the scope owner invoking this
-         * method before {@linkplain #join() joining}
+         * @throws IllegalStateException if the subtask has not completed or did not
+         * complete successfully, or this method if invoked outside the context of the
+         * {@code onComplete(Subtask)} method before the owner thread has joined
          * @see State#SUCCESS
          */
         T get();
@@ -427,15 +432,19 @@ public sealed interface StructuredTaskScope<T, R>
          * exception or error thrown by the {@link Runnable#run() run} method is returned.
          *
          * <p> Code executing in the scope owner thread can use this method to get the
-         * exception thrown by a failed subtask only after it has {@linkplain #join() joined}.
+         * exception thrown by a failed subtask after it has {@linkplain #join() joined}.
          *
          * <p> Code executing in a {@code Joiner} {@link Joiner#onComplete(Subtask)
          * onComplete} method should test that the {@linkplain #state() subtask state} is
          * {@link State#FAILED FAILED} before using this method to get the exception.
          *
-         * @throws IllegalStateException if the subtask has not completed, completed with
-         * a result, or the current thread is the scope owner invoking this method
-         * before {@linkplain #join() joining}
+         * <p> This method may be invoked by any thread after the scope owner has joined.
+         * The only case where this method can be used to get the exception before the scope
+         * owner has joined is when called from the {@code onComplete(Subtask)} method.
+         *
+         * @throws IllegalStateException if the subtask has not completed or completed
+         * with a result, or this method if invoked outside the context of the {@code
+         * onComplete(Subtask)} method before the owner thread has joined
          * @see State#FAILED
          */
         Throwable exception();
@@ -449,22 +458,22 @@ public sealed interface StructuredTaskScope<T, R>
      * <p> Joiner defines static methods to create {@code Joiner} objects for common cases:
      * <ul>
      *   <li> {@link #allSuccessfulOrThrow() allSuccessfulOrThrow()} creates a {@code Joiner}
-     *   that yields a stream of the completed subtasks for {@code join} to return when
-     *   all subtasks complete successfully. It cancels the scope and causes {@code join}
-     *   to throw if any subtask fails.
-     *   <li> {@link #anySuccessfulResultOrThrow() anySuccessfulResultOrThrow()} creates a
-     *   {@code Joiner} that yields the result of the first subtask to succeed for {@code
-     *   join} to return. It causes {@code join} to throw if all subtasks fail.
+     *   that yields a list of all results for {@code join} to return when all subtasks
+     *   complete successfully. It cancels the scope and causes {@code join} to throw if
+     *   any subtask fails.
+     *   <li> {@link #anySuccessfulOrThrow() anySuccessfulOrThrow()} creates a {@code Joiner}
+     *   that yields the result of the first subtask to succeed for {@code join} to return.
+     *   It causes {@code join} to throw if all subtasks fail.
      *   <li> {@link #awaitAllSuccessfulOrThrow() awaitAllSuccessfulOrThrow()} creates a
      *   {@code Joiner} that waits for all successful subtasks. It cancels the scope and
      *   causes {@code join} to throw if any subtask fails.
      *   <li> {@link #awaitAll() awaitAll()} creates a {@code Joiner} that waits for all
-     *   subtasks. It does not cancel the scope or cause {@code join} to throw.
+     *   subtasks to complete. It does not cancel the scope or cause {@code join} to throw.
      * </ul>
      *
      * <p> In addition to the methods to create {@code Joiner} objects for common cases,
      * the {@link #allUntil(Predicate) allUntil(Predicate)} method is defined to create a
-     * {@code Joiner} that yields a stream of all subtasks. It is created with a {@link
+     * {@code Joiner} that yields a list of all subtasks. It is created with a {@link
      * Predicate Predicate} that determines if the scope should continue or be cancelled.
      * This {@code Joiner} can be built upon to create custom policies that cancel the
      * scope based on some condition.
@@ -472,22 +481,34 @@ public sealed interface StructuredTaskScope<T, R>
      * <p> More advanced policies can be developed by implementing the {@code Joiner}
      * interface. The {@link #onFork(Subtask)} method is invoked when subtasks are forked.
      * The {@link #onComplete(Subtask)} method is invoked when subtasks complete with a
-     * result or exception. These methods return a {@code boolean} to indicate if scope
+     * result or exception. These methods return a {@code boolean} to indicate if the scope
      * should be cancelled. These methods can be used to collect subtasks, results, or
      * exceptions, and control when to cancel the scope. The {@link #result()} method
      * must be implemented to produce the result (or exception) for the {@code join}
      * method.
      *
+     * <p> If a {@code StructuredTaskScope} is opened with a {@linkplain
+     * Configuration#withTimeout(Duration) timeout}, and the timeout expires before or
+     * while waiting in {@link StructuredTaskScope#join() join()}, then the scope is
+     * {@linkplain StructuredTaskScope##Cancellation cancelled}, and the {@code Joiners}'s
+     * {@link #onTimeout()} method is invoked to notify the {@code Joiner} and optionally
+     * throw {@link TimeoutException TimeoutException}. If the {@code onTimeout()} method
+     * does not throw then the {@code join()} method will invoke the {@link #result()}
+     * method to produce a result. This result may be based on the outcome of subtasks
+     * that completed before the timeout expired.
+     *
      * <p> Unless otherwise specified, passing a {@code null} argument to a method
      * in this class will cause a {@link NullPointerException} to be thrown.
      *
-     * @implSpec Implementations of this interface must be thread safe. The {@link
-     * #onComplete(Subtask)} method defined by this interface may be invoked by several
-     * threads concurrently.
+     * @implSpec Implementations of this interface must be thread-safe. The {@link
+     * #onComplete(Subtask)} method may be invoked concurrently, as multiple subtasks can
+     * complete at the same time. Additionally, the {@code onComplete} method may be
+     * called concurrently with the scope owner thread invoking the {@link #onFork(Subtask)}
+     * or {@link #onTimeout()} methods.
      *
      * @apiNote It is very important that a new {@code Joiner} object is created for each
      * {@code StructuredTaskScope}. {@code Joiner} objects should never be shared with
-     * different scopes or re-used after a task is closed.
+     * different scopes or re-used after a scope is closed.
      *
      * <p> Designing a {@code Joiner} should take into account the code at the use-site
      * where the results from the {@link StructuredTaskScope#join() join} method are
@@ -502,13 +523,11 @@ public sealed interface StructuredTaskScope<T, R>
      * @see #open(Joiner)
      */
     @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
-    @FunctionalInterface
     interface Joiner<T, R> {
         /**
          * Invoked by {@link #fork(Callable) fork(Callable)} and {@link #fork(Runnable)
-         * fork(Runnable)} when forking a subtask. The method is invoked from the task
-         * owner thread. The method is invoked before a thread is created to run the
-         * subtask.
+         * fork(Runnable)} when forking a subtask. The method is invoked before a thread
+         * is created to run the subtask.
          *
          * @implSpec The default implementation throws {@code NullPointerException} if the
          * subtask is {@code null}. It throws {@code IllegalArgumentException} if the
@@ -521,7 +540,7 @@ public sealed interface StructuredTaskScope<T, R>
          * @param subtask the subtask
          * @return {@code true} to cancel the scope, otherwise {@code false}
          */
-        default boolean onFork(Subtask<? extends T> subtask) {
+        default boolean onFork(Subtask<T> subtask) {
             if (subtask.state() != Subtask.State.UNAVAILABLE) {
                 throw new IllegalArgumentException("Subtask not in UNAVAILABLE state");
             }
@@ -544,13 +563,34 @@ public sealed interface StructuredTaskScope<T, R>
          * @param subtask the subtask
          * @return {@code true} to cancel the scope, otherwise {@code false}
          */
-        default boolean onComplete(Subtask<? extends T> subtask) {
+        default boolean onComplete(Subtask<T> subtask) {
             if (subtask.state() == Subtask.State.UNAVAILABLE) {
                 throw new IllegalArgumentException("Subtask has not completed");
             }
             return false;
         }
 
+        /**
+         * Invoked by the {@link #join() join()} method if the scope was opened with a
+         * timeout, and the timeout expires before or while waiting in the {@code join}
+         * method.
+         *
+         * @implSpec The default implementation throws {@link TimeoutException TimeoutException}.
+         *
+         * @apiNote This method is intended for {@code Joiner} implementations that do not
+         * throw {@link TimeoutException TimeoutException}, or require a notification when
+         * the timeout expires before or while waiting in {@code join}.
+         *
+         * <p> This method is invoked by the {@code join} method. It should not be
+         * invoked directly.
+         *
+         * @throws TimeoutException for {@code join} to throw
+         * @since 26
+         */
+        default void onTimeout() {
+            throw new TimeoutException();
+        }
+
         /**
          * Invoked by the {@link #join() join()} method to produce the result (or exception)
          * after waiting for all subtasks to complete or the scope cancelled. The result
@@ -560,9 +600,7 @@ public sealed interface StructuredTaskScope<T, R>
          *
          * <p> In normal usage, this method will be called at most once by the {@code join}
          * method to produce the result (or exception). The behavior of this method when
-         * invoked directly, and invoked more than once, is undefined. Where possible, an
-         * implementation should return an equal result (or throw the same exception) on
-         * second or subsequent calls to produce the outcome.
+         * invoked directly is undefined.
          *
          * @apiNote This method is invoked by the {@code join} method. It should not be
          * invoked directly.
@@ -573,15 +611,17 @@ public sealed interface StructuredTaskScope<T, R>
         R result() throws Throwable;
 
         /**
-         * {@return a new Joiner object that yields a stream of all subtasks when all
+         * {@return a new Joiner object that yields a list of all results when all
          * subtasks complete successfully}
-         * The {@code Joiner} <a href="StructuredTaskScope.html#Cancallation">cancels</a>
+         * The {@code Joiner} {@linkplain StructuredTaskScope##Cancellation cancels}
          * the scope and causes {@code join} to throw if any subtask fails.
          *
-         * <p> If all subtasks complete successfully, the joiner's {@link Joiner#result()}
-         * method returns a stream of all subtasks in the order that they were forked.
-         * If any subtask failed then the {@code result} method throws the exception from
-         * the first subtask to fail.
+         * <p> If all subtasks complete successfully then the joiner's {@link
+         * Joiner#result()} method returns a list of all results, in the order that the
+         * subtasks were forked, for the {@link StructuredTaskScope#join() join()} to return.
+         * If the scope was opened with a {@linkplain Configuration#withTimeout(Duration)
+         * timeout}, and the timeout expires before or while waiting for all subtasks to
+         * complete, then the {@code join} method throws {@code TimeoutException}.
          *
          * @apiNote Joiners returned by this method are suited to cases where all subtasks
          * return a result of the same type. Joiners returned by {@link
@@ -590,7 +630,7 @@ public sealed interface StructuredTaskScope<T, R>
          *
          * @param <T> the result type of subtasks
          */
-        static <T> Joiner<T, Stream<Subtask<T>>> allSuccessfulOrThrow() {
+        static <T> Joiner<T, List<T>> allSuccessfulOrThrow() {
             return new Joiners.AllSuccessful<>();
         }
 
@@ -599,25 +639,33 @@ public sealed interface StructuredTaskScope<T, R>
          * completed successfully}
          * The {@code Joiner} causes {@code join} to throw if all subtasks fail.
          *
-         * <p> The joiner's {@link Joiner#result()} method returns the result of a subtask
-         * that completed successfully. If all subtasks fail then the {@code result} method
-         * throws the exception from one of the failed subtasks. The {@code result} method
-         * throws {@code NoSuchElementException} if no subtasks were forked.
+         * <p> The joiner's {@link Joiner#result()} method returns the result of a subtask,
+         * that completed successfully, for the {@link StructuredTaskScope#join() join()}
+         * to return. If all subtasks fail then the {@code result} method throws the
+         * exception from one of the failed subtasks. The {@code result} method throws
+         * {@code NoSuchElementException} if no subtasks were forked. If the scope was
+         * opened with a {@linkplain Configuration#withTimeout(Duration) timeout}, and
+         * the timeout expires before or while waiting for any subtask to complete
+         * successfully, then the {@code join} method throws {@code TimeoutException}.
          *
          * @param <T> the result type of subtasks
+         * @since 26
          */
-        static <T> Joiner<T, T> anySuccessfulResultOrThrow() {
+        static <T> Joiner<T, T> anySuccessfulOrThrow() {
             return new Joiners.AnySuccessful<>();
         }
 
         /**
          * {@return a new Joiner object that waits for subtasks to complete successfully}
-         * The {@code Joiner} <a href="StructuredTaskScope.html#Cancallation">cancels</a>
+         * The {@code Joiner} {@linkplain StructuredTaskScope##Cancellation cancels}
          * the scope and causes {@code join} to throw if any subtask fails.
          *
          * <p> The joiner's {@link Joiner#result() result} method returns {@code null}
          * if all subtasks complete successfully, or throws the exception from the first
-         * subtask to fail.
+         * subtask to fail. If the scope was opened with a {@linkplain
+         * Configuration#withTimeout(Duration) timeout}, and the timeout expires before or
+         * while waiting for all subtasks to complete, then the {@code join} method throws
+         * {@code TimeoutException}.
          *
          * @apiNote Joiners returned by this method are suited to cases where subtasks
          * return results of different types. Joiners returned by {@link #allSuccessfulOrThrow()}
@@ -634,6 +682,9 @@ public sealed interface StructuredTaskScope<T, R>
          * The {@code Joiner} does not cancel the scope if a subtask fails.
          *
          * <p> The joiner's {@link Joiner#result() result} method returns {@code null}.
+         * If the scope was opened with a {@linkplain Configuration#withTimeout(Duration)
+         * timeout}, and the timeout expires before or while waiting for all subtasks to
+         * complete, then the {@code join} method throws {@code TimeoutException}.
          *
          * @apiNote This Joiner is useful for cases where subtasks make use of
          * <em>side-effects</em> rather than return results or fail with exceptions.
@@ -668,33 +719,40 @@ public sealed interface StructuredTaskScope<T, R>
         }
 
         /**
-         * {@return a new Joiner object that yields a stream of all subtasks when all
+         * {@return a new Joiner object that yields a list of all subtasks when all
          * subtasks complete or a predicate returns {@code true} to cancel the scope}
          *
-         * <p> The joiner's {@link Joiner#onComplete(Subtask)} method invokes the
-         * predicate's {@link Predicate#test(Object) test} method with the subtask that
-         * completed successfully or failed with an exception. If the {@code test} method
-         * returns {@code true} then <a href="StructuredTaskScope.html#Cancallation">
-         * the scope is cancelled</a>. The {@code test} method must be thread safe as it
+         * <p> The joiner's {@link #onComplete(Subtask)} method invokes the predicate's
+         * {@link Predicate#test(Object) test} method with the subtask that completed
+         * successfully or failed with an exception. If the {@code test} method
+         * returns {@code true} then {@linkplain StructuredTaskScope##Cancellation
+         * the scope is cancelled}. The {@code test} method must be thread safe as it
          * may be invoked concurrently from several threads. If the {@code test} method
          * completes with an exception or error, then the thread that executed the subtask
          * invokes the {@linkplain Thread.UncaughtExceptionHandler uncaught exception handler}
          * with the exception or error before the thread terminates.
          *
-         * <p> The joiner's {@link #result()} method returns the stream of all subtasks,
-         * in fork order. The stream may contain subtasks that have completed
+         * <p> The joiner's {@link #result()} method returns the list of all subtasks,
+         * in fork order. The list may contain subtasks that have completed
          * (in {@link Subtask.State#SUCCESS SUCCESS} or {@link Subtask.State#FAILED FAILED}
          * state) or subtasks in the {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state
          * if the scope was cancelled before all subtasks were forked or completed.
          *
+         * <p> The joiner's {@link #onTimeout()} method does nothing. If configured with
+         * a {@linkplain Configuration#withTimeout(Duration) timeout}, and the timeout
+         * expires before or while waiting in {@link StructuredTaskScope#join() join},
+         * then the {@link #result()} method returns the list of all subtasks.
+         * Subtasks that did not complete before the timeout expired will be in the
+         * {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state.
+         *
          * <p> The following example uses this method to create a {@code Joiner} that
-         * <a href="StructuredTaskScope.html#Cancallation">cancels</a> the scope when
-         * two or more subtasks fail.
+         * {@linkplain StructuredTaskScope##Cancellation cancels} the scope when two or
+         * more subtasks fail.
          * {@snippet lang=java :
-         *    class CancelAfterTwoFailures<T> implements Predicate<Subtask<? extends T>> {
+         *    class CancelAfterTwoFailures<T> implements Predicate<Subtask<T>> {
          *         private final AtomicInteger failedCount = new AtomicInteger();
          *         @Override
-         *         public boolean test(Subtask<? extends T> subtask) {
+         *         public boolean test(Subtask<T> subtask) {
          *             return subtask.state() == Subtask.State.FAILED
          *                     && failedCount.incrementAndGet() >= 2;
          *         }
@@ -710,15 +768,30 @@ public sealed interface StructuredTaskScope<T, R>
          *    <T> List<Subtask<T>> invokeAll(Collection<Callable<T>> tasks) throws InterruptedException {
          *        try (var scope = StructuredTaskScope.open(Joiner.<T>allUntil(_ -> false))) {
          *            tasks.forEach(scope::fork);
-         *            return scope.join().toList();
+         *            return scope.join();
          *        }
          *    }
          * }
          *
+         * <p> The following example uses {@code allUntil} to get the results of all
+         * subtasks that complete successfully within a timeout period.
+         * {@snippet lang=java :
+         *    <T> List<T> invokeAll(Collection<Callable<T>> tasks, Duration timeout) throws InterruptedException {
+         *    try (var scope = StructuredTaskScope.open(Joiner.<T>allUntil(_ -> false), cf -> cf.withTimeout(timeout))) {
+         *        tasks.forEach(scope::fork);
+         *        return scope.join()
+         *                 .stream()
+         *                 .filter(s -> s.state() == Subtask.State.SUCCESS)
+         *                 .map(Subtask::get)
+         *                 .toList();
+         *         }
+         *     }
+         * }
+         *
          * @param isDone the predicate to evaluate completed subtasks
          * @param <T> the result type of subtasks
          */
-        static <T> Joiner<T, Stream<Subtask<T>>> allUntil(Predicate<Subtask<? extends T>> isDone) {
+        static <T> Joiner<T, List<Subtask<T>>> allUntil(Predicate<Subtask<T>> isDone) {
             return new Joiners.AllSubtasks<>(isDone);
         }
     }
@@ -727,19 +800,13 @@ public sealed interface StructuredTaskScope<T, R>
      * Represents the configuration for a {@code StructuredTaskScope}.
      *
      * <p> The configuration for a {@code StructuredTaskScope} consists of a {@link
-     * ThreadFactory} to create threads, an optional name for the purposes of monitoring
-     * and management, and an optional timeout.
+     * ThreadFactory} to create threads, an optional name for the scope, and an optional
+     * timeout. The name is intended for monitoring and management purposes.
      *
-     * <p> Creating a {@code StructuredTaskScope} with {@link #open()} or {@link #open(Joiner)}
-     * uses the <a href="StructuredTaskScope.html#DefaultConfiguration">default
-     * configuration</a>. The default configuration consists of a thread factory that
-     * creates unnamed <a href="{@docRoot}/java.base/java/lang/Thread.html#virtual-threads">
-     * virtual threads</a>, no name for monitoring and management purposes, and no timeout.
-     *
-     * <p> Creating a {@code StructuredTaskScope} with its 2-arg {@link #open(Joiner, Function)
-     * open} method allows a different configuration to be used. The function specified
+     * <p> Creating a {@code StructuredTaskScope} with its 2-arg {@link #open(Joiner, UnaryOperator)
+     * open} method allows a different configuration to be used. The operator specified
      * to the {@code open} method is applied to the default configuration and returns the
-     * configuration for the {@code StructuredTaskScope} under construction. The function
+     * configuration for the {@code StructuredTaskScope} under construction. The operator
      * can use the {@code with-} prefixed methods defined here to specify the components
      * of the configuration to use.
      *
@@ -756,17 +823,17 @@ public sealed interface StructuredTaskScope<T, R>
          * a scope to create threads when {@linkplain #fork(Callable) forking} subtasks.
          * @param threadFactory the thread factory
          *
-         * @apiNote The thread factory will typically create
-         * <a href="{@docRoot}/java.base/java/lang/Thread.html#virtual-threads">virtual threads</a>,
-         * maybe with names for monitoring purposes, an {@linkplain Thread.UncaughtExceptionHandler
-         * uncaught exception handler}, or other properties configured.
+         * @apiNote The thread factory will typically create {@linkplain Thread##virtual-threads
+         * virtual threads}, maybe with names for monitoring purposes, an {@linkplain
+         * Thread.UncaughtExceptionHandler uncaught exception handler}, or other properties
+         * configured.
          *
          * @see #fork(Callable)
          */
         Configuration withThreadFactory(ThreadFactory threadFactory);
 
         /**
-         * {@return a new {@code Configuration} object with the given name}
+         * {@return a new {@code Configuration} object with the given scope name}
          * The other components are the same as this object. A scope is optionally
          * named for the purposes of monitoring and management.
          * @param name the name
@@ -783,6 +850,7 @@ public sealed interface StructuredTaskScope<T, R>
          * compute the timeout for this method.
          *
          * @see #join()
+         * @see Joiner#onTimeout()
          */
         Configuration withTimeout(Duration timeout);
     }
@@ -809,11 +877,13 @@ public sealed interface StructuredTaskScope<T, R>
     }
 
     /**
-     * Exception thrown by {@link #join()} if the scope was created with a timeout and
-     * the timeout expired before or while waiting in {@code join}.
+     * Exception thrown by {@link #join()} if the scope was opened with a timeout,
+     * the timeout expired before or while waiting in {@code join}, and the {@link
+     * Joiner#onTimeout() Joiner.onTimeout} method throws this exception.
      *
      * @since 25
      * @see Configuration#withTimeout(Duration)
+     * @see Joiner#onTimeout()
      */
     @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
     final class TimeoutException extends RuntimeException {
@@ -828,14 +898,14 @@ public sealed interface StructuredTaskScope<T, R>
 
     /**
      * Opens a new {@code StructuredTaskScope} to use the given {@code Joiner} object and
-     * with configuration that is the result of applying the given function to the
-     * <a href="#DefaultConfiguration">default configuration</a>.
+     * with configuration that is the result of applying the given operator to the
+     * {@linkplain ##DefaultConfiguration default configuration}.
      *
-     * <p> The {@code configFunction} is called with the default configuration and returns
-     * the configuration for the new scope. The function may, for example, set the
+     * <p> The {@code configOperator} is called with the default configuration and returns
+     * the configuration for the new scope. The operator may, for example, set the
      * {@linkplain Configuration#withThreadFactory(ThreadFactory) ThreadFactory} or set a
-     * {@linkplain Configuration#withTimeout(Duration) timeout}. If the function completes
-     * with an exception or error then it is propagated by this method. If the function
+     * {@linkplain Configuration#withTimeout(Duration) timeout}. If the operator completes
+     * with an exception or error then it is propagated by this method. If the operator
      * returns {@code null} then {@code NullPointerException} is thrown.
      *
      * <p> If a {@code ThreadFactory} is set then its {@link ThreadFactory#newThread(Runnable)
@@ -845,8 +915,9 @@ public sealed interface StructuredTaskScope<T, R>
      *
      * <p> If a {@linkplain Configuration#withTimeout(Duration) timeout} is set then it
      * starts when the scope is opened. If the timeout expires before the scope has
-     * {@linkplain #join() joined} then the scope is <a href="#Cancallation">cancelled</a>
-     * and the {@code join} method throws {@link TimeoutException}.
+     * {@linkplain #join() joined} then the scope is {@linkplain ##Cancellation cancelled}
+     * and the {@code Joiner}'s {@link Joiner#onTimeout() onTimeout()} method is invoked
+     * to optionally throw {@link TimeoutException TimeoutException}.
      *
      * <p> The new scope is owned by the current thread. Only code executing in this
      * thread can {@linkplain #fork(Callable) fork}, {@linkplain #join() join}, or
@@ -856,27 +927,27 @@ public sealed interface StructuredTaskScope<T, R>
      * value} bindings for inheritance by threads started in the scope.
      *
      * @param joiner the joiner
-     * @param configFunction a function to produce the configuration
+     * @param configOperator the operator to produce the configuration
      * @return a new scope
      * @param <T> the result type of subtasks executed in the scope
      * @param <R> the result type of the scope
-     * @since 25
+     * @since 26
      */
     static <T, R> StructuredTaskScope<T, R> open(Joiner<? super T, ? extends R> joiner,
-                                                 Function<Configuration, Configuration> configFunction) {
-        return StructuredTaskScopeImpl.open(joiner, configFunction);
+                                                 UnaryOperator<Configuration> configOperator) {
+        return StructuredTaskScopeImpl.open(joiner, configOperator);
     }
 
     /**
      * Opens a new {@code StructuredTaskScope}to use the given {@code Joiner} object. The
-     * scope is created with the <a href="#DefaultConfiguration">default configuration</a>.
+     * scope is created with the {@linkplain ##DefaultConfiguration default configuration}.
      * The default configuration has a {@code ThreadFactory} that creates unnamed
-     * <a href="{@docRoot}/java.base/java/lang/Thread.html#virtual-threads">virtual threads</a>,
-     * is unnamed for monitoring and management purposes, and has no timeout.
+     * {@linkplain Thread##irtual-threads virtual threads}, does not name the scope, and
+     * has no timeout.
      *
      * @implSpec
      * This factory method is equivalent to invoking the 2-arg open method with the given
-     * joiner and the {@linkplain Function#identity() identity function}.
+     * joiner and the {@linkplain UnaryOperator#identity() identity operator}.
      *
      * @param joiner the joiner
      * @return a new scope
@@ -885,7 +956,7 @@ public sealed interface StructuredTaskScope<T, R>
      * @since 25
      */
     static <T, R> StructuredTaskScope<T, R> open(Joiner<? super T, ? extends R> joiner) {
-        return open(joiner, Function.identity());
+        return open(joiner, UnaryOperator.identity());
     }
 
     /**
@@ -897,22 +968,22 @@ public sealed interface StructuredTaskScope<T, R>
      * It throws {@link FailedException} if any subtask fails, with the exception from
      * the first subtask to fail as the cause.
      *
-     * <p> The scope is created with the <a href="#DefaultConfiguration">default
-     * configuration</a>. The default configuration has a {@code ThreadFactory} that creates
-     * unnamed <a href="{@docRoot}/java.base/java/lang/Thread.html#virtual-threads">virtual
-     * threads</a>, is unnamed for monitoring and management purposes, and has no timeout.
+     * <p> The scope is created with the {@linkplain ##DefaultConfiguration default
+     * configuration}. The default configuration has a {@code ThreadFactory} that creates
+     * unnamed {@linkplain Thread##virtual-threads virtual threads}, does not name the
+     * scope, and has no timeout.
      *
      * @implSpec
      * This factory method is equivalent to invoking the 2-arg open method with a joiner
      * created with {@link Joiner#awaitAllSuccessfulOrThrow() awaitAllSuccessfulOrThrow()}
-     * and the {@linkplain Function#identity() identity function}.
+     * and the {@linkplain UnaryOperator#identity() identity operator}.
      *
      * @param <T> the result type of subtasks
      * @return a new scope
      * @since 25
      */
     static <T> StructuredTaskScope<T, Void> open() {
-        return open(Joiner.awaitAllSuccessfulOrThrow(), Function.identity());
+        return open(Joiner.awaitAllSuccessfulOrThrow(), UnaryOperator.identity());
     }
 
     /**
@@ -926,7 +997,7 @@ public sealed interface StructuredTaskScope<T, R>
      * method with the subtask in the {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state.
      * If the {@code onFork} completes with an exception or error then it is propagated by
      * the {@code fork} method without creating a thread. If the scope is already
-     * <a href="#Cancallation">cancelled</a>, or {@code onFork} returns {@code true} to
+     * {@linkplain ##Cancellation cancelled}, or {@code onFork} returns {@code true} to
      * cancel the scope, then this method returns the {@code Subtask}, in the
      * {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state, without creating a thread to
      * execute the subtask.
@@ -993,32 +1064,42 @@ public sealed interface StructuredTaskScope<T, R>
 
     /**
      * Returns the result, or throws, after waiting for all subtasks to complete or
-     * the scope to be <a href="#Cancallation">cancelled</a>.
+     * the scope to be {@linkplain ##Cancellation cancelled}.
      *
      * <p> This method waits for all subtasks started in this scope to complete or the
-     * scope to be cancelled. If a {@linkplain Configuration#withTimeout(Duration) timeout}
-     * is configured and the timeout expires before or while waiting, then the scope is
-     * cancelled and {@link TimeoutException TimeoutException} is thrown. Once finished
-     * waiting, the {@code Joiner}'s {@link Joiner#result() result()} method is invoked
-     * to get the result or throw an exception. If the {@code result()} method throws
-     * then this method throws {@code FailedException} with the exception as the cause.
+     * scope to be cancelled. Once finished waiting, the {@code Joiner}'s {@link
+     * Joiner#result() result()} method is invoked to get the result or throw an exception.
+     * If the {@code result()} method throws then {@code join()} throws
+     * {@code FailedException} with the exception from the {@code Joiner} as the cause.
      *
-     * <p> This method may only be invoked by the scope owner, and only once.
+     * <p> If a {@linkplain Configuration#withTimeout(Duration) timeout} is configured,
+     * and the timeout expires before or while waiting, then the scope is cancelled and
+     * the {@code Joiner}'s {@link Joiner#onTimeout() onTimeout()} method is invoked
+     * before calling the {@code Joiner}'s {@code result()} method. If the {@code onTimeout()}
+     * method throws {@link TimeoutException TimeoutException} (or throws any exception
+     * or error), then it is propagated by this method. If the {@code onTimeout()} method
+     * does not throw then the {@code Joiner}'s {@code result()} method is invoked to
+     * get the result or throw.
+     *
+     * <p> This method may only be invoked by the scope owner. Once the result or
+     * exception outcome is obtained, this method may not be invoked again. The only
+     * case where the method may be called again is where {@code InterruptedException}
+     * is thrown while waiting.
      *
      * @return the result
      * @throws WrongThreadException if the current thread is not the scope owner
      * @throws IllegalStateException if already joined or this scope is closed
      * @throws FailedException if the <i>outcome</i> is an exception, thrown with the
      * exception from {@link Joiner#result() Joiner.result()} as the cause
-     * @throws TimeoutException if a timeout is set and the timeout expires before or
-     * while waiting
+     * @throws TimeoutException if a timeout is set, the timeout expires before or while
+     * waiting, and {@link Joiner#onTimeout() Joiner.onTimeout()} throws this exception
      * @throws InterruptedException if interrupted while waiting
      * @since 25
      */
     R join() throws InterruptedException;
 
     /**
-     * {@return {@code true} if this scope is <a href="#Cancallation">cancelled</a> or in
+     * {@return {@code true} if this scope is {@linkplain ##Cancellation cancelled} or in
      * the process of being cancelled, otherwise {@code false}}
      *
      * <p> Cancelling the scope prevents new threads from starting in the scope and
@@ -1038,11 +1119,11 @@ public sealed interface StructuredTaskScope<T, R>
     /**
      * Closes this scope.
      *
-     * <p> This method first <a href="#Cancallation">cancels</a> the scope, if not
+     * <p> This method first {@linkplain ##Cancellation cancels} the scope, if not
      * already cancelled. This interrupts the threads executing unfinished subtasks. This
      * method then waits for all threads to finish. If interrupted while waiting then it
-     * will continue to wait until the threads finish, before completing with the interrupt
-     * status set.
+     * will continue to wait until the threads finish, before completing with the
+     * {@linkplain Thread#isInterrupted() interrupted status} set.
      *
      * <p> This method may only be invoked by the scope owner. If the scope
      * is already closed then the scope owner invoking this method has no effect.
@@ -1069,4 +1150,4 @@ public sealed interface StructuredTaskScope<T, R>
      */
     @Override
     void close();
-}
\ No newline at end of file
+}
diff --git a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
index f65ea18e226..1051f9244f3 100644
--- a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
+++ b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
@@ -28,9 +28,10 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.time.Duration;
 import java.util.Objects;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import jdk.internal.misc.ThreadFlock;
 import jdk.internal.invoke.MhUtil;
+import jdk.internal.vm.annotation.Stable;
 
 /**
  * StructuredTaskScope implementation.
@@ -43,20 +44,19 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
     private final ThreadFactory threadFactory;
     private final ThreadFlock flock;
 
-    // state, only accessed by owner thread
-    private static final int ST_NEW            = 0,
-                             ST_FORKED         = 1,   // subtasks forked, need to join
+    // scope state, set by owner thread, read by any thread
+    private static final int ST_FORKED         = 1,   // subtasks forked, need to join
                              ST_JOIN_STARTED   = 2,   // join started, can no longer fork
                              ST_JOIN_COMPLETED = 3,   // join completed
                              ST_CLOSED         = 4;   // closed
-    private int state;
-
-    // timer task, only accessed by owner thread
-    private Future<?> timerTask;
+    private volatile int state;
 
     // set or read by any thread
     private volatile boolean cancelled;
 
+    // timer task, only accessed by owner thread
+    private Future<?> timerTask;
+
     // set by the timer thread, read by the owner thread
     private volatile boolean timeoutExpired;
 
@@ -67,7 +67,6 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
         this.joiner = joiner;
         this.threadFactory = threadFactory;
         this.flock = ThreadFlock.open((name != null) ? name : Objects.toIdentityString(this));
-        this.state = ST_NEW;
     }
 
     /**
@@ -76,10 +75,10 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
      * default configuration.
      */
     static <T, R> StructuredTaskScope<T, R> open(Joiner<? super T, ? extends R> joiner,
-                                                 Function<Configuration, Configuration> configFunction) {
+                                                 UnaryOperator<Configuration> configOperator) {
         Objects.requireNonNull(joiner);
 
-        var config = (ConfigImpl) configFunction.apply(ConfigImpl.defaultConfig());
+        var config = (ConfigImpl) configOperator.apply(ConfigImpl.defaultConfig());
         var scope = new StructuredTaskScopeImpl<T, R>(joiner, config.threadFactory(), config.name());
 
         // schedule timeout
@@ -109,23 +108,10 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
     }
 
     /**
-     * Throws IllegalStateException if already joined or scope is closed.
+     * Returns true if join has been invoked and there is an outcome.
      */
-    private void ensureNotJoined() {
-        assert Thread.currentThread() == flock.owner();
-        if (state > ST_FORKED) {
-            throw new IllegalStateException("Already joined or scope is closed");
-        }
-    }
-
-    /**
-     * Throws IllegalStateException if invoked by the owner thread and the owner thread
-     * has not joined.
-     */
-    private void ensureJoinedIfOwner() {
-        if (Thread.currentThread() == flock.owner() && state <= ST_JOIN_STARTED) {
-            throw new IllegalStateException("join not called");
-        }
+    private boolean isJoinCompleted() {
+        return state >= ST_JOIN_COMPLETED;
     }
 
     /**
@@ -184,9 +170,11 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
     /**
      * Invoked by the thread for a subtask when the subtask completes before scope is cancelled.
      */
-    private void onComplete(SubtaskImpl<? extends T> subtask) {
+    private <U extends T> void onComplete(SubtaskImpl<U> subtask) {
         assert subtask.state() != Subtask.State.UNAVAILABLE;
-        if (joiner.onComplete(subtask)) {
+        @SuppressWarnings("unchecked")
+        var j = (Joiner<U, ? extends R>) joiner;
+        if (j.onComplete(subtask)) {
             cancel();
         }
     }
@@ -195,12 +183,17 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
     public <U extends T> Subtask<U> fork(Callable<? extends U> task) {
         Objects.requireNonNull(task);
         ensureOwner();
-        ensureNotJoined();
+        int s = state;
+        if (s > ST_FORKED) {
+            throw new IllegalStateException("join already called or scope is closed");
+        }
 
         var subtask = new SubtaskImpl<U>(this, task);
 
         // notify joiner, even if cancelled
-        if (joiner.onFork(subtask)) {
+        @SuppressWarnings("unchecked")
+        var j = (Joiner<U, ? extends R>) joiner;
+        if (j.onFork(subtask)) {
             cancel();
         }
 
@@ -212,6 +205,7 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
             }
 
             // attempt to start the thread
+            subtask.setThread(thread);
             try {
                 flock.start(thread);
             } catch (IllegalStateException e) {
@@ -221,7 +215,9 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
         }
 
         // force owner to join
-        state = ST_FORKED;
+        if (s < ST_FORKED) {
+            state = ST_FORKED;
+        }
         return subtask;
     }
 
@@ -234,23 +230,29 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
     @Override
     public R join() throws InterruptedException {
         ensureOwner();
-        ensureNotJoined();
-
-        // join started
-        state = ST_JOIN_STARTED;
+        if (state >= ST_JOIN_COMPLETED) {
+            throw new IllegalStateException("Already joined or scope is closed");
+        }
 
         // wait for all subtasks, the scope to be cancelled, or interrupt
-        flock.awaitAll();
-
-        // throw if timeout expired
-        if (timeoutExpired) {
-            throw new TimeoutException();
+        try {
+            flock.awaitAll();
+        } catch (InterruptedException e) {
+            state = ST_JOIN_STARTED;  // joining not completed, prevent new forks
+            throw e;
         }
-        cancelTimeout();
 
-        // all subtasks completed or cancelled
+        // all subtasks completed or scope cancelled
         state = ST_JOIN_COMPLETED;
 
+        // invoke joiner onTimeout if timeout expired
+        if (timeoutExpired) {
+            cancel();  // ensure cancelled before calling onTimeout
+            joiner.onTimeout();
+        } else {
+            cancelTimeout();
+        }
+
         // invoke joiner to get result
         try {
             return joiner.result();
@@ -311,14 +313,37 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
         private final StructuredTaskScopeImpl<? super T, ?> scope;
         private final Callable<? extends T> task;
         private volatile Object result;
+        @Stable private Thread thread;
 
         SubtaskImpl(StructuredTaskScopeImpl<? super T, ?> scope, Callable<? extends T> task) {
             this.scope = scope;
             this.task = task;
         }
 
+        /**
+         * Sets the thread for this subtask.
+         */
+        void setThread(Thread thread) {
+            assert thread.getState() == Thread.State.NEW;
+            this.thread = thread;
+        }
+
+        /**
+         * Throws IllegalStateException if the caller thread is not the subtask and
+         * the scope owner has not joined.
+         */
+        private void ensureJoinedIfNotSubtask() {
+            if (Thread.currentThread() != thread && !scope.isJoinCompleted()) {
+                throw new IllegalStateException();
+            }
+        }
+
         @Override
         public void run() {
+            if (Thread.currentThread() != thread) {
+                throw new WrongThreadException();
+            }
+
             T result = null;
             Throwable ex = null;
             try {
@@ -355,7 +380,7 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
 
         @Override
         public T get() {
-            scope.ensureJoinedIfOwner();
+            ensureJoinedIfNotSubtask();
             Object result = this.result;
             if (result instanceof AltResult) {
                 if (result == RESULT_NULL) return null;
@@ -370,7 +395,7 @@ final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
 
         @Override
         public Throwable exception() {
-            scope.ensureJoinedIfOwner();
+            ensureJoinedIfNotSubtask();
             Object result = this.result;
             if (result instanceof AltResult alt && alt.state() == State.FAILED) {
                 return alt.exception();
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index eb0346c7397..6b8cda6aa1a 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -83,7 +83,7 @@ public @interface PreviewFeature {
         // the bootstrap JDK, the CLASSFILE_API enum constant became eligible for removal.
 
         //---
-        @JEP(number=505, title="Structured Concurrency", status="Fifth Preview")
+        @JEP(number=525, title="Structured Concurrency", status="Sixth Preview")
         STRUCTURED_CONCURRENCY,
         @JEP(number = 502, title = "Stable Values", status = "Preview")
         STABLE_VALUES,
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.java b/test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.java
index e8894353519..83adc930bb3 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.java
@@ -67,7 +67,7 @@ class StressCancellation {
     void test(ThreadFactory factory, int beforeCancel, int afterCancel) throws Exception {
         var joiner = new Joiner<Boolean, Void>() {
             @Override
-            public boolean onComplete(Subtask<? extends Boolean> subtask) {
+            public boolean onComplete(Subtask<Boolean> subtask) {
                 boolean cancel = subtask.get();
                 return cancel;
             }
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java b/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
index 762f24dc89f..b0d3ae0cf6b 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
@@ -61,8 +61,8 @@ import java.util.concurrent.StructureViolationException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 import static java.lang.Thread.State.*;
 
@@ -209,7 +209,7 @@ class StructuredTaskScopeTest {
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testForkAfterJoin1(ThreadFactory factory) throws Exception {
+    void testForkAfterJoinCompleted1(ThreadFactory factory) throws Exception {
         try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
                 cf -> cf.withThreadFactory(factory))) {
             scope.join();
@@ -222,7 +222,7 @@ class StructuredTaskScopeTest {
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testForkAfterJoin2(ThreadFactory factory) throws Exception {
+    void testForkAfterJoinCompleted2(ThreadFactory factory) throws Exception {
         try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
                 cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> "foo");
@@ -232,16 +232,15 @@ class StructuredTaskScopeTest {
     }
 
     /**
-     * Test fork after join throws.
+     * Test fork after join interrupted.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testForkAfterJoinThrows(ThreadFactory factory) throws Exception {
+    void testForkAfterJoinInterrupted(ThreadFactory factory) throws Exception {
         try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
                 cf -> cf.withThreadFactory(factory))) {
-            var latch = new CountDownLatch(1);
             var subtask1 = scope.fork(() -> {
-                latch.await();
+                Thread.sleep(Duration.ofDays(1));
                 return "foo";
             });
 
@@ -254,6 +253,25 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test fork after join timeout.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testForkAfterJoinTimeout(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory)
+                        .withTimeout(Duration.ofMillis(100)))) {
+            awaitCancelled(scope);
+
+            // join throws
+            assertThrows(TimeoutException.class, scope::join);
+
+            // fork should throw
+            assertThrows(IllegalStateException.class, () -> scope.fork(() -> "bar"));
+        }
+    }
+
     /**
      * Test fork after task scope is cancelled. This test uses a custom Joiner to
      * cancel execution.
@@ -296,9 +314,11 @@ class StructuredTaskScopeTest {
     /**
      * Test fork after task scope is closed.
      */
-    @Test
-    void testForkAfterClose() {
-        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testForkAfterClose(ThreadFactory factory) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             scope.close();
             assertThrows(IllegalStateException.class, () -> scope.fork(() -> null));
         }
@@ -366,7 +386,7 @@ class StructuredTaskScopeTest {
      */
     @Test
     void testJoinAfterJoin2() throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow())) {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulOrThrow())) {
             scope.fork(() -> { throw new FooException(); });
             Throwable ex = assertThrows(FailedException.class, scope::join);
             assertTrue(ex.getCause() instanceof FooException);
@@ -378,12 +398,39 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test join after join interrupted.
+     */
+    @Test
+    void testJoinAfterJoinInterrupted() throws Exception {
+        try (var scope = StructuredTaskScope.open()) {
+            var latch = new CountDownLatch(1);
+            var subtask = scope.fork(() -> {
+                latch.await();
+                return "foo";
+            });
+
+            // join throws InterruptedException
+            Thread.currentThread().interrupt();
+            assertThrows(InterruptedException.class, scope::join);
+
+            latch.countDown();
+
+            // retry join to get result
+            scope.join();
+            assertEquals("foo", subtask.get());
+
+            // retry after otbaining result
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
     /**
      * Test join after join completed with a timeout.
      */
     @Test
-    void testJoinAfterJoin3() throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow(),
+    void testJoinAfterJoinTimeout() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulOrThrow(),
                 cf -> cf.withTimeout(Duration.ofMillis(100)))) {
             // wait for scope to be cancelled by timeout
             awaitCancelled(scope);
@@ -396,6 +443,35 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test join invoked from Joiner.onTimeout.
+     */
+    @Test
+    void testJoinInOnTimeout() throws Exception {
+        Thread owner = Thread.currentThread();
+        var scopeRef = new AtomicReference<StructuredTaskScope<?, ?>>();
+
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public void onTimeout() {
+                assertTrue(Thread.currentThread() == owner);
+                var scope = scopeRef.get();
+                assertThrows(IllegalStateException.class, scope::join);
+            }
+            @Override
+            public Void result() {
+                return null;
+            }
+        };
+
+        try (var scope = StructuredTaskScope.open(joiner,
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            awaitCancelled(scope);
+            scopeRef.set(scope);
+            scope.join();  // invokes onTimeout
+        }
+    }
+
     /**
      * Test join method is owner confined.
      */
@@ -434,7 +510,7 @@ class StructuredTaskScopeTest {
                 cf -> cf.withThreadFactory(factory))) {
 
             Subtask<String> subtask = scope.fork(() -> {
-                Thread.sleep(60_000);
+                Thread.sleep(Duration.ofDays(1));
                 return "foo";
             });
 
@@ -457,10 +533,8 @@ class StructuredTaskScopeTest {
     void testInterruptJoin2(ThreadFactory factory) throws Exception {
         try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
                 cf -> cf.withThreadFactory(factory))) {
-
-            var latch = new CountDownLatch(1);
             Subtask<String> subtask = scope.fork(() -> {
-                Thread.sleep(60_000);
+                Thread.sleep(Duration.ofDays(1));
                 return "foo";
             });
 
@@ -879,7 +953,7 @@ class StructuredTaskScopeTest {
     void testOnForkThrows() throws Exception {
         var joiner = new Joiner<String, Void>() {
             @Override
-            public boolean onFork(Subtask<? extends String> subtask) {
+            public boolean onFork(Subtask<String> subtask) {
                 throw new FooException();
             }
             @Override
@@ -899,7 +973,7 @@ class StructuredTaskScopeTest {
     void testOnForkCancelsExecution() throws Exception {
         var joiner = new Joiner<String, Void>() {
             @Override
-            public boolean onFork(Subtask<? extends String> subtask) {
+            public boolean onFork(Subtask<String> subtask) {
                 return true;
             }
             @Override
@@ -922,7 +996,7 @@ class StructuredTaskScopeTest {
     void testOnCompleteThrows() throws Exception {
         var joiner = new Joiner<String, Void>() {
             @Override
-            public boolean onComplete(Subtask<? extends String> subtask) {
+            public boolean onComplete(Subtask<String> subtask) {
                 throw new FooException();
             }
             @Override
@@ -949,7 +1023,7 @@ class StructuredTaskScopeTest {
     void testOnCompleteCancelsExecution() throws Exception {
         var joiner = new Joiner<String, Void>() {
             @Override
-            public boolean onComplete(Subtask<? extends String> subtask) {
+            public boolean onComplete(Subtask<String> subtask) {
                 return true;
             }
             @Override
@@ -965,6 +1039,66 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test Joiner.onTimeout invoked by owner thread when timeout expires.
+     */
+    @Test
+    void testOnTimeoutInvoked() throws Exception {
+        var scopeRef = new AtomicReference<StructuredTaskScope<?, ?>>();
+        Thread owner = Thread.currentThread();
+        var invokeCount = new AtomicInteger();
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public void onTimeout() {
+                assertTrue(Thread.currentThread() == owner);
+                assertTrue(scopeRef.get().isCancelled());
+                invokeCount.incrementAndGet();
+            }
+            @Override
+            public Void result() {
+                return null;
+            }
+        };
+        try (var scope = StructuredTaskScope.open(joiner,
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            scopeRef.set(scope);
+            scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return null;
+            });
+            scope.join();
+            assertEquals(1, invokeCount.get());
+        }
+    }
+
+    /**
+     * Test Joiner.onTimeout throwing an excepiton.
+     */
+    @Test
+    void testOnTimeoutThrows() throws Exception {
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public void onTimeout() {
+                throw new FooException();
+            }
+            @Override
+            public Void result() {
+                return null;
+            }
+        };
+        try (var scope = StructuredTaskScope.open(joiner,
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            // wait for scope to be cancelled by timeout
+            awaitCancelled(scope);
+
+            // join should throw FooException on first usage
+            assertThrows(FooException.class, scope::join);
+
+            // retry after onTimeout fails
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
     /**
      * Test toString.
      */
@@ -990,19 +1124,27 @@ class StructuredTaskScopeTest {
     void testSubtaskWhenSuccess(ThreadFactory factory) throws Exception {
         try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAll(),
                 cf -> cf.withThreadFactory(factory))) {
-
             Subtask<String> subtask = scope.fork(() -> "foo");
 
-            // before join
+            // before join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
 
+            // before join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
+
             scope.join();
 
-            // after join
             assertEquals(Subtask.State.SUCCESS, subtask.state());
+
+            // after join, owner thread
             assertEquals("foo", subtask.get());
             assertThrows(IllegalStateException.class, subtask::exception);
+
+            // after join, another thread
+            assertEquals("foo", callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
         }
     }
 
@@ -1017,16 +1159,25 @@ class StructuredTaskScopeTest {
 
             Subtask<String> subtask = scope.fork(() -> { throw new FooException(); });
 
-            // before join
+            // before join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
 
+            // before join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
+
             scope.join();
 
-            // after join
             assertEquals(Subtask.State.FAILED, subtask.state());
+
+            // after join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertTrue(subtask.exception() instanceof FooException);
+
+            // after join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertTrue(callInOtherThread(subtask::exception) instanceof FooException);
         }
     }
 
@@ -1042,20 +1193,29 @@ class StructuredTaskScopeTest {
                 Thread.sleep(Duration.ofDays(1));
                 return null;
             });
-
-            // before join
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
+
+            // before join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
 
+            // before join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
+
             // attempt join, join throws
             Thread.currentThread().interrupt();
             assertThrows(InterruptedException.class, scope::join);
 
-            // after join
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
+
+            // after join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
+
+            // before join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
         }
     }
 
@@ -1071,17 +1231,25 @@ class StructuredTaskScopeTest {
 
             var subtask = scope.fork(() -> "foo");
 
-            // before join
-            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
+            // before join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
 
+            // before join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
+
             scope.join();
 
-            // after join
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
+
+            // after join, owner thread
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
+
+            // before join, another thread
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::get));
+            assertThrows(IllegalStateException.class, () -> callInOtherThread(subtask::exception));
         }
     }
 
@@ -1115,8 +1283,8 @@ class StructuredTaskScopeTest {
     @Test
     void testAllSuccessfulOrThrow1() throws Throwable {
         try (var scope = StructuredTaskScope.open(Joiner.allSuccessfulOrThrow())) {
-            var subtasks = scope.join().toList();
-            assertTrue(subtasks.isEmpty());
+            var results = scope.join();
+            assertTrue(results.isEmpty());
         }
     }
 
@@ -1128,12 +1296,10 @@ class StructuredTaskScopeTest {
     void testAllSuccessfulOrThrow2(ThreadFactory factory) throws Throwable {
         try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow(),
                 cf -> cf.withThreadFactory(factory))) {
-            var subtask1 = scope.fork(() -> "foo");
-            var subtask2 = scope.fork(() -> "bar");
-            var subtasks = scope.join().toList();
-            assertEquals(List.of(subtask1, subtask2), subtasks);
-            assertEquals("foo", subtask1.get());
-            assertEquals("bar", subtask2.get());
+            scope.fork(() -> "foo");
+            scope.fork(() -> "bar");
+            var results = scope.join();
+            assertEquals(List.of("foo", "bar"), results);
         }
     }
 
@@ -1157,11 +1323,52 @@ class StructuredTaskScopeTest {
     }
 
     /**
-     * Test Joiner.anySuccessfulResultOrThrow() with no subtasks.
+     * Test Joiner.allSuccessfulOrThrow() with a timeout.
      */
     @Test
-    void testAnySuccessfulResultOrThrow1() throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow())) {
+    void testAllSuccessfulOrThrow4() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow(),
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            scope.fork(() -> "foo");
+            scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return "bar";
+            });
+            assertThrows(TimeoutException.class, scope::join);
+
+            // retry after join throws TimeoutException
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
+    /**
+     * Test Joiner.allSuccessfulOrThrow() yields an unmodifiable list.
+     */
+    @Test
+    void testAllSuccessfulOrThrow5() throws Exception {
+        // empty list
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow())) {
+            var results = scope.join();
+            assertEquals(0, results.size());
+            assertThrows(UnsupportedOperationException.class, () -> results.add("foo"));
+        }
+
+        // non-empty list
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow())) {
+            scope.fork(() -> "foo");
+            var results = scope.join();
+            assertEquals(1, results.size());
+            assertThrows(UnsupportedOperationException.class, () -> results.add("foo"));
+            assertThrows(UnsupportedOperationException.class, () -> results.add("bar"));
+        }
+    }
+
+    /**
+     * Test Joiner.anySuccessfulOrThrow() with no subtasks.
+     */
+    @Test
+    void testAnySuccessfulOrThrow1() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulOrThrow())) {
             try {
                 scope.join();
             } catch (FailedException e) {
@@ -1171,12 +1378,12 @@ class StructuredTaskScopeTest {
     }
 
     /**
-     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that completes successfully.
+     * Test Joiner.anySuccessfulOrThrow() with a subtask that completes successfully.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testAnySuccessfulResultOrThrow2(ThreadFactory factory) throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow(),
+    void testAnySuccessfulOrThrow2(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulOrThrow(),
                 cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> "foo");
             String result = scope.join();
@@ -1185,13 +1392,13 @@ class StructuredTaskScopeTest {
     }
 
     /**
-     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that completes successfully
+     * Test Joiner.anySuccessfulOrThrow() with a subtask that completes successfully
      * with a null result.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testAnySuccessfulResultOrThrow3(ThreadFactory factory) throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow(),
+    void testAnySuccessfulOrThrow3(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulOrThrow(),
                 cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> null);
             String result = scope.join();
@@ -1200,13 +1407,13 @@ class StructuredTaskScopeTest {
     }
 
     /**
-     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that complete succcessfully
+     * Test Joiner.anySuccessfulOrThrow() with a subtask that complete succcessfully
      * and a subtask that fails.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testAnySuccessfulResultOrThrow4(ThreadFactory factory) throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow(),
+    void testAnySuccessfulOrThrow4(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulOrThrow(),
                 cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> "foo");
             scope.fork(() -> { throw new FooException(); });
@@ -1216,12 +1423,12 @@ class StructuredTaskScopeTest {
     }
 
     /**
-     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that fails.
+     * Test Joiner.anySuccessfulOrThrow() with a subtask that fails.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testAnySuccessfulResultOrThrow5(ThreadFactory factory) throws Exception {
-        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow(),
+    void testAnySuccessfulOrThrow5(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulOrThrow(),
                 cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> { throw new FooException(); });
             Throwable ex = assertThrows(FailedException.class, scope::join);
@@ -1229,6 +1436,25 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test Joiner.anySuccessfulOrThrow() with a timeout.
+     */
+    @Test
+    void anySuccessfulOrThrow6() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulOrThrow(),
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            scope.fork(() -> { throw new FooException(); });
+            scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return "bar";
+            });
+            assertThrows(TimeoutException.class, scope::join);
+
+            // retry after join throws TimeoutException
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
     /**
      * Test Joiner.awaitAllSuccessfulOrThrow() with no subtasks.
      */
@@ -1276,6 +1502,25 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test Joiner.awaitAllSuccessfulOrThrow() with a timeout.
+     */
+    @Test
+    void testAwaitSuccessfulOrThrow4() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAllSuccessfulOrThrow(),
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            scope.fork(() -> "foo");
+            scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return "bar";
+            });
+            assertThrows(TimeoutException.class, scope::join);
+
+            // retry after join throws TimeoutException
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
     /**
      * Test Joiner.awaitAll() with no subtasks.
      */
@@ -1322,6 +1567,25 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test Joiner.awaitAll() with a timeout.
+     */
+    @Test
+    void testAwaitAll4() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAll(),
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            scope.fork(() -> "foo");
+            scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return "bar";
+            });
+            assertThrows(TimeoutException.class, scope::join);
+
+            // retry after join throws TimeoutException
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
     /**
      * Test Joiner.allUntil(Predicate) with no subtasks.
      */
@@ -1329,7 +1593,7 @@ class StructuredTaskScopeTest {
     void testAllUntil1() throws Throwable {
         try (var scope = StructuredTaskScope.open(Joiner.allUntil(s -> false))) {
             var subtasks = scope.join();
-            assertEquals(0, subtasks.count());
+            assertEquals(0, subtasks.size());
         }
     }
 
@@ -1345,11 +1609,9 @@ class StructuredTaskScopeTest {
             var subtask1 = scope.fork(() -> "foo");
             var subtask2 = scope.fork(() -> { throw new FooException(); });
 
-            var subtasks = scope.join().toList();
-            assertEquals(2, subtasks.size());
+            var subtasks = scope.join();
+            assertEquals(List.of(subtask1, subtask2), subtasks);
 
-            assertSame(subtask1, subtasks.get(0));
-            assertSame(subtask2, subtasks.get(1));
             assertEquals("foo", subtask1.get());
             assertTrue(subtask2.exception() instanceof FooException);
         }
@@ -1370,11 +1632,9 @@ class StructuredTaskScopeTest {
                 return "bar";
             });
 
-            var subtasks = scope.join().toList();
+            var subtasks = scope.join();
+            assertEquals(List.of(subtask1, subtask2), subtasks);
 
-            assertEquals(2, subtasks.size());
-            assertSame(subtask1, subtasks.get(0));
-            assertSame(subtask2, subtasks.get(1));
             assertEquals("foo", subtask1.get());
             assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
         }
@@ -1388,10 +1648,10 @@ class StructuredTaskScopeTest {
     void testAllUntil4(ThreadFactory factory) throws Exception {
 
         // cancel execution after two or more failures
-        class CancelAfterTwoFailures<T> implements Predicate<Subtask<? extends T>> {
+        class CancelAfterTwoFailures<T> implements Predicate<Subtask<T>> {
             final AtomicInteger failedCount = new AtomicInteger();
             @Override
-            public boolean test(Subtask<? extends T> subtask) {
+            public boolean test(Subtask<T> subtask) {
                 return subtask.state() == Subtask.State.FAILED
                         && failedCount.incrementAndGet() >= 2;
             }
@@ -1409,7 +1669,7 @@ class StructuredTaskScopeTest {
                 Thread.sleep(Duration.ofMillis(20));
             }
 
-            var subtasks = scope.join().toList();
+            var subtasks = scope.join();
             assertEquals(forkCount, subtasks.size());
 
             long failedCount = subtasks.stream()
@@ -1437,6 +1697,59 @@ class StructuredTaskScopeTest {
         }
     }
 
+    /**
+     * Test Joiner.allUntil(Predicate) with a timeout.
+     */
+    @Test
+    void testAllUntil6() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allUntil(s -> false),
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return "bar";
+            });
+
+            // TimeoutException should not be thrown
+            var subtasks = scope.join();
+
+            // stream should have two elements, subtask1 may or may not have completed
+            assertEquals(List.of(subtask1, subtask2), subtasks);
+            assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
+
+            // retry after join throws TimeoutException
+            assertThrows(IllegalStateException.class, scope::join);
+        }
+    }
+
+    /**
+     * Test Joiner.allUntil(Predicate) yields an unmodifiable list.
+     */
+    @Test
+    void testAllUntil7() throws Exception {
+        Subtask<String> subtask1;
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allUntil(s -> false))) {
+            subtask1 = scope.fork(() -> "?");
+            scope.join();
+        }
+
+        // empty list
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allUntil(s -> false))) {
+            var subtasks = scope.join();
+            assertEquals(0, subtasks.size());
+            assertThrows(UnsupportedOperationException.class, () -> subtasks.add(subtask1));
+        }
+
+        // non-empty list
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allUntil(s -> false))) {
+            var subtask2 = scope.fork(() -> "foo");
+            var subtasks = scope.join();
+            assertEquals(1, subtasks.size());
+            assertThrows(UnsupportedOperationException.class, () -> subtasks.add(subtask1));
+            assertThrows(UnsupportedOperationException.class, () -> subtasks.add(subtask2));
+        }
+    }
+
     /**
      * Test Joiner default methods.
      */
@@ -1454,13 +1767,14 @@ class StructuredTaskScopeTest {
             assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
 
             // Joiner that does not override default methods
-            Joiner<Object, Void> joiner = () -> null;
+            Joiner<String, Void> joiner = () -> null;
             assertThrows(NullPointerException.class, () -> joiner.onFork(null));
             assertThrows(NullPointerException.class, () -> joiner.onComplete(null));
             assertThrows(IllegalArgumentException.class, () -> joiner.onFork(subtask1));
             assertFalse(joiner.onFork(subtask2));
             assertFalse(joiner.onComplete(subtask1));
             assertThrows(IllegalArgumentException.class, () -> joiner.onComplete(subtask2));
+            assertThrows(TimeoutException.class, joiner::onTimeout);
         }
     }
 
@@ -1481,7 +1795,7 @@ class StructuredTaskScopeTest {
             assertThrows(IllegalArgumentException.class,
                     () -> Joiner.allSuccessfulOrThrow().onComplete(subtask));
             assertThrows(IllegalArgumentException.class,
-                    () -> Joiner.anySuccessfulResultOrThrow().onComplete(subtask));
+                    () -> Joiner.anySuccessfulOrThrow().onComplete(subtask));
             assertThrows(IllegalArgumentException.class,
                     () -> Joiner.awaitAllSuccessfulOrThrow().onComplete(subtask));
             assertThrows(IllegalArgumentException.class,
@@ -1497,7 +1811,7 @@ class StructuredTaskScopeTest {
             assertThrows(IllegalArgumentException.class,
                     () -> Joiner.allSuccessfulOrThrow().onFork(subtask));
             assertThrows(IllegalArgumentException.class,
-                    () -> Joiner.anySuccessfulResultOrThrow().onFork(subtask));
+                    () -> Joiner.anySuccessfulOrThrow().onFork(subtask));
             assertThrows(IllegalArgumentException.class,
                     () -> Joiner.awaitAllSuccessfulOrThrow().onFork(subtask));
             assertThrows(IllegalArgumentException.class,
@@ -1523,7 +1837,7 @@ class StructuredTaskScopeTest {
      */
     @Test
     void testConfigMethods() throws Exception {
-        Function<Configuration, Configuration> testConfig = cf -> {
+        UnaryOperator<Configuration> configOperator = cf -> {
             var name = "duke";
             var threadFactory = Thread.ofPlatform().factory();
             var timeout = Duration.ofSeconds(10);
@@ -1548,7 +1862,7 @@ class StructuredTaskScopeTest {
 
             return cf;
         };
-        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(), testConfig)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(), configOperator)) {
             // do nothing
         }
     }
@@ -1597,9 +1911,9 @@ class StructuredTaskScopeTest {
         assertThrows(NullPointerException.class,
                 () -> Joiner.allSuccessfulOrThrow().onComplete(null));
         assertThrows(NullPointerException.class,
-                () -> Joiner.anySuccessfulResultOrThrow().onFork(null));
+                () -> Joiner.anySuccessfulOrThrow().onFork(null));
         assertThrows(NullPointerException.class,
-                () -> Joiner.anySuccessfulResultOrThrow().onComplete(null));
+                () -> Joiner.anySuccessfulOrThrow().onComplete(null));
     }
 
     /**
@@ -1629,12 +1943,12 @@ class StructuredTaskScopeTest {
         final AtomicInteger onForkCount = new AtomicInteger();
         final AtomicInteger onCompleteCount = new AtomicInteger();
         @Override
-        public boolean onFork(Subtask<? extends T> subtask) {
+        public boolean onFork(Subtask<T> subtask) {
             onForkCount.incrementAndGet();
             return false;
         }
         @Override
-        public boolean onComplete(Subtask<? extends T> subtask) {
+        public boolean onComplete(Subtask<T> subtask) {
             onCompleteCount.incrementAndGet();
             return false;
         }
@@ -1658,12 +1972,12 @@ class StructuredTaskScopeTest {
         final AtomicInteger onForkCount = new AtomicInteger();
         final AtomicInteger onCompleteCount = new AtomicInteger();
         @Override
-        public boolean onFork(Subtask<? extends T> subtask) {
+        public boolean onFork(Subtask<T> subtask) {
             onForkCount.incrementAndGet();
             return false;
         }
         @Override
-        public boolean onComplete(Subtask<? extends T> subtask) {
+        public boolean onComplete(Subtask<T> subtask) {
             onCompleteCount.incrementAndGet();
             return true;
         }
@@ -1755,6 +2069,40 @@ class StructuredTaskScopeTest {
         });
     }
 
+    /**
+     * Calls a result returning task from another thread.
+     */
+    private <V> V callInOtherThread(Callable<V> task) throws Exception {
+        var result = new AtomicReference<V>();
+        var exc = new AtomicReference<Exception>();
+        Thread thread = Thread.ofVirtual().start(() -> {
+            try {
+                result.set(task.call());
+            } catch (Exception e) {
+                exc.set(e);
+            }
+        });
+        boolean interrupted = false;
+        boolean terminated = false;
+        while (!terminated) {
+            try {
+                thread.join();
+                terminated = true;
+            } catch (InterruptedException e) {
+                interrupted = true;
+            }
+        }
+        if (interrupted) {
+            Thread.currentThread().interrupt();
+        }
+        Exception e = exc.get();
+        if (e != null) {
+            throw e;
+        } else {
+            return result.get();
+        }
+    }
+
     /**
      * Returns true if the given stack trace contains an element for the given class
      * and method name.

From 1327aa60907555d7e2d8d131bf4cb20a34660ff2 Mon Sep 17 00:00:00 2001
From: Kerem Kat <krk@openjdk.org>
Date: Mon, 10 Nov 2025 17:38:25 +0000
Subject: [PATCH 114/512] 8369949: Fix TestWaste.java stack overflow

Reviewed-by: egahlin, shade
---
 src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp | 2 +-
 test/jdk/ProblemList.txt                                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
index be0cd2a5d7e..5f630589257 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
@@ -37,7 +37,7 @@ class EdgeQueue;
 class DFSClosure : public BasicOopIterateClosure {
  private:
   // max dfs depth should not exceed size of stack
-  static const size_t max_dfs_depth = 4000;
+  static const size_t max_dfs_depth = 3200;
   static UnifiedOopRef _reference_stack[max_dfs_depth];
 
   EdgeStore* _edge_store;
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index b01460c3816..9452b3a1b9f 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -751,7 +751,6 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-
 jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java             8371014 aix-ppc64,linux-ppc64le
 jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
-jdk/jfr/jvm/TestWaste.java                                      8369949 generic-all
 
 ############################################################################
 

From 8a911aed26211936a9c2652299a1bca8a06cae21 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 10 Nov 2025 17:56:52 +0000
Subject: [PATCH 115/512] 8371471: HttpClient: Log HTTP/3 handshake failures if
 logging errors is enabled

Reviewed-by: djelinski, jpai
---
 .../jdk/internal/net/http/common/Log.java     |   5 +-
 .../net/http/quic/QuicConnectionImpl.java     |   5 +
 .../http3/H3LogHandshakeErrors.java           | 221 ++++++++++++++++++
 3 files changed, 228 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
index bc89a6e9d8e..7e7ff581351 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -391,8 +391,7 @@ public abstract class Log implements System.Logger {
 
     public static void logError(Throwable t) {
         if (errors()) {
-            String s = Utils.stackTrace(t);
-            logger.log(Level.INFO, "ERROR: " + s);
+            logger.log(Level.INFO, "ERROR: " + t, t);
         }
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index f05519d339b..9a280c3a8a5 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -591,6 +591,11 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
             SSLHandshakeException sslHandshakeException = null;
             if (!handshakeCF.isDone()) {
                 sslHandshakeException = sslHandshakeException(cause);
+                if (Log.errors()) {
+                    Log.logError("%s QUIC handshake failed: %s"
+                            .formatted(logTag(), cause));
+                    Log.logError(cause);
+                }
                 handshakeCF.completeExceptionally(sslHandshakeException);
             }
             if (!handshakeReachedPeerCF.isDone()) {
diff --git a/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java b/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
new file mode 100644
index 00000000000..32872f4fb12
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.BindException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpOption;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.logging.Handler;
+
+import javax.net.ssl.SSLContext;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.internal.net.http.quic.QuicConnectionImpl;
+import jdk.test.lib.net.SimpleSSLContext;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_3;
+import static java.net.http.HttpOption.H3_DISCOVERY;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static org.testng.Assert.*;
+
+/*
+ * @test
+ * @bug 8371471
+ * @summary Verify that HTTP/3 handshake failures are logged if
+ *          logging errors is enabled
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run testng/othervm
+ *              -Djdk.httpclient.HttpClient.log=errors
+ *              H3LogHandshakeErrors
+ */
+// -Djava.security.debug=all
+public class H3LogHandshakeErrors implements HttpServerAdapters {
+
+    private SSLContext sslContext;
+    private HttpTestServer h3Server;
+    private ServerSocket tcpServerSocket = null;
+    private Thread tcpServerThread = null;
+    private String requestURI;
+    private static Logger clientLogger;
+
+    @BeforeClass
+    public void beforeClass() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null) {
+            throw new AssertionError("Unexpected null sslContext");
+        }
+        // create an H3 only server
+        h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
+        h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
+        h3Server.start();
+        System.out.println("Server started at " + h3Server.getAddress());
+        requestURI = "https://" + h3Server.serverAuthority() + "/hello";
+
+        // Attempts to bind a TCP server socket on the same port
+        // That server will just accept and immediately close
+        // any connection. This is to make sure that we won't target
+        // another server when falling back to TCP.
+        tcpServerSocket = new ServerSocket();
+        try {
+            tcpServerSocket.bind(h3Server.getAddress());
+            tcpServerThread = Thread.ofPlatform().daemon().start(() -> {
+                System.out.println("tcpServerThread started");
+                while (true) {
+                    try (var accepted = tcpServerSocket.accept()) {
+                        // close immediately
+                    } catch (IOException x) {
+                        System.out.println("tcpServerSocket: " + x);
+                        break;
+                    }
+                }
+                System.out.println("tcpServerThread stopped");
+            });
+        } catch (BindException x) {
+            tcpServerSocket.close();
+            // if tcpServerSocket is null we will use
+            // HTTP3_URI_ONLY for the request
+            tcpServerSocket = null;
+        }
+    }
+
+    @AfterClass
+    public void afterClass() throws Exception {
+        if (h3Server != null) {
+            System.out.println("Stopping server " + h3Server.getAddress());
+            h3Server.stop();
+        }
+        if (tcpServerSocket != null) {
+            tcpServerSocket.close();
+            tcpServerThread.join();
+        }
+    }
+
+    static String format(LogRecord record) {
+        String thrown = Optional.ofNullable(record.getThrown())
+                .map(t -> ": " + t).orElse("");
+        return "\n  \"%s: %s %s: %s%s\"".formatted(
+                record.getLevel(),
+                record.getSourceClassName(),
+                record.getSourceMethodName(),
+                record.getMessage(),
+                thrown);
+    }
+
+    /**
+     * Issues a GET HTTP3 requests and verifies that the
+     * expected exception is logged.
+     */
+    @Test
+    public void testErrorLogging() throws Exception {
+        // jdk.httpclient.HttpClient.log=errors must be enabled
+        // for this test
+        String logging = System.getProperty("jdk.httpclient.HttpClient.log", "");
+        var categories = Arrays.asList(logging.split(","));
+        assertTrue(categories.contains("errors"),
+                "'errors' not found in " + categories);
+
+        // create a client without the test specific SSLContext
+        // so that the client doesn't have the server's
+        // certificate
+        final HttpClient client = newClientBuilderForH3()
+                .proxy(NO_PROXY)
+                .build();
+        final URI reqURI = new URI(requestURI);
+        final HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(reqURI)
+                .version(HTTP_3);
+        if (tcpServerSocket == null) {
+            // could not open ServerSocket on same port, only use HTTP/3
+            reqBuilder.setOption(H3_DISCOVERY, HTTP_3_URI_ONLY);
+        }
+        clientLogger = Logger.getLogger("jdk.httpclient.HttpClient");
+
+        CopyOnWriteArrayList<LogRecord> records = new CopyOnWriteArrayList<>();
+        Handler handler = new Handler() {
+            @Override
+            public void publish(LogRecord record) {
+                // forces the LogRecord to evaluate the caller
+                // while in the publish() method to make sure
+                // the source class name and source method name
+                // are correctly evaluated.
+                record.getSourceClassName();
+                records.add(record);
+            }
+            @Override public void flush() {}
+            @Override public void close() {
+            }
+        };
+        clientLogger.addHandler(handler);
+        try {
+            final HttpRequest req1 = reqBuilder.copy().GET().build();
+            System.out.println("Issuing request: " + req1);
+            final HttpResponse<Void> resp1 = client.send(req1, BodyHandlers.discarding());
+            fail("Unexpected response from server: " + resp1);
+        } catch (IOException io) {
+            System.out.println("Got expected exception: " + io);
+        } finally {
+            LogRecord expected = null;
+            // this is a bit fragile and may need to be updated if the
+            // place where we log the exception from changes.
+            String expectedClassName = QuicConnectionImpl.class.getName()
+                    + "$HandshakeFlow";
+            for (var record : records) {
+                if (record.getLevel() != Level.INFO) continue;
+                if (!record.getMessage().contains("ERROR:")) continue;
+                if (record.getMessage().contains("client peer")) continue;
+                var expectedThrown = record.getThrown();
+                if (expectedThrown == null) continue;
+                if (!record.getSourceClassName().equals(expectedClassName)) continue;
+                if (expectedThrown.getMessage().contains("client peer")) continue;
+                expected = record;
+                break;
+            }
+            assertNotNull(expected, "No throwable for "
+                    + expectedClassName + " found in "
+                    + records.stream().map(H3LogHandshakeErrors::format).toList()
+                    + "\n ");
+            System.out.printf("Found expected exception: %s%n\t logged at: %s %s%n",
+                    expected.getThrown(),
+                    expected.getSourceClassName(),
+                    expected.getSourceMethodName());
+        }
+    }
+}

From cc54d2c06b0e1f799c771d747cfb4059a8774e28 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Mon, 10 Nov 2025 18:21:13 +0000
Subject: [PATCH 116/512] 8371418: Methods in AdapterHandlerLibrary use
 HashtableBase iterate method incorrectly

Reviewed-by: kvn, adinn
---
 .../share/cds/lambdaProxyClassDictionary.cpp  |  2 +-
 .../share/classfile/compactHashtable.hpp      | 24 ++++++-
 src/hotspot/share/classfile/stringTable.cpp   |  2 +-
 src/hotspot/share/classfile/symbolTable.cpp   | 12 ++--
 .../classfile/systemDictionaryShared.cpp      |  8 +--
 src/hotspot/share/oops/trainingData.cpp       |  6 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   | 66 +++++++++++--------
 7 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index 62b1b8c05f1..f6da1a34af3 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -518,7 +518,7 @@ void LambdaProxyClassDictionary::print_on(const char* prefix,
   if (!dictionary->empty()) {
     st->print_cr("%sShared Lambda Dictionary", prefix);
     SharedLambdaDictionaryPrinter ldp(st, start_index);
-    dictionary->iterate(&ldp);
+    dictionary->iterate_all(&ldp);
   }
 }
 
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 402c8f197fa..944fb876521 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -294,6 +294,7 @@ public:
     return nullptr;
   }
 
+  // Iterate through the values in the table, stopping when do_value() returns false.
   template <class ITER>
   inline void iterate(ITER* iter) const { iterate([&](V v) { iter->do_value(v); }); }
 
@@ -302,6 +303,7 @@ public:
     iterate(const_cast<Function&>(function));
   }
 
+  // Iterate through the values in the table, stopping when the lambda returns false.
   template<typename Function>
   inline void iterate(Function& function) const { // lambda enabled API
     for (u4 i = 0; i < _bucket_count; i++) {
@@ -311,17 +313,35 @@ public:
       u4* entry = _entries + bucket_offset;
 
       if (bucket_type == VALUE_ONLY_BUCKET_TYPE) {
-        function(decode(entry[0]));
+        if (!function(decode(entry[0]))) {
+          return;
+        }
       } else {
         u4* entry_max = _entries + BUCKET_OFFSET(_buckets[i + 1]);
         while (entry < entry_max) {
-          function(decode(entry[1]));
+          if (!function(decode(entry[1]))) {
+            return;
+          }
           entry += 2;
         }
       }
     }
   }
 
+  // Unconditionally iterate through all the values in the table
+  template <class ITER>
+  inline void iterate_all(ITER* iter) const { iterate_all([&](V v) { iter->do_value(v); }); }
+
+  // Unconditionally iterate through all the values in the table using lambda
+  template<typename Function>
+  void iterate_all(Function function) const { // lambda enabled API
+    auto wrapper = [&] (V v) {
+      function(v);
+      return true;
+    };
+    iterate(wrapper);
+  }
+
   void print_table_statistics(outputStream* st, const char* name) {
     st->print_cr("%s statistics:", name);
     int total_entries = 0;
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index 6f9d5d11562..c775014cfac 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -908,7 +908,7 @@ void StringTable::dump(outputStream* st, bool verbose) {
       st->print_cr("# Shared strings:");
       st->print_cr("#----------------");
       PrintSharedString pss(thr, st);
-      _shared_table.iterate(&pss);
+      _shared_table.iterate_all(&pss);
     }
 #endif
   }
diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index 13320a30872..ec639a2b4d3 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -272,9 +272,7 @@ public:
 void SymbolTable::symbols_do(SymbolClosure *cl) {
   assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint");
   // all symbols from shared table
-  SharedSymbolIterator iter(cl);
-  _shared_table.iterate(&iter);
-  _dynamic_shared_table.iterate(&iter);
+  shared_symbols_do(cl);
 
   // all symbols from the dynamic table
   SymbolsDo sd(cl);
@@ -284,8 +282,8 @@ void SymbolTable::symbols_do(SymbolClosure *cl) {
 // Call function for all symbols in shared table. Used by -XX:+PrintSharedArchiveAndExit
 void SymbolTable::shared_symbols_do(SymbolClosure *cl) {
   SharedSymbolIterator iter(cl);
-  _shared_table.iterate(&iter);
-  _dynamic_shared_table.iterate(&iter);
+  _shared_table.iterate_all(&iter);
+  _dynamic_shared_table.iterate_all(&iter);
 }
 
 Symbol* SymbolTable::lookup_dynamic(const char* name,
@@ -669,14 +667,14 @@ void SymbolTable::dump(outputStream* st, bool verbose) {
       st->print_cr("# Shared symbols:");
       st->print_cr("#----------------");
       DumpSharedSymbol dss(st);
-      _shared_table.iterate(&dss);
+      _shared_table.iterate_all(&dss);
     }
     if (!_dynamic_shared_table.empty()) {
       st->print_cr("#------------------------");
       st->print_cr("# Dynamic shared symbols:");
       st->print_cr("#------------------------");
       DumpSharedSymbol dss(st);
-      _dynamic_shared_table.iterate(&dss);
+      _dynamic_shared_table.iterate_all(&dss);
     }
   }
 }
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index cb2ae96348e..afc190c36cf 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -1431,11 +1431,11 @@ const char* SystemDictionaryShared::loader_type_for_shared_class(Klass* k) {
 }
 
 void SystemDictionaryShared::get_all_archived_classes(bool is_static_archive, GrowableArray<Klass*>* classes) {
-  get_archive(is_static_archive)->_builtin_dictionary.iterate([&] (const RunTimeClassInfo* record) {
+  get_archive(is_static_archive)->_builtin_dictionary.iterate_all([&] (const RunTimeClassInfo* record) {
       classes->append(record->klass());
     });
 
-  get_archive(is_static_archive)->_unregistered_dictionary.iterate([&] (const RunTimeClassInfo* record) {
+  get_archive(is_static_archive)->_unregistered_dictionary.iterate_all([&] (const RunTimeClassInfo* record) {
       classes->append(record->klass());
     });
 }
@@ -1464,9 +1464,9 @@ void SystemDictionaryShared::ArchiveInfo::print_on(const char* prefix,
   st->print_cr("%sShared Dictionary", prefix);
   SharedDictionaryPrinter p(st);
   st->print_cr("%sShared Builtin Dictionary", prefix);
-  _builtin_dictionary.iterate(&p);
+  _builtin_dictionary.iterate_all(&p);
   st->print_cr("%sShared Unregistered Dictionary", prefix);
-  _unregistered_dictionary.iterate(&p);
+  _unregistered_dictionary.iterate_all(&p);
   LambdaProxyClassDictionary::print_on(prefix, st, p.index(), is_static_archive);
 }
 
diff --git a/src/hotspot/share/oops/trainingData.cpp b/src/hotspot/share/oops/trainingData.cpp
index 27ae3404f41..1a16fd70e44 100644
--- a/src/hotspot/share/oops/trainingData.cpp
+++ b/src/hotspot/share/oops/trainingData.cpp
@@ -83,7 +83,7 @@ static void verify_archived_entry(TrainingData* td, const TrainingData::Key* k)
 
 void TrainingData::verify() {
   if (TrainingData::have_data() && !TrainingData::assembling_data()) {
-    archived_training_data_dictionary()->iterate([&](TrainingData* td) {
+    archived_training_data_dictionary()->iterate_all([&](TrainingData* td) {
       if (td->is_KlassTrainingData()) {
         KlassTrainingData* ktd = td->as_KlassTrainingData();
         if (ktd->has_holder() && ktd->holder()->is_loaded()) {
@@ -466,7 +466,7 @@ void TrainingData::init_dumptime_table(TRAPS) {
   precond((!assembling_data() && !need_data()) || need_data() != assembling_data());
   if (assembling_data()) {
     _dumptime_training_data_dictionary = new DumptimeTrainingDataDictionary();
-    _archived_training_data_dictionary.iterate([&](TrainingData* record) {
+    _archived_training_data_dictionary.iterate_all([&](TrainingData* record) {
       _dumptime_training_data_dictionary->append(record);
     });
   }
@@ -692,7 +692,7 @@ void TrainingData::print_archived_training_data_on(outputStream* st) {
   st->print_cr("Archived TrainingData Dictionary");
   TrainingDataPrinter tdp(st);
   TrainingDataLocker::initialize();
-  _archived_training_data_dictionary.iterate(&tdp);
+  _archived_training_data_dictionary.iterate_all(&tdp);
 }
 
 void TrainingData::Key::metaspace_pointers_do(MetaspaceClosure *iter) {
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 8ede4d1082a..835bbc0ae2f 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -3036,7 +3036,7 @@ void AdapterHandlerLibrary::link_aot_adapters() {
    * result in collision of adapter ids between AOT stored handlers and runtime generated handlers.
    * To avoid such situation, initialize the _id_counter with the largest adapter id among the AOT stored handlers.
    */
-  _aot_adapter_handler_table.iterate([&](AdapterHandlerEntry* entry) {
+  _aot_adapter_handler_table.iterate_all([&](AdapterHandlerEntry* entry) {
     assert(!entry->is_linked(), "AdapterHandlerEntry is already linked!");
     entry->link();
     max_id = MAX2(max_id, entry->id());
@@ -3388,26 +3388,6 @@ JRT_LEAF(void, SharedRuntime::OSR_migration_end( intptr_t* buf) )
   FREE_C_HEAP_ARRAY(intptr_t, buf);
 JRT_END
 
-bool AdapterHandlerLibrary::contains(const CodeBlob* b) {
-  bool found = false;
-#if INCLUDE_CDS
-  if (AOTCodeCache::is_using_adapter()) {
-    auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
-      return (found = (b == CodeCache::find_blob(handler->get_i2c_entry())));
-    };
-    _aot_adapter_handler_table.iterate(findblob_archived_table);
-  }
-#endif // INCLUDE_CDS
-  if (!found) {
-    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
-      return (found = (b == CodeCache::find_blob(a->get_i2c_entry())));
-    };
-    assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
-    _adapter_handler_table->iterate(findblob_runtime_table);
-  }
-  return found;
-}
-
 const char* AdapterHandlerLibrary::name(AdapterHandlerEntry* handler) {
   return handler->fingerprint()->as_basic_args_string();
 }
@@ -3416,6 +3396,36 @@ uint32_t AdapterHandlerLibrary::id(AdapterHandlerEntry* handler) {
   return handler->id();
 }
 
+bool AdapterHandlerLibrary::contains(const CodeBlob* b) {
+  bool found = false;
+#if INCLUDE_CDS
+  if (AOTCodeCache::is_using_adapter()) {
+    auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
+      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
+        found = true;
+        return false; // abort iteration
+      } else {
+        return true; // keep looking
+      }
+    };
+    _aot_adapter_handler_table.iterate(findblob_archived_table);
+  }
+#endif // INCLUDE_CDS
+  if (!found) {
+    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* handler) {
+      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
+        found = true;
+        return false; // abort iteration
+      } else {
+        return true; // keep looking
+      }
+    };
+    assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
+    _adapter_handler_table->iterate(findblob_runtime_table);
+  }
+  return found;
+}
+
 void AdapterHandlerLibrary::print_handler_on(outputStream* st, const CodeBlob* b) {
   bool found = false;
 #if INCLUDE_CDS
@@ -3425,23 +3435,23 @@ void AdapterHandlerLibrary::print_handler_on(outputStream* st, const CodeBlob* b
         found = true;
         st->print("Adapter for signature: ");
         handler->print_adapter_on(st);
-        return true;
+        return false; // abort iteration
       } else {
-        return false; // keep looking
+        return true; // keep looking
       }
     };
     _aot_adapter_handler_table.iterate(findblob_archived_table);
   }
 #endif // INCLUDE_CDS
   if (!found) {
-    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
-      if (b == CodeCache::find_blob(a->get_i2c_entry())) {
+    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* handler) {
+      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
         found = true;
         st->print("Adapter for signature: ");
-        a->print_adapter_on(st);
-        return true;
+        handler->print_adapter_on(st);
+        return false; // abort iteration
       } else {
-        return false; // keep looking
+        return true; // keep looking
       }
     };
     assert_locked_or_safepoint(AdapterHandlerLibrary_lock);

From 43afce54a7ecbd124f68f1f32d718f08b24ca61a Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Mon, 10 Nov 2025 18:52:00 +0000
Subject: [PATCH 117/512] 8371573: Shenandoah: Remove unnecessary include after
 JDK-8351091

Reviewed-by: wkemper, shade
---
 src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp
index 40eee8c342b..b960beeb16c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp
@@ -27,7 +27,6 @@
 #include "gc/shared/markBitMap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.hpp"
-#include "shenandoahGlobalGeneration.hpp"
 
 ShenandoahMarkingContext::ShenandoahMarkingContext(MemRegion heap_region, MemRegion bitmap_region, size_t num_regions) :
   _mark_bit_map(heap_region, bitmap_region),

From e1c952608d61c6c74c3fa4d00789390f3a789de4 Mon Sep 17 00:00:00 2001
From: Rui Li <ruiamzn@amazon.com>
Date: Tue, 11 Nov 2025 03:35:42 +0000
Subject: [PATCH 118/512] 8361339: Test
 gc/shenandoah/TestLargeObjectAlignment.java#generational fails on macOS
 aarch64 with OOM: Java heap space

Reviewed-by: shade, syan
---
 .../shenandoah/TestLargeObjectAlignment.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java b/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java
index 9e12a910896..6eb0f36f1ae 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java
@@ -29,12 +29,13 @@
  * @key randomness
  * @requires vm.gc.Shenandoah
  * @requires vm.bits == "64"
+ * @requires os.maxMemory > 4G
  * @library /test/lib
  *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xint                   TestLargeObjectAlignment
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:-TieredCompilation  TestLargeObjectAlignment
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=1 TestLargeObjectAlignment
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=4 TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xint                   TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:-TieredCompilation  TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=1 TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=4 TestLargeObjectAlignment
  */
 
 /*
@@ -43,14 +44,14 @@
  * @key randomness
  * @requires vm.gc.Shenandoah
  * @requires vm.bits == "64"
+ * @requires os.maxMemory > 4G
  * @library /test/lib
  *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -Xint                   TestLargeObjectAlignment
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -XX:-TieredCompilation  TestLargeObjectAlignment
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=1 TestLargeObjectAlignment
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=4 TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -Xint                   TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -XX:-TieredCompilation  TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=1 TestLargeObjectAlignment
+ * @run main/othervm -Xmx3g -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:ObjectAlignmentInBytes=16 -XX:TieredStopAtLevel=4 TestLargeObjectAlignment
  */
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;

From 76a1109d6fc7baac9ebc7accff800ef8927931bb Mon Sep 17 00:00:00 2001
From: GennadiyKrivoshein
 <164895822+GennadiyKrivoshein@users.noreply.github.com>
Date: Tue, 11 Nov 2025 03:49:39 +0000
Subject: [PATCH 119/512] 8251928: [macos] the printer DPI always be 72, cause
 some content lost when print out

Reviewed-by: psadhukhan, prr
---
 .../lwawt/macosx/CPrinterGraphicsConfig.java  |  18 +-
 .../classes/sun/lwawt/macosx/CPrinterJob.java |  46 ++-
 .../sun/lwawt/macosx/CPrinterSurfaceData.java |   7 +-
 .../native/libawt_lwawt/awt/PrinterView.m     |  19 +-
 test/jdk/javax/print/PrintablePrintDPI.java   | 300 ++++++++++++++++++
 5 files changed, 378 insertions(+), 12 deletions(-)
 create mode 100644 test/jdk/javax/print/PrintablePrintDPI.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java
index dcf8bbdfba5..069008ea50f 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.awt.GraphicsDevice;
 import java.awt.Rectangle;
 import java.awt.Transparency;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.VolatileImage;
@@ -45,10 +46,16 @@ public final class CPrinterGraphicsConfig extends GraphicsConfiguration {
 
     private final GraphicsDevice device;
     private final PageFormat pf;
+    private final AffineTransform deviceTransform;
 
     public CPrinterGraphicsConfig(PageFormat pf) {
+        this(pf, null);
+    }
+
+    CPrinterGraphicsConfig(PageFormat pf, AffineTransform deviceTransform) {
         this.device = new CPrinterDevice(this);
         this.pf = pf;
+        this.deviceTransform = deviceTransform;
     }
 
     public PageFormat getPageFormat() {
@@ -178,7 +185,8 @@ public final class CPrinterGraphicsConfig extends GraphicsConfiguration {
      */
     @Override
     public AffineTransform getDefaultTransform() {
-        return new AffineTransform();
+        return deviceTransform == null ?
+                new AffineTransform() : new AffineTransform(deviceTransform);
     }
 
     /**
@@ -224,6 +232,10 @@ public final class CPrinterGraphicsConfig extends GraphicsConfiguration {
      */
     @Override
     public Rectangle getBounds() {
-        return new Rectangle(0, 0, (int)pf.getWidth(), (int)pf.getHeight());
+        Point2D.Double pt = new Point2D.Double(pf.getWidth(), pf.getHeight());
+        Point2D.Double transformedPt = new Point2D.Double();
+        getDefaultTransform().transform(pt, transformedPt);
+        return new Rectangle(0, 0,
+                (int)transformedPt.getX(), (int)transformedPt.getY());
     }
 }
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
index 11ac733be3a..979eeb36239 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
@@ -35,6 +35,7 @@ import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
 import java.awt.SecondaryLoop;
 import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.print.Pageable;
@@ -85,6 +86,9 @@ public final class CPrinterJob extends RasterPrinterJob {
     // future compatibility and the state keeping that it handles.
 
     private static String sShouldNotReachHere = "Should not reach here.";
+    private static final double USER_SPACE_DPI = 72.0;
+    private static final int DEFAULT_DOC_DPI_X = 300;
+    private static final int DEFAULT_DOC_DPI_Y = 300;
 
     private volatile SecondaryLoop printingLoop;
     private AtomicReference<Throwable> printErrorRef = new AtomicReference<>();
@@ -110,6 +114,9 @@ public final class CPrinterJob extends RasterPrinterJob {
     private final Object fNSPrintInfoLock = new Object();
     private final Object disposerReferent = new Object();
 
+    private double hRes = DEFAULT_DOC_DPI_X;
+    private double vRes = DEFAULT_DOC_DPI_Y;
+
     static {
         // AWT has to be initialized for the native code to function correctly.
         Toolkit.getDefaultToolkit();
@@ -461,8 +468,7 @@ public final class CPrinterJob extends RasterPrinterJob {
      */
     @Override
     protected double getXRes() {
-        // NOTE: This is not used in the CPrinterJob code path.
-        return 0;
+        return hRes;
     }
 
     /**
@@ -471,8 +477,31 @@ public final class CPrinterJob extends RasterPrinterJob {
      */
     @Override
     protected double getYRes() {
-        // NOTE: This is not used in the CPrinterJob code path.
-        return 0;
+        return vRes;
+    }
+
+    @Override
+    protected void setXYRes(double x, double y) {
+        hRes = x;
+        vRes = y;
+    }
+
+    /**
+     * Returns the resolution in dots per inch across the width
+     * of the page. This method take into account the page orientation.
+     */
+    private double getXRes(PageFormat pageFormat) {
+        return pageFormat.getOrientation() == PageFormat.PORTRAIT ?
+                getXRes() : getYRes();
+    }
+
+    /**
+     * Returns the resolution in dots per inch across the height
+     * of the page. This method take into account the page orientation.
+     */
+    private double getYRes(PageFormat pageFormat) {
+        return pageFormat.getOrientation() == PageFormat.PORTRAIT ?
+                getYRes() : getXRes();
     }
 
     /**
@@ -817,7 +846,11 @@ public final class CPrinterJob extends RasterPrinterJob {
         // This is called from the native side.
         Runnable r = new Runnable() { public void run() {
             try {
-                SurfaceData sd = CPrinterSurfaceData.createData(page, context); // Just stores page into an ivar
+                AffineTransform deviceTransform = new AffineTransform(
+                        getXRes(page) / USER_SPACE_DPI, 0, 0,
+                        getYRes(page) / USER_SPACE_DPI, 0, 0);
+                SurfaceData sd = CPrinterSurfaceData
+                        .createData(page, deviceTransform, context); // Just stores page into an ivar
                 if (defaultFont == null) {
                     defaultFont = new Font("Dialog", Font.PLAIN, 12);
                 }
@@ -873,6 +906,9 @@ public final class CPrinterJob extends RasterPrinterJob {
                         Rectangle2D pageFormatArea =
                              getPageFormatArea(pageFormat);
                         initPrinterGraphics(peekGraphics, pageFormatArea);
+                        double scaleX = getXRes(pageFormat) / USER_SPACE_DPI;
+                        double scaleY = getYRes(pageFormat) / USER_SPACE_DPI;
+                        peekGraphics.scale(scaleX, scaleY);
 
                         // Do the assignment here!
                         ret[0] = pageFormat;
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java
index bad5ecdcc09..cc14a185ed1 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package sun.lwawt.macosx;
 
 import java.awt.*;
+import java.awt.geom.AffineTransform;
 import java.awt.image.*;
 import java.awt.print.PageFormat;
 import java.nio.ByteBuffer;
@@ -40,8 +41,8 @@ public final class CPrinterSurfaceData extends OSXSurfaceData{
 //    public static final SurfaceType IntArgbPQ = SurfaceType.IntArgb.deriveSubType(DESC_INT_ARGB_PQ);
     public static final SurfaceType IntRgbPQ = SurfaceType.IntRgb.deriveSubType(DESC_INT_RGB_PQ);
 
-    static SurfaceData createData(PageFormat pf, long context) {
-        return new CPrinterSurfaceData(CPrinterGraphicsConfig.getConfig(pf), context);
+    static SurfaceData createData(PageFormat pf, AffineTransform deviceTransform, long context) {
+        return new CPrinterSurfaceData(new CPrinterGraphicsConfig(pf, deviceTransform), context);
     }
 
     private CPrinterSurfaceData(GraphicsConfiguration gc, long context) {
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m
index f39ca25a08f..d19948d9f0f 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,8 @@ static jclass sjc_PAbortEx = NULL;
     GET_CPRINTERJOB_CLASS();
     DECLARE_METHOD(jm_printToPathGraphics, sjc_CPrinterJob, "printToPathGraphics",
                    "(Lsun/print/PeekGraphics;Ljava/awt/print/PrinterJob;Ljava/awt/print/Printable;Ljava/awt/print/PageFormat;IJ)V");
+    DECLARE_METHOD(jm_getXRes, sjc_CPrinterJob, "getXRes", "(Ljava/awt/print/PageFormat;)D");
+    DECLARE_METHOD(jm_getYRes, sjc_CPrinterJob, "getYRes", "(Ljava/awt/print/PageFormat;)D");
 
     // Create and draw into a new CPrinterGraphics with the current Context.
     assert(fCurPageFormat != NULL);
@@ -103,6 +105,21 @@ static jclass sjc_PAbortEx = NULL;
 
     jlong context = ptr_to_jlong([printLoop context]);
     CGContextRef cgRef = (CGContextRef)[[printLoop context] graphicsPort];
+
+    // Scale from the java document DPI to the user space DPI
+    jdouble hRes = (*env)->CallDoubleMethod(env, fPrinterJob, jm_getXRes, fCurPageFormat);
+    CHECK_EXCEPTION();
+    jdouble vRes = (*env)->CallDoubleMethod(env, fPrinterJob, jm_getYRes, fCurPageFormat);
+    CHECK_EXCEPTION();
+    if (hRes > 0 && vRes > 0) {
+        double defaultDeviceDPI = 72;
+        double scaleX = defaultDeviceDPI / hRes;
+        double scaleY = defaultDeviceDPI / vRes;
+        if (scaleX != 1 || scaleY != 1) {
+            CGContextScaleCTM(cgRef, scaleX, scaleY);
+        }
+    }
+
     CGContextSaveGState(cgRef); //04/28/2004: state needs to be saved here due to addition of lazy state management
 
     (*env)->CallVoidMethod(env, fPrinterJob, jm_printToPathGraphics, fCurPeekGraphics, fPrinterJob,
diff --git a/test/jdk/javax/print/PrintablePrintDPI.java b/test/jdk/javax/print/PrintablePrintDPI.java
new file mode 100644
index 00000000000..6cae2be532c
--- /dev/null
+++ b/test/jdk/javax/print/PrintablePrintDPI.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, BELLSOFT. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.ResolutionSyntax;
+import javax.print.attribute.standard.OrientationRequested;
+import javax.print.attribute.standard.PrinterResolution;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+import javax.swing.border.EmptyBorder;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.GeneralPath;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+
+/*
+ * @test
+ * @bug 8251928
+ * @key printer
+ * @summary Printable.print method should reflect printer's DPI
+ * @library /java/awt/regtesthelpers
+ * @requires os.family == "mac"
+ * @build PassFailJFrame
+ * @run main/manual PrintablePrintDPI
+ */
+
+public class PrintablePrintDPI implements Printable {
+
+    private static final double PAPER_DPI = 72.0;
+    private static final int DEFAULT_DOCUMENT_DPI = 300;
+    private static final int UNITS = ResolutionSyntax.DPI;
+
+    private static final String INSTRUCTIONS = """
+           This test checks document DPI.
+           To be able to run this test it is required to have a
+           printer configured in your user environment.
+           Test's steps:
+             - Choose a printer.
+             - Choose a printer resolution.
+             - Press 'Print' button.
+           Visual inspection of the printed pages is needed.
+           A passing test will print chosen DPI on the printed page,
+           2 vertical and 2 horizontal lines.
+           """;
+
+    private final PrintService printService;
+    private final PrinterResolution printerResolution;
+
+    public static void main(String[] args) throws Exception {
+        PrintService[] availablePrintServices = PrintServiceLookup.lookupPrintServices(null, null);
+        if (availablePrintServices.length == 0) {
+            System.out.println("Available print services not found");
+            return;
+        }
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .testTimeOut(300)
+                .title("Document DPI test")
+                .testUI(createTestWindow(availablePrintServices))
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static Window createTestWindow(final PrintService[] availablePrintServices) {
+        final Window frame = new JFrame("Choose service to test");
+        JPanel pnlMain = new JPanel();
+        pnlMain.setBorder(new EmptyBorder(5, 5, 5, 5));
+        pnlMain.setLayout(new GridLayout(3, 1, 5, 5));
+        JLabel lblServices = new JLabel("Available services");
+        JLabel lblResolutions = new JLabel("Available resolutions");
+        JButton btnPrint = new JButton("Print");
+        btnPrint.setEnabled(false);
+        JComboBox<PrinterResolution> cbResolutions = new JComboBox<>();
+        cbResolutions.setRenderer(new ListCellRenderer<PrinterResolution>() {
+            @Override
+            public Component getListCellRendererComponent(JList<? extends PrinterResolution> list,
+                                                          PrinterResolution value,
+                                                          int index, boolean isSelected, boolean cellHasFocus) {
+                String str = value == null ? "" :
+                        String.format("%dx%d DPI",
+                                value.getCrossFeedResolution(UNITS), value.getFeedResolution(UNITS));
+                return new JLabel(str);
+            }
+        });
+        cbResolutions.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                btnPrint.setEnabled(cbResolutions.getSelectedItem() != null);
+            }
+        });
+
+        JComboBox<PrintService> cbServices = new JComboBox<>();
+        cbServices.setRenderer(new ListCellRenderer<PrintService>() {
+            @Override
+            public Component getListCellRendererComponent(JList<? extends PrintService> list, PrintService value,
+                                                          int index, boolean isSelected, boolean cellHasFocus) {
+                return new JLabel(value == null ? "" : value.getName());
+            }
+        });
+        cbServices.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                PrintService ps = (PrintService) cbServices.getSelectedItem();
+                cbResolutions.removeAllItems();
+                btnPrint.setEnabled(ps != null);
+                if (ps != null) {
+                    PrinterResolution[] supportedResolutions = (PrinterResolution[])ps
+                            .getSupportedAttributeValues(PrinterResolution.class, null, null);
+                    if (supportedResolutions == null || supportedResolutions.length == 0) {
+                        cbResolutions.addItem(new PrinterResolution(DEFAULT_DOCUMENT_DPI, DEFAULT_DOCUMENT_DPI, UNITS));
+                    } else {
+                        for (PrinterResolution pr : supportedResolutions) {
+                            cbResolutions.addItem(pr);
+                        }
+                    }
+                }
+            }
+        });
+        for (PrintService ps : availablePrintServices) {
+            cbServices.addItem(ps);
+        }
+        lblServices.setLabelFor(cbServices);
+        btnPrint.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                PrintService printService = (PrintService) cbServices.getSelectedItem();
+                PrinterResolution resolution = (PrinterResolution) cbResolutions.getSelectedItem();
+                if (printService != null && resolution != null) {
+                    cbServices.setEnabled(false);
+                    cbResolutions.setEnabled(false);
+                    btnPrint.setEnabled(false);
+                    frame.setVisible(false);
+                    new PrintablePrintDPI(printService, resolution).test();
+                }
+            }
+        });
+        pnlMain.add(lblServices);
+        pnlMain.add(cbServices);
+        pnlMain.add(lblResolutions);
+        pnlMain.add(cbResolutions);
+        pnlMain.add(btnPrint);
+        frame.add(pnlMain);
+        frame.pack();
+        return frame;
+    }
+
+    private PrintablePrintDPI(PrintService printService, PrinterResolution printerResolution) {
+        this.printService = printService;
+        this.printerResolution = printerResolution;
+    }
+
+    private void test() {
+        System.out.printf("Perform test using %s and %dx%d DPI\n",
+                printService.getName(),
+                printerResolution.getCrossFeedResolution(UNITS),
+                printerResolution.getFeedResolution(UNITS));
+
+        PrinterJob job = PrinterJob.getPrinterJob();
+        try {
+            PrintRequestAttributeSet attributeSet = new HashPrintRequestAttributeSet();
+            attributeSet.add(printerResolution);
+            attributeSet.add(OrientationRequested.PORTRAIT);
+            job.setPrintService(printService);
+            job.setPrintable(this);
+            job.print(attributeSet);
+        } catch (PrinterException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @Override
+    public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException {
+        if (pageIndex > 0) {
+            return NO_SUCH_PAGE;
+        }
+        final int[] deviceRes = printerResolution.getResolution(ResolutionSyntax.DPI);
+
+        Graphics2D g2 = (Graphics2D)graphics;
+
+        double hRes = g2.getTransform().getScaleX() * PAPER_DPI;
+        double vRes = g2.getTransform().getScaleY() * PAPER_DPI;
+
+        // Horizontal and vertical document resolution
+        g2.drawLine((int)pageFormat.getImageableX() + 5, (int)pageFormat.getImageableY() + 5,
+                (int)pageFormat.getImageableX() + 50, (int)pageFormat.getImageableY() + 5);
+        g2.drawString(Integer.toString((int)hRes),
+                (int)pageFormat.getImageableX() + 60,
+                (int)pageFormat.getImageableY() + 5 + g2.getFontMetrics().getHeight() / 2);
+
+        g2.drawLine((int)pageFormat.getImageableX() + 5, (int)pageFormat.getImageableY() + 5,
+                (int)pageFormat.getImageableX() + 5, (int)pageFormat.getImageableY() + 50);
+        g2.drawString(Integer.toString((int)vRes),
+                (int)pageFormat.getImageableX() + 5, (int)pageFormat.getImageableY() + 60);
+
+        String msg = String.format(
+                "Expected DPI: %dx%d, actual: %dx%d.\n",
+                deviceRes[0], deviceRes[1], (int)hRes, (int)vRes);
+        System.out.println(msg);
+
+        int msgX = (int)pageFormat.getImageableX() +
+                g2.getFontMetrics().stringWidth(Integer.toString((int)vRes)) + 20;
+        int msgY = (int)pageFormat.getImageableY() +
+                g2.getFontMetrics().getHeight() + 20;
+
+        g2.drawString(msg, msgX, msgY);
+        msgY += 20;
+        g2.drawString("ScaleX: " + g2.getTransform().getScaleX(), msgX, msgY);
+        msgY += 20;
+        g2.drawString("ScaleY: " + g2.getTransform().getScaleY(), msgX, msgY);
+
+        final float lineWidth = 0.2f;
+        double pageWidth = pageFormat.getWidth();
+        double xLeft = pageWidth / 10;
+        double yBase = pageFormat.getHeight() / 2;
+        double xBase = pageFormat.getWidth() / 2;
+        double yTop = yBase + 40;
+        double yBottom = pageFormat.getHeight() - pageFormat.getHeight() / 10;
+
+        g2.setStroke(new BasicStroke(lineWidth));
+
+        double xRight = pageWidth - xLeft;
+        g2.drawLine((int) xLeft, (int) yBase + 80,
+                (int) (xRight),(int) yBase + 80);
+        g2.drawLine((int) xBase, (int) yTop,
+                (int) (xBase),(int) yBottom);
+
+        GeneralPath line = new GeneralPath();
+        double halfLineWidth = lineWidth / 2.0f;
+        double yLine = yBase + 100;
+        double xLine = xBase + 20;
+        line.moveTo(xLeft, yLine);
+        line.lineTo(xLeft, yLine - halfLineWidth);
+        line.lineTo(xLine - halfLineWidth, yLine - halfLineWidth);
+        line.lineTo(xLine - halfLineWidth, yTop);
+        line.lineTo(xLine + halfLineWidth, yTop);
+        line.lineTo(xLine + halfLineWidth, yLine - halfLineWidth);
+        line.lineTo(xRight, yLine - halfLineWidth);
+        line.lineTo(xRight, yLine + halfLineWidth);
+        line.lineTo(xLine + halfLineWidth, yLine + halfLineWidth);
+        line.lineTo(xLine + halfLineWidth, yBottom);
+        line.lineTo(xLine - halfLineWidth, yBottom);
+        line.lineTo(xLine - halfLineWidth, yLine + halfLineWidth);
+        line.lineTo(xLeft, yLine + halfLineWidth );
+        line.closePath();
+        g2.clip(line);
+
+        g2.setColor(Color.RED);
+
+        line.reset();
+        line.moveTo(xLeft, yLine);
+        line.lineTo(xRight, yLine);
+        g2.draw(line);
+
+        line.reset();
+        line.moveTo(xBase + 20, yTop);
+        line.lineTo(xBase + 20, yBottom);
+        g2.draw(line);
+
+        return PAGE_EXISTS;
+    }
+}

From 291003208c025ce4f9a94ba6093e207d0792bbb9 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Tue, 11 Nov 2025 09:18:27 +0000
Subject: [PATCH 120/512] 8370966: Create regression test for the hierarchical
 memory limit fix in JDK-8370572

Reviewed-by: shade, syan
---
 .../containers/docker/TestJFRWithJMX.java     |   8 +-
 .../jtreg/containers/docker/TestJcmd.java     |   2 +-
 .../docker/TestMemoryInvisibleParent.java     | 117 ++++++++++++++++++
 .../docker/TestMemoryWithSubgroups.java       |  15 +--
 .../jtreg/containers/docker/TestPids.java     |   2 +-
 .../TestDockerMemoryMetricsSubgroup.java      |  15 +--
 .../containers/docker/DockerRunOptions.java   |   6 +
 .../containers/docker/DockerTestUtils.java    |  31 +++++
 8 files changed, 159 insertions(+), 37 deletions(-)
 create mode 100644 test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java

diff --git a/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java b/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java
index a9de46e00b0..efe1fa4ffbc 100644
--- a/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java
+++ b/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java
@@ -77,7 +77,7 @@ public class TestJFRWithJMX {
             throw new SkippedException("Docker is not supported on this host");
         }
 
-        if (isPodman() & !Platform.isRoot()) {
+        if (DockerTestUtils.isPodman() & !Platform.isRoot()) {
             throw new SkippedException("test cannot be run under rootless podman configuration");
         }
 
@@ -222,10 +222,4 @@ public class TestJFRWithJMX {
         }
     }
 
-    static boolean isPodman() {
-        String[] parts = Container.ENGINE_COMMAND
-            .toLowerCase()
-            .split(File.pathSeparator);
-        return "podman".equals(parts[parts.length - 1]);
-    }
 }
diff --git a/test/hotspot/jtreg/containers/docker/TestJcmd.java b/test/hotspot/jtreg/containers/docker/TestJcmd.java
index 4b604096b00..8c210544bb6 100644
--- a/test/hotspot/jtreg/containers/docker/TestJcmd.java
+++ b/test/hotspot/jtreg/containers/docker/TestJcmd.java
@@ -57,7 +57,7 @@ public class TestJcmd {
     private static final String IMAGE_NAME = Common.imageName("jcmd");
     private static final int TIME_TO_RUN_CONTAINER_PROCESS = (int) (10 * Utils.TIMEOUT_FACTOR); // seconds
     private static final String CONTAINER_NAME = "test-container";
-    private static final boolean IS_PODMAN = Container.ENGINE_COMMAND.contains("podman");
+    private static final boolean IS_PODMAN = DockerTestUtils.isPodman();
     private static final String ROOT_UID = "0";
 
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java b/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
new file mode 100644
index 00000000000..208dd603615
--- /dev/null
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2025, IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.Container;
+import jdk.test.lib.containers.docker.Common;
+import jdk.test.lib.containers.docker.DockerTestUtils;
+import jdk.test.lib.containers.docker.ContainerRuntimeVersionTestUtils;
+import jdk.test.lib.containers.docker.DockerRunOptions;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.internal.platform.Metrics;
+
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.util.ArrayList;
+
+import jtreg.SkippedException;
+
+/*
+ * @test
+ * @bug 8370966
+ * @requires os.family == "linux"
+ * @requires !vm.asan
+ * @modules java.base/jdk.internal.platform
+ * @library /test/lib
+ * @run main TestMemoryInvisibleParent
+ */
+public class TestMemoryInvisibleParent {
+    private static final String UNLIMITED = "-1";
+    private static final String imageName = Common.imageName("invisible-parent");
+
+    public static void main(String[] args) throws Exception {
+        Metrics metrics = Metrics.systemMetrics();
+        if (metrics == null) {
+            System.out.println("Cgroup not configured.");
+            return;
+        }
+        if (!DockerTestUtils.canTestDocker()) {
+            System.out.println("Unable to run docker tests.");
+            return;
+        }
+
+        ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
+
+        if (DockerTestUtils.isRootless()) {
+            throw new SkippedException("Test skipped in rootless mode");
+        }
+        DockerTestUtils.buildJdkContainerImage(imageName);
+
+        if ("cgroupv1".equals(metrics.getProvider())) {
+            try {
+                testMemoryLimitHiddenParent("104857600", "104857600");
+                testMemoryLimitHiddenParent("209715200", "209715200");
+            } finally {
+                DockerTestUtils.removeDockerImage(imageName);
+            }
+        } else {
+            throw new SkippedException("cgroup v1 - only test! This is " + metrics.getProvider());
+        }
+    }
+
+    private static void testMemoryLimitHiddenParent(String valueToSet, String expectedValue)
+            throws Exception {
+
+        Common.logNewTestCase("Cgroup V1 hidden parent memory limit: " + valueToSet);
+
+        try {
+        String cgroupParent = setParentWithLimit(valueToSet);
+        DockerRunOptions opts = new DockerRunOptions(imageName, "/jdk/bin/java", "-version", "-Xlog:os+container=trace");
+        opts.appendTestJavaOptions = false;
+        if (DockerTestUtils.isPodman()) {
+            // Podman needs to run this test with engine option --cgroup-manager=cgroupfs
+            opts.addEngineOpts("--cgroup-manager", "cgroupfs");
+        }
+        opts.addDockerOpts("--cgroup-parent=/" + cgroupParent);
+        Common.run(opts)
+              .shouldContain("Hierarchical Memory Limit is: " + expectedValue);
+        } finally {
+            // Reset the parent memory limit to unlimited (-1)
+            setParentWithLimit(UNLIMITED);
+        }
+    }
+
+    private static String setParentWithLimit(String memLimit) throws Exception {
+        String cgroupParent = "hidden-parent-" + TestMemoryInvisibleParent.class.getSimpleName() + Runtime.version().feature();
+        Path sysFsMemory = Path.of("/", "sys", "fs", "cgroup", "memory");
+        Path cgroupParentPath = sysFsMemory.resolve(cgroupParent);
+        ProcessBuilder pb = new ProcessBuilder("mkdir", "-p", cgroupParentPath.toString());
+        OutputAnalyzer out = new OutputAnalyzer(pb.start())
+            .shouldHaveExitValue(0);
+        Path memoryLimitsFile = cgroupParentPath.resolve("memory.limit_in_bytes");
+        Files.writeString(memoryLimitsFile, memLimit);
+        System.out.println("Cgroup parent is: /" + cgroupParentPath.getFileName() +
+                           " at " + sysFsMemory.toString());
+        return cgroupParent;
+    }
+
+}
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
index bd1713e578c..3b901765ee9 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
@@ -46,19 +46,6 @@ import jtreg.SkippedException;
 public class TestMemoryWithSubgroups {
     private static final String imageName = Common.imageName("subgroup");
 
-    static String getEngineInfo(String format) throws Exception {
-        return DockerTestUtils.execute(Container.ENGINE_COMMAND, "info", "-f", format)
-            .getStdout();
-    }
-
-    static boolean isRootless() throws Exception {
-        // Docker and Podman have different INFO structures.
-        // The node path for Podman is .Host.Security.Rootless, that also holds for
-        // Podman emulating Docker CLI. The node path for Docker is .SecurityOptions.
-        return (getEngineInfo("{{.Host.Security.Rootless}}").contains("true") ||
-                getEngineInfo("{{.SecurityOptions}}").contains("name=rootless"));
-    }
-
     public static void main(String[] args) throws Exception {
         Metrics metrics = Metrics.systemMetrics();
         if (metrics == null) {
@@ -72,7 +59,7 @@ public class TestMemoryWithSubgroups {
 
         ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
 
-        if (isRootless()) {
+        if (DockerTestUtils.isRootless()) {
             throw new SkippedException("Test skipped in rootless mode");
         }
         Common.prepareWhiteBox();
diff --git a/test/hotspot/jtreg/containers/docker/TestPids.java b/test/hotspot/jtreg/containers/docker/TestPids.java
index 2e9c97110b2..62bd70dc61f 100644
--- a/test/hotspot/jtreg/containers/docker/TestPids.java
+++ b/test/hotspot/jtreg/containers/docker/TestPids.java
@@ -47,7 +47,7 @@ import jdk.test.lib.Utils;
 
 public class TestPids {
     private static final String imageName = Common.imageName("pids");
-    private static final boolean IS_PODMAN = Container.ENGINE_COMMAND.contains("podman");
+    private static final boolean IS_PODMAN = DockerTestUtils.isPodman();
     private static final int UNLIMITED_PIDS_PODMAN = 0;
     private static final int UNLIMITED_PIDS_DOCKER = -1;
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
index 53f11f22d79..f9dd405891c 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
@@ -52,19 +52,6 @@ public class TestDockerMemoryMetricsSubgroup {
             DockerfileConfig.getBaseImageName() + ":" +
             DockerfileConfig.getBaseImageVersion();
 
-    static String getEngineInfo(String format) throws Exception {
-        return DockerTestUtils.execute(Container.ENGINE_COMMAND, "info", "-f", format)
-                .getStdout();
-    }
-
-    static boolean isRootless() throws Exception {
-        // Docker and Podman have different INFO structures.
-        // The node path for Podman is .Host.Security.Rootless, that also holds for
-        // Podman emulating Docker CLI. The node path for Docker is .SecurityOptions.
-        return (getEngineInfo("{{.Host.Security.Rootless}}").contains("true") ||
-                getEngineInfo("{{.SecurityOptions}}").contains("name=rootless"));
-    }
-
     public static void main(String[] args) throws Exception {
         Metrics metrics = Metrics.systemMetrics();
         if (metrics == null) {
@@ -78,7 +65,7 @@ public class TestDockerMemoryMetricsSubgroup {
 
         ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
 
-        if (isRootless()) {
+        if (DockerTestUtils.isRootless()) {
             throw new SkippedException("Test skipped in rootless mode");
         }
 
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
index 1942ae734d9..b9ea60c9fb7 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
@@ -31,6 +31,7 @@ import java.util.Collections;
 // in test environment.
 public class DockerRunOptions {
     public String imageNameAndTag;
+    public ArrayList<String> engineOpts = new ArrayList<>();
     public ArrayList<String> dockerOpts = new ArrayList<>();
     public String command;    // normally a full path to java
     public ArrayList<String> javaOpts = new ArrayList<>();
@@ -70,6 +71,11 @@ public class DockerRunOptions {
         return this;
     }
 
+    public final DockerRunOptions addEngineOpts(String... opts) {
+        Collections.addAll(engineOpts, opts);
+        return this;
+    }
+
     public final DockerRunOptions addJavaOpts(String... opts) {
         Collections.addAll(javaOpts, opts);
         return this;
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
index f2f744240f0..422671d65b7 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -83,6 +83,14 @@ public class DockerTestUtils {
         return isDockerEngineAvailable;
     }
 
+    /**
+     * Checks if the actual engine command is podman.
+     *
+     * @return {@code true} if engine is podman. {@code false} otherwise.
+     */
+    public static boolean isPodman() {
+        return Container.ENGINE_COMMAND.contains("podman");
+    }
 
     /**
      * Convenience method, will check if docker engine is available and usable;
@@ -121,6 +129,26 @@ public class DockerTestUtils {
         return true;
     }
 
+    private static String getEngineInfo(String format) throws Exception {
+        return execute(Container.ENGINE_COMMAND, "info", "-f", format).getStdout();
+    }
+
+    /**
+     * Determine if the engine is running in root-less mode.
+     *
+     * @return {@code true} when running root-less (podman or docker). {@code false}
+     *         otherwise.
+     *
+     * @throws Exception
+     */
+    public static boolean isRootless() throws Exception {
+        // Docker and Podman have different INFO structures.
+        // The node path for Podman is .Host.Security.Rootless, that also holds for
+        // Podman emulating Docker CLI. The node path for Docker is .SecurityOptions.
+        return (getEngineInfo("{{.Host.Security.Rootless}}").contains("true") ||
+                getEngineInfo("{{.SecurityOptions}}").contains("name=rootless"));
+    }
+
      /**
      * Build a container image that contains JDK under test.
      * The jdk will be placed under the "/jdk/" folder inside the image/container file system.
@@ -202,6 +230,9 @@ public class DockerTestUtils {
      */
     public static List<String> buildJavaCommand(DockerRunOptions opts) throws Exception {
         List<String> cmd = buildContainerCommand();
+        if (!opts.engineOpts.isEmpty()) {
+            cmd.addAll(opts.engineOpts);
+        }
         cmd.add("run");
         if (opts.tty)
             cmd.add("--tty=true");

From 2902436fb15c76755286ed2df444bc6f9d93af13 Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Tue, 11 Nov 2025 13:00:22 +0000
Subject: [PATCH 121/512] 8371019: G1: Support heap expansion during startup

Reviewed-by: eosterlund, tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 13 ++++++++-----
 src/hotspot/share/gc/g1/g1Policy.cpp        | 17 +++++++++++++++--
 src/hotspot/share/gc/g1/g1Policy.hpp        |  1 +
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 8a5c6d4579e..9a5e390f6f1 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -185,10 +185,13 @@ G1HeapRegion* G1CollectedHeap::new_region(size_t word_size,
   G1HeapRegion* res = _hrm.allocate_free_region(type, node_index);
 
   if (res == nullptr && do_expand) {
-    // Currently, only attempts to allocate GC alloc regions set
-    // do_expand to true. So, we should only reach here during a
-    // safepoint.
-    assert(SafepointSynchronize::is_at_safepoint(), "invariant");
+    // There are two situations where do_expand is set to true:
+    //  - for mutator regions during initialization
+    //  - for GC alloc regions during a safepoint
+    // Make sure we only reach here before initialization is complete
+    // or during a safepoint.
+    assert(!is_init_completed() ||
+           SafepointSynchronize::is_at_safepoint() , "invariant");
 
     log_debug(gc, ergo, heap)("Attempt heap expansion (region allocation request failed). Allocation request: %zuB",
                               word_size * HeapWordSize);
@@ -3101,7 +3104,7 @@ G1HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
   if (should_allocate) {
     G1HeapRegion* new_alloc_region = new_region(word_size,
                                                 G1HeapRegionType::Eden,
-                                                false /* do_expand */,
+                                                policy()->should_expand_on_mutator_allocation() /* do_expand */,
                                                 node_index);
     if (new_alloc_region != nullptr) {
       new_alloc_region->set_eden();
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index fe754020e0c..ddcdfb0c3a4 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -1187,8 +1187,21 @@ double G1Policy::predict_region_code_root_scan_time(G1HeapRegion* hr, bool for_y
 }
 
 bool G1Policy::should_allocate_mutator_region() const {
-  uint young_list_length = _g1h->young_regions_count();
-  return young_list_length < young_list_target_length();
+  if (_g1h->young_regions_count() < young_list_target_length()) {
+    return true;
+  }
+
+  if (should_expand_on_mutator_allocation()) {
+    return true;
+  }
+
+  return false;
+}
+
+bool G1Policy::should_expand_on_mutator_allocation() const {
+  // We can't do a GC during init so allow additional mutator
+  // allocations until we can GC.
+  return !is_init_completed();
 }
 
 bool G1Policy::use_adaptive_young_list_length() const {
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index eb4a84b519d..93724657235 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -367,6 +367,7 @@ public:
   uint young_list_target_length() const { return AtomicAccess::load(&_young_list_target_length); }
 
   bool should_allocate_mutator_region() const;
+  bool should_expand_on_mutator_allocation() const;
 
   bool use_adaptive_young_list_length() const;
 

From cbd77fc9f3e6c8f1e996b30afe208c6a074cce3a Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Tue, 11 Nov 2025 14:26:58 +0000
Subject: [PATCH 122/512] 8370244: [PPC64] Several vector tests fail on Power8

Reviewed-by: dbriemann, rrich
---
 src/hotspot/cpu/ppc/vm_version_ppc.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 8b1de754650..75feb389298 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -111,6 +111,10 @@ void VM_Version::initialize() {
   }
 
   MaxVectorSize = SuperwordUseVSX ? 16 : 8;
+  if (!SuperwordUseVSX && FLAG_IS_DEFAULT(EnableVectorSupport)) {
+    // VectorSupport intrinsics currently have issues with MaxVectorSize < 16 (JDK-8370803).
+    FLAG_SET_ERGO(EnableVectorSupport, false);
+  }
   if (FLAG_IS_DEFAULT(AlignVector)) {
     FLAG_SET_ERGO(AlignVector, false);
   }

From 405d5f7a6892426d69409c3975d0c808304b8438 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 11 Nov 2025 14:56:20 +0000
Subject: [PATCH 123/512] 8371297: C2: assert triggered in BoolTest::BoolTest

Reviewed-by: dlong, luhenry, epeter
---
 src/hotspot/share/opto/vtransform.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
index 9fd6ad1089c..c617f8415e4 100644
--- a/src/hotspot/share/opto/vtransform.cpp
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -1586,8 +1586,9 @@ void VTransformReinterpretVectorNode::print_spec() const {
 
 void VTransformBoolVectorNode::print_spec() const {
   VTransformVectorNode::print_spec();
-  const BoolTest bt(_test._mask);
-  tty->print(" test=");
+  BoolTest::mask m = BoolTest::mask(_test._mask & ~BoolTest::unsigned_compare);
+  const BoolTest bt(m);
+  tty->print(" test=%s", m == _test._mask ? "" : "unsigned ");
   bt.dump_on(tty);
 }
 #endif

From bbeb6bf0ac8952feaf8afc9c9b25a9a372c2c798 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Tue, 11 Nov 2025 15:07:10 +0000
Subject: [PATCH 124/512] 8371493: Simplify search for  AdapterHandlerEntry

Reviewed-by: kvn, adinn
---
 src/hotspot/share/code/codeBlob.cpp         |  3 +-
 src/hotspot/share/runtime/sharedRuntime.cpp | 34 ++-------------------
 src/hotspot/share/runtime/sharedRuntime.hpp |  1 -
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 18cdb6161fc..a0a34ec23fa 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -870,9 +870,10 @@ void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const
       return;
     }
     //
-    if (AdapterHandlerLibrary::contains(this)) {
+    if (is_adapter_blob()) {
       st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an AdapterHandler", p2i(addr), (int)(addr - code_begin()));
       AdapterHandlerLibrary::print_handler_on(st, this);
+      return;
     }
     // the stubroutines are generated into a buffer blob
     StubCodeDesc* d = StubCodeDesc::desc_for(addr);
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 835bbc0ae2f..79c7c0b32b4 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -3396,42 +3396,12 @@ uint32_t AdapterHandlerLibrary::id(AdapterHandlerEntry* handler) {
   return handler->id();
 }
 
-bool AdapterHandlerLibrary::contains(const CodeBlob* b) {
-  bool found = false;
-#if INCLUDE_CDS
-  if (AOTCodeCache::is_using_adapter()) {
-    auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
-      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
-        found = true;
-        return false; // abort iteration
-      } else {
-        return true; // keep looking
-      }
-    };
-    _aot_adapter_handler_table.iterate(findblob_archived_table);
-  }
-#endif // INCLUDE_CDS
-  if (!found) {
-    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* handler) {
-      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
-        found = true;
-        return false; // abort iteration
-      } else {
-        return true; // keep looking
-      }
-    };
-    assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
-    _adapter_handler_table->iterate(findblob_runtime_table);
-  }
-  return found;
-}
-
 void AdapterHandlerLibrary::print_handler_on(outputStream* st, const CodeBlob* b) {
   bool found = false;
 #if INCLUDE_CDS
   if (AOTCodeCache::is_using_adapter()) {
     auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
-      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
+      if (b == handler->adapter_blob()) {
         found = true;
         st->print("Adapter for signature: ");
         handler->print_adapter_on(st);
@@ -3445,7 +3415,7 @@ void AdapterHandlerLibrary::print_handler_on(outputStream* st, const CodeBlob* b
 #endif // INCLUDE_CDS
   if (!found) {
     auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* handler) {
-      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
+      if (b == handler->adapter_blob()) {
         found = true;
         st->print("Adapter for signature: ");
         handler->print_adapter_on(st);
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index f4ff51504f0..a696ce5a71b 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -866,7 +866,6 @@ class AdapterHandlerLibrary: public AllStatic {
 
   static void print_handler(const CodeBlob* b) { print_handler_on(tty, b); }
   static void print_handler_on(outputStream* st, const CodeBlob* b);
-  static bool contains(const CodeBlob* b);
   static const char* name(AdapterHandlerEntry* handler);
   static uint32_t id(AdapterHandlerEntry* handler);
 #ifndef PRODUCT

From f5eacbeb5fc58c1bd844d709fe92621ce3689d78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <bmaillard@openjdk.org>
Date: Tue, 11 Nov 2025 16:33:15 +0000
Subject: [PATCH 125/512] 8371534: C2: Missed Ideal optimization opportunity
 with AndL and URShiftL

Reviewed-by: thartmann, mhaessig
---
 src/hotspot/share/opto/phaseX.cpp             |  5 ++-
 .../compiler/c2/TestMaskAndRShiftReorder.java | 37 ++++++++++++++++---
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 5fcb2a62682..8f192cf069c 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2550,11 +2550,12 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
-  // If changed AndI/AndL inputs, check RShift users for "(x & mask) >> shift" optimization opportunity
+  // If changed AndI/AndL inputs, check RShift/URShift users for "(x & mask) >> shift" optimization opportunity
   if (use_op == Op_AndI || use_op == Op_AndL) {
     for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
       Node* u = use->fast_out(i2);
-      if (u->Opcode() == Op_RShiftI || u->Opcode() == Op_RShiftL) {
+      if (u->Opcode() == Op_RShiftI || u->Opcode() == Op_RShiftL ||
+          u->Opcode() == Op_URShiftI || u->Opcode() == Op_URShiftL) {
         worklist.push(u);
       }
     }
diff --git a/test/hotspot/jtreg/compiler/c2/TestMaskAndRShiftReorder.java b/test/hotspot/jtreg/compiler/c2/TestMaskAndRShiftReorder.java
index bbb80e2c120..3ebb8e5bf68 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMaskAndRShiftReorder.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMaskAndRShiftReorder.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @bug 8361700
+ * @bug 8361700 8371534
  * @summary An expression of the form "(x & mask) >> shift", where the mask
  *          is a constant, should be transformed to "(x >> shift) & (mask >> shift)"
  *          VerifyIterativeGVN checks that this optimization was applied
  * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions
- *      -XX:CompileCommand=compileonly,compiler.c2.TestMaskAndRShiftReorder::test
+ *      -XX:CompileCommand=compileonly,compiler.c2.TestMaskAndRShiftReorder::test*
  *      -XX:VerifyIterativeGVN=1110 compiler.c2.TestMaskAndRShiftReorder
  * @run main compiler.c2.TestMaskAndRShiftReorder
  *
@@ -41,13 +41,15 @@ public class TestMaskAndRShiftReorder {
 
 
     public static void main(String[] strArr) {
-        test();
+        // No known reproducer with URShiftI so far
+        testRShiftI();
+        testRShiftL();
+        testURShiftL();
     }
 
-    static long test() {
+    static void testRShiftI() {
         int x = 10;
         int y = -17;
-        int iArr[] = new int[10];
         for (int i = 1; i < 7; i++) {
             for (int j = 1; j < 2; j++) {
                 x <<= lFld;
@@ -55,6 +57,29 @@ public class TestMaskAndRShiftReorder {
             y &= x;
             y >>= 1;
         }
-        return iArr.length;
+    }
+
+    static void testRShiftL() {
+        long x = 10;
+        long y = -17L;
+        for (int i = 1; i < 7; i++) {
+            for (int j = 1; j < 2; j++) {
+                x <<= lFld;
+            }
+            y &= x;
+            y >>= 1;
+        }
+    }
+
+    static void testURShiftL() {
+        long x = 10;
+        long y = -17L;
+        for (int i = 1; i < 7; i++) {
+            for (int j = 1; j < 2; j++) {
+                x <<= lFld;
+            }
+            y &= x;
+            y >>>= 1;
+        }
     }
 }

From c6a8027b94bbcbde5f7dcabd0bff48b93bbb5a7f Mon Sep 17 00:00:00 2001
From: Dan Smith <dlsmith@openjdk.org>
Date: Tue, 11 Nov 2025 17:11:44 +0000
Subject: [PATCH 126/512] 8370154: Update @jls and @jvms taglets to point to
 local specs dir

Reviewed-by: liach
---
 make/Docs.gmk                                 |  3 +-
 .../src/classes/build/tools/taglet/JSpec.java | 61 +++++++++++++------
 .../classes/build/tools/taglet/ToolGuide.java |  8 ++-
 3 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 8b20572cb03..b105e1d8683 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -291,8 +291,7 @@ define SetupApiDocsGenerationBody
   $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES))
   $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
 
-  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \
-	-Djspec.version=$$(VERSION_SPECIFICATION)
+  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION)
 
   ifeq ($$(ENABLE_FULL_DOCS), true)
     $1_SEALED_GRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-sealed-graphs
diff --git a/make/jdk/src/classes/build/tools/taglet/JSpec.java b/make/jdk/src/classes/build/tools/taglet/JSpec.java
index 34cc2bd6b50..ca45104e086 100644
--- a/make/jdk/src/classes/build/tools/taglet/JSpec.java
+++ b/make/jdk/src/classes/build/tools/taglet/JSpec.java
@@ -33,6 +33,8 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.lang.model.element.Element;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.LiteralTree;
@@ -44,7 +46,7 @@ import jdk.javadoc.doclet.Taglet;
 import static com.sun.source.doctree.DocTree.Kind.*;
 
 /**
- * A base class for block tags to insert a link to an external copy of JLS or JVMS.
+ * A base class for block tags to insert a link to a local copy of JLS or JVMS.
  * The tags can be used as follows:
  *
  * <pre>
@@ -57,30 +59,23 @@ import static com.sun.source.doctree.DocTree.Kind.*;
  * &commat;jls 3.4 Line Terminators
  * </pre>
  *
- * will produce the following HTML for a docs build configured for Java SE 12.
+ * will produce the following HTML, depending on the file containing
+ * the tag.
  *
  * <pre>{@code
  * <dt>See <i>Java Language Specification</i>:
- * <dd><a href="https://docs.oracle.com/javase/specs/jls/se12/html/jls-3.html#jls-3.4">3.4 Line terminators</a>
+ * <dd><a href="../../specs/jls/jls-3.html#jls-3.4">3.4 Line terminators</a>
  * }</pre>
  *
- * The version of the spec must be set in the jspec.version system property.
+ * Copies of JLS and JVMS are expected to have been placed in the {@code specs}
+ * folder. These documents are not included in open-source repositories.
  */
 public class JSpec implements Taglet  {
-    static final String SPEC_VERSION;
-
-    static {
-        SPEC_VERSION = System.getProperty("jspec.version");
-        if (SPEC_VERSION == null) {
-            throw new RuntimeException("jspec.version property not set");
-        }
-    }
 
     public static class JLS extends JSpec {
         public JLS() {
             super("jls",
                 "Java Language Specification",
-                "https://docs.oracle.com/javase/specs/jls/se" + SPEC_VERSION + "/html",
                 "jls");
         }
     }
@@ -89,20 +84,17 @@ public class JSpec implements Taglet  {
         public JVMS() {
             super("jvms",
                 "Java Virtual Machine Specification",
-                "https://docs.oracle.com/javase/specs/jvms/se" + SPEC_VERSION + "/html",
                 "jvms");
         }
     }
 
     private String tagName;
     private String specTitle;
-    private String baseURL;
     private String idPrefix;
 
-    JSpec(String tagName, String specTitle, String baseURL, String idPrefix) {
+    JSpec(String tagName, String specTitle, String idPrefix) {
         this.tagName = tagName;
         this.specTitle = specTitle;
-        this.baseURL = baseURL;
         this.idPrefix = idPrefix;
     }
 
@@ -169,8 +161,8 @@ public class JSpec implements Taglet  {
                 String chapter = m.group("chapter");
                 String section = m.group("section");
 
-                String url = String.format("%1$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
-                        baseURL, idPrefix, chapter, section);
+                String url = String.format("%1$s/../specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
+                        docRoot(elem), idPrefix, chapter, section);
 
                 sb.append("<a href=\"")
                         .append(url)
@@ -216,4 +208,35 @@ public class JSpec implements Taglet  {
             }
         }).visit(trees, new StringBuilder()).toString();
     }
+
+    private String docRoot(Element elem) {
+        switch (elem.getKind()) {
+            case MODULE:
+                return "..";
+
+            case PACKAGE:
+                PackageElement pe = (PackageElement)elem;
+                String pkgPart = pe.getQualifiedName()
+                        .toString()
+                        .replace('.', '/')
+                        .replaceAll("[^/]+", "..");
+                return pe.getEnclosingElement() != null
+                        ? "../" + pkgPart
+                        : pkgPart;
+
+            case CLASS, ENUM, RECORD, INTERFACE, ANNOTATION_TYPE:
+                TypeElement te = (TypeElement)elem;
+                return te.getQualifiedName()
+                        .toString()
+                        .replace('.', '/')
+                        .replaceAll("[^/]+", "..");
+
+            default:
+                var enclosing = elem.getEnclosingElement();
+                if (enclosing == null)
+                    throw new IllegalArgumentException(elem.getKind().toString());
+                return docRoot(enclosing);
+        }
+    }
+
 }
diff --git a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
index af38e0a765c..72a8ab05b3b 100644
--- a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
+++ b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
@@ -156,7 +156,8 @@ public class ToolGuide implements Taglet {
                 return pe.getEnclosingElement() != null
                         ? "../" + pkgPart
                         : pkgPart;
-            case CLASS:
+
+            case CLASS, ENUM, RECORD, INTERFACE, ANNOTATION_TYPE:
                 TypeElement te = (TypeElement)elem;
                 return te.getQualifiedName()
                         .toString()
@@ -164,7 +165,10 @@ public class ToolGuide implements Taglet {
                         .replaceAll("[^/]+", "..");
 
             default:
-                throw new IllegalArgumentException(elem.getKind().toString());
+                var enclosing = elem.getEnclosingElement();
+                if (enclosing == null)
+                    throw new IllegalArgumentException(elem.getKind().toString());
+                return docRoot(enclosing);
         }
     }
 }

From 8531fa146be1da5e96c0f23091882a27c67d7893 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Tue, 11 Nov 2025 21:07:34 +0000
Subject: [PATCH 127/512] 8358735: GenShen: block_start() may be incorrect
 after class unloading

Co-authored-by: Y. Srinivas Ramakrishna <ysr@openjdk.org>
Reviewed-by: wkemper
---
 .../share/gc/shenandoah/shenandoahHeap.hpp    |   1 +
 .../gc/shenandoah/shenandoahMarkBitMap.cpp    |  20 +
 .../gc/shenandoah/shenandoahMarkBitMap.hpp    |  24 +-
 .../shenandoahMarkBitMap.inline.hpp           |  90 +++
 .../shenandoah/shenandoahMarkingContext.hpp   |   4 +
 .../shenandoahMarkingContext.inline.hpp       |   4 +
 .../shenandoah/shenandoahScanRemembered.cpp   | 141 ++++-
 .../shenandoah/shenandoahScanRemembered.hpp   |  33 +-
 .../shenandoahScanRemembered.inline.hpp       |  34 +-
 .../shenandoah/test_shenandoahMarkBitMap.cpp  | 571 ++++++++++++++++++
 .../test_shenandoahOldHeuristic.cpp           |   2 +-
 .../gc/shenandoah/compiler/TestClone.java     |   1 +
 12 files changed, 883 insertions(+), 42 deletions(-)
 create mode 100644 test/hotspot/gtest/gc/shenandoah/test_shenandoahMarkBitMap.cpp

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index e5961efd36e..cd388ee7cf3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -270,6 +270,7 @@ private:
 public:
 
   inline HeapWord* base() const { return _heap_region.start(); }
+  inline HeapWord* end()  const { return _heap_region.end(); }
 
   inline size_t num_regions() const { return _num_regions; }
   inline bool is_heap_region_special() { return _heap_region_special; }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
index 34e6af41b42..5318f38d8ef 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
@@ -57,6 +57,26 @@ bool ShenandoahMarkBitMap::is_bitmap_clear_range(const HeapWord* start, const He
   return (result == end);
 }
 
+HeapWord* ShenandoahMarkBitMap::get_prev_marked_addr(const HeapWord* limit,
+                                                     const HeapWord* addr) const {
+#ifdef ASSERT
+  ShenandoahHeap* heap = ShenandoahHeap::heap();
+  ShenandoahHeapRegion* r = heap->heap_region_containing(addr);
+  ShenandoahMarkingContext* ctx = heap->marking_context();
+  HeapWord* tams = ctx->top_at_mark_start(r);
+  assert(limit != nullptr, "limit must not be null");
+  assert(limit >= r->bottom(), "limit must be more than bottom");
+  assert(addr <= tams, "addr must be less than TAMS");
+#endif
+
+  // Round addr down to a possible object boundary to be safe.
+  size_t const addr_offset = address_to_index(align_down(addr, HeapWordSize << LogMinObjAlignment));
+  size_t const limit_offset = address_to_index(limit);
+  size_t const last_offset = get_prev_one_offset(limit_offset, addr_offset);
+
+  // cast required to remove const-ness of the value pointed to.  We won't modify that object, but my caller might.
+  return (last_offset > addr_offset)? (HeapWord*) addr + 1: index_to_address(last_offset);
+}
 
 HeapWord* ShenandoahMarkBitMap::get_next_marked_addr(const HeapWord* addr,
                                                      const HeapWord* limit) const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
index c094ec434f5..73bf3ecbeea 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
@@ -119,9 +119,21 @@ private:
   template<bm_word_t flip, bool aligned_right>
   inline idx_t get_next_bit_impl(idx_t l_index, idx_t r_index) const;
 
-  inline idx_t get_next_one_offset (idx_t l_index, idx_t r_index) const;
+  // Helper for get_prev_{zero,one}_bit variants.
+  // - flip designates whether searching for 1s or 0s.  Must be one of
+  //   find_{zeros,ones}_flip.
+  // - aligned_left is true if l_index is a priori on a bm_word_t boundary.
+  template<bm_word_t flip, bool aligned_left>
+  inline idx_t get_prev_bit_impl(idx_t l_index, idx_t r_index) const;
 
-  void clear_large_range (idx_t beg, idx_t end);
+  // Search for the first marked address in the range [l_index, r_index), or r_index if none found.
+  inline idx_t get_next_one_offset(idx_t l_index, idx_t r_index) const;
+
+  // Search for last one in the range [l_index, r_index).  Return r_index if not found.
+  inline idx_t get_prev_one_offset(idx_t l_index, idx_t r_index) const;
+
+  // Clear the strong and weak mark bits for all index positions >= l_index and < r_index.
+  void clear_large_range(idx_t beg, idx_t end);
 
   // Verify bit is less than size().
   void verify_index(idx_t bit) const NOT_DEBUG_RETURN;
@@ -162,12 +174,14 @@ public:
 
   bool is_bitmap_clear_range(const HeapWord* start, const HeapWord* end) const;
 
-  // Return the address corresponding to the next marked bit at or after
-  // "addr", and before "limit", if "limit" is non-null.  If there is no
-  // such bit, returns "limit" if that is non-null, or else "endWord()".
+  // Return the first marked address in the range [addr, limit), or limit if none found.
   HeapWord* get_next_marked_addr(const HeapWord* addr,
                                  const HeapWord* limit) const;
 
+  // Return the last marked address in the range [limit, addr], or addr+1 if none found.
+  HeapWord* get_prev_marked_addr(const HeapWord* limit,
+                                 const HeapWord* addr) const;
+
   bm_word_t inverted_bit_mask_for_range(idx_t beg, idx_t end) const;
   void  clear_range_within_word    (idx_t beg, idx_t end);
   void clear_range (idx_t beg, idx_t end);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
index 3bea8d73959..ae56db810bb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahMarkBitMap.hpp"
 
 #include "runtime/atomicAccess.hpp"
+#include "utilities/count_leading_zeros.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 
 inline size_t ShenandoahMarkBitMap::address_to_index(const HeapWord* addr) const {
@@ -169,10 +170,99 @@ inline ShenandoahMarkBitMap::idx_t ShenandoahMarkBitMap::get_next_bit_impl(idx_t
   return r_index;
 }
 
+template<ShenandoahMarkBitMap::bm_word_t flip, bool aligned_left>
+inline ShenandoahMarkBitMap::idx_t ShenandoahMarkBitMap::get_prev_bit_impl(idx_t l_index, idx_t r_index) const {
+  STATIC_ASSERT(flip == find_ones_flip || flip == find_zeros_flip);
+  verify_range(l_index, r_index);
+  assert(!aligned_left || is_aligned(l_index, BitsPerWord), "l_index not aligned");
+
+  // The first word often contains an interesting bit, either due to
+  // density or because of features of the calling algorithm.  So it's
+  // important to examine that first word with a minimum of fuss,
+  // minimizing setup time for later words that will be wasted if the
+  // first word is indeed interesting.
+
+  // The benefit from aligned_left being true is relatively small.
+  // It saves an operation in the setup for the word search loop.
+  // It also eliminates the range check on the final result.
+  // However, callers often have a comparison with l_index, and
+  // inlining often allows the two comparisons to be combined; it is
+  // important when !aligned_left that return paths either return
+  // l_index or a value dominating a comparison with l_index.
+  // aligned_left is still helpful when the caller doesn't have a
+  // range check because features of the calling algorithm guarantee
+  // an interesting bit will be present.
+
+  if (l_index < r_index) {
+    // Get the word containing r_index, and shift out the high-order bits (representing objects that come after r_index)
+    idx_t index = to_words_align_down(r_index);
+    assert(BitsPerWord - 2 >= bit_in_word(r_index), "sanity");
+    size_t shift = BitsPerWord - 2 - bit_in_word(r_index);
+    bm_word_t cword = (map(index) ^ flip) << shift;
+    // After this shift, the highest order bits correspond to r_index.
+
+    // We give special handling if either of the two most significant bits (Weak or Strong) is set.  With 64-bit
+    // words, the mask of interest is 0xc000_0000_0000_0000.  Symbolically, this constant is represented by:
+    const bm_word_t first_object_mask = ((bm_word_t) 0x3) << (BitsPerWord - 2);
+    if ((cword & first_object_mask) != 0) {
+      // The first object is similarly often interesting. When it matters
+      // (density or features of the calling algorithm make it likely
+      // the first bit is set), going straight to the next clause compares
+      // poorly with doing this check first; count_leading_zeros can be
+      // relatively expensive, plus there is the additional range check.
+      // But when the first bit isn't set, the cost of having tested for
+      // it is relatively small compared to the rest of the search.
+      return r_index;
+    } else if (cword != 0) {
+      // Note that there are 2 bits corresponding to every index value (Weak and Strong), and every odd index value
+      //  corresponds to the same object as index-1
+      // Flipped and shifted first word is non-zero.  If leading_zeros is 0 or 1, we return r_index (above).
+      // if leading zeros is 2 or 3, we return (r_index - 1) or (r_index - 2), and so forth
+      idx_t result = r_index + 1 - count_leading_zeros(cword);
+      if (aligned_left || (result >= l_index)) return result;
+      else {
+        // Sentinel value means no object found within specified range.
+        return r_index + 2;
+      }
+    } else {
+      // Flipped and shifted first word is zero.  Word search through
+      // aligned up r_index for a non-zero flipped word.
+      idx_t limit = aligned_left
+                    ? to_words_align_down(l_index) // Minuscule savings when aligned.
+                    : to_words_align_up(l_index);
+      // Unsigned index is always >= unsigned limit if limit equals zero, so test for strictly greater than before decrement.
+      while (index-- > limit) {
+        cword = map(index) ^ flip;
+        if (cword != 0) {
+          // cword hods bits:
+          //    0x03 for the object corresponding to index (and index+1)       (count_leading_zeros is 62 or 63)
+          //    0x0c for the object corresponding to index + 2 (and index+3)   (count_leading_zeros is 60 or 61)
+          //    and so on.
+          idx_t result = bit_index(index + 1) - (count_leading_zeros(cword) + 1);
+          if (aligned_left || (result >= l_index)) return result;
+          else {
+            // Sentinel value means no object found within specified range.
+            return r_index + 2;
+          }
+        }
+      }
+      // No bits in range; return r_index+2.
+      return r_index + 2;
+    }
+  }
+  else {
+    return r_index + 2;
+  }
+}
+
 inline ShenandoahMarkBitMap::idx_t ShenandoahMarkBitMap::get_next_one_offset(idx_t l_offset, idx_t r_offset) const {
   return get_next_bit_impl<find_ones_flip, false>(l_offset, r_offset);
 }
 
+inline ShenandoahMarkBitMap::idx_t ShenandoahMarkBitMap::get_prev_one_offset(idx_t l_offset, idx_t r_offset) const {
+  return get_prev_bit_impl<find_ones_flip, false>(l_offset, r_offset);
+}
+
 // Returns a bit mask for a range of bits [beg, end) within a single word.  Each
 // bit in the mask is 0 if the bit is in the range, 1 if not in the range.  The
 // returned mask can be used directly to clear the range, or inverted to set the
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
index 8a52042e513..d8e0c74ea4e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
@@ -67,8 +67,12 @@ public:
   inline bool is_marked_or_old(oop obj) const;
   inline bool is_marked_strong_or_old(oop obj) const;
 
+  // Return address of the first marked address in the range [addr,limit), or limit if no marked object found
   inline HeapWord* get_next_marked_addr(const HeapWord* addr, const HeapWord* limit) const;
 
+  // Return address of the last marked object in range [limit, start], returning start+1 if no marked object found
+  inline HeapWord* get_prev_marked_addr(const HeapWord* limit, const HeapWord* start) const;
+
   inline bool allocated_after_mark_start(const oop obj) const;
   inline bool allocated_after_mark_start(const HeapWord* addr) const;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
index bff4afc9ce9..637dbf47c3f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
@@ -72,6 +72,10 @@ inline HeapWord* ShenandoahMarkingContext::get_next_marked_addr(const HeapWord*
   return _mark_bit_map.get_next_marked_addr(start, limit);
 }
 
+inline HeapWord* ShenandoahMarkingContext::get_prev_marked_addr(const HeapWord* limit, const HeapWord* start) const {
+  return _mark_bit_map.get_prev_marked_addr(limit, start);
+}
+
 inline bool ShenandoahMarkingContext::allocated_after_mark_start(oop obj) const {
   const HeapWord* addr = cast_from_oop<HeapWord*>(obj);
   return allocated_after_mark_start(addr);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index af6cd6d39ab..3a99023eca4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -137,9 +137,8 @@ void ShenandoahDirectCardMarkRememberedSet::mark_write_table_as_clean() {
 
 // No lock required because arguments align with card boundaries.
 void ShenandoahCardCluster::reset_object_range(HeapWord* from, HeapWord* to) {
-  assert(((((unsigned long long) from) & (CardTable::card_size() - 1)) == 0) &&
-         ((((unsigned long long) to) & (CardTable::card_size() - 1)) == 0),
-         "reset_object_range bounds must align with card boundaries");
+  assert(CardTable::is_card_aligned(from) && CardTable::is_card_aligned(to),
+         "Must align with card boundaries");
   size_t card_at_start = _rs->card_index_for_addr(from);
   size_t num_cards = (to - from) / CardTable::card_size_in_words();
 
@@ -234,31 +233,86 @@ size_t ShenandoahCardCluster::get_last_start(size_t card_index) const {
   return _object_starts[card_index].offsets.last;
 }
 
-// Given a card_index, return the starting address of the first block in the heap
-// that straddles into this card. If this card is co-initial with an object, then
-// this would return the first address of the range that this card covers, which is
-// where the card's first object also begins.
-HeapWord* ShenandoahCardCluster::block_start(const size_t card_index) const {
+HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, const ShenandoahMarkingContext* const ctx,
+                                                    HeapWord* tams, HeapWord* end_range_of_interest) const {
 
   HeapWord* left = _rs->addr_for_card_index(card_index);
+  assert(left < end_range_of_interest, "No meaningful work to do");
+  ShenandoahHeapRegion* region = ShenandoahHeap::heap()->heap_region_containing(left);
 
 #ifdef ASSERT
   assert(ShenandoahHeap::heap()->mode()->is_generational(), "Do not use in non-generational mode");
-  ShenandoahHeapRegion* region = ShenandoahHeap::heap()->heap_region_containing(left);
   assert(region->is_old(), "Do not use for young regions");
   // For HumongousRegion:s it's more efficient to jump directly to the
   // start region.
   assert(!region->is_humongous(), "Use region->humongous_start_region() instead");
 #endif
+
+  HeapWord* right = MIN2(region->top(), end_range_of_interest);
+  HeapWord* end_of_search_next = MIN2(right, tams);
+  size_t last_relevant_card_index;
+  if (end_range_of_interest == _end_of_heap) {
+    last_relevant_card_index = _rs->card_index_for_addr(end_range_of_interest - 1);
+  } else {
+    last_relevant_card_index = _rs->card_index_for_addr(end_range_of_interest);
+    if (_rs->addr_for_card_index(last_relevant_card_index) == end_range_of_interest) {
+      last_relevant_card_index--;
+    }
+  }
+  assert(card_index <= last_relevant_card_index, "sanity: card_index: %zu, last_relevant: %zu, left: " PTR_FORMAT
+         ", end_of_range: " PTR_FORMAT, card_index, last_relevant_card_index, p2i(left), p2i(end_range_of_interest));
+
+  // if marking context is valid and we are below tams, we use the marking bit map to find the first marked object that
+  // intersects with this card.  If no such object exists, we return the first marked object that follows the start
+  // of this card's memory range if such an object is found at or before last_relevant_card_index.  If there are no
+  // marked objects in this range, we return nullptr.
+  if ((ctx != nullptr) && (left < tams)) {
+    if (ctx->is_marked(left)) {
+      oop obj = cast_to_oop(left);
+      assert(oopDesc::is_oop(obj), "Should be an object");
+      return left;
+    }
+    // get the previous marked object, if any
+    if (region->bottom() < left) {
+      // In the case that this region was most recently marked as young, the fact that this region has been promoted in place
+      // denotes that final mark (Young) has completed.  In the case that this region was most recently marked as old, the
+      // fact that (ctx != nullptr) denotes that old marking has completed.  Otherwise, ctx would equal null.
+      HeapWord* prev = ctx->get_prev_marked_addr(region->bottom(), left - 1);
+      if (prev < left) {
+        oop obj = cast_to_oop(prev);
+        assert(oopDesc::is_oop(obj), "Should be an object");
+        HeapWord* obj_end = prev + obj->size();
+        if (obj_end > left) {
+          return prev;
+        }
+      }
+    }
+    // Either prev >= left (no previous object found), or the previous object that was found ends before my card range begins.
+    // In eiher case, find the next marked object if any on this or a following card
+    assert(!ctx->is_marked(left), "Was dealt with above");
+    assert(right > left, "We don't expect to be examining cards above the smaller of TAMS or top");
+    HeapWord* next = ctx->get_next_marked_addr(left, end_of_search_next);
+    // If end_of_search_next < right, we may return tams here, which is "marked" by default
+    if (next < right) {
+      oop obj = cast_to_oop(next);
+      assert(oopDesc::is_oop(obj), "Should be an object");
+      return next;
+    } else {
+      return nullptr;
+    }
+  }
+
+  assert((ctx == nullptr) || (left >= tams), "Should have returned above");
+
+  // The following code assumes that all data in region at or above left holds parsable objects
+  assert((left >= tams) || ShenandoahGenerationalHeap::heap()->old_generation()->is_parsable(),
+         "The code that follows expects a parsable heap");
   if (starts_object(card_index) && get_first_start(card_index) == 0) {
-    // This card contains a co-initial object; a fortiori, it covers
-    // also the case of a card being the first in a region.
+    // This card contains a co-initial object; a fortiori, it covers also the case of a card being the first in a region.
     assert(oopDesc::is_oop(cast_to_oop(left)), "Should be an object");
     return left;
   }
 
-  HeapWord* p = nullptr;
-  oop obj = cast_to_oop(p);
   ssize_t cur_index = (ssize_t)card_index;
   assert(cur_index >= 0, "Overflow");
   assert(cur_index > 0, "Should have returned above");
@@ -268,37 +322,80 @@ HeapWord* ShenandoahCardCluster::block_start(const size_t card_index) const {
   }
   // cur_index should start an object: we should not have walked
   // past the left end of the region.
-  assert(cur_index >= 0 && (cur_index <= (ssize_t)card_index), "Error");
+  assert(cur_index >= 0 && (cur_index <= (ssize_t) card_index), "Error");
   assert(region->bottom() <= _rs->addr_for_card_index(cur_index),
          "Fell off the bottom of containing region");
   assert(starts_object(cur_index), "Error");
   size_t offset = get_last_start(cur_index);
   // can avoid call via card size arithmetic below instead
-  p = _rs->addr_for_card_index(cur_index) + offset;
+  HeapWord* p = _rs->addr_for_card_index(cur_index) + offset;
+  if ((ctx != nullptr) && (p < tams)) {
+    if (ctx->is_marked(p)) {
+      oop obj = cast_to_oop(p);
+      assert(oopDesc::is_oop(obj), "Should be an object");
+      assert(Klass::is_valid(obj->klass()), "Not a valid klass ptr");
+      assert(p + obj->size() > left, "This object should span start of card");
+      assert(p < right, "Result must precede right");
+      return p;
+    } else {
+      // Object that spans start of card is dead, so should not be scanned
+      assert((ctx == nullptr) || (left + get_first_start(card_index) >= tams), "Should have handled this case above");
+      if (starts_object(card_index)) {
+        assert(left + get_first_start(card_index) < right, "Result must precede right");
+        return left + get_first_start(card_index);
+      } else {
+        // Spanning object is dead and this card does not start an object, so the start object is in some card that follows
+        size_t following_card_index = card_index;
+        do {
+          following_card_index++;
+          if (following_card_index > last_relevant_card_index) {
+            return nullptr;
+          }
+        } while (!starts_object(following_card_index));
+        assert(_rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index),
+               "Result must precede right");
+        return _rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index);
+      }
+    }
+  }
+
   // Recall that we already dealt with the co-initial object case above
   assert(p < left, "obj should start before left");
   // While it is safe to ask an object its size in the loop that
   // follows, the (ifdef'd out) loop should never be needed.
-  // 1. we ask this question only for regions in the old generation
+  // 1. we ask this question only for regions in the old generation, and those
+  //    that are not humongous regions
   // 2. there is no direct allocation ever by mutators in old generation
-  //    regions. Only GC will ever allocate in old regions, and then
-  //    too only during promotion/evacuation phases. Thus there is no danger
+  //    regions walked by this code. Only GC will ever allocate in old regions,
+  //    and then too only during promotion/evacuation phases. Thus there is no danger
   //    of races between reading from and writing to the object start array,
   //    or of asking partially initialized objects their size (in the loop below).
+  //    Furthermore, humongous regions (and their dirty cards) are never processed
+  //    by this code.
   // 3. only GC asks this question during phases when it is not concurrently
   //    evacuating/promoting, viz. during concurrent root scanning (before
   //    the evacuation phase) and during concurrent update refs (after the
   //    evacuation phase) of young collections. This is never called
-  //    during old or global collections.
+  //    during global collections during marking or update refs..
   // 4. Every allocation under TAMS updates the object start array.
-  NOT_PRODUCT(obj = cast_to_oop(p);)
+  oop obj = cast_to_oop(p);
   assert(oopDesc::is_oop(obj), "Should be an object");
+#ifdef ASSERT
+#define WALK_FORWARD_IN_BLOCK_START true
+#else
 #define WALK_FORWARD_IN_BLOCK_START false
+#endif // ASSERT
   while (WALK_FORWARD_IN_BLOCK_START && p + obj->size() < left) {
     p += obj->size();
+    obj = cast_to_oop(p);
+    assert(oopDesc::is_oop(obj), "Should be an object");
+    assert(Klass::is_valid(obj->klass()), "Not a valid klass ptr");
+    // Check assumptions in previous block comment if this assert fires
+    guarantee(false, "Should never need forward walk in block start");
   }
-#undef WALK_FORWARD_IN_BLOCK_START // false
-  assert(p + obj->size() > left, "obj should end after left");
+#undef WALK_FORWARD_IN_BLOCK_START
+  assert(p <= left, "p should start at or before left end of card");
+  assert(p + obj->size() > left, "obj should end after left end of card");
   return p;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
index d04a768530f..9a0d28d2cb7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
@@ -353,6 +353,7 @@ class ShenandoahCardCluster: public CHeapObj<mtGC> {
 
 private:
   ShenandoahDirectCardMarkRememberedSet* _rs;
+  const HeapWord* _end_of_heap;
 
 public:
   static const size_t CardsPerCluster = 64;
@@ -406,6 +407,7 @@ public:
 
   ShenandoahCardCluster(ShenandoahDirectCardMarkRememberedSet* rs) {
     _rs = rs;
+    _end_of_heap = ShenandoahHeap::heap()->end();
     _object_starts = NEW_C_HEAP_ARRAY(crossing_info, rs->total_cards() + 1, mtGC); // the +1 is to account for card table guarding entry
     for (size_t i = 0; i < rs->total_cards(); i++) {
       _object_starts[i].short_word = 0;
@@ -652,12 +654,31 @@ public:
   size_t get_last_start(size_t card_index) const;
 
 
-  // Given a card_index, return the starting address of the first block in the heap
-  // that straddles into the card. If the card is co-initial with an object, then
-  // this would return the starting address of the heap that this card covers.
-  // Expects to be called for a card affiliated with the old generation in
-  // generational mode.
-  HeapWord* block_start(size_t card_index) const;
+  // Given a card_index, return the starting address of the first live object in the heap
+  // that intersects with or follows this card. This must be a valid, parsable object, and must
+  // be the first such object that intersects with this card. The object may start before,
+  // at, or after the start of the card identified by card_index, and may end in or after the card.
+  //
+  // The tams argument represents top for the enclosing region at the start of the most recently
+  // initiated concurrent old marking effort.  If ctx is non-null, we use the marking context to identify
+  // marked objects below tams.  Above tams, we know that every object is marked and that the memory is
+  // parsable (so we can add an object's size to its address to find the next object).  If ctx is null,
+  // we use crossing maps to find where object's start, and use object sizes to walk individual objects.
+  // The region must be parsable if ctx is null.
+  //
+  // The end_range_of_interest pointer argument represents an upper bound on how far we look in the forward direction
+  // for the first object in the heap that intersects or follows this card.  If there are no live objects found at
+  // an address less than end_range_of_interest returns nullptr.
+  //
+  // Expects to be called for a card in a region affiliated with the old generation of the
+  // generational heap, otherwise behavior is undefined.
+  //
+  // If not null, ctx holds the complete marking context of the old generation. If null,
+  // we expect that the marking context isn't available and the crossing maps are valid.
+  // Note that crossing maps may be invalid following class unloading and before dead
+  // or unloaded objects have been coalesced and filled.  Coalesce and fill updates the crossing maps.
+  HeapWord* first_object_start(size_t card_index, const ShenandoahMarkingContext* const ctx,
+                               HeapWord* tams, HeapWord* end_range_of_interest) const;
 };
 
 // ShenandoahScanRemembered is a concrete class representing the
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp
index 919cc4f6fd7..e394daa68c0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp
@@ -50,7 +50,7 @@
 // degenerated execution, leading to dangling references.
 template <typename ClosureType>
 void ShenandoahScanRemembered::process_clusters(size_t first_cluster, size_t count, HeapWord* end_of_range,
-                                                               ClosureType* cl, bool use_write_table, uint worker_id) {
+                                                ClosureType* cl, bool use_write_table, uint worker_id) {
 
   assert(ShenandoahHeap::heap()->old_generation()->is_parsable(), "Old generation regions must be parsable for remembered set scan");
   // If old-gen evacuation is active, then MarkingContext for old-gen heap regions is valid.  We use the MarkingContext
@@ -102,7 +102,7 @@ void ShenandoahScanRemembered::process_clusters(size_t first_cluster, size_t cou
   // tams and ctx below are for old generation marking. As such, young gen roots must
   // consider everything above tams, since it doesn't represent a TAMS for young gen's
   // SATB marking.
-  const HeapWord* tams = (ctx == nullptr ? region->bottom() : ctx->top_at_mark_start(region));
+  HeapWord* const tams = (ctx == nullptr ? region->bottom() : ctx->top_at_mark_start(region));
 
   NOT_PRODUCT(ShenandoahCardStats stats(whole_cards, card_stats(worker_id));)
 
@@ -162,19 +162,37 @@ void ShenandoahScanRemembered::process_clusters(size_t first_cluster, size_t cou
       // [left, right) is a maximal right-open interval of dirty cards
       HeapWord* left = _rs->addr_for_card_index(dirty_l);        // inclusive
       HeapWord* right = _rs->addr_for_card_index(dirty_r + 1);   // exclusive
+      if (end_addr <= left) {
+        // The range of addresses to be scanned is empty
+        continue;
+      }
       // Clip right to end_addr established above (still exclusive)
       right = MIN2(right, end_addr);
       assert(right <= region->top() && end_addr <= region->top(), "Busted bounds");
       const MemRegion mr(left, right);
 
-      // NOTE: We'll not call block_start() repeatedly
-      // on a very large object if its head card is dirty. If not,
-      // (i.e. the head card is clean) we'll call it each time we
-      // process a new dirty range on the object. This is always
-      // the case for large object arrays, which are typically more
+      // NOTE: We'll not call first_object_start() repeatedly
+      // on a very large object, i.e. one spanning multiple cards,
+      // if its head card is dirty. If not, (i.e. its head card is clean)
+      // we'll call it each time we process a new dirty range on the object.
+      // This is always the case for large object arrays, which are typically more
       // common.
-      HeapWord* p = _scc->block_start(dirty_l);
+      assert(ctx != nullptr || heap->old_generation()->is_parsable(), "Error");
+      HeapWord* p = _scc->first_object_start(dirty_l, ctx, tams, right);
+      assert((p == nullptr) || (p < right), "No first object found is denoted by nullptr, p: "
+             PTR_FORMAT ", right: " PTR_FORMAT ", end_addr: " PTR_FORMAT ", next card addr: " PTR_FORMAT,
+             p2i(p), p2i(right), p2i(end_addr), p2i(_rs->addr_for_card_index(dirty_r + 1)));
+      if (p == nullptr) {
+        // There are no live objects to be scanned in this dirty range.  cur_index identifies first card in this
+        // uninteresting dirty range.  At top of next loop iteration, we will either end the looop
+        // (because cur_index < start_card_index) or we will begin the search for a range of clean cards.
+        continue;
+      }
+
       oop obj = cast_to_oop(p);
+      assert(oopDesc::is_oop(obj), "Not an object at " PTR_FORMAT ", left: " PTR_FORMAT ", right: " PTR_FORMAT,
+             p2i(p), p2i(left), p2i(right));
+      assert(ctx==nullptr || ctx->is_marked(obj), "Error");
 
       // PREFIX: The object that straddles into this range of dirty cards
       // from the left may be subject to special treatment unless
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahMarkBitMap.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahMarkBitMap.cpp
new file mode 100644
index 00000000000..3dbb7c62122
--- /dev/null
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahMarkBitMap.cpp
@@ -0,0 +1,571 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahMarkBitMap.hpp"
+#include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp"
+
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
+#include <iostream>
+END_ALLOW_FORBIDDEN_FUNCTIONS
+
+#include "memory/memRegion.hpp"
+#include "unittest.hpp"
+
+#include "utilities/ostream.hpp"
+#include "utilities/vmassert_reinstall.hpp"
+#include "utilities/vmassert_uninstall.hpp"
+
+// These tests will all be skipped (unless Shenandoah becomes the default
+// collector). To execute these tests, you must enable Shenandoah, which
+// is done with:
+//
+// % make exploded-test TEST="gtest:ShenandoahOld*" CONF=release TEST_OPTS="JAVA_OPTIONS=-XX:+UseShenandoahGC -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCMode=generational"
+//
+// Please note that these 'unit' tests are really integration tests and rely
+// on the JVM being initialized. These tests manipulate the state of the
+// collector in ways that are not compatible with a normal collection run.
+// If these tests take longer than the minimum time between gc intervals -
+// or, more likely, if you have them paused in a debugger longer than this
+// interval - you can expect trouble. These tests will also not run in a build
+// with asserts enabled because they use APIs that expect to run on a safepoint.
+
+#ifdef ASSERT
+#define SKIP_IF_NOT_SHENANDOAH()           \
+  std::cout << "skipped (debug build)\n";  \
+  return;
+#else
+#define SKIP_IF_NOT_SHENANDOAH() \
+    if (!UseShenandoahGC) {      \
+      std::cout << "skipped\n";  \
+      return;                    \
+    }
+#endif
+
+static bool _success;
+static size_t _assertion_failures;
+
+#define MarkBitMapAssertEqual(a, b)  EXPECT_EQ((a), (b));   if ((a) != (b)) { _assertion_failures++; }
+#define MarkBitMapAssertTrue(a)      EXPECT_TRUE((a));      if ((a) == 0)   { _assertion_failures++; }
+
+
+class ShenandoahMarkBitMapTest: public ::testing::Test {
+protected:
+
+  static void verify_bitmap_is_empty(HeapWord *start, size_t words_in_heap, ShenandoahMarkBitMap* mbm) {
+    MarkBitMapAssertTrue(mbm->is_bitmap_clear_range(start, start + words_in_heap));
+    while (words_in_heap-- > 0) {
+      MarkBitMapAssertTrue(!mbm->is_marked(start));
+      MarkBitMapAssertTrue(!mbm->is_marked_weak(start));
+      MarkBitMapAssertTrue(!mbm->is_marked_strong(start));
+      start++;
+    }
+  }
+
+  static void verify_bitmap_is_weakly_marked(ShenandoahMarkBitMap* mbm,
+                                             HeapWord* weakly_marked_addresses[], size_t weakly_marked_objects) {
+    for (size_t i = 0; i < weakly_marked_objects; i++) {
+      HeapWord* obj_addr = weakly_marked_addresses[i];
+      MarkBitMapAssertTrue(mbm->is_marked(obj_addr));
+      MarkBitMapAssertTrue(mbm->is_marked_weak(obj_addr));
+    }
+  }
+
+  static void verify_bitmap_is_strongly_marked(ShenandoahMarkBitMap* mbm,
+                                               HeapWord* strongly_marked_addresses[], size_t strongly_marked_objects) {
+    for (size_t i = 0; i < strongly_marked_objects; i++) {
+      HeapWord* obj_addr = strongly_marked_addresses[i];
+      MarkBitMapAssertTrue(mbm->is_marked(obj_addr));
+      MarkBitMapAssertTrue(mbm->is_marked_strong(obj_addr));
+    }
+  }
+
+  static void verify_bitmap_all(ShenandoahMarkBitMap* mbm, HeapWord* all_marked_addresses[],
+                                bool is_weakly_marked_object[], bool is_strongly_marked_object[], size_t  all_marked_objects,
+                                HeapWord* heap_memory, HeapWord* end_of_heap_memory) {
+    HeapWord* last_marked_addr = &heap_memory[-1];
+    for (size_t i = 0; i < all_marked_objects; i++) {
+      HeapWord* obj_addr = all_marked_addresses[i];
+      if (is_strongly_marked_object[i]) {
+        MarkBitMapAssertTrue(mbm->is_marked(obj_addr));
+        MarkBitMapAssertTrue(mbm->is_marked_strong(obj_addr));
+      }
+      if (is_weakly_marked_object[i]) {
+        MarkBitMapAssertTrue(mbm->is_marked(obj_addr));
+        MarkBitMapAssertTrue(mbm->is_marked_weak(obj_addr));
+      }
+      while (++last_marked_addr < obj_addr) {
+        MarkBitMapAssertTrue(!mbm->is_marked(last_marked_addr));
+        MarkBitMapAssertTrue(!mbm->is_marked_strong(last_marked_addr));
+        MarkBitMapAssertTrue(!mbm->is_marked_weak(last_marked_addr));
+      }
+      last_marked_addr = obj_addr;
+    }
+    while (++last_marked_addr < end_of_heap_memory) {
+      MarkBitMapAssertTrue(!mbm->is_marked(last_marked_addr));
+      MarkBitMapAssertTrue(!mbm->is_marked_strong(last_marked_addr));
+      MarkBitMapAssertTrue(!mbm->is_marked_weak(last_marked_addr));
+    }
+
+    HeapWord* next_marked = (HeapWord*) &heap_memory[0] - 1;
+    for (size_t i = 0; i < all_marked_objects; i++) {
+      next_marked = mbm->get_next_marked_addr(next_marked + 1, end_of_heap_memory);
+      MarkBitMapAssertTrue(mbm->is_marked(next_marked));
+      MarkBitMapAssertEqual(next_marked, all_marked_addresses[i]);
+      if (is_strongly_marked_object[i]) {
+        MarkBitMapAssertTrue(mbm->is_marked_strong(next_marked));
+      }
+      if (is_weakly_marked_object[i]) {
+        MarkBitMapAssertTrue(mbm->is_marked_weak(next_marked));
+      }
+    }
+    // We expect no more marked addresses to be found.  Should return limit.
+    HeapWord* sentinel = mbm->get_next_marked_addr(next_marked + 1, end_of_heap_memory);
+    MarkBitMapAssertEqual(sentinel, end_of_heap_memory);
+
+    HeapWord* prev_marked = end_of_heap_memory + 1;
+    for (int i = (int) all_marked_objects - 1; i >= 0; i--) {
+      prev_marked = mbm->get_prev_marked_addr(&heap_memory[0], prev_marked - 1);
+      MarkBitMapAssertEqual(prev_marked, all_marked_addresses[i]);
+      MarkBitMapAssertTrue(mbm->is_marked(prev_marked));
+      if (is_strongly_marked_object[i]) {
+        MarkBitMapAssertTrue(mbm->is_marked_strong(prev_marked));
+      }
+      if (is_weakly_marked_object[i]) {
+        MarkBitMapAssertTrue(mbm->is_marked_weak(prev_marked));
+      }
+    }
+    // We expect no more marked addresses to be found.  should return prev_marked.
+    sentinel = mbm->get_prev_marked_addr(&heap_memory[0], prev_marked - 1);
+    MarkBitMapAssertEqual(sentinel, prev_marked);
+  }
+
+public:
+
+  static bool run_test() {
+    ShenandoahHeap* heap = ShenandoahHeap::heap();
+    size_t heap_size = heap->max_capacity();
+    size_t heap_size_words = heap_size / HeapWordSize;
+    HeapWord* my_heap_memory = heap->base();
+    HeapWord* end_of_my_heap = my_heap_memory + heap_size_words;
+    MemRegion heap_descriptor(my_heap_memory, heap_size_words);
+
+    _success = false;
+    _assertion_failures = 0;
+
+    size_t bitmap_page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
+    size_t bitmap_size_orig = ShenandoahMarkBitMap::compute_size(heap_size);
+    size_t bitmap_size = align_up(bitmap_size_orig, bitmap_page_size);
+    size_t bitmap_word_size = (bitmap_size + HeapWordSize - 1) / HeapWordSize;
+
+    HeapWord* my_bitmap_memory = NEW_C_HEAP_ARRAY(HeapWord, bitmap_word_size, mtGC);
+
+    MarkBitMapAssertTrue(my_bitmap_memory != nullptr);
+    if (my_bitmap_memory == nullptr) {
+      std::cout <<"Cannot run test because failed to allocate bitmap memory\n" << std::flush;
+      return false;
+    }
+    MemRegion bitmap_descriptor(my_bitmap_memory, bitmap_size / HeapWordSize);
+    ShenandoahMarkBitMap mbm(heap_descriptor, bitmap_descriptor);
+
+    mbm.clear_range_large(heap_descriptor);
+    verify_bitmap_is_empty((HeapWord*) my_heap_memory, heap_size_words, &mbm);
+
+    HeapWord* weakly_marked_addresses[] = {
+      (HeapWord*) &my_heap_memory[13],
+      (HeapWord*) &my_heap_memory[14],
+      (HeapWord*) &my_heap_memory[15],
+      (HeapWord*) &my_heap_memory[16],
+      (HeapWord*) &my_heap_memory[176],
+      (HeapWord*) &my_heap_memory[240],
+      (HeapWord*) &my_heap_memory[480],
+      (HeapWord*) &my_heap_memory[1360],
+      (HeapWord*) &my_heap_memory[1488],
+      (HeapWord*) &my_heap_memory[2416],
+      (HeapWord*) &my_heap_memory[5968],
+      (HeapWord*) &my_heap_memory[8191],
+      (HeapWord*) &my_heap_memory[8192],
+      (HeapWord*) &my_heap_memory[8193]
+    };
+    size_t weakly_marked_objects = sizeof(weakly_marked_addresses) / sizeof(HeapWord*);
+    for (size_t i = 0; i < weakly_marked_objects; i++) {
+      mbm.mark_weak(weakly_marked_addresses[i]);
+    }
+    HeapWord* next_marked = (HeapWord*) &my_heap_memory[0] - 1;
+    for (size_t i = 0; i < weakly_marked_objects; i++) {
+      next_marked = mbm.get_next_marked_addr(next_marked + 1, end_of_my_heap);
+      MarkBitMapAssertEqual(next_marked, weakly_marked_addresses[i]);
+      MarkBitMapAssertTrue(mbm.is_marked(next_marked));
+      MarkBitMapAssertTrue(mbm.is_marked_weak(next_marked));
+      MarkBitMapAssertTrue(!mbm.is_marked_strong(next_marked));
+    }
+    // We expect no more marked addresses to be found.  Should return limit.
+    HeapWord* sentinel = mbm.get_next_marked_addr(next_marked + 1, end_of_my_heap);
+    HeapWord* heap_limit = end_of_my_heap;
+    MarkBitMapAssertEqual(sentinel, heap_limit);
+    HeapWord* prev_marked = end_of_my_heap + 1;;
+    for (int i = (int) weakly_marked_objects - 1; i >= 0; i--) {
+      // to be renamed get_prev_marked_addr()
+      prev_marked = mbm.get_prev_marked_addr(&my_heap_memory[0], prev_marked - 1);
+      MarkBitMapAssertEqual(prev_marked, weakly_marked_addresses[i]);
+      MarkBitMapAssertTrue(mbm.is_marked(prev_marked));
+      MarkBitMapAssertTrue(mbm.is_marked_weak(prev_marked));
+      MarkBitMapAssertTrue(!mbm.is_marked_strong(prev_marked));
+    }
+    // We expect no more marked addresses to be found.  should return prev_marked.
+    sentinel = mbm.get_prev_marked_addr(&my_heap_memory[0], prev_marked - 1);
+    // MarkBitMapAssertEqual(sentinel, prev_marked);
+    MarkBitMapAssertEqual(sentinel, prev_marked);
+    verify_bitmap_is_weakly_marked(&mbm, weakly_marked_addresses, weakly_marked_objects);
+
+    HeapWord* strongly_marked_addresses[] = {
+      (HeapWord*) &my_heap_memory[8],
+      (HeapWord*) &my_heap_memory[24],
+      (HeapWord*) &my_heap_memory[32],
+      (HeapWord*) &my_heap_memory[56],
+      (HeapWord*) &my_heap_memory[64],
+      (HeapWord*) &my_heap_memory[168],
+      (HeapWord*) &my_heap_memory[232],
+      (HeapWord*) &my_heap_memory[248],
+      (HeapWord*) &my_heap_memory[256],
+      (HeapWord*) &my_heap_memory[257],
+      (HeapWord*) &my_heap_memory[258],
+      (HeapWord*) &my_heap_memory[259],
+      (HeapWord*) &my_heap_memory[488],
+      (HeapWord*) &my_heap_memory[1352],
+      (HeapWord*) &my_heap_memory[1496],
+      (HeapWord*) &my_heap_memory[2432],
+      (HeapWord*) &my_heap_memory[5960]
+    };
+    size_t strongly_marked_objects = sizeof(strongly_marked_addresses) / sizeof(HeapWord*);
+    for (size_t i = 0; i < strongly_marked_objects; i++) {
+      bool upgraded = false;
+      mbm.mark_strong(strongly_marked_addresses[i], upgraded);
+      MarkBitMapAssertTrue(!upgraded);
+    }
+    verify_bitmap_is_strongly_marked(&mbm, strongly_marked_addresses, strongly_marked_objects);
+    HeapWord* upgraded_weakly_marked_addresses[] = {
+      (HeapWord*) &my_heap_memory[240],
+      (HeapWord*) &my_heap_memory[1360],
+    };
+    size_t upgraded_weakly_marked_objects = sizeof(upgraded_weakly_marked_addresses) / sizeof(HeapWord *);
+    for (size_t i = 0; i < upgraded_weakly_marked_objects; i++) {
+      bool upgraded = false;
+      mbm.mark_strong(upgraded_weakly_marked_addresses[i], upgraded);
+      MarkBitMapAssertTrue(upgraded);
+    }
+    verify_bitmap_is_strongly_marked(&mbm, upgraded_weakly_marked_addresses, upgraded_weakly_marked_objects);
+
+    HeapWord* all_marked_addresses[] = {
+      (HeapWord*) &my_heap_memory[8],        /* strongly marked */
+      (HeapWord*) &my_heap_memory[13],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[14],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[15],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[16],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[24],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[32],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[56],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[64],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[168],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[176],      /* weakly marked */
+      (HeapWord*) &my_heap_memory[232],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[240],      /* weakly marked upgraded to strongly marked */
+      (HeapWord*) &my_heap_memory[248],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[256],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[257],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[258],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[259],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[480],      /* weakly marked */
+      (HeapWord*) &my_heap_memory[488],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[1352],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[1360],     /* weakly marked upgraded to strongly marked */
+      (HeapWord*) &my_heap_memory[1488],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[1496],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[2416],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[2432],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[5960],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[5968],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[8191],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[8192],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[8193]      /* weakly marked */
+    };
+    size_t all_marked_objects = sizeof(all_marked_addresses) / sizeof(HeapWord*);
+    bool is_weakly_marked_object[] = {
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    };
+    bool is_strongly_marked_object[] = {
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      true,
+      true,
+      true,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false
+    };
+    verify_bitmap_all(&mbm, all_marked_addresses, is_weakly_marked_object, is_strongly_marked_object, all_marked_objects,
+                      my_heap_memory, end_of_my_heap);
+
+    MemRegion first_clear_region(&my_heap_memory[168], &my_heap_memory[256]);
+    mbm.clear_range_large(first_clear_region);
+    // Five objects are no longer marked
+    HeapWord* all_marked_addresses_after_first_clear[] = {
+      (HeapWord*) &my_heap_memory[8],        /* strongly marked */
+      (HeapWord*) &my_heap_memory[13],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[14],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[15],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[16],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[24],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[32],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[56],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[64],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[256],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[257],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[258],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[259],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[480],      /* weakly marked */
+      (HeapWord*) &my_heap_memory[488],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[1352],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[1360],     /* weakly marked upgraded to strongly marked */
+      (HeapWord*) &my_heap_memory[1488],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[1496],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[2416],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[2432],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[5960],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[5968],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[8191],    /* weakly marked */
+      (HeapWord*) &my_heap_memory[8192],    /* weakly marked */
+      (HeapWord*) &my_heap_memory[8193]     /* weakly marked */
+    };
+    size_t all_marked_objects_after_first_clear = sizeof(all_marked_addresses_after_first_clear) / sizeof(HeapWord*);
+    bool is_weakly_marked_object_after_first_clear[] = {
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    };
+    bool is_strongly_marked_object_after_first_clear[] = {
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      true,
+      true,
+      true,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false
+    };
+    verify_bitmap_all(&mbm, all_marked_addresses_after_first_clear,
+                      is_weakly_marked_object_after_first_clear, is_strongly_marked_object_after_first_clear,
+                      all_marked_objects_after_first_clear, my_heap_memory, end_of_my_heap);
+
+    MemRegion second_clear_region(&my_heap_memory[1360], &my_heap_memory[2416]);
+    mbm.clear_range_large(second_clear_region);
+    // Five objects are no longer marked
+    HeapWord* all_marked_addresses_after_2nd_clear[] = {
+      (HeapWord*) &my_heap_memory[8],        /* strongly marked */
+      (HeapWord*) &my_heap_memory[13],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[14],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[15],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[16],       /* weakly marked */
+      (HeapWord*) &my_heap_memory[24],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[32],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[56],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[64],       /* strongly marked */
+      (HeapWord*) &my_heap_memory[256],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[257],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[258],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[259],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[480],      /* weakly marked */
+      (HeapWord*) &my_heap_memory[488],      /* strongly marked */
+      (HeapWord*) &my_heap_memory[1352],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[2416],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[2432],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[5960],     /* strongly marked */
+      (HeapWord*) &my_heap_memory[5968],     /* weakly marked */
+      (HeapWord*) &my_heap_memory[8191],    /* weakly marked */
+      (HeapWord*) &my_heap_memory[8192],    /* weakly marked */
+      (HeapWord*) &my_heap_memory[8193]     /* weakly marked */
+    };
+    size_t all_marked_objects_after_2nd_clear = sizeof(all_marked_addresses_after_2nd_clear) / sizeof(HeapWord*);
+    bool is_weakly_marked_object_after_2nd_clear[] = {
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    };
+    bool is_strongly_marked_object_after_2nd_clear[] = {
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      true,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      false
+    };
+    verify_bitmap_all(&mbm, all_marked_addresses_after_2nd_clear,
+                      is_weakly_marked_object_after_2nd_clear, is_strongly_marked_object_after_2nd_clear,
+                      all_marked_objects_after_2nd_clear, my_heap_memory, end_of_my_heap);
+
+    FREE_C_HEAP_ARRAY(HeapWord, my_bitmap_memory);
+    _success = true;
+    return true;
+  }
+};
+
+TEST_VM_F(ShenandoahMarkBitMapTest, minimum_test) {
+  SKIP_IF_NOT_SHENANDOAH();
+
+  bool result = ShenandoahMarkBitMapTest::run_test();
+  ASSERT_EQ(result, true);
+  ASSERT_EQ(_success, true);
+  ASSERT_EQ(_assertion_failures, (size_t) 0);
+}
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp
index b661bd6bc57..b184b19ce6c 100644
--- a/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp
@@ -49,7 +49,7 @@
 #else
 #define SKIP_IF_NOT_SHENANDOAH() \
     if (!UseShenandoahGC) {      \
-      tty->print_cr("skipped");  \
+      std::cout << "skipped\n";  \
       return;                    \
     }
 #endif
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java
index 2e98c72ee17..0775e5baadd 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java
@@ -357,6 +357,7 @@
   *                   -XX:TieredStopAtLevel=4
   *                   TestClone
   */
+
 public class TestClone {
 
     public static void main(String[] args) throws Exception {

From 15dcbf0bc80b3c1ab09e44b9447c639780cce65e Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Wed, 12 Nov 2025 04:44:37 +0000
Subject: [PATCH 128/512] 8363950: Incorrect jtreg header in
 TestLayoutVsICU.java

Reviewed-by: azvegint
---
 .../awt/font/TextLayout/TestLayoutVsICU.java  |  889 --------
 .../TextLayout/TestLayoutVsICU_jdkbase.xml    | 1827 -----------------
 2 files changed, 2716 deletions(-)
 delete mode 100644 test/jdk/java/awt/font/TextLayout/TestLayoutVsICU.java
 delete mode 100644 test/jdk/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml

diff --git a/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU.java b/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU.java
deleted file mode 100644
index a12fd802fd5..00000000000
--- a/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU.java
+++ /dev/null
@@ -1,889 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Copyright (C) 2013-2014 IBM Corporation and Others. All Rights Reserved.
- */
-
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.FontFormatException;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Image;
-import java.awt.Paint;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.RenderingHints.Key;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.AttributedCharacterIterator;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.TreeMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * This test runs against a test XML file. It opens the fonts and attempts
- * to shape and layout glyphs.
- * Note that the test is highly environment dependent- you must have
- * the same versions of the same fonts available or the test will fail.
- *
- * It is similar to letest which is part of ICU.
- * For reference, here are some reference items:
- * ICU's test file:
- *  http://source.icu-project.org/repos/icu/icu/trunk/source/test/testdata/letest.xml
- * ICU's readme for the similar test:
- *  http://source.icu-project.org/repos/icu/icu/trunk/source/test/letest/readme.html
- *
- * @bug 8054203
- * @test
- * @summary manual test of layout engine behavior. Takes an XML control file.
- * @compile TestLayoutVsICU.java
- * @author srl
- * @run main/manual
- */
-public class TestLayoutVsICU {
-
-    public static boolean OPT_DRAW = false;
-    public static boolean OPT_VERBOSE = false;
-    public static boolean OPT_FAILMISSING = false;
-    public static boolean OPT_NOTHROW= false; // if true - don't stop on failure
-
-    public static int docs = 0; // # docs processed
-    public static int skipped = 0; // cases skipped due to bad font
-    public static int total = 0; // cases processed
-    public static int bad = 0; // cases with errs
-
-    public static final String XML_LAYOUT_TESTS = "layout-tests"; // top level
-    public static final String XML_TEST_CASE = "test-case";
-    public static final String XML_TEST_FONT = "test-font";
-    public static final String XML_TEST_TEXT = "test-text";
-    public static final String XML_RESULT_GLYPHS = "result-glyphs";
-    public static final String XML_ID = "id";
-    public static final String XML_SCRIPT = "script";
-    public static final String XML_NAME = "name";
-    public static final String XML_VERSION = "version";
-    public static final String XML_CHECKSUM = "checksum";
-    public static final String XML_RESULT_INDICES = "result-indices";
-    public static final String XML_RESULT_POSITIONS = "result-positions";
-
-    /**
-     * @param args
-     * @throws IOException
-     * @throws SAXException
-     * @throws ParserConfigurationException
-     */
-    public static void main(String[] args) throws ParserConfigurationException, SAXException, IOException {
-        System.out.println("Java " + System.getProperty("java.version") + " from " + System.getProperty("java.vendor"));
-        TestLayoutVsICU tlvi = null;
-        for(String arg : args) {
-            if(arg.equals("-d")) {
-                OPT_DRAW = true;
-            } else if(arg.equals("-n")) {
-                OPT_NOTHROW = true;
-            } else if(arg.equals("-v")) {
-                OPT_VERBOSE = true;
-            } else if(arg.equals("-f")) {
-                OPT_FAILMISSING = true;
-            } else {
-                if(tlvi == null) {
-                    tlvi = new TestLayoutVsICU();
-                }
-                try {
-                    tlvi.show(arg);
-                } finally {
-                    if(OPT_VERBOSE) {
-                        System.out.println("# done with " + arg);
-                    }
-                }
-            }
-        }
-
-        if(tlvi == null) {
-            throw new IllegalArgumentException("No XML input. Usage: " + TestLayoutVsICU.class.getSimpleName() + " [-d][-v][-f] letest.xml ...");
-        } else {
-            System.out.println("\n\nRESULTS:\n");
-            System.out.println(skipped+"\tskipped due to missing font");
-            System.out.println(total+"\ttested of which:");
-            System.out.println(bad+"\twere bad");
-
-            if(bad>0) {
-                throw new InternalError("One or more failure(s)");
-            }
-        }
-    }
-
-    String id;
-
-    private void show(String arg) throws ParserConfigurationException, SAXException, IOException {
-        id = "<none>";
-        File xmlFile = new File(arg);
-        if(!xmlFile.exists()) {
-            throw new FileNotFoundException("Can't open input XML file " + arg);
-        }
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        if(OPT_VERBOSE) {
-            System.out.println("# Parsing " + xmlFile.getAbsolutePath());
-        }
-        Document doc = db.parse(xmlFile);
-        Element e = doc.getDocumentElement();
-        if(!XML_LAYOUT_TESTS.equals(e.getNodeName())) {
-            throw new IllegalArgumentException("Document " + xmlFile.getAbsolutePath() + " does not have <layout-tests> as its base");
-        }
-
-        NodeList testCases = e.getElementsByTagName(XML_TEST_CASE);
-        for(int caseNo=0;caseNo<testCases.getLength();caseNo++) {
-            final Node testCase = testCases.item(caseNo);
-            final Map<String,String> testCaseAttrs = attrs(testCase);
-            id = testCaseAttrs.get(XML_ID);
-            final String script = testCaseAttrs.get(XML_SCRIPT);
-            String testText = null;
-            Integer[] expectGlyphs = null;
-            Integer[] expectIndices = null;
-            Map<String,String> fontAttrs = null;
-            if(OPT_VERBOSE) {
-                System.out.println("#"+caseNo+" id="+id + ", script="+script);
-            }
-            NodeList children = testCase.getChildNodes();
-            for(int sub=0;sub<children.getLength();sub++) {
-                Node n = children.item(sub);
-                if(n.getNodeType()!=Node.ELEMENT_NODE) continue;
-                String nn = n.getNodeName();
-                if(nn.equals(XML_TEST_FONT)) {
-                    fontAttrs = attrs(n);
-                } else if(nn.equals(XML_TEST_TEXT)) {
-                    testText = n.getTextContent();
-                } else if(nn.equals(XML_RESULT_GLYPHS)) {
-                    String hex = n.getTextContent();
-                    expectGlyphs = parseHexArray(hex);
-                } else if(nn.equals(XML_RESULT_INDICES)) {
-                    String hex = n.getTextContent();
-                    expectIndices = parseHexArray(hex);
-                } else if(OPT_VERBOSE) {
-                    System.out.println("Ignoring node " + nn);
-                }
-            }
-            if(fontAttrs == null) {
-                throw new IllegalArgumentException(id + " Missing node " + XML_TEST_FONT);
-            }
-            if(testText == null) {
-                throw new IllegalArgumentException(id + " Missing node " + XML_TEST_TEXT);
-            }
-
-            String fontName = fontAttrs.get(XML_NAME);
-            Font f = getFont(fontName, fontAttrs);
-            if(f==null) {
-                if(OPT_FAILMISSING) {
-                    throw new MissingResourceException("Missing font,  abort test", Font.class.getName(), fontName);
-                }
-                System.out.println("Skipping " + id + " because font is missing: " + fontName);
-                skipped++;
-                continue;
-            }
-            FontRenderContext frc = new FontRenderContext(null, true, true);
-            TextLayout tl = new TextLayout(testText,f,frc);
-            final List<GlyphVector> glyphs = new ArrayList<GlyphVector>();
-            Graphics2D myg2 = new Graphics2D(){
-
-                    @Override
-                    public void draw(Shape s) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, AffineTransform xform,
-                                             ImageObserver obs) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public void drawImage(BufferedImage img,
-                                          BufferedImageOp op, int x, int y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawRenderedImage(RenderedImage img,
-                                                  AffineTransform xform) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawRenderableImage(RenderableImage img,
-                                                    AffineTransform xform) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawString(String str, int x, int y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawString(String str, float x, float y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawString(
-                                           AttributedCharacterIterator iterator, int x, int y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawString(
-                                           AttributedCharacterIterator iterator, float x,
-                                           float y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawGlyphVector(GlyphVector g, float x, float y) {
-                        if(x!=0.0 || y!=0.0) {
-                            throw new InternalError("x,y should be 0 but got " + x+","+y);
-                        }
-                        //System.err.println("dGV : " + g.toString() + " @ "+x+","+y);
-                        glyphs.add(g);
-                    }
-
-                    @Override
-                    public void fill(Shape s) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public GraphicsConfiguration getDeviceConfiguration() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void setComposite(Composite comp) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setPaint(Paint paint) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setStroke(Stroke s) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setRenderingHint(Key hintKey, Object hintValue) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public Object getRenderingHint(Key hintKey) {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void setRenderingHints(Map<?, ?> hints) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void addRenderingHints(Map<?, ?> hints) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public RenderingHints getRenderingHints() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void translate(int x, int y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void translate(double tx, double ty) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void rotate(double theta) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void rotate(double theta, double x, double y) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void scale(double sx, double sy) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void shear(double shx, double shy) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void transform(AffineTransform Tx) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setTransform(AffineTransform Tx) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public AffineTransform getTransform() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public Paint getPaint() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public Composite getComposite() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void setBackground(Color color) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public Color getBackground() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public Stroke getStroke() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void clip(Shape s) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public FontRenderContext getFontRenderContext() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public Graphics create() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public Color getColor() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void setColor(Color c) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setPaintMode() {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setXORMode(Color c1) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public Font getFont() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void setFont(Font font) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public FontMetrics getFontMetrics(Font f) {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public Rectangle getClipBounds() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void clipRect(int x, int y, int width, int height) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void setClip(int x, int y, int width, int height) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public Shape getClip() {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-
-                    @Override
-                    public void setClip(Shape clip) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void copyArea(int x, int y, int width, int height,
-                                         int dx, int dy) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawLine(int x1, int y1, int x2, int y2) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void fillRect(int x, int y, int width, int height) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void clearRect(int x, int y, int width, int height) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawRoundRect(int x, int y, int width,
-                                              int height, int arcWidth, int arcHeight) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void fillRoundRect(int x, int y, int width,
-                                              int height, int arcWidth, int arcHeight) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawOval(int x, int y, int width, int height) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void fillOval(int x, int y, int width, int height) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawArc(int x, int y, int width, int height,
-                                        int startAngle, int arcAngle) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void fillArc(int x, int y, int width, int height,
-                                        int startAngle, int arcAngle) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawPolyline(int[] xPoints, int[] yPoints,
-                                             int nPoints) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void drawPolygon(int[] xPoints, int[] yPoints,
-                                            int nPoints) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public void fillPolygon(int[] xPoints, int[] yPoints,
-                                            int nPoints) {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, int x, int y,
-                                             ImageObserver observer) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, int x, int y,
-                                             int width, int height, ImageObserver observer) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, int x, int y,
-                                             Color bgcolor, ImageObserver observer) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, int x, int y,
-                                             int width, int height, Color bgcolor,
-                                             ImageObserver observer) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, int dx1, int dy1,
-                                             int dx2, int dy2, int sx1, int sy1, int sx2,
-                                             int sy2, ImageObserver observer) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public boolean drawImage(Image img, int dx1, int dy1,
-                                             int dx2, int dy2, int sx1, int sy1, int sx2,
-                                             int sy2, Color bgcolor, ImageObserver observer) {
-                        // TODO Auto-generated method stub
-                        return false;
-                    }
-
-                    @Override
-                    public void dispose() {
-                        // TODO Auto-generated method stub
-
-                    }
-
-                };
-            tl.draw(myg2, 0, 0);
-            if(glyphs.size() != 1) {
-                err("drew " + glyphs.size() + " times - expected 1");
-                total++;
-                bad++;
-                continue;
-            }
-            boolean isBad = false;
-            GlyphVector gv = glyphs.get(0);
-
-            // GLYPHS
-            int gotGlyphs[] = gv.getGlyphCodes(0, gv.getNumGlyphs(), new int[gv.getNumGlyphs()]);
-
-            int count = Math.min(gotGlyphs.length, expectGlyphs.length); // go up to this count
-
-            for(int i=0;i<count;i++) {
-                if(gotGlyphs[i]!=expectGlyphs[i]) {
-                    err("@"+i+" - got \tglyph 0x" + Integer.toHexString(gotGlyphs[i]) + " wanted 0x" + Integer.toHexString(expectGlyphs[i]));
-                    isBad=true;
-                    break;
-                }
-            }
-
-            // INDICES
-            int gotIndices[] = gv.getGlyphCharIndices(0, gv.getNumGlyphs(), new int[gv.getNumGlyphs()]);
-            for(int i=0;i<count;i++) {
-                if(gotIndices[i]!=expectIndices[i]) {
-                    err("@"+i+" - got \tindex 0x" + Integer.toHexString(gotGlyphs[i]) + " wanted 0x" + Integer.toHexString(expectGlyphs[i]));
-                    isBad=true;
-                    break;
-                }
-            }
-
-
-            // COUNT
-            if(gotGlyphs.length != expectGlyphs.length) {
-                System.out.println("Got " + gotGlyphs.length + " wanted " + expectGlyphs.length + " glyphs");
-                isBad=true;
-            } else {
-                if(OPT_VERBOSE) {
-                    System.out.println(">> OK: " + gotGlyphs.length + " glyphs");
-                }
-            }
-
-
-            if(isBad) {
-                bad++;
-                System.out.println("* FAIL: " + id + "  /\t" + fontName);
-            } else {
-                System.out.println("* OK  : " + id + "  /\t" + fontName);
-            }
-            total++;
-        }
-    }
-
-
-    private boolean verifyFont(File f, Map<String, String> fontAttrs) {
-        InputStream fis = null;
-        String fontName = fontAttrs.get(XML_NAME);
-        int count=0;
-        try {
-            fis = new BufferedInputStream(new FileInputStream(f));
-
-            int i = 0;
-            int r;
-            try {
-                while((r=fis.read())!=-1) {
-                    i+=(int)r;
-                    count++;
-                }
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-                return false;
-            }
-            if(OPT_VERBOSE) {
-                System.out.println("for " + f.getAbsolutePath() + " chks = 0x" + Integer.toHexString(i) + " size=" + count);
-            }
-            String theirStr = fontAttrs.get("rchecksum");
-
-            String ourStr = Integer.toHexString(i).toLowerCase();
-
-            if(theirStr!=null) {
-                if(theirStr.startsWith("0x")) {
-                    theirStr = theirStr.substring(2).toLowerCase();
-                } else {
-                    theirStr = theirStr.toLowerCase();
-                }
-                long theirs = Integer.parseInt(theirStr, 16);
-                if(theirs != i) {
-                    err("WARNING: rchecksum for " + fontName + " was " + i  + " (0x"+ourStr+") "+ " but file said " + theirs +" (0x"+theirStr+")  - perhaps a different font?");
-                    return false;
-                } else {
-                    if(OPT_VERBOSE) {
-                        System.out.println(" rchecksum for " + fontName + " OK");
-                    }
-                    return true;
-                }
-            } else {
-                //if(OPT_VERBOSE) {
-                System.err.println("WARNING: rchecksum for " + fontName + " was " + i  + " (0x"+ourStr+") "+ " but rchecksum was MISSING. Old ICU data?");
-                //}
-            }
-        } catch (FileNotFoundException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            return false;
-        } finally {
-            try {
-                fis.close();
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-        return true;
-    }
-
-
-    private Integer[] parseHexArray(String hex) {
-        List<Integer> ret = new ArrayList<Integer>();
-        String items[] = hex.split("[\\s,]");
-        for(String i : items) {
-            if(i.isEmpty()) continue;
-            if(i.startsWith("0x")) {
-                i = i.substring(2);
-            }
-            ret.add(Integer.parseInt(i, 16));
-        }
-        return ret.toArray(new Integer[0]);
-    }
-
-
-    private void err(String string) {
-        if(OPT_NOTHROW) {
-            System.out.println(id+" ERROR: " + string +" (continuing due to -n)");
-        } else {
-            throw new InternalError(id+ ": " + string);
-        }
-    }
-
-
-    private Font getFont(String fontName, Map<String, String> fontAttrs) {
-        Font f;
-        if(false)
-            try {
-                f = Font.getFont(fontName);
-                if(f!=null)  {
-                    if(OPT_VERBOSE) {
-                        System.out.println("Loaded default path to " + fontName);
-                    }
-                    return f;
-                }
-            } catch(Throwable t) {
-                if(OPT_VERBOSE) {
-                    t.printStackTrace();
-                    System.out.println("problem loading font " + fontName + " - " + t.toString());
-                }
-            }
-
-        File homeDir = new File(System.getProperty("user.home"));
-        File fontDir = new File(homeDir, "fonts");
-        File fontFile = new File(fontDir, fontName);
-        //System.out.println("## trying " + fontFile.getAbsolutePath());
-        if(fontFile.canRead()) {
-            try {
-                if(!verifyFont(fontFile,fontAttrs)) {
-                    System.out.println("Warning: failed to verify " + fontName);
-                }
-                f = Font.createFont(Font.TRUETYPE_FONT, fontFile);
-                if(f!=null & OPT_VERBOSE) {
-                    System.out.println("> loaded from " + fontFile.getAbsolutePath() + " - " + f.toString());
-                }
-                return f;
-            } catch (FontFormatException e) {
-                if(OPT_VERBOSE) {
-                    e.printStackTrace();
-                    System.out.println("problem loading font " + fontName + " - " + e.toString());
-                }
-            } catch (IOException e) {
-                if(OPT_VERBOSE) {
-                    e.printStackTrace();
-                    System.out.println("problem loading font " + fontName + " - " + e.toString());
-                }
-            }
-        }
-        return null;
-    }
-
-
-    private static Map<String, String> attrs(Node testCase) {
-        Map<String,String> rv = new TreeMap<String,String>();
-        NamedNodeMap nnm = testCase.getAttributes();
-        for(int i=0;i<nnm.getLength();i++) {
-            Node n = nnm.item(i);
-            String k = n.getNodeName();
-            String v = n.getNodeValue();
-            rv.put(k, v);
-        }
-        return rv;
-    }
-}
diff --git a/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml b/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml
deleted file mode 100644
index 6cc633649cd..00000000000
--- a/test/jdk/java/awt/font/TextLayout/TestLayoutVsICU_jdkbase.xml
+++ /dev/null
@@ -1,1827 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
--->
-<!--
-   NOTE: You are unlikely to have all needed fonts.
- -->
-<!--
-  Copyright (c) 1999-2014 International Business Machines
-  Corporation and others. All rights reserved.
-
-  WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT
-  UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
-
-  file name:    letest.xml
-  generated on: 03/04/2013 10:28:51 PM PST
-  generated by: gendata.cpp
--->
-
-<layout-tests>
-    <test-case id="Ghita" script="deva">
-        <test-font name="raghu.ttf" version="Original Version 1.00 (2005)" checksum="0x088DB135" rchecksum="0x00803FCE"/>
-
-        <test-text>श्रीमद् भगवद्गीता अध्याय अर्जुन विषाद योग धृतराष्ट्र उवाचृ धर्मक्षेत्रे कुरुक्षेत्रे समवेता युयुत्सवः मामकाः पाण्डवाश्चैव किमकुर्वत संजव</test-text>
-
-        <result-glyphs>
-            0x0000009E, 0x0000009A, 0x00000051, 0x00000222, 0x00000098, 0x00000091, 0x00000051, 0x00000003, 
-            0x00000097, 0x00000082, 0x0000009D, 0x000001A5, 0x0000FFFF, 0x0000FFFF, 0x00000222, 0x0000008F, 
-            0x00000221, 0x00000003, 0x0000005C, 0x000000DA, 0x0000FFFF, 0x00000099, 0x00000221, 0x00000099, 
-            0x00000003, 0x0000005C, 0x00000087, 0x000001D5, 0x0000005B, 0x0000FFFF, 0x00000093, 0x00000003, 
-            0x000001D2, 0x0000009D, 0x0000009F, 0x00000221, 0x00000091, 0x00000003, 0x00000099, 0x0000022A, 
-            0x00000082, 0x00000003, 0x00000092, 0x000001D9, 0x0000008F, 0x0000009A, 0x00000221, 0x000001B4, 
-            0x0000FFFF, 0x0000FFFF, 0x0000009A, 0x00000051, 0x00000003, 0x00000060, 0x0000009D, 0x00000221, 
-            0x00000085, 0x000001D9, 0x00000003, 0x00000092, 0x00000098, 0x0000005B, 0x0000FFFF, 0x000000A2, 
-            0x0000FFFF, 0x0000FFFF, 0x0000022F, 0x0000008F, 0x0000009A, 0x00000051, 0x0000022F, 0x00000003, 
-            0x00000080, 0x000001D5, 0x0000009A, 0x000001FD, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x0000022F, 
-            0x0000008F, 0x0000009A, 0x00000051, 0x0000022F, 0x00000003, 0x000000A0, 0x00000098, 0x0000009D, 
-            0x0000022F, 0x0000008F, 0x00000221, 0x00000003, 0x00000099, 0x000001D5, 0x00000099, 0x000001D5, 
-            0x000000D7, 0x0000FFFF, 0x000000A0, 0x0000009D, 0x0000022C, 0x00000003, 0x00000098, 0x00000221, 
-            0x00000098, 0x00000080, 0x00000221, 0x0000022C, 0x00000003, 0x00000094, 0x00000221, 0x000000D6, 
-            0x0000FFFF, 0x0000008C, 0x0000009D, 0x00000221, 0x000001B1, 0x0000FFFF, 0x0000FFFF, 0x00000230, 
-            0x0000009D, 0x00000003, 0x000001D1, 0x00000080, 0x00000098, 0x00000080, 0x000001D5, 0x0000009D, 
-            0x0000005B, 0x0000FFFF, 0x0000008F, 0x00000003, 0x000000A0, 0x00000232, 0x00000087, 0x0000009D
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x0000001C, 0x0000001D, 0x0000001A, 0x0000001B, 0x0000001E, 0x0000001F, 
-            0x00000021, 0x00000020, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 
-            0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E, 0x0000002F, 
-            0x00000030, 0x00000031, 0x00000033, 0x00000032, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 
-            0x00000038, 0x00000039, 0x0000003A, 0x0000003B, 0x0000003E, 0x0000003C, 0x0000003D, 0x0000003F, 
-            0x00000040, 0x00000041, 0x00000042, 0x00000043, 0x00000045, 0x00000044, 0x00000046, 0x00000047, 
-            0x00000048, 0x00000049, 0x0000004A, 0x0000004B, 0x0000004C, 0x0000004D, 0x0000004E, 0x0000004F, 
-            0x00000050, 0x00000052, 0x00000051, 0x00000053, 0x00000054, 0x00000055, 0x00000056, 0x00000057, 
-            0x00000058, 0x00000059, 0x0000005A, 0x0000005B, 0x0000005C, 0x0000005D, 0x0000005E, 0x0000005F, 
-            0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066, 0x00000067, 
-            0x00000068, 0x00000069, 0x0000006A, 0x0000006B, 0x0000006C, 0x0000006D, 0x0000006E, 0x0000006F, 
-            0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 0x00000075, 0x00000076, 0x00000077, 
-            0x00000078, 0x00000079, 0x0000007B, 0x0000007A, 0x0000007C, 0x0000007D, 0x0000007E, 0x00000081, 
-            0x0000007F, 0x00000080, 0x00000082, 0x00000083, 0x00000084, 0x00000085, 0x00000086, 0x00000087
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 9.468750, 0.000000, 19.130859, -0.451172, 15.984375, 0.000000, 
-            19.640625, 0.000000, 29.109375, 0.000000, 40.177734, -0.451172, 37.078125, 0.000000, 
-            43.078125, 0.000000, 52.546875, 0.000000, 62.015625, 0.000000, 69.984375, 0.000000, 
-            77.953125, 0.000000, 77.953125, 0.000000, 77.953125, 0.000000, 81.609375, 0.000000, 
-            89.578125, 0.000000, 93.234375, 0.000000, 99.234375, 0.000000, 109.171875, 0.000000, 
-            116.437500, 0.000000, 116.437500, 0.000000, 125.906250, 0.000000, 129.562500, 0.000000, 
-            139.031250, 0.000000, 145.031250, 0.000000, 154.968750, 0.000000, 164.718750, -0.011719, 
-            164.718750, 0.263672, 164.437500, 0.000000, 164.437500, 0.000000, 173.906250, 0.000000, 
-            179.906250, 0.000000, 184.265625, 0.000000, 192.234375, 0.000000, 200.203125, 0.000000, 
-            203.859375, 0.000000, 211.828125, 0.000000, 217.828125, 0.000000, 227.296875, 0.000000, 
-            231.375000, 0.000000, 240.843750, 0.000000, 246.843750, 0.000000, 256.740234, -0.011719, 
-            256.312500, 0.000000, 264.281250, 0.000000, 270.796875, 0.000000, 274.453125, 0.000000, 
-            282.796875, 0.000000, 282.796875, 0.000000, 282.796875, 0.000000, 292.458984, -0.451172, 
-            289.312500, 0.000000, 295.312500, 0.000000, 303.281250, 0.000000, 311.250000, 0.000000, 
-            314.906250, 0.000000, 324.890625, -0.011719, 324.375000, 0.000000, 330.375000, 0.000000, 
-            339.843750, 0.000000, 349.675781, 0.263672, 349.312500, 0.000000, 349.312500, 0.000000, 
-            360.187500, 0.000000, 360.187500, 0.000000, 359.384766, 0.275391, 360.187500, 0.000000, 
-            368.156250, 0.000000, 377.818359, -0.451172, 372.996094, 0.263672, 374.671875, 0.000000, 
-            380.671875, 0.000000, 388.371094, -0.011719, 391.546875, 0.000000, 398.062500, 0.000000, 
-            399.421875, 0.000000, 410.296875, 0.000000, 410.296875, 0.000000, 409.494141, 0.275391, 
-            410.296875, 0.000000, 418.265625, 0.000000, 427.927734, -0.451172, 423.105469, 0.263672, 
-            424.781250, 0.000000, 430.781250, 0.000000, 440.250000, 0.000000, 449.718750, 0.000000, 
-            456.832031, 0.263672, 457.687500, 0.000000, 465.656250, 0.000000, 469.312500, 0.000000, 
-            475.312500, 0.000000, 484.921875, -0.011719, 484.781250, 0.000000, 494.390625, -0.011719, 
-            494.250000, 0.000000, 500.179688, 0.000000, 500.179688, 0.000000, 509.648438, 0.000000, 
-            517.617188, 0.000000, 521.976562, 0.000000, 527.976562, 0.000000, 537.445312, 0.000000, 
-            541.101562, 0.000000, 550.570312, 0.000000, 561.445312, 0.000000, 565.101562, 0.000000, 
-            569.460938, 0.000000, 575.460938, 0.000000, 583.429688, 0.000000, 587.085938, 0.000000, 
-            594.351562, 0.000000, 594.351562, 0.000000, 602.320312, 0.000000, 610.289062, 0.000000, 
-            613.945312, 0.000000, 624.820312, 0.000000, 624.820312, 0.000000, 624.691406, 0.263672, 
-            624.820312, 0.000000, 632.789062, 0.000000, 638.789062, 0.000000, 643.148438, 0.000000, 
-            654.023438, 0.000000, 663.492188, 0.000000, 671.191406, -0.011719, 674.367188, 0.000000, 
-            682.628906, 0.263672, 682.335938, 0.000000, 682.335938, 0.000000, 690.304688, 0.000000, 
-            696.304688, 0.000000, 705.140625, 0.439453, 705.773438, 0.000000, 715.242188, 0.000000, 
-            723.210938, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Arabic" script="arab">
-        <test-font name="CODE2000.TTF" version="Version 1.171" checksum="0xD025B1AD" rchecksum="0x1F6E6F2A"/>
-
-        <test-text>أساسًا، تتعامل الحواسيب فقط مع الأرقام، وتقوم بتخزين الأحرف والمحارف الأخرى بعد أن تُعطي رقما معينا لكل واحد منها. وقبل اختراع "يونِكود"، كان هناك مئات الأنظمة للتشفير وتخصيص هذه الأرقام للمحارف، ولم يوجد نظام تشفير واحد يحتوي على جميع المحارف الضرورية</test-text>
-
-        <result-glyphs>
-            0x0000CE28, 0x0000CE87, 0x0000CE41, 0x0000CE81, 0x0000CE42, 0x0000CE54, 0x0000CE73, 0x0000CE21, 
-            0x00000003, 0x0000CE65, 0x0000CE41, 0x0000CE22, 0x0000CE38, 0x0000CE78, 0x0000CE73, 0x0000CE21, 
-            0x00000003, 0x0000CE5E, 0x0000CE88, 0x0000CE78, 0x0000CE33, 0x00000003, 0x0000CE84, 0x0000CE74, 
-            0x0000CE5F, 0x00000003, 0x0000CE85, 0x0000CE82, 0x0000CE2C, 0x0000CE38, 0x0000CE87, 0x00000003, 
-            0x0000CE3E, 0x0000CE37, 0x0000CE21, 0x0000CE81, 0x00000003, 0x0000CE42, 0x0000CE88, 0x0000CE68, 
-            0x0000CE4C, 0x0000CE2B, 0x00000003, 0x0000CE75, 0x0000CE22, 0x0000CE5C, 0x0000CE7B, 0x00000003, 
-            0x0000CE3E, 0x0000CE33, 0x0000CE82, 0x0000CE87, 0x00000003, 0x0000CE76, 0x0000CE73, 0x0000CE81, 
-            0x00000003, 0x00000588, 0x0000CE65, 0x0000CE41, 0x0000CE22, 0x0000CE38, 0x0000CE78, 0x0000CE74, 
-            0x0000CE73, 0x00000003, 0x0000CE75, 0x0000CE22, 0x0000CE6B, 0x0000CE41, 0x0000FFFE, 0x0000CE8B, 
-            0x0000CE21, 0x00000003, 0x0000CE7D, 0x0000CE40, 0x0000CE7F, 0x00000003, 0x0000CE4E, 0x0000CE88, 
-            0x0000CE50, 0x0000CE3C, 0x0000CE2B, 0x0000CE81, 0x00000003, 0x0000CE42, 0x0000CE88, 0x0000CE68, 
-            0x0000CE4C, 0x0000CE2C, 0x0000CE74, 0x0000CE73, 0x00000003, 0x0000CE28, 0x0000CE78, 0x0000CE5C, 
-            0x0000CE7B, 0x0000FFFE, 0x0000CE8B, 0x0000CE21, 0x00000003, 0x0000CE29, 0x0000CE22, 0x0000CE20, 
-            0x0000CE77, 0x00000003, 0x0000CE6D, 0x0000CE22, 0x0000CE7C, 0x0000CE7F, 0x00000003, 0x0000CE79, 
-            0x0000CE22, 0x0000CE6F, 0x00000003, 0x00000588, 0x00000005, 0x0000CE3D, 0x0000CE82, 0x0000CE70, 
-            0x000005B5, 0x0000CE7B, 0x0000CE82, 0x0000CE87, 0x00000005, 0x00000003, 0x0000CE5D, 0x0000CE21, 
-            0x0000CE42, 0x0000CE2C, 0x0000CE3B, 0x0000CE21, 0x00000003, 0x0000CE72, 0x0000CE26, 0x0000CE6B, 
-            0x0000CE81, 0x00000003, 0x00000011, 0x0000CE22, 0x0000CE80, 0x0000CE7C, 0x0000CE77, 0x00000003, 
-            0x0000CE3E, 0x0000CE37, 0x0000CE21, 0x0000CE81, 0x00000003, 0x0000CE72, 0x0000CE70, 0x0000CE73, 
-            0x00000003, 0x0000CE22, 0x0000CE7C, 0x0000CE88, 0x0000CE60, 0x0000CE77, 0x00000003, 0x0000CE22, 
-            0x0000CE78, 0x0000CE6B, 0x0000CE41, 0x00000003, 0x0000CE86, 0x0000CE58, 0x0000CE60, 0x000005B4, 
-            0x0000CE2B, 0x00000003, 0x0000CE79, 0x0000CE17, 0x00000003, 0x0000CE3E, 0x0000CE60, 0x0000CE25, 
-            0x00000003, 0x0000CE83, 0x0000CE42, 0x0000CE3B, 0x0000FFFE, 0x0000CE8B, 0x0000CE21, 0x00000003, 
-            0x0000CE65, 0x0000CE41, 0x0000CE22, 0x0000CE38, 0x0000CE78, 0x0000CE73, 0x0000CE21, 0x0000CE81, 
-            0x00000003, 0x0000CE65, 0x0000CE42, 0x0000CE37, 0x0000FFFE, 0x0000CE8B, 0x0000CE21, 0x00000003, 
-            0x0000CE7A, 0x0000CE87, 0x0000CE44, 0x0000CE3C, 0x0000CE2C, 0x0000CE25, 0x00000003, 0x0000CE75, 
-            0x0000CE82, 0x0000CE6C, 0x0000CE2B, 0x0000CE81, 0x00000003, 0x00000588, 0x0000CE75, 0x0000CE22, 
-            0x0000CE6B, 0x0000CE41, 0x0000FFFE, 0x0000CE8B, 0x0000CE21, 0x00000003, 0x0000CE5E, 0x0000CE77, 
-            0x00000003, 0x0000CE56, 0x0000CE6C, 0x0000CE67, 0x00000003, 0x0000CE24, 0x0000CE88, 0x0000CE47, 
-            0x0000CE21, 0x0000CE82, 0x0000CE38, 0x0000CE73, 0x0000CE21, 0x00000003, 0x0000CE72, 0x0000CE77, 
-            0x0000CE22, 0x0000CE60, 0x0000CE2C, 0x0000CE2B, 0x00000003, 0x00000588, 0x0000CE22, 0x000005B0, 
-            0x0000CE47, 0x0000CE22, 0x0000CE47, 0x0000CE17
-        </result-glyphs>
-
-        <result-indices>
-            0x000000FB, 0x000000FA, 0x000000F9, 0x000000F8, 0x000000F7, 0x000000F6, 0x000000F5, 0x000000F4, 
-            0x000000F3, 0x000000F2, 0x000000F1, 0x000000F0, 0x000000EF, 0x000000EE, 0x000000ED, 0x000000EC, 
-            0x000000EB, 0x000000EA, 0x000000E9, 0x000000E8, 0x000000E7, 0x000000E6, 0x000000E5, 0x000000E4, 
-            0x000000E3, 0x000000E2, 0x000000E1, 0x000000E0, 0x000000DF, 0x000000DE, 0x000000DD, 0x000000DC, 
-            0x000000DB, 0x000000DA, 0x000000D9, 0x000000D8, 0x000000D7, 0x000000D6, 0x000000D5, 0x000000D4, 
-            0x000000D3, 0x000000D2, 0x000000D1, 0x000000D0, 0x000000CF, 0x000000CE, 0x000000CD, 0x000000CC, 
-            0x000000CB, 0x000000CA, 0x000000C9, 0x000000C8, 0x000000C7, 0x000000C6, 0x000000C5, 0x000000C4, 
-            0x000000C3, 0x000000C2, 0x000000C1, 0x000000C0, 0x000000BF, 0x000000BE, 0x000000BD, 0x000000BC, 
-            0x000000BB, 0x000000BA, 0x000000B9, 0x000000B8, 0x000000B7, 0x000000B6, 0x000000B5, 0x000000B4, 
-            0x000000B3, 0x000000B2, 0x000000B1, 0x000000B0, 0x000000AF, 0x000000AE, 0x000000AD, 0x000000AC, 
-            0x000000AB, 0x000000AA, 0x000000A9, 0x000000A8, 0x000000A7, 0x000000A6, 0x000000A5, 0x000000A4, 
-            0x000000A3, 0x000000A2, 0x000000A1, 0x000000A0, 0x0000009F, 0x0000009E, 0x0000009D, 0x0000009C, 
-            0x0000009B, 0x0000009A, 0x00000099, 0x00000098, 0x00000097, 0x00000096, 0x00000095, 0x00000094, 
-            0x00000093, 0x00000092, 0x00000091, 0x00000090, 0x0000008F, 0x0000008E, 0x0000008D, 0x0000008C, 
-            0x0000008B, 0x0000008A, 0x00000089, 0x00000088, 0x00000087, 0x00000086, 0x00000085, 0x00000084, 
-            0x00000083, 0x00000082, 0x00000081, 0x00000080, 0x0000007F, 0x0000007E, 0x0000007D, 0x0000007C, 
-            0x0000007B, 0x0000007A, 0x00000079, 0x00000078, 0x00000077, 0x00000076, 0x00000075, 0x00000074, 
-            0x00000073, 0x00000072, 0x00000071, 0x00000070, 0x0000006F, 0x0000006E, 0x0000006D, 0x0000006C, 
-            0x0000006B, 0x0000006A, 0x00000069, 0x00000068, 0x00000067, 0x00000066, 0x00000065, 0x00000064, 
-            0x00000063, 0x00000062, 0x00000061, 0x00000060, 0x0000005F, 0x0000005E, 0x0000005D, 0x0000005C, 
-            0x0000005B, 0x0000005A, 0x00000059, 0x00000058, 0x00000057, 0x00000056, 0x00000055, 0x00000054, 
-            0x00000053, 0x00000052, 0x00000051, 0x00000050, 0x0000004F, 0x0000004E, 0x0000004D, 0x0000004C, 
-            0x0000004B, 0x0000004A, 0x00000049, 0x00000048, 0x00000047, 0x00000046, 0x00000045, 0x00000044, 
-            0x00000043, 0x00000042, 0x00000041, 0x00000040, 0x0000003F, 0x0000003E, 0x0000003D, 0x0000003C, 
-            0x0000003B, 0x0000003A, 0x00000039, 0x00000038, 0x00000037, 0x00000036, 0x00000035, 0x00000034, 
-            0x00000033, 0x00000032, 0x00000031, 0x00000030, 0x0000002F, 0x0000002E, 0x0000002D, 0x0000002C, 
-            0x0000002B, 0x0000002A, 0x00000029, 0x00000028, 0x00000027, 0x00000026, 0x00000025, 0x00000024, 
-            0x00000023, 0x00000022, 0x00000021, 0x00000020, 0x0000001F, 0x0000001E, 0x0000001D, 0x0000001C, 
-            0x0000001B, 0x0000001A, 0x00000019, 0x00000018, 0x00000017, 0x00000016, 0x00000015, 0x00000014, 
-            0x00000013, 0x00000012, 0x00000011, 0x00000010, 0x0000000F, 0x0000000E, 0x0000000D, 0x0000000C, 
-            0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 0x00000004, 
-            0x00000003, 0x00000002, 0x00000001, 0x00000000
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 4.007812, 0.000000, 8.226562, 0.000000, 12.679688, 0.000000, 
-            18.679688, 0.000000, 23.132812, 0.000000, 31.289062, 0.000000, 34.312500, 0.000000, 
-            36.375000, 0.000000, 41.062500, 0.000000, 50.296875, 0.000000, 54.750000, 0.000000, 
-            56.859375, 0.000000, 62.367188, 0.000000, 66.632812, 0.000000, 69.656250, 0.000000, 
-            71.718750, 0.000000, 76.406250, 0.000000, 81.421875, 0.000000, 85.664062, 0.000000, 
-            89.929688, 0.000000, 95.742188, 0.000000, 100.429688, 0.000000, 108.796875, 0.000000, 
-            112.171875, 0.000000, 115.734375, 0.000000, 120.421875, 0.000000, 128.765625, 0.000000, 
-            134.765625, 0.000000, 139.007812, 0.000000, 144.515625, 0.000000, 148.734375, 0.000000, 
-            153.421875, 0.000000, 157.359375, 0.000000, 163.171875, 0.000000, 165.234375, 0.000000, 
-            171.234375, 0.000000, 175.921875, 0.000000, 180.375000, 0.000000, 184.617188, 0.000000, 
-            188.085938, 0.000000, 195.117188, 0.000000, 199.312500, 0.000000, 204.000000, 0.000000, 
-            208.007812, 0.000000, 210.117188, 0.000000, 217.054688, 0.000000, 220.429688, 0.000000, 
-            225.117188, 0.000000, 229.054688, 0.000000, 234.867188, 0.000000, 240.867188, 0.000000, 
-            245.085938, 0.000000, 249.773438, 0.000000, 253.781250, 0.000000, 256.804688, 0.000000, 
-            262.804688, 0.000000, 267.492188, 0.000000, 271.007812, 0.000000, 280.242188, 0.000000, 
-            284.695312, 0.000000, 286.804688, 0.000000, 292.312500, 0.000000, 296.578125, 0.000000, 
-            299.953125, 0.000000, 302.976562, 0.000000, 307.664062, 0.000000, 311.671875, 0.000000, 
-            313.781250, 0.000000, 317.882812, 0.000000, 322.335938, 0.000000, 322.335938, 0.000000, 
-            328.500000, 0.000000, 330.562500, 0.000000, 335.250000, 0.000000, 339.140625, 0.000000, 
-            343.078125, 0.000000, 348.984375, 0.000000, 353.671875, 0.000000, 366.445312, 0.000000, 
-            370.687500, 0.000000, 378.843750, 0.000000, 384.351562, 0.000000, 388.546875, 0.000000, 
-            394.546875, 0.000000, 399.234375, 0.000000, 403.687500, 0.000000, 407.929688, 0.000000, 
-            411.398438, 0.000000, 418.429688, 0.000000, 422.671875, 0.000000, 426.046875, 0.000000, 
-            429.070312, 0.000000, 433.757812, 0.000000, 437.765625, 0.000000, 442.031250, 0.000000, 
-            448.968750, 0.000000, 452.343750, 0.000000, 452.343750, 0.000000, 458.507812, 0.000000, 
-            460.570312, 0.000000, 465.257812, 0.000000, 474.492188, 0.000000, 476.601562, 0.000000, 
-            480.843750, 0.000000, 485.109375, 0.000000, 489.796875, 0.000000, 497.437500, 0.000000, 
-            499.546875, 0.000000, 503.765625, 0.000000, 509.671875, 0.000000, 514.359375, 0.000000, 
-            521.671875, 0.000000, 523.781250, 0.000000, 529.453125, 0.000000, 534.140625, 0.000000, 
-            537.656250, 0.000000, 543.046875, 0.000000, 546.585938, 0.000000, 552.585938, 0.000000, 
-            560.367188, 0.000000, 560.367188, 0.000000, 563.742188, 0.000000, 569.742188, 0.000000, 
-            573.960938, 0.000000, 579.351562, 0.000000, 584.039062, 0.000000, 589.851562, 0.000000, 
-            591.914062, 0.000000, 596.367188, 0.000000, 600.609375, 0.000000, 606.421875, 0.000000, 
-            608.484375, 0.000000, 613.171875, 0.000000, 619.570312, 0.000000, 623.812500, 0.000000, 
-            627.914062, 0.000000, 633.914062, 0.000000, 638.601562, 0.000000, 641.929688, 0.000000, 
-            644.039062, 0.000000, 647.789062, 0.000000, 652.007812, 0.000000, 656.273438, 0.000000, 
-            660.960938, 0.000000, 664.898438, 0.000000, 670.710938, 0.000000, 672.773438, 0.000000, 
-            678.773438, 0.000000, 683.460938, 0.000000, 689.859375, 0.000000, 697.640625, 0.000000, 
-            700.664062, 0.000000, 705.351562, 0.000000, 707.460938, 0.000000, 711.679688, 0.000000, 
-            715.921875, 0.000000, 719.390625, 0.000000, 723.656250, 0.000000, 728.343750, 0.000000, 
-            730.453125, 0.000000, 734.718750, 0.000000, 738.820312, 0.000000, 743.273438, 0.000000, 
-            747.960938, 0.000000, 756.328125, 0.000000, 763.265625, 0.000000, 766.734375, 0.000000, 
-            766.734375, 0.000000, 770.929688, 0.000000, 775.617188, 0.000000, 782.929688, 0.000000, 
-            785.273438, 0.000000, 789.960938, 0.000000, 793.898438, 0.000000, 797.367188, 0.000000, 
-            800.812500, 0.000000, 805.500000, 0.000000, 813.843750, 0.000000, 818.296875, 0.000000, 
-            824.109375, 0.000000, 824.109375, 0.000000, 830.273438, 0.000000, 832.335938, 0.000000, 
-            837.023438, 0.000000, 846.257812, 0.000000, 850.710938, 0.000000, 852.820312, 0.000000, 
-            858.328125, 0.000000, 862.593750, 0.000000, 865.617188, 0.000000, 867.679688, 0.000000, 
-            873.679688, 0.000000, 878.367188, 0.000000, 887.601562, 0.000000, 892.054688, 0.000000, 
-            897.867188, 0.000000, 897.867188, 0.000000, 904.031250, 0.000000, 906.093750, 0.000000, 
-            910.781250, 0.000000, 918.257812, 0.000000, 922.476562, 0.000000, 926.929688, 0.000000, 
-            932.437500, 0.000000, 936.679688, 0.000000, 940.125000, 0.000000, 944.812500, 0.000000, 
-            948.820312, 0.000000, 954.820312, 0.000000, 958.289062, 0.000000, 962.484375, 0.000000, 
-            968.484375, 0.000000, 973.171875, 0.000000, 976.687500, 0.000000, 980.695312, 0.000000, 
-            982.804688, 0.000000, 986.906250, 0.000000, 991.359375, 0.000000, 991.359375, 0.000000, 
-            997.523438, 0.000000, 999.585938, 0.000000, 1004.273438, 0.000000, 1009.289062, 0.000000, 
-            1013.554688, 0.000000, 1018.242188, 0.000000, 1026.187500, 0.000000, 1029.656250, 0.000000, 
-            1033.757812, 0.000000, 1038.445312, 0.000000, 1047.796875, 0.000000, 1052.039062, 0.000000, 
-            1058.859375, 0.000000, 1060.921875, 0.000000, 1066.921875, 0.000000, 1072.429688, 0.000000, 
-            1075.453125, 0.000000, 1077.515625, 0.000000, 1082.203125, 0.000000, 1088.601562, 0.000000, 
-            1092.867188, 0.000000, 1094.976562, 0.000000, 1098.445312, 0.000000, 1102.687500, 0.000000, 
-            1106.882812, 0.000000, 1111.570312, 0.000000, 1115.085938, 0.000000, 1117.195312, 0.000000, 
-            1117.195312, 0.000000, 1124.015625, 0.000000, 1126.125000, 0.000000, 1132.945312, 0.000000, 
-            1135.289062, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Unicode Arabic" script="arab">
-        <test-font name="LucidaSansRegular.ttf" version="Version 1.20 - October 2000" checksum="0xF5D9BA6D" rchecksum="0x029B644F"/>
-
-        <test-text>أساسًا، تتعامل الحواسيب فقط مع الأرقام، وتقوم بتخزين الأحرف والمحارف الأخرى بعد أن تُعطي رقما معينا لكل واحد منها. وقبل اختراع "يونِكود"، كان هناك مئات الأنظمة للتشفير وتخصيص هذه الأرقام للمحارف، ولم يوجد نظام تشفير واحد يحتوي على جميع المحارف الضرورية</test-text>
-
-        <result-glyphs>
-            0x00000872, 0x000008D1, 0x000003F9, 0x0000040B, 0x0000088C, 0x0000089E, 0x000008BD, 0x000003EF, 
-            0x00000003, 0x00000404, 0x000003F9, 0x0000086C, 0x00000882, 0x000008C2, 0x000008BD, 0x000003EF, 
-            0x00000003, 0x000008A8, 0x000008D2, 0x000008C2, 0x0000087D, 0x00000003, 0x000008CE, 0x000008BE, 
-            0x000008A9, 0x00000003, 0x0000040D, 0x000008CC, 0x00000876, 0x00000882, 0x000008D1, 0x00000003, 
-            0x00000888, 0x00000881, 0x000003EF, 0x0000040B, 0x00000003, 0x0000088C, 0x000008D2, 0x000008B2, 
-            0x00000896, 0x00000875, 0x00000003, 0x00000408, 0x0000086C, 0x000008A6, 0x000008C5, 0x00000003, 
-            0x00000888, 0x0000087D, 0x000008CC, 0x000008D1, 0x00000003, 0x000008C0, 0x000008BD, 0x0000040B, 
-            0x00000003, 0x000003E6, 0x00000404, 0x000003F9, 0x0000086C, 0x00000882, 0x000008C2, 0x000008BE, 
-            0x000008BD, 0x00000003, 0x00000408, 0x0000086C, 0x000008B5, 0x000003F9, 0x0000FFFF, 0x000008D5, 
-            0x000003EF, 0x00000003, 0x0000040A, 0x0000088A, 0x000008C9, 0x00000003, 0x00000898, 0x000008D2, 
-            0x0000089A, 0x00000886, 0x00000875, 0x0000040B, 0x00000003, 0x0000088C, 0x000008D2, 0x000008B2, 
-            0x00000896, 0x00000876, 0x000008BE, 0x000008BD, 0x00000003, 0x00000872, 0x000008C2, 0x000008A6, 
-            0x000008C5, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 0x000003F2, 0x0000086C, 0x0000086A, 
-            0x000008C1, 0x00000003, 0x00000406, 0x0000086C, 0x000008C6, 0x000008C9, 0x00000003, 0x00000409, 
-            0x0000086C, 0x000008B9, 0x00000003, 0x000003E6, 0x00000005, 0x000003F7, 0x000008CC, 0x000008BA, 
-            0x00000413, 0x000008C5, 0x000008CC, 0x000008D1, 0x00000005, 0x00000003, 0x00000401, 0x000003EF, 
-            0x0000088C, 0x00000876, 0x00000885, 0x000003EF, 0x00000003, 0x000008BC, 0x00000870, 0x000008B5, 
-            0x0000040B, 0x00000003, 0x00000011, 0x0000086C, 0x000008CA, 0x000008C6, 0x000008C1, 0x00000003, 
-            0x00000888, 0x00000881, 0x000003EF, 0x0000040B, 0x00000003, 0x000008BC, 0x000008BA, 0x000008BD, 
-            0x00000003, 0x0000086C, 0x000008C6, 0x000008D2, 0x000008AA, 0x000008C1, 0x00000003, 0x0000086C, 
-            0x000008C2, 0x000008B5, 0x000003F9, 0x00000003, 0x000008D0, 0x000008A2, 0x000008AA, 0x00000412, 
-            0x00000875, 0x00000003, 0x00000409, 0x000003EB, 0x00000003, 0x00000888, 0x000008AA, 0x0000086F, 
-            0x00000003, 0x0000040C, 0x0000088C, 0x00000885, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 
-            0x00000404, 0x000003F9, 0x0000086C, 0x00000882, 0x000008C2, 0x000008BD, 0x000003EF, 0x0000040B, 
-            0x00000003, 0x00000404, 0x0000088C, 0x00000881, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 
-            0x000008C4, 0x000008D1, 0x0000088E, 0x00000886, 0x00000876, 0x0000086F, 0x00000003, 0x00000408, 
-            0x000008CC, 0x000008B6, 0x00000875, 0x0000040B, 0x00000003, 0x000003E6, 0x00000408, 0x0000086C, 
-            0x000008B5, 0x000003F9, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 0x000008A8, 0x000008C1, 
-            0x00000003, 0x000008A0, 0x000008B6, 0x000008B1, 0x00000003, 0x0000086E, 0x000008D2, 0x00000891, 
-            0x000003EF, 0x000008CC, 0x00000882, 0x000008BD, 0x000003EF, 0x00000003, 0x000008BC, 0x000008C1, 
-            0x0000086C, 0x000008AA, 0x00000876, 0x00000875, 0x00000003, 0x000003E6, 0x0000086C, 0x0000040E, 
-            0x00000891, 0x0000086C, 0x00000891, 0x000003EB
-        </result-glyphs>
-
-        <result-indices>
-            0x000000FB, 0x000000FA, 0x000000F9, 0x000000F8, 0x000000F7, 0x000000F6, 0x000000F5, 0x000000F4, 
-            0x000000F3, 0x000000F2, 0x000000F1, 0x000000F0, 0x000000EF, 0x000000EE, 0x000000ED, 0x000000EC, 
-            0x000000EB, 0x000000EA, 0x000000E9, 0x000000E8, 0x000000E7, 0x000000E6, 0x000000E5, 0x000000E4, 
-            0x000000E3, 0x000000E2, 0x000000E1, 0x000000E0, 0x000000DF, 0x000000DE, 0x000000DD, 0x000000DC, 
-            0x000000DB, 0x000000DA, 0x000000D9, 0x000000D8, 0x000000D7, 0x000000D6, 0x000000D5, 0x000000D4, 
-            0x000000D3, 0x000000D2, 0x000000D1, 0x000000D0, 0x000000CF, 0x000000CE, 0x000000CD, 0x000000CC, 
-            0x000000CB, 0x000000CA, 0x000000C9, 0x000000C8, 0x000000C7, 0x000000C6, 0x000000C5, 0x000000C4, 
-            0x000000C3, 0x000000C2, 0x000000C1, 0x000000C0, 0x000000BF, 0x000000BE, 0x000000BD, 0x000000BC, 
-            0x000000BB, 0x000000BA, 0x000000B9, 0x000000B8, 0x000000B7, 0x000000B6, 0x000000B5, 0x000000B4, 
-            0x000000B3, 0x000000B2, 0x000000B1, 0x000000B0, 0x000000AF, 0x000000AE, 0x000000AD, 0x000000AC, 
-            0x000000AB, 0x000000AA, 0x000000A9, 0x000000A8, 0x000000A7, 0x000000A6, 0x000000A5, 0x000000A4, 
-            0x000000A3, 0x000000A2, 0x000000A1, 0x000000A0, 0x0000009F, 0x0000009E, 0x0000009D, 0x0000009C, 
-            0x0000009B, 0x0000009A, 0x00000099, 0x00000098, 0x00000097, 0x00000096, 0x00000095, 0x00000094, 
-            0x00000093, 0x00000092, 0x00000091, 0x00000090, 0x0000008F, 0x0000008E, 0x0000008D, 0x0000008C, 
-            0x0000008B, 0x0000008A, 0x00000089, 0x00000088, 0x00000087, 0x00000086, 0x00000085, 0x00000084, 
-            0x00000083, 0x00000082, 0x00000081, 0x00000080, 0x0000007F, 0x0000007E, 0x0000007D, 0x0000007C, 
-            0x0000007B, 0x0000007A, 0x00000079, 0x00000078, 0x00000077, 0x00000076, 0x00000075, 0x00000074, 
-            0x00000073, 0x00000072, 0x00000071, 0x00000070, 0x0000006F, 0x0000006E, 0x0000006D, 0x0000006C, 
-            0x0000006B, 0x0000006A, 0x00000069, 0x00000068, 0x00000067, 0x00000066, 0x00000065, 0x00000064, 
-            0x00000063, 0x00000062, 0x00000061, 0x00000060, 0x0000005F, 0x0000005E, 0x0000005D, 0x0000005C, 
-            0x0000005B, 0x0000005A, 0x00000059, 0x00000058, 0x00000057, 0x00000056, 0x00000055, 0x00000054, 
-            0x00000053, 0x00000052, 0x00000051, 0x00000050, 0x0000004F, 0x0000004E, 0x0000004D, 0x0000004C, 
-            0x0000004B, 0x0000004A, 0x00000049, 0x00000048, 0x00000047, 0x00000046, 0x00000045, 0x00000044, 
-            0x00000043, 0x00000042, 0x00000041, 0x00000040, 0x0000003F, 0x0000003E, 0x0000003D, 0x0000003C, 
-            0x0000003B, 0x0000003A, 0x00000039, 0x00000038, 0x00000037, 0x00000036, 0x00000035, 0x00000034, 
-            0x00000033, 0x00000032, 0x00000031, 0x00000030, 0x0000002F, 0x0000002E, 0x0000002D, 0x0000002C, 
-            0x0000002B, 0x0000002A, 0x00000029, 0x00000028, 0x00000027, 0x00000026, 0x00000025, 0x00000024, 
-            0x00000023, 0x00000022, 0x00000021, 0x00000020, 0x0000001F, 0x0000001E, 0x0000001D, 0x0000001C, 
-            0x0000001B, 0x0000001A, 0x00000019, 0x00000018, 0x00000017, 0x00000016, 0x00000015, 0x00000014, 
-            0x00000013, 0x00000012, 0x00000011, 0x00000010, 0x0000000F, 0x0000000E, 0x0000000D, 0x0000000C, 
-            0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 0x00000004, 
-            0x00000003, 0x00000002, 0x00000001, 0x00000000
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 6.316406, 0.000000, 10.382812, 0.000000, 15.492188, 0.000000, 
-            21.035156, 0.000000, 27.058594, 0.000000, 39.527344, 0.000000, 43.792969, 0.000000, 
-            47.408203, 0.000000, 51.205078, 0.000000, 66.216797, 0.000000, 71.326172, 0.000000, 
-            74.695312, 0.000000, 83.367188, 0.000000, 90.826172, 0.000000, 95.091797, 0.000000, 
-            98.707031, 0.000000, 102.503906, 0.000000, 109.962891, 0.000000, 114.949219, 0.000000, 
-            122.408203, 0.000000, 130.687500, 0.000000, 134.484375, 0.000000, 145.787109, 0.000000, 
-            150.773438, 0.000000, 156.884766, 0.000000, 160.681641, 0.000000, 172.277344, 0.000000, 
-            177.919922, 0.000000, 182.906250, 0.000000, 191.578125, 0.000000, 195.644531, 0.000000, 
-            199.441406, 0.000000, 206.507812, 0.000000, 214.787109, 0.000000, 218.402344, 0.000000, 
-            223.945312, 0.000000, 227.742188, 0.000000, 233.765625, 0.000000, 238.751953, 0.000000, 
-            245.185547, 0.000000, 257.982422, 0.000000, 262.048828, 0.000000, 265.845703, 0.000000, 
-            272.654297, 0.000000, 276.023438, 0.000000, 285.240234, 0.000000, 289.306641, 0.000000, 
-            293.103516, 0.000000, 300.169922, 0.000000, 308.449219, 0.000000, 314.091797, 0.000000, 
-            318.158203, 0.000000, 321.955078, 0.000000, 329.572266, 0.000000, 333.837891, 0.000000, 
-            339.380859, 0.000000, 343.177734, 0.000000, 346.974609, 0.000000, 361.986328, 0.000000, 
-            367.095703, 0.000000, 370.464844, 0.000000, 379.136719, 0.000000, 386.595703, 0.000000, 
-            391.582031, 0.000000, 395.847656, 0.000000, 399.644531, 0.000000, 406.453125, 0.000000, 
-            409.822266, 0.000000, 415.523438, 0.000000, 420.632812, 0.000000, 420.632812, 0.000000, 
-            427.441406, 0.000000, 431.056641, 0.000000, 434.853516, 0.000000, 441.357422, 0.000000, 
-            448.423828, 0.000000, 455.912109, 0.000000, 459.708984, 0.000000, 479.255859, 0.000000, 
-            484.242188, 0.000000, 496.710938, 0.000000, 505.382812, 0.000000, 509.449219, 0.000000, 
-            514.992188, 0.000000, 518.789062, 0.000000, 524.812500, 0.000000, 529.798828, 0.000000, 
-            536.232422, 0.000000, 549.029297, 0.000000, 554.015625, 0.000000, 559.001953, 0.000000, 
-            563.267578, 0.000000, 567.064453, 0.000000, 573.380859, 0.000000, 580.839844, 0.000000, 
-            590.056641, 0.000000, 594.123047, 0.000000, 594.123047, 0.000000, 600.931641, 0.000000, 
-            604.546875, 0.000000, 608.343750, 0.000000, 620.636719, 0.000000, 624.005859, 0.000000, 
-            628.992188, 0.000000, 635.830078, 0.000000, 639.626953, 0.000000, 653.361328, 0.000000, 
-            656.730469, 0.000000, 661.716797, 0.000000, 669.205078, 0.000000, 673.001953, 0.000000, 
-            683.777344, 0.000000, 687.146484, 0.000000, 692.660156, 0.000000, 696.457031, 0.000000, 
-            700.253906, 0.000000, 704.736328, 0.000000, 711.105469, 0.000000, 716.748047, 0.000000, 
-            722.994141, 0.000000, 722.994141, 0.000000, 727.060547, 0.000000, 732.703125, 0.000000, 
-            736.769531, 0.000000, 741.251953, 0.000000, 745.048828, 0.000000, 752.507812, 0.000000, 
-            756.123047, 0.000000, 762.146484, 0.000000, 767.132812, 0.000000, 775.412109, 0.000000, 
-            779.027344, 0.000000, 782.824219, 0.000000, 794.203125, 0.000000, 799.189453, 0.000000, 
-            804.890625, 0.000000, 810.433594, 0.000000, 814.230469, 0.000000, 818.027344, 0.000000, 
-            821.396484, 0.000000, 828.128906, 0.000000, 833.115234, 0.000000, 839.953125, 0.000000, 
-            843.750000, 0.000000, 850.816406, 0.000000, 859.095703, 0.000000, 862.710938, 0.000000, 
-            868.253906, 0.000000, 872.050781, 0.000000, 883.429688, 0.000000, 889.675781, 0.000000, 
-            893.941406, 0.000000, 897.738281, 0.000000, 901.107422, 0.000000, 906.093750, 0.000000, 
-            911.080078, 0.000000, 917.800781, 0.000000, 924.638672, 0.000000, 928.435547, 0.000000, 
-            931.804688, 0.000000, 939.263672, 0.000000, 944.964844, 0.000000, 950.074219, 0.000000, 
-            953.871094, 0.000000, 965.173828, 0.000000, 974.390625, 0.000000, 981.111328, 0.000000, 
-            981.111328, 0.000000, 985.177734, 0.000000, 988.974609, 0.000000, 999.750000, 0.000000, 
-            1003.365234, 0.000000, 1007.162109, 0.000000, 1014.228516, 0.000000, 1020.949219, 0.000000, 
-            1025.015625, 0.000000, 1028.812500, 0.000000, 1040.408203, 0.000000, 1046.431641, 0.000000, 
-            1054.710938, 0.000000, 1054.710938, 0.000000, 1061.519531, 0.000000, 1065.134766, 0.000000, 
-            1068.931641, 0.000000, 1083.943359, 0.000000, 1089.052734, 0.000000, 1092.421875, 0.000000, 
-            1101.093750, 0.000000, 1108.552734, 0.000000, 1112.818359, 0.000000, 1116.433594, 0.000000, 
-            1121.976562, 0.000000, 1125.773438, 0.000000, 1140.785156, 0.000000, 1146.808594, 0.000000, 
-            1155.087891, 0.000000, 1155.087891, 0.000000, 1161.896484, 0.000000, 1165.511719, 0.000000, 
-            1169.308594, 0.000000, 1180.541016, 0.000000, 1184.607422, 0.000000, 1190.630859, 0.000000, 
-            1199.302734, 0.000000, 1204.289062, 0.000000, 1208.355469, 0.000000, 1212.152344, 0.000000, 
-            1218.960938, 0.000000, 1224.603516, 0.000000, 1231.037109, 0.000000, 1235.103516, 0.000000, 
-            1240.646484, 0.000000, 1244.443359, 0.000000, 1248.240234, 0.000000, 1255.048828, 0.000000, 
-            1258.417969, 0.000000, 1264.119141, 0.000000, 1269.228516, 0.000000, 1269.228516, 0.000000, 
-            1276.037109, 0.000000, 1279.652344, 0.000000, 1283.449219, 0.000000, 1290.908203, 0.000000, 
-            1297.746094, 0.000000, 1301.542969, 0.000000, 1311.427734, 0.000000, 1317.861328, 0.000000, 
-            1323.562500, 0.000000, 1327.359375, 0.000000, 1341.492188, 0.000000, 1346.478516, 0.000000, 
-            1357.904297, 0.000000, 1361.519531, 0.000000, 1367.162109, 0.000000, 1375.833984, 0.000000, 
-            1380.099609, 0.000000, 1383.714844, 0.000000, 1387.511719, 0.000000, 1398.890625, 0.000000, 
-            1405.728516, 0.000000, 1409.097656, 0.000000, 1415.818359, 0.000000, 1420.804688, 0.000000, 
-            1424.871094, 0.000000, 1428.667969, 0.000000, 1432.464844, 0.000000, 1435.833984, 0.000000, 
-            1435.833984, 0.000000, 1447.259766, 0.000000, 1450.628906, 0.000000, 1462.054688, 0.000000, 
-            1465.669922, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Thai" script="thai">
-        <test-font name="angsd___.ttf" version="Version 2.1 - July 1995" checksum="0x49B67200" rchecksum="0x003C2EE9"/>
-
-        <test-text>บทที่๑พายุไซโคลนโดโรธีอาศัยอยู่ท่ามกลางทุ่งใหญ่ในแคนซัสกับลุงเฮนรีชาวไร่และป้าเอ็มภรรยาชาวไร่บ้านของพวกเขาหลังเล็กเพราะไม้สร้างบ้านต้องขนมาด้วยเกวียนเป็นระยะทางหลายไมล์</test-text>
-
-        <result-glyphs>
-            0x000000F3, 0x000000F0, 0x000000F0, 0x0000010E, 0x0000011D, 0x00000126, 0x000000F7, 0x0000010B, 
-            0x000000FB, 0x00000111, 0x00000119, 0x000000E4, 0x00000117, 0x000000DD, 0x000000FE, 0x000000F2, 
-            0x00000117, 0x000000ED, 0x00000117, 0x000000FC, 0x000000F1, 0x0000010E, 0x00000106, 0x0000010B, 
-            0x00000101, 0x0000010A, 0x000000FB, 0x00000106, 0x000000FB, 0x00000112, 0x0000013B, 0x000000F0, 
-            0x0000013B, 0x0000010B, 0x000000FA, 0x000000DA, 0x000000FE, 0x0000010B, 0x000000E0, 0x000000F0, 
-            0x00000111, 0x0000013B, 0x000000E0, 0x00000118, 0x00000104, 0x000000E6, 0x0000013B, 0x00000118, 
-            0x000000F2, 0x00000116, 0x000000DD, 0x000000F2, 0x000000E4, 0x0000010A, 0x00000103, 0x000000DA, 
-            0x0000010A, 0x000000F3, 0x000000FE, 0x00000111, 0x000000E0, 0x00000115, 0x00000107, 0x000000F2, 
-            0x000000FC, 0x0000010E, 0x000000E3, 0x0000010B, 0x00000100, 0x00000119, 0x000000FC, 0x0000013B, 
-            0x00000116, 0x000000FE, 0x00000109, 0x000000F4, 0x00000137, 0x0000010B, 0x00000115, 0x00000106, 
-            0x0000011C, 0x000000FA, 0x000000F9, 0x000000FC, 0x000000FC, 0x000000FB, 0x0000010B, 0x000000E3, 
-            0x0000010B, 0x00000100, 0x00000119, 0x000000FC, 0x0000013B, 0x000000F3, 0x0000013C, 0x0000010B, 
-            0x000000F2, 0x000000DB, 0x00000106, 0x000000E0, 0x000000F7, 0x00000100, 0x000000DA, 0x00000115, 
-            0x000000DB, 0x0000010B, 0x00000104, 0x000000FE, 0x0000010A, 0x000000E0, 0x00000115, 0x000000FE, 
-            0x0000011C, 0x000000DA, 0x00000115, 0x000000F7, 0x000000FC, 0x0000010B, 0x00000109, 0x00000119, 
-            0x000000FA, 0x0000013C, 0x00000103, 0x000000FC, 0x0000013C, 0x0000010B, 0x000000E0, 0x000000F3, 
-            0x0000013C, 0x0000010B, 0x000000F2, 0x000000EE, 0x0000013C, 0x00000106, 0x000000E0, 0x000000DB, 
-            0x000000F2, 0x000000FA, 0x0000010B, 0x000000ED, 0x0000013C, 0x00000100, 0x000000FB, 0x00000115, 
-            0x000000DA, 0x00000100, 0x0000010E, 0x000000FB, 0x000000F2, 0x00000115, 0x000000F4, 0x00000143, 
-            0x000000F2, 0x000000FC, 0x00000109, 0x000000FB, 0x00000109, 0x000000F0, 0x0000010B, 0x000000E0, 
-            0x00000104, 0x000000FE, 0x0000010B, 0x000000FB, 0x00000119, 0x000000FA, 0x000000FE, 0x0000013F
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 0x0000001E, 0x0000001F, 
-            0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 
-            0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E, 0x0000002F, 
-            0x00000030, 0x00000031, 0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 
-            0x00000038, 0x00000039, 0x0000003A, 0x0000003B, 0x0000003C, 0x0000003D, 0x0000003E, 0x0000003F, 
-            0x00000040, 0x00000041, 0x00000042, 0x00000043, 0x00000044, 0x00000045, 0x00000046, 0x00000047, 
-            0x00000048, 0x00000049, 0x0000004A, 0x0000004B, 0x0000004C, 0x0000004D, 0x0000004E, 0x0000004F, 
-            0x00000050, 0x00000051, 0x00000052, 0x00000053, 0x00000054, 0x00000055, 0x00000056, 0x00000057, 
-            0x00000058, 0x00000059, 0x0000005A, 0x0000005B, 0x0000005C, 0x0000005D, 0x0000005E, 0x0000005F, 
-            0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066, 0x00000067, 
-            0x00000068, 0x00000069, 0x0000006A, 0x0000006B, 0x0000006C, 0x0000006D, 0x0000006E, 0x0000006F, 
-            0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 0x00000075, 0x00000076, 0x00000077, 
-            0x00000078, 0x00000079, 0x0000007A, 0x0000007B, 0x0000007C, 0x0000007D, 0x0000007E, 0x0000007F, 
-            0x00000080, 0x00000081, 0x00000082, 0x00000083, 0x00000084, 0x00000085, 0x00000086, 0x00000087, 
-            0x00000088, 0x00000089, 0x0000008A, 0x0000008B, 0x0000008C, 0x0000008D, 0x0000008E, 0x0000008F, 
-            0x00000090, 0x00000091, 0x00000092, 0x00000093, 0x00000094, 0x00000095, 0x00000096, 0x00000097, 
-            0x00000098, 0x00000099, 0x0000009A, 0x0000009B, 0x0000009C, 0x0000009D, 0x0000009E, 0x0000009F, 
-            0x000000A0, 0x000000A1, 0x000000A2, 0x000000A3, 0x000000A4, 0x000000A5, 0x000000A6, 0x000000A7
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 5.399414, 0.000000, 10.798828, 0.000000, 16.198242, 0.000000, 
-            16.198242, 0.000000, 16.198242, 0.000000, 21.046875, 0.000000, 26.616211, 0.000000, 
-            30.035156, 0.000000, 34.151367, 0.000000, 34.151367, 0.000000, 38.279297, 0.000000, 
-            43.558594, 0.000000, 47.663086, 0.000000, 52.438477, 0.000000, 57.178711, 0.000000, 
-            62.698242, 0.000000, 66.802734, 0.000000, 71.601562, 0.000000, 75.706055, 0.000000, 
-            79.810547, 0.000000, 84.369141, 0.000000, 84.369141, 0.000000, 89.097656, 0.000000, 
-            92.516602, 0.000000, 97.195312, 0.000000, 97.195312, 0.000000, 101.311523, 0.000000, 
-            106.040039, 0.000000, 110.156250, 0.000000, 110.156250, 0.000000, 110.156250, 0.000000, 
-            115.555664, 0.000000, 115.555664, 0.000000, 118.974609, 0.000000, 124.013672, 0.000000, 
-            128.765625, 0.000000, 133.505859, 0.000000, 136.924805, 0.000000, 140.704102, 0.000000, 
-            146.103516, 0.000000, 146.103516, 0.000000, 146.103516, 0.000000, 149.882812, 0.000000, 
-            153.553711, 0.000000, 159.158203, 0.000000, 165.421875, 0.000000, 165.421875, 0.000000, 
-            169.092773, 0.000000, 174.612305, 0.000000, 179.135742, 0.000000, 183.911133, 0.000000, 
-            189.430664, 0.000000, 194.709961, 0.000000, 194.709961, 0.000000, 199.989258, 0.000000, 
-            204.741211, 0.000000, 204.741211, 0.000000, 210.140625, 0.000000, 214.880859, 0.000000, 
-            214.880859, 0.000000, 218.660156, 0.000000, 220.675781, 0.000000, 225.128906, 0.000000, 
-            230.648438, 0.000000, 234.752930, 0.000000, 234.752930, 0.000000, 239.613281, 0.000000, 
-            243.032227, 0.000000, 247.280273, 0.000000, 251.408203, 0.000000, 255.512695, 0.000000, 
-            255.512695, 0.000000, 260.036133, 0.000000, 264.776367, 0.000000, 269.071289, 0.000000, 
-            274.470703, 0.000000, 274.470703, 0.000000, 277.889648, 0.000000, 279.905273, 0.000000, 
-            284.633789, 0.000000, 284.633789, 0.000000, 289.672852, 0.000000, 294.641602, 0.000000, 
-            298.746094, 0.000000, 302.850586, 0.000000, 306.966797, 0.000000, 310.385742, 0.000000, 
-            315.246094, 0.000000, 318.665039, 0.000000, 322.913086, 0.000000, 327.041016, 0.000000, 
-            331.145508, 0.000000, 331.145508, 0.000000, 336.544922, 0.000000, 336.544922, 0.000000, 
-            339.963867, 0.000000, 345.483398, 0.000000, 350.258789, 0.000000, 354.987305, 0.000000, 
-            358.766602, 0.000000, 364.335938, 0.000000, 368.583984, 0.000000, 373.335938, 0.000000, 
-            375.351562, 0.000000, 380.126953, 0.000000, 383.545898, 0.000000, 389.150391, 0.000000, 
-            393.890625, 0.000000, 393.890625, 0.000000, 397.669922, 0.000000, 399.685547, 0.000000, 
-            404.425781, 0.000000, 404.425781, 0.000000, 409.177734, 0.000000, 411.193359, 0.000000, 
-            416.762695, 0.000000, 420.867188, 0.000000, 424.286133, 0.000000, 428.581055, 0.000000, 
-            432.708984, 0.000000, 437.748047, 0.000000, 437.748047, 0.000000, 443.027344, 0.000000, 
-            447.131836, 0.000000, 447.131836, 0.000000, 450.550781, 0.000000, 454.330078, 0.000000, 
-            459.729492, 0.000000, 459.729492, 0.000000, 463.148438, 0.000000, 468.667969, 0.000000, 
-            473.478516, 0.000000, 473.478516, 0.000000, 478.207031, 0.000000, 481.986328, 0.000000, 
-            486.761719, 0.000000, 492.281250, 0.000000, 497.320312, 0.000000, 500.739258, 0.000000, 
-            505.538086, 0.000000, 505.538086, 0.000000, 509.786133, 0.000000, 513.902344, 0.000000, 
-            515.917969, 0.000000, 520.669922, 0.000000, 524.917969, 0.000000, 524.917969, 0.000000, 
-            529.034180, 0.000000, 534.553711, 0.000000, 536.569336, 0.000000, 541.968750, 0.000000, 
-            541.968750, 0.000000, 547.488281, 0.000000, 551.592773, 0.000000, 555.887695, 0.000000, 
-            560.003906, 0.000000, 564.298828, 0.000000, 569.698242, 0.000000, 573.117188, 0.000000, 
-            576.896484, 0.000000, 582.500977, 0.000000, 587.241211, 0.000000, 590.660156, 0.000000, 
-            594.776367, 0.000000, 598.904297, 0.000000, 603.943359, 0.000000, 608.683594, 0.000000, 
-            608.683594, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Arabic Simple" script="arab">
-        <test-font name="LucidaSansRegular.ttf" version="Version 1.20 - October 2000" checksum="0xF5D9BA6D" rchecksum="0x029B644F"/>
-
-        <test-text>أساسًا، تتعامل الحواسيب فقط مع الأرقام، وتقوم بتخزين الأحرف والمحارف الأخرى بعد أن تُعطي رقما معينا لكل واحد منها. وقبل اختراع "يونِكود"، كان هناك مئات الأنظمة للتشفير وتخصيص هذه الأرقام للمحارف، ولم يوجد نظام تشفير واحد يحتوي على جميع المحارف الضرورية</test-text>
-
-        <result-glyphs>
-            0x00000872, 0x000008D1, 0x000003F9, 0x0000040B, 0x0000088C, 0x0000089E, 0x000008BD, 0x000003EF, 
-            0x00000003, 0x00000404, 0x000003F9, 0x0000086C, 0x00000882, 0x000008C2, 0x000008BD, 0x000003EF, 
-            0x00000003, 0x000008A8, 0x000008D2, 0x000008C2, 0x0000087D, 0x00000003, 0x000008CE, 0x000008BE, 
-            0x000008A9, 0x00000003, 0x0000040D, 0x000008CC, 0x00000876, 0x00000882, 0x000008D1, 0x00000003, 
-            0x00000888, 0x00000881, 0x000003EF, 0x0000040B, 0x00000003, 0x0000088C, 0x000008D2, 0x000008B2, 
-            0x00000896, 0x00000875, 0x00000003, 0x00000408, 0x0000086C, 0x000008A6, 0x000008C5, 0x00000003, 
-            0x00000888, 0x0000087D, 0x000008CC, 0x000008D1, 0x00000003, 0x000008C0, 0x000008BD, 0x0000040B, 
-            0x00000003, 0x000003E6, 0x00000404, 0x000003F9, 0x0000086C, 0x00000882, 0x000008C2, 0x000008BE, 
-            0x000008BD, 0x00000003, 0x00000408, 0x0000086C, 0x000008B5, 0x000003F9, 0x0000FFFF, 0x000008D5, 
-            0x000003EF, 0x00000003, 0x0000040A, 0x0000088A, 0x000008C9, 0x00000003, 0x00000898, 0x000008D2, 
-            0x0000089A, 0x00000886, 0x00000875, 0x0000040B, 0x00000003, 0x0000088C, 0x000008D2, 0x000008B2, 
-            0x00000896, 0x00000876, 0x000008BE, 0x000008BD, 0x00000003, 0x00000872, 0x000008C2, 0x000008A6, 
-            0x000008C5, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 0x000003F2, 0x0000086C, 0x0000086A, 
-            0x000008C1, 0x00000003, 0x00000406, 0x0000086C, 0x000008C6, 0x000008C9, 0x00000003, 0x00000409, 
-            0x0000086C, 0x000008B9, 0x00000003, 0x000003E6, 0x00000005, 0x000003F7, 0x000008CC, 0x000008BA, 
-            0x00000413, 0x000008C5, 0x000008CC, 0x000008D1, 0x00000005, 0x00000003, 0x00000401, 0x000003EF, 
-            0x0000088C, 0x00000876, 0x00000885, 0x000003EF, 0x00000003, 0x000008BC, 0x00000870, 0x000008B5, 
-            0x0000040B, 0x00000003, 0x00000011, 0x0000086C, 0x000008CA, 0x000008C6, 0x000008C1, 0x00000003, 
-            0x00000888, 0x00000881, 0x000003EF, 0x0000040B, 0x00000003, 0x000008BC, 0x000008BA, 0x000008BD, 
-            0x00000003, 0x0000086C, 0x000008C6, 0x000008D2, 0x000008AA, 0x000008C1, 0x00000003, 0x0000086C, 
-            0x000008C2, 0x000008B5, 0x000003F9, 0x00000003, 0x000008D0, 0x000008A2, 0x000008AA, 0x00000412, 
-            0x00000875, 0x00000003, 0x00000409, 0x000003EB, 0x00000003, 0x00000888, 0x000008AA, 0x0000086F, 
-            0x00000003, 0x0000040C, 0x0000088C, 0x00000885, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 
-            0x00000404, 0x000003F9, 0x0000086C, 0x00000882, 0x000008C2, 0x000008BD, 0x000003EF, 0x0000040B, 
-            0x00000003, 0x00000404, 0x0000088C, 0x00000881, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 
-            0x000008C4, 0x000008D1, 0x0000088E, 0x00000886, 0x00000876, 0x0000086F, 0x00000003, 0x00000408, 
-            0x000008CC, 0x000008B6, 0x00000875, 0x0000040B, 0x00000003, 0x000003E6, 0x00000408, 0x0000086C, 
-            0x000008B5, 0x000003F9, 0x0000FFFF, 0x000008D5, 0x000003EF, 0x00000003, 0x000008A8, 0x000008C1, 
-            0x00000003, 0x000008A0, 0x000008B6, 0x000008B1, 0x00000003, 0x0000086E, 0x000008D2, 0x00000891, 
-            0x000003EF, 0x000008CC, 0x00000882, 0x000008BD, 0x000003EF, 0x00000003, 0x000008BC, 0x000008C1, 
-            0x0000086C, 0x000008AA, 0x00000876, 0x00000875, 0x00000003, 0x000003E6, 0x0000086C, 0x0000040E, 
-            0x00000891, 0x0000086C, 0x00000891, 0x000003EB
-        </result-glyphs>
-
-        <result-indices>
-            0x000000FB, 0x000000FA, 0x000000F9, 0x000000F8, 0x000000F7, 0x000000F6, 0x000000F5, 0x000000F4, 
-            0x000000F3, 0x000000F2, 0x000000F1, 0x000000F0, 0x000000EF, 0x000000EE, 0x000000ED, 0x000000EC, 
-            0x000000EB, 0x000000EA, 0x000000E9, 0x000000E8, 0x000000E7, 0x000000E6, 0x000000E5, 0x000000E4, 
-            0x000000E3, 0x000000E2, 0x000000E1, 0x000000E0, 0x000000DF, 0x000000DE, 0x000000DD, 0x000000DC, 
-            0x000000DB, 0x000000DA, 0x000000D9, 0x000000D8, 0x000000D7, 0x000000D6, 0x000000D5, 0x000000D4, 
-            0x000000D3, 0x000000D2, 0x000000D1, 0x000000D0, 0x000000CF, 0x000000CE, 0x000000CD, 0x000000CC, 
-            0x000000CB, 0x000000CA, 0x000000C9, 0x000000C8, 0x000000C7, 0x000000C6, 0x000000C5, 0x000000C4, 
-            0x000000C3, 0x000000C2, 0x000000C1, 0x000000C0, 0x000000BF, 0x000000BE, 0x000000BD, 0x000000BC, 
-            0x000000BB, 0x000000BA, 0x000000B9, 0x000000B8, 0x000000B7, 0x000000B6, 0x000000B5, 0x000000B4, 
-            0x000000B3, 0x000000B2, 0x000000B1, 0x000000B0, 0x000000AF, 0x000000AE, 0x000000AD, 0x000000AC, 
-            0x000000AB, 0x000000AA, 0x000000A9, 0x000000A8, 0x000000A7, 0x000000A6, 0x000000A5, 0x000000A4, 
-            0x000000A3, 0x000000A2, 0x000000A1, 0x000000A0, 0x0000009F, 0x0000009E, 0x0000009D, 0x0000009C, 
-            0x0000009B, 0x0000009A, 0x00000099, 0x00000098, 0x00000097, 0x00000096, 0x00000095, 0x00000094, 
-            0x00000093, 0x00000092, 0x00000091, 0x00000090, 0x0000008F, 0x0000008E, 0x0000008D, 0x0000008C, 
-            0x0000008B, 0x0000008A, 0x00000089, 0x00000088, 0x00000087, 0x00000086, 0x00000085, 0x00000084, 
-            0x00000083, 0x00000082, 0x00000081, 0x00000080, 0x0000007F, 0x0000007E, 0x0000007D, 0x0000007C, 
-            0x0000007B, 0x0000007A, 0x00000079, 0x00000078, 0x00000077, 0x00000076, 0x00000075, 0x00000074, 
-            0x00000073, 0x00000072, 0x00000071, 0x00000070, 0x0000006F, 0x0000006E, 0x0000006D, 0x0000006C, 
-            0x0000006B, 0x0000006A, 0x00000069, 0x00000068, 0x00000067, 0x00000066, 0x00000065, 0x00000064, 
-            0x00000063, 0x00000062, 0x00000061, 0x00000060, 0x0000005F, 0x0000005E, 0x0000005D, 0x0000005C, 
-            0x0000005B, 0x0000005A, 0x00000059, 0x00000058, 0x00000057, 0x00000056, 0x00000055, 0x00000054, 
-            0x00000053, 0x00000052, 0x00000051, 0x00000050, 0x0000004F, 0x0000004E, 0x0000004D, 0x0000004C, 
-            0x0000004B, 0x0000004A, 0x00000049, 0x00000048, 0x00000047, 0x00000046, 0x00000045, 0x00000044, 
-            0x00000043, 0x00000042, 0x00000041, 0x00000040, 0x0000003F, 0x0000003E, 0x0000003D, 0x0000003C, 
-            0x0000003B, 0x0000003A, 0x00000039, 0x00000038, 0x00000037, 0x00000036, 0x00000035, 0x00000034, 
-            0x00000033, 0x00000032, 0x00000031, 0x00000030, 0x0000002F, 0x0000002E, 0x0000002D, 0x0000002C, 
-            0x0000002B, 0x0000002A, 0x00000029, 0x00000028, 0x00000027, 0x00000026, 0x00000025, 0x00000024, 
-            0x00000023, 0x00000022, 0x00000021, 0x00000020, 0x0000001F, 0x0000001E, 0x0000001D, 0x0000001C, 
-            0x0000001B, 0x0000001A, 0x00000019, 0x00000018, 0x00000017, 0x00000016, 0x00000015, 0x00000014, 
-            0x00000013, 0x00000012, 0x00000011, 0x00000010, 0x0000000F, 0x0000000E, 0x0000000D, 0x0000000C, 
-            0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 0x00000004, 
-            0x00000003, 0x00000002, 0x00000001, 0x00000000
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 6.316406, 0.000000, 10.382812, 0.000000, 15.492188, 0.000000, 
-            21.035156, 0.000000, 27.058594, 0.000000, 39.527344, 0.000000, 43.792969, 0.000000, 
-            47.408203, 0.000000, 51.205078, 0.000000, 66.216797, 0.000000, 71.326172, 0.000000, 
-            74.695312, 0.000000, 83.367188, 0.000000, 90.826172, 0.000000, 95.091797, 0.000000, 
-            98.707031, 0.000000, 102.503906, 0.000000, 109.962891, 0.000000, 114.949219, 0.000000, 
-            122.408203, 0.000000, 130.687500, 0.000000, 134.484375, 0.000000, 145.787109, 0.000000, 
-            150.773438, 0.000000, 156.884766, 0.000000, 160.681641, 0.000000, 172.277344, 0.000000, 
-            177.919922, 0.000000, 182.906250, 0.000000, 191.578125, 0.000000, 195.644531, 0.000000, 
-            199.441406, 0.000000, 206.507812, 0.000000, 214.787109, 0.000000, 218.402344, 0.000000, 
-            223.945312, 0.000000, 227.742188, 0.000000, 233.765625, 0.000000, 238.751953, 0.000000, 
-            245.185547, 0.000000, 257.982422, 0.000000, 262.048828, 0.000000, 265.845703, 0.000000, 
-            272.654297, 0.000000, 276.023438, 0.000000, 285.240234, 0.000000, 289.306641, 0.000000, 
-            293.103516, 0.000000, 300.169922, 0.000000, 308.449219, 0.000000, 314.091797, 0.000000, 
-            318.158203, 0.000000, 321.955078, 0.000000, 329.572266, 0.000000, 333.837891, 0.000000, 
-            339.380859, 0.000000, 343.177734, 0.000000, 346.974609, 0.000000, 361.986328, 0.000000, 
-            367.095703, 0.000000, 370.464844, 0.000000, 379.136719, 0.000000, 386.595703, 0.000000, 
-            391.582031, 0.000000, 395.847656, 0.000000, 399.644531, 0.000000, 406.453125, 0.000000, 
-            409.822266, 0.000000, 415.523438, 0.000000, 420.632812, 0.000000, 420.632812, 0.000000, 
-            427.441406, 0.000000, 431.056641, 0.000000, 434.853516, 0.000000, 441.357422, 0.000000, 
-            448.423828, 0.000000, 455.912109, 0.000000, 459.708984, 0.000000, 479.255859, 0.000000, 
-            484.242188, 0.000000, 496.710938, 0.000000, 505.382812, 0.000000, 509.449219, 0.000000, 
-            514.992188, 0.000000, 518.789062, 0.000000, 524.812500, 0.000000, 529.798828, 0.000000, 
-            536.232422, 0.000000, 549.029297, 0.000000, 554.015625, 0.000000, 559.001953, 0.000000, 
-            563.267578, 0.000000, 567.064453, 0.000000, 573.380859, 0.000000, 580.839844, 0.000000, 
-            590.056641, 0.000000, 594.123047, 0.000000, 594.123047, 0.000000, 600.931641, 0.000000, 
-            604.546875, 0.000000, 608.343750, 0.000000, 620.636719, 0.000000, 624.005859, 0.000000, 
-            628.992188, 0.000000, 635.830078, 0.000000, 639.626953, 0.000000, 653.361328, 0.000000, 
-            656.730469, 0.000000, 661.716797, 0.000000, 669.205078, 0.000000, 673.001953, 0.000000, 
-            683.777344, 0.000000, 687.146484, 0.000000, 692.660156, 0.000000, 696.457031, 0.000000, 
-            700.253906, 0.000000, 704.736328, 0.000000, 711.105469, 0.000000, 716.748047, 0.000000, 
-            722.994141, 0.000000, 722.994141, 0.000000, 727.060547, 0.000000, 732.703125, 0.000000, 
-            736.769531, 0.000000, 741.251953, 0.000000, 745.048828, 0.000000, 752.507812, 0.000000, 
-            756.123047, 0.000000, 762.146484, 0.000000, 767.132812, 0.000000, 775.412109, 0.000000, 
-            779.027344, 0.000000, 782.824219, 0.000000, 794.203125, 0.000000, 799.189453, 0.000000, 
-            804.890625, 0.000000, 810.433594, 0.000000, 814.230469, 0.000000, 818.027344, 0.000000, 
-            821.396484, 0.000000, 828.128906, 0.000000, 833.115234, 0.000000, 839.953125, 0.000000, 
-            843.750000, 0.000000, 850.816406, 0.000000, 859.095703, 0.000000, 862.710938, 0.000000, 
-            868.253906, 0.000000, 872.050781, 0.000000, 883.429688, 0.000000, 889.675781, 0.000000, 
-            893.941406, 0.000000, 897.738281, 0.000000, 901.107422, 0.000000, 906.093750, 0.000000, 
-            911.080078, 0.000000, 917.800781, 0.000000, 924.638672, 0.000000, 928.435547, 0.000000, 
-            931.804688, 0.000000, 939.263672, 0.000000, 944.964844, 0.000000, 950.074219, 0.000000, 
-            953.871094, 0.000000, 965.173828, 0.000000, 974.390625, 0.000000, 981.111328, 0.000000, 
-            981.111328, 0.000000, 985.177734, 0.000000, 988.974609, 0.000000, 999.750000, 0.000000, 
-            1003.365234, 0.000000, 1007.162109, 0.000000, 1014.228516, 0.000000, 1020.949219, 0.000000, 
-            1025.015625, 0.000000, 1028.812500, 0.000000, 1040.408203, 0.000000, 1046.431641, 0.000000, 
-            1054.710938, 0.000000, 1054.710938, 0.000000, 1061.519531, 0.000000, 1065.134766, 0.000000, 
-            1068.931641, 0.000000, 1083.943359, 0.000000, 1089.052734, 0.000000, 1092.421875, 0.000000, 
-            1101.093750, 0.000000, 1108.552734, 0.000000, 1112.818359, 0.000000, 1116.433594, 0.000000, 
-            1121.976562, 0.000000, 1125.773438, 0.000000, 1140.785156, 0.000000, 1146.808594, 0.000000, 
-            1155.087891, 0.000000, 1155.087891, 0.000000, 1161.896484, 0.000000, 1165.511719, 0.000000, 
-            1169.308594, 0.000000, 1180.541016, 0.000000, 1184.607422, 0.000000, 1190.630859, 0.000000, 
-            1199.302734, 0.000000, 1204.289062, 0.000000, 1208.355469, 0.000000, 1212.152344, 0.000000, 
-            1218.960938, 0.000000, 1224.603516, 0.000000, 1231.037109, 0.000000, 1235.103516, 0.000000, 
-            1240.646484, 0.000000, 1244.443359, 0.000000, 1248.240234, 0.000000, 1255.048828, 0.000000, 
-            1258.417969, 0.000000, 1264.119141, 0.000000, 1269.228516, 0.000000, 1269.228516, 0.000000, 
-            1276.037109, 0.000000, 1279.652344, 0.000000, 1283.449219, 0.000000, 1290.908203, 0.000000, 
-            1297.746094, 0.000000, 1301.542969, 0.000000, 1311.427734, 0.000000, 1317.861328, 0.000000, 
-            1323.562500, 0.000000, 1327.359375, 0.000000, 1341.492188, 0.000000, 1346.478516, 0.000000, 
-            1357.904297, 0.000000, 1361.519531, 0.000000, 1367.162109, 0.000000, 1375.833984, 0.000000, 
-            1380.099609, 0.000000, 1383.714844, 0.000000, 1387.511719, 0.000000, 1398.890625, 0.000000, 
-            1405.728516, 0.000000, 1409.097656, 0.000000, 1415.818359, 0.000000, 1420.804688, 0.000000, 
-            1424.871094, 0.000000, 1428.667969, 0.000000, 1432.464844, 0.000000, 1435.833984, 0.000000, 
-            1435.833984, 0.000000, 1447.259766, 0.000000, 1450.628906, 0.000000, 1462.054688, 0.000000, 
-            1465.669922, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Matra Test" script="deva">
-        <test-font name="raghu.ttf" version="Original Version 1.00 (2005)" checksum="0x088DB135" rchecksum="0x00803FCE"/>
-
-        <test-text>ुं ं॑</test-text>
-
-        <result-glyphs>
-            0x0000029C, 0x000001D5, 0x00000232, 0x00000003, 0x0000029C, 0x00000232, 0x00000233
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000004
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 7.541016, 0.000000, 7.541016, 0.000000, 7.541016, 0.000000, 
-            13.541016, 0.000000, 21.082031, 0.000000, 19.953125, -6.052734, 21.082031, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Deva Stress Test" script="deva">
-        <test-font name="raghu.ttf" version="Original Version 1.00 (2005)" checksum="0x088DB135" rchecksum="0x00803FCE"/>
-
-        <test-text>कँ कं कः क॑ क॒ कँ॑ कं॒ कँंः क॒॑</test-text>
-
-        <result-glyphs>
-            0x00000080, 0x00000231, 0x00000003, 0x00000080, 0x00000232, 0x00000003, 0x00000080, 0x0000022C, 
-            0x00000003, 0x00000080, 0x00000233, 0x00000003, 0x00000080, 0x000001DF, 0x00000003, 0x00000080, 
-            0x00000231, 0x00000233, 0x00000003, 0x00000080, 0x000001DF, 0x00000232, 0x00000003, 0x00000080, 
-            0x00000231, 0x0000029C, 0x00000232, 0x0000029C, 0x0000022C, 0x00000003, 0x00000080, 0x00000233, 
-            0x0000029C, 0x000001DF
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000015, 0x00000014, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x00000019, 0x0000001A, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 
-            0x0000001E, 0x0000001E
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 10.001953, -0.087891, 10.875000, 0.000000, 16.875000, 0.000000, 
-            23.783203, 0.439453, 27.750000, 0.000000, 33.750000, 0.000000, 44.625000, 0.000000, 
-            48.984375, 0.000000, 54.984375, 0.000000, 63.546875, -1.669922, 65.859375, 0.000000, 
-            71.859375, 0.000000, 80.332031, 0.492188, 82.734375, 0.000000, 88.734375, 0.000000, 
-            98.736328, -0.087891, 97.431641, -6.228516, 99.609375, 0.000000, 105.609375, 0.000000, 
-            114.082031, 0.492188, 112.517578, 0.439453, 116.484375, 0.000000, 122.484375, 0.000000, 
-            132.486328, -0.087891, 133.359375, 0.000000, 140.900391, 0.000000, 140.900391, 0.000000, 
-            148.441406, 0.000000, 152.800781, 0.000000, 158.800781, 0.000000, 167.363281, -1.669922, 
-            169.675781, 0.000000, 177.216797, 0.000000, 177.216797, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Deva Test" script="deva">
-        <test-font name="raghu.ttf" version="Original Version 1.00 (2005)" checksum="0x088DB135" rchecksum="0x00803FCE"/>
-
-        <test-text>रू क़् क्ष क्कि क्रि ट्रि हिन्दी र्क्रिं क्षत्रज्ञत्रक्ष श्र थ्र श्र कके र्कें केूकूेकेृ र्कू क़ क क् क्ष क्ष् क्ष्क  ज़ ज ज् ज्ञ ज्ञ् ज्ञ्क र्क र्क्क ड्र क्क क़्क क़्क क़् क्ष्क क्ष् त्र्क द्द कि हि रू रु र्के र्कं क् कु के द्द्द क़्ष क्ष र्क्षे द्दत्र्क ज्ञ क्त्व ज्ञ्क र्कँ र्किँ र्केँ र्क्रिँ हिंदी ह्मिह्यिखि ङ्क ङ्म ङ्क्त ङ्ख ङ्ग ङ्घ ङ्क्ष ङ्क्ष्व ङ्क्ष्य र्क्त्वि र्र्र्र कै के कु कू कृ कॅ कॆ हु हू हॆ है हे</test-text>
-
-        <result-glyphs>
-            0x0000009A, 0x000001FE, 0x00000003, 0x000000A4, 0x00000051, 0x00000003, 0x000000A2, 0x0000FFFF, 
-            0x0000FFFF, 0x00000003, 0x000001D4, 0x000000C8, 0x0000FFFF, 0x00000080, 0x00000003, 0x000001D1, 
-            0x00000080, 0x0000009A, 0x00000051, 0x00000003, 0x000001D1, 0x0000008A, 0x0000009A, 0x00000051, 
-            0x00000003, 0x000001D1, 0x000000A1, 0x000000DB, 0x0000FFFF, 0x00000091, 0x00000223, 0x00000003, 
-            0x000001D1, 0x00000080, 0x000000E2, 0x0000FFFF, 0x0000009A, 0x00000051, 0x00000232, 0x00000003, 
-            0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x0000008F, 0x000000E2, 0x0000FFFF, 0x000000A3, 0x0000FFFF, 
-            0x0000FFFF, 0x0000008F, 0x000000E2, 0x0000FFFF, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000003, 
-            0x0000009E, 0x0000009A, 0x00000051, 0x00000003, 0x00000090, 0x0000009A, 0x00000051, 0x00000003, 
-            0x0000009E, 0x0000009A, 0x00000051, 0x00000003, 0x00000080, 0x00000080, 0x0000022F, 0x00000003, 
-            0x00000080, 0x0000022F, 0x0000024D, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x00000080, 0x0000022F, 
-            0x0000029C, 0x000001D7, 0x00000080, 0x000001D7, 0x0000029C, 0x0000022F, 0x00000080, 0x0000022F, 
-            0x0000029C, 0x000001D9, 0x00000003, 0x00000080, 0x000001D7, 0x0000005B, 0x0000FFFF, 0x00000003, 
-            0x000000A4, 0x00000003, 0x00000080, 0x00000003, 0x00000080, 0x00000051, 0x00000003, 0x000000A2, 
-            0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000051, 0x00000003, 
-            0x000000EA, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000080, 0x00000003, 0x00000003, 0x000000AB, 
-            0x0000FFFF, 0x00000003, 0x00000087, 0x00000003, 0x00000087, 0x00000051, 0x00000003, 0x000000A3, 
-            0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000A3, 0x0000FFFF, 0x0000FFFF, 0x00000051, 0x00000003, 
-            0x000000EB, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000080, 0x00000003, 0x00000080, 0x0000005B, 
-            0x0000FFFF, 0x00000003, 0x000000C8, 0x0000FFFF, 0x00000080, 0x0000005B, 0x0000FFFF, 0x00000003, 
-            0x0000008C, 0x0000009A, 0x00000051, 0x00000003, 0x000000C8, 0x0000FFFF, 0x00000080, 0x00000003, 
-            0x000000EC, 0x0000FFFF, 0x00000080, 0x00000003, 0x000000EC, 0x0000FFFF, 0x00000080, 0x00000003, 
-            0x000000A4, 0x00000051, 0x00000003, 0x000000EA, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000080, 
-            0x00000003, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000051, 0x00000003, 0x000000D7, 0x0000FFFF, 
-            0x000000E2, 0x0000FFFF, 0x00000080, 0x00000003, 0x000001A7, 0x0000FFFF, 0x0000FFFF, 0x00000003, 
-            0x000001D1, 0x00000080, 0x00000003, 0x000001D1, 0x000000A1, 0x00000003, 0x0000009A, 0x000001FE, 
-            0x00000003, 0x0000009A, 0x000001FD, 0x00000003, 0x00000080, 0x0000022F, 0x0000005A, 0x0000FFFF, 
-            0x00000003, 0x00000080, 0x0000024D, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x00000080, 0x00000051, 
-            0x00000003, 0x00000080, 0x000001D5, 0x00000003, 0x00000080, 0x0000022F, 0x00000003, 0x000000D9, 
-            0x0000FFFF, 0x000001A7, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000EC, 0x0000FFFF, 0x0000009F, 
-            0x00000003, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 
-            0x0000022F, 0x0000005A, 0x0000FFFF, 0x00000003, 0x000001A7, 0x0000FFFF, 0x0000FFFF, 0x000000D7, 
-            0x0000FFFF, 0x000000E2, 0x0000FFFF, 0x00000080, 0x00000003, 0x000000A3, 0x0000FFFF, 0x0000FFFF, 
-            0x00000003, 0x000000C8, 0x0000FFFF, 0x000000D7, 0x0000FFFF, 0x0000009D, 0x00000003, 0x000000EB, 
-            0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000080, 0x00000003, 0x00000080, 0x0000024C, 0x0000FFFF, 
-            0x0000FFFF, 0x00000003, 0x000001D1, 0x00000080, 0x0000024C, 0x0000FFFF, 0x0000FFFF, 0x00000003, 
-            0x00000080, 0x0000022F, 0x0000024C, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000001D1, 0x00000080, 
-            0x000000E2, 0x0000FFFF, 0x0000009A, 0x00000051, 0x00000231, 0x00000003, 0x000001D1, 0x000000A1, 
-            0x00000232, 0x00000091, 0x00000223, 0x00000003, 0x000001D3, 0x000001BA, 0x0000FFFF, 0x0000FFFF, 
-            0x000001D3, 0x000001BB, 0x0000FFFF, 0x0000FFFF, 0x000001D4, 0x00000081, 0x00000003, 0x000000CC, 
-            0x0000FFFF, 0x00000080, 0x00000003, 0x000001A2, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000CC, 
-            0x0000FFFF, 0x000001A0, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000CC, 0x0000FFFF, 0x00000081, 
-            0x00000003, 0x000000CC, 0x0000FFFF, 0x00000082, 0x00000003, 0x000000CC, 0x0000FFFF, 0x00000083, 
-            0x00000003, 0x000000CC, 0x0000FFFF, 0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000CC, 
-            0x0000FFFF, 0x000000EA, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000009D, 0x00000003, 0x000000CC, 
-            0x0000FFFF, 0x000000EA, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000099, 0x00000003, 0x000001D4, 
-            0x000000C8, 0x0000FFFF, 0x000000D7, 0x0000FFFF, 0x0000009D, 0x0000005B, 0x0000FFFF, 0x00000003, 
-            0x0000009A, 0x00000051, 0x0000009A, 0x000000E2, 0x0000FFFF, 0x0000009A, 0x00000051, 0x00000003, 
-            0x00000080, 0x00000230, 0x00000003, 0x00000080, 0x0000022F, 0x00000003, 0x00000080, 0x000001D5, 
-            0x00000003, 0x00000080, 0x000001D7, 0x00000003, 0x00000080, 0x000001D9, 0x00000003, 0x00000080, 
-            0x0000022D, 0x00000003, 0x00000080, 0x0000022E, 0x00000003, 0x000000A1, 0x000001D5, 0x00000003, 
-            0x000000A1, 0x000001D7, 0x00000003, 0x000000A1, 0x0000022E, 0x00000003, 0x000000A1, 0x00000230, 
-            0x00000003, 0x000000A1, 0x0000022F
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000D, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000E, 0x00000012, 
-            0x0000000F, 0x00000011, 0x00000010, 0x00000013, 0x00000017, 0x00000014, 0x00000016, 0x00000015, 
-            0x00000018, 0x0000001A, 0x00000019, 0x0000001B, 0x0000001C, 0x0000001D, 0x0000001E, 0x0000001F, 
-            0x00000025, 0x00000022, 0x00000024, 0x00000023, 0x00000020, 0x00000021, 0x00000026, 0x00000027, 
-            0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002D, 0x0000002C, 0x0000002E, 0x0000002F, 
-            0x00000030, 0x00000031, 0x00000033, 0x00000032, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 
-            0x00000038, 0x0000003A, 0x00000039, 0x0000003B, 0x0000003C, 0x0000003E, 0x0000003D, 0x0000003F, 
-            0x00000040, 0x00000042, 0x00000041, 0x00000043, 0x00000044, 0x00000045, 0x00000046, 0x00000047, 
-            0x0000004A, 0x0000004B, 0x00000048, 0x00000049, 0x0000004C, 0x0000004D, 0x0000004E, 0x0000004F, 
-            0x00000050, 0x00000050, 0x00000051, 0x00000052, 0x00000053, 0x00000053, 0x00000054, 0x00000055, 
-            0x00000056, 0x00000056, 0x00000057, 0x0000005A, 0x0000005B, 0x00000058, 0x00000059, 0x0000005C, 
-            0x0000005D, 0x0000005E, 0x0000005F, 0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x00000064, 
-            0x00000065, 0x00000066, 0x00000067, 0x00000068, 0x00000069, 0x0000006A, 0x0000006B, 0x0000006C, 
-            0x0000006D, 0x0000006E, 0x0000006F, 0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 
-            0x00000075, 0x00000076, 0x00000077, 0x00000078, 0x00000079, 0x0000007A, 0x0000007B, 0x0000007C, 
-            0x0000007D, 0x0000007E, 0x0000007F, 0x00000080, 0x00000081, 0x00000082, 0x00000083, 0x00000084, 
-            0x00000085, 0x00000086, 0x00000087, 0x00000088, 0x00000089, 0x0000008A, 0x0000008D, 0x0000008B, 
-            0x0000008C, 0x0000008E, 0x00000091, 0x00000092, 0x00000093, 0x0000008F, 0x00000090, 0x00000094, 
-            0x00000095, 0x00000097, 0x00000096, 0x00000098, 0x00000099, 0x0000009A, 0x0000009B, 0x0000009C, 
-            0x0000009D, 0x0000009E, 0x0000009F, 0x000000A0, 0x000000A1, 0x000000A2, 0x000000A3, 0x000000A4, 
-            0x000000A5, 0x000000A6, 0x000000A7, 0x000000A8, 0x000000A9, 0x000000AA, 0x000000AB, 0x000000AC, 
-            0x000000AD, 0x000000AE, 0x000000AF, 0x000000B0, 0x000000B1, 0x000000B2, 0x000000B3, 0x000000B4, 
-            0x000000B5, 0x000000B6, 0x000000B7, 0x000000B8, 0x000000B9, 0x000000BA, 0x000000BB, 0x000000BC, 
-            0x000000BE, 0x000000BD, 0x000000BF, 0x000000C1, 0x000000C0, 0x000000C2, 0x000000C3, 0x000000C4, 
-            0x000000C5, 0x000000C6, 0x000000C7, 0x000000C8, 0x000000CB, 0x000000CC, 0x000000C9, 0x000000CA, 
-            0x000000CD, 0x000000D0, 0x000000CE, 0x000000CF, 0x000000D1, 0x000000D2, 0x000000D3, 0x000000D4, 
-            0x000000D5, 0x000000D6, 0x000000D7, 0x000000D8, 0x000000D9, 0x000000DA, 0x000000DB, 0x000000DC, 
-            0x000000DD, 0x000000DE, 0x000000DF, 0x000000E0, 0x000000E1, 0x000000E2, 0x000000E3, 0x000000E4, 
-            0x000000E5, 0x000000E6, 0x000000E7, 0x000000E8, 0x000000E9, 0x000000EC, 0x000000ED, 0x000000EE, 
-            0x000000EF, 0x000000EA, 0x000000EB, 0x000000F0, 0x000000F1, 0x000000F2, 0x000000F3, 0x000000F4, 
-            0x000000F5, 0x000000F6, 0x000000F7, 0x000000F8, 0x000000F9, 0x000000FA, 0x000000FB, 0x000000FC, 
-            0x000000FD, 0x000000FE, 0x000000FF, 0x00000100, 0x00000101, 0x00000102, 0x00000103, 0x00000104, 
-            0x00000105, 0x00000106, 0x00000107, 0x00000108, 0x00000109, 0x0000010C, 0x0000010A, 0x0000010B, 
-            0x0000010D, 0x0000010E, 0x00000112, 0x00000111, 0x0000010F, 0x00000110, 0x00000113, 0x00000114, 
-            0x00000117, 0x00000118, 0x00000115, 0x00000116, 0x00000119, 0x0000011A, 0x00000120, 0x0000011D, 
-            0x0000011F, 0x0000011E, 0x0000011B, 0x0000011C, 0x00000121, 0x00000122, 0x00000124, 0x00000123, 
-            0x00000125, 0x00000126, 0x00000127, 0x00000128, 0x0000012C, 0x00000129, 0x0000012A, 0x0000012B, 
-            0x00000130, 0x0000012D, 0x0000012E, 0x0000012F, 0x00000132, 0x00000131, 0x00000133, 0x00000134, 
-            0x00000135, 0x00000136, 0x00000137, 0x00000138, 0x00000139, 0x0000013A, 0x0000013B, 0x0000013C, 
-            0x0000013D, 0x0000013E, 0x0000013F, 0x00000140, 0x00000141, 0x00000142, 0x00000143, 0x00000144, 
-            0x00000145, 0x00000146, 0x00000147, 0x00000148, 0x00000149, 0x0000014A, 0x0000014B, 0x0000014C, 
-            0x0000014D, 0x0000014E, 0x0000014F, 0x00000150, 0x00000151, 0x00000152, 0x00000153, 0x00000154, 
-            0x00000155, 0x00000156, 0x00000157, 0x00000158, 0x00000159, 0x0000015A, 0x0000015B, 0x0000015C, 
-            0x0000015D, 0x0000015E, 0x0000015F, 0x00000160, 0x00000161, 0x00000162, 0x00000163, 0x0000016B, 
-            0x00000166, 0x00000167, 0x00000168, 0x00000169, 0x0000016A, 0x00000164, 0x00000165, 0x0000016C, 
-            0x0000016F, 0x00000170, 0x00000171, 0x00000173, 0x00000172, 0x0000016D, 0x0000016E, 0x00000174, 
-            0x00000175, 0x00000176, 0x00000177, 0x00000178, 0x00000179, 0x0000017A, 0x0000017B, 0x0000017C, 
-            0x0000017D, 0x0000017E, 0x0000017F, 0x00000180, 0x00000181, 0x00000182, 0x00000183, 0x00000184, 
-            0x00000185, 0x00000186, 0x00000187, 0x00000188, 0x00000189, 0x0000018A, 0x0000018B, 0x0000018C, 
-            0x0000018D, 0x0000018E, 0x0000018F, 0x00000190, 0x00000191, 0x00000192, 0x00000193, 0x00000194, 
-            0x00000195, 0x00000196, 0x00000197
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 6.515625, 0.000000, 8.121094, 0.000000, 14.121094, 0.000000, 
-            24.861328, -0.451172, 24.996094, 0.000000, 30.996094, 0.000000, 41.871094, 0.000000, 
-            41.871094, 0.000000, 41.871094, 0.000000, 47.871094, 0.000000, 52.230469, 0.000000, 
-            60.949219, 0.000000, 60.949219, 0.000000, 71.824219, 0.000000, 77.824219, 0.000000, 
-            82.183594, 0.000000, 93.058594, 0.000000, 102.720703, -0.451172, 99.574219, 0.000000, 
-            105.574219, 0.000000, 109.933594, 0.000000, 117.902344, 0.000000, 127.564453, -0.451172, 
-            124.417969, 0.000000, 130.417969, 0.000000, 134.777344, 0.000000, 142.746094, 0.000000, 
-            150.011719, 0.000000, 150.011719, 0.000000, 157.980469, 0.000000, 161.636719, 0.000000, 
-            167.636719, 0.000000, 171.996094, 0.000000, 182.871094, 0.000000, 186.621094, 0.000000, 
-            186.621094, 0.000000, 196.283203, -0.451172, 191.613281, 0.439453, 193.136719, 0.000000, 
-            199.136719, 0.000000, 210.011719, 0.000000, 210.011719, 0.000000, 210.011719, 0.000000, 
-            217.980469, 0.000000, 221.730469, 0.000000, 221.730469, 0.000000, 232.605469, 0.000000, 
-            232.605469, 0.000000, 232.605469, 0.000000, 240.574219, 0.000000, 244.324219, 0.000000, 
-            244.324219, 0.000000, 255.199219, 0.000000, 255.199219, 0.000000, 255.199219, 0.000000, 
-            261.199219, 0.000000, 270.667969, 0.000000, 280.330078, -0.451172, 277.183594, 0.000000, 
-            283.183594, 0.000000, 292.652344, 0.000000, 302.314453, -0.451172, 299.167969, 0.000000, 
-            305.167969, 0.000000, 314.636719, 0.000000, 324.298828, -0.451172, 321.152344, 0.000000, 
-            327.152344, 0.000000, 338.027344, 0.000000, 344.783203, 0.263672, 348.902344, 0.000000, 
-            354.902344, 0.000000, 361.658203, 0.263672, 362.279297, 0.263672, 365.777344, 0.000000, 
-            365.777344, 0.000000, 365.777344, 0.000000, 371.777344, 0.000000, 378.533203, 0.263672, 
-            382.652344, 0.000000, 390.193359, 0.000000, 390.193359, 0.000000, 397.916016, -0.011719, 
-            401.068359, 0.000000, 408.609375, 0.000000, 408.609375, 0.000000, 415.365234, 0.263672, 
-            419.484375, 0.000000, 427.025391, 0.000000, 427.025391, 0.000000, 433.025391, 0.000000, 
-            440.748047, -0.011719, 440.929688, 0.263672, 443.900391, 0.000000, 443.900391, 0.000000, 
-            449.900391, 0.000000, 460.775391, 0.000000, 466.775391, 0.000000, 477.650391, 0.000000, 
-            483.650391, 0.000000, 494.390625, -0.451172, 494.525391, 0.000000, 500.525391, 0.000000, 
-            511.400391, 0.000000, 511.400391, 0.000000, 511.400391, 0.000000, 517.400391, 0.000000, 
-            528.275391, 0.000000, 528.275391, 0.000000, 531.457031, -0.451172, 528.275391, 0.000000, 
-            534.275391, 0.000000, 542.994141, 0.000000, 542.994141, 0.000000, 542.994141, 0.000000, 
-            542.994141, 0.000000, 553.869141, 0.000000, 559.869141, 0.000000, 565.869141, 0.000000, 
-            575.337891, 0.000000, 575.337891, 0.000000, 581.337891, 0.000000, 590.806641, 0.000000, 
-            596.806641, 0.000000, 609.597656, -0.451172, 606.275391, 0.000000, 612.275391, 0.000000, 
-            623.150391, 0.000000, 623.150391, 0.000000, 623.150391, 0.000000, 629.150391, 0.000000, 
-            640.025391, 0.000000, 640.025391, 0.000000, 643.207031, -0.451172, 640.025391, 0.000000, 
-            646.025391, 0.000000, 653.994141, 0.000000, 653.994141, 0.000000, 653.994141, 0.000000, 
-            653.994141, 0.000000, 664.869141, 0.000000, 670.869141, 0.000000, 678.773438, 0.263672, 
-            681.744141, 0.000000, 681.744141, 0.000000, 687.744141, 0.000000, 696.462891, 0.000000, 
-            696.462891, 0.000000, 704.367188, 0.263672, 707.337891, 0.000000, 707.337891, 0.000000, 
-            713.337891, 0.000000, 721.306641, 0.000000, 730.968750, -0.451172, 727.822266, 0.000000, 
-            733.822266, 0.000000, 742.541016, 0.000000, 742.541016, 0.000000, 753.416016, 0.000000, 
-            759.416016, 0.000000, 768.134766, 0.000000, 768.134766, 0.000000, 779.009766, 0.000000, 
-            785.009766, 0.000000, 793.728516, 0.000000, 793.728516, 0.000000, 804.603516, 0.000000, 
-            810.603516, 0.000000, 821.343750, -0.451172, 821.478516, 0.000000, 827.478516, 0.000000, 
-            836.197266, 0.000000, 836.197266, 0.000000, 836.197266, 0.000000, 836.197266, 0.000000, 
-            847.072266, 0.000000, 853.072266, 0.000000, 863.947266, 0.000000, 863.947266, 0.000000, 
-            867.128906, -0.451172, 863.947266, 0.000000, 869.947266, 0.000000, 875.876953, 0.000000, 
-            875.876953, 0.000000, 879.626953, 0.000000, 879.626953, 0.000000, 890.501953, 0.000000, 
-            896.501953, 0.000000, 903.064453, 0.000000, 903.064453, 0.000000, 903.064453, 0.000000, 
-            909.064453, 0.000000, 913.423828, 0.000000, 924.298828, 0.000000, 930.298828, 0.000000, 
-            934.658203, 0.000000, 942.626953, 0.000000, 948.626953, 0.000000, 955.142578, 0.000000, 
-            956.748047, 0.000000, 962.748047, 0.000000, 969.263672, 0.000000, 970.623047, 0.000000, 
-            976.623047, 0.000000, 983.378906, 0.263672, 983.853516, 0.164062, 987.498047, 0.000000, 
-            987.498047, 0.000000, 993.498047, 0.000000, 1000.875000, 0.263672, 1004.373047, 0.000000, 
-            1004.373047, 0.000000, 1004.373047, 0.000000, 1010.373047, 0.000000, 1021.113281, -0.451172, 
-            1021.248047, 0.000000, 1027.248047, 0.000000, 1034.947266, -0.011719, 1038.123047, 0.000000, 
-            1044.123047, 0.000000, 1050.878906, 0.263672, 1054.998047, 0.000000, 1060.998047, 0.000000, 
-            1068.966797, 0.000000, 1068.966797, 0.000000, 1075.529297, 0.000000, 1075.529297, 0.000000, 
-            1075.529297, 0.000000, 1081.529297, 0.000000, 1090.248047, 0.000000, 1090.248047, 0.000000, 
-            1098.216797, 0.000000, 1104.216797, 0.000000, 1115.091797, 0.000000, 1115.091797, 0.000000, 
-            1115.091797, 0.000000, 1121.091797, 0.000000, 1131.966797, 0.000000, 1131.966797, 0.000000, 
-            1131.164062, 0.275391, 1131.638672, 0.175781, 1131.966797, 0.000000, 1131.966797, 0.000000, 
-            1137.966797, 0.000000, 1144.529297, 0.000000, 1144.529297, 0.000000, 1144.529297, 0.000000, 
-            1150.458984, 0.000000, 1150.458984, 0.000000, 1154.208984, 0.000000, 1154.208984, 0.000000, 
-            1165.083984, 0.000000, 1171.083984, 0.000000, 1181.958984, 0.000000, 1181.958984, 0.000000, 
-            1181.958984, 0.000000, 1187.958984, 0.000000, 1196.677734, 0.000000, 1196.677734, 0.000000, 
-            1202.607422, 0.000000, 1202.607422, 0.000000, 1210.576172, 0.000000, 1216.576172, 0.000000, 
-            1224.544922, 0.000000, 1224.544922, 0.000000, 1224.544922, 0.000000, 1224.544922, 0.000000, 
-            1235.419922, 0.000000, 1241.419922, 0.000000, 1249.236328, 0.263672, 1252.294922, 0.000000, 
-            1252.294922, 0.000000, 1252.294922, 0.000000, 1258.294922, 0.000000, 1262.654297, 0.000000, 
-            1270.470703, 0.263672, 1273.529297, 0.000000, 1273.529297, 0.000000, 1273.529297, 0.000000, 
-            1279.529297, 0.000000, 1286.285156, 0.263672, 1287.345703, 0.263672, 1290.404297, 0.000000, 
-            1290.404297, 0.000000, 1290.404297, 0.000000, 1296.404297, 0.000000, 1300.763672, 0.000000, 
-            1311.638672, 0.000000, 1315.388672, 0.000000, 1315.388672, 0.000000, 1325.050781, -0.451172, 
-            1323.474609, -0.087891, 1321.904297, 0.000000, 1327.904297, 0.000000, 1332.263672, 0.000000, 
-            1338.767578, 0.439453, 1340.232422, 0.000000, 1348.201172, 0.000000, 1351.857422, 0.000000, 
-            1357.857422, 0.000000, 1362.216797, 0.000000, 1372.388672, 0.000000, 1372.388672, 0.000000, 
-            1372.388672, 0.000000, 1376.748047, 0.000000, 1386.919922, 0.000000, 1386.919922, 0.000000, 
-            1386.919922, 0.000000, 1391.279297, 0.000000, 1402.154297, 0.000000, 1408.154297, 0.000000, 
-            1416.123047, 0.000000, 1416.123047, 0.000000, 1426.998047, 0.000000, 1432.998047, 0.000000, 
-            1446.076172, 0.000000, 1446.076172, 0.000000, 1446.076172, 0.000000, 1452.076172, 0.000000, 
-            1460.044922, 0.000000, 1460.044922, 0.000000, 1471.294922, 0.000000, 1471.294922, 0.000000, 
-            1471.294922, 0.000000, 1477.294922, 0.000000, 1485.263672, 0.000000, 1485.263672, 0.000000, 
-            1496.138672, 0.000000, 1502.138672, 0.000000, 1510.107422, 0.000000, 1510.107422, 0.000000, 
-            1519.576172, 0.000000, 1525.576172, 0.000000, 1533.544922, 0.000000, 1533.544922, 0.000000, 
-            1543.013672, 0.000000, 1549.013672, 0.000000, 1556.982422, 0.000000, 1556.982422, 0.000000, 
-            1567.857422, 0.000000, 1567.857422, 0.000000, 1567.857422, 0.000000, 1573.857422, 0.000000, 
-            1581.826172, 0.000000, 1581.826172, 0.000000, 1590.544922, 0.000000, 1590.544922, 0.000000, 
-            1590.544922, 0.000000, 1590.544922, 0.000000, 1598.513672, 0.000000, 1604.513672, 0.000000, 
-            1612.482422, 0.000000, 1612.482422, 0.000000, 1621.201172, 0.000000, 1621.201172, 0.000000, 
-            1621.201172, 0.000000, 1621.201172, 0.000000, 1630.669922, 0.000000, 1636.669922, 0.000000, 
-            1641.029297, 0.000000, 1649.748047, 0.000000, 1649.748047, 0.000000, 1655.677734, 0.000000, 
-            1655.677734, 0.000000, 1663.939453, 0.263672, 1663.646484, 0.000000, 1663.646484, 0.000000, 
-            1669.646484, 0.000000, 1679.308594, -0.451172, 1676.162109, 0.000000, 1682.677734, 0.000000, 
-            1686.427734, 0.000000, 1686.427734, 0.000000, 1696.089844, -0.451172, 1692.943359, 0.000000, 
-            1698.943359, 0.000000, 1706.314453, 0.263672, 1709.818359, 0.000000, 1715.818359, 0.000000, 
-            1722.574219, 0.263672, 1726.693359, 0.000000, 1732.693359, 0.000000, 1740.392578, -0.011719, 
-            1743.568359, 0.000000, 1749.568359, 0.000000, 1757.291016, -0.011719, 1760.443359, 0.000000, 
-            1766.443359, 0.000000, 1774.376953, -0.011719, 1777.318359, 0.000000, 1783.318359, 0.000000, 
-            1791.738281, -0.439453, 1794.193359, 0.000000, 1800.193359, 0.000000, 1808.121094, 0.263672, 
-            1811.068359, 0.000000, 1817.068359, 0.000000, 1823.085938, -0.011719, 1825.037109, 0.000000, 
-            1831.037109, 0.000000, 1837.078125, -0.011719, 1839.005859, 0.000000, 1845.005859, 0.000000, 
-            1852.529297, 0.263672, 1852.974609, 0.000000, 1858.974609, 0.000000, 1865.941406, 0.263672, 
-            1866.943359, 0.000000, 1872.943359, 0.000000, 1879.294922, 0.263672, 1880.912109, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Japanese Han" script="hani" lang="JAN">
-        <test-font name="Arial Unicode.ttf" version="Version 1.01x" checksum="0x609C497F" rchecksum="0x63451FC0"/>
-
-        <test-text>中华人民共和国 台湾 中華人民共和國 臺灣</test-text>
-
-        <result-glyphs>
-            0x000020BC, 0x000025DD, 0x00002149, 0x00003EA0, 0x00002400, 0x0000271B, 0x0000298C, 0x00000003, 
-            0x0000267F, 0x0000410D, 0x00000003, 0x000020BC, 0x0000567E, 0x00002149, 0x00003EA0, 0x00002400, 
-            0x0000271B, 0x0000299A, 0x00000003, 0x00005489, 0x000042F2
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.000000, 0.000000, 24.000000, 0.000000, 36.000000, 0.000000, 
-            48.000000, 0.000000, 60.000000, 0.000000, 72.000000, 0.000000, 84.000000, 0.000000, 
-            87.333984, 0.000000, 99.333984, 0.000000, 111.333984, 0.000000, 114.667969, 0.000000, 
-            126.667969, 0.000000, 138.667969, 0.000000, 150.667969, 0.000000, 162.667969, 0.000000, 
-            174.667969, 0.000000, 186.667969, 0.000000, 198.667969, 0.000000, 202.001953, 0.000000, 
-            214.001953, 0.000000, 226.001953, 0.000000
-        </result-positions>
-    </test-case>
-<!-- known to fail in base JDK7, skip
-    <test-case id="Korean Han" script="hani" lang="KOR">
-        <test-font name="Arial Unicode.ttf" version="Version 1.01x" checksum="0x609C497F" rchecksum="0x63451FC0"/>
-
-        <test-text>中华人民共和国 台湾 中華人民共和國 臺灣</test-text>
-
-        <result-glyphs>
-            0x000020BC, 0x000025DD, 0x00002149, 0x00003EA0, 0x00002400, 0x0000271B, 0x0000298C, 0x00000003, 
-            0x0000267F, 0x0000410D, 0x00000003, 0x000020BC, 0x00007492, 0x00002149, 0x00003EA0, 0x00002400, 
-            0x0000271B, 0x0000299A, 0x00000003, 0x00005489, 0x000042F2
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.000000, 0.000000, 24.000000, 0.000000, 36.000000, 0.000000, 
-            48.000000, 0.000000, 60.000000, 0.000000, 72.000000, 0.000000, 84.000000, 0.000000, 
-            87.333984, 0.000000, 99.333984, 0.000000, 111.333984, 0.000000, 114.667969, 0.000000, 
-            126.667969, 0.000000, 138.667969, 0.000000, 150.667969, 0.000000, 162.667969, 0.000000, 
-            174.667969, 0.000000, 186.667969, 0.000000, 198.667969, 0.000000, 202.001953, 0.000000, 
-            214.001953, 0.000000, 226.001953, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-<!-- known to fail in base JDK7, skip
-    <test-case id="Traditional Han" script="hani" lang="ZHT">
-        <test-font name="Arial Unicode.ttf" version="Version 1.01x" checksum="0x609C497F" rchecksum="0x63451FC0"/>
-
-        <test-text>中华人民共和国 台湾 中華人民共和國 臺灣</test-text>
-
-        <result-glyphs>
-            0x000020BC, 0x000025DD, 0x00002149, 0x000079EB, 0x00002400, 0x0000271B, 0x0000298C, 0x00000003, 
-            0x00007677, 0x0000410D, 0x00000003, 0x000020BC, 0x00007E26, 0x00002149, 0x000079EB, 0x00002400, 
-            0x0000271B, 0x0000299A, 0x00000003, 0x00007D8F, 0x00007A97
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.000000, 0.000000, 24.000000, 0.000000, 36.000000, 0.000000, 
-            48.000000, 0.000000, 60.000000, 0.000000, 72.000000, 0.000000, 84.000000, 0.000000, 
-            87.333984, 0.000000, 99.333984, 0.000000, 111.333984, 0.000000, 114.667969, 0.000000, 
-            126.667969, 0.000000, 138.667969, 0.000000, 150.667969, 0.000000, 162.667969, 0.000000, 
-            174.667969, 0.000000, 186.667969, 0.000000, 198.667969, 0.000000, 202.001953, 0.000000, 
-            214.001953, 0.000000, 226.001953, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-<!-- known to fail in base JDK7, skip
-    <test-case id="Simplified Han" script="hani" lang="ZHS">
-        <test-font name="Arial Unicode.ttf" version="Version 1.01x" checksum="0x609C497F" rchecksum="0x63451FC0"/>
-
-        <test-text>中华人民共和国 台湾 中華人民共和國 臺灣</test-text>
-
-        <result-glyphs>
-            0x000020BC, 0x000025DD, 0x00002149, 0x000079EB, 0x00002400, 0x0000271B, 0x0000298C, 0x00000003, 
-            0x00007677, 0x00008886, 0x00000003, 0x000020BC, 0x0000567E, 0x00002149, 0x000079EB, 0x00002400, 
-            0x0000271B, 0x0000299A, 0x00000003, 0x00007D8F, 0x00007A97
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.000000, 0.000000, 24.000000, 0.000000, 36.000000, 0.000000, 
-            48.000000, 0.000000, 60.000000, 0.000000, 72.000000, 0.000000, 84.000000, 0.000000, 
-            87.333984, 0.000000, 99.333984, 0.000000, 111.333984, 0.000000, 114.667969, 0.000000, 
-            126.667969, 0.000000, 138.667969, 0.000000, 150.667969, 0.000000, 162.667969, 0.000000, 
-            174.667969, 0.000000, 186.667969, 0.000000, 198.667969, 0.000000, 202.001953, 0.000000, 
-            214.001953, 0.000000, 226.001953, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-    <test-case id="Deva locl Hindi" script="deva" lang="HIN">
-        <test-font name="TestFont1.otf" version="Version 001.000 " checksum="0x75B4A535" rchecksum="0x0004D80A"/>
-
-        <test-text>शङ़ु</test-text>
-
-        <result-glyphs>
-            0x00000002, 0x00000001, 0x00000006, 0x0000FFFF
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 7.572000, 0.000000, 15.108000, 0.000000, 15.108000, 0.000000, 
-            15.108000, 0.000000
-        </result-positions>
-    </test-case>
-
-<!-- known to fail in base JDK7, skip
-    <test-case id="Deva locl Marathi" script="deva" lang="MAR">
-        <test-font name="TestFont1.otf" version="Version 001.000 " checksum="0x75B4A535" rchecksum="0x0004D80A"/>
-
-        <test-text>शङ़ु</test-text>
-
-        <result-glyphs>
-            0x00000005, 0x00000001, 0x00000006, 0x0000FFFF
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 7.392000, 0.000000, 14.927999, 0.000000, 14.927999, 0.000000, 
-            14.927999, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-    <test-case id="Deva ZWJ" script="deva">
-        <test-font name="raghu.ttf" version="Original Version 1.00 (2005)" checksum="0x088DB135" rchecksum="0x00803FCE"/>
-
-        <test-text>क्ष र्क क्‍ष र्‍क</test-text>
-
-        <result-glyphs>
-            0x000000A2, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x00000080, 0x0000005B, 0x0000FFFF, 0x00000003, 
-            0x00000080, 0x00000051, 0x00000001, 0x0000009F, 0x00000003, 0x0000009A, 0x00000051, 0x00000001, 
-            0x00000080
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000006, 0x00000004, 0x00000005, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 10.875000, 0.000000, 10.875000, 0.000000, 10.875000, 0.000000, 
-            16.875000, 0.000000, 24.779297, 0.263672, 27.750000, 0.000000, 27.750000, 0.000000, 
-            33.750000, 0.000000, 44.490234, -0.451172, 44.625000, 0.000000, 44.625000, 0.000000, 
-            52.593750, 0.000000, 58.593750, 0.000000, 68.255859, -0.451172, 65.109375, 0.000000, 
-            65.109375, 0.000000, 75.984375, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Hangul" script="hang">
-        <test-font name="LucidaSansRegular.ttf" version="Version 1.20 - October 2000" checksum="0xF5D9BA6D" rchecksum="0x029B644F"/>
-
-        <test-text>마만만</test-text>
-
-        <result-glyphs>
-            0x00000000, 0x0000FFFF, 0x00000000, 0x0000FFFF, 0x0000FFFF, 0x00000000, 0x0000FFFF
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 9.000000, 0.000000, 9.000000, 0.000000, 18.000000, 0.000000, 
-            18.000000, 0.000000, 18.000000, 0.000000, 27.000000, 0.000000, 27.000000, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Hebrew Mark Test" script="hebr">
-        <test-font name="SBL_Hbrw.ttf" version="Version 1.51 Build 001" checksum="0x5126B325" rchecksum="0x00F5C25B"/>
-
-        <test-text>מָשְׁכֵנִיאַחֲרֶיךָנָּרוּצָההֱבִיאַנִיהַמֶּלֶךְחֲדָרָיונָגִילָהוְנִשְׂמְחָהבָּךְנַזְכִּירָהדֹדֶיךָמִיַּיִןמֵישָׁרִיםאֲהֵבוּךָ</test-text>
-
-        <result-glyphs>
-            0x0000FFFF, 0x00000055, 0x0000FFFF, 0x0000004B, 0x0000001D, 0x00000097, 0x00000021, 0x00000094, 
-            0x0000001B, 0x0000002D, 0x00000027, 0x00000096, 0x0000003A, 0x0000009A, 0x0000FFFF, 0x00000066, 
-            0x00000027, 0x00000097, 0x0000002F, 0x00000030, 0x00000096, 0x00000027, 0x00000099, 0x0000FFFF, 
-            0x00000051, 0x00000096, 0x0000002F, 0x0000FFFF, 0x00000055, 0x00000027, 0x00000098, 0x0000001F, 
-            0x0000009C, 0x0000001F, 0x00000021, 0x0000009A, 0x0000003A, 0x00000027, 0x00000096, 0x0000FFFF, 
-            0x00000056, 0x00000092, 0x00000024, 0x00000099, 0x00000031, 0x0000FFFF, 0x00000054, 0x0000009A, 
-            0x0000FFFF, 0x00000043, 0x00000021, 0x0000009A, 0x00000025, 0x00000092, 0x0000002F, 0x00000092, 
-            0x0000FFFF, 0x00000067, 0x00000096, 0x00000031, 0x00000092, 0x00000023, 0x00000021, 0x0000009A, 
-            0x0000002B, 0x00000027, 0x00000096, 0x0000001E, 0x0000009A, 0x00000031, 0x00000023, 0x00000027, 
-            0x0000009A, 0x0000003A, 0x0000009A, 0x0000001F, 0x00000094, 0x00000025, 0x0000FFFF, 0x00000054, 
-            0x00000098, 0x0000002B, 0x00000098, 0x0000FFFF, 0x0000005D, 0x00000099, 0x00000021, 0x00000027, 
-            0x00000096, 0x00000031, 0x00000099, 0x0000001B, 0x00000027, 0x00000096, 0x0000001D, 0x00000093, 
-            0x00000021, 0x00000021, 0x0000009A, 0x00000038, 0x0000FFFF, 0x0000004B, 0x0000003A, 0x0000009A, 
-            0x0000FFFF, 0x0000005E, 0x0000FFFF, 0x00000055, 0x00000027, 0x00000098, 0x0000003A, 0x00000094, 
-            0x00000025, 0x00000099, 0x0000001B, 0x00000027, 0x00000096, 0x00000031, 0x00000097, 0x00000029, 
-            0x00000092, 0x0000FFFF, 0x00000066, 0x0000009A, 0x0000002F
-        </result-glyphs>
-
-        <result-indices>
-            0x0000007C, 0x0000007B, 0x0000007A, 0x00000079, 0x00000078, 0x00000077, 0x00000076, 0x00000075, 
-            0x00000074, 0x00000073, 0x00000072, 0x00000071, 0x00000070, 0x0000006F, 0x0000006E, 0x0000006D, 
-            0x0000006C, 0x0000006B, 0x0000006A, 0x00000069, 0x00000068, 0x00000067, 0x00000066, 0x00000065, 
-            0x00000064, 0x00000063, 0x00000062, 0x00000061, 0x00000060, 0x0000005F, 0x0000005E, 0x0000005D, 
-            0x0000005C, 0x0000005B, 0x0000005A, 0x00000059, 0x00000058, 0x00000057, 0x00000056, 0x00000055, 
-            0x00000054, 0x00000053, 0x00000052, 0x00000051, 0x00000050, 0x0000004F, 0x0000004E, 0x0000004D, 
-            0x0000004C, 0x0000004B, 0x0000004A, 0x00000049, 0x00000048, 0x00000047, 0x00000046, 0x00000045, 
-            0x00000044, 0x00000043, 0x00000042, 0x00000041, 0x00000040, 0x0000003F, 0x0000003E, 0x0000003D, 
-            0x0000003C, 0x0000003B, 0x0000003A, 0x00000039, 0x00000038, 0x00000037, 0x00000036, 0x00000035, 
-            0x00000034, 0x00000033, 0x00000032, 0x00000031, 0x00000030, 0x0000002F, 0x0000002E, 0x0000002D, 
-            0x0000002C, 0x0000002B, 0x0000002A, 0x00000029, 0x00000028, 0x00000027, 0x00000026, 0x00000025, 
-            0x00000024, 0x00000023, 0x00000022, 0x00000021, 0x00000020, 0x0000001F, 0x0000001E, 0x0000001D, 
-            0x0000001C, 0x0000001B, 0x0000001A, 0x00000019, 0x00000018, 0x00000017, 0x00000016, 0x00000015, 
-            0x00000014, 0x00000013, 0x00000012, 0x00000011, 0x00000010, 0x0000000F, 0x0000000E, 0x0000000D, 
-            0x0000000C, 0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 
-            0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 0.000000, 0.000000, 5.806641, 0.000000, 5.806641, 0.000000, 
-            9.087891, 0.000000, 18.679688, 0.000000, 15.251953, 0.000000, 25.365234, 0.000000, 
-            21.878906, 0.000000, 28.787109, 0.000000, 35.191406, 0.000000, 42.966797, 0.000000, 
-            38.279297, 0.000000, 47.982422, 0.000000, 44.085938, 0.000000, 44.085938, 0.000000, 
-            52.347656, 0.000000, 58.453125, 0.000000, 55.113281, 0.000000, 62.021484, 0.000000, 
-            66.292969, 0.000000, 64.886719, 0.000000, 69.292969, 0.000000, 67.886719, 0.000000, 
-            67.886719, 0.000000, 74.050781, 0.000000, 70.710938, 0.000000, 77.619141, 0.000000, 
-            77.619141, 0.000000, 83.425781, 0.000000, 90.527344, 0.000000, 86.513672, 0.000000, 
-            91.804688, 0.000000, 92.390625, 0.000000, 98.267578, 0.000000, 109.347656, 0.000000, 
-            104.894531, 0.000000, 110.701172, 0.000000, 116.250000, 0.000000, 113.701172, 0.000000, 
-            113.554688, 0.000000, 121.242188, 0.000000, 119.484375, 0.000000, 124.552734, 0.000000, 
-            122.677734, 0.000000, 126.679688, 0.000000, 126.679688, 0.000000, 135.210938, 0.000000, 
-            132.486328, 0.000000, 132.251953, 0.000000, 138.416016, 0.000000, 148.734375, 0.000000, 
-            145.042969, 0.000000, 155.308594, 0.000000, 151.968750, 0.000000, 162.773438, 0.000000, 
-            158.876953, 0.000000, 158.876953, 0.000000, 168.398438, 0.000000, 166.523438, 0.000000, 
-            172.546875, 0.000000, 170.525391, 0.000000, 173.689453, 0.000000, 182.718750, 0.000000, 
-            180.199219, 0.000000, 185.583984, 0.000000, 190.107422, 0.000000, 187.998047, 0.000000, 
-            194.132812, 0.000000, 192.257812, 0.000000, 196.259766, 0.000000, 199.423828, 0.000000, 
-            206.964844, 0.000000, 202.511719, 0.000000, 212.332031, 0.000000, 208.318359, 0.000000, 
-            217.886719, 0.000000, 214.195312, 0.000000, 221.121094, 0.000000, 221.121094, 0.000000, 
-            229.447266, 0.000000, 226.927734, 0.000000, 235.652344, 0.000000, 232.312500, 0.000000, 
-            232.312500, 0.000000, 242.648438, 0.000000, 239.220703, 0.000000, 245.847656, 0.000000, 
-            250.195312, 0.000000, 248.320312, 0.000000, 255.808594, 0.000000, 252.322266, 0.000000, 
-            259.230469, 0.000000, 265.042969, 0.000000, 262.083984, 0.000000, 271.675781, 0.000000, 
-            268.248047, 0.000000, 274.875000, 0.000000, 284.197266, 0.000000, 281.501953, 0.000000, 
-            287.250000, 0.000000, 287.250000, 0.000000, 290.531250, 0.000000, 298.212891, 0.000000, 
-            296.337891, 0.000000, 296.337891, 0.000000, 300.339844, 0.000000, 300.339844, 0.000000, 
-            306.146484, 0.000000, 313.687500, 0.000000, 309.234375, 0.000000, 318.732422, 0.000000, 
-            315.041016, 0.000000, 325.453125, 0.000000, 321.966797, 0.000000, 328.875000, 0.000000, 
-            333.222656, 0.000000, 331.347656, 0.000000, 338.044922, 0.000000, 335.349609, 0.000000, 
-            345.175781, 0.000000, 341.279297, 0.000000, 341.279297, 0.000000, 352.558594, 0.000000, 
-            349.218750, 0.000000, 356.126953, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Not Language Specific" script="latn">
-        <test-font name="fp9r8a.otf" version="Version 0.9.6 " checksum="0x62C6805F" rchecksum="0x00813376"/>
-
-        <test-text>Ţhiş iş a ţeşţ.</test-text>
-
-        <result-glyphs>
-            0x00000107, 0x00000049, 0x0000004A, 0x00000104, 0x00000001, 0x0000004A, 0x00000104, 0x00000001, 
-            0x00000042, 0x00000001, 0x00000108, 0x00000046, 0x00000104, 0x00000108, 0x0000000F
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 7.356000, 0.000000, 14.340000, 0.000000, 17.832001, 0.000000, 
-            22.920000, 0.000000, 25.920000, 0.000000, 29.412001, 0.000000, 34.500000, 0.000000, 
-            37.500000, 0.000000, 43.500000, 0.000000, 46.500000, 0.000000, 50.411999, 0.000000, 
-            56.160000, 0.000000, 61.248001, 0.000000, 65.160004, 0.000000, 68.160004, 0.000000
-        </result-positions>
-    </test-case>
-
-<!-- known to fail in base JDK7, skip ('lang' not supported)
-    <test-case id="Romanian Language Specific" script="latn" lang="ROM">
-        <test-font name="fp9r8a.otf" version="Version 0.9.6 " checksum="0x62C6805F" rchecksum="0x00813376"/>
-
-        <test-text>Ţhiş iş a ţeşţ.</test-text>
-
-        <result-glyphs>
-            0x00000127, 0x00000049, 0x0000004A, 0x00000126, 0x00000001, 0x0000004A, 0x00000126, 0x00000001, 
-            0x00000042, 0x00000001, 0x00000128, 0x00000046, 0x00000126, 0x00000128, 0x0000000F
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 7.356000, 0.000000, 14.340000, 0.000000, 17.832001, 0.000000, 
-            22.920000, 0.000000, 25.920000, 0.000000, 29.412001, 0.000000, 34.500000, 0.000000, 
-            37.500000, 0.000000, 43.500000, 0.000000, 46.500000, 0.000000, 50.411999, 0.000000, 
-            56.160000, 0.000000, 61.248001, 0.000000, 65.160004, 0.000000, 68.160004, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-    <test-case id="Nafees Nastaleeq Cursive Positioning Test" script="arab">
-        <test-font name="Nafees Nastaleeq v1.02.ttf" version="Version 1.02" checksum="0x1BD85538" rchecksum="0x0111F234"/>
-
-        <test-text>فتح بینچ خلیج شیخ پہنچ</test-text>
-
-        <result-glyphs>
-            0x0000003B, 0x00000344, 0x000001D5, 0x00000318, 0x00000349, 0x0000007C, 0x00000003, 0x0000003D, 
-            0x00000348, 0x000001D5, 0x00000346, 0x000000B5, 0x00000003, 0x0000003A, 0x00000348, 0x000001D5, 
-            0x000002E3, 0x00000344, 0x00000087, 0x00000003, 0x0000003B, 0x00000344, 0x000001D5, 0x00000348, 
-            0x000001E5, 0x00000347, 0x0000006E, 0x00000003, 0x0000003C, 0x00000345, 0x000001D5, 0x00000344, 
-            0x0000011D
-        </result-glyphs>
-
-        <result-indices>
-            0x00000015, 0x00000014, 0x00000014, 0x00000013, 0x00000012, 0x00000012, 0x00000011, 0x00000010, 
-            0x0000000F, 0x0000000F, 0x0000000E, 0x0000000E, 0x0000000D, 0x0000000C, 0x0000000B, 0x0000000B, 
-            0x0000000A, 0x00000009, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000006, 0x00000005, 
-            0x00000005, 0x00000004, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 
-            0x00000000
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 3.205078, -11.097656, 1.406250, 0.000000, 4.558594, -1.376953, 
-            9.421875, -5.273438, 7.505859, -6.843750, 11.537109, 0.000000, 12.726562, 0.000000, 
-            20.455078, -4.798828, 15.357422, 0.000000, 19.289062, -13.072266, 18.509766, -1.376953, 
-            22.552734, 0.000000, 23.742188, 0.000000, 30.246094, -4.798828, 25.148438, 0.000000, 
-            28.300781, -1.376953, 32.917969, -13.792969, 30.158203, -7.792969, 35.208984, 0.000000, 
-            36.398438, 0.000000, 39.603516, -11.097656, 37.804688, 0.000000, 45.632812, 3.181641, 
-            40.957031, -1.376953, 44.853516, -6.046875, 42.457031, -5.572266, 46.066406, 0.000000, 
-            47.255859, 0.000000, 49.376953, -11.396484, 48.662109, 0.000000, 52.769531, -14.332031, 
-            51.814453, -1.376953, 56.789062, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Malayalam Samvruthokaram Test" script="mlym">
-        <test-font name="lohit_ml.ttf" version="Version 1.00" checksum="0x66CB0B82" rchecksum="0x002EEBD8"/>
-
-        <test-text>ണു്</test-text>
-
-        <result-glyphs>
-            0x00000023, 0x0000003C, 0x00000045
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 15.117188, 0.000000, 18.503906, 0.000000, 18.503906, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Broken Font Test" script="hani" lang="ZHT">
-        <test-font name="BMIN00M.TTF" version="Version 2.00" checksum="0xF16BE0C6" rchecksum="0x15E106D0"/>
-
-        <test-text>中華人民共和國 臺灣</test-text>
-
-        <result-glyphs>
-            0x00000292, 0x000024E8, 0x000002D1, 0x00001582, 0x000004A1, 0x00000650, 0x000007E2, 0x00000021, 
-            0x00002395, 0x00001896
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.000000, 0.000000, 24.000000, 0.000000, 36.000000, 0.000000, 
-            48.000000, 0.000000, 60.000000, 0.000000, 72.000000, 0.000000, 84.000000, 0.000000, 
-            90.000000, 0.000000, 102.000000, 0.000000, 114.000000, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Telugu Syllable Boundary Test" script="telu">
-        <test-font name="gautami.ttf" version="Version 5.02" checksum="0x45C66919" rchecksum="0x00DBFA1A"/>
-
-        <test-text>ప్రకాష్</test-text>
-
-        <result-glyphs>
-            0x00000057, 0x0000023B, 0x0000FFFF, 0x00000125, 0x00000066, 0x00000241, 0x0000FFFF
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x00000004, 0x00000005, 0x00000006
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 8.285156, 0.000000, 14.894531, 0.000000, 14.894531, 0.000000, 
-            21.503906, 0.000000, 25.136719, 0.000000, 33.421875, 0.000000, 33.421875, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Angsana New Mark Test" script="thai">
-        <test-font name="ANGSA.TTF" version="Version 5.00" checksum="0x95F16337" rchecksum="0x00724BC4"/>
-
-        <test-text>บทที่๑พายุไซโคลนโดโรธีอาศัยอยู่ท่ามกลางทุ่งใหญ่ในแคนซัสกับลุงเฮนรีชาวไร่และป้าเอ็มภรรยาชาวไร่บ้านของพวกเขาหลังเล็กเพราะไม้สร้างบ้านต้องขนมาด้วยเกวียนเป็นระยะทางหลายไมล์</test-text>
-
-        <result-glyphs>
-            0x0000009D, 0x0000009A, 0x0000009A, 0x000000B8, 0x000000C9, 0x000000D2, 0x000000A1, 0x000000B5, 
-            0x000000A5, 0x000000BB, 0x000000C5, 0x0000008E, 0x000000C3, 0x00000087, 0x000000A8, 0x0000009C, 
-            0x000000C3, 0x00000097, 0x000000C3, 0x000000A6, 0x0000009B, 0x000000B8, 0x000000B0, 0x000000B5, 
-            0x000000AB, 0x000000B4, 0x000000A5, 0x000000B0, 0x000000A5, 0x000000BC, 0x0000006E, 0x0000009A, 
-            0x0000006E, 0x000000B5, 0x000000A4, 0x00000084, 0x000000A8, 0x000000B5, 0x0000008A, 0x0000009A, 
-            0x000000BB, 0x0000006E, 0x0000008A, 0x000000C4, 0x000000AE, 0x00000090, 0x0000006E, 0x000000C4, 
-            0x0000009C, 0x000000C2, 0x00000087, 0x0000009C, 0x0000008E, 0x000000B4, 0x000000AD, 0x00000084, 
-            0x000000B4, 0x0000009D, 0x000000A8, 0x000000BB, 0x0000008A, 0x000000C1, 0x000000B1, 0x0000009C, 
-            0x000000A6, 0x000000B8, 0x0000008D, 0x000000B5, 0x000000AA, 0x000000C5, 0x000000A6, 0x0000006E, 
-            0x000000C2, 0x000000A8, 0x000000B3, 0x0000009E, 0x0000006F, 0x000000B5, 0x000000C1, 0x000000B0, 
-            0x000000C8, 0x000000A4, 0x000000A3, 0x000000A6, 0x000000A6, 0x000000A5, 0x000000B5, 0x0000008D, 
-            0x000000B5, 0x000000AA, 0x000000C5, 0x000000A6, 0x0000006E, 0x0000009D, 0x0000006F, 0x000000B5, 
-            0x0000009C, 0x00000085, 0x000000B0, 0x0000008A, 0x000000A1, 0x000000AA, 0x00000084, 0x000000C1, 
-            0x00000085, 0x000000B5, 0x000000AE, 0x000000A8, 0x000000B4, 0x0000008A, 0x000000C1, 0x000000A8, 
-            0x000000C8, 0x00000084, 0x000000C1, 0x000000A1, 0x000000A6, 0x000000B5, 0x000000B3, 0x000000C5, 
-            0x000000A4, 0x0000006F, 0x000000AD, 0x000000A6, 0x0000006F, 0x000000B5, 0x0000008A, 0x0000009D, 
-            0x0000006F, 0x000000B5, 0x0000009C, 0x00000098, 0x0000006F, 0x000000B0, 0x0000008A, 0x00000085, 
-            0x0000009C, 0x000000A4, 0x000000B5, 0x00000097, 0x0000006F, 0x000000AA, 0x000000A5, 0x000000C1, 
-            0x00000084, 0x000000AA, 0x000000B8, 0x000000A5, 0x0000009C, 0x000000C1, 0x0000009E, 0x000000C8, 
-            0x0000009C, 0x000000A6, 0x000000B3, 0x000000A5, 0x000000B3, 0x0000009A, 0x000000B5, 0x0000008A, 
-            0x000000AE, 0x000000A8, 0x000000B5, 0x000000A5, 0x000000C5, 0x000000A4, 0x000000A8, 0x00000072
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 0x0000001E, 0x0000001F, 
-            0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 
-            0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E, 0x0000002F, 
-            0x00000030, 0x00000031, 0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 
-            0x00000038, 0x00000039, 0x0000003A, 0x0000003B, 0x0000003C, 0x0000003D, 0x0000003E, 0x0000003F, 
-            0x00000040, 0x00000041, 0x00000042, 0x00000043, 0x00000044, 0x00000045, 0x00000046, 0x00000047, 
-            0x00000048, 0x00000049, 0x0000004A, 0x0000004B, 0x0000004C, 0x0000004D, 0x0000004E, 0x0000004F, 
-            0x00000050, 0x00000051, 0x00000052, 0x00000053, 0x00000054, 0x00000055, 0x00000056, 0x00000057, 
-            0x00000058, 0x00000059, 0x0000005A, 0x0000005B, 0x0000005C, 0x0000005D, 0x0000005E, 0x0000005F, 
-            0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066, 0x00000067, 
-            0x00000068, 0x00000069, 0x0000006A, 0x0000006B, 0x0000006C, 0x0000006D, 0x0000006E, 0x0000006F, 
-            0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 0x00000075, 0x00000076, 0x00000077, 
-            0x00000078, 0x00000079, 0x0000007A, 0x0000007B, 0x0000007C, 0x0000007D, 0x0000007E, 0x0000007F, 
-            0x00000080, 0x00000081, 0x00000082, 0x00000083, 0x00000084, 0x00000085, 0x00000086, 0x00000087, 
-            0x00000088, 0x00000089, 0x0000008A, 0x0000008B, 0x0000008C, 0x0000008D, 0x0000008E, 0x0000008F, 
-            0x00000090, 0x00000091, 0x00000092, 0x00000093, 0x00000094, 0x00000095, 0x00000096, 0x00000097, 
-            0x00000098, 0x00000099, 0x0000009A, 0x0000009B, 0x0000009C, 0x0000009D, 0x0000009E, 0x0000009F, 
-            0x000000A0, 0x000000A1, 0x000000A2, 0x000000A3, 0x000000A4, 0x000000A5, 0x000000A6, 0x000000A7
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 5.399414, 0.000000, 10.798828, 0.000000, 15.072266, 0.000000, 
-            15.072266, 0.000000, 16.198242, 0.000000, 21.046875, 0.000000, 26.616211, 0.000000, 
-            30.035156, 0.000000, 31.312500, 0.000000, 34.151367, 0.000000, 38.279297, 0.000000, 
-            43.558594, 0.000000, 47.663086, 0.000000, 52.438477, 0.000000, 57.178711, 0.000000, 
-            62.698242, 0.000000, 66.802734, 0.000000, 71.601562, 0.000000, 75.706055, 0.000000, 
-            79.810547, 0.000000, 84.029297, 0.000000, 84.369141, 0.000000, 89.097656, 0.000000, 
-            92.516602, 0.000000, 97.614258, 0.000000, 97.195312, 0.000000, 101.311523, 0.000000, 
-            106.040039, 0.000000, 107.375977, 0.000000, 108.326172, -0.084961, 110.156250, 0.000000, 
-            113.497070, -0.084961, 115.555664, 0.000000, 118.974609, 0.000000, 124.013672, 0.000000, 
-            128.765625, 0.000000, 133.505859, 0.000000, 136.924805, 0.000000, 140.704102, 0.000000, 
-            143.036133, 0.000000, 144.044922, -0.084961, 146.103516, 0.000000, 149.882812, 0.000000, 
-            153.553711, 0.000000, 159.158203, 0.000000, 163.377930, -0.084961, 165.421875, 0.000000, 
-            169.092773, 0.000000, 174.612305, 0.000000, 179.135742, 0.000000, 183.911133, 0.000000, 
-            189.430664, 0.000000, 194.879883, 0.000000, 194.709961, 0.000000, 199.989258, 0.000000, 
-            204.092773, -0.084961, 204.741211, 0.000000, 210.140625, 0.000000, 212.828125, 0.000000, 
-            214.880859, 0.000000, 218.660156, 0.000000, 220.675781, 0.000000, 225.128906, 0.000000, 
-            230.648438, 0.000000, 234.105469, 0.000000, 234.752930, 0.000000, 239.613281, 0.000000, 
-            243.032227, 0.000000, 247.280273, 0.000000, 251.408203, 0.000000, 253.932617, -0.084961, 
-            255.512695, 0.000000, 260.036133, 0.000000, 264.776367, 0.000000, 269.071289, 0.000000, 
-            272.704102, 0.000000, 274.470703, 0.000000, 277.889648, 0.000000, 279.905273, 0.000000, 
-            284.768555, 0.000000, 284.633789, 0.000000, 289.672852, 0.000000, 294.641602, 0.000000, 
-            298.746094, 0.000000, 302.850586, 0.000000, 306.966797, 0.000000, 310.385742, 0.000000, 
-            315.246094, 0.000000, 318.665039, 0.000000, 322.913086, 0.000000, 327.041016, 0.000000, 
-            329.565430, -0.084961, 331.145508, 0.000000, 335.911133, 0.000000, 336.544922, 0.000000, 
-            339.963867, 0.000000, 345.483398, 0.000000, 350.258789, 0.000000, 354.987305, 0.000000, 
-            358.766602, 0.000000, 364.335938, 0.000000, 368.583984, 0.000000, 373.335938, 0.000000, 
-            375.351562, 0.000000, 380.126953, 0.000000, 383.545898, 0.000000, 389.150391, 0.000000, 
-            394.306641, 0.000000, 393.890625, 0.000000, 397.669922, 0.000000, 399.685547, 0.000000, 
-            404.548828, 0.000000, 404.425781, 0.000000, 409.177734, 0.000000, 411.193359, 0.000000, 
-            416.762695, 0.000000, 420.867188, 0.000000, 424.286133, 0.000000, 428.581055, 0.000000, 
-            432.708984, 0.000000, 438.123047, 0.000000, 437.748047, 0.000000, 443.027344, 0.000000, 
-            446.976562, 0.000000, 447.131836, 0.000000, 450.550781, 0.000000, 454.330078, 0.000000, 
-            459.095703, 0.000000, 459.729492, 0.000000, 463.148438, 0.000000, 468.667969, 0.000000, 
-            473.847656, 0.000000, 473.478516, 0.000000, 478.207031, 0.000000, 481.986328, 0.000000, 
-            486.761719, 0.000000, 492.281250, 0.000000, 497.320312, 0.000000, 500.739258, 0.000000, 
-            505.860352, 0.000000, 505.538086, 0.000000, 509.786133, 0.000000, 513.902344, 0.000000, 
-            515.917969, 0.000000, 520.669922, 0.000000, 523.947266, 0.000000, 524.917969, 0.000000, 
-            529.034180, 0.000000, 534.553711, 0.000000, 536.569336, 0.000000, 540.846680, 0.000000, 
-            541.968750, 0.000000, 547.488281, 0.000000, 551.592773, 0.000000, 555.887695, 0.000000, 
-            560.003906, 0.000000, 564.298828, 0.000000, 569.698242, 0.000000, 573.117188, 0.000000, 
-            576.896484, 0.000000, 582.500977, 0.000000, 587.241211, 0.000000, 590.660156, 0.000000, 
-            594.776367, 0.000000, 598.904297, 0.000000, 603.943359, 0.000000, 608.894531, 0.000000, 
-            608.683594, 0.000000
-        </result-positions>
-    </test-case>
-
-<!-- known to fail in base JDK7, skip  (come back to this later)
-    <test-case id="Sinhala Al-Lakuna Test" script="sinh">
-        <test-font name="lklug.hj.ttf" version="Version 0.6 " checksum="0xA190C2F4" rchecksum="0x00922218"/>
-
-        <test-text>ක්‍රෙ ක්‍යෙ ක්‍ෂෙ ක්‍ෂ්‍යෙ ක්ෂෙ කර්‍මෙ ස්ට්‍රේ ස‍්සෙ ස්ස</test-text>
-
-        <result-glyphs>
-            0x0000004A, 0x000001D5, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x0000004A, 0x00000018, 
-            0x0000008B, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x0000004A, 0x0000008A, 0x0000FFFF, 0x0000FFFF, 
-            0x0000FFFF, 0x00000003, 0x0000004A, 0x0000008A, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000008B, 
-            0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000001D6, 0x0000FFFF, 0x0000004A, 0x0000003C, 0x00000003, 
-            0x00000018, 0x0000004A, 0x000001F8, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000A9, 
-            0x0000FFFF, 0x0000004A, 0x0000007A, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000003, 
-            0x0000004A, 0x00000203, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x00000003, 0x000000A9, 0x0000FFFF, 
-            0x0000003D
-        </result-glyphs>
-
-        <result-indices>
-            0x00000004, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000005, 0x0000000A, 0x00000006, 
-            0x00000007, 0x00000008, 0x00000009, 0x0000000B, 0x00000010, 0x0000000C, 0x0000000D, 0x0000000E, 
-            0x0000000F, 0x00000011, 0x00000019, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 
-            0x00000017, 0x00000018, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001E, 0x0000001D, 0x0000001F, 
-            0x00000020, 0x00000025, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000026, 0x00000027, 
-            0x00000028, 0x0000002D, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E, 
-            0x00000033, 0x0000002F, 0x00000030, 0x00000031, 0x00000032, 0x00000034, 0x00000035, 0x00000036, 
-            0x00000037
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 8.520000, 0.000000, 19.224001, 0.000000, 19.224001, 0.000000, 
-            19.224001, 0.000000, 19.224001, 0.000000, 26.640001, 0.000000, 35.160004, 0.000000, 
-            45.864006, 0.000000, 51.936005, 0.000000, 51.936005, 0.000000, 51.936005, 0.000000, 
-            59.352005, 0.000000, 67.872009, 0.000000, 82.704010, 0.000000, 82.704010, 0.000000, 
-            82.704010, 0.000000, 82.704010, 0.000000, 90.120010, 0.000000, 98.640015, 0.000000, 
-            113.472015, 0.000000, 113.472015, 0.000000, 113.472015, 0.000000, 113.472015, 0.000000, 
-            119.544014, 0.000000, 119.544014, 0.000000, 119.544014, 0.000000, 126.960014, 0.000000, 
-            137.664017, 0.000000, 137.664017, 0.000000, 146.184021, 0.000000, 154.296021, 0.000000, 
-            161.712021, 0.000000, 172.416016, 0.000000, 180.936020, 0.000000, 189.552017, 0.000000, 
-            189.552017, 0.000000, 189.552017, 0.000000, 189.552017, 0.000000, 196.968018, 0.000000, 
-            205.584015, 0.000000, 205.584015, 0.000000, 214.104019, 0.000000, 222.720016, 0.000000, 
-            222.720016, 0.000000, 222.720016, 0.000000, 222.720016, 0.000000, 222.720016, 0.000000, 
-            230.136017, 0.000000, 238.656021, 0.000000, 254.784027, 0.000000, 254.784027, 0.000000, 
-            254.784027, 0.000000, 254.784027, 0.000000, 262.200012, 0.000000, 270.816010, 0.000000, 
-            270.816010, 0.000000, 279.432007, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-    <test-case id="Arabic Presentation Forms LRO Test" script="arab">
-        <test-font name="trado.ttf" version="Version 1.01" checksum="0x7B68B462" rchecksum="0x00708871"/>
-
-        <test-text>‭ﻲﺑﺮﻌﻟﺎﺑ</test-text>
-
-        <result-glyphs>
-            0x0000FFFF, 0x00000206, 0x000001A5, 0x000001C2, 0x000001E0, 0x000001F3, 0x000001A2, 0x000001A5
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 0.000000, 0.000000, 5.759766, 0.000000, 7.980469, 0.000000, 
-            11.748047, 0.000000, 15.298828, 0.000000, 17.302734, 0.000000, 19.763672, 0.000000, 
-            21.984375, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Arabic Presentation Forms No LRO Test" script="arab">
-        <test-font name="trado.ttf" version="Version 1.01" checksum="0x7B68B462" rchecksum="0x00708871"/>
-
-        <test-text>ﻲﺑﺮﻌﻟﺎﺑ</test-text>
-
-        <result-glyphs>
-            0x000001A5, 0x000001A2, 0x000001F3, 0x000001E0, 0x000001C2, 0x000001A5, 0x00000206
-        </result-glyphs>
-
-        <result-indices>
-            0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 2.220703, 0.000000, 4.681641, 0.000000, 6.685547, 0.000000, 
-            10.236328, 0.000000, 14.003906, 0.000000, 16.224609, 0.000000, 21.984375, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Canonical Char Indices Test" script="latn">
-        <test-font name="arial.ttf" version="Version 5.01.2x" checksum="0x92F28CF6" rchecksum="0x02CF4C8A"/>
-
-        <test-text>ḤḤ</test-text>
-
-        <result-glyphs>
-            0x000009A3, 0x000009A3
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 8.666016, 0.000000, 17.332031, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="REPH ZWNJ Test" script="deva">
-        <test-font name="raghu.ttf" version="Original Version 1.00 (2005)" checksum="0x088DB135" rchecksum="0x00803FCE"/>
-
-        <test-text>र्य र्‌य</test-text>
-
-        <result-glyphs>
-            0x00000099, 0x0000005B, 0x0000FFFF, 0x00000003, 0x0000009A, 0x00000051, 0x00000001, 0x00000099
-        </result-glyphs>
-
-        <result-indices>
-            0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 9.726562, 0.263672, 9.468750, 0.000000, 9.468750, 0.000000, 
-            15.468750, 0.000000, 25.130859, -0.451172, 21.984375, 0.000000, 21.984375, 0.000000, 
-            31.453125, 0.000000
-        </result-positions>
-    </test-case>
-
-<!-- known to fail in base JDK7, skip  ( won't load, 'bad font name' )
-    <test-case id="AppleChancery mort" script="latn">
-        <test-font name="Apple Chancery.ttf" version="6.1d4e1" checksum="0xC01C5902" rchecksum="0x014278BD"/>
-
-        <test-text>The quick brown fox jumps over the lazy dog. • Jackdaws love my big sphinx of quartz</test-text>
-
-        <result-glyphs>
-            0x00000157, 0x0000FFFF, 0x00000048, 0x00000003, 0x00000054, 0x00000058, 0x0000004C, 0x00000046, 
-            0x0000004E, 0x00000003, 0x00000045, 0x00000055, 0x00000052, 0x0000005A, 0x00000051, 0x00000003, 
-            0x00000049, 0x00000052, 0x0000005B, 0x00000003, 0x0000004D, 0x00000058, 0x00000050, 0x00000053, 
-            0x00000056, 0x00000003, 0x00000052, 0x00000059, 0x00000048, 0x00000055, 0x00000003, 0x00000152, 
-            0x0000FFFF, 0x00000048, 0x00000003, 0x0000004F, 0x00000044, 0x0000005D, 0x0000005C, 0x00000003, 
-            0x00000047, 0x00000052, 0x0000004A, 0x00000011, 0x00000003, 0x00000087, 0x00000003, 0x0000002D, 
-            0x00000044, 0x00000046, 0x0000004E, 0x00000047, 0x00000044, 0x0000005A, 0x00000056, 0x00000003, 
-            0x0000004F, 0x00000052, 0x00000059, 0x00000048, 0x00000003, 0x00000050, 0x0000005C, 0x00000003, 
-            0x00000045, 0x0000004C, 0x0000004A, 0x00000003, 0x00000056, 0x00000053, 0x0000004B, 0x0000004C, 
-            0x00000051, 0x0000005B, 0x00000003, 0x00000052, 0x00000049, 0x00000003, 0x00000054, 0x00000058, 
-            0x00000044, 0x00000055, 0x00000057, 0x0000005D
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 0x0000001E, 0x0000001F, 
-            0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 
-            0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E, 0x0000002F, 
-            0x00000030, 0x00000031, 0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 
-            0x00000038, 0x00000039, 0x0000003A, 0x0000003B, 0x0000003C, 0x0000003D, 0x0000003E, 0x0000003F, 
-            0x00000040, 0x00000041, 0x00000042, 0x00000043, 0x00000044, 0x00000045, 0x00000046, 0x00000047, 
-            0x00000048, 0x00000049, 0x0000004A, 0x0000004B, 0x0000004C, 0x0000004D, 0x0000004E, 0x0000004F, 
-            0x00000050, 0x00000051, 0x00000052, 0x00000053
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 13.523438, 0.000000, 13.523438, 0.000000, 17.982422, 0.000000, 
-            21.316406, 0.000000, 27.134766, 0.000000, 33.861328, 0.000000, 37.412109, 0.000000, 
-            42.005859, 0.000000, 47.554688, 0.000000, 50.888672, 0.000000, 56.707031, 0.000000, 
-            61.705078, 0.000000, 66.849609, 0.000000, 74.378906, 0.000000, 81.152344, 0.000000, 
-            84.486328, 0.000000, 88.230469, 0.000000, 93.375000, 0.000000, 99.386719, 0.000000, 
-            102.720703, 0.000000, 105.914062, 0.000000, 112.640625, 0.000000, 122.109375, 0.000000, 
-            128.080078, 0.000000, 132.345703, 0.000000, 135.679688, 0.000000, 140.824219, 0.000000, 
-            146.232422, 0.000000, 150.691406, 0.000000, 155.689453, 0.000000, 159.023438, 0.000000, 
-            168.908203, 0.000000, 168.908203, 0.000000, 173.367188, 0.000000, 176.701172, 0.000000, 
-            179.900391, 0.000000, 186.058594, 0.000000, 190.998047, 0.000000, 197.501953, 0.000000, 
-            200.835938, 0.000000, 206.994141, 0.000000, 212.138672, 0.000000, 217.734375, 0.000000, 
-            220.212891, 0.000000, 223.546875, 0.000000, 230.214844, 0.000000, 233.548828, 0.000000, 
-            239.003906, 0.000000, 245.162109, 0.000000, 249.755859, 0.000000, 255.304688, 0.000000, 
-            261.462891, 0.000000, 267.621094, 0.000000, 275.150391, 0.000000, 279.416016, 0.000000, 
-            282.750000, 0.000000, 285.949219, 0.000000, 291.093750, 0.000000, 296.501953, 0.000000, 
-            300.960938, 0.000000, 304.294922, 0.000000, 313.763672, 0.000000, 320.267578, 0.000000, 
-            323.601562, 0.000000, 329.419922, 0.000000, 332.970703, 0.000000, 338.566406, 0.000000, 
-            341.900391, 0.000000, 346.166016, 0.000000, 352.136719, 0.000000, 358.523438, 0.000000, 
-            362.074219, 0.000000, 368.847656, 0.000000, 374.859375, 0.000000, 378.193359, 0.000000, 
-            383.337891, 0.000000, 387.082031, 0.000000, 390.416016, 0.000000, 396.234375, 0.000000, 
-            402.960938, 0.000000, 409.119141, 0.000000, 414.117188, 0.000000, 418.365234, 0.000000, 
-            423.304688, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-<!-- known to fail in base JDK7, skip  ( won't load, 'bad font name') 
-    <test-case id="Zapfino morx" script="latn">
-        <test-font name="Zapfino.ttf" version="8.0d1e1" checksum="0x78FF7638" rchecksum="0x00EDBCB6"/>
-
-        <test-text>Pack my bags with six dozen liquor jugs</test-text>
-
-        <result-glyphs>
-            0x00000040, 0x000001F8, 0x00000203, 0x00000230, 0x00000003, 0x00000239, 0x00000274, 0x00000003, 
-            0x000001FE, 0x000001F8, 0x0000021D, 0x00000255, 0x00000003, 0x0000026C, 0x00000228, 0x0000025C, 
-            0x00000223, 0x00000003, 0x00000255, 0x00000228, 0x00000270, 0x00000003, 0x00000207, 0x00000244, 
-            0x0000027A, 0x00000210, 0x0000023D, 0x00000003, 0x00000235, 0x00000228, 0x0000024D, 0x00000264, 
-            0x00000244, 0x00000251, 0x00000003, 0x0000022C, 0x00000264, 0x0000021D, 0x00000255
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 0x0000001E, 0x0000001F, 
-            0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.630000, 0.000000, 21.180000, 0.000000, 27.600000, 0.000000, 
-            36.599998, 0.000000, 42.599998, 0.000000, 53.160000, 0.000000, 59.970001, 0.000000, 
-            65.970001, 0.000000, 73.620003, 0.000000, 82.170006, 0.000000, 89.370003, 0.000000, 
-            94.740005, 0.000000, 100.740005, 0.000000, 112.050003, 0.000000, 117.480003, 0.000000, 
-            123.420006, 0.000000, 131.400009, 0.000000, 137.400009, 0.000000, 142.770004, 0.000000, 
-            148.199997, 0.000000, 155.699997, 0.000000, 161.699997, 0.000000, 169.830002, 0.000000, 
-            177.330002, 0.000000, 184.020004, 0.000000, 190.169998, 0.000000, 198.000000, 0.000000, 
-            204.000000, 0.000000, 210.089996, 0.000000, 215.519989, 0.000000, 223.229996, 0.000000, 
-            230.940002, 0.000000, 238.440002, 0.000000, 244.290009, 0.000000, 250.290009, 0.000000, 
-            256.140015, 0.000000, 263.850006, 0.000000, 271.050018, 0.000000, 276.420013, 0.000000
-        </result-positions>
-    </test-case>
--->
-
-    <test-case id="SourceCodePro-Regular.otf" script="latn">
-        <test-font name="SourceCodePro-Regular.otf" version="Version 1.009;PS 1.000;hotconv 1.0.70;makeotf.lib2.5.5900" checksum="0x9EFE425F" rchecksum="0x0074AEC5"/>
-
-        <test-text>Li kien kien, li kieku kieku.</test-text>
-
-        <result-glyphs>
-            0x0000000D, 0x00000024, 0x00000001, 0x00000026, 0x00000024, 0x00000020, 0x00000029, 0x00000001, 
-            0x00000026, 0x00000024, 0x00000020, 0x00000029, 0x000001D0, 0x00000001, 0x00000027, 0x00000024, 
-            0x00000001, 0x00000026, 0x00000024, 0x00000020, 0x00000026, 0x00000030, 0x00000001, 0x00000026, 
-            0x00000024, 0x00000020, 0x00000026, 0x00000030, 0x000001CF
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 7.200000, 0.000000, 14.400000, 0.000000, 21.599998, 0.000000, 
-            28.799999, 0.000000, 36.000000, 0.000000, 43.200001, 0.000000, 50.400002, 0.000000, 
-            57.600002, 0.000000, 64.800003, 0.000000, 72.000000, 0.000000, 79.199997, 0.000000, 
-            86.399994, 0.000000, 93.599991, 0.000000, 100.799988, 0.000000, 107.999985, 0.000000, 
-            115.199982, 0.000000, 122.399979, 0.000000, 129.599976, 0.000000, 136.799973, 0.000000, 
-            143.999969, 0.000000, 151.199966, 0.000000, 158.399963, 0.000000, 165.599960, 0.000000, 
-            172.799957, 0.000000, 179.999954, 0.000000, 187.199951, 0.000000, 194.399948, 0.000000, 
-            201.599945, 0.000000, 208.799942, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="SourceSansPro-Regular.otf" script="latn">
-        <test-font name="SourceSansPro-Regular.otf" version="Version 1.036;PS 1.000;hotconv 1.0.70;makeotf.lib2.5.5900" checksum="0x0EDDDCF3" rchecksum="0x008F9D5C"/>
-
-        <test-text>Il-Mistoqsija oħt l-għerf.</test-text>
-
-        <result-glyphs>
-            0x0000000A, 0x00000027, 0x00000210, 0x0000000E, 0x00000024, 0x0000002E, 0x0000002F, 0x0000002A, 
-            0x0000002C, 0x0000002E, 0x00000024, 0x00000025, 0x0000001C, 0x00000001, 0x0000002A, 0x0000011F, 
-            0x0000002F, 0x00000001, 0x00000027, 0x00000210, 0x00000022, 0x0000011F, 0x00000020, 0x0000002D, 
-            0x00000021, 0x000001FB
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 
-            0x00000018, 0x00000019
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 3.096000, 0.000000, 6.156000, 0.000000, 9.888000, 0.000000, 
-            18.552000, 0.000000, 21.504000, 0.000000, 26.532000, 0.000000, 30.467999, 0.000000, 
-            36.972000, 0.000000, 43.571999, 0.000000, 48.599998, 0.000000, 51.551998, 0.000000, 
-            54.515999, 0.000000, 60.660000, 0.000000, 63.084000, 0.000000, 69.587997, 0.000000, 
-            76.115997, 0.000000, 80.171997, 0.000000, 82.596001, 0.000000, 85.655998, 0.000000, 
-            89.388000, 0.000000, 95.435997, 0.000000, 101.963997, 0.000000, 107.916000, 0.000000, 
-            112.080002, 0.000000, 114.984001, 0.000000, 117.972000, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Tibetan" script="tibt">
-        <test-font name="Jomolhari-alpha3c-0605331.ttf" version="Version alpha 0.003c 2006" checksum="0x0C1F08DC" rchecksum="0x067378EF"/>
-
-        <test-text>༄༅།། ཏིན་ཏིན་གྱི་དཔའ་རྩལ</test-text>
-
-        <result-glyphs>
-            0x00000145, 0x0000FFFF, 0x00000151, 0x00000151, 0x00000003, 0x0000046C, 0x00000BFD, 0x0000059A, 
-            0x0000014E, 0x0000046C, 0x00000BFD, 0x0000059A, 0x0000014E, 0x000002CA, 0x0000FFFF, 0x00000BFD, 
-            0x0000014E, 0x0000050E, 0x00000611, 0x00000848, 0x0000014E, 0x0000093C, 0x0000FFFF, 0x0000098B
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F, 
-            0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 14.906250, 0.000000, 14.906250, 0.000000, 17.648438, 0.000000, 
-            20.390625, 0.000000, 23.906250, 0.000000, 29.109375, 0.000000, 29.109375, 0.000000, 
-            34.171875, 0.000000, 35.929688, 0.000000, 41.132812, 0.000000, 41.132812, 0.000000, 
-            46.195312, 0.000000, 47.953125, 0.000000, 54.773438, 0.000000, 54.773438, 0.000000, 
-            54.773438, 0.000000, 56.531250, 0.000000, 61.875000, 0.000000, 67.570312, 0.000000, 
-            73.195312, 0.000000, 74.953125, 0.000000, 80.437500, 0.000000, 80.437500, 0.000000, 
-            87.328125, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="Old Hangul" script="hang">
-        <test-font name="UnBatangOdal.ttf" version="Version 1.00" checksum="0x4BA78B70" rchecksum="0x0A18D67F"/>
-
-        <test-text>ᄊᆞᆷ ᄒᆞᆫ글 ᄀᆞᇹ ᄫᆞᆼ</test-text>
-
-        <result-glyphs>
-            0x000044FF, 0x00004707, 0x00004859, 0x00000005, 0x0000462B, 0x00004707, 0x00004785, 0x000019B2, 
-            0x00000005, 0x00004361, 0x00004707, 0x0000498D, 0x00000005, 0x000044C3, 0x00004707, 0x00004911
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E, 0x0000000F
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 12.000000, 0.000000, 12.000000, 0.000000, 12.000000, 0.000000, 
-            14.700000, 0.000000, 26.700001, 0.000000, 26.700001, 0.000000, 26.700001, 0.000000, 
-            38.700001, 0.000000, 41.400002, 0.000000, 53.400002, 0.000000, 53.400002, 0.000000, 
-            53.400002, 0.000000, 56.100002, 0.000000, 68.100006, 0.000000, 68.100006, 0.000000, 
-            68.100006, 0.000000
-        </result-positions>
-    </test-case>
-
-    <test-case id="DevaRotate" script="deva">
-        <test-font name="LucidaSansRegular.ttf" version="Version 1.20 - October 2000" checksum="0xF5D9BA6D" rchecksum="0x029B644F"/>
-
-        <test-text>के े</test-text>
-
-        <result-glyphs>
-            0x00000901, 0x00000931, 0x00000003, 0x00000956, 0x00000931
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 5.935547, 0.000000, 8.548828, 0.000000, 12.345703, 0.000000, 
-            17.085938, 0.000000, 18.345703, 0.000000
-        </result-positions>
-    </test-case>
-
-
-    <test-case id="DevaGASP" script="deva">
-        <test-font name="LucidaSansRegular.ttf" version="Version 1.20 - October 2000" checksum="0xF5D9BA6D" rchecksum="0x029B644F"/>
-
-        <test-text>अँग्रेज़ी</test-text>
-
-        <result-glyphs>
-            0x000008F1, 0x000008EE, 0x000009CB, 0x0000FFFF, 0x0000FFFF, 0x00000931, 0x00000940, 0x0000FFFF, 
-            0x0000092A
-        </result-glyphs>
-
-        <result-indices>
-            0x00000000, 0x00000001, 0x00000002, 0x00000004, 0x00000003, 0x00000005, 0x00000006, 0x00000007, 
-            0x00000008
-        </result-indices>
-
-        <result-positions>
-            0.000000, 0.000000, 9.076172, 0.000000, 9.076172, 0.000000, 16.025391, 0.000000, 
-            16.025391, 0.000000, 16.025391, 0.000000, 16.025391, 0.000000, 23.976562, 0.000000, 
-            23.976562, 0.000000, 27.304688, 0.000000
-        </result-positions>
-    </test-case>
-
-</layout-tests>

From 6df78c4585fc5a71ceafa6f4b1dc0fe68db2657c Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 12 Nov 2025 07:10:29 +0000
Subject: [PATCH 129/512] 8371065: C2 SuperWord: VTransformLoopPhiNode::apply
 setting type leads to assert/wrong result

Co-authored-by: Roland Westrelin <roland@openjdk.org>
Reviewed-by: qamai, chagedorn
---
 .../share/opto/superwordVTransformBuilder.cpp |   2 +-
 src/hotspot/share/opto/vtransform.cpp         |  91 ++++++---
 src/hotspot/share/opto/vtransform.hpp         |  34 +++-
 .../superword/TestLoopPhiApplyBadType.java    | 189 ++++++++++++++++++
 4 files changed, 283 insertions(+), 33 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestLoopPhiApplyBadType.java

diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.cpp b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
index 45c919ccffa..832e91603d9 100644
--- a/src/hotspot/share/opto/superwordVTransformBuilder.cpp
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
@@ -64,7 +64,7 @@ void SuperWordVTransformBuilder::build_scalar_vtnodes_for_non_packed_nodes() {
       const VPointer& mem_p = _vloop_analyzer.vpointers().vpointer(mem);
       vtn = new (_vtransform.arena()) VTransformMemopScalarNode(_vtransform, mem, mem_p);
     } else if (n->is_Phi()) {
-      vtn = new (_vtransform.arena()) VTransformLoopPhiNode(_vtransform, n->as_Phi());
+      vtn = new (_vtransform.arena()) VTransformPhiScalarNode(_vtransform, n->as_Phi());
     } else if (n->is_CountedLoop()) {
       vtn = new (_vtransform.arena()) VTransformCountedLoopNode(_vtransform, n->as_CountedLoop());
     } else if (n->is_CFG()) {
diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
index c617f8415e4..e775eb60cab 100644
--- a/src/hotspot/share/opto/vtransform.cpp
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -62,7 +62,7 @@ void VTransformGraph::optimize(VTransform& vtransform) {
           // 1. Memory phi uses are not modeled, so they appear to have no use here, but must be kept alive.
           // 2. Similarly, some stores may not have their memory uses modeled, but need to be kept alive.
           // 3. Outer node with strong inputs: is a use after the loop that we must keep alive.
-          !(vtn->isa_LoopPhi() != nullptr ||
+          !(vtn->isa_PhiScalar() != nullptr ||
             vtn->is_load_or_store_in_loop() ||
             (vtn->isa_Outer() != nullptr && vtn->has_strong_in_edge()))) {
         vtn->mark_dead();
@@ -123,8 +123,10 @@ bool VTransformGraph::schedule() {
         // Skip dead nodes
         if (!use->is_alive()) { continue; }
 
-        // Skip LoopPhi backedge.
-        if ((use->isa_LoopPhi() != nullptr || use->isa_CountedLoop() != nullptr) && use->in_req(2) == vtn) { continue; }
+        // Skip backedges.
+        if ((use->is_loop_head_phi() || use->isa_CountedLoop() != nullptr) && use->in_req(2) == vtn) {
+          continue;
+        }
 
         if (post_visited.test(use->_idx)) { continue; }
         if (pre_visited.test(use->_idx)) {
@@ -205,7 +207,7 @@ void VTransformGraph::mark_vtnodes_in_loop(VectorSet& in_loop) const {
   for (int i = 0; i < _schedule.length(); i++) {
     VTransformNode* vtn = _schedule.at(i);
     // Is vtn a loop-phi?
-    if (vtn->isa_LoopPhi() != nullptr ||
+    if (vtn->is_loop_head_phi() ||
         vtn->is_load_or_store_in_loop()) {
       is_not_before_loop.set(vtn->_idx);
       continue;
@@ -232,8 +234,7 @@ void VTransformGraph::mark_vtnodes_in_loop(VectorSet& in_loop) const {
     for (uint i = 0; i < vtn->out_strong_edges(); i++) {
       VTransformNode* use = vtn->out_strong_edge(i);
       // Or is vtn a backedge or one of its transitive defs?
-      if (in_loop.test(use->_idx) ||
-          use->isa_LoopPhi() != nullptr) {
+      if (in_loop.test(use->_idx) || use->is_loop_head_phi()) {
         in_loop.set(vtn->_idx);
         break;
       }
@@ -957,7 +958,7 @@ VTransformApplyResult VTransformDataScalarNode::apply(VTransformApplyState& appl
   return VTransformApplyResult::make_scalar(_node);
 }
 
-VTransformApplyResult VTransformLoopPhiNode::apply(VTransformApplyState& apply_state) const {
+VTransformApplyResult VTransformPhiScalarNode::apply(VTransformApplyState& apply_state) const {
   PhaseIdealLoop* phase = apply_state.phase();
   Node* in0 = apply_state.transformed_node(in_req(0));
   Node* in1 = apply_state.transformed_node(in_req(1));
@@ -965,19 +966,14 @@ VTransformApplyResult VTransformLoopPhiNode::apply(VTransformApplyState& apply_s
   phase->igvn().replace_input_of(_node, 1, in1);
   // Note: the backedge is hooked up later.
 
-  // The Phi's inputs may have been modified, and the types changes,
-  // e.g. from scalar to vector.
-  const Type* t = in1->bottom_type();
-  _node->as_Type()->set_type(t);
-  phase->igvn().set_type(_node, t);
-
   return VTransformApplyResult::make_scalar(_node);
 }
 
 // Cleanup backedges. In the schedule, the backedges come after their phis. Hence,
 // we only have the transformed backedges after the phis are already transformed.
 // We hook the backedges into the phis now, during cleanup.
-void VTransformLoopPhiNode::apply_backedge(VTransformApplyState& apply_state) const {
+void VTransformPhiScalarNode::apply_backedge(VTransformApplyState& apply_state) const {
+  assert(_node == apply_state.transformed_node(this), "sanity");
   PhaseIdealLoop* phase = apply_state.phase();
   if (_node->is_memory_phi()) {
     // Memory phi/backedge
@@ -1219,7 +1215,7 @@ bool VTransformReductionVectorNode::requires_strict_order() const {
 //       are performed inside the loop.
 bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop_preconditions(VTransform& vtransform) {
   // We have a phi with a single use.
-  VTransformLoopPhiNode* phi = in_req(1)->isa_LoopPhi();
+  VTransformPhiScalarNode* phi = in_req(1)->isa_PhiScalar();
   if (phi == nullptr) {
     return false;
   }
@@ -1284,7 +1280,7 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
       // All uses must be outside loop body, except for the phi.
       for (uint i = 0; i < current_red->out_strong_edges(); i++) {
         VTransformNode* use = current_red->out_strong_edge(i);
-        if (use->isa_LoopPhi() == nullptr &&
+        if (use->isa_PhiScalar() == nullptr &&
             use->isa_Outer() == nullptr) {
           // Should not be allowed by SuperWord::mark_reductions
           assert(false, "reduction has use inside loop");
@@ -1339,16 +1335,28 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   VTransformNode* vtn_identity_vector = new (vtransform.arena()) VTransformReplicateNode(vtransform, vlen, bt);
   vtn_identity_vector->init_req(1, vtn_identity);
 
-  // Turn the scalar phi into a vector phi.
-  VTransformLoopPhiNode* phi = in_req(1)->isa_LoopPhi();
-  VTransformNode* init = phi->in_req(1);
-  phi->set_req(1, vtn_identity_vector);
+  // Look at old scalar phi.
+  VTransformPhiScalarNode* phi_scalar = in_req(1)->isa_PhiScalar();
+  PhiNode* old_phi = phi_scalar->node();
+  VTransformNode* init = phi_scalar->in_req(1);
+
+  TRACE_OPTIMIZE(
+    tty->print("  phi_scalar ");
+    phi_scalar->print();
+  )
+
+  // Create new vector phi
+  const VTransformVectorNodeProperties properties = VTransformVectorNodeProperties::make_for_phi_vector(old_phi, vlen, bt);
+  VTransformPhiVectorNode* phi_vector = new (vtransform.arena()) VTransformPhiVectorNode(vtransform, 3, properties);
+  phi_vector->init_req(0, phi_scalar->in_req(0));
+  phi_vector->init_req(1, vtn_identity_vector);
+  // Note: backedge comes later
 
   // Traverse down the chain of reductions, and replace them with vector_accumulators.
   VTransformReductionVectorNode* first_red   = this;
-  VTransformReductionVectorNode* last_red    = phi->in_req(2)->isa_ReductionVector();
+  VTransformReductionVectorNode* last_red    = phi_scalar->in_req(2)->isa_ReductionVector();
   VTransformReductionVectorNode* current_red = first_red;
-  VTransformNode* current_vector_accumulator = phi;
+  VTransformNode* current_vector_accumulator = phi_vector;
   while (true) {
     VTransformNode* vector_input = current_red->in_req(2);
     VTransformVectorNode* vector_accumulator = new (vtransform.arena()) VTransformElementWiseVectorNode(vtransform, 3, current_red->properties(), vopc);
@@ -1366,15 +1374,15 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   }
 
   // Feed vector accumulator into the backedge.
-  phi->set_req(2, current_vector_accumulator);
+  phi_vector->set_req(2, current_vector_accumulator);
 
   // Create post-loop reduction. last_red keeps all uses outside the loop.
   last_red->set_req(1, init);
   last_red->set_req(2, current_vector_accumulator);
 
   TRACE_OPTIMIZE(
-    tty->print("  phi        ");
-    phi->print();
+    tty->print("  phi_scalar ");
+    phi_scalar->print();
     tty->print("  after loop ");
     last_red->print();
   )
@@ -1398,6 +1406,37 @@ VTransformApplyResult VTransformReductionVectorNode::apply(VTransformApplyState&
   return VTransformApplyResult::make_vector(vn, vn->vect_type());
 }
 
+VTransformApplyResult VTransformPhiVectorNode::apply(VTransformApplyState& apply_state) const {
+  PhaseIdealLoop* phase = apply_state.phase();
+  Node* in0 = apply_state.transformed_node(in_req(0));
+  Node* in1 = apply_state.transformed_node(in_req(1));
+
+  // We create a new phi node, because the type is different to the scalar phi.
+  PhiNode* old_phi = approximate_origin()->as_Phi();
+  PhiNode* new_phi = old_phi->clone()->as_Phi();
+
+  phase->igvn().replace_input_of(new_phi, 0, in0);
+  phase->igvn().replace_input_of(new_phi, 1, in1);
+  // Note: the backedge is hooked up later.
+
+  // Give the new phi node the correct vector type.
+  const TypeVect* vt = TypeVect::make(element_basic_type(), vector_length());
+  new_phi->as_Type()->set_type(vt);
+  phase->igvn().set_type(new_phi, vt);
+
+  return VTransformApplyResult::make_vector(new_phi, vt);
+}
+
+// Cleanup backedges. In the schedule, the backedges come after their phis. Hence,
+// we only have the transformed backedges after the phis are already transformed.
+// We hook the backedges into the phis now, during cleanup.
+void VTransformPhiVectorNode::apply_backedge(VTransformApplyState& apply_state) const {
+  PhaseIdealLoop* phase = apply_state.phase();
+  PhiNode* new_phi = apply_state.transformed_node(this)->as_Phi();
+  Node* in2 = apply_state.transformed_node(in_req(2));
+  phase->igvn().replace_input_of(new_phi, 2, in2);
+}
+
 float VTransformLoadVectorNode::cost(const VLoopAnalyzer& vloop_analyzer) const {
   uint vlen    = vector_length();
   BasicType bt = element_basic_type();
@@ -1535,7 +1574,7 @@ void VTransformDataScalarNode::print_spec() const {
   tty->print("node[%d %s]", _node->_idx, _node->Name());
 }
 
-void VTransformLoopPhiNode::print_spec() const {
+void VTransformPhiScalarNode::print_spec() const {
   tty->print("node[%d %s]", _node->_idx, _node->Name());
 }
 
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index a30f0ff098f..a3e4977494e 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -79,7 +79,7 @@ class VTransform;
 class VTransformNode;
 class VTransformMemopScalarNode;
 class VTransformDataScalarNode;
-class VTransformLoopPhiNode;
+class VTransformPhiScalarNode;
 class VTransformCFGNode;
 class VTransformCountedLoopNode;
 class VTransformOuterNode;
@@ -88,6 +88,7 @@ class VTransformElementWiseVectorNode;
 class VTransformCmpVectorNode;
 class VTransformBoolVectorNode;
 class VTransformReductionVectorNode;
+class VTransformPhiVectorNode;
 class VTransformMemVectorNode;
 class VTransformLoadVectorNode;
 class VTransformStoreVectorNode;
@@ -539,7 +540,7 @@ public:
   }
 
   virtual VTransformMemopScalarNode* isa_MemopScalar() { return nullptr; }
-  virtual VTransformLoopPhiNode* isa_LoopPhi() { return nullptr; }
+  virtual VTransformPhiScalarNode* isa_PhiScalar() { return nullptr; }
   virtual VTransformCountedLoopNode* isa_CountedLoop() { return nullptr; }
   virtual VTransformOuterNode* isa_Outer() { return nullptr; }
   virtual VTransformVectorNode* isa_Vector() { return nullptr; }
@@ -547,6 +548,7 @@ public:
   virtual VTransformCmpVectorNode* isa_CmpVector() { return nullptr; }
   virtual VTransformBoolVectorNode* isa_BoolVector() { return nullptr; }
   virtual VTransformReductionVectorNode* isa_ReductionVector() { return nullptr; }
+  virtual VTransformPhiVectorNode* isa_PhiVector() { return nullptr; }
   virtual VTransformMemVectorNode* isa_MemVector() { return nullptr; }
   virtual VTransformLoadVectorNode* isa_LoadVector() { return nullptr; }
   virtual VTransformStoreVectorNode* isa_StoreVector() { return nullptr; }
@@ -554,6 +556,7 @@ public:
   virtual bool is_load_in_loop() const { return false; }
   virtual bool is_load_or_store_in_loop() const { return false; }
   virtual const VPointer& vpointer() const { ShouldNotReachHere(); }
+  virtual bool is_loop_head_phi() const { return false; }
 
   virtual bool optimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) { return false; }
 
@@ -613,21 +616,24 @@ public:
 };
 
 // Identity transform for loop head phi nodes.
-class VTransformLoopPhiNode : public VTransformNode {
+class VTransformPhiScalarNode : public VTransformNode {
 private:
   PhiNode* _node;
 public:
-  VTransformLoopPhiNode(VTransform& vtransform, PhiNode* n) :
+  VTransformPhiScalarNode(VTransform& vtransform, PhiNode* n) :
     VTransformNode(vtransform, n->req()), _node(n)
   {
     assert(_node->in(0)->is_Loop(), "phi ctrl must be Loop: %s", _node->in(0)->Name());
   }
 
-  virtual VTransformLoopPhiNode* isa_LoopPhi() override { return this; }
+  PhiNode* node() const { return _node; }
+
+  virtual VTransformPhiScalarNode* isa_PhiScalar() override { return this; }
+  virtual bool is_loop_head_phi() const override { return in_req(0)->isa_CountedLoop() != nullptr; }
   virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override { return 0; }
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   virtual void apply_backedge(VTransformApplyState& apply_state) const override;
-  NOT_PRODUCT(virtual const char* name() const override { return "LoopPhi"; };)
+  NOT_PRODUCT(virtual const char* name() const override { return "PhiScalar"; };)
   NOT_PRODUCT(virtual void print_spec() const override;)
 };
 
@@ -754,6 +760,10 @@ public:
     return VTransformVectorNodeProperties(first, opc, vlen, bt);
   }
 
+  static VTransformVectorNodeProperties make_for_phi_vector(PhiNode* phi, int vlen, BasicType bt) {
+    return VTransformVectorNodeProperties(phi, phi->Opcode(), vlen, bt);
+  }
+
   Node* approximate_origin()     const { return _approximate_origin; }
   int scalar_opcode()            const { return _scalar_opcode; }
   uint vector_length()           const { return _vector_length; }
@@ -870,6 +880,18 @@ private:
   bool optimize_move_non_strict_order_reductions_out_of_loop(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform);
 };
 
+class VTransformPhiVectorNode : public VTransformVectorNode {
+public:
+  VTransformPhiVectorNode(VTransform& vtransform, uint req, const VTransformVectorNodeProperties properties) :
+    VTransformVectorNode(vtransform, req, properties) {}
+  virtual VTransformPhiVectorNode* isa_PhiVector() override { return this; }
+  virtual bool is_loop_head_phi() const override { return in_req(0)->isa_CountedLoop() != nullptr; }
+  virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override { return 0; }
+  virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
+  virtual void apply_backedge(VTransformApplyState& apply_state) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "PhiVector"; };)
+};
+
 class VTransformMemVectorNode : public VTransformVectorNode {
 private:
   const VPointer _vpointer; // with size of the vector
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestLoopPhiApplyBadType.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestLoopPhiApplyBadType.java
new file mode 100644
index 00000000000..17bc3894c28
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestLoopPhiApplyBadType.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=all-flags-1
+ * @bug 8371065
+ * @summary A bug in VTransformLoopPhiNode::apply led us to copy the type of phi->in(1)
+ *          which we did not expect to ever be a constant, but always the full type range.
+ *          Setting the phi type to that value meant that the phi would wrongly constant
+ *          fold, and lead to wrong results.
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestLoopPhiApplyBadType::test*
+ *      -XX:CompileCommand=dontinline,*TestLoopPhiApplyBadType::notInlined
+ *      -XX:-TieredCompilation
+ *      -XX:-UseOnStackReplacement
+ *      -XX:-BackgroundCompilation
+ *      -XX:PartialPeelNewPhiDelta=1
+ *      -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+StressIGVN
+ *      -XX:StressSeed=212574406
+ *      compiler.loopopts.superword.TestLoopPhiApplyBadType
+ */
+
+/*
+ * @test id=fewer-flags-1
+ * @bug 8371065
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestLoopPhiApplyBadType::test*
+ *      -XX:CompileCommand=dontinline,*TestLoopPhiApplyBadType::notInlined
+ *      -XX:-TieredCompilation
+ *      -XX:-UseOnStackReplacement
+ *      -XX:-BackgroundCompilation
+ *      -XX:PartialPeelNewPhiDelta=1
+ *      -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+StressIGVN
+ *      compiler.loopopts.superword.TestLoopPhiApplyBadType
+ */
+
+/*
+ * @test id=all-flags-2
+ * @bug 8371065 8371472
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestLoopPhiApplyBadType::test*
+ *      -XX:CompileCommand=dontinline,*TestLoopPhiApplyBadType::notInlined
+ *      -XX:-TieredCompilation
+ *      -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+StressIGVN
+ *      -XX:StressSeed=3497198372
+ *      compiler.loopopts.superword.TestLoopPhiApplyBadType
+ */
+
+/*
+ * @test id=fewer-flags-2
+ * @bug 8371065 8371472
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestLoopPhiApplyBadType::test*
+ *      -XX:CompileCommand=dontinline,*TestLoopPhiApplyBadType::notInlined
+ *      -XX:-TieredCompilation
+ *      -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+StressIGVN
+ *      compiler.loopopts.superword.TestLoopPhiApplyBadType
+ */
+
+/*
+ * @test id=minimal-flags
+ * @bug 8371065
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestLoopPhiApplyBadType::test*
+ *      -XX:CompileCommand=dontinline,*TestLoopPhiApplyBadType::notInlined
+ *      compiler.loopopts.superword.TestLoopPhiApplyBadType
+ */
+
+/*
+ * @test id=no-flags
+ * @bug 8371065
+ * @run main compiler.loopopts.superword.TestLoopPhiApplyBadType
+ */
+
+package compiler.loopopts.superword;
+
+public class TestLoopPhiApplyBadType {
+    public static void main(String[] args) {
+        for (int i = 0; i < 20_000; i++) {
+            int[] array = test1();
+            int j;
+            boolean abort = false;
+            for (j = 0; j < array.length-2; j++) {
+                if (array[j] != (j | 1)) {
+                    System.out.println("For " + j + " " + array[j]);
+                    abort = true;
+                }
+            }
+            for (; j < array.length; j++) {
+                if (array[j] != j) {
+                    System.out.println("For " + j + " " + array[j]);
+                    abort = true;
+                }
+            }
+            if (abort) {
+                throw new RuntimeException("Failure");
+            }
+        }
+
+        int gold2 = test2();
+        for (int i = 0; i < 10; i++) {
+            int res = test2();
+            if (gold2 != res) {
+                throw new RuntimeException("Wrong value: " + res + " vs " + gold2);
+            }
+        }
+    }
+
+    private static int[] test1() {
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        int k = limit / 4;
+
+        int[] array = new int[1000];
+        int[] flags = new int[1000];
+        int[] flags2 = new int[1000];
+        int j;
+        for (j = 0; j < 10; j += k) {
+
+        }
+        notInlined(array);
+        for (int i = 0; ; i++) {
+            synchronized (new Object()) {}
+            int ii = Integer.min(Integer.max(i, 0), array.length-1);
+            int v = array[ii];
+            if (flags2[ii] * (j-10) != 0) {
+                throw new RuntimeException("never taken" + v);
+            }
+            if (i * k >= array.length - 2) {
+                break;
+            }
+            if (flags[ii]*(j-10)  != 0) {
+                throw new RuntimeException("never taken");
+            }
+            array[ii] = v | 1;
+        }
+        return array;
+    }
+
+    static int test2() {
+        int arr[] = new int[400];
+        int x = 34;
+        for (int i = 1; i < 50; i++) {
+            for (int k = 3; 201 > k; ++k) {
+                x += Math.min(k, arr[k - 1]);
+            }
+        }
+        return x;
+    }
+
+    private static void notInlined(int[] array) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = i;
+        }
+    }
+}

From 76a0732ba5c0f3159ed0ebc5fcb2dfb7117b38cd Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 12 Nov 2025 07:14:45 +0000
Subject: [PATCH 130/512] 8366691: JShell should support a more convenient
 completion

Reviewed-by: asotona
---
 .../jshell/tool/ConsoleIOContext.java         |  57 ++-
 .../shellsupport/doc/JavadocHelper.java       |  93 ++++-
 .../jdk/jshell/SourceCodeAnalysis.java        | 159 +++++++
 .../jdk/jshell/SourceCodeAnalysisImpl.java    | 395 +++++++++++-------
 .../jdk/jshell/CompletionAPITest.java         | 303 ++++++++++++++
 .../jdk/jshell/CompletionSuggestionTest.java  |  15 +-
 test/langtools/jdk/jshell/KullaTesting.java   |  13 +-
 .../jdk/jshell/ToolTabSnippetTest.java        |   8 +-
 8 files changed, 881 insertions(+), 162 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/CompletionAPITest.java

diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index 1662f81710a..57d427c1774 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -345,18 +345,21 @@ class ConsoleIOContext extends IOContext {
                 ConsoleIOContextTestSupport.willComputeCompletion();
                 int[] anchor = new int[] {-1};
                 List<Suggestion> suggestions;
-                List<String> doc;
+                List<AttributedString> doc;
                 boolean command = prefix.isEmpty() && text.startsWith("/");
                 if (command) {
                     suggestions = repl.commandCompletionSuggestions(text, cursor, anchor);
-                    doc = repl.commandDocumentation(text, cursor, true);
+                    doc = repl.commandDocumentation(text, cursor, true)
+                              .stream()
+                              .map(AttributedString::new)
+                              .toList();
                 } else {
                     int prefixLength = prefix.length();
                     suggestions = repl.analysis.completionSuggestions(prefix + text, cursor + prefixLength, anchor);
                     anchor[0] -= prefixLength;
                     doc = repl.analysis.documentation(prefix + text, cursor + prefix.length(), false)
                                        .stream()
-                                       .map(Documentation::signature)
+                                       .map(this::renderSignature)
                                        .toList();
                 }
                 long smartCount = suggestions.stream().filter(Suggestion::matchesType).count();
@@ -502,6 +505,41 @@ class ConsoleIOContext extends IOContext {
         }
     }
 
+    private AttributedString renderSignature(Documentation doc) {
+        int activeParamIndex = doc.activeParameterIndex();
+        String signature = doc.signature();
+
+        if (activeParamIndex == (-1)) {
+            return new AttributedString(signature);
+        }
+
+        int lparen = signature.indexOf('(');
+        int rparen = signature.indexOf(')', lparen);
+
+        if (lparen == (-1) || rparen == (-1)) {
+            return new AttributedString(signature);
+        }
+
+        AttributedStringBuilder result = new AttributedStringBuilder();
+
+        result.append(signature.substring(0, lparen + 1), AttributedStyle.DEFAULT);
+
+        String[] params = signature.substring(lparen + 1, rparen).split(", *");
+        String sep = "";
+
+        for (int i = 0; i < params.length; i++) {
+            result.append(sep);
+            result.append(params[i], i == activeParamIndex ? AttributedStyle.BOLD
+                                                           : AttributedStyle.DEFAULT);
+
+            sep = ", ";
+        }
+
+        result.append(signature.substring(rparen), AttributedStyle.DEFAULT);
+
+        return result.toAttributedString();
+    }
+
     private CompletionTask.Result doPrintFullDocumentation(List<CompletionTask> todo, List<String> doc, boolean command) {
         if (doc != null && !doc.isEmpty()) {
             Terminal term = in.getTerminal();
@@ -722,9 +760,9 @@ class ConsoleIOContext extends IOContext {
 
     private final class CommandSynopsisTask implements CompletionTask {
 
-        private final List<String> synopsis;
+        private final List<AttributedString> synopsis;
 
-        public CommandSynopsisTask(List<String> synposis) {
+        public CommandSynopsisTask(List<AttributedString> synposis) {
             this.synopsis = synposis;
         }
 
@@ -738,6 +776,7 @@ class ConsoleIOContext extends IOContext {
 //            try {
                 in.getTerminal().writer().println();
                 in.getTerminal().writer().println(synopsis.stream()
+                                   .map(doc -> doc.toAnsi(in.getTerminal()))
                                    .map(l -> l.replaceAll("\n", LINE_SEPARATOR))
                                    .collect(Collectors.joining(LINE_SEPARATORS2)));
 //            } catch (IOException ex) {
@@ -771,9 +810,9 @@ class ConsoleIOContext extends IOContext {
 
     private final class ExpressionSignaturesTask implements CompletionTask {
 
-        private final List<String> doc;
+        private final List<AttributedString> doc;
 
-        public ExpressionSignaturesTask(List<String> doc) {
+        public ExpressionSignaturesTask(List<AttributedString> doc) {
             this.doc = doc;
         }
 
@@ -786,7 +825,9 @@ class ConsoleIOContext extends IOContext {
         public Result perform(String text, int cursor) throws IOException {
             in.getTerminal().writer().println();
             in.getTerminal().writer().println(repl.getResourceString("jshell.console.completion.current.signatures"));
-            in.getTerminal().writer().println(doc.stream().collect(Collectors.joining(LINE_SEPARATOR)));
+            in.getTerminal().writer().println(doc.stream()
+                                                 .map(doc -> doc.toAnsi(in.getTerminal()))
+                                                 .collect(Collectors.joining(LINE_SEPARATOR)));
             return Result.FINISH;
         }
 
diff --git a/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java b/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
index e69f32097b2..099aba26968 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
@@ -118,7 +118,7 @@ public abstract class JavadocHelper implements AutoCloseable {
         StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null);
         try {
             fm.setLocationFromPaths(StandardLocation.SOURCE_PATH, sourceLocations);
-            return new OnDemandJavadocHelper(mainTask, fm);
+            return new OnDemandJavadocHelper(mainTask, fm, sourceLocations);
         } catch (IOException ex) {
             try {
                 fm.close();
@@ -135,6 +135,21 @@ public abstract class JavadocHelper implements AutoCloseable {
                 }
                 @Override
                 public void close() throws IOException {}
+
+                @Override
+                public String getResolvedDocComment(StoredElement forElement) throws IOException {
+                    return null;
+                }
+
+                @Override
+                public StoredElement getHandle(Element forElement) {
+                    return null;
+                }
+
+                @Override
+                public Collection<? extends Path> getSourceLocations() {
+                    return List.of();
+                }
             };
         }
     }
@@ -147,6 +162,7 @@ public abstract class JavadocHelper implements AutoCloseable {
      * @throws IOException if something goes wrong in the search
      */
     public abstract String getResolvedDocComment(Element forElement) throws IOException;
+    public abstract String getResolvedDocComment(StoredElement forElement) throws IOException;
 
     /**Returns an element representing the same given program element, but the returned element will
      * be resolved from source, if it can be found. Returns the original element if the source for
@@ -158,6 +174,9 @@ public abstract class JavadocHelper implements AutoCloseable {
      */
     public abstract Element getSourceElement(Element forElement) throws IOException;
 
+    public abstract StoredElement getHandle(Element forElement);
+    public abstract Collection<? extends Path> getSourceLocations();
+
     /**Closes the helper.
      *
      * @throws IOException if something foes wrong during the close
@@ -165,16 +184,20 @@ public abstract class JavadocHelper implements AutoCloseable {
     @Override
     public abstract void close() throws IOException;
 
+    public record StoredElement(String module, String binaryName, String handle) {}
+
     private static final class OnDemandJavadocHelper extends JavadocHelper {
         private final JavacTask mainTask;
         private final JavaFileManager baseFileManager;
         private final StandardJavaFileManager fm;
         private final Map<String, Pair<JavacTask, TreePath>> signature2Source = new HashMap<>();
+        private final Collection<? extends Path> sourceLocations;
 
-        private OnDemandJavadocHelper(JavacTask mainTask, StandardJavaFileManager fm) {
+        private OnDemandJavadocHelper(JavacTask mainTask, StandardJavaFileManager fm, Collection<? extends Path> sourceLocations) {
             this.mainTask = mainTask;
             this.baseFileManager = ((JavacTaskImpl) mainTask).getContext().get(JavaFileManager.class);
             this.fm = fm;
+            this.sourceLocations = sourceLocations;
         }
 
         @Override
@@ -187,6 +210,16 @@ public abstract class JavadocHelper implements AutoCloseable {
             return getResolvedDocComment(sourceElement.fst, sourceElement.snd);
         }
 
+        @Override
+        public String getResolvedDocComment(StoredElement forElement) throws IOException {
+            Pair<JavacTask, TreePath> sourceElement = getSourceElement(forElement);
+
+            if (sourceElement == null)
+                return null;
+
+            return getResolvedDocComment(sourceElement.fst, sourceElement.snd);
+        }
+
         @Override
         public Element getSourceElement(Element forElement) throws IOException {
             Pair<JavacTask, TreePath> sourceElement = getSourceElement(mainTask, forElement);
@@ -202,7 +235,30 @@ public abstract class JavadocHelper implements AutoCloseable {
             return result;
         }
 
-        private String getResolvedDocComment(JavacTask task, TreePath el) throws IOException {
+        @Override
+        public StoredElement getHandle(Element forElement) {
+            TypeElement type = topLevelType(forElement);
+
+            if (type == null)
+                return null;
+
+            Elements elements = mainTask.getElements();
+            ModuleElement module = elements.getModuleOf(type);
+            String moduleName = module == null || module.isUnnamed()
+                    ? null
+                    : module.getQualifiedName().toString();
+            String binaryName = elements.getBinaryName(type).toString();
+            String handle = elementSignature(forElement);
+
+            return new StoredElement(moduleName, binaryName, handle);
+        }
+
+        @Override
+        public Collection<? extends Path> getSourceLocations() {
+            return sourceLocations;
+        }
+
+         private String getResolvedDocComment(JavacTask task, TreePath el) throws IOException {
             DocTrees trees = DocTrees.instance(task);
             Element element = trees.getElement(el);
             String docComment = trees.getDocComment(el);
@@ -634,7 +690,7 @@ public abstract class JavadocHelper implements AutoCloseable {
                        .filter(supMethod -> task.getElements().overrides(method, supMethod, type));
         }
 
-        /* Find types from which methods in type may inherit javadoc, in the proper order.*/
+        /* Find types from which methods in binaryName may inherit javadoc, in the proper order.*/
         private Stream<Element> superTypeForInheritDoc(JavacTask task, Element type) {
             TypeElement clazz = (TypeElement) type;
             Stream<Element> result = interfaces(clazz);
@@ -701,6 +757,35 @@ public abstract class JavadocHelper implements AutoCloseable {
             return exc != null ? exc.toString() : null;
         }
 
+        private Pair<JavacTask, TreePath> getSourceElement(StoredElement el) throws IOException {
+            if (el == null) {
+                return null;
+            }
+
+            String handle = el.handle();
+            Pair<JavacTask, TreePath> cached = signature2Source.get(handle);
+
+            if (cached != null) {
+                return cached.fst != null ? cached : null;
+            }
+
+            Pair<JavacTask, CompilationUnitTree> source = findSource(el.module(), el.binaryName());
+
+            if (source == null)
+                return null;
+
+            fillElementCache(source.fst, source.snd);
+
+            cached = signature2Source.get(handle);
+
+            if (cached != null) {
+                return cached;
+            } else {
+                signature2Source.put(handle, Pair.of(null, null));
+                return null;
+            }
+        }
+
         private Pair<JavacTask, TreePath> getSourceElement(JavacTask origin, Element el) throws IOException {
             String handle = elementSignature(el);
             Pair<JavacTask, TreePath> cached = signature2Source.get(handle);
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
index 10da664cd03..91bdde888fa 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
@@ -28,6 +28,12 @@ package jdk.jshell;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Supplier;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
 
 /**
  * Provides analysis utilities for source code input.
@@ -64,6 +70,18 @@ public abstract class SourceCodeAnalysis {
      */
     public abstract List<Suggestion> completionSuggestions(String input, int cursor, int[] anchor);
 
+    /**
+     * Compute possible follow-ups for the given input.
+     * Uses information from the current {@code JShell} state, including
+     * type information, to filter the suggestions.
+     * @param input the user input, so far
+     * @param cursor the current position of the cursors in the given {@code input} text
+     * @param convertor convert the given {@linkplain ElementSuggestion} to a custom completion suggestions.
+     * @return list of candidate continuations of the given input.
+     * @since 26
+     */
+    public abstract <S> List<S> completionSuggestions(String input, int cursor, ElementSuggestionConvertor<S> convertor);
+
     /**
      * Compute documentation for the given user's input. Multiple {@code Documentation} objects may
      * be returned when multiple elements match the user's input (like for overloaded methods).
@@ -315,6 +333,135 @@ public abstract class SourceCodeAnalysis {
         boolean matchesType();
     }
 
+    /**
+     * A description of an {@linkplain Element} that is a possible continuation of
+     * a given snippet.
+     *
+     * @apiNote Instances of this interface and instances of the returned {@linkplain Elements}
+     * should only be used and held during the execution of the
+     * {@link #completionSuggestions(java.lang.String, int, jdk.jshell.SourceCodeAnalysis.ElementSuggestionConvertor) }
+     * method. Their use outside of the context of the method is not supported and
+     * the effect is undefined.
+     *
+     * @since 26
+     */
+    public sealed interface ElementSuggestion permits SourceCodeAnalysisImpl.ElementSuggestionImpl {
+        /**
+         * {@return a possible continuation {@linkplain Element}, or {@code null}
+         *  if this item does not represent an {@linkplain Element}.}
+         */
+        Element element();
+        /**
+         * {@return a possible continuation keyword, or {@code null}
+         *  if this item does not represent a keyword.}
+         */
+        String keyword();
+        /**
+         * {@return {@code true} if this {@linkplain Element}'s type fits into
+         *  the context.}
+         *
+         * Typically used when the type of the element fits the expected type.
+         */
+        boolean matchesType();
+        /**
+         * {@return the offset in the original snippet at which point this {@linkplain Element}
+         *  should be inserted.}
+         */
+        int anchor();
+        /**
+         * {@return a {@linkplain Supplier} for the javadoc documentation for this Element.}
+         *
+         * @apiNote The instance returned from this method is safe to hold for extended
+         * periods of time, and can be called outside of the context of the
+         * {@link #completionSuggestions(java.lang.String, int, jdk.jshell.SourceCodeAnalysis.ElementSuggestionConvertor) } method.
+         */
+        Supplier<String> documentation();
+    }
+
+    /**
+     * Permit access to completion state.
+     *
+     * @since 26
+     */
+    public sealed interface CompletionState permits SourceCodeAnalysisImpl.CompletionStateImpl {
+        /**
+         * {@return true if the given element is available using the simple name at
+         *  the place of the cursor.}
+         *
+         * @param el {@linkplain Element} to check
+         */
+        public boolean availableUsingSimpleName(Element el);
+        /**
+         * {@return flags describing the overall completion context.}
+         */
+        public Set<CompletionContext> completionContext();
+        /**
+         * {@return if the context is a qualified expression
+         * (i.e. {@link CompletionContext#QUALIFIED} is set),
+         * the type of the selector expression; {@code null} otherwise.}
+         */
+        public TypeMirror selectorType();
+        /**
+         * {@return an implementation of some utility methods for
+         * operating on elements}
+         */
+        Elements elementUtils();
+        /**
+         * {@return an implementation of some utility methods for
+         * operating on types}
+         */
+        Types typeUtils();
+    }
+
+    /**
+     * Various flags describing the context in which the completion happens.
+     *
+     * @since 26
+     */
+    public enum CompletionContext {
+        /**
+         * The context is inside annotation attributes.
+         */
+        ANNOTATION_ATTRIBUTE,
+        /**
+         * Parentheses should not be filled for methods and constructor
+         * in the current context.
+         *
+         * Typically used in the import or method reference contexts.
+         */
+        NO_PAREN,
+        /**
+         * Interpret {@link ElementKind#ANNOTATION_TYPE}s as annotation uses. Typically means
+         * they should be prefixed with {@code @}.
+         */
+        TYPES_AS_ANNOTATIONS,
+        /**
+         * The context is in a qualified expression (like member access). Simple
+         * names only should be used.
+         */
+        QUALIFIED,
+        ;
+    }
+
+    /**
+     * A convertor from a list of {@linkplain ElementSuggestion} to a list
+     * of custom target completion items.
+     *
+     * @param <S> a custom target completion type.
+     * @since 26
+     */
+    public interface ElementSuggestionConvertor<S> {
+        /**
+         * Convert a list of {@linkplain ElementSuggestion} to a list
+         * of custom completion items.
+         *
+         * @param state the state of the completion
+         * @param suggestions the input suggestions
+         * @return the converted suggestions
+         */
+        public List<S> convert(CompletionState state, List<? extends ElementSuggestion> suggestions);
+    }
+
     /**
      * A documentation for a candidate for continuation of the given user's input.
      */
@@ -333,6 +480,18 @@ public abstract class SourceCodeAnalysis {
          * @return the javadoc, or null if not found or not requested
          */
         String javadoc();
+
+        /**
+         * If this {@code Documentation} is created for a method invocation,
+         * return the current parameter index.
+         *
+         * @implNote the default implementation returns {@code -1}
+         * @return the active parameter index, or {@code -1} if not available
+         * @since 26
+         */
+        default int activeParameterIndex() {
+            return -1;
+        }
     }
 
     /**
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index 19bad110a5d..d5b44b569a4 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
@@ -114,11 +114,13 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -152,8 +154,13 @@ import static jdk.jshell.SourceCodeAnalysis.Completeness.DEFINITELY_INCOMPLETE;
 import static jdk.jshell.TreeDissector.printType;
 
 import static java.util.stream.Collectors.joining;
+import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
+import static javax.lang.model.element.ElementKind.MODULE;
+import static javax.lang.model.element.ElementKind.PACKAGE;
 
 import javax.lang.model.type.IntersectionType;
+import javax.lang.model.util.Elements;
+import jdk.internal.shellsupport.doc.JavadocHelper.StoredElement;
 
 /**
  * The concrete implementation of SourceCodeAnalysis.
@@ -278,18 +285,76 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
 
     @Override
     public List<Suggestion> completionSuggestions(String code, int cursor, int[] anchor) {
-        suspendIndexing();
+        ElementSuggestionConvertor<Suggestion> convertor = (state, suggestions) -> {
+            Set<String> haveParams = suggestions.stream()
+                    .map(s -> s.element())
+                    .filter(el -> el != null)
+                    .filter(IS_CONSTRUCTOR.or(IS_METHOD))
+                    .filter(c -> !((ExecutableElement)c).getParameters().isEmpty())
+                    .map(this::simpleContinuationName)
+                    .collect(toSet());
+            List<Suggestion> result = new ArrayList<>();
+
+            for (ElementSuggestion s : suggestions) {
+                Element el = s.element();
+                if (el != null) {
+                    String continuation = continuationName(state, el);
+
+                    switch (el.getKind()) {
+                        case CONSTRUCTOR, METHOD -> {
+                            if (state.completionContext().contains(CompletionContext.ANNOTATION_ATTRIBUTE)) {
+                                continuation += " = ";
+                            } else if (!state.completionContext().contains(CompletionContext.NO_PAREN)) {
+                                // add trailing open or matched parenthesis, as approriate:
+                                continuation += haveParams.contains(continuation) ? "(" : "()";
+                            }
+                        }
+                        case ANNOTATION_TYPE -> {
+                            if (state.completionContext().contains(CompletionContext.TYPES_AS_ANNOTATIONS)) {
+                                boolean hasAnyAttributes =
+                                        ElementFilter.methodsIn(el.getEnclosedElements())
+                                                     .stream()
+                                                     .anyMatch(attribute -> attribute.getParameters().isEmpty());
+                                String paren = hasAnyAttributes ? "(" : "";
+                                continuation = "@" + continuation + paren;
+                            }
+                        }
+                        case PACKAGE ->
+                            // add trailing dot to package names
+                            continuation += ".";
+                    }
+
+                    result.add(new SuggestionImpl(continuation, s.matchesType()));
+                } else if (s.keyword() != null) {
+                    result.add(new SuggestionImpl(s.keyword(), s.matchesType()));
+                }
+
+                anchor[0] = s.anchor();
+            }
+
+            Collections.sort(result, Comparator.comparing(Suggestion::continuation));
+
+            return result;
+        };
         try {
-            return completionSuggestionsImpl(code, cursor, anchor);
+            return completionSuggestions(code, cursor, convertor);
         } catch (Throwable exc) {
             proc.debug(exc, "Exception thrown in SourceCodeAnalysisImpl.completionSuggestions");
             return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public <Suggestion> List<Suggestion> completionSuggestions(String code, int cursor, ElementSuggestionConvertor<Suggestion> convertor) {
+        suspendIndexing();
+        try {
+            return completionSuggestionsImpl(code, cursor, convertor);
         } finally {
             resumeIndexing();
         }
     }
 
-    private List<Suggestion> completionSuggestionsImpl(String code, int cursor, int[] anchor) {
+    private <Suggestion> List<Suggestion> completionSuggestionsImpl(String code, int cursor, ElementSuggestionConvertor<Suggestion> suggestionConvertor) {
         code = code.substring(0, cursor);
         Matcher m = JAVA_IDENTIFIER.matcher(code);
         String identifier = "";
@@ -302,31 +367,27 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         }
 
         OuterWrap codeWrap = wrapCodeForCompletion(code, cursor, true);
-        String[] requiredPrefix = new String[] {identifier};
-        return computeSuggestions(codeWrap, code, cursor, requiredPrefix, anchor).stream()
-                .filter(s -> filteringText(s).startsWith(requiredPrefix[0]) && !s.continuation().equals(REPL_DOESNOTMATTER_CLASS_NAME))
-                .sorted(Comparator.comparing(Suggestion::continuation))
-                .toList();
+        return computeSuggestions(codeWrap, code, cursor, identifier, suggestionConvertor);
     }
 
-    private static String filteringText(Suggestion suggestion) {
-        return suggestion instanceof SuggestionImpl impl
-                ? impl.filteringText
-                : suggestion.continuation();
-    }
+    private static List<String> COMPLETION_EXTRA_PARAMETERS = List.of("-parameters");
 
-    private List<Suggestion> computeSuggestions(OuterWrap code, String inputCode, int cursor, String[] requiredPrefix, int[] anchor) {
-        return proc.taskFactory.analyze(code, at -> {
+    private <Suggestion> List<Suggestion> computeSuggestions(OuterWrap code, String inputCode, int cursor, String prefix, ElementSuggestionConvertor<Suggestion> suggestionConvertor) {
+        return proc.taskFactory.analyze(code, COMPLETION_EXTRA_PARAMETERS, at -> {
+            try (JavadocHelper javadoc = JavadocHelper.create(at.task, findSources())) {
             SourcePositions sp = at.trees().getSourcePositions();
             CompilationUnitTree topLevel = at.firstCuTree();
-            List<Suggestion> result = new ArrayList<>();
             TreePath tp = pathFor(topLevel, sp, code, cursor);
             if (tp != null) {
+                List<ElementSuggestion> result = new ArrayList<>();
                 Scope scope = at.trees().getScope(tp);
+                Collection<? extends Element> scopeContent = scopeContent(at, scope, IDENTITY);
+                Set<CompletionContext> completionContext = EnumSet.noneOf(CompletionContext.class);
                 Predicate<Element> accessibility = createAccessibilityFilter(at, tp);
                 Predicate<Element> smartTypeFilter;
                 Predicate<Element> smartFilter;
                 Iterable<TypeMirror> targetTypes = findTargetType(at, tp);
+                TypeMirror selectorType = null;
                 if (targetTypes != null) {
                     if (tp.getLeaf().getKind() == Kind.MEMBER_REFERENCE) {
                         Types types = at.getTypes();
@@ -386,24 +447,24 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 }
                 switch (tp.getLeaf().getKind()) {
                     case MEMBER_REFERENCE, MEMBER_SELECT: {
+                        completionContext.add(CompletionContext.QUALIFIED);
+
                         javax.lang.model.element.Name identifier;
                         ExpressionTree expression;
-                        Function<Boolean, String> paren;
                         if (tp.getLeaf().getKind() == Kind.MEMBER_SELECT) {
                             MemberSelectTree mst = (MemberSelectTree)tp.getLeaf();
                             identifier = mst.getIdentifier();
                             expression = mst.getExpression();
-                            paren = DEFAULT_PAREN;
                         } else {
                             MemberReferenceTree mst = (MemberReferenceTree)tp.getLeaf();
                             identifier = mst.getName();
                             expression = mst.getQualifierExpression();
-                            paren = NO_PAREN;
+                            completionContext.add(CompletionContext.NO_PAREN);
                         }
                         if (identifier.contentEquals("*"))
                             break;
                         TreePath exprPath = new TreePath(tp, expression);
-                        TypeMirror site = at.trees().getTypeMirror(exprPath);
+                        selectorType = at.trees().getTypeMirror(exprPath);
                         boolean staticOnly = isStaticContext(at, exprPath);
                         ImportTree it = findImport(tp);
 
@@ -413,17 +474,14 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                                 ? ((MemberSelectTree) it.getQualifiedIdentifier()).getExpression().toString() + "."
                                 : "";
 
-                            addModuleElements(at, qualifiedPrefix, result);
+                            addModuleElements(at, javadoc, selectStart, qualifiedPrefix + prefix, result);
 
-                            requiredPrefix[0] = qualifiedPrefix + requiredPrefix[0];
-                            anchor[0] = selectStart;
-
-                            return result;
+                            break;
                         }
 
                         boolean isImport = it != null;
 
-                        List<? extends Element> members = membersOf(at, site, staticOnly && !isImport && tp.getLeaf().getKind() == Kind.MEMBER_SELECT);
+                        List<? extends Element> members = membersOf(at, selectorType, staticOnly && !isImport && tp.getLeaf().getKind() == Kind.MEMBER_SELECT);
                         Predicate<Element> filter = accessibility;
 
                         if (isNewClass(tp)) { // new xxx.|
@@ -434,7 +492,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                                     }
                                     return true;
                                 });
-                            addElements(membersOf(at, members), constructorFilter, smartFilter, result);
+                            addElements(javadoc, membersOf(at, members), constructorFilter, smartFilter, cursor, prefix, result);
 
                             filter = filter.and(IS_PACKAGE);
                         } else if (isThrowsClause(tp)) {
@@ -442,7 +500,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                             filter = filter.and(IS_PACKAGE.or(IS_CLASS).or(IS_INTERFACE));
                             smartFilter = IS_PACKAGE.negate().and(smartTypeFilter);
                         } else if (isImport) {
-                            paren = NO_PAREN;
+                            completionContext.add(CompletionContext.NO_PAREN);
                             if (!it.isStatic()) {
                                 filter = filter.and(IS_PACKAGE.or(IS_CLASS).or(IS_INTERFACE));
                             }
@@ -452,7 +510,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
 
                         filter = filter.and(staticOnly ? STATIC_ONLY : INSTANCE_ONLY);
 
-                        addElements(members, filter, smartFilter, paren, result);
+                        addElements(javadoc, members, filter, smartFilter, cursor, prefix, result);
                         break;
                     }
                     case IDENTIFIER:
@@ -466,35 +524,43 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                             if (enclosingExpression != null) { // expr.new IDENT|
                                 TypeMirror site = at.trees().getTypeMirror(new TreePath(tp, enclosingExpression));
                                 filter = filter.and(el -> el.getEnclosingElement().getKind() == ElementKind.CLASS && !el.getEnclosingElement().getModifiers().contains(Modifier.STATIC));
-                                addElements(membersOf(at, membersOf(at, site, false)), filter, smartFilter, result);
+                                addElements(javadoc, membersOf(at, membersOf(at, site, false)), filter, smartFilter, cursor, prefix, result);
                             } else {
-                                addScopeElements(at, scope, listEnclosed, filter, smartFilter, result);
+                                addScopeElements(at, javadoc, scope, listEnclosed, filter, smartFilter, cursor, prefix, result);
                             }
                             break;
                         }
                         if (isThrowsClause(tp)) {
                             Predicate<Element> accept = accessibility.and(STATIC_ONLY)
                                     .and(IS_PACKAGE.or(IS_CLASS).or(IS_INTERFACE));
-                            addScopeElements(at, scope, IDENTITY, accept, IS_PACKAGE.negate().and(smartTypeFilter), result);
+                            addElements(javadoc, scopeContent, accept, IS_PACKAGE.negate().and(smartTypeFilter), cursor, prefix, result);
                             break;
                         }
                         if (isAnnotation(tp)) {
+                            completionContext.add(CompletionContext.TYPES_AS_ANNOTATIONS);
+
                             if (getAnnotationAttributeNameOrNull(tp.getParentPath(), true) != null) {
                                 //nested annotation
-                                result = completionSuggestionsImpl(inputCode, cursor - 1, anchor);
-                                requiredPrefix[0] = "@" + requiredPrefix[0];
-                                return result;
+                                return completionSuggestionsImpl(inputCode, cursor - 1, (state, items) -> {
+                                    CompletionState newState = new CompletionStateImpl(((CompletionStateImpl) state).scopeContent, completionContext, state.selectorType(), state.elementUtils(), state.typeUtils());
+                                    return suggestionConvertor.convert(newState,
+                                                                       items.stream()
+                                                                            .filter(s -> s.element().getKind() == ElementKind.ANNOTATION_TYPE)
+                                                                            .filter(s -> s.element().getSimpleName().toString().startsWith(prefix))
+                                                                            .map(s -> new ElementSuggestionImpl(s.element(), s.keyword(), s.matchesType(), s.anchor(), s.documentation()))
+                                                                            .<ElementSuggestion>toList());
+                                });
                             }
 
                             Predicate<Element> accept = accessibility.and(STATIC_ONLY)
                                     .and(IS_PACKAGE.or(IS_CLASS).or(IS_INTERFACE));
-                            addScopeElements(at, scope, IDENTITY, accept, IS_PACKAGE.negate().and(smartTypeFilter), result);
+                            addElements(javadoc, scopeContent, accept, IS_PACKAGE.negate().and(smartTypeFilter), cursor - 1, prefix, result);
                             break;
                         }
                         ImportTree it = findImport(tp);
                         if (it != null) {
                             if (it.isModule()) {
-                                addModuleElements(at, "", result);
+                                addModuleElements(at, javadoc, cursor, prefix, result);
                             } else {
                                 // the context of the identifier is an import, look for
                                 // package names that start with the identifier.
@@ -503,20 +569,20 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                                 // JShell to change to use the default package, and that
                                 // change is done, then this should use some variation
                                 // of membersOf(at, at.getElements().getPackageElement("").asType(), false)
-                                addElements(listPackages(at, ""),
+                                addElements(javadoc, listPackages(at, ""),
                                         it.isStatic()
                                                 ? STATIC_ONLY.and(accessibility)
                                                 : accessibility,
-                                        smartFilter, result);
+                                        smartFilter, cursor, prefix, result);
 
-                                result.add(new SuggestionImpl("module ", false));
+                                result.add(new ElementSuggestionImpl(null, "module ", false, cursor, () -> null)); //TODO: better javadoc?
                             }
                         }
                         break;
                     case CLASS: {
                         Predicate<Element> accept = accessibility.and(IS_TYPE);
-                        addScopeElements(at, scope, IDENTITY, accept, smartFilter, result);
-                        addElements(primitivesOrVoid(at), TRUE, smartFilter, result);
+                        addElements(javadoc, scopeContent, accept, smartFilter, cursor, prefix, result);
+                        addElements(javadoc, primitivesOrVoid(at), TRUE, smartFilter, cursor, prefix, result);
                         break;
                     }
                     case BLOCK:
@@ -553,6 +619,8 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                                 accept = accept.and(IS_TYPE);
                             }
                         } else if (tp.getParentPath().getLeaf().getKind() == Kind.ANNOTATION) {
+                            completionContext.add(CompletionContext.ANNOTATION_ATTRIBUTE);
+
                             AnnotationTree annotation = (AnnotationTree) tp.getParentPath().getLeaf();
                             Element annotationType = at.trees().getElement(tp.getParentPath());
                             Set<String> present = annotation.getArguments()
@@ -563,15 +631,18 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                                                             .filter(var -> var.getKind() == Kind.IDENTIFIER)
                                                             .map(var -> ((IdentifierTree) var).getName().toString())
                                                             .collect(Collectors.toSet());
-                            addElements(ElementFilter.methodsIn(annotationType.getEnclosedElements()), el -> !present.contains(el.getSimpleName().toString()), TRUE, _ -> " = ", result);
+                            addElements(javadoc, ElementFilter.methodsIn(annotationType.getEnclosedElements()), el -> !present.contains(el.getSimpleName().toString()), TRUE, cursor, prefix, /*_ -> " = ", */result);
                             break;
                         } else if (getAnnotationAttributeNameOrNull(tp, true) instanceof String attributeName) {
+                            completionContext.add(CompletionContext.ANNOTATION_ATTRIBUTE);
+
                             Element annotationType = tp.getParentPath().getParentPath().getLeaf().getKind() == Kind.ANNOTATION
                                     ? at.trees().getElement(tp.getParentPath().getParentPath())
                                     : at.trees().getElement(tp.getParentPath().getParentPath().getParentPath());
                             if (sp.getEndPosition(topLevel, tp.getParentPath().getLeaf()) == (-1)) {
                                 //synthetic 'value':
-                                addElements(ElementFilter.methodsIn(annotationType.getEnclosedElements()), TRUE, TRUE, _ -> " = ", result);
+                                //TODO: filter out existing:
+                                addElements(javadoc, ElementFilter.methodsIn(annotationType.getEnclosedElements()), TRUE, TRUE, cursor, prefix, result);
                                 boolean hasValue = findAnnotationAttributeIfAny(annotationType, "value").isPresent();
                                 if (!hasValue) {
                                     break;
@@ -588,29 +659,18 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                             if (relevantAttributeType.getKind() == TypeKind.DECLARED &&
                                 at.getTypes().asElement(relevantAttributeType) instanceof Element attributeTypeEl) {
                                 if (attributeTypeEl.getKind() == ElementKind.ANNOTATION_TYPE) {
-                                    boolean hasAnyAttributes =
-                                            ElementFilter.methodsIn(attributeTypeEl.getEnclosedElements())
-                                                         .stream()
-                                                         .anyMatch(attribute -> attribute.getParameters().isEmpty());
-                                    String paren = hasAnyAttributes ? "(" : "";
-                                    String name = scopeContent(at, scope, IDENTITY).contains(attributeTypeEl)
-                                            ? attributeTypeEl.getSimpleName().toString() //simple name ought to be enough:
-                                            : ((TypeElement) attributeTypeEl).getQualifiedName().toString();
-                                    result.add(new SuggestionImpl("@" + name + paren, true));
+                                    completionContext.add(CompletionContext.TYPES_AS_ANNOTATIONS);
+
+                                    addElements(javadoc, List.of(attributeTypeEl), TRUE, TRUE, cursor, prefix, result);
                                     break;
                                 } else if (attributeTypeEl.getKind() == ElementKind.ENUM) {
-                                    String typeName = scopeContent(at, scope, IDENTITY).contains(attributeTypeEl)
-                                            ? attributeTypeEl.getSimpleName().toString() //simple name ought to be enough:
-                                            : ((TypeElement) attributeTypeEl).getQualifiedName().toString();
-                                    result.add(new SuggestionImpl(typeName, true));
-                                    result.addAll(ElementFilter.fieldsIn(attributeTypeEl.getEnclosedElements())
-                                                               .stream()
-                                                               .filter(e -> e.getKind() == ElementKind.ENUM_CONSTANT)
-                                                               .map(c -> new SuggestionImpl(scopeContent(at, scope, IDENTITY).contains(c)
-                                                                       ? c.getSimpleName().toString()
-                                                                       : typeName + "." + c.getSimpleName(), c.getSimpleName().toString(),
-                                                                       true))
-                                                               .toList());
+                                    List<Element> elements = new ArrayList<>();
+                                    elements.add(attributeTypeEl);
+                                    ElementFilter.fieldsIn(attributeTypeEl.getEnclosedElements())
+                                                 .stream()
+                                                 .filter(e -> e.getKind() == ElementKind.ENUM_CONSTANT)
+                                                 .forEach(elements::add);
+                                    addElements(javadoc, elements, TRUE, TRUE, cursor, prefix, result);
                                     break;
                                 }
                             }
@@ -625,7 +685,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                             insertPrimitiveTypes = false;
                         }
 
-                        addScopeElements(at, scope, IDENTITY, accept, smartFilter, result);
+                        addElements(javadoc, scopeContent, accept, smartFilter, cursor, prefix, result);
 
                         if (insertPrimitiveTypes) {
                             Tree parent = tp.getParentPath().getLeaf();
@@ -637,22 +697,32 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                                 case TYPE_PARAMETER, CLASS, INTERFACE, ENUM, RECORD -> FALSE;
                                 default -> TRUE;
                             };
-                            addElements(primitivesOrVoid(at), accept, smartFilter, result);
+                            addElements(javadoc, primitivesOrVoid(at), accept, smartFilter, cursor, prefix, result);
                         }
 
                         boolean hasBooleanSmartType = targetTypes != null &&
                                 StreamSupport.stream(targetTypes.spliterator(), false)
                                              .anyMatch(tm -> tm.getKind() == TypeKind.BOOLEAN);
                         if (hasBooleanSmartType) {
-                            result.add(new SuggestionImpl("true", true));
-                            result.add(new SuggestionImpl("false", true));
+                            for (String booleanKeyword : new String[] {"false", "true"}) {
+                                if (booleanKeyword.startsWith(prefix)) {
+                                    result.add(new ElementSuggestionImpl(null, booleanKeyword, true, cursor, () -> null));
+                                }
+                            }
                         }
                         break;
                     }
                 }
+
+                CompletionState completionState = new CompletionStateImpl(scopeContent, completionContext, selectorType, at.getElements(), at.getTypes());
+
+                return suggestionConvertor.convert(completionState, result);
             }
-            anchor[0] = cursor;
-            return result;
+            } catch (IOException ex) {
+                //TODO:
+                ex.printStackTrace();
+            }
+            return Collections.emptyList();
         });
     }
 
@@ -1162,59 +1232,74 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 IS_PACKAGE.test(encl);
     };
     private final Function<Element, Iterable<? extends Element>> IDENTITY = Collections::singletonList;
-    private final Function<Boolean, String> DEFAULT_PAREN = hasParams -> hasParams ? "(" : "()";
-    private final Function<Boolean, String> NO_PAREN = hasParams -> "";
-
-    private void addElements(Iterable<? extends Element> elements, Predicate<Element> accept, Predicate<Element> smart, List<Suggestion> result) {
-        addElements(elements, accept, smart, DEFAULT_PAREN, result);
-    }
-    private void addElements(Iterable<? extends Element> elements, Predicate<Element> accept, Predicate<Element> smart, Function<Boolean, String> paren, List<Suggestion> result) {
-        Set<String> hasParams = Util.stream(elements)
-                .filter(accept)
-                .filter(IS_CONSTRUCTOR.or(IS_METHOD))
-                .filter(c -> !((ExecutableElement)c).getParameters().isEmpty())
-                .map(this::simpleName)
-                .collect(toSet());
 
+    private void addElements(JavadocHelper javadoc, Iterable<? extends Element> elements, Predicate<Element> accept, Predicate<Element> smart, int anchor, String prefix, List<ElementSuggestion> result) {
         for (Element c : elements) {
-            if (!accept.test(c))
+            if (!accept.test(c) || !simpleContinuationName(c).startsWith(prefix))
                 continue;
             if (c.getKind() == ElementKind.METHOD &&
                 c.getSimpleName().contentEquals(Util.DOIT_METHOD_NAME) &&
                 ((ExecutableElement) c).getParameters().isEmpty()) {
                 continue;
             }
-            String simpleName = simpleName(c);
-            switch (c.getKind()) {
-                case CONSTRUCTOR:
-                case METHOD:
-                    // add trailing open or matched parenthesis, as approriate
-                    simpleName += paren.apply(hasParams.contains(simpleName));
-                    break;
-                case PACKAGE:
-                    // add trailing dot to package names
-                    simpleName += ".";
-                    break;
-            }
-            result.add(new SuggestionImpl(simpleName, smart.test(c)));
+            StoredElement stored = javadoc.getHandle(c);
+            Collection<? extends Path> sourceLocations = javadoc.getSourceLocations();
+            result.add(new ElementSuggestionImpl(c, null, smart.test(c), anchor, () -> {
+                return proc.taskFactory.analyze(proc.outerMap.wrapInTrialClass(Wrap.methodWrap(";")), task -> {
+                    try (JavadocHelper nestedJavadoc = JavadocHelper.create(task.task, sourceLocations)) {
+                        return nestedJavadoc.getResolvedDocComment(stored);
+                    } catch (IOException ex) {
+                        ex.printStackTrace();
+                    }
+                    return null;
+                });
+            }));
         }
     }
 
-    private void addModuleElements(AnalyzeTask at,
+    private void addModuleElements(AnalyzeTask at, JavadocHelper javadoc, int anchor,
                                    String prefix,
-                                   List<Suggestion> result) {
+                                   List<ElementSuggestion> result) {
         for (ModuleElement me : at.getElements().getAllModuleElements()) {
             if (!me.getQualifiedName().toString().startsWith(prefix)) {
                 continue;
             }
-            result.add(new SuggestionImpl(me.getQualifiedName().toString(),
-                                          false));
+            result.add(new ElementSuggestionImpl(me, null, false, anchor, () -> null)); //TODO: better javadoc!
         }
     }
 
-    private String simpleName(Element el) {
-        return el.getKind() == ElementKind.CONSTRUCTOR ? el.getEnclosingElement().getSimpleName().toString()
-                                                       : el.getSimpleName().toString();
+    private String simpleContinuationName(Element el) {
+        return switch (el.getKind()) {
+            case CONSTRUCTOR -> el.getEnclosingElement().getSimpleName().toString();
+            case MODULE -> ((ModuleElement) el).getQualifiedName().toString();
+            default -> el.getSimpleName().toString();
+        };
+    }
+
+    private String continuationName(CompletionState state, Element el) {
+        if (state.completionContext().contains(CompletionContext.QUALIFIED)) {
+            return simpleContinuationName(el);
+        } else if (state.availableUsingSimpleName(el)) {
+            return el.getSimpleName().toString();
+        } else {
+            return (switch (el.getKind()) {
+                case PACKAGE -> ((PackageElement) el).getQualifiedName();
+                case ANNOTATION_TYPE, CLASS, ENUM, INTERFACE, RECORD ->
+                        primitiveLikeClass(el)
+                            ? el.getSimpleName()
+                            : continuationName(state, el.getEnclosingElement()) + "." + el.getSimpleName();
+                case ENUM_CONSTANT, FIELD, METHOD ->
+                    el.getModifiers().contains(Modifier.STATIC)
+                        ? continuationName(state, el.getEnclosingElement()) + "." + el.getSimpleName()
+                        : el.getSimpleName();
+                default -> simpleContinuationName(el);
+            }).toString();
+        }
+    }
+
+    private boolean primitiveLikeClass(Element el) {
+        return el.asType().getKind().isPrimitive() ||
+               el.asType().getKind() == TypeKind.VOID;
     }
 
     private List<? extends Element> membersOf(AnalyzeTask at, TypeMirror site, boolean shouldGenerateDotClassItem) {
@@ -1625,8 +1710,8 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         };
     }
 
-    private void addScopeElements(AnalyzeTask at, Scope scope, Function<Element, Iterable<? extends Element>> elementConvertor, Predicate<Element> filter, Predicate<Element> smartFilter, List<Suggestion> result) {
-        addElements(scopeContent(at, scope, elementConvertor), filter, smartFilter, result);
+    private void addScopeElements(AnalyzeTask at, JavadocHelper javadoc, Scope scope, Function<Element, Iterable<? extends Element>> elementConvertor, Predicate<Element> filter, Predicate<Element> smartFilter, int anchor, String prefix, List<ElementSuggestion> result) {
+        addElements(javadoc, scopeContent(at, scope, elementConvertor), filter, smartFilter, anchor, prefix, result);
     }
 
     private Iterable<Pair<ExecutableElement, ExecutableType>> methodCandidates(AnalyzeTask at, TreePath invocation) {
@@ -1759,6 +1844,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
             Stream<Element> elements;
             Iterable<Pair<ExecutableElement, ExecutableType>> candidates;
             List<? extends ExpressionTree> arguments;
+            int parameterIndex = -1;
 
             if (tp.getLeaf().getKind() == Kind.METHOD_INVOCATION || tp.getLeaf().getKind() == Kind.NEW_CLASS) {
                 if (tp.getLeaf().getKind() == Kind.METHOD_INVOCATION) {
@@ -1783,6 +1869,10 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 }
 
                 elements = Util.stream(candidates).map(method -> method.fst);
+
+                if (prevPath != null) {
+                    parameterIndex = arguments.indexOf(prevPath.getLeaf());
+                }
             } else if (tp.getLeaf().getKind() == Kind.IDENTIFIER || tp.getLeaf().getKind() == Kind.MEMBER_SELECT) {
                 Element el = at.trees().getElement(tp);
 
@@ -1820,7 +1910,8 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
             List<Documentation> result = Collections.emptyList();
 
             try (JavadocHelper helper = JavadocHelper.create(at.task, findSources())) {
-                result = elements.map(el -> constructDocumentation(at, helper, el, computeJavadoc))
+                int parameterIndexFin = parameterIndex;
+                result = elements.map(el -> constructDocumentation(at, helper, el, parameterIndexFin, computeJavadoc))
                                  .filter(Objects::nonNull)
                                  .toList();
             } catch (IOException ex) {
@@ -1831,7 +1922,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         });
     }
 
-    private Documentation constructDocumentation(AnalyzeTask at, JavadocHelper helper, Element el, boolean computeJavadoc) {
+    private Documentation constructDocumentation(AnalyzeTask at, JavadocHelper helper, Element el, int parameterIndex, boolean computeJavadoc) {
         String javadoc = null;
         try {
             if (hasSyntheticParameterNames(el)) {
@@ -1844,7 +1935,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
             proc.debug(ex, "SourceCodeAnalysisImpl.element2String(..., " + el + ")");
         }
         String signature = Util.expunge(elementHeader(at, el, !hasSyntheticParameterNames(el), true));
-        return new DocumentationImpl(signature,  javadoc);
+        return new DocumentationImpl(signature, javadoc, parameterIndex);
     }
 
     public void close() {
@@ -1857,27 +1948,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         }
     }
 
-    private static final class DocumentationImpl implements Documentation {
-
-        private final String signature;
-        private final String javadoc;
-
-        public DocumentationImpl(String signature, String javadoc) {
-            this.signature = signature;
-            this.javadoc = javadoc;
-        }
-
-        @Override
-        public String signature() {
-            return signature;
-        }
-
-        @Override
-        public String javadoc() {
-            return javadoc;
-        }
-
-    }
+    private record DocumentationImpl(String signature, String javadoc, int activeParameterIndex) implements Documentation {}
 
     private boolean isEmptyArgumentsContext(List<? extends ExpressionTree> arguments) {
         if (arguments.size() == 1) {
@@ -2520,7 +2591,6 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
     private static class SuggestionImpl implements Suggestion {
 
         private final String continuation;
-        private final String filteringText;
         private final boolean matchesType;
 
         /**
@@ -2530,19 +2600,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
          * @param matchesType does the candidate match the target type
          */
         public SuggestionImpl(String continuation, boolean matchesType) {
-            this(continuation, continuation, matchesType);
-        }
-
-        /**
-         * Create a {@code Suggestion} instance.
-         *
-         * @param continuation a candidate continuation of the user's input
-         * @param filteringText a text that should be used for filtering
-         * @param matchesType does the candidate match the target type
-         */
-        public SuggestionImpl(String continuation, String filteringText, boolean matchesType) {
             this.continuation = continuation;
-            this.filteringText = filteringText;
             this.matchesType = matchesType;
         }
 
@@ -2620,4 +2678,53 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         }
     }
 
+    record ElementSuggestionImpl(Element element, String keyword, boolean matchesType, int anchor, Supplier<String> documentation) implements ElementSuggestion {
+    }
+
+    final static class CompletionStateImpl implements CompletionState {
+
+        private final Collection<? extends Element> scopeContent;
+        private final Set<CompletionContext> completionContext;
+        private final TypeMirror selectorType;
+        private final Elements elementUtils;
+        private final Types typeUtils;
+
+        public CompletionStateImpl(Collection<? extends Element> scopeContent,
+                                   Set<CompletionContext> completionContext,
+                                   TypeMirror selectorType,
+                                   Elements elementUtils,
+                                   Types typeUtils) {
+            this.scopeContent = scopeContent;
+            this.completionContext = completionContext;
+            this.selectorType = selectorType;
+            this.elementUtils = elementUtils;
+            this.typeUtils = typeUtils;
+        }
+
+        @Override
+        public boolean availableUsingSimpleName(Element el) {
+            return scopeContent.contains(el);
+        }
+
+        @Override
+        public Set<CompletionContext> completionContext() {
+            return completionContext;
+        }
+
+        @Override
+        public TypeMirror selectorType() {
+            return selectorType;
+        }
+
+        @Override
+        public Elements elementUtils() {
+            return elementUtils;
+        }
+
+        @Override
+        public Types typeUtils() {
+            return typeUtils;
+        }
+
+    }
 }
diff --git a/test/langtools/jdk/jshell/CompletionAPITest.java b/test/langtools/jdk/jshell/CompletionAPITest.java
new file mode 100644
index 00000000000..ad5dea90a95
--- /dev/null
+++ b/test/langtools/jdk/jshell/CompletionAPITest.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8366691
+ * @summary Test JShell Completion API
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.javap
+ *          jdk.jshell/jdk.jshell:open
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
+ * @build KullaTesting TestingInputStream Compiler
+ * @run junit CompletionAPITest
+ */
+
+import java.io.IOException;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.stream.Collectors;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.QualifiedNameable;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import jdk.jshell.SourceCodeAnalysis.CompletionContext;
+import jdk.jshell.SourceCodeAnalysis.CompletionState;
+import jdk.jshell.SourceCodeAnalysis.ElementSuggestion;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+public class CompletionAPITest extends KullaTesting {
+
+    private static final long TIMEOUT = 2_000;
+
+    @Test
+    public void testAPI() {
+        waitIndexingFinished();
+        assertEval("String str = \"\";");
+        List<String> actual;
+        actual = completionSuggestions("str.", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.QUALIFIED), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang.String.length()"), String.valueOf(actual));
+        actual = completionSuggestions("java.lang.", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.QUALIFIED), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang.String"), String.valueOf(actual));
+        actual = completionSuggestions("java.", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.QUALIFIED), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang"), String.valueOf(actual));
+        assertEval("@interface Ann2 { }");
+        assertEval("@interface Ann1 { Ann2 value(); }");
+        actual = completionSuggestions("@Ann", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.TYPES_AS_ANNOTATIONS), state.completionContext());
+        });
+        assertTrue(actual.containsAll(Set.of("Ann1", "Ann2")), String.valueOf(actual));
+        actual = completionSuggestions("@Ann1(", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.ANNOTATION_ATTRIBUTE,
+                                    CompletionContext.TYPES_AS_ANNOTATIONS),
+                         state.completionContext());
+        });
+        assertTrue(actual.contains("Ann2"), String.valueOf(actual));
+        actual = completionSuggestions("import static java.lang.String.", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.QUALIFIED, CompletionContext.NO_PAREN), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang.String.valueOf(int arg0)"), String.valueOf(actual));
+        actual = completionSuggestions("java.util.function.IntFunction<String> f = String::", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.QUALIFIED, CompletionContext.NO_PAREN), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang.String.valueOf(int arg0)"), String.valueOf(actual));
+        actual = completionSuggestions("str.^len", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.QUALIFIED), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang.String.length()"), String.valueOf(actual));
+        actual = completionSuggestions("^@Depr", (state, suggestions) -> {
+            assertEquals(EnumSet.of(CompletionContext.TYPES_AS_ANNOTATIONS), state.completionContext());
+        });
+        assertTrue(actual.contains("java.lang.Deprecated"), String.valueOf(actual));
+        assertEval("import java.util.*;");
+        actual = completionSuggestions("^ArrayL", (state, suggestions) -> {
+            TypeElement arrayList =
+                suggestions.stream()
+                           .filter(el -> el.element() != null)
+                           .map(el -> el.element())
+                           .filter(el -> el.getKind() == ElementKind.CLASS)
+                           .map(el -> (TypeElement) el)
+                           .filter(el -> el.getQualifiedName().contentEquals("java.util.ArrayList"))
+                           .findAny()
+                           .orElseThrow();
+            assertTrue(state.availableUsingSimpleName(arrayList));
+            assertEquals(EnumSet.noneOf(CompletionContext.class), state.completionContext());
+        });
+        assertTrue(actual.contains("java.util.ArrayList"), String.valueOf(actual));
+        completionSuggestions("(new java.util.ArrayList<String>()).", (state, suggestions) -> {
+            List<String> elsWithTypes =
+                suggestions.stream()
+                           .filter(el -> el.element() != null)
+                           .map(el -> el.element())
+                           .filter(el -> el.getKind() == ElementKind.METHOD)
+                           .map(el -> el.getSimpleName() + state.typeUtils()
+                                                                .asMemberOf((DeclaredType) state.selectorType(), el)
+                                                                .toString())
+                           .toList();
+            assertTrue(elsWithTypes.contains("add(java.lang.String)boolean"));
+        });
+    }
+
+    @Test
+    public void testDocumentation() {
+        waitIndexingFinished();
+
+        Path classes = prepareZip();
+        getState().addToClasspath(classes.toString());
+
+        AtomicReference<Supplier<String>> documentation = new AtomicReference<>();
+        AtomicReference<Reference<Element>> clazz = new AtomicReference<>();
+        completionSuggestions("jshelltest.JShellTest", (state, suggestions) -> {
+            ElementSuggestion test =
+                    suggestions.stream()
+                               .filter(el -> el.element() != null)
+                               .filter(el -> el.element().getKind() == ElementKind.CLASS)
+                               .filter(el -> ((TypeElement) el.element()).getQualifiedName().contentEquals("jshelltest.JShellTest"))
+                               .findAny()
+                               .orElseThrow();
+            documentation.set(test.documentation());
+            clazz.set(new WeakReference<>(test.element()));
+        });
+
+        //throw away the JavacTaskPool, so that the cached javac instances are dropped:
+        getState().addToClasspath("undefined");
+
+        long start = System.currentTimeMillis();
+
+        while (clazz.get().get() != null && (System.currentTimeMillis() - start) < TIMEOUT) {
+            System.gc();
+        }
+
+        assertNull(clazz.get().get());
+        assertEquals("JShellTest 0 ", documentation.get().get());
+    }
+
+    @Test
+    public void testSignature() {
+        waitIndexingFinished();
+
+        assertEval("void test(int i) {}");
+        assertEval("void test(int i, int j) {}");
+        assertSignature("test(|", true, "void test(int i):0", "void test(int i, int j):0");
+        assertSignature("test(0, |", true, "void test(int i, int j):1");
+    }
+
+    private List<String> completionSuggestions(String input,
+                                               BiConsumer<CompletionState, List<? extends ElementSuggestion>> validator) {
+        int expectedAnchor = input.indexOf('^');
+
+        if (expectedAnchor != (-1)) {
+            input = input.substring(0, expectedAnchor) + input.substring(expectedAnchor + 1);
+        }
+
+        AtomicInteger mergedAnchor = new AtomicInteger(-1);
+
+        List<String> result = getAnalysis().completionSuggestions(input, input.length(), (state, suggestions) -> {
+            validator.accept(state, suggestions);
+
+            if (expectedAnchor != (-1)) {
+                for (ElementSuggestion sugg : suggestions) {
+                    if (mergedAnchor.get() == (-1)) {
+                        mergedAnchor.set(sugg.anchor());
+                    } else {
+                        assertEquals(mergedAnchor.get(), sugg.anchor());
+                    }
+                }
+            }
+
+            return suggestions.stream()
+                           .map(this::convertElement)
+                           .toList();
+        });
+
+        if (expectedAnchor != (-1)) {
+            assertEquals(expectedAnchor, mergedAnchor.get());
+        }
+
+        return result;
+    }
+
+    private String convertElement(ElementSuggestion suggestion) {
+        if (suggestion.keyword() != null) {
+            return suggestion.keyword();
+        }
+
+        Element el = suggestion.element();
+
+        if (el.getKind().isClass() || el.getKind().isInterface() || el.getKind() == ElementKind.PACKAGE) {
+            String qualifiedName = ((QualifiedNameable) el).getQualifiedName().toString();
+            if (qualifiedName.startsWith("REPL.$JShell$")) {
+                String[] parts = qualifiedName.split("\\.", 3);
+
+                return parts[2];
+            } else {
+                return qualifiedName;
+            }
+        } else if (el.getKind().isField()) {
+            return ((QualifiedNameable) el.getEnclosingElement()).getQualifiedName().toString() +
+                   "." +
+                   el.getSimpleName();
+        } else if (el.getKind() == ElementKind.CONSTRUCTOR || el.getKind() == ElementKind.METHOD) {
+            String name = el.getKind() == ElementKind.CONSTRUCTOR ? "" : "." + el.getSimpleName();
+            ExecutableElement method = (ExecutableElement) el;
+
+            return ((QualifiedNameable) el.getEnclosingElement()).getQualifiedName().toString() +
+                    name +
+                    method.getParameters()
+                          .stream()
+                          .map(var -> var.asType().toString() + " " + var.getSimpleName())
+                          .collect(Collectors.joining(", ", "(", ")"));
+        } else {
+            return el.getSimpleName().toString();
+        }
+    }
+
+    private Path prepareZip() {
+        String clazz =
+                "package jshelltest;\n" +
+                "/**JShellTest 0" +
+                " */\n" +
+                "public class JShellTest {\n" +
+                "}\n";
+
+        Path srcZip = Paths.get("src.zip");
+
+        try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(srcZip))) {
+            out.putNextEntry(new JarEntry("jshelltest/JShellTest.java"));
+            out.write(clazz.getBytes());
+        } catch (IOException ex) {
+            throw new IllegalStateException(ex);
+        }
+
+        compiler.compile(clazz);
+
+        try {
+            Field availableSources = Class.forName("jdk.jshell.SourceCodeAnalysisImpl").getDeclaredField("availableSourcesOverride");
+            availableSources.setAccessible(true);
+            availableSources.set(null, Arrays.asList(srcZip));
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | ClassNotFoundException ex) {
+            throw new IllegalStateException(ex);
+        }
+
+        return compiler.getClassDir();
+    }
+    //where:
+        private final Compiler compiler = new Compiler();
+
+    static {
+        try {
+            //disable reading of paramater names, to improve stability:
+            Class<?> analysisClass = Class.forName("jdk.jshell.SourceCodeAnalysisImpl");
+            Field params = analysisClass.getDeclaredField("COMPLETION_EXTRA_PARAMETERS");
+            params.setAccessible(true);
+            params.set(null, List.of());
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+}
diff --git a/test/langtools/jdk/jshell/CompletionSuggestionTest.java b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
index 7907fa4d027..7d739efddc6 100644
--- a/test/langtools/jdk/jshell/CompletionSuggestionTest.java
+++ b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
@@ -44,6 +44,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.jar.JarEntry;
@@ -901,7 +902,7 @@ public class CompletionSuggestionTest extends KullaTesting {
 
     @Test
     public void testAnnotation() {
-        assertCompletion("@Deprec|", "Deprecated");
+        assertCompletion("@Deprec|", "@Deprecated(");
         assertCompletion("@Deprecated(|", "forRemoval = ", "since = ");
         assertCompletion("@Deprecated(forRemoval = |", true, "false", "true");
         assertCompletion("@Deprecated(forRemoval = true, |", "since = ");
@@ -951,4 +952,16 @@ public class CompletionSuggestionTest extends KullaTesting {
         assertCompletion("class S { public int length() { return 0; } } new S().len|", true, "length()");
         assertSignature("void f() { } f(|", "void f()");
     }
+
+    static {
+        try {
+            //disable reading of paramater names, to improve stability:
+            Class<?> analysisClass = Class.forName("jdk.jshell.SourceCodeAnalysisImpl");
+            Field params = analysisClass.getDeclaredField("COMPLETION_EXTRA_PARAMETERS");
+            params.setAccessible(true);
+            params.set(null, List.of());
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
 }
diff --git a/test/langtools/jdk/jshell/KullaTesting.java b/test/langtools/jdk/jshell/KullaTesting.java
index fd9348507c4..8b62ce69a4c 100644
--- a/test/langtools/jdk/jshell/KullaTesting.java
+++ b/test/langtools/jdk/jshell/KullaTesting.java
@@ -44,6 +44,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -969,11 +970,21 @@ public class KullaTesting {
     }
 
     public void assertSignature(String code, String... expected) {
+        assertSignature(code, false, expected);
+    }
+
+    public void assertSignature(String code, boolean includeActive, String... expected) {
         int cursor =  code.indexOf('|');
         code = code.replace("|", "");
         assertTrue(cursor > -1, "'|' expected, but not found in: " + code);
         List<Documentation> documentation = getAnalysis().documentation(code, cursor, false);
-        Set<String> docSet = documentation.stream().map(doc -> doc.signature()).collect(Collectors.toSet());
+        Function<Documentation, String> convert;
+        if (includeActive) {
+            convert = doc -> doc.signature() + ":" + doc.activeParameterIndex();
+        } else {
+            convert = doc -> doc.signature();
+        }
+        Set<String> docSet = documentation.stream().map(convert).collect(Collectors.toSet());
         Set<String> expectedSet = Stream.of(expected).collect(Collectors.toSet());
         assertEquals(expectedSet, docSet, "Input: " + code);
     }
diff --git a/test/langtools/jdk/jshell/ToolTabSnippetTest.java b/test/langtools/jdk/jshell/ToolTabSnippetTest.java
index 968935b0814..112208c40b3 100644
--- a/test/langtools/jdk/jshell/ToolTabSnippetTest.java
+++ b/test/langtools/jdk/jshell/ToolTabSnippetTest.java
@@ -103,8 +103,8 @@ public class ToolTabSnippetTest extends UITesting {
             inputSink.write("(" + TAB);
             waitOutput(out, "\\(\n" +
                             resource("jshell.console.completion.current.signatures") + "\n" +
-                            "JShellTest\\(String str\\)\n" +
-                            "JShellTest\\(String str, int i\\)\n" +
+                            "JShellTest\\(\\u001B\\[1mString str\\u001B\\[0m\\)\n" +
+                            "JShellTest\\(\\u001B\\[1mString str\\u001B\\[0m, int i\\)\n" +
                             "\n" +
                             resource("jshell.console.see.documentation") +
                             REDRAW_PROMPT + "new JShellTest\\(");
@@ -138,8 +138,8 @@ public class ToolTabSnippetTest extends UITesting {
                             "str   \n" +
                             "\n" +
                             resource("jshell.console.completion.current.signatures") + "\n" +
-                            "JShellTest\\(String str\\)\n" +
-                            "JShellTest\\(String str, int i\\)\n" +
+                            "JShellTest\\(\\u001B\\[1mString str\\u001B\\[0m\\)\n" +
+                            "JShellTest\\(\\u001B\\[1mString str\\u001B\\[0m, int i\\)\n" +
                             "\n" +
                             resource("jshell.console.see.documentation") +
                             REDRAW_PROMPT + "new JShellTest\\(");

From 400a83da893f5fc285a175b63a266de21e93683c Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Wed, 12 Nov 2025 08:48:07 +0000
Subject: [PATCH 131/512] 8371625: G1: G1HeapRegion::print_on misalignment

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1HeapRegion.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index ca4359dcc24..63d64503316 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -428,7 +428,7 @@ bool G1HeapRegion::verify_code_roots(VerifyOption vo) const {
 void G1HeapRegion::print() const { print_on(tty); }
 
 void G1HeapRegion::print_on(outputStream* st) const {
-  st->print("|%4u", this->_hrm_index);
+  st->print("|%5u", this->_hrm_index);
   st->print("|" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT,
             p2i(bottom()), p2i(top()), p2i(end()));
   st->print("|%3d%%", (int) ((double) used() * 100 / capacity()));
@@ -442,7 +442,7 @@ void G1HeapRegion::print_on(outputStream* st) const {
     st->print("|  ");
   }
   G1ConcurrentMark* cm = G1CollectedHeap::heap()->concurrent_mark();
-  st->print("|TAMS " PTR_FORMAT "| PB " PTR_FORMAT "| %s ",
+  st->print("|TAMS " PTR_FORMAT "| PB " PTR_FORMAT "| %-9s ",
             p2i(cm->top_at_mark_start(this)), p2i(parsable_bottom_acquire()), rem_set()->get_state_str());
   if (UseNUMA) {
     G1NUMA* numa = G1NUMA::numa();

From 1f1f7bb44842fac966bd8f16cc6cfeee0ea972f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Wed, 12 Nov 2025 12:32:05 +0000
Subject: [PATCH 132/512] 8370024: HttpClient: QUIC congestion controller
 doesn't implement pacing

Reviewed-by: dfuchs
---
 .../net/http/quic/PacketSpaceManager.java     |  22 +-
 .../http/quic/QuicCongestionController.java   |  47 ++-
 .../net/http/quic/QuicConnectionImpl.java     |   2 +-
 .../jdk/internal/net/http/quic/QuicPacer.java | 191 ++++++++++++
 .../quic/QuicRenoCongestionController.java    | 116 +++++++-
 .../java/net/httpclient/quic/PacerTest.java   | 273 ++++++++++++++++++
 .../quic/PacketSpaceManagerTest.java          |  38 ++-
 7 files changed, 673 insertions(+), 16 deletions(-)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java
 create mode 100644 test/jdk/java/net/httpclient/quic/PacerTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java
index 494af85447e..90031decdb4 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java
@@ -97,6 +97,7 @@ public sealed class PacketSpaceManager implements PacketSpace
 
     private final QuicCongestionController congestionController;
     private volatile boolean blockedByCC;
+    private volatile boolean blockedByPacer;
     // packet threshold for loss detection; RFC 9002 suggests 3
     private static final long kPacketThreshold = 3;
     // Multiplier for persistent congestion; RFC 9002 suggests 3
@@ -386,6 +387,7 @@ public sealed class PacketSpaceManager implements PacketSpace
             // Handle is called from within the executor
             var nextDeadline = this.nextDeadline;
             Deadline now = now();
+            congestionController.updatePacer(now);
             do {
                 transmitNow = false;
                 var closed = !isOpenForTransmission();
@@ -404,6 +406,7 @@ public sealed class PacketSpaceManager implements PacketSpace
                 boolean needBackoff = isPTO(now);
                 int packetsSent = 0;
                 boolean cwndAvailable;
+                long startTime = System.nanoTime();
                 while ((cwndAvailable = congestionController.canSendPacket()) ||
                         (needBackoff && packetsSent < 2)) { // if PTO, try to send 2 packets
                     if (!isOpenForTransmission()) {
@@ -442,6 +445,7 @@ public sealed class PacketSpaceManager implements PacketSpace
                                 + qkue.getMessage());
                     }
                     if (!sentNew) {
+                        congestionController.appLimited();
                         break;
                     } else {
                         if (needBackoff && packetsSent == 0 && Log.quicRetransmit()) {
@@ -451,12 +455,19 @@ public sealed class PacketSpaceManager implements PacketSpace
                     }
                     packetsSent++;
                 }
-                blockedByCC = !cwndAvailable;
+                if (packetsSent != 0 && Log.quicCC()) {
+                    Log.logQuic("%s OUT: sent: %s packets in %s ns, cwnd limited: %s, pacer limited: %s".formatted(
+                            packetEmitter.logTag(), packetsSent, System.nanoTime() - startTime,
+                            congestionController.isCwndLimited(), congestionController.isPacerLimited()));
+                }
+                blockedByCC = !cwndAvailable && congestionController.isCwndLimited();
+                blockedByPacer = !cwndAvailable && congestionController.isPacerLimited();
                 if (!cwndAvailable && isOpenForTransmission()) {
                     if (debug.on()) debug.log("handle: blocked by CC");
                     // CC might be available already
                     if (congestionController.canSendPacket()) {
                         if (debug.on()) debug.log("handle: unblocked immediately");
+                        blockedByCC = blockedByPacer = false;
                         transmitNow = true;
                     }
                 }
@@ -1389,6 +1400,15 @@ public sealed class PacketSpaceManager implements PacketSpace
         Deadline ackDeadline = (ack == null || ack.sent() != null)
                 ? Deadline.MAX // if the ack frame has already been sent, getNextAck() returns null
                 : ack.deadline();
+        if (blockedByPacer) {
+            Deadline pacerDeadline = congestionController.pacerDeadline();
+            if (verbose && Log.quicTimer()) {
+                Log.logQuic(String.format("%s: [%s] pacer deadline: %s, ackDeadline: %s, deadline in %s",
+                        packetEmitter.logTag(), packetNumberSpace, pacerDeadline, ackDeadline,
+                        Utils.debugDeadline(now(), min(ackDeadline, pacerDeadline))));
+            }
+            return min(ackDeadline, pacerDeadline);
+        }
         Deadline lossDeadline = getLossTimer();
         // TODO: consider removing the debug traces in this method when integrating
         // if both loss deadline and PTO timer are set, loss deadline is always earlier
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCongestionController.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCongestionController.java
index 4bfad2c5560..94dafaf16eb 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCongestionController.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCongestionController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,4 +72,49 @@ public interface QuicCongestionController {
      */
     void packetDiscarded(Collection<QuicPacket> discardedPackets);
 
+    /**
+     * {@return the current size of the congestion window in bytes}
+     */
+    long congestionWindow();
+
+    /**
+     * {@return the initial window size in bytes}
+     */
+    long initialWindow();
+
+    /**
+     * {@return maximum datagram size}
+     */
+    long maxDatagramSize();
+
+    /**
+     * {@return true if the connection is in slow start phase}
+     */
+    boolean isSlowStart();
+
+    /**
+     * Update the pacer with the current time
+     * @param now the current time
+     */
+    void updatePacer(Deadline now);
+
+    /**
+     * {@return true if sending is blocked by pacer}
+     */
+    boolean isPacerLimited();
+
+    /**
+     * {@return true if sending is blocked by congestion window}
+     */
+    boolean isCwndLimited();
+
+    /**
+     * {@return deadline when pacer will unblock sending}
+     */
+    Deadline pacerDeadline();
+
+    /**
+     * Notify the congestion controller that sending is app-limited
+     */
+    void appLimited();
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index 9a280c3a8a5..7ebe09e008e 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -334,7 +334,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
         this.connectionId = this.endpoint.idFactory().newConnectionId();
         this.logTag = logTagFormat.formatted(labelId);
         this.dbgTag = dbgTag(quicInstance, logTag);
-        this.congestionController = new QuicRenoCongestionController(dbgTag);
+        this.congestionController = new QuicRenoCongestionController(dbgTag, rttEstimator);
         this.originalVersion = this.quicVersion = firstFlightVersion == null
                 ? QuicVersion.firstFlightVersion(quicInstance.getAvailableVersions())
                 : firstFlightVersion;
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java
new file mode 100644
index 00000000000..0ba7d78038b
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.net.http.quic;
+
+import jdk.internal.net.http.common.Deadline;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.util.OperatingSystem;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Implementation of pacing.
+ *
+ * When the connection is sending at a rate lower than permitted
+ * by the congestion controller, pacer is responsible for spreading out
+ * the outgoing packets across the entire RTT.
+ *
+ * Technically the pacer provides two functions:
+ * - computes the number of packets that can be sent now
+ * - computes the time when another packet can be sent
+ *
+ * When a new flow starts, or when the flow is not pacer-limited,
+ * the pacer limits the window to:
+ * max(INITIAL_WINDOW, pacingRate / timerFreq)
+ * timerFreq is the best timer resolution we can get from the selector.
+ * pacingRate is N * congestionWindow / smoothedRTT
+ * where N = 2 when in slow start, N = 1.25 otherwise.
+ *
+ * After that, the window refills at pacingRate, up to two timer periods or 4 packets,
+ * whichever is higher.
+ *
+ * The time when another packet can be sent is computed
+ * as the time when the window will allow at least 2 packets.
+ *
+ * All methods are externally synchronized in congestion controller.
+ *
+ * Ideas taken from:
+ * https://www.rfc-editor.org/rfc/rfc9002.html#name-pacing
+ * https://www.ietf.org/archive/id/draft-welzl-iccrg-pacing-03.html
+ */
+public class QuicPacer {
+
+    // usually 64 Hz on Windows, 1000 on Linux
+    private static final long DEFAULT_TIMER_FREQ_HZ = OperatingSystem.isWindows() ? 64 : 1000;
+    private static final long TIMER_FREQ_HZ = Math.clamp(
+            Utils.getLongProperty("jdk.httpclient.quic.timerFrequency", DEFAULT_TIMER_FREQ_HZ),
+            1, 1000);
+
+    private final QuicRttEstimator rttEstimator;
+    private final QuicCongestionController congestionController;
+
+    private boolean appLimited;
+    private long quota;
+    private Deadline lastUpdate;
+
+    /**
+     * Create a QUIC pacer for the given RTT estimator and congestion controller
+     *
+     * @param rttEstimator         the RTT estimator
+     * @param congestionController the congestion controller
+     */
+    public QuicPacer(QuicRttEstimator rttEstimator,
+                     QuicCongestionController congestionController) {
+        this.rttEstimator = rttEstimator;
+        this.congestionController = congestionController;
+        this.appLimited = true;
+    }
+
+    /**
+     * called to indicate that the flow is app-limited.
+     * Alters the behavior of the following updateQuota call.
+     */
+    public void appLimited() {
+        appLimited = true;
+    }
+
+    /**
+     * {@return true if pacer quota not hit yet, false otherwise}
+     */
+    public boolean canSend() {
+        return quota >= congestionController.maxDatagramSize();
+    }
+
+    /**
+     * Update quota based on time since the last call to this method
+     * and whether appLimited() was called or not.
+     *
+     * @param now current time
+     */
+    public void updateQuota(Deadline now) {
+        if (lastUpdate != null && !now.isAfter(lastUpdate)) {
+            // might happen when transmission tasks from different packet spaces
+            // race to update quota. Keep the most recent update only.
+            return;
+        }
+        long rttMicros = rttEstimator.state().smoothedRttMicros();
+        long cwnd = congestionController.congestionWindow();
+        if (rttMicros * TIMER_FREQ_HZ < TimeUnit.SECONDS.toMicros(2)) {
+            // RTT less than two timer periods; don't pace
+            quota = 2 * cwnd;
+            lastUpdate = now;
+            return;
+        }
+        long pacingRate = cwnd * (congestionController.isSlowStart() ? 2_000_000 : 1_250_000) / rttMicros; // bytes per second
+        long initialWindow = congestionController.initialWindow();
+        long onePeriodWindow = pacingRate / TIMER_FREQ_HZ;
+        long maxQuota;
+        if (appLimited) {
+            maxQuota = Math.max(initialWindow, onePeriodWindow);
+        } else {
+            maxQuota = Math.max(2 * onePeriodWindow, 4 * congestionController.maxDatagramSize());
+        }
+        if (lastUpdate == null) {
+            quota = Math.max(initialWindow, maxQuota);
+        } else {
+            long nanosSinceUpdate = Deadline.between(lastUpdate, now).toNanos();
+            if (nanosSinceUpdate >= TimeUnit.MICROSECONDS.toNanos(rttMicros)) {
+                // don't bother computing the increment, it might overflow and will be capped to maxQuota anyway
+                quota = maxQuota;
+                if (Log.quicCC()) {
+                    Log.logQuic("pacer cwnd: %s, rtt %s us, duration %s ns, quota: %s".formatted(
+                            cwnd, rttMicros, nanosSinceUpdate, quota));
+                }
+            } else {
+                long quotaIncrement = pacingRate * nanosSinceUpdate / 1_000_000_000;
+                quota += quotaIncrement;
+                quota = Math.min(quota, maxQuota);
+                if (Log.quicCC()) {
+                    Log.logQuic("pacer cwnd: %s, rtt %s us, duration %s ns, increment %s, quota %s".formatted(
+                            cwnd, rttMicros, nanosSinceUpdate, quotaIncrement, quota));
+                }
+            }
+        }
+        lastUpdate = now;
+        appLimited = false;
+    }
+
+    /**
+     * {@return the deadline when quota will increase to two packets}
+     */
+    public Deadline twoPacketDeadline() {
+        long datagramSize = congestionController.maxDatagramSize();
+        long quotaNeeded = datagramSize * 2 - quota;
+        if (quotaNeeded <= 0) {
+            assert canSend();
+            return lastUpdate;
+        }
+        // Window increases at a rate of rtt / cwnd / N
+        long rttMicros = rttEstimator.state().smoothedRttMicros();
+        long cwnd = congestionController.congestionWindow();
+        return lastUpdate.plus(rttMicros
+                * (congestionController.isSlowStart() ? 500 : 800) /* 1000/N */
+                * quotaNeeded / cwnd, ChronoUnit.NANOS);
+    }
+
+    /**
+     * called to indicate that a packet was sent
+     *
+     * @param packetBytes packet size in bytes
+     */
+    public void packetSent(int packetBytes) {
+        quota -= packetBytes;
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java
index fde253740d1..ff51aafc131 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,9 +64,12 @@ class QuicRenoCongestionController implements QuicCongestionController {
     private Deadline congestionRecoveryStartTime;
     private long ssThresh = Long.MAX_VALUE;
 
-    public QuicRenoCongestionController(String dbgTag) {
+    private final QuicPacer pacer;
+
+    public QuicRenoCongestionController(String dbgTag, QuicRttEstimator rttEstimator) {
         this.dbgTag = dbgTag;
         this.timeSource = TimeSource.source();
+        this.pacer = new QuicPacer(rttEstimator, this);
     }
 
     private boolean inCongestionRecovery(Deadline sentTime) {
@@ -83,7 +86,7 @@ class QuicRenoCongestionController implements QuicCongestionController {
         congestionWindow = Math.max(minimumWindow, ssThresh);
         maxBytesInFlight = 0;
         if (Log.quicCC()) {
-            Log.logQuic(dbgTag+ " Congestion: ssThresh: " + ssThresh +
+            Log.logQuic(dbgTag + " Congestion: ssThresh: " + ssThresh +
                     ", in flight: " + bytesInFlight +
                     ", cwnd:" + congestionWindow);
         }
@@ -103,8 +106,10 @@ class QuicRenoCongestionController implements QuicCongestionController {
             if (bytesInFlight >= MAX_BYTES_IN_FLIGHT) {
                 return false;
             }
-            var canSend = congestionWindow - bytesInFlight >= maxDatagramSize;
-            return canSend;
+            if (isCwndLimited() || isPacerLimited()) {
+                return false;
+            }
+            return true;
         } finally {
             lock.unlock();
         }
@@ -132,6 +137,7 @@ class QuicRenoCongestionController implements QuicCongestionController {
             if (bytesInFlight > maxBytesInFlight) {
                 maxBytesInFlight = bytesInFlight;
             }
+            pacer.packetSent(packetBytes);
         } finally {
             lock.unlock();
         }
@@ -147,8 +153,8 @@ class QuicRenoCongestionController implements QuicCongestionController {
             // Here we limit cwnd growth based on the maximum bytes in flight
             // observed since the last congestion event
             if (inCongestionRecovery(sentTime)) {
-                if (Log.quicCC()) {
-                    Log.logQuic(dbgTag+ " Acked, in recovery: bytes: " + packetBytes +
+                if (Log.quicCC() && Log.trace()) {
+                    Log.logQuic(dbgTag + " Acked, in recovery: bytes: " + packetBytes +
                             ", in flight: " + bytesInFlight);
                 }
                 return;
@@ -165,9 +171,9 @@ class QuicRenoCongestionController implements QuicCongestionController {
                     congestionWindow += Math.max((long) maxDatagramSize * packetBytes / congestionWindow, 1L);
                 }
             }
-            if (Log.quicCC()) {
+            if (Log.quicCC() && Log.trace()) {
                 if (isAppLimited) {
-                    Log.logQuic(dbgTag+ " Acked, not blocked: bytes: " + packetBytes +
+                    Log.logQuic(dbgTag + " Acked, not blocked: bytes: " + packetBytes +
                             ", in flight: " + bytesInFlight);
                 } else {
                     Log.logQuic(dbgTag + " Acked, increased: bytes: " + packetBytes +
@@ -194,7 +200,7 @@ class QuicRenoCongestionController implements QuicCongestionController {
                 congestionWindow = minimumWindow;
                 congestionRecoveryStartTime = null;
                 if (Log.quicCC()) {
-                    Log.logQuic(dbgTag+ " Persistent congestion: ssThresh: " + ssThresh +
+                    Log.logQuic(dbgTag + " Persistent congestion: ssThresh: " + ssThresh +
                             ", in flight: " + bytesInFlight +
                             ", cwnd:" + congestionWindow);
                 }
@@ -217,4 +223,94 @@ class QuicRenoCongestionController implements QuicCongestionController {
             lock.unlock();
         }
     }
+
+    @Override
+    public long congestionWindow() {
+        lock.lock();
+        try {
+            return congestionWindow;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public long initialWindow() {
+        lock.lock();
+        try {
+            return Math.max(14720, 2 * maxDatagramSize);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public long maxDatagramSize() {
+        lock.lock();
+        try {
+            return maxDatagramSize;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public boolean isSlowStart() {
+        lock.lock();
+        try {
+            return congestionWindow < ssThresh;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void updatePacer(Deadline now) {
+        lock.lock();
+        try {
+            pacer.updateQuota(now);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public boolean isPacerLimited() {
+        lock.lock();
+        try {
+            return !pacer.canSend();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public boolean isCwndLimited() {
+        lock.lock();
+        try {
+            return congestionWindow - bytesInFlight < maxDatagramSize;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public Deadline pacerDeadline() {
+        lock.lock();
+        try {
+            return pacer.twoPacketDeadline();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void appLimited() {
+        lock.lock();
+        try {
+            pacer.appLimited();
+        } finally {
+            lock.unlock();
+        }
+    }
 }
diff --git a/test/jdk/java/net/httpclient/quic/PacerTest.java b/test/jdk/java/net/httpclient/quic/PacerTest.java
new file mode 100644
index 00000000000..d54f4125a46
--- /dev/null
+++ b/test/jdk/java/net/httpclient/quic/PacerTest.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.internal.net.http.common.Deadline;
+import jdk.internal.net.http.quic.QuicCongestionController;
+import jdk.internal.net.http.quic.QuicPacer;
+import jdk.internal.net.http.quic.QuicRttEstimator;
+import jdk.internal.net.http.quic.packets.QuicPacket;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.time.temporal.ChronoUnit;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+/*
+ * @test
+ * @run testng/othervm -Djdk.httpclient.quic.timerFrequency=1000 PacerTest
+ */
+public class PacerTest {
+
+    private static class TestCongestionController implements QuicCongestionController {
+        private long cwnd;
+        private long iw;
+        private long maxDatagramSize;
+        private boolean isSlowStart;
+
+        private TestCongestionController(long cwnd, long iw, long maxDatagramSize, boolean isSlowStart) {
+            this.cwnd = cwnd;
+            this.iw = iw;
+            this.maxDatagramSize = maxDatagramSize;
+            this.isSlowStart = isSlowStart;
+        }
+
+        @Override
+        public boolean canSendPacket() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public void updateMaxDatagramSize(int newSize) {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public void packetSent(int packetBytes) {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public void packetAcked(int packetBytes, Deadline sentTime) {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public void packetLost(Collection<QuicPacket> lostPackets, Deadline sentTime, boolean persistent) {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public void packetDiscarded(Collection<QuicPacket> discardedPackets) {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public long congestionWindow() {
+            return cwnd;
+        }
+
+        @Override
+        public long initialWindow() {
+            return iw;
+        }
+
+        @Override
+        public long maxDatagramSize() {
+            return maxDatagramSize;
+        }
+
+        @Override
+        public boolean isSlowStart() {
+            return isSlowStart;
+        }
+
+        @Override
+        public void updatePacer(Deadline now) {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public boolean isPacerLimited() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public boolean isCwndLimited() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public Deadline pacerDeadline() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public void appLimited() {
+            throw new AssertionError("Should not come here");
+        }
+    }
+
+    public record TestCase(int maxDatagramSize, int packetsInIW, int packetsInCwnd, int millisInRtt,
+                           int initialPermit, int periodicPermit, boolean slowStart) {
+    }
+
+    @DataProvider
+    public Object[][] pacerFirstFlight() {
+        return List.of(
+                        // Should permit initial window before blocking
+                        new TestCase(1200, 10, 32, 16, 10, 4, true),
+                        // Should permit 2*cwnd/rtt packets before blocking
+                        new TestCase(1200, 10, 128, 16, 16, 16, true),
+                        // Should permit 1.25*cwnd/rtt packets before blocking
+                        new TestCase(1200, 10, 256, 16, 20, 20, false)
+                ).stream().map(Stream::of)
+                .map(Stream::toArray)
+                .toArray(Object[][]::new);
+    }
+
+    @Test(dataProvider = "pacerFirstFlight")
+    public void testBasicPacing(TestCase test) {
+        int maxDatagramSize = test.maxDatagramSize;
+        int packetsInIW = test.packetsInIW;
+        int packetsInCwnd = test.packetsInCwnd;
+        int millisInRtt = test.millisInRtt;
+        int permit = test.initialPermit;
+        QuicCongestionController cc = new TestCongestionController(packetsInCwnd * maxDatagramSize,
+                maxDatagramSize * packetsInIW, maxDatagramSize, test.slowStart);
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1000 * millisInRtt, 0, Deadline.MIN);
+        QuicPacer pacer = new QuicPacer(rtt, cc);
+        pacer.updateQuota(Deadline.MIN);
+        for (int i = 0; i < permit; i++) {
+            assertTrue(pacer.canSend(), "Pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Pacer didn't block");
+        Deadline next = pacer.twoPacketDeadline();
+        pacer.updateQuota(next);
+        for (int i = 0; i < 2; i++) {
+            assertTrue(pacer.canSend(), "Two packet deadline: pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Two packet deadline: pacer didn't block");
+        next = next.plus(1, ChronoUnit.MILLIS);
+        pacer.updateQuota(next);
+        for (int i = 0; i < test.periodicPermit; i++) {
+            assertTrue(pacer.canSend(), "One millisecond: pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "One millisecond: pacer didn't block");
+        next = next.plus(3, ChronoUnit.MILLIS);
+        pacer.updateQuota(next);
+        // Quota capped at two millisecond equivalent
+        for (int i = 0; i < 2 * test.periodicPermit; i++) {
+            assertTrue(pacer.canSend(), "Three milliseconds: pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Three milliseconds: pacer didn't block");
+        next = next.plus(3, ChronoUnit.MILLIS);
+        pacer.appLimited();
+        pacer.updateQuota(next);
+        // App-limited: quota capped at initialPermit
+        for (int i = 0; i < test.initialPermit; i++) {
+            assertTrue(pacer.canSend(), "App limited: pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "App limited: pacer didn't block");
+    }
+
+    @Test
+    public void testPacingShortRtt() {
+        int maxDatagramSize = 1200;
+        int packetsInIW = 10;
+        int packetsInCwnd = 32;
+        QuicCongestionController cc = new TestCongestionController(packetsInCwnd * maxDatagramSize,
+                maxDatagramSize * packetsInIW, maxDatagramSize, true);
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1000, 0, Deadline.MIN);
+        QuicPacer pacer = new QuicPacer(rtt, cc);
+        pacer.updateQuota(Deadline.MIN);
+        for (int i = 0; i < 2 * packetsInCwnd; i++) {
+            assertTrue(pacer.canSend(), "Pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Pacer didn't block");
+        // when RTT is short, permit cwnd on every update
+        Deadline next = pacer.twoPacketDeadline();
+        pacer.updateQuota(next);
+        for (int i = 0; i < 2 * packetsInCwnd; i++) {
+            assertTrue(pacer.canSend(), "Two packet deadline: pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Two packet deadline: pacer didn't block");
+    }
+
+    @Test
+    public void testPacingSmallCwnd() {
+        int maxDatagramSize = 1200;
+        int packetsInIW = 10;
+        int packetsInCwnd = 2;
+        int millisInRtt = 16;
+        QuicCongestionController cc = new TestCongestionController(packetsInCwnd * maxDatagramSize,
+                maxDatagramSize * packetsInIW, maxDatagramSize, true);
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1000 * millisInRtt, 0, Deadline.MIN);
+        QuicPacer pacer = new QuicPacer(rtt, cc);
+        // first quota update is capped to IW
+        pacer.updateQuota(Deadline.MIN);
+        // update quota again. This time it's capped to 4 packets
+        pacer.updateQuota(Deadline.MIN.plusNanos(1));
+        for (int i = 0; i < 4; i++) {
+            assertTrue(pacer.canSend(), "Pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Pacer didn't block");
+        Deadline next = pacer.twoPacketDeadline();
+        pacer.updateQuota(next);
+        for (int i = 0; i < 2; i++) {
+            assertTrue(pacer.canSend(), "Two packet deadline: pacer blocked after " + i + " packets");
+            pacer.packetSent(maxDatagramSize);
+        }
+        assertFalse(pacer.canSend(), "Two packet deadline: pacer didn't block");
+        // pacing rate is 1 packet per 4 milliseconds
+        next = next.plus(4, ChronoUnit.MILLIS);
+        pacer.updateQuota(next);
+        assertTrue(pacer.canSend(), "Pacer blocked after 4 millis");
+        pacer.packetSent(maxDatagramSize);
+        assertFalse(pacer.canSend(), "Pacer permitted 2 packets after 4 millis");
+
+        next = next.plus(2, ChronoUnit.MILLIS);
+        pacer.updateQuota(next);
+        assertFalse(pacer.canSend(), "Pacer permitted a packet after 2 millis");
+        next = next.plus(2, ChronoUnit.MILLIS);
+        pacer.updateQuota(next);
+        assertTrue(pacer.canSend(), "Pacer blocked after 2x2 millis");
+        pacer.packetSent(maxDatagramSize);
+        assertFalse(pacer.canSend(), "Pacer permitted 2 packets after 2x2 millis");
+    }
+}
diff --git a/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java b/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java
index 7cd2adfe7ab..40497ec13da 100644
--- a/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java
+++ b/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,10 +45,12 @@ import jdk.internal.net.http.common.Deadline;
 import jdk.internal.net.http.common.Logger;
 import jdk.internal.net.http.common.TestLoggerUtil;
 import jdk.internal.net.http.common.TimeLine;
+import jdk.internal.net.http.quic.CodingContext;
 import jdk.internal.net.http.quic.PacketEmitter;
 import jdk.internal.net.http.quic.PacketSpaceManager;
 import jdk.internal.net.http.quic.PeerConnectionId;
 import jdk.internal.net.http.quic.QuicCongestionController;
+import jdk.internal.net.http.quic.QuicConnectionId;
 import jdk.internal.net.http.quic.QuicRttEstimator;
 import jdk.internal.net.http.quic.QuicTimerQueue;
 import jdk.internal.net.http.quic.frames.AckFrame;
@@ -61,8 +63,6 @@ import jdk.internal.net.http.quic.packets.InitialPacket;
 import jdk.internal.net.http.quic.packets.PacketSpace;
 import jdk.internal.net.http.quic.packets.QuicPacketDecoder;
 import jdk.internal.net.http.quic.packets.QuicPacketEncoder;
-import jdk.internal.net.http.quic.CodingContext;
-import jdk.internal.net.http.quic.QuicConnectionId;
 import jdk.internal.net.http.quic.packets.QuicPacket;
 import jdk.internal.net.http.quic.packets.QuicPacket.PacketNumberSpace;
 import jdk.internal.net.http.quic.packets.QuicPacket.PacketType;
@@ -608,6 +608,38 @@ public class PacketSpaceManagerTest {
                 public void packetLost(Collection<QuicPacket> lostPackets, Deadline sentTime, boolean persistent) { }
                 @Override
                 public void packetDiscarded(Collection<QuicPacket> discardedPackets) { }
+                @Override
+                public long congestionWindow() {
+                    return Integer.MAX_VALUE;
+                }
+                @Override
+                public long initialWindow() {
+                    return Integer.MAX_VALUE;
+                }
+                @Override
+                public long maxDatagramSize() {
+                    return 1200;
+                }
+                @Override
+                public boolean isSlowStart() {
+                    return false;
+                }
+                @Override
+                public void updatePacer(Deadline now) { }
+                @Override
+                public boolean isPacerLimited() {
+                    return false;
+                }
+                @Override
+                public boolean isCwndLimited() {
+                    return false;
+                }
+                @Override
+                public Deadline pacerDeadline() {
+                    return Deadline.MIN;
+                }
+                @Override
+                public void appLimited() { }
             };
             manager = new PacketSpaceManager(space, this, timeSource,
                     rttEstimator, congestionController, new DummyQuicTLSEngine(),

From e5a272a59058e36136acd6aef635f87136fbb027 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Wed, 12 Nov 2025 14:30:08 +0000
Subject: [PATCH 133/512] 8369517: Compilation mismatch for equivalent lambda
 and method reference

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Source.java      |  1 +
 .../com/sun/tools/javac/comp/Attr.java        |  7 ++-
 .../ResultTypeNotBeingCapturedTest.java       | 49 +++++++++++++++++++
 .../ResultTypeNotBeingCapturedTest.out        |  3 ++
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java
 create mode 100644 test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 063d37be4e2..d0cb45ebc09 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -277,6 +277,7 @@ public enum Source {
         JAVA_BASE_TRANSITIVE(JDK25, Fragments.FeatureJavaBaseTransitive, DiagKind.PLURAL),
         PRIVATE_MEMBERS_IN_PERMITS_CLAUSE(JDK19),
         ERASE_POLY_SIG_RETURN_TYPE(JDK24),
+        CAPTURE_MREF_RETURN_TYPE(JDK26),
         ;
 
         enum DiagKind {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 1465ea652b1..4a8a8d4a324 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -124,6 +124,7 @@ public class Attr extends JCTree.Visitor {
     final ArgumentAttr argumentAttr;
     final MatchBindingsComputer matchBindingsComputer;
     final AttrRecover attrRecover;
+    final boolean captureMRefReturnType;
 
     public static Attr instance(Context context) {
         Attr instance = context.get(attrKey);
@@ -175,6 +176,7 @@ public class Attr extends JCTree.Visitor {
                              Feature.UNCONDITIONAL_PATTERN_IN_INSTANCEOF.allowedInSource(source);
         sourceName = source.name;
         useBeforeDeclarationWarning = options.isSet("useBeforeDeclarationWarning");
+        captureMRefReturnType = Source.Feature.ERASE_POLY_SIG_RETURN_TYPE.allowedInSource(source);
 
         statInfo = new ResultInfo(KindSelector.NIL, Type.noType);
         varAssignmentInfo = new ResultInfo(KindSelector.ASG, Type.noType);
@@ -3832,9 +3834,10 @@ public class Attr extends JCTree.Visitor {
         }
 
         if (!returnType.hasTag(VOID) && !resType.hasTag(VOID)) {
+            Type capturedResType = captureMRefReturnType ? types.capture(resType) : resType;
             if (resType.isErroneous() ||
-                    new FunctionalReturnContext(checkContext).compatible(resType, returnType,
-                            checkContext.checkWarner(tree, resType, returnType))) {
+                    new FunctionalReturnContext(checkContext).compatible(capturedResType, returnType,
+                            checkContext.checkWarner(tree, capturedResType, returnType))) {
                 incompatibleReturnType = null;
             }
         }
diff --git a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java
new file mode 100644
index 00000000000..a87dd8b302d
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8369517
+ * @summary Compilation mismatch for equivalent lambda and method reference
+ * @compile/fail/ref=ResultTypeNotBeingCapturedTest.out -XDrawDiagnostics ResultTypeNotBeingCapturedTest.java
+ */
+
+import java.util.function.Supplier;
+
+class ResultTypeNotBeingCapturedTest {
+    interface X<T> {
+        X<T> self();
+    }
+
+    static X<?> makeX() {return null;}
+
+    static <R> X<R> create(Supplier<? extends R> supplier) {return null;}
+
+    static X<X<?>> methodRef() {
+        return create(ResultTypeNotBeingCapturedTest::makeX).self();
+    }
+
+    static X<X<?>> lambda() {
+        return create(() -> makeX()).self();
+    }
+}
diff --git a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out
new file mode 100644
index 00000000000..bcd4dbad07b
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out
@@ -0,0 +1,3 @@
+ResultTypeNotBeingCapturedTest.java:43:66: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
+ResultTypeNotBeingCapturedTest.java:47:42: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
+2 errors

From 4042e821c6f582bf31201acb9f2d98d940383f1c Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Wed, 12 Nov 2025 14:42:30 +0000
Subject: [PATCH 134/512] 8371066: Remove unused class TextSourceLabel and
 associated class hierarchy

Reviewed-by: prr, psadhukhan
---
 .../share/classes/java/awt/font/TextLine.java |   2 +-
 .../share/classes/sun/font/Decoration.java    |   3 +-
 .../classes/sun/font/ExtendedTextLabel.java   | 146 -------------
 .../sun/font/ExtendedTextSourceLabel.java     | 193 +++++++++++++++---
 .../share/classes/sun/font/TextLabel.java     | 124 -----------
 .../classes/sun/font/TextLabelFactory.java    |  40 +---
 .../classes/sun/font/TextSourceLabel.java     | 173 ----------------
 7 files changed, 169 insertions(+), 512 deletions(-)
 delete mode 100644 src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java
 delete mode 100644 src/java.desktop/share/classes/sun/font/TextLabel.java
 delete mode 100644 src/java.desktop/share/classes/sun/font/TextSourceLabel.java

diff --git a/src/java.desktop/share/classes/java/awt/font/TextLine.java b/src/java.desktop/share/classes/java/awt/font/TextLine.java
index 3464c1626c6..6db1bc72360 100644
--- a/src/java.desktop/share/classes/java/awt/font/TextLine.java
+++ b/src/java.desktop/share/classes/java/awt/font/TextLine.java
@@ -1020,7 +1020,7 @@ final class TextLine {
                 }
 
                 TextLineComponent nextComponent =
-                    factory.createExtended(font, cm, decorator, startPos, startPos + lmCount);
+                    factory.createTextLabel(font, cm, decorator, startPos, startPos + lmCount);
 
                 ++numComponents;
                 if (numComponents > components.length) {
diff --git a/src/java.desktop/share/classes/sun/font/Decoration.java b/src/java.desktop/share/classes/sun/font/Decoration.java
index 26f5295d8d3..f131914134f 100644
--- a/src/java.desktop/share/classes/sun/font/Decoration.java
+++ b/src/java.desktop/share/classes/sun/font/Decoration.java
@@ -54,7 +54,8 @@ import static sun.font.EAttribute.*;
 /**
  * This class handles underlining, strikethrough, and foreground and
  * background styles on text.  Clients simply acquire instances
- * of this class and hand them off to ExtendedTextLabels or GraphicComponents.
+ * of this class and hand them off to ExtendedTextSourceLabels or
+ * GraphicComponents.
  */
 public class Decoration {
 
diff --git a/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java
deleted file mode 100644
index 2962d8ffc37..00000000000
--- a/src/java.desktop/share/classes/sun/font/ExtendedTextLabel.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- *
- * (C) Copyright IBM Corp. 1998-2003- All Rights Reserved.
- */
-
-package sun.font;
-
-import java.awt.Font;
-
-import java.awt.font.GlyphJustificationInfo;
-import java.awt.font.LineMetrics;
-
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-/**
- * An extension of TextLabel that maintains information
- * about characters.
- */
-
-public abstract class ExtendedTextLabel extends TextLabel
-                            implements TextLineComponent{
-  /**
-   * Return the number of characters represented by this label.
-   */
-  public abstract int getNumCharacters();
-
-  /**
-   * Return the line metrics for all text in this label.
-   */
-  public abstract CoreMetrics getCoreMetrics();
-
-  /**
-   * Return the x location of the character at the given logical index.
-   */
-  public abstract float getCharX(int logicalIndex);
-
-  /**
-   * Return the y location of the character at the given logical index.
-   */
-  public abstract float getCharY(int logicalIndex);
-
-  /**
-   * Return the advance of the character at the given logical index.
-   */
-  public abstract float getCharAdvance(int logicalIndex);
-
-  /**
-   * Return the visual bounds of the character at the given logical index.
-   * This bounds encloses all the pixels of the character when the label is rendered
-   * at x, y.
-   */
-  public abstract Rectangle2D getCharVisualBounds(int logicalIndex, float x, float y);
-
-  /**
-   * Return the visual index of the character at the given logical index.
-   */
-  public abstract int logicalToVisual(int logicalIndex);
-
-  /**
-   * Return the logical index of the character at the given visual index.
-   */
-  public abstract int visualToLogical(int visualIndex);
-
-  /**
-   * Return the logical index of the character, starting with the character at
-   * logicalStart, whose accumulated advance exceeds width.  If the advances of
-   * all characters do not exceed width, return getNumCharacters.  If width is
-   * less than zero, return logicalStart - 1.
-   */
-  public abstract int getLineBreakIndex(int logicalStart, float width);
-
-  /**
-   * Return the accumulated advances of all characters between logicalStart and
-   * logicalLimit.
-   */
-  public abstract float getAdvanceBetween(int logicalStart, int logicalLimit);
-
-  /**
-   * Return whether a caret can exist on the leading edge of the
-   * character at offset.  If the character is part of a ligature
-   * (for example) a caret may not be appropriate at offset.
-   */
-  public abstract boolean caretAtOffsetIsValid(int offset);
-
-  /**
-   * A convenience overload of getCharVisualBounds that defaults the label origin
-   * to 0, 0.
-   */
-  public Rectangle2D getCharVisualBounds(int logicalIndex) {
-    return getCharVisualBounds(logicalIndex, 0, 0);
-  }
-
-  public abstract TextLineComponent getSubset(int start, int limit, int dir);
-
-  /**
-   * Return the number of justification records this uses.
-   */
-  public abstract int getNumJustificationInfos();
-
-  /**
-   * Return GlyphJustificationInfo objects for the characters between
-   * charStart and charLimit, starting at offset infoStart.  Infos
-   * will be in visual order.  All positions between infoStart and
-   * getNumJustificationInfos will be set.  If a position corresponds
-   * to a character outside the provided range, it is set to null.
-   */
-  public abstract void getJustificationInfos(GlyphJustificationInfo[] infos, int infoStart, int charStart, int charLimit);
-
-  /**
-   * Apply deltas to the data in this component, starting at offset
-   * deltaStart, and return the new component.  There are two floats
-   * for each justification info, for a total of 2 * getNumJustificationInfos.
-   * The first delta is the left adjustment, the second is the right
-   * adjustment.
-   * <p>
-   * If flags[0] is true on entry, rejustification is allowed.  If
-   * the new component requires rejustification (ligatures were
-   * formed or split), flags[0] will be set on exit.
-   */
-  public abstract TextLineComponent applyJustificationDeltas(float[] deltas, int deltaStart, boolean[] flags);
-}
diff --git a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
index 784035f4fe2..85c631d6e3e 100644
--- a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
+++ b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
@@ -46,32 +46,35 @@ import java.awt.geom.Rectangle2D;
 
 import java.util.Map;
 
-/**
- * Default implementation of ExtendedTextLabel.
- */
-
 // {jbr} I made this class package-private to keep the
 // Decoration.Label API package-private.
 
-/* public */
-class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.Label {
+/**
+ * A label.
+ * Visual bounds is a rect that encompasses the entire rendered area.
+ * Logical bounds is a rect that defines how to position this next
+ * to other objects.
+ * Align bounds is a rect that defines how to align this to margins.
+ * it generally allows some overhang that logical bounds would prevent.
+ */
+class ExtendedTextSourceLabel implements TextLineComponent, Decoration.Label {
 
-  TextSource source;
-  private Decoration decorator;
+  private final TextSource source;
+  private final Decoration decorator;
 
   // caches
   private Font font;
   private AffineTransform baseTX;
   private CoreMetrics cm;
 
-  Rectangle2D lb;
-  Rectangle2D ab;
-  Rectangle2D vb;
-  Rectangle2D ib;
-  StandardGlyphVector gv;
-  float[] charinfo;
+  private Rectangle2D lb;
+  private Rectangle2D ab;
+  private Rectangle2D vb;
+  private Rectangle2D ib;
+  private StandardGlyphVector gv;
+  private float[] charinfo;
 
-  float advTracking;
+  private float advTracking;
 
   /**
    * Create from a TextSource.
@@ -116,13 +119,11 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     advTracking = font.getSize() * AttributeValues.getTracking(atts);
   }
 
-
-  // TextLabel API
-
-  public Rectangle2D getLogicalBounds() {
-    return getLogicalBounds(0, 0);
-  }
-
+  /**
+   * Return a rectangle that corresponds to the logical bounds of the text
+   * when this label is rendered at x, y.
+   * This rectangle is used when positioning text next to other text.
+   */
   public Rectangle2D getLogicalBounds(float x, float y) {
     if (lb == null) {
       lb = createLogicalBounds();
@@ -133,13 +134,16 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
                                  (float)lb.getHeight());
   }
 
-    public float getAdvance() {
-        if (lb == null) {
-            lb = createLogicalBounds();
-        }
-        return (float)lb.getWidth();
+  public float getAdvance() {
+    if (lb == null) {
+      lb = createLogicalBounds();
     }
+    return (float)lb.getWidth();
+  }
 
+  /**
+   * Return a rectangle that surrounds the text outline when this label is rendered at x, y.
+   */
   public Rectangle2D getVisualBounds(float x, float y) {
     if (vb == null) {
       vb = decorator.getVisualBounds(this);
@@ -150,6 +154,12 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
                                  (float)vb.getHeight());
   }
 
+  /**
+   * Return a rectangle that corresponds to the alignment bounds of the text
+   * when this label is rendered at x, y. This rectangle is used when positioning text next
+   * to a margin.  It differs from the logical bounds in that it does not include leading or
+   * trailing whitespace.
+   */
   public Rectangle2D getAlignBounds(float x, float y) {
     if (ab == null) {
       ab = createAlignBounds();
@@ -161,6 +171,10 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
 
   }
 
+  /**
+   * Return a rectangle that corresponds to the logical bounds of the text, adjusted
+   * to angle the leading and trailing edges by the italic angle.
+   */
   public Rectangle2D getItalicBounds(float x, float y) {
     if (ib == null) {
       ib = createItalicBounds();
@@ -189,6 +203,9 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     return getGV().getOutline(x, y);
   }
 
+  /**
+   * Return an outline of the characters in the label when rendered at x, y.
+   */
   public Shape getOutline(float x, float y) {
     return decorator.getOutline(this, x, y);
   }
@@ -197,10 +214,63 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     g.drawGlyphVector(getGV(), x, y);
   }
 
+  /**
+   * Render the label at x, y in the graphics.
+   */
   public void draw(Graphics2D g, float x, float y) {
     decorator.drawTextAndDecorations(this, g, x, y);
   }
 
+  /**
+   * A convenience method that returns the visual bounds when rendered at 0, 0.
+   */
+  public Rectangle2D getVisualBounds() {
+    return getVisualBounds(0f, 0f);
+  }
+
+  /**
+   * A convenience method that returns the logical bounds when rendered at 0, 0.
+   */
+  public Rectangle2D getLogicalBounds() {
+    return getLogicalBounds(0f, 0f);
+  }
+
+  /**
+   * A convenience method that returns the align bounds when rendered at 0, 0.
+   */
+  public Rectangle2D getAlignBounds() {
+    return getAlignBounds(0f, 0f);
+  }
+
+  /**
+   * A convenience method that returns the italic bounds when rendered at 0, 0.
+   */
+  public Rectangle2D getItalicBounds() {
+    return getItalicBounds(0f, 0f);
+  }
+
+  /**
+   * A convenience method that returns the outline when rendered at 0, 0.
+   */
+  public Shape getOutline() {
+    return getOutline(0f, 0f);
+  }
+
+  /**
+   * A convenience method that renders the label at 0, 0.
+   */
+  public void draw(Graphics2D g) {
+    draw(g, 0f, 0f);
+  }
+
+  /**
+   * A convenience overload of getCharVisualBounds that defaults the label origin
+   * to 0, 0.
+   */
+  public Rectangle2D getCharVisualBounds(int logicalIndex) {
+    return getCharVisualBounds(logicalIndex, 0, 0);
+  }
+
   /**
    * The logical bounds extends from the origin of the glyphvector to the
    * position at which a following glyphvector's origin should be placed.
@@ -336,8 +406,6 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     return gv;
   }
 
-  // ExtendedTextLabel API
-
   private static final int posx = 0,
     posy = 1,
     advx = 2,
@@ -348,14 +416,23 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     vish = 7;
   private static final int numvals = 8;
 
+  /**
+   * Return the number of characters represented by this label.
+   */
   public int getNumCharacters() {
     return source.getLength();
   }
 
+  /**
+   * Return the line metrics for all text in this label.
+   */
   public CoreMetrics getCoreMetrics() {
     return cm;
   }
 
+  /**
+   * Return the x location of the character at the given logical index.
+   */
   public float getCharX(int index) {
     validate(index);
     float[] charinfo = getCharinfo();
@@ -367,6 +444,9 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     }
   }
 
+  /**
+   * Return the y location of the character at the given logical index.
+   */
   public float getCharY(int index) {
     validate(index);
     float[] charinfo = getCharinfo();
@@ -378,6 +458,9 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     }
   }
 
+  /**
+   * Return the advance of the character at the given logical index.
+   */
   public float getCharAdvance(int index) {
     validate(index);
     float[] charinfo = getCharinfo();
@@ -403,6 +486,11 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
                                  charinfo[index + vish]);
   }
 
+  /**
+   * Return the visual bounds of the character at the given logical index.
+   * This bounds encloses all the pixels of the character when the label is rendered
+   * at x, y.
+   */
   public Rectangle2D getCharVisualBounds(int index, float x, float y) {
 
     Rectangle2D bounds = decorator.getCharVisualBounds(this, index);
@@ -470,16 +558,28 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     }
     */
 
+  /**
+   * Return the visual index of the character at the given logical index.
+   */
   public int logicalToVisual(int logicalIndex) {
     validate(logicalIndex);
     return l2v(logicalIndex);
   }
 
+  /**
+   * Return the logical index of the character at the given visual index.
+   */
   public int visualToLogical(int visualIndex) {
     validate(visualIndex);
     return v2l(visualIndex);
   }
 
+  /**
+   * Return the logical index of the character, starting with the character at
+   * logicalStart, whose accumulated advance exceeds width.  If the advances of
+   * all characters do not exceed width, return getNumCharacters.  If width is
+   * less than zero, return logicalStart - 1.
+   */
   public int getLineBreakIndex(int start, float width) {
     final float epsilon = 0.005f;
 
@@ -504,6 +604,10 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     return start;
   }
 
+  /**
+   * Return the accumulated advances of all characters between logicalStart and
+   * logicalLimit.
+   */
   public float getAdvanceBetween(int start, int limit) {
     float a = 0f;
 
@@ -523,6 +627,11 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     return a;
   }
 
+  /**
+   * Return whether a caret can exist on the leading edge of the
+   * character at offset.  If the character is part of a ligature
+   * (for example) a caret may not be appropriate at offset.
+   */
   public boolean caretAtOffsetIsValid(int offset) {
       // REMIND: improve this implementation
 
@@ -912,15 +1021,20 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     return sb.toString();
   }
 
-  //public static ExtendedTextLabel create(TextSource source) {
-  //  return new ExtendedTextSourceLabel(source);
-  //}
-
+  /**
+   * Return the number of justification records this uses.
+   */
   public int getNumJustificationInfos() {
     return getGV().getNumGlyphs();
   }
 
-
+  /**
+   * Return GlyphJustificationInfo objects for the characters between
+   * charStart and charLimit, starting at offset infoStart.  Infos
+   * will be in visual order.  All positions between infoStart and
+   * getNumJustificationInfos will be set.  If a position corresponds
+   * to a character outside the provided range, it is set to null.
+   */
   public void getJustificationInfos(GlyphJustificationInfo[] infos, int infoStart, int charStart, int charLimit) {
     // This simple implementation only uses spaces for justification.
     // Since regular characters aren't justified, we don't need to deal with
@@ -992,6 +1106,17 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     }
   }
 
+  /**
+   * Apply deltas to the data in this component, starting at offset
+   * deltaStart, and return the new component.  There are two floats
+   * for each justification info, for a total of 2 * getNumJustificationInfos.
+   * The first delta is the left adjustment, the second is the right
+   * adjustment.
+   * <p>
+   * If flags[0] is true on entry, rejustification is allowed.  If
+   * the new component requires rejustification (ligatures were
+   * formed or split), flags[0] will be set on exit.
+   */
   public TextLineComponent applyJustificationDeltas(float[] deltas, int deltaStart, boolean[] flags) {
 
     // when we justify, we need to adjust the charinfo since spaces
diff --git a/src/java.desktop/share/classes/sun/font/TextLabel.java b/src/java.desktop/share/classes/sun/font/TextLabel.java
deleted file mode 100644
index 738ff0c294d..00000000000
--- a/src/java.desktop/share/classes/sun/font/TextLabel.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- *
- * (C) Copyright IBM Corp. 1998-2003 All Rights Reserved
- */
-
-package sun.font;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-
-import java.awt.geom.Rectangle2D;
-
-/**
- * A label.
- * Visual bounds is a rect that encompasses the entire rendered area.
- * Logical bounds is a rect that defines how to position this next
- * to other objects.
- * Align bounds is a rect that defines how to align this to margins.
- * it generally allows some overhang that logical bounds would prevent.
- */
-public abstract class TextLabel {
-
-  /**
-   * Return a rectangle that surrounds the text outline when this label is rendered at x, y.
-   */
-  public abstract Rectangle2D getVisualBounds(float x, float y);
-
-  /**
-   * Return a rectangle that corresponds to the logical bounds of the text
-   * when this label is rendered at x, y.
-   * This rectangle is used when positioning text next to other text.
-   */
-  public abstract Rectangle2D getLogicalBounds(float x, float y);
-
-  /**
-   * Return a rectangle that corresponds to the alignment bounds of the text
-   * when this label is rendered at x, y. This rectangle is used when positioning text next
-   * to a margin.  It differs from the logical bounds in that it does not include leading or
-   * trailing whitespace.
-   */
-  public abstract Rectangle2D getAlignBounds(float x, float y);
-
-  /**
-   * Return a rectangle that corresponds to the logical bounds of the text, adjusted
-   * to angle the leading and trailing edges by the italic angle.
-   */
-  public abstract Rectangle2D getItalicBounds(float x, float y);
-
-  /**
-   * Return an outline of the characters in the label when rendered at x, y.
-   */
-  public abstract Shape getOutline(float x, float y);
-
-  /**
-   * Render the label at x, y in the graphics.
-   */
-  public abstract void draw(Graphics2D g, float x, float y);
-
-  /**
-   * A convenience method that returns the visual bounds when rendered at 0, 0.
-   */
-  public Rectangle2D getVisualBounds() {
-    return getVisualBounds(0f, 0f);
-  }
-
-  /**
-   * A convenience method that returns the logical bounds when rendered at 0, 0.
-   */
-  public Rectangle2D getLogicalBounds() {
-    return getLogicalBounds(0f, 0f);
-  }
-
-  /**
-   * A convenience method that returns the align bounds when rendered at 0, 0.
-   */
-  public Rectangle2D getAlignBounds() {
-    return getAlignBounds(0f, 0f);
-  }
-
-  /**
-   * A convenience method that returns the italic bounds when rendered at 0, 0.
-   */
-  public Rectangle2D getItalicBounds() {
-    return getItalicBounds(0f, 0f);
-  }
-
-  /**
-   * A convenience method that returns the outline when rendered at 0, 0.
-   */
-  public Shape getOutline() {
-    return getOutline(0f, 0f);
-  }
-
-  /**
-   * A convenience method that renders the label at 0, 0.
-   */
-  public void draw(Graphics2D g) {
-    draw(g, 0f, 0f);
-  }
-}
diff --git a/src/java.desktop/share/classes/sun/font/TextLabelFactory.java b/src/java.desktop/share/classes/sun/font/TextLabelFactory.java
index 7a41bd2e7f5..996986617de 100644
--- a/src/java.desktop/share/classes/sun/font/TextLabelFactory.java
+++ b/src/java.desktop/share/classes/sun/font/TextLabelFactory.java
@@ -42,8 +42,7 @@ import java.text.Bidi;
    * @see Font
    * @see FontRenderContext
    * @see java.awt.font.GlyphVector
-   * @see TextLabel
-   * @see ExtendedTextLabel
+   * @see ExtendedTextSourceLabel
    * @see Bidi
    * @see java.awt.font.TextLayout
    */
@@ -100,7 +99,7 @@ public final class TextLabelFactory {
   }
 
   /**
-   * Create an extended glyph array for the text between start and limit.
+   * Create a glyph array for the text between start and limit.
    *
    * @param font the font to use to generate glyphs and character positions.
    * @param start the start of the subrange for which to create the glyph array
@@ -113,11 +112,11 @@ public final class TextLabelFactory {
    * at start.  Clients should ensure that all text between start and limit
    * has the same bidi level for the current line.
    */
-  public ExtendedTextLabel createExtended(Font font,
-                                          CoreMetrics lm,
-                                          Decoration decorator,
-                                          int start,
-                                          int limit) {
+  public ExtendedTextSourceLabel createTextLabel(Font font,
+                                                 CoreMetrics lm,
+                                                 Decoration decorator,
+                                                 int start,
+                                                 int limit) {
 
     if (start > limit || start < lineStart || limit > lineLimit) {
       throw new IllegalArgumentException("bad start: " + start + " or limit: " + limit);
@@ -132,29 +131,4 @@ public final class TextLabelFactory {
     TextSource source = new StandardTextSource(text, start, limit - start, lineStart, lineLimit - lineStart, level, layoutFlags, font, frc, lm);
     return new ExtendedTextSourceLabel(source, decorator);
   }
-
-  /**
-   * Create a simple glyph array for the text between start and limit.
-   *
-   * @param font the font to use to generate glyphs and character positions.
-   * @param start the start of the subrange for which to create the glyph array
-   * @param limit the limit of the subrange for which to create glyph array
-   */
-  public TextLabel createSimple(Font font,
-                                CoreMetrics lm,
-                                int start,
-                                int limit) {
-
-    if (start > limit || start < lineStart || limit > lineLimit) {
-      throw new IllegalArgumentException("bad start: " + start + " or limit: " + limit);
-    }
-
-    int level = lineBidi == null ? 0 : lineBidi.getLevelAt(start - lineStart);
-    int linedir = (lineBidi == null || lineBidi.baseIsLeftToRight()) ? 0 : 1;
-    int layoutFlags = flags & ~0x9; // remove bidi, line direction flags
-    if ((level & 0x1) != 0) layoutFlags |= 1; // rtl
-    if ((linedir & 0x1) != 0) layoutFlags |= 8; // line rtl
-    TextSource source = new StandardTextSource(text, start, limit - start, lineStart, lineLimit - lineStart, level, layoutFlags, font, frc, lm);
-    return new TextSourceLabel(source);
-  }
 }
diff --git a/src/java.desktop/share/classes/sun/font/TextSourceLabel.java b/src/java.desktop/share/classes/sun/font/TextSourceLabel.java
deleted file mode 100644
index 8514be6ac7a..00000000000
--- a/src/java.desktop/share/classes/sun/font/TextSourceLabel.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- *
- * (C) Copyright IBM Corp. 1998, 1999 - All Rights Reserved
- */
-
-package sun.font;
-
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
-/**
- * Implementation of TextLabel based on String.
- */
-
-public class TextSourceLabel extends TextLabel {
-  TextSource source;
-
-  // caches
-  Rectangle2D lb;
-  Rectangle2D ab;
-  Rectangle2D vb;
-  Rectangle2D ib;
-  GlyphVector gv;
-
-  public TextSourceLabel(TextSource source) {
-    this(source, null, null, null);
-  }
-
-  public TextSourceLabel(TextSource source, Rectangle2D lb, Rectangle2D ab, GlyphVector gv) {
-    this.source = source;
-
-    this.lb = lb;
-    this.ab = ab;
-    this.gv = gv;
-  }
-
-  public TextSource getSource() {
-    return source;
-  }
-
-  public final Rectangle2D getLogicalBounds(float x, float y) {
-    if (lb == null) {
-      lb = createLogicalBounds();
-    }
-    return new Rectangle2D.Float((float)(lb.getX() + x),
-                                 (float)(lb.getY() + y),
-                                 (float)lb.getWidth(),
-                                 (float)lb.getHeight());
-  }
-
-  public final Rectangle2D getVisualBounds(float x, float y) {
-    if (vb == null) {
-      vb = createVisualBounds();
-
-    }
-    return new Rectangle2D.Float((float)(vb.getX() + x),
-                                 (float)(vb.getY() + y),
-                                 (float)vb.getWidth(),
-                                 (float)vb.getHeight());
-  }
-
-  public final Rectangle2D getAlignBounds(float x, float y) {
-    if (ab == null) {
-      ab = createAlignBounds();
-    }
-    return new Rectangle2D.Float((float)(ab.getX() + x),
-                                 (float)(ab.getY() + y),
-                                 (float)ab.getWidth(),
-                                 (float)ab.getHeight());
-  }
-
-  public Rectangle2D getItalicBounds(float x, float y) {
-    if (ib == null) {
-      ib = createItalicBounds();
-    }
-    return new Rectangle2D.Float((float)(ib.getX() + x),
-                                 (float)(ib.getY() + y),
-                                 (float)ib.getWidth(),
-                                 (float)ib.getHeight());
-
-  }
-
-  public Rectangle getPixelBounds(FontRenderContext frc, float x, float y) {
-      return getGV().getPixelBounds(frc, x, y); // no cache
-  }
-
-  public AffineTransform getBaselineTransform() {
-      Font font = source.getFont();
-      if (font.hasLayoutAttributes()) {
-          return AttributeValues.getBaselineTransform(font.getAttributes());
-      }
-      return null;
-  }
-
-  public Shape getOutline(float x, float y) {
-    return getGV().getOutline(x, y);
-  }
-
-  public void draw(Graphics2D g, float x, float y) {
-    g.drawGlyphVector(getGV(), x, y);
-  }
-
-  protected Rectangle2D createLogicalBounds() {
-    return getGV().getLogicalBounds();
-  }
-
-  protected Rectangle2D createVisualBounds() {
-    return getGV().getVisualBounds();
-  }
-
-  protected Rectangle2D createItalicBounds() {
-      // !!! fix
-    return getGV().getLogicalBounds();
-  }
-
-  protected Rectangle2D createAlignBounds() {
-    return createLogicalBounds();
-  }
-
-  private GlyphVector getGV() {
-    if (gv == null) {
-      gv = createGV();
-    }
-
-    return gv;
-  }
-
-  protected GlyphVector createGV() {
-    Font font = source.getFont();
-    FontRenderContext frc = source.getFRC();
-    int flags = source.getLayoutFlags();
-    char[] context = source.getChars();
-    int start = source.getStart();
-    int length = source.getLength();
-
-    GlyphLayout gl = GlyphLayout.get(null); // !!! no custom layout engines
-    StandardGlyphVector gv = gl.layout(font, frc, context, start, length,
-                                       flags, null); // ??? use textsource
-    GlyphLayout.done(gl);
-
-    return gv;
-  }
-}

From 56a27d11971d935e8b28ac9d701cf9890014a949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lund=C3=A9n?= <dlunden@openjdk.org>
Date: Wed, 12 Nov 2025 14:45:22 +0000
Subject: [PATCH 135/512] 8341039: compiler/cha/TypeProfileFinalMethod.java
 fails with assertEquals expected: 0 but was: 2

Reviewed-by: rcastanedalo, dfenacci
---
 test/hotspot/jtreg/ProblemList-Xcomp.txt      |  2 --
 .../compiler/cha/TypeProfileFinalMethod.java  | 33 ++++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index a564124b6e4..758bb32e968 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -45,6 +45,4 @@ vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 829
 
 vmTestbase/nsk/stress/thread/thread006.java 8321476 linux-all
 
-compiler/cha/TypeProfileFinalMethod.java 8341039 generic-all
-
 gc/arguments/TestNewSizeFlags.java 8299116 macosx-aarch64
diff --git a/test/hotspot/jtreg/compiler/cha/TypeProfileFinalMethod.java b/test/hotspot/jtreg/compiler/cha/TypeProfileFinalMethod.java
index a81ba53af52..8958a195653 100644
--- a/test/hotspot/jtreg/compiler/cha/TypeProfileFinalMethod.java
+++ b/test/hotspot/jtreg/compiler/cha/TypeProfileFinalMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,7 +25,7 @@
 /*
  * @test
  * @summary test c1 to record type profile with CHA optimization
- * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @requires vm.flavor == "server" & vm.flagless
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
@@ -48,6 +48,7 @@ public class TypeProfileFinalMethod {
            "-Xbatch", "-XX:-UseOnStackReplacement",
            "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
            "-XX:Tier3InvocationThreshold=200", "-XX:Tier4InvocationThreshold=5000",
+           "-XX:CompileCommand=CompileOnly," + Launcher.class.getName() + "::test*",
            Launcher.class.getName());
        OutputAnalyzer output = ProcessTools.executeProcess(pb);
        System.out.println("debug output");
@@ -61,7 +62,7 @@ public class TypeProfileFinalMethod {
        while (matcher.find()) {
          matchCnt++;
        }
-       Asserts.assertEquals(matchCnt, 2);  // inline Child1::m() twice
+       Asserts.assertEquals(2, matchCnt);  // inline Child1::m() twice
     }
 
     static class Launcher {
@@ -86,23 +87,23 @@ public class TypeProfileFinalMethod {
 
         static void addCompilerDirectives() {
             WhiteBox WB = WhiteBox.getWhiteBox();
-            // do not inline getInstance() for test1() and test2()
+            // Directive for test1
             String directive = "[{ match: [\"" + Launcher.class.getName() + "::test1\"]," +
-                "inline:[\"-" + Launcher.class.getName()+"::getInstance()\"] }]";
+                // Do not inline getInstance
+                "inline:[\"-" + Launcher.class.getName()+"::getInstance\"] }]";
             WB.addCompilerDirective(directive);
 
+            // Directive for test2
             directive = "[{ match: [\"" + Launcher.class.getName() + "::test2\"]," +
-                "inline:[\"-" + Launcher.class.getName()+"::getInstance()\"] }]";
-            WB.addCompilerDirective(directive);
-
-            // do not inline test1() for test2() in c1 compilation
-            directive = "[{ match: [\"" + Launcher.class.getName() + "::test2\"]," +
-                "c1: { inline:[\"-" + Launcher.class.getName()+"::test1()\"] } }]";
-            WB.addCompilerDirective(directive);
-
-            // print inline tree for checking
-            directive = "[{ match: [\"" + Launcher.class.getName() + "::test2\"]," +
-                "c2: { PrintInlining: true } }]";
+                // Do not inline getInstance
+                "inline:[\"-" + Launcher.class.getName()+"::getInstance\"]," +
+                // Do not inline test1 in C1 compilation
+                "c1: { inline:[\"-" + Launcher.class.getName()+"::test1\"] }," +
+                // Make sure to inline test1 in C2 compilation
+                "c2: { inline:[\"+" + Launcher.class.getName()+"::test1\"]," +
+                // Print the inline tree for checking
+                "      PrintInlining:true }" +
+                "}]";
             WB.addCompilerDirective(directive);
         }
 

From e5c72937af50433029b8d4b6b30a5318c31a9da4 Mon Sep 17 00:00:00 2001
From: David Beaumont <david.beaumont@oracle.com>
Date: Wed, 12 Nov 2025 15:41:40 +0000
Subject: [PATCH 136/512] 8371645: BasicImageReader getEntryNames() is stateful
 and cannot be called more than once

Reviewed-by: alanb, rriggs
---
 .../jdk/internal/jimage/BasicImageReader.java       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
index c06c62488db..6807928b2c2 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
@@ -317,13 +317,12 @@ public class BasicImageReader implements AutoCloseable {
     }
 
     public String[] getEntryNames() {
-        int[] attributeOffsets = new int[offsets.capacity()];
-        offsets.get(attributeOffsets);
-        return IntStream.of(attributeOffsets)
-                        .filter(o -> o != 0)
-                        .mapToObj(o -> ImageLocation.readFrom(this, o).getFullName())
-                        .sorted()
-                        .toArray(String[]::new);
+        return IntStream.range(0, offsets.capacity())
+                .map(offsets::get)
+                .filter(o -> o != 0)
+                .mapToObj(o -> ImageLocation.readFrom(this, o).getFullName())
+                .sorted()
+                .toArray(String[]::new);
     }
 
     ImageLocation getLocation(int offset) {

From 78db38f14044d434eabb61ff8293d62eff3c497c Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Wed, 12 Nov 2025 17:56:19 +0000
Subject: [PATCH 137/512] 8371365: Update
 javax/swing/JFileChooser/bug4759934.java to use Util.findComponent()

Reviewed-by: aivanov, dnguyen, azvegint
---
 .../jdk/javax/swing/JFileChooser/bug4759934.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/test/jdk/javax/swing/JFileChooser/bug4759934.java b/test/jdk/javax/swing/JFileChooser/bug4759934.java
index 08ccdebfb2b..c7f340ccdd0 100644
--- a/test/jdk/javax/swing/JFileChooser/bug4759934.java
+++ b/test/jdk/javax/swing/JFileChooser/bug4759934.java
@@ -31,10 +31,11 @@
  * @run main bug4759934
  */
 
+import java.awt.Component;
+import java.awt.Container;
 import java.awt.Dialog;
 import java.awt.Point;
 import java.awt.Robot;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -72,8 +73,10 @@ public class bug4759934 {
             robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
             robot.delay(500);
 
-            robot.keyPress(KeyEvent.VK_ESCAPE);
-            robot.keyRelease(KeyEvent.VK_ESCAPE);
+            SwingUtilities.invokeAndWait(() -> {
+                JButton cancelBtn = findCancelButton(jfc);
+                cancelBtn.doClick();
+            });
             robot.delay(500);
 
             SwingUtilities.invokeAndWait(() -> {
@@ -121,4 +124,11 @@ public class bug4759934 {
         dlg.setLocation(fr.getX() + fr.getWidth() + 10, fr.getY());
         dlg.setVisible(true);
     }
+
+    private static JButton findCancelButton(final Container container) {
+        Component result = Util.findComponent(container,
+                                              c -> c instanceof JButton button
+                                                   && "Cancel".equals(button.getText()));
+        return (JButton) result;
+    }
 }

From 705bd6fbdc0e78625d05dbfa8af547c50b076e69 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 12 Nov 2025 18:54:55 +0000
Subject: [PATCH 138/512] 8367902: Allocation after Universe::before_exit() in
 the VM shutdown sequence

Reviewed-by: ayang, stefank, iwalulya, aboldtch, sspitsyn
---
 src/hotspot/share/runtime/java.cpp            | 22 ++---
 .../TestAllocatingInVMDeath.java              | 81 +++++++++++++++++++
 .../libTestAllocatingInVMDeath.cpp            | 59 ++++++++++++++
 3 files changed, 152 insertions(+), 10 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/TestAllocatingInVMDeath.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp

diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 6fda21ac86c..fb4abdac2ef 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -476,7 +476,18 @@ void before_exit(JavaThread* thread, bool halt) {
 
   NativeHeapTrimmer::cleanup();
 
-  // Run before exit and then stop concurrent GC threads
+  if (JvmtiExport::should_post_thread_life()) {
+    JvmtiExport::post_thread_end(thread);
+  }
+
+  // Always call even when there are not JVMTI environments yet, since environments
+  // may be attached late and JVMTI must track phases of VM execution.
+  JvmtiExport::post_vm_death();
+  JvmtiAgentList::unload_agents();
+
+  // No user code can be executed in the current thread after this point.
+
+  // Run before exit and then stop concurrent GC threads.
   Universe::before_exit();
 
   if (PrintBytecodeHistogram) {
@@ -492,15 +503,6 @@ void before_exit(JavaThread* thread, bool halt) {
   }
 #endif
 
-  if (JvmtiExport::should_post_thread_life()) {
-    JvmtiExport::post_thread_end(thread);
-  }
-
-  // Always call even when there are not JVMTI environments yet, since environments
-  // may be attached late and JVMTI must track phases of VM execution
-  JvmtiExport::post_vm_death();
-  JvmtiAgentList::unload_agents();
-
   // Terminate the signal thread
   // Note: we don't wait until it actually dies.
   os::terminate_signal_thread();
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/TestAllocatingInVMDeath.java b/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/TestAllocatingInVMDeath.java
new file mode 100644
index 00000000000..47a04b305d2
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/TestAllocatingInVMDeath.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test verifies that VM still can execute java code, allocate
+ *          memory, and call GC in the VMDeath event callback.
+ *
+ * @bug 8367902
+ * @requires vm.jvmti
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm/native TestAllocatingInVMDeath
+ */
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+
+public class TestAllocatingInVMDeath {
+    public static String UPCALL_MARKER = "Hello from upCall. ";
+
+    public static void main(String[] args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                "-agentlib:TestAllocatingInVMDeath",
+                "--enable-native-access=ALL-UNNAMED",
+                "-Xbootclasspath/a:.",
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+WhiteBoxAPI",
+                "DoWork");
+
+        OutputAnalyzer oa = new OutputAnalyzer(pb.start());
+        String output = oa.getOutput();
+        System.err.println("DoWork output:");
+        System.err.println(output);
+        Asserts.assertTrue(oa.getExitValue() == 0);
+        Asserts.assertTrue(output.contains(UPCALL_MARKER));
+    }
+}
+
+class DoWork {
+    static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
+
+    // This method is called from VMDeath event callback.
+    static void upCall() {
+        // Do some work including memory allocation, so it can't be optimized by compiler.
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+        String result = TestAllocatingInVMDeath.UPCALL_MARKER + now.format(formatter);
+        WHITE_BOX.fullGC();
+        System.out.println(result);
+    }
+
+    public static void main(String argv[]) throws Exception {
+        System.out.println("Hello from DoWork main().");
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp
new file mode 100644
index 00000000000..5f46d69afa1
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "jvmti.h"
+#include "jni.h"
+#include "jvmti_common.hpp"
+
+static void JNICALL
+cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) {
+  jclass clz = jni->FindClass("DoWork");
+  if (clz == nullptr) {
+    fatal(jni, "Can't find DoWork class.");
+    return;
+  }
+  jmethodID mid = jni->GetStaticMethodID(clz, "upCall", "()V");
+  if (mid == nullptr) {
+    fatal(jni, "Can't find upCall method.");
+  }
+  jni->CallStaticObjectMethod(clz, mid);
+}
+
+JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
+  jvmtiEnv *jvmti = nullptr;
+  jint res = vm->GetEnv((void **) &jvmti, JVMTI_VERSION_21);
+  if (res != JNI_OK) {
+    return JNI_ERR;
+  }
+  jvmtiError err = JVMTI_ERROR_NONE;
+
+  jvmtiEventCallbacks callbacks;
+  (void) memset(&callbacks, 0, sizeof (callbacks));
+  callbacks.VMDeath = &cbVMDeath;
+  err = jvmti->SetEventCallbacks(&callbacks, (int) sizeof (jvmtiEventCallbacks));
+  check_jvmti_error(err, "SetEventCallbacks");
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, nullptr);
+  check_jvmti_error(err, "SetEventNotificationMode");
+  return JNI_OK;
+}

From d2571ea76ae5a9ccb7053bfec24bf3aedd366084 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 13 Nov 2025 00:31:10 +0000
Subject: [PATCH 139/512] 8371339: Illegal pattern char 'B' with
 locale.providers as HOST on macOS for Taiwanese

Reviewed-by: jlu, rriggs
---
 .../provider/HostLocaleProviderAdapterImpl.java     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
index e587ee54097..e24a986782d 100644
--- a/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
+++ b/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -874,6 +874,17 @@ public class HostLocaleProviderAdapterImpl {
             sb.append('\'');
             break;
 
+        case 'B':
+            // 'B' character (day period) is not supported by SimpleDateFormat,
+            // this is a workaround in which 'B' character
+            // appearing in macos' pattern string (based on LDML) is replaced
+            // with 'a' character and hence resolved with am/pm strings.
+            // This workaround is based on the fallback mechanism
+            // specified in LDML spec for 'B' character, when a locale
+            // does not have data for day period ('B')
+            appendN('a', count, sb);
+            break;
+
         default:
             appendN(cldrLetter, count, sb);
             break;

From bc66d3e65d208edc69e8ae334d23b38f2b78a440 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 13 Nov 2025 01:19:37 +0000
Subject: [PATCH 140/512] 8370467: BorderFactory.createBevelBorder and
 createSoftBevelBorder throws NPE for null highlight and shadow

Reviewed-by: aivanov, tr, honkar
---
 .../javax/swing/border/BevelBorder.java       |  6 +-
 .../swing/border/TestBevelBorderParam.java    | 64 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/javax/swing/border/TestBevelBorderParam.java

diff --git a/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
index 13c9c85ab29..dbcab475072 100644
--- a/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,9 @@ public class BevelBorder extends AbstractBorder
      * @param shadow the color to use for the bevel shadow
      */
     public BevelBorder(int bevelType, Color highlight, Color shadow) {
-        this(bevelType, highlight.brighter(), highlight, shadow, shadow.brighter());
+        this(bevelType,
+             (highlight != null) ? highlight.brighter() : null, highlight,
+             shadow, (shadow != null) ? shadow.brighter() : null);
     }
 
     /**
diff --git a/test/jdk/javax/swing/border/TestBevelBorderParam.java b/test/jdk/javax/swing/border/TestBevelBorderParam.java
new file mode 100644
index 00000000000..ad1d779afd1
--- /dev/null
+++ b/test/jdk/javax/swing/border/TestBevelBorderParam.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8370467
+ * @summary Verifies createBevelBorder and createSoftBevelBorder does not throw NPE
+ * @run main TestBevelBorderParam
+ */
+
+import javax.swing.BorderFactory;
+import javax.swing.border.BevelBorder;
+
+public class TestBevelBorderParam {
+
+    public static void main(String[] args) throws Exception {
+        StringBuilder str = new StringBuilder();
+
+        try {
+            BorderFactory.createBevelBorder(BevelBorder.RAISED, null, null);
+        } catch (NullPointerException ex) {
+            str.append("\n");
+            str.append("BorderFactory.createBevelBorder throws NPE for null highlight and shadow");
+        }
+
+        try {
+            BorderFactory.createSoftBevelBorder(BevelBorder.RAISED, null, null);
+        } catch (NullPointerException e) {
+            str.append("\n");
+            str.append("BorderFactory.createSoftBevelBorder throws NPE for null highlight and shadow");
+        }
+
+        try {
+            new BevelBorder(BevelBorder.RAISED, null, null);
+        } catch (NullPointerException ex) {
+            str.append("\n");
+            str.append("BevelBorder constructor throws NPE for null highlight and shadow");
+        }
+
+        if (str.length() != 0) {
+            throw new RuntimeException(str.toString());
+        }
+    }
+}

From 676e6fd8d5152f4e0d14ae59ddd7aa0a7127ea58 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Thu, 13 Nov 2025 01:33:21 +0000
Subject: [PATCH 141/512] 8367292: VectorAPI: Optimize
 VectorMask.fromLong/toLong() for SVE

Reviewed-by: epeter, psandoz, haosun, sviswanathan
---
 src/hotspot/cpu/aarch64/aarch64_vector.ad     |  67 ++++--
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4  |  67 ++++--
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp | 218 +++++++++---------
 .../cpu/aarch64/c2_MacroAssembler_aarch64.hpp |  20 +-
 src/hotspot/cpu/arm/arm.ad                    |   4 +
 src/hotspot/cpu/ppc/ppc.ad                    |   4 +
 src/hotspot/cpu/riscv/riscv_v.ad              |   5 +
 src/hotspot/cpu/s390/s390.ad                  |   4 +
 src/hotspot/cpu/x86/x86.ad                    |   5 +
 src/hotspot/share/opto/matcher.hpp            |   6 +
 src/hotspot/share/opto/vectorIntrinsics.cpp   |   6 +-
 src/hotspot/share/opto/vectornode.cpp         |  16 +-
 .../compiler/lib/ir_framework/IRNode.java     |  10 +
 .../ir_framework/test/IREncodingPrinter.java  |   1 +
 .../vectorapi/VectorMaskFromLongTest.java     | 147 ++++++------
 .../vectorapi/VectorMaskToLongTest.java       | 146 ++++++++++--
 16 files changed, 470 insertions(+), 256 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 9809d096233..842784d1a29 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -393,6 +393,32 @@ source %{
     return false;
   }
 
+  bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+    // Only SVE supports the predicate feature.
+    if (UseSVE == 0) {
+      // On architectures that do not support predicate, masks are stored in
+      // general vector registers (TypeVect) with sizes ranging from TypeVectA
+      // to TypeVectX based on the vector size in bytes.
+      assert(vt->isa_vectmask() == nullptr, "mask type is not matched");
+      return false;
+    }
+
+    assert(vt->isa_vectmask() != nullptr, "expected TypeVectMask on SVE");
+    switch (opcode) {
+      case Op_VectorMaskToLong:
+      case Op_VectorLongToMask:
+        // These operations lack native SVE predicate instructions and are
+        // implemented using general vector instructions instead. Use vector
+        // registers rather than predicate registers to save the mask for
+        // better performance.
+        return false;
+      default:
+        // By default, the mask operations are implemented with predicate
+        // instructions with a predicate input/output.
+        return true;
+    }
+  }
+
   // Assert that the given node is not a variable shift.
   bool assert_not_var_shift(const Node* n) {
     assert(!n->as_ShiftV()->is_var_shift(), "illegal variable shift");
@@ -6249,31 +6275,44 @@ instruct vmask_tolong_neon(iRegLNoSp dst, vReg src) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vmask_tolong_sve(iRegLNoSp dst, pReg src, vReg tmp1, vReg tmp2) %{
-  predicate(UseSVE > 0);
+instruct vmask_tolong_sve(iRegLNoSp dst, vReg src, vReg tmp) %{
+  predicate(UseSVE > 0 && !VM_Version::supports_svebitperm());
+  match(Set dst (VectorMaskToLong src));
+  effect(TEMP tmp);
+  format %{ "vmask_tolong_sve $dst, $src\t# KILL $tmp" %}
+  ins_encode %{
+    // Input "src" is a vector of boolean represented as
+    // bytes with 0x00/0x01 as element values.
+    __ sve_vmask_tolong($dst$$Register, $src$$FloatRegister,
+                        $tmp$$FloatRegister, Matcher::vector_length(this, $src));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmask_tolong_sve2(iRegLNoSp dst, vReg src, vReg tmp1, vReg tmp2) %{
+  predicate(VM_Version::supports_svebitperm());
   match(Set dst (VectorMaskToLong src));
   effect(TEMP tmp1, TEMP tmp2);
-  format %{ "vmask_tolong_sve $dst, $src\t# KILL $tmp1, $tmp2" %}
+  format %{ "vmask_tolong_sve2 $dst, $src\t# KILL $tmp1, $tmp2" %}
   ins_encode %{
-    __ sve_vmask_tolong($dst$$Register, $src$$PRegister,
-                        Matcher::vector_element_basic_type(this, $src),
-                        Matcher::vector_length(this, $src),
-                        $tmp1$$FloatRegister, $tmp2$$FloatRegister);
+    // Input "src" is a vector of boolean represented as
+    // bytes with 0x00/0x01 as element values.
+    __ sve2_vmask_tolong($dst$$Register, $src$$FloatRegister,
+                         $tmp1$$FloatRegister, $tmp2$$FloatRegister,
+                         Matcher::vector_length(this, $src));
   %}
   ins_pipe(pipe_slow);
 %}
 
 // fromlong
 
-instruct vmask_fromlong(pReg dst, iRegL src, vReg tmp1, vReg tmp2) %{
+instruct vmask_fromlong(vReg dst, iRegL src, vReg tmp) %{
   match(Set dst (VectorLongToMask src));
-  effect(TEMP tmp1, TEMP tmp2);
-  format %{ "vmask_fromlong $dst, $src\t# vector (sve2). KILL $tmp1, $tmp2" %}
+  effect(TEMP_DEF dst, TEMP tmp);
+  format %{ "vmask_fromlong $dst, $src\t# vector (sve2). KILL $tmp" %}
   ins_encode %{
-    __ sve_vmask_fromlong($dst$$PRegister, $src$$Register,
-                          Matcher::vector_element_basic_type(this),
-                          Matcher::vector_length(this),
-                          $tmp1$$FloatRegister, $tmp2$$FloatRegister);
+    __ sve_vmask_fromlong($dst$$FloatRegister, $src$$Register,
+                          $tmp$$FloatRegister, Matcher::vector_length(this));
   %}
   ins_pipe(pipe_slow);
 %}
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index a9f42e1bc08..dff82ce95ac 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -383,6 +383,32 @@ source %{
     return false;
   }
 
+  bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+    // Only SVE supports the predicate feature.
+    if (UseSVE == 0) {
+      // On architectures that do not support predicate, masks are stored in
+      // general vector registers (TypeVect) with sizes ranging from TypeVectA
+      // to TypeVectX based on the vector size in bytes.
+      assert(vt->isa_vectmask() == nullptr, "mask type is not matched");
+      return false;
+    }
+
+    assert(vt->isa_vectmask() != nullptr, "expected TypeVectMask on SVE");
+    switch (opcode) {
+      case Op_VectorMaskToLong:
+      case Op_VectorLongToMask:
+        // These operations lack native SVE predicate instructions and are
+        // implemented using general vector instructions instead. Use vector
+        // registers rather than predicate registers to save the mask for
+        // better performance.
+        return false;
+      default:
+        // By default, the mask operations are implemented with predicate
+        // instructions with a predicate input/output.
+        return true;
+    }
+  }
+
   // Assert that the given node is not a variable shift.
   bool assert_not_var_shift(const Node* n) {
     assert(!n->as_ShiftV()->is_var_shift(), "illegal variable shift");
@@ -4303,31 +4329,44 @@ instruct vmask_tolong_neon(iRegLNoSp dst, vReg src) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vmask_tolong_sve(iRegLNoSp dst, pReg src, vReg tmp1, vReg tmp2) %{
-  predicate(UseSVE > 0);
+instruct vmask_tolong_sve(iRegLNoSp dst, vReg src, vReg tmp) %{
+  predicate(UseSVE > 0 && !VM_Version::supports_svebitperm());
+  match(Set dst (VectorMaskToLong src));
+  effect(TEMP tmp);
+  format %{ "vmask_tolong_sve $dst, $src\t# KILL $tmp" %}
+  ins_encode %{
+    // Input "src" is a vector of boolean represented as
+    // bytes with 0x00/0x01 as element values.
+    __ sve_vmask_tolong($dst$$Register, $src$$FloatRegister,
+                        $tmp$$FloatRegister, Matcher::vector_length(this, $src));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmask_tolong_sve2(iRegLNoSp dst, vReg src, vReg tmp1, vReg tmp2) %{
+  predicate(VM_Version::supports_svebitperm());
   match(Set dst (VectorMaskToLong src));
   effect(TEMP tmp1, TEMP tmp2);
-  format %{ "vmask_tolong_sve $dst, $src\t# KILL $tmp1, $tmp2" %}
+  format %{ "vmask_tolong_sve2 $dst, $src\t# KILL $tmp1, $tmp2" %}
   ins_encode %{
-    __ sve_vmask_tolong($dst$$Register, $src$$PRegister,
-                        Matcher::vector_element_basic_type(this, $src),
-                        Matcher::vector_length(this, $src),
-                        $tmp1$$FloatRegister, $tmp2$$FloatRegister);
+    // Input "src" is a vector of boolean represented as
+    // bytes with 0x00/0x01 as element values.
+    __ sve2_vmask_tolong($dst$$Register, $src$$FloatRegister,
+                         $tmp1$$FloatRegister, $tmp2$$FloatRegister,
+                         Matcher::vector_length(this, $src));
   %}
   ins_pipe(pipe_slow);
 %}
 
 // fromlong
 
-instruct vmask_fromlong(pReg dst, iRegL src, vReg tmp1, vReg tmp2) %{
+instruct vmask_fromlong(vReg dst, iRegL src, vReg tmp) %{
   match(Set dst (VectorLongToMask src));
-  effect(TEMP tmp1, TEMP tmp2);
-  format %{ "vmask_fromlong $dst, $src\t# vector (sve2). KILL $tmp1, $tmp2" %}
+  effect(TEMP_DEF dst, TEMP tmp);
+  format %{ "vmask_fromlong $dst, $src\t# vector (sve2). KILL $tmp" %}
   ins_encode %{
-    __ sve_vmask_fromlong($dst$$PRegister, $src$$Register,
-                          Matcher::vector_element_basic_type(this),
-                          Matcher::vector_length(this),
-                          $tmp1$$FloatRegister, $tmp2$$FloatRegister);
+    __ sve_vmask_fromlong($dst$$FloatRegister, $src$$Register,
+                          $tmp$$FloatRegister, Matcher::vector_length(this));
   %}
   ins_pipe(pipe_slow);
 %}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index ebb4a897906..5e57044dcba 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -1399,137 +1399,125 @@ void C2_MacroAssembler::bytemask_compress(Register dst) {
   andr(dst, dst, 0xff);                   // dst = 0x8D
 }
 
-// Pack the lowest-numbered bit of each mask element in src into a long value
-// in dst, at most the first 64 lane elements.
-// Clobbers: rscratch1, if UseSVE=1 or the hardware doesn't support FEAT_BITPERM.
-void C2_MacroAssembler::sve_vmask_tolong(Register dst, PRegister src, BasicType bt, int lane_cnt,
-                                         FloatRegister vtmp1, FloatRegister vtmp2) {
+// Pack the value of each mask element in "src" into a long value in "dst", at most
+// the first 64 lane elements. The input "src" is a vector of boolean represented as
+// bytes with 0x00/0x01 as element values. Each lane value from "src" is packed into
+// one bit in "dst".
+//
+// Example:   src = 0x0001010000010001 0100000001010001, lane_cnt = 16
+// Expected:  dst = 0x658D
+//
+// Clobbers: rscratch1
+void C2_MacroAssembler::sve_vmask_tolong(Register dst, FloatRegister src,
+                                         FloatRegister vtmp, int lane_cnt) {
   assert(lane_cnt <= 64 && is_power_of_2(lane_cnt), "Unsupported lane count");
   assert_different_registers(dst, rscratch1);
-  assert_different_registers(vtmp1, vtmp2);
+  assert_different_registers(src, vtmp);
+  assert(UseSVE > 0, "must be");
 
-  Assembler::SIMD_RegVariant size = elemType_to_regVariant(bt);
-  // Example:   src = 0b01100101 10001101, bt = T_BYTE, lane_cnt = 16
-  // Expected:  dst = 0x658D
+  // Compress the lowest 8 bytes.
+  fmovd(dst, src);
+  bytemask_compress(dst);
+  if (lane_cnt <= 8) return;
 
-  // Convert the mask into vector with sequential bytes.
-  // vtmp1 = 0x00010100 0x00010001 0x01000000 0x01010001
-  sve_cpy(vtmp1, size, src, 1, false);
-  if (bt != T_BYTE) {
-    sve_vector_narrow(vtmp1, B, vtmp1, size, vtmp2);
-  }
-
-  if (UseSVE > 1 && VM_Version::supports_svebitperm()) {
-    // Given a vector with the value 0x00 or 0x01 in each byte, the basic idea
-    // is to compress each significant bit of the byte in a cross-lane way. Due
-    // to the lack of a cross-lane bit-compress instruction, we use BEXT
-    // (bit-compress in each lane) with the biggest lane size (T = D) then
-    // concatenate the results.
-
-    // The second source input of BEXT, initialized with 0x01 in each byte.
-    // vtmp2 = 0x01010101 0x01010101 0x01010101 0x01010101
-    sve_dup(vtmp2, B, 1);
-
-    // BEXT vtmp1.D, vtmp1.D, vtmp2.D
-    // vtmp1 = 0x0001010000010001 | 0x0100000001010001
-    // vtmp2 = 0x0101010101010101 | 0x0101010101010101
-    //         ---------------------------------------
-    // vtmp1 = 0x0000000000000065 | 0x000000000000008D
-    sve_bext(vtmp1, D, vtmp1, vtmp2);
-
-    // Concatenate the lowest significant 8 bits in each 8 bytes, and extract the
-    // result to dst.
-    // vtmp1 = 0x0000000000000000 | 0x000000000000658D
-    // dst   = 0x658D
-    if (lane_cnt <= 8) {
-      // No need to concatenate.
-      umov(dst, vtmp1, B, 0);
-    } else if (lane_cnt <= 16) {
-      ins(vtmp1, B, vtmp1, 1, 8);
-      umov(dst, vtmp1, H, 0);
-    } else {
-      // As the lane count is 64 at most, the final expected value must be in
-      // the lowest 64 bits after narrowing vtmp1 from D to B.
-      sve_vector_narrow(vtmp1, B, vtmp1, D, vtmp2);
-      umov(dst, vtmp1, D, 0);
-    }
-  } else if (UseSVE > 0) {
-    // Compress the lowest 8 bytes.
-    fmovd(dst, vtmp1);
-    bytemask_compress(dst);
-    if (lane_cnt <= 8) return;
-
-    // Repeat on higher bytes and join the results.
-    // Compress 8 bytes in each iteration.
-    for (int idx = 1; idx < (lane_cnt / 8); idx++) {
-      sve_extract_integral(rscratch1, T_LONG, vtmp1, idx, vtmp2);
-      bytemask_compress(rscratch1);
-      orr(dst, dst, rscratch1, Assembler::LSL, idx << 3);
-    }
-  } else {
-    assert(false, "unsupported");
-    ShouldNotReachHere();
+  // Repeat on higher bytes and join the results.
+  // Compress 8 bytes in each iteration.
+  for (int idx = 1; idx < (lane_cnt / 8); idx++) {
+    sve_extract_integral(rscratch1, T_LONG, src, idx, vtmp);
+    bytemask_compress(rscratch1);
+    orr(dst, dst, rscratch1, Assembler::LSL, idx << 3);
   }
 }
 
-// Unpack the mask, a long value in src, into predicate register dst based on the
-// corresponding data type. Note that dst can support at most 64 lanes.
-// Below example gives the expected dst predicate register in different types, with
-// a valid src(0x658D) on a 1024-bit vector size machine.
-// BYTE:  dst = 0x00 00 00 00 00 00 00 00 00 00 00 00 00 00 65 8D
-// SHORT: dst = 0x00 00 00 00 00 00 00 00 00 00 00 00 14 11 40 51
-// INT:   dst = 0x00 00 00 00 00 00 00 00 01 10 01 01 10 00 11 01
-// LONG:  dst = 0x00 01 01 00 00 01 00 01 01 00 00 00 01 01 00 01
-//
-// The number of significant bits of src must be equal to lane_cnt. E.g., 0xFF658D which
-// has 24 significant bits would be an invalid input if dst predicate register refers to
-// a LONG type 1024-bit vector, which has at most 16 lanes.
-void C2_MacroAssembler::sve_vmask_fromlong(PRegister dst, Register src, BasicType bt, int lane_cnt,
-                                           FloatRegister vtmp1, FloatRegister vtmp2) {
-  assert(UseSVE == 2 && VM_Version::supports_svebitperm() &&
-         lane_cnt <= 64 && is_power_of_2(lane_cnt), "unsupported");
-  Assembler::SIMD_RegVariant size = elemType_to_regVariant(bt);
-  // Example:   src = 0x658D, bt = T_BYTE, size = B, lane_cnt = 16
-  // Expected:  dst = 0b01101001 10001101
+// The function is same as above "sve_vmask_tolong", but it uses SVE2's BEXT
+// instruction which requires the FEAT_BITPERM feature.
+void C2_MacroAssembler::sve2_vmask_tolong(Register dst, FloatRegister src,
+                                          FloatRegister vtmp1, FloatRegister vtmp2,
+                                          int lane_cnt) {
+  assert(lane_cnt <= 64 && is_power_of_2(lane_cnt), "Unsupported lane count");
+  assert_different_registers(src, vtmp1, vtmp2);
+  assert(UseSVE > 1 && VM_Version::supports_svebitperm(), "must be");
 
-  // Put long value from general purpose register into the first lane of vector.
-  // vtmp1 = 0x0000000000000000 | 0x000000000000658D
-  sve_dup(vtmp1, B, 0);
-  mov(vtmp1, D, 0, src);
+  // Given a vector with the value 0x00 or 0x01 in each byte, the basic idea
+  // is to compress each significant bit of the byte in a cross-lane way. Due
+  // to the lack of a cross-lane bit-compress instruction, we use BEXT
+  // (bit-compress in each lane) with the biggest lane size (T = D) then
+  // concatenate the results.
 
-  // As sve_cmp generates mask value with the minimum unit in byte, we should
-  // transform the value in the first lane which is mask in bit now to the
-  // mask in byte, which can be done by SVE2's BDEP instruction.
-
-  // The first source input of BDEP instruction. Deposite each byte in every 8 bytes.
-  // vtmp1 = 0x0000000000000065 | 0x000000000000008D
-  if (lane_cnt <= 8) {
-    // Nothing. As only one byte exsits.
-  } else if (lane_cnt <= 16) {
-    ins(vtmp1, B, vtmp1, 8, 1);
-    mov(vtmp1, B, 1, zr);
-  } else {
-    sve_vector_extend(vtmp1, D, vtmp1, B);
-  }
-
-  // The second source input of BDEP instruction, initialized with 0x01 for each byte.
+  // The second source input of BEXT, initialized with 0x01 in each byte.
   // vtmp2 = 0x01010101 0x01010101 0x01010101 0x01010101
   sve_dup(vtmp2, B, 1);
 
-  // BDEP vtmp1.D, vtmp1.D, vtmp2.D
-  // vtmp1 = 0x0000000000000065 | 0x000000000000008D
+  // BEXT vtmp1.D, src.D, vtmp2.D
+  // src   = 0x0001010000010001 | 0x0100000001010001
   // vtmp2 = 0x0101010101010101 | 0x0101010101010101
   //         ---------------------------------------
-  // vtmp1 = 0x0001010000010001 | 0x0100000001010001
-  sve_bdep(vtmp1, D, vtmp1, vtmp2);
+  // vtmp1 = 0x0000000000000065 | 0x000000000000008D
+  sve_bext(vtmp1, D, src, vtmp2);
 
-  if (bt != T_BYTE) {
-    sve_vector_extend(vtmp1, size, vtmp1, B);
+  // Concatenate the lowest significant 8 bits in each 8 bytes, and extract the
+  // result to dst.
+  // vtmp1 = 0x0000000000000000 | 0x000000000000658D
+  // dst   = 0x658D
+  if (lane_cnt <= 8) {
+    // No need to concatenate.
+    umov(dst, vtmp1, B, 0);
+  } else if (lane_cnt <= 16) {
+    ins(vtmp1, B, vtmp1, 1, 8);
+    umov(dst, vtmp1, H, 0);
+  } else {
+    // As the lane count is 64 at most, the final expected value must be in
+    // the lowest 64 bits after narrowing vtmp1 from D to B.
+    sve_vector_narrow(vtmp1, B, vtmp1, D, vtmp2);
+    umov(dst, vtmp1, D, 0);
   }
-  // Generate mask according to the given vector, in which the elements have been
-  // extended to expected type.
-  // dst = 0b01101001 10001101
-  sve_cmp(Assembler::NE, dst, size, ptrue, vtmp1, 0);
+}
+
+// Unpack the mask, a long value in "src", into a vector register of boolean
+// represented as bytes with 0x00/0x01 as element values in "dst".  Each bit in
+// "src" is unpacked into one byte lane in "dst". Note that "dst" can support at
+// most 64 lanes.
+//
+// Below example gives the expected dst vector register, with a valid src(0x658D)
+// on a 128-bit vector size machine.
+// dst = 0x00 01 01 00 00 01 00 01 01 00 00 00 01 01 00 01
+void C2_MacroAssembler::sve_vmask_fromlong(FloatRegister dst, Register src,
+                                           FloatRegister vtmp, int lane_cnt) {
+  assert_different_registers(dst, vtmp);
+  assert(UseSVE == 2 && VM_Version::supports_svebitperm() &&
+         lane_cnt <= 64 && is_power_of_2(lane_cnt), "unsupported");
+
+  // Example:   src = 0x658D, lane_cnt = 16
+  // Expected:  dst = 0x00 01 01 00 00 01 00 01 01 00 00 00 01 01 00 01
+
+  // Put long value from general purpose register into the first lane of vector.
+  // vtmp = 0x0000000000000000 | 0x000000000000658D
+  sve_dup(vtmp, B, 0);
+  mov(vtmp, D, 0, src);
+
+  // Transform the value in the first lane which is mask in bit now to the mask in
+  // byte, which can be done by SVE2's BDEP instruction.
+
+  // The first source input of BDEP instruction. Deposite each byte in every 8 bytes.
+  // vtmp = 0x0000000000000065 | 0x000000000000008D
+  if (lane_cnt <= 8) {
+    // Nothing. As only one byte exsits.
+  } else if (lane_cnt <= 16) {
+    ins(vtmp, B, vtmp, 8, 1);
+  } else {
+    sve_vector_extend(vtmp, D, vtmp, B);
+  }
+
+  // The second source input of BDEP instruction, initialized with 0x01 for each byte.
+  // dst = 0x01010101 0x01010101 0x01010101 0x01010101
+  sve_dup(dst, B, 1);
+
+  // BDEP dst.D, vtmp.D, dst.D
+  // vtmp = 0x0000000000000065 | 0x000000000000008D
+  // dst  = 0x0101010101010101 | 0x0101010101010101
+  //        ---------------------------------------
+  // dst  = 0x0001010000010001 | 0x0100000001010001
+  sve_bdep(dst, D, vtmp, dst);
 }
 
 // Clobbers: rflags
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index ccd091938a3..412f0f37e9e 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -85,15 +85,19 @@
   // the higher garbage bits.
   void bytemask_compress(Register dst);
 
-  // Pack the lowest-numbered bit of each mask element in src into a long value
-  // in dst, at most the first 64 lane elements.
-  void sve_vmask_tolong(Register dst, PRegister src, BasicType bt, int lane_cnt,
-                        FloatRegister vtmp1, FloatRegister vtmp2);
+  // Pack the value of each mask element in "src" into a long value in "dst", at most the
+  // first 64 lane elements. The input "src" is a vector of boolean represented as bytes
+  // with 0x00/0x01 as element values. Each lane value from "src" is packed into one bit in
+  // "dst".
+  void sve_vmask_tolong(Register dst, FloatRegister src, FloatRegister vtmp, int lane_cnt);
 
-  // Unpack the mask, a long value in src, into predicate register dst based on the
-  // corresponding data type. Note that dst can support at most 64 lanes.
-  void sve_vmask_fromlong(PRegister dst, Register src, BasicType bt, int lane_cnt,
-                          FloatRegister vtmp1, FloatRegister vtmp2);
+  void sve2_vmask_tolong(Register dst, FloatRegister src, FloatRegister vtmp1,
+                         FloatRegister vtmp2, int lane_cnt);
+
+  // Unpack the mask, a long value in "src", into vector register "dst" with boolean type.
+  // Each bit in "src" is unpacked into one byte lane in "dst". Note that "dst" can support
+  // at most 64 lanes.
+  void sve_vmask_fromlong(FloatRegister dst, Register src, FloatRegister vtmp, int lane_cnt);
 
   // SIMD&FP comparison
   void neon_compare(FloatRegister dst, BasicType bt, FloatRegister src1,
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 31a442be624..92c0df68deb 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -1003,6 +1003,10 @@ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen
   return false;
 }
 
+bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+  return false;
+}
+
 const RegMask* Matcher::predicate_reg_mask(void) {
   return nullptr;
 }
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 36326e5fdb7..7fcd096d2ad 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2292,6 +2292,10 @@ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen
   return false;
 }
 
+bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+  return false;
+}
+
 const RegMask* Matcher::predicate_reg_mask(void) {
   return nullptr;
 }
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index fe323474d60..d162280106a 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -164,6 +164,11 @@ source %{
   bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen) {
     return false;
   }
+
+  bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+    // Prefer predicate if the mask type is "TypeVectMask".
+    return vt->isa_vectmask() != nullptr;
+  }
 %}
 
 // All VEC instructions
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 2b2ce713491..cab3965ecfa 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1809,6 +1809,10 @@ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen
   return false;
 }
 
+bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+  return false;
+}
+
 const RegMask* Matcher::predicate_reg_mask(void) {
   return nullptr;
 }
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 9a0bbdc27a0..a9748617e1f 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -3736,6 +3736,11 @@ bool Matcher::vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen
   }
 }
 
+bool Matcher::mask_op_prefers_predicate(int opcode, const TypeVect* vt) {
+  // Prefer predicate if the mask type is "TypeVectMask".
+  return vt->isa_vectmask() != nullptr;
+}
+
 MachOper* Matcher::pd_specialize_generic_vector_operand(MachOper* generic_opnd, uint ideal_reg, bool is_temp) {
   assert(Matcher::is_generic_vector(generic_opnd), "not generic");
   bool legacy = (generic_opnd->opcode() == LEGVEC);
diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp
index e4396b423ac..01f11b1fdc9 100644
--- a/src/hotspot/share/opto/matcher.hpp
+++ b/src/hotspot/share/opto/matcher.hpp
@@ -333,6 +333,12 @@ public:
 
   static bool vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen);
 
+  // Identify if a vector mask operation prefers the input/output mask to be
+  // saved with a predicate type or not.
+  // - Return true if it prefers a predicate type (i.e. TypeVectMask).
+  // - Return false if it prefers a general vector type (i.e. TypeVectA to TypeVectZ).
+  static bool mask_op_prefers_predicate(int opcode, const TypeVect* vt);
+
   static const RegMask* predicate_reg_mask(void);
 
   // Vector width in bytes
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 85d9790c0eb..b48b5f2cd05 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -622,7 +622,7 @@ bool LibraryCallKit::inline_vector_mask_operation() {
     return false;
   }
 
-  if (mask_vec->bottom_type()->isa_vectmask() == nullptr) {
+  if (!Matcher::mask_op_prefers_predicate(mopc, mask_vec->bottom_type()->is_vect())) {
     mask_vec = gvn().transform(VectorStoreMaskNode::make(gvn(), mask_vec, elem_bt, num_elem));
   }
   const Type* maskoper_ty = mopc == Op_VectorMaskToLong ? (const Type*)TypeLong::LONG : (const Type*)TypeInt::INT;
@@ -708,7 +708,7 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
 
   if (opc == Op_VectorLongToMask) {
     const TypeVect* vt = TypeVect::makemask(elem_bt, num_elem);
-    if (vt->isa_vectmask()) {
+    if (Matcher::mask_op_prefers_predicate(opc, vt)) {
       broadcast = gvn().transform(new VectorLongToMaskNode(elem, vt));
     } else {
       const TypeVect* mvt = TypeVect::make(T_BOOLEAN, num_elem);
@@ -2545,7 +2545,7 @@ bool LibraryCallKit::inline_vector_extract() {
         return false;
       }
       // VectorMaskToLongNode requires the input is either a mask or a vector with BOOLEAN type.
-      if (opd->bottom_type()->isa_vectmask() == nullptr) {
+      if (!Matcher::mask_op_prefers_predicate(Op_VectorMaskToLong, opd->bottom_type()->is_vect())) {
         opd = gvn().transform(VectorStoreMaskNode::make(gvn(), opd, elem_bt, num_elem));
       }
       // ((toLong() >>> pos) & 1L
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 6ae8bbe8aa0..a49f3d24fd4 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1403,7 +1403,7 @@ Node* ReductionNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 }
 
 // Convert fromLong to maskAll if the input sets or unsets all lanes.
-Node* convertFromLongToMaskAll(PhaseGVN* phase, const TypeLong* bits_type, bool is_mask, const TypeVect* vt) {
+static Node* convertFromLongToMaskAll(PhaseGVN* phase, const TypeLong* bits_type, const TypeVect* vt) {
   uint vlen = vt->length();
   BasicType bt = vt->element_basic_type();
   // The "maskAll" API uses the corresponding integer types for floating-point data.
@@ -1418,7 +1418,7 @@ Node* convertFromLongToMaskAll(PhaseGVN* phase, const TypeLong* bits_type, bool
     } else {
       con = phase->intcon(con_value);
     }
-    Node* res = VectorNode::scalar2vector(con, vlen, maskall_bt, is_mask);
+    Node* res = VectorNode::scalar2vector(con, vlen, maskall_bt, vt->isa_vectmask() != nullptr);
     // Convert back to the original floating-point data type.
     if (is_floating_point_type(bt)) {
       res = new VectorMaskCastNode(phase->transform(res), vt);
@@ -1432,7 +1432,7 @@ Node* VectorLoadMaskNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   // VectorLoadMask(VectorLongToMask(-1/0)) => Replicate(-1/0)
   if (in(1)->Opcode() == Op_VectorLongToMask) {
     const TypeVect* vt = bottom_type()->is_vect();
-    Node* res = convertFromLongToMaskAll(phase, in(1)->in(1)->bottom_type()->isa_long(), false, vt);
+    Node* res = convertFromLongToMaskAll(phase, in(1)->in(1)->bottom_type()->isa_long(), vt);
     if (res != nullptr) {
       return res;
     }
@@ -1900,10 +1900,12 @@ Node* VectorMaskCastNode::Identity(PhaseGVN* phase) {
 // l is -1 or 0.
 Node* VectorMaskToLongNode::Ideal_MaskAll(PhaseGVN* phase) {
   Node* in1 = in(1);
-  // VectorMaskToLong follows a VectorStoreMask if predicate is not supported.
+  // VectorMaskToLong follows a VectorStoreMask if it doesn't require the mask
+  // saved with a predicate type.
   if (in1->Opcode() == Op_VectorStoreMask) {
-    assert(!in1->in(1)->bottom_type()->isa_vectmask(), "sanity");
-    in1 = in1->in(1);
+    Node* mask = in1->in(1);
+    assert(!Matcher::mask_op_prefers_predicate(Opcode(), mask->bottom_type()->is_vect()), "sanity");
+    in1 = mask;
   }
   if (VectorNode::is_all_ones_vector(in1)) {
     int vlen = in1->bottom_type()->is_vect()->length();
@@ -1960,7 +1962,7 @@ Node* VectorLongToMaskNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   // VectorLongToMask(-1/0) => MaskAll(-1/0)
   const TypeLong* bits_type = in(1)->bottom_type()->isa_long();
   if (bits_type && is_mask) {
-    Node* res = convertFromLongToMaskAll(phase, bits_type, true, dst_type);
+    Node* res = convertFromLongToMaskAll(phase, bits_type, dst_type);
     if (res != nullptr) {
       return res;
     }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 80429ad868a..25ebcc94844 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2060,6 +2060,16 @@ public class IRNode {
         beforeMatchingNameRegex(STORE_VECTOR_SCATTER_MASKED, "StoreVectorScatterMasked");
     }
 
+    public static final String VECTOR_LOAD_MASK = PREFIX + "VECTOR_LOAD_MASK" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(VECTOR_LOAD_MASK, "VectorLoadMask");
+    }
+
+    public static final String VECTOR_STORE_MASK = PREFIX + "VECTOR_STORE_MASK" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(VECTOR_STORE_MASK, "VectorStoreMask");
+    }
+
     public static final String SUB = PREFIX + "SUB" + POSTFIX;
     static {
         beforeMatchingNameRegex(SUB, "Sub(I|L|F|D|HF)");
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index daa2b9765f8..a24cfbd3e37 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -114,6 +114,7 @@ public class IREncodingPrinter {
         "asimd",
         "sve",
         "sve2",
+        "svebitperm",
         "fphp",
         "asimdhp",
         // RISCV64
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorMaskFromLongTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorMaskFromLongTest.java
index eaa6211efc5..c4feb97ebf3 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorMaskFromLongTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorMaskFromLongTest.java
@@ -22,14 +22,14 @@
  */
 
 /*
-* @test
-* @bug 8356760 8367391
-* @library /test/lib /
-* @summary Optimize VectorMask.fromLong for all-true/all-false cases
-* @modules jdk.incubator.vector
-*
-* @run driver compiler.vectorapi.VectorMaskFromLongTest
-*/
+ * @test
+ * @bug 8356760 8367391 8367292
+ * @library /test/lib /
+ * @summary IR test for VectorMask.fromLong()
+ * @modules jdk.incubator.vector
+ *
+ * @run driver compiler.vectorapi.VectorMaskFromLongTest
+ */
 
 package compiler.vectorapi;
 
@@ -47,11 +47,6 @@ public class VectorMaskFromLongTest {
 
     static boolean[] mr = new boolean[B_SPECIES.length()];
 
-    @ForceInline
-    public static void maskFromLongKernel(VectorSpecies<?> species, long inputLong) {
-        VectorMask.fromLong(species, inputLong).intoArray(mr, 0);
-    }
-
     @DontInline
     public static void verifyMaskFromLong(VectorSpecies<?> species, long inputLong) {
         for (int i = 0; i < species.length(); i++) {
@@ -63,9 +58,11 @@ public class VectorMaskFromLongTest {
         }
     }
 
+    // Tests for "VectorLongToMask(-1/0) => MaskAll(-1/0)"
+
     @ForceInline
-    public static void testMaskFromLong(VectorSpecies<?> species, long inputLong ) {
-        maskFromLongKernel(species, inputLong);
+    public static void fromLongMaskAllKernel(VectorSpecies<?> species, long inputLong ) {
+        VectorMask.fromLong(species, inputLong).intoArray(mr, 0);
         verifyMaskFromLong(species, inputLong);
     }
 
@@ -73,16 +70,16 @@ public class VectorMaskFromLongTest {
     public static void testMaskFromLongMaskAll(VectorSpecies<?> species) {
         int vlen = species.length();
         long inputLong = 0L;
-        testMaskFromLong(species, inputLong);
+        fromLongMaskAllKernel(species, inputLong);
 
         inputLong = vlen >= 64 ? 0L : (0x1L << vlen);
-        testMaskFromLong(species, inputLong);
+        fromLongMaskAllKernel(species, inputLong);
 
         inputLong = -1L;
-        testMaskFromLong(species, inputLong);
+        fromLongMaskAllKernel(species, inputLong);
 
         inputLong = (-1L >>> (64 - vlen));
-        testMaskFromLong(species, inputLong);
+        fromLongMaskAllKernel(species, inputLong);
     }
 
     @Test
@@ -169,102 +166,104 @@ public class VectorMaskFromLongTest {
         testMaskFromLongMaskAll(D_SPECIES);
     }
 
-    // Tests for general input long values
+    // Tests for general input long values. The purpose is to test the IRs
+    // for API VectorMask.fromLong(). To avoid any IR being optimized out by
+    // compiler, we insert a VectorMask.not() after fromLong().
+
+    @ForceInline
+    public static void fromLongGeneralKernel(VectorSpecies<?> species, long inputLong) {
+        VectorMask.fromLong(species, inputLong).not().intoArray(mr, 0);
+        verifyMaskFromLong(species, inputLong ^ -1L);
+    }
+
+    @ForceInline
+    public static void testMaskFromLongGeneral(VectorSpecies<?> species) {
+        fromLongGeneralKernel(species, (-1L >>> (64 - species.length())) - 1);
+        fromLongGeneralKernel(species, (-1L >>> (64 - species.length())) >>> 1);
+    }
 
     @Test
-    @IR(counts = { IRNode.MASK_ALL, "= 0",
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 0",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx512", "true", "rvv", "true" })
-    @IR(counts = { IRNode.REPLICATE_B, "= 0",
-                   IRNode.VECTOR_LONG_TO_MASK, "= 0" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
-    @IR(counts = { IRNode.REPLICATE_B, "= 0",
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
         applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
+                   IRNode.VECTOR_LONG_TO_MASK, "= 2" },
+        applyIfCPUFeature = { "svebitperm", "true" })
     public static void testMaskFromLongByte() {
-        // Test cases where some but not all bits are set.
-        testMaskFromLong(B_SPECIES, (-1L >>> (64 - B_SPECIES.length())) - 1);
-        testMaskFromLong(B_SPECIES, (-1L >>> (64 - B_SPECIES.length())) >>> 1);
+        testMaskFromLongGeneral(B_SPECIES);
     }
 
     @Test
-    @IR(counts = { IRNode.MASK_ALL, "= 0",
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 0",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx512", "true", "rvv", "true" })
-    @IR(counts = { IRNode.REPLICATE_S, "= 0",
-                   IRNode.VECTOR_LONG_TO_MASK, "= 0" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
-    @IR(counts = { IRNode.REPLICATE_S, "= 0",
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
         applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
+                   IRNode.VECTOR_LONG_TO_MASK, "= 2" },
+        applyIfCPUFeature = { "svebitperm", "true" })
     public static void testMaskFromLongShort() {
-        // Test cases where some but not all bits are set.
-        testMaskFromLong(S_SPECIES, (-1L >>> (64 - S_SPECIES.length())) - 1);
-        testMaskFromLong(S_SPECIES, (-1L >>> (64 - S_SPECIES.length())) >>> 1);
+        testMaskFromLongGeneral(S_SPECIES);
     }
 
     @Test
-    @IR(counts = { IRNode.MASK_ALL, "= 0",
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 0",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx512", "true", "rvv", "true" })
-    @IR(counts = { IRNode.REPLICATE_I, "= 0",
-                   IRNode.VECTOR_LONG_TO_MASK, "= 0" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
-    @IR(counts = { IRNode.REPLICATE_I, "= 0",
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
         applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
+                   IRNode.VECTOR_LONG_TO_MASK, "= 2" },
+        applyIfCPUFeature = { "svebitperm", "true" })
     public static void testMaskFromLongInt() {
-        // Test cases where some but not all bits are set.
-        testMaskFromLong(I_SPECIES, (-1L >>> (64 - I_SPECIES.length())) - 1);
-        testMaskFromLong(I_SPECIES, (-1L >>> (64 - I_SPECIES.length())) >>> 1);
+        testMaskFromLongGeneral(I_SPECIES);
     }
 
     @Test
-    @IR(counts = { IRNode.MASK_ALL, "= 0",
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 0",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx512", "true", "rvv", "true" })
-    @IR(counts = { IRNode.REPLICATE_L, "= 0",
-                   IRNode.VECTOR_LONG_TO_MASK, "= 0" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
-    @IR(counts = { IRNode.REPLICATE_L, "= 0",
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
         applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
+                   IRNode.VECTOR_LONG_TO_MASK, "= 2" },
+        applyIfCPUFeature = { "svebitperm", "true" })
     public static void testMaskFromLongLong() {
-        // Test cases where some but not all bits are set.
-        testMaskFromLong(L_SPECIES, (-1L >>> (64 - L_SPECIES.length())) - 1);
-        testMaskFromLong(L_SPECIES, (-1L >>> (64 - L_SPECIES.length())) >>> 1);
+        testMaskFromLongGeneral(L_SPECIES);
     }
 
     @Test
-    @IR(counts = { IRNode.MASK_ALL, "= 0",
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 0",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx512", "true", "rvv", "true" })
-    @IR(counts = { IRNode.REPLICATE_I, "= 0",
-                   IRNode.VECTOR_LONG_TO_MASK, "= 0" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
-    @IR(counts = { IRNode.REPLICATE_I, "= 0",
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
         applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
+                   IRNode.VECTOR_LONG_TO_MASK, "= 2" },
+        applyIfCPUFeature = { "svebitperm", "true" })
     public static void testMaskFromLongFloat() {
-        // Test cases where some but not all bits are set.
-        testMaskFromLong(F_SPECIES, (-1L >>> (64 - F_SPECIES.length())) - 1);
-        testMaskFromLong(F_SPECIES, (-1L >>> (64 - F_SPECIES.length())) >>> 1);
+        testMaskFromLongGeneral(F_SPECIES);
     }
 
     @Test
-    @IR(counts = { IRNode.MASK_ALL, "= 0",
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 0",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx512", "true", "rvv", "true" })
-    @IR(counts = { IRNode.REPLICATE_L, "= 0",
-                   IRNode.VECTOR_LONG_TO_MASK, "= 0" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
-    @IR(counts = { IRNode.REPLICATE_L, "= 0",
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
                    IRNode.VECTOR_LONG_TO_MASK, "= 2" },
         applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_LOAD_MASK, "= 2",
+                   IRNode.VECTOR_LONG_TO_MASK, "= 2" },
+        applyIfCPUFeature = { "svebitperm", "true" })
     public static void testMaskFromLongDouble() {
-        // Test cases where some but not all bits are set.
-        testMaskFromLong(D_SPECIES, (-1L >>> (64 - D_SPECIES.length())) - 1);
-        testMaskFromLong(D_SPECIES, (-1L >>> (64 - D_SPECIES.length())) >>> 1);
+        testMaskFromLongGeneral(D_SPECIES);
     }
 
     public static void main(String[] args) {
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorMaskToLongTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorMaskToLongTest.java
index 3201d593efe..35a5aca966a 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorMaskToLongTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorMaskToLongTest.java
@@ -22,18 +22,19 @@
  */
 
 /*
-* @test
-* @bug 8356760
-* @library /test/lib /
-* @summary Optimize VectorMask.fromLong for all-true/all-false cases
-* @modules jdk.incubator.vector
-*
-* @run driver compiler.vectorapi.VectorMaskToLongTest
-*/
+ * @test
+ * @bug 8356760 8367292
+ * @library /test/lib /
+ * @summary IR test for VectorMask.toLong()
+ * @modules jdk.incubator.vector
+ *
+ * @run driver compiler.vectorapi.VectorMaskToLongTest
+ */
 
 package compiler.vectorapi;
 
 import compiler.lib.ir_framework.*;
+import java.util.Arrays;
 import jdk.incubator.vector.*;
 import jdk.test.lib.Asserts;
 
@@ -45,12 +46,21 @@ public class VectorMaskToLongTest {
     static final VectorSpecies<Long> L_SPECIES = LongVector.SPECIES_MAX;
     static final VectorSpecies<Double> D_SPECIES = DoubleVector.SPECIES_MAX;
 
+    private static boolean[] m;
+
+    static {
+        m = new boolean[B_SPECIES.length()];
+        Arrays.fill(m, true);
+    }
+
     @DontInline
     public static void verifyMaskToLong(VectorSpecies<?> species, long inputLong, long got) {
         long expected = inputLong & (-1L >>> (64 - species.length()));
         Asserts.assertEquals(expected, got, "for input long " + inputLong);
     }
 
+    // Tests for "VectorMaskToLong(MaskAll(0/-1)) => ((0/-1) & (-1ULL >> (64 - vlen)))"
+
     @ForceInline
     public static void testMaskAllToLong(VectorSpecies<?> species) {
         int vlen = species.length();
@@ -173,12 +183,12 @@ public class VectorMaskToLongTest {
     @Test
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 0" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx2", "true", "rvv", "true" })
+        applyIfCPUFeatureOr = { "svebitperm", "true", "avx2", "true", "rvv", "true" })
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
+        applyIfCPUFeatureAnd = { "asimd", "true", "svebitperm", "false" })
     public static void testFromLongToLongByte() {
-        // Test the case where some but not all bits are set.
+       // Test the case where some but not all bits are set.
        long inputLong = (-1L >>> (64 - B_SPECIES.length()))-1;
        long got = VectorMask.fromLong(B_SPECIES, inputLong).toLong();
        verifyMaskToLong(B_SPECIES, inputLong, got);
@@ -187,10 +197,10 @@ public class VectorMaskToLongTest {
     @Test
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 0" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx2", "true", "rvv", "true" })
+        applyIfCPUFeatureOr = { "svebitperm", "true", "avx2", "true", "rvv", "true" })
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
+        applyIfCPUFeatureAnd = { "asimd", "true", "svebitperm", "false" })
     public static void testFromLongToLongShort() {
         // Test the case where some but not all bits are set.
         long inputLong = (-1L >>> (64 - S_SPECIES.length()))-1;
@@ -201,10 +211,10 @@ public class VectorMaskToLongTest {
     @Test
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 0" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx2", "true", "rvv", "true" })
+        applyIfCPUFeatureOr = { "svebitperm", "true", "avx2", "true", "rvv", "true" })
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
+        applyIfCPUFeatureAnd = { "asimd", "true", "svebitperm", "false" })
     public static void testFromLongToLongInt() {
         // Test the case where some but not all bits are set.
         long inputLong = (-1L >>> (64 - I_SPECIES.length()))-1;
@@ -215,10 +225,10 @@ public class VectorMaskToLongTest {
     @Test
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 0" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx2", "true", "rvv", "true" })
+        applyIfCPUFeatureOr = { "svebitperm", "true", "avx2", "true", "rvv", "true" })
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
+        applyIfCPUFeatureAnd = { "asimd", "true", "svebitperm", "false" })
     public static void testFromLongToLongLong() {
         // Test the case where some but not all bits are set.
         long inputLong = (-1L >>> (64 - L_SPECIES.length()))-1;
@@ -229,10 +239,10 @@ public class VectorMaskToLongTest {
     @Test
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 1",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx2", "true", "rvv", "true" })
+        applyIfCPUFeatureOr = { "svebitperm", "true", "avx2", "true", "rvv", "true" })
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
+        applyIfCPUFeatureAnd = { "asimd", "true", "svebitperm", "false" })
     public static void testFromLongToLongFloat() {
         // Test the case where some but not all bits are set.
         long inputLong = (-1L >>> (64 - F_SPECIES.length()))-1;
@@ -243,10 +253,10 @@ public class VectorMaskToLongTest {
     @Test
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 1",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureOr = { "sve2", "true", "avx2", "true", "rvv", "true" })
+        applyIfCPUFeatureOr = { "svebitperm", "true", "avx2", "true", "rvv", "true" })
     @IR(counts = { IRNode.VECTOR_LONG_TO_MASK, "= 0",
                    IRNode.VECTOR_MASK_TO_LONG, "= 1" },
-        applyIfCPUFeatureAnd = { "asimd", "true", "sve", "false" })
+        applyIfCPUFeatureAnd = { "asimd", "true", "svebitperm", "false" })
     public static void testFromLongToLongDouble() {
         // Test the case where some but not all bits are set.
         long inputLong = (-1L >>> (64 - D_SPECIES.length()))-1;
@@ -254,6 +264,100 @@ public class VectorMaskToLongTest {
         verifyMaskToLong(D_SPECIES, inputLong, got);
     }
 
+    // General cases for VectorMask.toLong(). The main purpose is to test the IRs
+    // for API VectorMask.toLong(). To avoid the IRs being optimized out by compiler,
+    // we insert a VectorMask.not() before toLong().
+
+    @ForceInline
+    public static void testToLongGeneral(VectorSpecies<?> species) {
+        long got = VectorMask.fromArray(species, m, 0).not().toLong();
+        verifyMaskToLong(species, 0, got);
+    }
+
+    @Test
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 0",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeature = { "asimd", "true" })
+    public static void testToLongByte() {
+        testToLongGeneral(B_SPECIES);
+    }
+
+    @Test
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 0",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeature = { "asimd", "true" })
+    public static void testToLongShort() {
+        testToLongGeneral(S_SPECIES);
+    }
+
+    @Test
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 0",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeature = { "asimd", "true" })
+    public static void testToLongInt() {
+        testToLongGeneral(I_SPECIES);
+    }
+
+    @Test
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 0",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeature = { "asimd", "true" })
+    public static void testToLongLong() {
+        testToLongGeneral(L_SPECIES);
+    }
+
+    @Test
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 0",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeature = { "asimd", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    public static void testToLongFloat() {
+        testToLongGeneral(F_SPECIES);
+    }
+
+    @Test
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 0",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeatureAnd = { "avx2", "true", "avx512", "false" })
+    @IR(counts = { IRNode.VECTOR_STORE_MASK, "= 1",
+                   IRNode.VECTOR_MASK_TO_LONG, "= 1" },
+        applyIfCPUFeature = { "asimd", "true" })
+    public static void testToLongDouble() {
+        testToLongGeneral(D_SPECIES);
+    }
+
     public static void main(String[] args) {
         TestFramework testFramework = new TestFramework();
         testFramework.setDefaultWarmup(10000)

From b6ba1ac9aa800e01e2235c2b8737ad4670b0a655 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Thu, 13 Nov 2025 04:29:22 +0000
Subject: [PATCH 142/512] 8371093: Assert "section header string table should
 be loaded" failed on debug VM

Reviewed-by: phubner, jsjolen
---
 src/hotspot/share/utilities/decoder_elf.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/hotspot/share/utilities/decoder_elf.cpp b/src/hotspot/share/utilities/decoder_elf.cpp
index 962b572db64..127748b32ed 100644
--- a/src/hotspot/share/utilities/decoder_elf.cpp
+++ b/src/hotspot/share/utilities/decoder_elf.cpp
@@ -114,6 +114,11 @@ ElfFile* ElfDecoder::get_elf_file(const char* filepath) {
 
   file = new (std::nothrow)ElfFile(filepath);
   if (file != nullptr) {
+    _decoder_status = file->get_status();
+    if (has_error()) {
+      delete file;
+      return nullptr;
+    }
     if (_opened_elf_files != nullptr) {
       file->set_next(_opened_elf_files);
     }

From 5f42c7708588db28f9c18bf63462001e99b35ec7 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 13 Nov 2025 04:33:00 +0000
Subject: [PATCH 143/512] 8370839: Tests to verify peculiar Proxy dispatching
 behaviors

Reviewed-by: jvernee
---
 .../lang/reflect/Proxy/BridgeMethodsTest.java |  86 ++++++++
 .../Proxy/NonPublicMethodTypeTest.java        |  99 ++++++---
 .../Proxy/ProtectedObjectMethodsTest.java     | 190 ++++++++++++++++++
 3 files changed, 349 insertions(+), 26 deletions(-)
 create mode 100644 test/jdk/java/lang/reflect/Proxy/BridgeMethodsTest.java
 create mode 100644 test/jdk/java/lang/reflect/Proxy/ProtectedObjectMethodsTest.java

diff --git a/test/jdk/java/lang/reflect/Proxy/BridgeMethodsTest.java b/test/jdk/java/lang/reflect/Proxy/BridgeMethodsTest.java
new file mode 100644
index 00000000000..ee3e42a943c
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Proxy/BridgeMethodsTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
+ * @test
+ * @bug 8370839
+ * @summary Behavior of bridge methods in interfaces
+ * @run junit BridgeMethodsTest
+ */
+public class BridgeMethodsTest {
+
+    interface StringCallable extends Callable<String> {
+        @Override
+        String call(); // throws no exception
+    }
+
+    @Test
+    void testExceptionTypes() throws Throwable {
+        class MyException extends Exception {}
+        // This proxy has two distinct methods, even though the
+        // Java language would treat the first one as overridden:
+        // Object call() throws Exception;  - from Callable
+        // String call();                   - from StringCallable
+        var instance = Proxy.newProxyInstance(StringCallable.class.getClassLoader(),
+                new Class[] { StringCallable.class }, (_, _, _) -> { throw new MyException(); });
+        // The exception can't be thrown through StringCallable.call which has no throws
+        var undeclared = assertThrows(UndeclaredThrowableException.class, () -> ((StringCallable) instance).call());
+        assertInstanceOf(MyException.class, undeclared.getCause());
+        // But it can be thrown through Callable.call which permits Exception
+        assertThrows(MyException.class, () -> ((Callable<?>) instance).call());
+    }
+
+    interface SpecificConsumer extends Consumer<String> {
+        @Override
+        void accept(String s);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void testMethodObjects() throws Throwable {
+        List<Method> methods = new ArrayList<>();
+        // This proxy has two distinct methods, even though the
+        // Java language would treat the first one as overridden:
+        // void accept(Object);    - from Consumer
+        // void accept(String);    - from SpecificConsumer
+        var instance = Proxy.newProxyInstance(SpecificConsumer.class.getClassLoader(),
+                new Class[] { SpecificConsumer.class }, (_, m, _) -> methods.add(m));
+        ((Consumer<Object>) instance).accept(null);
+        ((SpecificConsumer) instance).accept(null);
+        assertEquals(2, methods.size());
+        // invocation handler gets different method due to covariant parameter types
+        assertNotEquals(methods.getFirst(), methods.getLast());
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Proxy/NonPublicMethodTypeTest.java b/test/jdk/java/lang/reflect/Proxy/NonPublicMethodTypeTest.java
index 8919dc2f0b2..eb455495bf2 100644
--- a/test/jdk/java/lang/reflect/Proxy/NonPublicMethodTypeTest.java
+++ b/test/jdk/java/lang/reflect/Proxy/NonPublicMethodTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,39 +21,86 @@
  * questions.
  */
 
-/*
- * @test
- * @bug 8333854
- * @summary Test invoking a method in a proxy interface with package-private
- *          classes or interfaces in its method type
- * @run junit NonPublicMethodTypeTest
- */
+import java.lang.reflect.Proxy;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Proxy;
+import static org.junit.jupiter.api.Assertions.*;
 
-import static org.junit.jupiter.api.Assertions.assertNotSame;
+/*
+ * @test
+ * @bug 8333854 8370839
+ * @summary Behavior of methods whose signature has package-private
+ *          class or interfaces but the proxy interface is public
+ * @run junit NonPublicMethodTypeTest
+ */
+public class NonPublicMethodTypeTest {
+    // Java language and JVM allow using fields and methods with inaccessible
+    // classes or interfaces in its signature, as long as the field or method
+    // is accessible and its declaring class or interface is accessible.
+    // Such inaccessible classes and interfaces are treated as if an arbitrary
+    // subtype of their accessible types, or an arbitrary supertype of their
+    // accessible subtypes.
+    // java.lang.invoke is stricter - MethodType constant pool entry resolution
+    // for such signatures fail, so they can't be used for MethodHandle or indy.
+    enum Internal { INSTANCE }
 
-public final class NonPublicMethodTypeTest {
-    interface NonPublicWorker {
-        void work();
-    }
-
-    public interface PublicWorkable {
-        void accept(NonPublicWorker worker);
+    public interface InternalParameter {
+        void call(Internal parameter);
     }
 
     @Test
-    public void test() {
-        PublicWorkable proxy = (PublicWorkable) Proxy.newProxyInstance(
-               NonPublicMethodTypeTest.class.getClassLoader(),
-               new Class[] {PublicWorkable.class},
-               (_, _, _) -> null);
-        assertNotSame(NonPublicWorker.class.getPackage(),
-                proxy.getClass().getPackage(),
+    void testNonPublicParameter() throws Throwable {
+        // Creation should be successful
+        // 8333854 - BSM usage fails for looking up such methods
+        InternalParameter instance = (InternalParameter) Proxy.newProxyInstance(
+                InternalParameter.class.getClassLoader(),
+                new Class[] { InternalParameter.class },
+                (_, _, _) -> null);
+        assertNotSame(Internal.class.getPackage(),
+                instance.getClass().getPackage(),
                 "Proxy class should not be able to access method parameter " +
-                        "NonPublic type's package");
-        proxy.accept(() -> {}); // Call should not fail
+                        "Internal class's package");
+        // Calls should be always successful
+        instance.call(null);
+        instance.call(Internal.INSTANCE);
+    }
+
+    public interface InternalReturn {
+        Internal call();
+    }
+
+    @Test
+    void testNonPublicReturn() throws Throwable {
+        AtomicReference<Internal> returnValue = new AtomicReference<>();
+        // Creation should be successful
+        // A lot of annotation interfaces are implemented by such proxy classes,
+        // due to presence of package-private annotation interface or enum-typed
+        // elements in public annotation interfaces.
+        InternalReturn instance = (InternalReturn) Proxy.newProxyInstance(
+                InternalReturn.class.getClassLoader(),
+                new Class[] { InternalReturn.class },
+                (_, _, _) -> returnValue.get());
+        assertNotSame(Internal.class.getPackage(),
+                instance.getClass().getPackage(),
+                "Proxy class should not be able to access method parameter " +
+                        "Internal class's package");
+
+        // The generated call() implementation is as follows:
+        // aload0, getfield Proxy.h, aload 0, getstatic (Method), aconst_null,
+        // invokevirtual InvocationHandler::invoke(Object, Method, Object[])Object,
+        // checkcast Internal.class, areturn
+        // In this bytecode, checkcast Internal.class will fail with a
+        // IllegalAccessError as a result of resolution of Internal.class
+        // if and only if the incoming reference is non-null.
+
+        // checkcast does not perform access check for null
+        returnValue.set(null);
+        instance.call();
+        // checkcast fails - proxy class cannot access the return type
+        // See JDK-8349716
+        returnValue.set(Internal.INSTANCE);
+        assertThrows(IllegalAccessError.class, instance::call);
     }
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/ProtectedObjectMethodsTest.java b/test/jdk/java/lang/reflect/Proxy/ProtectedObjectMethodsTest.java
new file mode 100644
index 00000000000..ec01c58b8f0
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Proxy/ProtectedObjectMethodsTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Proxy;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
+ * @test
+ * @bug 8370839
+ * @summary Behavior of protected methods in java.lang.Object
+ * @modules java.base/java.lang:+open
+ * @run junit ProtectedObjectMethodsTest
+ */
+public class ProtectedObjectMethodsTest {
+
+    static final MethodHandle OBJECT_CLONE;
+    static final MethodHandle OBJECT_FINALIZE;
+
+    static {
+        try {
+            var lookup = MethodHandles.privateLookupIn(Object.class, MethodHandles.lookup());
+            OBJECT_CLONE = lookup.findVirtual(Object.class, "clone", MethodType.methodType(Object.class));
+            OBJECT_FINALIZE = lookup.findVirtual(Object.class, "finalize", MethodType.methodType(void.class));
+        } catch (ReflectiveOperationException ex) {
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+
+    interface FakeClone {
+        // This method is not related to Object::clone in the JVM, but most
+        // implementations in the Java Language override Object::clone as
+        // covariant overrides
+        FakeClone clone();
+    }
+
+    interface TrueClone {
+        // This method is identical to Object::clone in the JVM, that calls
+        // to Object::clone can always call an implementation of this method
+        // if it exists
+        Object clone();
+    }
+
+    interface PrimitiveClone {
+        // This method is not related to Object::clone in the JVM, but it can't
+        // be implemented in the Java Language unless using a lambda expression,
+        // due to the Java language covariant override restrictions.
+        int clone();
+    }
+
+    // Does not duplicate with Object::clone so it is not proxied
+    @Test
+    void testDistinctClone() throws Throwable {
+        {
+            // This proxy declares FakeClone clone(); which cannot be
+            // invoked through Object::clone.
+            var fake = (FakeClone) Proxy.newProxyInstance(FakeClone.class.getClassLoader(), new Class[] { FakeClone.class }, (p, _, _) -> p);
+            assertSame(fake, fake.clone());
+            // Verify the default Object::clone behavior (this is not Cloneable)
+            assertThrows(CloneNotSupportedException.class, () -> {
+                var _ = (Object) OBJECT_CLONE.invoke((Object) fake);
+            });
+        }
+
+        {
+            // This proxy declares FakeClone clone(); which cannot be
+            // invoked through Object::clone.
+            var fake = (FakeClone) Proxy.newProxyInstance(FakeClone.class.getClassLoader(), new Class[] { FakeClone.class, Cloneable.class }, (p, _, _) -> p);
+            assertSame(fake, fake.clone());
+            // Verify the default Object::clone behavior (this is Cloneable)
+            var fakeClone = (Object) OBJECT_CLONE.invoke((Object) fake);
+            assertNotSame(fake, fakeClone);
+            assertSame(fake.getClass(), fakeClone.getClass());
+            assertSame(fakeClone, ((FakeClone) fakeClone).clone());
+        }
+
+        {
+            // This proxy declares int clone(); which cannot be
+            // invoked through Object::clone.
+            var instance = (PrimitiveClone) Proxy.newProxyInstance(PrimitiveClone.class.getClassLoader(), new Class[] { PrimitiveClone.class }, (_, _, _) -> 42);
+            assertEquals(42, instance.clone());
+            // Verify the default Object::clone behavior (this is not Cloneable)
+            assertThrows(CloneNotSupportedException.class, () -> {
+                var _ = (Object) OBJECT_CLONE.invoke((Object) instance);
+            });
+        }
+
+        {
+            // This proxy declares int clone(); which cannot be
+            // invoked through Object::clone
+            var instance = (PrimitiveClone) Proxy.newProxyInstance(PrimitiveClone.class.getClassLoader(), new Class[] { PrimitiveClone.class, Cloneable.class }, (_, _, _) -> 76);
+            assertEquals(76, instance.clone());
+            // Verify the default Object::clone behavior (this is Cloneable)
+            var clone = (Object) OBJECT_CLONE.invoke((Object) instance);
+            assertNotSame(instance, clone);
+            assertSame(instance.getClass(), clone.getClass());
+            assertEquals(76, ((PrimitiveClone) clone).clone());
+        }
+    }
+
+    // Duplicates with Object::clone so it is proxied
+    @Test
+    void testDuplicateClone() throws Throwable {
+        {
+            // This proxy declares Object clone();, which
+            // accidentally overrides Object::clone
+            var instance = (TrueClone) Proxy.newProxyInstance(TrueClone.class.getClassLoader(), new Class[] { TrueClone.class }, (p, _, _) -> p);
+            assertSame(instance, instance.clone());
+            // Verify Object::clone is overridden
+            assertSame(instance, (Object) OBJECT_CLONE.invoke((Object) instance));
+        }
+
+        {
+            // This proxy declares Object clone(); and FakeClone clone();.
+            // They are considered duplicate methods and dispatched equivalently.
+            // Object clone() accidentally overrides Object::clone, so now
+            // FakeClone clone() can be called through Object::clone
+            var instance = Proxy.newProxyInstance(TrueClone.class.getClassLoader(), new Class[] { TrueClone.class, FakeClone.class }, (p, _, _) -> p);
+            assertSame(instance, ((FakeClone) instance).clone());
+            assertSame(instance, ((TrueClone) instance).clone());
+            // Verify Object::clone is overridden
+            assertSame(instance, (Object) OBJECT_CLONE.invoke((Object) instance));
+        }
+    }
+
+    interface FalseFinalize {
+        // This method is not related to Object::finalize in the JVM, but it can't
+        // be implemented in the Java Language unless using a lambda expression,
+        // due to the Java language covariant override restrictions.
+        int finalize();
+    }
+
+    interface TrueFinalize {
+        // This method is identical to Object::finalize in the JVM, that calls
+        // to Object::finalize can always call an implementation of this method
+        // if it exists
+        void finalize();
+    }
+
+    @Test
+    void testDistinctFinalize() throws Throwable {
+        AtomicInteger invokeCount = new AtomicInteger();
+        // This proxy declares int finalize(), which cannot be
+        // invoked through Object::finalize.
+        var instance = Proxy.newProxyInstance(FalseFinalize.class.getClassLoader(), new Class[] { FalseFinalize.class }, (_, _, _) -> invokeCount.incrementAndGet());
+        // Verify the default Object::finalize behavior
+        OBJECT_FINALIZE.invoke(instance);
+        assertEquals(0, invokeCount.get());
+        assertEquals(1, ((FalseFinalize) instance).finalize());
+    }
+
+    @Test
+    void testDuplicateFinalize() throws Throwable {
+        AtomicInteger invokeCount = new AtomicInteger();
+        // This proxy declares void finalize(), which can be
+        // invoked through Object::finalize.
+        var instance = Proxy.newProxyInstance(TrueFinalize.class.getClassLoader(), new Class[] { TrueFinalize.class }, (_, _, _) -> invokeCount.incrementAndGet());
+        // Verify the overridden Object::finalize behavior
+        OBJECT_FINALIZE.invoke(instance);
+        assertEquals(1, invokeCount.get());
+        ((TrueFinalize) instance).finalize();
+        assertEquals(2, invokeCount.get());
+    }
+}

From d91480b9b0f85aca8d9dba615ae5a27f26ce5fee Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Thu, 13 Nov 2025 06:17:16 +0000
Subject: [PATCH 144/512] 8371675: ZGC: Remove leftover X VMOp symbols

Reviewed-by: jsikstro, stefank, tschatzl
---
 src/hotspot/share/runtime/vmOperation.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index ada5014beee..66bf5dc2e27 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -69,10 +69,6 @@
   template(ZRelocateStartYoung)                   \
   template(ZRendezvousGCThreads)                  \
   template(ZVerifyOld)                            \
-  template(XMarkStart)                            \
-  template(XMarkEnd)                              \
-  template(XRelocateStart)                        \
-  template(XVerify)                               \
   template(HandshakeAllThreads)                   \
   template(PopulateDumpSharedSpace)               \
   template(JNIFunctionTableCopier)                \

From 42aecc4070e952ed6308ebefaf716e35fed2f929 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Thu, 13 Nov 2025 06:17:35 +0000
Subject: [PATCH 145/512] 8371680: JVMTI: Remove unused VMOp type
 JvmtiPostObjectFree

Reviewed-by: stefank, lmesnik
---
 src/hotspot/share/runtime/vmOperation.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 66bf5dc2e27..5781b133cdb 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -110,7 +110,6 @@
   template(GTestExecuteAtSafepoint)               \
   template(GTestStopSafepoint)                    \
   template(JFROldObject)                          \
-  template(JvmtiPostObjectFree)                   \
   template(RendezvousGCThreads)                   \
   template(JFRInitializeCPUTimeSampler)       \
   template(JFRTerminateCPUTimeSampler)        \

From 279f39f14a6329d0147613edc3836b7d6d043186 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Thu, 13 Nov 2025 06:17:52 +0000
Subject: [PATCH 146/512] 8371681: Remove unused VMOp type
 CollectForCodeCacheAllocation

Reviewed-by: stefank, ayang, tschatzl
---
 src/hotspot/share/runtime/vmOperation.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 5781b133cdb..5140d0401fb 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -48,7 +48,6 @@
   template(Verify)                                \
   template(HeapDumper)                            \
   template(CollectForMetadataAllocation)          \
-  template(CollectForCodeCacheAllocation)         \
   template(GC_HeapInspection)                     \
   template(SerialCollectForAllocation)            \
   template(SerialGCCollect)                       \

From 436b3357e9791f6acb2673e2ac96d33c6a2782e6 Mon Sep 17 00:00:00 2001
From: Shawn M Emery <shawn.emery@oracle.com>
Date: Thu, 13 Nov 2025 08:10:12 +0000
Subject: [PATCH 147/512] 8371450: AES performance improvements for key
 schedule generation

Reviewed-by: valeriep, jnimeh
---
 .../com/sun/crypto/provider/AES_Crypt.java    | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java b/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
index 6e3e6144aff..19dceae01af 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
@@ -941,8 +941,9 @@ final class AES_Crypt extends SymmetricCipher {
      * Generate the cipher's round keys as outlined in section 5.2 of the spec.
      *
      * @param key [in] the symmetric key byte array.
+     * @param rounds [in] the number of rounds for generating the round keys.
      *
-     * @return w the cipher round keys.
+     * @return the cipher round keys.
      */
     private static int[] genRoundKeys(byte[] key, int rounds) {
         int wLen = WB * (rounds + 1);
@@ -970,53 +971,58 @@ final class AES_Crypt extends SymmetricCipher {
     /**
      * Generate the inverse cipher round keys.
      *
-     * @return w1 the inverse cipher round keys.
+     * @param w [in] the targeted word for substitution.
+     * @param rounds [in] the number of rounds for generating the round keys.
+     *
+     * @return the inverse cipher round keys.
      */
     private static int[] genInvRoundKeys(int[] w, int rounds) {
-        int kLen = w.length;;
-        int[] temp = new int[WB];
-        int[] dw = new int[kLen];
+        int[] dw = new int[w.length];
 
         // Intrinsics requires the inverse key expansion to be reverse order
         // except for the first and last round key as the first two round keys
         // are without a mix column transform.
         for (int i = 1; i < rounds; i++) {
-            System.arraycopy(w, i * WB, temp, 0, WB);
-            temp[0] = TMI0[temp[0] >>> 24] ^ TMI1[(temp[0] >> 16) & 0xFF]
-                    ^ TMI2[(temp[0] >> 8) & 0xFF] ^ TMI3[temp[0] & 0xFF];
-            temp[1] = TMI0[temp[1] >>> 24] ^ TMI1[(temp[1] >> 16) & 0xFF]
-                    ^ TMI2[(temp[1] >> 8) & 0xFF] ^ TMI3[temp[1] & 0xFF];
-            temp[2] = TMI0[temp[2] >>> 24] ^ TMI1[(temp[2] >> 16) & 0xFF]
-                    ^ TMI2[(temp[2] >> 8) & 0xFF] ^ TMI3[temp[2] & 0xFF];
-            temp[3] = TMI0[temp[3] >>> 24] ^ TMI1[(temp[3] >> 16) & 0xFF]
-                    ^ TMI2[(temp[3] >> 8) & 0xFF] ^ TMI3[temp[3] & 0xFF];
-            System.arraycopy(temp, 0, dw, kLen - (i * WB), WB);
+            int widx = i * WB;
+            int idx = w.length - widx;
+
+            dw[idx] = TMI0[w[widx] >>> 24] ^ TMI1[(w[widx] >> 16) & 0xFF]
+                    ^ TMI2[(w[widx] >> 8) & 0xFF] ^ TMI3[w[widx] & 0xFF];
+            dw[idx + 1] = TMI0[w[widx + 1] >>> 24]
+                    ^ TMI1[(w[widx + 1] >> 16) & 0xFF]
+                    ^ TMI2[(w[widx + 1] >> 8) & 0xFF]
+                    ^ TMI3[w[widx + 1] & 0xFF];
+            dw[idx + 2] = TMI0[w[widx + 2] >>> 24]
+                    ^ TMI1[(w[widx + 2] >> 16) & 0xFF]
+                    ^ TMI2[(w[widx + 2] >> 8) & 0xFF]
+                    ^ TMI3[w[widx + 2] & 0xFF];
+            dw[idx + 3] = TMI0[w[widx + 3] >>> 24]
+                    ^ TMI1[(w[widx + 3] >> 16) & 0xFF]
+                    ^ TMI2[(w[widx + 3] >> 8) & 0xFF]
+                    ^ TMI3[w[widx + 3] & 0xFF];
         }
-        System.arraycopy(w, kLen - WB, dw, WB, WB);
+        System.arraycopy(w, w.length - WB, dw, WB, WB);
         System.arraycopy(w, 0, dw, 0, WB);
-        Arrays.fill(temp, 0);
 
         return dw;
     }
 
     /**
-     * Subtitute the word as a step of key expansion.
+     * Substitute the word as a step of key expansion.
      *
-     * @param state [in] the targeted word for substituion.
-     * @param sub [in] the substitute table for cipher and inverse cipher.
+     * @param word [in] the targeted word for substitution.
      *
      * @return the substituted word.
      */
     private static int subWord(int word) {
-        byte b0 = (byte) (word >>> 24);
-        byte b1 = (byte) ((word >> 16) & 0xFF);
-        byte b2 = (byte) ((word >> 8) & 0xFF);
-        byte b3 = (byte) (word & 0xFF);
+        byte b0 = (byte) (word >> 24);
+        byte b1 = (byte) (word >> 16);
+        byte b2 = (byte) (word >> 8);
 
         return ((SBOX[(b0 & 0xF0) >> 4][b0 & 0x0F] & 0xFF) << 24)
                 | ((SBOX[(b1 & 0xF0) >> 4][b1 & 0x0F] & 0xFF) << 16)
                 | ((SBOX[(b2 & 0xF0) >> 4][b2 & 0x0F] & 0xFF) << 8)
-                | (SBOX[(b3 & 0xF0) >> 4][b3 & 0x0F] & 0xFF);
+                | (SBOX[(word & 0xF0) >> 4][word & 0x0F] & 0xFF);
     }
 
     /**

From 795ec5c1e90309bc008acb28cfe0ce039dabcb8f Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 13 Nov 2025 08:33:15 +0000
Subject: [PATCH 148/512] 8370333: hotspot-unit-tests.md specifies wrong
 directory structure for tests

Reviewed-by: stefank, ayang
---
 doc/hotspot-unit-tests.html | 12 ++++++------
 doc/hotspot-unit-tests.md   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/hotspot-unit-tests.html b/doc/hotspot-unit-tests.html
index b3700abb3ac..5cc424322f9 100644
--- a/doc/hotspot-unit-tests.html
+++ b/doc/hotspot-unit-tests.html
@@ -305,11 +305,11 @@ recognize your tests.</p>
 the product.</p>
 <ul>
 <li><p>All unit tests for a class from <code>foo/bar/baz.cpp</code>
-should be placed <code>foo/bar/test_baz.cpp</code> in
-<code>hotspot/test/native/</code> directory. Having all tests for a
-class in one file is a common practice for unit tests, it helps to see
-all existing tests at once, share functions and/or resources without
-losing encapsulation.</p></li>
+should be placed <code>foo/bar/test_baz.cpp</code> in the
+<code>test/hotspot/gtest/</code> directory. Having all tests for a class
+in one file is a common practice for unit tests, it helps to see all
+existing tests at once, share functions and/or resources without losing
+encapsulation.</p></li>
 <li><p>For tests which test more than one class, directory hierarchy
 should be the same as product hierarchy, and file name should reflect
 the name of the tested subsystem/functionality. For example, if a
@@ -319,7 +319,7 @@ placed in <code>gc/g1</code> directory.</p></li>
 <p>Please note that framework prepends directory name to a test group
 name. For example, if <code>TEST(foo, check_this)</code> and
 <code>TEST(bar, check_that)</code> are defined in
-<code>hotspot/test/native/gc/shared/test_foo.cpp</code> file, they will
+<code>test/hotspot/gtest/gc/shared/test_foo.cpp</code> file, they will
 be reported as <code>gc/shared/foo::check_this</code> and
 <code>gc/shared/bar::check_that</code>.</p>
 <h3 id="test-names">Test names</h3>
diff --git a/doc/hotspot-unit-tests.md b/doc/hotspot-unit-tests.md
index 69a95307109..f59e6084910 100644
--- a/doc/hotspot-unit-tests.md
+++ b/doc/hotspot-unit-tests.md
@@ -241,7 +241,7 @@ recognize your tests.
 Test file location should reflect a location of the tested part of the product.
 
 * All unit tests for a class from `foo/bar/baz.cpp` should be placed
-`foo/bar/test_baz.cpp` in `hotspot/test/native/` directory. Having all
+`foo/bar/test_baz.cpp` in the `test/hotspot/gtest/` directory. Having all
 tests for a class in one file is a common practice for unit tests, it
 helps to see all existing tests at once, share functions and/or
 resources without losing encapsulation.
@@ -254,7 +254,7 @@ sub-system under tests belongs to `gc/g1`, tests should be placed in
 
 Please note that framework prepends directory name to a test group
 name. For example, if `TEST(foo, check_this)` and `TEST(bar, check_that)`
-are defined in `hotspot/test/native/gc/shared/test_foo.cpp` file, they
+are defined in `test/hotspot/gtest/gc/shared/test_foo.cpp` file, they
 will be reported as `gc/shared/foo::check_this` and
 `gc/shared/bar::check_that`.
 

From 10220ed06ea452083693406113107484fce40275 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 13 Nov 2025 08:43:59 +0000
Subject: [PATCH 149/512] 8367013: Add Atomic<T> to package/replace idiom of
 volatile var plus AtomicAccess:: operations

Reviewed-by: stefank, aboldtch, jsjolen
---
 .../shared/stringdedup/stringDedupTable.cpp   |  34 +-
 .../shared/stringdedup/stringDedupTable.hpp   |   9 +-
 src/hotspot/share/runtime/atomic.hpp          | 546 +++++++++++++++
 .../share/utilities/globalDefinitions.hpp     |   8 +
 .../utilities/singleWriterSynchronizer.cpp    |  22 +-
 .../utilities/singleWriterSynchronizer.hpp    |  16 +-
 test/hotspot/gtest/runtime/test_atomic.cpp    | 640 ++++++++++++++++++
 7 files changed, 1236 insertions(+), 39 deletions(-)
 create mode 100644 src/hotspot/share/runtime/atomic.hpp
 create mode 100644 test/hotspot/gtest/runtime/test_atomic.cpp

diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
index cfa276c0de0..6682993766d 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
@@ -245,20 +245,20 @@ void StringDedup::Table::num_dead_callback(size_t num_dead) {
   // Lock while modifying dead count and state.
   MonitorLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
 
-  switch (AtomicAccess::load(&_dead_state)) {
+  switch (_dead_state.load_relaxed()) {
   case DeadState::good:
-    AtomicAccess::store(&_dead_count, num_dead);
+    _dead_count.store_relaxed(num_dead);
     break;
 
   case DeadState::wait1:
     // Set count first, so dedup thread gets this or a later value if it
     // sees the good state.
-    AtomicAccess::store(&_dead_count, num_dead);
-    AtomicAccess::release_store(&_dead_state, DeadState::good);
+    _dead_count.store_relaxed(num_dead);
+    _dead_state.release_store(DeadState::good);
     break;
 
   case DeadState::wait2:
-    AtomicAccess::release_store(&_dead_state, DeadState::wait1);
+    _dead_state.release_store(DeadState::wait1);
     break;
 
   case DeadState::cleaning:
@@ -423,8 +423,10 @@ size_t StringDedup::Table::_number_of_entries = 0;
 size_t StringDedup::Table::_grow_threshold;
 StringDedup::Table::CleanupState* StringDedup::Table::_cleanup_state = nullptr;
 bool StringDedup::Table::_need_bucket_shrinking = false;
-volatile size_t StringDedup::Table::_dead_count = 0;
-volatile StringDedup::Table::DeadState StringDedup::Table::_dead_state = DeadState::good;
+Atomic<size_t> StringDedup::Table::_dead_count{};
+
+Atomic<StringDedup::Table::DeadState>
+StringDedup::Table::_dead_state{DeadState::good};
 
 void StringDedup::Table::initialize_storage() {
   assert(_table_storage == nullptr, "storage already created");
@@ -477,19 +479,19 @@ void StringDedup::Table::add(TableValue tv, uint hash_code) {
 }
 
 bool StringDedup::Table::is_dead_count_good_acquire() {
-  return AtomicAccess::load_acquire(&_dead_state) == DeadState::good;
+  return _dead_state.load_acquire() == DeadState::good;
 }
 
 // Should be consistent with cleanup_start_if_needed.
 bool StringDedup::Table::is_grow_needed() {
   return is_dead_count_good_acquire() &&
-         ((_number_of_entries - AtomicAccess::load(&_dead_count)) > _grow_threshold);
+         ((_number_of_entries - _dead_count.load_relaxed()) > _grow_threshold);
 }
 
 // Should be consistent with cleanup_start_if_needed.
 bool StringDedup::Table::is_dead_entry_removal_needed() {
   return is_dead_count_good_acquire() &&
-         Config::should_cleanup_table(_number_of_entries, AtomicAccess::load(&_dead_count));
+         Config::should_cleanup_table(_number_of_entries, _dead_count.load_relaxed());
 }
 
 StringDedup::Table::TableValue
@@ -651,7 +653,7 @@ bool StringDedup::Table::cleanup_start_if_needed(bool grow_only, bool force) {
   // If dead count is good then we can read it once and use it below
   // without needing any locking.  The recorded count could increase
   // after the read, but that's okay.
-  size_t dead_count = AtomicAccess::load(&_dead_count);
+  size_t dead_count = _dead_count.load_relaxed();
   // This assertion depends on dead state tracking.  Otherwise, concurrent
   // reference processing could detect some, but a cleanup operation could
   // remove them before they are reported.
@@ -675,8 +677,8 @@ bool StringDedup::Table::cleanup_start_if_needed(bool grow_only, bool force) {
 
 void StringDedup::Table::set_dead_state_cleaning() {
   MutexLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
-  AtomicAccess::store(&_dead_count, size_t(0));
-  AtomicAccess::store(&_dead_state, DeadState::cleaning);
+  _dead_count.store_relaxed(0);
+  _dead_state.store_relaxed(DeadState::cleaning);
 }
 
 bool StringDedup::Table::start_resizer(bool grow_only, size_t number_of_entries) {
@@ -710,7 +712,7 @@ void StringDedup::Table::cleanup_end() {
   delete _cleanup_state;
   _cleanup_state = nullptr;
   MutexLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
-  AtomicAccess::store(&_dead_state, DeadState::wait2);
+  _dead_state.store_relaxed(DeadState::wait2);
 }
 
 void StringDedup::Table::verify() {
@@ -732,8 +734,8 @@ void StringDedup::Table::log_statistics() {
   int dead_state;
   {
     MutexLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
-    dead_count = _dead_count;
-    dead_state = static_cast<int>(_dead_state);
+    dead_count = _dead_count.load_relaxed();
+    dead_state = static_cast<int>(_dead_state.load_relaxed());
   }
   log_debug(stringdedup)("Table: %zu values in %zu buckets, %zu dead (%d)",
                          _number_of_entries, _number_of_buckets,
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
index a163319e84c..4c57339f2d5 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "memory/allStatic.hpp"
 #include "oops/typeArrayOop.hpp"
 #include "oops/weakHandle.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
@@ -86,9 +87,9 @@ private:
   static CleanupState* _cleanup_state;
   static bool _need_bucket_shrinking;
   // These are always written while holding StringDedup_lock, but may be
-  // read by the dedup thread without holding the lock lock.
-  static volatile size_t _dead_count;
-  static volatile DeadState _dead_state;
+  // read by the dedup thread without holding the lock.
+  static Atomic<size_t> _dead_count;
+  static Atomic<DeadState> _dead_state;
 
   static uint compute_hash(typeArrayOop obj);
   static size_t hash_to_index(uint hash_code);
diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp
new file mode 100644
index 00000000000..5b4d7d8659f
--- /dev/null
+++ b/src/hotspot/share/runtime/atomic.hpp
@@ -0,0 +1,546 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_RUNTIME_ATOMIC_HPP
+#define SHARE_RUNTIME_ATOMIC_HPP
+
+#include "cppstdlib/type_traits.hpp"
+#include "metaprogramming/enableIf.hpp"
+#include "metaprogramming/primitiveConversions.hpp"
+#include "runtime/atomicAccess.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// Atomic<T> is used to declare a variable of type T with atomic access.
+//
+// The following value types T are supported:
+//
+// (1) Integers with sizeof the same as sizeof int32_t or int64_t. These are
+// referred to as atomic integers below.
+//
+// (2) Integers with sizeof 1, including bool. These are referred to as atomic
+// bytes below.
+//
+// (3) Pointers. These are referred to as atomic pointers below.
+//
+// (4) Types with a PrimitiveValues::Translate definition. These are referred
+// to as atomic translated types below. The atomic value for the associated
+// decayed type is referred to as the atomic decayed type.
+//
+// The interface provided by an Atomic<T> depends on the value type.
+//
+// If T is the value type, v is an Atomic<T>, x and y are instances of T, i is
+// an integer, and o is an atomic_memory_order, then:
+//
+// (1) All Atomic types provide
+//
+//   nested types:
+//     ValueType -> T
+//
+//   special functions:
+//     explicit constructor(T)
+//     noncopyable
+//     destructor
+//
+//   static member functions:
+//     value_offset_in_bytes() -> int   // constexpr
+//     value_size_in_bytes() -> int     // constexpr
+//       These provide the compiler and the like with direct access to the
+//       value field. They shouldn't be used directly to bypass normal access.
+//
+//   member functions:
+//     v.load_relaxed() -> T
+//     v.load_acquire() -> T
+//     v.store_relaxed(x) -> void
+//     v.release_store(x) -> void
+//     v.release_store_fence(x) -> void
+//     v.compare_exchange(x, y [, o]) -> T
+//
+// (2) All atomic types are default constructible.
+//
+// Default construction of an atomic integer or atomic byte initializes the
+// value to zero. Default construction of an atomic pointer initializes the
+// value to null.
+//
+// If the value type of an atomic translated type is default constructible,
+// then default construction of the atomic translated type will initialize the
+// value to a default constructed object of the value type. Otherwise, the
+// value will be initialized as if by translating the value that would be
+// provided by default constructing an atomic type for the value type's
+// decayed type.
+
+// (3) Atomic pointers and atomic integers additionally provide
+//
+//   member functions:
+//     v.exchange(x [, o]) -> T
+//     v.add_then_fetch(i [, o]) -> T
+//     v.sub_then_fetch(i [, o]) -> T
+//     v.fetch_then_add(i [, o]) -> T
+//     v.fetch_then_sub(i [, o]) -> T
+//
+// sizeof(i) must not exceed sizeof(T). For atomic integers, both T and the
+// type of i must be signed, or both must be unsigned. Atomic pointers perform
+// element arithmetic.
+//
+// (4) An atomic translated type additionally provides the exchange
+// function if its associated atomic decayed type provides that function.
+//
+// (5) Atomic integers additionally provide
+//
+//   member functions:
+//     v.and_then_fetch(x [, o]) -> T
+//     v.or_then_fetch(x [, o]) -> T
+//     v.xor_then_fetch(x [, o]) -> T
+//     v.fetch_then_and(x [, o]) -> T
+//     v.fetch_then_or(x [, o]) -> T
+//     v.fetch_then_xor(x [, o]) -> T
+//
+// (6) Atomic pointers additionally provide
+//
+//   nested types:
+//     ElementType -> std::remove_pointer_t<T>
+//
+// Some of the function names provided by (some variants of) Atomic<T> differ
+// from the corresponding functions provided by the AtomicAccess class. In
+// some cases this is done for regularity; there are some inconsistencies in
+// the AtomicAccess names. Some of the naming choices are also to make them
+// stand out a little more when used in surrounding non-atomic code. Without
+// the "AtomicAccess::" qualifier, some of those names are easily overlooked.
+//
+// Atomic bytes don't provide exchange(). This is because that operation
+// hasn't been implemented for 1 byte values. That could be changed if needed.
+//
+// Atomic for 2 byte integers is not supported. This is because atomic
+// operations of that size have not been implemented. There haven't been
+// required use-cases. Many platforms don't provide hardware support.
+//
+// Atomic translated types don't provide the full interface of the associated
+// atomic decayed type. They could do so, perhaps under the control of an
+// associated type trait.
+//
+// Atomic<T> is not intended to be anything approaching a drop-in replacement
+// for std::atomic<T>. Rather, it's wrapping up a long-established HotSpot
+// idiom in a tidier and more rigorous package. Some of the differences from
+// std::atomic<T> include
+//
+// * Atomic<T> supports a much more limited set of value types.
+//
+// * All supported Atomic<T> types are "lock free", so the standard mechanisms
+// for testing for that are not provided. (There might have been some types on
+// some platforms that used a lock long-ago, but that's no longer the case.)
+//
+// * Rather than load and store operations with a memory order parameter,
+// Atomic<T> provides load_relaxed(), load_acquire(), release_store(),
+// store_relaxed(), and release_store_fence() operations.
+//
+// * Atomic<T> doesn't provide operator overloads that perform various
+// operations with sequentially consistent ordering semantics. The rationale
+// for not providing these is similar to that for having different (often
+// longer) names for some operations than the corresponding AtomicAccess
+// functions.
+
+// Implementation support for Atomic<T>.
+class AtomicImpl {
+  enum class Category {
+    Integer,
+    Byte,
+    Pointer,
+    Translated
+  };
+
+#if defined(__GNUC__) && !defined(__clang__)
+  // Workaround for gcc bug. Make category() public, else we get this error
+  //   error: 'static constexpr AtomicImpl::Category AtomicImpl::category()
+  //     [with T = unsigned int]' is private within this context
+  // The only reference is the default template parameter value in the Atomic
+  // class a couple lines below, in this same class!
+  // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=122098
+public:
+#endif
+  // Selection of Atomic<T> category, based on T.
+  template<typename T>
+  static constexpr Category category();
+private:
+
+  // Helper base classes, providing various parts of the APIs.
+  template<typename T> class CommonCore;
+  template<typename T> class SupportsExchange;
+  template<typename T> class SupportsArithmetic;
+
+  // Support conditional exchange() for atomic translated types.
+  template<typename T> class HasExchange;
+  template<typename T> class DecayedHasExchange;
+  template<typename Derived, typename T, bool = DecayedHasExchange<T>::value>
+  class TranslatedExchange;
+
+public:
+  template<typename T, Category = category<T>()>
+  class Atomic;
+};
+
+// The Atomic<T> type.
+template<typename T>
+using Atomic = AtomicImpl::Atomic<T>;
+
+template<typename T>
+constexpr auto AtomicImpl::category() -> Category {
+  static_assert(std::is_same_v<T, std::remove_cv_t<T>>,
+                "Value type must not be cv-qualified");
+  if constexpr (std::is_integral_v<T>) {
+    if constexpr ((sizeof(T) == sizeof(int32_t)) || (sizeof(T) == sizeof(int64_t))) {
+      return Category::Integer;
+    } else if constexpr (sizeof(T) == 1) {
+      return Category::Byte;
+    } else {
+      static_assert(DependentAlwaysFalse<T>, "Invalid atomic integer type");
+    }
+  } else if constexpr (std::is_pointer_v<T>) {
+    return Category::Pointer;
+  } else if constexpr (PrimitiveConversions::Translate<T>::value) {
+    return Category::Translated;
+  } else {
+    static_assert(DependentAlwaysFalse<T>, "Invalid atomic value type");
+  }
+}
+
+// Atomic<T> implementation classes.
+
+template<typename T>
+class AtomicImpl::CommonCore {
+  T volatile _value;
+
+protected:
+  explicit CommonCore(T value) : _value(value) {}
+  ~CommonCore() = default;
+
+  T volatile* value_ptr() { return &_value; }
+  T const volatile* value_ptr() const { return &_value; }
+
+  // Support for value_offset_in_bytes.
+  template<typename Derived>
+  static constexpr int value_offset_in_bytes_impl() {
+    return offsetof(Derived, _value);
+  }
+
+public:
+  NONCOPYABLE(CommonCore);
+
+  static constexpr int value_size_in_bytes() {
+    return sizeof(_value);
+  }
+
+  // Common core Atomic<T> operations.
+
+  T load_relaxed() const {
+    return AtomicAccess::load(value_ptr());
+  }
+
+  T load_acquire() const {
+    return AtomicAccess::load_acquire(value_ptr());
+  }
+
+  void store_relaxed(T value) {
+    AtomicAccess::store(value_ptr(), value);
+  }
+
+  void release_store(T value) {
+    AtomicAccess::release_store(value_ptr(), value);
+  }
+
+  void release_store_fence(T value) {
+    AtomicAccess::release_store_fence(value_ptr(), value);
+  }
+
+  T compare_exchange(T compare_value, T new_value,
+                     atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::cmpxchg(value_ptr(), compare_value, new_value, order);
+  }
+};
+
+template<typename T>
+class AtomicImpl::SupportsExchange : public CommonCore<T> {
+protected:
+  explicit SupportsExchange(T value) : CommonCore<T>(value) {}
+  ~SupportsExchange() = default;
+
+public:
+  T exchange(T new_value,
+             atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::xchg(this->value_ptr(), new_value, order);
+  }
+};
+
+template<typename T>
+class AtomicImpl::SupportsArithmetic : public SupportsExchange<T> {
+  // Guarding the AtomicAccess calls with constexpr checking of Offset produces
+  // better compile-time error messages.
+  template<typename Offset>
+  static constexpr bool check_offset_type() {
+    static_assert(std::is_integral_v<Offset>, "offset must be integral");
+    static_assert(sizeof(Offset) <= sizeof(T), "offset size exceeds value size");
+    if constexpr (!std::is_integral_v<T>) {
+      static_assert(std::is_pointer_v<T>, "must be");
+    } else if constexpr (std::is_signed_v<T>) {
+      static_assert(std::is_signed_v<Offset>,
+                    "value is signed but offset is unsigned");
+    } else {
+      static_assert(std::is_unsigned_v<Offset>,
+                    "value is unsigned but offset is signed");
+    }
+    return true;
+  }
+
+protected:
+  explicit SupportsArithmetic(T value) : SupportsExchange<T>(value) {}
+  ~SupportsArithmetic() = default;
+
+public:
+  template<typename Offset>
+  T add_then_fetch(Offset add_value,
+                   atomic_memory_order order = memory_order_conservative) {
+    if constexpr (check_offset_type<Offset>()) {
+      return AtomicAccess::add(this->value_ptr(), add_value, order);
+    }
+  }
+
+  template<typename Offset>
+  T fetch_then_add(Offset add_value,
+                   atomic_memory_order order = memory_order_conservative) {
+    if constexpr (check_offset_type<Offset>()) {
+      return AtomicAccess::fetch_then_add(this->value_ptr(), add_value, order);
+    }
+  }
+
+  template<typename Offset>
+  T sub_then_fetch(Offset sub_value,
+                   atomic_memory_order order = memory_order_conservative) {
+    if constexpr (check_offset_type<Offset>()) {
+      return AtomicAccess::sub(this->value_ptr(), sub_value, order);
+    }
+  }
+
+  template<typename Offset>
+  T fetch_then_sub(Offset sub_value,
+                   atomic_memory_order order = memory_order_conservative) {
+    if constexpr (check_offset_type<Offset>()) {
+      // AtomicAccess doesn't currently provide fetch_then_sub.
+      return sub_then_fetch(sub_value, order) + sub_value;
+    }
+  }
+};
+
+template<typename T>
+class AtomicImpl::Atomic<T, AtomicImpl::Category::Integer>
+  : public SupportsArithmetic<T>
+{
+public:
+  explicit Atomic(T value = 0) : SupportsArithmetic<T>(value) {}
+
+  NONCOPYABLE(Atomic);
+
+  using ValueType = T;
+
+  static constexpr int value_offset_in_bytes() {
+    return CommonCore<T>::template value_offset_in_bytes_impl<Atomic>();
+  }
+
+  T fetch_then_and(T bits, atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::fetch_then_and(this->value_ptr(), bits, order);
+  }
+
+  T fetch_then_or(T bits, atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::fetch_then_or(this->value_ptr(), bits, order);
+  }
+
+  T fetch_then_xor(T bits, atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::fetch_then_xor(this->value_ptr(), bits, order);
+  }
+
+  T and_then_fetch(T bits, atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::and_then_fetch(this->value_ptr(), bits, order);
+  }
+
+  T or_then_fetch(T bits, atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::or_then_fetch(this->value_ptr(), bits, order);
+  }
+
+  T xor_then_fetch(T bits, atomic_memory_order order = memory_order_conservative) {
+    return AtomicAccess::xor_then_fetch(this->value_ptr(), bits, order);
+  }
+};
+
+template<typename T>
+class AtomicImpl::Atomic<T, AtomicImpl::Category::Byte>
+  : public CommonCore<T>
+{
+public:
+  explicit Atomic(T value = 0) : CommonCore<T>(value) {}
+
+  NONCOPYABLE(Atomic);
+
+  using ValueType = T;
+
+  static constexpr int value_offset_in_bytes() {
+    return CommonCore<T>::template value_offset_in_bytes_impl<Atomic>();
+  }
+};
+
+template<typename T>
+class AtomicImpl::Atomic<T, AtomicImpl::Category::Pointer>
+  : public SupportsArithmetic<T>
+{
+public:
+  explicit Atomic(T value = nullptr) : SupportsArithmetic<T>(value) {}
+
+  NONCOPYABLE(Atomic);
+
+  using ValueType = T;
+  using ElementType = std::remove_pointer_t<T>;
+
+  static constexpr int value_offset_in_bytes() {
+    return CommonCore<T>::template value_offset_in_bytes_impl<Atomic>();
+  }
+};
+
+// Atomic translated type
+
+// Test whether Atomic<T> has exchange().
+template<typename T>
+class AtomicImpl::HasExchange {
+  template<typename Check> static void* test(decltype(&Check::exchange));
+  template<typename> static int test(...);
+  using test_type = decltype(test<Atomic<T>>(nullptr));
+public:
+  static constexpr bool value = std::is_pointer_v<test_type>;
+};
+
+// Test whether the atomic decayed type associated with T has exchange().
+template<typename T>
+class AtomicImpl::DecayedHasExchange {
+  using Translator = PrimitiveConversions::Translate<T>;
+  using Decayed = typename Translator::Decayed;
+
+  // "Unit test" HasExchange<>.
+  static_assert(HasExchange<int>::value);
+  static_assert(HasExchange<int*>::value);
+  static_assert(!HasExchange<char>::value);
+
+public:
+  static constexpr bool value = HasExchange<Decayed>::value;
+};
+
+// Base class for atomic translated type if atomic decayed type doesn't have
+// exchange().
+template<typename Derived, typename T, bool>
+class AtomicImpl::TranslatedExchange {};
+
+// Base class for atomic translated type if atomic decayed type does have
+// exchange().
+template<typename Derived, typename T>
+class AtomicImpl::TranslatedExchange<Derived, T, true> {
+public:
+  T exchange(T new_value,
+             atomic_memory_order order = memory_order_conservative) {
+    return static_cast<Derived*>(this)->exchange_impl(new_value, order);
+  }
+};
+
+template<typename T>
+class AtomicImpl::Atomic<T, AtomicImpl::Category::Translated>
+  : public TranslatedExchange<Atomic<T>, T>
+{
+  // Give TranslatedExchange<> access to exchange_impl() if needed.
+  friend class TranslatedExchange<Atomic<T>, T>;
+
+  using Translator = PrimitiveConversions::Translate<T>;
+  using Decayed = typename Translator::Decayed;
+
+  Atomic<Decayed> _value;
+
+  static Decayed decay(T x) { return Translator::decay(x); }
+  static T recover(Decayed x) { return Translator::recover(x); }
+
+  // Support for default construction via the default construction of _value.
+  struct UseDecayedCtor {};
+  explicit Atomic(UseDecayedCtor) : _value() {}
+  using DefaultCtorSelect =
+    std::conditional_t<std::is_default_constructible_v<T>, T, UseDecayedCtor>;
+
+public:
+  using ValueType = T;
+
+  // If T is default constructible, construct from a default constructed T.
+  // Otherwise, default construct the underlying Atomic<Decayed>.
+  Atomic() : Atomic(DefaultCtorSelect()) {}
+
+  explicit Atomic(T value) : _value(decay(value)) {}
+
+  NONCOPYABLE(Atomic);
+
+  static constexpr int value_offset_in_bytes() {
+    return (offsetof(Atomic, _value) +
+            Atomic<Decayed>::value_offset_in_bytes());
+  }
+
+  static constexpr int value_size_in_bytes() {
+    return Atomic<Decayed>::value_size_in_bytes();
+  }
+
+  T load_relaxed() const {
+    return recover(_value.load_relaxed());
+  }
+
+  T load_acquire() const {
+    return recover(_value.load_acquire());
+  }
+
+  void store_relaxed(T value) {
+    _value.store_relaxed(decay(value));
+  }
+
+  void release_store(T value) {
+    _value.release_store(decay(value));
+  }
+
+  void release_store_fence(T value) {
+    _value.release_store_fence(decay(value));
+  }
+
+  T compare_exchange(T compare_value, T new_value,
+                     atomic_memory_order order = memory_order_conservative) {
+    return recover(_value.compare_exchange(decay(compare_value),
+                                           decay(new_value),
+                                           order));
+  }
+
+private:
+  // Implementation of exchange() if needed.
+  // Exclude when not needed, to prevent reference to non-existent function
+  // of atomic decayed type if someone explicitly instantiates Atomic<T>.
+  template<typename Dep = Decayed, ENABLE_IF(HasExchange<Dep>::value)>
+  T exchange_impl(T new_value, atomic_memory_order order) {
+    return recover(_value.exchange(decay(new_value), order));
+  }
+};
+
+#endif // SHARE_RUNTIME_ATOMIC_HPP
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 12a69043013..1910759b434 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -1374,6 +1374,14 @@ template<typename K> int primitive_compare(const K& k0, const K& k1) {
 template<typename T>
 std::add_rvalue_reference_t<T> declval() noexcept;
 
+// This provides a workaround for static_assert(false) in discarded or
+// otherwise uninstantiated places.  Instead use
+//   static_assert(DependentAlwaysFalse<T>, "...")
+// See http://wg21.link/p2593r1. Some, but not all, compiler versions we're
+// using have implemented that change as a DR:
+// https://cplusplus.github.io/CWG/issues/2518.html
+template<typename T> inline constexpr bool DependentAlwaysFalse = false;
+
 // Quickly test to make sure IEEE-754 subnormal numbers are correctly
 // handled.
 bool IEEE_subnormal_handling_OK();
diff --git a/src/hotspot/share/utilities/singleWriterSynchronizer.cpp b/src/hotspot/share/utilities/singleWriterSynchronizer.cpp
index 5e4c9777468..932cd5c9093 100644
--- a/src/hotspot/share/utilities/singleWriterSynchronizer.cpp
+++ b/src/hotspot/share/utilities/singleWriterSynchronizer.cpp
@@ -43,17 +43,17 @@ SingleWriterSynchronizer::SingleWriterSynchronizer() :
 // synchronization have exited that critical section.
 void SingleWriterSynchronizer::synchronize() {
   // Side-effect in assert balanced by debug-only dec at end.
-  assert(AtomicAccess::add(&_writers, 1u) == 1u, "multiple writers");
+  assert(_writers.fetch_then_add(1u) == 0u, "multiple writers");
   // We don't know anything about the muxing between this invocation
   // and invocations in other threads.  We must start with the latest
   // _enter polarity, else we could clobber the wrong _exit value on
   // the first iteration.  So fence to ensure everything here follows
   // whatever muxing was used.
   OrderAccess::fence();
-  uint value = _enter;
+  uint value = _enter.load_relaxed();
   // (1) Determine the old and new exit counters, based on the
   // polarity (bit0 value) of the on-entry enter counter.
-  volatile uint* new_ptr = &_exit[(value + 1) & 1];
+  Atomic<uint>& new_exit = _exit[(value + 1) & 1];
   // (2) Change the in-use exit counter to the new counter, by adding
   // 1 to the enter counter (flipping the polarity), meanwhile
   // "simultaneously" initializing the new exit counter to that enter
@@ -62,29 +62,29 @@ void SingleWriterSynchronizer::synchronize() {
   uint old;
   do {
     old = value;
-    *new_ptr = ++value;
-    value = AtomicAccess::cmpxchg(&_enter, old, value);
+    new_exit.store_relaxed(++value);
+    value = _enter.compare_exchange(old, value);
   } while (old != value);
   // Critical sections entered before we changed the polarity will use
   // the old exit counter.  Critical sections entered after the change
   // will use the new exit counter.
-  volatile uint* old_ptr = &_exit[old & 1];
-  assert(old_ptr != new_ptr, "invariant");
+  Atomic<uint>& old_exit = _exit[old & 1];
+  assert(&new_exit != &old_exit, "invariant");
   // (3) Inform threads in in-progress critical sections that there is
   // a pending synchronize waiting.  The thread that completes the
   // request (_exit value == old) will signal the _wakeup semaphore to
   // allow us to proceed.
-  _waiting_for = old;
+  _waiting_for.store_relaxed(old);
   // Write of _waiting_for must precede read of _exit and associated
   // conditional semaphore wait.  If they were re-ordered then a
   // critical section exit could miss the wakeup request, failing to
   // signal us while we're waiting.
   OrderAccess::fence();
   // (4) Wait for all the critical sections started before the change
-  // to complete, e.g. for the value of old_ptr to catch up with old.
+  // to complete, e.g. for the value of old_exit to catch up with old.
   // Loop because there could be pending wakeups unrelated to this
   // synchronize request.
-  while (old != AtomicAccess::load_acquire(old_ptr)) {
+  while (old != old_exit.load_acquire()) {
     _wakeup.wait();
   }
   // (5) Drain any pending wakeups. A critical section exit may have
@@ -95,5 +95,5 @@ void SingleWriterSynchronizer::synchronize() {
   // lead to semaphore overflow.  This doesn't guarantee no unrelated
   // wakeups for the next wait, but prevents unbounded accumulation.
   while (_wakeup.trywait()) {}
-  DEBUG_ONLY(AtomicAccess::dec(&_writers);)
+  assert(_writers.sub_then_fetch(1u) == 0u, "invariant");
 }
diff --git a/src/hotspot/share/utilities/singleWriterSynchronizer.hpp b/src/hotspot/share/utilities/singleWriterSynchronizer.hpp
index 737d5c6d4ac..450c7e89233 100644
--- a/src/hotspot/share/utilities/singleWriterSynchronizer.hpp
+++ b/src/hotspot/share/utilities/singleWriterSynchronizer.hpp
@@ -26,7 +26,7 @@
 #define SHARE_UTILITIES_SINGLEWRITERSYNCHRONIZER_HPP
 
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/semaphore.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -48,12 +48,12 @@
 // the single writer at a time restriction.  Use this only in
 // situations where GlobalCounter won't work for some reason.
 class SingleWriterSynchronizer {
-  volatile uint _enter;
-  volatile uint _exit[2];
-  volatile uint _waiting_for;
+  Atomic<uint> _enter;
+  Atomic<uint> _exit[2];
+  Atomic<uint> _waiting_for;
   Semaphore _wakeup;
 
-  DEBUG_ONLY(volatile uint _writers;)
+  DEBUG_ONLY(Atomic<uint> _writers;)
 
   NONCOPYABLE(SingleWriterSynchronizer);
 
@@ -87,15 +87,15 @@ public:
 };
 
 inline uint SingleWriterSynchronizer::enter() {
-  return AtomicAccess::add(&_enter, 2u);
+  return _enter.add_then_fetch(2u);
 }
 
 inline void SingleWriterSynchronizer::exit(uint enter_value) {
-  uint exit_value = AtomicAccess::add(&_exit[enter_value & 1], 2u);
+  uint exit_value = _exit[enter_value & 1].add_then_fetch(2u);
   // If this exit completes a synchronize request, wakeup possibly
   // waiting synchronizer.  Read of _waiting_for must follow the _exit
   // update.
-  if (exit_value == _waiting_for) {
+  if (exit_value == _waiting_for.load_relaxed()) {
     _wakeup.signal();
   }
 }
diff --git a/test/hotspot/gtest/runtime/test_atomic.cpp b/test/hotspot/gtest/runtime/test_atomic.cpp
new file mode 100644
index 00000000000..dc492e523d1
--- /dev/null
+++ b/test/hotspot/gtest/runtime/test_atomic.cpp
@@ -0,0 +1,640 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cppstdlib/type_traits.hpp"
+#include "metaprogramming/primitiveConversions.hpp"
+#include "runtime/atomic.hpp"
+
+#include "unittest.hpp"
+
+// These tests of Atomic<T> only verify functionality.  They don't verify
+// atomicity.
+
+template<typename T>
+struct AtomicIntegerArithmeticTestSupport {
+  Atomic<T> _test_value;
+
+  static constexpr T _old_value =    static_cast<T>(UCONST64(0x2000000020000));
+  static constexpr T _change_value = static_cast<T>(UCONST64(    0x100000001));
+
+  AtomicIntegerArithmeticTestSupport() : _test_value(0) {}
+
+  void fetch_then_add() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value + _change_value;
+    T result = _test_value.fetch_then_add(_change_value);
+    EXPECT_EQ(_old_value, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void fetch_then_sub() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value - _change_value;
+    T result = _test_value.fetch_then_sub(_change_value);
+    EXPECT_EQ(_old_value, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void add_then_fetch() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value + _change_value;
+    T result = _test_value.add_then_fetch(_change_value);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void sub_then_fetch() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value - _change_value;
+    T result = _test_value.sub_then_fetch(_change_value);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+#define TEST_ARITHMETIC(name) { SCOPED_TRACE(XSTR(name)); name(); }
+
+  void operator()() {
+    TEST_ARITHMETIC(fetch_then_add)
+    TEST_ARITHMETIC(fetch_then_sub)
+    TEST_ARITHMETIC(add_then_fetch)
+    TEST_ARITHMETIC(sub_then_fetch)
+  }
+
+#undef TEST_ARITHMETIC
+};
+
+TEST_VM(AtomicIntegerTest, arith_int32) {
+  AtomicIntegerArithmeticTestSupport<int32_t>()();
+}
+
+TEST_VM(AtomicIntegerTest, arith_uint32) {
+  AtomicIntegerArithmeticTestSupport<uint32_t>()();
+}
+
+TEST_VM(AtomicIntegerTest, arith_int64) {
+  AtomicIntegerArithmeticTestSupport<int64_t>()();
+}
+
+TEST_VM(AtomicIntegerTest, arith_uint64) {
+  AtomicIntegerArithmeticTestSupport<uint64_t>()();
+}
+
+template<typename T>
+struct AtomicIntegerXchgTestSupport {
+  Atomic<T> _test_value;
+
+  AtomicIntegerXchgTestSupport() : _test_value{} {}
+
+  void test() {
+    T zero = 0;
+    T five = 5;
+    _test_value.store_relaxed(zero);
+    T res = _test_value.exchange(five);
+    EXPECT_EQ(zero, res);
+    EXPECT_EQ(five, _test_value.load_relaxed());
+  }
+};
+
+TEST_VM(AtomicIntegerTest, xchg_int32) {
+  using Support = AtomicIntegerXchgTestSupport<int32_t>;
+  Support().test();
+}
+
+TEST_VM(AtomicIntegerTest, xchg_int64) {
+  using Support = AtomicIntegerXchgTestSupport<int64_t>;
+  Support().test();
+}
+
+template<typename T>
+struct AtomicIntegerCmpxchgTestSupport {
+  Atomic<T> _test_value;
+
+  AtomicIntegerCmpxchgTestSupport() : _test_value{} {}
+
+  void test() {
+    T zero = 0;
+    T five = 5;
+    T ten = 10;
+    _test_value.store_relaxed(zero);
+    T res = _test_value.compare_exchange(five, ten);
+    EXPECT_EQ(zero, res);
+    EXPECT_EQ(zero, _test_value.load_relaxed());
+    res = _test_value.compare_exchange(zero, ten);
+    EXPECT_EQ(zero, res);
+    EXPECT_EQ(ten, _test_value.load_relaxed());
+  }
+};
+
+TEST_VM(AtomicIntegerTest, cmpxchg_int32) {
+  using Support = AtomicIntegerCmpxchgTestSupport<int32_t>;
+  Support().test();
+}
+
+TEST_VM(AtomicIntegerTest, cmpxchg_int64) {
+  // Check if 64-bit atomics are available on the machine.
+  if (!VM_Version::supports_cx8()) return;
+
+  using Support = AtomicIntegerCmpxchgTestSupport<int64_t>;
+  Support().test();
+}
+
+struct AtomicCmpxchg1ByteStressSupport {
+  char _default_val;
+  int  _base;
+  Atomic<char> _array[7+32+7];
+
+  AtomicCmpxchg1ByteStressSupport() : _default_val(0x7a), _base(7) {}
+
+  void validate(char val, char val2, int index) {
+    for (int i = 0; i < 7; i++) {
+      EXPECT_EQ(_array[i].load_relaxed(), _default_val);
+    }
+    for (int i = 7; i < (7+32); i++) {
+      if (i == index) {
+        EXPECT_EQ(_array[i].load_relaxed(), val2);
+      } else {
+        EXPECT_EQ(_array[i].load_relaxed(), val);
+      }
+    }
+    for (int i = 0; i < 7; i++) {
+      EXPECT_EQ(_array[i].load_relaxed(), _default_val);
+    }
+  }
+
+  void test_index(int index) {
+    char one = 1;
+    _array[index].compare_exchange(_default_val, one);
+    validate(_default_val, one, index);
+
+    _array[index].compare_exchange(one, _default_val);
+    validate(_default_val, _default_val, index);
+  }
+
+  void test() {
+    for (size_t i = 0; i < ARRAY_SIZE(_array); ++i) {
+      _array[i].store_relaxed(_default_val);
+    }
+    for (int i = _base; i < (_base+32); i++) {
+      test_index(i);
+    }
+  }
+};
+
+TEST_VM(AtomicCmpxchg1Byte, stress) {
+  AtomicCmpxchg1ByteStressSupport support;
+  support.test();
+}
+
+template<typename T>
+struct AtomicEnumTestSupport {
+  Atomic<T> _test_value;
+
+  AtomicEnumTestSupport() : _test_value{} {}
+
+  void test_store_load(T value) {
+    EXPECT_NE(value, _test_value.load_relaxed());
+    _test_value.store_relaxed(value);
+    EXPECT_EQ(value, _test_value.load_relaxed());
+  }
+
+  void test_cmpxchg(T value1, T value2) {
+    EXPECT_NE(value1, _test_value.load_relaxed());
+    _test_value.store_relaxed(value1);
+    EXPECT_EQ(value1, _test_value.compare_exchange(value2, value2));
+    EXPECT_EQ(value1, _test_value.load_relaxed());
+    EXPECT_EQ(value1, _test_value.compare_exchange(value1, value2));
+    EXPECT_EQ(value2, _test_value.load_relaxed());
+  }
+
+  void test_xchg(T value1, T value2) {
+    EXPECT_NE(value1, _test_value.load_relaxed());
+    _test_value.store_relaxed(value1);
+    EXPECT_EQ(value1, _test_value.exchange(value2));
+    EXPECT_EQ(value2, _test_value.load_relaxed());
+  }
+};
+
+namespace AtomicEnumTestUnscoped {       // Scope the enumerators.
+  enum TestEnum { A, B, C };
+}
+
+TEST_VM(AtomicEnumTest, unscoped_enum) {
+  using namespace AtomicEnumTestUnscoped;
+  using Support = AtomicEnumTestSupport<TestEnum>;
+
+  Support().test_store_load(B);
+  Support().test_cmpxchg(B, C);
+  Support().test_xchg(B, C);
+}
+
+enum class AtomicEnumTestScoped { A, B, C };
+
+TEST_VM(AtomicEnumTest, scoped_enum) {
+  const AtomicEnumTestScoped B = AtomicEnumTestScoped::B;
+  const AtomicEnumTestScoped C = AtomicEnumTestScoped::C;
+  using Support = AtomicEnumTestSupport<AtomicEnumTestScoped>;
+
+  Support().test_store_load(B);
+  Support().test_cmpxchg(B, C);
+  Support().test_xchg(B, C);
+}
+
+template<typename T>
+struct AtomicBitopsTestSupport {
+  Atomic<T> _test_value;
+
+  // At least one byte differs between _old_value and _old_value op _change_value.
+  static constexpr T _old_value =    static_cast<T>(UCONST64(0x7f5300007f530044));
+  static constexpr T _change_value = static_cast<T>(UCONST64(0x3800530038005322));
+
+  AtomicBitopsTestSupport() : _test_value(0) {}
+
+  void fetch_then_and() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value & _change_value;
+    EXPECT_NE(_old_value, expected);
+    T result = _test_value.fetch_then_and(_change_value);
+    EXPECT_EQ(_old_value, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void fetch_then_or() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value | _change_value;
+    EXPECT_NE(_old_value, expected);
+    T result = _test_value.fetch_then_or(_change_value);
+    EXPECT_EQ(_old_value, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void fetch_then_xor() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value ^ _change_value;
+    EXPECT_NE(_old_value, expected);
+    T result = _test_value.fetch_then_xor(_change_value);
+    EXPECT_EQ(_old_value, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void and_then_fetch() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value & _change_value;
+    EXPECT_NE(_old_value, expected);
+    T result = _test_value.and_then_fetch(_change_value);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void or_then_fetch() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value | _change_value;
+    EXPECT_NE(_old_value, expected);
+    T result = _test_value.or_then_fetch(_change_value);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void xor_then_fetch() {
+    _test_value.store_relaxed(_old_value);
+    T expected = _old_value ^ _change_value;
+    EXPECT_NE(_old_value, expected);
+    T result = _test_value.xor_then_fetch(_change_value);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+#define TEST_BITOP(name) { SCOPED_TRACE(XSTR(name)); name(); }
+
+  void operator()() {
+    TEST_BITOP(fetch_then_and)
+    TEST_BITOP(fetch_then_or)
+    TEST_BITOP(fetch_then_xor)
+    TEST_BITOP(and_then_fetch)
+    TEST_BITOP(or_then_fetch)
+    TEST_BITOP(xor_then_fetch)
+  }
+
+#undef TEST_BITOP
+};
+
+TEST_VM(AtomicBitopsTest, int32) {
+  AtomicBitopsTestSupport<int32_t>()();
+}
+
+TEST_VM(AtomicBitopsTest, uint32) {
+  AtomicBitopsTestSupport<uint32_t>()();
+}
+
+TEST_VM(AtomicBitopsTest, int64) {
+  AtomicBitopsTestSupport<int64_t>()();
+}
+
+TEST_VM(AtomicBitopsTest, uint64) {
+  AtomicBitopsTestSupport<uint64_t>()();
+}
+
+template<typename T>
+struct AtomicPointerTestSupport {
+  static T _test_values[10];
+  static T* _initial_ptr;
+
+  Atomic<T*> _test_value;
+
+  AtomicPointerTestSupport() : _test_value(nullptr) {}
+
+  void fetch_then_add() {
+    _test_value.store_relaxed(_initial_ptr);
+    T* expected = _initial_ptr + 2;
+    T* result = _test_value.fetch_then_add(2);
+    EXPECT_EQ(_initial_ptr, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void fetch_then_sub() {
+    _test_value.store_relaxed(_initial_ptr);
+    T* expected = _initial_ptr - 2;
+    T* result = _test_value.fetch_then_sub(2);
+    EXPECT_EQ(_initial_ptr, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void add_then_fetch() {
+    _test_value.store_relaxed(_initial_ptr);
+    T* expected = _initial_ptr + 2;
+    T* result = _test_value.add_then_fetch(2);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void sub_then_fetch() {
+    _test_value.store_relaxed(_initial_ptr);
+    T* expected = _initial_ptr - 2;
+    T* result = _test_value.sub_then_fetch(2);
+    EXPECT_EQ(expected, result);
+    EXPECT_EQ(expected, _test_value.load_relaxed());
+  }
+
+  void exchange() {
+    _test_value.store_relaxed(_initial_ptr);
+    T* replace = _initial_ptr + 3;
+    T* result = _test_value.exchange(replace);
+    EXPECT_EQ(_initial_ptr, result);
+    EXPECT_EQ(replace, _test_value.load_relaxed());
+  }
+
+  void compare_exchange() {
+    _test_value.store_relaxed(_initial_ptr);
+    T* not_initial_ptr = _initial_ptr - 1;
+    T* replace = _initial_ptr + 3;
+
+    T* result = _test_value.compare_exchange(not_initial_ptr, replace);
+    EXPECT_EQ(_initial_ptr, result);
+    EXPECT_EQ(_initial_ptr, _test_value.load_relaxed());
+
+    result = _test_value.compare_exchange(_initial_ptr, replace);
+    EXPECT_EQ(_initial_ptr, result);
+    EXPECT_EQ(replace, _test_value.load_relaxed());
+  }
+
+#define TEST_OP(name) { SCOPED_TRACE(XSTR(name)); name(); }
+
+  void operator()() {
+    TEST_OP(fetch_then_add)
+    TEST_OP(fetch_then_sub)
+    TEST_OP(add_then_fetch)
+    TEST_OP(sub_then_fetch)
+    TEST_OP(exchange)
+    TEST_OP(compare_exchange)
+  }
+
+#undef TEST_OP
+};
+
+template<typename T>
+T AtomicPointerTestSupport<T>::_test_values[10] = {};
+
+template<typename T>
+T* AtomicPointerTestSupport<T>::_initial_ptr = &_test_values[5];
+
+TEST_VM(AtomicPointerTest, ptr_to_char) {
+  AtomicPointerTestSupport<char>()();
+}
+
+TEST_VM(AtomicPointerTest, ptr_to_int32) {
+  AtomicPointerTestSupport<int32_t>()();
+}
+
+TEST_VM(AtomicPointerTest, ptr_to_int64) {
+  AtomicPointerTestSupport<int64_t>()();
+}
+
+// Test translation, including chaining.
+
+struct TranslatedAtomicTestObject1 {
+  int _value;
+
+  // NOT default constructible.
+
+  explicit TranslatedAtomicTestObject1(int value)
+    : _value(value) {}
+};
+
+template<>
+struct PrimitiveConversions::Translate<TranslatedAtomicTestObject1>
+  : public std::true_type
+{
+  using Value = TranslatedAtomicTestObject1;
+  using Decayed = int;
+
+  static Decayed decay(Value x) { return x._value; }
+  static Value recover(Decayed x) { return Value(x); }
+};
+
+struct TranslatedAtomicTestObject2 {
+  TranslatedAtomicTestObject1 _value;
+
+  static constexpr int DefaultObject1Value = 3;
+
+  TranslatedAtomicTestObject2()
+    : TranslatedAtomicTestObject2(TranslatedAtomicTestObject1(DefaultObject1Value))
+  {}
+
+  explicit TranslatedAtomicTestObject2(TranslatedAtomicTestObject1 value)
+    : _value(value) {}
+};
+
+template<>
+struct PrimitiveConversions::Translate<TranslatedAtomicTestObject2>
+  : public std::true_type
+{
+  using Value = TranslatedAtomicTestObject2;
+  using Decayed = TranslatedAtomicTestObject1;
+
+  static Decayed decay(Value x) { return x._value; }
+  static Value recover(Decayed x) { return Value(x); }
+};
+
+struct TranslatedAtomicByteObject {
+  uint8_t _value;
+
+  // NOT default constructible.
+
+  explicit TranslatedAtomicByteObject(uint8_t value = 0) : _value(value) {}
+};
+
+template<>
+struct PrimitiveConversions::Translate<TranslatedAtomicByteObject>
+  : public std::true_type
+{
+  using Value = TranslatedAtomicByteObject;
+  using Decayed = uint8_t;
+
+  static Decayed decay(Value x) { return x._value; }
+  static Value recover(Decayed x) { return Value(x); }
+};
+
+// Test whether Atomic<T> has exchange().
+// Note: This is intentionally a different implementation from what is used
+// by the atomic translated type to decide whether to provide exchange().
+// The intent is to make related testing non-tautological.
+// The two implementations must agree; it's a bug if they don't.
+template<typename T>
+class AtomicTypeHasExchange {
+  template<typename U,
+           typename AU = Atomic<U>,
+           typename = decltype(declval<AU>().exchange(declval<U>()))>
+  static char* test(int);
+
+  template<typename> static char test(...);
+
+  using test_type = decltype(test<T>(0));
+
+public:
+  static constexpr bool value = std::is_pointer_v<test_type>;
+};
+
+// Unit tests for AtomicTypeHasExchange.
+static_assert(AtomicTypeHasExchange<int>::value);
+static_assert(AtomicTypeHasExchange<int*>::value);
+static_assert(AtomicTypeHasExchange<TranslatedAtomicTestObject1>::value);
+static_assert(AtomicTypeHasExchange<TranslatedAtomicTestObject2>::value);
+static_assert(!AtomicTypeHasExchange<uint8_t>::value);
+
+// Verify translated byte type *doesn't* have exchange.
+static_assert(!AtomicTypeHasExchange<TranslatedAtomicByteObject>::value);
+
+// Verify that explicit instantiation doesn't attempt to reference the
+// non-existent exchange of the atomic decayed type.
+template class AtomicImpl::Atomic<TranslatedAtomicByteObject>;
+
+template<typename T>
+static void test_atomic_translated_type() {
+  // This works even if T is not default constructible.
+  Atomic<T> _test_value{};
+
+  using Translated = PrimitiveConversions::Translate<T>;
+
+  EXPECT_EQ(0, Translated::decay(_test_value.load_relaxed()));
+  _test_value.store_relaxed(Translated::recover(5));
+  EXPECT_EQ(5, Translated::decay(_test_value.load_relaxed()));
+  EXPECT_EQ(5, Translated::decay(_test_value.compare_exchange(Translated::recover(5),
+                                                              Translated::recover(10))));
+  EXPECT_EQ(10, Translated::decay(_test_value.load_relaxed()));
+
+  if constexpr (AtomicTypeHasExchange<T>::value) {
+    EXPECT_EQ(10, Translated::decay(_test_value.exchange(Translated::recover(20))));
+    EXPECT_EQ(20, Translated::decay(_test_value.load_relaxed()));
+  }
+}
+
+TEST_VM(AtomicTranslatedTypeTest, int_test) {
+  test_atomic_translated_type<TranslatedAtomicTestObject1>();
+}
+
+TEST_VM(AtomicTranslatedTypeTest, byte_test) {
+  test_atomic_translated_type<TranslatedAtomicByteObject>();
+}
+
+TEST_VM(AtomicTranslatedTypeTest, chain) {
+  Atomic<TranslatedAtomicTestObject2> _test_value{};
+
+  using Translated1 = PrimitiveConversions::Translate<TranslatedAtomicTestObject1>;
+  using Translated2 = PrimitiveConversions::Translate<TranslatedAtomicTestObject2>;
+
+  auto resolve = [&](TranslatedAtomicTestObject2 x) {
+    return Translated1::decay(Translated2::decay(x));
+  };
+
+  auto construct = [&](int x) {
+    return Translated2::recover(Translated1::recover(x));
+  };
+
+  EXPECT_EQ(TranslatedAtomicTestObject2::DefaultObject1Value,
+            resolve(_test_value.load_relaxed()));
+  _test_value.store_relaxed(construct(5));
+  EXPECT_EQ(5, resolve(_test_value.load_relaxed()));
+  EXPECT_EQ(5, resolve(_test_value.compare_exchange(construct(5), construct(10))));
+  EXPECT_EQ(10, resolve(_test_value.load_relaxed()));
+  EXPECT_EQ(10, resolve(_test_value.exchange(construct(20))));
+  EXPECT_EQ(20, resolve(_test_value.load_relaxed()));
+};
+
+template<typename T>
+static void test_value_access() {
+  using AT = Atomic<T>;
+  // In addition to verifying values are as expected, also verify the
+  // operations are constexpr.
+  static_assert(sizeof(T) == AT::value_size_in_bytes(), "value size differs");
+  static_assert(0 == AT::value_offset_in_bytes(), "unexpected offset");
+  // Also verify no unexpected increase in size for Atomic wrapper.
+  static_assert(sizeof(T) == sizeof(AT), "unexpected size difference");
+};
+
+TEST_VM(AtomicValueAccessTest, access_char) {
+  test_value_access<char>();
+}
+
+TEST_VM(AtomicValueAccessTest, access_bool) {
+  test_value_access<bool>();
+}
+
+TEST_VM(AtomicValueAccessTest, access_int32) {
+  test_value_access<int32_t>();
+}
+
+TEST_VM(AtomicValueAccessTest, access_int64) {
+  test_value_access<int64_t>();
+}
+
+TEST_VM(AtomicValueAccessTest, access_ptr) {
+  test_value_access<char*>();
+}
+
+TEST_VM(AtomicValueAccessTest, access_trans1) {
+  test_value_access<TranslatedAtomicTestObject1>();
+}
+
+TEST_VM(AtomicValueAccessTest, access_trans2) {
+  test_value_access<TranslatedAtomicTestObject2>();
+}

From 9d6a61fda6f43577ee8f19483e5b47100ff8eec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <bmaillard@openjdk.org>
Date: Thu, 13 Nov 2025 09:24:51 +0000
Subject: [PATCH 150/512] 8371558: C2: Missing optimization opportunity in
 AbsNode::Ideal

Reviewed-by: thartmann, rcastanedalo, chagedorn
---
 src/hotspot/share/opto/phaseX.cpp             | 10 +++
 .../c2/TestMissingOptAbsZeroMinusX.java       | 85 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestMissingOptAbsZeroMinusX.java

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 8f192cf069c..1fe911aa7ac 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2596,6 +2596,16 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
+  // Check for "abs(0-x)" into "abs(x)" conversion
+  if (use->is_Sub()) {
+    for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
+      Node* u = use->fast_out(i2);
+      if (u->Opcode() == Op_AbsD || u->Opcode() == Op_AbsF ||
+          u->Opcode() == Op_AbsL || u->Opcode() == Op_AbsI) {
+        worklist.push(u);
+      }
+    }
+  }
   auto enqueue_init_mem_projs = [&](ProjNode* proj) {
     add_users_to_worklist0(proj, worklist);
   };
diff --git a/test/hotspot/jtreg/compiler/c2/TestMissingOptAbsZeroMinusX.java b/test/hotspot/jtreg/compiler/c2/TestMissingOptAbsZeroMinusX.java
new file mode 100644
index 00000000000..1422aef7b78
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestMissingOptAbsZeroMinusX.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371558
+ * @summary An expression of the form "abs(0-x)" should be transformed to "abs(x)".
+ *          This test ensures that updates to the Sub node’s inputs propagate as
+ *          expected and that the optimization is not missed.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xcomp
+ *      -XX:CompileCommand=compileonly,compiler.c2.TestMissingOptAbsZeroMinusX::test*
+ *      -XX:VerifyIterativeGVN=1110 compiler.c2.TestMissingOptAbsZeroMinusX
+ * @run main compiler.c2.TestMissingOptAbsZeroMinusX
+ *
+ */
+
+package compiler.c2;
+
+public class TestMissingOptAbsZeroMinusX {
+    static int a;
+    static boolean b;
+
+    public static void main(String[] strArr) {
+        // no known reproducer for AbsL
+        testAbsI();
+        testAbsF();
+        testAbsD();
+    }
+
+    static void testAbsI() {
+        int d = 4;
+        for (int i = 8; i < 133; i += 3) {
+            d -= a;
+            b = (d != Math.abs(d));
+            for (long f = 3; f < 127; f++) {
+                for (int e = 1; e < 3; e++) {}
+            }
+            d = 0;
+        }
+    }
+
+    static void testAbsF() {
+        float d = 12.3f;
+        for (int i = 8; i < 133; i += 3) {
+            d -= a;
+            b = (d != Math.abs(d));
+            for (long f = 3; f < 127; f++) {
+                for (int e = 1; e < 3; e++) {}
+            }
+            d = 0.0f;
+        }
+    }
+
+    static void testAbsD() {
+        double d = 12.3;
+        for (int i = 8; i < 133; i += 3) {
+            d -= a;
+            b = (d != Math.abs(d));
+            for (long f = 3; f < 127; f++) {
+                for (int e = 1; e < 3; e++) {}
+            }
+            d = 0.0;
+        }
+    }
+}
\ No newline at end of file

From 48c59faf58a4d7b7ec9d6824a5cbc9a55888ce72 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Thu, 13 Nov 2025 10:46:00 +0000
Subject: [PATCH 151/512] 8371722:
 java/net/httpclient/BufferSizePropertyClampTest.java should use Locale.ROOT

Reviewed-by: djelinski, jpai, vyazici
---
 .../httpclient/BufferSizePropertyClampTest.java  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/net/httpclient/BufferSizePropertyClampTest.java b/test/jdk/java/net/httpclient/BufferSizePropertyClampTest.java
index caef0a58a6d..d9695dce3cb 100644
--- a/test/jdk/java/net/httpclient/BufferSizePropertyClampTest.java
+++ b/test/jdk/java/net/httpclient/BufferSizePropertyClampTest.java
@@ -29,6 +29,7 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -68,13 +69,20 @@ class BufferSizePropertyClampTest {
     private static final List<String> CLIENT_LOGGER_MESSAGES =
             Collections.synchronizedList(new ArrayList<>());
 
+    private static final String EXPECTED_MSG =
+            "ERROR: Property value for jdk.httpclient.bufsize={0} not in [1..16,384]: using default=16,384";
+
+    private static String format(String pattern, Object... args) {
+        return new MessageFormat(pattern, Locale.ROOT).format(args);
+    }
+
     @BeforeAll
     static void registerLoggerHandler() {
         CLIENT_LOGGER.addHandler(new Handler() {
 
             @Override
             public void publish(LogRecord record) {
-                var message = MessageFormat.format(record.getMessage(), record.getParameters());
+                var message = format(record.getMessage(), record.getParameters());
                 CLIENT_LOGGER_MESSAGES.add(message);
             }
 
@@ -97,10 +105,8 @@ class BufferSizePropertyClampTest {
         assertEquals(
                 1, CLIENT_LOGGER_MESSAGES.size(),
                 "Unexpected number of logger messages: " + CLIENT_LOGGER_MESSAGES);
-        var expectedMessage = "ERROR: Property value for jdk.httpclient.bufsize=" +
-                System.getProperty("jdk.httpclient.bufsize") +
-                " not in [1..16384]: using default=16384";
-        assertEquals(expectedMessage, CLIENT_LOGGER_MESSAGES.getFirst().replaceAll(",", ""));
+        var expectedMessage = format(EXPECTED_MSG, Integer.getInteger("jdk.httpclient.bufsize"));
+        assertEquals(expectedMessage, CLIENT_LOGGER_MESSAGES.getFirst());
     }
 
 }

From 6b6fdf1d9222eb03cd013cbe792fa77fd78c1acb Mon Sep 17 00:00:00 2001
From: Ramesh Bhagavatam Gangadhar <rgangadhar@openjdk.org>
Date: Thu, 13 Nov 2025 12:57:16 +0000
Subject: [PATCH 152/512] 8357874: UNLIMTED_CRYPTO typo in class description of
 JceSecurity.java.template

Reviewed-by: wetmore
---
 .../share/classes/javax/crypto/JceSecurity.java.template      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/JceSecurity.java.template b/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
index 01282394b57..a6010945660 100644
--- a/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
+++ b/src/java.base/share/classes/javax/crypto/JceSecurity.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *
  * In the current jdk builds, this file is first preprocessed to replace
  * @@JCE_DEFAULT_POLICY@ [sic] with "limited" or "unlimited" which is
- * determined by the $(UNLIMTED_CRYPTO) make variable.  This variable is
+ * determined by the $(UNLIMITED_CRYPTO) make variable.  This variable is
  * set by top-level configure script, using either
  * --disable-unlimited-crypto or --enable-unlimited-crypto [default].
  *

From bbc0f9ef30c467c8da8b873813bde50a7e9ff697 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 13 Nov 2025 13:53:09 +0000
Subject: [PATCH 153/512] 8371788: Fix documentation for
 CollectedHeap::collect(GCCause)

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp            | 3 ---
 src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp | 1 -
 src/hotspot/share/gc/serial/serialHeap.hpp             | 3 ---
 src/hotspot/share/gc/shared/collectedHeap.hpp          | 4 +---
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index e160cb9e428..7a0edfacd0f 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1040,9 +1040,6 @@ public:
   // old GC alloc region.
   bool is_old_gc_alloc_region(G1HeapRegion* hr);
 
-  // Perform a collection of the heap; intended for use in implementing
-  // "System.gc".  This probably implies as full a collection as the
-  // "CollectedHeap" supports.
   void collect(GCCause::Cause cause) override;
 
   // Try to perform a collection of the heap with the given cause to allocate allocation_word_size
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index de1e3ce851c..f9161afc28f 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -206,7 +206,6 @@ public:
 
   HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
 
-  // Support for System.gc()
   void collect(GCCause::Cause cause) override;
 
   void collect_at_safepoint(bool full);
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 432cd73f616..ee016173c2a 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -139,9 +139,6 @@ public:
   // Callback from VM_SerialGCCollect.
   void collect_at_safepoint(bool full);
 
-  // Perform a full collection of the heap; intended for use in implementing
-  // "System.gc". This implies as full a collection as the CollectedHeap
-  // supports. Caller does not hold the Heap_lock on entry.
   void collect(GCCause::Cause cause) override;
 
   // Returns "TRUE" iff "p" points into the committed areas of the heap.
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 659106f9c19..6be0057480d 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -353,9 +353,7 @@ protected:
   // collection or expansion activity.
   virtual size_t unsafe_max_tlab_alloc() const = 0;
 
-  // Perform a collection of the heap; intended for use in implementing
-  // "System.gc".  This probably implies as full a collection as the
-  // "CollectedHeap" supports.
+  // Perform a collection of the heap of a type depending on the given cause.
   virtual void collect(GCCause::Cause cause) = 0;
 
   // Perform a full collection

From 7d78818ae609461ab830c32c222f15f1cab0d2d4 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 13 Nov 2025 13:55:25 +0000
Subject: [PATCH 154/512] 8274178: G1: Occupancy value in IHOP logging and JFR
 event is inaccurate 8371635: G1: Young gen allocations should never be
 considered when comparing against IHOP threshold

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 17 +++++++++
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   | 11 ++++--
 .../share/gc/g1/g1HeapSizingPolicy.cpp        | 36 ++++++++----------
 src/hotspot/share/gc/g1/g1IHOPControl.cpp     | 37 +++++++++++--------
 src/hotspot/share/gc/g1/g1IHOPControl.hpp     | 16 +++++---
 src/hotspot/share/gc/g1/g1Policy.cpp          | 34 +++++------------
 src/hotspot/share/gc/g1/g1Policy.hpp          |  6 +--
 src/hotspot/share/gc/g1/g1Trace.cpp           |  8 ++--
 src/hotspot/share/gc/g1/g1Trace.hpp           |  4 +-
 9 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 9a5e390f6f1..f04658a1415 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -353,6 +353,14 @@ size_t G1CollectedHeap::humongous_obj_size_in_regions(size_t word_size) {
   return align_up(word_size, G1HeapRegion::GrainWords) / G1HeapRegion::GrainWords;
 }
 
+size_t G1CollectedHeap::allocation_used_bytes(size_t allocation_word_size) {
+  if (is_humongous(allocation_word_size)) {
+    return humongous_obj_size_in_regions(allocation_word_size) * G1HeapRegion::GrainBytes;
+  } else {
+    return allocation_word_size * HeapWordSize;
+  }
+}
+
 // If could fit into free regions w/o expansion, try.
 // Otherwise, if can expand, do so.
 // Otherwise, if using ex regions might help, try with ex given back.
@@ -2955,6 +2963,15 @@ void G1CollectedHeap::abandon_collection_set() {
   collection_set()->abandon();
 }
 
+size_t G1CollectedHeap::non_young_occupancy_after_allocation(size_t allocation_word_size) {
+  // For simplicity, just count whole regions.
+  const size_t cur_occupancy = (old_regions_count() + humongous_regions_count()) * G1HeapRegion::GrainBytes;
+  // Humongous allocations will always be assigned to non-young heap, so consider
+  // that allocation in the result as well. Otherwise the allocation will always
+  // be in young gen, so there is no need to account it here.
+  return cur_occupancy + (is_humongous(allocation_word_size) ? allocation_used_bytes(allocation_word_size) : 0);
+}
+
 bool G1CollectedHeap::is_old_gc_alloc_region(G1HeapRegion* hr) {
   return _allocator->is_retained_old_region(hr);
 }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 7a0edfacd0f..5dccf41e909 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1032,9 +1032,10 @@ public:
   inline void old_set_add(G1HeapRegion* hr);
   inline void old_set_remove(G1HeapRegion* hr);
 
-  size_t non_young_capacity_bytes() {
-    return (old_regions_count() + humongous_regions_count()) * G1HeapRegion::GrainBytes;
-  }
+  // Returns how much memory there is assigned to non-young heap that can not be
+  // allocated into any more without garbage collection after a hypothetical
+  // allocation of allocation_word_size.
+  size_t non_young_occupancy_after_allocation(size_t allocation_word_size);
 
   // Determine whether the given region is one that we are using as an
   // old GC alloc region.
@@ -1226,6 +1227,10 @@ public:
   // requires.
   static size_t humongous_obj_size_in_regions(size_t word_size);
 
+  // Returns how much space in bytes an allocation of word_size will use up in the
+  // heap.
+  static size_t allocation_used_bytes(size_t word_size);
+
   // Print the maximum heap capacity.
   size_t max_capacity() const override;
   size_t min_capacity() const;
diff --git a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
index 03a1444f8e6..4dd0a509bcd 100644
--- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
@@ -366,28 +366,24 @@ static size_t target_heap_capacity(size_t used_bytes, uintx free_ratio) {
 }
 
 size_t G1HeapSizingPolicy::full_collection_resize_amount(bool& expand, size_t allocation_word_size) {
-  // If the full collection was triggered by an allocation failure, we should account
-  // for the bytes required for this allocation under used_after_gc. This prevents
-  // unnecessary shrinking that would be followed by an expand call to satisfy the
-  // allocation.
-  size_t allocation_bytes = allocation_word_size * HeapWordSize;
-  if (_g1h->is_humongous(allocation_word_size)) {
-    // Humongous objects are allocated in entire regions, we must calculate
-    // required space in terms of full regions, not just the object size.
-    allocation_bytes = G1HeapRegion::align_up_to_region_byte_size(allocation_bytes);
-  }
-
+  const size_t capacity_after_gc = _g1h->capacity();
   // Capacity, free and used after the GC counted as full regions to
   // include the waste in the following calculations.
-  const size_t capacity_after_gc = _g1h->capacity();
-  const size_t used_after_gc = capacity_after_gc + allocation_bytes -
-                               _g1h->unused_committed_regions_in_bytes() -
-                               // Discount space used by current Eden to establish a
-                               // situation during Remark similar to at the end of full
-                               // GC where eden is empty. During Remark there can be an
-                               // arbitrary number of eden regions which would skew the
-                               // results.
-                               _g1h->eden_regions_count() * G1HeapRegion::GrainBytes;
+  const size_t current_used_after_gc = capacity_after_gc -
+                                       _g1h->unused_committed_regions_in_bytes() -
+                                       // Discount space used by current Eden to establish a
+                                       // situation during Remark similar to at the end of full
+                                       // GC where eden is empty. During Remark there can be an
+                                       // arbitrary number of eden regions which would skew the
+                                       // results.
+                                       _g1h->eden_regions_count() * G1HeapRegion::GrainBytes;
+
+  // Add pending allocation;
+  const size_t used_after_gc = current_used_after_gc +
+                               // If the full collection was triggered by an allocation failure,
+                               // account that allocation too. Otherwise we could shrink and then
+                               // expand immediately to satisfy the allocation.
+                               _g1h->allocation_used_bytes(allocation_word_size);
 
   size_t minimum_desired_capacity = target_heap_capacity(used_after_gc, MinHeapFreeRatio);
   size_t maximum_desired_capacity = target_heap_capacity(used_after_gc, MaxHeapFreeRatio);
diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.cpp b/src/hotspot/share/gc/g1/g1IHOPControl.cpp
index 5c05169c29d..34c8cd0366b 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.cpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.cpp
@@ -44,32 +44,37 @@ void G1IHOPControl::update_target_occupancy(size_t new_target_occupancy) {
   _target_occupancy = new_target_occupancy;
 }
 
+void G1IHOPControl::report_statistics(G1NewTracer* new_tracer, size_t non_young_occupancy) {
+  print_log(non_young_occupancy);
+  send_trace_event(new_tracer, non_young_occupancy);
+}
+
 void G1IHOPControl::update_allocation_info(double allocation_time_s, size_t additional_buffer_size) {
   assert(allocation_time_s >= 0.0, "Allocation time must be positive but is %.3f", allocation_time_s);
 
   _last_allocation_time_s = allocation_time_s;
 }
 
-void G1IHOPControl::print() {
+void G1IHOPControl::print_log(size_t non_young_occupancy) {
   assert(_target_occupancy > 0, "Target occupancy still not updated yet.");
   size_t cur_conc_mark_start_threshold = get_conc_mark_start_threshold();
-  log_debug(gc, ihop)("Basic information (value update), threshold: %zuB (%1.2f), target occupancy: %zuB, current occupancy: %zuB, "
+  log_debug(gc, ihop)("Basic information (value update), threshold: %zuB (%1.2f), target occupancy: %zuB, non-young occupancy: %zuB, "
                       "recent allocation size: %zuB, recent allocation duration: %1.2fms, recent old gen allocation rate: %1.2fB/s, recent marking phase length: %1.2fms",
                       cur_conc_mark_start_threshold,
                       percent_of(cur_conc_mark_start_threshold, _target_occupancy),
                       _target_occupancy,
-                      G1CollectedHeap::heap()->used(),
+                      non_young_occupancy,
                       _old_gen_alloc_tracker->last_period_old_gen_bytes(),
                       _last_allocation_time_s * 1000.0,
                       _last_allocation_time_s > 0.0 ? _old_gen_alloc_tracker->last_period_old_gen_bytes() / _last_allocation_time_s : 0.0,
                       last_marking_length_s() * 1000.0);
 }
 
-void G1IHOPControl::send_trace_event(G1NewTracer* tracer) {
+void G1IHOPControl::send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy) {
   assert(_target_occupancy > 0, "Target occupancy still not updated yet.");
   tracer->report_basic_ihop_statistics(get_conc_mark_start_threshold(),
                                        _target_occupancy,
-                                       G1CollectedHeap::heap()->used(),
+                                       non_young_occupancy,
                                        _old_gen_alloc_tracker->last_period_old_gen_bytes(),
                                        _last_allocation_time_s,
                                        last_marking_length_s());
@@ -165,27 +170,27 @@ void G1AdaptiveIHOPControl::update_marking_length(double marking_length_s) {
   _marking_times_s.add(marking_length_s);
 }
 
-void G1AdaptiveIHOPControl::print() {
-  G1IHOPControl::print();
-  size_t actual_target = actual_target_threshold();
-  log_debug(gc, ihop)("Adaptive IHOP information (value update), threshold: %zuB (%1.2f), internal target occupancy: %zuB, "
-                      "occupancy: %zuB, additional buffer size: %zuB, predicted old gen allocation rate: %1.2fB/s, "
+void G1AdaptiveIHOPControl::print_log(size_t non_young_occupancy) {
+  G1IHOPControl::print_log(non_young_occupancy);
+  size_t actual_threshold = actual_target_threshold();
+  log_debug(gc, ihop)("Adaptive IHOP information (value update), threshold: %zuB (%1.2f), internal target threshold: %zuB, "
+                      "non-young occupancy: %zuB, additional buffer size: %zuB, predicted old gen allocation rate: %1.2fB/s, "
                       "predicted marking phase length: %1.2fms, prediction active: %s",
                       get_conc_mark_start_threshold(),
-                      percent_of(get_conc_mark_start_threshold(), actual_target),
-                      actual_target,
-                      G1CollectedHeap::heap()->used(),
+                      percent_of(get_conc_mark_start_threshold(), actual_threshold),
+                      actual_threshold,
+                      non_young_occupancy,
                       _last_unrestrained_young_size,
                       predict(&_allocation_rate_s),
                       predict(&_marking_times_s) * 1000.0,
                       have_enough_data_for_prediction() ? "true" : "false");
 }
 
-void G1AdaptiveIHOPControl::send_trace_event(G1NewTracer* tracer) {
-  G1IHOPControl::send_trace_event(tracer);
+void G1AdaptiveIHOPControl::send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy) {
+  G1IHOPControl::send_trace_event(tracer, non_young_occupancy);
   tracer->report_adaptive_ihop_statistics(get_conc_mark_start_threshold(),
                                           actual_target_threshold(),
-                                          G1CollectedHeap::heap()->used(),
+                                          non_young_occupancy,
                                           _last_unrestrained_young_size,
                                           predict(&_allocation_rate_s),
                                           predict(&_marking_times_s),
diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.hpp b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
index 507fbb269d1..392a12a785a 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.hpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
@@ -55,7 +55,11 @@ class G1IHOPControl : public CHeapObj<mtGC> {
   // Most recent time from the end of the concurrent start to the start of the first
   // mixed gc.
   virtual double last_marking_length_s() const = 0;
- public:
+
+  virtual void print_log(size_t non_young_occupancy);
+  virtual void send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy);
+
+public:
   virtual ~G1IHOPControl() { }
 
   // Get the current non-young occupancy at which concurrent marking should start.
@@ -76,8 +80,7 @@ class G1IHOPControl : public CHeapObj<mtGC> {
   // the first mixed gc.
   virtual void update_marking_length(double marking_length_s) = 0;
 
-  virtual void print();
-  virtual void send_trace_event(G1NewTracer* tracer);
+  void report_statistics(G1NewTracer* tracer, size_t non_young_occupancy);
 };
 
 // The returned concurrent mark starting occupancy threshold is a fixed value
@@ -139,6 +142,10 @@ class G1AdaptiveIHOPControl : public G1IHOPControl {
   double last_mutator_period_old_allocation_rate() const;
  protected:
   virtual double last_marking_length_s() const { return _marking_times_s.last(); }
+
+  virtual void print_log(size_t non_young_occupancy);
+  virtual void send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy);
+
  public:
   G1AdaptiveIHOPControl(double ihop_percent,
                         G1OldGenAllocationTracker const* old_gen_alloc_tracker,
@@ -150,9 +157,6 @@ class G1AdaptiveIHOPControl : public G1IHOPControl {
 
   virtual void update_allocation_info(double allocation_time_s, size_t additional_buffer_size);
   virtual void update_marking_length(double marking_length_s);
-
-  virtual void print();
-  virtual void send_trace_event(G1NewTracer* tracer);
 };
 
 #endif // SHARE_GC_G1_G1IHOPCONTROL_HPP
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index ddcdfb0c3a4..19573e11cd7 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -749,22 +749,14 @@ bool G1Policy::need_to_start_conc_mark(const char* source, size_t allocation_wor
   }
 
   size_t marking_initiating_used_threshold = _ihop_control->get_conc_mark_start_threshold();
-
-  size_t cur_used_bytes = _g1h->non_young_capacity_bytes();
-  size_t allocation_byte_size = allocation_word_size * HeapWordSize;
-  // For humongous allocations, we need to consider that we actually use full regions
-  // for allocations. So compare the threshold to this size.
-  if (_g1h->is_humongous(allocation_word_size)) {
-    allocation_byte_size = G1HeapRegion::align_up_to_region_byte_size(allocation_byte_size);
-  }
-  size_t marking_request_bytes = cur_used_bytes + allocation_byte_size;
+  size_t non_young_occupancy = _g1h->non_young_occupancy_after_allocation(allocation_word_size);
 
   bool result = false;
-  if (marking_request_bytes > marking_initiating_used_threshold) {
+  if (non_young_occupancy > marking_initiating_used_threshold) {
     result = collector_state()->in_young_only_phase();
-    log_debug(gc, ergo, ihop)("%s occupancy: %zuB allocation request: %zuB threshold: %zuB (%1.2f) source: %s",
+    log_debug(gc, ergo, ihop)("%s non-young occupancy: %zuB allocation request: %zuB threshold: %zuB (%1.2f) source: %s",
                               result ? "Request concurrent cycle initiation (occupancy higher than threshold)" : "Do not request concurrent cycle initiation (still doing mixed collections)",
-                              cur_used_bytes, allocation_byte_size, marking_initiating_used_threshold, (double) marking_initiating_used_threshold / _g1h->capacity() * 100, source);
+                              non_young_occupancy, allocation_word_size * HeapWordSize, marking_initiating_used_threshold, (double) marking_initiating_used_threshold / _g1h->capacity() * 100, source);
   }
   return result;
 }
@@ -995,10 +987,10 @@ void G1Policy::record_young_collection_end(bool concurrent_operation_is_full_mar
     update_young_length_bounds();
 
     _old_gen_alloc_tracker.reset_after_gc(_g1h->humongous_regions_count() * G1HeapRegion::GrainBytes);
-    update_ihop_prediction(app_time_ms / 1000.0,
-                           G1GCPauseTypeHelper::is_young_only_pause(this_pause));
-
-    _ihop_control->send_trace_event(_g1h->gc_tracer_stw());
+    if (update_ihop_prediction(app_time_ms / 1000.0,
+                               G1GCPauseTypeHelper::is_young_only_pause(this_pause))) {
+      _ihop_control->report_statistics(_g1h->gc_tracer_stw(), _g1h->non_young_occupancy_after_allocation(allocation_word_size));
+    }
   } else {
     // Any garbage collection triggered as periodic collection resets the time-to-mixed
     // measurement. Periodic collection typically means that the application is "inactive", i.e.
@@ -1045,7 +1037,7 @@ G1IHOPControl* G1Policy::create_ihop_control(const G1OldGenAllocationTracker* ol
   }
 }
 
-void G1Policy::update_ihop_prediction(double mutator_time_s,
+bool G1Policy::update_ihop_prediction(double mutator_time_s,
                                       bool this_gc_was_young_only) {
   // Always try to update IHOP prediction. Even evacuation failures give information
   // about e.g. whether to start IHOP earlier next time.
@@ -1082,13 +1074,7 @@ void G1Policy::update_ihop_prediction(double mutator_time_s,
     report = true;
   }
 
-  if (report) {
-    report_ihop_statistics();
-  }
-}
-
-void G1Policy::report_ihop_statistics() {
-  _ihop_control->print();
+  return report;
 }
 
 void G1Policy::record_young_gc_pause_end(bool evacuation_failed) {
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index 93724657235..72fdc6deb5b 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -60,10 +60,10 @@ class G1Policy: public CHeapObj<mtGC> {
 
   static G1IHOPControl* create_ihop_control(const G1OldGenAllocationTracker* old_gen_alloc_tracker,
                                             const G1Predictions* predictor);
-  // Update the IHOP control with necessary statistics.
-  void update_ihop_prediction(double mutator_time_s,
+  // Update the IHOP control with the necessary statistics. Returns true if there
+  // has been a significant update to the prediction.
+  bool update_ihop_prediction(double mutator_time_s,
                               bool this_gc_was_young_only);
-  void report_ihop_statistics();
 
   G1Predictions _predictor;
   G1Analytics* _analytics;
diff --git a/src/hotspot/share/gc/g1/g1Trace.cpp b/src/hotspot/share/gc/g1/g1Trace.cpp
index 6c9a87e4d98..ed6a91f41ed 100644
--- a/src/hotspot/share/gc/g1/g1Trace.cpp
+++ b/src/hotspot/share/gc/g1/g1Trace.cpp
@@ -98,13 +98,13 @@ void G1NewTracer::report_evacuation_statistics(const G1EvacSummary& young_summar
 
 void G1NewTracer::report_basic_ihop_statistics(size_t threshold,
                                                size_t target_ccupancy,
-                                               size_t current_occupancy,
+                                               size_t non_young_occupancy,
                                                size_t last_allocation_size,
                                                double last_allocation_duration,
                                                double last_marking_length) {
   send_basic_ihop_statistics(threshold,
                              target_ccupancy,
-                             current_occupancy,
+                             non_young_occupancy,
                              last_allocation_size,
                              last_allocation_duration,
                              last_marking_length);
@@ -206,7 +206,7 @@ void G1NewTracer::send_old_evacuation_statistics(const G1EvacSummary& summary) c
 
 void G1NewTracer::send_basic_ihop_statistics(size_t threshold,
                                              size_t target_occupancy,
-                                             size_t current_occupancy,
+                                             size_t non_young_occupancy,
                                              size_t last_allocation_size,
                                              double last_allocation_duration,
                                              double last_marking_length) {
@@ -216,7 +216,7 @@ void G1NewTracer::send_basic_ihop_statistics(size_t threshold,
     evt.set_threshold(threshold);
     evt.set_targetOccupancy(target_occupancy);
     evt.set_thresholdPercentage(target_occupancy > 0 ? ((double)threshold / target_occupancy) : 0.0);
-    evt.set_currentOccupancy(current_occupancy);
+    evt.set_currentOccupancy(non_young_occupancy);
     evt.set_recentMutatorAllocationSize(last_allocation_size);
     evt.set_recentMutatorDuration(last_allocation_duration * MILLIUNITS);
     evt.set_recentAllocationRate(last_allocation_duration != 0.0 ? last_allocation_size / last_allocation_duration : 0.0);
diff --git a/src/hotspot/share/gc/g1/g1Trace.hpp b/src/hotspot/share/gc/g1/g1Trace.hpp
index 025a1c3fe95..1415828f376 100644
--- a/src/hotspot/share/gc/g1/g1Trace.hpp
+++ b/src/hotspot/share/gc/g1/g1Trace.hpp
@@ -73,13 +73,13 @@ private:
 
   void send_basic_ihop_statistics(size_t threshold,
                                   size_t target_occupancy,
-                                  size_t current_occupancy,
+                                  size_t non_young_occupancy,
                                   size_t last_allocation_size,
                                   double last_allocation_duration,
                                   double last_marking_length);
   void send_adaptive_ihop_statistics(size_t threshold,
                                      size_t internal_target_occupancy,
-                                     size_t current_occupancy,
+                                     size_t non_young_occupancy,
                                      size_t additional_buffer_size,
                                      double predicted_allocation_rate,
                                      double predicted_marking_length,

From 8102f436f5586253302cd8cef49bfe2b4af41693 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 13 Nov 2025 15:28:08 +0000
Subject: [PATCH 155/512] 8371480: VerifyError after JDK-8369654

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Types.java       |   2 +-
 .../classes/com/sun/tools/javac/jvm/Code.java |  19 +--
 .../VerifierErrorWrongSuperTypeTest.java      | 130 ++++++++++++++++++
 3 files changed, 142 insertions(+), 9 deletions(-)
 create mode 100644 test/langtools/tools/javac/switchexpr/VerifierErrorWrongSuperTypeTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index ffd304c18a2..d59505555f2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -3971,7 +3971,7 @@ public class Types {
      * Return the minimum types of a closure, suitable for computing
      * compoundMin or glb.
      */
-    private List<Type> closureMin(List<Type> cl) {
+    public List<Type> closureMin(List<Type> cl) {
         ListBuffer<Type> classes = new ListBuffer<>();
         ListBuffer<Type> interfaces = new ListBuffer<>();
         Set<Type> toSkip = new HashSet<>();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
index 7899b8335b6..227143c3148 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
@@ -1854,14 +1854,17 @@ public class Code {
             } else {
                 t1 = types.skipTypeVars(t1, false);
                 t2 = types.skipTypeVars(t2, false);
-                List<Type> intersection = types.intersect(
-                        t1.hasTag(ARRAY) ?
-                                List.of(syms.serializableType, syms.cloneableType, syms.objectType) :
-                                types.erasedSupertypes(t1),
-                        t2.hasTag(ARRAY) ?
-                                List.of(syms.serializableType, syms.cloneableType, syms.objectType) :
-                                types.erasedSupertypes(t2));
-                return intersection.head;
+                List<Type> result = types.closureMin(
+                        types.intersect(
+                            t1.hasTag(ARRAY) ?
+                                    List.of(syms.serializableType, syms.cloneableType, syms.objectType) :
+                                    types.erasedSupertypes(t1),
+                            t2.hasTag(ARRAY) ?
+                                    List.of(syms.serializableType, syms.cloneableType, syms.objectType) :
+                                    types.erasedSupertypes(t2)
+                        )
+                );
+                return result.head;
             }
         }
 
diff --git a/test/langtools/tools/javac/switchexpr/VerifierErrorWrongSuperTypeTest.java b/test/langtools/tools/javac/switchexpr/VerifierErrorWrongSuperTypeTest.java
new file mode 100644
index 00000000000..115bf8980b0
--- /dev/null
+++ b/test/langtools/tools/javac/switchexpr/VerifierErrorWrongSuperTypeTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary VerifyError after JDK-8369654, incorrect supertype
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.compiler/com.sun.tools.javac.code
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main VerifierErrorWrongSuperTypeTest
+ */
+
+import java.util.*;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+import toolbox.JavaTask;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.Task.OutputKind;
+
+public class VerifierErrorWrongSuperTypeTest extends TestRunner {
+    ToolBox tb;
+
+    VerifierErrorWrongSuperTypeTest() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    protected void runTests() throws Exception {
+        runTests(m -> new Object[]{Paths.get(m.getName())});
+    }
+
+    Path[] findJavaFiles(Path... paths) throws IOException {
+        return tb.findJavaFiles(paths);
+    }
+
+    public static void main(String... args) throws Exception {
+        VerifierErrorWrongSuperTypeTest t = new VerifierErrorWrongSuperTypeTest();
+        t.runTests();
+    }
+
+    @Test
+    public void testCompatibilityAfterMakingSuperclassSealed(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path pkg = src.resolve("p");
+        Path v = pkg.resolve("V");
+        tb.writeJavaFiles(v,
+                """
+                package p;
+                public abstract class V {}
+                """
+        );
+        Path d = pkg.resolve("D");
+        tb.writeJavaFiles(d,
+                """
+                package p;
+                public abstract class D extends V implements Cloneable {}
+                """
+        );
+        Path a = pkg.resolve("A");
+        tb.writeJavaFiles(a,
+                """
+                package p;
+                public class A extends V implements Cloneable {}
+                """
+        );
+        Path t = src.resolve("T");
+        tb.writeJavaFiles(t,
+                """
+                import p.A;
+                import p.D;
+                import p.V;
+                class T {
+                    public static void main(String[] args) {
+                        new T().foo(false, null);
+                    }
+                    void foo(boolean b, D d) {
+                        V u = b ? d : new A();
+                        g(u);
+                    }
+                    void g(V u) {}
+                }
+                """
+        );
+        Path out = base.resolve("out");
+        Files.createDirectories(out);
+        new JavacTask(tb)
+                .outdir(out)
+                .files(findJavaFiles(src))
+                .run();
+
+        try {
+            new JavaTask(tb)
+                    .classpath(out.toString())
+                    .classArgs("T")
+                    .run();
+        } catch (Throwable error) {
+            throw new AssertionError("execution failed");
+        }
+    }
+}

From bfc048aba6391d52c07d9a5146466b47d2f6fed8 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 13 Nov 2025 16:26:17 +0000
Subject: [PATCH 156/512] 8371608: Jtreg test 
 jdk/internal/vm/Continuation/Fuzz.java sometimes fails with (fast)debug
 binaries

Reviewed-by: mdoerr, rrich
---
 test/jdk/jdk/internal/vm/Continuation/Fuzz.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
index 8d522cc83e1..49d86099dc7 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
@@ -96,6 +96,9 @@ public class Fuzz implements Runnable {
         if (Platform.isPPC()) {
             COMPILATION_TIMEOUT = COMPILATION_TIMEOUT * 2;
         }
+        if (Platform.isDebugBuild()) {
+            COMPILATION_TIMEOUT = COMPILATION_TIMEOUT * 2;
+        }
         warmup();
         for (int compileLevel : new int[]{4}) {
             for (boolean compileRun : new boolean[]{true}) {

From 2199b5fef4540ae8da77c5c4feafc8822a3d9d3d Mon Sep 17 00:00:00 2001
From: Rui Li <ruiamzn@amazon.com>
Date: Thu, 13 Nov 2025 18:01:58 +0000
Subject: [PATCH 157/512] 8371381: [Shenandoah] Setting ergo flags should use
 FLAG_SET_ERGO

Reviewed-by: xpeng, wkemper, ysr, cslucas
---
 .../share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp | 6 +++---
 .../share/gc/shenandoah/mode/shenandoahPassiveMode.cpp      | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
index 6e3062d158f..3cd2cb1d171 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
@@ -36,7 +36,7 @@
   do {                                                                      \
     if (FLAG_IS_DEFAULT(name) && (name)) {                                  \
       log_info(gc)("Heuristics ergonomically sets -XX:-" #name);            \
-      FLAG_SET_DEFAULT(name, false);                                        \
+      FLAG_SET_ERGO(name, false);                                           \
     }                                                                       \
   } while (0)
 
@@ -44,7 +44,7 @@
   do {                                                                      \
     if (FLAG_IS_DEFAULT(name) && !(name)) {                                 \
       log_info(gc)("Heuristics ergonomically sets -XX:+" #name);            \
-      FLAG_SET_DEFAULT(name, true);                                         \
+      FLAG_SET_ERGO(name, true);                                            \
     }                                                                       \
   } while (0)
 
@@ -52,7 +52,7 @@
   do {                                                                      \
     if (FLAG_IS_DEFAULT(name)) {                                            \
       log_info(gc)("Heuristics ergonomically sets -XX:" #name "=" #value);  \
-      FLAG_SET_DEFAULT(name, value);                                        \
+      FLAG_SET_ERGO(name, value);                                           \
     }                                                                       \
   } while (0)
 
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
index 4c0bc209d78..41b2703730b 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
+#include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 
 void ShenandoahPassiveMode::initialize_flags() const {
@@ -38,7 +39,10 @@ void ShenandoahPassiveMode::initialize_flags() const {
 
   // No need for evacuation reserve with Full GC, only for Degenerated GC.
   if (!ShenandoahDegeneratedGC) {
-    SHENANDOAH_ERGO_OVERRIDE_DEFAULT(ShenandoahEvacReserve, 0);
+    if (FLAG_IS_DEFAULT(ShenandoahEvacReserve)) {
+      log_info(gc)("Heuristics sets -XX:ShenandoahEvacReserve=0");
+      FLAG_SET_DEFAULT(ShenandoahEvacReserve, 0);
+    }
   }
 
   // Disable known barriers by default.

From d09a8cb81b70a6c51ef5599bee04f1445a48e63f Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 13 Nov 2025 18:39:49 +0000
Subject: [PATCH 158/512] 8371746: Some imports in Integer.java and Long.java
 became unused after JDK-8370503

Reviewed-by: liach, darcy, iris
---
 src/java.base/share/classes/java/lang/Integer.java | 2 --
 src/java.base/share/classes/java/lang/Long.java    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index 20d1edb6d5f..2742ec40abf 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -41,8 +41,6 @@ import java.util.Optional;
 
 import static java.lang.Character.digit;
 import static java.lang.String.COMPACT_STRINGS;
-import static java.lang.String.LATIN1;
-import static java.lang.String.UTF16;
 
 /**
  * The {@code Integer} class is the {@linkplain
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index b0477fdab6d..3077e7c0a38 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -41,8 +41,6 @@ import jdk.internal.vm.annotation.Stable;
 
 import static java.lang.Character.digit;
 import static java.lang.String.COMPACT_STRINGS;
-import static java.lang.String.LATIN1;
-import static java.lang.String.UTF16;
 
 /**
  * The {@code Long} class is the {@linkplain

From db3a8386d482c161c45fae1689826bd53709f11f Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 13 Nov 2025 18:59:34 +0000
Subject: [PATCH 159/512] 8371436: (fs) java/nio/file/FileStore/Basic.java
 fails on macOS platform due to assertTrue(!store.equals(prev));

Reviewed-by: alanb
---
 .../macosx/native/libnio/fs/BsdNativeDispatcher.c    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c b/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c
index 8776411be07..7a9e92d6fa9 100644
--- a/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c
+++ b/src/java.base/macosx/native/libnio/fs/BsdNativeDispatcher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,7 @@ static jfieldID entry_name;
 static jfieldID entry_dir;
 static jfieldID entry_fstype;
 static jfieldID entry_options;
+static jfieldID entry_dev;
 
 struct fsstat_iter {
     struct statfs *buf;
@@ -85,6 +86,8 @@ Java_sun_nio_fs_BsdNativeDispatcher_initIDs(JNIEnv* env, jclass this)
     CHECK_NULL(entry_fstype);
     entry_options = (*env)->GetFieldID(env, clazz, "opts", "[B");
     CHECK_NULL(entry_options);
+    entry_dev = (*env)->GetFieldID(env, clazz, "dev", "J");
+    CHECK_NULL(entry_dev);
 }
 
 JNIEXPORT jlong JNICALL
@@ -151,6 +154,8 @@ Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry(JNIEnv* env, jclass this,
     char* dir;
     char* fstype;
     char* options;
+    int32_t fsid_val[2];
+    long dev;
 
     if (iter == NULL || iter->pos >= iter->nentries)
        return -1;
@@ -162,6 +167,8 @@ Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry(JNIEnv* env, jclass this,
         options="ro";
     else
         options="";
+    fsid_val[0] = iter->buf[iter->pos].f_fsid.val[0];
+    fsid_val[1] = iter->buf[iter->pos].f_fsid.val[1];
 
     iter->pos++;
 
@@ -193,6 +200,9 @@ Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry(JNIEnv* env, jclass this,
     (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)options);
     (*env)->SetObjectField(env, entry, entry_options, bytes);
 
+    dev = (((long)fsid_val[1]) << 32) | (long)fsid_val[0];
+    (*env)->SetLongField(env, entry, entry_dev, long_to_jlong(dev));
+
     return 0;
 }
 

From 6322aaba63b235cb6c73d23a932210af318404ec Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Thu, 13 Nov 2025 19:08:35 +0000
Subject: [PATCH 160/512] 8371821: Duplicate export of jdk.internal.util to
 java.net.http

Reviewed-by: naoto, alanb
---
 src/java.base/share/classes/module-info.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 3ae84fdf198..70a79390828 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -262,7 +262,6 @@ module java.base {
         jdk.jfr;
     exports jdk.internal.util to
         java.desktop,
-        java.net.http,
         java.prefs,
         java.security.jgss,
         java.smartcardio,

From 155d7df555fcebc318db89408ef0fffbd95414a0 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Thu, 13 Nov 2025 23:54:07 +0000
Subject: [PATCH 161/512] 8371749: New test
 serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/TestAllocatingInVMDeath.java
 fails with -Xcheck:jni

Reviewed-by: sspitsyn, amenkov, cjplummer
---
 .../AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp
index 5f46d69afa1..93d66bc38bc 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/VMDeath/AllocatingInVMDeath/libTestAllocatingInVMDeath.cpp
@@ -37,6 +37,10 @@ cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) {
     fatal(jni, "Can't find upCall method.");
   }
   jni->CallStaticObjectMethod(clz, mid);
+  if (jni->ExceptionOccurred()) {
+    jni->ExceptionDescribe();
+    fatal(jni, "cbVMDeath: unexpected exception occurred in Java upcall method.");
+  }
 }
 
 JNIEXPORT jint JNICALL

From 0d8b5188bb4315be3c63898a2ce4e68dd2bd4481 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 14 Nov 2025 01:07:05 +0000
Subject: [PATCH 162/512] 8364560: The default value of --linux-menu-group
 option is invalid 8356574: Test --linux-menu-group option

Reviewed-by: almatvee
---
 .../internal/LinuxPackageBuilder.java         | 10 ++++----
 .../internal/model/LinuxPackageMixin.java     | 15 +++++++++++-
 .../resources/LinuxResources.properties       |  1 -
 .../jdk/jpackage/test/LinuxHelper.java        |  3 ++-
 .../jpackage/linux/ShortcutHintTest.java      | 24 +++++++++++++++----
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
index cc00d7816f5..4cfb8a26c8f 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
@@ -84,9 +84,9 @@ final class LinuxPackageBuilder {
     private LinuxPackage create(Package pkg) throws ConfigException {
         return LinuxPackage.create(pkg, new LinuxPackageMixin.Stub(
                 Optional.ofNullable(menuGroupName).orElseGet(DEFAULTS::menuGroupName),
-                Optional.ofNullable(category),
+                category(),
                 Optional.ofNullable(additionalDependencies),
-                Optional.ofNullable(release),
+                release(),
                 pkg.asStandardPackageType().map(LinuxPackageArch::getValue).orElseThrow()));
     }
 
@@ -192,7 +192,7 @@ final class LinuxPackageBuilder {
 
     private final PackageBuilder pkgBuilder;
 
-    private static final Defaults DEFAULTS = new Defaults(I18N.getString(
-            "param.menu-group.default"));
-
+    // Should be one of https://specifications.freedesktop.org/menu/latest/category-registry.html#main-category-registry
+    // The category is an ID, not a localizable string
+    private static final Defaults DEFAULTS = new Defaults("Utility");
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
index 5bcf57194f6..056e3b89527 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
@@ -34,6 +34,12 @@ public interface LinuxPackageMixin {
     /**
      * Gets the name of the start menu group where to create shortcuts for
      * application launchers of this package.
+     * <p>
+     * It sets the value of the "Categories" property in .desktop files of the
+     * package.
+     * <p>
+     * Should be one of the values from <a href=
+     * "https://specifications.freedesktop.org/menu/latest/category-registry.html">https://specifications.freedesktop.org/menu/latest/category-registry.html</a>
      *
      * @return the name of the start menu group where to create shortcuts for
      *         application launchers of this package
@@ -44,6 +50,13 @@ public interface LinuxPackageMixin {
 
     /**
      * Gets the category of this package.
+     * <p>
+     * For RPM packages this is the value of the optional "Group" property.
+     * <p>
+     * For DEB packages this is the value of the mandatory "Section" property.
+     * <a href=
+     * "https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections">The
+     * present list of recognized values.</a>
      *
      * @return the category of this package
      */
@@ -62,7 +75,7 @@ public interface LinuxPackageMixin {
      * Gets the release of this package. Returns an empty {@link Optional} instance
      * if this package doesn't have a release.
      * <p>
-     * For RPM packages, this is the value of a "Release" property in spec file. RPM
+     * For RPM packages, this is the value of the "Release" property in spec file. RPM
      * packages always have a release.
      * <p>
      * For DEB packages, this is an optional {@code debian_revision} component of a
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
index fbc83ba2e10..a732d02c7d1 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
@@ -28,7 +28,6 @@ deb.bundler.name=DEB Bundle
 rpm.bundler.name=RPM Bundle
 
 param.license-type.default=Unknown
-param.menu-group.default=Unknown
 
 resource.deb-control-file=DEB control file
 resource.deb-preinstall-script=DEB preinstall script
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
index 25358e8ecdc..e795f7c9760 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -564,7 +564,8 @@ public final class LinuxHelper {
         for (var e : List.of(
                 Map.entry("Type", "Application"),
                 Map.entry("Terminal", "false"),
-                Map.entry("Comment", launcherDescription)
+                Map.entry("Comment", launcherDescription),
+                Map.entry("Categories", Optional.ofNullable(cmd.getArgumentValue("--linux-menu-group")).orElse("Utility"))
         )) {
             String key = e.getKey();
             TKit.assertEquals(e.getValue(), data.find(key).orElseThrow(), String.format(
diff --git a/test/jdk/tools/jpackage/linux/ShortcutHintTest.java b/test/jdk/tools/jpackage/linux/ShortcutHintTest.java
index 8d373cb2b86..2591d1d393a 100644
--- a/test/jdk/tools/jpackage/linux/ShortcutHintTest.java
+++ b/test/jdk/tools/jpackage/linux/ShortcutHintTest.java
@@ -26,13 +26,15 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import jdk.jpackage.test.AdditionalLauncher;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.FileAssociations;
-import jdk.jpackage.test.PackageType;
-import jdk.jpackage.test.PackageTest;
-import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.LinuxHelper;
-import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
 
 /**
  * Test --linux-shortcut parameter. Output of the test should be
@@ -179,4 +181,18 @@ public class ShortcutHintTest {
                     .apply(Files.readAllLines(desktopFile));
         }).run();
     }
+
+    /**
+     * Test "--linux-menu-group" option.
+     *
+     * @param menuGroup value of "--linux-menu-group" option
+     */
+    @Test
+    // Values from https://specifications.freedesktop.org/menu/latest/category-registry.html#main-category-registry
+    @Parameter("Development")
+    public static void testMenuGroup(String menuGroup) {
+        createTest().addInitializer(JPackageCommand::setFakeRuntime).addInitializer(cmd -> {
+            cmd.addArgument("--linux-shortcut").setArgumentValue("--linux-menu-group", menuGroup);
+        }).run(Action.CREATE_AND_UNPACK);
+    }
 }

From eaddefb475c6431821c2d62baf550ba2c5f357bf Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Fri, 14 Nov 2025 01:10:11 +0000
Subject: [PATCH 163/512] 8371753: compiler/c2/cr7200264/TestIntVect.java fails
 IR verification

Reviewed-by: chagedorn, fjiang
---
 .../compiler/c2/cr7200264/TestIntVect.java    | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
index 76c33ec1b07..3df6f956b0f 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
@@ -413,7 +413,8 @@ public class TestIntVect {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_I,     "> 0",
                    IRNode.ADD_REDUCTION_VI,  "> 0",
-                   IRNode.ADD_VI,            "> 0" })
+                   IRNode.ADD_VI,            "> 0" },
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     // The reduction is moved outside the loop, and we use a
     // element-wise accumulator inside the loop.
     int test_sum(int[] a1) {
@@ -426,7 +427,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.ADD_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_addc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]+VALUE);
@@ -435,7 +436,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.ADD_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_addv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]+b);
@@ -444,7 +445,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.ADD_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_adda(int[] a0, int[] a1, int[] a2) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]+a2[i]);
@@ -453,7 +454,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.ADD_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_subc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]-VALUE);
@@ -462,7 +463,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.SUB_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_subv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]-b);
@@ -471,7 +472,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.SUB_VI, "> 0", },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_suba(int[] a0, int[] a1, int[] a2) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]-a2[i]);
@@ -498,7 +499,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.MUL_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     void test_mulv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]*b);
@@ -507,7 +508,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.MUL_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     void test_mula(int[] a0, int[] a1, int[] a2) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]*a2[i]);
@@ -580,7 +581,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.AND_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_andc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]&BIT_MASK);
@@ -589,7 +590,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.AND_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_andv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]&b);
@@ -598,7 +599,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.AND_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_anda(int[] a0, int[] a1, int[] a2) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]&a2[i]);
@@ -607,7 +608,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.OR_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_orc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]|BIT_MASK);
@@ -616,7 +617,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.OR_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_orv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]|b);
@@ -625,7 +626,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.OR_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_ora(int[] a0, int[] a1, int[] a2) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]|a2[i]);
@@ -634,7 +635,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.XOR_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_xorc(int[] a0, int[] a1) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]^BIT_MASK);
@@ -643,7 +644,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.XOR_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_xorv(int[] a0, int[] a1, int b) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]^b);
@@ -652,7 +653,7 @@ public class TestIntVect {
 
     @Test
     @IR(counts = { IRNode.XOR_VI, "> 0" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"})
     void test_xora(int[] a0, int[] a1, int[] a2) {
         for (int i = 0; i < a0.length; i+=1) {
             a0[i] = (int)(a1[i]^a2[i]);

From 7733632f90a17ec848c4c9259c1aa58fded8c15a Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 14 Nov 2025 02:08:45 +0000
Subject: [PATCH 164/512] 8369206: jpackage should not set R/O permission on
 app launchers

Reviewed-by: almatvee
---
 .../internal/ExecutableRebrander.java         | 69 +++++++++----------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
index 913a44dbe18..05b87e6f449 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
@@ -120,46 +120,41 @@ final class ExecutableRebrander {
             List<UpdateResourceAction> actions) throws IOException {
         Objects.requireNonNull(actions);
         actions.forEach(Objects::requireNonNull);
+
+        String tempDirectory = env.buildRoot().toAbsolutePath().toString();
+        if (WindowsDefender.isThereAPotentialWindowsDefenderIssue(tempDirectory)) {
+            Log.verbose(I18N.format("message.potential.windows.defender.issue", tempDirectory));
+        }
+
+        var shortTargetPath = ShortPathUtils.toShortPath(target);
+        long resourceLock = lockResource(shortTargetPath.orElse(target).toString());
+        if (resourceLock == 0) {
+            throw I18N.buildException().message("error.lock-resource", shortTargetPath.orElse(target)).create(RuntimeException::new);
+        }
+
+        final boolean resourceUnlockedSuccess;
         try {
-            String tempDirectory = env.buildRoot().toAbsolutePath().toString();
-            if (WindowsDefender.isThereAPotentialWindowsDefenderIssue(tempDirectory)) {
-                Log.verbose(I18N.format("message.potential.windows.defender.issue", tempDirectory));
-            }
-
-            target.toFile().setWritable(true, true);
-
-            var shortTargetPath = ShortPathUtils.toShortPath(target);
-            long resourceLock = lockResource(shortTargetPath.orElse(target).toString());
-            if (resourceLock == 0) {
-                throw I18N.buildException().message("error.lock-resource", shortTargetPath.orElse(target)).create(RuntimeException::new);
-            }
-
-            final boolean resourceUnlockedSuccess;
-            try {
-                for (var action : actions) {
-                    action.editResource(resourceLock);
-                }
-            } finally {
-                if (resourceLock == 0) {
-                    resourceUnlockedSuccess = true;
-                } else {
-                    resourceUnlockedSuccess = unlockResource(resourceLock);
-                    if (shortTargetPath.isPresent()) {
-                        // Windows will rename the excuatble in the unlock operation.
-                        // Should restore executable's name.
-                        var tmpPath = target.getParent().resolve(
-                                target.getFileName().toString() + ".restore");
-                        Files.move(shortTargetPath.get(), tmpPath);
-                        Files.move(tmpPath, target);
-                    }
-                }
-            }
-
-            if (!resourceUnlockedSuccess) {
-                throw I18N.buildException().message("error.unlock-resource", target).create(RuntimeException::new);
+            for (var action : actions) {
+                action.editResource(resourceLock);
             }
         } finally {
-            target.toFile().setReadOnly();
+            if (resourceLock == 0) {
+                resourceUnlockedSuccess = true;
+            } else {
+                resourceUnlockedSuccess = unlockResource(resourceLock);
+                if (shortTargetPath.isPresent()) {
+                    // Windows will rename the executable in the unlock operation.
+                    // Should restore executable's name.
+                    var tmpPath = target.getParent().resolve(
+                            target.getFileName().toString() + ".restore");
+                    Files.move(shortTargetPath.get(), tmpPath);
+                    Files.move(tmpPath, target);
+                }
+            }
+        }
+
+        if (!resourceUnlockedSuccess) {
+            throw I18N.buildException().message("error.unlock-resource", target).create(RuntimeException::new);
         }
     }
 

From 1baf5164d6a9077e0c440b7b78be6424a052f8a9 Mon Sep 17 00:00:00 2001
From: Daniel Skantz <dskantz@openjdk.org>
Date: Fri, 14 Nov 2025 07:09:05 +0000
Subject: [PATCH 165/512] 8371628: C2: add a test case for the arraycopy
 changes in JDK-8297933

Reviewed-by: rcastanedalo, shade
---
 .../compiler/arraycopy/TestACSameSrcDst.java      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestACSameSrcDst.java b/test/hotspot/jtreg/compiler/arraycopy/TestACSameSrcDst.java
index f85bcf27d74..93b9fead584 100644
--- a/test/hotspot/jtreg/compiler/arraycopy/TestACSameSrcDst.java
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestACSameSrcDst.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +24,7 @@
 
 /**
  * @test
- * @bug 8179678
+ * @bug 8179678 8297933 8371628
  * @summary ArrayCopy with same src and dst can cause incorrect execution or compiler crash
  *
  * @run main/othervm -XX:CompileCommand=compileonly,TestACSameSrcDst::test* TestACSameSrcDst
@@ -76,6 +77,17 @@ public class TestACSameSrcDst {
         return 0;
     }
 
+    static void test6(int x) {
+        int[] src = new int[10];
+        int l = 0;
+        while (l < 1) { l++; } // Delay folding.
+        // The bug relies on idealizations of ArrayCopy source and destination offsets but this would be limited if carried out before IGVN.
+
+        System.arraycopy(src, x + 1, src, x + 1, l);
+        // source and destination offsets are a shared AddNode that would go away during LShiftL idealization
+        // -- causing a crash if not for a hook node retaining its liveness.
+    }
+
     public static void main(String[] args) {
         int[] array = new int[15];
         for (int i = 0; i < 20000; i++) {
@@ -101,6 +113,7 @@ public class TestACSameSrcDst {
             if (res != 0) {
                 throw new RuntimeException("bad result: " + res + " != " + 0);
             }
+            test6(0);
         }
     }
 }

From 0829c6acde496833300efb38b4b900bf94b99dc0 Mon Sep 17 00:00:00 2001
From: Anton Seoane Ampudia <aseoane@openjdk.org>
Date: Fri, 14 Nov 2025 07:25:44 +0000
Subject: [PATCH 166/512] 8356761: IGV: dump escape analysis information

Reviewed-by: rcastanedalo, chagedorn
---
 src/hotspot/share/opto/escape.cpp             | 41 +++++++++++++--
 src/hotspot/share/opto/escape.hpp             |  6 ++-
 src/hotspot/share/opto/idealGraphPrinter.cpp  | 38 ++++++++++++++
 src/hotspot/share/opto/idealGraphPrinter.hpp  |  3 ++
 src/hotspot/share/opto/phasetype.hpp          | 17 +++++++
 .../filters/colorEscapeAnalysis.filter        | 51 +++++++++++++++++++
 .../showConnectionGraphNodesOnly.filter       |  6 +++
 .../filters/showConnectionInfo.filter         | 16 ++++++
 .../sun/hotspot/igv/servercompiler/layer.xml  | 14 ++++-
 .../lib/ir_framework/CompilePhase.java        | 17 +++++++
 10 files changed, 204 insertions(+), 5 deletions(-)
 create mode 100644 src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/colorEscapeAnalysis.filter
 create mode 100644 src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionGraphNodesOnly.filter
 create mode 100644 src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionInfo.filter

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 61aa009361f..fb3b5dba42c 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -114,11 +114,13 @@ void ConnectionGraph::do_analysis(Compile *C, PhaseIterGVN *igvn) {
     invocation = C->congraph()->_invocation + 1;
   }
   ConnectionGraph* congraph = new(C->comp_arena()) ConnectionGraph(C, igvn, invocation);
+  NOT_PRODUCT(if (C->should_print_igv(/* Any level */ 1)) C->igv_printer()->set_congraph(congraph);)
   // Perform escape analysis
   if (congraph->compute_escape()) {
     // There are non escaping objects.
     C->set_congraph(congraph);
   }
+  NOT_PRODUCT(if (C->should_print_igv(/* Any level */ 1)) C->igv_printer()->set_congraph(nullptr);)
   // Cleanup.
   if (oop_null->outcnt() == 0) {
     igvn->hash_delete(oop_null);
@@ -126,6 +128,8 @@ void ConnectionGraph::do_analysis(Compile *C, PhaseIterGVN *igvn) {
   if (noop_null->outcnt() == 0) {
     igvn->hash_delete(noop_null);
   }
+
+  C->print_method(PHASE_AFTER_EA, 2);
 }
 
 bool ConnectionGraph::compute_escape() {
@@ -281,6 +285,8 @@ bool ConnectionGraph::compute_escape() {
     return false;
   }
 
+  _compile->print_method(PHASE_EA_AFTER_INITIAL_CONGRAPH, 4);
+
   // 2. Finish Graph construction by propagating references to all
   //    java objects through graph.
   if (!complete_connection_graph(ptnodes_worklist, non_escaped_allocs_worklist,
@@ -291,6 +297,8 @@ bool ConnectionGraph::compute_escape() {
     return false;
   }
 
+  _compile->print_method(PHASE_EA_AFTER_COMPLETE_CONGRAPH, 4);
+
   // 3. Adjust scalar_replaceable state of nonescaping objects and push
   //    scalar replaceable allocations on alloc_worklist for processing
   //    in split_unique_types().
@@ -312,6 +320,7 @@ bool ConnectionGraph::compute_escape() {
         found_nsr_alloc = true;
       }
     }
+    _compile->print_method(PHASE_EA_ADJUST_SCALAR_REPLACEABLE_ITER, 6, n);
   }
 
   // Propagate NSR (Not Scalar Replaceable) state.
@@ -350,6 +359,7 @@ bool ConnectionGraph::compute_escape() {
 
   _collecting = false;
 
+  _compile->print_method(PHASE_EA_AFTER_PROPAGATE_NSR, 4);
   } // TracePhase t3("connectionGraph")
 
   // 4. Optimize ideal graph based on EA information.
@@ -387,6 +397,8 @@ bool ConnectionGraph::compute_escape() {
   }
 #endif
 
+  _compile->print_method(PHASE_EA_AFTER_GRAPH_OPTIMIZATION, 4);
+
   // 5. Separate memory graph for scalar replaceable allcations.
   bool has_scalar_replaceable_candidates = (alloc_worklist.length() > 0);
   if (has_scalar_replaceable_candidates && EliminateAllocations) {
@@ -398,7 +410,6 @@ bool ConnectionGraph::compute_escape() {
       NOT_PRODUCT(escape_state_statistics(java_objects_worklist);)
       return false;
     }
-    C->print_method(PHASE_AFTER_EA, 2);
 
 #ifdef ASSERT
   } else if (Verbose && (PrintEscapeAnalysis || PrintEliminateAllocations)) {
@@ -413,6 +424,8 @@ bool ConnectionGraph::compute_escape() {
 #endif
   }
 
+  _compile->print_method(PHASE_EA_AFTER_SPLIT_UNIQUE_TYPES, 4);
+
   // 6. Reduce allocation merges used as debug information. This is done after
   // split_unique_types because the methods used to create SafePointScalarObject
   // need to traverse the memory graph to find values for object fields. We also
@@ -454,6 +467,8 @@ bool ConnectionGraph::compute_escape() {
     }
   }
 
+  _compile->print_method(PHASE_EA_AFTER_REDUCE_PHI_ON_SAFEPOINTS, 4);
+
   NOT_PRODUCT(escape_state_statistics(java_objects_worklist);)
   return has_non_escaping_obj;
 }
@@ -1302,11 +1317,14 @@ void ConnectionGraph::reduce_phi(PhiNode* ophi, GrowableArray<Node*> &alloc_work
     }
   }
 
+  _compile->print_method(PHASE_EA_BEFORE_PHI_REDUCTION, 5, ophi);
+
   // CastPPs need to be processed before Cmps because during the process of
   // splitting CastPPs we make reference to the inputs of the Cmp that is used
   // by the If controlling the CastPP.
   for (uint i = 0; i < castpps.size(); i++) {
     reduce_phi_on_castpp_field_load(castpps.at(i), alloc_worklist);
+    _compile->print_method(PHASE_EA_AFTER_PHI_CASTPP_REDUCTION, 6, castpps.at(i));
   }
 
   for (uint i = 0; i < others.size(); i++) {
@@ -1314,8 +1332,10 @@ void ConnectionGraph::reduce_phi(PhiNode* ophi, GrowableArray<Node*> &alloc_work
 
     if (use->is_AddP()) {
       reduce_phi_on_field_access(use, alloc_worklist);
+      _compile->print_method(PHASE_EA_AFTER_PHI_ADDP_REDUCTION, 6, use);
     } else if(use->is_Cmp()) {
       reduce_phi_on_cmp(use);
+      _compile->print_method(PHASE_EA_AFTER_PHI_CMP_REDUCTION, 6, use);
     }
   }
 
@@ -2417,6 +2437,7 @@ bool ConnectionGraph::complete_connection_graph(
         timeout = true;
         break;
       }
+      _compile->print_method(PHASE_EA_COMPLETE_CONNECTION_GRAPH_ITER, 5);
     }
     if ((iterations < GRAPH_BUILD_ITER_LIMIT) && !timeout) {
       time.start();
@@ -2490,7 +2511,8 @@ bool ConnectionGraph::complete_connection_graph(
 // Propagate GlobalEscape and ArgEscape escape states to all nodes
 // and check that we still have non-escaping java objects.
 bool ConnectionGraph::find_non_escaped_objects(GrowableArray<PointsToNode*>& ptnodes_worklist,
-                                               GrowableArray<JavaObjectNode*>& non_escaped_allocs_worklist) {
+                                               GrowableArray<JavaObjectNode*>& non_escaped_allocs_worklist,
+                                               bool print_method) {
   GrowableArray<PointsToNode*> escape_worklist;
   // First, put all nodes with GlobalEscape and ArgEscape states on worklist.
   int ptnodes_length = ptnodes_worklist.length();
@@ -2550,6 +2572,9 @@ bool ConnectionGraph::find_non_escaped_objects(GrowableArray<PointsToNode*>& ptn
           escape_worklist.push(e);
         }
       }
+      if (print_method) {
+        _compile->print_method(PHASE_EA_CONNECTION_GRAPH_PROPAGATE_ITER, 6, e->ideal_node());
+      }
     }
   }
   // Remove escaped objects from non_escaped list.
@@ -3137,6 +3162,7 @@ void ConnectionGraph::find_scalar_replaceable_allocs(GrowableArray<JavaObjectNod
             break;
           }
         }
+        _compile->print_method(PHASE_EA_PROPAGATE_NSR_ITER, 5, jobj->ideal_node());
       }
     }
   }
@@ -3159,7 +3185,7 @@ void ConnectionGraph::verify_connection_graph(
   assert(new_edges == 0, "graph was not complete");
   // Verify that escape state is final.
   int length = non_escaped_allocs_worklist.length();
-  find_non_escaped_objects(ptnodes_worklist, non_escaped_allocs_worklist);
+  find_non_escaped_objects(ptnodes_worklist, non_escaped_allocs_worklist, /*print_method=*/ false);
   assert((non_escaped_length == non_escaped_allocs_worklist.length()) &&
          (non_escaped_length == length) &&
          (_worklist.length() == 0), "escape state was not final");
@@ -4720,6 +4746,8 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
   // New alias types were created in split_AddP().
   uint new_index_end = (uint) _compile->num_alias_types();
 
+  _compile->print_method(PHASE_EA_AFTER_SPLIT_UNIQUE_TYPES_1, 5);
+
   //  Phase 2:  Process MemNode's from memnode_worklist. compute new address type and
   //            compute new values for Memory inputs  (the Memory inputs are not
   //            actually updated until phase 4.)
@@ -4920,6 +4948,8 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
     record_for_optimizer(nmm);
   }
 
+  _compile->print_method(PHASE_EA_AFTER_SPLIT_UNIQUE_TYPES_3, 5);
+
   //  Phase 4:  Update the inputs of non-instance memory Phis and
   //            the Memory input of memnodes
   // First update the inputs of any non-instance Phi's from
@@ -4988,6 +5018,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
     assert(old_cnt == old_mem->outcnt(), "old mem could be lost");
   }
 #endif
+  _compile->print_method(PHASE_EA_AFTER_SPLIT_UNIQUE_TYPES_4, 5);
 }
 
 #ifndef PRODUCT
@@ -5010,6 +5041,10 @@ static const char *esc_names[] = {
   "GlobalEscape"
 };
 
+const char* PointsToNode::esc_name() const {
+  return esc_names[(int)escape_state()];
+}
+
 void PointsToNode::dump_header(bool print_state, outputStream* out) const {
   NodeType nt = node_type();
   out->print("%s(%d) ", node_type_names[(int) nt], _pidx);
diff --git a/src/hotspot/share/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp
index 77d14525383..eea6403acdd 100644
--- a/src/hotspot/share/opto/escape.hpp
+++ b/src/hotspot/share/opto/escape.hpp
@@ -26,6 +26,7 @@
 #define SHARE_OPTO_ESCAPE_HPP
 
 #include "opto/addnode.hpp"
+#include "opto/idealGraphPrinter.hpp"
 #include "opto/node.hpp"
 #include "utilities/growableArray.hpp"
 
@@ -235,6 +236,7 @@ public:
   NodeType node_type() const { return (NodeType)_type;}
   void dump(bool print_state=true, outputStream* out=tty, bool newline=true) const;
   void dump_header(bool print_state=true, outputStream* out=tty) const;
+  const char* esc_name() const;
 #endif
 
 };
@@ -321,6 +323,7 @@ public:
 class ConnectionGraph: public ArenaObj {
   friend class PointsToNode; // to access _compile
   friend class FieldNode;
+  friend class IdealGraphPrinter;
 private:
   GrowableArray<PointsToNode*>  _nodes; // Map from ideal nodes to
                                         // ConnectionGraph nodes.
@@ -467,7 +470,8 @@ private:
   // Propagate GlobalEscape and ArgEscape escape states to all nodes
   // and check that we still have non-escaping java objects.
   bool find_non_escaped_objects(GrowableArray<PointsToNode*>& ptnodes_worklist,
-                                GrowableArray<JavaObjectNode*>& non_escaped_worklist);
+                                GrowableArray<JavaObjectNode*>& non_escaped_worklist,
+                                bool print_method = true);
 
   // Adjust scalar_replaceable state after Connection Graph is built.
   void adjust_scalar_replaceable_state(JavaObjectNode* jobj, Unique_Node_List &reducible_merges);
diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 2873c1ef9d7..6a738878a1b 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -24,6 +24,7 @@
 
 #include "memory/resourceArea.hpp"
 #include "opto/chaitin.hpp"
+#include "opto/escape.hpp"
 #include "opto/idealGraphPrinter.hpp"
 #include "opto/machnode.hpp"
 #include "opto/parse.hpp"
@@ -161,6 +162,7 @@ void IdealGraphPrinter::init(const char* file_name, bool use_multiple_files, boo
   _current_method = nullptr;
   _network_stream = nullptr;
   _append = append;
+  _congraph = nullptr;
   _parse = nullptr;
 
   if (file_name != nullptr) {
@@ -637,6 +639,29 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
       print_prop("is_block_start", "true");
     }
 
+    // Dump escape analysis state for relevant nodes.
+    if (node->is_Allocate()) {
+      AllocateNode* alloc = node->as_Allocate();
+      if (alloc->_is_scalar_replaceable) {
+        print_prop("is_scalar_replaceable", "true");
+      }
+      if (alloc->_is_non_escaping) {
+        print_prop("is_non_escaping", "true");
+      }
+      if (alloc->does_not_escape_thread()) {
+        print_prop("does_not_escape_thread", "true");
+      }
+    }
+    if (node->is_SafePoint() && node->as_SafePoint()->has_ea_local_in_scope()) {
+      print_prop("has_ea_local_in_scope", "true");
+    }
+    if (node->is_CallJava() && node->as_CallJava()->arg_escape()) {
+      print_prop("arg_escape", "true");
+    }
+    if (node->is_Initialize() && node->as_Initialize()->does_not_escape()) {
+      print_prop("does_not_escape", "true");
+    }
+
     const char *short_name = "short_name";
     if (strcmp(node->Name(), "Parm") == 0 && node->as_Proj()->_con >= TypeFunc::Parms) {
       int index = node->as_Proj()->_con - TypeFunc::Parms;
@@ -731,6 +756,19 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
       print_prop("lrg", lrg_id);
     }
 
+    if (_congraph != nullptr && node->_idx < _congraph->nodes_size()) {
+      PointsToNode* ptn = _congraph->ptnode_adr(node->_idx);
+      if (ptn != nullptr) {
+        stringStream node_head;
+        ptn->dump_header(false, &node_head);
+        print_prop("ea_node", node_head.freeze());
+        print_prop("escape_state", ptn->esc_name());
+        if (ptn->scalar_replaceable()) {
+          print_prop("scalar_replaceable", "true");
+        }
+      }
+    }
+
     if (node->is_MachSafePoint()) {
       const OopMap* oopmap = node->as_MachSafePoint()->oop_map();
       if (oopmap != nullptr) {
diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp
index df1c6b254d5..2159779ddfa 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp
@@ -42,6 +42,7 @@ class Node;
 class InlineTree;
 class ciMethod;
 class JVMState;
+class ConnectionGraph;
 class Parse;
 
 class IdealGraphPrinter : public CHeapObj<mtCompiler> {
@@ -116,6 +117,7 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   Compile *C;
   double _max_freq;
   bool _append;
+  ConnectionGraph* _congraph;
   const Parse* _parse;
 
   // Walk the native stack and print relevant C2 frames as IGV properties (if
@@ -165,6 +167,7 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   void end_method();
   void print_graph(const char* name, const frame* fr = nullptr);
   void print(const char* name, Node* root, GrowableArray<const Node*>& hidden_nodes, const frame* fr = nullptr);
+  void set_congraph(ConnectionGraph* congraph) { _congraph = congraph; }
   void set_compile(Compile* compile) {C = compile; }
   void update_compiled_method(ciMethod* current_method);
 };
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index f24938b51c1..f388dc6cdc6 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -50,6 +50,23 @@
   flags(ITER_GVN_AFTER_VECTOR,          "Iter GVN after Vector Box Elimination") \
   flags(BEFORE_LOOP_OPTS,               "Before Loop Optimizations") \
   flags(PHASEIDEAL_BEFORE_EA,           "PhaseIdealLoop before EA") \
+  flags(EA_AFTER_INITIAL_CONGRAPH,          "EA: 1. Intial Connection Graph") \
+  flags(EA_CONNECTION_GRAPH_PROPAGATE_ITER, "EA: 2. Connection Graph Propagate Iter") \
+  flags(EA_COMPLETE_CONNECTION_GRAPH_ITER,  "EA: 2. Complete Connection Graph Iter") \
+  flags(EA_AFTER_COMPLETE_CONGRAPH,         "EA: 2. Complete Connection Graph") \
+  flags(EA_ADJUST_SCALAR_REPLACEABLE_ITER,  "EA: 3. Adjust scalar_replaceable State Iter") \
+  flags(EA_PROPAGATE_NSR_ITER,              "EA: 3. Propagate NSR Iter") \
+  flags(EA_AFTER_PROPAGATE_NSR,             "EA: 3. Propagate NSR") \
+  flags(EA_AFTER_GRAPH_OPTIMIZATION,        "EA: 4. After Graph Optimization") \
+  flags(EA_AFTER_SPLIT_UNIQUE_TYPES_1,      "EA: 5. After split_unique_types Phase 1") \
+  flags(EA_AFTER_SPLIT_UNIQUE_TYPES_3,      "EA: 5. After split_unique_types Phase 3") \
+  flags(EA_AFTER_SPLIT_UNIQUE_TYPES_4,      "EA: 5. After split_unique_types Phase 4") \
+  flags(EA_AFTER_SPLIT_UNIQUE_TYPES,        "EA: 5. After split_unique_types") \
+  flags(EA_AFTER_REDUCE_PHI_ON_SAFEPOINTS,  "EA: 6. After reduce_phi_on_safepoints") \
+  flags(EA_BEFORE_PHI_REDUCTION,            "EA: 5. Before Phi Reduction") \
+  flags(EA_AFTER_PHI_CASTPP_REDUCTION,      "EA: 5. Phi -> CastPP Reduction") \
+  flags(EA_AFTER_PHI_ADDP_REDUCTION,        "EA: 5. Phi -> AddP Reduction") \
+  flags(EA_AFTER_PHI_CMP_REDUCTION,         "EA: 5. Phi -> Cmp Reduction") \
   flags(AFTER_EA,                       "After Escape Analysis") \
   flags(ITER_GVN_AFTER_EA,              "Iter GVN after EA") \
   flags(BEFORE_BEAUTIFY_LOOPS,          "Before Beautify Loops") \
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/colorEscapeAnalysis.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/colorEscapeAnalysis.filter
new file mode 100644
index 00000000000..2ef14f65110
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/colorEscapeAnalysis.filter
@@ -0,0 +1,51 @@
+// Color those nodes present in the escape analysis connection graph
+// to indicate the result of scape analysis.
+// This filter is relevant between the first EA phase and "After Macro
+// Expansion".
+
+var bestColor   = java.awt.Color.decode("#6aa84f"); // Green.
+var betterColor = java.awt.Color.decode("#f1c232"); // Yellow.
+var worseColor  = java.awt.Color.decode("#e69138"); // Orange.
+var worstColor  = java.awt.Color.decode("#cc0000"); // Red.
+
+// Apply first colors based on persistent node attributes
+
+// Object does not escape compilation unit and is scalar replaceable.
+colorize(and([hasProperty("is_non_escaping"),
+              hasProperty("is_scalar_replaceable")]),
+         bestColor);
+
+// Object does not escape compilation unit but is not scalar replaceable,
+// due to of scalar replacement limitations. We can at least elide locks.
+colorize(and([hasProperty("is_non_escaping"),
+              not(hasProperty("is_scalar_replaceable"))]),
+         betterColor);
+
+// Object may escape compilation unit but does not escape thread.
+// We can at least elide locks.
+colorize(and([hasProperty("does_not_escape_thread"),
+              not(hasProperty("is_non_escaping"))]),
+         worseColor);
+
+// Object may escape compilation unit and thread. Nothing to do.
+colorize(and([matches("name", "Allocate"),
+              not(hasProperty("is_non_escaping")),
+              not(hasProperty("does_not_escape_thread"))]),
+         worstColor);
+
+// Apply colors again based on connection graph-derived attributes
+
+colorize(and([matches("escape_state", "NoEscape"),
+              hasProperty("scalar_replaceable")]),
+         bestColor);
+
+colorize(and([matches("escape_state", "NoEscape"),
+              not(hasProperty("scalar_replaceable"))]),
+         betterColor);
+
+colorize(and([matches("escape_state", "ArgEscape"),
+              not(hasProperty("scalar_replaceable"))]),
+         worseColor);
+
+colorize(matches("escape_state", "GlobalEscape"),
+         worstColor);
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionGraphNodesOnly.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionGraphNodesOnly.filter
new file mode 100644
index 00000000000..b0986db221a
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionGraphNodesOnly.filter
@@ -0,0 +1,6 @@
+// This filter shows only the nodes that are present in the escape analysis
+// connection graph. This can be used to approximate the connection graph inside
+// IGV.
+// This filter is only relevant during the escape analysis phases.
+
+remove(not(hasProperty("ea_node")));
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionInfo.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionInfo.filter
new file mode 100644
index 00000000000..ca3509687f5
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showConnectionInfo.filter
@@ -0,0 +1,16 @@
+// This filter appends escape analysis connection graph node information to the
+// (possibly already existing) extra-label line.
+// This is only carried out for those nodes that are relevant to escape
+// analysis (and therefore represented in the connection graph).
+
+// Merge a possibly existing extra label with the escape analysis node type into a
+// new, single extra label.
+function mergeAndAppendTypeInfo(extra_label, ea_node) {
+  new_extra_label = extra_label == null ? "" : (extra_label + " ");
+  return new_extra_label + ea_node;
+}
+
+editProperty(hasProperty("ea_node"),
+             ["extra_label", "ea_node"],
+             "extra_label",
+             function(propertyValues) {return mergeAndAppendTypeInfo(propertyValues[0], propertyValues[1]);});
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml
index db4682f1cab..38dfc911a44 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml
@@ -85,9 +85,21 @@
             <attr name="enabled" boolvalue="false"/>
             <attr name="after" stringvalue="Hide uncommon trap blocks"/>
         </file>
+        <file name="Show connection graph info.js" url="filters/showConnectionInfo.filter">
+            <attr name="enabled" boolvalue="false"/>
+            <attr name="after" stringvalue="Hide exception blocks"/>
+        </file>
+        <file name="Show connection graph nodes only.js" url="filters/showConnectionGraphNodesOnly.filter">
+            <attr name="enabled" boolvalue="false"/>
+            <attr name="after" stringvalue="Show connection graph info"/>
+        </file>
+        <file name="Color by escape analysis state.js" url="filters/colorEscapeAnalysis.filter">
+            <attr name="enabled" boolvalue="false"/>
+            <attr name="after" stringvalue="Show connection graph nodes only"/>
+        </file>
         <file name="Color live ranges by allocation.js" url="filters/colorLiveRanges.filter">
             <attr name="enabled" boolvalue="true"/>
-            <attr name="after" stringvalue="Hide exception blocks"/>
+            <attr name="after" stringvalue="Color by escape analysis state"/>
         </file>
         <file name="Show liveness information.js" url="filters/showLiveness.filter">
             <attr name="enabled" boolvalue="false"/>
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
index 06b2afa8a67..a536808d269 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
@@ -60,6 +60,23 @@ public enum CompilePhase {
     ITER_GVN_AFTER_VECTOR(          "Iter GVN after Vector Box Elimination"),
     BEFORE_LOOP_OPTS(               "Before Loop Optimizations"),
     PHASEIDEAL_BEFORE_EA(           "PhaseIdealLoop before EA"),
+    EA_AFTER_INITIAL_CONGRAPH(         "EA: 1. Intial Connection Graph"),
+    EA_CONNECTION_GRAPH_PROPAGATE_ITER("EA: 2. Connection Graph Propagate Iter"),
+    EA_COMPLETE_CONNECTION_GRAPH_ITER( "EA: 2. Complete Connection Graph Iter"),
+    EA_AFTER_COMPLETE_CONGRAPH(        "EA: 2. Complete Connection Graph"),
+    EA_ADJUST_SCALAR_REPLACEABLE_ITER( "EA: 3. Adjust scalar_replaceable State Iter"),
+    EA_PROPAGATE_NSR_ITER(             "EA: 3. Propagate NSR Iter"),
+    EA_AFTER_PROPAGATE_NSR(            "EA: 3. Propagate NSR"),
+    EA_AFTER_GRAPH_OPTIMIZATION(       "EA: 4. After Graph Optimization"),
+    EA_AFTER_SPLIT_UNIQUE_TYPES_1(     "EA: 5. After split_unique_types Phase 1"),
+    EA_AFTER_SPLIT_UNIQUE_TYPES_3(     "EA: 5. After split_unique_types Phase 3"),
+    EA_AFTER_SPLIT_UNIQUE_TYPES_4(     "EA: 5. After split_unique_types Phase 4"),
+    EA_AFTER_SPLIT_UNIQUE_TYPES(       "EA: 5. After split_unique_types"),
+    EA_AFTER_REDUCE_PHI_ON_SAFEPOINTS( "EA: 6. After reduce_phi_on_safepoints"),
+    EA_BEFORE_PHI_REDUCTION(           "EA: 5. Before Phi Reduction"),
+    EA_AFTER_PHI_CASTPP_REDUCTION(     "EA: 5. Phi -> CastPP Reduction"),
+    EA_AFTER_PHI_ADDP_REDUCTION(       "EA: 5. Phi -> AddP Reduction"),
+    EA_AFTER_PHI_CMP_REDUCTION(        "EA: 5. Phi -> Cmp Reduction"),
     AFTER_EA(                       "After Escape Analysis"),
     ITER_GVN_AFTER_EA(              "Iter GVN after EA"),
     BEFORE_BEAUTIFY_LOOPS(          "Before Beautify Loops"),

From f4305923fb6203089fd13cf3387c81e127ae5fe2 Mon Sep 17 00:00:00 2001
From: Anton Seoane Ampudia <aseoane@openjdk.org>
Date: Fri, 14 Nov 2025 07:26:03 +0000
Subject: [PATCH 167/512] 8369002: Extract the
 loop->is_member(get_loop(get_ctrl(node))) pattern in a new function

Reviewed-by: bmaillard, rcastanedalo
---
 src/hotspot/share/opto/loopTransform.cpp | 12 +++++-----
 src/hotspot/share/opto/loopnode.cpp      | 10 ++++-----
 src/hotspot/share/opto/loopnode.hpp      | 12 +++++++---
 src/hotspot/share/opto/loopopts.cpp      | 28 ++++++++++--------------
 src/hotspot/share/opto/predicates.cpp    |  2 +-
 src/hotspot/share/opto/superword.cpp     |  3 +--
 6 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 9a21c7f5dda..31d1cbe0443 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -107,7 +107,7 @@ void IdealLoopTree::compute_trip_count(PhaseIdealLoop* phase, BasicType loop_bt)
   cl->set_nonexact_trip_count();
 
   // Loop's test should be part of loop.
-  if (!phase->is_member(this, phase->get_ctrl(cl->loopexit()->in(CountedLoopEndNode::TestValue))))
+  if (!phase->ctrl_is_member(this, cl->loopexit()->in(CountedLoopEndNode::TestValue)))
     return; // Infinite loop
 
 #ifdef ASSERT
@@ -611,7 +611,7 @@ void PhaseIdealLoop::peeled_dom_test_elim(IdealLoopTree* loop, Node_List& old_ne
       if (test_cond != nullptr && // Test?
           !test_cond->is_Con() && // And not already obvious?
           // And condition is not a member of this loop?
-          !loop->is_member(get_loop(get_ctrl(test_cond)))) {
+          !ctrl_is_member(loop, test_cond)) {
         // Walk loop body looking for instances of this test
         for (uint i = 0; i < loop->_body.size(); i++) {
           Node* n = loop->_body.at(i);
@@ -1682,7 +1682,7 @@ Node* PhaseIdealLoop::find_last_store_in_outer_loop(Node* store, const IdealLoop
     for (DUIterator_Fast imax, l = last->fast_outs(imax); l < imax; l++) {
       Node* use = last->fast_out(l);
       if (use->is_Store() && use->in(MemNode::Memory) == last) {
-        if (is_member(outer_loop, get_ctrl(use))) {
+        if (ctrl_is_member(outer_loop, use)) {
           assert(unique_next == last, "memory node should only have one usage in the loop body");
           unique_next = use;
         }
@@ -1795,7 +1795,7 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
       // as this is when we would normally expect a Phi as input. If the memory input
       // is in the loop body as well, then we can safely assume it is still correct as the entire
       // body was cloned as a unit
-      if (!is_member(outer_loop, get_ctrl(store->in(MemNode::Memory)))) {
+      if (!ctrl_is_member(outer_loop, store->in(MemNode::Memory))) {
         Node* mem_out = find_last_store_in_outer_loop(store, outer_loop);
         Node* store_new = old_new[store->_idx];
         store_new->set_req(MemNode::Memory, mem_out);
@@ -3285,7 +3285,7 @@ bool IdealLoopTree::empty_loop_candidate(PhaseIdealLoop* phase) const {
   if (!cl->is_valid_counted_loop(T_INT)) {
     return false;   // Malformed loop
   }
-  if (!phase->is_member(this, phase->get_ctrl(cl->loopexit()->in(CountedLoopEndNode::TestValue)))) {
+  if (!phase->ctrl_is_member(this, cl->loopexit()->in(CountedLoopEndNode::TestValue))) {
     return false;   // Infinite loop
   }
   return true;
@@ -3376,7 +3376,7 @@ bool IdealLoopTree::empty_loop_with_extra_nodes_candidate(PhaseIdealLoop* phase)
     return false;
   }
 
-  if (phase->is_member(this, phase->get_ctrl(cl->limit()))) {
+  if (phase->ctrl_is_member(this, cl->limit())) {
     return false;
   }
   return true;
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 3b398b053a3..dfff7ef96a5 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -463,16 +463,16 @@ Node* PhaseIdealLoop::loop_exit_test(Node* back_control, IdealLoopTree* loop, No
   // need 'loop()' test to tell if limit is loop invariant
   // ---------
 
-  if (!is_member(loop, get_ctrl(incr))) { // Swapped trip counter and limit?
+  if (!ctrl_is_member(loop, incr)) { // Swapped trip counter and limit?
     Node* tmp = incr;            // Then reverse order into the CmpI
     incr = limit;
     limit = tmp;
     bt = BoolTest(bt).commute(); // And commute the exit test
   }
-  if (is_member(loop, get_ctrl(limit))) { // Limit must be loop-invariant
+  if (ctrl_is_member(loop, limit)) { // Limit must be loop-invariant
     return nullptr;
   }
-  if (!is_member(loop, get_ctrl(incr))) { // Trip counter must be loop-variant
+  if (!ctrl_is_member(loop, incr)) { // Trip counter must be loop-variant
     return nullptr;
   }
   return cmp;
@@ -485,7 +485,7 @@ Node* PhaseIdealLoop::loop_iv_incr(Node* incr, Node* x, IdealLoopTree* loop, Nod
     }
     phi_incr = incr;
     incr = phi_incr->in(LoopNode::LoopBackControl); // Assume incr is on backedge of Phi
-    if (!is_member(loop, get_ctrl(incr))) { // Trip counter must be loop-variant
+    if (!ctrl_is_member(loop, incr)) { // Trip counter must be loop-variant
       return nullptr;
     }
   }
@@ -1795,7 +1795,7 @@ bool PhaseIdealLoop::convert_to_long_loop(Node* cmp, Node* phi, IdealLoopTree* l
       if (in == nullptr) {
         continue;
       }
-      if (loop->is_member(get_loop(get_ctrl(in)))) {
+      if (ctrl_is_member(loop, in)) {
         iv_nodes.push(in);
       }
     }
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 7ea66ea5486..1e34331f213 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1376,7 +1376,7 @@ public:
   Node* exact_limit( IdealLoopTree *loop );
 
   // Return a post-walked LoopNode
-  IdealLoopTree *get_loop( Node *n ) const {
+  IdealLoopTree* get_loop(const Node* n) const {
     // Dead nodes have no loop, so return the top level loop instead
     if (!has_node(n))  return _ltree_root;
     assert(!has_ctrl(n), "");
@@ -1386,8 +1386,14 @@ public:
   IdealLoopTree* ltree_root() const { return _ltree_root; }
 
   // Is 'n' a (nested) member of 'loop'?
-  int is_member( const IdealLoopTree *loop, Node *n ) const {
-    return loop->is_member(get_loop(n)); }
+  bool is_member(const IdealLoopTree* loop, const Node* n) const {
+    return loop->is_member(get_loop(n));
+  }
+
+  // is the control for 'n' a (nested) member of 'loop'?
+  bool ctrl_is_member(const IdealLoopTree* loop, const Node* n) {
+    return is_member(loop, get_ctrl(n));
+  }
 
   // This is the basic building block of the loop optimizations.  It clones an
   // entire loop body.  It makes an old_new loop body mapping; with this
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 50b1ae0de8d..3ef6a085b1c 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -637,11 +637,11 @@ Node* PhaseIdealLoop::remix_address_expressions(Node* n) {
       if (n->in(3)->Opcode() == Op_AddX) {
         Node* V = n->in(3)->in(1);
         Node* I = n->in(3)->in(2);
-        if (is_member(n_loop,get_ctrl(V))) {
+        if (ctrl_is_member(n_loop, V)) {
         } else {
           Node *tmp = V; V = I; I = tmp;
         }
-        if (!is_member(n_loop,get_ctrl(I))) {
+        if (!ctrl_is_member(n_loop, I)) {
           Node* add1 = new AddPNode(n->in(1), n->in(2), I);
           // Stuff new AddP in the loop preheader
           register_new_node(add1, n_loop->_head->as_Loop()->skip_strip_mined(1)->in(LoopNode::EntryControl));
@@ -937,8 +937,6 @@ Node* PhaseIdealLoop::try_move_store_before_loop(Node* n, Node *n_ctrl) {
     Node* address = n->in(MemNode::Address);
     Node* value = n->in(MemNode::ValueIn);
     Node* mem = n->in(MemNode::Memory);
-    IdealLoopTree* address_loop = get_loop(get_ctrl(address));
-    IdealLoopTree* value_loop = get_loop(get_ctrl(value));
 
     // - address and value must be loop invariant
     // - memory must be a memory Phi for the loop
@@ -957,8 +955,8 @@ Node* PhaseIdealLoop::try_move_store_before_loop(Node* n, Node *n_ctrl) {
     // memory Phi but sometimes is a bottom memory Phi that takes the
     // store as input).
 
-    if (!n_loop->is_member(address_loop) &&
-        !n_loop->is_member(value_loop) &&
+    if (!ctrl_is_member(n_loop, address) &&
+        !ctrl_is_member(n_loop, value) &&
         mem->is_Phi() && mem->in(0) == n_loop->_head &&
         mem->outcnt() == 1 &&
         mem->in(LoopNode::LoopBackControl) == n) {
@@ -1021,17 +1019,15 @@ void PhaseIdealLoop::try_move_store_after_loop(Node* n) {
     if (n_loop != _ltree_root && !n_loop->_irreducible) {
       Node* address = n->in(MemNode::Address);
       Node* value = n->in(MemNode::ValueIn);
-      IdealLoopTree* address_loop = get_loop(get_ctrl(address));
       // address must be loop invariant
-      if (!n_loop->is_member(address_loop)) {
+      if (!ctrl_is_member(n_loop, address)) {
         // Store must be last on this memory slice in the loop and
         // nothing in the loop must observe it
         Node* phi = nullptr;
         for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
           Node* u = n->fast_out(i);
           if (has_ctrl(u)) { // control use?
-            IdealLoopTree *u_loop = get_loop(get_ctrl(u));
-            if (!n_loop->is_member(u_loop)) {
+            if (!ctrl_is_member(n_loop, u)) {
               continue;
             }
             if (u->is_Phi() && u->in(0) == n_loop->_head) {
@@ -1838,7 +1834,7 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
             Node* cast = nullptr;
             for (uint k = 0; k < x->req(); k++) {
               Node* in = x->in(k);
-              if (in != nullptr && n_loop->is_member(get_loop(get_ctrl(in)))) {
+              if (in != nullptr && ctrl_is_member(n_loop, in)) {
                 const Type* in_t = _igvn.type(in);
                 cast = ConstraintCastNode::make_cast_for_type(x_ctrl, in, in_t,
                                                               ConstraintCastNode::UnconditionalDependency, nullptr);
@@ -2366,11 +2362,9 @@ static void collect_nodes_in_outer_loop_not_reachable_from_sfpt(Node* n, const I
     Node* u = n->fast_out(j);
     assert(check_old_new || old_new[u->_idx] == nullptr, "shouldn't have been cloned");
     if (!u->is_CFG() && (!check_old_new || old_new[u->_idx] == nullptr)) {
-      Node* c = phase->get_ctrl(u);
-      IdealLoopTree* u_loop = phase->get_loop(c);
-      assert(!loop->is_member(u_loop) || !loop->_body.contains(u), "can be in outer loop or out of both loops only");
-      if (!loop->is_member(u_loop)) {
-        if (outer_loop->is_member(u_loop)) {
+      assert(!phase->ctrl_is_member(loop, u) || !loop->_body.contains(u), "can be in outer loop or out of both loops only");
+      if (!phase->ctrl_is_member(loop, u)) {
+        if (phase->ctrl_is_member(outer_loop, u)) {
           wq.push(u);
         } else {
           // nodes pinned with control in the outer loop but not referenced from the safepoint must be moved out of
@@ -2849,7 +2843,7 @@ int PhaseIdealLoop::stride_of_possible_iv(Node* iff) {
     return 0;
   }
   // Must have an invariant operand
-  if (is_member(get_loop(iff), get_ctrl(cmp->in(2)))) {
+  if (ctrl_is_member(get_loop(iff), cmp->in(2))) {
     return 0;
   }
   Node* add2 = nullptr;
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index da9f704ee8d..208bd6583c5 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -1001,7 +1001,7 @@ InitializedAssertionPredicate CreateAssertionPredicatesVisitor::initialize_from_
 }
 
 bool NodeInSingleLoopBody::check_node_in_loop_body(Node* node) const {
-  return _phase->is_member(_ilt, _phase->get_ctrl(node));
+  return _phase->ctrl_is_member(_ilt, node);
 }
 
 // Clone the provided Template Assertion Predicate and set '_init' as new input for the OpaqueLoopInitNode.
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 7a2e6bc7fbd..35b46d22732 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -73,8 +73,7 @@ public:
 
   void set_ignored(Node* n) {
     // Only consider nodes in the loop.
-    Node* ctrl = _vloop.phase()->get_ctrl(n);
-    if (_vloop.lpt()->is_member(_vloop.phase()->get_loop(ctrl))) {
+    if (_vloop.phase()->ctrl_is_member(_vloop.lpt(), n)) {
       // Find the index in the loop.
       for (uint j = 0; j < _body.size(); j++) {
         if (n == _body.at(j)) {

From 81e0c87f28934cb0d66ad2500352b2728f44a1b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20H=C3=BCbner?= <phubner@openjdk.org>
Date: Fri, 14 Nov 2025 08:29:57 +0000
Subject: [PATCH 168/512] 8371320:
 runtime/ErrorHandling/PrintVMInfoAtExitTest.java fails with unexpected amount
 for Java Heap reserved memory

Reviewed-by: azafari, jsikstro
---
 .../ErrorHandling/PrintVMInfoAtExitTest.java  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
index 5e535bab626..80c209a9ec4 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
@@ -27,17 +27,13 @@
  * @test
  * @summary Test PrintVMInfoAtExit
  * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @modules java.base/jdk.internal.misc
  * @requires vm.flagless
  * @requires vm.bits == "64"
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI PrintVMInfoAtExitTest
+ * @run driver PrintVMInfoAtExitTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import jdk.test.whitebox.WhiteBox;
 
 
 public class PrintVMInfoAtExitTest {
@@ -52,18 +48,20 @@ public class PrintVMInfoAtExitTest {
             "-XX:CompressedClassSpaceSize=256m",
             "-version");
 
+    // How many kb of committed memory we expect in the NMT summary.
+    int committed_kb = 65536;
     OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
     output_detail.shouldContain("# JRE version:");
     output_detail.shouldContain("--  S U M M A R Y --");
     output_detail.shouldContain("Command Line: -Xmx64M -Xms64M -XX:-CreateCoredumpOnCrash -XX:+UnlockDiagnosticVMOptions -XX:+PrintVMInfoAtExit -XX:NativeMemoryTracking=summary -XX:CompressedClassSpaceSize=256m");
     output_detail.shouldContain("Native Memory Tracking:");
-    WhiteBox wb = WhiteBox.getWhiteBox();
-    if (wb.isAsanEnabled()) {
-        // the reserved value can be influenced by asan
-        output_detail.shouldContain("Java Heap (reserved=");
-        output_detail.shouldContain(", committed=65536KB)");
-    } else {
-        output_detail.shouldContain("Java Heap (reserved=65536KB, committed=65536KB)");
+    // Make sure the heap summary is present.
+    output_detail.shouldMatch("Java Heap \\(reserved=[0-9]+KB, committed=" + committed_kb + "KB\\)");
+    // Check reserved >= committed.
+    String reserved_kb_string = output_detail.firstMatch("Java Heap \\(reserved=([0-9]+)KB, committed=" + committed_kb + "KB\\)", 1);
+    int reserved_kb = Integer.parseInt(reserved_kb_string);
+    if (reserved_kb < committed_kb) {
+        throw new RuntimeException("committed more memory than reserved");
     }
   }
 }

From 9eaa364a5221cba960467ffbaea14ea790809c6a Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Fri, 14 Nov 2025 09:03:11 +0000
Subject: [PATCH 169/512] 8361487: [ubsan] test_committed_virtualmemory.cpp
 check_covered_pages shows overflow

Reviewed-by: jsjolen, phubner
---
 .../gtest/runtime/test_committed_virtualmemory.cpp    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index 4d3fc1ff82e..5b78a66a3ae 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -83,14 +83,21 @@ public:
     ASSERT_TRUE(found_stack_top);
   }
 
+  static const int PAGE_CONTAINED_IN_RANGE_TAG = -1;
+  static bool is_page_in_committed_region(int a) { return (a == PAGE_CONTAINED_IN_RANGE_TAG); }
+  static void set_page_as_contained_in_committed_region(int &a) { a = PAGE_CONTAINED_IN_RANGE_TAG; }
+
   static void check_covered_pages(address addr, size_t size, address base, size_t touch_pages, int* page_num) {
     const size_t page_sz = os::vm_page_size();
     size_t index;
     for (index = 0; index < touch_pages; index ++) {
+      if (is_page_in_committed_region(page_num[index])) { // Already tagged?
+        continue;
+      }
       address page_addr = base + page_num[index] * page_sz;
       // The range covers this page, marks the page
       if (page_addr >= addr && page_addr < addr + size) {
-        page_num[index] = -1;
+        set_page_as_contained_in_committed_region(page_num[index]);
       }
     }
   }
@@ -135,7 +142,7 @@ public:
     if (precise_tracking_supported) {
       // All touched pages should be committed
       for (size_t index = 0; index < touch_pages; index ++) {
-        ASSERT_EQ(page_num[index], -1);
+        ASSERT_TRUE(is_page_in_committed_region(page_num[index]));
       }
     }
 

From 8a7af77e991511e144914abc129a9d4d40c0b76b Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Fri, 14 Nov 2025 10:10:03 +0000
Subject: [PATCH 170/512] 8371366:
 java/net/httpclient/whitebox/RawChannelTestDriver.java fails intermittently
 in jtreg timeout

Reviewed-by: djelinski, vyazici
---
 .../whitebox/RawChannelTestDriver.java        |  9 +-
 .../jdk/internal/net/http/RawChannelTest.java | 82 +++++++++++++++----
 2 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java b/test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java
index ac577069b70..ab44fba5ecd 100644
--- a/test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 8151299 8164704
  * @modules java.net.http/jdk.internal.net.http
- * @run testng java.net.http/jdk.internal.net.http.RawChannelTest
+ * @run testng/othervm java.net.http/jdk.internal.net.http.RawChannelTest
  */
+// use
+//     @run testng/othervm -Dseed=6434511950803022575
+//          java.net.http/jdk.internal.net.http.RawChannelTest
+// to reproduce a failure with a particular seed (e.g. 6434511950803022575)
+// if this test is observed failing with that seed
 //-Djdk.internal.httpclient.websocket.debug=true
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
index 9b5764735b2..f6bcdcb4d33 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 package jdk.internal.net.http;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -43,8 +44,9 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.util.concurrent.atomic.AtomicReference;
+
 import jdk.internal.net.http.websocket.RawChannel;
-import jdk.internal.net.http.websocket.WebSocketRequest;
 import org.testng.annotations.Test;
 import static java.net.http.HttpResponse.BodyHandlers.discarding;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -57,6 +59,20 @@ import static org.testng.Assert.assertEquals;
  */
 public class RawChannelTest {
 
+    // can't use jdk.test.lib when injected in java.net.httpclient
+    // Seed can be specified on the @run line with -Dseed=<seed>
+    private static class RandomFactory {
+        private static long getSeed() {
+            long seed = Long.getLong("seed", new Random().nextLong());
+            System.out.println("Seed from RandomFactory = "+seed+"L");
+            return seed;
+        }
+        public static Random getRandom() {
+            return new Random(getSeed());
+        }
+    }
+
+    private static final Random RANDOM = RandomFactory.getRandom();
     private final AtomicLong clientWritten = new AtomicLong();
     private final AtomicLong serverWritten = new AtomicLong();
     private final AtomicLong clientRead = new AtomicLong();
@@ -90,7 +106,8 @@ public class RawChannelTest {
             server.setReuseAddress(false);
             server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = server.getLocalPort();
-            new TestServer(server).start();
+            TestServer testServer = new TestServer(server);
+            testServer.start();
 
             final RawChannel chan = channelOf(port);
             print("RawChannel is %s", String.valueOf(chan));
@@ -129,6 +146,7 @@ public class RawChannelTest {
                         } catch (IOException e) {
                             outputCompleted.completeExceptionally(e);
                             e.printStackTrace();
+                            closeChannel(chan);
                         }
                         return;
                     }
@@ -145,6 +163,9 @@ public class RawChannelTest {
                         chan.registerEvent(this);
                         writeStall.countDown(); // signal send buffer is full
                     } catch (IOException e) {
+                        print("OP_WRITE failed: " + e);
+                        outputCompleted.completeExceptionally(e);
+                        closeChannel(chan);
                         throw new UncheckedIOException(e);
                     }
                 }
@@ -168,6 +189,7 @@ public class RawChannelTest {
                             read = chan.read();
                         } catch (IOException e) {
                             inputCompleted.completeExceptionally(e);
+                            closeChannel(chan);
                             e.printStackTrace();
                         }
                         if (read == null) {
@@ -179,7 +201,10 @@ public class RawChannelTest {
                             try {
                                 chan.registerEvent(this);
                             } catch (IOException e) {
-                                e.printStackTrace();
+                                print("OP_READ failed to register event: " + e);
+                                inputCompleted.completeExceptionally(e);
+                                closeChannel(chan);
+                                throw new UncheckedIOException(e);
                             }
                             readStall.countDown();
                             break;
@@ -191,21 +216,33 @@ public class RawChannelTest {
                     print("OP_READ read %s bytes (%s total)", total, clientRead.get());
                 }
             });
+
             CompletableFuture.allOf(outputCompleted,inputCompleted)
                     .whenComplete((r,t) -> {
-                        try {
-                            print("closing channel");
-                            chan.close();
-                        } catch (IOException x) {
-                            x.printStackTrace();
-                        }
+                        closeChannel(chan);
                     });
             exit.await(); // All done, we need to compare results:
             assertEquals(clientRead.get(), serverWritten.get());
             assertEquals(serverRead.get(), clientWritten.get());
+            Throwable serverError = testServer.failed.get();
+            if (serverError != null) {
+                throw new AssertionError("TestServer failed: "
+                        + serverError, serverError);
+            }
         }
     }
 
+    private static void closeChannel(RawChannel chan) {
+        print("closing channel");
+        try {
+            chan.close();
+        } catch (IOException x) {
+            print("Failed to close channel: " + x);
+            x.printStackTrace();
+        }
+    }
+
+
     private static RawChannel channelOf(int port) throws Exception {
         URI uri = URI.create("http://localhost:" + port + "/");
         print("raw channel to %s", uri.toString());
@@ -237,11 +274,24 @@ public class RawChannelTest {
     private class TestServer extends Thread { // Powered by Slowpokes
 
         private final ServerSocket server;
+        private final AtomicReference<Throwable> failed = new AtomicReference<>();
 
         TestServer(ServerSocket server) throws IOException {
             this.server = server;
         }
 
+        private void fail(Closeable s, String actor, Throwable t) {
+            failed.compareAndSet(null, t);
+            print("Server %s got exception: %s", actor, t);
+            t.printStackTrace();
+            try {
+                s.close();
+            } catch (Exception x) {
+                print("Server %s failed to close socket: %s", actor, t);
+            }
+
+        }
+
         @Override
         public void run() {
             try (Socket s = server.accept()) {
@@ -252,21 +302,23 @@ public class RawChannelTest {
 
                 Thread reader = new Thread(() -> {
                     try {
+                        print("Server reader started");
                         long n = readSlowly(is);
                         print("Server read %s bytes", n);
                         s.shutdownInput();
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        fail(s, "reader", e);
                     }
                 });
 
                 Thread writer = new Thread(() -> {
                     try {
+                        print("Server writer started");
                         long n = writeSlowly(os);
                         print("Server written %s bytes", n);
                         s.shutdownOutput();
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        fail(s, "writer", e);
                     }
                 });
 
@@ -276,7 +328,7 @@ public class RawChannelTest {
                 reader.join();
                 writer.join();
             } catch (Exception e) {
-                e.printStackTrace();
+                fail(server,"acceptor", e);
             } finally {
                 exit.countDown();
             }
@@ -365,6 +417,8 @@ public class RawChannelTest {
     }
 
     private static byte[] byteArrayOfSize(int bound) {
-        return new byte[new Random().nextInt(1 + bound)];
+        // bound must be > 1; No need to check it,
+        // nextInt will throw IllegalArgumentException if needed
+        return new byte[RANDOM.nextInt(1, bound + 1)];
     }
 }

From 00f2c38e373f5ae58ad6593cc7b9d53b9596eb17 Mon Sep 17 00:00:00 2001
From: Dhamoder Nalla <dhanalla@openjdk.org>
Date: Fri, 14 Nov 2025 10:54:39 +0000
Subject: [PATCH 171/512] 8371161: [AArch64] Enable CPU feature
 UseSHA3Intrinsics for the Qualcomm processor family

Reviewed-by: aph, haosun
---
 src/hotspot/cpu/aarch64/vm_version_aarch64.cpp                | 4 ++--
 src/hotspot/cpu/aarch64/vm_version_aarch64.hpp                | 2 +-
 .../os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp     | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index a04e9defa4b..659c231464a 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -378,8 +378,8 @@ void VM_Version::initialize() {
   if (UseSHA && VM_Version::supports_sha3()) {
     // Auto-enable UseSHA3Intrinsics on hardware with performance benefit.
     // Note that the evaluation of UseSHA3Intrinsics shows better performance
-    // on Apple silicon but worse performance on Neoverse V1 and N2.
-    if (_cpu == CPU_APPLE) {  // Apple silicon
+    // on Apple and Qualcomm silicon but worse performance on Neoverse V1 and N2.
+    if (_cpu == CPU_APPLE || _cpu == CPU_QUALCOMM) {  // Apple or Qualcomm silicon
       if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
         FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
       }
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 3f7ba683efc..17087d243d3 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -106,7 +106,7 @@ public:
     CPU_MOTOROLA  = 'M',
     CPU_NVIDIA    = 'N',
     CPU_AMCC      = 'P',
-    CPU_QUALCOM   = 'Q',
+    CPU_QUALCOMM  = 'Q',
     CPU_MARVELL   = 'V',
     CPU_INTEL     = 'i',
     CPU_APPLE     = 'a',
diff --git a/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp
index de9bf76fdb0..a20feadcba4 100644
--- a/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp
+++ b/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp
@@ -84,6 +84,8 @@ void VM_Version::get_os_cpu_info() {
       _cpu = CPU_AMCC;
     } else if (buf && strstr(buf, "Cavium Inc.") != nullptr) {
       _cpu = CPU_CAVIUM;
+    } else if (buf && strstr(buf, "Qualcomm Technologies Inc") != nullptr) {
+      _cpu = CPU_QUALCOMM;
     } else {
       log_info(os)("VM_Version: unknown CPU model");
     }

From ff851de852673740542d922d1ee15a6c92b80473 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 14 Nov 2025 12:06:13 +0000
Subject: [PATCH 172/512] 8371709: Add CTW to hotspot_compiler testing

Reviewed-by: thartmann, epeter
---
 test/hotspot/jtreg/TEST.groups | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index d4f1470aea5..f07d276f1f5 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -36,6 +36,7 @@ hotspot_all_no_apps = \
 # Component test groups
 
 hotspot_compiler = \
+  applications/ctw/modules \
   compiler
 
 hotspot_compiler_resourcehogs = \

From 4cc655a2f445bb32ce555b80ac28610b26c51f4c Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 14 Nov 2025 12:49:46 +0000
Subject: [PATCH 173/512] 8371791: G1: Improve accuracy of
 G1CollectedHeap::non_young_occupancy_after_allocation()

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1Allocator.cpp     | 8 ++++++++
 src/hotspot/share/gc/g1/g1Allocator.hpp     | 3 +++
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 713bafd4782..78710084ee3 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -123,6 +123,14 @@ void G1Allocator::reuse_retained_old_region(G1EvacInfo* evacuation_info,
   }
 }
 
+size_t G1Allocator::free_bytes_in_retained_old_region() const {
+  if (_retained_old_gc_alloc_region == nullptr) {
+    return 0;
+  } else {
+    return _retained_old_gc_alloc_region->free();
+  }
+}
+
 void G1Allocator::init_gc_alloc_regions(G1EvacInfo* evacuation_info) {
   assert_at_safepoint_on_vm_thread();
 
diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp
index 19b19c06e92..9a7e62f5cc6 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp
@@ -103,7 +103,10 @@ public:
   void init_gc_alloc_regions(G1EvacInfo* evacuation_info);
   void release_gc_alloc_regions(G1EvacInfo* evacuation_info);
   void abandon_gc_alloc_regions();
+
   bool is_retained_old_region(G1HeapRegion* hr);
+  // Return the amount of free bytes in the current retained old region.
+  size_t free_bytes_in_retained_old_region() const;
 
   // Node index of current thread.
   inline uint current_node_index() const;
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index f04658a1415..d18f61ff507 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2964,8 +2964,8 @@ void G1CollectedHeap::abandon_collection_set() {
 }
 
 size_t G1CollectedHeap::non_young_occupancy_after_allocation(size_t allocation_word_size) {
-  // For simplicity, just count whole regions.
-  const size_t cur_occupancy = (old_regions_count() + humongous_regions_count()) * G1HeapRegion::GrainBytes;
+  const size_t cur_occupancy = (old_regions_count() + humongous_regions_count()) * G1HeapRegion::GrainBytes -
+                               _allocator->free_bytes_in_retained_old_region();
   // Humongous allocations will always be assigned to non-young heap, so consider
   // that allocation in the result as well. Otherwise the allocation will always
   // be in young gen, so there is no need to account it here.

From 5d65c23cd99b72527dcfab9eb6da9510e7dc6330 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Fri, 14 Nov 2025 13:13:09 +0000
Subject: [PATCH 174/512] 8370492: [Linux] Update cpu shares to cpu.weight
 mapping function

Reviewed-by: cnorrbin, ayang, syan
---
 .../os/linux/cgroupV2Subsystem_linux.cpp      | 31 ++++++++---
 .../platform/cgroupv2/CgroupV2Subsystem.java  | 31 ++++++++---
 .../jtreg/containers/docker/TestMisc.java     | 52 ++++++++++++++++++-
 .../platform/docker/MetricsCpuTester.java     | 10 ++--
 4 files changed, 107 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
index 38258a1f049..41fc8db7e81 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
@@ -26,6 +26,8 @@
 #include "cgroupUtil_linux.hpp"
 #include "cgroupV2Subsystem_linux.hpp"
 
+#include <math.h>
+
 // Constructor
 CgroupV2Controller::CgroupV2Controller(char* mount_path,
                                        char *cgroup_path,
@@ -61,22 +63,39 @@ int CgroupV2CpuController::cpu_shares() {
     log_debug(os, container)("CPU Shares is: %d", -1);
     return -1;
   }
+  // cg v2 values must be in range [1-10000]
+  assert(shares_int >= 1 && shares_int <= 10000, "invariant");
 
   // CPU shares (OCI) value needs to get translated into
   // a proper Cgroups v2 value. See:
-  // https://github.com/containers/crun/blob/master/crun.1.md#cpu-controller
+  // https://github.com/containers/crun/blob/1.24/crun.1.md#cpu-controller
   //
   // Use the inverse of (x == OCI value, y == cgroupsv2 value):
-  // ((262142 * y - 1)/9999) + 2 = x
+  // y = 10^(log2(x)^2/612 + 125/612 * log2(x) - 7.0/34.0)
   //
-  int x = 262142 * shares_int - 1;
-  double frac = x/9999.0;
-  x = ((int)frac) + 2;
+  // By re-arranging it to the standard quadratic form:
+  // log2(x)^2 + 125 * log2(x) - (126 + 612 * log_10(y)) = 0
+  //
+  // Therefore, log2(x) = (-125 + sqrt( 125^2 - 4 * (-(126 + 612 * log_10(y)))))/2
+  //
+  // As a result we have the inverse (we can discount substraction of the
+  // square root value since those values result in very small numbers and the
+  // cpu shares values - OCI - are in range [2,262144]):
+  //
+  // x = 2^((-125 + sqrt(16129 + 2448* log10(y)))/2)
+  //
+  double log_multiplicand = log10(shares_int);
+  double discriminant = 16129 + 2448 * log_multiplicand;
+  double square_root = sqrt(discriminant);
+  double exponent = (-125 + square_root)/2;
+  double scaled_val = pow(2, exponent);
+  int x = (int) scaled_val;
   log_trace(os, container)("Scaled CPU shares value is: %d", x);
   // Since the scaled value is not precise, return the closest
   // multiple of PER_CPU_SHARES for a more conservative mapping
   if ( x <= PER_CPU_SHARES ) {
-     // will always map to 1 CPU
+     // Don't do the multiples of PER_CPU_SHARES mapping since we
+     // have a value <= PER_CPU_SHARES
      log_debug(os, container)("CPU Shares is: %d", x);
      return x;
   }
diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
index aa618766b38..3e3f637cd4c 100644
--- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
@@ -156,22 +156,39 @@ public class CgroupV2Subsystem implements CgroupSubsystem {
     @Override
     public long getCpuShares() {
         long sharesRaw = getLongVal("cpu.weight");
-        if (sharesRaw == 100 || sharesRaw <= 0) {
+        // cg v2 value must be in range [1,10000]
+        if (sharesRaw == 100 || sharesRaw <= 0 || sharesRaw > 10000) {
             return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         int shares = (int)sharesRaw;
         // CPU shares (OCI) value needs to get translated into
         // a proper Cgroups v2 value. See:
-        // https://github.com/containers/crun/blob/master/crun.1.md#cpu-controller
+        // https://github.com/containers/crun/blob/1.24/crun.1.md#cpu-controller
         //
         // Use the inverse of (x == OCI value, y == cgroupsv2 value):
-        // ((262142 * y - 1)/9999) + 2 = x
+        // y = 10^(log2(x)^2/612 + 125/612 * log2(x) - 7.0/34.0)
         //
-        int x = 262142 * shares - 1;
-        double frac = x/9999.0;
-        x = ((int)frac) + 2;
+        // By re-arranging it to the standard quadratic form:
+        // log2(x)^2 + 125 * log2(x) - (126 + 612 * log_10(y)) = 0
+        //
+        // Therefore, log2(x) = (-125 + sqrt( 125^2 - 4 * (-(126 + 612 * log_10(y)))))/2
+        //
+        // As a result we have the inverse (we can discount substraction of the
+        // square root value since those values result in very small numbers and the
+        // cpu shares values - OCI - are in range [2-262144])
+        //
+        // x = 2^((-125 + sqrt(16129 + 2448* log10(y)))/2)
+        //
+        double logMultiplicand = Math.log10(shares);
+        double discriminant = 16129 + 2448 * logMultiplicand;
+        double squareRoot = Math.sqrt(discriminant);
+        double exponent = (-125 + squareRoot)/2;
+        double scaledValue = Math.pow(2, exponent);
+
+        int x = (int)scaledValue;
         if ( x <= PER_CPU_SHARES ) {
-            return PER_CPU_SHARES; // mimic cgroups v1
+            // Return the back-mapped value.
+            return x;
         }
         int f = x/PER_CPU_SHARES;
         int lower_multiple = f * PER_CPU_SHARES;
diff --git a/test/hotspot/jtreg/containers/docker/TestMisc.java b/test/hotspot/jtreg/containers/docker/TestMisc.java
index a1998cef344..400119dac9d 100644
--- a/test/hotspot/jtreg/containers/docker/TestMisc.java
+++ b/test/hotspot/jtreg/containers/docker/TestMisc.java
@@ -29,20 +29,24 @@
  * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build CheckContainerized jdk.test.whitebox.WhiteBox PrintContainerInfo
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox
  * @run driver TestMisc
  */
+import jdk.internal.platform.Metrics;
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerTestUtils;
 import jdk.test.lib.containers.docker.DockerRunOptions;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
 
 
 public class TestMisc {
+    private static final Metrics metrics = Metrics.systemMetrics();
     private static final String imageName = Common.imageName("misc");
 
     public static void main(String[] args) throws Exception {
@@ -58,6 +62,7 @@ public class TestMisc {
             testIsContainerized();
             testPrintContainerInfo();
             testPrintContainerInfoActiveProcessorCount();
+            testPrintContainerInfoCPUShares();
         } finally {
             DockerTestUtils.removeDockerImage(imageName);
         }
@@ -94,8 +99,53 @@ public class TestMisc {
         checkContainerInfo(Common.run(opts));
     }
 
+    // Test the mapping function on cgroups v2. Should also pass on cgroups v1 as it's
+    // a direct mapping there.
+    private static void testPrintContainerInfoCPUShares() throws Exception {
+        // Test won't work on cgv1 rootless podman since resource limits don't
+        // work there.
+        if ("cgroupv1".equals(metrics.getProvider()) &&
+            DockerTestUtils.isPodman() &&
+            DockerTestUtils.isRootless()) {
+            throw new SkippedException("Resource limits required for testPrintContainerInfoCPUShares(). " +
+                                       "This is cgv1 with podman in rootless mode. Test skipped.");
+        }
+        // Anything less than 1024 should return the back-mapped cpu-shares value without
+        // rounding to next multiple of 1024 (on cg v2). Only ensure that we get
+        // 'cpu_shares: <back-mapped-value>' over 'cpu_shares: no shares'.
+        printContainerInfo(512, 1024, false);
+        // Don't use 1024 exactly so as to avoid mapping to the unlimited/uset case.
+        // Use a value > 100 post-mapping so as to hit the non-default branch: 1052 => 103
+        printContainerInfo(1052, 1024, true);
+        // need at least 2 CPU cores for this test to work
+        if (Runtime.getRuntime().availableProcessors() >= 2) {
+            printContainerInfo(2048, 2048, true);
+        }
+    }
+
+    private static void printContainerInfo(int cpuShares, int expected, boolean numberMatch) throws Exception {
+        Common.logNewTestCase("Test print_container_info() - cpu shares - given: " + cpuShares + ", expected: " + expected);
+
+        DockerRunOptions opts = Common.newOpts(imageName, "PrintContainerInfo");
+        Common.addWhiteBoxOpts(opts);
+        opts.addDockerOpts("--cpu-shares", Integer.valueOf(cpuShares).toString());
+
+        OutputAnalyzer out = Common.run(opts);
+        String str = out.getOutput();
+        boolean isCgroupV2 = str.contains("cgroupv2");
+        // cg v1 maps cpu shares values verbatim. Only cg v2 uses the
+        // mapping function.
+        if (numberMatch) {
+          int valueExpected = isCgroupV2 ? expected : cpuShares;
+          out.shouldContain("cpu_shares: " + valueExpected);
+        } else {
+          // must not print "no shares"
+          out.shouldNotContain("cpu_shares: no shares");
+        }
+    }
+
     private static void testPrintContainerInfoActiveProcessorCount() throws Exception {
-        Common.logNewTestCase("Test print_container_info()");
+        Common.logNewTestCase("Test print_container_info() - ActiveProcessorCount");
 
         DockerRunOptions opts = Common.newOpts(imageName, "PrintContainerInfo").addJavaOpts("-XX:ActiveProcessorCount=2");
         Common.addWhiteBoxOpts(opts);
diff --git a/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java b/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java
index ff5d52d95a6..62549e7b518 100644
--- a/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java
+++ b/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java
@@ -145,9 +145,13 @@ public class MetricsCpuTester {
     private static void testCpuShares(long shares) {
         Metrics metrics = Metrics.systemMetrics();
         if ("cgroupv2".equals(metrics.getProvider()) && shares < 1024) {
-            // Adjust input shares for < 1024 cpu shares as the
-            // impl. rounds up to the next multiple of 1024
-            shares = 1024;
+            // Don't assert for shares values less than 1024 as we don't
+            // have a 1-to-1 mapping from the cgroup v2 value to the OCI
+            // value.
+            System.out.println("Debug: cgv2 - Got CPU shares of: " +
+                               metrics.getCpuShares() + " - Skipping assert.");
+            System.out.println("TEST PASSED!!!");
+            return;
         }
         long newShares = metrics.getCpuShares();
         if (newShares != shares) {

From 36daa2650d504b3cdc43c774601a6e5f9e9b2403 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 14 Nov 2025 14:12:27 +0000
Subject: [PATCH 175/512] 8371860: Make non-public methods in java_lang_Class
 private

Reviewed-by: kbarrett, fparain
---
 src/hotspot/share/classfile/javaClasses.cpp | 11 -----------
 src/hotspot/share/classfile/javaClasses.hpp | 15 +++++++--------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index e41af702601..ede3582b32e 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1336,11 +1336,6 @@ void java_lang_Class::set_class_data(oop java_class, oop class_data) {
   java_class->obj_field_put(_classData_offset, class_data);
 }
 
-void java_lang_Class::set_reflection_data(oop java_class, oop reflection_data) {
-  assert(_reflectionData_offset != 0, "must be set");
-  java_class->obj_field_put(_reflectionData_offset, reflection_data);
-}
-
 void java_lang_Class::set_class_loader(oop java_class, oop loader) {
   assert(_class_loader_offset != 0, "offsets should have been initialized");
   java_class->obj_field_put(_class_loader_offset, loader);
@@ -1483,7 +1478,6 @@ Klass* java_lang_Class::array_klass_acquire(oop java_class) {
   return k;
 }
 
-
 void java_lang_Class::release_set_array_klass(oop java_class, Klass* klass) {
   assert(klass->is_klass() && klass->is_array_klass(), "should be array klass");
   java_class->release_metadata_field_put(_array_klass_offset, klass);
@@ -1589,11 +1583,6 @@ void java_lang_Class::set_modifiers(oop the_class_mirror, u2 value) {
   the_class_mirror->char_field_put(_modifiers_offset, value);
 }
 
-int java_lang_Class::raw_access_flags(oop the_class_mirror) {
-  assert(_raw_access_flags_offset != 0, "offsets should have been initialized");
-  return the_class_mirror->char_field(_raw_access_flags_offset);
-}
-
 void java_lang_Class::set_raw_access_flags(oop the_class_mirror, u2 value) {
   assert(_raw_access_flags_offset != 0, "offsets should have been initialized");
   the_class_mirror->char_field_put(_raw_access_flags_offset, value);
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 28f8c0a3b8c..699dd39b887 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -273,6 +273,12 @@ class java_lang_Class : AllStatic {
   static void initialize_mirror_fields(InstanceKlass* ik, Handle mirror, Handle protection_domain,
                                        Handle classData, TRAPS);
   static void set_mirror_module_field(JavaThread* current, Klass* K, Handle mirror, Handle module);
+
+  static void set_modifiers(oop java_class, u2 value);
+  static void set_raw_access_flags(oop java_class, u2 value);
+  static void set_is_primitive(oop java_class);
+  static void release_set_array_klass(oop java_class, Klass* klass);
+
  public:
   static void allocate_fixup_lists();
   static void compute_offsets();
@@ -307,12 +313,10 @@ class java_lang_Class : AllStatic {
   static bool is_instance(oop obj);
 
   static bool is_primitive(oop java_class);
-  static void set_is_primitive(oop java_class);
   static BasicType primitive_type(oop java_class);
   static oop primitive_mirror(BasicType t);
-  // JVM_NewArray support
   static Klass* array_klass_acquire(oop java_class);
-  static void release_set_array_klass(oop java_class, Klass* klass);
+
   // compiler support for class operations
   static int klass_offset()                { CHECK_INIT(_klass_offset); }
   static int array_klass_offset()          { CHECK_INIT(_array_klass_offset); }
@@ -331,7 +335,6 @@ class java_lang_Class : AllStatic {
   static objArrayOop signers(oop java_class);
   static oop  class_data(oop java_class);
   static void set_class_data(oop java_class, oop classData);
-  static void set_reflection_data(oop java_class, oop reflection_data);
   static int reflection_data_offset() { return _reflectionData_offset; }
 
   static oop class_loader(oop java_class);
@@ -344,10 +347,6 @@ class java_lang_Class : AllStatic {
   static void set_source_file(oop java_class, oop source_file);
 
   static int modifiers(oop java_class);
-  static void set_modifiers(oop java_class, u2 value);
-
-  static int raw_access_flags(oop java_class);
-  static void set_raw_access_flags(oop java_class, u2 value);
 
   static size_t oop_size(oop java_class);
   static void set_oop_size(HeapWord* java_class, size_t size);

From 466cb383144edf0baa202dc5a2cac37e7572e2db Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 14 Nov 2025 14:53:19 +0000
Subject: [PATCH 176/512] 8371885: Mark UseCompressedClassPointers as obsolete
 for JDK 27

Reviewed-by: mdoerr, coleenp
---
 src/hotspot/share/runtime/arguments.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 79027cf113f..3748c35f00d 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -530,7 +530,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "LockingMode",                  JDK_Version::jdk(24), JDK_Version::jdk(26), JDK_Version::jdk(27) },
 #ifdef _LP64
-  { "UseCompressedClassPointers",   JDK_Version::jdk(25),  JDK_Version::jdk(26), JDK_Version::undefined() },
+  { "UseCompressedClassPointers",   JDK_Version::jdk(25),  JDK_Version::jdk(27), JDK_Version::undefined() },
 #endif
   { "ParallelRefProcEnabled",       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "ParallelRefProcBalancingEnabled", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },

From 10f262a6ad9a6e89cd79409c5e1a3f7efda76928 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 14 Nov 2025 15:31:28 +0000
Subject: [PATCH 177/512] 8371804: C2: Tighten up LoadNode::Value comments
 after JDK-8346184

Reviewed-by: kvn, vlivanov
---
 src/hotspot/share/opto/memnode.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index f42a6ea9489..61300ab4fcb 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2012,11 +2012,7 @@ const Type* LoadNode::Value(PhaseGVN* phase) const {
   assert(off != Type::OffsetTop, "case covered by TypePtr::empty");
   Compile* C = phase->C;
 
-  // If we are loading from a freshly-allocated object, produce a zero,
-  // if the load is provably beyond the header of the object.
-  // (Also allow a variable load from a fresh array to produce zero.)
-  const TypeOopPtr* tinst = tp->isa_oopptr();
-  bool is_instance = (tinst != nullptr) && tinst->is_known_instance_field();
+  // If load can see a previous constant store, use that.
   Node* value = can_see_stored_value(mem, phase);
   if (value != nullptr && value->is_Con()) {
     assert(value->bottom_type()->higher_equal(_type), "sanity");
@@ -2227,13 +2223,16 @@ const Type* LoadNode::Value(PhaseGVN* phase) const {
     }
   }
 
-  bool is_vect = (_type->isa_vect() != nullptr);
-  if (is_instance && !is_vect) {
-    // If we have an instance type and our memory input is the
-    // programs's initial memory state, there is no matching store,
-    // so just return a zero of the appropriate type -
-    // except if it is vectorized - then we have no zero constant.
-    Node *mem = in(MemNode::Memory);
+  // If we are loading from a freshly-allocated object/array, produce a zero.
+  // Things to check:
+  //   1. Load is beyond the header: headers are not guaranteed to be zero
+  //   2. Load is not vectorized: vectors have no zero constant
+  //   3. Load has no matching store, i.e. the input is the initial memory state
+  const TypeOopPtr* tinst = tp->isa_oopptr();
+  bool is_not_header = (tinst != nullptr) && tinst->is_known_instance_field();
+  bool is_not_vect = (_type->isa_vect() == nullptr);
+  if (is_not_header && is_not_vect) {
+    Node* mem = in(MemNode::Memory);
     if (mem->is_Parm() && mem->in(0)->is_Start()) {
       assert(mem->as_Parm()->_con == TypeFunc::Memory, "must be memory Parm");
       return Type::get_zero_type(_type->basic_type());

From 6e7eaf40d1b660cbec0a226911c9dc88f94756aa Mon Sep 17 00:00:00 2001
From: David Beaumont <david.beaumont@oracle.com>
Date: Fri, 14 Nov 2025 18:24:04 +0000
Subject: [PATCH 178/512] 8371591: VerifyJimage test incorrectly skips all
 tests when comparing directory structure

Reviewed-by: rriggs
---
 test/jdk/tools/jimage/VerifyJimage.java | 425 +++++++++++++++---------
 1 file changed, 259 insertions(+), 166 deletions(-)

diff --git a/test/jdk/tools/jimage/VerifyJimage.java b/test/jdk/tools/jimage/VerifyJimage.java
index 6da0e719950..08f567cbecb 100644
--- a/test/jdk/tools/jimage/VerifyJimage.java
+++ b/test/jdk/tools/jimage/VerifyJimage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,17 +21,19 @@
  * questions.
  */
 
-import java.io.File;
+import jdk.internal.jimage.BasicImageReader;
+import jtreg.SkippedException;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.DirectoryStream;
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedDeque;
@@ -41,205 +43,296 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
-import jdk.internal.jimage.BasicImageReader;
-import jdk.internal.jimage.ImageLocation;
+import static java.util.stream.Collectors.joining;
 
 /*
- * @test
- * @summary Verify jimage
+ * @test id=load
+ * @summary Load all classes defined in JRT file system.
+ * @library /test/lib
  * @modules java.base/jdk.internal.jimage
  * @run main/othervm --add-modules ALL-SYSTEM VerifyJimage
  */
 
-/**
- * This test runs in two modes:
- * (1) No argument: it verifies the jimage by loading all classes in the runtime
- * (2) path of exploded modules: it compares bytes of each file in the exploded
- *     module with the entry in jimage
- *
- * FIXME: exception thrown when findLocation from jimage by multiple threads
- * -Djdk.test.threads=<n> to specify the number of threads.
+/*
+ * @test id=compare
+ * @summary Compare an exploded directory of module classes with the system jimage.
+ * @library /test/lib
+ * @modules java.base/jdk.internal.jimage
+ * @run main/othervm --add-modules ALL-SYSTEM -Djdk.test.threads=10 VerifyJimage ../../jdk/modules
  */
-public class VerifyJimage {
+public abstract class VerifyJimage implements Runnable {
     private static final String MODULE_INFO = "module-info.class";
-    private static final Deque<String> failed = new ConcurrentLinkedDeque<>();
 
     public static void main(String... args) throws Exception {
-
-        String home = System.getProperty("java.home");
-        Path bootimagePath = Paths.get(home, "lib", "modules");
+        // Best practice is to read "test.jdk" in preference to "java.home".
+        String testJdk = System.getProperty("test.jdk", System.getProperty("java.home"));
+        Path jdkRoot = Path.of(testJdk);
+        Path bootimagePath = jdkRoot.resolve("lib", "modules");
         if (Files.notExists(bootimagePath)) {
-             System.out.println("Test skipped, not an images build");
-             return;
+            throw new SkippedException("No boot image: " + bootimagePath);
         }
 
-        long start = System.nanoTime();
-        int numThreads = Integer.getInteger("jdk.test.threads", 1);
-        JImageReader reader = newJImageReader();
-        VerifyJimage verify = new VerifyJimage(reader, numThreads);
+        FileSystem jrtFs = FileSystems.getFileSystem(URI.create("jrt:/"));
+        Path modulesRoot = jrtFs.getPath("/").resolve("modules");
+        List<String> modules;
+        try (Stream<Path> moduleDirs = Files.list(modulesRoot)) {
+            modules = moduleDirs.map(Path::getFileName).map(Object::toString).toList();
+        }
+        VerifyJimage verifier;
         if (args.length == 0) {
-            // load classes from jimage
-            verify.loadClasses();
+            verifier = new ClassLoadingVerifier(modules, modulesRoot);
         } else {
-            Path dir = Paths.get(args[0]);
-            if (Files.notExists(dir) || !Files.isDirectory(dir)) {
-                throw new RuntimeException("Invalid argument: " + dir);
+            Path pathArg = Path.of(args[0].replace("/", FileSystems.getDefault().getSeparator()));
+            // The path argument may be relative.
+            Path rootDir = jdkRoot.resolve(pathArg);
+            if (!Files.isDirectory(rootDir)) {
+                throw new SkippedException("No modules directory found: " + rootDir);
             }
-            verify.compareExplodedModules(dir);
+            int maxThreads = Integer.getInteger("jdk.test.threads", 1);
+            verifier = new DirectoryContentVerifier(modules, rootDir, maxThreads, bootimagePath);
         }
-        verify.waitForCompletion();
+        verifier.verify();
+    }
+
+    final List<String> modules;
+    // Count of items which have passed verification.
+    final AtomicInteger verifiedCount = new AtomicInteger(0);
+    // Error messages for verification failures.
+    final Deque<String> failed = new ConcurrentLinkedDeque<>();
+
+    private VerifyJimage(List<String> modules) {
+        this.modules = modules;
+    }
+
+    void verify() {
+        long start = System.nanoTime();
+        run();
         long end = System.nanoTime();
-        int entries = reader.entries();
-        System.out.format("%d entries %d files verified: %d ms %d errors%n",
-                          entries, verify.count.get(),
-                          TimeUnit.NANOSECONDS.toMillis(end - start), failed.size());
-        for (String f : failed) {
-            System.err.println(f);
-        }
+
+        System.out.format("Verified %d entries: %d ms, %d errors%n",
+                verifiedCount.get(),
+                TimeUnit.NANOSECONDS.toMillis(end - start),
+                failed.size());
         if (!failed.isEmpty()) {
+            failed.forEach(System.err::println);
             throw new AssertionError("Test failed");
         }
     }
 
-    private final AtomicInteger count = new AtomicInteger(0);
-    private final JImageReader reader;
-    private final ExecutorService pool;
+    private static final class DirectoryContentVerifier extends VerifyJimage {
+        private final Path rootDir;
+        private final ExecutorService pool;
+        private final Path jimagePath;
 
-    VerifyJimage(JImageReader reader, int numThreads) {
-        this.reader = reader;
-        this.pool = Executors.newFixedThreadPool(numThreads);
-    }
+        DirectoryContentVerifier(List<String> modules, Path rootDir, int maxThreads, Path jimagePath) {
+            super(modules);
+            this.rootDir = rootDir;
+            this.pool = Executors.newFixedThreadPool(maxThreads);
+            this.jimagePath = jimagePath;
+        }
 
-    private void waitForCompletion() throws InterruptedException {
-        pool.shutdown();
-        pool.awaitTermination(20, TimeUnit.SECONDS);
-    }
-
-    private void compareExplodedModules(Path dir) throws IOException {
-        System.out.println("comparing jimage with " + dir);
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
-            for (Path mdir : stream) {
-                if (Files.isDirectory(mdir)) {
-                    pool.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                Files.find(mdir, Integer.MAX_VALUE, (Path p, BasicFileAttributes attr)
-                                           -> !Files.isDirectory(p) &&
-                                              !mdir.relativize(p).toString().startsWith("_") &&
-                                              !p.getFileName().toString().equals("MANIFEST.MF"))
-                                     .forEach(p -> compare(mdir, p, reader));
-                            } catch (IOException e) {
-                                throw new UncheckedIOException(e);
-                            }
-                        }
-                    });
+        @Override
+        public void run() {
+            System.out.println("Comparing jimage with: " + rootDir);
+            try (BasicImageReader jimage = BasicImageReader.open(jimagePath)) {
+                for (String modName : modules) {
+                    Path modDir = rootDir.resolve(modName);
+                    if (!Files.isDirectory(modDir)) {
+                        failed.add("Missing module directory: " + modDir);
+                    } else {
+                        pool.execute(new ModuleResourceComparator(rootDir, modName, jimage));
+                    }
                 }
+                pool.shutdown();
+                if (!pool.awaitTermination(20, TimeUnit.SECONDS)) {
+                    failed.add("Directory verification timed out");
+                }
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            } catch (InterruptedException e) {
+                failed.add("Directory verification was interrupted");
+                Thread.currentThread().interrupt();
+            }
+        }
+
+        /**
+         * Verifies the contents of the current runtime jimage file by comparing
+         * entries with the on-disk resources in a given directory.
+         */
+        private class ModuleResourceComparator implements Runnable {
+            private final Path rootDir;
+            private final String moduleName;
+            private final BasicImageReader jimage;
+            private final String moduleInfoName;
+            // Entries we expect to find in the jimage module.
+            private final Set<String> moduleEntries;
+            private final Set<String> handledEntries = new HashSet<>();
+
+            public ModuleResourceComparator(Path rootDir, String moduleName, BasicImageReader jimage) {
+                this.rootDir = rootDir;
+                this.moduleName = moduleName;
+                this.jimage = jimage;
+                String moduleEntryPrefix = "/" + moduleName + "/";
+                this.moduleInfoName = moduleEntryPrefix + MODULE_INFO;
+                this.moduleEntries =
+                        Arrays.stream(jimage.getEntryNames())
+                                .filter(n -> n.startsWith(moduleEntryPrefix))
+                                .filter(n -> !isJimageOnly(n))
+                                .collect(Collectors.toSet());
+            }
+
+            @Override
+            public void run() {
+                try (Stream<Path> files = Files.walk(rootDir.resolve(moduleName))) {
+                    files.filter(this::shouldVerify).forEach(this::compareEntry);
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+                moduleEntries.stream()
+                        .filter(n -> !handledEntries.contains(n))
+                        .sorted()
+                        .forEach(n -> failed.add("Untested jimage entry: " + n));
+            }
+
+            void compareEntry(Path path) {
+                String entryName = getEntryName(path);
+                if (!moduleEntries.contains(entryName)) {
+                    // Corresponds to an on-disk file which is not expected to
+                    // be present in the jimage. This is normal and is skipped.
+                    return;
+                }
+                // Mark valid entries as "handled" to track if we've seen them
+                // (even if we don't test their content).
+                if (!handledEntries.add(entryName)) {
+                    failed.add("Duplicate entry name: " + entryName);
+                    return;
+                }
+                if (isExpectedToDiffer(entryName)) {
+                    return;
+                }
+                try {
+                    int mismatch = Arrays.mismatch(
+                            Files.readAllBytes(path),
+                            jimage.getResource(entryName));
+                    if (mismatch == -1) {
+                        verifiedCount.incrementAndGet();
+                    } else {
+                        failed.add("Content diff (byte offset " + mismatch + "): " + entryName);
+                    }
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+            }
+
+            /**
+             * Predicate for files which correspond to entries in the jimage.
+             *
+             * <p>This should be a narrow test with minimal chance of
+             * false-negative matching, primarily focusing on excluding build
+             * artifacts.
+             */
+            boolean shouldVerify(Path path) {
+                // Use the entry name because we know it uses the '/' separator.
+                String entryName = getEntryName(path);
+                return Files.isRegularFile(path)
+                        && !entryName.contains("/_the.")
+                        && !entryName.contains("/_element_lists.");
+            }
+
+            /**
+             * Predicate for the limited subset of entries which are expected to
+             * exist in the file system, but are not expected to have the same
+             * content as the associated jimage entry. This is to handle files
+             * which are modified/patched by jlink plugins.
+             *
+             * <p>This should be a narrow test with minimal chance of
+             * false-positive matching.
+             */
+            private boolean isExpectedToDiffer(String entryName) {
+                return entryName.equals(moduleInfoName)
+                        || (entryName.startsWith("/java.base/java/lang/invoke/") && entryName.endsWith("$Holder.class"))
+                        || entryName.equals("/java.base/jdk/internal/module/SystemModulesMap.class");
+            }
+
+            /**
+             * Predicate for the limited subset of entries which are not expected
+             * to exist in the file system, such as those created synthetically
+             * by jlink plugins.
+             *
+             * <p>This should be a narrow test with minimal chance of
+             * false-positive matching.
+             */
+            private boolean isJimageOnly(String entryName) {
+                return entryName.startsWith("/java.base/jdk/internal/module/SystemModules$")
+                        || entryName.startsWith("/java.base/java/lang/invoke/BoundMethodHandle$Species_");
+            }
+
+            private String getEntryName(Path path) {
+                return StreamSupport.stream(rootDir.relativize(path).spliterator(), false)
+                        .map(Object::toString).collect(joining("/", "/", ""));
             }
         }
     }
 
-    private final List<String> BOOT_RESOURCES = Arrays.asList(
-        "java.base/META-INF/services/java.nio.file.spi.FileSystemProvider"
-    );
-    private final List<String> EXT_RESOURCES = Arrays.asList(
-        "jdk.zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider"
-    );
-    private final List<String> APP_RESOURCES = Arrays.asList(
-        "jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector",
-        "jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector"
-    );
+    /**
+     * Verifies the contents of the current runtime jimage file by attempting to
+     * load every available class based on the content of the JRT file system.
+     */
+    static final class ClassLoadingVerifier extends VerifyJimage {
+        private static final String CLASS_SUFFIX = ".class";
 
-    private void compare(Path mdir, Path p, JImageReader reader) {
-        String entry = p.getFileName().toString().equals(MODULE_INFO)
-                ? mdir.getFileName().toString() + "/" + MODULE_INFO
-                : mdir.relativize(p).toString().replace(File.separatorChar, '/');
+        private final Path modulesRoot;
 
-        count.incrementAndGet();
-        String file = mdir.getFileName().toString() + "/" + entry;
-        if (APP_RESOURCES.contains(file)) {
-            // skip until the service config file is merged
-            System.out.println("Skipped " + file);
-            return;
+        ClassLoadingVerifier(List<String> modules, Path modulesRoot) {
+            super(modules);
+            this.modulesRoot = modulesRoot;
         }
 
-        if (reader.findLocation(entry) != null) {
-            reader.compare(entry, p);
-        }
-    }
-
-    private void loadClasses() {
-        ClassLoader loader = ClassLoader.getSystemClassLoader();
-        Stream.of(reader.getEntryNames())
-              .filter(this::accept)
-              .map(this::toClassName)
-              .forEach(cn -> {
-                  count.incrementAndGet();
-                  try {
-                      System.out.println("Loading " + cn);
-                      Class.forName(cn, false, loader);
-                  } catch (VerifyError ve) {
-                      System.err.println("VerifyError for " + cn);
-                      failed.add(reader.imageName() + ": " + cn + " not verified: " + ve.getMessage());
-                  } catch (ClassNotFoundException e) {
-                      failed.add(reader.imageName() + ": " + cn + " not found");
-                  }
-              });
-    }
-
-    private String toClassName(String entry) {
-        int index = entry.indexOf('/', 1);
-        return entry.substring(index + 1, entry.length())
-                    .replaceAll("\\.class$", "").replace('/', '.');
-    }
-
-    // All JVMCI packages other than jdk.vm.ci.services are dynamically
-    // exported to jdk.graal.compiler
-    private static Set<String> EXCLUDED_MODULES = Set.of("jdk.graal.compiler");
-
-    private boolean accept(String entry) {
-        int index = entry.indexOf('/', 1);
-        String mn = index > 1 ? entry.substring(1, index) : "";
-        if (mn.isEmpty() || EXCLUDED_MODULES.contains(mn)) {
-            return false;
-        }
-        return entry.endsWith(".class") && !entry.endsWith(MODULE_INFO);
-    }
-
-    private static JImageReader newJImageReader() throws IOException {
-        String home = System.getProperty("java.home");
-        Path jimage = Paths.get(home, "lib", "modules");
-        System.out.println("opened " + jimage);
-        return new JImageReader(jimage);
-    }
-
-    static class JImageReader extends BasicImageReader {
-        final Path jimage;
-        JImageReader(Path p) throws IOException {
-            super(p);
-            this.jimage = p;
+        @Override
+        public void run() {
+            ClassLoader loader = ClassLoader.getSystemClassLoader();
+            for (String modName : modules) {
+                Path modDir = modulesRoot.resolve(modName);
+                try (Stream<Path> files = Files.walk(modDir)) {
+                    files.map(modDir::relativize)
+                            .filter(ClassLoadingVerifier::isClassFile)
+                            .map(ClassLoadingVerifier::toClassName)
+                            .forEach(cn -> loadClass(cn, loader));
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            }
         }
 
-        String imageName() {
-            return jimage.getFileName().toString();
-        }
-
-        int entries() {
-            return getHeader().getTableLength();
-        }
-
-        void compare(String entry, Path p) {
+        private void loadClass(String cn, ClassLoader loader) {
             try {
-                byte[] bytes = Files.readAllBytes(p);
-                byte[] imagebytes = getResource(entry);
-                if (!Arrays.equals(bytes, imagebytes)) {
-                    failed.add(imageName() + ": bytes differs than " + p.toString());
-                }
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
+                Class.forName(cn, false, loader);
+                verifiedCount.incrementAndGet();
+            } catch (VerifyError ve) {
+                System.err.println("VerifyError for " + cn);
+                failed.add("Class: " + cn + " not verified: " + ve.getMessage());
+            } catch (ClassNotFoundException e) {
+                failed.add("Class: " + cn + " not found");
             }
         }
+
+        /**
+         * Maps a module-relative JRT path of a class file to its corresponding
+         * fully-qualified class name.
+         */
+        private static String toClassName(Path path) {
+            // JRT uses '/' as the separator, and relative paths don't start with '/'.
+            String s = path.toString();
+            return s.substring(0, s.length() - CLASS_SUFFIX.length()).replace('/', '.');
+        }
+
+        /** Whether a module-relative JRT file system path is a class file. */
+        private static boolean isClassFile(Path path) {
+            String classFileName = path.getFileName().toString();
+            return classFileName.endsWith(CLASS_SUFFIX)
+                    && !classFileName.equals(MODULE_INFO);
+        }
     }
 }

From 58b601ac4250a455e3f25f8505ead8c130eba642 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Fri, 14 Nov 2025 18:41:50 +0000
Subject: [PATCH 179/512] 8371874: AOTLinkedClassBulkLoader::preload_classes()
 should not allocate heap objects

Reviewed-by: shade, ayang
---
 src/hotspot/share/classfile/javaClasses.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index ede3582b32e..ee80dbbc45c 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1241,10 +1241,7 @@ bool java_lang_Class::restore_archived_mirror(Klass *k,
 
   if (!k->is_array_klass()) {
     // - local static final fields with initial values were initialized at dump time
-
-    // create the init_lock
-    typeArrayOop r = oopFactory::new_typeArray(T_INT, 0, CHECK_(false));
-    set_init_lock(mirror(), r);
+    assert(init_lock(mirror()) != nullptr, "allocated during AOT assembly");
 
     if (protection_domain.not_null()) {
       set_protection_domain(mirror(), protection_domain());

From 3924a28a2281bbdb13fe9f1e0b5347d57197f8dc Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Fri, 14 Nov 2025 19:39:26 +0000
Subject: [PATCH 180/512] 8371083: FollowReferences reports non-class objects
 as JVMTI_HEAP_REFERENCE_SYSTEM_CLASS

Reviewed-by: lmesnik, sspitsyn
---
 src/hotspot/share/prims/jvmtiTagMap.cpp       |  39 +++++-
 .../KindSystemClass/KindSystemClass.java      |  62 ++++++++++
 .../KindSystemClass/libKindSystemClass.cpp    | 111 ++++++++++++++++++
 3 files changed, 209 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/KindSystemClass.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/libKindSystemClass.cpp

diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index a69c7cb7142..c923f91f69d 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -2190,6 +2190,39 @@ class SimpleRootsClosure : public OopClosure {
   virtual void do_oop(narrowOop* obj_p) { ShouldNotReachHere(); }
 };
 
+// A supporting closure used to process ClassLoaderData roots.
+class CLDRootsClosure: public OopClosure {
+private:
+  bool _continue;
+public:
+  CLDRootsClosure(): _continue(true) {}
+
+  inline bool stopped() {
+    return !_continue;
+  }
+
+  void do_oop(oop* obj_p) {
+    if (stopped()) {
+      return;
+    }
+
+    oop o = NativeAccess<AS_NO_KEEPALIVE>::oop_load(obj_p);
+    // ignore null
+    if (o == nullptr) {
+      return;
+    }
+
+    jvmtiHeapReferenceKind kind = JVMTI_HEAP_REFERENCE_OTHER;
+    if (o->klass() == vmClasses::Class_klass()) {
+      kind = JVMTI_HEAP_REFERENCE_SYSTEM_CLASS;
+    }
+
+    // invoke the callback
+    _continue = CallbackInvoker::report_simple_root(kind, o);
+  }
+  virtual void do_oop(narrowOop* obj_p) { ShouldNotReachHere(); }
+};
+
 // A supporting closure used to process JNI locals
 class JNILocalRootsClosure : public OopClosure {
  private:
@@ -2776,10 +2809,10 @@ inline bool VM_HeapWalkOperation::collect_simple_roots() {
   }
 
   // Preloaded classes and loader from the system dictionary
-  blk.set_kind(JVMTI_HEAP_REFERENCE_SYSTEM_CLASS);
-  CLDToOopClosure cld_closure(&blk, ClassLoaderData::_claim_none);
+  CLDRootsClosure cld_roots_closure;
+  CLDToOopClosure cld_closure(&cld_roots_closure, ClassLoaderData::_claim_none);
   ClassLoaderDataGraph::always_strong_cld_do(&cld_closure);
-  if (blk.stopped()) {
+  if (cld_roots_closure.stopped()) {
     return false;
   }
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/KindSystemClass.java b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/KindSystemClass.java
new file mode 100644
index 00000000000..d02364d2b8f
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/KindSystemClass.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371083
+ * @summary Verify FollowReferences does not report non-classes roots as JVMTI_HEAP_REFERENCE_SYSTEM_CLASS
+ * @requires vm.jvmti
+ * @run main/othervm/native -agentlib:KindSystemClass
+ *                          KindSystemClass
+ */
+
+public class KindSystemClass {
+
+    static native int tagSysClasses();
+    static native Object[] getObjectsWithTags();
+
+    public static void main(String[] args) throws Exception {
+        System.loadLibrary("KindSystemClass");
+
+        int tagged = tagSysClasses();
+        System.out.println("Tagged " + tagged + " classes");
+
+        Object[] objs = getObjectsWithTags();
+        System.out.println("Tagged objects (total " + objs.length + "):");
+        int nonClassesCnt = 0;
+        for (int i = 0; i < objs.length; i++) {
+            Object obj = objs[i];
+            String s;
+            if (obj instanceof Class cls) {
+                s = "OK: " + cls;
+            } else {
+                nonClassesCnt++;
+                s = "ERROR, not a class: " + obj;
+            }
+            System.out.println("[" + i + "] " + s);
+        }
+        if (nonClassesCnt != 0) {
+            throw new RuntimeException("Found " + nonClassesCnt + " non-classes");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/libKindSystemClass.cpp b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/libKindSystemClass.cpp
new file mode 100644
index 00000000000..1be111fd40e
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/KindSystemClass/libKindSystemClass.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jvmti.h>
+#include "jvmti_common.hpp"
+
+static jvmtiEnv *jvmti = nullptr;
+static int class_counter = 0;
+static int other_counter = 0;
+
+static jint JNICALL
+heap_reference_callback(jvmtiHeapReferenceKind reference_kind,
+                        const jvmtiHeapReferenceInfo* reference_info,
+                        jlong class_tag,
+                        jlong referrer_class_tag,
+                        jlong size,
+                        jlong* tag_ptr,
+                        jlong* referrer_tag_ptr,
+                        jint length,
+                        void* user_data) {
+  switch (reference_kind) {
+  case JVMTI_HEAP_REFERENCE_SYSTEM_CLASS:
+    *tag_ptr = ++class_counter;
+    break;
+  case JVMTI_HEAP_REFERENCE_OTHER:
+    ++other_counter;
+    break;
+  default:
+    break;
+  }
+  return JVMTI_VISIT_OBJECTS;
+}
+
+extern "C" JNIEXPORT jint JNICALL
+Java_KindSystemClass_tagSysClasses(JNIEnv* jni, jclass clazz) {
+  jvmtiHeapCallbacks callbacks = {};
+  callbacks.heap_reference_callback = heap_reference_callback;
+
+  jvmtiError err = jvmti->FollowReferences(0 /* filter nothing */,
+                                           nullptr /* no class filter */,
+                                           nullptr /* no initial object, follow roots */,
+                                           &callbacks,
+                                           nullptr);
+  check_jvmti_error(err, "FollowReferences failed");
+
+  LOG("JVMTI_HEAP_REFERENCE_SYSTEM_CLASS: %d, JVMTI_HEAP_REFERENCE_OTHER: %d\n", class_counter, other_counter);
+
+  return class_counter;
+}
+
+extern "C" JNIEXPORT jobjectArray JNICALL
+Java_KindSystemClass_getObjectsWithTags(JNIEnv* jni, jclass clazz) {
+  // request tagged objects with tags 1..class_counter
+  jlong* tags = nullptr;
+  jvmtiError err = jvmti->Allocate(class_counter * sizeof(jlong), (unsigned char**)&tags);
+  check_jvmti_error(err, "Allocate failed");
+
+  for (int i = 0; i < class_counter; i++) {
+    tags[i] = i + 1;
+  }
+
+  jint count = 0;
+  jobject* objects = nullptr;
+
+  err = jvmti->GetObjectsWithTags(class_counter, tags,
+                                  &count, &objects, nullptr);
+  check_jvmti_error(err, "GetObjectsWithTags failed");
+
+  jclass object_klass = jni->FindClass("java/lang/Object");
+  jobjectArray array = jni->NewObjectArray(count, object_klass, nullptr);
+
+  for (jint i = 0; i < count; i++) {
+    jni->SetObjectArrayElement(array, i, objects[i]);
+  }
+
+  deallocate(jvmti, jni, objects);
+
+  return array;
+}
+
+extern "C" JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
+  if (vm->GetEnv(reinterpret_cast<void**>(&jvmti), JVMTI_VERSION) != JNI_OK || !jvmti) {
+    LOG("Could not initialize JVMTI\n");
+    abort();
+  }
+  jvmtiCapabilities capabilities;
+  memset(&capabilities, 0, sizeof(capabilities));
+  capabilities.can_tag_objects = 1;
+  check_jvmti_error(jvmti->AddCapabilities(&capabilities), "adding capabilities");
+  return JVMTI_ERROR_NONE;
+}

From 91b97a49d48ee8528b34486172293fd3a68ae3c7 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 14 Nov 2025 20:32:12 +0000
Subject: [PATCH 181/512] 8371922: Remove unused NonblockingQueue class

Reviewed-by: coleenp
---
 .../share/utilities/nonblockingQueue.hpp      | 136 ---------
 .../utilities/nonblockingQueue.inline.hpp     | 248 ---------------
 .../gtest/utilities/test_nonblockingQueue.cpp | 283 ------------------
 3 files changed, 667 deletions(-)
 delete mode 100644 src/hotspot/share/utilities/nonblockingQueue.hpp
 delete mode 100644 src/hotspot/share/utilities/nonblockingQueue.inline.hpp
 delete mode 100644 test/hotspot/gtest/utilities/test_nonblockingQueue.cpp

diff --git a/src/hotspot/share/utilities/nonblockingQueue.hpp b/src/hotspot/share/utilities/nonblockingQueue.hpp
deleted file mode 100644
index 1b7e4b8bac4..00000000000
--- a/src/hotspot/share/utilities/nonblockingQueue.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_UTILITIES_NONBLOCKINGQUEUE_HPP
-#define SHARE_UTILITIES_NONBLOCKINGQUEUE_HPP
-
-#include "memory/padded.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/pair.hpp"
-
-// The NonblockingQueue template provides a non-blocking FIFO.
-// It has inner padding of one cache line between its two internal pointers.
-//
-// The queue is internally represented by a linked list of elements, with
-// the link to the next element provided by a member of each element.
-// Access to this member is provided by the next_ptr function.
-//
-// The queue has a special pseudo-element that marks the end of the list.
-// Each queue has its own unique special element.  A pointer to this element
-// can be recognized using the is_end() function.  Such a pointer must never
-// be dereferenced.  This end marker is the value of the next member of the
-// last element in the queue, and possibly other elements while modifying
-// the queue.
-//
-// A queue may temporarily appear to be empty even though elements have been
-// added and not removed.  For example, after running the following program,
-// the value of r may be null.
-//
-// thread1: q.push(a); r = q.pop();
-// thread2: q.push(b);
-//
-// This can occur if the push of b started before the push of a, but didn't
-// complete until after the pop.
-//
-// \tparam T is the class of the elements in the queue.
-//
-// \tparam next_ptr is a function pointer.  Applying this function to
-// an object of type T must return a pointer to the list entry member
-// of the object associated with the NonblockingQueue type.
-template<typename T, T* volatile* (*next_ptr)(T&)>
-class NonblockingQueue {
-  T* volatile _head;
-  // Padding of one cache line to avoid false sharing.
-  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_PADDING_SIZE, sizeof(T*));
-  T* volatile _tail;
-
-  NONCOPYABLE(NonblockingQueue);
-
-  // Return the entry following node in the list used by the
-  // specialized NonblockingQueue class.
-  static inline T* next(const T& node);
-
-  // Set the entry following node to new_next in the list used by the
-  // specialized NonblockingQueue class. Not thread-safe, as it cannot
-  // concurrently run with push or try_pop operations that modify this
-  // node.
-  static inline void set_next(T& node, T* new_next);
-
-  // A unique pseudo-object pointer associated with this specific queue.
-  // The resulting pointer must not be dereferenced.
-  inline T* end_marker() const;
-
-public:
-  inline NonblockingQueue();
-  inline ~NonblockingQueue() NOT_DEBUG(= default);
-
-  // Return true if the queue is empty.
-  // Not thread-safe.  There must be no concurrent modification while the
-  // queue is being tested.
-  inline bool empty() const;
-
-  // Return the number of objects in the queue.
-  // Not thread-safe. There must be no concurrent modification while the
-  // length is being determined.
-  inline size_t length() const;
-
-  // Thread-safe add the object to the end of the queue.
-  // Subject to ABA behavior; callers must ensure usage is safe.
-  inline void push(T& node) { append(node, node); }
-
-  // Thread-safe add the objects from first to last to the end of the queue.
-  // Subject to ABA behavior; callers must ensure usage is safe.
-  inline void append(T& first, T& last);
-
-  // Thread-safe attempt to remove and return the first object in the queue.
-  // Returns true if successful.  If successful then *node_ptr is the former
-  // first object, or null if the queue was empty.  If unsuccessful, because
-  // of contention with a concurrent modification, then returns false with
-  // the value of *node_ptr unspecified.  Subject to ABA behavior; callers
-  // must ensure usage is safe.
-  inline bool try_pop(T** node_ptr);
-
-  // Thread-safe remove and return the first object in the queue, or null
-  // if the queue was empty.  This just iterates on try_pop() until it
-  // succeeds, returning the (possibly null) element obtained from that.
-  // Subject to ABA behavior; callers must ensure usage is safe.
-  inline T* pop();
-
-  // Take all the objects from the queue, leaving the queue empty.
-  // Not thread-safe.  There must be no concurrent operations.
-  // Returns a pair of <head, tail> pointers to the current queue.
-  inline Pair<T*, T*> take_all();
-
-  // Iteration support is provided by first() and is_end().  The queue must
-  // not be modified while iterating over its elements.
-
-  // Return the first object in the queue, or an end marker (a pointer p for
-  // which is_end(p) is true) if the queue is empty.
-  inline T* first() const;
-
-  // Test whether entry is an end marker for this queue.
-  inline bool is_end(const T* entry) const;
-};
-
-#endif // SHARE_UTILITIES_NONBLOCKINGQUEUE_HPP
diff --git a/src/hotspot/share/utilities/nonblockingQueue.inline.hpp b/src/hotspot/share/utilities/nonblockingQueue.inline.hpp
deleted file mode 100644
index d805eedb7a4..00000000000
--- a/src/hotspot/share/utilities/nonblockingQueue.inline.hpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_UTILITIES_NONBLOCKINGQUEUE_INLINE_HPP
-#define SHARE_UTILITIES_NONBLOCKINGQUEUE_INLINE_HPP
-
-#include "utilities/nonblockingQueue.hpp"
-
-#include "runtime/atomicAccess.hpp"
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-T* NonblockingQueue<T, next_ptr>::next(const T& node) {
-  return AtomicAccess::load(next_ptr(const_cast<T&>(node)));
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-void NonblockingQueue<T, next_ptr>::set_next(T& node, T* new_next) {
-  AtomicAccess::store(next_ptr(node), new_next);
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-NonblockingQueue<T, next_ptr>::NonblockingQueue() : _head(nullptr), _tail(nullptr) {}
-
-#ifdef ASSERT
-template<typename T, T* volatile* (*next_ptr)(T&)>
-NonblockingQueue<T, next_ptr>::~NonblockingQueue() {
-  assert(_head == nullptr, "precondition");
-  assert(_tail == nullptr, "precondition");
-}
-#endif
-
-// The end_marker must be uniquely associated with the specific queue, in
-// case queue elements can make their way through multiple queues.  A
-// pointer to the queue itself (after casting) satisfies that requirement.
-template<typename T, T* volatile* (*next_ptr)(T&)>
-T* NonblockingQueue<T, next_ptr>::end_marker() const {
-  return const_cast<T*>(reinterpret_cast<const T*>(this));
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-T* NonblockingQueue<T, next_ptr>::first() const {
-  T* head = AtomicAccess::load(&_head);
-  return head == nullptr ? end_marker() : head;
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-bool NonblockingQueue<T, next_ptr>::is_end(const T* entry) const {
-  return entry == end_marker();
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-bool NonblockingQueue<T, next_ptr>::empty() const {
-  return AtomicAccess::load(&_head) == nullptr;
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-size_t NonblockingQueue<T, next_ptr>::length() const {
-  size_t result = 0;
-  for (T* cur = first(); !is_end(cur); cur = next(*cur)) {
-    ++result;
-  }
-  return result;
-}
-
-// An append operation atomically exchanges the new tail with the queue tail.
-// It then sets the "next" value of the old tail to the head of the list being
-// appended. If the old tail is null then the queue was empty, then the
-// head of the list being appended is instead stored in the queue head.
-//
-// This means there is a period between the exchange and the old tail update
-// where the queue sequence is split into two parts, the list from the queue
-// head to the old tail, and the list being appended.  If there are concurrent
-// push/append operations, each may introduce another such segment.  But they
-// all eventually get resolved by their respective updates of their old tail's
-// "next" value.  This also means that try_pop operation must handle an object
-// differently depending on its "next" value.
-//
-// A push operation is just a degenerate append, where the object being pushed
-// is both the head and the tail of the list being appended.
-template<typename T, T* volatile* (*next_ptr)(T&)>
-void NonblockingQueue<T, next_ptr>::append(T& first, T& last) {
-  assert(next(last) == nullptr, "precondition");
-  // Make last the new end of the queue.  Any further push/appends will
-  // extend after last.  We will try to extend from the previous end of
-  // queue.
-  set_next(last, end_marker());
-  T* old_tail = AtomicAccess::xchg(&_tail, &last);
-  if (old_tail == nullptr) {
-    // If old_tail is null then the queue was empty, and _head must also be
-    // null. The correctness of this assertion depends on try_pop clearing
-    // first _head then _tail when taking the last entry.
-    assert(AtomicAccess::load(&_head) == nullptr, "invariant");
-    // Fall through to common update of _head.
-  } else if (is_end(AtomicAccess::cmpxchg(next_ptr(*old_tail), end_marker(), &first))) {
-    // Successfully extended the queue list from old_tail to first.  No
-    // other push/append could have competed with us, because we claimed
-    // old_tail for extension.  We won any races with try_pop by changing
-    // away from end-marker.  So we're done.
-    //
-    // Note that ABA is possible here.  A concurrent try_pop could take
-    // old_tail before our update of old_tail's next_ptr, old_tail gets
-    // recycled and re-added to the end of this queue, and then we
-    // successfully cmpxchg, making the list in _tail circular.  Callers
-    // must ensure this can't happen.
-    return;
-  } else {
-    // A concurrent try_pop has claimed old_tail, so it is no longer in the
-    // list. The queue was logically empty.  _head is either null or
-    // old_tail, depending on how far try_pop operations have progressed.
-    DEBUG_ONLY(T* old_head = AtomicAccess::load(&_head);)
-    assert((old_head == nullptr) || (old_head == old_tail), "invariant");
-    // Fall through to common update of _head.
-  }
-  // The queue was empty, and first should become the new _head.  The queue
-  // will appear to be empty to any further try_pops until done.
-  AtomicAccess::store(&_head, &first);
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-bool NonblockingQueue<T, next_ptr>::try_pop(T** node_ptr) {
-  // We only need memory_order_consume. Upgrade it to "load_acquire"
-  // as the memory_order_consume API is not ready for use yet.
-  T* old_head = AtomicAccess::load_acquire(&_head);
-  if (old_head == nullptr) {
-    *node_ptr = nullptr;
-    return true;                // Queue is empty.
-  }
-
-  T* next_node = AtomicAccess::load_acquire(next_ptr(*old_head));
-  if (!is_end(next_node)) {
-    // [Clause 1]
-    // There are several cases for next_node.
-    // (1) next_node is the extension of the queue's list.
-    // (2) next_node is null, because a competing try_pop took old_head.
-    // (3) next_node is the extension of some unrelated list, because a
-    // competing try_pop took old_head and put it in some other list.
-    //
-    // Attempt to advance the list, replacing old_head with next_node in
-    // _head.  The success or failure of that attempt, along with the value
-    // of next_node, are used to partially determine which case we're in and
-    // how to proceed.  In particular, advancement will fail for case (3).
-    if (old_head != AtomicAccess::cmpxchg(&_head, old_head, next_node)) {
-      // [Clause 1a]
-      // The cmpxchg to advance the list failed; a concurrent try_pop won
-      // the race and claimed old_head.  This can happen for any of the
-      // next_node cases.
-      return false;
-    } else if (next_node == nullptr) {
-      // [Clause 1b]
-      // The cmpxchg to advance the list succeeded, but a concurrent try_pop
-      // has already claimed old_head (see [Clause 2] - old_head was the last
-      // entry in the list) by nulling old_head's next field.  The advance set
-      // _head to null, "helping" the competing try_pop.  _head will remain
-      // nullptr until a subsequent push/append.  This is a lost race, and we
-      // report it as such for consistency, though we could report the queue
-      // was empty.  We don't attempt to further help [Clause 2] by also
-      // trying to set _tail to nullptr, as that would just ensure that one or
-      // the other cmpxchg is a wasted failure.
-      return false;
-    } else {
-      // [Clause 1c]
-      // Successfully advanced the list and claimed old_head.  next_node was
-      // in the extension of the queue's list.  Return old_head after
-      // unlinking it from next_node.
-      set_next(*old_head, nullptr);
-      *node_ptr = old_head;
-      return true;
-    }
-
-  } else if (is_end(AtomicAccess::cmpxchg(next_ptr(*old_head), next_node, (T*)nullptr))) {
-    // [Clause 2]
-    // Old_head was the last entry and we've claimed it by setting its next
-    // value to null.  However, this leaves the queue in disarray.  Fix up
-    // the queue, possibly in conjunction with other concurrent operations.
-    // Any further try_pops will consider the queue empty until a
-    // push/append completes by installing a new head.
-
-    // The order of the two cmpxchgs doesn't matter algorithmically, but
-    // dealing with _head first gives a stronger invariant in append, and is
-    // also consistent with [Clause 1b].
-
-    // Attempt to change the queue head from old_head to null.  Failure of
-    // the cmpxchg indicates a concurrent operation updated _head first.  That
-    // could be either a push/append or a try_pop in [Clause 1b].
-    AtomicAccess::cmpxchg(&_head, old_head, (T*)nullptr);
-
-    // Attempt to change the queue tail from old_head to null.  Failure of
-    // the cmpxchg indicates that a concurrent push/append updated _tail first.
-    // That operation will eventually recognize the old tail (our old_head) is
-    // no longer in the list and update _head from the list being appended.
-    AtomicAccess::cmpxchg(&_tail, old_head, (T*)nullptr);
-
-    // The queue has been restored to order, and we can return old_head.
-    *node_ptr = old_head;
-    return true;
-
-  } else {
-    // [Clause 3]
-    // Old_head was the last entry in the list, but either a concurrent
-    // try_pop claimed it first or a concurrent push/append extended the
-    // list from it.  Either way, we lost the race to claim it.
-    return false;
-  }
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-T* NonblockingQueue<T, next_ptr>::pop() {
-  T* result = nullptr;
-  // Typically try_pop() will succeed without retrying many times, thus we
-  // omit SpinPause in the loop body.  SpinPause or yield may be worthwhile
-  // in rare, highly contended cases, and client code could implement such
-  // with try_pop().
-  while (!try_pop(&result)) {}
-  return result;
-}
-
-template<typename T, T* volatile* (*next_ptr)(T&)>
-Pair<T*, T*> NonblockingQueue<T, next_ptr>::take_all() {
-  T* tail = AtomicAccess::load(&_tail);
-  if (tail != nullptr) set_next(*tail, nullptr); // Clear end marker.
-  Pair<T*, T*> result(AtomicAccess::load(&_head), tail);
-  AtomicAccess::store(&_head, (T*)nullptr);
-  AtomicAccess::store(&_tail, (T*)nullptr);
-  return result;
-}
-
-#endif // SHARE_UTILITIES_NONBLOCKINGQUEUE_INLINE_HPP
diff --git a/test/hotspot/gtest/utilities/test_nonblockingQueue.cpp b/test/hotspot/gtest/utilities/test_nonblockingQueue.cpp
deleted file mode 100644
index ae299730f6e..00000000000
--- a/test/hotspot/gtest/utilities/test_nonblockingQueue.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "memory/allocation.inline.hpp"
-#include "runtime/atomicAccess.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/nonblockingQueue.inline.hpp"
-#include "utilities/pair.hpp"
-#include "threadHelper.inline.hpp"
-#include "unittest.hpp"
-
-#include <new>
-
-class NonblockingQueueTestElement {
-  typedef NonblockingQueueTestElement Element;
-
-  Element* volatile _entry;
-  Element* volatile _entry1;
-  size_t _id;
-
-  static Element* volatile* entry_ptr(Element& e) { return &e._entry; }
-  static Element* volatile* entry1_ptr(Element& e) { return &e._entry1; }
-
-public:
-  using TestQueue = NonblockingQueue<Element, &entry_ptr>;
-  using TestQueue1 = NonblockingQueue<Element, &entry1_ptr>;
-
-  NonblockingQueueTestElement(size_t id = 0) : _entry(), _entry1(), _id(id) {}
-  size_t id() const { return _id; }
-  void set_id(size_t value) { _id = value; }
-  Element* next() { return _entry; }
-  Element* next1() { return _entry1; }
-};
-
-typedef NonblockingQueueTestElement Element;
-typedef Element::TestQueue TestQueue;
-typedef Element::TestQueue1 TestQueue1;
-
-static void initialize(Element* elements, size_t size, TestQueue* queue) {
-  for (size_t i = 0; i < size; ++i) {
-    elements[i].set_id(i);
-  }
-  ASSERT_TRUE(queue->empty());
-  ASSERT_EQ(0u, queue->length());
-  ASSERT_TRUE(queue->is_end(queue->first()));
-  ASSERT_TRUE(queue->pop() == nullptr);
-
-  for (size_t id = 0; id < size; ++id) {
-    ASSERT_EQ(id, queue->length());
-    Element* e = &elements[id];
-    ASSERT_EQ(id, e->id());
-    queue->push(*e);
-    ASSERT_FALSE(queue->empty());
-    // first() is always the oldest element.
-    ASSERT_EQ(&elements[0], queue->first());
-  }
-}
-
-class NonblockingQueueTestBasics : public ::testing::Test {
-public:
-  NonblockingQueueTestBasics();
-
-  static const size_t nelements = 10;
-  Element elements[nelements];
-  TestQueue queue;
-};
-
-const size_t NonblockingQueueTestBasics::nelements;
-
-NonblockingQueueTestBasics::NonblockingQueueTestBasics() : queue() {
-  initialize(elements, nelements, &queue);
-}
-
-TEST_F(NonblockingQueueTestBasics, pop) {
-  for (size_t i = 0; i < nelements; ++i) {
-    ASSERT_FALSE(queue.empty());
-    ASSERT_EQ(nelements - i, queue.length());
-    Element* e = queue.pop();
-    ASSERT_TRUE(e != nullptr);
-    ASSERT_EQ(&elements[i], e);
-    ASSERT_EQ(i, e->id());
-  }
-  ASSERT_TRUE(queue.empty());
-  ASSERT_EQ(0u, queue.length());
-  ASSERT_TRUE(queue.pop() == nullptr);
-}
-
-TEST_F(NonblockingQueueTestBasics, append) {
-  TestQueue other_queue;
-  ASSERT_TRUE(other_queue.empty());
-  ASSERT_EQ(0u, other_queue.length());
-  ASSERT_TRUE(other_queue.is_end(other_queue.first()));
-  ASSERT_TRUE(other_queue.pop() == nullptr);
-
-  Pair<Element*, Element*> pair = queue.take_all();
-  other_queue.append(*pair.first, *pair.second);
-  ASSERT_EQ(nelements, other_queue.length());
-  ASSERT_TRUE(queue.empty());
-  ASSERT_EQ(0u, queue.length());
-  ASSERT_TRUE(queue.is_end(queue.first()));
-  ASSERT_TRUE(queue.pop() == nullptr);
-
-  for (size_t i = 0; i < nelements; ++i) {
-    ASSERT_EQ(nelements - i, other_queue.length());
-    Element* e = other_queue.pop();
-    ASSERT_TRUE(e != nullptr);
-    ASSERT_EQ(&elements[i], e);
-    ASSERT_EQ(i, e->id());
-  }
-  ASSERT_EQ(0u, other_queue.length());
-  ASSERT_TRUE(other_queue.pop() == nullptr);
-}
-
-TEST_F(NonblockingQueueTestBasics, two_queues) {
-  TestQueue1 queue1;
-  ASSERT_TRUE(queue1.pop() == nullptr);
-
-  for (size_t id = 0; id < nelements; ++id) {
-    queue1.push(elements[id]);
-  }
-  ASSERT_EQ(nelements, queue1.length());
-  Element* e0 = queue.first();
-  Element* e1 = queue1.first();
-  ASSERT_TRUE(e0 != nullptr);
-  ASSERT_TRUE(e1 != nullptr);
-  ASSERT_FALSE(queue.is_end(e0));
-  ASSERT_FALSE(queue1.is_end(e1));
-  while (!queue.is_end(e0) && !queue1.is_end(e1)) {
-    ASSERT_EQ(e0, e1);
-    e0 = e0->next();
-    e1 = e1->next1();
-  }
-  ASSERT_TRUE(queue.is_end(e0));
-  ASSERT_TRUE(queue1.is_end(e1));
-
-  for (size_t i = 0; i < nelements; ++i) {
-    ASSERT_EQ(nelements - i, queue.length());
-    ASSERT_EQ(nelements - i, queue1.length());
-
-    Element* e = queue.pop();
-    ASSERT_TRUE(e != nullptr);
-    ASSERT_EQ(&elements[i], e);
-    ASSERT_EQ(i, e->id());
-
-    Element* e1 = queue1.pop();
-    ASSERT_TRUE(e1 != nullptr);
-    ASSERT_EQ(&elements[i], e1);
-    ASSERT_EQ(i, e1->id());
-
-    ASSERT_EQ(e, e1);
-  }
-  ASSERT_EQ(0u, queue.length());
-  ASSERT_EQ(0u, queue1.length());
-  ASSERT_TRUE(queue.pop() == nullptr);
-  ASSERT_TRUE(queue1.pop() == nullptr);
-}
-
-class NonblockingQueueTestThread : public JavaTestThread {
-  uint _id;
-  TestQueue* _from;
-  TestQueue* _to;
-  volatile size_t* _processed;
-  size_t _process_limit;
-  size_t _local_processed;
-  volatile bool _ready;
-
-public:
-  NonblockingQueueTestThread(Semaphore* post,
-                             uint id,
-                             TestQueue* from,
-                             TestQueue* to,
-                             volatile size_t* processed,
-                             size_t process_limit) :
-    JavaTestThread(post),
-    _id(id),
-    _from(from),
-    _to(to),
-    _processed(processed),
-    _process_limit(process_limit),
-    _local_processed(0),
-    _ready(false)
-  {}
-
-  virtual void main_run() {
-    AtomicAccess::release_store_fence(&_ready, true);
-    while (true) {
-      Element* e = _from->pop();
-      if (e != nullptr) {
-        _to->push(*e);
-        AtomicAccess::inc(_processed);
-        ++_local_processed;
-      } else if (AtomicAccess::load_acquire(_processed) == _process_limit) {
-        tty->print_cr("thread %u processed %zu", _id, _local_processed);
-        return;
-      }
-    }
-  }
-
-  bool ready() const { return AtomicAccess::load_acquire(&_ready); }
-};
-
-TEST_VM(NonblockingQueueTest, stress) {
-  Semaphore post;
-  TestQueue initial_queue;
-  TestQueue start_queue;
-  TestQueue middle_queue;
-  TestQueue final_queue;
-  volatile size_t stage1_processed = 0;
-  volatile size_t stage2_processed = 0;
-
-  const size_t nelements = 10000;
-  Element* elements = NEW_C_HEAP_ARRAY(Element, nelements, mtOther);
-  for (size_t id = 0; id < nelements; ++id) {
-    ::new (&elements[id]) Element(id);
-    initial_queue.push(elements[id]);
-  }
-  ASSERT_EQ(nelements, initial_queue.length());
-
-  // - stage1 threads pop from start_queue and push to middle_queue.
-  // - stage2 threads pop from middle_queue and push to final_queue.
-  // - all threads in a stage count the number of elements processed in
-  //   their corresponding stageN_processed counter.
-
-  const uint stage1_threads = 2;
-  const uint stage2_threads = 2;
-  const uint nthreads = stage1_threads + stage2_threads;
-  NonblockingQueueTestThread* threads[nthreads] = {};
-
-  for (uint i = 0; i < ARRAY_SIZE(threads); ++i) {
-    TestQueue* from = &start_queue;
-    TestQueue* to = &middle_queue;
-    volatile size_t* processed = &stage1_processed;
-    if (i >= stage1_threads) {
-      from = &middle_queue;
-      to = &final_queue;
-      processed = &stage2_processed;
-    }
-    threads[i] =
-      new NonblockingQueueTestThread(&post, i, from, to, processed, nelements);
-    threads[i]->doit();
-    while (!threads[i]->ready()) {} // Wait until ready to start test.
-  }
-
-  // Transfer elements to start_queue to start test.
-  Pair<Element*, Element*> pair = initial_queue.take_all();
-  start_queue.append(*pair.first, *pair.second);
-
-  // Wait for all threads to complete.
-  for (uint i = 0; i < nthreads; ++i) {
-    post.wait();
-  }
-
-  // Verify expected state.
-  ASSERT_EQ(nelements, stage1_processed);
-  ASSERT_EQ(nelements, stage2_processed);
-  ASSERT_EQ(0u, initial_queue.length());
-  ASSERT_EQ(0u, start_queue.length());
-  ASSERT_EQ(0u, middle_queue.length());
-  ASSERT_EQ(nelements, final_queue.length());
-  while (final_queue.pop() != nullptr) {}
-
-  FREE_C_HEAP_ARRAY(Element, elements);
-}

From cc05530b813564a40c233eaaa80b906795c6d752 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Fri, 14 Nov 2025 20:57:20 +0000
Subject: [PATCH 182/512] 8371732: [redo] Change java.time month/day field
 types to 'byte'

Reviewed-by: darcy, alanb
---
 .../share/classes/java/time/LocalDate.java    | 28 +++++++++++++++----
 .../share/classes/java/time/MonthDay.java     | 26 +++++++++++++----
 .../share/classes/java/time/YearMonth.java    | 24 +++++++++++++---
 .../classes/java/time/chrono/HijrahDate.java  | 14 +++++-----
 .../time/test/java/time/TestLocalDate.java    | 18 +++++++++++-
 .../time/test/java/time/TestMonthDay.java     | 18 +++++++++++-
 .../time/test/java/time/TestYearMonth.java    | 20 ++++++++++++-
 7 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 016bdab5394..2105621d135 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -79,6 +79,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamField;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.IsoEra;
@@ -142,6 +144,22 @@ import jdk.internal.util.DateTimeHelper;
 public final class LocalDate
         implements Temporal, TemporalAdjuster, ChronoLocalDate, Serializable {
 
+    /**
+     * For backward compatibility of the serialized {@code LocalDate.class} object,
+     * explicitly declare the types of the serialized fields as defined in Java SE 8.
+     * Instances of {@code LocalDate} are serialized using the dedicated
+     * serialized form by {@code writeReplace}.
+     * @serialField year int The year.
+     * @serialField month short The month-of-year.
+     * @serialField day short The day-of-month.
+     */
+    @Serial
+    private static final ObjectStreamField[] serialPersistentFields = {
+            new ObjectStreamField("year", int.class),
+            new ObjectStreamField("month", short.class),
+            new ObjectStreamField("day", short.class)
+    };
+
     /**
      * The minimum supported {@code LocalDate}, '-999999999-01-01'.
      * This could be used by an application as a "far past" date.
@@ -178,15 +196,15 @@ public final class LocalDate
     /**
      * @serial The year.
      */
-    private final int year;
+    private final transient int year;
     /**
      * @serial The month-of-year.
      */
-    private final short month;
+    private final transient byte month;
     /**
      * @serial The day-of-month.
      */
-    private final short day;
+    private final transient byte day;
 
     //-----------------------------------------------------------------------
     /**
@@ -490,8 +508,8 @@ public final class LocalDate
      */
     private LocalDate(int year, int month, int dayOfMonth) {
         this.year = year;
-        this.month = (short) month;
-        this.day = (short) dayOfMonth;
+        this.month = (byte) month;
+        this.day = (byte) dayOfMonth;
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/MonthDay.java b/src/java.base/share/classes/java/time/MonthDay.java
index 1de4fa84d3e..a25c9beec95 100644
--- a/src/java.base/share/classes/java/time/MonthDay.java
+++ b/src/java.base/share/classes/java/time/MonthDay.java
@@ -69,6 +69,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamField;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.chrono.Chronology;
 import java.time.chrono.IsoChronology;
@@ -133,6 +135,20 @@ public final class MonthDay
      */
     @java.io.Serial
     private static final long serialVersionUID = -939150713474957432L;
+
+    /**
+     * For backward compatibility of the serialized {@code MonthDay.class} object,
+     * explicitly declare the types of the serialized fields as defined in Java SE 8.
+     * Instances of {@code MonthDay} are serialized using the dedicated
+     * serialized form by {@code writeReplace}.
+     * @serialField month int The month-of-year.
+     * @serialField day int The day-of-month.
+     */
+    @Serial
+    private static final ObjectStreamField[] serialPersistentFields = {
+            new ObjectStreamField("month", int.class),
+            new ObjectStreamField("day", int.class)
+    };
     /**
      * Parser.
      */
@@ -144,13 +160,13 @@ public final class MonthDay
         .toFormatter();
 
     /**
-     * @serial The month-of-year, not null.
+     * @serial The month-of-year.
      */
-    private final int month;
+    private final transient byte month;
     /**
      * @serial The day-of-month.
      */
-    private final int day;
+    private final transient byte day;
 
     //-----------------------------------------------------------------------
     /**
@@ -319,8 +335,8 @@ public final class MonthDay
      * @param dayOfMonth  the day-of-month to represent, validated from 1 to 29-31
      */
     private MonthDay(int month, int dayOfMonth) {
-        this.month = month;
-        this.day = dayOfMonth;
+        this.month = (byte) month;
+        this.day = (byte) dayOfMonth;
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/YearMonth.java b/src/java.base/share/classes/java/time/YearMonth.java
index 8ad1172811f..b3d1aff7bc2 100644
--- a/src/java.base/share/classes/java/time/YearMonth.java
+++ b/src/java.base/share/classes/java/time/YearMonth.java
@@ -78,6 +78,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamField;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.chrono.Chronology;
 import java.time.chrono.IsoChronology;
@@ -137,6 +139,20 @@ public final class YearMonth
      */
     @java.io.Serial
     private static final long serialVersionUID = 4183400860270640070L;
+
+    /**
+     * For backward compatibility of the serialized {@code YearMonth.class} object,
+     * explicitly declare the types of the serialized fields as defined in Java SE 8.
+     * Instances of {@code YearMonth} are serialized using the dedicated
+     * serialized form by {@code writeReplace}.
+     * @serialField year int The year.
+     * @serialField month int The month-of-year.
+     */
+    @java.io.Serial
+    private static final ObjectStreamField[] serialPersistentFields = {
+            new ObjectStreamField("year", int.class),
+            new ObjectStreamField("month", int.class),
+    };
     /**
      * Parser.
      */
@@ -149,11 +165,11 @@ public final class YearMonth
     /**
      * @serial The year.
      */
-    private final int year;
+    private final transient int year;
     /**
-     * @serial The month-of-year, not null.
+     * @serial The month-of-year..
      */
-    private final int month;
+    private final transient byte month;
 
     //-----------------------------------------------------------------------
     /**
@@ -306,7 +322,7 @@ public final class YearMonth
      */
     private YearMonth(int year, int month) {
         this.year = year;
-        this.month = month;
+        this.month = (byte) month;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahDate.java b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
index 114a47e4797..2d3e4f93e69 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahDate.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,11 +137,11 @@ public final class HijrahDate
     /**
      * The month-of-year.
      */
-    private final transient int monthOfYear;
+    private final transient byte monthOfYear;
     /**
      * The day-of-month.
      */
-    private final transient int dayOfMonth;
+    private final transient byte dayOfMonth;
 
     //-------------------------------------------------------------------------
     /**
@@ -273,8 +273,8 @@ public final class HijrahDate
 
         this.chrono = chrono;
         this.prolepticYear = prolepticYear;
-        this.monthOfYear = monthOfYear;
-        this.dayOfMonth = dayOfMonth;
+        this.monthOfYear = (byte) monthOfYear;
+        this.dayOfMonth = (byte) dayOfMonth;
     }
 
     /**
@@ -287,8 +287,8 @@ public final class HijrahDate
 
         this.chrono = chrono;
         this.prolepticYear = dateInfo[0];
-        this.monthOfYear = dateInfo[1];
-        this.dayOfMonth = dateInfo[2];
+        this.monthOfYear = (byte) dateInfo[1];
+        this.dayOfMonth = (byte) dateInfo[2];
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/test/java/time/TestLocalDate.java b/test/jdk/java/time/test/java/time/TestLocalDate.java
index 4b732b0619b..ef7a10ac687 100644
--- a/test/jdk/java/time/test/java/time/TestLocalDate.java
+++ b/test/jdk/java/time/test/java/time/TestLocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,8 @@ import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+import java.io.ObjectStreamClass;
+import java.io.ObjectStreamField;
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.Month;
@@ -515,4 +517,18 @@ public class TestLocalDate extends AbstractTest {
                 .minus(quarterYears, ChronoUnit.MONTHS);
         assertEquals(t0, t1);
     }
+
+    // Verify serialized fields types are backward compatible
+    @Test
+    public void verifySerialFields() {
+        var osc = ObjectStreamClass.lookup(LocalDate.class);
+        for (ObjectStreamField f : osc.getFields()) {
+            switch (f.getName()) {
+                case "year" -> assertEquals(f.getType(), int.class, f.getName());
+                case "month",
+                     "day" -> assertEquals(f.getType(), short.class);
+                default -> fail("unknown field in LocalDate: " + f.getName());
+            }
+        }
+    }
 }
diff --git a/test/jdk/java/time/test/java/time/TestMonthDay.java b/test/jdk/java/time/test/java/time/TestMonthDay.java
index b03878be1a5..311a40030c1 100644
--- a/test/jdk/java/time/test/java/time/TestMonthDay.java
+++ b/test/jdk/java/time/test/java/time/TestMonthDay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,10 @@ package test.java.time;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
+import java.io.ObjectStreamClass;
+import java.io.ObjectStreamField;
 import java.time.LocalDate;
 import java.time.Month;
 import java.time.MonthDay;
@@ -144,4 +147,17 @@ public class TestMonthDay extends AbstractTest {
         }
     }
 
+
+    // Verify serialized fields types are backward compatible
+    @Test
+    public void verifySerialFields() {
+        var osc = ObjectStreamClass.lookup(MonthDay.class);
+        for (ObjectStreamField f : osc.getFields()) {
+            switch (f.getName()) {
+                case "month",
+                     "day" -> assertEquals(f.getType(), int.class, f.getName());
+                default -> fail("unknown field in MonthDay: " + f.getName());
+            }
+        }
+    }
 }
diff --git a/test/jdk/java/time/test/java/time/TestYearMonth.java b/test/jdk/java/time/test/java/time/TestYearMonth.java
index f02ed96a5d7..0552994b8c2 100644
--- a/test/jdk/java/time/test/java/time/TestYearMonth.java
+++ b/test/jdk/java/time/test/java/time/TestYearMonth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,16 @@
  */
 package test.java.time;
 
+import java.io.ObjectStreamClass;
+import java.io.ObjectStreamField;
+import java.time.LocalDate;
 import java.time.YearMonth;
 
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
 /**
  * Test YearMonth.
  */
@@ -75,4 +81,16 @@ public class TestYearMonth extends AbstractTest {
         assertImmutable(YearMonth.class);
     }
 
+    // Verify serialized fields types are backward compatible
+    @Test
+    public void verifySerialFields() {
+        var osc = ObjectStreamClass.lookup(YearMonth.class);
+        for (ObjectStreamField f : osc.getFields()) {
+            switch (f.getName()) {
+                case "year" -> assertEquals(f.getType(), int.class, f.getName());
+                case "month" -> assertEquals(f.getType(), int.class, f.getName());
+                default -> fail("unknown field in YearMonth: " + f.getName());
+            }
+        }
+    }
 }

From ad3dfaf1fc483bb2bfd5c26d76c43b8f69454cbd Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Fri, 14 Nov 2025 21:08:36 +0000
Subject: [PATCH 183/512] 8360564: Implement JEP 524: PEM Encodings of
 Cryptographic Objects (Second Preview)

Reviewed-by: weijun, mullan
---
 .../classes/java/security/DEREncodable.java   |   4 +-
 .../share/classes/java/security/PEM.java      | 147 ++++++
 .../classes/java/security/PEMDecoder.java     | 361 ++++++++-------
 .../classes/java/security/PEMEncoder.java     | 367 +++++++--------
 .../classes/java/security/PEMRecord.java      | 120 -----
 .../javax/crypto/EncryptedPrivateKeyInfo.java | 435 +++++++++++-------
 .../jdk/internal/javac/PreviewFeature.java    |   3 +-
 .../classes/sun/security/ec/ECKeyFactory.java |  15 +-
 .../sun/security/ec/ECPrivateKeyImpl.java     |  93 ++--
 .../sun/security/ec/XDHKeyFactory.java        |  22 +-
 .../sun/security/ec/ed/EdDSAKeyFactory.java   |  15 +-
 .../classes/sun/security/pkcs/PKCS8Key.java   |  49 +-
 .../sun/security/provider/X509Factory.java    |   4 +-
 .../classes/sun/security/util/KeyUtil.java    |  20 +-
 .../share/classes/sun/security/util/Pem.java  | 149 +++++-
 test/jdk/java/security/PEM/PEMData.java       |  36 +-
 .../jdk/java/security/PEM/PEMDecoderTest.java | 112 +++--
 .../jdk/java/security/PEM/PEMEncoderTest.java |  83 +++-
 .../{EncryptKey.java => Encrypt.java}         |  42 +-
 .../EncryptedPrivateKeyInfo/GetKey.java       |   3 +-
 .../EncryptedPrivateKeyInfo/GetKeyPair.java   | 120 +++++
 .../net/ssl/interop/ClientHelloInterOp.java   |   1 -
 22 files changed, 1385 insertions(+), 816 deletions(-)
 create mode 100644 src/java.base/share/classes/java/security/PEM.java
 delete mode 100644 src/java.base/share/classes/java/security/PEMRecord.java
 rename test/jdk/javax/crypto/EncryptedPrivateKeyInfo/{EncryptKey.java => Encrypt.java} (76%)
 create mode 100644 test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeyPair.java

diff --git a/src/java.base/share/classes/java/security/DEREncodable.java b/src/java.base/share/classes/java/security/DEREncodable.java
index 63c6a73ee52..1401336037c 100644
--- a/src/java.base/share/classes/java/security/DEREncodable.java
+++ b/src/java.base/share/classes/java/security/DEREncodable.java
@@ -47,7 +47,7 @@ import java.security.spec.X509EncodedKeySpec;
  * @see EncryptedPrivateKeyInfo
  * @see X509Certificate
  * @see X509CRL
- * @see PEMRecord
+ * @see PEM
  *
  * @since 25
  */
@@ -55,5 +55,5 @@ import java.security.spec.X509EncodedKeySpec;
 @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
 public sealed interface DEREncodable permits AsymmetricKey, KeyPair,
     PKCS8EncodedKeySpec, X509EncodedKeySpec, EncryptedPrivateKeyInfo,
-    X509Certificate, X509CRL, PEMRecord {
+    X509Certificate, X509CRL, PEM {
 }
diff --git a/src/java.base/share/classes/java/security/PEM.java b/src/java.base/share/classes/java/security/PEM.java
new file mode 100644
index 00000000000..2068fb707dc
--- /dev/null
+++ b/src/java.base/share/classes/java/security/PEM.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.security;
+
+import jdk.internal.javac.PreviewFeature;
+
+import sun.security.util.Pem;
+
+import java.io.InputStream;
+import java.util.Base64;
+import java.util.Objects;
+
+/**
+ * {@code PEM} is a {@link DEREncodable} that represents Privacy-Enhanced
+ * Mail (PEM) data by its type and Base64-encoded content.
+ *
+ * <p> The {@link PEMDecoder#decode(String)} and
+ * {@link PEMDecoder#decode(InputStream)} methods return a {@code PEM} object
+ * when the data type cannot be represented by a cryptographic object.
+ * If you need access to the leading data of a PEM text, or want to
+ * handle the text content directly, use the decoding methods
+ * {@link PEMDecoder#decode(String, Class)} or
+ * {@link PEMDecoder#decode(InputStream, Class)} with {@code PEM.class} as an
+ * argument type.
+ *
+ * <p> A {@code PEM} object can be encoded back to its textual format by calling
+ * {@link #toString()} or by using the encode methods in {@link PEMEncoder}.
+ *
+ * <p> When constructing a {@code PEM} instance, both {@code type} and
+ * {@code content} must not be {@code null}.
+ *
+ * <p>No validation is performed during instantiation to ensure that
+ * {@code type} conforms to RFC 7468 or other legacy formats, that
+ * {@code content} is valid Base64 data, or that {@code content} matches the
+ * {@code type}.
+
+ * <p> Common {@code type} values include, but are not limited to:
+ * CERTIFICATE, CERTIFICATE REQUEST, ATTRIBUTE CERTIFICATE, X509 CRL, PKCS7,
+ * CMS, PRIVATE KEY, ENCRYPTED PRIVATE KEY, and PUBLIC KEY.
+ *
+ * <p> {@code leadingData} is {@code null} if there is no data preceding the PEM
+ * header during decoding. {@code leadingData} can be useful for reading
+ * metadata that accompanies the PEM data. Because the value may represent a large
+ * amount of data, it is not defensively copied by the constructor, and the
+ * {@link #leadingData()} method does not return a clone. Modification of the
+ * passed-in or returned array changes the value stored in this record.
+ *
+ * @param type the type identifier from the PEM header, without PEM syntax
+ *             labels; for example, for a public key, {@code type} would be
+ *             "PUBLIC KEY"
+ * @param content the Base64-encoded data, excluding the PEM header and footer
+ * @param leadingData any non-PEM data that precedes the PEM header during
+ *                    decoding.  This value may be {@code null}.
+ *
+ * @spec https://www.rfc-editor.org/info/rfc7468
+ *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
+ *
+ * @see PEMDecoder
+ * @see PEMEncoder
+ *
+ * @since 26
+ */
+@PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+public record PEM(String type, String content, byte[] leadingData)
+    implements DEREncodable {
+
+    /**
+     * Creates a {@code PEM} instance with the specified parameters.
+     *
+     * @param type the PEM type identifier
+     * @param content the Base64-encoded data, excluding the PEM header and footer
+     * @param leadingData any non-PEM data read during the decoding process
+     *                    before the PEM header.  This value may be {@code null}.
+     * @throws IllegalArgumentException if {@code type} is incorrectly formatted
+     * @throws NullPointerException if {@code type} or {@code content} is {@code null}
+     */
+    public PEM {
+        Objects.requireNonNull(type, "\"type\" cannot be null.");
+        Objects.requireNonNull(content, "\"content\" cannot be null.");
+
+        // With no validity checking on `type`, the constructor accept anything
+        // including lowercase.  The onus is on the caller.
+        if (type.startsWith("-") || type.startsWith("BEGIN ") ||
+            type.startsWith("END ")) {
+            throw new IllegalArgumentException("PEM syntax labels found. " +
+                "Only the PEM type identifier is allowed.");
+        }
+    }
+
+    /**
+     * Creates a {@code PEM} instance with the specified type and content. This
+     * constructor sets {@code leadingData} to {@code null}.
+     *
+     * @param type the PEM type identifier
+     * @param content the Base64-encoded data, excluding the PEM header and footer
+     * @throws IllegalArgumentException if {@code type} is incorrectly formatted
+     * @throws NullPointerException if {@code type} or {@code content} is {@code null}
+     */
+    public PEM(String type, String content) {
+        this(type, content, null);
+    }
+
+    /**
+     * Returns the PEM formatted string containing the {@code type} and
+     * Base64-encoded {@code content}. {@code leadingData} is not included.
+     *
+     * @return the PEM text representation
+     */
+    @Override
+    final public String toString() {
+        return Pem.pemEncoded(this);
+    }
+
+    /**
+     * Returns a Base64-decoded byte array of {@code content}, using
+     * {@link Base64#getMimeDecoder()}.
+     *
+     * @return a decoded byte array
+     * @throws IllegalArgumentException if decoding fails
+     */
+    final public byte[] decode() {
+        return Base64.getMimeDecoder().decode(content);
+    }
+}
diff --git a/src/java.base/share/classes/java/security/PEMDecoder.java b/src/java.base/share/classes/java/security/PEMDecoder.java
index 0b959bf2440..7a4b7753876 100644
--- a/src/java.base/share/classes/java/security/PEMDecoder.java
+++ b/src/java.base/share/classes/java/security/PEMDecoder.java
@@ -27,6 +27,7 @@ package java.security;
 
 import jdk.internal.javac.PreviewFeature;
 
+import jdk.internal.ref.CleanerFactory;
 import sun.security.pkcs.PKCS8Key;
 import sun.security.rsa.RSAPrivateCrtKeyImpl;
 import sun.security.util.KeyUtil;
@@ -35,6 +36,7 @@ import sun.security.util.Pem;
 import javax.crypto.EncryptedPrivateKeyInfo;
 import javax.crypto.spec.PBEKeySpec;
 import java.io.*;
+import java.lang.ref.Reference;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.*;
 import java.security.spec.*;
@@ -43,96 +45,105 @@ import java.util.Objects;
 
 /**
  * {@code PEMDecoder} implements a decoder for Privacy-Enhanced Mail (PEM) data.
- * PEM is a textual encoding used to store and transfer security
+ * PEM is a textual encoding used to store and transfer cryptographic
  * objects, such as asymmetric keys, certificates, and certificate revocation
- * lists (CRLs).  It is defined in RFC 1421 and RFC 7468.  PEM consists of a
- * Base64-formatted binary encoding enclosed by a type-identifying header
+ * lists (CRLs).  It is defined in RFC 1421 and RFC 7468. PEM consists of a
+ * Base64-encoded binary encoding enclosed by a type-identifying header
  * and footer.
  *
- * <p> The {@linkplain #decode(String)} and {@linkplain #decode(InputStream)}
- * methods return an instance of a class that matches the data
- * type and implements {@link DEREncodable}.
- *
- * <p> The following lists the supported PEM types and the {@code DEREncodable}
- * types that each are decoded as:
+ * <p>The {@link #decode(String)} and {@link #decode(InputStream)} methods
+ * return an instance of a class that matches the PEM type and implements
+ * {@link DEREncodable}, as follows:
  * <ul>
- *  <li>CERTIFICATE : {@code X509Certificate}</li>
- *  <li>X509 CRL : {@code X509CRL}</li>
- *  <li>PUBLIC KEY : {@code PublicKey}</li>
- *  <li>PUBLIC KEY : {@code X509EncodedKeySpec} (Only supported when passed as
- *  a {@code Class} parameter)</li>
- *  <li>PRIVATE KEY : {@code PrivateKey}</li>
- *  <li>PRIVATE KEY : {@code PKCS8EncodedKeySpec} (Only supported when passed
- *  as a {@code Class} parameter)</li>
- *  <li>PRIVATE KEY : {@code KeyPair} (if the encoding also contains a
- *  public key)</li>
- *  <li>ENCRYPTED PRIVATE KEY : {@code EncryptedPrivateKeyInfo} </li>
- *  <li>ENCRYPTED PRIVATE KEY : {@code PrivateKey} (if configured with
- *  Decryption)</li>
- *  <li>Other types : {@code PEMRecord} </li>
+ *   <li>CERTIFICATE : {@link X509Certificate}</li>
+ *   <li>X509 CRL : {@link X509CRL}</li>
+ *   <li>PUBLIC KEY : {@link PublicKey}</li>
+ *   <li>PRIVATE KEY : {@link PrivateKey} or {@link KeyPair}
+ *   (if the encoding contains a public key)</li>
+ *   <li>ENCRYPTED PRIVATE KEY : {@link EncryptedPrivateKeyInfo}</li>
+ *   <li>Other types : {@link PEM}</li>
+ * </ul>
+ * When used with a {@code PEMDecoder} instance configured for decryption:
+ * <ul>
+ *   <li>ENCRYPTED PRIVATE KEY : {@link PrivateKey} or {@link KeyPair}
+ *   (if the encoding contains a public key)</li>
  * </ul>
  *
- * <p> The {@code PublicKey} and {@code PrivateKey} types, an algorithm specific
- * subclass is returned if the underlying algorithm is supported. For example an
- * ECPublicKey and ECPrivateKey for Elliptic Curve keys.
+ * <p> For {@code PublicKey} and {@code PrivateKey} types, an algorithm-specific
+ * subclass is returned if the algorithm is supported. For example, an
+ * {@code ECPublicKey} or an {@code ECPrivateKey} for Elliptic Curve keys.
  *
  * <p> If the PEM type does not have a corresponding class,
  * {@code decode(String)} and {@code decode(InputStream)} will return a
- * {@link PEMRecord}.
+ * {@code PEM} object.
  *
- * <p> The {@linkplain #decode(String, Class)} and
- * {@linkplain #decode(InputStream, Class)} methods take a class parameter
- * which determines the type of {@code DEREncodable} that is returned. These
- * methods are useful when extracting or changing the return class.
- * For example, if the PEM contains both public and private keys, the
- * class parameter can specify which to return. Use
- * {@code PrivateKey.class} to return only the private key.
- * If the class parameter is set to {@code X509EncodedKeySpec.class}, the
- * public key will be returned in that format.  Any type of PEM data can be
- * decoded into a {@code PEMRecord} by specifying {@code PEMRecord.class}.
- * If the class parameter doesn't match the PEM content, a
- * {@linkplain ClassCastException} will be thrown.
+ * <p> The {@link #decode(String, Class)} and {@link #decode(InputStream, Class)}
+ * methods take a class parameter that specifies the type of {@code DEREncodable}
+ * to return. These methods are useful for avoiding casts when the PEM type is
+ * known, or when extracting a specific type if there is more than one option.
+ * For example, if the PEM contains both a public and private key, specifying
+ * {@code PrivateKey.class} returns only the private key.
+ * If the class parameter specifies {@code X509EncodedKeySpec.class}, the
+ * public key encoding is returned as an instance of {@code X509EncodedKeySpec}
+ * class. Any type of PEM data can be decoded into a {@code PEM} object by
+ * specifying {@code PEM.class}. If the class parameter does not match the PEM
+ * content, a {@code ClassCastException} is thrown.
+ *
+ * <p> In addition to the types listed above, these methods support the
+ * following PEM types and {@code DEREncodable} classes when specified as
+ * parameters:
+ *  <ul>
+ *   <li>PUBLIC KEY : {@link X509EncodedKeySpec}</li>
+ *   <li>PRIVATE KEY : {@link PKCS8EncodedKeySpec}</li>
+ *   <li>PRIVATE KEY : {@link PublicKey} (if the encoding contains a public key)</li>
+ *   <li>PRIVATE KEY : {@link X509EncodedKeySpec} (if the encoding contains a public key)</li>
+ * </ul>
+ * When used with a {@code PEMDecoder} instance configured for decryption:
+ * <ul>
+ *   <li>ENCRYPTED PRIVATE KEY : {@link PKCS8EncodedKeySpec}</li>
+ *   <li>ENCRYPTED PRIVATE KEY : {@link PublicKey} (if the encoding contains a public key)</li>
+ *   <li>ENCRYPTED PRIVATE KEY : {@link X509EncodedKeySpec} (if the encoding contains a public key)</li>
+ * </ul>
  *
  * <p> A new {@code PEMDecoder} instance is created when configured
- * with {@linkplain #withFactory(Provider)} and/or
- * {@linkplain #withDecryption(char[])}. {@linkplain #withFactory(Provider)}
- * configures the decoder to use only {@linkplain KeyFactory} and
- * {@linkplain CertificateFactory} instances from the given {@code Provider}.
- * {@linkplain #withDecryption(char[])} configures the decoder to decrypt all
- * encrypted private key PEM data using the given password.
- * Configuring an instance for decryption does not prevent decoding with
- * unencrypted PEM. Any encrypted PEM that fails decryption
- * will throw a {@link RuntimeException}. When an encrypted private key PEM is
- * used with a decoder not configured for decryption, an
- * {@link EncryptedPrivateKeyInfo} object is returned.
+ * with {@link #withFactory(Provider)} or {@link #withDecryption(char[])}.
+ * The {@link #withFactory(Provider)} method uses the specified provider
+ * to produce cryptographic objects from {@link KeyFactory} and
+ * {@link CertificateFactory}. The {@link #withDecryption(char[])} method configures the
+ * decoder to decrypt and decode encrypted private key PEM data using the given
+ * password.  If decryption fails, an {@link IllegalArgumentException} is thrown.
+ * If an encrypted private key PEM is processed by a decoder not configured
+ * for decryption, an {@link EncryptedPrivateKeyInfo} object is returned.
+ * A {@code PEMDecoder} configured for decryption will decode unencrypted PEM.
  *
- * <p>This class is immutable and thread-safe.
+ * <p> This class is immutable and thread-safe.
  *
- * <p> Here is an example of decoding a {@code PrivateKey} object:
+ * <p> Example: decode a private key:
  * {@snippet lang = java:
  *     PEMDecoder pd = PEMDecoder.of();
  *     PrivateKey priKey = pd.decode(priKeyPEM, PrivateKey.class);
  * }
  *
- * <p> Here is an example of a {@code PEMDecoder} configured with decryption
- * and a factory provider:
+ * <p> Example: configure decryption and a factory provider:
  * {@snippet lang = java:
  *     PEMDecoder pd = PEMDecoder.of().withDecryption(password).
- *         withFactory(provider);
- *     byte[] pemData = pd.decode(privKey);
+ *             withFactory(provider);
+ *     DEREncodable pemData = pd.decode(privKeyPEM);
  * }
  *
- * @implNote An implementation may support other PEM types and
- * {@code DEREncodable} objects. This implementation additionally supports
- * the following PEM types:  {@code X509 CERTIFICATE},
- * {@code X.509 CERTIFICATE}, {@code CRL}, and {@code RSA PRIVATE KEY}.
+ * @implNote This implementation decodes RSA PRIVATE KEY as {@code PrivateKey},
+ * X509 CERTIFICATE and X.509 CERTIFICATE as {@code X509Certificate},
+ * and CRL as {@code X509CRL}. Other implementations may recognize
+ * additional PEM types.
  *
  * @see PEMEncoder
- * @see PEMRecord
+ * @see PEM
  * @see EncryptedPrivateKeyInfo
  *
  * @spec https://www.rfc-editor.org/info/rfc1421
  *       RFC 1421: Privacy Enhancement for Internet Electronic Mail
+ * @spec https://www.rfc-editor.org/info/rfc5958
+ *       RFC 5958: Asymmetric Key Packages
  * @spec https://www.rfc-editor.org/info/rfc7468
  *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
  *
@@ -142,7 +153,7 @@ import java.util.Objects;
 @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
 public final class PEMDecoder {
     private final Provider factory;
-    private final PBEKeySpec password;
+    private final PBEKeySpec keySpec;
 
     // Singleton instance for PEMDecoder
     private final static PEMDecoder PEM_DECODER = new PEMDecoder(null, null);
@@ -154,8 +165,12 @@ public final class PEMDecoder {
      *                    decryption
      */
     private PEMDecoder(Provider withFactory, PBEKeySpec withPassword) {
-        password = withPassword;
+        keySpec = withPassword;
         factory = withFactory;
+        if (withPassword != null) {
+            final var k = this.keySpec;
+            CleanerFactory.cleaner().register(this, k::clearPassword);
+        }
     }
 
     /**
@@ -172,7 +187,7 @@ public final class PEMDecoder {
      * header and footer and proceed with decoding the base64 for the
      * appropriate type.
      */
-    private DEREncodable decode(PEMRecord pem) {
+    private DEREncodable decode(PEM pem) {
         Base64.Decoder decoder = Base64.getMimeDecoder();
 
         try {
@@ -185,41 +200,57 @@ public final class PEMDecoder {
                         generatePublic(spec);
                 }
                 case Pem.PRIVATE_KEY -> {
-                    PKCS8Key p8key = new PKCS8Key(decoder.decode(pem.content()));
-                    String algo = p8key.getAlgorithm();
-                    KeyFactory kf = getKeyFactory(algo);
-                    DEREncodable d = kf.generatePrivate(
-                        new PKCS8EncodedKeySpec(p8key.getEncoded(), algo));
+                    DEREncodable d;
+                    PKCS8Key p8key = null;
+                    PKCS8EncodedKeySpec p8spec = null;
+                    byte[] encoding = decoder.decode(pem.content());
 
-                    // Look for a public key inside the pkcs8 encoding.
-                    if (p8key.getPubKeyEncoded() != null) {
-                        // Check if this is a OneAsymmetricKey encoding
-                        X509EncodedKeySpec spec = new X509EncodedKeySpec(
-                            p8key.getPubKeyEncoded(), algo);
-                        yield new KeyPair(getKeyFactory(algo).
-                            generatePublic(spec), (PrivateKey) d);
+                    try {
+                        p8key = new PKCS8Key(encoding);
+                        String algo = p8key.getAlgorithm();
+                        KeyFactory kf = getKeyFactory(algo);
+                        p8spec = new PKCS8EncodedKeySpec(encoding, algo);
+                        d = kf.generatePrivate(p8spec);
 
-                    } else if (d instanceof PKCS8Key p8 &&
-                        p8.getPubKeyEncoded() != null) {
-                        // If the KeyFactory decoded an algorithm-specific
-                        // encodings, look for the public key again.  This
-                        // happens with EC and SEC1-v2 encoding
-                        X509EncodedKeySpec spec = new X509EncodedKeySpec(
-                            p8.getPubKeyEncoded(), algo);
-                        yield new KeyPair(getKeyFactory(algo).
-                            generatePublic(spec), p8);
-                    } else {
-                        // No public key, return the private key.
-                        yield d;
+                        // Look for a public key inside the pkcs8 encoding.
+                        if (p8key.getPubKeyEncoded() != null) {
+                            // Check if this is a OneAsymmetricKey encoding
+                            X509EncodedKeySpec spec = new X509EncodedKeySpec(
+                                p8key.getPubKeyEncoded(), algo);
+                            yield new KeyPair(getKeyFactory(algo).
+                                generatePublic(spec), (PrivateKey) d);
+
+                        } else if (d instanceof PKCS8Key p8 &&
+                            p8.getPubKeyEncoded() != null) {
+                            // If the KeyFactory decoded an algorithm-specific
+                            // encodings, look for the public key again.
+                            X509EncodedKeySpec spec = new X509EncodedKeySpec(
+                                p8.getPubKeyEncoded(), algo);
+                            yield new KeyPair(getKeyFactory(algo).
+                                generatePublic(spec), (PrivateKey) d);
+                        } else {
+                            // No public key, return the private key.
+                            yield d;
+                        }
+                    } finally {
+                        KeyUtil.clear(encoding, p8spec, p8key);
                     }
                 }
                 case Pem.ENCRYPTED_PRIVATE_KEY -> {
-                    if (password == null) {
-                        yield new EncryptedPrivateKeyInfo(decoder.decode(
-                            pem.content()));
+                    byte[] p8 = null;
+                    byte[] encoding = null;
+                    try {
+                        encoding = decoder.decode(pem.content());
+                        var ekpi = new EncryptedPrivateKeyInfo(encoding);
+                        if (keySpec == null) {
+                            yield ekpi;
+                        }
+                        p8 = Pem.decryptEncoding(ekpi, keySpec);
+                        yield Pem.toDEREncodable(p8, true, factory);
+                    } finally {
+                        Reference.reachabilityFence(this);
+                        KeyUtil.clear(encoding, p8);
                     }
-                    yield new EncryptedPrivateKeyInfo(decoder.decode(pem.content())).
-                        getKey(password.getPassword());
                 }
                 case Pem.CERTIFICATE, Pem.X509_CERTIFICATE,
                      Pem.X_509_CERTIFICATE -> {
@@ -246,28 +277,26 @@ public final class PEMDecoder {
     }
 
     /**
-     * Decodes and returns a {@link DEREncodable} from the given {@code String}.
+     * Decodes and returns a {@code DEREncodable} from the given {@code String}.
      *
      * <p> This method reads the {@code String} until PEM data is found
      * or the end of the {@code String} is reached.  If no PEM data is found,
      * an {@code IllegalArgumentException} is thrown.
      *
-     * <p> This method returns a Java API cryptographic object,
-     * such as a {@code PrivateKey}, if the PEM type is supported.
-     * Any non-PEM data preceding the PEM header is ignored by the decoder.
-     * Otherwise, a {@link PEMRecord} will be returned containing
-     * the type identifier and Base64-encoded data.
-     * Any non-PEM data preceding the PEM header will be stored in
-     * {@code leadingData}.
+     * <p> A {@code DEREncodable} will be returned that best represents the
+     * decoded data.  If the PEM type is not supported, a {@code PEM} object is
+     * returned containing the type identifier, Base64-encoded data, and any
+     * leading data preceding the PEM header. For {@code DEREncodable} types
+     * other than {@code PEM}, leading data is ignored and not returned as part
+     * of the {@code DEREncodable} object.
      *
      * <p> Input consumed by this method is read in as
      * {@link java.nio.charset.StandardCharsets#UTF_8 UTF-8}.
      *
-     * @param str a String containing PEM data
+     * @param str a {@code String} containing PEM data
      * @return a {@code DEREncodable}
-     * @throws IllegalArgumentException on error in decoding or no PEM data
-     * found
-     * @throws NullPointerException when {@code str} is null
+     * @throws IllegalArgumentException on error in decoding or no PEM data found
+     * @throws NullPointerException when {@code str} is {@code null}
      */
     public DEREncodable decode(String str) {
         Objects.requireNonNull(str);
@@ -281,67 +310,65 @@ public final class PEMDecoder {
     }
 
     /**
-     * Decodes and returns a {@link DEREncodable} from the given
+     * Decodes and returns a {@code DEREncodable} from the given
      * {@code InputStream}.
      *
      * <p> This method reads from the {@code InputStream} until the end of
-     * the PEM footer or the end of the stream. If an I/O error occurs,
+     * a PEM footer or the end of the stream. If an I/O error occurs,
      * the read position in the stream may become inconsistent.
      * It is recommended to perform no further decoding operations
      * on the {@code InputStream}.
      *
-     * <p> This method returns a Java API cryptographic object,
-     * such as a {@code PrivateKey}, if the PEM type is supported.
-     * Any non-PEM data preceding the PEM header is ignored by the decoder.
-     * Otherwise, a {@link PEMRecord} will be returned containing
-     * the type identifier and Base64-encoded data.
-     * Any non-PEM data preceding the PEM header will be stored in
-     * {@code leadingData}.
+     * <p> A {@code DEREncodable} will be returned that best represents the
+     * decoded data.  If the PEM type is not supported, a {@code PEM} object is
+     * returned containing the type identifier, Base64-encoded data, and any
+     * leading data preceding the PEM header. For {@code DEREncodable} types
+     * other than {@code PEM}, leading data is ignored and not returned as part
+     * of the {@code DEREncodable} object.
      *
-     * <p> If no PEM data is found, an {@code IllegalArgumentException} is
-     * thrown.
+     * <p> If no PEM data is found, an {@code EOFException} is thrown.
      *
-     * @param is InputStream containing PEM data
+     * @param is {@code InputStream} containing PEM data
      * @return a {@code DEREncodable}
      * @throws IOException on IO or PEM syntax error where the
-     * {@code InputStream} did not complete decoding.
-     * @throws EOFException at the end of the {@code InputStream}
+     * {@code InputStream} did not complete decoding
+     * @throws EOFException no PEM data found or unexpectedly reached the
+     *   end of the {@code InputStream}
      * @throws IllegalArgumentException on error in decoding
-     * @throws NullPointerException when {@code is} is null
+     * @throws NullPointerException when {@code is} is {@code null}
      */
     public DEREncodable decode(InputStream is) throws IOException {
         Objects.requireNonNull(is);
-        PEMRecord pem = Pem.readPEM(is);
+        PEM pem = Pem.readPEM(is);
         return decode(pem);
     }
 
     /**
      * Decodes and returns a {@code DEREncodable} of the specified class from
-     * the given PEM string. {@code tClass} must extend {@link DEREncodable}
-     * and be an appropriate class for the PEM type.
+     * the given PEM string. {@code tClass} must be an appropriate class for
+     * the PEM type.
      *
      * <p> This method reads the {@code String} until PEM data is found
      * or the end of the {@code String} is reached.  If no PEM data is found,
      * an {@code IllegalArgumentException} is thrown.
      *
-     * <p> If the class parameter is {@code PEMRecord.class},
-     * a {@linkplain PEMRecord} is returned containing the
-     * type identifier and Base64 encoding. Any non-PEM data preceding
-     * the PEM header will be stored in {@code leadingData}.  Other
-     * class parameters will not return preceding non-PEM data.
+     * <p> If the class parameter is {@code PEM.class}, a {@code PEM} object is
+     * returned containing the type identifier, Base64-encoded data, and any
+     * leading data preceding the PEM header. For {@code DEREncodable} types
+     * other than {@code PEM}, leading data is ignored and not returned as part
+     * of the {@code DEREncodable} object.
      *
      * <p> Input consumed by this method is read in as
      * {@link java.nio.charset.StandardCharsets#UTF_8 UTF-8}.
      *
-     * @param <S> Class type parameter that extends {@code DEREncodable}
-     * @param str the String containing PEM data
-     * @param tClass the returned object class that implements
-     * {@code DEREncodable}
+     * @param <S> class type parameter that extends {@code DEREncodable}
+     * @param str the {@code String} containing PEM data
+     * @param tClass the returned object class that extends or implements
+     *   {@code DEREncodable}
      * @return a {@code DEREncodable} specified by {@code tClass}
-     * @throws IllegalArgumentException on error in decoding or no PEM data
-     * found
-     * @throws ClassCastException if {@code tClass} is invalid for the PEM type
-     * @throws NullPointerException when any input values are null
+     * @throws IllegalArgumentException on error in decoding or no PEM data found
+     * @throws ClassCastException if {@code tClass} does not represent the PEM type
+     * @throws NullPointerException when any input values are {@code null}
      */
     public <S extends DEREncodable> S decode(String str, Class<S> tClass) {
         Objects.requireNonNull(str);
@@ -355,47 +382,47 @@ public final class PEMDecoder {
     }
 
     /**
-     * Decodes and returns the specified class for the given
-     * {@link InputStream}.  The class must extend {@link DEREncodable} and be
-     * an appropriate class for the PEM type.
+     * Decodes and returns a {@code DEREncodable} of the specified class for the
+     * given {@code InputStream}. {@code tClass} must be an appropriate class
+     * for the PEM type.
      *
      * <p> This method reads from the {@code InputStream} until the end of
-     * the PEM footer or the end of the stream. If an I/O error occurs,
+     * a PEM footer or the end of the stream. If an I/O error occurs,
      * the read position in the stream may become inconsistent.
      * It is recommended to perform no further decoding operations
      * on the {@code InputStream}.
      *
-     * <p> If the class parameter is {@code PEMRecord.class},
-     * a {@linkplain PEMRecord} is returned containing the
-     * type identifier and Base64 encoding. Any non-PEM data preceding
-     * the PEM header will be stored in {@code leadingData}.  Other
-     * class parameters will not return preceding non-PEM data.
+     * <p> If the class parameter is {@code PEM.class}, a {@code PEM} object is
+     * returned containing the type identifier, Base64-encoded data, and any
+     * leading data preceding the PEM header. For {@code DEREncodable} types
+     * other than {@code PEM}, leading data is ignored and not returned as part
+     * of the {@code DEREncodable} object.
      *
-     * <p> If no PEM data is found, an {@code IllegalArgumentException} is
-     * thrown.
+     * <p> If no PEM data is found, an {@code EOFException} is thrown.
      *
-     * @param <S> Class type parameter that extends {@code DEREncodable}.
-     * @param is an InputStream containing PEM data
-     * @param tClass the returned object class that implements
-     *   {@code DEREncodable}.
+     * @param <S> class type parameter that extends {@code DEREncodable}
+     * @param is an {@code InputStream} containing PEM data
+     * @param tClass the returned object class that extends or implements
+     *   {@code DEREncodable}
      * @return a {@code DEREncodable} typecast to {@code tClass}
      * @throws IOException on IO or PEM syntax error where the
-     * {@code InputStream} did not complete decoding.
-     * @throws EOFException at the end of the {@code InputStream}
+     *   {@code InputStream} did not complete decoding
+     * @throws EOFException no PEM data found or unexpectedly reached the
+     *   end of the {@code InputStream}
      * @throws IllegalArgumentException on error in decoding
-     * @throws ClassCastException if {@code tClass} is invalid for the PEM type
-     * @throws NullPointerException when any input values are null
+     * @throws ClassCastException if {@code tClass} does not represent the PEM type
+     * @throws NullPointerException when any input values are {@code null}
      *
-     * @see #decode(InputStream)
+    * @see #decode(InputStream)
      * @see #decode(String, Class)
      */
     public <S extends DEREncodable> S decode(InputStream is, Class<S> tClass)
         throws IOException {
         Objects.requireNonNull(is);
         Objects.requireNonNull(tClass);
-        PEMRecord pem = Pem.readPEM(is);
+        PEM pem = Pem.readPEM(is);
 
-        if (tClass.isAssignableFrom(PEMRecord.class)) {
+        if (tClass.isAssignableFrom(PEM.class)) {
             return tClass.cast(pem);
         }
         DEREncodable so = decode(pem);
@@ -478,28 +505,28 @@ public final class PEMDecoder {
 
     /**
      * Returns a copy of this {@code PEMDecoder} instance that uses
-     * {@link KeyFactory} and {@link CertificateFactory} implementations
-     * from the specified {@link Provider} to produce cryptographic objects.
+     * {@code KeyFactory} and {@code CertificateFactory} implementations
+     * from the specified {@code Provider} to produce cryptographic objects.
      * Any errors using the {@code Provider} will occur during decoding.
      *
      * @param provider the factory provider
-     * @return a new PEMEncoder instance configured to the {@code Provider}.
-     * @throws NullPointerException if {@code provider} is null
+     * @return a new {@code PEMDecoder} instance configured with the {@code Provider}
+     * @throws NullPointerException if {@code provider} is {@code null}
      */
     public PEMDecoder withFactory(Provider provider) {
         Objects.requireNonNull(provider);
-        return new PEMDecoder(provider, password);
+        return new PEMDecoder(provider, keySpec);
     }
 
     /**
      * Returns a copy of this {@code PEMDecoder} that decodes and decrypts
      * encrypted private keys using the specified password.
-     * Non-encrypted PEM can still be decoded from this instance.
+     * Non-encrypted PEM can also be decoded from this instance.
      *
-     * @param password the password to decrypt encrypted PEM data.  This array
+     * @param password the password to decrypt the encrypted PEM data. This array
      *                 is cloned and stored in the new instance.
-     * @return a new PEMEncoder instance configured for decryption
-     * @throws NullPointerException if {@code password} is null
+     * @return a new {@code PEMDecoder} instance configured for decryption
+     * @throws NullPointerException if {@code password} is {@code null}
      */
     public PEMDecoder withDecryption(char[] password) {
         Objects.requireNonNull(password);
diff --git a/src/java.base/share/classes/java/security/PEMEncoder.java b/src/java.base/share/classes/java/security/PEMEncoder.java
index 95fcffe967b..62a0942caf7 100644
--- a/src/java.base/share/classes/java/security/PEMEncoder.java
+++ b/src/java.base/share/classes/java/security/PEMEncoder.java
@@ -27,10 +27,8 @@ package java.security;
 
 import jdk.internal.javac.PreviewFeature;
 import sun.security.pkcs.PKCS8Key;
-import sun.security.util.DerOutputStream;
-import sun.security.util.DerValue;
+import sun.security.util.KeyUtil;
 import sun.security.util.Pem;
-import sun.security.x509.AlgorithmId;
 
 import javax.crypto.*;
 import javax.crypto.spec.PBEKeySpec;
@@ -41,83 +39,84 @@ import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Objects;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * {@code PEMEncoder} implements an encoder for Privacy-Enhanced Mail (PEM)
- * data.  PEM is a textual encoding used to store and transfer security
+ * data.  PEM is a textual encoding used to store and transfer cryptographic
  * objects, such as asymmetric keys, certificates, and certificate revocation
- * lists (CRL).  It is defined in RFC 1421 and RFC 7468.  PEM consists of a
- * Base64-formatted binary encoding enclosed by a type-identifying header
+ * lists (CRLs).  It is defined in RFC 1421 and RFC 7468.  PEM consists of a
+ * Base64-encoded binary encoding enclosed by a type-identifying header
  * and footer.
  *
- * <p> Encoding may be performed on Java API cryptographic objects that
+ * <p> Encoding can be performed on cryptographic objects that
  * implement {@link DEREncodable}. The {@link #encode(DEREncodable)}
- * and {@link #encodeToString(DEREncodable)} methods encode a DEREncodable
- * into PEM and return the data in a byte array or String.
+ * and {@link #encodeToString(DEREncodable)} methods encode a {@code DEREncodable}
+ * into PEM and return the data in a byte array or {@code String}.
  *
  * <p> Private keys can be encrypted and encoded by configuring a
- * {@code PEMEncoder} with the {@linkplain #withEncryption(char[])} method,
+ * {@code PEMEncoder} with the {@link #withEncryption(char[])} method,
  * which takes a password and returns a new {@code PEMEncoder} instance
  * configured to encrypt the key with that password. Alternatively, a
- * private key encrypted as an {@code EncryptedKeyInfo} object can be encoded
+ * private key encrypted as an {@link EncryptedPrivateKeyInfo} object can be encoded
  * directly to PEM by passing it to the {@code encode} or
  * {@code encodeToString} methods.
  *
- * <p> PKCS #8 2.0 defines the ASN.1 OneAsymmetricKey structure, which may
+ * <p> PKCS #8 v2.0 defines the ASN.1 OneAsymmetricKey structure, which may
  * contain both private and public keys.
- * {@link KeyPair} objects passed to the {@code encode} or
+ * {@code KeyPair} objects passed to the {@code encode} or
  * {@code encodeToString} methods are encoded as a
  * OneAsymmetricKey structure using the "PRIVATE KEY" type.
  *
- * <p> When encoding a {@link PEMRecord}, the API surrounds the
- * {@linkplain PEMRecord#content()} with the PEM header and footer
- * from {@linkplain PEMRecord#type()}. {@linkplain PEMRecord#leadingData()} is
- * not included in the encoding.  {@code PEMRecord} will not perform
- * validity checks on the data.
- *
- * <p>The following lists the supported {@code DEREncodable} classes and
- * the PEM types that each are encoded as:
+ * <p> When encoding a {@link PEM} object, the API surrounds
+ * {@link PEM#content()} with a PEM header and footer based on
+ * {@link PEM#type()}. The value returned by {@link PEM#leadingData()} is not
+ * included in the output.
  *
+ * <p> The following lists the supported {@code DEREncodable} classes and
+ * the PEM types they encode as:
  * <ul>
- *  <li>{@code X509Certificate} : CERTIFICATE</li>
- *  <li>{@code X509CRL} : X509 CRL</li>
- *  <li>{@code PublicKey}: PUBLIC KEY</li>
- *  <li>{@code PrivateKey} : PRIVATE KEY</li>
- *  <li>{@code PrivateKey} (if configured with encryption):
- *  ENCRYPTED PRIVATE KEY</li>
- *  <li>{@code EncryptedPrivateKeyInfo} : ENCRYPTED PRIVATE KEY</li>
- *  <li>{@code KeyPair} : PRIVATE KEY</li>
- *  <li>{@code X509EncodedKeySpec} : PUBLIC KEY</li>
- *  <li>{@code PKCS8EncodedKeySpec} : PRIVATE KEY</li>
- *  <li>{@code PEMRecord} : {@code PEMRecord.type()}</li>
- *  </ul>
+ *   <li>{@link X509Certificate} : CERTIFICATE</li>
+ *   <li>{@link X509CRL} : X509 CRL</li>
+ *   <li>{@link PublicKey} : PUBLIC KEY</li>
+ *   <li>{@link PrivateKey} : PRIVATE KEY</li>
+ *   <li>{@link EncryptedPrivateKeyInfo} : ENCRYPTED PRIVATE KEY</li>
+ *   <li>{@link KeyPair} : PRIVATE KEY</li>
+ *   <li>{@link X509EncodedKeySpec} : PUBLIC KEY</li>
+ *   <li>{@link PKCS8EncodedKeySpec} : PRIVATE KEY</li>
+ *   <li>{@link PEM} : {@code PEM.type()}</li>
+ * </ul>
+ * <p> When used with a {@code PEMEncoder} instance configured for encryption:
+ * <ul>
+ *   <li>{@link PrivateKey} : ENCRYPTED PRIVATE KEY</li>
+ *   <li>{@link KeyPair} : ENCRYPTED PRIVATE KEY</li>
+ *   <li>{@link PKCS8EncodedKeySpec} : ENCRYPTED PRIVATE KEY</li>
+ * </ul>
  *
  * <p> This class is immutable and thread-safe.
  *
- * <p> Here is an example of encoding a {@code PrivateKey} object:
+ * <p> Example: encode a private key:
  * {@snippet lang = java:
  *     PEMEncoder pe = PEMEncoder.of();
  *     byte[] pemData = pe.encode(privKey);
  * }
  *
- * <p> Here is an example that encrypts and encodes a private key using the
- * specified password:
+ * <p> Example: encrypt and encode a private key using a password:
  * {@snippet lang = java:
  *     PEMEncoder pe = PEMEncoder.of().withEncryption(password);
  *     byte[] pemData = pe.encode(privKey);
  * }
  *
- * @implNote An implementation may support other PEM types and
- * {@code DEREncodable} objects.
+ * @implNote Implementations may support additional PEM types.
  *
  *
  * @see PEMDecoder
- * @see PEMRecord
+ * @see PEM
  * @see EncryptedPrivateKeyInfo
  *
  * @spec https://www.rfc-editor.org/info/rfc1421
  *       RFC 1421: Privacy Enhancement for Internet Electronic Mail
+ * @spec https://www.rfc-editor.org/info/rfc5958
+ *       RFC 5958: Asymmetric Key Packages
  * @spec https://www.rfc-editor.org/info/rfc7468
  *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
  *
@@ -128,24 +127,26 @@ public final class PEMEncoder {
 
     // Singleton instance of PEMEncoder
     private static final PEMEncoder PEM_ENCODER = new PEMEncoder(null);
-
-    // Stores the password for an encrypted encoder that isn't setup yet.
-    private PBEKeySpec keySpec;
-    // Stores the key after the encoder is ready to encrypt.  The prevents
-    // repeated SecretKeyFactory calls if the encoder is used on multiple keys.
-    private SecretKey key;
-    // Makes SecretKeyFactory generation thread-safe.
-    private final ReentrantLock lock;
+    // PBE key for encryption
+    private final Key key;
 
     /**
-     * Instantiate a {@code PEMEncoder} for Encrypted Private Keys.
-     *
-     * @param pbe contains the password spec used for encryption.
+     * Create an encrypted {@code PEMEncoder} instance.
      */
-    private PEMEncoder(PBEKeySpec pbe) {
-        keySpec = pbe;
-        key = null;
-        lock = new ReentrantLock();
+    private PEMEncoder(PBEKeySpec keySpec) {
+        if (keySpec != null) {
+            try {
+                key = SecretKeyFactory.getInstance(Pem.DEFAULT_ALGO).
+                    generateSecret(keySpec);
+            } catch (GeneralSecurityException e) {
+                throw new IllegalArgumentException("Operation failed: " +
+                    "unable to generate key or locate a valid algorithm. " +
+                    "Check the jdk.epkcs8.defaultAlgorithm security " +
+                    "property for a valid configuration.", e);
+            }
+        } else {
+            key = null;
+        }
     }
 
     /**
@@ -158,70 +159,90 @@ public final class PEMEncoder {
     }
 
     /**
-     * Encodes the specified {@code DEREncodable} and returns a PEM encoded
+     * Encodes the specified {@code DEREncodable} and returns a PEM-encoded
      * string.
      *
      * @param de the {@code DEREncodable} to be encoded
-     * @return a {@code String} containing the PEM encoded data
-     * @throws IllegalArgumentException if the {@code DEREncodable} cannot be
-     * encoded
+     * @return a {@code String} containing the PEM-encoded data
+     * @throws IllegalArgumentException if the {@code DEREncodable} cannot be encoded
      * @throws NullPointerException if {@code de} is {@code null}
      * @see #withEncryption(char[])
      */
     public String encodeToString(DEREncodable de) {
         Objects.requireNonNull(de);
         return switch (de) {
-            case PublicKey pu -> buildKey(null, pu.getEncoded());
-            case PrivateKey pr -> buildKey(pr.getEncoded(), null);
-            case KeyPair kp -> {
-                if (kp.getPublic() == null) {
-                    throw new IllegalArgumentException("KeyPair does not " +
-                        "contain PublicKey.");
-                }
-                if (kp.getPrivate() == null) {
-                    throw new IllegalArgumentException("KeyPair does not " +
-                        "contain PrivateKey.");
-                }
-                yield buildKey(kp.getPrivate().getEncoded(),
-                    kp.getPublic().getEncoded());
-            }
-            case X509EncodedKeySpec x ->
-                buildKey(null, x.getEncoded());
-            case PKCS8EncodedKeySpec p ->
-                buildKey(p.getEncoded(), null);
-            case EncryptedPrivateKeyInfo epki -> {
+            case PublicKey pu -> buildKey(pu.getEncoded(), null);
+            case PrivateKey pr -> {
+                byte[] encoding = pr.getEncoded();
                 try {
-                    yield Pem.pemEncoded(Pem.ENCRYPTED_PRIVATE_KEY,
-                        epki.getEncoded());
+                    yield buildKey(null, encoding);
+                } finally {
+                    KeyUtil.clear(encoding);
+                }
+            }
+            case KeyPair kp -> {
+                byte[] encoding = null;
+                try {
+                    if (kp.getPublic() == null) {
+                        throw new IllegalArgumentException("KeyPair does not " +
+                            "contain PublicKey.");
+                    }
+                    if (kp.getPrivate() == null) {
+                        throw new IllegalArgumentException("KeyPair does not " +
+                            "contain PrivateKey.");
+                    }
+                    encoding = kp.getPrivate().getEncoded();
+                    if (encoding == null || encoding.length == 0) {
+                        throw new IllegalArgumentException("PrivateKey is " +
+                            "null or has no encoding.");
+                    }
+                    yield buildKey(kp.getPublic().getEncoded(), encoding);
+                } finally {
+                    KeyUtil.clear(encoding);
+                }
+            }
+            case X509EncodedKeySpec x -> buildKey(x.getEncoded(), null);
+            case PKCS8EncodedKeySpec p -> buildKey(null, p.getEncoded());
+            case EncryptedPrivateKeyInfo epki -> {
+                byte[] encoding = null;
+                if (key != null) {
+                    throw new IllegalArgumentException(
+                        "EncryptedPrivateKeyInfo cannot be encrypted");
+                }
+                try {
+                    encoding = epki.getEncoded();
+                    yield Pem.pemEncoded(Pem.ENCRYPTED_PRIVATE_KEY, encoding);
                 } catch (IOException e) {
                     throw new IllegalArgumentException(e);
+                } finally {
+                    KeyUtil.clear(encoding);
                 }
             }
             case X509Certificate c -> {
+                if (key != null) {
+                    throw new IllegalArgumentException("Certificates " +
+                        "cannot be encrypted");
+                }
                 try {
-                    if (isEncrypted()) {
-                        throw new IllegalArgumentException("Certificates " +
-                            "cannot be encrypted");
-                    }
                     yield Pem.pemEncoded(Pem.CERTIFICATE, c.getEncoded());
                 } catch (CertificateEncodingException e) {
                     throw new IllegalArgumentException(e);
                 }
             }
             case X509CRL crl -> {
+                if (key != null) {
+                    throw new IllegalArgumentException("CRLs cannot be " +
+                        "encrypted");
+                }
                 try {
-                    if (isEncrypted()) {
-                        throw new IllegalArgumentException("CRLs cannot be " +
-                            "encrypted");
-                    }
                     yield Pem.pemEncoded(Pem.X509_CRL, crl.getEncoded());
                 } catch (CRLException e) {
                     throw new IllegalArgumentException(e);
                 }
             }
-            case PEMRecord rec -> {
-                if (isEncrypted()) {
-                    throw new IllegalArgumentException("PEMRecord cannot be " +
+            case PEM rec -> {
+                if (key != null) {
+                    throw new IllegalArgumentException("PEM cannot be " +
                         "encrypted");
                 }
                 yield Pem.pemEncoded(rec);
@@ -233,13 +254,12 @@ public final class PEMEncoder {
     }
 
     /**
-     * Encodes the specified {@code DEREncodable} and returns the PEM encoding
-     * in a byte array.
+     * Encodes the specified {@code DEREncodable} and returns a PEM-encoded
+     * byte array.
      *
      * @param de the {@code DEREncodable} to be encoded
-     * @return a PEM encoded byte array
-     * @throws IllegalArgumentException if the {@code DEREncodable} cannot be
-     * encoded
+     * @return a PEM-encoded byte array
+     * @throws IllegalArgumentException if the {@code DEREncodable} cannot be encoded
      * @throws NullPointerException if {@code de} is {@code null}
      * @see #withEncryption(char[])
      */
@@ -248,136 +268,95 @@ public final class PEMEncoder {
     }
 
     /**
-     * Returns a new {@code PEMEncoder} instance configured for encryption
-     * with the default algorithm and a given password.
+     * Returns a copy of this PEMEncoder that encrypts and encodes
+     * using the specified password and default encryption algorithm.
      *
-     * <p> Only {@link PrivateKey} objects can be encrypted with this newly
-     * configured instance.  Encoding other {@link DEREncodable} objects will
+     * <p> Only {@code PrivateKey}, {@code KeyPair}, and
+     * {@code PKCS8EncodedKeySpec} objects can be encoded with this newly
+     * configured instance.  Encoding other {@code DEREncodable} objects will
      * throw an {@code IllegalArgumentException}.
      *
-     * @implNote
-     * The default password-based encryption algorithm is defined
-     * by the {@code jdk.epkcs8.defaultAlgorithm} security property and
-     * uses the default encryption parameters of the provider that is selected.
-     * For greater flexibility with encryption options and parameters, use
-     * {@link EncryptedPrivateKeyInfo#encryptKey(PrivateKey, Key,
+     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} security property
+     * defines the default encryption algorithm. The {@code AlgorithmParameterSpec}
+     * defaults are determined by the provider. To use non-default encryption
+     * parameters, or to encrypt with a different encryption provider, use
+     * {@link EncryptedPrivateKeyInfo#encrypt(DEREncodable, Key,
      * String, AlgorithmParameterSpec, Provider, SecureRandom)} and use the
      * returned object with {@link #encode(DEREncodable)}.
      *
      * @param password the encryption password.  The array is cloned and
-     *                stored in the new instance.
+     *                 stored in the new instance.
      * @return a new {@code PEMEncoder} instance configured for encryption
-     * @throws NullPointerException when password is {@code null}
+     * @throws NullPointerException if password is {@code null}
+     * @throws IllegalArgumentException if generating the encryption key fails
      */
     public PEMEncoder withEncryption(char[] password) {
-        // PBEKeySpec clones the password
         Objects.requireNonNull(password, "password cannot be null.");
-        return new PEMEncoder(new PBEKeySpec(password));
+        PBEKeySpec keySpec = new PBEKeySpec(password);
+        try {
+            return new PEMEncoder(keySpec);
+        } finally {
+            keySpec.clearPassword();
+        }
     }
 
     /**
      * Build PEM encoding.
+     *
+     * privateKeyEncoding will be zeroed when the method returns
      */
-    private String buildKey(byte[] privateBytes, byte[] publicBytes) {
-        DerOutputStream out = new DerOutputStream();
-        Cipher cipher;
-
-        if (privateBytes == null && publicBytes == null) {
+    private String buildKey(byte[] publicEncoding, byte[] privateEncoding) {
+        if (publicEncoding == null && privateEncoding == null) {
             throw new IllegalArgumentException("No encoded data given by the " +
                 "DEREncodable.");
         }
 
-        // If `keySpec` is non-null, then `key` hasn't been established.
-        // Setting a `key` prevents repeated key generation operations.
-        // withEncryption() is a configuration method and cannot throw an
-        // exception; therefore generation is delayed.
-        if (keySpec != null) {
-            // For thread safety
-            lock.lock();
-            if (key == null) {
-                try {
-                    key = SecretKeyFactory.getInstance(Pem.DEFAULT_ALGO).
-                        generateSecret(keySpec);
-                    keySpec.clearPassword();
-                    keySpec = null;
-                } catch (GeneralSecurityException e) {
-                    throw new IllegalArgumentException("Security property " +
-                        "\"jdk.epkcs8.defaultAlgorithm\" may not specify a " +
-                        "valid algorithm.  Operation cannot be performed.", e);
-                } finally {
-                    lock.unlock();
-                }
-            } else {
-                lock.unlock();
-            }
+        if (publicEncoding != null && publicEncoding.length == 0) {
+            throw new IllegalArgumentException("Public key has no " +
+                "encoding");
         }
 
-        // If `key` is non-null, this is an encoder ready to encrypt.
-        if (key != null) {
-            if (privateBytes == null || publicBytes != null) {
-                throw new IllegalArgumentException("Can only encrypt a " +
-                    "PrivateKey.");
-            }
+        if (privateEncoding != null && privateEncoding.length == 0) {
+            throw new IllegalArgumentException("Private key has no " +
+                "encoding");
+        }
 
-            try {
-                cipher = Cipher.getInstance(Pem.DEFAULT_ALGO);
-                cipher.init(Cipher.ENCRYPT_MODE, key);
-            } catch (GeneralSecurityException e) {
-                throw new IllegalArgumentException("Security property " +
-                    "\"jdk.epkcs8.defaultAlgorithm\" may not specify a " +
-                    "valid algorithm.  Operation cannot be performed.", e);
-            }
-
-            try {
-                new AlgorithmId(Pem.getPBEID(Pem.DEFAULT_ALGO),
-                    cipher.getParameters()).encode(out);
-                out.putOctetString(cipher.doFinal(privateBytes));
-                return Pem.pemEncoded(Pem.ENCRYPTED_PRIVATE_KEY,
-                    DerValue.wrap(DerValue.tag_Sequence, out).toByteArray());
-            } catch (GeneralSecurityException e) {
-                throw new IllegalArgumentException(e);
-            }
+        if (key != null && privateEncoding == null) {
+            throw new IllegalArgumentException("This DEREncodable cannot " +
+                "be encrypted.");
         }
 
         // X509 only
-        if (publicBytes != null && privateBytes == null) {
-            if (publicBytes.length == 0) {
-                throw new IllegalArgumentException("No public key encoding " +
-                    "given by the DEREncodable.");
-            }
-
-            return Pem.pemEncoded(Pem.PUBLIC_KEY, publicBytes);
+        if (publicEncoding != null && privateEncoding == null) {
+            return Pem.pemEncoded(Pem.PUBLIC_KEY, publicEncoding);
         }
 
-        // PKCS8 only
-        if (publicBytes == null && privateBytes != null) {
-            if (privateBytes.length == 0) {
+        byte[] encoding = null;
+        PKCS8EncodedKeySpec p8KeySpec = null;
+        try {
+            if (publicEncoding == null) {
+                encoding = privateEncoding;
+            } else {
+                encoding = PKCS8Key.getEncoded(publicEncoding,
+                    privateEncoding);
+            }
+            if (key != null) {
+                p8KeySpec = new PKCS8EncodedKeySpec(encoding);
+                encoding = EncryptedPrivateKeyInfo.encrypt(p8KeySpec, key,
+                    Pem.DEFAULT_ALGO, null, null, null).
+                    getEncoded();
+            }
+            if (encoding.length == 0) {
                 throw new IllegalArgumentException("No private key encoding " +
                     "given by the DEREncodable.");
             }
-
-            return Pem.pemEncoded(Pem.PRIVATE_KEY, privateBytes);
-        }
-
-        // OneAsymmetricKey
-        if (privateBytes.length == 0) {
-            throw new IllegalArgumentException("No private key encoding " +
-                "given by the DEREncodable.");
-        }
-
-        if (publicBytes.length == 0) {
-            throw new IllegalArgumentException("No public key encoding " +
-                "given by the DEREncodable.");
-        }
-        try {
-            return Pem.pemEncoded(Pem.PRIVATE_KEY,
-                PKCS8Key.getEncoded(publicBytes, privateBytes));
+            return Pem.pemEncoded(
+                (key == null ? Pem.PRIVATE_KEY : Pem.ENCRYPTED_PRIVATE_KEY),
+                encoding);
         } catch (IOException e) {
-            throw new IllegalArgumentException(e);
+            throw new IllegalArgumentException("Error while encoding", e);
+        } finally {
+            KeyUtil.clear(encoding, p8KeySpec);
         }
     }
-
-    private boolean isEncrypted() {
-        return (key != null || keySpec != null);
-    }
 }
diff --git a/src/java.base/share/classes/java/security/PEMRecord.java b/src/java.base/share/classes/java/security/PEMRecord.java
deleted file mode 100644
index 2ce567f9fde..00000000000
--- a/src/java.base/share/classes/java/security/PEMRecord.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security;
-
-import jdk.internal.javac.PreviewFeature;
-
-import sun.security.util.Pem;
-
-import java.util.Objects;
-
-/**
- * {@code PEMRecord} is a {@link DEREncodable} that represents Privacy-Enhanced
- * Mail (PEM) data by its type and Base64 form.  {@link PEMDecoder} and
- * {@link PEMEncoder} use {@code PEMRecord} when representing the data as a
- * cryptographic object is not desired or the type has no
- * {@code DEREncodable}.
- *
- * <p> {@code type} and {@code content} may not be {@code null}.
- * {@code leadingData} may be null if no non-PEM data preceded PEM header
- * during decoding.  {@code leadingData} may be useful for reading metadata
- * that accompanies PEM data.
- *
- * <p> No validation is performed during instantiation to ensure that
- * {@code type} conforms to {@code RFC 7468}, that {@code content} is valid
- * Base64, or that {@code content} matches the {@code type}.
- * {@code leadingData} is not defensively copied and does not return a
- * clone when {@linkplain #leadingData()} is called.
- *
- * @param type the type identifier in the PEM header without PEM syntax labels.
- *           For a public key, {@code type} would be "PUBLIC KEY".
- * @param content the Base64-encoded data, excluding the PEM header and footer
- * @param leadingData any non-PEM data preceding the PEM header when decoding.
- *
- * @spec https://www.rfc-editor.org/info/rfc7468
- *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
- *
- * @see PEMDecoder
- * @see PEMEncoder
- *
- * @since 25
- */
-@PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
-public record PEMRecord(String type, String content, byte[] leadingData)
-    implements DEREncodable {
-
-    /**
-     * Creates a {@code PEMRecord} instance with the given parameters.
-     *
-     * @param type the type identifier
-     * @param content the Base64-encoded data, excluding the PEM header and
-     *               footer
-     * @param leadingData any non-PEM data read during the decoding process
-     *                    before the PEM header.  This value maybe {@code null}.
-     * @throws IllegalArgumentException if {@code type} is incorrectly
-     * formatted.
-     * @throws NullPointerException if {@code type} and/or {@code content} are
-     * {@code null}.
-     */
-    public PEMRecord {
-        Objects.requireNonNull(type, "\"type\" cannot be null.");
-        Objects.requireNonNull(content, "\"content\" cannot be null.");
-
-        // With no validity checking on `type`, the constructor accept anything
-        // including lowercase.  The onus is on the caller.
-        if (type.startsWith("-") || type.startsWith("BEGIN ") ||
-            type.startsWith("END ")) {
-            throw new IllegalArgumentException("PEM syntax labels found.  " +
-                "Only the PEM type identifier is allowed");
-        }
-
-    }
-
-    /**
-     * Creates a {@code PEMRecord} instance with a given {@code type} and
-     * {@code content} data in String form.  {@code leadingData} is set to null.
-     *
-     * @param type the PEM type identifier
-     * @param content the Base64-encoded data, excluding the PEM header and
-     *               footer
-     * @throws IllegalArgumentException if {@code type} is incorrectly
-     * formatted.
-     * @throws NullPointerException if {@code type} and/or {@code content} are
-     * {@code null}.
-     */
-    public PEMRecord(String type, String content) {
-        this(type, content, null);
-    }
-
-    /**
-     * Returns the type and Base64 encoding in PEM format.  {@code leadingData}
-     * is not returned by this method.
-     */
-    @Override
-    public String toString() {
-        return Pem.pemEncoded(this);
-    }
-}
diff --git a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
index 90316d7437e..15933183e5f 100644
--- a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
@@ -276,8 +276,7 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
      * @param cipher the initialized {@code Cipher} object which will be
      * used for decrypting the encrypted data.
      * @return the PKCS8EncodedKeySpec object.
-     * @exception NullPointerException if {@code cipher}
-     * is {@code null}.
+     * @exception NullPointerException if {@code cipher} is {@code null}.
      * @exception InvalidKeySpecException if the given cipher is
      * inappropriate for the encrypted data or the encrypted
      * data is corrupted and cannot be decrypted.
@@ -296,10 +295,9 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
         }
     }
 
-    private PKCS8EncodedKeySpec getKeySpecImpl(Key decryptKey,
-        Provider provider) throws NoSuchAlgorithmException,
-        InvalidKeyException {
-        byte[] encoded;
+    // Return the decrypted encryptedData in this instance.
+    private byte[] decryptData(Key decryptKey, Provider provider)
+        throws NoSuchAlgorithmException, InvalidKeyException {
         Cipher c;
         try {
             if (provider == null) {
@@ -308,162 +306,157 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
             } else {
                 c = Cipher.getInstance(getAlgName(), provider);
             }
+        } catch (NoSuchPaddingException e) {
+            throw new NoSuchAlgorithmException(e);
+        }
+        try {
             c.init(Cipher.DECRYPT_MODE, decryptKey, getAlgParameters());
-            encoded = c.doFinal(encryptedData);
-            return pkcs8EncodingToSpec(encoded);
+            return c.doFinal(encryptedData);
+        } catch (GeneralSecurityException e) {
+            throw new InvalidKeyException(e);
+        }
+    }
+
+    // Wrap the decrypted encryptedData in a P8EKS for getKeySpec methods.
+    private PKCS8EncodedKeySpec getKeySpecImpl(Key decryptKey,
+        Provider provider) throws NoSuchAlgorithmException,
+        InvalidKeyException {
+        byte[] encoding = null;
+        try {
+            encoding = decryptData(decryptKey, provider);
+            return pkcs8EncodingToSpec(encoding);
         } catch (NoSuchAlgorithmException nsae) {
             // rethrow
             throw nsae;
         } catch (GeneralSecurityException | IOException ex) {
             throw new InvalidKeyException(
-                    "Cannot retrieve the PKCS8EncodedKeySpec", ex);
+                "Cannot retrieve the PKCS8EncodedKeySpec", ex);
+        } finally {
+            KeyUtil.clear(encoding);
         }
     }
 
     /**
-     * Creates and encrypts an {@code EncryptedPrivateKeyInfo} from a given
-     * {@code PrivateKey}.  A valid password-based encryption (PBE) algorithm
+     * Creates an {@code EncryptedPrivateKeyInfo} by encrypting the specified
+     * {@code DEREncodable}.  A valid password-based encryption (PBE) algorithm
      * and password must be specified.
      *
-     * <p> The PBE algorithm string format details can be found in the
+     * <p>The format of the PBE algorithm string is described in the
      * <a href="{@docRoot}/../specs/security/standard-names.html#cipher-algorithms">
-     * Cipher section</a> of the Java Security Standard Algorithm Names
+     * Cipher Algorithms</a> section of the Java Security Standard Algorithm Names
      * Specification.
      *
-     * @param key the {@code PrivateKey} to be encrypted
-     * @param password the password used in the PBE encryption.  This array
-     *                 will be cloned before being used.
-     * @param algorithm the PBE encryption algorithm.  The default algorithm
-     *                  will be used if {@code null}.  However, {@code null} is
-     *                  not allowed when {@code params} is non-null.
-     * @param params the {@code AlgorithmParameterSpec} to be used with
-     *               encryption.  The provider default will be used if
-     *               {@code null}.
-     * @param provider the {@code Provider} will be used for PBE
-     *                 {@link SecretKeyFactory} generation and {@link Cipher}
-     *                 encryption operations. The default provider list will be
-     *                 used if {@code null}.
+     * @param de the {@code DEREncodable} to encrypt. Supported types include
+     *           {@code PrivateKey}, {@code KeyPair}, and {@code PKCS8EncodedKeySpec}.
+     * @param password the password used for PBE encryption. This array is cloned
+     *                 before use.
+     * @param algorithm the PBE encryption algorithm
+     * @param params the {@code AlgorithmParameterSpec} used for encryption. If
+     *               {@code null}, the provider’s default parameters are applied.
+     * @param provider the {@code Provider} for {@code SecretKeyFactory} and
+     *                 {@code Cipher} operations. If {@code null}, provider
+     *                 defaults are used.
      * @return an {@code EncryptedPrivateKeyInfo}
-     * @throws IllegalArgumentException on initialization errors based on the
-     * arguments passed to the method
-     * @throws RuntimeException on an encryption error
-     * @throws NullPointerException if the key or password are {@code null}. If
-     * {@code params} is non-null when {@code algorithm} is {@code null}.
-     *
-     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} Security Property
-     * defines the default encryption algorithm and the
-     * {@code AlgorithmParameterSpec} are the provider's algorithm defaults.
+     * @throws NullPointerException if {@code de}, {@code password}, or
+     *         {@code algorithm} is {@code null}
+     * @throws IllegalArgumentException if {@code de} is an unsupported
+     *         {@code DEREncodable}, if an error occurs while generating the
+     *         PBE key, if {@code algorithm} or {@code params} are
+     *         not supported by any provider, or if an error occurs during
+     *         encryption.
      *
      * @since 25
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
-    public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key,
+    public static EncryptedPrivateKeyInfo encrypt(DEREncodable de,
         char[] password, String algorithm, AlgorithmParameterSpec params,
         Provider provider) {
 
-        SecretKey skey;
-        Objects.requireNonNull(key, "key cannot be null");
-        Objects.requireNonNull(password, "password cannot be null.");
-        PBEKeySpec keySpec = new PBEKeySpec(password);
-        if (algorithm == null) {
-            if (params != null) {
-                throw new NullPointerException("algorithm must be specified" +
-                    " if params is non-null.");
-            }
-            algorithm = Pem.DEFAULT_ALGO;
-        }
-
+        Objects.requireNonNull(de, "a key must be specified.");
+        Objects.requireNonNull(password, "a password must be specified.");
+        Objects.requireNonNull(algorithm, "an algorithm must be specified.");
+        char[] passwd = password.clone();
+        byte[] encoding = getEncoding(de);
         try {
-            SecretKeyFactory factory;
-            if (provider == null) {
-                factory = SecretKeyFactory.getInstance(algorithm);
-            } else {
-                factory = SecretKeyFactory.getInstance(algorithm, provider);
-            }
-            skey = factory.generateSecret(keySpec);
-        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
-            throw new IllegalArgumentException(e);
+            return encryptImpl(encoding, algorithm,
+                generateSecretKey(passwd, algorithm, provider), params,
+                provider, null);
+        } finally {
+            KeyUtil.clear(passwd, encoding);
         }
-        return encryptKeyImpl(key, algorithm, skey, params, provider, null);
     }
-
     /**
-     * Creates and encrypts an {@code EncryptedPrivateKeyInfo} from a given
-     * {@code PrivateKey} and password.  Default algorithm and parameters are
-     * used.
+     * Creates an {@code EncryptedPrivateKeyInfo} by encrypting the specified
+     * {@code DEREncodable}. A valid password must be specified. A default
+     * password-based encryption (PBE) algorithm and provider are used.
      *
-     * @param key the {@code PrivateKey} to be encrypted
-     * @param password the password used in the PBE encryption.  This array
-     *                 will be cloned before being used.
+     * @param de the {@code DEREncodable} to encrypt. Supported types include
+     *           {@code PrivateKey}, {@code KeyPair}, and {@code PKCS8EncodedKeySpec}.
+     * @param password the password used for PBE encryption. This array is cloned
+     *                 before use.
      * @return an {@code EncryptedPrivateKeyInfo}
-     * @throws IllegalArgumentException on initialization errors based on the
-     * arguments passed to the method
-     * @throws RuntimeException on an encryption error
-     * @throws NullPointerException when the {@code key} or {@code password}
-     * is {@code null}
+     * @throws NullPointerException if {@code de} or {@code password} is {@code null}
+     * @throws IllegalArgumentException if {@code de} is an unsupported
+     *         {@code DEREncodable}, if an error occurs while generating the
+     *         PBE key, or if the default algorithm is misconfigured
      *
-     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} Security Property
-     * defines the default encryption algorithm and the
-     * {@code AlgorithmParameterSpec} are the provider's algorithm defaults.
+     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} security property
+     * defines the default encryption algorithm. The {@code AlgorithmParameterSpec}
+     * defaults are determined by the provider.
      *
      * @since 25
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
-    public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key,
+    public static EncryptedPrivateKeyInfo encrypt(DEREncodable de,
         char[] password) {
-        return encryptKey(key, password, Pem.DEFAULT_ALGO, null, null);
+        return encrypt(de, password, Pem.DEFAULT_ALGO, null,
+            null);
     }
 
     /**
-     * Creates and encrypts an {@code EncryptedPrivateKeyInfo} from the given
-     * {@link PrivateKey} using the {@code encKey} and given parameters.
+     * Creates an {@code EncryptedPrivateKeyInfo} by encrypting the specified
+     * {@code DEREncodable}. A valid encryption algorithm and {@code Key} must
+     * be specified.
      *
-     * @param key the {@code PrivateKey} to be encrypted
-     * @param encKey the password-based encryption (PBE) {@code Key} used to
-     *              encrypt {@code key}.
-     * @param algorithm the PBE encryption algorithm.  The default algorithm is
-     *                 will be used if {@code null}; however, {@code null} is
-     *                 not allowed when {@code params} is non-null.
-     * @param params the {@code AlgorithmParameterSpec} to be used with
-     *               encryption. The provider list default will be used if
-     *               {@code null}.
-     * @param random the {@code SecureRandom} instance used during
-     *               encryption.  The default will be used if {@code null}.
-     * @param provider the {@code Provider} is used for {@link Cipher}
-     *                encryption operation.  The default provider list will be
-     *                used if {@code null}.
+     * <p>The format of the algorithm string is described in the
+     * <a href="{@docRoot}/../specs/security/standard-names.html#cipher-algorithms">
+     * Cipher Algorithms</a> section of the Java Security Standard Algorithm Names
+     * Specification.
+     *
+     * @param de the {@code DEREncodable} to encrypt. Supported types include
+     *           {@code PrivateKey}, {@code KeyPair}, and {@code PKCS8EncodedKeySpec}.
+     * @param encryptKey the key used to encrypt the encoding
+     * @param algorithm the encryption algorithm, such as a password-based
+     *                  encryption (PBE) algorithm
+     * @param params the {@code AlgorithmParameterSpec} used for encryption. If
+     *               {@code null}, the provider’s default parameters are applied.
+     * @param random the {@code SecureRandom} instance used during encryption.
+     *               If {@code null}, the default is used.
+     * @param provider the {@code Provider} for {@code Cipher} operations.
+     *                 If {@code null}, the default provider list is used.
      * @return an {@code EncryptedPrivateKeyInfo}
-     * @throws IllegalArgumentException on initialization errors based on the
-     * arguments passed to the method
-     * @throws RuntimeException on an encryption error
-     * @throws NullPointerException if the {@code key} or {@code encKey} are
-     * {@code null}. If {@code params} is non-null, {@code algorithm} cannot be
-     * {@code null}.
-     *
-     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} Security Property
-     * defines the default encryption algorithm and the
-     * {@code AlgorithmParameterSpec} are the provider's algorithm defaults.
+     * @throws NullPointerException if {@code de}, {@code encryptKey}, or
+     *         {@code algorithm} is {@code null}
+     * @throws IllegalArgumentException if {@code de} is an unsupported
+     *         {@code DEREncodable}, if {@code encryptKey} is invalid, if
+     *         {@code algorithm} or {@code params} are not supported by any
+     *         provider, or if an error occurs during encryption
      *
      * @since 25
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
-    public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key, Key encKey,
-        String algorithm, AlgorithmParameterSpec params, Provider provider,
-        SecureRandom random) {
+    public static EncryptedPrivateKeyInfo encrypt(DEREncodable de,
+        Key encryptKey, String algorithm, AlgorithmParameterSpec params,
+        Provider provider, SecureRandom random) {
 
-        Objects.requireNonNull(key);
-        Objects.requireNonNull(encKey);
-        if (algorithm == null) {
-            if (params != null) {
-                throw new NullPointerException("algorithm must be specified " +
-                    "if params is non-null.");
-            }
-            algorithm = Pem.DEFAULT_ALGO;
-        }
-        return encryptKeyImpl(key, algorithm, encKey, params, provider, random);
+        Objects.requireNonNull(de, "a key must be specified.");
+        Objects.requireNonNull(encryptKey, "an encryption key must be specified.");
+        Objects.requireNonNull(algorithm, "an algorithm must be specified.");
+        return encryptImpl(getEncoding(de), algorithm, encryptKey,
+            params, provider, random);
     }
 
-    private static EncryptedPrivateKeyInfo encryptKeyImpl(PrivateKey key,
+    private static EncryptedPrivateKeyInfo encryptImpl(byte[] encoded,
         String algorithm, Key encryptKey, AlgorithmParameterSpec params,
         Provider provider, SecureRandom random) {
         AlgorithmId algId;
@@ -481,17 +474,26 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
                 c = Cipher.getInstance(algorithm, provider);
             }
             c.init(Cipher.ENCRYPT_MODE, encryptKey, params, random);
-            encryptedData = c.doFinal(key.getEncoded());
-            algId = new AlgorithmId(Pem.getPBEID(algorithm), c.getParameters());
+            encryptedData = c.doFinal(encoded);
+            try {
+                // Use shared PEM method for very likely case the algorithm is PBE.
+                algId = new AlgorithmId(Pem.getPBEID(algorithm), c.getParameters());
+            } catch (IllegalArgumentException e) {
+                // For the unlikely case a non-PBE cipher is used, get the OID.
+                algId = new AlgorithmId(AlgorithmId.get(algorithm).getOID(),
+                    c.getParameters());
+            }
             out = new DerOutputStream();
             algId.encode(out);
             out.putOctetString(encryptedData);
         } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException |
-                 NoSuchPaddingException e) {
+                 IllegalStateException | NoSuchPaddingException |
+                 IllegalBlockSizeException | InvalidKeyException e) {
             throw new IllegalArgumentException(e);
-        } catch (IllegalBlockSizeException | BadPaddingException |
-                 InvalidKeyException e) {
-            throw new RuntimeException(e);
+        } catch (BadPaddingException e) {
+            throw new AssertionError(e);
+        } finally {
+            KeyUtil.clear(encoded);
         }
         return new EncryptedPrivateKeyInfo(
             DerValue.wrap(DerValue.tag_Sequence, out).toByteArray(),
@@ -499,63 +501,129 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
     }
 
     /**
-     * Extract the enclosed {@code PrivateKey} object from the encrypted data
-     * and return it.
+     * Extracts and returns the enclosed {@code PrivateKey} using the
+     * specified password.
      *
-     * @param password the password used in the PBE encryption.  This array
-     *                 will be cloned before being used.
-     * @return a {@code PrivateKey}
-     * @throws GeneralSecurityException if an error occurs parsing or
-     * decrypting the encrypted data, or producing the key object.
-     * @throws NullPointerException if {@code password} is null
+     * @param password the password used for PBE decryption. The array is cloned
+     *                 before use.
+     * @return the decrypted {@code PrivateKey}
+     * @throws NullPointerException if {@code password} is {@code null}
+     * @throws NoSuchAlgorithmException if the decryption algorithm is unsupported
+     * @throws InvalidKeyException if an error occurs during parsing,
+     *         decryption, or key generation
      *
      * @since 25
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
-    public PrivateKey getKey(char[] password) throws GeneralSecurityException {
-        SecretKeyFactory skf;
-        PKCS8EncodedKeySpec p8KeySpec;
-        Objects.requireNonNull(password, "password cannot be null");
+    public PrivateKey getKey(char[] password)
+        throws NoSuchAlgorithmException, InvalidKeyException {
+        Objects.requireNonNull(password, "a password must be specified.");
         PBEKeySpec keySpec = new PBEKeySpec(password);
-        skf = SecretKeyFactory.getInstance(getAlgName());
-        p8KeySpec = getKeySpec(skf.generateSecret(keySpec));
-
-        return PKCS8Key.parseKey(p8KeySpec.getEncoded());
+        try {
+            return PKCS8Key.parseKey(Pem.decryptEncoding(this, keySpec), null);
+        } finally {
+            keySpec.clearPassword();
+        }
     }
 
     /**
-     * Extract the enclosed {@code PrivateKey} object from the encrypted data
-     * and return it.
+     * Extracts and returns the enclosed {@code PrivateKey} using the specified
+     * decryption key and provider.
      *
-     * @param decryptKey the decryption key and cannot be {@code null}
-     * @param provider the {@code Provider} used for Cipher decryption and
-     *                 {@code PrivateKey} generation. A {@code null} value will
-     *                 use the default provider configuration.
-     * @return a {@code PrivateKey}
-     * @throws GeneralSecurityException if an error occurs parsing or
-     * decrypting the encrypted data, or producing the key object.
-     * @throws NullPointerException if {@code decryptKey} is null
+     * @param decryptKey the decryption key. Must not be {@code null}.
+     * @param provider the {@code Provider} for {@code Cipher} decryption
+     *                 and {@code PrivateKey} generation. If {@code null}, the
+     *                 default provider configuration is used.
+     * @return the decrypted {@code PrivateKey}
+     * @throws NullPointerException if {@code decryptKey} is {@code null}
+     * @throws NoSuchAlgorithmException if the decryption algorithm is unsupported
+     * @throws InvalidKeyException if an error occurs during parsing,
+     *         decryption, or key generation
      *
      * @since 25
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
     public PrivateKey getKey(Key decryptKey, Provider provider)
-        throws GeneralSecurityException {
-        Objects.requireNonNull(decryptKey,"decryptKey cannot be null.");
-        PKCS8EncodedKeySpec p = getKeySpecImpl(decryptKey, provider);
+        throws NoSuchAlgorithmException, InvalidKeyException {
+        Objects.requireNonNull(decryptKey,"a decryptKey must be specified.");
+        byte[] encoding = null;
         try {
-            if (provider == null) {
-                return KeyFactory.getInstance(
-                    KeyUtil.getAlgorithm(p.getEncoded())).
-                    generatePrivate(p);
-            }
-            return KeyFactory.getInstance(KeyUtil.getAlgorithm(p.getEncoded()),
-                provider).generatePrivate(p);
-        } catch (IOException e) {
-            throw new GeneralSecurityException(e);
+            encoding = decryptData(decryptKey, provider);
+            return PKCS8Key.parseKey(encoding, provider);
+        } finally {
+            KeyUtil.clear(encoding);
         }
     }
 
+    /**
+     * Extracts and returns the enclosed {@code KeyPair} using the specified
+     * password. If the encoded data does not contain both a public and private
+     * key, an {@code InvalidKeyException} is thrown.
+     *
+     * @param password the password used for PBE decryption. The array is cloned
+     *                 before use.
+     * @return a decrypted {@code KeyPair}
+     * @throws NullPointerException if {@code password} is {@code null}
+     * @throws NoSuchAlgorithmException if the decryption algorithm is unsupported
+     * @throws InvalidKeyException if the encoded data lacks a public key, or if
+     *         an error occurs during parsing, decryption, or key generation
+     *
+     * @since 26
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public KeyPair getKeyPair(char[] password)
+        throws NoSuchAlgorithmException, InvalidKeyException {
+        Objects.requireNonNull(password, "a password must be specified.");
+
+        PBEKeySpec keySpec = new PBEKeySpec(password);
+        DEREncodable d;
+        try {
+            d = Pem.toDEREncodable(Pem.decryptEncoding(this, keySpec), true, null);
+        } finally {
+            keySpec.clearPassword();
+        }
+        return switch (d) {
+            case KeyPair kp -> kp;
+            case PrivateKey ignored -> throw new InvalidKeyException(
+                "This encoding does not contain a public key.");
+            default -> throw new InvalidKeyException(
+                "Invalid class returned " + d.getClass().getName());
+        };
+    }
+
+    /**
+     * Extracts and returns the enclosed {@code KeyPair} using the specified
+     * decryption key and provider. If the encoded data does not contain both a
+     * public and private key, an {@code InvalidKeyException} is thrown.
+     *
+     * @param decryptKey the decryption key. Must not be {@code null}.
+     * @param provider the {@code Provider} for {@code Cipher} decryption
+     *                 and key generation. If {@code null}, the default provider
+     *                 configuration is used.
+     * @return a decrypted {@code KeyPair}
+     * @throws NullPointerException if {@code decryptKey} is {@code null}
+     * @throws NoSuchAlgorithmException if the decryption algorithm is unsupported
+     * @throws InvalidKeyException if the encoded data lacks a public key, or if
+     *         an error occurs during parsing, decryption, or key generation
+     *
+     * @since 26
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public KeyPair getKeyPair(Key decryptKey, Provider provider)
+        throws NoSuchAlgorithmException, InvalidKeyException {
+        Objects.requireNonNull(decryptKey,"a decryptKey must be specified.");
+
+        DEREncodable d = Pem.toDEREncodable(
+            decryptData(decryptKey, provider),true, provider);
+        return switch (d) {
+            case KeyPair kp -> kp;
+            case PrivateKey ignored -> throw new InvalidKeyException(
+                "This encoding does not contain a public key.");
+            default -> throw new InvalidKeyException(
+                "Invalid class returned " + d.getClass().getName());
+        };
+    }
+
     /**
      * Extract the enclosed PKCS8EncodedKeySpec object from the
      * encrypted data and return it.
@@ -585,7 +653,7 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
      * @param decryptKey key used for decrypting the encrypted data.
      * @param providerName the name of provider whose cipher
      * implementation will be used.
-     * @return the PKCS8EncodedKeySpec object.
+     * @return the PKCS8EncodedKeySpec object
      * @exception NullPointerException if {@code decryptKey}
      * or {@code providerName} is {@code null}.
      * @exception NoSuchProviderException if no provider
@@ -670,17 +738,48 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
         return this.encoded.clone();
     }
 
-    private static void checkTag(DerValue val, byte tag, String valName)
-        throws IOException {
-        if (val.getTag() != tag) {
-            throw new IOException("invalid key encoding - wrong tag for " +
-                                  valName);
-        }
-    }
-
+    // Read the encodedKey and return a P8EKS with the algorithm specified
     private static PKCS8EncodedKeySpec pkcs8EncodingToSpec(byte[] encodedKey)
         throws IOException {
             return new PKCS8EncodedKeySpec(encodedKey,
                 KeyUtil.getAlgorithm(encodedKey));
     }
+
+    // Return the PKCS#8 encoding from a DEREncodable
+    private static byte[] getEncoding(DEREncodable d) {
+        return switch (d) {
+            case PrivateKey p -> p.getEncoded();
+            case PKCS8EncodedKeySpec p8 -> p8.getEncoded();
+            case KeyPair kp -> {
+                try {
+                    yield PKCS8Key.getEncoded(kp.getPublic().getEncoded(),
+                        kp.getPrivate().getEncoded());
+                } catch (IOException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+            default -> throw new IllegalArgumentException(
+                d.getClass().getName() + " not supported by this method");
+        };
+    }
+
+    // Generate a SecretKey from the password.
+    private static SecretKey generateSecretKey(char[] password, String algorithm,
+        Provider provider) {
+        PBEKeySpec keySpec = new PBEKeySpec(password);
+
+        try {
+            SecretKeyFactory factory;
+            if (provider == null) {
+                factory = SecretKeyFactory.getInstance(algorithm);
+            } else {
+                factory = SecretKeyFactory.getInstance(algorithm, provider);
+            }
+            return factory.generateSecret(keySpec);
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+            throw new IllegalArgumentException(e);
+        } finally {
+            keySpec.clearPassword();
+        }
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 6b8cda6aa1a..1316b8b946f 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -87,7 +87,8 @@ public @interface PreviewFeature {
         STRUCTURED_CONCURRENCY,
         @JEP(number = 502, title = "Stable Values", status = "Preview")
         STABLE_VALUES,
-        @JEP(number=470, title="PEM Encodings of Cryptographic Objects", status="Preview")
+        @JEP(number=524, title="PEM Encodings of Cryptographic Objects",
+            status="Second Preview")
         PEM_API,
         LANGUAGE_MODEL,
         /**
diff --git a/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java b/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
index 2530425fbd4..a753a105e6e 100644
--- a/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
@@ -26,6 +26,7 @@
 package sun.security.ec;
 
 import sun.security.pkcs.PKCS8Key;
+import sun.security.util.KeyUtil;
 
 import java.security.*;
 import java.security.interfaces.*;
@@ -213,11 +214,17 @@ public final class ECKeyFactory extends KeyFactorySpi {
             case ECPublicKeySpec e ->
                 new ECPublicKeyImpl(e.getW(), e.getParams());
             case PKCS8EncodedKeySpec p8 -> {
-                PKCS8Key p8key = new ECPrivateKeyImpl(p8.getEncoded());
-                if (!p8key.hasPublicKey()) {
-                    throw new InvalidKeySpecException("No public key found.");
+                byte[] encoded = p8.getEncoded();
+                PKCS8Key p8key = null;
+                try {
+                    p8key = new ECPrivateKeyImpl(encoded);
+                    if (!p8key.hasPublicKey()) {
+                        throw new InvalidKeySpecException("No public key found.");
+                    }
+                    yield new ECPublicKeyImpl(p8key.getPubKeyEncoded());
+                } finally {
+                    KeyUtil.clear(encoded, p8key);
                 }
-                yield new ECPublicKeyImpl(p8key.getPubKeyEncoded());
             }
             case null -> throw new InvalidKeySpecException(
                 "keySpec must not be null");
diff --git a/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
index 65c4f093f27..1b69a5b22b4 100644
--- a/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
@@ -75,6 +75,7 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
     @SuppressWarnings("serial") // Type of field is not Serializable
     private ECParameterSpec params;
     private byte[] domainParams;  //Currently unsupported
+    private final byte SEC1v2 = 1;
 
     /**
      * Construct a key from its encoding. Called by the ECKeyFactory.
@@ -92,34 +93,6 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
             throws InvalidKeyException {
         this.s = s;
         this.params = params;
-        makeEncoding(s);
-
-    }
-
-    ECPrivateKeyImpl(byte[] s, ECParameterSpec params)
-            throws InvalidKeyException {
-        this.arrayS = s.clone();
-        this.params = params;
-        makeEncoding(s);
-    }
-
-    private void makeEncoding(byte[] s) throws InvalidKeyException {
-        algid = new AlgorithmId
-                (AlgorithmId.EC_oid, ECParameters.getAlgorithmParameters(params));
-        DerOutputStream out = new DerOutputStream();
-        out.putInteger(1); // version 1
-        byte[] privBytes = s.clone();
-        ArrayUtil.reverse(privBytes);
-        out.putOctetString(privBytes);
-        Arrays.fill(privBytes, (byte) 0);
-        DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
-        privKeyMaterial = val.toByteArray();
-        val.clear();
-    }
-
-    private void makeEncoding(BigInteger s) throws InvalidKeyException {
-        algid = new AlgorithmId(AlgorithmId.EC_oid,
-                ECParameters.getAlgorithmParameters(params));
         byte[] sArr = s.toByteArray();
         // convert to fixed-length array
         int numOctets = (params.getOrder().bitLength() + 7) / 8;
@@ -129,11 +102,33 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
         int length = Math.min(sArr.length, sOctets.length);
         System.arraycopy(sArr, inPos, sOctets, outPos, length);
         Arrays.fill(sArr, (byte) 0);
+        try {
+            makeEncoding(sOctets);
+        } finally {
+            Arrays.fill(sOctets, (byte) 0);
+        }
+    }
 
+    ECPrivateKeyImpl(byte[] s, ECParameterSpec params)
+            throws InvalidKeyException {
+        this.arrayS = s.clone();
+        this.params = params;
+        byte[] privBytes = arrayS.clone();
+        ArrayUtil.reverse(privBytes);
+        try {
+            makeEncoding(privBytes);
+        } finally {
+            Arrays.fill(privBytes, (byte) 0);
+        }
+
+    }
+
+    private void makeEncoding(byte[] privBytes) throws InvalidKeyException {
+        algid = new AlgorithmId(AlgorithmId.EC_oid,
+            ECParameters.getAlgorithmParameters(params));
         DerOutputStream out = new DerOutputStream();
         out.putInteger(1); // version 1
-        out.putOctetString(sOctets);
-        Arrays.fill(sOctets, (byte) 0);
+        out.putOctetString(privBytes);
         DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
         privKeyMaterial = val.toByteArray();
         val.clear();
@@ -181,7 +176,7 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
             }
             DerInputStream data = derValue.data;
             int version = data.getInteger();
-            if (version != V2) {
+            if (version != SEC1v2) {
                 throw new IOException("Version must be 1");
             }
             byte[] privData = data.getOctetString();
@@ -253,4 +248,40 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
         throw new InvalidObjectException(
                 "ECPrivateKeyImpl keys are not directly deserializable");
     }
+
+    // Parse the SEC1v2 encoding to extract public key, if available.
+    public static BitArray parsePublicBits(byte[] privateBytes) {
+        DerValue seq = null;
+        try {
+            seq = new DerValue(privateBytes);
+            if (seq.tag == DerValue.tag_Sequence) {
+                int version = seq.data.getInteger();
+                if (version == 1) { // EC
+                    seq.data.getDerValue();  // read pass the private key
+                    if (seq.data.available() != 0) {
+                        DerValue derValue = seq.data.getDerValue();
+                        // check for optional [0] EC domain parameters
+                        if (derValue.isContextSpecific((byte) 0)) {
+                            if (seq.data.available() == 0) {
+                                return null;
+                            }
+                            derValue = seq.data.getDerValue();
+                        }
+                        // [1] public key
+                        if (derValue.isContextSpecific((byte) 1)) {
+                            derValue = derValue.data.getDerValue();
+                            return derValue.getUnalignedBitString();
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e);
+        } finally {
+            if (seq != null) {
+                seq.clear();
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java b/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
index c8fb6c0c11b..8f060705323 100644
--- a/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
@@ -26,6 +26,7 @@
 package sun.security.ec;
 
 import sun.security.pkcs.PKCS8Key;
+import sun.security.util.KeyUtil;
 
 import java.security.*;
 import java.security.interfaces.XECKey;
@@ -159,15 +160,20 @@ public class XDHKeyFactory extends KeyFactorySpi {
                 yield new XDHPublicKeyImpl(params, publicKeySpec.getU());
             }
             case PKCS8EncodedKeySpec p8 -> {
-                PKCS8Key p8key = new XDHPrivateKeyImpl(p8.getEncoded());
-                if (!p8key.hasPublicKey()) {
-                    throw new InvalidKeySpecException("No public key found.");
+                byte[] encoded = p8.getEncoded();
+                PKCS8Key p8key = new XDHPrivateKeyImpl(encoded);
+                try {
+                    if (!p8key.hasPublicKey()) {
+                        throw new InvalidKeySpecException("No public key found.");
+                    }
+                    XDHPublicKeyImpl result =
+                        new XDHPublicKeyImpl(p8key.getPubKeyEncoded());
+                    checkLockedParams(InvalidKeySpecException::new,
+                        result.getParams());
+                    yield result;
+                } finally {
+                    KeyUtil.clear(encoded, p8key);
                 }
-                XDHPublicKeyImpl result =
-                    new XDHPublicKeyImpl(p8key.getPubKeyEncoded());
-                checkLockedParams(InvalidKeySpecException::new,
-                    result.getParams());
-                yield result;
             }
             case null -> throw new InvalidKeySpecException(
                 "keySpec must not be null");
diff --git a/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java b/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
index 71ec14ba06f..d59e44d81db 100644
--- a/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
@@ -26,6 +26,7 @@
 package sun.security.ec.ed;
 
 import sun.security.pkcs.PKCS8Key;
+import sun.security.util.KeyUtil;
 
 import java.security.*;
 import java.security.interfaces.*;
@@ -152,11 +153,17 @@ public class EdDSAKeyFactory extends KeyFactorySpi {
                 yield new EdDSAPublicKeyImpl(params, publicKeySpec.getPoint());
             }
             case PKCS8EncodedKeySpec p8 -> {
-                PKCS8Key p8key = new EdDSAPrivateKeyImpl(p8.getEncoded());
-                if (!p8key.hasPublicKey()) {
-                    throw new InvalidKeySpecException("No public key found.");
+                byte[] encoded = p8.getEncoded();
+                PKCS8Key p8key = null;
+                try {
+                     p8key = new EdDSAPrivateKeyImpl(encoded);
+                    if (!p8key.hasPublicKey()) {
+                        throw new InvalidKeySpecException("No public key found.");
+                    }
+                    yield new EdDSAPublicKeyImpl(p8key.getPubKeyEncoded());
+                } finally {
+                    KeyUtil.clear(encoded, p8key);
                 }
-                yield new EdDSAPublicKeyImpl(p8key.getPubKeyEncoded());
             }
             case null -> throw new InvalidKeySpecException(
                 "keySpec must not be null");
diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
index b7cc5e7057f..dea87bd0a32 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
@@ -26,6 +26,7 @@
 package sun.security.pkcs;
 
 import jdk.internal.access.SharedSecrets;
+import sun.security.ec.ECPrivateKeyImpl;
 import sun.security.util.*;
 import sun.security.x509.AlgorithmId;
 import sun.security.x509.X509Key;
@@ -104,11 +105,29 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
         }
     }
 
-    private PKCS8Key(byte[] privEncoding, byte[] pubEncoding)
+    /**
+     * Constructor that takes both public and private encodings.
+     *
+     * If the private key includes a public key encoding (like an EC key in
+     * SEC1v2 format), and a specified public key matches it, the existing
+     * encoding is reused rather than recreated.
+     */
+    public PKCS8Key(byte[] publicEncoding, byte[] privateEncoding)
         throws InvalidKeyException {
-        this(privEncoding);
-        pubKeyEncoded = pubEncoding;
-        version = V2;
+        this(privateEncoding);
+        if (publicEncoding != null) {
+            if (pubKeyEncoded != null) {
+                if (!Arrays.equals(pubKeyEncoded, publicEncoding)) {
+                    Arrays.fill(privKeyMaterial, (byte) 0x0);
+                    throw new InvalidKeyException("PrivateKey " +
+                        "encoding has a public key that does not match " +
+                        "the given PublicKey");
+                }
+            } else {
+                pubKeyEncoded = publicEncoding;
+                version = V2;
+            }
+        }
     }
 
     public int getVersion() {
@@ -137,6 +156,14 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
             // Store key material for subclasses to parse
             privKeyMaterial = val.data.getOctetString();
 
+            // Special check and parsing for ECDSA's SEC1v2 format
+            if (algid.getOID().equals(AlgorithmId.EC_oid)) {
+                var bits = ECPrivateKeyImpl.parsePublicBits(privKeyMaterial);
+                if (bits != null) {
+                    pubKeyEncoded = new X509Key(algid, bits).getEncoded();
+                }
+            }
+
             // PKCS8 v1 typically ends here
             if (val.data.available() == 0) {
                 return;
@@ -271,19 +298,24 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
      * With a given encoded Public and Private key, generate and return a
      * PKCS8v2 DER-encoded byte[].
      *
-     * @param pubKeyEncoded DER-encoded PublicKey
+     * @param pubKeyEncoded DER-encoded PublicKey, this may be null.
      * @param privKeyEncoded DER-encoded PrivateKey
      * @return DER-encoded byte array
      * @throws IOException thrown on encoding failure
      */
     public static byte[] getEncoded(byte[] pubKeyEncoded, byte[] privKeyEncoded)
         throws IOException {
+        PKCS8Key pkcs8Key;
         try {
-            return new PKCS8Key(privKeyEncoded, pubKeyEncoded).
-                generateEncoding();
+            pkcs8Key = new PKCS8Key(pubKeyEncoded, privKeyEncoded);
         } catch (InvalidKeyException e) {
             throw new IOException(e);
         }
+        try {
+            return pkcs8Key.generateEncoding().clone();
+        } finally {
+            pkcs8Key.clear();
+        }
     }
 
     /**
@@ -295,7 +327,7 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
     private synchronized byte[] getEncodedInternal() {
         if (encodedKey == null) {
             try {
-                encodedKey = generateEncoding();
+                generateEncoding();
             } catch (IOException e) {
                return null;
             }
@@ -326,7 +358,6 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
                     throw new IOException(e);
                 }
 
-                // X509Key x = X509Key.parse(pubKeyEncoded);
                 DerOutputStream pubOut = new DerOutputStream();
                 pubOut.putUnalignedBitString(x.getKey());
                 out.writeImplicit(
diff --git a/src/java.base/share/classes/sun/security/provider/X509Factory.java b/src/java.base/share/classes/sun/security/provider/X509Factory.java
index 1a8ace55fc8..f732c7c0455 100644
--- a/src/java.base/share/classes/sun/security/provider/X509Factory.java
+++ b/src/java.base/share/classes/sun/security/provider/X509Factory.java
@@ -27,7 +27,7 @@ package sun.security.provider;
 
 import java.io.*;
 
-import java.security.PEMRecord;
+import java.security.PEM;
 import java.security.cert.*;
 import java.util.*;
 
@@ -559,7 +559,7 @@ public class X509Factory extends CertificateFactorySpi {
             return bout.toByteArray();
         } else {
             try {
-                PEMRecord rec;
+                PEM rec;
                 try {
                     rec = Pem.readPEM(is, (c == '-' ? true : false));
                 } catch (EOFException e) {
diff --git a/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index ccc72ea6ea2..942a91d61b8 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -36,12 +36,14 @@ import javax.crypto.interfaces.DHKey;
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.DHParameterSpec;
 import javax.crypto.spec.DHPublicKeySpec;
+import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.security.auth.DestroyFailedException;
 import jdk.internal.access.SharedSecrets;
 
 import com.sun.crypto.provider.PBKDF2KeyImpl;
 import sun.security.jca.JCAUtil;
+import sun.security.pkcs.PKCS8Key;
 import sun.security.x509.AlgorithmId;
 
 /**
@@ -548,6 +550,22 @@ public final class KeyUtil {
         throw new IOException("No algorithm detected");
     }
 
-
+    // Generic method for zeroing arrays and objects
+    public static void clear(Object... list) {
+        for (Object o: list) {
+            switch (o) {
+                case byte[] b -> Arrays.fill(b, (byte)0);
+                case char[] c -> Arrays.fill(c, (char)0);
+                case PKCS8Key p8 -> p8.clear();
+                case PKCS8EncodedKeySpec p8 ->
+                    SharedSecrets.getJavaSecuritySpecAccess().clearEncodedKeySpec(p8);
+                case PBEKeySpec pbe -> pbe.clearPassword();
+                case null -> {}
+                default ->
+                    throw new IllegalArgumentException(
+                    o.getClass().getName() + " not defined in KeyUtil.clear()");
+            }
+        }
+    }
 }
 
diff --git a/src/java.base/share/classes/sun/security/util/Pem.java b/src/java.base/share/classes/sun/security/util/Pem.java
index 492017eca29..a9b2908bcc9 100644
--- a/src/java.base/share/classes/sun/security/util/Pem.java
+++ b/src/java.base/share/classes/sun/security/util/Pem.java
@@ -25,13 +25,18 @@
 
 package sun.security.util;
 
+import sun.security.pkcs.PKCS8Key;
 import sun.security.x509.AlgorithmId;
 
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.security.NoSuchAlgorithmException;
-import java.security.PEMRecord;
-import java.security.Security;
+import java.security.*;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.HexFormat;
@@ -145,6 +150,9 @@ public class Pem {
      * Read the PEM text and return it in it's three components:  header,
      * base64, and footer.
      *
+     * The header begins processing when "-----B" is read.  At that point
+     * exceptions will be thrown for syntax errors.
+     *
      * The method will leave the stream after reading the end of line of the
      * footer or end of file
      * @param is an InputStream
@@ -159,15 +167,16 @@ public class Pem {
      * but the read position in the stream is at the end of the block, so
      * future reads can be successful.
      */
-    public static PEMRecord readPEM(InputStream is, boolean shortHeader)
+    public static PEM readPEM(InputStream is, boolean shortHeader)
         throws IOException {
         Objects.requireNonNull(is);
 
         int hyphen = (shortHeader ? 1 : 0);
         int eol = 0;
-
         ByteArrayOutputStream os = new ByteArrayOutputStream(6);
-        // Find starting hyphens
+
+        // Find 5 hyphens followed by a 'B' to start processing the header.
+        boolean headerStarted = false;
         do {
             int d = is.read();
             switch (d) {
@@ -178,13 +187,20 @@ public class Pem {
                     }
                     throw new EOFException("No PEM data found");
                 }
+                case 'B' -> {
+                    if (hyphen == 5) {
+                        headerStarted = true;
+                    } else {
+                        hyphen = 0;
+                    }
+                }
                 default -> hyphen = 0;
             }
             os.write(d);
-        } while (hyphen != 5);
+        } while (!headerStarted);
 
         StringBuilder sb = new StringBuilder(64);
-        sb.append("-----");
+        sb.append("-----B");
         hyphen = 0;
         int c;
 
@@ -307,14 +323,14 @@ public class Pem {
         // If there was data before finding the 5 dashes of the PEM header,
         // backup 5 characters and save that data.
         byte[] preData = null;
-        if (os.size() > 5) {
-            preData = Arrays.copyOf(os.toByteArray(), os.size() - 5);
+        if (os.size() > 6) {
+            preData = Arrays.copyOf(os.toByteArray(), os.size() - 6);
         }
 
-        return new PEMRecord(typeConverter(headerType), data, preData);
+        return new PEM(typeConverter(headerType), data, preData);
     }
 
-    public static PEMRecord readPEM(InputStream is) throws IOException {
+    public static PEM readPEM(InputStream is) throws IOException {
         return readPEM(is, false);
     }
 
@@ -342,8 +358,115 @@ public class Pem {
      * is not used with this method.
      * @return PEM in a string
      */
-    public static String pemEncoded(PEMRecord pem) {
+    public static String pemEncoded(PEM pem) {
         String p = pem.content().replaceAll("(.{64})", "$1\r\n");
         return pemEncoded(pem.type(), p);
     }
+
+    /*
+     * Get PKCS8 encoding from an encrypted private key encoding.
+     */
+    public static byte[] decryptEncoding(byte[] encoded, char[] password)
+        throws GeneralSecurityException {
+        EncryptedPrivateKeyInfo ekpi;
+
+        Objects.requireNonNull(password, "password cannot be null");
+        PBEKeySpec keySpec = new PBEKeySpec(password);
+        try {
+            ekpi = new EncryptedPrivateKeyInfo(encoded);
+            return decryptEncoding(ekpi, keySpec);
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e);
+        } finally {
+            keySpec.clearPassword();
+        }
+    }
+
+    public static byte[] decryptEncoding(EncryptedPrivateKeyInfo ekpi, PBEKeySpec keySpec)
+        throws NoSuchAlgorithmException, InvalidKeyException {
+
+        PKCS8EncodedKeySpec p8KeySpec = null;
+        try {
+            SecretKeyFactory skf = SecretKeyFactory.getInstance(ekpi.getAlgName());
+            p8KeySpec = ekpi.getKeySpec(skf.generateSecret(keySpec));
+            return p8KeySpec.getEncoded();
+        } catch (InvalidKeySpecException e) {
+            throw new InvalidKeyException(e);
+        } finally {
+            KeyUtil.clear(p8KeySpec);
+        }
+    }
+
+
+    /**
+     * With a given PKCS8 encoding, construct a PrivateKey or KeyPair.  A
+     * KeyPair is returned if requested and the encoding has a public key;
+     * otherwise, a PrivateKey is returned.
+     *
+     * @param encoded PKCS8 encoding
+     * @param pair set to true for returning a KeyPair, if possible. Otherwise,
+     *             return a PrivateKey
+     * @param provider KeyFactory provider
+     */
+    public static DEREncodable toDEREncodable(byte[] encoded, boolean pair,
+        Provider provider) throws InvalidKeyException {
+
+        PrivateKey privKey;
+        PublicKey pubKey = null;
+        PKCS8EncodedKeySpec p8KeySpec;
+        PKCS8Key p8key = new PKCS8Key(encoded);
+        KeyFactory kf;
+
+        try {
+            p8KeySpec = new PKCS8EncodedKeySpec(encoded);
+        } catch (NullPointerException e) {
+            p8key.clear();
+            throw new InvalidKeyException("No encoding found", e);
+        }
+
+        try {
+            if (provider == null) {
+                kf = KeyFactory.getInstance(p8key.getAlgorithm());
+            } else {
+                kf = KeyFactory.getInstance(p8key.getAlgorithm(), provider);
+            }
+        } catch (NoSuchAlgorithmException e) {
+            KeyUtil.clear(p8KeySpec, p8key);
+            throw new InvalidKeyException("Unable to find the algorithm: " +
+                p8key.getAlgorithm(), e);
+        }
+
+        try {
+            privKey = kf.generatePrivate(p8KeySpec);
+
+            // Only want the PrivateKey? then return it.
+            if (!pair) {
+                return privKey;
+            }
+
+            if (p8key.hasPublicKey()) {
+                // PKCS8Key.decode() has extracted the public key already
+                pubKey = kf.generatePublic(
+                    new X509EncodedKeySpec(p8key.getPubKeyEncoded()));
+            } else {
+                // In case decode() could not read the public key, the
+                // KeyFactory can try.  Failure is ok as there may not
+                // be a public key in the encoding.
+                try {
+                    pubKey = kf.generatePublic(p8KeySpec);
+                } catch (InvalidKeySpecException e) {
+                    // ignore
+                }
+            }
+        } catch (InvalidKeySpecException e) {
+            throw new InvalidKeyException(e);
+        } finally {
+            KeyUtil.clear(p8KeySpec, p8key);
+        }
+        if (pair && pubKey != null) {
+            return new KeyPair(pubKey, privKey);
+        }
+        return privKey;
+    }
+
 }
diff --git a/test/jdk/java/security/PEM/PEMData.java b/test/jdk/java/security/PEM/PEMData.java
index 2c8c60fcccc..1c03baa7e7d 100644
--- a/test/jdk/java/security/PEM/PEMData.java
+++ b/test/jdk/java/security/PEM/PEMData.java
@@ -26,7 +26,7 @@
 import javax.crypto.EncryptedPrivateKeyInfo;
 import java.security.DEREncodable;
 import java.security.KeyPair;
-import java.security.PEMRecord;
+import java.security.PEM;
 import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.*;
@@ -48,6 +48,17 @@ class PEMData {
         -----END PRIVATE KEY-----
         """, KeyPair.class, "SunEC");
 
+    // EC 256 with a domain parameter & public key
+    public static final Entry ecsecp256dom0 = new Entry("ecsecp256dom0",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgkW3Jx561NlEgBnut
+        KwDdi3cNwu7YYD/QtJ+9+AEBdoqgCgYIKoZIzj0DAQehRANCAASL+REY4vvAI9M3
+        gonaml5K3lRgHq5w+OO4oO0VNduC44gUN1nrk7/wdNSpL+xXNEX52Dsff+2RD/fo
+        p224ANvB
+        -----END PRIVATE KEY-----
+        """, KeyPair.class, "SunEC");
+
     public static final Entry rsapriv = new Entry("rsapriv",
         """
         -----BEGIN PRIVATE KEY-----
@@ -149,7 +160,7 @@ class PEMData {
         -----END PRIVATE KEY-----
         """, RSAPrivateKey.class, "SunRsaSign");
 
-    public static final Entry ec25519priv = new Entry("ed25519priv",
+    public static final Entry ed25519priv = new Entry("ed25519priv",
         """
         -----BEGIN PRIVATE KEY-----
         MC4CAQAwBQYDK2VwBCIEIFFZsmD+OKk67Cigc84/2fWtlKsvXWLSoMJ0MHh4jI4I
@@ -189,6 +200,7 @@ class PEMData {
         -----END PUBLIC KEY-----
         """, RSAPublicKey.class, "SunRsaSign");
 
+    // This is the public key contained in ecsecp256
     public static final Entry ecsecp256pub = new Entry("ecsecp256pub", """
         -----BEGIN PUBLIC KEY-----
         MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEi/kRGOL7wCPTN4KJ2ppeSt5UYB6u
@@ -286,6 +298,19 @@ class PEMData {
         -----END RSA PRIVATE KEY-----
         """, RSAPrivateKey.class, "SunRsaSign");
 
+    static final Entry ecsecp256ekpi = new Entry("ecsecp256ekpi",
+        """
+        -----BEGIN ENCRYPTED PRIVATE KEY-----
+        MIH0MF8GCSqGSIb3DQEFDTBSMDEGCSqGSIb3DQEFDDAkBBDhqUj1Oadj1GZXUMXT
+        b3QEAgIIADAMBggqhkiG9w0CCQUAMB0GCWCGSAFlAwQBAgQQitxCfcZcMtoNu+X+
+        PQk+/wSBkFL1NddKkUL2tRv6pNf1TR7eI7qJReGRgJexU/6pDN+UQS5e5qSySa7E
+        k1m2pUHgZlySUblXZj9nOzCsNFfq/jxlL15ZpAviAM2fRINnNEJcvoB+qZTS5cRb
+        Xs3wC7wymHW3EdIZ9sxfSHq9t7j9SnC1jGHjno0v1rKcdIvJtYloxsRYjsG/Sxhz
+        uNYnx8AMuQ==
+        -----END ENCRYPTED PRIVATE KEY-----
+        """, EncryptedPrivateKeyInfo.class, "SunEC", "fish".toCharArray());
+
+
     static final Entry ed25519ep8 = new Entry("ed25519ep8",
         """
         -----BEGIN ENCRYPTED PRIVATE KEY-----
@@ -450,7 +475,7 @@ class PEMData {
         MQYMBGZpc2gwCgYIKoZIzj0EAwIDRwAwRAIgUBTdrMDE4BqruYRh1rRyKQBf48WR
         kIX8R4dBK9h1VRcCIEBR2Mzvku/huTbWTwKVlXBZeEmwIlxKwpRepPtViXcW
         -----END CERTIFICATE REQUEST-----
-        """, PEMRecord.class, "SunEC");
+        """, PEM.class, "SunEC");
 
     public static final String preData = "TEXT BLAH TEXT BLAH" +
         System.lineSeparator();
@@ -471,7 +496,7 @@ class PEMData {
         MQYMBGZpc2gwCgYIKoZIzj0EAwIDRwAwRAIgUBTdrMDE4BqruYRh1rRyKQBf48WR
         kIX8R4dBK9h1VRcCIEBR2Mzvku/huTbWTwKVlXBZeEmwIlxKwpRepPtViXcW
         -----END CERTIFICATE REQUEST-----
-        """ + postData, PEMRecord.class, "SunEC");
+        """ + postData, PEM.class, "SunEC");
 
     final static Pattern CR = Pattern.compile("\r");
     final static Pattern LF = Pattern.compile("\n");
@@ -564,8 +589,9 @@ class PEMData {
         privList.add(rsapsspriv);
         privList.add(rsaprivbc);
         privList.add(ecsecp256);
+        privList.add(ecsecp256dom0);
         privList.add(ecsecp384);
-        privList.add(ec25519priv);
+        privList.add(ed25519priv);
         privList.add(ed25519ekpi);  // The non-EKPI version needs decryption
         privList.add(rsaOpenSSL);
         oasList.add(oasrfc8410);
diff --git a/test/jdk/java/security/PEM/PEMDecoderTest.java b/test/jdk/java/security/PEM/PEMDecoderTest.java
index 8e3ae76994d..3ae088329b4 100644
--- a/test/jdk/java/security/PEM/PEMDecoderTest.java
+++ b/test/jdk/java/security/PEM/PEMDecoderTest.java
@@ -53,8 +53,11 @@ import sun.security.util.Pem;
 public class PEMDecoderTest {
 
     static HexFormat hex = HexFormat.of();
+    static final PEMDecoder d = PEMDecoder.of();
 
     public static void main(String[] args) throws Exception {
+        PEMDecoder decr;
+
         System.out.println("Decoder test:");
         PEMData.entryList.forEach(entry -> test(entry, false));
         System.out.println("Decoder test withFactory:");
@@ -89,12 +92,12 @@ public class PEMDecoderTest {
         System.out.println("Decoder test ecsecp256:");
         testFailure(PEMData.ecsecp256pub.makeNoCRLF("pubecpem-no"));
         System.out.println("Decoder test RSAcert with decryption Decoder:");
-        PEMDecoder d = PEMDecoder.of().withDecryption("123".toCharArray());
-        d.decode(PEMData.rsaCert.pem());
+        decr = d.withDecryption("123".toCharArray());
+        decr.decode(PEMData.rsaCert.pem());
         System.out.println("Decoder test ecsecp256 private key with decryption Decoder:");
-        ((KeyPair) d.decode(PEMData.ecsecp256.pem())).getPrivate();
+        ((KeyPair) decr.decode(PEMData.ecsecp256.pem())).getPrivate();
         System.out.println("Decoder test ecsecp256 to P8EKS:");
-        d.decode(PEMData.ecsecp256.pem(), PKCS8EncodedKeySpec.class);
+        decr.decode(PEMData.ecsecp256.pem(), PKCS8EncodedKeySpec.class);
 
         System.out.println("Checking if decode() returns the same encoding:");
         PEMData.privList.forEach(PEMDecoderTest::testDERCheck);
@@ -111,11 +114,11 @@ public class PEMDecoderTest {
         System.out.println("Checking if ecCSR:");
         test(PEMData.ecCSR);
         System.out.println("Checking if ecCSR with preData:");
-        DEREncodable result = PEMDecoder.of().decode(PEMData.ecCSRWithData.pem(), PEMRecord.class);
-        if (result instanceof PEMRecord rec) {
+        DEREncodable result = d.decode(PEMData.ecCSRWithData.pem(), PEM.class);
+        if (result instanceof PEM rec) {
             if (PEMData.preData.compareTo(new String(rec.leadingData())) != 0) {
-                System.err.println("expected: " + PEMData.preData);
-                System.err.println("received: " + new String(rec.leadingData()));
+                System.err.println("expected: \"" + PEMData.preData + "\"");
+                System.err.println("received: \"" + new String(rec.leadingData()) + "\"");
                 throw new AssertionError("ecCSRWithData preData wrong");
             }
             if (rec.content().lastIndexOf("F") > rec.content().length() - 5) {
@@ -128,35 +131,34 @@ public class PEMDecoderTest {
         }
 
         System.out.println("Decoding RSA pub using class PEMRecord:");
-        result = PEMDecoder.of().decode(PEMData.rsapub.pem(), PEMRecord.class);
-        if (!(result instanceof PEMRecord)) {
+        result = d.decode(PEMData.rsapub.pem(), PEM.class);
+        if (!(result instanceof PEM)) {
             throw new AssertionError("pubecpem didn't return a PEMRecord");
         }
-        if (((PEMRecord) result).type().compareTo(Pem.PUBLIC_KEY) != 0) {
+        if (((PEM) result).type().compareTo(Pem.PUBLIC_KEY) != 0) {
             throw new AssertionError("pubecpem PEMRecord didn't decode as a Public Key");
         }
 
         testInputStream();
         testPEMRecord(PEMData.rsapub);
         testPEMRecord(PEMData.ecCert);
-        testPEMRecord(PEMData.ec25519priv);
+        testPEMRecord(PEMData.ed25519priv);
         testPEMRecord(PEMData.ecCSR);
         testPEMRecord(PEMData.ecCSRWithData);
         testPEMRecordDecode(PEMData.rsapub);
         testPEMRecordDecode(PEMData.ecCert);
-        testPEMRecordDecode(PEMData.ec25519priv);
+        testPEMRecordDecode(PEMData.ed25519priv);
         testPEMRecordDecode(PEMData.ecCSR);
         testPEMRecordDecode(PEMData.ecCSRWithData);
 
-        d = PEMDecoder.of();
         System.out.println("Check leadingData is null with back-to-back PEMs: ");
-        String s = new PEMRecord("ONE", "1212").toString()
-            + new PEMRecord("TWO", "3434").toString();
-        var ins = new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8));
-        if (d.decode(ins, PEMRecord.class).leadingData() != null) {
+        String s = new PEM("ONE", "1212").toString()
+            + new PEM("TWO", "3434").toString();
+        ByteArrayInputStream bis = new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8));
+        if (d.decode(bis, PEM.class).leadingData() != null) {
             throw new AssertionError("leading data not null on first pem");
         }
-        if (d.decode(ins, PEMRecord.class).leadingData() != null) {
+        if (d.decode(bis, PEM.class).leadingData() != null) {
             throw new AssertionError("leading data not null on second pem");
         }
         System.out.println("PASS");
@@ -173,8 +175,8 @@ public class PEMDecoderTest {
         }
 
         // PBE
-        System.out.println("EncryptedPrivateKeyInfo.encryptKey with PBE: ");
-        ekpi = EncryptedPrivateKeyInfo.encryptKey(privateKey,
+        System.out.println("EncryptedPrivateKeyInfo.encrypt with PBE: ");
+        ekpi = EncryptedPrivateKeyInfo.encrypt(privateKey,
             "password".toCharArray(),"PBEWithMD5AndDES", null, null);
         try {
             ekpi.getKey("password".toCharArray());
@@ -184,8 +186,8 @@ public class PEMDecoderTest {
         }
 
         // PBES2
-        System.out.println("EncryptedPrivateKeyInfo.encryptKey with default: ");
-        ekpi = EncryptedPrivateKeyInfo.encryptKey(privateKey
+        System.out.println("EncryptedPrivateKeyInfo.encrypt with default: ");
+        ekpi = EncryptedPrivateKeyInfo.encrypt(privateKey
             , "password".toCharArray());
         try {
             ekpi.getKey("password".toCharArray());
@@ -197,6 +199,13 @@ public class PEMDecoderTest {
 
         System.out.println("Decoder test testCoefZero:");
         testCoefZero(PEMData.rsaCrtCoefZeroPriv);
+
+        // leadingData can contain dashes
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        bos.write("--------\n".getBytes(StandardCharsets.ISO_8859_1));
+        bos.write(PEMData.ecsecp256ekpi.pem().getBytes(StandardCharsets.ISO_8859_1));
+        bis = new ByteArrayInputStream(bos.toByteArray());
+        result = d.decode(bis, PEM.class);
     }
 
     static void testInputStream() throws IOException {
@@ -211,10 +220,10 @@ public class PEMDecoderTest {
         ByteArrayInputStream is = new ByteArrayInputStream(ba.toByteArray());
 
         System.out.println("Decoding 2 RSA pub with pre & post data:");
-        PEMRecord obj;
+        PEM obj;
         int keys = 0;
         while (keys++ < 2) {
-            obj = PEMDecoder.of().decode(is, PEMRecord.class);
+            obj = d.decode(is, PEM.class);
             if (!PEMData.preData.equalsIgnoreCase(
                 new String(obj.leadingData()))) {
                 System.out.println("expected: \"" + PEMData.preData + "\"");
@@ -225,7 +234,7 @@ public class PEMDecoderTest {
             System.out.println("  Read public key.");
         }
         try {
-            PEMDecoder.of().decode(is, PEMRecord.class);
+            d.decode(is, PEM.class);
             throw new AssertionError("3rd entry returned a PEMRecord");
         } catch (EOFException e) {
             System.out.println("Success: No 3rd entry found.  EOFE thrown.");
@@ -234,7 +243,7 @@ public class PEMDecoderTest {
         // End of stream
         try {
             System.out.println("Failed: There should be no PEMRecord: " +
-                PEMDecoder.of().decode(is, PEMRecord.class));
+                d.decode(is, PEM.class));
         } catch (EOFException e) {
             System.out.println("Success");
             return;
@@ -250,22 +259,22 @@ public class PEMDecoderTest {
     static void testCertTypeConverter(PEMData.Entry entry) throws CertificateEncodingException {
         String certPem = entry.pem().replace("CERTIFICATE", "X509 CERTIFICATE");
         Asserts.assertEqualsByteArray(entry.der(),
-                PEMDecoder.of().decode(certPem, X509Certificate.class).getEncoded());
+                d.decode(certPem, X509Certificate.class).getEncoded());
 
         certPem = entry.pem().replace("CERTIFICATE", "X.509 CERTIFICATE");
         Asserts.assertEqualsByteArray(entry.der(),
-                PEMDecoder.of().decode(certPem, X509Certificate.class).getEncoded());
+                d.decode(certPem, X509Certificate.class).getEncoded());
     }
 
     // test that when the crtCoeff is zero, the key is decoded but only the modulus and private
     // exponent are used resulting in a different der
     static void testCoefZero(PEMData.Entry entry) {
-        RSAPrivateKey decoded = PEMDecoder.of().decode(entry.pem(), RSAPrivateKey.class);
+        RSAPrivateKey decoded = d.decode(entry.pem(), RSAPrivateKey.class);
         Asserts.assertNotEqualsByteArray(decoded.getEncoded(), entry.der());
     }
 
     static void testPEMRecord(PEMData.Entry entry) {
-        PEMRecord r = PEMDecoder.of().decode(entry.pem(), PEMRecord.class);
+        PEM r = d.decode(entry.pem(), PEM.class);
         String expected = entry.pem().split("-----")[2].replace(System.lineSeparator(), "");
         try {
             PEMData.checkResults(expected, r.content());
@@ -285,7 +294,7 @@ public class PEMDecoderTest {
             case Pem.X509_CRL ->
                 entry.clazz().isAssignableFrom(X509CRL.class);
             case "CERTIFICATE REQUEST" ->
-                entry.clazz().isAssignableFrom(PEMRecord.class);
+                entry.clazz().isAssignableFrom(PEM.class);
             default -> false;
         };
 
@@ -300,8 +309,8 @@ public class PEMDecoderTest {
 
 
     static void testPEMRecordDecode(PEMData.Entry entry) {
-        PEMRecord r = PEMDecoder.of().decode(entry.pem(), PEMRecord.class);
-        DEREncodable de = PEMDecoder.of().decode(r.toString());
+        PEM r = d.decode(entry.pem(), PEM.class);
+        DEREncodable de = d.decode(r.toString());
 
         boolean result = switch(r.type()) {
             case Pem.PRIVATE_KEY ->
@@ -311,7 +320,7 @@ public class PEMDecoderTest {
             case Pem.CERTIFICATE, Pem.X509_CERTIFICATE ->
                 (de instanceof X509Certificate);
             case Pem.X509_CRL -> (de instanceof X509CRL);
-            case "CERTIFICATE REQUEST" -> (de instanceof PEMRecord);
+            case "CERTIFICATE REQUEST" -> (de instanceof PEM);
             default -> false;
         };
 
@@ -332,7 +341,7 @@ public class PEMDecoderTest {
 
     static void testFailure(PEMData.Entry entry, Class c) {
         try {
-            test(entry.pem(), c, PEMDecoder.of());
+            test(entry.pem(), c, d);
             if (entry.pem().indexOf('\r') != -1) {
                 System.out.println("Found a CR.");
             }
@@ -351,9 +360,11 @@ public class PEMDecoderTest {
     }
 
     static DEREncodable testEncrypted(PEMData.Entry entry) {
-        PEMDecoder decoder = PEMDecoder.of();
+        PEMDecoder decoder;
         if (!Objects.equals(entry.clazz(), EncryptedPrivateKeyInfo.class)) {
-            decoder = decoder.withDecryption(entry.password());
+            decoder = d.withDecryption(entry.password());
+        } else {
+            decoder = d;
         }
 
         try {
@@ -381,9 +392,9 @@ public class PEMDecoderTest {
             PEMDecoder pemDecoder;
             if (withFactory) {
                 Provider provider = Security.getProvider(entry.provider());
-                pemDecoder = PEMDecoder.of().withFactory(provider);
+                pemDecoder = d.withFactory(provider);
             } else {
-                pemDecoder = PEMDecoder.of();
+                pemDecoder = d;
             }
             DEREncodable r = test(entry.pem(), entry.clazz(), pemDecoder);
             System.out.println("PASS (" + entry.name() + ")");
@@ -446,9 +457,8 @@ public class PEMDecoderTest {
     // result is the same
     static void testTwoKeys() throws IOException {
         PublicKey p1, p2;
-        PEMDecoder pd = PEMDecoder.of();
-        p1 = pd.decode(PEMData.rsapub.pem(), RSAPublicKey.class);
-        p2 = pd.decode(PEMData.rsapub.pem(), RSAPublicKey.class);
+        p1 = d.decode(PEMData.rsapub.pem(), RSAPublicKey.class);
+        p2 = d.decode(PEMData.rsapub.pem(), RSAPublicKey.class);
         if (!Arrays.equals(p1.getEncoded(), p2.getEncoded())) {
             System.err.println("These two should have matched:");
             System.err.println(hex.parseHex(new String(p1.getEncoded())));
@@ -460,7 +470,7 @@ public class PEMDecoderTest {
 
     private static void testPKCS8Key(PEMData.Entry entry) {
         try {
-            PKCS8Key key = PEMDecoder.of().decode(entry.pem(), PKCS8Key.class);
+            PKCS8Key key = d.decode(entry.pem(), PKCS8Key.class);
             PKCS8EncodedKeySpec spec =
                     new PKCS8EncodedKeySpec(key.getEncoded());
 
@@ -472,7 +482,7 @@ public class PEMDecoderTest {
     }
 
     static void testClass(PEMData.Entry entry, Class clazz) throws IOException {
-        var pk = PEMDecoder.of().decode(entry.pem(), clazz);
+        var pk = d.decode(entry.pem(), clazz);
     }
 
     static void testClass(PEMData.Entry entry, Class clazz, boolean pass)
@@ -506,7 +516,7 @@ public class PEMDecoderTest {
             return;
         }
 
-        PKCS8EncodedKeySpec p8 = PEMDecoder.of().decode(entry.pem(),
+        PKCS8EncodedKeySpec p8 = d.decode(entry.pem(),
                 PKCS8EncodedKeySpec.class);
         int result = Arrays.compare(entry.der(), p8.getEncoded());
         if (result != 0) {
@@ -531,8 +541,8 @@ public class PEMDecoderTest {
         byte[] data = "12345678".getBytes();
         PrivateKey privateKey;
 
-        DEREncodable d = PEMDecoder.of().decode(entry.pem());
-        switch (d) {
+        DEREncodable der = d.decode(entry.pem());
+        switch (der) {
             case PrivateKey p -> privateKey = p;
             case KeyPair kp -> privateKey = kp.getPrivate();
             case EncryptedPrivateKeyInfo e -> {
@@ -563,7 +573,7 @@ public class PEMDecoderTest {
         };
 
         try {
-            if (d instanceof PrivateKey) {
+            if (der instanceof PrivateKey) {
                 s = Signature.getInstance(algorithm);
                 if (spec != null) {
                     s.setParameter(spec);
@@ -572,12 +582,12 @@ public class PEMDecoderTest {
                 s.update(data);
                 s.sign();
                 System.out.println("PASS (Sign): " + entry.name());
-            } else if (d instanceof KeyPair) {
+            } else if (der instanceof KeyPair) {
                 s = Signature.getInstance(algorithm);
                 s.initSign(privateKey);
                 s.update(data);
                 byte[] sig = s.sign();
-                s.initVerify(((KeyPair)d).getPublic());
+                s.initVerify(((KeyPair)der).getPublic());
                 s.verify(sig);
                 System.out.println("PASS (Sign/Verify): " + entry.name());
             } else {
diff --git a/test/jdk/java/security/PEM/PEMEncoderTest.java b/test/jdk/java/security/PEM/PEMEncoderTest.java
index 3d1948ba2fe..4b60758c89f 100644
--- a/test/jdk/java/security/PEM/PEMEncoderTest.java
+++ b/test/jdk/java/security/PEM/PEMEncoderTest.java
@@ -62,6 +62,10 @@ public class PEMEncoderTest {
     public static void main(String[] args) throws Exception {
         pkcs8DefaultAlgExpect = args[0];
         PEMEncoder encoder = PEMEncoder.of();
+        PEMDecoder decoder = PEMDecoder.of();
+        EncryptedPrivateKeyInfo ekpi;
+        KeyPair kp;
+        PEM pem;
 
         // These entries are removed
         var newEntryList = new ArrayList<>(PEMData.entryList);
@@ -70,14 +74,13 @@ public class PEMEncoderTest {
         newEntryList.remove(PEMData.getEntry("ecsecp384"));
         keymap = generateObjKeyMap(newEntryList);
         System.out.println("Same instance re-encode test:");
-        keymap.keySet().stream().forEach(key -> test(key, encoder));
+        keymap.keySet().forEach(key -> test(key, encoder));
         System.out.println("New instance re-encode test:");
-        keymap.keySet().stream().forEach(key -> test(key, PEMEncoder.of()));
+        keymap.keySet().forEach(key -> test(key, PEMEncoder.of()));
         System.out.println("Same instance re-encode testToString:");
-        keymap.keySet().stream().forEach(key -> testToString(key, encoder));
+        keymap.keySet().forEach(key -> testToString(key, encoder));
         System.out.println("New instance re-encode testToString:");
-        keymap.keySet().stream().forEach(key -> testToString(key,
-            PEMEncoder.of()));
+        keymap.keySet().forEach(key -> testToString(key, PEMEncoder.of()));
         System.out.println("Same instance Encoder testEncodedKeySpec:");
         testEncodedKeySpec(encoder);
         System.out.println("New instance Encoder testEncodedKeySpec:");
@@ -86,14 +89,14 @@ public class PEMEncoderTest {
         testEmptyAndNullKey(encoder);
         keymap = generateObjKeyMap(PEMData.encryptedList);
         System.out.println("Same instance Encoder match test:");
-        keymap.keySet().stream().forEach(key -> testEncryptedMatch(key, encoder));
+        keymap.keySet().forEach(key -> testEncryptedMatch(key, encoder));
         System.out.println("Same instance Encoder new withEnc test:");
-        keymap.keySet().stream().forEach(key -> testEncrypted(key, encoder));
+        keymap.keySet().forEach(key -> testEncrypted(key, encoder));
         System.out.println("New instance Encoder and withEnc test:");
-        keymap.keySet().stream().forEach(key -> testEncrypted(key, PEMEncoder.of()));
+        keymap.keySet().forEach(key -> testEncrypted(key, PEMEncoder.of()));
         System.out.println("Same instance encrypted Encoder test:");
         PEMEncoder encEncoder = encoder.withEncryption("fish".toCharArray());
-        keymap.keySet().stream().forEach(key -> testSameEncryptor(key, encEncoder));
+        keymap.keySet().forEach(key -> testSameEncryptor(key, encEncoder));
         try {
             encoder.withEncryption(null);
         } catch (Exception e) {
@@ -102,17 +105,51 @@ public class PEMEncoderTest {
             }
         }
 
-        PEMDecoder d = PEMDecoder.of();
-        PEMRecord pemRecord =
-            d.decode(PEMData.ed25519ep8.pem(), PEMRecord.class);
-        PEMData.checkResults(PEMData.ed25519ep8, pemRecord.toString());
+        pem = decoder.decode(PEMData.ed25519ep8.pem(), PEM.class);
+        PEMData.checkResults(PEMData.ed25519ep8, pem.toString());
 
-        // test PemRecord is encapsulated with PEM header and footer on encoding
+        // test PEM is encapsulated with PEM header and footer on encoding
         String[] pemLines = PEMData.ed25519ep8.pem().split("\n");
         String[] pemNoHeaderFooter = Arrays.copyOfRange(pemLines, 1, pemLines.length - 1);
-        PEMRecord pemR = new PEMRecord("ENCRYPTED PRIVATE KEY", String.join("\n",
+        pem = new PEM("ENCRYPTED PRIVATE KEY", String.join("\n",
                 pemNoHeaderFooter));
-        PEMData.checkResults(PEMData.ed25519ep8.pem(), encoder.encodeToString(pemR));
+        PEMData.checkResults(PEMData.ed25519ep8.pem(), encoder.encodeToString(pem));
+
+        // Verify the same private key bytes are returned with an ECDSA private
+        // key PEM and an encrypted PEM.
+        kp = decoder.decode(PEMData.ecsecp256.pem(), KeyPair.class);
+        var origPriv = kp.getPrivate();
+        String s = encoder.withEncryption(PEMData.ecsecp256ekpi.password()).encodeToString(kp);
+        kp = decoder.withDecryption(PEMData.ecsecp256ekpi.password()).decode(s, KeyPair.class);
+        var newPriv = kp.getPrivate();
+        if (!Arrays.equals(origPriv.getEncoded(), newPriv.getEncoded())) {
+            throw new AssertionError("compare fails");
+        }
+
+        // Encoded non-encrypted Keypair
+        kp = KeyPairGenerator.getInstance("XDH").generateKeyPair();
+        s = encoder.encodeToString(kp);
+        decoder.decode(s, KeyPair.class);
+
+        // EmptyKey for the PrivateKey in a KeyPair.  Uses keypair from above.
+        try {
+            encoder.encode(new KeyPair(kp.getPublic(), new EmptyKey()));
+            throw new AssertionError("encoder accepted a empty private key encoding");
+        } catch (IllegalArgumentException _) {}
+
+        // NullKey for the PrivateKey in a KeyPair.  Uses keypair from above.
+        try {
+            encoder.encode(new KeyPair(kp.getPublic(), new NullKey()));
+            throw new AssertionError("encoder accepted a empty private key encoding");
+        } catch (IllegalArgumentException _) {}
+
+        ekpi = decoder.decode(PEMData.ecsecp256ekpi.pem(),
+            EncryptedPrivateKeyInfo.class);
+        try {
+            encoder.withEncryption("blah".toCharArray()).encode(ekpi);
+            throw new AssertionError("encoder tried to encrypt " +
+                "an EncryptedPrivateKeyInfo.");
+        } catch (IllegalArgumentException _) {}
     }
 
     static Map generateObjKeyMap(List<PEMData.Entry> list) {
@@ -215,7 +252,7 @@ public class PEMEncoderTest {
             EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(entry.pem(),
                 EncryptedPrivateKeyInfo.class);
             if (entry.password() != null) {
-                EncryptedPrivateKeyInfo.encryptKey(pkey, entry.password(),
+                EncryptedPrivateKeyInfo.encrypt(pkey, entry.password(),
                     Pem.DEFAULT_ALGO, ekpi.getAlgParameters().
                         getParameterSpec(PBEParameterSpec.class),
                     null);
@@ -267,4 +304,16 @@ public class PEMEncoderTest {
         @Override
         public byte[] getEncoded() { return new byte[0]; }
     }
+
+    private static class NullKey implements PrivateKey {
+        @Override
+        public String getAlgorithm() { return "Test"; }
+
+        @Override
+        public String getFormat() { return "Test"; }
+
+        @Override
+        public byte[] getEncoded() { return null; }
+    }
+
 }
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/Encrypt.java
similarity index 76%
rename from test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
rename to test/jdk/javax/crypto/EncryptedPrivateKeyInfo/Encrypt.java
index 3fe8cfcfbfa..abeed7c3395 100644
--- a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/Encrypt.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 
 import static jdk.test.lib.Asserts.assertEquals;
 
-public class EncryptKey {
+public class Encrypt {
 
     private static final String encEdECKey =
         """
@@ -74,7 +74,7 @@ public class EncryptKey {
         AlgorithmParameters ap = ekpi.getAlgParameters();
 
         // Test encryptKey(PrivateKey, char[], String, ... )
-        var e = EncryptedPrivateKeyInfo.encryptKey(priKey, password,
+        var e = EncryptedPrivateKeyInfo.encrypt(priKey, password,
             ekpi.getAlgName(), ap.getParameterSpec(PBEParameterSpec.class),
             null);
         if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
@@ -83,45 +83,53 @@ public class EncryptKey {
         }
 
         // Test encryptKey(PrivateKey, char[], String, ...) with provider
-        e = EncryptedPrivateKeyInfo.encryptKey(priKey, password, ekpi.getAlgName(),
-                ap.getParameterSpec(PBEParameterSpec.class), p);
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, password, ekpi.getAlgName(),
+            ap.getParameterSpec(PBEParameterSpec.class), p);
         if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
             throw new AssertionError("encryptKey() didn't match" +
-                    " with expected.");
+                " with expected.");
         }
 
         // Test encryptKey(PrivateKey, char[], String, ...) with provider and null algorithm
-        e = EncryptedPrivateKeyInfo.encryptKey(priKey, password, null, null,
-                p);
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, password, Pem.DEFAULT_ALGO, null, p);
         assertEquals(e.getAlgName(), Pem.DEFAULT_ALGO);
 
         // Test encryptKey(PrivateKey, Key, String, ...)
-        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
-            ap.getParameterSpec(PBEParameterSpec.class),null, null);
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, key, ekpi.getAlgName(),
+            ap.getParameterSpec(PBEParameterSpec.class), null, null);
         if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
             throw new AssertionError("encryptKey() didn't match" +
                 " with expected.");
         }
 
         // Test encryptKey(PrivateKey, Key, String, ...) with provider and null random
-        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
-                ap.getParameterSpec(PBEParameterSpec.class), p, null);
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, key, ekpi.getAlgName(),
+            ap.getParameterSpec(PBEParameterSpec.class), p, null);
         if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
             throw new AssertionError("encryptKey() didn't match" +
-                    " with expected.");
+                " with expected.");
         }
 
         // Test encryptKey(PrivateKey, Key, String, ...) with provider and SecureRandom
-        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
-                ap.getParameterSpec(PBEParameterSpec.class), p, new SecureRandom());
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, key, ekpi.getAlgName(),
+            ap.getParameterSpec(PBEParameterSpec.class), p, new SecureRandom());
         if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
             throw new AssertionError("encryptKey() didn't match" +
-                    " with expected.");
+                " with expected.");
         }
 
         // Test encryptKey(PrivateKey, Key, String, ...) with provider and null algorithm
-        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, null, null,
-                p, new SecureRandom());
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, key, Pem.DEFAULT_ALGO, null,
+            p, new SecureRandom());
         assertEquals(e.getAlgName(), Pem.DEFAULT_ALGO);
+
+
+        SecretKey key2 = new SecretKeySpec("1234567890123456".getBytes(), "AES");
+
+        // Test encryptKey(PrivateKey, Key, String, ...) with provider and SecureRandom
+        e = EncryptedPrivateKeyInfo.encrypt(priKey, key2, "AES_128/GCM/NoPadding",
+            null, p, new SecureRandom());
+        PrivateKey key3 = e.getKey(key2, null);
+        assertEquals(key3, priKey, "AES encryption failed");
     }
 }
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
index b1917ffa84d..36e6b02faba 100644
--- a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
@@ -71,7 +71,8 @@ public class GetKey {
         passwdText.getBytes(), "PBE");
 
     public static void main(String[] args) throws Exception {
-        Provider p = Security.getProvider(System.getProperty("test.provider.name", "SunJCE"));
+        Provider p = Security.getProvider(
+            System.getProperty("test.provider.name", "SunJCE"));
 
         EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(encEdECKey,
             EncryptedPrivateKeyInfo.class);
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeyPair.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeyPair.java
new file mode 100644
index 00000000000..d35197e1971
--- /dev/null
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeyPair.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8360563
+ * @library /test/lib
+ * @summary Testing getKeyPair using ML-KEM
+ * @enablePreview
+ * @modules java.base/sun.security.util
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.util.DerValue;
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.*;
+
+/*
+ * This generates an ML-KEM key pair and makes it into PEM data.  By using
+ * PEM, it constructs a OneAsymmetricKey structure that combines
+ * the public key into the private key encoding.  Decode the PEM data into
+ * a KeyPair and an EKPI for verification.
+ *
+ * The original private key does not have the public key encapsulated, so it
+ * cannot be used for verification.
+ *
+ * Verify the decoded PEM KeyPair and EKPI.getKeyPair() return matching public
+ * and private keys encodings; as well as, verify the original public key
+ * matches.
+ */
+
+public class GetKeyPair {
+    private static final String passwdText = "fish";
+    private static final char[] password = passwdText.toCharArray();
+    private static final SecretKey key = new SecretKeySpec(
+        passwdText.getBytes(), "PBE");
+    static byte[] keyOrigPub, keyOrigPriv;
+
+    public static void main(String[] args) throws Exception {
+        Provider p = Security.getProvider(
+            System.getProperty("test.provider.name", "SunJCE"));
+
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("ML-KEM");
+        KeyPair kpOrig = kpg.generateKeyPair();
+        keyOrigPub = kpOrig.getPublic().getEncoded();
+        keyOrigPriv = getPrivateKey(kpOrig.getPrivate());
+
+        // Encode the KeyPair into PEM, constructing an OneAsymmetricKey encoding
+        String pem = PEMEncoder.of().withEncryption(password).
+            encodeToString(kpOrig);
+        // Decode to a KeyPair from the generated PEM for verification.
+        KeyPair mlkemKP = PEMDecoder.of().withDecryption(password).
+            decode(pem, KeyPair.class);
+
+        // Check decoded public key pair with original.
+        Asserts.assertEqualsByteArray(mlkemKP.getPublic().getEncoded(),
+            keyOrigPub, "Initial PublicKey compare didn't match.");
+        byte[] priv = getPrivateKey(mlkemKP.getPrivate());
+        Asserts.assertEqualsByteArray(priv, keyOrigPriv,
+            "Initial PrivateKey compare didn't match");
+
+        // Decode to a EncryptedPrivateKeyInfo.
+        EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(pem,
+            EncryptedPrivateKeyInfo.class);
+
+        // Test getKeyPair(password)
+        System.out.print("Testing getKeyPair(char[]): ");
+        arrayCheck(ekpi.getKeyPair(password));
+
+        // Test getKeyPair(key, provider) provider null
+        System.out.print("Testing getKeyPair(key, null): ");
+        arrayCheck(ekpi.getKeyPair(key, null));
+
+        // Test getKeyPair(key, provider) provider SunJCE
+        System.out.print("Testing getKeyPair(key, SunJCE): ");
+        arrayCheck(ekpi.getKeyPair(key, p));
+    }
+
+    static void arrayCheck(KeyPair kp) throws Exception {
+        Asserts.assertEqualsByteArray(getPrivateKey(kp.getPrivate()), keyOrigPriv,
+            "PrivateKey didn't match with expected.");
+        Asserts.assertEqualsByteArray(kp.getPublic().getEncoded(), keyOrigPub,
+            "PublicKey didn't match with expected.");
+        System.out.println("PASS");
+    }
+
+    static byte[] getPrivateKey(PrivateKey p) throws Exception{
+        var val = new DerValue(p.getEncoded());
+        // Get version
+        val.data.getInteger();
+        // Get AlgorithmID
+        val.data.getDerValue();
+        // Return PrivateKey
+        return val.data.getOctetString();
+    }
+}
diff --git a/test/jdk/javax/net/ssl/interop/ClientHelloInterOp.java b/test/jdk/javax/net/ssl/interop/ClientHelloInterOp.java
index 808d137223e..80e50d01160 100644
--- a/test/jdk/javax/net/ssl/interop/ClientHelloInterOp.java
+++ b/test/jdk/javax/net/ssl/interop/ClientHelloInterOp.java
@@ -31,7 +31,6 @@ import javax.net.ssl.TrustManagerFactory;
 import java.nio.ByteBuffer;
 import java.security.KeyStore;
 import java.security.PEMDecoder;
-import java.security.PEMRecord;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;

From 7aff8e15ba59b1e23d2e62c200d52a26da1a2030 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 14 Nov 2025 22:55:28 +0000
Subject: [PATCH 184/512] 8371319: java.lang.reflect.Method#equals doesn't
 short-circuit with same instances

Reviewed-by: jvernee
---
 .../classes/java/lang/reflect/Executable.java |  4 +
 .../reflect/ExecutableCompareBenchmark.java   | 84 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/reflect/ExecutableCompareBenchmark.java

diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index 2f6f6cca89f..a22d0fa8076 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -70,6 +70,10 @@ public abstract sealed class Executable extends AccessibleObject
     abstract ConstructorRepository getGenericInfo();
 
     boolean equalParamTypes(Class<?>[] params1, Class<?>[] params2) {
+        // The parameter arrays are trusted and the same for a root and all leaf
+        // copies. Thus, == on arrays is more useful than == on Executable.
+        if (params1 == params2)
+            return true;
         /* Avoid unnecessary cloning */
         if (params1.length == params2.length) {
             for (int i = 0; i < params1.length; i++) {
diff --git a/test/micro/org/openjdk/bench/java/lang/reflect/ExecutableCompareBenchmark.java b/test/micro/org/openjdk/bench/java/lang/reflect/ExecutableCompareBenchmark.java
new file mode 100644
index 00000000000..1413938dbd5
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/reflect/ExecutableCompareBenchmark.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.reflect;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+/**
+ * Benchmark measuring the speed of Method and Constructor comparison.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@State(Scope.Benchmark)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(1)
+@Warmup(iterations = 3, time = 2, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+public class ExecutableCompareBenchmark {
+    Method appendRange;
+    Method appendRangeDup;
+    Method appendFull;
+
+    public ExecutableCompareBenchmark() {
+        try {
+            appendRange = Appendable.class.getMethod("append", CharSequence.class, int.class, int.class);
+            appendRangeDup = Appendable.class.getMethod("append", CharSequence.class, int.class, int.class);
+            if (appendRange == appendRangeDup || !appendRange.equals(appendRangeDup)) {
+                throw new IllegalStateException();
+            }
+            appendFull = Appendable.class.getMethod("append", CharSequence.class);
+        } catch (ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    // Comparing identical Method objects.
+    @Benchmark
+    public boolean sameMethodObject() {
+        return appendRange.equals(appendRange);
+    }
+
+    // Comparing equal Method objects with potentially different access
+    // suppression status.
+    @Benchmark
+    public boolean equalMethods() {
+        return appendRange.equals(appendRangeDup);
+    }
+
+    // Comparing Method objects with only different parameter types;
+    // The declaring class, name, and the return type are the same.
+    @Benchmark
+    public boolean distinctParams() {
+        return appendRange.equals(appendFull);
+    }
+}
\ No newline at end of file

From bc928c814b5ea70505e362a643e18664e119bce3 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Fri, 14 Nov 2025 23:53:31 +0000
Subject: [PATCH 185/512] 5038439: Warning message for literal shift amounts
 outside the canonical domain

Reviewed-by: darcy, jlahoda
---
 .../propertiesparser/parser/MessageType.java  |  1 +
 .../com/sun/tools/javac/comp/Attr.java        |  2 +
 .../com/sun/tools/javac/comp/Check.java       | 31 +++++++
 .../tools/javac/resources/compiler.properties |  5 ++
 .../tools/javac/resources/javac.properties    |  2 +-
 .../share/classes/module-info.java            |  5 +-
 src/jdk.compiler/share/man/javac.md           |  2 +-
 .../diags/examples/BitShiftOutOfRange.java    | 31 +++++++
 .../tools/javac/lint/ShiftOutOfRange.java     | 83 +++++++++++++++++++
 .../tools/javac/lint/ShiftOutOfRange.out      | 29 +++++++
 10 files changed, 187 insertions(+), 4 deletions(-)
 create mode 100644 test/langtools/tools/javac/diags/examples/BitShiftOutOfRange.java
 create mode 100644 test/langtools/tools/javac/lint/ShiftOutOfRange.java
 create mode 100644 test/langtools/tools/javac/lint/ShiftOutOfRange.out

diff --git a/make/langtools/tools/propertiesparser/parser/MessageType.java b/make/langtools/tools/propertiesparser/parser/MessageType.java
index a4ea0ddc3c0..4b7064e3872 100644
--- a/make/langtools/tools/propertiesparser/parser/MessageType.java
+++ b/make/langtools/tools/propertiesparser/parser/MessageType.java
@@ -84,6 +84,7 @@ public interface MessageType {
         FILE_OBJECT("file object", "JavaFileObject", "javax.tools"),
         PATH("path", "Path", "java.nio.file"),
         NAME("name", "Name", "com.sun.tools.javac.util"),
+        LONG("long", "long", null),
         NUMBER("number", "int", null),
         OPTION_NAME("option name", "Option", "com.sun.tools.javac.main"),
         PROFILE("profile", "Profile", "com.sun.tools.javac.jvm"),
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 4a8a8d4a324..a45f7466f9e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4001,6 +4001,7 @@ public class Attr extends JCTree.Visitor {
                               operator.type.getReturnType(),
                               owntype);
             chk.checkLossOfPrecision(tree.rhs.pos(), operand, owntype);
+            chk.checkOutOfRangeShift(tree.rhs.pos(), operator, operand);
         }
         result = check(tree, owntype, KindSelector.VAL, resultInfo);
     }
@@ -4091,6 +4092,7 @@ public class Attr extends JCTree.Visitor {
             }
 
             chk.checkDivZero(tree.rhs.pos(), operator, right);
+            chk.checkOutOfRangeShift(tree.rhs.pos(), operator, right);
         }
         result = check(tree, owntype, KindSelector.VAL, resultInfo);
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index da7db138604..9098568f42a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -4041,6 +4041,37 @@ public class Check {
         }
     }
 
+    /**
+     *  Check for bit shifts using an out-of-range bit count.
+     *  @param pos           Position for error reporting.
+     *  @param operator      The operator for the expression
+     *  @param operand       The right hand operand for the expression
+     */
+    void checkOutOfRangeShift(final DiagnosticPosition pos, Symbol operator, Type operand) {
+        if (operand.constValue() instanceof Number shiftAmount) {
+            Type targetType;
+            int maximumShift;
+            switch (((OperatorSymbol)operator).opcode) {
+            case ByteCodes.ishl, ByteCodes.ishr, ByteCodes.iushr, ByteCodes.ishll, ByteCodes.ishrl, ByteCodes.iushrl -> {
+                targetType = syms.intType;
+                maximumShift = 0x1f;
+            }
+            case ByteCodes.lshl, ByteCodes.lshr, ByteCodes.lushr, ByteCodes.lshll, ByteCodes.lshrl, ByteCodes.lushrl -> {
+                targetType = syms.longType;
+                maximumShift = 0x3f;
+            }
+            default -> {
+                return;
+            }
+            }
+            long specifiedShift = shiftAmount.longValue();
+            if (specifiedShift > maximumShift || specifiedShift < -maximumShift) {
+                int actualShift = (int)specifiedShift & (maximumShift - 1);
+                log.warning(pos, LintWarnings.BitShiftOutOfRange(targetType, specifiedShift, actualShift));
+            }
+        }
+    }
+
     /**
      *  Check for possible loss of precission
      *  @param pos           Position for error reporting.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 6318476fca4..95a7546e2b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2464,6 +2464,11 @@ compiler.err.no.zipfs.for.archive=\
 compiler.warn.div.zero=\
     division by zero
 
+# 0: type, 1: long, 2: number
+# lint: lossy-conversions
+compiler.warn.bit.shift.out.of.range=\
+    shifting {0} by {1} bits is equivalent to shifting by {2} bit(s)
+
 # lint: empty
 compiler.warn.empty.if=\
     empty statement after if
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 6d4276c794b..d5ee9469d22 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -228,7 +228,7 @@ javac.opt.Xlint.desc.incubating=\
     Warn about use of incubating modules.
 
 javac.opt.Xlint.desc.lossy-conversions=\
-    Warn about possible lossy conversions in compound assignment.
+    Warn about possible lossy conversions in compound assignment and bit shift operations.
 
 javac.opt.Xlint.desc.module=\
     Warn about module system related issues.
diff --git a/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java
index 46ada3a12e7..4aa60a3dffe 100644
--- a/src/jdk.compiler/share/classes/module-info.java
+++ b/src/jdk.compiler/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,8 @@ import javax.tools.StandardLocation;
  *                                                      the next
  * <tr><th scope="row">{@code finally}              <td>{@code finally} clauses that do not terminate normally
  * <tr><th scope="row">{@code identity}             <td>use of a value-based class where an identity class is expected
- * <tr><th scope="row">{@code lossy-conversions}    <td>possible lossy conversions in compound assignment
+ * <tr><th scope="row">{@code lossy-conversions}    <td>possible lossy conversions in compound assignments or bit shifts
+ *                                                      (more than \u00B131 bits for integers or \u00B163 bits for longs)
  * <tr><th scope="row">{@code missing-explicit-ctor} <td>missing explicit constructors in public and protected classes
  *                                                      in exported packages
  * <tr><th scope="row">{@code module}               <td>module system related issues
diff --git a/src/jdk.compiler/share/man/javac.md b/src/jdk.compiler/share/man/javac.md
index 1822931bf40..c749ca4da10 100644
--- a/src/jdk.compiler/share/man/javac.md
+++ b/src/jdk.compiler/share/man/javac.md
@@ -611,7 +611,7 @@ file system locations may be directories, JAR files or JMOD files.
     -   `incubating`: Warns about the use of incubating modules.
 
     -   `lossy-conversions`: Warns about possible lossy conversions
-        in compound assignment.
+        in compound assignment and bit shift operations.
 
     -   `missing-explicit-ctor`: Warns about missing explicit constructors in
          public and protected classes in exported packages.
diff --git a/test/langtools/tools/javac/diags/examples/BitShiftOutOfRange.java b/test/langtools/tools/javac/diags/examples/BitShiftOutOfRange.java
new file mode 100644
index 00000000000..2855c6f3023
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/BitShiftOutOfRange.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.warn.bit.shift.out.of.range
+// options: -Xlint:lossy-conversions
+
+class BitShiftOutOfRange {
+    int m(int a) {
+        return a << 32;
+    }
+}
diff --git a/test/langtools/tools/javac/lint/ShiftOutOfRange.java b/test/langtools/tools/javac/lint/ShiftOutOfRange.java
new file mode 100644
index 00000000000..e066c4469b9
--- /dev/null
+++ b/test/langtools/tools/javac/lint/ShiftOutOfRange.java
@@ -0,0 +1,83 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 5038439
+ * @summary Verify warnings about bit shifts using out-of-range shift amounts
+ * @compile/ref=ShiftOutOfRange.out -XDrawDiagnostics -Xlint:lossy-conversions ShiftOutOfRange.java
+ */
+
+public class ShiftOutOfRange {
+
+    public void shiftInt() {
+        int a = 123;
+
+        // These should generate warnings
+        a = a << (byte)-32;
+        a = a >> (short)-32;
+        a = a >>> -32;
+        a <<= -32L;
+        a >>= (byte)-32;
+        a >>>= (short)-32;
+
+        // These should not generate warnings
+        a = a << (byte)-31;
+        a = a >> (short)-23;
+        a = a >>> -17;
+        a <<= -13L;
+        a >>= (byte)-1;
+        a >>>= (short)0;
+        a = a << (byte)0;
+        a = a >> (char)7;
+        a = a >>> (short)13;
+        a <<= 17;
+        a >>= (long)23;
+        a >>>= (byte)31;
+        a <<= hashCode();
+        a >>= hashCode();
+        a >>>= hashCode();
+
+        // These should generate warnings
+        a = a << (byte)32;
+        a = a >> (char)32;
+        a = a >>> (short)32;
+        a <<= 32;
+        a >>= (long)32;
+        a >>>= (byte)32;
+    }
+
+    public void shiftLong() {
+        long a = 123;
+
+        // These should generate warnings
+        a = a << (byte)-64;
+        a = a >> (short)-64;
+        a = a >>> -64;
+        a <<= -64L;
+        a >>= (byte)-64L;
+        a >>>= (short)-64;
+
+        // These should not generate warnings
+        a = a << (byte)-63;
+        a = a >> (short)-47;
+        a = a >>> -34;
+        a <<= -25L;
+        a >>= (byte)-15;
+        a >>>= (short)0;
+        a = a << (byte)0;
+        a = a >> (char)15;
+        a = a >>> (short)25;
+        a <<= 34;
+        a >>= (long)47;
+        a >>>= (byte)63;
+        a <<= hashCode();
+        a >>= hashCode();
+        a >>>= hashCode();
+
+        // These should generate warnings
+        a = a << (byte)64;
+        a = a >> (char)64;
+        a = a >>> (short)64;
+        a <<= 64;
+        a >>= (long)64;
+        a >>>= (byte)64;
+    }
+}
diff --git a/test/langtools/tools/javac/lint/ShiftOutOfRange.out b/test/langtools/tools/javac/lint/ShiftOutOfRange.out
new file mode 100644
index 00000000000..7aee0b014af
--- /dev/null
+++ b/test/langtools/tools/javac/lint/ShiftOutOfRange.out
@@ -0,0 +1,29 @@
+ShiftOutOfRange.java:14:18: compiler.warn.bit.shift.out.of.range: int, -32, 0
+ShiftOutOfRange.java:15:18: compiler.warn.bit.shift.out.of.range: int, -32, 0
+ShiftOutOfRange.java:16:19: compiler.warn.bit.shift.out.of.range: int, -32, 0
+ShiftOutOfRange.java:17:15: compiler.warn.possible.loss.of.precision: long, int
+ShiftOutOfRange.java:17:15: compiler.warn.bit.shift.out.of.range: int, -32, 0
+ShiftOutOfRange.java:18:15: compiler.warn.bit.shift.out.of.range: int, -32, 0
+ShiftOutOfRange.java:19:16: compiler.warn.bit.shift.out.of.range: int, -32, 0
+ShiftOutOfRange.java:25:15: compiler.warn.possible.loss.of.precision: long, int
+ShiftOutOfRange.java:32:15: compiler.warn.possible.loss.of.precision: long, int
+ShiftOutOfRange.java:39:18: compiler.warn.bit.shift.out.of.range: int, 32, 0
+ShiftOutOfRange.java:40:18: compiler.warn.bit.shift.out.of.range: int, 32, 0
+ShiftOutOfRange.java:41:19: compiler.warn.bit.shift.out.of.range: int, 32, 0
+ShiftOutOfRange.java:42:15: compiler.warn.bit.shift.out.of.range: int, 32, 0
+ShiftOutOfRange.java:43:15: compiler.warn.possible.loss.of.precision: long, int
+ShiftOutOfRange.java:43:15: compiler.warn.bit.shift.out.of.range: int, 32, 0
+ShiftOutOfRange.java:44:16: compiler.warn.bit.shift.out.of.range: int, 32, 0
+ShiftOutOfRange.java:51:18: compiler.warn.bit.shift.out.of.range: long, -64, 0
+ShiftOutOfRange.java:52:18: compiler.warn.bit.shift.out.of.range: long, -64, 0
+ShiftOutOfRange.java:53:19: compiler.warn.bit.shift.out.of.range: long, -64, 0
+ShiftOutOfRange.java:54:15: compiler.warn.bit.shift.out.of.range: long, -64, 0
+ShiftOutOfRange.java:55:15: compiler.warn.bit.shift.out.of.range: long, -64, 0
+ShiftOutOfRange.java:56:16: compiler.warn.bit.shift.out.of.range: long, -64, 0
+ShiftOutOfRange.java:76:18: compiler.warn.bit.shift.out.of.range: long, 64, 0
+ShiftOutOfRange.java:77:18: compiler.warn.bit.shift.out.of.range: long, 64, 0
+ShiftOutOfRange.java:78:19: compiler.warn.bit.shift.out.of.range: long, 64, 0
+ShiftOutOfRange.java:79:15: compiler.warn.bit.shift.out.of.range: long, 64, 0
+ShiftOutOfRange.java:80:15: compiler.warn.bit.shift.out.of.range: long, 64, 0
+ShiftOutOfRange.java:81:16: compiler.warn.bit.shift.out.of.range: long, 64, 0
+28 warnings

From 7c169c9814a694126f524e8941b1035e6695900c Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 14 Nov 2025 23:53:44 +0000
Subject: [PATCH 186/512] 8365426: [macos26] Graphics2D tests fail on new macOS
 26

Reviewed-by: kizune, dnguyen
---
 test/jdk/java/awt/Graphics2D/CopyAreaOOB.java | 67 ++++++++++++-------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java b/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
index 27a1a3a868a..9ee44037f14 100644
--- a/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
+++ b/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
@@ -27,6 +27,8 @@
  * @bug 6430601 8198613
  * @summary Verifies that copyArea() works properly when the
  *          destination parameters are outside the destination bounds.
+ * @library /test/lib
+ * @build jdk.test.lib.Platform
  * @run main/othervm CopyAreaOOB
  */
 
@@ -49,23 +51,29 @@ import java.awt.image.RenderedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-
 import javax.imageio.ImageIO;
+import jdk.test.lib.Platform;
 
 public class CopyAreaOOB extends Canvas {
+    private static final int PRIMARY_TOLERANCE = 2;
+    private static int TOLERANCE = 30;
+    private static final boolean DEBUG = false;
     private static Frame frame;
     private static Robot robot;
     private static BufferedImage captureImg;
 
-    private static StringBuffer errorLog = new StringBuffer();
+    private static final StringBuffer errorLog = new StringBuffer();
 
     private static final Point OFF_FRAME_LOC = new Point(50, 50);
     private static final int SIZE = 400;
 
     public static void main(String[] args) throws Exception {
         try {
-            robot = new Robot();
+            if (!Platform.isOSX()) {
+                TOLERANCE = PRIMARY_TOLERANCE;
+            }
 
+            robot = new Robot();
             // added to move mouse pointer away from test UI
             // so that it is not captured in the screenshot
             robot.mouseMove(OFF_FRAME_LOC.x, OFF_FRAME_LOC.y);
@@ -77,7 +85,7 @@ public class CopyAreaOOB extends Canvas {
 
             if (!errorLog.isEmpty()) {
                 saveImages();
-                throw new RuntimeException("Test failed: \n" + errorLog.toString());
+                throw new RuntimeException("Test failed for the following region(s)" + errorLog);
             }
         } finally {
             if (frame != null) {
@@ -101,13 +109,13 @@ public class CopyAreaOOB extends Canvas {
         int h = getHeight();
 
         Graphics2D g2d = (Graphics2D)g;
-        g2d.setColor(Color.black);
+        g2d.setColor(Color.BLUE);
         g2d.fillRect(0, 0, w, h);
 
-        g2d.setColor(Color.green);
+        g2d.setColor(Color.GREEN);
         g2d.fillRect(0, 0, w, 10);
 
-        g2d.setColor(Color.red);
+        g2d.setColor(Color.RED);
         g2d.fillRect(0, 10, 50, h - 10);
 
         // copy the region such that part of it goes below the bottom of the
@@ -123,12 +131,12 @@ public class CopyAreaOOB extends Canvas {
         captureImg = robot.createScreenCapture(rect);
 
         // Test pixels
-        testRegion("green", 0, 0, 400, 10, 0xff00ff00);
-        testRegion("original-red", 0, 10, 50, 400, 0xffff0000);
-        testRegion("background", 50, 10, 60, 400, 0xff000000);
-        testRegion("in-between", 60, 10, 110, 20, 0xff000000);
-        testRegion("copied-red", 60, 20, 110, 400, 0xffff0000);
-        testRegion("background", 110, 10, 400, 400, 0xff000000);
+        testRegion("green", 0, 0, 400, 10, Color.GREEN);
+        testRegion("original-red", 0, 10, 50, 400, Color.RED);
+        testRegion("background", 50, 10, 60, 400, Color.BLUE);
+        testRegion("in-between", 60, 10, 110, 20, Color.BLUE);
+        testRegion("copied-red", 60, 20, 110, 400, Color.RED);
+        testRegion("background", 110, 10, 400, 400, Color.BLUE);
     }
 
     public Dimension getPreferredSize() {
@@ -137,24 +145,23 @@ public class CopyAreaOOB extends Canvas {
 
     private static void testRegion(String region,
                                    int x1, int y1, int x2, int y2,
-                                   int expected) {
-        System.out.print("Test region: " + region);
+                                   Color expected) {
         for (int y = y1; y < y2; y++) {
             for (int x = x1; x < x2; x++) {
-                int actual = captureImg.getRGB(x, y);
-                if (actual != expected) {
-                    System.out.print(" Status: FAILED\n");
-                    errorLog.append("Test failed for " + region
-                                                + " region at x: " + x + " y: " + y
-                                                + " (expected: "
-                                                + Integer.toHexString(expected)
-                                                + " actual: "
-                                                + Integer.toHexString(actual) + ")\n");
+                Color actual = new Color(captureImg.getRGB(x, y));
+                if (DEBUG) {
+                    System.out.println("Actual color: " + actual);
+                }
+                if (!compareColor(expected, actual)) {
+                    errorLog.append("\nTest region: " + region + " Status: FAILED!!!\n");
+                    errorLog.append("Test failed at x : " + x + " y : " + y + "\n"
+                                    + "Expected Color: " + expected + "\n"
+                                    + "Actual Color: " + actual + "\n");
                     return;
                 }
             }
         }
-        System.out.print(" Status: PASSED\n");
+        System.out.println("Test region: " + region + " Status: PASSED");
     }
 
     private static void saveImages() {
@@ -173,4 +180,14 @@ public class CopyAreaOOB extends Canvas {
             System.err.println("Can't write image " + e);
         }
     }
+
+    private static boolean compareColor(Color expected, Color actual) {
+            return Math.abs(expected.getRed() - actual.getRed())
+                   < (expected.equals(Color.RED) ? PRIMARY_TOLERANCE : TOLERANCE)
+                   && Math.abs(expected.getGreen() - actual.getGreen())
+                      < (expected.equals(Color.GREEN) ? PRIMARY_TOLERANCE : TOLERANCE)
+                   && Math.abs(expected.getBlue() - actual.getBlue())
+                      < (expected.equals(Color.BLUE) ? PRIMARY_TOLERANCE : TOLERANCE);
+    }
 }
+

From f971ee5ea07e3e1c0efe447a416e7242f5e46a16 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Sat, 15 Nov 2025 01:50:47 +0000
Subject: [PATCH 187/512] 8349192: jvmti/scenarios/contention/TC05/tc05t001
 fails: ERROR: tc05t001.cpp, 281: (waitedThreadCpuTime - waitThreadCpuTime) <
 (EXPECTED_ACCURACY * 1000000)

Reviewed-by: cjplummer, lmesnik
---
 .../nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
index 9680d01847a..df67828d28b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
@@ -42,7 +42,7 @@ static const jlong EXPECTED_TIMEOUT_ACCURACY_NS = 300000;
 #if (defined(WIN32) || defined(_WIN32))
 static const jlong EXPECTED_ACCURACY = 16; // 16ms is longest clock update interval
 #else
-static const jlong EXPECTED_ACCURACY = 10; // high frequency clock updates expected
+static const jlong EXPECTED_ACCURACY = 32; // high frequency clock updates expected
 #endif
 
 /* scaffold objects */

From 6042c9a6f0c25c141a74d72ad462189da7f9e625 Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Sat, 15 Nov 2025 02:46:30 +0000
Subject: [PATCH 188/512] 8371934: EncryptedPrivateKeyInfo methods need @since
 updates

Reviewed-by: jnimeh
---
 .../share/classes/javax/crypto/EncryptedPrivateKeyInfo.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
index 15933183e5f..dc3c4c14b27 100644
--- a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
@@ -365,7 +365,7 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
      *         not supported by any provider, or if an error occurs during
      *         encryption.
      *
-     * @since 25
+     * @since 26
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
     public static EncryptedPrivateKeyInfo encrypt(DEREncodable de,
@@ -404,7 +404,7 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
      * defines the default encryption algorithm. The {@code AlgorithmParameterSpec}
      * defaults are determined by the provider.
      *
-     * @since 25
+     * @since 26
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
     public static EncryptedPrivateKeyInfo encrypt(DEREncodable de,
@@ -442,7 +442,7 @@ public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
      *         {@code algorithm} or {@code params} are not supported by any
      *         provider, or if an error occurs during encryption
      *
-     * @since 25
+     * @since 26
      */
     @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
     public static EncryptedPrivateKeyInfo encrypt(DEREncodable de,

From f6c90fe8f9986b02797ba1f967c71a592a892266 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Sat, 15 Nov 2025 08:15:50 +0000
Subject: [PATCH 189/512] 8371226: Thread class description needs section on
 Thread Interruption

Reviewed-by: prappo, vklang, liach, rriggs
---
 .../java/lang/InterruptedException.java       | 29 +++----
 .../share/classes/java/lang/Thread.java       | 77 ++++++++++++++++---
 2 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/InterruptedException.java b/src/java.base/share/classes/java/lang/InterruptedException.java
index ef13e5f94e3..e8cf3d28bc5 100644
--- a/src/java.base/share/classes/java/lang/InterruptedException.java
+++ b/src/java.base/share/classes/java/lang/InterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,19 @@
 package java.lang;
 
 /**
- * Thrown when a thread is waiting, sleeping, or otherwise occupied,
- * and the thread is interrupted, either before or during the activity.
- * Occasionally a method may wish to test whether the current
- * thread has been interrupted, and if so, to immediately throw
- * this exception.  The following code can be used to achieve
- * this effect:
- * {@snippet lang=java :
- * if (Thread.interrupted())  // Clears interrupted status!
- *     throw new InterruptedException();
- * }
+ * Thrown when a thread executing a blocking method is {@linkplain Thread#interrupt()
+ * interrupted}. {@link Thread#sleep(long) Thread.sleep}, {@link Object#wait()
+ * Object.wait} and many other blocking methods throw this exception if interrupted.
+ *
+ * <p> Blocking methods that throw {@code InterruptedException} clear the thread's
+ * interrupted status before throwing the exception. Code that catches {@code
+ * InterruptedException} should rethrow the exception, or restore the current thread's
+ * interrupted status, with {@link Thread#currentThread()
+ * Thread.currentThread()}.{@link Thread#interrupt() interrupt()}, before continuing
+ * normally or handling it by throwing another type of exception.
  *
  * @author  Frank Yellin
- * @see     java.lang.Object#wait()
- * @see     java.lang.Object#wait(long)
- * @see     java.lang.Object#wait(long, int)
- * @see     java.lang.Thread#sleep(long)
- * @see     java.lang.Thread#interrupt()
- * @see     java.lang.Thread#interrupted()
+ * @see     Thread##thread-interruption Thread Interruption
  * @since   1.0
  */
 public class InterruptedException extends Exception {
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index ace29f30a56..798ded2b941 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -63,8 +63,9 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * <p> A thread <i>terminates</i> if either its {@code run} method completes normally,
  * or if its {@code run} method completes abruptly and the appropriate {@linkplain
  * Thread.UncaughtExceptionHandler uncaught exception handler} completes normally or
- * abruptly. With no code left to run, the thread has completed execution. The
- * {@link #join() join} method can be used to wait for a thread to terminate.
+ * abruptly. With no code left to run, the thread has completed execution. The {@link
+ * #isAlive isAlive} method can be used to test if a started thread has terminated.
+ * The {@link #join() join} method can be used to wait for a thread to terminate.
  *
  * <p> Threads have a unique {@linkplain #threadId() identifier} and a {@linkplain
  * #getName() name}. The identifier is generated when a {@code Thread} is created
@@ -79,7 +80,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * {@code Thread} supports a special inheritable thread local for the thread
  * {@linkplain #getContextClassLoader() context-class-loader}.
  *
- * <h2><a id="platform-threads">Platform threads</a></h2>
+ * <h2><a id="platform-threads">Platform Threads</a></h2>
  * <p> {@code Thread} supports the creation of <i>platform threads</i> that are
  * typically mapped 1:1 to kernel threads scheduled by the operating system.
  * Platform threads will usually have a large stack and other resources that are
@@ -99,7 +100,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * #getPriority() thread priority} and are members of a {@linkplain ThreadGroup
  * thread group}.
  *
- * <h2><a id="virtual-threads">Virtual threads</a></h2>
+ * <h2><a id="virtual-threads">Virtual Threads</a></h2>
  * <p> {@code Thread} also supports the creation of <i>virtual threads</i>.
  * Virtual threads are typically <i>user-mode threads</i> scheduled by the Java
  * runtime rather than the operating system. Virtual threads will typically require
@@ -124,7 +125,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * Virtual threads have a fixed {@linkplain #getPriority() thread priority}
  * that cannot be changed.
  *
- * <h2>Creating and starting threads</h2>
+ * <h2>Creating And Starting Threads</h2>
  *
  * <p> {@code Thread} defines public constructors for creating platform threads and
  * the {@link #start() start} method to schedule threads to execute. {@code Thread}
@@ -153,7 +154,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  *   ThreadFactory factory = Thread.ofVirtual().factory();
  * }
  *
- * <h2><a id="inheritance">Inheritance when creating threads</a></h2>
+ * <h2><a id="inheritance">Inheritance When Creating Threads</a></h2>
  * A {@code Thread} created with one of the public constructors inherits the daemon
  * status and thread priority from the parent thread at the time that the child {@code
  * Thread} is created. The {@linkplain ThreadGroup thread group} is also inherited when
@@ -171,7 +172,45 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  * {@link Builder#inheritInheritableThreadLocals(boolean) inheritInheritableThreadLocals}
  * method can be used to select if the initial values are inherited.
  *
- * <p> Unless otherwise specified, passing a {@code null} argument to a constructor
+ * <h2><a id="thread-interruption">Thread Interruption</a></h2>
+ * A {@code Thread} has an <em>interrupted status</em> which serves as a "request" for
+ * code executing in the thread to "stop or cancel its current activity". The interrupted
+ * status is set by invoking the target thread's {@link #interrupt()} method. Many methods
+ * that cause a thread to block or wait are <em>interruptible</em>, meaning they detect
+ * that the thread's interrupted status is set and cause execution to return early from
+ * the method, usually by throwing an exception.
+ *
+ * <p> If a thread executing {@link #sleep(long) Thread.sleep} or {@link Object#wait()
+ * Object.wait} is interrupted then it causes the method to throw {@link InterruptedException}.
+ * Methods that throw {@code InterruptedException} do so after first clearing the
+ * interrupted status. Code that catches {@code InterruptedException} should rethrow the
+ * exception, or restore the current thread's interrupted status, with
+ * {@link #currentThread() Thread.currentThread()}.{@link #interrupt()}, before
+ * continuing normally or handling it by throwing another type of exception. Code that
+ * throws another type of exception with the {@code InterruptedException} as {@linkplain
+ * Throwable#getCause() cause}, or the {@code InterruptedException} as a {@linkplain
+ * Throwable#addSuppressed(Throwable) suppressed exception}, should also restore the
+ * interrupted status before throwing the exception.
+ *
+ * <p> If a thread executing a blocking I/O operation on an {@link
+ * java.nio.channels.InterruptibleChannel} is interrupted then it causes the channel to be
+ * closed, and the blocking I/O operation to throw {@link java.nio.channels.ClosedByInterruptException}
+ * with the thread's interrupted status set. If a thread blocked in a {@linkplain
+ * java.nio.channels.Selector selection operation} is interrupted then it causes the
+ * selection operation to return early, with the thread's interrupted status set.
+ *
+ * <p> Code that doesn't invoke any interruptible methods can still respond to interrupt
+ * by polling the current thread's interrupted status with
+ * {@link Thread#currentThread() Thread.currentThread()}.{@link #isInterrupted()
+ * isInterrupted()}.
+ *
+ * <p> In addition to the {@link #interrupt()} and {@link #isInterrupted()} methods,
+ * {@code Thread} also defines the static {@link #interrupted() Thread.interrupted()}
+ * method to test the current thread's interrupted status and clear it. It should be rare
+ * to need to use this method.
+ *
+ * <h2>Null Handling</h2>
+ * Unless otherwise specified, passing a {@code null} argument to a constructor
  * or method in this class will cause a {@link NullPointerException} to be thrown.
  *
  * @implNote
@@ -190,8 +229,9 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  *     <th scope="row">
  *       {@systemProperty jdk.virtualThreadScheduler.parallelism}
  *     </th>
- *     <td> The number of platform threads available for scheduling virtual
- *       threads. It defaults to the number of available processors. </td>
+ *     <td> The scheduler's target parallelism. This is the number of platform threads
+ *       available for scheduling virtual threads. It defaults to the number of available
+ *       processors. </td>
  *   </tr>
  *   <tr>
  *     <th scope="row">
@@ -202,6 +242,8 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  *   </tr>
  *   </tbody>
  * </table>
+ * <p> The virtual thread scheduler can be monitored and managed with the
+ * {@code jdk.management.VirtualThreadSchedulerMXBean} management interface.
  *
  * @since   1.0
  */
@@ -1558,6 +1600,9 @@ public class Thread implements Runnable {
      * @implNote In the JDK Reference Implementation, interruption of a thread
      * that is not alive still records that the interrupt request was made and
      * will report it via {@link #interrupted()} and {@link #isInterrupted()}.
+     *
+     * @see ##thread-interruption Thread Interruption
+     * @see #isInterrupted()
      */
     public void interrupt() {
         // Setting the interrupted status must be done before reading nioBlocker.
@@ -1587,8 +1632,19 @@ public class Thread implements Runnable {
      * interrupted again, after the first call had cleared its interrupted
      * status and before the second call had examined it).
      *
+     * @apiNote It should be rare to use this method directly. It is intended
+     * for cases that detect {@linkplain ##thread-interruption thread interruption}
+     * and clear the interrupted status before throwing {@link InterruptedException}.
+     * It may also be useful for cases that implement an <em>uninterruptible</em>
+     * method that makes use of an <em>interruptible</em> method such as
+     * {@link LockSupport#park()}. The {@code interrupted()} method can be used
+     * to test if interrupted and clear the interrupted status to allow the code
+     * retry the <em>interruptible</em> method. The <em>uninterruptible</em> method
+     * should restore the interrupted status before it completes.
+     *
      * @return  {@code true} if the current thread has been interrupted;
      *          {@code false} otherwise.
+     * @see ##thread-interruption Thread Interruption
      * @see #isInterrupted()
      */
     public static boolean interrupted() {
@@ -1601,7 +1657,8 @@ public class Thread implements Runnable {
      *
      * @return  {@code true} if this thread has been interrupted;
      *          {@code false} otherwise.
-     * @see     #interrupted()
+     * @see ##thread-interruption Thread Interruption
+     * @see #interrupt()
      */
     public boolean isInterrupted() {
         return interrupted;

From f510b4a3bafa3f0d2c9ebf0b33d48f57f3bdef95 Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <qamai@openjdk.org>
Date: Sat, 15 Nov 2025 12:59:04 +0000
Subject: [PATCH 190/512] 8355574: Fatal error in abort_verify_int_in_range due
 to Invalid CastII

Reviewed-by: vlivanov, roland
---
 src/hotspot/share/opto/arraycopynode.cpp      | 24 ++++-----
 src/hotspot/share/opto/arraycopynode.hpp      |  2 +-
 src/hotspot/share/opto/macroArrayCopy.cpp     | 49 ++++++++-----------
 test/hotspot/jtreg/ProblemList.txt            |  2 -
 .../arraycopy/TestArrayCopyConjoint.java      |  7 ++-
 5 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/src/hotspot/share/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp
index c02aefc7943..4ee6107fe54 100644
--- a/src/hotspot/share/opto/arraycopynode.cpp
+++ b/src/hotspot/share/opto/arraycopynode.cpp
@@ -28,8 +28,6 @@
 #include "gc/shared/gc_globals.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/graphKit.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "utilities/macros.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 const TypeFunc* ArrayCopyNode::_arraycopy_type_Type = nullptr;
@@ -779,15 +777,17 @@ bool ArrayCopyNode::modifies(intptr_t offset_lo, intptr_t offset_hi, PhaseValues
   return false;
 }
 
-// As an optimization, choose optimum vector size for copy length known at compile time.
-int ArrayCopyNode::get_partial_inline_vector_lane_count(BasicType type, int const_len) {
-  int lane_count = ArrayOperationPartialInlineSize/type2aelembytes(type);
-  if (const_len > 0) {
-    int size_in_bytes = const_len * type2aelembytes(type);
-    if (size_in_bytes <= 16)
-      lane_count = 16/type2aelembytes(type);
-    else if (size_in_bytes > 16 && size_in_bytes <= 32)
-      lane_count = 32/type2aelembytes(type);
+// As an optimization, choose the optimal vector size for bounded copy length
+int ArrayCopyNode::get_partial_inline_vector_lane_count(BasicType type, jlong max_len) {
+  assert(max_len > 0, JLONG_FORMAT, max_len);
+  // We only care whether max_size_in_bytes is not larger than 32, we also want to avoid
+  // multiplication overflow, so clamp max_len to [0, 64]
+  int max_size_in_bytes = MIN2<jlong>(max_len, 64) * type2aelembytes(type);
+  if (ArrayOperationPartialInlineSize > 16 && max_size_in_bytes <= 16) {
+    return 16 / type2aelembytes(type);
+  } else if (ArrayOperationPartialInlineSize > 32 && max_size_in_bytes <= 32) {
+    return 32 / type2aelembytes(type);
+  } else {
+    return ArrayOperationPartialInlineSize / type2aelembytes(type);
   }
-  return lane_count;
 }
diff --git a/src/hotspot/share/opto/arraycopynode.hpp b/src/hotspot/share/opto/arraycopynode.hpp
index 13e739fc2c7..83c085fd5db 100644
--- a/src/hotspot/share/opto/arraycopynode.hpp
+++ b/src/hotspot/share/opto/arraycopynode.hpp
@@ -191,7 +191,7 @@ public:
 
   static bool may_modify(const TypeOopPtr* t_oop, MemBarNode* mb, PhaseValues* phase, ArrayCopyNode*& ac);
 
-  static int get_partial_inline_vector_lane_count(BasicType type, int const_len);
+  static int get_partial_inline_vector_lane_count(BasicType type, jlong max_len);
 
   bool modifies(intptr_t offset_lo, intptr_t offset_hi, PhaseValues* phase, bool must_modify) const;
 
diff --git a/src/hotspot/share/opto/macroArrayCopy.cpp b/src/hotspot/share/opto/macroArrayCopy.cpp
index 10de940c0c2..0ba8ed40c37 100644
--- a/src/hotspot/share/opto/macroArrayCopy.cpp
+++ b/src/hotspot/share/opto/macroArrayCopy.cpp
@@ -204,53 +204,46 @@ void PhaseMacroExpand::generate_limit_guard(Node** ctrl, Node* offset, Node* sub
 void PhaseMacroExpand::generate_partial_inlining_block(Node** ctrl, MergeMemNode** mem, const TypePtr* adr_type,
                                                        RegionNode** exit_block, Node** result_memory, Node* length,
                                                        Node* src_start, Node* dst_start, BasicType type) {
-  const TypePtr *src_adr_type = _igvn.type(src_start)->isa_ptr();
-  Node* inline_block = nullptr;
-  Node* stub_block = nullptr;
+  int inline_limit = ArrayOperationPartialInlineSize / type2aelembytes(type);
 
-  int const_len = -1;
-  const TypeInt* lty = nullptr;
-  uint shift  = exact_log2(type2aelembytes(type));
-  if (length->Opcode() == Op_ConvI2L) {
-    lty = _igvn.type(length->in(1))->isa_int();
-  } else  {
-    lty = _igvn.type(length)->isa_int();
-  }
-  if (lty && lty->is_con()) {
-    const_len = lty->get_con() << shift;
+  const TypeLong* length_type = _igvn.type(length)->isa_long();
+  if (length_type == nullptr) {
+    assert(_igvn.type(length) == Type::TOP, "");
+    return;
   }
 
-  // Return if copy length is greater than partial inline size limit or
-  // target does not supports masked load/stores.
-  int lane_count = ArrayCopyNode::get_partial_inline_vector_lane_count(type, const_len);
-  if ( const_len > ArrayOperationPartialInlineSize ||
-      !Matcher::match_rule_supported_vector(Op_LoadVectorMasked, lane_count, type)  ||
+  const TypeLong* inline_range = TypeLong::make(0, inline_limit, Type::WidenMin);
+  if (length_type->join(inline_range) == Type::TOP) {
+    // The ranges do not intersect, the inline check will surely fail
+    return;
+  }
+
+  // Return if the target does not supports masked load/stores.
+  int lane_count = ArrayCopyNode::get_partial_inline_vector_lane_count(type, length_type->_hi);
+  if (!Matcher::match_rule_supported_vector(Op_LoadVectorMasked, lane_count, type)  ||
       !Matcher::match_rule_supported_vector(Op_StoreVectorMasked, lane_count, type) ||
       !Matcher::match_rule_supported_vector(Op_VectorMaskGen, lane_count, type)) {
     return;
   }
 
-  int inline_limit = ArrayOperationPartialInlineSize / type2aelembytes(type);
-  Node* casted_length = new CastLLNode(*ctrl, length, TypeLong::make(0, inline_limit, Type::WidenMin));
-  transform_later(casted_length);
-  Node* copy_bytes = new LShiftXNode(length, intcon(shift));
-  transform_later(copy_bytes);
-
-  Node* cmp_le = new CmpULNode(copy_bytes, longcon(ArrayOperationPartialInlineSize));
+  Node* cmp_le = new CmpULNode(length, longcon(inline_limit));
   transform_later(cmp_le);
   Node* bol_le = new BoolNode(cmp_le, BoolTest::le);
   transform_later(bol_le);
-  inline_block  = generate_guard(ctrl, bol_le, nullptr, PROB_FAIR);
-  stub_block = *ctrl;
+  Node* inline_block = generate_guard(ctrl, bol_le, nullptr, PROB_FAIR);
+  Node* stub_block = *ctrl;
 
+  Node* casted_length = new CastLLNode(inline_block, length, inline_range, ConstraintCastNode::RegularDependency);
+  transform_later(casted_length);
   Node* mask_gen = VectorMaskGenNode::make(casted_length, type);
   transform_later(mask_gen);
 
-  unsigned vec_size = lane_count *  type2aelembytes(type);
+  unsigned vec_size = lane_count * type2aelembytes(type);
   if (C->max_vector_size() < vec_size) {
     C->set_max_vector_size(vec_size);
   }
 
+  const TypePtr* src_adr_type = _igvn.type(src_start)->isa_ptr();
   const TypeVect * vt = TypeVect::make(type, lane_count);
   Node* mm = (*mem)->memory_at(C->get_alias_index(src_adr_type));
   Node* masked_load = new LoadVectorMaskedNode(inline_block, mm, src_start,
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index bc163ae8197..a45fdc09323 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -75,8 +75,6 @@ compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
 compiler/interpreter/Test6833129.java 8335266 generic-i586
 
-compiler/c2/TestVerifyConstraintCasts.java 8355574 generic-all
-
 compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64
 
 serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java 8369150 generic-all
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java
index 8d98628c074..a6ba75df625 100644
--- a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyConjoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@ import java.util.Random;
 
 /**
  * @test
- * @bug 8251871 8285301
+ * @bug 8251871 8285301 8355574
  * @summary Optimize arrayCopy using AVX-512 masked instructions.
  *
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+IgnoreUnrecognizedVMOptions
@@ -38,6 +38,9 @@ import java.util.Random;
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:UseAVX=3 -XX:+UnlockDiagnosticVMOptions -XX:ArrayOperationPartialInlineSize=32 -XX:+UnlockDiagnosticVMOptions -XX:MaxVectorSize=32 -XX:+UnlockDiagnosticVMOption
  *      compiler.arraycopy.TestArrayCopyConjoint
+ * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:VerifyConstraintCasts=2
+ *      -XX:UseAVX=3 -XX:ArrayOperationPartialInlineSize=32 -XX:MaxVectorSize=32
+ *      compiler.arraycopy.TestArrayCopyConjoint
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:UseAVX=3 -XX:+UnlockDiagnosticVMOptions -XX:ArrayOperationPartialInlineSize=32 -XX:+UnlockDiagnosticVMOptions -XX:MaxVectorSize=64
  *      compiler.arraycopy.TestArrayCopyConjoint

From 7d35a283cf2497565d230e3d5426f563f7e5870d Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Sun, 16 Nov 2025 10:31:23 +0000
Subject: [PATCH 191/512] 8371958: [BACKOUT] 8371709: Add CTW to
 hotspot_compiler testing

Reviewed-by: ayang
---
 test/hotspot/jtreg/TEST.groups | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index f07d276f1f5..d4f1470aea5 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -36,7 +36,6 @@ hotspot_all_no_apps = \
 # Component test groups
 
 hotspot_compiler = \
-  applications/ctw/modules \
   compiler
 
 hotspot_compiler_resourcehogs = \

From 7738131835d08f47dd7c535b12bb7ea7b0ff0b90 Mon Sep 17 00:00:00 2001
From: David Briemann <dbriemann@openjdk.org>
Date: Mon, 17 Nov 2025 06:49:12 +0000
Subject: [PATCH 192/512] 8371642: TestNumberOfContinuousZeros.java fails on
 PPC64

Reviewed-by: mdoerr, epeter
---
 .../compiler/vectorization/TestNumberOfContinuousZeros.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index e9773e8ac07..d50a96af749 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -180,7 +180,8 @@ public class TestNumberOfContinuousZeros {
     }
 
     @Test
-    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
     @Arguments(setup = "setupSpecialLongArray")
     public Object[] testSpecialLongLeadingZeros(long[] longs) {
         int[] res = new int[LEN];
@@ -245,7 +246,8 @@ public class TestNumberOfContinuousZeros {
     }
 
     @Test
-    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
     @Arguments(setup = "setupSpecialLongArray")
     public Object[] testLongLeadingZerosVector(long[] longs) {
         long[] res = new long[LEN];

From ce1adf63ea1146fba4cf36c10dc5f1d33aa88000 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 17 Nov 2025 07:33:33 +0000
Subject: [PATCH 193/512] 8371672: G1: G1YoungGenSizer handling of NewRatio,
 NewSize and MaxNewSize 8370494: G1: NewSize not bounded by InitialHeapSize or
 MaxHeapSize

Reviewed-by: tschatzl, iwalulya
---
 src/hotspot/share/gc/g1/g1YoungGenSizer.cpp | 96 +++++++++++++++------
 1 file changed, 72 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
index a8209eb19ba..ffa573c68cc 100644
--- a/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
@@ -25,47 +25,95 @@
 #include "gc/g1/g1Arguments.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "runtime/globals_extension.hpp"
 
 G1YoungGenSizer::G1YoungGenSizer() : _sizer_kind(SizerDefaults),
   _use_adaptive_sizing(true), _min_desired_young_length(0), _max_desired_young_length(0) {
 
+  precond(!FLAG_IS_ERGO(NewRatio));
+  precond(!FLAG_IS_ERGO(NewSize));
+  precond(!FLAG_IS_ERGO(MaxNewSize));
+
+  // Figure out compatible young gen sizing policies.
+  // This will either use all default, NewRatio or a combination of NewSize and
+  // MaxNewSize. If both ratio and size is user specified NewRatio will be ignored.
+
+  const bool user_specified_NewRatio = !FLAG_IS_DEFAULT(NewRatio);
+  const bool user_specified_NewSize = !FLAG_IS_DEFAULT(NewSize);
+  const bool user_specified_MaxNewSize = !FLAG_IS_DEFAULT(MaxNewSize);
+
+  // MaxNewSize is updated every time the heap is resized (and when initialized),
+  // as such the value of MaxNewSize is only modified if it is also used by the
+  // young generation sizing. (If MaxNewSize is user specified).
+
+  if (!user_specified_NewRatio && !user_specified_NewSize && !user_specified_MaxNewSize) {
+    // Using Defaults.
+    return;
+  }
+
+  if (user_specified_NewRatio && !user_specified_NewSize && !user_specified_MaxNewSize) {
+    // Using NewRatio.
+    _sizer_kind = SizerNewRatio;
+    _use_adaptive_sizing = false;
+    return;
+  }
+
   if (FLAG_IS_CMDLINE(NewRatio)) {
-    if (FLAG_IS_CMDLINE(NewSize) || FLAG_IS_CMDLINE(MaxNewSize)) {
-      log_warning(gc, ergo)("-XX:NewSize and -XX:MaxNewSize override -XX:NewRatio");
-    } else {
-      _sizer_kind = SizerNewRatio;
-      _use_adaptive_sizing = false;
-      return;
+    // NewRatio ignored at this point, issue warning if NewRatio was specified
+    // on the command line.
+    log_warning(gc, ergo)("-XX:NewSize and -XX:MaxNewSize overrides -XX:NewRatio");
+  }
+
+  assert(!FLAG_IS_DEFAULT(InitialHeapSize), "Initial heap size must be selected");
+  if (user_specified_NewSize && NewSize > InitialHeapSize) {
+    // If user specifed NewSize is larger than the InitialHeapSize truncate the value.
+    if (FLAG_IS_CMDLINE(NewSize)) {
+      log_warning(gc, ergo)("NewSize (%zuk) is greater than the initial heap size (%zuk). "
+                            "A new NewSize of %zuk will be used.",
+                            NewSize/K, InitialHeapSize/K, InitialHeapSize/K);
     }
+    FLAG_SET_ERGO(NewSize, InitialHeapSize);
+  }
+
+  assert(!FLAG_IS_DEFAULT(MaxHeapSize), "Max heap size must be selected");
+  if (user_specified_MaxNewSize && MaxNewSize > MaxHeapSize) {
+    // If user specifed MaxNewSize is larger than the MaxHeapSize truncate the value.
+    if (FLAG_IS_CMDLINE(MaxNewSize)) {
+      log_warning(gc, ergo)("MaxNewSize (%zuk) greater than the entire heap (%zuk). "
+                            "A new MaxNewSize of %zuk will be used.",
+                            MaxNewSize/K, MaxHeapSize/K, MaxHeapSize/K);
+    }
+    FLAG_SET_ERGO(MaxNewSize, MaxHeapSize);
   }
 
   if (NewSize > MaxNewSize) {
+    // Either NewSize, MaxNewSize or both have been specified and are incompatible.
+    // In either case set MaxNewSize to the value of NewSize.
     if (FLAG_IS_CMDLINE(MaxNewSize)) {
-      log_warning(gc, ergo)("NewSize (%zuk) is greater than the MaxNewSize (%zuk). "
-                            "A new max generation size of %zuk will be used.",
+      log_warning(gc, ergo)("NewSize (%zuk) is greater than MaxNewSize (%zuk). "
+                            "A new MaxNewSize of %zuk will be used.",
                             NewSize/K, MaxNewSize/K, NewSize/K);
     }
     FLAG_SET_ERGO(MaxNewSize, NewSize);
   }
 
-  if (FLAG_IS_CMDLINE(NewSize)) {
-    _min_desired_young_length = MAX2((uint) (NewSize / G1HeapRegion::GrainBytes),
-                                     1U);
-    if (FLAG_IS_CMDLINE(MaxNewSize)) {
-      _max_desired_young_length =
-                             MAX2((uint) (MaxNewSize / G1HeapRegion::GrainBytes),
-                                  1U);
-      _sizer_kind = SizerMaxAndNewSize;
-      _use_adaptive_sizing = _min_desired_young_length != _max_desired_young_length;
-    } else {
-      _sizer_kind = SizerNewSizeOnly;
-    }
-  } else if (FLAG_IS_CMDLINE(MaxNewSize)) {
-    _max_desired_young_length =
-                             MAX2((uint) (MaxNewSize / G1HeapRegion::GrainBytes),
-                                  1U);
+  if (user_specified_NewSize) {
+    _min_desired_young_length = MAX2((uint)(NewSize / G1HeapRegion::GrainBytes), 1U);
+  }
+
+  if (user_specified_MaxNewSize) {
+    _max_desired_young_length = MAX2((uint)(MaxNewSize / G1HeapRegion::GrainBytes), 1U);
+  }
+
+  if (user_specified_NewSize && user_specified_MaxNewSize) {
+    _sizer_kind = SizerMaxAndNewSize;
+    _use_adaptive_sizing = _min_desired_young_length != _max_desired_young_length;
+  } else if (user_specified_NewSize) {
+    _sizer_kind = SizerNewSizeOnly;
+  } else {
+    postcond(user_specified_MaxNewSize);
     _sizer_kind = SizerMaxNewSizeOnly;
   }
 }

From 8690d263d9dd0fd06ed41d9529fd8cc84e1c08c8 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Mon, 17 Nov 2025 07:53:32 +0000
Subject: [PATCH 194/512] 8268613: jar --validate should check inital entries
 of a JAR file

Reviewed-by: lancea, jvernee
---
 .../classes/sun/tools/jar/Validator.java      | 13 +++
 .../sun/tools/jar/resources/jar.properties    |  4 +
 test/jdk/tools/jar/ValidatorTest.java         | 94 +++++++++++++++++++
 3 files changed, 111 insertions(+)

diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
index 1852b2cad9d..be694eeb1bc 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
@@ -260,6 +260,19 @@ final class Validator {
                 isValid = false;
                 warn(getMsg("warn.validator.order.mismatch"));
             }
+            // Check location of an optional manifest entry
+            if ("META-INF/MANIFEST.MF".equals(entryName)) {
+                int index = entryInfo.cen().order();
+                if (index > 1) { // Expect base manifest at index 0 or 1
+                    String position = Integer.toString(index);
+                    errorAndInvalid(formatMsg("error.validator.manifest.wrong.position", position));
+                } else if (index == 1) { // Ensure "META-INF/" preceeds manifest
+                    String firstName = entries.sequencedKeySet().getFirst();
+                    if (!"META-INF/".equals(firstName)) {
+                        errorAndInvalid(formatMsg("error.validator.metainf.wrong.position", firstName));
+                    }
+                }
+            }
         }
 
         /**
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
index 0e3555f181e..c80377e20c1 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
@@ -134,6 +134,10 @@ error.validator.info.version.notequal=\
         {0}: module-info.class in a versioned directory contains different "version"
 error.validator.info.manclass.notequal=\
         {0}: module-info.class in a versioned directory contains different "main-class"
+error.validator.metainf.wrong.position=\
+        expected entry META-INF/ to be at position 0, but found: {0}
+error.validator.manifest.wrong.position=\
+        expected entry META-INF/MANIFEST.MF to be at position 0 or 1, but found it at position: {0}
 warn.validator.identical.entry=\
         Warning: entry {0} contains a class that\n\
         is identical to an entry already in the jar
diff --git a/test/jdk/tools/jar/ValidatorTest.java b/test/jdk/tools/jar/ValidatorTest.java
index c08e6a8a984..c2dfeae8dec 100644
--- a/test/jdk/tools/jar/ValidatorTest.java
+++ b/test/jdk/tools/jar/ValidatorTest.java
@@ -38,10 +38,13 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
+import java.io.FileInputStream;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
@@ -50,6 +53,7 @@ import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
 import java.util.spi.ToolProvider;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
@@ -306,6 +310,96 @@ class ValidatorTest {
         }
     }
 
+    /**
+     * Validates that base manifest-related entries are at expected LOC positions.
+     * <p>
+     * Copied from <code>JarInputStream.java</code>:
+     * <pre>
+     * This implementation assumes the META-INF/MANIFEST.MF entry
+     * should be either the first or the second entry (when preceded
+     * by the dir META-INF/). It skips the META-INF/ and then
+     * "consumes" the MANIFEST.MF to initialize the Manifest object.
+     * </pre>
+     * This test does not do a similar CEN check in the event that the LOC and CEN
+     * entries do not match. Those mismatch cases are already checked by other tests.
+     */
+    @Test
+    public void testWrongManifestPositions() throws IOException {
+        testWrongManifestPosition(
+                Path.of("wrong-entry-position-A.jar"),
+                """
+                expected entry META-INF/ to be at position 0, but found: PLACEHOLDER
+                """,
+                EntryWriter.ofText("PLACEHOLDER", "0"),
+                EntryWriter.ofText(META_INF + "MANIFEST.MF", "Manifest-Version: 1.0"));
+        testWrongManifestPosition(
+                Path.of("wrong-entry-position-B.jar"),
+                """
+                expected entry META-INF/MANIFEST.MF to be at position 0 or 1, but found it at position: 2
+                """,
+                EntryWriter.ofDirectory(META_INF),
+                EntryWriter.ofText("PLACEHOLDER", "1"),
+                EntryWriter.ofText(META_INF + "MANIFEST.MF", "Manifest-Version: 1.0"));
+        testWrongManifestPosition(
+                Path.of("wrong-entry-position-C.jar"),
+                """
+                expected entry META-INF/MANIFEST.MF to be at position 0 or 1, but found it at position: 4
+                """,
+                EntryWriter.ofDirectory(META_INF),
+                EntryWriter.ofText("PLACEHOLDER1", "1"),
+                EntryWriter.ofText("PLACEHOLDER2", "2"),
+                EntryWriter.ofText("PLACEHOLDER3", "3"),
+                EntryWriter.ofText(META_INF + "MANIFEST.MF", "Manifest-Version: 1.0"));
+    }
+
+    private void testWrongManifestPosition(
+            Path path, String expectedErrorMessage, EntryWriter... entries) throws IOException {
+        createZipFile(path, entries);
+        // first check JAR file with streaming API
+        try (var jis = new JarInputStream(new FileInputStream(path.toFile()))) {
+            var manifest = jis.getManifest();
+            assertNull(manifest, "Manifest not null?!");
+        }
+        // now validate with tool CLI
+        try {
+            jar("--validate --file " + path);
+            fail("Expecting non-zero exit code validating: " + path);
+        } catch (IOException e) {
+            var err = e.getMessage();
+            System.out.println(err);
+            assertLinesMatch(expectedErrorMessage.lines(), err.lines());
+        }
+    }
+
+    record EntryWriter(ZipEntry entry, Writer writer) {
+        @FunctionalInterface
+        interface Writer {
+            void write(ZipOutputStream stream) throws IOException;
+        }
+        static EntryWriter ofDirectory(String name) {
+            return new EntryWriter(new ZipEntry(name), _ -> {});
+        }
+        static EntryWriter ofText(String name, String text) {
+            return new EntryWriter(new ZipEntry(name),
+                    stream -> stream.write(text.getBytes(StandardCharsets.UTF_8)));
+        }
+    }
+
+    private static void createZipFile(Path path, EntryWriter... entries) throws IOException {
+        System.out.printf("%n%n*****Creating Zip file with %d entries*****%n".formatted(entries.length));
+        var out = new ByteArrayOutputStream(1024);
+        try (var zos = new ZipOutputStream(out)) {
+            for (var entry : entries) {
+                System.out.printf("  %s%n".formatted(entry.entry().getName()));
+                zos.putNextEntry(entry.entry());
+                entry.writer().write(zos);
+                zos.closeEntry();
+            }
+            zos.flush();
+        }
+        Files.write(path, out.toByteArray());
+    }
+
     // return stderr output
     private String jar(String cmdline) throws IOException {
         System.out.println("jar " + cmdline);

From d032b28d9d042a36f5163b079151643bb49294e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 17 Nov 2025 08:50:50 +0000
Subject: [PATCH 195/512] 8371894: Minor style fixes in AOT/CDS code

Reviewed-by: stefank, kvn, iklam
---
 src/hotspot/share/cds/cdsConfig.cpp   |  2 +-
 src/hotspot/share/cds/filemap.hpp     |  2 +-
 src/hotspot/share/cds/heapShared.cpp  |  5 ++-
 src/hotspot/share/memory/universe.cpp | 44 +++++++++++++--------------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 7976f690b8b..86533e212d8 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -526,7 +526,7 @@ void CDSConfig::check_aotmode_record() {
   bool has_output = !FLAG_IS_DEFAULT(AOTCacheOutput);
 
   if (!has_output && !has_config) {
-      vm_exit_during_initialization("At least one of AOTCacheOutput and AOTConfiguration must be specified when using -XX:AOTMode=record");
+    vm_exit_during_initialization("At least one of AOTCacheOutput and AOTConfiguration must be specified when using -XX:AOTMode=record");
   }
 
   if (has_output) {
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index b97b46a7c26..2a761843e47 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -290,7 +290,7 @@ public:
 
   void log_paths(const char* msg, int start_idx, int end_idx);
 
-  FileMapInfo(const char* full_apth, bool is_static);
+  FileMapInfo(const char* full_path, bool is_static);
   ~FileMapInfo();
   static void free_current_info();
 
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 357b317ee49..f2382289c7d 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -631,9 +631,8 @@ void HeapShared::init_scratch_objects_for_basic_type_mirrors(TRAPS) {
 }
 
 // Given java_mirror that represents a (primitive or reference) type T,
-// return the "scratch" version that represents the same type T.
-// Note that if java_mirror will be returned if it's already a
-// scratch mirror.
+// return the "scratch" version that represents the same type T. Note
+// that java_mirror will be returned if the mirror is already a scratch mirror.
 //
 // See java_lang_Class::create_scratch_mirror() for more info.
 oop HeapShared::scratch_java_mirror(oop java_mirror) {
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index db0435044ca..d389fe81806 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -557,32 +557,32 @@ void Universe::genesis(TRAPS) {
 
 void Universe::initialize_basic_type_mirrors(TRAPS) {
 #if INCLUDE_CDS_JAVA_HEAP
-    if (CDSConfig::is_using_archive() &&
-        HeapShared::is_archived_heap_in_use() &&
-        _basic_type_mirrors[T_INT].resolve() != nullptr) {
-      // check that all basic type mirrors are mapped also
-      for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
-        if (!is_reference_type((BasicType)i)) {
-          oop m = _basic_type_mirrors[i].resolve();
-          assert(m != nullptr, "archived mirrors should not be null");
-        }
+  if (CDSConfig::is_using_archive() &&
+      HeapShared::is_archived_heap_in_use() &&
+      _basic_type_mirrors[T_INT].resolve() != nullptr) {
+    // check that all basic type mirrors are mapped also
+    for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
+      if (!is_reference_type((BasicType)i)) {
+        oop m = _basic_type_mirrors[i].resolve();
+        assert(m != nullptr, "archived mirrors should not be null");
       }
-    } else
-      // _basic_type_mirrors[T_INT], etc, are null if not using an archived heap
+    }
+  } else
+    // _basic_type_mirrors[T_INT], etc, are null if not using an archived heap
 #endif
-    {
-      for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
-        BasicType bt = (BasicType)i;
-        if (!is_reference_type(bt)) {
-          oop m = java_lang_Class::create_basic_type_mirror(type2name(bt), bt, CHECK);
-          _basic_type_mirrors[i] = OopHandle(vm_global(), m);
-        }
-        CDS_JAVA_HEAP_ONLY(_archived_basic_type_mirror_indices[i] = -1);
+  {
+    for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
+      BasicType bt = (BasicType)i;
+      if (!is_reference_type(bt)) {
+        oop m = java_lang_Class::create_basic_type_mirror(type2name(bt), bt, CHECK);
+        _basic_type_mirrors[i] = OopHandle(vm_global(), m);
       }
+      CDS_JAVA_HEAP_ONLY(_archived_basic_type_mirror_indices[i] = -1);
     }
-    if (CDSConfig::is_dumping_heap()) {
-      HeapShared::init_scratch_objects_for_basic_type_mirrors(CHECK);
-    }
+  }
+  if (CDSConfig::is_dumping_heap()) {
+    HeapShared::init_scratch_objects_for_basic_type_mirrors(CHECK);
+  }
 }
 
 void Universe::fixup_mirrors(TRAPS) {

From 970533d41d3d1b4ebe12868c85579d37b3b23655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 17 Nov 2025 09:06:32 +0000
Subject: [PATCH 196/512] 8371779: Replace MemTagBitmap with ResourceBitMap

Reviewed-by: azafari, phubner
---
 src/hotspot/share/nmt/memMapPrinter.cpp | 19 +++++----
 src/hotspot/share/nmt/memTagBitmap.hpp  | 56 -------------------------
 2 files changed, 10 insertions(+), 65 deletions(-)
 delete mode 100644 src/hotspot/share/nmt/memTagBitmap.hpp

diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp
index 7e82de23dd8..9a2fe166d3d 100644
--- a/src/hotspot/share/nmt/memMapPrinter.cpp
+++ b/src/hotspot/share/nmt/memMapPrinter.cpp
@@ -32,7 +32,6 @@
 #include "memory/universe.hpp"
 #include "nmt/memMapPrinter.hpp"
 #include "nmt/memTag.hpp"
-#include "nmt/memTagBitmap.hpp"
 #include "nmt/memTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/nonJavaThread.hpp"
@@ -40,6 +39,8 @@
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/vmThread.hpp"
+#include "utilities/bitMap.hpp"
+#include "utilities/bitMap.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/permitForbiddenFunctions.hpp"
@@ -128,8 +129,8 @@ public:
   }
 
   // Given a vma [from, to), find all regions that intersect with this vma and
-  // return their collective flags.
-  MemTagBitmap lookup(const void* from, const void* to) const {
+  // fill out their collective flags into bm.
+  void lookup(const void* from, const void* to, ResourceBitMap& bm) const {
     assert(from <= to, "Sanity");
     // We optimize for sequential lookups. Since this class is used when a list
     // of OS mappings is scanned (VirtualQuery, /proc/pid/maps), and these lists
@@ -138,16 +139,14 @@ public:
       // the range is to the right of the given section, we need to re-start the search
       _last = 0;
     }
-    MemTagBitmap bm;
     for(uintx i = _last; i < _count; i++) {
       if (range_intersects(from, to, _ranges[i].from, _ranges[i].to)) {
-        bm.set_tag(_mem_tags[i]);
+        bm.set_bit((BitMap::idx_t)_mem_tags[i]);
       } else if (to <= _ranges[i].from) {
         _last = i;
         break;
       }
     }
-    return bm;
   }
 
   bool do_allocation_site(const ReservedMemoryRegion* rgn) override {
@@ -247,11 +246,13 @@ bool MappingPrintSession::print_nmt_info_for_region(const void* vma_from, const
   // print NMT information, if available
   if (MemTracker::enabled()) {
     // Correlate vma region (from, to) with NMT region(s) we collected previously.
-    const MemTagBitmap flags = _nmt_info.lookup(vma_from, vma_to);
-    if (flags.has_any()) {
+    ResourceMark rm;
+    ResourceBitMap flags(mt_number_of_tags);
+    _nmt_info.lookup(vma_from, vma_to, flags);
+    if (!flags.is_empty()) {
       for (int i = 0; i < mt_number_of_tags; i++) {
         const MemTag mem_tag = (MemTag)i;
-        if (flags.has_tag(mem_tag)) {
+        if (flags.at((BitMap::idx_t)mem_tag)) {
           if (num_printed > 0) {
             _out->put(',');
           }
diff --git a/src/hotspot/share/nmt/memTagBitmap.hpp b/src/hotspot/share/nmt/memTagBitmap.hpp
deleted file mode 100644
index f65dce60fa6..00000000000
--- a/src/hotspot/share/nmt/memTagBitmap.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_NMT_MEMTAGBITMAP_HPP
-#define SHARE_NMT_MEMTAGBITMAP_HPP
-
-#include "nmt/memTag.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-class MemTagBitmap {
-  uint32_t _v;
-  STATIC_ASSERT(sizeof(_v) * BitsPerByte >= mt_number_of_tags);
-
-public:
-  MemTagBitmap(uint32_t v = 0) : _v(v) {}
-  MemTagBitmap(const MemTagBitmap& o) : _v(o._v) {}
-
-  uint32_t raw_value() const { return _v; }
-
-  void set_tag(MemTag mem_tag) {
-    const int bitno = (int)mem_tag;
-    _v |= nth_bit(bitno);
-  }
-
-  bool has_tag(MemTag mem_tag) const {
-    const int bitno = (int)mem_tag;
-    return _v & nth_bit(bitno);
-  }
-
-  bool has_any() const { return _v > 0; }
-};
-
-#endif // SHARE_NMT_MEMTAGBITMAP_HPP

From 69e30244c0c359e7108acd36d903fa22970822b9 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Mon, 17 Nov 2025 09:08:21 +0000
Subject: [PATCH 197/512] 8349157: Unnecessary Hashtable usage in
 XKeysym.javaKeycode2KeysymHash

Reviewed-by: aivanov, serb
---
 .../unix/classes/sun/awt/X11/XKeysym.java     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
index 2970305ce26..eab0898b47a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,9 @@
  */
 
 package sun.awt.X11;
+
 import java.util.Hashtable;
+import java.util.Map;
 import jdk.internal.misc.Unsafe;
 
 import sun.util.logging.PlatformLogger;
@@ -68,7 +70,12 @@ public final class XKeysym {
     // for robot only it seems to me. After that, we can remove lookup table
     // from XWindow.c altogether.
     // Another use for reverse lookup: query keyboard state, for some keys.
-    static Hashtable<Integer, Long> javaKeycode2KeysymHash = new Hashtable<Integer, Long>();
+    private static final Map<Integer, Long> javaKeycode2KeysymHash = Map.of(
+            java.awt.event.KeyEvent.VK_CAPS_LOCK, XKeySymConstants.XK_Caps_Lock,
+            java.awt.event.KeyEvent.VK_NUM_LOCK, XKeySymConstants.XK_Num_Lock,
+            java.awt.event.KeyEvent.VK_SCROLL_LOCK, XKeySymConstants.XK_Scroll_Lock,
+            java.awt.event.KeyEvent.VK_KANA_LOCK, XKeySymConstants.XK_Kana_Lock
+    );
     static long keysym_lowercase = unsafe.allocateMemory(Native.getLongSize());
     static long keysym_uppercase = unsafe.allocateMemory(Native.getLongSize());
     static Keysym2JavaKeycode kanaLock = new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_KANA_LOCK,
@@ -289,9 +296,8 @@ public final class XKeysym {
         Keysym2JavaKeycode jkc = getJavaKeycode( keysym );
         return jkc == null ? java.awt.event.KeyEvent.VK_UNDEFINED : jkc.getJavaKeycode();
     }
-    static long javaKeycode2Keysym( int jkey ) {
-        Long ks = javaKeycode2KeysymHash.get( jkey );
-        return  (ks == null ? 0 : ks.longValue());
+    static long javaKeycode2Keysym(int jkey) {
+        return javaKeycode2KeysymHash.getOrDefault(jkey, 0L);
     }
     /**
         Return keysym derived from a keycode and modifiers.
@@ -1716,14 +1722,6 @@ public final class XKeysym {
         keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.hpXK_mute_asciitilde),     new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_DEAD_TILDE, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
 
         keysym2JavaKeycodeHash.put( Long.valueOf(XConstants.NoSymbol),     new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN));
-
-        /* Reverse search of keysym by keycode. */
-
-        /* Add keyboard locking codes. */
-        javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_CAPS_LOCK, XKeySymConstants.XK_Caps_Lock);
-        javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_NUM_LOCK, XKeySymConstants.XK_Num_Lock);
-        javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_SCROLL_LOCK, XKeySymConstants.XK_Scroll_Lock);
-        javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_KANA_LOCK, XKeySymConstants.XK_Kana_Lock);
     }
 
 }

From 09b25cd0a24a4eaddce49917d958adc667ab5465 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 17 Nov 2025 09:38:17 +0000
Subject: [PATCH 198/512] 8371465: Parallel: Revise asserts around heap
 expansion

Reviewed-by: aboldtch, tschatzl
---
 .../share/gc/parallel/mutableSpace.cpp        | 13 --------
 .../share/gc/parallel/mutableSpace.hpp        |  5 ---
 .../gc/parallel/parallelScavengeHeap.cpp      |  9 +++++
 src/hotspot/share/gc/parallel/psOldGen.cpp    | 33 +++++++++++++++----
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 6d30c5a8d1f..fc42fc1eab2 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -180,19 +180,6 @@ bool MutableSpace::cas_deallocate(HeapWord *obj, size_t size) {
   return AtomicAccess::cmpxchg(top_addr(), expected_top, obj) == expected_top;
 }
 
-// Only used by oldgen allocation.
-bool MutableSpace::needs_expand(size_t word_size) const {
-  // This method can be invoked either outside of safepoint by java threads or
-  // in safepoint by gc workers. Such accesses are synchronized by holding one
-  // of the following locks.
-  assert(Heap_lock->is_locked() || PSOldGenExpand_lock->is_locked(), "precondition");
-
-  // Holding the lock means end is stable.  So while top may be advancing
-  // via concurrent allocations, there is no need to order the reads of top
-  // and end here, unlike in cas_allocate.
-  return pointer_delta(end(), top()) < word_size;
-}
-
 void MutableSpace::oop_iterate(OopIterateClosure* cl) {
   HeapWord* obj_addr = bottom();
   HeapWord* t = top();
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index 37fa7e3710e..9d3894e2489 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -127,11 +127,6 @@ public:
   virtual HeapWord* cas_allocate(size_t word_size);
   // Optional deallocation. Used in NUMA-allocator.
   bool cas_deallocate(HeapWord *obj, size_t size);
-  // Return true if this space needs to be expanded in order to satisfy an
-  // allocation request of the indicated size.  Concurrent allocations and
-  // resizes may change the result of a later call.  Used by oldgen allocator.
-  // precondition: holding PSOldGenExpand_lock if not VM thread
-  bool needs_expand(size_t word_size) const;
 
   // Iteration.
   void oop_iterate(OopIterateClosure* cl);
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index f5ed40c40e5..ebaea3ecba4 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -403,7 +403,16 @@ bool ParallelScavengeHeap::check_gc_overhead_limit() {
 }
 
 HeapWord* ParallelScavengeHeap::expand_heap_and_allocate(size_t size, bool is_tlab) {
+#ifdef ASSERT
   assert(Heap_lock->is_locked(), "precondition");
+  if (is_init_completed()) {
+    assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+    assert(Thread::current()->is_VM_thread(), "precondition");
+  } else {
+    assert(Thread::current()->is_Java_thread(), "precondition");
+    assert(Heap_lock->owned_by_self(), "precondition");
+  }
+#endif
 
   HeapWord* result = young_gen()->expand_and_allocate(size);
 
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 4e614c53447..974cd6aca59 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -33,6 +33,7 @@
 #include "gc/shared/spaceDecorator.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/init.hpp"
 #include "runtime/java.hpp"
 #include "utilities/align.hpp"
 
@@ -118,13 +119,22 @@ void PSOldGen::initialize_performance_counters() {
 }
 
 HeapWord* PSOldGen::expand_and_allocate(size_t word_size) {
+#ifdef ASSERT
   assert(Heap_lock->is_locked(), "precondition");
+  if (is_init_completed()) {
+    assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+    assert(Thread::current()->is_VM_thread(), "precondition");
+  } else {
+    assert(Thread::current()->is_Java_thread(), "precondition");
+    assert(Heap_lock->owned_by_self(), "precondition");
+  }
+#endif
 
-  if (object_space()->needs_expand(word_size)) {
+  if (pointer_delta(object_space()->end(), object_space()->top()) < word_size) {
     expand(word_size*HeapWordSize);
   }
 
-  // Reuse the CAS API even though this is VM thread in safepoint. This method
+  // Reuse the CAS API even though this is in a critical section. This method
   // is not invoked repeatedly, so the CAS overhead should be negligible.
   return cas_allocate_noexpand(word_size);
 }
@@ -168,7 +178,7 @@ bool PSOldGen::expand_for_allocate(size_t word_size) {
     // true until we expand, since we have the lock.  Other threads may take
     // the space we need before we can allocate it, regardless of whether we
     // expand.  That's okay, we'll just try expanding again.
-    if (object_space()->needs_expand(word_size)) {
+    if (pointer_delta(object_space()->end(), object_space()->top()) < word_size) {
       result = expand(word_size*HeapWordSize);
     }
   }
@@ -192,10 +202,21 @@ void PSOldGen::try_expand_till_size(size_t target_capacity_bytes) {
 
 bool PSOldGen::expand(size_t bytes) {
 #ifdef ASSERT
-  if (!Thread::current()->is_VM_thread()) {
-    assert_lock_strong(PSOldGenExpand_lock);
+  //  During startup (is_init_completed() == false), expansion can occur for
+  //    1. java-threads invoking heap-allocation (using Heap_lock)
+  //    2. CDS construction by a single thread (using PSOldGenExpand_lock but not needed)
+  //
+  //  After startup (is_init_completed() == true), expansion can occur for
+  //    1. GC workers for promoting to old-gen (using PSOldGenExpand_lock)
+  //    2. VM thread to satisfy the pending allocation
+  //    Both cases are inside safepoint pause, but are never overlapping.
+  //
+  if (is_init_completed()) {
+    assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+    assert(Thread::current()->is_VM_thread() || PSOldGenExpand_lock->owned_by_self(), "precondition");
+  } else {
+    assert(Heap_lock->owned_by_self() || PSOldGenExpand_lock->owned_by_self(), "precondition");
   }
-  assert_locked_or_safepoint(Heap_lock);
   assert(bytes > 0, "precondition");
 #endif
   const size_t remaining_bytes = virtual_space()->uncommitted_size();

From 812add27abdc70bc52ca105bc9430494a6491ecd Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jonas.norlinder@oracle.com>
Date: Mon, 17 Nov 2025 10:42:02 +0000
Subject: [PATCH 199/512] 8368527: JMX: Add an MXBeans method to query GC CPU
 time

Reviewed-by: phh, kevinw
---
 src/hotspot/share/include/jmm.h               |   4 +-
 src/hotspot/share/services/cpuTimeUsage.cpp   |   1 +
 src/hotspot/share/services/management.cpp     |  19 +++
 .../java/lang/management/MemoryMXBean.java    |  40 ++++++-
 .../classes/sun/management/MemoryImpl.java    |   4 +
 .../classes/sun/management/VMManagement.java  |   1 +
 .../sun/management/VMManagementImpl.java      |   1 +
 .../native/libmanagement/VMManagementImpl.c   |   7 ++
 .../share/server/ServerMemoryMXBean.java      |   4 +
 ...StressGetTotalGcCpuTimeDuringShutdown.java | 112 ++++++++++++++++++
 .../MemoryMXBean/TestGetTotalGcCpuTime.java   | 112 ++++++++++++++++++
 .../management/mxbean/MXBeanInteropTest1.java |   2 +
 12 files changed, 304 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/lang/management/MemoryMXBean/StressGetTotalGcCpuTimeDuringShutdown.java
 create mode 100644 test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java

diff --git a/src/hotspot/share/include/jmm.h b/src/hotspot/share/include/jmm.h
index ba7ed3bbca5..ee1462fe5a8 100644
--- a/src/hotspot/share/include/jmm.h
+++ b/src/hotspot/share/include/jmm.h
@@ -53,7 +53,8 @@ enum {
   JMM_VERSION_2   = 0x20020000, // JDK 10
   JMM_VERSION_3   = 0x20030000, // JDK 14
   JMM_VERSION_4   = 0x20040000, // JDK 21
-  JMM_VERSION     = JMM_VERSION_4
+  JMM_VERSION_5   = 0x20050000, // JDK 26
+  JMM_VERSION     = JMM_VERSION_5
 };
 
 typedef struct {
@@ -81,6 +82,7 @@ typedef enum {
   JMM_GC_TIME_MS                     = 9,    /* Total accumulated time spent in collection */
   JMM_GC_COUNT                       = 10,   /* Total number of collections */
   JMM_JVM_UPTIME_MS                  = 11,   /* The JVM uptime in milliseconds */
+  JMM_TOTAL_GC_CPU_TIME              = 12,   /* Total accumulated GC CPU time */
 
   JMM_INTERNAL_ATTRIBUTE_INDEX       = 100,
   JMM_CLASS_LOADED_BYTES             = 101,  /* Number of bytes loaded instance classes */
diff --git a/src/hotspot/share/services/cpuTimeUsage.cpp b/src/hotspot/share/services/cpuTimeUsage.cpp
index 27b5e90fbaf..0c7ecfdb655 100644
--- a/src/hotspot/share/services/cpuTimeUsage.cpp
+++ b/src/hotspot/share/services/cpuTimeUsage.cpp
@@ -36,6 +36,7 @@
 volatile bool CPUTimeUsage::Error::_has_error = false;
 
 static inline jlong thread_cpu_time_or_zero(Thread* thread) {
+  assert(!Universe::is_shutting_down(), "Should not query during shutdown");
   jlong cpu_time = os::thread_cpu_time(thread);
   if (cpu_time == -1) {
     CPUTimeUsage::Error::mark_error();
diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp
index cfe13d0c8f1..cc26e2e1352 100644
--- a/src/hotspot/share/services/management.cpp
+++ b/src/hotspot/share/services/management.cpp
@@ -54,6 +54,7 @@
 #include "runtime/threadSMR.hpp"
 #include "runtime/vmOperations.hpp"
 #include "services/classLoadingService.hpp"
+#include "services/cpuTimeUsage.hpp"
 #include "services/diagnosticCommand.hpp"
 #include "services/diagnosticFramework.hpp"
 #include "services/finalizerService.hpp"
@@ -889,6 +890,21 @@ static jint get_num_flags() {
   return count;
 }
 
+static jlong get_gc_cpu_time() {
+  if (!os::is_thread_cpu_time_supported()) {
+    return -1;
+  }
+
+  {
+    MutexLocker hl(Heap_lock);
+    if (Universe::heap()->is_shutting_down()) {
+      return -1;
+    }
+
+    return CPUTimeUsage::GC::total();
+  }
+}
+
 static jlong get_long_attribute(jmmLongAttribute att) {
   switch (att) {
   case JMM_CLASS_LOADED_COUNT:
@@ -915,6 +931,9 @@ static jlong get_long_attribute(jmmLongAttribute att) {
   case JMM_JVM_UPTIME_MS:
     return Management::ticks_to_ms(os::elapsed_counter());
 
+  case JMM_TOTAL_GC_CPU_TIME:
+    return get_gc_cpu_time();
+
   case JMM_COMPILE_TOTAL_TIME_MS:
     return Management::ticks_to_ms(CompileBroker::total_compilation_ticks());
 
diff --git a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
index 2c982e1ce9c..1211d8d1c4d 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -267,6 +267,43 @@ public interface MemoryMXBean extends PlatformManagedObject {
      */
     public MemoryUsage getNonHeapMemoryUsage();
 
+    /**
+     * Returns the approximate accumulated time, in nanoseconds,
+     * spent in garbage collection (GC).
+     *
+     * <p> The time spent in spent in GC is the CPU time used by
+     * all GC activity, including any overhead, which means the
+     * result may be non-zero even if no GC has occurred.
+     *
+     * This method returns {@code -1} if the platform does
+     * not support this operation or the information is not
+     * available.
+     *
+     * @apiNote
+     * May be used in conjunction with {@link jdk.management/com.sun.management.OperatingSystemMXBean#getProcessCpuTime()}
+     * for calculating the GC's usage of CPU time as a whole.
+     *
+     * @implNote The specifics on what constitutes the time spent
+     * in GC are highly implementation dependent. In the HotSpot
+     * Virtual Machine, this time includes relevant
+     * implementation-specific details such as driver threads,
+     * workers, VM Operations and string deduplication (if
+     * enabled). Driver threads may be created by a GC to
+     * orchestrate its work. The return value can be -1 if called
+     * when measurement is not possible, such as during shutdown.
+     *
+     * @implSpec The default implementation returns {@code -1}.
+     *
+     * @return the total accumulated CPU time for GC in
+     * nanoseconds, or {@code -1}.
+     *
+     * @since 26
+     */
+    @SuppressWarnings("doclint:reference")
+    default public long getTotalGcCpuTime() {
+        return -1;
+    }
+
     /**
      * Tests if verbose output for the memory system is enabled.
      *
@@ -302,5 +339,4 @@ public interface MemoryMXBean extends PlatformManagedObject {
      * @see     java.lang.System#gc()
      */
     public void gc();
-
 }
diff --git a/src/java.management/share/classes/sun/management/MemoryImpl.java b/src/java.management/share/classes/sun/management/MemoryImpl.java
index e1f68ce3711..3e27ba2e5bb 100644
--- a/src/java.management/share/classes/sun/management/MemoryImpl.java
+++ b/src/java.management/share/classes/sun/management/MemoryImpl.java
@@ -67,6 +67,10 @@ class MemoryImpl extends NotificationEmitterSupport
         Runtime.getRuntime().gc();
     }
 
+    public long getTotalGcCpuTime() {
+        return jvm.getTotalGcCpuTime();
+    }
+
     // Need to make a VM call to get coherent value
     public MemoryUsage getHeapMemoryUsage() {
         return getMemoryUsage0(true);
diff --git a/src/java.management/share/classes/sun/management/VMManagement.java b/src/java.management/share/classes/sun/management/VMManagement.java
index f4445f0225a..3e227225ccd 100644
--- a/src/java.management/share/classes/sun/management/VMManagement.java
+++ b/src/java.management/share/classes/sun/management/VMManagement.java
@@ -55,6 +55,7 @@ public interface VMManagement {
     public boolean getVerboseClass();
 
     // Memory Subsystem
+    public long    getTotalGcCpuTime();
     public boolean getVerboseGC();
 
     // Runtime Subsystem
diff --git a/src/java.management/share/classes/sun/management/VMManagementImpl.java b/src/java.management/share/classes/sun/management/VMManagementImpl.java
index 041f09547d2..b8c7a2921d4 100644
--- a/src/java.management/share/classes/sun/management/VMManagementImpl.java
+++ b/src/java.management/share/classes/sun/management/VMManagementImpl.java
@@ -128,6 +128,7 @@ class VMManagementImpl implements VMManagement {
     public native boolean getVerboseClass();
 
     // Memory Subsystem
+    public native long getTotalGcCpuTime();
     public native boolean getVerboseGC();
 
     // Runtime Subsystem
diff --git a/src/java.management/share/native/libmanagement/VMManagementImpl.c b/src/java.management/share/native/libmanagement/VMManagementImpl.c
index f1a566676dc..d5141c71ee7 100644
--- a/src/java.management/share/native/libmanagement/VMManagementImpl.c
+++ b/src/java.management/share/native/libmanagement/VMManagementImpl.c
@@ -121,6 +121,13 @@ Java_sun_management_VMManagementImpl_getUnloadedClassCount
     return count;
 }
 
+JNIEXPORT jlong JNICALL
+Java_sun_management_VMManagementImpl_getTotalGcCpuTime
+  (JNIEnv *env, jobject dummy)
+{
+    return jmm_interface->GetLongAttribute(env, NULL, JMM_TOTAL_GC_CPU_TIME);
+}
+
 JNIEXPORT jboolean JNICALL
 Java_sun_management_VMManagementImpl_getVerboseGC
   (JNIEnv *env, jobject dummy)
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java
index 0c536fcd123..31050b6b8bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java
@@ -58,6 +58,10 @@ public class ServerMemoryMXBean extends ServerMXBean implements MemoryMXBean {
                 return getIntAttribute(OBJECT_PENDING_FINALIZATION_COUNT);
         }
 
+        public long getTotalGcCpuTime() {
+                throw new UnsupportedOperationException("This method is not supported");
+        }
+
         public boolean isVerbose() {
                 return getBooleanAttribute(VERBOSE);
         }
diff --git a/test/jdk/java/lang/management/MemoryMXBean/StressGetTotalGcCpuTimeDuringShutdown.java b/test/jdk/java/lang/management/MemoryMXBean/StressGetTotalGcCpuTimeDuringShutdown.java
new file mode 100644
index 00000000000..21a8b18ffd7
--- /dev/null
+++ b/test/jdk/java/lang/management/MemoryMXBean/StressGetTotalGcCpuTimeDuringShutdown.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=Epsilon
+ * @requires vm.gc.Epsilon
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC StressGetTotalGcCpuTimeDuringShutdown
+ */
+
+/*
+ * @test id=Serial
+ * @requires vm.gc.Serial
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseSerialGC StressGetTotalGcCpuTimeDuringShutdown
+ */
+
+/*
+ * @test id=Parallel
+ * @requires vm.gc.Parallel
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseParallelGC StressGetTotalGcCpuTimeDuringShutdown
+ */
+
+/*
+ * @test id=G1
+ * @requires vm.gc.G1
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseG1GC StressGetTotalGcCpuTimeDuringShutdown
+ */
+
+/*
+ * @test id=ZGC
+ * @requires vm.gc.Z
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseZGC StressGetTotalGcCpuTimeDuringShutdown
+ */
+
+/*
+ * @test id=Shenandoah
+ * @requires vm.gc.Shenandoah
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseShenandoahGC StressGetTotalGcCpuTimeDuringShutdown
+ */
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.ThreadMXBean;
+
+public class StressGetTotalGcCpuTimeDuringShutdown {
+    static final ThreadMXBean mxThreadBean = ManagementFactory.getThreadMXBean();
+    static final MemoryMXBean mxMemoryBean = ManagementFactory.getMemoryMXBean();
+
+    public static void main(String[] args) throws Exception {
+        try {
+            if (!mxThreadBean.isThreadCpuTimeEnabled()) {
+                return;
+            }
+        } catch (UnsupportedOperationException e) {
+            if (mxMemoryBean.getTotalGcCpuTime() != -1) {
+                throw new RuntimeException("GC CPU time should be -1");
+            }
+            return;
+        }
+
+        final int numberOfThreads = Runtime.getRuntime().availableProcessors() * 8;
+        for (int i = 0; i < numberOfThreads; i++) {
+            Thread t = new Thread(() -> {
+                while (true) {
+                    long gcCpuTimeFromThread = mxMemoryBean.getTotalGcCpuTime();
+                    if (gcCpuTimeFromThread < -1) {
+                        throw new RuntimeException("GC CPU time should never be less than -1 but was " + gcCpuTimeFromThread);
+                    }
+                }
+            });
+            t.setDaemon(true);
+            t.start();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java b/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java
new file mode 100644
index 00000000000..d8a760027a7
--- /dev/null
+++ b/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=Epsilon
+ * @requires vm.gc.Epsilon
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC TestGetTotalGcCpuTime
+ */
+
+/*
+ * @test id=Serial
+ * @requires vm.gc.Serial
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseSerialGC TestGetTotalGcCpuTime
+ */
+
+/*
+ * @test id=Parallel
+ * @requires vm.gc.Parallel
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseParallelGC TestGetTotalGcCpuTime
+ */
+
+/*
+ * @test id=G1
+ * @requires vm.gc.G1
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseG1GC TestGetTotalGcCpuTime
+ */
+
+/*
+ * @test id=ZGC
+ * @requires vm.gc.Z
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseZGC TestGetTotalGcCpuTime
+ */
+
+/*
+ * @test id=Shenandoah
+ * @requires vm.gc.Shenandoah
+ * @bug     8368527
+ * @summary Stress MemoryMXBean.getTotalGcCpuTime during shutdown
+ * @library /test/lib
+ * @run main/othervm -XX:+UseShenandoahGC TestGetTotalGcCpuTime
+ */
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.ThreadMXBean;
+
+public class TestGetTotalGcCpuTime {
+    static final ThreadMXBean mxThreadBean = ManagementFactory.getThreadMXBean();
+    static final MemoryMXBean mxMemoryBean = ManagementFactory.getMemoryMXBean();
+    static final boolean usingEpsilonGC = ManagementFactory.getRuntimeMXBean().getInputArguments().stream().anyMatch(p -> p.contains("-XX:+UseEpsilonGC"));
+
+    public static void main(String[] args) throws Exception {
+        try {
+            if (!mxThreadBean.isThreadCpuTimeEnabled()) {
+                return;
+            }
+        } catch (UnsupportedOperationException e) {
+            if (mxMemoryBean.getTotalGcCpuTime() != -1) {
+                throw new RuntimeException("GC CPU time should be -1");
+            }
+            return;
+        }
+
+        System.gc();
+        long gcCpuTimeFromThread = mxMemoryBean.getTotalGcCpuTime();
+
+        if (usingEpsilonGC) {
+            if (gcCpuTimeFromThread != 0) {
+                throw new RuntimeException("Epsilon GC can't have any GC CPU time by definition");
+            }
+        } else {
+            if (gcCpuTimeFromThread <= 0) {
+                throw new RuntimeException("Some GC CPU time must have been reported");
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java b/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java
index 500fef1c2f3..011bdb144fb 100644
--- a/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java
+++ b/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java
@@ -222,6 +222,8 @@ public class MXBeanInteropTest1 {
                     + memory.getNonHeapMemoryUsage());
             System.out.println("getObjectPendingFinalizationCount\t\t"
                     + memory.getObjectPendingFinalizationCount());
+            System.out.println("getTotalGcCpuTime\t\t"
+                    + memory.getTotalGcCpuTime());
             System.out.println("isVerbose\t\t"
                     + memory.isVerbose());
 

From d19e072f97681cfc50a8c7b96a25589070436a10 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 17 Nov 2025 11:01:32 +0000
Subject: [PATCH 200/512] 8371916: Questionable volatile decrement in
 AckFrameSpliterator

Reviewed-by: vyazici, jpai, djelinski
---
 .../net/http/quic/frames/AckFrame.java        | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/frames/AckFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/frames/AckFrame.java
index 7983d1be4f0..09d05f91066 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/frames/AckFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/frames/AckFrame.java
@@ -86,7 +86,7 @@ public final class AckFrame extends QuicFrame {
         }
         var ackRanges = new ArrayList<AckRange>(ackRangeCount + 1);
         AckRange first = AckRange.of(0, firstAckRange);
-        ackRanges.add(0, first);
+        ackRanges.addFirst(first);
         for (int i=1; i <= ackRangeCount; i++) {
             long gap = decodeVLField(buffer, "gap");
             long len = decodeVLField(buffer, "range length");
@@ -139,10 +139,10 @@ public final class AckFrame extends QuicFrame {
         super(ACK);
         this.largestAcknowledged = requireVLRange(largestAcknowledged, "largestAcknowledged");
         this.ackDelay = requireVLRange(ackDelay, "ackDelay");
-        if (ackRanges.size() < 1) {
+        if (ackRanges.isEmpty()) {
             throw new IllegalArgumentException("insufficient ackRanges");
         }
-        if (ackRanges.get(0).gap() != 0) {
+        if (ackRanges.getFirst().gap() != 0) {
             throw new IllegalArgumentException("first range must have zero gap");
         }
         this.ackRanges = List.copyOf(ackRanges);
@@ -178,7 +178,7 @@ public final class AckFrame extends QuicFrame {
         encodeVLField(buffer, largestAcknowledged, "largestAcknowledged");
         encodeVLField(buffer, ackDelay, "ackDelay");
         encodeVLField(buffer, ackRangeCount, "ackRangeCount");
-        encodeVLField(buffer, ackRanges.get(0).range(), "firstAckRange");
+        encodeVLField(buffer, ackRanges.getFirst().range(), "firstAckRange");
         for (int i=1; i <= ackRangeCount; i++) {
             AckRange ar = ackRanges.get(i);
             encodeVLField(buffer, ar.gap(), "gap");
@@ -198,7 +198,7 @@ public final class AckFrame extends QuicFrame {
                 + getVLFieldLengthFor(largestAcknowledged)
                 + getVLFieldLengthFor(ackDelay)
                 + getVLFieldLengthFor(ackRangeCount)
-                + getVLFieldLengthFor(ackRanges.get(0).range())
+                + getVLFieldLengthFor(ackRanges.getFirst().range())
                 + ackRanges.stream().skip(1).mapToInt(AckRange::size).sum();
         if (countsPresent) {
             size = size + getVLFieldLengthFor(ect0Count)
@@ -236,7 +236,7 @@ public final class AckFrame extends QuicFrame {
     /**
      * {@return a new {@code AckFrame} identical to this one, but
      * with the given {@code ackDelay}};
-     * @param   ackDelay
+     * @param ackDelay the delay sending the Ack Frame
      */
     public AckFrame withAckDelay(long ackDelay) {
         if (ackDelay == this.ackDelay) return this;
@@ -361,9 +361,9 @@ public final class AckFrame extends QuicFrame {
             return null;
         }
         private final Iterator<AckRange> ackRangeIterator;
-        private volatile long largest;
-        private volatile long smallest;
-        private volatile long pn;  // the current packet number
+        private long largest;
+        private long smallest;
+        private long pn;  // the current packet number
 
         // The stream returns packet number in decreasing order
         // (largest packet number is returned first)
@@ -377,7 +377,7 @@ public final class AckFrame extends QuicFrame {
         @Override
         public boolean tryAdvance(LongConsumer action) {
             // First call will see pn == 0 and smallest >= 2,
-            // which guarantees we will not enter the if below
+            // which guarantees we will not enter the `if` below
             // before pn has been initialized from the
             // first ackRange value
             if (pn >= smallest) {
@@ -687,7 +687,7 @@ public final class AckFrame extends QuicFrame {
                             return this;
                         } else if (packetNumber == smallest - 1) {
                             // Otherwise, if the packet number to be acknowledged is
-                            // just below the smallest packet ackowledged by the current
+                            // just below the smallest packet acknowledged by the current
                             // range, there are again two cases, depending on
                             // whether the next ackRange has a gap that can be reduced,
                             // or not
@@ -855,7 +855,7 @@ public final class AckFrame extends QuicFrame {
         private AckFrameBuilder acknowledgeLargerPacket(long largerThanLargest) {
             var packetNumber = largerThanLargest;
             // the new packet is larger than the largest acknowledged
-            var firstAckRange = ackRanges.get(0);
+            var firstAckRange = ackRanges.getFirst();
             if (largestAcknowledged == packetNumber -1) {
                 // if packetNumber is largestAcknowledged + 1, we can simply
                 // extend the first ack range by 1
@@ -864,7 +864,7 @@ public final class AckFrame extends QuicFrame {
             } else {
                 // otherwise - we have a gap - we need to acknowledge the new packetNumber,
                 // and then add the gap that separate it from the previous largestAcknowledged...
-                ackRanges.add(0, AckRange.INITIAL); // acknowledge packetNumber only
+                ackRanges.addFirst(AckRange.INITIAL); // acknowledge packetNumber only
                 long gap = packetNumber - largestAcknowledged -2;
                 var secondAckRange = AckRange.of(gap, firstAckRange.range);
                 ackRanges.set(1, secondAckRange); // add the gap

From df35412db1d7e883148590e24d968cfe2f5c6bbc Mon Sep 17 00:00:00 2001
From: Zihao Lin <linzihao1999@outlook.com>
Date: Mon, 17 Nov 2025 11:49:01 +0000
Subject: [PATCH 201/512] 8368961: Remove redundant checks in ciField.cpp

Reviewed-by: bmaillard, aseoane, thartmann
---
 src/hotspot/share/ci/ciField.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/hotspot/share/ci/ciField.cpp b/src/hotspot/share/ci/ciField.cpp
index d47c4c508d7..8f33c17d0e6 100644
--- a/src/hotspot/share/ci/ciField.cpp
+++ b/src/hotspot/share/ci/ciField.cpp
@@ -216,9 +216,6 @@ ciField::ciField(fieldDescriptor *fd) :
 static bool trust_final_non_static_fields(ciInstanceKlass* holder) {
   if (holder == nullptr)
     return false;
-  if (holder->name() == ciSymbols::java_lang_System())
-    // Never trust strangely unstable finals:  System.out, etc.
-    return false;
   // Even if general trusting is disabled, trust system-built closures in these packages.
   if (holder->is_in_package("java/lang/invoke") || holder->is_in_package("sun/invoke") ||
       holder->is_in_package("java/lang/reflect") || holder->is_in_package("jdk/internal/reflect") ||
@@ -230,15 +227,9 @@ static bool trust_final_non_static_fields(ciInstanceKlass* holder) {
   // can't be serialized, so there is no hacking of finals going on with them.
   if (holder->is_hidden())
     return true;
-  // Trust final fields in all boxed classes
-  if (holder->is_box_klass())
-    return true;
   // Trust final fields in records
   if (holder->is_record())
     return true;
-  // Trust final fields in String
-  if (holder->name() == ciSymbols::java_lang_String())
-    return true;
   // Trust Atomic*FieldUpdaters: they are very important for performance, and make up one
   // more reason not to use Unsafe, if their final fields are trusted. See more in JDK-8140483.
   if (holder->name() == ciSymbols::java_util_concurrent_atomic_AtomicIntegerFieldUpdater_Impl() ||

From cebb03ef24fad8705156f12cecd2da6351cd1ef6 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Mon, 17 Nov 2025 12:13:39 +0000
Subject: [PATCH 202/512] 8371349: Update NSS library to 3.117

Reviewed-by: weijun, myankelevich, hchao
---
 test/jdk/sun/security/pkcs11/PKCS11Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index 98343d9b7e6..0e8d2d61d53 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -80,7 +80,7 @@ public abstract class PKCS11Test {
 
     // Version of the NSS artifact. This coincides with the version of
     // the NSS version
-    private static final String NSS_BUNDLE_VERSION = "3.111";
+    private static final String NSS_BUNDLE_VERSION = "3.117";
     private static final String NSSLIB = "jpg.tests.jdk.nsslib";
 
     static Version nss_version = null;

From 8301d9917ec9fed40e3af77998f88165e0837daf Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 17 Nov 2025 12:28:39 +0000
Subject: [PATCH 203/512] 8371825: G1: Use more precise filler API in
 fill_range_with_dead_objects

Reviewed-by: shade, tschatzl
---
 src/hotspot/share/gc/g1/g1HeapRegion.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index 63d64503316..b1eeb333d8d 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -787,23 +787,13 @@ void G1HeapRegion::fill_range_with_dead_objects(HeapWord* start, HeapWord* end)
   // possible that there is a pinned object that is not any more referenced by
   // Java code (only by native).
   //
-  // In this case we must not zap contents of such an array but we can overwrite
-  // the header; since only pinned typearrays are allowed, this fits nicely with
-  // putting filler arrays into the dead range as the object header sizes match and
-  // no user data is overwritten.
+  // In this case we should not zap, because that would overwrite
+  // user-observable data. Memory corresponding to obj-header is safe to
+  // change, since it's not directly user-observable.
   //
   // In particular String Deduplication might change the reference to the character
   // array of the j.l.String after native code obtained a raw reference to it (via
   // GetStringCritical()).
-  CollectedHeap::fill_with_objects(start, range_size, !has_pinned_objects());
-  HeapWord* current = start;
-  do {
-    // Update the BOT if the a threshold is crossed.
-    size_t obj_size = cast_to_oop(current)->size();
-    update_bot_for_block(current, current + obj_size);
-
-    // Advance to the next object.
-    current += obj_size;
-    guarantee(current <= end, "Should never go past end");
-  } while (current != end);
+  CollectedHeap::fill_with_object(start, range_size, !has_pinned_objects());
+  update_bot_for_block(start, start + range_size);
 }

From 960987e8c1428ce1d89ee13e007e06206fe6885c Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Mon, 17 Nov 2025 13:40:36 +0000
Subject: [PATCH 204/512] 8371991: Build failure in docs for MemoryMXBean

Reviewed-by: alanb
---
 .../share/classes/java/lang/management/MemoryMXBean.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
index 1211d8d1c4d..247868d3d99 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
@@ -280,7 +280,7 @@ public interface MemoryMXBean extends PlatformManagedObject {
      * available.
      *
      * @apiNote
-     * May be used in conjunction with {@link jdk.management/com.sun.management.OperatingSystemMXBean#getProcessCpuTime()}
+     * May be used in conjunction with {@code jdk.management/com.sun.management.OperatingSystemMXBean#getProcessCpuTime()}
      * for calculating the GC's usage of CPU time as a whole.
      *
      * @implNote The specifics on what constitutes the time spent
@@ -299,7 +299,6 @@ public interface MemoryMXBean extends PlatformManagedObject {
      *
      * @since 26
      */
-    @SuppressWarnings("doclint:reference")
     default public long getTotalGcCpuTime() {
         return -1;
     }

From 44087ea5d697deb3a7dd0e3c82f898dd9df1bfa3 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 17 Nov 2025 13:48:52 +0000
Subject: [PATCH 205/512] 8371682: Suppress javac warning from
 ThreadPoolExecutorSubclassTest.java

Reviewed-by: jpai
---
 .../java/util/concurrent/tck/ExecutorsTest.java   |  1 -
 .../java/util/concurrent/tck/JSR166TestCase.java  |  1 -
 .../tck/ThreadPoolExecutorSubclassTest.java       | 15 ---------------
 3 files changed, 17 deletions(-)

diff --git a/test/jdk/java/util/concurrent/tck/ExecutorsTest.java b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
index b4b4324ae5c..91dfd3cce1c 100644
--- a/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
+++ b/test/jdk/java/util/concurrent/tck/ExecutorsTest.java
@@ -329,7 +329,6 @@ public class ExecutorsTest extends JSR166TestCase {
      * ThreadPoolExecutor using defaultThreadFactory has
      * specified group, priority, daemon status, and name
      */
-    @SuppressWarnings("removal")
     public void testDefaultThreadFactory() throws Exception {
         final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
         final CountDownLatch done = new CountDownLatch(1);
diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index 80e6c98bfa7..f1f32bee310 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -1169,7 +1169,6 @@ public class JSR166TestCase extends TestCase {
      * A debugging tool to print stack traces of most threads, as jstack does.
      * Uninteresting threads are filtered out.
      */
-    @SuppressWarnings("removal")
     static void dumpTestThreads() {
         System.err.println("------ stacktrace dump start ------");
         for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
diff --git a/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java
index dec00360f60..5f117fd5e85 100644
--- a/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java
+++ b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java
@@ -1997,20 +1997,5 @@ public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
             }
         }
     }
-    @SuppressWarnings("deprecation")
-    public void testFinalizeMethodCallsSuperFinalize() {
-        new CustomTPE(1, 1,
-                      LONG_DELAY_MS, MILLISECONDS,
-                      new LinkedBlockingQueue<Runnable>()) {
-
-            /**
-             * A finalize method without "throws Throwable", that
-             * calls super.finalize().
-             */
-            protected void finalize() {
-                super.finalize();
-            }
-        }.shutdown();
-    }
 
 }

From 6385c663dc6ce892c23bc9208e1ffe24fa78ccd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20H=C3=BCbner?= <phubner@openjdk.org>
Date: Mon, 17 Nov 2025 14:06:41 +0000
Subject: [PATCH 206/512] 8371607: Remove GCSharedStringsDuringDumpWb.java
 after JDK-8362561

Reviewed-by: ayang, jsikstro
---
 .../javaldr/GCSharedStringsDuringDumpWb.java  | 45 -------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java
deleted file mode 100644
index f00fd3fa4a5..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-import jdk.test.whitebox.WhiteBox;
-
-public class GCSharedStringsDuringDumpWb {
-    public static void main(String[] args) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        String s = "shared_test_string_unique_14325";
-        s = s.intern();
-        CheckString(wb, s);
-        for (int i=0; i<100000; i++) {
-            s = "generated_string " + i;
-            s = s.intern();
-            CheckString(wb, s);
-        }
-    }
-
-    public static void CheckString(WhiteBox wb, String s) {
-        if (wb.areSharedStringsMapped() && !wb.isSharedInternedString(s)) {
-            throw new RuntimeException("String is not shared.");
-        }
-    }
-}

From 52ffe8a09637701cf93d3425b69089ced5ad4dcb Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Mon, 17 Nov 2025 14:59:30 +0000
Subject: [PATCH 207/512] 8371156: PBKDF2 default values should not be DER
 encoded

Reviewed-by: weijun
---
 .../classes/sun/security/util/PBKDF2Parameters.java  |  6 ++++--
 test/jdk/sun/security/pkcs12/ImportPassKeyAlg.java   | 12 ++++++++----
 test/jdk/sun/security/pkcs12/PBMAC1Test.java         | 10 ++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/util/PBKDF2Parameters.java b/src/java.base/share/classes/sun/security/util/PBKDF2Parameters.java
index 07d4c70fecb..ba6636d7922 100644
--- a/src/java.base/share/classes/sun/security/util/PBKDF2Parameters.java
+++ b/src/java.base/share/classes/sun/security/util/PBKDF2Parameters.java
@@ -27,7 +27,6 @@ package sun.security.util;
 
 import java.io.IOException;
 
-import sun.security.util.KnownOIDs;
 import sun.security.x509.AlgorithmId;
 
 /**
@@ -164,7 +163,10 @@ public final class PBKDF2Parameters {
         tmp0.putInteger(keyLength);
 
         // prf AlgorithmIdentifier {{PBKDF2-PRFs}}
-        tmp0.write(new AlgorithmId(prf));
+        // HmacSHA1 is the default and must not be encoded.
+        if (!prf.equals(ObjectIdentifier.of(KnownOIDs.HmacSHA1))) {
+            tmp0.write(new AlgorithmId(prf));
+        }
 
         // id-PBKDF2 OBJECT IDENTIFIER ::= {pkcs-5 12}
         out.putOID(ObjectIdentifier.of(KnownOIDs.PBKDF2));
diff --git a/test/jdk/sun/security/pkcs12/ImportPassKeyAlg.java b/test/jdk/sun/security/pkcs12/ImportPassKeyAlg.java
index ba98c3ce2de..bf767a6344d 100644
--- a/test/jdk/sun/security/pkcs12/ImportPassKeyAlg.java
+++ b/test/jdk/sun/security/pkcs12/ImportPassKeyAlg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8286069
+ * @bug 8286069 8371156
  * @summary keytool prints out wrong key algorithm for -importpass command
  * @library /test/lib
  * @modules java.base/sun.security.util
@@ -92,7 +92,7 @@ public class ImportPassKeyAlg {
         // 0034:0004  [1011]                 INTEGER 10000
         // 0038:0003  [1012]                 INTEGER 16
         // 003B:000E  [1013]                 SEQUENCE
-        // 003D:000A  [10130]                     OID 1.2.840.113549.2.7 (HmacSHA1)
+        // 003D:000A  [10130]                     OID 1.2.840.113549.2.9 (HmacSHA256)
         // 0047:0002  [10131]                     NULL
         // 0049:001F  [11]         SEQUENCE
         // 004B:000B  [110]             OID 2.16.840.1.101.3.4.1.2 (AES_128/CBC/NoPadding)
@@ -100,7 +100,11 @@ public class ImportPassKeyAlg {
         var data = Files.readAllBytes(Path.of(name));
         DerUtils.checkAlg(data, "110c010c01010c00", oids[0]);
         if (oids[0] == KnownOIDs.PBES2) {
-            DerUtils.checkAlg(data, "110c010c01010c010130", oids[1]);
+            if (oids[1] == KnownOIDs.HmacSHA1) {
+                DerUtils.shouldNotExist(data, "110c010c01010c010130");
+            } else {
+                DerUtils.checkAlg(data, "110c010c01010c010130", oids[1]);
+            }
             DerUtils.checkAlg(data, "110c010c01010c0110", oids[2]);
         }
     }
diff --git a/test/jdk/sun/security/pkcs12/PBMAC1Test.java b/test/jdk/sun/security/pkcs12/PBMAC1Test.java
index acb0f73a2d2..4e89322bc0a 100644
--- a/test/jdk/sun/security/pkcs12/PBMAC1Test.java
+++ b/test/jdk/sun/security/pkcs12/PBMAC1Test.java
@@ -116,6 +116,16 @@ public class PBMAC1Test {
         var reason = Asserts.assertThrows(NoSuchAlgorithmException.class,
                 () -> emptyP12()).getMessage();
         Asserts.assertTrue(reason.contains("Algorithm hmacsha456 not available"), reason);
+
+        // Verify that DEFAULT HmacSHA1 prf does not get encoded.
+        System.setProperty("keystore.pkcs12.macAlgorithm", "PBEWITHHMACSHA1");
+        der = emptyP12();
+        DerUtils.checkAlg(der, "2000", KnownOIDs.PBMAC1);
+        DerUtils.checkAlg(der, "200100", KnownOIDs.PBKDF2);
+        DerUtils.shouldNotExist(der, "20010130");
+        DerUtils.checkAlg(der, "200110", KnownOIDs.HmacSHA1);
+        DerUtils.checkInt(der, "2001011", 10000);
+        DerUtils.checkInt(der, "2001012", 20);
     }
 
     static void migrate() throws Exception {

From 9ec773ad27773f5813c79ae33ac1d2393c2e0cc8 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 17 Nov 2025 16:48:40 +0000
Subject: [PATCH 208/512] 8371689: (fs) CopyMoveHelper.copyToForeignTarget use
 of sourcePosixView is confusing

Reviewed-by: alanb
---
 .../classes/java/nio/file/CopyMoveHelper.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java b/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
index 357e200e930..4e5bd7ebba1 100644
--- a/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
+++ b/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,21 +109,21 @@ class CopyMoveHelper {
         LinkOption[] linkOptions = (opts.followLinks) ? new LinkOption[0] :
             new LinkOption[] { LinkOption.NOFOLLOW_LINKS };
 
-        // retrieve source posix view, null if unsupported
-        final PosixFileAttributeView sourcePosixView =
-            Files.getFileAttributeView(source, PosixFileAttributeView.class);
+        // determine whether the source supports posix attributes
+        boolean sourceSupportsPosixAttributes = Files.getFileAttributeView
+            (source, PosixFileAttributeView.class) != null;
 
         // attributes of source file
         BasicFileAttributes sourceAttrs = null;
-        if (sourcePosixView != null) {
+        if (sourceSupportsPosixAttributes)
             sourceAttrs = Files.readAttributes(source,
                                                PosixFileAttributes.class,
                                                linkOptions);
-        }
-        if (sourceAttrs == null)
+        else
             sourceAttrs = Files.readAttributes(source,
                                                BasicFileAttributes.class,
                                                linkOptions);
+
         assert sourceAttrs != null;
 
         if (sourceAttrs.isSymbolicLink())
@@ -151,7 +151,7 @@ class CopyMoveHelper {
         // copy basic and, if supported, POSIX attributes to target
         if (opts.copyAttributes) {
             BasicFileAttributeView targetView = null;
-            if (sourcePosixView != null) {
+            if (sourceSupportsPosixAttributes) {
                 targetView = Files.getFileAttributeView(target,
                                                      PosixFileAttributeView.class);
             }

From 6c09529cd637a34c1ffc42a5feb71e8646be4237 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 17 Nov 2025 20:53:10 +0000
Subject: [PATCH 209/512] 8369188: Update link-time check for HotSpot uses of
 allocation and deallocation functions

Reviewed-by: jwaters, erikj
---
 make/hotspot/lib/CompileJvm.gmk | 38 ++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index fd574b9e42d..a8b90c92e4d 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -337,6 +337,30 @@ TARGETS += $(BUILD_LIBJVM)
 # for the associated class.  If the class doesn't provide a more specific
 # declaration (either directly or by inheriting from a class that provides
 # one) then the global definition will be used, triggering this check.
+#
+
+# The HotSpot wrapper for <new> declares as deprecated all the allocation and
+# deallocation functions that use the global allocator. But that blocking
+# isn't a bullet-proof. Some of these functions are implicitly available in
+# every translation unit, without the need to include <new>. So even with that
+# wrapper we still need this link-time check. The implicitly declared
+# functions and their mangled names are - from C++17 6.7.4:
+#
+# void* operator new(size_t)               // _Znwm
+# void* operator new(size_t, align_val_t)  // _ZnwmSt11align_val_t
+#
+# void operator delete(void*) noexcept                      // _ZdlPv
+# void operator delete(void*, size_t) noexcept              // _ZdlPvm
+# void operator delete(void*, align_val_t) noexcept         // _ZdlPvSt11align_val_t
+# void operator delete(void*, size_t, align_val_t) noexcept // _ZdlPvmSt11align_val_t
+#
+# void* operator new[](size_t)               // _Znam
+# void* operator new[](size_t, align_val_t)  // _ZnamSt11align_val_t
+#
+# void operator delete[](void*) noexcept                      // _ZdaPv
+# void operator delete[](void*, size_t) noexcept              // _ZdaPvm
+# void operator delete[](void*, align_val_t) noexcept         // _ZdaPvSt11align_val_t
+# void operator delete[](void*, size_t, align_val_t) noexcept // _ZdaPvmSt11align_val_t
 
 ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
   ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
@@ -347,10 +371,18 @@ ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
     # so use mangled names when looking for symbols.
     # Save the demangling for when something is actually found.
     MANGLED_SYMS := \
-        _ZdaPv \
-        _ZdlPv \
-        _Znam \
         _Znwm \
+        _ZnwmSt11align_val_t \
+        _ZdlPv \
+        _ZdlPvm \
+        _ZdlPvSt11align_val_t \
+        _ZdlPvmSt11align_val_t \
+        _Znam \
+        _ZnamSt11align_val_t \
+        _ZdaPv \
+        _ZdaPvm \
+        _ZdaPvSt11align_val_t \
+        _ZdaPvmSt11align_val_t \
         #
     UNDEF_PATTERN := ' U '
 

From e5f63326100384d2c2be8c916423e1f120b595d3 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Mon, 17 Nov 2025 21:00:22 +0000
Subject: [PATCH 210/512] 8371650: Add CMakeLists.txt and compile_commands.json
 into .gitignore

Reviewed-by: erikj
---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 852b692f99b..0743489f8ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,8 @@ NashornProfile.txt
 *.rej
 *.orig
 test/benchmarks/**/target
+/src/hotspot/CMakeLists.txt
+/src/hotspot/compile_commands.json
+/src/hotspot/cmake-build-debug/
+/src/hotspot/.cache/
+/src/hotspot/.idea/

From e067038796e2798132e07aa47b695f3c21b87e79 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Mon, 17 Nov 2025 21:21:03 +0000
Subject: [PATCH 211/512] 8150564: Migrate useful ExtendedRobot methods into
 awt.Robot

Reviewed-by: kizune, prr, liach
---
 .../share/classes/java/awt/Robot.java         | 227 ++++++++++++++++++
 1 file changed, 227 insertions(+)

diff --git a/src/java.desktop/share/classes/java/awt/Robot.java b/src/java.desktop/share/classes/java/awt/Robot.java
index e91cc582c4c..d887cad4f77 100644
--- a/src/java.desktop/share/classes/java/awt/Robot.java
+++ b/src/java.desktop/share/classes/java/awt/Robot.java
@@ -126,6 +126,20 @@ public class Robot {
 
     private DirectColorModel screenCapCM = null;
 
+    /**
+     * Default delay in milliseconds for mouse
+     * {@link #glide(int, int, int, int) glide},
+     * {@link #type(int) type}, and
+     * {@link #click(int) click}.
+     */
+    public static final int DEFAULT_DELAY = 20;
+
+    /**
+     * Default pixel step-length for mouse
+     * {@link #glide(int, int, int, int) glide}.
+     */
+    public static final int DEFAULT_STEP_LENGTH = 2;
+
     /**
      * Constructs a Robot object in the coordinate system of the primary screen.
      *
@@ -773,4 +787,217 @@ public class Robot {
         String params = "autoDelay = "+getAutoDelay()+", "+"autoWaitForIdle = "+isAutoWaitForIdle();
         return getClass().getName() + "[ " + params + " ]";
     }
+
+    /**
+     * A convenience method that simulates clicking a mouse button by calling {@code mousePress},
+     * {@code mouseRelease} and {@code waitForIdle}. Invokes {@code waitForIdle} with a default
+     * delay of {@value #DEFAULT_DELAY} milliseconds after {@code mousePress} and {@code mouseRelease}
+     * calls. For specifics on valid inputs see {@link java.awt.Robot#mousePress(int)}.
+     *
+     * @param   buttons The button mask; a combination of one or more mouse button masks.
+     * @throws  IllegalArgumentException if the {@code buttons} mask contains the mask for
+     *          extra mouse button and support for extended mouse buttons is
+     *          {@linkplain Toolkit#areExtraMouseButtonsEnabled() disabled} by Java
+     * @throws  IllegalArgumentException if the {@code buttons} mask contains the mask for
+     *          extra mouse button that does not exist on the mouse and support for extended
+     *          mouse buttons is {@linkplain Toolkit#areExtraMouseButtonsEnabled() enabled}
+     *          by Java
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching thread
+     * @see     #DEFAULT_DELAY
+     * @see     #mousePress(int)
+     * @see     #mouseRelease(int)
+     * @see     InputEvent#getMaskForButton(int)
+     * @see     Toolkit#areExtraMouseButtonsEnabled()
+     * @see     java.awt.event.MouseEvent
+     * @since   26
+     */
+    public void click(int buttons) {
+        try {
+            mousePress(buttons);
+            waitForIdle(DEFAULT_DELAY);
+        } finally {
+            mouseRelease(buttons);
+            waitForIdle(DEFAULT_DELAY);
+        }
+    }
+
+    /**
+     * A convenience method that clicks mouse button 1.
+     *
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching thread
+     * @see     #click(int)
+     * @since   26
+     */
+    public void click() {
+        click(InputEvent.BUTTON1_DOWN_MASK);
+    }
+
+    /**
+     * A convenience method that calls {@code waitForIdle} then waits an additional specified
+     * {@code delayValue} time in milliseconds.
+     *
+     * @param   delayValue  Additional delay length in milliseconds to wait until thread
+     *                      sync been completed
+     * @throws  IllegalThreadStateException if called on the AWT event
+     *          dispatching thread
+     * @throws  IllegalArgumentException if {@code delayValue} is not between {@code 0}
+     *          and {@code 60,000} milliseconds inclusive
+     * @since   26
+     */
+    public void waitForIdle(int delayValue) {
+        waitForIdle();
+        delay(delayValue);
+    }
+
+    /**
+     * A convenience method that moves the mouse in multiple
+     * steps from its current location to the destination coordinates.
+     *
+     * @implSpec Invokes {@link #mouseMove(int, int) mouseMove} with a step-length
+     * of {@value #DEFAULT_STEP_LENGTH} and a step-delay of {@value #DEFAULT_DELAY}.
+     *
+     * @param   x   Destination point x coordinate
+     * @param   y   Destination point y coordinate
+     *
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching
+     *          thread and {@code isAutoWaitForIdle} would return true
+     * @see     #DEFAULT_STEP_LENGTH
+     * @see     #DEFAULT_DELAY
+     * @see     #glide(int, int, int, int, int, int)
+     * @since   26
+     */
+    public void glide(int x, int y) {
+        Point p = MouseInfo.getPointerInfo().getLocation();
+        glide(p.x, p.y, x, y);
+    }
+
+    /**
+     * A convenience method that moves the mouse in multiple steps
+     * from source coordinates to the destination coordinates.
+     *
+     * @implSpec Invokes {@link #mouseMove(int, int) mouseMove} with a step-length
+     * of {@value #DEFAULT_STEP_LENGTH} and a step-delay of {@value #DEFAULT_DELAY}.
+     *
+     * @param   srcX   Source point x coordinate
+     * @param   srcY   Source point y coordinate
+     * @param   dstX   Destination point x coordinate
+     * @param   dstY   Destination point y coordinate
+     *
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching
+     *          thread and {@code isAutoWaitForIdle} would return true
+     * @see     #DEFAULT_STEP_LENGTH
+     * @see     #DEFAULT_DELAY
+     * @see     #glide(int, int, int, int, int, int)
+     * @since   26
+     */
+    public void glide(int srcX, int srcY, int dstX, int dstY) {
+        glide(srcX, srcY, dstX, dstY, DEFAULT_STEP_LENGTH, DEFAULT_DELAY);
+    }
+
+    /**
+     * A convenience method that moves the mouse in multiple
+     * steps from source point to the destination point with a
+     * given {@code stepLength} and {@code stepDelay}.
+     *
+     * @param   srcX        Source point x coordinate
+     * @param   srcY        Source point y coordinate
+     * @param   destX       Destination point x coordinate
+     * @param   destY       Destination point y coordinate
+     * @param   stepLength  Preferred length of one step in pixels
+     * @param   stepDelay   Delay between steps in milliseconds
+     *
+     * @throws  IllegalArgumentException if {@code stepLength} is not greater than zero
+     * @throws  IllegalArgumentException if {@code stepDelay} is not between {@code 0}
+     *          and {@code 60,000} milliseconds inclusive
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching
+     *          thread and {@code isAutoWaitForIdle} would return true
+     * @see     #mouseMove(int, int)
+     * @see     #delay(int)
+     * @since   26
+     */
+    public void glide(int srcX, int srcY, int destX, int destY, int stepLength, int stepDelay) {
+        if (stepLength <= 0) {
+            throw new IllegalArgumentException("Step length must be greater than zero");
+        }
+        if (stepDelay <= 0 || stepDelay > 60000) {
+            throw new IllegalArgumentException("Step delay must be between 0 and 60,000 milliseconds");
+        }
+
+        int stepNum;
+        double tDx, tDy;
+        double dx, dy, ds;
+        double x, y;
+
+        dx = (destX - srcX);
+        dy = (destY - srcY);
+        ds = Math.sqrt(dx*dx + dy*dy);
+
+        tDx = dx / ds * stepLength;
+        tDy = dy / ds * stepLength;
+
+        int stepsCount = (int) ds / stepLength;
+
+        // Walk the mouse to the destination one step at a time
+        mouseMove(srcX, srcY);
+
+        for (x = srcX, y = srcY, stepNum = 0;
+             stepNum < stepsCount;
+             stepNum++) {
+            x += tDx;
+            y += tDy;
+            mouseMove((int)x, (int)y);
+            delay(stepDelay);
+        }
+
+        // Ensure the mouse moves to the right destination.
+        // The steps may have led the mouse to a slightly wrong place.
+        if (x != destX || y != destY) {
+            mouseMove(destX, destY);
+        }
+    }
+
+    /**
+     * A convenience method that simulates typing a key by calling {@code keyPress}
+     * and {@code keyRelease}. Invokes {@code waitForIdle} with a delay of {@value #DEFAULT_DELAY}
+     * milliseconds after {@code keyPress} and {@code keyRelease} calls.
+     * <p>
+     * Key codes that have more than one physical key associated with them
+     * (e.g. {@code KeyEvent.VK_SHIFT} could mean either the
+     * left or right shift key) will map to the left key.
+     *
+     * @param   keycode Key to type (e.g. {@code KeyEvent.VK_A})
+     * @throws  IllegalArgumentException if {@code keycode} is not
+     *          a valid key
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching thread
+     * @see     #DEFAULT_DELAY
+     * @see     #keyPress(int)
+     * @see     #keyRelease(int)
+     * @see     java.awt.event.KeyEvent
+     * @since   26
+     */
+    public synchronized void type(int keycode) {
+        keyPress(keycode);
+        waitForIdle(DEFAULT_DELAY);
+        keyRelease(keycode);
+        waitForIdle(DEFAULT_DELAY);
+    }
+
+    /**
+     * A convenience method that simulates typing a char by calling {@code keyPress}
+     * and {@code keyRelease}. Gets the ExtendedKeyCode for the char and calls
+     * {@code type(int keycode)}.
+     *
+     * @param   c   Character to be typed (e.g. {@code 'a'})
+     * @throws  IllegalArgumentException if {@code keycode} is not
+     *          a valid key
+     * @throws  IllegalThreadStateException if called on the AWT event dispatching thread
+     * @see     #type(int)
+     * @see     #keyPress(int)
+     * @see     #keyRelease(int)
+     * @see     java.awt.event.KeyEvent
+     * @since   26
+     */
+    public synchronized void type(char c) {
+        type(KeyEvent.getExtendedKeyCodeForChar(c));
+    }
 }

From 696821670e11fee003906806f081038032ac4985 Mon Sep 17 00:00:00 2001
From: Ramkumar Sunderbabu <rsunderbabu@openjdk.org>
Date: Tue, 18 Nov 2025 00:59:14 +0000
Subject: [PATCH 212/512] 8293484: AArch64:
 TestUseSHA512IntrinsicsOptionOnSupportedCPU.java fails on CPU with SHA512
 feature support

Reviewed-by: haosun, aph
---
 .../jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java  | 4 ++--
 .../sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java
index 2d4d4353868..22b3bba854c 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@ public class DigestOptionsBase extends CommandLineOptionTest {
             case DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION:
                 return IntrinsicPredicates.SHA256_INSTRUCTION_AVAILABLE;
             case DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION:
-                return IntrinsicPredicates.SHA512_INSTRUCTION_AVAILABLE;
+                return IntrinsicPredicates.isSHA512IntrinsicAvailable();
             case DigestOptionsBase.USE_SHA3_INTRINSICS_OPTION:
                 return IntrinsicPredicates.SHA3_INSTRUCTION_AVAILABLE;
             default:
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
index e349c22e383..7913a25d939 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA512Intrinsics option processing on supported CPU.
- * @requires os.arch!="x86" & os.arch!="i386"
  * @library /test/lib /
  * @requires vm.flagless
  *

From 46b5e588ab18a68d164b1d97e71d769585c7c4b8 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 18 Nov 2025 03:18:36 +0000
Subject: [PATCH 213/512] 8371697: test/jdk/java/nio/file/FileStore/Basic.java
 fails after 8360887 on linux

Reviewed-by: alanb
---
 test/jdk/java/nio/file/FileStore/Basic.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/jdk/java/nio/file/FileStore/Basic.java b/test/jdk/java/nio/file/FileStore/Basic.java
index 0a7b3d5e2f6..052348c1f02 100644
--- a/test/jdk/java/nio/file/FileStore/Basic.java
+++ b/test/jdk/java/nio/file/FileStore/Basic.java
@@ -38,6 +38,7 @@ import java.io.IOException;
 
 import jdk.test.lib.Platform;
 import jdk.test.lib.util.FileUtils;
+import static jdk.test.lib.Asserts.*;
 
 public class Basic {
 
@@ -52,11 +53,6 @@ public class Basic {
         }
     }
 
-    static void assertTrue(boolean okay) {
-        if (!okay)
-            throw new RuntimeException("Assertion failed");
-    }
-
     static void checkWithin1GB(String space, long expected, long actual) {
         long diff = Math.abs(actual - expected);
         if (diff > G) {
@@ -73,8 +69,11 @@ public class Basic {
         FileStore store = Files.getFileStore(file);
         boolean supported = store.supportsFileAttributeView(viewClass);
         assertTrue(store.supportsFileAttributeView(viewName) == supported);
-        boolean haveView = Files.getFileAttributeView(file, viewClass) != null;
-        assertTrue(haveView == supported);
+        // If the file attribute view is supported by the FileStore then
+        // Files.getFileAttributeView should return that view
+        if (supported) {
+            assertNotNull(Files.getFileAttributeView(file, viewClass));
+        }
     }
 
     static void doTests(Path dir) throws IOException {

From 695a4abd5f7e9edcea9f1a724a9ceb87340a8f25 Mon Sep 17 00:00:00 2001
From: Anjian Wen <wenanjian@openjdk.org>
Date: Tue, 18 Nov 2025 03:37:11 +0000
Subject: [PATCH 214/512] 8371966: RISC-V: Incorrect pointer dereference in
 TemplateInterpreterGenerator::generate_native_entry

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 692335d8c08..f073909bf5d 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1146,9 +1146,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     Label L;
     __ ld(x28, Address(xmethod, Method::native_function_offset()));
     ExternalAddress unsatisfied(SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
-    __ la(t, unsatisfied);
-    __ load_long_misaligned(t1, Address(t, 0), t0, 2); // 2 bytes aligned, but not 4 or 8
-
+    __ la(t1, unsatisfied);
     __ bne(x28, t1, L);
     __ call_VM(noreg,
                CAST_FROM_FN_PTR(address,

From 16557739791ada59dc1991f65a0218434df01f9e Mon Sep 17 00:00:00 2001
From: Vishal Chand <vishalvc@amazon.com>
Date: Tue, 18 Nov 2025 06:49:03 +0000
Subject: [PATCH 215/512] 8371881: C2: Fix potential SEGV in
 VTransformReductionVectorNode tracing

Reviewed-by: shade, epeter
---
 src/hotspot/share/opto/vtransform.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
index e775eb60cab..b437d2e6eac 100644
--- a/src/hotspot/share/opto/vtransform.cpp
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -1252,7 +1252,6 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   // back to the phi. Check that all non strict order reductions only have a single
   // use, except for the last (last_red), which only has phi as a use in the loop,
   // and all other uses are outside the loop.
-  VTransformReductionVectorNode* first_red   = this;
   VTransformReductionVectorNode* last_red    = phi->in_req(2)->isa_ReductionVector();
   VTransformReductionVectorNode* current_red = last_red;
   while (true) {
@@ -1264,7 +1263,11 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
         tty->print("  Cannot move out of loop, other reduction node does not match:");
         print();
         tty->print("  other: ");
-        current_red->print();
+        if (current_red != nullptr) {
+          current_red->print();
+        } else {
+          tty->print("nullptr");
+        }
       )
       return false; // not compatible
     }

From 8cdfec8d1cdc7e3137035cebe1cc189e36c0e319 Mon Sep 17 00:00:00 2001
From: Nityanand Rai <163765635+nityarai08@users.noreply.github.com>
Date: Tue, 18 Nov 2025 06:49:28 +0000
Subject: [PATCH 216/512] 8371852: Shenandoah: Unused
 ShenandoahFreeSet::_allocated_since_gc_start field

Reviewed-by: shade, fandreuzzi
---
 src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 5cc9eab7b4b..a9c5ebe49de 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -106,9 +106,6 @@ private:
   size_t _used[UIntNumPartitions];
   size_t _available[UIntNumPartitions];
 
-  // Measured in bytes.
-  size_t _allocated_since_gc_start[UIntNumPartitions];
-
   // Some notes:
   //  total_region_counts[p] is _capacity[p] / region_size_bytes
   //  retired_regions[p] is total_region_counts[p] - _region_counts[p]

From 26460b6f12ce0763b79acfd98fca260b509a82c5 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 18 Nov 2025 08:06:18 +0000
Subject: [PATCH 217/512] 8353835: Implement JEP 500: Prepare to Make Final
 Mean Final

Reviewed-by: liach, vlivanov, dholmes, vyazici
---
 make/test/JtregNativeJdk.gmk                  |   1 +
 src/hotspot/share/ci/ciField.cpp              |  12 +-
 src/hotspot/share/prims/jni.cpp               |  30 +
 src/hotspot/share/prims/jniCheck.cpp          |  31 +-
 src/hotspot/share/runtime/arguments.cpp       |  22 +-
 src/hotspot/share/runtime/fieldDescriptor.cpp |  10 +
 src/hotspot/share/runtime/fieldDescriptor.hpp |   4 +-
 .../share/classes/java/lang/Module.java       | 161 ++++-
 .../share/classes/java/lang/ModuleLayer.java  |  14 +-
 .../share/classes/java/lang/System.java       |  21 +-
 .../java/lang/invoke/MethodHandles.java       |  10 +-
 .../java/lang/reflect/AccessibleObject.java   |  14 +-
 .../classes/java/lang/reflect/Field.java      | 412 ++++++++++++-
 .../java/lang/reflect/ReflectAccess.java      |   7 +-
 .../reflect/doc-files/MutationMethods.html    |  69 +++
 .../jdk/internal/access/JavaLangAccess.java   |  36 +-
 .../access/JavaLangReflectAccess.java         |   8 +-
 .../event/FinalFieldMutationEvent.java        |  47 ++
 .../jdk/internal/module/ModuleBootstrap.java  |  96 ++-
 .../classes/jdk/internal/module/Modules.java  |  41 +-
 .../classes/sun/launcher/LauncherHelper.java  |  13 +
 .../launcher/resources/launcher.properties    |  10 +
 src/java.base/share/man/java.md               |  38 +-
 .../jfr/events/FinalFieldMutationEvent.java   |  55 ++
 .../classes/jdk/jfr/internal/JDKEvents.java   |   1 +
 .../jdk/jfr/internal/MirrorEvents.java        |   4 +-
 .../jdk/jfr/internal/PlatformEventType.java   |   1 +
 src/jdk.jfr/share/conf/jfr/default.jfc        |   5 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |   5 +
 .../jni/mutateFinals/MutateFinals.java        | 356 +++++++++++
 .../jni/mutateFinals/MutateFinalsTest.java    | 170 ++++++
 .../jni/mutateFinals/libMutateFinals.c        | 160 +++++
 .../lang/invoke/MethodHandlesGeneralTest.java |   3 +-
 .../TestFieldLookupAccessibility.java         |  28 +-
 .../lang/invoke/unreflect/UnreflectTest.java  |  64 +-
 .../AccessibleObject/HiddenClassTest.java     |  58 +-
 .../java/lang/reflect/Field/NegativeTest.java |   4 +-
 test/jdk/java/lang/reflect/Field/Set.java     |   3 +-
 .../FinalFieldMutationEventTest.java          | 203 +++++++
 .../Field/mutateFinals/MutateFinalsTest.java  | 358 +++++++++++
 .../mutateFinals/cli/CommandLineTest.java     | 294 +++++++++
 .../cli/CommandLineTestHelper.java            |  88 +++
 .../mutateFinals/jar/ExecutableJarTest.java   | 227 +++++++
 .../jar/ExecutableJarTestHelper.java          |  97 +++
 .../Field/mutateFinals/jar/m/module-info.java |  29 +
 .../reflect/Field/mutateFinals/jar/m/p/C.java |  35 ++
 .../mutateFinals/jni/JNIAttachMutator.java    | 123 ++++
 .../jni/JNIAttachMutatorTest.java             | 124 ++++
 .../mutateFinals/jni/libJNIAttachMutator.c    | 192 ++++++
 .../Field/mutateFinals/jni/m/module-info.java |  29 +
 .../Field/mutateFinals/jni/m/p/C1.java        |  35 ++
 .../Field/mutateFinals/jni/m/p/C2.java        |  35 ++
 .../Field/mutateFinals/jni/m/p/C3.java        |  35 ++
 .../reflect/Field/mutateFinals/jni/m/q/C.java |  35 ++
 .../Field/mutateFinals/modules/Driver.java    |  35 ++
 .../mutateFinals/modules/m1/module-info.java  |  27 +
 .../mutateFinals/modules/m1/p1/M1Mutator.java |  81 +++
 .../mutateFinals/modules/m2/module-info.java  |  27 +
 .../mutateFinals/modules/m2/p2/M2Mutator.java |  81 +++
 .../mutateFinals/modules/m3/module-info.java  |  27 +
 .../mutateFinals/modules/m3/p3/M3Mutator.java |  81 +++
 .../modules/test/module-info.java             |  33 ++
 .../modules/test/test/TestMain.java           | 556 ++++++++++++++++++
 .../test/test/fieldholders/PrivateFields.java | 124 ++++
 .../test/test/fieldholders/PublicFields.java  | 124 ++++
 .../test/test/internal/TestMutator.java       |  81 +++
 .../modules/test/test/spi/Mutator.java        |  88 +++
 .../Attributes/NullAndEmptyKeysAndValues.java |   4 +-
 .../util/logging/FileHandlerLongLimit.java    |   4 +-
 .../metadata/TestLookForUntestedEvents.java   |   5 +
 .../pkcs11/Cipher/CancelMultipart.java        |   2 +-
 .../provider/SecureRandom/DRBGS11n.java       |   6 +-
 .../util/ManifestDigester/FindSection.java    |   4 +-
 .../jdk/jshell/CompletionSuggestionTest.java  |   2 +-
 test/lib/jdk/test/lib/jfr/EventNames.java     |   1 +
 .../bench/java/lang/reflect/FieldSet.java     | 151 +++++
 76 files changed, 5311 insertions(+), 196 deletions(-)
 create mode 100644 src/java.base/share/classes/java/lang/reflect/doc-files/MutationMethods.html
 create mode 100644 src/java.base/share/classes/jdk/internal/event/FinalFieldMutationEvent.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/events/FinalFieldMutationEvent.java
 create mode 100644 test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinals.java
 create mode 100644 test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinalsTest.java
 create mode 100644 test/hotspot/jtreg/runtime/jni/mutateFinals/libMutateFinals.c
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/FinalFieldMutationEventTest.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/MutateFinalsTest.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTest.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTestHelper.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTest.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTestHelper.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/module-info.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/p/C.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutator.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutatorTest.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/libJNIAttachMutator.c
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/module-info.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C1.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C2.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C3.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/q/C.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/Driver.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/module-info.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/p1/M1Mutator.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/module-info.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/p2/M2Mutator.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/module-info.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/p3/M3Mutator.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/module-info.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/TestMain.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PrivateFields.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PublicFields.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/internal/TestMutator.java
 create mode 100644 test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/spi/Mutator.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/reflect/FieldSet.java

diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index a204467a77b..0482011f561 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -80,6 +80,7 @@ else
 
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libExplicitAttach := -pthread
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libImplicitAttach := -pthread
+  BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libJNIAttachMutator := -pthread
   BUILD_JDK_JTREG_EXCLUDE += exerevokeall.c
   ifeq ($(call isTargetOs, linux), true)
     BUILD_JDK_JTREG_EXECUTABLES_LIBS_exelauncher := -ldl
diff --git a/src/hotspot/share/ci/ciField.cpp b/src/hotspot/share/ci/ciField.cpp
index 8f33c17d0e6..19e05784f4d 100644
--- a/src/hotspot/share/ci/ciField.cpp
+++ b/src/hotspot/share/ci/ciField.cpp
@@ -258,17 +258,7 @@ void ciField::initialize_from(fieldDescriptor* fd) {
       // not be constant is when the field is a *special* static & final field
       // whose value may change.  The three examples are java.lang.System.in,
       // java.lang.System.out, and java.lang.System.err.
-      assert(vmClasses::System_klass() != nullptr, "Check once per vm");
-      if (k == vmClasses::System_klass()) {
-        // Check offsets for case 2: System.in, System.out, or System.err
-        if (_offset == java_lang_System::in_offset()  ||
-            _offset == java_lang_System::out_offset() ||
-            _offset == java_lang_System::err_offset()) {
-          _is_constant = false;
-          return;
-        }
-      }
-      _is_constant = true;
+      _is_constant = !fd->is_mutable_static_final();
     } else {
       // An instance field can be constant if it's a final static field or if
       // it's a final non-static field of a trusted class (classes in
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 5af8edbb758..2297ce9b790 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1867,6 +1867,32 @@ address jni_GetDoubleField_addr() {
   return (address)jni_GetDoubleField;
 }
 
+static void log_debug_if_final_static_field(JavaThread* current, const char* func_name, InstanceKlass* ik, int offset) {
+  if (log_is_enabled(Debug, jni)) {
+    fieldDescriptor fd;
+    bool found = ik->find_field_from_offset(offset, true, &fd);
+    assert(found, "bad field offset");
+    assert(fd.is_static(), "static/instance mismatch");
+    if (fd.is_final() && !fd.is_mutable_static_final()) {
+      ResourceMark rm(current);
+      log_debug(jni)("%s mutated final static field %s.%s", func_name, ik->external_name(), fd.name()->as_C_string());
+    }
+  }
+}
+
+static void log_debug_if_final_instance_field(JavaThread* current, const char* func_name, InstanceKlass* ik, int offset) {
+  if (log_is_enabled(Debug, jni)) {
+    fieldDescriptor fd;
+    bool found = ik->find_field_from_offset(offset, false, &fd);
+    assert(found, "bad field offset");
+    assert(!fd.is_static(), "static/instance mismatch");
+    if (fd.is_final()) {
+      ResourceMark rm(current);
+      log_debug(jni)("%s mutated final instance field %s.%s", func_name, ik->external_name(), fd.name()->as_C_string());
+    }
+  }
+}
+
 JNI_ENTRY_NO_PRESERVE(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID, jobject value))
   HOTSPOT_JNI_SETOBJECTFIELD_ENTRY(env, obj, (uintptr_t) fieldID, value);
   oop o = JNIHandles::resolve_non_null(obj);
@@ -1879,6 +1905,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldI
     o = JvmtiExport::jni_SetField_probe(thread, obj, o, k, fieldID, false, JVM_SIGNATURE_CLASS, (jvalue *)&field_value);
   }
   HeapAccess<ON_UNKNOWN_OOP_REF>::oop_store_at(o, offset, JNIHandles::resolve(value));
+  log_debug_if_final_instance_field(thread, "SetObjectField", InstanceKlass::cast(k), offset);
   HOTSPOT_JNI_SETOBJECTFIELD_RETURN();
 JNI_END
 
@@ -1901,6 +1928,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfi
     o = JvmtiExport::jni_SetField_probe(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \
   } \
   o->Fieldname##_field_put(offset, value); \
+  log_debug_if_final_instance_field(thread, "Set<Type>Field", InstanceKlass::cast(k), offset); \
   ReturnProbe; \
 JNI_END
 
@@ -2072,6 +2100,7 @@ JNI_ENTRY(void, jni_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fie
     JvmtiExport::jni_SetField_probe(thread, nullptr, nullptr, id->holder(), fieldID, true, JVM_SIGNATURE_CLASS, (jvalue *)&field_value);
   }
   id->holder()->java_mirror()->obj_field_put(id->offset(), JNIHandles::resolve(value));
+  log_debug_if_final_static_field(THREAD, "SetStaticObjectField", id->holder(), id->offset());
   HOTSPOT_JNI_SETSTATICOBJECTFIELD_RETURN();
 JNI_END
 
@@ -2093,6 +2122,7 @@ JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID
     JvmtiExport::jni_SetField_probe(thread, nullptr, nullptr, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \
   } \
   id->holder()->java_mirror()-> Fieldname##_field_put (id->offset(), value); \
+  log_debug_if_final_static_field(THREAD, "SetStatic<Type>Field", id->holder(), id->offset()); \
   ReturnProbe;\
 JNI_END
 
diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp
index 43cc61d7363..5f4cf10ebf4 100644
--- a/src/hotspot/share/prims/jniCheck.cpp
+++ b/src/hotspot/share/prims/jniCheck.cpp
@@ -233,7 +233,7 @@ functionExit(JavaThread* thr)
 }
 
 static inline void
-checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype)
+checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype, bool setter)
 {
   fieldDescriptor fd;
 
@@ -258,10 +258,18 @@ checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype)
       !(fd.field_type() == T_ARRAY && ftype == T_OBJECT)) {
     ReportJNIFatalError(thr, fatal_static_field_mismatch);
   }
+
+  /* check if setting a final field */
+  if (setter && fd.is_final() && !fd.is_mutable_static_final()) {
+    ResourceMark rm(thr);
+    stringStream ss;
+    ss.print("SetStatic<Type>Field called to mutate final static field %s.%s", k_oop->external_name(), fd.name()->as_C_string());
+    ReportJNIWarning(thr, ss.as_string());
+  }
 }
 
 static inline void
-checkInstanceFieldID(JavaThread* thr, jfieldID fid, jobject obj, int ftype)
+checkInstanceFieldID(JavaThread* thr, jfieldID fid, jobject obj, int ftype, bool setter)
 {
   fieldDescriptor fd;
 
@@ -287,14 +295,21 @@ checkInstanceFieldID(JavaThread* thr, jfieldID fid, jobject obj, int ftype)
     ReportJNIFatalError(thr, fatal_wrong_field);
 
   /* check for proper field type */
-  if (!InstanceKlass::cast(k_oop)->find_field_from_offset(offset,
-                                                              false, &fd))
+  if (!InstanceKlass::cast(k_oop)->find_field_from_offset(offset, false, &fd))
     ReportJNIFatalError(thr, fatal_instance_field_not_found);
 
   if ((fd.field_type() != ftype) &&
       !(fd.field_type() == T_ARRAY && ftype == T_OBJECT)) {
     ReportJNIFatalError(thr, fatal_instance_field_mismatch);
   }
+
+  /* check if setting a final field */
+  if (setter && fd.is_final()) {
+    ResourceMark rm(thr);
+    stringStream ss;
+    ss.print("Set<Type>Field called to mutate final instance field %s.%s", k_oop->external_name(), fd.name()->as_C_string());
+    ReportJNIWarning(thr, ss.as_string());
+  }
 }
 
 static inline void
@@ -1204,7 +1219,7 @@ JNI_ENTRY_CHECKED(ReturnType,  \
                                  jfieldID fieldID)) \
     functionEnter(thr); \
     IN_VM( \
-      checkInstanceFieldID(thr, fieldID, obj, FieldType); \
+      checkInstanceFieldID(thr, fieldID, obj, FieldType, false); \
     ) \
     ReturnType result = UNCHECKED()->Get##Result##Field(env,obj,fieldID); \
     functionExit(thr); \
@@ -1229,7 +1244,7 @@ JNI_ENTRY_CHECKED(void,  \
                                  ValueType val)) \
     functionEnter(thr); \
     IN_VM( \
-      checkInstanceFieldID(thr, fieldID, obj, FieldType); \
+      checkInstanceFieldID(thr, fieldID, obj, FieldType, true); \
     ) \
     UNCHECKED()->Set##Result##Field(env,obj,fieldID,val); \
     functionExit(thr); \
@@ -1395,7 +1410,7 @@ JNI_ENTRY_CHECKED(ReturnType,  \
     functionEnter(thr); \
     IN_VM( \
       jniCheck::validate_class(thr, clazz, false); \
-      checkStaticFieldID(thr, fieldID, clazz, FieldType); \
+      checkStaticFieldID(thr, fieldID, clazz, FieldType, false); \
     ) \
     ReturnType result = UNCHECKED()->GetStatic##Result##Field(env, \
                                                               clazz, \
@@ -1423,7 +1438,7 @@ JNI_ENTRY_CHECKED(void,  \
     functionEnter(thr); \
     IN_VM( \
       jniCheck::validate_class(thr, clazz, false); \
-      checkStaticFieldID(thr, fieldID, clazz, FieldType); \
+      checkStaticFieldID(thr, fieldID, clazz, FieldType, true); \
     ) \
     UNCHECKED()->SetStatic##Result##Field(env,clazz,fieldID,value); \
     functionExit(thr); \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 3748c35f00d..1ef2ee9de0d 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -317,6 +317,10 @@ bool needs_module_property_warning = false;
 #define ENABLE_NATIVE_ACCESS_LEN 20
 #define ILLEGAL_NATIVE_ACCESS "illegal.native.access"
 #define ILLEGAL_NATIVE_ACCESS_LEN 21
+#define ENABLE_FINAL_FIELD_MUTATION "enable.final.field.mutation"
+#define ENABLE_FINAL_FIELD_MUTATION_LEN 27
+#define ILLEGAL_FINAL_FIELD_MUTATION "illegal.final.field.mutation"
+#define ILLEGAL_FINAL_FIELD_MUTATION_LEN 28
 
 // Return TRUE if option matches 'property', or 'property=', or 'property.'.
 static bool matches_property_suffix(const char* option, const char* property, size_t len) {
@@ -343,7 +347,9 @@ bool Arguments::internal_module_property_helper(const char* property, bool check
     if (matches_property_suffix(property_suffix, PATCH, PATCH_LEN) ||
         matches_property_suffix(property_suffix, LIMITMODS, LIMITMODS_LEN) ||
         matches_property_suffix(property_suffix, UPGRADE_PATH, UPGRADE_PATH_LEN) ||
-        matches_property_suffix(property_suffix, ILLEGAL_NATIVE_ACCESS, ILLEGAL_NATIVE_ACCESS_LEN)) {
+        matches_property_suffix(property_suffix, ILLEGAL_NATIVE_ACCESS, ILLEGAL_NATIVE_ACCESS_LEN) ||
+        matches_property_suffix(property_suffix, ENABLE_FINAL_FIELD_MUTATION, ENABLE_FINAL_FIELD_MUTATION_LEN) ||
+        matches_property_suffix(property_suffix, ILLEGAL_FINAL_FIELD_MUTATION, ILLEGAL_FINAL_FIELD_MUTATION_LEN)) {
       return true;
     }
 
@@ -1809,6 +1815,7 @@ static unsigned int addexports_count = 0;
 static unsigned int addopens_count = 0;
 static unsigned int patch_mod_count = 0;
 static unsigned int enable_native_access_count = 0;
+static unsigned int enable_final_field_mutation = 0;
 static bool patch_mod_javabase = false;
 
 // Check the consistency of vm_init_args
@@ -2273,6 +2280,19 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
       if (res != JNI_OK) {
         return res;
       }
+    } else if (match_option(option, "--enable-final-field-mutation=", &tail)) {
+      if (!create_numbered_module_property("jdk.module.enable.final.field.mutation", tail, enable_final_field_mutation++)) {
+        return JNI_ENOMEM;
+      }
+    } else if (match_option(option, "--illegal-final-field-mutation=", &tail)) {
+      if (strcmp(tail, "allow") == 0 || strcmp(tail, "warn") == 0 || strcmp(tail, "debug") == 0 || strcmp(tail, "deny") == 0) {
+        PropertyList_unique_add(&_system_properties, "jdk.module.illegal.final.field.mutation", tail,
+                                AddProperty, WriteableProperty, InternalProperty);
+      } else {
+        jio_fprintf(defaultStream::error_stream(),
+                    "Value specified to --illegal-final-field-mutation not recognized: '%s'\n", tail);
+        return JNI_ERR;
+      }
     } else if (match_option(option, "--sun-misc-unsafe-memory-access=", &tail)) {
       if (strcmp(tail, "allow") == 0 || strcmp(tail, "warn") == 0 || strcmp(tail, "debug") == 0 || strcmp(tail, "deny") == 0) {
         PropertyList_unique_add(&_system_properties, "sun.misc.unsafe.memory.access", tail,
diff --git a/src/hotspot/share/runtime/fieldDescriptor.cpp b/src/hotspot/share/runtime/fieldDescriptor.cpp
index c5c3bdbd4bc..491157d5bf7 100644
--- a/src/hotspot/share/runtime/fieldDescriptor.cpp
+++ b/src/hotspot/share/runtime/fieldDescriptor.cpp
@@ -46,6 +46,16 @@ bool fieldDescriptor::is_trusted_final() const {
   return is_final() && (is_static() || ik->is_hidden() || ik->is_record());
 }
 
+bool fieldDescriptor::is_mutable_static_final() const {
+  InstanceKlass* ik = field_holder();
+  // write protected fields (JLS 17.5.4)
+  if (is_final() && is_static() && ik == vmClasses::System_klass() &&
+      (offset() == java_lang_System::in_offset() || offset() == java_lang_System::out_offset() || offset() == java_lang_System::err_offset())) {
+   return true;
+  }
+  return false;
+}
+
 AnnotationArray* fieldDescriptor::annotations() const {
   InstanceKlass* ik = field_holder();
   Array<AnnotationArray*>* md = ik->fields_annotations();
diff --git a/src/hotspot/share/runtime/fieldDescriptor.hpp b/src/hotspot/share/runtime/fieldDescriptor.hpp
index aae789b1fb7..fa3d1b9d23c 100644
--- a/src/hotspot/share/runtime/fieldDescriptor.hpp
+++ b/src/hotspot/share/runtime/fieldDescriptor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,6 +98,8 @@ class fieldDescriptor {
 
   bool is_trusted_final()         const;
 
+  bool is_mutable_static_final()  const;
+
   inline void set_is_field_access_watched(const bool value);
   inline void set_is_field_modification_watched(const bool value);
   inline void set_has_initialized_final_update(const bool value);
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
index 065e1ac4620..cd2b8095ee4 100644
--- a/src/java.base/share/classes/java/lang/Module.java
+++ b/src/java.base/share/classes/java/lang/Module.java
@@ -37,6 +37,7 @@ import java.lang.module.ModuleDescriptor.Version;
 import java.lang.module.ResolvedModule;
 import java.lang.reflect.AccessFlag;
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URL;
 import java.security.CodeSource;
@@ -115,6 +116,10 @@ public final class Module implements AnnotatedElement {
     @Stable
     private boolean enableNativeAccess;
 
+    // true if this module is allowed to mutate final instance fields
+    @Stable
+    private boolean enableFinalMutation;
+
     /**
      * Creates a new named Module. The resulting Module will be defined to the
      * VM but will not read any other modules, will not have any exports setup
@@ -262,7 +267,6 @@ public final class Module implements AnnotatedElement {
      * in the outer Module class as that would create a circular initializer dependency.
      */
     private static final class EnableNativeAccess {
-
         private EnableNativeAccess() {}
 
         private static final Unsafe UNSAFE = Unsafe.getUnsafe();
@@ -331,12 +335,52 @@ public final class Module implements AnnotatedElement {
     }
 
     /**
-     * Update all unnamed modules to allow access to restricted methods.
+     * Enable code in all unnamed modules to access restricted methods.
      */
-    static void implAddEnableNativeAccessToAllUnnamed() {
+    static void addEnableNativeAccessToAllUnnamed() {
         EnableNativeAccess.trySetEnableNativeAccess(ALL_UNNAMED_MODULE);
     }
 
+    /**
+     * This class exists to avoid using Unsafe during early initialization of Module.
+     */
+    private static final class EnableFinalMutation {
+        private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+        private static final long ENABLE_FINAL_MUTATION_OFFSET =
+                UNSAFE.objectFieldOffset(Module.class, "enableFinalMutation");
+
+        private static boolean isEnableFinalMutation(Module module) {
+            return UNSAFE.getBooleanVolatile(module, ENABLE_FINAL_MUTATION_OFFSET);
+        }
+
+        private static boolean tryEnableFinalMutation(Module module) {
+            return UNSAFE.compareAndSetBoolean(module, ENABLE_FINAL_MUTATION_OFFSET, false, true);
+        }
+    }
+
+    /**
+     * Enable code in all unnamed modules to mutate final instance fields.
+     */
+    static void addEnableFinalMutationToAllUnnamed() {
+        EnableFinalMutation.tryEnableFinalMutation(ALL_UNNAMED_MODULE);
+    }
+
+    /**
+     * Enable code in this named module to mutate final instance fields.
+     */
+    boolean tryEnableFinalMutation() {
+        Module m = isNamed() ? this : ALL_UNNAMED_MODULE;
+        return EnableFinalMutation.tryEnableFinalMutation(m);
+    }
+
+    /**
+     * Return true if code in this module is allowed to mutate final instance fields.
+     */
+    boolean isFinalMutationEnabled() {
+        Module m = isNamed() ? this : ALL_UNNAMED_MODULE;
+        return EnableFinalMutation.isEnableFinalMutation(m);
+    }
+
     // --
 
     // special Module to mean "all unnamed modules"
@@ -718,8 +762,50 @@ public final class Module implements AnnotatedElement {
     }
 
     /**
-     * Returns {@code true} if this module exports or opens a package to
-     * the given module via its module declaration or CLI options.
+     * Returns {@code true} if this module statically exports a package to the given module.
+     * If the package is exported to the given module via {@code addExports} then this method
+     * returns {@code false}.
+     */
+    boolean isStaticallyExported(String pn, Module other) {
+        return isStaticallyExportedOrOpened(pn, other, false);
+    }
+
+    /**
+     * Returns {@code true} if this module statically opens a package to the given module.
+     * If the package is opened to the given module via {@code addOpens} then this method
+     * returns {@code false}.
+     */
+    boolean isStaticallyOpened(String pn, Module other) {
+        return isStaticallyExportedOrOpened(pn, other, true);
+    }
+
+    /**
+     * Returns {@code true} if this module exports or opens a package to the
+     * given module via its module declaration or CLI options.
+     */
+    private boolean isStaticallyExportedOrOpened(String pn, Module other, boolean open) {
+        // all packages in unnamed modules are exported and open
+        if (!isNamed())
+            return true;
+
+        // all packages are exported/open to self
+        if (other == this && descriptor.packages().contains(pn))
+            return true;
+
+        // all packages in open and automatic modules are exported/open
+        if (descriptor.isOpen() || descriptor.isAutomatic())
+            return descriptor.packages().contains(pn);
+
+        // exported/opened via module descriptor
+        if (isExplicitlyExportedOrOpened(pn, other, open))
+            return true;
+
+        return false;
+    }
+
+    /**
+     * Returns {@code true} if this module exports or opens a package to the
+     * given module via its module declaration or CLI options.
      */
     private boolean isExplicitlyExportedOrOpened(String pn, Module other, boolean open) {
         // test if package is open to everyone or <other>
@@ -818,11 +904,16 @@ public final class Module implements AnnotatedElement {
         return isReflectivelyExportedOrOpened(pn, other, true);
     }
 
-
     /**
      * If the caller's module is this module then update this module to export
      * the given package to the given module.
      *
+     * <p> Exporting a package with this method does not allow the given module to
+     * {@linkplain Field#set(Object, Object) reflectively set} or {@linkplain
+     * java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field) obtain a method
+     * handle with write access} to a public final field declared in a public class
+     * in the package.
+     *
      * <p> This method has no effect if the package is already exported (or
      * <em>open</em>) to the given module. </p>
      *
@@ -860,21 +951,27 @@ public final class Module implements AnnotatedElement {
             if (caller != this) {
                 throw new IllegalCallerException(caller + " != " + this);
             }
-            implAddExportsOrOpens(pn, other, /*open*/false, /*syncVM*/true);
+            implAddExports(pn, other);
         }
 
         return this;
     }
 
     /**
-     * If this module has <em>opened</em> a package to at least the caller
-     * module then update this module to open the package to the given module.
-     * Opening a package with this method allows all types in the package,
+     * If this module has <em>opened</em> the given package to at least the caller
+     * module, then update this module to also open the package to the given module.
+     *
+     * <p> Opening a package with this method allows all types in the package,
      * and all their members, not just public types and their public members,
-     * to be reflected on by the given module when using APIs that support
-     * private access or a way to bypass or suppress default Java language
+     * to be reflected on by the given module when using APIs that either support
+     * private access or provide a way to bypass or suppress Java language
      * access control checks.
      *
+     * <p> Opening a package with this method does not allow the given module to
+     * {@linkplain Field#set(Object, Object) reflectively set} or {@linkplain
+     * java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field) obtain a method
+     * handle with write access} to a final field declared in a class in the package.
+     *
      * <p> This method has no effect if the package is already <em>open</em>
      * to the given module. </p>
      *
@@ -913,7 +1010,7 @@ public final class Module implements AnnotatedElement {
             Module caller = getCallerModule(Reflection.getCallerClass());
             if (caller != this && (caller == null || !isOpen(pn, caller)))
                 throw new IllegalCallerException(pn + " is not open to " + caller);
-            implAddExportsOrOpens(pn, other, /*open*/true, /*syncVM*/true);
+            implAddOpens(pn, other);
         }
 
         return this;
@@ -923,28 +1020,29 @@ public final class Module implements AnnotatedElement {
     /**
      * Updates this module to export a package unconditionally.
      *
-     * @apiNote This method is for JDK tests only.
+     * @apiNote Used by Proxy and other dynamic modules.
      */
     void implAddExports(String pn) {
-        implAddExportsOrOpens(pn, Module.EVERYONE_MODULE, false, true);
+        implAddExportsOrOpens(pn, Module.EVERYONE_MODULE, false, true, true);
     }
 
     /**
      * Updates this module to export a package to another module.
      *
-     * @apiNote Used by Instrumentation::redefineModule and --add-exports
+     * @apiNote Used by addExports, Instrumentation::redefineModule, and --add-exports
      */
     void implAddExports(String pn, Module other) {
-        implAddExportsOrOpens(pn, other, false, true);
+        implAddExportsOrOpens(pn, other, false, VM.isBooted(), true);
     }
 
     /**
      * Updates this module to export a package to all unnamed modules.
      *
-     * @apiNote Used by the --add-exports command line option.
+     * @apiNote Used by the --add-exports command line option and the launcher when
+     * an executable JAR file has the "Add-Exports" attribute in its main manifest.
      */
     void implAddExportsToAllUnnamed(String pn) {
-        implAddExportsOrOpens(pn, Module.ALL_UNNAMED_MODULE, false, true);
+        implAddExportsOrOpens(pn, Module.ALL_UNNAMED_MODULE, false, false, true);
     }
 
     /**
@@ -954,7 +1052,7 @@ public final class Module implements AnnotatedElement {
      * @apiNote This method is for VM white-box testing.
      */
     void implAddExportsNoSync(String pn) {
-        implAddExportsOrOpens(pn.replace('/', '.'), Module.EVERYONE_MODULE, false, false);
+        implAddExportsOrOpens(pn.replace('/', '.'), Module.EVERYONE_MODULE, false, true, false);
     }
 
     /**
@@ -964,7 +1062,7 @@ public final class Module implements AnnotatedElement {
      * @apiNote This method is for VM white-box testing.
      */
     void implAddExportsNoSync(String pn, Module other) {
-        implAddExportsOrOpens(pn.replace('/', '.'), other, false, false);
+        implAddExportsOrOpens(pn.replace('/', '.'), other, false, true, false);
     }
 
     /**
@@ -973,35 +1071,40 @@ public final class Module implements AnnotatedElement {
      * @apiNote This method is for JDK tests only.
      */
     void implAddOpens(String pn) {
-        implAddExportsOrOpens(pn, Module.EVERYONE_MODULE, true, true);
+        implAddExportsOrOpens(pn, Module.EVERYONE_MODULE, true, true, true);
     }
 
     /**
      * Updates this module to open a package to another module.
      *
-     * @apiNote Used by Instrumentation::redefineModule and --add-opens
+     * @apiNote Used by addOpens, Instrumentation::redefineModule, and --add-opens
      */
     void implAddOpens(String pn, Module other) {
-        implAddExportsOrOpens(pn, other, true, true);
+        implAddExportsOrOpens(pn, other, true, VM.isBooted(), true);
     }
 
     /**
      * Updates this module to open a package to all unnamed modules.
      *
-     * @apiNote Used by the --add-opens command line option.
+     * @apiNote Used by the --add-opens command line option and the launcher when
+     * an executable JAR file has the "Add-Opens" attribute in its main manifest.
      */
     void implAddOpensToAllUnnamed(String pn) {
-        implAddExportsOrOpens(pn, Module.ALL_UNNAMED_MODULE, true, true);
+        implAddExportsOrOpens(pn, Module.ALL_UNNAMED_MODULE, true, false, true);
     }
 
     /**
      * Updates a module to export or open a module to another module.
-     *
-     * If {@code syncVM} is {@code true} then the VM is notified.
+     * @param pn package name
+     * @param other the module to export/open the package to
+     * @param open true to open, false to export
+     * @param reflectively true if exported/opened reflectively
+     * @param syncVM true to update the VM
      */
     private void implAddExportsOrOpens(String pn,
                                        Module other,
                                        boolean open,
+                                       boolean reflectively,
                                        boolean syncVM) {
         Objects.requireNonNull(other);
         Objects.requireNonNull(pn);
@@ -1031,7 +1134,7 @@ public final class Module implements AnnotatedElement {
             }
         }
 
-        if (VM.isBooted()) {
+        if (reflectively) {
             // add package name to ReflectionData.exports if absent
             Map<String, Boolean> map = ReflectionData.exports
                 .computeIfAbsent(this, other,
diff --git a/src/java.base/share/classes/java/lang/ModuleLayer.java b/src/java.base/share/classes/java/lang/ModuleLayer.java
index 5dfd93796d2..9d922f787a6 100644
--- a/src/java.base/share/classes/java/lang/ModuleLayer.java
+++ b/src/java.base/share/classes/java/lang/ModuleLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ package java.lang;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ResolvedModule;
+import java.lang.reflect.Field;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -252,6 +253,12 @@ public final class ModuleLayer {
          * module {@code target}. This method is a no-op if {@code source}
          * already exports the package to at least {@code target}.
          *
+         * <p> Exporting a package with this method does not allow the target module to
+         * {@linkplain Field#set(Object, Object) reflectively set} or {@linkplain
+         * java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field) obtain a method
+         * handle with write access} to a public final field declared in a public class
+         * in the package.
+         *
          * @param  source
          *         The source module
          * @param  pn
@@ -278,6 +285,11 @@ public final class ModuleLayer {
          * module {@code target}. This method is a no-op if {@code source}
          * already opens the package to at least {@code target}.
          *
+         * <p> Opening a package with this method does not allow the target module
+         * to {@linkplain Field#set(Object, Object) reflectively set} or {@linkplain
+         * java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field) obtain a method
+         * handle with write access} to a final field declared in a class in the package.
+         *
          * @param  source
          *         The source module
          * @param  pn
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index c88cf4ac797..5c2b47afe3d 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2096,18 +2096,33 @@ public final class System {
             public boolean isReflectivelyOpened(Module m, String pn, Module other) {
                 return m.isReflectivelyOpened(pn, other);
             }
-            public Module addEnableNativeAccess(Module m) {
-                return m.implAddEnableNativeAccess();
+            public void addEnableNativeAccess(Module m) {
+                m.implAddEnableNativeAccess();
             }
             public boolean addEnableNativeAccess(ModuleLayer layer, String name) {
                 return layer.addEnableNativeAccess(name);
             }
             public void addEnableNativeAccessToAllUnnamed() {
-                Module.implAddEnableNativeAccessToAllUnnamed();
+                Module.addEnableNativeAccessToAllUnnamed();
             }
             public void ensureNativeAccess(Module m, Class<?> owner, String methodName, Class<?> currentClass, boolean jni) {
                 m.ensureNativeAccess(owner, methodName, currentClass, jni);
             }
+            public boolean isStaticallyExported(Module m, String pn, Module other) {
+                return m.isStaticallyExported(pn, other);
+            }
+            public boolean isStaticallyOpened(Module m, String pn, Module other) {
+                return m.isStaticallyOpened(pn, other);
+            }
+            public boolean isFinalMutationEnabled(Module m) {
+                return m.isFinalMutationEnabled();
+            }
+            public boolean tryEnableFinalMutation(Module m) {
+                return m.tryEnableFinalMutation();
+            }
+            public void addEnableFinalMutationToAllUnnamed() {
+                Module.addEnableFinalMutationToAllUnnamed();
+            }
             public ServicesCatalog getServicesCatalog(ModuleLayer layer) {
                 return layer.getServicesCatalog();
             }
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 92a37587926..feb8aaaa1a9 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -3429,12 +3429,15 @@ return mh1;
          *         or if the field is {@code final} and write access
          *         is not enabled on the {@code Field} object
          * @throws NullPointerException if the argument is null
+         * @see <a href="{@docRoot}/java.base/java/lang/reflect/doc-files/MutationMethods.html">Mutation methods</a>
          */
         public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
             return unreflectField(f, true);
         }
 
         private MethodHandle unreflectField(Field f, boolean isSetter) throws IllegalAccessException {
+            @SuppressWarnings("deprecation")
+            boolean isAccessible = f.isAccessible();
             MemberName field = new MemberName(f, isSetter);
             if (isSetter && field.isFinal()) {
                 if (field.isTrustedFinalField()) {
@@ -3442,12 +3445,15 @@ return mh1;
                                                   : "final field has no write access";
                     throw field.makeAccessException(msg, this);
                 }
+                // check if write access to final field allowed
+                if (!field.isStatic() && isAccessible) {
+                    SharedSecrets.getJavaLangReflectAccess().checkAllowedToUnreflectFinalSetter(lookupClass, f);
+                }
             }
             assert(isSetter
                     ? MethodHandleNatives.refKindIsSetter(field.getReferenceKind())
                     : MethodHandleNatives.refKindIsGetter(field.getReferenceKind()));
-            @SuppressWarnings("deprecation")
-            Lookup lookup = f.isAccessible() ? IMPL_LOOKUP : this;
+            Lookup lookup = isAccessible ? IMPL_LOOKUP : this;
             return lookup.getDirectField(field.getReferenceKind(), f.getDeclaringClass(), field);
         }
 
diff --git a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
index a045f9c196a..1637d26b571 100644
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,18 +160,6 @@ public class AccessibleObject implements AnnotatedElement {
      * to the caller and the package containing the declaring class is not open
      * to the caller's module. </p>
      *
-     * <p> This method cannot be used to enable {@linkplain Field#set <em>write</em>}
-     * access to a <em>non-modifiable</em> final field.  The following fields
-     * are non-modifiable:
-     * <ul>
-     * <li>static final fields declared in any class or interface</li>
-     * <li>final fields declared in a {@linkplain Class#isHidden() hidden class}</li>
-     * <li>final fields declared in a {@linkplain Class#isRecord() record}</li>
-     * </ul>
-     * <p> The {@code accessible} flag when {@code true} suppresses Java language access
-     * control checks to only enable {@linkplain Field#get <em>read</em>} access to
-     * these non-modifiable final fields.
-     *
      * @param flag the new value for the {@code accessible} flag
      * @throws InaccessibleObjectException if access cannot be enabled
      *
diff --git a/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java
index e26d8b03ff8..663e3453343 100644
--- a/src/java.base/share/classes/java/lang/reflect/Field.java
+++ b/src/java.base/share/classes/java/lang/reflect/Field.java
@@ -25,7 +25,18 @@
 
 package java.lang.reflect;
 
+import java.lang.annotation.Annotation;
+import java.net.URL;
+import java.security.CodeSource;
+import java.util.Map;
+import java.util.Set;
+import java.util.Objects;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.event.FinalFieldMutationEvent;
+import jdk.internal.loader.ClassLoaders;
+import jdk.internal.misc.VM;
+import jdk.internal.module.ModuleBootstrap;
+import jdk.internal.module.Modules;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.FieldAccessor;
 import jdk.internal.reflect.Reflection;
@@ -35,10 +46,6 @@ import sun.reflect.generics.repository.FieldRepository;
 import sun.reflect.generics.factory.CoreReflectionFactory;
 import sun.reflect.generics.factory.GenericsFactory;
 import sun.reflect.generics.scope.ClassScope;
-import java.lang.annotation.Annotation;
-import java.util.Map;
-import java.util.Set;
-import java.util.Objects;
 import sun.reflect.annotation.AnnotationParser;
 import sun.reflect.annotation.AnnotationSupport;
 import sun.reflect.annotation.TypeAnnotation;
@@ -165,6 +172,27 @@ class Field extends AccessibleObject implements Member {
     }
 
     /**
+     * {@inheritDoc}
+     *
+     * <p>If this reflected object represents a non-final field, and this method is
+     * used to enable access, then both <em>{@linkplain #get(Object) read}</em>
+     * and <em>{@linkplain #set(Object, Object) write}</em> access to the field
+     * are enabled.
+     *
+     * <p>If this reflected object represents a <em>non-modifiable</em> final field
+     * then enabling access only enables read access. Any attempt to {@linkplain
+     * #set(Object, Object) set} the field value throws an {@code
+     * IllegalAccessException}. The following fields are non-modifiable:
+     * <ul>
+     * <li>static final fields declared in any class or interface</li>
+     * <li>final fields declared in a {@linkplain Class#isRecord() record}</li>
+     * <li>final fields declared in a {@linkplain Class#isHidden() hidden class}</li>
+     * </ul>
+     * <p>If this reflected object represents a non-static final field in a class that
+     * is not a record class or hidden class, then enabling access will enable read
+     * access. Whether write access is allowed or not is checked when attempting to
+     * {@linkplain #set(Object, Object) set} the field value.
+     *
      * @throws InaccessibleObjectException {@inheritDoc}
      */
     @Override
@@ -762,18 +790,59 @@ class Field extends AccessibleObject implements Member {
      * the underlying field is inaccessible, the method throws an
      * {@code IllegalAccessException}.
      *
-     * <p>If the underlying field is final, this {@code Field} object has
-     * <em>write</em> access if and only if the following conditions are met:
+     * <p>If the underlying field is final, this {@code Field} object has <em>write</em>
+     * access if and only if all of the following conditions are true, where {@code D} is
+     * the field's {@linkplain #getDeclaringClass() declaring class}:
+     *
      * <ul>
-     * <li>{@link #setAccessible(boolean) setAccessible(true)} has succeeded for
-     *     this {@code Field} object;</li>
-     * <li>the field is non-static; and</li>
-     * <li>the field's declaring class is not a {@linkplain Class#isHidden()
-     *     hidden class}; and</li>
-     * <li>the field's declaring class is not a {@linkplain Class#isRecord()
-     *     record class}.</li>
+     * <li>{@link #setAccessible(boolean) setAccessible(true)} has succeeded for this
+     *     {@code Field} object.</li>
+     * <li><a href="doc-files/MutationMethods.html">final field mutation is enabled</a>
+     *     for the caller's module.</li>
+     * <li> At least one of the following conditions holds:
+     *     <ol type="a">
+     *     <li> {@code D} and the caller class are in the same module.</li>
+     *     <li> The field is {@code public} and {@code D} is {@code public} in a package
+     *     that the module containing {@code D} exports to at least the caller's module.</li>
+     *     <li> {@code D} is in a package that is {@linkplain Module#isOpen(String, Module)
+     *     open} to the caller's module.</li>
+     *     </ol>
+     * </li>
+     * <li>{@code D} is not a {@linkplain Class#isRecord() record class}.</li>
+     * <li>{@code D} is not a {@linkplain Class#isHidden() hidden class}.</li>
+     * <li>The field is non-static.</li>
      * </ul>
-     * If any of the above checks is not met, this method throws an
+     *
+     * <p>If any of the above conditions is not met, this method throws an
+     * {@code IllegalAccessException}.
+     *
+     * <p>These conditions are more restrictive than the conditions specified by {@link
+     * #setAccessible(boolean)} to suppress access checks. In particular, updating a
+     * module to export or open a package cannot be used to allow <em>write</em> access
+     * to final fields with the {@code set} methods defined by {@code Field}.
+     * Condition (b) is not met if the module containing {@code D} has been updated with
+     * {@linkplain Module#addExports(String, Module) addExports} to export the package to
+     * the caller's module. Condition (c) is not met if the module containing {@code D}
+     * has been updated with {@linkplain Module#addOpens(String, Module) addOpens} to open
+     * the package to the caller's module.
+     *
+     * <p>This method may be called by <a href="{@docRoot}/../specs/jni/index.html">
+     * JNI code</a> with no caller class on the stack. In that case, and when the
+     * underlying field is final, this {@code Field} object has <em>write</em> access
+     * if and only if all of the following conditions are true, where {@code D} is the
+     * field's {@linkplain #getDeclaringClass() declaring class}:
+     *
+     * <ul>
+     * <li>{@code setAccessible(true)} has succeeded for this {@code Field} object.</li>
+     * <li>final field mutation is enabled for the unnamed module.</li>
+     * <li>The field is {@code public} and {@code D} is {@code public} in a package that
+     *     is {@linkplain Module#isExported(String) exported} to all modules.</li>
+     * <li>{@code D} is not a {@linkplain Class#isRecord() record class}.</li>
+     * <li>{@code D} is not a {@linkplain Class#isHidden() hidden class}.</li>
+     * <li>The field is non-static.</li>
+     * </ul>
+     *
+     * <p>If any of the above conditions is not met, this method throws an
      * {@code IllegalAccessException}.
      *
      * <p> Setting a final field in this way
@@ -818,6 +887,8 @@ class Field extends AccessibleObject implements Member {
      *              and the field is an instance field.
      * @throws    ExceptionInInitializerError if the initialization provoked
      *              by this method fails.
+     *
+     * @see <a href="doc-files/MutationMethods.html">Mutation methods</a>
      */
     @CallerSensitive
     @ForceInline // to ensure Reflection.getCallerClass optimization
@@ -828,8 +899,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().set(obj, value);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.set(obj, value);
         } else {
-            getOverrideFieldAccessor().set(obj, value);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.set(obj, value));
         }
     }
 
@@ -867,8 +944,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setBoolean(obj, z);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setBoolean(obj, z);
         } else {
-            getOverrideFieldAccessor().setBoolean(obj, z);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setBoolean(obj, z));
         }
     }
 
@@ -906,8 +989,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setByte(obj, b);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setByte(obj, b);
         } else {
-            getOverrideFieldAccessor().setByte(obj, b);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setByte(obj, b));
         }
     }
 
@@ -945,8 +1034,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setChar(obj, c);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setChar(obj, c);
         } else {
-            getOverrideFieldAccessor().setChar(obj, c);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setChar(obj, c));
         }
     }
 
@@ -984,8 +1079,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setShort(obj, s);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setShort(obj, s);
         } else {
-            getOverrideFieldAccessor().setShort(obj, s);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setShort(obj, s));
         }
     }
 
@@ -1023,8 +1124,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setInt(obj, i);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setInt(obj, i);
         } else {
-            getOverrideFieldAccessor().setInt(obj, i);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setInt(obj, i));
         }
     }
 
@@ -1062,8 +1169,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setLong(obj, l);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setLong(obj, l);
         } else {
-            getOverrideFieldAccessor().setLong(obj, l);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setLong(obj, l));
         }
     }
 
@@ -1101,8 +1214,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setFloat(obj, f);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setFloat(obj, f);
         } else {
-            getOverrideFieldAccessor().setFloat(obj, f);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setFloat(obj, f));
         }
     }
 
@@ -1140,8 +1259,14 @@ class Field extends AccessibleObject implements Member {
             Class<?> caller = Reflection.getCallerClass();
             checkAccess(caller, obj);
             getFieldAccessor().setDouble(obj, d);
+            return;
+        }
+
+        FieldAccessor fa = getOverrideFieldAccessor();
+        if (!Modifier.isFinal(modifiers)) {
+            fa.setDouble(obj, d);
         } else {
-            getOverrideFieldAccessor().setDouble(obj, d);
+            setFinal(Reflection.getCallerClass(), obj, () -> fa.setDouble(obj, d));
         }
     }
 
@@ -1304,5 +1429,244 @@ class Field extends AccessibleObject implements Member {
                                                        getDeclaringClass(),
                                                        getGenericType(),
                                                        TypeAnnotation.TypeAnnotationTarget.FIELD);
-}
+    }
+
+    /**
+     * A function that sets a field to a value.
+     */
+    @FunctionalInterface
+    private interface FieldSetter {
+        void setFieldValue() throws IllegalAccessException;
+    }
+
+    /**
+     * Attempts to set a final field.
+     */
+    private void setFinal(Class<?> caller, Object obj, FieldSetter setter) throws IllegalAccessException {
+        if (obj != null && isFinalInstanceInNormalClass()) {
+            preSetFinal(caller, false);
+            setter.setFieldValue();
+            postSetFinal(caller, false);
+        } else {
+            // throws IllegalAccessException if static, or field in record or hidden class
+            setter.setFieldValue();
+        }
+    }
+
+    /**
+     * Return true if this field is a final instance field in a normal class (not a
+     * record class or hidden class),
+     */
+    private boolean isFinalInstanceInNormalClass() {
+        return Modifier.isFinal(modifiers)
+                && !Modifier.isStatic(modifiers)
+                && !clazz.isRecord()
+                && !clazz.isHidden();
+    }
+
+    /**
+     * Check that the caller is allowed to unreflect for mutation a final instance field
+     * in a normal class.
+     * @throws IllegalAccessException if not allowed
+     */
+    void checkAllowedToUnreflectFinalSetter(Class<?> caller) throws IllegalAccessException {
+        Objects.requireNonNull(caller);
+        preSetFinal(caller, true);
+        postSetFinal(caller, true);
+    }
+
+    /**
+     * Invoke before attempting to mutate, or unreflect for mutation, a final instance
+     * field in a normal class.
+     * @throws IllegalAccessException if not allowed
+     */
+    private void preSetFinal(Class<?> caller, boolean unreflect) throws IllegalAccessException {
+        assert isFinalInstanceInNormalClass();
+
+        if (caller != null) {
+            // check if declaring class in package that is open to caller, or public field
+            // and declaring class is public in package exported to caller
+            if (!isFinalDeeplyAccessible(caller)) {
+                throw new IllegalAccessException(notAccessibleToCallerMessage(caller, unreflect));
+            }
+        } else {
+            // no java caller, only allowed if field is public in exported package
+            if (!Reflection.verifyPublicMemberAccess(clazz, modifiers)) {
+                throw new IllegalAccessException(notAccessibleToNoCallerMessage(unreflect));
+            }
+        }
+
+        // check if field mutation is enabled for caller module or illegal final field
+        // mutation is allowed
+        var mode = ModuleBootstrap.illegalFinalFieldMutation();
+        if (mode == ModuleBootstrap.IllegalFinalFieldMutation.DENY
+                && !Modules.isFinalMutationEnabled(moduleToCheck(caller))) {
+            throw new IllegalAccessException(callerNotAllowedToMutateMessage(caller, unreflect));
+        }
+    }
+
+    /**
+     * Invoke after mutating a final instance field, or when unreflecting a final instance
+     * field for mutation, to print a warning and record a JFR event.
+     */
+    private void postSetFinal(Class<?> caller, boolean unreflect) {
+        assert isFinalInstanceInNormalClass();
+
+        var mode = ModuleBootstrap.illegalFinalFieldMutation();
+        if (mode == ModuleBootstrap.IllegalFinalFieldMutation.WARN) {
+            // first mutation prints warning
+            Module moduleToCheck = moduleToCheck(caller);
+            if (Modules.tryEnableFinalMutation(moduleToCheck)) {
+                String warningMsg = finalFieldMutationWarning(caller, unreflect);
+                String targetModule = (caller != null && moduleToCheck.isNamed())
+                        ? moduleToCheck.getName()
+                        : "ALL-UNNAMED";
+                VM.initialErr().printf("""
+                        WARNING: %s
+                        WARNING: Use --enable-final-field-mutation=%s to avoid a warning
+                        WARNING: Mutating final fields will be blocked in a future release unless final field mutation is enabled
+                        """, warningMsg, targetModule);
+            }
+        } else if (mode == ModuleBootstrap.IllegalFinalFieldMutation.DEBUG) {
+            // print warning and stack trace
+            var sb = new StringBuilder(finalFieldMutationWarning(caller, unreflect));
+            StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE)
+                    .forEach(sf -> {
+                        sb.append(System.lineSeparator()).append("\tat " + sf);
+                    });
+            VM.initialErr().println(sb);
+        }
+
+        // record JFR event
+        FinalFieldMutationEvent.offer(getDeclaringClass(), getName());
+    }
+
+    /**
+     * Returns true if this final field is "deeply accessible" to the caller.
+     * The field is deeply accessible if declaring class is in a package that is open
+     * to the caller's module, or the field is public in a public class that is exported
+     * to the caller's module.
+     *
+     * Updates to the module of the declaring class at runtime with {@code Module.addExports}
+     * or {@code Module.addOpens} have no impact on the result of this method.
+     */
+    private boolean isFinalDeeplyAccessible(Class<?> caller) {
+        assert isFinalInstanceInNormalClass();
+
+        // all fields in unnamed modules are deeply accessible
+        Module declaringModule = clazz.getModule();
+        if (!declaringModule.isNamed()) return true;
+
+        // all fields in the caller's module are deeply accessible
+        Module callerModule = caller.getModule();
+        if (callerModule == declaringModule) return true;
+
+        // public field, public class, package exported to caller's module
+        String pn = clazz.getPackageName();
+        if (Modifier.isPublic(modifiers)
+                && Modifier.isPublic(clazz.getModifiers())
+                && Modules.isStaticallyExported(declaringModule, pn, callerModule)) {
+            return true;
+        }
+
+        // package open to caller's module
+        return Modules.isStaticallyOpened(declaringModule, pn, callerModule);
+    }
+
+    /**
+     * Returns the Module to use for access checks with the given caller.
+     */
+    private Module moduleToCheck(Class<?> caller) {
+        if (caller != null) {
+            return caller.getModule();
+        } else {
+            // no java caller, only allowed if field is public in exported package
+            return ClassLoaders.appClassLoader().getUnnamedModule();
+        }
+    }
+
+    /**
+     * Returns the warning message to print when this final field is mutated by
+     * the given possibly-null caller.
+     */
+    private String finalFieldMutationWarning(Class<?> caller, boolean unreflect) {
+        assert Modifier.isFinal(modifiers);
+        String source;
+        if (caller != null) {
+            source = caller + " in " + caller.getModule();
+            CodeSource cs = caller.getProtectionDomain().getCodeSource();
+            if (cs != null) {
+                URL url = cs.getLocation();
+                if (url != null) {
+                    source += " (" + url + ")";
+                }
+            }
+        } else {
+            source = "JNI attached thread with no caller frame";
+        }
+        return String.format("Final field %s in %s has been %s by %s",
+                name,
+                clazz,
+                (unreflect) ? "unreflected for mutation" : "mutated reflectively",
+                source);
+    }
+
+    /**
+     * Returns the message for an IllegalAccessException when a final field cannot be
+     * mutated because the declaring class is in a package that is not "deeply accessible"
+     * to the caller.
+     */
+    private String notAccessibleToCallerMessage(Class<?> caller, boolean unreflect) {
+        String exportsOrOpens = Modifier.isPublic(modifiers)
+                && Modifier.isPublic(clazz.getModifiers()) ? "exports" : "opens";
+        return String.format("%s, %s does not explicitly \"%s\" package %s to %s",
+                cannotSetFieldMessage(caller, unreflect),
+                clazz.getModule(),
+                exportsOrOpens,
+                clazz.getPackageName(),
+                caller.getModule());
+    }
+
+    /**
+     * Returns the exception message for the IllegalAccessException when this
+     * final field cannot be mutated because the caller module is not allowed
+     * to mutate final fields.
+     */
+    private String callerNotAllowedToMutateMessage(Class<?> caller, boolean unreflect) {
+        if (caller != null) {
+            return String.format("%s, %s is not allowed to mutate final fields",
+                    cannotSetFieldMessage(caller, unreflect),
+                    caller.getModule());
+        } else {
+            return notAccessibleToNoCallerMessage(unreflect);
+        }
+    }
+
+    /**
+     * Returns the message for an IllegalAccessException when a field is not
+     * accessible to a JNI attached thread.
+     */
+    private String notAccessibleToNoCallerMessage(boolean unreflect) {
+        return cannotSetFieldMessage("JNI attached thread with no caller frame cannot", unreflect);
+    }
+
+    /**
+     * Returns a message to indicate that the caller cannot set/unreflect this final field.
+     */
+    private String cannotSetFieldMessage(Class<?> caller, boolean unreflect) {
+        return cannotSetFieldMessage(caller + " (in " + caller.getModule() + ") cannot", unreflect);
+    }
+
+    /**
+     * Returns a message to indicate that a field cannot be set/unreflected.
+     */
+    private String cannotSetFieldMessage(String prefix, boolean unreflect) {
+        if (unreflect) {
+            return prefix + " unreflect final field " + clazz.getName() + "." + name
+                    + " (in " + clazz.getModule() + ") for mutation";
+        } else {
+            return prefix + " set final field " + clazz.getName() + "." + name
+                    + " (in " + clazz.getModule() + ")";
+        }
+    }
 }
diff --git a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java
index 835ffef616e..ea4e5e06dcf 100644
--- a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java
+++ b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,4 +78,9 @@ final class ReflectAccess implements JavaLangReflectAccess {
     {
         return ctor.newInstanceWithCaller(args, true, caller);
     }
+
+    @Override
+    public void checkAllowedToUnreflectFinalSetter(Class<?> caller, Field f) throws IllegalAccessException {
+        f.checkAllowedToUnreflectFinalSetter(caller);
+    }
 }
diff --git a/src/java.base/share/classes/java/lang/reflect/doc-files/MutationMethods.html b/src/java.base/share/classes/java/lang/reflect/doc-files/MutationMethods.html
new file mode 100644
index 00000000000..8a731040cd1
--- /dev/null
+++ b/src/java.base/share/classes/java/lang/reflect/doc-files/MutationMethods.html
@@ -0,0 +1,69 @@
+<!doctype html>
+<!--
+ Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<html lang="en">
+<head>
+    <title>Mutation methods</title>
+</head>
+<body>
+
+<h1 id="mutation">Mutation methods</h1>
+
+<p>A number of methods in Java SE API provide <em>write</em> access to non-static
+final fields. This means that Java code can alter the value of a final field
+after the field has been initialized in a constructor.
+
+The methods that provide write access, known as <em>mutation methods</em> are:
+<ul>
+    <li>{@link java.lang.reflect.Field#set(Object, Object)}</li>
+    <li>{@link java.lang.reflect.Field#setBoolean(Object, boolean)}</li>
+    <li>{@link java.lang.reflect.Field#setByte(Object, byte)}</li>
+    <li>{@link java.lang.reflect.Field#setChar(Object, char)}</li>
+    <li>{@link java.lang.reflect.Field#setInt(Object, int)}</li>
+    <li>{@link java.lang.reflect.Field#setLong(Object, long)}</li>
+    <li>{@link java.lang.reflect.Field#setFloat(Object, float)}</li>
+    <li>{@link java.lang.reflect.Field#setDouble(Object, double)}</li>
+    <li>{@link java.lang.invoke.MethodHandles.Lookup#unreflectSetter(java.lang.reflect.Field)}</li>
+</ul>
+
+<p> The use of mutation methods to alter the values of final fields is
+strongly inadvisable because it undermines the correctness of programs written in
+expectation of final fields being immutable.
+
+<p> In the reference implementation, a module can be granted the capability to mutate
+final instance fields of classes in packages that are open to the module using
+the command line option <code>--enable-final-field-mutation=M1,M2, ... Mn}</code> where
+<code>M1</code>, <code>M2</code>, <code>...Mn</code> are module names (for the unnamed
+module, the special value <code>ALL-UNNAMED</code> can be used). Mutation of final
+instance fields of classes from modules not listed by that option is deemed
+<em>illegal</em>.
+The command line option <code>--illegal-final-field-mutation</code> controls how illegal
+final mutation is handled. Valid values for this command line option are "warn", "allow",
+"debug, and "deny".  If this option is not specified then the default is "warn" so that
+illegal final field mutation will result in a warning at runtime.
+
+</body>
+</html>
+
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index fa6e5b4aac3..86e5f317dc7 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -205,7 +205,7 @@ public interface JavaLangAccess {
      * Updates the readability so that module m1 reads m2. The new read edge
      * does not result in a strong reference to m2 (m2 can be GC'ed).
      *
-     * This method is the same as m1.addReads(m2) but without a permission check.
+     * This method is the same as m1.addReads(m2) but without a caller check.
      */
     void addReads(Module m1, Module m2);
 
@@ -259,11 +259,11 @@ public interface JavaLangAccess {
     /**
      * Updates module m to allow access to restricted methods.
      */
-    Module addEnableNativeAccess(Module m);
+    void addEnableNativeAccess(Module m);
 
     /**
-     * Updates module named {@code name} in layer {@code layer} to allow access to restricted methods.
-     * Returns true iff the given module exists in the given layer.
+     * Updates module named {@code name} in layer {@code layer} to allow access to
+     * restricted methods. Returns true iff the given module exists in the given layer.
      */
     boolean addEnableNativeAccess(ModuleLayer layer, String name);
 
@@ -273,7 +273,8 @@ public interface JavaLangAccess {
     void addEnableNativeAccessToAllUnnamed();
 
     /**
-     * Ensure that the given module has native access. If not, warn or throw exception depending on the configuration.
+     * Ensure that the given module has native access. If not, warn or throw exception
+     * depending on the configuration.
      * @param m the module in which native access occurred
      * @param owner the owner of the restricted method being called (or the JNI method being bound)
      * @param methodName the name of the restricted method being called (or the JNI method being bound)
@@ -282,6 +283,31 @@ public interface JavaLangAccess {
      */
     void ensureNativeAccess(Module m, Class<?> owner, String methodName, Class<?> currentClass, boolean jni);
 
+    /**
+     * Enable code in all unnamed modules to mutate final instance fields.
+     */
+    void addEnableFinalMutationToAllUnnamed();
+
+    /**
+     * Enable code in a given module to mutate final instance fields.
+     */
+    boolean tryEnableFinalMutation(Module m);
+
+    /**
+     * Return true if code in a given module is allowed to mutate final instance fields.
+     */
+    boolean isFinalMutationEnabled(Module m);
+
+    /**
+     * Return true if a given module has statically exported the given package to a given other module.
+     */
+    boolean isStaticallyExported(Module module, String pn, Module other);
+
+    /**
+     * Return true if a given module has statically opened the given package to a given other module.
+     */
+    boolean isStaticallyOpened(Module module, String pn, Module other);
+
     /**
      * Returns the ServicesCatalog for the given Layer.
      */
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java
index d0c415d2dc6..965bac67f45 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,4 +67,10 @@ public interface JavaLangReflectAccess {
     /** Returns a new instance created by the given constructor with access check */
     public <T> T newInstance(Constructor<T> ctor, Object[] args, Class<?> caller)
         throws IllegalAccessException, InstantiationException, InvocationTargetException;
+
+    /**
+     * Check that the caller is allowed to unreflect for mutation a final instance field
+     * in a class that is not a record or hidden class.
+     */
+    void checkAllowedToUnreflectFinalSetter(Class<?> caller, Field f) throws IllegalAccessException;
 }
diff --git a/src/java.base/share/classes/jdk/internal/event/FinalFieldMutationEvent.java b/src/java.base/share/classes/jdk/internal/event/FinalFieldMutationEvent.java
new file mode 100644
index 00000000000..4db29d43bd6
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/event/FinalFieldMutationEvent.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.internal.event;
+
+public class FinalFieldMutationEvent extends Event {
+    public Class<?> declaringClass;
+    public String fieldName;
+
+    /**
+     * Commit a FinalFieldMutationEvent if enabled.
+     */
+    public static void offer(Class<?> declaringClass, String fieldName) {
+        if (enabled()) {
+            var event = new FinalFieldMutationEvent();
+            event.declaringClass = declaringClass;
+            event.fieldName = fieldName;
+            event.commit();
+        }
+    }
+
+    public static boolean enabled() {
+        // Generated by JFR
+        return false;
+    }
+}
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index 45cddc9fb6f..4dfc740024e 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -452,9 +452,12 @@ public final class ModuleBootstrap {
         addExtraReads(bootLayer);
         addExtraExportsAndOpens(bootLayer);
 
-        // add enable native access
+        // enable native access to modules specified to --enable-native-access
         addEnableNativeAccess(bootLayer);
 
+        // allow final mutation by modules specified to --enable-final-field-mutation
+        addEnableFinalFieldMutation(bootLayer);
+
         Counters.add("jdk.module.boot.7.adjustModulesTime");
 
         // Step 8: CDS dump phase
@@ -721,7 +724,6 @@ public final class ModuleBootstrap {
      * additional packages specified on the command-line.
      */
     private static void addExtraExportsAndOpens(ModuleLayer bootLayer) {
-
         // --add-exports
         String prefix = "jdk.module.addexports.";
         Map<String, List<String>> extraExports = decode(prefix);
@@ -729,14 +731,12 @@ public final class ModuleBootstrap {
             addExtraExportsOrOpens(bootLayer, extraExports, false);
         }
 
-
         // --add-opens
         prefix = "jdk.module.addopens.";
         Map<String, List<String>> extraOpens = decode(prefix);
         if (!extraOpens.isEmpty()) {
             addExtraExportsOrOpens(bootLayer, extraOpens, true);
         }
-
     }
 
     private static void addExtraExportsOrOpens(ModuleLayer bootLayer,
@@ -807,6 +807,7 @@ public final class ModuleBootstrap {
     private static final Set<String> USER_NATIVE_ACCESS_MODULES;
     private static final Set<String> JDK_NATIVE_ACCESS_MODULES;
     private static final IllegalNativeAccess ILLEGAL_NATIVE_ACCESS;
+    private static final IllegalFinalFieldMutation ILLEGAL_FINAL_FIELD_MUTATION;
 
     public enum IllegalNativeAccess {
         ALLOW,
@@ -814,14 +815,26 @@ public final class ModuleBootstrap {
         DENY
     }
 
+    public enum IllegalFinalFieldMutation {
+        ALLOW,
+        WARN,
+        DEBUG,
+        DENY
+    }
+
+    static {
+        ILLEGAL_NATIVE_ACCESS = decodeIllegalNativeAccess();
+        USER_NATIVE_ACCESS_MODULES = decodeEnableNativeAccess();
+        JDK_NATIVE_ACCESS_MODULES = ModuleLoaderMap.nativeAccessModules();
+        ILLEGAL_FINAL_FIELD_MUTATION = decodeIllegalFinalFieldMutation();
+    }
+
     public static IllegalNativeAccess illegalNativeAccess() {
         return ILLEGAL_NATIVE_ACCESS;
     }
 
-    static {
-        ILLEGAL_NATIVE_ACCESS = addIllegalNativeAccess();
-        USER_NATIVE_ACCESS_MODULES = decodeEnableNativeAccess();
-        JDK_NATIVE_ACCESS_MODULES = ModuleLoaderMap.nativeAccessModules();
+    public static IllegalFinalFieldMutation illegalFinalFieldMutation() {
+        return ILLEGAL_FINAL_FIELD_MUTATION;
     }
 
     /**
@@ -881,7 +894,7 @@ public final class ModuleBootstrap {
     /**
      * Process the --illegal-native-access option (and its default).
      */
-    private static IllegalNativeAccess addIllegalNativeAccess() {
+    private static IllegalNativeAccess decodeIllegalNativeAccess() {
         String value = getAndRemoveProperty("jdk.module.illegal.native.access");
         // don't use a switch: bootstrapping issues!
         if (value == null) {
@@ -899,6 +912,71 @@ public final class ModuleBootstrap {
         }
     }
 
+    /**
+     * Process the --illegal-final-field-mutation option.
+     */
+    private static IllegalFinalFieldMutation decodeIllegalFinalFieldMutation() {
+        String value = getAndRemoveProperty("jdk.module.illegal.final.field.mutation");
+        if (value == null) {
+            return IllegalFinalFieldMutation.WARN; // default
+        } else if (value.equals("allow")) {
+            return IllegalFinalFieldMutation.ALLOW;
+        } else if (value.equals("warn")) {
+            return IllegalFinalFieldMutation.WARN;
+        } else if (value.equals("debug")) {
+            return IllegalFinalFieldMutation.DEBUG;
+        } else if (value.equals("deny")) {
+            return IllegalFinalFieldMutation.DENY;
+        } else {
+            fail("Value specified to --illegal-final-field-mutation not recognized:"
+                    + " '" + value + "'");
+            return null;
+        }
+    }
+
+    /**
+     * Process the modules specified to --enable-final-field-mutation and grant the
+     * capability to mutate finals to specified named modules or all unnamed modules.
+     */
+    private static void addEnableFinalFieldMutation(ModuleLayer bootLayer) {
+        for (String name : decodeEnableFinalFieldMutation()) {
+            if (name.equals("ALL-UNNAMED")) {
+                JLA.addEnableFinalMutationToAllUnnamed();
+            } else {
+                Module m = bootLayer.findModule(name).orElse(null);
+                if (m != null) {
+                    JLA.tryEnableFinalMutation(m);
+                } else {
+                    warnUnknownModule("--enable-final-field-mutation", name);
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the set of module names specified by --enable-final-field-mutation options.
+     */
+    private static Set<String> decodeEnableFinalFieldMutation() {
+        String prefix = "jdk.module.enable.final.field.mutation.";
+        int index = 0;
+        // the system property is removed after decoding
+        String value = getAndRemoveProperty(prefix + index);
+        Set<String> modules = new HashSet<>();
+        if (value == null) {
+            return modules;
+        }
+        while (value != null) {
+            for (String s : value.split(",")) {
+                if (!s.isEmpty()) {
+                    modules.add(s);
+                }
+            }
+            index++;
+            value = getAndRemoveProperty(prefix + index);
+        }
+        return modules;
+    }
+
     /**
      * Decodes the values of --add-reads, -add-exports, --add-opens or
      * --patch-modules options that are encoded in system properties.
diff --git a/src/java.base/share/classes/jdk/internal/module/Modules.java b/src/java.base/share/classes/jdk/internal/module/Modules.java
index 3c3d148e196..760b3ba9a08 100644
--- a/src/java.base/share/classes/jdk/internal/module/Modules.java
+++ b/src/java.base/share/classes/jdk/internal/module/Modules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,6 +139,45 @@ public class Modules {
         JLA.addEnableNativeAccessToAllUnnamed();
     }
 
+    /**
+     * Enable code in all unnamed modules to mutate final instance fields.
+     */
+    public static void addEnableFinalMutationToAllUnnamed() {
+        JLA.addEnableFinalMutationToAllUnnamed();
+    }
+
+    /**
+     * Enable code in a given module to mutate final instance fields.
+     */
+    public static boolean tryEnableFinalMutation(Module m) {
+        return JLA.tryEnableFinalMutation(m);
+    }
+
+    /**
+     * Return true if code in a given module is allowed to mutate final instance fields.
+     */
+    public static boolean isFinalMutationEnabled(Module m) {
+        return JLA.isFinalMutationEnabled(m);
+    }
+
+    /**
+     * Return true if a given module has statically exported the given package to a given
+     * other module. "statically exported" means the module declaration, --add-exports on
+     * the command line, or Add-Exports in the main manifest of an executable JAR.
+     */
+    public static boolean isStaticallyExported(Module m, String pn, Module other) {
+        return JLA.isStaticallyExported(m, pn, other);
+    }
+
+    /**
+     * Return true if a given module has statically opened the given package to a given
+     * other module. "statically open" means the module declaration, --add-opens on the
+     * command line, or Add-Opens in the main manifest of an executable JAR.
+     */
+    public static boolean isStaticallyOpened(Module m, String pn, Module other) {
+        return JLA.isStaticallyOpened(m, pn, other);
+    }
+
     /**
      * Updates module m to use a service.
      * Same as m2.addUses(service) but without a caller check.
diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index 81a4fe32110..9badf2beaeb 100644
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -103,6 +103,7 @@ public final class LauncherHelper {
     private static final String ADD_EXPORTS = "Add-Exports";
     private static final String ADD_OPENS = "Add-Opens";
     private static final String ENABLE_NATIVE_ACCESS = "Enable-Native-Access";
+    private static final String ENABLE_FINAL_FIELD_MUTATION = "Enable-Final-Field-Mutation";
 
     private static StringBuilder outBuf = new StringBuilder();
 
@@ -647,6 +648,8 @@ public final class LauncherHelper {
         if (opens != null) {
             addExportsOrOpens(opens, true);
         }
+
+        // Enable-Native-Access
         String enableNativeAccess = mainAttrs.getValue(ENABLE_NATIVE_ACCESS);
         if (enableNativeAccess != null) {
             if (!enableNativeAccess.equals("ALL-UNNAMED")) {
@@ -655,6 +658,16 @@ public final class LauncherHelper {
             Modules.addEnableNativeAccessToAllUnnamed();
         }
 
+        // Enable-Final-Field-Mutation
+        String enableFinalFieldMutation = mainAttrs.getValue(ENABLE_FINAL_FIELD_MUTATION);
+        if (enableFinalFieldMutation != null) {
+            if (!enableFinalFieldMutation.equals("ALL-UNNAMED")) {
+                abort(null, "java.launcher.jar.error.illegal.effm.value",
+                        enableFinalFieldMutation);
+            }
+            Modules.addEnableFinalMutationToAllUnnamed();
+        }
+
         /*
          * Hand off to FXHelper if it detects a JavaFX application
          * This must be done after ensuring a Main-Class entry
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index 83e08a3e11c..739ef8b8a29 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -70,6 +70,14 @@ java.launcher.opt.footer = \
 \                  by code in modules for which native access is not explicitly enabled.\n\
 \                  <value> is one of "deny", "warn" or "allow". The default value is "warn".\n\
 \                  This option will be removed in a future release.\n\
+\    --enable-final-field-mutation <module name>[,<module name>...]\n\
+\                  allow code in the specified modules to mutate final instance fields.\n\
+\                  <module name> can also be ALL-UNNAMED to indicate code on the class path.\n\
+\    --illegal-final-field-mutation=<value>\n\
+\                  allow or deny final field mutation by code in modules for which final\n\
+\                  field mutation is not explicitly enabled.\n\
+\                  <value> is one of "deny", "warn", "debug", or "allow". The default value is "warn".\n\
+\                  This option will be removed in a future release.\n\
 \    --list-modules\n\
 \                  list observable modules and exit\n\
 \    -d <module name>\n\
@@ -291,6 +299,8 @@ java.launcher.jar.error5=\
     Error: An unexpected error occurred while trying to close file {0}
 java.launcher.jar.error.illegal.ena.value=\
     Error: illegal value \"{0}\" for Enable-Native-Access manifest attribute. Only 'ALL-UNNAMED' is allowed
+java.launcher.jar.error.illegal.effm.value=\
+    Error: illegal value \"{0}\" for Enable-Final-Field-Mutation manifest attribute. Only 'ALL-UNNAMED' is allowed
 java.launcher.init.error=initialization error
 java.launcher.javafx.error1=\
     Error: The JavaFX launchApplication method has the wrong signature, it\n\
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 43719ff619a..462baa5a4a0 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -450,7 +450,7 @@ the JVM.
     > **Note:** This option will be removed in a future release.
 
     -   `allow`: This mode allows illegal native access in all modules,
-        without any warings.
+        without any warnings.
 
     -   `warn`: This mode is identical to `allow` except that a warning
         message is issued for the first illegal native access found in a module.
@@ -465,6 +465,39 @@ the JVM.
     run it with `--illegal-native-access=deny` along with any necessary `--enable-native-access`
     options.
 
+`--enable-final-field-mutation` *module*\[,*module*...\]
+:   Mutation of final fields is possible with the reflection API of the Java Platform.
+    However, it compromises safety and performance in all programs.
+    This option allows code in the specified modules to mutate final fields by reflection.
+    Attempts by code in any other module to mutate final fields by reflection are deemed _illegal_.
+
+    *module* can be the name of a module on the module path, or `ALL-UNNAMED` to indicate
+    code on the class path.
+
+-`--illegal-final-field-mutation=`*parameter*
+:   This option specifies a mode for how _illegal_ final field mutation is handled:
+
+    > **Note:** This option will be removed in a future release.
+
+    -   `allow`: This mode allows illegal final field mutation in all modules,
+        without any warnings.
+
+    -   `warn`: This mode is identical to `allow` except that a warning message is
+        issued for the first illegal final field mutation performaed in a module.
+        This mode is the default for the current JDK but will change in a future
+        release.
+
+    -   `debug`: This mode is identical to `allow` except that a warning message
+        and stack trace are printed for every illegal final field mutation.
+
+    -   `deny`: This mode disables final field mutation. That is, any illegal final
+        field mutation access causes an `IllegalAccessException`. This mode will
+        become the default in a future release.
+
+    To verify that your application is ready for a future version of the JDK,
+    run it with `--illegal-final-field-mutation=deny` along with any necessary
+    `--enable-final-field-mutation` options.
+
 `--finalization=`*value*
 :   Controls whether the JVM performs finalization of objects. Valid values
     are "enabled" and "disabled". Finalization is enabled by default, so the
@@ -701,7 +734,8 @@ the Java HotSpot Virtual Machine.
     - A class descriptor is in decorated format (`Lname;`) when it should not be.
     - A `NULL` parameter is allowed, but its use is questionable.
     - Calling other JNI functions in the scope of `Get/ReleasePrimitiveArrayCritical`
-      or `Get/ReleaseStringCritical`
+      or `Get/ReleaseStringCritical`.
+    - A JNI call was made to mutate a final field.
 
     Expect a performance degradation when this option is used.
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/FinalFieldMutationEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/FinalFieldMutationEvent.java
new file mode 100644
index 00000000000..8f90ad2c8fd
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/FinalFieldMutationEvent.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.events;
+
+import jdk.jfr.Category;
+import jdk.jfr.Description;
+import jdk.jfr.Label;
+import jdk.jfr.Name;
+import jdk.jfr.internal.Type;
+import jdk.jfr.internal.MirrorEvent;
+import jdk.jfr.internal.RemoveFields;
+
+@Category("Java Application")
+@Label("Final Field Mutation")
+@Name(Type.EVENT_NAME_PREFIX + "FinalFieldMutation")
+@RemoveFields("duration")
+@StackFilter({
+        "java.lang.reflect.Field",
+        "java.lang.reflect.ReflectAccess",
+        "java.lang.invoke.MethodHandles$Lookup"
+})
+public final class FinalFieldMutationEvent extends MirrorEvent {
+
+    @Label("Declaring Class")
+    @Description("Declaring class with final field")
+    public Class<?> declaringClass;
+
+    @Label("Field Name")
+    @Description("Field name of final field")
+    public String fieldName;
+
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
index 503a7955e00..53d40c1e5e1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
@@ -76,6 +76,7 @@ public final class JDKEvents {
         jdk.internal.event.VirtualThreadSubmitFailedEvent.class,
         jdk.internal.event.X509CertificateEvent.class,
         jdk.internal.event.X509ValidationEvent.class,
+        jdk.internal.event.FinalFieldMutationEvent.class,
         DirectBufferStatisticsEvent.class,
         InitialSecurityPropertyEvent.class,
         MethodTraceEvent.class,
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
index 48dc0d22cea..7cbd893ee1d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import jdk.jfr.events.ExceptionThrownEvent;
 import jdk.jfr.events.FileForceEvent;
 import jdk.jfr.events.FileReadEvent;
 import jdk.jfr.events.FileWriteEvent;
+import jdk.jfr.events.FinalFieldMutationEvent;
 import jdk.jfr.events.ProcessStartEvent;
 import jdk.jfr.events.SecurityPropertyModificationEvent;
 import jdk.jfr.events.SecurityProviderServiceEvent;
@@ -77,6 +78,7 @@ final class MirrorEvents {
         register("jdk.internal.event.ErrorThrownEvent", ErrorThrownEvent.class);
         register("jdk.internal.event.ExceptionStatisticsEvent", ExceptionStatisticsEvent.class);
         register("jdk.internal.event.ExceptionThrownEvent", ExceptionThrownEvent.class);
+        register("jdk.internal.event.FinalFieldMutationEvent", FinalFieldMutationEvent.class);
     };
 
     private static void register(String eventClassName, Class<? extends MirrorEvent> mirrorClass) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index 30bd96ba86a..eaba86e6327 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -125,6 +125,7 @@ public final class PlatformEventType extends Type {
                      Type.EVENT_NAME_PREFIX + "FileWrite" -> 6;
                 case Type.EVENT_NAME_PREFIX + "FileRead",
                      Type.EVENT_NAME_PREFIX + "FileForce" -> 5;
+                case Type.EVENT_NAME_PREFIX + "FinalFieldMutation" -> 4;
                 default -> 3;
             };
         }
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index eb3b8626722..e4dc3315d2b 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -117,6 +117,11 @@
       <setting name="period">everyChunk</setting>
     </event>
 
+    <event name="jdk.FinalFieldMutation">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
     <event name="jdk.SyncOnValueBasedClass">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 5ffdc8d9e4d..619d7d90a53 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -117,6 +117,11 @@
       <setting name="period">everyChunk</setting>
     </event>
 
+    <event name="jdk.FinalFieldMutation">
+      <setting name="enabled">true</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
     <event name="jdk.SyncOnValueBasedClass">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
diff --git a/test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinals.java b/test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinals.java
new file mode 100644
index 00000000000..ecf89f1a5da
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinals.java
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+/**
+ * Invoked by MutateFinalsTest, either directly or in a child VM, with the name of the
+ * test method in this class to execute.
+ */
+
+public class MutateFinals {
+
+    /**
+     *  Usage: java MutateFinals <method-name>
+     */
+    public static void main(String[] args) throws Exception {
+        invoke(args[0]);
+    }
+
+    /**
+     * Invokes the given method.
+     */
+    static void invoke(String methodName) throws Exception {
+        Method m = MutateFinals.class.getDeclaredMethod(methodName);
+        m.invoke(null);
+    }
+
+    /**
+     * JNI SetObjectField.
+     */
+    private static void testJniSetObjectField() throws Exception {
+        class C {
+            final Object value;
+            C(Object value) {
+                this.value = value;
+            }
+        }
+        Object oldValue = new Object();
+        Object newValue = new Object();
+        var obj = new C(oldValue);
+        jniSetObjectField(obj, newValue);
+        assertTrue(obj.value == newValue);
+    }
+
+    /**
+     * JNI SetBooleanField.
+     */
+    private static void testJniSetBooleanField() throws Exception {
+        class C {
+            final boolean value;
+            C(boolean value) {
+                this.value = value;
+            }
+        }
+        var obj = new C(false);
+        jniSetBooleanField(obj, true);
+        assertTrue(obj.value);
+    }
+
+    /**
+     * JNI SetByteField.
+     */
+    private static void testJniSetByteField() throws Exception {
+        class C {
+            final byte value;
+            C(byte value) {
+                this.value = value;
+            }
+        }
+        byte oldValue = (byte) 1;
+        byte newValue = (byte) 2;
+        var obj = new C(oldValue);
+        jniSetByteField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetCharField.
+     */
+    private static void testJniSetCharField() throws Exception {
+        class C {
+            final char value;
+            C(char value) {
+                this.value = value;
+            }
+        }
+        char oldValue = 'A';
+        char newValue = 'B';
+        var obj = new C(oldValue);
+        jniSetCharField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetShortField.
+     */
+    private static void testJniSetShortField() throws Exception {
+        class C {
+            final short value;
+            C(short value) {
+                this.value = value;
+            }
+        }
+        short oldValue = (short) 1;
+        short newValue = (short) 2;
+        var obj = new C(oldValue);
+        jniSetShortField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetIntField.
+     */
+    private static void testJniSetIntField() throws Exception {
+        class C {
+            final int value;
+            C(int value) {
+                this.value = value;
+            }
+        }
+        int oldValue = 1;
+        int newValue = 2;
+        var obj = new C(oldValue);
+        jniSetIntField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetLongField.
+     */
+    private static void testJniSetLongField() throws Exception {
+        class C {
+            final long value;
+            C(long value) {
+                this.value = value;
+            }
+        }
+        long oldValue = 1L;
+        long newValue = 2L;
+        var obj = new C(oldValue);
+        jniSetLongField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetFloatField.
+     */
+    private static void testJniSetFloatField() throws Exception {
+        class C {
+            final float value;
+            C(float value) {
+                this.value = value;
+            }
+        }
+        float oldValue = 1.0f;
+        float newValue = 2.0f;
+        var obj = new C(oldValue);
+        jniSetFloatField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetDoubleField.
+     */
+    private static void testJniSetDoubleField() throws Exception {
+        class C {
+            final double value;
+            C(double value) {
+                this.value = value;
+            }
+        }
+        double oldValue = 1.0d;
+        double newValue = 2.0d;
+        var obj = new C(oldValue);
+        jniSetDoubleField(obj, newValue);
+        assertEquals(newValue, obj.value);
+    }
+
+    /**
+     * JNI SetStaticObjectField.
+     */
+    private static void testJniSetStaticObjectField() throws Exception {
+        class C {
+            static final Object value = new Object();
+        }
+        Object newValue = new Object();
+        jniSetStaticObjectField(C.class, newValue);
+        assertTrue(C.value == newValue);
+    }
+
+    /**
+     * JNI SetStaticBooleanField.
+     */
+    private static void testJniSetStaticBooleanField() throws Exception {
+        class C {
+            static final boolean value = false;
+        }
+        jniSetStaticBooleanField(C.class, true);
+        // use reflection as field treated as constant by compiler
+        boolean value = (boolean) C.class.getDeclaredField("value").get(null);
+        assertTrue(value);
+    }
+
+    /**
+     * JNI SetStaticByteField.
+     */
+    private static void testJniSetStaticByteField() throws Exception {
+        class C {
+            static final byte value = (byte) 1;
+        }
+        byte newValue = (byte) 2;
+        jniSetStaticByteField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        byte value = (byte) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    /**
+     * JNI SetStaticCharField.
+     */
+    private static void testJniSetStaticCharField() throws Exception {
+        class C {
+            static final char value = 'A';
+        }
+        char newValue = 'B';
+        jniSetStaticCharField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        char value = (char) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    /**
+     * JNI SetStaticShortField.
+     */
+    private static void testJniSetStaticShortField() throws Exception {
+        class C {
+            static final short value = (short) 1;
+        }
+        short newValue = (short) 2;
+        jniSetStaticShortField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        short value = (short) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    /**
+     * JNI SetStaticIntField.
+     */
+    private static void testJniSetStaticIntField() throws Exception {
+        class C {
+            static final int value = 1;
+        }
+        int newValue = 2;
+        jniSetStaticIntField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        int value = (int) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    /**
+     * JNI SetStaticLongField.
+     */
+    private static void testJniSetStaticLongField() throws Exception {
+        class C {
+            static final long value = 1L;
+        }
+        long newValue = 2L;
+        jniSetStaticLongField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        long value = (long) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    /**
+     * JNI SetStaticFloatField.
+     */
+    private static void testJniSetStaticFloatField() throws Exception {
+        class C {
+            static final float value = 1.0f;
+        }
+        float newValue = 2.0f;
+        jniSetStaticFloatField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        float value = (float) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    /**
+     * JNI SetStaticDoubleField.
+     */
+    private static void testJniSetStaticDoubleField() throws Exception {
+        class C {
+            static final double value = 1.0d;
+        }
+        double newValue = 2.0f;
+        jniSetStaticDoubleField(C.class, newValue);
+        // use reflection as field treated as constant by compiler
+        double value = (double) C.class.getDeclaredField("value").get(null);
+        assertEquals(newValue, value);
+    }
+
+    private static native void jniSetObjectField(Object obj, Object value);
+    private static native void jniSetBooleanField(Object obj, boolean value);
+    private static native void jniSetByteField(Object obj, byte value);
+    private static native void jniSetCharField(Object obj, char value);
+    private static native void jniSetShortField(Object obj, short value);
+    private static native void jniSetIntField(Object obj, int value);
+    private static native void jniSetLongField(Object obj, long value);
+    private static native void jniSetFloatField(Object obj, float value);
+    private static native void jniSetDoubleField(Object obj, double value);
+
+    private static native void jniSetStaticObjectField(Class<?> clazz, Object value);
+    private static native void jniSetStaticBooleanField(Class<?> clazz, boolean value);
+    private static native void jniSetStaticByteField(Class<?> clazz, byte value);
+    private static native void jniSetStaticCharField(Class<?> clazz, char value);
+    private static native void jniSetStaticShortField(Class<?> clazz, short value);
+    private static native void jniSetStaticIntField(Class<?> clazz, int value);
+    private static native void jniSetStaticLongField(Class<?> clazz, long value);
+    private static native void jniSetStaticFloatField(Class<?> clazz, float value);
+    private static native void jniSetStaticDoubleField(Class<?> clazz, double value);
+
+    static {
+        System.loadLibrary("MutateFinals");
+    }
+
+    private static void assertTrue(boolean e) {
+        if (!e) throw new RuntimeException("Not true as expected");
+    }
+
+    private static void assertEquals(Object expected, Object actual) {
+        if (!Objects.equals(expected, actual)) {
+            throw new RuntimeException("Actual: " + actual + ", expected: " + expected);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinalsTest.java b/test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinalsTest.java
new file mode 100644
index 00000000000..0ae4ae231b9
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/mutateFinals/MutateFinalsTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8353835
+ * @summary Test JNI SetXXXField methods to set final instance and final static fields
+ * @key randomness
+ * @modules java.management
+ * @library /test/lib
+ * @compile MutateFinals.java
+ * @run junit/native/timeout=300 MutateFinalsTest
+ */
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+class MutateFinalsTest {
+
+    static String javaLibraryPath;
+
+    @BeforeAll
+    static void init() {
+        javaLibraryPath = System.getProperty("java.library.path");
+    }
+
+    /**
+     * The names of the test methods that use JNI to set final instance fields.
+     */
+    static Stream<String> mutateInstanceFieldMethods() {
+        return Stream.of(
+                "testJniSetObjectField",
+                "testJniSetBooleanField",
+                "testJniSetByteField",
+                "testJniSetCharField",
+                "testJniSetShortField",
+                "testJniSetIntField",
+                "testJniSetLongField",
+                "testJniSetFloatField",
+                "testJniSetDoubleField"
+        );
+    }
+
+    /**
+     * The names of the test methods that use JNI to set final static fields.
+     */
+    static Stream<String> mutateStaticFieldMethods() {
+        return Stream.of(
+                "testJniSetStaticObjectField",
+                "testJniSetStaticBooleanField",
+                "testJniSetStaticByteField",
+                "testJniSetStaticCharField",
+                "testJniSetStaticShortField",
+                "testJniSetStaticIntField",
+                "testJniSetStaticLongField",
+                "testJniSetStaticFloatField",
+                "testJniSetStaticDoubleField"
+        );
+    }
+
+    /**
+     * The names of all test methods that use JNI to set final fields.
+     */
+    static Stream<String> allMutationMethods() {
+        return Stream.concat(mutateInstanceFieldMethods(), mutateStaticFieldMethods());
+    }
+
+    /**
+     * Mutate a final field with JNI.
+     */
+    @ParameterizedTest
+    @MethodSource("allMutationMethods")
+    void testMutateFinal(String methodName) throws Exception {
+        MutateFinals.invoke(methodName);
+    }
+
+    /**
+     * Mutate a final instance field with JNI. The test launches a child VM with -Xcheck:jni
+     * and expects a warning in the output.
+     */
+    @ParameterizedTest
+    @MethodSource("mutateInstanceFieldMethods")
+    void testMutateInstanceFinalWithXCheckJni(String methodName) throws Exception {
+        test(methodName, "-Xcheck:jni")
+            .shouldContain("WARNING in native method: Set<Type>Field called to mutate final instance field")
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Mutate final static fields with JNI. The test launches a child VM with -Xcheck:jni
+     * and expects a warning in the output.
+     */
+    @ParameterizedTest
+    @MethodSource("mutateStaticFieldMethods")
+    void testMutateStaticFinalWithXCheckJni(String methodName) throws Exception {
+        test(methodName, "-Xcheck:jni")
+            .shouldContain("WARNING in native method: SetStatic<Type>Field called to mutate final static field")
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Mutate a final instance field with JNI. The test launches a child VM with -Xlog
+     * and expects a log message in the output.
+     */
+    @ParameterizedTest
+    @MethodSource("mutateInstanceFieldMethods")
+    void testMutateInstanceFinalWithLogging(String methodName) throws Exception {
+        String type = methodName.contains("Object") ? "Object" : "<Type>";
+        test(methodName, "-Xlog:jni=debug")
+            .shouldContain("[debug][jni] Set" + type + "Field mutated final instance field")
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Mutate a final static field with JNI. The test launches a child VM with -Xlog
+     * and expects a log message in the output.
+     */
+    @ParameterizedTest
+    @MethodSource("mutateStaticFieldMethods")
+    void testMutateStaticFinalWithLogging(String methodName) throws Exception {
+        String type = methodName.contains("Object") ? "Object" : "<Type>";
+        test(methodName, "-Xlog:jni=debug")
+            .shouldContain("[debug][jni] SetStatic" + type + "Field mutated final static field")
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Launches MutateFinals with the given method name as parameter, and the given VM options.
+     */
+    private OutputAnalyzer test(String methodName, String... vmopts) throws Exception {
+        Stream<String> s1 = Stream.of(
+                "-Djava.library.path=" + javaLibraryPath,
+                "--enable-native-access=ALL-UNNAMED");
+        Stream<String> s2 = Stream.of(vmopts);
+        Stream<String> s3 = Stream.of("MutateFinals", methodName);
+        String[] opts = Stream.concat(Stream.concat(s1, s2), s3).toArray(String[]::new);
+        var outputAnalyzer = ProcessTools
+                .executeTestJava(opts)
+                .outputTo(System.err)
+                .errorTo(System.err);
+        return outputAnalyzer;
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/jni/mutateFinals/libMutateFinals.c b/test/hotspot/jtreg/runtime/jni/mutateFinals/libMutateFinals.c
new file mode 100644
index 00000000000..b903169484b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/jni/mutateFinals/libMutateFinals.c
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdio.h>
+#include "jni.h"
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetObjectField(JNIEnv *env, jclass ignore, jobject obj, jobject value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "Ljava/lang/Object;");
+    if (fid != NULL) {
+        (*env)->SetObjectField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetBooleanField(JNIEnv *env, jclass ignore, jobject obj, jboolean value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "Z");
+    if (fid != NULL) {
+        (*env)->SetBooleanField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetByteField(JNIEnv *env, jclass ignore, jobject obj, jbyte value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "B");
+    if (fid != NULL) {
+        (*env)->SetByteField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetCharField(JNIEnv *env, jclass ignore, jobject obj, jchar value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "C");
+    if (fid != NULL) {
+        (*env)->SetCharField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetShortField(JNIEnv *env, jclass ignore, jobject obj, jshort value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "S");
+    if (fid != NULL) {
+        (*env)->SetShortField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetIntField(JNIEnv *env, jclass ignore, jobject obj, jint value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "I");
+    if (fid != NULL) {
+        (*env)->SetIntField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetLongField(JNIEnv *env, jclass ignore, jobject obj, jlong value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "J");
+    if (fid != NULL) {
+        (*env)->SetLongField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetFloatField(JNIEnv *env, jclass ignore, jobject obj, jfloat value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "F");
+    if (fid != NULL) {
+        (*env)->SetFloatField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetDoubleField(JNIEnv *env, jclass ignore, jobject obj, jdouble value) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jfieldID fid = (*env)->GetFieldID(env, clazz, "value", "D");
+    if (fid != NULL) {
+        (*env)->SetDoubleField(env, obj, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticObjectField(JNIEnv *env, jclass ignore, jclass clazz, jobject value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "Ljava/lang/Object;");
+    if (fid != NULL) {
+        (*env)->SetStaticObjectField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticBooleanField(JNIEnv *env, jclass ignore, jclass clazz, jboolean value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "Z");
+    if (fid != NULL) {
+        (*env)->SetStaticBooleanField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticByteField(JNIEnv *env, jclass ignore, jclass clazz, jbyte value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "B");
+    if (fid != NULL) {
+        (*env)->SetStaticByteField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticCharField(JNIEnv *env, jclass ignore, jclass clazz, jchar value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "C");
+    if (fid != NULL) {
+        (*env)->SetStaticCharField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticShortField(JNIEnv *env, jclass ignore, jclass clazz, jshort value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "S");
+    if (fid != NULL) {
+        (*env)->SetStaticShortField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticIntField(JNIEnv *env, jclass ignore, jclass clazz, jint value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "I");
+    if (fid != NULL) {
+        (*env)->SetStaticIntField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticLongField(JNIEnv *env, jclass ignore, jclass clazz, jlong value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "J");
+    if (fid != NULL) {
+        (*env)->SetStaticLongField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticFloatField(JNIEnv *env, jclass ignore, jclass clazz, jfloat value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "F");
+    if (fid != NULL) {
+        (*env)->SetStaticFloatField(env, clazz, fid, value);
+    }
+}
+
+JNIEXPORT void JNICALL Java_MutateFinals_jniSetStaticDoubleField(JNIEnv *env, jclass ignore, jclass clazz, jdouble value) {
+    jfieldID fid = (*env)->GetStaticFieldID(env, clazz, "value", "D");
+    if (fid != NULL) {
+        (*env)->SetStaticDoubleField(env, clazz, fid, value);
+    }
+}
diff --git a/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java b/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java
index 7997e1266c2..b60c35fc30b 100644
--- a/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions
  *                                 -XX:-VerifyDependencies
  *                                 -esa
+ *                                 --enable-final-field-mutation=ALL-UNNAMED
  *                                 test.java.lang.invoke.MethodHandlesGeneralTest
  */
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java
index 9e2d01ec7c5..343b15a1caf 100644
--- a/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java
+++ b/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,12 @@
  * @compile TestFieldLookupAccessibility.java
  *          pkg/A.java pkg/B_extends_A.java pkg/C.java
  *          pkg/subpkg/B_extends_A.java pkg/subpkg/C.java
- * @run testng/othervm TestFieldLookupAccessibility
+ * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED -DwriteAccess=true TestFieldLookupAccessibility
+ * @run testng/othervm --illegal-final-field-mutation=deny -DwriteAccess=false TestFieldLookupAccessibility
  */
 
-import org.testng.Assert;
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import pkg.B_extends_A;
@@ -48,6 +50,14 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class TestFieldLookupAccessibility {
+    static boolean writeAccess;
+
+    @BeforeClass
+    static void setup() {
+        String s = System.getProperty("writeAccess");
+        assertNotNull(s);
+        writeAccess = Boolean.valueOf(s);
+    }
 
     // The set of possible field lookup mechanisms
     enum FieldLookup {
@@ -118,7 +128,11 @@ public class TestFieldLookupAccessibility {
             }
 
             boolean isAccessible(Field f) {
-                return !(Modifier.isStatic(f.getModifiers()) && Modifier.isFinal(f.getModifiers()));
+                if (Modifier.isFinal(f.getModifiers())) {
+                    return !Modifier.isStatic(f.getModifiers()) && writeAccess;
+                } else {
+                    return true;
+                }
             }
 
             // Setting the accessibility bit of a Field grants access to non-static
@@ -226,15 +240,15 @@ public class TestFieldLookupAccessibility {
                 collect(Collectors.toSet());
         if (!actualFieldNames.equals(expected)) {
             if (actualFieldNames.isEmpty()) {
-                Assert.assertEquals(actualFieldNames, expected, "No accessibility failures:");
+                assertEquals(actualFieldNames, expected, "No accessibility failures:");
             }
             else {
-                Assert.assertEquals(actualFieldNames, expected, "Accessibility failures differ:");
+                assertEquals(actualFieldNames, expected, "Accessibility failures differ:");
             }
         }
         else {
             if (!actual.values().stream().allMatch(IllegalAccessException.class::isInstance)) {
-                Assert.fail("Expecting an IllegalArgumentException for all failures " + actual);
+                fail("Expecting an IllegalArgumentException for all failures " + actual);
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/unreflect/UnreflectTest.java b/test/jdk/java/lang/invoke/unreflect/UnreflectTest.java
index 31dc851f4ea..b034d63a223 100644
--- a/test/jdk/java/lang/invoke/unreflect/UnreflectTest.java
+++ b/test/jdk/java/lang/invoke/unreflect/UnreflectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,10 @@
 /*
  * @test
  * @bug 8238358 8247444
- * @run testng/othervm UnreflectTest
  * @summary Test Lookup::unreflectSetter and Lookup::unreflectVarHandle on
  *          trusted final fields (declared in hidden classes and records)
+ * @run junit/othervm --enable-final-field-mutation=ALL-UNNAMED -DwriteAccess=true UnreflectTest
+ * @run junit/othervm --illegal-final-field-mutation=deny -DwriteAccess=false UnreflectTest
  */
 
 import java.io.IOException;
@@ -38,25 +39,25 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class UnreflectTest {
-    static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-    static final Class<?> hiddenClass = defineHiddenClass();
-    private static Class<?> defineHiddenClass() {
+class UnreflectTest {
+    static Class<?> hiddenClass;
+    static boolean writeAccess;
+
+    @BeforeAll
+    static void setup() throws Exception {
         String classes = System.getProperty("test.classes");
-        Path cf = Paths.get(classes, "Fields.class");
-        try {
-            byte[] bytes = Files.readAllBytes(cf);
-            return MethodHandles.lookup().defineHiddenClass(bytes, true).lookupClass();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
+        Path cf = Path.of(classes, "Fields.class");
+        byte[] bytes = Files.readAllBytes(cf);
+        hiddenClass = MethodHandles.lookup().defineHiddenClass(bytes, true).lookupClass();
+
+        String s = System.getProperty("writeAccess");
+        assertNotNull(s);
+        writeAccess = Boolean.valueOf(s);
     }
 
     /*
@@ -64,7 +65,7 @@ public class UnreflectTest {
      * can write the value of a non-static final field in a normal class
      */
     @Test
-    public void testFieldsInNormalClass() throws Throwable {
+    void testFieldsInNormalClass() throws Throwable {
         // despite the name "HiddenClass", this class is loaded by the
         // class loader as non-hidden class
         Class<?> c = Fields.class;
@@ -72,7 +73,11 @@ public class UnreflectTest {
         assertFalse(c.isHidden());
         readOnlyAccessibleObject(c, "STATIC_FINAL", null, true);
         readWriteAccessibleObject(c, "STATIC_NON_FINAL", null, false);
-        readWriteAccessibleObject(c, "FINAL", o, true);
+        if (writeAccess) {
+            readWriteAccessibleObject(c, "FINAL", o, true);
+        } else {
+            readOnlyAccessibleObject(c, "FINAL", o, true);
+        }
         readWriteAccessibleObject(c, "NON_FINAL", o, false);
     }
 
@@ -81,7 +86,7 @@ public class UnreflectTest {
      * has NO write the value of a non-static final field in a hidden class
      */
     @Test
-    public void testFieldsInHiddenClass() throws Throwable {
+    void testFieldsInHiddenClass() throws Throwable {
         assertTrue(hiddenClass.isHidden());
         Object o = hiddenClass.newInstance();
         readOnlyAccessibleObject(hiddenClass, "STATIC_FINAL", null, true);
@@ -99,7 +104,8 @@ public class UnreflectTest {
      * Test Lookup::unreflectSetter and Lookup::unreflectVarHandle that
      * cannot write the value of a non-static final field in a record class
      */
-    public void testFieldsInRecordClass() throws Throwable {
+    @Test
+    void testFieldsInRecordClass() throws Throwable {
         assertTrue(TestRecord.class.isRecord());
         Object o = new TestRecord(1);
         readOnlyAccessibleObject(TestRecord.class, "STATIC_FINAL", null, true);
@@ -121,16 +127,12 @@ public class UnreflectTest {
         assertTrue(f.trySetAccessible());
 
         // Field object with read-only access
-        MethodHandle mh = LOOKUP.unreflectGetter(f);
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        MethodHandle mh = lookup.unreflectGetter(f);
         Object value = Modifier.isStatic(modifier) ? mh.invoke() : mh.invoke(o);
         assertTrue(value == f.get(o));
-        try {
-            LOOKUP.unreflectSetter(f);
-            assertTrue(false, "should fail to unreflect a setter for " + name);
-        } catch (IllegalAccessException e) {
-        }
-
-        VarHandle vh = LOOKUP.unreflectVarHandle(f);
+        assertThrows(IllegalAccessException.class, () -> lookup.unreflectSetter(f));
+        VarHandle vh = lookup.unreflectVarHandle(f);
         if (isFinal) {
             assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
         } else {
@@ -163,7 +165,7 @@ public class UnreflectTest {
             throw e;
         }
 
-        VarHandle vh = LOOKUP.unreflectVarHandle(f);
+        VarHandle vh = MethodHandles.lookup().unreflectVarHandle(f);
         if (isFinal) {
             assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
         } else {
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/HiddenClassTest.java b/test/jdk/java/lang/reflect/AccessibleObject/HiddenClassTest.java
index 273523bee65..6fc03934666 100644
--- a/test/jdk/java/lang/reflect/AccessibleObject/HiddenClassTest.java
+++ b/test/jdk/java/lang/reflect/AccessibleObject/HiddenClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
 
 /**
  * @test
- * @build Fields HiddenClassTest
- * @run testng/othervm HiddenClassTest
  * @summary Test java.lang.reflect.AccessibleObject with modules
+ * @run junit/othervm --enable-final-field-mutation=ALL-UNNAMED -DwriteAccess=true HiddenClassTest
+ * @run junit/othervm --illegal-final-field-mutation=deny -DwriteAccess=false HiddenClassTest
  */
 
 import java.io.IOException;
@@ -37,22 +37,24 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class HiddenClassTest {
-    static final Class<?> hiddenClass = defineHiddenClass();
-    private static Class<?> defineHiddenClass() {
+class HiddenClassTest {
+    static Class<?> hiddenClass;
+    static boolean writeAccess;
+
+    @BeforeAll
+    static void setup() throws Exception {
         String classes = System.getProperty("test.classes");
-        Path cf = Paths.get(classes, "Fields.class");
-        try {
-            byte[] bytes = Files.readAllBytes(cf);
-            return MethodHandles.lookup().defineHiddenClass(bytes, true).lookupClass();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
+        Path cf = Path.of(classes, "Fields.class");
+        byte[] bytes = Files.readAllBytes(cf);
+        hiddenClass = MethodHandles.lookup().defineHiddenClass(bytes, true).lookupClass();
+
+        String s = System.getProperty("writeAccess");
+        assertNotNull(s);
+        writeAccess = Boolean.valueOf(s);
     }
 
     /*
@@ -60,7 +62,7 @@ public class HiddenClassTest {
      * in a normal class
      */
     @Test
-    public void testFieldsInNormalClass() throws Throwable {
+    void testFieldsInNormalClass() throws Throwable {
         // despite the name "HiddenClass", this class is loaded by the
         // class loader as non-hidden class
         Class<?> c = Fields.class;
@@ -68,7 +70,11 @@ public class HiddenClassTest {
         assertFalse(c.isHidden());
         readOnlyAccessibleObject(c, "STATIC_FINAL", null, true);
         readWriteAccessibleObject(c, "STATIC_NON_FINAL", null, false);
-        readWriteAccessibleObject(c, "FINAL", o, true);
+        if (writeAccess) {
+            readWriteAccessibleObject(c, "FINAL", o, true);
+        } else {
+            readOnlyAccessibleObject(c, "FINAL", o, true);
+        }
         readWriteAccessibleObject(c, "NON_FINAL", o, false);
     }
 
@@ -77,7 +83,7 @@ public class HiddenClassTest {
      * in a hidden class
      */
     @Test
-    public void testFieldsInHiddenClass() throws Throwable {
+    void testFieldsInHiddenClass() throws Throwable {
         assertTrue(hiddenClass.isHidden());
         Object o = hiddenClass.newInstance();
         readOnlyAccessibleObject(hiddenClass, "STATIC_FINAL", null, true);
@@ -96,11 +102,7 @@ public class HiddenClassTest {
         }
         assertTrue(f.trySetAccessible());
         assertTrue(f.get(o) != null);
-        try {
-            f.set(o, null);
-            assertTrue(false, "should fail to set " + name);
-        } catch (IllegalAccessException e) {
-        }
+        assertThrows(IllegalAccessException.class, () -> f.set(o, null));
     }
 
     private static void readWriteAccessibleObject(Class<?> c, String name, Object o, boolean isFinal) throws Exception {
@@ -113,10 +115,6 @@ public class HiddenClassTest {
         }
         assertTrue(f.trySetAccessible());
         assertTrue(f.get(o) != null);
-        try {
-            f.set(o, null);
-        } catch (IllegalAccessException e) {
-            throw e;
-        }
+        f.set(o, null);
     }
 }
diff --git a/test/jdk/java/lang/reflect/Field/NegativeTest.java b/test/jdk/java/lang/reflect/Field/NegativeTest.java
index 874686e55b1..fe1f2dd7480 100644
--- a/test/jdk/java/lang/reflect/Field/NegativeTest.java
+++ b/test/jdk/java/lang/reflect/Field/NegativeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
 /**
  * @test
  * @bug 8277451
- * @run testng NegativeTest
  * @summary Test exception thrown due to bad receiver and bad value on
  *          Field with and without setAccessible(true)
+ * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED NegativeTest
  */
 
 import java.lang.reflect.Field;
diff --git a/test/jdk/java/lang/reflect/Field/Set.java b/test/jdk/java/lang/reflect/Field/Set.java
index 6232026cee3..b369ea07d45 100644
--- a/test/jdk/java/lang/reflect/Field/Set.java
+++ b/test/jdk/java/lang/reflect/Field/Set.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4250960 5044412
  * @summary Should not be able to set final fields through reflection unless setAccessible(true) passes and is not static
  * @author David Bowen (modified by Doug Lea)
+ * @run main/othervm --enable-final-field-mutation=ALL-UNNAMED Set
 */
 
 import java.lang.reflect.*;
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/FinalFieldMutationEventTest.java b/test/jdk/java/lang/reflect/Field/mutateFinals/FinalFieldMutationEventTest.java
new file mode 100644
index 00000000000..ea1a28221fb
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/FinalFieldMutationEventTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8353835
+ * @summary Basic test for JFR FinalFieldMutation event
+ * @requires vm.hasJFR
+ * @modules jdk.jfr/jdk.jfr.events
+ * @run junit FinalFieldMutationEventTest
+ * @run junit/othervm --illegal-final-field-mutation=allow FinalFieldMutationEventTest
+ * @run junit/othervm --illegal-final-field-mutation=warn FinalFieldMutationEventTest
+ * @run junit/othervm --illegal-final-field-mutation=debug FinalFieldMutationEventTest
+ * @run junit/othervm --illegal-final-field-mutation=deny FinalFieldMutationEventTest
+ */
+
+import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordingFile;
+import jdk.jfr.events.FinalFieldMutationEvent;
+import jdk.jfr.events.StackFilter;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class FinalFieldMutationEventTest {
+    private static final String EVENT_NAME = "jdk.FinalFieldMutation";
+
+    /**
+     * Test class with final field.
+     */
+    private static class C {
+        final int value;
+        C(int value) {
+            this.value = value;
+        }
+    }
+
+    /**
+     * Test jdk.FinalFieldMutation is recorded when mutating a final field.
+     */
+    @Test
+    void testFieldSet() throws Exception {
+        Field field = C.class.getDeclaredField("value");
+        field.setAccessible(true);
+
+        try (Recording recording = new Recording()) {
+            recording.enable(EVENT_NAME).withStackTrace();
+
+            boolean mutated = false;
+            recording.start();
+            try {
+                var obj = new C(100);
+                try {
+                    field.setInt(obj, 200);
+                    mutated = true;
+                } catch (IllegalAccessException e) {
+                    // denied
+                }
+            } finally {
+                recording.stop();
+            }
+
+            // FinalFieldMutation event should be recorded if field mutated
+            List<RecordedEvent> events = find(recording, EVENT_NAME);
+            System.err.println(events);
+            if (mutated) {
+                assertEquals(1, events.size(), "1 event expected");
+                checkEvent(events.get(0), field, "FinalFieldMutationEventTest::testFieldSet");
+            } else {
+                assertEquals(0, events.size(), "No events expected");
+            }
+        }
+    }
+
+    /**
+     * Test jdk.FinalFieldMutation is recorded when unreflecting a field field for mutation.
+     */
+    @Test
+    void testUnreflectSetter() throws Exception {
+        Field field = C.class.getDeclaredField("value");
+        field.setAccessible(true);
+
+        try (Recording recording = new Recording()) {
+            recording.enable(EVENT_NAME).withStackTrace();
+
+            boolean unreflected = false;
+            recording.start();
+            try {
+                MethodHandles.lookup().unreflectSetter(field);
+                unreflected = true;
+            } catch (IllegalAccessException e) {
+                // denied
+            } finally {
+                recording.stop();
+            }
+
+            // FinalFieldMutation event should be recorded if field unreflected for set
+            List<RecordedEvent> events = find(recording, EVENT_NAME);
+            System.err.println(events);
+            if (unreflected) {
+                assertEquals(1, events.size(), "1 event expected");
+                checkEvent(events.get(0), field, "FinalFieldMutationEventTest::testUnreflectSetter");
+            } else {
+                assertEquals(0, events.size(), "No events expected");
+            }
+        }
+    }
+
+    /**
+     * Test that a FinalFieldMutationEvent event has the declaringClass and fieldName of
+     * the given Field, and the expected top frame.
+     */
+    private void checkEvent(RecordedEvent e, Field f, String expectedTopFrame) {
+        RecordedClass clazz = e.getClass("declaringClass");
+        assertNotNull(clazz);
+        assertEquals(f.getDeclaringClass().getName(), clazz.getName());
+        assertEquals(f.getName(), e.getString("fieldName"));
+
+        // check the top-frame of the stack trace
+        RecordedMethod m = e.getStackTrace().getFrames().getFirst().getMethod();
+        assertEquals(expectedTopFrame, m.getType().getName() + "::" + m.getName());
+    }
+
+    /**
+     * Tests that FinalFieldMutationEvent's stack filter value names classes/methods that
+     * exist. This will help detect stale values when the implementation is refactored.
+     */
+    @Test
+    void testFinalFieldMutationEventStackFilter() throws Exception {
+        String[] filters = FinalFieldMutationEvent.class.getAnnotation(StackFilter.class).value();
+        for (String filter : filters) {
+            String[] classAndMethod = filter.split("::");
+            String cn = classAndMethod[0];
+
+            // throws if class not found
+            Class<?> clazz = Class.forName(cn);
+
+            // if the filter has a method name then check a method of that name exists
+            if (classAndMethod.length > 1) {
+                String mn = classAndMethod[1];
+                Method method = Stream.of(clazz.getDeclaredMethods())
+                        .filter(m -> m.getName().equals(mn))
+                        .findFirst()
+                        .orElse(null);
+                assertNotNull(method, cn + "::" + mn + " not found");
+            }
+        }
+    }
+
+    /**
+     * Returns the list of events in the given recording with the given name.
+     */
+    private List<RecordedEvent> find(Recording recording, String name) throws Exception {
+        Path recordingFile = recordingFile(recording);
+        return RecordingFile.readAllEvents(recordingFile)
+                .stream()
+                .filter(e -> e.getEventType().getName().equals(name))
+                .toList();
+    }
+
+    /**
+     * Return the file path to the recording file.
+     */
+    private Path recordingFile(Recording recording) throws Exception {
+        Path recordingFile = recording.getDestination();
+        if (recordingFile == null) {
+            ProcessHandle h = ProcessHandle.current();
+            recordingFile = Path.of("recording-" + recording.getId() + "-pid" + h.pid() + ".jfr");
+            recording.dump(recordingFile);
+        }
+        return recordingFile;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/MutateFinalsTest.java b/test/jdk/java/lang/reflect/Field/mutateFinals/MutateFinalsTest.java
new file mode 100644
index 00000000000..78a7849dfc0
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/MutateFinalsTest.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8353835
+ * @summary Test Field.set and Lookup.unreflectSetter on final instance fields
+ * @run junit/othervm -DwriteAccess=true MutateFinalsTest
+ * @run junit/othervm --enable-final-field-mutation=ALL-UNNAMED -DwriteAccess=true MutateFinalsTest
+ * @run junit/othervm --illegal-final-field-mutation=allow -DwriteAccess=true MutateFinalsTest
+ * @run junit/othervm --illegal-final-field-mutation=warn -DwriteAccess=true MutateFinalsTest
+ * @run junit/othervm --illegal-final-field-mutation=debug -DwriteAccess=true MutateFinalsTest
+ * @run junit/othervm --illegal-final-field-mutation=deny -DwriteAccess=false MutateFinalsTest
+ */
+
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class MutateFinalsTest {
+    static boolean writeAccess;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        String s = System.getProperty("writeAccess");
+        assertNotNull(s);
+        writeAccess = Boolean.valueOf(s);
+    }
+
+    @Test
+    void testFieldSet() throws Exception {
+        class C {
+            final String value;
+            C(String value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        String oldValue = "oldValue";
+        String newValue = "newValue";
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.set(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.set(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.set(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.set("not a C", newValue));
+            assertThrows(IllegalArgumentException.class, () -> f.set(obj, 100)); // not a string
+            f.set(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.set(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetBoolean() throws Throwable {
+        class C {
+            final boolean value;
+            C(boolean value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        boolean oldValue = false;
+        boolean newValue = true;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setBoolean(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setBoolean(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setBoolean(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setBoolean("not a C", newValue));
+            f.setBoolean(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setBoolean(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetByte() throws Exception {
+        class C {
+            final byte value;
+            C(byte value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        byte oldValue = (byte) 1;
+        byte newValue = (byte) 2;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setByte(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setByte(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setByte(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setByte("not a C", newValue));
+            f.setByte(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setByte(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetChar() throws Exception {
+        class C {
+            final char value;
+            C(char value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        char oldValue = 'A';
+        char newValue = 'B';
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setChar(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setChar(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setChar(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setChar("not a C", newValue));
+            f.setChar(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setChar(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetShort() throws Exception {
+        class C {
+            final short value;
+            C(short value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        short oldValue = (short) 1;
+        short newValue = (short) 2;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setShort(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setShort(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setShort(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setShort("not a C", newValue));
+            f.setShort(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setShort(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetInt() throws Exception {
+        class C {
+            final int value;
+            C(int value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        int oldValue = 1;
+        int newValue = 2;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setInt(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setInt(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setInt(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setInt("not a C", newValue));
+            f.setInt(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setInt(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetLong() throws Exception {
+        class C {
+            final long value;
+            C(long value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        long oldValue = 1L;
+        long newValue = 2L;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setLong(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setLong(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setLong(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setLong("not a C", newValue));
+            f.setLong(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setLong(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetFloat() throws Exception {
+        class C {
+            final float value;
+            C(float value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        float oldValue = 1.0f;
+        float newValue = 2.0f;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setFloat(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setFloat(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setFloat(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setFloat("not a C", newValue));
+            f.setFloat(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setFloat(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testFieldSetDouble() throws Exception {
+        class C {
+            final double value;
+            C(double value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        double oldValue = 1.0d;
+        double newValue = 2.0d;
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(NullPointerException.class, () -> f.setDouble(null, newValue));
+        assertThrows(IllegalAccessException.class, () -> f.setDouble(obj, newValue));
+        assertTrue(obj.value == oldValue);
+
+        f.setAccessible(true);
+        assertThrows(NullPointerException.class, () -> f.setDouble(null, newValue));
+        if (writeAccess) {
+            assertThrows(IllegalArgumentException.class, () -> f.setDouble("not a C", newValue));
+            f.setDouble(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> f.setDouble(obj, newValue));
+            assertTrue(obj.value == oldValue);
+        }
+    }
+
+    @Test
+    void testUnreflectSetter() throws Throwable {
+        class C {
+            final Object value;
+            C(Object value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+
+        Object oldValue = new Object();
+        var obj = new C(oldValue);
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.lookup().unreflectSetter(f));
+
+        f.setAccessible(true);
+        if (writeAccess) {
+            Object newValue = new Object();
+            MethodHandles.lookup().unreflectSetter(f).invoke(obj, newValue);
+            assertTrue(obj.value == newValue);
+        } else {
+            assertThrows(IllegalAccessException.class, () -> MethodHandles.lookup().unreflectSetter(f));
+        }
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTest.java b/test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTest.java
new file mode 100644
index 00000000000..34f9bb2bd5b
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTest.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8353835
+ * @summary Test the command line option --enable-final-field-mutation
+ * @library /test/lib
+ * @build CommandLineTestHelper
+ * @run junit CommandLineTest
+ */
+
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+class CommandLineTest {
+
+    // helper class name
+    private static final String HELPER = "CommandLineTestHelper";
+
+    // warning output
+    private static final String WARNING_LINE1 =
+            "WARNING: Final field value in class " + HELPER;
+    private static final String WARNING_LINE3 =
+            "WARNING: Use --enable-final-field-mutation=ALL-UNNAMED to avoid a warning";
+    private static final String WARNING_LINE4 =
+            "WARNING: Mutating final fields will be blocked in a future release unless final field mutation is enabled";
+
+    // warning line 2 depends on the method
+    private static final String WARNING_MUTATED =
+            " has been mutated reflectively by class " + HELPER + " in unnamed module";
+    private static final String WARNING_UNREFLECTED =
+            " has been unreflected for mutation by class " + HELPER + " in unnamed module";
+
+    /**
+     * Test that a warning is printed by default.
+     */
+    @Test
+    void testDefault() throws Exception {
+        test("testFieldSetInt")
+            .shouldContain(WARNING_LINE1)
+            .shouldContain(WARNING_MUTATED)
+            .shouldContain(WARNING_LINE3)
+            .shouldContain(WARNING_LINE4)
+            .shouldHaveExitValue(0);
+
+        test("testUnreflectSetter")
+            .shouldContain(WARNING_LINE1)
+            .shouldContain(WARNING_UNREFLECTED)
+            .shouldContain(WARNING_LINE3)
+            .shouldContain(WARNING_LINE4)
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test allow mutation of finals.
+     */
+    @Test
+    void testAllow() throws Exception {
+        test("testFieldSetInt", "--illegal-final-field-mutation=allow")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_MUTATED)
+            .shouldHaveExitValue(0);
+
+        test("testFieldSetInt", "--enable-final-field-mutation=ALL-UNNAMED")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_MUTATED)
+            .shouldHaveExitValue(0);
+
+        // allow ALL-UNNAMED, deny by default
+        test("testFieldSetInt", "--enable-final-field-mutation=ALL-UNNAMED", "--illegal-final-field-mutation=deny")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_MUTATED)
+            .shouldHaveExitValue(0);
+
+        test("testUnreflectSetter", "--illegal-final-field-mutation=allow")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_UNREFLECTED)
+            .shouldHaveExitValue(0);
+
+        test("testUnreflectSetter", "--enable-final-field-mutation=ALL-UNNAMED")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_UNREFLECTED)
+            .shouldHaveExitValue(0);
+
+        // allow ALL-UNNAMED, deny by default
+        test("testUnreflectSetter", "--enable-final-field-mutation=ALL-UNNAMED", "--illegal-final-field-mutation=deny")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_UNREFLECTED)
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test warn on first mutation or unreflect of a final field.
+     */
+    @Test
+    void testWarn() throws Exception {
+        test("testFieldSetInt", "--illegal-final-field-mutation=warn")
+            .shouldContain(WARNING_LINE1)
+            .shouldContain(WARNING_MUTATED)
+            .shouldContain(WARNING_LINE3)
+            .shouldContain(WARNING_LINE4)
+            .shouldHaveExitValue(0);
+
+        test("testUnreflectSetter", "--illegal-final-field-mutation=warn")
+            .shouldContain(WARNING_LINE1)
+            .shouldContain(WARNING_UNREFLECTED)
+            .shouldContain(WARNING_LINE3)
+            .shouldContain(WARNING_LINE4)
+            .shouldHaveExitValue(0);
+
+        // should be one warning only, for Field.set
+        var output = test("testFieldSetInt+testUnreflectSetter", "--illegal-final-field-mutation=warn")
+            .shouldContain(WARNING_MUTATED)
+            .shouldNotContain(WARNING_UNREFLECTED)
+            .shouldHaveExitValue(0)
+            .getOutput();
+        assertEquals(1, countStrings(output, WARNING_LINE1));
+        assertEquals(1, countStrings(output, WARNING_LINE3));
+        assertEquals(1, countStrings(output, WARNING_LINE4));
+
+        // should be one warning only, for Lookup.unreflectSetter
+        output = test("testUnreflectSetter+testFieldSetInt", "--illegal-final-field-mutation=warn")
+            .shouldNotContain(WARNING_MUTATED)
+            .shouldContain(WARNING_UNREFLECTED)
+            .shouldHaveExitValue(0)
+            .getOutput();
+        assertEquals(1, countStrings(output, WARNING_LINE1));
+        assertEquals(1, countStrings(output, WARNING_LINE3));
+        assertEquals(1, countStrings(output, WARNING_LINE4));
+    }
+
+    /**
+     * Test debug mode.
+     */
+    @Test
+    void testDebug() throws Exception {
+        test("testFieldSetInt+testUnreflectSetter", "--illegal-final-field-mutation=debug")
+            .shouldContain("Final field value in class " + HELPER)
+            .shouldContain(WARNING_MUTATED)
+            .shouldContain("java.lang.reflect.Field.setInt")
+            .shouldContain(WARNING_UNREFLECTED)
+            .shouldContain("java.lang.invoke.MethodHandles$Lookup.unreflectSetter")
+            .shouldHaveExitValue(0);
+
+        test("testUnreflectSetter+testFieldSetInt", "--illegal-final-field-mutation=debug")
+            .shouldContain("Final field value in class " + HELPER)
+            .shouldContain(WARNING_UNREFLECTED)
+            .shouldContain("java.lang.invoke.MethodHandles$Lookup.unreflectSetter")
+            .shouldContain(WARNING_MUTATED)
+            .shouldContain("java.lang.reflect.Field.setInt")
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test deny mutation of finals.
+     */
+    @Test
+    void testDeny() throws Exception {
+        test("testFieldSetInt", "--illegal-final-field-mutation=deny")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_MUTATED)
+            .shouldContain("java.lang.IllegalAccessException")
+            .shouldNotHaveExitValue(0);
+
+        test("testUnreflectSetter", "--illegal-final-field-mutation=deny")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_UNREFLECTED)
+            .shouldContain("java.lang.IllegalAccessException")
+            .shouldNotHaveExitValue(0);
+    }
+
+    /**
+     * Test last usage of --illegal-final-field-mutation "wins".
+     */
+    @Test
+    void testLastOneWins() throws Exception {
+        test("testFieldSetInt", "--illegal-final-field-mutation=allow", "--illegal-final-field-mutation=deny")
+            .shouldNotContain(WARNING_LINE1)
+            .shouldNotContain(WARNING_MUTATED)
+            .shouldContain("java.lang.IllegalAccessException")
+            .shouldNotHaveExitValue(0);
+
+        test("testFieldSetInt", "--illegal-final-field-mutation=deny", "--illegal-final-field-mutation=warn")
+            .shouldContain(WARNING_LINE1)
+            .shouldContain(WARNING_MUTATED)
+            .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test --illegal-final-field-mutation with bad values.
+     */
+    @ParameterizedTest
+    @ValueSource(strings = { "", "bad" })
+    void testInvalidValues(String value) throws Exception {
+        test("testFieldSetInt", "--illegal-final-field-mutation=" + value)
+            .shouldContain("Value specified to --illegal-final-field-mutation not recognized")
+            .shouldNotHaveExitValue(0);
+    }
+
+    /**
+     * Test setting the internal system properties (that correspond to the command line
+     * options) on the commannd line. They should be ignored.
+     */
+    @Test
+    void testSetPropertyOnCommandLine() throws Exception {
+        // --enable-final-field-mutation=ALL-UNNAMED
+        test("testFieldSetInt", "-Djdk.module.enable.final.field.mutation.0=ALL-UNNAMED")
+                .shouldContain(WARNING_LINE1)
+                .shouldContain(WARNING_MUTATED)
+                .shouldContain(WARNING_LINE3)
+                .shouldContain(WARNING_LINE4)
+                .shouldHaveExitValue(0);
+
+        // --illegal-final-field-mutation=allow
+        test("testFieldSetInt", "-Djdk.module.illegal.final.field.mutation=allow")
+                .shouldContain(WARNING_LINE1)
+                .shouldContain(WARNING_MUTATED)
+                .shouldContain(WARNING_LINE3)
+                .shouldContain(WARNING_LINE4)
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test setting the internal system properties (that correspond to the command line
+     * options) at runtime. They should be ignored.
+     */
+    @Test
+    void testSetPropertyAtRuntime() throws Exception {
+        // --enable-final-field-mutation=ALL-UNNAMED
+        test("setPropertyIllegalFinalFieldMutationAllow+testFieldSetInt")
+            .shouldContain(WARNING_LINE1)
+            .shouldContain(WARNING_MUTATED)
+            .shouldContain(WARNING_LINE3)
+            .shouldContain(WARNING_LINE4)
+            .shouldHaveExitValue(0);
+
+        // --illegal-final-field-mutation=allow
+        test("setPropertyEnableFinalFieldMutationAllUnnamed+testFieldSetInt")
+                .shouldContain(WARNING_LINE1)
+                .shouldContain(WARNING_MUTATED)
+                .shouldContain(WARNING_LINE3)
+                .shouldContain(WARNING_LINE4)
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Launch helper with the given arguments and VM options.
+     */
+    private OutputAnalyzer test(String action, String... vmopts) throws Exception {
+        Stream<String> s1 = Stream.of(vmopts);
+        Stream<String> s2 = Stream.of(HELPER, action);
+        String[] opts = Stream.concat(s1, s2).toArray(String[]::new);
+        var outputAnalyzer = ProcessTools
+                .executeTestJava(opts)
+                .outputTo(System.err)
+                .errorTo(System.err);
+        return outputAnalyzer;
+    }
+
+    /**
+     * Counts the number of substrings in the given input string.
+     */
+    private int countStrings(String input, String substring) {
+        return input.split(Pattern.quote(substring)).length - 1;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTestHelper.java b/test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTestHelper.java
new file mode 100644
index 00000000000..cbda9987c5d
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/cli/CommandLineTestHelper.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandles;
+
+public class CommandLineTestHelper {
+
+    /**
+     * The argument is a list of names of no-arg static methods in this class to invoke.
+     * The names are separated with a '+'.
+     */
+    public static void main(String[] args) throws Exception {
+        String[] methodNames = args.length > 0 ? args[0].split("\\+") : new String[0];
+        for (String methodName : methodNames) {
+            Method m = CommandLineTestHelper.class.getDeclaredMethod(methodName);
+            m.invoke(null);
+        }
+    }
+
+    static void testFieldSetInt() throws Exception {
+        class C {
+            final int value;
+            C(int value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+        f.setAccessible(true);
+        var obj = new C(100);
+        f.setInt(obj, 200);
+        if (obj.value != 200) {
+            throw new RuntimeException("Unexpected value: " + obj.value);
+        }
+    }
+
+    static void testUnreflectSetter() throws Throwable {
+        class C {
+            final int value;
+            C(int value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+        f.setAccessible(true);
+        var obj = new C(100);
+        MethodHandles.lookup().unreflectSetter(f).invoke(obj, 200);
+        if (obj.value != 200) {
+            throw new RuntimeException("Unexpected value: " + obj.value);
+        }
+    }
+
+    /**
+     * Set the internal system property that corresponds to the first usage of
+     * --enable-final-field-mutation.
+     */
+    static void setPropertyEnableFinalFieldMutationAllUnnamed() {
+        System.setProperty("jdk.module.enable.final.field.mutation.0", "ALL-UNNAMED");
+    }
+
+    /**
+     * Set the internal system property that corresponds to --illegal-final-field-mutation.
+     */
+    static void setPropertyIllegalFinalFieldMutationAllow() {
+        System.setProperty("jdk.module.illegal.final.field.mutation", "allow");
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTest.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTest.java
new file mode 100644
index 00000000000..a9bdae67cfd
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTest.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8353835
+ * @summary Test the executable JAR file attribute Enable-Final-Field-Mutation
+ * @library /test/lib
+ * @build m/*
+ * @build ExecutableJarTestHelper jdk.test.lib.util.JarUtils
+ * @run junit ExecutableJarTest
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.stream.Stream;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.JarUtils;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ExecutableJarTest {
+
+    // helper class name
+    private static final String HELPER = "ExecutableJarTestHelper";
+
+    // warning output
+    private static final String WARNING_LINE1 =
+            "WARNING: Final field value in class " + HELPER;
+
+    // warning line 2 depends on the method
+    private static final String WARNING_MUTATED =
+            " has been mutated reflectively by class " + HELPER + " in unnamed module";
+    private static final String WARNING_UNREFLECTED =
+            " has been unreflected for mutation by class " + HELPER + " in unnamed module";
+
+    /**
+     * Test executable JAR with code that uses Field.set to mutate a final field.
+     * A warning should be printed.
+     */
+    @Test
+    void testFieldSetExpectingWarning() throws Exception {
+        String jarFile = createExecutableJar(Map.of());
+        testExecutableJar(jarFile, "testFieldSetInt")
+                .shouldContain(WARNING_LINE1)
+                .shouldContain(WARNING_MUTATED)
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test executable JAR with code that uses Lookup.unreflectSetter to get MH to a
+     * final field. A warning should be printed.
+     */
+    @Test
+    void testUnreflectExpectingWarning() throws Exception {
+        String jarFile = createExecutableJar(Map.of());
+        testExecutableJar(jarFile, "testUnreflectSetter")
+                .shouldContain(WARNING_LINE1)
+                .shouldContain(WARNING_UNREFLECTED)
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test executable JAR with Enable-Final-Field-Mutation attribute and code that uses
+     * Field.set to mutate a final field. No warning should be printed.
+     */
+    @Test
+    void testFieldSetExpectingAllow() throws Exception {
+        String jarFile = createExecutableJar(Map.of("Enable-Final-Field-Mutation", "ALL-UNNAMED"));
+        testExecutableJar(jarFile, "testFieldSetInt")
+                .shouldNotContain(WARNING_LINE1)
+                .shouldNotContain(WARNING_MUTATED)
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test executable JAR with Enable-Final-Field-Mutation attribute and code that uses
+     * Lookup.unreflectSetter to get MH to a final field. No warning should be printed.
+     */
+    @Test
+    void testUnreflectExpectingAllow() throws Exception {
+        String jarFile = createExecutableJar(Map.of("Enable-Final-Field-Mutation", "ALL-UNNAMED"));
+        testExecutableJar(jarFile, "testUnreflectSetter")
+                .shouldNotContain(WARNING_LINE1)
+                .shouldNotContain(WARNING_UNREFLECTED)
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test executable JAR with Enable-Final-Field-Mutation attribute and code that uses
+     * Field.set to mutate a final field of class in a named module. The package is opened
+     * with --add-open.
+     */
+    @Test
+    void testFieldSetWithAddOpens1() throws Exception {
+        String jarFile = createExecutableJar(Map.of(
+                "Enable-Final-Field-Mutation", "ALL-UNNAMED"));
+        testExecutableJar(jarFile, "testFieldInNamedModule",
+                "--illegal-final-field-mutation=deny",
+                "--module-path", modulePath(),
+                "--add-modules", "m",
+                "--add-opens", "m/p=ALL-UNNAMED")
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test executable JAR with Enable-Final-Field-Mutation attribute and code that uses
+     * Field.set to mutate a final field of class in a named module. The package is opened
+     * with with the Add-Opens attribute.
+     */
+    @Test
+    void testFieldSetWithAddOpens2() throws Exception {
+        String jarFile = createExecutableJar(Map.of(
+                "Enable-Final-Field-Mutation", "ALL-UNNAMED",
+                "Add-Opens", "m/p"));
+        testExecutableJar(jarFile, "testFieldInNamedModule",
+                "--illegal-final-field-mutation=deny",
+                "--module-path", modulePath(),
+                "--add-modules", "m")
+                .shouldHaveExitValue(0);
+    }
+
+    /**
+     * Test executable JAR with Enable-Final-Field-Mutation with that a value that is not
+     * "ALL-UNNAMED".
+     */
+    @ParameterizedTest
+    @ValueSource(strings = {"java.base", "BadValue", " ", ""})
+    void testFinalFieldMutationBadValue(String value) throws Exception {
+        String jarFile = createExecutableJar(Map.of("Enable-Final-Field-Mutation", value));
+        testExecutableJar(jarFile, "testFieldSetInt")
+                 .shouldContain("Error: illegal value \"" + value + "\" for Enable-Final-Field-Mutation" +
+                         " manifest attribute. Only ALL-UNNAMED is allowed")
+                 .shouldNotHaveExitValue(0);
+     }
+
+    /**
+     * Launch ExecutableJarTestHelper with the given arguments and VM options.
+     */
+    private OutputAnalyzer test(String action, String... vmopts) throws Exception {
+        Stream<String> s1 = Stream.of(vmopts);
+        Stream<String> s2 = Stream.of("ExecutableJarTestHelper", action);
+        String[] opts = Stream.concat(s1, s2).toArray(String[]::new);
+        var outputAnalyzer = ProcessTools
+                .executeTestJava(opts)
+                .outputTo(System.err)
+                .errorTo(System.err);
+        return outputAnalyzer;
+    }
+
+    /**
+     * Launch ExecutableJarTestHelper with the given arguments and VM options.
+     */
+    private OutputAnalyzer testExecutableJar(String jarFile,
+                                             String action,
+                                             String... vmopts) throws Exception {
+        Stream<String> s1 = Stream.of(vmopts);
+        Stream<String> s2 = Stream.of("-jar", jarFile, action);
+        String[] opts = Stream.concat(s1, s2).toArray(String[]::new);
+        var outputAnalyzer = ProcessTools
+                .executeTestJava(opts)
+                .outputTo(System.err)
+                .errorTo(System.err);
+        return outputAnalyzer;
+    }
+
+    /**
+     * Creates executable JAR named helper.jar with ExecutableJarTestHelper* classes.
+     */
+    private String createExecutableJar(Map<String, String> map) throws Exception {
+        Path jarFile = Path.of("helper.jar");
+        var man = new Manifest();
+        Attributes attrs = man.getMainAttributes();
+        attrs.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+        attrs.put(Attributes.Name.MAIN_CLASS, "ExecutableJarTestHelper");
+        map.entrySet().forEach(e -> {
+            var name = new Attributes.Name(e.getKey());
+            attrs.put(name, e.getValue());
+        });
+        Path dir = Path.of(System.getProperty("test.classes"));
+        try (Stream<Path> stream = Files.list(dir)) {
+            Path[] files = Files.list(dir).filter(p -> {
+                        String fn = p.getFileName().toString();
+                        return fn.startsWith("ExecutableJarTestHelper") && fn.endsWith(".class");
+                    })
+                    .toArray(Path[]::new);
+            JarUtils.createJarFile(jarFile, man, dir, files);
+        }
+        return jarFile.toString();
+    }
+
+    /**
+     * Return the module path for the modules used by this test.
+     */
+    private String modulePath() {
+        return Path.of(System.getProperty("test.classes"), "modules").toString();
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTestHelper.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTestHelper.java
new file mode 100644
index 00000000000..e0f7c60f637
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/ExecutableJarTestHelper.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandles;
+
+public class ExecutableJarTestHelper {
+
+    /**
+     * The argument is a list of names of no-arg static methods in this class to invoke.
+     * The names are separated with a '+'.
+     */
+    public static void main(String[] args) throws Exception {
+        String[] methodNames = args.length > 0 ? args[0].split("\\+") : new String[0];
+        for (String methodName : methodNames) {
+            Method m = ExecutableJarTestHelper.class.getDeclaredMethod(methodName);
+            m.invoke(null);
+        }
+    }
+
+    /**
+     * Uses Field.set to mutate a final field.
+     */
+    static void testFieldSetInt() throws Exception {
+        class C {
+            final int value;
+            C(int value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+        f.setAccessible(true);
+        var obj = new C(100);
+        f.setInt(obj, 200);
+        if (obj.value != 200) {
+            throw new RuntimeException("Unexpected value: " + obj.value);
+        }
+    }
+
+    /**
+     * Uses Lookup.unreflectSetter to get a method handle to set a final field.
+     */
+    static void testUnreflectSetter() throws Throwable {
+        class C {
+            final int value;
+            C(int value) {
+                this.value = value;
+            }
+        }
+        Field f = C.class.getDeclaredField("value");
+        f.setAccessible(true);
+        var obj = new C(100);
+        MethodHandles.lookup().unreflectSetter(f).invoke(obj, 200);
+        if (obj.value != 200) {
+            throw new RuntimeException("Unexpected value: " + obj.value);
+        }
+    }
+
+    /**
+     * Uses Field.set to mutate a final field of a class in a named module.
+     */
+    static void testFieldInNamedModule() throws Exception {
+        Class<?> c = Class.forName("p.C");
+        if (!c.getModule().isNamed()) {
+            throw new RuntimeException(c + " is not in a named module");
+        }
+        Object obj = c.getDeclaredConstructor(int.class).newInstance(100);
+        Field f = c.getDeclaredField("value");
+        f.setAccessible(true);
+        f.setInt(obj, 200);
+        int newValue = f.getInt(obj);
+        if (newValue != 200) {
+            throw new RuntimeException("Unexpected value: " + newValue);
+        }
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/module-info.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/module-info.java
new file mode 100644
index 00000000000..197a2101894
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/module-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Module containing a class with a final field used by ExecutableJarTest.
+ */
+module m {
+    exports p;
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/p/C.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/p/C.java
new file mode 100644
index 00000000000..e128330ab5e
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jar/m/p/C.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package p;
+
+/**
+ * A class with a final field used by ExecutableJarTest.
+ */
+public class C {
+    private final int value;
+
+    public C(int value) {
+        this.value = value;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutator.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutator.java
new file mode 100644
index 00000000000..9af4370c652
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutator.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * Launched by JNIAttachMutatorTest to test a JNI attached thread attempting to mutate
+ * a final field.
+ */
+
+public class JNIAttachMutator {
+    private static final CountDownLatch finished = new CountDownLatch(1);
+    private static volatile Object obj;
+    private static volatile Throwable exc;
+
+    // public class, public final field
+    public static class C1 {
+        public final int value;
+        C1(int value) {
+            this.value = value;
+        }
+    }
+
+    // public class, non-public final field
+    public static class C2 {
+        final int value;
+        C2(int value) {
+            this.value = value;
+        }
+    }
+
+    // non-public class, public final field
+    static class C3 {
+        public final int value;
+        C3(int value) {
+            this.value = value;
+        }
+    }
+
+    /**
+     * Usage: java JNIAttachMutator <classname> <true|false>
+     */
+    public static void main(String[] args) throws Exception {
+        String cn = args[0];
+        boolean expectIAE = Boolean.parseBoolean(args[1]);
+
+        Class<?> clazz = Class.forName(args[0]);
+        Constructor<?> ctor = clazz.getDeclaredConstructor(int.class);
+        ctor.setAccessible(true);
+        obj = ctor.newInstance(100);
+
+        // start native thread
+        startThread();
+
+        // wait for native thread to finish
+        finished.await();
+
+        if (expectIAE) {
+            if (exc == null) {
+                // IAE expected
+                throw new RuntimeException("IllegalAccessException not thrown");
+            } else if (!(exc instanceof IllegalAccessException)) {
+                // unexpected exception
+                throw new RuntimeException(exc);
+            }
+        } else if (exc != null) {
+            // no exception expected
+            throw new RuntimeException(exc);
+        }
+    }
+
+    /**
+     * Invoked by JNI attached thread to get object.
+     */
+    static Object getObject() {
+        return obj;
+    }
+
+    /**
+     * Invoked by JNI attached thread to get Field object with accessible enabled.
+     */
+    static Field getField() throws NoSuchFieldException {
+        Field f = obj.getClass().getDeclaredField("value");
+        f.setAccessible(true);
+        return f;
+    }
+
+    /**
+     * Invoked by JNI attached thread when finished.
+     */
+    static void finish(Throwable ex) {
+        exc = ex;
+        finished.countDown();
+    }
+
+    private static native void startThread();
+
+    static {
+        System.loadLibrary("JNIAttachMutator");
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutatorTest.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutatorTest.java
new file mode 100644
index 00000000000..19f5e21085f
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/JNIAttachMutatorTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8353835
+ * @summary Test native thread attaching to the VM with JNI AttachCurrentThread and directly
+ *    invoking Field.set to set a final field
+ * @library /test/lib
+ * @build m/*
+ * @compile JNIAttachMutator.java
+ * @run junit JNIAttachMutatorTest
+ */
+
+import java.nio.file.Path;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+class JNIAttachMutatorTest {
+    private static String testClasses;
+    private static String modulesDir;
+    private static String javaLibraryPath;
+
+    @BeforeAll
+    static void setup() {
+        testClasses = System.getProperty("test.classes");
+        modulesDir = Path.of(testClasses, "modules").toString();
+        javaLibraryPath = System.getProperty("java.library.path");
+    }
+
+    /**
+     * Final final mutation allowed. All final fields are public, in public classes,
+     * and in packages exported to all modules.
+     */
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "JNIAttachMutator$C1",     // unnamed module
+            "p.C1",                    // named module
+    })
+    void testAllowed(String cn) throws Exception {
+        test(cn, false);
+    }
+
+    /**
+     * Final final mutation not allowed.
+     */
+    @ParameterizedTest
+    @ValueSource(strings = {
+            // unnamed module
+            "JNIAttachMutator$C2",      // public class, non-public final field
+            "JNIAttachMutator$C3",      // non-public class, public final field
+
+            // named module
+            "p.C2",                     // public class, non-public final field, exported package
+            "p.C3",                     // non-public class, public final field, exported package
+            "q.C"                       // public class, public final field, package not exported
+    })
+    void testDenied(String cn) throws Exception {
+        test(cn, true);
+    }
+
+    /**
+     * public final field, public class, package exported to some modules.
+     */
+    @Test
+    void testQualifiedExports() throws Exception {
+        test("q.C", true, "--add-exports", "m/q=ALL-UNNAMED");
+    }
+
+    /**
+     * Launches JNIAttachMutator to test a JNI attached thread mutating a final field.
+     * @param className the class with the field final
+     * @param expectIAE if IllegalAccessException is expected
+     * @param extraOps additional VM options
+     */
+    private void test(String className, boolean expectIAE, String... extraOps) throws Exception {
+        Stream<String> s1 = Stream.of(extraOps);
+        Stream<String> s2 = Stream.of(
+                "-cp", testClasses,
+                "-Djava.library.path=" + javaLibraryPath,
+                "--module-path", modulesDir,
+                "--add-modules", "m",
+                "--add-opens", "m/p=ALL-UNNAMED",    // allow setAccessible
+                "--add-opens", "m/q=ALL-UNNAMED",
+                "--enable-native-access=ALL-UNNAMED",
+                "--enable-final-field-mutation=ALL-UNNAMED",
+                "--illegal-final-field-mutation=deny",
+                "JNIAttachMutator",
+                className,
+                expectIAE ? "true" : "false");
+        String[] opts = Stream.concat(s1, s2).toArray(String[]::new);
+        OutputAnalyzer outputAnalyzer = ProcessTools
+                .executeTestJava(opts)
+                .outputTo(System.out)
+                .errorTo(System.out);
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/libJNIAttachMutator.c b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/libJNIAttachMutator.c
new file mode 100644
index 00000000000..077b9f5d625
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/libJNIAttachMutator.c
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+#include <stdio.h>
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <pthread.h>
+#endif
+#include "jni.h"
+
+#define STACK_SIZE 0x100000
+
+static JavaVM *vm;
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void* reserved) {
+    vm = jvm;
+    return JNI_VERSION_1_8;
+}
+
+/**
+ * Invokes JNIAttachMutator.getObject()
+ */
+jobject getObject(JNIEnv* env) {
+    jclass clazz = (*env)->FindClass(env, "JNIAttachMutator");
+    if (clazz == NULL) {
+        fprintf(stderr, "FindClass failed\n");
+        return NULL;
+    }
+    jmethodID mid = (*env)->GetStaticMethodID(env, clazz, "getObject", "()Ljava/lang/Object;");
+    if (mid == NULL) {
+        fprintf(stderr, "GetMethodID for getObject failed\n");
+        return NULL;
+    }
+    jobject obj = (*env)->CallStaticObjectMethod(env, clazz, mid);
+    if (obj == NULL) {
+        fprintf(stderr, "CallObjectMethod to getObject failed\n");
+        return NULL;
+    }
+    return obj;
+}
+
+/**
+ * Invokes JNIAttachMutator.getField()
+ */
+jobject getField(JNIEnv* env) {
+    jclass clazz = (*env)->FindClass(env, "JNIAttachMutator");
+    if (clazz == NULL) {
+        fprintf(stderr, "FindClass failed\n");
+        return NULL;
+    }
+    jmethodID mid = (*env)->GetStaticMethodID(env, clazz, "getField", "()Ljava/lang/reflect/Field;");
+    if (mid == NULL) {
+        fprintf(stderr, "GetStaticMethodID for getField failed\n");
+        return NULL;
+    }
+    jobject obj = (*env)->CallStaticObjectMethod(env, clazz, mid);
+    if (obj == NULL) {
+        fprintf(stderr, "CallObjectMethod to getField failed\n");
+        return NULL;
+    }
+    return obj;
+}
+
+/**
+ * Invokes Field.setInt
+ */
+jboolean setInt(JNIEnv* env, jobject obj, jobject fieldObj, jint newValue) {
+    jclass fieldClass = (*env)->GetObjectClass(env, fieldObj);
+    jmethodID mid = (*env)->GetMethodID(env, fieldClass, "setInt", "(Ljava/lang/Object;I)V");
+    if (mid == NULL) {
+        fprintf(stderr, "GetMethodID for Field.setInt failed\n");
+        return JNI_FALSE;
+    }
+    (*env)->CallObjectMethod(env, fieldObj, mid, obj, newValue);
+    return JNI_TRUE;
+}
+
+/**
+ * Invokes JNIAttachMutator.finish
+ */
+void finish(JNIEnv* env, jthrowable ex) {
+    jclass clazz = (*env)->FindClass(env, "JNIAttachMutator");
+    if (clazz == NULL) {
+        fprintf(stderr, "FindClass failed\n");
+        return;
+    }
+
+    // invoke finish
+    jmethodID mid = (*env)->GetStaticMethodID(env, clazz, "finish", "(Ljava/lang/Throwable;)V");
+    if (mid == NULL) {
+        fprintf(stderr, "GetStaticMethodID failed\n");
+        return;
+    }
+    (*env)->CallStaticVoidMethod(env, clazz, mid, ex);
+    if ((*env)->ExceptionOccurred(env)) {
+        fprintf(stderr, "CallStaticVoidMethod failed\n");
+    }
+}
+
+/**
+ * Attach the current thread with JNI AttachCurrentThread.
+ */
+void* thread_main(void* arg) {
+    JNIEnv *env;
+    jint res;
+    jthrowable ex;
+
+    res = (*vm)->AttachCurrentThread(vm, (void **) &env, NULL);
+    if (res != JNI_OK) {
+        fprintf(stderr, "AttachCurrentThread failed: %d\n", res);
+        return NULL;
+    }
+
+    // invoke JNIAttachMutator.getObject to get the object to test
+    jobject obj = getObject(env);
+    if (obj == NULL) {
+        goto done;
+    }
+
+    // invoke JNIAttachMutator.getField to get the Field object with access enabled
+    jobject fieldObj = getField(env);
+    if (fieldObj == NULL) {
+        goto done;
+    }
+
+    // invoke Field.setInt to attempt to set the value to 200
+    if (!setInt(env, obj, fieldObj, 200)) {
+        goto done;
+    }
+
+  done:
+
+    ex = (*env)->ExceptionOccurred(env);
+    if (ex != NULL) {
+        (*env)->ExceptionDescribe(env);
+        (*env)->ExceptionClear(env);
+    }
+    finish(env, ex);
+
+    res = (*vm)->DetachCurrentThread(vm);
+    if (res != JNI_OK) {
+        fprintf(stderr, "DetachCurrentThread failed: %d\n", res);
+    }
+
+    return NULL;
+}
+
+#ifdef _WIN32
+static DWORD WINAPI win32_thread_main(void* p) {
+    thread_main(p);
+    return 0;
+}
+#endif
+
+JNIEXPORT void JNICALL Java_JNIAttachMutator_startThread(JNIEnv *env, jclass clazz) {
+#ifdef _WIN32
+    HANDLE handle = CreateThread(NULL, STACK_SIZE, win32_thread_main, NULL, 0, NULL);
+    if (handle == NULL) {
+        fprintf(stderr, "CreateThread failed: %d\n", GetLastError());
+    }
+#else
+    pthread_t tid;
+    pthread_attr_t attr;
+
+    pthread_attr_init(&attr);
+    pthread_attr_setstacksize(&attr, STACK_SIZE);
+    int res = pthread_create(&tid, &attr, thread_main, NULL);
+    if (res != 0) {
+        fprintf(stderr, "pthread_create failed: %d\n", res);
+    }
+#endif
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/module-info.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/module-info.java
new file mode 100644
index 00000000000..bb113e926df
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/module-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Module containing classes with final fields.
+ */
+module m {
+    exports p;
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C1.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C1.java
new file mode 100644
index 00000000000..8d931f2eb47
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C1.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package p;
+
+/**
+ * public class, public final field.
+ */
+public class C1 {
+    public final int value;
+
+    C1(int value) {
+        this.value = value;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C2.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C2.java
new file mode 100644
index 00000000000..186d8e82575
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C2.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package p;
+
+/**
+ * public class, non-public final field.
+ */
+public class C2 {
+    final int value;
+
+    C2(int value) {
+        this.value = value;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C3.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C3.java
new file mode 100644
index 00000000000..56b90490abf
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/p/C3.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package p;
+
+/**
+ * non-public class, public final field.
+ */
+class C3 {
+    public final int value;
+
+    C3(int value) {
+        this.value = value;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/q/C.java b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/q/C.java
new file mode 100644
index 00000000000..1411547347e
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/jni/m/q/C.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package q;
+
+/**
+ * public class, public final field.
+ */
+public class C {
+    public final int value;
+
+    public C(int value) {
+        this.value = value;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/Driver.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/Driver.java
new file mode 100644
index 00000000000..f0b87b09304
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/Driver.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8353835
+ * @summary Test mutating final fields in module test from code in modules test, m1, m2 and m3
+ * @build test/* m1/* m2/* m3/*
+ * @run junit/othervm --illegal-final-field-mutation=deny --enable-final-field-mutation=test,m1,m2,m3
+ *     test/test.TestMain
+ * @run junit/othervm --illegal-final-field-mutation=deny --enable-final-field-mutation=test,m1,m2,m3
+ *     --add-exports test/test.fieldholders=m3 test/test.TestMain
+ * @run junit/othervm --illegal-final-field-mutation=deny --enable-final-field-mutation=test,m1,m2,m3
+ *     --add-opens test/test.fieldholders=m2 test/test.TestMain
+ */
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/module-info.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/module-info.java
new file mode 100644
index 00000000000..c7b4fbdc424
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+@SuppressWarnings("module")
+module m1 {
+    requires test;
+    provides test.spi.Mutator with p1.M1Mutator;
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/p1/M1Mutator.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/p1/M1Mutator.java
new file mode 100644
index 00000000000..4fed0c97692
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m1/p1/M1Mutator.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package p1;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+
+public class M1Mutator implements test.spi.Mutator {
+
+    @Override
+    public void set(Field f, Object obj, Object value) throws IllegalAccessException {
+        f.set(obj, value);
+    }
+
+    @Override
+    public void setBoolean(Field f, Object obj, boolean value) throws IllegalAccessException {
+        f.setBoolean(obj, value);
+    }
+
+    @Override
+    public void setByte(Field f, Object obj, byte value) throws IllegalAccessException {
+        f.setByte(obj, value);
+    }
+
+    @Override
+    public void setChar(Field f, Object obj, char value) throws IllegalAccessException {
+        f.setChar(obj, value);
+    }
+
+    @Override
+    public void setShort(Field f, Object obj, short value) throws IllegalAccessException {
+        f.setShort(obj, value);
+    }
+
+    @Override
+    public void setInt(Field f, Object obj, int value) throws IllegalAccessException {
+        f.setInt(obj, value);
+    }
+
+    @Override
+    public void setLong(Field f, Object obj, long value) throws IllegalAccessException {
+        f.setLong(obj, value);
+    }
+
+    @Override
+    public void setFloat(Field f, Object obj, float value) throws IllegalAccessException {
+        f.setFloat(obj, value);
+    }
+
+    @Override
+    public void setDouble(Field f, Object obj, double value) throws IllegalAccessException {
+        f.setDouble(obj, value);
+    }
+
+    @Override
+    public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
+        return MethodHandles.lookup().unreflectSetter(f);
+    }
+
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/module-info.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/module-info.java
new file mode 100644
index 00000000000..3c48cb6dfc7
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+@SuppressWarnings("module")
+module m2 {
+    requires test;
+    provides test.spi.Mutator with p2.M2Mutator;
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/p2/M2Mutator.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/p2/M2Mutator.java
new file mode 100644
index 00000000000..a3f2252e20c
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m2/p2/M2Mutator.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package p2;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+
+public class M2Mutator implements test.spi.Mutator {
+
+    @Override
+    public void set(Field f, Object obj, Object value) throws IllegalAccessException {
+        f.set(obj, value);
+    }
+
+    @Override
+    public void setBoolean(Field f, Object obj, boolean value) throws IllegalAccessException {
+        f.setBoolean(obj, value);
+    }
+
+    @Override
+    public void setByte(Field f, Object obj, byte value) throws IllegalAccessException {
+        f.setByte(obj, value);
+    }
+
+    @Override
+    public void setChar(Field f, Object obj, char value) throws IllegalAccessException {
+        f.setChar(obj, value);
+    }
+
+    @Override
+    public void setShort(Field f, Object obj, short value) throws IllegalAccessException {
+        f.setShort(obj, value);
+    }
+
+    @Override
+    public void setInt(Field f, Object obj, int value) throws IllegalAccessException {
+        f.setInt(obj, value);
+    }
+
+    @Override
+    public void setLong(Field f, Object obj, long value) throws IllegalAccessException {
+        f.setLong(obj, value);
+    }
+
+    @Override
+    public void setFloat(Field f, Object obj, float value) throws IllegalAccessException {
+        f.setFloat(obj, value);
+    }
+
+    @Override
+    public void setDouble(Field f, Object obj, double value) throws IllegalAccessException {
+        f.setDouble(obj, value);
+    }
+
+    @Override
+    public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
+        return MethodHandles.lookup().unreflectSetter(f);
+    }
+
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/module-info.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/module-info.java
new file mode 100644
index 00000000000..8e378882a42
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+@SuppressWarnings("module")
+module m3 {
+    requires test;
+    provides test.spi.Mutator with p3.M3Mutator;
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/p3/M3Mutator.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/p3/M3Mutator.java
new file mode 100644
index 00000000000..c432b8d8f07
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/m3/p3/M3Mutator.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package p3;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+
+public class M3Mutator implements test.spi.Mutator {
+
+    @Override
+    public void set(Field f, Object obj, Object value) throws IllegalAccessException {
+        f.set(obj, value);
+    }
+
+    @Override
+    public void setBoolean(Field f, Object obj, boolean value) throws IllegalAccessException {
+        f.setBoolean(obj, value);
+    }
+
+    @Override
+    public void setByte(Field f, Object obj, byte value) throws IllegalAccessException {
+        f.setByte(obj, value);
+    }
+
+    @Override
+    public void setChar(Field f, Object obj, char value) throws IllegalAccessException {
+        f.setChar(obj, value);
+    }
+
+    @Override
+    public void setShort(Field f, Object obj, short value) throws IllegalAccessException {
+        f.setShort(obj, value);
+    }
+
+    @Override
+    public void setInt(Field f, Object obj, int value) throws IllegalAccessException {
+        f.setInt(obj, value);
+    }
+
+    @Override
+    public void setLong(Field f, Object obj, long value) throws IllegalAccessException {
+        f.setLong(obj, value);
+    }
+
+    @Override
+    public void setFloat(Field f, Object obj, float value) throws IllegalAccessException {
+        f.setFloat(obj, value);
+    }
+
+    @Override
+    public void setDouble(Field f, Object obj, double value) throws IllegalAccessException {
+        f.setDouble(obj, value);
+    }
+
+    @Override
+    public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
+        return MethodHandles.lookup().unreflectSetter(f);
+    }
+
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/module-info.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/module-info.java
new file mode 100644
index 00000000000..9e41df42f20
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/module-info.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+module test {
+    requires org.junit.platform.console.standalone;
+    opens test to org.junit.platform.console.standalone;
+
+    opens test.fieldholders to m1;
+    exports test.fieldholders to m2;
+
+    exports test.spi;
+    uses test.spi.Mutator;
+    provides test.spi.Mutator with test.internal.TestMutator;
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/TestMain.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/TestMain.java
new file mode 100644
index 00000000000..17ed2d78e0a
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/TestMain.java
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test;
+
+import java.lang.reflect.Field;
+import java.util.ServiceLoader;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import test.spi.Mutator;
+import test.fieldholders.PublicFields;
+import test.fieldholders.PrivateFields;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Test mutating final fields from different modules.
+ */
+class TestMain {
+    static Map<Boolean, List<Mutator>> exportedToMutators;
+    static Map<Boolean, List<Mutator>> openToMutators;
+
+    // test module and the name of package with the fieldholder classes
+    static Module testModule;
+    static String fieldHoldersPackage;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        testModule = TestMain.class.getModule();
+        fieldHoldersPackage = PublicFields.class.getPackageName();
+
+        List<Mutator> allMutators = ServiceLoader.load(Mutator.class)
+                .stream()
+                .map(ServiceLoader.Provider::get)
+                .toList();
+
+        // mutators that test.fieldholders is exported to
+        exportedToMutators = allMutators.stream()
+                .collect(Collectors.partitioningBy(m -> testModule.isExported(fieldHoldersPackage,
+                                                                              m.getClass().getModule()),
+                        Collectors.toList()));
+
+        // mutators that test.fieldholders is open to
+        openToMutators = allMutators.stream()
+                .collect(Collectors.partitioningBy(m -> testModule.isOpen(fieldHoldersPackage,
+                                                                          m.getClass().getModule()),
+                        Collectors.toList()));
+
+
+        // exported to at least test, m1 and m2
+        assertTrue(exportedToMutators.get(Boolean.TRUE).size() >= 3);
+
+        // open to at least test and m1
+        assertTrue(openToMutators.get(Boolean.TRUE).size() >= 2);
+    }
+
+    /**
+     * Returns a stream of mutators that test.fieldholders is exported to.
+     */
+    static Stream<Mutator> exportedToMutators() {
+        return exportedToMutators.get(Boolean.TRUE).stream();
+    }
+
+    /**
+     * Returns a stream of mutators that test.fieldholders is open to.
+     */
+    static Stream<Mutator> openToMutators() {
+        return openToMutators.get(Boolean.TRUE).stream();
+    }
+
+    /**
+     * Returns a stream of mutators that test.fieldholders is not exported to.
+     */
+    static Stream<Mutator> notExportedToMutators() {
+        List<Mutator> mutators = exportedToMutators.get(Boolean.FALSE);
+        if (mutators.isEmpty()) {
+            // can't return an empty stream at this time
+            return Stream.of(Mutator.throwing());
+        } else {
+            return mutators.stream();
+        }
+    }
+
+    /**
+     * Returns a stream of mutators that test.fieldholders is not open to.
+     */
+    static Stream<Mutator> notOpenToMutators() {
+        List<Mutator> mutators = openToMutators.get(Boolean.FALSE);
+        if (mutators.isEmpty()) {
+            // can't return an empty stream at this time
+            return Stream.of(Mutator.throwing());
+        } else {
+            return mutators.stream();
+        }
+    }
+
+    // public field, public class in package exported to mutator
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.objectField();
+        var obj = new PublicFields();
+        Object oldValue = obj.objectValue();
+        Object newValue = new Object();
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        assertTrue(obj.objectValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.set(f, obj, newValue);
+        assertTrue(obj.objectValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetBooleanExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.booleanField();
+        var obj = new PublicFields();
+        boolean oldValue = obj.booleanValue();
+        boolean newValue = true;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setBoolean(f, obj, newValue));
+        assertTrue(obj.booleanValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setBoolean(f, obj, newValue);
+        assertTrue(obj.booleanValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetByteExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.byteField();
+        var obj = new PublicFields();
+        byte oldValue = obj.byteValue();
+        byte newValue = 10;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setByte(f, obj, newValue));
+        assertTrue(obj.byteValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setByte(f, obj, newValue);
+        assertTrue(obj.byteValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetCharExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.charField();
+        var obj = new PublicFields();
+        char oldValue = obj.charValue();
+        char newValue = 'Z';
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setChar(f, obj, newValue));
+        assertTrue(obj.charValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setChar(f, obj, newValue);
+        assertTrue(obj.charValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetShortExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.shortField();
+        var obj = new PublicFields();
+        short oldValue = obj.shortValue();
+        short newValue = 99;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setShort(f, obj, newValue));
+        assertTrue(obj.shortValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setShort(f, obj, newValue);
+        assertTrue(obj.shortValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetIntExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.intField();
+        var obj = new PublicFields();
+        int oldValue = obj.intValue();
+        int newValue = 999;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setInt(f, obj, newValue));
+        assertTrue(obj.intValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setInt(f, obj, newValue);
+        assertTrue(obj.intValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetLongExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.longField();
+        var obj = new PublicFields();
+        long oldValue = obj.longValue();
+        long newValue = 9999;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setLong(f, obj, newValue));
+        assertTrue(obj.longValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setLong(f, obj, newValue);
+        assertTrue(obj.longValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetFloatExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.floatField();
+        var obj = new PublicFields();
+        float oldValue = obj.floatValue();
+        float newValue = 9.9f;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setFloat(f, obj, newValue));
+        assertTrue(obj.floatValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setFloat(f, obj, newValue);
+        assertTrue(obj.floatValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("exportedToMutators")
+    void testFieldSetDoublExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.doubleField();
+        var obj = new PublicFields();
+        double oldValue = obj.doubleValue();
+        double newValue = 99.9d;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setDouble(f, obj, newValue));
+        assertTrue(obj.doubleValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setDouble(f, obj, newValue);
+        assertTrue(obj.doubleValue() == newValue);
+    }
+
+    @ParameterizedTest
+    @MethodSource("exportedToMutators")
+    void testUnreflectSetterExportedPackage(Mutator mutator) throws Throwable {
+        Field f = PublicFields.objectField();
+        var obj = new PublicFields();
+        Object oldValue = obj.objectValue();
+        Object newValue = new Object();
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+
+        f.setAccessible(true);
+        mutator.unreflectSetter(f).invokeExact(obj, newValue);
+        assertTrue(obj.objectValue() == newValue);
+    }
+
+    // private field, class in package opened to mutator
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.objectField();
+        var obj = new PrivateFields();
+        Object oldValue = obj.objectValue();
+        Object newValue = new Object();
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        assertTrue(obj.objectValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.set(f, obj, newValue);
+        assertTrue(obj.objectValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetBooleanOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.booleanField();
+        var obj = new PrivateFields();
+        boolean oldValue = obj.booleanValue();
+        boolean newValue = true;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setBoolean(f, obj, newValue));
+        assertTrue(obj.booleanValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setBoolean(f, obj, newValue);
+        assertTrue(obj.booleanValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetByteOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.byteField();
+        var obj = new PrivateFields();
+        byte oldValue = obj.byteValue();
+        byte newValue = 10;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setByte(f, obj, newValue));
+        assertTrue(obj.byteValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setByte(f, obj, newValue);
+        assertTrue(obj.byteValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetCharOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.charField();
+        var obj = new PrivateFields();
+        char oldValue = obj.charValue();
+        char newValue = 'Z';
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setChar(f, obj, newValue));
+        assertTrue(obj.charValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setChar(f, obj, newValue);
+        assertTrue(obj.charValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetShortOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.shortField();
+        var obj = new PrivateFields();
+        short oldValue = obj.shortValue();
+        short newValue = 'Z';
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setShort(f, obj, newValue));
+        assertTrue(obj.shortValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setShort(f, obj, newValue);
+        assertTrue(obj.shortValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetIntOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.intField();
+        var obj = new PrivateFields();
+        int oldValue = obj.intValue();
+        int newValue = 99;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setInt(f, obj, newValue));
+        assertTrue(obj.intValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setInt(f, obj, newValue);
+        assertTrue(obj.intValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetLongOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.longField();
+        var obj = new PrivateFields();
+        long oldValue = obj.longValue();
+        long newValue = 999;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setLong(f, obj, newValue));
+        assertTrue(obj.longValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setLong(f, obj, newValue);
+        assertTrue(obj.longValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetFloatOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.floatField();
+        var obj = new PrivateFields();
+        float oldValue = obj.floatValue();
+        float newValue = 9.9f;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setFloat(f, obj, newValue));
+        assertTrue(obj.floatValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setFloat(f, obj, newValue);
+        assertTrue(obj.floatValue() == newValue);
+    }
+
+    @ParameterizedTest()
+    @MethodSource("openToMutators")
+    void testFieldSetDoubleOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.doubleField();
+        var obj = new PrivateFields();
+        double oldValue = obj.doubleValue();
+        double newValue = 99.9d;
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.setDouble(f, obj, newValue));
+        assertTrue(obj.doubleValue() == oldValue);
+
+        f.setAccessible(true);
+        mutator.setDouble(f, obj, newValue);
+        assertTrue(obj.doubleValue() == newValue);
+    }
+
+    @ParameterizedTest
+    @MethodSource("openToMutators")
+    void testUnreflectSetterOpenPackage(Mutator mutator) throws Throwable {
+        Field f = PrivateFields.objectField();
+        var obj = new PrivateFields();
+        Object oldValue = obj.objectValue();
+        Object newValue = new Object();
+
+        f.setAccessible(false);
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+
+        f.setAccessible(true);
+        mutator.unreflectSetter(f).invokeExact(obj, newValue);
+        assertTrue(obj.objectValue() == newValue);
+    }
+
+    // public field, public class in package not exported to mutator
+
+    @ParameterizedTest
+    @MethodSource("notExportedToMutators")
+    void testFieldSetNotExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.objectField();
+        var obj = new PublicFields();
+        Object oldValue = obj.objectValue();
+        Object newValue = new Object();
+
+        f.setAccessible(true);
+        var e1 = assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        Module mutatorModule = mutator.getClass().getModule();
+        if (mutatorModule != testModule) {
+            assertTrue(e1.getMessage().contains("module " + testModule.getName()
+                    + " does not explicitly \"exports\" package "
+                    + f.getDeclaringClass().getPackageName()
+                    + " to module " + mutatorModule.getName()));
+        }
+        assertTrue(obj.objectValue() == oldValue);
+
+        // export package to mutator module, should have no effect on set method
+        testModule.addExports(fieldHoldersPackage, mutator.getClass().getModule());
+        var e2 = assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        assertEquals(e1.getMessage(), e2.getMessage());
+        assertTrue(obj.objectValue() == oldValue);
+
+        // open package to mutator module, should have no effect on set method
+        testModule.addOpens(fieldHoldersPackage, mutator.getClass().getModule());
+        var e3 = assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        assertEquals(e1.getMessage(), e3.getMessage());
+        assertTrue(obj.objectValue() == oldValue);
+    }
+
+    @ParameterizedTest
+    @MethodSource("notExportedToMutators")
+    void testUnreflectSetterNotExportedPackage(Mutator mutator) throws Exception {
+        Field f = PublicFields.objectField();
+
+        f.setAccessible(true);
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+
+        // export package to mutator module, should have no effect on unreflectSetter method
+        testModule.addExports(fieldHoldersPackage, mutator.getClass().getModule());
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+
+        // open package to mutator module, should have no effect on unreflectSetter method
+        testModule.addOpens(fieldHoldersPackage, mutator.getClass().getModule());
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+    }
+
+    // private field, class in package not opened to mutator
+
+    @ParameterizedTest
+    @MethodSource("notOpenToMutators")
+    void testFieldSetNotOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.objectField();
+        var obj = new PrivateFields();
+        Object oldValue = obj.objectValue();
+        Object newValue = new Object();
+
+        f.setAccessible(true);
+        var e1 = assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        Module mutatorModule = mutator.getClass().getModule();
+        if (mutatorModule != testModule) {
+            assertTrue(e1.getMessage().contains("module " + testModule.getName()
+                    + " does not explicitly \"opens\" package "
+                    + f.getDeclaringClass().getPackageName()
+                    + " to module " + mutatorModule.getName()));
+        }
+        assertTrue(obj.objectValue() == oldValue);
+
+        // open package to mutator module, should have no effect on set method
+        testModule.addOpens(fieldHoldersPackage, mutator.getClass().getModule());
+        var e2 = assertThrows(IllegalAccessException.class, () -> mutator.set(f, obj, newValue));
+        assertEquals(e2.getMessage(), e2.getMessage());
+        assertTrue(obj.objectValue() == oldValue);
+    }
+
+    @ParameterizedTest
+    @MethodSource("notOpenToMutators")
+    void testUnreflectSetterNotOpenPackage(Mutator mutator) throws Exception {
+        Field f = PrivateFields.class.getDeclaredField("obj");
+
+        f.setAccessible(true);
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+
+        // open package to mutator module, should have no effect on unreflectSetter method
+        testModule.addOpens(fieldHoldersPackage, mutator.getClass().getModule());
+        assertThrows(IllegalAccessException.class, () -> mutator.unreflectSetter(f));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PrivateFields.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PrivateFields.java
new file mode 100644
index 00000000000..2e7ed57a36f
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PrivateFields.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.fieldholders;
+
+import java.lang.reflect.Field;
+
+/**
+ * public class with private final fields.
+ */
+public class PrivateFields {
+    private final Object obj;
+    private final boolean z;
+    private final byte b;
+    private final char c;
+    private final short s;
+    private final int i;
+    private final long l;
+    private final float f;
+    private final double d;
+
+    public PrivateFields() {
+        obj = new Object();
+        z = false;
+        b = 0;
+        c = 0;
+        s = 0;
+        i = 0;
+        l = 0;
+        f = 0.0f;
+        d = 0.0d;
+    }
+
+    public static Field objectField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("obj");
+    }
+
+    public static Field booleanField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("z");
+    }
+
+    public static Field byteField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("b");
+    }
+
+    public static Field charField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("c");
+    }
+
+    public static Field shortField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("s");
+    }
+
+    public static Field intField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("i");
+    }
+
+    public static Field longField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("l");
+    }
+
+    public static Field floatField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("f");
+    }
+
+    public static Field doubleField() throws NoSuchFieldException {
+        return PrivateFields.class.getDeclaredField("d");
+    }
+
+    public Object objectValue() {
+        return obj;
+    }
+
+    public boolean booleanValue() {
+        return z;
+    }
+
+    public byte byteValue() {
+        return b;
+    }
+
+    public char charValue() {
+        return c;
+    }
+
+    public short shortValue() {
+        return s;
+    }
+
+    public int intValue() {
+        return i;
+    }
+
+    public long longValue() {
+        return l;
+    }
+
+    public float floatValue() {
+        return f;
+    }
+
+    public double doubleValue() {
+        return d;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PublicFields.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PublicFields.java
new file mode 100644
index 00000000000..5a830249753
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/fieldholders/PublicFields.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.fieldholders;
+
+import java.lang.reflect.Field;
+
+/**
+ * public class with public final fields.
+ */
+public class PublicFields {
+    public final Object obj;
+    public final boolean z;
+    public final byte b;
+    public final char c;
+    public final short s;
+    public final int i;
+    public final long l;
+    public final float f;
+    public final double d;
+
+    public PublicFields() {
+        obj = new Object();
+        z = false;
+        b = 0;
+        c = 0;
+        s = 0;
+        i = 0;
+        l = 0;
+        f = 0.0f;
+        d = 0.0d;
+    }
+
+    public static Field objectField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("obj");
+    }
+
+    public static Field booleanField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("z");
+    }
+
+    public static Field byteField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("b");
+    }
+
+    public static Field charField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("c");
+    }
+
+    public static Field shortField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("s");
+    }
+
+    public static Field intField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("i");
+    }
+
+    public static Field longField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("l");
+    }
+
+    public static Field floatField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("f");
+    }
+
+    public static Field doubleField() throws NoSuchFieldException {
+        return PublicFields.class.getDeclaredField("d");
+    }
+
+    public Object objectValue() {
+        return obj;
+    }
+
+    public boolean booleanValue() {
+        return z;
+    }
+
+    public byte byteValue() {
+        return b;
+    }
+
+    public char charValue() {
+        return c;
+    }
+
+    public short shortValue() {
+        return s;
+    }
+
+    public int intValue() {
+        return i;
+    }
+
+    public long longValue() {
+        return l;
+    }
+
+    public float floatValue() {
+        return f;
+    }
+
+    public double doubleValue() {
+        return d;
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/internal/TestMutator.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/internal/TestMutator.java
new file mode 100644
index 00000000000..33f7056026b
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/internal/TestMutator.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.internal;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+
+public class TestMutator implements test.spi.Mutator {
+
+    @Override
+    public void set(Field f, Object obj, Object value) throws IllegalAccessException {
+        f.set(obj, value);
+    }
+
+    @Override
+    public void setBoolean(Field f, Object obj, boolean value) throws IllegalAccessException {
+        f.setBoolean(obj, value);
+    }
+
+    @Override
+    public void setByte(Field f, Object obj, byte value) throws IllegalAccessException {
+        f.setByte(obj, value);
+    }
+
+    @Override
+    public void setChar(Field f, Object obj, char value) throws IllegalAccessException {
+        f.setChar(obj, value);
+    }
+
+    @Override
+    public void setShort(Field f, Object obj, short value) throws IllegalAccessException {
+        f.setShort(obj, value);
+    }
+
+    @Override
+    public void setInt(Field f, Object obj, int value) throws IllegalAccessException {
+        f.setInt(obj, value);
+    }
+
+    @Override
+    public void setLong(Field f, Object obj, long value) throws IllegalAccessException {
+        f.setLong(obj, value);
+    }
+
+    @Override
+    public void setFloat(Field f, Object obj, float value) throws IllegalAccessException {
+        f.setFloat(obj, value);
+    }
+
+    @Override
+    public void setDouble(Field f, Object obj, double value) throws IllegalAccessException {
+        f.setDouble(obj, value);
+    }
+
+    @Override
+    public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
+        return MethodHandles.lookup().unreflectSetter(f);
+    }
+
+}
diff --git a/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/spi/Mutator.java b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/spi/Mutator.java
new file mode 100644
index 00000000000..467a84e8a55
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Field/mutateFinals/modules/test/test/spi/Mutator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.spi;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Field;
+
+public interface Mutator {
+    void set(Field f, Object obj, Object value) throws IllegalAccessException;
+    void setBoolean(Field f, Object obj, boolean value) throws IllegalAccessException;
+    void setByte(Field f, Object obj, byte value) throws IllegalAccessException;
+    void setChar(Field f, Object obj, char value) throws IllegalAccessException;
+    void setShort(Field f, Object obj, short value) throws IllegalAccessException;
+    void setInt(Field f, Object obj, int value) throws IllegalAccessException;
+    void setLong(Field f, Object obj, long value) throws IllegalAccessException;
+    void setFloat(Field f, Object obj, float value) throws IllegalAccessException;
+    void setDouble(Field f, Object obj, double value) throws IllegalAccessException;
+    MethodHandle unreflectSetter(Field f) throws IllegalAccessException;
+
+    static Mutator throwing() {
+        return new Mutator() {
+            @Override
+            public void set(Field f, Object obj, Object value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setBoolean(Field f, Object obj, boolean value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setByte(Field f, Object obj, byte value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setChar(Field f, Object obj, char value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setShort(Field f, Object obj, short value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setInt(Field f, Object obj, int value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setLong(Field f, Object obj, long value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setFloat(Field f, Object obj, float value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public void setDouble(Field f, Object obj, double value) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
+                throw new IllegalAccessException();
+            }
+            @Override
+            public String toString() {
+                return "<throwing>";
+            }
+        };
+    }
+}
diff --git a/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java b/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java
index 396c0a27b6d..c62ddcced8a 100644
--- a/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java
+++ b/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ import static org.testng.Assert.*;
  * @test
  * @bug 8066619
  * @modules java.base/java.util.jar:+open
- * @run testng/othervm NullAndEmptyKeysAndValues
+ * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED NullAndEmptyKeysAndValues
  * @summary Tests manifests with {@code null} and empty string {@code ""}
  * values as section name, header name, or value in both main and named
  * attributes sections.
diff --git a/test/jdk/java/util/logging/FileHandlerLongLimit.java b/test/jdk/java/util/logging/FileHandlerLongLimit.java
index 43594ad3df4..69aa20e8bed 100644
--- a/test/jdk/java/util/logging/FileHandlerLongLimit.java
+++ b/test/jdk/java/util/logging/FileHandlerLongLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ import java.util.logging.LogRecord;
  * @bug 8059767
  * @summary tests that FileHandler can accept a long limit.
  * @modules java.logging/java.util.logging:open
- * @run main/othervm FileHandlerLongLimit
+ * @run main/othervm --enable-final-field-mutation=ALL-UNNAMED FileHandlerLongLimit
  * @author danielfuchs
  * @key randomness
  */
diff --git a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
index d6e126a493f..155ece15b86 100644
--- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
+++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
@@ -81,6 +81,10 @@ public class TestLookForUntestedEvents {
     private static final Set<String> coveredVirtualThreadEvents = Set.of(
         "VirtualThreadPinned", "VirtualThreadSubmitFailed");
 
+    // This event is tested in test/jdk/java/lang/reflect/Field/mutateFinals/FinalFieldMutationEventTest.java
+    private static final Set<String> coveredFinalFieldMutationEvents = Set.of(
+        "FinalFieldMutationEvent");
+
     // This is a "known failure list" for this test.
     // NOTE: if the event is not covered, a bug should be open, and bug number
     // noted in the comments for this set.
@@ -128,6 +132,7 @@ public class TestLookForUntestedEvents {
         eventsNotCoveredByTest.removeAll(hardToTestEvents);
         eventsNotCoveredByTest.removeAll(coveredGcEvents);
         eventsNotCoveredByTest.removeAll(coveredVirtualThreadEvents);
+        eventsNotCoveredByTest.removeAll(coveredFinalFieldMutationEvents);
         eventsNotCoveredByTest.removeAll(coveredContainerEvents);
         eventsNotCoveredByTest.removeAll(knownNotCoveredEvents);
 
diff --git a/test/jdk/sun/security/pkcs11/Cipher/CancelMultipart.java b/test/jdk/sun/security/pkcs11/Cipher/CancelMultipart.java
index 28f3699050c..afd9fb2cfca 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/CancelMultipart.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/CancelMultipart.java
@@ -26,7 +26,7 @@
  * @bug 8258833
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki/sun.security.pkcs11:open
- * @run main/othervm CancelMultipart
+ * @run main/othervm --enable-final-field-mutation=ALL-UNNAMED CancelMultipart
  */
 
 import java.lang.reflect.Field;
diff --git a/test/jdk/sun/security/provider/SecureRandom/DRBGS11n.java b/test/jdk/sun/security/provider/SecureRandom/DRBGS11n.java
index 410bf0cacb2..95b91805882 100644
--- a/test/jdk/sun/security/provider/SecureRandom/DRBGS11n.java
+++ b/test/jdk/sun/security/provider/SecureRandom/DRBGS11n.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,8 @@ import java.lang.reflect.Field;
  * @bug 8157308
  * @modules java.base/sun.security.provider:+open
  * @summary Make AbstractDrbg non-Serializable
- * @run main DRBGS11n mech
- * @run main DRBGS11n capability
+ * @run main/othervm --enable-final-field-mutation=ALL-UNNAMED DRBGS11n mech
+ * @run main/othervm --enable-final-field-mutation=ALL-UNNAMED DRBGS11n capability
  */
 public class DRBGS11n {
 
diff --git a/test/jdk/sun/security/util/ManifestDigester/FindSection.java b/test/jdk/sun/security/util/ManifestDigester/FindSection.java
index ed80c5bcbbd..f7517427239 100644
--- a/test/jdk/sun/security/util/ManifestDigester/FindSection.java
+++ b/test/jdk/sun/security/util/ManifestDigester/FindSection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ import static org.testng.Assert.*;
  * @bug 8217375
  * @modules java.base/sun.security.util:+open
  * @compile ../../tools/jarsigner/Utils.java
- * @run testng/othervm FindSection
+ * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED FindSection
  * @summary Check {@link ManifestDigester#findSection}.
  */
 public class FindSection {
diff --git a/test/langtools/jdk/jshell/CompletionSuggestionTest.java b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
index 7d739efddc6..d31a32b63f8 100644
--- a/test/langtools/jdk/jshell/CompletionSuggestionTest.java
+++ b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
@@ -32,7 +32,7 @@
  *          jdk.jshell/jdk.jshell:open
  * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
  * @build KullaTesting TestingInputStream Compiler
- * @run junit/timeout=480 CompletionSuggestionTest
+ * @run junit/othervm/timeout=480 --enable-final-field-mutation=ALL-UNNAMED CompletionSuggestionTest
  */
 
 import java.io.IOException;
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index a00898358a8..e53b242097e 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -220,6 +220,7 @@ public class EventNames {
     public static final String VirtualThreadEnd = PREFIX + "VirtualThreadEnd";
     public static final String VirtualThreadPinned = PREFIX + "VirtualThreadPinned";
     public static final String VirtualThreadSubmitFailed = PREFIX + "VirtualThreadSubmitFailed";
+    public static final String FinalFieldMutation = PREFIX + "FinalFieldMutation";
 
     // Containers
     public static final String ContainerConfiguration = PREFIX + "ContainerConfiguration";
diff --git a/test/micro/org/openjdk/bench/java/lang/reflect/FieldSet.java b/test/micro/org/openjdk/bench/java/lang/reflect/FieldSet.java
new file mode 100644
index 00000000000..4b8bd59a5c8
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/reflect/FieldSet.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang.reflect;
+
+import java.lang.reflect.Field;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.openjdk.jmh.annotations.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@State(Scope.Benchmark)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 10, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(3)
+public class FieldSet {
+
+    static class FieldHolder {
+        Object obj;
+        int intValue;
+        long longValue;
+        FieldHolder(Object obj, int i, long l) {
+            this.obj = obj;
+            this.intValue = i;
+            this.longValue = l;
+        }
+    }
+
+    static class FinalFieldHolder {
+        final Object obj;
+        final int intValue;
+        final long longValue;
+        FinalFieldHolder(Object obj, int i, long l) {
+            this.obj = obj;
+            this.intValue = i;
+            this.longValue = l;
+        }
+    }
+
+    private FieldHolder fieldHolder;
+    private FinalFieldHolder finalFieldHolder;
+
+    private Field objField1, objField2, objField3;
+    private Field intField1, intField2, intField3;
+    private Field longField1, longField2, longField3;
+
+    @Setup
+    public void setup() throws Exception {
+        fieldHolder = new FieldHolder(new Object(), 1, 1L);
+        finalFieldHolder = new FinalFieldHolder(new Object(), 1, 1L);
+
+        // non-final && !override
+        objField1 = FieldHolder.class.getDeclaredField("obj");
+        intField1 = FieldHolder.class.getDeclaredField("intValue");
+        longField1 = FieldHolder.class.getDeclaredField("longValue");
+
+        // non-final && override
+        objField2 = FieldHolder.class.getDeclaredField("obj");
+        objField2.setAccessible(true);
+        intField2 = FieldHolder.class.getDeclaredField("intValue");
+        intField2.setAccessible(true);
+        longField2 = FieldHolder.class.getDeclaredField("longValue");
+        longField2.setAccessible(true);
+
+        // final && override
+        objField3 = FinalFieldHolder.class.getDeclaredField("obj");
+        objField3.setAccessible(true);
+        intField3 = FinalFieldHolder.class.getDeclaredField("intValue");
+        intField3.setAccessible(true);
+        longField3 = FinalFieldHolder.class.getDeclaredField("longValue");
+        longField3.setAccessible(true);
+    }
+
+    // non-final && !override
+
+    @Benchmark
+    public void setNonFinalObjectField() throws Exception {
+        objField1.set(fieldHolder, new Object());
+    }
+
+    @Benchmark
+    public void setNonFinalIntField() throws Exception {
+        int newValue = ThreadLocalRandom.current().nextInt();
+        intField1.setInt(fieldHolder, newValue);
+    }
+
+    @Benchmark
+    public void setNonFinalLongField() throws Exception {
+        long newValue = ThreadLocalRandom.current().nextLong();
+        longField1.setLong(fieldHolder, newValue);
+    }
+
+    // non-final && override
+
+    @Benchmark
+    public void setNonFinalObjectFieldWithOverride() throws Exception {
+        objField2.set(fieldHolder, new Object());
+    }
+
+    @Benchmark
+    public void setNonFinalIntFieldWithOverride() throws Exception {
+        int newValue = ThreadLocalRandom.current().nextInt();
+        intField2.setInt(fieldHolder, newValue);
+    }
+
+    @Benchmark
+    public void setNonFinalLongFieldWithOverride() throws Exception {
+        long newValue = ThreadLocalRandom.current().nextLong();
+        longField2.setLong(fieldHolder, newValue);
+    }
+
+    // final && override
+
+    @Benchmark
+    public void setFinalObjectField()throws Exception {
+        objField3.set(finalFieldHolder, new Object());
+    }
+
+    @Benchmark
+    public void setFinalIntField() throws Exception {
+        int newValue = ThreadLocalRandom.current().nextInt();
+        intField3.setInt(finalFieldHolder, newValue);
+    }
+
+    @Benchmark
+    public void setFinalLongField() throws Exception {
+        long newValue = ThreadLocalRandom.current().nextLong();
+        longField3.setLong(finalFieldHolder, newValue);
+    }
+}

From 8af594371979b2b76ec04e0a2753413dc35b8d44 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 18 Nov 2025 08:13:58 +0000
Subject: [PATCH 218/512] 8370334: javadoc NPE with "import module" statement

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Modules.java     | 15 +++++---
 .../jdk/javadoc/tool/modules/Modules.java     | 31 ++++++++++++++++
 .../tools/javac/modules/AddModulesTest.java   | 37 ++++++++++++++++++-
 3 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index 0cef9cc6602..5a1fe70dd9b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -37,7 +37,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -236,6 +236,7 @@ public class Modules extends JCTree.Visitor {
                 setupAllModules(); //initialize the module graph
                 Assert.checkNonNull(allModules);
                 inInitModules = false;
+                return allModules;
             }, null);
         } finally {
             inInitModules = false;
@@ -249,10 +250,11 @@ public class Modules extends JCTree.Visitor {
             //the next steps may query if the current module participates in preview,
             //and that requires a completed java.base:
             syms.java_base.complete();
+            return modules;
         }, c);
     }
 
-    private boolean enter(List<JCCompilationUnit> trees, Consumer<Set<ModuleSymbol>> init, ClassSymbol c) {
+    private boolean enter(List<JCCompilationUnit> trees, Function<Set<ModuleSymbol>, Set<ModuleSymbol>> init, ClassSymbol c) {
         if (!allowModules) {
             for (JCCompilationUnit tree: trees) {
                 tree.modle = syms.noModule;
@@ -270,10 +272,13 @@ public class Modules extends JCTree.Visitor {
 
             setCompilationUnitModules(trees, roots, c);
 
-            init.accept(roots);
+            Set<ModuleSymbol> initialized = init.apply(roots);
 
-            for (ModuleSymbol msym: roots) {
-                msym.complete();
+            for (ModuleSymbol msym : initialized) {
+                if (msym != syms.unnamedModule ||
+                    roots.contains(syms.unnamedModule)) {
+                    msym.complete();
+                }
             }
         } catch (CompletionFailure ex) {
             chk.completionError(null, ex);
diff --git a/test/langtools/jdk/javadoc/tool/modules/Modules.java b/test/langtools/jdk/javadoc/tool/modules/Modules.java
index d830470bb01..c8028ba5c7e 100644
--- a/test/langtools/jdk/javadoc/tool/modules/Modules.java
+++ b/test/langtools/jdk/javadoc/tool/modules/Modules.java
@@ -672,4 +672,35 @@ public class Modules extends ModuleTestBase {
         checkTypesIncluded("p.P");
     }
 
+    @Test
+    public void testImportModules(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path mod = Paths.get(src.toString(), "m1");
+        tb.writeJavaFiles(mod,
+                """
+                import module m1;
+                module m1 {
+                    exports p;
+                    uses Service;
+                    provides Service with ServiceImpl;
+                }
+                """,
+                """
+                package p;
+                public interface Service {
+                }
+                """,
+                """
+                package p;
+                public class ServiceImpl implements Service {
+                }
+                """);
+        execTask("--module-source-path", src.toString(),
+                 "--module", "m1");
+        checkModulesSpecified("m1");
+        checkPackagesIncluded("p");
+        checkTypesIncluded("p.Service");
+        checkTypesIncluded("p.ServiceImpl");
+    }
+
 }
diff --git a/test/langtools/tools/javac/modules/AddModulesTest.java b/test/langtools/tools/javac/modules/AddModulesTest.java
index f7a87c592c9..080a5edda27 100644
--- a/test/langtools/tools/javac/modules/AddModulesTest.java
+++ b/test/langtools/tools/javac/modules/AddModulesTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8167975 8173596
+ * @bug 8167975 8173596 8370334
  * @summary Test the --add-modules option
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -35,6 +35,7 @@
 
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.List;
 
 import javax.tools.JavaCompiler;
 import javax.tools.JavaCompiler.CompilationTask;
@@ -278,5 +279,39 @@ public class AddModulesTest extends ModuleTestBase {
             Assert.check(t.call());
         }
     }
+
+    @Test //JDK-8370334
+    public void testModuleImportAndAddModules(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        //module that will be inserted using addModules:
+        Path src_m = src.resolve("m");
+        tb.writeJavaFiles(src_m,
+                          "import module m; module m { exports p1; }",
+                          "package p1; public class C1 { }");
+        //test module:
+        Path src_test = src.resolve("test");
+        tb.writeJavaFiles(src_test,
+                          "import module test; module test { exports p2; }",
+                          "package p2; public class C2 { }");
+
+        Path classes = base.resolve("classes");
+        tb.createDirectories(classes);
+
+        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
+        try (StandardJavaFileManager fm = c.getStandardFileManager(null, null, null)) {
+            List<String> options = List.of(
+                "--module-source-path", src.toString(),
+                "-d", classes.toString()
+            );
+            Iterable<? extends JavaFileObject> files =
+                    fm.getJavaFileObjects(findJavaFiles(src_test));
+
+            CompilationTask t = c.getTask(null, fm, null, options, null, files);
+            t.addModules(Arrays.asList("m"));
+            //expecting no errors/crashes:
+            Assert.check(t.call());
+        }
+    }
 }
 

From 50a30497370799e8f377a11914562a15b0a48fbb Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 18 Nov 2025 09:37:20 +0000
Subject: [PATCH 219/512] 8371643: Remove
 ThreadLocalAllocBuffer::_reserve_for_allocation_prefetch

Reviewed-by: mdoerr, kvn, tschatzl
---
 src/hotspot/cpu/ppc/ppc.ad                    | 29 -------------------
 .../gc/shared/threadLocalAllocBuffer.cpp      | 28 +-----------------
 .../gc/shared/threadLocalAllocBuffer.hpp      |  1 -
 src/hotspot/share/opto/macro.cpp              |  3 +-
 src/hotspot/share/runtime/vmStructs.cpp       |  1 -
 .../runtime/ThreadLocalAllocBuffer.java       |  3 +-
 .../classes/sun/jvm/hotspot/runtime/VM.java   |  7 -----
 7 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 7fcd096d2ad..c169d673aaf 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -6328,36 +6328,8 @@ instruct loadConD_Ex(regD dst, immD src) %{
 // Prefetch instructions.
 // Must be safe to execute with invalid address (cannot fault).
 
-// Special prefetch versions which use the dcbz instruction.
-instruct prefetch_alloc_zero(indirectMemory mem, iRegLsrc src) %{
-  match(PrefetchAllocation (AddP mem src));
-  predicate(AllocatePrefetchStyle == 3);
-  ins_cost(MEMORY_REF_COST);
-
-  format %{ "PREFETCH $mem, 2, $src \t// Prefetch write-many with zero" %}
-  size(4);
-  ins_encode %{
-    __ dcbz($src$$Register, $mem$$base$$Register);
-  %}
-  ins_pipe(pipe_class_memory);
-%}
-
-instruct prefetch_alloc_zero_no_offset(indirectMemory mem) %{
-  match(PrefetchAllocation mem);
-  predicate(AllocatePrefetchStyle == 3);
-  ins_cost(MEMORY_REF_COST);
-
-  format %{ "PREFETCH $mem, 2 \t// Prefetch write-many with zero" %}
-  size(4);
-  ins_encode %{
-    __ dcbz($mem$$base$$Register);
-  %}
-  ins_pipe(pipe_class_memory);
-%}
-
 instruct prefetch_alloc(indirectMemory mem, iRegLsrc src) %{
   match(PrefetchAllocation (AddP mem src));
-  predicate(AllocatePrefetchStyle != 3);
   ins_cost(MEMORY_REF_COST);
 
   format %{ "PREFETCH $mem, 2, $src \t// Prefetch write-many" %}
@@ -6370,7 +6342,6 @@ instruct prefetch_alloc(indirectMemory mem, iRegLsrc src) %{
 
 instruct prefetch_alloc_no_offset(indirectMemory mem) %{
   match(PrefetchAllocation mem);
-  predicate(AllocatePrefetchStyle != 3);
   ins_cost(MEMORY_REF_COST);
 
   format %{ "PREFETCH $mem, 2 \t// Prefetch write-many" %}
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index 9635ed4d0cb..2181e089663 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -37,7 +37,6 @@
 #include "utilities/copy.hpp"
 
 size_t       ThreadLocalAllocBuffer::_max_size = 0;
-int          ThreadLocalAllocBuffer::_reserve_for_allocation_prefetch = 0;
 unsigned int ThreadLocalAllocBuffer::_target_refills = 0;
 
 ThreadLocalAllocBuffer::ThreadLocalAllocBuffer() :
@@ -225,30 +224,6 @@ void ThreadLocalAllocBuffer::startup_initialization() {
   // abort during VM initialization.
   _target_refills = MAX2(_target_refills, 2U);
 
-#ifdef COMPILER2
-  // If the C2 compiler is present, extra space is needed at the end of
-  // TLABs, otherwise prefetching instructions generated by the C2
-  // compiler will fault (due to accessing memory outside of heap).
-  // The amount of space is the max of the number of lines to
-  // prefetch for array and for instance allocations. (Extra space must be
-  // reserved to accommodate both types of allocations.)
-  //
-  // Only SPARC-specific BIS instructions are known to fault. (Those
-  // instructions are generated if AllocatePrefetchStyle==3 and
-  // AllocatePrefetchInstr==1). To be on the safe side, however,
-  // extra space is reserved for all combinations of
-  // AllocatePrefetchStyle and AllocatePrefetchInstr.
-  //
-  // If the C2 compiler is not present, no space is reserved.
-
-  // +1 for rounding up to next cache line, +1 to be safe
-  if (CompilerConfig::is_c2_or_jvmci_compiler_enabled()) {
-    int lines =  MAX2(AllocatePrefetchLines, AllocateInstancePrefetchLines) + 2;
-    _reserve_for_allocation_prefetch = (AllocatePrefetchDistance + AllocatePrefetchStepSize * lines) /
-                                       (int)HeapWordSize;
-  }
-#endif
-
   // During jvm startup, the main thread is initialized
   // before the heap is initialized.  So reinitialize it now.
   guarantee(Thread::current()->is_Java_thread(), "tlab initialization thread not Java thread");
@@ -454,8 +429,7 @@ void ThreadLocalAllocStats::publish() {
 }
 
 size_t ThreadLocalAllocBuffer::end_reserve() {
-  size_t reserve_size = CollectedHeap::lab_alignment_reserve();
-  return MAX2(reserve_size, (size_t)_reserve_for_allocation_prefetch);
+  return CollectedHeap::lab_alignment_reserve();
 }
 
 const HeapWord* ThreadLocalAllocBuffer::start_relaxed() const {
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index 59979646395..b64fa8d6ad1 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -58,7 +58,6 @@ private:
   size_t    _allocated_before_last_gc;           // total bytes allocated up until the last gc
 
   static size_t   _max_size;                          // maximum size of any TLAB
-  static int      _reserve_for_allocation_prefetch;   // Reserve at the end of the TLAB
   static unsigned _target_refills;                    // expected number of refills between GCs
 
   unsigned  _number_of_refills;
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 90602bc2b35..6f2171bbd75 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -1914,8 +1914,7 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
       transform_later(cache_adr);
       cache_adr = new CastP2XNode(needgc_false, cache_adr);
       transform_later(cache_adr);
-      // Address is aligned to execute prefetch to the beginning of cache line size
-      // (it is important when BIS instruction is used on SPARC as prefetch).
+      // Address is aligned to execute prefetch to the beginning of cache line size.
       Node* mask = _igvn.MakeConX(~(intptr_t)(step_size-1));
       cache_adr = new AndXNode(cache_adr, mask);
       transform_later(cache_adr);
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index a7342448522..a75e67e9b56 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -350,7 +350,6 @@
   nonstatic_field(ThreadLocalAllocBuffer,      _pf_top,                                       HeapWord*)                             \
   nonstatic_field(ThreadLocalAllocBuffer,      _desired_size,                                 size_t)                                \
   nonstatic_field(ThreadLocalAllocBuffer,      _refill_waste_limit,                           size_t)                                \
-     static_field(ThreadLocalAllocBuffer,      _reserve_for_allocation_prefetch,              int)                                   \
      static_field(ThreadLocalAllocBuffer,      _target_refills,                               unsigned)                              \
   nonstatic_field(ThreadLocalAllocBuffer,      _number_of_refills,                            unsigned)                              \
   nonstatic_field(ThreadLocalAllocBuffer,      _refill_waste,                                 unsigned)                              \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java
index 1dc67330d3d..e23e63806bd 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java
@@ -76,10 +76,9 @@ public class ThreadLocalAllocBuffer extends VMObject {
 
   private long endReserve() {
     long labAlignmentReserve = VM.getVM().getLabAlignmentReserve();
-    long reserveForAllocationPrefetch = VM.getVM().getReserveForAllocationPrefetch();
     long heapWordSize = VM.getVM().getHeapWordSize();
 
-    return Math.max(labAlignmentReserve, reserveForAllocationPrefetch) * heapWordSize;
+    return labAlignmentReserve * heapWordSize;
   }
 
   /** Support for iteration over heap -- not sure how this will
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
index dc27a4fc59e..1607563150a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
@@ -123,7 +123,6 @@ public class VM {
   private int          invocationEntryBCI;
   private ReversePtrs  revPtrs;
   private VMRegImpl    vmregImpl;
-  private int          reserveForAllocationPrefetch;
   private int          labAlignmentReserve;
 
   // System.getProperties from debuggee VM
@@ -447,8 +446,6 @@ public class VM {
     boolType = (CIntegerType) db.lookupType("bool");
 
     Type threadLocalAllocBuffer = db.lookupType("ThreadLocalAllocBuffer");
-    CIntegerField reserveForAllocationPrefetchField = threadLocalAllocBuffer.getCIntegerField("_reserve_for_allocation_prefetch");
-    reserveForAllocationPrefetch = (int)reserveForAllocationPrefetchField.getCInteger(intType);
 
     Type collectedHeap = db.lookupType("CollectedHeap");
     CIntegerField labAlignmentReserveField = collectedHeap.getCIntegerField("_lab_alignment_reserve");
@@ -915,10 +912,6 @@ public class VM {
     return vmInternalInfo;
   }
 
-  public int getReserveForAllocationPrefetch() {
-    return reserveForAllocationPrefetch;
-  }
-
   public int getLabAlignmentReserve() {
     return labAlignmentReserve;
   }

From 72ebca8a0b19fac8a9483e5a3a98b454176fc342 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Tue, 18 Nov 2025 09:42:28 +0000
Subject: [PATCH 220/512] 8365606: Container code should not be using
 jlong/julong

Reviewed-by: stuefe, cnorrbin, fitzsim
---
 .../os/linux/cgroupSubsystem_linux.cpp        | 157 +++---
 .../os/linux/cgroupSubsystem_linux.hpp        | 139 +++--
 src/hotspot/os/linux/cgroupUtil_linux.cpp     | 101 +++-
 src/hotspot/os/linux/cgroupUtil_linux.hpp     |   9 +-
 .../os/linux/cgroupV1Subsystem_linux.cpp      | 527 +++++++++++-------
 .../os/linux/cgroupV1Subsystem_linux.hpp      |  76 ++-
 .../os/linux/cgroupV2Subsystem_linux.cpp      | 320 ++++++-----
 .../os/linux/cgroupV2Subsystem_linux.hpp      |  43 +-
 src/hotspot/os/linux/osContainer_linux.cpp    | 196 ++++---
 src/hotspot/os/linux/osContainer_linux.hpp    |  59 +-
 src/hotspot/os/linux/os_linux.cpp             | 220 ++++----
 src/hotspot/os/linux/os_linux.hpp             |   4 +-
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    |   4 +-
 src/hotspot/share/prims/whitebox.cpp          |   8 +-
 src/hotspot/share/runtime/os.cpp              |   8 +-
 .../runtime/test_cgroupSubsystem_linux.cpp    | 135 ++---
 16 files changed, 1207 insertions(+), 799 deletions(-)

diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
index f5c4abeb4ca..f9c6f794ebd 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
@@ -612,7 +612,6 @@ void CgroupSubsystemFactory::cleanup(CgroupInfo* cg_infos) {
  *
  * cpu affinity
  * cgroup cpu quota & cpu period
- * cgroup cpu shares
  *
  * Algorithm:
  *
@@ -623,19 +622,18 @@ void CgroupSubsystemFactory::cleanup(CgroupInfo* cg_infos) {
  *
  * All results of division are rounded up to the next whole number.
  *
- * If quotas have not been specified, return the
- * number of active processors in the system.
+ * If quotas have not been specified, sets the result reference to
+ * the number of active processors in the system.
  *
- * If quotas have been specified, the resulting number
- * returned will never exceed the number of active processors.
+ * If quotas have been specified, the number set in the result
+ * reference will never exceed the number of active processors.
  *
  * return:
- *    number of CPUs
+ *    true if there were no errors. false otherwise.
  */
-int CgroupSubsystem::active_processor_count() {
-  int quota_count = 0;
+bool CgroupSubsystem::active_processor_count(int& value) {
   int cpu_count;
-  int result;
+  int result = -1;
 
   // We use a cache with a timeout to avoid performing expensive
   // computations in the event this function is called frequently.
@@ -643,38 +641,50 @@ int CgroupSubsystem::active_processor_count() {
   CachingCgroupController<CgroupCpuController>* contrl = cpu_controller();
   CachedMetric* cpu_limit = contrl->metrics_cache();
   if (!cpu_limit->should_check_metric()) {
-    int val = (int)cpu_limit->value();
-    log_trace(os, container)("CgroupSubsystem::active_processor_count (cached): %d", val);
-    return val;
+    value = (int)cpu_limit->value();
+    log_trace(os, container)("CgroupSubsystem::active_processor_count (cached): %d", value);
+    return true;
   }
 
   cpu_count = os::Linux::active_processor_count();
-  result = CgroupUtil::processor_count(contrl->controller(), cpu_count);
+  if (!CgroupUtil::processor_count(contrl->controller(), cpu_count, result)) {
+    return false;
+  }
+  assert(result > 0 && result <= cpu_count, "must be");
   // Update cached metric to avoid re-reading container settings too often
   cpu_limit->set_value(result, OSCONTAINER_CACHE_TIMEOUT);
+  value = result;
 
-  return result;
+  return true;
 }
 
 /* memory_limit_in_bytes
  *
- * Return the limit of available memory for this process.
+ * Return the limit of available memory for this process in the provided
+ * physical_memory_size_type reference. If there was no limit value set in the underlying
+ * interface files 'value_unlimited' is returned.
  *
  * return:
- *    memory limit in bytes or
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
+ *    false if retrieving the value failed
+ *    true if retrieving the value was successfull and the value was
+ *    set in the 'value' reference.
  */
-jlong CgroupSubsystem::memory_limit_in_bytes(julong upper_bound) {
+bool CgroupSubsystem::memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                            physical_memory_size_type& value) {
   CachingCgroupController<CgroupMemoryController>* contrl = memory_controller();
   CachedMetric* memory_limit = contrl->metrics_cache();
   if (!memory_limit->should_check_metric()) {
-    return memory_limit->value();
+    value = memory_limit->value();
+    return true;
+  }
+  physical_memory_size_type mem_limit = 0;
+  if (!contrl->controller()->read_memory_limit_in_bytes(upper_bound, mem_limit)) {
+    return false;
   }
-  jlong mem_limit = contrl->controller()->read_memory_limit_in_bytes(upper_bound);
   // Update cached metric to avoid re-reading container settings too often
   memory_limit->set_value(mem_limit, OSCONTAINER_CACHE_TIMEOUT);
-  return mem_limit;
+  value = mem_limit;
+  return true;
 }
 
 bool CgroupController::read_string(const char* filename, char* buf, size_t buf_size) {
@@ -719,36 +729,35 @@ bool CgroupController::read_string(const char* filename, char* buf, size_t buf_s
   return true;
 }
 
-bool CgroupController::read_number(const char* filename, julong* result) {
+bool CgroupController::read_number(const char* filename, uint64_t& result) {
   char buf[1024];
   bool is_ok = read_string(filename, buf, 1024);
   if (!is_ok) {
     return false;
   }
-  int matched = sscanf(buf, JULONG_FORMAT, result);
+  int matched = sscanf(buf, UINT64_FORMAT, &result);
   if (matched == 1) {
     return true;
   }
   return false;
 }
 
-bool CgroupController::read_number_handle_max(const char* filename, jlong* result) {
+bool CgroupController::read_number_handle_max(const char* filename, uint64_t& result) {
   char buf[1024];
   bool is_ok = read_string(filename, buf, 1024);
   if (!is_ok) {
     return false;
   }
-  jlong val = limit_from_str(buf);
-  if (val == OSCONTAINER_ERROR) {
+  uint64_t val = 0;
+  if (!limit_from_str(buf, val)) {
     return false;
   }
-  *result = val;
+  result = val;
   return true;
 }
 
-bool CgroupController::read_numerical_key_value(const char* filename, const char* key, julong* result) {
+bool CgroupController::read_numerical_key_value(const char* filename, const char* key, uint64_t& result) {
   assert(key != nullptr, "key must be given");
-  assert(result != nullptr, "result pointer must not be null");
   assert(filename != nullptr, "file to search in must be given");
   const char* s_path = subsystem_path();
   if (s_path == nullptr) {
@@ -786,7 +795,7 @@ bool CgroupController::read_numerical_key_value(const char* filename, const char
           && after_key != '\n') {
       // Skip key, skip space
       const char* value_substr = line + key_len + 1;
-      int matched = sscanf(value_substr, JULONG_FORMAT, result);
+      int matched = sscanf(value_substr, UINT64_FORMAT, &result);
       found_match = matched == 1;
       if (found_match) {
         break;
@@ -797,12 +806,12 @@ bool CgroupController::read_numerical_key_value(const char* filename, const char
   if (found_match) {
     return true;
   }
-  log_debug(os, container)("Type %s (key == %s) not found in file %s", JULONG_FORMAT,
+  log_debug(os, container)("Type %s (key == %s) not found in file %s", UINT64_FORMAT,
                            key, absolute_path);
   return false;
 }
 
-bool CgroupController::read_numerical_tuple_value(const char* filename, bool use_first, jlong* result) {
+bool CgroupController::read_numerical_tuple_value(const char* filename, bool use_first, uint64_t& result) {
   char buf[1024];
   bool is_ok = read_string(filename, buf, 1024);
   if (!is_ok) {
@@ -813,80 +822,90 @@ bool CgroupController::read_numerical_tuple_value(const char* filename, bool use
   if (matched != 1) {
     return false;
   }
-  jlong val = limit_from_str(token);
-  if (val == OSCONTAINER_ERROR) {
+  uint64_t val = 0;
+  if (!limit_from_str(token, val)) {
     return false;
   }
-  *result = val;
+  result = val;
   return true;
 }
 
-jlong CgroupController::limit_from_str(char* limit_str) {
+bool CgroupController::limit_from_str(char* limit_str, uint64_t& value) {
   if (limit_str == nullptr) {
-    return OSCONTAINER_ERROR;
+    return false;
   }
   // Unlimited memory in cgroups is the literal string 'max' for
   // some controllers, for example the pids controller.
   if (strcmp("max", limit_str) == 0) {
-    return (jlong)-1;
+    value = value_unlimited;
+    return true;
   }
-  julong limit;
-  if (sscanf(limit_str, JULONG_FORMAT, &limit) != 1) {
-    return OSCONTAINER_ERROR;
+  uint64_t limit;
+  if (sscanf(limit_str, UINT64_FORMAT, &limit) != 1) {
+    return false;
   }
-  return (jlong)limit;
+  value = limit;
+  return true;
 }
 
 // CgroupSubsystem implementations
-
-jlong CgroupSubsystem::memory_and_swap_limit_in_bytes(julong upper_mem_bound, julong upper_swap_bound) {
-  return memory_controller()->controller()->memory_and_swap_limit_in_bytes(upper_mem_bound, upper_swap_bound);
+bool CgroupSubsystem::memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                     physical_memory_size_type upper_swap_bound,
+                                                     physical_memory_size_type& value) {
+  return memory_controller()->controller()->memory_and_swap_limit_in_bytes(upper_mem_bound,
+                                                                           upper_swap_bound,
+                                                                           value);
 }
 
-jlong CgroupSubsystem::memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound) {
-  return memory_controller()->controller()->memory_and_swap_usage_in_bytes(upper_mem_bound, upper_swap_bound);
+bool CgroupSubsystem::memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                     physical_memory_size_type upper_swap_bound,
+                                                     physical_memory_size_type& value) {
+  return memory_controller()->controller()->memory_and_swap_usage_in_bytes(upper_mem_bound,
+                                                                           upper_swap_bound,
+                                                                           value);
 }
 
-jlong CgroupSubsystem::memory_soft_limit_in_bytes(julong upper_bound) {
-  return memory_controller()->controller()->memory_soft_limit_in_bytes(upper_bound);
+bool CgroupSubsystem::memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                                 physical_memory_size_type& value) {
+  return memory_controller()->controller()->memory_soft_limit_in_bytes(upper_bound, value);
 }
 
-jlong CgroupSubsystem::memory_throttle_limit_in_bytes() {
-  return memory_controller()->controller()->memory_throttle_limit_in_bytes();
+bool CgroupSubsystem::memory_throttle_limit_in_bytes(physical_memory_size_type& value) {
+  return memory_controller()->controller()->memory_throttle_limit_in_bytes(value);
 }
 
-jlong CgroupSubsystem::memory_usage_in_bytes() {
-  return memory_controller()->controller()->memory_usage_in_bytes();
+bool CgroupSubsystem::memory_usage_in_bytes(physical_memory_size_type& value) {
+  return memory_controller()->controller()->memory_usage_in_bytes(value);
 }
 
-jlong CgroupSubsystem::memory_max_usage_in_bytes() {
-  return memory_controller()->controller()->memory_max_usage_in_bytes();
+bool CgroupSubsystem::memory_max_usage_in_bytes(physical_memory_size_type& value) {
+  return memory_controller()->controller()->memory_max_usage_in_bytes(value);
 }
 
-jlong CgroupSubsystem::rss_usage_in_bytes() {
-  return memory_controller()->controller()->rss_usage_in_bytes();
+bool CgroupSubsystem::rss_usage_in_bytes(physical_memory_size_type& value) {
+  return memory_controller()->controller()->rss_usage_in_bytes(value);
 }
 
-jlong CgroupSubsystem::cache_usage_in_bytes() {
-  return memory_controller()->controller()->cache_usage_in_bytes();
+bool CgroupSubsystem::cache_usage_in_bytes(physical_memory_size_type& value) {
+  return memory_controller()->controller()->cache_usage_in_bytes(value);
 }
 
-int CgroupSubsystem::cpu_quota() {
-  return cpu_controller()->controller()->cpu_quota();
+bool CgroupSubsystem::cpu_quota(int& value) {
+  return cpu_controller()->controller()->cpu_quota(value);
 }
 
-int CgroupSubsystem::cpu_period() {
-  return cpu_controller()->controller()->cpu_period();
+bool CgroupSubsystem::cpu_period(int& value) {
+  return cpu_controller()->controller()->cpu_period(value);
 }
 
-int CgroupSubsystem::cpu_shares() {
-  return cpu_controller()->controller()->cpu_shares();
+bool CgroupSubsystem::cpu_shares(int& value) {
+  return cpu_controller()->controller()->cpu_shares(value);
 }
 
-jlong CgroupSubsystem::cpu_usage_in_micros() {
-  return cpuacct_controller()->cpu_usage_in_micros();
+bool CgroupSubsystem::cpu_usage_in_micros(uint64_t& value) {
+  return cpuacct_controller()->cpu_usage_in_micros(value);
 }
 
-void CgroupSubsystem::print_version_specific_info(outputStream* st, julong upper_mem_bound) {
+void CgroupSubsystem::print_version_specific_info(outputStream* st, physical_memory_size_type upper_mem_bound) {
   memory_controller()->controller()->print_version_specific_info(st, upper_mem_bound);
 }
diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
index bf0ad03fc56..522b64f8816 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
@@ -72,23 +72,29 @@
 #define CONTAINER_READ_NUMBER_CHECKED(controller, filename, log_string, retval)       \
 {                                                                                     \
   bool is_ok;                                                                         \
-  is_ok = controller->read_number(filename, &retval);                                 \
+  is_ok = controller->read_number(filename, retval);                                  \
   if (!is_ok) {                                                                       \
-    log_trace(os, container)(log_string " failed: %d", OSCONTAINER_ERROR);            \
-    return OSCONTAINER_ERROR;                                                         \
+    log_trace(os, container)(log_string " failed");                                   \
+    return false;                                                                     \
   }                                                                                   \
-  log_trace(os, container)(log_string " is: " JULONG_FORMAT, retval);                 \
+  log_trace(os, container)(log_string " is: " UINT64_FORMAT, retval);                 \
+  return true;                                                                        \
 }
 
 #define CONTAINER_READ_NUMBER_CHECKED_MAX(controller, filename, log_string, retval)   \
 {                                                                                     \
   bool is_ok;                                                                         \
-  is_ok = controller->read_number_handle_max(filename, &retval);                      \
+  is_ok = controller->read_number_handle_max(filename, retval);                       \
   if (!is_ok) {                                                                       \
-    log_trace(os, container)(log_string " failed: %d", OSCONTAINER_ERROR);            \
-    return OSCONTAINER_ERROR;                                                         \
+    log_trace(os, container)(log_string " failed");                                   \
+    return false;                                                                     \
   }                                                                                   \
-  log_trace(os, container)(log_string " is: " JLONG_FORMAT, retval);                  \
+  if (retval == value_unlimited) {                                                    \
+    log_trace(os, container)(log_string " is: unlimited");                            \
+  } else {                                                                            \
+    log_trace(os, container)(log_string " is: " UINT64_FORMAT, retval);               \
+  }                                                                                   \
+  return true;                                                                        \
 }
 
 #define CONTAINER_READ_STRING_CHECKED(controller, filename, log_string, retval, buf_size) \
@@ -96,7 +102,7 @@
   bool is_ok;                                                                             \
   is_ok = controller->read_string(filename, retval, buf_size);                            \
   if (!is_ok) {                                                                           \
-    log_trace(os, container)(log_string " failed: %d", OSCONTAINER_ERROR);                \
+    log_trace(os, container)(log_string " failed");                                       \
     return nullptr;                                                                       \
   }                                                                                       \
   log_trace(os, container)(log_string " is: %s", retval);                                 \
@@ -105,12 +111,13 @@
 #define CONTAINER_READ_NUMERICAL_KEY_VALUE_CHECKED(controller, filename, key, log_string, retval) \
 {                                                                                     \
   bool is_ok;                                                                         \
-  is_ok = controller->read_numerical_key_value(filename, key, &retval);               \
+  is_ok = controller->read_numerical_key_value(filename, key, retval);                \
   if (!is_ok) {                                                                       \
-    log_trace(os, container)(log_string " failed: %d", OSCONTAINER_ERROR);            \
-    return OSCONTAINER_ERROR;                                                         \
+    log_trace(os, container)(log_string " failed");                                   \
+    return false;                                                                     \
   }                                                                                   \
-  log_trace(os, container)(log_string " is: " JULONG_FORMAT, retval);                 \
+  log_trace(os, container)(log_string " is: " UINT64_FORMAT, retval);                 \
+  return true;                                                                        \
 }
 
 class CgroupController: public CHeapObj<mtInternal> {
@@ -124,21 +131,22 @@ class CgroupController: public CHeapObj<mtInternal> {
     const char* mount_point() { return _mount_point; }
     virtual bool needs_hierarchy_adjustment() { return false; }
 
-    /* Read a numerical value as unsigned long
+    /* Read a numerical value as uint64_t
      *
      * returns: false if any error occurred. true otherwise and
-     * the parsed value is set in the provided julong pointer.
+     * the parsed value is set in the provided result reference.
      */
-    bool read_number(const char* filename, julong* result);
+    bool read_number(const char* filename, uint64_t& result);
 
     /* Convenience method to deal with numbers as well as the string 'max'
      * in interface files. Otherwise same as read_number().
      *
      * returns: false if any error occurred. true otherwise and
-     * the parsed value (which might be negative) is being set in
-     * the provided jlong pointer.
+     * the parsed value will be set in the provided result reference.
+     * When the value was the string 'max' then 'value_unlimited' is
+     * being set as the value.
      */
-    bool read_number_handle_max(const char* filename, jlong* result);
+    bool read_number_handle_max(const char* filename, uint64_t& result);
 
     /* Read a string of at most buf_size - 1 characters from the interface file.
      * The provided buffer must be at least buf_size in size so as to account
@@ -156,37 +164,37 @@ class CgroupController: public CHeapObj<mtInternal> {
      * parsing interface files like cpu.max which contain such tuples.
      *
      * returns: false if any error occurred. true otherwise and the parsed
-     * value of the appropriate tuple entry set in the provided jlong pointer.
+     * value of the appropriate tuple entry set in the provided result reference.
      */
-    bool read_numerical_tuple_value(const char* filename, bool use_first, jlong* result);
+    bool read_numerical_tuple_value(const char* filename, bool use_first, uint64_t& result);
 
     /* Read a numerical value from a multi-line interface file. The matched line is
      * determined by the provided 'key'. The associated numerical value is being set
-     * via the passed in julong pointer. Example interface file 'memory.stat'
+     * via the passed in result reference. Example interface file 'memory.stat'
      *
      * returns: false if any error occurred. true otherwise and the parsed value is
-     * being set in the provided julong pointer.
+     * being set in the provided result reference.
      */
-    bool read_numerical_key_value(const char* filename, const char* key, julong* result);
+    bool read_numerical_key_value(const char* filename, const char* key, uint64_t& result);
 
   private:
-    static jlong limit_from_str(char* limit_str);
+    static bool limit_from_str(char* limit_str, physical_memory_size_type& value);
 };
 
 class CachedMetric : public CHeapObj<mtInternal>{
   private:
-    volatile jlong _metric;
+    volatile physical_memory_size_type _metric;
     volatile jlong _next_check_counter;
   public:
     CachedMetric() {
-      _metric = -1;
+      _metric = value_unlimited;
       _next_check_counter = min_jlong;
     }
     bool should_check_metric() {
       return os::elapsed_counter() > _next_check_counter;
     }
-    jlong value() { return _metric; }
-    void set_value(jlong value, jlong timeout) {
+    physical_memory_size_type value() { return _metric; }
+    void set_value(physical_memory_size_type value, jlong timeout) {
       _metric = value;
       // Metric is unlikely to change, but we want to remain
       // responsive to configuration changes. A very short grace time
@@ -216,9 +224,9 @@ class CachingCgroupController : public CHeapObj<mtInternal> {
 // Pure virtual class representing version agnostic CPU controllers
 class CgroupCpuController: public CHeapObj<mtInternal> {
   public:
-    virtual int cpu_quota() = 0;
-    virtual int cpu_period() = 0;
-    virtual int cpu_shares() = 0;
+    virtual bool cpu_quota(int& value) = 0;
+    virtual bool cpu_period(int& value) = 0;
+    virtual bool cpu_shares(int& value) = 0;
     virtual bool needs_hierarchy_adjustment() = 0;
     virtual bool is_read_only() = 0;
     virtual const char* subsystem_path() = 0;
@@ -230,7 +238,7 @@ class CgroupCpuController: public CHeapObj<mtInternal> {
 // Pure virtual class representing version agnostic CPU accounting controllers
 class CgroupCpuacctController: public CHeapObj<mtInternal> {
   public:
-    virtual jlong cpu_usage_in_micros() = 0;
+    virtual bool cpu_usage_in_micros(uint64_t& value) = 0;
     virtual bool needs_hierarchy_adjustment() = 0;
     virtual bool is_read_only() = 0;
     virtual const char* subsystem_path() = 0;
@@ -242,16 +250,22 @@ class CgroupCpuacctController: public CHeapObj<mtInternal> {
 // Pure virtual class representing version agnostic memory controllers
 class CgroupMemoryController: public CHeapObj<mtInternal> {
   public:
-    virtual jlong read_memory_limit_in_bytes(julong upper_bound) = 0;
-    virtual jlong memory_usage_in_bytes() = 0;
-    virtual jlong memory_and_swap_limit_in_bytes(julong upper_mem_bound, julong upper_swap_bound) = 0;
-    virtual jlong memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound) = 0;
-    virtual jlong memory_soft_limit_in_bytes(julong upper_bound) = 0;
-    virtual jlong memory_throttle_limit_in_bytes() = 0;
-    virtual jlong memory_max_usage_in_bytes() = 0;
-    virtual jlong rss_usage_in_bytes() = 0;
-    virtual jlong cache_usage_in_bytes() = 0;
-    virtual void print_version_specific_info(outputStream* st, julong upper_mem_bound) = 0;
+    virtual bool read_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                            physical_memory_size_type& value) = 0;
+    virtual bool memory_usage_in_bytes(physical_memory_size_type& value) = 0;
+    virtual bool memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                physical_memory_size_type upper_swap_bound,
+                                                physical_memory_size_type& value) = 0;
+    virtual bool memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                physical_memory_size_type upper_swap_bound,
+                                                physical_memory_size_type& value) = 0;
+    virtual bool memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                            physical_memory_size_type& value) = 0;
+    virtual bool memory_throttle_limit_in_bytes(physical_memory_size_type& value) = 0;
+    virtual bool memory_max_usage_in_bytes(physical_memory_size_type& value) = 0;
+    virtual bool rss_usage_in_bytes(physical_memory_size_type& value) = 0;
+    virtual bool cache_usage_in_bytes(physical_memory_size_type& value) = 0;
+    virtual void print_version_specific_info(outputStream* st, physical_memory_size_type upper_mem_bound) = 0;
     virtual bool needs_hierarchy_adjustment() = 0;
     virtual bool is_read_only() = 0;
     virtual const char* subsystem_path() = 0;
@@ -262,11 +276,11 @@ class CgroupMemoryController: public CHeapObj<mtInternal> {
 
 class CgroupSubsystem: public CHeapObj<mtInternal> {
   public:
-    jlong memory_limit_in_bytes(julong upper_bound);
-    int active_processor_count();
+    bool memory_limit_in_bytes(physical_memory_size_type upper_bound, physical_memory_size_type& value);
+    bool active_processor_count(int& value);
 
-    virtual jlong pids_max() = 0;
-    virtual jlong pids_current() = 0;
+    virtual bool pids_max(uint64_t& value) = 0;
+    virtual bool pids_current(uint64_t& value) = 0;
     virtual bool is_containerized() = 0;
 
     virtual char * cpu_cpuset_cpus() = 0;
@@ -276,21 +290,26 @@ class CgroupSubsystem: public CHeapObj<mtInternal> {
     virtual CachingCgroupController<CgroupCpuController>* cpu_controller() = 0;
     virtual CgroupCpuacctController* cpuacct_controller() = 0;
 
-    int cpu_quota();
-    int cpu_period();
-    int cpu_shares();
+    bool cpu_quota(int& value);
+    bool cpu_period(int& value);
+    bool cpu_shares(int& value);
 
-    jlong cpu_usage_in_micros();
+    bool cpu_usage_in_micros(uint64_t& value);
 
-    jlong memory_usage_in_bytes();
-    jlong memory_and_swap_limit_in_bytes(julong upper_mem_bound, julong upper_swap_bound);
-    jlong memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound);
-    jlong memory_soft_limit_in_bytes(julong upper_bound);
-    jlong memory_throttle_limit_in_bytes();
-    jlong memory_max_usage_in_bytes();
-    jlong rss_usage_in_bytes();
-    jlong cache_usage_in_bytes();
-    void print_version_specific_info(outputStream* st, julong upper_mem_bound);
+    bool memory_usage_in_bytes(physical_memory_size_type& value);
+    bool memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                        physical_memory_size_type upper_swap_bound,
+                                        physical_memory_size_type& value);
+    bool memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                        physical_memory_size_type upper_swap_bound,
+                                        physical_memory_size_type& value);
+    bool memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                    physical_memory_size_type& value);
+    bool memory_throttle_limit_in_bytes(physical_memory_size_type& value);
+    bool memory_max_usage_in_bytes(physical_memory_size_type& value);
+    bool rss_usage_in_bytes(physical_memory_size_type& value);
+    bool cache_usage_in_bytes(physical_memory_size_type& value);
+    void print_version_specific_info(outputStream* st, physical_memory_size_type upper_mem_bound);
 };
 
 // Utility class for storing info retrieved from /proc/cgroups,
diff --git a/src/hotspot/os/linux/cgroupUtil_linux.cpp b/src/hotspot/os/linux/cgroupUtil_linux.cpp
index de027db812a..7aa07d53148 100644
--- a/src/hotspot/os/linux/cgroupUtil_linux.cpp
+++ b/src/hotspot/os/linux/cgroupUtil_linux.cpp
@@ -25,13 +25,19 @@
 #include "cgroupUtil_linux.hpp"
 #include "os_linux.hpp"
 
-int CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int host_cpus) {
-  assert(host_cpus > 0, "physical host cpus must be positive");
-  int limit_count = host_cpus;
-  int quota  = cpu_ctrl->cpu_quota();
-  int period = cpu_ctrl->cpu_period();
+bool CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int upper_bound, int& value) {
+  assert(upper_bound > 0, "upper bound of cpus must be positive");
+  int limit_count = upper_bound;
+  int quota = -1;
+  int period = -1;
+  if (!cpu_ctrl->cpu_quota(quota)) {
+    return false;
+  }
+  if (!cpu_ctrl->cpu_period(period)) {
+    return false;
+  }
   int quota_count = 0;
-  int result = 0;
+  int result = upper_bound;
 
   if (quota > -1 && period > 0) {
     quota_count = ceilf((float)quota / (float)period);
@@ -43,16 +49,50 @@ int CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int host_cpus) {
     limit_count = quota_count;
   }
 
-  result = MIN2(host_cpus, limit_count);
+  result = MIN2(upper_bound, limit_count);
   log_trace(os, container)("OSContainer::active_processor_count: %d", result);
-  return result;
+  value = result;
+  return true;
+}
+
+// Get an updated memory limit. The return value is strictly less than or equal to the
+// passed in 'lowest' value.
+physical_memory_size_type CgroupUtil::get_updated_mem_limit(CgroupMemoryController* mem,
+                                                            physical_memory_size_type lowest,
+                                                            physical_memory_size_type upper_bound) {
+  assert(lowest <= upper_bound, "invariant");
+  physical_memory_size_type current_limit = value_unlimited;
+  if (mem->read_memory_limit_in_bytes(upper_bound, current_limit) && current_limit != value_unlimited) {
+    assert(current_limit <= upper_bound, "invariant");
+    if (lowest > current_limit) {
+      return current_limit;
+    }
+  }
+  return lowest;
+}
+
+// Get an updated cpu limit. The return value is strictly less than or equal to the
+// passed in 'lowest' value.
+int CgroupUtil::get_updated_cpu_limit(CgroupCpuController* cpu,
+                                     int lowest,
+                                     int upper_bound) {
+  assert(lowest > 0 && lowest <= upper_bound, "invariant");
+  int cpu_limit_val = -1;
+  if (CgroupUtil::processor_count(cpu, upper_bound, cpu_limit_val) && cpu_limit_val != upper_bound) {
+    assert(cpu_limit_val <= upper_bound, "invariant");
+    if (lowest > cpu_limit_val) {
+      return cpu_limit_val;
+    }
+  }
+  return lowest;
 }
 
 void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
   assert(mem->cgroup_path() != nullptr, "invariant");
   if (strstr(mem->cgroup_path(), "../") != nullptr) {
-    log_warning(os, container)("Cgroup memory controller path at '%s' seems to have moved to '%s', detected limits won't be accurate",
-      mem->mount_point(), mem->cgroup_path());
+    log_warning(os, container)("Cgroup memory controller path at '%s' seems to have moved "
+                               "to '%s'. Detected limits won't be accurate",
+                               mem->mount_point(), mem->cgroup_path());
     mem->set_subsystem_path("/");
     return;
   }
@@ -65,17 +105,18 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
   char* cg_path = os::strdup(orig);
   char* last_slash;
   assert(cg_path[0] == '/', "cgroup path must start with '/'");
-  julong phys_mem = static_cast<julong>(os::Linux::physical_memory());
+  physical_memory_size_type phys_mem = os::Linux::physical_memory();
   char* limit_cg_path = nullptr;
-  jlong limit = mem->read_memory_limit_in_bytes(phys_mem);
-  jlong lowest_limit = limit < 0 ? phys_mem : limit;
-  julong orig_limit = ((julong)lowest_limit) != phys_mem ? lowest_limit : phys_mem;
+  physical_memory_size_type limit = value_unlimited;
+  physical_memory_size_type lowest_limit = phys_mem;
+  lowest_limit = get_updated_mem_limit(mem, lowest_limit, phys_mem);
+  physical_memory_size_type orig_limit = lowest_limit != phys_mem ? lowest_limit : phys_mem;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
     *last_slash = '\0'; // strip path
     // update to shortened path and try again
     mem->set_subsystem_path(cg_path);
-    limit = mem->read_memory_limit_in_bytes(phys_mem);
-    if (limit >= 0 && limit < lowest_limit) {
+    limit = get_updated_mem_limit(mem, lowest_limit, phys_mem);
+    if (limit < lowest_limit) {
       lowest_limit = limit;
       os::free(limit_cg_path); // handles nullptr
       limit_cg_path = os::strdup(cg_path);
@@ -83,24 +124,24 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
   }
   // need to check limit at mount point
   mem->set_subsystem_path("/");
-  limit = mem->read_memory_limit_in_bytes(phys_mem);
-  if (limit >= 0 && limit < lowest_limit) {
+  limit = get_updated_mem_limit(mem, lowest_limit, phys_mem);
+  if (limit < lowest_limit) {
     lowest_limit = limit;
     os::free(limit_cg_path); // handles nullptr
     limit_cg_path = os::strdup("/");
   }
-  assert(lowest_limit >= 0, "limit must be positive");
-  if ((julong)lowest_limit != orig_limit) {
+  assert(lowest_limit <= phys_mem, "limit must not exceed host memory");
+  if (lowest_limit != orig_limit) {
     // we've found a lower limit anywhere in the hierarchy,
     // set the path to the limit path
     assert(limit_cg_path != nullptr, "limit path must be set");
     mem->set_subsystem_path(limit_cg_path);
     log_trace(os, container)("Adjusted controller path for memory to: %s. "
-                             "Lowest limit was: " JLONG_FORMAT,
+                             "Lowest limit was: " PHYS_MEM_TYPE_FORMAT,
                              mem->subsystem_path(),
                              lowest_limit);
   } else {
-    log_trace(os, container)("Lowest limit was: " JLONG_FORMAT, lowest_limit);
+    log_trace(os, container)("Lowest limit was: " PHYS_MEM_TYPE_FORMAT, lowest_limit);
     log_trace(os, container)("No lower limit found for memory in hierarchy %s, "
                              "adjusting to original path %s",
                               mem->mount_point(), orig);
@@ -114,8 +155,9 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
 void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
   assert(cpu->cgroup_path() != nullptr, "invariant");
   if (strstr(cpu->cgroup_path(), "../") != nullptr) {
-    log_warning(os, container)("Cgroup cpu controller path at '%s' seems to have moved to '%s', detected limits won't be accurate",
-      cpu->mount_point(), cpu->cgroup_path());
+    log_warning(os, container)("Cgroup cpu controller path at '%s' seems to have moved "
+                               "to '%s'. Detected limits won't be accurate",
+                               cpu->mount_point(), cpu->cgroup_path());
     cpu->set_subsystem_path("/");
     return;
   }
@@ -129,15 +171,15 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
   char* last_slash;
   assert(cg_path[0] == '/', "cgroup path must start with '/'");
   int host_cpus = os::Linux::active_processor_count();
-  int cpus = CgroupUtil::processor_count(cpu, host_cpus);
-  int lowest_limit = cpus < host_cpus ? cpus: host_cpus;
+  int lowest_limit = host_cpus;
+  int cpus = get_updated_cpu_limit(cpu, lowest_limit, host_cpus);
   int orig_limit = lowest_limit != host_cpus ? lowest_limit : host_cpus;
   char* limit_cg_path = nullptr;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
     *last_slash = '\0'; // strip path
     // update to shortened path and try again
     cpu->set_subsystem_path(cg_path);
-    cpus = CgroupUtil::processor_count(cpu, host_cpus);
+    cpus = get_updated_cpu_limit(cpu, lowest_limit, host_cpus);
     if (cpus != host_cpus && cpus < lowest_limit) {
       lowest_limit = cpus;
       os::free(limit_cg_path); // handles nullptr
@@ -146,7 +188,7 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
   }
   // need to check limit at mount point
   cpu->set_subsystem_path("/");
-  cpus = CgroupUtil::processor_count(cpu, host_cpus);
+  cpus = get_updated_cpu_limit(cpu, lowest_limit, host_cpus);
   if (cpus != host_cpus && cpus < lowest_limit) {
     lowest_limit = cpus;
     os::free(limit_cg_path); // handles nullptr
@@ -160,8 +202,7 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
     cpu->set_subsystem_path(limit_cg_path);
     log_trace(os, container)("Adjusted controller path for cpu to: %s. "
                              "Lowest limit was: %d",
-                             cpu->subsystem_path(),
-                             lowest_limit);
+                             cpu->subsystem_path(), lowest_limit);
   } else {
     log_trace(os, container)("Lowest limit was: %d", lowest_limit);
     log_trace(os, container)("No lower limit found for cpu in hierarchy %s, "
diff --git a/src/hotspot/os/linux/cgroupUtil_linux.hpp b/src/hotspot/os/linux/cgroupUtil_linux.hpp
index aa63a7457cc..d72bbd1cf1e 100644
--- a/src/hotspot/os/linux/cgroupUtil_linux.hpp
+++ b/src/hotspot/os/linux/cgroupUtil_linux.hpp
@@ -31,13 +31,20 @@
 class CgroupUtil: AllStatic {
 
   public:
-    static int processor_count(CgroupCpuController* cpu, int host_cpus);
+    static bool processor_count(CgroupCpuController* cpu, int upper_bound, int& value);
     // Given a memory controller, adjust its path to a point in the hierarchy
     // that represents the closest memory limit.
     static void adjust_controller(CgroupMemoryController* m);
     // Given a cpu controller, adjust its path to a point in the hierarchy
     // that represents the closest cpu limit.
     static void adjust_controller(CgroupCpuController* c);
+  private:
+    static physical_memory_size_type get_updated_mem_limit(CgroupMemoryController* m,
+                                                           physical_memory_size_type lowest,
+                                                           physical_memory_size_type upper_bound);
+    static int get_updated_cpu_limit(CgroupCpuController* c,
+                                     int lowest,
+                                     int upper_bound);
 };
 
 #endif // CGROUP_UTIL_LINUX_HPP
diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
index 87870e647eb..ddcb0db2161 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
@@ -124,10 +124,13 @@ void CgroupV1Controller::set_subsystem_path(const char* cgroup_path) {
   }
 }
 
-jlong CgroupV1MemoryController::uses_mem_hierarchy() {
-  julong use_hierarchy;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.use_hierarchy", "Use Hierarchy", use_hierarchy);
-  return (jlong)use_hierarchy;
+bool CgroupV1MemoryController::read_use_hierarchy_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.use_hierarchy", "Use Hierarchy", result);
+}
+
+bool CgroupV1MemoryController::uses_mem_hierarchy() {
+  physical_memory_size_type use_hierarchy = 0;
+  return read_use_hierarchy_val(use_hierarchy) && use_hierarchy > 0;
 }
 
 /*
@@ -141,125 +144,177 @@ bool CgroupV1Controller::needs_hierarchy_adjustment() {
   return strcmp(_root, _cgroup_path) != 0;
 }
 
-static inline
-void verbose_log(julong read_mem_limit, julong upper_mem_bound) {
-  if (log_is_enabled(Debug, os, container)) {
-    jlong mem_limit = (jlong)read_mem_limit; // account for negative values
-    if (mem_limit < 0 || read_mem_limit >= upper_mem_bound) {
-      const char *reason;
-      if (mem_limit == OSCONTAINER_ERROR) {
-        reason = "failed";
-      } else if (mem_limit == -1) {
-        reason = "unlimited";
-      } else {
-        assert(read_mem_limit >= upper_mem_bound, "Expected read value exceeding upper memory bound");
-        // Exceeding physical memory is treated as unlimited. This implementation
-        // caps it at host_mem since Cg v1 has no value to represent 'max'.
-        reason = "ignored";
-      }
-      log_debug(os, container)("container memory limit %s: " JLONG_FORMAT ", upper bound is " JLONG_FORMAT,
-                               reason, mem_limit, upper_mem_bound);
+bool CgroupV1MemoryController::read_memory_limit_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.limit_in_bytes", "Memory Limit", result);
+}
+
+bool CgroupV1MemoryController::read_hierarchical_memory_limit_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMERICAL_KEY_VALUE_CHECKED(reader(), "/memory.stat",
+                                             "hierarchical_memory_limit", "Hierarchical Memory Limit",
+                                             result);
+}
+
+bool CgroupV1MemoryController::read_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                                          physical_memory_size_type& result) {
+  physical_memory_size_type memlimit = 0;
+  if (!read_memory_limit_val(memlimit)) {
+    log_trace(os, container)("container memory limit failed, upper bound is " PHYS_MEM_TYPE_FORMAT, upper_bound);
+    return false;
+  }
+  if (memlimit >= upper_bound) {
+    physical_memory_size_type hierlimit = 0;
+    if (uses_mem_hierarchy() && read_hierarchical_memory_limit_val(hierlimit) &&
+        hierlimit < upper_bound) {
+      log_trace(os, container)("Memory Limit is: " PHYS_MEM_TYPE_FORMAT, hierlimit);
+      result = hierlimit;
+    } else {
+      // Exceeding physical memory is treated as unlimited. This implementation
+      // caps it at host_mem since Cg v1 has no value to represent 'max'.
+      log_trace(os, container)("container memory limit ignored: " PHYS_MEM_TYPE_FORMAT
+                               ", upper bound is " PHYS_MEM_TYPE_FORMAT, memlimit, upper_bound);
+      result = value_unlimited;
     }
+  } else {
+    result = memlimit;
   }
+  return true;
 }
 
-jlong CgroupV1MemoryController::read_memory_limit_in_bytes(julong upper_bound) {
-  julong memlimit;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.limit_in_bytes", "Memory Limit", memlimit);
-  if (memlimit >= upper_bound && uses_mem_hierarchy()) {
-    CONTAINER_READ_NUMERICAL_KEY_VALUE_CHECKED(reader(), "/memory.stat",
-                                               "hierarchical_memory_limit", "Hierarchical Memory Limit",
-                                               memlimit);
-  }
-  verbose_log(memlimit, upper_bound);
-  return (jlong)((memlimit < upper_bound) ? memlimit : -1);
+bool CgroupV1MemoryController::read_mem_swap(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.memsw.limit_in_bytes", "Memory and Swap Limit", result);
 }
 
-/* read_mem_swap
+bool CgroupV1MemoryController::read_hierarchical_mem_swap_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMERICAL_KEY_VALUE_CHECKED(reader(), "/memory.stat",
+                                             "hierarchical_memsw_limit", "Hierarchical Memory and Swap Limit",
+                                             result);
+}
+
+/* memory_and_swap_limit_in_bytes
  *
- * Determine the memory and swap limit metric. Returns a positive limit value strictly
- * lower than the physical memory and swap limit iff there is a limit. Otherwise a
- * negative value is returned indicating the determined status.
+ * Determine the memory and swap limit metric. Sets the 'result' reference to a positive limit value or
+ * 'value_unlimited' (for unlimited).
  *
  * returns:
- *    * A number > 0 if the limit is available and lower than a physical upper bound.
- *    * OSCONTAINER_ERROR if the limit cannot be retrieved (i.e. not supported) or
- *    * -1 if there isn't any limit in place (note: includes values which exceed a physical
- *      upper bound)
+ *    * false if an error occurred. 'result' reference remains unchanged.
+ *    * true if the limit value has been set in the 'result' reference
  */
-jlong CgroupV1MemoryController::read_mem_swap(julong upper_memsw_bound) {
-  julong memswlimit;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.memsw.limit_in_bytes", "Memory and Swap Limit", memswlimit);
-  if (memswlimit >= upper_memsw_bound && uses_mem_hierarchy()) {
-      CONTAINER_READ_NUMERICAL_KEY_VALUE_CHECKED(reader(), "/memory.stat",
-                                                 "hierarchical_memsw_limit", "Hierarchical Memory and Swap Limit",
-                                                 memswlimit);
+bool CgroupV1MemoryController::memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                              physical_memory_size_type upper_swap_bound,
+                                                              physical_memory_size_type& result) {
+  physical_memory_size_type total_mem_swap = upper_mem_bound + upper_swap_bound;
+  physical_memory_size_type memory_swap = 0;
+  bool mem_swap_read_failed = false;
+  if (!read_mem_swap(memory_swap)) {
+    mem_swap_read_failed = true;
+  }
+  if (memory_swap >= total_mem_swap) {
+    physical_memory_size_type hiermswlimit = 0;
+    if (uses_mem_hierarchy() && read_hierarchical_mem_swap_val(hiermswlimit) &&
+        hiermswlimit < total_mem_swap) {
+      log_trace(os, container)("Memory and Swap Limit is: " PHYS_MEM_TYPE_FORMAT, hiermswlimit);
+      memory_swap = hiermswlimit;
+    } else {
+      memory_swap = value_unlimited;
+    }
+  }
+  if (memory_swap == value_unlimited) {
+    log_trace(os, container)("Memory and Swap Limit is: Unlimited");
+    result = value_unlimited;
+    return true;
   }
-  verbose_log(memswlimit, upper_memsw_bound);
-  return (jlong)((memswlimit < upper_memsw_bound) ? memswlimit : -1);
-}
 
-jlong CgroupV1MemoryController::memory_and_swap_limit_in_bytes(julong upper_mem_bound, julong upper_swap_bound) {
-  jlong memory_swap = read_mem_swap(upper_mem_bound + upper_swap_bound);
-  if (memory_swap == -1) {
-    return memory_swap;
-  }
   // If there is a swap limit, but swappiness == 0, reset the limit
   // to the memory limit. Do the same for cases where swap isn't
   // supported.
-  jlong swappiness = read_mem_swappiness();
-  if (swappiness == 0 || memory_swap == OSCONTAINER_ERROR) {
-    jlong memlimit = read_memory_limit_in_bytes(upper_mem_bound);
-    if (memory_swap == OSCONTAINER_ERROR) {
-      log_trace(os, container)("Memory and Swap Limit has been reset to " JLONG_FORMAT " because swap is not supported", memlimit);
-    } else {
-      log_trace(os, container)("Memory and Swap Limit has been reset to " JLONG_FORMAT " because swappiness is 0", memlimit);
-    }
-    return memlimit;
+  physical_memory_size_type swappiness = 0;
+  if (!read_mem_swappiness(swappiness)) {
+    // assume no swap
+    mem_swap_read_failed = true;
   }
-  return memory_swap;
+  if (swappiness == 0 || mem_swap_read_failed) {
+    physical_memory_size_type memlimit = value_unlimited;
+    if (!read_memory_limit_in_bytes(upper_mem_bound, memlimit)) {
+      return false;
+    }
+    if (memlimit == value_unlimited) {
+      result = value_unlimited; // No memory limit, thus no swap limit
+      return true;
+    }
+    if (mem_swap_read_failed) {
+      log_trace(os, container)("Memory and Swap Limit has been reset to " PHYS_MEM_TYPE_FORMAT
+                               " because swap is not supported", memlimit);
+    } else {
+      log_trace(os, container)("Memory and Swap Limit has been reset to " PHYS_MEM_TYPE_FORMAT
+                               " because swappiness is 0", memlimit);
+    }
+    result = memlimit;
+    return true;
+  }
+  result = memory_swap;
+  return true;
 }
 
 static inline
-jlong memory_swap_usage_impl(CgroupController* ctrl) {
-  julong memory_swap_usage;
-  CONTAINER_READ_NUMBER_CHECKED(ctrl, "/memory.memsw.usage_in_bytes", "mem swap usage", memory_swap_usage);
-  return (jlong)memory_swap_usage;
+bool memory_swap_usage_impl(CgroupController* ctrl, physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(ctrl, "/memory.memsw.usage_in_bytes", "mem swap usage", result);
 }
 
-jlong CgroupV1MemoryController::memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound) {
-  jlong memory_sw_limit = memory_and_swap_limit_in_bytes(upper_mem_bound, upper_swap_bound);
-  jlong memory_limit = read_memory_limit_in_bytes(upper_mem_bound);
-  if (memory_sw_limit > 0 && memory_limit > 0) {
-    jlong delta_swap = memory_sw_limit - memory_limit;
-    if (delta_swap > 0) {
-      return memory_swap_usage_impl(reader());
+bool CgroupV1MemoryController::memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                              physical_memory_size_type upper_swap_bound,
+                                                              physical_memory_size_type& result) {
+  physical_memory_size_type memory_sw_limit = value_unlimited;
+  if (!memory_and_swap_limit_in_bytes(upper_mem_bound, upper_swap_bound, memory_sw_limit)) {
+    return false;
+  }
+  physical_memory_size_type mem_limit_val = value_unlimited;
+  physical_memory_size_type memory_limit = value_unlimited;
+  if (read_memory_limit_in_bytes(upper_mem_bound, mem_limit_val)) {
+    if (mem_limit_val != value_unlimited) {
+      memory_limit = mem_limit_val;
     }
   }
-  return memory_usage_in_bytes();
-}
-
-jlong CgroupV1MemoryController::read_mem_swappiness() {
-  julong swappiness;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.swappiness", "Swappiness", swappiness);
-  return (jlong)swappiness;
-}
-
-jlong CgroupV1MemoryController::memory_soft_limit_in_bytes(julong upper_bound) {
-  julong memsoftlimit;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.soft_limit_in_bytes", "Memory Soft Limit", memsoftlimit);
-  if (memsoftlimit >= upper_bound) {
-    log_trace(os, container)("Memory Soft Limit is: Unlimited");
-    return (jlong)-1;
-  } else {
-    return (jlong)memsoftlimit;
+  if (memory_sw_limit != value_unlimited && memory_limit != value_unlimited) {
+    if (memory_limit < memory_sw_limit) {
+      // swap allowed and > 0
+      physical_memory_size_type swap_usage = 0;
+      if (!memory_swap_usage_impl(reader(), swap_usage)) {
+        return false;
+      }
+      result = swap_usage;
+      return true;
+    }
   }
+  return memory_usage_in_bytes(result);
 }
 
-jlong CgroupV1MemoryController::memory_throttle_limit_in_bytes() {
+bool CgroupV1MemoryController::read_mem_swappiness(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.swappiness", "Swappiness", result);
+}
+
+bool CgroupV1MemoryController::memory_soft_limit_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.soft_limit_in_bytes", "Memory Soft Limit", result);
+}
+
+bool CgroupV1MemoryController::memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                                          physical_memory_size_type& result) {
+  physical_memory_size_type mem_soft_limit = 0;
+  if (!memory_soft_limit_val(mem_soft_limit)) {
+    return false;
+  }
+  if (mem_soft_limit >= upper_bound) {
+    log_trace(os, container)("Memory Soft Limit is: Unlimited");
+    result = value_unlimited;
+  } else {
+    result = mem_soft_limit;
+  }
+  return true;
+}
+
+bool CgroupV1MemoryController::memory_throttle_limit_in_bytes(physical_memory_size_type& result) {
   // Log this string at trace level so as to make tests happy.
   log_trace(os, container)("Memory Throttle Limit is not supported.");
-  return OSCONTAINER_ERROR; // not supported
+  return false;
 }
 
 // Constructor
@@ -288,80 +343,129 @@ bool CgroupV1Subsystem::is_containerized() {
          _cpuset->is_read_only();
 }
 
-/* memory_usage_in_bytes
+bool CgroupV1MemoryController::memory_usage_in_bytes(physical_memory_size_type& result) {
+  physical_memory_size_type memory_usage = 0;
+  if (!memory_usage_val(memory_usage)) {
+    return false;
+  }
+  result = memory_usage;
+  return true;
+}
+
+/* memory_usage_val
  *
- * Return the amount of used memory for this process.
+ * Read the amount of used memory for this process into the passed in reference 'result'
  *
  * return:
- *    memory usage in bytes or
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
+ *    true when reading of the file was successful and 'result' was set appropriately
+ *    false when reading of the file failed
  */
-jlong CgroupV1MemoryController::memory_usage_in_bytes() {
-  julong memusage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.usage_in_bytes", "Memory Usage", memusage);
-  return (jlong)memusage;
+bool CgroupV1MemoryController::memory_usage_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.usage_in_bytes", "Memory Usage", result);
+}
+
+bool CgroupV1MemoryController::memory_max_usage_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.max_usage_in_bytes", "Maximum Memory Usage", result);
 }
 
 /* memory_max_usage_in_bytes
  *
- * Return the maximum amount of used memory for this process.
+ * Return the maximum amount of used memory for this process in the
+ * result reference.
  *
  * return:
- *    max memory usage in bytes or
- *    OSCONTAINER_ERROR for not supported
+ *    true if the result reference has been set
+ *    false otherwise (e.g. on error)
  */
-jlong CgroupV1MemoryController::memory_max_usage_in_bytes() {
-  julong memmaxusage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.max_usage_in_bytes", "Maximum Memory Usage", memmaxusage);
-  return (jlong)memmaxusage;
-}
-
-jlong CgroupV1MemoryController::rss_usage_in_bytes() {
-  julong rss;
-  bool is_ok = reader()->read_numerical_key_value("/memory.stat", "rss", &rss);
-  if (!is_ok) {
-    return OSCONTAINER_ERROR;
+bool CgroupV1MemoryController::memory_max_usage_in_bytes(physical_memory_size_type& result) {
+  physical_memory_size_type memory_max_usage = 0;
+  if (!memory_max_usage_val(memory_max_usage)) {
+     return false;
   }
-  log_trace(os, container)("RSS usage is: " JULONG_FORMAT, rss);
-  return (jlong)rss;
+  result = memory_max_usage;
+  return true;
 }
 
-jlong CgroupV1MemoryController::cache_usage_in_bytes() {
-  julong cache;
-  bool is_ok = reader()->read_numerical_key_value("/memory.stat", "cache", &cache);
-  if (!is_ok) {
-    return OSCONTAINER_ERROR;
+bool CgroupV1MemoryController::rss_usage_in_bytes(physical_memory_size_type& result) {
+  physical_memory_size_type rss = 0;
+
+  if (!reader()->read_numerical_key_value("/memory.stat", "rss", rss)) {
+    return false;
   }
-  log_trace(os, container)("Cache usage is: " JULONG_FORMAT, cache);
-  return cache;
+  log_trace(os, container)("RSS usage is: " PHYS_MEM_TYPE_FORMAT, rss);
+  result = rss;
+  return true;
 }
 
-jlong CgroupV1MemoryController::kernel_memory_usage_in_bytes() {
-  julong kmem_usage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.kmem.usage_in_bytes", "Kernel Memory Usage", kmem_usage);
-  return (jlong)kmem_usage;
+bool CgroupV1MemoryController::cache_usage_in_bytes(physical_memory_size_type& result) {
+  physical_memory_size_type cache = 0;
+  if (!reader()->read_numerical_key_value("/memory.stat", "cache", cache)) {
+    return false;
+  }
+  log_trace(os, container)("Cache usage is: " PHYS_MEM_TYPE_FORMAT, cache);
+  result = cache;
+  return true;
 }
 
-jlong CgroupV1MemoryController::kernel_memory_limit_in_bytes(julong upper_bound) {
-  julong kmem_limit;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.kmem.limit_in_bytes", "Kernel Memory Limit", kmem_limit);
+bool CgroupV1MemoryController::kernel_memory_usage_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.kmem.usage_in_bytes", "Kernel Memory Usage", result);
+}
+
+bool CgroupV1MemoryController::kernel_memory_usage_in_bytes(physical_memory_size_type& result) {
+  physical_memory_size_type kmem_usage = 0;
+  if (!kernel_memory_usage_val(kmem_usage)) {
+    return false;
+  }
+  result = kmem_usage;
+  return true;
+}
+
+bool CgroupV1MemoryController::kernel_memory_limit_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.kmem.limit_in_bytes", "Kernel Memory Limit", result);
+}
+
+bool CgroupV1MemoryController::kernel_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                                            physical_memory_size_type& result) {
+  physical_memory_size_type kmem_limit = 0;
+  if (!kernel_memory_limit_val(kmem_limit)) {
+    return false;
+  }
   if (kmem_limit >= upper_bound) {
-    return (jlong)-1;
+    kmem_limit = value_unlimited;
   }
-  return (jlong)kmem_limit;
+  result = kmem_limit;
+  return true;
 }
 
-jlong CgroupV1MemoryController::kernel_memory_max_usage_in_bytes() {
-  julong kmem_max_usage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.kmem.max_usage_in_bytes", "Maximum Kernel Memory Usage", kmem_max_usage);
-  return (jlong)kmem_max_usage;
+bool CgroupV1MemoryController::kernel_memory_max_usage_val(physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.kmem.max_usage_in_bytes", "Maximum Kernel Memory Usage", result);
 }
 
-void CgroupV1MemoryController::print_version_specific_info(outputStream* st, julong mem_bound) {
-  jlong kmem_usage = kernel_memory_usage_in_bytes();
-  jlong kmem_limit = kernel_memory_limit_in_bytes(mem_bound);
-  jlong kmem_max_usage = kernel_memory_max_usage_in_bytes();
+bool CgroupV1MemoryController::kernel_memory_max_usage_in_bytes(physical_memory_size_type& result) {
+  physical_memory_size_type kmem_max_usage = 0;
+  if (!kernel_memory_max_usage_val(kmem_max_usage)) {
+    return false;
+  }
+  result = kmem_max_usage;
+  return true;
+}
+
+void CgroupV1MemoryController::print_version_specific_info(outputStream* st, physical_memory_size_type mem_bound) {
+  MetricResult kmem_usage;
+  physical_memory_size_type temp = 0;
+  if (kernel_memory_usage_in_bytes(temp)) {
+    kmem_usage.set_value(temp);
+  }
+  MetricResult kmem_limit;
+  temp = value_unlimited;
+  if (kernel_memory_limit_in_bytes(mem_bound, temp)) {
+    kmem_limit.set_value(temp);
+  }
+  MetricResult kmem_max_usage;
+  temp = 0;
+  if (kernel_memory_max_usage_in_bytes(temp)) {
+    kmem_max_usage.set_value(temp);
+  }
 
   OSContainer::print_container_helper(st, kmem_limit, "kernel_memory_limit_in_bytes");
   OSContainer::print_container_helper(st, kmem_usage, "kernel_memory_usage_in_bytes");
@@ -383,74 +487,114 @@ char* CgroupV1Subsystem::cpu_cpuset_memory_nodes() {
 /* cpu_quota
  *
  * Return the number of microseconds per period
- * process is guaranteed to run.
+ * a process is guaranteed to run in the provided
+ * result reference.
  *
  * return:
- *    quota time in microseconds
- *    -1 for no quota
- *    OSCONTAINER_ERROR for not supported
+ *   true if the value was set in the result reference
+ *   false on failure to read the number from the file
+ *   and the result reference has not been touched.
  */
-int CgroupV1CpuController::cpu_quota() {
-  julong quota;
-  bool is_ok = reader()->read_number("/cpu.cfs_quota_us", &quota);
-  if (!is_ok) {
-    log_trace(os, container)("CPU Quota failed: %d", OSCONTAINER_ERROR);
-    return OSCONTAINER_ERROR;
+bool CgroupV1CpuController::cpu_quota(int& result) {
+  uint64_t quota = 0;
+
+  // intentionally not using the macro so as to not log a
+  // negative value as a large unsiged int
+  if (!reader()->read_number("/cpu.cfs_quota_us", quota)) {
+    log_trace(os, container)("CPU Quota failed");
+    return false;
   }
   // cast to int since the read value might be negative
   // and we want to avoid logging -1 as a large unsigned value.
-  int quota_int = (int)quota;
+  int quota_int = static_cast<int>(quota);
   log_trace(os, container)("CPU Quota is: %d", quota_int);
-  return quota_int;
+  result = quota_int;
+  return true;
 }
 
-int CgroupV1CpuController::cpu_period() {
-  julong period;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpu.cfs_period_us", "CPU Period", period);
-  return (int)period;
+bool CgroupV1CpuController::cpu_period_val(uint64_t& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpu.cfs_period_us", "CPU Period", result);
+}
+
+bool CgroupV1CpuController::cpu_period(int& result) {
+  uint64_t period = value_unlimited;
+  if (!cpu_period_val(period)) {
+    return false;
+  }
+  result = static_cast<int>(period);
+  return true;
+}
+
+bool CgroupV1CpuController::cpu_shares_val(uint64_t& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpu.shares", "CPU Shares", result);
 }
 
 /* cpu_shares
  *
  * Return the amount of cpu shares available to the process
+ *    - Share number (typically a number relative to 1024)
+ *    - (2048 typically expresses 2 CPUs worth of processing)
  *
  * return:
- *    Share number (typically a number relative to 1024)
- *                 (2048 typically expresses 2 CPUs worth of processing)
- *    -1 for no share setup
- *    OSCONTAINER_ERROR for not supported
+ *    false on error
+ *    true if the result has been set in the result reference
  */
-int CgroupV1CpuController::cpu_shares() {
-  julong shares;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpu.shares", "CPU Shares", shares);
-  int shares_int = (int)shares;
-  // Convert 1024 to no shares setup
-  if (shares_int == 1024) return -1;
+bool CgroupV1CpuController::cpu_shares(int& result) {
+  uint64_t shares = 0;
+  if (!cpu_shares_val(shares)) {
+    return false;
+  }
+  int shares_int = static_cast<int>(shares);
+  // Convert 1024 to no shares setup (-1)
+  if (shares_int == 1024) {
+    shares_int = -1;
+  }
 
-  return shares_int;
+  result = shares_int;
+  return true;
 }
 
-jlong CgroupV1CpuacctController::cpu_usage_in_micros() {
-  julong cpu_usage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpuacct.usage", "CPU Usage", cpu_usage);
+bool CgroupV1CpuacctController::cpu_usage_in_micros_val(uint64_t& result) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpuacct.usage", "CPU Usage", result);
+}
+
+bool CgroupV1CpuacctController::cpu_usage_in_micros(uint64_t& result) {
+  uint64_t cpu_usage = 0;
+  if (!cpu_usage_in_micros_val(cpu_usage)) {
+    return false;
+  }
   // Output is in nanoseconds, convert to microseconds.
-  return (jlong)cpu_usage / 1000;
+  result = static_cast<uint64_t>(cpu_usage / 1000);
+  return true;
+}
+
+static
+bool pids_max_val(CgroupController* ctrl, uint64_t& result) {
+  CONTAINER_READ_NUMBER_CHECKED_MAX(ctrl, "/pids.max", "Maximum number of tasks", result);
 }
 
 /* pids_max
  *
  * Return the maximum number of tasks available to the process
+ * in the passed result reference (might be value_unlimited).
  *
  * return:
- *    maximum number of tasks
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
+ *    false on error
+ *    true when the result reference has been appropriately set
  */
-jlong CgroupV1Subsystem::pids_max() {
-  if (_pids == nullptr) return OSCONTAINER_ERROR;
-  jlong pids_max;
-  CONTAINER_READ_NUMBER_CHECKED_MAX(_pids, "/pids.max", "Maximum number of tasks", pids_max);
-  return pids_max;
+bool CgroupV1Subsystem::pids_max(uint64_t& result) {
+  if (_pids == nullptr) return false;
+  uint64_t pids_val = 0;
+  if (!pids_max_val(_pids, pids_val)) {
+    return false;
+  }
+  result = pids_val;
+  return true;
+}
+
+static
+bool pids_current_val(CgroupController* ctrl, uint64_t& result) {
+  CONTAINER_READ_NUMBER_CHECKED(ctrl, "/pids.current", "Current number of tasks", result);
 }
 
 /* pids_current
@@ -458,12 +602,15 @@ jlong CgroupV1Subsystem::pids_max() {
  * The number of tasks currently in the cgroup (and its descendants) of the process
  *
  * return:
- *    current number of tasks
- *    OSCONTAINER_ERROR for not supported
+ *    true if the current number of tasks has been set in the result reference
+ *    false if an error occurred
  */
-jlong CgroupV1Subsystem::pids_current() {
-  if (_pids == nullptr) return OSCONTAINER_ERROR;
-  julong pids_current;
-  CONTAINER_READ_NUMBER_CHECKED(_pids, "/pids.current", "Current number of tasks", pids_current);
-  return (jlong)pids_current;
+bool CgroupV1Subsystem::pids_current(uint64_t& result) {
+  if (_pids == nullptr) return false;
+  uint64_t pids_current = 0;
+  if (!pids_current_val(_pids, pids_current)) {
+    return false;
+  }
+  result = pids_current;
+  return true;
 }
diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
index ce3184992e8..8aeb64ef18c 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
@@ -73,23 +73,44 @@ class CgroupV1MemoryController final : public CgroupMemoryController {
   private:
     CgroupV1Controller _reader;
     CgroupV1Controller* reader() { return &_reader; }
+    bool read_memory_limit_val(physical_memory_size_type& result);
+    bool read_hierarchical_memory_limit_val(physical_memory_size_type& result);
+    bool read_hierarchical_mem_swap_val(physical_memory_size_type& result);
+    bool read_use_hierarchy_val(physical_memory_size_type& result);
+    bool memory_usage_val(physical_memory_size_type& result);
+    bool read_mem_swappiness(physical_memory_size_type& result);
+    bool read_mem_swap(physical_memory_size_type& result);
+    bool memory_soft_limit_val(physical_memory_size_type& result);
+    bool memory_max_usage_val(physical_memory_size_type& result);
+    bool kernel_memory_usage_val(physical_memory_size_type& result);
+    bool kernel_memory_limit_val(physical_memory_size_type& result);
+    bool kernel_memory_max_usage_val(physical_memory_size_type& result);
+    bool uses_mem_hierarchy();
+
   public:
     void set_subsystem_path(const char *cgroup_path) override {
       reader()->set_subsystem_path(cgroup_path);
     }
-    jlong read_memory_limit_in_bytes(julong upper_bound) override;
-    jlong memory_usage_in_bytes() override;
-    jlong memory_and_swap_limit_in_bytes(julong upper_mem_bound, julong upper_swap_bound) override;
-    jlong memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound) override;
-    jlong memory_soft_limit_in_bytes(julong upper_bound) override;
-    jlong memory_throttle_limit_in_bytes() override;
-    jlong memory_max_usage_in_bytes() override;
-    jlong rss_usage_in_bytes() override;
-    jlong cache_usage_in_bytes() override;
-    jlong kernel_memory_usage_in_bytes();
-    jlong kernel_memory_limit_in_bytes(julong upper_bound);
-    jlong kernel_memory_max_usage_in_bytes();
-    void print_version_specific_info(outputStream* st, julong upper_mem_bound) override;
+    bool read_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                    physical_memory_size_type& value) override;
+    bool memory_usage_in_bytes(physical_memory_size_type& result) override;
+    bool memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                        physical_memory_size_type upper_swap_bound,
+                                        physical_memory_size_type& result) override;
+    bool memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                        physical_memory_size_type upper_swap_bound,
+                                        physical_memory_size_type& result) override;
+    bool memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                    physical_memory_size_type& result) override;
+    bool memory_throttle_limit_in_bytes(physical_memory_size_type& result) override;
+    bool memory_max_usage_in_bytes(physical_memory_size_type& result) override;
+    bool rss_usage_in_bytes(physical_memory_size_type& result) override;
+    bool cache_usage_in_bytes(physical_memory_size_type& result) override;
+    bool kernel_memory_usage_in_bytes(physical_memory_size_type& result);
+    bool kernel_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                      physical_memory_size_type& result);
+    bool kernel_memory_max_usage_in_bytes(physical_memory_size_type& result);
+    void print_version_specific_info(outputStream* st, physical_memory_size_type upper_mem_bound) override;
     bool needs_hierarchy_adjustment() override {
       return reader()->needs_hierarchy_adjustment();
     }
@@ -99,10 +120,6 @@ class CgroupV1MemoryController final : public CgroupMemoryController {
     const char* subsystem_path() override { return reader()->subsystem_path(); }
     const char* mount_point() override { return reader()->mount_point(); }
     const char* cgroup_path() override { return reader()->cgroup_path(); }
-  private:
-    jlong uses_mem_hierarchy();
-    jlong read_mem_swappiness();
-    jlong read_mem_swap(julong upper_memsw_bound);
 
   public:
     CgroupV1MemoryController(const CgroupV1Controller& reader)
@@ -116,10 +133,12 @@ class CgroupV1CpuController final : public CgroupCpuController {
   private:
     CgroupV1Controller _reader;
     CgroupV1Controller* reader() { return &_reader; }
+    bool cpu_period_val(uint64_t& result);
+    bool cpu_shares_val(uint64_t& result);
   public:
-    int cpu_quota() override;
-    int cpu_period() override;
-    int cpu_shares() override;
+    bool cpu_quota(int& result) override;
+    bool cpu_period(int& result) override;
+    bool cpu_shares(int& result) override;
     void set_subsystem_path(const char *cgroup_path) override {
       reader()->set_subsystem_path(cgroup_path);
     }
@@ -147,8 +166,9 @@ class CgroupV1CpuacctController final : public CgroupCpuacctController {
   private:
     CgroupV1Controller _reader;
     CgroupV1Controller* reader() { return &_reader; }
+    bool cpu_usage_in_micros_val(uint64_t& result);
   public:
-    jlong cpu_usage_in_micros() override;
+    bool cpu_usage_in_micros(uint64_t& result) override;
     void set_subsystem_path(const char *cgroup_path) override {
       reader()->set_subsystem_path(cgroup_path);
     }
@@ -180,15 +200,15 @@ class CgroupV1Subsystem: public CgroupSubsystem {
                       CgroupV1Controller* pids,
                       CgroupV1MemoryController* memory);
 
-    jlong kernel_memory_usage_in_bytes();
-    jlong kernel_memory_limit_in_bytes();
-    jlong kernel_memory_max_usage_in_bytes();
+    bool kernel_memory_usage_in_bytes(physical_memory_size_type& result);
+    bool kernel_memory_limit_in_bytes(physical_memory_size_type& result);
+    bool kernel_memory_max_usage_in_bytes(physical_memory_size_type& result);
 
-    char * cpu_cpuset_cpus();
-    char * cpu_cpuset_memory_nodes();
+    char * cpu_cpuset_cpus() override;
+    char * cpu_cpuset_memory_nodes() override;
 
-    jlong pids_max();
-    jlong pids_current();
+    bool pids_max(uint64_t& result) override;
+    bool pids_current(uint64_t& result) override;
     bool is_containerized();
 
     const char * container_type() {
diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
index 41fc8db7e81..f435e53c02c 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
@@ -44,24 +44,35 @@ CgroupV2Controller::CgroupV2Controller(const CgroupV2Controller& o) :
   _mount_point = o._mount_point;
 }
 
+static
+bool read_cpu_shares_value(CgroupV2Controller* ctrl, uint64_t& value) {
+  CONTAINER_READ_NUMBER_CHECKED(ctrl, "/cpu.weight", "Raw value for CPU Shares", value);
+}
+
 /* cpu_shares
  *
- * Return the amount of cpu shares available to the process
+ * Return the amount of cpu shares available to the process in the
+ * 'result' reference.
  *
- * return:
  *    Share number (typically a number relative to 1024)
  *                 (2048 typically expresses 2 CPUs worth of processing)
- *    -1 for no share setup
- *    OSCONTAINER_ERROR for not supported
+ *
+ * return:
+ *    true if the result reference got updated
+ *    false if there was an error
  */
-int CgroupV2CpuController::cpu_shares() {
-  julong shares;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/cpu.weight", "Raw value for CPU Shares", shares);
-  int shares_int = (int)shares;
+bool CgroupV2CpuController::cpu_shares(int& result) {
+  uint64_t shares = 0;
+  bool is_ok = read_cpu_shares_value(reader(), shares);
+  if (!is_ok) {
+    return false;
+  }
+  int shares_int = static_cast<int>(shares);
   // Convert default value of 100 to no shares setup
   if (shares_int == 100) {
-    log_debug(os, container)("CPU Shares is: %d", -1);
-    return -1;
+    log_debug(os, container)("CPU Shares is: unlimited");
+    result = -1;
+    return true;
   }
   // cg v2 values must be in range [1-10000]
   assert(shares_int >= 1 && shares_int <= 10000, "invariant");
@@ -97,7 +108,8 @@ int CgroupV2CpuController::cpu_shares() {
      // Don't do the multiples of PER_CPU_SHARES mapping since we
      // have a value <= PER_CPU_SHARES
      log_debug(os, container)("CPU Shares is: %d", x);
-     return x;
+     result = x;
+     return true;
   }
   int f = x/PER_CPU_SHARES;
   int lower_multiple = f * PER_CPU_SHARES;
@@ -107,28 +119,33 @@ int CgroupV2CpuController::cpu_shares() {
   x = distance_lower <= distance_upper ? lower_multiple : upper_multiple;
   log_trace(os, container)("Closest multiple of %d of the CPU Shares value is: %d", PER_CPU_SHARES, x);
   log_debug(os, container)("CPU Shares is: %d", x);
-  return x;
+  result = x;
+  return true;
 }
 
 /* cpu_quota
  *
  * Return the number of microseconds per period
- * process is guaranteed to run.
+ * process is guaranteed to run in the passed in 'result' reference.
  *
  * return:
- *    quota time in microseconds
- *    -1 for no quota
- *    OSCONTAINER_ERROR for not supported
+ *    true if the result reference has been set
+ *    false on error
  */
-int CgroupV2CpuController::cpu_quota() {
-  jlong quota_val;
-  bool is_ok = reader()->read_numerical_tuple_value("/cpu.max", true /* use_first */, &quota_val);
-  if (!is_ok) {
-    return OSCONTAINER_ERROR;
+bool CgroupV2CpuController::cpu_quota(int& result) {
+  uint64_t quota_val = 0;
+  if (!reader()->read_numerical_tuple_value("/cpu.max", true /* use_first */, quota_val)) {
+    return false;
+  }
+  int limit = -1;
+  // The read first tuple value might be 'max' which maps
+  // to value_unlimited. Keep that at -1;
+  if (quota_val != value_unlimited) {
+    limit = static_cast<int>(quota_val);
   }
-  int limit = (int)quota_val;
   log_trace(os, container)("CPU Quota is: %d", limit);
-  return limit;
+  result = limit;
+  return true;
 }
 
 // Constructor
@@ -162,80 +179,67 @@ char* CgroupV2Subsystem::cpu_cpuset_memory_nodes() {
   return os::strdup(mems);
 }
 
-int CgroupV2CpuController::cpu_period() {
-  jlong period_val;
-  bool is_ok = reader()->read_numerical_tuple_value("/cpu.max", false /* use_first */, &period_val);
-  if (!is_ok) {
-    log_trace(os, container)("CPU Period failed: %d", OSCONTAINER_ERROR);
-    return OSCONTAINER_ERROR;
+bool CgroupV2CpuController::cpu_period(int& result) {
+  uint64_t cpu_period = 0;
+  if (!reader()->read_numerical_tuple_value("/cpu.max", false /* use_first */, cpu_period)) {
+    log_trace(os, container)("CPU Period failed");
+    return false;
   }
-  int period = (int)period_val;
-  log_trace(os, container)("CPU Period is: %d", period);
-  return period;
+  int period_int = static_cast<int>(cpu_period);
+  log_trace(os, container)("CPU Period is: %d", period_int);
+  result = period_int;
+  return true;
 }
 
-jlong CgroupV2CpuController::cpu_usage_in_micros() {
-  julong cpu_usage;
-  bool is_ok = reader()->read_numerical_key_value("/cpu.stat", "usage_usec", &cpu_usage);
+bool CgroupV2CpuController::cpu_usage_in_micros(uint64_t& value) {
+  bool is_ok = reader()->read_numerical_key_value("/cpu.stat", "usage_usec", value);
   if (!is_ok) {
-    log_trace(os, container)("CPU Usage failed: %d", OSCONTAINER_ERROR);
-    return OSCONTAINER_ERROR;
+    log_trace(os, container)("CPU Usage failed");
+    return false;
   }
-  log_trace(os, container)("CPU Usage is: " JULONG_FORMAT, cpu_usage);
-  return (jlong)cpu_usage;
+  log_trace(os, container)("CPU Usage is: " UINT64_FORMAT, value);
+  return true;
 }
 
 /* memory_usage_in_bytes
  *
- * Return the amount of used memory used by this cgroup and descendents
+ * read the amount of used memory used by this cgroup and descendents
+ * into the passed in 'value' reference.
  *
  * return:
- *    memory usage in bytes or
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
+ *    false on failure, true otherwise.
  */
-jlong CgroupV2MemoryController::memory_usage_in_bytes() {
-  julong memusage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.current", "Memory Usage", memusage);
-  return (jlong)memusage;
+bool CgroupV2MemoryController::memory_usage_in_bytes(physical_memory_size_type& value) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.current", "Memory Usage", value);
 }
 
-jlong CgroupV2MemoryController::memory_soft_limit_in_bytes(julong upper_bound) {
-  jlong mem_soft_limit;
-  CONTAINER_READ_NUMBER_CHECKED_MAX(reader(), "/memory.low", "Memory Soft Limit", mem_soft_limit);
-  return mem_soft_limit;
+bool CgroupV2MemoryController::memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                                          physical_memory_size_type& value) {
+  CONTAINER_READ_NUMBER_CHECKED_MAX(reader(), "/memory.low", "Memory Soft Limit", value);
 }
 
-jlong CgroupV2MemoryController::memory_throttle_limit_in_bytes() {
-  jlong mem_throttle_limit;
-  CONTAINER_READ_NUMBER_CHECKED_MAX(reader(), "/memory.high", "Memory Throttle Limit", mem_throttle_limit);
-  return mem_throttle_limit;
+bool CgroupV2MemoryController::memory_throttle_limit_in_bytes(physical_memory_size_type& value) {
+  CONTAINER_READ_NUMBER_CHECKED_MAX(reader(), "/memory.high", "Memory Throttle Limit", value);
 }
 
-jlong CgroupV2MemoryController::memory_max_usage_in_bytes() {
-  julong mem_max_usage;
-  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.peak", "Maximum Memory Usage", mem_max_usage);
-  return mem_max_usage;
+bool CgroupV2MemoryController::memory_max_usage_in_bytes(physical_memory_size_type& value) {
+  CONTAINER_READ_NUMBER_CHECKED(reader(), "/memory.peak", "Maximum Memory Usage", value);
 }
 
-jlong CgroupV2MemoryController::rss_usage_in_bytes() {
-  julong rss;
-  bool is_ok = reader()->read_numerical_key_value("/memory.stat", "anon", &rss);
-  if (!is_ok) {
-    return OSCONTAINER_ERROR;
+bool CgroupV2MemoryController::rss_usage_in_bytes(physical_memory_size_type& value) {
+  if (!reader()->read_numerical_key_value("/memory.stat", "anon", value)) {
+    return false;
   }
-  log_trace(os, container)("RSS usage is: " JULONG_FORMAT, rss);
-  return (jlong)rss;
+  log_trace(os, container)("RSS usage is: " PHYS_MEM_TYPE_FORMAT, value);
+  return true;
 }
 
-jlong CgroupV2MemoryController::cache_usage_in_bytes() {
-  julong cache;
-  bool is_ok = reader()->read_numerical_key_value("/memory.stat", "file", &cache);
-  if (!is_ok) {
-    return OSCONTAINER_ERROR;
+bool CgroupV2MemoryController::cache_usage_in_bytes(physical_memory_size_type& value) {
+  if (!reader()->read_numerical_key_value("/memory.stat", "file", value)) {
+    return false;
   }
-  log_trace(os, container)("Cache usage is: " JULONG_FORMAT, cache);
-  return (jlong)cache;
+  log_trace(os, container)("Cache usage is: " PHYS_MEM_TYPE_FORMAT, value);
+  return true;
 }
 
 // Note that for cgroups v2 the actual limits set for swap and
@@ -243,91 +247,108 @@ jlong CgroupV2MemoryController::cache_usage_in_bytes() {
 // respectively. In order to properly report a cgroup v1 like
 // compound value we need to sum the two values. Setting a swap limit
 // without also setting a memory limit is not allowed.
-jlong CgroupV2MemoryController::memory_and_swap_limit_in_bytes(julong upper_mem_bound,
-                                                               julong upper_swap_bound /* unused in cg v2 */) {
-  jlong swap_limit;
-  bool is_ok = reader()->read_number_handle_max("/memory.swap.max", &swap_limit);
-  if (!is_ok) {
+bool CgroupV2MemoryController::memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                              physical_memory_size_type upper_swap_bound, /* unused in cg v2 */
+                                                              physical_memory_size_type& result) {
+  physical_memory_size_type swap_limit_val = 0;
+  if (!reader()->read_number_handle_max("/memory.swap.max", swap_limit_val)) {
     // Some container tests rely on this trace logging to happen.
-    log_trace(os, container)("Swap Limit failed: %d", OSCONTAINER_ERROR);
+    log_trace(os, container)("Swap Limit failed");
     // swap disabled at kernel level, treat it as no swap
-    return read_memory_limit_in_bytes(upper_mem_bound);
+    physical_memory_size_type mem_limit = value_unlimited;
+    if (!read_memory_limit_in_bytes(upper_mem_bound, mem_limit)) {
+      return false;
+    }
+    result = mem_limit;
+    return true;
   }
-  log_trace(os, container)("Swap Limit is: " JLONG_FORMAT, swap_limit);
-  if (swap_limit >= 0) {
-    jlong memory_limit = read_memory_limit_in_bytes(upper_mem_bound);
-    assert(memory_limit >= 0, "swap limit without memory limit?");
-    return memory_limit + swap_limit;
+  if (swap_limit_val == value_unlimited) {
+    log_trace(os, container)("Memory and Swap Limit is: Unlimited");
+    result = swap_limit_val;
+    return true;
+  }
+  log_trace(os, container)("Swap Limit is: " PHYS_MEM_TYPE_FORMAT, swap_limit_val);
+  physical_memory_size_type memory_limit = 0;
+  if (read_memory_limit_in_bytes(upper_mem_bound, memory_limit)) {
+    assert(memory_limit != value_unlimited, "swap limit without memory limit?");
+    result = memory_limit + swap_limit_val;
+    log_trace(os, container)("Memory and Swap Limit is: " PHYS_MEM_TYPE_FORMAT, result);
+    return true;
+  } else {
+    return false;
   }
-  log_trace(os, container)("Memory and Swap Limit is: " JLONG_FORMAT, swap_limit);
-  return swap_limit;
 }
 
 // memory.swap.current : total amount of swap currently used by the cgroup and its descendants
 static
-jlong memory_swap_current_value(CgroupV2Controller* ctrl) {
-  julong swap_current;
-  CONTAINER_READ_NUMBER_CHECKED(ctrl, "/memory.swap.current", "Swap currently used", swap_current);
-  return (jlong)swap_current;
+bool memory_swap_current_value(CgroupV2Controller* ctrl, physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED(ctrl, "/memory.swap.current", "Swap currently used", result);
 }
 
-jlong CgroupV2MemoryController::memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound) {
-  jlong memory_usage = memory_usage_in_bytes();
-  if (memory_usage >= 0) {
-      jlong swap_current = memory_swap_current_value(reader());
-      return memory_usage + (swap_current >= 0 ? swap_current : 0);
+bool CgroupV2MemoryController::memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                                              physical_memory_size_type upper_swap_bound,
+                                                              physical_memory_size_type& result) {
+  physical_memory_size_type memory_usage = 0;
+  if (!memory_usage_in_bytes(memory_usage)) {
+     return false;
   }
-  return memory_usage; // not supported or unlimited case
+  physical_memory_size_type swap_current = 0;
+  if (!memory_swap_current_value(reader(), swap_current)) {
+    result = memory_usage; // treat as no swap usage
+    return true;
+  }
+  result = memory_usage + swap_current;
+  return true;
 }
 
 static
-jlong memory_limit_value(CgroupV2Controller* ctrl) {
-  jlong memory_limit;
-  CONTAINER_READ_NUMBER_CHECKED_MAX(ctrl, "/memory.max", "Memory Limit", memory_limit);
-  return memory_limit;
+bool memory_limit_value(CgroupV2Controller* ctrl, physical_memory_size_type& result) {
+  CONTAINER_READ_NUMBER_CHECKED_MAX(ctrl, "/memory.max", "Memory Limit", result);
 }
 
 /* read_memory_limit_in_bytes
  *
- * Return the limit of available memory for this process.
+ * Calculate the limit of available memory for this process. The result will be
+ * set in the 'result' variable if the function returns true.
  *
  * return:
- *    memory limit in bytes or
- *    -1 for unlimited, OSCONTAINER_ERROR for an error
+ *    true when the limit could be read correctly.
+ *    false in case of any error.
  */
-jlong CgroupV2MemoryController::read_memory_limit_in_bytes(julong upper_bound) {
-  jlong limit = memory_limit_value(reader());
+bool CgroupV2MemoryController::read_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                                          physical_memory_size_type& result) {
+  physical_memory_size_type limit = 0; // default unlimited
+  if (!memory_limit_value(reader(), limit)) {
+    log_trace(os, container)("container memory limit failed, using host value " PHYS_MEM_TYPE_FORMAT,
+                              upper_bound);
+    return false;
+  }
+  bool is_unlimited = limit == value_unlimited;
+  bool exceeds_physical_mem = false;
+  if (!is_unlimited && limit >= upper_bound) {
+    exceeds_physical_mem = true;
+  }
   if (log_is_enabled(Trace, os, container)) {
-    if (limit == -1) {
-      log_trace(os, container)("Memory Limit is: Unlimited");
-    } else {
-      log_trace(os, container)("Memory Limit is: " JLONG_FORMAT, limit);
+    if (!is_unlimited) {
+      log_trace(os, container)("Memory Limit is: " PHYS_MEM_TYPE_FORMAT, limit);
     }
-  }
-  if (log_is_enabled(Debug, os, container)) {
-    julong read_limit = (julong)limit; // avoid signed/unsigned compare
-    if (limit < 0 || read_limit >= upper_bound) {
-      const char* reason;
-      if (limit == -1) {
-        reason = "unlimited";
-      } else if (limit == OSCONTAINER_ERROR) {
-        reason = "failed";
+    if (is_unlimited || exceeds_physical_mem) {
+      if (is_unlimited) {
+        log_trace(os, container)("Memory Limit is: Unlimited");
+        log_trace(os, container)("container memory limit unlimited, using upper bound value " PHYS_MEM_TYPE_FORMAT, upper_bound);
       } else {
-        assert(read_limit >= upper_bound, "Expected mem limit to exceed upper memory bound");
-        reason = "ignored";
+        log_trace(os, container)("container memory limit ignored: " PHYS_MEM_TYPE_FORMAT ", upper bound is " PHYS_MEM_TYPE_FORMAT,
+                                 limit, upper_bound);
       }
-      log_debug(os, container)("container memory limit %s: " JLONG_FORMAT ", upper bound is " JLONG_FORMAT,
-                               reason, limit, upper_bound);
     }
   }
-  return limit;
+  result = limit;
+  return true;
 }
 
 static
-jlong memory_swap_limit_value(CgroupV2Controller* ctrl) {
-  jlong swap_limit;
-  CONTAINER_READ_NUMBER_CHECKED_MAX(ctrl, "/memory.swap.max", "Swap Limit", swap_limit);
-  return swap_limit;
+bool memory_swap_limit_value(CgroupV2Controller* ctrl, physical_memory_size_type& value) {
+  CONTAINER_READ_NUMBER_CHECKED_MAX(ctrl, "/memory.swap.max", "Swap Limit", value);
 }
 
 void CgroupV2Controller::set_subsystem_path(const char* cgroup_path) {
@@ -346,10 +367,17 @@ bool CgroupV2Controller::needs_hierarchy_adjustment() {
   return strcmp(_cgroup_path, "/") != 0;
 }
 
-void CgroupV2MemoryController::print_version_specific_info(outputStream* st, julong upper_mem_bound) {
-  jlong swap_current = memory_swap_current_value(reader());
-  jlong swap_limit = memory_swap_limit_value(reader());
-
+void CgroupV2MemoryController::print_version_specific_info(outputStream* st, physical_memory_size_type upper_mem_bound) {
+  MetricResult swap_current;
+  physical_memory_size_type swap_current_val = 0;
+  if (memory_swap_current_value(reader(), swap_current_val)) {
+    swap_current.set_value(swap_current_val);
+  }
+  MetricResult swap_limit;
+  physical_memory_size_type swap_limit_val = 0;
+  if (memory_swap_limit_value(reader(), swap_limit_val)) {
+    swap_limit.set_value(swap_limit_val);
+  }
   OSContainer::print_container_helper(st, swap_current, "memory_swap_current_in_bytes");
   OSContainer::print_container_helper(st, swap_limit, "memory_swap_max_limit_in_bytes");
 }
@@ -365,29 +393,27 @@ char* CgroupV2Controller::construct_path(char* mount_path, const char* cgroup_pa
 
 /* pids_max
  *
- * Return the maximum number of tasks available to the process
+ * Calculate the maximum number of tasks available to the process. Set the
+ * value in the passed in 'value' reference. The value might be 'value_unlimited' when
+ * there is no limit.
  *
  * return:
- *    maximum number of tasks
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
+ *    true if the value has been set appropriately
+ *    false if there was an error
  */
-jlong CgroupV2Subsystem::pids_max() {
-  jlong pids_max;
-  CONTAINER_READ_NUMBER_CHECKED_MAX(unified(), "/pids.max", "Maximum number of tasks", pids_max);
-  return pids_max;
+bool CgroupV2Subsystem::pids_max(uint64_t& value) {
+  CONTAINER_READ_NUMBER_CHECKED_MAX(unified(), "/pids.max", "Maximum number of tasks", value);
 }
 
 /* pids_current
  *
- * The number of tasks currently in the cgroup (and its descendants) of the process
+ * The number of tasks currently in the cgroup (and its descendants) of the process. Set
+ * in the passed in 'value' reference.
  *
  * return:
- *    current number of tasks
- *    OSCONTAINER_ERROR for not supported
+ *    true on success
+ *    false when there was an error
  */
-jlong CgroupV2Subsystem::pids_current() {
-  julong pids_current;
-  CONTAINER_READ_NUMBER_CHECKED(unified(), "/pids.current", "Current number of tasks", pids_current);
-  return pids_current;
+bool CgroupV2Subsystem::pids_current(uint64_t& value) {
+  CONTAINER_READ_NUMBER_CHECKED(unified(), "/pids.current", "Current number of tasks", value);
 }
diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
index 07db126ce90..39a4fabe9f6 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
@@ -59,10 +59,10 @@ class CgroupV2CpuController: public CgroupCpuController {
   public:
     CgroupV2CpuController(const CgroupV2Controller& reader) : _reader(reader) {
     }
-    int cpu_quota() override;
-    int cpu_period() override;
-    int cpu_shares() override;
-    jlong cpu_usage_in_micros();
+    bool cpu_quota(int& value) override;
+    bool cpu_period(int& value) override;
+    bool cpu_shares(int& value) override;
+    bool cpu_usage_in_micros(uint64_t& value);
     bool is_read_only() override {
       return reader()->is_read_only();
     }
@@ -87,8 +87,8 @@ class CgroupV2CpuacctController: public CgroupCpuacctController {
     CgroupV2CpuacctController(CgroupV2CpuController* reader) : _reader(reader) {
     }
     // In cgroup v2, cpu usage is a part of the cpu controller.
-    jlong cpu_usage_in_micros() override {
-      return reader()->cpu_usage_in_micros();
+    bool cpu_usage_in_micros(uint64_t& result) override {
+      return reader()->cpu_usage_in_micros(result);
     }
     bool is_read_only() override {
       return reader()->is_read_only();
@@ -110,20 +110,27 @@ class CgroupV2MemoryController final: public CgroupMemoryController {
   private:
     CgroupV2Controller _reader;
     CgroupV2Controller* reader() { return &_reader; }
+
   public:
     CgroupV2MemoryController(const CgroupV2Controller& reader) : _reader(reader) {
     }
 
-    jlong read_memory_limit_in_bytes(julong upper_bound) override;
-    jlong memory_and_swap_limit_in_bytes(julong upper_mem_bound, julong upper_swap_bound) override;
-    jlong memory_and_swap_usage_in_bytes(julong upper_mem_bound, julong upper_swap_bound) override;
-    jlong memory_soft_limit_in_bytes(julong upper_bound) override;
-    jlong memory_throttle_limit_in_bytes() override;
-    jlong memory_usage_in_bytes() override;
-    jlong memory_max_usage_in_bytes() override;
-    jlong rss_usage_in_bytes() override;
-    jlong cache_usage_in_bytes() override;
-    void print_version_specific_info(outputStream* st, julong upper_mem_bound) override;
+    bool read_memory_limit_in_bytes(physical_memory_size_type upper_bound,
+                                    physical_memory_size_type& result) override;
+    bool memory_and_swap_limit_in_bytes(physical_memory_size_type upper_mem_bound,
+                                        physical_memory_size_type upper_swap_bound,
+                                        physical_memory_size_type& result) override;
+    bool memory_and_swap_usage_in_bytes(physical_memory_size_type upper_mem_bound,
+                                        physical_memory_size_type upper_swap_bound,
+                                        physical_memory_size_type& result) override;
+    bool memory_soft_limit_in_bytes(physical_memory_size_type upper_bound,
+                                    physical_memory_size_type& result) override;
+    bool memory_throttle_limit_in_bytes(physical_memory_size_type& result) override;
+    bool memory_usage_in_bytes(physical_memory_size_type& result) override;
+    bool memory_max_usage_in_bytes(physical_memory_size_type& result) override;
+    bool rss_usage_in_bytes(physical_memory_size_type& result) override;
+    bool cache_usage_in_bytes(physical_memory_size_type& result) override;
+    void print_version_specific_info(outputStream* st, physical_memory_size_type upper_mem_bound) override;
     bool is_read_only() override {
       return reader()->is_read_only();
     }
@@ -160,8 +167,8 @@ class CgroupV2Subsystem: public CgroupSubsystem {
 
     char * cpu_cpuset_cpus() override;
     char * cpu_cpuset_memory_nodes() override;
-    jlong pids_max() override;
-    jlong pids_current() override;
+    bool pids_max(uint64_t& result) override;
+    bool pids_current(uint64_t& result) override;
 
     bool is_containerized() override;
 
diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index 561f2d4926c..d86bbf7428a 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -84,8 +84,12 @@ void OSContainer::init() {
     // We can be in one of two cases:
     //  1.) On a physical Linux system without any limit
     //  2.) On a physical Linux system with a limit enforced by other means (like systemd slice)
-    any_mem_cpu_limit_present = memory_limit_in_bytes() > 0 ||
-                                os::Linux::active_processor_count() != active_processor_count();
+    physical_memory_size_type mem_limit_val = value_unlimited;
+    (void)memory_limit_in_bytes(mem_limit_val);  // discard error and use default
+    int host_cpus = os::Linux::active_processor_count();
+    int cpus = host_cpus;
+    (void)active_processor_count(cpus);  // discard error and use default
+    any_mem_cpu_limit_present = mem_limit_val != value_unlimited || host_cpus != cpus;
     if (any_mem_cpu_limit_present) {
       reason = " because either a cpu or a memory limit is present";
     } else {
@@ -103,77 +107,138 @@ const char * OSContainer::container_type() {
   return cgroup_subsystem->container_type();
 }
 
-bool OSContainer::available_memory_in_container(julong& value) {
-  jlong mem_limit = memory_limit_in_bytes();
-  jlong mem_usage = memory_usage_in_bytes();
+bool OSContainer::memory_limit_in_bytes(physical_memory_size_type& value) {
+  assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
+  physical_memory_size_type phys_mem = os::Linux::physical_memory();
+  return cgroup_subsystem->memory_limit_in_bytes(phys_mem, value);
+}
 
-  if (mem_limit > 0 && mem_usage <= 0) {
-    log_debug(os, container)("container memory usage failed: " JLONG_FORMAT, mem_usage);
+bool OSContainer::available_memory_in_bytes(physical_memory_size_type& value) {
+  physical_memory_size_type mem_limit = value_unlimited;
+  physical_memory_size_type mem_usage = 0;
+  if (memory_limit_in_bytes(mem_limit) && memory_usage_in_bytes(mem_usage)) {
+    assert(mem_usage != value_unlimited, "invariant");
+    if (mem_limit != value_unlimited) {
+      value = (mem_limit > mem_usage) ? mem_limit - mem_usage : 0;
+      return true;
+    }
   }
+  log_trace(os, container)("calculating available memory in container failed");
+  return false;
+}
 
-  if (mem_limit <= 0 || mem_usage <= 0) {
+bool OSContainer::available_swap_in_bytes(physical_memory_size_type host_free_swap,
+                                          physical_memory_size_type& value) {
+  physical_memory_size_type mem_limit = 0;
+  physical_memory_size_type mem_swap_limit = 0;
+  if (memory_limit_in_bytes(mem_limit) &&
+      memory_and_swap_limit_in_bytes(mem_swap_limit) &&
+      mem_limit != value_unlimited &&
+      mem_swap_limit != value_unlimited) {
+    if (mem_limit >= mem_swap_limit) {
+      value = 0; // no swap, thus no free swap
+      return true;
+    }
+    physical_memory_size_type swap_limit = mem_swap_limit - mem_limit;
+    physical_memory_size_type mem_swap_usage = 0;
+    physical_memory_size_type mem_usage = 0;
+    if (memory_and_swap_usage_in_bytes(mem_swap_usage) &&
+        memory_usage_in_bytes(mem_usage)) {
+      physical_memory_size_type swap_usage = value_unlimited;
+      if (mem_usage > mem_swap_usage) {
+        swap_usage = 0; // delta usage must not be negative
+      } else {
+        swap_usage = mem_swap_usage - mem_usage;
+      }
+      // free swap is based on swap limit (upper bound) and swap usage
+      if (swap_usage >= swap_limit) {
+        value = 0; // free swap must not be negative
+        return true;
+      }
+      value = swap_limit - swap_usage;
+      return true;
+    }
+  }
+  // unlimited or not supported. Leave an appropriate trace message
+  if (log_is_enabled(Trace, os, container)) {
+    char mem_swap_buf[25]; // uint64_t => 20 + 1, 'unlimited' => 9 + 1; 10 < 21 < 25
+    char mem_limit_buf[25];
+    int num = 0;
+    if (mem_swap_limit == value_unlimited) {
+      num = os::snprintf(mem_swap_buf, sizeof(mem_swap_buf), "%s", "unlimited");
+    } else {
+      num = os::snprintf(mem_swap_buf, sizeof(mem_swap_buf), PHYS_MEM_TYPE_FORMAT, mem_swap_limit);
+    }
+    assert(num < 25, "buffer too small");
+    mem_swap_buf[num] = '\0';
+    if (mem_limit == value_unlimited) {
+      num = os::snprintf(mem_limit_buf, sizeof(mem_limit_buf), "%s", "unlimited");
+    } else {
+      num = os::snprintf(mem_limit_buf, sizeof(mem_limit_buf), PHYS_MEM_TYPE_FORMAT, mem_limit);
+    }
+    assert(num < 25, "buffer too small");
+    mem_limit_buf[num] = '\0';
+    log_trace(os,container)("OSContainer::available_swap_in_bytes: container_swap_limit=%s"
+                            " container_mem_limit=%s, host_free_swap: " PHYS_MEM_TYPE_FORMAT,
+                            mem_swap_buf, mem_limit_buf, host_free_swap);
+  }
+  return false;
+}
+
+bool OSContainer::memory_and_swap_limit_in_bytes(physical_memory_size_type& value) {
+  assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
+  physical_memory_size_type phys_mem = os::Linux::physical_memory();
+  physical_memory_size_type host_swap = 0;
+  if (!os::Linux::host_swap(host_swap)) {
     return false;
   }
-
-  value = mem_limit > mem_usage ? static_cast<julong>(mem_limit - mem_usage) : 0;
-
-  return true;
+  return cgroup_subsystem->memory_and_swap_limit_in_bytes(phys_mem, host_swap, value);
 }
 
-jlong OSContainer::memory_limit_in_bytes() {
+bool OSContainer::memory_and_swap_usage_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  julong phys_mem = static_cast<julong>(os::Linux::physical_memory());
-  return cgroup_subsystem->memory_limit_in_bytes(phys_mem);
+  physical_memory_size_type phys_mem = os::Linux::physical_memory();
+  physical_memory_size_type host_swap = 0;
+  if (!os::Linux::host_swap(host_swap)) {
+    return false;
+  }
+  return cgroup_subsystem->memory_and_swap_usage_in_bytes(phys_mem, host_swap, value);
 }
 
-jlong OSContainer::memory_and_swap_limit_in_bytes() {
+bool OSContainer::memory_soft_limit_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  julong phys_mem = static_cast<julong>(os::Linux::physical_memory());
-  julong host_swap = os::Linux::host_swap();
-  return cgroup_subsystem->memory_and_swap_limit_in_bytes(phys_mem, host_swap);
+  physical_memory_size_type phys_mem = os::Linux::physical_memory();
+  return cgroup_subsystem->memory_soft_limit_in_bytes(phys_mem, value);
 }
 
-jlong OSContainer::memory_and_swap_usage_in_bytes() {
+bool OSContainer::memory_throttle_limit_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  julong phys_mem = static_cast<julong>(os::Linux::physical_memory());
-  julong host_swap = os::Linux::host_swap();
-  return cgroup_subsystem->memory_and_swap_usage_in_bytes(phys_mem, host_swap);
+  return cgroup_subsystem->memory_throttle_limit_in_bytes(value);
 }
 
-jlong OSContainer::memory_soft_limit_in_bytes() {
+bool OSContainer::memory_usage_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  julong phys_mem = static_cast<julong>(os::Linux::physical_memory());
-  return cgroup_subsystem->memory_soft_limit_in_bytes(phys_mem);
+  return cgroup_subsystem->memory_usage_in_bytes(value);
 }
 
-jlong OSContainer::memory_throttle_limit_in_bytes() {
+bool OSContainer::memory_max_usage_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->memory_throttle_limit_in_bytes();
+  return cgroup_subsystem->memory_max_usage_in_bytes(value);
 }
 
-jlong OSContainer::memory_usage_in_bytes() {
+bool OSContainer::rss_usage_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->memory_usage_in_bytes();
+  return cgroup_subsystem->rss_usage_in_bytes(value);
 }
 
-jlong OSContainer::memory_max_usage_in_bytes() {
+bool OSContainer::cache_usage_in_bytes(physical_memory_size_type& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->memory_max_usage_in_bytes();
-}
-
-jlong OSContainer::rss_usage_in_bytes() {
-  assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->rss_usage_in_bytes();
-}
-
-jlong OSContainer::cache_usage_in_bytes() {
-  assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->cache_usage_in_bytes();
+  return cgroup_subsystem->cache_usage_in_bytes(value);
 }
 
 void OSContainer::print_version_specific_info(outputStream* st) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  julong phys_mem = static_cast<julong>(os::Linux::physical_memory());
+  physical_memory_size_type phys_mem = os::Linux::physical_memory();
   cgroup_subsystem->print_version_specific_info(st, phys_mem);
 }
 
@@ -187,50 +252,55 @@ char * OSContainer::cpu_cpuset_memory_nodes() {
   return cgroup_subsystem->cpu_cpuset_memory_nodes();
 }
 
-int OSContainer::active_processor_count() {
+bool OSContainer::active_processor_count(int& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->active_processor_count();
+  return cgroup_subsystem->active_processor_count(value);
 }
 
-int OSContainer::cpu_quota() {
+bool OSContainer::cpu_quota(int& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->cpu_quota();
+  return cgroup_subsystem->cpu_quota(value);
 }
 
-int OSContainer::cpu_period() {
+bool OSContainer::cpu_period(int& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->cpu_period();
+  return cgroup_subsystem->cpu_period(value);
 }
 
-int OSContainer::cpu_shares() {
+bool OSContainer::cpu_shares(int& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->cpu_shares();
+  return cgroup_subsystem->cpu_shares(value);
 }
 
-jlong OSContainer::cpu_usage_in_micros() {
+bool OSContainer::cpu_usage_in_micros(uint64_t& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->cpu_usage_in_micros();
+  return cgroup_subsystem->cpu_usage_in_micros(value);
 }
 
-jlong OSContainer::pids_max() {
+bool OSContainer::pids_max(uint64_t& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->pids_max();
+  return cgroup_subsystem->pids_max(value);
 }
 
-jlong OSContainer::pids_current() {
+bool OSContainer::pids_current(uint64_t& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
-  return cgroup_subsystem->pids_current();
+  return cgroup_subsystem->pids_current(value);
 }
 
-void OSContainer::print_container_helper(outputStream* st, jlong j, const char* metrics) {
+void OSContainer::print_container_helper(outputStream* st, MetricResult& res, const char* metrics) {
   st->print("%s: ", metrics);
-  if (j >= 0) {
-    if (j >= 1024) {
-      st->print_cr(UINT64_FORMAT " k", uint64_t(j) / K);
+  if (res.success()) {
+    if (res.value() != value_unlimited) {
+      if (res.value() >= 1024) {
+        st->print_cr(PHYS_MEM_TYPE_FORMAT " k", (physical_memory_size_type)(res.value() / K));
+      } else {
+        st->print_cr(PHYS_MEM_TYPE_FORMAT, res.value());
+      }
     } else {
-      st->print_cr(UINT64_FORMAT, uint64_t(j));
+      st->print_cr("%s", "unlimited");
     }
   } else {
-    st->print_cr("%s", j == OSCONTAINER_ERROR ? "not supported" : "unlimited");
+    // Not supported
+    st->print_cr("%s", "unavailable");
   }
 }
diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index 6258714c48b..895c99ba167 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -30,11 +30,30 @@
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 
-#define OSCONTAINER_ERROR (-2)
+// Some cgroup interface files define the value 'max' for unlimited.
+// Define this constant value to indicate this value.
+const uint64_t value_unlimited = std::numeric_limits<uint64_t>::max();
 
 // 20ms timeout between re-reads of memory limit and _active_processor_count.
 #define OSCONTAINER_CACHE_TIMEOUT (NANOSECS_PER_SEC/50)
 
+// Carrier object for print_container_helper()
+class MetricResult: public StackObj {
+  private:
+    static const uint64_t value_unused = 0;
+    bool _success = false;
+    physical_memory_size_type _value = value_unused;
+  public:
+    void set_value(physical_memory_size_type val) {
+      // having a value means success
+      _success = true;
+      _value = val;
+    }
+
+    bool success() { return _success; }
+    physical_memory_size_type value() { return _value; }
+};
+
 class OSContainer: AllStatic {
 
  private:
@@ -45,36 +64,38 @@ class OSContainer: AllStatic {
  public:
   static void init();
   static void print_version_specific_info(outputStream* st);
-  static void print_container_helper(outputStream* st, jlong j, const char* metrics);
+  static void print_container_helper(outputStream* st, MetricResult& res, const char* metrics);
 
   static inline bool is_containerized();
   static const char * container_type();
 
-  static bool available_memory_in_container(julong& value);
-  static jlong memory_limit_in_bytes();
-  static jlong memory_and_swap_limit_in_bytes();
-  static jlong memory_and_swap_usage_in_bytes();
-  static jlong memory_soft_limit_in_bytes();
-  static jlong memory_throttle_limit_in_bytes();
-  static jlong memory_usage_in_bytes();
-  static jlong memory_max_usage_in_bytes();
-  static jlong rss_usage_in_bytes();
-  static jlong cache_usage_in_bytes();
+  static bool available_memory_in_bytes(physical_memory_size_type& value);
+  static bool available_swap_in_bytes(physical_memory_size_type host_free_swap,
+                                      physical_memory_size_type& value);
+  static bool memory_limit_in_bytes(physical_memory_size_type& value);
+  static bool memory_and_swap_limit_in_bytes(physical_memory_size_type& value);
+  static bool memory_and_swap_usage_in_bytes(physical_memory_size_type& value);
+  static bool memory_soft_limit_in_bytes(physical_memory_size_type& value);
+  static bool memory_throttle_limit_in_bytes(physical_memory_size_type& value);
+  static bool memory_usage_in_bytes(physical_memory_size_type& value);
+  static bool memory_max_usage_in_bytes(physical_memory_size_type& value);
+  static bool rss_usage_in_bytes(physical_memory_size_type& value);
+  static bool cache_usage_in_bytes(physical_memory_size_type& value);
 
-  static int active_processor_count();
+  static bool active_processor_count(int& value);
 
   static char * cpu_cpuset_cpus();
   static char * cpu_cpuset_memory_nodes();
 
-  static int cpu_quota();
-  static int cpu_period();
+  static bool cpu_quota(int& value);
+  static bool cpu_period(int& value);
 
-  static int cpu_shares();
+  static bool cpu_shares(int& value);
 
-  static jlong cpu_usage_in_micros();
+  static bool cpu_usage_in_micros(uint64_t& value);
 
-  static jlong pids_max();
-  static jlong pids_current();
+  static bool pids_max(uint64_t& value);
+  static bool pids_current(uint64_t& value);
 };
 
 inline bool OSContainer::is_containerized() {
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 69ef8ce7c33..a345663dd5b 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -214,10 +214,8 @@ static bool suppress_primordial_thread_resolution = false;
 // utility functions
 
 bool os::available_memory(physical_memory_size_type& value) {
-  julong avail_mem = 0;
-  if (OSContainer::is_containerized() && OSContainer::available_memory_in_container(avail_mem)) {
-    log_trace(os)("available container memory: " JULONG_FORMAT, avail_mem);
-    value = static_cast<physical_memory_size_type>(avail_mem);
+  if (OSContainer::is_containerized() && OSContainer::available_memory_in_bytes(value)) {
+    log_trace(os)("available container memory: " PHYS_MEM_TYPE_FORMAT, value);
     return true;
   }
 
@@ -225,36 +223,38 @@ bool os::available_memory(physical_memory_size_type& value) {
 }
 
 bool os::Linux::available_memory(physical_memory_size_type& value) {
-  julong avail_mem = static_cast<julong>(-1L);
+  physical_memory_size_type avail_mem = 0;
 
+  bool found_available_mem = false;
   FILE *fp = os::fopen("/proc/meminfo", "r");
   if (fp != nullptr) {
     char buf[80];
     do {
-      if (fscanf(fp, "MemAvailable: " JULONG_FORMAT " kB", &avail_mem) == 1) {
+      if (fscanf(fp, "MemAvailable: " PHYS_MEM_TYPE_FORMAT " kB", &avail_mem) == 1) {
         avail_mem *= K;
+        found_available_mem = true;
         break;
       }
     } while (fgets(buf, sizeof(buf), fp) != nullptr);
     fclose(fp);
   }
-  if (avail_mem == static_cast<julong>(-1L)) {
+  // Only enter the free memory block if we
+  // haven't found the available memory
+  if (!found_available_mem) {
     physical_memory_size_type free_mem = 0;
     if (!free_memory(free_mem)) {
       return false;
     }
-    avail_mem = static_cast<julong>(free_mem);
+    avail_mem = free_mem;
   }
-  log_trace(os)("available memory: " JULONG_FORMAT, avail_mem);
-  value = static_cast<physical_memory_size_type>(avail_mem);
+  log_trace(os)("available memory: " PHYS_MEM_TYPE_FORMAT, avail_mem);
+  value = avail_mem;
   return true;
 }
 
 bool os::free_memory(physical_memory_size_type& value) {
-  julong free_mem = 0;
-  if (OSContainer::is_containerized() && OSContainer::available_memory_in_container(free_mem)) {
-    log_trace(os)("free container memory: " JULONG_FORMAT, free_mem);
-    value = static_cast<physical_memory_size_type>(free_mem);
+  if (OSContainer::is_containerized() && OSContainer::available_memory_in_bytes(value)) {
+    log_trace(os)("free container memory: " PHYS_MEM_TYPE_FORMAT, value);
     return true;
   }
 
@@ -269,29 +269,26 @@ bool os::Linux::free_memory(physical_memory_size_type& value) {
   if (ret != 0) {
     return false;
   }
-  julong free_mem = (julong)si.freeram * si.mem_unit;
-  log_trace(os)("free memory: " JULONG_FORMAT, free_mem);
-  value = static_cast<physical_memory_size_type>(free_mem);
+  physical_memory_size_type free_mem = (physical_memory_size_type)si.freeram * si.mem_unit;
+  log_trace(os)("free memory: " PHYS_MEM_TYPE_FORMAT, free_mem);
+  value = free_mem;
   return true;
 }
 
 bool os::total_swap_space(physical_memory_size_type& value) {
   if (OSContainer::is_containerized()) {
-    jlong memory_and_swap_limit_in_bytes = OSContainer::memory_and_swap_limit_in_bytes();
-    jlong memory_limit_in_bytes = OSContainer::memory_limit_in_bytes();
-    if (memory_limit_in_bytes > 0 && memory_and_swap_limit_in_bytes > 0) {
-      value = static_cast<physical_memory_size_type>(memory_and_swap_limit_in_bytes - memory_limit_in_bytes);
-      return true;
+    physical_memory_size_type mem_swap_limit = value_unlimited;
+    physical_memory_size_type memory_limit = value_unlimited;
+    if (OSContainer::memory_and_swap_limit_in_bytes(mem_swap_limit) &&
+        OSContainer::memory_limit_in_bytes(memory_limit)) {
+      if (memory_limit != value_unlimited && mem_swap_limit != value_unlimited &&
+          mem_swap_limit >= memory_limit /* ensure swap is >= 0 */) {
+        value = mem_swap_limit - memory_limit;
+        return true;
+      }
     }
-  } // fallback to the host swap space if the container did return the unbound value of -1
-  struct sysinfo si;
-  int ret = sysinfo(&si);
-  if (ret != 0) {
-    assert(false, "sysinfo failed in total_swap_space(): %s", os::strerror(errno));
-    return false;
-  }
-  value = static_cast<physical_memory_size_type>(si.totalswap) * si.mem_unit;
-  return true;
+  } // fallback to the host swap space if the container returned unlimited
+  return Linux::host_swap(value);
 }
 
 static bool host_free_swap_f(physical_memory_size_type& value) {
@@ -315,29 +312,12 @@ bool os::free_swap_space(physical_memory_size_type& value) {
   }
   physical_memory_size_type host_free_swap_val = MIN2(total_swap_space, host_free_swap);
   if (OSContainer::is_containerized()) {
-    jlong mem_swap_limit = OSContainer::memory_and_swap_limit_in_bytes();
-    jlong mem_limit = OSContainer::memory_limit_in_bytes();
-    if (mem_swap_limit >= 0 && mem_limit >= 0) {
-      jlong delta_limit = mem_swap_limit - mem_limit;
-      if (delta_limit <= 0) {
-        value = 0;
-        return true;
-      }
-      jlong mem_swap_usage = OSContainer::memory_and_swap_usage_in_bytes();
-      jlong mem_usage = OSContainer::memory_usage_in_bytes();
-      if (mem_swap_usage > 0 && mem_usage > 0) {
-        jlong delta_usage = mem_swap_usage - mem_usage;
-        if (delta_usage >= 0) {
-          jlong free_swap = delta_limit - delta_usage;
-          value = free_swap >= 0 ? static_cast<physical_memory_size_type>(free_swap) : 0;
-          return true;
-        }
-      }
+    if (OSContainer::available_swap_in_bytes(host_free_swap_val, value)) {
+      return true;
     }
-    // unlimited or not supported. Fall through to return host value
-    log_trace(os,container)("os::free_swap_space: container_swap_limit=" JLONG_FORMAT
-                            " container_mem_limit=" JLONG_FORMAT " returning host value: " PHYS_MEM_TYPE_FORMAT,
-                            mem_swap_limit, mem_limit, host_free_swap_val);
+    // Fall through to use host value
+    log_trace(os,container)("os::free_swap_space: containerized value unavailable"
+                            " returning host value: " PHYS_MEM_TYPE_FORMAT, host_free_swap_val);
   }
   value = host_free_swap_val;
   return true;
@@ -345,10 +325,10 @@ bool os::free_swap_space(physical_memory_size_type& value) {
 
 physical_memory_size_type os::physical_memory() {
   if (OSContainer::is_containerized()) {
-    jlong mem_limit;
-    if ((mem_limit = OSContainer::memory_limit_in_bytes()) > 0) {
-      log_trace(os)("total container memory: " JLONG_FORMAT, mem_limit);
-      return static_cast<physical_memory_size_type>(mem_limit);
+    physical_memory_size_type mem_limit = value_unlimited;
+    if (OSContainer::memory_limit_in_bytes(mem_limit) && mem_limit != value_unlimited) {
+      log_trace(os)("total container memory: " PHYS_MEM_TYPE_FORMAT, mem_limit);
+      return mem_limit;
     }
   }
 
@@ -508,10 +488,15 @@ pid_t os::Linux::gettid() {
 
 // Returns the amount of swap currently configured, in bytes.
 // This can change at any time.
-julong os::Linux::host_swap() {
+bool os::Linux::host_swap(physical_memory_size_type& value) {
   struct sysinfo si;
-  sysinfo(&si);
-  return (julong)(si.totalswap * si.mem_unit);
+  int ret = sysinfo(&si);
+  if (ret != 0) {
+    assert(false, "sysinfo failed in host_swap(): %s", os::strerror(errno));
+    return false;
+  }
+  value = static_cast<physical_memory_size_type>(si.totalswap) * si.mem_unit;
+  return true;
 }
 
 // Most versions of linux have a bug where the number of processors are
@@ -2469,9 +2454,11 @@ bool os::Linux::print_container_info(outputStream* st) {
   st->print_cr("cpu_memory_nodes: %s", p != nullptr ? p : "not supported");
   free(p);
 
-  int i = OSContainer::active_processor_count();
+  int i = -1;
+  bool supported = OSContainer::active_processor_count(i);
   st->print("active_processor_count: ");
-  if (i > 0) {
+  if (supported) {
+    assert(i > 0, "must be");
     if (ActiveProcessorCount > 0) {
       st->print_cr("%d, but overridden by -XX:ActiveProcessorCount %d", i, ActiveProcessorCount);
     } else {
@@ -2481,65 +2468,105 @@ bool os::Linux::print_container_info(outputStream* st) {
     st->print_cr("not supported");
   }
 
-  i = OSContainer::cpu_quota();
+
+  supported = OSContainer::cpu_quota(i);
   st->print("cpu_quota: ");
-  if (i > 0) {
+  if (supported && i > 0) {
     st->print_cr("%d", i);
   } else {
-    st->print_cr("%s", i == OSCONTAINER_ERROR ? "not supported" : "no quota");
+    st->print_cr("%s", !supported ? "not supported" : "no quota");
   }
 
-  i = OSContainer::cpu_period();
+  supported = OSContainer::cpu_period(i);
   st->print("cpu_period: ");
-  if (i > 0) {
+  if (supported && i > 0) {
     st->print_cr("%d", i);
   } else {
-    st->print_cr("%s", i == OSCONTAINER_ERROR ? "not supported" : "no period");
+    st->print_cr("%s", !supported ? "not supported" : "no period");
   }
 
-  i = OSContainer::cpu_shares();
+  supported = OSContainer::cpu_shares(i);
   st->print("cpu_shares: ");
-  if (i > 0) {
+  if (supported && i > 0) {
     st->print_cr("%d", i);
   } else {
-    st->print_cr("%s", i == OSCONTAINER_ERROR ? "not supported" : "no shares");
+    st->print_cr("%s", !supported ? "not supported" : "no shares");
   }
 
-  jlong j = OSContainer::cpu_usage_in_micros();
+  uint64_t j = 0;
+  supported = OSContainer::cpu_usage_in_micros(j);
   st->print("cpu_usage_in_micros: ");
-  if (j >= 0) {
-    st->print_cr(JLONG_FORMAT, j);
+  if (supported && j > 0) {
+    st->print_cr(UINT64_FORMAT, j);
   } else {
-    st->print_cr("%s", j == OSCONTAINER_ERROR ? "not supported" : "no usage");
+    st->print_cr("%s", !supported ? "not supported" : "no usage");
   }
 
-  OSContainer::print_container_helper(st, OSContainer::memory_limit_in_bytes(), "memory_limit_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::memory_and_swap_limit_in_bytes(), "memory_and_swap_limit_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::memory_soft_limit_in_bytes(), "memory_soft_limit_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::memory_throttle_limit_in_bytes(), "memory_throttle_limit_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::memory_usage_in_bytes(), "memory_usage_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::memory_max_usage_in_bytes(), "memory_max_usage_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::rss_usage_in_bytes(), "rss_usage_in_bytes");
-  OSContainer::print_container_helper(st, OSContainer::cache_usage_in_bytes(), "cache_usage_in_bytes");
+  MetricResult memory_limit;
+  physical_memory_size_type val = value_unlimited;
+  if (OSContainer::memory_limit_in_bytes(val)) {
+    memory_limit.set_value(val);
+  }
+  MetricResult mem_swap_limit;
+  val = value_unlimited;
+  if (OSContainer::memory_and_swap_limit_in_bytes(val)) {
+    mem_swap_limit.set_value(val);
+  }
+  MetricResult mem_soft_limit;
+  val = value_unlimited;
+  if (OSContainer::memory_soft_limit_in_bytes(val)) {
+    mem_soft_limit.set_value(val);
+  }
+  MetricResult mem_throttle_limit;
+  val = value_unlimited;
+  if (OSContainer::memory_throttle_limit_in_bytes(val)) {
+    mem_throttle_limit.set_value(val);
+  }
+  MetricResult mem_usage;
+  val = 0;
+  if (OSContainer::memory_usage_in_bytes(val)) {
+    mem_usage.set_value(val);
+  }
+  MetricResult mem_max_usage;
+  val = 0;
+  if (OSContainer::memory_max_usage_in_bytes(val)) {
+    mem_max_usage.set_value(val);
+  }
+  MetricResult rss_usage;
+  val = 0;
+  if (OSContainer::rss_usage_in_bytes(val)) {
+    rss_usage.set_value(val);
+  }
+  MetricResult cache_usage;
+  val = 0;
+  if (OSContainer::cache_usage_in_bytes(val)) {
+    cache_usage.set_value(val);
+  }
+  OSContainer::print_container_helper(st, memory_limit, "memory_limit_in_bytes");
+  OSContainer::print_container_helper(st, mem_swap_limit, "memory_and_swap_limit_in_bytes");
+  OSContainer::print_container_helper(st, mem_soft_limit, "memory_soft_limit_in_bytes");
+  OSContainer::print_container_helper(st, mem_throttle_limit, "memory_throttle_limit_in_bytes");
+  OSContainer::print_container_helper(st, mem_usage, "memory_usage_in_bytes");
+  OSContainer::print_container_helper(st, mem_max_usage, "memory_max_usage_in_bytes");
+  OSContainer::print_container_helper(st, rss_usage, "rss_usage_in_bytes");
+  OSContainer::print_container_helper(st, cache_usage, "cache_usage_in_bytes");
 
   OSContainer::print_version_specific_info(st);
 
-  j = OSContainer::pids_max();
+  supported = OSContainer::pids_max(j);
   st->print("maximum number of tasks: ");
-  if (j > 0) {
-    st->print_cr(JLONG_FORMAT, j);
+  if (supported && j != value_unlimited) {
+    st->print_cr(UINT64_FORMAT, j);
   } else {
-    st->print_cr("%s", j == OSCONTAINER_ERROR ? "not supported" : "unlimited");
+    st->print_cr("%s", !supported ? "not supported" : "unlimited");
   }
 
-  j = OSContainer::pids_current();
+  supported = OSContainer::pids_current(j);
   st->print("current number of tasks: ");
-  if (j > 0) {
-    st->print_cr(JLONG_FORMAT, j);
+  if (supported && j > 0) {
+    st->print_cr(UINT64_FORMAT, j);
   } else {
-    if (j == OSCONTAINER_ERROR) {
-      st->print_cr("not supported");
-    }
+    st->print_cr("%s", !supported ? "not supported" : "no current tasks");
   }
 
   return true;
@@ -4643,7 +4670,7 @@ int os::Linux::active_processor_count() {
 //
 // 1. User option -XX:ActiveProcessorCount
 // 2. kernel os calls (sched_getaffinity or sysconf(_SC_NPROCESSORS_ONLN)
-// 3. extracted from cgroup cpu subsystem (shares and quotas)
+// 3. extracted from cgroup cpu subsystem (quotas)
 //
 // Option 1, if specified, will always override.
 // If the cgroup subsystem is active and configured, we
@@ -4660,9 +4687,8 @@ int os::active_processor_count() {
     return ActiveProcessorCount;
   }
 
-  int active_cpus;
-  if (OSContainer::is_containerized()) {
-    active_cpus = OSContainer::active_processor_count();
+  int active_cpus = -1;
+  if (OSContainer::is_containerized() && OSContainer::active_processor_count(active_cpus)) {
     log_trace(os)("active_processor_count: determined by OSContainer: %d",
                    active_cpus);
   } else {
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index b77cd9f3c81..df96a17d8e9 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -45,8 +45,6 @@ class os::Linux {
   static GrowableArray<int>* _cpu_to_node;
   static GrowableArray<int>* _nindex_to_node;
 
-  static julong available_memory_in_container();
-
  protected:
 
   static physical_memory_size_type _physical_memory;
@@ -117,7 +115,7 @@ class os::Linux {
   static uintptr_t initial_thread_stack_size(void)                  { return _initial_thread_stack_size; }
 
   static physical_memory_size_type physical_memory() { return _physical_memory; }
-  static julong host_swap();
+  static bool host_swap(physical_memory_size_type& value);
 
   static intptr_t* ucontext_get_sp(const ucontext_t* uc);
   static intptr_t* ucontext_get_fp(const ucontext_t* uc);
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index cc5bbe1fc60..6a1146587bc 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -421,7 +421,9 @@ JVM_END
 JVM_ENTRY_NO_ENV(jlong, jfr_host_total_swap_memory(JNIEnv* env, jclass jvm))
 #ifdef LINUX
   // We want the host swap memory, not the container value.
-  return os::Linux::host_swap();
+  physical_memory_size_type host_swap = 0;
+  (void)os::Linux::host_swap(host_swap); // Discard return value and treat as no swap
+  return static_cast<jlong>(host_swap);
 #else
   physical_memory_size_type total_swap_space = 0;
   // Return value ignored - defaulting to 0 on failure.
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 8f0a2320288..5514f7d3260 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -2590,7 +2590,13 @@ WB_END
 
 // Physical swap of the host machine (including containers), Linux only.
 WB_ENTRY(jlong, WB_HostPhysicalSwap(JNIEnv* env, jobject o))
-  LINUX_ONLY(return (jlong)os::Linux::host_swap();)
+#ifdef LINUX
+  physical_memory_size_type swap_val = 0;
+  if (!os::Linux::host_swap(swap_val)) {
+    return -1; // treat as unlimited
+  }
+  return static_cast<jlong>(swap_val);
+#endif
   return -1; // Not used/implemented on other platforms
 WB_END
 
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 674b0a55841..ceff9b54c33 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -2207,13 +2207,7 @@ static void assert_nonempty_range(const char* addr, size_t bytes) {
 bool os::used_memory(physical_memory_size_type& value) {
 #ifdef LINUX
   if (OSContainer::is_containerized()) {
-    jlong mem_usage = OSContainer::memory_usage_in_bytes();
-    if (mem_usage > 0) {
-      value = static_cast<physical_memory_size_type>(mem_usage);
-      return true;
-    } else {
-      return false;
-    }
+    return OSContainer::memory_usage_in_bytes(value);
   }
 #endif
   physical_memory_size_type avail_mem = 0;
diff --git a/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp b/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp
index b33d6454477..7a4f7bcb99e 100644
--- a/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp
@@ -104,35 +104,35 @@ TEST(cgroupTest, read_numerical_key_value_failure_cases) {
   const char* base_with_slash = path.as_string(true);
 
   TestController* controller = new TestController((char*)os::get_temp_directory());
-  constexpr julong bad = 0xBAD;
-  julong x = bad;
+  constexpr uint64_t bad = 0xBAD;
+  uint64_t x = bad;
 
   fill_file(test_file, "foo ");
-  bool is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  bool is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_FALSE(is_ok) << "Value is missing in key/value case, expecting false";
   EXPECT_EQ(bad, x) << "x must be unchanged";
 
   x = bad;
   fill_file(test_file, "faulty_start foo 101");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_FALSE(is_ok) << "key must be at the start";
   EXPECT_EQ(bad, x) << "x must be unchanged";
 
   x = bad;
   fill_file(test_file, nullptr);
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_FALSE(is_ok) << "key not in empty file";
   EXPECT_EQ(bad, x) << "x must be unchanged";
 
   x = bad;
   fill_file(test_file, "foo\n");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_FALSE(is_ok) << "key must have a value";
   EXPECT_EQ(bad, x) << "x must be unchanged";
 
   x = bad;
   fill_file(test_file, "foof 1002");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_FALSE(is_ok) << "key must be exact match";
   EXPECT_EQ(bad, x) << "x must be unchanged";
 
@@ -150,43 +150,43 @@ TEST(cgroupTest, read_numerical_key_value_success_cases) {
   const char* base_with_slash = path.as_string(true);
 
   TestController* controller = new TestController((char*)os::get_temp_directory());
-  constexpr julong bad = 0xBAD;
-  julong x = bad;
+  constexpr uint64_t bad = 0xBAD;
+  uint64_t x = bad;
 
   fill_file(test_file, "foo 100");
-  bool is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  bool is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_TRUE(is_ok);
-  EXPECT_EQ((julong)100, x);
+  EXPECT_EQ((uint64_t)100, x);
 
   x = bad;
   fill_file(test_file, "foo\t111");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_TRUE(is_ok);
-  EXPECT_EQ((julong)111, x);
+  EXPECT_EQ((uint64_t)111, x);
 
   x = bad;
   fill_file(test_file, "foo\nbar 333\nfoo\t111");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_TRUE(is_ok);
-  EXPECT_EQ((julong)111, x);
+  EXPECT_EQ((uint64_t)111, x);
 
   x = bad;
   fill_file(test_file, "foof 100\nfoo 133");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_TRUE(is_ok);
-  EXPECT_EQ((julong)133, x);
+  EXPECT_EQ((uint64_t)133, x);
 
   x = bad;
   fill_file(test_file, "foo\t333\nfoot 999");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_TRUE(is_ok);
-  EXPECT_EQ((julong)333, x);
+  EXPECT_EQ((uint64_t)333, x);
 
   x = bad;
   fill_file(test_file, "foo 1\nfoo car");
-  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", &x);
+  is_ok = controller->read_numerical_key_value(base_with_slash, "foo", x);
   EXPECT_TRUE(is_ok);
-  EXPECT_EQ((julong)1, x);
+  EXPECT_EQ((uint64_t)1, x);
 
   // Cleanup
   delete_file(test_file);
@@ -195,10 +195,10 @@ TEST(cgroupTest, read_numerical_key_value_success_cases) {
 TEST(cgroupTest, read_number_null) {
   TestController* null_path_controller = new TestController((char*)nullptr);
   const char* test_file_path = "/not-used";
-  constexpr julong bad = 0xBAD;
-  julong a = bad;
+  constexpr uint64_t bad = 0xBAD;
+  uint64_t a = bad;
   // null subsystem_path() case
-  bool is_ok = null_path_controller->read_number(test_file_path, &a);
+  bool is_ok = null_path_controller->read_number(test_file_path, a);
   EXPECT_FALSE(is_ok) << "Null subsystem path should be an error";
   EXPECT_EQ(bad, a) << "Expected untouched scan value";
 }
@@ -221,9 +221,9 @@ TEST(cgroupTest, read_string_beyond_max_path) {
 TEST(cgroupTest, read_number_file_not_exist) {
   TestController* unknown_path_ctrl = new TestController((char*)"/do/not/exist");
   const char* test_file_path = "/file-not-found";
-  constexpr julong bad = 0xBAD;
-  julong result = bad;
-  bool is_ok = unknown_path_ctrl->read_number(test_file_path, &result);
+  constexpr uint64_t bad = 0xBAD;
+  uint64_t result = bad;
+  bool is_ok = unknown_path_ctrl->read_number(test_file_path, result);
   EXPECT_FALSE(is_ok) << "File not found should be an error";
   EXPECT_EQ(bad, result) << "Expected untouched scan value";
 }
@@ -232,10 +232,10 @@ TEST(cgroupTest, read_numerical_key_value_null) {
   TestController* null_path_controller = new TestController((char*)nullptr);
   const char* test_file_path = "/not-used";
   const char* key = "something";
-  constexpr julong bad = 0xBAD;
-  julong a = bad;
+  constexpr uint64_t bad = 0xBAD;
+  uint64_t a = bad;
   // null subsystem_path() case
-  bool is_ok = null_path_controller->read_numerical_key_value(test_file_path, key, &a);
+  bool is_ok = null_path_controller->read_numerical_key_value(test_file_path, key, a);
   EXPECT_FALSE(is_ok) << "Null subsystem path should be an error";
   EXPECT_EQ(bad, a) << "Expected untouched scan value";
 }
@@ -243,7 +243,7 @@ TEST(cgroupTest, read_numerical_key_value_null) {
 TEST(cgroupTest, read_number_tests) {
   char* test_file = temp_file("cgroups");
   const char* b = basename(test_file);
-  constexpr julong bad = 0xBAD;
+  constexpr uint64_t bad = 0xBAD;
   EXPECT_TRUE(b != nullptr) << "basename was null";
   stringStream path;
   path.print_raw(os::file_separator());
@@ -252,44 +252,49 @@ TEST(cgroupTest, read_number_tests) {
   fill_file(test_file, "8888");
 
   TestController* controller = new TestController((char*)os::get_temp_directory());
-  julong foo = bad;
-  bool ok = controller->read_number(base_with_slash, &foo);
+  uint64_t foo = bad;
+  bool ok = controller->read_number(base_with_slash, foo);
   EXPECT_TRUE(ok) << "Number parsing should have been successful";
-  EXPECT_EQ((julong)8888, foo) << "Wrong value for 'foo' (NOTE: 0xBAD == " << 0xBAD << ")";
+  EXPECT_EQ((uint64_t)8888, foo) << "Wrong value for 'foo' (NOTE: 0xBAD == " << 0xBAD << ")";
 
   // Some interface files might have negative values, ensure we can read
-  // them and manually cast them as needed.
+  // them and manually cast them as needed. For example, on cgv1, the cpu.cfs_quota_us
+  // file might be set to -1 to indicate no cpu quota setup.
   fill_file(test_file, "-1");
   foo = bad;
-  ok = controller->read_number(base_with_slash, &foo);
+  ok = controller->read_number(base_with_slash, foo);
   EXPECT_TRUE(ok) << "Number parsing should have been successful";
-  EXPECT_EQ((jlong)-1, (jlong)foo) << "Wrong value for 'foo' (NOTE: 0xBAD == " << 0xBAD << ")";
+  EXPECT_EQ((int)-1, (int)foo) << "Wrong value for 'foo' (NOTE: 0xBAD == " << 0xBAD << ")";
 
   foo = bad;
   fill_file(test_file, nullptr);
-  ok = controller->read_number(base_with_slash, &foo);
+  ok = controller->read_number(base_with_slash, foo);
   EXPECT_FALSE(ok) << "Empty file should have failed";
   EXPECT_EQ(bad, foo) << "foo was altered";
 
   // Some interface files have numbers as well as the string
   // 'max', which means unlimited.
-  jlong result = -10;
+  uint64_t result = 0;
+  uint64_t unlimited = std::numeric_limits<uint64_t>::max();
   fill_file(test_file, "max\n");
-  ok = controller->read_number_handle_max(base_with_slash, &result);
+  ok = controller->read_number_handle_max(base_with_slash, result);
   EXPECT_TRUE(ok) << "Number parsing for 'max' string should have been successful";
-  EXPECT_EQ((jlong)-1, result) << "'max' means unlimited (-1)";
+  EXPECT_EQ(unlimited, result) << "'max' means unlimited (-1)";
 
-  result = -10;
+  result = 0;
   fill_file(test_file, "11114\n");
-  ok = controller->read_number_handle_max(base_with_slash, &result);
+  ok = controller->read_number_handle_max(base_with_slash, result);
   EXPECT_TRUE(ok) << "Number parsing for should have been successful";
-  EXPECT_EQ((jlong)11114, result) << "Incorrect result";
+  EXPECT_EQ((uint64_t)11114, result) << "Incorrect result";
 
-  result = -10;
+  result = 0;
+  // This is a contrived test case not matching cgroup interface files
+  // in the wild where numbers are positive. The value is deliberately
+  // negative. Yet it should work
   fill_file(test_file, "-51114\n");
-  ok = controller->read_number_handle_max(base_with_slash, &result);
+  ok = controller->read_number_handle_max(base_with_slash, result);
   EXPECT_TRUE(ok) << "Number parsing for should have been successful";
-  EXPECT_EQ((jlong)-51114, result) << "Incorrect result";
+  EXPECT_EQ((int)-51114, (int)result) << "Incorrect result";
 
   delete_file(test_file);
 }
@@ -372,28 +377,28 @@ TEST(cgroupTest, read_number_tuple_test) {
   fill_file(test_file, "max 10000");
 
   TestController* controller = new TestController((char*)os::get_temp_directory());
-  jlong result = -10;
-  bool ok = controller->read_numerical_tuple_value(base_with_slash, true /* use_first */, &result);
+  uint64_t result = 0;
+  bool ok = controller->read_numerical_tuple_value(base_with_slash, true /* use_first */, result);
   EXPECT_TRUE(ok) << "Should be OK to read value";
-  EXPECT_EQ((jlong)-1, result) << "max should be unlimited (-1)";
+  EXPECT_EQ(value_unlimited, result) << "max should be unlimited (-1)";
 
-  result = -10;
-  ok = controller->read_numerical_tuple_value(base_with_slash, false /* use_first */, &result);
+  result = 0;
+  ok = controller->read_numerical_tuple_value(base_with_slash, false /* use_first */, result);
   EXPECT_TRUE(ok) << "Should be OK to read the value";
-  EXPECT_EQ((jlong)10000, result);
+  EXPECT_EQ((uint64_t)10000, result);
 
   // non-max strings
   fill_file(test_file, "abc 10000");
-  result = -10;
-  ok = controller->read_numerical_tuple_value(base_with_slash, true /* use_first */, &result);
+  result = 0;
+  ok = controller->read_numerical_tuple_value(base_with_slash, true /* use_first */, result);
   EXPECT_FALSE(ok) << "abc should not be parsable";
-  EXPECT_EQ((jlong)-10, result) << "result value should be unchanged";
+  EXPECT_EQ((uint64_t)0, result) << "result value should be unchanged";
 
   fill_file(test_file, nullptr);
-  result = -10;
-  ok = controller->read_numerical_tuple_value(base_with_slash, true /* use_first */, &result);
+  result = 0;
+  ok = controller->read_numerical_tuple_value(base_with_slash, true /* use_first */, result);
   EXPECT_FALSE(ok) << "Empty file should be an error";
-  EXPECT_EQ((jlong)-10, result) << "result value should be unchanged";
+  EXPECT_EQ((uint64_t)0, result) << "result value should be unchanged";
 
   delete_file(test_file);
 }
@@ -407,20 +412,20 @@ TEST(cgroupTest, read_numerical_key_beyond_max_path) {
   TestController* too_large_path_controller = new TestController(larger_than_max);
   const char* test_file_path = "/file-not-found";
   const char* key = "something";
-  julong a = 0xBAD;
-  bool is_ok = too_large_path_controller->read_numerical_key_value(test_file_path, key, &a);
+  uint64_t a = 0xBAD;
+  bool is_ok = too_large_path_controller->read_numerical_key_value(test_file_path, key, a);
   EXPECT_FALSE(is_ok) << "Too long path should be an error";
-  EXPECT_EQ((julong)0xBAD, a) << "Expected untouched scan value";
+  EXPECT_EQ((uint64_t)0xBAD, a) << "Expected untouched scan value";
 }
 
 TEST(cgroupTest, read_numerical_key_file_not_exist) {
   TestController* unknown_path_ctrl = new TestController((char*)"/do/not/exist");
   const char* test_file_path = "/file-not-found";
   const char* key = "something";
-  julong a = 0xBAD;
-  bool is_ok = unknown_path_ctrl->read_numerical_key_value(test_file_path, key, &a);
+  uint64_t a = 0xBAD;
+  bool is_ok = unknown_path_ctrl->read_numerical_key_value(test_file_path, key, a);
   EXPECT_FALSE(is_ok) << "File not found should be an error";
-  EXPECT_EQ((julong)0xBAD, a) << "Expected untouched scan value";
+  EXPECT_EQ((uint64_t)0xBAD, a) << "Expected untouched scan value";
 }
 
 TEST(cgroupTest, set_cgroupv1_subsystem_path) {

From 3a2845f334a59670d54699919073f0e908c038c4 Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <fandreuzzi@openjdk.org>
Date: Tue, 18 Nov 2025 09:43:28 +0000
Subject: [PATCH 221/512] 8037914: Add JFR event for string deduplication

Reviewed-by: ayang, egahlin
---
 .../stringdedup/stringDedupProcessor.cpp      |   8 +-
 .../gc/shared/stringdedup/stringDedupStat.cpp |  50 ++++-
 .../gc/shared/stringdedup/stringDedupStat.hpp |   3 +-
 .../shared/stringdedup/stringDedupTable.cpp   |   4 +
 src/hotspot/share/jfr/metadata/metadata.xml   |  20 +-
 src/jdk.jfr/share/conf/jfr/default.jfc        |   5 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |   5 +
 .../TestStringDeduplicationEvent.java         | 172 ++++++++++++++++++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   1 +
 9 files changed, 251 insertions(+), 17 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java

diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
index 8bf6f4e539a..b8a27f31d01 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
@@ -198,10 +198,8 @@ void StringDedup::Processor::run(JavaThread* thread) {
 void StringDedup::Processor::log_statistics() {
   _total_stat.add(&_cur_stat);
   Stat::log_summary(&_cur_stat, &_total_stat);
-  if (log_is_enabled(Debug, stringdedup)) {
-    _cur_stat.log_statistics(false);
-    _total_stat.log_statistics(true);
-    Table::log_statistics();
-  }
+  _cur_stat.emit_statistics(false /* total */);
+  _total_stat.emit_statistics(true /* total */);
+  Table::log_statistics();
   _cur_stat = Stat{};
 }
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp
index 28e5e9adf20..245a0ab20e9 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "gc/shared/stringdedup/stringDedupStat.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -91,13 +92,6 @@ static double strdedup_elapsed_param_ms(Tickspan t) {
 }
 
 void StringDedup::Stat::log_summary(const Stat* last_stat, const Stat* total_stat) {
-  double total_deduped_bytes_percent = 0.0;
-
-  if (total_stat->_new_bytes > 0) {
-    // Avoid division by zero
-    total_deduped_bytes_percent = percent_of(total_stat->_deduped_bytes, total_stat->_new_bytes);
-  }
-
   log_info(stringdedup)(
     "Concurrent String Deduplication "
     "%zu/" STRDEDUP_BYTES_FORMAT_NS " (new), "
@@ -106,7 +100,7 @@ void StringDedup::Stat::log_summary(const Stat* last_stat, const Stat* total_sta
     STRDEDUP_ELAPSED_FORMAT_MS " of " STRDEDUP_ELAPSED_FORMAT_MS,
     last_stat->_new, STRDEDUP_BYTES_PARAM(last_stat->_new_bytes),
     last_stat->_deduped, STRDEDUP_BYTES_PARAM(last_stat->_deduped_bytes),
-    total_deduped_bytes_percent,
+    percent_of(total_stat->_deduped_bytes, total_stat->_new_bytes),
     strdedup_elapsed_param_ms(last_stat->_process_elapsed),
     strdedup_elapsed_param_ms(last_stat->_active_elapsed));
 }
@@ -208,7 +202,7 @@ void StringDedup::Stat::log_times(const char* prefix) const {
   }
 }
 
-void StringDedup::Stat::log_statistics(bool total) const {
+void StringDedup::Stat::log_statistics() const {
   double known_percent               = percent_of(_known, _inspected);
   double known_shared_percent        = percent_of(_known_shared, _inspected);
   double new_percent                 = percent_of(_new, _inspected);
@@ -216,7 +210,6 @@ void StringDedup::Stat::log_statistics(bool total) const {
   double deduped_bytes_percent       = percent_of(_deduped_bytes, _new_bytes);
   double replaced_percent            = percent_of(_replaced, _new);
   double deleted_percent             = percent_of(_deleted, _new);
-  log_times(total ? "Total" : "Last");
   log_debug(stringdedup)("    Inspected:    %12zu", _inspected);
   log_debug(stringdedup)("      Known:      %12zu(%5.1f%%)", _known, known_percent);
   log_debug(stringdedup)("      Shared:     %12zu(%5.1f%%)", _known_shared, known_shared_percent);
@@ -229,3 +222,40 @@ void StringDedup::Stat::log_statistics(bool total) const {
   log_debug(stringdedup)("    Skipped: %zu (dead), %zu (incomplete), %zu (shared)",
                          _skipped_dead, _skipped_incomplete, _skipped_shared);
 }
+
+void StringDedup::Stat::emit_statistics(bool total) const {
+  if (log_is_enabled(Debug, stringdedup)) {
+    log_times(total ? "Total" : "Last");
+    log_statistics();
+  }
+
+  if (total) {
+    // Send only JFR events about the last stats
+    return;
+  }
+
+  EventStringDeduplication e;
+  if (e.should_commit()) {
+    e.set_starttime(_active_start);
+    Ticks active_end = _active_start;
+    active_end += _active_elapsed;
+    e.set_endtime(active_end);
+
+    e.set_inspected(_inspected);
+    e.set_known(_known);
+    e.set_shared(_known_shared);
+    e.set_newStrings(_new);
+    e.set_newSize(_new_bytes);
+    e.set_replaced(_replaced);
+    e.set_deleted(_deleted);
+    e.set_deduplicated(_deduped);
+    e.set_deduplicatedSize(_deduped_bytes);
+    e.set_skippedDead(_skipped_dead);
+    e.set_skippedIncomplete(_skipped_incomplete);
+    e.set_skippedShared(_skipped_shared);
+    e.set_processing(_process_elapsed);
+    e.set_tableResize(_resize_table_elapsed);
+    e.set_tableCleanup(_cleanup_table_elapsed);
+    e.commit();
+  }
+}
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
index db753af3be5..fb864ab34ab 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
@@ -71,6 +71,7 @@ private:
   void report_phase_end(const char* phase, Tickspan* elapsed);
 
   void log_times(const char* prefix) const;
+  void log_statistics() const;
 
 public:
   Stat();
@@ -148,7 +149,7 @@ public:
   void report_active_end();
 
   void add(const Stat* const stat);
-  void log_statistics(bool total) const;
+  void emit_statistics(bool total) const;
 
   static void log_summary(const Stat* last_stat, const Stat* total_stat);
 };
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
index 6682993766d..a376f3b96de 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
@@ -730,6 +730,10 @@ void StringDedup::Table::verify() {
 }
 
 void StringDedup::Table::log_statistics() {
+  if (!log_is_enabled(Debug, stringdedup)) {
+    return;
+  }
+
   size_t dead_count;
   int dead_state;
   {
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 6d43123ae87..eaafef37306 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1283,7 +1283,25 @@
     <Field type="ulong" name="regionsImmediate" label="Regions Immediate" />
     <Field type="ulong" contentType="bytes" name="immediateBytes" label="Immediate Bytes" />
   </Event>
-  
+
+  <Event name="StringDeduplication" category="Java Virtual Machine, GC, Detailed" label="String Deduplication Statistics" stackTrace="false">
+    <Field type="ulong" name="inspected" label="Inspected" />
+    <Field type="ulong" name="known" label="Known" />
+    <Field type="ulong" name="shared" label="Shared" />
+    <Field type="ulong" name="newStrings" label="New Strings" />
+    <Field type="ulong" name="newSize" contentType="bytes" label="New Size" />
+    <Field type="ulong" name="replaced" label="Replaced" />
+    <Field type="ulong" name="deleted" label="Deleted" />
+    <Field type="ulong" name="deduplicated" label="Deduplicated" />
+    <Field type="ulong" name="deduplicatedSize" contentType="bytes" label="Deduplicated Size" />
+    <Field type="ulong" name="skippedDead" label="Skipped Dead" />
+    <Field type="ulong" name="skippedIncomplete" label="Skipped Incomplete" />
+    <Field type="ulong" name="skippedShared" label="Skipped Shared" />
+    <Field type="Tickspan" name="processing" label="Processing" />
+    <Field type="Tickspan" name="tableResize" label="Table Resize" />
+    <Field type="Tickspan" name="tableCleanup" label="Table Cleanup" />
+  </Event>
+
   <Event name="Flush" category="Flight Recorder" label="Flush" thread="false" experimental="true">
     <Field type="ulong" name="flushId" label="Flush Identifier" relation="FlushId" />
     <Field type="ulong" name="elements" label="Elements Written" />
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index e4dc3315d2b..554e09261d6 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -491,6 +491,11 @@
       <setting name="enabled" control="gc-enabled-normal">true</setting>
     </event>
 
+    <event name="jdk.StringDeduplication">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
     <event name="jdk.PromotionFailed">
       <setting name="enabled" control="gc-enabled-normal">true</setting>
     </event>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 619d7d90a53..108886fb18d 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -491,6 +491,11 @@
       <setting name="enabled" control="gc-enabled-normal">true</setting>
     </event>
 
+    <event name="jdk.StringDeduplication">
+      <setting name="enabled" control="gc-enabled-normal">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
     <event name="jdk.PromotionFailed">
       <setting name="enabled" control="gc-enabled-normal">true</setting>
     </event>
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java
new file mode 100644
index 00000000000..3221e76b4d2
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jfr.event.gc.detailed;
+
+import java.lang.reflect.Field;
+import java.lang.management.ManagementFactory;
+import java.lang.management.GarbageCollectorMXBean;
+import java.util.List;
+import java.util.ArrayList;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.whitebox.WhiteBox;
+
+/**
+ * @test id=Serial
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @requires vm.gc.Serial
+ * @library /test/lib /test/jdk
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. --add-opens=java.base/java.lang=ALL-UNNAMED
+ *                                       -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                                       -ea
+ *                                       -XX:+UseSerialGC
+ *                                       -XX:+UseStringDeduplication
+ *                                       -XX:StringDeduplicationAgeThreshold=1
+ *                                       -Xlog:stringdedup*=debug
+ *                                       jdk.jfr.event.gc.detailed.TestStringDeduplicationEvent
+ */
+
+/**
+ * @test id=Parallel
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @requires vm.gc.Parallel
+ * @library /test/lib /test/jdk
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. --add-opens=java.base/java.lang=ALL-UNNAMED
+ *                                       -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                                       -ea
+ *                                       -XX:+UseParallelGC
+ *                                       -XX:+UseStringDeduplication
+ *                                       -XX:StringDeduplicationAgeThreshold=1
+ *                                       -Xlog:stringdedup*=debug
+ *                                       jdk.jfr.event.gc.detailed.TestStringDeduplicationEvent
+ */
+
+/**
+ * @test id=G1
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @requires vm.gc.G1
+ * @library /test/lib /test/jdk
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. --add-opens=java.base/java.lang=ALL-UNNAMED
+ *                                       -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                                       -ea
+ *                                       -XX:+UseG1GC
+ *                                       -XX:+UseStringDeduplication
+ *                                       -XX:StringDeduplicationAgeThreshold=1
+ *                                       -Xlog:stringdedup*=debug
+ *                                       jdk.jfr.event.gc.detailed.TestStringDeduplicationEvent
+ */
+
+/**
+ * @test id=Z
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @requires vm.gc.Z
+ * @library /test/lib /test/jdk
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. --add-opens=java.base/java.lang=ALL-UNNAMED
+ *                                       -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                                       -ea
+ *                                       -XX:+UseZGC
+ *                                       -XX:+UseStringDeduplication
+ *                                       -XX:StringDeduplicationAgeThreshold=1
+ *                                       -Xlog:stringdedup*=debug
+ *                                       jdk.jfr.event.gc.detailed.TestStringDeduplicationEvent
+ */
+
+/**
+ * @test id=Shenandoah
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @requires vm.gc.Shenandoah
+ * @library /test/lib /test/jdk
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. --add-opens=java.base/java.lang=ALL-UNNAMED
+ *                                       -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                                       -ea
+ *                                       -XX:+UseShenandoahGC
+ *                                       -XX:+UseStringDeduplication
+ *                                       -XX:StringDeduplicationAgeThreshold=1
+ *                                       -Xlog:stringdedup*=debug
+ *                                       jdk.jfr.event.gc.detailed.TestStringDeduplicationEvent
+ */
+
+public class TestStringDeduplicationEvent {
+    private static Field valueField;
+
+    static {
+        try {
+            valueField = String.class.getDeclaredField("value");
+            valueField.setAccessible(true);
+        } catch (Exception exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        boolean zgc = isZgc();
+
+        try (RecordingStream recording = new RecordingStream()) {
+            recording.enable(EventNames.StringDeduplication);
+            recording.onEvent(EventNames.StringDeduplication, e -> recording.close());
+            recording.startAsync();
+
+            String base = TestStringDeduplicationEvent.class.getSimpleName();
+            String duplicate = new StringBuilder(base).toString();
+            assert(getValue(base) != getValue(duplicate));
+
+            if (zgc) {
+                // ZGC only triggers string deduplications from major collections
+                WhiteBox.getWhiteBox().fullGC();
+            } else {
+                WhiteBox.getWhiteBox().youngGC();
+            }
+
+            recording.awaitTermination();
+        }
+    }
+
+    private static Object getValue(String string) {
+        try {
+            return valueField.get(string);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static boolean isZgc() {
+        List<GarbageCollectorMXBean> gcs = ManagementFactory.getGarbageCollectorMXBeans();
+        return gcs.getFirst().getName().contains("ZGC");
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index e53b242097e..8b0113f75f4 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -160,6 +160,7 @@ public class EventNames {
     public static final String ZUncommit = PREFIX + "ZUncommit";
     public static final String SystemGC = PREFIX + "SystemGC";
     public static final String GCCPUTime = PREFIX + "GCCPUTime";
+    public static final String StringDeduplication = PREFIX + "StringDeduplication";
 
     // Compiler
     public static final String Compilation = PREFIX + "Compilation";

From 28d94d6ab4994b844af98c5c227b40b5fb8a72e5 Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jnorlinder@openjdk.org>
Date: Tue, 18 Nov 2025 10:08:17 +0000
Subject: [PATCH 222/512] 8372008: TestGetTotalGcCpuTime test failures on
 Windows (Some GC CPU time must have been reported)

Reviewed-by: kevinw, alanb, cjplummer, dholmes
---
 .../MemoryMXBean/TestGetTotalGcCpuTime.java         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java b/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java
index d8a760027a7..464218d1e15 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/TestGetTotalGcCpuTime.java
@@ -78,12 +78,15 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 import java.lang.management.ThreadMXBean;
+import java.util.ArrayList;
 
 public class TestGetTotalGcCpuTime {
     static final ThreadMXBean mxThreadBean = ManagementFactory.getThreadMXBean();
     static final MemoryMXBean mxMemoryBean = ManagementFactory.getMemoryMXBean();
     static final boolean usingEpsilonGC = ManagementFactory.getRuntimeMXBean().getInputArguments().stream().anyMatch(p -> p.contains("-XX:+UseEpsilonGC"));
 
+    private static ArrayList<Object> objs = null;
+
     public static void main(String[] args) throws Exception {
         try {
             if (!mxThreadBean.isThreadCpuTimeEnabled()) {
@@ -96,7 +99,15 @@ public class TestGetTotalGcCpuTime {
             return;
         }
 
-        System.gc();
+        // Add some tracing work to ensure OSs with slower update rates would report usage
+        for (int i = 0; i < 200; i++) {
+            objs = new ArrayList<Object>();
+            for (int j = 0; j < 5000; j++) {
+                objs.add(new Object());
+            }
+            System.gc();
+        }
+
         long gcCpuTimeFromThread = mxMemoryBean.getTotalGcCpuTime();
 
         if (usingEpsilonGC) {

From df5b105bbb55d9cc923ac45ff99e702126626670 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Tue, 18 Nov 2025 11:57:58 +0000
Subject: [PATCH 223/512] 8371698: ZGC: Call GTEST_SKIP when OS is unsupported

Reviewed-by: aboldtch, jsikstro, mdoerr
---
 test/hotspot/gtest/gc/z/test_zForwarding.cpp           | 10 ----------
 test/hotspot/gtest/gc/z/test_zMapper_windows.cpp       | 10 ----------
 test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp | 10 ----------
 test/hotspot/gtest/gc/z/zunittest.hpp                  | 10 +++++++++-
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index 3a69ff3cbb7..5275b78fb82 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -51,11 +51,6 @@ public:
   zoffset           _page_offset;
 
   virtual void SetUp() {
-    // Only run test on supported Windows versions
-    if (!is_os_supported()) {
-      GTEST_SKIP() << "OS not supported";
-    }
-
     _old_heap = ZHeap::_heap;
     ZHeap::_heap = (ZHeap*)os::malloc(sizeof(ZHeap), mtTest);
 
@@ -83,11 +78,6 @@ public:
   }
 
   virtual void TearDown() {
-    if (!is_os_supported()) {
-      // Test skipped, nothing to cleanup
-      return;
-    }
-
     os::free(ZHeap::_heap);
     ZHeap::_heap = _old_heap;
     ZGeneration::_old = _old_old;
diff --git a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
index 1789d2e3b43..95e6317dfd8 100644
--- a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
+++ b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
@@ -42,11 +42,6 @@ private:
 
 public:
   virtual void SetUp() {
-    // Only run test on supported Windows versions
-    if (!is_os_supported()) {
-      GTEST_SKIP() << "OS not supported";
-    }
-
     _zaddress_reserver.SetUp(ReservationSize);
     _reserver = _zaddress_reserver.reserver();
     _registry = _zaddress_reserver.registry();
@@ -58,11 +53,6 @@ public:
   }
 
   virtual void TearDown() {
-    if (!is_os_supported()) {
-      // Test skipped, nothing to cleanup
-      return;
-    }
-
     // Best-effort cleanup
     _registry = nullptr;
     _reserver = nullptr;
diff --git a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
index 2b6fbc198ca..7c41dde04cb 100644
--- a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
+++ b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
@@ -62,11 +62,6 @@ private:
 
 public:
   virtual void SetUp() {
-    // Only run test on supported Windows versions
-    if (!is_os_supported()) {
-      GTEST_SKIP() << "OS not supported";
-    }
-
     _zaddress_reserver.SetUp(ReservationSize);
     _reserver = _zaddress_reserver.reserver();
     _registry = _zaddress_reserver.registry();
@@ -78,11 +73,6 @@ public:
   }
 
   virtual void TearDown() {
-    if (!is_os_supported()) {
-      // Test skipped, nothing to cleanup
-      return;
-    }
-
     _registry = nullptr;
     _reserver = nullptr;
     _zaddress_reserver.TearDown();
diff --git a/test/hotspot/gtest/gc/z/zunittest.hpp b/test/hotspot/gtest/gc/z/zunittest.hpp
index a4586d51a0e..2464f821380 100644
--- a/test/hotspot/gtest/gc/z/zunittest.hpp
+++ b/test/hotspot/gtest/gc/z/zunittest.hpp
@@ -76,7 +76,6 @@ public:
       }
 
       void SetUp(size_t reservation_size) {
-        GTEST_EXPECT_TRUE(ZArguments::is_os_supported()) << "Should not use SetUp on unsupported systems";
         GTEST_EXPECT_FALSE(_active) << "SetUp called twice without a TearDown";
         _active = true;
 
@@ -109,12 +108,21 @@ private:
   ZAddressOffsetMaxSetter _zaddress_offset_max_setter;
   unsigned int _rand_seed;
 
+  void skip_all_tests() {
+    // Skipping from the constructor currently works, but according to the
+    // documentation the GTEST_SKIP macro should be used from the test or
+    // from the SetUp function. If this start to fail down the road, then
+    // we'll have to explicitly call this for each inheriting gtest.
+    GTEST_SKIP() << "OS not supported";
+  }
+
 protected:
   ZTest()
     : _zaddress_offset_max_setter(ZAddressOffsetMax),
       _rand_seed(static_cast<unsigned int>(::testing::UnitTest::GetInstance()->random_seed())) {
     if (!is_os_supported()) {
       // If the OS does not support ZGC do not run initialization, as it may crash the VM.
+      skip_all_tests();
       return;
     }
 

From f94644999766e752f7d60ce52c14a7db79005035 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 18 Nov 2025 12:20:23 +0000
Subject: [PATCH 224/512] 8366178: Implement JEP 526: Lazy Constants (Second
 Preview) 8371882: Improve documentation for JEP 526: Lazy Constants

Reviewed-by: jvernee, mcimadamore
---
 .../share/classes/java/lang/LazyConstant.java | 307 +++++++
 .../share/classes/java/lang/StableValue.java  | 756 ------------------
 .../classes/java/nio/charset/Charset.java     |   8 +-
 .../share/classes/java/util/Currency.java     |   4 +-
 .../java/util/ImmutableCollections.java       | 384 +--------
 .../classes/java/util/LazyCollections.java    | 584 ++++++++++++++
 .../share/classes/java/util/List.java         |  80 +-
 .../share/classes/java/util/Locale.java       |   8 +-
 .../classes/java/util/LocaleISOData.java      |  16 +-
 .../share/classes/java/util/Map.java          |  85 +-
 .../share/classes/java/util/Optional.java     |   6 +-
 .../classes/java/util/ResourceBundle.java     |   2 +-
 .../access/JavaUtilCollectionAccess.java      |   6 -
 .../internal/foreign/CaptureStateUtil.java    |  33 +-
 .../jdk/internal/io/JdkConsoleImpl.java       |  40 +-
 .../jdk/internal/javac/PreviewFeature.java    |   4 +-
 .../jdk/internal/lang/LazyConstantImpl.java   | 173 ++++
 .../lang/stable/StableEnumFunction.java       | 118 ---
 .../internal/lang/stable/StableFunction.java  |  83 --
 .../lang/stable/StableIntFunction.java        |  80 --
 .../internal/lang/stable/StableSupplier.java  |  69 --
 .../jdk/internal/lang/stable/StableUtil.java  | 105 ---
 .../internal/lang/stable/StableValueImpl.java | 218 -----
 .../share/classes/sun/nio/ch/Net.java         |   7 +-
 .../classes/sun/util/locale/BaseLocale.java   |   4 +-
 .../BreakIteratorResourceBundle.java          |   2 +-
 .../resources/OpenListResourceBundle.java     |   4 +-
 .../DemoContainerInjectionTest.java           | 153 ++++
 .../lang/LazyConstant/DemoImperativeTest.java |  83 ++
 .../java/lang/LazyConstant/DemoMapTest.java   | 119 +++
 .../LazyConstantSafePublicationTest.java}     |  71 +-
 .../lang/LazyConstant/LazyConstantTest.java   | 236 ++++++
 .../LazyConstantTestUtil.java}                |  58 +-
 .../LazyListTest.java}                        | 248 ++----
 .../java/lang/LazyConstant/LazyMapTest.java   | 573 +++++++++++++
 .../TrustedFieldTypeTest.java                 |  63 +-
 .../lang/StableValue/StableFunctionTest.java  | 250 ------
 .../StableValue/StableIntFunctionTest.java    | 109 ---
 .../java/lang/StableValue/StableMapTest.java  | 388 ---------
 .../lang/StableValue/StableSupplierTest.java  | 104 ---
 .../StableValue/StableValueFactoriesTest.java |  43 -
 .../lang/StableValue/StableValueTest.java     | 389 ---------
 test/jdk/java/util/Collection/MOAT.java       |  28 +-
 .../jdk/jshell/CompletionSuggestionTest.java  |   2 +-
 ...enchmark.java => StableListBenchmark.java} |  12 +-
 ...rk.java => StableListSingleBenchmark.java} |  12 +-
 ...Benchmark.java => StableMapBenchmark.java} |  14 +-
 ...ark.java => StableMapSingleBenchmark.java} |  33 +-
 .../stable/StableMethodHandleBenchmark.java   |  16 +-
 .../lang/stable/StableSupplierBenchmark.java  |  35 +-
 .../lang/stable/StableValueBenchmark.java     |  84 +-
 .../lang/stable/VarHandleHolderBenchmark.java |  11 +-
 52 files changed, 2784 insertions(+), 3536 deletions(-)
 create mode 100644 src/java.base/share/classes/java/lang/LazyConstant.java
 delete mode 100644 src/java.base/share/classes/java/lang/StableValue.java
 create mode 100644 src/java.base/share/classes/java/util/LazyCollections.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/LazyConstantImpl.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
 create mode 100644 test/jdk/java/lang/LazyConstant/DemoContainerInjectionTest.java
 create mode 100644 test/jdk/java/lang/LazyConstant/DemoImperativeTest.java
 create mode 100644 test/jdk/java/lang/LazyConstant/DemoMapTest.java
 rename test/jdk/java/lang/{StableValue/StableValuesSafePublicationTest.java => LazyConstant/LazyConstantSafePublicationTest.java} (73%)
 create mode 100644 test/jdk/java/lang/LazyConstant/LazyConstantTest.java
 rename test/jdk/java/lang/{StableValue/StableTestUtil.java => LazyConstant/LazyConstantTestUtil.java} (64%)
 rename test/jdk/java/lang/{StableValue/StableListTest.java => LazyConstant/LazyListTest.java} (60%)
 create mode 100644 test/jdk/java/lang/LazyConstant/LazyMapTest.java
 rename test/jdk/java/lang/{StableValue => LazyConstant}/TrustedFieldTypeTest.java (61%)
 delete mode 100644 test/jdk/java/lang/StableValue/StableFunctionTest.java
 delete mode 100644 test/jdk/java/lang/StableValue/StableIntFunctionTest.java
 delete mode 100644 test/jdk/java/lang/StableValue/StableMapTest.java
 delete mode 100644 test/jdk/java/lang/StableValue/StableSupplierTest.java
 delete mode 100644 test/jdk/java/lang/StableValue/StableValueFactoriesTest.java
 delete mode 100644 test/jdk/java/lang/StableValue/StableValueTest.java
 rename test/micro/org/openjdk/bench/java/lang/stable/{StableIntFunctionBenchmark.java => StableListBenchmark.java} (86%)
 rename test/micro/org/openjdk/bench/java/lang/stable/{StableIntFunctionSingleBenchmark.java => StableListSingleBenchmark.java} (84%)
 rename test/micro/org/openjdk/bench/java/lang/stable/{StableFunctionBenchmark.java => StableMapBenchmark.java} (85%)
 rename test/micro/org/openjdk/bench/java/lang/stable/{StableFunctionSingleBenchmark.java => StableMapSingleBenchmark.java} (70%)

diff --git a/src/java.base/share/classes/java/lang/LazyConstant.java b/src/java.base/share/classes/java/lang/LazyConstant.java
new file mode 100644
index 00000000000..34f3d754a10
--- /dev/null
+++ b/src/java.base/share/classes/java/lang/LazyConstant.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import jdk.internal.javac.PreviewFeature;
+import jdk.internal.lang.LazyConstantImpl;
+
+import java.io.Serializable;
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.Supplier;
+
+/**
+ * A lazy constant is a holder of contents that can be set at most once.
+ * <p>
+ * A lazy constant is created using the factory method
+ * {@linkplain LazyConstant#of(Supplier) LazyConstant.of({@code <computing function>})}.
+ * When created, the lazy constant is <em>not initialized</em>, meaning it has no contents.
+ * The lazy constant (of type {@code T}) can then be <em>initialized</em>
+ * (and its contents retrieved) by calling {@linkplain #get() get()}. The first time
+ * {@linkplain #get() get()} is called, the underlying <em>computing function</em>
+ * (provided at construction) will be invoked and the result will be used to initialize
+ * the constant. Once a lazy constant is initialized, its contents can <em>never change</em>
+ * and will be retrieved over and over again upon subsequent {@linkplain #get() get()}
+ * invocations.
+ * <p>
+ * Consider the following example where a lazy constant field "{@code logger}" holds
+ * an object of type {@code Logger}:
+ *
+ * {@snippet lang = java:
+ * public class Component {
+ *
+ *    // Creates a new uninitialized lazy constant
+ *    private final LazyConstant<Logger> logger =
+ *            // @link substring="of" target="#of" :
+ *            LazyConstant.of( () -> Logger.create(Component.class) );
+ *
+ *    public void process() {
+ *        logger.get().info("Process started");
+ *        // ...
+ *    }
+ * }
+ *}
+ * <p>
+ * Initially, the lazy constant is <em>not initialized</em>. When {@code logger.get()}
+ * is first invoked, it evaluates the computing function and initializes the constant to
+ * the result; the result is then returned to the client. Hence, {@linkplain #get() get()}
+ * guarantees that the constant is <em>initialized</em> before it returns, barring
+ * any exceptions.
+ * <p>
+ * Furthermore, {@linkplain #get() get()} guarantees that, out of several threads trying to
+ * invoke the computing function simultaneously, {@linkplain ##thread-safety only one is
+ * ever selected} for computation. This property is crucial as evaluation of the computing
+ * function may have side effects, for example, the call above to {@code Logger.create()}
+ * may result in storage resources being prepared.
+ *
+ * <h2 id="exception-handling">Exception handling</h2>
+ * If the computing function returns {@code null}, a {@linkplain NullPointerException}
+ * is thrown. Hence, a lazy constant can never hold a {@code null} value. Clients who
+ * want to use a nullable constant can wrap the value into an {@linkplain Optional} holder.
+ * <p>
+ * If the computing function recursively invokes itself (directly or indirectly via
+ * the lazy constant), an {@linkplain IllegalStateException} is thrown, and the lazy
+ * constant is not initialized.
+ *
+ * <h2 id="composition">Composing lazy constants</h2>
+ * A lazy constant can depend on other lazy constants, forming a dependency graph
+ * that can be lazily computed but where access to individual elements can still be
+ * performant. In the following example, a single {@code Foo} and a {@code Bar}
+ * instance (that is dependent on the {@code Foo} instance) are lazily created, both of
+ * which are held by lazy constants:
+ *
+ * {@snippet lang = java:
+ * public final class DependencyUtil {
+ *
+ *     private DependencyUtil() {}
+ *
+ *     public static class Foo {
+ *          // ...
+ *      }
+ *
+ *     public static class Bar {
+ *         public Bar(Foo foo) {
+ *              // ...
+ *         }
+ *     }
+ *
+ *     private static final LazyConstant<Foo> FOO = LazyConstant.of( Foo::new );
+ *     private static final LazyConstant<Bar> BAR = LazyConstant.of( () -> new Bar(FOO.get()) );
+ *
+ *     public static Foo foo() {
+ *         return FOO.get();
+ *     }
+ *
+ *     public static Bar bar() {
+ *         return BAR.get();
+ *     }
+ *
+ * }
+ *}
+ * Calling {@code BAR.get()} will create the {@code Bar} singleton if it is not already
+ * created. Upon such a creation, a dependent {@code Foo} will first be created if
+ * the {@code Foo} does not already exist.
+ *
+ * <h2 id="thread-safety">Thread Safety</h2>
+ * A lazy constant is guaranteed to be initialized atomically and at most once. If
+ * competing threads are racing to initialize a lazy constant, only one updating thread
+ * runs the computing function (which runs on the caller's thread and is hereafter denoted
+ * <em>the computing thread</em>), while the other threads are blocked until the constant
+ * is initialized, after which the other threads observe the lazy constant is initialized
+ * and leave the constant unchanged and will never invoke any computation.
+ * <p>
+ * The invocation of the computing function and the resulting initialization of
+ * the constant {@linkplain java.util.concurrent##MemoryVisibility <em>happens-before</em>}
+ * the initialized constant's content is read. Hence, the initialized constant's content,
+ * including any {@code final} fields of any newly created objects, is safely published.
+ * <p>
+ * Thread interruption does not cancel the initialization of a lazy constant. In other
+ * words, if the computing thread is interrupted, {@code LazyConstant::get} doesn't clear
+ * the interrupted thread’s status, nor does it throw an {@linkplain InterruptedException}.
+ * <p>
+ * If the computing function blocks indefinitely, other threads operating on this
+ * lazy constant may block indefinitely; no timeouts or cancellations are provided.
+ *
+ * <h2 id="performance">Performance</h2>
+ * The contents of a lazy constant can never change after the lazy constant has been
+ * initialized. Therefore, a JVM implementation may, for an initialized lazy constant,
+ * elide all future reads of that lazy constant's contents and instead use the contents
+ * that has been previously observed. We call this optimization <em>constant folding</em>.
+ * This is only possible if there is a direct reference from a {@code static final} field
+ * to a lazy constant or if there is a chain from a {@code static final} field -- via one
+ * or more <em>trusted fields</em> (i.e., {@code static final} fields,
+ * {@linkplain Record record} fields, or final instance fields in hidden classes) --
+ * to a lazy constant.
+ *
+ * <h2 id="miscellaneous">Miscellaneous</h2>
+ * Except for {@linkplain Object#equals(Object) equals(obj)} and
+ * {@linkplain #orElse(Object) orElse(other)} parameters, all method parameters
+ * must be <em>non-null</em>, or a {@link NullPointerException} will be thrown.
+ *
+ * @apiNote Once a lazy constant is initialized, its contents cannot ever be removed.
+ *          This can be a source of an unintended memory leak. More specifically,
+ *          a lazy constant {@linkplain java.lang.ref##reachability strongly references}
+ *          it contents. Hence, the contents of a lazy constant will be reachable as long
+ *          as the lazy constant itself is reachable.
+ *          <p>
+ *          While it's possible to store an array inside a lazy constant, doing so will
+ *          not result in improved access performance of the array elements. Instead, a
+ *          {@linkplain List#ofLazy(int, IntFunction) lazy list} of arbitrary depth can
+ *          be used, which provides constant components.
+ *          <p>
+ *          The {@code LazyConstant} type is not {@link Serializable}.
+ *          <p>
+ *          Use in static initializers may interact with class initialization order;
+ *          cyclic initialization may result in initialization errors as described
+ *          in section {@jls 12.4} of <cite>The Java Language Specification</cite>.
+ *
+ * @implNote
+ *           A lazy constant is free to synchronize on itself. Hence, care must be
+ *           taken when directly or indirectly synchronizing on a lazy constant.
+ *           A lazy constant is unmodifiable but its contents may or may not be
+ *           immutable (e.g., it may hold an {@linkplain ArrayList}).
+ *
+ * @param <T> type of the constant
+ *
+ * @since 26
+ *
+ * @see Optional
+ * @see Supplier
+ * @see List#ofLazy(int, IntFunction)
+ * @see Map#ofLazy(Set, Function)
+ * @jls 12.4 Initialization of Classes and Interfaces
+ * @jls 17.4.5 Happens-before Order
+ */
+@PreviewFeature(feature = PreviewFeature.Feature.LAZY_CONSTANTS)
+public sealed interface LazyConstant<T>
+        extends Supplier<T>
+        permits LazyConstantImpl {
+
+    /**
+     * {@return the contents of this lazy constant if initialized, otherwise,
+     *          returns {@code other}}
+     * <p>
+     * This method never triggers initialization of this lazy constant and will observe
+     * initialization by other threads atomically (i.e., it returns the contents
+     * if and only if the initialization has already completed).
+     *
+     * @param other value to return if the content is not initialized
+     *              (can be {@code null})
+     */
+    T orElse(T other);
+
+    /**
+     * {@return the contents of this initialized constant. If not initialized, first
+     *          computes and initializes this constant using the computing function}
+     * <p>
+     * After this method returns successfully, the constant is guaranteed to be
+     * initialized.
+     * <p>
+     * If the computing function throws, the throwable is relayed to the caller and
+     * the lazy constant remains uninitialized; a subsequent call to get() may then
+     * attempt the computation again.
+     */
+    T get();
+
+    /**
+     * {@return {@code true} if the constant is initialized, {@code false} otherwise}
+     * <p>
+     * This method never triggers initialization of this lazy constant and will observe
+     * changes in the initialization state made by other threads atomically.
+     */
+    boolean isInitialized();
+
+    // Object methods
+
+    /**
+     * {@return if this lazy constant is the same as the provided {@code obj}}
+     * <p>
+     * In other words, equals compares the identity of this lazy constant and {@code obj}
+     * to determine equality. Hence, two lazy constants with the same contents are
+     * <em>not</em> equal.
+     * <p>
+     * This method never triggers initialization of this lazy constant.
+     */
+    @Override
+    boolean equals(Object obj);
+
+    /**
+     * {@return the {@linkplain System#identityHashCode(Object) identity hash code} for
+     *          this lazy constant}
+     *
+     * This method never triggers initialization of this lazy constant.
+     */
+    @Override
+    int hashCode();
+
+    /**
+     * {@return a string suitable for debugging}
+     * <p>
+     * This method never triggers initialization of this lazy constant and will observe
+     * initialization by other threads atomically (i.e., it observes the
+     * contents if and only if the initialization has already completed).
+     * <p>
+     * If this lazy constant is initialized, an implementation-dependent string
+     * containing the {@linkplain Object#toString()} of the
+     * contents will be returned; otherwise, an implementation-dependent string is
+     * returned that indicates this lazy constant is not yet initialized.
+     */
+    @Override
+    String toString();
+
+    // Factory
+
+    /**
+     * {@return a lazy constant whose contents is to be computed later via the provided
+     *          {@code computingFunction}}
+     * <p>
+     * The returned lazy constant strongly references the provided
+     * {@code computingFunction} at least until initialization completes successfully.
+     * <p>
+     * If the provided computing function is already an instance of
+     * {@code LazyConstant}, the method is free to return the provided computing function
+     * directly.
+     *
+     * @implNote  after initialization completes successfully, the computing function is
+     *            no longer strongly referenced and becomes eligible for
+     *            garbage collection.
+     *
+     * @param computingFunction in the form of a {@linkplain Supplier} to be used
+     *                          to initialize the constant
+     * @param <T>               type of the constant
+     *
+     */
+    @SuppressWarnings("unchecked")
+    static <T> LazyConstant<T> of(Supplier<? extends T> computingFunction) {
+        Objects.requireNonNull(computingFunction);
+        if (computingFunction instanceof LazyConstant<? extends T> lc) {
+            return (LazyConstant<T>) lc;
+        }
+        return LazyConstantImpl.ofLazy(computingFunction);
+    }
+
+}
diff --git a/src/java.base/share/classes/java/lang/StableValue.java b/src/java.base/share/classes/java/lang/StableValue.java
deleted file mode 100644
index 1815cb1a5b1..00000000000
--- a/src/java.base/share/classes/java/lang/StableValue.java
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
-import jdk.internal.lang.stable.StableEnumFunction;
-import jdk.internal.lang.stable.StableFunction;
-import jdk.internal.lang.stable.StableIntFunction;
-import jdk.internal.lang.stable.StableSupplier;
-import jdk.internal.lang.stable.StableUtil;
-import jdk.internal.lang.stable.StableValueImpl;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.RandomAccess;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.IntFunction;
-import java.util.function.Supplier;
-
-/**
- * A stable value is a holder of contents that can be set at most once.
- * <p>
- * A {@code StableValue<T>} is typically created using the factory method
- * {@linkplain StableValue#of() {@code StableValue.of()}}. When created this way,
- * the stable value is <em>unset</em>, which means it holds no <em>contents</em>.
- * Its contents, of type {@code T}, can be <em>set</em> by calling
- * {@linkplain #trySet(Object) trySet()}, {@linkplain #setOrThrow(Object) setOrThrow()},
- * or {@linkplain #orElseSet(Supplier) orElseSet()}. Once set, the contents
- * can never change and can be retrieved by calling {@linkplain #orElseThrow() orElseThrow()}
- * , {@linkplain #orElse(Object) orElse()}, or {@linkplain #orElseSet(Supplier) orElseSet()}.
- * <p>
- * Consider the following example where a stable value field "{@code logger}" is a
- * shallowly immutable holder of contents of type {@code Logger} and that is initially
- * created as <em>unset</em>, which means it holds no contents. Later in the example, the
- * state of the "{@code logger}" field is checked and if it is still <em>unset</em>,
- * the contents is <em>set</em>:
- *
- * {@snippet lang = java:
- * public class Component {
- *
- *    // Creates a new unset stable value with no contents
- *    // @link substring="of" target="#of" :
- *    private final StableValue<Logger> logger = StableValue.of();
- *
- *    private Logger getLogger() {
- *        if (!logger.isSet()) {
- *            logger.trySet(Logger.create(Component.class));
- *        }
- *        return logger.orElseThrow();
- *    }
- *
- *    public void process() {
- *        getLogger().info("Process started");
- *        // ...
- *    }
- * }
- *}
- * <p>
- * If {@code getLogger()} is called from several threads, several instances of
- * {@code Logger} might be created. However, the contents can only be set at most once
- * meaning the first writer wins.
- * <p>
- * In order to guarantee that, even under races, only one instance of {@code Logger} is
- * ever created, the {@linkplain #orElseSet(Supplier) orElseSet()} method can be used
- * instead, where the contents are lazily computed, and atomically set, via a
- * {@linkplain Supplier supplier}. In the example below, the supplier is provided in the
- * form of a lambda expression:
- *
- * {@snippet lang = java:
- * public class Component {
- *
- *    // Creates a new unset stable value with no contents
- *    // @link substring="of" target="#of" :
- *    private final StableValue<Logger> logger = StableValue.of();
- *
- *    private Logger getLogger() {
- *        return logger.orElseSet( () -> Logger.create(Component.class) );
- *    }
- *
- *    public void process() {
- *        getLogger().info("Process started");
- *        // ...
- *    }
- * }
- *}
- * <p>
- * The {@code getLogger()} method calls {@code logger.orElseSet()} on the stable value to
- * retrieve its contents. If the stable value is <em>unset</em>, then {@code orElseSet()}
- * evaluates the given supplier, and sets the contents to the result; the result is then
- * returned to the client. In other words, {@code orElseSet()} guarantees that a
- * stable value's contents is <em>set</em> before it returns.
- * <p>
- * Furthermore, {@code orElseSet()} guarantees that out of one or more suppliers provided,
- * only at most one is ever evaluated, and that one is only ever evaluated once,
- * even when {@code logger.orElseSet()} is invoked concurrently. This property is crucial
- * as evaluation of the supplier may have side effects, for example, the call above to
- * {@code Logger.create()} may result in storage resources being prepared.
- *
- * <h2 id="stable-functions">Stable Functions</h2>
- * Stable values provide the foundation for higher-level functional abstractions. A
- * <em>stable supplier</em> is a supplier that computes a value and then caches it into
- * a backing stable value storage for subsequent use. A stable supplier is created via the
- * {@linkplain StableValue#supplier(Supplier) StableValue.supplier()} factory, by
- * providing an underlying {@linkplain Supplier} which is invoked when the stable supplier
- * is first accessed:
- *
- * {@snippet lang = java:
- * public class Component {
- *
- *     private final Supplier<Logger> logger =
- *             // @link substring="supplier" target="#supplier(Supplier)" :
- *             StableValue.supplier( () -> Logger.getLogger(Component.class) );
- *
- *     public void process() {
- *        logger.get().info("Process started");
- *        // ...
- *     }
- * }
- *}
- * A stable supplier encapsulates access to its backing stable value storage. This means
- * that code inside {@code Component} can obtain the logger object directly from the
- * stable supplier, without having to go through an accessor method like {@code getLogger()}.
- * <p>
- * A <em>stable int function</em> is a function that takes an {@code int} parameter and
- * uses it to compute a result that is then cached by the backing stable value storage
- * for that parameter value. A stable {@link IntFunction} is created via the
- * {@linkplain StableValue#intFunction(int, IntFunction) StableValue.intFunction()}
- * factory. Upon creation, the input range (i.e. {@code [0, size)}) is specified together
- * with an underlying {@linkplain IntFunction} which is invoked at most once per input
- * value. In effect, the stable int function will act like a cache for the underlying
- * {@linkplain IntFunction}:
- *
- * {@snippet lang = java:
- * final class PowerOf2Util {
- *
- *     private PowerOf2Util() {}
- *
- *     private static final int SIZE = 6;
- *     private static final IntFunction<Integer> UNDERLYING_POWER_OF_TWO =
- *         v -> 1 << v;
- *
- *     private static final IntFunction<Integer> POWER_OF_TWO =
- *         // @link substring="intFunction" target="#intFunction(int,IntFunction)" :
- *         StableValue.intFunction(SIZE, UNDERLYING_POWER_OF_TWO);
- *
- *     public static int powerOfTwo(int a) {
- *         return POWER_OF_TWO.apply(a);
- *     }
- * }
- *
- * int result = PowerOf2Util.powerOfTwo(4);   // May eventually constant fold to 16 at runtime
- *
- *}
- * The {@code PowerOf2Util.powerOfTwo()} function is a <em>partial function</em> that only
- * allows a subset {@code [0, 5]} of the underlying function's {@code UNDERLYING_POWER_OF_TWO}
- * input range.
- *
- * <p>
- * A <em>stable function</em> is a function that takes a parameter (of type {@code T}) and
- * uses it to compute a result (of type {@code R}) that is then cached by the backing
- * stable value storage for that parameter value. A stable function is created via the
- * {@linkplain StableValue#function(Set, Function) StableValue.function()} factory.
- * Upon creation, the input {@linkplain Set} is specified together with an underlying
- * {@linkplain Function} which is invoked at most once per input value. In effect, the
- * stable function will act like a cache for the underlying {@linkplain Function}:
- *
- * {@snippet lang = java:
- * class Log2Util {
- *
- *     private Log2Util() {}
- *
- *     private static final Set<Integer> KEYS =
- *         Set.of(1, 2, 4, 8, 16, 32);
- *     private static final UnaryOperator<Integer> UNDERLYING_LOG2 =
- *         i -> 31 - Integer.numberOfLeadingZeros(i);
- *
- *     private static final Function<Integer, Integer> LOG2 =
- *         // @link substring="function" target="#function(Set,Function)" :
- *         StableValue.function(KEYS, UNDERLYING_LOG2);
- *
- *     public static int log2(int a) {
- *         return LOG2.apply(a);
- *     }
- *
- * }
- *
- * int result = Log2Util.log2(16);   // May eventually constant fold to 4 at runtime
- *}
- *
- * The {@code Log2Util.log2()} function is a <em>partial function</em> that only allows
- * a subset {@code {1, 2, 4, 8, 16, 32}} of the underlying function's
- * {@code UNDERLYING_LOG2} input range.
- *
- * <h2 id="stable-collections">Stable Collections</h2>
- * Stable values can also be used as backing storage for
- * {@linkplain Collection##unmodifiable unmodifiable collections}. A <em>stable list</em>
- * is an unmodifiable list, backed by an array of stable values. The stable list elements
- * are computed when they are first accessed, using a provided {@linkplain IntFunction}:
- *
- * {@snippet lang = java:
- * final class PowerOf2Util {
- *
- *     private PowerOf2Util() {}
- *
- *     private static final int SIZE = 6;
- *     private static final IntFunction<Integer> UNDERLYING_POWER_OF_TWO =
- *             v -> 1 << v;
- *
- *     private static final List<Integer> POWER_OF_TWO =
- *         // @link substring="list" target="#list(int,IntFunction)" :
- *         StableValue.list(SIZE, UNDERLYING_POWER_OF_TWO);
- *
- *     public static int powerOfTwo(int a) {
- *         return POWER_OF_TWO.get(a);
- *     }
- * }
- *
- * int result = PowerOf2Util.powerOfTwo(4);   // May eventually constant fold to 16 at runtime
- *
- * }
- * <p>
- * Similarly, a <em>stable map</em> is an unmodifiable map whose keys are known at
- * construction. The stable map values are computed when they are first accessed,
- * using a provided {@linkplain Function}:
- *
- * {@snippet lang = java:
- * class Log2Util {
- *
- *     private Log2Util() {}
- *
- *     private static final Set<Integer> KEYS =
- *         Set.of(1, 2, 4, 8, 16, 32);
- *     private static final UnaryOperator<Integer> UNDERLYING_LOG2 =
- *         i -> 31 - Integer.numberOfLeadingZeros(i);
- *
- *     private static final Map<Integer, INTEGER> LOG2 =
- *         // @link substring="map" target="#map(Set,Function)" :
- *         StableValue.map(CACHED_KEYS, UNDERLYING_LOG2);
- *
- *     public static int log2(int a) {
- *          return LOG2.get(a);
- *     }
- *
- * }
- *
- * int result = Log2Util.log2(16);   // May eventually constant fold to 4 at runtime
- *
- *}
- *
- * <h2 id="composition">Composing stable values</h2>
- * A stable value can depend on other stable values, forming a dependency graph
- * that can be lazily computed but where access to individual elements can still be
- * performant. In the following example, a single {@code Foo} and a {@code Bar}
- * instance (that is dependent on the {@code Foo} instance) are lazily created, both of
- * which are held by stable values:
- * {@snippet lang = java:
- * public final class DependencyUtil {
- *
- *     private DependencyUtil() {}
- *
- *     public static class Foo {
- *          // ...
- *      }
- *
- *     public static class Bar {
- *         public Bar(Foo foo) {
- *              // ...
- *         }
- *     }
- *
- *     private static final Supplier<Foo> FOO = StableValue.supplier(Foo::new);
- *     private static final Supplier<Bar> BAR = StableValue.supplier(() -> new Bar(FOO.get()));
- *
- *     public static Foo foo() {
- *         return FOO.get();
- *     }
- *
- *     public static Bar bar() {
- *         return BAR.get();
- *     }
- *
- * }
- *}
- * Calling {@code bar()} will create the {@code Bar} singleton if it is not already
- * created. Upon such a creation, the dependent {@code Foo} will first be created if
- * the {@code Foo} does not already exist.
- * <p>
- * Another example, which has a more complex dependency graph, is to compute the
- * Fibonacci sequence lazily:
- * {@snippet lang = java:
- * public final class Fibonacci {
- *
- *     private Fibonacci() {}
- *
- *     private static final int MAX_SIZE_INT = 46;
- *
- *     private static final IntFunction<Integer> FIB =
- *         StableValue.intFunction(MAX_SIZE_INT, Fibonacci::fib);
- *
- *     public static int fib(int n) {
- *         return n < 2
- *                 ? n
- *                 : FIB.apply(n - 1) + FIB.apply(n - 2);
- *     }
- *
- * }
- *}
- * Both {@code FIB} and {@code Fibonacci::fib} recurse into each other. Because the
- * stable int function {@code FIB} caches intermediate results, the initial
- * computational complexity is reduced from exponential to linear compared to a
- * traditional non-caching recursive fibonacci method. Once computed, the VM is free to
- * constant-fold expressions like {@code Fibonacci.fib(5)}.
- * <p>
- * The fibonacci example above is a directed acyclic graph (i.e.,
- * it has no circular dependencies and is therefore a dependency tree):
- *{@snippet lang=text :
- *
- *              ___________fib(5)____________
- *             /                             \
- *       ____fib(4)____                  ____fib(3)____
- *      /              \                /              \
- *    fib(3)          fib(2)          fib(2)          fib(1)
- *   /     \         /     \         /     \
- * fib(2) fib(1)   fib(1) fib(0)   fib(1) fib(0)
- *}
- *
- * If there are circular dependencies in a dependency graph, a stable value will
- * eventually throw an {@linkplain IllegalStateException} upon referencing elements in
- * a circularity.
- *
- * <h2 id="thread-safety">Thread Safety</h2>
- * The contents of a stable value is guaranteed to be set at most once. If competing
- * threads are racing to set a stable value, only one update succeeds, while the other
- * updates are blocked until the stable value is set, whereafter the other updates
- * observes the stable value is set and leave the stable value unchanged.
- * <p>
- * The at-most-once write operation on a stable value that succeeds
- * (e.g. {@linkplain #trySet(Object) trySet()})
- * {@linkplain java.util.concurrent##MemoryVisibility <em>happens-before</em>}
- * any successful read operation (e.g. {@linkplain #orElseThrow()}).
- * A successful write operation can be either:
- * <ul>
- *     <li>a {@link #trySet(Object)} that returns {@code true},</li>
- *     <li>a {@link #setOrThrow(Object)} that does not throw, or</li>
- *     <li>an {@link #orElseSet(Supplier)} that successfully runs the supplier</li>
- * </ul>
- * A successful read operation can be either:
- * <ul>
- *     <li>a {@link #orElseThrow()} that does not throw,</li>
- *     <li>a {@link #orElse(Object) orElse(other)} that does not return the {@code other} value</li>
- *     <li>an {@link #orElseSet(Supplier)} that does not {@code throw}, or</li>
- *     <li>an {@link #isSet()} that returns {@code true}</li>
- * </ul>
- * <p>
- * The method {@link #orElseSet(Supplier)} guarantees that the provided
- * {@linkplain Supplier} is invoked successfully at most once, even under race.
- * Invocations of {@link #orElseSet(Supplier)} form a total order of zero or
- * more exceptional invocations followed by zero (if the contents were already set) or one
- * successful invocation. Since stable functions and stable collections are built on top
- * of the same principles as {@linkplain StableValue#orElseSet(Supplier) orElseSet()} they
- * too are thread safe and guarantee at-most-once-per-input invocation.
- *
- * <h2 id="performance">Performance</h2>
- * As the contents of a stable value can never change after it has been set, a JVM
- * implementation may, for a set stable value, elide all future reads of that
- * stable value, and instead directly use any contents that it has previously observed.
- * This is true if the reference to the stable value is a constant (e.g. in cases where
- * the stable value itself is stored in a {@code static final} field). Stable functions
- * and collections are built on top of StableValue. As such, they might also be eligible
- * for the same JVM optimizations as for StableValue.
- *
- * @implSpec Implementing classes of {@code StableValue} are free to synchronize on
- *           {@code this} and consequently, it should be avoided to
- *           (directly or indirectly) synchronize on a {@code StableValue}. Hence,
- *           synchronizing on {@code this} may lead to deadlock.
- *           <p>
- *           Except for a {@code StableValue}'s contents itself,
- *           an {@linkplain #orElse(Object) orElse(other)} parameter, and
- *           an {@linkplain #equals(Object) equals(obj)} parameter; all
- *           method parameters must be <em>non-null</em> or a {@link NullPointerException}
- *           will be thrown.
- *
- * @implNote A {@code StableValue} is mainly intended to be a non-public field in
- *           a class and is usually neither exposed directly via accessors nor passed as
- *           a method parameter.
- *           <p>
- *           Stable functions and collections make reasonable efforts to provide
- *           {@link Object#toString()} operations that do not trigger evaluation
- *           of the internal stable values when called.
- *           Stable collections have {@link Object#equals(Object)} operations that try
- *           to minimize evaluation of the internal stable values when called.
- *           <p>
- *           As objects can be set via stable values but never removed, this can be a
- *           source of unintended memory leaks. A stable value's contents are
- *           {@linkplain java.lang.ref##reachability strongly reachable}.
- *           Be advised that reachable stable values will hold their set contents until
- *           the stable value itself is collected.
- *           <p>
- *           A {@code StableValue} that has a type parameter {@code T} that is an array
- *           type (of arbitrary rank) will only allow the JVM to treat the
- *           <em>array reference</em> as a stable value but <em>not its components</em>.
- *           Instead, a {@linkplain #list(int, IntFunction) a stable list} of arbitrary
- *           depth can be used, which provides stable components. More generally, a
- *           stable value can hold other stable values of arbitrary depth and still
- *           provide transitive constantness.
- *           <p>
- *           Stable values, functions, and collections are not {@link Serializable}.
- *
- * @param <T> type of the contents
- *
- * @since 25
- */
-@PreviewFeature(feature = PreviewFeature.Feature.STABLE_VALUES)
-public sealed interface StableValue<T>
-        permits StableValueImpl {
-
-    /**
-     * Tries to set the contents of this StableValue to the provided {@code contents}.
-     * The contents of this StableValue can only be set once, implying this method only
-     * returns {@code true} once.
-     * <p>
-     * When this method returns, the contents of this StableValue is always set.
-     *
-     * @return {@code true} if the contents of this StableValue was set to the
-     *         provided {@code contents}, {@code false} otherwise
-     * @param contents to set
-     * @throws IllegalStateException if a supplier invoked by {@link #orElseSet(Supplier)}
-     *         recursively attempts to set this stable value by calling this method
-     *         directly or indirectly.
-     */
-    boolean trySet(T contents);
-
-    /**
-     * {@return the contents if set, otherwise, returns the provided {@code other} value}
-     *
-     * @param other to return if the contents is not set
-     */
-    T orElse(T other);
-
-    /**
-     * {@return the contents if set, otherwise, throws {@code NoSuchElementException}}
-     *
-     * @throws NoSuchElementException if no contents is set
-     */
-    T orElseThrow();
-
-    /**
-     * {@return {@code true} if the contents is set, {@code false} otherwise}
-     */
-    boolean isSet();
-
-    /**
-     * {@return the contents; if unset, first attempts to compute and set the
-     *          contents using the provided {@code supplier}}
-     * <p>
-     * The provided {@code supplier} is guaranteed to be invoked at most once if it
-     * completes without throwing an exception. If this method is invoked several times
-     * with different suppliers, only one of them will be invoked provided it completes
-     * without throwing an exception.
-     * <p>
-     * If the supplier throws an (unchecked) exception, the exception is rethrown and no
-     * contents is set. The most common usage is to construct a new object serving
-     * as a lazily computed value or memoized result, as in:
-     *
-     * {@snippet lang=java:
-     * Value v = stable.orElseSet(Value::new);
-     * }
-     * <p>
-     * When this method returns successfully, the contents is always set.
-     * <p>
-     * The provided {@code supplier} will only be invoked once even if invoked from
-     * several threads unless the {@code supplier} throws an exception.
-     *
-     * @param  supplier to be used for computing the contents, if not previously set
-     * @throws IllegalStateException if the provided {@code supplier} recursively
-     *                               attempts to set this stable value.
-     */
-    T orElseSet(Supplier<? extends T> supplier);
-
-    /**
-     * Sets the contents of this StableValue to the provided {@code contents}, or, if
-     * already set, throws {@code IllegalStateException}.
-     * <p>
-     * When this method returns (or throws an exception), the contents is always set.
-     *
-     * @param contents to set
-     * @throws IllegalStateException if the contents was already set
-     * @throws IllegalStateException if a supplier invoked by {@link #orElseSet(Supplier)}
-     *         recursively attempts to set this stable value by calling this method
-     *         directly or indirectly.
-     */
-    void setOrThrow(T contents);
-
-    // Object methods
-
-    /**
-     * {@return {@code true} if {@code this == obj}, {@code false} otherwise}
-     *
-     * @param obj to check for equality
-     */
-    boolean equals(Object obj);
-
-    /**
-     * {@return the {@linkplain System#identityHashCode(Object) identity hash code} of
-     *          {@code this} object}
-     */
-    int hashCode();
-
-    // Factories
-
-    /**
-     * {@return a new unset stable value}
-     * <p>
-     * An unset stable value has no contents.
-     *
-     * @param <T> type of the contents
-     */
-    static <T> StableValue<T> of() {
-        return StableValueImpl.of();
-    }
-
-    /**
-     * {@return a new pre-set stable value with the provided {@code contents}}
-     *
-     * @param contents to set
-     * @param <T>     type of the contents
-     */
-    static <T> StableValue<T> of(T contents) {
-        final StableValue<T> stableValue = StableValue.of();
-        stableValue.trySet(contents);
-        return stableValue;
-    }
-
-    /**
-     * {@return a new stable supplier}
-     * <p>
-     * The returned {@linkplain Supplier supplier} is a caching supplier that records
-     * the value of the provided {@code underlying} supplier upon being first accessed via
-     * the returned supplier's {@linkplain Supplier#get() get()} method.
-     * <p>
-     * The provided {@code underlying} supplier is guaranteed to be successfully invoked
-     * at most once even in a multi-threaded environment. Competing threads invoking the
-     * returned supplier's {@linkplain Supplier#get() get()} method when a value is
-     * already under computation will block until a value is computed or an exception is
-     * thrown by the computing thread. The competing threads will then observe the newly
-     * computed value (if any) and will then never execute the {@code underlying} supplier.
-     * <p>
-     * If the provided {@code underlying} supplier throws an exception, it is rethrown
-     * to the initial caller and no contents is recorded.
-     * <p>
-     * If the provided {@code underlying} supplier recursively calls the returned
-     * supplier, an {@linkplain IllegalStateException} will be thrown.
-     *
-     * @param underlying supplier used to compute a cached value
-     * @param <T>        the type of results supplied by the returned supplier
-     */
-    static <T> Supplier<T> supplier(Supplier<? extends T> underlying) {
-        Objects.requireNonNull(underlying);
-        return StableSupplier.of(underlying);
-    }
-
-    /**
-     * {@return a new stable {@linkplain IntFunction}}
-     * <p>
-     * The returned function is a caching function that, for each allowed {@code int}
-     * input, records the values of the provided {@code underlying}
-     * function upon being first accessed via the returned function's
-     * {@linkplain IntFunction#apply(int) apply()} method. If the returned function is
-     * invoked with an input that is not in the range {@code [0, size)}, an
-     * {@link IllegalArgumentException} will be thrown.
-     * <p>
-     * The provided {@code underlying} function is guaranteed to be successfully invoked
-     * at most once per allowed input, even in a multi-threaded environment. Competing
-     * threads invoking the returned function's
-     * {@linkplain IntFunction#apply(int) apply()} method when a value is already under
-     * computation will block until a value is computed or an exception is thrown by
-     * the computing thread.
-     * <p>
-     * If invoking the provided {@code underlying} function throws an exception, it is
-     * rethrown to the initial caller and no contents is recorded.
-     * <p>
-     * If the provided {@code underlying} function recursively calls the returned
-     * function for the same input, an {@linkplain IllegalStateException} will
-     * be thrown.
-     *
-     * @param size       the upper bound of the range {@code [0, size)} indicating
-     *                   the allowed inputs
-     * @param underlying {@code IntFunction} used to compute cached values
-     * @param <R>        the type of results delivered by the returned IntFunction
-     * @throws IllegalArgumentException if the provided {@code size} is negative.
-     */
-    static <R> IntFunction<R> intFunction(int size,
-                                          IntFunction<? extends R> underlying) {
-        StableUtil.assertSizeNonNegative(size);
-        Objects.requireNonNull(underlying);
-        return StableIntFunction.of(size, underlying);
-    }
-
-    /**
-     * {@return a new stable {@linkplain Function}}
-     * <p>
-     * The returned function is a caching function that, for each allowed
-     * input in the given set of {@code inputs}, records the values of the provided
-     * {@code underlying} function upon being first accessed via the returned function's
-     * {@linkplain Function#apply(Object) apply()} method. If the returned function is
-     * invoked with an input that is not in {@code inputs}, an {@link IllegalArgumentException}
-     * will be thrown.
-     * <p>
-     * The provided {@code underlying} function is guaranteed to be successfully invoked
-     * at most once per allowed input, even in a multi-threaded environment. Competing
-     * threads invoking the returned function's {@linkplain Function#apply(Object) apply()}
-     * method when a value is already under computation will block until a value is
-     * computed or an exception is thrown by the computing thread.
-     * <p>
-     * If invoking the provided {@code underlying} function throws an exception, it is
-     * rethrown to the initial caller and no contents is recorded.
-     * <p>
-     * If the provided {@code underlying} function recursively calls the returned
-     * function for the same input, an {@linkplain IllegalStateException} will
-     * be thrown.
-     *
-     * @param inputs     the set of (non-null) allowed input values
-     * @param underlying {@code Function} used to compute cached values
-     * @param <T>        the type of the input to the returned Function
-     * @param <R>        the type of results delivered by the returned Function
-     * @throws NullPointerException if the provided set of {@code inputs} contains a
-     *                              {@code null} element.
-     */
-    static <T, R> Function<T, R> function(Set<? extends T> inputs,
-                                          Function<? super T, ? extends R> underlying) {
-        Objects.requireNonNull(inputs);
-        // Checking that the Set of inputs does not contain a `null` value is made in the
-        // implementing classes.
-        Objects.requireNonNull(underlying);
-        return inputs instanceof EnumSet<?> && !inputs.isEmpty()
-                ? StableEnumFunction.of(inputs, underlying)
-                : StableFunction.of(inputs, underlying);
-    }
-
-    /**
-     * {@return a new stable list with the provided {@code size}}
-     * <p>
-     * The returned list is an {@linkplain Collection##unmodifiable unmodifiable} list
-     * with the provided {@code size}. The list's elements are computed via the
-     * provided {@code mapper} when they are first accessed
-     * (e.g. via {@linkplain List#get(int) List::get}).
-     * <p>
-     * The provided {@code mapper} function is guaranteed to be successfully invoked
-     * at most once per list index, even in a multi-threaded environment. Competing
-     * threads accessing an element already under computation will block until an element
-     * is computed or an exception is thrown by the computing thread.
-     * <p>
-     * If invoking the provided {@code mapper} function throws an exception, it
-     * is rethrown to the initial caller and no value for the element is recorded.
-     * <p>
-     * Any {@link List#subList(int, int) subList} or {@link List#reversed()} views
-     * of the returned list are also stable.
-     * <p>
-     * The returned list and its {@link List#subList(int, int) subList} or
-     * {@link List#reversed()} views implement the {@link RandomAccess} interface.
-     * <p>
-     * The returned list is unmodifiable and does not implement the
-     * {@linkplain Collection##optional-operation optional operations} in the
-     * {@linkplain List} interface.
-     * <p>
-     * If the provided {@code mapper} recursively calls the returned list for the
-     * same index, an {@linkplain IllegalStateException} will be thrown.
-     *
-     * @param size   the size of the returned list
-     * @param mapper to invoke whenever an element is first accessed
-     *               (may return {@code null})
-     * @param <E>    the type of elements in the returned list
-     * @throws IllegalArgumentException if the provided {@code size} is negative.
-     */
-    static <E> List<E> list(int size,
-                            IntFunction<? extends E> mapper) {
-        StableUtil.assertSizeNonNegative(size);
-        Objects.requireNonNull(mapper);
-        return SharedSecrets.getJavaUtilCollectionAccess().stableList(size, mapper);
-    }
-
-    /**
-     * {@return a new stable map with the provided {@code keys}}
-     * <p>
-     * The returned map is an {@linkplain Collection##unmodifiable unmodifiable} map whose
-     * keys are known at construction. The map's values are computed via the provided
-     * {@code mapper} when they are first accessed
-     * (e.g. via {@linkplain Map#get(Object) Map::get}).
-     * <p>
-     * The provided {@code mapper} function is guaranteed to be successfully invoked
-     * at most once per key, even in a multi-threaded environment. Competing
-     * threads accessing a value already under computation will block until an element
-     * is computed or an exception is thrown by the computing thread.
-     * <p>
-     * If invoking the provided {@code mapper} function throws an exception, it
-     * is rethrown to the initial caller and no value associated with the provided key
-     * is recorded.
-     * <p>
-     * Any {@link Map#values()} or {@link Map#entrySet()} views of the returned map are
-     * also stable.
-     * <p>
-     * The returned map is unmodifiable and does not implement the
-     * {@linkplain Collection##optional-operations optional operations} in the
-     * {@linkplain Map} interface.
-     * <p>
-     * If the provided {@code mapper} recursively calls the returned map for
-     * the same key, an {@linkplain IllegalStateException} will be thrown.
-     *
-     * @param keys   the (non-null) keys in the returned map
-     * @param mapper to invoke whenever an associated value is first accessed
-     *               (may return {@code null})
-     * @param <K>    the type of keys maintained by the returned map
-     * @param <V>    the type of mapped values in the returned map
-     * @throws NullPointerException if the provided set of {@code inputs} contains a
-     *                              {@code null} element.
-     */
-    static <K, V> Map<K, V> map(Set<K> keys,
-                                Function<? super K, ? extends V> mapper) {
-        Objects.requireNonNull(keys);
-        // Checking that the Set of keys does not contain a `null` value is made in the
-        // implementing class.
-        Objects.requireNonNull(mapper);
-        return SharedSecrets.getJavaUtilCollectionAccess().stableMap(keys, mapper);
-    }
-
-}
diff --git a/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java
index 1eb3c9c2094..736ed4f12d5 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -25,7 +25,6 @@
 
 package java.nio.charset;
 
-import jdk.internal.misc.ThreadTracker;
 import jdk.internal.misc.VM;
 import jdk.internal.util.StaticProperty;
 import jdk.internal.vm.annotation.Stable;
@@ -41,7 +40,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.SortedMap;
@@ -426,7 +424,7 @@ public abstract class Charset
     }
 
     /* The extended set of charsets */
-    private static final Supplier<List<CharsetProvider>> EXTENDED_PROVIDERS = StableValue.supplier(
+    private static final LazyConstant<List<CharsetProvider>> EXTENDED_PROVIDERS = LazyConstant.of(
             new Supplier<>() { public List<CharsetProvider> get() { return extendedProviders0(); }});
 
     private static List<CharsetProvider> extendedProviders0() {
@@ -617,7 +615,7 @@ public abstract class Charset
         return Collections.unmodifiableSortedMap(m);
     }
 
-    private static final Supplier<Charset> defaultCharset = StableValue.supplier(
+    private static final LazyConstant<Charset> defaultCharset = LazyConstant.of(
             new Supplier<>() { public Charset get() { return defaultCharset0(); }});
 
     private static Charset defaultCharset0() {
@@ -658,7 +656,7 @@ public abstract class Charset
     @Stable
     private final String[] aliases;
     @Stable
-    private final Supplier<Set<String>> aliasSet = StableValue.supplier(
+    private final LazyConstant<Set<String>> aliasSet = LazyConstant.of(
             new Supplier<>() { public Set<String> get() { return Set.of(aliases); }});
 
     /**
diff --git a/src/java.base/share/classes/java/util/Currency.java b/src/java.base/share/classes/java/util/Currency.java
index febae04a77b..b254bae32a1 100644
--- a/src/java.base/share/classes/java/util/Currency.java
+++ b/src/java.base/share/classes/java/util/Currency.java
@@ -142,8 +142,8 @@ public final class Currency implements Serializable {
     // class data: instance map
 
     private static ConcurrentMap<String, Currency> instances = new ConcurrentHashMap<>(7);
-    private static final Supplier<HashSet<Currency>> available =
-            StableValue.supplier(Currency::computeAllCurrencies);
+    private static final LazyConstant<HashSet<Currency>> available =
+            LazyConstant.of(Currency::computeAllCurrencies);
 
     // Class data: currency data obtained from currency.data file.
     // Purpose:
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
index 1dd7808da20..abc48ff5ed9 100644
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -36,18 +36,12 @@ import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.IntFunction;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
 import jdk.internal.access.JavaUtilCollectionAccess;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.lang.stable.StableUtil;
-import jdk.internal.lang.stable.StableValueImpl;
 import jdk.internal.misc.CDS;
-import jdk.internal.util.ArraysSupport;
-import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -135,14 +129,6 @@ class ImmutableCollections {
                 public <E> List<E> listFromTrustedArrayNullsAllowed(Object[] array) {
                     return ImmutableCollections.listFromTrustedArrayNullsAllowed(array);
                 }
-                public <E> List<E> stableList(int size, IntFunction<? extends E> mapper) {
-                    // A stable list is not Serializable, so we cannot return `List.of()` if `size == 0`
-                    return new StableList<>(size, mapper);
-                }
-                public <K, V> Map<K, V> stableMap(Set<K> keys, Function<? super K, ? extends V> mapper) {
-                    // A stable map is not Serializable, so we cannot return `Map.of()` if `keys.isEmpty()`
-                    return new StableMap<>(keys, mapper);
-                }
             });
         }
     }
@@ -450,7 +436,7 @@ class ImmutableCollections {
         }
     }
 
-    static sealed class SubList<E> extends AbstractImmutableList<E>
+    static final class SubList<E> extends AbstractImmutableList<E>
             implements RandomAccess {
 
         @Stable
@@ -462,8 +448,10 @@ class ImmutableCollections {
         @Stable
         final int size;
 
-        private SubList(AbstractImmutableList<E> root, int offset, int size) {
-            assert root instanceof List12 || root instanceof ListN || root instanceof StableList;
+        SubList(AbstractImmutableList<E> root, int offset, int size) {
+            assert root instanceof List12
+                    || root instanceof ListN
+                    || root instanceof LazyCollections.LazyList;
             this.root = root;
             this.offset = offset;
             this.size = size;
@@ -795,187 +783,6 @@ class ImmutableCollections {
         }
     }
 
-    @FunctionalInterface
-    interface HasStableDelegates<E> {
-        StableValueImpl<E>[] delegates();
-    }
-
-    @jdk.internal.ValueBased
-    static final class StableList<E>
-            extends AbstractImmutableList<E>
-            implements HasStableDelegates<E> {
-
-        @Stable
-        private final IntFunction<? extends E> mapper;
-        @Stable
-        final StableValueImpl<E>[] delegates;
-
-        StableList(int size, IntFunction<? extends E> mapper) {
-            this.mapper = mapper;
-            this.delegates = StableUtil.array(size);
-        }
-
-        @Override public boolean  isEmpty() { return delegates.length == 0;}
-        @Override public int      size() { return delegates.length; }
-        @Override public Object[] toArray() { return copyInto(new Object[size()]); }
-
-        @ForceInline
-        @Override
-        public E get(int i) {
-            final StableValueImpl<E> delegate;
-            try {
-                delegate = delegates[i];
-            } catch (ArrayIndexOutOfBoundsException aioobe) {
-                throw new IndexOutOfBoundsException(i);
-            }
-            return delegate.orElseSet(new Supplier<E>() {
-                        @Override  public E get() { return mapper.apply(i); }});
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public <T> T[] toArray(T[] a) {
-            final int size = delegates.length;
-            if (a.length < size) {
-                // Make a new array of a's runtime type, but my contents:
-                T[] n = (T[])Array.newInstance(a.getClass().getComponentType(), size);
-                return copyInto(n);
-            }
-            copyInto(a);
-            if (a.length > size) {
-                a[size] = null; // null-terminate
-            }
-            return a;
-        }
-
-        @Override
-        public int indexOf(Object o) {
-            final int size = size();
-            for (int i = 0; i < size; i++) {
-                if (Objects.equals(o, get(i))) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
-        @Override
-        public int lastIndexOf(Object o) {
-            for (int i = size() - 1; i >= 0; i--) {
-                if (Objects.equals(o, get(i))) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
-        @SuppressWarnings("unchecked")
-        private <T> T[] copyInto(Object[] a) {
-            final int len = delegates.length;
-            for (int i = 0; i < len; i++) {
-                a[i] = get(i);
-            }
-            return (T[]) a;
-        }
-
-        @Override
-        public List<E> reversed() {
-            return new StableReverseOrderListView<>(this);
-        }
-
-        @Override
-        public List<E> subList(int fromIndex, int toIndex) {
-            subListRangeCheck(fromIndex, toIndex, size());
-            return StableSubList.fromStableList(this, fromIndex, toIndex);
-        }
-
-        @Override
-        public String toString() {
-            return StableUtil.renderElements(this, "StableCollection", delegates);
-        }
-
-        @Override
-        public StableValueImpl<E>[] delegates() {
-            return delegates;
-        }
-
-        private static final class StableSubList<E> extends SubList<E>
-                implements HasStableDelegates<E> {
-
-            private StableSubList(AbstractImmutableList<E> root, int offset, int size) {
-                super(root, offset, size);
-            }
-
-            @Override
-            public List<E> reversed() {
-                return new StableReverseOrderListView<>(this);
-            }
-
-            @Override
-            public List<E> subList(int fromIndex, int toIndex) {
-                subListRangeCheck(fromIndex, toIndex, size());
-                return StableSubList.fromStableSubList(this, fromIndex, toIndex);
-            }
-
-            @Override
-            public String toString() {
-                return StableUtil.renderElements(this, "StableCollection", delegates());
-            }
-
-            @Override
-            boolean allowNulls() {
-                return true;
-            }
-
-            @Override
-            public StableValueImpl<E>[] delegates() {
-                @SuppressWarnings("unchecked")
-                final var rootDelegates = ((HasStableDelegates<E>) root).delegates();
-                return Arrays.copyOfRange(rootDelegates, offset, offset + size);
-            }
-
-            static <E> SubList<E> fromStableList(StableList<E> list, int fromIndex, int toIndex) {
-                return new StableSubList<>(list, fromIndex, toIndex - fromIndex);
-            }
-
-            static <E> SubList<E> fromStableSubList(StableSubList<E> parent, int fromIndex, int toIndex) {
-                return new StableSubList<>(parent.root, parent.offset + fromIndex, toIndex - fromIndex);
-            }
-
-        }
-
-        private static final class StableReverseOrderListView<E>
-                extends ReverseOrderListView.Rand<E>
-                implements HasStableDelegates<E> {
-
-            private StableReverseOrderListView(List<E> base) {
-                super(base, false);
-            }
-
-            // This method does not evaluate the elements
-            @Override
-            public String toString() {
-                return StableUtil.renderElements(this, "StableCollection", delegates());
-            }
-
-            @Override
-            public List<E> subList(int fromIndex, int toIndex) {
-                final int size = base.size();
-                subListRangeCheck(fromIndex, toIndex, size);
-                return new StableReverseOrderListView<>(base.subList(size - toIndex, size - fromIndex));
-            }
-
-            @Override
-            public StableValueImpl<E>[] delegates() {
-                @SuppressWarnings("unchecked")
-                final var baseDelegates = ((HasStableDelegates<E>) base).delegates();
-                return ArraysSupport.reverse(
-                        Arrays.copyOf(baseDelegates, baseDelegates.length));
-            }
-        }
-
-    }
-
     // ---------- Set Implementations ----------
 
     @jdk.internal.ValueBased
@@ -1614,187 +1421,6 @@ class ImmutableCollections {
         }
     }
 
-    static final class StableMap<K, V>
-            extends AbstractImmutableMap<K, V> {
-
-        @Stable
-        private final Function<? super K, ? extends V> mapper;
-        @Stable
-        private final Map<K, StableValueImpl<V>> delegate;
-
-        StableMap(Set<K> keys, Function<? super K, ? extends V> mapper) {
-            this.mapper = mapper;
-            this.delegate = StableUtil.map(keys);
-        }
-
-        @Override public boolean              containsKey(Object o) { return delegate.containsKey(o); }
-        @Override public int                  size() { return delegate.size(); }
-        @Override public Set<Map.Entry<K, V>> entrySet() { return StableMapEntrySet.of(this); }
-
-        @ForceInline
-        @Override
-        public V get(Object key) {
-            return getOrDefault(key, null);
-        }
-
-        @ForceInline
-        @Override
-        public V getOrDefault(Object key, V defaultValue) {
-            final StableValueImpl<V> stable = delegate.get(key);
-            if (stable == null) {
-                return defaultValue;
-            }
-            @SuppressWarnings("unchecked")
-            final K k = (K) key;
-            return stable.orElseSet(new Supplier<V>() {
-                @Override public V get() { return mapper.apply(k); }});
-        }
-
-        @jdk.internal.ValueBased
-        static final class StableMapEntrySet<K, V> extends AbstractImmutableSet<Map.Entry<K, V>> {
-
-            // Use a separate field for the outer class in order to facilitate
-            // a @Stable annotation.
-            @Stable
-            private final StableMap<K, V> outer;
-
-            @Stable
-            private final Set<Map.Entry<K, StableValueImpl<V>>> delegateEntrySet;
-
-            private StableMapEntrySet(StableMap<K, V> outer) {
-                this.outer = outer;
-                this.delegateEntrySet = outer.delegate.entrySet();
-            }
-
-            @Override public Iterator<Map.Entry<K, V>> iterator() { return LazyMapIterator.of(this); }
-            @Override public int                       size() { return delegateEntrySet.size(); }
-            @Override public int                       hashCode() { return outer.hashCode(); }
-
-            @Override
-            public String toString() {
-                return StableUtil.renderMappings(this, "StableCollection", delegateEntrySet, false);
-            }
-
-            // For @ValueBased
-            private static <K, V> StableMapEntrySet<K, V> of(StableMap<K, V> outer) {
-                return new StableMapEntrySet<>(outer);
-            }
-
-            @jdk.internal.ValueBased
-            static final class LazyMapIterator<K, V> implements Iterator<Map.Entry<K, V>> {
-
-                // Use a separate field for the outer class in order to facilitate
-                // a @Stable annotation.
-                @Stable
-                private final StableMapEntrySet<K, V> outer;
-
-                @Stable
-                private final Iterator<Map.Entry<K, StableValueImpl<V>>> delegateIterator;
-
-                private LazyMapIterator(StableMapEntrySet<K, V> outer) {
-                    this.outer = outer;
-                    this.delegateIterator = outer.delegateEntrySet.iterator();
-                }
-
-                @Override public boolean hasNext() { return delegateIterator.hasNext(); }
-
-                @Override
-                public Entry<K, V> next() {
-                    final Map.Entry<K, StableValueImpl<V>> inner = delegateIterator.next();
-                    final K k = inner.getKey();
-                    return new StableEntry<>(k, inner.getValue(), new Supplier<V>() {
-                        @Override public V get() { return outer.outer.mapper.apply(k); }});
-                }
-
-                @Override
-                public void forEachRemaining(Consumer<? super Map.Entry<K, V>> action) {
-                    final Consumer<? super Map.Entry<K, StableValueImpl<V>>> innerAction =
-                            new Consumer<>() {
-                                @Override
-                                public void accept(Entry<K, StableValueImpl<V>> inner) {
-                                    final K k = inner.getKey();
-                                    action.accept(new StableEntry<>(k, inner.getValue(), new Supplier<V>() {
-                                        @Override public V get() { return outer.outer.mapper.apply(k); }}));
-                                }
-                            };
-                    delegateIterator.forEachRemaining(innerAction);
-                }
-
-                // For @ValueBased
-                private static  <K, V> LazyMapIterator<K, V> of(StableMapEntrySet<K, V> outer) {
-                    return new LazyMapIterator<>(outer);
-                }
-
-            }
-        }
-
-        private record StableEntry<K, V>(K getKey, // trick
-                                         StableValueImpl<V> stableValue,
-                                         Supplier<? extends V> supplier) implements Map.Entry<K, V> {
-
-            @Override public V setValue(V value) { throw uoe(); }
-            @Override public V getValue() { return stableValue.orElseSet(supplier); }
-            @Override public int hashCode() { return hash(getKey()) ^ hash(getValue()); }
-            @Override public String toString() { return getKey() + "=" + stableValue.toString(); }
-            @Override public boolean equals(Object o) {
-                return o instanceof Map.Entry<?, ?> e
-                        && Objects.equals(getKey(), e.getKey())
-                        // Invoke `getValue()` as late as possible to avoid evaluation
-                        && Objects.equals(getValue(), e.getValue());
-            }
-
-            private int hash(Object obj) { return (obj == null) ? 0 : obj.hashCode(); }
-        }
-
-        @Override
-        public Collection<V> values() {
-            return StableMapValues.of(this);
-        }
-
-        @jdk.internal.ValueBased
-        static final class StableMapValues<V> extends AbstractImmutableCollection<V> {
-
-            // Use a separate field for the outer class in order to facilitate
-            // a @Stable annotation.
-            @Stable
-            private final StableMap<?, V> outer;
-
-            private StableMapValues(StableMap<?, V> outer) {
-                this.outer = outer;
-            }
-
-            @Override public Iterator<V> iterator() { return outer.new ValueIterator(); }
-            @Override public int size() { return outer.size(); }
-            @Override public boolean isEmpty() { return outer.isEmpty();}
-            @Override public boolean contains(Object v) { return outer.containsValue(v); }
-
-            private static final IntFunction<StableValueImpl<?>[]> GENERATOR = new IntFunction<StableValueImpl<?>[]>() {
-                @Override
-                public StableValueImpl<?>[] apply(int len) {
-                    return new StableValueImpl<?>[len];
-                }
-            };
-
-            @Override
-            public String toString() {
-                final StableValueImpl<?>[] values = outer.delegate.values().toArray(GENERATOR);
-                return StableUtil.renderElements(this, "StableCollection", values);
-            }
-
-            // For @ValueBased
-            private static <V> StableMapValues<V> of(StableMap<?, V> outer) {
-                return new StableMapValues<>(outer);
-            }
-
-        }
-
-        @Override
-        public String toString() {
-            return StableUtil.renderMappings(this, "StableMap", delegate.entrySet(), true);
-        }
-
-    }
-
 }
 
 // ---------- Serialization Proxy ----------
diff --git a/src/java.base/share/classes/java/util/LazyCollections.java b/src/java.base/share/classes/java/util/LazyCollections.java
new file mode 100644
index 00000000000..0bbdad87ac4
--- /dev/null
+++ b/src/java.base/share/classes/java/util/LazyCollections.java
@@ -0,0 +1,584 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+import jdk.internal.misc.Unsafe;
+import jdk.internal.util.ImmutableBitSetPredicate;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+
+import java.lang.LazyConstant;
+import java.lang.reflect.Array;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.IntPredicate;
+import java.util.function.Supplier;
+
+/**
+ * Container class for lazy collections implementations. Not part of the public API.
+ */
+@AOTSafeClassInitializer
+final class LazyCollections {
+
+    /**
+     * No instances.
+     */
+    private LazyCollections() { }
+
+    // Unsafe allows LazyCollection classes to be used early in the boot sequence
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    @jdk.internal.ValueBased
+    static final class LazyList<E>
+            extends ImmutableCollections.AbstractImmutableList<E> {
+
+        @Stable
+        private final E[] elements;
+        // Keeping track of `size` separately reduces bytecode size compared to
+        // using `elements.length`.
+        @Stable
+        private final int size;
+        @Stable
+        final FunctionHolder<IntFunction<? extends E>> functionHolder;
+        @Stable
+        private final Mutexes mutexes;
+
+        private LazyList(int size, IntFunction<? extends E> computingFunction) {
+            this.elements = newGenericArray(size);
+            this.size = size;
+            this.functionHolder = new FunctionHolder<>(computingFunction, size);
+            this.mutexes = new Mutexes(size);
+            super();
+        }
+
+        @Override public boolean  isEmpty() { return size == 0; }
+        @Override public int      size() { return size; }
+        @Override public Object[] toArray() { return copyInto(new Object[size]); }
+
+        @ForceInline
+        @Override
+        public E get(int i) {
+            final E e = contentsAcquire(offsetFor(Objects.checkIndex(i, size)));
+            return (e != null) ? e : getSlowPath(i);
+        }
+
+        private E getSlowPath(int i) {
+            return orElseComputeSlowPath(elements, i, mutexes, i, functionHolder);
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            if (a.length < size) {
+                // Make a new array of a's runtime type, but my contents:
+                T[] n = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+                return copyInto(n);
+            }
+            copyInto(a);
+            if (a.length > size) {
+                a[size] = null; // null-terminate
+            }
+            return a;
+        }
+
+        @Override
+        public int indexOf(Object o) {
+            for (int i = 0; i < size; i++) {
+                if (Objects.equals(o, get(i))) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        @Override
+        public int lastIndexOf(Object o) {
+            for (int i = size - 1; i >= 0; i--) {
+                if (Objects.equals(o, get(i))) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        @SuppressWarnings("unchecked")
+        private <T> T[] copyInto(Object[] a) {
+            for (int i = 0; i < size; i++) {
+                a[i] = get(i);
+            }
+            return (T[]) a;
+        }
+
+        @SuppressWarnings("unchecked")
+        @ForceInline
+        private E contentsAcquire(long offset) {
+            return (E) UNSAFE.getReferenceAcquire(elements, offset);
+        }
+
+    }
+
+    static final class LazyEnumMap<K extends Enum<K>, V>
+            extends AbstractLazyMap<K, V> {
+
+        @Stable
+        private final Class<K> enumType;
+        @Stable
+        // We are using a wrapper class here to be able to use a min value of zero that
+        // is also stable.
+        private final Integer min;
+        @Stable
+        private final IntPredicate member;
+
+        public LazyEnumMap(Set<K> set,
+                           Class<K> enumType,
+                           int min,
+                           int backingSize,
+                           IntPredicate member,
+                           Function<? super K, ? extends V> computingFunction) {
+            this.enumType = enumType;
+            this.min = min;
+            this.member = member;
+            super(set, set.size(), backingSize, computingFunction);
+        }
+
+        @Override
+        @ForceInline
+        public boolean containsKey(Object o) {
+            return enumType.isAssignableFrom(o.getClass())
+                    && member.test(((Enum<?>) o).ordinal());
+        }
+
+        @ForceInline
+        @Override
+        public V getOrDefault(Object key, V defaultValue) {
+            if (enumType.isAssignableFrom(key.getClass())) {
+                final int ordinal = ((Enum<?>) key).ordinal();
+                if (member.test(ordinal)) {
+                    @SuppressWarnings("unchecked")
+                    final K k = (K) key;
+                    return orElseCompute(k, indexForAsInt(k));
+                }
+            }
+            return defaultValue;
+        }
+
+        @Override
+        Integer indexFor(K key) {
+            return indexForAsInt(key);
+        }
+
+        private int indexForAsInt(K key) {
+            return key.ordinal() - min;
+        }
+
+    }
+
+    static final class LazyMap<K, V>
+            extends AbstractLazyMap<K, V> {
+
+        // Use an unmodifiable map with known entries that are @Stable. Lookups through this map can be folded because
+        // it is created using Map.ofEntrie. This allows us to avoid creating a separate hashing function.
+        @Stable
+        private final Map<K, Integer> indexMapper;
+
+        public LazyMap(Set<K> keys, Function<? super K, ? extends V> computingFunction) {
+            @SuppressWarnings("unchecked")
+            final Entry<K, Integer>[] entries = (Entry<K, Integer>[]) new Entry<?, ?>[keys.size()];
+            int i = 0;
+            for (K k : keys) {
+                entries[i] = Map.entry(k, i++);
+            }
+            this.indexMapper = Map.ofEntries(entries);
+            super(keys, i, i, computingFunction);
+        }
+
+        @ForceInline
+        @Override
+        public V getOrDefault(Object key, V defaultValue) {
+            final Integer index = indexMapper.get(key);
+            if (index != null) {
+                @SuppressWarnings("unchecked")
+                final K k = (K) key;
+                return orElseCompute(k, index);
+            }
+            return defaultValue;
+        }
+
+        @Override public boolean containsKey(Object o) { return indexMapper.containsKey(o); }
+
+        @Override
+        Integer indexFor(K key) {
+            return indexMapper.get(key);
+        }
+    }
+
+    static sealed abstract class AbstractLazyMap<K, V>
+            extends ImmutableCollections.AbstractImmutableMap<K, V> {
+
+        // This field shadows AbstractMap.keySet which is not @Stable.
+        @Stable
+        Set<K> keySet;
+        // This field shadows AbstractMap.values which is of another type
+        @Stable
+        final V[] values;
+        @Stable
+        Mutexes mutexes;
+        @Stable
+        private final int size;
+        @Stable
+        final FunctionHolder<Function<? super K, ? extends V>> functionHolder;
+        @Stable
+        private final Set<Entry<K, V>> entrySet;
+
+        private AbstractLazyMap(Set<K> keySet,
+                                int size,
+                                int backingSize,
+                                Function<? super K, ? extends V> computingFunction) {
+            this.size = size;
+            this.functionHolder = new FunctionHolder<>(computingFunction, size);
+            this.values = newGenericArray(backingSize);
+            this.mutexes = new Mutexes(backingSize);
+            super();
+            this.keySet = keySet;
+            this.entrySet = LazyMapEntrySet.of(this);
+        }
+
+        // Abstract methods
+        @Override public abstract boolean containsKey(Object o);
+        abstract Integer indexFor(K key);
+
+        // Public methods
+        @Override public final int              size() { return size; }
+        @Override public final boolean          isEmpty() { return size == 0; }
+        @Override public final Set<Entry<K, V>> entrySet() { return entrySet; }
+        @Override public Set<K>                 keySet() { return keySet; }
+
+        @ForceInline
+        @Override
+        public final V get(Object key) {
+            return getOrDefault(key, null);
+        }
+
+        @SuppressWarnings("unchecked")
+        @ForceInline
+        final V orElseCompute(K key, int index) {
+            final long offset = offsetFor(index);
+            final V v = (V) UNSAFE.getReferenceAcquire(values, offset);
+            if (v != null) {
+                return v;
+            }
+            return orElseComputeSlowPath(values, index, mutexes, key, functionHolder);
+        }
+
+        @jdk.internal.ValueBased
+        static final class LazyMapEntrySet<K, V> extends ImmutableCollections.AbstractImmutableSet<Entry<K, V>> {
+
+            // Use a separate field for the outer class in order to facilitate
+            // a @Stable annotation.
+            @Stable
+            private final AbstractLazyMap<K, V> map;
+
+            private LazyMapEntrySet(AbstractLazyMap<K, V> map) {
+                this.map = map;
+                super();
+            }
+
+            @Override public Iterator<Entry<K, V>> iterator() { return LazyMapIterator.of(map); }
+            @Override public int                   size() { return map.size(); }
+            @Override public int                   hashCode() { return map.hashCode(); }
+
+            // For @ValueBased
+            private static <K, V> LazyMapEntrySet<K, V> of(AbstractLazyMap<K, V> outer) {
+                return new LazyMapEntrySet<>(outer);
+            }
+
+            @jdk.internal.ValueBased
+            static final class LazyMapIterator<K, V> implements Iterator<Entry<K, V>> {
+
+                // Use a separate field for the outer class in order to facilitate
+                // a @Stable annotation.
+                @Stable
+                private final AbstractLazyMap<K, V> map;
+                @Stable
+                private final Iterator<K> keyIterator;
+
+                private LazyMapIterator(AbstractLazyMap<K, V> map) {
+                    this.map = map;
+                    this.keyIterator = map.keySet.iterator();
+                    super();
+                }
+
+                @Override  public boolean hasNext() { return keyIterator.hasNext(); }
+
+                @Override
+                public Entry<K, V> next() {
+                    final K k = keyIterator.next();
+                    return new LazyEntry<>(k, map, map.functionHolder);
+                }
+
+                @Override
+                public void forEachRemaining(Consumer<? super Entry<K, V>> action) {
+                    final Consumer<? super K> innerAction =
+                            new Consumer<>() {
+                                @Override
+                                public void accept(K key) {
+                                    action.accept(new LazyEntry<>(key, map, map.functionHolder));
+                                }
+                            };
+                    keyIterator.forEachRemaining(innerAction);
+                }
+
+                // For @ValueBased
+                private static <K, V> LazyMapIterator<K, V> of(AbstractLazyMap<K, V> map) {
+                    return new LazyMapIterator<>(map);
+                }
+
+            }
+        }
+
+        private record LazyEntry<K, V>(K getKey, // trick
+                                       AbstractLazyMap<K, V> map,
+                                       FunctionHolder<Function<? super K, ? extends V>> functionHolder) implements Entry<K, V> {
+
+            @Override public V      setValue(V value) { throw ImmutableCollections.uoe(); }
+            @Override public V      getValue() { return map.orElseCompute(getKey, map.indexFor(getKey)); }
+            @Override public int    hashCode() { return hash(getKey()) ^ hash(getValue()); }
+            @Override public String toString() { return getKey() + "=" + getValue(); }
+
+            @Override
+            public boolean equals(Object o) {
+                return o instanceof Map.Entry<?, ?> e
+                        && Objects.equals(getKey(), e.getKey())
+                        // Invoke `getValue()` as late as possible to avoid evaluation
+                        && Objects.equals(getValue(), e.getValue());
+            }
+
+            private int hash(Object obj) {
+                return (obj == null) ? 0 : obj.hashCode();
+            }
+        }
+
+        @Override
+        public Collection<V> values() {
+            return LazyMapValues.of(this);
+        }
+
+        @jdk.internal.ValueBased
+        static final class LazyMapValues<K, V> extends ImmutableCollections.AbstractImmutableCollection<V> {
+
+            // Use a separate field for the outer class in order to facilitate
+            // a @Stable annotation.
+            @Stable
+            private final AbstractLazyMap<K, V> map;
+
+            private LazyMapValues(AbstractLazyMap<K, V> map) {
+                this.map = map;
+                super();
+            }
+
+            @Override public Iterator<V> iterator() { return map.new ValueIterator(); }
+            @Override public int         size() { return map.size(); }
+            @Override public boolean     isEmpty() { return map.isEmpty(); }
+            @Override public boolean     contains(Object v) { return map.containsValue(v); }
+
+            // For @ValueBased
+            private static <K, V> LazyMapValues<K, V> of(AbstractLazyMap<K, V> outer) {
+                return new LazyMapValues<>(outer);
+            }
+
+        }
+
+    }
+
+    static final class Mutexes {
+
+        private static final Object TOMB_STONE = new Object();
+
+        // Filled on demand and then discarded once it is not needed anymore.
+        // A mutex element can only transition like so: `null` -> `new Object()` -> `TOMB_STONE`
+        private volatile Object[] mutexes;
+        // Used to detect we have computed all elements and no longer need the `mutexes` array
+        private volatile AtomicInteger counter;
+
+        private Mutexes(int length) {
+            this.mutexes = new Object[length];
+            this.counter = new AtomicInteger(length);
+        }
+
+        @ForceInline
+        private Object acquireMutex(long offset) {
+            assert mutexes != null;
+            // Check if there already is a mutex (Object or TOMB_STONE)
+            final Object mutex = UNSAFE.getReferenceVolatile(mutexes, offset);
+            if (mutex != null) {
+                return mutex;
+            }
+            // Protect against racy stores of mutex candidates
+            final Object candidate = new Object();
+            final Object witness = UNSAFE.compareAndExchangeReference(mutexes, offset, null, candidate);
+            return witness == null ? candidate : witness;
+        }
+
+        private void releaseMutex(long offset) {
+            // Replace the old mutex with a tomb stone since now the old mutex can be collected.
+            UNSAFE.putReference(mutexes, offset, TOMB_STONE);
+            if (counter != null && counter.decrementAndGet() == 0) {
+                mutexes = null;
+                counter = null;
+            }
+        }
+
+    }
+
+    @ForceInline
+    private static long offsetFor(long index) {
+        return Unsafe.ARRAY_OBJECT_BASE_OFFSET + Unsafe.ARRAY_OBJECT_INDEX_SCALE * index;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <E> E[] newGenericArray(int length) {
+        return (E[]) new Object[length];
+    }
+
+    public static <E> List<E> ofLazyList(int size,
+                                         IntFunction<? extends E> computingFunction) {
+        return new LazyList<>(size, computingFunction);
+    }
+
+    public static <K, V> Map<K, V> ofLazyMap(Set<K> keys,
+                                             Function<? super K, ? extends V> computingFunction) {
+        return new LazyMap<>(keys, computingFunction);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <K, E extends Enum<E>, V>
+    Map<K, V> ofLazyMapWithEnumKeys(Set<K> keys,
+                                    Function<? super K, ? extends V> computingFunction) {
+        // The input set is not empty
+        final Class<E> enumType = ((E) keys.iterator().next()).getDeclaringClass();
+        final BitSet bitSet = new BitSet(enumType.getEnumConstants().length);
+        int min = Integer.MAX_VALUE;
+        int max = Integer.MIN_VALUE;
+        for (K t : keys) {
+            final int ordinal = ((E) t).ordinal();
+            min = Math.min(min, ordinal);
+            max = Math.max(max, ordinal);
+            bitSet.set(ordinal);
+        }
+        final int backingSize = max - min + 1;
+        final IntPredicate member = ImmutableBitSetPredicate.of(bitSet);
+        return (Map<K, V>) new LazyEnumMap<>((Set<E>) keys, enumType, min, backingSize, member, (Function<E, V>) computingFunction);
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> T orElseComputeSlowPath(final T[] array,
+                                       final int index,
+                                       final Mutexes mutexes,
+                                       final Object input,
+                                       final FunctionHolder<?> functionHolder) {
+        final long offset = offsetFor(index);
+        final Object mutex = mutexes.acquireMutex(offset);
+        preventReentry(mutex);
+        synchronized (mutex) {
+            final T t = array[index];  // Plain semantics suffice here
+            if (t == null) {
+                final T newValue = switch (functionHolder.function()) {
+                    case IntFunction<?> iFun -> (T) iFun.apply((int) input);
+                    case Function<?, ?> fun  ->  ((Function<Object, T>) fun).apply(input);
+                    default -> throw new InternalError("cannot reach here");
+                };
+                Objects.requireNonNull(newValue);
+                // Reduce the counter and if it reaches zero, clear the reference
+                // to the underlying holder.
+                functionHolder.countDown();
+
+                // The mutex is not reentrant so we know newValue should be returned
+                set(array, index, mutex, newValue);
+                // We do not need the mutex anymore
+                mutexes.releaseMutex(offset);
+                return newValue;
+            }
+            return t;
+        }
+    }
+
+    static void preventReentry(Object mutex) {
+        if (Thread.holdsLock(mutex)) {
+            throw new IllegalStateException("Recursive initialization of a lazy collection is illegal");
+        }
+    }
+
+    static <T> void set(T[] array, int index, Object mutex, T newValue) {
+        assert Thread.holdsLock(mutex) : index + "didn't hold " + mutex;
+        // We know we hold the monitor here so plain semantic is enough
+        // This is an extra safety net to emulate a CAS op.
+        if (array[index] == null) {
+            UNSAFE.putReferenceRelease(array, Unsafe.ARRAY_OBJECT_BASE_OFFSET + Unsafe.ARRAY_OBJECT_INDEX_SCALE * (long) index, newValue);
+        }
+    }
+
+    /**
+     * This class is thread safe. Any thread can create and use an instance of this class at
+     * any time. The `function` field is only accessed if `counter` is positive so the setting
+     * of function to `null` is safe.
+     *
+     * @param <U> the underlying function type
+     */
+    @AOTSafeClassInitializer
+    static final class FunctionHolder<U> {
+
+        private static final long COUNTER_OFFSET = UNSAFE.objectFieldOffset(FunctionHolder.class, "counter");
+
+        // This field can only transition at most once from being set to a
+        // non-null reference to being `null`. Once `null`, it is never read.
+        private U function;
+        // Used reflectively via Unsafe
+        private int counter;
+
+        public FunctionHolder(U function, int counter) {
+            this.function = (counter == 0) ? null : function;
+            this.counter = counter;
+            // Safe publication
+            UNSAFE.storeStoreFence();
+        }
+
+        @ForceInline
+        public U function() {
+            return function;
+        }
+
+        public void countDown() {
+            if (UNSAFE.getAndAddInt(this, COUNTER_OFFSET, -1) == 1) {
+                // Do not reference the underlying function anymore so it can be collected.
+                function = null;
+            }
+        }
+    }
+
+}
diff --git a/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java
index 32430298363..6ab80b83ef8 100644
--- a/src/java.base/share/classes/java/util/List.java
+++ b/src/java.base/share/classes/java/util/List.java
@@ -25,6 +25,11 @@
 
 package java.util;
 
+import jdk.internal.foreign.Utils;
+import jdk.internal.javac.PreviewFeature;
+
+import java.io.Serializable;
+import java.util.function.IntFunction;
 import java.util.function.UnaryOperator;
 
 /**
@@ -87,9 +92,9 @@ import java.util.function.UnaryOperator;
  * interface.
  *
  * <h2><a id="unmodifiable">Unmodifiable Lists</a></h2>
- * <p>The {@link List#of(Object...) List.of} and
- * {@link List#copyOf List.copyOf} static factory methods
- * provide a convenient way to create unmodifiable lists. The {@code List}
+ * <p>The {@link List#of(Object...) List.of},
+ * {@link List#copyOf List.copyOf}, and {@link List#ofLazy(int, IntFunction)} static
+ * factory methods provide a convenient way to create unmodifiable lists. The {@code List}
  * instances created by these methods have the following characteristics:
  *
  * <ul>
@@ -100,7 +105,7 @@ import java.util.function.UnaryOperator;
  * this may cause the List's contents to appear to change.
  * <li>They disallow {@code null} elements. Attempts to create them with
  * {@code null} elements result in {@code NullPointerException}.
- * <li>They are serializable if all elements are serializable.
+ * <li>Unless otherwise specified, they are serializable if all elements are serializable.
  * <li>The order of elements in the list is the same as the order of the
  * provided arguments, or of the elements in the provided array.
  * <li>The lists and their {@link #subList(int, int) subList} views implement the
@@ -1190,4 +1195,71 @@ public interface List<E> extends SequencedCollection<E> {
     static <E> List<E> copyOf(Collection<? extends E> coll) {
         return ImmutableCollections.listCopy(coll);
     }
+
+    /**
+     * {@return a new lazily computed list of the provided {@code size}}
+     * <p>
+     * The returned list is an {@linkplain Collection##unmodifiable unmodifiable} list
+     * with the provided {@code size}. The list's elements are lazily computed via the
+     * provided {@code computingFunction} when they are first accessed
+     * (e.g., via {@linkplain List#get(int) List::get}).
+     * <p>
+     * The provided computing function is guaranteed to be successfully
+     * invoked at most once per list index, even in a multi-threaded environment.
+     * Competing threads accessing an element already under computation will block until
+     * an element is computed or the computing function completes abnormally
+     * <p>
+     * If invoking the provided computing function throws an exception, it is rethrown
+     * to the initial caller and no value for the element is recorded.
+     * <p>
+     * If the provided computing function returns {@code null},
+     * a {@linkplain NullPointerException} will be thrown. Hence, just like other
+     * unmodifiable lists created via the {@code List::of} factories, a lazy list
+     * cannot contain {@code null} elements. Clients that want to use nullable elements
+     * can wrap elements into an {@linkplain Optional} holder.
+     * <p>
+     * The elements of any {@link List#subList(int, int) subList()} or
+     * {@link List#reversed()} views of the returned list are also lazily computed.
+     * <p>
+     * The returned list and its {@link List#subList(int, int) subList()} or
+     * {@link List#reversed()} views implement the {@link RandomAccess} interface.
+     * <p>
+     * If the provided computing function recursively calls itself or the returned
+     * lazy list for the same index, an {@linkplain IllegalStateException}
+     * will be thrown.
+     * <p>
+     * The returned list's {@linkplain Object Object methods};
+     * {@linkplain Object#equals(Object) equals()},
+     * {@linkplain Object#hashCode() hashCode()}, and
+     * {@linkplain Object#toString() toString()} methods may trigger initialization of
+     * one or more lazy elements.
+     * <p>
+     * The returned lazy list strongly references its computing
+     * function used to compute elements at least so long as there are uninitialized
+     * elements.
+     * <p>
+     * The returned List is <em>not</em> {@linkplain Serializable}.
+     *
+     * @implNote  after all elements have been initialized successfully, the computing
+     *            function is no longer strongly referenced and becomes eligible for
+     *            garbage collection.
+     *
+     * @param size              the size of the returned lazy list
+     * @param computingFunction to invoke whenever an element is first accessed
+     *                          (may not return {@code null})
+     * @param <E>               the type of elements in the returned list
+     * @throws IllegalArgumentException if the provided {@code size} is negative.
+     *
+     * @see LazyConstant
+     * @since 26
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.LAZY_CONSTANTS)
+    static <E> List<E> ofLazy(int size,
+                              IntFunction<? extends E> computingFunction) {
+        Utils.checkNonNegativeArgument(size, "size");
+        Objects.requireNonNull(computingFunction);
+        // A computed list is not Serializable, so we cannot return `List.of()` if `size == 0`
+        return LazyCollections.ofLazyList(size, computingFunction);
+    }
+
 }
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 97278cdbafa..54863d58782 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -992,8 +992,8 @@ public final class Locale implements Cloneable, Serializable {
         }
     }
 
-    private static final Supplier<ReferencedKeyMap<Object, Locale>> LOCALE_CACHE =
-            StableValue.supplier(new Supplier<>() {
+    private static final LazyConstant<ReferencedKeyMap<Object, Locale>> LOCALE_CACHE =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public ReferencedKeyMap<Object, Locale> get() {
                     return ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
@@ -2330,8 +2330,8 @@ public final class Locale implements Cloneable, Serializable {
     private static volatile Locale defaultDisplayLocale;
     private static volatile Locale defaultFormatLocale;
 
-    private final transient Supplier<String> languageTag =
-            StableValue.supplier(new Supplier<>() {
+    private final transient LazyConstant<String> languageTag =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public String get() {
                     return computeLanguageTag();
diff --git a/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java
index 29e0b28be01..c99e88bd2bd 100644
--- a/src/java.base/share/classes/java/util/LocaleISOData.java
+++ b/src/java.base/share/classes/java/util/LocaleISOData.java
@@ -30,32 +30,32 @@ import java.util.function.Supplier;
 // Methods and suppliers for producing ISO 639/3166 resources used by Locale.
 class LocaleISOData {
 
-    static final Supplier<String[]> ISO_639 =
-            StableValue.supplier(new Supplier<>() {
+    static final LazyConstant<String[]> ISO_639 =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public String[] get() {
                     return getISO2Table(isoLanguageTable);
                 }
             });
 
-    static final Supplier<String[]> ISO_3166_1_ALPHA2 =
-            StableValue.supplier(new Supplier<>() {
+    static final LazyConstant<String[]> ISO_3166_1_ALPHA2 =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public String[] get() {
                     return getISO2Table(isoCountryTable);
                 }
             });
 
-    static final Supplier<Set<String>> ISO_3166_1_ALPHA3 =
-            StableValue.supplier(new Supplier<>() {
+    static final LazyConstant<Set<String>> ISO_3166_1_ALPHA3 =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public Set<String> get() {
                     return computeISO3166_1Alpha3Countries();
                 }
             });
 
-    static final Supplier<Set<String>> ISO_3166_3 =
-            StableValue.supplier(new Supplier<>() {
+    static final LazyConstant<Set<String>> ISO_3166_3 =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public Set<String> get() {
                     return Set.of(ISO3166_3);
diff --git a/src/java.base/share/classes/java/util/Map.java b/src/java.base/share/classes/java/util/Map.java
index fbb41be5073..abee819069f 100644
--- a/src/java.base/share/classes/java/util/Map.java
+++ b/src/java.base/share/classes/java/util/Map.java
@@ -25,6 +25,8 @@
 
 package java.util;
 
+import jdk.internal.javac.PreviewFeature;
+
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -114,8 +116,9 @@ import java.io.Serializable;
  *
  * <h2><a id="unmodifiable">Unmodifiable Maps</a></h2>
  * <p>The {@link Map#of() Map.of},
- * {@link Map#ofEntries(Map.Entry...) Map.ofEntries}, and
- * {@link Map#copyOf Map.copyOf}
+ * {@link Map#ofEntries(Map.Entry...) Map.ofEntries},
+ * {@link Map#copyOf Map.copyOf}, and
+ * {@link Map#ofLazy(Set, Function)}
  * static factory methods provide a convenient way to create unmodifiable maps.
  * The {@code Map}
  * instances created by these methods have the following characteristics:
@@ -128,7 +131,8 @@ import java.io.Serializable;
  * Map to behave inconsistently or its contents to appear to change.
  * <li>They disallow {@code null} keys and values. Attempts to create them with
  * {@code null} keys or values result in {@code NullPointerException}.
- * <li>They are serializable if all keys and values are serializable.
+ * <li>Unless otherwise specified, they are serializable if all keys and values
+ * are serializable.
  * <li>They reject duplicate keys at creation time. Duplicate keys
  * passed to a static factory method result in {@code IllegalArgumentException}.
  * <li>The iteration order of mappings is unspecified and is subject to change.
@@ -1746,4 +1750,79 @@ public interface Map<K, V> {
             return (Map<K,V>)Map.ofEntries(map.entrySet().toArray(new Entry[0]));
         }
     }
+
+    /**
+     * {@return a new lazily computed map with the provided {@code keys}}
+     * <p>
+     * The returned map is an {@linkplain Collection##unmodifiable unmodifiable} map whose
+     * keys are known at construction. The map's values are lazily computed via the
+     * provided {@code computingFunction} when they are first accessed
+     * (e.g., via {@linkplain Map#get(Object) Map::get}).
+     * <p>
+     * The provided computing function is guaranteed to be successfully invoked
+     * at most once per key, even in a multi-threaded environment. Competing
+     * threads accessing a value already under computation will block until an element
+     * is computed or the computing function completes abnormally.
+     * <p>
+     * If invoking the provided computing function throws an exception, it
+     * is rethrown to the initial caller and no value associated with the provided key
+     * is recorded.
+     * <p>
+     * If the provided computing function returns {@code null},
+     * a {@linkplain NullPointerException} will be thrown. Hence, just like other
+     * unmodifiable maps created via the {@code Map::of} factories, a lazy map
+     * cannot contain {@code null} values. Clients that want to use nullable values can
+     * wrap values into an {@linkplain Optional} holder.
+     * <p>
+     * The values of any {@link Map#values()} or {@link Map#entrySet()} views of
+     * the returned map are also lazily computed.
+     * <p>
+     * If the provided computing function recursively calls itself or
+     * the returned lazy map for the same key, an {@linkplain IllegalStateException}
+     * will be thrown.
+     * <p>
+     * The returned map's {@linkplain Object Object methods};
+     * {@linkplain Object#equals(Object) equals()},
+     * {@linkplain Object#hashCode() hashCode()}, and
+     * {@linkplain Object#toString() toString()} methods may trigger initialization of
+     * one or more lazy elements.
+     * <p>
+     * The returned lazy map strongly references its underlying
+     * computing function used to compute values at least so long as there are
+     * uncomputed values.
+     * <p>
+     * The returned Map is <em>not</em> {@linkplain Serializable}.
+     *
+     * @implNote  after all values have been initialized successfully, the computing
+     *            function is no longer strongly referenced and becomes eligible for
+     *            garbage collection.
+     *
+     * @param keys              the (non-null) keys in the returned computed map
+     * @param computingFunction to invoke whenever an associated value is first accessed
+     * @param <K>               the type of keys maintained by the returned map
+     * @param <V>               the type of mapped values in the returned map
+     * @throws NullPointerException if the provided set of {@code keys} is {@code null}
+     *         or if the set of {@code keys} contains a {@code null} element.
+     *
+     * @see LazyConstant
+     * @since 26
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.LAZY_CONSTANTS)
+    static <K, V> Map<K, V> ofLazy(Set<? extends K> keys,
+                                   Function<? super K, ? extends V> computingFunction) {
+        // Protect against TOC-TOU attacks.
+        // Also, implicit null check of `keys` and all its elements
+        final Set<K> keyCopies = Set.copyOf(keys);
+        Objects.requireNonNull(computingFunction);
+        // We need to check the instance type using the original `keys` parameter.
+        if (keys instanceof EnumSet<?> && !keyCopies.isEmpty()) {
+            @SuppressWarnings("unchecked")
+            var enumMap = (Map<K, V>) LazyCollections.ofLazyMapWithEnumKeys(keyCopies, computingFunction);
+            return enumMap;
+        } else {
+            // A computed map is not Serializable, so we cannot return `Map.of()` if `keys.isEmpty()`
+            return LazyCollections.ofLazyMap(keyCopies, computingFunction);
+        }
+    }
+
 }
diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java
index e19dde6383e..3e577bd379c 100644
--- a/src/java.base/share/classes/java/util/Optional.java
+++ b/src/java.base/share/classes/java/util/Optional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.util;
 
+import jdk.internal.vm.annotation.Stable;
+
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -68,6 +71,7 @@ public final class Optional<T> {
     /**
      * If non-null, the value; if null, indicates no value is present
      */
+    @Stable
     private final T value;
 
     /**
diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java
index b375a8ba941..db19eda6399 100644
--- a/src/java.base/share/classes/java/util/ResourceBundle.java
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java
@@ -488,7 +488,7 @@ public abstract class ResourceBundle {
     /**
      * A Set of the keys contained only in this ResourceBundle.
      */
-    private final Supplier<Set<String>> keySet = StableValue.supplier(
+    private final LazyConstant<Set<String>> keySet = LazyConstant.of(
             new Supplier<>() { public Set<String> get() { return keySet0(); }});
 
     private Set<String> keySet0() {
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java
index cac8785b158..5e7647d6106 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java
@@ -26,14 +26,8 @@
 package jdk.internal.access;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 public interface JavaUtilCollectionAccess {
     <E> List<E> listFromTrustedArray(Object[] array);
     <E> List<E> listFromTrustedArrayNullsAllowed(Object[] array);
-    <E> List<E> stableList(int size, IntFunction<? extends E> mapper);
-    <K, V> Map<K, V> stableMap(Set<K> keys, Function<? super K, ? extends V> mapper);
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java b/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
index 2f3ba7d9e05..b3a19340fb5 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
@@ -38,6 +38,8 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.VarHandle;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
@@ -57,7 +59,7 @@ public final class CaptureStateUtil {
     // of combinators needed to form an adapted method handle.
     // The function is lazily computed.
     //
-    private static final Function<SegmentExtractorKey, MethodHandle> SEGMENT_EXTRACTION_HANDLE_CACHE;
+    private static final Map<SegmentExtractorKey, MethodHandle> SEGMENT_EXTRACTION_HANDLE_CACHE;
 
     static {
         final Set<SegmentExtractorKey> inputs = new HashSet<>();
@@ -77,7 +79,7 @@ public final class CaptureStateUtil {
             }
         };
 
-        SEGMENT_EXTRACTION_HANDLE_CACHE = StableValue.function(inputs, segmentExtractionHandle);
+        SEGMENT_EXTRACTION_HANDLE_CACHE = Map.ofLazy(inputs, segmentExtractionHandle);
     }
 
     // A key that holds both the `returnType` and the `stateName` needed to look up a
@@ -188,7 +190,10 @@ public final class CaptureStateUtil {
         final SegmentExtractorKey key = new SegmentExtractorKey(target, stateName);
 
         // ((int | long), MemorySegment)(int | long)
-        final MethodHandle segmentExtractor = SEGMENT_EXTRACTION_HANDLE_CACHE.apply(key);
+        final MethodHandle segmentExtractor = SEGMENT_EXTRACTION_HANDLE_CACHE.get(key);
+        if (segmentExtractor == null) {
+            throw new IllegalArgumentException("Input not allowed: " + key);
+        }
 
         // Make `target` specific adaptations of the basic handle
 
@@ -208,7 +213,7 @@ public final class CaptureStateUtil {
 
         // Use an `Arena` for the first argument instead and extract a segment from it.
         // (C0=Arena, C1-Cn)(int|long)
-        innerAdapted = MethodHandles.collectArguments(innerAdapted, 0, HANDLES_CACHE.apply(ALLOCATE));
+        innerAdapted = MethodHandles.collectArguments(innerAdapted, 0, HANDLES_CACHE.get(ALLOCATE));
 
         // Add an identity function for the result of the cleanup action.
         // ((int|long))(int|long)
@@ -221,7 +226,7 @@ public final class CaptureStateUtil {
         // cleanup action and invoke `Arena::close` when it is run. The `cleanup` handle
         // does not have to have all parameters. It can have zero or more.
         // (Throwable, (int|long), Arena)(int|long)
-        cleanup = MethodHandles.collectArguments(cleanup, 2, HANDLES_CACHE.apply(ARENA_CLOSE));
+        cleanup = MethodHandles.collectArguments(cleanup, 2, HANDLES_CACHE.get(ARENA_CLOSE));
 
         // Combine the `innerAdapted` and `cleanup` action into a try/finally block.
         // (Arena, C1-Cn)(int|long)
@@ -230,7 +235,7 @@ public final class CaptureStateUtil {
         // Acquire the arena from the global pool.
         // With this, we finally arrive at the intended method handle:
         // (C1-Cn)(int|long)
-        return MethodHandles.collectArguments(tryFinally, 0, HANDLES_CACHE.apply(ACQUIRE_ARENA));
+        return MethodHandles.collectArguments(tryFinally, 0, HANDLES_CACHE.get(ACQUIRE_ARENA));
     }
 
     private static MethodHandle makeSegmentExtractionHandle(SegmentExtractorKey segmentExtractorKey) {
@@ -260,15 +265,15 @@ public final class CaptureStateUtil {
         if (segmentExtractorKey.returnType().equals(int.class)) {
             // (int, MemorySegment)int
             return MethodHandles.guardWithTest(
-                    HANDLES_CACHE.apply(NON_NEGATIVE_INT),
-                    HANDLES_CACHE.apply(SUCCESS_INT),
-                    HANDLES_CACHE.apply(ERROR_INT).bindTo(intExtractor));
+                    HANDLES_CACHE.get(NON_NEGATIVE_INT),
+                    HANDLES_CACHE.get(SUCCESS_INT),
+                    HANDLES_CACHE.get(ERROR_INT).bindTo(intExtractor));
         } else {
             // (long, MemorySegment)long
             return MethodHandles.guardWithTest(
-                    HANDLES_CACHE.apply(NON_NEGATIVE_LONG),
-                    HANDLES_CACHE.apply(SUCCESS_LONG),
-                    HANDLES_CACHE.apply(ERROR_LONG).bindTo(intExtractor));
+                    HANDLES_CACHE.get(NON_NEGATIVE_LONG),
+                    HANDLES_CACHE.get(SUCCESS_LONG),
+                    HANDLES_CACHE.get(ERROR_LONG).bindTo(intExtractor));
         }
     }
 
@@ -341,8 +346,8 @@ public final class CaptureStateUtil {
         }
     };
 
-    private static final IntFunction<MethodHandle> HANDLES_CACHE =
-            StableValue.intFunction(ARENA_CLOSE + 1, UNDERLYING_MAKE_HANDLE);
+    private static final List<MethodHandle> HANDLES_CACHE =
+            List.ofLazy(ARENA_CLOSE + 1, UNDERLYING_MAKE_HANDLE);
 
     private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
index 820dfe90073..a6f4174324e 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
@@ -39,6 +39,7 @@ import java.util.Formatter;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.StaticProperty;
@@ -114,24 +115,29 @@ public final class JdkConsoleImpl implements JdkConsole {
     // check if `System.console()` returns a Console instance and use it if available. Otherwise,
     // it should call this method to obtain a JdkConsoleImpl. This ensures only one Console
     // instance exists in the Java runtime.
-    private static final StableValue<Optional<JdkConsoleImpl>> INSTANCE = StableValue.of();
-    public static Optional<JdkConsoleImpl> passwordConsole() {
-        return INSTANCE.orElseSet(() -> {
-            // If there's already a proper console, throw an exception
-            if (System.console() != null) {
-                throw new IllegalStateException("Can’t create a dedicated password " +
-                    "console since a real console already exists");
-            }
+    private static final LazyConstant<Optional<JdkConsoleImpl>> PASSWORD_CONSOLE = LazyConstant.of(
+            new Supplier<Optional<JdkConsoleImpl>>() {
+                @Override
+                public Optional<JdkConsoleImpl> get() {
+                    if (System.console() != null) {
+                        throw new IllegalStateException("Can’t create a dedicated password " +
+                                "console since a real console already exists");
+                    }
 
-            // If stdin is NOT redirected, return an Optional containing a JdkConsoleImpl
-            // instance, otherwise an empty Optional.
-            return SharedSecrets.getJavaIOAccess().isStdinTty() ?
-                Optional.of(
-                    new JdkConsoleImpl(
-                        Charset.forName(StaticProperty.stdinEncoding(), UTF_8.INSTANCE),
-                        Charset.forName(StaticProperty.stdoutEncoding(), UTF_8.INSTANCE))) :
-                Optional.empty();
-        });
+                    // If stdin is NOT redirected, return an Optional containing a JdkConsoleImpl
+                    // instance, otherwise an empty Optional.
+                    return SharedSecrets.getJavaIOAccess().isStdinTty() ?
+                            Optional.of(
+                                    new JdkConsoleImpl(
+                                            Charset.forName(StaticProperty.stdinEncoding(), UTF_8.INSTANCE),
+                                            Charset.forName(StaticProperty.stdoutEncoding(), UTF_8.INSTANCE))) :
+                            Optional.empty();
+                }
+            }
+    );
+
+    public static Optional<JdkConsoleImpl> passwordConsole() {
+        return PASSWORD_CONSOLE.get();
     }
 
     // Dedicated entry for sun.security.util.Password when stdout is redirected.
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 1316b8b946f..5942cefa2a1 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -85,8 +85,8 @@ public @interface PreviewFeature {
         //---
         @JEP(number=525, title="Structured Concurrency", status="Sixth Preview")
         STRUCTURED_CONCURRENCY,
-        @JEP(number = 502, title = "Stable Values", status = "Preview")
-        STABLE_VALUES,
+        @JEP(number = 526, title = "Lazy Constants", status = "Second Preview")
+        LAZY_CONSTANTS,
         @JEP(number=524, title="PEM Encodings of Cryptographic Objects",
             status="Second Preview")
         PEM_API,
diff --git a/src/java.base/share/classes/jdk/internal/lang/LazyConstantImpl.java b/src/java.base/share/classes/jdk/internal/lang/LazyConstantImpl.java
new file mode 100644
index 00000000000..59d0174c4c9
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/LazyConstantImpl.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.lang;
+
+import jdk.internal.misc.Unsafe;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * The sole implementation of the LazyConstant interface.
+ *
+ * @param <T> type of the constant
+ * @implNote This implementation can be used early in the boot sequence as it does not
+ * rely on reflection, MethodHandles, Streams etc.
+ */
+@AOTSafeClassInitializer
+public final class LazyConstantImpl<T> implements LazyConstant<T> {
+
+    // Unsafe allows `LazyConstant` instances to be used early in the boot sequence
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    // Unsafe offset for access of the `constant` field
+    private static final long CONSTANT_OFFSET =
+            UNSAFE.objectFieldOffset(LazyConstantImpl.class, "constant");
+
+    // Generally, fields annotated with `@Stable` are accessed by the JVM using special
+    // memory semantics rules (see `parse.hpp` and `parse(1|2|3).cpp`).
+    //
+    // This field is used reflectively via Unsafe using explicit memory semantics.
+    //
+    // | Value           | Meaning        |
+    // | --------------- | -------------- |
+    // | `null`          | Unset          |
+    // | `other`         | Set to `other` |
+    //
+    @Stable
+    private T constant;
+
+    // Underlying computing function to be used to compute the `constant` field.
+    // The field needs to be `volatile` as a lazy constant can be
+    // created by one thread and computed by another thread.
+    // After the function is successfully invoked, the field is set to
+    // `null` to allow the function to be collected.
+    @Stable
+    private volatile Supplier<? extends T> computingFunction;
+
+    private LazyConstantImpl(Supplier<? extends T> computingFunction) {
+        this.computingFunction = computingFunction;
+    }
+
+    @ForceInline
+    @Override
+    public T get() {
+        final T t = getAcquire();
+        return (t != null) ? t : getSlowPath();
+    }
+
+    private T getSlowPath() {
+        preventReentry();
+        synchronized (this) {
+            T t = getAcquire();
+            if (t == null) {
+                t = computingFunction.get();
+                Objects.requireNonNull(t);
+                setRelease(t);
+                // Allow the underlying supplier to be collected after successful use
+                computingFunction = null;
+            }
+            return t;
+        }
+    }
+
+    @ForceInline
+    @Override
+    public T orElse(T other) {
+        final T t = getAcquire();
+        return (t == null) ? other : t;
+    }
+
+    @ForceInline
+    @Override
+    public boolean isInitialized() {
+        return getAcquire() != null;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "[" + toStringSuffix() + "]";
+    }
+
+    private String toStringSuffix() {
+        final T t = getAcquire();
+        if (t == this) {
+            return "(this LazyConstant)";
+        } else if (t != null) {
+            return t.toString();
+        }
+        // Volatile read
+        final Supplier<? extends T> cf = computingFunction;
+        // There could be a race here
+        if (cf != null) {
+            return "computing function=" + computingFunction.toString();
+        }
+        // As we know `computingFunction` is `null` via a volatile read, we
+        // can now be sure that this lazy constant is initialized
+        return getAcquire().toString();
+    }
+
+
+    // Discussion on the memory semantics used.
+    // ----------------------------------------
+    // Using acquire/release semantics on the `constant` field is the cheapest way to
+    // establish a happens-before (HB) relation between load and store operations. Every
+    // implementation of a method defined in the interface `LazyConstant` except
+    // `equals()` starts with a load of the `constant` field using acquire semantics.
+    //
+    // If the underlying supplier was guaranteed to always create a new object,
+    // a fence after creation and subsequent plain loads would suffice to ensure
+    // new objects' state are always correctly observed. However, no such restriction is
+    // imposed on the underlying supplier. Hence, the docs state there should be an
+    // HB relation meaning we will have to pay a price (on certain platforms) on every
+    // `get()` operation that is not constant-folded.
+
+    @SuppressWarnings("unchecked")
+    @ForceInline
+    private T getAcquire() {
+        return (T) UNSAFE.getReferenceAcquire(this, CONSTANT_OFFSET);
+    }
+
+    private void setRelease(T newValue) {
+        UNSAFE.putReferenceRelease(this, CONSTANT_OFFSET, newValue);
+    }
+
+    private void preventReentry() {
+        if (Thread.holdsLock(this)) {
+            throw new IllegalStateException("Recursive invocation of a LazyConstant's computing function: " + computingFunction);
+        }
+    }
+
+    // Factory
+
+    public static <T> LazyConstantImpl<T> ofLazy(Supplier<? extends T> computingFunction) {
+        return new LazyConstantImpl<>(computingFunction);
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
deleted file mode 100644
index d6893438be5..00000000000
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.lang.stable;
-
-import jdk.internal.util.ImmutableBitSetPredicate;
-import jdk.internal.vm.annotation.ForceInline;
-import jdk.internal.vm.annotation.Stable;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.IntPredicate;
-import java.util.function.Supplier;
-
-/**
- * Optimized implementation of a stable Function with enums as keys.
- *
- * @implNote This implementation can be used early in the boot sequence as it does not
- *           rely on reflection, MethodHandles, Streams etc.
- *
- * @param enumType     the class type of the Enum
- * @param firstOrdinal the lowest ordinal used
- * @param member       an int predicate that can be used to test if an enum is a member
- *                     of the valid inputs (as there might be "holes")
- * @param delegates    a delegate array of inputs to StableValue mappings
- * @param original     the original Function
- * @param <E>          the type of the input to the function
- * @param <R>          the type of the result of the function
- */
-public record StableEnumFunction<E extends Enum<E>, R>(Class<E> enumType,
-                                                       int firstOrdinal,
-                                                       IntPredicate member,
-                                                       @Stable StableValueImpl<R>[] delegates,
-                                                       Function<? super E, ? extends R> original) implements Function<E, R> {
-    @ForceInline
-    @Override
-    public R apply(E value) {
-        if (!member.test(value.ordinal())) { // Implicit null-check of value
-            throw new IllegalArgumentException("Input not allowed: " + value);
-        }
-        final int index = value.ordinal() - firstOrdinal;
-        // Since we did the member.test above, we know the index is in bounds
-        return delegates[index].orElseSet(new Supplier<R>() {
-                    @Override public R get() { return original.apply(value); }});
-
-    }
-
-    @Override
-    public int hashCode() {
-        return System.identityHashCode(this);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj == this;
-    }
-
-    @Override
-    public String toString() {
-        final Collection<Map.Entry<E, StableValueImpl<R>>> entries = new ArrayList<>(delegates.length);
-        final E[] enumElements = enumType.getEnumConstants();
-        int ordinal = firstOrdinal;
-        for (int i = 0; i < delegates.length; i++, ordinal++) {
-            if (member.test(ordinal)) {
-                entries.add(new AbstractMap.SimpleImmutableEntry<>(enumElements[ordinal], delegates[i]));
-            }
-        }
-        return StableUtil.renderMappings(this, "StableFunction", entries, true);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T, E extends Enum<E>, R> Function<T, R> of(Set<? extends T> inputs,
-                                                              Function<? super T, ? extends R> original) {
-        // The input set is not empty
-        final Class<E> enumType = ((E) inputs.iterator().next()).getDeclaringClass();
-        final BitSet bitSet = new BitSet(enumType.getEnumConstants().length);
-        int min = Integer.MAX_VALUE;
-        int max = Integer.MIN_VALUE;
-        for (T t : inputs) {
-            final int ordinal = ((E) t).ordinal();
-            min = Math.min(min, ordinal);
-            max = Math.max(max, ordinal);
-            bitSet.set(ordinal);
-        }
-        final int size = max - min + 1;
-        final IntPredicate member = ImmutableBitSetPredicate.of(bitSet);
-        return (Function<T, R>) new StableEnumFunction<E, R>(enumType, min, member, StableUtil.array(size), (Function<E, R>) original);
-    }
-
-}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
deleted file mode 100644
index e36b4e9b25a..00000000000
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.lang.stable;
-
-import jdk.internal.vm.annotation.ForceInline;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-// Note: It would be possible to just use `StableMap::get` with some additional logic
-// instead of this class but explicitly providing a class like this provides better
-// debug capability, exception handling, and may provide better performance.
-/**
- * Implementation of a stable Function.
- *
- * @implNote This implementation can be used early in the boot sequence as it does not
- *           rely on reflection, MethodHandles, Streams etc.
- *
- * @param values   a delegate map of inputs to StableValue mappings
- * @param original the original Function
- * @param <T>      the type of the input to the function
- * @param <R>      the type of the result of the function
- */
-public record StableFunction<T, R>(Map<? extends T, StableValueImpl<R>> values,
-                                   Function<? super T, ? extends R> original) implements Function<T, R> {
-
-    @ForceInline
-    @Override
-    public R apply(T value) {
-        final StableValueImpl<R> stable = values.get(value);
-        if (stable == null) {
-            throw new IllegalArgumentException("Input not allowed: " + value);
-        }
-        return stable.orElseSet(new Supplier<R>() {
-            @Override  public R get() { return original.apply(value); }});
-    }
-
-    @Override
-    public int hashCode() {
-        return System.identityHashCode(this);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj == this;
-    }
-
-    @Override
-    public String toString() {
-        return StableUtil.renderMappings(this, "StableFunction", values.entrySet(), true);
-    }
-
-    public static <T, R> StableFunction<T, R> of(Set<? extends T> inputs,
-                                                 Function<? super T, ? extends R> original) {
-        return new StableFunction<>(StableUtil.map(inputs), original);
-    }
-
-}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
deleted file mode 100644
index a921a4de87b..00000000000
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.lang.stable;
-
-import jdk.internal.vm.annotation.ForceInline;
-import jdk.internal.vm.annotation.Stable;
-
-import java.util.function.IntFunction;
-import java.util.function.Supplier;
-
-/**
- * Implementation of a stable IntFunction.
- * <p>
- * For performance reasons (~10%), we are not delegating to a StableList but are using
- * the more primitive functions in StableValueUtil that are shared with StableList/StableValueImpl.
- *
- * @implNote This implementation can be used early in the boot sequence as it does not
- *           rely on reflection, MethodHandles, Streams etc.
- *
- * @param <R> the return type
- */
-public record StableIntFunction<R>(@Stable StableValueImpl<R>[] delegates,
-                                   IntFunction<? extends R> original) implements IntFunction<R> {
-
-    @ForceInline
-    @Override
-    public R apply(int index) {
-        final StableValueImpl<R> delegate;
-        try {
-            delegate =  delegates[index];
-        } catch (ArrayIndexOutOfBoundsException ioob) {
-            throw new IllegalArgumentException("Input not allowed: " + index, ioob);
-        }
-        return delegate.orElseSet(new Supplier<R>() {
-                    @Override public R get() { return original.apply(index); }});
-    }
-
-    @Override
-    public int hashCode() {
-        return System.identityHashCode(this);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj == this;
-    }
-
-    @Override
-    public String toString() {
-        return StableUtil.renderElements(this, "StableIntFunction", delegates);
-    }
-
-    public static <R> StableIntFunction<R> of(int size, IntFunction<? extends R> original) {
-        return new StableIntFunction<>(StableUtil.array(size), original);
-    }
-
-}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
deleted file mode 100644
index 631a41c5710..00000000000
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.lang.stable;
-
-import jdk.internal.vm.annotation.ForceInline;
-
-import java.util.function.Supplier;
-
-/**
- * Implementation of a stable supplier.
- * <p>
- * @implNote This implementation can be used early in the boot sequence as it does not
- *           rely on reflection, MethodHandles, Streams etc.
- *
- * @param <T> the return type
- */
-public record StableSupplier<T>(StableValueImpl<T> delegate,
-                                Supplier<? extends T> original) implements Supplier<T> {
-
-    @ForceInline
-    @Override
-    public T get() {
-        return delegate.orElseSet(original);
-    }
-
-    @Override
-    public int hashCode() {
-        return System.identityHashCode(this);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj == this;
-    }
-
-    @Override
-    public String toString() {
-        final Object t = delegate.wrappedContentsAcquire();
-        return t == this ? "(this StableSupplier)" : StableValueImpl.renderWrapped(t);
-    }
-
-    public static <T> StableSupplier<T> of(Supplier<? extends T> original) {
-        return new StableSupplier<>(StableValueImpl.of(), original);
-    }
-
-}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
deleted file mode 100644
index 74104ddbb49..00000000000
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.lang.stable;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.StringJoiner;
-
-public final class StableUtil {
-
-    private StableUtil() {}
-
-    public static <R> String renderElements(Object self,
-                                            String selfName,
-                                            StableValueImpl<?>[] delegates) {
-        return renderElements(self, selfName, delegates, 0, delegates.length);
-    }
-
-    public static <R> String renderElements(Object self,
-                                            String selfName,
-                                            StableValueImpl<?>[] delegates,
-                                            int offset,
-                                            int length) {
-        final StringJoiner sj = new StringJoiner(", ", "[", "]");
-        for (int i = 0; i < length; i++) {
-            final Object value = delegates[i + offset].wrappedContentsAcquire();
-            if (value == self) {
-                sj.add("(this " + selfName + ")");
-            } else {
-                sj.add(StableValueImpl.renderWrapped(value));
-            }
-        }
-        return sj.toString();
-    }
-
-    public static <K, V> String renderMappings(Object self,
-                                               String selfName,
-                                               Iterable<Map.Entry<K, StableValueImpl<V>>> delegates,
-                                               boolean curly) {
-        final StringJoiner sj = new StringJoiner(", ", curly ? "{" : "[", curly ? "}" : "]");
-        for (var e : delegates) {
-            final Object value = e.getValue().wrappedContentsAcquire();
-            final String valueString;
-            if (value == self) {
-                valueString = "(this " + selfName + ")";
-            } else {
-                valueString = StableValueImpl.renderWrapped(value);
-            }
-            sj.add(e.getKey() + "=" + valueString);
-        }
-        return sj.toString();
-    }
-
-    public static <T> StableValueImpl<T>[] array(int size) {
-        assertSizeNonNegative(size);
-        @SuppressWarnings("unchecked")
-        final var stableValues = (StableValueImpl<T>[]) new StableValueImpl<?>[size];
-        for (int i = 0; i < size; i++) {
-            stableValues[i] = StableValueImpl.of();
-        }
-        return stableValues;
-    }
-
-    public static <K, T> Map<K, StableValueImpl<T>> map(Set<K> keys) {
-        Objects.requireNonNull(keys);
-        @SuppressWarnings("unchecked")
-        final var entries = (Map.Entry<K, StableValueImpl<T>>[]) new Map.Entry<?, ?>[keys.size()];
-        int i = 0;
-        for (K key : keys) {
-            entries[i++] = Map.entry(key, StableValueImpl.of());
-        }
-        return Map.ofEntries(entries);
-    }
-
-    public static void assertSizeNonNegative(int size) {
-        if (size < 0) {
-            throw new IllegalArgumentException("size can not be negative: " + size);
-        }
-    }
-
-}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
deleted file mode 100644
index 1413fd7446e..00000000000
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.lang.stable;
-
-import jdk.internal.misc.Unsafe;
-import jdk.internal.vm.annotation.DontInline;
-import jdk.internal.vm.annotation.ForceInline;
-import jdk.internal.vm.annotation.Stable;
-
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-/**
- * The implementation of StableValue.
- *
- * @implNote This implementation can be used early in the boot sequence as it does not
- *           rely on reflection, MethodHandles, Streams etc.
- *
- * @param <T> type of the contents
- */
-public final class StableValueImpl<T> implements StableValue<T> {
-
-    static final String UNSET_LABEL = ".unset";
-
-    // Unsafe allows StableValue to be used early in the boot sequence
-    static final Unsafe UNSAFE = Unsafe.getUnsafe();
-
-    // Unsafe offsets for direct field access
-
-    private static final long CONTENTS_OFFSET =
-            UNSAFE.objectFieldOffset(StableValueImpl.class, "contents");
-
-    // Used to indicate a holder value is `null` (see field `contents` below)
-    private static final Object NULL_SENTINEL = new Object();
-
-    // Generally, fields annotated with `@Stable` are accessed by the JVM using special
-    // memory semantics rules (see `parse.hpp` and `parse(1|2|3).cpp`).
-    //
-    // This field is used directly and reflectively via Unsafe using explicit memory semantics.
-    //
-    // | Value          |  Meaning      |
-    // | -------------- |  ------------ |
-    // | null           |  Unset        |
-    // | NULL_SENTINEL  |  Set(null)    |
-    // | other          |  Set(other)   |
-    //
-    @Stable
-    private Object contents;
-
-    // Only allow creation via the factory `StableValueImpl::newInstance`
-    private StableValueImpl() {}
-
-    @ForceInline
-    @Override
-    public boolean trySet(T contents) {
-        if (wrappedContentsAcquire() != null) {
-            return false;
-        }
-        // Prevent reentry via an orElseSet(supplier)
-        preventReentry();
-        // Mutual exclusion is required here as `orElseSet` might also
-        // attempt to modify `this.contents`
-        synchronized (this) {
-            return wrapAndSet(contents);
-        }
-    }
-
-    @ForceInline
-    @Override
-    public void setOrThrow(T contents) {
-        if (!trySet(contents)) {
-            // Neither the set contents nor the provided contents is revealed in the
-            // exception message as it might be sensitive.
-            throw new IllegalStateException("The contents is already set");
-        }
-    }
-
-    @ForceInline
-    @Override
-    public T orElseThrow() {
-        final Object t = wrappedContentsAcquire();
-        if (t == null) {
-            throw new NoSuchElementException("No contents set");
-        }
-        return unwrap(t);
-    }
-
-    @ForceInline
-    @Override
-    public T orElse(T other) {
-        final Object t = wrappedContentsAcquire();
-        return (t == null) ? other : unwrap(t);
-    }
-
-    @ForceInline
-    @Override
-    public boolean isSet() {
-        return wrappedContentsAcquire() != null;
-    }
-
-    @ForceInline
-    @Override
-    public T orElseSet(Supplier<? extends T> supplier) {
-        Objects.requireNonNull(supplier);
-        final Object t = wrappedContentsAcquire();
-        return (t == null) ? orElseSetSlowPath(supplier) : unwrap(t);
-    }
-
-    @DontInline
-    private T orElseSetSlowPath(Supplier<? extends T> supplier) {
-        preventReentry();
-        synchronized (this) {
-            final Object t = contents;  // Plain semantics suffice here
-            if (t == null) {
-                final T newValue = supplier.get();
-                // The mutex is not reentrant so we know newValue should be returned
-                wrapAndSet(newValue);
-                return newValue;
-            }
-            return unwrap(t);
-        }
-    }
-
-    // The methods equals() and hashCode() should be based on identity (defaults from Object)
-
-    @Override
-    public String toString() {
-        final Object t = wrappedContentsAcquire();
-        return t == this
-                ? "(this StableValue)"
-                : renderWrapped(t);
-    }
-
-    // Internal methods shared with other internal classes
-
-    @ForceInline
-    public Object wrappedContentsAcquire() {
-        return UNSAFE.getReferenceAcquire(this, CONTENTS_OFFSET);
-    }
-
-    static String renderWrapped(Object t) {
-        return (t == null) ? UNSET_LABEL : Objects.toString(unwrap(t));
-    }
-
-    // Private methods
-
-    // This method is not annotated with @ForceInline as it is always called
-    // in a slow path.
-    private void preventReentry() {
-        if (Thread.holdsLock(this)) {
-            throw new IllegalStateException("Recursive initialization of a stable value is illegal");
-        }
-    }
-
-    /**
-     * Wraps the provided {@code newValue} and tries to set the contents.
-     * <p>
-     * This method ensures the {@link Stable} field is written to at most once.
-     *
-     * @param newValue to wrap and set
-     * @return if the contents was set
-     */
-    @ForceInline
-    private boolean wrapAndSet(T newValue) {
-        assert Thread.holdsLock(this);
-        // We know we hold the monitor here so plain semantic is enough
-        if (contents == null) {
-            UNSAFE.putReferenceRelease(this, CONTENTS_OFFSET, wrap(newValue));
-            return true;
-        }
-        return false;
-    }
-
-
-    // Wraps `null` values into a sentinel value
-    @ForceInline
-    private static Object wrap(Object t) {
-        return (t == null) ? NULL_SENTINEL : t;
-    }
-
-    // Unwraps null sentinel values into `null`
-    @SuppressWarnings("unchecked")
-    @ForceInline
-    private static <T> T unwrap(Object t) {
-        return t != NULL_SENTINEL ? (T) t : null;
-    }
-
-    // Factory
-
-    public static <T> StableValueImpl<T> of() {
-        return new StableValueImpl<>();
-    }
-
-}
diff --git a/src/java.base/share/classes/sun/nio/ch/Net.java b/src/java.base/share/classes/sun/nio/ch/Net.java
index 9ec7975a35c..4564579d054 100644
--- a/src/java.base/share/classes/sun/nio/ch/Net.java
+++ b/src/java.base/share/classes/sun/nio/ch/Net.java
@@ -48,6 +48,8 @@ import java.nio.channels.UnresolvedAddressException;
 import java.nio.channels.UnsupportedAddressTypeException;
 import java.util.Enumeration;
 import java.util.Objects;
+import java.lang.LazyConstant;
+import java.util.function.Supplier;
 
 import sun.net.ext.ExtendedSocketOptions;
 import sun.net.util.IPAddressUtil;
@@ -94,13 +96,14 @@ public class Net {
         return EXCLUSIVE_BIND;
     }
 
-    private static final StableValue<Boolean> SHUTDOWN_WRITE_BEFORE_CLOSE = StableValue.of();
+    private static final LazyConstant<Boolean> SHUTDOWN_WRITE_BEFORE_CLOSE = LazyConstant.of(new Supplier<Boolean>() {
+        @Override  public Boolean get() { return shouldShutdownWriteBeforeClose0(); }});
 
     /**
      * Tells whether a TCP connection should be shutdown for writing before closing.
      */
     static boolean shouldShutdownWriteBeforeClose() {
-        return SHUTDOWN_WRITE_BEFORE_CLOSE.orElseSet(Net::shouldShutdownWriteBeforeClose0);
+        return SHUTDOWN_WRITE_BEFORE_CLOSE.get();
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
index 529ca1b0c13..91efc61d1bf 100644
--- a/src/java.base/share/classes/sun/util/locale/BaseLocale.java
+++ b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
@@ -92,8 +92,8 @@ public final class BaseLocale {
     }
 
     // Interned BaseLocale cache
-    private static final Supplier<ReferencedKeySet<BaseLocale>> CACHE =
-            StableValue.supplier(new Supplier<>() {
+    private static final LazyConstant<ReferencedKeySet<BaseLocale>> CACHE =
+            LazyConstant.of(new Supplier<>() {
                 @Override
                 public ReferencedKeySet<BaseLocale> get() {
                     return ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
diff --git a/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java b/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java
index d7c575962f6..49e882c5ca6 100644
--- a/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java
+++ b/src/java.base/share/classes/sun/util/resources/BreakIteratorResourceBundle.java
@@ -50,7 +50,7 @@ public abstract class BreakIteratorResourceBundle extends ResourceBundle {
     // those keys must be added to NON_DATA_KEYS.
     private static final Set<String> NON_DATA_KEYS = Set.of("BreakIteratorClasses");
 
-    private final Supplier<Set<String>> keys = StableValue.supplier(
+    private final LazyConstant<Set<String>> keys = LazyConstant.of(
             new Supplier<>() { public Set<String> get() { return keys0(); }});
 
     private Set<String> keys0() {
diff --git a/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java b/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
index 0c16f508018..9d0c1c015ce 100644
--- a/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
+++ b/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
@@ -119,7 +119,7 @@ public abstract class OpenListResourceBundle extends ResourceBundle {
         return new HashSet<>();
     }
 
-    private final Supplier<Map<String, Object>> lookup = StableValue.supplier(
+    private final LazyConstant<Map<String, Object>> lookup = LazyConstant.of(
             new Supplier<>() { public Map<String, Object> get() { return lookup0(); }});
 
     private Map<String, Object> lookup0() {
@@ -134,7 +134,7 @@ public abstract class OpenListResourceBundle extends ResourceBundle {
         return temp;
     }
 
-    private final Supplier<Set<String>> keyset = StableValue.supplier(
+    private final LazyConstant<Set<String>> keyset = LazyConstant.of(
             new Supplier<>() { public Set<String> get() { return keyset0(); }});
 
     private Set<String> keyset0() {
diff --git a/test/jdk/java/lang/LazyConstant/DemoContainerInjectionTest.java b/test/jdk/java/lang/LazyConstant/DemoContainerInjectionTest.java
new file mode 100644
index 00000000000..df51a562210
--- /dev/null
+++ b/test/jdk/java/lang/LazyConstant/DemoContainerInjectionTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Basic tests for dependency injection
+ * @enablePreview
+ * @run junit DemoContainerInjectionTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class DemoContainerInjectionTest {
+
+    interface Foo{}
+    interface Bar{};
+    static class FooImpl implements Foo{};
+    static class BarImpl implements Bar{};
+
+    // Provides a type safe way of associating a type to a supplier
+    record Provider<T>(Class<T> type, Supplier<? extends T> supplier){}
+
+    @Test
+    void ComputedComponentsViaLambda() {
+        Container container = ComputedContainer.of(Set.of(Foo.class, Bar.class), t -> switch (t) {
+            case Class<?> c when c.equals(Foo.class) -> new FooImpl();
+            case Class<?> c when c.equals(Bar.class) -> new BarImpl();
+            default -> throw new IllegalArgumentException();
+        });
+        assertContainerPopulated(container);
+    }
+
+    @Test
+    void SettableComponents() {
+        SettableContainer container = SettableScratchContainer.of(Set.of(Foo.class, Bar.class));
+        container.set(Foo.class, new FooImpl());
+        container.set(Bar.class, new BarImpl());
+        assertContainerPopulated(container);
+    }
+
+
+    @Test
+    void ProviderComponents() {
+        Container container = ProviderContainer.of(Map.of(
+                Foo.class, FooImpl::new,
+                Bar.class, BarImpl::new));
+        assertContainerPopulated(container);
+    }
+
+    @Test
+    void ProviderTypedComponents() {
+        Container container = providerTypedContainer(Set.of(
+           new Provider<>(Foo.class, FooImpl::new),
+           new Provider<>(Bar.class, BarImpl::new)
+        ));
+        assertContainerPopulated(container);
+    }
+
+    private static void assertContainerPopulated(Container container) {
+        assertInstanceOf(FooImpl.class, container.get(Foo.class));
+        assertInstanceOf(BarImpl.class, container.get(Bar.class));
+    }
+
+    interface Container {
+        <T> T get(Class<T> type);
+    }
+
+    interface SettableContainer extends Container {
+        <T> void set(Class<T> type, T implementation);
+    }
+
+    record ComputedContainer(Map<Class<?>, ?> components) implements Container {
+
+        @Override
+        public <T> T get(Class<T> type) {
+            return type.cast(components.get(type));
+        }
+
+        static Container of(Set<Class<?>> components, Function<Class<?>, ?> mapper) {
+            return new ComputedContainer(Map.ofLazy(components, mapper));
+        }
+
+    }
+
+    record SettableScratchContainer(Map<Class<?>, Object> scratch, Map<Class<?>, ?> components) implements SettableContainer {
+
+        @Override
+        public <T> void set(Class<T> type, T implementation) {
+            if (scratch.putIfAbsent(type, type.cast(implementation)) != null) {
+                throw new IllegalStateException("Can only set once for " + type);
+            }
+        }
+
+        @Override
+        public <T> T get(Class<T> type) {
+            return type.cast(components.get(type));
+        }
+
+        static SettableContainer of(Set<Class<?>> components) {
+            Map<Class<?>, Object> scratch = new ConcurrentHashMap<>();
+            return new SettableScratchContainer(scratch, Map.ofLazy(components, scratch::get));
+        }
+
+    }
+
+    record ProviderContainer(Map<Class<?>, ?> components) implements Container {
+
+        @Override
+        public <T> T get(Class<T> type) {
+            return type.cast(components.get(type));
+        }
+
+        static Container of(Map<Class<?>, Supplier<?>> components) {
+            var map = Map.ofLazy(components.keySet(), t -> components.get(t).get());
+            return new ProviderContainer(map);
+        }
+
+    }
+
+    static Container providerTypedContainer(Set<Provider<?>> providers) {
+                return ProviderContainer.of(providers.stream()
+                                .collect(Collectors.toMap(Provider::type, Provider::supplier)));
+    }
+
+}
diff --git a/test/jdk/java/lang/LazyConstant/DemoImperativeTest.java b/test/jdk/java/lang/LazyConstant/DemoImperativeTest.java
new file mode 100644
index 00000000000..bc1208e67f8
--- /dev/null
+++ b/test/jdk/java/lang/LazyConstant/DemoImperativeTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Test of a demo of an imperative stable value based on a lazy constant
+ * @enablePreview
+ * @run junit DemoImperativeTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class DemoImperativeTest {
+
+    interface ImperativeStableValue<T> {
+        T orElse(T other);
+        boolean isSet();
+        boolean trySet(T t);
+        T get();
+
+        static <T> ImperativeStableValue<T> of() {
+            var scratch = new AtomicReference<T>();
+            return new Impl<>(scratch, LazyConstant.of(scratch::get));
+        }
+
+    }
+
+
+    private record Impl<T>(AtomicReference<T> scratch,
+                           LazyConstant<T> underlying) implements ImperativeStableValue<T> {
+
+        @Override
+        public boolean trySet(T t) {
+            final boolean result = scratch.compareAndSet(null, t);
+            if (result) {
+                // Actually set the value
+                get();
+            }
+            return result;
+        }
+
+        @Override public T       orElse(T other) { return underlying.orElse(other); }
+        @Override public boolean isSet() { return underlying.isInitialized(); }
+        @Override public T       get() { return underlying.get(); }
+
+    }
+
+    @Test
+    void basic() {
+        var stableValue = ImperativeStableValue.<Integer>of();
+        assertFalse(stableValue.isSet());
+        assertEquals(13, stableValue.orElse(13));
+        assertTrue(stableValue.trySet(42));
+        assertFalse(stableValue.trySet(13));
+        assertTrue(stableValue.isSet());
+        assertEquals(42, stableValue.get());
+        assertEquals(42, stableValue.orElse(13));
+    }
+
+}
diff --git a/test/jdk/java/lang/LazyConstant/DemoMapTest.java b/test/jdk/java/lang/LazyConstant/DemoMapTest.java
new file mode 100644
index 00000000000..25e37494cb9
--- /dev/null
+++ b/test/jdk/java/lang/LazyConstant/DemoMapTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Test of a lazy map application
+ * @enablePreview
+ * @run junit DemoMapTest
+ */
+
+import org.junit.jupiter.api.*;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class DemoMapTest {
+
+    static class OrderController{}
+
+    // NEW:
+    static final Map<String, OrderController> ORDERS
+            = Map.ofLazy(
+                    Set.of("Customers", "Internal", "Testing"),
+                    _ -> new OrderController()
+    );
+
+    public static OrderController orders() {
+        String groupName = Thread.currentThread().getThreadGroup().getName();
+        return ORDERS.get(groupName);
+    }
+
+    @Test
+    void orderController() throws InterruptedException {
+        Thread t = Thread.ofPlatform()
+                .group(new ThreadGroup("Customers"))
+                .start(() -> {
+                    String groupName = Thread.currentThread().getThreadGroup().getName();
+                    OrderController orderController = ORDERS.get(groupName);
+                    assertNotNull(orderController);
+                });
+        t.join();
+    }
+
+    private static final Map<Integer, String> SERVER_ERROR_PAGES = Map.ofLazy(
+            Set.of(500, 501, 502, 503, 504, 505, 506, 507, 508, 510, 511),
+            e -> {
+                try {
+                    return Files.readString(Path.of("server_error_" + e + ".html"));
+                } catch (IOException ioe) {
+                    throw new RuntimeException(ioe);
+                }
+            });
+
+    private static String htmlServerErrorPage(int errorCode) {
+        return SERVER_ERROR_PAGES.get(errorCode); // Eligible for constant folding
+    }
+
+    @Test
+    void page500() {
+        String page = htmlServerErrorPage(500); // Constant folds
+        assertEquals(DEFAULT_FS_MSG, page);
+    }
+
+    static final String DEFAULT_FS_MSG = """
+            <!DOCTYPE html>
+            <html lang="en">
+              <head>
+                <meta charset="utf-8">
+                <title>Internal Server Error (500)</title>
+                <link rel="stylesheet" href="style.css">
+                <script src="script.js"></script>
+              </head>
+              <body>
+                There was a general problem with the server, code 500
+              </body>
+            </html>
+            """;
+
+    @BeforeAll
+    public static void setup() throws IOException {
+        var file = Path.of("server_error_500.html");
+        if (Files.notExists(file)) {
+            Files.createFile(file);
+            Files.writeString(file, DEFAULT_FS_MSG);
+        }
+        assertEquals(DEFAULT_FS_MSG, Files.readString(file));
+    }
+
+    @AfterAll
+    public static void cleanUp() throws IOException {
+        var file = Path.of("server_error_500.html");
+        Files.deleteIfExists(file);
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java b/test/jdk/java/lang/LazyConstant/LazyConstantSafePublicationTest.java
similarity index 73%
rename from test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java
rename to test/jdk/java/lang/LazyConstant/LazyConstantSafePublicationTest.java
index 151d6f9c805..4d88169b155 100644
--- a/test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java
+++ b/test/jdk/java/lang/LazyConstant/LazyConstantSafePublicationTest.java
@@ -22,10 +22,11 @@
  */
 
 /* @test
- * @summary Basic tests for making sure StableValue publishes values safely
+ * @summary Basic tests for making sure ComputedConstant publishes values safely
  * @modules java.base/jdk.internal.misc
+ * @modules java.base/jdk.internal.lang
  * @enablePreview
- * @run junit StableValuesSafePublicationTest
+ * @run junit LazyConstantSafePublicationTest
  */
 
 import org.junit.jupiter.api.Test;
@@ -36,30 +37,22 @@ import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.lang.LazyConstant;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-final class StableValuesSafePublicationTest {
+final class LazyConstantSafePublicationTest {
 
     private static final int SIZE = 100_000;
     private static final int THREADS = Runtime.getRuntime().availableProcessors();
-    private static final StableValue<Holder>[] STABLES = stables();
-
-    static StableValue<Holder>[] stables() {
-        @SuppressWarnings("unchecked")
-        StableValue<Holder>[] stables = (StableValue<Holder>[]) new StableValue[SIZE];
-        for (int i = 0; i < SIZE; i++) {
-            stables[i] = StableValue.of();
-        }
-        return stables;
-    }
 
     static final class Holder {
         // These are non-final fields but should be seen
-        // fully initialized thanks to the HB properties of StableValue.
+        // fully initialized thanks to the HB properties of ComputedConstants.
         int a, b, c, d, e;
 
         Holder() {
@@ -69,17 +62,21 @@ final class StableValuesSafePublicationTest {
 
     static final class Consumer implements Runnable {
 
+        final LazyConstant<Holder>[] constants;
         final int[] observations = new int[SIZE];
-        final StableValue<Holder>[] stables = STABLES;
         int i = 0;
 
+        public Consumer(LazyConstant<Holder>[] constants) {
+            this.constants = constants;
+        }
+
         @Override
         public void run() {
             for (; i < SIZE; i++) {
-                StableValue<Holder> s = stables[i];
+                LazyConstant<Holder> s = constants[i];
                 Holder h;
-                // Wait until the StableValue has a holder value
-                while ((h = s.orElse(null)) == null) {}
+                // Wait until the ComputedConstant has a holder value
+                while ((h = s.orElse(null)) == null) { Thread.onSpinWait();}
                 int a = h.a;
                 int b = h.b;
                 int c = h.c;
@@ -92,15 +89,19 @@ final class StableValuesSafePublicationTest {
 
     static final class Producer implements Runnable {
 
-        final StableValue<Holder>[] stables = STABLES;
+        final LazyConstant<Holder>[] constants;
+
+        public Producer(LazyConstant<Holder>[] constants) {
+            this.constants = constants;
+        }
 
         @Override
         public void run() {
-            StableValue<Holder> s;
+            LazyConstant<Holder> s;
             long deadlineNs = System.nanoTime();
             for (int i = 0; i < SIZE; i++) {
-                s = stables[i];
-                s.trySet(new Holder());
+                s = constants[i];
+                s.get();
                 deadlineNs += 1000;
                 while (System.nanoTime() < deadlineNs) {
                     Thread.onSpinWait();
@@ -110,9 +111,10 @@ final class StableValuesSafePublicationTest {
     }
 
     @Test
-    void main() {
+    void mainTest() {
+        final LazyConstant<Holder>[] constants = constants();
         List<Consumer> consumers = IntStream.range(0, THREADS)
-                .mapToObj(_ -> new Consumer())
+                .mapToObj(_ -> new Consumer(constants))
                 .toList();
 
         List<Thread> consumersThreads = IntStream.range(0, THREADS)
@@ -121,14 +123,14 @@ final class StableValuesSafePublicationTest {
                         .start(consumers.get(i)))
                 .toList();
 
-        Producer producer = new Producer();
+        Producer producer = new Producer(constants);
 
         Thread producerThread = Thread.ofPlatform()
                 .name("Producer Thread")
                 .start(producer);
 
-        join(consumers, producerThread);
-        join(consumers, consumersThreads.toArray(Thread[]::new));
+        join(constants, consumers, producerThread);
+        join(constants, consumers, consumersThreads.toArray(Thread[]::new));
 
         int[] histogram = new int[64];
         for (Consumer consumer : consumers) {
@@ -146,7 +148,7 @@ final class StableValuesSafePublicationTest {
         assertEquals(THREADS * SIZE, histogram[63]);
     }
 
-    static void join(List<Consumer> consumers, Thread... threads) {
+    static void join(final LazyConstant<Holder>[] constants, List<Consumer> consumers, Thread... threads) {
         try {
             for (Thread t:threads) {
                 long deadline = System.nanoTime() + TimeUnit.MINUTES.toNanos(1);
@@ -163,11 +165,11 @@ final class StableValuesSafePublicationTest {
                     }
                     if (System.nanoTime() > deadline) {
                         long nonNulls = CompletableFuture.supplyAsync(() ->
-                                Stream.of(STABLES)
+                                Arrays.stream(constants)
                                         .map(s -> s.orElse(null))
                                         .filter(Objects::nonNull)
                                         .count(), Executors.newSingleThreadExecutor()).join();
-                        fail("Giving up! Set stables seen by a new thread: " + nonNulls);
+                        fail("Giving up! Set lazy constants seen by a new thread: " + nonNulls);
                     }
                 }
             }
@@ -176,4 +178,13 @@ final class StableValuesSafePublicationTest {
         }
     }
 
+    static LazyConstant<Holder>[] constants() {
+        @SuppressWarnings("unchecked")
+        LazyConstant<Holder>[] constants = (LazyConstant<Holder>[]) new LazyConstant[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            constants[i] = LazyConstant.of(Holder::new);
+        }
+        return constants;
+    }
+
 }
diff --git a/test/jdk/java/lang/LazyConstant/LazyConstantTest.java b/test/jdk/java/lang/LazyConstant/LazyConstantTest.java
new file mode 100644
index 00000000000..af194cbcc01
--- /dev/null
+++ b/test/jdk/java/lang/LazyConstant/LazyConstantTest.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Basic tests for the LazyConstant implementation
+ * @enablePreview
+ * @modules java.base/jdk.internal.lang
+ * @run junit/othervm --add-opens java.base/jdk.internal.lang=ALL-UNNAMED LazyConstantTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.lang.LazyConstant;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+final class LazyConstantTest {
+
+    private static final int VALUE = 42;
+    private static final Supplier<Integer> SUPPLIER = () -> VALUE;
+
+    @Test
+    void factoryInvariants() {
+        assertThrows(NullPointerException.class, () -> LazyConstant.of(null));
+    }
+
+    @ParameterizedTest
+    @MethodSource("factories")
+    void basic(Function<Supplier<Integer>, LazyConstant<Integer>> factory) {
+        LazyConstantTestUtil.CountingSupplier<Integer> cs = new LazyConstantTestUtil.CountingSupplier<>(SUPPLIER);
+        var lazy = factory.apply(cs);
+        assertFalse(lazy.isInitialized());
+        assertEquals(SUPPLIER.get(), lazy.get());
+        assertEquals(1, cs.cnt());
+        assertEquals(SUPPLIER.get(), lazy.get());
+        assertEquals(1, cs.cnt());
+        assertTrue(lazy.toString().contains(Integer.toString(SUPPLIER.get())));
+    }
+
+    @ParameterizedTest
+    @MethodSource("factories")
+    void exception(Function<Supplier<Integer>, LazyConstant<Integer>> factory) {
+        LazyConstantTestUtil.CountingSupplier<Integer> cs = new LazyConstantTestUtil.CountingSupplier<>(() -> {
+            throw new UnsupportedOperationException();
+        });
+        var lazy = factory.apply(cs);
+        assertThrows(UnsupportedOperationException.class, lazy::get);
+        assertEquals(1, cs.cnt());
+        assertThrows(UnsupportedOperationException.class, lazy::get);
+        assertEquals(2, cs.cnt());
+        assertTrue(lazy.toString().contains("computing function"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void orElse(LazyConstant<Integer> constant) {
+        assertNull(constant.orElse(null));
+        constant.get();
+        assertEquals(VALUE, constant.orElse(null));
+    }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void get(LazyConstant<Integer> constant) {
+        assertEquals(VALUE, constant.get());
+    }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void isInitialized(LazyConstant<Integer> constant) {
+        assertFalse(constant.isInitialized());
+        constant.get();
+        assertTrue(constant.isInitialized());
+   }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void testHashCode(LazyConstant<Integer> constant) {
+        assertEquals(System.identityHashCode(constant), constant.hashCode());
+    }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void testEquals(LazyConstant<Integer> c0) {
+        assertNotEquals(null, c0);
+        LazyConstant<Integer> different = LazyConstant.of(SUPPLIER);
+        assertNotEquals(different, c0);
+        assertNotEquals(c0, different);
+        assertNotEquals("a", c0);
+    }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void testLazyConstantAsComputingFunction(LazyConstant<Integer> constant) {
+        LazyConstant<Integer> c1 = LazyConstant.of(constant);
+        assertSame(constant, c1);
+    }
+
+    @Test
+    void toStringTest() {
+        Supplier<String> supplier = () -> "str";
+        LazyConstant<String> lazy = LazyConstant.of(supplier);
+        var expectedSubstring = "computing function=" + supplier;
+        assertTrue(lazy.toString().contains(expectedSubstring));
+        lazy.get();
+        assertTrue(lazy.toString().contains("str"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("lazyConstants")
+    void toStringUnset(LazyConstant<Integer> constant) {
+        String unInitializedToString = constant.toString();
+        int suffixEnd = unInitializedToString.indexOf("[");
+        String suffix = unInitializedToString.substring(0, suffixEnd);
+        String expectedUninitialized = suffix+"[computing function=";
+        assertTrue(unInitializedToString.startsWith(expectedUninitialized));
+        constant.get();
+        String expectedInitialized = suffix + "[" + VALUE + "]";
+        assertEquals(expectedInitialized, constant.toString());
+    }
+
+    @Test
+    void toStringCircular() {
+        AtomicReference<LazyConstant<?>> ref = new AtomicReference<>();
+        LazyConstant<LazyConstant<?>> constant = LazyConstant.of(ref::get);
+        ref.set(constant);
+        constant.get();
+        String toString = assertDoesNotThrow(constant::toString);
+        assertTrue(constant.toString().contains("(this LazyConstant)"), toString);
+    }
+
+    @Test
+    void recursiveCall() {
+        AtomicReference<LazyConstant<Integer>> ref = new AtomicReference<>();
+        LazyConstant<Integer> constant = LazyConstant.of(() -> ref.get().get());
+        LazyConstant<Integer> constant1 = LazyConstant.of(constant);
+        ref.set(constant1);
+        assertThrows(IllegalStateException.class, constant::get);
+    }
+
+    @ParameterizedTest
+    @MethodSource("factories")
+    void underlying(Function<Supplier<Integer>, LazyConstant<Integer>> factory) {
+        LazyConstantTestUtil.CountingSupplier<Integer> cs = new LazyConstantTestUtil.CountingSupplier<>(SUPPLIER);
+        var f1 = factory.apply(cs);
+
+        Supplier<?> underlyingBefore = LazyConstantTestUtil.computingFunction(f1);
+        assertSame(cs, underlyingBefore);
+        int v = f1.get();
+        Supplier<?> underlyingAfter = LazyConstantTestUtil.computingFunction(f1);
+        assertNull(underlyingAfter);
+    }
+
+    @ParameterizedTest
+    @MethodSource("factories")
+    void functionHolderException(Function<Supplier<Integer>, LazyConstant<Integer>> factory) {
+        LazyConstantTestUtil.CountingSupplier<Integer> cs = new LazyConstantTestUtil.CountingSupplier<>(() -> {
+            throw new UnsupportedOperationException();
+        });
+        var f1 = factory.apply(cs);
+
+        Supplier<?> underlyingBefore = LazyConstantTestUtil.computingFunction(f1);
+        assertSame(cs, underlyingBefore);
+        try {
+            int v = f1.get();
+        } catch (UnsupportedOperationException _) {
+            // Expected
+        }
+        Supplier<?> underlyingAfter = LazyConstantTestUtil.computingFunction(f1);
+        assertSame(cs, underlyingAfter);
+    }
+
+    private static Stream<LazyConstant<Integer>> lazyConstants() {
+        return factories()
+                .map(f -> f.apply(() -> VALUE));
+    }
+
+    private static Stream<Function<Supplier<Integer>, LazyConstant<Integer>>> factories() {
+        return Stream.of(
+                supplier("ComputedConstant.of(<lambda>)", LazyConstant::of)
+        );
+    }
+
+    private static Function<Supplier<Integer>, LazyConstant<Integer>> supplier(String name,
+                                                                               Function<Supplier<Integer>, LazyConstant<Integer>> underlying) {
+        return new Function<Supplier<Integer>, LazyConstant<Integer>>() {
+            @Override
+            public LazyConstant<Integer> apply(Supplier<Integer> supplier) {
+                return underlying.apply(supplier);
+            }
+
+            @Override
+            public String toString() {
+                return name;
+            }
+        };
+    }
+
+    record Lazy<T>(LazyConstant<T> underlying) implements Supplier<T> {
+        @Override
+        public T get() { return underlying.get(); }
+
+        static <T> Lazy<T> of(Supplier<? extends T> computingFunction) {
+            return new Lazy<>(LazyConstant.of(computingFunction));
+        }
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableTestUtil.java b/test/jdk/java/lang/LazyConstant/LazyConstantTestUtil.java
similarity index 64%
rename from test/jdk/java/lang/StableValue/StableTestUtil.java
rename to test/jdk/java/lang/LazyConstant/LazyConstantTestUtil.java
index f71915c28ee..502f46b726d 100644
--- a/test/jdk/java/lang/StableValue/StableTestUtil.java
+++ b/test/jdk/java/lang/LazyConstant/LazyConstantTestUtil.java
@@ -21,15 +21,18 @@
  * questions.
  */
 
+import java.lang.reflect.Field;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
 
-final class StableTestUtil {
+final class LazyConstantTestUtil {
 
-    private StableTestUtil() {}
+    private LazyConstantTestUtil() { }
+
+    public static final String UNINITIALIZED_TAG = ".uninitialized";
 
     public static final class CountingSupplier<T>
             extends AbstractCounting<Supplier<T>>
@@ -117,4 +120,55 @@ final class StableTestUtil {
         }
     }
 
+    static Object functionHolder(Object o) {
+        try {
+            final Field field = field(o.getClass(), "functionHolder");
+            field.setAccessible(true);
+            return field.get(o);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static Object functionHolderFunction(Object o) {
+        try {
+            final Field field = field(o.getClass(), "function");
+            field.setAccessible(true);
+            return field.get(o);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static int functionHolderCounter(Object o) {
+        try {
+            final Field field = field(o.getClass(), "counter");
+            field.setAccessible(true);
+            return (int)field.get(o);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static Supplier<?> computingFunction(LazyConstant<?> o) {
+        try {
+            final Field field = field(o.getClass(), "computingFunction");
+            field.setAccessible(true);
+            return (Supplier<?>) field.get(o);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static Field field(Class<?> clazz, String name) {
+        if (clazz.equals(Object.class)) {
+            throw new RuntimeException("No " + name);
+        }
+        try {
+            return clazz.getDeclaredField(name);
+        } catch (NoSuchFieldException e) {
+            return field(clazz.getSuperclass(), name);
+        }
+    }
+
 }
diff --git a/test/jdk/java/lang/StableValue/StableListTest.java b/test/jdk/java/lang/LazyConstant/LazyListTest.java
similarity index 60%
rename from test/jdk/java/lang/StableValue/StableListTest.java
rename to test/jdk/java/lang/LazyConstant/LazyListTest.java
index 2abe305b0e7..046f9107b17 100644
--- a/test/jdk/java/lang/StableValue/StableListTest.java
+++ b/test/jdk/java/lang/LazyConstant/LazyListTest.java
@@ -22,23 +22,18 @@
  */
 
 /* @test
- * @summary Basic tests for StableList methods
- * @modules java.base/jdk.internal.lang.stable
+ * @summary Basic tests for lazy list methods
  * @enablePreview
- * @run junit StableListTest
+ * @run junit/othervm --add-opens java.base/java.util=ALL-UNNAMED LazyListTest
  */
 
-import jdk.internal.lang.stable.StableUtil;
-import jdk.internal.lang.stable.StableValueImpl;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.Serializable;
 import java.util.Comparator;
-import java.util.IdentityHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.RandomAccess;
 import java.util.Set;
@@ -54,7 +49,7 @@ import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-final class StableListTest {
+final class LazyListTest {
 
     private static final int ZERO = 0;
     private static final int INDEX = 7;
@@ -63,26 +58,26 @@ final class StableListTest {
 
     @Test
     void factoryInvariants() {
-        assertThrows(NullPointerException.class, () -> StableValue.list(SIZE, null));
-        assertThrows(IllegalArgumentException.class, () -> StableValue.list(-1, IDENTITY));
+        assertThrows(NullPointerException.class, () -> List.ofLazy(SIZE, null));
+        assertThrows(IllegalArgumentException.class, () -> List.ofLazy(-1, IDENTITY));
     }
 
     @Test
     void isEmpty() {
-        assertFalse(newList().isEmpty());
-        assertTrue(newEmptyList().isEmpty());
+        assertFalse(newLazyList().isEmpty());
+        assertTrue(newEmptyLazyList().isEmpty());
     }
 
     @Test
     void size() {
-        assertEquals(SIZE, newList().size());
-        assertEquals(ZERO, newEmptyList().size());
+        assertEquals(SIZE, newLazyList().size());
+        assertEquals(ZERO, newEmptyLazyList().size());
     }
 
     @Test
     void get() {
-        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(IDENTITY);
-        var lazy = StableValue.list(SIZE, cif);
+        LazyConstantTestUtil.CountingIntFunction<Integer> cif = new LazyConstantTestUtil.CountingIntFunction<Integer>(IDENTITY);
+        var lazy = List.ofLazy(SIZE, cif);
         for (int i = 0; i < SIZE; i++) {
             assertEquals(i, lazy.get(i));
             assertEquals(i + 1, cif.cnt());
@@ -93,10 +88,10 @@ final class StableListTest {
 
     @Test
     void getException() {
-        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(_ -> {
+        LazyConstantTestUtil.CountingIntFunction<Integer> cif = new LazyConstantTestUtil.CountingIntFunction<Integer>(_ -> {
             throw new UnsupportedOperationException();
         });
-        var lazy = StableValue.list(SIZE, cif);
+        var lazy = List.ofLazy(SIZE, cif);
         assertThrows(UnsupportedOperationException.class, () -> lazy.get(INDEX));
         assertEquals(1, cif.cnt());
         assertThrows(UnsupportedOperationException.class, () -> lazy.get(INDEX));
@@ -105,8 +100,8 @@ final class StableListTest {
 
     @Test
     void toArray() {
-        assertArrayEquals(new Object[ZERO], newEmptyList().toArray());
-        assertArrayEquals(newRegularList().toArray(), newList().toArray());
+        assertArrayEquals(new Object[ZERO], newEmptyLazyList().toArray());
+        assertArrayEquals(newRegularList().toArray(), newLazyList().toArray());
     }
 
     @Test
@@ -115,8 +110,8 @@ final class StableListTest {
         for (int i = 0; i < SIZE; i++) {
             actual[INDEX] = 100 + i;
         }
-        var list = StableValue.list(INDEX, IDENTITY);
-        assertSame(actual, list.toArray(actual));
+        var lazy = List.ofLazy(INDEX, IDENTITY);
+        assertSame(actual, lazy.toArray(actual));
         Integer[] expected = IntStream.range(0, SIZE)
                 .mapToObj(i -> i < INDEX ? i : null)
                 .toArray(Integer[]::new);
@@ -126,7 +121,7 @@ final class StableListTest {
     @Test
     void toArrayWithArraySmaller() {
         Integer[] arr = new Integer[INDEX];
-        Integer[] actual = newList().toArray(arr);
+        Integer[] actual = newLazyList().toArray(arr);
         assertNotSame(arr, actual);
         Integer[] expected = newRegularList().toArray(new Integer[0]);
         assertArrayEquals(expected, actual);
@@ -135,13 +130,13 @@ final class StableListTest {
     @Test
     void toArrayWithGenerator() {
         Integer[] expected = newRegularList().toArray(Integer[]::new);
-        Integer[] actual = newList().toArray(Integer[]::new);
+        Integer[] actual = newLazyList().toArray(Integer[]::new);
         assertArrayEquals(expected, actual);
     }
 
     @Test
     void firstIndex() {
-        var lazy = newList();
+        var lazy = newLazyList();
         for (int i = INDEX; i < SIZE; i++) {
             assertEquals(i, lazy.indexOf(i));
         }
@@ -150,7 +145,7 @@ final class StableListTest {
 
     @Test
     void lastIndex() {
-        var lazy = newList();
+        var lazy = newLazyList();
         for (int i = INDEX; i < SIZE; i++) {
             assertEquals(i, lazy.lastIndexOf(i));
         }
@@ -159,42 +154,28 @@ final class StableListTest {
 
     @Test
     void toStringTest() {
-        assertEquals("[]", newEmptyList().toString());
-        var list = StableValue.list(2, IDENTITY);
-        assertEquals("[.unset, .unset]", list.toString());
-        list.get(0);
-        assertEquals("[0, .unset]", list.toString());
-        list.get(1);
-        assertEquals("[0, 1]", list.toString());
+        assertEquals("[]", newEmptyLazyList().toString());
+        assertEquals("[0, 1]", List.ofLazy(2, IDENTITY).toString());
     }
 
     @Test
     void hashCodeTest() {
-        assertEquals(List.of().hashCode(), newEmptyList().hashCode());
-        assertEquals(newRegularList().hashCode(), newList().hashCode());
+        assertEquals(List.of().hashCode(), newEmptyLazyList().hashCode());
+        assertEquals(newRegularList().hashCode(), newLazyList().hashCode());
     }
 
     @Test
     void equalsTest() {
-        assertTrue(newEmptyList().equals(List.of()));
-        assertTrue(List.of().equals(newEmptyList()));
-        assertTrue(newList().equals(newRegularList()));
-        assertTrue(newRegularList().equals(newList()));
-        assertFalse(newList().equals("A"));
-    }
-
-    @Test
-    void equalsPartialEvaluationTest() {
-        var list = StableValue.list(2, IDENTITY);
-        assertFalse(list.equals(List.of(0)));
-        assertEquals("[0, .unset]", list.toString());
-        assertTrue(list.equals(List.of(0, 1)));
-        assertEquals("[0, 1]", list.toString());
+        assertTrue(newEmptyLazyList().equals(List.of()));
+        assertTrue(List.of().equals(newEmptyLazyList()));
+        assertTrue(newLazyList().equals(newRegularList()));
+        assertTrue(newRegularList().equals(newLazyList()));
+        assertFalse(newLazyList().equals("A"));
     }
 
     @Test
     void iteratorTotal() {
-        var iterator = newList().iterator();
+        var iterator = newLazyList().iterator();
         for (int i = 0; i < SIZE; i++) {
             assertTrue(iterator.hasNext());
             assertTrue(iterator.hasNext());
@@ -209,7 +190,7 @@ final class StableListTest {
 
     @Test
     void iteratorPartial() {
-        var iterator = newList().iterator();
+        var iterator = newLazyList().iterator();
         for (int i = 0; i < INDEX; i++) {
             assertTrue(iterator.hasNext());
             assertTrue(iterator.hasNext());
@@ -225,7 +206,7 @@ final class StableListTest {
 
     @Test
     void subList() {
-        var lazy = newList();
+        var lazy = newLazyList();
         var lazySubList = lazy.subList(1, SIZE);
         assertInstanceOf(RandomAccess.class, lazySubList);
         var regularList = newRegularList();
@@ -235,36 +216,33 @@ final class StableListTest {
 
     @Test
     void subList2() {
-        var lazy = newList();
+        var lazy = newLazyList();
         var lazySubList = lazy.subList(1, SIZE);
         lazySubList.get(0);
-        var eq = newList();
+        var eq = newLazyList();
         eq.get(1);
         assertEquals(eq.toString(), lazy.toString());
     }
 
-    void assertUnevaluated(List<Integer> subList) {
-        assertEquals(asString(".unset", subList), subList.toString());
-    }
-
     @Test
     void reversed() {
-        var reversed = newList().reversed();
-        assertInstanceOf(RandomAccess.class, reversed);
-        assertEquals(SIZE - 1, reversed.getFirst());
-        assertEquals(0, reversed.getLast());
+        var lazy = newLazyList();
+        var reversedLazy = lazy.reversed();
+        assertInstanceOf(RandomAccess.class, reversedLazy);
+        assertEquals(SIZE - 1, reversedLazy.getFirst());
+        assertEquals(0, reversedLazy.getLast());
 
-        var reversed2 = reversed.reversed();
-        assertInstanceOf(RandomAccess.class, reversed2);
-        assertEquals(0, reversed2.getFirst());
-        assertEquals(SIZE - 1, reversed2.getLast());
+        var reversed2Lazy = reversedLazy.reversed();
+        assertInstanceOf(RandomAccess.class, reversed2Lazy);
+        assertEquals(0, reversed2Lazy.getFirst());
+        assertEquals(SIZE - 1, reversed2Lazy.getLast());
         // Make sure we get back a non-reversed implementation
-        assertEquals("java.util.ImmutableCollections$StableList", reversed2.getClass().getName());
+        assertEquals(lazy.getClass().getName(), reversed2Lazy.getClass().getName());
     }
 
     @Test
     void sublistReversedToString() {
-        var actual = StableValue.list(4, IDENTITY);
+        var actual = List.ofLazy(4, IDENTITY);
         var expected = List.of(0, 1, 2, 3);
         for (UnaryOperation op : List.of(
                 new UnaryOperation("subList", l -> l.subList(1, 3)),
@@ -276,60 +254,17 @@ final class StableListTest {
         actual.getLast();
 
         var actualToString = actual.toString();
-        var expectedToString = expected.toString().replace("2", ".unset");
+        var expectedToString = expected.toString();
         assertEquals(expectedToString, actualToString);
     }
 
-    // This test makes sure successive view operations retains the property
-    // of being a Stable view.
-    @Test
-    void viewsStable() {
-        viewOperations().forEach(op0 -> {
-            viewOperations().forEach( op1 -> {
-                viewOperations().forEach(op2 -> {
-                    var list = newList();
-                    var view1 = op0.apply(list);
-                    var view2 = op1.apply(view1);
-                    var view3 = op2.apply(view2);
-                    var className3 = className(view3);
-                    var transitions = className(list) + ", " +
-                            op0 + " -> " + className(view1) + ", " +
-                            op1 + " -> " + className(view2) + ", " +
-                            op2 + " -> " + className3;
-                    assertTrue(className3.contains("Stable"), transitions);
-                    assertUnevaluated(list);
-                    assertUnevaluated(view1);
-                    assertUnevaluated(view2);
-                    assertUnevaluated(view3);
-                });
-            });
-        });
-    }
-
     @Test
     void recursiveCall() {
         AtomicReference<IntFunction<Integer>> ref = new AtomicReference<>();
-        var lazy = StableValue.list(SIZE, i -> ref.get().apply(i));
+        var lazy = List.ofLazy(SIZE, i -> ref.get().apply(i));
         ref.set(lazy::get);
         var x = assertThrows(IllegalStateException.class, () -> lazy.get(INDEX));
-        assertEquals("Recursive initialization of a stable value is illegal", x.getMessage());
-    }
-
-    @Test
-    void indexOfNullInViews() {
-        final int size = 5;
-        final int middle = 2;
-        viewOperations().forEach(op0 -> {
-            viewOperations().forEach( op1 -> {
-                viewOperations().forEach(op2 -> {
-                    var list = StableValue.list(size, x -> x == middle ? null : x);;
-                    var view1 = op0.apply(list);
-                    var view2 = op1.apply(view1);
-                    var view3 = op2.apply(view2);
-                    assertEquals(middle, view3.indexOf(null));
-                });
-            });
-        });
+        assertEquals("Recursive initialization of a lazy collection is illegal", x.getMessage());
     }
 
     // Immutability
@@ -355,7 +290,7 @@ final class StableListTest {
     }
 
     static <T extends Throwable> void assertThrowsForOperation(Class<T> expectedType, Operation operation) {
-        var lazy = newList();
+        var lazy = newLazyList();
         assertThrows(expectedType, () -> operation.accept(lazy));
         var sub = lazy.subList(1, SIZE / 2);
         assertThrows(expectedType, () -> operation.accept(sub));
@@ -367,14 +302,14 @@ final class StableListTest {
 
     @Test
     void serializable() {
-        serializable(newList());
-        serializable(newEmptyList());
+        serializable(newLazyList());
+        serializable(newEmptyLazyList());
     }
 
     void serializable(List<Integer> list) {
         assertFalse(list instanceof Serializable);
         if (list.size()>INDEX) {
-            assertFalse(newList().subList(1, INDEX) instanceof Serializable);
+            assertFalse(newLazyList().subList(1, INDEX) instanceof Serializable);
         }
         assertFalse(list.iterator() instanceof Serializable);
         assertFalse(list.reversed() instanceof Serializable);
@@ -383,54 +318,25 @@ final class StableListTest {
 
     @Test
     void randomAccess() {
-        assertInstanceOf(RandomAccess.class, newList());
-        assertInstanceOf(RandomAccess.class, newEmptyList());
-        assertInstanceOf(RandomAccess.class, newList().subList(1, INDEX));
+        assertInstanceOf(RandomAccess.class, newLazyList());
+        assertInstanceOf(RandomAccess.class, newEmptyLazyList());
+        assertInstanceOf(RandomAccess.class, newLazyList().subList(1, INDEX));
     }
 
     @Test
-    void distinct() {
-        StableValueImpl<Integer>[] array = StableUtil.array(SIZE);
-        assertEquals(SIZE, array.length);
-        // Check, every StableValue is distinct
-        Map<StableValue<Integer>, Boolean> idMap = new IdentityHashMap<>();
-        for (var e: array) {
-            idMap.put(e, true);
+    void functionHolder() {
+        LazyConstantTestUtil.CountingIntFunction<Integer> cif = new LazyConstantTestUtil.CountingIntFunction<>(IDENTITY);
+        List<Integer> f1 = List.ofLazy(SIZE, cif);
+
+        Object holder = LazyConstantTestUtil.functionHolder(f1);
+        for (int i = 0; i < SIZE; i++) {
+            assertEquals(SIZE - i, LazyConstantTestUtil.functionHolderCounter(holder));
+            assertSame(cif, LazyConstantTestUtil.functionHolderFunction(holder));
+            int v = f1.get(i);
+            int v2 = f1.get(i);
         }
-        assertEquals(SIZE, idMap.size());
-    }
-
-    @Test
-    void childObjectOpsLazy() {
-        viewOperations().forEach(op0 -> {
-            viewOperations().forEach(op1 -> {
-                viewOperations().forEach(op2 -> {
-                    childOperations().forEach(co -> {
-                        var list = newList();
-                        var view1 = op0.apply(list);
-                        var view2 = op1.apply(view1);
-                        var view3 = op2.apply(view2);
-                        var child = co.apply(view3);
-                        var childClassName = className(child);
-                        var transitions = className(list) + ", " +
-                                op0 + " -> " + className(view1) + ", " +
-                                op1 + " -> " + className(view2) + ", " +
-                                op2 + " -> " + className(view3) + ", " +
-                                co + " -> " + childClassName;
-
-                        // None of these operations should trigger evaluation
-                        var childToString = child.toString();
-                        int childHashCode = child.hashCode();
-                        boolean childEqualToNewObj = child.equals(new Object());
-
-                        assertUnevaluated(list);
-                        assertUnevaluated(view1);
-                        assertUnevaluated(view2);
-                        assertUnevaluated(view3);
-                    });
-                });
-            });
-        });
+        assertEquals(0, LazyConstantTestUtil.functionHolderCounter(holder));
+        assertNull(LazyConstantTestUtil.functionHolderFunction(holder));
     }
 
     // Support constructs
@@ -516,25 +422,15 @@ final class StableListTest {
         );
     }
 
-    static List<Integer> newList() {
-        return StableValue.list(SIZE, IDENTITY);
+    static List<Integer> newLazyList() {
+        return List.ofLazy(SIZE, IDENTITY);
     }
 
-    static List<Integer> newEmptyList() {
-        return StableValue.list(ZERO, IDENTITY);
+    static List<Integer> newEmptyLazyList() {
+        return List.ofLazy(ZERO, IDENTITY);
     }
 
     static List<Integer> newRegularList() {
         return IntStream.range(0, SIZE).boxed().toList();
     }
-
-    static String asString(String first, List<Integer> list) {
-        return "[" + first + ", " + Stream.generate(() -> ".unset")
-                .limit(list.size() - 1)
-                .collect(Collectors.joining(", ")) + "]";
-    }
-
-    static String className(Object o) {
-        return o.getClass().getName();
-    }
 }
diff --git a/test/jdk/java/lang/LazyConstant/LazyMapTest.java b/test/jdk/java/lang/LazyConstant/LazyMapTest.java
new file mode 100644
index 00000000000..766313c9173
--- /dev/null
+++ b/test/jdk/java/lang/LazyConstant/LazyMapTest.java
@@ -0,0 +1,573 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Basic tests for lazy map methods
+ * @enablePreview
+ * @run junit/othervm --add-opens java.base/java.util=ALL-UNNAMED LazyMapTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.mapping;
+import static org.junit.jupiter.api.Assertions.*;
+
+final class LazyMapTest {
+
+    enum Value {
+        // Zero is here so that we have enums with ordinals before the first one
+        // actually used in input sets (i.e. ZERO is not in the input set)
+        ZERO(0),
+        ILLEGAL_BEFORE(-1),
+        // Valid values
+        THIRTEEN(13) {
+            @Override
+            public String toString() {
+                // getEnumConstants will be `null` for this enum as it is overridden
+                return super.toString()+" (Overridden)";
+            }
+        },
+        ILLEGAL_BETWEEN(-2),
+        FORTY_TWO(42),
+        // Illegal values (not in the input set)
+        ILLEGAL_AFTER(-3);
+
+        final int intValue;
+
+        Value(int intValue) {
+            this.intValue = intValue;
+        }
+
+        int asInt() {
+            return intValue;
+        }
+
+    }
+
+    private static final Function<Value, Integer> MAPPER = Value::asInt;
+
+    private static final Value KEY = Value.FORTY_TWO;
+    private static final Integer VALUE = MAPPER.apply(KEY);
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void factoryInvariants(Set<Value> set) {
+        assertThrows(NullPointerException.class, () -> Map.ofLazy(set, null), set.getClass().getSimpleName());
+        assertThrows(NullPointerException.class, () -> Map.ofLazy(null, MAPPER));
+        Set<Value> setWithNull = new HashSet<>();
+        setWithNull.add(KEY);
+        setWithNull.add(null);
+        assertThrows(NullPointerException.class, () -> Map.ofLazy(setWithNull, MAPPER));
+    }
+
+    @ParameterizedTest
+    @MethodSource("emptySets")
+    void empty(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        assertTrue(lazy.isEmpty());
+        assertEquals("{}", lazy.toString());
+        assertThrows(NullPointerException.class, () -> lazy.get(null));
+        assertNotEquals(null, lazy);
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void size(Set<Value> set) {
+        assertEquals(newRegularMap(set).size(), newLazyMap(set).size());
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void get(Set<Value> set) {
+        LazyConstantTestUtil.CountingFunction<Value, Integer> cf = new LazyConstantTestUtil.CountingFunction<>(MAPPER);
+        var lazy = Map.ofLazy(set, cf);
+        int cnt = 1;
+        for (Value v : set) {
+            assertEquals(MAPPER.apply(v), lazy.get(v));
+            assertEquals(cnt, cf.cnt());
+            assertEquals(MAPPER.apply(v), lazy.get(v));
+            assertEquals(cnt++, cf.cnt());
+        }
+        assertNull(lazy.get(Value.ILLEGAL_BETWEEN));
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void exception(Set<Value> set) {
+        LazyConstantTestUtil.CountingFunction<Value, Integer> cif = new LazyConstantTestUtil.CountingFunction<>(_ -> {
+            throw new UnsupportedOperationException();
+        });
+        var lazy = Map.ofLazy(set, cif);
+        assertThrows(UnsupportedOperationException.class, () -> lazy.get(KEY));
+        assertEquals(1, cif.cnt());
+        assertThrows(UnsupportedOperationException.class, () -> lazy.get(KEY));
+        assertEquals(2, cif.cnt());
+        assertThrows(UnsupportedOperationException.class, lazy::toString);
+        assertEquals(3, cif.cnt());
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void containsKey(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        for (Value v : set) {
+            assertTrue(lazy.containsKey(v));
+        }
+        assertFalse(lazy.containsKey(Value.ILLEGAL_BETWEEN));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void containsValue(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        for (Value v : set) {
+            assertTrue(lazy.containsValue(MAPPER.apply(v)));
+        }
+        assertFalse(lazy.containsValue(MAPPER.apply(Value.ILLEGAL_BETWEEN)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void forEach(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var ref = newRegularMap(set);
+        Set<Map.Entry<Value, Integer>> expected = ref.entrySet();
+        Set<Map.Entry<Value, Integer>> actual = new HashSet<>();
+        lazy.forEach((k, v) -> actual.add(new AbstractMap.SimpleImmutableEntry<>(k , v)));
+        assertEquals(expected, actual);
+    }
+
+    @ParameterizedTest
+    @MethodSource("emptySets")
+    void toStringTestEmpty(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        assertEquals("{}", lazy.toString());
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void toStringTest(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var toString = lazy.toString();
+        assertTrue(toString.startsWith("{"));
+        assertTrue(toString.endsWith("}"));
+
+        // Key order is unspecified
+        for (Value key : set) {
+            toString = lazy.toString();
+            assertTrue(toString.contains(key + "=" + MAPPER.apply(key)), toString);
+        }
+
+        // One between the values
+        assertEquals(set.size() - 1, toString.chars().filter(ch -> ch == ',').count());
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void hashCodeTest(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var regular = newRegularMap(set);
+        assertEquals(regular.hashCode(), lazy.hashCode());
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void equality(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var regular = newRegularMap(set);
+        assertEquals(regular, lazy);
+        assertEquals(lazy, regular);
+        assertNotEquals("A", lazy);
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void circular(Set<Value> set) {
+        final AtomicReference<Map<?, ?>> ref = new AtomicReference<>();
+        Map<Value, Map<?, ?>> lazy = Map.ofLazy(set, _ -> ref.get());
+        ref.set(lazy);
+        lazy.get(KEY);
+        var toString = lazy.toString();
+        assertTrue(toString.contains("FORTY_TWO=(this Map)"), toString);
+        assertDoesNotThrow((() -> lazy.equals(lazy)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void recursiveCall(Set<Value> set) {
+        final AtomicReference<Map<Value, ?>> ref = new AtomicReference<>();
+        @SuppressWarnings("unchecked")
+        Map<Value, Map<Value, Object>> lazy = Map.ofLazy(set, k -> (Map<Value, Object>) ref.get().get(k));
+        ref.set(lazy);
+        var x = assertThrows(IllegalStateException.class, () -> lazy.get(KEY));
+        assertEquals("Recursive initialization of a lazy collection is illegal", x.getMessage());
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void entrySet(Set<Value> set) {
+        var lazy = newLazyMap(set).entrySet();
+        var regular = newRegularMap(set).entrySet();
+        assertTrue(regular.equals(lazy));
+        assertTrue(lazy.equals(regular));
+        assertTrue(regular.equals(lazy));
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void entrySetToString(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var lazyEntrySet = lazy.entrySet();
+        var toString = lazyEntrySet.toString();
+        for (var key : set) {
+            assertTrue(toString.contains(key + "=" + MAPPER.apply(key)));
+        }
+        assertTrue(toString.startsWith("["));
+        assertTrue(toString.endsWith("]"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void values(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var lazyValues = lazy.values();
+        // Look at one of the elements
+        var val = lazyValues.stream().iterator().next();
+        assertEquals(lazy.size() - 1, functionCounter(lazy));
+
+        // Mod ops
+        assertThrows(UnsupportedOperationException.class, () -> lazyValues.remove(val));
+        assertThrows(UnsupportedOperationException.class, () -> lazyValues.add(val));
+        assertThrows(UnsupportedOperationException.class, lazyValues::clear);
+        assertThrows(UnsupportedOperationException.class, () -> lazyValues.addAll(Set.of(VALUE)));
+        assertThrows(UnsupportedOperationException.class, () -> lazyValues.removeIf(i -> true));
+        assertThrows(UnsupportedOperationException.class, () -> lazyValues.retainAll(Set.of(VALUE)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void valuesToString(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var lazyValues = lazy.values();
+        var toString = lazyValues.toString();
+
+        // Key order is unspecified
+        for (Value key : set) {
+            assertTrue(toString.contains(MAPPER.apply(key).toString()), toString);
+        }
+        assertTrue(toString.startsWith("["), toString);
+        assertTrue(toString.endsWith("]"), toString);
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void iteratorNext(Set<Value> set) {
+        Set<Value> encountered = new HashSet<>();
+        var iterator = newLazyMap(set).entrySet().iterator();
+        while (iterator.hasNext()) {
+            var entry = iterator.next();
+            assertEquals(MAPPER.apply(entry.getKey()), entry.getValue());
+            encountered.add(entry.getKey());
+        }
+        assertEquals(set, encountered);
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void iteratorForEachRemaining(Set<Value> set) {
+        Set<Value> encountered = new HashSet<>();
+        var iterator = newLazyMap(set).entrySet().iterator();
+        var entry = iterator.next();
+        assertEquals(MAPPER.apply(entry.getKey()), entry.getValue());
+        encountered.add(entry.getKey());
+        iterator.forEachRemaining(e -> {
+            assertEquals(MAPPER.apply(e.getKey()), e.getValue());
+            encountered.add(e.getKey());
+        });
+        assertEquals(set, encountered);
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void lazyEntry(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        var entry = lazy.entrySet().stream()
+                .filter(e -> e.getKey().equals(KEY))
+                .findAny()
+                .orElseThrow();
+
+        assertEquals(lazy.size(), functionCounter(lazy));
+        var otherDifferent = Map.entry(Value.ZERO, -1);
+        assertNotEquals(entry, otherDifferent);
+        assertEquals(lazy.size(), functionCounter(lazy));
+        var otherEqual = Map.entry(entry.getKey(), entry.getValue());
+        assertEquals(entry, otherEqual);
+        assertEquals(lazy.size() - 1, functionCounter(lazy));
+        assertEquals(entry.hashCode(), otherEqual.hashCode());
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void lazyForEachEntry(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        // Only touch the key.
+        lazy.entrySet().iterator().forEachRemaining(Map.Entry::getKey);
+        assertEquals(lazy.size(), functionCounter(lazy)); // No evaluation
+        // Only touch the value.
+        lazy.entrySet().iterator().forEachRemaining(Map.Entry::getValue);
+        assertEquals(0, functionCounter(lazy));
+    }
+
+    // Immutability
+    @ParameterizedTest
+    @MethodSource("unsupportedOperations")
+    void unsupported(Operation operation) {
+        assertThrowsForOperation(UnsupportedOperationException.class, operation);
+    }
+
+    // Method parameter invariant checking
+
+    @ParameterizedTest
+    @MethodSource("nullAverseOperations")
+    void nullAverse(Operation operation) {
+        assertThrowsForOperation(NullPointerException.class, operation);
+    }
+
+    static <T extends Throwable> void assertThrowsForOperation(Class<T> expectedType, Operation operation) {
+        for (Set<Value> set : allSets().toList()) {
+            var lazy = newLazyMap(set);
+            assertThrows(expectedType, () -> operation.accept(lazy), set.getClass().getSimpleName() + " " + operation);
+        }
+    }
+
+    // Implementing interfaces
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void serializable(Set<Value> set) {
+        var lazy = newLazyMap(set);
+        assertFalse(lazy instanceof Serializable);
+        assertFalse(lazy.entrySet() instanceof Serializable);
+        assertFalse(lazy.values() instanceof Serializable);
+    }
+
+    @Test
+    void nullResult() {
+        var lazy = Map.ofLazy(Set.of(0), _ -> null);
+        assertThrows(NullPointerException.class, () -> lazy.getOrDefault(0, 1));;
+        assertTrue(lazy.containsKey(0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void functionHolder(Set<Value> set) {
+        LazyConstantTestUtil.CountingFunction<Value, Integer> cif = new LazyConstantTestUtil.CountingFunction<>(MAPPER);
+        Map<Value, Integer> lazy = Map.ofLazy(set, cif);
+
+        Object holder = LazyConstantTestUtil.functionHolder(lazy);
+
+        int i = 0;
+        for (Value key : set) {
+            assertEquals(set.size() - i, LazyConstantTestUtil.functionHolderCounter(holder));
+            assertSame(cif, LazyConstantTestUtil.functionHolderFunction(holder));
+            int v = lazy.get(key);
+            int v2 = lazy.get(key);
+            i++;
+        }
+        assertEquals(0, LazyConstantTestUtil.functionHolderCounter(holder));
+        assertNull(LazyConstantTestUtil.functionHolderFunction(holder));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void functionHolderViaEntrySet(Set<Value> set) {
+        LazyConstantTestUtil.CountingFunction<Value, Integer> cif = new LazyConstantTestUtil.CountingFunction<>(MAPPER);
+        Map<Value, Integer> lazy = Map.ofLazy(set, cif);
+
+        Object holder = LazyConstantTestUtil.functionHolder(lazy);
+
+        int i = 0;
+        for (Map.Entry<Value, Integer> e : lazy.entrySet()) {
+            assertEquals(set.size() - i, LazyConstantTestUtil.functionHolderCounter(holder));
+            assertSame(cif, LazyConstantTestUtil.functionHolderFunction(holder));
+            int v = e.getValue();
+            int v2 = e.getValue();
+            i++;
+        }
+        assertEquals(0, LazyConstantTestUtil.functionHolderCounter(holder));
+        assertNull(LazyConstantTestUtil.functionHolderFunction(holder));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void underlyingRefViaEntrySetForEach(Set<Value> set) {
+        LazyConstantTestUtil.CountingFunction<Value, Integer> cif = new LazyConstantTestUtil.CountingFunction<>(MAPPER);
+        Map<Value, Integer> lazy = Map.ofLazy(set, cif);
+
+        Object holder = LazyConstantTestUtil.functionHolder(lazy);
+
+        final AtomicInteger i = new AtomicInteger();
+        lazy.entrySet().forEach(e -> {
+            assertEquals(set.size() - i.get(), LazyConstantTestUtil.functionHolderCounter(holder));
+            assertSame(cif, LazyConstantTestUtil.functionHolderFunction(holder));
+            Integer val = e.getValue();
+            Integer val2 = e.getValue();
+            i.incrementAndGet();
+        });
+        assertEquals(0, LazyConstantTestUtil.functionHolderCounter(holder));
+        assertNull(LazyConstantTestUtil.functionHolderFunction(holder));
+    }
+
+    @Test
+    void usesOptimizedVersion() {
+        Map<Value, Integer> enumMap = Map.ofLazy(EnumSet.of(KEY), Value::asInt);
+        assertTrue(enumMap.getClass().getName().contains("Enum"), enumMap.getClass().getName());
+        Map<Value, Integer> emptyMap = Map.ofLazy(EnumSet.noneOf(Value.class), Value::asInt);
+        assertFalse(emptyMap.getClass().getName().contains("Enum"), emptyMap.getClass().getName());
+        Map<Value, Integer> regularMap = Map.ofLazy(Set.of(KEY), Value::asInt);
+        assertFalse(regularMap.getClass().getName().contains("Enum"), regularMap.getClass().getName());
+    }
+
+    @Test
+    void overriddenEnum() {
+        final var overridden = Value.THIRTEEN;
+        Map<Value, Integer> enumMap = Map.ofLazy(EnumSet.of(overridden), MAPPER);
+        assertEquals(MAPPER.apply(overridden), enumMap.get(overridden), enumMap.toString());
+    }
+
+    @Test
+    void enumAliasing() {
+        enum MyEnum {FOO, BAR}
+        enum MySecondEnum{BAZ, QUX}
+        Map<MyEnum, Integer> mapEnum = Map.ofLazy(EnumSet.allOf(MyEnum.class), MyEnum::ordinal);
+        assertEquals(MyEnum.BAR.ordinal(), mapEnum.get(MyEnum.BAR));
+        // Make sure class is checked, not just `ordinal()`
+        assertNull(mapEnum.get(MySecondEnum.QUX));
+    }
+
+    // Support constructs
+
+    record Operation(String name,
+                     Consumer<Map<Value, Integer>> consumer) implements Consumer<Map<Value, Integer>> {
+        @java.lang.Override
+        public void accept(Map<Value, Integer> map) { consumer.accept(map); }
+        @java.lang.Override
+        public String toString() { return name; }
+    }
+
+    static Stream<Operation> nullAverseOperations() {
+        return Stream.of(
+            new Operation("forEach",     m -> m.forEach(null))
+        );
+    }
+
+    static Stream<Operation> unsupportedOperations() {
+        return Stream.of(
+            new Operation("clear",             Map::clear),
+            new Operation("compute",           m -> m.compute(KEY, (_, _) -> 1)),
+            new Operation("computeIfAbsent",   m -> m.computeIfAbsent(KEY, _ -> 1)),
+            new Operation("computeIfPresent",  m -> m.computeIfPresent(KEY, (_, _) -> 1)),
+            new Operation("merge",             m -> m.merge(KEY, VALUE, (a, _) -> a)),
+            new Operation("put",               m -> m.put(KEY, 0)),
+            new Operation("putAll",            m -> m.putAll(Map.of())),
+            new Operation("remove1",           m -> m.remove(KEY)),
+            new Operation("remove2",           m -> m.remove(KEY, VALUE)),
+            new Operation("replace2",          m -> m.replace(KEY, 1)),
+            new Operation("replace3",          m -> m.replace(KEY, VALUE, 1)),
+            new Operation("replaceAll",        m -> m.replaceAll((a, _) -> MAPPER.apply(a)))
+        );
+    }
+
+
+    static Map<Value, Integer> newLazyMap(Set<Value> set) {
+        return Map.ofLazy(set, MAPPER);
+    }
+    static Map<Value, Integer> newRegularMap(Set<Value> set) {
+        return set.stream()
+                .collect(Collectors.toMap(Function.identity(), MAPPER));
+    }
+
+    private static Stream<Set<Value>> nonEmptySets() {
+        return Stream.of(
+                Set.of(KEY, Value.THIRTEEN),
+                linkedHashSet(Value.THIRTEEN, KEY),
+                treeSet(KEY, Value.THIRTEEN),
+                EnumSet.of(KEY, Value.THIRTEEN)
+        );
+    }
+
+    private static Stream<Set<Value>> emptySets() {
+        return Stream.of(
+                Set.of(),
+                linkedHashSet(),
+                treeSet(),
+                EnumSet.noneOf(Value.class)
+        );
+    }
+
+    private static Stream<Set<Value>> allSets() {
+        return Stream.concat(
+                nonEmptySets(),
+                emptySets()
+        );
+    }
+
+    static Set<Value> treeSet(Value... values) {
+        return populate(new TreeSet<>(Comparator.comparingInt(Value::asInt).reversed()),values);
+    }
+
+    static Set<Value> linkedHashSet(Value... values) {
+        return populate(new LinkedHashSet<>(), values);
+    }
+
+    static Set<Value> populate(Set<Value> set, Value... values) {
+        set.addAll(Arrays.asList(values));
+        return set;
+    }
+
+    private static int functionCounter(Map<?, ?> lazy) {
+        final Object holder = LazyConstantTestUtil.functionHolder(lazy);
+        return LazyConstantTestUtil.functionHolderCounter(holder);
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/TrustedFieldTypeTest.java b/test/jdk/java/lang/LazyConstant/TrustedFieldTypeTest.java
similarity index 61%
rename from test/jdk/java/lang/StableValue/TrustedFieldTypeTest.java
rename to test/jdk/java/lang/LazyConstant/TrustedFieldTypeTest.java
index 205e5ed3a77..9e63a9b275c 100644
--- a/test/jdk/java/lang/StableValue/TrustedFieldTypeTest.java
+++ b/test/jdk/java/lang/LazyConstant/TrustedFieldTypeTest.java
@@ -24,14 +24,14 @@
 /* @test
  * @summary Basic tests for TrustedFieldType implementations
  * @modules jdk.unsupported/sun.misc
- * @modules java.base/jdk.internal.lang.stable
+ * @modules java.base/jdk.internal.lang
  * @modules java.base/jdk.internal.misc
  * @enablePreview
- * @run junit/othervm --add-opens java.base/jdk.internal.lang.stable=ALL-UNNAMED -Dopens=true TrustedFieldTypeTest
+ * @run junit/othervm --add-opens java.base/jdk.internal.lang=ALL-UNNAMED -Dopens=true TrustedFieldTypeTest
  * @run junit/othervm -Dopens=false TrustedFieldTypeTest
  */
 
-import jdk.internal.lang.stable.StableValueImpl;
+import jdk.internal.lang.LazyConstantImpl;
 import jdk.internal.misc.Unsafe;
 import org.junit.jupiter.api.Test;
 
@@ -39,84 +39,89 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.lang.reflect.Field;
 import java.lang.reflect.InaccessibleObjectException;
+import java.lang.LazyConstant;
+import java.util.function.Supplier;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 final class TrustedFieldTypeTest {
 
+    private static final int VALUE = 42;
+    private static final Supplier<Integer> SUPPLIER = () -> VALUE;
+
     @Test
     void varHandle() throws NoSuchFieldException, IllegalAccessException {
         MethodHandles.Lookup lookup = MethodHandles.lookup();
 
-        StableValue<Integer> originalValue = StableValue.of();
+        LazyConstant<Integer> originalValue = LazyConstant.of(SUPPLIER);
         @SuppressWarnings("unchecked")
-        StableValue<Integer>[] originalArrayValue = new StableValue[10];
+        LazyConstant<Integer>[] originalArrayValue = new LazyConstant[10];
 
         final class Holder {
-            private final StableValue<Integer> value = originalValue;
+            private final LazyConstant<Integer> value = originalValue;
         }
         final class ArrayHolder {
-            private final StableValue<Integer>[] array = originalArrayValue;
+            private final LazyConstant<Integer>[] array = originalArrayValue;
         }
 
 
-        VarHandle valueVarHandle = lookup.findVarHandle(Holder.class, "value", StableValue.class);
+        VarHandle valueVarHandle = lookup.findVarHandle(Holder.class, "value", LazyConstant.class);
         Holder holder = new Holder();
 
         assertThrows(UnsupportedOperationException.class, () ->
-                valueVarHandle.set(holder, StableValue.of())
+                valueVarHandle.set(holder, LazyConstant.of(SUPPLIER))
         );
 
         assertThrows(UnsupportedOperationException.class, () ->
-                valueVarHandle.compareAndSet(holder, originalValue, StableValue.of())
+                valueVarHandle.compareAndSet(holder, originalValue, LazyConstant.of(SUPPLIER))
         );
 
-        VarHandle arrayVarHandle = lookup.findVarHandle(ArrayHolder.class, "array", StableValue[].class);
+        VarHandle arrayVarHandle = lookup.findVarHandle(ArrayHolder.class, "array", LazyConstant[].class);
         ArrayHolder arrayHolder = new ArrayHolder();
 
         assertThrows(UnsupportedOperationException.class, () ->
-                arrayVarHandle.set(arrayHolder, new StableValue[1])
+                arrayVarHandle.set(arrayHolder, new LazyConstant[1])
         );
 
         assertThrows(UnsupportedOperationException.class, () ->
-                arrayVarHandle.compareAndSet(arrayHolder, originalArrayValue, new StableValue[1])
+                arrayVarHandle.compareAndSet(arrayHolder, originalArrayValue, new LazyConstant[1])
         );
 
     }
 
     @Test
-    void updateStableValueContentVia_j_i_m_Unsafe() {
-        StableValue<Integer> stableValue = StableValue.of();
-        stableValue.trySet(42);
+    void updateComputedConstantContentVia_j_i_m_Unsafe() {
+        LazyConstant<Integer> lazyConstant = LazyConstant.of(SUPPLIER);
+        lazyConstant.get();
         jdk.internal.misc.Unsafe unsafe = Unsafe.getUnsafe();
 
-        long offset = unsafe.objectFieldOffset(stableValue.getClass(), "contents");
+        long offset = unsafe.objectFieldOffset(lazyConstant.getClass(), "constant");
         assertTrue(offset > 0);
 
         // Unfortunately, it is possible to update the underlying data via jdk.internal.misc.Unsafe
-        Object oldData = unsafe.getAndSetReference(stableValue, offset, 13);
-        assertEquals(42, oldData);
-        assertEquals(13, stableValue.orElseThrow());
+        Object oldData = unsafe.getAndSetReference(lazyConstant, offset, 13);
+        assertEquals(VALUE, oldData);
+        assertEquals(13, lazyConstant.get());
     }
 
     @Test
-    void updateStableValueContentViaSetAccessible() throws NoSuchFieldException, IllegalAccessException {
+    void updateComputedConstantContentViaSetAccessible() throws NoSuchFieldException, IllegalAccessException {
 
         if (Boolean.getBoolean("opens")) {
             // Unfortunately, add-opens allows direct access to the `value` field
-            Field field = StableValueImpl.class.getDeclaredField("contents");
+            Field field = LazyConstantImpl.class.getDeclaredField("constant");
             field.setAccessible(true);
 
-            StableValue<Integer> stableValue = StableValue.of();
-            stableValue.trySet(42);
+            LazyConstant<Integer> lazyConstant = LazyConstant.of(SUPPLIER);
+            lazyConstant.get();
 
-            Object oldData = field.get(stableValue);
-            assertEquals(42, oldData);
+            Object oldData = field.get(lazyConstant);
+            assertEquals(VALUE, oldData);
 
-            field.set(stableValue, 13);
-            assertEquals(13, stableValue.orElseThrow());
+            field.set(lazyConstant, 13);
+            assertEquals(13, lazyConstant.get());
         } else {
-            Field field = StableValueImpl.class.getDeclaredField("contents");
+            Field field = LazyConstantImpl.class.getDeclaredField("constant");
             assertThrows(InaccessibleObjectException.class, ()-> field.setAccessible(true));
         }
     }
diff --git a/test/jdk/java/lang/StableValue/StableFunctionTest.java b/test/jdk/java/lang/StableValue/StableFunctionTest.java
deleted file mode 100644
index 07f51470a0b..00000000000
--- a/test/jdk/java/lang/StableValue/StableFunctionTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @summary Basic tests for StableFunction methods
- * @enablePreview
- * @run junit StableFunctionTest
- */
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-final class StableFunctionTest {
-
-    enum Value {
-        // Zero is here so that we have enums with ordinals before the first one
-        // actually used in input sets (i.e. ZERO is not in the input set)
-        ZERO(0),
-        ILLEGAL_BEFORE(-1),
-        // Valid values
-        THIRTEEN(13) {
-            @Override
-            public String toString() {
-                // getEnumConstants will be `null` for this enum as it is overridden
-                return super.toString()+" (Overridden)";
-            }
-        },
-        ILLEGAL_BETWEEN(-2),
-        FORTY_TWO(42),
-        // Illegal values (not in the input set)
-        ILLEGAL_AFTER(-3);
-
-        final int intValue;
-
-        Value(int intValue) {
-            this.intValue = intValue;
-        }
-
-        int asInt() {
-            return intValue;
-        }
-
-    }
-
-    private static final Function<Value, Integer> MAPPER = Value::asInt;
-
-    @ParameterizedTest
-    @MethodSource("allSets")
-    void factoryInvariants(Set<Value> inputs) {
-        assertThrows(NullPointerException.class, () -> StableValue.function(null, MAPPER));
-        assertThrows(NullPointerException.class, () -> StableValue.function(inputs, null));
-    }
-
-    @ParameterizedTest
-    @MethodSource("nonEmptySets")
-    void basic(Set<Value> inputs) {
-        basic(inputs, MAPPER);
-        toStringTest(inputs, MAPPER);
-        basic(inputs, _ -> null);
-        toStringTest(inputs, _ -> null);
-    }
-
-    void basic(Set<Value> inputs, Function<Value, Integer> mapper) {
-        StableTestUtil.CountingFunction<Value, Integer> cif = new StableTestUtil.CountingFunction<>(mapper);
-        var cached = StableValue.function(inputs, cif);
-        assertEquals(mapper.apply(Value.FORTY_TWO), cached.apply(Value.FORTY_TWO));
-        assertEquals(1, cif.cnt());
-        assertEquals(mapper.apply(Value.FORTY_TWO), cached.apply(Value.FORTY_TWO));
-        assertEquals(1, cif.cnt());
-        var x0 = assertThrows(IllegalArgumentException.class, () -> cached.apply(Value.ILLEGAL_BEFORE));
-        assertEquals("Input not allowed: ILLEGAL_BEFORE", x0.getMessage());
-        var x1 = assertThrows(IllegalArgumentException.class, () -> cached.apply(Value.ILLEGAL_BETWEEN));
-        assertEquals("Input not allowed: ILLEGAL_BETWEEN", x1.getMessage());
-        var x2 = assertThrows(IllegalArgumentException.class, () -> cached.apply(Value.ILLEGAL_AFTER));
-        assertEquals("Input not allowed: ILLEGAL_AFTER", x2.getMessage());
-    }
-
-    void toStringTest(Set<Value> inputs, Function<Value, Integer> mapper) {
-        var cached = StableValue.function(inputs, mapper);
-        cached.apply(Value.FORTY_TWO);
-        var toString = cached.toString();
-        assertTrue(toString.startsWith("{"));
-        // Key order is unspecified
-        assertTrue(toString.contains(Value.THIRTEEN + "=.unset"));
-        assertTrue(toString.contains(Value.FORTY_TWO + "=" + mapper.apply(Value.FORTY_TWO)));
-        assertTrue(toString.endsWith("}"));
-        // One between the values
-        assertEquals(1L, toString.chars().filter(ch -> ch == ',').count());
-    }
-
-    @ParameterizedTest
-    @MethodSource("emptySets")
-    void empty(Set<Value> inputs) {
-        Function<Value, Integer> f0 = StableValue.function(inputs, Value::asInt);
-        Function<Value, Integer> f1 = StableValue.function(inputs, Value::asInt);
-        assertEquals("{}", f0.toString());
-        assertThrows(NullPointerException.class, () -> f0.apply(null));
-        assertNotEquals(f0, f1);
-        assertNotEquals(null, f0);
-    }
-
-    @ParameterizedTest
-    @MethodSource("nonEmptySets")
-    void exception(Set<Value> inputs) {
-        StableTestUtil.CountingFunction<Value, Integer> cif = new StableTestUtil.CountingFunction<>(_ -> {
-            throw new UnsupportedOperationException();
-        });
-        var cached = StableValue.function(inputs, cif);
-        assertThrows(UnsupportedOperationException.class, () -> cached.apply(Value.FORTY_TWO));
-        assertEquals(1, cif.cnt());
-        assertThrows(UnsupportedOperationException.class, () -> cached.apply(Value.FORTY_TWO));
-        assertEquals(2, cif.cnt());
-        var toString = cached.toString();
-        assertTrue(toString.startsWith("{"));
-        // Key order is unspecified
-        assertTrue(toString.contains(Value.THIRTEEN + "=.unset"));
-        assertTrue(toString.contains(Value.FORTY_TWO + "=.unset"));
-        assertTrue(toString.endsWith("}"));
-    }
-
-    @ParameterizedTest
-    @MethodSource("nonEmptySets")
-    void circular(Set<Value> inputs) {
-        final AtomicReference<Function<?, ?>> ref = new AtomicReference<>();
-        Function<Value, Function<?, ?>> cached = StableValue.function(inputs, _ -> ref.get());
-        ref.set(cached);
-        cached.apply(Value.FORTY_TWO);
-        var toString = cached.toString();
-        assertTrue(toString.contains("FORTY_TWO=(this StableFunction)"), toString);
-        assertDoesNotThrow(cached::hashCode);
-        assertDoesNotThrow((() -> cached.equals(cached)));
-    }
-
-    @ParameterizedTest
-    @MethodSource("allSets")
-    void equality(Set<Value> inputs) {
-        Function<Value, Integer> mapper = Value::asInt;
-        Function<Value, Integer> f0 = StableValue.function(inputs, mapper);
-        Function<Value, Integer> f1 = StableValue.function(inputs, mapper);
-        // No function is equal to another function
-        assertNotEquals(f0, f1);
-    }
-
-    @ParameterizedTest
-    @MethodSource("allSets")
-    void hashCodeStable(Set<Value> inputs) {
-        Function<Value, Integer> f0 = StableValue.function(inputs, Value::asInt);
-        assertEquals(System.identityHashCode(f0), f0.hashCode());
-        if (!inputs.isEmpty()) {
-            f0.apply(Value.FORTY_TWO);
-            assertEquals(System.identityHashCode(f0), f0.hashCode());
-        }
-    }
-
-    @Test
-    void nullKeys() {
-        Set<Value> inputs = new HashSet<>();
-        inputs.add(Value.FORTY_TWO);
-        inputs.add(null);
-        assertThrows(NullPointerException.class, () -> StableValue.function(inputs, MAPPER));
-    }
-
-    @Test
-    void usesOptimizedVersion() {
-        Function<Value, Integer> enumFunction = StableValue.function(EnumSet.of(Value.FORTY_TWO), Value::asInt);
-        assertEquals("jdk.internal.lang.stable.StableEnumFunction", enumFunction.getClass().getName());
-        Function<Value, Integer> emptyFunction = StableValue.function(Set.of(), Value::asInt);
-        assertEquals("jdk.internal.lang.stable.StableFunction", emptyFunction.getClass().getName());
-    }
-
-    @Test
-    void overriddenEnum() {
-        final var overridden = Value.THIRTEEN;
-        Function<Value, Integer> enumFunction = StableValue.function(EnumSet.of(overridden), Value::asInt);
-        assertEquals(MAPPER.apply(overridden), enumFunction.apply(overridden));
-    }
-
-    private static Stream<Set<Value>> nonEmptySets() {
-        return Stream.of(
-                Set.of(Value.FORTY_TWO, Value.THIRTEEN),
-                linkedHashSet(Value.THIRTEEN, Value.FORTY_TWO),
-                treeSet(Value.FORTY_TWO, Value.THIRTEEN),
-                EnumSet.of(Value.FORTY_TWO, Value.THIRTEEN)
-        );
-    }
-
-    private static Stream<Set<Value>> emptySets() {
-        return Stream.of(
-                Set.of(),
-                linkedHashSet(),
-                treeSet(),
-                EnumSet.noneOf(Value.class)
-        );
-    }
-
-    private static Stream<Set<Value>> allSets() {
-        return Stream.concat(
-                nonEmptySets(),
-                emptySets()
-        );
-    }
-
-    static Set<Value> treeSet(Value... values) {
-        return populate(new TreeSet<>(Comparator.comparingInt(Value::asInt).reversed()),values);
-    }
-
-    static Set<Value> linkedHashSet(Value... values) {
-        return populate(new LinkedHashSet<>(), values);
-    }
-
-    static Set<Value> populate(Set<Value> set, Value... values) {
-        set.addAll(Arrays.asList(values));
-        return set;
-    }
-
-}
diff --git a/test/jdk/java/lang/StableValue/StableIntFunctionTest.java b/test/jdk/java/lang/StableValue/StableIntFunctionTest.java
deleted file mode 100644
index 7397a688ee6..00000000000
--- a/test/jdk/java/lang/StableValue/StableIntFunctionTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @summary Basic tests for StableIntFunction methods
- * @enablePreview
- * @run junit StableIntFunctionTest
- */
-
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.IntFunction;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-final class StableIntFunctionTest {
-
-    private static final int SIZE = 2;
-    private static final IntFunction<Integer> MAPPER = i -> i;
-
-    @Test
-    void factoryInvariants() {
-        assertThrows(IllegalArgumentException.class, () -> StableValue.intFunction(-1, MAPPER));
-        assertThrows(NullPointerException.class, () -> StableValue.intFunction(SIZE, null));
-    }
-
-    @Test
-    void basic() {
-        basic(MAPPER);
-        basic(i -> null);
-    }
-
-    void basic(IntFunction<Integer> mapper) {
-        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(mapper);
-        var cached = StableValue.intFunction(SIZE, cif);
-        assertEquals("[.unset, .unset]", cached.toString());
-        assertEquals(mapper.apply(1), cached.apply(1));
-        assertEquals(1, cif.cnt());
-        assertEquals(mapper.apply(1), cached.apply(1));
-        assertEquals(1, cif.cnt());
-        assertEquals("[.unset, " + mapper.apply(1) + "]", cached.toString());
-        assertThrows(IllegalArgumentException.class, () -> cached.apply(SIZE));
-        assertThrows(IllegalArgumentException.class, () -> cached.apply(-1));
-        assertThrows(IllegalArgumentException.class, () -> cached.apply(1_000_000));
-    }
-
-    @Test
-    void exception() {
-        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(_ -> {
-            throw new UnsupportedOperationException();
-        });
-        var cached = StableValue.intFunction(SIZE, cif);
-        assertThrows(UnsupportedOperationException.class, () -> cached.apply(1));
-        assertEquals(1, cif.cnt());
-        assertThrows(UnsupportedOperationException.class, () -> cached.apply(1));
-        assertEquals(2, cif.cnt());
-        assertEquals("[.unset, .unset]", cached.toString());
-    }
-
-    @Test
-    void circular() {
-        final AtomicReference<IntFunction<?>> ref = new AtomicReference<>();
-        IntFunction<IntFunction<?>> cached = StableValue.intFunction(SIZE, _ -> ref.get());
-        ref.set(cached);
-        cached.apply(0);
-        String toString = cached.toString();
-        assertEquals("[(this StableIntFunction), .unset]", toString);
-        assertDoesNotThrow(cached::hashCode);
-        assertDoesNotThrow((() -> cached.equals(cached)));
-    }
-
-    @Test
-    void equality() {
-        IntFunction<Integer> f0 = StableValue.intFunction(8, MAPPER);
-        IntFunction<Integer> f1 = StableValue.intFunction(8, MAPPER);
-        // No function is equal to another function
-        assertNotEquals(f0, f1);
-    }
-
-    @Test
-    void hashCodeStable() {
-        IntFunction<Integer> f0 = StableValue.intFunction(8, MAPPER);
-        assertEquals(System.identityHashCode(f0), f0.hashCode());
-        f0.apply(4);
-        assertEquals(System.identityHashCode(f0), f0.hashCode());
-    }
-
-}
diff --git a/test/jdk/java/lang/StableValue/StableMapTest.java b/test/jdk/java/lang/StableValue/StableMapTest.java
deleted file mode 100644
index 86cf4ab3643..00000000000
--- a/test/jdk/java/lang/StableValue/StableMapTest.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @summary Basic tests for StableMap methods
- * @modules java.base/jdk.internal.lang.stable
- * @enablePreview
- * @run junit StableMapTest
- */
-
-import jdk.internal.lang.stable.StableUtil;
-import jdk.internal.lang.stable.StableValueImpl;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.io.Serializable;
-import java.util.AbstractMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-final class StableMapTest {
-
-    private static final int NOT_PRESENT = 147;
-    private static final int KEY = 7;
-    private static final Set<Integer> KEYS = Set.of(0, KEY, 13);
-    private static final Set<Integer> EMPTY = Set.of();
-    private static final Function<Integer, Integer> IDENTITY = Function.identity();
-
-    @Test
-    void factoryInvariants() {
-        assertThrows(NullPointerException.class, () -> StableValue.map(KEYS, null));
-        assertThrows(NullPointerException.class, () -> StableValue.map(null, IDENTITY));
-    }
-
-    @Test
-    void isEmpty() {
-        assertFalse(newMap().isEmpty());
-        assertTrue(newEmptyMap().isEmpty());
-    }
-
-    @Test
-    void size() {
-        assertEquals(KEYS.size(), newMap().size());
-        assertEquals(EMPTY.size(), newEmptyMap().size());
-    }
-
-    @Test
-    void get() {
-        StableTestUtil.CountingFunction<Integer, Integer> cf = new StableTestUtil.CountingFunction<>(IDENTITY);
-        var lazy = StableValue.map(KEYS, cf);
-        int cnt = 1;
-        for (int i : KEYS) {
-            assertEquals(i, lazy.get(i));
-            assertEquals(cnt, cf.cnt());
-            assertEquals(i, lazy.get(i));
-            assertEquals(cnt++, cf.cnt());
-        }
-        assertNull(lazy.get(NOT_PRESENT));
-    }
-
-    @Test
-    void getException() {
-        StableTestUtil.CountingFunction<Integer, Integer> cf = new StableTestUtil.CountingFunction<>(_ -> {
-            throw new UnsupportedOperationException();
-        });
-        var lazy = StableValue.map(KEYS, cf);
-        assertThrows(UnsupportedOperationException.class, () -> lazy.get(KEY));
-        assertEquals(1, cf.cnt());
-        assertThrows(UnsupportedOperationException.class, () -> lazy.get(KEY));
-        assertEquals(2, cf.cnt());
-    }
-
-    @Test
-    void containsKey() {
-        var lazy = newMap();
-        for (int i : KEYS) {
-            assertTrue(lazy.containsKey(i));
-        }
-        assertFalse(lazy.containsKey(NOT_PRESENT));
-    }
-
-    @Test
-    void containsValue() {
-        var lazy = newMap();
-        for (int i : KEYS) {
-            assertTrue(lazy.containsValue(i));
-        }
-        assertFalse(lazy.containsValue(NOT_PRESENT));
-    }
-
-    @Test
-    void forEach() {
-        var lazy = newMap();
-        Set<Map.Entry<Integer, Integer>> expected = KEYS.stream()
-                .map(i -> new AbstractMap.SimpleImmutableEntry<>(i , i))
-                .collect(Collectors.toSet());
-        Set<Map.Entry<Integer, Integer>> actual = new HashSet<>();
-        lazy.forEach((k, v) -> actual.add(new AbstractMap.SimpleImmutableEntry<>(k , v)));
-        assertEquals(expected, actual);
-    }
-
-    @Test
-    void toStringTest() {
-        assertEquals("{}", newEmptyMap().toString());
-        var map = StableValue.map(Set.of(KEY), IDENTITY);
-        assertEquals("{" + KEY + "=.unset}", map.toString());
-        map.get(KEY);
-        assertEquals("{" + KEY + "=" + KEY + "}", map.toString());
-        String actual = newMap().toString();
-        assertTrue(actual.startsWith("{"));
-        for (int key : KEYS) {
-            assertTrue(actual.contains(key + "=.unset"));
-        }
-        assertTrue(actual.endsWith("}"));
-    }
-
-    @Test
-    void hashCodeTest() {
-        assertEquals(Map.of().hashCode(), newEmptyMap().hashCode());
-        assertEquals(newRegularMap().hashCode(), newMap().hashCode());
-    }
-
-    @Test
-    void equalsTest() {
-        assertTrue(newEmptyMap().equals(Map.of()));
-        assertTrue(Map.of().equals(newEmptyMap()));
-        assertTrue(newMap().equals(newRegularMap()));
-        assertTrue(newRegularMap().equals(newMap()));
-        assertFalse(newMap().equals("A"));
-    }
-
-    @Test
-    void entrySet() {
-        var regular = newRegularMap().entrySet();
-        var actual = newMap().entrySet();
-        assertTrue(regular.equals(actual));
-        assertTrue(actual.equals(regular));
-        assertTrue(regular.equals(actual));
-    }
-
-    @Test
-    void entrySetToString() {
-        var map = newMap();
-        var entrySet = map.entrySet();
-        var toString = entrySet.toString();
-        for (var key : KEYS) {
-            assertTrue(toString.contains(key + "=.unset"));
-        }
-        assertTrue(toString.startsWith("["));
-        assertTrue(toString.endsWith("]"));
-
-        map.get(KEY);
-        for (var key : KEYS) {
-            if (key.equals(KEY)) {
-                continue;
-            }
-            assertTrue(entrySet.toString().contains(key + "=.unset"));
-        }
-        assertTrue(entrySet.toString().contains(KEY + "=" + KEY));
-    }
-
-    @Test
-    void values() {
-        var map = newMap();
-        var values = map.values();
-        // Look at one of the elements
-        var val = values.stream().iterator().next();
-        var toString = map.toString();
-        for (var key : KEYS) {
-            if (key.equals(val)) {
-                assertTrue(toString.contains(key + "=" + key));
-            } else {
-                assertTrue(toString.contains(key + "=.unset"));
-            }
-        }
-
-        // Mod ops
-        assertThrows(UnsupportedOperationException.class, () -> values.remove(KEY));
-        assertThrows(UnsupportedOperationException.class, () -> values.add(KEY));
-        assertThrows(UnsupportedOperationException.class, values::clear);
-        assertThrows(UnsupportedOperationException.class, () -> values.addAll(Set.of(1)));
-        assertThrows(UnsupportedOperationException.class, () -> values.removeIf(i -> true));
-        assertThrows(UnsupportedOperationException.class, () -> values.retainAll(Set.of(KEY)));
-    }
-
-    @Test
-    void valuesToString() {
-        var map = newMap();
-        var values = map.values();
-        assertEquals("[.unset, .unset, .unset]", values.toString());
-        map.get(KEY);
-        var afterGet = values.toString();
-        assertTrue(afterGet.contains(Integer.toString(KEY)), afterGet);
-    }
-
-    @Test
-    void iteratorNext() {
-        Set<Integer> encountered = new HashSet<>();
-        var iterator = newMap().entrySet().iterator();
-        while (iterator.hasNext()) {
-            var entry = iterator.next();
-            assertEquals(entry.getKey(), entry.getValue());
-            encountered.add(entry.getValue());
-        }
-        assertEquals(KEYS, encountered);
-    }
-
-    @Test
-    void iteratorForEachRemaining() {
-        Set<Integer> encountered = new HashSet<>();
-        var iterator = newMap().entrySet().iterator();
-        var entry = iterator.next();
-        assertEquals(entry.getKey(), entry.getValue());
-        encountered.add(entry.getValue());
-        iterator.forEachRemaining(e -> {
-            assertEquals(e.getKey(), e.getValue());
-            encountered.add(e.getValue());
-        });
-        assertEquals(KEYS, encountered);
-    }
-
-    @Test
-    void stableEntry() {
-        var map = newMap();
-        var entry = map.entrySet().stream()
-                .filter(e -> e.getKey().equals(KEY))
-                .findAny()
-                .orElseThrow();
-
-        assertEquals(KEY + "=.unset", entry.toString());
-        var otherDifferent = Map.entry(-1, -1);
-        assertNotEquals(entry, otherDifferent);
-        assertEquals(KEY + "=.unset", entry.toString());
-        var otherEqual = Map.entry(KEY, KEY);
-        assertEquals(entry, otherEqual);
-        assertEquals(KEY + "=" + KEY, entry.toString());
-        assertEquals(entry.hashCode(), otherEqual.hashCode());
-    }
-
-    @Test
-    void stableForEachEntry() {
-        var map = newMap();
-        // Only touch the key.
-        map.entrySet().iterator().forEachRemaining(Map.Entry::getKey);
-        map.entrySet().iterator()
-                .forEachRemaining(e -> assertTrue(e.toString().contains(".unset")));
-        // Only touch the value.
-        map.entrySet().iterator().forEachRemaining(Map.Entry::getValue);
-        map.entrySet().iterator()
-                .forEachRemaining(e -> assertFalse(e.toString().contains(".unset")));
-    }
-
-    // Immutability
-    @ParameterizedTest
-    @MethodSource("unsupportedOperations")
-    void unsupported(Operation operation) {
-        assertThrowsForOperation(UnsupportedOperationException.class, operation);
-    }
-
-    // Method parameter invariant checking
-
-    @ParameterizedTest
-    @MethodSource("nullAverseOperations")
-    void nullAverse(Operation operation) {
-        assertThrowsForOperation(NullPointerException.class, operation);
-    }
-
-    static <T extends Throwable> void assertThrowsForOperation(Class<T> expectedType, Operation operation) {
-        var lazy = newMap();
-        assertThrows(expectedType, () -> operation.accept(lazy));
-    }
-
-    // Implementing interfaces
-
-    @Test
-    void serializable() {
-        serializable(newMap());
-        serializable(newEmptyMap());
-    }
-
-    void serializable(Map<Integer, Integer> map) {
-        assertFalse(map instanceof Serializable);
-        assertFalse(map.entrySet() instanceof Serializable);
-        assertFalse(map.keySet() instanceof Serializable);
-        assertFalse(map.values() instanceof Serializable);
-    }
-
-    @Test
-    void distinct() {
-        Map<Integer, StableValueImpl<Integer>> map = StableUtil.map(Set.of(1, 2, 3));
-        assertEquals(3, map.size());
-        // Check, every StableValue is distinct
-        Map<StableValue<Integer>, Boolean> idMap = new IdentityHashMap<>();
-        map.forEach((k, v) -> idMap.put(v, true));
-        assertEquals(3, idMap.size());
-    }
-
-    @Test
-    void nullResult() {
-        var map = StableValue.map(Set.of(0), _ -> null);
-        assertNull(map.getOrDefault(0, 1));;
-        assertTrue(map.containsKey(0));
-        assertNull(map.get(0));
-    }
-
-    @Test
-    void nullKeys() {
-        Set<Integer> inputs = new HashSet<>();
-        inputs.add(0);
-        inputs.add(null);
-        assertThrows(NullPointerException.class, () -> StableValue.map(inputs, IDENTITY));
-    }
-
-    // Support constructs
-
-    record Operation(String name,
-                     Consumer<Map<Integer, Integer>> consumer) implements Consumer<Map<Integer, Integer>> {
-        @java.lang.Override
-        public void accept(Map<Integer, Integer> map) { consumer.accept(map); }
-        @java.lang.Override
-        public String toString() { return name; }
-    }
-
-    static Stream<Operation> nullAverseOperations() {
-        return Stream.of(
-            new Operation("forEach",     m -> m.forEach(null))
-        );
-    }
-
-    static Stream<Operation> unsupportedOperations() {
-        return Stream.of(
-            new Operation("clear",             Map::clear),
-            new Operation("compute",           m -> m.compute(KEY, (_, _) -> 1)),
-            new Operation("computeIfAbsent",   m -> m.computeIfAbsent(KEY, _ -> 1)),
-            new Operation("computeIfPresent",  m -> m.computeIfPresent(KEY, (_, _) -> 1)),
-            new Operation("merge",             m -> m.merge(KEY, KEY, (a, _) -> a)),
-            new Operation("put",               m -> m.put(0, 0)),
-            new Operation("putAll",            m -> m.putAll(Map.of())),
-            new Operation("remove1",           m -> m.remove(KEY)),
-            new Operation("remove2",           m -> m.remove(KEY, KEY)),
-            new Operation("replace2",          m -> m.replace(KEY, 1)),
-            new Operation("replace3",          m -> m.replace(KEY, KEY, 1)),
-            new Operation("replaceAll",        m -> m.replaceAll((a, _) -> a))
-        );
-    }
-
-    static Map<Integer, Integer> newMap() {
-        return StableValue.map(KEYS, IDENTITY);
-    }
-
-    static Map<Integer, Integer> newEmptyMap() {
-        return StableValue.map(EMPTY, IDENTITY);
-    }
-
-    static Map<Integer, Integer> newRegularMap() {
-        return KEYS.stream().collect(Collectors.toMap(IDENTITY, IDENTITY));
-    }
-
-}
diff --git a/test/jdk/java/lang/StableValue/StableSupplierTest.java b/test/jdk/java/lang/StableValue/StableSupplierTest.java
deleted file mode 100644
index 2d542fbf6ca..00000000000
--- a/test/jdk/java/lang/StableValue/StableSupplierTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @summary Basic tests for StableSupplier methods
- * @enablePreview
- * @run junit StableSupplierTest
- */
-
-import org.junit.jupiter.api.Test;
-
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-final class StableSupplierTest {
-
-    private static final Supplier<Integer> SUPPLIER = () -> 42;
-
-    @Test
-    void factoryInvariants() {
-        assertThrows(NullPointerException.class, () -> StableValue.supplier(null));
-    }
-
-    @Test
-    void basic() {
-        basic(SUPPLIER);
-        basic(() -> null);
-    }
-
-    void basic(Supplier<Integer> supplier) {
-        StableTestUtil.CountingSupplier<Integer> cs = new StableTestUtil.CountingSupplier<>(supplier);
-        var cached = StableValue.supplier(cs);
-        assertEquals(".unset", cached.toString());
-        assertEquals(supplier.get(), cached.get());
-        assertEquals(1, cs.cnt());
-        assertEquals(supplier.get(), cached.get());
-        assertEquals(1, cs.cnt());
-        assertEquals(Objects.toString(supplier.get()), cached.toString());
-    }
-
-    @Test
-    void exception() {
-        StableTestUtil.CountingSupplier<Integer> cs = new StableTestUtil.CountingSupplier<>(() -> {
-            throw new UnsupportedOperationException();
-        });
-        var cached = StableValue.supplier(cs);
-        assertThrows(UnsupportedOperationException.class, cached::get);
-        assertEquals(1, cs.cnt());
-        assertThrows(UnsupportedOperationException.class, cached::get);
-        assertEquals(2, cs.cnt());
-        assertEquals(".unset", cached.toString());
-    }
-
-    @Test
-    void circular() {
-        final AtomicReference<Supplier<?>> ref = new AtomicReference<>();
-        Supplier<Supplier<?>> cached = StableValue.supplier(ref::get);
-        ref.set(cached);
-        cached.get();
-        String toString = cached.toString();
-        assertTrue(toString.startsWith("(this StableSupplier)"));
-        assertDoesNotThrow(cached::hashCode);
-    }
-
-    @Test
-    void equality() {
-        Supplier<Integer> f0 = StableValue.supplier(SUPPLIER);
-        Supplier<Integer> f1 = StableValue.supplier(SUPPLIER);
-        // No function is equal to another function
-        assertNotEquals(f0, f1);
-    }
-
-    @Test
-    void hashCodeStable() {
-        Supplier<Integer> f0 = StableValue.supplier(SUPPLIER);
-        assertEquals(System.identityHashCode(f0), f0.hashCode());
-        f0.get();
-        assertEquals(System.identityHashCode(f0), f0.hashCode());
-    }
-
-}
diff --git a/test/jdk/java/lang/StableValue/StableValueFactoriesTest.java b/test/jdk/java/lang/StableValue/StableValueFactoriesTest.java
deleted file mode 100644
index 85aee0cbeec..00000000000
--- a/test/jdk/java/lang/StableValue/StableValueFactoriesTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @summary Basic tests for StableValue factory implementations
- * @modules java.base/jdk.internal.lang.stable
- * @enablePreview
- * @run junit StableValueFactoriesTest
- */
-
-import jdk.internal.lang.stable.StableUtil;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-final class StableValueFactoriesTest {
-
-    @Test
-    void array() {
-        assertThrows(IllegalArgumentException.class, () -> StableUtil.array(-1));
-    }
-
-}
diff --git a/test/jdk/java/lang/StableValue/StableValueTest.java b/test/jdk/java/lang/StableValue/StableValueTest.java
deleted file mode 100644
index 4290c8716a0..00000000000
--- a/test/jdk/java/lang/StableValue/StableValueTest.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- * @summary Basic tests for StableValue implementations
- * @enablePreview
- * @run junit StableValueTest
- */
-
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.LockSupport;
-import java.util.function.BiPredicate;
-import java.util.function.Function;
-import java.util.function.IntFunction;
-import java.util.function.UnaryOperator;
-import java.util.stream.IntStream;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-final class StableValueTest {
-
-    private static final int VALUE = 42;
-    private static final int VALUE2 = 13;
-
-    @Test
-    void trySet() {
-        trySet(VALUE);
-        trySet(null);
-    }
-
-    @Test
-    void preSet() {
-        StableValue<Integer> stable = StableValue.of(VALUE);
-        assertTrue(stable.isSet());
-        assertEquals(VALUE, stable.orElseThrow());
-        assertEquals(VALUE, stable.orElse(VALUE2));
-        assertEquals(VALUE, stable.orElseSet(() -> VALUE2));
-        assertFalse(stable.trySet(VALUE2));
-        var e = assertThrows(IllegalStateException.class, () -> stable.setOrThrow(VALUE2));
-        assertEquals(
-                "The contents is already set",
-                e.getMessage());
-    }
-
-    void trySet(Integer initial) {
-        StableValue<Integer> stable = StableValue.of();
-        assertTrue(stable.trySet(initial));
-        assertFalse(stable.trySet(null));
-        assertFalse(stable.trySet(VALUE));
-        assertFalse(stable.trySet(VALUE2));
-        assertEquals(initial, stable.orElseThrow());
-    }
-
-    @Test
-    void setOrThrowValue() {
-        StableValue<Integer> stable = StableValue.of();
-        stable.setOrThrow(VALUE);
-        var e = assertThrows(IllegalStateException.class, () -> stable.setOrThrow(VALUE2));
-        assertEquals("The contents is already set", e.getMessage());
-    }
-
-    @Test
-    void setOrThrowNull() {
-        StableValue<Integer> stable = StableValue.of();
-        stable.setOrThrow(null);
-        var e = assertThrows(IllegalStateException.class, () -> stable.setOrThrow(null));
-        assertEquals("The contents is already set", e.getMessage());
-    }
-
-    @Test
-    void orElse() {
-        StableValue<Integer> stable = StableValue.of();
-        assertEquals(VALUE, stable.orElse(VALUE));
-        assertNull(stable.orElse(null));
-        stable.trySet(VALUE);
-        assertEquals(VALUE, stable.orElse(VALUE2));
-    }
-
-    @Test
-    void orElseThrow() {
-        StableValue<Integer> stable = StableValue.of();
-        var e = assertThrows(NoSuchElementException.class, stable::orElseThrow);
-        assertEquals("No contents set", e.getMessage());
-        stable.trySet(VALUE);
-        assertEquals(VALUE, stable.orElseThrow());
-    }
-
-    @Test
-    void isSet() {
-        isSet(VALUE);
-        isSet(null);
-   }
-
-    void isSet(Integer initial) {
-        StableValue<Integer> stable = StableValue.of();
-        assertFalse(stable.isSet());
-        stable.trySet(initial);
-        assertTrue(stable.isSet());
-    }
-
-   @Test
-   void testOrElseSetSupplier() {
-       StableTestUtil.CountingSupplier<Integer> cs = new StableTestUtil.CountingSupplier<>(() -> VALUE);
-       StableValue<Integer> stable = StableValue.of();
-       assertThrows(NullPointerException.class, () -> stable.orElseSet(null));
-       assertEquals(VALUE, stable.orElseSet(cs));
-       assertEquals(1, cs.cnt());
-       assertEquals(VALUE, stable.orElseSet(cs));
-       assertEquals(1, cs.cnt());
-   }
-
-    @Test
-    void testHashCode() {
-        StableValue<Integer> stableValue = StableValue.of();
-        // Should be Object::hashCode
-        assertEquals(System.identityHashCode(stableValue), stableValue.hashCode());
-    }
-
-    @Test
-    void testEquals() {
-        StableValue<Integer> s0 = StableValue.of();
-        assertNotEquals(null, s0);
-        StableValue<Integer> s1 = StableValue.of();
-        assertNotEquals(s0, s1); // Identity based
-        s0.setOrThrow(42);
-        s1.setOrThrow(42);
-        assertNotEquals(s0, s1);
-        assertNotEquals("a", s0);
-        StableValue<Integer> null0 = StableValue.of();
-        StableValue<Integer> null1 = StableValue.of();
-        null0.setOrThrow(null);
-        null1.setOrThrow(null);
-        assertNotEquals(null0, null1);
-    }
-
-    @Test
-    void toStringUnset() {
-        StableValue<Integer> stable = StableValue.of();
-        assertEquals(".unset", stable.toString());
-    }
-
-    @Test
-    void toStringNull() {
-        StableValue<Integer> stable = StableValue.of();
-        assertTrue(stable.trySet(null));
-        assertEquals("null", stable.toString());
-    }
-
-    @Test
-    void toStringNonNull() {
-        StableValue<Integer> stable = StableValue.of();
-        assertTrue(stable.trySet(VALUE));
-        assertEquals(Objects.toString(VALUE), stable.toString());
-    }
-
-    @Test
-    void toStringCircular() {
-        StableValue<StableValue<?>> stable = StableValue.of();
-        stable.trySet(stable);
-        String toString = assertDoesNotThrow(stable::toString);
-        assertEquals("(this StableValue)", toString);
-        assertDoesNotThrow(stable::hashCode);
-        assertDoesNotThrow((() -> stable.equals(stable)));
-    }
-
-    @Test
-    void recursiveCall() {
-        StableValue<Integer> stable = StableValue.of();
-        AtomicReference<StableValue<Integer>> ref = new AtomicReference<>(stable);
-        assertThrows(IllegalStateException.class, () ->
-                stable.orElseSet(() -> {
-                    ref.get().trySet(1);
-                    return 1;
-                })
-        );
-        assertThrows(IllegalStateException.class, () ->
-                stable.orElseSet(() -> {
-                    ref.get().orElseSet(() -> 1);
-                    return 1;
-                })
-        );
-    }
-
-    @Test
-    void intFunctionExample() {
-        final class SqrtUtil {
-
-            private SqrtUtil() {}
-
-            private static final int CACHED_SIZE = 10;
-
-            private static final IntFunction<Double> SQRT =
-                    // @link substring="intFunction" target="#intFunction(int,IntFunction)" :
-                    StableValue.intFunction(CACHED_SIZE, StrictMath::sqrt);
-
-            public static double sqrt(int a) {
-                return SQRT.apply(a);
-            }
-        }
-
-        double sqrt9 = SqrtUtil.sqrt(9);   // May eventually constant fold to 3.0 at runtime
-
-        assertEquals(3, sqrt9);
-        assertThrows(IllegalArgumentException.class, () -> SqrtUtil.sqrt(16));
-    }
-
-    @Test
-    void intFunctionExample2() {
-        final class PowerOf2Util {
-
-            private PowerOf2Util() {}
-
-            private static final int SIZE = 6;
-            private static final IntFunction<Integer> ORIGINAL_POWER_OF_TWO =
-                    v -> 1 << v;
-
-            private static final IntFunction<Integer> POWER_OF_TWO =
-                    // @link substring="intFunction" target="#intFunction(int,IntFunction)" :
-                    StableValue.intFunction(SIZE, ORIGINAL_POWER_OF_TWO);
-
-            public static int powerOfTwo(int a) {
-                return POWER_OF_TWO.apply(a);
-            }
-        }
-
-        int pwr4 = PowerOf2Util.powerOfTwo(4);   // May eventually constant fold to 16 at runtime
-
-        assertEquals(16, pwr4);
-        assertEquals(1, PowerOf2Util.powerOfTwo(0));
-        assertEquals(8, PowerOf2Util.powerOfTwo(3));
-        assertEquals(32, PowerOf2Util.powerOfTwo(5));
-        assertThrows(IllegalArgumentException.class, () -> PowerOf2Util.powerOfTwo(10));
-    }
-
-    @Test
-    void functionExample() {
-
-        class Log2Util {
-
-            private Log2Util() {}
-
-            private static final Set<Integer> CACHED_KEYS =
-                    Set.of(1, 2, 4, 8, 16, 32);
-            private static final UnaryOperator<Integer> LOG2_ORIGINAL =
-                    i -> 31 - Integer.numberOfLeadingZeros(i);
-
-            private static final Function<Integer, Integer> LOG2_CACHED =
-                    // @link substring="function" target="#function(Set,Function)" :
-                    StableValue.function(CACHED_KEYS, LOG2_ORIGINAL);
-
-            public static double log2(int a) {
-                if (CACHED_KEYS.contains(a)) {
-                    return LOG2_CACHED.apply(a);
-                } else {
-                    return LOG2_ORIGINAL.apply(a);
-                }
-            }
-
-        }
-
-        double log16 = Log2Util.log2(16); // May eventually constant fold to 4.0 at runtime
-        double log256 = Log2Util.log2(256); // Will not constant fold
-
-        assertEquals(4, log16);
-        assertEquals(8, log256);
-    }
-
-    @Test
-    void functionExample2() {
-
-        class Log2Util {
-
-            private Log2Util() {}
-
-            private static final Set<Integer> KEYS =
-                    Set.of(1, 2, 4, 8);
-            private static final UnaryOperator<Integer> LOG2_ORIGINAL =
-                    i -> 31 - Integer.numberOfLeadingZeros(i);
-
-            private static final Function<Integer, Integer> LOG2 =
-                    // @link substring="function" target="#function(Set,Function)" :
-                    StableValue.function(KEYS, LOG2_ORIGINAL);
-
-            public static double log2(int a) {
-                return LOG2.apply(a);
-            }
-
-        }
-
-        double log16 = Log2Util.log2(8); // May eventually constant fold to 3.0 at runtime
-
-        assertEquals(3, log16);
-        assertThrows(IllegalArgumentException.class, () -> Log2Util.log2(3));
-    }
-
-    private static final BiPredicate<StableValue<Integer>, Integer> TRY_SET = StableValue::trySet;
-    private static final BiPredicate<StableValue<Integer>, Integer> SET_OR_THROW = (s, i) -> {
-        try {
-            s.setOrThrow(i);
-            return true;
-        } catch (IllegalStateException e) {
-            return false;
-        }
-    };
-
-    @Test
-    void raceTrySet() {
-        race(TRY_SET);
-    }
-
-    @Test
-    void raceSetOrThrow() {
-        race(SET_OR_THROW);
-    }
-
-    @Test
-    void raceMixed() {
-        race((s, i) -> switch (i % 2) {
-            case 0 -> TRY_SET.test(s, i);
-            case 1 -> SET_OR_THROW.test(s, i);
-            default -> fail("should not reach here");
-        });
-    }
-
-    void race(BiPredicate<StableValue<Integer>, Integer> winnerPredicate) {
-        int noThreads = 10;
-        CountDownLatch starter = new CountDownLatch(noThreads);
-        StableValue<Integer> stable = StableValue.of();
-        Map<Integer, Boolean> winners = new ConcurrentHashMap<>();
-        List<Thread> threads = IntStream.range(0, noThreads).mapToObj(i -> new Thread(() -> {
-                    try {
-                        // Ready ...
-                        starter.countDown();
-                        // ... set ...
-                        starter.await();
-                        // Here we go!
-                        winners.put(i, winnerPredicate.test(stable, i));
-                    } catch (Throwable t) {
-                        fail(t);
-                    }
-                }))
-                .toList();
-        threads.forEach(Thread::start);
-        threads.forEach(StableValueTest::join);
-        // There can only be one winner
-        assertEquals(1, winners.values().stream().filter(b -> b).count());
-    }
-
-    private static void join(Thread thread) {
-        try {
-            thread.join();
-        } catch (InterruptedException e) {
-            fail(e);
-        }
-    }
-
-}
diff --git a/test/jdk/java/util/Collection/MOAT.java b/test/jdk/java/util/Collection/MOAT.java
index ab9e4b4309d..d0d27c8f91e 100644
--- a/test/jdk/java/util/Collection/MOAT.java
+++ b/test/jdk/java/util/Collection/MOAT.java
@@ -220,15 +220,15 @@ public class MOAT {
         // Immutable List
         testEmptyList(List.of());
         testEmptyList(List.of().subList(0,0));
-        testEmptyList(StableValue.list(0, i -> i));
-        testEmptyList(StableValue.list(3, i -> i).subList(0, 0));
+        testEmptyList(List.ofLazy(0, i -> i));
+        testEmptyList(List.ofLazy(3, i -> i).subList(0, 0));
         testListMutatorsAlwaysThrow(List.of());
         testListMutatorsAlwaysThrow(List.<Integer>of().subList(0,0));
-        testListMutatorsAlwaysThrow(StableValue.list(0, i -> i));
+        testListMutatorsAlwaysThrow(List.ofLazy(0, i -> i));
         testEmptyListMutatorsAlwaysThrow(List.of());
         testEmptyListMutatorsAlwaysThrow(List.<Integer>of().subList(0,0));
-        testEmptyListMutatorsAlwaysThrow(StableValue.list(0, i -> i));
-        testEmptyListMutatorsAlwaysThrow(StableValue.list(3, i -> i).subList(0, 0));
+        testEmptyListMutatorsAlwaysThrow(List.ofLazy(0, i -> i));
+        testEmptyListMutatorsAlwaysThrow(List.ofLazy(3, i -> i).subList(0, 0));
         for (List<Integer> list : Arrays.asList(
                 List.<Integer>of(),
                 List.of(1),
@@ -251,9 +251,9 @@ public class MOAT {
                 Stream.of(1, null).toList(),
                 Stream.of(1, null, 3).toList(),
                 Stream.of(1, null, 3, 4).toList(),
-                StableValue.list(0, i -> i),
-                StableValue.list(3, i -> i),
-                StableValue.list(10, i -> i))) {
+                List.ofLazy(0, i -> i),
+                List.ofLazy(3, i -> i),
+                List.ofLazy(10, i -> i))) {
             testCollection(list);
             testImmutableList(list);
             testListMutatorsAlwaysThrow(list);
@@ -365,9 +365,9 @@ public class MOAT {
         testEmptyMap(Map.of());
         testMapMutatorsAlwaysThrow(Map.of());
         testEmptyMapMutatorsAlwaysThrow(Map.of());
-        testEmptyMap(StableValue.map(Set.of(), k -> k));
-        testMapMutatorsAlwaysThrow(StableValue.map(Set.of(), k -> k));
-        testEmptyMapMutatorsAlwaysThrow(StableValue.map(Set.of(), k -> k));
+        testEmptyMap(Map.ofLazy(Set.of(), k -> k));
+        testMapMutatorsAlwaysThrow(Map.ofLazy(Set.of(), k -> k));
+        testEmptyMapMutatorsAlwaysThrow(Map.ofLazy(Set.of(), k -> k));
         for (Map<Integer,Integer> map : Arrays.asList(
                 Map.<Integer,Integer>of(),
                 Map.of(1, 101),
@@ -381,9 +381,9 @@ public class MOAT {
                 Map.of(1, 101, 2, 202, 3, 303, 4, 404, 5, 505, 6, 606, 7, 707, 8, 808, 9, 909),
                 Map.of(1, 101, 2, 202, 3, 303, 4, 404, 5, 505, 6, 606, 7, 707, 8, 808, 9, 909, 10, 1010),
                 Map.ofEntries(ea),
-                StableValue.map(Set.<Integer>of(), k -> k),
-                StableValue.map(Set.of(1), k -> k),
-                StableValue.map(Set.of(1, 2, 3), k -> k))) {
+                Map.ofLazy(Set.<Integer>of(), k -> k),
+                Map.ofLazy(Set.of(1), k -> k),
+                Map.ofLazy(Set.of(1, 2, 3), k -> k))) {
             testMap(map);
             testImmutableMap(map);
             testMapMutatorsAlwaysThrow(map);
diff --git a/test/langtools/jdk/jshell/CompletionSuggestionTest.java b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
index d31a32b63f8..7a960258cc1 100644
--- a/test/langtools/jdk/jshell/CompletionSuggestionTest.java
+++ b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
@@ -947,7 +947,7 @@ public class CompletionSuggestionTest extends KullaTesting {
     public void testMultiSnippet() {
         assertCompletion("String s = \"\"; s.len|", true, "length()");
         assertCompletion("String s() { return \"\"; } s().len|", true, "length()");
-        assertCompletion("String s() { return \"\"; } import java.util.List; List.o|", true, "of(");
+        assertCompletion("String s() { return \"\"; } import java.util.List; List.o|", true, "of(", "ofLazy(");
         assertCompletion("String s() { return \"\"; } import java.ut| ", true, "util.");
         assertCompletion("class S { public int length() { return 0; } } new S().len|", true, "length()");
         assertSignature("void f() { } f(|", "void f()");
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableListBenchmark.java
similarity index 86%
rename from test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java
rename to test/micro/org/openjdk/bench/java/lang/stable/StableListBenchmark.java
index 0b8e5d97cac..67a60755682 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableListBenchmark.java
@@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.IntFunction;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring stable list performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -52,16 +52,16 @@ import java.util.function.IntFunction;
 })
 @Threads(Threads.MAX)   // Benchmark under contention
 @OperationsPerInvocation(100)
-public class StableIntFunctionBenchmark {
+public class StableListBenchmark {
 
     private static final int SIZE = 100;
     private static final IntFunction<Integer> IDENTITY = i -> i;
 
-    private static final List<Integer> LIST = StableValue.list(SIZE, IDENTITY);
-    private static final IntFunction<Integer> INT_FUNCTION = StableValue.intFunction(SIZE, IDENTITY);
+    private static final List<Integer> LIST = List.ofLazy(SIZE, IDENTITY);
+    private static final IntFunction<Integer> INT_FUNCTION = LIST::get;
 
-    private final List<Integer> list = StableValue.list(SIZE, IDENTITY);
-    private final IntFunction<Integer> intFunction = StableValue.intFunction(SIZE, IDENTITY);
+    private final List<Integer> list = List.ofLazy(SIZE, IDENTITY);
+    private final IntFunction<Integer> intFunction = list::get;
 
     @Benchmark
     public int list() {
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableListSingleBenchmark.java
similarity index 84%
rename from test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java
rename to test/micro/org/openjdk/bench/java/lang/stable/StableListSingleBenchmark.java
index 1e8e250ba8a..9210d8a86be 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableListSingleBenchmark.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.IntFunction;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring stable list performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -50,16 +50,16 @@ import java.util.function.IntFunction;
         "--enable-preview"
 })
 @Threads(Threads.MAX)   // Benchmark under contention
-public class StableIntFunctionSingleBenchmark {
+public class StableListSingleBenchmark {
 
     private static final int SIZE = 100;
     private static final IntFunction<Integer> IDENTITY = i -> i;
 
-    private static final List<Integer> STABLE = StableValue.list(SIZE, IDENTITY);
-    private static final IntFunction<Integer> INT_FUNCTION = StableValue.intFunction(SIZE, IDENTITY);
+    private static final List<Integer> STABLE = List.ofLazy(SIZE, IDENTITY);
+    private static final IntFunction<Integer> INT_FUNCTION = STABLE::get;
 
-    private final List<Integer> stable = StableValue.list(SIZE, IDENTITY);
-    private final IntFunction<Integer> intFunction = StableValue.intFunction(SIZE, IDENTITY);
+    private final List<Integer> stable = List.ofLazy(SIZE, IDENTITY);
+    private final IntFunction<Integer> intFunction = stable::get;
 
     @Benchmark
     public int list() {
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableMapBenchmark.java
similarity index 85%
rename from test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java
rename to test/micro/org/openjdk/bench/java/lang/stable/StableMapBenchmark.java
index 44fd3f2c18e..2b8e90eee17 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableMapBenchmark.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring stable map performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -55,16 +55,16 @@ import java.util.stream.IntStream;
 })
 @Threads(Threads.MAX)   // Benchmark under contention
 @OperationsPerInvocation(100)
-public class StableFunctionBenchmark {
+public class StableMapBenchmark {
 
     private static final int SIZE = 100;
     private static final Set<Integer> SET = IntStream.range(0, SIZE).boxed().collect(Collectors.toSet());
 
-    private static final Map<Integer, Integer> MAP = StableValue.map(SET, Function.identity());
-    private static final Function<Integer, Integer> FUNCTION = StableValue.function(SET, Function.identity());
+    private static final Map<Integer, Integer> MAP = Map.ofLazy(SET, Function.identity());
+    private static final Function<Integer, Integer> FUNCTION = MAP::get;
 
-    private final Map<Integer, Integer> map = StableValue.map(SET, Function.identity());
-    private final Function<Integer, Integer> function = StableValue.function(SET, Function.identity());
+    private final Map<Integer, Integer> map = Map.ofLazy(SET, Function.identity());
+    private final Function<Integer, Integer> function = map::get;
 
     @Benchmark
     public int map() {
@@ -85,7 +85,7 @@ public class StableFunctionBenchmark {
     }
 
     @Benchmark
-    public int staticSMap() {
+    public int staticMap() {
         int sum = 0;
         for (int i = 0; i < SIZE; i++) {
             sum += MAP.get(i);
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableMapSingleBenchmark.java
similarity index 70%
rename from test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java
rename to test/micro/org/openjdk/bench/java/lang/stable/StableMapSingleBenchmark.java
index 1cb1a04582f..4965ec649eb 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableMapSingleBenchmark.java
@@ -28,14 +28,15 @@ import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OperationsPerInvocation;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
+import java.util.EnumSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -43,7 +44,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring lazy map performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -54,16 +55,17 @@ import java.util.stream.IntStream;
         "--enable-preview"
 })
 @Threads(Threads.MAX)   // Benchmark under contention
-public class StableFunctionSingleBenchmark {
+public class StableMapSingleBenchmark {
 
     private static final int SIZE = 100;
     private static final Set<Integer> SET = IntStream.range(0, SIZE).boxed().collect(Collectors.toSet());
 
-    private static final Map<Integer, Integer> MAP = StableValue.map(SET, Function.identity());
-    private static final Function<Integer, Integer> FUNCTION = StableValue.function(SET, Function.identity());
+    private static final Map<Integer, Integer> MAP = Map.ofLazy(SET, Function.identity());
+    private static final Map<MyEnum, Integer> MAP_ENUM = Map.ofLazy(EnumSet.allOf(MyEnum.class), MyEnum::ordinal);
+    private static final Map<MyEnum, Optional<Integer>> MAP_ENUM_OPTIONAL = Map.ofLazy(EnumSet.allOf(MyEnum.class), e -> Optional.of(e.ordinal()));
 
-    private final Map<Integer, Integer> map = StableValue.map(SET, Function.identity());
-    private final Function<Integer, Integer> function = StableValue.function(SET, Function.identity());
+    private final Map<Integer, Integer> map = Map.ofLazy(SET, Function.identity());
+    private final Map<MyEnum, Integer> mapEnum = Map.ofLazy(EnumSet.allOf(MyEnum.class), MyEnum::ordinal);
 
     @Benchmark
     public int map() {
@@ -71,18 +73,25 @@ public class StableFunctionSingleBenchmark {
     }
 
     @Benchmark
-    public int function() {
-        return function.apply(1);
+    public int mapEnum() {
+        return mapEnum.get(MyEnum.BAR);
     }
 
     @Benchmark
-    public int staticSMap() {
+    public int staticMap() {
         return MAP.get(1);
     }
 
     @Benchmark
-    public int staticIntFunction() {
-        return FUNCTION.apply(1);
+    public int staticMapEnum() {
+        return MAP_ENUM.get(MyEnum.BAR);
     }
 
+    @Benchmark
+    public int staticMapEnumOptional() {
+        return MAP_ENUM_OPTIONAL.get(MyEnum.BAR).orElseThrow();
+    }
+
+    private enum MyEnum {FOO, BAR}
+
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
index 95721d88cec..c61e7b1861f 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
@@ -35,22 +35,18 @@ import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
-import java.lang.classfile.CodeBuilder;
-import java.lang.classfile.constantpool.ConstantPoolBuilder;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
-import static java.lang.constant.ConstantDescs.*;
+import java.lang.LazyConstant;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring lazy value performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -64,17 +60,15 @@ import static java.lang.constant.ConstantDescs.*;
 public class StableMethodHandleBenchmark {
 
     private static final MethodHandle FINAL_MH = identityHandle();
-    private static final StableValue<MethodHandle> STABLE_MH;
+    private static final LazyConstant<MethodHandle> STABLE_MH = LazyConstant.of(StableMethodHandleBenchmark::identityHandle);
 
     private static /* intentionally not final */ MethodHandle mh = identityHandle();
     private static final Dcl<MethodHandle> DCL = new Dcl<>(StableMethodHandleBenchmark::identityHandle);
     private static final AtomicReference<MethodHandle> ATOMIC_REFERENCE = new AtomicReference<>(identityHandle());
     private static final Map<String, MethodHandle> MAP = new ConcurrentHashMap<>();
-    private static final Map<String, MethodHandle> STABLE_MAP = StableValue.map(Set.of("identityHandle"), _ -> identityHandle());
+    private static final Map<String, MethodHandle> STABLE_MAP = Map.ofLazy(Set.of("identityHandle"), _ -> identityHandle());
 
     static {
-        STABLE_MH = StableValue.of();
-        STABLE_MH.setOrThrow(identityHandle());
         MAP.put("identityHandle", identityHandle());
     }
 
@@ -110,7 +104,7 @@ public class StableMethodHandleBenchmark {
 
     @Benchmark
     public int stableMh() throws Throwable {
-        return (int) STABLE_MH.orElseThrow().invokeExact(1);
+        return (int) STABLE_MH.get().invokeExact(1);
     }
 
     static MethodHandle identityHandle() {
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java
index 883f13da05a..59aaa9c014e 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java
@@ -36,10 +36,10 @@ import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.annotations.Warmup;
 
 import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
+import java.lang.LazyConstant;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring lazy constant performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -56,39 +56,24 @@ public class StableSupplierBenchmark {
     private static final int VALUE = 42;
     private static final int VALUE2 = 23;
 
-    private static final StableValue<Integer> STABLE = init(StableValue.of(), VALUE);
-    private static final StableValue<Integer> STABLE2 = init(StableValue.of(), VALUE2);
-    private static final Supplier<Integer> SUPPLIER = StableValue.supplier(() -> VALUE);
-    private static final Supplier<Integer> SUPPLIER2 = StableValue.supplier(() -> VALUE);
+    private static final LazyConstant<Integer> STABLE = init(VALUE);
+    private static final LazyConstant<Integer> STABLE2 = init(VALUE2);
 
-    private final StableValue<Integer> stable = init(StableValue.of(), VALUE);
-    private final StableValue<Integer> stable2 = init(StableValue.of(), VALUE2);
-    private final Supplier<Integer> supplier = StableValue.supplier(() -> VALUE);
-    private final Supplier<Integer> supplier2 = StableValue.supplier(() -> VALUE2);
+    private final LazyConstant<Integer> stable = init(VALUE);
+    private final LazyConstant<Integer> stable2 = init(VALUE2);
 
     @Benchmark
     public int stable() {
-        return stable.orElseThrow() + stable2.orElseThrow();
-    }
-
-    @Benchmark
-    public int supplier() {
-        return supplier.get() + supplier2.get();
+        return stable.get() + stable2.get();
     }
 
     @Benchmark
     public int staticStable() {
-        return STABLE.orElseThrow() + STABLE2.orElseThrow();
+        return STABLE.get() + STABLE2.get();
     }
 
-    @Benchmark
-    public int staticSupplier() {
-        return SUPPLIER.get() + SUPPLIER2.get();
-    }
-
-    private static StableValue<Integer> init(StableValue<Integer> m, Integer value) {
-        m.trySet(value);
-        return m;
+    private static LazyConstant<Integer> init(Integer value) {
+        return LazyConstant.of(() -> value);
     }
 
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java
index 505cfffdc2c..5323af36c22 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java
@@ -25,12 +25,14 @@ package org.openjdk.bench.java.lang.stable;
 
 import org.openjdk.jmh.annotations.*;
 
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.lang.LazyConstant;
 import java.util.function.Supplier;
 
 /**
- * Benchmark measuring StableValue performance
+ * Benchmark measuring lazy constant performance
  */
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
@@ -47,10 +49,10 @@ public class StableValueBenchmark {
     private static final int VALUE = 42;
     private static final int VALUE2 = 23;
 
-    private static final StableValue<Integer> STABLE = init(StableValue.of(), VALUE);
-    private static final StableValue<Integer> STABLE2 = init(StableValue.of(), VALUE2);
-    private static final StableValue<Integer> DCL = init(StableValue.of(), VALUE);
-    private static final StableValue<Integer> DCL2 = init(StableValue.of(), VALUE2);
+    private static final LazyConstant<Integer> STABLE = init(VALUE);
+    private static final LazyConstant<Integer> STABLE2 = init(VALUE2);
+    private static final Supplier<Integer> DCL = new Dcl<>(() -> VALUE);
+    private static final Supplier<Integer> DCL2 = new Dcl<>(() -> VALUE2);
     private static final AtomicReference<Integer> ATOMIC = new AtomicReference<>(VALUE);
     private static final AtomicReference<Integer> ATOMIC2 = new AtomicReference<>(VALUE2);
     private static final Holder HOLDER = new Holder(VALUE);
@@ -58,10 +60,13 @@ public class StableValueBenchmark {
     private static final RecordHolder RECORD_HOLDER = new RecordHolder(VALUE);
     private static final RecordHolder RECORD_HOLDER2 = new RecordHolder(VALUE2);
 
-    private final StableValue<Integer> stable = init(StableValue.of(), VALUE);
-    private final StableValue<Integer> stable2 = init(StableValue.of(), VALUE2);
-    private final StableValue<Integer> stableNull = StableValue.of();
-    private final StableValue<Integer> stableNull2 = StableValue.of();
+    private static final LazyConstant<Optional<Integer>> OPTIONAL_42 = LazyConstant.of(() -> Optional.of(42));
+    private static final LazyConstant<Optional<Integer>> OPTIONAL_42_2 = LazyConstant.of(() -> Optional.of(42));
+    private static final LazyConstant<Optional<Integer>> OPTIONAL_EMPTY = LazyConstant.of(Optional::empty);
+    private static final LazyConstant<Optional<Integer>> OPTIONAL_EMPTY2 = LazyConstant.of(Optional::empty);
+
+    private final LazyConstant<Integer> stable = init(VALUE);
+    private final LazyConstant<Integer> stable2 = init(VALUE2);
     private final Supplier<Integer> dcl = new Dcl<>(() -> VALUE);
     private final Supplier<Integer> dcl2 = new Dcl<>(() -> VALUE2);
     private final AtomicReference<Integer> atomic = new AtomicReference<>(VALUE);
@@ -69,13 +74,6 @@ public class StableValueBenchmark {
     private final Supplier<Integer> supplier = () -> VALUE;
     private final Supplier<Integer> supplier2 = () -> VALUE2;
 
-
-    @Setup
-    public void setup() {
-        stableNull.trySet(null);
-        stableNull2.trySet(null);
-    }
-
     @Benchmark
     public int atomic() {
         return atomic.get() + atomic2.get();
@@ -88,12 +86,7 @@ public class StableValueBenchmark {
 
     @Benchmark
     public int stable() {
-        return stable.orElseThrow() + stable2.orElseThrow();
-    }
-
-    @Benchmark
-    public int stableNull() {
-        return (stableNull.orElseThrow() == null ? VALUE : VALUE2) + (stableNull2.orElseThrow() == null ? VALUE : VALUE2);
+        return stable.get() + stable2.get();
     }
 
     // Reference case
@@ -109,7 +102,7 @@ public class StableValueBenchmark {
 
     @Benchmark
     public int staticDcl() {
-        return DCL.orElseThrow() + DCL2.orElseThrow();
+        return DCL.get() + DCL2.get();
     }
 
     @Benchmark
@@ -117,6 +110,16 @@ public class StableValueBenchmark {
         return HOLDER.get() + HOLDER2.get();
     }
 
+    @Benchmark
+    public int staticOptional42() {
+        return OPTIONAL_42.get().orElseThrow() + OPTIONAL_42_2.get().orElseThrow();
+    }
+
+    @Benchmark
+    public boolean staticOptionalEmpty() {
+        return OPTIONAL_EMPTY.get().isEmpty() ^ OPTIONAL_EMPTY2.get().isEmpty();
+    }
+
     @Benchmark
     public int staticRecordHolder() {
         return RECORD_HOLDER.get() + RECORD_HOLDER2.get();
@@ -124,50 +127,46 @@ public class StableValueBenchmark {
 
     @Benchmark
     public int staticStable() {
-        return STABLE.orElseThrow() + STABLE2.orElseThrow();
+        return STABLE.get() + STABLE2.get();
     }
 
 
-    private static StableValue<Integer> init(StableValue<Integer> m, Integer value) {
-        m.trySet(value);
-        return m;
+    private static LazyConstant<Integer> init(Integer value) {
+        return LazyConstant.of(() -> value);
     }
 
     private static final class Holder {
 
-        private final StableValue<Integer> delegate = StableValue.of();
+        private final LazyConstant<Integer> delegate;
 
         Holder(int value) {
-            delegate.setOrThrow(value);
+            delegate = LazyConstant.of(() -> value);
         }
 
         int get() {
-            return delegate.orElseThrow();
+            return delegate.get();
         }
 
     }
 
-    private record RecordHolder(StableValue<Integer> delegate) {
+    private record RecordHolder(LazyConstant<Integer> delegate) {
 
         RecordHolder(int value) {
-            this(StableValue.of());
-            delegate.setOrThrow(value);
+            this(LazyConstant.of(() -> value));
         }
 
         int get() {
-            return delegate.orElseThrow();
+            return delegate.get();
         }
 
     }
 
-
     // Handles null values
     public static class Dcl<V> implements Supplier<V> {
 
         private final Supplier<V> supplier;
 
         private volatile V value;
-        private boolean bound;
 
         public Dcl(Supplier<V> supplier) {
             this.supplier = supplier;
@@ -177,15 +176,10 @@ public class StableValueBenchmark {
         public V get() {
             V v = value;
             if (v == null) {
-                if (!bound) {
-                    synchronized (this) {
-                        v = value;
-                        if (v == null) {
-                            if (!bound) {
-                                value = v = supplier.get();
-                                bound = true;
-                            }
-                        }
+                synchronized (this) {
+                    v = value;
+                    if (v == null) {
+                        value = v = supplier.get();
                     }
                 }
             }
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java
index 65d53a42e88..759cb25b592 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java
@@ -41,7 +41,6 @@ import java.lang.invoke.VarHandle;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
 import static java.util.concurrent.TimeUnit.*;
@@ -75,8 +74,8 @@ public class VarHandleHolderBenchmark {
     private static final VarHandle VH_X = VAR_HANDLE_FUNCTION.apply("x");
     private static final VarHandle VH_Y = VAR_HANDLE_FUNCTION.apply("y");
 
-    private static final Supplier<VarHandle> SV_X = StableValue.supplier(() -> VAR_HANDLE_FUNCTION.apply("x"));
-    private static final Supplier<VarHandle> SV_Y = StableValue.supplier(() -> VAR_HANDLE_FUNCTION.apply("y"));
+    private static final LazyConstant<VarHandle> SV_X = LazyConstant.of(() -> VAR_HANDLE_FUNCTION.apply("x"));
+    private static final LazyConstant<VarHandle> SV_Y = LazyConstant.of(() -> VAR_HANDLE_FUNCTION.apply("y"));
 
     private static final Map<String, VarHandle> U_MAP = Map.of(
             "x", VH_X,
@@ -86,13 +85,11 @@ public class VarHandleHolderBenchmark {
             "x", LAYOUT.varHandle(groupElement("x")),
             "y", LAYOUT.varHandle(groupElement("y")));
 
-    private static final Map<String, VarHandle> S_MAP = StableValue.map(
+    private static final Map<String, VarHandle> S_MAP = Map.ofLazy(
             Set.of("x", "y"),
             VAR_HANDLE_FUNCTION);
 
-    private static final Function<String, VarHandle> S_FUN = StableValue.function(
-            Set.of("x", "y"),
-            VAR_HANDLE_FUNCTION);
+    private static final Function<String, VarHandle> S_FUN = S_MAP::get;
 
     private static final MemorySegment confined;
     static {

From 36b66e13c8eca8e460bfd6d900f139408aff9d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Tue, 18 Nov 2025 13:05:57 +0000
Subject: [PATCH 225/512] 8371778: Make MallocMemorySummary::_snapshot a
 DeferredStatic

Reviewed-by: phubner, azafari
---
 src/hotspot/share/nmt/mallocTracker.cpp | 4 ++--
 src/hotspot/share/nmt/mallocTracker.hpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/nmt/mallocTracker.cpp b/src/hotspot/share/nmt/mallocTracker.cpp
index a61a27db25d..2cf5034c0bf 100644
--- a/src/hotspot/share/nmt/mallocTracker.cpp
+++ b/src/hotspot/share/nmt/mallocTracker.cpp
@@ -45,7 +45,7 @@
 #include "utilities/ostream.hpp"
 #include "utilities/vmError.hpp"
 
-MallocMemorySnapshot MallocMemorySummary::_snapshot;
+DeferredStatic<MallocMemorySnapshot> MallocMemorySummary::_snapshot;
 
 void MemoryCounter::update_peak(size_t size, size_t cnt) {
   size_t peak_sz = peak_size();
@@ -101,7 +101,7 @@ void MallocMemorySnapshot::make_adjustment() {
 }
 
 void MallocMemorySummary::initialize() {
-  // Uses placement new operator to initialize static area.
+  _snapshot.initialize();
   MallocLimitHandler::initialize(MallocLimit);
 }
 
diff --git a/src/hotspot/share/nmt/mallocTracker.hpp b/src/hotspot/share/nmt/mallocTracker.hpp
index 0ead41f2411..fc03faf7212 100644
--- a/src/hotspot/share/nmt/mallocTracker.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.hpp
@@ -30,6 +30,7 @@
 #include "nmt/memTag.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "runtime/atomicAccess.hpp"
+#include "utilities/deferredStatic.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 class outputStream;
@@ -204,7 +205,7 @@ class MallocMemorySnapshot {
 class MallocMemorySummary : AllStatic {
  private:
   // Reserve memory for placement of MallocMemorySnapshot object
-  static MallocMemorySnapshot _snapshot;
+  static DeferredStatic<MallocMemorySnapshot> _snapshot;
   static bool _have_limits;
 
   // Called when a total limit break was detected.
@@ -251,7 +252,7 @@ class MallocMemorySummary : AllStatic {
    }
 
   static MallocMemorySnapshot* as_snapshot() {
-    return &_snapshot;
+    return _snapshot.get();
   }
 
   // MallocLimit: returns true if allocating s bytes on f would trigger

From 2e68b79a3973c8a3dde6b47f19b19c0c7faacc51 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 18 Nov 2025 13:55:42 +0000
Subject: [PATCH 226/512] 8364991: Incorrect not-exhaustive error

Reviewed-by: vromero
---
 .../javac/comp/ExhaustivenessComputer.java    | 142 ++++++++++----
 .../tools/javac/patterns/Exhaustiveness.java  | 184 +++++++++++++++++-
 2 files changed, 285 insertions(+), 41 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
index 3b66ac010cf..036e86dff5e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
@@ -39,6 +39,7 @@ import com.sun.tools.javac.tree.JCTree.*;
 
 import com.sun.tools.javac.code.Kinds.Kind;
 import com.sun.tools.javac.code.Type.TypeVar;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.function.Predicate;
@@ -60,6 +61,7 @@ public class ExhaustivenessComputer {
     private final Types types;
     private final Check chk;
     private final Infer infer;
+    private final Map<Pair<Type, Type>, Boolean> isSubtypeCache = new HashMap<>();
 
     public static ExhaustivenessComputer instance(Context context) {
         ExhaustivenessComputer instance = context.get(exhaustivenessKey);
@@ -120,6 +122,7 @@ public class ExhaustivenessComputer {
             }
         }
         Set<PatternDescription> patterns = patternSet;
+        Set<Set<PatternDescription>> seenFallback = new HashSet<>();
         boolean useHashes = true;
         try {
             boolean repeat = true;
@@ -141,7 +144,7 @@ public class ExhaustivenessComputer {
                     //but hashing in reduceNestedPatterns will not allow that
                     //disable the use of hashing, and use subtyping in
                     //reduceNestedPatterns to handle situations like this:
-                    repeat = useHashes;
+                    repeat = useHashes && seenFallback.add(updatedPatterns);
                     useHashes = false;
                 } else {
                     //if a reduction happened, make sure hashing in reduceNestedPatterns
@@ -154,6 +157,8 @@ public class ExhaustivenessComputer {
         } catch (CompletionFailure cf) {
             chk.completionError(selector.pos(), cf);
             return true; //error recovery
+        } finally {
+            isSubtypeCache.clear();
         }
     }
 
@@ -211,10 +216,9 @@ public class ExhaustivenessComputer {
                         //if a binding pattern for clazz already exists, no need to analyze it again:
                         !existingBindings.contains(clazz)) {
                         //do not reduce to types unrelated to the selector type:
-                        Type clazzErasure = types.erasure(clazz.type);
+                        Type clazzType = clazz.type;
                         if (components(selectorType).stream()
-                                                    .map(types::erasure)
-                                                    .noneMatch(c -> types.isSubtype(clazzErasure, c))) {
+                                                    .noneMatch(c -> isSubtypeErasure(clazzType, c))) {
                             continue;
                         }
 
@@ -238,18 +242,18 @@ public class ExhaustivenessComputer {
                                 //cover using bpOther:
 
                                 //all types that are permitted subtypes of bpOther's type:
-                                pendingPermitted.removeIf(pending -> types.isSubtype(types.erasure(pending.type),
-                                                                                     types.erasure(bpOther.type)));
+                                pendingPermitted.removeIf(pending -> isSubtypeErasure(pending.type,
+                                                                                      bpOther.type));
 
                                 if (bpOther.type.tsym.isAbstract()) {
                                     //all types that are in a diamond hierarchy with bpOther's type
                                     //i.e. there's a common subtype of the given type and bpOther's type:
                                     Predicate<Symbol> check =
                                             pending -> permitted.stream()
-                                                                .filter(perm -> types.isSubtype(types.erasure(perm.type),
-                                                                                                types.erasure(bpOther.type)))
-                                                                .filter(perm -> types.isSubtype(types.erasure(perm.type),
-                                                                                                types.erasure(pending.type)))
+                                                                .filter(perm -> isSubtypeErasure(perm.type,
+                                                                                                 bpOther.type))
+                                                                .filter(perm -> isSubtypeErasure(perm.type,
+                                                                                                 pending.type))
                                                                 .findAny()
                                                                 .isPresent();
 
@@ -374,30 +378,15 @@ public class ExhaustivenessComputer {
 
                         join.append(rpOne);
 
-                        NEXT_PATTERN: for (int nextCandidate = 0;
-                                           nextCandidate < candidatesArr.length;
-                                           nextCandidate++) {
+                        for (int nextCandidate = 0; nextCandidate < candidatesArr.length; nextCandidate++) {
                             if (firstCandidate == nextCandidate) {
                                 continue;
                             }
 
                             RecordPattern rpOther = candidatesArr[nextCandidate];
-                            if (rpOne.recordType.tsym == rpOther.recordType.tsym) {
-                                for (int i = 0; i < rpOne.nested.length; i++) {
-                                    if (i != mismatchingCandidate) {
-                                        if (!rpOne.nested[i].equals(rpOther.nested[i])) {
-                                            if (useHashes ||
-                                                //when not using hashes,
-                                                //check if rpOne.nested[i] is
-                                                //a subtype of rpOther.nested[i]:
-                                                !(rpOne.nested[i] instanceof BindingPattern bpOne) ||
-                                                !(rpOther.nested[i] instanceof BindingPattern bpOther) ||
-                                                !types.isSubtype(types.erasure(bpOne.type), types.erasure(bpOther.type))) {
-                                                continue NEXT_PATTERN;
-                                            }
-                                        }
-                                    }
-                                }
+
+                            if (rpOne.recordType.tsym == rpOther.recordType.tsym &&
+                                nestedComponentsEquivalent(rpOne, rpOther, mismatchingCandidate, useHashes)) {
                                 join.append(rpOther);
                             }
                         }
@@ -418,9 +407,11 @@ public class ExhaustivenessComputer {
                                 PatternDescription[] newNested =
                                         Arrays.copyOf(rpOne.nested, rpOne.nested.length);
                                 newNested[mismatchingCandidateFin] = nested;
-                                current.add(new RecordPattern(rpOne.recordType(),
+                                RecordPattern nue = new RecordPattern(rpOne.recordType(),
                                                                 rpOne.fullComponentTypes(),
-                                                                newNested));
+                                                                newNested,
+                                                                new HashSet<>(join));
+                                current.add(nue);
                             }
                         }
                     }
@@ -437,6 +428,70 @@ public class ExhaustivenessComputer {
         return patterns;
     }
 
+    /* Returns true if all nested components of existing and candidate are
+     * equivalent (if useHashes == true), or "substitutable" (if useHashes == false).
+     * A candidate pattern is "substitutable" if it is a binding pattern, and:
+     * - it's type is a supertype of the existing pattern's type
+     * - it was produced by a reduction from a record pattern that is equivalent to
+     *   the existing pattern
+     */
+    private boolean nestedComponentsEquivalent(RecordPattern existing,
+                                               RecordPattern candidate,
+                                               int mismatchingCandidate,
+                                               boolean useHashes) {
+        NEXT_NESTED:
+        for (int i = 0; i < existing.nested.length; i++) {
+            if (i != mismatchingCandidate) {
+                if (!existing.nested[i].equals(candidate.nested[i])) {
+                    if (useHashes) {
+                        return false;
+                    }
+                    //when not using hashes,
+                    //check if rpOne.nested[i] is
+                    //a subtype of rpOther.nested[i]:
+                    if (!(candidate.nested[i] instanceof BindingPattern nestedCandidate)) {
+                        return false;
+                    }
+                    if (existing.nested[i] instanceof BindingPattern nestedExisting) {
+                        if (!isSubtypeErasure(nestedExisting.type, nestedCandidate.type)) {
+                            return false;
+                        }
+                    } else if (existing.nested[i] instanceof RecordPattern nestedExisting) {
+                        java.util.List<PatternDescription> pendingReplacedPatterns =
+                                new ArrayList<>(nestedCandidate.sourcePatterns());
+
+                        while (!pendingReplacedPatterns.isEmpty()) {
+                            PatternDescription currentReplaced = pendingReplacedPatterns.removeLast();
+
+                            if (nestedExisting.equals(currentReplaced)) {
+                                //candidate.nested[i] is substitutable for existing.nested[i]
+                                //continue with the next nested pattern:
+                                continue NEXT_NESTED;
+                            }
+
+                            pendingReplacedPatterns.addAll(currentReplaced.sourcePatterns());
+                        }
+
+                        return false;
+                    } else {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /*The same as types.isSubtype(types.erasure(t), types.erasure(s)), but cached.
+    */
+    private boolean isSubtypeErasure(Type t, Type s) {
+        Pair<Type, Type> key = Pair.of(t, s);
+
+        return isSubtypeCache.computeIfAbsent(key, _ ->
+                types.isSubtype(types.erasure(t), types.erasure(s)));
+    }
+
     /* In the set of patterns, find those for which, given:
      * $record($nested1, $nested2, ...)
      * all the $nestedX pattern cover the given record component,
@@ -480,9 +535,11 @@ public class ExhaustivenessComputer {
                 covered &= checkCovered(componentType[i], List.of(newNested));
             }
             if (covered) {
-                return new BindingPattern(rpOne.recordType);
+                PatternDescription pd = new BindingPattern(rpOne.recordType, Set.of(pattern));
+                return pd;
             } else if (reducedNestedPatterns != null) {
-                return new RecordPattern(rpOne.recordType, rpOne.fullComponentTypes(), reducedNestedPatterns);
+                PatternDescription pd = new RecordPattern(rpOne.recordType, rpOne.fullComponentTypes(), reducedNestedPatterns, Set.of(pattern));
+                return pd;
             }
         }
         return pattern;
@@ -517,7 +574,9 @@ public class ExhaustivenessComputer {
         return false;
     }
 
-    sealed interface PatternDescription { }
+    sealed interface PatternDescription {
+        public Set<PatternDescription> sourcePatterns();
+    }
     public PatternDescription makePatternDescription(Type selectorType, JCPattern pattern) {
         if (pattern instanceof JCBindingPattern binding) {
             Type type = !selectorType.isPrimitive() && types.isSubtype(selectorType, binding.type)
@@ -552,7 +611,12 @@ public class ExhaustivenessComputer {
             throw Assert.error();
         }
     }
-    record BindingPattern(Type type) implements PatternDescription {
+    record BindingPattern(Type type, Set<PatternDescription> sourcePatterns) implements PatternDescription {
+
+        public BindingPattern(Type type) {
+            this(type, Set.of());
+        }
+
         @Override
         public int hashCode() {
             return type.tsym.hashCode();
@@ -567,10 +631,14 @@ public class ExhaustivenessComputer {
             return type.tsym + " _";
         }
     }
-    record RecordPattern(Type recordType, int _hashCode, Type[] fullComponentTypes, PatternDescription... nested) implements PatternDescription {
+    record RecordPattern(Type recordType, int _hashCode, Type[] fullComponentTypes, PatternDescription[] nested, Set<PatternDescription> sourcePatterns) implements PatternDescription {
 
         public RecordPattern(Type recordType, Type[] fullComponentTypes, PatternDescription[] nested) {
-            this(recordType, hashCode(-1, recordType, nested), fullComponentTypes, nested);
+            this(recordType, fullComponentTypes, nested, Set.of());
+        }
+
+        public RecordPattern(Type recordType, Type[] fullComponentTypes, PatternDescription[] nested, Set<PatternDescription> sourcePatterns) {
+            this(recordType, hashCode(-1, recordType, nested), fullComponentTypes, nested, sourcePatterns);
         }
 
         @Override
diff --git a/test/langtools/tools/javac/patterns/Exhaustiveness.java b/test/langtools/tools/javac/patterns/Exhaustiveness.java
index f328765b579..84e67855b3b 100644
--- a/test/langtools/tools/javac/patterns/Exhaustiveness.java
+++ b/test/langtools/tools/javac/patterns/Exhaustiveness.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8262891 8268871 8274363 8281100 8294670 8311038 8311815 8325215 8333169 8327368 8366968
+ * @bug 8262891 8268871 8274363 8281100 8294670 8311038 8311815 8325215 8333169 8327368 8366968 8364991
  * @summary Check exhaustiveness of switches over sealed types.
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -40,6 +40,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -1543,7 +1544,7 @@ public class Exhaustiveness extends TestRunner {
     private static final int NESTING_CONSTANT = 4;
 
     Set<String> createDeeplyNestedVariants() {
-        Set<String> variants = new HashSet<>();
+        Set<String> variants = new LinkedHashSet<>();
         variants.add("C _");
         variants.add("R(I _, I _, I _)");
         for (int n = 0; n < NESTING_CONSTANT; n++) {
@@ -1636,10 +1637,11 @@ public class Exhaustiveness extends TestRunner {
     @Test
     public void testDeeplyNestedNotExhaustive(Path base) throws Exception {
         List<String> variants = createDeeplyNestedVariants().stream().collect(Collectors.toCollection(ArrayList::new));
-        variants.remove((int) (Math.random() * variants.size()));
+        int removed = (int) (Math.random() * variants.size());
+        variants.remove(removed);
         String code = testCodeForVariants(variants);
 
-        System.err.println("analyzing:");
+        System.err.println("analyzing (removed: " + removed + "):");
         System.err.println(code);
         doTest(base,
                new String[0],
@@ -2311,6 +2313,180 @@ public class Exhaustiveness extends TestRunner {
                "1 error");
     }
 
+    @Test //JDK-8364991
+    public void testDifferentReductionPaths(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Root r) {
+                       return switch (r) {
+                           case Root(R1 _, _, _) -> 0;
+                           case Root(R2 _, R1 _, _) -> 0;
+                           case Root(R2 _, R2 _, R1 _) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2 _) -> 0; //functionally equivalent to: Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R2 _))
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2(Base b1, Base b2) implements Base {}
+                   record Root(Base b1, Base b2, Base b3) {}
+               }
+               """);
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Root<Base> r) {
+                       return switch (r) {
+                           case Root(R1 _, _, _) -> 0;
+                           case Root(R2 _, R1 _, _) -> 0;
+                           case Root(R2 _, R2 _, R1 _) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2 _) -> 0; //functionally equivalent to: Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R2 _))
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2(Base b1, Base b2) implements Base {}
+                   record Root<T>(T b1, T b2, T b3) {}
+               }
+               """);
+    }
+
+    @Test //JDK-8364991
+    public void testDifferentReductionPathsSimplified(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test1(Root r) {
+                       return switch (r) {
+                           case Root(R2(R1 _), R2(R1 _)) -> 0;
+                           case Root(R2(R1 _), R2(R2 _)) -> 0;
+                           case Root(R2(R2 _), R2(R1 _)) -> 0;
+                           case Root(R2(R2 _), R2 _) -> 0;
+                       };
+                   }
+                   private int test2(Root r) {
+                       return switch (r) {
+                           case Root(R2(R1 _), R2(R1 _)) -> 0;
+                           case Root(R2(R2 _), R2(R1 _)) -> 0;
+                           case Root(R2(R1 _), R2(R2 _)) -> 0;
+                           case Root(R2 _,     R2(R2 _)) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2(Base b1) implements Base {}
+                   record Root(R2 b2, R2 b3) {}
+               }
+               """);
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test1(Root<R2<Base>> r) {
+                       return switch (r) {
+                           case Root(R2(R1 _), R2(R1 _)) -> 0;
+                           case Root(R2(R1 _), R2(R2 _)) -> 0;
+                           case Root(R2(R2 _), R2(R1 _)) -> 0;
+                           case Root(R2(R2 _), R2 _) -> 0;
+                       };
+                   }
+                   private int test2(Root<R2<Base>> r) {
+                       return switch (r) {
+                           case Root(R2(R1 _), R2(R1 _)) -> 0;
+                           case Root(R2(R2 _), R2(R1 _)) -> 0;
+                           case Root(R2(R1 _), R2(R2 _)) -> 0;
+                           case Root(R2 _,     R2(R2 _)) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2<T>(T b1) implements Base {}
+                   record Root<T>(T b2, T b3) {}
+               }
+               """);
+    }
+
+    @Test //JDK-8364991
+    public void testBindingPatternDoesNotStandInPlaceOfRecordPatterns(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Root r) {
+                       return switch (r) {
+                           case Root(R2 _, R2(R1 _)) -> 0;
+                           case Root(R2(R1 _), R2(R2 _)) -> 0;
+                           case Root(R2(R2 _), R2 _) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2(Base b) implements Base {}
+                   record Root(R2 b2, R2 b3) {}
+               }
+               """,
+               "Test.java:4:16: compiler.err.not.exhaustive",
+               "1 error");
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Root<R2<Base>> r) {
+                       return switch (r) {
+                           case Root(R2 _, R2(R1 _)) -> 0;
+                           case Root(R2(R1 _), R2(R2 _)) -> 0;
+                           case Root(R2(R2 _), R2 _) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2<T>(T b) implements Base {}
+                   record Root<T>(T b2, T b3) {}
+               }
+               """,
+               "Test.java:4:16: compiler.err.not.exhaustive",
+               "1 error");
+    }
+
     private void doTest(Path base, String[] libraryCode, String testCode, String... expectedErrors) throws IOException {
         doTest(base, libraryCode, testCode, false, expectedErrors);
     }

From dcba014ad56eae753c25c579fb30bb8ecfab69af Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Tue, 18 Nov 2025 14:44:14 +0000
Subject: [PATCH 227/512] 8371967: Add Visual Studio 2026 to build toolchain
 for Windows

Reviewed-by: erikj
---
 doc/building.html                    |  2 +-
 doc/building.md                      |  2 +-
 make/autoconf/toolchain_microsoft.m4 | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 99eb3e0c473..19313ebf43a 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -668,7 +668,7 @@ update.</p>
 (Note that this version is often presented as "MSVC 14.28", and reported
 by cl.exe as 19.28.) Older versions will not be accepted by
 <code>configure</code> and will not work. The maximum accepted version
-of Visual Studio is 2022.</p>
+of Visual Studio is 2026.</p>
 <p>If you have multiple versions of Visual Studio installed,
 <code>configure</code> will by default pick the latest. You can request
 a specific version to be used by setting
diff --git a/doc/building.md b/doc/building.md
index 047255d1848..1fbd395a9d1 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -468,7 +468,7 @@ available for this update.
 The minimum accepted version is Visual Studio 2019 version 16.8. (Note that
 this version is often presented as "MSVC 14.28", and reported by cl.exe as
 19.28.) Older versions will not be accepted by `configure` and will not work.
-The maximum accepted version of Visual Studio is 2022.
+The maximum accepted version of Visual Studio is 2026.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by
diff --git a/make/autoconf/toolchain_microsoft.m4 b/make/autoconf/toolchain_microsoft.m4
index 17ad2666b3a..f577cf1a2a1 100644
--- a/make/autoconf/toolchain_microsoft.m4
+++ b/make/autoconf/toolchain_microsoft.m4
@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2022 2019"
+VALID_VS_VERSIONS="2022 2019 2026"
 
 VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
 VS_VERSION_INTERNAL_2019=142
@@ -57,6 +57,21 @@ VS_SDK_PLATFORM_NAME_2022=
 VS_SUPPORTED_2022=true
 VS_TOOLSET_SUPPORTED_2022=true
 
+VS_DESCRIPTION_2026="Microsoft Visual Studio 2026"
+VS_VERSION_INTERNAL_2026=145
+VS_MSVCR_2026=vcruntime140.dll
+VS_VCRUNTIME_1_2026=vcruntime140_1.dll
+VS_MSVCP_2026=msvcp140.dll
+VS_ENVVAR_2026="VS180COMNTOOLS"
+VS_USE_UCRT_2026="true"
+VS_VS_INSTALLDIR_2026="Microsoft Visual Studio/18"
+VS_EDITIONS_2026="BuildTools Community Professional Enterprise"
+VS_SDK_INSTALLDIR_2026=
+VS_VS_PLATFORM_NAME_2026="v145"
+VS_SDK_PLATFORM_NAME_2026=
+VS_SUPPORTED_2026=true
+VS_TOOLSET_SUPPORTED_2026=true
+
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],

From 43040f30a72591a37deb9a54ab7723988c1e4b51 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 18 Nov 2025 15:11:45 +0000
Subject: [PATCH 228/512] 8372012:
 java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java should
 check ability to create links

Reviewed-by: alanb, jpai
---
 .../attribute/BasicFileAttributeView/SetTimesNanos.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
index acdff692601..55a7ca10a6d 100644
--- a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
+++ b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,8 +67,10 @@ public class SetTimesNanos {
         Path file = Files.createFile(dir.resolve("test.dat"));
         testNanos(file);
 
-        testNanosLink(false);
-        testNanosLink(true);
+        if (TestUtil.supportsSymbolicLinks(Path.of(""))) {
+            testNanosLink(false);
+            testNanosLink(true);
+        }
     }
 
     private static void testNanos(Path path) throws IOException {

From b6d83eda6bfa76da98274aa3ad294759cb56d3a5 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 18 Nov 2025 15:14:20 +0000
Subject: [PATCH 229/512] 8371960: Missing null check in AnnotatedType
 annotation accessor methods

Reviewed-by: alanb
---
 .../annotation/AnnotatedTypeFactory.java      |   6 +-
 .../AnnotatedElementNullCheckTest.java        | 101 ++++++++++++++++++
 2 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/lang/reflect/AnnotatedElement/AnnotatedElementNullCheckTest.java

diff --git a/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
index aa69e29831d..b5db897b218 100644
--- a/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
+++ b/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -128,7 +128,7 @@ public final class AnnotatedTypeFactory {
         private final Type type;
         private final LocationInfo location;
         private final TypeAnnotation[] allOnSameTargetTypeAnnotations;
-        private final Map<Class <? extends Annotation>, Annotation> annotations;
+        private final Map<Class<? extends Annotation>, Annotation> annotations;
 
         AnnotatedTypeBaseImpl(Type type, LocationInfo location,
                 TypeAnnotation[] actualTypeAnnotations, TypeAnnotation[] allOnSameTargetTypeAnnotations) {
@@ -162,11 +162,13 @@ public final class AnnotatedTypeFactory {
         @Override
         @SuppressWarnings("unchecked")
         public final <T extends Annotation> T getDeclaredAnnotation(Class<T> annotation) {
+            Objects.requireNonNull(annotation);
             return (T)annotations.get(annotation);
         }
 
         @Override
         public final <T extends Annotation> T[] getDeclaredAnnotationsByType(Class<T> annotation) {
+            Objects.requireNonNull(annotation);
             return AnnotationSupport.getDirectlyAndIndirectlyPresent(annotations, annotation);
         }
 
diff --git a/test/jdk/java/lang/reflect/AnnotatedElement/AnnotatedElementNullCheckTest.java b/test/jdk/java/lang/reflect/AnnotatedElement/AnnotatedElementNullCheckTest.java
new file mode 100644
index 00000000000..632dab252a9
--- /dev/null
+++ b/test/jdk/java/lang/reflect/AnnotatedElement/AnnotatedElementNullCheckTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953 8371960
+ * @summary Null checks for AnnotatedElement APIs.
+ * @run junit AnnotatedElementNullCheckTest
+ */
+
+import java.lang.reflect.AnnotatedArrayType;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.AnnotatedParameterizedType;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
+class AnnotatedElementNullCheckTest {
+
+    // Return a stream of instances, each of a different implementation class
+    static AnnotatedElement[] implementations() throws Exception {
+        var objectHashCodeMethod = Object.class.getMethod("hashCode");
+        var annotatedParameterizedType = (AnnotatedParameterizedType) Optional.class
+                .getMethod("ifPresent", Consumer.class)
+                .getAnnotatedParameterTypes()[0];
+        var annotatedGenericArrayType = (AnnotatedArrayType) List.class
+                .getMethod("of", Object[].class)
+                .getAnnotatedParameterTypes()[0];
+        record Rec(int a) {}
+        return new AnnotatedElement[] {
+                Object.class,
+                objectHashCodeMethod,
+                System.class.getField("out"),
+                Object.class.getConstructor(),
+                Object.class.getPackage(),
+                Optional.class.getTypeParameters()[0],
+                // AnnotatedType (direct)
+                objectHashCodeMethod.getAnnotatedReturnType(),
+                // AnnotatedParameterizedType
+                annotatedParameterizedType,
+                // AnnotatedArrayType
+                annotatedGenericArrayType,
+                // AnnotatedTypeVariable
+                annotatedGenericArrayType.getAnnotatedGenericComponentType(),
+                // AnnotatedWildcardType
+                annotatedParameterizedType.getAnnotatedActualTypeArguments()[0],
+                Rec.class.getRecordComponents()[0],
+                Object.class.getMethod("equals", Object.class).getParameters()[0],
+                Object.class.getModule(),
+        };
+    }
+
+    @Test
+    void ensureImplementationsDistinct() throws Throwable {
+        var set = new HashSet<Class<?>>();
+        for (var impl : implementations()) {
+            var clazz = impl.getClass();
+            if (!set.add(clazz)) {
+                fail("Duplicate implementation class %s in %s".formatted(clazz, impl));
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("implementations")
+    void nullChecks(AnnotatedElement impl) {
+        assertThrows(NullPointerException.class, () -> impl.isAnnotationPresent(null));
+        assertThrows(NullPointerException.class, () -> impl.getAnnotation(null));
+        assertThrows(NullPointerException.class, () -> impl.getAnnotationsByType(null));
+        assertThrows(NullPointerException.class, () -> impl.getDeclaredAnnotation(null));
+        assertThrows(NullPointerException.class, () -> impl.getDeclaredAnnotationsByType(null));
+    }
+}

From 1f99cf942449728cdeb9918b93fd9a97a51eb0b6 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 18 Nov 2025 15:14:49 +0000
Subject: [PATCH 230/512] 8372002: VarHandle for receiver's superclass instance
 fields fails describeConstable

Reviewed-by: psandoz, jvernee
---
 .../classes/java/lang/invoke/VarHandles.java  | 13 +++---
 .../DescribeConstableTest.java                | 45 +++++++++++++++----
 .../VarHandles/describeConstable/p/C.java     |  4 +-
 .../VarHandles/describeConstable/p/q/Q.java   |  4 +-
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
index c97d44ba5d3..8c3e123f39a 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
@@ -166,12 +166,15 @@ final class VarHandles {
     static Field getFieldFromReceiverAndOffset(Class<?> receiverType,
                                                long offset,
                                                Class<?> fieldType) {
-        for (Field f : receiverType.getDeclaredFields()) {
-            if (Modifier.isStatic(f.getModifiers())) continue;
+        // The receiver may be a referenced class different from the declaring class
+        for (var declaringClass = receiverType; declaringClass != null; declaringClass = declaringClass.getSuperclass()) {
+            for (Field f : declaringClass.getDeclaredFields()) {
+                if (Modifier.isStatic(f.getModifiers())) continue;
 
-            if (offset == UNSAFE.objectFieldOffset(f)) {
-                assert f.getType() == fieldType;
-                return f;
+                if (offset == UNSAFE.objectFieldOffset(f)) {
+                    assert f.getType() == fieldType;
+                    return f;
+                }
             }
         }
         throw new InternalError("Field not found at offset");
diff --git a/test/jdk/java/lang/invoke/VarHandles/describeConstable/DescribeConstableTest.java b/test/jdk/java/lang/invoke/VarHandles/describeConstable/DescribeConstableTest.java
index ecda61cac48..0eecbdc3798 100644
--- a/test/jdk/java/lang/invoke/VarHandles/describeConstable/DescribeConstableTest.java
+++ b/test/jdk/java/lang/invoke/VarHandles/describeConstable/DescribeConstableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,18 +21,16 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @bug 8302260
+ * @bug 8302260 8372002
  * @build p.C p.D p.I p.q.Q
  * @run junit DescribeConstableTest
  * @summary Test VarHandle::describeConstable on static fields
  */
 
-import java.lang.constant.ClassDesc;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.invoke.VarHandle;
 import java.lang.invoke.VarHandle.VarHandleDesc;
 import java.util.stream.Stream;
 
@@ -43,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class DescribeConstableTest {
     private static final Lookup LOOKUP = MethodHandles.lookup();
-    private static Stream<Arguments> testCases() {
+    private static Stream<Arguments> staticTestCases() {
         return Stream.of(
                 // static field defined in p.C only
                 Arguments.of(p.C.class, "cString", String.class, p.C.class, "CClass"),
@@ -68,8 +66,8 @@ public class DescribeConstableTest {
     }
 
     @ParameterizedTest
-    @MethodSource("testCases")
-    void test(Class<?> refc, String name, Class<?> type, Class<?> declaringClass, Object value) throws Throwable {
+    @MethodSource("staticTestCases")
+    void testStatic(Class<?> refc, String name, Class<?> type, Class<?> declaringClass, Object value) throws Throwable {
         var vh = LOOKUP.findStaticVarHandle(refc, name, type);
         assertEquals(value, vh.get());
 
@@ -84,6 +82,37 @@ public class DescribeConstableTest {
         assertEquals(vhd.toString(), varHandleDescString(declaringClass, name, type, true));
     }
 
+    private static Arguments[] instanceTestCases() {
+        return new Arguments[] {
+                // Basic instance field in p.q.Q
+                Arguments.of(p.q.Q.class, "instanceIntField", int.class, new p.q.Q(), 42),
+                // p.C.instanceIntField hides the superclass instanceIntField, but it still exists
+                Arguments.of(p.C.class, "instanceIntField", int.class, new p.C(), 76),
+                Arguments.of(p.q.Q.class, "instanceIntField", int.class, new p.C(), 42),
+                // p.D.instanceIntField points to that of p.q.Q
+                Arguments.of(p.D.class, "instanceIntField", int.class, new p.D(), 42),
+        };
+    }
+
+    @ParameterizedTest
+    @MethodSource("instanceTestCases")
+    void testInstance(Class<?> refc, String name, Class<?> type, Object instance, Object value) throws Throwable {
+        var vh = LOOKUP.findVarHandle(refc, name, type).withInvokeBehavior();
+        assertEquals(value, vh.get(instance));
+
+        var refcDesc = refc.describeConstable().orElseThrow();
+        var typeDesc = type.describeConstable().orElseThrow();
+        var vhd = vh.describeConstable().orElseThrow();
+        var vhd2 = VarHandleDesc.ofField(refcDesc, name, typeDesc);
+
+        assertEquals(value, vhd.resolveConstantDesc(LOOKUP).get(instance));
+        assertEquals(value, vhd2.resolveConstantDesc(LOOKUP).get(instance));
+
+        // The string does not use the declaring class because
+        // receiver is restricted on the handle
+        assertEquals(vhd.toString(), varHandleDescString(refc, name, type, false));
+    }
+
     static String varHandleDescString(Class<?> declaringClass, String name, Class<?> type, boolean staticField) {
         return String.format("VarHandleDesc[%s%s.%s:%s]",
                              staticField ? "static " : "",
diff --git a/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/C.java b/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/C.java
index 353bd26dcf5..5e56451ea25 100644
--- a/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/C.java
+++ b/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/C.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,4 +25,6 @@ package p;
 
 public class C extends p.q.Q implements I {
     public static String cString =  "CClass";
+
+    public int instanceIntField = 76; // Hides the field from Q
 }
diff --git a/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/q/Q.java b/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/q/Q.java
index b3bbb8adafc..0461d43b533 100644
--- a/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/q/Q.java
+++ b/test/jdk/java/lang/invoke/VarHandles/describeConstable/p/q/Q.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,4 +29,6 @@ public class Q {
 
     public static String stringField2 = "QClass2";
     public static long longField2 = 102L;
+
+    public int instanceIntField = 42;
 }

From 713de231a61234632e2f9858b222b5f7fd0bdaf1 Mon Sep 17 00:00:00 2001
From: Nityanand Rai <nityanar@amazon.com>
Date: Tue, 18 Nov 2025 15:47:54 +0000
Subject: [PATCH 231/512] 8371854: Shenandoah: Simplify
 WALK_FORWARD_IN_BLOCK_START use

Reviewed-by: shade, ysr, xpeng
---
 .../share/gc/shenandoah/shenandoahScanRemembered.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index 3a99023eca4..34713898fc6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -378,24 +378,20 @@ HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, con
   //    evacuation phase) of young collections. This is never called
   //    during global collections during marking or update refs..
   // 4. Every allocation under TAMS updates the object start array.
+#ifdef ASSERT
   oop obj = cast_to_oop(p);
   assert(oopDesc::is_oop(obj), "Should be an object");
-#ifdef ASSERT
-#define WALK_FORWARD_IN_BLOCK_START true
-#else
-#define WALK_FORWARD_IN_BLOCK_START false
-#endif // ASSERT
-  while (WALK_FORWARD_IN_BLOCK_START && p + obj->size() < left) {
+  while (p + obj->size() < left) {
     p += obj->size();
     obj = cast_to_oop(p);
     assert(oopDesc::is_oop(obj), "Should be an object");
     assert(Klass::is_valid(obj->klass()), "Not a valid klass ptr");
     // Check assumptions in previous block comment if this assert fires
-    guarantee(false, "Should never need forward walk in block start");
+    fatal("Should never need forward walk in block start");
   }
-#undef WALK_FORWARD_IN_BLOCK_START
   assert(p <= left, "p should start at or before left end of card");
   assert(p + obj->size() > left, "obj should end after left end of card");
+#endif // ASSERT
   return p;
 }
 

From ac6f5e96512a7f003ac536611c53f2564ea912a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Tue, 18 Nov 2025 16:52:12 +0000
Subject: [PATCH 232/512] 8366094: Sealed graph for nested types creates broken
 links

Reviewed-by: liach
---
 .../src/classes/build/tools/taglet/SealedGraph.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
index 17867b99595..3e93826c180 100644
--- a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
+++ b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,13 +219,13 @@ public final class SealedGraph implements Taglet {
             // This implies the module is always the same.
             private String relativeLink(TypeElement node) {
                 var util = SealedGraph.this.docletEnvironment.getElementUtils();
-                var rootPackage = util.getPackageOf(rootNode);
                 var nodePackage = util.getPackageOf(node);
-                var backNavigator = rootPackage.getQualifiedName().toString().chars()
+                // Note: SVG files for nested types use the simple names of containing types as parent directories.
+                // We therefore need to convert all dots in the qualified name to "../" below.
+                var backNavigator = rootNode.getQualifiedName().toString().chars()
                         .filter(c -> c == '.')
                         .mapToObj(c -> "../")
-                        .collect(joining()) +
-                        "../";
+                        .collect(joining());
                 var forwardNavigator = nodePackage.getQualifiedName().toString()
                         .replace(".", "/");
 

From 0e6c7e8664fdddd8b789851263613852fc2c55f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Tue, 18 Nov 2025 17:55:43 +0000
Subject: [PATCH 233/512] 8371896: Links in snippets can not be highlighted

Reviewed-by: liach
---
 .../formats/html/taglets/SnippetTaglet.java   | 12 +--
 .../testSnippetTag/TestSnippetMarkup.java     | 82 ++++++++++++++++---
 2 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
index d16c47dd59f..38baa7b2826 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
@@ -162,10 +162,11 @@ public class SnippetTaglet extends BaseTaglet {
                         case Style.Markup m -> markupEncountered = true;
                     }
                 }
-                Content c;
                 if (markupEncountered) {
                     return;
-                } else if (linkTarget != null) {
+                }
+                Content c = Text.of(text);
+                if (linkTarget != null) {
                     //disable preview tagging inside the snippets:
                     Utils.PreviewFlagProvider prevPreviewProvider = utils.setPreviewFlagProvider(el -> false);
                     try {
@@ -174,15 +175,16 @@ public class SnippetTaglet extends BaseTaglet {
                                 null,
                                 linkTarget,
                                 ref,
-                                false, // TODO: for now
+                                true,
                                 Text.of(sequence.toString()),
                                 (key, args) -> { /* Error has already been reported above */ },
                                 tagletWriter);
                     } finally {
                         utils.setPreviewFlagProvider(prevPreviewProvider);
                     }
-                } else {
-                    c = HtmlTree.SPAN(Text.of(text));
+                }
+                if (!classes.isEmpty()) {
+                    c = HtmlTree.SPAN(c);
                     classes.forEach(((HtmlTree) c)::addStyle);
                 }
                 code.add(c);
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
index a3e92584ae2..be60a114040 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8266666 8281969 8319339 8338833
+ * @bug 8266666 8281969 8319339 8338833 8371896
  * @summary Implementation for snippets
  * @library /tools/lib ../../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -180,7 +180,7 @@ public class TestSnippetMarkup extends SnippetTester {
                         replace("""
                                 link(First) link(line)
                                   Second line
-                                """, "link\\((.+?)\\)", r -> link(true, "java.lang.Object#Object", r.group(1)))
+                                """, "link\\((.+?)\\)", r -> link("java.lang.Object#Object", r.group(1)))
                 ),
                 new TestCase(
                         """
@@ -190,7 +190,7 @@ public class TestSnippetMarkup extends SnippetTester {
                         replace("""
                                 First line
                                 link(  )Secondlink( )line
-                                """, "link\\((.+?)\\)", r -> link(true, "java.lang.System#out", r.group(1)))
+                                """, "link\\((.+?)\\)", r -> link("java.lang.System#out", r.group(1)))
                 ),
                 new TestCase(
                         """
@@ -200,7 +200,68 @@ public class TestSnippetMarkup extends SnippetTester {
                         replace("""
                                 First line
                                 link(  )Secondlink( )line
-                                """, "link\\((.+?)\\)", r -> link(true, "java.lang.System#in", r.group(1)))
+                                """, "link\\((.+?)\\)", r -> link("java.lang.System#in", r.group(1)))
+                )
+        );
+        testPositive(base, testCases);
+    }
+
+    // Test combinations of @link, @highlight and @replace on the same or overlapping substrings.
+    @Test
+    public void testLinkHighlightReplace(Path base) throws Exception {
+        var testCases = List.of(
+                new TestCase(
+                        """
+                                void method(Object o);  // @link substring=Object target=Object @highlight substring=Object
+                                """,
+                        replace("""
+                                void method(<span class="bold">link(Object)</span> o);
+                                """, "link\\((.+?)\\)", r -> link("Object", r.group(1)))
+                ),
+                new TestCase(
+                        """
+                                void method(Object o); // @replace substring=Object replacement=String \
+                                @highlight substring=String @link substring=String target=String
+                                """,
+                        replace("""
+                                void method(<span class="bold">link(String)</span> o);
+                                """, "link\\((.+?)\\)", r -> link("String", r.group(1)))
+                ),
+                new TestCase(
+                        """
+                                void method(Object o);  // @highlight substring="(Object o)" @link substring=Object target=Object
+                                """,
+                        replace("""
+                                void method<span class="bold">(</span><span class="bold">link(Object)</span><span class="bold"> o)</span>;
+                                """, "link\\((.+?)\\)", r -> link("Object", r.group(1)))
+                ),
+                new TestCase(
+                        """
+                                void method(Object o); // @replace substring=Object replacement=String \
+                                @link substring=String target=String @highlight substring="(String o)"
+                                """,
+                        replace("""
+                                void method<span class="bold">(</span><span class="bold">link(String)</span><span class="bold"> o)</span>;
+                                """, "link\\((.+?)\\)", r -> link("String", r.group(1)))
+                ),
+                new TestCase(
+                        """
+                                void method(Object o); // @replace substring=Object replacement=String \
+                                @link substring="String o" target=String @highlight substring=String
+                                """,
+                        replace("""
+                                void method(<span class="bold">link(String)</span>link( o));
+                                """, "link\\((.+?)\\)", r -> link("String", r.group(1)))
+                ),
+                // replacement subtext does not retain links and highlights of the replaced subtext
+                new TestCase(
+                        """
+                                void method(Object o); // @link substring=Object target=Object \
+                                @highlight substring=Object @replace substring=Object replacement=String
+                                """,
+                        """
+                                void method(String o);
+                                """
                 )
         );
         testPositive(base, testCases);
@@ -245,7 +306,7 @@ public class TestSnippetMarkup extends SnippetTester {
                 """
                         <details class="invalid-tag">
                         <summary>invalid reference</summary>
-                        <pre><code>Second</code></pre>
+                        <pre>Second</pre>
                         </details>""");
         checkNoCrashes();
     }
@@ -646,7 +707,7 @@ First line // @highlight :
                         replace("""
                                 First line
                                 link( Third line)
-                                """, "link\\((.+?)\\)", r -> link(true, "java.lang.Object#equals(Object)", r.group(1)))
+                                """, "link\\((.+?)\\)", r -> link("java.lang.Object#equals(Object)", r.group(1)))
                 ),
                 new TestCase("""
                         First line
@@ -910,8 +971,7 @@ First line // @highlight :
         checkNoCrashes();
     }
 
-    private static String link(boolean linkPlain,
-                               String targetReference,
+    private static String link(String targetReference,
                                String content)
             throws UncheckedIOException {
 
@@ -935,7 +995,7 @@ First line // @highlight :
 
         var LABEL_PLACEHOLDER = "label";
         var source = """
-                /** {@link %s %s} */
+                /** {@linkplain %s %s} */
                 public interface A { }
                 """.formatted(targetReference, LABEL_PLACEHOLDER);
 
@@ -1063,8 +1123,8 @@ First line // @highlight :
             }
             String output = fileManager.getFileString(DOCUMENTATION_OUTPUT, "A.html");
             // use the [^<>] regex to select HTML elements that immediately enclose "content"
-            Matcher m = Pattern.compile("(?is)(<a href=\"[^<>]*\" title=\"[^<>]*\" class=\"[^<>]*\"><code>)"
-                    +  LABEL_PLACEHOLDER + "(</code></a>)").matcher(output);
+            Matcher m = Pattern.compile("(?is)(<a href=\"[^<>]*\" title=\"[^<>]*\" class=\"[^<>]*\">)"
+                    +  LABEL_PLACEHOLDER + "(</a>)").matcher(output);
             if (!m.find()) {
                 throw new IOException(output);
             }

From b3e408c07891b58a312a58ffd756d6a1d18c0f6d Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 18 Nov 2025 18:12:07 +0000
Subject: [PATCH 234/512] 8372045: AOT assembly phase asserts with old class if
 AOT class linking is disabled

Reviewed-by: shade, mgronlun
---
 src/hotspot/share/oops/instanceKlass.cpp      |   2 +-
 .../cds/appcds/aotCache/OldClassSupport2.java | 104 ++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/OldClassSupport2.java

diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 2d03b69ee92..24358f662bc 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2870,7 +2870,7 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl
 }
 
 bool InstanceKlass::can_be_verified_at_dumptime() const {
-  if (AOTMetaspace::in_aot_cache(this)) {
+  if (CDSConfig::is_dumping_dynamic_archive() && AOTMetaspace::in_aot_cache(this)) {
     // This is a class that was dumped into the base archive, so we know
     // it was verified at dump time.
     return true;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/OldClassSupport2.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/OldClassSupport2.java
new file mode 100644
index 00000000000..16a4d258e4f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/OldClassSupport2.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary AOT cache should exclude old classes when AOT class linking is disabled.
+ * @bug 8372045
+ * @requires vm.cds.supports.aot.class.linking
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build OldClass
+ * @build OldClassSupport2
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *                 AppUsesOldClass2 OldClass
+ * @run driver OldClassSupport2
+ */
+
+import jdk.jfr.Event;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class OldClassSupport2 {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "AppUsesOldClass2";
+
+    public static void main(String[] args) throws Exception {
+        // Explicitly disable
+        Tester tester1 = new Tester("-XX:-AOTClassLinking");
+        tester1.run(new String[] {"AOT", "--two-step-training"} );
+
+        // Full module graph caching is disabled with -Djdk.module.showModuleResolution=true.
+        // This will disable AOT class linking.
+        Tester tester2 = new Tester("-Djdk.module.showModuleResolution=true");
+        tester2.run(new String[] {"AOT", "--two-step-training"} );
+
+        // Heap archiving is disable with -XX:-UseCompressedClassPointers.
+        // This will disable AOT class linking.
+        Tester tester3 = new Tester("-XX:-UseCompressedClassPointers");
+        tester3.run(new String[] {"AOT", "--two-step-training"} );
+    }
+
+    static class Tester extends CDSAppTester {
+        String extraArg;
+        public Tester(String extraArg) {
+            super(mainClass);
+            this.extraArg = extraArg;
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+                "-Xlog:aot",
+                "-Xlog:aot+class=debug",
+                extraArg,
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {mainClass};
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            String prefix = "aot,class.* = 0x.* app *";
+            if (runMode == RunMode.ASSEMBLY) {
+                out.shouldMatch(prefix + "AppUsesOldClass2");
+                out.shouldNotMatch(prefix + "OldClass");
+            }
+        }
+    }
+}
+
+class AppUsesOldClass2 {
+    public static void main(String args[]) {
+        System.out.println("Old Class Instance: " + new OldClass());
+    }
+}

From 4a975637a144fa8aa449a1419e656721833513b5 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 18 Nov 2025 18:35:01 +0000
Subject: [PATCH 235/512] 8346944: Update Unicode Data Files to 17.0.0 8346947:
 Update ICU4J to Version 78.1

Reviewed-by: joehw
---
 .../share/classes/java/lang/Character.java    |  459 +++--
 .../java/text/CollationElementIterator.java   |    6 +-
 .../icu/impl/CharacterIteratorWrapper.java    |    6 +-
 .../jdk/internal/icu/impl/Norm2AllModes.java  |    4 +-
 .../impl/ReplaceableUCharacterIterator.java   |    8 +-
 .../jdk/internal/icu/impl/UBiDiProps.java     |    4 +-
 .../internal/icu/impl/UCharacterProperty.java |    4 +-
 .../impl/data/{icudt76b => icudata}/nfc.nrm   |  Bin 36224 -> 36336 bytes
 .../impl/data/{icudt76b => icudata}/nfkc.nrm  |  Bin 56032 -> 56128 bytes
 .../impl/data/{icudt76b => icudata}/ubidi.icu |  Bin 28464 -> 28768 bytes
 .../internal/icu/impl/data/icudata/uprops.icu |  Bin 0 -> 170864 bytes
 .../icu/impl/data/icudt76b/uprops.icu         |  Bin 146880 -> 0 bytes
 .../jdk/internal/icu/text/NormalizerBase.java |    6 +-
 .../internal/icu/text/UCharacterIterator.java |    6 +-
 .../jdk/internal/icu/text/UnicodeSet.java     |   16 +-
 .../jdk/internal/icu/util/VersionInfo.java    |    4 +-
 .../jdk/internal/util/regex/Grapheme.java     |    7 +-
 .../regex/IndicConjunctBreak.java.template    |    7 +-
 .../share/data/unicodedata/Blocks.txt         |   14 +-
 .../share/data/unicodedata/CaseFolding.txt    |   42 +-
 .../unicodedata/DerivedCoreProperties.txt     |  599 ++++--
 .../data/unicodedata/NormalizationTest.txt    |   75 +-
 .../share/data/unicodedata/PropList.txt       |   72 +-
 .../data/unicodedata/PropertyValueAliases.txt |   35 +-
 .../share/data/unicodedata/ReadMe.txt         |   19 +-
 .../share/data/unicodedata/Scripts.txt        |  142 +-
 .../share/data/unicodedata/SpecialCasing.txt  |   14 +-
 .../share/data/unicodedata/UnicodeData.txt    |  489 ++++-
 .../auxiliary/GraphemeBreakProperty.txt       |   28 +-
 .../auxiliary/GraphemeBreakTest.txt           | 1737 +++++++----------
 .../data/unicodedata/emoji/emoji-data.txt     |  148 +-
 src/java.base/share/legal/icu.md              |    4 +-
 src/java.base/share/legal/unicode.md          |    4 +-
 33 files changed, 2327 insertions(+), 1632 deletions(-)
 rename src/java.base/share/classes/jdk/internal/icu/impl/data/{icudt76b => icudata}/nfc.nrm (64%)
 rename src/java.base/share/classes/jdk/internal/icu/impl/data/{icudt76b => icudata}/nfkc.nrm (90%)
 rename src/java.base/share/classes/jdk/internal/icu/impl/data/{icudt76b => icudata}/ubidi.icu (74%)
 create mode 100644 src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/uprops.icu
 delete mode 100644 src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/uprops.icu

diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index 72ff33651f9..d866202909c 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -63,7 +63,7 @@ import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
  * from the Unicode Consortium at
  * <a href="http://www.unicode.org">http://www.unicode.org</a>.
  * <p>
- * Character information is based on the Unicode Standard, version 16.0.
+ * Character information is based on the Unicode Standard, version 17.0.
  * <p>
  * The Java platform has supported different versions of the Unicode
  * Standard over time. Upgrades to newer versions of the Unicode Standard
@@ -75,6 +75,8 @@ import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
  *     <th scope="col">Unicode version</th></tr>
  * </thead>
  * <tbody>
+ * <tr><th scope="row" style="text-align:left">Java SE 26</th>
+ *     <td>Unicode 17.0</td></tr>
  * <tr><th scope="row" style="text-align:left">Java SE 24</th>
  *     <td>Unicode 16.0</td></tr>
  * <tr><th scope="row" style="text-align:left">Java SE 22</th>
@@ -745,7 +747,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
          * It should be adjusted whenever the Unicode Character Database
          * is upgraded.
          */
-        private static final int NUM_ENTITIES = 782;
+        private static final int NUM_ENTITIES = 804;
         private static Map<String, UnicodeBlock> map = HashMap.newHashMap(NUM_ENTITIES);
 
         /**
@@ -3715,6 +3717,85 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
                         "OL ONAL",
                         "OLONAL");
 
+        /**
+         * Constant for the "Sidetic" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock SIDETIC =
+            new UnicodeBlock("SIDETIC");
+
+        /**
+         * Constant for the "Sharada Supplement" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock SHARADA_SUPPLEMENT =
+            new UnicodeBlock("SHARADA_SUPPLEMENT",
+                "SHARADA SUPPLEMENT",
+                "SHARADASUPPLEMENT");
+
+        /**
+         * Constant for the "Tolong Siki" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock TOLONG_SIKI =
+            new UnicodeBlock("TOLONG_SIKI",
+                "TOLONG SIKI",
+                "TOLONGSIKI");
+
+        /**
+         * Constant for the "Beria Erfe" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock BERIA_ERFE =
+            new UnicodeBlock("BERIA_ERFE",
+                "BERIA ERFE",
+                "BERIAERFE");
+
+        /**
+         * Constant for the "Tangut Components Supplement" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock TANGUT_COMPONENTS_SUPPLEMENT =
+            new UnicodeBlock("TANGUT_COMPONENTS_SUPPLEMENT",
+                "TANGUT COMPONENTS SUPPLEMENT",
+                "TANGUTCOMPONENTSSUPPLEMENT");
+
+        /**
+         * Constant for the "Miscellaneous Symbols Supplement" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock MISCELLANEOUS_SYMBOLS_SUPPLEMENT =
+            new UnicodeBlock("MISCELLANEOUS_SYMBOLS_SUPPLEMENT",
+                "MISCELLANEOUS SYMBOLS SUPPLEMENT",
+                "MISCELLANEOUSSYMBOLSSUPPLEMENT");
+
+        /**
+         * Constant for the "Tai Yo" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock TAI_YO =
+            new UnicodeBlock("TAI_YO",
+                "TAI YO",
+                "TAIYO");
+
+        /**
+         * Constant for the "CJK Unified Ideographs Extension J" Unicode
+         * character block.
+         * @since 26
+         */
+        public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_J =
+            new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_J",
+                "CJK UNIFIED IDEOGRAPHS EXTENSION J",
+                "CJKUNIFIEDIDEOGRAPHSEXTENSIONJ");
+
+
         private static final int[] blockStarts = {
             0x0000,   // 0000..007F; Basic Latin
             0x0080,   // 0080..00FF; Latin-1 Supplement
@@ -3916,7 +3997,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x108E0,  // 108E0..108FF; Hatran
             0x10900,  // 10900..1091F; Phoenician
             0x10920,  // 10920..1093F; Lydian
-            0x10940,  //               unassigned
+            0x10940,  // 10940..1095F; Sidetic
+            0x10960,  //               unassigned
             0x10980,  // 10980..1099F; Meroitic Hieroglyphs
             0x109A0,  // 109A0..109FF; Meroitic Cursive
             0x10A00,  // 10A00..10A5F; Kharoshthi
@@ -3977,14 +4059,16 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x11AB0,  // 11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A
             0x11AC0,  // 11AC0..11AFF; Pau Cin Hau
             0x11B00,  // 11B00..11B5F; Devanagari Extended-A
-            0x11B60,  //               unassigned
+            0x11B60,  // 11B60..11B7F; Sharada Supplement
+            0x11B80,  //               unassigned
             0x11BC0,  // 11BC0..11BFF; Sunuwar
             0x11C00,  // 11C00..11C6F; Bhaiksuki
             0x11C70,  // 11C70..11CBF; Marchen
             0x11CC0,  //               unassigned
             0x11D00,  // 11D00..11D5F; Masaram Gondi
             0x11D60,  // 11D60..11DAF; Gunjala Gondi
-            0x11DB0,  //               unassigned
+            0x11DB0,  // 11DB0..11DEF; Tolong Siki
+            0x11DF0,  //               unassigned
             0x11EE0,  // 11EE0..11EFF; Makasar
             0x11F00,  // 11F00..11F5F; Kawi
             0x11F60,  //               unassigned
@@ -4011,7 +4095,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x16D40,  // 16D40..16D7F; Kirat Rai
             0x16D80,  //               unassigned
             0x16E40,  // 16E40..16E9F; Medefaidrin
-            0x16EA0,  //               unassigned
+            0x16EA0,  // 16EA0..16EDF; Beria Erfe
+            0x16EE0,  //               unassigned
             0x16F00,  // 16F00..16F9F; Miao
             0x16FA0,  //               unassigned
             0x16FE0,  // 16FE0..16FFF; Ideographic Symbols and Punctuation
@@ -4019,7 +4104,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x18800,  // 18800..18AFF; Tangut Components
             0x18B00,  // 18B00..18CFF; Khitan Small Script
             0x18D00,  // 18D00..18D7F; Tangut Supplement
-            0x18D80,  //               unassigned
+            0x18D80,  // 18D80..18DFF; Tangut Components Supplement
+            0x18E00,  //               unassigned
             0x1AFF0,  // 1AFF0..1AFFF; Kana Extended-B
             0x1B000,  // 1B000..1B0FF; Kana Supplement
             0x1B100,  // 1B100..1B12F; Kana Extended-A
@@ -4030,7 +4116,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1BCA0,  // 1BCA0..1BCAF; Shorthand Format Controls
             0x1BCB0,  //               unassigned
             0x1CC00,  // 1CC00..1CEBF; Symbols for Legacy Computing Supplement
-            0x1CEC0,  //               unassigned
+            0x1CEC0,  // 1CEC0..1CEFF; Miscellaneous Symbols Supplement
             0x1CF00,  // 1CF00..1CFCF; Znamenny Musical Notation
             0x1CFD0,  //               unassigned
             0x1D000,  // 1D000..1D0FF; Byzantine Musical Symbols
@@ -4058,6 +4144,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1E500,  //               unassigned
             0x1E5D0,  // 1E5D0..1E5FF; Ol Onal
             0x1E600,  //               unassigned
+            0x1E6C0,  // 1E6C0..1E6FF; Tai Yo
+            0x1E700,  //               unassigned
             0x1E7E0,  // 1E7E0..1E7FF; Ethiopic Extended-B
             0x1E800,  // 1E800..1E8DF; Mende Kikakui
             0x1E8E0,  //               unassigned
@@ -4098,7 +4186,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x2FA20,  //               unassigned
             0x30000,  // 30000..3134F; CJK Unified Ideographs Extension G
             0x31350,  // 31350..323AF; CJK Unified Ideographs Extension H
-            0x323B0,  //               unassigned
+            0x323B0,  // 323B0..3347F; CJK Unified Ideographs Extension J
+            0x33480,  //               unassigned
             0xE0000,  // E0000..E007F; Tags
             0xE0080,  //               unassigned
             0xE0100,  // E0100..E01EF; Variation Selectors Supplement
@@ -4308,6 +4397,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             HATRAN,
             PHOENICIAN,
             LYDIAN,
+            SIDETIC,
             null,
             MEROITIC_HIEROGLYPHS,
             MEROITIC_CURSIVE,
@@ -4369,6 +4459,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A,
             PAU_CIN_HAU,
             DEVANAGARI_EXTENDED_A,
+            SHARADA_SUPPLEMENT,
             null,
             SUNUWAR,
             BHAIKSUKI,
@@ -4376,6 +4467,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             null,
             MASARAM_GONDI,
             GUNJALA_GONDI,
+            TOLONG_SIKI,
             null,
             MAKASAR,
             KAWI,
@@ -4403,6 +4495,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             KIRAT_RAI,
             null,
             MEDEFAIDRIN,
+            BERIA_ERFE,
             null,
             MIAO,
             null,
@@ -4411,6 +4504,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             TANGUT_COMPONENTS,
             KHITAN_SMALL_SCRIPT,
             TANGUT_SUPPLEMENT,
+            TANGUT_COMPONENTS_SUPPLEMENT,
             null,
             KANA_EXTENDED_B,
             KANA_SUPPLEMENT,
@@ -4422,7 +4516,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             SHORTHAND_FORMAT_CONTROLS,
             null,
             SYMBOLS_FOR_LEGACY_COMPUTING_SUPPLEMENT,
-            null,
+            MISCELLANEOUS_SYMBOLS_SUPPLEMENT,
             ZNAMENNY_MUSICAL_NOTATION,
             null,
             BYZANTINE_MUSICAL_SYMBOLS,
@@ -4450,6 +4544,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             null,
             OL_ONAL,
             null,
+            TAI_YO,
+            null,
             ETHIOPIC_EXTENDED_B,
             MENDE_KIKAKUI,
             null,
@@ -4490,6 +4586,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             null,
             CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G,
             CJK_UNIFIED_IDEOGRAPHS_EXTENSION_H,
+            CJK_UNIFIED_IDEOGRAPHS_EXTENSION_J,
             null,
             TAGS,
             null,
@@ -5547,6 +5644,30 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
          */
         OL_ONAL,
 
+        /**
+         * Unicode script "Sidetic".
+         * @since 26
+         */
+        SIDETIC,
+
+        /**
+         * Unicode script "Tolong Siki".
+         * @since 26
+         */
+        TOLONG_SIKI,
+
+        /**
+         * Unicode script "Beria Erfe".
+         * @since 26
+         */
+        BERIA_ERFE,
+
+        /**
+         * Unicode script "Tai Yo".
+         * @since 26
+         */
+        TAI_YO,
+
         /**
          * Unicode script "Unknown".
          */
@@ -5648,9 +5769,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x085F,   // 085F      ; UNKNOWN
             0x0860,   // 0860..086A; SYRIAC
             0x086B,   // 086B..086F; UNKNOWN
-            0x0870,   // 0870..088E; ARABIC
-            0x088F,   // 088F      ; UNKNOWN
-            0x0890,   // 0890..0891; ARABIC
+            0x0870,   // 0870..0891; ARABIC
             0x0892,   // 0892..0896; UNKNOWN
             0x0897,   // 0897..08E1; ARABIC
             0x08E2,   // 08E2      ; COMMON
@@ -5825,8 +5944,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x0C55,   // 0C55..0C56; TELUGU
             0x0C57,   // 0C57      ; UNKNOWN
             0x0C58,   // 0C58..0C5A; TELUGU
-            0x0C5B,   // 0C5B..0C5C; UNKNOWN
-            0x0C5D,   // 0C5D      ; TELUGU
+            0x0C5B,   // 0C5B      ; UNKNOWN
+            0x0C5C,   // 0C5C..0C5D; TELUGU
             0x0C5E,   // 0C5E..0C5F; UNKNOWN
             0x0C60,   // 0C60..0C63; TELUGU
             0x0C64,   // 0C64..0C65; UNKNOWN
@@ -5850,8 +5969,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x0CCA,   // 0CCA..0CCD; KANNADA
             0x0CCE,   // 0CCE..0CD4; UNKNOWN
             0x0CD5,   // 0CD5..0CD6; KANNADA
-            0x0CD7,   // 0CD7..0CDC; UNKNOWN
-            0x0CDD,   // 0CDD..0CDE; KANNADA
+            0x0CD7,   // 0CD7..0CDB; UNKNOWN
+            0x0CDC,   // 0CDC..0CDE; KANNADA
             0x0CDF,   // 0CDF      ; UNKNOWN
             0x0CE0,   // 0CE0..0CE3; KANNADA
             0x0CE4,   // 0CE4..0CE5; UNKNOWN
@@ -6062,8 +6181,10 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1A9A,   // 1A9A..1A9F; UNKNOWN
             0x1AA0,   // 1AA0..1AAD; TAI_THAM
             0x1AAE,   // 1AAE..1AAF; UNKNOWN
-            0x1AB0,   // 1AB0..1ACE; INHERITED
-            0x1ACF,   // 1ACF..1AFF; UNKNOWN
+            0x1AB0,   // 1AB0..1ADD; INHERITED
+            0x1ADE,   // 1ADE..1ADF; UNKNOWN
+            0x1AE0,   // 1AE0..1AEB; INHERITED
+            0x1AEC,   // 1AEC..1AFF; UNKNOWN
             0x1B00,   // 1B00..1B4C; BALINESE
             0x1B4D,   // 1B4D      ; UNKNOWN
             0x1B4E,   // 1B4E..1B7F; BALINESE
@@ -6155,8 +6276,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x208F,   // 208F      ; UNKNOWN
             0x2090,   // 2090..209C; LATIN
             0x209D,   // 209D..209F; UNKNOWN
-            0x20A0,   // 20A0..20C0; COMMON
-            0x20C1,   // 20C1..20CF; UNKNOWN
+            0x20A0,   // 20A0..20C1; COMMON
+            0x20C2,   // 20C2..20CF; UNKNOWN
             0x20D0,   // 20D0..20F0; INHERITED
             0x20F1,   // 20F1..20FF; UNKNOWN
             0x2100,   // 2100..2125; COMMON
@@ -6179,9 +6300,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x2800,   // 2800..28FF; BRAILLE
             0x2900,   // 2900..2B73; COMMON
             0x2B74,   // 2B74..2B75; UNKNOWN
-            0x2B76,   // 2B76..2B95; COMMON
-            0x2B96,   // 2B96      ; UNKNOWN
-            0x2B97,   // 2B97..2BFF; COMMON
+            0x2B76,   // 2B76..2BFF; COMMON
             0x2C00,   // 2C00..2C5F; GLAGOLITIC
             0x2C60,   // 2C60..2C7F; LATIN
             0x2C80,   // 2C80..2CF3; COPTIC
@@ -6282,15 +6401,9 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0xA700,   // A700..A721; COMMON
             0xA722,   // A722..A787; LATIN
             0xA788,   // A788..A78A; COMMON
-            0xA78B,   // A78B..A7CD; LATIN
-            0xA7CE,   // A7CE..A7CF; UNKNOWN
-            0xA7D0,   // A7D0..A7D1; LATIN
-            0xA7D2,   // A7D2      ; UNKNOWN
-            0xA7D3,   // A7D3      ; LATIN
-            0xA7D4,   // A7D4      ; UNKNOWN
-            0xA7D5,   // A7D5..A7DC; LATIN
-            0xA7DD,   // A7DD..A7F1; UNKNOWN
-            0xA7F2,   // A7F2..A7FF; LATIN
+            0xA78B,   // A78B..A7DC; LATIN
+            0xA7DD,   // A7DD..A7F0; UNKNOWN
+            0xA7F1,   // A7F1..A7FF; LATIN
             0xA800,   // A800..A82C; SYLOTI_NAGRI
             0xA82D,   // A82D..A82F; UNKNOWN
             0xA830,   // A830..A839; COMMON
@@ -6378,15 +6491,9 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0xFB43,   // FB43..FB44; HEBREW
             0xFB45,   // FB45      ; UNKNOWN
             0xFB46,   // FB46..FB4F; HEBREW
-            0xFB50,   // FB50..FBC2; ARABIC
-            0xFBC3,   // FBC3..FBD2; UNKNOWN
-            0xFBD3,   // FBD3..FD3D; ARABIC
+            0xFB50,   // FB50..FD3D; ARABIC
             0xFD3E,   // FD3E..FD3F; COMMON
-            0xFD40,   // FD40..FD8F; ARABIC
-            0xFD90,   // FD90..FD91; UNKNOWN
-            0xFD92,   // FD92..FDC7; ARABIC
-            0xFDC8,   // FDC8..FDCE; UNKNOWN
-            0xFDCF,   // FDCF      ; ARABIC
+            0xFD40,   // FD40..FDCF; ARABIC
             0xFDD0,   // FDD0..FDEF; UNKNOWN
             0xFDF0,   // FDF0..FDFF; ARABIC
             0xFE00,   // FE00..FE0F; INHERITED
@@ -6555,7 +6662,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x10920,  // 10920..10939; LYDIAN
             0x1093A,  // 1093A..1093E; UNKNOWN
             0x1093F,  // 1093F       ; LYDIAN
-            0x10940,  // 10940..1097F; UNKNOWN
+            0x10940,  // 10940..10959; SIDETIC
+            0x1095A,  // 1095A..1097F; UNKNOWN
             0x10980,  // 10980..1099F; MEROITIC_HIEROGLYPHS
             0x109A0,  // 109A0..109B7; MEROITIC_CURSIVE
             0x109B8,  // 109B8..109BB; UNKNOWN
@@ -6625,9 +6733,11 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x10EAE,  // 10EAE..10EAF; UNKNOWN
             0x10EB0,  // 10EB0..10EB1; YEZIDI
             0x10EB2,  // 10EB2..10EC1; UNKNOWN
-            0x10EC2,  // 10EC2..10EC4; ARABIC
-            0x10EC5,  // 10EC5..10EFB; UNKNOWN
-            0x10EFC,  // 10EFC..10EFF; ARABIC
+            0x10EC2,  // 10EC2..10EC7; ARABIC
+            0x10EC8,  // 10EC8..10ECF; UNKNOWN
+            0x10ED0,  // 10ED0..10ED8; ARABIC
+            0x10ED9,  // 10ED9..10EF9; UNKNOWN
+            0x10EFA,  // 10EFA..10EFF; ARABIC
             0x10F00,  // 10F00..10F27; OLD_SOGDIAN
             0x10F28,  // 10F28..10F2F; UNKNOWN
             0x10F30,  // 10F30..10F59; SOGDIAN
@@ -6797,7 +6907,9 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x11AC0,  // 11AC0..11AF8; PAU_CIN_HAU
             0x11AF9,  // 11AF9..11AFF; UNKNOWN
             0x11B00,  // 11B00..11B09; DEVANAGARI
-            0x11B0A,  // 11B0A..11BBF; UNKNOWN
+            0x11B0A,  // 11B0A..11B5F; UNKNOWN
+            0x11B60,  // 11B60..11B67; SHARADA
+            0x11B68,  // 11B68..11BBF; UNKNOWN
             0x11BC0,  // 11BC0..11BE1; SUNUWAR
             0x11BE2,  // 11BE2..11BEF; UNKNOWN
             0x11BF0,  // 11BF0..11BF9; SUNUWAR
@@ -6841,7 +6953,11 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x11D93,  // 11D93..11D98; GUNJALA_GONDI
             0x11D99,  // 11D99..11D9F; UNKNOWN
             0x11DA0,  // 11DA0..11DA9; GUNJALA_GONDI
-            0x11DAA,  // 11DAA..11EDF; UNKNOWN
+            0x11DAA,  // 11DAA..11DAF; UNKNOWN
+            0x11DB0,  // 11DB0..11DDB; TOLONG_SIKI
+            0x11DDC,  // 11DDC..11DDF; UNKNOWN
+            0x11DE0,  // 11DE0..11DE9; TOLONG_SIKI
+            0x11DEA,  // 11DEA..11EDF; UNKNOWN
             0x11EE0,  // 11EE0..11EF8; MAKASAR
             0x11EF9,  // 11EF9..11EFF; UNKNOWN
             0x11F00,  // 11F00..11F10; KAWI
@@ -6901,7 +7017,11 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x16D40,  // 16D40..16D79; KIRAT_RAI
             0x16D7A,  // 16D7A..16E3F; UNKNOWN
             0x16E40,  // 16E40..16E9A; MEDEFAIDRIN
-            0x16E9B,  // 16E9B..16EFF; UNKNOWN
+            0x16E9B,  // 16E9B..16E9F; UNKNOWN
+            0x16EA0,  // 16EA0..16EB8; BERIA_ERFE
+            0x16EB9,  // 16EB9..16EBA; UNKNOWN
+            0x16EBB,  // 16EBB..16ED3; BERIA_ERFE
+            0x16ED4,  // 16ED4..16EFF; UNKNOWN
             0x16F00,  // 16F00..16F4A; MIAO
             0x16F4B,  // 16F4B..16F4E; UNKNOWN
             0x16F4F,  // 16F4F..16F87; MIAO
@@ -6913,16 +7033,16 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x16FE2,  // 16FE2..16FE3; HAN
             0x16FE4,  // 16FE4       ; KHITAN_SMALL_SCRIPT
             0x16FE5,  // 16FE5..16FEF; UNKNOWN
-            0x16FF0,  // 16FF0..16FF1; HAN
-            0x16FF2,  // 16FF2..16FFF; UNKNOWN
-            0x17000,  // 17000..187F7; TANGUT
-            0x187F8,  // 187F8..187FF; UNKNOWN
-            0x18800,  // 18800..18AFF; TANGUT
+            0x16FF0,  // 16FF0..16FF6; HAN
+            0x16FF7,  // 16FF7..16FFF; UNKNOWN
+            0x17000,  // 17000..18AFF; TANGUT
             0x18B00,  // 18B00..18CD5; KHITAN_SMALL_SCRIPT
             0x18CD6,  // 18CD6..18CFE; UNKNOWN
             0x18CFF,  // 18CFF       ; KHITAN_SMALL_SCRIPT
-            0x18D00,  // 18D00..18D08; TANGUT
-            0x18D09,  // 18D09..1AFEF; UNKNOWN
+            0x18D00,  // 18D00..18D1E; TANGUT
+            0x18D1F,  // 18D1F..18D7F; UNKNOWN
+            0x18D80,  // 18D80..18DF2; TANGUT
+            0x18DF3,  // 18DF3..1AFEF; UNKNOWN
             0x1AFF0,  // 1AFF0..1AFF3; KATAKANA
             0x1AFF4,  // 1AFF4       ; UNKNOWN
             0x1AFF5,  // 1AFF5..1AFFB; KATAKANA
@@ -6954,10 +7074,14 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1BC9C,  // 1BC9C..1BC9F; DUPLOYAN
             0x1BCA0,  // 1BCA0..1BCA3; COMMON
             0x1BCA4,  // 1BCA4..1CBFF; UNKNOWN
-            0x1CC00,  // 1CC00..1CCF9; COMMON
-            0x1CCFA,  // 1CCFA..1CCFF; UNKNOWN
+            0x1CC00,  // 1CC00..1CCFC; COMMON
+            0x1CCFD,  // 1CCFD..1CCFF; UNKNOWN
             0x1CD00,  // 1CD00..1CEB3; COMMON
-            0x1CEB4,  // 1CEB4..1CEFF; UNKNOWN
+            0x1CEB4,  // 1CEB4..1CEB9; UNKNOWN
+            0x1CEBA,  // 1CEBA..1CED0; COMMON
+            0x1CED1,  // 1CED1..1CEDF; UNKNOWN
+            0x1CEE0,  // 1CEE0..1CEF0; COMMON
+            0x1CEF1,  // 1CEF1..1CEFF; UNKNOWN
             0x1CF00,  // 1CF00..1CF2D; INHERITED
             0x1CF2E,  // 1CF2E..1CF2F; UNKNOWN
             0x1CF30,  // 1CF30..1CF46; INHERITED
@@ -7072,7 +7196,13 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1E5D0,  // 1E5D0..1E5FA; OL_ONAL
             0x1E5FB,  // 1E5FB..1E5FE; UNKNOWN
             0x1E5FF,  // 1E5FF       ; OL_ONAL
-            0x1E600,  // 1E600..1E7DF; UNKNOWN
+            0x1E600,  // 1E600..1E6BF; UNKNOWN
+            0x1E6C0,  // 1E6C0..1E6DE; TAI_YO
+            0x1E6DF,  // 1E6DF       ; UNKNOWN
+            0x1E6E0,  // 1E6E0..1E6F5; TAI_YO
+            0x1E6F6,  // 1E6F6..1E6FD; UNKNOWN
+            0x1E6FE,  // 1E6FE..1E6FF; TAI_YO
+            0x1E700,  // 1E700..1E7DF; UNKNOWN
             0x1E7E0,  // 1E7E0..1E7E6; ETHIOPIC
             0x1E7E7,  // 1E7E7       ; UNKNOWN
             0x1E7E8,  // 1E7E8..1E7EB; ETHIOPIC
@@ -7189,15 +7319,13 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1F252,  // 1F252..1F25F; UNKNOWN
             0x1F260,  // 1F260..1F265; COMMON
             0x1F266,  // 1F266..1F2FF; UNKNOWN
-            0x1F300,  // 1F300..1F6D7; COMMON
-            0x1F6D8,  // 1F6D8..1F6DB; UNKNOWN
+            0x1F300,  // 1F300..1F6D8; COMMON
+            0x1F6D9,  // 1F6D9..1F6DB; UNKNOWN
             0x1F6DC,  // 1F6DC..1F6EC; COMMON
             0x1F6ED,  // 1F6ED..1F6EF; UNKNOWN
             0x1F6F0,  // 1F6F0..1F6FC; COMMON
             0x1F6FD,  // 1F6FD..1F6FF; UNKNOWN
-            0x1F700,  // 1F700..1F776; COMMON
-            0x1F777,  // 1F777..1F77A; UNKNOWN
-            0x1F77B,  // 1F77B..1F7D9; COMMON
+            0x1F700,  // 1F700..1F7D9; COMMON
             0x1F7DA,  // 1F7DA..1F7DF; UNKNOWN
             0x1F7E0,  // 1F7E0..1F7EB; COMMON
             0x1F7EC,  // 1F7EC..1F7EF; UNKNOWN
@@ -7216,35 +7344,37 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x1F8B0,  // 1F8B0..1F8BB; COMMON
             0x1F8BC,  // 1F8BC..1F8BF; UNKNOWN
             0x1F8C0,  // 1F8C0..1F8C1; COMMON
-            0x1F8C2,  // 1F8C2..1F8FF; UNKNOWN
-            0x1F900,  // 1F900..1FA53; COMMON
-            0x1FA54,  // 1FA54..1FA5F; UNKNOWN
+            0x1F8C2,  // 1F8C2..1F8CF; UNKNOWN
+            0x1F8D0,  // 1F8D0..1F8D8; COMMON
+            0x1F8D9,  // 1F8D9..1F8FF; UNKNOWN
+            0x1F900,  // 1F900..1FA57; COMMON
+            0x1FA58,  // 1FA58..1FA5F; UNKNOWN
             0x1FA60,  // 1FA60..1FA6D; COMMON
             0x1FA6E,  // 1FA6E..1FA6F; UNKNOWN
             0x1FA70,  // 1FA70..1FA7C; COMMON
             0x1FA7D,  // 1FA7D..1FA7F; UNKNOWN
-            0x1FA80,  // 1FA80..1FA89; COMMON
-            0x1FA8A,  // 1FA8A..1FA8E; UNKNOWN
-            0x1FA8F,  // 1FA8F..1FAC6; COMMON
-            0x1FAC7,  // 1FAC7..1FACD; UNKNOWN
-            0x1FACE,  // 1FACE..1FADC; COMMON
+            0x1FA80,  // 1FA80..1FA8A; COMMON
+            0x1FA8B,  // 1FA8B..1FA8D; UNKNOWN
+            0x1FA8E,  // 1FA8E..1FAC6; COMMON
+            0x1FAC7,  // 1FAC7       ; UNKNOWN
+            0x1FAC8,  // 1FAC8       ; COMMON
+            0x1FAC9,  // 1FAC9..1FACC; UNKNOWN
+            0x1FACD,  // 1FACD..1FADC; COMMON
             0x1FADD,  // 1FADD..1FADE; UNKNOWN
-            0x1FADF,  // 1FADF..1FAE9; COMMON
-            0x1FAEA,  // 1FAEA..1FAEF; UNKNOWN
-            0x1FAF0,  // 1FAF0..1FAF8; COMMON
+            0x1FADF,  // 1FADF..1FAEA; COMMON
+            0x1FAEB,  // 1FAEB..1FAEE; UNKNOWN
+            0x1FAEF,  // 1FAEF..1FAF8; COMMON
             0x1FAF9,  // 1FAF9..1FAFF; UNKNOWN
             0x1FB00,  // 1FB00..1FB92; COMMON
             0x1FB93,  // 1FB93       ; UNKNOWN
-            0x1FB94,  // 1FB94..1FBF9; COMMON
-            0x1FBFA,  // 1FBFA..1FFFF; UNKNOWN
+            0x1FB94,  // 1FB94..1FBFA; COMMON
+            0x1FBFB,  // 1FBFB..1FFFF; UNKNOWN
             0x20000,  // 20000..2A6DF; HAN
             0x2A6E0,  // 2A6E0..2A6FF; UNKNOWN
-            0x2A700,  // 2A700..2B739; HAN
-            0x2B73A,  // 2B73A..2B73F; UNKNOWN
-            0x2B740,  // 2B740..2B81D; HAN
+            0x2A700,  // 2A700..2B81D; HAN
             0x2B81E,  // 2B81E..2B81F; UNKNOWN
-            0x2B820,  // 2B820..2CEA1; HAN
-            0x2CEA2,  // 2CEA2..2CEAF; UNKNOWN
+            0x2B820,  // 2B820..2CEAD; HAN
+            0x2CEAE,  // 2CEAE..2CEAF; UNKNOWN
             0x2CEB0,  // 2CEB0..2EBE0; HAN
             0x2EBE1,  // 2EBE1..2EBEF; UNKNOWN
             0x2EBF0,  // 2EBF0..2EE5D; HAN
@@ -7253,8 +7383,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             0x2FA1E,  // 2FA1E..2FFFF; UNKNOWN
             0x30000,  // 30000..3134A; HAN
             0x3134B,  // 3134B..3134F; UNKNOWN
-            0x31350,  // 31350..323AF; HAN
-            0x323B0,  // 323B0..E0000; UNKNOWN
+            0x31350,  // 31350..33479; HAN
+            0x3347A,  // 3347A..E0000; UNKNOWN
             0xE0001,  // E0001       ; COMMON
             0xE0002,  // E0002..E001F; UNKNOWN
             0xE0020,  // E0020..E007F; COMMON
@@ -7359,9 +7489,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNKNOWN,                  // 085F
             SYRIAC,                   // 0860..086A
             UNKNOWN,                  // 086B..086F
-            ARABIC,                   // 0870..088E
-            UNKNOWN,                  // 088F
-            ARABIC,                   // 0890..0891
+            ARABIC,                   // 0870..0891
             UNKNOWN,                  // 0892..0896
             ARABIC,                   // 0897..08E1
             COMMON,                   // 08E2
@@ -7536,8 +7664,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             TELUGU,                   // 0C55..0C56
             UNKNOWN,                  // 0C57
             TELUGU,                   // 0C58..0C5A
-            UNKNOWN,                  // 0C5B..0C5C
-            TELUGU,                   // 0C5D
+            UNKNOWN,                  // 0C5B
+            TELUGU,                   // 0C5C..0C5D
             UNKNOWN,                  // 0C5E..0C5F
             TELUGU,                   // 0C60..0C63
             UNKNOWN,                  // 0C64..0C65
@@ -7561,8 +7689,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             KANNADA,                  // 0CCA..0CCD
             UNKNOWN,                  // 0CCE..0CD4
             KANNADA,                  // 0CD5..0CD6
-            UNKNOWN,                  // 0CD7..0CDC
-            KANNADA,                  // 0CDD..0CDE
+            UNKNOWN,                  // 0CD7..0CDB
+            KANNADA,                  // 0CDC..0CDE
             UNKNOWN,                  // 0CDF
             KANNADA,                  // 0CE0..0CE3
             UNKNOWN,                  // 0CE4..0CE5
@@ -7773,8 +7901,10 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNKNOWN,                  // 1A9A..1A9F
             TAI_THAM,                 // 1AA0..1AAD
             UNKNOWN,                  // 1AAE..1AAF
-            INHERITED,                // 1AB0..1ACE
-            UNKNOWN,                  // 1ACF..1AFF
+            INHERITED,                // 1AB0..1ADD
+            UNKNOWN,                  // 1ADE..1ADF
+            INHERITED,                // 1AE0..1AEB
+            UNKNOWN,                  // 1AEC..1AFF
             BALINESE,                 // 1B00..1B4C
             UNKNOWN,                  // 1B4D
             BALINESE,                 // 1B4E..1B7F
@@ -7866,8 +7996,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNKNOWN,                  // 208F
             LATIN,                    // 2090..209C
             UNKNOWN,                  // 209D..209F
-            COMMON,                   // 20A0..20C0
-            UNKNOWN,                  // 20C1..20CF
+            COMMON,                   // 20A0..20C1
+            UNKNOWN,                  // 20C2..20CF
             INHERITED,                // 20D0..20F0
             UNKNOWN,                  // 20F1..20FF
             COMMON,                   // 2100..2125
@@ -7890,9 +8020,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             BRAILLE,                  // 2800..28FF
             COMMON,                   // 2900..2B73
             UNKNOWN,                  // 2B74..2B75
-            COMMON,                   // 2B76..2B95
-            UNKNOWN,                  // 2B96
-            COMMON,                   // 2B97..2BFF
+            COMMON,                   // 2B76..2BFF
             GLAGOLITIC,               // 2C00..2C5F
             LATIN,                    // 2C60..2C7F
             COPTIC,                   // 2C80..2CF3
@@ -7993,15 +8121,9 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             COMMON,                   // A700..A721
             LATIN,                    // A722..A787
             COMMON,                   // A788..A78A
-            LATIN,                    // A78B..A7CD
-            UNKNOWN,                  // A7CE..A7CF
-            LATIN,                    // A7D0..A7D1
-            UNKNOWN,                  // A7D2
-            LATIN,                    // A7D3
-            UNKNOWN,                  // A7D4
-            LATIN,                    // A7D5..A7DC
-            UNKNOWN,                  // A7DD..A7F1
-            LATIN,                    // A7F2..A7FF
+            LATIN,                    // A78B..A7DC
+            UNKNOWN,                  // A7DD..A7F0
+            LATIN,                    // A7F1..A7FF
             SYLOTI_NAGRI,             // A800..A82C
             UNKNOWN,                  // A82D..A82F
             COMMON,                   // A830..A839
@@ -8089,15 +8211,9 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             HEBREW,                   // FB43..FB44
             UNKNOWN,                  // FB45
             HEBREW,                   // FB46..FB4F
-            ARABIC,                   // FB50..FBC2
-            UNKNOWN,                  // FBC3..FBD2
-            ARABIC,                   // FBD3..FD3D
+            ARABIC,                   // FB50..FD3D
             COMMON,                   // FD3E..FD3F
-            ARABIC,                   // FD40..FD8F
-            UNKNOWN,                  // FD90..FD91
-            ARABIC,                   // FD92..FDC7
-            UNKNOWN,                  // FDC8..FDCE
-            ARABIC,                   // FDCF
+            ARABIC,                   // FD40..FDCF
             UNKNOWN,                  // FDD0..FDEF
             ARABIC,                   // FDF0..FDFF
             INHERITED,                // FE00..FE0F
@@ -8266,7 +8382,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             LYDIAN,                   // 10920..10939
             UNKNOWN,                  // 1093A..1093E
             LYDIAN,                   // 1093F
-            UNKNOWN,                  // 10940..1097F
+            SIDETIC,                  // 10940..10959
+            UNKNOWN,                  // 1095A..1097F
             MEROITIC_HIEROGLYPHS,     // 10980..1099F
             MEROITIC_CURSIVE,         // 109A0..109B7
             UNKNOWN,                  // 109B8..109BB
@@ -8336,9 +8453,11 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNKNOWN,                  // 10EAE..10EAF
             YEZIDI,                   // 10EB0..10EB1
             UNKNOWN,                  // 10EB2..10EC1
-            ARABIC,                   // 10EC2..10EC4
-            UNKNOWN,                  // 10EC5..10EFB
-            ARABIC,                   // 10EFC..10EFF
+            ARABIC,                   // 10EC2..10EC7
+            UNKNOWN,                  // 10EC8..10ECF
+            ARABIC,                   // 10ED0..10ED8
+            UNKNOWN,                  // 10ED9..10EF9
+            ARABIC,                   // 10EFA..10EFF
             OLD_SOGDIAN,              // 10F00..10F27
             UNKNOWN,                  // 10F28..10F2F
             SOGDIAN,                  // 10F30..10F59
@@ -8508,7 +8627,9 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             PAU_CIN_HAU,              // 11AC0..11AF8
             UNKNOWN,                  // 11AF9..11AFF
             DEVANAGARI,               // 11B00..11B09
-            UNKNOWN,                  // 11B0A..11BBF
+            UNKNOWN,                  // 11B0A..11B5F
+            SHARADA,                  // 11B60..11B67
+            UNKNOWN,                  // 11B68..11BBF
             SUNUWAR,                  // 11BC0..11BE1
             UNKNOWN,                  // 11BE2..11BEF
             SUNUWAR,                  // 11BF0..11BF9
@@ -8552,7 +8673,11 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             GUNJALA_GONDI,            // 11D93..11D98
             UNKNOWN,                  // 11D99..11D9F
             GUNJALA_GONDI,            // 11DA0..11DA9
-            UNKNOWN,                  // 11DAA..11EDF
+            UNKNOWN,                  // 11DAA..11DAF
+            TOLONG_SIKI,              // 11DB0..11DDB
+            UNKNOWN,                  // 11DDC..11DDF
+            TOLONG_SIKI,              // 11DE0..11DE9
+            UNKNOWN,                  // 11DEA..11EDF
             MAKASAR,                  // 11EE0..11EF8
             UNKNOWN,                  // 11EF9..11EFF
             KAWI,                     // 11F00..11F10
@@ -8612,7 +8737,11 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             KIRAT_RAI,                // 16D40..16D79
             UNKNOWN,                  // 16D7A..16E3F
             MEDEFAIDRIN,              // 16E40..16E9A
-            UNKNOWN,                  // 16E9B..16EFF
+            UNKNOWN,                  // 16E9B..16E9F
+            BERIA_ERFE,               // 16EA0..16EB8
+            UNKNOWN,                  // 16EB9..16EBA
+            BERIA_ERFE,               // 16EBB..16ED3
+            UNKNOWN,                  // 16ED4..16EFF
             MIAO,                     // 16F00..16F4A
             UNKNOWN,                  // 16F4B..16F4E
             MIAO,                     // 16F4F..16F87
@@ -8624,16 +8753,16 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             HAN,                      // 16FE2..16FE3
             KHITAN_SMALL_SCRIPT,      // 16FE4
             UNKNOWN,                  // 16FE5..16FEF
-            HAN,                      // 16FF0..16FF1
-            UNKNOWN,                  // 16FF2..16FFF
-            TANGUT,                   // 17000..187F7
-            UNKNOWN,                  // 187F8..187FF
-            TANGUT,                   // 18800..18AFF
+            HAN,                      // 16FF0..16FF6
+            UNKNOWN,                  // 16FF7..16FFF
+            TANGUT,                   // 17000..18AFF
             KHITAN_SMALL_SCRIPT,      // 18B00..18CD5
             UNKNOWN,                  // 18CD6..18CFE
             KHITAN_SMALL_SCRIPT,      // 18CFF
-            TANGUT,                   // 18D00..18D08
-            UNKNOWN,                  // 18D09..1AFEF
+            TANGUT,                   // 18D00..18D1E
+            UNKNOWN,                  // 18D1F..18D7F
+            TANGUT,                   // 18D80..18DF2
+            UNKNOWN,                  // 18DF3..1AFEF
             KATAKANA,                 // 1AFF0..1AFF3
             UNKNOWN,                  // 1AFF4
             KATAKANA,                 // 1AFF5..1AFFB
@@ -8665,10 +8794,14 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             DUPLOYAN,                 // 1BC9C..1BC9F
             COMMON,                   // 1BCA0..1BCA3
             UNKNOWN,                  // 1BCA4..1CBFF
-            COMMON,                   // 1CC00..1CCF9
-            UNKNOWN,                  // 1CCFA..1CCFF
+            COMMON,                   // 1CC00..1CCFC
+            UNKNOWN,                  // 1CCFD..1CCFF
             COMMON,                   // 1CD00..1CEB3
-            UNKNOWN,                  // 1CEB4..1CEFF
+            UNKNOWN,                  // 1CEB4..1CEB9
+            COMMON,                   // 1CEBA..1CED0
+            UNKNOWN,                  // 1CED1..1CEDF
+            COMMON,                   // 1CEE0..1CEF0
+            UNKNOWN,                  // 1CEF1..1CEFF
             INHERITED,                // 1CF00..1CF2D
             UNKNOWN,                  // 1CF2E..1CF2F
             INHERITED,                // 1CF30..1CF46
@@ -8783,7 +8916,13 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             OL_ONAL,                  // 1E5D0..1E5FA
             UNKNOWN,                  // 1E5FB..1E5FE
             OL_ONAL,                  // 1E5FF
-            UNKNOWN,                  // 1E600..1E7DF
+            UNKNOWN,                  // 1E600..1E6BF
+            TAI_YO,                   // 1E6C0..1E6DE
+            UNKNOWN,                  // 1E6DF
+            TAI_YO,                   // 1E6E0..1E6F5
+            UNKNOWN,                  // 1E6F6..1E6FD
+            TAI_YO,                   // 1E6FE..1E6FF
+            UNKNOWN,                  // 1E700..1E7DF
             ETHIOPIC,                 // 1E7E0..1E7E6
             UNKNOWN,                  // 1E7E7
             ETHIOPIC,                 // 1E7E8..1E7EB
@@ -8900,15 +9039,13 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNKNOWN,                  // 1F252..1F25F
             COMMON,                   // 1F260..1F265
             UNKNOWN,                  // 1F266..1F2FF
-            COMMON,                   // 1F300..1F6D7
-            UNKNOWN,                  // 1F6D8..1F6DB
+            COMMON,                   // 1F300..1F6D8
+            UNKNOWN,                  // 1F6D9..1F6DB
             COMMON,                   // 1F6DC..1F6EC
             UNKNOWN,                  // 1F6ED..1F6EF
             COMMON,                   // 1F6F0..1F6FC
             UNKNOWN,                  // 1F6FD..1F6FF
-            COMMON,                   // 1F700..1F776
-            UNKNOWN,                  // 1F777..1F77A
-            COMMON,                   // 1F77B..1F7D9
+            COMMON,                   // 1F700..1F7D9
             UNKNOWN,                  // 1F7DA..1F7DF
             COMMON,                   // 1F7E0..1F7EB
             UNKNOWN,                  // 1F7EC..1F7EF
@@ -8927,35 +9064,37 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             COMMON,                   // 1F8B0..1F8BB
             UNKNOWN,                  // 1F8BC..1F8BF
             COMMON,                   // 1F8C0..1F8C1
-            UNKNOWN,                  // 1F8C2..1F8FF
-            COMMON,                   // 1F900..1FA53
-            UNKNOWN,                  // 1FA54..1FA5F
+            UNKNOWN,                  // 1F8C2..1F8CF
+            COMMON,                   // 1F8D0..1F8D8
+            UNKNOWN,                  // 1F8D9..1F8FF
+            COMMON,                   // 1F900..1FA57
+            UNKNOWN,                  // 1FA58..1FA5F
             COMMON,                   // 1FA60..1FA6D
             UNKNOWN,                  // 1FA6E..1FA6F
             COMMON,                   // 1FA70..1FA7C
             UNKNOWN,                  // 1FA7D..1FA7F
-            COMMON,                   // 1FA80..1FA89
-            UNKNOWN,                  // 1FA8A..1FA8E
-            COMMON,                   // 1FA8F..1FAC6
-            UNKNOWN,                  // 1FAC7..1FACD
-            COMMON,                   // 1FACE..1FADC
+            COMMON,                   // 1FA80..1FA8A
+            UNKNOWN,                  // 1FA8B..1FA8D
+            COMMON,                   // 1FA8E..1FAC6
+            UNKNOWN,                  // 1FAC7
+            COMMON,                   // 1FAC8
+            UNKNOWN,                  // 1FAC9..1FACC
+            COMMON,                   // 1FACD..1FADC
             UNKNOWN,                  // 1FADD..1FADE
-            COMMON,                   // 1FADF..1FAE9
-            UNKNOWN,                  // 1FAEA..1FAEF
-            COMMON,                   // 1FAF0..1FAF8
+            COMMON,                   // 1FADF..1FAEA
+            UNKNOWN,                  // 1FAEB..1FAEE
+            COMMON,                   // 1FAEF..1FAF8
             UNKNOWN,                  // 1FAF9..1FAFF
             COMMON,                   // 1FB00..1FB92
             UNKNOWN,                  // 1FB93
-            COMMON,                   // 1FB94..1FBF9
-            UNKNOWN,                  // 1FBFA..1FFFF
+            COMMON,                   // 1FB94..1FBFA
+            UNKNOWN,                  // 1FBFB..1FFFF
             HAN,                      // 20000..2A6DF
             UNKNOWN,                  // 2A6E0..2A6FF
-            HAN,                      // 2A700..2B739
-            UNKNOWN,                  // 2B73A..2B73F
-            HAN,                      // 2B740..2B81D
+            HAN,                      // 2A700..2B81D
             UNKNOWN,                  // 2B81E..2B81F
-            HAN,                      // 2B820..2CEA1
-            UNKNOWN,                  // 2CEA2..2CEAF
+            HAN,                      // 2B820..2CEAD
+            UNKNOWN,                  // 2CEAE..2CEAF
             HAN,                      // 2CEB0..2EBE0
             UNKNOWN,                  // 2EBE1..2EBEF
             HAN,                      // 2EBF0..2EE5D
@@ -8964,8 +9103,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             UNKNOWN,                  // 2FA1E..2FFFF
             HAN,                      // 30000..3134A
             UNKNOWN,                  // 3134B..3134F
-            HAN,                      // 31350..323AF
-            UNKNOWN,                  // 323B0..E0000
+            HAN,                      // 31350..33479
+            UNKNOWN,                  // 3347A..E0000
             COMMON,                   // E0001
             UNKNOWN,                  // E0002..E001F
             COMMON,                   // E0020..E007F
@@ -8989,6 +9128,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             aliases.put("BASS", BASSA_VAH);
             aliases.put("BATK", BATAK);
             aliases.put("BENG", BENGALI);
+            aliases.put("BERF", BERIA_ERFE);
             aliases.put("BHKS", BHAIKSUKI);
             aliases.put("BOPO", BOPOMOFO);
             aliases.put("BRAH", BRAHMI);
@@ -9107,6 +9247,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             aliases.put("SHAW", SHAVIAN);
             aliases.put("SHRD", SHARADA);
             aliases.put("SIDD", SIDDHAM);
+            aliases.put("SIDT", SIDETIC);
             aliases.put("SIND", KHUDAWADI);
             aliases.put("SINH", SINHALA);
             aliases.put("SOGD", SOGDIAN);
@@ -9124,6 +9265,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             aliases.put("TAML", TAMIL);
             aliases.put("TANG", TANGUT);
             aliases.put("TAVT", TAI_VIET);
+            aliases.put("TAYO", TAI_YO);
             aliases.put("TELU", TELUGU);
             aliases.put("TFNG", TIFINAGH);
             aliases.put("TGLG", TAGALOG);
@@ -9133,6 +9275,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
             aliases.put("TIRH", TIRHUTA);
             aliases.put("TNSA", TANGSA);
             aliases.put("TODR", TODHRI);
+            aliases.put("TOLS", TOLONG_SIKI);
             aliases.put("TOTO", TOTO);
             aliases.put("TUTG", TULU_TIGALARI);
             aliases.put("UGAR", UGARITIC);
diff --git a/src/java.base/share/classes/java/text/CollationElementIterator.java b/src/java.base/share/classes/java/text/CollationElementIterator.java
index 5469b95b11e..46fe80e1bda 100644
--- a/src/java.base/share/classes/java/text/CollationElementIterator.java
+++ b/src/java.base/share/classes/java/text/CollationElementIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -661,7 +661,7 @@ public final class CollationElementIterator
 
         // (the Normalizer is cloned here so that the seeking we do in the next loop
         // won't affect our real position in the text)
-        NormalizerBase tempText = (NormalizerBase)text.clone();
+        NormalizerBase tempText = text.clone();
 
         // extract the next maxLength characters in the string (we have to do this using the
         // Normalizer to ensure that our offsets correspond to those the rest of the
@@ -732,7 +732,7 @@ public final class CollationElementIterator
         pair = list.lastElement();
         int maxLength = pair.entryName.length();
 
-        NormalizerBase tempText = (NormalizerBase)text.clone();
+        NormalizerBase tempText = text.clone();
 
         tempText.next();
         key.setLength(0);
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/CharacterIteratorWrapper.java b/src/java.base/share/classes/jdk/internal/icu/impl/CharacterIteratorWrapper.java
index 79a6264d16d..698f28ea2be 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/CharacterIteratorWrapper.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/CharacterIteratorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ import jdk.internal.icu.text.UCharacterIterator;
  * @author ram
  */
 
-public class CharacterIteratorWrapper extends UCharacterIterator {
+public class CharacterIteratorWrapper extends UCharacterIterator implements Cloneable {
 
     private CharacterIterator iterator;
 
@@ -135,7 +135,7 @@ public class CharacterIteratorWrapper extends UCharacterIterator {
      * Creates a clone of this iterator.  Clones the underlying character iterator.
      * @see UCharacterIterator#clone()
      */
-    public Object clone(){
+    public CharacterIteratorWrapper clone(){
         try {
             CharacterIteratorWrapper result = (CharacterIteratorWrapper) super.clone();
             result.iterator = (CharacterIterator)this.iterator.clone();
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java b/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java
index 7922bb46829..67c9eff6f34 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java
@@ -269,8 +269,8 @@ public final class Norm2AllModes {
         private Norm2AllModesSingleton(String name) {
             try {
                 @SuppressWarnings("deprecation")
-                String DATA_FILE_NAME = "/jdk/internal/icu/impl/data/icudt" +
-                    VersionInfo.ICU_DATA_VERSION_PATH + "/" + name + ".nrm";
+                String DATA_FILE_NAME = "/jdk/internal/icu/impl/data/icudata/" +
+                    name + ".nrm";
                 NormalizerImpl impl=new NormalizerImpl().load(DATA_FILE_NAME);
                 allModes=new Norm2AllModes(impl);
             } catch (RuntimeException e) {
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/ReplaceableUCharacterIterator.java b/src/java.base/share/classes/jdk/internal/icu/impl/ReplaceableUCharacterIterator.java
index cf58f614155..b44a0d7675c 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/ReplaceableUCharacterIterator.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/ReplaceableUCharacterIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ import jdk.internal.icu.text.UCharacterIterator;
  *
  * What are first, last, and getBeginIndex doing here?!?!?!
  */
-public class ReplaceableUCharacterIterator extends UCharacterIterator {
+public class ReplaceableUCharacterIterator extends UCharacterIterator implements Cloneable {
 
     // public constructor ------------------------------------------------------
 
@@ -86,9 +86,9 @@ public class ReplaceableUCharacterIterator extends UCharacterIterator {
      * <code>Replaceable</code>object
      * @return copy of this iterator
      */
-    public Object clone(){
+    public ReplaceableUCharacterIterator clone(){
         try {
-          return super.clone();
+          return (ReplaceableUCharacterIterator) super.clone();
         } catch (CloneNotSupportedException e) {
             return null; // never invoked
         }
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java b/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java
index 287ac38c87b..e7e1e65c2a0 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java
@@ -201,9 +201,7 @@ public final class UBiDiProps {
     // data format constants ----------------------------------------------- ***
     @SuppressWarnings("deprecation")
     private static final String DATA_FILE_NAME =
-            "/jdk/internal/icu/impl/data/icudt" +
-            VersionInfo.ICU_DATA_VERSION_PATH +
-            "/ubidi.icu";
+            "/jdk/internal/icu/impl/data/icudata/ubidi.icu";
 
     /* format "BiDi" */
     private static final int FMT=0x42694469;
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java b/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java
index f439ae23d0f..073ffe933df 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java
@@ -330,9 +330,7 @@ public final class UCharacterProperty
      */
     @SuppressWarnings("deprecation")
     private static final String DATA_FILE_NAME_ =
-            "/jdk/internal/icu/impl/data/icudt" +
-            VersionInfo.ICU_DATA_VERSION_PATH +
-            "/uprops.icu";
+            "/jdk/internal/icu/impl/data/icudata/uprops.icu";
 
     /**
      * Shift value for lead surrogate to form a supplementary character.
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/nfc.nrm b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfc.nrm
similarity index 64%
rename from src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/nfc.nrm
rename to src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfc.nrm
index 114da46498df3ff787c0e42d58a4b309863f91c4..fa1d2917ef760977c7474f739ab8016201b9d61c 100644
GIT binary patch
delta 564
zcmZpe&Gcb5(*zM6K?W2M!NB16hJm5y1Or1a2A=3(&zvCtXk!yQ2md3sPwZUmn(TI9
z=rmb?$!_vBjyo~Z0ZeKTD4oFS4`N9dz(gQ4hb&mM0Vp#;dam?Jm@JD3P-Khr5vVF5
zn7H&62uu3@<PD4>R?^Sl5+7w4I5lMWScGI`WOSI+WK3k7IO<`tGC}O8U~HgVl1w2`
zyA&HIhfJkR=VU!@F(#SGlc#WLGESI0fm@z&@#K447nwK790c(=FG6(k>jL%YOm^cD
znXJI1BPR0>VIYhp^8utpK<2+JzpSjR7L%H+nXHR!$mAJ3j;txNIkHug@A0HFwgMH&
zO-|vJVFN0d%6=KhRp6Ih3Nr*m%TC_NEk1b_uLFzxLHUco@U)q%#<zuqEuXDv@&i6Q
zHijc?i`WiL4lu6VJez;L%;X<>va&lE7#SG<pFx5<;Or}t4fr)SuhCJGoFvULIY5<d
svXG3>=5wxbEOH=SAbkiDA_C!W*7B-i*}TZ_hb`mF$+LT&a;$;^0K^}d*8l(j

delta 452
zcmew`o2g+o(*zM60R|Kh!NB0x!objzz`)RpfhRiHGyBRP+}Om<!GE6ZKHGP8F?MY*
z)SoQCWH<R5$DJ6qY$i1bln!9^2eG6RU?LEjLl!Jr0F-Hv?v<VilVuSBiY$@d0#zjh
z6PG>$VM(8#yn#`~O8OdH;-T~hP7UdQEJ89oGBQkRGAc4g9Q80+87KBrFg8#wNG1`e
zU5bs9Lnc$Ea<U$`7?Vu%<SAU5j17|~aLY4Jo_vq%BJ(1djUXQ9L5NO%U7#KvCYf_!
z@3HZSFv&asi3rHNm-#QtD=WpMCaWfEBI`1F29G0ah-{2(*5rFU>5Qd7MRJo<cx41+
zTM=#mDxNrb0<SppLfMUz&+s}-7U289!f=EwfARu8i^&aq94u`8Z0je<m2KX~ze#5D
m35$@)3H*GUFX<>rZWeKiW7#~(tAb@SkN-DY#>~mgy-xvh$7^~3

diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/nfkc.nrm b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfkc.nrm
similarity index 90%
rename from src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/nfkc.nrm
rename to src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfkc.nrm
index 66421d6f29f65ae3e96ca6a5db716eb86da56a29..c78a9d9cac5e80594bcd617998d54e8e47a8f2ab 100644
GIT binary patch
delta 832
zcmZXQUr19?9LMjyyY616b2G<j4QD+BJLh-KSQw?q&^?qI{TtH5zz88o>t%ZgjCv^4
zkP5Lnfmu)wioW%SyKIEjf+!G?6{56!@F7e^Xb;gJd#H20ZYrH0=bZ2PeSY5`oZtL2
zTYAiP)5FT8Eh{ET@g7OaR!Y+6|Msm&gKd8(_OwgWU5~Zb+N}0N_pF7N?@{WF8QmwJ
z3}h8*MPRw8&s2fce8#%<R`bRVv3)pz_vWeEA~N;(*m_kopU0;xh0pRQvZoFw3g8mH
zUVH}MRik(Wj|uZDJgL7d&^cYtYr$6VA7S@Z6*m$asjz?pHVRBd{QRSX$UdGc*(nEk
zWyuFym>gbvwQ_gqK7O^df=3jF$c3%OHS<L=1ZF4KP#+l-65M2n7~~C^5{<KDk^JIz
zXX9niQ9pPAqZ{Zx)Iu}FpaXRyj)veo^q_~3fIBb@yHPJ1K%?tKcm%OLTS*e$!Zdt=
z?=S&bScWuYU><Vt4rX8h#$giXs7gK5M-c^DO`Q=MrEN4puPC&r#vCYLaW?UInUjyp
z+jvV^rCp))fnF}qE;oI&`JeQKNFpztpjo<1SDDVd46|C+%wnva#RSBRb+TSIfV$bJ
zLfLcE&E9YB!DiW4_A{sjw+92aT@CUeKj4a}p_)*W7+IL7T}fnLu>Y1aQbyaM5$%wv
zgg(yQ?l8}}R8@;>{XFCDG!B-Z_VZM=-=C6XN&Y*zDN+SJElRQB2;K85)x*Zfk;Mu=
rMRlG&s_Md%GQ;R<>(Hvq9%h$~)5=(HW3l~&X4J)#=j0{+?bFgffQ0KN

delta 730
zcmZXSUr19?9LMjy+wQ&2&0TSvjj<VIuycOrEca555?c>xP{`PeMn3F8tk#1)L{UUR
z1}0&DIFVpM4@#Cu%<eJ}3m>Fl>|usjjUI%;)}IHVAnB=dH)l$}!{L0-_jA4n&W|%c
zV_SJ{yX|F$w5_@&sXr)5AF`5E{BPcgAFwqww@hEvbk75AN?XuA>2i5EcvNXKm-T?$
zqdrk+WrT~4VM~R-Rh`PJA1}Lq6pEeLhnuR@o)pe*+_rHlQT1_WMd4#SBYXGZ)FwEM
zFV^(o>-Ge`haZXXQ#_}?+@yJ3uWG?Q;_o6JXsl_+KZ&gZobc~}rHGrqbrRXh*J^jj
zAs(z<v@x>3ygR}T*B-uDM|j5N<A+=g3Q3DcGnHIG!(>QEFbF4OWSYDZ7v;!%QsSz+
z{R&w}w?GF!x`FNkh8P@%ZZv>68iQUqiylG>uEAaKqCqr*CMv|r2vW&xBQOqGSb!z?
z46~4fB4l753a|n*@EVq33g#dWzo?x$sY(NMCv`_@oF-_Bo>8cy#cCk`;qH(x3)RSz
zbwPvP+}Z;=Dgg4+Njgh&v`9;Io$1WaFpIGc784LN*2PY+^Jst#DwK^_X*RL-4)%h*
zVei-%_B*0k|3W205nm+C`#f>6ZRM+;ERqW9s#K5)nyMjfucd@;<r(9ktw+1W*LIyV
x)AhX}{y633Mt!FlZ5|CNl5FOWmKw~ZRF7sRP9`;Ty#HBRKE=C=U-ik2`U~r#$Or%c

diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/ubidi.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/ubidi.icu
similarity index 74%
rename from src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/ubidi.icu
rename to src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/ubidi.icu
index a333bde075702293e5759a31f295c1ca59aa9f04..bbd02f5f7dcbe3092c9fc15d25e83f463e5ba38a 100644
GIT binary patch
delta 1937
zcmcIjYitx%6rSBXGxyo0Z|Sy$ZOfyjtwn^2g;K1okcFlo)uz0vg%+t68X9fHgay=?
zEN!GcKL{8FB?{DtlyOVI@Y0A?5fTj`2#6>IP$-0mkH+Ykon2e};Xmi(-tRoVbI+MO
zXLg-;UAW*{pO_b?-Sxz3TJvO0duls+vo+21X&O7Kxx^vO<>`g*)6-*?x_hctEFGt5
zo+`eoyK%Q`gxO>6G#bnUMyq*5&ohsaka+^v84_~DykK5|sqWm$KJ!<zpC-^0N~ok6
zG>7IJztIV_n3j_etuTYO&;_)fHqmG4O1hQ?>0`8$Zo=pmy3L6r<8}HT?jhLc&PduH
z^`htFaQ+wcYq;r73H(5RqPOX{j4;U(n3rX+9F|Y}9X^{7!Aa3B9b^wjaE60AVRP6#
zwvdEaLpY<|$%|w+u@?3sd%@<ib!I-|StpN#e70f+8IWrjY+)O4-^{i}!|YvaJBg!#
z7BgsUjXDRA?Y4EchaI%hIF0qzggu`+9Cn<YH0QAM;pqG9GIDRQUywP3{egQn32`?U
z#u!A8k;9XnES?s@EC)%*nkcX8l@IV-UZ8(q3omi-?wyzMnHZae>v2Ap*YQTaj6WC2
zSjpFtw|S6vMh@R(HOF@7qu;V$-wg6D`(BL9XvGLA{C?QoUf4yZLvvDG?qS_OSomlB
z%c#xI@e{hAU$Sj}o!^G_-o$_)yk8^;86`O=Qgy$`61n;w#QQ~&m@1}=nW9Sf8#!XW
zSR@+tJh8%PwXaG%PeLMq_DiD8ZcB6+IZk_QhS;d*8Qn&k*n<9d#7?6WalYsY^A3n3
zB!CG~5ub~%!htiGa1n`D!qyFOC&~!h{evwMl5Qy+kBl+eWRgsg8R*4tHz0ECAbq^8
z%ThVnMog7{@iXp^!fIDyykY5ie6QH!@MW!>i#J=U%O!F-Dn&XwC|gl^#*{d&at*3e
zl~|4HE8$aLg|S0txHj1CPQsY|<yez^4Gy`zLT;5^vP&m&H{2YWGJK!>NcLjlF`Fb$
zItA@LY@f#?3KQjJa#miKx8+rGO5T(|%6|D5w&_zkQ52U)C8=~|Rwb&D%KmRcb}x=#
zbE{p+rr1Y9Y8<M=GF4GD=AbJ1mpu)hNJ<l`QunKBl!Z7T*|5dS>LO!pPZkchY8W&u
z;c<_SIga*S)2I8*pju|XklC(UR4Z#z0dfi(dKp)6pgMg6ys70GojBz-HzI1IdehEU
zJ8*TY9(4eGsrRI|sUr$6O`TBZ{$XCSHFXWIVv1YcLRb}0w_;rCcUxlIj_72t#E7W>
zf5EIs(f>N!ickMjxGJpJ>;w-4YKFpQUncZr=Ru&_v_=<RmQY(X1lE@r@JW3#oGWA2
z^3q-kvx|HXH);wr`O9Eq-B{>e;<HZsaU|Qd3X~Xohxz_2%bI<M!u~=AP(2YU3q98H
znkfV-Dn>y`eLU1QFql`Wptd|70>z`CZ(6cdu%J`#m}Nr2bOsMj@Ib-69{4aP84f@B
z4IIwIvc5EkSv&^X>xaR*h7s`4qFz{D&Y-5k3w?_+p}I5{&r^1<uw(I2FpATh8a@W!
zm8nR*Sj?X|kXIM)641Ob2fb<G%)R&dpr+Il=}bUVu@{E>OmK}%gf)+h@0g`5W64G0
U^1_wINml05rcSk``Ca(@4RK>6)&Kwi

delta 1792
zcmcIieN2^A7=JJ4ea|<aUFyn*T*>HyHzcNpsELT1UQAQ(mbjUs1Hr+fvP`YeX<H(<
zfoDx?bE6d-tC`T-HEfx>S?RE>;Uot`qfcoO+2*vS>pAax@5Ddqzusr(`8^-M=bY!9
z_qlS#(>?5I^9EClyFPHAqK2{Q1&9U=1N#kw_8A_2((ojGroPM0POM8f8h)m}*f5g9
zY<17(4?I&XiK135?y<JwV`dPaLQ#AM)|V*i3hu{)sw`pJ@)10W#|S18U&ptJmt+yY
zb%O**5h+1YQifZ!kjKetvYynDM)Dkai7Y0skO*WIdDG1Uqm6Wc?ouBoOiAyKM<H_5
zssEIGuErB4HD4sd<R|hKxlV3VOcSY>W>G&GbNMtt3$;aO#JhBn&W&M(izcE=X_!8N
zqI8{88FA}lyVTMK`Xb$;xpWVH2yn=)Ls7pr;DA;%3dsiA2KpfFh^Og0b{9$|%?-H4
zdOIGxgY-RZ({9?U(YgfZ?Q$X~T@F1%&*N2ez{wt=mx22;9Rp@E{S$Nm{J$Bp3Q&|0
zE1xC1RV+P*SuUceT_UcU%Zu1l7BD~jcVQ*0%+0bzYzbSzs@Pgq6N}Wdr%@-{#+(M>
zz`b@;O1t@ByS_edVQ=Vnv2x=l#yWT_hFz)~EmlqGsnfd6&_rRq?31|9&au;Gh+WV=
z8)74>EyLT)uCY;`!2XJpT;$vg@id;xGXM+t!~79GpD*N<X2{CttN0pTZ3cP0wN*bA
zZ$eT2Jor2KZru)l)yj9<q7}T&3|c)_D?b47L%h=}2VBJuJG>}Aj;f#_F8mZf>m<H`
zf=fVz{{i|({#%^k_}3<SkiRKBZbX<?tB@i^_)t{jsGT04Pvq&8m>~*dl)3zS@GBtc
zO|xt>$h!FZvD6B&6kf616jh=cj8c>Kih3{_uxNyuXTdDP9Ih<3?a#<kCsDC!Efjlo
zct4_4|0P;0BC04elSTBNCK9i!ao?nzL!wi_B#Iu*5y#x~w08Vcu){2`IE#kF*W#i$
zhXzEy_(BYe5$Mt{VV6-@e~25>0A|=LsZ7zux)oQTx1FAQG4DZ9nGWXUG?^XGxhQk>
zUN9h%%K|ebi$P|?{|~5+47wpUwR&)1dU@W2S-5MO<$?(r%?{xfxkO(AN8~cOlGe&K
zXaJg653A-*2c%tPWG<T02t%y7Epm&acgWqkTJD3T<Uzbk`7`g!jK~hz1(752BbN>K
z35S0guK#F)>;rhYS@y|6+3(1Zbi_mxMgHJM|0jKa?9l((-cHND#XX63O5mO(d*7^4
zp-ybdRmnBk_MY-zi8>J4uBJbL?fI3jVU-xlQaO1(wKk7hiAJIkQ8I6i%~t+G)a9U0
zt*esuyftM=&0Z$e@o<{@eP)t6U!7!6e{#F2u5S2NrB)WH96z;hZY=Srn;Q$Y<Klu8
zRapU5GkmJO=7PFa>Qnjt$!hSi42W}exRk0R^ZaVxrXa+1Omow~-wdY()p)koo>@17
SJcjZ$%(24_mPy}@eg6PY&nM>q

diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/uprops.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/uprops.icu
new file mode 100644
index 0000000000000000000000000000000000000000..b72fcd903e009ddba8f3c750bd152cd0f3aa3db5
GIT binary patch
literal 170864
zcmeFa2b|PY_dh%>nUd)(Gqas-tb!E~6%-3T%3{Z^*s!43zygYj1q%z<d*xB=4J&q0
zQDL$7`dARfioNT5PVSt&H_6SET^{}aKJPQ%PjdRX=ic08GMP-q)%aGsEA4W*T^`pC
z+e|zx=yJIdu<+OFtGHa^a>@j-d0nn6!S$+sF4uLhuw|Q9y#8I+giO2gSeI+e#PMsn
zT*-7w4UI^i?`iZ+_s#NM;Jd<ikMCjMLf^B#SAFmLKJtC;`_A{9;#D*yq2!e&r9&B@
z3{r+En<}G~G0HZ|&dOfOfyyDuQOfbkbmdIt9OV*aj&h?iPq|gOM|nVbTzN)$L3u-Y
zU-?v7q5Q16R7H)baW$tls{Pf~)FJ9%b+|fG-BR5{-9g<?Jw%<PtWZx;k5kW6FHo;g
zyVP6NyVM8OxoWriqWY%#gt}b)TK!4=!0-1*{2BExf2)6>f3UyKKhodn-`+pmzpsD1
z{|NtX{*(Nt`Dgp5_^<TO_225hP+il1kN;ucT>nD<68|ee-|;W?f8qbe|4YCX2>9kI
zD+2LAF3=e0uN)s38dw9WwIMJ9yfzPv4vYc1D=d2j4h$R)JwHA$IWW!cZ`TB-2WFu*
za6#aTz}&#CfqQ^|IIuAAY~WqsJ`Q{m_&V?^aNh>iz^_41FsiHwW`niCmf!&3h6Ohb
zjt&kA?j9TyoDe)Lcua6y@but`V3`fe6~POGbAz`A=LPQ%E>K#7i-JpnF9qKWE`e<|
z8n&l_;0HzeP4JhHI}{8hLYYuqaCvBOXn3eKG%z$Wv}I_A&>o?qLi>dd2^}Ar9y&jC
zNoZzhjs-V{<^@|qcZVJdJrQ~)^aAj&h29H&75WBhZ3!*IHG}5T0->Lae1x<`Ii=ME
zTeN0v6|){P6x-9*3eC~h)kcs^6rwiQw$`?%IAi{`YP+%CY5OXz+QG^S?Fj88ZHhKU
z8LgeEouggio2$*i2<--nLmGNnyH$HwyGLCUA{OG7)SlH|)!xJ{rM(9u+oFA}eX0GR
z{RZ3*VXqiVd{|>!JDjp_^~yBid}V&zD_qa{|8dSEfZHhC79JR0U0D%cCp<hnGQ4GY
zJM<6l$fCl#hxawdhYtel5#eLZTC)^}Jr5B+-K;Msh0iSOadtV6-r2(!vAFP+;p=*r
z0i(h<hwm`x{NCpfBf}4g(#qk(3rgn+KU&&esWrT)Qcv^?KOcU*8h`Q)!@I-ZgYeSc
zwi907+sKt07ygRn3$L;=^M<=C%@+P%?iv0);*I!=wLKyC`RBBe?8<375)HOQ>Vt4T
zWk#eqva0XZ$oi4BQ6JeP(iwsG>d0P^10#n<j*4s_IX*HS^s^#YM6Qlp5V=7e8Mz~J
zUtpPfUgYV>qmk#q_Il($kxzhr9r-EpSJWSkMN`olr4_Iu+H7v^f71U(;Qz`9L|2Wj
z6J6amw{M7U*hl;;`ak?XGy-h)Mz@A@h9{#tMt3X9##w6M8{gdMl<4^A5vYxx6qTM&
zMrQ~6gY`mKE{|Rvy&-x>^uB2EtS7oK`mXPS=*Q77qwq;H`fT*oKF*#Eljj3oNu^U`
zQZrLa(&6-`=~L5pq*r9t$c)HL%iNv$KHHKVm%TQ7clJ}gQQu3yT7N&6&W*@T%gxWd
zl23=Gg&u=XiX*gX+RfVM?zh9y&<I3$v+!x|w-Mo|ikcrILn1qdMntAY9*X=P9TuG$
zeJJ{SY*=g(dc`h^b;J5Q7UO<9-bfsy@j*!AN5XPqQFBjdMEnQj6N8y1u^nsaf9wB^
z!2gvINSxcZO8u_BAn{UPqW!MKOMQFy>w9$c*O)sN#Or{FSR&RG%g2VsI$~?YMrgOj
zHm4Q>%fPx#Y-d>S6+19CA$BBiQz7nn<@DI8z@HI2J9c&KV&HCo<@VU4vHO5N&GL$C
z?WDlBvBj~sVn*L%pT$0meHr^9sK);A&5bMZNIZkbd1XbsH9jz27atzqG(I>!Iz9%h
z<Knx6{($&l@nhmA#!tuEFmwDYtRsGr(i*=Cr0e64#BYz^OO+#yKLz^d;%~=aj(-&Y
zJpOIm9sf1%PI$DF5=pf!QAmV>rziR)R!OXp*gP>bF(NS<<lPfv65|q66B80g`sOB1
zNpz{3C(cV;lejT4FL7C7L1JOz*~I<Iio~mlcM~52{W9?bZxiG{k_y(Bj3hJ3I-moS
zt;xa3EtA8OBSpXD4orfPY)$TwJR~_OxgTnhrzB5L9+$i-c~%mxUL<c#UJuttKS{#1
zT(I4PYtSxCzMXtO`E2sl<cj2{hUKr6H~CYlkkV4AR9&hSbsVXIso|-OQ-e{H8kO2L
z1y_So`@k|@+(KqPb+{;}j%HHoSe7+4BXw@-($vW&pMUcf|6VTc#yV0riPiLuPu-b%
zpm&iJ6-y9Tii&f=I#%jBsmHCl|E653PG$>y5>zAb89u1O>{<*X{Zi_!)Q7QWoU2NG
zoBB+&;w(@7nhvEsY~M{M(|WoNJ<_e^+ppXs@NIh4pvqciQR%hCI{tn>J=9)(dPI6;
zdbC}Sn!bNFvi7k!4%?-7O7Cg4RV&l=e@4>>m}OB)AC^8LeY7$<Jv)6t(fc&tT+su+
zi3ql&FNfut^v!Afe&s#1r|)M~r5B_Z81ka@i&SU&gY>8AFVo+pf6I6?TKeNmDpQkb
z&h$_JYFL)0zsszV{xGvPSk}*MlIhHBm)Rh*S!S!u4w;QId!*kqw{Mq}(V0VFIWlux
zW<P4PFEleFbFLVlIXQD_a7pH-Oz~K$tjIi&xl{CDeB7OR9Bhm27Onvw(|H8QZ*eP(
zwVL@*lznqEpNVrW^DVxAW<8l-&0giDY$#jECebguO17WqpItAzaduR8yX>yneZabw
zXhS~Ol067VUArNDX?9}h<?OMv4MMMi|H;`I+1c3(vsY3aSsBe<XO>G#+1s)(r#M0{
zW$(w<voNc&i?YvUU$f3f=9^uXeJ}eJ`23LlgQ9f>IXy&m^_J>M+yZ*>yDz;7_zrQK
z{I~h=Wk&n(&7U3my81?TZC^Ai>zcH_d0(oiJXVM64=WRT@%y%wnX^<b_TDOb#Lf_<
zzn_m9S8#gYu0FPs*w`7)`y<8caK0-;saWT%m0M(OmeZ++l=G<Ej-RS}2YsS`5Q3ud
zz6uV#_(_1QE1&+eS7`N<eW&_Pb;bIKuuC_PFVeIt16&T4l%d(eb*5{PJLulReWrVn
zC+OM2bEcusfe(7=a7$G6NJCu4Rd8it@$>>|XgdQ-OuUEcAK_QV_~%^=H83g#SB*<?
z)k5Fmz@e1$c6z&val+9qcr~!s4eB1$Ijp<t(a%}7RkdTEvu!K9A@1*7?5)`~E4Lmo
z8;%#wc50JxOv5Z>HCuQTkL5a+mCKZaG#=RE7>7`baKpWYXcyNgJ1@=_F^cCzPOPM|
zcrjNsJnJ1>Q>z$Htvb~r#{D;V9Pi%b^|{KU0DCpU$&>6d%45t{pOMe3lSy#v=RXRX
z8(1&$`0^D;8sAgsg|)kTj&pbeE-oyZ%?al<^EBJ5+m<u~S&JA;byrHMJ@m(;FWakF
zCUa%~9f{iSEv>YlrTl7ynTB6Xl=5Bqwo)0Z-=3wi$!xMYSbj_6?DxT}=jiSB<8gRK
zhp!qy9_W8>|4%_~-N?_^M$^KI-p8t=lz^geeB`e<oIerxxhgx$#SxJAUWXVq=F~!O
zsjugqTFfACRi<@1@5bsdqbkiWw)OY$SdF=UJZ}{>_)di~*J5R|{;`U2>nO#oz~{fn
zxnL{xbp*r;oq3#Ff6q8#EAl!N`2;U&oyV~+b=xb!t%#pb5I&=A)%esxo@^Vd#cj>B
z=q7GAJ73-CTH8Xo`d*5)IkjILTp;E07c3rl%;7Jp*i7RNTiWa;m+bY>$jkk$T8u{>
zZVTDm!L4g=gKJp6KuI6&E$38Mz}Rx|Qy+sf*T}T!ft+=(kY&Vpe98KQ{_yE~o$kTi
z8+H%s9@ZV~gn66?ExtG5_GRtZw=`zNXri)~ncZx`DE1;fN;p%^{Y5Qmh@yw}#jL2M
zmP8L(e{n2WySR;IFZ95?R2|FAJc$==R^A+mHM1yjjs0c4!|lkn4z@r%QqmGdJHDtr
z<d{Uhvi|DExr`B5T$yJKYt!0a)&{jjlv*}ZtCh*378|y2U+foFj&0+1X8p8pV~pl6
zY`au{;k}Vv`(ZPh2ljCPjrmMlg2s*di)~@GRIzzJ_mpHX=u`E4_IKBJPR2c!BM-d!
z#r7O=t1&xOOBSxhtw-AtwdlcK6hm5y6=~76xK*joG~bEJwm0uT<-oi&db0UVevIl$
zr_!Z#s~TIwNU*JqTS2T4d77a_t#*>j+1bcoezu*lzpT$pX0x37!0Tli)(RhCl*w1#
zU-Yn#6XnHdY@MA2Qy-90KZuGpk(b*=Ew;t>XBu7VFQd4oK2Tk3t8<C9$g+~Jq`z!_
zoAzit`{lq`Y>#V*ql$@=z8Z?z?e9z29v!vV%;I|-%N|&wE!Mg_7imK}7j+KCE7Iai
z(oe&TS>^9ZXlDJatT(K+N_#5Hi8_3lbFjSp9f^$ujuJbX)4t90xHiYjB(`U=9JFTb
zxQz1<9%Da~b2>*8M-k&$Z+IqazqrN9StGe!RyWpf9XGsE!H)r~hw^hV>^0BNj_CH!
z1fm8%aWFs3%ijZPWaoPDjY#LFoufO)bnf0cu5&`?k(~qZor8VyM2g>S;Ue2^Vr9I>
zQXKXMU$jkSl)pRD6%n3M=FeuC+)}BQUEvYO$~<z+&PSO%QNv%nPLacrqdGW;8YYol
z{`sD_X+C=MDApEhfsRY4Lk|woi_KE8M$WS%3agGsV?;nUe~K-z(c;(5s^Rd{6Z03Z
z@v*DcG`8&8cDby)7sT-yikV2uD9T)Cx1(1%yE$WN|4P~u^YOMtt(oUO^7_r*atR~Z
z>=Eah!Fx6Q9@X3J(|n!2E?>8z`MX1%;qF*xqC4H0?ap`B;JIcOrhu0`KiAS;BT^R0
z*5dXr$76&zA5cz}t$^1e=kVAmw}{$s1wNub<MAlUUUnO5j1dpc2rdqVZ260UCF9Lm
z*%p<Z6Po>;Bz6SAn(Qy97*UV$PA}2V%+nlVGqU=4b2iooHWIYv$27+A;~jZ$%Jv8P
zP64lfus%7Rs}<{|&l_qdJo}~FufbDYXb)i?<|<L5GXy8QIfB*2*6fZG<XPQ#ovciK
z#o1N*nw7alt7P6X+=?}DsT$6lkx8saw8c<jJo%zTI@+4(MK3x7$I+3ENj3G^eQB=R
zEvUg4w@^i9%I#*3yv$m;M7~HReS|w-*h@U-_Li4d;H0JP#kPkyXBkiX6_c<^w!P(R
zKUkewvg_HrFlWO2G+)dX*&H%^u<9h^%Lcc&E@wCA<dP{#34upc&tY2nTwvb*_FQH=
zN^BdEXC<HD?AwH0g`gaKThN}1)EdRU3z3bhIG^y`l=8A;0?Up%%qWW&TS7m3+oDH#
zo?7I+VHKfleNpYQx|lC(Pi7Y@VQuj>jR8@#AkSXZY9(hlVk-)qpL1Xq@w|)9+}YhI
ztfg}2ZgM-uG7GPiaV#rev;NUL9`#nFd_FKO^~Zb+VG{FYM{L%Hy?;!@N1-pAQ+7|!
z=OAZ~QWjp5?4AlIoi!u+S;4m#yDJJuiTN-}b}!s_ROqqsEMzCjEo|119x2bwy+k|m
z+`_n0cFZT*W%=1>O?H<Q^3~+G`pWWq;f_NQ))>)-Jh$7&*JF$^-2rU3;})QJs)hRR
zD#m7u$Mc+VWyiX=F&XbuCO@-BxaS@b{MMH47ZIqZ8)h=R#Ltaz9~S~Y1NmHGDR_ny
ze3Bzz+qJGbh^+0Q=6ZBj#1$3lpu4k0FU&x4*3)hOTr1Rv*XEpn-NGx7eFw`VUyDaF
zGfzKJSBpP&H(R+R&r4c*e|N(>J73r=se#!;^M&6z>oKk);=Do|+m^WI`wHB1UG%9L
z+%*KQaS!Sm+BFy+dpKO%NE_TavU70v@a~b_TXrj5h99=ez&L7^+Q7`LI?PNJ8NSL4
zWw9DkN2xQ^#r}|glz)bQaUc{Jl~`Oq>f+GkQRVEDM_oK>@(iq9U7T2a@r=of74~fz
zjSuf1)rd8){&9^n$K$OW#;`orY*yJRJJo^yPBGS2tCg*7(=}kL-btn!xg9fbsanpd
zpOxjQy!VymvwMjx*saxRXbx6F<(VsqWImF3Pj^5IbOyQt-9atb8SDynhqO?q{dno`
zmK{a?6-Ucjsd|Qp<8GgGlHQqGkj*NYu3R3gy?hSZpCnW^(v|8=y%VeA<Ag18sTxjF
zYlWF)kxsg5D&oGBjccmoFdiesF_ZD-vtpF!CClQh!@W{w#rHz?4#?geQKE(Ps9`#!
z40sk}wu{**2Rmy(iNA{HN`pF$vnI-i6wf&Mi}Cd7%87D+<nX#rsh9aPn)sax%P(G6
zLrpo^sVdUjYr)>*86!VyWE_|2ToNg}0*h<1Bc(Y>lt-AadyyW`cR8;^JV|znTajrg
zJ5heOy11n);pH<=9%&yjvql~zXzgcc#&rsuiFnN-C7gdllz(w(RCqDy@H-OBLTC6j
zs8dGS#u`Th{b*E(rVLHSxF$qfzdXghVP*Kq3iqh;5poawo|DD%(UN<X(^_Y|+~3%u
z?4Bppd^eb|C3q=4ocUfFS#B}Ddfr7f@oz``-NyE+Fqic^NLNj$E7YxNTBp{fb%(WZ
zXSgfe9ns+VtX+}rs8&9Av@_Zj?T%@&&RAEhJFdk$<6ZIYgqG+`bS1j^7FVZpzFJOM
zSZ##pUtP<7*;cdZ6r(rfI~gR^<|Ec%<@?qn%;q;Lu;wM%njgnN9Z6O@J+5Rn@}Dx@
zzmWLe(8;z6sv9+Iv$CyOZ)?d~uXTj1cDr1CgiDz+-JYjX&9S|T#VY;KdlhIUz%4p?
zWN2jA<R2SZNi6!nKYAFb)L-UTYG#r@+v7-r_pa%jua4_|Bx}b%J>)n#%5-HR&gn|$
z3LQbJ>w(!Dx1bYnCRB>P)}mC=7S`mSUTI}=zw-OI7&ooVI80e6dY9rWnXT4%e21tM
zeC}}09$W3`*^j;UoTW9YFhbRhJ<luV;93*MPNvG8&s02`4riU_{5>adJxsa$^hu<g
zpVRk{Jq?v%=#yr(6wj9N%)3+^eyhx`ip#$bwEQ;9{>cMAKVTc;rz~rC*tcGluGv|>
zxVGlA%jAtcW#6~*YwwEj$)nU5;OFvEcCyiZmi+TPS@0@>JqJE#fIVpdt?YRk$dzu7
zU2$OfMBbj?YL(Ss*0GVp`ASy_h;mK2*-Uo&c0ADY`Jnhsx#gDy_{%rClZdxZSxQlw
zQ`YTG-`L~4v%WA!w!evf7+<R0ayDw;O0k}D5OcHs;iq!c@-4w6b0+i^W1V?(97$NK
z{H241M%qsCdQ++KtfnrkL97RP)bYOHZ+W>yoUDDa*{@%rg<7E&L~0)emdiZ;EDIYm
zS^JoUMvK=X=gfU#?>g+B8?o>5SXKx1h)H6l*fTbF?ENaO!CdSeOx`lvR=9oGHpXKt
z>SQl51KP{U<{YB8eS5O+==m|XQjS04#vZ|r%v6QlZq~5+*zDzN+;7-uIL!~rPyHj=
zO37X=r99?1xz_AsmXfZ%Apw6&*%z3rDN5F>0{jzBsWW2J%v02bm45~{M>2`GDYF_n
z9Bpa+CT-3nnf=9h<e4n4&Hm*j^X#ShV5QuPTdeOw&TW-Hn=_wX+a>4Rm00jsRptD!
z%~C$rn)o=#Ij3BBeuEI-b!0rfUoeVS)y?1J$YMktepix$yNa^5EAw=P9y7DNtPS*~
zyO8+%6}yfv#^BQzQ^jxI(2qT{hDL$+Tb!$0TRDdr*|RFd7}QoKqbIw6C<kZOcxH)D
z72@9+;#QEo*u7EQ%0{QR&!6OXi1B@>JV(!uWZQ?flGtzJ&F2fGt&ZZmwNr$7w4J<2
zU#U0qE9Z?{hce4(IlC-|>3X*N9ol?ta_6+pGdj=iytwn~&Ko-K=$sF~vYOU)M%US0
z7k6FVbwk%3UGwQTC2Zdn*KBqa^U1z#vHyl^ns$bEwsx_0wRVH%UrY$Y{ZS0{qs|Cj
z+ylIWN}Z8dJg9R}=g=;Arl#1siB~!Yk+sw}j7F`477v1Zw=gfXH0omD{LnhPrwiNT
z(&QNzg9M-D5sMkr84mkS&$yOlOqDzLNn&B=QO?_zETv0OtKU{QS175{rFQwd;rlB4
zi`p+kYZhDQ_WY2LtW2~imLK<df@<QezIaq89c3h$sE)G%zb&pGMJ^^<?ifdTdPA|H
za_7->y~Bx?tIx?!opj1;)sw$9pS9oQN7QP!%H(IJPER}L_hn-p<vt}@?M!AZS^LLi
zo?n!$d9ZD3Kb&N9zsgH=RnM8q?ltCl#W<O#XqWL${gCPD-49#Gb9n2!9Mf2}vP@<j
z?6>TwhTq!bb7|n$!e)<h5*(HJaS^i^)%C1;Z18JK)<%!Xi7D42vx_4Fnb^@4`%q2&
zO0gz<{!FnPejKZ;4yuNFqdT7wOzxi6eMa}$-4}OX-F-v%9o_T0hjb5yci=%?o58cM
zx9Z0C>XB8|Z}hd;@>s}$a?gnO{JPbAM+UmrcZz2e<}(_)pOIz+WHrCo`HQ$V+v#eO
z^;g35o<rkGvy~|6E1}pT%SUaCSFI|^AowVF7fJ87yOD*>B4OTPWyO~;FU1ive==jf
zLPbWd(w{D^-b`kh%q_`1<ywfR`9s@Z=$AZ3Y`M4btZrIU{Ulqcxk8K4F50WM`;^ki
z-@mL{=M2{Oak*@Yr*lQ)Nnun!?LQ_@5UM$^VX>4+HSXn;*JIXN+r+zQ%e`cEQD5-W
zqjdx=G98CXKi$H59D~n1a6BE_1;tTYB4tMnb{{6{d;8)eD1NqJpNXwG?Z4|adx-T_
z#nXPk-dV%&tPkTIz?@w^4%T+W{`Bzl?g+<5f|wg~kgv=x`pWp88mJ!?o*xu*2~Rlb
zl<ouU9RVwpZD;n2;L5%s>8aE-r>O6Y(g-kGtg+M_HszAFfZqk!ztO_{^h9U&yifbs
z+OL7h@>@qmw!ezG%{h4Qd5xr#ACqW=*t3tUt(TvtEW5di>LqqBfxUHn4jN^nN~u5W
zyBOK{uy0qHKSh_O=B-LC;B4%9=N0d~wO<Q@XGh9kPVI^<vKhs;81)h<?JM%km1&*Y
z7xm@0GJ0??&WTw#FSnb|uDG|H6UT>d58h|lcIQ@B0p`FLk4KKZxUQ(M5VW&+Ykla5
zI-*uP$<|SzD6(S)Y=!N4tTn1wq^u9-eS_(Y5{z0X7t{1+&8y-ZR*WxPb8UGJy|D-8
zV-W7k_`)@_6334E?0YDj_v~8>^yRPet&)emW!jc(n`2ev%l9_fe4<*&pI1{oM=d&0
zd(~JcjT7qun=S0<X01S0zv$!CF4LP^$2fb-e5@+rs6DJ1UnDzGa|LWmvHr8!L3f*(
z_X8ufu`1Vp=bCwrQe3(GGP|I2=s)Wl_MLi+l+94n@v`SX(Mr`=$|klUwni~Rt<)Bt
z`4!JGt)F@+s&eYI-An5+KaGdnQ$BC_oS_OG`e%MFA35779?x*0S!i>Rp6iNU=IYTx
z$5yKa<x2M#)_b<MVopAL@R)^HPsDc$^r-Y@u1a33)yFKGw+yz+s$+VyuajinE9{?a
zXs@Psb>2JfORch8yd^O=@!VRDV=eRctX#Qxv{S2g%Jxv!25v_@7o@!wY4ux`MoOgC
znoG%8MX8r$|1!C=Ua;0phN2*er%#}z&%BHAn7Q<rm*1!C@igYNh1eV>$!bMC?u%q+
zl*w#u@43BAvj!u~`Ro$TB<o8uo+cM-D=1etLSh{(HCBOIT$}SViS7BgCO_oq_|9_B
zy1M#htx<of>lM#rzHU^m9;(}k^1P)u96cNpoXzGJ8zph?HS@Ci#94uv*}Iri`_+vT
z+j2AqSgmZ!n(MYo?487_<uct@RqDP1?rr7tXSF3-xAp=&HU4>cZu|@I<oI>E*XbSt
zPtsY`xncKU4ewLOe>8p8{tH+3d?KgOanQr>zNSm(x`RLWwZ{z_N!H5mc4QHl%X;r5
z<tj&^E#Wn2@!(N#PYK*rGHAxo8L?4`#o{xAz>&{7A&Rrsrwo~&IV9%7`wq-jt}!g8
zrxg`#hVHQ$3ygbMAe#9wItsFnGM;V}GM;cW3Z8LffVb1r0^Av+8ttP7dpgqS?_ho}
z2k%mKT-og|*|)_O%Ej|1e#trWk(c&QIThO_UgnAWHNC6Jjx!XCv{e0Q=lQKiIJB0I
z$J{&~IX)ZdctPLk<Mn;nOIpA2?-*TEv?*Q3YR5W#OCj$WZ$oZpTC9rIDs7)90Y5~k
zTqSL?=P1jbFvQNSdd80zVE%^5S>h39&hmXxx$l#}jxXMhym!<Fdk<stv2Sb2$SBP!
znmuxgzl#&!Q^g!u4MZt3hK*7di-unD@=>sB%O|IvSnq{lGVO1r^OSqf#%NX><7C;W
zcB_r_r74ec_TxUt$^1~y?%2j}YZy@1n-?8#oTzL+XTGd8r#P!#tj%hZ$>qKQmc^KL
zVvBa3eC?LXG_<G5C}xo9?K*o~R99(=aiu-%R{q|{Y~pc;W)V?qr5It>+4DPVDAL)(
zY+?TL_dWZFnKYHYZ<vBa!CXl>NsKi3N<QmzAG{O8oWiq(=S=A}IN5$E(^dbzMZfCh
z?_H(1Qu)ns;=3WYl!|w<@#xAq_C#Oyu1srAu_fz0qI?{%a%=TgnJRIrne?I`ZxJ^-
zc@VW~oLZ!ea*Ek_CeAS}wkztGw>%TmQgxNkQhA(g<?@Pg_S(xuqdg~_m5JF(@#dIH
zS~2^W<4d)K|8g(d&3Wt+^R>pXXYt972NoR+Asvn76vw#KOCIH<rQ@fQ9rffx)UH7b
z)AG+rrE0YI(XO#qgc-S3+$O{;rY%KU85OG&?V`RkkCm``#Hx4<oew)v?kVG(&i=Wt
zQ(n|p^0Lf3<9&_d6xg2SUb6FErel$OOCe{j7CoHfWmlQ))i}jdyQTVP{hvafi~nO`
z>G*Q><LAdx8R$C%b``~ZErnfs;5FIj0{*t1+mYk-FpkS+KaxZ{1{?puYWhzk8b?O$
z<4=2y*^ke?(!FQDJE0uCq4tU_8hfAcduI9`c5?TW&XYRrKCT+}gb`OBZIinucU#gH
zMf!g=>m8_-{5BAO2~hI4gEjbz1aWKlyU&JS|4oD6XAJ5bT)YF!Uc1=8a`nl3C1}gt
z<13p<q^pGTd5VpSGgyq~^OSsq5{)P(vv~5s3@nmqNN=SS#e8`buRvy@EZmDY?oApy
z<@Gb07$frbNb+YH=-t>#DZf>3mCJoTEo1jcpD_-f?mBJf3)YsIOm!ladsLzovzYlx
zqGdjm#cm@Dqi8Sn65~txIoZVc%6b0egvw*clT|{JotCy!KT3~^eOpr;QG2`Qj8;3v
z5w+T7GWyE&sH2z2lTM`Klf)S>TAlM#UZ?h{0%yD2Vs723edZ<4Ak$(Vddcjf4*f(~
z<V)os8>3>BGw<9I#mLS-cwgX1+qb7t_U0Ll@UCQ_FR}3b>vYP~duo0bE9NQpJl0Zn
zbzvoy^!9t>-o^DUiuzG1y5g;8p4V2%m<iOLotAz2CS3{cEv09rSnH}(HlO#~rE+=t
z@=PZo_n3*}*Mge`T3U7tjnJ?4G%Aaf7nL`a50qb2w;EIvYF=$pJJdDRb=8g3E!1t*
zUDUnR@#+!k6!j$aO!XY~5_OJxqdHH$UtORsQeRZxR6kHZRadA#!-FdW{<uHqZ}hkN
z2l@y3hxs@4kM@u8@9rPxpWvV5KhA%OzsrA~|1$qI{+s=G`5*K@;qPue$^WwdZU0C9
z<!#;lA8L<fH_mRJ-6p%9{~P~L{=WkLKrE06)CF1t0|RRZ)(>m~|L3x8V3)w&f$@PO
z0#gFh0%rtf2QCa;8MrQROW^LnLxCr=j|7$kUJ1MtSQ_{u@O|L-peq<qmIvd(T(D7D
z-mt9Ut6=}&8o{B#5y8!s<xS@|?$@|S%fDML&F&T4CcAUPk$|JKQ?tis56@1_9@#jk
zaY%4ySoR9;7d)hKKyVW9Q-UW2&unaIYzdyzczojt72v4gC5?wP9uk}ryfHX0cz<v~
z)6B*Vf{TJL2H$MltZ}R02aP)fm$!BVzYP8m{3E1<Ld`FPlA(O_uuxO$`=O4|nxS<=
z8-=zAZQIhnWngF*X!@6yZ(4r~?cK5<G(L1h%X^_Iq2oi-L$jJUZEk5E)I6a1mgZ}l
ze{LC-ot~YQy&`)-_S)>-fO|t1WDg8o5}E_+8$<I#_ot6aACkT`v>>!7eL?Eo(2MEm
z=~?Ny*;_(yrXNl}nO>6FKC@e9-^{_8Ntt6aCue4)UrE1{{!jXY#@c=l_FK>rNdG7G
zW9rZBbJ>@(uVvp!Uy)s!U7B8=z9;=<`iJx%86^|RWHNP`)_#kc(=A7~KARbsSv#|S
zW|Q>sna+MM_Iso8w8qm#^n0g>r9eOL_ievl4f#)8H~V0zZHc#xORMc8+dJF0Z~v|N
zvF5v*=eOjVry@chG@lw;-uy;rMd)YErMX&z%}2IONJrCIEzo#T<3(D$@hT22r`79;
z>{D7>!z^vJhMODiYIsl^qOIR>Lc?@zMB`b_E40nEZ5p0vSghw8-fDQS;ev)s8s-45
z(L3}t0c$n9)ObDMw#J(cdVS+PMS4@?eT|PcKHb>e_;OK$ewE-3!|QEh{eI)8jVP~Z
z{8@<o1M)(qCPmO08j$Z5blBR*MR}e<@3dIa1JD#`iUGZ`@diV_sYr`f<|C|cVtiA&
zDPQD@l|Y^*!H?zc2b#N@R^j@lwV=hpP3?w;)rB<-=N>Sg^P5ICZHbzu?R)fWWQ?pm
zx}wxHuxYoZeGUHu$kudd^X|>N>s#wPG)&NU)A!L2(ht>-(vR0q(Yy4s^z-%0^=tK8
z^j-A3^@sE)^ltrS{cZgteYw6&|3?2M=gtLliCn&60z^;DHRf6yCgcX>2IYq3HqDLB
zjnN;^?Vj5=cW`b}Zi>FEzJq?LJ{vsu$xVgz_}nCngNRdeUAgmem*nQ;Zp_Wg&CflW
zdph@g?)BV%a-ZbB%<Tmphrsep?iYP_?ytN*AIrm3%R^fY6Y>Kv6VSEwh54cR4fO+|
zj&-5sS^3TKTjf5_@0cG8*8TH`=H>xC3cMy`4f$#L)Ah&mGxO)?FN0oh4Vr5p)7H6p
zpuJJQB!7od*>Cyz`N#6lfb|7^pZpv7_WV)#_wvi~U*&%U-Jb<D-<sR15X~P|NMa@V
zR~sf2^3cou3QhWQ;M*bRS(vFXpfCt5mlcK;HZE*l*e3U7Vdvbjg}wAE3kMVq%MU0V
zQ#he;T49EMN8wz3QsL6V9PC%&`ogXGHhos%p29<g1-W^JWMNU^#loBV4v=dMWPLj~
zrSK7W9#r_Ou%hsD;jbEhO$^3)Tw$G>OidkF4sMuG(^^<jGXVO2KFE*j2kSf64AK_>
ze^$+~nvKD}dCfLZ^Px36)$9q{<@p!#&w=&;eOApu`2jT(^OFlFgFL0?_?qc8Gxgbp
zeD2Gd^T2XRuDP&Beu@5h%~dtm*W8Bvthw7*KbZScp9s00fEsf(kLd^3JYDm=zP#oY
z@OVc*5bLN}TJr^r+kBW+mw<d|&3F1leN4@7wO;+eTCFw(GiHIlPi;+YbM2}yvJcj-
z4fEzp$Tzljo!a5GBlTIeoweK5?pnJ~!-U#{Y7c|;(X}VkPOqI+dtUC~+RJKTdxGv}
zm^t(G<+Uf(-T~R>>xb4pTKhEUpRawj_MO_L`i$DoYrn)%f;qh)cPz#r3Il3?0I%Qm
zo$I_%$E9@|jND~)@jAWmcEg0a2HogwT^qz5ST_(VUr@-w2p@_w2}bu3*kfRpK_1vQ
z@=NR10zYV@Zr%I<m`P*mhSyH3+qm$yKC$j!`k{4O)$IuS0WiB;YSz|g*Nx2`o4*0F
zomJanRKH8%tGa#a#^Ve|)E$vO1-D<_<hp5frvp8!?xMP@ppNVH!)g{l%ZGyQc3AGK
zdz3|B>vd1(X4gFreR#PrzYh8UI@mh;Wia25(%;m#t~;RaeSLY|r#0_EhDmk%6mrn^
zv2|b9{e=5h-5)h;8!-pgYy$hsrS)EYmcG1Rt550+>I?PtxheS<>f7p9%N<)k1h(80
zI<#NELH%a+TLRsoeh(O*uj}`tY8b7bkiV|}$a**yfX}J5C)UrbKfnHR;IFB_x&F@j
z2Vk_;tADKi8U2aE+x5@azgGV)jO74md#Ta(=NN}uqyD@4U-adL%kwXQ##Q%KL!cp^
zdq3ZutE-PfAExO0G(cY(8XNj!gn`u?hCtuP=(F{0^v4S;8a6;J?6I3QK)w3Y4Lj(U
zHSCUiSi`thcmJhLCp4Y9GNA3;bhNft>lH1}S+Gbuu;tX2sV%3qUeJ1hc6jrI7FWyc
zmUCNnZ~ac2tW9fvMmwWruy%IKvX<rA#jW|4J6rC@2e-9u*}AO;k6LNDNqbCtrnRZ{
z%+^_O`|umu``V}N!?hLtz5Ttdduu;8MjK;|@y0}BvN6?|{-5-}k@&wd3*e7~{o#<Z
zyl-guv2VzJ@jv{(Gy?j17Hp{ht2vymZ~nCT({#UdM>rWSg!^S~%FN5$pIMMulwBpe
zO6J_mrI{DAP1%0gwK8vJ-pee@e3khz^JiAg{5!mg-V|Odyk0h%O=t7rjl-jKw;s%X
zpZz7gU3k~<K7E@#4L`y;^tJlZTuW|T?%Lead`o^@{@VP~LQ7#>;o8E|nwFYzHCNZX
zU)xx_SMB+=FTh#GHg#v$EvXOJkB0ZeB@N-ww9sSlNo|BSO}kn9JUb^G4UIsAHw&MZ
zIUaCA_^G1i$H<TfT(yWyjXV_jJvuBpH8w2zP_iYtSMuuQ?aAe-c=GntW~m9O^HPg}
z`#HT%^7i!p>C4mig7jW&N&3h1AMtQzcwEmsf{1S!pB8^C^JnJIge$v2cJJ&5i4mZw
z3W;&7w%)FzzxOth#r-e-|L@}$n;M(h`!R_Ao><x^T-&GUrHO0%_U_mB=<q?|Bf?XZ
z<;|lJ;giB=hG#Zk-aIpWe)#h6)#0A{!nd@%7QQ?DP`{e+li|hT=fbZwzaM^2S>7+z
zPwl5Qj|ndee--{V{B!#$5m)=m5kLH6V`>#OQqz906_Mu1s*$xL>qj=k>LdS(jEZd6
zepzJK$UYz)6qy(~HgdAEyzS-4jL5nD*Na>lnG?COb#D84%JTL}k$J7-BlkxZL>5I}
zjJ%2Qt-G}D68S(`-ai#t-d~G+(=j;mOUJUPI||o4Iim57<D$7}W3;_vcy#sXkm&H}
z$mkZ)ZK6B3dE1oeUeN<ur?egsJuG@uyFYq-bb9p6w(r`0YWqBTPV|!Y2cvV8<<T3X
z^V+Y8-XC2MeLDJl^!4a}qD!M+M8EHURsV~kzsG#--R)1r!o0=y?_%j#E!6x```fXW
z*nqabVuNDCVw=FfQf?pHjr(=f#r9=V`(5of#}1B7icN`~gqqlyv01STIwJj-#IER2
z`ac<)+x~g%*4RCU?O|MZ{25yqdp7n`?5)@bv1PF@49oYipWzaJARdip<Ar!X)N#aD
ziLVu3CvJ><e6x-n;#;*0?-e$V@5r*U==j+FH5~E%d5eE97eA=unvQGYhqkU+0oDee
z^-X>o2-3*-(H-yg1@RO5Z(IWZVz&5c&Lh<EReZLyb>&;yBIOXjFn(qHx{jOUH^uLa
z-`Box`)=_^<4?z*cdn)5$N1}_wPRpMYy3a)PvT#}KK@bLNAVxq-j4r?9tpMo^;O~S
zj`N(6h$hkr*#8i4iU>$Fh;{t^e4?f8iT>Z4@IzuiV$H<R{(s1j7`C!&Y(EZ>*fg<4
zV%xsv?s!?iYl&S1Nwff;*gJ7x;_!~U5|a}rc3g%?z?^ToRzzZU)3u2Uo8~rM-gIlz
zT}=-ru53QP`TWFntjfe~iF@%{cH)u5Q&e};7fs(Ko@@Fs@mk`&#ImLpiLVkrCjM;t
zq3I8_G=1IlW7D5aUp9T;v?8fAJ<-(N^itECO;0sF*Ys-BJIP4X(*Dh5a9ICU`ybYS
ztz;%yM{V|nCR>vO#rWjl<nWFMlOvO(n6_h&<aWtjMGwX&$0qmf*e`jo-NH4=Ny*7v
zQkExAOrC0zXC}`VW$?JXy^A9W@ACc6>VJCj7PD7*DS3BCCV4;lB^M+g7yXlqlP@LT
zN`9F9Ecq>1e-UlSr`+vrDL*W+R5}IwY5%SJAJhND{;%}ksbggSJ^R1Yv1P}WsoPTb
zrXJ}yCG}M5xsF2^QY}Cyr3R$-?Gs+L*7NtuskK|SORe8Bre#cO!_>c0Tc>tvy{9$N
z`f%&Q)>~71LeCCLO-vn~Iw5r$^|EbH+b~!*ZX4B>Y1^)CSK#+)JE-l5wkd6Oz@O08
z+BTr=w6>Y;tF;eq*W1o(yR7Y+wwv1<z;;(^cIv{`PYrzD-UefSW$L=r$Nla?q?R!>
zj}wvliuC^!?YHXRh?~<Lt*@GqUbFuJ|0L4u_Wz<UNN?29T^{L?>5hLE{hCW7z2$$k
zz8yNcsz-W{jwe<YR*9|*r1$%;j#BwKvO}Z#Pom+^f3kIK`)@p2u_NOe{RTms>#me`
zNAw%nZ#Bp?8kY5pjNA3(-PPd6_8Zr4Lcg*74h89men%U+V_|)=!A<Ws%b*t+YkuTj
zIo0ue)pMIzDylw1H4$v=R_(WMu~jxYtM<F3C{F--3@k_Ylhrk%=v7UNPQGJTVy;#D
zt<1`-6_12UX`HM!E^oY2`@{3fIjrfw0k+>bXTIvc(yG|rfd6U><Am(y8ICi5<>I>P
z^O?`^{sHNYwg)->$+JtN?dq<!tbFfV`f`4|GGePg^IORgEA1?@cW0yNy;sJ$XJ4+7
zu8i1~(TBd|P@X|Z{<Zi!*I%w*0KZFYw*NTxUF*BjcZ%;|-!Z-;VSSqK2;cEQFYuk|
zo93J2JJxrg1T(>UmVqn5_YMI!`6|N^(BARB%Y6I!F819j;Cf$WIKp?X?@-@a(8GWF
z)ia`QPbK4R^Xc>+1|xrr_b3>VgT4EEcXG}3E^#gKo#kEIJKndCccS+y??}KNu2aGK
znRi#<!S3DAz+s+~IlLcmo;b74d!Z<MKk&Zoeb4)zXDWmDZO>GcQA2vt6+JGb2*U^b
zJtqTqGE#@-M96?Xhj<R)KJpl>hxv&9(Bd23S1H!}7;#9^!lEc6)V;JvQ*5&*uc-#1
zUaMc}K8Za&+_RnMM9)E<amK>96N{R$KpCch^+fO?X`JDYnuCnqQ2ar~Ok+J`iyXFv
zu_t;k2WB|PGa9UW8`4<dcP`>+&(WU4Vc~0|7dS4(<q+>v9&wpsY!mD|E|{HqMmm%a
zDCPv6{~5sh{&!7ryLoo-RIy;Zu{`5n=zq)qO7P~;G5**6FB%KTsFN+BBN1Acf!W$@
zpll5^d|dd1@TstzU~niM2l7csJ==MofNeAdz}LuaM=07!W}YN5%Du-@6l?>t50_X=
zTxPA|b`o{SOLO?U3D{%LbSqpJ0xtJ_YS0T^=K&_TCV0od`a<st*CpN+2%z7ghj(As
zRcL4MeD2-J`z0(pxhBFgAux$&Cm+`Y|1p4l;P*rOgqq7iJx)CVexY<aJU?`ndbWC=
zdZBtM{8s65^(u9)dV@Ma{kM8EtZ##5f;!PyBR9E+L+wQPUDMs_eV|349q|BYCa4dq
zj~Q_o%j3ysf_fC-31j_K;14T8y5=?`JTknYfsHkv7Sep`Vd`N)SE$Yjk^Lh3;Ntnp
z8$*h3H|~eR;}Nc{k~h=akNaNNVeWTblilwkz{gmCf6M!DIk;SA4<pB0?jpPol!N<q
zvj;`G--;aQejo6W`xU_Z?ic-Yf;R-`x*zvnX<CkOAL@2mF#bjNGr@tuRf7KxZ6Deu
zv<t4a6Sb)b|7qU4-50noh6O<sIR9xVdFR=1w@qXB;hLMhR@`ROSUo`YPxId9KFfVB
zEC`~&`KKAu@$O^Xl`hlV$4Y&VRQHG9=<THL6kQOwGjM0{^57-#Tf5_Nfw4GCx?r1D
zn@m^UXQul!_nGcfuvIG!?+;^tuCZVq<dI^8RWHh5_n!viL%Jf>cGGr7U3lN{UbF-+
z44zkNA-~9uk!?yX(NCiv#~+VBn!GA`xwya{w0-q3_RbyMn;IAe>wjerc5ky1ux0jO
zZ_<Ax=1*RjyfAUT%jI9a9KtQm9%|B#@KUDpq|~G*guEx~Un|_MO%Ja^#~GrY{=ET3
zXOHpJ8i;!$q%+gd1`LUFlCvTk7+62DzBb77eQ0QCFkl%+bPB=qO>(c?zS?llPw|J`
zL*485U?@lxAhHqQU%2-CD)U$OFeC6&;Mc&fP{|je<>4BR#Ma)79d6y7b|>7?;H=;*
zbys&Yw6GB@9Ys`7A9y#)>T<UgfjQcWi#eYdCwTY|^&iSJ0>3^;xJcnYqNrcrn{y9U
z{v*O2a7UF70Y$BQ1NR2V7qy@dtsh$7U9bad037T;IJACXgn{(}W~>A9I`CHxn*@dj
zK7^$g2%Ulmd|Cz{2PD9`$>OzjwDkb%7$C|dt|Jem=u`BAnZ>YaL=KpDfz4JTJ`YF`
zoM+zC%u@IU32qMe9=C-NKiV)aJTLrjz})bC;k&U0-Itx2of$uvA$Fdbf^;By#m*Km
zD|R7BxF9Z!UFdQpB30v%1ORg<LM~V44H?kNUb$V%U`%e09_&=uI=6pre~NXv3clRi
zW+X3BK6mfw-V@$$4mQE)Eov|tsdBp<@Q4nR1!dME=}}U?3T>nqEh(Qfpq8}^bRYLV
z>Z{ra)QK<UQ<9Whlv^OnE$;o?`zaqQAEVw|ZwI#N-W{+@4}g!plX)rgeD*ht3Vo}p
zA?TI+PY%@M3pGT!)y$bA(I4!Pxo2%;P=lcP7NNq+NDeFFk*YDKjZP;kqwe1fU|yqM
zZuK_V0eQmip8-Ear)Q1#XYS89<qy^6UIy8|77;qo{Wa+rRUVN8M%`p#vZ%#&RIhuv
zdl`a1VuC$z(P$g>Z=;|43tT(D+{;7zg}x3!ZLob?>_}V}GCqUw4C#-v9of}k8GwK`
z*YI59xdtBkdb<fQdzg->^0XY#Gn0kMFmK)`J!VkX_S~qhfo<VhT_bvtk@p(Ubq2l8
zbDjDDa{QHR0>6PID^Ds<VrI{co*SbV6{D~A*l|VZqxkzA6faVBh-W_ZZ9WIHGP!7Z
z5Pk54T3i#yb;OCDJf~;Ab`fPnPZ)z?o;z{z+{t9*koVk!P&Y(v<Su4oYjs^wB3}E@
zyNV6%UO?#4&}lt5Gjtk7xLm0}JqtWfdY;tXo@Y&fXYDhYsPe2FF#2Z8Vw6+waxJ!&
z`yg_^Iue1cA)wzVZ(gJ$)up^D<kXGTja{zj*yz|a9K8yA=T1kh=V{N=(MzM38vG+3
z8&J<*`sm2LW@Oq^-+ET_td>32GsuKBA-AC+YO)HxHv5|BDQdC(&<~+QJ*%lTYCW!@
z#Z{q4AgT30VGVo}uM;^nr{=h(uw8C~2Wwi>vu5~{@F!^T4z$DN3Qq`6$Om|&nai$~
z`oS~XGh2VtbEyfipD~%JvOosUY;_ex^bGKWJf7J=&jEC)@5SHE^z4V3H4y45@O%&f
z>FJ*HJ?BTyz-Wj&!;Z*V94s<&ZscMPm^m%*^q5vSXB=e1YJoKYf}ZugN3&`VC-~TP
zvfQY{Y-aCb{{Juv)_1TrSOZXk1?B$6(jVxX<cT!7#17PhcfUXba<Z4_oxVZsg!nh%
z>6#p4dfHjV^I;F(@%#s#7sS!2ZsmEw^O^)NdtUCz;PPzZ*#x#NEc%+r<C^itGgk09
zD*&{Rm3UER88Dh>0sC;zCTa`N_0$#){W|2a6^Pn`0Q_dK7q$1GCBG%;*0IBg8{rv|
zxG`~~zs^9RNbBJ9IMdYmdvs+u@+VpdY#mt`S%|IR%Rdw_*jNVpM*%m=(4cmxKWgYV
zg(ofjOI_h#ACP8<FH7u<DEeaj(7-qTp~ZX{Yv>HS0~h!TQOtl5EXUx$Hwc(_qXAn8
z_+H?*fcKn-0$XU8YL`YHjXWNC2!1zYApTMOBi1uqyKm)yGw*A-h4Jn?O2dD#2<-s>
z#n8i|4s#LDD9T)Cw`=1{+s)ayR4%S;yHK|XUZbexe7W|}UI8w^5lHNi*dbi6?d?Ac
zp3F6~h|7RK*M>9w5?~IOOB+`PduukZNVfJLTPf0$Fd}_82g-qLAm0n50&$Fn_*yCU
zh9`~f%`C~M%wTb}4&LpA+$^%dbG?*MAZIyG!3^MYUwMS!i-J%z_*n2UYL(OA1LYA)
zgc3Z$%mp8Ig3HA$a88mArOi=X^54%9xCi;bf*w2=co6tUg5JP<|KotW{Ezx?^<VG5
z!+(?iq0rBm#ec6IJUg^~gdL*Yzs$cZa6sT7{}+LA{^cNj?f=vNZQxmi|D)V{{vYfx
z#sBQD3R&SC81vYp15ZaT<1NIJm4iodE_88kk$gV+JdEFO1}+FOpk#2=f*}=kMV~)I
zfFAo<j0;@`I9Gz3LS=y&xEEzMQ|(DRV!2q3yaemh8Up><+7?MMNVNra#4^l7djxPz
zH3$z34}_=GTpc#fU$rZ=E8usf6(Tk=z6~xS;Ng;2#x@51#<(^kHj=}z>=-uz`w-tg
zwxJ!YcWiC9#*EK}<O9FW6|p(|PL~0+=u`4{Fz@H;0dGk0QVvk)Dh15%V24i&mA%3j
z0zM0W8U7{whKL-@eRvky%<$O~Tot}5JR>{{)>p;9<w)!u|2i=?F*g1+0x3#>afxx(
zYT{ooM7}6udBlY1b!MP7dQ0?1mM8Kx;3EUeA~qC#jLgxL1n^J~LZ-<Icn;k0yxQy$
zy#dCvxWv<D@XU;hA0Iz9etc{Ztf$3KiJulfGd?qZ7DzJz$0Cg_iJxn5C;?*6!!NgA
zjXf2=Aof%dZ@@uvt0X+)BpXO?m)=hA;;pzJwP2y!48e|3qScTEJ7z);aj|57RE#(H
zN8QhXk90Be_k2%Y{MP$j_6>Z`y4&5&EYK>}!m57-=)I8jUcg<fh8{cGaJkC>tN*#4
zz7*rZ+hk`sg#7O^drutpoV8E+?}vK^T*0k^+akihyMoC*7+m!NHVoc|IlLoX8}?u)
z*Lc@Xu6<p5z@1>jyc;vPhV@{KYk$`m*Iuq&;rM$FA^y4<m=&%8y`a1txIJ)t@b{1>
z<O%-85YC0)V~9S&{G8TsClbK_T==lap$xHK(tD@(CV#l&%m&v>fae*st+mm{GFsb&
zBl;mc=Kz-Y`tc3o8ze4G7*`irPHhKmJHTe(y#=ff;(&ANE2v%K;g65YA~8QPpT{Am
zJsV$c)|jQlZe`B8EobHCXq3$H)ywb<-l_p-+Y~dkha-)gPPJFgG=Zs=!zqWT51a!y
zAAnRq{$Rj?`2%65uBQyLErXPGKwHT&2>i_POha0d)(I{R8lM!@=hf$xlL5n(5kcWv
zwi4+bqFZMZS(sJIs^tM*vjLYnBf0}a{^z`L9xsk1yz?F${G>FLe!WHLt<YOAle(Nx
zoF8Yv6QWBZ_$9L=HCK;P?19pV{2;+^5z9A5_PnHt%`1)gG4W$!H^=Ud-Dco!iX)nv
zm^(}#p%2#w8P5%SL4Q_<C4U;=l)`TCBv!B&c3=zgxS%a>`TRop?6fd8cN_xqCg&yY
zN!$~Eg^sb2L$wDD%-80JhlGb{^R;^za_uZr>^%b?z!O?Nh%E(t5;J}N4L@8V9tb}W
zek}Z$wZ7<TMck9Q%4QoB9TZ*F4$&{#--O$vGPFjE->is{$VdCd;o+0L1Irb^44#g|
z(H>hHP?TZzeHL5A4ypqEQm^;m=j3Clx2#A$U<dbsYjm$z5xs&V@?7LOl!#KxoWgU6
z0N`OzzQ!2zigepy=%0zaj)?s`eq`+5JYQv8>?*+A*d?*cll3wro=vWuTs!eB;5EPt
ziI)M-Ci!)1p_zC$2dcRg@0Q6zsKp!o#b}h1x0ObEDg$`k0DJLpcnbAv@QmG_vmJhw
zOU}i1GO%rI+xRZAo^@>3*qHe4SZQo4JH#IN2QY{_k&pgV2`D1^eQ!Y-;NEcoq_tA_
zmIQ9`U#n(34W3pT@}PA9T;K1pAkSoR&Fu!)&%Ks=fU&IZ9xS7wLTPB90)EoI(Z14t
z1$?i4tbNY=0Du1dknerpySM~b1XqM!40Zb+E#e0s;v?TOAH2KxzVI#g{Rw#8*X_H%
zXL;QBxbJJgx5oNw@cY{Litk0=<J5+`4(hH8p6!NjDj1Klut<C5rruh6Pcl%Wg&Jsa
zd*52VMqh`o4c3Ew&AvLI8~KL%R`+cK+?Eoo@7n-85Zn7a-oJVe)=M!SHI>OM7OL)m
zIyN<W&;hZ(cz-YA7w<3N1AixBhJSklTY86hKK6VZx>63f^5tNW=_~bSe&xKeXR=mE
zSI$m;c8Zbg6}lJjP>*z1s7e&G+#j+)n<PVWZgOs>CDQ`mUjHSB{vgYkoJ%$Jj`s2-
z8&1um#<ikosJCGCM&T>I(kR`p^bV<oy#Zx~e@ZbxGN+kW5yAFKz@w6%RF2|Tnec@s
zj}P6^d%#|BtM)PjWhA+WzR<%7-%*n{WVp8Xz$~FTcJS<Q-{EnUfnqX~dk2b#r%#zc
zdZMW_ON0E(G<90;0U6+%E|Z?gu)a?QCq4OE?M!Bs<lidd-5!oKCTgymOUb3xfX5Nn
zw`e$Tw6sroE2X&;;J-&s&7FjRaWQChYgrU;Jv5U8wV|1~R0kHpa$-Env3)BCoZapf
z+ry01(7u4x!q=(6R&bk~OFvr);QMRv;~CP63E@Rm;EAw-*t)Ue{e0o4qVV9;YQgJ>
zMhb^i4;~L!J3p=t6q~*}eKkfREd}&1Wrr^h)<D3Sfw89iObcuLdI11-6D55)n*BEW
zE#?fbjp)g~xps>g*)z$;sCK)6JGDDC<33pKll+AMU$Vpf=j@eS(Ssk8Kc=2Z!W!@$
z**T3(s2nURwtsBAfElrhf$_1^EjTq+0fc%_ikXn|ln0MSF8LROS<9v5?;^Nf&c%jU
zA@_6Are{|Ir)ZedU6sHbpFV>l+YNXw`<!0OVD^M>@t(0m^vTcRVERI&5N97|^XI}d
z{VyvIF(2~z3-ZPtMpnHjN8juV;62J~2WW=?jAqa(wkPBB$07<_07hHwg-r@0%&>Y?
zE*H)(oKx`S|AolDWx~7GEZJAeLvN5F`(hEVXN$1rmdUvrD!_^y!_7GZvOG>Y{qwT;
zR2Sfs$Et^ab*lo_Xn4OmK)^u>f5IRCnLyt0AIjjjxDC0_;9uV^fq!}XBzFnr;WX`z
z9Tz(;_a)bGE_*KW$+F-P$R+-;L-a^CnJ^?-MB+cdtqWlCPD!}iBk_&|ZzeuOWPiw>
zl|3uhb3YEXkvg{$q(`J?rp`(kJ)}sY$wifc{LM6VM0vnnERJ6Jy8MpjjMYi$7ev7E
z`~_SXI7b>Yb+DU0f5KC8OJma%0RAC{qcz>1_aU{B9oz~P{F>f5rKjMEb*j+}^g<0$
zvz1HMNQx3Y^nU5xQg!KUO2>u4$P2td3#mf77P++W4LV3!)Uj8pE!7ObDvMF+ya?vS
zH56y2`9Bc_H(Qtl?^wqDZUr}TVEe5)K-98Azx+q}j|%-b;NGTw*mePagHUJ%fCqS@
z*J^+@^UDjX=D)~)orkNn`S<hho9l#_{smz>TCL^e%wd3sGxq@w%RG>oSj178qcY<&
z`@=uGPOwA&Ff$&mMC_~k^>O;g`p4zkC}mHtlR7><JiT7(6u>d5Q>?zJW9<-q;0f3z
zklrG7N9vCB77Q4Na_X+sU8n)e*6Goy>r?jwZUWqD;QsWRCGc9>Kqi<8V!reysX2fP
zQdgp6f2A(AL-c}wyLEu*<;*98QjCNj<>P{Dj?U!f`q<p%Vz#8$4$+=Jvou8CYIykX
z;Hr@|&K5J?^a5BONk2kAokzI{m1;;oD8c;n{PfcX=I5>wK~a^{>>LMNnFZ(}D?k_5
zBiYNSh18Z3j7nKR-d390K35|G?K${v1=nUUja_f{0%@TBJpq1Q^S%C)k!@gZU~cW)
zhWf9dfhD(w{)hgR{s-F3FZfSf8$=KNL^IH4)|8c|>WJGJjCkakcB+0S#7}``s@Q7f
zJp3QpFIgq4WPZu~p7}9rd#}$nW;f!<e3|*OC^dowkohF@S>`k6_Hr{yBXw=HFt?Rg
z>@a(jmI@caKeAn90IBiaMCk~#HUE14MYF~%<zKNw^vG;$1-!%9bY(SLWo{DzIYfCY
z_*cAbGh+aoXGUg5itQ7h>6BpOObM{a%ubnIGkcW>dS~u-23Ys7Seb0BsY*`a-~0qX
zG)QbM>Pzw2p&Tr4b|_pA04-Ysw>~TzWH-osfI9Ol^R^wLNA@NT$OjTzb8Q9O_1Ple
zm;onskO5>p1xpt5i7)scdmBW1;pnO{1tTa&VUitWtAu9nssMNB@HgMtTLJfG?=@%5
z?*iz^x8*l=0-Pl}+9Z}X$b~r#u(m*hy4~~p;D0mc8>MK@+fWd`hcj2rCH)=F%Q$@t
zeUoyK#W9_}S@O$jkv>Pv7k(b$lmo8oE@4PI9P88PFo-#;;d67#;@`Ov_e15kfvLl>
zeZB-_b>+|M4S1&X?IO6oQVu@gWi3eMZ$*G5RmkUWvO~<Bh*t|S8a^NF-WNdpE_P50
z@Xs}S=H~SUa2|J?9h4twN+}QYOGgN)0Ls=^@@>F-fDe){S#2mM->?I;FNpvdvs47$
zMz#JtQsnaY8+fRPKAJ~74!A475OA*@Vtn@gs_;;DA^P(Sg@dXE#ug5!6uc!fmsmj1
zcjF)*{YJ1pQVROcW>6%f$$<=sC!LTvJ6oq;q+gmFW{xB&w{C9T!pVRW5v1ibm#G{)
zs<&MJhg{N%!WosLe7m_N46x@GIZ+1fB1Gvt`3*|j(W+m8KrX)#uB|WqY6h#`da$ij
zraZErou#5=h2xRrXK75weUOv+8G0=pPp49e)I$vBsLG}M5oK^>-iE>;1ZyLIXk`#9
zV)5nHVuYP97hPD-9wTaUuQ~($oUNio%*goM$kMP!RHg~WDu*niIT}480kf{Ols>=;
z?5C_HxlTJ;J38Ei(0V>I$UWuS+%J_u9u1$2cBu?b@u6p`fjvw3rSizW-vg-DoFiCY
z0yRMaaI38#_3#)k)0flLLq3SbYG}<Vv)C#t=EO>PHK7h{pUakNO7%~y-Kd3HWL1&G
zDAp;$vBlCox3t4EVt%%5xDL6}?PysoE34L=Ln5&%Gva84$Aq^va^-?$kv_kOpA33Y
z`qK18fb&@ooYv`|2yjN+!^=3Q45ZH;CBbBgPUd$MWkH(PI7EGEK6AMUxB_I7WfJBy
z>zOQSd7F7pY2^NrfyMAF<+%K)avu65C$LEU78AJl(YkRw)(^LX+Jwx95bs2DcUJ((
z{a4m}`WX(mM`xI>+rV?^Cv#rT<<}~MJ@X8!=WUQ@G;8zEl}Dkr&;VZDc2KVTGlj$Z
z0{Fzl;x9EQTl0*U7DSElOh0NFDaPc+i-7Z?qRcohlip0>ymbHpGp0JMNH>T;AM-0S
ztcaU4h`E^?5c=Nam08!09@~)25aOL_ne%}?i*}-x_hX({Z|y5ES7J5;=SWi-WpTJ>
z+2nb+mU%L7>I;{U;|o^6BAHgSi9AIxUmnGKAhS>g?nNB;CXJm^?c_@oJw@Ig$uvA(
z&LyTNrpql%o7`UxijiBnmi&lv3+Kp&lxrC$+GKXCKg#H*Kd3(_`{YLX&_=wB7S^-E
z?1lNugViDPlhr2b^aXa%XHs(|l}r9+e{;kmhs(<#x7xMjZ>8~TO98!0*^}c-+Y_y&
z?eS}q<12@?c9b(GIRSn-Rve?g()dliKyzZ%#H!9MS919qGnkQ?K^g5o4j>DoiA@rl
zm^EezPXBvgwp1o1`X}Iz-WkL#n0k>(>31@x0-ne`p`Vk3N7@#qvb_1hxrY&A4ChnN
zrJiGcq%*RdYSj7>%T%;G9OvxEm+bBgx!=W}>F3BnKDmd9lhaDyW9hn(H49ZGqv%W3
z<<$IO1e0;(Sf-+k4+{nuKHt(97pCUFrFf*wN4kD22grZx@=`2vn9bsCY%|shwx9o&
zZAHEYTTlC#1M_m^hvtV`N1%EckB7O93+uS}BhhV~^0FgdfM*lE;0gxA=HLDHPSX6P
zQ8w#bR}udG{QKpPLAb(IpeLU47_{OH$rCCARwVU2J@t5UM&^V}CbNW)-7mXO_CQ?p
z)$}J3xorWP=Q>TxR#o)Uu|L80WQfC09pVL7%oPiJs|UvQ6^ZqF4{SUAVfw?ubUDzT
zO_xLI9_07yJuq`{-QJ^gW#z5L{*Molw1LOw*DnqE$d=af?5-I6XXgIi@$jFTH+YW&
zoZ$KqkRb#P@lJHz?Y-PP*Yyc-j{)Yo@ZUA}cdc-J>7DF4$~6+Oc@H{^T+Xd2@3<AW
z;+^4o%JqczbnmI&le`zY9`>H?J<qiWGR*SMLh5R&5OWi&AxuXHJZ205obBD*)#6<j
zxLH6qcb)D!+ra6>dG~U)fLAB1Pb%8bqXn>`cU^dP99SXpKG#5?+j=H>pEtZtVDX-<
zK|0+vgTcS2f5%XxmJRM3+&{R#YZVjPT^oCUbgiO(;@`%<3nI8va3?L!5M3O7Hu`M*
z`sA+3!;%w|6VqcePkFbp!?i~6smc&q7~CtkM-lr&MGRwtduWkxCp>dbiN1iq|3Y=G
z%~AY!)D2zhx{fQ3=-aM&t{Z}<`ws-b5gZYm5PSlb3Bk#s)kAG?d9XEjl-3G(4VHe|
zn;`FM%paUXW#Ia^ZOgGEe(^bX^t?Op;+mI=61_Ko#XBBntI3P|GY+4gXFNX-=G*hQ
zn1J~yALW@_%sH2O&S`M694_!R<$2HbstXq(H|!;X<eIDa6km@9t1??dir=j1y#(8C
zGV6oWcA?x(cG9CC@y1-h`5*wFUdTO|C*`JbH+-PK%$Hf6bjFzBR%7iN&qg%zn8vE7
z1w#wD_QwUZ;<h$2@GZ$WVQan-d?Ps7bz2d0sXD&Zus76F==IR+!STWIS}kmMi1AKv
zJpjvXWOt%)2s8owSc}E}7^7$OmSr$|bIB<`8%JXVpjN1O0;?KF1V<cuEp9K7*YaUk
z^3-BIw-t}AP+ekBVvy?rK#4IYo8*Y>5JmeKMVcw*;koEoA5Ry(?sFN4-xa?LG&ci^
zBOja?Jj`kF4za`Bs$JqW*lk!L8&y~rk1&kmvT?-u%=LkI<iQv=``OkqY%gI9%0>L!
zwG=c<0md9AJ<Vv8i#&TaXmO2MSa$LhTjo0AyqB;DF@G`lOJKW%j-572dlnp94S#`B
zZZoBNiIUYKv!gZZ4YgsTmKd9za+jd8cDU{hj1-Oywxd2gQ>*u=gC|)L2EcQ=dV%1O
z(!lDxYglT8HiI)lkLSkZ#`HWXi=LQOEft=q1+B1WjUg?UNAwYSiUVEz{?f>eDQs36
zMnyu#VujeAxS)sK%j(0bWb46IZmZQHzZvCcO}W`%&NmqPAOfoQ2EAe2#-#vN;kM#H
z30p=Dr_77Vv?e?ErC9Wk@hl6=Tx=1yUr+1iD3+h)D!=CSnp<X(tTo`x^CdT?^xhL3
z0`o+iDa4DjMaGkkD8&&aeeY>;{CdW&cQQUbuWu0NTxnk3&K&m~<s0Q2&mVBPt;P=b
zWsyB2yT_j)q+W@4#5=;T0%Ew1Z>0RB{N%new59uc6XuvCuqpE$aHmE8pdky|#CGw8
z%CGJ@?kf@49^m^Tg|->gH=<v~7rL)i_fq#&UQ=F+Z<N?Bv7K^{8KwUn$gtkz?m_UX
z;8ofo+96)Ac6j1y1poJ;UUKZY?0jv0D*eKq=dqKA#qRMT_%k*=?!H5O2B*i*TIln7
zH_r~9Lp%rAmXkeGdvqd?{$dQ-h+;0Q59JqqkSCca`5`48QpzW`YxPAxaS`oSo^o6D
zD2q1Y4*)&laP_muk${<zBfT%l;W?VYyT}gl38<!8#k#BDBga53#l`*~eTgmXI<qFR
zS$1%CaO47Y70+z=Y#p~keW{2g>Jnv=az+u;eUB=K1WrT*-wyr~{4sEmSM?675bMJA
zqP}8VZ+S?r3z@DImAT%6p8`wb6K|goT;$VzQJ>~Z_|kA$BVa=Tw0(rSNL>WaJKa;j
zF22gp49`lf^Zm;=3Z9s{yMP^im4U@?6kOsPpd6qaq#W+M3x4Q&1^iI=8s%!`M&&wX
zoU*sEj8%4nZXT{66_=xxsmh7U6s5Iy2)!G6HyrfctGo&CF|b4@MGucoN_~-9&X@G}
z>2G|`_}&8i40sNn(Q8|jbIQTDkR$XQgK`mp+j`Go&I*1WRQ?A<wMs4IVGFM9u-Y-A
z$1|BpW@O*8h&rXA0@RlDDQ&gpFYjI6qw<_9Gnchhl*{L5TZDPqz3m#Y6`9qpBMnmG
zc^1+T<(5jh(vfH_?ZMlr)Q?9XXO9xwv|G*5qEwA9#o_iNz7k5_M8*2KPM%4$i@e;s
zw3f$n&N+g7h>|DGUXm-J)*Kik)5&w0JyDWv0kaox!LFCLV%3`C%#v6=S%``@mXj<*
ztu3MKWaD~SpPl2(ZD1CjiQ8m4=4rK9WuAj^^6Jp$9EldP61C<fxtyJ<Ab+Bj#F39k
z885CWqe#UFQP2Bj*2*O3k+XV>)lkda2Q_jn>g^U5>7?g*t(?3a@?!Za&1(1KmD+9C
zhFNQtSPe2Aug-3@Ysgzpd4+PjTw84`<}57Q+H$oyOZi)Ko7*=_@;q{_xW&vKqQrU5
zQJbi-YsqS+RzIuEyqUI?jc1j6ak~>&K2GLg*V#4Z7SYapWLwZFTGWd?<)(}zS4zcP
zoadZ1535;jmusyVP_}!D8j-h0%d9e;J(6oge~~8-Q779<<j1J!%`I}RtnZ|gwZyVG
z<&w2l+SkcSdPYey=eKLQ9l6Tv<-E)}Ny4aVBklgyEaX9yT9Z?2wA{;FXJwf&liibP
z?0Vj=Y{rOI&J)M8agJ<A?OLvpabm12+HAMBz%$zYoHf=cCW~uXtTl@H$hER~v(6f4
zl|^r|5fyF7JL#SLD)V>tvd$W-rznejrIoT6T$`hLf9!g@hI<oN%BPf#;+-hQit*O*
z;c=oD*P1yeA1A%JZL7p`JIBiG<-E=Hnx%5F%wEn*%t^jP$!3<#68Sh&?l0qb9Jg{E
z<D4y`CwkF>oH@!YiE*WPiXvKRJ=~vj@^+ZLoR=6&zC=Y^b$n$RL@$vS+p_Advglii
zw{A7jw|q{shglLcS@&F-r%cCkI9sR<vj<5;$;(=WUFM!vj*XK&qt(wWbAQf>9&#=B
zklF29%<M%HQOYLDB2RWsxs`L=N}Swgug>l-k0d{$%&RhAim_5zH0oq}c`SJnB`+p(
zE$7I?PR%}C;+#Fkt|{eR%4W}G)nGI&R+~&N)tcRA*T{0(bz(*49A?QL$ux2=xmKRT
z?#ncGy*$2@)_H&7QRIWv-lko{BRMDcl52Ssa+Ug2>SxX=iy|FSb3Jy+*$*vbCCWAS
zOy=6;cC%L8BD@9BhqOo;FKT3-q7HfTC%rj~%!51`wZ=PJOM9B*Na8V^BbyVg#IyX!
zI%T)(SuUQ@seMr|^7f4Otz!1Uwn}A?*<?DFRkR>4%I0>RC3BpZLF9Qn)5>jDFRG}V
zH^te<MvVObiaQrLxvDDN@6%n?UHz)A>UW0#)k${<5FlWX$g=`L6j3r@c!)E$0)v7g
zh;Ts!4j~xufgp(B2n2a4>NO~W3TV)XNtB18<6LyE?cj_v&M<?6qo9EI`_|g8dUhw}
z@0#ydeg0>iwb$NfpZz+gPP$`uDY&g?cQ&_;{cBS=FSm`o>)FEb+7gFjB&Kd2q1NA7
zT)O%(!cj*qoy%AE>m6-$q%x<*Dd&1ltw(U@R2`{$-}yD$hBSekKP|OZca+=aN7b{^
zr*bcNsJ-6NIKRNNdp3&L$R1*o>ctPX#x30WxNT)r#?>S7&sv{GC77*T)sd?GnQP;c
z)uyhs)Jt8@R+}=;d9EqqD4J&Wl=VF-t=y}$#5wU;<D>3~+cu9>9e1w#A-blh-lw%$
zDMLOkrQ3!hfq1O)c;ncOkA!$JRmOEk>Ra7Wx2^Wl{a_8GDXNdVIF)Bduj-V+vmQ0_
zu8tJ@1rAg%wzJL6%X!cB>IZ)%=E5r&a&zRi)hU|qH%e7$uiSGHX{~?6dDPp^o?<qS
z#`!irQd<(ur8=+beWt5ttF<@sYLv6H$JbKxVx&r|^KG=%yj=<0R=q2aHHr}Xk}G4x
zsp2Cs$3E3u&##`XI-M)W?7p!_%(W5K;`&hV4b&(N?Ui1Ydm&w=oqLs*;MtfeQ&jHN
zPu18bKGKM*W4aouwpX4@9L;%dTibQ1xUCnh+FsA6o{iD!+v6N7nf|q@<`Sj8Pkn31
z(;au)aHKKS`qo<F)Zu6#cf8V4xu-r_8{tSGcbwZwYvrEHtNymJZ|#v<OLa`=p<B17
zUX`}WW7ToO{%n5L$E){4q~@iVEnS?tw!Y_*y3)t(Rc~E+YkPq^!mUdcliI_P;9t)c
zjw)69RPI&#hW+3dC>$l#+G9)1>RWx@l^!8>r9JEgs?3}A_*jS(+ntBo#$L)SUpN{l
z_H@?jZR``X^NVe+HY#m#S*wreeq6dn9<iNyyH9MNJtyZ;FUR_4<l;9!>f+AT+xfX|
z{j=fG+46M}YPa>yvDPcLXkLwTY<wh+qC8vfbB)!=ubzFjJgZBoG3rIC_N?CDmNb>V
zjra73J6^r5ZV5c@eB#p8v&F~jr)p#kDMQ>q;b<*2_iBDLjut#g&8~3pjMF=Ae$;uz
z+c>Yerw*xV)6`nx{A$_xyRGwZc~slo@!IX&J>#@Y<x(oUy=t#`pX~f}t7)r!bidNG
z(pH&5qd5P{WA*mt?iuH*say@$i(6@Pp0&BTBbEN#tM#3WEySx$PfM+JZaD|95FwB|
zT4`~6ZaZ7<!Oz9hE$xktReFZKYX7hwh~ByvY=J_oMii%w(*+I`V$`#RqmC-Q!c}$0
z!?w~h*sDqXoOjqdQvb@m>KIyIl|GewE=8p^?CF_=edoU|+s3JRr14SBLyynqRau_K
z-r>qL_6f0?`BWaO+zSz6s`iQZV~*2QawxsC$LV6$<FSA3Q5Pd@oB8Om#vYB2G{447
zCuw^-=C1rPDx_^qi?c1OP;$!do!z}f?YW)l_scHJ?w8$Pev<UF3|rNH)}}|Qe=ckE
z+co@e(l{*Jf=0iZeRYef`u!hW&t;F!zP9G`+U!xV&i%s}vG;4SuR6-w^=S1^=M|U1
z*|bz{?<kb<Xv9*Tko{2hnC$AVUpK1nx!MbhRQ=CZs{667A2-un<Jb4Y??1V&RW&PJ
z*N;0#JD#(8hTG1Z{A}y^Q)kvI*YQlp3-~~t2X`K<WcTa*`v3U2=VzHtJ}Ww2?D!o&
zokghBq84>-zwmbyT1c(=?%KIzyR^OOPObjU#B<pXzoE4AeJ$#S&L-+Pt>);*J1bR@
zy62P{|BB<YAI+^7-Ilw}(kF8_S<)l!=ce4I&adUZ607rT(DQ#5{c-!F<hJIvZhPw7
zS#{Kx>&qopcjkilOSYcKJ&`}j>Z<%zxzFZ4n?H#^q0c++yDQh3d(x^q_hcTP@O?7(
z_qoolj{J3fclX^bwv%%6Th!`YBOQ}Fq54?=K#lsVeYSJ|Z*nL7S#(}*n^fG78tZk+
zUC^T5pKDEPa(@n8zRgj#Jw<IfHAbUIjqGup=044j&K_sB^o@?k_L$=w$<2;c`d;3^
z*F|vK%2dtv;uJB@HI4JDpSHerTh7?Uub-w-{E(^{)lVI)ftp3pW5GAjwxkNajng+i
z5>nUF_NA(f6UT_T(rYezaq5`olD67Mdqbl>QSHrrm!sR(^QpDXHHYR=-BGu#&8NPF
zxd+wvnX5I#A<dSm%A@x06^-@huE<@{^-R|@+%{7~j}PVMs;lPg*({=4Pj376CRv&4
zifg-nb`5wP-gS7_>qPxs)N3MjRsB;x{#4)AezFW9=MZ~a<GYlNOB2p^VEaoxblT8q
z_zUh8f2%$IyX{T5GEK$budnkr;cJgqrf>e2?JIq2V>Pl=rfZ(Z4zvGd`dK_0m7<w_
zwlc-Xo5g8#EKWaHcCjYAyt<F<KC)|K+tqypbXRkQT(*;5(ba+mzP<f_t<I)Au&Z?)
zGN%}G^QtY)wxrt@U(IQ5DPpgfYfC$uMN>DAaY$G5<F$EgtA89Jqzx1wpDWL;)Z3az
zwSV<~T)Jk*V!wJkx3sZWe7=?T%J}iI$|LpnoWI-F_lm96p4I!#SMA|wAm=g5wrZvK
z?Xhon9onL5{<2bdrddPy%Y*UXE34)1CEfer?-JHg?_aBG({#PF`$v(MbT2{rmuh45
z75N7RdUp5PyJt@qwYa8lNpVf#zQTPqWv+LAKkRzE%YO2&&L7sdPv2g1N>?vdrS0Ob
z3nenQvwbR4&UMd4ovVMfAJbRc;{CNvkH((LYrCjg`&=!T+O&25-fsMx;F~jA-j8b9
z%uAK+sP|2M#ab0cp&ZgTR2;YWO|kMv<&V;c-S3TbT({H8?o{+XyVbq$GuYqK{g&>F
ztlr%1^xmE;8t88-?G55L&s~o)=eKm9-J;_2-yXiXyEV<SPHeu4#L>;Ism|ARv-}0`
zsuVx(snlRk6ZIai>dQOzEN&wHjo4TVdVbcoW8YBUu6@OxoqKj>3+_3(=ctxGr}wm`
z3wq|Nb9(COyq?xH*W4TVUDwl!)>QW9Iq!u$KiktpW7qcF*^0)lZWet`#~$c;p!bzM
z_=)YSbQ>&gzsYt}PixxR)0&>_X-V7u*W#;E^fv#OU)@~22SUTpFJj?u*x;|&<j=#;
z)AFZ7?`ovpH}t-t@1nl<HT;~>cShgYjX!p!=4a3R-|OF$E$&(P0#)3*u%WP_xc9)t
zvG50CR9oDvTRVSS%aXpP>OH^rTzsf=g)Z#9xK}<XHI)B@mc94gz3;*2T=~0P{M%d~
z=({rihx{LU*Y$p|j-KnSR*l!#^<&qMf4KM8R@e64*!wB}`G?-0TE0=X|Ij;EJ?kSf
z@-y<ew)fiJhg#I*y?+J`JTsdr+u7jLP4sUgi=b5_i^hI8d~NZl!g99YzBX0<wT@cc
zR=3@JUk`LyUs`yo@S~wi3O^`3R{Ub|^8^1Iy0`WdwLY#fqqeB+*{u_C7c=DkFk0Nw
z`xZi_zR`-$qCVB~zJ2ot_5ZZ^{^AAD`-|s^-e0_=c*)>52QGy!?whC5)odXLxj(;_
zLm%TlEjb)lyYo=LT;W@VZ}uJ6x2o>v*!-sa`>DRy5A0T{{F?llz9aiitedV;ygK%Q
zTLwNQpHB~bdgwm~c5614%<0&b=+Bi3R~RI3Y+TiMm%ew=x54TQeP765lRp7_x7Mn^
z9WsR@`fl#K8E<Qxgw#lvKLP%?LrANl1^SScdpo3J+xMdu^;BQ2{;_YHlwa?4Tb?TS
z&Eyw1SKoiMsOS6Y>*c=x&S&yT-ycQweYU}x?`%;c`EAp9o|-Q|ch2ve-xJ!q1u=a+
zy*0mo{;O8|TYg~RuLhP5EX}_a+OJl{tphty#jVAyl5&6Xr1!SVzOP)^u~GwLL;qB*
zk)c}UFKJEv&(+oM`l0-jBPSN;7ut&R>xuS4TVds_x*`9Y{%7*PvHJHs^_!vdhAtR6
zbL8d1lIH5~)#LirTmB`gu%y3Z@Q(uz4L&vaRL%QVwQpcGx9rg0nkM?GokT9uPBtd(
z{5bozZ8d7sG~@F|kEzh=(WA$Uq9Jr2d<sWW{d@E;bt>#d>7Mc&e!d<N_Rv@oO_;X+
zSGK0YzT2bz<GtS5-<r<tuc!09^*#Mi;VmlRQwwkFe>Ze-|AqY*(hh6A7>#X=?sB-c
zf6gkL0i9Vmv;SHl?w!$pOKU2e-G58rY^wh={hzVhTgYO6Z~r|l>g)a6ulxHS>i_n3
zYhyp8ouTrldo#Ycb8)c$Mf|MM@TE?5N5|&|P98XU^Z}~=@nGf1=|)hu?SIj!I8s%z
zKQ-UCN6#sqGrCywuk`0$KVtO%i9fl;3N?rO!K~gD3T6G8)va9RiLF@a-D8jADK1ns
zFKzq&7`|1Z#t)cxc~D`W7IkZ(C5^pE&0D6@J^ti<N%g1rCETGv!@G@K#O=@;(fjf9
z{Ueu+q@(+f?&m&*|87w)7f&m^T*RLpE+*Th(~6ZU6kF3&ajsfWToCy>=GJ{&q{ZG(
zk2qg<Jl-;DP<*5w2hTwD{L~hFDrn$u2maQVuyN{Hjtsn`zJ`8A#qkH;5$|m)54@u)
zUZ~wVC9EkE&XqRFb#W0Id<?8H77v^c;i#6GKWoz4vz)!unsV?l-D<>Pd4$HFv!`$7
z!Sdt7^7EYKJZgT{sg0_b_0v^bHBP8yJ??U?%!OXTv+`KeJ-G_vq4i%pOU1V76|T!E
zRcBHYyU}%XSD43#*ERIAS2;Q!N`dwhavvB7T%Vi=xABMG?wF<=z&{s5JuCO!vC8e>
zV}p-Lk8sz8b>Xj}ue-SX5!+a^U$Z!RT-*B>TT{7s(8%catN5XTYl|PM(iKH$;A*dH
zhu$^xuCe2XcktS27#iI=y0!Q~i~2^f1&y9ie7H3Y99sNs@%PYgi+_OrwfOHtFAW=N
z@YK<tkL_0c&sq(>ZRpOS&ko%-^!cIB4;(UZNbxsF-I{)b7{6hxO2Ot|i``Co<p4FY
zy&AqA8XNlefn6d^4g|&a8Xo+wXauMo6Jkr$r=-uhW7YO%`{xc&?-Vujo69kmf1|C;
zb3D7j9}NDW_AH0j*4pM|;q&cn*M$T3TUC626F=du<#`8<ZmPA;ZW(zS)yQvj_v$0V
zTQo(zp94Q_uAxk<fnPvB9{6FTS<*L;j-$V9Q7;Ts>e;IO%A+-VgZUOUG}xM!47R3y
z2Devx4N?bhlMWcH))9j(XlTLUsup$JU~4*iu)fY5gobvfEG-+_b7=3u_d;jL&$kbM
zdVI&h%bIIwzrl+JFB;k}h<k(SV9KBP%#wcA<5v#0rke+w>+c4kp~EVrHrQW1OX}va
zdGz)cb>Co1sy8OmHgvkG(Q&np?ml!@i~7(|Yr1NvHC;2*nywpaO}`)77P-8drExxP
z`}?{jTtC#BzBtsnzB2Ts*`f?@tgo@I(QBaV!kxaQpAWAK8p(&_!)qI9q$kqTBNZC@
z8TTbG=4Un5G4{~tbre!I{-O|ZtG^T5=KW?@dJe}b&UxMN+UQK>tcTaJ{GrB#)(-cp
zW%Qbg^!;HEaipGtr5=s+3?Bj=*n*h86}@M8u6p+{b$^xSn!1tSM}}L}$bUJF-WD|P
zib~Bbm$89H;=MHVU8}8Qe?2xm_S0&OJU@J6eT|e<qo<9YHvFt=WJMzlKQpp&<k;a~
z4nH^i+{g{XzZ(A4$ig}4h>_Qi9H|=q(@2}=7pvQ~-}k+F^qR2_*SE*I*n`=xoyGg>
zSm0Cn<Fi@neAkU{zyHIj>VIzZNBi<^L+v-^+h}Rw8BBP3Gxo^HycT8Kfol)jyj|$7
zX~lMKt%F`Cwy0Z2TGKa2TGO{iTGRJNTGKy{Y_Fagp`@RncXhbAl3VVpCF)QAGV(9j
z!%uiz=e?&!Thn2q&2`o2Rq)`aTCW|Y&S_CsjJ78EmR7$j-Tt5BXU<h)?JY{KtX^OH
z^Pw@(_`X!d5sbO<vGM=L@pvTM9v&WRO^1)QraQ)3(>-IY>BnO&X}oPVjs2;a#t&#w
zr;fL#Ik)sCJ>u-~T77i9HQg{?tDDDFcVT<$EZQ)>-I_NzZ*cr;E$S!Zt?8-pYW-u4
zrP?Ff4{u&<CsnPFD_6_2@0sxLw17r=Ml8a~wB?*^OZa&jf9Ste-aqS1SDTVB{5M^5
zh3D@)oCf}dwT~II(fVYNK2tD;X@yIHv#TPW4%{30Y%Z8~mloXNxn$ZRj_vu#-tTzJ
zwD(UouRI~KcCw3;Y~Eygti7<MbIAFWGNC-B%_ZaFlU@AM=1U{{rNO>sMX-aN|AHtE
z+1fKEQ_9%7${5&f8HA;r9jP&e(tPm&7dDp);seHS!Bu<bM*3)df?;=@n9U0^5~p)x
zQUYgrzQPM5`&0#6pR6e?(6V)I1TT#E*uc+wd!P52L>{gU2;1@qU#evj-VpIj;OvTs
zZJVKg_UvG1z3^OUN4?28lDDk#+}4SG>(jA$qh4$H<f8bwC}zoBcleN{o`pl1OPObV
z%u?12x%j0hW+^)ze4?_IqOvV;K1*=vvXiOAA#a&X<y^|fB$<`k2Zc}Gfc%URK4od(
zJJy$-Jv;K5^`4)!{!#x;kv_Z6jnnW++O8;>P1jG7+cL0cN>XOw>^|2SXV30)LtwoY
zZLIs3ti98qjV;XN=#O?~a@rn*ZJQA;MRxe}9K{aKMBEv%j|rbHXMZt@1LieC9N#|M
zI-f|)M)hge^OCk|xxjN#-bK#0on^LtMEFH*^U712Hj1B#>Ppy-X_<~RF)v;}RYrWr
zE67ou2-|uPw&&7GpH%Zz)_il!%Z`mXiK9M_dG5;AUwo#dPQ+e{{K4M86#0X_-JZLo
z1qXZN|DyVLNA=JhoqKn5zQVQ*2;1}RjeL|fzOePlV`OyWp<}ig<yF!*^PRYw_S)rb
z{jki+8q=}2k7=EV9qjFh6SL&Sn49%{#oyMCWAAV4gm#XxE^P^E$^B9N^hf6|Z0kqZ
zo_itkFVNrm2;24}jDEo~2-~y+^zUAnWjj}XMYbfoIWdnY4@TEc`1z9b3uWy)WH)}2
z3mF|B$R&(voFfLA*MgImGcVz-CogAt9P`{Ad;gc!f0*Z3(*7cB`_6DwKf?CB#-cH2
ztP^RsT$UV)_+#`hUM786c*|un{tLh4?On$6OyYQ4^3wL8tZhcv&V7z~UdmcO%Gx%B
zZM#yAd~6>SyX}L@QC_wWiruy!<tV;wOJcX}(6KKY+99un+I?E-BV2FHV;xTDxDCcw
zef`u5wfnJ4?6?+UkFLc$vTb|9_PXpGwWXb-_+TH?F=Or=#T2$Ng>B4*QCi1LyO3#}
zkL3jR$tYj2Z&$*$T}?*$3fp{zZOlc{xsVH)vb3v3QQKP-wY^1*Y1<Xpx3NW?Gv1DM
zb;0mo7AqpoBf4J7?7;C&*M6Cg(XM?tbBE-+LHvcYom^vN?&)QD?oG*GV_rFFW0`*w
z`%1CD960;Ra4y+z2+uHP#}1Py%aE*Rl!s-l)q5SwGgP8a?`@2e&2SCS``vKvz26IE
z=o=6AzMUdoK-M<a7u8$eZlOGVyG1^Gg|vBT1E>eg`>3;=$!uD|`-=if=GK$SxG%ui
z;u-e~o^fB`8S8e>X#dK(2D3cv;$WN~$k;gGVaM(o(I4}X&zH=x-P&c%Suki1CB(s4
zN5*;>qa~SjuIpjTCDya$nZVg{#H%8n4y@}*O}qJ7EkENwU*;Gt_O>Xmw#<G$ZCfW6
z#MY<dk4R(Lu7M>jc!{^a5V#b@B%|Mne@WLrmP0v9uC7ovyY4NRC1_WhpZz@R&8;z*
zmt)3MmT}B8?K0=;T&%2Ppk?)!aW5z1c|lmmaAh5Pm2r(&2Jr#2Z72_OKJ^@YWKOqs
znbVbR86+*(r`2&7K2KmRs%bF}=s(^wbfmrJ`2w%k&}e8^L!+|Jlr}Sjm?(*GN!q{O
zFDRo8bZ3n)=VG$V^_!p0C}XbQq&&hgYV*^*v<q)NmOOPk`cw}0u%2<R>bS6Zoih4n
zW{bq1x}AN0^V*a?53+4*oTXAW#3^Qt<(a^U>Fwxufu}w5e%#qRHvh`obDKjP@Dk^P
zvJH9OvP&UiZ!d+k=%+qT#@jjOY@V4fX~E^q|8#?}oMZa=!1tzPZ5#iT3H;BVkv3wn
zmvyWtv2T`ft&Mq6?$d=g>U~pL$Al95pk*18mGxfIvWx?kr-OfXL*Nb>!^NlL`JZ?@
z`f}OD&%JQ=fsPA0r-*;yg-*6Z;Zi1)r=)YA+O_SGIUc(Bn7u5sU+dgdmOlQ1`Mktj
ziTlj#?I)039|<gdR_q(KA6XXrDrr}l8Rn%t6fxRcud{;-o@ZF+>W}Lld}d5vWcU7P
zpWX)??5iUCwC6UoPv=i|{_IDdqd07<&c6_)Euh_c`<7k258J1+FLM5DKWM9RUX~><
z+g8P2_})~QbAeu$RocdEy-i|D-FPX-ZP>vNuMp01d?-K7d1_U$b7Q+HJS}xDy!mPI
z5q{CzvCfgT2mCj+o07AGt<M0)7L-}8g=5UEtMq<kFq1mQc*XM?=+yDb^CRjr#Io6#
zj#+-;myeZlf?1vlrq76$p_lnOW*d+(@WrQldA^RtpLxA}tg|y_1;c0c?Wq6E3nk{Y
z`gW;j>9fk(XN7Z_V7JejR^JW(LS~($y+``X+LUp=#&Tw6#Qrsj8MrO7w`EJ-$Hk|=
zi!a=(`99c*-m|6Di~3xRvAW9?uI0H{mUAcf+4Ef;tq+y;+IdDDdPW_3#=N=u8*DRr
zjaGkC%CBV*wsrE|$S$n*G{ZXAb+59n!&7-yfb}`*T-o|W&k)oOfBHoC&S`XSlDhRI
zeWLq|RMz~u{#TZK6O$NIGDCbO25w7BrGn>4Q^Ai|pDT=c<j&(t@Na8NCvZP2cJQR*
z4DC6!3tJ!I7rlKF&yFN*cjPZ@{e^>%_wSGL6}CQL?^B?UwS!~(u95u|$AfL@lq<jR
zQZ3tXl$WrL>G-Xv2e6MbM*o*SAm;_1bUZIA&(2XyVH*?d%ejy~w*G}}od{chu+Mig
ziYaV;9J8E@=wr(Uo-`9$PT^ob)%xUarq7tvL+)Elt1-z_jvu9uUhCY?0{7k!@uxzZ
z0@|2sSC*w+DeE~ZZ@zvKWmeXF$97~|%Tp2W5%FFT?;Y_gBVIw)yvB}*>_<hsI^yYw
zPmcJsh)*Z$^%@hl@!uKQ&y4u&h|eY4^SUsyUlQ@95wDGS9oeS6Dzby8>~)!XupPW*
z(d6mbWYqwD^qQXdAX&?K;u9flnhEVHMIUr+EJgqFjP~pq?bb8en=&53%X)_ED6p<4
zalZiGCBtJF+dY>f#@f%@F|K;X+Rrh^Qpfy`!}0SWP9YQg3z?1T&$R^CqV$*NEw7#`
zD`#-+lsP{0IRouvK8JM7G1)Q4Pq5tMBv(s(aKZ3j&J_H;PtL9ZUV1L`u;Z88Gr!0s
z2IGv@zp{=$;9c0)*!~^!`YLN*bIkVUnAcHx$}IM5uLWaXJz+LpKl!#UluzpaEMqWB
z`fG&sl>E!!J592?Mvi$MmAM|y2(y0h>@G{Y+`FMp$TIhp)PD&oWy@sR274Q0KCgEF
z{Rr)h!}<ib!w2{2!dc!YuGG9b=u@5&dydR!jPQ4yc#eJWJP`Jt=v>GJwmoZ?=UrsB
zjhwYhd@WB;RJI=Y6*7}4)5^U$@4FrIz8mbG{W4$N=W085Z0k_$y=5r_*_A;!t7RB<
zZIx-+R$uzSRGG~3bX}%t$rF}wtdLnLWs|;U%ciV#B5cbkJQmq)eTtpW4G>Q`_R;zj
zJMaCS55Efl@4ybR>0xO<c-CjkT0IwX$J$j=W^!R|IpX^r=e$49{ZjN(#^gDsdM&_R
zo^h<O_Fg&P`OM2+)A_8cUA3-+F|RR>WvRpYOl#|EM=2-98Q6p`$Jk;yS-bKC;iwFy
zh$o_aCz$Wj>m|N0pTQ!I;}vA4<=Enw>oLbmBes13Ey|$%OL@oz$Ba`}{{={2SUD;6
zupp)X#O2elP0`23@#8J*%4LZu<J)45vpC9YaTI@X6o1c2#OL!;*pwws_EjvKUeoNs
zH7wURdobhZ^~$b+58gwVkN(uREVOfuMbIkN$*QcB;c4MwrVZD3hWV}%=31T1bvW+V
zl<j?)*zJ88cvs|QR%+T^qnO|>vqH{&^`|o?wei7;%S+e%nr|BQJ7w*6%6uN)YruH+
z^|11M=Cy0Y)<^8%q&G3hN!Q+B^qi9E#kdU~b?Y?cNz?TKXP-31h{q%5`c3?=D4Fjl
z@4z_gHRcZO8z)R^c>q5A9vuGj>9ec)3)?tgUAw|(f<9aiJLY_(tn&+a0e#A92Tz(+
zo~N80Yc^ds!e8dNlKKeSnBYm9m##TA-?0AdwQEAoeV!j7r>M76WbFz@`IY-{{bgLj
zye4el+aa@Uusu88Tr!De`M!^g_F3Ap&kb2Jt|`Ck3_K;=#cQ3Shr&l0V<xyy>}X?P
z|2?T^JW~bl#4@ZcNf~yE{QX*@FSK)%Ej)j4%=^$jv?NYmyryK_$H`h$S=XiDgmue$
z%fp>@@*TX(WVy6yLYd{slu%%9@ySkmmiLIPy%hOKUD1y6OZ|98{g5Z|;j?tlrHC&L
z%ypgf;dd66eO`!D$^?IT|HS$5+C?mBmtf4{+5`4Bo(p2;$gF3M!;ZPe1It>1^QLE9
zN5`BWJ*&N!aX5y<j_>H@{TX42ul~ADP=7z4!e1C|sUPgeYVdAM%lQtxd&Em3-Xm~!
ze;HR-rtr^RF7+&RtLwTUsq>|B9XI27b>1lBc^z1vb7rJIm9_p?ssD^=&-1yNKQE5A
zi786i{Md^+*Jo20hYODRoC++@n!53P$uXYE)5nj=c{~eZnTKZRzxqMcVcQEO`mg>W
zSjJ?s&o?m%iX+b}@?h7_EtjNiCuTQ}MI7s32cP12_s9<R_9c-W_mVCx?mg`|na7yp
z#>{*&CinQf=SB5uU6o9mvaXHEoYzWt22Mu#rC*SFzU(`e+ai{B4!g8fYZvCTYuZ^4
zoYToE;_$sDaE5laXRx$kuJOQrT=I-|2zJk!$l5;DUs-*GZ5&~K7q9;E-FiOaesDjp
z7sm>6R387F3U+zNgYQ3p{W}j}zfJ~Azp(jgf6=mm@!e3w=sPTf*x8T33z#q0MPU5&
z^(<`5wikWazu>c!J}XO7=B2z|E3oFIool(WmUC$ob1D1U%6n7#>>b6~hiSQ9g?*pM
z{)&i~kyl_n0H1x4udJ8I!KY(_<ykA`>6jEQ)4xO3Y}T$U_VE33!Q|zg1kPmzh-sCz
zFUO2=0N=v-KHle;&+y5UNULoxJWGe&J<~=T@Z4Uo&lpQmpW%69A$m5btoOOfdY=oH
zXLr(%aGTA3$Mpd0c%J6{F{e)&u5(~tN*}H<lqW6gGa~l=f?FG4JwSGSwvdc{ROUX|
zi#$Jjj*i(jl=(hDMi|#c`Yi3PPCU=3Kka;%(%E}U5tjq+7<{CUTYs6$9CPdix3O&e
zewoa+!Mb(KzE5U5%-oxjrSDsNC)2W>z^<%iP~M<+X>aI9^btmXC%bvXv&MJ#*Yr_V
ze_{4J*!}%AIV!WTEt|}hIn7s?_dD<xwsAOzO51~7*w&|xOX}~(DEcrjzJui0#^L)~
zrdQ9`k0<c)<B4ZI7qKI4UhVqs5ZJ$a1D1Z5StWJ2UsTWgajZx&R={UJsZTBEa$zl-
zvgXBmC3lUK^%}h@s{j4zv$7<4?eE4S#NVGW%NqXx`W&8$&jD`ig3kf;;W#5a<N3fS
zt?=fBa_tU692tw?e~^?};%C=QB7Sd~ak3wY_&RV$Cyv4XW8SanH45*y6y4Z@amMqy
zh@TC-WtW%>-k)O;)3Q!BuT2BrtIYCnjG~Y5jIg^OOknrl(}CUC)n2sU<7C8Nzfa-X
zuV~U&`EyTnUBPFhMP*r6fZN;{1@3WU6gbayi1n9edVKx{yL^uj^HR0%=hhhTc~vD(
z%31~X{oPone2R>9#UzL4x-Kt{dnH-V7iHW7b9_t2PNkh=X)#F=U)MQ9tTTQ}m>Yz3
ztwP4R%UI_b>vm<#xu_qqt8>dTj)DF7;2G`QF~8#mYoAs2^FHj-?>HuS*0f^hT<`3K
z$j)`Rv*R5?&o(bf%Xd-W!)Fm@Wm(QwdB$_W+1Ymv{oxJb@A?|kT3$hB+c@;g8q;z@
zJKN{Vl_}F6FL{+DKDlr>)@-!9zDZ_U_Fu=Z@r<_xJa-vqm-rZm;r}Ma=QA`i<D}~U
zCi?KX3hXC|kCuTf{hId3|J2BSYOvd99g^06&xn|5bnc#$p+x$K^b6%lX@_8G^K5%y
z%;OXC9R&Db*PbJOtFq4Hj#p{g<JrGB*AFEr(w<@t{oUmBFzNvJt#YqQ=J~Qcd!7l*
zamm?-JZqb$-94`+PvYa^2$waj@TC#Y1kOf2oV#5dt_K`*{Io3Ve9O{zJcsylKdW}U
zg^24*UV`h`i|Y$+<N0!JVA;iybpqG_wDX#lBIf)HyS!I#&(XhQPdokD2R&PVv7;ZU
zJuCMYVE=uzvbXy_4!fVD9kc&}eSi0?d8s|}Vc&N?aazvx&dz7ojyWcHj_jP%ogLio
znBxO@9_!QAiLk9(`99s&r~hsp{{C4sSe`j&Q@Iv+wyf`e(#~-M->WjdfBqbJs;r!i
ze6oCIMSoduaJ&V}`rnpqQm%#CbsbWYe3i=)Yunf*Y6FMz99PbW&!KLtLwvB_<B;iJ
zK1}izKJ-atH@?B=Xg7|L#b3*FbmVgk@{(~CKF37<V4v49QQBjov?oVtPma=_9Qg}#
zY(#u;myDU@IF7LPm$x%5$4U5{5%D`&Cu>VmC-02x?~3w$SClVU$7jR=_qlxE73F(o
z6!T1;FV}?dKQoH|?kGOk*U7u1yxtwfJUj9SJOAwUlPrIk<?q0IK9F#k<Cxr23>#$~
zm-JqbYo1}ZUMdOuXY8>1_0n*(MjAG$Jg?@nZpVC%4UXDmdbTfrqH8DK(+ykZeVJpf
zk(4K7y`-#jhi9x|99w_C?t<MvCnvl4MOp6|!Tw$nEbm=#J_5`0ZNBs1n9sVEr{rA-
zWqoc8mUlC3T70iPA!{nw4|Q`H_~=U3ISck<B0D&??;-OVe9oj#s$~P~It})BlR5W+
z@t(j$#LnJzja&N-C%vCye61^GmU+a4`Oz`QH_y|7`F~EG9nVqQ$!udBf52^Q+m<ur
z?6lbR{t;s@e3UV+f@MzOdd#!h<^NA{UWQ%%{}lc&Mw!g^!|@iZ@5?RB27X1h1iPOj
zz<%r{vtMw$Rn~FUF~?Oh<FgGbcRA*FUTsI<d|+QpAFjc`{(g!~JMX8!N02$5c)l#~
zrH2W>f%UU;M*PV#9>V_(?8{tdDr;XRGbY!TWY_n>Cq#Mqbsg-dGydU-MRwzZGRmpv
z3p-ir_H_B4OUr*c;~%~@W!iJ1v|wKza0cy7(w@UI*g82UD%*Qm29BSILzZ<WIV$tH
z;!_qMvhz7N@;N_>b3V(!F%xmlk9{mBw6hFrS4#QMPmM8`<M}7-?~CHRFG_n+WWOk~
zUmV%V1$!<R$3BwRq~vu8{cW9-3y$e;+r}lFBLd^QMXmEoI%mAk8pc^!k~$%~wy}nB
zY(1}u>KU!e`&<_JTo(CU&X~6RmxuCa%Vh0S*+V%;Xur$8nb%kQUG}Y!&nXd~7O~8O
zHqH%`$ct;*5tIE1^Uaime--iX0(T^29dkO+f4j`I^pX5fh_BBo`Q6ZneQwGBLlH5?
zBK6TR%5$IE6O$Qc-=Q7vq6}xmKFPA#n8Gs}pUieY;+|2=Ft1feYxwRi(%R<<k~TbB
zfW2tHYeqW^b0t{EE4;f49tv^%`=Thn-cOYlvYcT)1xI~9ML%`zBn|y8;e4v|<49sU
z$(%17U#*OHv?gS3f*q{y2!Z{42Y!Q_N0fCw0-sJh#tp^<$M#8QKPO5H);S3N=hJS>
z1NLPD>s$t(i#bnOAF%fadw;y==F1@OyxH=s3FYZ3lew-KNxD`<e0ao1M*RASS4I5B
zh>wf-Zz6t2;5^n6F5eV&sP~~GNs78UMd}A%CrkTbU+_E=m~*AGcbv6vN|rWh{e`VR
znfH&@r(|Qcv0V+Re;eBg@9E&<@7+9Oo(0R?%J)ymk-vX73%kD;^Q>vb&igNC=RK5T
z-Zz2m{ZV!r?Efz$co&v4vr)>w3-jf;0sDcpuPlrG5aE)tn|I)I2>p5A0bW6$wKL*F
zE;wf2U4uE4K5o7sGwmA8p`O33?B)yD-^e&CHQzVVpW`j;e(W8y;|#|Q#~5?^ly#hO
z%yDMSjvMN)V~Aca%Tj)2mfQJroFPvd9X~x=f7-3TU!TLrug}3cem*TRN2H$de*0K>
zN4<T_=sV$B|H>SH#u7W8JTf^A_UmeJH~S#p!2tVbn_zi2gZ&PCU|TvZYf<na^e?L&
ztmB5-(MSG8{LxP*r0>HHKE<s0o!HR_OOke+bztkkG1i~`WLH0)%V@OL&biETTV|<e
z=`XOezj$W-@Z4!9v+r0gZC;qkl2gRxcd6iZmWO>7tZQ2I1<z>zVEN91eZ;YiFLw43
z*ya0Bwg>PS^PRX%So#;ASHP~U{=zmbSiggSkAH3tK8|rxEkEXQwBhTg%CNtg_Oi9R
zdsW!a=DD!VlOrF$-h<uGHOhKVO?GPx@OcuaEOE|b+vNA8v`1w)FY^CLRL)N@?OH8^
zvc~xY<M2CE!~x^H^jtm>r&Z2Q)5rB?@C{Mg8zTQ3BRkl~yfOG>rLNd7#!dEo+Lc3}
z9gpUEVf$X$xC!^U;Hcix^B70!U;32ZhmH$R$-E5q_p0DG^F1i`9k9Q@1N(Uve4guH
z5x-Sg=U?zAT>nzmITw6mWC!a!t9Iwp^*%SRjVCF};9{nJeuo`pQ2RVwL)R~M0K508
zb}+qPbUfesa6I%}ig+e)HnMYl==|C5JYybo%<HPG&u__-_^^L@E=N4$S$>~`^^yNK
zL{9Nxe+SE$z&7BReHq-&^R@9auARW{=UmU|zslNY!SdauO{>pB(cfv8IO;zxtafG1
zSK0gcn7Gf?XN-sg*85yC*VTL<80_C41D6<|V+D93I+uwk&QkiY-NNT}^kF}>Eca_<
z*Qdx)Ot8L-OS|iv;A1176C*wq@m<VQBl`tWzRJ%^8OYB6g2?~E$e%3tZpin-$matw
zM`c?VrCk^Ktc!fEi0oIoF$D1)uON%hVN!3xTzfeC8mwWIQ9tVQ;V9n^NAa(U>{mth
zk4E;7M)s>C`_+;Cn&=vVaosVNq72tWJ|BzHek}6;nD}TrRMz&OtnKjQ^uHBjHDZ38
z{_EA}<59i&aT`85R!^q%zbVR>?5@{MQ8{ml%6U^1^X4e+%~6@b{u~|iy4)Paxg|<_
zOJrXk*_CztSs(e_7Wv#3<qP)t-WK~uWxgY_-zjl4KDn@VgS2h1zUz)M-x<Yp%yYRj
zjuYZ%-V(;!%v+W)=1SIc_LfO-rp)*q@_rrHNb^m856M^TdHmi9tbe3!g!yj1UB~h~
z=i7T#9S`+hRmYZa-wK~emQ8#TlW-)?U@n^v=Dfq_y~=vu<T$qTdurJI`V;KGD+J3k
zTdq05xQCsR_n#e4;9eCh&tt6*)|S&I)tIky^BsInbn_tig2?`Xh}XIMQ}}=<WW5T$
zvXXTURlBZZ!5@y|;CZZ13-<nCopa%TQ{)5oKHyzlzF_ZvbL0>9{$TI3KC<5y`GdXB
zosk{v<A9w{m)yT=eRl6kALaaBOw0R%`3ZSa7){HtZFBB+JPGhT6L^`mqkS6dBXch2
zSsdzMTPkDx@r*GCEYFIUXneVcU9A2xKXUyHALZDtY5n(i@HvX*<h({^Ua6*4R)0Sq
z!RM^VpDc3_?XC}kb<D>&5B^Bx@7K4mD{J}v*hqU6=TlN1Ex+<*5>uGZli`0W<6oXi
z`EPY&5$){Dm*RPE;Hfg1F)zh>fE?xZ>8PBaj`F=d=E&cVKZtW@u!nJ@6pb5Te}7uC
z|2J8$uZ|VM(R#RK*Taj^u9Wqif6wU4;Imxc1pEF7#<~}|Xj-tgXV`CLTSc8PE%+42
zzWtXHdp~~l<n*M`Hk_H!wWRFhWVsbC>o&zc*NU+DcI%k;l3>3k1pBogc$js|a|cUX
z<#*X&|GhIg^4TGSy!eg>?01n5FDvu9^PY=#`m?`y)|j86KifI%%9@reZJ2h~ev}hg
zCy*I4)pCBuU2E7sn_)~X4_W3f+TEN*j?&&u|CL$>Wi10)o^`|j?&w^=IG5|E%CyUQ
zX&LTj8CI@Lc`l!e&R1E^H}gpxGo0`6bX3M7-gn@CohZ))W`54jXD{GS@>y>BwAjI2
z=2GUHglDZ_%uOY^cT=8lyxfhYu;Y8W3Av90`>`E-S7Zn4vk|o~asHo);(&D=hR<gs
z``u9-u#W@Q`?AHX1Aa>Q0?YAC;Ow-r)Rpyd^#=b;ls3b9=9~_@zmEVfaMuO=Mc01F
zw6o0w&Q60jFy`8_<g1MKW9`xo$*%p7HIAlrZ4dT)B#xF@Sz{_|%zL6Z_eAB9-y61e
zWr}>W7rXB}7DsKvG0z8_W!l#~&2tIk7}!5&17GjjjIy?w#U{1oXWBHBAqj11v3<|E
zgz-vwQreR8u8#fp)Ubn3k@*+=Mb{pbb*xj?HUr)e`G8Rp&FdaFPQnK~5!qeZE_vS0
zwb|k%MOtT1;jg^Jgf`}RM&3)3w#PL9?b5DF5tls|*iYfp&U)r^GqB9*Y;RzFZl+vt
zZ4&lD`tx@!g7Ga6%AtAbSgLXSdH_Dk7$3m?T^;bNTw4MkPd<EF%HyA3!G3-UJHJl^
z-^zSBhl2g}1%D}u^Cj2zXs18>0{F|Wk0`^A@r@k$+#996SL}yLT4CNl!vEf0j<+jQ
z@>imK$<mK#m$X_B%6jf!iPGN3@^J2e|9$i?YdOLCP7Cb!NAd5E%6Y%UnUpeoHS+mt
z@Ui1<iFFmmUdPNEEd7hWZwKtx31B}CFNxm21^ee|OQLZYoN;3^Se{pNjSBYfW`ObD
zpgvm$W1RH-CD;C82Tw|0P`2$nF<*{+z}|juWWUcnyF=RhL!7R~WcKl;CiEA_e5OsF
z<gpU|gNd^A3$TAa43;*W!*z7b{^B{Za}Dh5d=D0kE9>JcmnAP@_EY#wijOj1eK2b;
zy`luWGXC$j<I7hF`{&HCzuC1P@QtnwfOSoRT)=)F2m7%d{I$sc>nsD;39x_NwNG*s
zAFR)!VSj-BT!)Zd-yugaAEXcaHS7;YF&_*uGd~Uf;s4GojoPharUw@pGh0%Y=WKG0
zIxlqN|G2?tgfaPl+`zs)FU5aLVEf^{Dj3gub)5kIx|_$r54d)vtnCf_p!3-~e5cd5
z3}s<?*nX7xEL550<^NHoeG(sQ_v=;Ig}Gh@Ya2uR@r?H4nC(qjpFM)-@f^oAt$z;z
zcK_TS?ALf?SLfh|Smw1QDd$73{$c-y*vn%72FuUy^=Nn3H{um!rd{*x>@?YpZ{UrH
z)3y$IkVE`17A>>amwABwSOoTC5!hcl@Hb_yUr7Hj7J;=4c-FTp3C}vfJGZ4vr0;_#
zcuhH<g7;?|C@bSWWkSXr*uPQ9laXE90DLwEpH)SUIUMVjC9A&KmM)NI9m|pwar9Zl
za-2WwlYQJVzb__F(!L^aM__q2P9Mwx^8bmzZH!~nN}J&vO*`wB@1{B~dDj0UKs&EX
z=H66%Qs#^K6!spbW!nS$dm^xJhn~?69kU&J*0kc!_juKwH5>yS2YVlXzZQKanXfJ9
zVlwAG*monR%FBf{j<S})zuOQ074+dVUhs{qAGT-kt+aEU0Dd^KKODvXR?Kcbh5xtN
z9{K$jIr7;Q@ppu^Y|2u$(6*OHZ5!;{GkAz;bGXL=%NUizcf`u5w}oW?KEGL>XnW@T
zrL6CqIJS1&6X_fW`ws5^)`2nqdi!o}-h_RHYs1Rgw!wJTG$Cys{4J(UHQ!Bvb18Wh
z><6O0S+^Y1JkJQ{?DwR3*d6zSyTu=U0qlS0HdxvZ+ZEW)eV#G*Ip*9)cGto&pUHsz
z^J?%Ta^1B&kGOG+b~lcZ8HZyR*^OOb`8~sI1LTlbxV{HQ*B9)sFIcWG=OD13gAT;V
zAbFv!9w=)ky)Iz?{UaE2Q%U9~@DXIzzp`Enu)m)LKjN;JvR+5<cSG6~J~|d16qWNJ
z!{4oeYlr$#PKC>~@l!I!G1f>~GV73Y8F>;P>m%b2`!ejf)`|3e&*&FmxxO3|JgeP*
zcLuxf*I<8r!CO!snMW*_*vH8osrFN{TqBLItmRSGyue*Dwy1xf<E@OtISzJkf;yin
zljVA0%@6(_>%`{!J^Hh4&@TCEUY4_^V9!n{XI)<MJF9u`0Q>i&nBR|Lem{!&Xyo%~
z<nw6c^H?2D5dU#WJ0o@VcywNmi~rMdUczku^ymBYskKXA_$A93+C13Lzvbv%^s-4c
z4%)V7sW)qXGLw|0%}>Z&3`U#O_6*)q$y3ti)s8z3w14nc*Ulq;tFpFv@b{xQV4wE!
zD6M0r1^Y69V}BPjg<bp3N)!5p<Lorn%4#pMFOVm>uiTcY=Cb&Ro%1;S{oL)C{m3!r
zWw6Z4oa@0lFQYv>W}oux?YcgMeUjJOruAz=*q@L#plOvg?GIdAg3k{le$ur)*q@B;
z(q^P=p`EPcID_YS{N1g}J^0-emhC$mu={o0$|O9K@r>upV9aZ}W>cP$_5=27Ht-MK
z^);RNZ>fFw6%|FiLh=esqbHiTn|GRX%{p_1S)YCx16$5?<Jcl|S-Qz&({VGNUWU&i
z(}A=(q#Vb>^2GE}?7O|snMc#dWPdz85XToF^>XoG3g$-Jf#w$TIrw$LG6Ku;^a>l{
z!1P2|2gPd{{7y9M;MZ=`M)q_aeejcckEfr*c065%&!eU%9T(eUlG}+=9_E64#b48n
zrwb$kOHb}VS?IIK+>$<;vYfZDgrL0nn8~4BIdeU>%d!0=w&N&OFZSBadeeq<Q|5Sc
zpV^ph;U1Q`ZTL0H&VE-oV%}&jFc%tH?oYpExCm}DQ|U(h+=RXRu-$^1?>7B-96XFt
z%riTih3F_(nopRU&E4q(4UXQN-W?rbstHNAKT=*}ZbaJk=8NV_=F8@R^!s%^mzp}h
zW-GkA&G~2%UozdvFjDTHo@X-24yKUaZVCyW2&6Ze{$$cDOs_Nxlf@|Y1L@;tI9Y<P
zVVA*oezLdeMIA541ihQt-7HD>Fgv7gO1q^L!$`&Roiz3gFwAtDPuR1W#I`&A1T4c^
z6F8bd%5L%QcJ)CIo5H13{|TwNo25kE$cb^TOdn6#wzUPIB&hehP{QTrD06~&dwK@0
z_)+G#^zHB-N19Gt>l4y*;c=AhA?K$T<2oIMRK@g@CW{_4fd67Tf-gTk;|weI%&y4C
z9!*D5{HJr53cqb`mnz>~;C&f-ToFD)cp<xp61WyI57*)vw1peZO>#|d!!>1nyW`D{
z@|aJ@>nW|QDh2Gg9*l@z>(ret#C8DfaDIBU*)M$q>gsrW(7xMtG<%u7(_`i5!)C8^
zZ`eD{1!&b5wC!%LL`yJle9t>xVan}?_RecNtMj)QR}7~-gHaY!T$*fbGi~Lzv~6R%
zX)i}QrG4!jwW<A&nFBHx)=`?-h`*y#j&xS`j<#ppyP<jQ`=cZUQ^LazPTAAuER^bM
z^pFi^qj|#2m}gN!wC!Xm%DF0;PR>GUuTIt{8<LI56Uj{SEJ|KzE43{}`B$|~x1EKv
zxVmk9+lID{ZBMk#ARp6SXfL%d#aXRtpKd>^W_wEedvT7}$>;X=d$)VLsr^Uozij_4
z>Y)dJmt=R;#_KXCWzIm2d?@pGna|C-O*2<#)@L?kHfEm4%w(QLofWdB>{8U*s_b<3
ztT}Jb%BI<?v+J{WWWSRAPWH#yf6o3-N48_QW2$4{j>9`%-|^QS@9May<0Bn6b$p@Y
z{*Lc<{G{Vo9l!7F>>TZ!>fE>U@Xpnpr*@v(d3oo@JMZYcw{uhHkF0*#`CpyCt<fKI
zJyv76o$6}O+@85t)}*VARAtG%I!=>24tiVeJ)OVJU7Y)1?vuH@XVKSl)K=)JI8GzZ
z{W|xDuI{d4?eVUOTANzB_J;QDI=pLj*Qs6Sc3s}}ajQGJ?&!MPrRw^6*VeA5x_;65
z+pgbqC*8&FiSE6-SMX@}k=<|VJ{{Zlb$_t?lihcVzTUmH`>F0<cmJWM+ePS^*P`b4
zESW{idtTl1nkIUE&k3{Y#Gbc9xI)$HSp!`itUc@Jq|fziXrQn3Y@9`#LvGtgJ^#@2
zuiKYWQ}sOGntF4s$sBG@#roz-=(FZ4=EvrLlHp`;jG%8%E=aCV?o0mO>)E!hww>Az
zZaWEMXKT8;D*XnG!m*yfh#bjaXs-~4@(N+-t`HtiHxU0&n^T8z>NK%(SZP!WuemnW
zTMflEj#H0`)r*x#GxcF5t4cAerC80VK8AHH^?9pD%p=KYvM*(R7^xqtf>``TT(P(+
zi8X-LPpm<#-(wA7Z4_%5Yp_@&xCe+eYAQ8`{}K`l_aPOUhm~Qh9k8NmrukTxR%=HS
zw3BJBow2sw7Ja~c04t5439QWjoLYdpkA;!mX5MB_hE9P_g(j;sg?p7+eZe@r+c=$t
zb<tVoLy^ulXPZl*|6QXQteRBUno9khQGM5_K4qM4!W#Cbq$}BhGC#%r3H6>TeZ;6P
zGpa?nM{A~COmi*9D-J=s8frJu?zlU_{fXBeMzyDjwHH>r&9oG&%4XWzsP-}Y;J&+7
z%Wzj6YhSakd1a*iOmi*AolHIbt)WgcubM?~$6ZdWcbH0@Zkp>H(_B~JKEUZZbDddR
zrFDk7+Us%?bTjUGuBy`hxNnVhfN3l~W<JR3U=wtR2`b~Bplnt|I@BBntr4AphcwM~
zIA+0SdbRn>>b*vF1im}?OX@Y|FRRxY)dt-4ZNL+$xoJJ_5}ocbK_4_9G#_uGj~ePr
zc!s39)dYPRPh~zWy3J7cLSKpWpXNW!?UC-|)1yc~#!73m=vPMdC*$;0qdL<3W%V`V
z^g8qZS4ZKwO{~|OzpUP1{<1pSw5C;fVxsyh)0*Ci=TXO)W1%-ft7~*To~bt0ad=i;
zsq;*w{+Cf*Vw~<Usyhu;{qHV3m;H>@&&|*AG>|$G`i<y(JbU}F71O@S>jK>MTwvZu
zCH+q3pG5!Hh>}CR{wfife{HVhRVrW13-RQb`a1Mm=)XjAIB84T@Ko><xbOOGa(r^U
z7=L1ZV*Wl7@5`JXFb|k#A^!Wd)q_U$ka@^_1NxmvT;#_$jg#yqnJVp=sE$mmLQ<iP
zc=ET*YDJ=2kWdS)4oFmcB-B)bKlf9mhmF%yhWe4$zZvTPM0&xzVE)-l%iNwo=3l&i
zX)2T)Q>A=TA@j#bRi|g3uhM@QucR;OGe2`mUQd~qys9H<S?48I(cu@3SF%@-^GFs&
z8cUo;lAwdl|EQ9ck&a7_^D&N2RJkNpFaFen$omZ?LGu%*HzgwHRd1W@481xi_~2>5
z?kaP`EV>cTvLhu`|3b|Al)N&Q`Brl!lcLuqO=Vu5MO8&fUZ<)uhuy8Fxt=jla$u18
zN6~YpS|KJVIZ9Pwq<tdNv5820{=wABCQf>w!YnE#&9xLy+MDSWNu^FqDpY+QmHWwZ
z^S$Ou21UCjs$o2}Y9jNCI{JOc6VJPvYjvV3<J*P0vawDw&Glx}To)UsP&iO>I8;hX
z=KYaAiElNl|NXUTs-&a2LbzoAS%gQ_&|yI#Eh*W>snYKDl7mD`5|OjkZj&RZTD!9(
zZ=l>>^)@*{Rc(*=ll_wY%)d7goRiL=IIZJkCns-NoLD(a)%Ho#Tz4Dla~1l&3Hr8a
zu1)xMx|tp|&GndZ`fo!$UZp4Sty`?8O{M-|nkvc8qVXiwZb`NFNt(+1%`D>O_|7c)
zfvKy?htYNR29oA_P100VEk$?VVw$UNA~hy^&Z0w;=6Yk&R5e*o<NMiI)eaY#X2Nee
MokeGw=0bk|4;mLCh5!Hn

literal 0
HcmV?d00001

diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/uprops.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt76b/uprops.icu
deleted file mode 100644
index ca241674dbb90c1150fc7fe95ed0b3a1a8aab837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146880
zcmeFa1>6<I_dkAX_uh@Wad&S#iGhJ&Az)&F7(8|db}M#aV;~3yHg<xjn22Hrpu&UQ
zVj&h{cl$qQ=gytkyv0Yqzt`V=zjo)$sW~&-H4|In?d4*2EEbO?V%u+Z)ZtPr7BgUG
z(@N*ZV*GsQeIQH5VrM@ei;aFQ7Q5g8GH>-l;^$pf1y9>B+gNP7qYmmDi{;MET`8|`
zsfi_0H>GY*O-((VdL=b4wIH=9^?mAhAudRQDYOVn3cZAth1G@igpGxv!ZyM#!rsEc
z!coFu!g0c>!r8(&;bP$`;U?i0;V$6;;c?*^;RT^vctv<q_(1qX_)7Rm_)8Q;O)Q9=
z;?iPoaV2qpxURU7xS6<}xUIOWxQ}><c#?Ruc&0c`yb$zm5U&vL5vPg|i?@p1;!EON
z;tX-2__g@6I6s|EXVZD{@ANY1-s#oS9qGa8uJpF)wbT2g4@w`I-Zg!CdUX1N^a<(f
z(l@84q%TiDlAe+7PTwbPnSLcbFEt~*ApLpzJ4k=aBr<YF&lEGAnPpQmL@l#YW<X}$
z%tpdhnH@4)KomY?b_cEfGY4mmf^-DTr)JL1oDVg>Dsx%pTED)ZlesB#J90BqGY@BG
zWV$o206j0WAhRg*yQoP?NszLc?}0L;o>EC#Lh1u_KWQy#kTeviU8KFGgQabx6H_y!
zGo(?{dD2nRHPWRZxf$lE(iG`oX@>NS^n&z;Fj#tD`cV2z`da!B*44qVJ{?FulT=R2
zx?Gfd$jiyS<<+FW<t}+!d2M;HysNyAe29FsJWf7IK2yF}zDmALzDvGQe!zpr<!7Wp
z@*MeP`7QZ9`4gbOkbh88N*ZDvB>#a+0;QmIDq5LdnsUqeUdpP{AZ1NueK#LGl*>~#
zksnaDRCb_wnu68t%6`g0%HhP)+5QGA$CKJArwN0V(W0iDr(C04s$41@tV~qyP^P73
zD37APGLtV)UZ~7g-cnu?w*-s%xF(f_%D2joxTcifpk)WCaaB@HwFs1{_TX(Ptu9B_
zwz{%^t=Gm;``4z&wA8g2{T~(H0=SOULF%Szm#C@RsynNDsRyZtp}q=xvXhQbPjlO=
zXM^-S^<p>Iol~zOdG#hYzgkY6SXE<6HI2sP>QrK<KBPX?m<O~{pHb&J>8p+V;4RfR
z`P|~6)pw))sPm%bwMx~GYt=+Ob&(23_xhp!TE9(W7TH*1cA}OQ8ns-!c3GMDQ#V?i
ze$`KF^_De)HM6B`kL=Rr*xnD;`S-ZlzKf^q><ZGL>{`;pUT@j;vKyzq&+eFob1ZBt
zdt?vD!nrzoa`vq3*zASb!?RapZvg(S*$1<aWbet&6!*!_&AuX~#Cx&}vh%WwK=yt1
zcP%Munxa`+o3^ypTU%LMT^KA32Htw!^8U;J*8=}<w1Bp;wyoBcn$aAzU7N%{+JE>z
z)B<GN)eeDch7Yu(wByTp=PFgwQ!}(nwNcu6$kndV0<R~v+ax#xYWKoCU3)~Esm;}1
z(aKjn+I;QT)KopLOS&fY)D~*rHo5ieYN>$DtaGiocFNw+KFfZ@{v*G9{=od?{Pg@U
zg+7Jhg{uqi6x)k^ihC9(6yGeBN;{R#Eln@|(y~g+W-aH+BjqQQn6kbyQn_7O6rZPR
z^7;sMBlYa~Jjg$t6$vN1GMp_gkk`*n%l@eK*N)YuX+P@y^<(uZsHeYZq~i08K1d^s
zohen$9}2vQ#>cSyhH%Vf<@L?|kv1p6Je!pA-}1i}_<yMda#C~Aren<@w`nuh=~!;l
z=FWc2Tk8eALth4;10wVl^?`6q*-js#Z>A4ZX6yUX65xtd(}(NF!184MEPaeV9;gYa
z8SwmRqJBNlH|taMNA&xEnhA5aK2LuI(gnmXzf`V~4E+=RC;cn*ZHW3`hGdvhPoo8L
zOB%h5Rgo`h#s<cw#+t^?#-7I3#(~BWARTGI(?{b>W1MlZag}is(F4xy7>6-c7;M1x
zw=u(b+vql4rja|Pd<gu{jh~ILjla#bsTmz+0p?ES8gnIaLvw(+taOdJuDOx9nYpjI
zojJ@r5b`6;Bg~QJ1apizJ~hL<&b&q3-@MCw+?-`TXFg!QYtA<pny-nP`K|e@@s+6M
z;yH<x33)RIHG*`>T(8`!kZzD$Gq-7OuiVzTon3kdksP$-;M|e9({rP9Cm<(xdG4y*
z1-YrYn{x2%H1}i<>Lv-f*)H3ca-ZhD$i0=DpZg>C14=B#(ygSmoK>`XFilEXy{)ya
z^{v$$%}uPGtgZMpQxA>jV#mvY))CeSYfs+R8cEChr&FT?<FLl?(KJR|<E;seSyC%~
zMM_1b{I=k2EpdD6dN1#PnU9K-$ly7B&n(=-OFgZdty`g`@39`Vp42}IkIH(<;<i}l
zcrn;|i|C_IYrge~^#$gwAF7xCztph)Se)J^!%pCF>EDE1ej>!z%g)(FyOZZIy7{{?
zZ*7ThyQkgDc8=;^c|Cdh#(|{vn(jQGQ)Z%H;b41Hd#kec2Jq&n@@57pd7(7O-Vx^A
z?fvcHkpBU>_Aw+P`(*oMCx4cGE{)N?+P=x2Y~N|$Z$D-~ZC`IcZ@+H8XD_g)Ig;x@
zvdF&1{t6^N*?;B5eAfOoAJ0p91MUb)_9gD}{W;;_{PHlboF9;1f|l7#njezioVU*p
z%x^D!nBOnI8{vvt{@DDXyau6-j{GSg8|9ZU4(Oc6a&Ttu$Y09m{dE2sww;0ZiFhQ)
zPs`uo*No=mAI(3PpM^U4ck{3Dy7@2jKj!}|2!(7R57Li$8Pd|ALI<|GGSl9^u#CL0
zup(Ut@}ks?LjS_R!Uly+3tLk=DkW)QXLmk2R~S^-t88}=rt)WnBe3+s2$)9}Mirp-
zf;=cQ3zrtI0iBx*Q>eUfA5!+3G_FR|!Xvl_3gs)kLO0NGh4#-ueZVQdd?)TMx3Hi9
zPdXPT7S~ho!gq@^s&HS0#r&qD*zo&|@ED^c^bR6QXK~9Uo%g82w*dbpikaq0FNVB7
zaeLKo4&VQ&X3?gUJB_jp_gcHeU0RK~aW(4Iux_KSLu;=^u_rvO15gY6iiDxqhw}ed
z>A(9ty4WvuBO<0Z2{l%9&{9tASRSYn%$CF1G<HsGc3g^Y8b2pKJ0T@DO`PNKOQ3^V
zMfe1)e%N4_kF~}MFee&-4Q1zH*7<M7{uO$0w0}#Cpbc83HP#jrV(m~j11QXul3mGh
zPCH?1w<Z;kcl7J-*R@V}-K}5ptgCw4zT{h1_yOQQIr~fVa~5wryf<tw+}dfGgd!Xw
zp;EVmSutD2BVJja`k<TytZ}qM2xY|KTS}DkOU#GQ;S%18`9zA3q&9orS3NYT9a+*+
z(VmtX77K6pzn}#thWb6HV%5<Kdo?0VlgfiqX5*Ho9Di<JP)>~fyP(?!#)~vgsd8K6
zIfYIbd%SX-!w-&eCe~z|2wxISx4gbJNw+{!BHGfpYfWi+sE<cqvR4sL?#TW(Ia+?B
zX|45)(re?kHGB~hrMviLQ6B4GpHbd|WI@|t^)-!Ke+ssGhDO&Pv%@PooZ0{_kpA!X
ze+zuWjje0x6wNK@d91#aI-pkAKEaa#*H0AeT9sVoVhaS<z6ds?&1ngZrm4!An)eV~
zY7jT<x*MZIk7A&IzN~+S#%SE}<8>>~!7~-+85bi9svn6M*N#wL3vB!6Dg4!>*%sg<
z45xA1`e)h^O9_rc2;RWU-0*g6CT@QuxEAsL1d(#e7M;5ms!7(dSYFqJi)#FO^V9XU
zuD2}A*I!FMwy^TcjSERN|E(?!+%oy!plHPI)CgJAZmr;)KOWlh!TMe<+9MCwMbNf`
zYu8@};}CzDNFAmfOo_3Kv*t38BIO3*A|EO5UJ>LG?QsgK59-6+_3GXIyVvXP*S$`+
z)CJpd3vlrah3l7;<6qP05v^$&R5FpfC1^z^%EugTsqXqB7dbRV4evyx$fYIm8bS5N
zwjkx=Iu4pp1O3wIh-acnX<p`~-If?LvEr9lUs5}=eu;N-&4Dyo<Ah7r9o1moks`UM
z^;>kVWtcTu5bv}MOuh9bb)sd_)LT=x7L^ih-UdteuV1VeEgRP}si%J(^RW}JXoXYI
z`h{~NdG<rLXt%MG`(JF&bWP9}q4mYGNIR2=-P^M}INBD3i=MEy{1i~%ba!Xh2;5^C
zT7Y&>WY3}Nhj>N}8ZDI&D<Y>g;(5Fcqp3AZi4EDlX=@{o?B6sETHkDcrasVX)cU4+
zBrOVE@HcC>sE{SJ1Suca0*jAO{`z}0+<L)M<l=<>$(km$#F~&iO-X$nWoJQZMa!V;
z8uQWhMGb#DQNL)75s<53;+>Y^PI(zm({|x`bZej<`0bmoFVb|qd+SSNG)__qSw_^C
zY~QXu8n1pC&=x&24y9;4XiE9@r0Cs$ULrMS+p)myam0IOt};jI?wYL(=$hTtAD>9`
zQ^0=gh|zEGISIvdPpTz;Qd%vVs1wve$ivC)!(l-rbRsQ*t%N+B35PA+_CYzaXA&QD
zN&Vw>2!sDhF6<hOZ$-2xwPBvT^<ok)<+Wt;ptv!9Z@b}>3U&-2H4Hv?VXc{eazyvv
z6Yw0o;~;wImz@LJg3gWbMx<-QuFbl(>l)UzZ`bgyW4ij_nS<PUVv6s!aK^RA;vf_s
znO7E^$J*dT*J)77&W`kn2=f)BPqwmPNv&M+goke{cgqnuYh|j595%5yc?w&O#=$7$
zkQ|i<-`}$`-A8X`Mam*2(Bl&FP=kTjB3mgRBcsU?g+#}!(IOMH{gg`}t;L?3)kERk
z6Vd0N@sX$2v~9_=?P^|GEhxpdQ1nE(B*i@A`Q@lpP44y>tzS!dygybp&vnyGCpdn$
zc5n_Y$=1VfYYv@M@I7j>JEf$$QsYwHf|Bl*yVP#I%j~wh3f(PTZFsFY4qd<$?4NPz
zUc;xvk}Uc4UyVi!etW>YRW$+@OE87U&R_}8Rcp}U^$CqfQ8M{u$Z=X+8Y|6_WuO1D
zVWhp=D_NsK*Mx4pupBu8U`+lg%!cQqeb~h7xoNr$ku9=*d$%`I2htLB$&P7+V#hnG
z!BVn6(02-W-9hRUcCA*9m)>uPUC{SUcUpnoZ0H_BG~7{Qj$R>z$=wztF0v$FoFGl&
z#^+>J;wx`m(a)^hC3<u2HN&JB1IyJzxjm8`sS#acm?JdR#T@0)wTW7EqW8SmIzeqx
zPkeq|x~=*p$iaz8XhiOm$=wvya&v=oR2S2LI>MJPWa5vxjncspgmLNmBI|?SW(iIA
zE0V(~$@&gnra>B3lAlku3%4iqPq!DhBxoCQYmn#y+LttLd09<Pugl%-?=A^*ZaL;i
z8~HVPjw_VF4Au5u$@^O{h(p?sdEwiQ&|WL@E+eR2`0W9&EtywBQx19zvgb=e+eYg|
z{m{D6;|MJu^WKTZ9uybRC0>K%v^-2nS!_w$fTk!xnoP9RTCPy|QUtiZW<W3ebrZev
zCSQ|~lB!*M1<TQvNLZwVB3{{&)Q_IAXl?nFwm#+2`nZn)Bu8|~5to$VuOH#CR%nI_
z^PZ^O$AoJ{Nmxul-$aD*ydF`{3%0(<S54STM2DnQo`mm)S}QW<h01BlBxI|hd`y{d
zrp3#VW)eb0$<ZG#5Asj$70FjlNY~@vs~hA$311BI@Y?V)q?z2`z6qy|=@-0yIj#X}
zPh+9=kCkl;<?}(wc{1bO+ejY2Gp2fO4b^$yO1|?T?_TLQALTUB4O=oy{CyvMhlRj<
zm{d#+1oL9Sofrj{-5%=z%l1m@j;9#Q#xyP_`gJw0g&t_Wkm&Z`mvZspv$Zf_wPMaY
zc>4WtV=3_ywxmZbe@cI;7t6oq`!xtB%roKB>w`F48L*jbC2g?v(CvkN`I>O9DR8?&
z8CjROWcvzyGhNnc>pyM)JfrS6ZjEvMp&Q46$_7gRt|49hy9ag;>E66s80Y9=xdeow
zrP4CcGl>p8(})~hVXQDml*OUqSaD8TP7h6wP0xXTJBONcI)_e>M+~hdA2D>o&=F%X
zc5#k5XTsPKa|H6Xi?$l8AB_=XAoXLMaEjS`DYPMeyxzR|Fz+-D)DN@qmRfJ#TQ+@$
z>*a^#X^c#c9$2nkDy*Kh`Ki73wfXaF@g?}B^>OGnSW6o0xfV;J6JVd{&M29#%(zUq
zq)1)TIH_A!<Szg5GTj|?6iwG`9aKu)TL|Co{%tOxcCHeFwyGdrH9uZ?bsuzp3P^)m
zx>la6c6?N<ov=iftA`4RwMI`tmSMblB4WDK8{^bRp*>pgZ5BjV_lj1$R*;u)9`2Rl
z(qKuD1)e*}8Izn%F-K?0M-Jg(N`O~AZaH5j^+B#MFvq6ywN<|^=PHZ(!xXPj*+gi1
zHx`yMeWdU?Pt@eTr{mwD5dZvhG~`svhebvC{#dZ~c!kNXG6}`<^x6|s^28OFRE{a#
zhH1(y+|RivAFq!YT?BiY^QX8L372}ODf>E|U(>bFLEBxJoxjE0oG`lz-+x8tdfsDk
z*Xv-Do+A%c=Kv4iiJ%X9N6>~mVW_XIu{BVSwhB!xhm!|C^#JRJ`v~5N;T~0wEw793
zHHkfIEnZ$b?cL&oEuA$=zHt)WUw>8B1GJHUa(_D$<eRszpN`R(*xQhFx3j)#^yPi$
z7;A%`?7J03=~Bii-KwH?spHh{tdi}@j>~pyN_F2_mo`r8))l==AE$R4iqQrAZgrcA
z*=3G1yV)8SM=`oyN|;rz1+QOU$?2fA=Hm%YZK&=D$ca83J_aw{T#e9M+KIsHm*&0x
zu?@r_RO(Mpiu6YHPZ*V+Md?P;5xxlOYc(vhwzb*mE6E$Lw}rfNf4+W;m~g@<zn@w;
zCqQlM2S%A50__B8Ex<K8Vu(CMb?NIvYOzHfv5Z>vgY=@dOsY@zIGTfV*C<BUM>TFq
z%1MusLt94}CCtKYy4G!l9zp7>fm<8bU>I;qs1?n|BGge9#*`jaYh=NC)%S7UZe*2q
zIAIpA9Yxo&wR-LG3{flCw!<jDZN07MKlb{4Msq~2h3ad2=9l-uxGsuZRaLv5skt>n
zt~%ZR{a13;{L?#;YI<SsE&U}1bLgFBy(wNT<CS-m9eyiAo}vf8KlJ>I<-hZQ`v)w8
zzsvI0g1jZGbxE%B`K8xiP@d>xP09ON_N-oT?mVK}0PoAA<Wxq#t7P}{RDw?l{64T>
z0n)PoN=g42NJW=No;VPHJni@Im7)z!Bqh%ph#zW8S`N2Y`jmjCj8koErgHi=JyW?q
zD8E_v{7Ha+y1DO@sE2AP-KI#?Y)Rkn<96qr&?abq<Mq(KTG>%@TD~{Mc&dT-OX`Pr
z<;Z1gg5=zuP?xt2r`>imhp`4vMUc>z_NVx~DXKl|i3?-k<3SpEtS<QPF3V9WsC+8(
zKfgi=ErpiAr~XzTzTE9kypT2vDj&Vj)?%>)Q|>yEvkv)2hp&6EEs2BHh~)T4v1Vl3
z@z*PwgTBZaEVyK{u5kU3b&N+?<ONN<2b5RKyM6H5{`E=T>9b>QtrY9i#&1E6%rpwW
z+|42Jk*$|4alaw05w?9$|FnKI?@g(^-jw=r+XZvoI__L9)*Q@Ob8tsf&Uv2-usfWn
zD`MA{Cy29ZzXx_(k{l~DNb2ygwFBdKaZ9e8Tc5W_n&kPVTfchFz4g-V!J9HICh?wy
z!po|DHOIULQ{ldAk>Foc)%393C>?iP?rRjcjO4<6;q?uIKkEe1^n5{5e5&q#lM`ga
z^YC4X1z#Z*d{5@-6MFPa{E{+ImwvUx&R66)K5v7)En4L_b*M-BsG)7Z>K)ylOfQT=
zkECx3UIV$c<x!J-Z&ZRSYrL|=UWC{?MqCR)6Zw{kNlEK8+TSGmqKxfB)hXIvBw0Un
zE%EiHwEKF2a_dX+Y#nCdZtXBF%CA+M=vC9kwL?7zrPbs?HiTDM?{_QHl@VPdyT){l
z@0!qceb?l!ySt{tUsWT=jTtw7+=Ox0kDEO1?s3!UKO|(|<(FjZDEkX~+v5LcYoszp
z8Lv!Gu2&{2={XcCd{0HtIdqIXp#uEkN*rs>>DSe-YmITxhbCXTix#^2QEAj0Mkm&O
zbNa!zUg#G}8ae@}G?Y%h0mJfGZp7FLkb`@9#2f-~Y{<S-Y1gWREAsF<1xUzsRQS53
zlIRe``qve1E7YklP8^r+hWAzeiI!g_ZJXoWwx`RSvntjuTXx)M4(hS@>f%wI@~B6e
zr)d$l27FuGIh3ln(rU*z>Zg$u3#xV<O`ms!rPbmKlhaCu`StRtzSp0(-c*mKUb#0<
z_1tM#@5byqZj7VaU6NN$@}wkh{Yakq=ks1aShlwwVR?7Gs^|D;fWdUox5>;eZxf`+
z%Y*2!dIa(5*$+#{Yk2Qjj&Qu(AWv={?6>5ohHve$9~$^O*sW152S;UgTtqKUbd^O#
z27gzQGAg1lqFRYW&bJ77B1c!OLp|{e<(RO)nQ}PnI96L6G#Xl)V)zxoi0+ZyW4gz8
zPw2kBdvf>P-P5}VboYldaKCXIL0{KfbmO^tNL}$ebuE{?JNUqSrNt|Mv%0^?K=sZp
z{))nVMMJ-Tq+0}dbx-8_g<rbm^l6g!uV8x4q3ueyR+>_NEh&~r{L!-cr&hIi;B*B1
zilnji?sy?v5x3o8WaWw5F8LO7-<c6zE+WTQ^)G$A7Uaml?!-umeywm0L_)V8y8gL(
zh1=1R8?`UDRym<9<>pp$?g%UFFv1^om}W3P`26MN2HPUndmazYyX@(;qSG@Nji2s6
zE=|bPb6rDhsV5Qc%KdMhg5vX*iC^7Tn}Xt^b-}wwZwq?z^f(mVn}zo{2KPL0JY8cP
z1V_u_Q*zWG-(e!ZnTfU{`XFUA=8cc9E}HHK<jkr<-yY5xz#By^K51QCDLp&Fv5|uJ
zjee<qket^IqAPLHdenG*Q1-?3Xwnt950EngMi{i7$sfeEy&<VYT3*j2PwP%n+5#jk
z#~8H@yL<(efbRnQZ?w=q?ZKJ!@9A$_|1+>4|K3&!+FyC!ZXc}nEJn%;J|@u?B7ahQ
zOQ-vgyA(c0yz`t!X!0$AzjW;PjQXRI()y5hF+uG^-mVgTY8{=r*D5Umx5mnum;dtC
z|11dliVU8@%H>NWTNGJiw3e9CeI?j)ZQQW(d4Bb^j2cXfQM?yM2g}`8S4=yY;@gL<
z4_4=(_0FUu0`!3svqy?dj8|rO5|k5rZ+xhTJeqptH1BN%YDMMf0ZSo!9x07R%%`Ld
z?tO#soDiH?s4v24WXYmp6h@2_E*ZBvh1ysH_b~|fWt?zHq?95@eexa(w|jD}jJj;9
zUMkh_mrU0sS?3rP)n$8I(Dp=QVfxh0pZZJ1a%eqC1Y~WKqZ6wcp@Pcib^Imr9Cztx
z=P#MnwHAtc$Cz=V`LNU-0cmMcf3kMz*JAGN*m3PFs?|R{X67S`s^&jP&hbL(PwIws
zr!~fuY+<hBU1bcjs2HPUd>MRc)P{?dmW5Yt<!eOmT`RS!Jq=s$(R}nz+ap*rc)MZS
z42>|Pe(rwssIo7`;}OnuEA%M@UaRt2?&wiMkBwdl=4;(wNbSkqiay!agU1|v`oSOR
zQKQz$9aV6wULAMdy=Jgn5*^{Yb;EM*y~2NILicKVR%W$hy0lc{i<QLtrZkgQqe#iD
zJTFzv9_6%De@gaHQU<QaV0g=n%A=R4DPaF_sq;~|1m#SCJ-q{rzVa>GV-2I*tolCT
zx95*^*ve!Zr0wmM5)Chx<jK-sbAOp`4qDLi!cyE4yi-7Xx>UTSV7|T<;-ew1Y5QQr
zZvP}l_FP<&I+5cJJwCg_t9m?iYx{G2`J`U;)sEO>9Wh?qy4(|qI(WZAZczL4YY9D*
zvjQI}PuCYOM#<I)iIudpJ8o}|9GSgbmZ#qtMZITd+Fq*ooHAGGR$hc&(_eso(_e(1
z(^v0ay?X%kL^Hc<z3%=Bez%PydOqj><J0NYr{A3ZL*W|(_{yN)*fqxLL(MsSpEFP#
zTLa#*oxHb~8h4*Hyf1tY?Upi*BXRY1Q<gcrC&oVMeA58dM2Dn9!TV6BcO2R2A!jJ`
zk>h}sQz-$yln|Zrk%KiI;?%c4d$%80yBe7M78OkUw{6~Sunps~9;1RO_mO~Yp+OX1
zE~SI?aJ!~kd(eJHZ82q$hEu4=%JJ^$D6Q^?*(1faO1j_BcfI&Ge9#nF4`-BwaVIDz
zj5|>|G3@DeaJ^U=!E(aIs7S1V<ufOshluhODGTaPH>jr?a?Y=`9}6JZJC&1TDcLTX
zTT+iCrE8V0z2Fr8SK^QDybp{fY6`AbI5)~yby>BeJ^NyTQKZf!Pxpi9lB$=&`w7;j
zE#NJQ@}pB`6|Tp0kP6a6KKa5HpRN-iuaSu!2g1^7`yaJyq-?aITXIlZP0nomrPH{g
zQ?!fL@Jrb-p2+z9nyw9+vIq%<7H*#3e>jI)hHJPbv`l~NROQrqTnu&Oj-*=7=cbl>
zET)5RpxrJKn<mZ)yw(lco`ZOv_q)~J|2p!ZchO<IDF1Go;CJ#-_F*!&-`a9?d}nN4
z(gQ1cCpl7%_uDx9%aQ;i_eSr{Q{AwbDWBJ4CGv4lO(v!BQQLY_v}K+cMYvcl&m-DV
z{%Lfzq)~ptWYzrgcK+C_S);sES+BgWXxeR4ODS$0xBcQQi}-T;r~eEG9S=M_XhM24
z4o<O+qo!c1FfKiQhRKmnb!h76poDPQeLz%<{yO?O{)o^c;|8rWq2?`#kB;}m^P_2u
zgv7%~#cYDFoEevC22o*G*G!jr@>5JJobqgU&UuY$^W(r#o;MA;ek44i$<`E7?if)c
z+&<{(p11UHds=Q({qXOm;PTnXY|-}N<)dGWA$SA;S`Y8DTjq~YEFT;vFUQ7o#)@=}
z-9p=eq_kX?(yiXDM@D=`t*H9rUXI68>Z6gAMG`{!>xA#u==-M;-6wRN-sRVcwUM3?
zVl5~eF>XY6uzNZVl=sWITK;LmFPJ0$d1}Kisrj{$?j8?+Esccl%KLToFMqk>kDaey
zwfKT-#c`{Bn@G1SeoLafT2f+%OPp{SWW~5t$5AgY*qt!3r#k3~SP~B9dsAvfbeR>4
zBuGNNFfB?kZOZYdEPf*6ZFt&mN%e^bdN%c@)W4VS%~!j>tRhbY_N5GWXI;MYy|-kN
zr*UE$tWgV>_u{5&u@2IqUi>mDAt}nECf+_uFHFYU*G{uPzQb)uiH*yHENLx*WQ4~w
zC>5M~J$SXea?JCSSI*0j_R53uQF_#$w_M7vH4Q44@}kP8wWYdz%F5=sQ8crNE)#u(
zYw%wDrSa0*+8@jE`ym{mx!&&@=@X8gnVPY!wLeT+R&eU>`w?}j_5T<p7iR^R;^un$
z_;5?ZbB)<GW<{fjvaVz8xwlw%F6_L__-=h~j_CzbReKAhPjDMeY2OasxN6P2ulN1A
zYJQsOg@*IJ-BAbijm7L^T91*}w|_`1A#@1K2rCNxh0TTSh24bxghPd6g;SuH&+~*!
zg=>U~!W7{?;Sph`Fjsh0ct`k1_(J$W_(M#Is%VStVo$M;*iT$r91K_8+lsr2`-q2#
zM~frGk>Y6a0`YS3I`J0qF7W~Jaq(&KdGU4eJ@FIqEAc1sue6xf(uH(q+Y;$z(<`M1
zq}OR5*12x`_4#e{JLmVxccnLkv0k=G?~>j-ePH^C^oaDx^x5h2)0d^MP2ZfJlD;qf
zNP1>^Zu*t<y!8C^!t}T4U(<hQ(iuHd%-@~qky$RYa%Mng-ONUrEi&6=b`b_<_Rbuf
zIZ7B<c&acbb7JO<%-GCDnJa~X#Vv{(71wQDvvt+{k(nFw2NkvgY?D7Pe}4Y-{F(Vt
z#Y|Do+y?W#nFlhD7xm06pu01#Wai<`SY|<S|Kb5PVE4?T;ts_fGT&!@my$5rhE?oQ
zEJ|(C(o*l@a>bRU)rte8wOgN%){{1twv=|1hP50Z?JFHpdPO?A^%v<R=}Z`%<6`M5
zVPMPSEi<K?S{`T}-#Vu4T<P}KousMK!>z|kGo)vv7o;~z^GXkwx=S-!2Dhx;azV@d
z{G>82bJEGu`}q^31=1o|elPtlC#`F(%dFR7+z-ooEcb`pX5DGsZ#|#CR$kir#QM_u
z(LUKe%Rbk>#J<|T$-dp5YW-;ocE*+qzm&Eq?bLFeow4#(NB)WYto*b2=dGvnujgO4
zbJlxy!S1w|wO6tS*z4LG*;|zMEZyF!v<<g+u!q_E+QY3$_A#XcONSRdC>>qKNsyjV
zI;V7@lfTqiUIojkEw{A%ZY^W=ZhyV~y^gb6c5LZt*|O!X77HQwZfTQOYdKtAOCBT-
zm4~)o-=ef8t<|ix<!y?m6;G3QDUN24_m&SVB=ghdBMJw}BMPGn7Zfg+N6MoLyA<}4
z#}<!o87*HVUs<@WFsYyv?k_x4II?hT;S|7Wg|@=dfS!drix>Qd|D!E%QR(~A_k|7q
z!+$OCUkm)#0{^vurv)}?ozQt)@y6oh#R2)o;+67kZR@n|=fR%xy{&DnR%=IFzqWqz
zLoLac%UhRe?bY&q+gb8c@|>1E<d<9K%5S%x(mGQ9u=VcNO<T8;KbOC2{iyXb`8Ore
zx`84qxz_1z%eVDWT9u`g6_md1&ns(noZoSNTTB^L_`I;F@I~Rv!dHc_3*Y>g`>!Sb
zU)c(jp~}|EcEZ5sP<XjH<lp-b|Cd^z(8q&S3u~5cvIe)D)^eJ)v9*OVOxaf%Zogu`
zZGWg7V}G7sJHNL5usy^6F5fr5T7IzooBek_o!6C<^F`$>yIVQ8U@4a<SLb`=m&vc7
z+^kH=f1m$7|4Dw4a-Z^uGPAj@r|`1<gZ)FkU;dc<efb{>{R+nv?k;>&T%~wK@$TX`
zrBzBtl<qEl(bA`7c*~TQ4_ez>hqYea`c7M^ZKt*gZEv=h+INEcttXV2vc57>xm{Ug
z_f<7{eT2G^dbZWq>Z?AT6$vN1a`y1-1@ijYY1tpO{@StHH2qlZ$J|l1!4Puy8Uu|}
za^D$atfLUdW5&1Us@A>Mz2=eDcjhI=xAnukm&DfSQt#iWC9(U@{{Qdor%%&oHQok#
z|6Jc@V1Cz(b*``ZU2|u@=B?qkp;wf7!obo3gt9<cq<qz~TFcVPPs(3vLKSHVs@8g_
zT2MPnE33<@ebiOdHCm2W*9W`hO0A_HrA6u{>Q?G@>Mk9cx_8I!>OtzE>ajh>sHe35
z<b^s)Jx{$<y+*wOeXF;sQ`Gx9mQ^27XF_hS`l|X4^4s@SKT^Nwn5F)p{+>;?ZP?KX
zyuY$aTPAB|+p<e%duLZez1DA9zsasG4D7fzJGkSrY**(4*=>6qnB6tIH;o+A?7^LX
zW{=9Am_51k@$6YJ^4&$*E3?;TCuZ+xyQJ+hIHEoR$7CZrGdrjK<m}7Yx3llHpW8mZ
z{jBUK*{?b_%Kii%{?f#bl{8H&Xzf~0t&i4ETT|OW+q83q&ZV@iwVgY5=-5Kri<Q}N
zs&<feB*b-C$Nt(0+Ue~Rv~#ozwF%nw+GOo+rq_9$Hl5@;*6kReJ)u3TJ+Hlv9PK^r
zL+$g<-8*;CzU$ngb0h7yj^p%%E;HL6BlVo#s`t>B(^t}0)7M0azJWeO-(25b-&Nm-
zX;Ml*L_b;|p^tPlM|ZxVU(oVuLwHNSocJWx`gI+X81!3cdH-~(-`-=H9?R%=wLV(|
z=77%2F1^>d+&lUMJ@#w{`r{qXMc`#3)1L`%qaH`-FN8}MzohNjYS7=%-`79wv7)|6
z|6c#4{j2s*;B`{QFv4T$F~TVE($2d&Z!wl2oc3edk1>{SA8xFId1H;vzW*kS_3JEs
zKo7X641=+Wv4yb%U-N&SHg;*>uJddcMjLw@2N;KSUJwKW-VZHabchJ!MB_ALbhDm&
zY|mjQ;{q<nOMo_<V^fd*#&yP|9vukd4tUcworf{4INf-(_#j-TKUsXH_<}L3rFTnj
z<2e$g@tW~2K0P-+Hol~B!-s8Y<HwS0{Amhiwv;mSW{0^<Nh+BrDJ4sCDOZY@G9c+w
ze53e&@sr}0#kY$e78e%3G5ZyN>A15Be(Siu<F}4S&2`KTX_?KW=4Phr?%Et??%QLa
zIoyP^5~A~c^91vBe+lL&b8P3Q=0$!9<Cs^P*Rh;1(41u6&gcEKIkls}U_K1xw|3^t
z8Gg-Zj@jLLx%ndMm~WbI@w(=GbD{aI`D-qolZ1ge-!UmyYJVWt3G=eK-Z{8-=y<y`
z(J6QC-|=DRGaa9I9@hCn=L@;#a<Apy?IGko&VAYWH9>A|NPo-?&Yjp4e&A#M=jq(g
zmW8=(S{Ah|%I%QbJ-2`Eu(s`5C$|l2+qZ4A+;LE|({tzK&dXhzyN1@XZC2ZJFu&3^
zuWeG>g0@9Kf8X|dd!k)#yR&UpyWVzx+oSEp_Kx<)+n;Wq+}^XjPkX=ib=vO+*@n4^
zxjWiUM&zcoKLBn1Xl|C3Dh)+g0zv6_9#)p}|E;vN-am*z))sBY{L`>@Xy1&%+P&ku
ze-qaJou@Vf>#!c1R|h=l*y7(sY4vDWC;m_4JEKRoepq9B3|U;T&i|j*ulm|OqwwLs
zinssO(xLAE;BhVR82V2i=e*_pn@2e;yUzQH#eWyn)N!_%V>Gd?|M;_*Ef(9ctifYq
zQ_m5ac?Lmjg?6DmU=+abV}Hkf1^f{p^NkspS~s;usv{+&%#;SpC7@sMBBU#)mQJ;%
z)=t@}L;#irX)gzBfbLKZ8>VW50_7D`{gZ#E`ldGKutBOeD5*ZFOsW^u@ZX*)EgDbM
z(%wFuuA~kvZzl85B0^G3{1%&-+&?xq)hqFOQcC`j%q7=Ld<OV4c2-hMo|X75@fpe!
zA0m=^Vjx5EBt}!p%}Wm8^U0Hv$0kQ4M<iA!NFJM59rMVce99|p44@W{4(KNa0yPlR
zka;ce;L{1V!FY%tUJfN5l{}pKry8U*ln^Uw0db$|=0II4enVm`$IkSqw?KWqro9t|
z#4>=T$}^z|ryY1}RiwORDMz1h(3{sDZpO+yB6XKwfV77rZ%-JBmNHgNteWTzGg~^X
zjx`CHm!fUzq!<HVGfJ;s_6hm)8i1kcjRW<len^UT&b&stKc<;Q(tYqP^ajpMWdW&l
z4?=$2!Bg;M&EqiR5>jP~a#tBhx#mP6xhJff<pFfr&!GyibWoPlJkg{%lA<j^djLgc
zG-cX6r=?;^xdm8%jIL1WwJEU1iS@mRT?V*1G0sUZi(L#D9vhzc8J3qN$HuNmjzvIv
z9%>|$vFlJykT^f_TXHlUJAR8D1@rLq8_YY^i47M&1-vHC6<?P2sRrRI;am7({x{)I
z_~bt+ilQX^4ByV{VouD9ZNeh4Bz6k#i%SZNg!hGyVJ5(w1F<J?KNeRIR}_~69R!uE
z0-X27)x-gg-Nzt7drrgA{7m>vTvNd1I`B2T2hxu6+HNQ(E5|uFL0(thP+nK~Q1~#j
zskB=d)UoPloD&x&?!^>OGx2McD-p3R%xmarCq5x|c>Mm@i1_^o&~av<rzUr+hFHw4
z;rN&uFC)22HN@|BYf#JhRQ0_0gMdfkcK{xY-<H-gpJhId-;h>Z^M3KY<6$$}-xj|)
zb42FQ%!lxe{&?vMT*_1B`w`+#$?f8&#7Dx6peaz|Pnb(??Zb9Hj$emyx{_XO;p2EU
zATNHC+#-H_{6v@$GzCih#>pKSKO|o3d`$eXK-~j{x8R?VIl`Rm8|lB&e`Vguyd{1w
zeu*=*#qs~+c_h>WO2JaSsd5Rl{fW+uag;SHyofyfyYh`o4|L^A<%^J~Tn=B_l;_Or
z@Q+BuO!d^0)Dcm0_OI;k`V;!2=7r|@<~VbVGXo8K(B}2S**mw2uj^n#SZ<KtF+OxL
zVB`FbiD}|T=-)iUJi|B_I_J2q8kC*FHH1sbxUxcBqDq90e;`~Ee*@|G0`W#=SNTC@
zcY2(mY5coJK&|upl&#;5zfF1WR63QwILACe-N(V6>YnmpiOZ!C(y`L9@)8X2w!MtR
zCFW+u&E#VeSL*l0`^NiM&=+zwK;54raZQlE@S+=;!3c<CS$Sz?O9o?TV!9vkV%(0K
zaV_&)<~iXx$N$=}T)K?v@huS)laE)MR=G5BzBr$G0J=Zqa1KO8w}0Z{cwgZN9`Q_E
z6OIOyx$!mPYam_b0w4afIw{`j2gU$+Pkc{0DSeBB8`5rE3;AnfvGi@}n=`AzA8HLi
zdIFJIy$bqe0)X2lv6qi*9CX`?O4D~NK4jJk#JBD}&7Fg<b^Lf;X&i4U0JYN#<sHCt
zfESeymG?1*{5ScN@+ZO9BM!7%-6`abMJ;U-hnuu1ki!`<MVkUYkt%iLKm&lj4d~(1
zekKSgB@_J37>)ILIdp5hWpPVt8;g}bhqu8ln4^T_;ycH8hV#uHZlD!%Xew+J4CtK0
zCBZx?k@7JooFJV}N)nDEaQr$YLpj6Z!^AH6cw)zv!f})q1`C71%V3NM?UA2&(hn>%
zz5`&}3V_ajXFq8_mj4v3<UYa}X)=`A&47HIkV8`@byIFj)Cc*q+|uzNj04UrgfK=J
z<2Z)}r7;yQB-|_<SNJLZtON85Uim38(+}`-K8Y`TZGKN)o6^D=!Wr?$!P`?jq>1sT
zD37GVHo<_XT@sS#xmc1g3cNp#!14%yOUnknxHalwsZmq>DQTkIOYVg_iD&#Uu9a?d
z+goqsOZiTi+YnIZU5V`z+k^G4Za5x+M^j<fV1Ngggydnn>7ab{Al#eSRk#bw!liIm
z_72DI_KBUGbf?5l;*LnMshCAQniqBwKvQsH%-&J9-X`J4mU4&w9s{-KQ(;<SU#RcC
z3`9!uWyt}kgA;ObNh!vo6tBsACia!PsYld==%*!i$2n2HIztNS#9jztI_jt|<C0Fo
zG)nQQ(vo=2hdBv=^auR+O!2fdgIVRiNgRsEf0;PK4JhB?&{Wtx7!ZGeB=-X2Vrj)^
z)Hj8P5v07tp<svk$I9u$;w~&Iq)-}*!MB(vTF$j)5iCe7*}JoMJM_T`ACS+cLVxu&
zH|#?0qxg^UAM^Xie|H1+DThN-x0L0A<vbV5msgf<kN*fg16+?wED>r1IpKOpVF~n2
zG1ml~%2NOo6t|E6LcFRlAt&*oAF-HnjdD%#E0hOK`6Y9oCN@fJRG5|6%nk78aA*qs
z8U!G*5%g>T$ld^Y;3om+B<PC|Aa1A6v)gHzb`OLw#ct<e9gk&XZ$N9X8|;UA9|N&e
zA5b4+fOas_7o{(PYsRYrFd;pG=aOi6jzhb2m^8>I^3V&@LW=m!tVB{6CZjjTl<AGY
z9Oy$neW^2Fn!Yr%Jk`Y1oaqPhLHmL<+yMqpiPM^c@FduuEIi5KnMz43Bt}(mTH*}o
zw}RnGVP@j!#0dd7E>XFTfVG)Uq;VOG6*`c{C84<wxEu+UVoE`5s0XxWUWkq`3DUSQ
ziJ@=-(r5$aW+{M{VV}CSf=Q*-V88jx562E(KN&X|H;Css7+X%ygZps8IS)pDsEwjp
zG##71AHGHZh_<mf88FeACyEaN^^n6s?qu;Shku`VAN2XLzjzOz>_z{`*cMUNMf=H_
zf#PI{k603)gm$D3-$i8xA}achF61W?K5TbW0e3TG)@O7Yj;!ju^xg9F^7HC@>U?!x
z_FV#fzCNGU4chkt2Dsub?;$8Bbo`=dq@kZB2Kg%Jbty*k=!McG#XRHr<<;!n-dL`h
zT`lD@Z+whAm(kVALwPO07BIFlwo<l{Cy0NiGvXfvY3SOevWwAOEg}9I1oQ#tsjI4B
zg6spaBunx0T4C*n7S`Sjm`|Sx{ngZuk?B*=8tl&r#H=*Jk(rOVLG0)<^FtVlM^lM3
z1h7eQ4z*z^==@wAQWszgDJC()3YGb-I;5>7=bFD_#1WZ4!vN<cM+Q$kwv)EwOk5=N
zDpWxxj&vql0d7v&jGQqtsdQh!66rqa*0i1ONEg$6Wau9W+J9+3_yVLm{ov*4tpMHW
z=hHi+pG|KI^v=+a(XdQABE5NWW_k}lT=siI&qsA2e-v*G@%wBu1@%#;qb*ZAm=&X>
z*BXWSjQI@gpZyWi%LI(3B_N;4o!lBSpdz13DCteW3jz34stWYLw5VryD*x_>)?0%s
zBQkN)zhngJlcmp++F&aG;)hngx{`kcyipI7y_CJ=SLIigy&T^!$uDWU){LF>T{M_^
z#A5nB+V;TT9+z%tJ25ztJ#`l_0)01a8$VD&C%;tNhRQJ2wsc{4ZLczbkMi7`5qP;M
z10D;6^A`kqh@O-ul_ynQ&8cn5OdiFP;VIcsrK6OG126}MADgC3hvgjo8wO*T{-v?A
zv9taq0#nQZ_As2MXM803=LA`$jLJc)eE51K>jui7%EI#-oU$5#TtEt0AIdt!bKk5V
z{j(L=h8Ly%OZyNHxXka?2$-euh#Sl^q4cr(Xnm~qJ}l1zjCbaXAvYc{8dL2<Cq>$U
z_L=sv_Kx<BejY9zEHcyPU=uzVvj4O;v^Fdp!%AWAfXkHgUYfj}cE4YaPem(Ea=(+W
zyniP4sKL)Q_`d~o0_PzAeEIJ9pj3>7#D52*6Ts^Pz@;RHiX3G)U+RFwe@msTvOQ?K
z<iv-|zay{MLF+g=#5elC3f}d{GUsP5M5s%~By&@OSSN?|GS0ny;<MO#73>&0D7Is4
zpV)5j<<>fhj|pPyRIpua|JZi1J!9}hMV>{Wzvc!;2KP;S3HzphPya5hBMkzqN1$w`
zCJC~y61}h`d^rS2ud7_IUQD2?*0$ERR3E+&^C9*!-~|HtZ23%QK2tuCA^S`AN1XLR
z@R#Zk<09h%>JMsku6z#Q6wn?C%WE0nn)p(tM`$Hp9mXAo^VE^qDk=R_mh)4_4ppw2
zJy+F!4{m#?mCK@fKK*X}fU6y9^+AQAoZ$2Wf8>Od{-Ab*`QZ8K?*KmnFy&C%8n8ua
z3mER~rBt_X?oK@q+*;;t&~w`p4&~C^^HNW#Cq^a?5r+sZLQCq^)Em;0EY{R5jUjtv
zUd+#fdOTGfuwO0%ST!8k;|WTimIAia($>;)(MUbmDDaX2wxln@Kw1j=8m$6pMWTTz
zYh6ldFGeG42cR|EO6{wq+B4D6&(hD*p48@OGadNu{fc`PcP;cPEDJN@@xmiGmxcol
z!m?2gOJ_zJXOxwOSBs3vi#s8pN6o3`O~!4;ZTidf7^_|^f9K$9`D^7+<xu%+`3r)g
zMeMb29sHmneg^!e{meYWQ{&HS#K+3V(AUEv-WKWX=4Eu-=lf*aX1C1_^@G>TZtTLW
zY!Eigdfwbo57`Z%AA<%#eCRuBt8-XO+XztRz*Y61+CV>O>8NMkOOgBBoNi9@VT$QT
zMGKy>eeXqfDueo^`X%OQN=s&``V9g!oRlrm2DQ}B{c!l7sy`vL>H6uK^Ja<ptWIgu
z01s<-Y4;kl0`Zi&jJb^Q6rdY0%Xk*>l<9gJPD{~eGa!%U^w~jqYDZFD8}+?;^ZIC5
zhY^6*m9Q5tTX+z9JieviT<2j4>?u_+r5)<v0PO&Mf333Aj?fO)o&8_i*AKo1;?)E^
zkEihlr8=mECN~P|0lxL-K)K#DzA*)pq)p-S_`>+tK70b)5Wux?MS?WR^Ghaos4wDu
z;>$X7ulUMAseX@sPjN7dDwuLvQjdKc?y}&2*?6zYvKP>pBWW-6N9l?VZ$oKfwXD1R
z;^52)(U5kDhSCGDlCr$AjIt`Ax6-aG#g~!VA$4Nvc$}qGq*Y*Z$fR~I<AN08l+?%+
zTpg#*PMw*W05~$WUuxURJS;UVbq?TMXL%0jos&8&bx3L$EhF9m?cR}jG2Q{~;Lw=o
z=D@WAEk^jXt-X2RJ0-Nix65B9=O!OY&PYB1%NLT5CLe%wUh?JS?BwS_eHwt*l5c_r
z;>+aK$txNMsU>fZoZ9kb+b1CMdCB*j8q5IOi<6g?adGlu(2=|lXE=B?@m69?VvIB|
z7+@G83F6nPP4ud1W6gp}p}cBxs^?G9l1$LM`uEbWmE1Q{ohW<xN%BCxB?#u_=H<3!
z!!?rHGZ=-NiAVEt8dGDbx<aGKI&U_zy&46HH@j>#MAysO82Vyp0Mu*dXabsNsXY?`
zqYTslW@Wx#J958LFnj6C#sPc5=g_;Z1L~3HD`~ny!P{v6B+YLe=uLXh555%p;MzcK
z>;oDDwa>vLUmlcCQ|Koo5>(Hf=1wi%6a=`Fa`8zXme&U%j8ApFa*`*Jl%6PKMunmr
zSL%+N<;-{L0kfl2bJp;!iKl$(x7M_{Z}DJ&Ggb$*OD$t|cyxlSSn1Mi2INY!ajp-<
zg7`#x%tPOKH3RPNj?<2IBezO3AhEDzZbdJcESRz$uLW>l0(#7Y^$3OXLml`^aiDFc
zZAN@4-$Jjkb%Vu`?PI)KAE>Q$k#!MTVj2b1kCMxuK!3jgc(UOvsei&%_LV;&fG4XC
zMN`VJmgYy~N1#vT07S+6!SV-g<d3B?lFAD>ER+|@AGqbv6IB_xKXQLinfX}-UzuO!
zo-knv@I8frE%}VvLA+}xYo~Fz9(tOr5ooVn<H40$4WRV``^()hf2$5=jg<K_ft$;6
z<_|m=KbX=s^&(g=jBAao1!2~(O`lQ=-1g8DPzCu%0Z-(gC}arSn(+SdAwPJX(r5<4
zhyLt-Dt+T%L}_g4^y=XKAzeDDbds0n&1b)E2JoHXkAA?JXPM$Mh3~K|lzPkb=3%TQ
zfR|fezVvx%MMQqC3om%R<e#n%7(FQf`59%*&X?i!9h5I#SOZ=!5?oSr5acI}S9rTB
z-Y9Sg^W)_gwyg(VYj^{=H;4TU!4UMHD5y5{Ng9n`bsvf^7S8}Y2RMWJVQKDr=(G32
z;wy~9sQg(-8^2TovvBl(G<@JSj5m0gy(x@Wfm#VbIIEhgLfJ0`;CbV11dQHxYW~!M
z?>T#JY%Q?*=FZBE&W+_GqqO;CZJ_$@G<Q&Sz}GFITF}qtI&P2k<*cW8z;PP>x1k(H
zQI0zek<a2I$gNie>*N6NsDhzrac{SBYx=?ax4y83=JXsqiONBDqdZUx^EBmUJngll
zR!j$uvYNGdE^lRWI?e=+U!a{dm&;iiQWp0HA95Mwktx@iYXe}6Wh+bJL9`f$+PTxx
zYYyIoCC(1uO!OLRmEJ@O_%GB4u$tSFDa|g;ZpkpjVl7VeEecQy05m`owQNAK^m2;{
zqYJ)QdJniym!5XV2{u}b(;{AeZFzflz!ZBDV0Zggd#^I~g|Py6vbVRlv3K>O@RGd~
z{1LfL{`<n_g;xtzzUYXK!|Ihg)>_%>lRF7;c+Pj84;p2H_n5mg3f9`W$+^ka+5~8a
z`P}Wf+mQp34Xkx@*X8a3+z6QH;2x_x0?%3mzgxefKdXQ43cz`}%P{Aka^wBrwd|$B
zz-xumCj2-afVGUjOqg-WVSRI8VdLT`-kb5eAH2MDcr<w3dT1E!vTo!@V+q!e)>N49
z2K-nC<_UhGF<5s5;5O?v>p=&%702+PR<)=3i$gFzkNC-l@%caUzvkh;5HjV41Yl6k
z1FG#!b6tgnJWyU(NR~Vwd6*|lx5S+*wiFgnfcApIC+Mx%0_ag(3P$=`fOD}OM*DiV
z@HNWZQ{e+Yc#Xn=ZlKJ~shZobfS5qw*dtB2`xUMN`@Lay{tDnru8p=ovlqb_KEJ{8
zEBmwjdR{C0{roBn_B-}FBxk>0#_RT5_FG;nmWPpfB9XhgUNGNC6&Ly8)`-rP9xXi(
zrBQmw4_@D1-wQZH_;^)01MO>gfDb-D(7ql#3<j)j_p|%)<x|>TD*&t75g?W@R_><u
zmeqmUFd}a#K)RVnO7hN<M#)n9IUZmQd9vjBQFMMe2I4or9Neb^mn?x=0p=C+E7~t2
z&pp|5{NOe6S2KV=$dM)E)<9j6F9U4<&i@Td%>SLgqL4s;{FJ}U4_;o4&QGiXHx`6~
zkiQNvIX~I$(dn}`S5ixQ7~m=_R2Cpn!B?esT2dBpkT<9_qy)dmm!K=M07%fozZcGz
zIPQ48xk9&><IWfQdd4~Pj(Y}qw*{XotZaT<FRU|p56W+dFdy(d^k)L|L*9zf)|mv1
zQy*14zbeKR$A$YW4JiJ}P+BtzL0(G7HUj3!x`7Ad*GiRsE&buauceC}{0g$aOXL0E
zeH&W6;H}~Md%I=;_FMZwOUUh*+p&0MGl28x<$h5An3{i92kPbit^l*X$$SOyI^ZqS
z_bn(Yn=kqS+&MfTk6vm53!q+oX30~f>m1xzNhg*NlL1$hZU<cL2XCLhy)N9De*pEF
z2jhN<!iEe~UbqOPQ={M+lXnAZNm8?&z<4kW_G$TCVPxUVVsE!4%@vm~E>G#8)IK>3
z`S}!ua~Zroitx*1t?=5`pD%q>gzk{tsLxAr8UgHKWs1)O_g+M_&yw%z#jjsD8-e`N
z3VtcvbDTrqmF4xuK>g&PV^Ke-6pjZ0Qo>_8NCoLR{G^qzgq)PSkHBqJd#<!&73@;-
zf%jh8t~T&CJY9S^9H<vA<t4mFLKjz!hToz#PG+0h5#-TrjT-8TZeDcG+Sv=NXHZGO
zJoz^HHf4K+d|R+aG#AE`stI9U@<VDvn7u621HTvL&+5p(TmeMu_L12u0=s88z`u7~
zu0o@I5WgA^{wT(hF&esLDUtXhEBnMqSTxc>SU$^pqKT>>AG;F^Es;b;b0oz$d4!f2
zU2{)4%p>|I>xS`=iY`aqO5Q3cTDOmY9Eox#zO|Gwiu3F=vukx&XP2?iNzbv)wax)J
zXC_jMpry5t0-keL=pZV{n&-hELVoNX!1HSX$K~nUVg)=unzqOBfF~NRd{7Skx%ni|
zb6J_i&#K_#Vh|iF=A{}{TBVvsVOSW5W#Lj6nD!opJy4^tvmdlf@Vo=1!_wk4H6Y@-
zB=uW3G6dHa2o5XwKy9HGhcG&rD#1Xvk=Ud}Q1VZ~9^Ks1eboU&5eT4lj~~=m>CWOd
zJm7kyoF^2^Q@%Te>$jd1=rgyZ7naF`mdjGRcNtgOh)e9t5rv^t!(QHxifkEs8A^wz
zRnEs<WjRef=R@YVU^WZ%Wt>gGD9WiVC3d(Z-h%xwF3}{~v@R@%6q_*uVoA8XjHjsu
z(PdVw20;?)foV~SX;Y3rrLj|8nxZC8`z;BF*#}d`NMmHMgmBGmf<bM9rHo7UXv!pv
zqB2Ywmr%ScNbc3gJn9v0F5Db+2Sfd#jM9yy=)XEh96@?PvGKgZZGJQoCvPKOEMBZG
z7mQevAXw_>Qhjf#UmXS1j*^?(N6U?+qviV5=JvJ28$0IhBf<cG_>|kI*;K!=0SqvD
z8NI?w)_Yb5dT_%&fqK-J^nyxAYHVO^;O4k<`51#+Qd`bg)>xW?UxT^XBxgNu9}T$I
zzPE5<;g`ZM)N84;I0?bqFgo{i?rEY)d5)K(omgMvJ?U4}1{iM{Kuae%Tm~J7f_eE(
z2$&c22C)R9Qqm+!1*f&1ql2wuNg7p9iZ+$#ekpY#NFH0Bcr43d%^)0|`K+wc{E9u+
zvaID#i?<?5oF)2j%5&L}b<RpD%_khT1ewbV@l2PcB}+@P=o+Q)cv@U3CPqQnHxzq8
zA3A%*q|BDyKRg@B%Ns<as?UkBGQ>B<H%q%AVrm_z*i%1FTC)f9;M#x@)uzd`Vrt<I
zmMc?7=N>YTvk$e?_QMqUt@B&tx5K&6TDSvI90=%FT-`OVRY$9Y)?exjg1#amrpI(;
zt@?p>%|c(LRurcYlzQ@I8f!ET^kcnhy~_LZ(s`*GycX_!sjG3Ir_9NX!yQTeIp=r-
zgUI;7e3g1egJ}j+Ft($Zlwj<~O_FVZ&e%_Y%Bem5QZg62FS$-~NbFOfo&ZdY&5g}X
zim`8EUnWbjV`D=An^e$Mrb=-|I5aNAh2#pcr(-jc%O!gzmrM?bJ(^r4xms*CcvvyH
zBBrq=Ys5sO55je{!DG+>!1%<XSkJ^eK%EEaqS)xzcn6~?m5jxDg4S2CJiRPKjh=w@
z67N8tX&{aDOzs$45z?&_D<uzdv`!`V2@7(gV`B-#7sRKfJ>{)3H)SSeCdF28VY%3#
z<oMVM;%?#-;%r3b^33J(P=f3S*#+4J`gP_;=C0=M=I+*3_O!&ee#BOh#M&SyGS_FW
zDPs~uL~u#w8hK;oH0Wz>h3qE?9J4dF8UyAX-kPzK$}KuCc28__<{5Dw0L}=A%oHh^
znF5$D9WL!JZ!7PSnI`Wc@1bO2IZQDif2Fhi;5JkRu^WABj+{Zt{kzeA-aw0SUM}b8
zxdtRKHYseaE-j`{sF!KKaj?C;fU^tepZcSICYF6pq%~)0W_mDUpzHGUUhK6P&YW-9
zOSoKYV(Qw|wG|FV<(A%@y1~t9JO}G;I;lh0dZE6<<dlzkly<fS+#Wb!uYF8|Xj0#_
z-5njMFVQ8^FrL$9xYkIyPM?5|A6HvdN^rQ~OT-zt{JM5Lur*02wl?u2tjzS-on=g<
z(Xq9LwV@@+wrpo^&D<*Q0P7uWl4|TBnD3<Wurzg*8=yx@EZ4_rJ*T$BgIk;B!u*qV
zbXovng@{!WHMR)0IM$k9Upy^utE_GwQI6-%^05`7Gx{2RV-Eo$+MLP)j>sWabRVOZ
z?iBqnU-Ve7FIU!jAm%{7UB4YTw*$&8pSd@4SJ(_arug74)t_TA_+=O&X;oM{JySZZ
z4;0Hg^yjhpPFmg?(FXGbgpR$8Hk1eHpx8&i`3T@xQ3>6mF<+)hpP1z(dMSIXZ2J|>
z3Ws`uDAptvy#KQAmqE5BJ$Cw1>I;spjy{(%?>t4LpedDk^5keuYD3HLr5+ofocfMP
zgUVsNH_?(E8~haX{nR)*pa&!h(*IN4%jjOAGACekiB~)^LYbL4(%;3w#le*xmT1pP
z^`^9ECU08J59(7Lp5}PiCs!DtMx;M4YRlQVWK^%0!==lWoj$l~Z|z={zPl(@eXUpX
zPCb!yW$5XO2h=VxC2<$7qbNXJl|IIt7+D`=v@bHE!T1;#<xz_0QXLXG<yET()h7DP
zGvQ-9u{A|$er*NOlt)u)M^nmgJaxBzqdDxItU2)OJem$J=bZRC!pXwPiR%+LB_8u5
zex`bsdb<8JMQ*OXj=qixk1mvraH(&C*738Y^Wxws3c_X~*wVu%d5&vruFnuo1K(#O
zusj}w8$VmzLQCm0pf;}vuL}nV2k4s^n;V-8o4OG_DvTpNH(o*J{mlFF&GOBON%9TG
z1Oyv(ra{WnA35~H?M5~EOK||}nKAx+^Wgh#jK7Nhn@3_`V)dHm)j=20TijE<0&tId
zMRIsB5~~s<_wj@8L9*tuBjQxAhFHq8e{3>iLqE^WF*eNi%=c6u5~d_Jf_t>vybw1j
zV~{uqK3nTiMtf>!A(dW$klLg*r2*+*61OJauMzLSbBAW}L!vqYo-goE9Pn<TDV&~c
z3X+t(CpkGeF?oCP&g6B;8-2JBxJ^P_Ph1cBTl|&7_sQDuDD>6%KyrTaBj~a5Cl22v
zYXh;LC#lJ&Q-8tZuyktk)KsBg>TY2zVRd1BVPNX_)GyBbW9qxqwIIion_<ui3w~-c
zQjatSxm9je)=zCE91O==n6u|*&&i&fdoMSS&DJN@g4EurV*nQc4un2JeY3E9HKg`n
zD0hOV2rE%AS>qIXP2I5=aDVE4@Iq!>`r(zMMMcxhn%SVI`8?0jCsqwFm4US*dkjJ9
z@#evL%uYR9y$|{-8ndd%!+N<Vef48s{(P_fwD*1F5`OTqJ8WyETW0F*W>B~x^=@<U
z#wV?o`Xu#%Z~h>)0Jyc!=!4h(0P+M2%6uaAE~yqD1LcvZXl?<-_zCzT_*z&hwJ`OC
zw1T%j_2%_8%Sh@j$V&7JpnA)3>&uGJyIDlX2jev!RK`9|daAP=As#E9RKcm@KH}jp
zBW?!}iY!kT{ov)4#?c}7appV4qr~CPJX#zrj&Bl|iH!r^mp5Te%Dsa2fL>?XsGalX
z!~4{@TAn>Gs&$mZFg^FEj<t^S=(h6bYVgws#_a2pUKv2BUgebJD$9(Ov0&`KI1guJ
zz=}q&T~)4cd_Dh&do^(Ot3fBEB<#AU0qa-Oew>&-F?~oG$D|pKOdpx)k?EnnK#;vT
zdoxPa7s@)vQ(ApGeHdyY&;~WLH$!eI;4hQCO`WaIMoz_&l~FGhJT7MK+(*)3crg9A
zR~9fv;!<9n2J=s)o5S1bx?uE26#k;9ah#-gL-jtWeVn8~%}>%z!~dN@F^*&JNGsAY
zc*4i(3Dx)_Z2TV||7#zocH4?(X8Q_8WkzMjIUxV~jma=<mT`mV;j)hZ0z-8%239ij
zU9W#?86Fd>?e?M3gj<&-_$MO#DdqYnivK?<f_B@u{u2xM_sTDK+eiOF=GOK53gfu#
zqRZI5`X69bG{T~Y;#Z4_mq+;tlkxVo($v=hnF^$_(%8(t^+OsB_$V5zlm@BeGEKmI
zxbd&N%9f{P76Uv-VEE!Lb4HU0`F@36v2qlA>BD~?;HRbG(oygoPymz*3H&yhDYD4`
z9)`nr2mSm$)B)K2j=Wz5hsXy~uf{3r*2XFNo%)?zw4pVVa*|Hx?19<+)E(9BYO$+9
z=dsMg=s5#v)j2f2$a1LX#;m71QAOF#j4a)6IWvRs^K0ciNo@INV-3;6VH@&ncS=9^
zcBGuI4)8-?0nmoqT^M-3%K1F9hh+~V9;JIYTqaSRB|YlkfpSW6Y{~f7N!Ljam2tI1
zagY2+2rh8*L;OdVPNZ1!b^g)S>*VnDZ-lO6bRz#aK)|VT{-`Fer?-JX-74SPM}Lhk
zZ{Y2)Ti!eh$~XdbH41s}2<(AhWpWs%Sn42kO?3-(fV{K3Gj73^@pI`oy7i{q__=H(
z-8!f{<XRCpA`|v^(G+SeJxuRexf$H;-kWRAu`=J4BTzg+e!CeIkBjnNlMKcgh4Dq5
z(MFXc%A<}}I5Z!T{w_C#>Z3PT(V#B|8ciGcf5Y|1$6zHAbR6HXR5=>3sj{gm@_=`J
z@U|~|0W3#m&jg$u2IUOp4E09!y3l#NI$pgjd@f(9RnDH-FUU8XMjw45!dO|KtWP#p
zcK?@Sr^=X4&$|BecbT)b8VTiAWfIJYNe(qdxl3_oh#H_7BzEO`<tCUXIo~hfHw?F{
zcVgFf%Du`oKd?hbH~c!q(~75+j#703<uPTZ@=U-yv&_S^2B>-J(MfZ#%z^L6Y8;LC
zvrs*!pGMMKW8=%PejXX$y`AM=i@>}*PJ{CK;yd;k#>V=3&K6w$Z#jF2|6k;WINoh{
zHFXuhWObtcrv9>Zr2c|F*SN*F*%=LX5-dG4xAoyQCbun;Et*~@!d=XAv>Q==TUR#$
z3{lr{&0Q+NZt5=CJ+!Zk<Bekg#~VjFINmtXI5GEtc_`pubv*)dHLJG)Xs4uYu#aIL
zIc*>(e5yh8+VqF?2h?NL!vp7|vTtWEMX1Bg7B{k2Wv@~XQcn%E3-cGiH^-S{ocR*-
z66*uACF)pGlk85|pWR?<7%6zh4$sG*E<Y!qt5%S`1!Qy88Gb;A`z=~Q-$H#teFC4Y
zgEd;=)B2~&H1Xm*zbDV+9li4Nd`FYg-+RYxt~39u>c<~yUC7>F!Gl@E-s<13(X`!T
zYm=OkZ4Sk3FgoC)iKVkkWMS-eK(J0d+^XYNRvFi_f3`lXkwvWSEZ5Dh>x^o?Rkm?#
zUKttPO%2QLoPEBGoy+t~=2B)4vqyFqU<W^p#~B>UogGcot{>&^NW6cAng;%<=|<3>
znb`@=K^Fr74|H@XyD&e*Xw~yZYY>nRojrC{#bsJrk7?;L;u<1t9cUer-zERK)?NiY
zTyjf8v}-N7FU`AfZ1;dST+7tOTS;pU{WQd?4ydP9%RZ5hGv(Kp60eaqrC4EY7uGGT
zQT*A#Z^a*qFzZ_*wDq;Y%|PD{JgiTAIo=!^dEQal>dx<~H3u@@d*jPG#_0<j(Qlj<
zg!3!hF&aQ0PT<f->4$5h0GHs{RLBQzkdJU4dZ#7as?`jA1mGn7B<)s*!rTaLT654(
z)u!pEBDBY}$I9t6q#ge0+A~e!MXhl>r@f-R)i7Sy07lUd`o)ydVVJrOOCMMtH-Sf2
z(cIG9lJr^>EN5Ii^3o%4CDrL<*zV}`Ty(xHJ<K?)V3YFQ`j|r>IAj!|o$K6*aE<HS
zRl*XlcIh=Qz4CRQ_&Qv?3hpe+;VCen=Kc;sG;8cPCbV}MxX-|Q4SqImfx8WW-I6~D
zQ|lN9hr#l&{NefGg{2Ei&{_YcN&I2#t^Z*pjD-GoBj85OBO~b5-EX|7pZQ8JK(sfY
z&~yo72~I|7OzBL0vA%_fgz8c`pQ2X=UJ^tzO-2Rj5gyZVQP@uqSCer2ND1xX$eUWv
zBY6Mj_I$2h+T7mbkF{<<eBNlBK9Qi0E~nIGq1UHnb58?Jd@O733jisJ8J9l$a{pe{
zqb8QQr%77&_?J~ib^9m{j2~u<AM5PY!?z4*4Uf-YJ1>{`VXaK$v{ZK~sKqqhvdEmX
z790)I{>C8$u0E{TdfCBK6QA#}^+wk)%I)JqwaROmlk@!$a@(&dSB<2sftvh`c5Z8Y
zEls@<O?RHk+$r`k=Ijx4y<l5Z)}gEY_&Sv7vajmvjQ7sBb`$;WI6d{OYpk7zhl`EE
zIMY1MI5P<5$rYSt?P2Xv+{n(lQMkKsx6v#jM}LSK83JX64e00+jizM0RDMj=`e<`?
z;|t?!z!%1MfDeoX*4Nf|h}>?4=Zgj76F+jhSQD(PtV^wHt!vGGW<O&gST~1-;A0{B
zaszllqYl==vqu4B>s?nTvV7OLksa6N=5t2?|1p8*c=s(T^YWwedzpxx97O5WBBSMp
zrOtT{YnPi%`#9w5Y9Gz#>Y%T8o><qrJixrQj2io4<DX?ik7)p&!_$Q#pF`T7PAr0!
z)kdw!{lo)C)p^T&jvp(hntfIIJ7#nE)^y`DPu?x{<#M6phtw!hbIqaBuQl!8y3TZk
zT%%YnhZs;7R?B%&ZG7ZNxn<`zX%buHn!`aMV^i;+16Uo1GPSI=gtc^TIA9-Vxu<<$
zDd~)_i(~AD0LS5lk$8JCU@kWzHv*S1huGE3KRwqRF3UyZ;vB&0?*`!ke~l{E(Y{ey
z_xPM1i^y?`qsA~MvY=xk@~mM5VRFJR6s^6R#3@#D7-=<!^0<F={J*+WIvz)(Y2;`e
zz7aZTDN$Bbho)qt5SpXuMOJfgjTgv|9asl_i*<7~ZTqfZ6n=Ml_&tT)xtFPz?Bf{n
zNhT*fF$XOx-A!W0ldrj9J&$=;Z^BNG!o^92QxIU03<daezp-i{7qzBqkh$u6oK1S7
zW*uzC?Bg(c)?yBIv>hj$!ig^XILpzNVw@l<AG22i(6J{PNzuL;(2?h>r#NE$?#_ty
zlelGdyJ(Hj@%X~V=?mh!N66!Icu&itxKVM_;*(zFKeES!pghiWVXMMc_J;&)JZdim
zqf@VzA7H;?e{6r8A8Wr3pyO0Gn*Lzdfc%>I_44Zw*x%YeSLm<oA1KYIwfH1Du6>`|
zFW6B4`wyo%IO_aToP@^%%JJBHjvf`QaDMRb+wbMe@cfYx=kiW}$U*PG>*6*1B!+*2
zQ@pFOQ4Tq)8pm@B9cAX?d~>)b-yH7CH-|^_&EbW7qnMjVI9sUGLq0z)0O<uEINX-}
zX8ujc!4me2Qz~ahGxEVob!otO(XJ7tk1re#d7QoI3u90B4I3@1W`5W>RkiYK7@Z|(
zToyNvACV=RF8tUe$eQJrbSwjBl!H$9SP5=fX+DgC!5@hlp=%yxHe@u~Rinq{tSYTO
zUU#%cQ{zFySke*WmDVJ4Mx2Wrt1f7qx(YA4*Y+BuP4sK;^oU>Mc(0LrLC~194UL1&
zjh%jK$&a&21m{6Ix(Y5UH4Yppos56o`0~+Gb9kcU#S9<EtHI^D@t+Rx(H}S*hacaw
zOlO>Q30NM03o>m*Y(I#_1j-s8Tf(71f98c_D)g);M>2YTnO};<o+#_2z&>RVKMuVF
zqXihj6MZ6I*ptyJr}L~4OHv)6#R|PdEWyz{U*q^XrDyM1(T_j7;ZE@~A8G0*{_M<{
zQsx`8(>B#v;{Pk|T)^zAsyx5Xt#j($dL=hd6%!KVRB|f`AxQC(fB|oXil`t|0}<o1
zkkEsu7#d+fTR0&F0UsD`3`7NjJVfvjAb^Tup&?d~*R-up&qJ$?wlnRtogQ0-?m*A~
zzt-OStg3{HBl8Wcuc%+GT6^t%_E~%F$2qr>mhH*Mau@uQga3SNt<kS7^*aViJvi9U
zGk(ZkpSm<peV?Qbdfx_NX=iJJe+4d|D>mTzSY8(!Fy1jxeRY&J+Mi(P11D~5UMha7
zqe%|Vc)h~&jlORJdz;MF=V{xjqu}|5&nS6!)OSUj2I>egAne;CyjI&Lyv6W%$=QHm
zA2YPiE-dxz7hVhX=r_4W@{Xa%m9!acTE|B9Uc;tl{MU@nJluEKkfoo6%QolfuIMw*
zTz6<gZhYn;wprG+EjMkO7i^Z`)@6-C{E&Av3b__EJxK?33<{sK1@$>6yt=>SJ2p3i
zKAU;h=Ey(v_GbJRD4!j%X&5$1<(k}W+t?siQs~oMu1h#O;(8bK*%3FEtoNeAzJK29
zs}3<XKdsRoaph_n55my%S^}qrtA=A)*tZ3}k1Ht)=Dh%CF6y62+^E*oqV1QM^jv3~
zmGN)Qli4;u7KC?eY%BL^S>r!7eIo30SK3-6ZuiE%CVU1SAk)8ZTa{d>e`WPwqfejf
zYSLF~6PVYi?Cr&-Pp)0`zRiK7{cd9qroP>@zumOC-L$h){A(X7s~=&1Ez^*pLS72Y
zd#XGnV`N$tJ?#5-nr}1vTzHmVqcCjPw!q?t_G8*+(fex*9PRyeQO`UU%H}9bo^Gyj
zI(_=~*Nwg|b!jXKdz<~JZ=avB&B{k+x$s!xwkz*%`cwGXTw+XF`;Z)R4!NG{m?AR|
zFt6^<x*k7gDX%Lq+aEaEyl~D^wx`FmzlUZ0_!9Q*pJm45tZI?C9qW?iC_9VxJJv})
z6n=i4j0JF;i#(nLo-O|Mekp4_2>ZD}S+7^v-(O{;&yAnl_~|!#e;=i+kAcAK6JZ|@
zf!S}$#;1=B=p_z0w;o{n1RTd~-~rn3dVL=rWbW@lrYty?4a~9!nX>bZO<>y0w>F;H
z{)X`nj{Y0Qet~HZx$ft(1*Yr*bFUY$tiPw=cz+jE$D<x=ygD)vV<1KRhg_P@;TYF-
zNP3<0p^TCAR;hQ3*b8S>&UfioI@zAB1^EHir7@ZQT=avY|3k^yVdb@CpA#OZ&+OR-
z+R`m^t8$Ob`<)xuo@aB~;Pa`dD@!>ab$+kB_RjB@ZRpys)OWqY@EpVDo^~Nh!+h6;
z`xWN0u0@7-vp+E(VQxa7)m*x5fNR}4T86Sv1;!c`v8sAqyGF(uH8R$akrAKDx*qU6
z9Q>f({Zg!fsR#E24)=(9<m6Z{Sk^pshc@RZiyT76dJLI|%zh4S7S6T(!s8`pO~XTm
zhfCJ=jQSkgrER94XPeB2qOX{`D(Nw?Y$ZJ@a_h5YU49KFWx-2=pW1UJ=f)=)<4Ejt
zotHhA?aV{}plyELRd-7eOJlpf%=;DQP}UWgK9wc6M5bQmBh69DnwLDQz2qg$lXYR-
z3)U5w_g%S%^I+uCM&>oImw8Ru*Cl1av8>Mfuz3b+AuWqBuK#gu+FEqFXY0H#-LEKP
zru!8f;~E>?@EJIl*w%HaGVXPI=7c$ak!5}y+nFk3e%z)!Q^w2APU?jpKZD%2HpS?{
zUMVv6M1kvL>y<I?(jDTzZ!O35*hoQ}O^jjn(=Tm<pBb6+JYF(<Mm@$<$-|Mk?+g0Y
zv0p`fZLIVIUJ`83w(iI~7S;_%eO{Ku7>s_>sAoPI8=os>!OgLs-zY5CSbVwUtp!<Q
z<L7C~zl@BshDG1hJdkq?HgT_=+b#P+;Za?mH+Agi9Cw~2-zw{##j}ie&%>pCwx#4&
z$<Jcb`s`1l9%Hr{{A0{63tZRvLhS3$RT+oEd0Mt7*Lh9#8hd2sy5Ju(lV^@!op+it
zmY;K97N3LI&t$j1g&f96$uc%YKdR%%v*?E;uF`SVrQB^8@zxpi;Cke7_PN^QzLz%R
zuFL47J>oOkfJ^<5(GN$iAU=aVIoNX?MK*pItHHi*%GMFLQNLqhv|)S({eoc6_(817
zb$OP$e5{JS@YX_@IbZL~kj9wrw+80M(Y4Ia(1RZx5YCt%cJJhTG&G|++T!XvrO$=O
zc8ZPg?x@EaM%I(C-`0Y%V!t2q3EC<B9~g7xkgnVJPm93FQM{J@s+yxBZ&#acZIAd2
z%r*<Za7NIx4HK9)Gqnw!tT!<4yX3vyJ3D!efyJJ6y>Ld*)8_<+&C0dt^Ypo#b*)@0
zeJkTsS;whxEiLu_9Ao8r*w@qbQuaC-BO?X<Y-BsranWxSpCwm}zLMq9Citg)@Gsn{
z^=_(S#O%mB(Vr`kpW9shuXrt<<=V+z{(4uM^`5fcyU6In$mqk!m@8L)j&Y**edXt+
z{n`d$-zT>ly|C&F*^guWhQ3wSb$%iHU#~ZNVb#Ni_GbTBm_0%vYkptWtpAI0-JZC_
zx!iU0Tm@Vy^1L3o;U@5QZ*z@v+wXjH4*N=_=ykc;gByWU>UXOi+z8xm^x&wUZuH=&
zuNyts>JJV+p<f+%|4Pvp+92GoZ4mbD=`lV7pN(q)M?bS@^ZeCvz2HXR15DY2CUR`s
ze4__PpADlA%z774@9P4`y1?gpeeJW<&ys7YJyQB1_xWqD?VwFfZGK#G=k<nfEdA7R
zufzTIEcaJg@2T?G#s=D{tbI7^K$i8~XZTRVhZ#QH@T(0EkhQK^CmH?8hR-zoPQzy#
zKG*PhWbaehxAT1JHJ)d^&)9#!@I}T(*q6Q7*nG(F<%ZW99x?pUi5%`%-=-GayB!M}
z=V!^#ezej1yJ}Nuzv?SwZF7Nf6k@5s*olns5*hIs8Sxnz@urNURarl9-2&G28`kIG
zg(-iByc)S_7;CMlM^1~3wN_x}vA{gL4$OU%=XzS&*V9qebMEHak2Z3)@VdUHa*7yJ
z=6u9FMm?Fi5iEO$WP|tt*B$?>xq94F)cidA{BP4o1HaIc{#`9`$O#%J%9=O83pu_R
z^MM%y%6cyXGsXg!HhO<m@B5rSH}tyEjg5D=p?%WNYn;PO6z>JrDe_;6XHw*FF9P#^
zDRZ5f3QM2h`3Uv0CqkbDX8(|7uF19R5_HgxMp1#jLjOFkAcy`0w?L15u9VGCQ>d$z
zHqAcK*Tf!YVz3XKM7B0KBZa=hTno9*81s5LBO)^fYF=;J(}CaB(?&si+0WLrUSaNA
zp%3SftP6Wajp4w)-$dWplzPdbUg1pZjpr~d%Q$@g>b@qK?P*)5Wyw6V5<T{?k9x+>
z^>k3$DPzjFQ(5~&*tc1DmeKR<5k5rEv&X>PJ4e?3oWsE1_Nc@O&cU1;(e{&DM~0+r
z<oZa{@I!%X(Vl(27UK^7=kU4;jTvxTWc;o^vQ@5YF6;95Zm#xEgJnHSU(GfB6PWFv
zOFzDU4wN<{hd?KM74nAXWMuFy!lpgB;a<~*Ubdkh`2l5xnJWwrkXg20uS?jE3-q>g
zgSpg8t_P-lQ|;%We0{JX*FLYHeeYGn(Dl*A`-wRddgZ40j5!MWMW(Jr#{VMY|5Xk6
z@6K5^JA&=edzT%v2g`lTj$v87FWI|bgXh9?F;=<`4Y{;aatp@q5Mya5lQ!=Zo{?5?
zAIDkOkTBP`WUgJYuTl2<7w8X$e>bT12TS|a54g<@NMEhIB6WrL2~L84T^mbXiGx<x
znVonfK<-5T1ivDzf0P@p4ePGJGYro*%=MDmtd=#B@HM%6O!af<bF=!N(=yuY3eWq&
zhR+aTKiAX?)^(Taqt9O2a19B)F!Q{!=63Kr+B8)UZn&YyeL;^klFkdTm-)r}0XJkF
z)tQv*x=z2=;=CVudt<l@_d&)!<_KZ`4g;C@i18D6EO&`#d5%LyY~(wRxG^K+KFYK8
z$bBjGZM?sH4j37^2;3!l+-op%uRPC+jB`KmE7^vTT-xwTV;|?`t}@2ZwsMc$g~(v?
z=Y1h#4<c(GWu0@u3HyqDG7aYJhsW?Phv$4-uQJ<^=4d3p<0~7EEbmcxeQs=|f2jA@
zl|@FMkQ?~oS#IRq@Y<5O{s}fbC-)rdf}cDs?dAD<u;KkOEM=EqjB~z*zQSvP&l;J1
zTf@Bw%=a9?G8c2+iHv&}nCD25Ro_WJ%wy2w*{HlfAT0jXUguo3k8>03h4CzGIymM-
z@M4zbJOVz%@Djs^mYf|ad2FzNefDnYXX#sA7j;XY_se}8!#V0Sr;KwXu%5rA(x1xO
z|3hj&?pmhtJSSck^IPI(NZVqrL!ayU3G!Y&FwauJavsu-GmyYzJ3DC;^Wij{SFp|9
z<FsG734K_3E~ov<uYn~Wl4HGzOVAwIYfl4*IQN`OY$t9p^9l16^x)Nj4>5Xh)Gsl5
z?7u=;?AMs<kT<3wpM<<OEtw^ITkaFlz1ml~t0?PwkIZ=_$Js0y?U!6Z=Jj&yc&-?h
zIEP+h)$4_Mrb<2gf$>Hz;D_&ZfK#KF80H!Y`k0F%BM!mw3<Rw4srJfhBkcVM^O?Ka
z%k$Q0hNpw4^L{Z`kWG8yvv}y^^J_5IjiDc8Ecm)~jA(nncurv$<AwE#o?{0*k9Bdq
z0mlEMPhsDl!)U`X1)F}_4Cd0#e%_-2tly~TTBy0PuSqsO`(=%>wV=)6#?KKf%e5c$
zM;QH)hL0i-V0{alqfxJ{Nyw#5_5#~8BJF8SgqyT)mG@7)URm_zbIiKy+D&`TS#?Os
zI(}8}$1={4>ln+l!CIv&Fwc|84d^xA%5z=l!&xitd*qh7(=#!NLvwyr7uNltvhD}L
z*kAX`91X@<Q)HYM>D&!H)-Vmn^$ED2He3%VH$3b43CDOn%<mYR<S;ht$*hmb90&aj
zUX#DBz>Ejw6#bS8<6g+vq(1aR<Z-p9p6`qWeP?dCS@MCUjf`b)FLPF4=2&orZR2xH
zGUI{$NoKsITMKd=*WfDc84r=QUe#|=y~Gv93vGlkmdRm`h^+o4S8yCbFU&bEvX+f|
zPv|>LJ7w;xslBlGBkZq*bE3o*$_o2_(>$ZstGPwnAne<qtZm@CG_F&xG3E;RjJYDR
z+KV3TnHKcEZSma<=yk6#B>l!cLg?FLm<I~v0oWWPeW>kRYWh}L>pIqyRo44*tSNh}
z>Hp(sKbT9s$Az4Ox{jkg^BDLwv{_Mz&1*uAqMkO)C&J^AmzlD{IOpL#Jsy4}=a9?x
zWUCwS-`S*}?0mx)f?HG7-^a5Hy<g?~5;H;$K|YDR-texHcPzAAkM_(tEXzI_8!1ZO
zs?7E<7tuy|TsZ8l66oWzA#li1Ei?Rc1n!k)xOlejW+b{!;Mt&OSto$w**mx+<Rb7i
zt}DDf&bV^7NXvqICvd;&kD;FH4U|20A~%d)*Bh`oF61}m)so+4BsH9KhI*Ona#^d-
zkX#35PD^H;Lw%0Ay4g?s$}tBB>)L~ido4LFGS=bBndBLA=x5K8ufQ=6L`Iy0<Jbhp
zc^oWbjd>ul+KZlZchJ|3o@X^d&$Alv3A~oUrd*5ic;tG}b1W?X>l?*Bj2)KsJV0ig
zFTY=XdQPZkybTT(EPIyJm5YCJeFfH6)Q7P~W?7EMz^{*tC(e=ET+oYu<W<<emHv5-
zM5Z6EJ;=1-nFIK3Vxw&!%Q&Up*q>|k=azbZCLm?YIPXp*&Ly^$8xlWY#I4T7;PAX=
z7<@vAL&Ik)>zo^Si18-&tKIV73!laD!a2GJ*NVNQ>>tUzF2-c!@sgQOg1$Sl#x3<+
z?{V%RH}Dnw2sgE?@LI#;C1=Kl^K9_LxjQiPo@ZHmdzSc*T>6(irt0xFns3_@+^<gD
zN9ZfOUe4p5gP%C3Loe?D`)i5s15?j?%CQq!{i`11BIr3MMvnT}S8+WL8*tRinDzdZ
zwX875Bkbe&jjU}@y|Lj~4mP$d-vteNp2r5}7>{i9n2V<cJ$QOxzSjgkfc@$FO4#>p
zd?pK<c-9J*Gu5n+{>M40J_n(mIRR%}^cl}rm9wa4|MM&w`nWa#H%uEEwDB>iYld9x
zm79h&1{NCo<@7T+E;h?U?t*`??ls7?Z=NXEF1-AQ${}CD=CqKP$YQVe=rm(<I_i=<
z37gZ6Jvi2Nx+#0QDSM77dyXl4j<FYJu7iJYo8&;U^&_m~;yjjR-h<714Zn|lGLlQ5
zywB+0Z|Z%&sTZvI7Jk58q2BkKdM_|OFW~iZ{RaCBjQ<Z9|KQjsA24-&!1%n-*n^|}
zg{6IVQG?gg<h5kK<$5U<ZZdbtn!m>>YcA6L7uP2}VQrHOXY|SUWT200n;x^C>2dnL
zL5=;H=z50d4}rNS3e0tja<8mmlyxqMjI~5yZy(n}(8sf7GUo_i7g+aq(91rK>ku%W
znfA(>1RT$VmHXsuSy|77!SdYSm&J3{Sax}sk6?4!MD}w{;!Zbuu+<-`^HJh1piQA|
z1M9jAKJlD-b+Eb6_yGrf8|-tLH+z!K_^dxL+dR{ib6jBNsK~=5<9*cDpvU=S3z;#)
z{06QtZat^uY*_TVcSHV!jWTj0Smp)J1(8)RpZnn43cY;pqqecHNoHIzX2ANc)cmaE
zBeNX(nCHPUmy#Lt%%94dGs*PHoT;quoP+s{rZU(R{UX|MjRbw%zmTct{snvznfW2|
zx{}wPD10jWg!vOTWXW%2j!muum33^A>62?eav00tx0t%(x(oXA>3;=$k;8abMmzP|
zp(jg!o^RR@#<Lr}mh)NHijjhTE;4?=v2EZKu_t~mq95Ns7nyc`knLe^gdei33CX7Y
z7mH0(Y{<dpVq<fu@pCELz<dZlms%Uo3H5Bl$e^_U(!x1+70wl*|B&(XAyf7vM*k6`
zzuf4_b$>0FTN|mXA$8%ISL}as-QSBVXz%+LoEeUNenoXW+FVILgSqqxImF48^yB;a
zO4HAXv}m)=*sL=)SJ9_$|5auCvt!9RrZVi)b&ovLW!Qt@eG2L4O!gq&=Jm$@jfO97
zz(3cbD7%$)rMd7n!&nJK{ZGl7XR_Zj_J(DQbp3PbvyRrlzD_^Nd>`I0@=w$wFGcQB
zPF&i<u|vIl20`=<<5PHC{gWB%GsBs{IO`gcHt>v*T$U~O^3c!l&q)z`<$MR$9EEo^
z!QCnRtDpFOAlhH<cV;G>2X$TpSINxzfj21QJs+K4pa<*wUEnxRflm!{fwImi%DUeH
zpHCa)1o{U@8{tyFI@nxfe1dg;LD@^G_w5A7HiK6OJ>H4R4M%%<SIU>Y!n6n62=!iB
zwyh0k5#f5<aOMyh`@YCc!<c`AzUv<Y;}NOGRgMpr1s*S%b5_u|t~t6O%YDyPFYN8f
z+>3deoG}ls@LqR&W;}Df4ZX~F+`mM|d>5GWU}V+D&pbjebD#GU&n=;k`<=*IR`lHC
z1U>gDfw?yU`#nfD3_gf$_U+fbz^GiyLeu_bwBeix`_~HR%3)rhp7vbxg9m6cGA=gc
zdSH&TD>2{ECggK6%U+53F7o%3Lq3Q8O!^trde5Xi^C9#xH_q~TfO#V@@<x}k=7hlb
zToUv;#?{`l`1dUBS7y6|J;yS+;X=QaIU(r1eOwPiAJ@a+ZnnR+Q+&=;?u7p`Kg@FF
zySuXzpC7Q+1y?v;xPAj85A@3O2yi_21IPCYz{@Jdu&foqucduc%Yt?6s~-8`@5Sc;
zZ8$ce2d{Ql{$BV@j%Aje&Fl8p9vExF>EzHSk(&rqujjhXb0zJMEMo_Hj-ANt6UIFC
z;CyU;nvo0m;<G|<3){dk3y$l|$cS^Wp5bFGL{^`wR~vcW$M}cMEY{04Ay~!{$7W=;
zhh9IY34J`T2EUnQxef%sJ&X%7^^8?z-2;LzWcwM<WMdQ8TF}S!m9p+t$zgs6Um|{*
z;^z{^9iIbIZ`yE)@qdXa`w7$L8|Y_5+oP;LZ=g>;AB0aZu5n{ulWfZ>XT#KoF$=!Y
zl)cf|Z!&st^tq|DDc2seUAB^Xu0v*rF+0xdE$3fh|DMup^ZZU(&kVtF4+wrc&k`k`
z6BqYT(8oO#IL>{_I`@Gu3FFA{*~-!8hA@tx2kV>&#yh>eGQN~`-c$}YZE_~bz3Kr@
z#~R~&4miB?Gskt_6L_w-VIGT|8y+t?GkUJUf<665#=I7o_eojLHpvZqalAxs8Xk{a
zNlU$a7K8Q$zBqot9M^JB19QBCTNsDlzdSeOeTP2Ip^-5j19O~4j(Q!Z(91JB?^DkY
z)m~ZcXG?ojudMYdN1Nyq`$|2dgMYB@E6Mc3cSHj-pD4EleS9Yh`keO68{l4Z?Y;Eh
zhH(ddKW&&pz$ep&<J7b4o5*2Ik&REVzQaj<7@OcTjLj;;=fZ#Rd9Kl4X6jYmC2b%F
z`^${|hmAd1_E4zz!^Y-n%cgDXP1*IvX1%ew#^|pNIRyR#50J&?MCmtSt}%lCN~~3s
z(LZYQaZ~TdjsNS6{yL-oq|txU=r<Vs2BZI!xkq5!cjQvE;Zw%u)28gFjs2&^M&nai
z<3U;D^E0%+Rb%EewBM{YpE3Ow^ET?$T-_+x4>y^5$>Dz8WZHR?Y3EJG=gp?<&8E%Z
zc#VO1Uv4&jZZTzVG5XC$udMlMv$46&*xY971;=`Cv-YOVcNqPh;z#|H>myqvw!!+2
zG}?Tp@fn!ca;NoE`cL0c=I8VsOXzcu{ha+}1FX5RwUza9T{PEC<Jp%VN7Fi47vEu?
zYv#Mayw16P|ERgKJX4*UxP%!x#oR&WT*EU}W!)16wt7C3g+8t=!SZ~Ka}Ze0MLlD`
z*(dMiLNCnsZ^3f@>20uX9Cn5JJeliEt|wu$D$IT0%Z&bN!|TJI5jNo7Q1;r19DPEs
zYgE{O-1zyFu?I(cu+FovzscBuqYe1rP%k*z-)!u`(H<OaHXHqI#vUAP?lgLE^aBny
zZ7ZqQ{%mh8d0HpS@}1$i30dDeLI^p=66f^54M61al8^Fw#G&&xG8gCbQ`)yOo}0)s
zk&#=#ayGj}{mY(ok=o1r$Y*4*QMP(5EBj5xDr`<+J2`)mW$b8KWwnp<4s6yKd$NoX
z>cdzAYi>tA2Y<rY$8{|9%G&;z1F1KDJ}>Rjb}FwEpTa!Lh5fDce^nvvzcu6>>N#fD
z;;gmgz9yMI*J2GoHg$c$wDSw5-rFr3`<Q3o=gv}J?p1T2E7&G*+;8UoGogBaHCG7B
zc-OUY?$^eP5Le0#dDlHM#xi(K7@OcY9>G}Oq82R+)_8{gR>ms&gk{021IPH!6TiRS
z&=_twjp1}$*O>A%E|%YgoBF-L&s;-7CvnSlBRH-P!EwC@?qPp=8;MUo^MyV>pCucc
zIVt?}od@W@NM6xYX1{W8MLq2~Mk1@vyJ*kYhF)3Ak|l1b4>6;hpx^qMWcn=hTJ8$>
z7y2)y^r`J3%iKhLn2*S&?A^2<)HWz<8_05=4EwvywSaLg+J?L3y0i^<vkilT1+V2E
zbG^!Py_jWC7w0mZUP}Jq9t59yP#!Ot^#wi8Pr#q$*=ey;^x!tPmh~p(StuCuQ7&g4
z%DsV?hWrUVo`v<wJ`No7Irxi457x5|)h`M5cNsrm&AqVslF{F7{D7k$u<rF1u@Cr_
z<Ka=@@shJ)W$7z#6Z#GIsVSSXpP472k9!30yl`K@UkmX=rk*iVayAU!LZ2f|saF~C
z<Mk4U<Pbk(<Hxi532_LUd&Q@=Us?SttN(kA&wGte&*Jmm(r5Oz@T_5xiJ8E>PH;v)
zwVk}iGN*y#85($Fh$Ur>rA0{@OW^qKuCmUX%KG_nu&i@9w<@oe`4{}P5D&_l-;_0G
zz*~$Bc#-5o)km9qL!N{l+#77b!KMx868bD)i7VqO^0;$>IoFdVmU6?*$g<9aO$+;w
zXTo5ayBT9(JqJ^+hd6|Of7<hJxPkE`1?|wfG=Hj}IPb$o894zQ-)RBsd!*X7W9gHz
z3jJC1xnfw_8PBPpkLOh2OAFZW`5pLHmgO7@j<E{9kA9eM$szX0rmp)#u7e(|xsFVm
zrnYCRDZ5q5o+#}U<~|YjTRWM12Mh88re3m)De9%H_K&jm$pfbBgQh(Xnl^y-Y!H4P
zGX5VDpW4oc#7{%o@O5MJ_0q=YUg?uE4=*um1F(!KzNZ0>>jZGj$xBS`1*eQ#jtj7y
zIdfeKmNmcE<IGCWhoMJqjC@~+bLhc3c9b>d!S~aKXK~7!SHW9N*$2aU9rO>Ce%gA;
zY(u{*$4g+IOOqS?9s0zxj0<o)?*+%$j*NR3nCDB8RgXIoeJVG_zc9xp>>FaEd=kvv
z$l7ai=#}xg-N0832*-0{=-(b<1H38RU$Cw{PzyND*Wj49!QU|U-((xO9)SLvA@<0|
zKUmL}p?{e6TyK!WxF8#!-=Yo2FZACsKEGA^%-&Gim!I|MH+eoV%Y$doXO=6oJ#BK0
z<=?b{%}n~_-=YD>SnW^TEap${L&3<O8cX1BGBy}j;D<vjDQoP3zZGl_FQ3139fh{A
zJ&YM;o_{K{z5MJX^$mP^eO!w|FR{eueUT9}ftiN`Gp-^>8$Dx${s3O@Ec637=0<RQ
z)(?(n^5D3}BZqqd{x+{=B$xJoJKPuO9}#_1^pEhm_-u~)aNi9NkXe>zXpz5{4U<ED
z1CPRIg=-ITSy!2hjxxCj9CHyk<|1&szu@o4{5~H(lk!Xhd{CuWB4ZznJfLSCU_2w%
z90JCEq*vxy@FNphbCK#b9s={37kIR^ADY4Z!#s0TGW4BFF;C7nmO70Sj`zTP{!3<T
zWCJC)mRw1jsz<Ju&&a^O!h6A33he#FxT2nO1otvz_IbLs5H3)bdm`vN*yr9R?tP$_
znB;q^ff;*|)u-6-8L{d!$9;X^vTPUs{s#RtOkIn}oKK-&Oy*n<UMj49l-2(U)bkxD
z*u;0*!2{GY#=x5-KDAG7rJid5=pQxuN5#L^^<B$hu7v&f7~6b?MK(6u3_m8U?NpX_
zmT|k(#4R|+D!7|v`L~|HlB4){w3N|@^TCP6ZI1X+)-_&Wug89;A$uI?=Y-FKfichO
z90y(;){5YP5TD8#!(hCF(JL_z{w~WFTJN@!Yab*JLB9;K6Jjs&I38}wo?3FzG{e)u
z?P8CZ2gkqh3)c8SAA;k27a8+iV9s~s(EovX#sZG#%;4>EueCkfLyn?8<R~)zFlHhn
zFOfrD0)Icm0J*HUyuZuL{RPMS3zqxK&jN$v9JEZ<NP54(@@$d$0gU-5m-z^M5}Ez4
ztoH&O_p0FS;eILWeGJT81pa>TbG&KW@s59Q0rwC6qg)6#spD7fTwtt)GBW#t^B1{+
zFK;7xCdW8}zQ+FH*pG~{0G9jf^~$Q3XJNe<U$BW|8658~cn8`e^MdD`^AWkV(6LFD
z`=a$KYkQQnE^wRV7PapR{5bt^{(>HypwIi7WQmO*O8bAnKJoSbz|{ML5D&2ToaKgl
zm9tRS4?<i)|Ag`Rgz@==@%f~&dD7TCX>6X_3n%dZw3Ho}zIxhR*VAIZQ?5&x@lSi|
zuSEPu)@xV&4^#2U_s<JoR<7k21<ICV0UYPtrg?w6DKXzGISP!p)p!Q)n8<w+^QvDG
z`0)_u&<8$SSz{jjgz*E8WuG=>1G6kRwgGJIqfhAd8G)<f<9c2ASpE#WK5!&b^eT6r
zd!M`5t#{YB&Bgr~G&R?b-z{+Kift|{X1m$NI(#i~tteYV$=O)gtSX+w&*7(g+>^yq
z^7HIs8Gb(xrI(5YORzTTmbqKpJ+P}nGZUJn#Wm`oSOwkwVsjL%R=M@CYVjq5epRua
z7WhBwon736@3V`e@b#qYC}xZ9DXD1{O3%jfq*ZFs5?Ye~XS?;cUGTTS-BLVRuzk0%
zWuR&9I#)xBYVOncz7*d#;`?m0rxQQ5xX-%^uBFeN<sNjS#SZ?2Wl_c574=^%f8)+{
zm$?r+Y91=S>$qsDxV~Z(|HoJHAih6_9&dNkaeUZ=Rvh3Ca`Tatu5~vQH}Cy76ZEw2
zl@iCH%%|KYceC5<zUJ<8_q&ISCya;Evfu5+);$jEc6TXa;6B%mKLwGx<BCgMn&8hB
z6t}y2GTTirZgSI;1Ks@MS~oxGMSCAEo_0M+A0EaX1>3pFV#L<$Vky%7Vt0sJQXJ~$
z6mKosr4>CWm4e%g8&FS=UMT{%y?9uEFPdJt_M63XJ4(><+T!VgQOUbDn;y|~Uqnqy
z-6`%Z?!4l?xM!!hHy7u@dN#^bakt)5Tnvj-d~9D@T#lYT1*K*bpLH2xe?NS1Zzdjb
zMTXxAKe>ZZkN<5kv%tq|Ln*w5vT%~^LRhcESeXHvZoKk311$*m^Z@kfr`!#=GdIb-
zxefP*{T6;d)o=N`SdRBa;$%_@=n+BmnEV62&&T(FLO;zdPIJc;r=qXU!WSYm`B!(C
zJG?kU{{N^utT-I{s=Ewvd0D0Au1$K+{EPP->6$Hvcl^5YuIeu21BaAYxY5KV&7??1
zE3VS46qV5y*U~hyx@F{#lx;2lmcAza@Lr@yNAVZsn?}}TcT|2>d9LzYOIypqXi44W
z*z__*54$yJ)ds}*7L1~2+_>9?7S@wI=|?+<lHp_xTDu|HoNP%(lV_6gWEWaqujG|}
zw122FTv>yw*ihMA*-{y;JX0C3?7|h*Tk@8ET-8v^aLbxKzOQciAg=Lx`MSMj>!196
zTg%_H{G#Pw&<`E>yZwitH%?C9mcAD~^0D-D={@`WUZfk+&FPkOG<_x=Pj{iu>iD-V
z`q6Jg*>JYzkN&<UE3ysQ=IoB_f$XvDN7*m4-?e6~J*|DMN4KtMeN*c@THoLLk=9SN
z-qiY))`wcZ-};l*U$y?BTE#y?*H=Bdx}v(WdT#aN>Q&XxRPU&6sg72k@iJchb#>Ps
z@`qa0OLy&ny~^U+;@S~=l-twOBu#C(EmJ!k^3K`?)m^m@)vm5>tlhZ}d9X&=4*9Y5
z^I}~4Y3(<)7uvEtf8W-#r%p9(eUO9Oj%|BG+p4zrv|ZMAt(Q%0o7!#;rP{vQ_DI`P
zZ9l5+YWro|@2b1nv-Y0$KK{1-RqZFVpNjAAY`>uW^7iXQZf^f-`y=g7wg0sJH^D>u
z3olJNTt|H$GPh%K$C4@J@Q!8sl;b;2fxJ1iy8Pbp=a3JYpGP|W82Mz!^)DiuN?(5(
zb$qGg8-H3!E!DB(CCcA+yd-fe+__kNTnqV<d%*q3{VwTA4o7}GFS#t)m^_&LILfX{
zTjiCN6Dn`3yz3>(6_d)}Qkf{<sZ0=u#63Zfs3!;#^913?boMU%=YN8<x*%0&rG{0+
zM8P5JlybJCVAT=@1I0)uRvA-C7uLEe1?H>*D;1SbV|7XSvX|{{JN{A7qbcsMjZDXk
zZ>5fT&<a-^R`$cn#>)O!S6ks9N3b&KpJT>~d7`|+O_W)9N#6=~2NUD~tm3T9!D?wL
znTxgKWI524@=7<g9EA1n|BYPjuEsi|lwPc!|6j^H><#7{dAEDFI|s5FaxSDXN&2vp
z*i*jZf_%UQS%X#28uu|H7rG1GTF6)Tka4VuRQ}3Ml+QVp?>m*xV?U#E6V|6UC2h$Z
ziu<qFLs0%=l6=CctaB<0u!EXP7P_fr5guxna<HQ;7C8hv2<#!E9O_hF<*Xcr)$CN#
zk2T{|a=24D!X1I#@SbuM_PSP%c1OEc8#%^JElaUW*_-^iqx=VV>^|f?>|m_C$4!*;
z-PCfCn_8~HDnH2e?s_*eN!H_BU_I8_L9TM8+>HIqb(7>c>@BUl#=W@kF!6XVC%95x
z>q=>2#ou%TMwYu1Ay<mL*A4DNR$vyKN?zw)UiqL?ISHr5FQ>fTy}a@Ur?Lfmx-B>-
z`r~9X_JBd|b)|gNebjws3i+g?+=r7Lm0MjY_v7T`3nI5U%2vn&Mt<Xd<8C+dAkTJ;
z{0J+pF_B+6m4A0ZzV1}s=w4p=h6{4C`~NGa;7rEKo7~GQr@EI{PIE6!hHxID@@MX)
z$@_5Dbh<kOawcTu9&#2=JYQVij1%OEa*3NL|Iw*j;ey=ZRPJ<?$^U&3r>1v#`I-9}
zPWmXTApb0KDbCeC?uBLF8s#$VdM<Mxq9oIUxSxys)QKdojq+!Si2EN?OLDAAZ03h?
zu1onQ<X<5FBqF~~DoF(=em7v>^`&V46ZaGMV<X&`1$o##>~=x;-#>WymQ(q*`?h-o
z@_Ui!&V46}=#q4j9GIxQG4WCs6&l64-ceo#5|w!gWxki!Br1m{l)eQ2K*uC`)CKu3
zj`BBA{->k-t&!*4bMBW>w9PFE#QlAgU$_a9oIXjWB@@K`n~_PE=boJ;|I0;5x{@yU
z--0A>qPXXyO!lO0Js|O7e!bg8Ne(L|SR@OK%u0gHOiDSy{Z1trEG3lZ_vAD$wZuwi
z;w9K7-A3jnUcztp_B}ZW^14z=8=MjxqT+7chit<6w2@@ef2Gg8Q}Svn?z>Y<(hzw=
zGNrf|_92s+lANqENnQT<xSLx3(Ls`BrMUkt@>@4qN}r(Q6qN}|>U&F>@Vo!)_7rcB
zbU^C+kQvF;(vS1=spQCHf=p=J9zP^Y-4CXgWPg!^6O|sEPE8^1@Ae{pD67S})|3(~
z@r2+-#9O@0O)YPCQ_JNpNT^c2Co3R%lDoe&@>%!U2}b<k9aBrvI<=JklH>Lv?Fr??
zQp&QVWMPnr`tVb7yvUM7Bxv{io}5J4Qy(<Rsg&^3-o7WtB*(a4Pa!CjR7=^bk5?vM
z!f%sBL4sz|_aC~c<!(p0XM#N8O8K6fTDG~V<w-ZSJmrG?Z%280l01WFV^(&$iSn;*
zN=dSP$n3<*;$*TMkxVJ>o%;~pj>q;P|H<uDCLSv9<){6Uspa*_lrkw&^v8F(sb#N)
oRGGYLAF@1|QjF_iJRh}UekJ%3H<jQoGwwq!a8nB^xf}oeA6$>hod5s;

diff --git a/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java b/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java
index f2566d9d419..afa09a3f537 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -420,10 +420,10 @@ public final class NormalizerBase implements Cloneable {
      * iterator's {@code clone} method does so.
      * @stable ICU 2.8
      */
-    public Object clone() {
+    public NormalizerBase clone() {
         try {
             NormalizerBase copy = (NormalizerBase) super.clone();
-            copy.text = (UCharacterIterator) text.clone();
+            copy.text = text.clone();
             copy.mode = mode;
             copy.options = options;
             copy.norm2 = norm2;
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java b/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java
index 93978372c3a..24c54795508 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -310,8 +310,8 @@ public abstract class UCharacterIterator
      * @return copy of this iterator
      * @stable ICU 2.4
      */
-    public Object clone() throws CloneNotSupportedException{
-        return super.clone();
+    public UCharacterIterator clone() throws CloneNotSupportedException{
+        return (UCharacterIterator) super.clone();
     }
 
 }
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java b/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java
index 6f5919e016b..0bc68080e83 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,7 +293,7 @@ import jdk.internal.icu.util.VersionInfo;
  * @author Alan Liu
  * @stable ICU 2.0
  */
-public class UnicodeSet {
+public class UnicodeSet implements Cloneable {
 
     private static final int LOW = 0x000000; // LOW <= all valid values. ZERO for codepoints
     private static final int HIGH = 0x110000; // HIGH > all valid values. 10000 for code units.
@@ -385,6 +385,18 @@ public class UnicodeSet {
         applyPattern(pattern, null);
     }
 
+    /**
+     * Return a new set that is equivalent to this one.
+     * @stable ICU 2.0
+     */
+    @Override
+    public UnicodeSet clone() {
+        if (isFrozen()) {
+            return this;
+        }
+        return new UnicodeSet(this);
+    }
+
     /**
      * Make this object represent the same set as <code>other</code>.
      * @param other a <code>UnicodeSet</code> whose value will be
diff --git a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java
index b7a52b74ae1..fa55b9df5af 100644
--- a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java
+++ b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public final class VersionInfo
      * @deprecated This API is ICU internal only.
      */
     @Deprecated
-    public static final String ICU_DATA_VERSION_PATH = "76b";
+    public static final String ICU_DATA_VERSION_PATH = "78b";
 
     // public methods ------------------------------------------------------
 
diff --git a/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java b/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java
index 34a69c3045f..303a76cb545 100644
--- a/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java
+++ b/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,9 @@ public final class Grapheme {
      * <p>
      * See Unicode Standard Annex #29 Unicode Text Segmentation for the specification
      * for the extended grapheme cluster boundary rules. The following implementation
-     * is based on the annex for Unicode version 16.0.
+     * is based on the annex for Unicode version 17.0.
      *
-     * @spec http://www.unicode.org/reports/tr29/tr29-45.html
+     * @spec http://www.unicode.org/reports/tr29/tr29-47.html
      * @param src the {@code CharSequence} to be scanned
      * @param off offset to start looking for the next boundary in the src
      * @param limit limit offset in the src (exclusive)
@@ -283,7 +283,6 @@ public final class Grapheme {
                 case 0x113D1:
                 case 0x1193F:
                 case 0x11941:
-                case 0x11A3A:
                 case 0x11A84:
                 case 0x11A85:
                 case 0x11A86:
diff --git a/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template b/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template
index fc0e6605eca..149b1dce660 100644
--- a/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template
+++ b/src/java.base/share/classes/jdk/internal/util/regex/IndicConjunctBreak.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,9 @@ final class IndicConjunctBreak {
     }
 
     static boolean isConsonant(int cp) {
-        // fast check - Devanagari to Malayalam
-        if (cp < 0x0900 || cp > 0x0D7F) {
+        // fast check - return false for code points below
+        // the Devanagari range (lowest among Indic scripts)
+        if (cp < 0x0900) {
             return false;
         }
 
diff --git a/src/java.base/share/data/unicodedata/Blocks.txt b/src/java.base/share/data/unicodedata/Blocks.txt
index 19460657ac9..5c24ab60cb1 100644
--- a/src/java.base/share/data/unicodedata/Blocks.txt
+++ b/src/java.base/share/data/unicodedata/Blocks.txt
@@ -1,6 +1,6 @@
-# Blocks-16.0.0.txt
-# Date: 2024-02-02
-# Copyright (c) 2024 Unicode, Inc.
+# Blocks-17.0.0.txt
+# Date: 2025-08-01
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -228,6 +228,7 @@ FFF0..FFFF; Specials
 108E0..108FF; Hatran
 10900..1091F; Phoenician
 10920..1093F; Lydian
+10940..1095F; Sidetic
 10980..1099F; Meroitic Hieroglyphs
 109A0..109FF; Meroitic Cursive
 10A00..10A5F; Kharoshthi
@@ -279,11 +280,13 @@ FFF0..FFFF; Specials
 11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A
 11AC0..11AFF; Pau Cin Hau
 11B00..11B5F; Devanagari Extended-A
+11B60..11B7F; Sharada Supplement
 11BC0..11BFF; Sunuwar
 11C00..11C6F; Bhaiksuki
 11C70..11CBF; Marchen
 11D00..11D5F; Masaram Gondi
 11D60..11DAF; Gunjala Gondi
+11DB0..11DEF; Tolong Siki
 11EE0..11EFF; Makasar
 11F00..11F5F; Kawi
 11FB0..11FBF; Lisu Supplement
@@ -304,12 +307,14 @@ FFF0..FFFF; Specials
 16B00..16B8F; Pahawh Hmong
 16D40..16D7F; Kirat Rai
 16E40..16E9F; Medefaidrin
+16EA0..16EDF; Beria Erfe
 16F00..16F9F; Miao
 16FE0..16FFF; Ideographic Symbols and Punctuation
 17000..187FF; Tangut
 18800..18AFF; Tangut Components
 18B00..18CFF; Khitan Small Script
 18D00..18D7F; Tangut Supplement
+18D80..18DFF; Tangut Components Supplement
 1AFF0..1AFFF; Kana Extended-B
 1B000..1B0FF; Kana Supplement
 1B100..1B12F; Kana Extended-A
@@ -318,6 +323,7 @@ FFF0..FFFF; Specials
 1BC00..1BC9F; Duployan
 1BCA0..1BCAF; Shorthand Format Controls
 1CC00..1CEBF; Symbols for Legacy Computing Supplement
+1CEC0..1CEFF; Miscellaneous Symbols Supplement
 1CF00..1CFCF; Znamenny Musical Notation
 1D000..1D0FF; Byzantine Musical Symbols
 1D100..1D1FF; Musical Symbols
@@ -336,6 +342,7 @@ FFF0..FFFF; Specials
 1E2C0..1E2FF; Wancho
 1E4D0..1E4FF; Nag Mundari
 1E5D0..1E5FF; Ol Onal
+1E6C0..1E6FF; Tai Yo
 1E7E0..1E7FF; Ethiopic Extended-B
 1E800..1E8DF; Mende Kikakui
 1E900..1E95F; Adlam
@@ -367,6 +374,7 @@ FFF0..FFFF; Specials
 2F800..2FA1F; CJK Compatibility Ideographs Supplement
 30000..3134F; CJK Unified Ideographs Extension G
 31350..323AF; CJK Unified Ideographs Extension H
+323B0..3347F; CJK Unified Ideographs Extension J
 E0000..E007F; Tags
 E0100..E01EF; Variation Selectors Supplement
 F0000..FFFFF; Supplementary Private Use Area-A
diff --git a/src/java.base/share/data/unicodedata/CaseFolding.txt b/src/java.base/share/data/unicodedata/CaseFolding.txt
index 345c4f3dd03..a0b0f07fd64 100644
--- a/src/java.base/share/data/unicodedata/CaseFolding.txt
+++ b/src/java.base/share/data/unicodedata/CaseFolding.txt
@@ -1,6 +1,6 @@
-# CaseFolding-16.0.0.txt
-# Date: 2024-04-30, 21:48:11 GMT
-# © 2024 Unicode®, Inc.
+# CaseFolding-17.0.0.txt
+# Date: 2025-07-30, 23:54:36 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -18,15 +18,15 @@
 # The data supports both implementations that require simple case foldings
 # (where string lengths don't change), and implementations that allow full case folding
 # (where string lengths may grow). Note that where they can be supported, the
-# full case foldings are superior: for example, they allow "MASSE" and "Maße" to match.
+# full case foldings are superior: for example, they allow "FUSS" and "Fuß" to match.
 #
 # All code points not listed in this file map to themselves.
 #
 # NOTE: case folding does not preserve normalization formats!
 #
 # For information on case folding, including how to have case folding
-# preserve normalization formats, see Section 3.13 Default Case Algorithms in
-# The Unicode Standard.
+# preserve normalization formats, see the
+# "Conformance" / "Default Case Algorithms" section of the core specification.
 #
 # ================================================================================
 # Format
@@ -1243,7 +1243,10 @@ A7C7; C; A7C8; # LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
 A7C9; C; A7CA; # LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
 A7CB; C; 0264; # LATIN CAPITAL LETTER RAMS HORN
 A7CC; C; A7CD; # LATIN CAPITAL LETTER S WITH DIAGONAL STROKE
+A7CE; C; A7CF; # LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D0; C; A7D1; # LATIN CAPITAL LETTER CLOSED INSULAR G
+A7D2; C; A7D3; # LATIN CAPITAL LETTER DOUBLE THORN
+A7D4; C; A7D5; # LATIN CAPITAL LETTER DOUBLE WYNN
 A7D6; C; A7D7; # LATIN CAPITAL LETTER MIDDLE SCOTS S
 A7D8; C; A7D9; # LATIN CAPITAL LETTER SIGMOID S
 A7DA; C; A7DB; # LATIN CAPITAL LETTER LAMBDA
@@ -1616,6 +1619,31 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
 16E5D; C; 16E7D; # MEDEFAIDRIN CAPITAL LETTER O
 16E5E; C; 16E7E; # MEDEFAIDRIN CAPITAL LETTER AI
 16E5F; C; 16E7F; # MEDEFAIDRIN CAPITAL LETTER Y
+16EA0; C; 16EBB; # BERIA ERFE CAPITAL LETTER ARKAB
+16EA1; C; 16EBC; # BERIA ERFE CAPITAL LETTER BASIGNA
+16EA2; C; 16EBD; # BERIA ERFE CAPITAL LETTER DARBAI
+16EA3; C; 16EBE; # BERIA ERFE CAPITAL LETTER EH
+16EA4; C; 16EBF; # BERIA ERFE CAPITAL LETTER FITKO
+16EA5; C; 16EC0; # BERIA ERFE CAPITAL LETTER GOWAY
+16EA6; C; 16EC1; # BERIA ERFE CAPITAL LETTER HIRDEABO
+16EA7; C; 16EC2; # BERIA ERFE CAPITAL LETTER I
+16EA8; C; 16EC3; # BERIA ERFE CAPITAL LETTER DJAI
+16EA9; C; 16EC4; # BERIA ERFE CAPITAL LETTER KOBO
+16EAA; C; 16EC5; # BERIA ERFE CAPITAL LETTER LAKKO
+16EAB; C; 16EC6; # BERIA ERFE CAPITAL LETTER MERI
+16EAC; C; 16EC7; # BERIA ERFE CAPITAL LETTER NINI
+16EAD; C; 16EC8; # BERIA ERFE CAPITAL LETTER GNA
+16EAE; C; 16EC9; # BERIA ERFE CAPITAL LETTER NGAY
+16EAF; C; 16ECA; # BERIA ERFE CAPITAL LETTER OI
+16EB0; C; 16ECB; # BERIA ERFE CAPITAL LETTER PI
+16EB1; C; 16ECC; # BERIA ERFE CAPITAL LETTER ERIGO
+16EB2; C; 16ECD; # BERIA ERFE CAPITAL LETTER ERIGO TAMURA
+16EB3; C; 16ECE; # BERIA ERFE CAPITAL LETTER SERI
+16EB4; C; 16ECF; # BERIA ERFE CAPITAL LETTER SHEP
+16EB5; C; 16ED0; # BERIA ERFE CAPITAL LETTER TATASOUE
+16EB6; C; 16ED1; # BERIA ERFE CAPITAL LETTER UI
+16EB7; C; 16ED2; # BERIA ERFE CAPITAL LETTER WASSE
+16EB8; C; 16ED3; # BERIA ERFE CAPITAL LETTER AY
 1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
 1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
 1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM
@@ -1651,4 +1679,4 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
 1E920; C; 1E942; # ADLAM CAPITAL LETTER KPO
 1E921; C; 1E943; # ADLAM CAPITAL LETTER SHA
 #
-# EOF
\ No newline at end of file
+# EOF
diff --git a/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
index 43d7af85c29..f327784bf39 100644
--- a/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
+++ b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
@@ -1,6 +1,6 @@
-# DerivedCoreProperties-16.0.0.txt
-# Date: 2024-05-31, 18:09:32 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# DerivedCoreProperties-17.0.0.txt
+# Date: 2025-07-30, 23:55:08 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -178,6 +178,7 @@ FF5E          ; Math # Sm       FULLWIDTH TILDE
 FFE2          ; Math # Sm       FULLWIDTH NOT SIGN
 FFE9..FFEC    ; Math # Sm   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW
 10D8E..10D8F  ; Math # Sm   [2] GARAY PLUS SIGN..GARAY MINUS SIGN
+1CEF0         ; Math # Sm       MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR
 1D400..1D454  ; Math # L&  [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G
 1D456..1D49C  ; Math # L&  [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A
 1D49E..1D49F  ; Math # L&   [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D
@@ -253,8 +254,9 @@ FFE9..FFEC    ; Math # Sm   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A
 1EEA5..1EEA9  ; Math # Lo   [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
 1EEAB..1EEBB  ; Math # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1EEF0..1EEF1  ; Math # Sm   [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
+1F8D0..1F8D8  ; Math # Sm   [9] LONG RIGHTWARDS ARROW OVER LONG LEFTWARDS ARROW..LONG LEFT RIGHT ARROW WITH DEPENDENT LOBE
 
-# Total code points: 2312
+# Total code points: 2322
 
 # ================================================
 
@@ -273,8 +275,8 @@ FFE9..FFEC    ; Math # Sm   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A
 01BC..01BF    ; Alphabetic # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; Alphabetic # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; Alphabetic # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; Alphabetic # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; Alphabetic # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; Alphabetic # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; Alphabetic # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02C1    ; Alphabetic # Lm  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
 02C6..02D1    ; Alphabetic # Lm  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
 02E0..02E4    ; Alphabetic # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -344,7 +346,7 @@ FFE9..FFEC    ; Math # Sm   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A
 0840..0858    ; Alphabetic # Lo  [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN
 0860..086A    ; Alphabetic # Lo  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
 0870..0887    ; Alphabetic # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
-0889..088E    ; Alphabetic # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; Alphabetic # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 0897          ; Alphabetic # Mn       ARABIC PEPET
 08A0..08C8    ; Alphabetic # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
 08C9          ; Alphabetic # Lm       ARABIC SMALL FARSI YEH
@@ -477,7 +479,7 @@ FFE9..FFEC    ; Math # Sm   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A
 0C4A..0C4C    ; Alphabetic # Mn   [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU
 0C55..0C56    ; Alphabetic # Mn   [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
 0C58..0C5A    ; Alphabetic # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; Alphabetic # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; Alphabetic # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; Alphabetic # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C62..0C63    ; Alphabetic # Mn   [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
 0C80          ; Alphabetic # Lo       KANNADA SIGN SPACING CANDRABINDU
@@ -497,7 +499,7 @@ FFE9..FFEC    ; Math # Sm   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A
 0CCA..0CCB    ; Alphabetic # Mc   [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
 0CCC          ; Alphabetic # Mn       KANNADA VOWEL SIGN AU
 0CD5..0CD6    ; Alphabetic # Mc   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
-0CDD..0CDE    ; Alphabetic # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; Alphabetic # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; Alphabetic # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CE2..0CE3    ; Alphabetic # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
 0CF1..0CF2    ; Alphabetic # Lo   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
@@ -833,11 +835,8 @@ A771..A787    ; Alphabetic # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER
 A788          ; Alphabetic # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A78B..A78E    ; Alphabetic # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; Alphabetic # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; Alphabetic # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; Alphabetic # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; Alphabetic # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; Alphabetic # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; Alphabetic # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; Alphabetic # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; Alphabetic # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; Alphabetic # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; Alphabetic # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; Alphabetic # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -1020,6 +1019,7 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 108F4..108F5  ; Alphabetic # Lo   [2] HATRAN LETTER SHIN..HATRAN LETTER TAW
 10900..10915  ; Alphabetic # Lo  [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
 10920..10939  ; Alphabetic # Lo  [26] LYDIAN LETTER A..LYDIAN LETTER C
+10940..10959  ; Alphabetic # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
 10980..109B7  ; Alphabetic # Lo  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
 109BE..109BF  ; Alphabetic # Lo   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
 10A00         ; Alphabetic # Lo       KHAROSHTHI LETTER A
@@ -1053,7 +1053,9 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 10EAB..10EAC  ; Alphabetic # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
 10EB0..10EB1  ; Alphabetic # Lo   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 10EC2..10EC4  ; Alphabetic # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
-10EFC         ; Alphabetic # Mn       ARABIC COMBINING ALEF OVERLAY
+10EC5         ; Alphabetic # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; Alphabetic # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
+10EFA..10EFC  ; Alphabetic # Mn   [3] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC COMBINING ALEF OVERLAY
 10F00..10F1C  ; Alphabetic # Lo  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F27         ; Alphabetic # Lo       OLD SOGDIAN LIGATURE AYIN-DALETH
 10F30..10F45  ; Alphabetic # Lo  [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN
@@ -1239,6 +1241,12 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 11A97         ; Alphabetic # Mc       SOYOMBO SIGN VISARGA
 11A9D         ; Alphabetic # Lo       SOYOMBO MARK PLUTA
 11AB0..11AF8  ; Alphabetic # Lo  [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL
+11B60         ; Alphabetic # Mn       SHARADA VOWEL SIGN OE
+11B61         ; Alphabetic # Mc       SHARADA VOWEL SIGN OOE
+11B62..11B64  ; Alphabetic # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B65         ; Alphabetic # Mc       SHARADA VOWEL SIGN SHORT O
+11B66         ; Alphabetic # Mn       SHARADA VOWEL SIGN CANDRA E
+11B67         ; Alphabetic # Mc       SHARADA VOWEL SIGN CANDRA O
 11BC0..11BE0  ; Alphabetic # Lo  [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO
 11C00..11C08  ; Alphabetic # Lo   [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
 11C0A..11C2E  ; Alphabetic # Lo  [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA
@@ -1274,6 +1282,9 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 11D95         ; Alphabetic # Mn       GUNJALA GONDI SIGN ANUSVARA
 11D96         ; Alphabetic # Mc       GUNJALA GONDI SIGN VISARGA
 11D98         ; Alphabetic # Lo       GUNJALA GONDI OM
+11DB0..11DD8  ; Alphabetic # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; Alphabetic # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; Alphabetic # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
 11EE0..11EF2  ; Alphabetic # Lo  [19] MAKASAR LETTER KA..MAKASAR ANGKA
 11EF3..11EF4  ; Alphabetic # Mn   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
 11EF5..11EF6  ; Alphabetic # Mc   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
@@ -1311,6 +1322,8 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 16D43..16D6A  ; Alphabetic # Lo  [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU
 16D6B..16D6C  ; Alphabetic # Lm   [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT
 16E40..16E7F  ; Alphabetic # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; Alphabetic # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; Alphabetic # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 16F00..16F4A  ; Alphabetic # Lo  [75] MIAO LETTER PA..MIAO LETTER RTE
 16F4F         ; Alphabetic # Mn       MIAO SIGN CONSONANT MODIFIER BAR
 16F50         ; Alphabetic # Lo       MIAO LETTER NASALIZATION
@@ -1320,9 +1333,11 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 16FE0..16FE1  ; Alphabetic # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 16FE3         ; Alphabetic # Lm       OLD CHINESE ITERATION MARK
 16FF0..16FF1  ; Alphabetic # Mc   [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
-17000..187F7  ; Alphabetic # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; Alphabetic # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; Alphabetic # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; Alphabetic # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; Alphabetic # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; Alphabetic # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; Alphabetic # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; Alphabetic # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1AFF0..1AFF3  ; Alphabetic # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; Alphabetic # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; Alphabetic # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -1387,6 +1402,17 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 1E4EB         ; Alphabetic # Lm       NAG MUNDARI SIGN OJOD
 1E5D0..1E5ED  ; Alphabetic # Lo  [30] OL ONAL LETTER O..OL ONAL LETTER EG
 1E5F0         ; Alphabetic # Lo       OL ONAL SIGN HODDOND
+1E6C0..1E6DE  ; Alphabetic # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; Alphabetic # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E3         ; Alphabetic # Mn       TAI YO SIGN UE
+1E6E4..1E6E5  ; Alphabetic # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E6         ; Alphabetic # Mn       TAI YO SIGN AU
+1E6E7..1E6ED  ; Alphabetic # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6EE..1E6EF  ; Alphabetic # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F0..1E6F4  ; Alphabetic # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6F5         ; Alphabetic # Mn       TAI YO SIGN OM
+1E6FE         ; Alphabetic # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; Alphabetic # Lm       TAI YO XAM LAI
 1E7E0..1E7E6  ; Alphabetic # Lo   [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E8..1E7EB  ; Alphabetic # Lo   [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
 1E7ED..1E7EE  ; Alphabetic # Lo   [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE
@@ -1432,16 +1458,15 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 1F150..1F169  ; Alphabetic # So  [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F170..1F189  ; Alphabetic # So  [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 20000..2A6DF  ; Alphabetic # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; Alphabetic # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; Alphabetic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; Alphabetic # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; Alphabetic # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; Alphabetic # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; Alphabetic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; Alphabetic # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Alphabetic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Alphabetic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; Alphabetic # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; Alphabetic # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 142759
+# Total code points: 147421
 
 # ================================================
 
@@ -1595,7 +1620,7 @@ FFDA..FFDC    ; Alphabetic # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG
 024B          ; Lowercase # L&       LATIN SMALL LETTER Q WITH HOOK TAIL
 024D          ; Lowercase # L&       LATIN SMALL LETTER R WITH STROKE
 024F..0293    ; Lowercase # L&  [69] LATIN SMALL LETTER Y WITH STROKE..LATIN SMALL LETTER EZH WITH CURL
-0295..02AF    ; Lowercase # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0296..02AF    ; Lowercase # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02B8    ; Lowercase # Lm   [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y
 02C0..02C1    ; Lowercase # Lm   [2] MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP
 02E0..02E4    ; Lowercase # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -2073,13 +2098,14 @@ A7C3          ; Lowercase # L&       LATIN SMALL LETTER ANGLICANA W
 A7C8          ; Lowercase # L&       LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY
 A7CA          ; Lowercase # L&       LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
 A7CD          ; Lowercase # L&       LATIN SMALL LETTER S WITH DIAGONAL STROKE
+A7CF          ; Lowercase # L&       LATIN SMALL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D1          ; Lowercase # L&       LATIN SMALL LETTER CLOSED INSULAR G
 A7D3          ; Lowercase # L&       LATIN SMALL LETTER DOUBLE THORN
 A7D5          ; Lowercase # L&       LATIN SMALL LETTER DOUBLE WYNN
 A7D7          ; Lowercase # L&       LATIN SMALL LETTER MIDDLE SCOTS S
 A7D9          ; Lowercase # L&       LATIN SMALL LETTER SIGMOID S
 A7DB          ; Lowercase # L&       LATIN SMALL LETTER LAMBDA
-A7F2..A7F4    ; Lowercase # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A7F1..A7F4    ; Lowercase # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F6          ; Lowercase # L&       LATIN SMALL LETTER REVERSED HALF H
 A7F8..A7F9    ; Lowercase # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
 A7FA          ; Lowercase # L&       LATIN LETTER SMALL CAPITAL TURNED M
@@ -2105,6 +2131,7 @@ FF41..FF5A    ; Lowercase # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L
 10D70..10D85  ; Lowercase # L&  [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA
 118C0..118DF  ; Lowercase # L&  [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO
 16E60..16E7F  ; Lowercase # L&  [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EBB..16ED3  ; Lowercase # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 1D41A..1D433  ; Lowercase # L&  [26] MATHEMATICAL BOLD SMALL A..MATHEMATICAL BOLD SMALL Z
 1D44E..1D454  ; Lowercase # L&   [7] MATHEMATICAL ITALIC SMALL A..MATHEMATICAL ITALIC SMALL G
 1D456..1D467  ; Lowercase # L&  [18] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL Z
@@ -2139,7 +2166,7 @@ FF41..FF5A    ; Lowercase # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L
 1E030..1E06D  ; Lowercase # Lm  [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE
 1E922..1E943  ; Lowercase # L&  [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA
 
-# Total code points: 2569
+# Total code points: 2595
 
 # ================================================
 
@@ -2750,7 +2777,10 @@ A7C2          ; Uppercase # L&       LATIN CAPITAL LETTER ANGLICANA W
 A7C4..A7C7    ; Uppercase # L&   [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
 A7C9          ; Uppercase # L&       LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
 A7CB..A7CC    ; Uppercase # L&   [2] LATIN CAPITAL LETTER RAMS HORN..LATIN CAPITAL LETTER S WITH DIAGONAL STROKE
+A7CE          ; Uppercase # L&       LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D0          ; Uppercase # L&       LATIN CAPITAL LETTER CLOSED INSULAR G
+A7D2          ; Uppercase # L&       LATIN CAPITAL LETTER DOUBLE THORN
+A7D4          ; Uppercase # L&       LATIN CAPITAL LETTER DOUBLE WYNN
 A7D6          ; Uppercase # L&       LATIN CAPITAL LETTER MIDDLE SCOTS S
 A7D8          ; Uppercase # L&       LATIN CAPITAL LETTER SIGMOID S
 A7DA          ; Uppercase # L&       LATIN CAPITAL LETTER LAMBDA
@@ -2767,6 +2797,7 @@ FF21..FF3A    ; Uppercase # L&  [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH
 10D50..10D65  ; Uppercase # L&  [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA
 118A0..118BF  ; Uppercase # L&  [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO
 16E40..16E5F  ; Uppercase # L&  [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y
+16EA0..16EB8  ; Uppercase # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
 1D400..1D419  ; Uppercase # L&  [26] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL BOLD CAPITAL Z
 1D434..1D44D  ; Uppercase # L&  [26] MATHEMATICAL ITALIC CAPITAL A..MATHEMATICAL ITALIC CAPITAL Z
 1D468..1D481  ; Uppercase # L&  [26] MATHEMATICAL BOLD ITALIC CAPITAL A..MATHEMATICAL BOLD ITALIC CAPITAL Z
@@ -2803,7 +2834,7 @@ FF21..FF3A    ; Uppercase # L&  [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH
 1F150..1F169  ; Uppercase # So  [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F170..1F189  ; Uppercase # So  [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 
-# Total code points: 1978
+# Total code points: 2006
 
 # ================================================
 
@@ -2821,7 +2852,7 @@ FF21..FF3A    ; Uppercase # L&  [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH
 00F8..01BA    ; Cased # L& [195] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER EZH WITH TAIL
 01BC..01BF    ; Cased # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C4..0293    ; Cased # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0295..02AF    ; Cased # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0296..02AF    ; Cased # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02B8    ; Cased # Lm   [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y
 02C0..02C1    ; Cased # Lm   [2] MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP
 02E0..02E4    ; Cased # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -2911,11 +2942,8 @@ A722..A76F    ; Cased # L&  [78] LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF..LATIN
 A770          ; Cased # Lm       MODIFIER LETTER US
 A771..A787    ; Cased # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T
 A78B..A78E    ; Cased # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
-A790..A7CD    ; Cased # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; Cased # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; Cased # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; Cased # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; Cased # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; Cased # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; Cased # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; Cased # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F8..A7F9    ; Cased # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
 A7FA          ; Cased # L&       LATIN LETTER SMALL CAPITAL TURNED M
@@ -2949,6 +2977,8 @@ FF41..FF5A    ; Cased # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN
 10D70..10D85  ; Cased # L&  [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA
 118A0..118DF  ; Cased # L&  [64] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI SMALL LETTER VIYO
 16E40..16E7F  ; Cased # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; Cased # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; Cased # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 1D400..1D454  ; Cased # L&  [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G
 1D456..1D49C  ; Cased # L&  [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A
 1D49E..1D49F  ; Cased # L&   [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D
@@ -2988,7 +3018,7 @@ FF41..FF5A    ; Cased # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN
 1F150..1F169  ; Cased # So  [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F170..1F189  ; Cased # So  [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 
-# Total code points: 4578
+# Total code points: 4632
 
 # ================================================
 
@@ -3194,7 +3224,8 @@ FF41..FF5A    ; Cased # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN
 1AA7          ; Case_Ignorable # Lm       TAI THAM SIGN MAI YAMOK
 1AB0..1ABD    ; Case_Ignorable # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
 1ABE          ; Case_Ignorable # Me       COMBINING PARENTHESES OVERLAY
-1ABF..1ACE    ; Case_Ignorable # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; Case_Ignorable # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; Case_Ignorable # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B00..1B03    ; Case_Ignorable # Mn   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
 1B34          ; Case_Ignorable # Mn       BALINESE SIGN REREKAN
 1B36..1B3A    ; Case_Ignorable # Mn   [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA
@@ -3274,7 +3305,7 @@ A720..A721    ; Case_Ignorable # Sk   [2] MODIFIER LETTER STRESS AND HIGH TONE..
 A770          ; Case_Ignorable # Lm       MODIFIER LETTER US
 A788          ; Case_Ignorable # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A789..A78A    ; Case_Ignorable # Sk   [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
-A7F2..A7F4    ; Case_Ignorable # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A7F1..A7F4    ; Case_Ignorable # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F8..A7F9    ; Case_Ignorable # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
 A802          ; Case_Ignorable # Mn       SYLOTI NAGRI SIGN DVISVARA
 A806          ; Case_Ignorable # Mn       SYLOTI NAGRI SIGN HASANTA
@@ -3350,7 +3381,8 @@ FFF9..FFFB    ; Case_Ignorable # Cf   [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI
 10D69..10D6D  ; Case_Ignorable # Mn   [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK
 10D6F         ; Case_Ignorable # Lm       GARAY REDUPLICATION MARK
 10EAB..10EAC  ; Case_Ignorable # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
-10EFC..10EFF  ; Case_Ignorable # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EC5         ; Case_Ignorable # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EFA..10EFF  ; Case_Ignorable # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 10F46..10F50  ; Case_Ignorable # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 10F82..10F85  ; Case_Ignorable # Mn   [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW
 11001         ; Case_Ignorable # Mn       BRAHMI SIGN ANUSVARA
@@ -3427,6 +3459,9 @@ FFF9..FFFB    ; Case_Ignorable # Cf   [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI
 11A59..11A5B  ; Case_Ignorable # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
 11A8A..11A96  ; Case_Ignorable # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
 11A98..11A99  ; Case_Ignorable # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
+11B60         ; Case_Ignorable # Mn       SHARADA VOWEL SIGN OE
+11B62..11B64  ; Case_Ignorable # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B66         ; Case_Ignorable # Mn       SHARADA VOWEL SIGN CANDRA E
 11C30..11C36  ; Case_Ignorable # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; Case_Ignorable # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
 11C3F         ; Case_Ignorable # Mn       BHAIKSUKI SIGN VIRAMA
@@ -3442,6 +3477,7 @@ FFF9..FFFB    ; Case_Ignorable # Cf   [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI
 11D90..11D91  ; Case_Ignorable # Mn   [2] GUNJALA GONDI VOWEL SIGN EE..GUNJALA GONDI VOWEL SIGN AI
 11D95         ; Case_Ignorable # Mn       GUNJALA GONDI SIGN ANUSVARA
 11D97         ; Case_Ignorable # Mn       GUNJALA GONDI VIRAMA
+11DD9         ; Case_Ignorable # Lm       TOLONG SIKI SIGN SELA
 11EF3..11EF4  ; Case_Ignorable # Mn   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
 11F00..11F01  ; Case_Ignorable # Mn   [2] KAWI SIGN CANDRABINDU..KAWI SIGN ANUSVARA
 11F36..11F3A  ; Case_Ignorable # Mn   [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R
@@ -3464,6 +3500,7 @@ FFF9..FFFB    ; Case_Ignorable # Cf   [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI
 16FE0..16FE1  ; Case_Ignorable # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 16FE3         ; Case_Ignorable # Lm       OLD CHINESE ITERATION MARK
 16FE4         ; Case_Ignorable # Mn       KHITAN SMALL SCRIPT FILLER
+16FF2..16FF3  ; Case_Ignorable # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
 1AFF0..1AFF3  ; Case_Ignorable # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; Case_Ignorable # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; Case_Ignorable # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -3497,6 +3534,11 @@ FFF9..FFFB    ; Case_Ignorable # Cf   [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI
 1E4EB         ; Case_Ignorable # Lm       NAG MUNDARI SIGN OJOD
 1E4EC..1E4EF  ; Case_Ignorable # Mn   [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH
 1E5EE..1E5EF  ; Case_Ignorable # Mn   [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR
+1E6E3         ; Case_Ignorable # Mn       TAI YO SIGN UE
+1E6E6         ; Case_Ignorable # Mn       TAI YO SIGN AU
+1E6EE..1E6EF  ; Case_Ignorable # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F5         ; Case_Ignorable # Mn       TAI YO SIGN OM
+1E6FF         ; Case_Ignorable # Lm       TAI YO XAM LAI
 1E8D0..1E8D6  ; Case_Ignorable # Mn   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
 1E944..1E94A  ; Case_Ignorable # Mn   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
 1E94B         ; Case_Ignorable # Lm       ADLAM NASALIZATION MARK
@@ -3505,13 +3547,14 @@ E0001         ; Case_Ignorable # Cf       LANGUAGE TAG
 E0020..E007F  ; Case_Ignorable # Cf  [96] TAG SPACE..CANCEL TAG
 E0100..E01EF  ; Case_Ignorable # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 2749
+# Total code points: 2794
 
 # ================================================
 
 # Derived Property:   Changes_When_Lowercased (CWL)
 #  Characters whose normalized forms are not stable under a toLowercase mapping.
-#  For more information, see D139 in Section 3.13, "Default Case Algorithms".
+#  For more information, see the definition of "isLowercase(X)"
+#  in the "Conformance" / "Default Case Algorithms" section of the core specification.
 #  Changes_When_Lowercased(X) is true when toLowercase(toNFD(X)) != toNFD(X)
 
 0041..005A    ; Changes_When_Lowercased # L&  [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z
@@ -4110,7 +4153,10 @@ A7C2          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER ANGLICAN
 A7C4..A7C7    ; Changes_When_Lowercased # L&   [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
 A7C9          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
 A7CB..A7CC    ; Changes_When_Lowercased # L&   [2] LATIN CAPITAL LETTER RAMS HORN..LATIN CAPITAL LETTER S WITH DIAGONAL STROKE
+A7CE          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D0          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER CLOSED INSULAR G
+A7D2          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER DOUBLE THORN
+A7D4          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER DOUBLE WYNN
 A7D6          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER MIDDLE SCOTS S
 A7D8          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER SIGMOID S
 A7DA          ; Changes_When_Lowercased # L&       LATIN CAPITAL LETTER LAMBDA
@@ -4127,15 +4173,17 @@ FF21..FF3A    ; Changes_When_Lowercased # L&  [26] FULLWIDTH LATIN CAPITAL LETTE
 10D50..10D65  ; Changes_When_Lowercased # L&  [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA
 118A0..118BF  ; Changes_When_Lowercased # L&  [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO
 16E40..16E5F  ; Changes_When_Lowercased # L&  [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y
+16EA0..16EB8  ; Changes_When_Lowercased # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
 1E900..1E921  ; Changes_When_Lowercased # L&  [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA
 
-# Total code points: 1460
+# Total code points: 1488
 
 # ================================================
 
 # Derived Property:   Changes_When_Uppercased (CWU)
 #  Characters whose normalized forms are not stable under a toUppercase mapping.
-#  For more information, see D140 in Section 3.13, "Default Case Algorithms".
+#  For more information, see the definition of "isUppercase(X)"
+#  in the "Conformance" / "Default Case Algorithms" section of the core specification.
 #  Changes_When_Uppercased(X) is true when toUppercase(toNFD(X)) != toNFD(X)
 
 0061..007A    ; Changes_When_Uppercased # L&  [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z
@@ -4747,7 +4795,10 @@ A7C3          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER ANGLICANA
 A7C8          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY
 A7CA          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
 A7CD          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER S WITH DIAGONAL STROKE
+A7CF          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D1          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER CLOSED INSULAR G
+A7D3          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER DOUBLE THORN
+A7D5          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER DOUBLE WYNN
 A7D7          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER MIDDLE SCOTS S
 A7D9          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER SIGMOID S
 A7DB          ; Changes_When_Uppercased # L&       LATIN SMALL LETTER LAMBDA
@@ -4767,15 +4818,17 @@ FF41..FF5A    ; Changes_When_Uppercased # L&  [26] FULLWIDTH LATIN SMALL LETTER
 10D70..10D85  ; Changes_When_Uppercased # L&  [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA
 118C0..118DF  ; Changes_When_Uppercased # L&  [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO
 16E60..16E7F  ; Changes_When_Uppercased # L&  [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EBB..16ED3  ; Changes_When_Uppercased # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 1E922..1E943  ; Changes_When_Uppercased # L&  [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA
 
-# Total code points: 1552
+# Total code points: 1580
 
 # ================================================
 
 # Derived Property:   Changes_When_Titlecased (CWT)
 #  Characters whose normalized forms are not stable under a toTitlecase mapping.
-#  For more information, see D141 in Section 3.13, "Default Case Algorithms".
+#  For more information, see the definition of "isTitlecase(X)"
+#  in the "Conformance" / "Default Case Algorithms" section of the core specification.
 #  Changes_When_Titlecased(X) is true when toTitlecase(toNFD(X)) != toNFD(X)
 
 0061..007A    ; Changes_When_Titlecased # L&  [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z
@@ -5386,7 +5439,10 @@ A7C3          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER ANGLICANA
 A7C8          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY
 A7CA          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
 A7CD          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER S WITH DIAGONAL STROKE
+A7CF          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D1          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER CLOSED INSULAR G
+A7D3          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER DOUBLE THORN
+A7D5          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER DOUBLE WYNN
 A7D7          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER MIDDLE SCOTS S
 A7D9          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER SIGMOID S
 A7DB          ; Changes_When_Titlecased # L&       LATIN SMALL LETTER LAMBDA
@@ -5406,15 +5462,17 @@ FF41..FF5A    ; Changes_When_Titlecased # L&  [26] FULLWIDTH LATIN SMALL LETTER
 10D70..10D85  ; Changes_When_Titlecased # L&  [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA
 118C0..118DF  ; Changes_When_Titlecased # L&  [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO
 16E60..16E7F  ; Changes_When_Titlecased # L&  [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EBB..16ED3  ; Changes_When_Titlecased # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 1E922..1E943  ; Changes_When_Titlecased # L&  [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA
 
-# Total code points: 1479
+# Total code points: 1507
 
 # ================================================
 
 # Derived Property:   Changes_When_Casefolded (CWCF)
 #  Characters whose normalized forms are not stable under case folding.
-#  For more information, see D142 in Section 3.13, "Default Case Algorithms".
+#  For more information, see the definition of "isCasefolded(X)"
+#  in the "Conformance" / "Default Case Algorithms" section of the core specification.
 #  Changes_When_Casefolded(X) is true when toCasefold(toNFD(X)) != toNFD(X)
 
 0041..005A    ; Changes_When_Casefolded # L&  [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z
@@ -6022,7 +6080,10 @@ A7C2          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER ANGLICAN
 A7C4..A7C7    ; Changes_When_Casefolded # L&   [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
 A7C9          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
 A7CB..A7CC    ; Changes_When_Casefolded # L&   [2] LATIN CAPITAL LETTER RAMS HORN..LATIN CAPITAL LETTER S WITH DIAGONAL STROKE
+A7CE          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE
 A7D0          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER CLOSED INSULAR G
+A7D2          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER DOUBLE THORN
+A7D4          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER DOUBLE WYNN
 A7D6          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER MIDDLE SCOTS S
 A7D8          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER SIGMOID S
 A7DA          ; Changes_When_Casefolded # L&       LATIN CAPITAL LETTER LAMBDA
@@ -6042,15 +6103,17 @@ FF21..FF3A    ; Changes_When_Casefolded # L&  [26] FULLWIDTH LATIN CAPITAL LETTE
 10D50..10D65  ; Changes_When_Casefolded # L&  [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA
 118A0..118BF  ; Changes_When_Casefolded # L&  [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO
 16E40..16E5F  ; Changes_When_Casefolded # L&  [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y
+16EA0..16EB8  ; Changes_When_Casefolded # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
 1E900..1E921  ; Changes_When_Casefolded # L&  [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA
 
-# Total code points: 1533
+# Total code points: 1561
 
 # ================================================
 
 # Derived Property:   Changes_When_Casemapped (CWCM)
 #  Characters whose normalized forms are not stable under case mapping.
-#  For more information, see D143 in Section 3.13, "Default Case Algorithms".
+#  For more information, see the definition of "isCased(X)"
+#  in the "Conformance" / "Default Case Algorithms" section of the core specification.
 #  Changes_When_Casemapped(X) is true when CWL(X), or CWT(X), or CWU(X)
 
 0041..005A    ; Changes_When_Casemapped # L&  [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z
@@ -6156,9 +6219,7 @@ A779..A787    ; Changes_When_Casemapped # L&  [15] LATIN CAPITAL LETTER INSULAR
 A78B..A78D    ; Changes_When_Casemapped # L&   [3] LATIN CAPITAL LETTER SALTILLO..LATIN CAPITAL LETTER TURNED H
 A790..A794    ; Changes_When_Casemapped # L&   [5] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER C WITH PALATAL HOOK
 A796..A7AE    ; Changes_When_Casemapped # L&  [25] LATIN CAPITAL LETTER B WITH FLOURISH..LATIN CAPITAL LETTER SMALL CAPITAL I
-A7B0..A7CD    ; Changes_When_Casemapped # L&  [30] LATIN CAPITAL LETTER TURNED K..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; Changes_When_Casemapped # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D6..A7DC    ; Changes_When_Casemapped # L&   [7] LATIN CAPITAL LETTER MIDDLE SCOTS S..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7B0..A7DC    ; Changes_When_Casemapped # L&  [45] LATIN CAPITAL LETTER TURNED K..LATIN CAPITAL LETTER LAMBDA WITH STROKE
 A7F5..A7F6    ; Changes_When_Casemapped # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 AB53          ; Changes_When_Casemapped # L&       LATIN SMALL LETTER CHI
 AB70..ABBF    ; Changes_When_Casemapped # L&  [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA
@@ -6183,9 +6244,11 @@ FF41..FF5A    ; Changes_When_Casemapped # L&  [26] FULLWIDTH LATIN SMALL LETTER
 10D70..10D85  ; Changes_When_Casemapped # L&  [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA
 118A0..118DF  ; Changes_When_Casemapped # L&  [64] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI SMALL LETTER VIYO
 16E40..16E7F  ; Changes_When_Casemapped # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; Changes_When_Casemapped # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; Changes_When_Casemapped # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 1E900..1E943  ; Changes_When_Casemapped # L&  [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA
 
-# Total code points: 2981
+# Total code points: 3037
 
 # ================================================
 
@@ -6210,8 +6273,8 @@ FF41..FF5A    ; Changes_When_Casemapped # L&  [26] FULLWIDTH LATIN SMALL LETTER
 01BC..01BF    ; ID_Start # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; ID_Start # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; ID_Start # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; ID_Start # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; ID_Start # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; ID_Start # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; ID_Start # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02C1    ; ID_Start # Lm  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
 02C6..02D1    ; ID_Start # Lm  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
 02E0..02E4    ; ID_Start # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -6259,7 +6322,7 @@ FF41..FF5A    ; Changes_When_Casemapped # L&  [26] FULLWIDTH LATIN SMALL LETTER
 0840..0858    ; ID_Start # Lo  [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN
 0860..086A    ; ID_Start # Lo  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
 0870..0887    ; ID_Start # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
-0889..088E    ; ID_Start # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; ID_Start # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 08A0..08C8    ; ID_Start # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
 08C9          ; ID_Start # Lm       ARABIC SMALL FARSI YEH
 0904..0939    ; ID_Start # Lo  [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA
@@ -6327,7 +6390,7 @@ FF41..FF5A    ; Changes_When_Casemapped # L&  [26] FULLWIDTH LATIN SMALL LETTER
 0C2A..0C39    ; ID_Start # Lo  [16] TELUGU LETTER PA..TELUGU LETTER HA
 0C3D          ; ID_Start # Lo       TELUGU SIGN AVAGRAHA
 0C58..0C5A    ; ID_Start # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; ID_Start # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; ID_Start # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; ID_Start # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C80          ; ID_Start # Lo       KANNADA SIGN SPACING CANDRABINDU
 0C85..0C8C    ; ID_Start # Lo   [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L
@@ -6336,7 +6399,7 @@ FF41..FF5A    ; Changes_When_Casemapped # L&  [26] FULLWIDTH LATIN SMALL LETTER
 0CAA..0CB3    ; ID_Start # Lo  [10] KANNADA LETTER PA..KANNADA LETTER LLA
 0CB5..0CB9    ; ID_Start # Lo   [5] KANNADA LETTER VA..KANNADA LETTER HA
 0CBD          ; ID_Start # Lo       KANNADA SIGN AVAGRAHA
-0CDD..0CDE    ; ID_Start # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; ID_Start # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; ID_Start # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CF1..0CF2    ; ID_Start # Lo   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
 0D04..0D0C    ; ID_Start # Lo   [9] MALAYALAM LETTER VEDIC ANUSVARA..MALAYALAM LETTER VOCALIC L
@@ -6561,11 +6624,8 @@ A771..A787    ; ID_Start # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER I
 A788          ; ID_Start # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A78B..A78E    ; ID_Start # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; ID_Start # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; ID_Start # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; ID_Start # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; ID_Start # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; ID_Start # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; ID_Start # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; ID_Start # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; ID_Start # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; ID_Start # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; ID_Start # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; ID_Start # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -6702,6 +6762,7 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 108F4..108F5  ; ID_Start # Lo   [2] HATRAN LETTER SHIN..HATRAN LETTER TAW
 10900..10915  ; ID_Start # Lo  [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
 10920..10939  ; ID_Start # Lo  [26] LYDIAN LETTER A..LYDIAN LETTER C
+10940..10959  ; ID_Start # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
 10980..109B7  ; ID_Start # Lo  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
 109BE..109BF  ; ID_Start # Lo   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
 10A00         ; ID_Start # Lo       KHAROSHTHI LETTER A
@@ -6729,6 +6790,8 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 10E80..10EA9  ; ID_Start # Lo  [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET
 10EB0..10EB1  ; ID_Start # Lo   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 10EC2..10EC4  ; ID_Start # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
+10EC5         ; ID_Start # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; ID_Start # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
 10F00..10F1C  ; ID_Start # Lo  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F27         ; ID_Start # Lo       OLD SOGDIAN LIGATURE AYIN-DALETH
 10F30..10F45  ; ID_Start # Lo  [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN
@@ -6821,6 +6884,9 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 11D67..11D68  ; ID_Start # Lo   [2] GUNJALA GONDI LETTER EE..GUNJALA GONDI LETTER AI
 11D6A..11D89  ; ID_Start # Lo  [32] GUNJALA GONDI LETTER OO..GUNJALA GONDI LETTER SA
 11D98         ; ID_Start # Lo       GUNJALA GONDI OM
+11DB0..11DD8  ; ID_Start # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; ID_Start # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; ID_Start # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
 11EE0..11EF2  ; ID_Start # Lo  [19] MAKASAR LETTER KA..MAKASAR ANGKA
 11F02         ; ID_Start # Lo       KAWI SIGN REPHA
 11F04..11F10  ; ID_Start # Lo  [13] KAWI LETTER A..KAWI LETTER O
@@ -6847,14 +6913,18 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 16D43..16D6A  ; ID_Start # Lo  [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU
 16D6B..16D6C  ; ID_Start # Lm   [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT
 16E40..16E7F  ; ID_Start # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; ID_Start # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; ID_Start # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 16F00..16F4A  ; ID_Start # Lo  [75] MIAO LETTER PA..MIAO LETTER RTE
 16F50         ; ID_Start # Lo       MIAO LETTER NASALIZATION
 16F93..16F9F  ; ID_Start # Lm  [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8
 16FE0..16FE1  ; ID_Start # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 16FE3         ; ID_Start # Lm       OLD CHINESE ITERATION MARK
-17000..187F7  ; ID_Start # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; ID_Start # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; ID_Start # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; ID_Start # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; ID_Start # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; ID_Start # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; ID_Start # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; ID_Start # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1AFF0..1AFF3  ; ID_Start # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; ID_Start # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; ID_Start # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -6912,6 +6982,13 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 1E4EB         ; ID_Start # Lm       NAG MUNDARI SIGN OJOD
 1E5D0..1E5ED  ; ID_Start # Lo  [30] OL ONAL LETTER O..OL ONAL LETTER EG
 1E5F0         ; ID_Start # Lo       OL ONAL SIGN HODDOND
+1E6C0..1E6DE  ; ID_Start # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; ID_Start # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E4..1E6E5  ; ID_Start # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E7..1E6ED  ; ID_Start # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6F0..1E6F4  ; ID_Start # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6FE         ; ID_Start # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; ID_Start # Lm       TAI YO XAM LAI
 1E7E0..1E7E6  ; ID_Start # Lo   [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E8..1E7EB  ; ID_Start # Lo   [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
 1E7ED..1E7EE  ; ID_Start # Lo   [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE
@@ -6953,16 +7030,15 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 1EEA5..1EEA9  ; ID_Start # Lo   [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
 1EEAB..1EEBB  ; ID_Start # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 20000..2A6DF  ; ID_Start # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; ID_Start # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; ID_Start # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; ID_Start # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; ID_Start # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; ID_Start # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; ID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; ID_Start # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; ID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; ID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; ID_Start # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; ID_Start # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 141269
+# Total code points: 145916
 
 # ================================================
 
@@ -6991,8 +7067,8 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 01BC..01BF    ; ID_Continue # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; ID_Continue # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; ID_Continue # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; ID_Continue # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; ID_Continue # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; ID_Continue # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; ID_Continue # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02C1    ; ID_Continue # Lm  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
 02C6..02D1    ; ID_Continue # Lm  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
 02E0..02E4    ; ID_Continue # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -7068,7 +7144,7 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 0859..085B    ; ID_Continue # Mn   [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK
 0860..086A    ; ID_Continue # Lo  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
 0870..0887    ; ID_Continue # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
-0889..088E    ; ID_Continue # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; ID_Continue # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 0897..089F    ; ID_Continue # Mn   [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA
 08A0..08C8    ; ID_Continue # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
 08C9          ; ID_Continue # Lm       ARABIC SMALL FARSI YEH
@@ -7218,7 +7294,7 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 0C4A..0C4D    ; ID_Continue # Mn   [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
 0C55..0C56    ; ID_Continue # Mn   [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
 0C58..0C5A    ; ID_Continue # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; ID_Continue # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; ID_Continue # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; ID_Continue # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C62..0C63    ; ID_Continue # Mn   [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
 0C66..0C6F    ; ID_Continue # Nd  [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
@@ -7240,7 +7316,7 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 0CCA..0CCB    ; ID_Continue # Mc   [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
 0CCC..0CCD    ; ID_Continue # Mn   [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA
 0CD5..0CD6    ; ID_Continue # Mc   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
-0CDD..0CDE    ; ID_Continue # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; ID_Continue # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; ID_Continue # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CE2..0CE3    ; ID_Continue # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
 0CE6..0CEF    ; ID_Continue # Nd  [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
@@ -7457,7 +7533,8 @@ FFDA..FFDC    ; ID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL
 1A90..1A99    ; ID_Continue # Nd  [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE
 1AA7          ; ID_Continue # Lm       TAI THAM SIGN MAI YAMOK
 1AB0..1ABD    ; ID_Continue # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
-1ABF..1ACE    ; ID_Continue # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; ID_Continue # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; ID_Continue # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B00..1B03    ; ID_Continue # Mn   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
 1B04          ; ID_Continue # Mc       BALINESE SIGN BISAH
 1B05..1B33    ; ID_Continue # Lo  [47] BALINESE LETTER AKARA..BALINESE LETTER HA
@@ -7646,11 +7723,8 @@ A771..A787    ; ID_Continue # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTE
 A788          ; ID_Continue # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A78B..A78E    ; ID_Continue # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; ID_Continue # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; ID_Continue # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; ID_Continue # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; ID_Continue # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; ID_Continue # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; ID_Continue # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; ID_Continue # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; ID_Continue # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; ID_Continue # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; ID_Continue # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; ID_Continue # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -7857,6 +7931,7 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 108F4..108F5  ; ID_Continue # Lo   [2] HATRAN LETTER SHIN..HATRAN LETTER TAW
 10900..10915  ; ID_Continue # Lo  [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
 10920..10939  ; ID_Continue # Lo  [26] LYDIAN LETTER A..LYDIAN LETTER C
+10940..10959  ; ID_Continue # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
 10980..109B7  ; ID_Continue # Lo  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
 109BE..109BF  ; ID_Continue # Lo   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
 10A00         ; ID_Continue # Lo       KHAROSHTHI LETTER A
@@ -7895,7 +7970,9 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 10EAB..10EAC  ; ID_Continue # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
 10EB0..10EB1  ; ID_Continue # Lo   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 10EC2..10EC4  ; ID_Continue # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
-10EFC..10EFF  ; ID_Continue # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EC5         ; ID_Continue # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; ID_Continue # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
+10EFA..10EFF  ; ID_Continue # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 10F00..10F1C  ; ID_Continue # Lo  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F27         ; ID_Continue # Lo       OLD SOGDIAN LIGATURE AYIN-DALETH
 10F30..10F45  ; ID_Continue # Lo  [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN
@@ -8122,6 +8199,12 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 11A98..11A99  ; ID_Continue # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
 11A9D         ; ID_Continue # Lo       SOYOMBO MARK PLUTA
 11AB0..11AF8  ; ID_Continue # Lo  [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL
+11B60         ; ID_Continue # Mn       SHARADA VOWEL SIGN OE
+11B61         ; ID_Continue # Mc       SHARADA VOWEL SIGN OOE
+11B62..11B64  ; ID_Continue # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B65         ; ID_Continue # Mc       SHARADA VOWEL SIGN SHORT O
+11B66         ; ID_Continue # Mn       SHARADA VOWEL SIGN CANDRA E
+11B67         ; ID_Continue # Mc       SHARADA VOWEL SIGN CANDRA O
 11BC0..11BE0  ; ID_Continue # Lo  [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO
 11BF0..11BF9  ; ID_Continue # Nd  [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE
 11C00..11C08  ; ID_Continue # Lo   [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
@@ -8162,6 +8245,10 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 11D97         ; ID_Continue # Mn       GUNJALA GONDI VIRAMA
 11D98         ; ID_Continue # Lo       GUNJALA GONDI OM
 11DA0..11DA9  ; ID_Continue # Nd  [10] GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE
+11DB0..11DD8  ; ID_Continue # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; ID_Continue # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; ID_Continue # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
+11DE0..11DE9  ; ID_Continue # Nd  [10] TOLONG SIKI DIGIT ZERO..TOLONG SIKI DIGIT NINE
 11EE0..11EF2  ; ID_Continue # Lo  [19] MAKASAR LETTER KA..MAKASAR ANGKA
 11EF3..11EF4  ; ID_Continue # Mn   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
 11EF5..11EF6  ; ID_Continue # Mc   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
@@ -8212,6 +8299,8 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 16D6B..16D6C  ; ID_Continue # Lm   [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT
 16D70..16D79  ; ID_Continue # Nd  [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE
 16E40..16E7F  ; ID_Continue # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; ID_Continue # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; ID_Continue # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 16F00..16F4A  ; ID_Continue # Lo  [75] MIAO LETTER PA..MIAO LETTER RTE
 16F4F         ; ID_Continue # Mn       MIAO SIGN CONSONANT MODIFIER BAR
 16F50         ; ID_Continue # Lo       MIAO LETTER NASALIZATION
@@ -8222,9 +8311,11 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 16FE3         ; ID_Continue # Lm       OLD CHINESE ITERATION MARK
 16FE4         ; ID_Continue # Mn       KHITAN SMALL SCRIPT FILLER
 16FF0..16FF1  ; ID_Continue # Mc   [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
-17000..187F7  ; ID_Continue # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; ID_Continue # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; ID_Continue # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; ID_Continue # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; ID_Continue # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; ID_Continue # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; ID_Continue # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; ID_Continue # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1AFF0..1AFF3  ; ID_Continue # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; ID_Continue # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; ID_Continue # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -8315,6 +8406,17 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 1E5EE..1E5EF  ; ID_Continue # Mn   [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR
 1E5F0         ; ID_Continue # Lo       OL ONAL SIGN HODDOND
 1E5F1..1E5FA  ; ID_Continue # Nd  [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE
+1E6C0..1E6DE  ; ID_Continue # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; ID_Continue # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E3         ; ID_Continue # Mn       TAI YO SIGN UE
+1E6E4..1E6E5  ; ID_Continue # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E6         ; ID_Continue # Mn       TAI YO SIGN AU
+1E6E7..1E6ED  ; ID_Continue # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6EE..1E6EF  ; ID_Continue # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F0..1E6F4  ; ID_Continue # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6F5         ; ID_Continue # Mn       TAI YO SIGN OM
+1E6FE         ; ID_Continue # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; ID_Continue # Lm       TAI YO XAM LAI
 1E7E0..1E7E6  ; ID_Continue # Lo   [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E8..1E7EB  ; ID_Continue # Lo   [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
 1E7ED..1E7EE  ; ID_Continue # Lo   [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE
@@ -8360,17 +8462,16 @@ FFDA..FFDC    ; ID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN
 1EEAB..1EEBB  ; ID_Continue # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1FBF0..1FBF9  ; ID_Continue # Nd  [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE
 20000..2A6DF  ; ID_Continue # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; ID_Continue # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; ID_Continue # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; ID_Continue # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; ID_Continue # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; ID_Continue # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; ID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; ID_Continue # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; ID_Continue # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; ID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; ID_Continue # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; ID_Continue # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 E0100..E01EF  ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 144541
+# Total code points: 149240
 
 # ================================================
 
@@ -8393,8 +8494,8 @@ E0100..E01EF  ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR
 01BC..01BF    ; XID_Start # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; XID_Start # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; XID_Start # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; XID_Start # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; XID_Start # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; XID_Start # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; XID_Start # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02C1    ; XID_Start # Lm  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
 02C6..02D1    ; XID_Start # Lm  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
 02E0..02E4    ; XID_Start # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -8441,7 +8542,7 @@ E0100..E01EF  ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR
 0840..0858    ; XID_Start # Lo  [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN
 0860..086A    ; XID_Start # Lo  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
 0870..0887    ; XID_Start # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
-0889..088E    ; XID_Start # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; XID_Start # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 08A0..08C8    ; XID_Start # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
 08C9          ; XID_Start # Lm       ARABIC SMALL FARSI YEH
 0904..0939    ; XID_Start # Lo  [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA
@@ -8509,7 +8610,7 @@ E0100..E01EF  ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR
 0C2A..0C39    ; XID_Start # Lo  [16] TELUGU LETTER PA..TELUGU LETTER HA
 0C3D          ; XID_Start # Lo       TELUGU SIGN AVAGRAHA
 0C58..0C5A    ; XID_Start # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; XID_Start # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; XID_Start # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; XID_Start # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C80          ; XID_Start # Lo       KANNADA SIGN SPACING CANDRABINDU
 0C85..0C8C    ; XID_Start # Lo   [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L
@@ -8518,7 +8619,7 @@ E0100..E01EF  ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR
 0CAA..0CB3    ; XID_Start # Lo  [10] KANNADA LETTER PA..KANNADA LETTER LLA
 0CB5..0CB9    ; XID_Start # Lo   [5] KANNADA LETTER VA..KANNADA LETTER HA
 0CBD          ; XID_Start # Lo       KANNADA SIGN AVAGRAHA
-0CDD..0CDE    ; XID_Start # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; XID_Start # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; XID_Start # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CF1..0CF2    ; XID_Start # Lo   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
 0D04..0D0C    ; XID_Start # Lo   [9] MALAYALAM LETTER VEDIC ANUSVARA..MALAYALAM LETTER VOCALIC L
@@ -8742,11 +8843,8 @@ A771..A787    ; XID_Start # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER
 A788          ; XID_Start # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A78B..A78E    ; XID_Start # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; XID_Start # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; XID_Start # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; XID_Start # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; XID_Start # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; XID_Start # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; XID_Start # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; XID_Start # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; XID_Start # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; XID_Start # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; XID_Start # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; XID_Start # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -8888,6 +8986,7 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 108F4..108F5  ; XID_Start # Lo   [2] HATRAN LETTER SHIN..HATRAN LETTER TAW
 10900..10915  ; XID_Start # Lo  [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
 10920..10939  ; XID_Start # Lo  [26] LYDIAN LETTER A..LYDIAN LETTER C
+10940..10959  ; XID_Start # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
 10980..109B7  ; XID_Start # Lo  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
 109BE..109BF  ; XID_Start # Lo   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
 10A00         ; XID_Start # Lo       KHAROSHTHI LETTER A
@@ -8915,6 +9014,8 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 10E80..10EA9  ; XID_Start # Lo  [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET
 10EB0..10EB1  ; XID_Start # Lo   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 10EC2..10EC4  ; XID_Start # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
+10EC5         ; XID_Start # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; XID_Start # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
 10F00..10F1C  ; XID_Start # Lo  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F27         ; XID_Start # Lo       OLD SOGDIAN LIGATURE AYIN-DALETH
 10F30..10F45  ; XID_Start # Lo  [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN
@@ -9007,6 +9108,9 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 11D67..11D68  ; XID_Start # Lo   [2] GUNJALA GONDI LETTER EE..GUNJALA GONDI LETTER AI
 11D6A..11D89  ; XID_Start # Lo  [32] GUNJALA GONDI LETTER OO..GUNJALA GONDI LETTER SA
 11D98         ; XID_Start # Lo       GUNJALA GONDI OM
+11DB0..11DD8  ; XID_Start # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; XID_Start # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; XID_Start # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
 11EE0..11EF2  ; XID_Start # Lo  [19] MAKASAR LETTER KA..MAKASAR ANGKA
 11F02         ; XID_Start # Lo       KAWI SIGN REPHA
 11F04..11F10  ; XID_Start # Lo  [13] KAWI LETTER A..KAWI LETTER O
@@ -9033,14 +9137,18 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 16D43..16D6A  ; XID_Start # Lo  [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU
 16D6B..16D6C  ; XID_Start # Lm   [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT
 16E40..16E7F  ; XID_Start # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; XID_Start # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; XID_Start # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 16F00..16F4A  ; XID_Start # Lo  [75] MIAO LETTER PA..MIAO LETTER RTE
 16F50         ; XID_Start # Lo       MIAO LETTER NASALIZATION
 16F93..16F9F  ; XID_Start # Lm  [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8
 16FE0..16FE1  ; XID_Start # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 16FE3         ; XID_Start # Lm       OLD CHINESE ITERATION MARK
-17000..187F7  ; XID_Start # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; XID_Start # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; XID_Start # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; XID_Start # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; XID_Start # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; XID_Start # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; XID_Start # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; XID_Start # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1AFF0..1AFF3  ; XID_Start # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; XID_Start # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; XID_Start # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -9098,6 +9206,13 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 1E4EB         ; XID_Start # Lm       NAG MUNDARI SIGN OJOD
 1E5D0..1E5ED  ; XID_Start # Lo  [30] OL ONAL LETTER O..OL ONAL LETTER EG
 1E5F0         ; XID_Start # Lo       OL ONAL SIGN HODDOND
+1E6C0..1E6DE  ; XID_Start # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; XID_Start # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E4..1E6E5  ; XID_Start # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E7..1E6ED  ; XID_Start # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6F0..1E6F4  ; XID_Start # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6FE         ; XID_Start # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; XID_Start # Lm       TAI YO XAM LAI
 1E7E0..1E7E6  ; XID_Start # Lo   [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E8..1E7EB  ; XID_Start # Lo   [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
 1E7ED..1E7EE  ; XID_Start # Lo   [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE
@@ -9139,16 +9254,15 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 1EEA5..1EEA9  ; XID_Start # Lo   [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
 1EEAB..1EEBB  ; XID_Start # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 20000..2A6DF  ; XID_Start # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; XID_Start # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; XID_Start # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; XID_Start # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; XID_Start # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; XID_Start # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; XID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; XID_Start # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; XID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; XID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; XID_Start # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; XID_Start # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 141246
+# Total code points: 145893
 
 # ================================================
 
@@ -9174,8 +9288,8 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 01BC..01BF    ; XID_Continue # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; XID_Continue # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; XID_Continue # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; XID_Continue # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; XID_Continue # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; XID_Continue # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; XID_Continue # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02C1    ; XID_Continue # Lm  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
 02C6..02D1    ; XID_Continue # Lm  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
 02E0..02E4    ; XID_Continue # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
@@ -9250,7 +9364,7 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 0859..085B    ; XID_Continue # Mn   [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK
 0860..086A    ; XID_Continue # Lo  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
 0870..0887    ; XID_Continue # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
-0889..088E    ; XID_Continue # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; XID_Continue # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 0897..089F    ; XID_Continue # Mn   [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA
 08A0..08C8    ; XID_Continue # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
 08C9          ; XID_Continue # Lm       ARABIC SMALL FARSI YEH
@@ -9400,7 +9514,7 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 0C4A..0C4D    ; XID_Continue # Mn   [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
 0C55..0C56    ; XID_Continue # Mn   [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
 0C58..0C5A    ; XID_Continue # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; XID_Continue # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; XID_Continue # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; XID_Continue # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C62..0C63    ; XID_Continue # Mn   [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
 0C66..0C6F    ; XID_Continue # Nd  [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
@@ -9422,7 +9536,7 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 0CCA..0CCB    ; XID_Continue # Mc   [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
 0CCC..0CCD    ; XID_Continue # Mn   [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA
 0CD5..0CD6    ; XID_Continue # Mc   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
-0CDD..0CDE    ; XID_Continue # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; XID_Continue # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; XID_Continue # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CE2..0CE3    ; XID_Continue # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
 0CE6..0CEF    ; XID_Continue # Nd  [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
@@ -9639,7 +9753,8 @@ FFDA..FFDC    ; XID_Start # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU
 1A90..1A99    ; XID_Continue # Nd  [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE
 1AA7          ; XID_Continue # Lm       TAI THAM SIGN MAI YAMOK
 1AB0..1ABD    ; XID_Continue # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
-1ABF..1ACE    ; XID_Continue # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; XID_Continue # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; XID_Continue # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B00..1B03    ; XID_Continue # Mn   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
 1B04          ; XID_Continue # Mc       BALINESE SIGN BISAH
 1B05..1B33    ; XID_Continue # Lo  [47] BALINESE LETTER AKARA..BALINESE LETTER HA
@@ -9827,11 +9942,8 @@ A771..A787    ; XID_Continue # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETT
 A788          ; XID_Continue # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A78B..A78E    ; XID_Continue # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; XID_Continue # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; XID_Continue # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; XID_Continue # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; XID_Continue # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; XID_Continue # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; XID_Continue # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; XID_Continue # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; XID_Continue # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; XID_Continue # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; XID_Continue # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; XID_Continue # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -10044,6 +10156,7 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 108F4..108F5  ; XID_Continue # Lo   [2] HATRAN LETTER SHIN..HATRAN LETTER TAW
 10900..10915  ; XID_Continue # Lo  [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
 10920..10939  ; XID_Continue # Lo  [26] LYDIAN LETTER A..LYDIAN LETTER C
+10940..10959  ; XID_Continue # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
 10980..109B7  ; XID_Continue # Lo  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
 109BE..109BF  ; XID_Continue # Lo   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
 10A00         ; XID_Continue # Lo       KHAROSHTHI LETTER A
@@ -10082,7 +10195,9 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 10EAB..10EAC  ; XID_Continue # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
 10EB0..10EB1  ; XID_Continue # Lo   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 10EC2..10EC4  ; XID_Continue # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
-10EFC..10EFF  ; XID_Continue # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EC5         ; XID_Continue # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; XID_Continue # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
+10EFA..10EFF  ; XID_Continue # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 10F00..10F1C  ; XID_Continue # Lo  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F27         ; XID_Continue # Lo       OLD SOGDIAN LIGATURE AYIN-DALETH
 10F30..10F45  ; XID_Continue # Lo  [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN
@@ -10309,6 +10424,12 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 11A98..11A99  ; XID_Continue # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
 11A9D         ; XID_Continue # Lo       SOYOMBO MARK PLUTA
 11AB0..11AF8  ; XID_Continue # Lo  [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL
+11B60         ; XID_Continue # Mn       SHARADA VOWEL SIGN OE
+11B61         ; XID_Continue # Mc       SHARADA VOWEL SIGN OOE
+11B62..11B64  ; XID_Continue # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B65         ; XID_Continue # Mc       SHARADA VOWEL SIGN SHORT O
+11B66         ; XID_Continue # Mn       SHARADA VOWEL SIGN CANDRA E
+11B67         ; XID_Continue # Mc       SHARADA VOWEL SIGN CANDRA O
 11BC0..11BE0  ; XID_Continue # Lo  [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO
 11BF0..11BF9  ; XID_Continue # Nd  [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE
 11C00..11C08  ; XID_Continue # Lo   [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
@@ -10349,6 +10470,10 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 11D97         ; XID_Continue # Mn       GUNJALA GONDI VIRAMA
 11D98         ; XID_Continue # Lo       GUNJALA GONDI OM
 11DA0..11DA9  ; XID_Continue # Nd  [10] GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE
+11DB0..11DD8  ; XID_Continue # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; XID_Continue # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; XID_Continue # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
+11DE0..11DE9  ; XID_Continue # Nd  [10] TOLONG SIKI DIGIT ZERO..TOLONG SIKI DIGIT NINE
 11EE0..11EF2  ; XID_Continue # Lo  [19] MAKASAR LETTER KA..MAKASAR ANGKA
 11EF3..11EF4  ; XID_Continue # Mn   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
 11EF5..11EF6  ; XID_Continue # Mc   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
@@ -10399,6 +10524,8 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 16D6B..16D6C  ; XID_Continue # Lm   [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT
 16D70..16D79  ; XID_Continue # Nd  [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE
 16E40..16E7F  ; XID_Continue # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+16EA0..16EB8  ; XID_Continue # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; XID_Continue # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 16F00..16F4A  ; XID_Continue # Lo  [75] MIAO LETTER PA..MIAO LETTER RTE
 16F4F         ; XID_Continue # Mn       MIAO SIGN CONSONANT MODIFIER BAR
 16F50         ; XID_Continue # Lo       MIAO LETTER NASALIZATION
@@ -10409,9 +10536,11 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 16FE3         ; XID_Continue # Lm       OLD CHINESE ITERATION MARK
 16FE4         ; XID_Continue # Mn       KHITAN SMALL SCRIPT FILLER
 16FF0..16FF1  ; XID_Continue # Mc   [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
-17000..187F7  ; XID_Continue # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; XID_Continue # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; XID_Continue # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; XID_Continue # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; XID_Continue # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; XID_Continue # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; XID_Continue # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; XID_Continue # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1AFF0..1AFF3  ; XID_Continue # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; XID_Continue # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; XID_Continue # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -10502,6 +10631,17 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 1E5EE..1E5EF  ; XID_Continue # Mn   [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR
 1E5F0         ; XID_Continue # Lo       OL ONAL SIGN HODDOND
 1E5F1..1E5FA  ; XID_Continue # Nd  [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE
+1E6C0..1E6DE  ; XID_Continue # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; XID_Continue # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E3         ; XID_Continue # Mn       TAI YO SIGN UE
+1E6E4..1E6E5  ; XID_Continue # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E6         ; XID_Continue # Mn       TAI YO SIGN AU
+1E6E7..1E6ED  ; XID_Continue # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6EE..1E6EF  ; XID_Continue # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F0..1E6F4  ; XID_Continue # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6F5         ; XID_Continue # Mn       TAI YO SIGN OM
+1E6FE         ; XID_Continue # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; XID_Continue # Lm       TAI YO XAM LAI
 1E7E0..1E7E6  ; XID_Continue # Lo   [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E8..1E7EB  ; XID_Continue # Lo   [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
 1E7ED..1E7EE  ; XID_Continue # Lo   [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE
@@ -10547,17 +10687,16 @@ FFDA..FFDC    ; XID_Continue # Lo   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA
 1EEAB..1EEBB  ; XID_Continue # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1FBF0..1FBF9  ; XID_Continue # Nd  [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE
 20000..2A6DF  ; XID_Continue # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; XID_Continue # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; XID_Continue # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; XID_Continue # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; XID_Continue # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; XID_Continue # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; XID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; XID_Continue # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; XID_Continue # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; XID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; XID_Continue # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; XID_Continue # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 E0100..E01EF  ; XID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 144522
+# Total code points: 149221
 
 # ================================================
 
@@ -10778,7 +10917,8 @@ E01F0..E0FFF  ; Default_Ignorable_Code_Point # Cn [3600] <reserved-E01F0>..<rese
 1A7F          ; Grapheme_Extend # Mn       TAI THAM COMBINING CRYPTOGRAMMIC DOT
 1AB0..1ABD    ; Grapheme_Extend # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
 1ABE          ; Grapheme_Extend # Me       COMBINING PARENTHESES OVERLAY
-1ABF..1ACE    ; Grapheme_Extend # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; Grapheme_Extend # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; Grapheme_Extend # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B00..1B03    ; Grapheme_Extend # Mn   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
 1B34          ; Grapheme_Extend # Mn       BALINESE SIGN REREKAN
 1B35          ; Grapheme_Extend # Mc       BALINESE VOWEL SIGN TEDUNG
@@ -10874,7 +11014,7 @@ FF9E..FF9F    ; Grapheme_Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK.
 10D24..10D27  ; Grapheme_Extend # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
 10D69..10D6D  ; Grapheme_Extend # Mn   [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK
 10EAB..10EAC  ; Grapheme_Extend # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
-10EFC..10EFF  ; Grapheme_Extend # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EFA..10EFF  ; Grapheme_Extend # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 10F46..10F50  ; Grapheme_Extend # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 10F82..10F85  ; Grapheme_Extend # Mn   [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW
 11001         ; Grapheme_Extend # Mn       BRAHMI SIGN ANUSVARA
@@ -10965,6 +11105,9 @@ FF9E..FF9F    ; Grapheme_Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK.
 11A59..11A5B  ; Grapheme_Extend # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
 11A8A..11A96  ; Grapheme_Extend # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
 11A98..11A99  ; Grapheme_Extend # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
+11B60         ; Grapheme_Extend # Mn       SHARADA VOWEL SIGN OE
+11B62..11B64  ; Grapheme_Extend # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B66         ; Grapheme_Extend # Mn       SHARADA VOWEL SIGN CANDRA E
 11C30..11C36  ; Grapheme_Extend # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; Grapheme_Extend # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
 11C3F         ; Grapheme_Extend # Mn       BHAIKSUKI SIGN VIRAMA
@@ -11024,12 +11167,16 @@ FF9E..FF9F    ; Grapheme_Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK.
 1E2EC..1E2EF  ; Grapheme_Extend # Mn   [4] WANCHO TONE TUP..WANCHO TONE KOINI
 1E4EC..1E4EF  ; Grapheme_Extend # Mn   [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH
 1E5EE..1E5EF  ; Grapheme_Extend # Mn   [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR
+1E6E3         ; Grapheme_Extend # Mn       TAI YO SIGN UE
+1E6E6         ; Grapheme_Extend # Mn       TAI YO SIGN AU
+1E6EE..1E6EF  ; Grapheme_Extend # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F5         ; Grapheme_Extend # Mn       TAI YO SIGN OM
 1E8D0..1E8D6  ; Grapheme_Extend # Mn   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
 1E944..1E94A  ; Grapheme_Extend # Mn   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
 E0020..E007F  ; Grapheme_Extend # Cf  [96] TAG SPACE..CANCEL TAG
 E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 2193
+# Total code points: 2232
 
 # ================================================
 
@@ -11098,8 +11245,8 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 01BC..01BF    ; Grapheme_Base # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; Grapheme_Base # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; Grapheme_Base # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; Grapheme_Base # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; Grapheme_Base # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; Grapheme_Base # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; Grapheme_Base # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02C1    ; Grapheme_Base # Lm  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
 02C2..02C5    ; Grapheme_Base # Sk   [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD
 02C6..02D1    ; Grapheme_Base # Lm  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
@@ -11190,7 +11337,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 0860..086A    ; Grapheme_Base # Lo  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
 0870..0887    ; Grapheme_Base # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
 0888          ; Grapheme_Base # Sk       ARABIC RAISED ROUND DOT
-0889..088E    ; Grapheme_Base # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; Grapheme_Base # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 08A0..08C8    ; Grapheme_Base # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
 08C9          ; Grapheme_Base # Lm       ARABIC SMALL FARSI YEH
 0903          ; Grapheme_Base # Mc       DEVANAGARI SIGN VISARGA
@@ -11305,7 +11452,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 0C3D          ; Grapheme_Base # Lo       TELUGU SIGN AVAGRAHA
 0C41..0C44    ; Grapheme_Base # Mc   [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR
 0C58..0C5A    ; Grapheme_Base # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; Grapheme_Base # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; Grapheme_Base # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; Grapheme_Base # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C66..0C6F    ; Grapheme_Base # Nd  [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
 0C77          ; Grapheme_Base # Po       TELUGU SIGN SIDDHAM
@@ -11323,7 +11470,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 0CBE          ; Grapheme_Base # Mc       KANNADA VOWEL SIGN AA
 0CC1          ; Grapheme_Base # Mc       KANNADA VOWEL SIGN U
 0CC3..0CC4    ; Grapheme_Base # Mc   [2] KANNADA VOWEL SIGN VOCALIC R..KANNADA VOWEL SIGN VOCALIC RR
-0CDD..0CDE    ; Grapheme_Base # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; Grapheme_Base # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; Grapheme_Base # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CE6..0CEF    ; Grapheme_Base # Nd  [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
 0CF1..0CF2    ; Grapheme_Base # Lo   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
@@ -11639,7 +11786,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 208D          ; Grapheme_Base # Ps       SUBSCRIPT LEFT PARENTHESIS
 208E          ; Grapheme_Base # Pe       SUBSCRIPT RIGHT PARENTHESIS
 2090..209C    ; Grapheme_Base # Lm  [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T
-20A0..20C0    ; Grapheme_Base # Sc  [33] EURO-CURRENCY SIGN..SOM SIGN
+20A0..20C1    ; Grapheme_Base # Sc  [34] EURO-CURRENCY SIGN..SAUDI RIYAL SIGN
 2100..2101    ; Grapheme_Base # So   [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT
 2102          ; Grapheme_Base # L&       DOUBLE-STRUCK CAPITAL C
 2103..2106    ; Grapheme_Base # So   [4] DEGREE CELSIUS..CADA UNA
@@ -11796,8 +11943,7 @@ E0100..E01EF  ; Grapheme_Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELE
 2B45..2B46    ; Grapheme_Base # So   [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW
 2B47..2B4C    ; Grapheme_Base # Sm   [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
 2B4D..2B73    ; Grapheme_Base # So  [39] DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
-2B76..2B95    ; Grapheme_Base # So  [32] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
-2B97..2BFF    ; Grapheme_Base # So [105] SYMBOL FOR TYPE A ELECTRONICS..HELLSCHREIBER PAUSE SYMBOL
+2B76..2BFF    ; Grapheme_Base # So [138] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..HELLSCHREIBER PAUSE SYMBOL
 2C00..2C7B    ; Grapheme_Base # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E
 2C7C..2C7D    ; Grapheme_Base # Lm   [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V
 2C7E..2CE4    ; Grapheme_Base # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI
@@ -11977,11 +12123,8 @@ A788          ; Grapheme_Base # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A789..A78A    ; Grapheme_Base # Sk   [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
 A78B..A78E    ; Grapheme_Base # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; Grapheme_Base # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; Grapheme_Base # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; Grapheme_Base # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; Grapheme_Base # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; Grapheme_Base # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; Grapheme_Base # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; Grapheme_Base # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; Grapheme_Base # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; Grapheme_Base # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; Grapheme_Base # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; Grapheme_Base # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -12097,13 +12240,15 @@ FB40..FB41    ; Grapheme_Base # Lo   [2] HEBREW LETTER NUN WITH DAGESH..HEBREW L
 FB43..FB44    ; Grapheme_Base # Lo   [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH
 FB46..FBB1    ; Grapheme_Base # Lo [108] HEBREW LETTER TSADI WITH DAGESH..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
 FBB2..FBC2    ; Grapheme_Base # Sk  [17] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL WASLA ABOVE
+FBC3..FBD2    ; Grapheme_Base # So  [16] ARABIC LIGATURE JALLA WA-ALAA..ARABIC LIGATURE ALAYHI AR-RAHMAH
 FBD3..FD3D    ; Grapheme_Base # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
 FD3E          ; Grapheme_Base # Pe       ORNATE LEFT PARENTHESIS
 FD3F          ; Grapheme_Base # Ps       ORNATE RIGHT PARENTHESIS
 FD40..FD4F    ; Grapheme_Base # So  [16] ARABIC LIGATURE RAHIMAHU ALLAAH..ARABIC LIGATURE RAHIMAHUM ALLAAH
 FD50..FD8F    ; Grapheme_Base # Lo  [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
+FD90..FD91    ; Grapheme_Base # So   [2] ARABIC LIGATURE RAHMATU ALLAAHI ALAYH..ARABIC LIGATURE RAHMATU ALLAAHI ALAYHAA
 FD92..FDC7    ; Grapheme_Base # Lo  [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
-FDCF          ; Grapheme_Base # So       ARABIC LIGATURE SALAAMUHU ALAYNAA
+FDC8..FDCF    ; Grapheme_Base # So   [8] ARABIC LIGATURE RAHIMAHU ALLAAH TAAALAA..ARABIC LIGATURE SALAAMUHU ALAYNAA
 FDF0..FDFB    ; Grapheme_Base # Lo  [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU
 FDFC          ; Grapheme_Base # Sc       RIAL SIGN
 FDFD..FDFF    ; Grapheme_Base # So   [3] ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM..ARABIC LIGATURE AZZA WA JALL
@@ -12280,6 +12425,7 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 1091F         ; Grapheme_Base # Po       PHOENICIAN WORD SEPARATOR
 10920..10939  ; Grapheme_Base # Lo  [26] LYDIAN LETTER A..LYDIAN LETTER C
 1093F         ; Grapheme_Base # Po       LYDIAN TRIANGULAR MARK
+10940..10959  ; Grapheme_Base # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
 10980..109B7  ; Grapheme_Base # Lo  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
 109BC..109BD  ; Grapheme_Base # No   [2] MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS..MEROITIC CURSIVE FRACTION ONE HALF
 109BE..109BF  ; Grapheme_Base # Lo   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
@@ -12330,6 +12476,10 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 10EAD         ; Grapheme_Base # Pd       YEZIDI HYPHENATION MARK
 10EB0..10EB1  ; Grapheme_Base # Lo   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
 10EC2..10EC4  ; Grapheme_Base # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
+10EC5         ; Grapheme_Base # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; Grapheme_Base # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
+10ED0         ; Grapheme_Base # Po       ARABIC BIBLICAL END OF VERSE
+10ED1..10ED8  ; Grapheme_Base # So   [8] ARABIC LIGATURE ALAYHAA AS-SALAATU WAS-SALAAM..ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH
 10F00..10F1C  ; Grapheme_Base # Lo  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F1D..10F26  ; Grapheme_Base # No  [10] OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF
 10F27         ; Grapheme_Base # Lo       OLD SOGDIAN LIGATURE AYIN-DALETH
@@ -12515,6 +12665,9 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 11A9E..11AA2  ; Grapheme_Base # Po   [5] SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME..SOYOMBO TERMINAL MARK-2
 11AB0..11AF8  ; Grapheme_Base # Lo  [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL
 11B00..11B09  ; Grapheme_Base # Po  [10] DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU
+11B61         ; Grapheme_Base # Mc       SHARADA VOWEL SIGN OOE
+11B65         ; Grapheme_Base # Mc       SHARADA VOWEL SIGN SHORT O
+11B67         ; Grapheme_Base # Mc       SHARADA VOWEL SIGN CANDRA O
 11BC0..11BE0  ; Grapheme_Base # Lo  [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO
 11BE1         ; Grapheme_Base # Po       SUNUWAR SIGN PVO
 11BF0..11BF9  ; Grapheme_Base # Nd  [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE
@@ -12544,6 +12697,10 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 11D96         ; Grapheme_Base # Mc       GUNJALA GONDI SIGN VISARGA
 11D98         ; Grapheme_Base # Lo       GUNJALA GONDI OM
 11DA0..11DA9  ; Grapheme_Base # Nd  [10] GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE
+11DB0..11DD8  ; Grapheme_Base # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; Grapheme_Base # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; Grapheme_Base # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
+11DE0..11DE9  ; Grapheme_Base # Nd  [10] TOLONG SIKI DIGIT ZERO..TOLONG SIKI DIGIT NINE
 11EE0..11EF2  ; Grapheme_Base # Lo  [19] MAKASAR LETTER KA..MAKASAR ANGKA
 11EF5..11EF6  ; Grapheme_Base # Mc   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
 11EF7..11EF8  ; Grapheme_Base # Po   [2] MAKASAR PASSIMBANG..MAKASAR END OF SECTION
@@ -12600,6 +12757,8 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 16E40..16E7F  ; Grapheme_Base # L&  [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y
 16E80..16E96  ; Grapheme_Base # No  [23] MEDEFAIDRIN DIGIT ZERO..MEDEFAIDRIN DIGIT THREE ALTERNATE FORM
 16E97..16E9A  ; Grapheme_Base # Po   [4] MEDEFAIDRIN COMMA..MEDEFAIDRIN EXCLAMATION OH
+16EA0..16EB8  ; Grapheme_Base # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; Grapheme_Base # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
 16F00..16F4A  ; Grapheme_Base # Lo  [75] MIAO LETTER PA..MIAO LETTER RTE
 16F50         ; Grapheme_Base # Lo       MIAO LETTER NASALIZATION
 16F51..16F87  ; Grapheme_Base # Mc  [55] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN UI
@@ -12607,9 +12766,11 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 16FE0..16FE1  ; Grapheme_Base # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 16FE2         ; Grapheme_Base # Po       OLD CHINESE HOOK MARK
 16FE3         ; Grapheme_Base # Lm       OLD CHINESE ITERATION MARK
-17000..187F7  ; Grapheme_Base # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; Grapheme_Base # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; Grapheme_Base # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; Grapheme_Base # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; Grapheme_Base # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; Grapheme_Base # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; Grapheme_Base # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; Grapheme_Base # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1AFF0..1AFF3  ; Grapheme_Base # Lm   [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5
 1AFF5..1AFFB  ; Grapheme_Base # Lm   [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5
 1AFFD..1AFFE  ; Grapheme_Base # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
@@ -12627,7 +12788,11 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 1BC9F         ; Grapheme_Base # Po       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
 1CC00..1CCEF  ; Grapheme_Base # So [240] UP-POINTING GO-KART..OUTLINED LATIN CAPITAL LETTER Z
 1CCF0..1CCF9  ; Grapheme_Base # Nd  [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE
+1CCFA..1CCFC  ; Grapheme_Base # So   [3] SNAKE SYMBOL..NOSE SYMBOL
 1CD00..1CEB3  ; Grapheme_Base # So [436] BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET
+1CEBA..1CED0  ; Grapheme_Base # So  [23] FRAGILE SYMBOL..LEUKOTHEA
+1CEE0..1CEEF  ; Grapheme_Base # So  [16] GEOMANTIC FIGURE POPULUS..GEOMANTIC FIGURE VIA
+1CEF0         ; Grapheme_Base # Sm       MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR
 1CF50..1CFC3  ; Grapheme_Base # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK
 1D000..1D0F5  ; Grapheme_Base # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
 1D100..1D126  ; Grapheme_Base # So  [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
@@ -12710,6 +12875,13 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 1E5F0         ; Grapheme_Base # Lo       OL ONAL SIGN HODDOND
 1E5F1..1E5FA  ; Grapheme_Base # Nd  [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE
 1E5FF         ; Grapheme_Base # Po       OL ONAL ABBREVIATION SIGN
+1E6C0..1E6DE  ; Grapheme_Base # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; Grapheme_Base # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E4..1E6E5  ; Grapheme_Base # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E7..1E6ED  ; Grapheme_Base # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6F0..1E6F4  ; Grapheme_Base # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6FE         ; Grapheme_Base # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; Grapheme_Base # Lm       TAI YO XAM LAI
 1E7E0..1E7E6  ; Grapheme_Base # Lo   [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E8..1E7EB  ; Grapheme_Base # Lo   [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
 1E7ED..1E7EE  ; Grapheme_Base # Lo   [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE
@@ -12777,11 +12949,10 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 1F260..1F265  ; Grapheme_Base # So   [6] ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI
 1F300..1F3FA  ; Grapheme_Base # So [251] CYCLONE..AMPHORA
 1F3FB..1F3FF  ; Grapheme_Base # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
-1F400..1F6D7  ; Grapheme_Base # So [728] RAT..ELEVATOR
+1F400..1F6D8  ; Grapheme_Base # So [729] RAT..LANDSLIDE
 1F6DC..1F6EC  ; Grapheme_Base # So  [17] WIRELESS..AIRPLANE ARRIVING
 1F6F0..1F6FC  ; Grapheme_Base # So  [13] SATELLITE..ROLLER SKATE
-1F700..1F776  ; Grapheme_Base # So [119] ALCHEMICAL SYMBOL FOR QUINTESSENCE..LUNAR ECLIPSE
-1F77B..1F7D9  ; Grapheme_Base # So  [95] HAUMEA..NINE POINTED WHITE STAR
+1F700..1F7D9  ; Grapheme_Base # So [218] ALCHEMICAL SYMBOL FOR QUINTESSENCE..NINE POINTED WHITE STAR
 1F7E0..1F7EB  ; Grapheme_Base # So  [12] LARGE ORANGE CIRCLE..LARGE BROWN SQUARE
 1F7F0         ; Grapheme_Base # So       HEAVY EQUALS SIGN
 1F800..1F80B  ; Grapheme_Base # So  [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
@@ -12791,28 +12962,30 @@ FFFC..FFFD    ; Grapheme_Base # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEME
 1F890..1F8AD  ; Grapheme_Base # So  [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
 1F8B0..1F8BB  ; Grapheme_Base # So  [12] ARROW POINTING UPWARDS THEN NORTH WEST..SOUTH WEST ARROW FROM BAR
 1F8C0..1F8C1  ; Grapheme_Base # So   [2] LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW
-1F900..1FA53  ; Grapheme_Base # So [340] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS KNIGHT-BISHOP
+1F8D0..1F8D8  ; Grapheme_Base # Sm   [9] LONG RIGHTWARDS ARROW OVER LONG LEFTWARDS ARROW..LONG LEFT RIGHT ARROW WITH DEPENDENT LOBE
+1F900..1FA57  ; Grapheme_Base # So [344] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS ALFIL
 1FA60..1FA6D  ; Grapheme_Base # So  [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER
 1FA70..1FA7C  ; Grapheme_Base # So  [13] BALLET SHOES..CRUTCH
-1FA80..1FA89  ; Grapheme_Base # So  [10] YO-YO..HARP
-1FA8F..1FAC6  ; Grapheme_Base # So  [56] SHOVEL..FINGERPRINT
-1FACE..1FADC  ; Grapheme_Base # So  [15] MOOSE..ROOT VEGETABLE
-1FADF..1FAE9  ; Grapheme_Base # So  [11] SPLATTER..FACE WITH BAGS UNDER EYES
-1FAF0..1FAF8  ; Grapheme_Base # So   [9] HAND WITH INDEX FINGER AND THUMB CROSSED..RIGHTWARDS PUSHING HAND
+1FA80..1FA8A  ; Grapheme_Base # So  [11] YO-YO..TROMBONE
+1FA8E..1FAC6  ; Grapheme_Base # So  [57] TREASURE CHEST..FINGERPRINT
+1FAC8         ; Grapheme_Base # So       HAIRY CREATURE
+1FACD..1FADC  ; Grapheme_Base # So  [16] ORCA..ROOT VEGETABLE
+1FADF..1FAEA  ; Grapheme_Base # So  [12] SPLATTER..DISTORTED FACE
+1FAEF..1FAF8  ; Grapheme_Base # So  [10] FIGHT CLOUD..RIGHTWARDS PUSHING HAND
 1FB00..1FB92  ; Grapheme_Base # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
 1FB94..1FBEF  ; Grapheme_Base # So  [92] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE
 1FBF0..1FBF9  ; Grapheme_Base # Nd  [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE
+1FBFA         ; Grapheme_Base # So       ALARM BELL SYMBOL
 20000..2A6DF  ; Grapheme_Base # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; Grapheme_Base # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; Grapheme_Base # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; Grapheme_Base # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; Grapheme_Base # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; Grapheme_Base # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; Grapheme_Base # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; Grapheme_Base # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Grapheme_Base # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Grapheme_Base # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; Grapheme_Base # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; Grapheme_Base # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 152730
+# Total code points: 157494
 
 # ================================================
 
@@ -12909,8 +13082,22 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 0B4D          ; InCB; Linker # Mn       ORIYA SIGN VIRAMA
 0C4D          ; InCB; Linker # Mn       TELUGU SIGN VIRAMA
 0D4D          ; InCB; Linker # Mn       MALAYALAM SIGN VIRAMA
+1039          ; InCB; Linker # Mn       MYANMAR SIGN VIRAMA
+17D2          ; InCB; Linker # Mn       KHMER SIGN COENG
+1A60          ; InCB; Linker # Mn       TAI THAM SIGN SAKOT
+1B44          ; InCB; Linker # Mc       BALINESE ADEG ADEG
+1BAB          ; InCB; Linker # Mn       SUNDANESE SIGN VIRAMA
+A9C0          ; InCB; Linker # Mc       JAVANESE PANGKON
+AAF6          ; InCB; Linker # Mn       MEETEI MAYEK VIRAMA
+10A3F         ; InCB; Linker # Mn       KHAROSHTHI VIRAMA
+11133         ; InCB; Linker # Mn       CHAKMA VIRAMA
+113D0         ; InCB; Linker # Mn       TULU-TIGALARI CONJOINER
+1193E         ; InCB; Linker # Mn       DIVES AKURU VIRAMA
+11A47         ; InCB; Linker # Mn       ZANABAZAR SQUARE SUBJOINER
+11A99         ; InCB; Linker # Mn       SOYOMBO SUBJOINER
+11F42         ; InCB; Linker # Mn       KAWI CONJOINER
 
-# Total code points: 6
+# Total code points: 20
 
 # ================================================
 
@@ -12942,8 +13129,58 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 0C2A..0C39    ; InCB; Consonant # Lo  [16] TELUGU LETTER PA..TELUGU LETTER HA
 0C58..0C5A    ; InCB; Consonant # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
 0D15..0D3A    ; InCB; Consonant # Lo  [38] MALAYALAM LETTER KA..MALAYALAM LETTER TTTA
+1000..102A    ; InCB; Consonant # Lo  [43] MYANMAR LETTER KA..MYANMAR LETTER AU
+103F          ; InCB; Consonant # Lo       MYANMAR LETTER GREAT SA
+1050..1055    ; InCB; Consonant # Lo   [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL
+105A..105D    ; InCB; Consonant # Lo   [4] MYANMAR LETTER MON NGA..MYANMAR LETTER MON BBE
+1061          ; InCB; Consonant # Lo       MYANMAR LETTER SGAW KAREN SHA
+1065..1066    ; InCB; Consonant # Lo   [2] MYANMAR LETTER WESTERN PWO KAREN THA..MYANMAR LETTER WESTERN PWO KAREN PWA
+106E..1070    ; InCB; Consonant # Lo   [3] MYANMAR LETTER EASTERN PWO KAREN NNA..MYANMAR LETTER EASTERN PWO KAREN GHWA
+1075..1081    ; InCB; Consonant # Lo  [13] MYANMAR LETTER SHAN KA..MYANMAR LETTER SHAN HA
+108E          ; InCB; Consonant # Lo       MYANMAR LETTER RUMAI PALAUNG FA
+1780..17B3    ; InCB; Consonant # Lo  [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU
+1A20..1A54    ; InCB; Consonant # Lo  [53] TAI THAM LETTER HIGH KA..TAI THAM LETTER GREAT SA
+1B0B..1B0C    ; InCB; Consonant # Lo   [2] BALINESE LETTER RA REPA..BALINESE LETTER RA REPA TEDUNG
+1B13..1B33    ; InCB; Consonant # Lo  [33] BALINESE LETTER KA..BALINESE LETTER HA
+1B45..1B4C    ; InCB; Consonant # Lo   [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA
+1B83..1BA0    ; InCB; Consonant # Lo  [30] SUNDANESE LETTER A..SUNDANESE LETTER HA
+1BAE..1BAF    ; InCB; Consonant # Lo   [2] SUNDANESE LETTER KHA..SUNDANESE LETTER SYA
+1BBB..1BBD    ; InCB; Consonant # Lo   [3] SUNDANESE LETTER REU..SUNDANESE LETTER BHA
+A989..A98B    ; InCB; Consonant # Lo   [3] JAVANESE LETTER PA CEREK..JAVANESE LETTER NGA LELET RASWADI
+A98F..A9B2    ; InCB; Consonant # Lo  [36] JAVANESE LETTER KA..JAVANESE LETTER HA
+A9E0..A9E4    ; InCB; Consonant # Lo   [5] MYANMAR LETTER SHAN GHA..MYANMAR LETTER SHAN BHA
+A9E7..A9EF    ; InCB; Consonant # Lo   [9] MYANMAR LETTER TAI LAING NYA..MYANMAR LETTER TAI LAING NNA
+A9FA..A9FE    ; InCB; Consonant # Lo   [5] MYANMAR LETTER TAI LAING LLA..MYANMAR LETTER TAI LAING BHA
+AA60..AA6F    ; InCB; Consonant # Lo  [16] MYANMAR LETTER KHAMTI GA..MYANMAR LETTER KHAMTI FA
+AA71..AA73    ; InCB; Consonant # Lo   [3] MYANMAR LETTER KHAMTI XA..MYANMAR LETTER KHAMTI RA
+AA7A          ; InCB; Consonant # Lo       MYANMAR LETTER AITON RA
+AA7E..AA7F    ; InCB; Consonant # Lo   [2] MYANMAR LETTER SHWE PALAUNG CHA..MYANMAR LETTER SHWE PALAUNG SHA
+AAE0..AAEA    ; InCB; Consonant # Lo  [11] MEETEI MAYEK LETTER E..MEETEI MAYEK LETTER SSA
+ABC0..ABDA    ; InCB; Consonant # Lo  [27] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER BHAM
+10A00         ; InCB; Consonant # Lo       KHAROSHTHI LETTER A
+10A10..10A13  ; InCB; Consonant # Lo   [4] KHAROSHTHI LETTER KA..KHAROSHTHI LETTER GHA
+10A15..10A17  ; InCB; Consonant # Lo   [3] KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA
+10A19..10A35  ; InCB; Consonant # Lo  [29] KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER VHA
+11103..11126  ; InCB; Consonant # Lo  [36] CHAKMA LETTER AA..CHAKMA LETTER HAA
+11144         ; InCB; Consonant # Lo       CHAKMA LETTER LHAA
+11147         ; InCB; Consonant # Lo       CHAKMA LETTER VAA
+11380..11389  ; InCB; Consonant # Lo  [10] TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL
+1138B         ; InCB; Consonant # Lo       TULU-TIGALARI LETTER EE
+1138E         ; InCB; Consonant # Lo       TULU-TIGALARI LETTER AI
+11390..113B5  ; InCB; Consonant # Lo  [38] TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA
+11900..11906  ; InCB; Consonant # Lo   [7] DIVES AKURU LETTER A..DIVES AKURU LETTER E
+11909         ; InCB; Consonant # Lo       DIVES AKURU LETTER O
+1190C..11913  ; InCB; Consonant # Lo   [8] DIVES AKURU LETTER KA..DIVES AKURU LETTER JA
+11915..11916  ; InCB; Consonant # Lo   [2] DIVES AKURU LETTER NYA..DIVES AKURU LETTER TTA
+11918..1192F  ; InCB; Consonant # Lo  [24] DIVES AKURU LETTER DDA..DIVES AKURU LETTER ZA
+11A00         ; InCB; Consonant # Lo       ZANABAZAR SQUARE LETTER A
+11A0B..11A32  ; InCB; Consonant # Lo  [40] ZANABAZAR SQUARE LETTER KA..ZANABAZAR SQUARE LETTER KSSA
+11A50         ; InCB; Consonant # Lo       SOYOMBO LETTER A
+11A5C..11A83  ; InCB; Consonant # Lo  [40] SOYOMBO LETTER KA..SOYOMBO LETTER KSSA
+11F04..11F10  ; InCB; Consonant # Lo  [13] KAWI LETTER A..KAWI LETTER O
+11F12..11F33  ; InCB; Consonant # Lo  [34] KAWI LETTER KA..KAWI LETTER JNYA
 
-# Total code points: 240
+# Total code points: 911
 
 # ================================================
 
@@ -13065,7 +13302,7 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 0FC6          ; InCB; Extend # Mn       TIBETAN SYMBOL PADMA GDAN
 102D..1030    ; InCB; Extend # Mn   [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU
 1032..1037    ; InCB; Extend # Mn   [6] MYANMAR VOWEL SIGN AI..MYANMAR SIGN DOT BELOW
-1039..103A    ; InCB; Extend # Mn   [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT
+103A          ; InCB; Extend # Mn       MYANMAR SIGN ASAT
 103D..103E    ; InCB; Extend # Mn   [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA
 1058..1059    ; InCB; Extend # Mn   [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL
 105E..1060    ; InCB; Extend # Mn   [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA
@@ -13084,7 +13321,8 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 17B4..17B5    ; InCB; Extend # Mn   [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA
 17B7..17BD    ; InCB; Extend # Mn   [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA
 17C6          ; InCB; Extend # Mn       KHMER SIGN NIKAHIT
-17C9..17D3    ; InCB; Extend # Mn  [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT
+17C9..17D1    ; InCB; Extend # Mn   [9] KHMER SIGN MUUSIKATOAN..KHMER SIGN VIRIAM
+17D3          ; InCB; Extend # Mn       KHMER SIGN BATHAMASAT
 17DD          ; InCB; Extend # Mn       KHMER SIGN ATTHACAN
 180B..180D    ; InCB; Extend # Mn   [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE
 180F          ; InCB; Extend # Mn       MONGOLIAN FREE VARIATION SELECTOR FOUR
@@ -13098,14 +13336,14 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 1A1B          ; InCB; Extend # Mn       BUGINESE VOWEL SIGN AE
 1A56          ; InCB; Extend # Mn       TAI THAM CONSONANT SIGN MEDIAL LA
 1A58..1A5E    ; InCB; Extend # Mn   [7] TAI THAM SIGN MAI KANG LAI..TAI THAM CONSONANT SIGN SA
-1A60          ; InCB; Extend # Mn       TAI THAM SIGN SAKOT
 1A62          ; InCB; Extend # Mn       TAI THAM VOWEL SIGN MAI SAT
 1A65..1A6C    ; InCB; Extend # Mn   [8] TAI THAM VOWEL SIGN I..TAI THAM VOWEL SIGN OA BELOW
 1A73..1A7C    ; InCB; Extend # Mn  [10] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN KHUEN-LUE KARAN
 1A7F          ; InCB; Extend # Mn       TAI THAM COMBINING CRYPTOGRAMMIC DOT
 1AB0..1ABD    ; InCB; Extend # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
 1ABE          ; InCB; Extend # Me       COMBINING PARENTHESES OVERLAY
-1ABF..1ACE    ; InCB; Extend # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; InCB; Extend # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; InCB; Extend # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B00..1B03    ; InCB; Extend # Mn   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
 1B34          ; InCB; Extend # Mn       BALINESE SIGN REREKAN
 1B35          ; InCB; Extend # Mc       BALINESE VOWEL SIGN TEDUNG
@@ -13114,13 +13352,13 @@ ABED          ; Grapheme_Link # Mn       MEETEI MAYEK APUN IYEK
 1B3C          ; InCB; Extend # Mn       BALINESE VOWEL SIGN LA LENGA
 1B3D          ; InCB; Extend # Mc       BALINESE VOWEL SIGN LA LENGA TEDUNG
 1B42          ; InCB; Extend # Mn       BALINESE VOWEL SIGN PEPET
-1B43..1B44    ; InCB; Extend # Mc   [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG
+1B43          ; InCB; Extend # Mc       BALINESE VOWEL SIGN PEPET TEDUNG
 1B6B..1B73    ; InCB; Extend # Mn   [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
 1B80..1B81    ; InCB; Extend # Mn   [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR
 1BA2..1BA5    ; InCB; Extend # Mn   [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU
 1BA8..1BA9    ; InCB; Extend # Mn   [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG
 1BAA          ; InCB; Extend # Mc       SUNDANESE SIGN PAMAAEH
-1BAB..1BAD    ; InCB; Extend # Mn   [3] SUNDANESE SIGN VIRAMA..SUNDANESE CONSONANT SIGN PASANGAN WA
+1BAC..1BAD    ; InCB; Extend # Mn   [2] SUNDANESE CONSONANT SIGN PASANGAN MA..SUNDANESE CONSONANT SIGN PASANGAN WA
 1BE6          ; InCB; Extend # Mn       BATAK SIGN TOMPI
 1BE8..1BE9    ; InCB; Extend # Mn   [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE
 1BED          ; InCB; Extend # Mn       BATAK VOWEL SIGN KARO O
@@ -13167,7 +13405,6 @@ A980..A982    ; InCB; Extend # Mn   [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN L
 A9B3          ; InCB; Extend # Mn       JAVANESE SIGN CECAK TELU
 A9B6..A9B9    ; InCB; Extend # Mn   [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT
 A9BC..A9BD    ; InCB; Extend # Mn   [2] JAVANESE VOWEL SIGN PEPET..JAVANESE CONSONANT SIGN KERET
-A9C0          ; InCB; Extend # Mc       JAVANESE PANGKON
 A9E5          ; InCB; Extend # Mn       MYANMAR SIGN SHAN SAW
 AA29..AA2E    ; InCB; Extend # Mn   [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE
 AA31..AA32    ; InCB; Extend # Mn   [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE
@@ -13181,7 +13418,6 @@ AAB7..AAB8    ; InCB; Extend # Mn   [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA
 AABE..AABF    ; InCB; Extend # Mn   [2] TAI VIET VOWEL AM..TAI VIET TONE MAI EK
 AAC1          ; InCB; Extend # Mn       TAI VIET TONE MAI THO
 AAEC..AAED    ; InCB; Extend # Mn   [2] MEETEI MAYEK VOWEL SIGN UU..MEETEI MAYEK VOWEL SIGN AAI
-AAF6          ; InCB; Extend # Mn       MEETEI MAYEK VIRAMA
 ABE5          ; InCB; Extend # Mn       MEETEI MAYEK VOWEL SIGN ANAP
 ABE8          ; InCB; Extend # Mn       MEETEI MAYEK VOWEL SIGN UNAP
 ABED          ; InCB; Extend # Mn       MEETEI MAYEK APUN IYEK
@@ -13196,12 +13432,11 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 10A05..10A06  ; InCB; Extend # Mn   [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
 10A0C..10A0F  ; InCB; Extend # Mn   [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA
 10A38..10A3A  ; InCB; Extend # Mn   [3] KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
-10A3F         ; InCB; Extend # Mn       KHAROSHTHI VIRAMA
 10AE5..10AE6  ; InCB; Extend # Mn   [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW
 10D24..10D27  ; InCB; Extend # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
 10D69..10D6D  ; InCB; Extend # Mn   [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK
 10EAB..10EAC  ; InCB; Extend # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
-10EFC..10EFF  ; InCB; Extend # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EFA..10EFF  ; InCB; Extend # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 10F46..10F50  ; InCB; Extend # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 10F82..10F85  ; InCB; Extend # Mn   [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW
 11001         ; InCB; Extend # Mn       BRAHMI SIGN ANUSVARA
@@ -13214,7 +13449,8 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 110C2         ; InCB; Extend # Mn       KAITHI VOWEL SIGN VOCALIC R
 11100..11102  ; InCB; Extend # Mn   [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA
 11127..1112B  ; InCB; Extend # Mn   [5] CHAKMA VOWEL SIGN A..CHAKMA VOWEL SIGN UU
-1112D..11134  ; InCB; Extend # Mn   [8] CHAKMA VOWEL SIGN AI..CHAKMA MAAYYAA
+1112D..11132  ; InCB; Extend # Mn   [6] CHAKMA VOWEL SIGN AI..CHAKMA AU MARK
+11134         ; InCB; Extend # Mn       CHAKMA MAAYYAA
 11173         ; InCB; Extend # Mn       MAHAJANI SIGN NUKTA
 11180..11181  ; InCB; Extend # Mn   [2] SHARADA SIGN CANDRABINDU..SHARADA SIGN ANUSVARA
 111B6..111BE  ; InCB; Extend # Mn   [9] SHARADA VOWEL SIGN U..SHARADA VOWEL SIGN O
@@ -13244,7 +13480,6 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 113C7..113C9  ; InCB; Extend # Mc   [3] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI AU LENGTH MARK
 113CE         ; InCB; Extend # Mn       TULU-TIGALARI SIGN VIRAMA
 113CF         ; InCB; Extend # Mc       TULU-TIGALARI SIGN LOOPED VIRAMA
-113D0         ; InCB; Extend # Mn       TULU-TIGALARI CONJOINER
 113D2         ; InCB; Extend # Mn       TULU-TIGALARI GEMINATION MARK
 113E1..113E2  ; InCB; Extend # Mn   [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA
 11438..1143F  ; InCB; Extend # Mn   [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI
@@ -13279,7 +13514,6 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 11930         ; InCB; Extend # Mc       DIVES AKURU VOWEL SIGN AA
 1193B..1193C  ; InCB; Extend # Mn   [2] DIVES AKURU SIGN ANUSVARA..DIVES AKURU SIGN CANDRABINDU
 1193D         ; InCB; Extend # Mc       DIVES AKURU SIGN HALANTA
-1193E         ; InCB; Extend # Mn       DIVES AKURU VIRAMA
 11943         ; InCB; Extend # Mn       DIVES AKURU SIGN NUKTA
 119D4..119D7  ; InCB; Extend # Mn   [4] NANDINAGARI VOWEL SIGN U..NANDINAGARI VOWEL SIGN VOCALIC RR
 119DA..119DB  ; InCB; Extend # Mn   [2] NANDINAGARI VOWEL SIGN E..NANDINAGARI VOWEL SIGN AI
@@ -13287,11 +13521,13 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 11A01..11A0A  ; InCB; Extend # Mn  [10] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL LENGTH MARK
 11A33..11A38  ; InCB; Extend # Mn   [6] ZANABAZAR SQUARE FINAL CONSONANT MARK..ZANABAZAR SQUARE SIGN ANUSVARA
 11A3B..11A3E  ; InCB; Extend # Mn   [4] ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
-11A47         ; InCB; Extend # Mn       ZANABAZAR SQUARE SUBJOINER
 11A51..11A56  ; InCB; Extend # Mn   [6] SOYOMBO VOWEL SIGN I..SOYOMBO VOWEL SIGN OE
 11A59..11A5B  ; InCB; Extend # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
 11A8A..11A96  ; InCB; Extend # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
-11A98..11A99  ; InCB; Extend # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
+11A98         ; InCB; Extend # Mn       SOYOMBO GEMINATION MARK
+11B60         ; InCB; Extend # Mn       SHARADA VOWEL SIGN OE
+11B62..11B64  ; InCB; Extend # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B66         ; InCB; Extend # Mn       SHARADA VOWEL SIGN CANDRA E
 11C30..11C36  ; InCB; Extend # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; InCB; Extend # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
 11C3F         ; InCB; Extend # Mn       BHAIKSUKI SIGN VIRAMA
@@ -13312,7 +13548,6 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 11F36..11F3A  ; InCB; Extend # Mn   [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R
 11F40         ; InCB; Extend # Mn       KAWI VOWEL SIGN EU
 11F41         ; InCB; Extend # Mc       KAWI SIGN KILLER
-11F42         ; InCB; Extend # Mn       KAWI CONJOINER
 11F5A         ; InCB; Extend # Mn       KAWI SIGN NUKTA
 13440         ; InCB; Extend # Mn       EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY
 13447..13455  ; InCB; Extend # Mn  [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED
@@ -13351,12 +13586,16 @@ FF9E..FF9F    ; InCB; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HA
 1E2EC..1E2EF  ; InCB; Extend # Mn   [4] WANCHO TONE TUP..WANCHO TONE KOINI
 1E4EC..1E4EF  ; InCB; Extend # Mn   [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH
 1E5EE..1E5EF  ; InCB; Extend # Mn   [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR
+1E6E3         ; InCB; Extend # Mn       TAI YO SIGN UE
+1E6E6         ; InCB; Extend # Mn       TAI YO SIGN AU
+1E6EE..1E6EF  ; InCB; Extend # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F5         ; InCB; Extend # Mn       TAI YO SIGN OM
 1E8D0..1E8D6  ; InCB; Extend # Mn   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
 1E944..1E94A  ; InCB; Extend # Mn   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
 1F3FB..1F3FF  ; InCB; Extend # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
 E0020..E007F  ; InCB; Extend # Cf  [96] TAG SPACE..CANCEL TAG
 E0100..E01EF  ; InCB; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 2192
+# Total code points: 2217
 
 # EOF
diff --git a/src/java.base/share/data/unicodedata/NormalizationTest.txt b/src/java.base/share/data/unicodedata/NormalizationTest.txt
index 093de82c565..97b4e4e6202 100644
--- a/src/java.base/share/data/unicodedata/NormalizationTest.txt
+++ b/src/java.base/share/data/unicodedata/NormalizationTest.txt
@@ -1,6 +1,6 @@
-# NormalizationTest-16.0.0.txt
-# Date: 2024-04-30, 21:48:23 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# NormalizationTest-17.0.0.txt
+# Date: 2025-06-30, 06:16:16 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -2429,6 +2429,7 @@ FEFA 0334;FEFA 0334;FEFA 0334;0644 0625 0334;0644 0627 0334 0655; # (ﻺ◌̴; 
 A69C;A69C;A69C;044A;044A; # (ꚜ; ꚜ; ꚜ; ъ; ъ; ) MODIFIER LETTER CYRILLIC HARD SIGN
 A69D;A69D;A69D;044C;044C; # (ꚝ; ꚝ; ꚝ; ь; ь; ) MODIFIER LETTER CYRILLIC SOFT SIGN
 A770;A770;A770;A76F;A76F; # (ꝰ; ꝰ; ꝰ; ꝯ; ꝯ; ) MODIFIER LETTER US
+A7F1;A7F1;A7F1;0053;0053; # (꟱; ꟱; ꟱; S; S; ) MODIFIER LETTER CAPITAL S
 A7F2;A7F2;A7F2;0043;0043; # (ꟲ; ꟲ; ꟲ; C; C; ) MODIFIER LETTER CAPITAL C
 A7F3;A7F3;A7F3;0046;0046; # (ꟳ; ꟳ; ꟳ; F; F; ) MODIFIER LETTER CAPITAL F
 A7F4;A7F4;A7F4;0051;0051; # (ꟴ; ꟴ; ꟴ; Q; Q; ) MODIFIER LETTER CAPITAL Q
@@ -18098,6 +18099,60 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 1ACD 0315 0300 05AE 0062;0061 05AE 1ACD 0300 0315 0062;0061 05AE 1ACD 0300 0315 0062;0061 05AE 1ACD 0300 0315 0062;0061 05AE 1ACD 0300 0315 0062; # (a◌ᫍ◌̕◌̀◌֮b; a◌֮◌ᫍ◌̀◌̕b; a◌֮◌ᫍ◌̀◌̕b; a◌֮◌ᫍ◌̀◌̕b; a◌֮◌ᫍ◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING LATIN SMALL LETTER INSULAR R, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1ACE 0062;00E0 05AE 1ACE 0315 0062;0061 05AE 0300 1ACE 0315 0062;00E0 05AE 1ACE 0315 0062;0061 05AE 0300 1ACE 0315 0062; # (a◌̕◌̀◌֮◌ᫎb; à◌֮◌ᫎ◌̕b; a◌֮◌̀◌ᫎ◌̕b; à◌֮◌ᫎ◌̕b; a◌֮◌̀◌ᫎ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING LATIN SMALL LETTER INSULAR T, LATIN SMALL LETTER B
 0061 1ACE 0315 0300 05AE 0062;0061 05AE 1ACE 0300 0315 0062;0061 05AE 1ACE 0300 0315 0062;0061 05AE 1ACE 0300 0315 0062;0061 05AE 1ACE 0300 0315 0062; # (a◌ᫎ◌̕◌̀◌֮b; a◌֮◌ᫎ◌̀◌̕b; a◌֮◌ᫎ◌̀◌̕b; a◌֮◌ᫎ◌̀◌̕b; a◌֮◌ᫎ◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING LATIN SMALL LETTER INSULAR T, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1ACF 0062;00E0 05AE 1ACF 0315 0062;0061 05AE 0300 1ACF 0315 0062;00E0 05AE 1ACF 0315 0062;0061 05AE 0300 1ACF 0315 0062; # (a◌̕◌̀◌֮◌᫏b; à◌֮◌᫏◌̕b; a◌֮◌̀◌᫏◌̕b; à◌֮◌᫏◌̕b; a◌֮◌̀◌᫏◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING DOUBLE CARON, LATIN SMALL LETTER B
+0061 1ACF 0315 0300 05AE 0062;0061 05AE 1ACF 0300 0315 0062;0061 05AE 1ACF 0300 0315 0062;0061 05AE 1ACF 0300 0315 0062;0061 05AE 1ACF 0300 0315 0062; # (a◌᫏◌̕◌̀◌֮b; a◌֮◌᫏◌̀◌̕b; a◌֮◌᫏◌̀◌̕b; a◌֮◌᫏◌̀◌̕b; a◌֮◌᫏◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING DOUBLE CARON, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD0 0062;00E0 05AE 1AD0 0315 0062;0061 05AE 0300 1AD0 0315 0062;00E0 05AE 1AD0 0315 0062;0061 05AE 0300 1AD0 0315 0062; # (a◌̕◌̀◌֮◌᫐b; à◌֮◌᫐◌̕b; a◌֮◌̀◌᫐◌̕b; à◌֮◌᫐◌̕b; a◌֮◌̀◌᫐◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING VERTICAL-LINE-ACUTE, LATIN SMALL LETTER B
+0061 1AD0 0315 0300 05AE 0062;0061 05AE 1AD0 0300 0315 0062;0061 05AE 1AD0 0300 0315 0062;0061 05AE 1AD0 0300 0315 0062;0061 05AE 1AD0 0300 0315 0062; # (a◌᫐◌̕◌̀◌֮b; a◌֮◌᫐◌̀◌̕b; a◌֮◌᫐◌̀◌̕b; a◌֮◌᫐◌̀◌̕b; a◌֮◌᫐◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING VERTICAL-LINE-ACUTE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD1 0062;00E0 05AE 1AD1 0315 0062;0061 05AE 0300 1AD1 0315 0062;00E0 05AE 1AD1 0315 0062;0061 05AE 0300 1AD1 0315 0062; # (a◌̕◌̀◌֮◌᫑b; à◌֮◌᫑◌̕b; a◌֮◌̀◌᫑◌̕b; à◌֮◌᫑◌̕b; a◌֮◌̀◌᫑◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING GRAVE-VERTICAL-LINE, LATIN SMALL LETTER B
+0061 1AD1 0315 0300 05AE 0062;0061 05AE 1AD1 0300 0315 0062;0061 05AE 1AD1 0300 0315 0062;0061 05AE 1AD1 0300 0315 0062;0061 05AE 1AD1 0300 0315 0062; # (a◌᫑◌̕◌̀◌֮b; a◌֮◌᫑◌̀◌̕b; a◌֮◌᫑◌̀◌̕b; a◌֮◌᫑◌̀◌̕b; a◌֮◌᫑◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING GRAVE-VERTICAL-LINE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD2 0062;00E0 05AE 1AD2 0315 0062;0061 05AE 0300 1AD2 0315 0062;00E0 05AE 1AD2 0315 0062;0061 05AE 0300 1AD2 0315 0062; # (a◌̕◌̀◌֮◌᫒b; à◌֮◌᫒◌̕b; a◌֮◌̀◌᫒◌̕b; à◌֮◌᫒◌̕b; a◌֮◌̀◌᫒◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING VERTICAL-LINE-GRAVE, LATIN SMALL LETTER B
+0061 1AD2 0315 0300 05AE 0062;0061 05AE 1AD2 0300 0315 0062;0061 05AE 1AD2 0300 0315 0062;0061 05AE 1AD2 0300 0315 0062;0061 05AE 1AD2 0300 0315 0062; # (a◌᫒◌̕◌̀◌֮b; a◌֮◌᫒◌̀◌̕b; a◌֮◌᫒◌̀◌̕b; a◌֮◌᫒◌̀◌̕b; a◌֮◌᫒◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING VERTICAL-LINE-GRAVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD3 0062;00E0 05AE 1AD3 0315 0062;0061 05AE 0300 1AD3 0315 0062;00E0 05AE 1AD3 0315 0062;0061 05AE 0300 1AD3 0315 0062; # (a◌̕◌̀◌֮◌᫓b; à◌֮◌᫓◌̕b; a◌֮◌̀◌᫓◌̕b; à◌֮◌᫓◌̕b; a◌֮◌̀◌᫓◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING ACUTE-VERTICAL-LINE, LATIN SMALL LETTER B
+0061 1AD3 0315 0300 05AE 0062;0061 05AE 1AD3 0300 0315 0062;0061 05AE 1AD3 0300 0315 0062;0061 05AE 1AD3 0300 0315 0062;0061 05AE 1AD3 0300 0315 0062; # (a◌᫓◌̕◌̀◌֮b; a◌֮◌᫓◌̀◌̕b; a◌֮◌᫓◌̀◌̕b; a◌֮◌᫓◌̀◌̕b; a◌֮◌᫓◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING ACUTE-VERTICAL-LINE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD4 0062;00E0 05AE 1AD4 0315 0062;0061 05AE 0300 1AD4 0315 0062;00E0 05AE 1AD4 0315 0062;0061 05AE 0300 1AD4 0315 0062; # (a◌̕◌̀◌֮◌᫔b; à◌֮◌᫔◌̕b; a◌֮◌̀◌᫔◌̕b; à◌֮◌᫔◌̕b; a◌֮◌̀◌᫔◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING VERTICAL-LINE-MACRON, LATIN SMALL LETTER B
+0061 1AD4 0315 0300 05AE 0062;0061 05AE 1AD4 0300 0315 0062;0061 05AE 1AD4 0300 0315 0062;0061 05AE 1AD4 0300 0315 0062;0061 05AE 1AD4 0300 0315 0062; # (a◌᫔◌̕◌̀◌֮b; a◌֮◌᫔◌̀◌̕b; a◌֮◌᫔◌̀◌̕b; a◌֮◌᫔◌̀◌̕b; a◌֮◌᫔◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING VERTICAL-LINE-MACRON, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD5 0062;00E0 05AE 1AD5 0315 0062;0061 05AE 0300 1AD5 0315 0062;00E0 05AE 1AD5 0315 0062;0061 05AE 0300 1AD5 0315 0062; # (a◌̕◌̀◌֮◌᫕b; à◌֮◌᫕◌̕b; a◌֮◌̀◌᫕◌̕b; à◌֮◌᫕◌̕b; a◌֮◌̀◌᫕◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING MACRON-VERTICAL-LINE, LATIN SMALL LETTER B
+0061 1AD5 0315 0300 05AE 0062;0061 05AE 1AD5 0300 0315 0062;0061 05AE 1AD5 0300 0315 0062;0061 05AE 1AD5 0300 0315 0062;0061 05AE 1AD5 0300 0315 0062; # (a◌᫕◌̕◌̀◌֮b; a◌֮◌᫕◌̀◌̕b; a◌֮◌᫕◌̀◌̕b; a◌֮◌᫕◌̀◌̕b; a◌֮◌᫕◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING MACRON-VERTICAL-LINE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD6 0062;00E0 05AE 1AD6 0315 0062;0061 05AE 0300 1AD6 0315 0062;00E0 05AE 1AD6 0315 0062;0061 05AE 0300 1AD6 0315 0062; # (a◌̕◌̀◌֮◌᫖b; à◌֮◌᫖◌̕b; a◌֮◌̀◌᫖◌̕b; à◌֮◌᫖◌̕b; a◌֮◌̀◌᫖◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING VERTICAL-LINE-ACUTE-GRAVE, LATIN SMALL LETTER B
+0061 1AD6 0315 0300 05AE 0062;0061 05AE 1AD6 0300 0315 0062;0061 05AE 1AD6 0300 0315 0062;0061 05AE 1AD6 0300 0315 0062;0061 05AE 1AD6 0300 0315 0062; # (a◌᫖◌̕◌̀◌֮b; a◌֮◌᫖◌̀◌̕b; a◌֮◌᫖◌̀◌̕b; a◌֮◌᫖◌̀◌̕b; a◌֮◌᫖◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING VERTICAL-LINE-ACUTE-GRAVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD7 0062;00E0 05AE 1AD7 0315 0062;0061 05AE 0300 1AD7 0315 0062;00E0 05AE 1AD7 0315 0062;0061 05AE 0300 1AD7 0315 0062; # (a◌̕◌̀◌֮◌᫗b; à◌֮◌᫗◌̕b; a◌֮◌̀◌᫗◌̕b; à◌֮◌᫗◌̕b; a◌֮◌̀◌᫗◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING VERTICAL-LINE-GRAVE-ACUTE, LATIN SMALL LETTER B
+0061 1AD7 0315 0300 05AE 0062;0061 05AE 1AD7 0300 0315 0062;0061 05AE 1AD7 0300 0315 0062;0061 05AE 1AD7 0300 0315 0062;0061 05AE 1AD7 0300 0315 0062; # (a◌᫗◌̕◌̀◌֮b; a◌֮◌᫗◌̀◌̕b; a◌֮◌᫗◌̀◌̕b; a◌֮◌᫗◌̀◌̕b; a◌֮◌᫗◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING VERTICAL-LINE-GRAVE-ACUTE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD8 0062;00E0 05AE 1AD8 0315 0062;0061 05AE 0300 1AD8 0315 0062;00E0 05AE 1AD8 0315 0062;0061 05AE 0300 1AD8 0315 0062; # (a◌̕◌̀◌֮◌᫘b; à◌֮◌᫘◌̕b; a◌֮◌̀◌᫘◌̕b; à◌֮◌᫘◌̕b; a◌֮◌̀◌᫘◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING MACRON-ACUTE-GRAVE, LATIN SMALL LETTER B
+0061 1AD8 0315 0300 05AE 0062;0061 05AE 1AD8 0300 0315 0062;0061 05AE 1AD8 0300 0315 0062;0061 05AE 1AD8 0300 0315 0062;0061 05AE 1AD8 0300 0315 0062; # (a◌᫘◌̕◌̀◌֮b; a◌֮◌᫘◌̀◌̕b; a◌֮◌᫘◌̀◌̕b; a◌֮◌᫘◌̀◌̕b; a◌֮◌᫘◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING MACRON-ACUTE-GRAVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AD9 0062;00E0 05AE 1AD9 0315 0062;0061 05AE 0300 1AD9 0315 0062;00E0 05AE 1AD9 0315 0062;0061 05AE 0300 1AD9 0315 0062; # (a◌̕◌̀◌֮◌᫙b; à◌֮◌᫙◌̕b; a◌֮◌̀◌᫙◌̕b; à◌֮◌᫙◌̕b; a◌֮◌̀◌᫙◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING SHARP SIGN, LATIN SMALL LETTER B
+0061 1AD9 0315 0300 05AE 0062;0061 05AE 1AD9 0300 0315 0062;0061 05AE 1AD9 0300 0315 0062;0061 05AE 1AD9 0300 0315 0062;0061 05AE 1AD9 0300 0315 0062; # (a◌᫙◌̕◌̀◌֮b; a◌֮◌᫙◌̀◌̕b; a◌֮◌᫙◌̀◌̕b; a◌֮◌᫙◌̀◌̕b; a◌֮◌᫙◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING SHARP SIGN, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1ADA 0062;00E0 05AE 1ADA 0315 0062;0061 05AE 0300 1ADA 0315 0062;00E0 05AE 1ADA 0315 0062;0061 05AE 0300 1ADA 0315 0062; # (a◌̕◌̀◌֮◌᫚b; à◌֮◌᫚◌̕b; a◌֮◌̀◌᫚◌̕b; à◌֮◌᫚◌̕b; a◌֮◌̀◌᫚◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING FLAT SIGN, LATIN SMALL LETTER B
+0061 1ADA 0315 0300 05AE 0062;0061 05AE 1ADA 0300 0315 0062;0061 05AE 1ADA 0300 0315 0062;0061 05AE 1ADA 0300 0315 0062;0061 05AE 1ADA 0300 0315 0062; # (a◌᫚◌̕◌̀◌֮b; a◌֮◌᫚◌̀◌̕b; a◌֮◌᫚◌̀◌̕b; a◌֮◌᫚◌̀◌̕b; a◌֮◌᫚◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING FLAT SIGN, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1ADB 0062;00E0 05AE 1ADB 0315 0062;0061 05AE 0300 1ADB 0315 0062;00E0 05AE 1ADB 0315 0062;0061 05AE 0300 1ADB 0315 0062; # (a◌̕◌̀◌֮◌᫛b; à◌֮◌᫛◌̕b; a◌֮◌̀◌᫛◌̕b; à◌֮◌᫛◌̕b; a◌֮◌̀◌᫛◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING DOWN TACK ABOVE, LATIN SMALL LETTER B
+0061 1ADB 0315 0300 05AE 0062;0061 05AE 1ADB 0300 0315 0062;0061 05AE 1ADB 0300 0315 0062;0061 05AE 1ADB 0300 0315 0062;0061 05AE 1ADB 0300 0315 0062; # (a◌᫛◌̕◌̀◌֮b; a◌֮◌᫛◌̀◌̕b; a◌֮◌᫛◌̀◌̕b; a◌֮◌᫛◌̀◌̕b; a◌֮◌᫛◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING DOWN TACK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1ADC 0062;00E0 05AE 1ADC 0315 0062;0061 05AE 0300 1ADC 0315 0062;00E0 05AE 1ADC 0315 0062;0061 05AE 0300 1ADC 0315 0062; # (a◌̕◌̀◌֮◌᫜b; à◌֮◌᫜◌̕b; a◌֮◌̀◌᫜◌̕b; à◌֮◌᫜◌̕b; a◌֮◌̀◌᫜◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING DIAERESIS WITH RAISED LEFT DOT, LATIN SMALL LETTER B
+0061 1ADC 0315 0300 05AE 0062;0061 05AE 1ADC 0300 0315 0062;0061 05AE 1ADC 0300 0315 0062;0061 05AE 1ADC 0300 0315 0062;0061 05AE 1ADC 0300 0315 0062; # (a◌᫜◌̕◌̀◌֮b; a◌֮◌᫜◌̀◌̕b; a◌֮◌᫜◌̀◌̕b; a◌֮◌᫜◌̀◌̕b; a◌֮◌᫜◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING DIAERESIS WITH RAISED LEFT DOT, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 1DFA 1ADD 0062;0061 1DFA 0316 1ADD 059A 0062;0061 1DFA 0316 1ADD 059A 0062;0061 1DFA 0316 1ADD 059A 0062;0061 1DFA 0316 1ADD 059A 0062; # (a◌֚◌̖◌᷺◌᫝b; a◌᷺◌̖◌᫝◌֚b; a◌᷺◌̖◌᫝◌֚b; a◌᷺◌̖◌᫝◌֚b; a◌᷺◌̖◌᫝◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, COMBINING DOT-AND-RING BELOW, LATIN SMALL LETTER B
+0061 1ADD 059A 0316 1DFA 0062;0061 1DFA 1ADD 0316 059A 0062;0061 1DFA 1ADD 0316 059A 0062;0061 1DFA 1ADD 0316 059A 0062;0061 1DFA 1ADD 0316 059A 0062; # (a◌᫝◌֚◌̖◌᷺b; a◌᷺◌᫝◌̖◌֚b; a◌᷺◌᫝◌̖◌֚b; a◌᷺◌᫝◌̖◌֚b; a◌᷺◌᫝◌̖◌֚b; ) LATIN SMALL LETTER A, COMBINING DOT-AND-RING BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE0 0062;00E0 05AE 1AE0 0315 0062;0061 05AE 0300 1AE0 0315 0062;00E0 05AE 1AE0 0315 0062;0061 05AE 0300 1AE0 0315 0062; # (a◌̕◌̀◌֮◌᫠b; à◌֮◌᫠◌̕b; a◌֮◌̀◌᫠◌̕b; à◌֮◌᫠◌̕b; a◌֮◌̀◌᫠◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING LEFT TACK ABOVE, LATIN SMALL LETTER B
+0061 1AE0 0315 0300 05AE 0062;0061 05AE 1AE0 0300 0315 0062;0061 05AE 1AE0 0300 0315 0062;0061 05AE 1AE0 0300 0315 0062;0061 05AE 1AE0 0300 0315 0062; # (a◌᫠◌̕◌̀◌֮b; a◌֮◌᫠◌̀◌̕b; a◌֮◌᫠◌̀◌̕b; a◌֮◌᫠◌̀◌̕b; a◌֮◌᫠◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING LEFT TACK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE1 0062;00E0 05AE 1AE1 0315 0062;0061 05AE 0300 1AE1 0315 0062;00E0 05AE 1AE1 0315 0062;0061 05AE 0300 1AE1 0315 0062; # (a◌̕◌̀◌֮◌᫡b; à◌֮◌᫡◌̕b; a◌֮◌̀◌᫡◌̕b; à◌֮◌᫡◌̕b; a◌֮◌̀◌᫡◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING RIGHT TACK ABOVE, LATIN SMALL LETTER B
+0061 1AE1 0315 0300 05AE 0062;0061 05AE 1AE1 0300 0315 0062;0061 05AE 1AE1 0300 0315 0062;0061 05AE 1AE1 0300 0315 0062;0061 05AE 1AE1 0300 0315 0062; # (a◌᫡◌̕◌̀◌֮b; a◌֮◌᫡◌̀◌̕b; a◌֮◌᫡◌̀◌̕b; a◌֮◌᫡◌̀◌̕b; a◌֮◌᫡◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING RIGHT TACK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE2 0062;00E0 05AE 1AE2 0315 0062;0061 05AE 0300 1AE2 0315 0062;00E0 05AE 1AE2 0315 0062;0061 05AE 0300 1AE2 0315 0062; # (a◌̕◌̀◌֮◌᫢b; à◌֮◌᫢◌̕b; a◌֮◌̀◌᫢◌̕b; à◌֮◌᫢◌̕b; a◌֮◌̀◌᫢◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING MINUS SIGN ABOVE, LATIN SMALL LETTER B
+0061 1AE2 0315 0300 05AE 0062;0061 05AE 1AE2 0300 0315 0062;0061 05AE 1AE2 0300 0315 0062;0061 05AE 1AE2 0300 0315 0062;0061 05AE 1AE2 0300 0315 0062; # (a◌᫢◌̕◌̀◌֮b; a◌֮◌᫢◌̀◌̕b; a◌֮◌᫢◌̀◌̕b; a◌֮◌᫢◌̀◌̕b; a◌֮◌᫢◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING MINUS SIGN ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE3 0062;00E0 05AE 1AE3 0315 0062;0061 05AE 0300 1AE3 0315 0062;00E0 05AE 1AE3 0315 0062;0061 05AE 0300 1AE3 0315 0062; # (a◌̕◌̀◌֮◌᫣b; à◌֮◌᫣◌̕b; a◌֮◌̀◌᫣◌̕b; à◌֮◌᫣◌̕b; a◌֮◌̀◌᫣◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING INVERTED BRIDGE ABOVE, LATIN SMALL LETTER B
+0061 1AE3 0315 0300 05AE 0062;0061 05AE 1AE3 0300 0315 0062;0061 05AE 1AE3 0300 0315 0062;0061 05AE 1AE3 0300 0315 0062;0061 05AE 1AE3 0300 0315 0062; # (a◌᫣◌̕◌̀◌֮b; a◌֮◌᫣◌̀◌̕b; a◌֮◌᫣◌̀◌̕b; a◌֮◌᫣◌̀◌̕b; a◌֮◌᫣◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING INVERTED BRIDGE ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE4 0062;00E0 05AE 1AE4 0315 0062;0061 05AE 0300 1AE4 0315 0062;00E0 05AE 1AE4 0315 0062;0061 05AE 0300 1AE4 0315 0062; # (a◌̕◌̀◌֮◌᫤b; à◌֮◌᫤◌̕b; a◌֮◌̀◌᫤◌̕b; à◌֮◌᫤◌̕b; a◌֮◌̀◌᫤◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING SQUARE ABOVE, LATIN SMALL LETTER B
+0061 1AE4 0315 0300 05AE 0062;0061 05AE 1AE4 0300 0315 0062;0061 05AE 1AE4 0300 0315 0062;0061 05AE 1AE4 0300 0315 0062;0061 05AE 1AE4 0300 0315 0062; # (a◌᫤◌̕◌̀◌֮b; a◌֮◌᫤◌̀◌̕b; a◌֮◌᫤◌̀◌̕b; a◌֮◌᫤◌̀◌̕b; a◌֮◌᫤◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING SQUARE ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE5 0062;00E0 05AE 1AE5 0315 0062;0061 05AE 0300 1AE5 0315 0062;00E0 05AE 1AE5 0315 0062;0061 05AE 0300 1AE5 0315 0062; # (a◌̕◌̀◌֮◌᫥b; à◌֮◌᫥◌̕b; a◌֮◌̀◌᫥◌̕b; à◌֮◌᫥◌̕b; a◌֮◌̀◌᫥◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING SEAGULL ABOVE, LATIN SMALL LETTER B
+0061 1AE5 0315 0300 05AE 0062;0061 05AE 1AE5 0300 0315 0062;0061 05AE 1AE5 0300 0315 0062;0061 05AE 1AE5 0300 0315 0062;0061 05AE 1AE5 0300 0315 0062; # (a◌᫥◌̕◌̀◌֮b; a◌֮◌᫥◌̀◌̕b; a◌֮◌᫥◌̀◌̕b; a◌֮◌᫥◌̀◌̕b; a◌֮◌᫥◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING SEAGULL ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 1DFA 1AE6 0062;0061 1DFA 0316 1AE6 059A 0062;0061 1DFA 0316 1AE6 059A 0062;0061 1DFA 0316 1AE6 059A 0062;0061 1DFA 0316 1AE6 059A 0062; # (a◌֚◌̖◌᷺◌᫦b; a◌᷺◌̖◌᫦◌֚b; a◌᷺◌̖◌᫦◌֚b; a◌᷺◌̖◌᫦◌֚b; a◌᷺◌̖◌᫦◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, COMBINING DOUBLE ARCH BELOW, LATIN SMALL LETTER B
+0061 1AE6 059A 0316 1DFA 0062;0061 1DFA 1AE6 0316 059A 0062;0061 1DFA 1AE6 0316 059A 0062;0061 1DFA 1AE6 0316 059A 0062;0061 1DFA 1AE6 0316 059A 0062; # (a◌᫦◌֚◌̖◌᷺b; a◌᷺◌᫦◌̖◌֚b; a◌᷺◌᫦◌̖◌֚b; a◌᷺◌᫦◌̖◌֚b; a◌᷺◌᫦◌̖◌֚b; ) LATIN SMALL LETTER A, COMBINING DOUBLE ARCH BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE7 0062;00E0 05AE 1AE7 0315 0062;0061 05AE 0300 1AE7 0315 0062;00E0 05AE 1AE7 0315 0062;0061 05AE 0300 1AE7 0315 0062; # (a◌̕◌̀◌֮◌᫧b; à◌֮◌᫧◌̕b; a◌֮◌̀◌᫧◌̕b; à◌֮◌᫧◌̕b; a◌֮◌̀◌᫧◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING DOUBLE ARCH ABOVE, LATIN SMALL LETTER B
+0061 1AE7 0315 0300 05AE 0062;0061 05AE 1AE7 0300 0315 0062;0061 05AE 1AE7 0300 0315 0062;0061 05AE 1AE7 0300 0315 0062;0061 05AE 1AE7 0300 0315 0062; # (a◌᫧◌̕◌̀◌֮b; a◌֮◌᫧◌̀◌̕b; a◌֮◌᫧◌̀◌̕b; a◌֮◌᫧◌̀◌̕b; a◌֮◌᫧◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING DOUBLE ARCH ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE8 0062;00E0 05AE 1AE8 0315 0062;0061 05AE 0300 1AE8 0315 0062;00E0 05AE 1AE8 0315 0062;0061 05AE 0300 1AE8 0315 0062; # (a◌̕◌̀◌֮◌᫨b; à◌֮◌᫨◌̕b; a◌֮◌̀◌᫨◌̕b; à◌֮◌᫨◌̕b; a◌֮◌̀◌᫨◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING EQUALS SIGN ABOVE, LATIN SMALL LETTER B
+0061 1AE8 0315 0300 05AE 0062;0061 05AE 1AE8 0300 0315 0062;0061 05AE 1AE8 0300 0315 0062;0061 05AE 1AE8 0300 0315 0062;0061 05AE 1AE8 0300 0315 0062; # (a◌᫨◌̕◌̀◌֮b; a◌֮◌᫨◌̀◌̕b; a◌֮◌᫨◌̀◌̕b; a◌֮◌᫨◌̀◌̕b; a◌֮◌᫨◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING EQUALS SIGN ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AE9 0062;00E0 05AE 1AE9 0315 0062;0061 05AE 0300 1AE9 0315 0062;00E0 05AE 1AE9 0315 0062;0061 05AE 0300 1AE9 0315 0062; # (a◌̕◌̀◌֮◌᫩b; à◌֮◌᫩◌̕b; a◌֮◌̀◌᫩◌̕b; à◌֮◌᫩◌̕b; a◌֮◌̀◌᫩◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING LEFT ANGLE CENTRED ABOVE, LATIN SMALL LETTER B
+0061 1AE9 0315 0300 05AE 0062;0061 05AE 1AE9 0300 0315 0062;0061 05AE 1AE9 0300 0315 0062;0061 05AE 1AE9 0300 0315 0062;0061 05AE 1AE9 0300 0315 0062; # (a◌᫩◌̕◌̀◌֮b; a◌֮◌᫩◌̀◌̕b; a◌֮◌᫩◌̀◌̕b; a◌֮◌᫩◌̀◌̕b; a◌֮◌᫩◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING LEFT ANGLE CENTRED ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1AEA 0062;00E0 05AE 1AEA 0315 0062;0061 05AE 0300 1AEA 0315 0062;00E0 05AE 1AEA 0315 0062;0061 05AE 0300 1AEA 0315 0062; # (a◌̕◌̀◌֮◌᫪b; à◌֮◌᫪◌̕b; a◌֮◌̀◌᫪◌̕b; à◌֮◌᫪◌̕b; a◌֮◌̀◌᫪◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING UPWARDS ARROW ABOVE, LATIN SMALL LETTER B
+0061 1AEA 0315 0300 05AE 0062;0061 05AE 1AEA 0300 0315 0062;0061 05AE 1AEA 0300 0315 0062;0061 05AE 1AEA 0300 0315 0062;0061 05AE 1AEA 0300 0315 0062; # (a◌᫪◌̕◌̀◌֮b; a◌֮◌᫪◌̀◌̕b; a◌֮◌᫪◌̀◌̕b; a◌֮◌᫪◌̀◌̕b; a◌֮◌᫪◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING UPWARDS ARROW ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0345 035D 035C 1AEB 0062;0061 035C 035D 1AEB 0345 0062;0061 035C 035D 1AEB 0345 0062;0061 035C 035D 1AEB 0345 0062;0061 035C 035D 1AEB 0345 0062; # (a◌ͅ◌͝◌͜◌᫫b; a◌͜◌͝◌᫫◌ͅb; a◌͜◌͝◌᫫◌ͅb; a◌͜◌͝◌᫫◌ͅb; a◌͜◌͝◌᫫◌ͅb; ) LATIN SMALL LETTER A, COMBINING GREEK YPOGEGRAMMENI, COMBINING DOUBLE BREVE, COMBINING DOUBLE BREVE BELOW, COMBINING DOUBLE RIGHTWARDS ARROW ABOVE, LATIN SMALL LETTER B
+0061 1AEB 0345 035D 035C 0062;0061 035C 1AEB 035D 0345 0062;0061 035C 1AEB 035D 0345 0062;0061 035C 1AEB 035D 0345 0062;0061 035C 1AEB 035D 0345 0062; # (a◌᫫◌ͅ◌͝◌͜b; a◌͜◌᫫◌͝◌ͅb; a◌͜◌᫫◌͝◌ͅb; a◌͜◌᫫◌͝◌ͅb; a◌͜◌᫫◌͝◌ͅb; ) LATIN SMALL LETTER A, COMBINING DOUBLE RIGHTWARDS ARROW ABOVE, COMBINING GREEK YPOGEGRAMMENI, COMBINING DOUBLE BREVE, COMBINING DOUBLE BREVE BELOW, LATIN SMALL LETTER B
 0061 3099 093C 16FF0 1B34 0062;0061 16FF0 093C 1B34 3099 0062;0061 16FF0 093C 1B34 3099 0062;0061 16FF0 093C 1B34 3099 0062;0061 16FF0 093C 1B34 3099 0062; # (a◌゙◌𖿰़◌᬴b; a𖿰◌़◌᬴◌゙b; a𖿰◌़◌᬴◌゙b; a𖿰◌़◌᬴◌゙b; a𖿰◌़◌᬴◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, VIETNAMESE ALTERNATE READING MARK CA, BALINESE SIGN REREKAN, LATIN SMALL LETTER B
 0061 1B34 3099 093C 16FF0 0062;0061 16FF0 1B34 093C 3099 0062;0061 16FF0 1B34 093C 3099 0062;0061 16FF0 1B34 093C 3099 0062;0061 16FF0 1B34 093C 3099 0062; # (a◌᬴◌゙◌𖿰़b; a𖿰◌᬴◌़◌゙b; a𖿰◌᬴◌़◌゙b; a𖿰◌᬴◌़◌゙b; a𖿰◌᬴◌़◌゙b; ) LATIN SMALL LETTER A, BALINESE SIGN REREKAN, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, VIETNAMESE ALTERNATE READING MARK CA, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1B44 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062; # (a◌ְ◌्◌゙᭄b; a◌゙◌्᭄◌ְb; a◌゙◌्᭄◌ְb; a◌゙◌्᭄◌ְb; a◌゙◌्᭄◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BALINESE ADEG ADEG, LATIN SMALL LETTER B
@@ -18646,6 +18701,10 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 10EAB 0315 0300 05AE 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062; # (a◌𐺫◌̕◌̀◌֮b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; ) LATIN SMALL LETTER A, YEZIDI COMBINING HAMZA MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 10EAC 0062;00E0 05AE 10EAC 0315 0062;0061 05AE 0300 10EAC 0315 0062;00E0 05AE 10EAC 0315 0062;0061 05AE 0300 10EAC 0315 0062; # (a◌̕◌̀◌֮◌𐺬b; à◌֮◌𐺬◌̕b; a◌֮◌̀◌𐺬◌̕b; à◌֮◌𐺬◌̕b; a◌֮◌̀◌𐺬◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, YEZIDI COMBINING MADDA MARK, LATIN SMALL LETTER B
 0061 10EAC 0315 0300 05AE 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062; # (a◌𐺬◌̕◌̀◌֮b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; ) LATIN SMALL LETTER A, YEZIDI COMBINING MADDA MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 1DFA 10EFA 0062;0061 1DFA 0316 10EFA 059A 0062;0061 1DFA 0316 10EFA 059A 0062;0061 1DFA 0316 10EFA 059A 0062;0061 1DFA 0316 10EFA 059A 0062; # (a◌֚◌̖◌᷺◌𐻺b; a◌᷺◌̖◌𐻺◌֚b; a◌᷺◌̖◌𐻺◌֚b; a◌᷺◌̖◌𐻺◌֚b; a◌᷺◌̖◌𐻺◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC DOUBLE VERTICAL BAR BELOW, LATIN SMALL LETTER B
+0061 10EFA 059A 0316 1DFA 0062;0061 1DFA 10EFA 0316 059A 0062;0061 1DFA 10EFA 0316 059A 0062;0061 1DFA 10EFA 0316 059A 0062;0061 1DFA 10EFA 0316 059A 0062; # (a◌𐻺◌֚◌̖◌᷺b; a◌᷺◌𐻺◌̖◌֚b; a◌᷺◌𐻺◌̖◌֚b; a◌᷺◌𐻺◌̖◌֚b; a◌᷺◌𐻺◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC DOUBLE VERTICAL BAR BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
+0061 059A 0316 1DFA 10EFB 0062;0061 1DFA 0316 10EFB 059A 0062;0061 1DFA 0316 10EFB 059A 0062;0061 1DFA 0316 10EFB 059A 0062;0061 1DFA 0316 10EFB 059A 0062; # (a◌֚◌̖◌᷺◌𐻻b; a◌᷺◌̖◌𐻻◌֚b; a◌᷺◌̖◌𐻻◌֚b; a◌᷺◌̖◌𐻻◌֚b; a◌᷺◌̖◌𐻻◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW NOON, LATIN SMALL LETTER B
+0061 10EFB 059A 0316 1DFA 0062;0061 1DFA 10EFB 0316 059A 0062;0061 1DFA 10EFB 0316 059A 0062;0061 1DFA 10EFB 0316 059A 0062;0061 1DFA 10EFB 0316 059A 0062; # (a◌𐻻◌֚◌̖◌᷺b; a◌᷺◌𐻻◌̖◌֚b; a◌᷺◌𐻻◌̖◌֚b; a◌᷺◌𐻻◌̖◌֚b; a◌᷺◌𐻻◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW NOON, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 10EFD 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062; # (a◌֚◌̖◌᷺◌𐻽b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD SAKTA, LATIN SMALL LETTER B
 0061 10EFD 059A 0316 1DFA 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062; # (a◌𐻽◌֚◌̖◌᷺b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD SAKTA, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 10EFE 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062; # (a◌֚◌̖◌᷺◌𐻾b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD QASR, LATIN SMALL LETTER B
@@ -19018,6 +19077,16 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 1E5EE 0315 0300 05AE 0062;0061 05AE 1E5EE 0300 0315 0062;0061 05AE 1E5EE 0300 0315 0062;0061 05AE 1E5EE 0300 0315 0062;0061 05AE 1E5EE 0300 0315 0062; # (a◌𞗮◌̕◌̀◌֮b; a◌֮◌𞗮◌̀◌̕b; a◌֮◌𞗮◌̀◌̕b; a◌֮◌𞗮◌̀◌̕b; a◌֮◌𞗮◌̀◌̕b; ) LATIN SMALL LETTER A, OL ONAL SIGN MU, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 1E5EF 0062;0061 1DFA 0316 1E5EF 059A 0062;0061 1DFA 0316 1E5EF 059A 0062;0061 1DFA 0316 1E5EF 059A 0062;0061 1DFA 0316 1E5EF 059A 0062; # (a◌֚◌̖◌᷺◌𞗯b; a◌᷺◌̖◌𞗯◌֚b; a◌᷺◌̖◌𞗯◌֚b; a◌᷺◌̖◌𞗯◌֚b; a◌᷺◌̖◌𞗯◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, OL ONAL SIGN IKIR, LATIN SMALL LETTER B
 0061 1E5EF 059A 0316 1DFA 0062;0061 1DFA 1E5EF 0316 059A 0062;0061 1DFA 1E5EF 0316 059A 0062;0061 1DFA 1E5EF 0316 059A 0062;0061 1DFA 1E5EF 0316 059A 0062; # (a◌𞗯◌֚◌̖◌᷺b; a◌᷺◌𞗯◌̖◌֚b; a◌᷺◌𞗯◌̖◌֚b; a◌᷺◌𞗯◌̖◌֚b; a◌᷺◌𞗯◌̖◌֚b; ) LATIN SMALL LETTER A, OL ONAL SIGN IKIR, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1E6E3 0062;00E0 05AE 1E6E3 0315 0062;0061 05AE 0300 1E6E3 0315 0062;00E0 05AE 1E6E3 0315 0062;0061 05AE 0300 1E6E3 0315 0062; # (a◌̕◌̀◌֮◌𞛣b; à◌֮◌𞛣◌̕b; a◌֮◌̀◌𞛣◌̕b; à◌֮◌𞛣◌̕b; a◌֮◌̀◌𞛣◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, TAI YO SIGN UE, LATIN SMALL LETTER B
+0061 1E6E3 0315 0300 05AE 0062;0061 05AE 1E6E3 0300 0315 0062;0061 05AE 1E6E3 0300 0315 0062;0061 05AE 1E6E3 0300 0315 0062;0061 05AE 1E6E3 0300 0315 0062; # (a◌𞛣◌̕◌̀◌֮b; a◌֮◌𞛣◌̀◌̕b; a◌֮◌𞛣◌̀◌̕b; a◌֮◌𞛣◌̀◌̕b; a◌֮◌𞛣◌̀◌̕b; ) LATIN SMALL LETTER A, TAI YO SIGN UE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1E6E6 0062;00E0 05AE 1E6E6 0315 0062;0061 05AE 0300 1E6E6 0315 0062;00E0 05AE 1E6E6 0315 0062;0061 05AE 0300 1E6E6 0315 0062; # (a◌̕◌̀◌֮◌𞛦b; à◌֮◌𞛦◌̕b; a◌֮◌̀◌𞛦◌̕b; à◌֮◌𞛦◌̕b; a◌֮◌̀◌𞛦◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, TAI YO SIGN AU, LATIN SMALL LETTER B
+0061 1E6E6 0315 0300 05AE 0062;0061 05AE 1E6E6 0300 0315 0062;0061 05AE 1E6E6 0300 0315 0062;0061 05AE 1E6E6 0300 0315 0062;0061 05AE 1E6E6 0300 0315 0062; # (a◌𞛦◌̕◌̀◌֮b; a◌֮◌𞛦◌̀◌̕b; a◌֮◌𞛦◌̀◌̕b; a◌֮◌𞛦◌̀◌̕b; a◌֮◌𞛦◌̀◌̕b; ) LATIN SMALL LETTER A, TAI YO SIGN AU, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1E6EE 0062;00E0 05AE 1E6EE 0315 0062;0061 05AE 0300 1E6EE 0315 0062;00E0 05AE 1E6EE 0315 0062;0061 05AE 0300 1E6EE 0315 0062; # (a◌̕◌̀◌֮◌𞛮b; à◌֮◌𞛮◌̕b; a◌֮◌̀◌𞛮◌̕b; à◌֮◌𞛮◌̕b; a◌֮◌̀◌𞛮◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, TAI YO SIGN AY, LATIN SMALL LETTER B
+0061 1E6EE 0315 0300 05AE 0062;0061 05AE 1E6EE 0300 0315 0062;0061 05AE 1E6EE 0300 0315 0062;0061 05AE 1E6EE 0300 0315 0062;0061 05AE 1E6EE 0300 0315 0062; # (a◌𞛮◌̕◌̀◌֮b; a◌֮◌𞛮◌̀◌̕b; a◌֮◌𞛮◌̀◌̕b; a◌֮◌𞛮◌̀◌̕b; a◌֮◌𞛮◌̀◌̕b; ) LATIN SMALL LETTER A, TAI YO SIGN AY, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1E6EF 0062;00E0 05AE 1E6EF 0315 0062;0061 05AE 0300 1E6EF 0315 0062;00E0 05AE 1E6EF 0315 0062;0061 05AE 0300 1E6EF 0315 0062; # (a◌̕◌̀◌֮◌𞛯b; à◌֮◌𞛯◌̕b; a◌֮◌̀◌𞛯◌̕b; à◌֮◌𞛯◌̕b; a◌֮◌̀◌𞛯◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, TAI YO SIGN ANG, LATIN SMALL LETTER B
+0061 1E6EF 0315 0300 05AE 0062;0061 05AE 1E6EF 0300 0315 0062;0061 05AE 1E6EF 0300 0315 0062;0061 05AE 1E6EF 0300 0315 0062;0061 05AE 1E6EF 0300 0315 0062; # (a◌𞛯◌̕◌̀◌֮b; a◌֮◌𞛯◌̀◌̕b; a◌֮◌𞛯◌̀◌̕b; a◌֮◌𞛯◌̀◌̕b; a◌֮◌𞛯◌̀◌̕b; ) LATIN SMALL LETTER A, TAI YO SIGN ANG, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1E6F5 0062;00E0 05AE 1E6F5 0315 0062;0061 05AE 0300 1E6F5 0315 0062;00E0 05AE 1E6F5 0315 0062;0061 05AE 0300 1E6F5 0315 0062; # (a◌̕◌̀◌֮◌𞛵b; à◌֮◌𞛵◌̕b; a◌֮◌̀◌𞛵◌̕b; à◌֮◌𞛵◌̕b; a◌֮◌̀◌𞛵◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, TAI YO SIGN OM, LATIN SMALL LETTER B
+0061 1E6F5 0315 0300 05AE 0062;0061 05AE 1E6F5 0300 0315 0062;0061 05AE 1E6F5 0300 0315 0062;0061 05AE 1E6F5 0300 0315 0062;0061 05AE 1E6F5 0300 0315 0062; # (a◌𞛵◌̕◌̀◌֮b; a◌֮◌𞛵◌̀◌̕b; a◌֮◌𞛵◌̀◌̕b; a◌֮◌𞛵◌̀◌̕b; a◌֮◌𞛵◌̀◌̕b; ) LATIN SMALL LETTER A, TAI YO SIGN OM, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 1E8D0 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062; # (a◌֚◌̖◌᷺◌𞣐b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, MENDE KIKAKUI COMBINING NUMBER TEENS, LATIN SMALL LETTER B
 0061 1E8D0 059A 0316 1DFA 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062; # (a◌𞣐◌֚◌̖◌᷺b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; ) LATIN SMALL LETTER A, MENDE KIKAKUI COMBINING NUMBER TEENS, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 1E8D1 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062; # (a◌֚◌̖◌᷺◌𞣑b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, MENDE KIKAKUI COMBINING NUMBER TENS, LATIN SMALL LETTER B
diff --git a/src/java.base/share/data/unicodedata/PropList.txt b/src/java.base/share/data/unicodedata/PropList.txt
index 41fdbad7045..e64b4224d72 100644
--- a/src/java.base/share/data/unicodedata/PropList.txt
+++ b/src/java.base/share/data/unicodedata/PropList.txt
@@ -1,6 +1,6 @@
-# PropList-16.0.0.txt
-# Date: 2024-05-31, 18:09:48 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# PropList-17.0.0.txt
+# Date: 2025-06-30, 06:19:01 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -702,7 +702,7 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 10D24..10D27  ; Other_Alphabetic # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
 10D69         ; Other_Alphabetic # Mn       GARAY VOWEL SIGN E
 10EAB..10EAC  ; Other_Alphabetic # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
-10EFC         ; Other_Alphabetic # Mn       ARABIC COMBINING ALEF OVERLAY
+10EFA..10EFC  ; Other_Alphabetic # Mn   [3] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC COMBINING ALEF OVERLAY
 11000         ; Other_Alphabetic # Mc       BRAHMI SIGN CANDRABINDU
 11001         ; Other_Alphabetic # Mn       BRAHMI SIGN ANUSVARA
 11002         ; Other_Alphabetic # Mc       BRAHMI SIGN VISARGA
@@ -809,6 +809,12 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 11A59..11A5B  ; Other_Alphabetic # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
 11A8A..11A96  ; Other_Alphabetic # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
 11A97         ; Other_Alphabetic # Mc       SOYOMBO SIGN VISARGA
+11B60         ; Other_Alphabetic # Mn       SHARADA VOWEL SIGN OE
+11B61         ; Other_Alphabetic # Mc       SHARADA VOWEL SIGN OOE
+11B62..11B64  ; Other_Alphabetic # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B65         ; Other_Alphabetic # Mc       SHARADA VOWEL SIGN SHORT O
+11B66         ; Other_Alphabetic # Mn       SHARADA VOWEL SIGN CANDRA E
+11B67         ; Other_Alphabetic # Mc       SHARADA VOWEL SIGN CANDRA O
 11C2F         ; Other_Alphabetic # Mc       BHAIKSUKI VOWEL SIGN AA
 11C30..11C36  ; Other_Alphabetic # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; Other_Alphabetic # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
@@ -853,12 +859,16 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 1E023..1E024  ; Other_Alphabetic # Mn   [2] COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
 1E026..1E02A  ; Other_Alphabetic # Mn   [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
 1E08F         ; Other_Alphabetic # Mn       COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+1E6E3         ; Other_Alphabetic # Mn       TAI YO SIGN UE
+1E6E6         ; Other_Alphabetic # Mn       TAI YO SIGN AU
+1E6EE..1E6EF  ; Other_Alphabetic # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F5         ; Other_Alphabetic # Mn       TAI YO SIGN OM
 1E947         ; Other_Alphabetic # Mn       ADLAM HAMZA
 1F130..1F149  ; Other_Alphabetic # So  [26] SQUARED LATIN CAPITAL LETTER A..SQUARED LATIN CAPITAL LETTER Z
 1F150..1F169  ; Other_Alphabetic # So  [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F170..1F189  ; Other_Alphabetic # So  [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 
-# Total code points: 1495
+# Total code points: 1510
 
 # ================================================
 
@@ -871,21 +881,22 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 F900..FA6D    ; Ideographic # Lo [366] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA6D
 FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9
 16FE4         ; Ideographic # Mn       KHITAN SMALL SCRIPT FILLER
-17000..187F7  ; Ideographic # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18CD5  ; Ideographic # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
-18CFF..18D08  ; Ideographic # Lo  [10] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D08
+16FF2..16FF3  ; Ideographic # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; Ideographic # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
+17000..18CD5  ; Ideographic # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18CFF..18D1E  ; Ideographic # Lo  [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; Ideographic # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 1B170..1B2FB  ; Ideographic # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
 20000..2A6DF  ; Ideographic # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; Ideographic # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; Ideographic # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; Ideographic # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; Ideographic # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; Ideographic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; Ideographic # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Ideographic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; Ideographic # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; Ideographic # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 106477
+# Total code points: 110943
 
 # ================================================
 
@@ -915,11 +926,11 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 0384..0385    ; Diacritic # Sk   [2] GREEK TONOS..GREEK DIALYTIKA TONOS
 0483..0487    ; Diacritic # Mn   [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE
 0559          ; Diacritic # Lm       ARMENIAN MODIFIER LETTER LEFT HALF RING
-0591..05A1    ; Diacritic # Mn  [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER
-05A3..05BD    ; Diacritic # Mn  [27] HEBREW ACCENT MUNAH..HEBREW POINT METEG
+0591..05BD    ; Diacritic # Mn  [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG
 05BF          ; Diacritic # Mn       HEBREW POINT RAFE
 05C1..05C2    ; Diacritic # Mn   [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
-05C4          ; Diacritic # Mn       HEBREW MARK UPPER DOT
+05C4..05C5    ; Diacritic # Mn   [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT
+05C7          ; Diacritic # Mn       HEBREW POINT QAMATS QATAN
 064B..0652    ; Diacritic # Mn   [8] ARABIC FATHATAN..ARABIC SUKUN
 0657..0658    ; Diacritic # Mn   [2] ARABIC INVERTED DAMMA..ARABIC MARK NOON GHUNNA
 06DF..06E0    ; Diacritic # Mn   [2] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO
@@ -990,6 +1001,8 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 1AB0..1ABD    ; Diacritic # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
 1ABE          ; Diacritic # Me       COMBINING PARENTHESES OVERLAY
 1AC1..1ACB    ; Diacritic # Mn  [11] COMBINING LEFT PARENTHESIS ABOVE LEFT..COMBINING TRIPLE ACUTE ACCENT
+1ACF..1ADD    ; Diacritic # Mn  [15] COMBINING DOUBLE CARON..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; Diacritic # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B34          ; Diacritic # Mn       BALINESE SIGN REREKAN
 1B44          ; Diacritic # Mc       BALINESE ADEG ADEG
 1B6B..1B73    ; Diacritic # Mn   [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
@@ -1009,6 +1022,7 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 1CF7          ; Diacritic # Mc       VEDIC SIGN ATIKRAMA
 1CF8..1CF9    ; Diacritic # Mn   [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
 1D2C..1D6A    ; Diacritic # Lm  [63] MODIFIER LETTER CAPITAL A..GREEK SUBSCRIPT SMALL LETTER CHI
+1D9B..1DBE    ; Diacritic # Lm  [36] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL EZH
 1DC4..1DCF    ; Diacritic # Mn  [12] COMBINING MACRON-ACUTE..COMBINING ZIGZAG BELOW
 1DF5..1DFF    ; Diacritic # Mn  [11] COMBINING UP TACK ABOVE..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
 1FBD          ; Diacritic # Sk       GREEK KORONIS
@@ -1034,6 +1048,7 @@ A717..A71F    ; Diacritic # Lm   [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER
 A720..A721    ; Diacritic # Sk   [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
 A788          ; Diacritic # Lm       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A789..A78A    ; Diacritic # Sk   [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
+A7F1          ; Diacritic # Lm       MODIFIER LETTER CAPITAL S
 A7F8..A7F9    ; Diacritic # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
 A806          ; Diacritic # Mn       SYLOTI NAGRI SIGN HASANTA
 A82C          ; Diacritic # Mn       SYLOTI NAGRI SIGN ALTERNATE HASANTA
@@ -1077,6 +1092,7 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 10D24..10D27  ; Diacritic # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
 10D4E         ; Diacritic # Lm       GARAY VOWEL LENGTH MARK
 10D69..10D6D  ; Diacritic # Mn   [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK
+10EFA         ; Diacritic # Mn       ARABIC DOUBLE VERTICAL BAR BELOW
 10EFD..10EFF  ; Diacritic # Mn   [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA
 10F46..10F50  ; Diacritic # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 10F82..10F85  ; Diacritic # Mn   [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW
@@ -1120,6 +1136,7 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 11D42         ; Diacritic # Mn       MASARAM GONDI SIGN NUKTA
 11D44..11D45  ; Diacritic # Mn   [2] MASARAM GONDI SIGN HALANTA..MASARAM GONDI VIRAMA
 11D97         ; Diacritic # Mn       GUNJALA GONDI VIRAMA
+11DD9         ; Diacritic # Lm       TOLONG SIKI SIGN SELA
 11F41         ; Diacritic # Mc       KAWI SIGN KILLER
 11F42         ; Diacritic # Mn       KAWI CONJOINER
 11F5A         ; Diacritic # Mn       KAWI SIGN NUKTA
@@ -1150,7 +1167,7 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 1E944..1E946  ; Diacritic # Mn   [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK
 1E948..1E94A  ; Diacritic # Mn   [3] ADLAM CONSONANT MODIFIER..ADLAM NUKTA
 
-# Total code points: 1178
+# Total code points: 1247
 
 # ================================================
 
@@ -1190,14 +1207,16 @@ FF70          ; Extender # Lm       HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND
 113D3         ; Extender # Lo       TULU-TIGALARI SIGN PLUTA
 115C6..115C8  ; Extender # Po   [3] SIDDHAM REPETITION MARK-1..SIDDHAM REPETITION MARK-3
 11A98         ; Extender # Mn       SOYOMBO GEMINATION MARK
+11DD9         ; Extender # Lm       TOLONG SIKI SIGN SELA
 16B42..16B43  ; Extender # Lm   [2] PAHAWH HMONG SIGN VOS NRUA..PAHAWH HMONG SIGN IB YAM
 16FE0..16FE1  ; Extender # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 16FE3         ; Extender # Lm       OLD CHINESE ITERATION MARK
+16FF2..16FF3  ; Extender # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
 1E13C..1E13D  ; Extender # Lm   [2] NYIAKENG PUACHUE HMONG SIGN XW XW..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER
 1E5EF         ; Extender # Mn       OL ONAL SIGN IKIR
 1E944..1E946  ; Extender # Mn   [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK
 
-# Total code points: 59
+# Total code points: 62
 
 # ================================================
 
@@ -1220,7 +1239,7 @@ FF70          ; Extender # Lm       HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND
 2C7C..2C7D    ; Other_Lowercase # Lm   [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V
 A69C..A69D    ; Other_Lowercase # Lm   [2] MODIFIER LETTER CYRILLIC HARD SIGN..MODIFIER LETTER CYRILLIC SOFT SIGN
 A770          ; Other_Lowercase # Lm       MODIFIER LETTER US
-A7F2..A7F4    ; Other_Lowercase # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A7F1..A7F4    ; Other_Lowercase # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F8..A7F9    ; Other_Lowercase # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
 AB5C..AB5F    ; Other_Lowercase # Lm   [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK
 AB69          ; Other_Lowercase # Lm       MODIFIER LETTER SMALL TURNED W
@@ -1230,7 +1249,7 @@ AB69          ; Other_Lowercase # Lm       MODIFIER LETTER SMALL TURNED W
 107B2..107BA  ; Other_Lowercase # Lm   [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL
 1E030..1E06D  ; Other_Lowercase # Lm  [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE
 
-# Total code points: 311
+# Total code points: 312
 
 # ================================================
 
@@ -1359,15 +1378,14 @@ FA21          ; Unified_Ideograph # Lo       CJK COMPATIBILITY IDEOGRAPH-FA21
 FA23..FA24    ; Unified_Ideograph # Lo   [2] CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24
 FA27..FA29    ; Unified_Ideograph # Lo   [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29
 20000..2A6DF  ; Unified_Ideograph # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; Unified_Ideograph # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; Unified_Ideograph # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; Unified_Ideograph # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; Unified_Ideograph # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; Unified_Ideograph # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; Unified_Ideograph # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 30000..3134A  ; Unified_Ideograph # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; Unified_Ideograph # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; Unified_Ideograph # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 97680
+# Total code points: 101996
 
 # ================================================
 
@@ -1809,9 +1827,7 @@ E0100..E01EF  ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S
 2B47..2B4C    ; Pattern_Syntax # Sm   [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
 2B4D..2B73    ; Pattern_Syntax # So  [39] DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
 2B74..2B75    ; Pattern_Syntax # Cn   [2] <reserved-2B74>..<reserved-2B75>
-2B76..2B95    ; Pattern_Syntax # So  [32] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
-2B96          ; Pattern_Syntax # Cn       <reserved-2B96>
-2B97..2BFF    ; Pattern_Syntax # So [105] SYMBOL FOR TYPE A ELECTRONICS..HELLSCHREIBER PAUSE SYMBOL
+2B76..2BFF    ; Pattern_Syntax # So [138] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..HELLSCHREIBER PAUSE SYMBOL
 2E00..2E01    ; Pattern_Syntax # Po   [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
 2E02          ; Pattern_Syntax # Pi       LEFT SUBSTITUTION BRACKET
 2E03          ; Pattern_Syntax # Pf       RIGHT SUBSTITUTION BRACKET
diff --git a/src/java.base/share/data/unicodedata/PropertyValueAliases.txt b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
index 97980e2d902..b92662eda28 100644
--- a/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
+++ b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
@@ -1,6 +1,6 @@
-# PropertyValueAliases-16.0.0.txt
-# Date: 2024-07-30, 19:59:00 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# PropertyValueAliases-17.0.0.txt
+# Date: 2025-06-30, 06:16:21 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -93,6 +93,7 @@ age; 14.0                             ; V14_0
 age; 15.0                             ; V15_0
 age; 15.1                             ; V15_1
 age; 16.0                             ; V16_0
+age; 17.0                             ; V17_0
 age; NA                               ; Unassigned
 
 # Alphabetic (Alpha)
@@ -179,6 +180,7 @@ blk; Bamum_Sup                        ; Bamum_Supplement
 blk; Bassa_Vah                        ; Bassa_Vah
 blk; Batak                            ; Batak
 blk; Bengali                          ; Bengali
+blk; Beria_Erfe                       ; Beria_Erfe
 blk; Bhaiksuki                        ; Bhaiksuki
 blk; Block_Elements                   ; Block_Elements
 blk; Bopomofo                         ; Bopomofo
@@ -211,6 +213,7 @@ blk; CJK_Ext_F                        ; CJK_Unified_Ideographs_Extension_F
 blk; CJK_Ext_G                        ; CJK_Unified_Ideographs_Extension_G
 blk; CJK_Ext_H                        ; CJK_Unified_Ideographs_Extension_H
 blk; CJK_Ext_I                        ; CJK_Unified_Ideographs_Extension_I
+blk; CJK_Ext_J                        ; CJK_Unified_Ideographs_Extension_J
 blk; CJK_Radicals_Sup                 ; CJK_Radicals_Supplement
 blk; CJK_Strokes                      ; CJK_Strokes
 blk; CJK_Symbols                      ; CJK_Symbols_And_Punctuation
@@ -360,6 +363,7 @@ blk; Misc_Math_Symbols_A              ; Miscellaneous_Mathematical_Symbols_A
 blk; Misc_Math_Symbols_B              ; Miscellaneous_Mathematical_Symbols_B
 blk; Misc_Pictographs                 ; Miscellaneous_Symbols_And_Pictographs
 blk; Misc_Symbols                     ; Miscellaneous_Symbols
+blk; Misc_Symbols_Sup                 ; Miscellaneous_Symbols_Supplement
 blk; Misc_Technical                   ; Miscellaneous_Technical
 blk; Modi                             ; Modi
 blk; Modifier_Letters                 ; Spacing_Modifier_Letters
@@ -419,9 +423,11 @@ blk; Runic                            ; Runic
 blk; Samaritan                        ; Samaritan
 blk; Saurashtra                       ; Saurashtra
 blk; Sharada                          ; Sharada
+blk; Sharada_Sup                      ; Sharada_Supplement
 blk; Shavian                          ; Shavian
 blk; Shorthand_Format_Controls        ; Shorthand_Format_Controls
 blk; Siddham                          ; Siddham
+blk; Sidetic                          ; Sidetic
 blk; Sinhala                          ; Sinhala
 blk; Sinhala_Archaic_Numbers          ; Sinhala_Archaic_Numbers
 blk; Small_Forms                      ; Small_Form_Variants
@@ -456,12 +462,14 @@ blk; Tai_Le                           ; Tai_Le
 blk; Tai_Tham                         ; Tai_Tham
 blk; Tai_Viet                         ; Tai_Viet
 blk; Tai_Xuan_Jing                    ; Tai_Xuan_Jing_Symbols
+blk; Tai_Yo                           ; Tai_Yo
 blk; Takri                            ; Takri
 blk; Tamil                            ; Tamil
 blk; Tamil_Sup                        ; Tamil_Supplement
 blk; Tangsa                           ; Tangsa
 blk; Tangut                           ; Tangut
 blk; Tangut_Components                ; Tangut_Components
+blk; Tangut_Components_Sup            ; Tangut_Components_Supplement
 blk; Tangut_Sup                       ; Tangut_Supplement
 blk; Telugu                           ; Telugu
 blk; Thaana                           ; Thaana
@@ -470,6 +478,7 @@ blk; Tibetan                          ; Tibetan
 blk; Tifinagh                         ; Tifinagh
 blk; Tirhuta                          ; Tirhuta
 blk; Todhri                           ; Todhri
+blk; Tolong_Siki                      ; Tolong_Siki
 blk; Toto                             ; Toto
 blk; Transport_And_Map                ; Transport_And_Map_Symbols
 blk; Tulu_Tigalari                    ; Tulu_Tigalari
@@ -878,7 +887,7 @@ InPC; Bottom_And_Left                 ; Bottom_And_Left
 InPC; Bottom_And_Right                ; Bottom_And_Right
 InPC; Left                            ; Left
 InPC; Left_And_Right                  ; Left_And_Right
-InPC; NA                              ; NA
+InPC; NA                              ; Not_Applicable
 InPC; Overstruck                      ; Overstruck
 InPC; Right                           ; Right
 InPC; Top                             ; Top
@@ -1088,6 +1097,7 @@ jg ; Taw                              ; Taw
 jg ; Teh_Marbuta                      ; Teh_Marbuta
 jg ; Teh_Marbuta_Goal                 ; Teh_Marbuta_Goal                 ; Hamza_On_Heh_Goal
 jg ; Teth                             ; Teth
+jg ; Thin_Noon                        ; Thin_Noon
 jg ; Thin_Yeh                         ; Thin_Yeh
 jg ; Vertical_Tail                    ; Vertical_Tail
 jg ; Waw                              ; Waw
@@ -1131,6 +1141,7 @@ lb ; EX                               ; Exclamation
 lb ; GL                               ; Glue
 lb ; H2                               ; H2
 lb ; H3                               ; H3
+lb ; HH                               ; Unambiguous_Hyphen
 lb ; HL                               ; Hebrew_Letter
 lb ; HY                               ; Hyphen
 lb ; ID                               ; Ideographic
@@ -1319,6 +1330,7 @@ sc ; Bamu                             ; Bamum
 sc ; Bass                             ; Bassa_Vah
 sc ; Batk                             ; Batak
 sc ; Beng                             ; Bengali
+sc ; Berf                             ; Beria_Erfe
 sc ; Bhks                             ; Bhaiksuki
 sc ; Bopo                             ; Bopomofo
 sc ; Brah                             ; Brahmi
@@ -1438,6 +1450,7 @@ sc ; Sgnw                             ; SignWriting
 sc ; Shaw                             ; Shavian
 sc ; Shrd                             ; Sharada
 sc ; Sidd                             ; Siddham
+sc ; Sidt                             ; Sidetic
 sc ; Sind                             ; Khudawadi
 sc ; Sinh                             ; Sinhala
 sc ; Sogd                             ; Sogdian
@@ -1455,6 +1468,7 @@ sc ; Talu                             ; New_Tai_Lue
 sc ; Taml                             ; Tamil
 sc ; Tang                             ; Tangut
 sc ; Tavt                             ; Tai_Viet
+sc ; Tayo                             ; Tai_Yo
 sc ; Telu                             ; Telugu
 sc ; Tfng                             ; Tifinagh
 sc ; Tglg                             ; Tagalog
@@ -1464,6 +1478,7 @@ sc ; Tibt                             ; Tibetan
 sc ; Tirh                             ; Tirhuta
 sc ; Tnsa                             ; Tangsa
 sc ; Todr                             ; Todhri
+sc ; Tols                             ; Tolong_Siki
 sc ; Toto                             ; Toto
 sc ; Tutg                             ; Tulu_Tigalari
 sc ; Ugar                             ; Ugaritic
@@ -1705,4 +1720,16 @@ kEH_NoMirror; Y                       ; Yes                              ; T
 kEH_NoRotate; N                       ; No                               ; F                                ; False
 kEH_NoRotate; Y                       ; Yes                              ; T                                ; True
 
+# kMandarin (cjkMandarin)
+
+# @missing: 0000..10FFFF; kMandarin; <none>
+
+# kTotalStrokes (cjkTotalStrokes)
+
+# @missing: 0000..10FFFF; kTotalStrokes; <none>
+
+# kUnihanCore2020 (cjkUnihanCore2020)
+
+# @missing: 0000..10FFFF; kUnihanCore2020; <none>
+
 # EOF
diff --git a/src/java.base/share/data/unicodedata/ReadMe.txt b/src/java.base/share/data/unicodedata/ReadMe.txt
index 81d489a0575..268f62b8a93 100644
--- a/src/java.base/share/data/unicodedata/ReadMe.txt
+++ b/src/java.base/share/data/unicodedata/ReadMe.txt
@@ -1,17 +1,24 @@
 # Unicode Character Database
-# Date: 2024-08-25
-# Copyright (c) 2024 Unicode, Inc.
+# Date: 2025-08-15
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
 # For documentation, see the following:
-# NamesList.html
+# ucd/NamesList.html
 # UAX #38, "Unicode Han Database (Unihan)"
+# UAX #42, "Unicode Character Database in XML"
 # UAX #44, "Unicode Character Database"
 # UTS #51, "Unicode Emoji"
 # UAX #57, "Unicode Egyptian Hieroglyph Database"
 #
-# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/Unicode16.0.0/
+# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/Unicode17.0.0/
 
-This directory contains final data files
-for the Unicode Character Database, for Version 16.0.0 of the Unicode Standard.
+This directory contains the final data files 
+for Version 17.0.0 of the Unicode Standard.
+
+The "charts" subdirectory contains an archival set of
+pdf code charts corresponding exactly to Version 17.0.0.
+
+The other subdirectories contain the data files for the
+Unicode Character Database and for the synchronized Unicode Technical Standards.
diff --git a/src/java.base/share/data/unicodedata/Scripts.txt b/src/java.base/share/data/unicodedata/Scripts.txt
index 14d48d94162..5574fdd6ae3 100644
--- a/src/java.base/share/data/unicodedata/Scripts.txt
+++ b/src/java.base/share/data/unicodedata/Scripts.txt
@@ -1,6 +1,6 @@
-# Scripts-16.0.0.txt
-# Date: 2024-04-30, 21:48:40 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# Scripts-17.0.0.txt
+# Date: 2025-07-24, 13:28:55 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -154,7 +154,7 @@
 208A..208C    ; Common # Sm   [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN
 208D          ; Common # Ps       SUBSCRIPT LEFT PARENTHESIS
 208E          ; Common # Pe       SUBSCRIPT RIGHT PARENTHESIS
-20A0..20C0    ; Common # Sc  [33] EURO-CURRENCY SIGN..SOM SIGN
+20A0..20C1    ; Common # Sc  [34] EURO-CURRENCY SIGN..SAUDI RIYAL SIGN
 2100..2101    ; Common # So   [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT
 2102          ; Common # L&       DOUBLE-STRUCK CAPITAL C
 2103..2106    ; Common # So   [4] DEGREE CELSIUS..CADA UNA
@@ -306,8 +306,7 @@
 2B45..2B46    ; Common # So   [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW
 2B47..2B4C    ; Common # Sm   [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
 2B4D..2B73    ; Common # So  [39] DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
-2B76..2B95    ; Common # So  [32] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
-2B97..2BFF    ; Common # So [105] SYMBOL FOR TYPE A ELECTRONICS..HELLSCHREIBER PAUSE SYMBOL
+2B76..2BFF    ; Common # So [138] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..HELLSCHREIBER PAUSE SYMBOL
 2E00..2E01    ; Common # Po   [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
 2E02          ; Common # Pi       LEFT SUBSTITUTION BRACKET
 2E03          ; Common # Pf       RIGHT SUBSTITUTION BRACKET
@@ -524,7 +523,11 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 1BCA0..1BCA3  ; Common # Cf   [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP
 1CC00..1CCEF  ; Common # So [240] UP-POINTING GO-KART..OUTLINED LATIN CAPITAL LETTER Z
 1CCF0..1CCF9  ; Common # Nd  [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE
+1CCFA..1CCFC  ; Common # So   [3] SNAKE SYMBOL..NOSE SYMBOL
 1CD00..1CEB3  ; Common # So [436] BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET
+1CEBA..1CED0  ; Common # So  [23] FRAGILE SYMBOL..LEUKOTHEA
+1CEE0..1CEEF  ; Common # So  [16] GEOMANTIC FIGURE POPULUS..GEOMANTIC FIGURE VIA
+1CEF0         ; Common # Sm       MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR
 1CF50..1CFC3  ; Common # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK
 1D000..1D0F5  ; Common # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
 1D100..1D126  ; Common # So  [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
@@ -605,11 +608,10 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 1F260..1F265  ; Common # So   [6] ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI
 1F300..1F3FA  ; Common # So [251] CYCLONE..AMPHORA
 1F3FB..1F3FF  ; Common # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
-1F400..1F6D7  ; Common # So [728] RAT..ELEVATOR
+1F400..1F6D8  ; Common # So [729] RAT..LANDSLIDE
 1F6DC..1F6EC  ; Common # So  [17] WIRELESS..AIRPLANE ARRIVING
 1F6F0..1F6FC  ; Common # So  [13] SATELLITE..ROLLER SKATE
-1F700..1F776  ; Common # So [119] ALCHEMICAL SYMBOL FOR QUINTESSENCE..LUNAR ECLIPSE
-1F77B..1F7D9  ; Common # So  [95] HAUMEA..NINE POINTED WHITE STAR
+1F700..1F7D9  ; Common # So [218] ALCHEMICAL SYMBOL FOR QUINTESSENCE..NINE POINTED WHITE STAR
 1F7E0..1F7EB  ; Common # So  [12] LARGE ORANGE CIRCLE..LARGE BROWN SQUARE
 1F7F0         ; Common # So       HEAVY EQUALS SIGN
 1F800..1F80B  ; Common # So  [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
@@ -619,21 +621,24 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 1F890..1F8AD  ; Common # So  [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
 1F8B0..1F8BB  ; Common # So  [12] ARROW POINTING UPWARDS THEN NORTH WEST..SOUTH WEST ARROW FROM BAR
 1F8C0..1F8C1  ; Common # So   [2] LEFTWARDS ARROW FROM DOWNWARDS ARROW..RIGHTWARDS ARROW FROM DOWNWARDS ARROW
-1F900..1FA53  ; Common # So [340] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS KNIGHT-BISHOP
+1F8D0..1F8D8  ; Common # Sm   [9] LONG RIGHTWARDS ARROW OVER LONG LEFTWARDS ARROW..LONG LEFT RIGHT ARROW WITH DEPENDENT LOBE
+1F900..1FA57  ; Common # So [344] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS ALFIL
 1FA60..1FA6D  ; Common # So  [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER
 1FA70..1FA7C  ; Common # So  [13] BALLET SHOES..CRUTCH
-1FA80..1FA89  ; Common # So  [10] YO-YO..HARP
-1FA8F..1FAC6  ; Common # So  [56] SHOVEL..FINGERPRINT
-1FACE..1FADC  ; Common # So  [15] MOOSE..ROOT VEGETABLE
-1FADF..1FAE9  ; Common # So  [11] SPLATTER..FACE WITH BAGS UNDER EYES
-1FAF0..1FAF8  ; Common # So   [9] HAND WITH INDEX FINGER AND THUMB CROSSED..RIGHTWARDS PUSHING HAND
+1FA80..1FA8A  ; Common # So  [11] YO-YO..TROMBONE
+1FA8E..1FAC6  ; Common # So  [57] TREASURE CHEST..FINGERPRINT
+1FAC8         ; Common # So       HAIRY CREATURE
+1FACD..1FADC  ; Common # So  [16] ORCA..ROOT VEGETABLE
+1FADF..1FAEA  ; Common # So  [12] SPLATTER..DISTORTED FACE
+1FAEF..1FAF8  ; Common # So  [10] FIGHT CLOUD..RIGHTWARDS PUSHING HAND
 1FB00..1FB92  ; Common # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
 1FB94..1FBEF  ; Common # So  [92] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE
 1FBF0..1FBF9  ; Common # Nd  [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE
+1FBFA         ; Common # So       ALARM BELL SYMBOL
 E0001         ; Common # Cf       LANGUAGE TAG
 E0020..E007F  ; Common # Cf  [96] TAG SPACE..CANCEL TAG
 
-# Total code points: 9053
+# Total code points: 9123
 
 # ================================================
 
@@ -648,8 +653,8 @@ E0020..E007F  ; Common # Cf  [96] TAG SPACE..CANCEL TAG
 01BC..01BF    ; Latin # L&   [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
 01C0..01C3    ; Latin # Lo   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
 01C4..0293    ; Latin # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294          ; Latin # Lo       LATIN LETTER GLOTTAL STOP
-0295..02AF    ; Latin # L&  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0294..0295    ; Latin # Lo   [2] LATIN LETTER GLOTTAL STOP..LATIN LETTER PHARYNGEAL VOICED FRICATIVE
+0296..02AF    ; Latin # L&  [26] LATIN LETTER INVERTED GLOTTAL STOP..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
 02B0..02B8    ; Latin # Lm   [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y
 02E0..02E4    ; Latin # Lm   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
 1D00..1D25    ; Latin # L&  [38] LATIN LETTER SMALL CAPITAL A..LATIN LETTER AIN
@@ -676,11 +681,8 @@ A770          ; Latin # Lm       MODIFIER LETTER US
 A771..A787    ; Latin # L&  [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T
 A78B..A78E    ; Latin # L&   [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F          ; Latin # Lo       LATIN LETTER SINOLOGICAL DOT
-A790..A7CD    ; Latin # L&  [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE
-A7D0..A7D1    ; Latin # L&   [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G
-A7D3          ; Latin # L&       LATIN SMALL LETTER DOUBLE THORN
-A7D5..A7DC    ; Latin # L&   [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE
-A7F2..A7F4    ; Latin # Lm   [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q
+A790..A7DC    ; Latin # L&  [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE
+A7F1..A7F4    ; Latin # Lm   [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q
 A7F5..A7F6    ; Latin # L&   [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H
 A7F7          ; Latin # Lo       LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9    ; Latin # Lm   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -702,7 +704,7 @@ FF41..FF5A    ; Latin # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN
 1DF0B..1DF1E  ; Latin # L&  [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL
 1DF25..1DF2A  ; Latin # L&   [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK
 
-# Total code points: 1487
+# Total code points: 1492
 
 # ================================================
 
@@ -869,7 +871,7 @@ FB46..FB4F    ; Hebrew # Lo  [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATU
 0750..077F    ; Arabic # Lo  [48] ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS ABOVE
 0870..0887    ; Arabic # Lo  [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT
 0888          ; Arabic # Sk       ARABIC RAISED ROUND DOT
-0889..088E    ; Arabic # Lo   [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL
+0889..088F    ; Arabic # Lo   [7] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC LETTER NOON WITH RING ABOVE
 0890..0891    ; Arabic # Cf   [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE
 0897..089F    ; Arabic # Mn   [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA
 08A0..08C8    ; Arabic # Lo  [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF
@@ -878,11 +880,13 @@ FB46..FB4F    ; Hebrew # Lo  [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATU
 08E3..08FF    ; Arabic # Mn  [29] ARABIC TURNED DAMMA BELOW..ARABIC MARK SIDEWAYS NOON GHUNNA
 FB50..FBB1    ; Arabic # Lo  [98] ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
 FBB2..FBC2    ; Arabic # Sk  [17] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL WASLA ABOVE
+FBC3..FBD2    ; Arabic # So  [16] ARABIC LIGATURE JALLA WA-ALAA..ARABIC LIGATURE ALAYHI AR-RAHMAH
 FBD3..FD3D    ; Arabic # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
 FD40..FD4F    ; Arabic # So  [16] ARABIC LIGATURE RAHIMAHU ALLAAH..ARABIC LIGATURE RAHIMAHUM ALLAAH
 FD50..FD8F    ; Arabic # Lo  [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
+FD90..FD91    ; Arabic # So   [2] ARABIC LIGATURE RAHMATU ALLAAHI ALAYH..ARABIC LIGATURE RAHMATU ALLAAHI ALAYHAA
 FD92..FDC7    ; Arabic # Lo  [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
-FDCF          ; Arabic # So       ARABIC LIGATURE SALAAMUHU ALAYNAA
+FDC8..FDCF    ; Arabic # So   [8] ARABIC LIGATURE RAHIMAHU ALLAAH TAAALAA..ARABIC LIGATURE SALAAMUHU ALAYNAA
 FDF0..FDFB    ; Arabic # Lo  [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU
 FDFC          ; Arabic # Sc       RIAL SIGN
 FDFD..FDFF    ; Arabic # So   [3] ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM..ARABIC LIGATURE AZZA WA JALL
@@ -890,7 +894,11 @@ FE70..FE74    ; Arabic # Lo   [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN
 FE76..FEFC    ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM
 10E60..10E7E  ; Arabic # No  [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
 10EC2..10EC4  ; Arabic # Lo   [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW
-10EFC..10EFF  ; Arabic # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EC5         ; Arabic # Lm       ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW
+10EC6..10EC7  ; Arabic # Lo   [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW
+10ED0         ; Arabic # Po       ARABIC BIBLICAL END OF VERSE
+10ED1..10ED8  ; Arabic # So   [8] ARABIC LIGATURE ALAYHAA AS-SALAATU WAS-SALAAM..ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH
+10EFA..10EFF  ; Arabic # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 1EE00..1EE03  ; Arabic # Lo   [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL
 1EE05..1EE1F  ; Arabic # Lo  [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF
 1EE21..1EE22  ; Arabic # Lo   [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM
@@ -926,7 +934,7 @@ FE76..FEFC    ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LA
 1EEAB..1EEBB  ; Arabic # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1EEF0..1EEF1  ; Arabic # Sm   [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
 
-# Total code points: 1373
+# Total code points: 1413
 
 # ================================================
 
@@ -1155,7 +1163,7 @@ A8FF          ; Devanagari # Mn       DEVANAGARI VOWEL SIGN AY
 0C4A..0C4D    ; Telugu # Mn   [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
 0C55..0C56    ; Telugu # Mn   [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
 0C58..0C5A    ; Telugu # Lo   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
-0C5D          ; Telugu # Lo       TELUGU LETTER NAKAARA POLLU
+0C5C..0C5D    ; Telugu # Lo   [2] TELUGU ARCHAIC SHRII..TELUGU LETTER NAKAARA POLLU
 0C60..0C61    ; Telugu # Lo   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
 0C62..0C63    ; Telugu # Mn   [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
 0C66..0C6F    ; Telugu # Nd  [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
@@ -1163,7 +1171,7 @@ A8FF          ; Devanagari # Mn       DEVANAGARI VOWEL SIGN AY
 0C78..0C7E    ; Telugu # No   [7] TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR
 0C7F          ; Telugu # So       TELUGU SIGN TUUMU
 
-# Total code points: 100
+# Total code points: 101
 
 # ================================================
 
@@ -1186,14 +1194,14 @@ A8FF          ; Devanagari # Mn       DEVANAGARI VOWEL SIGN AY
 0CCA..0CCB    ; Kannada # Mc   [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
 0CCC..0CCD    ; Kannada # Mn   [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA
 0CD5..0CD6    ; Kannada # Mc   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
-0CDD..0CDE    ; Kannada # Lo   [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA
+0CDC..0CDE    ; Kannada # Lo   [3] KANNADA ARCHAIC SHRII..KANNADA LETTER FA
 0CE0..0CE1    ; Kannada # Lo   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
 0CE2..0CE3    ; Kannada # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
 0CE6..0CEF    ; Kannada # Nd  [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
 0CF1..0CF2    ; Kannada # Lo   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
 0CF3          ; Kannada # Mc       KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT
 
-# Total code points: 91
+# Total code points: 92
 
 # ================================================
 
@@ -1594,17 +1602,18 @@ FA70..FAD9    ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILI
 16FE2         ; Han # Po       OLD CHINESE HOOK MARK
 16FE3         ; Han # Lm       OLD CHINESE ITERATION MARK
 16FF0..16FF1  ; Han # Mc   [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
+16FF2..16FF3  ; Han # Lm   [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER
+16FF4..16FF6  ; Han # Nl   [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS
 20000..2A6DF  ; Han # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; Han # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
-2B740..2B81D  ; Han # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
-2B820..2CEA1  ; Han # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2A700..2B81D  ; Han # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEAD  ; Han # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD
 2CEB0..2EBE0  ; Han # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2EBF0..2EE5D  ; Han # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D
 2F800..2FA1D  ; Han # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Han # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; Han # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
+31350..33479  ; Han # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479
 
-# Total code points: 99030
+# Total code points: 103351
 
 # ================================================
 
@@ -1647,7 +1656,8 @@ A490..A4C6    ; Yi # So  [55] YI RADICAL QOT..YI RADICAL KE
 0951..0954    ; Inherited # Mn   [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT
 1AB0..1ABD    ; Inherited # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
 1ABE          ; Inherited # Me       COMBINING PARENTHESES OVERLAY
-1ABF..1ACE    ; Inherited # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; Inherited # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; Inherited # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1CD0..1CD2    ; Inherited # Mn   [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
 1CD4..1CE0    ; Inherited # Mn  [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA
 1CE2..1CE8    ; Inherited # Mn   [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL
@@ -1676,7 +1686,7 @@ FE20..FE2D    ; Inherited # Mn  [14] COMBINING LIGATURE LEFT HALF..COMBINING CON
 1D1AA..1D1AD  ; Inherited # Mn   [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO
 E0100..E01EF  ; Inherited # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 657
+# Total code points: 684
 
 # ================================================
 
@@ -2347,8 +2357,14 @@ ABF0..ABF9    ; Meetei_Mayek # Nd  [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI
 111DB         ; Sharada # Po       SHARADA SIGN SIDDHAM
 111DC         ; Sharada # Lo       SHARADA HEADSTROKE
 111DD..111DF  ; Sharada # Po   [3] SHARADA CONTINUATION SIGN..SHARADA SECTION MARK-2
+11B60         ; Sharada # Mn       SHARADA VOWEL SIGN OE
+11B61         ; Sharada # Mc       SHARADA VOWEL SIGN OOE
+11B62..11B64  ; Sharada # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B65         ; Sharada # Mc       SHARADA VOWEL SIGN SHORT O
+11B66         ; Sharada # Mn       SHARADA VOWEL SIGN CANDRA E
+11B67         ; Sharada # Mc       SHARADA VOWEL SIGN CANDRA O
 
-# Total code points: 96
+# Total code points: 104
 
 # ================================================
 
@@ -2756,11 +2772,11 @@ ABF0..ABF9    ; Meetei_Mayek # Nd  [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI
 # ================================================
 
 16FE0         ; Tangut # Lm       TANGUT ITERATION MARK
-17000..187F7  ; Tangut # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
-18800..18AFF  ; Tangut # Lo [768] TANGUT COMPONENT-001..TANGUT COMPONENT-768
-18D00..18D08  ; Tangut # Lo   [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08
+17000..18AFF  ; Tangut # Lo [6912] TANGUT IDEOGRAPH-17000..TANGUT COMPONENT-768
+18D00..18D1E  ; Tangut # Lo  [31] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D1E
+18D80..18DF2  ; Tangut # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883
 
-# Total code points: 6914
+# Total code points: 7059
 
 # ================================================
 
@@ -3125,4 +3141,42 @@ ABF0..ABF9    ; Meetei_Mayek # Nd  [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI
 
 # Total code points: 80
 
+# ================================================
+
+10940..10959  ; Sidetic # Lo  [26] SIDETIC LETTER N01..SIDETIC LETTER N26
+
+# Total code points: 26
+
+# ================================================
+
+1E6C0..1E6DE  ; Tai_Yo # Lo  [31] TAI YO LETTER LOW KO..TAI YO LETTER HIGH KVO
+1E6E0..1E6E2  ; Tai_Yo # Lo   [3] TAI YO LETTER AA..TAI YO LETTER UE
+1E6E3         ; Tai_Yo # Mn       TAI YO SIGN UE
+1E6E4..1E6E5  ; Tai_Yo # Lo   [2] TAI YO LETTER U..TAI YO LETTER AE
+1E6E6         ; Tai_Yo # Mn       TAI YO SIGN AU
+1E6E7..1E6ED  ; Tai_Yo # Lo   [7] TAI YO LETTER O..TAI YO LETTER AUE
+1E6EE..1E6EF  ; Tai_Yo # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F0..1E6F4  ; Tai_Yo # Lo   [5] TAI YO LETTER AN..TAI YO LETTER AP
+1E6F5         ; Tai_Yo # Mn       TAI YO SIGN OM
+1E6FE         ; Tai_Yo # Lo       TAI YO SYMBOL MUEANG
+1E6FF         ; Tai_Yo # Lm       TAI YO XAM LAI
+
+# Total code points: 55
+
+# ================================================
+
+11DB0..11DD8  ; Tolong_Siki # Lo  [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH
+11DD9         ; Tolong_Siki # Lm       TOLONG SIKI SIGN SELA
+11DDA..11DDB  ; Tolong_Siki # Lo   [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA
+11DE0..11DE9  ; Tolong_Siki # Nd  [10] TOLONG SIKI DIGIT ZERO..TOLONG SIKI DIGIT NINE
+
+# Total code points: 54
+
+# ================================================
+
+16EA0..16EB8  ; Beria_Erfe # L&  [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY
+16EBB..16ED3  ; Beria_Erfe # L&  [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY
+
+# Total code points: 50
+
 # EOF
diff --git a/src/java.base/share/data/unicodedata/SpecialCasing.txt b/src/java.base/share/data/unicodedata/SpecialCasing.txt
index 74700b5d321..1013344a6f2 100644
--- a/src/java.base/share/data/unicodedata/SpecialCasing.txt
+++ b/src/java.base/share/data/unicodedata/SpecialCasing.txt
@@ -1,6 +1,6 @@
-# SpecialCasing-16.0.0.txt
-# Date: 2024-05-10, 22:49:00 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# SpecialCasing-17.0.0.txt
+# Date: 2025-07-31, 22:11:55 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -47,8 +47,8 @@
 #
 # A language ID is defined by BCP 47, with '-' and '_' treated equivalently.
 #
-# A casing context for a character is defined by Section 3.13 Default Case Algorithms
-# of The Unicode Standard.
+# A casing context for a character is defined in the
+# "Conformance" / "Default Case Algorithms" section of the core specification.
 #
 # Parsers of this file must be prepared to deal with future additions to this format:
 #  * Additional contexts
@@ -57,6 +57,10 @@
 
 # ================================================================================
 # Unconditional mappings
+# The mappings in this section are not language-sensitive nor context-sensitive.
+#
+# Note that comments provide additional information but
+# do not modify the case mapping algorithms in the core specification, chapter 3.
 # ================================================================================
 
 # The German es-zed is special--the normal mapping is to SS.
diff --git a/src/java.base/share/data/unicodedata/UnicodeData.txt b/src/java.base/share/data/unicodedata/UnicodeData.txt
index 64258a37395..fca68e3e154 100644
--- a/src/java.base/share/data/unicodedata/UnicodeData.txt
+++ b/src/java.base/share/data/unicodedata/UnicodeData.txt
@@ -659,7 +659,7 @@
 0292;LATIN SMALL LETTER EZH;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH;;01B7;;01B7
 0293;LATIN SMALL LETTER EZH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH CURL;;;;
 0294;LATIN LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
-0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;;
+0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Lo;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;;
 0296;LATIN LETTER INVERTED GLOTTAL STOP;Ll;0;L;;;;;N;;;;;
 0297;LATIN LETTER STRETCHED C;Ll;0;L;;;;;N;;;;;
 0298;LATIN LETTER BILABIAL CLICK;Ll;0;L;;;;;N;LATIN LETTER BULLSEYE;;;;
@@ -2121,6 +2121,7 @@
 088C;ARABIC LETTER TAH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
 088D;ARABIC LETTER KEHEH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;;
 088E;ARABIC VERTICAL TAIL;Lo;0;AL;;;;;N;;;;;
+088F;ARABIC LETTER NOON WITH RING ABOVE;Lo;0;AL;;;;;N;;;;;
 0890;ARABIC POUND MARK ABOVE;Cf;0;AN;;;;;N;;;;;
 0891;ARABIC PIASTRE MARK ABOVE;Cf;0;AN;;;;;N;;;;;
 0897;ARABIC PEPET;Mn;230;NSM;;;;;N;;;;;
@@ -2862,6 +2863,7 @@
 0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;;
 0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;;
 0C5A;TELUGU LETTER RRRA;Lo;0;L;;;;;N;;;;;
+0C5C;TELUGU ARCHAIC SHRII;Lo;0;L;;;;;N;;;;;
 0C5D;TELUGU LETTER NAKAARA POLLU;Lo;0;L;;;;;N;;;;;
 0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
 0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
@@ -2958,6 +2960,7 @@
 0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
 0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;;
 0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CDC;KANNADA ARCHAIC SHRII;Lo;0;L;;;;;N;;;;;
 0CDD;KANNADA LETTER NAKAARA POLLU;Lo;0;L;;;;;N;;;;;
 0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;;
 0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
@@ -6137,6 +6140,33 @@
 1ACC;COMBINING LATIN SMALL LETTER INSULAR G;Mn;230;NSM;;;;;N;;;;;
 1ACD;COMBINING LATIN SMALL LETTER INSULAR R;Mn;230;NSM;;;;;N;;;;;
 1ACE;COMBINING LATIN SMALL LETTER INSULAR T;Mn;230;NSM;;;;;N;;;;;
+1ACF;COMBINING DOUBLE CARON;Mn;230;NSM;;;;;N;;;;;
+1AD0;COMBINING VERTICAL-LINE-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1AD1;COMBINING GRAVE-VERTICAL-LINE;Mn;230;NSM;;;;;N;;;;;
+1AD2;COMBINING VERTICAL-LINE-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1AD3;COMBINING ACUTE-VERTICAL-LINE;Mn;230;NSM;;;;;N;;;;;
+1AD4;COMBINING VERTICAL-LINE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1AD5;COMBINING MACRON-VERTICAL-LINE;Mn;230;NSM;;;;;N;;;;;
+1AD6;COMBINING VERTICAL-LINE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1AD7;COMBINING VERTICAL-LINE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1AD8;COMBINING MACRON-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1AD9;COMBINING SHARP SIGN;Mn;230;NSM;;;;;N;;;;;
+1ADA;COMBINING FLAT SIGN;Mn;230;NSM;;;;;N;;;;;
+1ADB;COMBINING DOWN TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1ADC;COMBINING DIAERESIS WITH RAISED LEFT DOT;Mn;230;NSM;;;;;N;;;;;
+1ADD;COMBINING DOT-AND-RING BELOW;Mn;220;NSM;;;;;N;;;;;
+1AE0;COMBINING LEFT TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE1;COMBINING RIGHT TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE2;COMBINING MINUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE3;COMBINING INVERTED BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE4;COMBINING SQUARE ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE5;COMBINING SEAGULL ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE6;COMBINING DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;;;;;
+1AE7;COMBINING DOUBLE ARCH ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE8;COMBINING EQUALS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AE9;COMBINING LEFT ANGLE CENTRED ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AEA;COMBINING UPWARDS ARROW ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AEB;COMBINING DOUBLE RIGHTWARDS ARROW ABOVE;Mn;234;NSM;;;;;N;;;;;
 1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;;
 1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;;
 1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;;
@@ -7545,6 +7575,7 @@
 20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;;
 20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;;
 20C0;SOM SIGN;Sc;0;ET;;;;;N;;;;;
+20C1;SAUDI RIYAL SIGN;Sc;0;ET;;;;;N;;;;;
 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
@@ -10239,6 +10270,7 @@
 2B93;NEWLINE RIGHT;So;0;ON;;;;;N;;;;;
 2B94;FOUR CORNER ARROWS CIRCLING ANTICLOCKWISE;So;0;ON;;;;;N;;;;;
 2B95;RIGHTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B96;EQUALS SIGN WITH INFINITY ABOVE;So;0;ON;;;;;N;;;;;
 2B97;SYMBOL FOR TYPE A ELECTRONICS;So;0;ON;;;;;N;;;;;
 2B98;THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
 2B99;THREE-D RIGHT-LIGHTED UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
@@ -14274,10 +14306,14 @@ A7CA;LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C9;;A7C9
 A7CB;LATIN CAPITAL LETTER RAMS HORN;Lu;0;L;;;;;N;;;;0264;
 A7CC;LATIN CAPITAL LETTER S WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A7CD;
 A7CD;LATIN SMALL LETTER S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A7CC;;A7CC
+A7CE;LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE;Lu;0;L;;;;;N;;;;A7CF;
+A7CF;LATIN SMALL LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;;;A7CE;;A7CE
 A7D0;LATIN CAPITAL LETTER CLOSED INSULAR G;Lu;0;L;;;;;N;;;;A7D1;
 A7D1;LATIN SMALL LETTER CLOSED INSULAR G;Ll;0;L;;;;;N;;;A7D0;;A7D0
-A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;;;
-A7D5;LATIN SMALL LETTER DOUBLE WYNN;Ll;0;L;;;;;N;;;;;
+A7D2;LATIN CAPITAL LETTER DOUBLE THORN;Lu;0;L;;;;;N;;;;A7D3;
+A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;A7D2;;A7D2
+A7D4;LATIN CAPITAL LETTER DOUBLE WYNN;Lu;0;L;;;;;N;;;;A7D5;
+A7D5;LATIN SMALL LETTER DOUBLE WYNN;Ll;0;L;;;;;N;;;A7D4;;A7D4
 A7D6;LATIN CAPITAL LETTER MIDDLE SCOTS S;Lu;0;L;;;;;N;;;;A7D7;
 A7D7;LATIN SMALL LETTER MIDDLE SCOTS S;Ll;0;L;;;;;N;;;A7D6;;A7D6
 A7D8;LATIN CAPITAL LETTER SIGMOID S;Lu;0;L;;;;;N;;;;A7D9;
@@ -14285,6 +14321,7 @@ A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8
 A7DA;LATIN CAPITAL LETTER LAMBDA;Lu;0;L;;;;;N;;;;A7DB;
 A7DB;LATIN SMALL LETTER LAMBDA;Ll;0;L;;;;;N;;;A7DA;;A7DA
 A7DC;LATIN CAPITAL LETTER LAMBDA WITH STROKE;Lu;0;L;;;;;N;;;;019B;
+A7F1;MODIFIER LETTER CAPITAL S;Lm;0;L;<super> 0053;;;;N;;;;;
 A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L;<super> 0043;;;;N;;;;;
 A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L;<super> 0046;;;;N;;;;;
 A7F4;MODIFIER LETTER CAPITAL Q;Lm;0;L;<super> 0051;;;;N;;;;;
@@ -15925,6 +15962,22 @@ FBBF;ARABIC SYMBOL RING;Sk;0;AL;;;;;N;;;;;
 FBC0;ARABIC SYMBOL SMALL TAH ABOVE;Sk;0;AL;;;;;N;;;;;
 FBC1;ARABIC SYMBOL SMALL TAH BELOW;Sk;0;AL;;;;;N;;;;;
 FBC2;ARABIC SYMBOL WASLA ABOVE;Sk;0;AL;;;;;N;;;;;
+FBC3;ARABIC LIGATURE JALLA WA-ALAA;So;0;ON;;;;;N;;;;;
+FBC4;ARABIC LIGATURE DAAMAT BARAKAATUHUM;So;0;ON;;;;;N;;;;;
+FBC5;ARABIC LIGATURE RAHMATU ALLAAHI TAAALAA ALAYH;So;0;ON;;;;;N;;;;;
+FBC6;ARABIC LIGATURE RAHMATU ALLAAHI ALAYHIM;So;0;ON;;;;;N;;;;;
+FBC7;ARABIC LIGATURE RAHMATU ALLAAHI ALAYHIMAA;So;0;ON;;;;;N;;;;;
+FBC8;ARABIC LIGATURE RAHIMAHUM ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;;
+FBC9;ARABIC LIGATURE RAHIMAHUMAA ALLAAH;So;0;ON;;;;;N;;;;;
+FBCA;ARABIC LIGATURE RAHIMAHUMAA ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;;
+FBCB;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANHUM;So;0;ON;;;;;N;;;;;
+FBCC;ARABIC LIGATURE HAFIZAHU ALLAAH;So;0;ON;;;;;N;;;;;
+FBCD;ARABIC LIGATURE HAFIZAHU ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;;
+FBCE;ARABIC LIGATURE HAFIZAHUM ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;;
+FBCF;ARABIC LIGATURE HAFIZAHUMAA ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;;
+FBD0;ARABIC LIGATURE SALLALLAAHU TAAALAA ALAYHI WA-SALLAM;So;0;ON;;;;;N;;;;;
+FBD1;ARABIC LIGATURE AJJAL ALLAAHU FARAJAHU ASH-SHAREEF;So;0;ON;;;;;N;;;;;
+FBD2;ARABIC LIGATURE ALAYHI AR-RAHMAH;So;0;ON;;;;;N;;;;;
 FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL;<isolated> 06AD;;;;N;;;;;
 FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL;<final> 06AD;;;;N;;;;;
 FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL;<initial> 06AD;;;;N;;;;;
@@ -16370,6 +16423,8 @@ FD8C;ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645
 FD8D;ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C 0645;;;;N;;;;;
 FD8E;ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 062C;;;;N;;;;;
 FD8F;ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 0645;;;;N;;;;;
+FD90;ARABIC LIGATURE RAHMATU ALLAAHI ALAYH;So;0;ON;;;;;N;;;;;
+FD91;ARABIC LIGATURE RAHMATU ALLAAHI ALAYHAA;So;0;ON;;;;;N;;;;;
 FD92;ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062E;;;;N;;;;;
 FD93;ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 062C;;;;N;;;;;
 FD94;ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 0645;;;;N;;;;;
@@ -16424,6 +16479,13 @@ FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639
 FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645 0645;;;;N;;;;;
 FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 062E 064A;;;;N;;;;;
 FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062C 064A;;;;N;;;;;
+FDC8;ARABIC LIGATURE RAHIMAHU ALLAAH TAAALAA;So;0;ON;;;;;N;;;;;
+FDC9;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANH;So;0;ON;;;;;N;;;;;
+FDCA;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANHAA;So;0;ON;;;;;N;;;;;
+FDCB;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANHUMAA;So;0;ON;;;;;N;;;;;
+FDCC;ARABIC LIGATURE SALLALLAHU ALAYHI WA-ALAA AALIHEE WA-SALLAM;So;0;ON;;;;;N;;;;;
+FDCD;ARABIC LIGATURE AJJAL ALLAAHU TAAALAA FARAJAHU ASH-SHAREEF;So;0;ON;;;;;N;;;;;
+FDCE;ARABIC LIGATURE KARRAMA ALLAAHU WAJHAH;So;0;ON;;;;;N;;;;;
 FDCF;ARABIC LIGATURE SALAAMUHU ALAYNAA;So;0;ON;;;;;N;;;;;
 FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 06D2;;;;N;;;;;
 FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0642 0644 06D2;;;;N;;;;;
@@ -18708,6 +18770,32 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10938;LYDIAN LETTER NN;Lo;0;R;;;;;N;;;;;
 10939;LYDIAN LETTER C;Lo;0;R;;;;;N;;;;;
 1093F;LYDIAN TRIANGULAR MARK;Po;0;R;;;;;N;;;;;
+10940;SIDETIC LETTER N01;Lo;0;R;;;;;N;;;;;
+10941;SIDETIC LETTER N02;Lo;0;R;;;;;N;;;;;
+10942;SIDETIC LETTER N03;Lo;0;R;;;;;N;;;;;
+10943;SIDETIC LETTER N04;Lo;0;R;;;;;N;;;;;
+10944;SIDETIC LETTER N05;Lo;0;R;;;;;N;;;;;
+10945;SIDETIC LETTER N06;Lo;0;R;;;;;N;;;;;
+10946;SIDETIC LETTER N07;Lo;0;R;;;;;N;;;;;
+10947;SIDETIC LETTER N08;Lo;0;R;;;;;N;;;;;
+10948;SIDETIC LETTER N09;Lo;0;R;;;;;N;;;;;
+10949;SIDETIC LETTER N10;Lo;0;R;;;;;N;;;;;
+1094A;SIDETIC LETTER N11;Lo;0;R;;;;;N;;;;;
+1094B;SIDETIC LETTER N12;Lo;0;R;;;;;N;;;;;
+1094C;SIDETIC LETTER N13;Lo;0;R;;;;;N;;;;;
+1094D;SIDETIC LETTER N14;Lo;0;R;;;;;N;;;;;
+1094E;SIDETIC LETTER N15;Lo;0;R;;;;;N;;;;;
+1094F;SIDETIC LETTER N16;Lo;0;R;;;;;N;;;;;
+10950;SIDETIC LETTER N17;Lo;0;R;;;;;N;;;;;
+10951;SIDETIC LETTER N18;Lo;0;R;;;;;N;;;;;
+10952;SIDETIC LETTER N19;Lo;0;R;;;;;N;;;;;
+10953;SIDETIC LETTER N20;Lo;0;R;;;;;N;;;;;
+10954;SIDETIC LETTER N21;Lo;0;R;;;;;N;;;;;
+10955;SIDETIC LETTER N22;Lo;0;R;;;;;N;;;;;
+10956;SIDETIC LETTER N23;Lo;0;R;;;;;N;;;;;
+10957;SIDETIC LETTER N24;Lo;0;R;;;;;N;;;;;
+10958;SIDETIC LETTER N25;Lo;0;R;;;;;N;;;;;
+10959;SIDETIC LETTER N26;Lo;0;R;;;;;N;;;;;
 10980;MEROITIC HIEROGLYPHIC LETTER A;Lo;0;R;;;;;N;;;;;
 10981;MEROITIC HIEROGLYPHIC LETTER E;Lo;0;R;;;;;N;;;;;
 10982;MEROITIC HIEROGLYPHIC LETTER I;Lo;0;R;;;;;N;;;;;
@@ -19541,6 +19629,20 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10EC2;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;;
 10EC3;ARABIC LETTER TAH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;;
 10EC4;ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;;
+10EC5;ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW;Lm;0;AL;;;;;N;;;;;
+10EC6;ARABIC LETTER THIN NOON;Lo;0;AL;;;;;N;;;;;
+10EC7;ARABIC LETTER YEH WITH FOUR DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+10ED0;ARABIC BIBLICAL END OF VERSE;Po;0;ON;;;;;N;;;;;
+10ED1;ARABIC LIGATURE ALAYHAA AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;;
+10ED2;ARABIC LIGATURE ALAYHIM AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;;
+10ED3;ARABIC LIGATURE ALAYHIMAA AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;;
+10ED4;ARABIC LIGATURE QADDASA ALLAAHU SIRRAH;So;0;ON;;;;;N;;;;;
+10ED5;ARABIC LIGATURE QUDDISA SIRRUHUM;So;0;ON;;;;;N;;;;;
+10ED6;ARABIC LIGATURE QUDDISA SIRRUHUMAA;So;0;ON;;;;;N;;;;;
+10ED7;ARABIC LIGATURE QUDDISAT ASRAARUHUM;So;0;ON;;;;;N;;;;;
+10ED8;ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH;So;0;ON;;;;;N;;;;;
+10EFA;ARABIC DOUBLE VERTICAL BAR BELOW;Mn;220;NSM;;;;;N;;;;;
+10EFB;ARABIC SMALL LOW NOON;Mn;220;NSM;;;;;N;;;;;
 10EFC;ARABIC COMBINING ALEF OVERLAY;Mn;0;NSM;;;;;N;;;;;
 10EFD;ARABIC SMALL LOW WORD SAKTA;Mn;220;NSM;;;;;N;;;;;
 10EFE;ARABIC SMALL LOW WORD QASR;Mn;220;NSM;;;;;N;;;;;
@@ -21521,6 +21623,14 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;;
 11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;;
 11B09;DEVANAGARI SIGN MINDU;Po;0;L;;;;;N;;;;;
+11B60;SHARADA VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11B61;SHARADA VOWEL SIGN OOE;Mc;0;L;;;;;N;;;;;
+11B62;SHARADA VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11B63;SHARADA VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;;
+11B64;SHARADA VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
+11B65;SHARADA VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
+11B66;SHARADA VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+11B67;SHARADA VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
 11BC0;SUNUWAR LETTER DEVI;Lo;0;L;;;;;N;;;;;
 11BC1;SUNUWAR LETTER TASLA;Lo;0;L;;;;;N;;;;;
 11BC2;SUNUWAR LETTER EKO;Lo;0;L;;;;;N;;;;;
@@ -21868,6 +21978,60 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11DA7;GUNJALA GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 11DA8;GUNJALA GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 11DA9;GUNJALA GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11DB0;TOLONG SIKI LETTER I;Lo;0;L;;;;;N;;;;;
+11DB1;TOLONG SIKI LETTER E;Lo;0;L;;;;;N;;;;;
+11DB2;TOLONG SIKI LETTER U;Lo;0;L;;;;;N;;;;;
+11DB3;TOLONG SIKI LETTER O;Lo;0;L;;;;;N;;;;;
+11DB4;TOLONG SIKI LETTER A;Lo;0;L;;;;;N;;;;;
+11DB5;TOLONG SIKI LETTER AA;Lo;0;L;;;;;N;;;;;
+11DB6;TOLONG SIKI LETTER P;Lo;0;L;;;;;N;;;;;
+11DB7;TOLONG SIKI LETTER PH;Lo;0;L;;;;;N;;;;;
+11DB8;TOLONG SIKI LETTER B;Lo;0;L;;;;;N;;;;;
+11DB9;TOLONG SIKI LETTER BH;Lo;0;L;;;;;N;;;;;
+11DBA;TOLONG SIKI LETTER M;Lo;0;L;;;;;N;;;;;
+11DBB;TOLONG SIKI LETTER T;Lo;0;L;;;;;N;;;;;
+11DBC;TOLONG SIKI LETTER TH;Lo;0;L;;;;;N;;;;;
+11DBD;TOLONG SIKI LETTER D;Lo;0;L;;;;;N;;;;;
+11DBE;TOLONG SIKI LETTER DH;Lo;0;L;;;;;N;;;;;
+11DBF;TOLONG SIKI LETTER N;Lo;0;L;;;;;N;;;;;
+11DC0;TOLONG SIKI LETTER TT;Lo;0;L;;;;;N;;;;;
+11DC1;TOLONG SIKI LETTER TTH;Lo;0;L;;;;;N;;;;;
+11DC2;TOLONG SIKI LETTER DD;Lo;0;L;;;;;N;;;;;
+11DC3;TOLONG SIKI LETTER DDH;Lo;0;L;;;;;N;;;;;
+11DC4;TOLONG SIKI LETTER NN;Lo;0;L;;;;;N;;;;;
+11DC5;TOLONG SIKI LETTER C;Lo;0;L;;;;;N;;;;;
+11DC6;TOLONG SIKI LETTER CH;Lo;0;L;;;;;N;;;;;
+11DC7;TOLONG SIKI LETTER J;Lo;0;L;;;;;N;;;;;
+11DC8;TOLONG SIKI LETTER JH;Lo;0;L;;;;;N;;;;;
+11DC9;TOLONG SIKI LETTER NY;Lo;0;L;;;;;N;;;;;
+11DCA;TOLONG SIKI LETTER K;Lo;0;L;;;;;N;;;;;
+11DCB;TOLONG SIKI LETTER KH;Lo;0;L;;;;;N;;;;;
+11DCC;TOLONG SIKI LETTER G;Lo;0;L;;;;;N;;;;;
+11DCD;TOLONG SIKI LETTER GH;Lo;0;L;;;;;N;;;;;
+11DCE;TOLONG SIKI LETTER NG;Lo;0;L;;;;;N;;;;;
+11DCF;TOLONG SIKI LETTER Y;Lo;0;L;;;;;N;;;;;
+11DD0;TOLONG SIKI LETTER R;Lo;0;L;;;;;N;;;;;
+11DD1;TOLONG SIKI LETTER L;Lo;0;L;;;;;N;;;;;
+11DD2;TOLONG SIKI LETTER V;Lo;0;L;;;;;N;;;;;
+11DD3;TOLONG SIKI LETTER NNY;Lo;0;L;;;;;N;;;;;
+11DD4;TOLONG SIKI LETTER S;Lo;0;L;;;;;N;;;;;
+11DD5;TOLONG SIKI LETTER H;Lo;0;L;;;;;N;;;;;
+11DD6;TOLONG SIKI LETTER X;Lo;0;L;;;;;N;;;;;
+11DD7;TOLONG SIKI LETTER RR;Lo;0;L;;;;;N;;;;;
+11DD8;TOLONG SIKI LETTER RRH;Lo;0;L;;;;;N;;;;;
+11DD9;TOLONG SIKI SIGN SELA;Lm;0;L;;;;;N;;;;;
+11DDA;TOLONG SIKI SIGN HECAKA;Lo;0;L;;;;;N;;;;;
+11DDB;TOLONG SIKI UNGGA;Lo;0;L;;;;;N;;;;;
+11DE0;TOLONG SIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11DE1;TOLONG SIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11DE2;TOLONG SIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11DE3;TOLONG SIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11DE4;TOLONG SIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11DE5;TOLONG SIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11DE6;TOLONG SIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11DE7;TOLONG SIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11DE8;TOLONG SIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11DE9;TOLONG SIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 11EE0;MAKASAR LETTER KA;Lo;0;L;;;;;N;;;;;
 11EE1;MAKASAR LETTER GA;Lo;0;L;;;;;N;;;;;
 11EE2;MAKASAR LETTER NGA;Lo;0;L;;;;;N;;;;;
@@ -22088,8 +22252,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12035;CUNEIFORM SIGN ARAD TIMES KUR;Lo;0;L;;;;;N;;;;;
 12036;CUNEIFORM SIGN ARKAB;Lo;0;L;;;;;N;;;;;
 12037;CUNEIFORM SIGN ASAL2;Lo;0;L;;;;;N;;;;;
-12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;;N;;;;;
-12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;1;N;;;;;
+12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;1;N;;;;;
 1203A;CUNEIFORM SIGN ASH KABA TENU;Lo;0;L;;;;;N;;;;;
 1203B;CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP;Lo;0;L;;;;;N;;;;;
 1203C;CUNEIFORM SIGN ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
@@ -22153,7 +22317,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12076;CUNEIFORM SIGN DIM2;Lo;0;L;;;;;N;;;;;
 12077;CUNEIFORM SIGN DIN;Lo;0;L;;;;;N;;;;;
 12078;CUNEIFORM SIGN DIN KASKAL U GUNU DISH;Lo;0;L;;;;;N;;;;;
-12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;;N;;;;;
+12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;1;N;;;;;
 1207A;CUNEIFORM SIGN DU;Lo;0;L;;;;;N;;;;;
 1207B;CUNEIFORM SIGN DU OVER DU;Lo;0;L;;;;;N;;;;;
 1207C;CUNEIFORM SIGN DU GUNU;Lo;0;L;;;;;N;;;;;
@@ -22582,12 +22746,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12223;CUNEIFORM SIGN MA2;Lo;0;L;;;;;N;;;;;
 12224;CUNEIFORM SIGN MAH;Lo;0;L;;;;;N;;;;;
 12225;CUNEIFORM SIGN MAR;Lo;0;L;;;;;N;;;;;
-12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;;N;;;;;
+12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;1/2;N;;;;;
 12227;CUNEIFORM SIGN MASH2;Lo;0;L;;;;;N;;;;;
 12228;CUNEIFORM SIGN ME;Lo;0;L;;;;;N;;;;;
 12229;CUNEIFORM SIGN MES;Lo;0;L;;;;;N;;;;;
 1222A;CUNEIFORM SIGN MI;Lo;0;L;;;;;N;;;;;
-1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;;N;;;;;
+1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;2;N;;;;;
 1222C;CUNEIFORM SIGN MU;Lo;0;L;;;;;N;;;;;
 1222D;CUNEIFORM SIGN MU OVER MU;Lo;0;L;;;;;N;;;;;
 1222E;CUNEIFORM SIGN MUG;Lo;0;L;;;;;N;;;;;
@@ -22811,9 +22975,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12308;CUNEIFORM SIGN TUM;Lo;0;L;;;;;N;;;;;
 12309;CUNEIFORM SIGN TUR;Lo;0;L;;;;;N;;;;;
 1230A;CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA;Lo;0;L;;;;;N;;;;;
-1230B;CUNEIFORM SIGN U;Lo;0;L;;;;;N;;;;;
+1230B;CUNEIFORM SIGN U;Lo;0;L;;;;1;N;;;;;
 1230C;CUNEIFORM SIGN U GUD;Lo;0;L;;;;;N;;;;;
-1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;;N;;;;;
+1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;3;N;;;;;
 1230E;CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR;Lo;0;L;;;;;N;;;;;
 1230F;CUNEIFORM SIGN U OVER U SUR OVER SUR;Lo;0;L;;;;;N;;;;;
 12310;CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED;Lo;0;L;;;;;N;;;;;
@@ -22953,7 +23117,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12396;CUNEIFORM SIGN SAG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
 12397;CUNEIFORM SIGN TI2;Lo;0;L;;;;;N;;;;;
 12398;CUNEIFORM SIGN UM TIMES ME;Lo;0;L;;;;;N;;;;;
-12399;CUNEIFORM SIGN U U;Lo;0;L;;;;;N;;;;;
+12399;CUNEIFORM SIGN U U;Lo;0;L;;;;2;N;;;;;
 12400;CUNEIFORM NUMERIC SIGN TWO ASH;Nl;0;L;;;;2;N;;;;;
 12401;CUNEIFORM NUMERIC SIGN THREE ASH;Nl;0;L;;;;3;N;;;;;
 12402;CUNEIFORM NUMERIC SIGN FOUR ASH;Nl;0;L;;;;4;N;;;;;
@@ -30124,6 +30288,56 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16E98;MEDEFAIDRIN FULL STOP;Po;0;L;;;;;N;;;;;
 16E99;MEDEFAIDRIN SYMBOL AIVA;Po;0;L;;;;;N;;;;;
 16E9A;MEDEFAIDRIN EXCLAMATION OH;Po;0;L;;;;;N;;;;;
+16EA0;BERIA ERFE CAPITAL LETTER ARKAB;Lu;0;L;;;;;N;;;;16EBB;
+16EA1;BERIA ERFE CAPITAL LETTER BASIGNA;Lu;0;L;;;;;N;;;;16EBC;
+16EA2;BERIA ERFE CAPITAL LETTER DARBAI;Lu;0;L;;;;;N;;;;16EBD;
+16EA3;BERIA ERFE CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;16EBE;
+16EA4;BERIA ERFE CAPITAL LETTER FITKO;Lu;0;L;;;;;N;;;;16EBF;
+16EA5;BERIA ERFE CAPITAL LETTER GOWAY;Lu;0;L;;;;;N;;;;16EC0;
+16EA6;BERIA ERFE CAPITAL LETTER HIRDEABO;Lu;0;L;;;;;N;;;;16EC1;
+16EA7;BERIA ERFE CAPITAL LETTER I;Lu;0;L;;;;;N;;;;16EC2;
+16EA8;BERIA ERFE CAPITAL LETTER DJAI;Lu;0;L;;;;;N;;;;16EC3;
+16EA9;BERIA ERFE CAPITAL LETTER KOBO;Lu;0;L;;;;;N;;;;16EC4;
+16EAA;BERIA ERFE CAPITAL LETTER LAKKO;Lu;0;L;;;;;N;;;;16EC5;
+16EAB;BERIA ERFE CAPITAL LETTER MERI;Lu;0;L;;;;;N;;;;16EC6;
+16EAC;BERIA ERFE CAPITAL LETTER NINI;Lu;0;L;;;;;N;;;;16EC7;
+16EAD;BERIA ERFE CAPITAL LETTER GNA;Lu;0;L;;;;;N;;;;16EC8;
+16EAE;BERIA ERFE CAPITAL LETTER NGAY;Lu;0;L;;;;;N;;;;16EC9;
+16EAF;BERIA ERFE CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;16ECA;
+16EB0;BERIA ERFE CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;16ECB;
+16EB1;BERIA ERFE CAPITAL LETTER ERIGO;Lu;0;L;;;;;N;;;;16ECC;
+16EB2;BERIA ERFE CAPITAL LETTER ERIGO TAMURA;Lu;0;L;;;;;N;;;;16ECD;
+16EB3;BERIA ERFE CAPITAL LETTER SERI;Lu;0;L;;;;;N;;;;16ECE;
+16EB4;BERIA ERFE CAPITAL LETTER SHEP;Lu;0;L;;;;;N;;;;16ECF;
+16EB5;BERIA ERFE CAPITAL LETTER TATASOUE;Lu;0;L;;;;;N;;;;16ED0;
+16EB6;BERIA ERFE CAPITAL LETTER UI;Lu;0;L;;;;;N;;;;16ED1;
+16EB7;BERIA ERFE CAPITAL LETTER WASSE;Lu;0;L;;;;;N;;;;16ED2;
+16EB8;BERIA ERFE CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;16ED3;
+16EBB;BERIA ERFE SMALL LETTER ARKAB;Ll;0;L;;;;;N;;;16EA0;;16EA0
+16EBC;BERIA ERFE SMALL LETTER BASIGNA;Ll;0;L;;;;;N;;;16EA1;;16EA1
+16EBD;BERIA ERFE SMALL LETTER DARBAI;Ll;0;L;;;;;N;;;16EA2;;16EA2
+16EBE;BERIA ERFE SMALL LETTER EH;Ll;0;L;;;;;N;;;16EA3;;16EA3
+16EBF;BERIA ERFE SMALL LETTER FITKO;Ll;0;L;;;;;N;;;16EA4;;16EA4
+16EC0;BERIA ERFE SMALL LETTER GOWAY;Ll;0;L;;;;;N;;;16EA5;;16EA5
+16EC1;BERIA ERFE SMALL LETTER HIRDEABO;Ll;0;L;;;;;N;;;16EA6;;16EA6
+16EC2;BERIA ERFE SMALL LETTER I;Ll;0;L;;;;;N;;;16EA7;;16EA7
+16EC3;BERIA ERFE SMALL LETTER DJAI;Ll;0;L;;;;;N;;;16EA8;;16EA8
+16EC4;BERIA ERFE SMALL LETTER KOBO;Ll;0;L;;;;;N;;;16EA9;;16EA9
+16EC5;BERIA ERFE SMALL LETTER LAKKO;Ll;0;L;;;;;N;;;16EAA;;16EAA
+16EC6;BERIA ERFE SMALL LETTER MERI;Ll;0;L;;;;;N;;;16EAB;;16EAB
+16EC7;BERIA ERFE SMALL LETTER NINI;Ll;0;L;;;;;N;;;16EAC;;16EAC
+16EC8;BERIA ERFE SMALL LETTER GNA;Ll;0;L;;;;;N;;;16EAD;;16EAD
+16EC9;BERIA ERFE SMALL LETTER NGAY;Ll;0;L;;;;;N;;;16EAE;;16EAE
+16ECA;BERIA ERFE SMALL LETTER OI;Ll;0;L;;;;;N;;;16EAF;;16EAF
+16ECB;BERIA ERFE SMALL LETTER PI;Ll;0;L;;;;;N;;;16EB0;;16EB0
+16ECC;BERIA ERFE SMALL LETTER ERIGO;Ll;0;L;;;;;N;;;16EB1;;16EB1
+16ECD;BERIA ERFE SMALL LETTER ERIGO TAMURA;Ll;0;L;;;;;N;;;16EB2;;16EB2
+16ECE;BERIA ERFE SMALL LETTER SERI;Ll;0;L;;;;;N;;;16EB3;;16EB3
+16ECF;BERIA ERFE SMALL LETTER SHEP;Ll;0;L;;;;;N;;;16EB4;;16EB4
+16ED0;BERIA ERFE SMALL LETTER TATASOUE;Ll;0;L;;;;;N;;;16EB5;;16EB5
+16ED1;BERIA ERFE SMALL LETTER UI;Ll;0;L;;;;;N;;;16EB6;;16EB6
+16ED2;BERIA ERFE SMALL LETTER WASSE;Ll;0;L;;;;;N;;;16EB7;;16EB7
+16ED3;BERIA ERFE SMALL LETTER AY;Ll;0;L;;;;;N;;;16EB8;;16EB8
 16F00;MIAO LETTER PA;Lo;0;L;;;;;N;;;;;
 16F01;MIAO LETTER BA;Lo;0;L;;;;;N;;;;;
 16F02;MIAO LETTER YI PA;Lo;0;L;;;;;N;;;;;
@@ -30280,8 +30494,13 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16FE4;KHITAN SMALL SCRIPT FILLER;Mn;0;NSM;;;;;N;;;;;
 16FF0;VIETNAMESE ALTERNATE READING MARK CA;Mc;6;L;;;;;N;;;;;
 16FF1;VIETNAMESE ALTERNATE READING MARK NHAY;Mc;6;L;;;;;N;;;;;
+16FF2;CHINESE SMALL SIMPLIFIED ER;Lm;0;L;;;;;N;;;;;
+16FF3;CHINESE SMALL TRADITIONAL ER;Lm;0;L;;;;;N;;;;;
+16FF4;YANGQIN SIGN SLOW ONE BEAT;Nl;0;L;;;;1;N;;;;;
+16FF5;YANGQIN SIGN SLOW THREE HALF BEATS;Nl;0;L;;;;3/2;N;;;;;
+16FF6;YANGQIN SIGN SLOW TWO BEATS;Nl;0;L;;;;2;N;;;;;
 17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
-187F7;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+187FF;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
 18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
 18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
@@ -31522,7 +31741,122 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;;
 18CFF;KHITAN SMALL SCRIPT CHARACTER-18CFF;Lo;0;L;;;;;N;;;;;
 18D00;<Tangut Ideograph Supplement, First>;Lo;0;L;;;;;N;;;;;
-18D08;<Tangut Ideograph Supplement, Last>;Lo;0;L;;;;;N;;;;;
+18D1E;<Tangut Ideograph Supplement, Last>;Lo;0;L;;;;;N;;;;;
+18D80;TANGUT COMPONENT-769;Lo;0;L;;;;;N;;;;;
+18D81;TANGUT COMPONENT-770;Lo;0;L;;;;;N;;;;;
+18D82;TANGUT COMPONENT-771;Lo;0;L;;;;;N;;;;;
+18D83;TANGUT COMPONENT-772;Lo;0;L;;;;;N;;;;;
+18D84;TANGUT COMPONENT-773;Lo;0;L;;;;;N;;;;;
+18D85;TANGUT COMPONENT-774;Lo;0;L;;;;;N;;;;;
+18D86;TANGUT COMPONENT-775;Lo;0;L;;;;;N;;;;;
+18D87;TANGUT COMPONENT-776;Lo;0;L;;;;;N;;;;;
+18D88;TANGUT COMPONENT-777;Lo;0;L;;;;;N;;;;;
+18D89;TANGUT COMPONENT-778;Lo;0;L;;;;;N;;;;;
+18D8A;TANGUT COMPONENT-779;Lo;0;L;;;;;N;;;;;
+18D8B;TANGUT COMPONENT-780;Lo;0;L;;;;;N;;;;;
+18D8C;TANGUT COMPONENT-781;Lo;0;L;;;;;N;;;;;
+18D8D;TANGUT COMPONENT-782;Lo;0;L;;;;;N;;;;;
+18D8E;TANGUT COMPONENT-783;Lo;0;L;;;;;N;;;;;
+18D8F;TANGUT COMPONENT-784;Lo;0;L;;;;;N;;;;;
+18D90;TANGUT COMPONENT-785;Lo;0;L;;;;;N;;;;;
+18D91;TANGUT COMPONENT-786;Lo;0;L;;;;;N;;;;;
+18D92;TANGUT COMPONENT-787;Lo;0;L;;;;;N;;;;;
+18D93;TANGUT COMPONENT-788;Lo;0;L;;;;;N;;;;;
+18D94;TANGUT COMPONENT-789;Lo;0;L;;;;;N;;;;;
+18D95;TANGUT COMPONENT-790;Lo;0;L;;;;;N;;;;;
+18D96;TANGUT COMPONENT-791;Lo;0;L;;;;;N;;;;;
+18D97;TANGUT COMPONENT-792;Lo;0;L;;;;;N;;;;;
+18D98;TANGUT COMPONENT-793;Lo;0;L;;;;;N;;;;;
+18D99;TANGUT COMPONENT-794;Lo;0;L;;;;;N;;;;;
+18D9A;TANGUT COMPONENT-795;Lo;0;L;;;;;N;;;;;
+18D9B;TANGUT COMPONENT-796;Lo;0;L;;;;;N;;;;;
+18D9C;TANGUT COMPONENT-797;Lo;0;L;;;;;N;;;;;
+18D9D;TANGUT COMPONENT-798;Lo;0;L;;;;;N;;;;;
+18D9E;TANGUT COMPONENT-799;Lo;0;L;;;;;N;;;;;
+18D9F;TANGUT COMPONENT-800;Lo;0;L;;;;;N;;;;;
+18DA0;TANGUT COMPONENT-801;Lo;0;L;;;;;N;;;;;
+18DA1;TANGUT COMPONENT-802;Lo;0;L;;;;;N;;;;;
+18DA2;TANGUT COMPONENT-803;Lo;0;L;;;;;N;;;;;
+18DA3;TANGUT COMPONENT-804;Lo;0;L;;;;;N;;;;;
+18DA4;TANGUT COMPONENT-805;Lo;0;L;;;;;N;;;;;
+18DA5;TANGUT COMPONENT-806;Lo;0;L;;;;;N;;;;;
+18DA6;TANGUT COMPONENT-807;Lo;0;L;;;;;N;;;;;
+18DA7;TANGUT COMPONENT-808;Lo;0;L;;;;;N;;;;;
+18DA8;TANGUT COMPONENT-809;Lo;0;L;;;;;N;;;;;
+18DA9;TANGUT COMPONENT-810;Lo;0;L;;;;;N;;;;;
+18DAA;TANGUT COMPONENT-811;Lo;0;L;;;;;N;;;;;
+18DAB;TANGUT COMPONENT-812;Lo;0;L;;;;;N;;;;;
+18DAC;TANGUT COMPONENT-813;Lo;0;L;;;;;N;;;;;
+18DAD;TANGUT COMPONENT-814;Lo;0;L;;;;;N;;;;;
+18DAE;TANGUT COMPONENT-815;Lo;0;L;;;;;N;;;;;
+18DAF;TANGUT COMPONENT-816;Lo;0;L;;;;;N;;;;;
+18DB0;TANGUT COMPONENT-817;Lo;0;L;;;;;N;;;;;
+18DB1;TANGUT COMPONENT-818;Lo;0;L;;;;;N;;;;;
+18DB2;TANGUT COMPONENT-819;Lo;0;L;;;;;N;;;;;
+18DB3;TANGUT COMPONENT-820;Lo;0;L;;;;;N;;;;;
+18DB4;TANGUT COMPONENT-821;Lo;0;L;;;;;N;;;;;
+18DB5;TANGUT COMPONENT-822;Lo;0;L;;;;;N;;;;;
+18DB6;TANGUT COMPONENT-823;Lo;0;L;;;;;N;;;;;
+18DB7;TANGUT COMPONENT-824;Lo;0;L;;;;;N;;;;;
+18DB8;TANGUT COMPONENT-825;Lo;0;L;;;;;N;;;;;
+18DB9;TANGUT COMPONENT-826;Lo;0;L;;;;;N;;;;;
+18DBA;TANGUT COMPONENT-827;Lo;0;L;;;;;N;;;;;
+18DBB;TANGUT COMPONENT-828;Lo;0;L;;;;;N;;;;;
+18DBC;TANGUT COMPONENT-829;Lo;0;L;;;;;N;;;;;
+18DBD;TANGUT COMPONENT-830;Lo;0;L;;;;;N;;;;;
+18DBE;TANGUT COMPONENT-831;Lo;0;L;;;;;N;;;;;
+18DBF;TANGUT COMPONENT-832;Lo;0;L;;;;;N;;;;;
+18DC0;TANGUT COMPONENT-833;Lo;0;L;;;;;N;;;;;
+18DC1;TANGUT COMPONENT-834;Lo;0;L;;;;;N;;;;;
+18DC2;TANGUT COMPONENT-835;Lo;0;L;;;;;N;;;;;
+18DC3;TANGUT COMPONENT-836;Lo;0;L;;;;;N;;;;;
+18DC4;TANGUT COMPONENT-837;Lo;0;L;;;;;N;;;;;
+18DC5;TANGUT COMPONENT-838;Lo;0;L;;;;;N;;;;;
+18DC6;TANGUT COMPONENT-839;Lo;0;L;;;;;N;;;;;
+18DC7;TANGUT COMPONENT-840;Lo;0;L;;;;;N;;;;;
+18DC8;TANGUT COMPONENT-841;Lo;0;L;;;;;N;;;;;
+18DC9;TANGUT COMPONENT-842;Lo;0;L;;;;;N;;;;;
+18DCA;TANGUT COMPONENT-843;Lo;0;L;;;;;N;;;;;
+18DCB;TANGUT COMPONENT-844;Lo;0;L;;;;;N;;;;;
+18DCC;TANGUT COMPONENT-845;Lo;0;L;;;;;N;;;;;
+18DCD;TANGUT COMPONENT-846;Lo;0;L;;;;;N;;;;;
+18DCE;TANGUT COMPONENT-847;Lo;0;L;;;;;N;;;;;
+18DCF;TANGUT COMPONENT-848;Lo;0;L;;;;;N;;;;;
+18DD0;TANGUT COMPONENT-849;Lo;0;L;;;;;N;;;;;
+18DD1;TANGUT COMPONENT-850;Lo;0;L;;;;;N;;;;;
+18DD2;TANGUT COMPONENT-851;Lo;0;L;;;;;N;;;;;
+18DD3;TANGUT COMPONENT-852;Lo;0;L;;;;;N;;;;;
+18DD4;TANGUT COMPONENT-853;Lo;0;L;;;;;N;;;;;
+18DD5;TANGUT COMPONENT-854;Lo;0;L;;;;;N;;;;;
+18DD6;TANGUT COMPONENT-855;Lo;0;L;;;;;N;;;;;
+18DD7;TANGUT COMPONENT-856;Lo;0;L;;;;;N;;;;;
+18DD8;TANGUT COMPONENT-857;Lo;0;L;;;;;N;;;;;
+18DD9;TANGUT COMPONENT-858;Lo;0;L;;;;;N;;;;;
+18DDA;TANGUT COMPONENT-859;Lo;0;L;;;;;N;;;;;
+18DDB;TANGUT COMPONENT-860;Lo;0;L;;;;;N;;;;;
+18DDC;TANGUT COMPONENT-861;Lo;0;L;;;;;N;;;;;
+18DDD;TANGUT COMPONENT-862;Lo;0;L;;;;;N;;;;;
+18DDE;TANGUT COMPONENT-863;Lo;0;L;;;;;N;;;;;
+18DDF;TANGUT COMPONENT-864;Lo;0;L;;;;;N;;;;;
+18DE0;TANGUT COMPONENT-865;Lo;0;L;;;;;N;;;;;
+18DE1;TANGUT COMPONENT-866;Lo;0;L;;;;;N;;;;;
+18DE2;TANGUT COMPONENT-867;Lo;0;L;;;;;N;;;;;
+18DE3;TANGUT COMPONENT-868;Lo;0;L;;;;;N;;;;;
+18DE4;TANGUT COMPONENT-869;Lo;0;L;;;;;N;;;;;
+18DE5;TANGUT COMPONENT-870;Lo;0;L;;;;;N;;;;;
+18DE6;TANGUT COMPONENT-871;Lo;0;L;;;;;N;;;;;
+18DE7;TANGUT COMPONENT-872;Lo;0;L;;;;;N;;;;;
+18DE8;TANGUT COMPONENT-873;Lo;0;L;;;;;N;;;;;
+18DE9;TANGUT COMPONENT-874;Lo;0;L;;;;;N;;;;;
+18DEA;TANGUT COMPONENT-875;Lo;0;L;;;;;N;;;;;
+18DEB;TANGUT COMPONENT-876;Lo;0;L;;;;;N;;;;;
+18DEC;TANGUT COMPONENT-877;Lo;0;L;;;;;N;;;;;
+18DED;TANGUT COMPONENT-878;Lo;0;L;;;;;N;;;;;
+18DEE;TANGUT COMPONENT-879;Lo;0;L;;;;;N;;;;;
+18DEF;TANGUT COMPONENT-880;Lo;0;L;;;;;N;;;;;
+18DF0;TANGUT COMPONENT-881;Lo;0;L;;;;;N;;;;;
+18DF1;TANGUT COMPONENT-882;Lo;0;L;;;;;N;;;;;
+18DF2;TANGUT COMPONENT-883;Lo;0;L;;;;;N;;;;;
 1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;;
 1AFF1;KATAKANA LETTER MINNAN TONE-3;Lm;0;L;;;;;N;;;;;
 1AFF2;KATAKANA LETTER MINNAN TONE-4;Lm;0;L;;;;;N;;;;;
@@ -32629,6 +32963,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1CCF7;OUTLINED DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
 1CCF8;OUTLINED DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
 1CCF9;OUTLINED DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1CCFA;SNAKE SYMBOL;So;0;ON;;;;;N;;;;;
+1CCFB;FLYING SAUCER SYMBOL;So;0;ON;;;;;N;;;;;
+1CCFC;NOSE SYMBOL;So;0;ON;;;;;N;;;;;
 1CD00;BLOCK OCTANT-3;So;0;ON;;;;;N;;;;;
 1CD01;BLOCK OCTANT-23;So;0;ON;;;;;N;;;;;
 1CD02;BLOCK OCTANT-123;So;0;ON;;;;;N;;;;;
@@ -33065,6 +33402,46 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1CEB1;KEYHOLE;So;0;ON;;;;;N;;;;;
 1CEB2;OLD PERSONAL COMPUTER WITH MONITOR IN PORTRAIT ORIENTATION;So;0;ON;;;;;N;;;;;
 1CEB3;BLACK RIGHT TRIANGLE CARET;So;0;ON;;;;;N;;;;;
+1CEBA;FRAGILE SYMBOL;So;0;ON;;;;;N;;;;;
+1CEBB;OFFICE BUILDING SYMBOL;So;0;ON;;;;;N;;;;;
+1CEBC;TREE SYMBOL;So;0;ON;;;;;N;;;;;
+1CEBD;APPLE SYMBOL;So;0;ON;;;;;N;;;;;
+1CEBE;CHERRY SYMBOL;So;0;ON;;;;;N;;;;;
+1CEBF;STRAWBERRY SYMBOL;So;0;ON;;;;;N;;;;;
+1CEC0;HEBE;So;0;ON;;;;;N;;;;;
+1CEC1;IRIS;So;0;ON;;;;;N;;;;;
+1CEC2;FLORA;So;0;ON;;;;;N;;;;;
+1CEC3;METIS;So;0;ON;;;;;N;;;;;
+1CEC4;PARTHENOPE;So;0;ON;;;;;N;;;;;
+1CEC5;VICTORIA;So;0;ON;;;;;N;;;;;
+1CEC6;EGERIA;So;0;ON;;;;;N;;;;;
+1CEC7;IRENE;So;0;ON;;;;;N;;;;;
+1CEC8;EUNOMIA;So;0;ON;;;;;N;;;;;
+1CEC9;PSYCHE;So;0;ON;;;;;N;;;;;
+1CECA;THETIS;So;0;ON;;;;;N;;;;;
+1CECB;MELPOMENE;So;0;ON;;;;;N;;;;;
+1CECC;FORTUNA;So;0;ON;;;;;N;;;;;
+1CECD;ASTRONOMICAL SYMBOL FOR ASTEROID PROSERPINA;So;0;ON;;;;;N;;;;;
+1CECE;BELLONA;So;0;ON;;;;;N;;;;;
+1CECF;AMPHITRITE;So;0;ON;;;;;N;;;;;
+1CED0;LEUKOTHEA;So;0;ON;;;;;N;;;;;
+1CEE0;GEOMANTIC FIGURE POPULUS;So;0;ON;;;;;N;;;;;
+1CEE1;GEOMANTIC FIGURE TRISTITIA;So;0;ON;;;;;N;;;;;
+1CEE2;GEOMANTIC FIGURE ALBUS;So;0;ON;;;;;N;;;;;
+1CEE3;GEOMANTIC FIGURE FORTUNA MAJOR;So;0;ON;;;;;N;;;;;
+1CEE4;GEOMANTIC FIGURE RUBEUS;So;0;ON;;;;;N;;;;;
+1CEE5;GEOMANTIC FIGURE ACQUISITIO;So;0;ON;;;;;N;;;;;
+1CEE6;GEOMANTIC FIGURE CONJUNCTIO;So;0;ON;;;;;N;;;;;
+1CEE7;GEOMANTIC FIGURE CAPUT DRACONIS;So;0;ON;;;;;N;;;;;
+1CEE8;GEOMANTIC FIGURE LAETITIA;So;0;ON;;;;;N;;;;;
+1CEE9;GEOMANTIC FIGURE CARCER;So;0;ON;;;;;N;;;;;
+1CEEA;GEOMANTIC FIGURE AMISSIO;So;0;ON;;;;;N;;;;;
+1CEEB;GEOMANTIC FIGURE PUELLA;So;0;ON;;;;;N;;;;;
+1CEEC;GEOMANTIC FIGURE FORTUNA MINOR;So;0;ON;;;;;N;;;;;
+1CEED;GEOMANTIC FIGURE PUER;So;0;ON;;;;;N;;;;;
+1CEEE;GEOMANTIC FIGURE CAUDA DRACONIS;So;0;ON;;;;;N;;;;;
+1CEEF;GEOMANTIC FIGURE VIA;So;0;ON;;;;;N;;;;;
+1CEF0;MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;;
 1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;;
 1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;;
 1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;;
@@ -36004,6 +36381,61 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1E5F9;OL ONAL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 1E5FA;OL ONAL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 1E5FF;OL ONAL ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+1E6C0;TAI YO LETTER LOW KO;Lo;0;L;;;;;N;;;;;
+1E6C1;TAI YO LETTER HIGH KO;Lo;0;L;;;;;N;;;;;
+1E6C2;TAI YO LETTER LOW KHO;Lo;0;L;;;;;N;;;;;
+1E6C3;TAI YO LETTER HIGH KHO;Lo;0;L;;;;;N;;;;;
+1E6C4;TAI YO LETTER GO;Lo;0;L;;;;;N;;;;;
+1E6C5;TAI YO LETTER NGO;Lo;0;L;;;;;N;;;;;
+1E6C6;TAI YO LETTER CO;Lo;0;L;;;;;N;;;;;
+1E6C7;TAI YO LETTER LOW XO;Lo;0;L;;;;;N;;;;;
+1E6C8;TAI YO LETTER HIGH XO;Lo;0;L;;;;;N;;;;;
+1E6C9;TAI YO LETTER LOW NYO;Lo;0;L;;;;;N;;;;;
+1E6CA;TAI YO LETTER HIGH NYO;Lo;0;L;;;;;N;;;;;
+1E6CB;TAI YO LETTER DO;Lo;0;L;;;;;N;;;;;
+1E6CC;TAI YO LETTER LOW TO;Lo;0;L;;;;;N;;;;;
+1E6CD;TAI YO LETTER HIGH TO;Lo;0;L;;;;;N;;;;;
+1E6CE;TAI YO LETTER THO;Lo;0;L;;;;;N;;;;;
+1E6CF;TAI YO LETTER NO;Lo;0;L;;;;;N;;;;;
+1E6D0;TAI YO LETTER BO;Lo;0;L;;;;;N;;;;;
+1E6D1;TAI YO LETTER LOW PO;Lo;0;L;;;;;N;;;;;
+1E6D2;TAI YO LETTER HIGH PO;Lo;0;L;;;;;N;;;;;
+1E6D3;TAI YO LETTER PHO;Lo;0;L;;;;;N;;;;;
+1E6D4;TAI YO LETTER LOW FO;Lo;0;L;;;;;N;;;;;
+1E6D5;TAI YO LETTER HIGH FO;Lo;0;L;;;;;N;;;;;
+1E6D6;TAI YO LETTER MO;Lo;0;L;;;;;N;;;;;
+1E6D7;TAI YO LETTER YO;Lo;0;L;;;;;N;;;;;
+1E6D8;TAI YO LETTER LO;Lo;0;L;;;;;N;;;;;
+1E6D9;TAI YO LETTER VO;Lo;0;L;;;;;N;;;;;
+1E6DA;TAI YO LETTER LOW HO;Lo;0;L;;;;;N;;;;;
+1E6DB;TAI YO LETTER HIGH HO;Lo;0;L;;;;;N;;;;;
+1E6DC;TAI YO LETTER QO;Lo;0;L;;;;;N;;;;;
+1E6DD;TAI YO LETTER LOW KVO;Lo;0;L;;;;;N;;;;;
+1E6DE;TAI YO LETTER HIGH KVO;Lo;0;L;;;;;N;;;;;
+1E6E0;TAI YO LETTER AA;Lo;0;L;;;;;N;;;;;
+1E6E1;TAI YO LETTER I;Lo;0;L;;;;;N;;;;;
+1E6E2;TAI YO LETTER UE;Lo;0;L;;;;;N;;;;;
+1E6E3;TAI YO SIGN UE;Mn;230;NSM;;;;;N;;;;;
+1E6E4;TAI YO LETTER U;Lo;0;L;;;;;N;;;;;
+1E6E5;TAI YO LETTER AE;Lo;0;L;;;;;N;;;;;
+1E6E6;TAI YO SIGN AU;Mn;230;NSM;;;;;N;;;;;
+1E6E7;TAI YO LETTER O;Lo;0;L;;;;;N;;;;;
+1E6E8;TAI YO LETTER E;Lo;0;L;;;;;N;;;;;
+1E6E9;TAI YO LETTER IA;Lo;0;L;;;;;N;;;;;
+1E6EA;TAI YO LETTER UEA;Lo;0;L;;;;;N;;;;;
+1E6EB;TAI YO LETTER UA;Lo;0;L;;;;;N;;;;;
+1E6EC;TAI YO LETTER OO;Lo;0;L;;;;;N;;;;;
+1E6ED;TAI YO LETTER AUE;Lo;0;L;;;;;N;;;;;
+1E6EE;TAI YO SIGN AY;Mn;230;NSM;;;;;N;;;;;
+1E6EF;TAI YO SIGN ANG;Mn;230;NSM;;;;;N;;;;;
+1E6F0;TAI YO LETTER AN;Lo;0;L;;;;;N;;;;;
+1E6F1;TAI YO LETTER AM;Lo;0;L;;;;;N;;;;;
+1E6F2;TAI YO LETTER AK;Lo;0;L;;;;;N;;;;;
+1E6F3;TAI YO LETTER AT;Lo;0;L;;;;;N;;;;;
+1E6F4;TAI YO LETTER AP;Lo;0;L;;;;;N;;;;;
+1E6F5;TAI YO SIGN OM;Mn;230;NSM;;;;;N;;;;;
+1E6FE;TAI YO SYMBOL MUEANG;Lo;0;L;;;;;N;;;;;
+1E6FF;TAI YO XAM LAI;Lm;0;L;;;;;N;;;;;
 1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;;
 1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;;
 1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;;
@@ -38079,6 +38511,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;;
 1F6D6;HUT;So;0;ON;;;;;N;;;;;
 1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;;
+1F6D8;LANDSLIDE;So;0;ON;;;;;N;;;;;
 1F6DC;WIRELESS;So;0;ON;;;;;N;;;;;
 1F6DD;PLAYGROUND SLIDE;So;0;ON;;;;;N;;;;;
 1F6DE;WHEEL;So;0;ON;;;;;N;;;;;
@@ -38228,6 +38661,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F774;LOT OF FORTUNE;So;0;ON;;;;;N;;;;;
 1F775;OCCULTATION;So;0;ON;;;;;N;;;;;
 1F776;LUNAR ECLIPSE;So;0;ON;;;;;N;;;;;
+1F777;VESTA FORM TWO;So;0;ON;;;;;N;;;;;
+1F778;ASTRAEA FORM TWO;So;0;ON;;;;;N;;;;;
+1F779;HYGIEA FORM TWO;So;0;ON;;;;;N;;;;;
+1F77A;PARTHENOPE FORM TWO;So;0;ON;;;;;N;;;;;
 1F77B;HAUMEA;So;0;ON;;;;;N;;;;;
 1F77C;MAKEMAKE;So;0;ON;;;;;N;;;;;
 1F77D;GONGGONG;So;0;ON;;;;;N;;;;;
@@ -38498,6 +38935,15 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F8BB;SOUTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;;
 1F8C0;LEFTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;;
 1F8C1;RIGHTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;;
+1F8D0;LONG RIGHTWARDS ARROW OVER LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+1F8D1;LONG RIGHTWARDS HARPOON OVER LONG LEFTWARDS HARPOON;Sm;0;ON;;;;;N;;;;;
+1F8D2;LONG RIGHTWARDS HARPOON ABOVE SHORT LEFTWARDS HARPOON;Sm;0;ON;;;;;N;;;;;
+1F8D3;SHORT RIGHTWARDS HARPOON ABOVE LONG LEFTWARDS HARPOON;Sm;0;ON;;;;;N;;;;;
+1F8D4;LONG LEFTWARDS HARPOON ABOVE SHORT RIGHTWARDS HARPOON;Sm;0;ON;;;;;N;;;;;
+1F8D5;SHORT LEFTWARDS HARPOON ABOVE LONG RIGHTWARDS HARPOON;Sm;0;ON;;;;;N;;;;;
+1F8D6;LONG RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+1F8D7;LONG RIGHTWARDS ARROW WITH DOUBLE SLASH;Sm;0;ON;;;;;N;;;;;
+1F8D8;LONG LEFT RIGHT ARROW WITH DEPENDENT LOBE;Sm;0;ON;;;;;N;;;;;
 1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
 1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
 1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;;
@@ -38838,6 +39284,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FA51;BLACK CHESS KNIGHT-QUEEN;So;0;ON;;;;;N;;;;;
 1FA52;BLACK CHESS KNIGHT-ROOK;So;0;ON;;;;;N;;;;;
 1FA53;BLACK CHESS KNIGHT-BISHOP;So;0;ON;;;;;N;;;;;
+1FA54;WHITE CHESS FERZ;So;0;ON;;;;;N;;;;;
+1FA55;WHITE CHESS ALFIL;So;0;ON;;;;;N;;;;;
+1FA56;BLACK CHESS FERZ;So;0;ON;;;;;N;;;;;
+1FA57;BLACK CHESS ALFIL;So;0;ON;;;;;N;;;;;
 1FA60;XIANGQI RED GENERAL;So;0;ON;;;;;N;;;;;
 1FA61;XIANGQI RED MANDARIN;So;0;ON;;;;;N;;;;;
 1FA62;XIANGQI RED ELEPHANT;So;0;ON;;;;;N;;;;;
@@ -38875,6 +39325,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FA87;MARACAS;So;0;ON;;;;;N;;;;;
 1FA88;FLUTE;So;0;ON;;;;;N;;;;;
 1FA89;HARP;So;0;ON;;;;;N;;;;;
+1FA8A;TROMBONE;So;0;ON;;;;;N;;;;;
+1FA8E;TREASURE CHEST;So;0;ON;;;;;N;;;;;
 1FA8F;SHOVEL;So;0;ON;;;;;N;;;;;
 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;;
 1FA91;CHAIR;So;0;ON;;;;;N;;;;;
@@ -38931,6 +39383,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;;
 1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;;
 1FAC6;FINGERPRINT;So;0;ON;;;;;N;;;;;
+1FAC8;HAIRY CREATURE;So;0;ON;;;;;N;;;;;
+1FACD;ORCA;So;0;ON;;;;;N;;;;;
 1FACE;MOOSE;So;0;ON;;;;;N;;;;;
 1FACF;DONKEY;So;0;ON;;;;;N;;;;;
 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;;
@@ -38957,6 +39411,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAE7;BUBBLES;So;0;ON;;;;;N;;;;;
 1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;;
 1FAE9;FACE WITH BAGS UNDER EYES;So;0;ON;;;;;N;;;;;
+1FAEA;DISTORTED FACE;So;0;ON;;;;;N;;;;;
+1FAEF;FIGHT CLOUD;So;0;ON;;;;;N;;;;;
 1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;;
 1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;;
 1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;;
@@ -39215,14 +39671,15 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FBF7;SEGMENTED DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
 1FBF8;SEGMENTED DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
 1FBF9;SEGMENTED DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1FBFA;ALARM BELL SYMBOL;So;0;ON;;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6DF;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
 2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
-2B739;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
+2B73F;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
 2B740;<CJK Ideograph Extension D, First>;Lo;0;L;;;;;N;;;;;
 2B81D;<CJK Ideograph Extension D, Last>;Lo;0;L;;;;;N;;;;;
 2B820;<CJK Ideograph Extension E, First>;Lo;0;L;;;;;N;;;;;
-2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
+2CEAD;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
 2CEB0;<CJK Ideograph Extension F, First>;Lo;0;L;;;;;N;;;;;
 2EBE0;<CJK Ideograph Extension F, Last>;Lo;0;L;;;;;N;;;;;
 2EBF0;<CJK Ideograph Extension I, First>;Lo;0;L;;;;;N;;;;;
@@ -39773,6 +40230,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 3134A;<CJK Ideograph Extension G, Last>;Lo;0;L;;;;;N;;;;;
 31350;<CJK Ideograph Extension H, First>;Lo;0;L;;;;;N;;;;;
 323AF;<CJK Ideograph Extension H, Last>;Lo;0;L;;;;;N;;;;;
+323B0;<CJK Ideograph Extension J, First>;Lo;0;L;;;;;N;;;;;
+33479;<CJK Ideograph Extension J, Last>;Lo;0;L;;;;;N;;;;;
 E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;;
 E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;;
 E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;;
diff --git a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
index a4b7b6fbc3c..19b13571f34 100644
--- a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
+++ b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakProperty-16.0.0.txt
-# Date: 2024-05-31, 18:09:38 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# GraphemeBreakProperty-17.0.0.txt
+# Date: 2025-06-30, 06:20:23 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -30,12 +30,11 @@
 113D1         ; Prepend # Lo       TULU-TIGALARI REPHA
 1193F         ; Prepend # Lo       DIVES AKURU PREFIXED NASAL SIGN
 11941         ; Prepend # Lo       DIVES AKURU INITIAL RA
-11A3A         ; Prepend # Lo       ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA
 11A84..11A89  ; Prepend # Lo   [6] SOYOMBO SIGN JIHVAMULIYA..SOYOMBO CLUSTER-INITIAL LETTER SA
 11D46         ; Prepend # Lo       MASARAM GONDI REPHA
 11F02         ; Prepend # Lo       KAWI SIGN REPHA
 
-# Total code points: 28
+# Total code points: 27
 
 # ================================================
 
@@ -243,7 +242,8 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 1A7F          ; Extend # Mn       TAI THAM COMBINING CRYPTOGRAMMIC DOT
 1AB0..1ABD    ; Extend # Mn  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
 1ABE          ; Extend # Me       COMBINING PARENTHESES OVERLAY
-1ABF..1ACE    ; Extend # Mn  [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T
+1ABF..1ADD    ; Extend # Mn  [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW
+1AE0..1AEB    ; Extend # Mn  [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
 1B00..1B03    ; Extend # Mn   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
 1B34          ; Extend # Mn       BALINESE SIGN REREKAN
 1B35          ; Extend # Mc       BALINESE VOWEL SIGN TEDUNG
@@ -339,7 +339,7 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 10D24..10D27  ; Extend # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
 10D69..10D6D  ; Extend # Mn   [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK
 10EAB..10EAC  ; Extend # Mn   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
-10EFC..10EFF  ; Extend # Mn   [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA
+10EFA..10EFF  ; Extend # Mn   [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA
 10F46..10F50  ; Extend # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 10F82..10F85  ; Extend # Mn   [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW
 11001         ; Extend # Mn       BRAHMI SIGN ANUSVARA
@@ -430,6 +430,9 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 11A59..11A5B  ; Extend # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
 11A8A..11A96  ; Extend # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
 11A98..11A99  ; Extend # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
+11B60         ; Extend # Mn       SHARADA VOWEL SIGN OE
+11B62..11B64  ; Extend # Mn   [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E
+11B66         ; Extend # Mn       SHARADA VOWEL SIGN CANDRA E
 11C30..11C36  ; Extend # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; Extend # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
 11C3F         ; Extend # Mn       BHAIKSUKI SIGN VIRAMA
@@ -489,13 +492,17 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 1E2EC..1E2EF  ; Extend # Mn   [4] WANCHO TONE TUP..WANCHO TONE KOINI
 1E4EC..1E4EF  ; Extend # Mn   [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH
 1E5EE..1E5EF  ; Extend # Mn   [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR
+1E6E3         ; Extend # Mn       TAI YO SIGN UE
+1E6E6         ; Extend # Mn       TAI YO SIGN AU
+1E6EE..1E6EF  ; Extend # Mn   [2] TAI YO SIGN AY..TAI YO SIGN ANG
+1E6F5         ; Extend # Mn       TAI YO SIGN OM
 1E8D0..1E8D6  ; Extend # Mn   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
 1E944..1E94A  ; Extend # Mn   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
 1F3FB..1F3FF  ; Extend # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
 E0020..E007F  ; Extend # Cf  [96] TAG SPACE..CANCEL TAG
 E0100..E01EF  ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 2198
+# Total code points: 2237
 
 # ================================================
 
@@ -646,6 +653,9 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 11A39         ; SpacingMark # Mc       ZANABAZAR SQUARE SIGN VISARGA
 11A57..11A58  ; SpacingMark # Mc   [2] SOYOMBO VOWEL SIGN AI..SOYOMBO VOWEL SIGN AU
 11A97         ; SpacingMark # Mc       SOYOMBO SIGN VISARGA
+11B61         ; SpacingMark # Mc       SHARADA VOWEL SIGN OOE
+11B65         ; SpacingMark # Mc       SHARADA VOWEL SIGN SHORT O
+11B67         ; SpacingMark # Mc       SHARADA VOWEL SIGN CANDRA O
 11C2F         ; SpacingMark # Mc       BHAIKSUKI VOWEL SIGN AA
 11C3E         ; SpacingMark # Mc       BHAIKSUKI SIGN VISARGA
 11CA9         ; SpacingMark # Mc       MARCHEN SUBJOINED LETTER YA
@@ -661,7 +671,7 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 1612A..1612C  ; SpacingMark # Mc   [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA
 16F51..16F87  ; SpacingMark # Mc  [55] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN UI
 
-# Total code points: 378
+# Total code points: 381
 
 # ================================================
 
diff --git a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
index 3eb4b307e8e..e1215547c58 100644
--- a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
+++ b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakTest-16.0.0.txt
-# Date: 2024-05-02, 15:02:48 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# GraphemeBreakTest-17.0.0.txt
+# Date: 2025-03-24, 14:45:55 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
@@ -16,1106 +16,781 @@
 #	× wherever there is not.
 #  <comment> the format can change, but currently it shows:
 #	- the sample character name
-#	- (x) the Grapheme_Cluster_Break property value for the sample character
+#	- (x) the Grapheme_Cluster_Break property value for the sample character and 
+#	  any other properties relevant to the algorithm, as described in 
+#	  GraphemeBreakTest.html
 #	- [x] the rule that determines whether there is a break or not,
 #	   as listed in the Rules section of GraphemeBreakTest.html
 #
 # These samples may be extended or changed in the future.
 #
-÷ 0020 ÷ 0020 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0020 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0020 ÷ 000D ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0020 × 0308 ÷ 000D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0020 ÷ 000A ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0020 × 0308 ÷ 000A ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0020 ÷ 0001 ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0001 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0020 × 200C ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0020 × 0308 × 200C ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0020 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0020 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0020 × 0A03 ÷	#  ÷ [0.2] SPACE (Other) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0020 × 0308 × 0A03 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0020 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0020 ÷ 1160 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1160 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0020 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0020 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0020 ÷ AC00 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0020 × 0308 ÷ AC00 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0020 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0020 × 0308 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0020 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0020 × 0308 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0020 ÷ 0904 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0904 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0020 ÷ 0D4E ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0020 ÷ 0915 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0915 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0020 ÷ 231A ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0020 × 0308 ÷ 231A ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0020 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 0308 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 0900 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 0308 × 0900 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 094D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 0308 × 094D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0020 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000D ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 000D ÷ 000D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 000D × 000A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) × [3.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 000D ÷ 0001 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000D ÷ 200C ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 000D ÷ 0308 × 200C ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 000D ÷ 0000 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <NULL> (Control) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0000 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 000D ÷ 094D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 000D ÷ 0308 × 094D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 000D ÷ 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 000D ÷ 0308 × 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 000D ÷ 200C ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 000D ÷ 0308 × 200C ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 000D ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000D ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000D ÷ 0A03 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 000D ÷ 0308 × 0A03 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 000D ÷ 06DD ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 06DD ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 000D ÷ 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000D ÷ 0308 × 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 000D ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000D ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 000D ÷ 11A8 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 000D ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 000D ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000D ÷ 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000D ÷ 0308 × 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000D ÷ 0904 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0904 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 000D ÷ 0D4E ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0D4E ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000D ÷ 0915 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 000D ÷ 231A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 000D ÷ 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 0308 × 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 0900 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 0308 × 0900 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 094D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 0308 × 094D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 000D ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000A ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 000D ÷ 0915 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 000D ÷ 00A9 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 00A9 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 000D ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000D ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ 000A ÷ 000D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 000A ÷ 000A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 000A ÷ 0001 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000A ÷ 200C ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 000A ÷ 0308 × 200C ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 000A ÷ 0000 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <NULL> (Control) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0000 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 000A ÷ 094D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 000A ÷ 0308 × 094D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 000A ÷ 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 000A ÷ 0308 × 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 000A ÷ 200C ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 000A ÷ 0308 × 200C ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 000A ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000A ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000A ÷ 0A03 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 000A ÷ 0308 × 0A03 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 000A ÷ 06DD ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 06DD ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 000A ÷ 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000A ÷ 0308 × 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 000A ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000A ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 000A ÷ 11A8 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 000A ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 000A ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000A ÷ 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000A ÷ 0308 × 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000A ÷ 0904 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0904 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 000A ÷ 0D4E ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0D4E ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 000A ÷ 0915 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 000A ÷ 231A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 000A ÷ 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 0308 × 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 0900 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 0308 × 0900 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 094D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 0308 × 094D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 000A ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0001 ÷ 0020 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0001 ÷ 000D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0001 ÷ 000A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0001 ÷ 0001 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0001 ÷ 200C ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0001 ÷ 0308 × 200C ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0001 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0001 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0001 ÷ 0A03 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0A03 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0001 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0001 ÷ 1160 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0001 ÷ 11A8 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0001 ÷ AC00 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0001 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0001 ÷ 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0001 ÷ 0904 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0904 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0001 ÷ 0D4E ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0D4E ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0001 ÷ 0915 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0001 ÷ 231A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0001 ÷ 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 0900 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0900 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 094D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 0308 × 094D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 0308 × 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0001 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 200C ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 200C × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 200C ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 200C × 0308 ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 200C ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 200C × 0308 ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 200C ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 200C × 0308 ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 200C × 200C ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 200C × 0308 × 200C ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 200C ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 200C × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 200C ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200C × 0308 ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200C × 0A03 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200C × 0308 × 0A03 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200C ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 200C × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 200C ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 200C × 0308 ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 200C ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 200C × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 200C ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 200C × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 200C ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 200C × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 200C × 0903 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200C × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200C ÷ 0904 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 200C × 0308 ÷ 0904 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 200C ÷ 0D4E ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200C × 0308 ÷ 0D4E ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200C ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 200C × 0308 ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 200C ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 200C × 0308 ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 200C × 0300 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 200C × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 200C × 0900 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 200C × 0308 × 0900 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 200C × 094D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 200C × 0308 × 094D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 200C × 200D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 200C × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 200C ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 200C × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F1E6 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 000A ÷ 0915 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 000A ÷ 00A9 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 00A9 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 000A ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000A ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0000 ÷ 000D ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0000 ÷ 000A ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0000 ÷ 0000 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] <NULL> (Control) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 0000 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0000 ÷ 094D ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0000 ÷ 0308 × 094D ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0000 ÷ 0300 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0000 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0000 ÷ 200C ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0000 ÷ 0308 × 200C ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0000 ÷ 200D ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0000 ÷ 0308 × 200D ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0000 ÷ 1F1E6 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0000 ÷ 06DD ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 06DD ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0000 ÷ 0903 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0000 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0000 ÷ 1100 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0000 ÷ 1160 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0000 ÷ 11A8 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0000 ÷ AC00 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0000 ÷ AC01 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0000 ÷ 0915 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 0915 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0000 ÷ 00A9 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 00A9 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0000 ÷ 0020 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0000 ÷ 0378 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0000 ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <NULL> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 094D ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 094D × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 094D ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 094D × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 094D ÷ 0000 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 094D × 0308 ÷ 0000 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 094D × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 094D × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 094D × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 094D × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 094D × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 094D × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 094D × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 094D × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 094D ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 094D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 094D ÷ 06DD ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 094D × 0308 ÷ 06DD ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 094D × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 094D × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 094D ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 094D × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 094D ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 094D × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 094D ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 094D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 094D ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 094D × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 094D ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 094D × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 094D ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 094D × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 094D ÷ 00A9 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 094D × 0308 ÷ 00A9 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 094D ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 094D × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 094D ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 094D × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0300 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0300 × 0308 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0300 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0300 × 0308 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0300 ÷ 0000 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0000 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0300 × 094D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0300 × 0308 × 094D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0300 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0300 × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0300 × 200C ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0300 × 0308 × 200C ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0300 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0300 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0300 ÷ 06DD ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0300 × 0308 ÷ 06DD ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0300 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0300 × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0300 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0300 × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0300 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0300 × 0308 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0300 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0300 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0300 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0300 × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0300 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0300 × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0300 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0300 ÷ 00A9 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0300 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0300 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200C ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 200C × 0308 ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 200C ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 200C × 0308 ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 200C ÷ 0000 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 200C × 0308 ÷ 0000 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 200C × 094D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 200C × 0308 × 094D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 200C × 0300 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 200C × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 200C × 200C ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 200C × 0308 × 200C ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 200C × 200D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 200C × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 200C ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 200C × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 200C ÷ 06DD ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 200C × 0308 ÷ 06DD ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 200C × 0903 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200C × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200C ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 200C × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 200C ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 200C × 0308 ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 200C ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 200C × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 200C ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 200C × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 200C ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200C × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200C ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 200C × 0308 ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 200C ÷ 00A9 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 200C × 0308 ÷ 00A9 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 200C ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200C × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200C ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200C × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200D ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 200D × 0308 ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 200D ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 200D × 0308 ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 200D ÷ 0000 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 200D × 0308 ÷ 0000 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 200D × 094D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 200D × 0308 × 094D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 200D × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 200D × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 200D × 200C ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 200D × 0308 × 200C ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 200D ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 200D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 200D ÷ 06DD ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 200D × 0308 ÷ 06DD ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 200D × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200D × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200D ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 200D × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 200D ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 200D × 0308 ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 200D ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 200D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 200D ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 200D × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 200D ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200D × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200D ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 200D × 0308 ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 200D ÷ 00A9 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 200D × 0308 ÷ 00A9 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 200D ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200D × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 200D × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ 1F1E6 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 1F1E6 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F1E6 ÷ 0001 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0001 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F1E6 × 200C ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 1F1E6 × 0308 × 200C ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1F1E6 ÷ 0000 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0000 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 1F1E6 × 094D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 1F1E6 × 0308 × 094D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 1F1E6 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1F1E6 × 200C ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 1F1E6 × 0308 × 200C ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F1E6 × 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F1E6 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F1E6 × 0A03 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0A03 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1F1E6 ÷ 06DD ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 06DD ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 1F1E6 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1F1E6 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1F1E6 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 1F1E6 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 1F1E6 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1F1E6 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F1E6 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1F1E6 ÷ 0904 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0904 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 1F1E6 ÷ 0D4E ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1F1E6 ÷ 0915 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0915 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 1F1E6 ÷ 231A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 231A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 1F1E6 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 0900 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0900 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 094D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 0308 × 094D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0600 × 0020 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] SPACE (Other) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0020 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0600 ÷ 000D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0600 × 0308 ÷ 000D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0600 ÷ 000A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0600 × 0308 ÷ 000A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0600 ÷ 0001 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0001 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0600 × 200C ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0600 × 0308 × 200C ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0600 × 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0600 × 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0600 × 0A03 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0600 × 0308 × 0A03 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0600 × 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0600 × 1160 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1160 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0600 × 11A8 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0600 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0600 × AC00 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0600 × 0308 ÷ AC00 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0600 × AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0600 × 0308 ÷ AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0600 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0600 × 0308 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0600 × 0904 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0904 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0600 × 0D4E ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0600 × 0915 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0915 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0600 × 231A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] WATCH (ExtPict) ÷ [0.3]
-÷ 0600 × 0308 ÷ 231A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0600 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 0308 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 0900 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 0308 × 0900 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 094D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 0308 × 094D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 0308 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0600 × 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] <reserved-0378> (Other) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0A03 ÷ 0020 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0020 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0A03 ÷ 000D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 000D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0A03 ÷ 000A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 000A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0A03 ÷ 0001 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0001 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0A03 × 200C ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0A03 × 0308 × 200C ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0A03 ÷ 1F1E6 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0A03 ÷ 0600 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0600 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0A03 × 0A03 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0A03 × 0308 × 0A03 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0A03 ÷ 1100 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 1100 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0A03 ÷ 1160 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 1160 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0A03 ÷ 11A8 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0A03 ÷ AC00 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0A03 × 0308 ÷ AC00 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0A03 ÷ AC01 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0A03 × 0308 ÷ AC01 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0A03 × 0903 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0A03 × 0308 × 0903 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0A03 ÷ 0904 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0904 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0A03 ÷ 0D4E ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0A03 ÷ 0915 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0915 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0A03 ÷ 231A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 231A ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0A03 × 0300 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 0308 × 0300 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 0900 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 0308 × 0900 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 094D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 0308 × 094D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 200D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0A03 × 0308 × 200D ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0A03 ÷ 0378 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0A03 × 0308 ÷ 0378 ÷	#  ÷ [0.2] GURMUKHI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1100 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1F1E6 ÷ 0915 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0915 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1F1E6 ÷ 00A9 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 1F1E6 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 06DD ÷ 000D ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 06DD × 0308 ÷ 000D ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 06DD ÷ 000A ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 06DD × 0308 ÷ 000A ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 06DD ÷ 0000 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 06DD × 0308 ÷ 0000 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 06DD × 094D ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 06DD × 0308 × 094D ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 06DD × 0300 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 06DD × 0308 × 0300 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 06DD × 200C ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 06DD × 0308 × 200C ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 06DD × 200D ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 06DD × 0308 × 200D ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 06DD × 1F1E6 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 06DD × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 06DD × 06DD ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 06DD × 0308 ÷ 06DD ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 06DD × 0903 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 06DD × 0308 × 0903 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 06DD × 1100 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 06DD × 0308 ÷ 1100 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 06DD × 1160 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 06DD × 0308 ÷ 1160 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 06DD × 11A8 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 06DD × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 06DD × AC00 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 06DD × 0308 ÷ AC00 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 06DD × AC01 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 06DD × 0308 ÷ AC01 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 06DD × 0915 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 06DD × 0308 ÷ 0915 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 06DD × 00A9 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 06DD × 0308 ÷ 00A9 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 06DD × 0020 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 06DD × 0308 ÷ 0020 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 06DD × 0378 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 06DD × 0308 ÷ 0378 ÷	#  ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0903 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0903 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0903 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0903 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0903 ÷ 0000 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0000 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0903 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0903 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0903 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0903 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0903 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0903 × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0903 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0903 ÷ 06DD ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0903 × 0308 ÷ 06DD ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0903 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0903 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0903 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0903 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0903 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0903 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0903 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0903 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0903 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0903 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0903 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0903 ÷ 00A9 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0903 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0903 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ 1100 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1100 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1100 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 1100 ÷ 000A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1100 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1100 ÷ 0001 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1100 × 200C ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 1100 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ 1100 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1100 ÷ 0000 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0000 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 1100 × 094D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 1100 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 1100 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1100 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1100 × 200C ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 1100 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1100 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1100 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1100 × 0A03 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1100 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1100 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1100 ÷ 06DD ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 1100 × 0308 ÷ 06DD ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 1100 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1100 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1100 × 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1100 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1100 × 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1100 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 1100 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1100 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1100 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 1100 × AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1100 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1100 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1100 × AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1100 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1100 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1100 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1100 ÷ 0904 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 1100 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1100 ÷ 0915 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 1100 ÷ 231A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 1100 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 1100 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 0900 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 094D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 1100 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1160 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1100 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1100 ÷ 0915 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1100 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 1100 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 1100 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1100 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ 1160 ÷ 000D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1160 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1160 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 1160 ÷ 000A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1160 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1160 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1160 × 200C ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 1160 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ 1160 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1160 ÷ 0000 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0000 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 1160 × 094D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 1160 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 1160 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1160 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1160 × 200C ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 1160 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1160 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1160 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1160 × 0A03 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1160 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1160 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1160 ÷ 06DD ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 1160 × 0308 ÷ 06DD ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 1160 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1160 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1160 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1160 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1160 × 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1160 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 1160 × 11A8 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1160 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1160 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 1160 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1160 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1160 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1160 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1160 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1160 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1160 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1160 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 1160 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 1160 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 1160 ÷ 231A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 1160 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 1160 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 0900 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 094D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 1160 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 11A8 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1160 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1160 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1160 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 1160 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 1160 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1160 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ 11A8 ÷ 000D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 11A8 ÷ 000A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 11A8 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 11A8 × 200C ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 11A8 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 11A8 ÷ 0000 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0000 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 11A8 × 094D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 11A8 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 11A8 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 11A8 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 11A8 × 200C ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 11A8 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 11A8 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 11A8 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 11A8 × 0A03 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 11A8 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 11A8 ÷ 06DD ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 06DD ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 11A8 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 11A8 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 11A8 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 11A8 × 11A8 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 11A8 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 11A8 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 11A8 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 11A8 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 11A8 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 11A8 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 11A8 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 11A8 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 11A8 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 11A8 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 11A8 ÷ 231A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 11A8 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 0900 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 094D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 11A8 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ AC00 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 11A8 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 11A8 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 11A8 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 11A8 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 11A8 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ AC00 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ AC00 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ AC00 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ AC00 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ AC00 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ AC00 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC00 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ AC00 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ AC00 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ AC00 ÷ 0000 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0000 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ AC00 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ AC00 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ AC00 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ AC00 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ AC00 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ AC00 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ AC00 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC00 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC00 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ AC00 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC00 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ AC00 ÷ 06DD ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ AC00 × 0308 ÷ 06DD ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ AC00 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC00 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ AC00 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ AC00 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC00 × 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ AC00 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ AC00 × 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ AC00 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ AC00 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ AC00 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ AC00 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ AC00 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ AC00 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC00 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC00 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC00 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC00 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ AC00 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC00 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ AC00 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ AC00 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ AC00 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ AC00 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ AC01 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ AC00 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ AC00 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ AC00 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ AC00 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ AC00 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ AC00 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ AC01 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ AC01 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ AC01 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ AC01 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ AC01 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ AC01 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC01 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ AC01 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
+÷ AC01 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ AC01 ÷ 0000 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0000 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ AC01 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ AC01 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ AC01 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ AC01 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ AC01 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ AC01 × 0308 × 200C ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ AC01 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC01 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC01 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ AC01 × 0308 × 0A03 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC01 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ AC01 ÷ 06DD ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ AC01 × 0308 ÷ 06DD ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ AC01 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC01 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ AC01 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ AC01 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC01 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ AC01 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ AC01 × 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ AC01 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ AC01 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ AC01 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ AC01 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ AC01 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ AC01 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC01 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC01 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC01 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC01 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0904 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ AC01 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ AC01 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ AC01 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ AC01 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ AC01 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 0308 × 0900 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 0308 × 094D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ AC01 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0903 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0903 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0903 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0903 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0903 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0903 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0903 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0903 × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0903 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0903 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0903 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0903 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0903 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0903 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0903 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0903 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0903 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0903 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0903 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0903 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0903 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0903 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0903 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0903 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0903 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0903 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0903 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0903 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0904 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0904 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0904 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0904 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0904 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0904 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0904 × 200C ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0904 × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0904 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0904 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0904 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0904 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0904 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0904 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0904 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0904 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0904 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0904 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0904 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0904 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0904 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0904 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0904 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0904 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0904 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0904 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0904 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0904 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0904 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0904 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0904 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0904 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0904 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0904 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0D4E × 0020 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] SPACE (Other) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0020 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0D4E ÷ 000D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 000D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0D4E ÷ 000A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 000A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0D4E ÷ 0001 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0001 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0D4E × 200C ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0D4E × 0308 × 200C ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0D4E × 1F1E6 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0D4E × 0600 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0600 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0D4E × 0A03 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0D4E × 0308 × 0A03 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0D4E × 1100 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 1100 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0D4E × 1160 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 1160 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0D4E × 11A8 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 11A8 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0D4E × AC00 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0D4E × 0308 ÷ AC00 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0D4E × AC01 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0D4E × 0308 ÷ AC01 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0D4E × 0903 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0D4E × 0308 × 0903 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0D4E × 0904 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0904 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0D4E × 0D4E ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0D4E ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0D4E × 0915 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0915 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0D4E × 231A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] WATCH (ExtPict) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 231A ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0D4E × 0300 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 0308 × 0300 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 0900 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 0308 × 0900 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 094D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 0308 × 094D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 200D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 0308 × 200D ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0D4E × 0378 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.2] <reserved-0378> (Other) ÷ [0.3]
-÷ 0D4E × 0308 ÷ 0378 ÷	#  ÷ [0.2] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0915 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0915 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0915 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0915 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0915 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0915 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0915 × 200C ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0915 × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0915 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0915 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0915 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0915 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0915 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0915 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0915 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0915 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0915 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0915 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0915 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0915 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0915 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0915 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0915 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0915 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0915 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0915 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0915 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0915 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0915 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0915 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0915 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0915 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0915 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 231A ÷ 0020 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 231A × 0308 ÷ 0020 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 231A ÷ 000D ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 231A × 0308 ÷ 000D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 231A ÷ 000A ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 231A × 0308 ÷ 000A ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 231A ÷ 0001 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 231A × 0308 ÷ 0001 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 231A × 200C ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 231A × 0308 × 200C ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 231A ÷ 1F1E6 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 231A × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 231A ÷ 0600 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 231A × 0308 ÷ 0600 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 231A × 0A03 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 231A × 0308 × 0A03 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 231A ÷ 1100 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 231A × 0308 ÷ 1100 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 231A ÷ 1160 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 231A × 0308 ÷ 1160 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 231A ÷ 11A8 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 231A × 0308 ÷ 11A8 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 231A ÷ AC00 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 231A × 0308 ÷ AC00 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 231A ÷ AC01 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 231A × 0308 ÷ AC01 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 231A × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 231A × 0308 × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 231A ÷ 0904 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 231A × 0308 ÷ 0904 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 231A ÷ 0D4E ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 231A × 0308 ÷ 0D4E ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 231A ÷ 0915 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 231A × 0308 ÷ 0915 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 231A ÷ 231A ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 231A × 0308 ÷ 231A ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 231A × 0300 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 231A × 0308 × 0300 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 231A × 0900 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 231A × 0308 × 0900 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 231A × 094D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 231A × 0308 × 094D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 231A × 200D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 231A × 0308 × 200D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 231A ÷ 0378 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 231A × 0308 ÷ 0378 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0300 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0300 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0300 × 0308 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0300 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0300 × 0308 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0300 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0300 × 200C ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0300 × 0308 × 200C ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0300 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0300 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0300 × 0A03 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0300 × 0308 × 0A03 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0300 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0300 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0300 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0300 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0300 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0300 × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0300 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0300 × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0300 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0300 × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0300 ÷ 0904 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0904 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0300 ÷ 0D4E ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0300 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0915 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0300 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0300 × 0308 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0300 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 0900 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 0308 × 0900 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 094D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 0308 × 094D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0900 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0900 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0900 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0900 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0900 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0900 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0900 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0900 × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0900 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0900 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0900 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0900 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0900 × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0900 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0900 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0900 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0900 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0900 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0900 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0900 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0900 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0900 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0900 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0900 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0900 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0900 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0900 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0900 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0900 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0900 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0900 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0900 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0900 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0900 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 094D ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 094D × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 094D ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 094D × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 094D ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 094D × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 094D ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 094D × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 094D × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 094D × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 094D ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 094D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 094D ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 094D × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 094D × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 094D × 0308 × 0A03 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 094D ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 094D × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 094D ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 094D × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 094D ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 094D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 094D ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 094D × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 094D ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 094D × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 094D × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 094D × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 094D ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 094D × 0308 ÷ 0904 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 094D ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 094D × 0308 ÷ 0D4E ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 094D ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 094D × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 094D ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 094D × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 094D × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 094D × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 094D × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 094D × 0308 × 0900 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 094D × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 094D × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 094D × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 094D × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 094D ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 094D × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 200D ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 200D × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 200D ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 200D × 0308 ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 200D ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 200D × 0308 ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 200D ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 200D × 0308 ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 200D × 200C ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 200D × 0308 × 200C ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 200D ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 200D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 200D ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200D × 0308 ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200D × 0A03 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200D × 0308 × 0A03 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200D ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 200D × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 200D ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 200D × 0308 ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 200D ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 200D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 200D ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 200D × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 200D ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 200D × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 200D × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200D × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200D ÷ 0904 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 200D × 0308 ÷ 0904 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 200D ÷ 0D4E ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200D × 0308 ÷ 0D4E ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 200D ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 200D × 0308 ÷ 0915 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 200D ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 200D × 0308 ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 200D × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 200D × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 200D × 0900 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 200D × 0308 × 0900 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 200D × 094D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 200D × 0308 × 094D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 200D × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0378 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0378 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0378 × 0308 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0378 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0378 × 0308 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0378 ÷ 0001 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0001 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0378 × 200C ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0378 × 0308 × 200C ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH NON-JOINER (Extend) ÷ [0.3]
-÷ 0378 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0378 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0378 × 0A03 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0378 × 0308 × 0A03 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] GURMUKHI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0378 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0378 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0378 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0378 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0378 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0378 × 0308 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0378 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0378 × 0308 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0378 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0378 × 0308 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0378 ÷ 0904 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0904 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER SHORT A (ConjunctLinkingScripts) ÷ [0.3]
-÷ 0378 ÷ 0D4E ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0D4E ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] MALAYALAM LETTER DOT REPH (Prepend_ConjunctLinkingScripts) ÷ [0.3]
-÷ 0378 ÷ 0915 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0915 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0378 ÷ 231A ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0378 × 0308 ÷ 231A ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
-÷ 0378 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 0308 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 0900 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 0308 × 0900 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN INVERTED CANDRABINDU (Extend_ConjunctLinkingScripts_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 094D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 0308 × 094D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0378 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000D × 000A ÷ 0061 ÷ 000A ÷ 0308 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) × [3.0] <LINE FEED (LF)> (LF) ÷ [4.0] LATIN SMALL LETTER A (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0061 × 0308 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [0.3]
-÷ 0020 × 200D ÷ 0646 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] ARABIC LETTER NOON (Other) ÷ [0.3]
-÷ 0646 × 200D ÷ 0020 ÷	#  ÷ [0.2] ARABIC LETTER NOON (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ AC01 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ AC01 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0915 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ AC01 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ AC01 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ AC01 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ AC01 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0915 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0915 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0915 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0915 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0915 ÷ 0000 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0000 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0915 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0915 × 0308 × 094D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0915 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0915 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0915 × 200C ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0915 × 0308 × 200C ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0915 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0915 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0915 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0915 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0915 ÷ 06DD ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0915 × 0308 ÷ 06DD ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0915 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0915 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0915 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0915 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0915 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0915 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0915 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0915 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0915 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0915 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0915 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0915 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0915 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0915 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0915 ÷ 00A9 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0915 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0915 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0915 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0915 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 00A9 ÷ 000D ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 000D ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 00A9 ÷ 000A ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 000A ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 00A9 ÷ 0000 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 0000 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 00A9 × 094D ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 00A9 × 0308 × 094D ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 00A9 × 0300 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 00A9 × 0308 × 0300 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 00A9 × 200C ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 00A9 × 0308 × 200C ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 00A9 × 200D ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 00A9 × 0308 × 200D ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 00A9 ÷ 1F1E6 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 00A9 ÷ 06DD ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 06DD ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 00A9 × 0903 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 00A9 × 0308 × 0903 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 00A9 ÷ 1100 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 1100 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 00A9 ÷ 1160 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 1160 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 00A9 ÷ 11A8 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 00A9 ÷ AC00 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 00A9 × 0308 ÷ AC00 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 00A9 ÷ AC01 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 00A9 × 0308 ÷ AC01 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 00A9 ÷ 0915 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 0915 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 00A9 ÷ 00A9 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 00A9 ÷ 0020 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 0020 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 00A9 ÷ 0378 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 00A9 × 0308 ÷ 0378 ÷	#  ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0020 ÷ 000D ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0020 × 0308 ÷ 000D ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0020 ÷ 000A ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0020 × 0308 ÷ 000A ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0020 ÷ 0000 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0000 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0020 × 094D ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0020 × 0308 × 094D ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0020 × 0300 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0020 × 0308 × 0300 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0020 × 200C ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0020 × 0308 × 200C ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0020 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0020 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0020 ÷ 06DD ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0020 × 0308 ÷ 06DD ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0020 × 0903 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0020 × 0308 × 0903 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0020 ÷ 1100 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0020 × 0308 ÷ 1100 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0020 ÷ 1160 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0020 × 0308 ÷ 1160 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0020 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0020 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0020 ÷ AC00 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0020 × 0308 ÷ AC00 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0020 ÷ AC01 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0020 × 0308 ÷ AC01 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0020 ÷ 0915 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0915 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0020 ÷ 00A9 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0020 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0020 ÷ 0020 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0020 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0020 ÷ 0378 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0378 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0378 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0378 × 0308 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0378 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0378 × 0308 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0378 ÷ 0000 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0000 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] <NULL> (Control) ÷ [0.3]
+÷ 0378 × 094D ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0378 × 0308 × 094D ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3]
+÷ 0378 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0378 × 0308 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0378 × 200C ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0378 × 0308 × 200C ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3]
+÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0378 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0378 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0378 ÷ 06DD ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0378 × 0308 ÷ 06DD ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3]
+÷ 0378 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0378 × 0308 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0378 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0378 × 0308 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0378 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0378 × 0308 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0378 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0378 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0378 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0378 × 0308 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0378 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0378 × 0308 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0378 ÷ 0915 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0915 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 0378 ÷ 00A9 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0378 × 0308 ÷ 00A9 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3]
+÷ 0378 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0378 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] <reserved-0378> (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 000D × 000A ÷ 0061 ÷ 000A ÷ 0308 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) × [3.0] <LINE FEED (LF)> (LF) ÷ [4.0] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0061 × 0308 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 0020 × 200D ÷ 0646 ÷	#  ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC LETTER NOON (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0646 × 200D ÷ 0020 ÷	#  ÷ [0.2] ARABIC LETTER NOON (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3]
 ÷ 1100 × 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC00 × 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC01 × 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 1F1E6 × 1F1E7 × 200D ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 1F1E6 × 200D ÷ 1F1E7 × 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 × 1F1E9 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER D (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 × 200D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
-÷ 0061 × 0308 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 × 0903 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark_ConjunctLinkingScripts) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 0600 × 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) × [9.2] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 1F476 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ExtCccZwj) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
-÷ 0061 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ExtCccZwj) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
-÷ 0061 × 1F3FF ÷ 1F476 × 200D × 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ExtCccZwj) ÷ [999.0] BABY (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
-÷ 1F476 × 1F3FF × 0308 × 200D × 1F476 × 1F3FF ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ExtCccZwj) ÷ [0.3]
-÷ 1F6D1 × 200D × 1F6D1 ÷	#  ÷ [0.2] OCTAGONAL SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
-÷ 0061 × 200D ÷ 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
-÷ 2701 × 200D × 2701 ÷	#  ÷ [0.2] UPPER BLADE SCISSORS (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] UPPER BLADE SCISSORS (Other) ÷ [0.3]
-÷ 0061 × 200D ÷ 2701 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] UPPER BLADE SCISSORS (Other) ÷ [0.3]
-÷ 0915 ÷ 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 094D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 094D × 200D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 093C × 200D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 093C × 094D × 200D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctLinkingScripts_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 094D × 0924 × 094D × 092F ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER YA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 094D ÷ 0061 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] LATIN SMALL LETTER A (Other) ÷ [0.3]
-÷ 0061 × 094D ÷ 0924 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 003F × 094D ÷ 0924 ÷	#  ÷ [0.2] QUESTION MARK (Other) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) ÷ [999.0] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
-÷ 0915 × 094D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (ConjunctLinkingScripts_LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinkingScripts_ConjunctLinker_ExtCccZwj) × [9.3] DEVANAGARI LETTER TA (ConjunctLinkingScripts_LinkingConsonant) ÷ [0.3]
+÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 ÷ 1F1E6 × 1F1E7 × 200D ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 ÷ 1F1E6 × 200D ÷ 1F1E7 × 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 × 1F1E9 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER D (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 × 200D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 0061 × 0308 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 × 0903 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 ÷ 0600 × 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) × [9.2] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 1F476 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
+÷ 0061 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
+÷ 0061 × 1F3FF ÷ 1F476 × 200D × 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BABY (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
+÷ 1F476 × 1F3FF × 0308 × 200D × 1F476 × 1F3FF ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1F6D1 × 200D × 1F6D1 ÷	#  ÷ [0.2] OCTAGONAL SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
+÷ 0061 × 200D ÷ 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
+÷ 2701 × 200D ÷ 2701 ÷	#  ÷ [0.2] UPPER BLADE SCISSORS (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] UPPER BLADE SCISSORS (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 × 200D ÷ 2701 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] UPPER BLADE SCISSORS (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0915 ÷ 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 200D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 093C × 200D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 093C × 094D × 200D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 0924 × 094D × 092F ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER YA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D ÷ 0061 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [0.3]
+÷ 0061 × 094D ÷ 0924 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 003F × 094D ÷ 0924 ÷	#  ÷ [0.2] QUESTION MARK (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0915 × 094D × 094D × 0924 ÷	#  ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3]
+÷ 0AB8 × 0AFB × 0ACD × 0AB8 × 0AFB ÷	#  ÷ [0.2] GUJARATI LETTER SA (LinkingConsonant) × [9.0] GUJARATI SIGN SHADDA (Extend_ConjunctExtendermConjunctLinker) × [9.0] GUJARATI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] GUJARATI LETTER SA (LinkingConsonant) × [9.0] GUJARATI SIGN SHADDA (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1019 × 1039 × 1018 ÷ 102C × 1037 ÷	#  ÷ [0.2] MYANMAR LETTER MA (LinkingConsonant) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER BHA (LinkingConsonant) ÷ [999.0] MYANMAR VOWEL SIGN AA (XXmLinkingConsonantmExtPict) × [9.0] MYANMAR SIGN DOT BELOW (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1004 × 103A × 1039 × 1011 × 1039 × 1011 ÷	#  ÷ [0.2] MYANMAR LETTER NGA (LinkingConsonant) × [9.0] MYANMAR SIGN ASAT (Extend_ConjunctExtendermConjunctLinker) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER THA (LinkingConsonant) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER THA (LinkingConsonant) ÷ [0.3]
+÷ 1B12 × 1B01 ÷ 1B32 × 1B44 × 1B2F ÷ 1B32 × 1B44 × 1B22 × 1B44 × 1B2C ÷ 1B32 × 1B44 × 1B22 × 1B38 ÷	#  ÷ [0.2] BALINESE LETTER OKARA TEDUNG (XXmLinkingConsonantmExtPict) × [9.0] BALINESE SIGN ULU CANDRA (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER WA (LinkingConsonant) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER TA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER YA (LinkingConsonant) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER TA (LinkingConsonant) × [9.0] BALINESE VOWEL SIGN SUKU (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 179F × 17D2 × 178F × 17D2 × 179A × 17B8 ÷	#  ÷ [0.2] KHMER LETTER SA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER LETTER TA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER LETTER RO (LinkingConsonant) × [9.0] KHMER VOWEL SIGN II (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3]
+÷ 1B26 ÷ 1B17 × 1B44 × 1B13 ÷	#  ÷ [0.2] BALINESE LETTER NA (LinkingConsonant) ÷ [999.0] BALINESE LETTER NGA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER KA (LinkingConsonant) ÷ [0.3]
+÷ 1B27 ÷ 1B13 × 1B44 × 1B0B ÷ 1B0B × 1B04 ÷	#  ÷ [0.2] BALINESE LETTER PA (LinkingConsonant) ÷ [999.0] BALINESE LETTER KA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER RA REPA (LinkingConsonant) ÷ [999.0] BALINESE LETTER RA REPA (LinkingConsonant) × [9.1] BALINESE SIGN BISAH (SpacingMark) ÷ [0.3]
+÷ 1795 × 17D2 × 17AF ÷ 1798 ÷	#  ÷ [0.2] KHMER LETTER PHA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER INDEPENDENT VOWEL QE (LinkingConsonant) ÷ [999.0] KHMER LETTER MO (LinkingConsonant) ÷ [0.3]
+÷ 17A0 × 17D2 × 17AB ÷ 1791 × 17D0 ÷ 1799 ÷	#  ÷ [0.2] KHMER LETTER HA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER INDEPENDENT VOWEL RY (LinkingConsonant) ÷ [999.0] KHMER LETTER TO (LinkingConsonant) × [9.0] KHMER SIGN SAMYOK SANNYA (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] KHMER LETTER YO (LinkingConsonant) ÷ [0.3]
 #
-# Lines: 1093
+# Lines: 766
 #
 # EOF
diff --git a/src/java.base/share/data/unicodedata/emoji/emoji-data.txt b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
index 12f83273cf5..450252c4df3 100644
--- a/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
+++ b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
@@ -1,11 +1,11 @@
 # emoji-data.txt
-# Date: 2024-05-01, 21:25:24 GMT
-# Copyright (c) 2024 Unicode, Inc.
+# Date: 2025-07-25, 17:54:31 GMT
+# © 2025 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
 # Emoji Data for UTS #51
-# Used with Emoji Version 16.0 and subsequent minor revisions (if any)
+# Version: 17.0
 #
 # For documentation and usage, see https://www.unicode.org/reports/tr51
 #
@@ -340,6 +340,7 @@
 1F6D1..1F6D2  ; Emoji                # E3.0   [2] (🛑..🛒)    stop sign..shopping cart
 1F6D5         ; Emoji                # E12.0  [1] (🛕)       hindu temple
 1F6D6..1F6D7  ; Emoji                # E13.0  [2] (🛖..🛗)    hut..elevator
+1F6D8         ; Emoji                # E17.0  [1] (🛘)       landslide
 1F6DC         ; Emoji                # E15.0  [1] (🛜)       wireless
 1F6DD..1F6DF  ; Emoji                # E14.0  [3] (🛝..🛟)    playground slide..ring buoy
 1F6E0..1F6E5  ; Emoji                # E0.7   [6] (🛠️..🛥️)    hammer and wrench..motor boat
@@ -408,6 +409,8 @@
 1FA83..1FA86  ; Emoji                # E13.0  [4] (🪃..🪆)    boomerang..nesting dolls
 1FA87..1FA88  ; Emoji                # E15.0  [2] (🪇..🪈)    maracas..flute
 1FA89         ; Emoji                # E16.0  [1] (🪉)       harp
+1FA8A         ; Emoji                # E17.0  [1] (🪊)       trombone
+1FA8E         ; Emoji                # E17.0  [1] (🪎)       treasure chest
 1FA8F         ; Emoji                # E16.0  [1] (🪏)       shovel
 1FA90..1FA95  ; Emoji                # E12.0  [6] (🪐..🪕)    ringed planet..banjo
 1FA96..1FAA8  ; Emoji                # E13.0 [19] (🪖..🪨)    military helmet..rock
@@ -421,6 +424,8 @@
 1FAC0..1FAC2  ; Emoji                # E13.0  [3] (🫀..🫂)    anatomical heart..people hugging
 1FAC3..1FAC5  ; Emoji                # E14.0  [3] (🫃..🫅)    pregnant man..person with crown
 1FAC6         ; Emoji                # E16.0  [1] (🫆)       fingerprint
+1FAC8         ; Emoji                # E17.0  [1] (🫈)       hairy creature
+1FACD         ; Emoji                # E17.0  [1] (🫍)       orca
 1FACE..1FACF  ; Emoji                # E15.0  [2] (🫎..🫏)    moose..donkey
 1FAD0..1FAD6  ; Emoji                # E13.0  [7] (🫐..🫖)    blueberries..teapot
 1FAD7..1FAD9  ; Emoji                # E14.0  [3] (🫗..🫙)    pouring liquid..jar
@@ -430,10 +435,12 @@
 1FAE0..1FAE7  ; Emoji                # E14.0  [8] (🫠..🫧)    melting face..bubbles
 1FAE8         ; Emoji                # E15.0  [1] (🫨)       shaking face
 1FAE9         ; Emoji                # E16.0  [1] (🫩)       face with bags under eyes
+1FAEA         ; Emoji                # E17.0  [1] (🫪)       distorted face
+1FAEF         ; Emoji                # E17.0  [1] (🫯)       fight cloud
 1FAF0..1FAF6  ; Emoji                # E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
 1FAF7..1FAF8  ; Emoji                # E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
 
-# Total elements: 1431
+# Total elements: 1438
 
 # ================================================
 
@@ -640,6 +647,7 @@
 1F6D1..1F6D2  ; Emoji_Presentation   # E3.0   [2] (🛑..🛒)    stop sign..shopping cart
 1F6D5         ; Emoji_Presentation   # E12.0  [1] (🛕)       hindu temple
 1F6D6..1F6D7  ; Emoji_Presentation   # E13.0  [2] (🛖..🛗)    hut..elevator
+1F6D8         ; Emoji_Presentation   # E17.0  [1] (🛘)       landslide
 1F6DC         ; Emoji_Presentation   # E15.0  [1] (🛜)       wireless
 1F6DD..1F6DF  ; Emoji_Presentation   # E14.0  [3] (🛝..🛟)    playground slide..ring buoy
 1F6EB..1F6EC  ; Emoji_Presentation   # E1.0   [2] (🛫..🛬)    airplane departure..airplane arrival
@@ -704,6 +712,8 @@
 1FA83..1FA86  ; Emoji_Presentation   # E13.0  [4] (🪃..🪆)    boomerang..nesting dolls
 1FA87..1FA88  ; Emoji_Presentation   # E15.0  [2] (🪇..🪈)    maracas..flute
 1FA89         ; Emoji_Presentation   # E16.0  [1] (🪉)       harp
+1FA8A         ; Emoji_Presentation   # E17.0  [1] (🪊)       trombone
+1FA8E         ; Emoji_Presentation   # E17.0  [1] (🪎)       treasure chest
 1FA8F         ; Emoji_Presentation   # E16.0  [1] (🪏)       shovel
 1FA90..1FA95  ; Emoji_Presentation   # E12.0  [6] (🪐..🪕)    ringed planet..banjo
 1FA96..1FAA8  ; Emoji_Presentation   # E13.0 [19] (🪖..🪨)    military helmet..rock
@@ -717,6 +727,8 @@
 1FAC0..1FAC2  ; Emoji_Presentation   # E13.0  [3] (🫀..🫂)    anatomical heart..people hugging
 1FAC3..1FAC5  ; Emoji_Presentation   # E14.0  [3] (🫃..🫅)    pregnant man..person with crown
 1FAC6         ; Emoji_Presentation   # E16.0  [1] (🫆)       fingerprint
+1FAC8         ; Emoji_Presentation   # E17.0  [1] (🫈)       hairy creature
+1FACD         ; Emoji_Presentation   # E17.0  [1] (🫍)       orca
 1FACE..1FACF  ; Emoji_Presentation   # E15.0  [2] (🫎..🫏)    moose..donkey
 1FAD0..1FAD6  ; Emoji_Presentation   # E13.0  [7] (🫐..🫖)    blueberries..teapot
 1FAD7..1FAD9  ; Emoji_Presentation   # E14.0  [3] (🫗..🫙)    pouring liquid..jar
@@ -726,10 +738,12 @@
 1FAE0..1FAE7  ; Emoji_Presentation   # E14.0  [8] (🫠..🫧)    melting face..bubbles
 1FAE8         ; Emoji_Presentation   # E15.0  [1] (🫨)       shaking face
 1FAE9         ; Emoji_Presentation   # E16.0  [1] (🫩)       face with bags under eyes
+1FAEA         ; Emoji_Presentation   # E17.0  [1] (🫪)       distorted face
+1FAEF         ; Emoji_Presentation   # E17.0  [1] (🫯)       fight cloud
 1FAF0..1FAF6  ; Emoji_Presentation   # E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
 1FAF7..1FAF8  ; Emoji_Presentation   # E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
 
-# Total elements: 1212
+# Total elements: 1219
 
 # ================================================
 
@@ -827,7 +841,6 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 21A9..21AA    ; Extended_Pictographic# E0.6   [2] (↩️..↪️)    right arrow curving left..left arrow curving right
 231A..231B    ; Extended_Pictographic# E0.6   [2] (⌚..⌛)    watch..hourglass done
 2328          ; Extended_Pictographic# E1.0   [1] (⌨️)       keyboard
-2388          ; Extended_Pictographic# E0.0   [1] (⎈)       HELM SYMBOL
 23CF          ; Extended_Pictographic# E1.0   [1] (⏏️)       eject button
 23E9..23EC    ; Extended_Pictographic# E0.6   [4] (⏩..⏬)    fast-forward button..fast down button
 23ED..23EE    ; Extended_Pictographic# E0.7   [2] (⏭️..⏮️)    next track button..last track button
@@ -844,106 +857,63 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 2600..2601    ; Extended_Pictographic# E0.6   [2] (☀️..☁️)    sun..cloud
 2602..2603    ; Extended_Pictographic# E0.7   [2] (☂️..☃️)    umbrella..snowman
 2604          ; Extended_Pictographic# E1.0   [1] (☄️)       comet
-2605          ; Extended_Pictographic# E0.0   [1] (★)       BLACK STAR
-2607..260D    ; Extended_Pictographic# E0.0   [7] (☇..☍)    LIGHTNING..OPPOSITION
 260E          ; Extended_Pictographic# E0.6   [1] (☎️)       telephone
-260F..2610    ; Extended_Pictographic# E0.0   [2] (☏..☐)    WHITE TELEPHONE..BALLOT BOX
 2611          ; Extended_Pictographic# E0.6   [1] (☑️)       check box with check
-2612          ; Extended_Pictographic# E0.0   [1] (☒)       BALLOT BOX WITH X
 2614..2615    ; Extended_Pictographic# E0.6   [2] (☔..☕)    umbrella with rain drops..hot beverage
-2616..2617    ; Extended_Pictographic# E0.0   [2] (☖..☗)    WHITE SHOGI PIECE..BLACK SHOGI PIECE
 2618          ; Extended_Pictographic# E1.0   [1] (☘️)       shamrock
-2619..261C    ; Extended_Pictographic# E0.0   [4] (☙..☜)    REVERSED ROTATED FLORAL HEART BULLET..WHITE LEFT POINTING INDEX
 261D          ; Extended_Pictographic# E0.6   [1] (☝️)       index pointing up
-261E..261F    ; Extended_Pictographic# E0.0   [2] (☞..☟)    WHITE RIGHT POINTING INDEX..WHITE DOWN POINTING INDEX
 2620          ; Extended_Pictographic# E1.0   [1] (☠️)       skull and crossbones
-2621          ; Extended_Pictographic# E0.0   [1] (☡)       CAUTION SIGN
 2622..2623    ; Extended_Pictographic# E1.0   [2] (☢️..☣️)    radioactive..biohazard
-2624..2625    ; Extended_Pictographic# E0.0   [2] (☤..☥)    CADUCEUS..ANKH
 2626          ; Extended_Pictographic# E1.0   [1] (☦️)       orthodox cross
-2627..2629    ; Extended_Pictographic# E0.0   [3] (☧..☩)    CHI RHO..CROSS OF JERUSALEM
 262A          ; Extended_Pictographic# E0.7   [1] (☪️)       star and crescent
-262B..262D    ; Extended_Pictographic# E0.0   [3] (☫..☭)    FARSI SYMBOL..HAMMER AND SICKLE
 262E          ; Extended_Pictographic# E1.0   [1] (☮️)       peace symbol
 262F          ; Extended_Pictographic# E0.7   [1] (☯️)       yin yang
-2630..2637    ; Extended_Pictographic# E0.0   [8] (☰..☷)    TRIGRAM FOR HEAVEN..TRIGRAM FOR EARTH
 2638..2639    ; Extended_Pictographic# E0.7   [2] (☸️..☹️)    wheel of dharma..frowning face
 263A          ; Extended_Pictographic# E0.6   [1] (☺️)       smiling face
-263B..263F    ; Extended_Pictographic# E0.0   [5] (☻..☿)    BLACK SMILING FACE..MERCURY
 2640          ; Extended_Pictographic# E4.0   [1] (♀️)       female sign
-2641          ; Extended_Pictographic# E0.0   [1] (♁)       EARTH
 2642          ; Extended_Pictographic# E4.0   [1] (♂️)       male sign
-2643..2647    ; Extended_Pictographic# E0.0   [5] (♃..♇)    JUPITER..PLUTO
 2648..2653    ; Extended_Pictographic# E0.6  [12] (♈..♓)    Aries..Pisces
-2654..265E    ; Extended_Pictographic# E0.0  [11] (♔..♞)    WHITE CHESS KING..BLACK CHESS KNIGHT
 265F          ; Extended_Pictographic# E11.0  [1] (♟️)       chess pawn
 2660          ; Extended_Pictographic# E0.6   [1] (♠️)       spade suit
-2661..2662    ; Extended_Pictographic# E0.0   [2] (♡..♢)    WHITE HEART SUIT..WHITE DIAMOND SUIT
 2663          ; Extended_Pictographic# E0.6   [1] (♣️)       club suit
-2664          ; Extended_Pictographic# E0.0   [1] (♤)       WHITE SPADE SUIT
 2665..2666    ; Extended_Pictographic# E0.6   [2] (♥️..♦️)    heart suit..diamond suit
-2667          ; Extended_Pictographic# E0.0   [1] (♧)       WHITE CLUB SUIT
 2668          ; Extended_Pictographic# E0.6   [1] (♨️)       hot springs
-2669..267A    ; Extended_Pictographic# E0.0  [18] (♩..♺)    QUARTER NOTE..RECYCLING SYMBOL FOR GENERIC MATERIALS
 267B          ; Extended_Pictographic# E0.6   [1] (♻️)       recycling symbol
-267C..267D    ; Extended_Pictographic# E0.0   [2] (♼..♽)    RECYCLED PAPER SYMBOL..PARTIALLY-RECYCLED PAPER SYMBOL
 267E          ; Extended_Pictographic# E11.0  [1] (♾️)       infinity
 267F          ; Extended_Pictographic# E0.6   [1] (♿)       wheelchair symbol
-2680..2685    ; Extended_Pictographic# E0.0   [6] (⚀..⚅)    DIE FACE-1..DIE FACE-6
-2690..2691    ; Extended_Pictographic# E0.0   [2] (⚐..⚑)    WHITE FLAG..BLACK FLAG
 2692          ; Extended_Pictographic# E1.0   [1] (⚒️)       hammer and pick
 2693          ; Extended_Pictographic# E0.6   [1] (⚓)       anchor
 2694          ; Extended_Pictographic# E1.0   [1] (⚔️)       crossed swords
 2695          ; Extended_Pictographic# E4.0   [1] (⚕️)       medical symbol
 2696..2697    ; Extended_Pictographic# E1.0   [2] (⚖️..⚗️)    balance scale..alembic
-2698          ; Extended_Pictographic# E0.0   [1] (⚘)       FLOWER
 2699          ; Extended_Pictographic# E1.0   [1] (⚙️)       gear
-269A          ; Extended_Pictographic# E0.0   [1] (⚚)       STAFF OF HERMES
 269B..269C    ; Extended_Pictographic# E1.0   [2] (⚛️..⚜️)    atom symbol..fleur-de-lis
-269D..269F    ; Extended_Pictographic# E0.0   [3] (⚝..⚟)    OUTLINED WHITE STAR..THREE LINES CONVERGING LEFT
 26A0..26A1    ; Extended_Pictographic# E0.6   [2] (⚠️..⚡)    warning..high voltage
-26A2..26A6    ; Extended_Pictographic# E0.0   [5] (⚢..⚦)    DOUBLED FEMALE SIGN..MALE WITH STROKE SIGN
 26A7          ; Extended_Pictographic# E13.0  [1] (⚧️)       transgender symbol
-26A8..26A9    ; Extended_Pictographic# E0.0   [2] (⚨..⚩)    VERTICAL MALE WITH STROKE SIGN..HORIZONTAL MALE WITH STROKE SIGN
 26AA..26AB    ; Extended_Pictographic# E0.6   [2] (⚪..⚫)    white circle..black circle
-26AC..26AF    ; Extended_Pictographic# E0.0   [4] (⚬..⚯)    MEDIUM SMALL WHITE CIRCLE..UNMARRIED PARTNERSHIP SYMBOL
 26B0..26B1    ; Extended_Pictographic# E1.0   [2] (⚰️..⚱️)    coffin..funeral urn
-26B2..26BC    ; Extended_Pictographic# E0.0  [11] (⚲..⚼)    NEUTER..SESQUIQUADRATE
 26BD..26BE    ; Extended_Pictographic# E0.6   [2] (⚽..⚾)    soccer ball..baseball
-26BF..26C3    ; Extended_Pictographic# E0.0   [5] (⚿..⛃)    SQUARED KEY..BLACK DRAUGHTS KING
 26C4..26C5    ; Extended_Pictographic# E0.6   [2] (⛄..⛅)    snowman without snow..sun behind cloud
-26C6..26C7    ; Extended_Pictographic# E0.0   [2] (⛆..⛇)    RAIN..BLACK SNOWMAN
 26C8          ; Extended_Pictographic# E0.7   [1] (⛈️)       cloud with lightning and rain
-26C9..26CD    ; Extended_Pictographic# E0.0   [5] (⛉..⛍)    TURNED WHITE SHOGI PIECE..DISABLED CAR
 26CE          ; Extended_Pictographic# E0.6   [1] (⛎)       Ophiuchus
 26CF          ; Extended_Pictographic# E0.7   [1] (⛏️)       pick
-26D0          ; Extended_Pictographic# E0.0   [1] (⛐)       CAR SLIDING
 26D1          ; Extended_Pictographic# E0.7   [1] (⛑️)       rescue worker’s helmet
-26D2          ; Extended_Pictographic# E0.0   [1] (⛒)       CIRCLED CROSSING LANES
 26D3          ; Extended_Pictographic# E0.7   [1] (⛓️)       chains
 26D4          ; Extended_Pictographic# E0.6   [1] (⛔)       no entry
-26D5..26E8    ; Extended_Pictographic# E0.0  [20] (⛕..⛨)    ALTERNATE ONE-WAY LEFT WAY TRAFFIC..BLACK CROSS ON SHIELD
 26E9          ; Extended_Pictographic# E0.7   [1] (⛩️)       shinto shrine
 26EA          ; Extended_Pictographic# E0.6   [1] (⛪)       church
-26EB..26EF    ; Extended_Pictographic# E0.0   [5] (⛫..⛯)    CASTLE..MAP SYMBOL FOR LIGHTHOUSE
 26F0..26F1    ; Extended_Pictographic# E0.7   [2] (⛰️..⛱️)    mountain..umbrella on ground
 26F2..26F3    ; Extended_Pictographic# E0.6   [2] (⛲..⛳)    fountain..flag in hole
 26F4          ; Extended_Pictographic# E0.7   [1] (⛴️)       ferry
 26F5          ; Extended_Pictographic# E0.6   [1] (⛵)       sailboat
-26F6          ; Extended_Pictographic# E0.0   [1] (⛶)       SQUARE FOUR CORNERS
 26F7..26F9    ; Extended_Pictographic# E0.7   [3] (⛷️..⛹️)    skier..person bouncing ball
 26FA          ; Extended_Pictographic# E0.6   [1] (⛺)       tent
-26FB..26FC    ; Extended_Pictographic# E0.0   [2] (⛻..⛼)    JAPANESE BANK SYMBOL..HEADSTONE GRAVEYARD SYMBOL
 26FD          ; Extended_Pictographic# E0.6   [1] (⛽)       fuel pump
-26FE..2701    ; Extended_Pictographic# E0.0   [4] (⛾..✁)    CUP ON BLACK SQUARE..UPPER BLADE SCISSORS
 2702          ; Extended_Pictographic# E0.6   [1] (✂️)       scissors
-2703..2704    ; Extended_Pictographic# E0.0   [2] (✃..✄)    LOWER BLADE SCISSORS..WHITE SCISSORS
 2705          ; Extended_Pictographic# E0.6   [1] (✅)       check mark button
 2708..270C    ; Extended_Pictographic# E0.6   [5] (✈️..✌️)    airplane..victory hand
 270D          ; Extended_Pictographic# E0.7   [1] (✍️)       writing hand
-270E          ; Extended_Pictographic# E0.0   [1] (✎)       LOWER RIGHT PENCIL
 270F          ; Extended_Pictographic# E0.6   [1] (✏️)       pencil
-2710..2711    ; Extended_Pictographic# E0.0   [2] (✐..✑)    UPPER RIGHT PENCIL..WHITE NIB
 2712          ; Extended_Pictographic# E0.6   [1] (✒️)       black nib
 2714          ; Extended_Pictographic# E0.6   [1] (✔️)       check mark
 2716          ; Extended_Pictographic# E0.6   [1] (✖️)       multiply
@@ -959,7 +929,6 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 2757          ; Extended_Pictographic# E0.6   [1] (❗)       red exclamation mark
 2763          ; Extended_Pictographic# E1.0   [1] (❣️)       heart exclamation
 2764          ; Extended_Pictographic# E0.6   [1] (❤️)       red heart
-2765..2767    ; Extended_Pictographic# E0.0   [3] (❥..❧)    ROTATED HEAVY BLACK HEART BULLET..ROTATED FLORAL HEART BULLET
 2795..2797    ; Extended_Pictographic# E0.6   [3] (➕..➗)    plus..divide
 27A1          ; Extended_Pictographic# E0.6   [1] (➡️)       right arrow
 27B0          ; Extended_Pictographic# E0.6   [1] (➰)       curly loop
@@ -973,19 +942,19 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 303D          ; Extended_Pictographic# E0.6   [1] (〽️)       part alternation mark
 3297          ; Extended_Pictographic# E0.6   [1] (㊗️)       Japanese “congratulations” button
 3299          ; Extended_Pictographic# E0.6   [1] (㊙️)       Japanese “secret” button
-1F000..1F003  ; Extended_Pictographic# E0.0   [4] (🀀..🀃)    MAHJONG TILE EAST WIND..MAHJONG TILE NORTH WIND
 1F004         ; Extended_Pictographic# E0.6   [1] (🀄)       mahjong red dragon
-1F005..1F0CE  ; Extended_Pictographic# E0.0 [202] (🀅..🃎)    MAHJONG TILE GREEN DRAGON..PLAYING CARD KING OF DIAMONDS
+1F02C..1F02F  ; Extended_Pictographic# E0.0   [4] (🀬..🀯)    <reserved-1F02C>..<reserved-1F02F>
+1F094..1F09F  ; Extended_Pictographic# E0.0  [12] (🂔..🂟)    <reserved-1F094>..<reserved-1F09F>
+1F0AF..1F0B0  ; Extended_Pictographic# E0.0   [2] (🂯..🂰)    <reserved-1F0AF>..<reserved-1F0B0>
+1F0C0         ; Extended_Pictographic# E0.0   [1] (🃀)       <reserved-1F0C0>
 1F0CF         ; Extended_Pictographic# E0.6   [1] (🃏)       joker
-1F0D0..1F0FF  ; Extended_Pictographic# E0.0  [48] (🃐..🃿)    <reserved-1F0D0>..<reserved-1F0FF>
-1F10D..1F10F  ; Extended_Pictographic# E0.0   [3] (🄍..🄏)    CIRCLED ZERO WITH SLASH..CIRCLED DOLLAR SIGN WITH OVERLAID BACKSLASH
-1F12F         ; Extended_Pictographic# E0.0   [1] (🄯)       COPYLEFT SYMBOL
-1F16C..1F16F  ; Extended_Pictographic# E0.0   [4] (🅬..🅯)    RAISED MR SIGN..CIRCLED HUMAN FIGURE
+1F0D0         ; Extended_Pictographic# E0.0   [1] (🃐)       <reserved-1F0D0>
+1F0F6..1F0FF  ; Extended_Pictographic# E0.0  [10] (🃶..🃿)    <reserved-1F0F6>..<reserved-1F0FF>
 1F170..1F171  ; Extended_Pictographic# E0.6   [2] (🅰️..🅱️)    A button (blood type)..B button (blood type)
 1F17E..1F17F  ; Extended_Pictographic# E0.6   [2] (🅾️..🅿️)    O button (blood type)..P button
 1F18E         ; Extended_Pictographic# E0.6   [1] (🆎)       AB button (blood type)
 1F191..1F19A  ; Extended_Pictographic# E0.6  [10] (🆑..🆚)    CL button..VS button
-1F1AD..1F1E5  ; Extended_Pictographic# E0.0  [57] (🆭..🇥)    MASK WORK SYMBOL..<reserved-1F1E5>
+1F1AE..1F1E5  ; Extended_Pictographic# E0.0  [56] (🆮..🇥)    <reserved-1F1AE>..<reserved-1F1E5>
 1F201..1F202  ; Extended_Pictographic# E0.6   [2] (🈁..🈂️)    Japanese “here” button..Japanese “service charge” button
 1F203..1F20F  ; Extended_Pictographic# E0.0  [13] (🈃..🈏)    <reserved-1F203>..<reserved-1F20F>
 1F21A         ; Extended_Pictographic# E0.6   [1] (🈚)       Japanese “free of charge” button
@@ -994,7 +963,8 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F23C..1F23F  ; Extended_Pictographic# E0.0   [4] (🈼..🈿)    <reserved-1F23C>..<reserved-1F23F>
 1F249..1F24F  ; Extended_Pictographic# E0.0   [7] (🉉..🉏)    <reserved-1F249>..<reserved-1F24F>
 1F250..1F251  ; Extended_Pictographic# E0.6   [2] (🉐..🉑)    Japanese “bargain” button..Japanese “acceptable” button
-1F252..1F2FF  ; Extended_Pictographic# E0.0 [174] (🉒..🋿)    <reserved-1F252>..<reserved-1F2FF>
+1F252..1F25F  ; Extended_Pictographic# E0.0  [14] (🉒..🉟)    <reserved-1F252>..<reserved-1F25F>
+1F266..1F2FF  ; Extended_Pictographic# E0.0 [154] (🉦..🋿)    <reserved-1F266>..<reserved-1F2FF>
 1F300..1F30C  ; Extended_Pictographic# E0.6  [13] (🌀..🌌)    cyclone..milky way
 1F30D..1F30E  ; Extended_Pictographic# E0.7   [2] (🌍..🌎)    globe showing Europe-Africa..globe showing Americas
 1F30F         ; Extended_Pictographic# E0.6   [1] (🌏)       globe showing Asia-Australia
@@ -1010,7 +980,6 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F31D..1F31E  ; Extended_Pictographic# E1.0   [2] (🌝..🌞)    full moon face..sun with face
 1F31F..1F320  ; Extended_Pictographic# E0.6   [2] (🌟..🌠)    glowing star..shooting star
 1F321         ; Extended_Pictographic# E0.7   [1] (🌡️)       thermometer
-1F322..1F323  ; Extended_Pictographic# E0.0   [2] (🌢..🌣)    BLACK DROPLET..WHITE SUN
 1F324..1F32C  ; Extended_Pictographic# E0.7   [9] (🌤️..🌬️)    sun behind small cloud..wind face
 1F32D..1F32F  ; Extended_Pictographic# E1.0   [3] (🌭..🌯)    hot dog..burrito
 1F330..1F331  ; Extended_Pictographic# E0.6   [2] (🌰..🌱)    chestnut..seedling
@@ -1026,11 +995,8 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F37D         ; Extended_Pictographic# E0.7   [1] (🍽️)       fork and knife with plate
 1F37E..1F37F  ; Extended_Pictographic# E1.0   [2] (🍾..🍿)    bottle with popping cork..popcorn
 1F380..1F393  ; Extended_Pictographic# E0.6  [20] (🎀..🎓)    ribbon..graduation cap
-1F394..1F395  ; Extended_Pictographic# E0.0   [2] (🎔..🎕)    HEART WITH TIP ON THE LEFT..BOUQUET OF FLOWERS
 1F396..1F397  ; Extended_Pictographic# E0.7   [2] (🎖️..🎗️)    military medal..reminder ribbon
-1F398         ; Extended_Pictographic# E0.0   [1] (🎘)       MUSICAL KEYBOARD WITH JACKS
 1F399..1F39B  ; Extended_Pictographic# E0.7   [3] (🎙️..🎛️)    studio microphone..control knobs
-1F39C..1F39D  ; Extended_Pictographic# E0.0   [2] (🎜..🎝)    BEAMED ASCENDING MUSICAL NOTES..BEAMED DESCENDING MUSICAL NOTES
 1F39E..1F39F  ; Extended_Pictographic# E0.7   [2] (🎞️..🎟️)    film frames..admission tickets
 1F3A0..1F3C4  ; Extended_Pictographic# E0.6  [37] (🎠..🏄)    carousel horse..person surfing
 1F3C5         ; Extended_Pictographic# E1.0   [1] (🏅)       sports medal
@@ -1045,11 +1011,9 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F3E0..1F3E3  ; Extended_Pictographic# E0.6   [4] (🏠..🏣)    house..Japanese post office
 1F3E4         ; Extended_Pictographic# E1.0   [1] (🏤)       post office
 1F3E5..1F3F0  ; Extended_Pictographic# E0.6  [12] (🏥..🏰)    hospital..castle
-1F3F1..1F3F2  ; Extended_Pictographic# E0.0   [2] (🏱..🏲)    WHITE PENNANT..BLACK PENNANT
 1F3F3         ; Extended_Pictographic# E0.7   [1] (🏳️)       white flag
 1F3F4         ; Extended_Pictographic# E1.0   [1] (🏴)       black flag
 1F3F5         ; Extended_Pictographic# E0.7   [1] (🏵️)       rosette
-1F3F6         ; Extended_Pictographic# E0.0   [1] (🏶)       BLACK ROSETTE
 1F3F7         ; Extended_Pictographic# E0.7   [1] (🏷️)       label
 1F3F8..1F3FA  ; Extended_Pictographic# E1.0   [3] (🏸..🏺)    badminton..amphora
 1F400..1F407  ; Extended_Pictographic# E1.0   [8] (🐀..🐇)    rat..rabbit
@@ -1086,7 +1050,6 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F4F8         ; Extended_Pictographic# E1.0   [1] (📸)       camera with flash
 1F4F9..1F4FC  ; Extended_Pictographic# E0.6   [4] (📹..📼)    video camera..videocassette
 1F4FD         ; Extended_Pictographic# E0.7   [1] (📽️)       film projector
-1F4FE         ; Extended_Pictographic# E0.0   [1] (📾)       PORTABLE STEREO
 1F4FF..1F502  ; Extended_Pictographic# E1.0   [4] (📿..🔂)    prayer beads..repeat single button
 1F503         ; Extended_Pictographic# E0.6   [1] (🔃)       clockwise vertical arrows
 1F504..1F507  ; Extended_Pictographic# E1.0   [4] (🔄..🔇)    counterclockwise arrows button..muted speaker
@@ -1097,51 +1060,30 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F516..1F52B  ; Extended_Pictographic# E0.6  [22] (🔖..🔫)    bookmark..water pistol
 1F52C..1F52D  ; Extended_Pictographic# E1.0   [2] (🔬..🔭)    microscope..telescope
 1F52E..1F53D  ; Extended_Pictographic# E0.6  [16] (🔮..🔽)    crystal ball..downwards button
-1F546..1F548  ; Extended_Pictographic# E0.0   [3] (🕆..🕈)    WHITE LATIN CROSS..CELTIC CROSS
 1F549..1F54A  ; Extended_Pictographic# E0.7   [2] (🕉️..🕊️)    om..dove
 1F54B..1F54E  ; Extended_Pictographic# E1.0   [4] (🕋..🕎)    kaaba..menorah
-1F54F         ; Extended_Pictographic# E0.0   [1] (🕏)       BOWL OF HYGIEIA
 1F550..1F55B  ; Extended_Pictographic# E0.6  [12] (🕐..🕛)    one o’clock..twelve o’clock
 1F55C..1F567  ; Extended_Pictographic# E0.7  [12] (🕜..🕧)    one-thirty..twelve-thirty
-1F568..1F56E  ; Extended_Pictographic# E0.0   [7] (🕨..🕮)    RIGHT SPEAKER..BOOK
 1F56F..1F570  ; Extended_Pictographic# E0.7   [2] (🕯️..🕰️)    candle..mantelpiece clock
-1F571..1F572  ; Extended_Pictographic# E0.0   [2] (🕱..🕲)    BLACK SKULL AND CROSSBONES..NO PIRACY
 1F573..1F579  ; Extended_Pictographic# E0.7   [7] (🕳️..🕹️)    hole..joystick
 1F57A         ; Extended_Pictographic# E3.0   [1] (🕺)       man dancing
-1F57B..1F586  ; Extended_Pictographic# E0.0  [12] (🕻..🖆)    LEFT HAND TELEPHONE RECEIVER..PEN OVER STAMPED ENVELOPE
 1F587         ; Extended_Pictographic# E0.7   [1] (🖇️)       linked paperclips
-1F588..1F589  ; Extended_Pictographic# E0.0   [2] (🖈..🖉)    BLACK PUSHPIN..LOWER LEFT PENCIL
 1F58A..1F58D  ; Extended_Pictographic# E0.7   [4] (🖊️..🖍️)    pen..crayon
-1F58E..1F58F  ; Extended_Pictographic# E0.0   [2] (🖎..🖏)    LEFT WRITING HAND..TURNED OK HAND SIGN
 1F590         ; Extended_Pictographic# E0.7   [1] (🖐️)       hand with fingers splayed
-1F591..1F594  ; Extended_Pictographic# E0.0   [4] (🖑..🖔)    REVERSED RAISED HAND WITH FINGERS SPLAYED..REVERSED VICTORY HAND
 1F595..1F596  ; Extended_Pictographic# E1.0   [2] (🖕..🖖)    middle finger..vulcan salute
-1F597..1F5A3  ; Extended_Pictographic# E0.0  [13] (🖗..🖣)    WHITE DOWN POINTING LEFT HAND INDEX..BLACK DOWN POINTING BACKHAND INDEX
 1F5A4         ; Extended_Pictographic# E3.0   [1] (🖤)       black heart
 1F5A5         ; Extended_Pictographic# E0.7   [1] (🖥️)       desktop computer
-1F5A6..1F5A7  ; Extended_Pictographic# E0.0   [2] (🖦..🖧)    KEYBOARD AND MOUSE..THREE NETWORKED COMPUTERS
 1F5A8         ; Extended_Pictographic# E0.7   [1] (🖨️)       printer
-1F5A9..1F5B0  ; Extended_Pictographic# E0.0   [8] (🖩..🖰)    POCKET CALCULATOR..TWO BUTTON MOUSE
 1F5B1..1F5B2  ; Extended_Pictographic# E0.7   [2] (🖱️..🖲️)    computer mouse..trackball
-1F5B3..1F5BB  ; Extended_Pictographic# E0.0   [9] (🖳..🖻)    OLD PERSONAL COMPUTER..DOCUMENT WITH PICTURE
 1F5BC         ; Extended_Pictographic# E0.7   [1] (🖼️)       framed picture
-1F5BD..1F5C1  ; Extended_Pictographic# E0.0   [5] (🖽..🗁)    FRAME WITH TILES..OPEN FOLDER
 1F5C2..1F5C4  ; Extended_Pictographic# E0.7   [3] (🗂️..🗄️)    card index dividers..file cabinet
-1F5C5..1F5D0  ; Extended_Pictographic# E0.0  [12] (🗅..🗐)    EMPTY NOTE..PAGES
 1F5D1..1F5D3  ; Extended_Pictographic# E0.7   [3] (🗑️..🗓️)    wastebasket..spiral calendar
-1F5D4..1F5DB  ; Extended_Pictographic# E0.0   [8] (🗔..🗛)    DESKTOP WINDOW..DECREASE FONT SIZE SYMBOL
 1F5DC..1F5DE  ; Extended_Pictographic# E0.7   [3] (🗜️..🗞️)    clamp..rolled-up newspaper
-1F5DF..1F5E0  ; Extended_Pictographic# E0.0   [2] (🗟..🗠)    PAGE WITH CIRCLED TEXT..STOCK CHART
 1F5E1         ; Extended_Pictographic# E0.7   [1] (🗡️)       dagger
-1F5E2         ; Extended_Pictographic# E0.0   [1] (🗢)       LIPS
 1F5E3         ; Extended_Pictographic# E0.7   [1] (🗣️)       speaking head
-1F5E4..1F5E7  ; Extended_Pictographic# E0.0   [4] (🗤..🗧)    THREE RAYS ABOVE..THREE RAYS RIGHT
 1F5E8         ; Extended_Pictographic# E2.0   [1] (🗨️)       left speech bubble
-1F5E9..1F5EE  ; Extended_Pictographic# E0.0   [6] (🗩..🗮)    RIGHT SPEECH BUBBLE..LEFT ANGER BUBBLE
 1F5EF         ; Extended_Pictographic# E0.7   [1] (🗯️)       right anger bubble
-1F5F0..1F5F2  ; Extended_Pictographic# E0.0   [3] (🗰..🗲)    MOOD BUBBLE..LIGHTNING MOOD
 1F5F3         ; Extended_Pictographic# E0.7   [1] (🗳️)       ballot box with ballot
-1F5F4..1F5F9  ; Extended_Pictographic# E0.0   [6] (🗴..🗹)    BALLOT SCRIPT X..BALLOT BOX WITH BOLD CHECK
 1F5FA         ; Extended_Pictographic# E0.7   [1] (🗺️)       world map
 1F5FB..1F5FF  ; Extended_Pictographic# E0.6   [5] (🗻..🗿)    mount fuji..moai
 1F600         ; Extended_Pictographic# E1.0   [1] (😀)       grinning face
@@ -1210,26 +1152,22 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F6BF         ; Extended_Pictographic# E1.0   [1] (🚿)       shower
 1F6C0         ; Extended_Pictographic# E0.6   [1] (🛀)       person taking bath
 1F6C1..1F6C5  ; Extended_Pictographic# E1.0   [5] (🛁..🛅)    bathtub..left luggage
-1F6C6..1F6CA  ; Extended_Pictographic# E0.0   [5] (🛆..🛊)    TRIANGLE WITH ROUNDED CORNERS..GIRLS SYMBOL
 1F6CB         ; Extended_Pictographic# E0.7   [1] (🛋️)       couch and lamp
 1F6CC         ; Extended_Pictographic# E1.0   [1] (🛌)       person in bed
 1F6CD..1F6CF  ; Extended_Pictographic# E0.7   [3] (🛍️..🛏️)    shopping bags..bed
 1F6D0         ; Extended_Pictographic# E1.0   [1] (🛐)       place of worship
 1F6D1..1F6D2  ; Extended_Pictographic# E3.0   [2] (🛑..🛒)    stop sign..shopping cart
-1F6D3..1F6D4  ; Extended_Pictographic# E0.0   [2] (🛓..🛔)    STUPA..PAGODA
 1F6D5         ; Extended_Pictographic# E12.0  [1] (🛕)       hindu temple
 1F6D6..1F6D7  ; Extended_Pictographic# E13.0  [2] (🛖..🛗)    hut..elevator
-1F6D8..1F6DB  ; Extended_Pictographic# E0.0   [4] (🛘..🛛)    <reserved-1F6D8>..<reserved-1F6DB>
+1F6D8         ; Extended_Pictographic# E17.0  [1] (🛘)       landslide
+1F6D9..1F6DB  ; Extended_Pictographic# E0.0   [3] (🛙..🛛)    <reserved-1F6D9>..<reserved-1F6DB>
 1F6DC         ; Extended_Pictographic# E15.0  [1] (🛜)       wireless
 1F6DD..1F6DF  ; Extended_Pictographic# E14.0  [3] (🛝..🛟)    playground slide..ring buoy
 1F6E0..1F6E5  ; Extended_Pictographic# E0.7   [6] (🛠️..🛥️)    hammer and wrench..motor boat
-1F6E6..1F6E8  ; Extended_Pictographic# E0.0   [3] (🛦..🛨)    UP-POINTING MILITARY AIRPLANE..UP-POINTING SMALL AIRPLANE
 1F6E9         ; Extended_Pictographic# E0.7   [1] (🛩️)       small airplane
-1F6EA         ; Extended_Pictographic# E0.0   [1] (🛪)       NORTHEAST-POINTING AIRPLANE
 1F6EB..1F6EC  ; Extended_Pictographic# E1.0   [2] (🛫..🛬)    airplane departure..airplane arrival
 1F6ED..1F6EF  ; Extended_Pictographic# E0.0   [3] (🛭..🛯)    <reserved-1F6ED>..<reserved-1F6EF>
 1F6F0         ; Extended_Pictographic# E0.7   [1] (🛰️)       satellite
-1F6F1..1F6F2  ; Extended_Pictographic# E0.0   [2] (🛱..🛲)    ONCOMING FIRE ENGINE..DIESEL LOCOMOTIVE
 1F6F3         ; Extended_Pictographic# E0.7   [1] (🛳️)       passenger ship
 1F6F4..1F6F6  ; Extended_Pictographic# E3.0   [3] (🛴..🛶)    kick scooter..canoe
 1F6F7..1F6F8  ; Extended_Pictographic# E5.0   [2] (🛷..🛸)    sled..flying saucer
@@ -1237,8 +1175,7 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F6FA         ; Extended_Pictographic# E12.0  [1] (🛺)       auto rickshaw
 1F6FB..1F6FC  ; Extended_Pictographic# E13.0  [2] (🛻..🛼)    pickup truck..roller skate
 1F6FD..1F6FF  ; Extended_Pictographic# E0.0   [3] (🛽..🛿)    <reserved-1F6FD>..<reserved-1F6FF>
-1F774..1F77F  ; Extended_Pictographic# E0.0  [12] (🝴..🝿)    LOT OF FORTUNE..ORCUS
-1F7D5..1F7DF  ; Extended_Pictographic# E0.0  [11] (🟕..🟟)    CIRCLED TRIANGLE..<reserved-1F7DF>
+1F7DA..1F7DF  ; Extended_Pictographic# E0.0   [6] (🟚..🟟)    <reserved-1F7DA>..<reserved-1F7DF>
 1F7E0..1F7EB  ; Extended_Pictographic# E12.0 [12] (🟠..🟫)    orange circle..brown square
 1F7EC..1F7EF  ; Extended_Pictographic# E0.0   [4] (🟬..🟯)    <reserved-1F7EC>..<reserved-1F7EF>
 1F7F0         ; Extended_Pictographic# E14.0  [1] (🟰)       heavy equals sign
@@ -1247,7 +1184,10 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F848..1F84F  ; Extended_Pictographic# E0.0   [8] (🡈..🡏)    <reserved-1F848>..<reserved-1F84F>
 1F85A..1F85F  ; Extended_Pictographic# E0.0   [6] (🡚..🡟)    <reserved-1F85A>..<reserved-1F85F>
 1F888..1F88F  ; Extended_Pictographic# E0.0   [8] (🢈..🢏)    <reserved-1F888>..<reserved-1F88F>
-1F8AE..1F8FF  ; Extended_Pictographic# E0.0  [82] (🢮..🣿)    <reserved-1F8AE>..<reserved-1F8FF>
+1F8AE..1F8AF  ; Extended_Pictographic# E0.0   [2] (🢮..🢯)    <reserved-1F8AE>..<reserved-1F8AF>
+1F8BC..1F8BF  ; Extended_Pictographic# E0.0   [4] (🢼..🢿)    <reserved-1F8BC>..<reserved-1F8BF>
+1F8C2..1F8CF  ; Extended_Pictographic# E0.0  [14] (🣂..🣏)    <reserved-1F8C2>..<reserved-1F8CF>
+1F8D9..1F8FF  ; Extended_Pictographic# E0.0  [39] (🣙..🣿)    <reserved-1F8D9>..<reserved-1F8FF>
 1F90C         ; Extended_Pictographic# E13.0  [1] (🤌)       pinched fingers
 1F90D..1F90F  ; Extended_Pictographic# E12.0  [3] (🤍..🤏)    white heart..pinching hand
 1F910..1F918  ; Extended_Pictographic# E1.0   [9] (🤐..🤘)    zipper-mouth face..sign of the horns
@@ -1293,7 +1233,8 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F9CD..1F9CF  ; Extended_Pictographic# E12.0  [3] (🧍..🧏)    person standing..deaf person
 1F9D0..1F9E6  ; Extended_Pictographic# E5.0  [23] (🧐..🧦)    face with monocle..socks
 1F9E7..1F9FF  ; Extended_Pictographic# E11.0 [25] (🧧..🧿)    red envelope..nazar amulet
-1FA00..1FA6F  ; Extended_Pictographic# E0.0 [112] (🨀..🩯)    NEUTRAL CHESS KING..<reserved-1FA6F>
+1FA58..1FA5F  ; Extended_Pictographic# E0.0   [8] (🩘..🩟)    <reserved-1FA58>..<reserved-1FA5F>
+1FA6E..1FA6F  ; Extended_Pictographic# E0.0   [2] (🩮..🩯)    <reserved-1FA6E>..<reserved-1FA6F>
 1FA70..1FA73  ; Extended_Pictographic# E12.0  [4] (🩰..🩳)    ballet shoes..shorts
 1FA74         ; Extended_Pictographic# E13.0  [1] (🩴)       thong sandal
 1FA75..1FA77  ; Extended_Pictographic# E15.0  [3] (🩵..🩷)    light blue heart..pink heart
@@ -1304,7 +1245,9 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1FA83..1FA86  ; Extended_Pictographic# E13.0  [4] (🪃..🪆)    boomerang..nesting dolls
 1FA87..1FA88  ; Extended_Pictographic# E15.0  [2] (🪇..🪈)    maracas..flute
 1FA89         ; Extended_Pictographic# E16.0  [1] (🪉)       harp
-1FA8A..1FA8E  ; Extended_Pictographic# E0.0   [5] (🪊..🪎)    <reserved-1FA8A>..<reserved-1FA8E>
+1FA8A         ; Extended_Pictographic# E17.0  [1] (🪊)       trombone
+1FA8B..1FA8D  ; Extended_Pictographic# E0.0   [3] (🪋..🪍)    <reserved-1FA8B>..<reserved-1FA8D>
+1FA8E         ; Extended_Pictographic# E17.0  [1] (🪎)       treasure chest
 1FA8F         ; Extended_Pictographic# E16.0  [1] (🪏)       shovel
 1FA90..1FA95  ; Extended_Pictographic# E12.0  [6] (🪐..🪕)    ringed planet..banjo
 1FA96..1FAA8  ; Extended_Pictographic# E13.0 [19] (🪖..🪨)    military helmet..rock
@@ -1318,7 +1261,10 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1FAC0..1FAC2  ; Extended_Pictographic# E13.0  [3] (🫀..🫂)    anatomical heart..people hugging
 1FAC3..1FAC5  ; Extended_Pictographic# E14.0  [3] (🫃..🫅)    pregnant man..person with crown
 1FAC6         ; Extended_Pictographic# E16.0  [1] (🫆)       fingerprint
-1FAC7..1FACD  ; Extended_Pictographic# E0.0   [7] (🫇..🫍)    <reserved-1FAC7>..<reserved-1FACD>
+1FAC7         ; Extended_Pictographic# E0.0   [1] (🫇)       <reserved-1FAC7>
+1FAC8         ; Extended_Pictographic# E17.0  [1] (🫈)       hairy creature
+1FAC9..1FACC  ; Extended_Pictographic# E0.0   [4] (🫉..🫌)    <reserved-1FAC9>..<reserved-1FACC>
+1FACD         ; Extended_Pictographic# E17.0  [1] (🫍)       orca
 1FACE..1FACF  ; Extended_Pictographic# E15.0  [2] (🫎..🫏)    moose..donkey
 1FAD0..1FAD6  ; Extended_Pictographic# E13.0  [7] (🫐..🫖)    blueberries..teapot
 1FAD7..1FAD9  ; Extended_Pictographic# E14.0  [3] (🫗..🫙)    pouring liquid..jar
@@ -1329,12 +1275,14 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1FAE0..1FAE7  ; Extended_Pictographic# E14.0  [8] (🫠..🫧)    melting face..bubbles
 1FAE8         ; Extended_Pictographic# E15.0  [1] (🫨)       shaking face
 1FAE9         ; Extended_Pictographic# E16.0  [1] (🫩)       face with bags under eyes
-1FAEA..1FAEF  ; Extended_Pictographic# E0.0   [6] (🫪..🫯)    <reserved-1FAEA>..<reserved-1FAEF>
+1FAEA         ; Extended_Pictographic# E17.0  [1] (🫪)       distorted face
+1FAEB..1FAEE  ; Extended_Pictographic# E0.0   [4] (🫫..🫮)    <reserved-1FAEB>..<reserved-1FAEE>
+1FAEF         ; Extended_Pictographic# E17.0  [1] (🫯)       fight cloud
 1FAF0..1FAF6  ; Extended_Pictographic# E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
 1FAF7..1FAF8  ; Extended_Pictographic# E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
 1FAF9..1FAFF  ; Extended_Pictographic# E0.0   [7] (🫹..🫿)    <reserved-1FAF9>..<reserved-1FAFF>
 1FC00..1FFFD  ; Extended_Pictographic# E0.0[1022] (🰀..🿽)    <reserved-1FC00>..<reserved-1FFFD>
 
-# Total elements: 3537
+# Total elements: 2848
 
 #EOF
diff --git a/src/java.base/share/legal/icu.md b/src/java.base/share/legal/icu.md
index e27193e10be..634fea70d92 100644
--- a/src/java.base/share/legal/icu.md
+++ b/src/java.base/share/legal/icu.md
@@ -1,4 +1,4 @@
-## International Components for Unicode (ICU4J) v76.1
+## International Components for Unicode (ICU4J) v78.1
 
 ### ICU4J License
 ```
@@ -6,7 +6,7 @@ UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 2016-2024 Unicode, Inc.
+Copyright © 2016-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
diff --git a/src/java.base/share/legal/unicode.md b/src/java.base/share/legal/unicode.md
index 8bd2ed8bd13..a1009c70c1c 100644
--- a/src/java.base/share/legal/unicode.md
+++ b/src/java.base/share/legal/unicode.md
@@ -1,4 +1,4 @@
-## The Unicode Standard, Unicode Character Database, Version 16.0.0
+## The Unicode Standard, Unicode Character Database, Version 17.0.0
 
 ### Unicode Character Database
 ```
@@ -7,7 +7,7 @@ UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR

From 27a38d9093958ae4851bc61b8d3f0d71dc780823 Mon Sep 17 00:00:00 2001
From: Chad Rakoczy <chadrako@amazon.com>
Date: Tue, 18 Nov 2025 20:28:33 +0000
Subject: [PATCH 236/512] 8371121:
 compiler/whitebox/DeoptimizeRelocatedNMethod.java fails with C1

Reviewed-by: thartmann, chagedorn
---
 .../whitebox/DeoptimizeRelocatedNMethod.java        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/whitebox/DeoptimizeRelocatedNMethod.java b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeRelocatedNMethod.java
index 42f29044e8c..c7cf355259b 100644
--- a/test/hotspot/jtreg/compiler/whitebox/DeoptimizeRelocatedNMethod.java
+++ b/test/hotspot/jtreg/compiler/whitebox/DeoptimizeRelocatedNMethod.java
@@ -28,6 +28,8 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc java.management
  * @requires vm.opt.DeoptimizeALot != true
+ * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @requires !vm.emulatedClient
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch -XX:+SegmentedCodeCache
@@ -55,8 +57,8 @@ public class DeoptimizeRelocatedNMethod {
         // Verify not initially compiled
         CompilerWhiteBoxTest.checkNotCompiled(method, false);
 
-        // Call function enough to compile
-        callFunction();
+        // Enqueue method for compilation. This will block since background compilation is disabled
+        WHITE_BOX.enqueueMethodForCompilation(method, CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION);
 
         // Verify now compiled
         CompilerWhiteBoxTest.checkCompiled(method, false);
@@ -91,13 +93,6 @@ public class DeoptimizeRelocatedNMethod {
         function();
     }
 
-    // Call function multiple times to trigger compilation
-    private static void callFunction() {
-        for (int i = 0; i < CompilerWhiteBoxTest.THRESHOLD; i++) {
-            function();
-        }
-    }
-
     public static void function() {
         FUNCTION_RESULT = Math.random();
     }

From 66fb015267058f9b5e6788eaeaa758be56ba553e Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratochvil@openjdk.org>
Date: Tue, 18 Nov 2025 21:51:28 +0000
Subject: [PATCH 237/512] 8357579: Compilation error: first argument in call to
 'memset' is a pointer to non-trivially copyable type

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: iklam, asmehra
---
 src/hotspot/share/oops/resolvedFieldEntry.cpp | 13 +++-
 src/hotspot/share/oops/resolvedFieldEntry.hpp | 60 ++++---------------
 .../share/oops/resolvedMethodEntry.cpp        | 17 ++++--
 .../share/oops/resolvedMethodEntry.hpp        | 51 +++++++---------
 4 files changed, 52 insertions(+), 89 deletions(-)

diff --git a/src/hotspot/share/oops/resolvedFieldEntry.cpp b/src/hotspot/share/oops/resolvedFieldEntry.cpp
index dd0a81ce0f3..83f1a6919a6 100644
--- a/src/hotspot/share/oops/resolvedFieldEntry.cpp
+++ b/src/hotspot/share/oops/resolvedFieldEntry.cpp
@@ -23,8 +23,17 @@
  */
 
 #include "cds/archiveBuilder.hpp"
+#include "cppstdlib/type_traits.hpp"
 #include "oops/resolvedFieldEntry.hpp"
 
+static_assert(std::is_trivially_copyable_v<ResolvedFieldEntry>);
+
+// Detect inadvertently introduced trailing padding.
+class ResolvedFieldEntryWithExtra : public ResolvedFieldEntry {
+  u1 _extra_field;
+};
+static_assert(sizeof(ResolvedFieldEntryWithExtra) > sizeof(ResolvedFieldEntry));
+
 void ResolvedFieldEntry::print_on(outputStream* st) const {
   st->print_cr("Field Entry:");
 
@@ -45,9 +54,7 @@ void ResolvedFieldEntry::print_on(outputStream* st) const {
 
 #if INCLUDE_CDS
 void ResolvedFieldEntry::remove_unshareable_info() {
-  u2 saved_cpool_index = _cpool_index;
-  memset(this, 0, sizeof(*this));
-  _cpool_index = saved_cpool_index;
+  *this = ResolvedFieldEntry(_cpool_index);
 }
 
 void ResolvedFieldEntry::mark_and_relocate() {
diff --git a/src/hotspot/share/oops/resolvedFieldEntry.hpp b/src/hotspot/share/oops/resolvedFieldEntry.hpp
index 1df4ae8d956..77ad4815730 100644
--- a/src/hotspot/share/oops/resolvedFieldEntry.hpp
+++ b/src/hotspot/share/oops/resolvedFieldEntry.hpp
@@ -43,6 +43,9 @@
 // Field bytecodes start with a constant pool index as their operand, which is then rewritten to
 // a "field index", which is an index into the array of ResolvedFieldEntry.
 
+// The explicit paddings are necessary for generating deterministic CDS archives. They prevent
+// the C++ compiler from potentially inserting random values in unused gaps.
+
 //class InstanceKlass;
 class ResolvedFieldEntry {
   friend class VMStructs;
@@ -54,17 +57,9 @@ class ResolvedFieldEntry {
   u1 _tos_state;                // TOS state
   u1 _flags;                    // Flags: [0000|00|is_final|is_volatile]
   u1 _get_code, _put_code;      // Get and Put bytecodes of the field
-
-  void copy_from(const ResolvedFieldEntry& other) {
-    _field_holder = other._field_holder;
-    _field_offset = other._field_offset;
-    _field_index = other._field_index;
-    _cpool_index = other._cpool_index;
-    _tos_state = other._tos_state;
-    _flags = other._flags;
-    _get_code = other._get_code;
-    _put_code = other._put_code;
-  }
+#ifdef _LP64
+  u4 _padding;
+#endif
 
 public:
   ResolvedFieldEntry(u2 cpi) :
@@ -75,48 +70,15 @@ public:
     _tos_state(0),
     _flags(0),
     _get_code(0),
-    _put_code(0) {}
+    _put_code(0)
+#ifdef _LP64
+    , _padding(0)
+#endif
+    {}
 
   ResolvedFieldEntry() :
     ResolvedFieldEntry(0) {}
 
-  // Notes on copy constructor, copy assignment operator, and copy_from().
-  // These are necessary for generating deterministic CDS archives.
-  //
-  // We have some unused padding on 64-bit platforms (4 bytes at the tail end).
-  //
-  // When ResolvedFieldEntries in a ConstantPoolCache are allocated from the metaspace,
-  // their entire content (including the padding) is filled with zeros. They are
-  // then initialized with initialize_resolved_entries_array() in cpCache.cpp from a
-  // GrowableArray.
-  //
-  // The GrowableArray is initialized in rewriter.cpp, using ResolvedFieldEntries that
-  // are originally allocated from the C++ stack. Functions like GrowableArray::expand_to()
-  // will also allocate ResolvedFieldEntries from the stack. These may have random bits
-  // in the padding as the C++ compiler is allowed to leave the padding in uninitialized
-  // states.
-  //
-  // If we use the default copy constructor and/or default copy assignment operator,
-  // the random padding will be copied into the GrowableArray, from there
-  // to the ConstantPoolCache, and eventually to the CDS archive. As a result, the
-  // CDS archive will contain random bits, causing failures in
-  // test/hotspot/jtreg/runtime/cds/DeterministicDump.java (usually on Windows).
-  //
-  // By using copy_from(), we can prevent the random padding from being copied,
-  // ensuring that the ResolvedFieldEntries in a ConstantPoolCache (and thus the
-  // CDS archive) will have all zeros in the padding.
-
-  // Copy constructor
-  ResolvedFieldEntry(const ResolvedFieldEntry& other) {
-    copy_from(other);
-  }
-
-  // Copy assignment operator
-  ResolvedFieldEntry& operator=(const ResolvedFieldEntry& other) {
-    copy_from(other);
-    return *this;
-  }
-
   // Bit shift to get flags
   // Note: Only two flags exists at the moment but more could be added
   enum {
diff --git a/src/hotspot/share/oops/resolvedMethodEntry.cpp b/src/hotspot/share/oops/resolvedMethodEntry.cpp
index 2dc533dbee0..bb96ca86012 100644
--- a/src/hotspot/share/oops/resolvedMethodEntry.cpp
+++ b/src/hotspot/share/oops/resolvedMethodEntry.cpp
@@ -23,9 +23,18 @@
  */
 
 #include "cds/archiveBuilder.hpp"
+#include "cppstdlib/type_traits.hpp"
 #include "oops/method.hpp"
 #include "oops/resolvedMethodEntry.hpp"
 
+static_assert(std::is_trivially_copyable_v<ResolvedMethodEntry>);
+
+// Detect inadvertently introduced trailing padding.
+class ResolvedMethodEntryWithExtra : public ResolvedMethodEntry {
+  u1 _extra_field;
+};
+static_assert(sizeof(ResolvedMethodEntryWithExtra) > sizeof(ResolvedMethodEntry));
+
 bool ResolvedMethodEntry::check_no_old_or_obsolete_entry() {
   // return false if m refers to a non-deleted old or obsolete method
   if (_method != nullptr) {
@@ -39,14 +48,10 @@ bool ResolvedMethodEntry::check_no_old_or_obsolete_entry() {
 void ResolvedMethodEntry::reset_entry() {
   if (has_resolved_references_index()) {
     u2 saved_resolved_references_index = _entry_specific._resolved_references_index;
-    u2 saved_cpool_index = _cpool_index;
-    memset(this, 0, sizeof(*this));
+    *this = ResolvedMethodEntry(_cpool_index);
     set_resolved_references_index(saved_resolved_references_index);
-    _cpool_index = saved_cpool_index;
   } else {
-    u2 saved_cpool_index = _cpool_index;
-    memset(this, 0, sizeof(*this));
-    _cpool_index = saved_cpool_index;
+    *this = ResolvedMethodEntry(_cpool_index);
   }
 }
 
diff --git a/src/hotspot/share/oops/resolvedMethodEntry.hpp b/src/hotspot/share/oops/resolvedMethodEntry.hpp
index c95efb751e9..802cf252a6d 100644
--- a/src/hotspot/share/oops/resolvedMethodEntry.hpp
+++ b/src/hotspot/share/oops/resolvedMethodEntry.hpp
@@ -61,6 +61,9 @@
 //       pool entry and thus the same resolved method entry.
 // The is_vfinal flag indicates method pointer for a final method or an index.
 
+// The explicit paddings are necessary for generating deterministic CDS archives. They prevent
+// the C++ compiler from potentially inserting random values in unused gaps.
+
 class InstanceKlass;
 class ResolvedMethodEntry {
   friend class VMStructs;
@@ -70,6 +73,7 @@ class ResolvedMethodEntry {
     InstanceKlass* _interface_klass; // for interface and static
     u2 _resolved_references_index;   // Index of resolved references array that holds the appendix oop for invokehandle
     u2 _table_index;                 // vtable/itable index for virtual and interface calls
+    // The padding field is unused here, as the parent constructor zeroes the union.
   } _entry_specific;
 
   u2 _cpool_index;                   // Constant pool index
@@ -80,51 +84,36 @@ class ResolvedMethodEntry {
 #ifdef ASSERT
   bool _has_interface_klass;
   bool _has_table_index;
+# ifdef _LP64
+  u2 _padding1;
+  u4 _padding2;
+# else
+  u1 _padding1;
+  u1 _padding2;
+# endif
 #endif
 
-  // See comments in resolvedFieldEntry.hpp about copy_from and padding.
-  // We have unused padding on debug builds.
-  void copy_from(const ResolvedMethodEntry& other) {
-    _method = other._method;
-    _entry_specific = other._entry_specific;
-    _cpool_index = other._cpool_index;
-    _number_of_parameters = other._number_of_parameters;
-    _tos_state = other._tos_state;
-    _flags = other._flags;
-    _bytecode1 = other._bytecode1;
-    _bytecode2 = other._bytecode2;
-#ifdef ASSERT
-    _has_interface_klass = other._has_interface_klass;
-    _has_table_index = other._has_table_index;
-#endif
-  }
-
   // Constructors
   public:
     ResolvedMethodEntry(u2 cpi) :
       _method(nullptr),
+      _entry_specific{nullptr},
       _cpool_index(cpi),
       _number_of_parameters(0),
       _tos_state(0),
       _flags(0),
       _bytecode1(0),
-      _bytecode2(0) {
-        _entry_specific._interface_klass = nullptr;
-        DEBUG_ONLY(_has_interface_klass = false;)
-        DEBUG_ONLY(_has_table_index = false;)
-      }
+      _bytecode2(0)
+#ifdef ASSERT
+      , _has_interface_klass(false),
+      _has_table_index(false),
+      _padding1(0),
+      _padding2(0)
+#endif
+      {}
     ResolvedMethodEntry() :
       ResolvedMethodEntry(0) {}
 
-    ResolvedMethodEntry(const ResolvedMethodEntry& other) {
-      copy_from(other);
-    }
-
-    ResolvedMethodEntry& operator=(const ResolvedMethodEntry& other) {
-      copy_from(other);
-      return *this;
-    }
-
 
   // Bit shift to get flags
   enum {

From b086e34f7170631d7568dc50a7c075dc9c2f173b Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 18 Nov 2025 21:51:54 +0000
Subject: [PATCH 238/512] 8371771: CDS test SharedStringsStress.java failed
 with insufficient heap

Reviewed-by: kvn
---
 .../runtime/cds/appcds/sharedStrings/SharedStringsStress.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
index c51a67c445b..4d176c949c6 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
@@ -83,8 +83,10 @@ public class SharedStringsStress {
         dumpOutput.shouldContain("string table array (primary)");
         dumpOutput.shouldContain("string table array (secondary)");
 
+        // We could create up to 26MB of archived heap objects. Run with enough Xms to ensure
+        // SerialGC can accommodate the archived objects during VM start up.
         OutputAnalyzer execOutput = TestCommon.exec(appJar,
-            TestCommon.concat(vmOptionsPrefix, "-Xlog:aot,cds", "HelloString"));
+            TestCommon.concat(vmOptionsPrefix, "-Xlog:aot,cds", "-Xms128m", "HelloString"));
         TestCommon.checkExec(execOutput);
     }
 }

From 256a9beffc106d6657a912a33f97e7f97acbb1e1 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Tue, 18 Nov 2025 22:29:37 +0000
Subject: [PATCH 239/512] 8280469: C2: CHA support for interface calls when
 inlining through method handle linker

Reviewed-by: kvn, roland
---
 src/hotspot/share/ci/ciInstanceKlass.cpp      |   3 +-
 src/hotspot/share/ci/ciInstanceKlass.hpp      |   1 +
 src/hotspot/share/opto/doCall.cpp             |  27 ++-
 .../cha/StrengthReduceInterfaceCall.java      | 205 ++++++++++++++++--
 4 files changed, 204 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp
index 9bbf005356c..64b9acf9146 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.cpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.cpp
@@ -605,7 +605,7 @@ bool ciInstanceKlass::is_leaf_type() {
   if (is_shared()) {
     return is_final();  // approximately correct
   } else {
-    return !has_subklass() && (nof_implementors() == 0);
+    return !has_subklass() && (!is_interface() || nof_implementors() == 0);
   }
 }
 
@@ -619,6 +619,7 @@ bool ciInstanceKlass::is_leaf_type() {
 // This is OK, since any dependencies we decide to assert
 // will be checked later under the Compile_lock.
 ciInstanceKlass* ciInstanceKlass::implementor() {
+  assert(is_interface(), "required");
   ciInstanceKlass* impl = _implementor;
   if (impl == nullptr) {
     if (is_shared()) {
diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp
index ec8fc789c7d..1f887771f54 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp
@@ -259,6 +259,7 @@ public:
 
   ciInstanceKlass* unique_implementor() {
     assert(is_loaded(), "must be loaded");
+    assert(is_interface(), "must be");
     ciInstanceKlass* impl = implementor();
     return (impl != this ? impl : nullptr);
   }
diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp
index 754b0fa8d1c..91bb743618b 100644
--- a/src/hotspot/share/opto/doCall.cpp
+++ b/src/hotspot/share/opto/doCall.cpp
@@ -97,10 +97,9 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
   Bytecodes::Code bytecode    = caller->java_code_at_bci(bci);
   ciMethod*       orig_callee = caller->get_method_at_bci(bci);
 
-  const bool is_virtual_or_interface = (bytecode == Bytecodes::_invokevirtual) ||
-                                       (bytecode == Bytecodes::_invokeinterface) ||
-                                       (orig_callee->intrinsic_id() == vmIntrinsics::_linkToVirtual) ||
-                                       (orig_callee->intrinsic_id() == vmIntrinsics::_linkToInterface);
+  const bool is_virtual = (bytecode == Bytecodes::_invokevirtual) || (orig_callee->intrinsic_id() == vmIntrinsics::_linkToVirtual);
+  const bool is_interface = (bytecode == Bytecodes::_invokeinterface) || (orig_callee->intrinsic_id() == vmIntrinsics::_linkToInterface);
+  const bool is_virtual_or_interface = is_virtual || is_interface;
 
   const bool check_access = !orig_callee->is_method_handle_intrinsic(); // method handle intrinsics don't perform access checks
 
@@ -339,17 +338,25 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
     // number of implementors for decl_interface is 0 or 1. If
     // it's 0 then no class implements decl_interface and there's
     // no point in inlining.
-    if (call_does_dispatch && bytecode == Bytecodes::_invokeinterface) {
-      ciInstanceKlass* declared_interface =
-          caller->get_declared_method_holder_at_bci(bci)->as_instance_klass();
+    if (call_does_dispatch && is_interface) {
+      ciInstanceKlass* declared_interface = nullptr;
+      if (orig_callee->intrinsic_id() == vmIntrinsics::_linkToInterface) {
+        // MemberName doesn't keep information about resolved interface class (REFC) once
+        // resolution is over, but resolved method holder (DECC) can be used as a
+        // conservative approximation.
+        declared_interface = callee->holder();
+      } else {
+        assert(!orig_callee->is_method_handle_intrinsic(), "not allowed");
+        declared_interface = caller->get_declared_method_holder_at_bci(bci)->as_instance_klass();
+      }
+      assert(declared_interface->is_interface(), "required");
       ciInstanceKlass* singleton = declared_interface->unique_implementor();
 
       if (singleton != nullptr) {
         assert(singleton != declared_interface, "not a unique implementor");
 
-        assert(check_access, "required");
         ciMethod* cha_monomorphic_target =
-            callee->find_monomorphic_target(caller->holder(), declared_interface, singleton);
+            callee->find_monomorphic_target(caller->holder(), declared_interface, singleton, check_access);
 
         if (cha_monomorphic_target != nullptr &&
             cha_monomorphic_target->holder() != env()->Object_klass()) { // subtype check against Object is useless
@@ -372,7 +379,7 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
           }
         }
       }
-    } // call_does_dispatch && bytecode == Bytecodes::_invokeinterface
+    } // call_does_dispatch && is_interface
 
     // Nothing claimed the intrinsic, we go with straight-forward inlining
     // for already discovered intrinsic.
diff --git a/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java b/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
index aa014cfa63d..5e2dc2e3d56 100644
--- a/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
+++ b/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @requires !vm.graal.enabled
+ * @requires vm.opt.StressMethodHandleLinkerInlining == null | !vm.opt.StressMethodHandleLinkerInlining
  * @requires vm.opt.StressUnstableIfTraps == null | !vm.opt.StressUnstableIfTraps
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.vm.annotation
@@ -55,6 +56,9 @@ package compiler.cha;
 
 import jdk.internal.vm.annotation.DontInline;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+
 import static compiler.cha.Utils.*;
 
 public class StrengthReduceInterfaceCall {
@@ -66,6 +70,18 @@ public class StrengthReduceInterfaceCall {
         run(ThreeLevelHierarchyAbstractVsDefault.class);
         run(ThreeLevelDefaultHierarchy.class);
         run(ThreeLevelDefaultHierarchy1.class);
+
+        // Implementation limitation: CHA is not performed by C1 during inlining through MH linkers.
+        if (!jdk.test.whitebox.code.Compiler.isC1Enabled()) {
+            run(ObjectToString.TestMH.class, ObjectToString.class);
+            run(ObjectHashCode.TestMH.class, ObjectHashCode.class);
+            run(TwoLevelHierarchyLinear.TestMH.class, TwoLevelHierarchyLinear.class);
+            run(ThreeLevelHierarchyLinear.TestMH.class, ThreeLevelHierarchyLinear.class);
+            run(ThreeLevelHierarchyAbstractVsDefault.TestMH.class, ThreeLevelHierarchyAbstractVsDefault.class);
+            run(ThreeLevelDefaultHierarchy.TestMH.class, ThreeLevelDefaultHierarchy.class);
+            run(ThreeLevelDefaultHierarchy1.TestMH.class, ThreeLevelDefaultHierarchy1.class);
+        }
+
         System.out.println("TEST PASSED");
     }
 
@@ -87,7 +103,7 @@ public class StrengthReduceInterfaceCall {
         static class DJ2 implements J { public String toString() { return "DJ2"; }}
 
         @Override
-        public Object test(I i) { return ObjectToStringHelper.testHelper(i); /* invokeinterface I.toString() */ }
+        public Object test(I i) throws Throwable { return ObjectToStringHelper.testHelper(i); /* invokeinterface I.toString() */ }
 
         @TestCase
         public void testMono() {
@@ -155,6 +171,20 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        public static class TestMH extends ObjectToString {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "toString", String.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return (String)TEST_MH.invokeExact(obj); // invokeinterface I.toString()
+            }
+        }
     }
 
     public static class ObjectHashCode extends ATest<ObjectHashCode.I> {
@@ -175,7 +205,7 @@ public class StrengthReduceInterfaceCall {
         static class DJ2 implements J { public int hashCode() { return super.hashCode(); }}
 
         @Override
-        public Object test(I i) {
+        public Object test(I i) throws Throwable {
             return ObjectHashCodeHelper.testHelper(i); /* invokeinterface I.hashCode() */
         }
 
@@ -242,6 +272,20 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        public static class TestMH extends ObjectHashCode {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "hashCode", int.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return (int)TEST_MH.invokeExact(obj); // invokeinterface I.hashCode()
+            }
+        }
     }
 
     public static class TwoLevelHierarchyLinear extends ATest<TwoLevelHierarchyLinear.I> {
@@ -263,7 +307,7 @@ public class StrengthReduceInterfaceCall {
         static class DJ2 implements J { public Object m() { return WRONG; }}
 
         @DontInline
-        public Object test(I i) {
+        public Object test(I i) throws Throwable {
             return i.m();
         }
 
@@ -366,6 +410,20 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        public static class TestMH extends TwoLevelHierarchyLinear {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokeinterface I.m()
+            }
+        }
     }
 
     public static class ThreeLevelHierarchyLinear extends ATest<ThreeLevelHierarchyLinear.I> {
@@ -385,7 +443,7 @@ public class StrengthReduceInterfaceCall {
         static class DJ implements J { public Object m() { return WRONG;   }}
 
         @DontInline
-        public Object test(I i) {
+        public Object test(I i) throws Throwable {
             return i.m(); // I <: J.m ABSTRACT
         }
 
@@ -404,10 +462,16 @@ public class StrengthReduceInterfaceCall {
             assertCompiled(); // No deopt on not-yet-seen receiver
 
             // 2. No dependency invalidation: different context
-            initialize(DJ.class,  //      DJ.m                    <: intf J.m ABSTRACT
-                       K1.class,  // intf K1            <: intf I <: intf J.m ABSTRACT
-                       K2.class); // intf K2.m ABSTRACT <: intf I <: intf J.m ABSTRACT
-            assertCompiled();
+            if (contextClass() == I.class) {
+                initialize(DJ.class,  //      DJ.m                    <: intf J.m ABSTRACT
+                           K1.class,  // intf K1            <: intf I <: intf J.m ABSTRACT
+                           K2.class); // intf K2.m ABSTRACT <: intf I <: intf J.m ABSTRACT
+                assertCompiled();
+            } else if (contextClass() == J.class) {
+                // no classes to initialize w/o breaking a dependency
+            } else {
+                throw new InternalError("unsupported context: " + contextClass());
+            }
 
             // 3. Dependency invalidation: DI.m <: I
             initialize(DI.class); //      DI.m          <: intf I <: intf J.m ABSTRACT
@@ -491,6 +555,30 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        Class<?> contextClass() {
+            return I.class;
+        }
+
+        public static class TestMH extends ThreeLevelHierarchyLinear {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            Class<?> contextClass() {
+                return J.class;
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokeinterface I.m()
+            }
+        }
+
     }
 
     public static class ThreeLevelHierarchyAbstractVsDefault extends ATest<ThreeLevelHierarchyAbstractVsDefault.I> {
@@ -503,7 +591,7 @@ public class StrengthReduceInterfaceCall {
         static class C  implements I { public Object m() { return CORRECT; }}
 
         @DontInline
-        public Object test(I i) {
+        public Object test(I i) throws Throwable {
             return i.m(); // intf I.m OVERPASS
         }
 
@@ -598,6 +686,20 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        public static class TestMH extends ThreeLevelHierarchyAbstractVsDefault {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokeinterface I.m()
+            }
+        }
     }
 
     public static class ThreeLevelDefaultHierarchy extends ATest<ThreeLevelDefaultHierarchy.I> {
@@ -617,7 +719,7 @@ public class StrengthReduceInterfaceCall {
         static class DK3 implements K3 {}
 
         @DontInline
-        public Object test(I i) {
+        public Object test(I i) throws Throwable {
             return i.m();
         }
 
@@ -636,11 +738,17 @@ public class StrengthReduceInterfaceCall {
             assertCompiled();
 
             // 2. No dependency invalidation
-            initialize(DJ.class,    //      DJ.m                               <: intf J.m ABSTRACT
-                       K1.class,   // intf  K1            <: intf I            <: intf J.m ABSTRACT
-                       K2.class,   // intf  K2.m ABSTRACT <: intf I            <: intf J.m ABSTRACT
-                       DK3.class); //      DK3.m          <: intf K3.m DEFAULT <: intf J.m ABSTRACT
-            assertCompiled();
+            if (contextClass() == I.class) {
+                initialize(DJ.class,   //       DJ.m                               <: intf J.m ABSTRACT
+                           K1.class,   // intf  K1            <: intf I            <: intf J.m ABSTRACT
+                           K2.class,   // intf  K2.m ABSTRACT <: intf I            <: intf J.m ABSTRACT
+                           DK3.class); //      DK3.m          <: intf K3.m DEFAULT <: intf J.m ABSTRACT
+                assertCompiled();
+            } else if (contextClass() == J.class) {
+                // no classes to initialize w/o breaking a dependency
+            } else {
+                throw new InternalError("unsupported context: " + contextClass());
+            }
 
             // 3. Dependency invalidation
             initialize(DI.class); // DI.m <: intf I <: intf J.m ABSTRACT
@@ -666,6 +774,29 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        Class<?> contextClass() {
+            return I.class;
+        }
+
+        public static class TestMH extends ThreeLevelDefaultHierarchy {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            Class<?> contextClass() {
+                return J.class;
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokeinterface I.m()
+            }
+        }
     }
 
     public static class ThreeLevelDefaultHierarchy1 extends ATest<ThreeLevelDefaultHierarchy1.I> {
@@ -686,7 +817,7 @@ public class StrengthReduceInterfaceCall {
         static class DJ2 implements J2 { public Object m() { return WRONG; }}
 
         @DontInline
-        public Object test(I i) {
+        public Object test(I i) throws Throwable {
             return i.m();
         }
 
@@ -705,11 +836,20 @@ public class StrengthReduceInterfaceCall {
             assertCompiled();
 
             // 2. No dependency invalidation
-            initialize(DJ1.class,
-                       DJ2.class,
-                       K1.class,
-                       K2.class,
-                       K3.class);
+            if (contextClass() == I.class) {
+                initialize(DJ1.class, //      DJ1.m                               <: intf J1
+                           DJ2.class, //      DJ2.m                               <:          intf J2.m ABSTRACT
+                           K1.class,  // intf  K1            <: intf I            <: intf J1, intf J2.m ABSTRACT
+                           K2.class,  // intf  K2.m ABSTRACT <: intf I            <: intf J1, intf J2.m ABSTRACT
+                           K3.class); // intf  K3.m DEFAULT  <: intf I            <: intf J1, intf J2.m ABSTRACT
+            } else if (contextClass() == J2.class) {
+                initialize(DJ1.class, //      DJ1.m                               <: intf J1
+                           K1.class,  // intf  K1            <: intf I            <: intf J1, intf J2.m ABSTRACT
+                           K2.class,  // intf  K2.m ABSTRACT <: intf I            <: intf J1, intf J2.m ABSTRACT
+                           K3.class); // intf  K3.m DEFAULT  <: intf I            <: intf J1, intf J2.m ABSTRACT
+            } else {
+                throw new InternalError("unsupported context: " + contextClass());
+            }
             assertCompiled();
 
             // 3. Dependency invalidation
@@ -742,5 +882,28 @@ public class StrengthReduceInterfaceCall {
             });
             assertCompiled();
         }
+
+        Class<?> contextClass() {
+            return I.class;
+        }
+
+        public static class TestMH extends ThreeLevelDefaultHierarchy1 {
+            static final MethodHandle TEST_MH = findVirtualHelper(I.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public void checkInvalidReceiver() {
+                // receiver type check failures trigger nmethod invalidation
+            }
+
+            @Override
+            Class<?> contextClass() {
+                return J2.class;
+            }
+
+            @Override
+            public Object test(I obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokeinterface I.m()
+            }
+        }
     }
 }

From aeea8497562aabda12f292ad93c9f0f6935cc842 Mon Sep 17 00:00:00 2001
From: John Engebretson <jengebr@amazon.com>
Date: Tue, 18 Nov 2025 23:37:06 +0000
Subject: [PATCH 240/512] 8371164: ArrayList.addAll() optimizations

Reviewed-by: smarks, ogillespie
---
 .../share/classes/java/util/ArrayList.java    |  14 +-
 .../share/classes/java/util/Collections.java  |  14 ++
 test/jdk/java/util/Collection/MOAT.java       |  26 +++-
 .../java/util/ArrayListBulkOpsBenchmark.java  | 128 ++++++++++++++++++
 4 files changed, 178 insertions(+), 4 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/util/ArrayListBulkOpsBenchmark.java

diff --git a/src/java.base/share/classes/java/util/ArrayList.java b/src/java.base/share/classes/java/util/ArrayList.java
index c00b130a553..53e818b99c5 100644
--- a/src/java.base/share/classes/java/util/ArrayList.java
+++ b/src/java.base/share/classes/java/util/ArrayList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -750,9 +750,17 @@ public class ArrayList<E> extends AbstractList<E>
      * @throws NullPointerException if the specified collection is null
      */
     public boolean addAll(Collection<? extends E> c) {
-        Object[] a = c.toArray();
+        Object[] a;
+        int numNew;
+        if (c.getClass() == ArrayList.class) {
+            ArrayList<?> src = (ArrayList<?>) c;
+            a = src.elementData;
+            numNew = src.size;
+        } else {
+            a = c.toArray();
+            numNew = a.length;
+        }
         modCount++;
-        int numNew = a.length;
         if (numNew == 0)
             return false;
         Object[] elementData;
diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java
index c48dbd8cf6c..316458d6f90 100644
--- a/src/java.base/share/classes/java/util/Collections.java
+++ b/src/java.base/share/classes/java/util/Collections.java
@@ -5253,6 +5253,20 @@ public final class Collections {
         public int hashCode() {
             return Objects.hashCode(element);
         }
+        @Override
+        public Object[] toArray() {
+            return new Object[] {element};
+        }
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            if (a.length < 1)
+                a = (T[])Array.newInstance(a.getClass().getComponentType(), 1);
+            a[0] = (T)element;
+            if (a.length > 1)
+                a[1] = null;
+            return a;
+        }
     }
 
     /**
diff --git a/test/jdk/java/util/Collection/MOAT.java b/test/jdk/java/util/Collection/MOAT.java
index d0d27c8f91e..687ac9fbd5f 100644
--- a/test/jdk/java/util/Collection/MOAT.java
+++ b/test/jdk/java/util/Collection/MOAT.java
@@ -26,7 +26,7 @@
  * @bug     6207984 6272521 6192552 6269713 6197726 6260652 5073546 4137464
  *          4155650 4216399 4294891 6282555 6318622 6355327 6383475 6420753
  *          6431845 4802633 6570566 6570575 6570631 6570924 6691185 6691215
- *          4802647 7123424 8024709 8193128 8327858 8368178
+ *          4802647 7123424 8024709 8193128 8327858 8368178 8371164
  * @summary Run many tests on many Collection and Map implementations
  * @author  Martin Buchholz
  * @modules java.base/java.util:open
@@ -887,6 +887,28 @@ public class MOAT {
         catch (Throwable t) { unexpected(t); }
     }
 
+    private static void testAddAll(Collection<Integer> c) {
+        clear(c);
+
+        // Test ArrayList source
+        ArrayList<Integer> arrayListSource = new ArrayList<>();
+        arrayListSource.add(42);
+        arrayListSource.add(99);
+        check(c.addAll(arrayListSource));
+        equal(c.size(), arrayListSource.size());
+        check(c.containsAll(arrayListSource));
+
+        clear(c);
+
+        // Test non-ArrayList source
+        LinkedList<Integer> linkedListSource = new LinkedList<>();
+        linkedListSource.add(77);
+        linkedListSource.add(88);
+        check(c.addAll(linkedListSource));
+        equal(c.size(), linkedListSource.size());
+        check(c.containsAll(linkedListSource));
+    }
+
     private static void testConcurrentCollection(Collection<Integer> c) {
         try {
             c.add(1);
@@ -1294,6 +1316,8 @@ public class MOAT {
         clear(c);      testStringElement(c);
         oneElement(c); testStringElement(c);
 
+        testAddAll(c);
+
         if (c.getClass().getName().matches(".*concurrent.*"))
             testConcurrentCollection(c);
 
diff --git a/test/micro/org/openjdk/bench/java/util/ArrayListBulkOpsBenchmark.java b/test/micro/org/openjdk/bench/java/util/ArrayListBulkOpsBenchmark.java
new file mode 100644
index 00000000000..78b902f0c3a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/util/ArrayListBulkOpsBenchmark.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.WeakHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+
+/**
+ * Benchmark measuring ArrayList addAll() performance.
+ *
+ * Tests the performance of ArrayList.addAll() when copying from another ArrayList.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark)
+@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 1, jvmArgs = { "-XX:+UseParallelGC", "-Xmx3g" })
+public class ArrayListBulkOpsBenchmark {
+    @Param({"0", "1", "5", "75"})
+    int size;
+
+    @Param({"ArrayList", "LinkedList"})
+    String type;
+
+    List<String> source;
+
+    @Setup(Level.Trial)
+    public void setup() {
+        switch (type) {
+            case "ArrayList" -> source = new ArrayList<>(size);
+            case "LinkedList" -> source = new LinkedList<>();
+        }
+        for (int i = 0; i < size; i++) source.add("key" + i);
+    }
+
+    @Benchmark
+    public ArrayList<String> addAll() {
+        ArrayList<String> result = new ArrayList<>(size);
+        result.addAll(source);
+        return result;
+    }
+
+    static void poisonCallSites() {
+        HashMap<String, String> hashMapSource = new HashMap<>();
+        TreeSet<String> treeSetSource = new TreeSet<>();
+        WeakHashMap<String, String> weakHashMapSource = new WeakHashMap<>();
+        for (int i = 0; i < 75; i++) {
+            hashMapSource.put("key" + i, "value" + i);
+            treeSetSource.add("key" + i);
+            weakHashMapSource.put("key" + i, "value" + i);
+        }
+        // Poison ArrayList.addAll() with different Collection types
+        for (int i = 0; i < 40_000; i++) {
+            ArrayList<Object> temp = new ArrayList<>();
+            temp.addAll(hashMapSource.entrySet());
+            temp.addAll(treeSetSource);
+            temp.addAll(weakHashMapSource.keySet());
+        }
+    }
+
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    @State(Scope.Benchmark)
+    @Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+    @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+    @Fork(value = 1, jvmArgs = { "-XX:+UseParallelGC", "-Xmx3g" })
+    public static class SingletonSet {
+        Set<String> singletonSetSource = Collections.singleton("key");
+
+        @Param({ "false", "true" })
+        private boolean poison;
+
+        @Setup(Level.Trial)
+        public void setup() {
+            if (poison) poisonCallSites();
+        }
+
+        @Benchmark
+        public ArrayList<String> addAllSingletonSet() {
+            ArrayList<String> result = new ArrayList<>(1);
+            result.addAll(singletonSetSource);
+            return result;
+        }
+    }
+}

From 152cd4d8bab7d3428d0330c56a3cb9ed7feef313 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 18 Nov 2025 23:43:22 +0000
Subject: [PATCH 241/512] 8371956: Convert OopStorage to use Atomic<T>

Reviewed-by: stefank, tschatzl
---
 src/hotspot/share/gc/shared/oopStorage.cpp    | 157 +++++++++---------
 src/hotspot/share/gc/shared/oopStorage.hpp    |  11 +-
 .../share/gc/shared/oopStorage.inline.hpp     |  19 ++-
 .../share/gc/shared/oopStorageParState.hpp    |   5 +-
 .../gtest/gc/shared/test_oopStorage.cpp       |   4 +-
 5 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/src/hotspot/share/gc/shared/oopStorage.cpp b/src/hotspot/share/gc/shared/oopStorage.cpp
index d52efc13dac..a1cc3ffa553 100644
--- a/src/hotspot/share/gc/shared/oopStorage.cpp
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp
@@ -28,7 +28,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "nmt/memTracker.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
@@ -122,7 +122,7 @@ OopStorage::ActiveArray::ActiveArray(size_t size) :
 {}
 
 OopStorage::ActiveArray::~ActiveArray() {
-  assert(_refcount == 0, "precondition");
+  assert(_refcount.load_relaxed() == 0, "precondition");
 }
 
 OopStorage::ActiveArray* OopStorage::ActiveArray::create(size_t size,
@@ -144,32 +144,32 @@ size_t OopStorage::ActiveArray::size() const {
 }
 
 size_t OopStorage::ActiveArray::block_count() const {
-  return _block_count;
+  return _block_count.load_relaxed();
 }
 
 size_t OopStorage::ActiveArray::block_count_acquire() const {
-  return AtomicAccess::load_acquire(&_block_count);
+  return _block_count.load_acquire();
 }
 
 void OopStorage::ActiveArray::increment_refcount() const {
-  int new_value = AtomicAccess::add(&_refcount, 1);
-  assert(new_value >= 1, "negative refcount %d", new_value - 1);
+  int old_value = _refcount.fetch_then_add(1);
+  assert(old_value >= 0, "negative refcount %d", old_value);
 }
 
 bool OopStorage::ActiveArray::decrement_refcount() const {
-  int new_value = AtomicAccess::sub(&_refcount, 1);
+  int new_value = _refcount.sub_then_fetch(1);
   assert(new_value >= 0, "negative refcount %d", new_value);
   return new_value == 0;
 }
 
 bool OopStorage::ActiveArray::push(Block* block) {
-  size_t index = _block_count;
+  size_t index = _block_count.load_relaxed();
   if (index < _size) {
     block->set_active_index(index);
     *block_ptr(index) = block;
     // Use a release_store to ensure all the setup is complete before
     // making the block visible.
-    AtomicAccess::release_store(&_block_count, index + 1);
+    _block_count.release_store(index + 1);
     return true;
   } else {
     return false;
@@ -177,19 +177,19 @@ bool OopStorage::ActiveArray::push(Block* block) {
 }
 
 void OopStorage::ActiveArray::remove(Block* block) {
-  assert(_block_count > 0, "array is empty");
+  assert(_block_count.load_relaxed() > 0, "array is empty");
   size_t index = block->active_index();
   assert(*block_ptr(index) == block, "block not present");
-  size_t last_index = _block_count - 1;
+  size_t last_index = _block_count.load_relaxed() - 1;
   Block* last_block = *block_ptr(last_index);
   last_block->set_active_index(index);
   *block_ptr(index) = last_block;
-  _block_count = last_index;
+  _block_count.store_relaxed(last_index);
 }
 
 void OopStorage::ActiveArray::copy_from(const ActiveArray* from) {
-  assert(_block_count == 0, "array must be empty");
-  size_t count = from->_block_count;
+  assert(_block_count.load_relaxed() == 0, "array must be empty");
+  size_t count = from->_block_count.load_relaxed();
   assert(count <= _size, "precondition");
   Block* const* from_ptr = from->block_ptr(0);
   Block** to_ptr = block_ptr(0);
@@ -198,7 +198,7 @@ void OopStorage::ActiveArray::copy_from(const ActiveArray* from) {
     assert(block->active_index() == i, "invariant");
     *to_ptr++ = block;
   }
-  _block_count = count;
+  _block_count.store_relaxed(count);
 }
 
 // Blocks start with an array of BitsPerWord oop entries.  That array
@@ -230,14 +230,17 @@ OopStorage::Block::Block(const OopStorage* owner, void* memory) :
   assert(is_aligned(this, block_alignment), "misaligned block");
 }
 
+#ifdef ASSERT
 OopStorage::Block::~Block() {
-  assert(_release_refcount == 0, "deleting block while releasing");
-  assert(_deferred_updates_next == nullptr, "deleting block with deferred update");
+  assert(_release_refcount.load_relaxed() == 0, "deleting block while releasing");
+  assert(_deferred_updates_next.load_relaxed() == nullptr, "deleting block with deferred update");
   // Clear fields used by block_for_ptr and entry validation, which
-  // might help catch bugs.  Volatile to prevent dead-store elimination.
-  const_cast<uintx volatile&>(_allocated_bitmask) = 0;
+  // might help catch bugs.
+  _allocated_bitmask.store_relaxed(0);
+  // Volatile to prevent dead-store elimination.
   const_cast<intptr_t volatile&>(_owner_address) = 0;
 }
+#endif // ASSERT
 
 size_t OopStorage::Block::allocation_size() {
   // _data must be first member, so aligning Block aligns _data.
@@ -272,16 +275,16 @@ uintx OopStorage::Block::bitmask_for_entry(const oop* ptr) const {
 bool OopStorage::Block::is_safe_to_delete() const {
   assert(is_empty(), "precondition");
   OrderAccess::loadload();
-  return (AtomicAccess::load_acquire(&_release_refcount) == 0) &&
-         (AtomicAccess::load_acquire(&_deferred_updates_next) == nullptr);
+  return ((_release_refcount.load_acquire() == 0) &&
+          (_deferred_updates_next.load_acquire() == nullptr));
 }
 
 OopStorage::Block* OopStorage::Block::deferred_updates_next() const {
-  return _deferred_updates_next;
+  return _deferred_updates_next.load_relaxed();
 }
 
 void OopStorage::Block::set_deferred_updates_next(Block* block) {
-  _deferred_updates_next = block;
+  _deferred_updates_next.store_relaxed(block);
 }
 
 bool OopStorage::Block::contains(const oop* ptr) const {
@@ -321,9 +324,8 @@ void OopStorage::Block::atomic_add_allocated(uintx add) {
   // we can use an atomic add to implement the operation.  The assert post
   // facto verifies the precondition held; if there were any set bits in
   // common, then after the add at least one of them will be zero.
-  uintx sum = AtomicAccess::add(&_allocated_bitmask, add);
-  assert((sum & add) == add, "some already present: %zu:%zu",
-         sum, add);
+  uintx sum = _allocated_bitmask.add_then_fetch(add);
+  assert((sum & add) == add, "some already present: %zu:%zu", sum, add);
 }
 
 oop* OopStorage::Block::allocate() {
@@ -452,7 +454,7 @@ oop* OopStorage::allocate() {
   oop* result = block->allocate();
   assert(result != nullptr, "allocation failed");
   assert(!block->is_empty(), "postcondition");
-  AtomicAccess::inc(&_allocation_count); // release updates outside lock.
+  _allocation_count.add_then_fetch(1u); // release updates outside lock.
   if (block->is_full()) {
     // Transitioning from not full to full.
     // Remove full blocks from consideration by future allocates.
@@ -490,7 +492,7 @@ size_t OopStorage::allocate(oop** ptrs, size_t size) {
     assert(!is_empty_bitmask(taken), "invariant");
   } // Drop lock, now that we've taken all available entries from block.
   size_t num_taken = population_count(taken);
-  AtomicAccess::add(&_allocation_count, num_taken);
+  _allocation_count.add_then_fetch(num_taken);
   // Fill ptrs from those taken entries.
   size_t limit = MIN2(num_taken, size);
   for (size_t i = 0; i < limit; ++i) {
@@ -506,7 +508,7 @@ size_t OopStorage::allocate(oop** ptrs, size_t size) {
     assert(size == limit, "invariant");
     assert(num_taken == (limit + population_count(taken)), "invariant");
     block->release_entries(taken, this);
-    AtomicAccess::sub(&_allocation_count, num_taken - limit);
+    _allocation_count.sub_then_fetch(num_taken - limit);
   }
   log_trace(oopstorage, ref)("%s: bulk allocate %zu, returned %zu",
                              name(), limit, num_taken - limit);
@@ -527,9 +529,9 @@ bool OopStorage::try_add_block() {
   if (block == nullptr) return false;
 
   // Add new block to the _active_array, growing if needed.
-  if (!_active_array->push(block)) {
+  if (!_active_array.load_relaxed()->push(block)) {
     if (expand_active_array()) {
-      guarantee(_active_array->push(block), "push failed after expansion");
+      guarantee(_active_array.load_relaxed()->push(block), "push failed after expansion");
     } else {
       log_debug(oopstorage, blocks)("%s: failed active array expand", name());
       Block::delete_block(*block);
@@ -576,7 +578,7 @@ OopStorage::Block* OopStorage::block_for_allocation() {
 // indicate allocation failure.
 bool OopStorage::expand_active_array() {
   assert_lock_strong(_allocation_mutex);
-  ActiveArray* old_array = _active_array;
+  ActiveArray* old_array = _active_array.load_relaxed();
   size_t new_size = 2 * old_array->size();
   log_debug(oopstorage, blocks)("%s: expand active array %zu",
                                 name(), new_size);
@@ -599,7 +601,7 @@ void OopStorage::replace_active_array(ActiveArray* new_array) {
   // Update new_array refcount to account for the new reference.
   new_array->increment_refcount();
   // Install new_array, ensuring its initialization is complete first.
-  AtomicAccess::release_store(&_active_array, new_array);
+  _active_array.release_store(new_array);
   // Wait for any readers that could read the old array from _active_array.
   // Can't use GlobalCounter here, because this is called from allocate(),
   // which may be called in the scope of a GlobalCounter critical section
@@ -617,7 +619,7 @@ void OopStorage::replace_active_array(ActiveArray* new_array) {
 // using it.
 OopStorage::ActiveArray* OopStorage::obtain_active_array() const {
   SingleWriterSynchronizer::CriticalSection cs(&_protect_active);
-  ActiveArray* result = AtomicAccess::load_acquire(&_active_array);
+  ActiveArray* result = _active_array.load_acquire();
   result->increment_refcount();
   return result;
 }
@@ -625,7 +627,7 @@ OopStorage::ActiveArray* OopStorage::obtain_active_array() const {
 // Decrement refcount of array and destroy if refcount is zero.
 void OopStorage::relinquish_block_array(ActiveArray* array) const {
   if (array->decrement_refcount()) {
-    assert(array != _active_array, "invariant");
+    assert(array != _active_array.load_relaxed(), "invariant");
     ActiveArray::destroy(array);
   }
 }
@@ -672,14 +674,14 @@ static void log_release_transitions(uintx releasing,
 void OopStorage::Block::release_entries(uintx releasing, OopStorage* owner) {
   assert(releasing != 0, "preconditon");
   // Prevent empty block deletion when transitioning to empty.
-  AtomicAccess::inc(&_release_refcount);
+  _release_refcount.add_then_fetch(1u);
 
   // Atomically update allocated bitmask.
-  uintx old_allocated = _allocated_bitmask;
+  uintx old_allocated = _allocated_bitmask.load_relaxed();
   while (true) {
     assert((releasing & ~old_allocated) == 0, "releasing unallocated entries");
     uintx new_value = old_allocated ^ releasing;
-    uintx fetched = AtomicAccess::cmpxchg(&_allocated_bitmask, old_allocated, new_value);
+    uintx fetched = _allocated_bitmask.compare_exchange(old_allocated, new_value);
     if (fetched == old_allocated) break; // Successful update.
     old_allocated = fetched;             // Retry with updated bitmask.
   }
@@ -698,12 +700,12 @@ void OopStorage::Block::release_entries(uintx releasing, OopStorage* owner) {
     // then someone else has made such a claim and the deferred update has not
     // yet been processed and will include our change, so we don't need to do
     // anything further.
-    if (AtomicAccess::replace_if_null(&_deferred_updates_next, this)) {
+    if (_deferred_updates_next.compare_exchange(nullptr, this) == nullptr) {
       // Successfully claimed.  Push, with self-loop for end-of-list.
-      Block* head = owner->_deferred_updates;
+      Block* head = owner->_deferred_updates.load_relaxed();
       while (true) {
-        _deferred_updates_next = (head == nullptr) ? this : head;
-        Block* fetched = AtomicAccess::cmpxchg(&owner->_deferred_updates, head, this);
+        _deferred_updates_next.store_relaxed((head == nullptr) ? this : head);
+        Block* fetched = owner->_deferred_updates.compare_exchange(head, this);
         if (fetched == head) break; // Successful update.
         head = fetched;             // Retry with updated head.
       }
@@ -720,7 +722,7 @@ void OopStorage::Block::release_entries(uintx releasing, OopStorage* owner) {
     }
   }
   // Release hold on empty block deletion.
-  AtomicAccess::dec(&_release_refcount);
+  _release_refcount.sub_then_fetch(1u);
 }
 
 // Process one available deferred update.  Returns true if one was processed.
@@ -729,13 +731,13 @@ bool OopStorage::reduce_deferred_updates() {
   // Atomically pop a block off the list, if any available.
   // No ABA issue because this is only called by one thread at a time.
   // The atomicity is wrto pushes by release().
-  Block* block = AtomicAccess::load_acquire(&_deferred_updates);
+  Block* block = _deferred_updates.load_acquire();
   while (true) {
     if (block == nullptr) return false;
     // Try atomic pop of block from list.
     Block* tail = block->deferred_updates_next();
     if (block == tail) tail = nullptr; // Handle self-loop end marker.
-    Block* fetched = AtomicAccess::cmpxchg(&_deferred_updates, block, tail);
+    Block* fetched = _deferred_updates.compare_exchange(block, tail);
     if (fetched == block) break; // Update successful.
     block = fetched;             // Retry with updated block.
   }
@@ -780,7 +782,7 @@ void OopStorage::release(const oop* ptr) {
   assert(block != nullptr, "%s: invalid release " PTR_FORMAT, name(), p2i(ptr));
   log_trace(oopstorage, ref)("%s: releasing " PTR_FORMAT, name(), p2i(ptr));
   block->release_entries(block->bitmask_for_entry(ptr), this);
-  AtomicAccess::dec(&_allocation_count);
+  _allocation_count.sub_then_fetch(1u);
 }
 
 void OopStorage::release(const oop* const* ptrs, size_t size) {
@@ -806,7 +808,7 @@ void OopStorage::release(const oop* const* ptrs, size_t size) {
     }
     // Release the contiguous entries that are in block.
     block->release_entries(releasing, this);
-    AtomicAccess::sub(&_allocation_count, count);
+    _allocation_count.sub_then_fetch(count);
   }
 }
 
@@ -837,7 +839,7 @@ OopStorage::OopStorage(const char* name, MemTag mem_tag) :
   _mem_tag(mem_tag),
   _needs_cleanup(false)
 {
-  _active_array->increment_refcount();
+  _active_array.load_relaxed()->increment_refcount();
   assert(_active_mutex->rank() < _allocation_mutex->rank(),
          "%s: active_mutex must have lower rank than allocation_mutex", _name);
   assert(Service_lock->rank() < _active_mutex->rank(),
@@ -852,20 +854,21 @@ void OopStorage::delete_empty_block(const Block& block) {
 
 OopStorage::~OopStorage() {
   Block* block;
-  while ((block = _deferred_updates) != nullptr) {
-    _deferred_updates = block->deferred_updates_next();
+  while ((block = _deferred_updates.load_relaxed()) != nullptr) {
+    _deferred_updates.store_relaxed(block->deferred_updates_next());
     block->set_deferred_updates_next(nullptr);
   }
   while ((block = _allocation_list.head()) != nullptr) {
     _allocation_list.unlink(*block);
   }
-  bool unreferenced = _active_array->decrement_refcount();
+  ActiveArray* array = _active_array.load_relaxed();
+  bool unreferenced = array->decrement_refcount();
   assert(unreferenced, "deleting storage while _active_array is referenced");
-  for (size_t i = _active_array->block_count(); 0 < i; ) {
-    block = _active_array->at(--i);
+  for (size_t i = array->block_count(); 0 < i; ) {
+    block = array->at(--i);
     Block::delete_block(*block);
   }
-  ActiveArray::destroy(_active_array);
+  ActiveArray::destroy(array);
   os::free(const_cast<char*>(_name));
 }
 
@@ -894,7 +897,7 @@ bool OopStorage::should_report_num_dead() const {
 // face of frequent explicit ServiceThread wakeups, hence the defer period.
 
 // Global cleanup request state.
-static volatile bool needs_cleanup_requested = false;
+static Atomic<bool> needs_cleanup_requested{false};
 
 // Time after which a cleanup is permitted.
 static jlong cleanup_permit_time = 0;
@@ -906,12 +909,11 @@ const jlong cleanup_defer_period = 500 * NANOSECS_PER_MILLISEC;
 bool OopStorage::has_cleanup_work_and_reset() {
   assert_lock_strong(Service_lock);
 
-  if (AtomicAccess::load_acquire(&needs_cleanup_requested) &&
-      os::javaTimeNanos() > cleanup_permit_time) {
-    cleanup_permit_time =
-      os::javaTimeNanos() + cleanup_defer_period;
+  if (needs_cleanup_requested.load_acquire() &&
+      (os::javaTimeNanos() > cleanup_permit_time)) {
+    cleanup_permit_time = os::javaTimeNanos() + cleanup_defer_period;
     // Set the request flag false and return its old value.
-    AtomicAccess::release_store(&needs_cleanup_requested, false);
+    needs_cleanup_requested.release_store(false);
     return true;
   } else {
     return false;
@@ -923,22 +925,22 @@ bool OopStorage::has_cleanup_work_and_reset() {
 void OopStorage::record_needs_cleanup() {
   // Set local flag first, else ServiceThread could wake up and miss
   // the request.
-  AtomicAccess::release_store(&_needs_cleanup, true);
-  AtomicAccess::release_store_fence(&needs_cleanup_requested, true);
+  _needs_cleanup.release_store(true);
+  needs_cleanup_requested.release_store_fence(true);
 }
 
 bool OopStorage::delete_empty_blocks() {
   // ServiceThread might have oopstorage work, but not for this object.
   // But check for deferred updates, which might provide cleanup work.
-  if (!AtomicAccess::load_acquire(&_needs_cleanup) &&
-      (AtomicAccess::load_acquire(&_deferred_updates) == nullptr)) {
+  if (!_needs_cleanup.load_acquire() &&
+      (_deferred_updates.load_acquire() == nullptr)) {
     return false;
   }
 
   MutexLocker ml(_allocation_mutex, Mutex::_no_safepoint_check_flag);
 
   // Clear the request before processing.
-  AtomicAccess::release_store_fence(&_needs_cleanup, false);
+  _needs_cleanup.release_store_fence(false);
 
   // Other threads could be adding to the empty block count or the
   // deferred update list while we're working.  Set an upper bound on
@@ -977,7 +979,7 @@ bool OopStorage::delete_empty_blocks() {
         // but don't re-notify, to avoid useless spinning of the
         // ServiceThread.  Instead, iteration completion notifies.
         if (_concurrent_iteration_count > 0) return true;
-        _active_array->remove(block);
+        _active_array.load_relaxed()->remove(block);
       }
       // Remove block from _allocation_list and delete it.
       _allocation_list.unlink(*block);
@@ -1001,8 +1003,9 @@ OopStorage::EntryStatus OopStorage::allocation_status(const oop* ptr) const {
     MutexLocker ml(_allocation_mutex, Mutex::_no_safepoint_check_flag);
     // Block could be a false positive, so get index carefully.
     size_t index = Block::active_index_safe(block);
-    if ((index < _active_array->block_count()) &&
-        (block == _active_array->at(index)) &&
+    ActiveArray* array = _active_array.load_relaxed();
+    if ((index < array->block_count()) &&
+        (block == array->at(index)) &&
         block->contains(ptr)) {
       if ((block->allocated_bitmask() & block->bitmask_for_entry(ptr)) != 0) {
         return ALLOCATED_ENTRY;
@@ -1015,7 +1018,7 @@ OopStorage::EntryStatus OopStorage::allocation_status(const oop* ptr) const {
 }
 
 size_t OopStorage::allocation_count() const {
-  return _allocation_count;
+  return _allocation_count.load_relaxed();
 }
 
 size_t OopStorage::block_count() const {
@@ -1084,7 +1087,7 @@ void OopStorage::BasicParState::update_concurrent_iteration_count(int value) {
 
 bool OopStorage::BasicParState::claim_next_segment(IterationData* data) {
   data->_processed += data->_segment_end - data->_segment_start;
-  size_t start = AtomicAccess::load_acquire(&_next_block);
+  size_t start = _next_block.load_acquire();
   if (start >= _block_count) {
     return finish_iteration(data); // No more blocks available.
   }
@@ -1097,11 +1100,11 @@ bool OopStorage::BasicParState::claim_next_segment(IterationData* data) {
   size_t max_step = 10;
   size_t remaining = _block_count - start;
   size_t step = MIN2(max_step, 1 + (remaining / _estimated_thread_count));
-  // AtomicAccess::add with possible overshoot.  This can perform better
+  // Atomic add with possible overshoot.  This can perform better
   // than a CAS loop on some platforms when there is contention.
   // We can cope with the uncertainty by recomputing start/end from
   // the result of the add, and dealing with potential overshoot.
-  size_t end = AtomicAccess::add(&_next_block, step);
+  size_t end = _next_block.add_then_fetch(step);
   // _next_block may have changed, so recompute start from result of add.
   start = end - step;
   // _next_block may have changed so much that end has overshot.
@@ -1128,15 +1131,15 @@ bool OopStorage::BasicParState::finish_iteration(const IterationData* data) cons
 }
 
 size_t OopStorage::BasicParState::num_dead() const {
-  return AtomicAccess::load(&_num_dead);
+  return _num_dead.load_relaxed();
 }
 
 void OopStorage::BasicParState::increment_num_dead(size_t num_dead) {
-  AtomicAccess::add(&_num_dead, num_dead);
+  _num_dead.add_then_fetch(num_dead);
 }
 
 void OopStorage::BasicParState::report_num_dead() const {
-  _storage->report_num_dead(AtomicAccess::load(&_num_dead));
+  _storage->report_num_dead(_num_dead.load_relaxed());
 }
 
 const char* OopStorage::name() const { return _name; }
@@ -1164,8 +1167,8 @@ bool OopStorage::Block::print_containing(const oop* addr, outputStream* st) {
 #ifndef PRODUCT
 
 void OopStorage::print_on(outputStream* st) const {
-  size_t allocations = _allocation_count;
-  size_t blocks = _active_array->block_count();
+  size_t allocations = _allocation_count.load_relaxed();
+  size_t blocks = _active_array.load_relaxed()->block_count();
 
   double data_size = section_size * section_count;
   double alloc_percentage = percent_of((double)allocations, blocks * data_size);
diff --git a/src/hotspot/share/gc/shared/oopStorage.hpp b/src/hotspot/share/gc/shared/oopStorage.hpp
index 34c980a0586..6097eeaa4f4 100644
--- a/src/hotspot/share/gc/shared/oopStorage.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/singleWriterSynchronizer.hpp"
@@ -258,15 +259,15 @@ private:
 
 private:
   const char* _name;
-  ActiveArray* _active_array;
+  Atomic<ActiveArray*> _active_array;
   AllocationList _allocation_list;
-  Block* volatile _deferred_updates;
+  Atomic<Block*> _deferred_updates;
   Mutex* _allocation_mutex;
   Mutex* _active_mutex;
   NumDeadCallback _num_dead_callback;
 
-  // Volatile for racy unlocked accesses.
-  volatile size_t _allocation_count;
+  // Atomic for racy unlocked accesses.
+  Atomic<size_t> _allocation_count;
 
   // Protection for _active_array.
   mutable SingleWriterSynchronizer _protect_active;
@@ -278,7 +279,7 @@ private:
   MemTag _mem_tag;
 
   // Flag indicating this storage object is a candidate for empty block deletion.
-  volatile bool _needs_cleanup;
+  Atomic<bool> _needs_cleanup;
 
   // Clients construct via "create" factory function.
   OopStorage(const char* name, MemTag mem_tag);
diff --git a/src/hotspot/share/gc/shared/oopStorage.inline.hpp b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
index 4fb1d8fcaf1..c2747781a6b 100644
--- a/src/hotspot/share/gc/shared/oopStorage.inline.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
@@ -30,6 +30,7 @@
 #include "cppstdlib/type_traits.hpp"
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
 #include "utilities/count_trailing_zeros.hpp"
@@ -42,8 +43,8 @@ class OopStorage::ActiveArray {
   friend class OopStorage::TestAccess;
 
   size_t _size;
-  volatile size_t _block_count;
-  mutable volatile int _refcount;
+  Atomic<size_t> _block_count;
+  mutable Atomic<int> _refcount;
   // Block* _blocks[1];            // Pseudo flexible array member.
 
   ActiveArray(size_t size);
@@ -104,7 +105,7 @@ inline OopStorage::Block** OopStorage::ActiveArray::block_ptr(size_t index) {
 }
 
 inline OopStorage::Block* OopStorage::ActiveArray::at(size_t index) const {
-  assert(index < _block_count, "precondition");
+  assert(index < _block_count.load_relaxed(), "precondition");
   return *block_ptr(index);
 }
 
@@ -135,16 +136,16 @@ class OopStorage::Block /* No base class, to avoid messing up alignment. */ {
   oop _data[BitsPerWord];
   static const unsigned _data_pos = 0; // Position of _data.
 
-  volatile uintx _allocated_bitmask; // One bit per _data element.
+  Atomic<uintx> _allocated_bitmask; // One bit per _data element.
   intptr_t _owner_address;
   void* _memory;              // Unaligned storage containing block.
   size_t _active_index;
   AllocationListEntry _allocation_list_entry;
-  Block* volatile _deferred_updates_next;
-  volatile uintx _release_refcount;
+  Atomic<Block*> _deferred_updates_next;
+  Atomic<uintx> _release_refcount;
 
   Block(const OopStorage* owner, void* memory);
-  ~Block();
+  ~Block() NOT_DEBUG(= default);
 
   void check_index(unsigned index) const;
   unsigned get_index(const oop* ptr) const;
@@ -322,7 +323,7 @@ inline const oop* OopStorage::Block::get_pointer(unsigned index) const {
 }
 
 inline uintx OopStorage::Block::allocated_bitmask() const {
-  return _allocated_bitmask;
+  return _allocated_bitmask.load_relaxed();
 }
 
 inline uintx OopStorage::Block::bitmask_for_index(unsigned index) const {
@@ -366,7 +367,7 @@ inline bool OopStorage::iterate_impl(F f, Storage* storage) {
   // Propagate const/non-const iteration to the block layer, by using
   // const or non-const blocks as corresponding to Storage.
   using BlockPtr = std::conditional_t<std::is_const<Storage>::value, const Block*, Block*>;
-  ActiveArray* blocks = storage->_active_array;
+  ActiveArray* blocks = storage->_active_array.load_relaxed();
   size_t limit = blocks->block_count();
   for (size_t i = 0; i < limit; ++i) {
     BlockPtr block = blocks->at(i);
diff --git a/src/hotspot/share/gc/shared/oopStorageParState.hpp b/src/hotspot/share/gc/shared/oopStorageParState.hpp
index 046bf9de8c2..cad1a1f0cf6 100644
--- a/src/hotspot/share/gc/shared/oopStorageParState.hpp
+++ b/src/hotspot/share/gc/shared/oopStorageParState.hpp
@@ -27,6 +27,7 @@
 
 #include "cppstdlib/type_traits.hpp"
 #include "gc/shared/oopStorage.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 //////////////////////////////////////////////////////////////////////////////
@@ -131,10 +132,10 @@ class OopStorage::BasicParState {
   const OopStorage* _storage;
   ActiveArray* _active_array;
   size_t _block_count;
-  volatile size_t _next_block;
+  Atomic<size_t> _next_block;
   uint _estimated_thread_count;
   bool _concurrent;
-  volatile size_t _num_dead;
+  Atomic<size_t> _num_dead;
 
   NONCOPYABLE(BasicParState);
 
diff --git a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
index 285cc2630a3..b343e7fc47f 100644
--- a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
+++ b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
@@ -47,7 +47,7 @@ public:
   typedef OopStorage::ActiveArray ActiveArray;
 
   static ActiveArray& active_array(const OopStorage& storage) {
-    return *storage._active_array;
+    return *storage._active_array.load_relaxed();
   }
 
   static AllocationList& allocation_list(OopStorage& storage) {
@@ -90,7 +90,7 @@ public:
   }
 
   static void block_array_set_block_count(ActiveArray* blocks, size_t count) {
-    blocks->_block_count = count;
+    blocks->_block_count.store_relaxed(count);
   }
 
   static const oop* get_block_pointer(const Block& block, unsigned index) {

From 902aa4dcd297fef34cb302e468b030c48665ec84 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Tue, 18 Nov 2025 23:51:32 +0000
Subject: [PATCH 242/512] 8372120: Add missing sound keyword to MIDI tests

Reviewed-by: kcr, dholmes
---
 .../javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java    | 1 +
 test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java  | 1 +
 .../sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java     | 1 +
 test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java   | 1 +
 .../javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java | 1 +
 5 files changed, 5 insertions(+)

diff --git a/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java b/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java
index 27290738a0c..afac39b83fb 100644
--- a/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java
+++ b/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4933700
+ * @key sound
  * @summary Tests that default devices return MidiDeviceTransmitter/Receiver and returned objects return correct MidiDevice
  * @compile TestAllDevices.java
  * @run main TestAllDevices
diff --git a/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java b/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
index 00c57f46c98..7b8c4b0a3f2 100644
--- a/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
+++ b/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
@@ -35,6 +35,7 @@ import static javax.sound.midi.SysexMessage.SYSTEM_EXCLUSIVE;
 /**
  * @test
  * @bug 8074211 8237495 8301310
+ * @key sound
  * @summary fail with memory errors when asked to send a sysex message starting
  *          with 0xF7
  */
diff --git a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java
index efb57eeeae2..05ba16cded5 100644
--- a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java
+++ b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java
@@ -32,6 +32,7 @@ import static java.util.ServiceLoader.load;
 /**
  * @test
  * @bug 8143909
+ * @key sound
  * @author Sergey Bylokhov
  */
 public final class ExpectedNPEOnNull {
diff --git a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java
index 8eabb992bca..71d27c4943c 100644
--- a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java
+++ b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java
@@ -35,6 +35,7 @@ import static java.util.ServiceLoader.load;
 /**
  * @test
  * @bug 8059743
+ * @key sound
  * @summary MidiDeviceProvider shouldn't returns incorrect results in case of
  *          some unknown MidiDevice.Info
  * @author Sergey Bylokhov
diff --git a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java
index 685a5e8af62..5d37759fbad 100644
--- a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java
+++ b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java
@@ -30,6 +30,7 @@ import static java.util.ServiceLoader.load;
 /**
  * @test
  * @bug 8058115
+ * @key sound
  * @summary MidiDeviceProvider shouldn't returns incorrect results in case of
  *          unsupported MidiDevice.Info
  * @author Sergey Bylokhov

From 02ff38f2d7f6abc0e4661e8226bc6780b7a11c3a Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 19 Nov 2025 05:04:34 +0000
Subject: [PATCH 243/512] 8363986: Heap region in CDS archive is not at
 deterministic address

Reviewed-by: kvn, asmehra
---
 src/hotspot/share/cds/aotArtifactFinder.hpp   |   2 +-
 src/hotspot/share/cds/aotMapLogger.cpp        |   2 +-
 src/hotspot/share/cds/aotMappedHeapWriter.cpp | 105 ++++++++++++++++--
 src/hotspot/share/cds/aotMappedHeapWriter.hpp |  44 ++++----
 src/hotspot/share/cds/filemap.cpp             |  10 +-
 src/hotspot/share/cds/heapShared.hpp          |   2 +-
 test/hotspot/jtreg/ProblemList.txt            |   1 -
 7 files changed, 125 insertions(+), 41 deletions(-)

diff --git a/src/hotspot/share/cds/aotArtifactFinder.hpp b/src/hotspot/share/cds/aotArtifactFinder.hpp
index 405222a8753..05bcde6b0ac 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.hpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.hpp
@@ -39,7 +39,7 @@ class TypeArrayKlass;
 // It also decides what Klasses must be cached in aot-initialized state.
 //
 // ArchiveBuilder uses [1] as roots to scan for all MetaspaceObjs that need to be cached.
-// ArchiveHeapWriter uses [2] to create an image of the archived heap.
+// HeapShared uses [2] to create an image of the archived heap.
 //
 // [1] is stored in _all_cached_classes in aotArtifactFinder.cpp.
 // [2] is stored in HeapShared::archived_object_cache().
diff --git a/src/hotspot/share/cds/aotMapLogger.cpp b/src/hotspot/share/cds/aotMapLogger.cpp
index d0a63c56093..a252eae4b84 100644
--- a/src/hotspot/share/cds/aotMapLogger.cpp
+++ b/src/hotspot/share/cds/aotMapLogger.cpp
@@ -796,7 +796,7 @@ void AOTMapLogger::dumptime_log_mapped_heap_region(ArchiveMappedHeapInfo* heap_i
   address buffer_start = address(r.start()); // start of the current oop inside the buffer
   address buffer_end = address(r.end());
 
-  address requested_base = UseCompressedOops ? (address)CompressedOops::base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
+  address requested_base = UseCompressedOops ? AOTMappedHeapWriter::narrow_oop_base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
   address requested_start = UseCompressedOops ? AOTMappedHeapWriter::buffered_addr_to_requested_addr(buffer_start) : requested_base;
 
   log_region_range("heap", buffer_start, buffer_end, requested_start);
diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.cpp b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
index ff9319d266b..98f400c989c 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
@@ -55,7 +55,7 @@
 
 GrowableArrayCHeap<u1, mtClassShared>* AOTMappedHeapWriter::_buffer = nullptr;
 
-// The following are offsets from buffer_bottom()
+bool AOTMappedHeapWriter::_is_writing_deterministic_heap = false;
 size_t AOTMappedHeapWriter::_buffer_used;
 
 // Heap root segments
@@ -74,7 +74,7 @@ AOTMappedHeapWriter::_buffer_offset_to_source_obj_table = nullptr;
 DumpedInternedStrings *AOTMappedHeapWriter::_dumped_interned_strings = nullptr;
 
 typedef HashTable<
-      size_t,    // offset of a filler from ArchiveHeapWriter::buffer_bottom()
+      size_t,    // offset of a filler from AOTMappedHeapWriter::buffer_bottom()
       size_t,    // size of this filler (in bytes)
       127,       // prime number
       AnyObj::C_HEAP,
@@ -96,6 +96,45 @@ void AOTMappedHeapWriter::init() {
     _source_objs = new GrowableArrayCHeap<oop, mtClassShared>(10000);
 
     guarantee(MIN_GC_REGION_ALIGNMENT <= G1HeapRegion::min_region_size_in_words() * HeapWordSize, "must be");
+
+    if (CDSConfig::old_cds_flags_used()) {
+      // With the old CDS workflow, we can guatantee determninistic output: given
+      // the same classlist file, we can generate the same static CDS archive.
+      // To ensure determinism, we always use the same compressed oop encoding
+      // (zero-based, no shift). See set_requested_address_range().
+      _is_writing_deterministic_heap = true;
+    } else {
+      // Determninistic output is not supported by the new AOT workflow, so
+      // we don't force the (zero-based, no shift) encoding. This way, it is more
+      // likely that we can avoid oop relocation in the production run.
+      _is_writing_deterministic_heap = false;
+    }
+  }
+}
+
+// For AOTMappedHeapWriter::narrow_oop_{mode, base, shift}(), see comments
+// in AOTMappedHeapWriter::set_requested_address_range(),
+CompressedOops::Mode AOTMappedHeapWriter::narrow_oop_mode() {
+  if (is_writing_deterministic_heap()) {
+    return CompressedOops::UnscaledNarrowOop;
+  } else {
+    return CompressedOops::mode();
+  }
+}
+
+address AOTMappedHeapWriter::narrow_oop_base() {
+  if (is_writing_deterministic_heap()) {
+    return (address)0;
+  } else {
+    return CompressedOops::base();
+  }
+}
+
+int AOTMappedHeapWriter::narrow_oop_shift() {
+  if (is_writing_deterministic_heap()) {
+    return 0;
+  } else {
+    return CompressedOops::shift();
   }
 }
 
@@ -116,7 +155,7 @@ void AOTMappedHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
   assert(CDSConfig::is_dumping_heap(), "sanity");
   allocate_buffer();
   copy_source_objs_to_buffer(roots);
-  set_requested_address(heap_info);
+  set_requested_address_range(heap_info);
   relocate_embedded_oops(roots, heap_info);
 }
 
@@ -536,14 +575,55 @@ size_t AOTMappedHeapWriter::copy_one_source_obj_to_buffer(oop src_obj) {
   return buffered_obj_offset;
 }
 
-void AOTMappedHeapWriter::set_requested_address(ArchiveMappedHeapInfo* info) {
+// Set the range [_requested_bottom, _requested_top), the requested address range of all
+// the archived heap objects in the production run.
+//
+// (1) UseCompressedOops == true && !is_writing_deterministic_heap()
+//
+//     The archived objects are stored using the COOPS encoding of the assembly phase.
+//     We pick a range within the heap used by the assembly phase.
+//
+//     In the production run, if different COOPS encodings are used:
+//         - The heap contents needs to be relocated.
+//
+// (2) UseCompressedOops == true && is_writing_deterministic_heap()
+//
+//     We always use zero-based, zero-shift encoding. _requested_top is aligned to 0x10000000.
+//
+// (3) UseCompressedOops == false:
+//
+//     In the production run, the heap range is usually picked (randomly) by the OS, so we
+//     will almost always need to perform relocation, regardless of how we pick the requested
+//     address range.
+//
+//     So we just hard code it to NOCOOPS_REQUESTED_BASE.
+//
+void AOTMappedHeapWriter::set_requested_address_range(ArchiveMappedHeapInfo* info) {
   assert(!info->is_used(), "only set once");
 
   size_t heap_region_byte_size = _buffer_used;
   assert(heap_region_byte_size > 0, "must archived at least one object!");
 
   if (UseCompressedOops) {
-    if (UseG1GC) {
+    if (is_writing_deterministic_heap()) {
+      // Pick a heap range so that requested addresses can be encoded with zero-base/no shift.
+      // We align the requested bottom to at least 1 MB: if the production run uses G1 with a small
+      // heap (e.g., -Xmx256m), it's likely that we can map the archived objects at the
+      // requested location to avoid relocation.
+      //
+      // For other collectors or larger heaps, relocation is unavoidable, but is usually
+      // quite cheap. If you really want to avoid relocation, use the AOT workflow instead.
+      address heap_end = (address)0x100000000;
+      size_t alignment = MAX2(MIN_GC_REGION_ALIGNMENT, 1024 * 1024);
+      if (align_up(heap_region_byte_size, alignment) >= (size_t)heap_end) {
+        log_error(aot, heap)("cached heap space is too large: %zu bytes", heap_region_byte_size);
+        AOTMetaspace::unrecoverable_writing_error();
+      }
+      _requested_bottom = align_down(heap_end - heap_region_byte_size, alignment);
+    } else if (UseG1GC) {
+      // For G1, pick the range at the top of the current heap. If the exact same heap sizes
+      // are used in the production run, it's likely that we can map the archived objects
+      // at the requested location to avoid relocation.
       address heap_end = (address)G1CollectedHeap::heap()->reserved().end();
       log_info(aot, heap)("Heap end = %p", heap_end);
       _requested_bottom = align_down(heap_end - heap_region_byte_size, G1HeapRegion::GrainBytes);
@@ -612,7 +692,14 @@ oop AOTMappedHeapWriter::load_oop_from_buffer(narrowOop* buffered_addr) {
 
 template <typename T> void AOTMappedHeapWriter::relocate_field_in_buffer(T* field_addr_in_buffer, oop source_referent, CHeapBitMap* oopmap) {
   oop request_referent = source_obj_to_requested_obj(source_referent);
-  store_requested_oop_in_buffer<T>(field_addr_in_buffer, request_referent);
+  if (UseCompressedOops && is_writing_deterministic_heap()) {
+    // We use zero-based, 0-shift encoding, so the narrowOop is just the lower
+    // 32 bits of request_referent
+    intptr_t addr = cast_from_oop<intptr_t>(request_referent);
+    *((narrowOop*)field_addr_in_buffer) = checked_cast<narrowOop>(addr);
+  } else {
+    store_requested_oop_in_buffer<T>(field_addr_in_buffer, request_referent);
+  }
   if (request_referent != nullptr) {
     mark_oop_pointer<T>(field_addr_in_buffer, oopmap);
   }
@@ -918,9 +1005,9 @@ AOTMapLogger::OopDataIterator* AOTMappedHeapWriter::oop_iterator(ArchiveMappedHe
   address buffer_start = address(r.start());
   address buffer_end = address(r.end());
 
-  address requested_base = UseCompressedOops ? (address)CompressedOops::base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
-  address requested_start = UseCompressedOops ? buffered_addr_to_requested_addr(buffer_start) : requested_base;
-  int requested_shift =  CompressedOops::shift();
+  address requested_base = UseCompressedOops ? AOTMappedHeapWriter::narrow_oop_base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
+  address requested_start = UseCompressedOops ? AOTMappedHeapWriter::buffered_addr_to_requested_addr(buffer_start) : requested_base;
+  int requested_shift = AOTMappedHeapWriter::narrow_oop_shift();
   intptr_t buffer_to_requested_delta = requested_start - buffer_start;
   uint64_t buffer_start_narrow_oop = 0xdeadbeed;
   if (UseCompressedOops) {
diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.hpp b/src/hotspot/share/cds/aotMappedHeapWriter.hpp
index 9a85b83d3d1..eafd38ac8bb 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.hpp
@@ -29,6 +29,7 @@
 #include "cds/heapShared.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "oops/compressedOops.hpp"
 #include "oops/oopHandle.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/exceptions.hpp"
@@ -71,7 +72,7 @@ class AOTMappedHeapWriter : AllStatic {
   //   These are entered into HeapShared::archived_object_cache().
   //
   // - "buffered objects" are copies of the "source objects", and are stored in into
-  //   ArchiveHeapWriter::_buffer, which is a GrowableArray that sits outside of
+  //   AOTMappedHeapWriter::_buffer, which is a GrowableArray that sits outside of
   //   the valid heap range. Therefore we avoid using the addresses of these copies
   //   as oops. They are usually called "buffered_addr" in the code (of the type "address").
   //
@@ -81,26 +82,11 @@ class AOTMappedHeapWriter : AllStatic {
   // - Each archived object has a "requested address" -- at run time, if the object
   //   can be mapped at this address, we can avoid relocation.
   //
-  // The requested address is implemented differently depending on UseCompressedOops:
+  // The requested address of an archived object is essentially its buffered_addr + delta,
+  // where delta is (_requested_bottom - buffer_bottom());
   //
-  // UseCompressedOops == true:
-  //   The archived objects are stored assuming that the runtime COOPS compression
-  //   scheme is exactly the same as in dump time (or else a more expensive runtime relocation
-  //   would be needed.)
-  //
-  //   At dump time, we assume that the runtime heap range is exactly the same as
-  //   in dump time. The requested addresses of the archived objects are chosen such that
-  //   they would occupy the top end of a G1 heap (TBD when dumping is supported by other
-  //   collectors. See JDK-8298614).
-  //
-  // UseCompressedOops == false:
-  //   At runtime, the heap range is usually picked (randomly) by the OS, so we will almost always
-  //   need to perform relocation. Hence, the goal of the "requested address" is to ensure that
-  //   the contents of the archived objects are deterministic. I.e., the oop fields of archived
-  //   objects will always point to deterministic addresses.
-  //
-  //   For G1, the archived heap is written such that the lowest archived object is placed
-  //   at NOCOOPS_REQUESTED_BASE. (TBD after JDK-8298614).
+  // The requested addresses of all archived objects are within [_requested_bottom, _requested_top).
+  // See AOTMappedHeapWriter::set_requested_address_range() for more info.
   // ----------------------------------------------------------------------
 
 public:
@@ -111,6 +97,15 @@ public:
   // Shenandoah heap region size can never be smaller than 256K.
   static constexpr int MIN_GC_REGION_ALIGNMENT = 256 * K;
 
+  // The heap contents are required to be deterministic when dumping "old" CDS archives, in order
+  // to support reproducible lib/server/classes*.jsa when building the JDK.
+  static bool is_writing_deterministic_heap() { return _is_writing_deterministic_heap; }
+
+  // The oop encoding used by the archived heap objects.
+  static CompressedOops::Mode narrow_oop_mode();
+  static address narrow_oop_base();
+  static int narrow_oop_shift();
+
   static const int INITIAL_TABLE_SIZE = 15889; // prime number
   static const int MAX_TABLE_SIZE     = 1000000;
 
@@ -121,6 +116,7 @@ private:
     int _field_offset;
   };
 
+  static bool _is_writing_deterministic_heap;
   static GrowableArrayCHeap<u1, mtClassShared>* _buffer;
 
   // The number of bytes that have written into _buffer (may be smaller than _buffer->length()).
@@ -130,15 +126,15 @@ private:
   static HeapRootSegments _heap_root_segments;
 
   // The address range of the requested location of the archived heap objects.
-  static address _requested_bottom;
-  static address _requested_top;
+  static address _requested_bottom; // The requested address of the lowest archived heap object
+  static address _requested_top;    // The exclusive end of the highest archived heap object
 
   static GrowableArrayCHeap<NativePointerInfo, mtClassShared>* _native_pointers;
   static GrowableArrayCHeap<oop, mtClassShared>* _source_objs;
   static DumpedInternedStrings *_dumped_interned_strings;
 
   // We sort _source_objs_order to minimize the number of bits in ptrmap and oopmap.
-  // See comments near the body of ArchiveHeapWriter::compare_objs_by_oop_fields().
+  // See comments near the body of AOTMappedHeapWriter::compare_objs_by_oop_fields().
   // The objects will be written in the order of:
   //_source_objs->at(_source_objs_order->at(0)._index)
   // source_objs->at(_source_objs_order->at(1)._index)
@@ -200,7 +196,7 @@ private:
   static int filler_array_length(size_t fill_bytes);
   static HeapWord* init_filler_array_at_buffer_top(int array_length, size_t fill_bytes);
 
-  static void set_requested_address(ArchiveMappedHeapInfo* info);
+  static void set_requested_address_range(ArchiveMappedHeapInfo* info);
   static void mark_native_pointers(oop orig_obj);
   static void relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots, ArchiveMappedHeapInfo* info);
   static void compute_ptrmap(ArchiveMappedHeapInfo *info);
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index ae92ce31058..61df0a86b41 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -216,12 +216,14 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   _obj_alignment = ObjectAlignmentInBytes;
   _compact_strings = CompactStrings;
   _compact_headers = UseCompactObjectHeaders;
+#if INCLUDE_CDS_JAVA_HEAP
   if (CDSConfig::is_dumping_heap()) {
     _object_streaming_mode = HeapShared::is_writing_streaming_mode();
-    _narrow_oop_mode = CompressedOops::mode();
-    _narrow_oop_base = CompressedOops::base();
-    _narrow_oop_shift = CompressedOops::shift();
+    _narrow_oop_mode = AOTMappedHeapWriter::narrow_oop_mode();
+    _narrow_oop_base = AOTMappedHeapWriter::narrow_oop_base();
+    _narrow_oop_shift = AOTMappedHeapWriter::narrow_oop_shift();
   }
+#endif
   _compressed_oops = UseCompressedOops;
   _compressed_class_ptrs = UseCompressedClassPointers;
   if (UseCompressedClassPointers) {
@@ -911,7 +913,7 @@ void FileMapInfo::write_region(int region, char* base, size_t size,
     if (HeapShared::is_writing_mapping_mode()) {
       requested_base = (char*)AOTMappedHeapWriter::requested_address();
       if (UseCompressedOops) {
-        mapping_offset = (size_t)((address)requested_base - CompressedOops::base());
+        mapping_offset = (size_t)((address)requested_base - AOTMappedHeapWriter::narrow_oop_base());
         assert((mapping_offset >> CompressedOops::shift()) << CompressedOops::shift() == mapping_offset, "must be");
       }
     } else {
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index 2c782f7231b..118c60faa60 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -332,7 +332,7 @@ public:
     // Used by CDSHeapVerifier.
     OopHandle _orig_referrer;
 
-    // The location of this object inside ArchiveHeapWriter::_buffer
+    // The location of this object inside {AOTMappedHeapWriter, AOTStreamedHeapWriter}::_buffer
     size_t _buffer_offset;
 
     // One or more fields in this object are pointing to non-null oops.
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index a45fdc09323..934ef03a987 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -100,7 +100,6 @@ gc/shenandoah/TestSieveObjects.java#no-tlab-genshen 8361099 generic-all
 
 # :hotspot_runtime
 
-runtime/cds/DeterministicDump.java 8363986 macosx-x64,macosx-aarch64
 runtime/jni/terminatedThread/TestTerminatedThread.java 8317789 aix-ppc64
 runtime/Monitor/SyncOnValueBasedClassTest.java 8340995 linux-s390x
 runtime/os/TestTracePageSizes.java#no-options 8267460 linux-aarch64

From 99135d2e05bb501fe9f9f0d36abd25894d0f93de Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Wed, 19 Nov 2025 08:47:57 +0000
Subject: [PATCH 244/512] 8359145: Implement JEP 530: Primitive Types in
 Patterns, instanceof, and switch (Fourth Preview)

Reviewed-by: jlahoda
---
 .../java/lang/runtime/SwitchBootstraps.java   |   2 +-
 .../com/sun/tools/javac/code/TypeTag.java     |  12 +-
 .../com/sun/tools/javac/code/Types.java       | 135 +++++++--
 .../com/sun/tools/javac/comp/Attr.java        |   2 +-
 .../com/sun/tools/javac/comp/Check.java       |  29 +-
 .../javac/comp/ExhaustivenessComputer.java    |   4 +-
 .../com/sun/tools/javac/comp/Lower.java       |   5 +-
 .../sun/tools/javac/comp/TransPatterns.java   |   2 +-
 .../tools/javac/patterns/Domination.java      |  12 +-
 .../tools/javac/patterns/DominationWithPP.out |  14 +
 .../PrimitivePatternsSwitchConstants.java     |  71 +++++
 .../PrimitivePatternsSwitchConstants.out      |  11 +
 .../PrimitivePatternsSwitchErrors.java        |  67 ++++-
 .../PrimitivePatternsSwitchErrors.out         |  11 +-
 ...veUnconditionallyExactInAssignability.java | 138 +++++++++
 ...onditionallyExactInExhaustiveSwitches.java | 280 ++++++++++++++++++
 .../tools/javac/patterns/T8332463a.java       |   8 +-
 .../tools/javac/patterns/T8332463a.out        |   6 +
 .../tools/javac/patterns/T8332463b.java       |   5 +-
 .../tools/javac/patterns/T8332463b.out        |   2 +
 .../tools/javac/types/UnknownTypeTest.java    |   4 +-
 .../tools/lib/types/TypeHarness.java          |  15 +
 22 files changed, 776 insertions(+), 59 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/DominationWithPP.out
 create mode 100644 test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java
 create mode 100644 test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.out
 create mode 100644 test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInAssignability.java
 create mode 100644 test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInExhaustiveSwitches.java
 create mode 100644 test/langtools/tools/javac/patterns/T8332463a.out
 create mode 100644 test/langtools/tools/javac/patterns/T8332463b.out

diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index 99716baf439..30b6df0073e 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -777,7 +777,7 @@ public final class SwitchBootstraps {
         return name + "$$TypeSwitch";
     }
 
-    // this method should be in sync with com.sun.tools.javac.code.Types.checkUnconditionallyExactPrimitives
+    // this method should be in sync with com.sun.tools.javac.code.Types.isUnconditionallyExactTypeBased
     private static boolean unconditionalExactnessCheck(Class<?> selectorType, Class<?> targetType) {
         Wrapper selectorWrapper = Wrapper.forBasicType(selectorType);
         Wrapper targetWrapper   = Wrapper.forBasicType(targetType);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java
index 0b97b119119..b2771556eb2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeTag.java
@@ -26,7 +26,7 @@
 package com.sun.tools.javac.code;
 
 import com.sun.source.tree.Tree.Kind;
-
+import java.lang.runtime.ExactConversionsSupport;
 import javax.lang.model.type.TypeKind;
 
 import static com.sun.tools.javac.code.TypeTag.NumericClasses.*;
@@ -186,6 +186,10 @@ public enum TypeTag {
         return (this.numericClass & tag.superClasses) != 0;
     }
 
+    public boolean isNumeric() {
+        return this.numericClass != 0;
+    }
+
     /** Returns the number of type tags.
      */
     public static int getTypeTagCount() {
@@ -247,11 +251,11 @@ public enum TypeTag {
             case BOOLEAN:
                 return 0 <= value && value <= 1;
             case BYTE:
-                return Byte.MIN_VALUE <= value && value <= Byte.MAX_VALUE;
+                return ExactConversionsSupport.isIntToByteExact(value);
             case CHAR:
-                return Character.MIN_VALUE <= value && value <= Character.MAX_VALUE;
+                return ExactConversionsSupport.isIntToCharExact(value);
             case SHORT:
-                return Short.MIN_VALUE <= value && value <= Short.MAX_VALUE;
+                return ExactConversionsSupport.isIntToShortExact(value);
             case INT:
                 return true;
             default:
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index d59505555f2..3f3eb1f9623 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -26,6 +26,7 @@
 package com.sun.tools.javac.code;
 
 import java.lang.ref.SoftReference;
+import java.lang.runtime.ExactConversionsSupport;
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Locale;
@@ -5086,46 +5087,128 @@ public class Types {
     }
     // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Unconditionality">
-    /** Check unconditionality between any combination of reference or primitive types.
+    // <editor-fold defaultstate="collapsed" desc="Unconditional Exactness">
+    /** Check type-based unconditional exactness between any combination of
+     *  reference or primitive types according to JLS 5.7.2.
      *
-     *  Rules:
-     *    an identity conversion
-     *    a widening reference conversion
-     *    a widening primitive conversion (delegates to `checkUnconditionallyExactPrimitives`)
-     *    a boxing conversion
-     *    a boxing conversion followed by a widening reference conversion
+     *  The following are unconditionally exact regardless of the input
+     *  expression:
+     *
+     *    - an identity conversion
+     *    - a widening reference conversion
+     *    - an exact widening primitive conversion
+     *    - a boxing conversion
+     *    - a boxing conversion followed by a widening reference conversion
      *
      *  @param source     Source primitive or reference type
      *  @param target     Target primitive or reference type
      */
-    public boolean isUnconditionallyExact(Type source, Type target) {
+    public boolean isUnconditionallyExactTypeBased(Type source, Type target) {
         if (isSameType(source, target)) {
             return true;
         }
 
-        return target.isPrimitive()
-                ? isUnconditionallyExactPrimitives(source, target)
-                : isSubtype(boxedTypeOrType(erasure(source)), target);
+        if (target.isPrimitive()) {
+            if (source.isPrimitive() &&
+                ((source.getTag().isStrictSubRangeOf(target.getTag())) &&
+                        !((source.hasTag(BYTE) && target.hasTag(CHAR)) ||
+                          (source.hasTag(INT) && target.hasTag(FLOAT)) ||
+                          (source.hasTag(LONG) && (target.hasTag(DOUBLE) || target.hasTag(FLOAT)))))) return true;
+            else {
+                return false;
+            }
+        } else {
+            return isSubtype(boxedTypeOrType(erasure(source)), target);
+        }
     }
 
-    /** Check unconditionality between primitive types.
+    /** Check value-based unconditional exactness between any combination of
+     *  reference or primitive types for the value of a constant expression
+     *   according to JLS 5.7.2.
      *
-     *  - widening from one integral type to another,
-     *  - widening from one floating point type to another,
-     *  - widening from byte, short, or char to a floating point type,
-     *  - widening from int to double.
+     *  The following can be unconditionally exact if the source primitive is a
+     *  constant expression and the conversions is exact for that constant
+     *  expression:
      *
-     *  @param selectorType     Type of selector
-     *  @param targetType       Target type
+     *    - a narrowing primitive conversion
+     *    - a widening and narrowing primitive conversion
+     *    - a widening primitive conversion that is not exact
+     *
+     *  @param source     Source primitive or reference type, should be a numeric value
+     *  @param target     Target primitive or reference type
      */
-    public boolean isUnconditionallyExactPrimitives(Type selectorType, Type targetType) {
-        return isSameType(selectorType, targetType) ||
-                (selectorType.isPrimitive() && targetType.isPrimitive()) &&
-                ((selectorType.getTag().isStrictSubRangeOf(targetType.getTag())) &&
-                        !((selectorType.hasTag(BYTE) && targetType.hasTag(CHAR)) ||
-                          (selectorType.hasTag(INT)  && targetType.hasTag(FLOAT)) ||
-                          (selectorType.hasTag(LONG) && (targetType.hasTag(DOUBLE) || targetType.hasTag(FLOAT)))));
+    public boolean isUnconditionallyExactValueBased(Type source, Type target) {
+        if (!(source.constValue() instanceof Number value) || !target.getTag().isNumeric()) return false;
+
+        switch (source.getTag()) {
+            case BYTE:
+                switch (target.getTag()) {
+                    case CHAR:      return ExactConversionsSupport.isIntToCharExact(value.intValue());
+                }
+                break;
+            case CHAR:
+                switch (target.getTag()) {
+                    case BYTE:      return ExactConversionsSupport.isIntToByteExact(value.intValue());
+                    case SHORT:     return ExactConversionsSupport.isIntToShortExact(value.intValue());
+                }
+                break;
+            case SHORT:
+                switch (target.getTag()) {
+                    case BYTE:      return ExactConversionsSupport.isIntToByteExact(value.intValue());
+                    case CHAR:      return ExactConversionsSupport.isIntToCharExact(value.intValue());
+                }
+                break;
+            case INT:
+                switch (target.getTag()) {
+                    case BYTE:      return ExactConversionsSupport.isIntToByteExact(value.intValue());
+                    case CHAR:      return ExactConversionsSupport.isIntToCharExact(value.intValue());
+                    case SHORT:     return ExactConversionsSupport.isIntToShortExact(value.intValue());
+                    case FLOAT:     return ExactConversionsSupport.isIntToFloatExact(value.intValue());
+                }
+                break;
+            case FLOAT:
+                switch (target.getTag()) {
+                    case BYTE:      return ExactConversionsSupport.isFloatToByteExact(value.floatValue());
+                    case CHAR:      return ExactConversionsSupport.isFloatToCharExact(value.floatValue());
+                    case SHORT:     return ExactConversionsSupport.isFloatToShortExact(value.floatValue());
+                    case INT:       return ExactConversionsSupport.isFloatToIntExact(value.floatValue());
+                    case LONG:      return ExactConversionsSupport.isFloatToLongExact(value.floatValue());
+                }
+                break;
+            case LONG:
+                switch (target.getTag()) {
+                    case BYTE:      return ExactConversionsSupport.isLongToByteExact(value.longValue());
+                    case CHAR:      return ExactConversionsSupport.isLongToCharExact(value.longValue());
+                    case SHORT:     return ExactConversionsSupport.isLongToShortExact(value.longValue());
+                    case INT:       return ExactConversionsSupport.isLongToIntExact(value.longValue());
+                    case FLOAT:     return ExactConversionsSupport.isLongToFloatExact(value.longValue());
+                    case DOUBLE:    return ExactConversionsSupport.isLongToDoubleExact(value.longValue());
+                }
+                break;
+            case DOUBLE:
+                switch (target.getTag()) {
+                    case BYTE:      return ExactConversionsSupport.isDoubleToByteExact(value.doubleValue());
+                    case CHAR:      return ExactConversionsSupport.isDoubleToCharExact(value.doubleValue());
+                    case SHORT:     return ExactConversionsSupport.isDoubleToShortExact(value.doubleValue());
+                    case INT:       return ExactConversionsSupport.isDoubleToIntExact(value.doubleValue());
+                    case FLOAT:     return ExactConversionsSupport.isDoubleToFloatExact(value.doubleValue());
+                    case LONG:      return ExactConversionsSupport.isDoubleToLongExact(value.doubleValue());
+                }
+                break;
+        }
+        return true;
+    }
+
+    /** Check both type or value-based unconditional exactness between any
+     *  combination of reference or primitive types for the value of a constant
+     *  expression according to JLS 5.7.2.
+     *
+     *  @param source     Source primitive or reference type, should be a numeric value
+     *  @param target     Target primitive or reference type
+     */
+    public boolean isUnconditionallyExactCombined(Type currentType, Type testType) {
+        return isUnconditionallyExactTypeBased(currentType, testType) ||
+                (currentType.constValue() instanceof Number && isUnconditionallyExactValueBased(currentType, testType));
     }
     // </editor-fold>
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index a45f7466f9e..ad41adcc135 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1861,7 +1861,7 @@ public class Attr extends JCTree.Visitor {
                         boolean unconditional =
                                 unguarded &&
                                 !patternType.isErroneous() &&
-                                types.isUnconditionallyExact(seltype, patternType);
+                                types.isUnconditionallyExactTypeBased(seltype, patternType);
                         if (unconditional) {
                             if (hasUnconditionalPattern) {
                                 log.error(pat.pos(), Errors.DuplicateUnconditionalPattern);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 9098568f42a..94b14f3122f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -28,7 +28,6 @@ package com.sun.tools.javac.comp;
 import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.function.ToIntBiFunction;
@@ -167,6 +166,7 @@ public class Check {
         allowModules = Feature.MODULES.allowedInSource(source);
         allowRecords = Feature.RECORDS.allowedInSource(source);
         allowSealed = Feature.SEALED_CLASSES.allowedInSource(source);
+        allowPrimitivePatterns = preview.isEnabled() && Feature.PRIMITIVE_PATTERNS.allowedInSource(source);
     }
 
     /** Character for synthetic names
@@ -190,6 +190,10 @@ public class Check {
      */
     private final boolean allowSealed;
 
+    /** Are primitive patterns allowed
+     */
+    private final boolean allowPrimitivePatterns;
+
     /** Whether to force suppression of deprecation and preview warnings.
      *  This happens when attributing import statements for JDK 9+.
      *  @see Feature#DEPRECATION_ON_IMPORT
@@ -4764,21 +4768,26 @@ public class Check {
                     JCCase testCase = caseAndLabel.fst;
                     JCCaseLabel testCaseLabel = caseAndLabel.snd;
                     Type testType = labelType(testCaseLabel);
+
+                    // an unconditional pattern cannot be followed by any other label
+                    if (allowPrimitivePatterns && unconditionalCaseLabel == testCaseLabel && unconditionalCaseLabel != label) {
+                        log.error(label.pos(), Errors.PatternDominated);
+                        continue;
+                    }
+
                     boolean dominated = false;
-                    if (types.isUnconditionallyExact(currentType, testType) &&
-                        !currentType.hasTag(ERROR) && !testType.hasTag(ERROR)) {
-                        //the current label is potentially dominated by the existing (test) label, check:
-                        if (label instanceof JCConstantCaseLabel) {
-                            dominated |= !(testCaseLabel instanceof JCConstantCaseLabel) &&
+                    if (!currentType.hasTag(ERROR) && !testType.hasTag(ERROR)) {
+                        // the current label is potentially dominated by the existing (test) label, check:
+                        if (types.isUnconditionallyExactCombined(currentType, testType) &&
+                                label instanceof JCConstantCaseLabel) {
+                            dominated = !(testCaseLabel instanceof JCConstantCaseLabel) &&
                                          TreeInfo.unguardedCase(testCase);
                         } else if (label instanceof JCPatternCaseLabel patternCL &&
                                    testCaseLabel instanceof JCPatternCaseLabel testPatternCaseLabel &&
                                    (testCase.equals(c) || TreeInfo.unguardedCase(testCase))) {
-                            dominated = patternDominated(testPatternCaseLabel.pat,
-                                                         patternCL.pat);
+                            dominated = patternDominated(testPatternCaseLabel.pat, patternCL.pat);
                         }
                     }
-
                     if (dominated) {
                         log.error(label.pos(), Errors.PatternDominated);
                     }
@@ -4798,7 +4807,7 @@ public class Check {
         private boolean patternDominated(JCPattern existingPattern, JCPattern currentPattern) {
             Type existingPatternType = types.erasure(existingPattern.type);
             Type currentPatternType = types.erasure(currentPattern.type);
-            if (!types.isUnconditionallyExact(currentPatternType, existingPatternType)) {
+            if (!types.isUnconditionallyExactTypeBased(currentPatternType, existingPatternType)) {
                 return false;
             }
             if (currentPattern instanceof JCBindingPattern ||
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
index 036e86dff5e..bbc330832f3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
@@ -568,8 +568,8 @@ public class ExhaustivenessComputer {
             Type pattype = types.erasure(bp.type);
 
             return seltype.isPrimitive() ?
-                    types.isUnconditionallyExact(seltype, pattype) :
-                    (bp.type.isPrimitive() && types.isUnconditionallyExact(types.unboxedType(seltype), bp.type)) || types.isSubtype(seltype, pattype);
+                    types.isUnconditionallyExactTypeBased(seltype, pattype) :
+                    (bp.type.isPrimitive() && types.isUnconditionallyExactTypeBased(types.unboxedType(seltype), bp.type)) || types.isSubtype(seltype, pattype);
         }
         return false;
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index aee7f0afe39..2db3435a382 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -36,7 +36,6 @@ import com.sun.tools.javac.jvm.*;
 import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
 import com.sun.tools.javac.main.Option.PkgInfo;
 import com.sun.tools.javac.resources.CompilerProperties.Fragments;
-import com.sun.tools.javac.resources.CompilerProperties.Notes;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -2835,7 +2834,7 @@ public class Lower extends TreeTranslator {
             JCExpression exactnessCheck;
             JCExpression instanceOfExpr = translate(tree.expr);
 
-            if (types.isUnconditionallyExact(tree.expr.type, tree.pattern.type)) {
+            if (types.isUnconditionallyExactTypeBased(tree.expr.type, tree.pattern.type)) {
                 // instanceOfExpr; true
                 prefixStatement = make.Exec(instanceOfExpr);
                 exactnessCheck = make.Literal(BOOLEAN, 1).setType(syms.booleanType.constType(1));
@@ -2844,7 +2843,7 @@ public class Lower extends TreeTranslator {
                 prefixStatement = null;
                 exactnessCheck = getExactnessCheck(tree, instanceOfExpr);
             } else if (tree.expr.type.isReference()) {
-                if (types.isUnconditionallyExact(types.unboxedType(tree.expr.type), tree.pattern.type)) {
+                if (types.isUnconditionallyExactTypeBased(types.unboxedType(tree.expr.type), tree.pattern.type)) {
                     // instanceOfExpr != null
                     prefixStatement = null;
                     exactnessCheck = makeBinary(NE, instanceOfExpr, makeNull());
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
index 58c36a5cf7c..11774c313e3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -921,7 +921,7 @@ public class TransPatterns extends TreeTranslator {
                         JCBindingPattern binding = (JCBindingPattern) instanceofCheck.pattern;
                         hasUnconditional =
                                 (!types.erasure(binding.type).isPrimitive() ? instanceofCheck.allowNull :
-                                types.isUnconditionallyExact(commonNestedExpression.type, types.erasure(binding.type))) &&
+                                types.isUnconditionallyExactTypeBased(commonNestedExpression.type, types.erasure(binding.type))) &&
                                 accList.tail.isEmpty();
                         List<JCCaseLabel> newLabel;
 
diff --git a/test/langtools/tools/javac/patterns/Domination.java b/test/langtools/tools/javac/patterns/Domination.java
index a5cdb99b9c8..dd9d1153696 100644
--- a/test/langtools/tools/javac/patterns/Domination.java
+++ b/test/langtools/tools/javac/patterns/Domination.java
@@ -26,8 +26,8 @@
  * @bug 8262891 8290709
  * @summary Check the pattern domination error are reported correctly.
  * @compile/fail/ref=Domination.out -XDrawDiagnostics Domination.java
+ * @compile/fail/ref=DominationWithPP.out --enable-preview --source ${jdk.version} -XDrawDiagnostics Domination.java
  */
-
 public class Domination {
     int testDominatesError1(Object o) {
         switch (o) {
@@ -218,4 +218,14 @@ public class Domination {
             case null : return -1;
         }
     }
+
+    int testCasePatternDominatedbyPreceedingUnconditionalCasePattern () {
+        interface A {}
+        interface B {}
+        A aa = new A() {};
+        switch (aa) {
+            case A a : return 1;
+            case B b : return -1;
+        }
+    }
 }
diff --git a/test/langtools/tools/javac/patterns/DominationWithPP.out b/test/langtools/tools/javac/patterns/DominationWithPP.out
new file mode 100644
index 00000000000..119cc003d07
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/DominationWithPP.out
@@ -0,0 +1,14 @@
+Domination.java:35:18: compiler.err.pattern.dominated
+Domination.java:43:18: compiler.err.pattern.dominated
+Domination.java:51:18: compiler.err.pattern.dominated
+Domination.java:67:18: compiler.err.pattern.dominated
+Domination.java:88:18: compiler.err.pattern.dominated
+Domination.java:113:18: compiler.err.pattern.dominated
+Domination.java:144:18: compiler.err.pattern.dominated
+Domination.java:153:18: compiler.err.pattern.dominated
+Domination.java:184:18: compiler.err.pattern.dominated
+Domination.java:193:18: compiler.err.pattern.dominated
+Domination.java:202:18: compiler.err.pattern.dominated
+Domination.java:211:18: compiler.err.pattern.dominated
+Domination.java:228:18: compiler.err.pattern.dominated
+13 errors
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java
new file mode 100644
index 00000000000..2890b315e62
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java
@@ -0,0 +1,71 @@
+/*
+ * @test /nodynamiccopyright/
+ * @summary Retain exhaustiveness properties of switches with a constant selector
+ * @enablePreview
+ * @compile/fail/ref=PrimitivePatternsSwitchConstants.out -XDrawDiagnostics -XDshould-stop.at=FLOW PrimitivePatternsSwitchConstants.java
+ */
+public class PrimitivePatternsSwitchConstants {
+    void testConstExpressions() {
+        switch (42) {         // error: not exhaustive
+            case byte _ :
+        }
+
+        switch (42l) {        // error: not exhaustive
+            case byte _ :
+        }
+
+        switch (123456) {     // error: not exhaustive
+            case byte _ :
+        }
+
+        switch (16_777_216) { // error: not exhaustive
+            case float _ :
+        }
+
+        switch (16_777_217) { // error: not exhaustive
+            case float _ :
+        }
+
+        switch (42d) {        // error: not exhaustive
+            case float _ :
+        }
+
+        switch (1) {          // OK
+            case long _ :
+        }
+
+        final int i = 42;
+        switch (i) {          // OK
+            case long _ :
+        }
+
+        switch (1) {          // error: non-exhaustive
+            case Long _ :         // error: widening primitive conversion and boxing is not supported
+        }
+
+        switch (42) {
+            case byte bb  -> {}
+            case int ii   -> {}   // OK
+        };
+
+        switch (42) {
+            case 42 -> {}
+            case int ii -> {}     // OK
+        };
+
+        switch (42) {
+            case (byte) 42 -> {}
+            case int ii -> {}     // OK
+        };
+
+        switch (42) {
+            case 42 -> {}
+            default -> {}         // OK
+        };
+
+        switch (42) {
+            default -> {}         // OK
+            case 42 -> {}
+        };
+    }
+}
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.out b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.out
new file mode 100644
index 00000000000..9a983a86437
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.out
@@ -0,0 +1,11 @@
+PrimitivePatternsSwitchConstants.java:43:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.Long)
+PrimitivePatternsSwitchConstants.java:9:9: compiler.err.not.exhaustive.statement
+PrimitivePatternsSwitchConstants.java:13:9: compiler.err.not.exhaustive.statement
+PrimitivePatternsSwitchConstants.java:17:9: compiler.err.not.exhaustive.statement
+PrimitivePatternsSwitchConstants.java:21:9: compiler.err.not.exhaustive.statement
+PrimitivePatternsSwitchConstants.java:25:9: compiler.err.not.exhaustive.statement
+PrimitivePatternsSwitchConstants.java:29:9: compiler.err.not.exhaustive.statement
+PrimitivePatternsSwitchConstants.java:42:9: compiler.err.not.exhaustive.statement
+- compiler.note.preview.filename: PrimitivePatternsSwitchConstants.java, DEFAULT
+- compiler.note.preview.recompile
+8 errors
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
index 3d47c4ac9bc..dacd48f441c 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
@@ -59,7 +59,7 @@ public class PrimitivePatternsSwitchErrors {
         int i = 42;
         return switch (i) {
             case Integer ib  -> ib;
-            case byte ip     -> ip; // OK - not dominated!
+            case byte ip     -> ip; // Error - dominated!
         };
     }
 
@@ -265,4 +265,69 @@ public class PrimitivePatternsSwitchErrors {
     public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndNarrowingPrimitive(T i) {
         return i instanceof byte b;  // not allowed as a conversion
     }
+
+    public static void dominanceIntFloat() {
+        int ii = 42;
+        switch (ii) {
+            case int i -> {}
+            case float f -> {} // Error - dominated!
+        }
+    }
+
+    public static void noDominanceIntFloat() {
+        int ii = 42;
+        switch (ii) {
+            case float f -> {}
+            case int i -> {} // ok
+        }
+    }
+
+    public static void strengtheningDominance() {
+        byte x = 42;
+        switch (x) {
+            case short s -> {}
+            case 42      -> {}    // error: dominated
+        }
+
+        long l = 42l;
+        switch (l) {
+            case short s -> {}
+            case 42l     -> {}    // error: dominated
+            case long _  -> {}
+        }
+
+        char c = 'a';
+        switch (c) {
+            case short s -> {}
+            case 42      -> {}    // error: dominated
+            case char _  -> {}
+        }
+
+        int x2 = 42;
+        switch(x2) {
+            case float f -> {}
+            case 16_777_216 -> {}  // error: dominated
+            default -> {}
+        }
+
+        switch(x2) {
+            case float f -> {}
+            case 16_777_217 -> {} // OK
+            default -> {}
+        }
+
+        switch(x2) {
+            case int ii   -> {}
+            case float f -> {}    // error: dominated
+        }
+    }
+
+    public static void unconditionalFollowedByDefault() {
+        int ii = 42;
+        switch (ii) {
+            case int i -> {}
+            case float f -> {} // Error - dominated!
+            default -> {}      // Error - unconditional and default
+        }
+    }
 }
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
index 75fd62016a0..5a0822a9aef 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
@@ -1,6 +1,7 @@
 PrimitivePatternsSwitchErrors.java:15:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:24:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:31:24: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.Long)
+PrimitivePatternsSwitchErrors.java:62:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:70:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:78:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:84:18: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: long, byte)
@@ -29,6 +30,14 @@ PrimitivePatternsSwitchErrors.java:248:18: compiler.err.prob.found.req: (compile
 PrimitivePatternsSwitchErrors.java:255:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Long, int)
 PrimitivePatternsSwitchErrors.java:261:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Short, char)
 PrimitivePatternsSwitchErrors.java:266:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, byte)
+PrimitivePatternsSwitchErrors.java:273:18: compiler.err.pattern.dominated
+PrimitivePatternsSwitchErrors.java:289:18: compiler.err.pattern.dominated
+PrimitivePatternsSwitchErrors.java:295:18: compiler.err.pattern.dominated
+PrimitivePatternsSwitchErrors.java:302:18: compiler.err.pattern.dominated
+PrimitivePatternsSwitchErrors.java:309:18: compiler.err.pattern.dominated
+PrimitivePatternsSwitchErrors.java:321:18: compiler.err.pattern.dominated
+PrimitivePatternsSwitchErrors.java:330:13: compiler.err.unconditional.pattern.and.default
+PrimitivePatternsSwitchErrors.java:329:18: compiler.err.pattern.dominated
 PrimitivePatternsSwitchErrors.java:30:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:37:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:44:16: compiler.err.not.exhaustive
@@ -43,4 +52,4 @@ PrimitivePatternsSwitchErrors.java:254:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:260:16: compiler.err.not.exhaustive
 - compiler.note.preview.filename: PrimitivePatternsSwitchErrors.java, DEFAULT
 - compiler.note.preview.recompile
-43 errors
\ No newline at end of file
+52 errors
diff --git a/test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInAssignability.java b/test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInAssignability.java
new file mode 100644
index 00000000000..c75dff3f8ad
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInAssignability.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Check assignability of narrowing p.c. with constant expressions vs exact conversion methods
+ * @library /tools/lib/types
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.tree
+ * @build TypeHarness
+ * @compile PrimitiveUnconditionallyExactInAssignability.java
+ * @run main PrimitiveUnconditionallyExactInAssignability
+ */
+
+import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.TypeTag;
+
+import java.lang.runtime.ExactConversionsSupport;
+
+import static com.sun.tools.javac.code.TypeTag.ERROR;
+import static com.sun.tools.javac.code.TypeTag.INT;
+
+public class PrimitiveUnconditionallyExactInAssignability extends TypeHarness {
+    PrimitiveUnconditionallyExactInAssignability() {
+    }
+
+    void assertOriginalAssignmentNarrowingAndUnconditionality() {
+        // byte b = <constant short> vs ExactConversionsSupport::isIntToByteExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Short.MIN_VALUE),                     predef.byteType, ExactConversionsSupport.isIntToByteExact(Short.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((short) (Byte.MIN_VALUE - 1)),        predef.byteType, ExactConversionsSupport.isIntToByteExact((short) (Byte.MIN_VALUE - 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant((short) (Byte.MAX_VALUE + 1)),        predef.byteType, ExactConversionsSupport.isIntToByteExact((short) (Byte.MAX_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Short.MAX_VALUE),                     predef.byteType, ExactConversionsSupport.isIntToByteExact(Short.MAX_VALUE));
+
+        // byte b = <constant char> vs ExactConversionsSupport::isIntToByteExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Character.MIN_VALUE),                 predef.byteType, ExactConversionsSupport.isIntToByteExact(Character.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((char) (Byte.MAX_VALUE + 1)),         predef.byteType, ExactConversionsSupport.isIntToByteExact((char) (Byte.MAX_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Character.MAX_VALUE),                 predef.byteType, ExactConversionsSupport.isIntToByteExact(Character.MAX_VALUE));
+
+        // byte b = <constant int>  vs ExactConversionsSupport::isIntToByteExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Integer.MIN_VALUE),                   predef.byteType, ExactConversionsSupport.isIntToByteExact(Integer.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((int) (Byte.MIN_VALUE - 1)),          predef.byteType, ExactConversionsSupport.isIntToByteExact((int) (Byte.MIN_VALUE - 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant((int) (Byte.MAX_VALUE + 1)),          predef.byteType, ExactConversionsSupport.isIntToByteExact((int) (Byte.MAX_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Integer.MAX_VALUE),                   predef.byteType, ExactConversionsSupport.isIntToByteExact(Integer.MAX_VALUE));
+
+        // char c = <constant short> vs ExactConversionsSupport::isIntToCharExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Short.MIN_VALUE),                     predef.charType, ExactConversionsSupport.isIntToCharExact(Short.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((short) (Character.MIN_VALUE - 1)),   predef.charType, ExactConversionsSupport.isIntToCharExact((short) (Character.MIN_VALUE - 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant((short) (Character.MAX_VALUE + 1)),   predef.charType, ExactConversionsSupport.isIntToCharExact((short) (Character.MIN_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Short.MAX_VALUE),                     predef.charType, ExactConversionsSupport.isIntToCharExact(Short.MAX_VALUE));
+
+        // char c = <constant int>   vs ExactConversionsSupport::isIntToCharExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Integer.MIN_VALUE),                   predef.charType, ExactConversionsSupport.isIntToCharExact(Integer.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((int) (Character.MIN_VALUE - 1)),     predef.charType, ExactConversionsSupport.isIntToCharExact((int) (Character.MIN_VALUE - 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant((int) (Character.MAX_VALUE + 1)),     predef.charType, ExactConversionsSupport.isIntToCharExact((int) (Character.MAX_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Integer.MAX_VALUE),                   predef.charType, ExactConversionsSupport.isIntToCharExact(Integer.MAX_VALUE));
+
+        // short b = <constant char> vs ExactConversionsSupport::isIntToShortExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Character.MIN_VALUE),                 predef.shortType, ExactConversionsSupport.isIntToShortExact(Character.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((char) (Character.MAX_VALUE + 1)),    predef.shortType, ExactConversionsSupport.isIntToShortExact((char) (Character.MAX_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Character.MAX_VALUE),                 predef.shortType, ExactConversionsSupport.isIntToShortExact(Character.MAX_VALUE));
+
+        // short b = <constant int>  vs ExactConversionsSupport::isIntToShortExact
+        assertOriginaAndUpdatedAssignable(fac.Constant(Integer.MIN_VALUE),                   predef.shortType, ExactConversionsSupport.isIntToShortExact(Integer.MIN_VALUE));
+        assertOriginaAndUpdatedAssignable(fac.Constant((int) (Short.MIN_VALUE - 1)),         predef.shortType, ExactConversionsSupport.isIntToShortExact((int) (Short.MIN_VALUE - 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant((int) (Short.MAX_VALUE + 1)),         predef.shortType, ExactConversionsSupport.isIntToShortExact((int) (Short.MAX_VALUE + 1)));
+        assertOriginaAndUpdatedAssignable(fac.Constant(Integer.MAX_VALUE),                   predef.shortType, ExactConversionsSupport.isIntToShortExact(Integer.MAX_VALUE));
+    }
+    // where
+    public void assertOriginaAndUpdatedAssignable(Type s, Type t, boolean expected) {
+        assertAssignable(s, t, originalIsAssignable(s, t));
+    }
+    public boolean originalIsAssignable(Type t, Type s) {
+        if (t.hasTag(ERROR))
+            return true;
+        if (t.getTag().isSubRangeOf(INT) && t.constValue() != null) {
+            int value = ((Number)t.constValue()).intValue();
+            switch (s.getTag()) {
+                case BYTE:
+                case CHAR:
+                case SHORT:
+                case INT:
+                    if (originalCheckRange(s.getTag(), value))
+                        return true;
+                    break;
+            }
+        }
+        return types.isConvertible(t, s);
+    }
+    public boolean originalCheckRange(TypeTag that, int value) {
+        switch (that) {
+            case BOOLEAN:
+                return 0 <= value && value <= 1;
+            case BYTE:
+                return Byte.MIN_VALUE <= value && value <= Byte.MAX_VALUE;
+            case CHAR:
+                return Character.MIN_VALUE <= value && value <= Character.MAX_VALUE;
+            case SHORT:
+                return Short.MIN_VALUE <= value && value <= Short.MAX_VALUE;
+            case INT:
+                return true;
+            default:
+                throw new AssertionError();
+        }
+    }
+
+    private void error(String msg) {
+        throw new AssertionError("Unexpected result in original isAssignable: " + msg);
+    }
+
+    public static void main(String[] args) {
+        PrimitiveUnconditionallyExactInAssignability harness = new PrimitiveUnconditionallyExactInAssignability();
+        harness.assertOriginalAssignmentNarrowingAndUnconditionality();
+    }
+}
diff --git a/test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInExhaustiveSwitches.java b/test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInExhaustiveSwitches.java
new file mode 100644
index 00000000000..e6a204968dd
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/PrimitiveUnconditionallyExactInExhaustiveSwitches.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Check the unconditionally exact for constant primitives used in the exhaustiveness check
+ * @library /tools/lib/types
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.tree
+ * @build TypeHarness
+ * @compile PrimitiveUnconditionallyExactInExhaustiveSwitches.java
+ * @run main PrimitiveUnconditionallyExactInExhaustiveSwitches
+ */
+
+public class PrimitiveUnconditionallyExactInExhaustiveSwitches extends TypeHarness {
+
+    PrimitiveUnconditionallyExactInExhaustiveSwitches() {
+    }
+    public void testByte() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))), predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (0))),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.byteType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.byteType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.byteType, true);
+    }
+    public void testShort() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (0))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.shortType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.shortType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.shortType, true);
+    }
+    public void testChar() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (0))),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.charType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.charType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.charType, true);
+    }
+    public void testInt() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (0))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.intType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.intType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.intType, true);
+    }
+    public void testLong() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (0))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.longType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.longType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.longType, true);
+    }
+    public void testFloat() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((byte) (0)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.floatType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.floatType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.floatType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.floatType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.floatType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.floatType, true);
+    }
+    public void testDouble() {
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MAX_VALUE))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (0))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((byte) (Byte.MIN_VALUE))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MAX_VALUE))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (0))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((short) (Short.MIN_VALUE))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MAX_VALUE))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((char) (Character.MIN_VALUE))),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MAX_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Integer.MIN_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MAX_VALUE)),predef.doubleType, false);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((0L)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Long.MIN_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MAX_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((float) 0)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.MIN_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NaN)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.POSITIVE_INFINITY)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Float.NEGATIVE_INFINITY)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0f)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0f)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MAX_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant(((double) 0)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.MIN_VALUE)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NaN)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.POSITIVE_INFINITY)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((Double.NEGATIVE_INFINITY)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((-0.0d)),predef.doubleType, true);
+        assertIsUnconditionallyExactConstantPrimitives(fac.Constant((+0.0d)),predef.doubleType, true);
+    }
+
+
+    public static void main(String[] args) {
+        PrimitiveUnconditionallyExactInExhaustiveSwitches harness = new PrimitiveUnconditionallyExactInExhaustiveSwitches();
+        harness.testByte();
+        harness.testShort();
+        harness.testChar();
+        harness.testInt();
+        harness.testDouble();
+        harness.testLong();
+        harness.testFloat();
+    }
+}
diff --git a/test/langtools/tools/javac/patterns/T8332463a.java b/test/langtools/tools/javac/patterns/T8332463a.java
index 96aaad86a85..2501a330af2 100644
--- a/test/langtools/tools/javac/patterns/T8332463a.java
+++ b/test/langtools/tools/javac/patterns/T8332463a.java
@@ -25,14 +25,14 @@
  * @test
  * @bug 8332463
  * @summary Byte conditional pattern case element dominates short constant case element
- * @compile --enable-preview --source ${jdk.version} T8332463a.java
+ * @compile/fail/ref=T8332463a.out -XDrawDiagnostics --enable-preview --source ${jdk.version} T8332463a.java
  */
 public class T8332463a {
     public int test2() {
         Byte i = (byte) 42;
         return switch (i) {
             case Byte ib  -> 1;
-            case short s  -> 2;
+            case short s  -> 2; // dominated
         };
     }
 
@@ -40,7 +40,7 @@ public class T8332463a {
         int i = 42;
         return switch (i) {
             case Integer ib -> 1;
-            case byte ip    -> 2;
+            case byte ip    -> 2; // dominated
         };
     }
 
@@ -48,7 +48,7 @@ public class T8332463a {
         int i = 42;
         return switch (i) {
             case Integer ib -> 1;
-            case (byte) 0   -> 2;
+            case (byte) 0   -> 2; // dominated
         };
     }
 }
diff --git a/test/langtools/tools/javac/patterns/T8332463a.out b/test/langtools/tools/javac/patterns/T8332463a.out
new file mode 100644
index 00000000000..5a4eec46d82
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8332463a.out
@@ -0,0 +1,6 @@
+T8332463a.java:35:18: compiler.err.pattern.dominated
+T8332463a.java:43:18: compiler.err.pattern.dominated
+T8332463a.java:51:18: compiler.err.pattern.dominated
+- compiler.note.preview.filename: T8332463a.java, DEFAULT
+- compiler.note.preview.recompile
+3 errors
diff --git a/test/langtools/tools/javac/patterns/T8332463b.java b/test/langtools/tools/javac/patterns/T8332463b.java
index 7956fd31f9f..73338b2bd8a 100644
--- a/test/langtools/tools/javac/patterns/T8332463b.java
+++ b/test/langtools/tools/javac/patterns/T8332463b.java
@@ -26,15 +26,14 @@
  * @bug 8332463
  * @summary Byte conditional pattern case element dominates short constant case element
  * @enablePreview
- * @compile T8332463b.java
- *  @compile --enable-preview --source ${jdk.version} T8332463b.java
+ * @compile/fail/ref=T8332463b.out -XDrawDiagnostics --enable-preview --source ${jdk.version} T8332463b.java
  */
 public class T8332463b {
     public int test1() {
         Byte i = (byte) 42;
         return switch (i) {
             case Byte ib   -> 1;
-            case (short) 0 -> 2;
+            case (short) 0 -> 2;  // dominated
         };
     }
 }
diff --git a/test/langtools/tools/javac/patterns/T8332463b.out b/test/langtools/tools/javac/patterns/T8332463b.out
new file mode 100644
index 00000000000..f912242a6c6
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8332463b.out
@@ -0,0 +1,2 @@
+T8332463b.java:36:18: compiler.err.pattern.dominated
+1 error
diff --git a/test/langtools/tools/javac/types/UnknownTypeTest.java b/test/langtools/tools/javac/types/UnknownTypeTest.java
index edb4ab3a9be..e79c583f142 100644
--- a/test/langtools/tools/javac/types/UnknownTypeTest.java
+++ b/test/langtools/tools/javac/types/UnknownTypeTest.java
@@ -73,7 +73,9 @@ public class UnknownTypeTest extends TypeHarness {
             types::isSameType,
             types::isSubtype,
             types::isSuperType,
-            types::isUnconditionallyExact,
+            types::isUnconditionallyExactValueBased,
+            types::isUnconditionallyExactTypeBased,
+            types::isUnconditionallyExactCombined,
             (t1, _) -> types.isArray(t1),
             (t1, _) -> types.isDerivedRaw(t1),
             (t1, _) -> types.isReifiable(t1),
diff --git a/test/langtools/tools/lib/types/TypeHarness.java b/test/langtools/tools/lib/types/TypeHarness.java
index 43bf2f961e9..296ea8d3f9b 100644
--- a/test/langtools/tools/lib/types/TypeHarness.java
+++ b/test/langtools/tools/lib/types/TypeHarness.java
@@ -188,6 +188,21 @@ public class TypeHarness {
         }
     }
 
+    /** assert that 's' is unconditionally exact to 't' */
+    public void assertIsUnconditionallyExactConstantPrimitives(Type s, Type t) {
+        assertIsUnconditionallyExactConstantPrimitives(s, t, true);
+    }
+
+    /** assert that 's' is/is not unconditionally exact to 't' */
+    public void assertIsUnconditionallyExactConstantPrimitives(Type s, Type t, boolean expected) {
+        if (types.isUnconditionallyExactValueBased(s, t) != expected) {
+            String msg = expected ?
+                    " is not unconditionally exact to " :
+                    " is unconditionally exact to ";
+            error(s + msg + t);
+        }
+    }
+
     /** assert that generic type 't' is well-formed */
     public void assertValidGenericType(Type t) {
         assertValidGenericType(t, true);

From 54893dc5c2a4702896029b1844bc9496325c8f26 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 19 Nov 2025 11:46:43 +0000
Subject: [PATCH 245/512] 8371985: Parallel: Move should_attempt_scavenge to
 ParallelScavengeHeap

Reviewed-by: fandreuzzi, iwalulya
---
 .../gc/parallel/parallelScavengeHeap.cpp      | 60 ++++++++++++++++--
 .../gc/parallel/parallelScavengeHeap.hpp      |  3 +
 src/hotspot/share/gc/parallel/psScavenge.cpp  | 62 +------------------
 src/hotspot/share/gc/parallel/psScavenge.hpp  |  2 -
 4 files changed, 59 insertions(+), 68 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index ebaea3ecba4..747e2f3228c 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -370,6 +370,55 @@ void ParallelScavengeHeap::do_full_collection(bool clear_all_soft_refs) {
   PSParallelCompact::invoke(clear_all_soft_refs, should_do_max_compaction);
 }
 
+bool ParallelScavengeHeap::should_attempt_young_gc() const {
+  const bool ShouldRunYoungGC = true;
+  const bool ShouldRunFullGC = false;
+
+  if (!_young_gen->to_space()->is_empty()) {
+    log_debug(gc, ergo)("To-space is not empty; run full-gc instead.");
+    return ShouldRunFullGC;
+  }
+
+  // Check if the predicted promoted bytes will overflow free space in old-gen.
+  PSAdaptiveSizePolicy* policy = _size_policy;
+
+  size_t avg_promoted = (size_t) policy->padded_average_promoted_in_bytes();
+  size_t promotion_estimate = MIN2(avg_promoted, _young_gen->used_in_bytes());
+  // Total free size after possible old gen expansion
+  size_t free_in_old_gen_with_expansion = _old_gen->max_gen_size() - _old_gen->used_in_bytes();
+
+  log_trace(gc, ergo)("average_promoted %zu; padded_average_promoted %zu",
+              (size_t) policy->average_promoted_in_bytes(),
+              (size_t) policy->padded_average_promoted_in_bytes());
+
+  if (promotion_estimate >= free_in_old_gen_with_expansion) {
+    log_debug(gc, ergo)("Run full-gc; predicted promotion size >= max free space in old-gen: %zu >= %zu",
+      promotion_estimate, free_in_old_gen_with_expansion);
+    return ShouldRunFullGC;
+  }
+
+  if (UseAdaptiveSizePolicy) {
+    // Also checking OS has enough free memory to commit and expand old-gen.
+    // Otherwise, the recorded gc-pause-time might be inflated to include time
+    // of OS preparing free memory, resulting in inaccurate young-gen resizing.
+    assert(_old_gen->committed().byte_size() >= _old_gen->used_in_bytes(), "inv");
+    // Use uint64_t instead of size_t for 32bit compatibility.
+    uint64_t free_mem_in_os;
+    if (os::free_memory(free_mem_in_os)) {
+      size_t actual_free = (size_t)MIN2(_old_gen->committed().byte_size() - _old_gen->used_in_bytes() + free_mem_in_os,
+                                        (uint64_t)SIZE_MAX);
+      if (promotion_estimate > actual_free) {
+        log_debug(gc, ergo)("Run full-gc; predicted promotion size > free space in old-gen and OS: %zu > %zu",
+          promotion_estimate, actual_free);
+        return ShouldRunFullGC;
+      }
+    }
+  }
+
+  // No particular reasons to run full-gc, so young-gc.
+  return ShouldRunYoungGC;
+}
+
 static bool check_gc_heap_free_limit(size_t free_bytes, size_t capacity_bytes) {
   return (free_bytes * 100 / capacity_bytes) < GCHeapFreeLimit;
 }
@@ -516,17 +565,18 @@ void ParallelScavengeHeap::collect(GCCause::Cause cause) {
   VMThread::execute(&op);
 }
 
-void ParallelScavengeHeap::collect_at_safepoint(bool full) {
+void ParallelScavengeHeap::collect_at_safepoint(bool is_full) {
   assert(!GCLocker::is_active(), "precondition");
   bool clear_soft_refs = GCCause::should_clear_all_soft_refs(_gc_cause);
 
-  if (!full) {
-    bool success = PSScavenge::invoke(clear_soft_refs);
-    if (success) {
+  if (!is_full && should_attempt_young_gc()) {
+    bool young_gc_success = PSScavenge::invoke(clear_soft_refs);
+    if (young_gc_success) {
       return;
     }
-    // Upgrade to Full-GC if young-gc fails
+    log_debug(gc, heap)("Upgrade to Full-GC since Young-gc failed.");
   }
+
   const bool should_do_max_compaction = false;
   PSParallelCompact::invoke(clear_soft_refs, should_do_max_compaction);
 }
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index f9161afc28f..0221fd2a90e 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -119,6 +119,9 @@ class ParallelScavengeHeap : public CollectedHeap {
   void print_tracing_info() const override;
   void stop() override {};
 
+  // Returns true if a young GC should be attempted, false if a full GC is preferred.
+  bool should_attempt_young_gc() const;
+
 public:
   ParallelScavengeHeap() :
     CollectedHeap(),
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index e738a13d464..d1d595df529 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -313,12 +313,6 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
   assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
   assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
 
-  // Check for potential problems.
-  if (!should_attempt_scavenge()) {
-    log_info(gc, ergo)("Young-gc might fail so skipping");
-    return false;
-  }
-
   IsSTWGCActiveMark mark;
 
   _gc_timer.register_gc_start();
@@ -336,8 +330,7 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
   PSOldGen* old_gen = heap->old_gen();
   PSAdaptiveSizePolicy* size_policy = heap->size_policy();
 
-  assert(young_gen->to_space()->is_empty(),
-         "Attempt to scavenge with live objects in to_space");
+  assert(young_gen->to_space()->is_empty(), "precondition");
 
   heap->increment_total_collections();
 
@@ -520,59 +513,6 @@ void PSScavenge::clean_up_failed_promotion() {
   NOT_PRODUCT(ParallelScavengeHeap::heap()->reset_promotion_should_fail();)
 }
 
-bool PSScavenge::should_attempt_scavenge() {
-  const bool ShouldRunYoungGC = true;
-  const bool ShouldRunFullGC = false;
-
-  ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
-  PSYoungGen* young_gen = heap->young_gen();
-  PSOldGen* old_gen = heap->old_gen();
-
-  if (!young_gen->to_space()->is_empty()) {
-    log_debug(gc, ergo)("To-space is not empty; run full-gc instead.");
-    return ShouldRunFullGC;
-  }
-
-  // Check if the predicted promoted bytes will overflow free space in old-gen.
-  PSAdaptiveSizePolicy* policy = heap->size_policy();
-
-  size_t avg_promoted = (size_t) policy->padded_average_promoted_in_bytes();
-  size_t promotion_estimate = MIN2(avg_promoted, young_gen->used_in_bytes());
-  // Total free size after possible old gen expansion
-  size_t free_in_old_gen_with_expansion = old_gen->max_gen_size() - old_gen->used_in_bytes();
-
-  log_trace(gc, ergo)("average_promoted %zu; padded_average_promoted %zu",
-              (size_t) policy->average_promoted_in_bytes(),
-              (size_t) policy->padded_average_promoted_in_bytes());
-
-  if (promotion_estimate >= free_in_old_gen_with_expansion) {
-    log_debug(gc, ergo)("Run full-gc; predicted promotion size >= max free space in old-gen: %zu >= %zu",
-      promotion_estimate, free_in_old_gen_with_expansion);
-    return ShouldRunFullGC;
-  }
-
-  if (UseAdaptiveSizePolicy) {
-    // Also checking OS has enough free memory to commit and expand old-gen.
-    // Otherwise, the recorded gc-pause-time might be inflated to include time
-    // of OS preparing free memory, resulting in inaccurate young-gen resizing.
-    assert(old_gen->committed().byte_size() >= old_gen->used_in_bytes(), "inv");
-    // Use uint64_t instead of size_t for 32bit compatibility.
-    uint64_t free_mem_in_os;
-    if (os::free_memory(free_mem_in_os)) {
-      size_t actual_free = (size_t)MIN2(old_gen->committed().byte_size() - old_gen->used_in_bytes() + free_mem_in_os,
-                                        (uint64_t)SIZE_MAX);
-      if (promotion_estimate > actual_free) {
-        log_debug(gc, ergo)("Run full-gc; predicted promotion size > free space in old-gen and OS: %zu > %zu",
-          promotion_estimate, actual_free);
-        return ShouldRunFullGC;
-      }
-    }
-  }
-
-  // No particular reasons to run full-gc, so young-gc.
-  return ShouldRunYoungGC;
-}
-
 // Adaptive size policy support.
 void PSScavenge::set_young_generation_boundary(HeapWord* v) {
   _young_generation_boundary = v;
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index c297a46a46e..af9b91f74bc 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -64,8 +64,6 @@ class PSScavenge: AllStatic {
 
   static void clean_up_failed_promotion();
 
-  static bool should_attempt_scavenge();
-
   // Private accessors
   static PSCardTable* card_table()                 { assert(_card_table != nullptr, "Sanity"); return _card_table; }
   static const ParallelScavengeTracer* gc_tracer() { return &_gc_tracer; }

From d2926dfd9a242928877d0b1e40eac498073975bd Mon Sep 17 00:00:00 2001
From: Evgeny Astigeevich <eastigeevich@openjdk.org>
Date: Wed, 19 Nov 2025 12:11:23 +0000
Subject: [PATCH 246/512] 8371649: ZGC: AArch64: redundant OrderAccess::fence
 in ZBarrierSetAssembler::patch_barrier_relocation

Reviewed-by: aph
---
 src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
index 5d4f0801ec6..07a2d6fbfa0 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
@@ -879,7 +879,6 @@ void ZBarrierSetAssembler::patch_barrier_relocation(address addr, int format) {
     ShouldNotReachHere();
   }
 
-  OrderAccess::fence();
   ICache::invalidate_word((address)patch_addr);
 }
 

From 0b3df489e9d3b6d876a67793e082b930c17ade3e Mon Sep 17 00:00:00 2001
From: Renjith Kannath Pariyangad <rkannathpari@openjdk.org>
Date: Wed, 19 Nov 2025 12:13:37 +0000
Subject: [PATCH 247/512] 8372048: Performance improvement on Linux remote
 desktop

Reviewed-by: azvegint, serb
---
 .../sun/awt/screencast/ScreencastHelper.java  |  8 +++---
 .../sun/awt/screencast/TokenStorage.java      | 25 ++++++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
index 33af39810d5..a8f7cd41a0e 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
@@ -63,9 +63,11 @@ public final class ScreencastHelper {
     private static final int DELAY_BEFORE_SESSION_CLOSE = 2000;
 
     private static volatile TimerTask timerTask = null;
-    private static final Timer timerCloseSession
-            = new Timer("auto-close screencast session", true);
 
+    private static class TimerHolder {
+        private static final Timer timerCloseSession =
+                new Timer("auto-close screencast session", true);
+    }
 
     private ScreencastHelper() {}
 
@@ -143,7 +145,7 @@ public final class ScreencastHelper {
             }
         };
 
-        timerCloseSession.schedule(timerTask, DELAY_BEFORE_SESSION_CLOSE);
+        TimerHolder.timerCloseSession.schedule(timerTask, DELAY_BEFORE_SESSION_CLOSE);
     }
 
     public static synchronized void getRGBPixels(
diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
index 9db64725048..09dc84e74d0 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
@@ -238,6 +238,7 @@ final class TokenStorage {
     }
 
     private static WatchService watchService;
+    private static volatile boolean isWatcherThreadStarted = false;
 
     private static void setupWatch() {
         try {
@@ -257,10 +258,6 @@ final class TokenStorage {
                         "file watch %s\n", e);
             }
         }
-
-        if (watchService != null) {
-            new WatcherThread(watchService).start();
-        }
     }
 
     // called from native
@@ -337,7 +334,27 @@ final class TokenStorage {
         return true;
     }
 
+    private static void startWatcherThreadIfNeeded() {
+        if (!isWatcherThreadStarted) {
+            // not sure if the double-checked locking is actually needed here
+            // the getTokens is only called from ScreencastHelper#getRGBPixels
+            // and ScreencastHelper#remoteDesktop* methods (which are synchronized),
+            // but it may change later.
+            synchronized (TokenStorage.class) {
+                if (!isWatcherThreadStarted) {
+                    readTokens(PROPS_PATH);
+                    if (watchService != null) {
+                        new WatcherThread(watchService).start();
+                    }
+                    isWatcherThreadStarted = true;
+                }
+            }
+        }
+    }
+
     static Set<TokenItem> getTokens(List<Rectangle> affectedScreenBounds) {
+        startWatcherThreadIfNeeded();
+
         // We need an ordered set to store tokens
         // with exact matches at the beginning.
         LinkedHashSet<TokenItem> result = new LinkedHashSet<>();

From ae4d9c2e6af0b899481c98742f4976c7769f39e5 Mon Sep 17 00:00:00 2001
From: Kurt Miller <kurt@openjdk.org>
Date: Wed, 19 Nov 2025 12:14:07 +0000
Subject: [PATCH 248/512] 8371918: aarch64: Incorrect pointer dereference in
 TemplateInterpreterGenerator::generate_native_entry

Reviewed-by: aph, shade
---
 src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index c1eabed8ade..dd70c98797f 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1375,7 +1375,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ ldr(r10, Address(rmethod, Method::native_function_offset()));
     ExternalAddress unsatisfied(SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
     __ lea(rscratch2, unsatisfied);
-    __ ldr(rscratch2, rscratch2);
     __ cmp(r10, rscratch2);
     __ br(Assembler::NE, L);
     __ call_VM(noreg,

From 0bff5f3dbe69ab2a59db771af1020b04c0132954 Mon Sep 17 00:00:00 2001
From: Anton Seoane Ampudia <aseoane@openjdk.org>
Date: Wed, 19 Nov 2025 13:02:07 +0000
Subject: [PATCH 249/512] 8213762: Deprecate Xmaxjitcodesize

Reviewed-by: kvn, epeter
---
 src/hotspot/share/runtime/arguments.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1ef2ee9de0d..55ee7641a5f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -2483,6 +2483,9 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
       }
     } else if (match_option(option, "-Xmaxjitcodesize", &tail) ||
                match_option(option, "-XX:ReservedCodeCacheSize=", &tail)) {
+      if (match_option(option, "-Xmaxjitcodesize", &tail)) {
+        warning("Option -Xmaxjitcodesize was deprecated in JDK 26 and will likely be removed in a future release.");
+      }
       julong long_ReservedCodeCacheSize = 0;
 
       ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, 1);

From f0afd89f66c0b42ff06fbb76378a5b2028b76a10 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 19 Nov 2025 15:19:04 +0000
Subject: [PATCH 250/512] 8357728: Avoid caching synthesized names in
 synthesized parameters

Reviewed-by: jvernee
---
 .../classes/java/lang/reflect/Executable.java |  2 +-
 .../classes/java/lang/reflect/Parameter.java  |  4 +-
 .../Parameter/SyntheticNameRetention.java     | 81 +++++++++++++++++++
 3 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/lang/reflect/Parameter/SyntheticNameRetention.java

diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index a22d0fa8076..4f32d33048d 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -431,7 +431,7 @@ public abstract sealed class Executable extends AccessibleObject
             // modifiers?  Probably not in the general case, since
             // we'd have no way of knowing about them, but there
             // may be specific cases.
-            out[i] = new Parameter("arg" + i, 0, this, i);
+            out[i] = new Parameter(null, 0, this, i);
         return out;
     }
 
diff --git a/src/java.base/share/classes/java/lang/reflect/Parameter.java b/src/java.base/share/classes/java/lang/reflect/Parameter.java
index b8a57a9790b..d4a53e193a9 100644
--- a/src/java.base/share/classes/java/lang/reflect/Parameter.java
+++ b/src/java.base/share/classes/java/lang/reflect/Parameter.java
@@ -55,7 +55,7 @@ public final class Parameter implements AnnotatedElement {
      * absent, however, then {@code Executable} uses this constructor
      * to synthesize them.
      *
-     * @param name The name of the parameter.
+     * @param name The name of the parameter, or {@code null} if absent
      * @param modifiers The modifier flags for the parameter.
      * @param executable The executable which defines this parameter.
      * @param index The index of the parameter.
@@ -104,7 +104,7 @@ public final class Parameter implements AnnotatedElement {
      * to the class file.
      */
     public boolean isNamePresent() {
-        return executable.hasRealParameterData() && name != null;
+        return name != null;
     }
 
     /**
diff --git a/test/jdk/java/lang/reflect/Parameter/SyntheticNameRetention.java b/test/jdk/java/lang/reflect/Parameter/SyntheticNameRetention.java
new file mode 100644
index 00000000000..b77a231be88
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Parameter/SyntheticNameRetention.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.invoke.MethodHandleProxies;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Parameter;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
+ * @test
+ * @bug 8357728
+ * @summary Synthetic parameter names should not be retained.
+ * @modules java.base/java.lang.reflect:+open
+ * @run junit SyntheticNameRetention
+ */
+public class SyntheticNameRetention {
+
+    class Inner {
+        Inner() {}
+    }
+
+    public interface NameGetter {
+        String getRawName(Parameter parameter);
+    }
+    static final NameGetter GETTER;
+
+    static {
+        try {
+            var lookup = MethodHandles.privateLookupIn(Parameter.class, MethodHandles.lookup());
+            GETTER = MethodHandleProxies.asInterfaceInstance(NameGetter.class, lookup.findGetter(Parameter.class, "name", String.class));
+        } catch (ReflectiveOperationException ex) {
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+
+    static Stream<Executable> methods() throws Throwable {
+        return Stream.of(Inner.class.getDeclaredConstructor(SyntheticNameRetention.class), // Has MethodParameters with flags
+                         SyntheticNameRetention.class.getDeclaredMethod("test", Executable.class)); // No MethodParameters
+    }
+
+    @ParameterizedTest
+    @MethodSource("methods")
+    public void test(Executable exec) {
+        var params = exec.getParameters();
+        for (int i = 0; i < params.length; i++) {
+            var param = params[i];
+            assertEquals("arg" + i, param.getName(), "name " + i);
+            assertFalse(param.isNamePresent(), "name present " + i);
+            assertNull(GETTER.getRawName(param), "raw name " + i);
+            boolean mandated = exec instanceof Constructor<?> && i == 0;
+            assertEquals(mandated, param.isImplicit(), "mandated " + i);
+        }
+    }
+}

From 3949b0f23cd9c936c12ac0306534bc38b5b8d298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <bmaillard@openjdk.org>
Date: Wed, 19 Nov 2025 15:40:57 +0000
Subject: [PATCH 251/512] 8371674: C2 fails with Missed optimization
 opportunity in PhaseIterGVN for MoveL2D

Reviewed-by: epeter, chagedorn
---
 src/hotspot/share/opto/node.cpp               |  7 ++-
 .../c2/TestMissingOptMoveX2YLoadX.java        | 61 +++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestMissingOptMoveX2YLoadX.java

diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 93ded36363e..2452677caf3 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1209,9 +1209,12 @@ bool Node::has_special_unique_user() const {
   if (this->is_Store()) {
     // Condition for back-to-back stores folding.
     return n->Opcode() == op && n->in(MemNode::Memory) == this;
-  } else if (this->is_Load() || this->is_DecodeN() || this->is_Phi()) {
+  } else if ((this->is_Load() || this->is_DecodeN() || this->is_Phi()) && n->Opcode() == Op_MemBarAcquire) {
     // Condition for removing an unused LoadNode or DecodeNNode from the MemBarAcquire precedence input
-    return n->Opcode() == Op_MemBarAcquire;
+    return true;
+  } else if (this->is_Load() && n->is_Move()) {
+    // Condition for MoveX2Y (LoadX mem) => LoadY mem
+    return true;
   } else if (op == Op_AddL) {
     // Condition for convL2I(addL(x,y)) ==> addI(convL2I(x),convL2I(y))
     return n->Opcode() == Op_ConvL2I && n->in(1) == this;
diff --git a/test/hotspot/jtreg/compiler/c2/TestMissingOptMoveX2YLoadX.java b/test/hotspot/jtreg/compiler/c2/TestMissingOptMoveX2YLoadX.java
new file mode 100644
index 00000000000..1e6e01a8e33
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestMissingOptMoveX2YLoadX.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371674
+ * @summary An expression of the form "MoveX2Y (LoadX mem)" should be
+ *          transformed into "LoadY mem". This test ensures that changes
+ *          to the number of users of the Load node propagate as expected
+ *          and that the optimization is not missed.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xcomp
+ *      -XX:CompileCommand=compileonly,compiler.c2.TestMissingOptMoveX2YLoadX::test*
+ *      -XX:VerifyIterativeGVN=1110 compiler.c2.TestMissingOptMoveX2YLoadX
+ * @run main compiler.c2.TestMissingOptMoveX2YLoadX
+ *
+ */
+
+package compiler.c2;
+
+public class TestMissingOptMoveX2YLoadX {
+    static final int N = 400;
+    static volatile long b;
+
+    public static void main(String[] strArr) {
+        // could theoretically happen with other variants of MoveNode
+        // but there is no known reproducer for the other cases
+        Double.longBitsToDouble(0l);
+        testMoveL2D();
+    }
+
+    static void testMoveL2D() {
+        int e = 8, f, g = 9, h = 2, i[] = new int[N];
+        long j[] = new long[N];
+        while (++e < 37) {
+            for (f = 1; f < 7; f++) {
+                h >>>= (int)(--g - Double.longBitsToDouble(j[e]));
+                b -= b;
+            }
+        }
+    }
+}
\ No newline at end of file

From 9ea8201b7494fe9107d4abd78c02ac765a5751d4 Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Wed, 19 Nov 2025 16:07:20 +0000
Subject: [PATCH 252/512] 8363980: [macos] Add JDK specific keys/values to
 Info.plist of embedded runtime

Reviewed-by: asemenyuk
---
 .../internal/MacPackagingPipeline.java        | 21 +++++++++++--
 .../internal/JLinkRuntimeBuilder.java         |  5 ++++
 .../internal/model/RuntimeBuilder.java        | 10 +++++++
 .../jdk/jpackage/test/JPackageCommand.java    | 30 ++++++++++++-------
 .../jpackage/macosx/CustomInfoPListTest.java  |  5 ++++
 .../jpackage/share/AppImagePackageTest.java   |  3 +-
 .../jpackage/share/CookedRuntimeTest.java     | 17 +++++++++--
 .../jpackage/share/PostImageScriptTest.java   | 10 +++----
 8 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
index 6e63b73674e..b82b20c0c36 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
@@ -364,12 +364,21 @@ final class MacPackagingPipeline {
 
         final var app = env.app();
 
+        // If the embedded runtime contains executable(s) in the "bin"
+        // subdirectory, we should use the standalone runtime info plist
+        // template. Otherwise, the user may be unable to run the "java"
+        // or other executables in the "bin" subdirectory of the embedded
+        // runtime.
+        final var useRuntimeInfoPlist = app.isRuntime() ||
+                app.runtimeBuilder().orElseThrow().withNativeCommands() ||
+                Files.isDirectory(env.resolvedLayout().runtimeDirectory().resolve("bin"));
+
         Map<String, String> data = new HashMap<>();
         data.put("CF_BUNDLE_IDENTIFIER", app.bundleIdentifier());
         data.put("CF_BUNDLE_NAME", app.bundleName());
         data.put("CF_BUNDLE_VERSION", app.version());
         data.put("CF_BUNDLE_SHORT_VERSION_STRING", app.shortVersion().toString());
-        if (app.isRuntime()) {
+        if (useRuntimeInfoPlist) {
             data.put("CF_BUNDLE_VENDOR", app.vendor());
         }
 
@@ -377,12 +386,18 @@ final class MacPackagingPipeline {
         final String publicName;
         final String category;
 
-        if (app.isRuntime()) {
+        if (useRuntimeInfoPlist) {
             template = "Runtime-Info.plist.template";
+        } else {
+            template = "ApplicationRuntime-Info.plist.template";
+        }
+
+        // Public name and category should be based on standalone runtime vs
+        // embedded runtime.
+        if (app.isRuntime()) {
             publicName = "Info.plist";
             category = "resource.runtime-info-plist";
         } else {
-            template = "ApplicationRuntime-Info.plist.template";
             publicName = "Runtime-Info.plist";
             category = "resource.app-runtime-info-plist";
         }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
index 2273d385936..6ac9758e179 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
@@ -83,6 +83,11 @@ final class JLinkRuntimeBuilder implements RuntimeBuilder {
         }
     }
 
+    @Override
+    public boolean withNativeCommands() {
+        return !jlinkCmdLine.contains("--strip-native-commands");
+    }
+
     static ModuleFinder createModuleFinder(Collection<Path> modulePath) {
         return ModuleFinder.compose(
                 ModulePath.of(JarFile.runtimeVersion(), true,
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
index a0f5f077c70..89d370b58e0 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
@@ -46,6 +46,16 @@ public interface RuntimeBuilder {
      */
     void create(AppImageLayout appImageLayout) throws PackagerException;
 
+    /**
+     * Returns {@code true} if "--strip-native-commands" was not used with jlink.
+     * Default implementation returns {@code false}.
+     *
+     * @return {@code true} if "--strip-native-commands" was not used with jlink
+     */
+    default boolean withNativeCommands() {
+        return false;
+    }
+
     /**
      * Gets the default set of paths where jlink should look up for system Java
      * modules.
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
index 57915b91d8b..98d991e38f3 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -306,24 +306,16 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             TKit.trace(String.format("Init fake runtime in [%s] directory",
                     fakeRuntimeDir));
 
-            Files.createDirectories(fakeRuntimeDir);
-
-            if (TKit.isLinux()) {
-                // Need to make the code in rpm spec happy as it assumes there is
-                // always something in application image.
-                fakeRuntimeDir.resolve("bin").toFile().mkdir();
-            }
-
             if (TKit.isOSX()) {
                 // Make MacAppImageBuilder happy
                 createBulkFile.accept(fakeRuntimeDir.resolve(Path.of(
                         "lib/jli/libjli.dylib")));
             }
 
-            // Mak sure fake runtime takes some disk space.
+            // Make sure fake runtime takes some disk space.
             // Package bundles with 0KB size are unexpected and considered
             // an error by PackageTest.
-            createBulkFile.accept(fakeRuntimeDir.resolve(Path.of("bin", "bulk")));
+            createBulkFile.accept(fakeRuntimeDir.resolve(Path.of("lib", "bulk")));
 
             cmd.setArgumentValue("--runtime-image", fakeRuntimeDir);
         });
@@ -1227,6 +1219,24 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                 MacHelper.verifyUnsignedBundleSignature(cmd);
             }
         }),
+        MAC_RUNTIME_PLIST_JDK_KEY(cmd -> {
+            if (TKit.isOSX()) {
+                var appLayout = cmd.appLayout();
+                var plistPath = appLayout.runtimeDirectory().resolve("Contents/Info.plist");
+                var keyName = "JavaVM";
+                var keyValue = MacHelper.readPList(plistPath).findDictValue(keyName);
+                if (cmd.isRuntime() || Files.isDirectory(appLayout.runtimeHomeDirectory().resolve("bin"))) {
+                    // There are native launchers in the runtime
+                    TKit.assertTrue(keyValue.isPresent(), String.format(
+                            "Check the runtime plist file [%s] contains '%s' key",
+                            plistPath, keyName));
+                } else {
+                    TKit.assertTrue(keyValue.isEmpty(), String.format(
+                            "Check the runtime plist file [%s] contains NO '%s' key",
+                            plistPath, keyName));
+                }
+            }
+        }),
         PREDEFINED_APP_IMAGE_COPY(cmd -> {
             Optional.ofNullable(cmd.getArgumentValue("--app-image")).filter(_ -> {
                 return !TKit.isOSX() || !MacHelper.signPredefinedAppImage(cmd);
diff --git a/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java b/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
index b690b69269c..dd94330d039 100644
--- a/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
+++ b/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
@@ -25,6 +25,7 @@ import static java.util.Collections.unmodifiableSortedSet;
 import static java.util.Map.entry;
 import jdk.jpackage.internal.util.Slot;
 import static jdk.jpackage.internal.util.PListWriter.writeDict;
+import static jdk.jpackage.internal.util.PListWriter.writeKey;
 import static jdk.jpackage.internal.util.PListWriter.writePList;
 import static jdk.jpackage.internal.util.PListWriter.writeString;
 import static jdk.jpackage.internal.util.XmlUtils.createXml;
@@ -431,6 +432,10 @@ public class CustomInfoPListTest {
                     writeString(xml, "CFBundleShortVersionString", value("CF_BUNDLE_SHORT_VERSION_STRING", cmd.version()));
                     writeString(xml, "CFBundleVersion", value("CF_BUNDLE_VERSION", cmd.version()));
                     writeString(xml, "CustomInfoPListFA", "DEPLOY_FILE_ASSOCIATIONS");
+                    writeKey(xml, "JavaVM");
+                    writeDict(xml, toXmlConsumer(() -> {
+                        writeString(xml, "JVMVersion", value("CF_BUNDLE_VERSION", cmd.version()));
+                    }));
                 }));
             }));
         }
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index 94eb086e4c6..c3faa1ffb65 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -120,7 +120,8 @@ public class AppImagePackageTest {
                     StandardAssert.MAIN_JAR_FILE,
                     StandardAssert.MAIN_LAUNCHER_FILES,
                     StandardAssert.MAC_BUNDLE_STRUCTURE,
-                    StandardAssert.RUNTIME_DIRECTORY);
+                    StandardAssert.RUNTIME_DIRECTORY,
+                    StandardAssert.MAC_RUNTIME_PLIST_JDK_KEY);
         })
         .run(Action.CREATE_AND_UNPACK);
     }
diff --git a/test/jdk/tools/jpackage/share/CookedRuntimeTest.java b/test/jdk/tools/jpackage/share/CookedRuntimeTest.java
index 28fba111c8f..e3304e01f84 100644
--- a/test/jdk/tools/jpackage/share/CookedRuntimeTest.java
+++ b/test/jdk/tools/jpackage/share/CookedRuntimeTest.java
@@ -51,10 +51,11 @@ import jdk.jpackage.test.TKit;
 public final class CookedRuntimeTest {
 
     public CookedRuntimeTest(String javaAppDesc, String jlinkOutputSubdir,
-            String runtimeSubdir) {
+            String runtimeSubdir, boolean withNativeCommands) {
         this.javaAppDesc = javaAppDesc;
         this.jlinkOutputSubdir = Path.of(jlinkOutputSubdir);
         this.runtimeSubdir = Path.of(runtimeSubdir);
+        this.withNativeCommands = withNativeCommands;
     }
 
     @Test
@@ -90,6 +91,10 @@ public final class CookedRuntimeTest {
                 "--no-header-files",
                 "--no-man-pages");
 
+        if (!withNativeCommands) {
+            jlink.addArgument("--strip-native-commands");
+        }
+
         if (moduleName != null) {
             jlink.addArguments("--add-modules", moduleName, "--module-path",
                     Path.of(cmd.getArgumentValue("--module-path")).resolve(
@@ -127,7 +132,14 @@ public final class CookedRuntimeTest {
         List<Object[]> data = new ArrayList<>();
         for (var javaAppDesc : javaAppDescs) {
             for (var pathCfg : paths) {
-                data.add(new Object[] { javaAppDesc, pathCfg[0], pathCfg[1] });
+                if (TKit.isOSX()) {
+                    // On OSX platform we need to test both runtime root and runtime home
+                    // directories with and without "bin" folder.
+                    data.add(new Object[] { javaAppDesc, pathCfg[0], pathCfg[1], true });
+                    data.add(new Object[] { javaAppDesc, pathCfg[0], pathCfg[1], false });
+                } else {
+                    data.add(new Object[] { javaAppDesc, pathCfg[0], pathCfg[1], true });
+                }
             }
         }
 
@@ -137,4 +149,5 @@ public final class CookedRuntimeTest {
     private final String javaAppDesc;
     private final Path jlinkOutputSubdir;
     private final Path runtimeSubdir;
+    private final boolean withNativeCommands;
 }
diff --git a/test/jdk/tools/jpackage/share/PostImageScriptTest.java b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
index 5e9127d8fa8..655658f036d 100644
--- a/test/jdk/tools/jpackage/share/PostImageScriptTest.java
+++ b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
@@ -140,7 +140,7 @@ public class PostImageScriptTest {
                         runtimeDir = Path.of("");
                     }
 
-                    final Path runtimeBinDir = runtimeDir.resolve("bin");
+                    final Path runtimeLibDir = runtimeDir.resolve("lib");
 
                     if (TKit.isWindows()) {
                         final List<String> script = new ArrayList<>();
@@ -148,16 +148,16 @@ public class PostImageScriptTest {
                         script.addAll(WinGlobals.JS_FS.expr());
                         script.addAll(List.of(
                                 "WScript.Echo('PWD: ' + fs.GetFolder(shell.CurrentDirectory).Path)",
-                                String.format("WScript.Echo('Probe directory: %s')", runtimeBinDir),
-                                String.format("fs.GetFolder('%s')", runtimeBinDir.toString().replace('\\', '/'))
+                                String.format("WScript.Echo('Probe directory: %s')", runtimeLibDir),
+                                String.format("fs.GetFolder('%s')", runtimeLibDir.toString().replace('\\', '/'))
                         ));
                         JPackageUserScript.POST_IMAGE.create(cmd, script);
                     } else {
                         JPackageUserScript.POST_IMAGE.create(cmd, List.of(
                                 "set -e",
                                 "printf 'PWD: %s\\n' \"$PWD\"",
-                                String.format("printf 'Probe directory: %%s\\n' '%s'", runtimeBinDir),
-                                String.format("[ -d '%s' ]", runtimeBinDir)
+                                String.format("printf 'Probe directory: %%s\\n' '%s'", runtimeLibDir),
+                                String.format("[ -d '%s' ]", runtimeLibDir)
                         ));
                     }
                 });

From 223cc6451860f10fe8095705da07aaf7e882188f Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Wed, 19 Nov 2025 19:14:33 +0000
Subject: [PATCH 253/512] 8343316: Review and update tests using explicit
 provider names

Reviewed-by: rhalade
---
 .../KeyAgreement/DHGenSharedSecret.java       | 11 ++++++----
 .../KeyAgreement/DHKeyAgreement2.java         | 21 ++++++++++---------
 .../KeyAgreement/DHKeyAgreement3.java         | 17 ++++++++-------
 .../Provider/ProviderVersionCheck.java        |  7 ++++++-
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
index 9fe96d967dc..a89efa7bddd 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,9 @@ import jdk.test.lib.security.SecurityUtils;
 
 public class DHGenSharedSecret {
 
+    private static final String PROVIDER_NAME =
+            System.getProperty("test.provider.name", "SunJCE");
+
     public static void main(String[] args) throws Exception {
         DHGenSharedSecret test = new DHGenSharedSecret();
         test.run();
@@ -57,7 +60,7 @@ public class DHGenSharedSecret {
 
         // generate keyPairs using parameters
         KeyPairGenerator keyGen =
-            KeyPairGenerator.getInstance("DH", "SunJCE");
+            KeyPairGenerator.getInstance("DH", PROVIDER_NAME);
         keyGen.initialize(spec);
 
         // Alice generates her key pairs
@@ -77,11 +80,11 @@ public class DHGenSharedSecret {
         // bob uses it to generate Secret
         X509EncodedKeySpec x509Spec =
             new X509EncodedKeySpec(alicePubKeyEnc);
-        KeyFactory bobKeyFac = KeyFactory.getInstance("DH", "SunJCE");
+        KeyFactory bobKeyFac = KeyFactory.getInstance("DH", PROVIDER_NAME);
         PublicKey alicePubKey = bobKeyFac.generatePublic(x509Spec);
 
 
-        KeyAgreement bobAlice = KeyAgreement.getInstance("DH", "SunJCE");
+        KeyAgreement bobAlice = KeyAgreement.getInstance("DH", PROVIDER_NAME);
         start = System.currentTimeMillis();
         bobAlice.init(keyB.getPrivate());
         bobAlice.doPhase(alicePubKey, true);
diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
index da583c9dc29..c972c8a696b 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,8 @@ import jdk.test.lib.security.SecurityUtils;
 
 public class DHKeyAgreement2 {
 
-    private static final String SUNJCE = "SunJCE";
+    private static final String PROVIDER_NAME = System.getProperty(
+                                            "test.provider.name", "SunJCE");
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX_FORMATTER = HexFormat.ofDelimiter(":").withUpperCase();
@@ -90,7 +91,7 @@ public class DHKeyAgreement2 {
             // Some central authority creates new DH parameters
             System.err.println("Creating Diffie-Hellman parameters ...");
             AlgorithmParameterGenerator paramGen
-                = AlgorithmParameterGenerator.getInstance("DH", SUNJCE);
+                = AlgorithmParameterGenerator.getInstance("DH", PROVIDER_NAME);
             paramGen.init(primeSize);
             AlgorithmParameters params = paramGen.generateParameters();
             dhParameterSpec = (DHParameterSpec)params.getParameterSpec
@@ -108,7 +109,7 @@ public class DHKeyAgreement2 {
          * above
          */
         System.err.println("ALICE: Generate DH keypair ...");
-        KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH", SUNJCE);
+        KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH", PROVIDER_NAME);
         aliceKpairGen.initialize(dhParameterSpec);
         KeyPair aliceKpair = aliceKpairGen.generateKeyPair();
         System.out.println("Alice DH public key:\n" +
@@ -117,14 +118,14 @@ public class DHKeyAgreement2 {
                            aliceKpair.getPrivate().toString());
         DHParameterSpec dhParamSpec =
             ((DHPublicKey)aliceKpair.getPublic()).getParams();
-        AlgorithmParameters algParams = AlgorithmParameters.getInstance("DH", SUNJCE);
+        AlgorithmParameters algParams = AlgorithmParameters.getInstance("DH", PROVIDER_NAME);
         algParams.init(dhParamSpec);
         System.out.println("Alice DH parameters:\n"
                            + algParams.toString());
 
         // Alice executes Phase1 of her version of the DH protocol
         System.err.println("ALICE: Execute PHASE1 ...");
-        KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", SUNJCE);
+        KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", PROVIDER_NAME);
         aliceKeyAgree.init(aliceKpair.getPrivate());
 
         // Alice encodes her public key, and sends it over to Bob.
@@ -135,7 +136,7 @@ public class DHKeyAgreement2 {
          * in encoded format.
          * He instantiates a DH public key from the encoded key material.
          */
-        KeyFactory bobKeyFac = KeyFactory.getInstance("DH", SUNJCE);
+        KeyFactory bobKeyFac = KeyFactory.getInstance("DH", PROVIDER_NAME);
         X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec
             (alicePubKeyEnc);
         PublicKey alicePubKey = bobKeyFac.generatePublic(x509KeySpec);
@@ -149,7 +150,7 @@ public class DHKeyAgreement2 {
 
         // Bob creates his own DH key pair
         System.err.println("BOB: Generate DH keypair ...");
-        KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH", SUNJCE);
+        KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH", PROVIDER_NAME);
         bobKpairGen.initialize(dhParamSpec);
         KeyPair bobKpair = bobKpairGen.generateKeyPair();
         System.out.println("Bob DH public key:\n" +
@@ -159,7 +160,7 @@ public class DHKeyAgreement2 {
 
         // Bob executes Phase1 of his version of the DH protocol
         System.err.println("BOB: Execute PHASE1 ...");
-        KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH", SUNJCE);
+        KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH", PROVIDER_NAME);
         bobKeyAgree.init(bobKpair.getPrivate());
 
         // Bob encodes his public key, and sends it over to Alice.
@@ -171,7 +172,7 @@ public class DHKeyAgreement2 {
          * Before she can do so, she has to instanticate a DH public key
          * from Bob's encoded key material.
          */
-        KeyFactory aliceKeyFac = KeyFactory.getInstance("DH", SUNJCE);
+        KeyFactory aliceKeyFac = KeyFactory.getInstance("DH", PROVIDER_NAME);
         x509KeySpec = new X509EncodedKeySpec(bobPubKeyEnc);
         PublicKey bobPubKey = aliceKeyFac.generatePublic(x509KeySpec);
         System.err.println("ALICE: Execute PHASE2 ...");
diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
index d4f70ea2563..5315d62aee8 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,9 @@ import jdk.test.lib.security.SecurityUtils;
 
 public class DHKeyAgreement3 {
 
+    private static final String PROVIDER_NAME =
+            System.getProperty("test.provider.name", "SunJCE");
+
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX_FORMATTER = HexFormat.ofDelimiter(":").withUpperCase();
 
@@ -70,36 +73,36 @@ public class DHKeyAgreement3 {
 
         // Alice creates her own DH key pair
         System.err.println("ALICE: Generate DH keypair ...");
-        KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH", "SunJCE");
+        KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH", PROVIDER_NAME);
         aliceKpairGen.initialize(dhParamSpec);
         KeyPair aliceKpair = aliceKpairGen.generateKeyPair();
 
         // Bob creates his own DH key pair
         System.err.println("BOB: Generate DH keypair ...");
-        KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH", "SunJCE");
+        KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH", PROVIDER_NAME);
         bobKpairGen.initialize(dhParamSpec);
         KeyPair bobKpair = bobKpairGen.generateKeyPair();
 
         // Carol creates her own DH key pair
         System.err.println("CAROL: Generate DH keypair ...");
-        KeyPairGenerator carolKpairGen = KeyPairGenerator.getInstance("DH", "SunJCE");
+        KeyPairGenerator carolKpairGen = KeyPairGenerator.getInstance("DH", PROVIDER_NAME);
         carolKpairGen.initialize(dhParamSpec);
         KeyPair carolKpair = carolKpairGen.generateKeyPair();
 
 
         // Alice initialize
         System.err.println("ALICE: Initialize ...");
-        KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", "SunJCE");
+        KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", PROVIDER_NAME);
         aliceKeyAgree.init(aliceKpair.getPrivate());
 
         // Bob initialize
         System.err.println("BOB: Initialize ...");
-        KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH", "SunJCE");
+        KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH", PROVIDER_NAME);
         bobKeyAgree.init(bobKpair.getPrivate());
 
         // Carol initialize
         System.err.println("CAROL: Initialize ...");
-        KeyAgreement carolKeyAgree = KeyAgreement.getInstance("DH", "SunJCE");
+        KeyAgreement carolKeyAgree = KeyAgreement.getInstance("DH", PROVIDER_NAME);
         carolKeyAgree.init(carolKpair.getPrivate());
 
 
diff --git a/test/jdk/java/security/Provider/ProviderVersionCheck.java b/test/jdk/java/security/Provider/ProviderVersionCheck.java
index 43d1c502b3f..2af2be0a7ad 100644
--- a/test/jdk/java/security/Provider/ProviderVersionCheck.java
+++ b/test/jdk/java/security/Provider/ProviderVersionCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,11 @@ public class ProviderVersionCheck {
 
         for (Provider p: Security.getProviders()) {
             System.out.print(p.getName() + " ");
+            if (p.getName().equals(System.getProperty("test.provider.name"))) {
+                // Version numbers of non JDK-providers do not match JDK version number.
+                continue;
+            }
+
             String specVersion = System.getProperty("java.specification.version");
             if (p.getVersion() != Double.parseDouble(specVersion)) {
                 System.out.println("failed. " + "Version received was " +

From 6f1c5733ed4a1d1a1e099681f1f292acf827d9dc Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 19 Nov 2025 20:05:09 +0000
Subject: [PATCH 254/512] 8371923: Update LockFreeStack for Atomic<T>

Reviewed-by: iwalulya, dholmes
---
 src/hotspot/share/utilities/lockFreeStack.hpp | 51 +++++++++++++------
 .../gtest/utilities/test_lockFreeStack.cpp    | 34 ++++++-------
 2 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/share/utilities/lockFreeStack.hpp b/src/hotspot/share/utilities/lockFreeStack.hpp
index 43bc58fbc44..3f63482a268 100644
--- a/src/hotspot/share/utilities/lockFreeStack.hpp
+++ b/src/hotspot/share/utilities/lockFreeStack.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_UTILITIES_LOCKFREESTACK_HPP
 #define SHARE_UTILITIES_LOCKFREESTACK_HPP
 
+#include "runtime/atomic.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -34,11 +35,14 @@
 // a result, there is no allocation involved in adding objects to the stack
 // or removing them from the stack.
 //
-// To be used in a LockFreeStack of objects of type T, an object of
-// type T must have a list entry member of type T* volatile, with an
-// non-member accessor function returning a pointer to that member.  A
-// LockFreeStack is associated with the class of its elements and an
-// entry member from that class.
+// To be used in a LockFreeStack of objects of type T, an object of type T
+// must have a list entry member. A list entry member is a data member whose
+// type is either (1) Atomic<T*>, or (2) T* volatile. There must be a
+// non-member or static member function returning a pointer to that member,
+// which is used to provide access to it by a LockFreeStack.  A LockFreeStack
+// is associated with the class of its elements and an entry member from that
+// class by being specialized on the element class and a pointer to the
+// function for accessing that entry member.
 //
 // An object can be in multiple stacks at the same time, so long as
 // each stack uses a different entry member. That is, the class of the
@@ -52,12 +56,12 @@
 //
 // \tparam T is the class of the elements in the stack.
 //
-// \tparam next_ptr is a function pointer.  Applying this function to
+// \tparam next_accessor is a function pointer.  Applying this function to
 // an object of type T must return a pointer to the list entry member
 // of the object associated with the LockFreeStack type.
-template<typename T, T* volatile* (*next_ptr)(T&)>
+template<typename T, auto next_accessor>
 class LockFreeStack {
-  T* volatile _top;
+  Atomic<T*> _top;
 
   void prepend_impl(T* first, T* last) {
     T* cur = top();
@@ -65,12 +69,21 @@ class LockFreeStack {
     do {
       old = cur;
       set_next(*last, cur);
-      cur = AtomicAccess::cmpxchg(&_top, cur, first);
+      cur = _top.compare_exchange(cur, first);
     } while (old != cur);
   }
 
   NONCOPYABLE(LockFreeStack);
 
+  template<typename NextAccessor>
+  static constexpr void use_atomic_access_impl(NextAccessor) {
+    static_assert(DependentAlwaysFalse<NextAccessor>, "Invalid next accessor");
+  }
+  static constexpr bool use_atomic_access_impl(T* volatile* (*)(T&)) { return true; }
+  static constexpr bool use_atomic_access_impl(Atomic<T*>* (*)(T&)) { return false; }
+
+  static constexpr bool use_atomic_access = use_atomic_access_impl(next_accessor);
+
 public:
   LockFreeStack() : _top(nullptr) {}
   ~LockFreeStack() { assert(empty(), "stack not empty"); }
@@ -89,7 +102,7 @@ public:
         new_top = next(*result);
       }
       // CAS even on empty pop, for consistent membar behavior.
-      result = AtomicAccess::cmpxchg(&_top, result, new_top);
+      result = _top.compare_exchange(result, new_top);
     } while (result != old);
     if (result != nullptr) {
       set_next(*result, nullptr);
@@ -101,7 +114,7 @@ public:
   // list of elements.  Acts as a full memory barrier.
   // postcondition: empty()
   T* pop_all() {
-    return AtomicAccess::xchg(&_top, (T*)nullptr);
+    return _top.exchange(nullptr);
   }
 
   // Atomically adds value to the top of this stack.  Acts as a full
@@ -143,9 +156,9 @@ public:
   // Return true if the stack is empty.
   bool empty() const { return top() == nullptr; }
 
-  // Return the most recently pushed element, or nullptr if the stack is empty.
+  // Return the most recently pushed element, or null if the stack is empty.
   // The returned element is not removed from the stack.
-  T* top() const { return AtomicAccess::load(&_top); }
+  T* top() const { return _top.load_relaxed(); }
 
   // Return the number of objects in the stack.  There must be no concurrent
   // pops while the length is being determined.
@@ -160,7 +173,11 @@ public:
   // Return the entry following value in the list used by the
   // specialized LockFreeStack class.
   static T* next(const T& value) {
-    return AtomicAccess::load(next_ptr(const_cast<T&>(value)));
+    if constexpr (use_atomic_access) {
+      return AtomicAccess::load(next_accessor(const_cast<T&>(value)));
+    } else {
+      return next_accessor(const_cast<T&>(value))->load_relaxed();
+    }
   }
 
   // Set the entry following value to new_next in the list used by the
@@ -168,7 +185,11 @@ public:
   // if value is in an instance of this specialization of LockFreeStack,
   // there must be no concurrent push or pop operations on that stack.
   static void set_next(T& value, T* new_next) {
-    AtomicAccess::store(next_ptr(value), new_next);
+    if constexpr (use_atomic_access) {
+      AtomicAccess::store(next_accessor(value), new_next);
+    } else {
+      next_accessor(value)->store_relaxed(new_next);
+    }
   }
 };
 
diff --git a/test/hotspot/gtest/utilities/test_lockFreeStack.cpp b/test/hotspot/gtest/utilities/test_lockFreeStack.cpp
index 3a9d24ad61e..fac17e87016 100644
--- a/test/hotspot/gtest/utilities/test_lockFreeStack.cpp
+++ b/test/hotspot/gtest/utilities/test_lockFreeStack.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "memory/allocation.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/lockFreeStack.hpp"
 #include "threadHelper.inline.hpp"
@@ -33,12 +33,12 @@
 class LockFreeStackTestElement {
   typedef LockFreeStackTestElement Element;
 
-  Element* volatile _entry;
-  Element* volatile _entry1;
+  Atomic<Element*> _entry;
+  Atomic<Element*> _entry1;
   size_t _id;
 
-  static Element* volatile* entry_ptr(Element& e) { return &e._entry; }
-  static Element* volatile* entry1_ptr(Element& e) { return &e._entry1; }
+  static Atomic<Element*>* entry_ptr(Element& e) { return &e._entry; }
+  static Atomic<Element*>* entry1_ptr(Element& e) { return &e._entry1; }
 
 public:
   LockFreeStackTestElement(size_t id = 0) : _entry(), _entry1(), _id(id) {}
@@ -202,17 +202,17 @@ class LockFreeStackTestThread : public JavaTestThread {
   uint _id;
   TestStack* _from;
   TestStack* _to;
-  volatile size_t* _processed;
+  Atomic<size_t>* _processed;
   size_t _process_limit;
   size_t _local_processed;
-  volatile bool _ready;
+  Atomic<bool> _ready;
 
 public:
   LockFreeStackTestThread(Semaphore* post,
                           uint id,
                           TestStack* from,
                           TestStack* to,
-                          volatile size_t* processed,
+                          Atomic<size_t>* processed,
                           size_t process_limit) :
     JavaTestThread(post),
     _id(id),
@@ -225,21 +225,21 @@ public:
   {}
 
   virtual void main_run() {
-    AtomicAccess::release_store_fence(&_ready, true);
+    _ready.release_store_fence(true);
     while (true) {
       Element* e = _from->pop();
       if (e != nullptr) {
         _to->push(*e);
-        AtomicAccess::inc(_processed);
+        _processed->fetch_then_add(1u);
         ++_local_processed;
-      } else if (AtomicAccess::load_acquire(_processed) == _process_limit) {
+      } else if (_processed->load_acquire() == _process_limit) {
         tty->print_cr("thread %u processed %zu", _id, _local_processed);
         return;
       }
     }
   }
 
-  bool ready() const { return AtomicAccess::load_acquire(&_ready); }
+  bool ready() const { return _ready.load_acquire(); }
 };
 
 TEST_VM(LockFreeStackTest, stress) {
@@ -248,8 +248,8 @@ TEST_VM(LockFreeStackTest, stress) {
   TestStack start_stack;
   TestStack middle_stack;
   TestStack final_stack;
-  volatile size_t stage1_processed = 0;
-  volatile size_t stage2_processed = 0;
+  Atomic<size_t> stage1_processed{0};
+  Atomic<size_t> stage2_processed{0};
 
   const size_t nelements = 10000;
   Element* elements = NEW_C_HEAP_ARRAY(Element, nelements, mtOther);
@@ -272,7 +272,7 @@ TEST_VM(LockFreeStackTest, stress) {
   for (uint i = 0; i < ARRAY_SIZE(threads); ++i) {
     TestStack* from = &start_stack;
     TestStack* to = &middle_stack;
-    volatile size_t* processed = &stage1_processed;
+    Atomic<size_t>* processed = &stage1_processed;
     if (i >= stage1_threads) {
       from = &middle_stack;
       to = &final_stack;
@@ -293,8 +293,8 @@ TEST_VM(LockFreeStackTest, stress) {
   }
 
   // Verify expected state.
-  ASSERT_EQ(nelements, stage1_processed);
-  ASSERT_EQ(nelements, stage2_processed);
+  ASSERT_EQ(nelements, stage1_processed.load_relaxed());
+  ASSERT_EQ(nelements, stage2_processed.load_relaxed());
   ASSERT_EQ(0u, initial_stack.length());
   ASSERT_EQ(0u, start_stack.length());
   ASSERT_EQ(0u, middle_stack.length());

From f5bc6ee90d73da00cab5cad283b9517c692bc895 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 19 Nov 2025 20:56:21 +0000
Subject: [PATCH 255/512] 8369187: Add wrapper for <new> that forbids use of
 global allocation and deallocation functions

Reviewed-by: stefank, erikj, jrose
---
 make/hotspot/lib/CompileGtest.gmk             |   1 +
 src/hotspot/share/code/relocInfo.cpp          |   3 +-
 src/hotspot/share/code/relocInfo.hpp          |   3 +-
 src/hotspot/share/cppstdlib/new.hpp           | 154 ++++++++++++++++++
 src/hotspot/share/gc/shared/bufferNode.cpp    |   3 +-
 .../share/gc/shared/partialArrayState.cpp     |   3 +-
 .../gc/z/zDeferredConstructed.inline.hpp      |   3 +-
 src/hotspot/share/memory/allocation.hpp       |   3 +-
 src/hotspot/share/memory/arena.cpp            |   1 +
 src/hotspot/share/memory/arena.hpp            |   2 -
 src/hotspot/share/utilities/debug.cpp         |   2 +-
 .../share/utilities/deferredStatic.hpp        |   3 +-
 src/hotspot/share/utilities/elfFile.cpp       |   2 +-
 .../share/utilities/globalDefinitions.hpp     |  21 +++
 .../gtest/utilities/test_lockFreeStack.cpp    |   3 +-
 15 files changed, 187 insertions(+), 20 deletions(-)
 create mode 100644 src/hotspot/share/cppstdlib/new.hpp

diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index d615e254f5a..60912992134 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -95,6 +95,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
     EXTRA_OBJECT_FILES := $(BUILD_LIBJVM_ALL_OBJS), \
     DEFAULT_CFLAGS := false, \
     CFLAGS := $(JVM_CFLAGS) \
+        -DHOTSPOT_GTEST \
         -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \
         $(addprefix -I, $(GTEST_TEST_SRC)), \
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 286d407c94b..2a6335e2118 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -26,6 +26,7 @@
 #include "code/compiledIC.hpp"
 #include "code/nmethod.hpp"
 #include "code/relocInfo.hpp"
+#include "cppstdlib/new.hpp"
 #include "cppstdlib/type_traits.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -37,8 +38,6 @@
 #include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 
-#include <new>
-
 const RelocationHolder RelocationHolder::none; // its type is relocInfo::none
 
 
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index a6a08815d10..6f1778ef479 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_CODE_RELOCINFO_HPP
 #define SHARE_CODE_RELOCINFO_HPP
 
+#include "cppstdlib/new.hpp"
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/osInfo.hpp"
@@ -32,8 +33,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
-#include <new>
-
 class CodeBlob;
 class Metadata;
 class NativeMovConstReg;
diff --git a/src/hotspot/share/cppstdlib/new.hpp b/src/hotspot/share/cppstdlib/new.hpp
new file mode 100644
index 00000000000..3536ac13288
--- /dev/null
+++ b/src/hotspot/share/cppstdlib/new.hpp
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CPPSTDLIB_NEW_HPP
+#define SHARE_CPPSTDLIB_NEW_HPP
+
+#include "utilities/compilerWarnings.hpp"
+
+// HotSpot usage:
+// Only the following may be used:
+// * std::nothrow_t, std::nothrow
+// * std::align_val_t
+// * The non-allocating forms of `operator new` and `operator new[]` are
+//   implicitly used by the corresponding `new` and `new[]` expressions.
+//   - operator new(size_t, void*) noexcept
+//   - operator new[](size_t, void*) noexcept
+//   Note that the non-allocating forms of `operator delete` and `operator
+//   delete[]` are not used, since they are only invoked by a placement new
+//   expression that fails by throwing an exception. But they might still
+//   end up being referenced in such a situation.
+
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
+#include "utilities/vmassert_uninstall.hpp"
+
+#include <new>
+
+#include "utilities/vmassert_reinstall.hpp" // don't reorder
+END_ALLOW_FORBIDDEN_FUNCTIONS
+
+// Deprecation declarations to forbid use of the default global allocator.
+// See C++17 21.6.1 Header <new> synopsis.
+
+namespace std {
+
+#if 0
+// We could deprecate exception types, for completeness, but don't bother.  We
+// already have exceptions disabled, and run into compiler bugs when we try.
+//
+// gcc -Wattributes => type attributes ignored after type is already defined
+// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=122167
+//
+// clang -Wignored-attributes => attribute declaration must precede definition
+// The clang warning is https://github.com/llvm/llvm-project/issues/135481,
+// which should be fixed in clang 21.
+class [[deprecated]] bad_alloc;
+class [[deprecated]] bad_array_new_length;
+#endif // #if 0
+
+// Forbid new_handler manipulation by HotSpot code, leaving it untouched for
+// use by application code.
+[[deprecated]] new_handler get_new_handler() noexcept;
+[[deprecated]] new_handler set_new_handler(new_handler) noexcept;
+
+// Prefer HotSpot mechanisms for padding.
+//
+// The syntax for redeclaring these for deprecation is tricky, and not
+// supported by some versions of some compilers.  Dispatch on compiler and
+// version to decide whether to redeclare deprecated.
+
+#if defined(__clang__)
+#if __clang_major__ >= 19
+// clang18 and earlier may accept the declaration but go wrong with uses.
+// Different warnings and link-time failures are both possible.
+#define CAN_DEPRECATE_HARDWARE_INTERFERENCE_SIZES 1
+#endif // restrict clang version
+
+#elif defined(__GNUC__)
+#if (__GNUC__ > 13) || (__GNUC__ == 13 && __GNUC_MINOR__ >= 2)
+// g++11.5 accepts the declaration and reports deprecation for uses, but also
+// has link-time failure for uses. Haven't tested intermediate versions.
+#define CAN_DEPRECATE_HARDWARE_INTERFERENCE_SIZES 1
+#endif // restrict gcc version
+
+#elif defined(_MSVC)
+// VS2022-17.13.2 => error C2370: '...': redefinition; different storage class
+
+#endif // Compiler dispatch
+
+// Redeclare deprecated if such is supported.
+#ifdef CAN_DEPRECATE_HARDWARE_INTERFERENCE_SIZES
+[[deprecated]] extern const size_t hardware_destructive_interference_size;
+[[deprecated]] extern const size_t hardware_constructive_interference_size;
+#undef CAN_DEPRECATE_HARDWARE_INTERFERENCE_SIZES
+#endif // CAN_DEPRECATE_HARDWARE_INTERFERENCE_SIZES
+
+} // namespace std
+
+// Forbid using the global allocator by HotSpot code.
+// This doesn't provide complete coverage. Some global allocation and
+// deallocation functions are implicitly declared in all translation units,
+// without needing to include <new>; see C++17 6.7.4. So this doesn't remove
+// the need for the link-time verification that these functions aren't used.
+//
+// But don't poison them when compiling gtests. The gtest framework, the
+// HotSpot wrapper around it (gtestMain.cpp), and even some tests, all have
+// new/new[] and delete/delete[] expressions that use the default global
+// allocator.  We also don't apply the link-time check for gtests, for the
+// same reason.
+#ifndef HOTSPOT_GTEST
+
+[[deprecated]] void* operator new(std::size_t);
+[[deprecated]] void* operator new(std::size_t, std::align_val_t);
+[[deprecated]] void* operator new(std::size_t, const std::nothrow_t&) noexcept;
+[[deprecated]] void* operator new(std::size_t, std::align_val_t,
+                                  const std::nothrow_t&) noexcept;
+
+[[deprecated]] void operator delete(void*) noexcept;
+[[deprecated]] void operator delete(void*, std::size_t) noexcept;
+[[deprecated]] void operator delete(void*, std::align_val_t) noexcept;
+[[deprecated]] void operator delete(void*, std::size_t, std::align_val_t) noexcept;
+[[deprecated]] void operator delete(void*, const std::nothrow_t&) noexcept;
+[[deprecated]] void operator delete(void*, std::align_val_t,
+                                    const std::nothrow_t&) noexcept;
+
+[[deprecated]] void* operator new[](std::size_t);
+[[deprecated]] void* operator new[](std::size_t, std::align_val_t);
+[[deprecated]] void* operator new[](std::size_t, const std::nothrow_t&) noexcept;
+[[deprecated]] void* operator new[](std::size_t, std::align_val_t,
+                                    const std::nothrow_t&) noexcept;
+
+[[deprecated]] void operator delete[](void*) noexcept;
+[[deprecated]] void operator delete[](void*, std::size_t) noexcept;
+[[deprecated]] void operator delete[](void*, std::align_val_t) noexcept;
+[[deprecated]] void operator delete[](void*, std::size_t, std::align_val_t) noexcept;
+[[deprecated]] void operator delete[](void*, const std::nothrow_t&) noexcept;
+[[deprecated]] void operator delete[](void*, std::align_val_t,
+                                      const std::nothrow_t&) noexcept;
+
+#endif // HOTSPOT_GTEST
+
+// Allow (don't poison) the non-allocating forms from [new.delete.placement].
+
+#endif // SHARE_CPPSTDLIB_NEW_HPP
diff --git a/src/hotspot/share/gc/shared/bufferNode.cpp b/src/hotspot/share/gc/shared/bufferNode.cpp
index b064f9c7efe..90e50f52e84 100644
--- a/src/hotspot/share/gc/shared/bufferNode.cpp
+++ b/src/hotspot/share/gc/shared/bufferNode.cpp
@@ -22,12 +22,11 @@
  *
  */
 
+#include "cppstdlib/new.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "memory/allocation.inline.hpp"
 #include "utilities/debug.hpp"
 
-#include <new>
-
 BufferNode::AllocatorConfig::AllocatorConfig(size_t size)
   : _buffer_capacity(size)
 {
diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
index f913f3db4ba..39c1fe4fc78 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cppstdlib/new.hpp"
 #include "gc/shared/partialArrayState.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/arena.hpp"
@@ -33,8 +34,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
-#include <new>
-
 PartialArrayState::PartialArrayState(oop src, oop dst,
                                      size_t index, size_t length,
                                      size_t initial_refcount)
diff --git a/src/hotspot/share/gc/z/zDeferredConstructed.inline.hpp b/src/hotspot/share/gc/z/zDeferredConstructed.inline.hpp
index d6d35ecddcd..f686bc78d15 100644
--- a/src/hotspot/share/gc/z/zDeferredConstructed.inline.hpp
+++ b/src/hotspot/share/gc/z/zDeferredConstructed.inline.hpp
@@ -27,10 +27,9 @@
 
 #include "gc/z/zDeferredConstructed.hpp"
 
+#include "cppstdlib/new.hpp"
 #include "cppstdlib/type_traits.hpp"
 
-#include <new>
-
 template <typename T>
 inline ZDeferredConstructed<T>::ZDeferredConstructed()
   DEBUG_ONLY(: _initialized(false)) {
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index 35180fdba5e..963ca04aadf 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -25,14 +25,13 @@
 #ifndef SHARE_MEMORY_ALLOCATION_HPP
 #define SHARE_MEMORY_ALLOCATION_HPP
 
+#include "cppstdlib/new.hpp"
 #include "memory/allStatic.hpp"
 #include "nmt/memTag.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
-#include <new>
-
 class outputStream;
 class Thread;
 class JavaThread;
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index b9968083e0e..2de3f837c00 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "compiler/compilationMemoryStatistic.hpp"
+#include "cppstdlib/new.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/arena.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index b4a0546babf..a8450b5543a 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -31,8 +31,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 
-#include <new>
-
 // The byte alignment to be used by Arena::Amalloc.
 #define ARENA_AMALLOC_ALIGNMENT BytesPerLong
 #define ARENA_ALIGN(x) (align_up((x), ARENA_AMALLOC_ALIGNMENT))
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index 89c0a1ebc08..de39fe32dc1 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -29,6 +29,7 @@
 #include "code/vtableStubs.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/disassembler.hpp"
+#include "cppstdlib/new.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jvm.h"
@@ -63,7 +64,6 @@
 #include "utilities/unsigned5.hpp"
 #include "utilities/vmError.hpp"
 
-#include <new>
 #include <stdarg.h>
 #include <stdio.h>
 
diff --git a/src/hotspot/share/utilities/deferredStatic.hpp b/src/hotspot/share/utilities/deferredStatic.hpp
index 56bdb9b8e6b..3a32f920fe8 100644
--- a/src/hotspot/share/utilities/deferredStatic.hpp
+++ b/src/hotspot/share/utilities/deferredStatic.hpp
@@ -25,11 +25,10 @@
 #ifndef SHARE_UTILITIES_DEFERREDSTATIC_HPP
 #define SHARE_UTILITIES_DEFERREDSTATIC_HPP
 
+#include "cppstdlib/new.hpp"
 #include "cppstdlib/type_traits.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-#include <new>
-
 // The purpose of this class is to provide control over the initialization
 // time for an object of type T with static storage duration. An instance of
 // this class provides storage for an object, sized and aligned for T. The
diff --git a/src/hotspot/share/utilities/elfFile.cpp b/src/hotspot/share/utilities/elfFile.cpp
index 9ea19b38276..0b7713e9ca9 100644
--- a/src/hotspot/share/utilities/elfFile.cpp
+++ b/src/hotspot/share/utilities/elfFile.cpp
@@ -25,6 +25,7 @@
 
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
+#include "cppstdlib/new.hpp"
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
@@ -37,7 +38,6 @@
 #include "utilities/ostream.hpp"
 
 #include <limits.h>
-#include <new>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 1910759b434..3284fd3bd15 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -1386,4 +1386,25 @@ template<typename T> inline constexpr bool DependentAlwaysFalse = false;
 // handled.
 bool IEEE_subnormal_handling_OK();
 
+//----------------------------------------------------------------------------------------------------
+// Forbid using the global allocator by HotSpot code.
+//
+// This is a subset of allocator and deallocator functions. These are
+// implicitly declared in all translation units, without needing to include
+// <new>; see C++17 6.7.4. This isn't even the full set of those; implicit
+// declarations involving std::align_val_t are not covered here, since that
+// type is defined in <new>.  A translation unit that doesn't include <new> is
+// still likely to include this file.  See cppstdlib/new.hpp for more details.
+#ifndef HOTSPOT_GTEST
+
+[[deprecated]] void* operator new(std::size_t);
+[[deprecated]] void operator delete(void*) noexcept;
+[[deprecated]] void operator delete(void*, std::size_t) noexcept;
+
+[[deprecated]] void* operator new[](std::size_t);
+[[deprecated]] void operator delete[](void*) noexcept;
+[[deprecated]] void operator delete[](void*, std::size_t) noexcept;
+
+#endif // HOTSPOT_GTEST
+
 #endif // SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
diff --git a/test/hotspot/gtest/utilities/test_lockFreeStack.cpp b/test/hotspot/gtest/utilities/test_lockFreeStack.cpp
index fac17e87016..bdba49b48c0 100644
--- a/test/hotspot/gtest/utilities/test_lockFreeStack.cpp
+++ b/test/hotspot/gtest/utilities/test_lockFreeStack.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "cppstdlib/new.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -28,8 +29,6 @@
 #include "threadHelper.inline.hpp"
 #include "unittest.hpp"
 
-#include <new>
-
 class LockFreeStackTestElement {
   typedef LockFreeStackTestElement Element;
 

From 1535d08f0ee5da42d9db9e196d6a620aabe9feea Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 19 Nov 2025 20:58:23 +0000
Subject: [PATCH 256/512] 8371944: AOT configuration is corrupted when app
 closes System.out

Reviewed-by: kvn, iveresov
---
 src/hotspot/share/cds/aotMetaspace.cpp        | 46 ++++++++---
 src/hotspot/share/cds/aotMetaspace.hpp        |  2 +
 src/hotspot/share/cds/dynamicArchive.cpp      |  1 +
 src/hotspot/share/cds/filemap.cpp             |  2 +
 src/hotspot/share/cds/filemap.hpp             |  1 +
 .../cds/appcds/aotCache/CloseSystemOut.java   | 82 +++++++++++++++++++
 6 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/CloseSystemOut.java

diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index 8642b1a6de8..42d41e6ae89 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -114,6 +114,7 @@ intx AOTMetaspace::_relocation_delta;
 char* AOTMetaspace::_requested_base_address;
 Array<Method*>* AOTMetaspace::_archived_method_handle_intrinsics = nullptr;
 bool AOTMetaspace::_use_optimized_module_handling = true;
+FileMapInfo* AOTMetaspace::_output_mapinfo = nullptr;
 
 // The CDS archive is divided into the following regions:
 //     rw  - read-write metadata
@@ -322,6 +323,24 @@ void AOTMetaspace::initialize_for_static_dump() {
     AOTMetaspace::unrecoverable_writing_error();
   }
   _symbol_region.init(&_symbol_rs, &_symbol_vs);
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    // We are in the AOT training run. User code is executed.
+    //
+    // On Windows, if the user code closes System.out and we open the AOT config file for output
+    // only at VM exit, we might get back the same file HANDLE as stdout, and the AOT config
+    // file may get corrupted by UL logs. By opening early, we ensure that the output
+    // HANDLE is different than stdout so we can avoid such corruption.
+    open_output_mapinfo();
+  } else {
+    // No need for the above as we won't execute any user code.
+  }
+}
+
+void AOTMetaspace::open_output_mapinfo() {
+  const char* static_archive = CDSConfig::output_archive_path();
+  assert(static_archive != nullptr, "sanity");
+  _output_mapinfo = new FileMapInfo(static_archive, true);
+  _output_mapinfo->open_as_output();
 }
 
 // Called by universe_post_init()
@@ -655,15 +674,14 @@ private:
 
 public:
 
-  VM_PopulateDumpSharedSpace(StaticArchiveBuilder& b) :
-    VM_Operation(), _mapped_heap_info(), _streamed_heap_info(), _map_info(nullptr), _builder(b) {}
+  VM_PopulateDumpSharedSpace(StaticArchiveBuilder& b, FileMapInfo* map_info) :
+    VM_Operation(), _mapped_heap_info(), _streamed_heap_info(), _map_info(map_info), _builder(b) {}
 
   bool skip_operation() const { return false; }
 
   VMOp_Type type() const { return VMOp_PopulateDumpSharedSpace; }
   ArchiveMappedHeapInfo* mapped_heap_info()  { return &_mapped_heap_info; }
   ArchiveStreamedHeapInfo* streamed_heap_info()  { return &_streamed_heap_info; }
-  FileMapInfo* map_info() const { return _map_info; }
   void doit();   // outline because gdb sucks
   bool allow_nested_vm_operations() const { return true; }
 }; // class VM_PopulateDumpSharedSpace
@@ -795,12 +813,6 @@ void VM_PopulateDumpSharedSpace::doit() {
   CppVtables::zero_archived_vtables();
 
   // Write the archive file
-  if (CDSConfig::is_dumping_final_static_archive()) {
-    FileMapInfo::free_current_info(); // FIXME: should not free current info
-  }
-  const char* static_archive = CDSConfig::output_archive_path();
-  assert(static_archive != nullptr, "sanity");
-  _map_info = new FileMapInfo(static_archive, true);
   _map_info->populate_header(AOTMetaspace::core_region_alignment());
   _map_info->set_early_serialized_data(early_serialized_data);
   _map_info->set_serialized_data(serialized_data);
@@ -1138,7 +1150,14 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
   }
 #endif
 
-  VM_PopulateDumpSharedSpace op(builder);
+  if (!CDSConfig::is_dumping_preimage_static_archive()) {
+    if (CDSConfig::is_dumping_final_static_archive()) {
+      FileMapInfo::free_current_info(); // FIXME: should not free current info
+    }
+    open_output_mapinfo();
+  }
+
+  VM_PopulateDumpSharedSpace op(builder, _output_mapinfo);
   VMThread::execute(&op);
 
   if (AOTCodeCache::is_on_for_dump() && CDSConfig::is_dumping_final_static_archive()) {
@@ -1152,7 +1171,9 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
     CDSConfig::disable_dumping_aot_code();
   }
 
-  bool status = write_static_archive(&builder, op.map_info(), op.mapped_heap_info(), op.streamed_heap_info());
+  bool status = write_static_archive(&builder, _output_mapinfo, op.mapped_heap_info(), op.streamed_heap_info());
+  assert(!_output_mapinfo->is_open(), "Must be closed already");
+  _output_mapinfo = nullptr;
   if (status && CDSConfig::is_dumping_preimage_static_archive()) {
     tty->print_cr("%s AOTConfiguration recorded: %s",
                   CDSConfig::has_temp_aot_config_file() ? "Temporary" : "", AOTConfiguration);
@@ -1173,11 +1194,10 @@ bool AOTMetaspace::write_static_archive(ArchiveBuilder* builder,
   // relocate the data so that it can be mapped to AOTMetaspace::requested_base_address()
   // without runtime relocation.
   builder->relocate_to_requested();
-
-  map_info->open_as_output();
   if (!map_info->is_open()) {
     return false;
   }
+  map_info->prepare_for_writing();
   builder->write_archive(map_info, mapped_heap_info, streamed_heap_info);
   return true;
 }
diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp
index bfd9f4bcc75..1712a7865ad 100644
--- a/src/hotspot/share/cds/aotMetaspace.hpp
+++ b/src/hotspot/share/cds/aotMetaspace.hpp
@@ -60,6 +60,7 @@ class AOTMetaspace : AllStatic {
   static char* _requested_base_address;
   static bool _use_optimized_module_handling;
   static Array<Method*>* _archived_method_handle_intrinsics;
+  static FileMapInfo* _output_mapinfo;
 
  public:
   enum {
@@ -185,6 +186,7 @@ public:
 private:
   static void read_extra_data(JavaThread* current, const char* filename) NOT_CDS_RETURN;
   static void fork_and_dump_final_static_archive(TRAPS);
+  static void open_output_mapinfo();
   static bool write_static_archive(ArchiveBuilder* builder,
                                    FileMapInfo* map_info,
                                    ArchiveMappedHeapInfo* mapped_heap_info,
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index 85e59e23f8c..8fae8dabf8c 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -353,6 +353,7 @@ void DynamicArchiveBuilder::write_archive(char* serialized_data, AOTClassLocatio
   assert(dynamic_info != nullptr, "Sanity");
 
   dynamic_info->open_as_output();
+  dynamic_info->prepare_for_writing();
   ArchiveBuilder::write_archive(dynamic_info, nullptr, nullptr);
 
   address base = _requested_dynamic_archive_bottom;
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 61df0a86b41..0eeb96bb269 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -779,7 +779,9 @@ void FileMapInfo::open_as_output() {
   }
   _fd = fd;
   _file_open = true;
+}
 
+void FileMapInfo::prepare_for_writing() {
   // Seek past the header. We will write the header after all regions are written
   // and their CRCs computed.
   size_t header_bytes = header()->header_size();
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 2a761843e47..fbd3c8e1681 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -365,6 +365,7 @@ public:
   // File manipulation.
   bool  open_as_input() NOT_CDS_RETURN_(false);
   void  open_as_output();
+  void  prepare_for_writing();
   void  write_header();
   void  write_region(int region, char* base, size_t size,
                      bool read_only, bool allow_exec);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/CloseSystemOut.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/CloseSystemOut.java
new file mode 100644
index 00000000000..1f4111ecfb1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/CloseSystemOut.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary AOT configuration should not be corrupted even if the app closes System.out in the training run
+ * @bug 8371944
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build CloseSystemOut
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar CloseSystemOutApp
+ * @run driver CloseSystemOut
+ */
+
+import java.io.PrintWriter;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CloseSystemOut {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "CloseSystemOutApp";
+
+    public static void main(String[] args) throws Exception {
+        Tester tester = new Tester();
+        tester.run(new String[] {"AOT", "--two-step-training"} );
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {mainClass};
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            if (runMode != RunMode.ASSEMBLY) {
+                out.shouldContain("Hello Confused World");
+            }
+        }
+    }
+}
+
+class CloseSystemOutApp {
+    public static void main(String args[]) {
+        // Naive code that ends up closing System.out/err when we
+        // leave the "try" block
+        try (var err = new PrintWriter(System.err);
+             var out = new PrintWriter(System.out)) {
+            out.println("Hello Confused World");
+        }
+    }
+}

From c8e64e7c33cabcc5c94616808b9c59ab5b7cd14e Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 19 Nov 2025 23:22:40 +0000
Subject: [PATCH 257/512] 8372118: Test
 tools/jpackage/macosx/DmgContentTest.java failed

Reviewed-by: almatvee
---
 .../macosx/classes/jdk/jpackage/internal/MacDmgPackager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
index 6e13a2ff0c1..4ccc459109f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
@@ -30,6 +30,7 @@ import static jdk.jpackage.internal.util.PathUtils.normalizedAbsolutePathString;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.Base64;
@@ -288,7 +289,7 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
         // Copy app image, since we did not create DMG with it, but instead we created
         // empty one.
         if (copyAppImage) {
-            FileUtils.copyRecursive(srcFolder, mountedVolume);
+            FileUtils.copyRecursive(srcFolder, mountedVolume, LinkOption.NOFOLLOW_LINKS);
         }
 
         try {

From 2acd8776f26686a93708eb9fc408ff4e2bbe287c Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 20 Nov 2025 01:29:49 +0000
Subject: [PATCH 258/512] 8371440: jpackage should exit with an error if it
 finds multiple matching signing certificates

Reviewed-by: almatvee
---
 .../internal/SigningIdentityBuilder.java      |  7 ++--
 .../resources/MacResources.properties         |  2 +-
 .../tools/jpackage/macosx/MacSignTest.java    | 40 +++++++++++--------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
index bf8f1519fe1..f90e76bb23d 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
@@ -156,9 +156,10 @@ final class SigningIdentityBuilder {
                 return certs.getFirst();
             }
             default -> {
-                Log.error(I18N.format("error.multiple.certs.found", certificateSelector.signingIdentities().getFirst(),
-                        keychain.map(Keychain::name).orElse("")));
-                return certs.getFirst();
+                throw I18N.buildConfigException("error.multiple.certs.found",
+                        certificateSelector.signingIdentities().getFirst(),
+                        keychain.map(Keychain::name).orElse("")
+                ).create();
             }
         }
     }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index 58c3bbbc025..afa71d84d5c 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -36,7 +36,7 @@ error.must-sign-app-store=Mac App Store apps must be signed, and signing has bee
 error.must-sign-app-store.advice=Use --mac-sign option with appropriate user-name and keychain
 error.certificate.expired=Error: Certificate expired {0}
 error.cert.not.found=No certificate found matching [{0}] using keychain [{1}]
-error.multiple.certs.found=WARNING: Multiple certificates found matching [{0}] using keychain [{1}], using first one
+error.multiple.certs.found=Multiple certificates matching name [{0}] found in keychain [{1}]
 error.app-image.mac-sign.required=Error: --mac-sign option is required with predefined application image and with type [app-image]
 error.tool.failed.with.output=Error: "{0}" failed with following output:
 error.invalid-runtime-image-missing-file=Runtime image "{0}" is missing "{1}" file
diff --git a/test/jdk/tools/jpackage/macosx/MacSignTest.java b/test/jdk/tools/jpackage/macosx/MacSignTest.java
index 014fbc84548..af7cf448bdc 100644
--- a/test/jdk/tools/jpackage/macosx/MacSignTest.java
+++ b/test/jdk/tools/jpackage/macosx/MacSignTest.java
@@ -39,6 +39,7 @@ import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.MacHelper;
 import jdk.jpackage.test.MacSign;
 import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.CertificateType;
 import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
@@ -155,20 +156,13 @@ public class MacSignTest {
     }
 
     @Test
-    // Case "--mac-signing-key-user-name": jpackage selects first certificate
-    // found with warning message. Certificate hash is pass to "codesign" in this
-    // case.
-    @Parameter({"IMAGE", "0", "GOOD_SIGNING_KEY_USER_NAME"})
-    @Parameter({"MAC_DMG", "0", "GOOD_SIGNING_KEY_USER_NAME"})
-    @Parameter({"MAC_PKG", "0", "GOOD_SIGNING_KEY_USER_NAME_PKG", "GOOD_SIGNING_KEY_USER_NAME"})
-
-    // Case "--mac-app-image-sign-identity": sign identity will be pass to
-    // "codesign" and "codesign" should fail due to multiple certificates with
-    // same common name found.
-    @Parameter({"IMAGE", "1", "GOOD_CODESIGN_SIGN_IDENTITY"})
-    @Parameter({"MAC_PKG", "1", "GOOD_CODESIGN_SIGN_IDENTITY", "GOOD_PKG_SIGN_IDENTITY"})
-    @Parameter({"MAC_PKG", "1", "GOOD_PKG_SIGN_IDENTITY"})
-    public static void testMultipleCertificates(PackageType type, int jpackageExitCode, SignOption... options) {
+    @Parameter({"IMAGE", "GOOD_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_DMG", "GOOD_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_PKG", "GOOD_SIGNING_KEY_USER_NAME_PKG", "GOOD_SIGNING_KEY_USER_NAME"})
+    @Parameter({"IMAGE", "GOOD_CODESIGN_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "GOOD_CODESIGN_SIGN_IDENTITY", "GOOD_PKG_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "GOOD_PKG_SIGN_IDENTITY"})
+    public static void testMultipleCertificates(PackageType type, SignOption... options) {
 
         MacSign.withKeychain(keychain -> {
             final var cmd = MacHelper.useKeychain(JPackageCommand.helloAppImage(), keychain)
@@ -176,9 +170,19 @@ public class MacSignTest {
                     .addArguments(Stream.of(options).map(SignOption::args).flatMap(List::stream).toList())
                     .setPackageType(type);
 
-            SignOption.configureOutputValidation(cmd, List.of(options), opt -> {
+            Predicate<SignOption> filter = opt -> {
+                if (type == PackageType.MAC_PKG && options.length > 1) {
+                    // Only the first error will be reported and it should always be
+                    // for the app image signing, not for the PKG signing.
+                    return opt.identityType() == CertificateType.CODE_SIGN;
+                } else {
+                    return true;
+                }
+            };
+
+            SignOption.configureOutputValidation(cmd, Stream.of(options).filter(filter).toList(), opt -> {
                 return JPackageStringBundle.MAIN.cannedFormattedString("error.multiple.certs.found", opt.identityName(), keychain.name());
-            }).execute(jpackageExitCode);
+            }).execute(1);
         }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.DUPLICATE.keychain());
     }
 
@@ -244,6 +248,10 @@ public class MacSignTest {
             return cert.name();
         }
 
+        CertificateType identityType() {
+            return cert.type();
+        }
+
         List<String> args() {
             return List.of(option, shortName ? cert.shortName() : cert.name());
         }

From a3b1affbfb23eeef32749164aae316e5d55fffaa Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Thu, 20 Nov 2025 02:18:44 +0000
Subject: [PATCH 259/512] 8372046:
 compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java fails IR
 verification

Reviewed-by: mhaessig, epeter
---
 .../floatingpoint/TestSubNodeFloatDoubleNegation.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java b/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
index 4c7092ec654..d96e64baa36 100644
--- a/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
+++ b/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
@@ -38,7 +38,13 @@ import jdk.test.lib.Asserts;
 public class TestSubNodeFloatDoubleNegation {
 
     public static void main(String[] args) {
-        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:CompileCommand=inline,jdk.incubator.vector.Float16::*");
+        // Disable inlining for java.lang.Float::float16ToFloat and java.lang.Float::floatToFloat16.
+        // Otherwise, they could be inlined into testHalfFloat on platforms where there is no support
+        // for fp16, which causes unexpected IR graph.
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector",
+                                   "-XX:CompileCommand=inline,jdk.incubator.vector.Float16::*",
+                                   "-XX:CompileCommand=dontinline,java.lang.Float::float16ToFloat",
+                                   "-XX:CompileCommand=dontinline,java.lang.Float::floatToFloat16");
     }
 
     @Run(test = { "testHalfFloat", "testFloat", "testDouble" })

From 473471c1f1d3cd42a057dfd602d452196c53aa00 Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Thu, 20 Nov 2025 05:30:40 +0000
Subject: [PATCH 260/512] 8369838: Likely invalid assert or function call in
 jimage.cpp

Reviewed-by: dholmes
---
 src/hotspot/share/classfile/classLoader.cpp   | 37 +++++++++----------
 .../share/native/libjimage/jimage.cpp         |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index 082c745f4c3..12fbda899b9 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -412,31 +412,30 @@ ClassFileStream* ClassPathImageEntry::open_stream(JavaThread* current, const cha
 //
 ClassFileStream* ClassPathImageEntry::open_stream_for_loader(JavaThread* current, const char* name, ClassLoaderData* loader_data) {
   jlong size;
-  JImageLocationRef location = (*JImageFindResource)(jimage_non_null(), "", get_jimage_version_string(), name, &size);
+  JImageLocationRef location = 0;
 
-  if (location == 0) {
-    TempNewSymbol class_name = SymbolTable::new_symbol(name);
-    TempNewSymbol pkg_name = ClassLoader::package_from_class_name(class_name);
+  TempNewSymbol class_name = SymbolTable::new_symbol(name);
+  TempNewSymbol pkg_name = ClassLoader::package_from_class_name(class_name);
 
-    if (pkg_name != nullptr) {
-      if (!Universe::is_module_initialized()) {
-        location = (*JImageFindResource)(jimage_non_null(), JAVA_BASE_NAME, get_jimage_version_string(), name, &size);
-      } else {
-        PackageEntry* package_entry = ClassLoader::get_package_entry(pkg_name, loader_data);
-        if (package_entry != nullptr) {
-          ResourceMark rm(current);
-          // Get the module name
-          ModuleEntry* module = package_entry->module();
-          assert(module != nullptr, "Boot classLoader package missing module");
-          assert(module->is_named(), "Boot classLoader package is in unnamed module");
-          const char* module_name = module->name()->as_C_string();
-          if (module_name != nullptr) {
-            location = (*JImageFindResource)(jimage_non_null(), module_name, get_jimage_version_string(), name, &size);
-          }
+  if (pkg_name != nullptr) {
+    if (!Universe::is_module_initialized()) {
+      location = (*JImageFindResource)(jimage_non_null(), JAVA_BASE_NAME, get_jimage_version_string(), name, &size);
+    } else {
+      PackageEntry* package_entry = ClassLoader::get_package_entry(pkg_name, loader_data);
+      if (package_entry != nullptr) {
+        ResourceMark rm(current);
+        // Get the module name
+        ModuleEntry* module = package_entry->module();
+        assert(module != nullptr, "Boot classLoader package missing module");
+        assert(module->is_named(), "Boot classLoader package is in unnamed module");
+        const char* module_name = module->name()->as_C_string();
+        if (module_name != nullptr) {
+          location = (*JImageFindResource)(jimage_non_null(), module_name, get_jimage_version_string(), name, &size);
         }
       }
     }
   }
+
   if (location != 0) {
     if (UsePerfData) {
       ClassLoader::perf_sys_classfile_bytes_read()->inc(size);
diff --git a/src/java.base/share/native/libjimage/jimage.cpp b/src/java.base/share/native/libjimage/jimage.cpp
index 10e85eb2520..91a86f992e6 100644
--- a/src/java.base/share/native/libjimage/jimage.cpp
+++ b/src/java.base/share/native/libjimage/jimage.cpp
@@ -110,7 +110,7 @@ JIMAGE_FindResource(JImageFile* image,
     size_t nameLen = strlen(name);
     size_t index;
 
-    // TBD:   assert(moduleNameLen > 0 && "module name must be non-empty");
+    assert(moduleNameLen > 0 && "module name must be non-empty");
     assert(nameLen > 0 && "name must non-empty");
 
     // If the concatenated string is too long for the buffer, return not found

From 5d3e73b9e512b55cdf554158b19a4ec642dc1f1a Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 20 Nov 2025 06:14:40 +0000
Subject: [PATCH 261/512] 8371248: Crash in -Xdoclint with invalid @link

Reviewed-by: hannesw, vromero
---
 .../com/sun/tools/javac/api/JavacTrees.java   |  4 +++
 .../com/sun/tools/javac/comp/Attr.java        |  2 +-
 .../tools/javac/doctree/ReferenceTest.java    | 30 +++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 2eca26de838..f933ef36565 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -473,6 +473,10 @@ public class JavacTrees extends DocTrees {
             if (memberName == null)
                 return tsym;
 
+            if (tsym.type.isPrimitive()) {
+                return null;
+            }
+
             final List<Type> paramTypes;
             if (ref.paramTypes == null)
                 paramTypes = null;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index ad41adcc135..c723caf1843 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -377,7 +377,7 @@ public class Attr extends JCTree.Visitor {
             @Override @DefinedBy(Api.COMPILER_TREE)
             public Symbol visitMemberSelect(MemberSelectTree node, Env<AttrContext> env) {
                 Symbol site = visit(node.getExpression(), env);
-                if (site.kind == ERR || site.kind == ABSENT_TYP || site.kind == HIDDEN)
+                if (site == null || site.kind == ERR || site.kind == ABSENT_TYP || site.kind == HIDDEN)
                     return site;
                 Name name = (Name)node.getIdentifier();
                 if (site.kind == PCK) {
diff --git a/test/langtools/tools/javac/doctree/ReferenceTest.java b/test/langtools/tools/javac/doctree/ReferenceTest.java
index 46c3d40e73a..540cb9a6621 100644
--- a/test/langtools/tools/javac/doctree/ReferenceTest.java
+++ b/test/langtools/tools/javac/doctree/ReferenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8278373 8164094
+ * @bug 7021614 8278373 8164094 8371248
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @summary check references in at-see and {at-link} tags
  * @modules jdk.compiler
@@ -43,6 +43,7 @@ import com.sun.source.util.DocTrees;
 import com.sun.source.util.TreePath;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.processing.AbstractProcessor;
@@ -83,6 +84,31 @@ import javax.tools.Diagnostic.Kind;
  * {@link #trees Field}
  * {@link #getSupportedSourceVersion Method}
  * {@link #init(ProcessingEnvironment Method}
+ * {@link double Class}
+ * {@link double.NAN Bad}
+ * {@link double#NAN Bad}
+ * {@link double#double Bad}
+ * {@link java.base/double Bad}
+ *
+ * {@link List<String> Interface}
+ * {@link List<String>.add Bad}
+ * {@link List<String>#add Method}
+ * {@link List<String>#add(Object) Method}
+ * {@link Map<String, String>.Entry Interface}
+ * {@link Map<String, String>.Entry<String, String> Interface}
+ * {@link Map<String, String>.Entry<String, String>.getKey Bad}
+ * {@link Map<String, String>.Entry<String, String>#getKey Method}
+ * {@link Map<String, String>.Entry<String, String>#setValue(Object) Method}
+ *
+ * {@link java.base/java.util.List<String> Bad}
+ * {@link java.base/java.util.List<String>.add Bad}
+ * {@link java.base/java.util.List<String>#add Bad}
+ * {@link java.base/java.util.List<String>#add(Object) Bad}
+ * {@link java.base/java.util.Map<String, String>.Entry Bad}
+ * {@link java.base/java.util.Map<String, String>.Entry<String, String> Bad}
+ * {@link java.base/java.util.Map<String, String>.Entry<String, String>.getKey Bad}
+ * {@link java.base/java.util.Map<String, String>.Entry<String, String>#getKey Bad}
+ * {@link java.base/java.util.Map<String, String>.Entry<String, String>#setValue(Object) Bad}
  *
  * @see java.lang        Package
  * @see java.lang.ERROR  Bad

From 72c45a4d923a294108995e24951bec24dfc70410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Thu, 20 Nov 2025 07:08:46 +0000
Subject: [PATCH 262/512] 8355225: Test gtest/AsyncLogGtest.java failed at
 droppingMessage_vm: apparent log corruption

Reviewed-by: dholmes, syan
---
 test/hotspot/gtest/logging/test_asynclog.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/gtest/logging/test_asynclog.cpp b/test/hotspot/gtest/logging/test_asynclog.cpp
index fdc3795e9db..2634b8dac77 100644
--- a/test/hotspot/gtest/logging/test_asynclog.cpp
+++ b/test/hotspot/gtest/logging/test_asynclog.cpp
@@ -253,6 +253,8 @@ TEST_VM_F(AsyncLogTest, droppingMessage) {
 
   set_log_config(TestLogFileName, "logging=debug");
   test_asynclog_drop_messages();
+  AsyncLogWriter::flush();
+  fflush(nullptr);
   bool messages_dropped = file_contains_substring(TestLogFileName, "messages dropped due to async logging");
   if (!messages_dropped) {
     stringStream content;

From 852141b9d42ada168a008aea63045deddca29190 Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Thu, 20 Nov 2025 07:32:06 +0000
Subject: [PATCH 263/512] 8372004: Have SSLLogger implement System.Logger

Reviewed-by: dfuchs, weijun
---
 .../share/classes/sun/security/ssl/Alert.java |   2 +-
 .../sun/security/ssl/AlpnExtension.java       |  18 +-
 .../security/ssl/CertSignAlgsExtension.java   |   8 +-
 .../sun/security/ssl/CertStatusExtension.java |  32 +-
 .../ssl/CertificateAuthoritiesExtension.java  |  16 +-
 .../sun/security/ssl/CertificateMessage.java  |  32 +-
 .../sun/security/ssl/CertificateRequest.java  |  22 +-
 .../sun/security/ssl/CertificateStatus.java   |   6 +-
 .../sun/security/ssl/CertificateVerify.java   |  26 +-
 .../sun/security/ssl/ChangeCipherSpec.java    |   6 +-
 .../classes/sun/security/ssl/ClientHello.java |  42 +-
 .../sun/security/ssl/CookieExtension.java     |  10 +-
 .../sun/security/ssl/DHClientKeyExchange.java |   4 +-
 .../sun/security/ssl/DHServerKeyExchange.java |   4 +-
 .../sun/security/ssl/DTLSInputRecord.java     |  76 ++--
 .../sun/security/ssl/DTLSOutputRecord.java    |  22 +-
 .../security/ssl/ECDHClientKeyExchange.java   |   8 +-
 .../security/ssl/ECDHServerKeyExchange.java   |   4 +-
 .../security/ssl/ECPointFormatsExtension.java |   6 +-
 .../sun/security/ssl/EncryptedExtensions.java |   4 +-
 .../ssl/ExtendedMasterSecretExtension.java    |  10 +-
 .../classes/sun/security/ssl/Finished.java    |  16 +-
 .../sun/security/ssl/HandshakeContext.java    |  12 +-
 .../sun/security/ssl/HandshakeOutStream.java  |   2 +-
 .../sun/security/ssl/HelloRequest.java        |  10 +-
 .../sun/security/ssl/HelloVerifyRequest.java  |   4 +-
 .../sun/security/ssl/KeyShareExtension.java   |  32 +-
 .../classes/sun/security/ssl/KeyUpdate.java   |   8 +-
 .../sun/security/ssl/MaxFragExtension.java    |  18 +-
 .../classes/sun/security/ssl/NamedGroup.java  |   8 +-
 .../sun/security/ssl/NewSessionTicket.java    |  38 +-
 .../sun/security/ssl/OutputRecord.java        |   4 +-
 .../security/ssl/PreSharedKeyExtension.java   |  34 +-
 .../ssl/PredefinedDHParameterSpecs.java       |   6 +-
 .../ssl/PskKeyExchangeModesExtension.java     |   8 +-
 .../security/ssl/QuicEngineOutputRecord.java  |   8 +-
 .../sun/security/ssl/QuicKeyManager.java      |  26 +-
 .../sun/security/ssl/QuicTLSEngineImpl.java   |   6 +-
 .../security/ssl/RSAClientKeyExchange.java    |   4 +-
 .../sun/security/ssl/RSAKeyExchange.java      |  11 +-
 .../security/ssl/RSAServerKeyExchange.java    |   4 +-
 .../sun/security/ssl/RenegoInfoExtension.java |  24 +-
 .../security/ssl/SSLAlgorithmConstraints.java |   2 +-
 .../classes/sun/security/ssl/SSLCipher.java   |  44 +-
 .../sun/security/ssl/SSLConfiguration.java    |   8 +-
 .../sun/security/ssl/SSLContextImpl.java      |  32 +-
 .../sun/security/ssl/SSLEngineImpl.java       |  14 +-
 .../security/ssl/SSLEngineInputRecord.java    |  10 +-
 .../security/ssl/SSLEngineOutputRecord.java   |  26 +-
 .../sun/security/ssl/SSLExtension.java        |   2 +-
 .../sun/security/ssl/SSLExtensions.java       |  32 +-
 .../classes/sun/security/ssl/SSLLogger.java   | 415 +++++++++---------
 .../security/ssl/SSLMasterKeyDerivation.java  |   3 +-
 .../security/ssl/SSLSessionContextImpl.java   |   8 +-
 .../sun/security/ssl/SSLSessionImpl.java      |  16 +-
 .../sun/security/ssl/SSLSocketImpl.java       |  46 +-
 .../security/ssl/SSLSocketInputRecord.java    |  14 +-
 .../security/ssl/SSLSocketOutputRecord.java   |  32 +-
 .../sun/security/ssl/SSLTransport.java        |   8 +-
 .../classes/sun/security/ssl/ServerHello.java |  26 +-
 .../sun/security/ssl/ServerHelloDone.java     |   4 +-
 .../sun/security/ssl/ServerNameExtension.java |  20 +-
 .../security/ssl/SessionTicketExtension.java  |  24 +-
 .../ssl/SignatureAlgorithmsExtension.java     |   4 +-
 .../sun/security/ssl/SignatureScheme.java     |  20 +-
 .../security/ssl/StatusResponseManager.java   |  62 +--
 .../security/ssl/SunX509KeyManagerImpl.java   |   4 +-
 .../ssl/SupportedGroupsExtension.java         |  20 +-
 .../ssl/SupportedVersionsExtension.java       |  18 +-
 .../sun/security/ssl/TransportContext.java    |  20 +-
 .../security/ssl/TrustManagerFactoryImpl.java |  10 +-
 .../sun/security/ssl/TrustStoreManager.java   |  16 +-
 .../classes/sun/security/ssl/Utilities.java   |   6 +-
 .../sun/security/ssl/X509Authentication.java  |  26 +-
 .../ssl/X509KeyManagerCertChecking.java       |  14 +-
 .../sun/security/ssl/X509KeyManagerImpl.java  |  14 +-
 .../security/ssl/X509TrustManagerImpl.java    |  12 +-
 .../classes/sun/security/util/DomainName.java |   9 +-
 .../sun/security/util/HostnameChecker.java    |  10 +-
 .../SSLLogger/DebugPropertyValuesTest.java    |   3 +-
 80 files changed, 848 insertions(+), 847 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/Alert.java b/src/java.base/share/classes/sun/security/ssl/Alert.java
index ed5e079bf44..d172206326f 100644
--- a/src/java.base/share/classes/sun/security/ssl/Alert.java
+++ b/src/java.base/share/classes/sun/security/ssl/Alert.java
@@ -238,7 +238,7 @@ public enum Alert {
             TransportContext tc = (TransportContext)context;
 
             AlertMessage am = new AlertMessage(tc, m);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("Received alert message", am);
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java b/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java
index aa5933ddab0..f03a65c8410 100644
--- a/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java
@@ -157,7 +157,7 @@ final class AlpnExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_ALPN)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.info(
                             "Ignore client unavailable extension: " +
                             SSLExtension.CH_ALPN.name);
@@ -170,7 +170,7 @@ final class AlpnExtension {
 
             String[] laps = chc.sslConfig.applicationProtocols;
             if ((laps == null) || (laps.length == 0)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.info(
                             "No available application protocols");
                 }
@@ -183,7 +183,7 @@ final class AlpnExtension {
                 int length = ap.getBytes(alpnCharset).length;
                 if (length == 0) {
                     // log the configuration problem
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.severe(
                                 "Application protocol name cannot be empty");
                     }
@@ -197,7 +197,7 @@ final class AlpnExtension {
                     listLength += (length + 1);
                 } else {
                     // log the configuration problem
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.severe(
                                 "Application protocol name (" + ap +
                                 ") exceeds the size limit (" +
@@ -212,7 +212,7 @@ final class AlpnExtension {
 
                 if (listLength > MAX_AP_LIST_LENGTH) {
                     // log the configuration problem
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.severe(
                                 "The configured application protocols (" +
                                 Arrays.toString(laps) +
@@ -266,7 +266,7 @@ final class AlpnExtension {
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_ALPN)) {
                 shc.applicationProtocol = "";
                 shc.conContext.applicationProtocol = "";
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.info(
                             "Ignore server unavailable extension: " +
                             SSLExtension.CH_ALPN.name);
@@ -288,7 +288,7 @@ final class AlpnExtension {
             if (noAPSelector && noAlpnProtocols) {
                 shc.applicationProtocol = "";
                 shc.conContext.applicationProtocol = "";
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore server unenabled extension: " +
                             SSLExtension.CH_ALPN.name);
@@ -378,7 +378,7 @@ final class AlpnExtension {
                     (AlpnSpec)shc.handshakeExtensions.get(SSLExtension.CH_ALPN);
             if (requestedAlps == null) {
                 // Ignore, this extension was not requested and accepted.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable extension: " +
                             SSLExtension.SH_ALPN.name);
@@ -423,7 +423,7 @@ final class AlpnExtension {
                 // Ignore, no negotiated application layer protocol.
                 shc.applicationProtocol = "";
                 shc.conContext.applicationProtocol = "";
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "Ignore, no negotiated application layer protocol");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
index 2125a148162..2d03d5fef98 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
@@ -94,7 +94,7 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
@@ -144,7 +144,7 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
@@ -235,7 +235,7 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
@@ -283,7 +283,7 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
index 49713b6db11..d6c1cec5735 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
@@ -144,7 +144,7 @@ final class CertStatusExtension {
             if (statusType == CertStatusRequestType.OCSP.id) {
                 this.statusRequest = new OCSPStatusRequest(statusType, encoded);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.info(
                         "Unknown certificate status request " +
                         "(status type: " + statusType + ")");
@@ -196,7 +196,7 @@ final class CertStatusExtension {
             if (type == CertStatusRequestType.OCSP.id) {
                 this.statusResponse = new OCSPStatusResponse(type, respData);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.info(
                         "Unknown certificate status response " +
                         "(status type: " + type + ")");
@@ -557,7 +557,7 @@ final class CertStatusExtension {
             }
 
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         SSLExtension.CH_STATUS_REQUEST.name);
@@ -598,7 +598,7 @@ final class CertStatusExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                         SSLExtension.CH_STATUS_REQUEST.name);
                 }
@@ -656,7 +656,7 @@ final class CertStatusExtension {
                     shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST);
             if (spec == null) {
                 // Ignore, no status_request extension requested.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest("Ignore unavailable extension: " +
                         SSLExtension.CH_STATUS_REQUEST.name);
                 }
@@ -666,7 +666,7 @@ final class CertStatusExtension {
 
             // Is it a session resuming?
             if (shc.isResumption) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "No status_request response for session resuming");
                 }
@@ -839,7 +839,7 @@ final class CertStatusExtension {
                     statusRequests.add(
                             new OCSPStatusRequest(statusType, encoded));
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.info(
                                 "Unknown certificate status request " +
                                 "(status type: " + statusType + ")");
@@ -915,7 +915,7 @@ final class CertStatusExtension {
             }
 
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable status_request_v2 extension");
                 }
@@ -957,7 +957,7 @@ final class CertStatusExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable status_request_v2 extension");
                 }
@@ -1017,7 +1017,7 @@ final class CertStatusExtension {
                 shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST_V2);
             if (spec == null) {
                 // Ignore, no status_request_v2 extension requested.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable status_request_v2 extension");
                 }
@@ -1027,7 +1027,7 @@ final class CertStatusExtension {
 
             // Is it a session resuming?
             if (shc.isResumption) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "No status_request_v2 response for session resumption");
                 }
@@ -1112,7 +1112,7 @@ final class CertStatusExtension {
 
             // Stapling needs to be active and have valid data to proceed
             if (shc.stapleParams == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Stapling is disabled for this connection");
                 }
@@ -1121,7 +1121,7 @@ final class CertStatusExtension {
 
             // There needs to be a non-null CertificateEntry to proceed
             if (shc.currentCertEntry == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest("Found null CertificateEntry in context");
                 }
                 return null;
@@ -1139,7 +1139,7 @@ final class CertStatusExtension {
                 byte[] respBytes = shc.stapleParams.responseMap.get(x509Cert);
                 if (respBytes == null) {
                     // We're done with this entry.  Clear it from the context
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest("No status response found for " +
                                 x509Cert.getSubjectX500Principal());
@@ -1149,7 +1149,7 @@ final class CertStatusExtension {
                 }
 
                 // Build a proper response buffer from the stapling information
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake,verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest("Found status response for " +
                             x509Cert.getSubjectX500Principal() +
                             ", response length: " + respBytes.length);
@@ -1208,7 +1208,7 @@ final class CertStatusExtension {
                 respList.add(spec.statusResponse.encodedResponse);
                 chc.handshakeSession.setStatusResponses(respList);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake,verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest(
                             "Ignoring stapled data on resumed session");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
index 43bac16f0ea..cc513eb30ba 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
@@ -192,7 +192,7 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
@@ -205,7 +205,7 @@ final class CertificateAuthoritiesExtension {
             X509Certificate[] caCerts =
                     chc.sslContext.getX509TrustManager().getAcceptedIssuers();
             if (caCerts.length == 0) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "No available certificate authorities");
                 }
@@ -216,7 +216,7 @@ final class CertificateAuthoritiesExtension {
             List<byte[]> encodedCAs =
                     CertificateAuthoritiesSpec.getEncodedAuthorities(caCerts);
             if (encodedCAs.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "The number of CAs exceeds the maximum size " +
                             "of the certificate_authorities extension");
@@ -270,7 +270,7 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
@@ -319,7 +319,7 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CR_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
@@ -332,7 +332,7 @@ final class CertificateAuthoritiesExtension {
             X509Certificate[] caCerts =
                     shc.sslContext.getX509TrustManager().getAcceptedIssuers();
             if (caCerts.length == 0) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "No available certificate authorities");
                 }
@@ -343,7 +343,7 @@ final class CertificateAuthoritiesExtension {
             List<byte[]> encodedCAs =
                     CertificateAuthoritiesSpec.getEncodedAuthorities(caCerts);
             if (encodedCAs.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "Too many certificate authorities to use " +
                             "the certificate_authorities extension");
@@ -397,7 +397,7 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CR_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
index d4587d35ae9..2a2db34cab9 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
@@ -265,7 +265,7 @@ final class CertificateMessage {
             shc.handshakeSession.setLocalCertificates(x509Possession.popCerts);
             T12CertificateMessage cm =
                     new T12CertificateMessage(shc, x509Possession.popCerts);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced server Certificate handshake message", cm);
             }
@@ -293,7 +293,7 @@ final class CertificateMessage {
             // an empty cert chain instead.
             if (x509Possession == null) {
                 if (chc.negotiatedProtocol.useTLS10PlusSpec()) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "No X.509 certificate for client authentication, " +
                             "use empty Certificate message instead");
@@ -302,7 +302,7 @@ final class CertificateMessage {
                     x509Possession =
                             new X509Possession(null, new X509Certificate[0]);
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "No X.509 certificate for client authentication, " +
                             "send a no_certificate alert");
@@ -324,7 +324,7 @@ final class CertificateMessage {
             }
             T12CertificateMessage cm =
                     new T12CertificateMessage(chc, x509Possession.popCerts);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced client Certificate handshake message", cm);
             }
@@ -360,13 +360,13 @@ final class CertificateMessage {
 
             T12CertificateMessage cm = new T12CertificateMessage(hc, message);
             if (hc.sslConfig.isClientMode) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Consuming server Certificate handshake message", cm);
                 }
                 onCertificate((ClientHandshakeContext)context, cm);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Consuming client Certificate handshake message", cm);
                 }
@@ -501,7 +501,7 @@ final class CertificateMessage {
             try {
                 thisSubjectAltNames = thisCert.getSubjectAlternativeNames();
             } catch (CertificateParsingException cpe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
                     SSLLogger.fine(
                         "Attempt to obtain subjectAltNames extension failed!");
                 }
@@ -511,7 +511,7 @@ final class CertificateMessage {
             try {
                 prevSubjectAltNames = prevCert.getSubjectAlternativeNames();
             } catch (CertificateParsingException cpe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
                     SSLLogger.fine(
                         "Attempt to obtain subjectAltNames extension failed!");
                 }
@@ -980,7 +980,7 @@ final class CertificateMessage {
                 certEnt.extensions.produce(shc, enabledCTExts);
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced server Certificate message", cm);
             }
 
@@ -997,7 +997,7 @@ final class CertificateMessage {
                 ClientHelloMessage clientHello) {
             if (hc.peerRequestedCertSignSchemes == null ||
                     hc.peerRequestedCertSignSchemes.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "No signature_algorithms(_cert) in ClientHello");
                 }
@@ -1021,7 +1021,7 @@ final class CertificateMessage {
             SSLPossession pos = X509Authentication
                     .createPossession(hc, supportedKeyTypes);
             if (pos == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No available authentication scheme");
                 }
             }
@@ -1034,14 +1034,14 @@ final class CertificateMessage {
             SSLPossession pos = choosePossession(chc, clientHello);
             X509Certificate[] localCerts;
             if (pos == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("No available client authentication scheme");
                 }
                 localCerts = new X509Certificate[0];
             } else {
                 chc.handshakePossessions.add(pos);
                 if (!(pos instanceof X509Possession x509Possession)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "No X.509 certificate for client authentication");
                     }
@@ -1067,7 +1067,7 @@ final class CertificateMessage {
                 throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "Failed to produce client Certificate message", ce);
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced client Certificate message", cm);
             }
 
@@ -1108,13 +1108,13 @@ final class CertificateMessage {
 
             T13CertificateMessage cm = new T13CertificateMessage(hc, message);
             if (hc.sslConfig.isClientMode) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Consuming server Certificate handshake message", cm);
                 }
                 onConsumeCertificate((ClientHandshakeContext)context, cm);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Consuming client Certificate handshake message", cm);
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
index 66b8c048703..a297d9d21b2 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
@@ -297,7 +297,7 @@ final class CertificateRequest {
                     shc.sslContext.getX509TrustManager().getAcceptedIssuers();
             T10CertificateRequestMessage crm = new T10CertificateRequestMessage(
                     shc, caCerts, shc.negotiatedCipherSuite.keyExchange);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced CertificateRequest handshake message", crm);
             }
@@ -360,7 +360,7 @@ final class CertificateRequest {
 
             T10CertificateRequestMessage crm =
                     new T10CertificateRequestMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming CertificateRequest handshake message", crm);
             }
@@ -400,7 +400,7 @@ final class CertificateRequest {
             }
 
             if (clientAlias == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No available client authentication");
                 }
                 return;
@@ -408,7 +408,7 @@ final class CertificateRequest {
 
             PrivateKey clientPrivateKey = km.getPrivateKey(clientAlias);
             if (clientPrivateKey == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No available client private key");
                 }
                 return;
@@ -416,7 +416,7 @@ final class CertificateRequest {
 
             X509Certificate[] clientCerts = km.getCertificateChain(clientAlias);
             if ((clientCerts == null) || (clientCerts.length == 0)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No available client certificate");
                 }
                 return;
@@ -655,7 +655,7 @@ final class CertificateRequest {
             T12CertificateRequestMessage crm = new T12CertificateRequestMessage(
                     shc, caCerts, shc.negotiatedCipherSuite.keyExchange,
                     certReqSignAlgs);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced CertificateRequest handshake message", crm);
             }
@@ -717,7 +717,7 @@ final class CertificateRequest {
 
             T12CertificateRequestMessage crm =
                     new T12CertificateRequestMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming CertificateRequest handshake message", crm);
             }
@@ -784,7 +784,7 @@ final class CertificateRequest {
                 T12CertificateRequestMessage crm) {
             if (hc.peerRequestedCertSignSchemes == null ||
                     hc.peerRequestedCertSignSchemes.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No signature and hash algorithms " +
                             "in CertificateRequest");
                 }
@@ -823,7 +823,7 @@ final class CertificateRequest {
             SSLPossession pos = X509Authentication
                     .createPossession(hc, supportedKeyTypes);
             if (pos == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No available authentication scheme");
                 }
             }
@@ -933,7 +933,7 @@ final class CertificateRequest {
             SSLExtension[] extTypes = shc.sslConfig.getEnabledExtensions(
                     SSLHandshake.CERTIFICATE_REQUEST, shc.negotiatedProtocol);
             crm.extensions.produce(shc, extTypes);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced CertificateRequest message", crm);
             }
 
@@ -985,7 +985,7 @@ final class CertificateRequest {
 
             T13CertificateRequestMessage crm =
                     new T13CertificateRequestMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming CertificateRequest handshake message", crm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
index 11b2c5e587d..a1048e423d1 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
@@ -281,7 +281,7 @@ final class CertificateStatus {
                     new CertificateStatusMessage(chc, message);
 
             // Log the message
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming server CertificateStatus handshake message",
                         cst);
@@ -325,7 +325,7 @@ final class CertificateStatus {
 
             // Create the CertificateStatus message from info in the
             CertificateStatusMessage csm = new CertificateStatusMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced server CertificateStatus handshake message", csm);
             }
@@ -358,7 +358,7 @@ final class CertificateStatus {
                 // status_request[_v2] extension.  2) The CertificateStatus
                 // message was not sent.  This means that cert path checking
                 // was deferred, but must happen immediately.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Server did not send CertificateStatus, " +
                             "checking cert chain without status info.");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java b/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
index 09d07d8e62d..18ea2b9c3de 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
@@ -248,7 +248,7 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -258,7 +258,7 @@ final class CertificateVerify {
 
             S30CertificateVerifyMessage cvm =
                     new S30CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced CertificateVerify handshake message", cvm);
             }
@@ -300,7 +300,7 @@ final class CertificateVerify {
 
             S30CertificateVerifyMessage cvm =
                     new S30CertificateVerifyMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming CertificateVerify handshake message", cvm);
             }
@@ -503,7 +503,7 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -513,7 +513,7 @@ final class CertificateVerify {
 
             T10CertificateVerifyMessage cvm =
                     new T10CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced CertificateVerify handshake message", cvm);
             }
@@ -555,7 +555,7 @@ final class CertificateVerify {
 
             T10CertificateVerifyMessage cvm =
                     new T10CertificateVerifyMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming CertificateVerify handshake message", cvm);
             }
@@ -754,7 +754,7 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -764,7 +764,7 @@ final class CertificateVerify {
 
             T12CertificateVerifyMessage cvm =
                     new T12CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced CertificateVerify handshake message", cvm);
             }
@@ -806,7 +806,7 @@ final class CertificateVerify {
 
             T12CertificateVerifyMessage cvm =
                     new T12CertificateVerifyMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming CertificateVerify handshake message", cvm);
             }
@@ -1092,7 +1092,7 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -1113,7 +1113,7 @@ final class CertificateVerify {
                 X509Possession x509Possession) throws IOException {
             T13CertificateVerifyMessage cvm =
                     new T13CertificateVerifyMessage(shc, x509Possession);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced server CertificateVerify handshake message", cvm);
             }
@@ -1130,7 +1130,7 @@ final class CertificateVerify {
                 X509Possession x509Possession) throws IOException {
             T13CertificateVerifyMessage cvm =
                     new T13CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced client CertificateVerify handshake message", cvm);
             }
@@ -1173,7 +1173,7 @@ final class CertificateVerify {
 
             T13CertificateVerifyMessage cvm =
                     new T13CertificateVerifyMessage(hc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming CertificateVerify handshake message", cvm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java b/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
index 4ea61161c1d..d3eac8f13af 100644
--- a/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
+++ b/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
@@ -108,7 +108,7 @@ final class ChangeCipherSpec {
                     ") and protocol version (" + hc.negotiatedProtocol + ")");
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced ChangeCipherSpec message");
             }
 
@@ -142,7 +142,7 @@ final class ChangeCipherSpec {
                 throw tc.fatal(Alert.UNEXPECTED_MESSAGE,
                         "Malformed or unexpected ChangeCipherSpec message");
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Consuming ChangeCipherSpec message");
             }
 
@@ -237,7 +237,7 @@ final class ChangeCipherSpec {
                 throw tc.fatal(Alert.UNEXPECTED_MESSAGE,
                         "Malformed or unexpected ChangeCipherSpec message");
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Consuming ChangeCipherSpec message");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ClientHello.java b/src/java.base/share/classes/sun/security/ssl/ClientHello.java
index c9432ea3979..421673d625d 100644
--- a/src/java.base/share/classes/sun/security/ssl/ClientHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ClientHello.java
@@ -430,7 +430,7 @@ final class ClientHello {
 
                 if (!session.isRejoinable()) {
                     session = null;
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "Can't resume, the session is not rejoinable");
@@ -443,7 +443,7 @@ final class ClientHello {
                 sessionSuite = session.getSuite();
                 if (!chc.isNegotiable(sessionSuite)) {
                     session = null;
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "Can't resume, unavailable session cipher suite");
@@ -456,7 +456,7 @@ final class ClientHello {
                 sessionVersion = session.getProtocolVersion();
                 if (!chc.isNegotiable(sessionVersion)) {
                     session = null;
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "Can't resume, unavailable protocol version");
@@ -513,7 +513,7 @@ final class ClientHello {
                 String sessionIdentityAlg =
                     session.getIdentificationProtocol();
                 if (!identityAlg.equalsIgnoreCase(sessionIdentityAlg)) {
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                     SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest("Can't resume, endpoint id" +
                             " algorithm does not match, requested: " +
@@ -524,7 +524,7 @@ final class ClientHello {
             }
 
             if (session != null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake,verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest("Try resuming session", session);
                 }
 
@@ -547,7 +547,7 @@ final class ClientHello {
                         cipherSuites = List.of(sessionSuite);
                     }
 
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "No new session is allowed, so try to resume " +
@@ -634,7 +634,7 @@ final class ClientHello {
                     SSLHandshake.CLIENT_HELLO, chc.activeProtocols);
             chm.extensions.produce(chc, extTypes);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced ClientHello handshake message", chm);
             }
 
@@ -700,7 +700,7 @@ final class ClientHello {
                     //
                     // The HelloVerifyRequest consumer should have updated the
                     // ClientHello handshake message with cookie.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "Produced ClientHello(cookie) handshake message",
                             chc.initialClientHelloMsg);
@@ -734,7 +734,7 @@ final class ClientHello {
                     // TLS 1.3
                     // The HelloRetryRequest consumer should have updated the
                     // ClientHello handshake message with cookie.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "Produced ClientHello(HRR) handshake message",
                             chc.initialClientHelloMsg);
@@ -790,7 +790,7 @@ final class ClientHello {
 
             ClientHelloMessage chm =
                     new ClientHelloMessage(shc, message, enabledExtensions);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Consuming ClientHello handshake message", chm);
             }
 
@@ -820,7 +820,7 @@ final class ClientHello {
                         negotiateProtocol(context, clientHello.clientVersion);
             }
             context.negotiatedProtocol = negotiatedProtocol;
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Negotiated protocol version: " + negotiatedProtocol.name);
             }
@@ -980,7 +980,7 @@ final class ClientHello {
                 boolean resumingSession =
                         (previous != null) && previous.isRejoinable();
                 if (!resumingSession) {
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                                 "Can't resume, " +
@@ -993,7 +993,7 @@ final class ClientHello {
                             previous.getProtocolVersion();
                     if (sessionProtocol != shc.negotiatedProtocol) {
                         resumingSession = false;
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest(
                                 "Can't resume, not the same protocol version");
@@ -1008,7 +1008,7 @@ final class ClientHello {
                         previous.getPeerPrincipal();
                     } catch (SSLPeerUnverifiedException e) {
                         resumingSession = false;
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest(
                                 "Can't resume, " +
@@ -1023,7 +1023,7 @@ final class ClientHello {
                     if ((!shc.isNegotiable(suite)) ||
                             (!clientHello.cipherSuites.contains(suite))) {
                         resumingSession = false;
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest(
                                 "Can't resume, " +
@@ -1039,7 +1039,7 @@ final class ClientHello {
                     String sessionIdentityAlg =
                         previous.getIdentificationProtocol();
                     if (!identityAlg.equalsIgnoreCase(sessionIdentityAlg)) {
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest("Can't resume, endpoint id" +
                             " algorithm does not match, requested: " +
@@ -1054,7 +1054,7 @@ final class ClientHello {
                 shc.isResumption = resumingSession;
                 shc.resumingSession = resumingSession ? previous : null;
 
-                if (!resumingSession && SSLLogger.isOn &&
+                if (!resumingSession && SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Session not resumed.");
                 }
@@ -1321,7 +1321,7 @@ final class ClientHello {
                 boolean resumingSession =
                         (previous != null) && previous.isRejoinable();
                 if (!resumingSession) {
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "Can't resume, " +
@@ -1334,7 +1334,7 @@ final class ClientHello {
                             previous.getProtocolVersion();
                     if (sessionProtocol != shc.negotiatedProtocol) {
                         resumingSession = false;
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest(
                                 "Can't resume, not the same protocol version");
@@ -1350,7 +1350,7 @@ final class ClientHello {
                         previous.getPeerPrincipal();
                     } catch (SSLPeerUnverifiedException e) {
                         resumingSession = false;
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest(
                                 "Can't resume, " +
@@ -1365,7 +1365,7 @@ final class ClientHello {
                     if ((!shc.isNegotiable(suite)) ||
                             (!clientHello.cipherSuites.contains(suite))) {
                         resumingSession = false;
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake,verbose")) {
                             SSLLogger.finest(
                                 "Can't resume, " +
diff --git a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
index d54a1a3e63d..2c22dd121ba 100644
--- a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
@@ -117,7 +117,7 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_COOKIE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -154,7 +154,7 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_COOKIE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -218,7 +218,7 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.HRR_COOKIE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -253,7 +253,7 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.HRR_COOKIE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -280,7 +280,7 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.HRR_COOKIE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
index fb5d6feef55..53f9896a3e4 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
@@ -187,7 +187,7 @@ final class DHClientKeyExchange {
             chc.handshakePossessions.add(dhePossession);
             DHClientKeyExchangeMessage ckem =
                     new DHClientKeyExchangeMessage(chc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced DH ClientKeyExchange handshake message", ckem);
             }
@@ -268,7 +268,7 @@ final class DHClientKeyExchange {
 
             DHClientKeyExchangeMessage ckem =
                     new DHClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming DH ClientKeyExchange handshake message", ckem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
index 2df62d50fb8..744ff59f402 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
@@ -481,7 +481,7 @@ final class DHServerKeyExchange {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
             DHServerKeyExchangeMessage skem =
                     new DHServerKeyExchangeMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced DH ServerKeyExchange handshake message", skem);
             }
@@ -512,7 +512,7 @@ final class DHServerKeyExchange {
 
             DHServerKeyExchangeMessage skem =
                     new DHServerKeyExchangeMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming DH ServerKeyExchange handshake message", skem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
index 4e82fd25a7b..e880f36e846 100644
--- a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
@@ -125,7 +125,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             return null;
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
             SSLLogger.fine("Raw read", packet);
         }
 
@@ -150,7 +150,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         int contentLen = ((packet.get() & 0xFF) << 8) |
                           (packet.get() & 0xFF);           // pos: 11, 12
 
-        if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
             SSLLogger.fine("READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
                     " " + ContentType.nameOf(contentType) + ", length = " +
@@ -162,7 +162,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         if (this.readEpoch > recordEpoch) {
             // Reset the position of the packet buffer.
             packet.position(recLim);
-            if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                 SSLLogger.fine("READ: discard this old record", recordEnS);
             }
             return null;
@@ -181,7 +181,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 packet.position(recLim);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("Premature record (epoch), discard it.");
                 }
 
@@ -223,7 +223,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             plaintextFragment = plaintext.fragment;
             contentType = plaintext.contentType;
         } catch (GeneralSecurityException gse) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("Discard invalid record: " + gse);
             }
 
@@ -241,7 +241,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             // Cleanup the handshake reassembler if necessary.
             if ((reassembler != null) &&
                     (reassembler.handshakeEpoch < recordEpoch)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("Cleanup the handshake reassembler");
                 }
 
@@ -273,7 +273,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 if (hsFrag == null) {
                     // invalid, discard this record
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                                 "Invalid handshake message, discard it.");
                     }
@@ -296,7 +296,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             return pt == null ? null : new Plaintext[] { pt };
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
              SSLLogger.fine("The reassembler is not initialized yet.");
         }
 
@@ -356,7 +356,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
         int remaining = plaintextFragment.remaining();
         if (remaining < handshakeHeaderSize) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("Discard invalid record: " +
                         "too small record to hold a handshake fragment");
             }
@@ -368,7 +368,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         // Fail fast for unknown handshake message.
         byte handshakeType = plaintextFragment.get();       // pos: 0
         if (!SSLHandshake.isKnown(handshakeType)) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("Discard invalid record: " +
                         "unknown handshake type size, Handshake.msg_type = " +
                         (handshakeType & 0xFF));
@@ -404,7 +404,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 ((plaintextFragment.get() & 0xFF) << 8) |
                  (plaintextFragment.get() & 0xFF);          // pos: 9-11
         if ((remaining - handshakeHeaderSize) < fragmentLength) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("Discard invalid record: " +
                         "not a complete handshake fragment in the record");
             }
@@ -748,7 +748,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // It's OK to discard retransmission as the handshake hash
                 // is computed as if each handshake message had been sent
                 // as a single fragment.
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("Have got the full message, discard it.");
                 }
 
@@ -769,7 +769,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     // The ranges SHOULD NOT overlap.
                     if (hole.offset > hsf.fragmentOffset || hole.limit < fragmentLimit) {
 
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                             SSLLogger.fine("Discard invalid record: " +
                                 "handshake fragment ranges are overlapping");
                         }
@@ -837,7 +837,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 }
                 // Read the random (32 bytes)
                 if (fragmentData.remaining() < 32) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine("Rejected client hello fragment (bad random len) " +
                                 "fo=" + hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
                     }
@@ -861,7 +861,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // Cookie
                 byte[] cookie = Record.getBytes8(fragmentData);
                 if (firstHello && cookie.length != 0) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine("Rejected initial client hello fragment (bad cookie len) " +
                                 "fo=" + hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
                     }
@@ -897,7 +897,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     }
                 }
             } catch (IOException ioe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("Rejected client hello fragment " +
                             "fo=" + hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
                 }
@@ -1029,7 +1029,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             int previousEpoch = nextRecordEpoch - 1;
             if (rf.recordEpoch < previousEpoch) {
                 // Too old to use, discard this record.
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "Too old epoch to use this record, discard it.");
                 }
@@ -1075,7 +1075,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 if (!isDesired) {
                     // Too old to use, discard this retransmitted record
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                                 "Too old retransmission to use, discard it.");
                     }
@@ -1088,7 +1088,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // Previously disordered record for the current epoch.
                 //
                 // Should have been retransmitted. Discard this record.
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "Lagging behind record (sequence), discard it.");
                 }
@@ -1126,7 +1126,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
         Plaintext acquirePlaintext() throws SSLProtocolException {
             if (bufferedFragments.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("No received handshake messages");
                 }
                 return null;
@@ -1147,7 +1147,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                         // Reset the next handshake flight.
                         resetHandshakeFlight(precedingFlight);
 
-                        if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                             SSLLogger.fine("Received a retransmission flight.");
                         }
 
@@ -1159,7 +1159,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             }
 
             if (!flightIsReady) {
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "The handshake flight is not ready to use: " +
                             handshakeFlight.handshakeType);
@@ -1244,7 +1244,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             if (readEpoch != rFrag.recordEpoch) {
                 if (readEpoch > rFrag.recordEpoch) {
                     // discard old records
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                                 "Discard old buffered ciphertext fragments.");
                     }
@@ -1256,7 +1256,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     flightIsReady = false;
                 }
 
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "Not yet ready to decrypt the cached fragments.");
                 }
@@ -1273,7 +1273,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 plaintextFragment = plaintext.fragment;
                 rFrag.contentType = plaintext.contentType;
             } catch (GeneralSecurityException gse) {
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("Discard invalid record: ", gse);
                 }
 
@@ -1295,7 +1295,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                     if (hsFrag == null) {
                         // invalid, discard this record
-                        if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                             SSLLogger.fine(
                                     "Invalid handshake fragment, discard it",
                                     plaintextFragment);
@@ -1446,7 +1446,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 if (expectCCSFlight) {
                     // Have the ChangeCipherSpec/Finished flight been received?
                     boolean isReady = hasFinishedMessage();
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                             "Has the final flight been received? " + isReady);
                     }
@@ -1454,7 +1454,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     return isReady;
                 }
 
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine("No flight is received yet.");
                 }
 
@@ -1467,7 +1467,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 // single handshake message flight
                 boolean isReady = hasCompleted(flightType);
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "Is the handshake message completed? " + isReady);
                 }
@@ -1481,7 +1481,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             if (flightType == SSLHandshake.SERVER_HELLO.id) {
                 // Firstly, check the first flight handshake message.
                 if (!hasCompleted(flightType)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                             "The ServerHello message is not completed yet.");
                     }
@@ -1493,7 +1493,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // an abbreviated handshake
                 //
                 if (hasFinishedMessage()) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine("It's an abbreviated handshake.");
                     }
 
@@ -1507,7 +1507,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                         SSLHandshake.SERVER_HELLO_DONE.id);
                 if ((holes == null) || !holes.isEmpty()) {
                     // Not yet got the final message of the flight.
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                                 "Not yet got the ServerHelloDone message");
                     }
@@ -1519,7 +1519,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 boolean isReady = hasCompleted(bufferedFragments,
                             handshakeFlight.minMessageSeq,
                             handshakeFlight.maxMessageSeq);
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "Is the ServerHello flight (message " +
                             handshakeFlight.minMessageSeq + "-" +
@@ -1542,7 +1542,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 // Firstly, check the first flight handshake message.
                 if (!hasCompleted(flightType)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                             "The ClientKeyExchange or client Certificate " +
                             "message is not completed yet.");
@@ -1556,7 +1556,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     if (needClientVerify(bufferedFragments) &&
                         !hasCompleted(SSLHandshake.CERTIFICATE_VERIFY.id)) {
 
-                        if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                             SSLLogger.fine(
                                 "Not yet have the CertificateVerify message");
                         }
@@ -1567,7 +1567,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 if (!hasFinishedMessage()) {
                     // not yet have the ChangeCipherSpec/Finished messages
-                    if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                         SSLLogger.fine(
                             "Not yet have the ChangeCipherSpec and " +
                             "Finished messages");
@@ -1580,7 +1580,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 boolean isReady = hasCompleted(bufferedFragments,
                             handshakeFlight.minMessageSeq,
                             handshakeFlight.maxMessageSeq);
-                if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                             "Is the ClientKeyExchange flight (message " +
                             handshakeFlight.minMessageSeq + "-" +
@@ -1594,7 +1594,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             //
             // Otherwise, need to receive more handshake messages.
             //
-            if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                 SSLLogger.fine("Need to receive more handshake messages");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
index 691ac32c26b..162dbb58eec 100644
--- a/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
@@ -92,7 +92,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     void changeWriteCiphers(SSLWriteCipher writeCipher,
             boolean useChangeCipherSpec) {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "change_cipher_spec message");
             }
@@ -120,7 +120,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     @Override
     void encodeAlert(byte level, byte description) {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "alert message: " + Alert.nameOf(description));
             }
@@ -137,7 +137,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     @Override
     void encodeChangeCipherSpec() {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "change_cipher_spec message");
             }
@@ -154,7 +154,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     void encodeHandshake(byte[] source,
             int offset, int length) {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                         "handshake message",
                         ByteBuffer.wrap(source, offset, length));
@@ -179,14 +179,14 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
         ByteBuffer[] dsts, int dstsOffset, int dstsLength) throws IOException {
 
         if (isClosed) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data or cached messages");
             }
 
             return null;
         } else if (isCloseWaiting) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data");
             }
@@ -201,7 +201,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
             ByteBuffer destination) throws IOException {
 
         if (writeCipher.authenticator.seqNumOverflow()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine(
                     "sequence number extremely close to overflow " +
                     "(2^64-1 packets). Closing connection.");
@@ -269,7 +269,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
         destination.limit(destination.position());
         destination.position(dstContent);
 
-        if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
             SSLLogger.fine(
                     "WRITE: " + protocolVersion.name + " " +
                     ContentType.APPLICATION_DATA.name +
@@ -282,7 +282,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
                 dstPos, dstLim, headerSize,
                 protocolVersion);
 
-        if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
             ByteBuffer temporary = destination.duplicate();
             temporary.limit(temporary.position());
             temporary.position(dstPos);
@@ -497,7 +497,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
             dstBuf.limit(dstBuf.position());
             dstBuf.position(dstContent);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name + " " +
                         ContentType.nameOf(memo.contentType) +
@@ -511,7 +511,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
                     ProtocolVersion.valueOf(memo.majorVersion,
                             memo.minorVersion));
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 ByteBuffer temporary = dstBuf.duplicate();
                 temporary.limit(temporary.position());
                 temporary.position(dstPos);
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
index e1c1b1377ad..a626f6f34d0 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
@@ -199,7 +199,7 @@ final class ECDHClientKeyExchange {
             ECDHClientKeyExchangeMessage cke =
                     new ECDHClientKeyExchangeMessage(
                             chc, sslPossession.encode());
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced ECDH ClientKeyExchange handshake message", cke);
             }
@@ -308,7 +308,7 @@ final class ECDHClientKeyExchange {
             // parse either handshake message containing either EC/XEC.
             ECDHClientKeyExchangeMessage cke =
                     new ECDHClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming ECDH ClientKeyExchange handshake message", cke);
             }
@@ -397,7 +397,7 @@ final class ECDHClientKeyExchange {
                     new ECDHClientKeyExchangeMessage(
                             chc, sslPossession.encode());
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced ECDHE ClientKeyExchange handshake message", cke);
             }
@@ -490,7 +490,7 @@ final class ECDHClientKeyExchange {
             // parse the EC/XEC handshake message
             ECDHClientKeyExchangeMessage cke =
                     new ECDHClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming ECDHE ClientKeyExchange handshake message", cke);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
index b31c0ba9cb9..a02a8438163 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
@@ -489,7 +489,7 @@ final class ECDHServerKeyExchange {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
             ECDHServerKeyExchangeMessage skem =
                     new ECDHServerKeyExchangeMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced ECDH ServerKeyExchange handshake message", skem);
             }
@@ -522,7 +522,7 @@ final class ECDHServerKeyExchange {
             // AlgorithmConstraints are checked during decoding
             ECDHServerKeyExchangeMessage skem =
                     new ECDHServerKeyExchangeMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming ECDH ServerKeyExchange handshake message", skem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
index 580e1d416de..72b7c950374 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
@@ -171,7 +171,7 @@ final class ECPointFormatsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_EC_POINT_FORMATS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable ec_point_formats extension");
                 }
@@ -193,7 +193,7 @@ final class ECPointFormatsExtension {
                 return extData;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Need no ec_point_formats extension");
             }
@@ -221,7 +221,7 @@ final class ECPointFormatsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_EC_POINT_FORMATS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable ec_point_formats extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java b/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
index d1975b5caa4..b5be927f0aa 100644
--- a/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
@@ -134,7 +134,7 @@ final class EncryptedExtensions {
                             SSLHandshake.ENCRYPTED_EXTENSIONS,
                             shc.negotiatedProtocol);
             eem.extensions.produce(shc, extTypes);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced EncryptedExtensions message", eem);
             }
 
@@ -168,7 +168,7 @@ final class EncryptedExtensions {
 
             EncryptedExtensionsMessage eem =
                     new EncryptedExtensionsMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming EncryptedExtensions handshake message", eem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
index ff4694c8c7c..6bacbfbd1d8 100644
--- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
@@ -119,7 +119,7 @@ final class ExtendedMasterSecretExtension {
             if (!chc.sslConfig.isAvailable(CH_EXTENDED_MASTER_SECRET) ||
                     !SSLConfiguration.useExtendedMasterSecret ||
                     !chc.conContext.protocolVersion.useTLS10PlusSpec()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extended_master_secret extension");
                 }
@@ -162,7 +162,7 @@ final class ExtendedMasterSecretExtension {
             if (!shc.sslConfig.isAvailable(CH_EXTENDED_MASTER_SECRET) ||
                     !SSLConfiguration.useExtendedMasterSecret ||
                     !shc.negotiatedProtocol.useTLS10PlusSpec()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                             CH_EXTENDED_MASTER_SECRET.name);
                 }
@@ -182,7 +182,7 @@ final class ExtendedMasterSecretExtension {
                 // with a full handshake.
                 shc.isResumption = false;
                 shc.resumingSession = null;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "abort session resumption which did not use " +
                         "Extended Master Secret extension");
@@ -213,7 +213,7 @@ final class ExtendedMasterSecretExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_EXTENDED_MASTER_SECRET) ||
                     !SSLConfiguration.useExtendedMasterSecret) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                             CH_EXTENDED_MASTER_SECRET.name);
                 }
@@ -252,7 +252,7 @@ final class ExtendedMasterSecretExtension {
                     } else {  // Otherwise, continue with a full handshake.
                         shc.isResumption = false;
                         shc.resumingSession = null;
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.fine(
                                 "abort session resumption, " +
                                 "missing Extended Master Secret extension");
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 04fe61760d0..4238ced8f01 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -390,7 +390,7 @@ final class Finished {
             // Change write cipher and delivery ChangeCipherSpec message.
             ChangeCipherSpec.t10Producer.produce(chc, message);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced client Finished handshake message", fm);
             }
@@ -453,7 +453,7 @@ final class Finished {
             // Change write cipher and delivery ChangeCipherSpec message.
             ChangeCipherSpec.t10Producer.produce(shc, message);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced server Finished handshake message", fm);
             }
@@ -542,7 +542,7 @@ final class Finished {
         private void onConsumeFinished(ClientHandshakeContext chc,
                 ByteBuffer message) throws IOException {
             FinishedMessage fm = new FinishedMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming server Finished handshake message", fm);
             }
@@ -602,7 +602,7 @@ final class Finished {
             }
 
             FinishedMessage fm = new FinishedMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming client Finished handshake message", fm);
             }
@@ -681,7 +681,7 @@ final class Finished {
             chc.handshakeHash.update();
 
             FinishedMessage fm = new FinishedMessage(chc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced client Finished handshake message", fm);
             }
@@ -778,7 +778,7 @@ final class Finished {
             shc.handshakeHash.update();
 
             FinishedMessage fm = new FinishedMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced server Finished handshake message", fm);
             }
@@ -930,7 +930,7 @@ final class Finished {
             }
 
             FinishedMessage fm = new FinishedMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming server Finished handshake message", fm);
             }
@@ -1073,7 +1073,7 @@ final class Finished {
             }
 
             FinishedMessage fm = new FinishedMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming client Finished handshake message", fm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
index 8455ddfc65d..a5f340d5203 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
@@ -284,14 +284,14 @@ abstract class HandshakeContext implements ConnectionContext {
                         found = true;
                         break;
                     }
-                } else if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                } else if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.fine(
                         "Ignore unsupported cipher suite: " + suite +
                              " for " + protocol.name);
                 }
             }
 
-            if (!found && (SSLLogger.isOn) && SSLLogger.isOn("handshake")) {
+            if (!found && (SSLLogger.isOn()) && SSLLogger.isOn("handshake")) {
                 SSLLogger.fine(
                     "No available cipher suite for " + protocol.name);
             }
@@ -335,7 +335,7 @@ abstract class HandshakeContext implements ConnectionContext {
                 }
 
                 if (!isSupported &&
-                        SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                        SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                     SSLLogger.finest(
                             "Ignore unsupported cipher suite: " + suite);
                 }
@@ -556,7 +556,7 @@ abstract class HandshakeContext implements ConnectionContext {
                         cachedStatus.put(groupType, groupAvailable);
 
                         if (!groupAvailable &&
-                                SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+                                SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                             SSLLogger.fine(
                                     "No activated named group in " + groupType);
                         }
@@ -570,13 +570,13 @@ abstract class HandshakeContext implements ConnectionContext {
                 }
             }
 
-            if (!retval && SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+            if (!retval && SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
                 SSLLogger.fine("No active named group(s), ignore " + suite);
             }
 
             return retval;
 
-        } else if (SSLLogger.isOn && SSLLogger.isOn("verbose")) {
+        } else if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
             SSLLogger.fine("Ignore disabled cipher suite: " + suite);
         }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
index 61936442502..2a05881180d 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
@@ -61,7 +61,7 @@ public class HandshakeOutStream extends ByteArrayOutputStream {
             if (!outputRecord.isClosed()) {
                 outputRecord.encodeHandshake(buf, 0, count);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "handshake messages", ByteBuffer.wrap(buf, 0, count));
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloRequest.java b/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
index f4da66b5dd3..39464992db5 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
@@ -101,7 +101,7 @@ final class HelloRequest {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             HelloRequestMessage hrm = new HelloRequestMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced HelloRequest handshake message", hrm);
             }
 
@@ -137,7 +137,7 @@ final class HelloRequest {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             HelloRequestMessage hrm = new HelloRequestMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced HelloRequest handshake message", hrm);
             }
 
@@ -177,7 +177,7 @@ final class HelloRequest {
             // be sent by the server at any time.  Please don't clean up this
             // handshake consumer.
             HelloRequestMessage hrm = new HelloRequestMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming HelloRequest handshake message", hrm);
             }
@@ -190,7 +190,7 @@ final class HelloRequest {
                 }
 
                 if (!chc.conContext.secureRenegotiation) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                                 "Continue with insecure renegotiation");
                     }
@@ -206,7 +206,7 @@ final class HelloRequest {
                 //
                 SSLHandshake.CLIENT_HELLO.produce(context, hrm);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore HelloRequest, handshaking is in progress");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java b/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
index f28ae16de88..8d3f1048c91 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
@@ -140,7 +140,7 @@ final class HelloVerifyRequest {
 
             HelloVerifyRequestMessage hvrm =
                     new HelloVerifyRequestMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced HelloVerifyRequest handshake message", hvrm);
             }
@@ -197,7 +197,7 @@ final class HelloVerifyRequest {
 
             HelloVerifyRequestMessage hvrm =
                     new HelloVerifyRequestMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming HelloVerifyRequest handshake message", hvrm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
index 98e4693e917..8d785f7515a 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
@@ -90,7 +90,7 @@ final class KeyShareExtension {
                 Record.putInt16(m, namedGroupId);
                 Record.putBytes16(m, keyExchange);
             } catch (IOException ioe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "Unlikely IOException", ioe);
                 }
@@ -222,7 +222,7 @@ final class KeyShareExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_KEY_SHARE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable key_share extension");
                 }
@@ -237,7 +237,7 @@ final class KeyShareExtension {
                 namedGroups = chc.clientRequestedNamedGroups;
                 if (namedGroups == null || namedGroups.isEmpty()) {
                     // No supported groups.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                             "Ignore key_share extension, no supported groups");
                     }
@@ -287,7 +287,7 @@ final class KeyShareExtension {
                 NamedGroup ng) {
             SSLKeyExchange ke = SSLKeyExchange.valueOf(ng);
             if (ke == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "No key exchange for named group " + ng.name);
                 }
@@ -323,7 +323,7 @@ final class KeyShareExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (shc.handshakeExtensions.containsKey(SSLExtension.CH_KEY_SHARE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "The key_share extension has been loaded");
                 }
@@ -332,7 +332,7 @@ final class KeyShareExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_KEY_SHARE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable key_share extension");
                 }
@@ -346,7 +346,7 @@ final class KeyShareExtension {
                 NamedGroup ng = NamedGroup.valueOf(entry.namedGroupId);
                 if (ng == null || !NamedGroup.isActivatable(shc.sslConfig,
                         shc.algorithmConstraints, ng)) {
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "Ignore unsupported named group: " +
@@ -364,7 +364,7 @@ final class KeyShareExtension {
                         if (!shc.algorithmConstraints.permits(
                                 EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
                                 namedGroupCredentials.getPublicKey())) {
-                            if (SSLLogger.isOn &&
+                            if (SSLLogger.isOn() &&
                                     SSLLogger.isOn("ssl,handshake")) {
                                 SSLLogger.warning(
                                     "key share entry of " + ng + " does not " +
@@ -379,7 +379,7 @@ final class KeyShareExtension {
                         credentials.add(kaCred);
                     }
                 } catch (GeneralSecurityException ex) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                                 "Cannot decode named group: " +
                                 NamedGroup.nameOf(entry.namedGroupId));
@@ -522,7 +522,7 @@ final class KeyShareExtension {
                             SSLExtension.CH_KEY_SHARE);
             if (kss == null) {
                 // Unlikely, no key_share extension requested.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Ignore, no client key_share extension");
                 }
@@ -531,7 +531,7 @@ final class KeyShareExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.SH_KEY_SHARE)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Ignore, no available server key_share extension");
                 }
@@ -542,7 +542,7 @@ final class KeyShareExtension {
             if ((shc.handshakeCredentials == null) ||
                     shc.handshakeCredentials.isEmpty()) {
                 // Unlikely, HelloRetryRequest should be used earlier.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "No available client key share entries");
                 }
@@ -562,7 +562,7 @@ final class KeyShareExtension {
 
                 SSLKeyExchange ke = SSLKeyExchange.valueOf(ng);
                 if (ke == null) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                             "No key exchange for named group " + ng.name);
                     }
@@ -597,7 +597,7 @@ final class KeyShareExtension {
 
             if (keyShare == null) {
                 // Unlikely, HelloRetryRequest should be used instead earlier.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "No available server key_share extension");
                 }
@@ -708,7 +708,7 @@ final class KeyShareExtension {
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
 
             // Cannot use the previous requested key shares anymore.
-            if (SSLLogger.isOn && SSLLogger.isOn("handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
                 SSLLogger.fine(
                         "No key_share extension in ServerHello, " +
                         "cleanup the key shares if necessary");
@@ -801,7 +801,7 @@ final class KeyShareExtension {
             for (NamedGroup ng : shc.clientRequestedNamedGroups) {
                 if (NamedGroup.isActivatable(shc.sslConfig,
                         shc.algorithmConstraints, ng)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "HelloRetryRequest selected named group: " +
                                 ng.name);
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java b/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
index 2b17c7406a3..4e5a9683079 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
@@ -191,7 +191,7 @@ final class KeyUpdate {
             // The consuming happens in client side only.
             PostHandshakeContext hc = (PostHandshakeContext)context;
             KeyUpdateMessage km = new KeyUpdateMessage(hc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming KeyUpdate post-handshake message", km);
             }
@@ -235,7 +235,7 @@ final class KeyUpdate {
 
                 rc.baseSecret = nplus1;
                 hc.conContext.inputRecord.changeReadCiphers(rc);
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("KeyUpdate: read key updated");
                 }
             } catch (GeneralSecurityException gse) {
@@ -276,7 +276,7 @@ final class KeyUpdate {
                 return null;
             }
             KeyUpdateMessage km = (KeyUpdateMessage)message;
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced KeyUpdate post-handshake message", km);
             }
@@ -328,7 +328,7 @@ final class KeyUpdate {
             // changeWriteCiphers() implementation.
             wc.baseSecret = nplus1;
             hc.conContext.outputRecord.changeWriteCiphers(wc, km.status.id);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("KeyUpdate: write key updated");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
index a07e81be914..25500c7ac57 100644
--- a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
@@ -176,7 +176,7 @@ final class MaxFragExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_MAX_FRAGMENT_LENGTH)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -213,7 +213,7 @@ final class MaxFragExtension {
             } else {
                 // log and ignore, no MFL extension.
                 chc.maxFragmentLength = -1;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "No available max_fragment_length extension can " +
                         "be used for fragment size of " +
@@ -243,7 +243,7 @@ final class MaxFragExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (!shc.sslConfig.isAvailable(CH_MAX_FRAGMENT_LENGTH)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -288,7 +288,7 @@ final class MaxFragExtension {
             MaxFragLenSpec spec = (MaxFragLenSpec)
                     shc.handshakeExtensions.get(CH_MAX_FRAGMENT_LENGTH);
             if (spec == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -305,7 +305,7 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
@@ -413,7 +413,7 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
@@ -455,7 +455,7 @@ final class MaxFragExtension {
             MaxFragLenSpec spec = (MaxFragLenSpec)
                     shc.handshakeExtensions.get(CH_MAX_FRAGMENT_LENGTH);
             if (spec == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -472,7 +472,7 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
@@ -578,7 +578,7 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
index 46280a05355..0c708b194cb 100644
--- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
@@ -273,7 +273,7 @@ enum NamedGroup {
                     | NoSuchAlgorithmException exp) {
                 if (namedGroupSpec != NamedGroupSpec.NAMED_GROUP_XDH) {
                     mediator = false;
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                             "No AlgorithmParameters for " + name, exp);
                     }
@@ -294,7 +294,7 @@ enum NamedGroup {
                         // AlgorithmParameters.getInstance(name);
                     } catch (NoSuchAlgorithmException nsae) {
                         mediator = false;
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.warning(
                                 "No AlgorithmParameters for " + name, nsae);
                         }
@@ -382,7 +382,7 @@ enum NamedGroup {
         for (String ss : namedGroups) {
             NamedGroup ng = NamedGroup.nameOf(ss);
             if (ng == null || !ng.isAvailable) {
-                if (SSLLogger.isOn &&
+                if (SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest(
                             "Ignore the named group (" + ss
@@ -811,7 +811,7 @@ enum NamedGroup {
                 }
 
                 if (groupList.isEmpty() &&
-                        SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                        SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("No default named groups");
                 }
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
index 4c879e0dc4d..89b0a72bb32 100644
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
@@ -202,7 +202,7 @@ final class NewSessionTicket {
 
             this.ticket = Record.getBytes16(m);
             if (ticket.length == 0) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "No ticket in the NewSessionTicket handshake message");
                 }
@@ -329,7 +329,7 @@ final class NewSessionTicket {
             if (hc instanceof ServerHandshakeContext) {
                 // Is this session resumable?
                 if (!hc.handshakeSession.isRejoinable()) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("No session ticket produced: " +
                                 "session is not resumable");
                     }
@@ -347,7 +347,7 @@ final class NewSessionTicket {
                                 SSLExtension.PSK_KEY_EXCHANGE_MODES);
                 if (pkemSpec == null ||
                         !pkemSpec.contains(PskKeyExchangeMode.PSK_DHE_KE)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("No session ticket produced: " +
                                 "client does not support psk_dhe_ke");
                     }
@@ -358,7 +358,7 @@ final class NewSessionTicket {
                 // Check if we have sent a PSK already, then we know it is
                 // using an allowable PSK exchange key mode.
                 if (!hc.handshakeSession.isPSKable()) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("No session ticket produced: " +
                                 "No session ticket allowed in this session");
                     }
@@ -372,7 +372,7 @@ final class NewSessionTicket {
                 hc.sslContext.engineGetServerSessionContext();
             int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
             if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("No session ticket produced: " +
                             "session timeout is too long");
                 }
@@ -459,7 +459,7 @@ final class NewSessionTicket {
                 if (!nstm.isValid()) {
                     hc.statelessResumption = false;
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("Produced NewSessionTicket stateless " +
                             "post-handshake message", nstm);
                     }
@@ -474,7 +474,7 @@ final class NewSessionTicket {
                     sessionCache.getSessionTimeout(),
                     hc.sslContext.getSecureRandom(), nonce,
                     newId.getId());
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Produced NewSessionTicket " +
                         "post-handshake message", nstm);
                 }
@@ -488,7 +488,7 @@ final class NewSessionTicket {
                 return nstm;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("No NewSessionTicket created");
             }
 
@@ -526,7 +526,7 @@ final class NewSessionTicket {
                     shc.sslContext.engineGetServerSessionContext();
             int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
             if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Session timeout is too long. No ticket sent.");
                 }
@@ -540,7 +540,7 @@ final class NewSessionTicket {
             NewSessionTicketMessage nstm = new T12NewSessionTicketMessage(shc,
                     sessionTimeoutSeconds,
                     new SessionTicketSpec().encrypt(shc, sessionCopy));
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced NewSessionTicket stateless handshake message",
                     nstm);
@@ -579,7 +579,7 @@ final class NewSessionTicket {
             HandshakeContext hc = (HandshakeContext)context;
             NewSessionTicketMessage nstm =
                     new T13NewSessionTicketMessage(hc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming NewSessionTicket message", nstm);
             }
@@ -590,7 +590,7 @@ final class NewSessionTicket {
             // discard tickets with timeout 0
             if (nstm.ticketLifetime <= 0 ||
                 nstm.ticketLifetime > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Discarding NewSessionTicket with lifetime " +
                             nstm.ticketLifetime, nstm);
@@ -599,7 +599,7 @@ final class NewSessionTicket {
             }
 
             if (sessionCache.getSessionTimeout() > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Session cache lifetime is too long. " +
                         "Discarding ticket.");
@@ -611,7 +611,7 @@ final class NewSessionTicket {
             SecretKey resumptionMasterSecret =
                     sessionToSave.getResumptionMasterSecret();
             if (resumptionMasterSecret == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Session has no resumption master secret. " +
                             "Ignoring ticket.");
@@ -637,7 +637,7 @@ final class NewSessionTicket {
             sessionCopy.setPskIdentity(nstm.ticket);
             sessionCache.put(sessionCopy, sessionCopy.isPSK());
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("MultiNST PSK (Server): " +
                     Utilities.toHexString(Arrays.copyOf(nstm.ticket, 16)));
             }
@@ -665,7 +665,7 @@ final class NewSessionTicket {
             NewSessionTicketMessage nstm = new T12NewSessionTicketMessage(hc,
                     message);
             if (nstm.ticket.length == 0) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("NewSessionTicket ticket was empty");
                 }
                 return;
@@ -674,7 +674,7 @@ final class NewSessionTicket {
             // discard tickets with timeout 0
             if (nstm.ticketLifetime <= 0 ||
                 nstm.ticketLifetime > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Discarding NewSessionTicket with lifetime " +
                             nstm.ticketLifetime, nstm);
@@ -686,7 +686,7 @@ final class NewSessionTicket {
                     hc.sslContext.engineGetClientSessionContext();
 
             if (sessionCache.getSessionTimeout() > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Session cache lifetime is too long. " +
                         "Discarding ticket.");
@@ -695,7 +695,7 @@ final class NewSessionTicket {
             }
 
             hc.handshakeSession.setPskIdentity(nstm.ticket);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Consuming NewSessionTicket\n" + nstm);
             }
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
index f2c30b3ff72..416d5d1b5ef 100644
--- a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
@@ -188,7 +188,7 @@ abstract class OutputRecord
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "change_cipher_spec message");
                 }
@@ -222,7 +222,7 @@ abstract class OutputRecord
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "key_update handshake message");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
index 819fdd589cb..b99c0175838 100644
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
@@ -341,7 +341,7 @@ final class PreSharedKeyExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_PRE_SHARED_KEY)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable pre_shared_key extension");
                 }
@@ -393,7 +393,7 @@ final class PreSharedKeyExtension {
                             }
                         }
                         if (b == null || s == null) {
-                            if (SSLLogger.isOn &&
+                            if (SSLLogger.isOn() &&
                                     SSLLogger.isOn("ssl,handshake")) {
                                 SSLLogger.fine(
                                         "Stateless session ticket invalid");
@@ -402,7 +402,7 @@ final class PreSharedKeyExtension {
                     }
 
                     if (s != null && canRejoin(clientHello, shc, s)) {
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.fine("Resuming session: ", s);
                         }
 
@@ -435,7 +435,7 @@ final class PreSharedKeyExtension {
 
         // Check protocol version
         if (result && s.getProtocolVersion() != shc.negotiatedProtocol) {
-            if (SSLLogger.isOn &&
+            if (SSLLogger.isOn() &&
                 SSLLogger.isOn("ssl,handshake,verbose")) {
 
                 SSLLogger.finest("Can't resume, incorrect protocol version");
@@ -449,7 +449,7 @@ final class PreSharedKeyExtension {
             try {
                 s.getPeerPrincipal();
             } catch (SSLPeerUnverifiedException e) {
-                if (SSLLogger.isOn &&
+                if (SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest(
                         "Can't resume, " +
@@ -466,7 +466,7 @@ final class PreSharedKeyExtension {
             if (result &&
                 !shc.localSupportedCertSignAlgs.containsAll(sessionSigAlgs)) {
 
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Can't resume. Session uses different " +
                         "signature algorithms");
                 }
@@ -480,7 +480,7 @@ final class PreSharedKeyExtension {
         if (result && identityAlg != null) {
             String sessionIdentityAlg = s.getIdentificationProtocol();
             if (!identityAlg.equalsIgnoreCase(sessionIdentityAlg)) {
-                if (SSLLogger.isOn &&
+                if (SSLLogger.isOn() &&
                     SSLLogger.isOn("ssl,handshake,verbose")) {
 
                     SSLLogger.finest("Can't resume, endpoint id" +
@@ -494,7 +494,7 @@ final class PreSharedKeyExtension {
         // Ensure cipher suite can be negotiated
         if (result && (!shc.isNegotiable(s.getSuite()) ||
             !clientHello.cipherSuites.contains(s.getSuite()))) {
-            if (SSLLogger.isOn &&
+            if (SSLLogger.isOn() &&
                     SSLLogger.isOn("ssl,handshake,verbose")) {
                 SSLLogger.finest(
                     "Can't resume, unavailable session cipher suite");
@@ -653,7 +653,7 @@ final class PreSharedKeyExtension {
             // The producing happens in client side only.
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
             if (!chc.isResumption || chc.resumingSession == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("No session to resume.");
                 }
                 return null;
@@ -663,7 +663,7 @@ final class PreSharedKeyExtension {
             Collection<SignatureScheme> sessionSigAlgs =
                 chc.resumingSession.getLocalSupportedSignatureSchemes();
             if (!chc.localSupportedCertSignAlgs.containsAll(sessionSigAlgs)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Existing session uses different " +
                         "signature algorithms");
                 }
@@ -673,7 +673,7 @@ final class PreSharedKeyExtension {
             // The session must have a pre-shared key
             SecretKey psk = chc.resumingSession.getPreSharedKey();
             if (psk == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Existing session has no PSK.");
                 }
                 return null;
@@ -687,7 +687,7 @@ final class PreSharedKeyExtension {
             }
 
             if (chc.pskIdentity == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "PSK has no identity, or identity was already used");
                 }
@@ -699,7 +699,7 @@ final class PreSharedKeyExtension {
                 chc.sslContext.engineGetClientSessionContext();
             sessionCache.remove(chc.resumingSession.getSessionId(), true);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Found resumable session. Preparing PSK message.");
                 SSLLogger.fine(
@@ -836,7 +836,7 @@ final class PreSharedKeyExtension {
         public void absent(ConnectionContext context,
                            HandshakeMessage message) throws IOException {
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                 "Handling pre_shared_key absence.");
             }
@@ -901,7 +901,7 @@ final class PreSharedKeyExtension {
             }
 
             SHPreSharedKeySpec shPsk = new SHPreSharedKeySpec(chc, buffer);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Received pre_shared_key extension: ", shPsk);
             }
@@ -911,7 +911,7 @@ final class PreSharedKeyExtension {
                     "Selected identity index is not in correct range.");
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Resuming session: ", chc.resumingSession);
             }
@@ -925,7 +925,7 @@ final class PreSharedKeyExtension {
                 HandshakeMessage message) throws IOException {
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Handling pre_shared_key absence.");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
index e510fe92b0e..c826d9c89e3 100644
--- a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
+++ b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
@@ -246,7 +246,7 @@ final class PredefinedDHParameterSpecs {
             Matcher spacesMatcher = spacesPattern.matcher(property);
             property = spacesMatcher.replaceAll("");
 
-            if (SSLLogger.isOn && SSLLogger.isOn("sslctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("sslctx")) {
                 SSLLogger.fine(
                         "The Security Property " +
                         PROPERTY_NAME + ": " + property);
@@ -262,7 +262,7 @@ final class PredefinedDHParameterSpecs {
                     String primeModulus = paramsFinder.group(1);
                     BigInteger p = new BigInteger(primeModulus, 16);
                     if (!p.isProbablePrime(PRIME_CERTAINTY)) {
-                        if (SSLLogger.isOn && SSLLogger.isOn("sslctx")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("sslctx")) {
                             SSLLogger.fine(
                                 "Prime modulus p in Security Property, " +
                                 PROPERTY_NAME + ", is not a prime: " +
@@ -279,7 +279,7 @@ final class PredefinedDHParameterSpecs {
                     DHParameterSpec spec = new DHParameterSpec(p, g);
                     defaultParams.put(primeLen, spec);
                 }
-            } else if (SSLLogger.isOn && SSLLogger.isOn("sslctx")) {
+            } else if (SSLLogger.isOn() && SSLLogger.isOn("sslctx")) {
                 SSLLogger.fine("Invalid Security Property, " +
                         PROPERTY_NAME + ", definition");
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
index 07707c5163a..a4f343ccb06 100644
--- a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
@@ -184,7 +184,7 @@ final class PskKeyExchangeModesExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.PSK_KEY_EXCHANGE_MODES)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable psk_key_exchange_modes extension");
                 }
@@ -216,7 +216,7 @@ final class PskKeyExchangeModesExtension {
                 if (!spec.contains(PskKeyExchangeMode.PSK_DHE_KE)) {
                     shc.isResumption = false;
                     shc.resumingSession = null;
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                             "abort session resumption, " +
                             "no supported psk_dhe_ke PSK key exchange mode");
@@ -247,7 +247,7 @@ final class PskKeyExchangeModesExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.PSK_KEY_EXCHANGE_MODES)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "Ignore unavailable psk_key_exchange_modes extension");
                 }
@@ -287,7 +287,7 @@ final class PskKeyExchangeModesExtension {
             if (shc.isResumption) {     // resumingSession may not be set
                 shc.isResumption = false;
                 shc.resumingSession = null;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "abort session resumption, " +
                             "no supported psk_dhe_ke PSK key exchange mode");
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java
index 893eb282116..7e307ba9d27 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java
@@ -75,14 +75,14 @@ final class QuicEngineOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                             "alert message: " + Alert.nameOf(description));
                 }
                 return;
             }
             if (level == Alert.Level.WARNING.level) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("Suppressing warning-level " +
                             "alert message: " + Alert.nameOf(description));
                 }
@@ -90,7 +90,7 @@ final class QuicEngineOutputRecord extends OutputRecord implements SSLRecord {
             }
 
             if (alert != null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("Suppressing subsequent alert: " +
                             description + ", original: " + alert.id);
                 }
@@ -109,7 +109,7 @@ final class QuicEngineOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                                     "handshake message",
                             ByteBuffer.wrap(source, offset, length));
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java b/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java
index fb9077af022..4613dcf96ff 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java
@@ -244,7 +244,7 @@ sealed abstract class QuicKeyManager
             if (toDiscard == null) {
                 return;
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("discarding keys (keyphase="
                         + toDiscard.writeCipher.getKeyPhase()
                         + ") of " + this.keySpace + " key space");
@@ -389,7 +389,7 @@ sealed abstract class QuicKeyManager
             if (toDiscard == null) {
                 return;
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("discarding keys (keyphase="
                         + toDiscard.writeCipher.getKeyPhase()
                         + ") of " + this.keySpace + " key space");
@@ -570,7 +570,7 @@ sealed abstract class QuicKeyManager
             if (series == null) {
                 return;
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("discarding key (series) of " +
                         this.keySpace + " key space");
             }
@@ -611,7 +611,7 @@ sealed abstract class QuicKeyManager
             if (series.canUseOldDecryptKey(packetNumber)) {
                 final QuicReadCipher oldReadCipher = series.old;
                 assert oldReadCipher != null : "old key is unexpectedly null";
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest("using old read key to decrypt packet: " +
                             packetNumber + ", with incoming key phase: " +
                             keyPhase + ", current key phase: " +
@@ -633,7 +633,7 @@ sealed abstract class QuicKeyManager
                     // KEY_UPDATE_ERROR. This indicates that a peer has
                     // received and acknowledged a packet that initiates a key
                     // update, but has not updated keys in response.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.finest("peer used incorrect key, was" +
                                 " expected to use updated key of" +
                                 " key phase: " + currentKeyPhase +
@@ -646,7 +646,7 @@ sealed abstract class QuicKeyManager
                 }
                 return;
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("detected ONE_RTT key update, current key " +
                         "phase: " + currentKeyPhase
                         + ", incoming key phase: " + keyPhase
@@ -717,7 +717,7 @@ sealed abstract class QuicKeyManager
             }
             final long numEncrypted = cipher.getNumEncrypted();
             if (numEncrypted >= 0.8 * confidentialityLimit) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest("about to reach confidentiality limit, " +
                             "attempting to initiate a 1-RTT key update," +
                             " packet number: " +
@@ -732,7 +732,7 @@ sealed abstract class QuicKeyManager
                             : "key phase of updated key unexpectedly matches " +
                             "the key phase "
                             + cipher.getKeyPhase() + " of current keys";
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.finest(
                                 "1-RTT key update initiated, new key phase: "
                                         + newKeyPhase);
@@ -755,7 +755,7 @@ sealed abstract class QuicKeyManager
                 // current key phase. This ensures that keys are
                 // available to both peers before
                 // another key update can be initiated.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest(
                             "skipping key update initiation because peer " +
                             "hasn't yet sent us a packet encrypted with " +
@@ -803,7 +803,7 @@ sealed abstract class QuicKeyManager
                 // (we avoid timing attacks by not generating
                 // keys during decryption, our key generation
                 // only happens during encryption)
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest("next keys unavailable," +
                             " won't decrypt a packet which appears to be" +
                             " a key update");
@@ -815,7 +815,7 @@ sealed abstract class QuicKeyManager
             // use the next keys to attempt decrypting
             currentKeySeries.next.readCipher.decryptPacket(packetNumber, packet,
                     headerLength, output);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest(
                         "decrypted using next keys for peer-initiated" +
                         " key update; will now switch to new key phase: " +
@@ -1025,14 +1025,14 @@ sealed abstract class QuicKeyManager
                 // update the key series
                 this.keySeries = newSeries;
                 if (oldReadCipher != null) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.finest(
                                 "discarding old read key of key phase: " +
                                 oldReadCipher.getKeyPhase());
                     }
                     oldReadCipher.discard(false);
                 }
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest("discarding write key of key phase: " +
                             writeCipherToDiscard.getKeyPhase());
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
index 6765f554fcc..18790a58c11 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
@@ -560,7 +560,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
                 // incoming crypto buffer is null. Validate message type,
                 // check if size is available
                 byte messageType = payload.get(payload.position());
-                if (SSLLogger.isOn) {
+                if (SSLLogger.isOn()) {
                     SSLLogger.fine("Received message of type 0x" +
                             Integer.toHexString(messageType & 0xFF));
                 }
@@ -835,7 +835,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
         final boolean confirmed = HANDSHAKE_STATE_HANDLE.compareAndSet(this,
                 NEED_SEND_HANDSHAKE_DONE, HANDSHAKE_CONFIRMED);
         if (confirmed) {
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 SSLLogger.fine("QuicTLSEngine (server) marked handshake " +
                         "state as HANDSHAKE_CONFIRMED");
             }
@@ -853,7 +853,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
         final boolean confirmed = HANDSHAKE_STATE_HANDLE.compareAndSet(this,
                 NEED_RECV_HANDSHAKE_DONE, HANDSHAKE_CONFIRMED);
         if (confirmed) {
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 SSLLogger.fine(
                         "QuicTLSEngine (client) received HANDSHAKE_DONE," +
                         " marking state as HANDSHAKE_DONE");
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index 701ba35174e..ec91cb4509a 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
@@ -190,7 +190,7 @@ final class RSAClientKeyExchange {
                 throw chc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
                         "Cannot generate RSA premaster secret", gse);
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced RSA ClientKeyExchange handshake message", ckem);
             }
@@ -270,7 +270,7 @@ final class RSAClientKeyExchange {
 
             RSAClientKeyExchangeMessage ckem =
                     new RSAClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming RSA ClientKeyExchange handshake message", ckem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
index 311ac97e744..d176d7311d0 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
@@ -35,7 +35,6 @@ import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.interfaces.RSAPublicKey;
-import java.security.spec.AlgorithmParameterSpec;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -150,7 +149,7 @@ final class RSAKeyExchange {
                 needFailover = !KeyUtil.isOracleJCEProvider(
                         cipher.getProvider().getName());
             } catch (InvalidKeyException | UnsupportedOperationException iue) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("The Cipher provider "
                             + safeProviderName(cipher)
                             + " caused exception: " + iue.getMessage());
@@ -197,7 +196,7 @@ final class RSAKeyExchange {
             try {
                 return cipher.getProvider().toString();
             } catch (Exception e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Retrieving The Cipher provider name" +
                             " caused exception ", e);
                 }
@@ -205,7 +204,7 @@ final class RSAKeyExchange {
             try {
                 return cipher.toString() + " (provider name not available)";
             } catch (Exception e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Retrieving The Cipher name" +
                             " caused exception ", e);
                 }
@@ -220,7 +219,7 @@ final class RSAKeyExchange {
                 int clientVersion, int serverVersion, byte[] encodedSecret,
                 SecureRandom generator) throws GeneralSecurityException {
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Generating a premaster secret");
             }
 
@@ -235,7 +234,7 @@ final class RSAKeyExchange {
             } catch (InvalidAlgorithmParameterException |
                     NoSuchAlgorithmException iae) {
                 // unlikely to happen, otherwise, must be a provider exception
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("RSA premaster secret generation error", iae);
                 }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
index 8633b9458ce..43f2ef95ba8 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
@@ -264,7 +264,7 @@ final class RSAServerKeyExchange {
             RSAServerKeyExchangeMessage skem =
                     new RSAServerKeyExchangeMessage(
                             shc, x509Possession, rsaPossession);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced RSA ServerKeyExchange handshake message", skem);
             }
@@ -296,7 +296,7 @@ final class RSAServerKeyExchange {
 
             RSAServerKeyExchangeMessage skem =
                     new RSAServerKeyExchangeMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Consuming RSA ServerKeyExchange handshake message", skem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
index e1348badd30..90b9e999925 100644
--- a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
@@ -138,7 +138,7 @@ final class RenegoInfoExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_RENEGOTIATION_INFO)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore unavailable renegotiation_info extension");
                 }
@@ -182,7 +182,7 @@ final class RenegoInfoExtension {
                 return extData;
             } else {    // not secure renegotiation
                 if (HandshakeContext.allowUnsafeRenegotiation) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning("Using insecure renegotiation");
                     }
 
@@ -216,7 +216,7 @@ final class RenegoInfoExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_RENEGOTIATION_INFO)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                             CH_RENEGOTIATION_INFO.name);
                 }
@@ -280,7 +280,7 @@ final class RenegoInfoExtension {
                 for (int id : clientHello.cipherSuiteIds) {
                     if (id ==
                             CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV.id) {
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.finest(
                                 "Safe renegotiation, using the SCSV signaling");
                         }
@@ -294,7 +294,7 @@ final class RenegoInfoExtension {
                         "Failed to negotiate the use of secure renegotiation");
                 }   // otherwise, allow legacy hello message
 
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("Warning: No renegotiation " +
                         "indication in ClientHello, allow legacy ClientHello");
                 }
@@ -306,13 +306,13 @@ final class RenegoInfoExtension {
                         "Inconsistent secure renegotiation indication");
             } else {    // renegotiation, not secure
                 if (HandshakeContext.allowUnsafeRenegotiation) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning("Using insecure renegotiation");
                     }
                 } else {
                     // Unsafe renegotiation should have been aborted in
                     // earlier processes.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("Terminate insecure renegotiation");
                     }
                     throw shc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
@@ -345,7 +345,7 @@ final class RenegoInfoExtension {
             if (requestedSpec == null && !shc.conContext.secureRenegotiation) {
                 // Ignore, no renegotiation_info extension or SCSV signaling
                 // requested.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable renegotiation_info extension");
                 }
@@ -354,7 +354,7 @@ final class RenegoInfoExtension {
 
             if (!shc.conContext.secureRenegotiation) {
                 // Ignore, no secure renegotiation is negotiated.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "No secure renegotiation has been negotiated");
                 }
@@ -515,7 +515,7 @@ final class RenegoInfoExtension {
                         "Failed to negotiate the use of secure renegotiation");
                 }   // otherwise, allow legacy hello message
 
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("Warning: No renegotiation " +
                         "indication in ServerHello, allow legacy ServerHello");
                 }
@@ -527,13 +527,13 @@ final class RenegoInfoExtension {
                         "Inconsistent secure renegotiation indication");
             } else {    // renegotiation, not secure
                 if (HandshakeContext.allowUnsafeRenegotiation) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning("Using insecure renegotiation");
                     }
                 } else {
                     // Unsafe renegotiation should have been aborted in
                     // earlier processes.
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("Terminate insecure renegotiation");
                     }
                     throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
index 1d5a4c4e73d..594766ea0fd 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
@@ -454,7 +454,7 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
                                 .equalsIgnoreCase(paramDigestAlg));
 
             } catch (InvalidParameterSpecException e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("Invalid AlgorithmParameters: "
                             + parameters + "; Error: " + e.getMessage());
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
index 4a52a2ea583..5dfa5be3420 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
@@ -392,7 +392,7 @@ enum SSLCipher {
                 if (values[1].contains(tag[0])) {
                     index = 0;
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.fine("jdk.tls.keyLimits:  Unknown action:  " +
                                 entry);
                     }
@@ -413,13 +413,13 @@ enum SSLCipher {
                             "Length exceeded limits");
                     }
                 } catch (NumberFormatException e) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.fine("jdk.tls.keyLimits:  " + e.getMessage() +
                                 ":  " +  entry);
                     }
                     continue;
                 }
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("jdk.tls.keyLimits:  entry = " + entry +
                             ". " + values[0] + ":" + tag[index] + " = " + size);
                 }
@@ -468,7 +468,7 @@ enum SSLCipher {
             Cipher.getInstance(transformation);
             return true;
         } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("Transformation " + transformation + " is" +
                         " not available.");
             }
@@ -860,7 +860,7 @@ enum SSLCipher {
                         "JCE provider " + cipher.getProvider().getName(), sbe);
                 }
                 pt.position(pos);
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -930,7 +930,7 @@ enum SSLCipher {
                     authenticator.increaseSequenceNumber();
                 }
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.finest(
                         "Padded plaintext before ENCRYPTION", bb.duplicate());
                 }
@@ -1050,7 +1050,7 @@ enum SSLCipher {
                         "JCE provider " + cipher.getProvider().getName(), sbe);
                 }
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Padded plaintext after DECRYPTION",
                             pt.duplicate().position(pos));
@@ -1182,7 +1182,7 @@ enum SSLCipher {
                 int len = addPadding(bb, blockSize);
                 bb.position(pos);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Padded plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -1326,7 +1326,7 @@ enum SSLCipher {
                         "JCE provider " + cipher.getProvider().getName(), sbe);
                 }
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine("Padded plaintext after DECRYPTION",
                         pt.duplicate().position(pos));
                 }
@@ -1478,7 +1478,7 @@ enum SSLCipher {
                 int len = addPadding(bb, blockSize);
                 bb.position(pos);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Padded plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -1650,7 +1650,7 @@ enum SSLCipher {
                 pt.position(pos);
                 pt.limit(pos + len);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -1737,7 +1737,7 @@ enum SSLCipher {
 
                 // DON'T encrypt the nonce for AEAD mode.
                 int len, pos = bb.position();
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -1823,7 +1823,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("KeyLimit read side: algorithm = " +
                             algorithm + ":" + tag[0] +
                             "\ncountdown value = " + keyLimitCountdown);
@@ -1932,7 +1932,7 @@ enum SSLCipher {
                 contentType = pt.get(i);
                 pt.limit(i);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -1984,7 +1984,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("KeyLimit write side: algorithm = "
                             + algorithm + ":" + tag[0] +
                             "\ncountdown value = " + keyLimitCountdown);
@@ -2026,7 +2026,7 @@ enum SSLCipher {
                 cipher.updateAAD(aad);
 
                 int len, pos = bb.position();
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -2182,7 +2182,7 @@ enum SSLCipher {
                 pt.position(pos);
                 pt.limit(pos + len);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -2231,7 +2231,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("algorithm = " + algorithm +
                             ":" + tag[0] + "\ncountdown value = " +
                             keyLimitCountdown);
@@ -2273,7 +2273,7 @@ enum SSLCipher {
 
                 // DON'T encrypt the nonce for AEAD mode.
                 int pos = bb.position();
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -2450,7 +2450,7 @@ enum SSLCipher {
                 contentType = pt.get(i);
                 pt.limit(i);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -2499,7 +2499,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("algorithm = " + algorithm +
                             ":" + tag[0] + "\ncountdown value = " +
                             keyLimitCountdown);
@@ -2541,7 +2541,7 @@ enum SSLCipher {
                 cipher.updateAAD(aad);
 
                 int pos = bb.position();
-                if (SSLLogger.isOn && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
index 6d1834ad2b7..ace60e41af9 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
@@ -204,7 +204,7 @@ final class SSLConfiguration implements Cloneable {
         if (nstServerCount == null || nstServerCount < 0 ||
             nstServerCount > 10) {
             serverNewSessionTicketCount = SERVER_NST_DEFAULT;
-            if (nstServerCount != null && SSLLogger.isOn &&
+            if (nstServerCount != null && SSLLogger.isOn() &&
                 SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "jdk.tls.server.newSessionTicketCount defaults to " +
@@ -213,7 +213,7 @@ final class SSLConfiguration implements Cloneable {
             }
         } else {
             serverNewSessionTicketCount = nstServerCount;
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "jdk.tls.server.newSessionTicketCount set to " +
                         serverNewSessionTicketCount);
@@ -586,7 +586,7 @@ final class SSLConfiguration implements Cloneable {
         String property = System.getProperty(propertyName);
         // this method is called from class initializer; logging here
         // will occasionally pin threads and deadlock if called from a virtual thread
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")
                 && !Thread.currentThread().isVirtual()) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
@@ -615,7 +615,7 @@ final class SSLConfiguration implements Cloneable {
                 if (scheme != null && scheme.isAvailable) {
                     signatureSchemes.add(schemeName);
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")
                             && !Thread.currentThread().isVirtual()) {
                         SSLLogger.fine(
                         "The current installed providers do not " +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
index d50a9a10b76..be324eb0949 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
@@ -104,11 +104,11 @@ public abstract class SSLContextImpl extends SSLContextSpi {
          * first connection to time out and fail. Make sure it is
          * primed and ready by getting some initial output from it.
          */
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
             SSLLogger.finest("trigger seeding of SecureRandom");
         }
         secureRandom.nextInt();
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
             SSLLogger.finest("done seeding of SecureRandom");
         }
 
@@ -143,7 +143,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 return (X509ExtendedKeyManager)km;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
                 SSLLogger.warning(
                     "X509KeyManager passed to SSLContext.init():  need an " +
                     "X509ExtendedKeyManager for SSLEngine use");
@@ -246,7 +246,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             contextLock.lock();
             try {
                 if (statusResponseManager == null) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
                         SSLLogger.finest(
                                 "Initializing StatusResponseManager");
                     }
@@ -383,7 +383,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                             suite.name, null)) {
                         suites.add(suite);
                         isSupported = true;
-                    } else if (SSLLogger.isOn &&
+                    } else if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,sslctx,verbose")) {
                         SSLLogger.fine(
                                 "Ignore disabled cipher suite: " + suite.name);
@@ -392,7 +392,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                     break;
                 }
 
-                if (!isSupported && SSLLogger.isOn &&
+                if (!isSupported && SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,sslctx,verbose")) {
                     SSLLogger.finest(
                             "Ignore unsupported cipher suite: " + suite);
@@ -410,7 +410,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             String propertyName) {
 
         String property = System.getProperty(propertyName);
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
                     property + "'");
@@ -437,7 +437,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 try {
                     suite = CipherSuite.nameOf(cipherSuiteNames[i]);
                 } catch (IllegalArgumentException iae) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
                         SSLLogger.fine(
                                 "Unknown or unsupported cipher suite name: " +
                                 cipherSuiteNames[i]);
@@ -449,7 +449,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 if (suite != null && suite.isAvailable()) {
                     cipherSuites.add(suite);
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
                         SSLLogger.fine(
                                 "The current installed providers do not " +
                                 "support cipher suite: " + cipherSuiteNames[i]);
@@ -907,7 +907,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 tmMediator = getTrustManagers();
             } catch (Exception e) {
                 reserved = e;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                     SSLLogger.warning(
                             "Failed to load default trust managers", e);
                 }
@@ -919,7 +919,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                     kmMediator = getKeyManagers();
                 } catch (Exception e) {
                     reserved = e;
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                         SSLLogger.warning(
                                 "Failed to load default key managers", e);
                     }
@@ -977,7 +977,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             String defaultKeyStore = props.get("keyStore");
             String defaultKeyStoreType = props.get("keyStoreType");
             String defaultKeyStoreProvider = props.get("keyStoreProvider");
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                 SSLLogger.fine("keyStore is : " + defaultKeyStore);
                 SSLLogger.fine("keyStore type is : " +
                                         defaultKeyStoreType);
@@ -1007,7 +1007,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
 
                 // Try to initialize key store.
                 if ((defaultKeyStoreType.length()) != 0) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                         SSLLogger.finest("init keystore");
                     }
                     if (defaultKeyStoreProvider.isEmpty()) {
@@ -1030,7 +1030,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             /*
              * Try to initialize key manager.
              */
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                 SSLLogger.fine("init keymanager of type " +
                     KeyManagerFactory.getDefaultAlgorithm());
             }
@@ -1068,7 +1068,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                     // exception object, which may be not garbage collection
                     // friendly as 'reservedException' is a static filed.
                     reserved = new KeyManagementException(e.getMessage());
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                         SSLLogger.warning(
                                 "Failed to load default SSLContext", e);
                     }
@@ -1097,7 +1097,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 super.engineInit(DefaultManagersHolder.keyManagers,
                         DefaultManagersHolder.trustManagers, null);
             } catch (Exception e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,defaultctx")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
                     SSLLogger.fine("default context init failed: ", e);
                 }
                 throw e;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index 4b19f5a9d7b..5e23e6ee37b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -330,7 +330,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
             // application data may be discarded accordingly.  As could
             // be an issue for some applications.  This impact can be
             // mitigated by sending the last flight twice.
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,verbose")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
                 SSLLogger.finest("retransmit the last flight messages");
             }
 
@@ -397,7 +397,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
         if ((conContext.handshakeContext == null) &&
                 !conContext.isOutboundClosed() &&
                 !conContext.isBroken) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("trigger key update");
             }
             beginHandshake();
@@ -419,7 +419,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
             !conContext.isOutboundClosed() &&
             !conContext.isInboundClosed() &&
             !conContext.isBroken) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("trigger NST");
             }
             conContext.conSession.updateNST = false;
@@ -612,7 +612,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
         } catch (SSLException ssle) {
             // Need to discard invalid records for DTLS protocols.
             if (sslContext.isDTLS()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
                     SSLLogger.finest("Discard invalid DTLS records", ssle);
                 }
 
@@ -780,7 +780,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
                 return;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("Closing inbound of SSLEngine");
             }
 
@@ -819,7 +819,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
                 return;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("Closing outbound of SSLEngine");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
index 1bfbd9f51bf..6e08fc71664 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
             return null;
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
             SSLLogger.fine("Raw read", packet);
         }
 
@@ -209,7 +209,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
         byte minorVersion = packet.get();                  // pos: 2
         int contentLen = Record.getInt16(packet);          // pos: 3, 4
 
-        if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
             SSLLogger.fine(
                     "READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
@@ -388,7 +388,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
                  * error message, one that's treated as fatal by
                  * clients (Otherwise we'll hang.)
                  */
-                if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                    SSLLogger.fine(
                             "Requested to negotiate unsupported SSLv2!");
                 }
@@ -410,7 +410,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
 
             ByteBuffer converted = convertToClientHello(packet);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine(
                         "[Converted] ClientHello", converted);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
index 4a689a84d5f..1c8751e66fe 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     @Override
     void encodeAlert(byte level, byte description) {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "alert message: " + Alert.nameOf(description));
             }
@@ -91,7 +91,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     void encodeHandshake(byte[] source,
             int offset, int length) {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                         "handshake message",
                         ByteBuffer.wrap(source, offset, length));
@@ -138,7 +138,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     @Override
     void encodeChangeCipherSpec() {
         if (isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "change_cipher_spec message");
             }
@@ -171,14 +171,14 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
         ByteBuffer[] dsts, int dstsOffset, int dstsLength) throws IOException {
 
         if (isClosed) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data or cached messages");
             }
 
             return null;
         } else if (isCloseWaiting) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data");
             }
@@ -193,7 +193,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             ByteBuffer destination) throws IOException {
 
         if (writeCipher.authenticator.seqNumOverflow()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine(
                     "sequence number extremely close to overflow " +
                     "(2^64-1 packets). Closing connection.");
@@ -275,7 +275,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             destination.limit(destination.position());
             destination.position(dstContent);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name + " " +
                         ContentType.APPLICATION_DATA.name +
@@ -288,7 +288,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
                     dstPos, dstLim, headerSize,
                     protocolVersion);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 ByteBuffer temporary = destination.duplicate();
                 temporary.limit(temporary.position());
                 temporary.position(dstPos);
@@ -317,7 +317,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             //
             // Please don't change the limit of the destination buffer.
             destination.put(SSLRecord.v2NoCipher);
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine("Raw write", SSLRecord.v2NoCipher);
             }
 
@@ -331,7 +331,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             // deliver the SSLv2 format ClientHello message
             //
             // Please don't change the limit of the destination buffer.
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 if (SSLLogger.isOn("record")) {
                      SSLLogger.fine(Thread.currentThread().getName() +
                             ", WRITE: SSLv2 ClientHello message" +
@@ -525,7 +525,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             dstBuf.limit(dstBuf.position());
             dstBuf.position(dstContent);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name + " " +
                         ContentType.nameOf(memo.contentType) +
@@ -543,7 +543,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
                 memo.encodeCipher.dispose();
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 ByteBuffer temporary = dstBuf.duplicate();
                 temporary.limit(temporary.position());
                 temporary.position(dstPos);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
index fb0490d70f1..47a0d0b0e44 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
@@ -844,7 +844,7 @@ enum SSLExtension implements SSLStringizer {
         String property = System.getProperty(propertyName);
         // this method is called from class initializer; logging here
         // will occasionally pin threads and deadlock if called from a virtual thread
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")
                 && !Thread.currentThread().isVirtual()) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
index 5ad93cfc836..66f6293302e 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ final class SSLExtensions {
 
     // Extension map for debug logging
     private final Map<Integer, byte[]> logMap =
-            SSLLogger.isOn ? new LinkedHashMap<>() : null;
+            SSLLogger.isOn() ? new LinkedHashMap<>() : null;
 
     SSLExtensions(HandshakeMessage handshakeMessage) {
         this.handshakeMessage = handshakeMessage;
@@ -93,7 +93,7 @@ final class SSLExtensions {
                     // However, the implementation of the limit is complicated
                     // and inefficient, and may not worthy the maintenance.
                     isSupported = false;
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                                 "Received buggy supported_groups extension " +
                                 "in the ServerHello handshake message");
@@ -143,7 +143,7 @@ final class SSLExtensions {
                     m.get(extData);
                     logMap.put(extId, extData);
 
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "Ignore unknown or unsupported extension",
                                 toString(extId, extData));
@@ -171,7 +171,7 @@ final class SSLExtensions {
         for (SSLExtension extension : extensions) {
             if (context.negotiatedProtocol != null &&
                     !extension.isAvailable(context.negotiatedProtocol)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unsupported extension: " + extension.name);
                 }
@@ -181,7 +181,7 @@ final class SSLExtensions {
             if (!extMap.containsKey(extension)) {
                 if (extension.onLoadAbsence != null) {
                     extension.absentOnLoad(context, handshakeMessage);
-                } else if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " + extension.name);
                 }
@@ -190,7 +190,7 @@ final class SSLExtensions {
 
 
             if (extension.onLoadConsumer == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "Ignore unsupported extension: " + extension.name);
                 }
@@ -200,7 +200,7 @@ final class SSLExtensions {
             ByteBuffer m = ByteBuffer.wrap(extMap.get(extension));
             extension.consumeOnLoad(context, handshakeMessage, m);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Consumed extension: " + extension.name);
             }
         }
@@ -215,7 +215,7 @@ final class SSLExtensions {
             if (!extMap.containsKey(extension)) {
                 if (extension.onTradeAbsence != null) {
                     extension.absentOnTrade(context, handshakeMessage);
-                } else if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " + extension.name);
                 }
@@ -223,7 +223,7 @@ final class SSLExtensions {
             }
 
             if (extension.onTradeConsumer == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Ignore impact of unsupported extension: " +
                             extension.name);
@@ -232,7 +232,7 @@ final class SSLExtensions {
             }
 
             extension.consumeOnTrade(context, handshakeMessage);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Populated with extension: " + extension.name);
             }
         }
@@ -245,7 +245,7 @@ final class SSLExtensions {
             SSLExtension[] extensions) throws IOException {
         for (SSLExtension extension : extensions) {
             if (extMap.containsKey(extension)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "Ignore, duplicated extension: " +
                             extension.name);
@@ -254,7 +254,7 @@ final class SSLExtensions {
             }
 
             if (extension.networkProducer == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Ignore, no extension producer defined: " +
                             extension.name);
@@ -267,7 +267,7 @@ final class SSLExtensions {
                 extMap.put(extension, encoded);
                 encodedLength += encoded.length + 4; // extension_type (2)
                                                      // extension_data length(2)
-            } else if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 // The extension is not available in the context.
                 SSLLogger.fine(
                         "Ignore, context unavailable extension: " +
@@ -284,7 +284,7 @@ final class SSLExtensions {
             SSLExtension[] extensions) throws IOException {
         for (SSLExtension extension : extensions) {
             if (extension.networkProducer == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Ignore, no extension producer defined: " +
                             extension.name);
@@ -305,7 +305,7 @@ final class SSLExtensions {
                 encodedLength += encoded.length + 4;
                 // extension_type (2)
                 // extension_data length(2)
-            } else if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 // The extension is not available in the context.
                 SSLLogger.fine(
                         "Ignore, context unavailable extension: " +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLLogger.java b/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
index f55ab27d297..7fa6fbf91b5 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
@@ -29,8 +29,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
 import java.security.cert.Certificate;
 import java.security.cert.Extension;
@@ -41,6 +39,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import jdk.internal.vm.annotation.ForceInline;
 import sun.security.util.HexDumpEncoder;
 import sun.security.util.Debug;
 import sun.security.x509.*;
@@ -58,10 +57,13 @@ import static sun.security.ssl.Utilities.LINE_SEP;
  * logging mechanisms.  If the system property "javax.net.debug" is defined
  * and non-empty, a private debug logger implemented in this class is used.
  */
-public final class SSLLogger {
+public final class SSLLogger implements System.Logger {
     private static final System.Logger logger;
     private static final String property;
-    public static final boolean isOn;
+    private static final boolean isOn;
+
+    private final String loggerName;
+    private final boolean useCompactFormat;
 
 
     static {
@@ -76,7 +78,7 @@ public final class SSLLogger {
                     help();
                 }
 
-                logger = new SSLConsoleLogger("javax.net.ssl", p);
+                logger = new SSLLogger("javax.net.ssl", p);
             }
             isOn = true;
         } else {
@@ -86,6 +88,105 @@ public final class SSLLogger {
         }
     }
 
+    private SSLLogger(String loggerName, String options) {
+        this.loggerName = loggerName;
+        options = options.toLowerCase(Locale.ENGLISH);
+        this.useCompactFormat = !options.contains("expand");
+    }
+
+    /**
+     * Return true if the "javax.net.debug" property contains the
+     * debug check points, or System.Logger is used.
+     */
+    public static boolean isOn(String checkPoints) {
+        if (property == null) {              // debugging is turned off
+            return false;
+        } else if (property.isEmpty()) {     // use System.Logger
+            return true;
+        }                                   // use provider logger
+
+        String[] options = checkPoints.split(",");
+        for (String option : options) {
+            option = option.trim();
+            if (!SSLLogger.hasOption(option)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @ForceInline
+    public static boolean isOn() {
+        return isOn;
+    }
+
+    private static boolean hasOption(String option) {
+        option = option.toLowerCase(Locale.ENGLISH);
+        if (property.contains("all")) {
+            return true;
+        } else {
+            // remove first occurrence of "sslctx" since
+            // it interferes with search for "ssl"
+            String modified = property.replaceFirst("sslctx", "");
+            if (modified.contains("ssl")) {
+                // don't enable data and plaintext options by default
+                if (!(option.equals("data")
+                        || option.equals("packet")
+                        || option.equals("plaintext"))) {
+                    return true;
+                }
+            }
+        }
+
+        return property.contains(option);
+    }
+
+    public static void severe(String msg, Object... params) {
+        SSLLogger.log0(Level.ERROR, msg, params);
+    }
+
+    public static void warning(String msg, Object... params) {
+        SSLLogger.log0(Level.WARNING, msg, params);
+    }
+
+    public static void info(String msg, Object... params) {
+        SSLLogger.log0(Level.INFO, msg, params);
+    }
+
+    public static void fine(String msg, Object... params) {
+        SSLLogger.log0(Level.DEBUG, msg, params);
+    }
+
+    public static void finer(String msg, Object... params) {
+        SSLLogger.log0(Level.TRACE, msg, params);
+    }
+
+    public static void finest(String msg, Object... params) {
+        SSLLogger.log0(Level.TRACE, msg, params);
+    }
+
+    private static void log0(Level level, String msg, Object... params) {
+        if (logger != null && logger.isLoggable(level)) {
+            if (params == null || params.length == 0) {
+                logger.log(level, msg);
+            } else {
+                try {
+                    String formatted =
+                            SSLSimpleFormatter.formatParameters(params);
+                    // use the customized log method for SSLLogger
+                    if (logger instanceof SSLLogger) {
+                        logger.log(level, msg, formatted);
+                    } else {
+                        logger.log(level, msg + ":" + LINE_SEP + formatted);
+                    }
+                } catch (Exception exp) {
+                    // ignore it, just for debugging.
+                }
+            }
+        }
+    }
+
     private static void help() {
         System.err.println();
         System.err.println("help           print the help messages");
@@ -117,94 +218,6 @@ public final class SSLLogger {
         System.exit(0);
     }
 
-    /**
-     * Return true if the "javax.net.debug" property contains the
-     * debug check points, or System.Logger is used.
-     */
-    public static boolean isOn(String checkPoints) {
-        if (property == null) {              // debugging is turned off
-            return false;
-        } else if (property.isEmpty()) {     // use System.Logger
-            return true;
-        }                                   // use provider logger
-
-        String[] options = checkPoints.split(",");
-        for (String option : options) {
-            option = option.trim();
-            if (!SSLLogger.hasOption(option)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static boolean hasOption(String option) {
-        option = option.toLowerCase(Locale.ENGLISH);
-        if (property.contains("all")) {
-            return true;
-        } else {
-            // remove first occurrence of "sslctx" since
-            // it interferes with search for "ssl"
-            String modified = property.replaceFirst("sslctx", "");
-            if (modified.contains("ssl")) {
-                // don't enable data and plaintext options by default
-                if (!(option.equals("data")
-                        || option.equals("packet")
-                        || option.equals("plaintext"))) {
-                    return true;
-                }
-            }
-        }
-
-        return property.contains(option);
-    }
-
-    public static void severe(String msg, Object... params) {
-        SSLLogger.log(Level.ERROR, msg, params);
-    }
-
-    public static void warning(String msg, Object... params) {
-        SSLLogger.log(Level.WARNING, msg, params);
-    }
-
-    public static void info(String msg, Object... params) {
-        SSLLogger.log(Level.INFO, msg, params);
-    }
-
-    public static void fine(String msg, Object... params) {
-        SSLLogger.log(Level.DEBUG, msg, params);
-    }
-
-    public static void finer(String msg, Object... params) {
-        SSLLogger.log(Level.TRACE, msg, params);
-    }
-
-    public static void finest(String msg, Object... params) {
-        SSLLogger.log(Level.TRACE, msg, params);
-    }
-
-    private static void log(Level level, String msg, Object... params) {
-        if (logger != null && logger.isLoggable(level)) {
-            if (params == null || params.length == 0) {
-                logger.log(level, msg);
-            } else {
-                try {
-                    String formatted =
-                            SSLSimpleFormatter.formatParameters(params);
-                    // use the customized log method for SSLConsoleLogger
-                    if (logger instanceof SSLConsoleLogger) {
-                        logger.log(level, msg, formatted);
-                    } else {
-                        logger.log(level, msg + ":" + LINE_SEP + formatted);
-                    }
-                } catch (Exception exp) {
-                    // ignore it, just for debugging.
-                }
-            }
-        }
-    }
-
     static String toString(Object... params) {
         try {
             return SSLSimpleFormatter.formatParameters(params);
@@ -216,65 +229,55 @@ public final class SSLLogger {
     // Logs a warning message and always returns false. This method
     // can be used as an OR Predicate to add a log in a stream filter.
     public static boolean logWarning(String option, String s) {
-        if (SSLLogger.isOn && SSLLogger.isOn(option)) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(option)) {
             SSLLogger.warning(s);
         }
         return false;
     }
 
-    private static class SSLConsoleLogger implements Logger {
-        private final String loggerName;
-        private final boolean useCompactFormat;
+    @Override
+    public String getName() {
+        return loggerName;
+    }
 
-        SSLConsoleLogger(String loggerName, String options) {
-            this.loggerName = loggerName;
-            options = options.toLowerCase(Locale.ENGLISH);
-            this.useCompactFormat = !options.contains("expand");
-        }
+    @Override
+    public boolean isLoggable(Level level) {
+        return level != Level.OFF;
+    }
 
-        @Override
-        public String getName() {
-            return loggerName;
-        }
-
-        @Override
-        public boolean isLoggable(Level level) {
-            return level != Level.OFF;
-        }
-
-        @Override
-        public void log(Level level,
-                ResourceBundle rb, String message, Throwable thrwbl) {
-            if (isLoggable(level)) {
-                try {
-                    String formatted =
+    @Override
+    public void log(Level level,
+                    ResourceBundle rb, String message, Throwable thrwbl) {
+        if (isLoggable(level)) {
+            try {
+                String formatted =
                         SSLSimpleFormatter.format(this, level, message, thrwbl);
-                    System.err.write(formatted.getBytes(UTF_8));
-                } catch (Exception exp) {
-                    // ignore it, just for debugging.
-                }
+                System.err.write(formatted.getBytes(UTF_8));
+            } catch (Exception exp) {
+                // ignore it, just for debugging.
             }
         }
+    }
 
-        @Override
-        public void log(Level level,
-                ResourceBundle rb, String message, Object... params) {
-            if (isLoggable(level)) {
-                try {
-                    String formatted =
+    @Override
+    public void log(Level level,
+                    ResourceBundle rb, String message, Object... params) {
+        if (isLoggable(level)) {
+            try {
+                String formatted =
                         SSLSimpleFormatter.format(this, level, message, params);
-                    System.err.write(formatted.getBytes(UTF_8));
-                } catch (Exception exp) {
-                    // ignore it, just for debugging.
-                }
+                System.err.write(formatted.getBytes(UTF_8));
+            } catch (Exception exp) {
+                // ignore it, just for debugging.
             }
         }
     }
 
     private static class SSLSimpleFormatter {
         private static final String PATTERN = "yyyy-MM-dd kk:mm:ss.SSS z";
-        private static final DateTimeFormatter dateTimeFormat = DateTimeFormatter.ofPattern(PATTERN, Locale.ENGLISH)
-                                                                                 .withZone(ZoneId.systemDefault());
+        private static final DateTimeFormatter dateTimeFormat =
+                DateTimeFormatter.ofPattern(PATTERN, Locale.ENGLISH)
+                .withZone(ZoneId.systemDefault());
 
         private static final MessageFormat basicCertFormat = new MessageFormat(
                 """
@@ -290,68 +293,68 @@ public final class SSLLogger {
                 Locale.ENGLISH);
 
         private static final MessageFormat extendedCertFormat =
-            new MessageFormat(
-                    """
-                            "version"            : "v{0}",
-                            "serial number"      : "{1}",
-                            "signature algorithm": "{2}",
-                            "issuer"             : "{3}",
-                            "not before"         : "{4}",
-                            "not  after"         : "{5}",
-                            "subject"            : "{6}",
-                            "subject public key" : "{7}",
-                            "extensions"         : [
-                            {8}
-                            ]
-                            """,
-                Locale.ENGLISH);
+                new MessageFormat(
+                        """
+                                "version"            : "v{0}",
+                                "serial number"      : "{1}",
+                                "signature algorithm": "{2}",
+                                "issuer"             : "{3}",
+                                "not before"         : "{4}",
+                                "not  after"         : "{5}",
+                                "subject"            : "{6}",
+                                "subject public key" : "{7}",
+                                "extensions"         : [
+                                {8}
+                                ]
+                                """,
+                        Locale.ENGLISH);
 
         private static final MessageFormat messageFormatNoParas =
-            new MessageFormat(
-                    """
-                            '{'
-                              "logger"      : "{0}",
-                              "level"       : "{1}",
-                              "thread id"   : "{2}",
-                              "thread name" : "{3}",
-                              "time"        : "{4}",
-                              "caller"      : "{5}",
-                              "message"     : "{6}"
-                            '}'
-                            """,
-                Locale.ENGLISH);
+                new MessageFormat(
+                        """
+                                '{'
+                                  "logger"      : "{0}",
+                                  "level"       : "{1}",
+                                  "thread id"   : "{2}",
+                                  "thread name" : "{3}",
+                                  "time"        : "{4}",
+                                  "caller"      : "{5}",
+                                  "message"     : "{6}"
+                                '}'
+                                """,
+                        Locale.ENGLISH);
 
         private static final MessageFormat messageCompactFormatNoParas =
-            new MessageFormat(
-                "{0}|{1}|{2}|{3}|{4}|{5}|{6}" + LINE_SEP,
-                Locale.ENGLISH);
+                new MessageFormat(
+                        "{0}|{1}|{2}|{3}|{4}|{5}|{6}" + LINE_SEP,
+                        Locale.ENGLISH);
 
         private static final MessageFormat messageFormatWithParas =
-            new MessageFormat(
-                    """
-                            '{'
-                              "logger"      : "{0}",
-                              "level"       : "{1}",
-                              "thread id"   : "{2}",
-                              "thread name" : "{3}",
-                              "time"        : "{4}",
-                              "caller"      : "{5}",
-                              "message"     : "{6}",
-                              "specifics"   : [
-                            {7}
-                              ]
-                            '}'
-                            """,
-                Locale.ENGLISH);
+                new MessageFormat(
+                        """
+                                '{'
+                                  "logger"      : "{0}",
+                                  "level"       : "{1}",
+                                  "thread id"   : "{2}",
+                                  "thread name" : "{3}",
+                                  "time"        : "{4}",
+                                  "caller"      : "{5}",
+                                  "message"     : "{6}",
+                                  "specifics"   : [
+                                {7}
+                                  ]
+                                '}'
+                                """,
+                        Locale.ENGLISH);
 
         private static final MessageFormat messageCompactFormatWithParas =
-            new MessageFormat(
-                    """
-                            {0}|{1}|{2}|{3}|{4}|{5}|{6} (
-                            {7}
-                            )
-                            """,
-                Locale.ENGLISH);
+                new MessageFormat(
+                        """
+                                {0}|{1}|{2}|{3}|{4}|{5}|{6} (
+                                {7}
+                                )
+                                """,
+                        Locale.ENGLISH);
 
         private static final MessageFormat keyObjectFormat = new MessageFormat(
                 """
@@ -364,8 +367,8 @@ public final class SSLLogger {
         //     log message
         //     log message
         //     ...
-        private static String format(SSLConsoleLogger logger, Level level,
-                    String message, Object ... parameters) {
+        private static String format(SSLLogger logger, Level level,
+                                     String message, Object... parameters) {
 
             if (parameters == null || parameters.length == 0) {
                 Object[] messageFields = {
@@ -394,9 +397,9 @@ public final class SSLLogger {
                     formatCaller(),
                     message,
                     (logger.useCompactFormat ?
-                        formatParameters(parameters) :
-                        Utilities.indent(formatParameters(parameters)))
-                };
+                            formatParameters(parameters) :
+                            Utilities.indent(formatParameters(parameters)))
+            };
 
             if (logger.useCompactFormat) {
                 return messageCompactFormatWithParas.format(messageFields);
@@ -414,7 +417,7 @@ public final class SSLLogger {
                 .findFirst().orElse("unknown caller"));
         }
 
-        private static String formatParameters(Object ... parameters) {
+        private static String formatParameters(Object... parameters) {
             StringBuilder builder = new StringBuilder(512);
             boolean isFirst = true;
             for (Object parameter : parameters) {
@@ -425,21 +428,21 @@ public final class SSLLogger {
                 }
 
                 if (parameter instanceof Throwable) {
-                    builder.append(formatThrowable((Throwable)parameter));
+                    builder.append(formatThrowable((Throwable) parameter));
                 } else if (parameter instanceof Certificate) {
-                    builder.append(formatCertificate((Certificate)parameter));
+                    builder.append(formatCertificate((Certificate) parameter));
                 } else if (parameter instanceof ByteArrayInputStream) {
                     builder.append(formatByteArrayInputStream(
-                        (ByteArrayInputStream)parameter));
+                            (ByteArrayInputStream) parameter));
                 } else if (parameter instanceof ByteBuffer) {
-                    builder.append(formatByteBuffer((ByteBuffer)parameter));
+                    builder.append(formatByteBuffer((ByteBuffer) parameter));
                 } else if (parameter instanceof byte[]) {
                     builder.append(formatByteArrayInputStream(
-                        new ByteArrayInputStream((byte[])parameter)));
+                            new ByteArrayInputStream((byte[]) parameter)));
                 } else if (parameter instanceof Map.Entry) {
                     @SuppressWarnings("unchecked")
                     Map.Entry<String, ?> mapParameter =
-                        (Map.Entry<String, ?>)parameter;
+                            (Map.Entry<String, ?>) parameter;
                     builder.append(formatMapEntry(mapParameter));
                 } else {
                     builder.append(formatObject(parameter));
@@ -462,7 +465,7 @@ public final class SSLLogger {
             Object[] fields = {
                     "throwable",
                     builder.toString()
-                };
+            };
 
             return keyObjectFormat.format(fields);
         }
@@ -479,7 +482,7 @@ public final class SSLLogger {
             StringBuilder builder = new StringBuilder(512);
             try {
                 X509CertImpl x509 =
-                    X509CertImpl.toImpl((X509Certificate)certificate);
+                        X509CertImpl.toImpl((X509Certificate) certificate);
                 X509CertInfo certInfo = x509.getInfo();
                 CertificateExtensions certExts = certInfo.getExtensions();
                 if (certExts == null) {
@@ -528,7 +531,7 @@ public final class SSLLogger {
             Object[] fields = {
                     "certificate",
                     builder.toString()
-                };
+            };
 
             return Utilities.indent(keyObjectFormat.format(fields));
         }
@@ -591,13 +594,13 @@ public final class SSLLogger {
                 formatted = builder.toString();
             } else if (value instanceof byte[]) {
                 formatted = "\"" + key + "\": \"" +
-                    Utilities.toHexString((byte[])value) + "\"";
+                        Utilities.toHexString((byte[]) value) + "\"";
             } else if (value instanceof Byte) {
                 formatted = "\"" + key + "\": \"" +
-                        HexFormat.of().toHexDigits((byte)value) + "\"";
+                        HexFormat.of().toHexDigits((byte) value) + "\"";
             } else {
                 formatted = "\"" + key + "\": " +
-                    "\"" + value.toString() + "\"";
+                        "\"" + value.toString() + "\"";
             }
 
             return Utilities.indent(formatted);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
index db5887c5e8e..4de29b7570a 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.ProviderException;
-import java.security.spec.AlgorithmParameterSpec;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import sun.security.internal.spec.TlsMasterSecretParameterSpec;
@@ -152,7 +151,7 @@ enum SSLMasterKeyDerivation implements SSLKeyDerivationGenerator {
                 //
                 // For RSA premaster secrets, do not signal a protocol error
                 // due to the Bleichenbacher attack. See comments further down.
-                if (SSLLogger.isOn && SSLLogger.isOn("handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
                     SSLLogger.fine("RSA master secret generation error.", iae);
                 }
                 throw new ProviderException(iae);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
index 4baa3304fee..f713f723ea0 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
@@ -339,7 +339,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
                     if (t < 0 ||
                             t > NewSessionTicket.MAX_TICKET_LIFETIME) {
                         timeout = DEFAULT_SESSION_TIMEOUT;
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                             SSLLogger.warning("Invalid timeout given " +
                                     "jdk.tls.server.sessionTicketTimeout: " + t +
                                     ".  Set to default value " + timeout);
@@ -349,7 +349,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
                     }
                 } catch (NumberFormatException e) {
                     setSessionTimeout(DEFAULT_SESSION_TIMEOUT);
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.warning("Invalid timeout for " +
                                 "jdk.tls.server.sessionTicketTimeout: " + s +
                                 ".  Set to default value " + timeout);
@@ -363,7 +363,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
 
             if (defaultCacheLimit >= 0) {
                 return defaultCacheLimit;
-            } else if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning(
                     "invalid System Property javax.net.ssl.sessionCacheSize, " +
                     "use the default session cache size (" +
@@ -371,7 +371,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
             }
         } catch (Exception e) {
             // unlikely, log it for safe
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning(
                     "the System Property javax.net.ssl.sessionCacheSize is " +
                     "not available, use the default value (" +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index 1bf561c47e6..f3a4b964158 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -223,7 +223,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.identificationProtocol = hc.sslConfig.identificationProtocol;
         this.boundValues = new ConcurrentHashMap<>();
 
-        if (SSLLogger.isOn && SSLLogger.isOn("session")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
              SSLLogger.finest("Session initialized:  " + this);
         }
     }
@@ -256,7 +256,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.maximumPacketSize = baseSession.maximumPacketSize;
         this.boundValues = baseSession.boundValues;
 
-        if (SSLLogger.isOn && SSLLogger.isOn("session")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
              SSLLogger.finest("Session initialized:  " + this);
         }
     }
@@ -455,7 +455,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
 
             if (same) {
                 this.localCerts = ((X509Possession) pos).popCerts;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,session")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,session")) {
                     SSLLogger.fine("Restored " + len
                             + " local certificates from session ticket"
                             + " for algorithms " + Arrays.toString(certAlgs));
@@ -463,7 +463,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
             } else {
                 this.localCerts = null;
                 this.invalidated = true;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,session")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,session")) {
                     SSLLogger.warning("Local certificates can not be restored "
                             + "from session ticket "
                             + "for algorithms " + Arrays.toString(certAlgs));
@@ -482,7 +482,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         // If there is no getMasterSecret with TLS1.2 or under, do not resume.
         if (!protocolVersion.useTLS13PlusSpec() &&
                 getMasterSecret().getEncoded() == null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.finest("No MasterSecret, cannot make stateless" +
                         " ticket");
             }
@@ -490,7 +490,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         }
 
         if (boundValues != null && boundValues.size() > 0) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.finest("There are boundValues, cannot make" +
                         " stateless ticket");
             }
@@ -862,7 +862,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
     void setSuite(CipherSuite suite) {
        cipherSuite = suite;
 
-        if (SSLLogger.isOn && SSLLogger.isOn("session")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
              SSLLogger.finest("Negotiating session:  " + this);
        }
     }
@@ -1132,7 +1132,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
                 return;
             }
             invalidated = true;
-            if (SSLLogger.isOn && SSLLogger.isOn("session")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
                  SSLLogger.finest("Invalidated session:  " + this);
             }
             for (SSLSessionImpl child : childSessions) {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index be95a09006f..ab01a9d85be 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,7 +370,7 @@ public final class SSLSocketImpl
             // start handshaking, if failed, the connection will be closed.
             ensureNegotiated(false);
         } catch (IOException ioe) {
-            if (SSLLogger.isOn && SSLLogger.isOn("handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
                 SSLLogger.severe("handshake failed", ioe);
             }
 
@@ -573,7 +573,7 @@ public final class SSLSocketImpl
             return;
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.fine("duplex close of SSLSocket");
         }
 
@@ -591,7 +591,7 @@ public final class SSLSocketImpl
             }
         } catch (IOException ioe) {
             // ignore the exception
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("SSLSocket duplex close failed. Debug info only. Exception details:", ioe);
             }
         } finally {
@@ -601,7 +601,7 @@ public final class SSLSocketImpl
                     closeSocket(false);
                 } catch (IOException ioe) {
                     // ignore the exception
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.warning("SSLSocket close failed. Debug info only. Exception details:", ioe);
                     }
                 } finally {
@@ -696,7 +696,7 @@ public final class SSLSocketImpl
                                     "close_notify message cannot be sent.");
                         } else {
                             super.shutdownOutput();
-                            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                                 SSLLogger.warning(
                                     "SSLSocket output duplex close failed: " +
                                     "SO_LINGER timeout, " +
@@ -717,7 +717,7 @@ public final class SSLSocketImpl
                     // failed to send the close_notify message.
                     //
                     conContext.conSession.invalidate();
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.warning(
                                 "Invalidate the session: SO_LINGER timeout, " +
                                 "close_notify message cannot be sent.");
@@ -832,7 +832,7 @@ public final class SSLSocketImpl
             return;
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.fine("close inbound of SSLSocket");
         }
 
@@ -868,7 +868,7 @@ public final class SSLSocketImpl
             return;
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.fine("close outbound of SSLSocket");
         }
         conContext.closeOutbound();
@@ -1027,7 +1027,7 @@ public final class SSLSocketImpl
             // filed is checked here, in case the closing process is
             // still in progress.
             if (hasDepleted) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("The input stream has been depleted");
                 }
 
@@ -1048,7 +1048,7 @@ public final class SSLSocketImpl
 
                 // Double check if the input stream has been depleted.
                 if (hasDepleted) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.fine("The input stream is closing");
                     }
 
@@ -1134,7 +1134,7 @@ public final class SSLSocketImpl
 
         @Override
         public void close() throws IOException {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("Closing input stream");
             }
 
@@ -1142,7 +1142,7 @@ public final class SSLSocketImpl
                 SSLSocketImpl.this.close();
             } catch (IOException ioe) {
                 // ignore the exception
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("input stream close failed. Debug info only. Exception details:", ioe);
                 }
             }
@@ -1218,7 +1218,7 @@ public final class SSLSocketImpl
                 socketInputRecord.deplete(
                     conContext.isNegotiated && (getSoTimeout() > 0));
             } catch (Exception ex) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning(
                         "input stream close depletion failed", ex);
                 }
@@ -1327,7 +1327,7 @@ public final class SSLSocketImpl
 
         @Override
         public void close() throws IOException {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("Closing output stream");
             }
 
@@ -1335,7 +1335,7 @@ public final class SSLSocketImpl
                 SSLSocketImpl.this.close();
             } catch (IOException ioe) {
                 // ignore the exception
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("output stream close failed. Debug info only. Exception details:", ioe);
                 }
             }
@@ -1543,7 +1543,7 @@ public final class SSLSocketImpl
         if ((conContext.handshakeContext == null) &&
                 !conContext.isOutboundClosed() &&
                 !conContext.isBroken) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("trigger key update");
             }
             startHandshake();
@@ -1562,7 +1562,7 @@ public final class SSLSocketImpl
             !conContext.isOutboundClosed() &&
             !conContext.isInboundClosed() &&
             !conContext.isBroken) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("trigger new session ticket");
             }
             conContext.conSession.updateNST = false;
@@ -1670,7 +1670,7 @@ public final class SSLSocketImpl
      * This method never returns normally, it always throws an IOException.
      */
     private void handleException(Exception cause) throws IOException {
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.warning("handling exception", cause);
         }
 
@@ -1747,7 +1747,7 @@ public final class SSLSocketImpl
     @Override
     public void shutdown() throws IOException {
         if (!isClosed()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine("close the underlying socket");
             }
 
@@ -1773,7 +1773,7 @@ public final class SSLSocketImpl
     }
 
     private void closeSocket(boolean selfInitiated) throws IOException {
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.fine("close the SSL connection " +
                 (selfInitiated ? "(initiative)" : "(passive)"));
         }
@@ -1828,7 +1828,7 @@ public final class SSLSocketImpl
     * transport without waiting for the responding close_notify.
     */
     private void waitForClose() throws IOException {
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.fine("wait for close_notify or alert");
         }
 
@@ -1838,7 +1838,7 @@ public final class SSLSocketImpl
                 try {
                     Plaintext plainText = decode(null);
                     // discard and continue
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.finest(
                                 "discard plaintext while waiting for close",
                                 plainText);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
index 09223a4485d..ce7ab630730 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -210,7 +210,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
         int contentLen = ((header[3] & 0xFF) << 8) +
                            (header[4] & 0xFF);          // pos: 3, 4
 
-        if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
             SSLLogger.fine(
                     "READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
@@ -243,7 +243,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
         readFully(contentLen);
         recordBody.flip();
 
-        if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
             SSLLogger.fine(
                     "READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
@@ -406,7 +406,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
                  */
                 os.write(SSLRecord.v2NoCipher);      // SSLv2Hello
 
-                if (SSLLogger.isOn) {
+                if (SSLLogger.isOn()) {
                     if (SSLLogger.isOn("record")) {
                          SSLLogger.fine(
                                 "Requested to negotiate unsupported SSLv2!");
@@ -445,7 +445,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
 
             ByteBuffer converted = convertToClientHello(recordBody);
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine(
                         "[Converted] ClientHello", converted);
             }
@@ -488,13 +488,13 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
     private static int read(InputStream is, byte[] buf, int off, int len)  throws IOException {
         int readLen = is.read(buf, off, len);
         if (readLen < 0) {
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine("Raw read: EOF");
             }
             throw new EOFException("SSL peer shut down incorrectly");
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
             ByteBuffer bb = ByteBuffer.wrap(buf, off, readLen);
             SSLLogger.fine("Raw read", bb);
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
index a7809754ed0..e83ad15db22 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "alert message: " + Alert.nameOf(description));
                 }
@@ -67,7 +67,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
 
             write(level);
             write(description);
-            if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                 SSLLogger.fine("WRITE: " + protocolVersion.name +
                         " " + ContentType.ALERT.name +
                         "(" + Alert.nameOf(description) + ")" +
@@ -81,7 +81,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             deliverStream.write(buf, 0, count);    // may throw IOException
             deliverStream.flush();                 // may throw IOException
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine("Raw write",
                         (new ByteArrayInputStream(buf, 0, count)));
             }
@@ -99,7 +99,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                             "handshake message",
                             ByteBuffer.wrap(source, offset, length));
@@ -127,7 +127,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                     int limit = v2ClientHello.limit();
                     handshakeHash.deliver(record, 2, (limit - 2));
 
-                    if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                         SSLLogger.fine(
                                 "WRITE: SSLv2 ClientHello message" +
                                 ", length = " + limit);
@@ -141,7 +141,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                     deliverStream.write(record, 0, limit);
                     deliverStream.flush();
 
-                    if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                         SSLLogger.fine("Raw write",
                                 (new ByteArrayInputStream(record, 0, limit)));
                     }
@@ -177,7 +177,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                     return;
                 }
 
-                if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                     SSLLogger.fine(
                             "WRITE: " + protocolVersion.name +
                             " " + ContentType.HANDSHAKE.name +
@@ -191,7 +191,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 deliverStream.write(buf, 0, count);    // may throw IOException
                 deliverStream.flush();                 // may throw IOException
 
-                if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                     SSLLogger.fine("Raw write",
                             (new ByteArrayInputStream(buf, 0, count)));
                 }
@@ -212,7 +212,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "change_cipher_spec message");
                 }
@@ -231,7 +231,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             deliverStream.write(buf, 0, count);        // may throw IOException
             // deliverStream.flush();                  // flush in Finished
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine("Raw write",
                         (new ByteArrayInputStream(buf, 0, count)));
             }
@@ -257,7 +257,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 return;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name +
                         " " + ContentType.HANDSHAKE.name +
@@ -271,7 +271,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             deliverStream.write(buf, 0, count);    // may throw IOException
             deliverStream.flush();                 // may throw IOException
 
-            if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                 SSLLogger.fine("Raw write",
                         (new ByteArrayInputStream(buf, 0, count)));
             }
@@ -293,7 +293,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             }
 
             if (writeCipher.authenticator.seqNumOverflow()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine(
                         "sequence number extremely close to overflow " +
                         "(2^64-1 packets). Closing connection.");
@@ -330,7 +330,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 count = position;
                 write(source, offset, fragLen);
 
-                if (SSLLogger.isOn && SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
                     SSLLogger.fine(
                             "WRITE: " + protocolVersion.name +
                             " " + ContentType.APPLICATION_DATA.name +
@@ -345,7 +345,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 deliverStream.write(buf, 0, count);    // may throw IOException
                 deliverStream.flush();                 // may throw IOException
 
-                if (SSLLogger.isOn && SSLLogger.isOn("packet")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
                     SSLLogger.fine("Raw write",
                             (new ByteArrayInputStream(buf, 0, count)));
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
index c248b48fb0a..9298e016f63 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ interface SSLTransport {
             // Code to deliver SSLv2 error message for SSL/TLS connections.
             if (!context.sslContext.isDTLS()) {
                 context.outputRecord.encodeV2NoCipher();
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest("may be talking to SSLv2");
                 }
             }
@@ -161,7 +161,7 @@ interface SSLTransport {
                 if (context.handshakeContext != null &&
                     context.handshakeContext.sslConfig.enableRetransmissions &&
                     context.sslContext.isDTLS()) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
                         SSLLogger.finest("retransmitted handshake flight");
                     }
 
@@ -181,7 +181,7 @@ interface SSLTransport {
                 // Note that JDK does not support 0-RTT yet.  Otherwise, it is
                 // needed to check early_data.
                 if (!context.isNegotiated) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,verbose")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
                         SSLLogger.warning("unexpected application data " +
                             "before handshake completion");
                     }
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHello.java b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
index 1d2faa5351f..76c266a628a 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -365,7 +365,7 @@ final class ServerHello {
                 shc.sslConfig.getEnabledExtensions(
                         SSLHandshake.SERVER_HELLO, shc.negotiatedProtocol);
             shm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced ServerHello handshake message", shm);
             }
 
@@ -440,7 +440,7 @@ final class ServerHello {
                 }
 
                 // The cipher suite has been negotiated.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("use cipher suite " + cs.name);
                 }
 
@@ -453,7 +453,7 @@ final class ServerHello {
                 if (ke != null) {
                     SSLPossession[] hcds = ke.createPossessions(shc);
                     if ((hcds != null) && (hcds.length != 0)) {
-                        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.warning(
                                 "use legacy cipher suite " + cs.name);
                         }
@@ -570,7 +570,7 @@ final class ServerHello {
                     shc.sslConfig.getEnabledExtensions(
                         SSLHandshake.SERVER_HELLO, shc.negotiatedProtocol);
             shm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Produced ServerHello handshake message", shm);
             }
 
@@ -723,14 +723,14 @@ final class ServerHello {
                 }
 
                 // The cipher suite has been negotiated.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("use cipher suite " + cs.name);
                 }
                 return cs;
             }
 
             if (legacySuite != null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "use legacy cipher suite " + legacySuite.name);
                 }
@@ -783,7 +783,7 @@ final class ServerHello {
                 shc.sslConfig.getEnabledExtensions(
                     SSLHandshake.HELLO_RETRY_REQUEST, shc.negotiatedProtocol);
             hhrm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced HelloRetryRequest handshake message", hhrm);
             }
@@ -845,7 +845,7 @@ final class ServerHello {
                     shc.sslConfig.getEnabledExtensions(
                     SSLHandshake.MESSAGE_HASH, shc.negotiatedProtocol);
             hhrm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Reproduced HelloRetryRequest handshake message", hhrm);
             }
@@ -886,7 +886,7 @@ final class ServerHello {
             }
 
             ServerHelloMessage shm = new ServerHelloMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Consuming ServerHello handshake message", shm);
             }
 
@@ -931,7 +931,7 @@ final class ServerHello {
             }
 
             chc.negotiatedProtocol = serverVersion;
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Negotiated protocol version: " + serverVersion.name);
             }
@@ -986,7 +986,7 @@ final class ServerHello {
                 chc.conContext.protocolVersion = chc.negotiatedProtocol;
                 chc.conContext.outputRecord.setVersion(chc.negotiatedProtocol);
             }
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Negotiated protocol version: " + serverVersion.name);
             }
@@ -1132,7 +1132,7 @@ final class ServerHello {
                     chc.handshakeSession = new SSLSessionImpl(chc,
                             chc.negotiatedCipherSuite, newId);
 
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine("Locally assigned Session Id: " +
                                 newId.toString());
                     }
@@ -1204,7 +1204,7 @@ final class ServerHello {
     private static void setUpPskKD(HandshakeContext hc,
             SecretKey psk) throws SSLHandshakeException {
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
             SSLLogger.fine("Using PSK to derive early secret");
         }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java b/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
index 7136b36ffc2..a86257ab3d0 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
@@ -93,7 +93,7 @@ final class ServerHelloDone {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             ServerHelloDoneMessage shdm = new ServerHelloDoneMessage(shc);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Produced ServerHelloDone handshake message", shdm);
             }
@@ -147,7 +147,7 @@ final class ServerHelloDone {
 
             ServerHelloDoneMessage shdm =
                     new ServerHelloDoneMessage(chc, message);
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                         "Consuming ServerHelloDone handshake message", shdm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 96c3fe2fa6a..1b3c8ec3eba 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -216,7 +216,7 @@ final class ServerNameExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_SERVER_NAME)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "Ignore unavailable server_name extension");
                 }
@@ -261,7 +261,7 @@ final class ServerNameExtension {
                 return extData;
             }
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.warning("Unable to indicate server name");
             }
             return null;
@@ -287,7 +287,7 @@ final class ServerNameExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_SERVER_NAME)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " + CH_SERVER_NAME.name);
                 }
@@ -305,7 +305,7 @@ final class ServerNameExtension {
             if (!shc.sslConfig.sniMatchers.isEmpty()) {
                 sni = chooseSni(shc.sslConfig.sniMatchers, spec.serverNames);
                 if (sni != null) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "server name indication (" +
                                 sni + ") is accepted");
@@ -322,7 +322,7 @@ final class ServerNameExtension {
                 // connection with a "missing_extension" alert.
                 //
                 // We do not reject client without SNI extension currently.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                             "no server name matchers, " +
                             "ignore server name indication");
@@ -347,7 +347,7 @@ final class ServerNameExtension {
                     // so don't include the pre-shared key in the
                     // ServerHello handshake message
                     shc.handshakeExtensions.remove(SH_PRE_SHARED_KEY);
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "abort session resumption, " +
                                 "different server name indication used");
@@ -441,7 +441,7 @@ final class ServerNameExtension {
             CHServerNamesSpec spec = (CHServerNamesSpec)
                     shc.handshakeExtensions.get(CH_SERVER_NAME);
             if (spec == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable extension: " + SH_SERVER_NAME.name);
                 }
@@ -451,7 +451,7 @@ final class ServerNameExtension {
             // When resuming a session, the server MUST NOT include a
             // server_name extension in the server hello.
             if (shc.isResumption || shc.negotiatedServerName == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "No expected server name indication response");
                 }
@@ -528,7 +528,7 @@ final class ServerNameExtension {
             CHServerNamesSpec spec = (CHServerNamesSpec)
                     shc.handshakeExtensions.get(CH_SERVER_NAME);
             if (spec == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "Ignore unavailable extension: " + EE_SERVER_NAME.name);
                 }
@@ -538,7 +538,7 @@ final class ServerNameExtension {
             // When resuming a session, the server MUST NOT include a
             // server_name extension in the server hello.
             if (shc.isResumption || shc.negotiatedServerName == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest(
                         "No expected server name indication response");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
index 9a84bbad8fd..1a0283cf859 100644
--- a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
@@ -93,7 +93,7 @@ final class SessionTicketExtension {
                 kt = Integer.parseInt(s) * 1000;  // change to ms
                 if (kt < 0 ||
                         kt > NewSessionTicket.MAX_TICKET_LIFETIME) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.warning("Invalid timeout for " +
                                 "jdk.tls.server.statelessKeyTimeout: " +
                                 kt + ".  Set to default value " +
@@ -103,7 +103,7 @@ final class SessionTicketExtension {
                 }
             } catch (NumberFormatException e) {
                 kt = TIMEOUT_DEFAULT;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning("Invalid timeout for " +
                             "jdk.tls.server.statelessKeyTimeout: " + s +
                             ".  Set to default value " + TIMEOUT_DEFAULT +
@@ -252,7 +252,7 @@ final class SessionTicketExtension {
                         Integer.BYTES + iv.length + 1, encrypted.length);
                 return result;
             } catch (Exception e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Encryption failed." + e);
                 }
                 return new byte[0];
@@ -294,7 +294,7 @@ final class SessionTicketExtension {
 
                 return out;
             } catch (Exception e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Decryption failed." + e);
                 }
             }
@@ -309,7 +309,7 @@ final class SessionTicketExtension {
                 gos.write(input, 0, decompressedLen);
                 gos.finish();
 
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("decompressed bytes: " + decompressedLen
                             + "; compressed bytes: " + baos.size());
                 }
@@ -328,7 +328,7 @@ final class SessionTicketExtension {
                     new ByteArrayInputStream(bytes))) {
                 byte[] out = gis.readAllBytes();
 
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("compressed bytes: " + compressedLen
                             + "; decompressed bytes: " + out.length);
                 }
@@ -394,7 +394,7 @@ final class SessionTicketExtension {
             // If the context does not allow stateless tickets, exit
             if (!((SSLSessionContextImpl)chc.sslContext.
                     engineGetClientSessionContext()).statelessEnabled()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Stateless resumption not supported");
                 }
                 return null;
@@ -406,7 +406,7 @@ final class SessionTicketExtension {
             if (!chc.isResumption || chc.resumingSession == null
                     || chc.resumingSession.getPskIdentity() == null
                     || chc.resumingSession.getProtocolVersion().useTLS13PlusSpec()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Stateless resumption supported");
                 }
                 return new byte[0];
@@ -450,7 +450,7 @@ final class SessionTicketExtension {
             shc.statelessResumption = true;
 
             if (buffer.remaining() == 0) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Client accepts session tickets.");
                 }
                 return;
@@ -462,11 +462,11 @@ final class SessionTicketExtension {
             if (b != null) {
                 shc.resumingSession = new SSLSessionImpl(shc, b);
                 shc.isResumption = true;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Valid stateless session ticket found");
                 }
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Invalid stateless session ticket found");
                 }
             }
@@ -546,7 +546,7 @@ final class SessionTicketExtension {
 
             // Disable stateless resumption if server doesn't send the extension.
             if (chc.statelessResumption) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.info(
                             "Server doesn't support stateless resumption");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
index b298da05e9a..dddeb523516 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
@@ -182,7 +182,7 @@ final class SignatureAlgorithmsExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable signature_algorithms extension");
                 }
@@ -218,7 +218,7 @@ final class SignatureAlgorithmsExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable signature_algorithms extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
index 5a8f103082b..b91fc17fd29 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
@@ -204,7 +204,7 @@ enum SignatureScheme {
                     NoSuchAlgorithmException | RuntimeException exp) {
                 // Signature.getParameters() may throw RuntimeException.
                 mediator = false;
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                         "RSASSA-PSS signature with " + hash +
                         " is not supported by the underlying providers", exp);
@@ -297,7 +297,7 @@ enum SignatureScheme {
                     Signature.getInstance(algorithm);
                 } catch (Exception e) {
                     mediator = false;
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.warning(
                             "Signature algorithm, " + algorithm +
                             ", is not supported by the underlying providers");
@@ -432,7 +432,7 @@ enum SignatureScheme {
 
         for (SignatureScheme ss: schemesToCheck) {
             if (!ss.isAvailable) {
-                if (SSLLogger.isOn &&
+                if (SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest(
                         "Ignore unsupported signature scheme: " + ss.name);
@@ -451,12 +451,12 @@ enum SignatureScheme {
             if (isMatch) {
                 if (ss.isPermitted(constraints, scopes)) {
                     supported.add(ss);
-                } else if (SSLLogger.isOn &&
+                } else if (SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake,verbose")) {
                     SSLLogger.finest(
                         "Ignore disabled signature scheme: " + ss.name);
                 }
-            } else if (SSLLogger.isOn &&
+            } else if (SSLLogger.isOn() &&
                     SSLLogger.isOn("ssl,handshake,verbose")) {
                 SSLLogger.finest(
                     "Ignore inactive signature scheme: " + ss.name);
@@ -476,7 +476,7 @@ enum SignatureScheme {
         for (int ssid : algorithmIds) {
             SignatureScheme ss = SignatureScheme.valueOf(ssid);
             if (ss == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Unsupported signature scheme: " +
                             SignatureScheme.nameOf(ssid));
@@ -486,7 +486,7 @@ enum SignatureScheme {
                     && ss.isAllowed(constraints, protocolVersion, scopes)) {
                 supported.add(ss);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Unsupported signature scheme: " + ss.name);
                 }
@@ -545,7 +545,7 @@ enum SignatureScheme {
                         }
                     }
 
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "Ignore the signature algorithm (" + ss +
@@ -574,7 +574,7 @@ enum SignatureScheme {
                         }
                     }
 
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake,verbose")) {
                         SSLLogger.finest(
                             "Ignore the legacy signature algorithm (" + ss +
@@ -660,7 +660,7 @@ enum SignatureScheme {
             return signer;
         } catch (NoSuchAlgorithmException | InvalidKeyException |
                 InvalidAlgorithmParameterException nsae) {
-            if (SSLLogger.isOn &&
+            if (SSLLogger.isOn() &&
                     SSLLogger.isOn("ssl,handshake,verbose")) {
                 SSLLogger.finest(
                     "Ignore unsupported signature algorithm (" +
diff --git a/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java b/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java
index ec200c6e495..d8c4a8ccc3e 100644
--- a/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java
@@ -119,13 +119,13 @@ final class StatusResponseManager {
 
         if (cert.getExtensionValue(
                 PKIXExtensions.OCSPNoCheck_Id.toString()) != null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                 SSLLogger.fine(
                     "OCSP NoCheck extension found.  OCSP will be skipped");
             }
             return null;
         } else if (defaultResponder != null && respOverride) {
-            if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
               SSLLogger.fine(
                     "Responder override: URI is " + defaultResponder);
             }
@@ -165,7 +165,7 @@ final class StatusResponseManager {
         Map<X509Certificate, byte[]> responseMap = new HashMap<>();
         List<OCSPFetchCall> requestList = new ArrayList<>();
 
-        if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
             SSLLogger.fine(
                 "Beginning check: Type = " + type + ", Chain length = " +
                 chain.length);
@@ -192,7 +192,7 @@ final class StatusResponseManager {
                     requestList.add(new OCSPFetchCall(sInfo, ocspReq));
                 }
             } catch (IOException exc) {
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine(
                         "Exception during CertId creation: ", exc);
                 }
@@ -219,14 +219,14 @@ final class StatusResponseManager {
                         requestList.add(new OCSPFetchCall(sInfo, ocspReq));
                     }
                 } catch (IOException exc) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                         SSLLogger.fine(
                             "Exception during CertId creation: ", exc);
                     }
                 }
             }
         } else {
-            if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                 SSLLogger.fine("Unsupported status request type: " + type);
             }
         }
@@ -257,7 +257,7 @@ final class StatusResponseManager {
                             // that, otherwise just log the ExecutionException
                             Throwable cause = Optional.ofNullable(
                                     exc.getCause()).orElse(exc);
-                            if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                                 SSLLogger.fine("Exception during OCSP fetch: " +
                                         cause);
                             }
@@ -266,13 +266,13 @@ final class StatusResponseManager {
                         if (info != null && info.responseData != null) {
                             responseMap.put(info.cert,
                                     info.responseData.ocspBytes);
-                        } else if (SSLLogger.isOn &&
+                        } else if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("respmgr")) {
                             SSLLogger.fine(
                                 "Completed task had no response data");
                         }
                     } else {
-                        if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                        if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                             SSLLogger.fine("Found cancelled task");
                         }
                     }
@@ -280,7 +280,7 @@ final class StatusResponseManager {
             } catch (InterruptedException intex) {
                 // Log and reset the interrupted state
                 Thread.currentThread().interrupt();
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine("Interrupt occurred while fetching: " +
                             intex);
                 }
@@ -308,7 +308,7 @@ final class StatusResponseManager {
         for (Extension ext : ocspRequest.extensions) {
             if (ext.getId().equals(
                     PKIXExtensions.OCSPNonce_Id.toString())) {
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine(
                             "Nonce extension found, skipping cache check");
                 }
@@ -323,14 +323,14 @@ final class StatusResponseManager {
         // and do not return it as a cache hit.
         if (respEntry != null && respEntry.nextUpdate != null &&
                 respEntry.nextUpdate.before(new Date())) {
-            if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                 SSLLogger.fine(
                     "nextUpdate threshold exceeded, purging from cache");
             }
             respEntry = null;
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
             SSLLogger.fine(
                     "Check cache for SN" + Debug.toString(cid.getSerialNumber())
                         + ": " + (respEntry != null ? "HIT" : "MISS"));
@@ -493,7 +493,7 @@ final class StatusResponseManager {
          */
         @Override
         public StatusInfo call() {
-            if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                 SSLLogger.fine(
                     "Starting fetch for SN " +
                     Debug.toString(statInfo.cid.getSerialNumber()));
@@ -505,13 +505,13 @@ final class StatusResponseManager {
                 if (statInfo.responder == null) {
                     // If we have no URI then there's nothing to do
                     // but return.
-                    if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                         SSLLogger.fine(
                             "Null URI detected, OCSP fetch aborted");
                     }
                     return statInfo;
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                         SSLLogger.fine(
                             "Attempting fetch from " + statInfo.responder);
                     }
@@ -541,7 +541,7 @@ final class StatusResponseManager {
                         statInfo.cid);
 
                 // Get the response status and act on it appropriately
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine("OCSP Status: " + cacheEntry.status +
                         " (" + respBytes.length + " bytes)");
                 }
@@ -554,7 +554,7 @@ final class StatusResponseManager {
                     addToCache(statInfo.cid, cacheEntry);
                 }
             } catch (IOException ioe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine("Caught exception: ", ioe);
                 }
             }
@@ -573,12 +573,12 @@ final class StatusResponseManager {
             // If no cache lifetime has been set on entries then
             // don't cache this response if there is no nextUpdate field
             if (entry.nextUpdate == null && cacheLifetime == 0) {
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine("Not caching this OCSP response");
                 }
             } else {
                 responseCache.put(certId, entry);
-                if (SSLLogger.isOn && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
                     SSLLogger.fine(
                         "Added response for SN " +
                         Debug.toString(certId.getSerialNumber()) +
@@ -600,7 +600,7 @@ final class StatusResponseManager {
         // is necessary.  Also, we will only staple if we're doing a full
         // handshake.
         if (!shc.sslContext.isStaplingEnabled(false) || shc.isResumption) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("Staping disabled or is a resumed session");
             }
             return null;
@@ -623,7 +623,7 @@ final class StatusResponseManager {
         // selection yet, only accept a request if the ResponderId field
         // is empty.  Finally, we'll only do this in (D)TLS 1.2 or earlier.
         if (statReqV2 != null && !shc.negotiatedProtocol.useTLS13PlusSpec()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake,verbose")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
                 SSLLogger.fine("SH Processing status_request_v2 extension");
             }
             // RFC 6961 stapling
@@ -660,7 +660,7 @@ final class StatusResponseManager {
                 req = reqItems[ocspIdx];
                 type = CertStatusRequestType.valueOf(req.statusType);
             } else {
-                if (SSLLogger.isOn &&
+                if (SSLLogger.isOn() &&
                         SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest("Warning: No suitable request " +
                             "found in the status_request_v2 extension.");
@@ -678,7 +678,7 @@ final class StatusResponseManager {
         // we will try processing an asserted status_request.
         if ((statReq != null) &&
                 (ext == null || type == null || req == null)) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake,verbose")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
                 SSLLogger.fine("SH Processing status_request extension");
             }
             ext = SSLExtension.CH_STATUS_REQUEST;
@@ -692,7 +692,7 @@ final class StatusResponseManager {
                 if (ocspReq.responderIds.isEmpty()) {
                     req = ocspReq;
                 } else {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.finest("Warning: No suitable request " +
                             "found in the status_request extension.");
                     }
@@ -704,7 +704,7 @@ final class StatusResponseManager {
         // find a suitable StatusRequest, then stapling is disabled.
         // The ext, type and req variables must have been set to continue.
         if (type == null || req == null || ext == null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine("No suitable status_request or " +
                         "status_request_v2, stapling is disabled");
             }
@@ -721,7 +721,7 @@ final class StatusResponseManager {
         }
 
         if (x509Possession == null) {       // unlikely
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.finest("Warning: no X.509 certificates found.  " +
                         "Stapling is disabled.");
             }
@@ -743,7 +743,7 @@ final class StatusResponseManager {
             responses = statRespMgr.get(fetchType, req, certs,
                     shc.statusRespTimeout, TimeUnit.MILLISECONDS);
             if (!responses.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest("Response manager returned " +
                             responses.size() + " entries.");
                 }
@@ -752,7 +752,7 @@ final class StatusResponseManager {
                 if (type == CertStatusRequestType.OCSP) {
                     byte[] respDER = responses.get(certs[0]);
                     if (respDER == null || respDER.length == 0) {
-                        if (SSLLogger.isOn &&
+                        if (SSLLogger.isOn() &&
                                 SSLLogger.isOn("ssl,handshake")) {
                             SSLLogger.finest("Warning: Null or zero-length " +
                                     "response found for leaf certificate. " +
@@ -763,7 +763,7 @@ final class StatusResponseManager {
                 }
                 params = new StaplingParameters(ext, type, req, responses);
             } else {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.finest("Warning: no OCSP responses obtained.  " +
                             "Stapling is disabled.");
                 }
@@ -771,7 +771,7 @@ final class StatusResponseManager {
         } else {
             // This should not happen, but if lazy initialization of the
             // StatusResponseManager doesn't occur we should turn off stapling.
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.finest("Warning: lazy initialization " +
                         "of the StatusResponseManager failed.  " +
                         "Stapling is disabled.");
diff --git a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
index 6bf138f4e45..1fa2356d1de 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
@@ -129,7 +129,7 @@ final class SunX509KeyManagerImpl extends X509KeyManagerCertChecking {
             X509Credentials cred = new X509Credentials((PrivateKey) key,
                     (X509Certificate[]) certs);
             credentialsMap.put(alias, cred);
-            if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                 SSLLogger.fine("found key for : " + alias, (Object[]) certs);
             }
         }
@@ -315,7 +315,7 @@ final class SunX509KeyManagerImpl extends X509KeyManagerCertChecking {
         }
 
         if (results == null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                 SSLLogger.fine("KeyMgr: no matching key found");
             }
             return null;
diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
index 57e5f8c9093..67cb37988a1 100644
--- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
@@ -164,7 +164,7 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
@@ -177,7 +177,7 @@ final class SupportedGroupsExtension {
             for (String name : chc.sslConfig.namedGroups) {
                 NamedGroup ng = NamedGroup.nameOf(name);
                 if (ng == null) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "Ignore unspecified named group: " + name);
                     }
@@ -193,14 +193,14 @@ final class SupportedGroupsExtension {
                         ng.isSupported(chc.activeCipherSuites) &&
                         ng.isPermitted(chc.algorithmConstraints)) {
                     namedGroups.add(ng);
-                } else if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore inactive or disabled named group: " + ng.name);
                 }
             }
 
             if (namedGroups.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("no available named group");
                 }
 
@@ -244,7 +244,7 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
@@ -319,7 +319,7 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(EE_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
@@ -335,7 +335,7 @@ final class SupportedGroupsExtension {
             for (String name : shc.sslConfig.namedGroups) {
                 NamedGroup ng = NamedGroup.nameOf(name);
                 if (ng == null) {
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("ssl,handshake")) {
                         SSLLogger.fine(
                                 "Ignore unspecified named group: " + name);
@@ -352,14 +352,14 @@ final class SupportedGroupsExtension {
                         ng.isSupported(shc.activeCipherSuites) &&
                         ng.isPermitted(shc.algorithmConstraints)) {
                     namedGroups.add(ng);
-                } else if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore inactive or disabled named group: " + ng.name);
                 }
             }
 
             if (namedGroups.isEmpty()) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("no available named group");
                 }
 
@@ -399,7 +399,7 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(EE_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java
index 6efdcef0d29..58597c3008c 100644
--- a/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,7 +168,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         CH_SUPPORTED_VERSIONS.name);
@@ -216,7 +216,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         CH_SUPPORTED_VERSIONS.name);
@@ -308,7 +308,7 @@ final class SupportedVersionsExtension {
                     shc.handshakeExtensions.get(CH_SUPPORTED_VERSIONS);
             if (svs == null) {
                 // Unlikely, no key_share extension requested.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
                             "Ignore unavailable supported_versions extension");
                 }
@@ -317,7 +317,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         SH_SUPPORTED_VERSIONS.name);
@@ -356,7 +356,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         SH_SUPPORTED_VERSIONS.name);
@@ -399,7 +399,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(HRR_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         HRR_SUPPORTED_VERSIONS.name);
@@ -441,7 +441,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(HRR_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         HRR_SUPPORTED_VERSIONS.name);
@@ -483,7 +483,7 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(HRR_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine(
                         "[Reproduce] Ignore unavailable extension: " +
                         HRR_SUPPORTED_VERSIONS.name);
diff --git a/src/java.base/share/classes/sun/security/ssl/TransportContext.java b/src/java.base/share/classes/sun/security/ssl/TransportContext.java
index 9595dc8b3fd..980d9c4a6ce 100644
--- a/src/java.base/share/classes/sun/security/ssl/TransportContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/TransportContext.java
@@ -270,7 +270,7 @@ final class TransportContext implements ConnectionContext {
             try {
                 outputRecord.encodeAlert(Alert.Level.WARNING.level, alert.id);
             } catch (IOException ioe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning(
                         "Warning: failed to send warning alert " + alert, ioe);
                 }
@@ -330,7 +330,7 @@ final class TransportContext implements ConnectionContext {
         // so we'll do it here.
         if (closeReason != null) {
             if (cause == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning(
                             "Closed transport, general or untracked problem");
                 }
@@ -341,7 +341,7 @@ final class TransportContext implements ConnectionContext {
             if (cause instanceof SSLException) {
                 throw (SSLException)cause;
             } else {    // unlikely, but just in case.
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning(
                             "Closed transport, unexpected rethrowing", cause);
                 }
@@ -364,7 +364,7 @@ final class TransportContext implements ConnectionContext {
         }
 
         // shutdown the transport
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.severe("Fatal (" + alert + "): " + diagnostic, cause);
         }
 
@@ -380,7 +380,7 @@ final class TransportContext implements ConnectionContext {
         try {
             inputRecord.close();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("Fatal: input record closure failed", ioe);
             }
 
@@ -411,7 +411,7 @@ final class TransportContext implements ConnectionContext {
             try {
                 outputRecord.encodeAlert(Alert.Level.FATAL.level, alert.id);
             } catch (IOException ioe) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.warning(
                         "Fatal: failed to send fatal alert " + alert, ioe);
                 }
@@ -424,7 +424,7 @@ final class TransportContext implements ConnectionContext {
         try {
             outputRecord.close();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("Fatal: output record closure failed", ioe);
             }
 
@@ -440,7 +440,7 @@ final class TransportContext implements ConnectionContext {
         try {
             transport.shutdown();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("Fatal: transport closure failed", ioe);
             }
 
@@ -526,7 +526,7 @@ final class TransportContext implements ConnectionContext {
                 passiveInboundClose();
             }
         } catch (IOException ioe) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("inbound closure failed", ioe);
             }
         }
@@ -583,7 +583,7 @@ final class TransportContext implements ConnectionContext {
         try {
              initiateOutboundClose();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.warning("outbound closure failed", ioe);
             }
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
index bac7735de07..8b89fecefa8 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,24 +48,24 @@ abstract class TrustManagerFactoryImpl extends TrustManagerFactorySpi {
                 trustManager = getInstance(TrustStoreManager.getTrustedCerts());
             } catch (SecurityException se) {
                 // eat security exceptions but report other throwables
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine(
                             "SunX509: skip default keystore", se);
                 }
             } catch (Error err) {
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine(
                         "SunX509: skip default keystore", err);
                 }
                 throw err;
             } catch (RuntimeException re) {
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine(
                         "SunX509: skip default keystore", re);
                 }
                 throw re;
             } catch (Exception e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine(
                         "SunX509: skip default keystore", e);
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
index e2c353847c7..a44f3a4e32d 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
@@ -108,7 +108,7 @@ final class TrustStoreManager {
             this.storeFile = storeFile;
             this.lastModified = lastModified;
 
-            if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                 SSLLogger.fine(
                     "trustStore is: " + storeName + "\n" +
                     "trustStore type is: " + storeType + "\n" +
@@ -151,7 +151,7 @@ final class TrustStoreManager {
                     }
 
                     // Not break, the file is inaccessible.
-                    if (SSLLogger.isOn &&
+                    if (SSLLogger.isOn() &&
                             SSLLogger.isOn("trustmanager")) {
                         SSLLogger.fine(
                                 "Inaccessible trust store: " +
@@ -267,7 +267,7 @@ final class TrustStoreManager {
                 }
 
                 // Reload a new key store.
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine("Reload the trust store");
                 }
 
@@ -321,7 +321,7 @@ final class TrustStoreManager {
 
                 // Reload the trust store if needed.
                 if (ks == null) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                         SSLLogger.fine("Reload the trust store");
                     }
                     ks = loadKeyStore(descriptor);
@@ -329,12 +329,12 @@ final class TrustStoreManager {
                 }
 
                 // Reload trust certs from the key store.
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine("Reload trust certs");
                 }
 
                 certs = loadTrustedCerts(ks);
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine("Reloaded " + certs.size() + " trust certs");
                 }
 
@@ -355,7 +355,7 @@ final class TrustStoreManager {
                     descriptor.storeFile == null) {
 
                 // No file available, no KeyStore available.
-                if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine("No available key store");
                 }
 
@@ -382,7 +382,7 @@ final class TrustStoreManager {
                     ks.load(bis, password);
                 } catch (FileNotFoundException fnfe) {
                     // No file available, no KeyStore available.
-                    if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
                         SSLLogger.fine(
                             "Not available key store: " + descriptor.storeName);
                     }
diff --git a/src/java.base/share/classes/sun/security/ssl/Utilities.java b/src/java.base/share/classes/sun/security/ssl/Utilities.java
index 50cd3bee751..458551b9d8a 100644
--- a/src/java.base/share/classes/sun/security/ssl/Utilities.java
+++ b/src/java.base/share/classes/sun/security/ssl/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ final class Utilities {
             SNIServerName serverName = sniList.get(i);
             if (serverName.getType() == StandardConstants.SNI_HOST_NAME) {
                 sniList.set(i, sniHostName);
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                      SSLLogger.fine(
                         "the previous server name in SNI (" + serverName +
                         ") was replaced with (" + sniHostName + ")");
@@ -116,7 +116,7 @@ final class Utilities {
                 return new SNIHostName(hostname);
             } catch (IllegalArgumentException iae) {
                 // don't bother to handle illegal host_name
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                      SSLLogger.fine(hostname + "\" " +
                         "is not a legal HostName for  server name indication");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/X509Authentication.java b/src/java.base/share/classes/sun/security/ssl/X509Authentication.java
index 5abc2cb1bf4..6aedff02c34 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509Authentication.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509Authentication.java
@@ -201,7 +201,7 @@ enum X509Authentication implements SSLAuthentication {
     private static SSLPossession createClientPossession(
             ClientHandshakeContext chc, String[] keyTypes) {
         X509ExtendedKeyManager km = chc.sslContext.getX509KeyManager();
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.finest("X509KeyManager class: " +
                     km.getClass().getName());
         }
@@ -243,7 +243,7 @@ enum X509Authentication implements SSLAuthentication {
         }
 
         if (clientAlias == null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest("No X.509 cert selected for "
                         + Arrays.toString(keyTypes));
             }
@@ -252,7 +252,7 @@ enum X509Authentication implements SSLAuthentication {
 
         PrivateKey clientPrivateKey = km.getPrivateKey(clientAlias);
         if (clientPrivateKey == null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest(
                         clientAlias + " is not a private key entry");
             }
@@ -261,7 +261,7 @@ enum X509Authentication implements SSLAuthentication {
 
         X509Certificate[] clientCerts = km.getCertificateChain(clientAlias);
         if ((clientCerts == null) || (clientCerts.length == 0)) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.finest(clientAlias +
                         " is a private key entry with no cert chain stored");
             }
@@ -270,7 +270,7 @@ enum X509Authentication implements SSLAuthentication {
 
         String privateKeyAlgorithm = clientPrivateKey.getAlgorithm();
         if (!Arrays.asList(keyTypes).contains(privateKeyAlgorithm)) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine(
                         clientAlias + " private key algorithm " +
                                 privateKeyAlgorithm + " not in request list");
@@ -280,7 +280,7 @@ enum X509Authentication implements SSLAuthentication {
 
         String publicKeyAlgorithm = clientCerts[0].getPublicKey().getAlgorithm();
         if (!privateKeyAlgorithm.equals(publicKeyAlgorithm)) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                 SSLLogger.fine(
                         clientAlias + " private or public key is not of " +
                                 "same algorithm: " +
@@ -296,7 +296,7 @@ enum X509Authentication implements SSLAuthentication {
     private static SSLPossession createServerPossession(
             ServerHandshakeContext shc, String[] keyTypes) {
         X509ExtendedKeyManager km = shc.sslContext.getX509KeyManager();
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
             SSLLogger.finest("X509KeyManager class: " +
                     km.getClass().getName());
         }
@@ -337,7 +337,7 @@ enum X509Authentication implements SSLAuthentication {
             }
 
             if (serverAlias == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest("No X.509 cert selected for " + keyType);
                 }
                 continue;
@@ -345,7 +345,7 @@ enum X509Authentication implements SSLAuthentication {
 
             PrivateKey serverPrivateKey = km.getPrivateKey(serverAlias);
             if (serverPrivateKey == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest(
                             serverAlias + " is not a private key entry");
                 }
@@ -354,7 +354,7 @@ enum X509Authentication implements SSLAuthentication {
 
             X509Certificate[] serverCerts = km.getCertificateChain(serverAlias);
             if ((serverCerts == null) || (serverCerts.length == 0)) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.finest(
                             serverAlias + " is not a certificate entry");
                 }
@@ -364,7 +364,7 @@ enum X509Authentication implements SSLAuthentication {
             PublicKey serverPublicKey = serverCerts[0].getPublicKey();
             if ((!serverPrivateKey.getAlgorithm().equals(keyType))
                     || (!serverPublicKey.getAlgorithm().equals(keyType))) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine(
                             serverAlias + " private or public key is not of " +
                                     keyType + " algorithm");
@@ -379,7 +379,7 @@ enum X509Authentication implements SSLAuthentication {
             if (!shc.negotiatedProtocol.useTLS13PlusSpec() &&
                     keyType.equals("EC")) {
                 if (!(serverPublicKey instanceof ECPublicKey)) {
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.warning(serverAlias +
                                 " public key is not an instance of ECPublicKey");
                     }
@@ -398,7 +398,7 @@ enum X509Authentication implements SSLAuthentication {
                         ((shc.clientRequestedNamedGroups != null) &&
                                 !shc.clientRequestedNamedGroups.contains(namedGroup))) {
 
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                         SSLLogger.warning(
                                 "Unsupported named group (" + namedGroup +
                                         ") used in the " + serverAlias + " certificate");
diff --git a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java
index 9484ab4f830..2a1f01273bd 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java
@@ -116,7 +116,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
         }
 
         if (keyIndex == -1) {
-            if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                 SSLLogger.fine("Ignore alias " + alias
                         + ": key algorithm does not match");
             }
@@ -134,7 +134,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                 }
             }
             if (!found) {
-                if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                     SSLLogger.fine(
                             "Ignore alias " + alias
                                     + ": issuers do not match");
@@ -150,7 +150,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                 !conformsToAlgorithmConstraints(constraints, chain,
                         checkType.getValidator())) {
 
-            if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                 SSLLogger.fine("Ignore alias " + alias +
                         ": certificate chain does not conform to " +
                         "algorithm constraints");
@@ -219,7 +219,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
             checker.init(false);
         } catch (CertPathValidatorException cpve) {
             // unlikely to happen
-            if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                 SSLLogger.fine(
                         "Cannot initialize algorithm constraints checker",
                         cpve);
@@ -235,7 +235,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                 // We don't care about the unresolved critical extensions.
                 checker.check(cert, Collections.emptySet());
             } catch (CertPathValidatorException cpve) {
-                if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
                     SSLLogger.fine("Certificate does not conform to " +
                             "algorithm constraints", cert, cpve);
                 }
@@ -392,7 +392,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                                         serverName.getEncoded());
                             } catch (IllegalArgumentException iae) {
                                 // unlikely to happen, just in case ...
-                                if (SSLLogger.isOn &&
+                                if (SSLLogger.isOn() &&
                                         SSLLogger.isOn("keymanager")) {
                                     SSLLogger.fine("Illegal server name: "
                                             + serverName);
@@ -408,7 +408,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                             X509TrustManagerImpl.checkIdentity(hostname,
                                     cert, idAlgorithm);
                         } catch (CertificateException e) {
-                            if (SSLLogger.isOn &&
+                            if (SSLLogger.isOn() &&
                                     SSLLogger.isOn("keymanager")) {
                                 SSLLogger.fine(
                                         "Certificate identity does not match "
diff --git a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
index c607fe0f25d..72f079db175 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
@@ -228,7 +228,7 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
                 || (secondDot - firstDot < 2)
                 || (alias.length() - secondDot < 2)) {
 
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
                 SSLLogger.warning("Invalid alias format: " + alias);
             }
             return null;
@@ -255,7 +255,7 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
                  NoSuchAlgorithmException |
                  IndexOutOfBoundsException e) {
             // ignore and only log exception
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
                 SSLLogger.warning("Exception thrown while getting an alias " +
                                   alias + ": " + e);
             }
@@ -295,7 +295,7 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
                 if (results != null) {
                     for (EntryStatus status : results) {
                         if (status.checkResult == CheckResult.OK) {
-                            if (SSLLogger.isOn
+                            if (SSLLogger.isOn()
                                     && SSLLogger.isOn("ssl,keymanager")) {
                                 SSLLogger.fine("Choosing key: " + status);
                             }
@@ -312,13 +312,13 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
             }
         }
         if (allResults == null) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
                 SSLLogger.fine("No matching key found");
             }
             return null;
         }
         Collections.sort(allResults);
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,keymanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
             SSLLogger.fine(
                     "No good matching key found, "
                     + "returning best match out of", allResults);
@@ -358,13 +358,13 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
             }
         }
         if (allResults == null || allResults.isEmpty()) {
-            if (SSLLogger.isOn && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
                 SSLLogger.fine("No matching alias found");
             }
             return null;
         }
         Collections.sort(allResults);
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,keymanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
             SSLLogger.fine("Getting aliases", allResults);
         }
         return toAliases(allResults);
diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index d82b94a1d7d..1bbe0bfb9c7 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -81,7 +81,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
 
         this.trustedCerts = trustedCerts;
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
             SSLLogger.fine("adding as trusted certificates",
                     (Object[])trustedCerts.toArray(new X509Certificate[0]));
         }
@@ -98,7 +98,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
         trustedCerts = v.getTrustedCertificates();
         serverValidator = v;
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
             SSLLogger.fine("adding as trusted certificates",
                     (Object[])trustedCerts.toArray(new X509Certificate[0]));
         }
@@ -242,7 +242,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
                     null, checkClientTrusted ? null : authType);
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
             SSLLogger.fine("Found trusted certificate",
                     trustedChain[trustedChain.length - 1]);
         }
@@ -288,7 +288,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
                     null, checkClientTrusted ? null : authType);
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
             SSLLogger.fine("Found trusted certificate",
                     trustedChain[trustedChain.length - 1]);
         }
@@ -331,7 +331,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
                     null, checkClientTrusted ? null : authType);
         }
 
-        if (SSLLogger.isOn && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
             SSLLogger.fine("Found trusted certificate",
                     trustedChain[trustedChain.length - 1]);
         }
@@ -365,7 +365,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
                     hostname = new SNIHostName(sniName.getEncoded());
                 } catch (IllegalArgumentException iae) {
                     // unlikely to happen, just in case ...
-                    if (SSLLogger.isOn && SSLLogger.isOn("ssl,trustmanager")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
                         SSLLogger.fine("Illegal server name: " + sniName);
                     }
                 }
diff --git a/src/java.base/share/classes/sun/security/util/DomainName.java b/src/java.base/share/classes/sun/security/util/DomainName.java
index 4f577f1114c..465c155ab87 100644
--- a/src/java.base/share/classes/sun/security/util/DomainName.java
+++ b/src/java.base/share/classes/sun/security/util/DomainName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@ import java.util.zip.ZipInputStream;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import jdk.internal.util.StaticProperty;
 import sun.security.ssl.SSLLogger;
 
 /**
@@ -193,7 +192,7 @@ class DomainName {
                 }
                 return getRules(tld, new ZipInputStream(pubSuffixStream));
             } catch (IOException e) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine(
                         "cannot parse public suffix data for " + tld +
                          ": " + e.getMessage());
@@ -210,7 +209,7 @@ class DomainName {
                 is = new FileInputStream(f);
             } catch (FileNotFoundException e) { }
             if (is == null) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl") &&
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl") &&
                         SSLLogger.isOn("trustmanager")) {
                     SSLLogger.fine(
                         "lib/security/public_suffix_list.dat not found");
@@ -231,7 +230,7 @@ class DomainName {
                 }
             }
             if (!found) {
-                if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
                     SSLLogger.fine("Domain " + tld + " not found");
                 }
                 return null;
diff --git a/src/java.base/share/classes/sun/security/util/HostnameChecker.java b/src/java.base/share/classes/sun/security/util/HostnameChecker.java
index 1374bc6d535..65115c9aeaf 100644
--- a/src/java.base/share/classes/sun/security/util/HostnameChecker.java
+++ b/src/java.base/share/classes/sun/security/util/HostnameChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -271,7 +271,7 @@ public class HostnameChecker {
             name = IDN.toUnicode(IDN.toASCII(name));
             template = IDN.toUnicode(IDN.toASCII(template));
         } catch (RuntimeException re) {
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 SSLLogger.fine("Failed to normalize to Unicode: " + re);
             }
 
@@ -308,7 +308,7 @@ public class HostnameChecker {
             String template, boolean chainsToPublicCA) {
         // not ok if it is a single wildcard character or "*."
         if (template.equals("*") || template.equals("*.")) {
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 SSLLogger.fine(
                     "Certificate domain name has illegal single " +
                       "wildcard character: " + template);
@@ -328,7 +328,7 @@ public class HostnameChecker {
 
         // not ok if there is no dot after wildcard (ex: "*com")
         if (firstDotIndex == -1) {
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 SSLLogger.fine(
                     "Certificate domain name has illegal wildcard, " +
                     "no dot after wildcard character: " + template);
@@ -353,7 +353,7 @@ public class HostnameChecker {
 
         // Is it a top-level domain?
         if (wildcardedDomain.equalsIgnoreCase(templateDomainSuffix)) {
-            if (SSLLogger.isOn) {
+            if (SSLLogger.isOn()) {
                 SSLLogger.fine(
                     "Certificate domain name has illegal " +
                     "wildcard for top-level public suffix: " + template);
diff --git a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
index fbd20e588d1..f32d0e381a6 100644
--- a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
+++ b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8350582 8340312 8369995
+ * @bug 8350582 8340312 8369995 8372004
  * @library /test/lib /javax/net/ssl/templates
  * @summary Correct the parsing of the ssl value in javax.net.debug
  * @run junit DebugPropertyValuesTest
@@ -91,6 +91,7 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
                 List.of("FINE: adding as trusted certificates:"
                             + System.lineSeparator() +
                             "  \"certificate\" : \\{",
+                        "sun.security.ssl.SSLSocketImpl close",
                         "FINE: Produced ClientHello handshake message:" +
                             System.lineSeparator() +
                             "\"ClientHello\": \\{",

From 6fc8e4998019a2f3ef05ff3e73a4c855c0366d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Thu, 20 Nov 2025 09:13:57 +0000
Subject: [PATCH 264/512] 8372097: C2: PhasePrintLevel requires setting
 PrintPhaseLevel explicitly to be active

Reviewed-by: mhaessig, chagedorn
---
 src/hotspot/share/opto/c2_globals.hpp         |   2 +-
 src/hotspot/share/opto/compile.cpp            |   2 +-
 .../compiler/oracle/TestPhasePrintLevel.java  | 110 ++++++++++++++++++
 3 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/oracle/TestPhasePrintLevel.java

diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 0a4f231c49b..2b2b4db47b1 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -428,7 +428,7 @@
           "0=print nothing except PhasePrintLevel directives, "             \
           "6=all details printed. "                                         \
           "Level of detail of printouts can be set on a per-method level "  \
-          "as well by using CompileCommand=PrintPhaseLevel.")                        \
+          "as well by using CompileCommand=PhasePrintLevel.")               \
           range(-1, 6)                                                      \
                                                                             \
   develop(bool, PrintIdealGraph, false,                                     \
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 6babc13e1b3..89b5e36b120 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -5233,7 +5233,7 @@ void Compile::end_method() {
 
 #ifndef PRODUCT
 bool Compile::should_print_phase(const int level) const {
-  return PrintPhaseLevel > 0 && directive()->PhasePrintLevelOption >= level &&
+  return PrintPhaseLevel >= 0 && directive()->PhasePrintLevelOption >= level &&
          _method != nullptr; // Do not print phases for stubs.
 }
 
diff --git a/test/hotspot/jtreg/compiler/oracle/TestPhasePrintLevel.java b/test/hotspot/jtreg/compiler/oracle/TestPhasePrintLevel.java
new file mode 100644
index 00000000000..cf60c5c9be2
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/oracle/TestPhasePrintLevel.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.oracle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import compiler.lib.ir_framework.CompilePhase;
+
+/**
+ * @test
+ * @bug 8372097
+ * @summary Checks that -XX:CompileCommand=PhasePrintLevel,... interacts with
+ *          -XX:PrintPhaseLevel as expected.
+ * @library /test/lib /
+ * @requires vm.debug & vm.compiler2.enabled & vm.flagless
+ * @run driver compiler.oracle.TestPhasePrintLevel
+ */
+
+public class TestPhasePrintLevel {
+
+    static final String level1Phase = CompilePhase.FINAL_CODE.getName();
+    static final String level2Phase = CompilePhase.GLOBAL_CODE_MOTION.getName();
+
+    public static void main(String[] args) throws Exception {
+        // Test flag level < 0: nothing should be printed regardless of the compile command level.
+        test(-1, -1, null,        level1Phase);
+        test(-1,  0, null,        level1Phase);
+        test(-1,  1, null,        level1Phase);
+
+        // Test flag level = 0: the compile command level should determine what is printed.
+        test(0,  -1, null,        level1Phase);
+        test(0,   0, null,        level1Phase);
+        test(0,   1, level1Phase, null);
+        test(0,   2, level2Phase, null);
+
+        // Test flag level > 0: the compile command level should take precedence.
+        test(1,  -1, null,        level1Phase);
+        test(1,   0, null,        level1Phase);
+        test(1,   1, level1Phase, null);
+        test(2,   1, level1Phase, level2Phase);
+        test(1,   2, level2Phase, null);
+    }
+
+    static void test(int flagLevel, int compileCommandLevel, String expectedPhase, String unexpectedPhase) throws Exception {
+        List<String> options = new ArrayList<String>();
+        options.add("-Xbatch");
+        options.add("-XX:CompileOnly=" + getTestName());
+        options.add("-XX:PrintPhaseLevel=" + flagLevel);
+        options.add("-XX:CompileCommand=PhasePrintLevel," + getTestName() + "," + compileCommandLevel);
+        options.add(getTestClass());
+        OutputAnalyzer oa = ProcessTools.executeTestJava(options);
+        oa.shouldHaveExitValue(0)
+            .shouldContain("CompileCommand: PhasePrintLevel compiler/oracle/TestPhasePrintLevel$TestMain.test intx PhasePrintLevel = " + compileCommandLevel)
+            .shouldNotContain("CompileCommand: An error occurred during parsing")
+            .shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
+        if (expectedPhase != null) {
+            oa.shouldContain(expectedPhase);
+        }
+        if (unexpectedPhase != null) {
+            oa.shouldNotContain(unexpectedPhase);
+        }
+    }
+
+    static String getTestClass() {
+        return TestMain.class.getName();
+    }
+
+    static String getTestName() {
+        return getTestClass() + "::test";
+    }
+
+    static class TestMain {
+        public static void main(String[] args) {
+            for (int i = 0; i < 10_000; i++) {
+                test(i);
+            }
+        }
+
+        static void test(int i) {
+            if ((i % 1000) == 0) {
+                System.out.println("Hello World!");
+            }
+        }
+    }
+}

From b41146cd1e5d412f69b893bfb2fd65b6206bb0d2 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 20 Nov 2025 09:32:57 +0000
Subject: [PATCH 265/512] 8367531: Template Framework: use scopes and tokens
 instead of misbehaving immediate-return-queries

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: rcastanedalo, mhaessig, chagedorn
---
 .../arguments/TestMethodArguments.java        |    4 +-
 .../jtreg/compiler/igvn/ExpressionFuzzer.java |   16 +-
 .../lib/template_framework/AddNameToken.java  |    4 +
 .../lib/template_framework/CodeFrame.java     |  123 +-
 .../lib/template_framework/DataName.java      |  219 +-
 .../compiler/lib/template_framework/Hook.java |   92 +-
 .../template_framework/HookAnchorToken.java   |    5 +-
 .../template_framework/HookInsertToken.java   |    6 +-
 .../HookIsAnchoredToken.java                  |   37 +
 .../lib/template_framework/LetToken.java      |   38 +
 .../template_framework/NameCountToken.java    |   39 +
 .../template_framework/NameForEachToken.java  |   41 +
 .../template_framework/NameHasAnyToken.java   |   39 +
 .../template_framework/NameSampleToken.java   |   43 +
 .../lib/template_framework/NameSet.java       |    1 +
 .../template_framework/NamesToListToken.java  |   41 +
 .../lib/template_framework/Renderer.java      |  187 +-
 .../{TemplateBody.java => ScopeToken.java}    |   10 +-
 .../template_framework/ScopeTokenImpl.java    |   42 +
 ...othingToken.java => SetFuelCostToken.java} |    5 +-
 .../template_framework/StructuralName.java    |  161 +-
 .../lib/template_framework/Template.java      |  510 ++--
 .../lib/template_framework/TemplateFrame.java |  111 +-
 .../lib/template_framework/TemplateToken.java |   10 +-
 .../lib/template_framework/Token.java         |   29 +-
 .../lib/template_framework/TokenParser.java   |    2 +-
 .../library/Expression.java                   |    4 +-
 .../library/PrimitiveType.java                |    4 +-
 .../library/TestFrameworkClass.java           |   10 +-
 .../superword/TestAliasingFuzzer.java         |   66 +-
 .../examples/TestAdvanced.java                |    6 +-
 .../examples/TestExpressions.java             |    4 +-
 .../examples/TestPrimitiveTypes.java          |   31 +-
 .../examples/TestSimple.java                  |    4 +-
 .../examples/TestTutorial.java                |  836 +++++--
 .../examples/TestWithTestFrameworkClass.java  |    6 +-
 .../tests/TestExpression.java                 |    8 +-
 .../template_framework/tests/TestFormat.java  |    6 +-
 .../tests/TestTemplate.java                   | 2207 ++++++++++++++---
 39 files changed, 3988 insertions(+), 1019 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/HookIsAnchoredToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/LetToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NameCountToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NameForEachToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NameHasAnyToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NameSampleToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NamesToListToken.java
 rename test/hotspot/jtreg/compiler/lib/template_framework/{TemplateBody.java => ScopeToken.java} (78%)
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/ScopeTokenImpl.java
 rename test/hotspot/jtreg/compiler/lib/template_framework/{NothingToken.java => SetFuelCostToken.java} (89%)

diff --git a/test/hotspot/jtreg/compiler/arguments/TestMethodArguments.java b/test/hotspot/jtreg/compiler/arguments/TestMethodArguments.java
index 6ff830e85c6..306d0176aad 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestMethodArguments.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestMethodArguments.java
@@ -60,7 +60,7 @@ public class TestMethodArguments {
                 : IntStream.range(0, numberOfArguments)
                         .mapToObj(i -> "x" + i)
                         .collect(Collectors.joining(" + "));
-        return Template.make(() -> Template.body(
+        return Template.make(() -> Template.scope(
                 Template.let("type", type.name()),
                 Template.let("boxedType", type.boxedTypeName()),
                 Template.let("arguments", arguments),
@@ -115,7 +115,7 @@ public class TestMethodArguments {
             tests.add(generateTest(CodeGenerationDataNameType.longs(), i / 2).asToken());
             tests.add(generateTest(CodeGenerationDataNameType.doubles(), i / 2).asToken());
         }
-        return Template.make(() -> Template.body(
+        return Template.make(() -> Template.scope(
                 Template.let("classpath", comp.getEscapedClassPathOfCompiledClasses()),
                 """
                 import java.util.Arrays;
diff --git a/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java b/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java
index 60b11e8ffbc..40bfb2e4319 100644
--- a/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java
+++ b/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java
@@ -45,7 +45,7 @@ import java.util.stream.IntStream;
 import compiler.lib.compile_framework.*;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 import static compiler.lib.template_framework.Template.$;
 import compiler.lib.template_framework.library.CodeGenerationDataNameType;
@@ -99,7 +99,7 @@ public class ExpressionFuzzer {
 
         // Create the body for the test. We use it twice: compiled and reference.
         // Execute the expression and catch expected Exceptions.
-        var bodyTemplate = Template.make("expression", "arguments", "checksum", (Expression expression, List<Object> arguments, String checksum) -> body(
+        var bodyTemplate = Template.make("expression", "arguments", "checksum", (Expression expression, List<Object> arguments, String checksum) -> scope(
             """
             try {
             """,
@@ -167,14 +167,14 @@ public class ExpressionFuzzer {
                 default -> throw new RuntimeException("not handled: " + type.name());
             };
             StringPair cmp = cmps.get(RANDOM.nextInt(cmps.size()));
-            return body(
+            return scope(
                 ", ", cmp.s0(), type.con(), cmp.s1()
             );
         });
 
         // Checksum method: returns not just the value, but also does some range / bit checks.
         //                  This gives us enhanced verification on the range / bits of the result type.
-        var checksumTemplate = Template.make("expression", "checksum", (Expression expression, String checksum) -> body(
+        var checksumTemplate = Template.make("expression", "checksum", (Expression expression, String checksum) -> scope(
             let("returnType", expression.returnType),
             """
             @ForceInline
@@ -201,7 +201,7 @@ public class ExpressionFuzzer {
 
         // We need to prepare some random values to pass into the test method. We generate the values
         // once, and pass the same values into both the compiled and reference method.
-        var valueTemplate = Template.make("name", "type", (String name, CodeGenerationDataNameType type) -> body(
+        var valueTemplate = Template.make("name", "type", (String name, CodeGenerationDataNameType type) -> scope(
             "#type #name = ",
             (type instanceof PrimitiveType pt) ? pt.callLibraryRNG() : type.con(),
             ";\n"
@@ -213,7 +213,7 @@ public class ExpressionFuzzer {
         //
         // To ensure that both the compiled and reference method use the same constraint, we put
         // the computation in a ForceInline method.
-        var constrainArgumentMethodTemplate = Template.make("name", "type", (String name, CodeGenerationDataNameType type) -> body(
+        var constrainArgumentMethodTemplate = Template.make("name", "type", (String name, CodeGenerationDataNameType type) -> scope(
             """
             @ForceInline
             public static #type constrain_#name(#type v) {
@@ -247,7 +247,7 @@ public class ExpressionFuzzer {
             """
         ));
 
-        var constrainArgumentTemplate = Template.make("name", (String name) -> body(
+        var constrainArgumentTemplate = Template.make("name", (String name) -> scope(
             """
             #name = constrain_#name(#name);
             """
@@ -279,7 +279,7 @@ public class ExpressionFuzzer {
                     }
                 }
             }
-            return body(
+            return scope(
                 let("methodArguments",
                     methodArguments.stream().map(ma -> ma.name).collect(Collectors.joining(", "))),
                 let("methodArgumentsWithTypes",
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java
index 4f1f7e569bf..ceb1cc263fc 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java
@@ -23,4 +23,8 @@
 
 package compiler.lib.template_framework;
 
+/**
+ * Represents the addition of the specified {@link Name} to the current scope,
+ * or an outer scope if the inner scope is transparent to {@link Name}s.
+ */
 record AddNameToken(Name name) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java b/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java
index 5c4ff55614f..765e9bc42ba 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java
@@ -29,22 +29,96 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The {@link CodeFrame} represents a frame (i.e. scope) of code, appending {@link Code} to the {@code 'codeList'}
+ * The {@link CodeFrame} represents a frame (i.e. scope) of generated code by appending {@link Code} to the {@link #codeList}
  * as {@link Token}s are rendered, and adding names to the {@link NameSet}s with {@link Template#addStructuralName}/
- * {@link Template#addDataName}. {@link Hook}s can be added to a frame, which allows code to be inserted at that
- * location later. When a {@link Hook} is {@link Hook#anchor}ed, it separates the Template into an outer and inner
- * {@link CodeFrame}, ensuring that names that are added inside the inner frame are only available inside that frame.
+ * {@link Template#addDataName}. {@link Hook}s can be added to a code frame, which allows code to be inserted at that
+ * location later.
  *
  * <p>
- * On the other hand, each {@link TemplateFrame} represents the frame (or scope) of exactly one use of a
- * Template.
+ * The {@link CodeFrame} thus implements the {@link Name} non-transparency aspect of {@link ScopeToken}.
  *
  * <p>
- * For simple Template nesting, the {@link CodeFrame}s and {@link TemplateFrame}s overlap exactly.
- * However, when using {@link Hook#insert}, we simply nest {@link TemplateFrame}s, going further "in",
- * but we jump to an outer {@link CodeFrame}, ensuring that we insert {@link Code} at the outer frame,
- * and operating on the names of the outer frame. Once the {@link Hook#insert}ion is complete, we jump
- * back to the caller {@link TemplateFrame} and {@link CodeFrame}.
+ * The {@link CodeFrame}s are nested relative to the order of the final rendered code. This can
+ * diverge from the nesting order of the {@link Template} when using {@link Hook#insert}, where
+ * the execution jumps from the current (caller) {@link CodeFrame} scope to the scope of the
+ * {@link Hook#anchor}. This ensures that the {@link Name}s of the anchor scope are accessed,
+ * and not the ones from the caller scope. Once the {@link Hook#insert}ion is complete, we
+ * jump back to the caller {@link CodeFrame}.
+ *
+ * <p>
+ * Note, that {@link CodeFrame}s and {@link TemplateFrame}s often go together. But they do diverge when
+ * we call {@link Hook#insert}. On the {@link CodeFrame} side, the inserted scope is nested in the anchoring
+ * scope, so that the inserted scope has access to the Names of the anchoring scope, and not the caller
+ * scope. But the {@link TemplateFrame} of the inserted scope is nested in the caller scope, so
+ * that the inserted scope has access to hashtag replacements of the caller scope, and not the
+ * anchoring scope.
+ */
+
+/*
+ * Below, we look at an example, and show the use of CodeFrames (c) and TemplateFrames (t).
+ *
+ * Explanations:
+ *  - Generally, every scope has a CodeFrame and a TemplateFrame. There can be multiple
+ *    scopes inside a Template, and so there can be multiple CodeFrames and TemplateFrames.
+ *    In the drawing below, we draw the frames vertically, and give each a unique id.
+ *  - When we nest scopes inside scopes, we create a new CodeFrame and a new TemplateFrame,
+ *    and so they grow the same nested structure. Example: t3 is nested inside t2 and
+ *    c3 is nested inside c2b.
+ *  - The exception to this:
+ *    - At a hook.anchor, there are two CodeFrames. The first one (e.g. c2a) we call the
+ *      hook CodeFrame, it is kept empty until we insert code to the hook. The second
+ *      (e.g. c2b) we call the inner CodeFrame of the anchoring, into which we keep
+ *      generating the code that is inside the scope of the hook.anchor.
+ *    - At a hook.insert, the TemplateFrame (e.g. t4) is nested into the caller (e.g. t3),
+ *      while the CodeFrame (e.g. c4) is nested into the anchoring CodeFrame (e.g. c2a).
+ *
+ * Template(
+ *   t1 c1
+ *   t1 c1
+ *   t1 c1  Anchoring Scope
+ *   t1 c1  hook.anchor(scope(
+ *   t1 c1  t2 c2a
+ *   t1 c1  t2 c2a <------ CodeFrame nesting--------+
+ *   t1 c1  t2 c2a         with generated code      |
+ *   t1 c1  t2             and Names                |
+ *   t1 c1  t2  ^                                   |
+ *   t1 c1  t2  +- Two CodeFramees                  |
+ *   t1 c1  t2  v                                   |
+ *   t1 c1  t2                                      |
+ *   t1 c1  t2 c2b                                  |
+ *   t1 c1  t2 c2b                                  |
+ *   t1 c1  t2 c2b     Caller Scope                 |
+ *   t1 c1  t2 c2b ... scope(                       |
+ *   t1 c1  t2 c2b ... t3 c3                        |     Insertion Scope
+ *   t1 c1  t2 c2b ... t3 c3                        |     hook.insert(transparentScope(
+ *   t1 c1  t2 c2b ... t3 c3                        |     t4     c4
+ *   t1 c1  t2 c2b ... t3 c3                        +---- t4 ----c4
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4
+ *   t1 c1  t2 c2b ... t3 c3 <-- TemplateFrame nesting ---t4     c4
+ *   t1 c1  t2 c2b ... t3 c3     with hashtag             t4     c4                            // t: Concerns Template Frame
+ *   t1 c1  t2 c2b ... t3 c3     and setFuelCost          t4     c4                            // c: Concerns Code Frame
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4 "use hashtag #x"           -> t: hashtag queried in Insertion (t4) and Caller Scope (t3)
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4                               c: code added to Anchoring Scope (c2a)
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4 let("x", 42)               -> t: hashtag definition escapes to Caller Scope (t3) because
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4                                  Insertion Scope is transparent
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4 dataNames(...)...sample()  -> c: sample from Insertion (c4) and Anchoring Scope (c2a)
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4                                  (CodeFrame nesting: c2a -> c4)
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4 addDataName(...)           -> c: names escape to the Caller Scope (c3) because
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4                                  Insertion Scope is transparent
+ *   t1 c1  t2 c2b ... t3 c3                              t4     c4
+ *   t1 c1  t2 c2b ... t3 c3                              ))
+ *   t1 c1  t2 c2b ... t3 c3
+ *   t1 c1  t2 c2b ... t3 c3
+ *   t1 c1  t2 c2b ... )
+ *   t1 c1  t2 c2b
+ *   t1 c1  t2 c2b
+ *   t1 c1  ))
+ *   t1 c1
+ *   t1 c1
+ * )
+ *
  */
 class CodeFrame {
     public final CodeFrame parent;
@@ -78,25 +152,16 @@ class CodeFrame {
     }
 
     /**
-     * Creates a normal frame, which has a {@link #parent} and which defines an inner
-     * {@link NameSet}, for the names that are generated inside this frame. Once this
-     * frame is exited, the name from inside this frame are not available anymore.
+     * Creates a normal frame, which has a {@link #parent}. It can either be
+     * transparent for names, meaning that names are added and accessed to and
+     * from an outer frame. Names that are added in a transparent frame are
+     * still available in the outer frames, as far out as the next non-transparent
+     * frame. If a frame is non-transparent, this frame defines an inner
+     * {@link NameSet}, for the names that are generated inside this frame. Once
+     * this frame is exited, the names from inside this frame are not available.
      */
-    public static CodeFrame make(CodeFrame parent) {
-        return new CodeFrame(parent, false);
-    }
-
-    /**
-     * Creates a special frame, which has a {@link #parent} but uses the {@link NameSet}
-     * from the parent frame, allowing {@link Template#addDataName}/
-     * {@link Template#addStructuralName} to persist in the outer frame when the current frame
-     * is exited. This is necessary for {@link Hook#insert},  where we would possibly want to
-     * make field or variable definitions during the insertion that are not just local to the
-     * insertion but affect the {@link CodeFrame} that we {@link Hook#anchor} earlier and are
-     * now {@link Hook#insert}ing into.
-     */
-    public static CodeFrame makeTransparentForNames(CodeFrame parent) {
-        return new CodeFrame(parent, true);
+    public static CodeFrame make(CodeFrame parent, boolean isTransparentForNames) {
+        return new CodeFrame(parent, isTransparentForNames);
     }
 
     void addString(String s) {
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java b/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java
index f45a4db8a1e..4a82608567f 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java
@@ -24,6 +24,7 @@
 package compiler.lib.template_framework;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * {@link DataName}s represent things like fields and local variables, and can be added to the local
@@ -114,18 +115,36 @@ public record DataName(String name, DataName.Type type, boolean mutable, int wei
             this(mutability, null, null);
         }
 
+        // Wrap the FilteredSet as a Predicate.
+        private record DataNamePredicate(FilteredSet fs) implements NameSet.Predicate {
+            public boolean check(Name type) {
+                return fs.check(type);
+            }
+            public String toString() {
+                return fs.toString();
+            }
+        }
+
         NameSet.Predicate predicate() {
             if (subtype == null && supertype == null) {
                 throw new UnsupportedOperationException("Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
             }
-            return (Name name) -> {
-                if (!(name instanceof DataName dataName)) { return false; }
-                if (mutability == Mutability.MUTABLE && !dataName.mutable()) { return false; }
-                if (mutability == Mutability.IMMUTABLE && dataName.mutable()) { return false; }
-                if (subtype != null && !dataName.type().isSubtypeOf(subtype)) { return false; }
-                if (supertype != null && !supertype.isSubtypeOf(dataName.type())) { return false; }
-                return true;
-            };
+            return new DataNamePredicate(this);
+        }
+
+        boolean check(Name name) {
+            if (!(name instanceof DataName dataName)) { return false; }
+            if (mutability == Mutability.MUTABLE && !dataName.mutable()) { return false; }
+            if (mutability == Mutability.IMMUTABLE && dataName.mutable()) { return false; }
+            if (subtype != null && !dataName.type().isSubtypeOf(subtype)) { return false; }
+            if (supertype != null && !supertype.isSubtypeOf(dataName.type())) { return false; }
+            return true;
+        }
+
+        public String toString() {
+            String msg1 = (subtype == null) ? "" : ", subtypeOf(" + subtype + ")";
+            String msg2 = (supertype == null) ? "" : ", supertypeOf(" + supertype + ")";
+            return "DataName.FilterdSet(" + mutability + msg1 + msg2 + ")";
         }
 
         /**
@@ -173,55 +192,179 @@ public record DataName(String name, DataName.Type type, boolean mutable, int wei
 
         /**
          * Samples a random {@link DataName} from the filtered set, according to the weights
-         * of the contained {@link DataName}s.
+         * of the contained {@link DataName}s, making the sampled {@link DataName}
+         * available to an inner scope.
          *
-         * @return The sampled {@link DataName}.
-         * @throws UnsupportedOperationException If the type was not constrained with either of
-         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
-         * @throws RendererException If the set was empty.
-         */
-        public DataName sample() {
-            DataName n = (DataName)Renderer.getCurrent().sampleName(predicate());
-            if (n == null) {
-                String msg1 = (subtype == null) ? "" : ", subtypeOf(" + subtype + ")";
-                String msg2 = (supertype == null) ? "" : ", supertypeOf(" + supertype + ")";
-                throw new RendererException("No variable: " + mutability + msg1 + msg2 + ".");
-            }
-            return n;
-        }
-
-        /**
-         * Counts the number of {@link DataName}s in the filtered set.
-         *
-         * @return The number of {@link DataName}s in the filtered set.
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the sampled {@link DataName}.
+         * @return a token that represents the sampling and inner scope.
          * @throws UnsupportedOperationException If the type was not constrained with either of
          *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
          */
-        public int count() {
-            return Renderer.getCurrent().countNames(predicate());
+        public Token sample(Function<DataName, ScopeToken> function) {
+            return new NameSampleToken<>(predicate(), null, null, function);
         }
 
         /**
-         * Checks if there are any {@link DataName}s in the filtered set.
+         * Samples a random {@link DataName} from the filtered set, according to the weights
+         * of the contained {@link DataName}s, and makes a hashtag replacement for both
+         * the name and type of the {@link DataName}, in the current scope.
          *
-         * @return Returns {@code true} iff there is at least one {@link DataName} in the filtered set.
+         * <p>
+         * Note, that the following two do the equivalent:
+         *
+         * <p>
+         * {@snippet lang=java :
+         * var template = Template.make(() -> scope(
+         *     dataNames(MUTABLE).subtypeOf(type).sampleAndLetAs("name", "type"),
+         *     """
+         *     #name #type
+         *     """
+         * ));
+         * }
+         *
+         * <p>
+         * {@snippet lang=java :
+         * var template = Template.make(() -> scope(
+         *     dataNames(MUTABLE).subtypeOf(type).sample((DataName dn) -> transparentScope(
+         *         // The "let" hashtag definitions escape the "transparentScope".
+         *         let("name", dn.name()),
+         *         let("type", dn.type())
+         *     )),
+         *     """
+         *     #name #type
+         *     """
+         * ));
+         * }
+         *
+         * @param name the key of the hashtag replacement for the {@link DataName} name.
+         * @param type the key of the hashtag replacement for the {@link DataName} type.
+         * @return a token that represents the sampling and hashtag replacement definition.
          * @throws UnsupportedOperationException If the type was not constrained with either of
          *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
          */
-        public boolean hasAny() {
-            return Renderer.getCurrent().hasAnyNames(predicate());
+        public Token sampleAndLetAs(String name, String type) {
+            return new NameSampleToken<DataName>(predicate(), name, type, n -> Template.transparentScope());
         }
 
         /**
-         * Collects all {@link DataName}s in the filtered set.
+         * Samples a random {@link DataName} from the filtered set, according to the weights
+         * of the contained {@link DataName}s, and makes a hashtag replacement for the
+         * name of the {@link DataName}, in the current scope.
          *
+         * <p>
+         * Note, that the following two do the equivalent:
+         *
+         * <p>
+         * {@snippet lang=java :
+         * var template = Template.make(() -> scope(
+         *     dataNames(MUTABLE).subtypeOf(type).sampleAndLetAs("name"),
+         *     """
+         *     #name
+         *     """
+         * ));
+         * }
+         *
+         * <p>
+         * {@snippet lang=java :
+         * var template = Template.make(() -> scope(
+         *     dataNames(MUTABLE).subtypeOf(type).sample((DataName dn) -> transparentScope(
+         *         // The "let" hashtag definition escape the "transparentScope".
+         *         let("name", dn.name())
+         *     )),
+         *     """
+         *     #name
+         *     """
+         * ));
+         * }
+         *
+         * @param name the key of the hashtag replacement for the {@link DataName} name.
+         * @return a token that represents the sampling and hashtag replacement definition.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token sampleAndLetAs(String name) {
+            return new NameSampleToken<DataName>(predicate(), name, null, n -> Template.transparentScope());
+        }
+
+        /**
+         * Counts the number of {@link DataName}s in the filtered set, making the count
+         * available to an inner scope.
+         *
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the count.
+         * @return a token that represents the counting and inner scope.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token count(Function<Integer, ScopeToken> function) {
+            return new NameCountToken(predicate(), function);
+        }
+
+        /**
+         * Checks if there are any {@link DataName}s in the filtered set, making the resulting boolean
+         * available to an inner scope.
+         *
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the boolean indicating iff there are any {@link DataName}s in the filtered set.
+         * @return a token that represents the checking and inner scope.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token hasAny(Function<Boolean, ScopeToken> function) {
+            return new NameHasAnyToken(predicate(), function);
+        }
+
+        /**
+         * Collects all {@link DataName}s in the filtered set, making the collected list
+         * available to an inner scope.
+         *
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the list of {@link DataName}.
          * @return A {@link List} of all {@link DataName}s in the filtered set.
          * @throws UnsupportedOperationException If the type was not constrained with either of
          *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
          */
-        public List<DataName> toList() {
-            List<Name> list = Renderer.getCurrent().listNames(predicate());
-            return list.stream().map(n -> (DataName)n).toList();
+        public Token toList(Function<List<DataName>, ScopeToken> function) {
+            return new NamesToListToken<>(predicate(), function);
+        }
+
+        /**
+         * Calls the provided {@code function} for each {@link DataName}s in the filtered set,
+         * making each of these {@link DataName}s available to a separate inner scope.
+         *
+         * @param function The {@link Function} that is called to create the inner {@link ScopeToken}s
+         *                 for each of the {@link DataName}s in the filtered set.
+         * @return The token representing the for-each execution and the respective inner scopes.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token forEach(Function<DataName, ScopeToken> function) {
+            return new NameForEachToken<>(predicate(), null, null, function);
+        }
+
+        /**
+         * Calls the provided {@code function} for each {@link DataName}s in the filtered set,
+         * making each of these {@link DataName}s available to a separate inner scope, and additionally
+         * setting hashtag replacements for the {@code name} and {@code type} of the respective
+         * {@link DataName}s.
+         *
+         * <p>
+         * Note, to avoid duplication of the {@code name} and {@code type}
+         * hashtag replacements, the scope created by the provided {@code function} should be
+         * non-transparent to hashtag replacements, for example {@link Template#scope} or
+         * {@link Template#hashtagScope}.
+         *
+         * @param name the key of the hashtag replacement for each individual {@link DataName} name.
+         * @param type the key of the hashtag replacement for each individual {@link DataName} type.
+         * @param function The {@link Function} that is called to create the inner {@link ScopeToken}s
+         *                 for each of the {@link DataName}s in the filtereds set.
+         * @return The token representing the for-each execution and the respective inner scopes.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token forEach(String name, String type, Function<DataName, ScopeToken> function) {
+            return new NameForEachToken<>(predicate(), name, type, function);
         }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java b/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java
index 8ee2689eb2f..ef5a5df6ce0 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java
@@ -23,59 +23,84 @@
 
 package compiler.lib.template_framework;
 
+import java.util.function.Function;
+
 /**
- * {@link Hook}s can be {@link #anchor}ed for a certain scope in a Template, and all nested
- * Templates in this scope, and then from within this scope, any Template can
- * {@link #insert} code to where the {@link Hook} was {@link #anchor}ed. This can be useful to reach
- * "back" or to some outer scope, e.g. while generating code for a method, one can reach out
- * to the class scope to insert fields.
+ * A {@link Hook} can be {@link #anchor}ed for a certain scope ({@link ScopeToken}), and that
+ * anchoring stays active for any nested scope or nested {@link Template}. With {@link #insert},
+ * one can insert a template ({@link TemplateToken}) or scope ({@link ScopeToken}) to where the
+ * {@link Hook} was {@link #anchor}'ed. If the hook was anchored for multiple outer scopes, the
+ * innermost is chosen for insertion.
  *
  * <p>
+ * This can be useful to reach "back" or to some outer scope, e.g. while generating code for a
+ * method, one can reach out to the class scope to insert fields. Or one may want to reach back
+ * to the beginning of a method to insert local variables that should be live for the whole method.
+ *
+ * <p>
+ * The choice of {@link ScopeToken} is very important and powerful.
+ * For example, if you want to insert a {@link DataName} to the scope of an anchor,
+ * it is important that the scope of the insertion is transparent for {@link DataName}s,
+ * e.g. using {@link Template#transparentScope}. In most cases, we want {@link DataName}s to escape
+ * the inserted scope but not the anchor scope, so the anchor scope should be
+ * non-transparent for {@link DataName}s, e.g. using {@link Template#scope}.
  * Example:
+ *
+ * <p>
  * {@snippet lang=java :
  * var myHook = new Hook("MyHook");
  *
- * var template1 = Template.make("name", (String name) -> body(
- *     """
- *     public static int #name = 42;
- *     """
- * ));
- *
- * var template2 = Template.make(() -> body(
+ * var template = Template.make(() -> scope(
  *     """
  *     public class Test {
  *     """,
  *     // Anchor the hook here.
- *     myHook.anchor(
+ *     myHook.anchor(scope(
  *         """
  *         public static void main(String[] args) {
  *         System.out.println("$field: " + $field)
  *         """,
- *         // Reach out to where the hook was anchored, and insert the code of template1.
- *         myHook.insert(template1.asToken($("field"))),
+ *         // Reach out to where the hook was anchored, and insert some code.
+ *         myHook.insert(transparentScope(
+ *             // The field (DataName) escapes because the inserted scope is "transparentScope"
+ *             addDataName($("field"), Primitives.INTS, MUTABLE),
+ *             """
+ *             public static int $field = 42;
+ *             """
+ *         )),
  *         """
  *         }
  *         """
- *     ),
+ *     )),
  *     """
  *     }
  *     """
  * ));
  * }
  *
+ * <p>
+ * Note that if we use {@link #insert} with {@link Template#transparentScope}, then
+ * {@link DataName}s  and {@link StructuralName}s escape from the inserted scope to the
+ * anchor scope, but hashtag replacements and {@link Template#setFuelCost} escape to
+ * the caller, i.e. from where we inserted the scope. This makes sense if we consider
+ * {@link DataName}s belonging to the structure of the generated code and the inserted
+ * scope belonging to the anchor scope. On the other hand, hashtag replacements and
+ * {@link Template#setFuelCost} rather belong to the code generation that happens
+ * within the context of a template.
+ *
  * @param name The name of the Hook, for debugging purposes only.
  */
 public record Hook(String name) {
     /**
-     * Anchor this {@link Hook} for the scope of the provided {@code 'tokens'}.
+     * Anchor this {@link Hook} for the provided inner scope.
      * From anywhere inside this scope, even in nested Templates, code can be
      * {@link #insert}ed back to the location where this {@link Hook} was {@link #anchor}ed.
      *
-     * @param tokens A list of tokens, which have the same restrictions as {@link Template#body}.
-     * @return A {@link Token} that captures the anchoring of the scope and the list of validated {@link Token}s.
+     * @param innerScope An inner scope, for which the {@link Hook} is anchored.
+     * @return A {@link Token} that captures the anchoring and the inner scope.
      */
-    public Token anchor(Object... tokens) {
-        return new HookAnchorToken(this, TokenParser.parse(tokens));
+    public Token anchor(ScopeToken innerScope) {
+        return new HookAnchorToken(this, innerScope);
     }
 
     /**
@@ -83,18 +108,31 @@ public record Hook(String name) {
      * This could be in the same Template, or one nested further out.
      *
      * @param templateToken The Template with applied arguments to be inserted at the {@link Hook}.
-     * @return The {@link Token} which when used inside a {@link Template#body} performs the code insertion into the {@link Hook}.
+     * @return The {@link Token} which represents the code insertion into the {@link Hook}.
      */
     public Token insert(TemplateToken templateToken) {
-        return new HookInsertToken(this, templateToken);
+        return new HookInsertToken(this, Template.transparentScope(templateToken));
     }
 
     /**
-     * Checks if the {@link Hook} was {@link Hook#anchor}ed for the current scope or an outer scope.
+     * Inserts a scope ({@link ScopeToken}) to the innermost location where this {@link Hook} was {@link #anchor}ed.
+     * This could be in the same Template, or one nested further out.
      *
-     * @return If the {@link Hook} was {@link Hook#anchor}ed for the current scope or an outer scope.
+     * @param scopeToken The scope to be inserted at the {@link Hook}.
+     * @return The {@link Token} which represents the code insertion into the {@link Hook}.
      */
-    public boolean isAnchored() {
-        return Renderer.getCurrent().isAnchored(this);
+    public Token insert(ScopeToken scopeToken) {
+        return new HookInsertToken(this, scopeToken);
+    }
+
+    /**
+     * Checks if the {@link Hook} was {@link Hook#anchor}ed for the current scope or an outer scope,
+     * and makes the boolean result available to an inner scope.
+     *
+     * @param function the function that generates the inner scope given the boolean result.
+     * @return the token that represents the check and inner scope.
+     */
+    public Token isAnchored(Function<Boolean, ScopeToken> function) {
+        return new HookIsAnchoredToken(this, function);
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java
index b025c5ff041..4979365b3d0 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java
@@ -25,4 +25,7 @@ package compiler.lib.template_framework;
 
 import java.util.List;
 
-record HookAnchorToken(Hook hook, List<Token> tokens) implements Token {}
+/**
+ * Represents the {@link Hook#anchor} with its inner scope.
+ */
+record HookAnchorToken(Hook hook, ScopeToken innerScope) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java
index de8b60bbf24..a433d472a6e 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java
@@ -23,4 +23,8 @@
 
 package compiler.lib.template_framework;
 
-record HookInsertToken(Hook hook, TemplateToken templateToken) implements Token {}
+/**
+ * Represents the {@link Hook#insert} with the {@link ScopeToken} of the
+ * scope that is to be inserted.
+ */
+record HookInsertToken(Hook hook, ScopeToken scopeToken) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/HookIsAnchoredToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/HookIsAnchoredToken.java
new file mode 100644
index 00000000000..5c7b92ec1fe
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/HookIsAnchoredToken.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+
+/**
+ * Represents an {@link Hook#isAnchored} query with the function that creates an inner scope
+ * given the boolean answer.
+ */
+record HookIsAnchoredToken(Hook hook, Function<Boolean, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken(boolean isAnchored) {
+        return function().apply(isAnchored);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/LetToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/LetToken.java
new file mode 100644
index 00000000000..ee18dd440b7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/LetToken.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+
+/**
+ * Represents a let (aka hashtag) definition. The hashtag replacement is active for the
+ * scope ({@link ScopeToken}) that the {@code function} creates, but can escape that
+ * scope if it is transparent to hashtags.
+ */
+record LetToken<T>(String key, T value, Function<T, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken() {
+        return function().apply(value);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NameCountToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/NameCountToken.java
new file mode 100644
index 00000000000..f0344efdd08
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NameCountToken.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+
+/**
+ * Represents the counting of {@link Name}s, and the function that is called
+ * to create an inner scope given the count.
+ */
+record NameCountToken(
+        NameSet.Predicate predicate,
+        Function<Integer, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken(int count) {
+        return function().apply(count);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NameForEachToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/NameForEachToken.java
new file mode 100644
index 00000000000..0e629740be1
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NameForEachToken.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+
+/**
+ * Represents the for-each execution of the provided function and (optional) hashtag replacement
+ * keys for name and type of each name.
+ */
+record NameForEachToken<N>(
+        NameSet.Predicate predicate,
+        String name,
+        String type,
+        Function<N, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken(Name n) {
+        return function().apply((N)n);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NameHasAnyToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/NameHasAnyToken.java
new file mode 100644
index 00000000000..a31990af210
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NameHasAnyToken.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+
+/**
+ * Represents the check if there is any name and the function that is to
+ * be called given the boolean value (true iff there are any names).
+ */
+record NameHasAnyToken(
+        NameSet.Predicate predicate,
+        Function<Boolean, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken(boolean hasAny) {
+        return function().apply(hasAny);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NameSampleToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/NameSampleToken.java
new file mode 100644
index 00000000000..0b01f00fcd9
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NameSampleToken.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+
+/**
+ * Represents the sampling of {@link Name}s, and the function that is called given
+ * the sampled name, as well as the (optional) hashtag replacement keys for the
+ * name and type of the sampled name, which are then available in the inner scope
+ * created by the provided function.
+ */
+record NameSampleToken<N>(
+        NameSet.Predicate predicate,
+        String name,
+        String type,
+        Function<N, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken(Name n) {
+        return function().apply((N)n);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java b/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java
index ef79c33d48a..403dbdc694f 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java
@@ -43,6 +43,7 @@ class NameSet {
 
     interface Predicate {
         boolean check(Name type);
+        String toString(); // used when sampling fails.
     }
 
     NameSet(NameSet parent) {
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NamesToListToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/NamesToListToken.java
new file mode 100644
index 00000000000..40710a01297
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NamesToListToken.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.function.Function;
+import java.util.List;
+
+/**
+ * Represents the {@code toList} on a filtered name set, including the collection of the
+ * names and the creation of the inner scope with the function.
+ */
+record NamesToListToken<N>(
+        NameSet.Predicate predicate,
+        Function<List<N>, ScopeToken> function) implements Token {
+
+    ScopeToken getScopeToken(List<Name> names) {
+        List<N> castNames = names.stream().map(n -> (N)n).toList();
+        return function().apply(castNames);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java b/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
index 14adfc81d3f..61ab9ab343c 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
@@ -76,7 +76,7 @@ final class Renderer {
      * <p>
      * When using nested templates, the user of the Template Framework may be tempted to first render
      * the nested template to a {@link String}, and then use this {@link String} as a token in an outer
-     * {@link Template#body}. This would be a bad pattern: the outer and nested {@link Template} would
+     * {@link Template#scope}. This would be a bad pattern: the outer and nested {@link Template} would
      * be rendered separately, and could not interact. For example, the nested {@link Template} would
      * not have access to the scopes of the outer {@link Template}. The inner {@link Template} could
      * not access {@link Name}s and {@link Hook}s from the outer {@link Template}. The user might assume
@@ -84,8 +84,8 @@ final class Renderer {
      * be separated. This could lead to unexpected behavior or even bugs.
      *
      * <p>
-     * Instead, the user should create a {@link TemplateToken} from the inner {@link Template}, and
-     * use that {@link TemplateToken} in the {@link Template#body} of the outer {@link Template}.
+     * Instead, the user must create a {@link TemplateToken} from the inner {@link Template}, and
+     * use that {@link TemplateToken} in the {@link Template#scope} of the outer {@link Template}.
      * This way, the inner and outer {@link Template}s get rendered together, and the inner {@link Template}
      * has access to the {@link Name}s and {@link Hook}s of the outer {@link Template}.
      *
@@ -113,7 +113,7 @@ final class Renderer {
 
     static Renderer getCurrent() {
         if (renderer == null) {
-            throw new RendererException("A Template method such as '$', 'let', 'sample', 'count' etc. was called outside a template rendering.");
+            throw new RendererException("A Template method such as '$', 'fuel', etc. was called outside a template rendering call.");
         }
         return renderer;
     }
@@ -171,26 +171,6 @@ final class Renderer {
         return currentTemplateFrame.fuel;
     }
 
-    void setFuelCost(float fuelCost) {
-        currentTemplateFrame.setFuelCost(fuelCost);
-    }
-
-    Name sampleName(NameSet.Predicate predicate) {
-        return currentCodeFrame.sampleName(predicate);
-    }
-
-    int countNames(NameSet.Predicate predicate) {
-        return currentCodeFrame.countNames(predicate);
-    }
-
-    boolean hasAnyNames(NameSet.Predicate predicate) {
-        return currentCodeFrame.hasAnyNames(predicate);
-    }
-
-    List<Name> listNames(NameSet.Predicate predicate) {
-        return currentCodeFrame.listNames(predicate);
-    }
-
     /**
      * Formats values to {@link String} with the goal of using them in Java code.
      * By default, we use the overrides of {@link Object#toString}.
@@ -243,12 +223,16 @@ final class Renderer {
     }
 
     private void renderTemplateToken(TemplateToken templateToken) {
+        // We need a TemplateFrame in all cases, this ensures that the outermost scope of the template
+        // is not transparent for hashtags and setFuelCost, and also that the id of the template is
+        // unique.
         TemplateFrame templateFrame = TemplateFrame.make(currentTemplateFrame, nextTemplateFrameId++);
         currentTemplateFrame = templateFrame;
 
         templateToken.visitArguments((name, value) -> addHashtagReplacement(name, format(value)));
-        TemplateBody body = templateToken.instantiate();
-        renderTokenList(body.tokens());
+
+        // If the ScopeToken is transparent to Names, then the Template is transparent to names.
+        renderScopeToken(templateToken.instantiate());
 
         if (currentTemplateFrame != templateFrame) {
             throw new RuntimeException("Internal error: TemplateFrame mismatch!");
@@ -256,29 +240,76 @@ final class Renderer {
         currentTemplateFrame = currentTemplateFrame.parent;
     }
 
+    private void renderScopeToken(ScopeToken st) {
+        renderScopeToken(st, () -> {});
+    }
+
+    private void renderScopeToken(ScopeToken st, Runnable preamble) {
+        if (!(st instanceof ScopeTokenImpl(List<Token> tokens,
+                                           boolean isTransparentForNames,
+                                           boolean isTransparentForHashtags,
+                                           boolean isTransparentForSetFuelCost))) {
+            throw new RuntimeException("Internal error: could not unpack ScopeTokenImpl.");
+        }
+
+        // We need the CodeFrame for local names.
+        CodeFrame outerCodeFrame = currentCodeFrame;
+        if (!isTransparentForNames) {
+            currentCodeFrame = CodeFrame.make(currentCodeFrame, false);
+        }
+
+        // We need to be able to define local hashtag replacements, but still
+        // see the outer ones. We also need to have the same id for dollar
+        // replacement as the outer frame. And we need to be able to allow
+        // local setFuelCost definitions.
+        TemplateFrame innerTemplateFrame = null;
+        if (!isTransparentForHashtags || !isTransparentForSetFuelCost) {
+            innerTemplateFrame = TemplateFrame.makeInnerScope(currentTemplateFrame,
+                                                              isTransparentForHashtags,
+                                                              isTransparentForSetFuelCost);
+            currentTemplateFrame = innerTemplateFrame;
+        }
+
+        // Allow definition of hashtags and variables to be placed in the nested frames.
+        preamble.run();
+
+        // Now render the nested code.
+        renderTokenList(tokens);
+
+        if (!isTransparentForHashtags || !isTransparentForSetFuelCost) {
+            if (currentTemplateFrame != innerTemplateFrame) {
+                throw new RuntimeException("Internal error: TemplateFrame mismatch!");
+            }
+            currentTemplateFrame = currentTemplateFrame.parent;
+        }
+
+        // Tear down CodeFrame nesting. If no nesting happened, the code is already
+        // in the currentCodeFrame.
+        if (!isTransparentForNames) {
+            outerCodeFrame.addCode(currentCodeFrame.getCode());
+            currentCodeFrame = outerCodeFrame;
+        }
+    }
+
     private void renderToken(Token token) {
         switch (token) {
             case StringToken(String s) -> {
                 renderStringWithDollarAndHashtagReplacements(s);
             }
-            case NothingToken() -> {
-                // Nothing.
-            }
-            case HookAnchorToken(Hook hook, List<Token> tokens) -> {
+            case HookAnchorToken(Hook hook, ScopeTokenImpl innerScope) -> {
                 CodeFrame outerCodeFrame = currentCodeFrame;
 
-                // We need a CodeFrame to which the hook can insert code. That way, name
-                // definitions at the hook cannot escape the hookCodeFrame.
-                CodeFrame hookCodeFrame = CodeFrame.make(outerCodeFrame);
+                // We need a CodeFrame to which the hook can insert code. If the nested names
+                // are to be local, the CodeFrame must be non-transparent for names.
+                CodeFrame hookCodeFrame = CodeFrame.make(outerCodeFrame, innerScope.isTransparentForNames());
                 hookCodeFrame.addHook(hook);
 
-                // We need a CodeFrame where the tokens can be rendered. That way, name
-                // definitions from the tokens cannot escape the innerCodeFrame to the
-                // hookCodeFrame.
-                CodeFrame innerCodeFrame = CodeFrame.make(hookCodeFrame);
+                // We need a CodeFrame where the tokens can be rendered for code that is
+                // generated inside the anchor scope, but not inserted directly to the hook.
+                CodeFrame innerCodeFrame = CodeFrame.make(hookCodeFrame, innerScope.isTransparentForNames());
                 currentCodeFrame = innerCodeFrame;
 
-                renderTokenList(tokens);
+                renderScopeToken(innerScope);
 
                 // Close the hookCodeFrame and innerCodeFrame. hookCodeFrame code comes before the
                 // innerCodeFrame code from the tokens.
@@ -286,20 +317,20 @@ final class Renderer {
                 currentCodeFrame.addCode(hookCodeFrame.getCode());
                 currentCodeFrame.addCode(innerCodeFrame.getCode());
             }
-            case HookInsertToken(Hook hook, TemplateToken templateToken) -> {
+            case HookInsertToken(Hook hook, ScopeTokenImpl scopeToken) -> {
                 // Switch to hook CodeFrame.
                 CodeFrame callerCodeFrame = currentCodeFrame;
                 CodeFrame hookCodeFrame = codeFrameForHook(hook);
 
                 // Use a transparent nested CodeFrame. We need a CodeFrame so that the code generated
-                // by the TemplateToken can be collected, and hook insertions from it can still
-                // be made to the hookCodeFrame before the code from the TemplateToken is added to
+                // by the scopeToken can be collected, and hook insertions from it can still
+                // be made to the hookCodeFrame before the code from the scopeToken is added to
                 // the hookCodeFrame.
                 // But the CodeFrame must be transparent, so that its name definitions go out to
-                // the hookCodeFrame, and are not limited to the CodeFrame for the TemplateToken.
-                currentCodeFrame = CodeFrame.makeTransparentForNames(hookCodeFrame);
+                // the hookCodeFrame, and are not limited to the CodeFrame for the scopeToken.
+                currentCodeFrame = CodeFrame.make(hookCodeFrame, true);
 
-                renderTemplateToken(templateToken);
+                renderScopeToken(scopeToken);
 
                 hookCodeFrame.addCode(currentCodeFrame.getCode());
 
@@ -307,18 +338,68 @@ final class Renderer {
                 currentCodeFrame = callerCodeFrame;
             }
             case TemplateToken templateToken -> {
-                // Use a nested CodeFrame.
-                CodeFrame callerCodeFrame = currentCodeFrame;
-                currentCodeFrame = CodeFrame.make(currentCodeFrame);
-
                 renderTemplateToken(templateToken);
-
-                callerCodeFrame.addCode(currentCodeFrame.getCode());
-                currentCodeFrame = callerCodeFrame;
             }
             case AddNameToken(Name name) -> {
                 currentCodeFrame.addName(name);
             }
+            case ScopeToken scopeToken -> {
+                renderScopeToken(scopeToken);
+            }
+            case NameSampleToken nameScopeToken -> {
+                Name name = currentCodeFrame.sampleName(nameScopeToken.predicate());
+                if (name == null) {
+                    throw new RendererException("No Name found for " + nameScopeToken.predicate().toString());
+                }
+                ScopeToken scopeToken = nameScopeToken.getScopeToken(name);
+                renderScopeToken(scopeToken, () -> {
+                    if (nameScopeToken.name() != null) {
+                        addHashtagReplacement(nameScopeToken.name(), name.name());
+                    }
+                    if (nameScopeToken.type() != null) {
+                        addHashtagReplacement(nameScopeToken.type(), name.type());
+                    }
+                });
+            }
+            case NameForEachToken nameForEachToken -> {
+                List<Name> list = currentCodeFrame.listNames(nameForEachToken.predicate());
+                list.stream().forEach(name -> {
+                    ScopeToken scopeToken = nameForEachToken.getScopeToken(name);
+                    renderScopeToken(scopeToken, () -> {
+                        if (nameForEachToken.name() != null) {
+                            addHashtagReplacement(nameForEachToken.name(), name.name());
+                        }
+                        if (nameForEachToken.type() != null) {
+                            addHashtagReplacement(nameForEachToken.type(), name.type());
+                        }
+                    });
+                });
+            }
+            case NamesToListToken nameToListToken -> {
+                List<Name> list = currentCodeFrame.listNames(nameToListToken.predicate());
+                renderScopeToken(nameToListToken.getScopeToken(list));
+            }
+            case NameCountToken nameCountToken -> {
+                int count = currentCodeFrame.countNames(nameCountToken.predicate());
+                renderScopeToken(nameCountToken.getScopeToken(count));
+            }
+            case NameHasAnyToken nameHasAnyToken -> {
+                boolean hasAny = currentCodeFrame.hasAnyNames(nameHasAnyToken.predicate());
+                renderScopeToken(nameHasAnyToken.getScopeToken(hasAny));
+            }
+            case SetFuelCostToken(float fuelCost) -> {
+                currentTemplateFrame.setFuelCost(fuelCost);
+            }
+            case LetToken letToken -> {
+                ScopeToken scopeToken = letToken.getScopeToken();
+                renderScopeToken(scopeToken, () -> {
+                    addHashtagReplacement(letToken.key(), letToken.value());
+                });
+            }
+            case HookIsAnchoredToken hookIsAnchoredToken -> {
+                boolean isAnchored = currentCodeFrame.codeFrameForHook(hookIsAnchoredToken.hook()) != null;
+                renderScopeToken(hookIsAnchoredToken.getScopeToken(isAnchored));
+            }
         }
     }
 
@@ -423,10 +504,6 @@ final class Renderer {
         ));
     }
 
-    boolean isAnchored(Hook hook) {
-        return currentCodeFrame.codeFrameForHook(hook) != null;
-    }
-
     private CodeFrame codeFrameForHook(Hook hook) {
         CodeFrame codeFrame = currentCodeFrame.codeFrameForHook(hook);
         if (codeFrame == null) {
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java b/test/hotspot/jtreg/compiler/lib/template_framework/ScopeToken.java
similarity index 78%
rename from test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java
rename to test/hotspot/jtreg/compiler/lib/template_framework/ScopeToken.java
index 440766b3f79..f81215da36b 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/ScopeToken.java
@@ -23,12 +23,8 @@
 
 package compiler.lib.template_framework;
 
-import java.util.List;
-
 /**
- * A Template generates a {@link TemplateBody}, which is a list of {@link Token}s,
- * which are then later rendered to {@link String}s.
- *
- * @param tokens The list of {@link Token}s that are later rendered to {@link String}s.
+ * A {@link ScopeToken} represents a scope in a {@link Template}, which can be
+ * created with {@link Template#scope}, {@link Template#transparentScope}, and other related methods.
  */
-public record TemplateBody(List<Token> tokens) {}
+public sealed interface ScopeToken extends Token permits ScopeTokenImpl {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/ScopeTokenImpl.java b/test/hotspot/jtreg/compiler/lib/template_framework/ScopeTokenImpl.java
new file mode 100644
index 00000000000..df95bd56722
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/ScopeTokenImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.List;
+
+/**
+ * Represents a scope with its tokens. Boolean flags indicate if names,
+ * hashtag replacements and {@link Template#setFuelCost} are local, or escape to
+ * outer scopes.
+ *
+ * <p>
+ * Note: We want the {@link ScopeToken} to be public, but the internals of the
+ *       record should be private. One way to solve this is with a public interface
+ *       that exposes nothing but its name, and a private implementation via a
+ *       record that allows easy destructuring with pattern matching.
+ */
+record ScopeTokenImpl(List<Token> tokens,
+                      boolean isTransparentForNames,
+                      boolean isTransparentForHashtags,
+                      boolean isTransparentForSetFuelCost) implements ScopeToken, Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/SetFuelCostToken.java
similarity index 89%
rename from test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java
rename to test/hotspot/jtreg/compiler/lib/template_framework/SetFuelCostToken.java
index 540eaf1e14c..08e219b2cd9 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/SetFuelCostToken.java
@@ -23,4 +23,7 @@
 
 package compiler.lib.template_framework;
 
-record NothingToken() implements Token {}
+/**
+ * Represents the setting of the fuel cost in the current scope.
+ */
+record SetFuelCostToken(float fuelCost) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java b/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java
index 866ac6dbfb8..8a1090bc5ab 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java
@@ -24,6 +24,7 @@
 package compiler.lib.template_framework;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * {@link StructuralName}s represent things like method and class names, and can be added to the local
@@ -89,16 +90,34 @@ public record StructuralName(String name, StructuralName.Type type, int weight)
             this(null, null);
         }
 
+        // Wrap the FilteredSet as a Predicate.
+        private record StructuralNamePredicate(FilteredSet fs) implements NameSet.Predicate {
+            public boolean check(Name type) {
+                return fs.check(type);
+            }
+            public String toString() {
+                return fs.toString();
+            }
+        }
+
         NameSet.Predicate predicate() {
             if (subtype == null && supertype == null) {
                 throw new UnsupportedOperationException("Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
             }
-            return (Name name) -> {
-                if (!(name instanceof StructuralName structuralName)) { return false; }
-                if (subtype != null && !structuralName.type().isSubtypeOf(subtype)) { return false; }
-                if (supertype != null && !supertype.isSubtypeOf(structuralName.type())) { return false; }
-                return true;
-            };
+            return new StructuralNamePredicate(this);
+        }
+
+        boolean check(Name name) {
+            if (!(name instanceof StructuralName structuralName)) { return false; }
+            if (subtype != null && !structuralName.type().isSubtypeOf(subtype)) { return false; }
+            if (supertype != null && !supertype.isSubtypeOf(structuralName.type())) { return false; }
+            return true;
+        }
+
+        public String toString() {
+            String msg1 = (subtype == null) ? "" : " subtypeOf(" + subtype + ")";
+            String msg2 = (supertype == null) ? "" : " supertypeOf(" + supertype + ")";
+            return "StructuralName.FilteredSet(" + msg1 + msg2 + ")";
         }
 
         /**
@@ -146,55 +165,125 @@ public record StructuralName(String name, StructuralName.Type type, int weight)
 
         /**
          * Samples a random {@link StructuralName} from the filtered set, according to the weights
-         * of the contained {@link StructuralName}s.
+         * of the contained {@link StructuralName}s, making the sampled {@link StructuralName}
+         * available to an inner scope.
          *
-         * @return The sampled {@link StructuralName}.
-         * @throws UnsupportedOperationException If the type was not constrained with either of
-         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
-         * @throws RendererException If the set was empty.
-         */
-        public StructuralName sample() {
-            StructuralName n = (StructuralName)Renderer.getCurrent().sampleName(predicate());
-            if (n == null) {
-                String msg1 = (subtype == null) ? "" : " subtypeOf(" + subtype + ")";
-                String msg2 = (supertype == null) ? "" : " supertypeOf(" + supertype + ")";
-                throw new RendererException("No variable:" + msg1 + msg2 + ".");
-            }
-            return n;
-        }
-
-        /**
-         * Counts the number of {@link StructuralName}s in the filtered set.
-         *
-         * @return The number of {@link StructuralName}s in the filtered set.
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the sampled {@link StructuralName}.
+         * @return a token that represents the sampling and inner scope.
          * @throws UnsupportedOperationException If the type was not constrained with either of
          *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
          */
-        public int count() {
-            return Renderer.getCurrent().countNames(predicate());
+        public Token sample(Function<StructuralName, ScopeToken> function) {
+            return new NameSampleToken<>(predicate(), null, null, function);
         }
 
         /**
-         * Checks if there are any {@link StructuralName}s in the filtered set.
+         * Samples a random {@link StructuralName} from the filtered set, according to the weights
+         * of the contained {@link StructuralName}s, and makes a hashtag replacement for both
+         * the name and type of the {@link StructuralName}, in the current scope.
          *
-         * @return Returns {@code true} iff there is at least one {@link StructuralName} in the filtered set.
+         * @param name the key of the hashtag replacement for the {@link StructuralName} name.
+         * @param type the key of the hashtag replacement for the {@link StructuralName} type.
+         * @return a token that represents the sampling and hashtag replacement definition.
          * @throws UnsupportedOperationException If the type was not constrained with either of
          *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
          */
-        public boolean hasAny() {
-            return Renderer.getCurrent().hasAnyNames(predicate());
+        public Token sampleAndLetAs(String name, String type) {
+            return new NameSampleToken<StructuralName>(predicate(), name, type, n -> Template.transparentScope());
         }
 
         /**
-         * Collects all {@link StructuralName}s in the filtered set.
+         * Samples a random {@link StructuralName} from the filtered set, according to the weights
+         * of the contained {@link StructuralName}s, and makes a hashtag replacement for the
+         * name of the {@link StructuralName}, in the current scope.
          *
+         * @param name the key of the hashtag replacement for the {@link StructuralName} name.
+         * @return a token that represents the sampling and hashtag replacement definition.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token sampleAndLetAs(String name) {
+            return new NameSampleToken<StructuralName>(predicate(), name, null, n -> Template.transparentScope());
+        }
+
+        /**
+         * Counts the number of {@link StructuralName}s in the filtered set, making the count
+         * available to an inner scope.
+         *
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the count.
+         * @return a token that represents the counting and inner scope.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token count(Function<Integer, ScopeToken> function) {
+            return new NameCountToken(predicate(), function);
+        }
+
+        /**
+         * Checks if there are any {@link StructuralName}s in the filtered set, making the resulting boolean
+         * available to an inner scope.
+         *
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the boolean indicating iff there are any {@link StructuralName}s in the filtered set.
+         * @return a token that represents the checking and inner scope.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token hasAny(Function<Boolean, ScopeToken> function) {
+            return new NameHasAnyToken(predicate(), function);
+        }
+        /**
+         * Collects all {@link StructuralName}s in the filtered set, making the collected list
+         * available to an inner scope.
+         *
+         * @param function The {@link Function} that creates the inner {@link ScopeToken} given
+         *                 the list of {@link StructuralName}.
          * @return A {@link List} of all {@link StructuralName}s in the filtered set.
          * @throws UnsupportedOperationException If the type was not constrained with either of
          *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
          */
-        public List<StructuralName> toList() {
-            List<Name> list = Renderer.getCurrent().listNames(predicate());
-            return list.stream().map(n -> (StructuralName)n).toList();
+        public Token toList(Function<List<StructuralName>, ScopeToken> function) {
+            return new NamesToListToken<>(predicate(), function);
+        }
+
+        /**
+         * Calls the provided {@code function} for each {@link StructuralName}s in the filtered set,
+         * making each of these {@link StructuralName}s available to a separate inner scope.
+         *
+         * @param function The {@link Function} that is called to create the inner {@link ScopeToken}s
+         *                 for each of the {@link StructuralName}s in the filtereds set.
+         * @return The token representing the for-each execution and the respective inner scopes.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token forEach(Function<StructuralName, ScopeToken> function) {
+            return new NameForEachToken<>(predicate(), null, null, function);
+        }
+
+        /**
+         * Calls the provided {@code function} for each {@link StructuralName}s in the filtered set,
+         * making each of these {@link StructuralName}s available to a separate inner scope, and additionally
+         * setting hashtag replacements for the {@code name} and {@code type} of the respective
+         * {@link StructuralName}s.
+         *
+         * <p>
+         * Note, to avoid duplication of the {@code name} and {@code type}
+         * hashtag replacements, the scope created by the provided {@code function} should be
+         * non-transparent to hashtag replacements, for example {@link Template#scope} or
+         * {@link Template#hashtagScope}.
+         *
+         * @param name the key of the hashtag replacement for each individual {@link StructuralName} name.
+         * @param type the key of the hashtag replacement for each individual {@link StructuralName} type.
+         * @param function The {@link Function} that is called to create the inner {@link ScopeToken}s
+         *                 for each of the {@link StructuralName}s in the filtereds set.
+         * @return The token representing the for-each execution and the respective inner scopes.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public Token forEach(String name, String type, Function<StructuralName, ScopeToken> function) {
+            return new NameForEachToken<>(predicate(), name, type, function);
         }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Template.java b/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
index 57d06e732bb..f245cda0501 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
@@ -65,7 +65,7 @@ import compiler.lib.ir_framework.TestFramework;
  *
  * <p>
  * {@snippet lang=java :
- * var testTemplate = Template.make("typeName", "operator", "generator", (String typeName, String operator, MyGenerator generator) -> body(
+ * var testTemplate = Template.make("typeName", "operator", "generator", (String typeName, String operator, MyGenerator generator) -> scope(
  *     let("con1", generator.next()),
  *     let("con2", generator.next()),
  *     """
@@ -86,13 +86,13 @@ import compiler.lib.ir_framework.TestFramework;
  * }
  *
  * <p>
- * To get an executable test, we define a {@link Template} that produces a class body with a main method. The Template
+ * To get an executable test, we define a {@link Template} that produces a class scope with a main method. The Template
  * takes a list of types, and calls the {@code testTemplate} defined above for each type and operator. We use
  * the {@link TestFramework} to call our {@code @Test} methods.
  *
  * <p>
  * {@snippet lang=java :
- * var classTemplate = Template.make("types", (List<Type> types) -> body(
+ * var classTemplate = Template.make("types", (List<Type> types) -> scope(
  *     let("classpath", comp.getEscapedClassPathOfCompiledClasses()),
  *     """
  *     package p.xyz;
@@ -148,12 +148,12 @@ import compiler.lib.ir_framework.TestFramework;
  * {@link Template#make(String, Function)}. For each number of arguments there is an implementation
  * (e.g. {@link Template.TwoArgs} for two arguments). This allows the use of generics for the
  * {@link Template} argument types which enables type checking of the {@link Template} arguments.
- *  It is currently only allowed to use up to three arguments.
+ * It is currently only allowed to use up to three arguments.
  *
  * <p>
  * A {@link Template} can be rendered to a {@link String} (e.g. {@link Template.ZeroArgs#render()}).
  * Alternatively, we can generate a {@link Token} (more specifically, a {@link TemplateToken}) with {@code asToken()}
- * (e.g. {@link Template.ZeroArgs#asToken()}), and use the {@link Token} inside another {@link Template#body}.
+ * (e.g. {@link Template.ZeroArgs#asToken()}), and use the {@link Token} inside another {@link Template#scope}.
  *
  * <p>
  * Ideally, we would have used <a href="https://openjdk.org/jeps/430">string templates</a> to inject these Template
@@ -161,6 +161,11 @@ import compiler.lib.ir_framework.TestFramework;
  * <strong>hashtag replacements</strong> in the {@link String}s: the Template argument names are captured, and
  * the argument values automatically replace any {@code "#name"} in the {@link String}s. See the different overloads
  * of {@link #make} for examples. Additional hashtag replacements can be defined with {@link #let}.
+ * We have decided to keep hashtag replacements constrained to the scope of one Template. They
+ * do not escape to outer or inner Template uses. If one needs to pass values to inner Templates,
+ * this can be done with Template arguments. Keeping hashtag replacements local to Templates
+ * has the benefit that there is no conflict in recursive templates, where outer and inner Templates
+ * define the same hashtag replacement.
  *
  * <p>
  * When using nested Templates, there can be collisions with identifiers (e.g. variable names and method names).
@@ -176,25 +181,6 @@ import compiler.lib.ir_framework.TestFramework;
  * {@code #{name}}.
  *
  * <p>
- * A {@link TemplateToken} cannot just be used in {@link Template#body}, but it can also be
- * {@link Hook#insert}ed to where a {@link Hook} was {@link Hook#anchor}ed earlier (in some outer scope of the code).
- * For example, while generating code in a method, one can reach out to the scope of the class, and insert a
- * new field, or define a utility method.
- *
- * <p>
- * A {@link TemplateBinding} allows the recursive use of Templates. With the indirection of such a binding,
- * a Template can reference itself.
- *
- * <p>
- * The writer of recursive {@link Template}s must ensure that this recursion terminates. To unify the
- * approach across {@link Template}s, we introduce the concept of {@link #fuel}. Templates are rendered starting
- * with a limited amount of {@link #fuel} (default: 100, see {@link #DEFAULT_FUEL}), which is decreased at each
- * Template nesting by a certain amount (default: 10, see {@link #DEFAULT_FUEL_COST}). The default fuel for a
- * template can be changed when we {@code render()} it (e.g. {@link ZeroArgs#render(float)}) and the default
- * fuel cost with {@link #setFuelCost}) when defining the {@link #body(Object...)}. Recursive templates are
- * supposed to terminate once the {@link #fuel} is depleted (i.e. reaches zero).
- *
- * <p>
  * Code generation can involve keeping track of fields and variables, as well as the scopes in which they
  * are available, and if they are mutable or immutable. We model fields and variables with {@link DataName}s,
  * which we can add to the current scope with {@link #addDataName}. We can access the {@link DataName}s with
@@ -211,61 +197,70 @@ import compiler.lib.ir_framework.TestFramework;
  * are not concerned about mutability.
  *
  * <p>
- * When working with {@link DataName}s and {@link StructuralName}s, it is important to be aware of the
- * relevant scopes, as well as the execution order of the {@link Template} lambdas and the evaluation
- * of the {@link Template#body} tokens. When a {@link Template} is rendered, its lambda is invoked. In the
- * lambda, we generate the tokens, and create the {@link Template#body}. Once the lambda returns, the
- * tokens are evaluated one by one. While evaluating the tokens, the {@link Renderer} might encounter a nested
- * {@link TemplateToken}, which in turn triggers the evaluation of that nested {@link Template}, i.e.
- * the evaluation of its lambda and later the evaluation of its tokens. It is important to keep in mind
- * that the lambda is always executed first, and the tokens are evaluated afterwards. A method like
- * {@code dataNames(MUTABLE).exactOf(type).count()} is a method that is executed during the evaluation
- * of the lambda. But a method like {@link #addDataName} returns a token, and does not immediately add
- * the {@link DataName}. This ensures that the {@link DataName} is only inserted when the tokens are
- * evaluated, so that it is inserted at the exact scope where we would expect it.
+ * Code generation can involve keeping track of scopes in the code (e.g. liveness and availability of
+ * {@link DataName}s) and of the hashtag replacements in the templates. The {@link ScopeToken} serves
+ * this purpose, and allows the definition of transparent scopes (e.g. {@link #transparentScope}) and
+ * non-transparent scopes (e.g. {@link #scope}).
+ *
+ * <table border="1">
+ *   <caption>Scopes and (non-)transparency</caption>
+ *   <tr>
+ *     <th>                           </th><th> hashtag         </th><th> {@link DataName} and {@link StructuralName} </th><th> {@link #setFuelCost} </th>
+ *   </tr>
+ *   <tr>
+ *     <th> {@link #scope}            </th><th> non-transparent </th><th> non-transparent                             </th><th> non-transparent     </th>
+ *   </tr>
+ *   <tr>
+ *     <th> {@link #hashtagScope}     </th><th> non-transparent </th><th> transparent                                 </th><th> transparent         </th>
+ *   </tr>
+ *   <tr>
+ *     <th> {@link #nameScope}        </th><th> transparent     </th><th> non-transparent                             </th><th> transparent         </th>
+ *   </tr>
+ *   <tr>
+ *     <th> {@link #setFuelCostScope} </th><th> transparent     </th><th> transparent                                 </th><th> non-transparent     </th>
+ *   </tr>
+ *   <tr>
+ *     <th> {@link #transparentScope} </th><th> transparent     </th><th> transparent                                 </th><th> transparent         </th>
+ *   </tr>
+ * </table>
  *
  * <p>
- * Let us look at the following example to better understand the execution order.
+ * In some cases, we may be deeper nested in templates and scopes, and would like to reach "back" or
+ * to outer scopes. This is possible with {@link Hook#anchor}ing in some outer scope, and later
+ * {@link Hook#insert}ing from an inner scope to the scope of the anchoring. For example, while
+ * generating code in a method, one can reach out to the scope of the class, and insert a new field,
+ * or define a utility method.
  *
  * <p>
- * {@snippet lang=java :
- * var testTemplate = Template.make(() -> body(
- *     // The lambda has just been invoked.
- *     // We count the DataNames and assign the count to the hashtag replacement "c1".
- *     let("c1", dataNames(MUTABLE).exactOf(someType).count()),
- *     // We want to define a DataName "v1", and create a token for it.
- *     addDataName($("v1"), someType, MUTABLE),
- *     // We count the DataNames again, but the count does NOT change compared to "c1".
- *     // This is because the token for "v1" is only evaluated later.
- *     let("c2", dataNames(MUTABLE).exactOf(someType).count()),
- *     // Create a nested scope.
- *     METHOD_HOOK.anchor(
- *         // We want to define a DataName "v2", which is only valid inside this
- *         // nested scope.
- *         addDataName($("v2"), someType, MUTABLE),
- *         // The count is still not different to "c1".
- *         let("c3", dataNames(MUTABLE).exactOf(someType).count()),
- *         // We nest a Template. This creates a TemplateToken, which is later evaluated.
- *         // By the time the TemplateToken is evaluated, the tokens from above will
- *         // be already evaluated. Hence, "v1" and "v2" are added by then, and if the
- *         // "otherTemplate" were to count the DataNames, the count would be increased
- *         // by 2 compared to "c1".
- *         otherTemplate.asToken()
- *     ),
- *     // After closing the scope, "v2" is no longer available.
- *     // The count is still the same as "c1", since "v1" is still only a token.
- *     let("c4", dataNames(MUTABLE).exactOf(someType).count()),
- *     // We nest another Template. Again, this creates a TemplateToken, which is only
- *     // evaluated later. By that time, the token for "v1" is evaluated, and so the
- *     // nested Template would observe an increment in the count.
- *     anotherTemplate.asToken()
- *     // By this point, all methods are called, and the tokens generated.
- *     // The lambda returns the "body", which is all of the tokens that we just
- *     // generated. After returning from the lambda, the tokens will be evaluated
- *     // one by one.
- * ));
- * }
-
+ * A {@link TemplateBinding} allows the recursive use of Templates. With the indirection of such a binding,
+ * a Template can reference itself.
+ *
+ * <p>
+ * The writer of recursive {@link Template}s must ensure that this recursion terminates. To unify the
+ * approach across {@link Template}s, we introduce the concept of {@link #fuel}. Templates are rendered starting
+ * with a limited amount of {@link #fuel} (default: 100, see {@link #DEFAULT_FUEL}), which is decreased at each
+ * Template nesting by a certain amount (default: 10, see {@link #DEFAULT_FUEL_COST}). The default fuel for a
+ * template can be changed when we {@code render()} it (e.g. {@link ZeroArgs#render(float)}) and the default
+ * fuel cost with {@link #setFuelCost}) when defining the {@link #scope(Object...)}. Recursive templates are
+ * supposed to terminate once the {@link #fuel} is depleted (i.e. reaches zero).
+ *
+ * <p>
+ * A note from the implementor to the user: We have decided to implement the Template Framework using
+ * a functional (lambdas) and data-oriented (tokens) model. The consequence is that there are three
+ * orders in template rendering: (1) the execution order in lambdas, where we usually assemble the
+ * tokens and pass them to some scope ({@link ScopeToken}) as arguments. (2) the token evaluation
+ * order, which occurs in the order of how tokens are listed in a scope. By design, the token order
+ * is the same order as execution in lambdas. To keep the lambda and token order in sync, most of the
+ * queries about the state of code generation, such as {@link DataName}s and {@link Hook}s cannot
+ * return the values immediately, but have to be expressed as tokens. If we had a mix of tokens and
+ * immediate queries, then the immediate queries would "float" by the tokens, because the immediate
+ * queries are executed during the lambda execution, but the tokens are only executed later. Having
+ * to express everything as tokens can be a little more cumbersome (e.g. sample requires a lambda
+ * that captures the {@link DataName}, and sample does not return the {@link DataName} directly).
+ * But this ensures that reasoning about execution order is relatively straight forward, namely in
+ * the order of the specified tokens. (3) the final code order is the same as the lambda and token
+ * order, except when using {@link Hook#insert}, which places the code at the innermost {@link Hook#anchor}.
+ *
  * <p>
  * More examples for these functionalities can be found in {@code TestTutorial.java}, {@code TestSimple.java},
  * and {@code TestAdvanced.java}, which all produce compilable Java code. Additional examples can be found in
@@ -281,10 +276,10 @@ public sealed interface Template permits Template.ZeroArgs,
     /**
      * A {@link Template} with no arguments.
      *
-     * @param function The {@link Supplier} that creates the {@link TemplateBody}.
+     * @param function The {@link Supplier} that creates the {@link ScopeToken}.
      */
-    record ZeroArgs(Supplier<TemplateBody> function) implements Template {
-        TemplateBody instantiate() {
+    record ZeroArgs(Supplier<ScopeToken> function) implements Template {
+        ScopeToken instantiate() {
             return function.get();
         }
 
@@ -324,10 +319,10 @@ public sealed interface Template permits Template.ZeroArgs,
      *
      * @param arg1Name The name of the (first) argument, used for hashtag replacements in the {@link Template}.
      * @param <T1> The type of the (first) argument.
-     * @param function The {@link Function} that creates the {@link TemplateBody} given the template argument.
+     * @param function The {@link Function} that creates the {@link ScopeToken} given the template argument.
      */
-    record OneArg<T1>(String arg1Name, Function<T1, TemplateBody> function) implements Template {
-        TemplateBody instantiate(T1 arg1) {
+    record OneArg<T1>(String arg1Name, Function<T1, ScopeToken> function) implements Template {
+        ScopeToken instantiate(T1 arg1) {
             return function.apply(arg1);
         }
 
@@ -372,10 +367,10 @@ public sealed interface Template permits Template.ZeroArgs,
      * @param arg2Name The name of the second argument, used for hashtag replacements in the {@link Template}.
      * @param <T1> The type of the first argument.
      * @param <T2> The type of the second argument.
-     * @param function The {@link BiFunction} that creates the {@link TemplateBody} given the template arguments.
+     * @param function The {@link BiFunction} that creates the {@link ScopeToken} given the template arguments.
      */
-    record TwoArgs<T1, T2>(String arg1Name, String arg2Name, BiFunction<T1, T2, TemplateBody> function) implements Template {
-        TemplateBody instantiate(T1 arg1, T2 arg2) {
+    record TwoArgs<T1, T2>(String arg1Name, String arg2Name, BiFunction<T1, T2, ScopeToken> function) implements Template {
+        ScopeToken instantiate(T1 arg1, T2 arg2) {
             return function.apply(arg1, arg2);
         }
 
@@ -447,10 +442,10 @@ public sealed interface Template permits Template.ZeroArgs,
      * @param <T1> The type of the first argument.
      * @param <T2> The type of the second argument.
      * @param <T3> The type of the third argument.
-     * @param function The function with three arguments that creates the {@link TemplateBody} given the template arguments.
+     * @param function The function with three arguments that creates the {@link ScopeToken} given the template arguments.
      */
-    record ThreeArgs<T1, T2, T3>(String arg1Name, String arg2Name, String arg3Name, TriFunction<T1, T2, T3, TemplateBody> function) implements Template {
-        TemplateBody instantiate(T1 arg1, T2 arg2, T3 arg3) {
+    record ThreeArgs<T1, T2, T3>(String arg1Name, String arg2Name, String arg3Name, TriFunction<T1, T2, T3, ScopeToken> function) implements Template {
+        ScopeToken instantiate(T1 arg1, T2 arg2, T3 arg3) {
             return function.apply(arg1, arg2, arg3);
         }
 
@@ -496,28 +491,28 @@ public sealed interface Template permits Template.ZeroArgs,
 
     /**
      * Creates a {@link Template} with no arguments.
-     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * See {@link #scope} for more details about how to construct a Template with {@link Token}s.
      *
      * <p>
      * Example:
      * {@snippet lang=java :
-     * var template = Template.make(() -> body(
+     * var template = Template.make(() -> scope(
      *     """
      *     Multi-line string or other tokens.
      *     """
      * ));
      * }
      *
-     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param scope The {@link ScopeToken} created by {@link Template#scope}.
      * @return A {@link Template} with zero arguments.
      */
-    static Template.ZeroArgs make(Supplier<TemplateBody> body) {
-        return new Template.ZeroArgs(body);
+    static Template.ZeroArgs make(Supplier<ScopeToken> scope) {
+        return new Template.ZeroArgs(scope);
     }
 
     /**
      * Creates a {@link Template} with one argument.
-     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * See {@link #scope} for more details about how to construct a Template with {@link Token}s.
      * Good practice but not enforced but not enforced: {@code arg1Name} should match the lambda argument name.
      *
      * <p>
@@ -525,7 +520,7 @@ public sealed interface Template permits Template.ZeroArgs,
      * for use in hashtag replacements, and captured once as lambda argument with the corresponding type
      * of the generic argument.
      * {@snippet lang=java :
-     * var template = Template.make("a", (Integer a) -> body(
+     * var template = Template.make("a", (Integer a) -> scope(
      *     """
      *     Multi-line string or other tokens.
      *     We can use the hashtag replacement #a to directly insert the String value of a.
@@ -534,18 +529,18 @@ public sealed interface Template permits Template.ZeroArgs,
      * ));
      * }
      *
-     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param scope The {@link ScopeToken} created by {@link Template#scope}.
      * @param <T1> Type of the (first) argument.
      * @param arg1Name The name of the (first) argument for hashtag replacement.
      * @return A {@link Template} with one argument.
      */
-    static <T1> Template.OneArg<T1> make(String arg1Name, Function<T1, TemplateBody> body) {
-        return new Template.OneArg<>(arg1Name, body);
+    static <T1> Template.OneArg<T1> make(String arg1Name, Function<T1, ScopeToken> scope) {
+        return new Template.OneArg<>(arg1Name, scope);
     }
 
     /**
      * Creates a {@link Template} with two arguments.
-     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * See {@link #scope} for more details about how to construct a Template with {@link Token}s.
      * Good practice but not enforced: {@code arg1Name} and {@code arg2Name} should match the lambda argument names.
      *
      * <p>
@@ -553,7 +548,7 @@ public sealed interface Template permits Template.ZeroArgs,
      * for use in hashtag replacements, and captured once as lambda arguments with the corresponding types
      * of the generic arguments.
      * {@snippet lang=java :
-     * var template = Template.make("a", "b", (Integer a, String b) -> body(
+     * var template = Template.make("a", "b", (Integer a, String b) -> scope(
      *     """
      *     Multi-line string or other tokens.
      *     We can use the hashtag replacement #a and #b to directly insert the String value of a and b.
@@ -562,23 +557,23 @@ public sealed interface Template permits Template.ZeroArgs,
      * ));
      * }
      *
-     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param scope The {@link ScopeToken} created by {@link Template#scope}.
      * @param <T1> Type of the first argument.
      * @param arg1Name The name of the first argument for hashtag replacement.
      * @param <T2> Type of the second argument.
      * @param arg2Name The name of the second argument for hashtag replacement.
      * @return A {@link Template} with two arguments.
      */
-    static <T1, T2> Template.TwoArgs<T1, T2> make(String arg1Name, String arg2Name, BiFunction<T1, T2, TemplateBody> body) {
-        return new Template.TwoArgs<>(arg1Name, arg2Name, body);
+    static <T1, T2> Template.TwoArgs<T1, T2> make(String arg1Name, String arg2Name, BiFunction<T1, T2, ScopeToken> scope) {
+        return new Template.TwoArgs<>(arg1Name, arg2Name, scope);
     }
 
     /**
      * Creates a {@link Template} with three arguments.
-     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * See {@link #scope} for more details about how to construct a Template with {@link Token}s.
      * Good practice but not enforced: {@code arg1Name}, {@code arg2Name}, and {@code arg3Name} should match the lambda argument names.
      *
-     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param scope The {@link ScopeToken} created by {@link Template#scope}.
      * @param <T1> Type of the first argument.
      * @param arg1Name The name of the first argument for hashtag replacement.
      * @param <T2> Type of the second argument.
@@ -587,18 +582,35 @@ public sealed interface Template permits Template.ZeroArgs,
      * @param arg3Name The name of the third argument for hashtag replacement.
      * @return A {@link Template} with three arguments.
      */
-    static <T1, T2, T3> Template.ThreeArgs<T1, T2, T3> make(String arg1Name, String arg2Name, String arg3Name, Template.TriFunction<T1, T2, T3, TemplateBody> body) {
-        return new Template.ThreeArgs<>(arg1Name, arg2Name, arg3Name, body);
+    static <T1, T2, T3> Template.ThreeArgs<T1, T2, T3> make(String arg1Name, String arg2Name, String arg3Name, Template.TriFunction<T1, T2, T3, ScopeToken> scope) {
+        return new Template.ThreeArgs<>(arg1Name, arg2Name, arg3Name, scope);
     }
 
     /**
-     * Creates a {@link TemplateBody} from a list of tokens, which can be {@link String}s,
-     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}), any {@link Token},
-     * or {@link List}s of any of these.
+     * Creates a {@link ScopeToken} that represents a scope that is completely
+     * non-transparent, <strong>not</strong> allowing anything to escape. This
+     * means that no {@link DataName}, {@link StructuralName}s, hashtag-replacement
+     * or {@link #setFuelCost} defined inside the scope is available outside. All
+     * these usages are only local to the defining scope here.
+     *
+     * <p>
+     * The scope is formed from a list of tokens, which can be {@link String}s,
+     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}),
+     * any {@link Token}, or {@link List}s of any of these.
+     *
+     * <p>
+     * If you require a scope that is either fully transparent (i.e. everything escapes)
+     * or only restricts a specific kind to not escape, consider using one of the other
+     * provided scopes: {@link #transparentScope}, {@link #nameScope}, {@link #hashtagScope},
+     * or {@link #setFuelCostScope}. A "scope-transparency-matrix" can also be found in
+     * the interface comment for {@link Template}.
+     *
+     * <p>
+     * The most common use of {@link #scope} is in the construction of templates:
      *
      * <p>
      * {@snippet lang=java :
-     * var template = Template.make(() -> body(
+     * var template = Template.make(() -> scope(
      *     """
      *     Multi-line string
      *     """,
@@ -608,14 +620,200 @@ public sealed interface Template permits Template.ZeroArgs,
      * ));
      * }
      *
+     * <p>
+     * Note that regardless of the chosen scope for {@code Template.make},
+     * hashtag-replacements and {@link #setFuelCost} are always implicitly
+     * non-transparent (i.e. non-escaping). For example, {@link #let} will
+     * not escape the template scope even when using {@link #transparentScope}.
+     * As a default, it is recommended to use {@link #scope} for
+     * {@code Template.make} since in most cases template scopes align with
+     * code scopes that are non-transparent for fields, variables, etc. In
+     * rare cases, where the scope of the template needs to be transparent
+     * (e.g. because we need to insert a variable or field into an outer scope),
+     * it is recommended to use {@link #transparentScope}. This allows to make
+     * {@link DataName}s and {@link StructuralName}s available outside this
+     * template crossing the template boundary.
+     *
+     * <p>
+     * We can also use nested scopes inside of templates:
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var template = Template.make(() -> scope(
+     *     // CODE1: some code in the outer scope
+     *     scope(
+     *       // CODE2: some code in the inner scope. Names, hashtags and setFuelCost
+     *       //        do not escape the inner scope.
+     *     ),
+     *     // CODE3: more code in the outer scope, names and hashtags from CODE2 are
+     *     //        not available anymore because of the non-transparent "scope".
+     *     transparentScope(
+     *       // CODE4: some code in the inner "transparentScope". Names, hashtags and setFuelCost
+     *       //        escape the "transparentScope" and are still available after the "transparentScope"
+     *       //        closes.
+     *     )
+     *     // CODE5: we still have access to names and hashtags from CODE4.
+     * ));
+     * }
+     *
      * @param tokens A list of tokens, which can be {@link String}s, boxed primitive types
      *               (for example {@link Integer}), any {@link Token}, or {@link List}s
      *               of any of these.
-     * @return The {@link TemplateBody} which captures the list of validated {@link Token}s.
+     * @return The {@link ScopeToken} which captures the list of validated {@link Token}s.
      * @throws IllegalArgumentException if the list of tokens contains an unexpected object.
      */
-    static TemplateBody body(Object... tokens) {
-        return new TemplateBody(TokenParser.parse(tokens));
+    static ScopeToken scope(Object... tokens) {
+        return new ScopeTokenImpl(TokenParser.parse(tokens), false, false, false);
+    }
+
+    /**
+     * Creates a {@link ScopeToken} that represents a completely transparent scope.
+     * This means that {@link DataName}s, {@link StructuralName}s,
+     * hashtag-replacements and {@link #setFuelCost} declared inside the scope will be available
+     * in the outer scope.
+     * The scope is formed from a list of tokens, which can be {@link String}s,
+     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}),
+     * any {@link Token}, or {@link List}s of any of these.
+     *
+     * <p>
+     * If you require a scope that is non-transparent (i.e. nothing escapes) or only restricts
+     * a specific kind to not escape, consider using one of the other provided scopes:
+     * {@link #scope}, {@link #nameScope}, {@link #hashtagScope}, or {@link #setFuelCostScope}.
+     * A "scope-transparency-matrix" can also be found in the interface comment for {@link Template}.
+     *
+     * @param tokens A list of tokens, which can be {@link String}s, boxed primitive types
+     *               (for example {@link Integer}), any {@link Token}, or {@link List}s
+     *               of any of these.
+     * @return The {@link ScopeToken} which captures the list of validated {@link Token}s.
+     * @throws IllegalArgumentException if the list of tokens contains an unexpected object.
+     */
+    static ScopeToken transparentScope(Object... tokens) {
+        return new ScopeTokenImpl(TokenParser.parse(tokens), true, true, true);
+    }
+
+    /**
+     * Creates a {@link ScopeToken} that represents a scope that is non-transparent for
+     * {@link DataName}s and {@link StructuralName}s (i.e. cannot escape), but
+     * transparent for hashtag-replacements and {@link #setFuelCost} (i.e. available
+     * in outer scope).
+     *
+     * <p>
+     * The scope is formed from a list of tokens, which can be {@link String}s,
+     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}),
+     * any {@link Token}, or {@link List}s of any of these.
+     *
+     * <p>
+     * If you require a scope that is transparent or uses a different restriction, consider
+     * using one of the other provided scopes: {@link #scope}, {@link #transparentScope},
+     * {@link #hashtagScope}, or {@link #setFuelCostScope}. A "scope-transparency-matrix" can
+     * also be found in the interface comment for {@link Template}.
+     *
+     * @param tokens A list of tokens, which can be {@link String}s, boxed primitive types
+     *               (for example {@link Integer}), any {@link Token}, or {@link List}s
+     *               of any of these.
+     * @return The {@link ScopeToken} which captures the list of validated {@link Token}s.
+     * @throws IllegalArgumentException if the list of tokens contains an unexpected object.
+     */
+    static ScopeToken nameScope(Object... tokens) {
+        return new ScopeTokenImpl(TokenParser.parse(tokens), false, true, true);
+    }
+
+    /**
+     * Creates a {@link ScopeToken} that represents a scope that is non-transparent for
+     * hashtag-replacements (i.e. cannot escape), but transparent for {@link DataName}s
+     * and {@link StructuralName}s and {@link #setFuelCost} (i.e. available in outer scope).
+     *
+     * <p>
+     * The scope is formed from a list of tokens, which can be {@link String}s,
+     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}),
+     * any {@link Token}, or {@link List}s of any of these.
+     *
+     * <p>
+     * If you require a scope that is transparent or uses a different restriction, consider
+     * using one of the other provided scopes: {@link #scope}, {@link #transparentScope},
+     * {@link #nameScope}, or {@link #setFuelCostScope}. A "scope-transparency-matrix" can
+     * also be found in the interface comment for {@link Template}.
+     *
+     * <p>
+     * Keeping hashtag-replacements local but letting {@link DataName}s escape can be
+     * useful in cases like the following, where we may want to reuse the hashtag
+     * multiple times:
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var template = Template.make(() -> scope(
+     *     List.of("a", "b", "c").stream().map(name -> hashtagScope(
+     *         let("name", name), // assumes values: a, b, c
+     *         addDataName(name, PrimitiveType.INTS, MUTABLE), // escapes
+     *         """
+     *         int #name = 42;
+     *         """
+     *     ))
+     *     // We still have access to the three DataNames.
+     * ));
+     * }
+     *
+     * @param tokens A list of tokens, which can be {@link String}s, boxed primitive types
+     *               (for example {@link Integer}), any {@link Token}, or {@link List}s
+     *               of any of these.
+     * @return The {@link ScopeToken} which captures the list of validated {@link Token}s.
+     * @throws IllegalArgumentException if the list of tokens contains an unexpected object.
+     */
+    static ScopeToken hashtagScope(Object... tokens) {
+        return new ScopeTokenImpl(TokenParser.parse(tokens), true, false, true);
+    }
+
+    /**
+     * Creates a {@link ScopeToken} that represents a scope that is non-transparent for
+     * {@link #setFuelCost} (i.e. cannot escape), but transparent for hashtag-replacements,
+     * {@link DataName}s and {@link StructuralName}s (i.e. available in outer scope).
+     * The scope is formed from a list of tokens, which can be {@link String}s,
+     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}),
+     * any {@link Token}, or {@link List}s of any of these.
+     *
+     * <p>
+     * If you require a scope that is transparent or uses a different restriction, consider
+     * using one of the other provided scopes: {@link #scope}, {@link #transparentScope},
+     * {@link #hashtagScope}, or {@link #nameScope}. A "scope-transparency-matrix" can
+     * also be found in the interface comment for {@link Template}.
+     *
+     * <p>
+     * In some cases, it can be helpful to have different {@link #setFuelCost} within
+     * a single template, depending on the code nesting depth. Example:
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var template = Template.make(() -> scope(
+     *     setFuelCost(1),
+     *     // CODE1: some shallow code, allowing recursive template uses here
+     *     //        to use more fuel.
+     *     """
+     *     for (int i = 0; i < 1000; i++) {
+     *     """,
+     *     setFuelCostScope(
+     *         setFuelCost(100)
+     *         // CODE2: with the for-loop, we already have a deeper nesting
+     *         //        depth, and recursive template uses should not get
+     *         //        as much fuel as in CODE1.
+     *     ),
+     *     """
+     *     }
+     *     """
+     *     // CODE3: we are back in the outer scope of CODE1, and can use
+     *     //        more fuel again in nested template uses. setFuelCost
+     *     //        is automatically restored to what was set before the
+     *     //        inner scope.
+     * ));
+     * }
+     *
+     * @param tokens A list of tokens, which can be {@link String}s, boxed primitive types
+     *               (for example {@link Integer}), any {@link Token}, or {@link List}s
+     *               of any of these.
+     * @return The {@link ScopeToken} which captures the list of validated {@link Token}s.
+     * @throws IllegalArgumentException if the list of tokens contains an unexpected object.
+     */
+    static ScopeToken setFuelCostScope(Object... tokens) {
+        return new ScopeTokenImpl(TokenParser.parse(tokens), true, true, false);
     }
 
     /**
@@ -628,7 +826,7 @@ public sealed interface Template permits Template.ZeroArgs,
      * with an implicit dollar replacement, and then captures that dollar replacement
      * using {@link #$} for the use inside a nested template.
      * {@snippet lang=java :
-     * var template = Template.make(() -> body(
+     * var template = Template.make(() -> scope(
      *     """
      *     int $var = 42;
      *     """,
@@ -640,6 +838,9 @@ public sealed interface Template permits Template.ZeroArgs,
      * @return The dollar replacement for the {@code 'name'}.
      */
     static String $(String name) {
+        // Note, since the dollar replacements do not change within a template
+        // and the retrieval has no side effects, we can return the value immediately,
+        // and do not need a token.
         return Renderer.getCurrent().$(name);
     }
 
@@ -648,7 +849,7 @@ public sealed interface Template permits Template.ZeroArgs,
      *
      * <p>
      * {@snippet lang=java :
-     * var template = Template.make("a", (Integer a) -> body(
+     * var template = Template.make("a", (Integer a) -> scope(
      *     let("b", a * 5),
      *     """
      *     System.out.println("Use a and b with hashtag replacement: #a and #b");
@@ -656,41 +857,50 @@ public sealed interface Template permits Template.ZeroArgs,
      * ));
      * }
      *
+     * <p>
+     * Note that a {@code let} definition makes the hashtag replacement available
+     * for anything that follows it, until the the end of the next outer scope
+     * that is non-transparent for hashtag replacements. Additionally, hashtag
+     * replacements are limited to the template they were defined in.
+     * If you want to pass values from an outer to an inner template, this cannot
+     * be done with hashtags directly. Instead, one has to pass the values via
+     * template arguments.
+     *
      * @param key Name for the hashtag replacement.
      * @param value The value that the hashtag is replaced with.
-     * @return A token that does nothing, so that the {@link #let} can easily be put in a list of tokens
-     *         inside a {@link Template#body}.
-     * @throws RendererException if there is a duplicate hashtag {@code key}.
+     * @return A token that represents the hashtag replacement definition.
      */
     static Token let(String key, Object value) {
-        Renderer.getCurrent().addHashtagReplacement(key, value);
-        return new NothingToken();
+        return new LetToken(key, value, v -> transparentScope());
     }
 
     /**
      * Define a hashtag replacement for {@code "#key"}, with a specific value, which is also captured
-     * by the provided {@code function} with type {@code <T>}.
+     * by the provided {@code function} with type {@code <T>}. While the argument of the lambda that
+     * captures the value is naturally bounded to the scope of the lambda, the hashtag replacement
+     * may be bound to the scope or escape it, depending on the choice of scope, see {@link #scope}
+     * and {@link #transparentScope}.
      *
      * <p>
      * {@snippet lang=java :
-     * var template = Template.make("a", (Integer a) -> let("b", a * 2, (Integer b) -> body(
-     *     """
-     *     System.out.println("Use a and b with hashtag replacement: #a and #b");
-     *     """,
-     *     "System.out.println(\"Use a and b as capture variables:\"" + a + " and " + b + ");\n"
-     * )));
+     * var template = Template.make("a", (Integer a) -> scope(
+     *     let("b", a * 2, (Integer b) -> scope(
+     *         """
+     *         System.out.println("Use a and b with hashtag replacement: #a and #b");
+     *         """,
+     *         "System.out.println(\"Use a and b as capture variables:\"" + a + " and " + b + ");\n"
+     *     ))
+     * ));
      * }
      *
      * @param key Name for the hashtag replacement.
      * @param value The value that the hashtag is replaced with.
      * @param <T> The type of the value.
      * @param function The function that is applied with the provided {@code value}.
-     * @return A {@link TemplateBody}.
-     * @throws RendererException if there is a duplicate hashtag {@code key}.
+     * @return A {@link Token} representing the hashtag replacement definition and inner scope.
      */
-    static <T> TemplateBody let(String key, T value, Function<T, TemplateBody> function) {
-        Renderer.getCurrent().addHashtagReplacement(key, value);
-        return function.apply(value);
+    static <T> Token let(String key, T value, Function<T, ScopeToken> function) {
+        return new LetToken(key, value, function);
     }
 
     /**
@@ -702,7 +912,7 @@ public sealed interface Template permits Template.ZeroArgs,
     /**
      * The default amount of fuel spent per Template. It is subtracted from the current {@link #fuel} at every
      * nesting level, and once the {@link #fuel} reaches zero, the nesting is supposed to terminate. Can be changed
-     * with {@link #setFuelCost(float)} inside {@link #body(Object...)}.
+     * with {@link #setFuelCost(float)} inside {@link #scope(Object...)}.
      */
     float DEFAULT_FUEL_COST = 10.0f;
 
@@ -721,7 +931,7 @@ public sealed interface Template permits Template.ZeroArgs,
      * <p>
      * {@snippet lang=java :
      * var binding = new TemplateBinding<Template.OneArg<Integer>>();
-     * var template = Template.make("depth", (Integer depth) -> body(
+     * var template = Template.make("depth", (Integer depth) -> scope(
      *     setFuelCost(5.0f),
      *     let("fuel", fuel()),
      *     """
@@ -737,6 +947,9 @@ public sealed interface Template permits Template.ZeroArgs,
      * @return The amount of fuel left for nested Template use.
      */
     static float fuel() {
+        // Note, since the fuel amount does not change within a template
+        // and the retrieval has no side effects, we can return the value immediately,
+        // and do not need a token.
         return Renderer.getCurrent().fuel();
     }
 
@@ -745,16 +958,17 @@ public sealed interface Template permits Template.ZeroArgs,
      * {@link Template#DEFAULT_FUEL_COST}.
      *
      * @param fuelCost The amount of fuel used for the current Template.
-     * @return A token for convenient use in {@link Template#body}.
+     * @return A token for convenient use in {@link Template#scope}.
      */
     static Token setFuelCost(float fuelCost) {
-        Renderer.getCurrent().setFuelCost(fuelCost);
-        return new NothingToken();
+        return new SetFuelCostToken(fuelCost);
     }
 
     /**
-     * Add a {@link DataName} in the current scope, that is the innermost of either
-     * {@link Template#body} or {@link Hook#anchor}.
+     * Add a {@link DataName} in the current {@link #scope}.
+     * If the current scope is transparent to {@link DataName}s, it escapes to the next
+     * outer scope that is non-transparent, and is available for everything that follows
+     * the {@code addDataName} until the end of that non-transparent scope.
      *
      * @param name The name of the {@link DataName}, i.e. the {@link String} used in code.
      * @param type The type of the {@link DataName}.
@@ -779,8 +993,10 @@ public sealed interface Template permits Template.ZeroArgs,
     }
 
     /**
-     * Add a {@link DataName} in the current scope, that is the innermost of either
-     * {@link Template#body} or {@link Hook#anchor}, with a {@code weight} of 1.
+     * Add a {@link DataName} in the current {@link #scope}, with a {@code weight} of 1.
+     * If the current scope is transparent to {@link DataName}s, it escapes to the next
+     * outer scope that is non-transparent, and is available for everything that follows
+     * the {@code addDataName} until the end of that non-transparent scope.
      *
      * @param name The name of the {@link DataName}, i.e. the {@link String} used in code.
      * @param type The type of the {@link DataName}.
@@ -804,8 +1020,10 @@ public sealed interface Template permits Template.ZeroArgs,
     }
 
     /**
-     * Add a {@link StructuralName} in the current scope, that is the innermost of either
-     * {@link Template#body} or {@link Hook#anchor}.
+     * Add a {@link StructuralName} in the current {@link #scope}.
+     * If the current scope is transparent to {@link StructuralName}s, it escapes to the next
+     * outer scope that is non-transparent, and is available for everything that follows
+     * the {@code addStructuralName} until the end of that non-transparent scope.
      *
      * @param name The name of the {@link StructuralName}, i.e. the {@link String} used in code.
      * @param type The type of the {@link StructuralName}.
@@ -822,8 +1040,10 @@ public sealed interface Template permits Template.ZeroArgs,
     }
 
     /**
-     * Add a {@link StructuralName} in the current scope, that is the innermost of either
-     * {@link Template#body} or {@link Hook#anchor}, with a {@code weight} of 1.
+     * Add a {@link StructuralName} in the current {@link #scope}, with a {@code weight} of 1.
+     * If the current scope is transparent to {@link StructuralName}s, it escapes to the next
+     * outer scope that is non-transparent, and is available for everything that follows
+     * the {@code addStructuralName} until the end of that non-transparent scope.
      *
      * @param name The name of the {@link StructuralName}, i.e. the {@link String} used in code.
      * @param type The type of the {@link StructuralName}.
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java
index cf8c4afb321..04305dff02f 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java
@@ -27,38 +27,96 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * The {@link TemplateFrame} is the frame for a {@link Template}, i.e. the corresponding
- * {@link TemplateToken}. It ensures that each template use has its own unique {@link #id}
- * used to deconflict names using {@link Template#$}. It also has a set of hashtag
- * replacements, which combine the key-value pairs from the template argument and the
- * {@link Template#let} definitions. The {@link #parent} relationship provides a trace
- * for the use chain of templates. The {@link #fuel} is reduced over this chain, to give
- * a heuristic on how much time is spent on the code from the template corresponding to
- * the frame, and to give a termination criterion to avoid nesting templates too deeply.
+ * The {@link TemplateFrame} keeps track of the nested hashtag replacements available
+ * inside the {@link Template}, as well as the unique id of the {@link Template} use,
+ * and how much fuel is available for recursive {@link Template} calls. The name of
+ * the {@link TemplateFrame} indicates that it corresponds to the structure of the
+ * {@link Template}, whereas the {@link CodeFrame} corresponds to the structure of
+ * the generated code.
  *
  * <p>
- * See also {@link CodeFrame} for more explanations about the frames.
+ * The unique id is used to deconflict names using {@link Template#$}.
+ *
+ * <p>
+ * A {@link Template} can have multiple {@link TemplateFrame}s, if there are nested
+ * scopes. The outermost {@link TemplateFrame} determines the id of the {@link Template}
+ * use and performs the subtraction of fuel from the outer {@link Template}. Inner
+ * {@link TemplateFrame}s ensure the correct availability of hashtag replacement and
+ * {@link Template#setFuelCost} definitions, so that they are local to their scope and
+ * nested scopes, and only escape if the scope is transparent.
+ *
+ * <p>
+ * The hashtag replacements are a set of key-value pairs from the template arguments
+ * and queries such as {@link Template#let} definitions. Each {@link TemplateFrame}
+ * has such a set of hashtag replacements, and implicitly provides access to the
+ * hashtag replacements of the outer {@link TemplateFrame}s, up to the outermost
+ * of the current {@link Template}. If a hashtag replacement is added in a scope,
+ * we have to traverse to outer scopes until we find one that is not transparent
+ * for hashtags (at most it is the frame of the Template), and insert it there.
+ * The hashtag replacent is local to that frame, and accessible for any frames nested
+ * inside it, but not inside other Templates. The hashtag replacement disappears once
+ * the corresponding scope is exited, i.e. the frame removed.
+ *
+ * <p>
+ * The {@link #parent} relationship provides a trace for the use chain of templates and
+ * their inner scopes. The {@link #fuel} is reduced over this chain to give a heuristic
+ * on how deeply nested the code is at a given point, correlating to the runtime that
+ * would be spent if the code was executed. The idea is that once the fuel is depleated,
+ * we do not want to nest more deeply, so that there is a reasonable chance that the
+ * execution of the generated code can terminate.
+ *
+ * <p>
+ * The {@link TemplateFrame} thus implements the hashtag and {@link Template#setFuelCost}
+ * non-transparency aspect of {@link ScopeToken}.
+ *
+ * <p>
+ * See also {@link CodeFrame} for more explanations about the frames. Note, that while
+ * {@link TemplateFrame} always nests inward, even with {@link Hook#insert}, the
+ * {@link CodeFrame} can also jump to the {@link Hook#anchor} {@link CodeFrame} when
+ * using {@link Hook#insert}.
  */
 class TemplateFrame {
     final TemplateFrame parent;
+    private final boolean isInnerScope;
     private final int id;
     private final Map<String, String> hashtagReplacements = new HashMap<>();
     final float fuel;
     private float fuelCost;
+    private final boolean isTransparentForHashtag;
+    private final boolean isTransparentForFuel;
 
     public static TemplateFrame makeBase(int id, float fuel) {
-        return new TemplateFrame(null, id, fuel, 0.0f);
+        return new TemplateFrame(null, false, id, fuel, 0.0f, false, false);
     }
 
     public static TemplateFrame make(TemplateFrame parent, int id) {
-        return new TemplateFrame(parent, id, parent.fuel - parent.fuelCost, Template.DEFAULT_FUEL_COST);
+        float fuel = parent.fuel - parent.fuelCost;
+        return new TemplateFrame(parent, false, id, fuel, Template.DEFAULT_FUEL_COST, false, false);
     }
 
-    private TemplateFrame(TemplateFrame parent, int id, float fuel, float fuelCost) {
+    public static TemplateFrame makeInnerScope(TemplateFrame parent,
+                                               boolean isTransparentForHashtag,
+                                               boolean isTransparentForFuel) {
+        // We keep the id of the parent, so that we have the same dollar replacements.
+        // And we subtract no fuel, but forward the cost.
+        return new TemplateFrame(parent, true, parent.id, parent.fuel, parent.fuelCost,
+                                 isTransparentForHashtag, isTransparentForFuel);
+    }
+
+    private TemplateFrame(TemplateFrame parent,
+                          boolean isInnerScope,
+                          int id,
+                          float fuel,
+                          float fuelCost,
+                          boolean isTransparentForHashtag,
+                          boolean isTransparentForFuel) {
         this.parent = parent;
+        this.isInnerScope = isInnerScope;
         this.id = id;
         this.fuel = fuel;
         this.fuelCost = fuelCost;
+        this.isTransparentForHashtag = isTransparentForHashtag;
+        this.isTransparentForFuel = isTransparentForFuel;
     }
 
     public String $(String name) {
@@ -78,8 +136,15 @@ class TemplateFrame {
         if (!Renderer.isValidHashtagOrDollarName(key)) {
             throw new RendererException("Is not a valid hashtag replacement name: '" + key + "'.");
         }
-        if (hashtagReplacements.putIfAbsent(key, value) != null) {
-            throw new RendererException("Duplicate hashtag replacement for #" + key);
+        String previous = findHashtagReplacementInScopes(key);
+        if (previous != null) {
+            throw new RendererException("Duplicate hashtag replacement for #" + key + ". " +
+                                        "previous: " + previous + ", new: " + value);
+        }
+        if (isTransparentForHashtag) {
+            parent.addHashtagReplacement(key, value);
+        } else {
+            hashtagReplacements.put(key, value);
         }
     }
 
@@ -87,13 +152,27 @@ class TemplateFrame {
         if (!Renderer.isValidHashtagOrDollarName(key)) {
             throw new RendererException("Is not a valid hashtag replacement name: '" + key + "'.");
         }
-        if (hashtagReplacements.containsKey(key)) {
-            return hashtagReplacements.get(key);
+        String value = findHashtagReplacementInScopes(key);
+        if (value != null) {
+            return value;
         }
         throw new RendererException("Missing hashtag replacement for #" + key);
     }
 
+    private String findHashtagReplacementInScopes(String key) {
+        if (hashtagReplacements.containsKey(key)) {
+            return hashtagReplacements.get(key);
+        }
+        if (!isInnerScope) {
+            return null;
+        }
+        return parent.findHashtagReplacementInScopes(key);
+    }
+
     void setFuelCost(float fuelCost) {
         this.fuelCost = fuelCost;
+        if (isTransparentForFuel) {
+            parent.setFuelCost(fuelCost);
+        }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java
index 47262f152d4..ffbfcfdf2d0 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java
@@ -49,7 +49,7 @@ public sealed abstract class TemplateToken implements Token
         }
 
         @Override
-        public TemplateBody instantiate() {
+        public ScopeToken instantiate() {
             return zeroArgs.instantiate();
         }
 
@@ -74,7 +74,7 @@ public sealed abstract class TemplateToken implements Token
         }
 
         @Override
-        public TemplateBody instantiate() {
+        public ScopeToken instantiate() {
             return oneArgs.instantiate(arg1);
         }
 
@@ -104,7 +104,7 @@ public sealed abstract class TemplateToken implements Token
         }
 
         @Override
-        public TemplateBody instantiate() {
+        public ScopeToken instantiate() {
             return twoArgs.instantiate(arg1, arg2);
         }
 
@@ -138,7 +138,7 @@ public sealed abstract class TemplateToken implements Token
         }
 
         @Override
-        public TemplateBody instantiate() {
+        public ScopeToken instantiate() {
             return threeArgs.instantiate(arg1, arg2, arg3);
         }
 
@@ -150,7 +150,7 @@ public sealed abstract class TemplateToken implements Token
         }
     }
 
-    abstract TemplateBody instantiate();
+    abstract ScopeToken instantiate();
 
     @FunctionalInterface
     interface ArgumentVisitor {
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Token.java b/test/hotspot/jtreg/compiler/lib/template_framework/Token.java
index 0e9f9b272c5..6e9d5f7650a 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/Token.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Token.java
@@ -24,16 +24,25 @@
 package compiler.lib.template_framework;
 
 /**
- * The {@link Template#body} and {@link Hook#anchor} are given a list of tokens, which are either
+ * The {@link Template#scope} and {@link Hook#anchor} are given a list of tokens, which are either
  * {@link Token}s or {@link String}s or some permitted boxed primitives.
  */
 public sealed interface Token permits StringToken,
-                               TemplateToken,
-                               TemplateToken.ZeroArgs,
-                               TemplateToken.OneArg,
-                               TemplateToken.TwoArgs,
-                               TemplateToken.ThreeArgs,
-                               HookAnchorToken,
-                               HookInsertToken,
-                               AddNameToken,
-                               NothingToken {}
+                                      TemplateToken,
+                                      TemplateToken.ZeroArgs,
+                                      TemplateToken.OneArg,
+                                      TemplateToken.TwoArgs,
+                                      TemplateToken.ThreeArgs,
+                                      HookAnchorToken,
+                                      HookInsertToken,
+                                      HookIsAnchoredToken,
+                                      AddNameToken,
+                                      NameSampleToken,
+                                      NameForEachToken,
+                                      NamesToListToken,
+                                      NameCountToken,
+                                      NameHasAnyToken,
+                                      LetToken,
+                                      ScopeToken,
+                                      ScopeTokenImpl,
+                                      SetFuelCostToken {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TokenParser.java b/test/hotspot/jtreg/compiler/lib/template_framework/TokenParser.java
index 0c335bd4fb8..bee6246bdc5 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/TokenParser.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TokenParser.java
@@ -31,7 +31,7 @@ import java.util.List;
  * Helper class for {@link Token}, to keep the parsing methods package private.
  *
  * <p>
- * The {@link Template#body} and {@link Hook#anchor} are given a list of tokens, which are either
+ * The {@link Template#scope} and {@link Hook#anchor} are given a list of tokens, which are either
  * {@link Token}s or {@link String}s or some permitted boxed primitives. These are then parsed
  * and all non-{@link Token}s are converted to {@link StringToken}s. The parsing also flattens
  * {@link List}s.
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/Expression.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/Expression.java
index 360937c8f7f..43ab16af415 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/Expression.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/Expression.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 
 /**
  * {@link Expression}s model Java expressions, that have a list of arguments with specified
@@ -357,7 +357,7 @@ public class Expression {
         }
         tokens.add(strings.getLast());
 
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             tokens
         ));
         return template.asToken();
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
index 46a9d5bbabe..c0db3d51545 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
@@ -33,7 +33,7 @@ import compiler.lib.generators.RestrictableGenerator;
 import compiler.lib.template_framework.DataName;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 
 /**
  * The {@link PrimitiveType} models Java's primitive types, and provides a set
@@ -190,7 +190,7 @@ public final class PrimitiveType implements CodeGenerationDataNameType {
      * @return a TemplateToken that holds all the {@code LibraryRNG} class.
      */
     public static TemplateToken generateLibraryRNG() {
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             """
             public static class LibraryRNG {
                 private static final Random RANDOM = Utils.getRandomInstance();
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/TestFrameworkClass.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/TestFrameworkClass.java
index 5194b75af43..a9db9285b78 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/TestFrameworkClass.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/TestFrameworkClass.java
@@ -30,7 +30,7 @@ import compiler.lib.ir_framework.TestFramework;
 import compiler.lib.compile_framework.CompileFramework;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 
 /**
@@ -51,7 +51,7 @@ public final class TestFrameworkClass {
     private TestFrameworkClass() {}
 
     /**
-     * This method renders a list of {@code testTemplateTokens} into the body of a class
+     * This method renders a list of {@code testTemplateTokens} into the scope of a class
      * and generates a {@code main} method which launches the {@link TestFramework}
      * to run the generated tests.
      *
@@ -81,7 +81,7 @@ public final class TestFrameworkClass {
                                 final Set<String> imports,
                                 final String classpath,
                                 final List<TemplateToken> testTemplateTokens) {
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             let("packageName", packageName),
             let("className", className),
             let("classpath", classpath),
@@ -96,7 +96,7 @@ public final class TestFrameworkClass {
             public class #className {
             // --- CLASS_HOOK insertions start ---
             """,
-            Hooks.CLASS_HOOK.anchor(
+            Hooks.CLASS_HOOK.anchor(scope(
             """
             // --- CLASS_HOOK insertions end   ---
                 public static void main(String[] vmFlags) {
@@ -108,7 +108,7 @@ public final class TestFrameworkClass {
             // --- LIST OF TESTS start ---
             """,
             testTemplateTokens
-            ),
+            )),
             """
             // --- LIST OF TESTS end   ---
             }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingFuzzer.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingFuzzer.java
index 62e474ecb2c..5d20ce659b9 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingFuzzer.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingFuzzer.java
@@ -61,7 +61,7 @@ import compiler.lib.compile_framework.*;
 import compiler.lib.generators.Generators;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 import static compiler.lib.template_framework.Template.$;
 
@@ -333,7 +333,7 @@ public class TestAliasingFuzzer {
         }
 
         public TemplateToken index(String invar0, String[] invarRest) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("con", con),
                 let("ivScale", ivScale),
                 let("invar0Scale", invar0Scale),
@@ -349,7 +349,7 @@ public class TestAliasingFuzzer {
         // MemorySegment need to be long-addressed, otherwise there can be int-overflow
         // in the index, and that prevents RangeCheck Elimination and Vectorization.
         public TemplateToken indexLong(String invar0, String[] invarRest) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("con", con),
                 let("ivScale", ivScale),
                 let("invar0Scale", invar0Scale),
@@ -365,7 +365,7 @@ public class TestAliasingFuzzer {
 
     // Mirror the IndexForm from the generator to the test.
     public static TemplateToken generateIndexForm() {
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             """
             private static final Random RANDOM = Utils.getRandomInstance();
 
@@ -610,7 +610,7 @@ public class TestAliasingFuzzer {
                 for (int i = 0; i < indexFormNames.length; i++) {
                     indexFormNames[i] = $("index" + i);
                 }
-                return body(
+                return scope(
                     """
                     // --- $test start ---
                     """,
@@ -662,7 +662,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateArrayField(String name, MyType type) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("size", containerByteSize / type.byteSize()),
                 let("name", name),
                 let("type", type),
@@ -676,7 +676,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateMemorySegmentField(String name, MyType type) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("size", containerByteSize / type.byteSize()),
                 let("byteSize", containerByteSize),
                 let("name", name),
@@ -698,7 +698,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateIndexField(String name, IndexForm form) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("name", name),
                 let("form", form.generate()),
                 """
@@ -709,7 +709,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateTestFields(String[] invarRest, String[] containerNames, String[] indexFormNames) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("ivType", isLongIvType ? "long" : "int"),
                 """
                 // invarRest fields:
@@ -741,7 +741,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateContainerInitArray(String name) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("size", containerByteSize / containerElementType.byteSize()),
                 let("name", name),
                 """
@@ -753,7 +753,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateContainerInitMemorySegment(String name) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("size", containerByteSize / containerElementType.byteSize()),
                 let("name", name),
                 """
@@ -765,7 +765,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateContainerInit(String[] containerNames) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 """
                 // Init containers from original data:
                 """,
@@ -784,7 +784,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateContainerAliasingAssignment(int i, String name1, String name2, String iterations) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("i", i),
                 let("name1", name1),
                 let("name2", name2),
@@ -798,7 +798,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateContainerAliasing(String[] containerNames, String iterations) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 """
                 // Container aliasing:
                 """,
@@ -832,7 +832,7 @@ public class TestAliasingFuzzer {
 
             if (accessIndexForm.length != 2) { throw new RuntimeException("not yet implemented"); }
 
-            var templateSplitRanges = Template.make(() -> body(
+            var templateSplitRanges = Template.make(() -> scope(
                 let("size", size),
                 """
                 int middle = RANDOM.nextInt(#size / 3, #size * 2 / 3);
@@ -865,7 +865,7 @@ public class TestAliasingFuzzer {
                 """
             ));
 
-            var templateWholeRanges = Template.make(() -> body(
+            var templateWholeRanges = Template.make(() -> scope(
                 let("size", size),
                 """
                 var r0 = new IndexForm.Range(0, #size);
@@ -873,7 +873,7 @@ public class TestAliasingFuzzer {
                 """
             ));
 
-            var templateRandomRanges = Template.make(() -> body(
+            var templateRandomRanges = Template.make(() -> scope(
                 let("size", size),
                 """
                 int lo0 = RANDOM.nextInt(0, #size * 3 / 4);
@@ -883,7 +883,7 @@ public class TestAliasingFuzzer {
                 """
             ));
 
-            var templateSmallOverlapRanges = Template.make(() -> body(
+            var templateSmallOverlapRanges = Template.make(() -> scope(
                 // Idea: same size ranges, with size "range". A small overlap,
                 //       so that bad runtime checks would create wrong results.
                 let("size", size),
@@ -907,7 +907,7 @@ public class TestAliasingFuzzer {
                 // -> safe with rnd = size/10
             ));
 
-            var templateAnyRanges = Template.make(() -> body(
+            var templateAnyRanges = Template.make(() -> scope(
                 switch(RANDOM.nextInt(4)) {
                     case 0 -> templateSplitRanges.asToken();
                     case 1 -> templateWholeRanges.asToken();
@@ -917,7 +917,7 @@ public class TestAliasingFuzzer {
                 }
             ));
 
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 """
                 // Generate ranges:
                 """,
@@ -941,7 +941,7 @@ public class TestAliasingFuzzer {
             // We want there to be at least 1000 iterations.
             final int minIvRange = ivStrideAbs * 1000;
 
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("containerByteSize", containerByteSize),
                 """
                 // Compute loop bounds and loop invariants.
@@ -949,7 +949,7 @@ public class TestAliasingFuzzer {
                 int ivHi = ivLo + #containerByteSize;
                 """,
                 IntStream.range(0, indexFormNames.length).mapToObj(i ->
-                    Template.make(() -> body(
+                    Template.make(() -> scope(
                         let("i", i),
                         let("form", indexFormNames[i]),
                         """
@@ -990,7 +990,7 @@ public class TestAliasingFuzzer {
                         """,
                         IntStream.range(0, indexFormNames.length).mapToObj(i1 ->
                             IntStream.range(0, i1).mapToObj(i2 ->
-                                Template.make(() -> body(
+                                Template.make(() -> scope(
                                     let("i1", i1),
                                     let("i2", i2),
                                     // i1 < i2 or i1 > i2
@@ -1021,7 +1021,7 @@ public class TestAliasingFuzzer {
 
 
         private TemplateToken generateCallMethod(String output, String methodName, String containerPrefix) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("output", output),
                 let("methodName", methodName),
                 "var #output = #methodName(",
@@ -1034,7 +1034,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateIRRules() {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 switch (containerKind) {
                     case ContainerKind.ARRAY ->
                         generateIRRulesArray();
@@ -1094,7 +1094,7 @@ public class TestAliasingFuzzer {
         // Regular array-accesses are vectorized quite predictably, and we can create nice
         // IR rules - even for cases where we do not expect vectorization.
         private TemplateToken generateIRRulesArray() {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("T", containerElementType.letter()),
                 switch (accessScenario) {
                     case COPY_LOAD_STORE ->
@@ -1145,7 +1145,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateIRRulesMemorySegmentAtIndex() {
-           var template = Template.make(() -> body(
+           var template = Template.make(() -> scope(
                 """
                 // Unfortunately, there are some issues that prevent RangeCheck elimination.
                 // The cases are currently quite unpredictable, so we cannot create any IR
@@ -1158,7 +1158,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateIRRulesMemorySegmentLongAdrStride() {
-           var template = Template.make(() -> body(
+           var template = Template.make(() -> scope(
                 """
                 // Unfortunately, there are some issues that prevent RangeCheck elimination.
                 // The cases are currently quite unpredictable, so we cannot create any IR
@@ -1169,7 +1169,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateIRRulesMemorySegmentLongAdrScale() {
-           var template = Template.make(() -> body(
+           var template = Template.make(() -> scope(
                 """
                 // Unfortunately, there are some issues that prevent RangeCheck elimination.
                 // The cases are currently quite unpredictable, so we cannot create any IR
@@ -1180,7 +1180,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateTestMethod(String methodName, String[] invarRest) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("methodName", methodName),
                 let("containerElementType", containerElementType),
                 let("ivStrideAbs", ivStrideAbs),
@@ -1230,7 +1230,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateTestLoopIterationArray(String[] invarRest) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("type", containerElementType),
                 switch (accessScenario) {
                     case COPY_LOAD_STORE ->
@@ -1245,7 +1245,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateTestLoopIterationMemorySegmentAtIndex(String[] invarRest) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("type0", accessType[0]),
                 let("type1", accessType[1]),
                 let("type0Layout", accessType[0].layout()),
@@ -1265,7 +1265,7 @@ public class TestAliasingFuzzer {
         }
 
         private TemplateToken generateTestLoopIterationMemorySegmentLongAdr(String[] invarRest) {
-            var template = Template.make(() -> body(
+            var template = Template.make(() -> scope(
                 let("type0", accessType[0]),
                 let("type1", accessType[1]),
                 let("type0Layout", accessType[0].layout()),
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java
index c5a4528f63d..784f1ded065 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java
@@ -43,7 +43,7 @@ import compiler.lib.generators.RestrictableGenerator;
 
 import compiler.lib.compile_framework.*;
 import compiler.lib.template_framework.Template;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 
 /**
@@ -96,7 +96,7 @@ public class TestAdvanced {
         // - The GOLD value is computed at the beginning, hopefully by the interpreter.
         // - The test method is eventually compiled, and the values are verified by the
         //   check method.
-        var testTemplate = Template.make("typeName", "operator", "generator", (String typeName, String operator, MyGenerator generator) -> body(
+        var testTemplate = Template.make("typeName", "operator", "generator", (String typeName, String operator, MyGenerator generator) -> scope(
             let("con1", generator.next()),
             let("con2", generator.next()),
             """
@@ -116,7 +116,7 @@ public class TestAdvanced {
         ));
 
         // Template for the Class.
-        var classTemplate = Template.make("types", (List<Type> types) -> body(
+        var classTemplate = Template.make("types", (List<Type> types) -> scope(
             let("classpath", comp.getEscapedClassPathOfCompiledClasses()),
             """
             package p.xyz;
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java
index c21d2492fc7..6a0a2d3786a 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java
@@ -40,7 +40,7 @@ import java.util.Set;
 import compiler.lib.compile_framework.*;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 import compiler.lib.template_framework.library.Expression;
 import compiler.lib.template_framework.library.Operations;
@@ -78,7 +78,7 @@ public class TestExpressions {
             // precision results from some operators. We only compare the results if we know that the
             // result is deterministically the same.
             TemplateToken expressionToken = expression.asToken(expression.argumentTypes.stream().map(t -> t.con()).toList());
-            return body(
+            return scope(
                 let("returnType", expression.returnType),
                 """
                 @Test
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java
index a04a5771cb4..b1f5f74e682 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java
@@ -41,7 +41,8 @@ import java.util.HashMap;
 import compiler.lib.compile_framework.*;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
+import static compiler.lib.template_framework.Template.transparentScope;
 import static compiler.lib.template_framework.Template.dataNames;
 import static compiler.lib.template_framework.Template.let;
 import static compiler.lib.template_framework.Template.$;
@@ -77,7 +78,7 @@ public class TestPrimitiveTypes {
         Map<String, TemplateToken> tests = new HashMap<>();
 
         // The boxing tests check if we can autobox with "boxedTypeName".
-        var boxingTemplate = Template.make("name", "type", (String name, PrimitiveType type) -> body(
+        var boxingTemplate = Template.make("name", "type", (String name, PrimitiveType type) -> scope(
             let("CON1", type.con()),
             let("CON2", type.con()),
             let("Boxed", type.boxedTypeName()),
@@ -99,7 +100,7 @@ public class TestPrimitiveTypes {
         }
 
         // Integral and Float types have a size. Also test if "isFloating" is correct.
-        var integralFloatTemplate = Template.make("name", "type", (String name, PrimitiveType type) -> body(
+        var integralFloatTemplate = Template.make("name", "type", (String name, PrimitiveType type) -> scope(
             let("size", type.byteSize()),
             let("isFloating", type.isFloating()),
             """
@@ -129,27 +130,31 @@ public class TestPrimitiveTypes {
 
         // Finally, test the type by creating some DataNames (variables), and sampling
         // from them. There should be no cross-over between the types.
-        var variableTemplate = Template.make("type", (PrimitiveType type) -> body(
+        // IMPORTANT: since we are adding the DataName via an inserted Template, we
+        //            must chose a "transparentScope", so that the DataName escapes. If we
+        //            instead chose "scope", the test would fail, because it later
+        //            finds no DataNames when we sample.
+        var variableTemplate = Template.make("type", (PrimitiveType type) -> transparentScope(
             let("CON", type.con()),
-            addDataName($("var"), type, MUTABLE),
+            addDataName($("var"), type, MUTABLE), // escapes the Template
             """
             #type $var = #CON;
             """
         ));
 
-        var sampleTemplate = Template.make("type", (PrimitiveType type) -> body(
-            let("var", dataNames(MUTABLE).exactOf(type).sample().name()),
+        var sampleTemplate = Template.make("type", (PrimitiveType type) -> scope(
             let("CON", type.con()),
+            dataNames(MUTABLE).exactOf(type).sampleAndLetAs("var"),
             """
             #var = #CON;
             """
         ));
 
-        var namesTemplate = Template.make(() -> body(
+        var namesTemplate = Template.make(() -> scope(
             """
             public static void test_names() {
             """,
-            Hooks.METHOD_HOOK.anchor(
+            Hooks.METHOD_HOOK.anchor(scope(
                 Collections.nCopies(10,
                     CodeGenerationDataNameType.PRIMITIVE_TYPES.stream().map(type ->
                         Hooks.METHOD_HOOK.insert(variableTemplate.asToken(type))
@@ -161,7 +166,7 @@ public class TestPrimitiveTypes {
                 Collections.nCopies(10,
                     CodeGenerationDataNameType.PRIMITIVE_TYPES.stream().map(sampleTemplate::asToken).toList()
                 )
-            ),
+            )),
             """
             }
             """
@@ -172,7 +177,7 @@ public class TestPrimitiveTypes {
         // Test runtime random value generation with LibraryRNG
         // Runtime random number generation of a given primitive type can be very helpful
         // when writing tests that require random inputs.
-        var libraryRNGWithTypeTemplate = Template.make("type", (PrimitiveType type) -> body(
+        var libraryRNGWithTypeTemplate = Template.make("type", (PrimitiveType type) -> scope(
             """
             {
                 // Fill an array with 1_000 random values. Every type has at least 2 values,
@@ -196,7 +201,7 @@ public class TestPrimitiveTypes {
             """
         ));
 
-        var libraryRNGTemplate = Template.make(() -> body(
+        var libraryRNGTemplate = Template.make(() -> scope(
             // Make sure we instantiate the LibraryRNG class.
             PrimitiveType.generateLibraryRNG(),
             // Now we can use it inside the test.
@@ -213,7 +218,7 @@ public class TestPrimitiveTypes {
 
         // Finally, put all the tests together in a class, and invoke all
         // tests from the main method.
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             """
             package p.xyz;
 
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java
index e06671ca951..c8afb34e423 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java
@@ -34,7 +34,7 @@ package template_framework.examples;
 
 import compiler.lib.compile_framework.*;
 import compiler.lib.template_framework.Template;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 
 public class TestSimple {
 
@@ -61,7 +61,7 @@ public class TestSimple {
     // Generate a source Java file as String
     public static String generate() {
         // Create a Template with two arguments.
-        var template = Template.make("arg1", "arg2", (Integer arg1, String arg2) -> body(
+        var template = Template.make("arg1", "arg2", (Integer arg1, String arg2) -> scope(
             """
             package p.xyz;
             public class InnerTest {
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
index faa05b29d82..ed542180bad 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
@@ -43,7 +43,9 @@ import compiler.lib.template_framework.Hook;
 import compiler.lib.template_framework.TemplateBinding;
 import compiler.lib.template_framework.DataName;
 import compiler.lib.template_framework.StructuralName;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
+import static compiler.lib.template_framework.Template.transparentScope;
+import static compiler.lib.template_framework.Template.hashtagScope;
 import static compiler.lib.template_framework.Template.let;
 import static compiler.lib.template_framework.Template.$;
 import static compiler.lib.template_framework.Template.fuel;
@@ -68,13 +70,14 @@ public class TestTutorial {
         comp.addJavaSourceCode("p.xyz.InnerTest2",  generateWithTemplateArguments());
         comp.addJavaSourceCode("p.xyz.InnerTest3",  generateWithHashtagAndDollarReplacements());
         comp.addJavaSourceCode("p.xyz.InnerTest3b", generateWithHashtagAndDollarReplacements2());
+        comp.addJavaSourceCode("p.xyz.InnerTest3c", generateWithHashtagAndDollarReplacements3());
         comp.addJavaSourceCode("p.xyz.InnerTest4",  generateWithCustomHooks());
         comp.addJavaSourceCode("p.xyz.InnerTest5",  generateWithLibraryHooks());
         comp.addJavaSourceCode("p.xyz.InnerTest6",  generateWithRecursionAndBindingsAndFuel());
         comp.addJavaSourceCode("p.xyz.InnerTest7",  generateWithDataNamesSimple());
         comp.addJavaSourceCode("p.xyz.InnerTest8",  generateWithDataNamesForFieldsAndVariables());
-        comp.addJavaSourceCode("p.xyz.InnerTest9a", generateWithDataNamesAndScopes1());
-        comp.addJavaSourceCode("p.xyz.InnerTest9b", generateWithDataNamesAndScopes2());
+        comp.addJavaSourceCode("p.xyz.InnerTest9a", generateWithScopes1());
+        comp.addJavaSourceCode("p.xyz.InnerTest9b", generateWithScopes2());
         comp.addJavaSourceCode("p.xyz.InnerTest10", generateWithDataNamesForFuzzing());
         comp.addJavaSourceCode("p.xyz.InnerTest11", generateWithStructuralNamesForMethods());
 
@@ -91,6 +94,7 @@ public class TestTutorial {
         comp.invoke("p.xyz.InnerTest2",  "main", new Object[] {});
         comp.invoke("p.xyz.InnerTest3",  "main", new Object[] {});
         comp.invoke("p.xyz.InnerTest3b", "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest3c", "main", new Object[] {});
         comp.invoke("p.xyz.InnerTest4",  "main", new Object[] {});
         comp.invoke("p.xyz.InnerTest5",  "main", new Object[] {});
         comp.invoke("p.xyz.InnerTest6",  "main", new Object[] {});
@@ -105,9 +109,9 @@ public class TestTutorial {
     // This example shows the use of various Tokens.
     public static String generateWithListOfTokens() {
         // A Template is essentially a function / lambda that produces a
-        // token body, which is a list of Tokens that are concatenated.
-        var templateClass = Template.make(() -> body(
-            // The "body" method is filled by a sequence of "Tokens".
+        // scope, which contains a list of Tokens that are concatenated.
+        var templateClass = Template.make(() -> scope(
+            // The "scope" arguments are a sequence of "Tokens".
             // These can be Strings and multi-line Strings, but also
             // boxed primitives.
             """
@@ -141,14 +145,14 @@ public class TestTutorial {
     // This example shows the use of Templates, with and without arguments.
     public static String generateWithTemplateArguments() {
         // A Template with no arguments.
-        var templateHello = Template.make(() -> body(
+        var templateHello = Template.make(() -> scope(
             """
             System.out.println("Hello");
             """
         ));
 
         // A Template with a single Integer argument.
-        var templateCompare = Template.make("arg", (Integer arg) -> body(
+        var templateCompare = Template.make("arg", (Integer arg) -> scope(
             "System.out.println(", arg, ");\n",  // capture arg via lambda argument
             "System.out.println(#arg);\n",       // capture arg via hashtag replacement
             "System.out.println(#{arg});\n",     // capture arg via hashtag replacement with brackets
@@ -156,7 +160,7 @@ public class TestTutorial {
             // argument values into Strings. However, since these are not (yet)
             // available, the Template Framework provides two alternative ways of
             // formatting Strings:
-            // 1) By appending to the comma-separated list of Tokens passed to body().
+            // 1) By appending to the comma-separated list of Tokens passed to scope().
             //    Appending as a Token works whenever one has a reference to the Object
             //    in Java code. But often, this is rather cumbersome and looks awkward,
             //    given all the additional quotes and commands required. Hence, it
@@ -180,7 +184,7 @@ public class TestTutorial {
 
         // A Template that creates the body of the Class and main method, and then
         // uses the two Templates above inside it.
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
@@ -204,8 +208,16 @@ public class TestTutorial {
     // Note: hashtag replacements are a workaround for the missing string templates.
     //       If we had string templates, we could just capture the typed lambda
     //       arguments, and use them directly in the String via string templating.
+    //
+    // Important: hashtag replacements are always constrained to a single template
+    //            and are not available in any nested templates. Hashtag replacements
+    //            are only there to facilitate string templating within the limited
+    //            scope of a template. You may consider it like a "local variable"
+    //            for code generation purposes only.
+    //            If you need to pass some value to a nested Template, consider using
+    //            a Template argument, and capturing that Template argument.
     public static String generateWithHashtagAndDollarReplacements() {
-        var template1 = Template.make("x", (Integer x) -> body(
+        var template1 = Template.make("x", (Integer x) -> scope(
             // We have the "#x" hashtag replacement from the argument capture above.
             // Additionally, we can define "#con" as a hashtag replacement from let:
             let("con", 3 * x),
@@ -219,29 +231,27 @@ public class TestTutorial {
             """
         ));
 
-        var template2 = Template.make("x", (Integer x) ->
+        var template2 = Template.make("x", (Integer x) -> scope(
             // Sometimes it can be helpful to not just create a hashtag replacement
             // with let, but also to capture the variable to use it as lambda parameter.
-            let("y", 11 * x, y ->
-                body(
-                    """
-                    System.out.println("T2: #x, #y");
-                    """,
-                    template1.asToken(y)
-                )
-            )
-        );
+            let("y", 11 * x, y -> scope(
+                """
+                System.out.println("T2: #x, #y");
+                """,
+                template1.asToken(y)
+            ))
+        ));
 
         // This template generates an int variable and assigns it a value.
         // Together with template4, we see that each template has a unique renaming
         // for a $-name replacement.
-        var template3 = Template.make("name", "value", (String name, Integer value) -> body(
+        var template3 = Template.make("name", "value", (String name, Integer value) -> scope(
             """
             int #name = #value; // Note: $var is not #name
             """
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             """
             // We will define the variable $var:
             """,
@@ -252,7 +262,7 @@ public class TestTutorial {
             """
         ));
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             // The Template Framework API only guarantees that every Template use
             // has a unique ID. When using the Templates, all we need is that
             // variables from different Template uses do not conflict. But it can
@@ -300,7 +310,7 @@ public class TestTutorial {
     // "INT_CON" and "LONG_CON".
     public static String generateWithHashtagAndDollarReplacements2() {
         // Let us define some final static variables of a specific type.
-        var template1 = Template.make("type", (String type) -> body(
+        var template1 = Template.make("type", (String type) -> scope(
             // The type (e.g. "int") is lower case, let us create the upper case "INT_CON" from it.
             let("TYPE", type.toUpperCase()),
             """
@@ -309,7 +319,7 @@ public class TestTutorial {
         ));
 
         // Let's write a simple class to demonstrate that this works, i.e. produces compilable code.
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
@@ -331,50 +341,221 @@ public class TestTutorial {
         return templateClass.render();
     }
 
+    // We already have used "scope" multiple times, but not explained it yet.
+    // So far, we have seen "scope" mostly in the context of Template scopes, but they
+    // can be used in many contexts as we will see below. They can also be used on
+    // their own and in the use of "let", as we will show right now.
+    //
+    // Scopes are even more relevant for DataNames and Structural names.
+    // See: generateWithDataNamesForFieldsAndVariables
+    // See: generateWithScopes1
+    // See: generateWithScopes2
+    public static String generateWithHashtagAndDollarReplacements3() {
+
+        var template1 = Template.make(() -> scope(
+            // We can use scopes to limit the liveness of hashtag replacements.
+            scope(
+                let("x", 3), // does not escape
+                """
+                static int v1_3 = #x;
+                """
+            ),
+            scope(
+                let("x", 5), // does not escape
+                """
+                static int v1_5 = #x;
+                """
+            ),
+            // Using "scope" does not just limit the liveness / availability
+            // of hashtag replacements, but also of DataNames, StructuralNames,
+            // and setFuelCost. We can use "hashtagScope" to only limit hashtag
+            // replacements.
+            hashtagScope(
+                let("x", 7), // does not escape
+                """
+                static int v1_7 = #x;
+                """
+            ),
+            // Using "transparentScope" means the scope is transparent, and the hashtag
+            // replacements escape the scope.
+            transparentScope(
+                let("x", 11), // escapes the "transparentScope".
+                """
+                static int v1_11a = #x;
+                """
+            ),
+            // The hashtag replacement from the "transparentScope" escaped, and is
+            // still available.
+            """
+            static int v1_11b = #x;
+            """
+        ));
+
+        var template2 = Template.make("x", (Integer x) -> scope(
+            // We can map a list of values to a list of scopes. Using a scope that is
+            // non-transparent for hashtag replacements means that we can reuse the same
+            // hashtag key when looping / streaming over multiple values.
+            List.of(3, 5, 7).stream().map(y -> scope(
+                let("y", y), // does not escape -> allows reuse of hashtag key "y".
+                """
+                static int v2_#{x}_#{y} = #x * #y;
+                """
+            )).toList()
+        ));
+
+        var template3 = Template.make("x", (Integer x) -> scope(
+            // When using a "let" that captures the value in a lambda argument, we have
+            // to choose what kind of scope we generate. In most cases "scope" or
+            // "hashtagScope" are the best, because they limit the hashtag replacement
+            // of "y" to the same scope as the lambda argument.
+            let("y", x * 11, y -> scope(
+                """
+                static int v3a_#{x} = #y;
+                """
+            )),
+            // But in rare cases, we may want "y" and some nested "z" to escape.
+            let("y", x * 11, y -> transparentScope(
+                let("z", y * 2),
+                """
+                static int v3b_#{x} = #y - #z;
+                """
+            )),
+            // Because of the "transparentScope", "y" and "z" have escaped.
+            """
+            static int v3c_#{x} = #y - #z;
+            """,
+            // Side note: We can simulate a "let" without lambda with a "let" that has a lambda.
+            // That is not very useful, but a similar trick can be used for other queries, that
+            // only provide a lambda version, and where we only want to use the hashtag replacement.
+            //
+            // Below we see the standard use of "let", where we add a hashtag replacement for "a"
+            // for the rest of the enclosing scope. We then also use a lambda version of "let"
+            // with a transparent scope, which means that "b" escapes that scope and is also
+            // available in the enclosing scope. In the implementation of the framework, we
+            // actually use a "transparentScope", so the standard "let" is really just syntactic
+            // sugar for the lambda "let" with "transparentScope".
+            let("a", -x),
+            let("b", -x, b -> transparentScope()),
+            """
+            static int v3d_#{x} = #a + #b;
+            """
+        ));
+
+        // Let's write a simple class to demonstrate that this works, i.e. produces compilable code.
+        var templateClass = Template.make(() -> scope(
+            """
+            package p.xyz;
+
+            public class InnerTest3c {
+            """,
+            template1.asToken(),
+            template2.asToken(1),
+            template2.asToken(2),
+            template3.asToken(2),
+            """
+                public static void main() {
+                    if (v1_3 != 3 ||
+                        v1_5 != 5 ||
+                        v1_7 != 7 ||
+                        v1_11a != 11 ||
+                        v1_11b != 11 ||
+                        v2_1_3 != 3 ||
+                        v2_1_5 != 5 ||
+                        v2_1_7 != 7 ||
+                        v2_2_3 != 6 ||
+                        v2_2_5 != 10 ||
+                        v2_2_7 != 14 ||
+                        v3a_2 != 22 ||
+                        v3b_2 != -22 ||
+                        v3c_2 != -22 ||
+                        v3d_2 != -4) {
+                        throw new RuntimeException("Wrong result!");
+                    }
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
     // In this example, we look at the use of Hooks. They allow us to reach back, to outer
     // scopes. For example, we can reach out from inside a method body to a hook anchored at
     // the top of the class, and insert a field.
+    //
+    // When we insert to a hook, we have 3 relevant scopes:
+    // - Anchor scope: the scope defined at "hook.anchor(scope(...))"
+    // - Insertion scope: the scope that is inserted, see "hook.insert(scope(...))"
+    // - Caller scope: the scope we insert from.
+    //
+    // The choice of transparency of an insertion scope (the scope that is inserted) is quite
+    // important. A common use case is to insert a DataName.
+    // See: generateWithDataNamesForFieldsAndVariables
+    // See: generateWithScopes1
+    // See: generateWithScopes2
     public static String generateWithCustomHooks() {
         // We can define a custom hook.
         // Note: generally we prefer using the pre-defined CLASS_HOOK and METHOD_HOOK from the library,
         //       whenever possible. See also the example after this one.
         var myHook = new Hook("MyHook");
 
-        var template1 = Template.make("name", "value", (String name, Integer value) -> body(
+        var template1 = Template.make("name", "value", (String name, Integer value) -> scope(
             """
             public static int #name = #value;
             """
         ));
 
-        var template2 = Template.make("x", (Integer x) -> body(
+        var template2 = Template.make("x", (Integer x) -> scope(
             """
-            // Let us go back to where we anchored the hook with anchor() and define a field named $field there.
-            // Note that in the Java code we have not defined anchor() on the hook, yet. But since it's a lambda
-            // expression, it is not evaluated, yet! Eventually, anchor() will be evaluated before insert() in
-            // this example.
+            // Let us go back to where we anchored the hook with anchor() (see 'templateClass' below) and define a field
+            // named $field1 there.
             """,
-            myHook.insert(template1.asToken($("field"), x)),
+            myHook.insert(scope( // <- insertion scope
+                """
+                public static int $field1 = #x;
+                """
+                // Note that we were able to use the dollar replacement "$field1" and the hashtag
+                // replacement "#x" inside the scope that is inserted to myHook.
+            )),
             """
-            System.out.println("$field: " + $field);
-            if ($field != #x) { throw new RuntimeException("Wrong value!"); }
+            // We can do that by inserting a scope like above, or by inserting a template, like below.
+            //
+            // Which method is used is up to the user. General guidance is if the same code may also
+            // be inserted elsewhere, one should lean towards inserting templates. But in many cases
+            // it is nice to see the inserted code directly, and to be able to use hashtag replacements
+            // from the outer scope directly, without having to route them via template arguments,
+            // as we have to do below.
+            """,
+            // <- caller scope
+            myHook.insert(template1.asToken($("field2"), x)),
+            """
+            System.out.println("$field1: " + $field1);
+            System.out.println("$field2: " + $field2);
+            if ($field1 != #x) { throw new RuntimeException("Wrong value 1!"); }
+            if ($field2 != #x) { throw new RuntimeException("Wrong value 2!"); }
             """
         ));
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
             public class InnerTest4 {
             """,
             // We anchor a Hook outside the main method, but inside the Class.
-            // Anchoring a Hook creates a scope, spanning the braces of the
-            // "anchor" call. Any Hook.insert that happens inside this scope
-            // goes to the top of that scope.
-            myHook.anchor(
+            // Anchoring a Hook requires the definition of an inner scope,
+            // aka the "anchor scope", spanning the braces of the "anchor" call.
+            // Any Hook.insert that happens inside this scope goes to the top of
+            // that scope.
+            myHook.anchor(scope( // <- anchor scope
                 // Any Hook.insert goes here.
                 //
-                // <-------- field_X = 5 ------------------+
-                // <-------- field_Y = 7 -------------+    |
+                // <-------- field1_X = 5 -----------------+
+                //           field2_X = 5                  |
+                //                                         |
+                // <-------- field1_Y = 7 ------------+    |
+                //           field2_Y = 7             |    |
                 //                                    |    |
                 """
                 public static void main() {
@@ -384,7 +565,7 @@ public class TestTutorial {
                 """
                 }
                 """
-            ), // The Hook scope ends here.
+            )), // The Hook scope ends here.
             """
             }
             """
@@ -408,46 +589,54 @@ public class TestTutorial {
     // there is a class scope inside another class scope. Similarly, we can nest lambda bodies
     // inside method bodies, so also METHOD_HOOK can be used in such a "re-entrant" way.
     public static String generateWithLibraryHooks() {
-        var templateStaticField = Template.make("name", "value", (String name, Integer value) -> body(
-            """
-            static { System.out.println("Defining static field #name"); }
-            public static int #name = #value;
-            """
-        ));
 
-        var templateLocalVariable = Template.make("name", "value", (String name, Integer value) -> body(
-            """
-            System.out.println("Defining local variable #name");
-            int #name = #value;
-            """
-        ));
-
-        var templateMethodBody = Template.make(() -> body(
+        var templateMethodBody = Template.make(() -> scope(
             """
             // Let's define a local variable $var and a static field $field.
-            """,
-            Hooks.CLASS_HOOK.insert(templateStaticField.asToken($("field"), 5)),
-            Hooks.METHOD_HOOK.insert(templateLocalVariable.asToken($("var"), 11)),
-            """
+            // Since we are inserting them at the anchor before the code below,
+            // they will already be available:
             System.out.println("$field: " + $field);
             System.out.println("$var: " + $var);
+            """,
+            Hooks.CLASS_HOOK.insert(scope(
+                """
+                static { System.out.println("Defining static field $field"); }
+                public static int $field = 5;
+                """
+            )),
+            Hooks.METHOD_HOOK.insert(scope(
+                """
+                System.out.println("Defining local variable $var");
+                int $var = 11;
+                """
+            )),
+            """
             if ($field * $var != 55) { throw new RuntimeException("Wrong value!"); }
             """
+            // Note: we have used "scope" for the "insert" scope. This is fine here as
+            // we are only working with code and hashtags, but not with DataNames. If
+            // we were to also "addDataName" inside the insert scope, we would have to
+            // make sure that the scope is transparent for DataNames, so that they can
+            // escape to the anchor scope, and can be available to the caller of the
+            // insertion. One might want to use "transparentScope" for the insertion scope.
+            // See: generateWithDataNamesForFieldsAndVariables.
+            // See: generateWithScopes1
+            // See: generateWithScopes2
         ));
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
             public class InnerTest5 {
             """,
             // Class Hook for fields.
-            Hooks.CLASS_HOOK.anchor(
+            Hooks.CLASS_HOOK.anchor(scope(
                 """
                 public static void main() {
                 """,
                 // Method Hook for local variables, and earlier computations.
-                Hooks.METHOD_HOOK.anchor(
+                Hooks.METHOD_HOOK.anchor(scope(
                     """
                     // This is the beginning of the "main" method body.
                     System.out.println("Welcome to main!");
@@ -457,7 +646,7 @@ public class TestTutorial {
                     System.out.println("Going to call other...");
                     other();
                     """
-                ),
+                )),
                 """
                 }
 
@@ -465,7 +654,7 @@ public class TestTutorial {
                 """,
                 // Have a separate method hook for other, so that it can insert
                 // its own local variables.
-                Hooks.METHOD_HOOK.anchor(
+                Hooks.METHOD_HOOK.anchor(scope(
                     """
                     System.out.println("Welcome to other!");
                     """,
@@ -473,11 +662,11 @@ public class TestTutorial {
                     """
                     System.out.println("Done with other.");
                     """
-                ),
+                )),
                 """
                 }
                 """
-            ),
+            )),
             """
             }
             """
@@ -493,7 +682,7 @@ public class TestTutorial {
     public static String generateWithRecursionAndBindingsAndFuel() {
         // Binding allows the use of template1 inside of template1, via the binding indirection.
         var binding1 = new TemplateBinding<Template.OneArg<Integer>>();
-        var template1 = Template.make("depth", (Integer depth) -> body(
+        var template1 = Template.make("depth", (Integer depth) -> scope(
             let("fuel", fuel()),
             """
             System.out.println("At depth #depth with fuel #fuel.");
@@ -514,7 +703,7 @@ public class TestTutorial {
         ));
         binding1.bind(template1);
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
@@ -561,6 +750,12 @@ public class TestTutorial {
     //
     // To get started, we show an example where all DataNames have the same type, and where
     // all Names are mutable. For simplicity, our type represents the primitive int type.
+    //
+    // Note: the template library contains a lot of types that model the Java types,
+    //       such as primitive types ({@code PrimitiveType}). The following examples
+    //       give insight into how those types work. If you are just interested in
+    //       how to use the predefined types, then you can find other examples in
+    //       {@code examples/TestPrimitiveTypes.java}.
     private record MySimpleInt() implements DataName.Type {
         // The type is only subtype of itself. This is relevant when sampling or weighing
         // DataNames, because we do not just sample from the given type, but also its subtypes.
@@ -577,31 +772,25 @@ public class TestTutorial {
     private static final MySimpleInt mySimpleInt = new MySimpleInt();
 
     // In this example, we generate 3 fields, and add their names to the
-    // current scope. In a nested Template, we can then sample one of these
-    // DataNames, which gives us one of the fields. We increment that randomly
-    // chosen field. At the end, we print all three fields.
+    // current scope. We can then sample some of these DataNames, which
+    // gives us one of those fields each time. We increment those randomly
+    // chosen fields. At the end, we print all three fields.
     public static String generateWithDataNamesSimple() {
-        var templateMain = Template.make(() -> body(
-            // Sample a random DataName, i.e. field, and assign its name to
-            // the hashtag replacement "#f".
-            // We are picking a mutable DataName, because we are not just
-            // reading but also writing to the field.
-            let("f", dataNames(MUTABLE).exactOf(mySimpleInt).sample().name()),
-            """
-            // Let us now sample a random field #f, and increment it.
-            #f += 42;
-            """
-        ));
-
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             // Let us define the names for the three fields.
-            // We can then sample from these names in a nested Template.
             // We make all DataNames mutable, and with the same weight of 1,
             // so that they have equal probability of being sampled.
             // Note: the default weight is 1, so we can also omit the weight.
+            //
+            // Also note that DataNames are only available once they are defined:
+            //
+            // Nothing defined, yet: dataNames() = {}
             addDataName($("f1"), mySimpleInt, MUTABLE, 1),
+            // Only now dataNames() contains f1: dataNames() = {f1}
             addDataName($("f2"), mySimpleInt, MUTABLE, 1),
+            // dataNames() = {f1, f2}
             addDataName($("f3"), mySimpleInt, MUTABLE), // omit weight, default is 1.
+            // dataNames() = {f1, f2, f3}
             """
             package p.xyz;
 
@@ -612,18 +801,35 @@ public class TestTutorial {
                 public static int $f3 = 0;
 
                 public static void main() {
-                    // Let us now call the nested template that samples
-                    // a random field and increments it.
+                    // Let us now sample a random field and assign its name to
+                    // the hashtag replacement "a".
                     """,
-                    templateMain.asToken(),
+                    dataNames(MUTABLE).exactOf(mySimpleInt).sampleAndLetAs("a"),
+                    """
+                    // We can now access the field, and increment it.
+                    #a += 42;
+                    // If we are also interested in the type of the field, we can do:
+                    """,
+                    dataNames(MUTABLE).exactOf(mySimpleInt).sampleAndLetAs("b", "bType"),
+                    """
+                    #b += 7;
+                    // In some cases, we may want to capture the DataName directly, which
+                    // requires capturing the value in a lambda that creates an inner scope:
+                    """,
+                    dataNames(MUTABLE).exactOf(mySimpleInt).sample((DataName dn) -> scope(
+                        let("c", dn.name()),
+                        """
+                        #c += 12;
+                        """
+                    )),
                     """
                     // Now, we can print all three fields, and see which
-                    // one was incremented.
+                    // ones were incremented.
                     System.out.println("f1: " + $f1);
                     System.out.println("f2: " + $f2);
                     System.out.println("f3: " + $f3);
-                    // We have two zeros, and one 42.
-                    if ($f1 + $f2 + $f3 != 42) { throw new RuntimeException("wrong result!"); }
+                    // Make sure they add up to the correct sum.
+                    if ($f1 + $f2 + $f3 != 42 + 7 + 12) { throw new RuntimeException("wrong result!"); }
                 }
             }
             """
@@ -662,8 +868,15 @@ public class TestTutorial {
 
     public static String generateWithDataNamesForFieldsAndVariables() {
         // Define a static field.
-        var templateStaticField = Template.make("type", (DataName.Type type) -> body(
-            addDataName($("field"), type, MUTABLE),
+        // Note: it is very important that we use a "transparentScope" for the template here,
+        //       so that the DataName can escape to outer scopes, so that it is available to
+        //       everything that follows the DataName definition in the outer scope.
+        //       (We could also use "hashtagScope", since those are also transparent for
+        //        names. But it is not great style, because template boundaries are
+        //        non-transparent for hashtags and setFuelCost anyway. So we might as
+        //        well just use "transparentScope".)
+        var templateStaticField = Template.make("type", (DataName.Type type) -> transparentScope(
+            addDataName($("field"), type, MUTABLE), // escapes template because of "transparentScope"
             // Note: since we have overridden MyPrimitive::toString, we can use
             //       the type directly as "#type" in the template, which then
             //       gets hashtag replaced with "int" or "long".
@@ -673,8 +886,10 @@ public class TestTutorial {
         ));
 
         // Define a local variable.
-        var templateLocalVariable = Template.make("type", (DataName.Type type) -> body(
-            addDataName($("var"), type, MUTABLE),
+        // Note: it is very important that we use a "transparentScope" for the template here,
+        //       so that the DataName can escape to outer scopes.
+        var templateLocalVariable = Template.make("type", (DataName.Type type) -> transparentScope(
+            addDataName($("var"), type, MUTABLE), // escapes template because of "transparentScope"
             """
             #type $var = 0;
             """
@@ -682,8 +897,8 @@ public class TestTutorial {
 
         // Sample a random field or variable, from those that are available at
         // the current scope.
-        var templateSample = Template.make("type", (DataName.Type type) -> body(
-            let("name", dataNames(MUTABLE).exactOf(type).sample().name()),
+        var templateSample = Template.make("type", (DataName.Type type) -> scope(
+            dataNames(MUTABLE).exactOf(type).sampleAndLetAs("name"),
             // Note: we could also sample from MUTABLE_OR_IMMUTABLE, we will
             //       cover the concept of mutability in an example further down.
             """
@@ -692,18 +907,36 @@ public class TestTutorial {
         ));
 
         // Check how many fields and variables are available at the current scope.
-        var templateStatus = Template.make(() -> body(
-            let("ints", dataNames(MUTABLE).exactOf(myInt).count()),
-            let("longs", dataNames(MUTABLE).exactOf(myLong).count()),
-            // Note: we could also count the MUTABLE_OR_IMMUTABLE, we will
-            //       cover the concept of mutability in an example further down.
+        var templateStatus = Template.make(() -> scope(
+            dataNames(MUTABLE).exactOf(myInt).count(ints -> scope(
+                dataNames(MUTABLE).exactOf(myLong).count(longs -> scope(
+                    // We have now captured the values as Java variables, and can
+                    // use them inside the scope in some "let" definitions.
+                    let("ints", ints),
+                    let("longs", longs),
+                    // Note: we could also count the MUTABLE_OR_IMMUTABLE, we will
+                    //       cover the concept of mutability in an example further down.
+                    """
+                    System.out.println("Status: #ints ints, #longs longs.");
+                    """
+                ))
+            )),
+            // In a real code generation case, we would most likely want to
+            // have the count as a Java variable so that one can take conditional
+            // action based on the value. For that we have to capture the count
+            // with a lambda and inner scope as above. If we only need to have
+            // the count as a hashtag replacement, we can also use the following
+            // trick:
+            dataNames(MUTABLE).exactOf(myInt).count(c -> transparentScope(let("ints", c))),
+            dataNames(MUTABLE).exactOf(myLong).count(c -> transparentScope(let("longs", c))),
+            // Because of the "transparentScope", the hashtag replacements escape.
             """
             System.out.println("Status: #ints ints, #longs longs.");
             """
         ));
 
         // Definition of the main method body.
-        var templateMain = Template.make(() -> body(
+        var templateMain = Template.make(() -> scope(
             """
             System.out.println("Starting inside main...");
             """,
@@ -736,7 +969,7 @@ public class TestTutorial {
 
         // Definition of another method's body. It is in the same class
         // as the main method, so it has access to the same static fields.
-        var templateOther = Template.make(() -> body(
+        var templateOther = Template.make(() -> scope(
             """
             System.out.println("Starting inside other...");
             """,
@@ -755,19 +988,19 @@ public class TestTutorial {
         ));
 
         // Finally, we put it all together in a class.
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
             public class InnerTest8 {
             """,
             // Class Hook for fields.
-            Hooks.CLASS_HOOK.anchor(
+            Hooks.CLASS_HOOK.anchor(scope(
                 """
                 public static void main() {
                 """,
                 // Method Hook for local variables.
-                Hooks.METHOD_HOOK.anchor(
+                Hooks.METHOD_HOOK.anchor(scope(
                     """
                     // This is the beginning of the "main" method body.
                     System.out.println("Welcome to main!");
@@ -777,7 +1010,7 @@ public class TestTutorial {
                     System.out.println("Going to call other...");
                     other();
                     """
-                ),
+                )),
                 """
                 }
 
@@ -785,7 +1018,7 @@ public class TestTutorial {
                 """,
                 // Have a separate method hook for other, where it could insert
                 // its own local variables (but happens not to).
-                Hooks.METHOD_HOOK.anchor(
+                Hooks.METHOD_HOOK.anchor(scope(
                     """
                     System.out.println("Welcome to other!");
                     """,
@@ -793,11 +1026,11 @@ public class TestTutorial {
                     """
                     System.out.println("Done with other.");
                     """
-                ),
+                )),
                 """
                 }
                 """
-            ),
+            )),
             """
             }
             """
@@ -807,83 +1040,119 @@ public class TestTutorial {
         return templateClass.render();
     }
 
-    // Let us have a closer look at how DataNames interact with scopes created by
-    // Templates and Hooks. Additionally, we see how the execution order of the
-    // lambdas and token evaluation affects the availability of DataNames.
-    //
-    // We inject the results directly into verification inside the code, so it
-    // is relatively simple to see what the expected results are.
-    //
-    // For simplicity, we define a simple "list" function. It collects all
-    // field and variable names, and immediately returns the comma separated
-    // list of the names. We can use that to visualize the available names
-    // at any point.
-    public static String listNames() {
-        return "{" + String.join(", ", dataNames(MUTABLE).exactOf(myInt).toList()
-                                       .stream().map(DataName::name).toList()) + "}";
-    }
+    public static String generateWithScopes1() {
 
-    // Even simpler: count the available variables and return the count immediately.
-    public static int countNames() {
-        return dataNames(MUTABLE).exactOf(myInt).count();
-    }
-
-    // Having defined these helper methods, let us start with the first example.
-    // You should start reading this example bottom-up, starting at
-    // templateClass, then going to templateMain and last to templateInner.
-    public static String generateWithDataNamesAndScopes1() {
-
-        var templateInner = Template.make(() -> body(
-            // We just got called from the templateMain. All tokens from there
-            // are already evaluated, so "v1" is now available:
-            let("l1", listNames()),
+        // For the examples below, we need a convenient way of asserting the state
+        // of the available DataNames.
+        var templateVerify = Template.make("count", "hasAny", "toList", (Integer count, Boolean hasAny, String toList) -> scope(
+            dataNames(MUTABLE).exactOf(myInt).count(c -> transparentScope(let("count2", c))),
+            dataNames(MUTABLE).exactOf(myInt).hasAny(h -> transparentScope(let("hasAny2", h))),
+            dataNames(MUTABLE).exactOf(myInt).toList(list -> transparentScope(
+                let("toList2", String.join(", ", list.stream().map(DataName::name).toList()))
+            )),
             """
-            if (!"{v1}".equals("#l1")) { throw new RuntimeException("l1 should have been '{v1}' but was '#l1'"); }
+            if (#count != #count2 ||
+                #hasAny != #hasAny2 ||
+                !"#toList".equals("#toList2")) {
+                throw new RuntimeException("verify failed");
+            }
             """
         ));
 
-        var templateMain = Template.make(() -> body(
-            // So far, no names were defined. We expect "c1" to be zero.
-            let("c1", countNames()),
-            """
-            if (#c1 != 0) { throw new RuntimeException("c1 was not zero but #c1"); }
-            """,
-            // We now add a local variable "v1" to the scope of this templateMain.
-            // This only generates a token, and does not immediately add the name.
-            // The name is only added once we evaluate the tokens, and arrive at
-            // this particular token.
+        var templateMain = Template.make(() -> scope(
+            "// Start with nothing:\n",
+            templateVerify.asToken(0, false, ""),
+            "// Add v1:\n",
             addDataName("v1", myInt, MUTABLE),
-            // We count again with "c2". The variable "v1" is at this point still
-            // in token form, hence it is not yet made available while executing
-            // the template lambda of templateMain.
-            let("c2", countNames()),
+            "int v1 = 1;\n",
+            "// Check that it is visible:\n",
+            templateVerify.asToken(1, true, "v1"),
+            "// Add v2:\n",
+            addDataName("v2", myInt, MUTABLE),
+            "int v2 = 2;\n",
+            "// Check that both are visible:\n",
+            templateVerify.asToken(2, true, "v1, v2"),
+
+            "// Create a local scope:\n",
+            "{\n", scope( // for consistency, we model the code and template scope together.
+                "// Add v3:\n",
+                addDataName("v3", myInt, MUTABLE),
+                "int v3 = 3;\n",
+                "// Check that all are visible:\n",
+                templateVerify.asToken(3, true, "v1, v2, v3")
+            ), "}\n",
+            "// But after the scope, v3 is no longer available:\n",
+            templateVerify.asToken(2, true, "v1, v2"),
+
+            "// Now let's create a list of variables.\n",
+            List.of(4, 5, 6).stream().map(i -> hashtagScope(
+                // The hashtagScope allows hashtag replacements to be local,
+                // and DataNames to escape, so we can use them afterwards.
+                let("i", i),
+                addDataName("v" + i, myInt, MUTABLE),
+                "int v#i = #i;\n"
+            )).toList(),
+            templateVerify.asToken(5, true, "v1, v2, v4, v5, v6"),
+
+            "// Let's multiply all variables by a factor of 2, using forEach:\n",
+            dataNames(MUTABLE).exactOf(myInt).forEach(dn -> scope(
+                let("v", dn.name()),
+                "#v *= 2;\n"
+            )),
+            "// We can also capture the name (v) and type of the DataName:\n",
+            dataNames(MUTABLE).exactOf(myInt).forEach("v", "type", dn -> scope(
+                "#v *= 2;\n"
+            )),
+            "// Yet another option is using toList, but here that is more cumbersome:\n",
+            dataNames(MUTABLE).exactOf(myInt).toList(list -> scope(
+                list.stream().map(dn -> scope(
+                    let("v", dn.name()),
+                    "#v *= 2;\n"
+                )).toList()
+            )),
+
             """
-            if (#c2 != 0) { throw new RuntimeException("c2 was not zero but #c2"); }
+            // We verify the result again.
             """,
-            // But now we call an inner Template. This is added as a TemplateToken.
-            // This means it is not evaluated immediately, but only once we evaluate
-            // the tokens. By that time, all tokens from above are already evaluated
-            // and we see that "v1" is available.
-            templateInner.asToken()
+            templateVerify.asToken(5, true, "v1, v2, v4, v5, v6"),
+            """
+            if (v1 != 1 * 8 ||
+                v2 != 2 * 8 ||
+                v4 != 4 * 8 ||
+                v5 != 5 * 8 ||
+                v6 != 6 * 8) {
+                throw new RuntimeException("wrong value!");
+            }
+            """,
+
+            "// Let us copy each variable:\n",
+            dataNames(MUTABLE).exactOf(myInt).forEach("v", "type", dn -> hashtagScope(
+                // Note that we need a hashtagScope here, so that we can reuse "v" and
+                // "type" as hashtag replacements in each iteration, but still let the
+                // copied DataNames escape.
+                addDataName(dn.name() + "_copy", myInt, MUTABLE),
+                "#type #{v}_copy = #v;\n"
+            )),
+            templateVerify.asToken(10, true, "v1, v2, v4, v5, v6, v1_copy, v2_copy, v4_copy, v5_copy, v6_copy")
         ));
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
             public class InnerTest9a {
             """,
-            Hooks.CLASS_HOOK.anchor(
+            Hooks.CLASS_HOOK.anchor(scope(
             """
                 public static void main() {
             """,
-                Hooks.METHOD_HOOK.anchor(
+                Hooks.METHOD_HOOK.anchor(scope(
                     templateMain.asToken()
-                ),
+                )),
             """
                 }
             """
-            ),
+            )),
             """
             }
             """
@@ -893,111 +1162,129 @@ public class TestTutorial {
         return templateClass.render();
     }
 
-    // Now that we understand this simple example, we go to a more complicated one
-    // where we use Hook.insert. Just as above, you should read this example
-    // bottom-up, starting at templateClass.
-    public static String generateWithDataNamesAndScopes2() {
+    public static String generateWithScopes2() {
 
-        var templateFields = Template.make(() -> body(
-            // We were just called from templateMain. But the code is not
-            // generated into the main scope, rather into the class scope
-            // out in templateClass.
-            // Let us now add a field "f1".
-            addDataName("f1", myInt, MUTABLE),
-            // And let's also generate the code for it.
+        // In this section, we will look at some subtle facts about the behavior of
+        // transparent scopes around hook insertion. This is intended for expert users
+        // so feel free to skip it until you extensively use hook insertion.
+        // More info can also be found in the Javadocs of the Hook class.
+
+        // Helper method to check that the expected DataNames are available.
+        var templateVerify = Template.make("toList", (String toList) -> scope(
+            dataNames(MUTABLE).exactOf(myInt).toList(list -> transparentScope(
+                let("toList2", String.join(", ", list.stream().map(DataName::name).toList()))
+            )),
             """
-            public static int f1 = 42;
-            """,
-            // But why is this DataName now available inside the scope of
-            // templateInner? Does that not mean that "f1" escapes this
-            // templateFields here? Yes it does!
-            // For normal template nesting, the names do not escape the
-            // scope of the nested template. But this here is no normal
-            // template nesting, rather it is an insertion into a Hook,
-            // and we treat those differently. We make the scope of the
-            // inserted templateFields transparent, so that any added
-            // DataNames are added to the scope of the Hook we just
-            // inserted into, i.e. the CLASS_HOOK. This is very important,
-            // if we did not make that scope transparent, we could not
-            // add any DataNames to the class scope anymore, and we could
-            // not add any fields that would be available in the class
-            // scope.
-            Hooks.METHOD_HOOK.anchor(
-                // We now create a separate scope. This one is not the
-                // template scope from above, and it is not transparent.
-                // Hence, "f2" will not be available outside of this
+            if (!"#toList".equals("#toList2")) {
+                throw new RuntimeException("verify failed: '#toList' vs '#toList2'.");
+            }
+            """
+        ));
+
+        var myHook = new Hook("MyHook");
+
+        var templateMain = Template.make(() -> scope(
+            // Start with nothing:
+            templateVerify.asToken(""),
+            addDataName("v1", myInt, MUTABLE),
+            templateVerify.asToken("v1"),
+            // Non-transparent hook anchor:
+            myHook.anchor(scope(
+                templateVerify.asToken("v1"),
+                addDataName("v2", myInt, MUTABLE),
+                templateVerify.asToken("v1, v2"),
+                // Insert a non-transparent scope: nothing escapes.
+                myHook.insert(scope(
+                    // Note that at the anchor insertion point, v2 is not yet
+                    // available, because it is added after the anchoring.
+                    templateVerify.asToken("v1"),
+                    let("x3", 42),
+                    addDataName("v3", myInt, MUTABLE),
+                    templateVerify.asToken("v1, v3")
+                )),
+                // Note: x3 and v3 do not escape.
+                let("x3", 7), // we can define it again.
+                templateVerify.asToken("v1, v2"),
+                // While not letting hashtags escape may be helpful, it is probably
+                // not very helpful if the DataNames don't escape. For example, if
+                // we are inserting some variable at an outer scope, we would like
+                // it to be available for the rest of the scope.
+                // That's where a transparent scope can be helpful.
+                myHook.insert(transparentScope(
+                    // At the anchoring, still only v1 is available.
+                    templateVerify.asToken("v1"),
+                    let("x4", 42), // escapes to caller scope
+                    addDataName("v4", myInt, MUTABLE), // escapes to anchor scope
+                    templateVerify.asToken("v1, v4")
+                )),
+                // x4 escapes to the caller out here, and not to the anchor scope.
+                "// x4: #x4\n",
+                // And v4 escapes to the anchor scope, which is available from here too.
+                // Interesting detail: the ordering in the list indicates that v1
+                // is from the outermost scope of the template, v4 is located at the
+                // anchor scope, and v2 is located inside the anchor scope, and
+                // thus comes last.
+                templateVerify.asToken("v1, v4, v2"),
+                // In most practical cases we probably don't want to let the hashtag
+                // escape, because they just represent something local. So we can
+                // use a hashtagScope, so that DataNames escape, but not hashtags.
+                myHook.insert(hashtagScope(
+                    // Note: both v1 and v4 are now available at the anchoring, since
+                    // v1 was inserted outside the anchoring scope, and v4 was just
+                    // inserted to the anchoring scope.
+                    templateVerify.asToken("v1, v4"),
+                    let("x5", 42), // local, does not escape.
+                    addDataName("v5", myInt, MUTABLE), // escapes to anchor scope
+                    templateVerify.asToken("v1, v4, v5")
+                )),
+                let("x5", 7), // we can define it again.
+                templateVerify.asToken("v1, v4, v5, v2")
+            )),
+            // We left the non-transparent anchoring scope which does not let anything escape
+            templateVerify.asToken("v1"),
+
+            // Let us now do something that probably should never be done. But still
+            // we want to demonstrate it for educational purposes: transparent anchoring
+            // scopes.
+            myHook.anchor(transparentScope(
+                templateVerify.asToken("v1"),
+                // For one, this means that DataName escape the scope directly.
+                addDataName("v6", myInt, MUTABLE),
+                templateVerify.asToken("v1, v6"),
+                // But also if we insert to the anchoring scope, DataNames don't just
+                // escape from the anchoring scope, but further out to the enclosing
                 // scope.
-                addDataName("f2", myInt, MUTABLE),
-                // And let's also generate the code for it.
-                """
-                public static int f2 = 666;
-                """
-                // Similarly, if we called any nested Template here,
-                // and added DataNames inside, this would happen inside
-                // nested scopes that are not transparent. If one wanted
-                // to add names to the CLASS_HOOK from there, one would
-                // have to do another Hook.insert, and make sure that
-                // the names are added from the outermost scope of that
-                // inserted Template, because only that outermost scope
-                // is transparent to the CLASS_HOOK.
-            )
+                myHook.insert(transparentScope(
+                    templateVerify.asToken("v1, v6"),
+                    addDataName("v7", myInt, MUTABLE),
+                    templateVerify.asToken("v1, v6, v7")
+                )),
+                templateVerify.asToken("v1, v6, v7"),
+                let("x6", 42) // escapes the anchor scope
+            )),
+            // We left the transparent anchoring scope which lets the DataNames and
+            // hashtags escape.
+            "// x6: #x6\n",
+            templateVerify.asToken("v1, v6, v7")
         ));
 
-        var templateInner = Template.make(() -> body(
-            // We just got called from the templateMain. All tokens from there
-            // are already evaluated, so there should be some fields available.
-            // We can see field "f1".
-            let("l1", listNames()),
-            """
-            if (!"{f1}".equals("#l1")) { throw new RuntimeException("l1 should have been '{f1}' but was '#l1'"); }
-            """
-            // Now go and have a look at templateFields, to understand how that
-            // field was added, and why not any others.
-        ));
-
-        var templateMain = Template.make(() -> body(
-            // So far, no names were defined. We expect "c1" to be zero.
-            let("c1", countNames()),
-            """
-            if (#c1 != 0) { throw new RuntimeException("c1 was not zero but #c1"); }
-            """,
-            // We would now like to add some fields to the class scope, out in the
-            // templateClass. This creates a token, which is only evaluated after
-            // the completion of the templateMain lambda. Before you go and look
-            // at templateFields, just assume that it does add some fields, and
-            // continue reading in templateMain.
-            Hooks.CLASS_HOOK.insert(templateFields.asToken()),
-            // We count again with "c2". The fields we wanted to add above are not
-            // yet available, because the token is not yet evaluated. Hence, we
-            // still only count zero names.
-            let("c2", countNames()),
-            """
-            if (#c2 != 0) { throw new RuntimeException("c2 was not zero but #c2"); }
-            """,
-            // Now we call an inner Template. This also creates a token, and so it
-            // is not evaluated immediately. And by the time this token is evaluated
-            // the tokens from above are already evaluated, and so the fields should
-            // be available. Go have a look at templateInner now.
-            templateInner.asToken()
-        ));
-
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
             public class InnerTest9b {
             """,
-            Hooks.CLASS_HOOK.anchor(
+            Hooks.CLASS_HOOK.anchor(scope(
             """
                 public static void main() {
             """,
-                Hooks.METHOD_HOOK.anchor(
+                Hooks.METHOD_HOOK.anchor(scope(
                     templateMain.asToken()
-                ),
+                )),
             """
                 }
             """
-            ),
+            )),
             """
             }
             """
@@ -1006,8 +1293,6 @@ public class TestTutorial {
         // Render templateClass to String.
         return templateClass.render();
     }
-
-
     // There are two more concepts to understand more deeply with DataNames.
     //
     // One is the use of mutable and immutable DataNames.
@@ -1045,38 +1330,40 @@ public class TestTutorial {
     private static final List<MyClass> myClassList = List.of(myClassA, myClassA1, myClassA2, myClassA11, myClassB);
 
     public static String generateWithDataNamesForFuzzing() {
-        var templateStaticField = Template.make("type", "mutable", (DataName.Type type, Boolean mutable) -> body(
-            addDataName($("field"), type, mutable ? MUTABLE : IMMUTABLE),
+        // This template is used to insert a DataName (field) into an outer scope, hence we must use
+        // "transparentScope" instead of "scope".
+        var templateStaticField = Template.make("type", "mutable", (DataName.Type type, Boolean mutable) -> transparentScope(
+            addDataName($("field"), type, mutable ? MUTABLE : IMMUTABLE), // Escapes the template.
             let("isFinal", mutable ? "" : "final"),
             """
             public static #isFinal #type $field = new #type();
             """
         ));
 
-        var templateLoad = Template.make("type", (DataName.Type type) -> body(
+        var templateLoad = Template.make("type", (DataName.Type type) -> scope(
             // We only load from the field, so we do not need a mutable one,
             // we can load from final and non-final fields.
             // We want to find any field from which we can read the value and store
             // it in our variable v of our given type. Hence, we can take a field
             // of the given type or any subtype thereof.
-            let("field", dataNames(MUTABLE_OR_IMMUTABLE).subtypeOf(type).sample().name()),
+            dataNames(MUTABLE_OR_IMMUTABLE).subtypeOf(type).sampleAndLetAs("field"),
             """
             #type $v = #field;
             System.out.println("#field: " + $v);
             """
         ));
 
-        var templateStore = Template.make("type", (DataName.Type type) -> body(
+        var templateStore = Template.make("type", (DataName.Type type) -> scope(
             // We are storing to a field, so it better be non-final, i.e. mutable.
             // We want to store a new instance of our given type to a field. This
             // field must be of the given type or any supertype.
-            let("field", dataNames(MUTABLE).supertypeOf(type).sample().name()),
+            dataNames(MUTABLE).supertypeOf(type).sampleAndLetAs("field"),
             """
             #field = new #type();
             """
         ));
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
@@ -1094,7 +1381,7 @@ public class TestTutorial {
                 // addDataName is restricted to the scope of the templateStaticField. But
                 // with the insertion to CLASS_HOOK, the addDataName goes through the scope
                 // of the templateStaticField out to the scope of the CLASS_HOOK.
-                Hooks.CLASS_HOOK.anchor(
+                Hooks.CLASS_HOOK.anchor(scope(
                     myClassList.stream().map(c ->
                         (Object)Hooks.CLASS_HOOK.insert(templateStaticField.asToken(c, true))
                     ).toList(),
@@ -1118,7 +1405,7 @@ public class TestTutorial {
                         """
                     }
                     """
-                ),
+                )),
             """
             }
             """
@@ -1126,7 +1413,6 @@ public class TestTutorial {
 
         // Render templateClass to String.
         return templateClass.render();
-
     }
 
     // "DataNames" are useful for modeling fields and variables. They hold data,
@@ -1165,9 +1451,9 @@ public class TestTutorial {
 
     public static String generateWithStructuralNamesForMethods() {
         // Define a method, which takes two ints, returns the result of op.
-        var templateMethod = Template.make("op", (String op) -> body(
+        var templateMethod = Template.make("op", (String op) -> transparentScope(
             // Register the method name, so we can later sample.
-            addStructuralName($("methodName"), myMethodType),
+            addStructuralName($("methodName"), myMethodType), // escapes the template because of "transparentScope"
             """
             public static int $methodName(int a, int b) {
                 return a #op b;
@@ -1175,16 +1461,16 @@ public class TestTutorial {
             """
         ));
 
-        var templateSample = Template.make(() -> body(
+        var templateSample = Template.make(() -> scope(
             // Sample a random method, and retrieve its name.
-            let("methodName", structuralNames().exactOf(myMethodType).sample().name()),
+            structuralNames().exactOf(myMethodType).sampleAndLetAs("methodName"),
             """
             System.out.println("Calling #methodName with inputs 7 and 11");
             System.out.println("  result: " + #methodName(7, 11));
             """
         ));
 
-        var templateClass = Template.make(() -> body(
+        var templateClass = Template.make(() -> scope(
             """
             package p.xyz;
 
@@ -1192,7 +1478,7 @@ public class TestTutorial {
                 // Let us define some methods that we can sample from later.
             """,
             // We must anchor a CLASS_HOOK here, and insert the method definitions to that hook.
-            Hooks.CLASS_HOOK.anchor(
+            Hooks.CLASS_HOOK.anchor(scope(
                 // If we directly nest the templateMethod, then the addStructuralName goes to the nested
                 // scope, and is not available at the class scope, i.e. it is not visible
                 // for sampleStructuralName outside of the templateMethod.
@@ -1218,7 +1504,7 @@ public class TestTutorial {
                     }
                 }
                 """
-            )
+            ))
         ));
 
         // Render templateClass to String.
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestWithTestFrameworkClass.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestWithTestFrameworkClass.java
index 813f2976ef2..01b49db2c01 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestWithTestFrameworkClass.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestWithTestFrameworkClass.java
@@ -43,7 +43,7 @@ import compiler.lib.generators.Generators;
 
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 
 import compiler.lib.template_framework.library.Hooks;
@@ -82,7 +82,7 @@ public class TestWithTestFrameworkClass {
     // Generate a source Java file as String
     public static String generate(CompileFramework comp) {
         // A simple template that adds a comment.
-        var commentTemplate = Template.make(() -> body(
+        var commentTemplate = Template.make(() -> scope(
             """
             // Comment inserted from test method to class hook.
             """
@@ -103,7 +103,7 @@ public class TestWithTestFrameworkClass {
         // - The test method makes use of hashtag replacements (#con2 and #op).
         // - The Check method verifies the results of the test method with the
         //   GOLD value.
-        var testTemplate = Template.make("op", (String op) -> body(
+        var testTemplate = Template.make("op", (String op) -> scope(
             let("size", Generators.G.safeRestrict(Generators.G.ints(), 10_000, 20_000).next()),
             let("con1", Generators.G.ints().next()),
             let("con2", Generators.G.safeRestrict(Generators.G.ints(), 1, Integer.MAX_VALUE).next()),
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestExpression.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestExpression.java
index 2dac740dd93..b34538c39c1 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestExpression.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestExpression.java
@@ -38,7 +38,7 @@ import java.util.Set;
 import compiler.lib.template_framework.DataName;
 import compiler.lib.template_framework.Template;
 import compiler.lib.template_framework.TemplateToken;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import compiler.lib.template_framework.library.CodeGenerationDataNameType;
 import compiler.lib.template_framework.library.Expression;
 
@@ -93,7 +93,7 @@ public class TestExpression {
         Expression e3 = Expression.make(myTypeA, "[", myTypeA, ",", myTypeB, ",", myTypeA1, "]");
         Expression e4 = Expression.make(myTypeA, "[", myTypeA, ",", myTypeB, ",", myTypeA1, ",", myTypeA, "]");
 
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             "xx", e1.toString(), "yy\n",
             "xx", e2.toString(), "yy\n",
             "xx", e3.toString(), "yy\n",
@@ -141,7 +141,7 @@ public class TestExpression {
         Expression e3e1 = e3.nest(0, e1);
         Expression e4e5 = e4.nest(1, e5);
 
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             "xx", e1e1.toString(), "yy\n",
             "xx", e2e1.toString(), "yy\n",
             "xx", e3e1.toString(), "yy\n",
@@ -184,7 +184,7 @@ public class TestExpression {
         // Alternating pattern
         Expression deep2 = Expression.nestRandomly(myTypeA, List.of(e5, e3), 5);
 
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             "xx", e1e2.toString(), "yy\n",
             "xx", e1ex.toString(), "yy\n",
             "xx", e1e4.toString(), "yy\n",
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java
index fe267a3ff63..577542e085b 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java
@@ -39,7 +39,7 @@ import compiler.lib.compile_framework.*;
 import compiler.lib.generators.*;
 import compiler.lib.verify.*;
 import compiler.lib.template_framework.Template;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
 import static compiler.lib.template_framework.Template.let;
 
 public class TestFormat {
@@ -84,7 +84,7 @@ public class TestFormat {
 
     private static String generate(List<FormatInfo> list) {
         // Generate 2 "get" methods, one that formats via "let" (hashtag), the other via direct token.
-        var template1 = Template.make("info", (FormatInfo info) -> body(
+        var template1 = Template.make("info", (FormatInfo info) -> scope(
             let("id", info.id()),
             let("type", info.type()),
             let("value", info.value()),
@@ -95,7 +95,7 @@ public class TestFormat {
         ));
 
         // For each FormatInfo in list, generate the "get" methods inside InnerTest class.
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             """
             package p.xyz;
             public class InnerTest {
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
index 35d020b6080..9be74d232a7 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
@@ -44,7 +44,11 @@ import compiler.lib.template_framework.StructuralName;
 import compiler.lib.template_framework.Hook;
 import compiler.lib.template_framework.TemplateBinding;
 import compiler.lib.template_framework.RendererException;
-import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.scope;
+import static compiler.lib.template_framework.Template.transparentScope;
+import static compiler.lib.template_framework.Template.nameScope;
+import static compiler.lib.template_framework.Template.hashtagScope;
+import static compiler.lib.template_framework.Template.setFuelCostScope;
 import static compiler.lib.template_framework.Template.$;
 import static compiler.lib.template_framework.Template.let;
 import static compiler.lib.template_framework.Template.fuel;
@@ -121,41 +125,56 @@ public class TestTemplate {
         // The following tests all pass, i.e. have no errors during rendering.
         testSingleLine();
         testMultiLine();
-        testBodyTokens();
+        testBasicTokens();
         testWithOneArgument();
         testWithTwoArguments();
         testWithThreeArguments();
-        testNested();
-        testHookSimple();
+        testNestedTemplates();
+        testHookSimple1();
+        testHookSimple2();
+        testHookSimple3();
         testHookIsAnchored();
         testHookNested();
         testHookWithNestedTemplates();
         testHookRecursion();
         testDollar();
-        testLet();
+        testLet1();
+        testLet2();
         testDollarAndHashtagBrackets();
         testSelector();
         testRecursion();
         testFuel();
         testFuelCustom();
+        testFuelAndScopes();
+        testDataNames0a();
+        testDataNames0b();
+        testDataNames0c();
+        testDataNames0d();
         testDataNames1();
         testDataNames2();
         testDataNames3();
         testDataNames4();
         testDataNames5();
+        testDataNames6();
+        testStructuralNames0();
         testStructuralNames1();
         testStructuralNames2();
+        testStructuralNames3();
+        testStructuralNames4();
+        testStructuralNames5();
+        testStructuralNames6();
         testListArgument();
+        testNestedScopes1();
+        testNestedScopes2();
+        testTemplateScopes();
+        testHookAndScopes1();
+        testHookAndScopes2();
+        testHookAndScopes3();
 
         // The following tests should all fail, with an expected exception and message.
         expectRendererException(() -> testFailingNestedRendering(), "Nested render not allowed.");
         expectRendererException(() -> $("name"),                          "A Template method such as");
-        expectRendererException(() -> let("x","y"),                       "A Template method such as");
         expectRendererException(() -> fuel(),                             "A Template method such as");
-        expectRendererException(() -> setFuelCost(1.0f),                  "A Template method such as");
-        expectRendererException(() -> dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).count(),  "A Template method such as");
-        expectRendererException(() -> dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).sample(), "A Template method such as");
-        expectRendererException(() -> (new Hook("abc")).isAnchored(),     "A Template method such as");
         expectRendererException(() -> testFailingDollarName1(), "Is not a valid '$' name: ''.");
         expectRendererException(() -> testFailingDollarName2(), "Is not a valid '$' name: '#abc'.");
         expectRendererException(() -> testFailingDollarName3(), "Is not a valid '$' name: 'abc#'.");
@@ -178,20 +197,31 @@ public class TestTemplate {
         expectRendererException(() -> testFailingDollarHashtagName3(), "Is not a valid '#' replacement pattern: '#' in '#$name'.");
         expectRendererException(() -> testFailingDollarHashtagName4(), "Is not a valid '$' replacement pattern: '$' in '$#name'.");
         expectRendererException(() -> testFailingHook(), "Hook 'Hook1' was referenced but not found!");
-        expectRendererException(() -> testFailingSample1(),  "No variable: MUTABLE, subtypeOf(int), supertypeOf(int).");
+        expectRendererException(() -> testFailingSample1a(),  "No Name found for DataName.FilterdSet(MUTABLE, subtypeOf(int), supertypeOf(int))");
+        expectRendererException(() -> testFailingSample1b(),  "No Name found for StructuralName.FilteredSet( subtypeOf(StructuralA) supertypeOf(StructuralA))");
         expectRendererException(() -> testFailingHashtag1(), "Duplicate hashtag replacement for #a");
         expectRendererException(() -> testFailingHashtag2(), "Duplicate hashtag replacement for #a");
         expectRendererException(() -> testFailingHashtag3(), "Duplicate hashtag replacement for #a");
         expectRendererException(() -> testFailingHashtag4(), "Missing hashtag replacement for #a");
+        expectRendererException(() -> testFailingHashtag5(), "Missing hashtag replacement for #a");
         expectRendererException(() -> testFailingBinding1(), "Duplicate 'bind' not allowed.");
         expectRendererException(() -> testFailingBinding2(), "Cannot 'get' before 'bind'.");
-        expectIllegalArgumentException(() -> body(null),              "Unexpected tokens: null");
-        expectIllegalArgumentException(() -> body("x", null),         "Unexpected token: null");
-        expectIllegalArgumentException(() -> body(new Hook("Hook1")), "Unexpected token:");
+        expectIllegalArgumentException(() -> scope(null),              "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> scope("x", null),         "Unexpected token: null");
+        expectIllegalArgumentException(() -> scope(new Hook("Hook1")), "Unexpected token:");
+        expectIllegalArgumentException(() -> transparentScope(null),              "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> transparentScope("x", null),         "Unexpected token: null");
+        expectIllegalArgumentException(() -> transparentScope(new Hook("Hook1")), "Unexpected token:");
+        expectIllegalArgumentException(() -> nameScope(null),              "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> nameScope("x", null),         "Unexpected token: null");
+        expectIllegalArgumentException(() -> nameScope(new Hook("Hook1")), "Unexpected token:");
+        expectIllegalArgumentException(() -> hashtagScope(null),              "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> hashtagScope("x", null),         "Unexpected token: null");
+        expectIllegalArgumentException(() -> hashtagScope(new Hook("Hook1")), "Unexpected token:");
+        expectIllegalArgumentException(() -> setFuelCostScope(null),              "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> setFuelCostScope("x", null),         "Unexpected token: null");
+        expectIllegalArgumentException(() -> setFuelCostScope(new Hook("Hook1")), "Unexpected token:");
         Hook hook1 = new Hook("Hook1");
-        expectIllegalArgumentException(() -> hook1.anchor(null),      "Unexpected tokens: null");
-        expectIllegalArgumentException(() -> hook1.anchor("x", null), "Unexpected token: null");
-        expectIllegalArgumentException(() -> hook1.anchor(hook1),     "Unexpected token:");
         expectIllegalArgumentException(() -> testFailingAddDataName1(), "Unexpected mutability: MUTABLE_OR_IMMUTABLE");
         expectIllegalArgumentException(() -> testFailingAddDataName2(), "Unexpected weight: ");
         expectIllegalArgumentException(() -> testFailingAddDataName3(), "Unexpected weight: ");
@@ -199,7 +229,8 @@ public class TestTemplate {
         expectIllegalArgumentException(() -> testFailingAddStructuralName1(), "Unexpected weight: ");
         expectIllegalArgumentException(() -> testFailingAddStructuralName2(), "Unexpected weight: ");
         expectIllegalArgumentException(() -> testFailingAddStructuralName3(), "Unexpected weight: ");
-        expectUnsupportedOperationException(() -> testFailingSample2(), "Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
+        expectUnsupportedOperationException(() -> testFailingSample2a(), "Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
+        expectUnsupportedOperationException(() -> testFailingSample2b(), "Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
         expectRendererException(() -> testFailingAddNameDuplication1(), "Duplicate name:");
         expectRendererException(() -> testFailingAddNameDuplication2(), "Duplicate name:");
         expectRendererException(() -> testFailingAddNameDuplication3(), "Duplicate name:");
@@ -208,16 +239,23 @@ public class TestTemplate {
         expectRendererException(() -> testFailingAddNameDuplication6(), "Duplicate name:");
         expectRendererException(() -> testFailingAddNameDuplication7(), "Duplicate name:");
         expectRendererException(() -> testFailingAddNameDuplication8(), "Duplicate name:");
+        expectRendererException(() -> testFailingScope1(), "Duplicate hashtag replacement for #x. previous: x1, new: x2");
+        expectRendererException(() -> testFailingScope2(), "Duplicate hashtag replacement for #x. previous: x1, new: x2");
+        expectRendererException(() -> testFailingScope3(), "Duplicate hashtag replacement for #x. previous: a, new: b");
+        expectRendererException(() -> testFailingScope4(), "Duplicate hashtag replacement for #x. previous: a, new: b");
+        expectRendererException(() -> testFailingScope5(), "Duplicate name:");
+        expectRendererException(() -> testFailingScope6(), "Duplicate name:");
+        expectRendererException(() -> testFailingScope7(), "Duplicate name:");
     }
 
     public static void testSingleLine() {
-        var template = Template.make(() -> body("Hello World!"));
+        var template = Template.make(() -> scope("Hello World!"));
         String code = template.render();
         checkEQ(code, "Hello World!");
     }
 
     public static void testMultiLine() {
-        var template = Template.make(() -> body(
+        var template = Template.make(() -> scope(
             """
             Code on more
             than a single line
@@ -232,10 +270,10 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
-    public static void testBodyTokens() {
-        // We can fill the body with Objects of different types, and they get concatenated.
-        // Lists get flattened into the body.
-        var template = Template.make(() -> body(
+    public static void testBasicTokens() {
+        // We can fill the scope with Objects of different types, and they get concatenated.
+        // Lists get flattened into the scope.
+        var template = Template.make(() -> scope(
             "start ",
             Integer.valueOf(1), 1,
             Long.valueOf(2), 2L,
@@ -250,31 +288,31 @@ public class TestTemplate {
 
     public static void testWithOneArgument() {
         // Capture String argument via String name.
-        var template1 = Template.make("a", (String a) -> body("start #a end"));
+        var template1 = Template.make("a", (String a) -> scope("start #a end"));
         checkEQ(template1.render("x"), "start x end");
         checkEQ(template1.render("a"), "start a end");
         checkEQ(template1.render("" ), "start  end");
 
         // Capture String argument via typed lambda argument.
-        var template2 = Template.make("a", (String a) -> body("start ", a, " end"));
+        var template2 = Template.make("a", (String a) -> scope("start ", a, " end"));
         checkEQ(template2.render("x"), "start x end");
         checkEQ(template2.render("a"), "start a end");
         checkEQ(template2.render("" ), "start  end");
 
         // Capture Integer argument via String name.
-        var template3 = Template.make("a", (Integer a) -> body("start #a end"));
+        var template3 = Template.make("a", (Integer a) -> scope("start #a end"));
         checkEQ(template3.render(0  ), "start 0 end");
         checkEQ(template3.render(22 ), "start 22 end");
         checkEQ(template3.render(444), "start 444 end");
 
         // Capture Integer argument via templated lambda argument.
-        var template4 = Template.make("a", (Integer a) -> body("start ", a, " end"));
+        var template4 = Template.make("a", (Integer a) -> scope("start ", a, " end"));
         checkEQ(template4.render(0  ), "start 0 end");
         checkEQ(template4.render(22 ), "start 22 end");
         checkEQ(template4.render(444), "start 444 end");
 
         // Test Strings with backslashes:
-        var template5 = Template.make("a", (String a) -> body("start #a " + a + " end"));
+        var template5 = Template.make("a", (String a) -> scope("start #a " + a + " end"));
         checkEQ(template5.render("/"), "start / / end");
         checkEQ(template5.render("\\"), "start \\ \\ end");
         checkEQ(template5.render("\\\\"), "start \\\\ \\\\ end");
@@ -282,25 +320,25 @@ public class TestTemplate {
 
     public static void testWithTwoArguments() {
         // Capture 2 String arguments via String names.
-        var template1 = Template.make("a1", "a2", (String a1, String a2) -> body("start #a1 #a2 end"));
+        var template1 = Template.make("a1", "a2", (String a1, String a2) -> scope("start #a1 #a2 end"));
         checkEQ(template1.render("x", "y"), "start x y end");
         checkEQ(template1.render("a", "b"), "start a b end");
         checkEQ(template1.render("",  "" ), "start   end");
 
         // Capture 2 String arguments via typed lambda arguments.
-        var template2 = Template.make("a1", "a2", (String a1, String a2) -> body("start ", a1, " ", a2, " end"));
+        var template2 = Template.make("a1", "a2", (String a1, String a2) -> scope("start ", a1, " ", a2, " end"));
         checkEQ(template2.render("x", "y"), "start x y end");
         checkEQ(template2.render("a", "b"), "start a b end");
         checkEQ(template2.render("",  "" ), "start   end");
 
         // Capture 2 Integer arguments via String names.
-        var template3 = Template.make("a1", "a2", (Integer a1, Integer a2) -> body("start #a1 #a2 end"));
+        var template3 = Template.make("a1", "a2", (Integer a1, Integer a2) -> scope("start #a1 #a2 end"));
         checkEQ(template3.render(0,   1  ), "start 0 1 end");
         checkEQ(template3.render(22,  33 ), "start 22 33 end");
         checkEQ(template3.render(444, 555), "start 444 555 end");
 
         // Capture 2 Integer arguments via templated lambda arguments.
-        var template4 = Template.make("a1", "a2", (Integer a1, Integer a2) -> body("start ", a1, " ", a2, " end"));
+        var template4 = Template.make("a1", "a2", (Integer a1, Integer a2) -> scope("start ", a1, " ", a2, " end"));
         checkEQ(template4.render(0,   1  ), "start 0 1 end");
         checkEQ(template4.render(22,  33 ), "start 22 33 end");
         checkEQ(template4.render(444, 555), "start 444 555 end");
@@ -308,46 +346,46 @@ public class TestTemplate {
 
     public static void testWithThreeArguments() {
         // Capture 3 String arguments via String names.
-        var template1 = Template.make("a1", "a2", "a3", (String a1, String a2, String a3) -> body("start #a1 #a2 #a3 end"));
+        var template1 = Template.make("a1", "a2", "a3", (String a1, String a2, String a3) -> scope("start #a1 #a2 #a3 end"));
         checkEQ(template1.render("x", "y", "z"), "start x y z end");
         checkEQ(template1.render("a", "b", "c"), "start a b c end");
         checkEQ(template1.render("",  "", "" ),  "start    end");
 
         // Capture 3 String arguments via typed lambda arguments.
-        var template2 = Template.make("a1", "a2", "a3", (String a1, String a2, String a3) -> body("start ", a1, " ", a2, " ", a3, " end"));
+        var template2 = Template.make("a1", "a2", "a3", (String a1, String a2, String a3) -> scope("start ", a1, " ", a2, " ", a3, " end"));
         checkEQ(template1.render("x", "y", "z"), "start x y z end");
         checkEQ(template1.render("a", "b", "c"), "start a b c end");
         checkEQ(template1.render("",  "", "" ),  "start    end");
 
         // Capture 3 Integer arguments via String names.
-        var template3 = Template.make("a1", "a2", "a3", (Integer a1, Integer a2, Integer a3) -> body("start #a1 #a2 #a3 end"));
+        var template3 = Template.make("a1", "a2", "a3", (Integer a1, Integer a2, Integer a3) -> scope("start #a1 #a2 #a3 end"));
         checkEQ(template3.render(0,   1  , 2  ), "start 0 1 2 end");
         checkEQ(template3.render(22,  33 , 44 ), "start 22 33 44 end");
         checkEQ(template3.render(444, 555, 666), "start 444 555 666 end");
 
         // Capture 2 Integer arguments via templated lambda arguments.
-        var template4 = Template.make("a1", "a2", "a3", (Integer a1, Integer a2, Integer a3) -> body("start ", a1, " ", a2, " ", a3, " end"));
+        var template4 = Template.make("a1", "a2", "a3", (Integer a1, Integer a2, Integer a3) -> scope("start ", a1, " ", a2, " ", a3, " end"));
         checkEQ(template3.render(0,   1  , 2  ), "start 0 1 2 end");
         checkEQ(template3.render(22,  33 , 44 ), "start 22 33 44 end");
         checkEQ(template3.render(444, 555, 666), "start 444 555 666 end");
     }
 
-    public static void testNested() {
-        var template1 = Template.make(() -> body("proton"));
+    public static void testNestedTemplates() {
+        var template1 = Template.make(() -> scope("proton"));
 
-        var template2 = Template.make("a1", "a2", (String a1, String a2) -> body(
+        var template2 = Template.make("a1", "a2", (String a1, String a2) -> scope(
             "electron #a1\n",
             "neutron #a2\n"
         ));
 
-        var template3 = Template.make("a1", "a2", (String a1, String a2) -> body(
+        var template3 = Template.make("a1", "a2", (String a1, String a2) -> scope(
             "Universe ", template1.asToken(), " {\n",
                 template2.asToken("up", "down"),
                 template2.asToken(a1, a2),
             "}\n"
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             template3.asToken("low", "high"),
             "{\n",
                 template3.asToken("42", "24"),
@@ -374,19 +412,19 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
-    public static void testHookSimple() {
+    public static void testHookSimple1() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make(() -> body("Hello\n"));
+        var template1 = Template.make(() -> scope("Hello\n"));
 
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "{\n",
-            hook1.anchor(
+            hook1.anchor(scope(
                 "World\n",
                 // Note: "Hello" from the template below will be inserted
                 // above "World" above.
                 hook1.insert(template1.asToken())
-            ),
+            )),
             "}"
         ));
 
@@ -400,21 +438,85 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testHookSimple2() {
+        var hook1 = new Hook("Hook1");
+
+        var template2 = Template.make(() -> scope(
+            "{\n",
+            hook1.anchor(scope(
+                "World\n",
+                // Note: "Hello" from the scope below will be inserted
+                // above "World" above.
+                hook1.insert(scope(
+                    "Hello\n"
+                ))
+            )),
+            "}"
+        ));
+
+        String code = template2.render();
+        String expected =
+            """
+            {
+            Hello
+            World
+            }""";
+        checkEQ(code, expected);
+    }
+
+    public static void testHookSimple3() {
+        var hook1 = new Hook("Hook1");
+
+        // Ensure that insert inside insert really goes first.
+        var template = Template.make(() -> scope(
+            "{\n",
+            hook1.anchor(scope(
+                "<Anchor\n",
+                hook1.insert(scope(
+                    "<Outer Insert\n",
+                    hook1.insert(scope(
+                        "Inner Insert\n"
+                    )),
+                    ">Outer Insert\n"
+                )),
+                ">Anchor\n"
+            )),
+            "}"
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            {
+            Inner Insert
+            <Outer Insert
+            >Outer Insert
+            <Anchor
+            >Anchor
+            }""";
+        checkEQ(code, expected);
+    }
+
     public static void testHookIsAnchored() {
         var hook1 = new Hook("Hook1");
 
-        var template0 = Template.make(() -> body("isAnchored: ", hook1.isAnchored(), "\n"));
+        var template0 = Template.make(() -> scope("t0 isAnchored: ", hook1.isAnchored(a -> scope(a)), "\n"));
 
-        var template1 = Template.make(() -> body("Hello\n", template0.asToken()));
+        var template1 = Template.make(() -> scope("Hello\n", template0.asToken()));
 
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "{\n",
+            "t2 isAnchored: ", hook1.isAnchored(a -> scope(a)), "\n",
             template0.asToken(),
-            hook1.anchor(
+            hook1.anchor(scope(
                 "World\n",
+                "t2 isAnchored: ", hook1.isAnchored(a -> scope(a)), "\n",
                 template0.asToken(),
-                hook1.insert(template1.asToken())
-            ),
+                hook1.insert(template1.asToken()),
+                hook1.insert(scope("Beautiful\n", template0.asToken())),
+                "t2 isAnchored: ", hook1.isAnchored(a -> scope(a)), "\n"
+            )),
+            "t2 isAnchored: ", hook1.isAnchored(a -> scope(a)), "\n",
             template0.asToken(),
             "}"
         ));
@@ -423,12 +525,18 @@ public class TestTemplate {
         String expected =
             """
             {
-            isAnchored: false
+            t2 isAnchored: false
+            t0 isAnchored: false
             Hello
-            isAnchored: true
+            t0 isAnchored: true
+            Beautiful
+            t0 isAnchored: true
             World
-            isAnchored: true
-            isAnchored: false
+            t2 isAnchored: true
+            t0 isAnchored: true
+            t2 isAnchored: true
+            t2 isAnchored: false
+            t0 isAnchored: false
             }""";
         checkEQ(code, expected);
     }
@@ -436,36 +544,41 @@ public class TestTemplate {
     public static void testHookNested() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("a", (String a) -> body("x #a x\n"));
+        var template1 = Template.make("a", (String a) -> scope("x #a x\n"));
 
         // Test nested use of hooks in the same template.
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "{\n",
-            hook1.anchor(), // empty
+            hook1.anchor(scope()), // empty
             "zero\n",
-            hook1.anchor(
+            hook1.anchor(scope(
                 template1.asToken("one"),
                 template1.asToken("two"),
                 hook1.insert(template1.asToken("intoHook1a")),
                 hook1.insert(template1.asToken("intoHook1b")),
+                hook1.insert(scope("y 1 y\n")),
+                hook1.insert(scope("y 2 y\n")),
                 template1.asToken("three"),
-                hook1.anchor(
+                hook1.anchor(scope(
                     template1.asToken("four"),
                     hook1.insert(template1.asToken("intoHook1c")),
+                    hook1.insert(scope("y 3 y\n")),
                     template1.asToken("five")
-                ),
+                )),
                 template1.asToken("six"),
-                hook1.anchor(), // empty
+                hook1.anchor(scope()), // empty
                 template1.asToken("seven"),
                 hook1.insert(template1.asToken("intoHook1d")),
+                hook1.insert(scope("y 4 y\n")),
                 template1.asToken("eight"),
-                hook1.anchor(
+                hook1.anchor(scope(
                     template1.asToken("nine"),
                     hook1.insert(template1.asToken("intoHook1e")),
+                    hook1.insert(scope("y 5 y\n")),
                     template1.asToken("ten")
-                ),
+                )),
                 template1.asToken("eleven")
-            ),
+            )),
             "}"
         ));
 
@@ -476,17 +589,22 @@ public class TestTemplate {
             zero
             x intoHook1a x
             x intoHook1b x
+            y 1 y
+            y 2 y
             x intoHook1d x
+            y 4 y
             x one x
             x two x
             x three x
             x intoHook1c x
+            y 3 y
             x four x
             x five x
             x six x
             x seven x
             x eight x
             x intoHook1e x
+            y 5 y
             x nine x
             x ten x
             x eleven x
@@ -498,30 +616,30 @@ public class TestTemplate {
         var hook1 = new Hook("Hook1");
         var hook2 = new Hook("Hook2");
 
-        var template1 = Template.make("a", (String a) -> body("x #a x\n"));
+        var template1 = Template.make("a", (String a) -> scope("x #a x\n"));
 
-        var template2 = Template.make("b", (String b) -> body(
+        var template2 = Template.make("b", (String b) -> scope(
             "{\n",
             template1.asToken(b + "A"),
             hook1.insert(template1.asToken(b + "B")),
             hook2.insert(template1.asToken(b + "C")),
             template1.asToken(b + "D"),
-            hook1.anchor(
+            hook1.anchor(scope(
                 template1.asToken(b + "E"),
                 hook1.insert(template1.asToken(b + "F")),
                 hook2.insert(template1.asToken(b + "G")),
                 template1.asToken(b + "H"),
-                hook2.anchor(
+                hook2.anchor(scope(
                     template1.asToken(b + "I"),
                     hook1.insert(template1.asToken(b + "J")),
                     hook2.insert(template1.asToken(b + "K")),
                     template1.asToken(b + "L")
-                ),
+                )),
                 template1.asToken(b + "M"),
                 hook1.insert(template1.asToken(b + "N")),
                 hook2.insert(template1.asToken(b + "O")),
                 template1.asToken(b + "O")
-            ),
+            )),
             template1.asToken(b + "P"),
             hook1.insert(template1.asToken(b + "Q")),
             hook2.insert(template1.asToken(b + "R")),
@@ -530,18 +648,18 @@ public class TestTemplate {
         ));
 
         // Test use of hooks across templates.
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             "{\n",
             "base-A\n",
-            hook1.anchor(
+            hook1.anchor(scope(
                 "base-B\n",
-                hook2.anchor(
+                hook2.anchor(scope(
                     "base-C\n",
                     template2.asToken("sub-"),
                     "base-D\n"
-                ),
+                )),
                 "base-E\n"
-            ),
+            )),
             "base-F\n",
             "}\n"
         ));
@@ -586,32 +704,32 @@ public class TestTemplate {
     public static void testHookRecursion() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("a", (String a) -> body("x #a x\n"));
+        var template1 = Template.make("a", (String a) -> scope("x #a x\n"));
 
-        var template2 = Template.make("b", (String b) -> body(
+        var template2 = Template.make("b", (String b) -> scope(
             "<\n",
             template1.asToken(b + "A"),
             hook1.insert(template1.asToken(b + "B")), // sub-B is rendered before template2.
             template1.asToken(b + "C"),
             "inner-hook-start\n",
-            hook1.anchor(
+            hook1.anchor(scope(
                 "inner-hook-end\n",
                 template1.asToken(b + "E"),
                 hook1.insert(template1.asToken(b + "E")),
                 template1.asToken(b + "F")
-            ),
+            )),
             ">\n"
         ));
 
         // Test use of hooks across templates.
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             "{\n",
             "hook-start\n",
-            hook1.anchor(
+            hook1.anchor(scope(
                 "hook-end\n",
                 hook1.insert(template2.asToken("sub-")),
                 "base-C\n"
-            ),
+            )),
             "base-D\n",
             "}\n"
         ));
@@ -642,16 +760,16 @@ public class TestTemplate {
     public static void testDollar() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("a", (String a) -> body("x $name #a x\n"));
+        var template1 = Template.make("a", (String a) -> scope("x $name #a x\n"));
 
-        var template2 = Template.make("a", (String a) -> body(
+        var template2 = Template.make("a", (String a) -> scope(
             "{\n",
             "y $name #a y\n",
             template1.asToken($("name")),
             "}\n"
         ));
 
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             "{\n",
             "$name\n",
             "$name", "\n",
@@ -660,11 +778,11 @@ public class TestTemplate {
             template1.asToken("name"),     // does not capture -> literal "$name"
             template1.asToken("$name"),    // does not capture -> literal "$name"
             template1.asToken($("name")),  // capture replacement name "name_1"
-            hook1.anchor(
+            hook1.anchor(scope(
                 "$name\n"
-            ),
+            )),
             "break\n",
-            hook1.anchor(
+            hook1.anchor(scope(
                 "one\n",
                 hook1.insert(template1.asToken($("name"))),
                 "two\n",
@@ -672,7 +790,7 @@ public class TestTemplate {
                 "three\n",
                 hook1.insert(template2.asToken($("name"))),
                 "four\n"
-            ),
+            )),
             "}\n"
         ));
 
@@ -704,10 +822,10 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
-    public static void testLet() {
+    public static void testLet1() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("a", (String a) -> body(
+        var template1 = Template.make("a", (String a) -> scope(
             "{\n",
             "y #a y\n",
             let("b", "<" + a + ">"),
@@ -715,25 +833,25 @@ public class TestTemplate {
             "}\n"
         ));
 
-        var template2 = Template.make("a", (Integer a) -> let("b", a * 10, b ->
-            body(
+        var template2 = Template.make("a", (Integer a) -> scope(
+            let("b", a * 10, b -> scope(
                 let("c", b * 3),
                 "abc = #a #b #c\n"
-            )
+            ))
         ));
 
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             "{\n",
             let("x", "abc"),
             template1.asToken("alpha"),
             "break\n",
             "x1 = #x\n",
-            hook1.anchor(
+            hook1.anchor(transparentScope( // transparentScope allows hashtags to escape
                 "x2 = #x\n", // leaks inside
                 template1.asToken("beta"),
                 let("y", "one"),
                 "y1 = #y\n"
-            ),
+            )),
             "break\n",
             "y2 = #y\n", // leaks outside
             "break\n",
@@ -766,8 +884,30 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testLet2() {
+        var template = Template.make(() -> scope(
+            "outer {\n",
+            let("x", "x1", x -> scope(
+                "x: #x ", x, ".\n"
+            )),
+            let("x", "x2"), // definition above is limited to its scope
+            "x: #x\n",
+            "} outer\n"
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            outer {
+            x: x1 x1.
+            x: x2
+            } outer
+            """;
+        checkEQ(code, expected);
+    }
+
     public static void testDollarAndHashtagBrackets() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("xyz", "abc"),
             let("xyz_", "def"),
             let("xyz_klm", "ghi"),
@@ -792,19 +932,19 @@ public class TestTemplate {
     }
 
     public static void testSelector() {
-        var template1 = Template.make("a", (String a) -> body(
+        var template1 = Template.make("a", (String a) -> scope(
             "<\n",
             "x #a x\n",
             ">\n"
         ));
 
-        var template2 = Template.make("a", (String a) -> body(
+        var template2 = Template.make("a", (String a) -> scope(
             "<\n",
             "y #a y\n",
             ">\n"
         ));
 
-        var template3 = Template.make("a", (Integer a) -> body(
+        var template3 = Template.make("a", (Integer a) -> scope(
             "[\n",
             "z #a z\n",
             // Select which template should be used:
@@ -813,7 +953,7 @@ public class TestTemplate {
             "]\n"
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             "{\n",
             template3.asToken(-1),
             "break\n",
@@ -865,7 +1005,7 @@ public class TestTemplate {
         // Binding allows use of template1 inside template1, via the Binding indirection.
         var binding1 = new TemplateBinding<Template.OneArg<Integer>>();
 
-        var template1 = Template.make("i", (Integer i) -> body(
+        var template1 = Template.make("i", (Integer i) -> scope(
             "[ #i\n",
             // We cannot yet use the template1 directly, as it is being defined.
             // So we use binding1 instead.
@@ -874,7 +1014,7 @@ public class TestTemplate {
         ));
         binding1.bind(template1);
 
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "{\n",
             // Now, we can use template1 normally, as it is already defined.
             template1.asToken(3),
@@ -902,7 +1042,7 @@ public class TestTemplate {
     }
 
     public static void testFuel() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("f", fuel()),
 
             "<#f>\n"
@@ -910,7 +1050,7 @@ public class TestTemplate {
 
         // Binding allows use of template2 inside template2, via the Binding indirection.
         var binding2 = new TemplateBinding<Template.OneArg<Integer>>();
-        var template2 = Template.make("i", (Integer i) -> body(
+        var template2 = Template.make("i", (Integer i) -> scope(
             let("f", fuel()),
 
             "[ #i #f\n",
@@ -920,7 +1060,7 @@ public class TestTemplate {
         ));
         binding2.bind(template2);
 
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             "{\n",
             template2.asToken(3),
             "}\n"
@@ -948,7 +1088,7 @@ public class TestTemplate {
     }
 
     public static void testFuelCustom() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             setFuelCost(2.0f),
             let("f", fuel()),
 
@@ -957,7 +1097,7 @@ public class TestTemplate {
 
         // Binding allows use of template2 inside template2, via the Binding indirection.
         var binding2 = new TemplateBinding<Template.OneArg<Integer>>();
-        var template2 = Template.make("i", (Integer i) -> body(
+        var template2 = Template.make("i", (Integer i) -> scope(
             setFuelCost(3.0f),
             let("f", fuel()),
 
@@ -968,7 +1108,7 @@ public class TestTemplate {
         ));
         binding2.bind(template2);
 
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             setFuelCost(5.0f),
             let("f", fuel()),
 
@@ -1002,46 +1142,277 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testFuelAndScopes() {
+        var readFuelTemplate = Template.make(() -> scope(
+            let("f", fuel()),
+            "<#f>\n"
+        ));
+
+        var template = Template.make(() -> scope(
+            let("f", fuel()),
+            "{#f}\n",
+            readFuelTemplate.asToken(),
+
+            "scope:\n",
+            setFuelCost(1.0f),
+            scope(
+                readFuelTemplate.asToken(),
+                setFuelCost(2.0f),
+                readFuelTemplate.asToken()
+            ),
+            readFuelTemplate.asToken(),
+
+            "transparentScope:\n",
+            setFuelCost(4.0f),
+            transparentScope(
+                readFuelTemplate.asToken(),
+                setFuelCost(8.0f),
+                readFuelTemplate.asToken()
+            ),
+            readFuelTemplate.asToken(),
+
+            "nameScope:\n",
+            setFuelCost(16.0f),
+            nameScope(
+                readFuelTemplate.asToken(),
+                setFuelCost(32.0f),
+                readFuelTemplate.asToken()
+            ),
+            readFuelTemplate.asToken(),
+
+            "hashtagScope:\n",
+            setFuelCost(64.0f),
+            hashtagScope(
+                readFuelTemplate.asToken(),
+                setFuelCost(128.0f),
+                readFuelTemplate.asToken()
+            ),
+            readFuelTemplate.asToken(),
+
+            "setFuelCostScope:\n",
+            setFuelCost(256.0f),
+            setFuelCostScope(
+                readFuelTemplate.asToken(),
+                setFuelCost(512.0f),
+                readFuelTemplate.asToken()
+            ),
+            readFuelTemplate.asToken()
+        ));
+
+        String code = template.render(1000.0f);
+        String expected =
+            """
+            {1000.0f}
+            <990.0f>
+            scope:
+            <999.0f>
+            <998.0f>
+            <999.0f>
+            transparentScope:
+            <996.0f>
+            <992.0f>
+            <992.0f>
+            nameScope:
+            <984.0f>
+            <968.0f>
+            <968.0f>
+            hashtagScope:
+            <936.0f>
+            <872.0f>
+            <872.0f>
+            setFuelCostScope:
+            <744.0f>
+            <488.0f>
+            <744.0f>
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames0a() {
+        var template = Template.make(() -> scope(
+            // When a DataName is added, it is immediately available afterwards.
+            // This may seem trivial, but it requires that either both "add" and
+            // "sample" happen in lambda execution, or in token evaluation.
+            // Otherwise, one can float above the other, and lead to unintuitive
+            // behavior.
+            addDataName("x", myInt, MUTABLE),
+            dataNames(MUTABLE).exactOf(myInt).sampleAndLetAs("v"),
+            "sample: #v."
+        ));
+
+        String code = template.render();
+        checkEQ(code, "sample: x.");
+    }
+
+    public static void testDataNames0b() {
+        // Test that the scope keeps local DataNames only for the scope, but that
+        // we can see DataNames of outer scopes.
+        var template = Template.make(() -> scope(
+            // Outer scope DataName:
+            addDataName("outerInt", myInt, MUTABLE),
+            dataNames(MUTABLE).exactOf(myInt).sample((DataName dn) -> scope(
+                let("name1", dn.name()),
+                "sample: #name1.\n",
+                // We can also see the outer DataName:
+                dataNames(MUTABLE).exactOf(myInt).sampleAndLetAs("name2"),
+                "sample: #name2.\n",
+                // Local DataName:
+                addDataName("innerLong", myLong, MUTABLE),
+                dataNames(MUTABLE).exactOf(myLong).sampleAndLetAs("name3"),
+                "sample: #name3.\n"
+            )),
+            // We can still see the outer scope DataName:
+            dataNames(MUTABLE).exactOf(myInt).sampleAndLetAs("name4"),
+            "sample: #name4.\n",
+            // But we cannot see the DataNames that are local to the inner scope.
+            // So here, we will always see "outerLong", and never "innerLong".
+            addDataName("outerLong", myLong, MUTABLE),
+            dataNames(MUTABLE).exactOf(myLong).sampleAndLetAs("name5"),
+            "sample: #name5.\n"
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            sample: outerInt.
+            sample: outerInt.
+            sample: innerLong.
+            sample: outerInt.
+            sample: outerLong.
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames0c() {
+        // Test that hashtag replacements that are local to inner scopes are
+        // only visible to inner scopes, but dollar replacements are the same
+        // for the whole Template.
+        var template = Template.make(() -> scope(
+            let("global", "GLOBAL"),
+            "g: #global. $a\n",
+            // Create a dummy DataName so we don't get an exception from sample.
+            addDataName("x", myInt, MUTABLE),
+            dataNames(MUTABLE).exactOf(myInt).sample((DataName dn) -> scope(
+                "g: #global. $b\n",
+                let("local", "LOCAL1"),
+                "l: #local. $c\n"
+            )),
+            "g: #global. $d\n",
+            // Open the scope again just to see if we can create the local again there.
+            dataNames(MUTABLE).exactOf(myInt).sample((DataName dn) -> scope(
+                "g: #global. $e\n",
+                let("local", "LOCAL2"),
+                "l: #local. $f\n"
+            )),
+            // We can now use the "local" hashtag replacement again, since it
+            // was previously only defined in an inner scope.
+            let("local", "LOCAL3"),
+            "g: #global. $g\n",
+            "l: #local. $h\n"
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            g: GLOBAL. a_1
+            g: GLOBAL. b_1
+            l: LOCAL1. c_1
+            g: GLOBAL. d_1
+            g: GLOBAL. e_1
+            l: LOCAL2. f_1
+            g: GLOBAL. g_1
+            l: LOCAL3. h_1
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames0d() {
+        var template = Template.make(() -> scope(
+            addDataName("x", myInt, MUTABLE),
+            addDataName("y", myInt, MUTABLE),
+            addDataName("z", myInt, MUTABLE),
+            addDataName("a", myLong, MUTABLE),
+            addDataName("b", myLong, MUTABLE),
+            addDataName("c", myLong, MUTABLE),
+            dataNames(MUTABLE).exactOf(myInt).forEach((DataName dn) -> scope(
+                let("name", dn.name()),
+                let("type", dn.type()),
+                "listI: #name #type.\n"
+            )),
+            dataNames(MUTABLE).exactOf(myLong).forEach((DataName dn) -> scope(
+                let("name", dn.name()),
+                let("type", dn.type()),
+                "listL: #name #type.\n"
+            ))
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            listI: x int.
+            listI: y int.
+            listI: z int.
+            listL: a long.
+            listL: b long.
+            listL: c long.
+            """;
+        checkEQ(code, expected);
+    }
     public static void testDataNames1() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "[",
-            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).hasAny(),
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).hasAny(h -> scope(h)),
             ", ",
-            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).count(),
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).count(c -> scope(c)),
             ", names: {",
-            String.join(", ", dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).toList().stream().map(DataName::name).toList()),
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).toList(list -> scope(
+                String.join(", ", list.stream().map(DataName::name).toList())
+            )),
             "}]\n"
         ));
 
-        var template2 = Template.make("name", "type", (String name, DataName.Type type) -> body(
-            addDataName(name, type, MUTABLE),
+        // Note: the scope of the template must be transparentScope, so that the addDataName can escape.
+        var template2 = Template.make("name", "type", (String name, DataName.Type type) -> transparentScope(
+            addDataName(name, type, MUTABLE), // escapes
             "define #type #name\n",
             template1.asToken()
         ));
 
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             "<\n",
             hook1.insert(template2.asToken($("name"), myInt)),
             "$name = 5\n",
             ">\n"
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             "{\n",
             template1.asToken(),
-            hook1.anchor(
+            hook1.anchor(scope(
                 template1.asToken(),
                 "something\n",
-                template3.asToken(),
+                template3.asToken(), // name_4 is inserted to hook1
                 "more\n",
                 template1.asToken(),
                 "more\n",
-                template2.asToken($("name"), myInt),
+                template2.asToken($("name"), myInt), // name_1 escapes
                 "more\n",
+                template1.asToken(),
+                "extra\n",
+                hook1.insert(scope(
+                    addDataName($("extra1"), myInt, MUTABLE), // does not escape
+                    "$extra1 = 666\n"
+                )),
+                hook1.insert(transparentScope(
+                    addDataName($("extra2"), myInt, MUTABLE), // escapes
+                    "$extra2 = 42\n"
+                )),
                 template1.asToken()
-            ),
+            )),
+            // But no names escape to down here, because the anchor scope is "scope".
+            "final:\n",
             template1.asToken(),
             "}\n"
         ));
@@ -1053,6 +1424,8 @@ public class TestTemplate {
             [false, 0, names: {}]
             define int name_4
             [true, 1, names: {name_4}]
+            extra1_1 = 666
+            extra2_1 = 42
             [false, 0, names: {}]
             something
             <
@@ -1064,7 +1437,10 @@ public class TestTemplate {
             define int name_1
             [true, 2, names: {name_4, name_1}]
             more
-            [true, 1, names: {name_4}]
+            [true, 2, names: {name_4, name_1}]
+            extra
+            [true, 3, names: {name_4, extra2_1, name_1}]
+            final:
             [false, 0, names: {}]
             }
             """;
@@ -1074,17 +1450,19 @@ public class TestTemplate {
     public static void testDataNames2() {
         var hook1 = new Hook("Hook1");
 
-        var template0 = Template.make("type", "mutability", (DataName.Type type, DataName.Mutability mutability) -> body(
+        var template0 = Template.make("type", "mutability", (DataName.Type type, DataName.Mutability mutability) -> scope(
             "  #mutability: [",
-            dataNames(mutability).exactOf(myInt).hasAny(),
+            dataNames(mutability).exactOf(myInt).hasAny(h -> scope(h)),
             ", ",
-            dataNames(mutability).exactOf(myInt).count(),
+            dataNames(mutability).exactOf(myInt).count(c -> scope(c)),
             ", names: {",
-            String.join(", ", dataNames(mutability).exactOf(myInt).toList().stream().map(DataName::name).toList()),
+            dataNames(mutability).exactOf(myInt).toList(list -> scope(
+                String.join(", ", list.stream().map(DataName::name).toList())
+            )),
             "}]\n"
         ));
 
-        var template1 = Template.make("type", (DataName.Type type) -> body(
+        var template1 = Template.make("type", (DataName.Type type) -> scope(
             "[#type:\n",
             template0.asToken(type, MUTABLE),
             template0.asToken(type, IMMUTABLE),
@@ -1092,51 +1470,51 @@ public class TestTemplate {
             "]\n"
         ));
 
-        var template2 = Template.make("name", "type", (String name, DataName.Type type) -> body(
-            addDataName(name, type, MUTABLE),
+        var template2 = Template.make("name", "type", (String name, DataName.Type type) -> transparentScope(
+            addDataName(name, type, MUTABLE), // escapes
             "define mutable #type #name\n",
             template1.asToken(type)
         ));
 
-        var template3 = Template.make("name", "type", (String name, DataName.Type type) -> body(
-            addDataName(name, type, IMMUTABLE),
+        var template3 = Template.make("name", "type", (String name, DataName.Type type) -> transparentScope(
+            addDataName(name, type, IMMUTABLE), // escapes
             "define immutable #type #name\n",
             template1.asToken(type)
         ));
 
-        var template4 = Template.make("type", (DataName.Type type) -> body(
+        var template4 = Template.make("type", (DataName.Type type) -> scope(
             "{ $store\n",
             hook1.insert(template2.asToken($("name"), type)),
             "$name = 5\n",
             "} $store\n"
         ));
 
-        var template5 = Template.make("type", (DataName.Type type) -> body(
+        var template5 = Template.make("type", (DataName.Type type) -> scope(
             "{ $load\n",
             hook1.insert(template3.asToken($("name"), type)),
             "blackhole($name)\n",
             "} $load\n"
         ));
 
-        var template6 = Template.make("type", (DataName.Type type) -> body(
-            let("v", dataNames(MUTABLE).exactOf(type).sample().name()),
+        var template6 = Template.make("type", (DataName.Type type) -> scope(
+            dataNames(MUTABLE).exactOf(type).sampleAndLetAs("v"),
             "{ $sample\n",
             "#v = 7\n",
             "} $sample\n"
         ));
 
-        var template7 = Template.make("type", (DataName.Type type) -> body(
-            let("v", dataNames(MUTABLE_OR_IMMUTABLE).exactOf(type).sample().name()),
+        var template7 = Template.make("type", (DataName.Type type) -> scope(
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(type).sampleAndLetAs("v"),
             "{ $sample\n",
             "blackhole(#v)\n",
             "} $sample\n"
         ));
 
-        var template8 = Template.make(() -> body(
+        var template8 = Template.make(() -> scope(
             "class $X {\n",
             template1.asToken(myInt),
-            hook1.anchor(
-                "begin $body\n",
+            hook1.anchor(scope(
+                "begin $scope\n",
                 template1.asToken(myInt),
                 "start with immutable\n",
                 template5.asToken(myInt),
@@ -1148,7 +1526,7 @@ public class TestTemplate {
                 "then store to it\n",
                 template6.asToken(myInt),
                 template1.asToken(myInt)
-            ),
+            )),
             template1.asToken(myInt),
             "}\n"
         ));
@@ -1174,7 +1552,7 @@ public class TestTemplate {
               IMMUTABLE: [true, 1, names: {name_10}]
               MUTABLE_OR_IMMUTABLE: [true, 2, names: {name_10, name_21}]
             ]
-            begin body_1
+            begin scope_1
             [int:
               MUTABLE: [false, 0, names: {}]
               IMMUTABLE: [false, 0, names: {}]
@@ -1219,17 +1597,19 @@ public class TestTemplate {
     public static void testDataNames3() {
         var hook1 = new Hook("Hook1");
 
-        var template0 = Template.make("type", "mutability", (DataName.Type type, DataName.Mutability mutability) -> body(
+        var template0 = Template.make("type", "mutability", (DataName.Type type, DataName.Mutability mutability) -> scope(
             "  #mutability: [",
-            dataNames(mutability).exactOf(myInt).hasAny(),
+            dataNames(mutability).exactOf(myInt).hasAny(h -> scope(h)),
             ", ",
-            dataNames(mutability).exactOf(myInt).count(),
+            dataNames(mutability).exactOf(myInt).count(c -> scope(c)),
             ", names: {",
-            String.join(", ", dataNames(mutability).exactOf(myInt).toList().stream().map(DataName::name).toList()),
+            dataNames(mutability).exactOf(myInt).toList(list -> scope(
+                String.join(", ", list.stream().map(DataName::name).toList())
+            )),
             "}]\n"
         ));
 
-        var template1 = Template.make("type", (DataName.Type type) -> body(
+        var template1 = Template.make("type", (DataName.Type type) -> scope(
             "[#type:\n",
             template0.asToken(type, MUTABLE),
             template0.asToken(type, IMMUTABLE),
@@ -1237,11 +1617,11 @@ public class TestTemplate {
             "]\n"
         ));
 
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "class $Y {\n",
             template1.asToken(myInt),
-            hook1.anchor(
-                "begin $body\n",
+            hook1.anchor(scope(
+                "begin $scope\n",
                 template1.asToken(myInt),
                 "define mutable $v1\n",
                 addDataName($("v1"), myInt, MUTABLE),
@@ -1249,7 +1629,7 @@ public class TestTemplate {
                 "define immutable $v2\n",
                 addDataName($("v2"), myInt, IMMUTABLE),
                 template1.asToken(myInt)
-            ),
+            )),
             template1.asToken(myInt),
             "}\n"
         ));
@@ -1263,7 +1643,7 @@ public class TestTemplate {
               IMMUTABLE: [false, 0, names: {}]
               MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
             ]
-            begin body_1
+            begin scope_1
             [int:
               MUTABLE: [false, 0, names: {}]
               IMMUTABLE: [false, 0, names: {}]
@@ -1294,47 +1674,62 @@ public class TestTemplate {
     public static void testDataNames4() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("type", (DataName.Type type) -> body(
+        var template1 = Template.make("type", (DataName.Type type) -> scope(
             "[#type:\n",
             "  exact: ",
-            dataNames(MUTABLE).exactOf(type).hasAny(),
+            dataNames(MUTABLE).exactOf(type).hasAny(h -> scope(h)),
             ", ",
-            dataNames(MUTABLE).exactOf(type).count(),
+            dataNames(MUTABLE).exactOf(type).count(c -> scope(c)),
             ", {",
-            String.join(", ", dataNames(MUTABLE).exactOf(type).toList().stream().map(DataName::name).toList()),
+            dataNames(MUTABLE).exactOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(DataName::name).toList())
+            )),
             "}\n",
             "  subtype: ",
-            dataNames(MUTABLE).subtypeOf(type).hasAny(),
+            dataNames(MUTABLE).subtypeOf(type).hasAny(h -> scope(h)),
             ", ",
-            dataNames(MUTABLE).subtypeOf(type).count(),
+            dataNames(MUTABLE).subtypeOf(type).count(c -> scope(c)),
             ", {",
-            String.join(", ", dataNames(MUTABLE).subtypeOf(type).toList().stream().map(DataName::name).toList()),
+            dataNames(MUTABLE).subtypeOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(DataName::name).toList())
+            )),
+
             "}\n",
             "  supertype: ",
-            dataNames(MUTABLE).supertypeOf(type).hasAny(),
+            dataNames(MUTABLE).supertypeOf(type).hasAny(h -> scope(h)),
             ", ",
-            dataNames(MUTABLE).supertypeOf(type).count(),
+            dataNames(MUTABLE).supertypeOf(type).count(c -> scope(c)),
             ", {",
-            String.join(", ", dataNames(MUTABLE).supertypeOf(type).toList().stream().map(DataName::name).toList()),
+            dataNames(MUTABLE).supertypeOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(DataName::name).toList())
+            )),
             "}\n",
             "]\n"
         ));
 
         List<DataName.Type> types = List.of(myClassA, myClassA1, myClassA2, myClassA11, myClassB);
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "DataNames:\n",
             types.stream().map(t -> template1.asToken(t)).toList()
         ));
 
-        var template3 = Template.make("type", (DataName.Type type) -> body(
-            let("name", dataNames(MUTABLE).subtypeOf(type).sample()),
-            "Sample #type: #name\n"
+        var template3 = Template.make("type", (DataName.Type type) -> scope(
+            dataNames(MUTABLE).subtypeOf(type).sampleAndLetAs("name1"),
+            "Sample #type: #name1\n",
+            dataNames(MUTABLE).subtypeOf(type).sampleAndLetAs("name2", "type2"),
+            "Sample #type: #name2 #type2\n",
+            dataNames(MUTABLE).subtypeOf(type).sample((DataName dn) -> scope(
+                let("name3", dn.name()),
+                let("type3", dn.type()),
+                let("dn", dn), // format the whole DataName with toString
+                "Sample #type: #name3 #type3 #dn\n"
+            ))
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             "class $W {\n",
             template2.asToken(),
-            hook1.anchor(
+            hook1.anchor(scope(
                 "Create name for myClassA11, should be visible for the super classes\n",
                 addDataName($("v1"), myClassA11, MUTABLE),
                 template3.asToken(myClassA11),
@@ -1345,7 +1740,7 @@ public class TestTemplate {
                 template3.asToken(myClassA11),
                 template3.asToken(myClassA1),
                 template2.asToken()
-            ),
+            )),
             template2.asToken(),
             "}\n"
         ));
@@ -1381,12 +1776,22 @@ public class TestTemplate {
               supertype: false, 0, {}
             ]
             Create name for myClassA11, should be visible for the super classes
-            Sample myClassA11: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
-            Sample myClassA1: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
-            Sample myClassA: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA11: v1_1
+            Sample myClassA11: v1_1 myClassA11
+            Sample myClassA11: v1_1 myClassA11 DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA1: v1_1
+            Sample myClassA1: v1_1 myClassA11
+            Sample myClassA1: v1_1 myClassA11 DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA: v1_1
+            Sample myClassA: v1_1 myClassA11
+            Sample myClassA: v1_1 myClassA11 DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
             Create name for myClassA, should never be visible for the sub classes
-            Sample myClassA11: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
-            Sample myClassA1: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA11: v1_1
+            Sample myClassA11: v1_1 myClassA11
+            Sample myClassA11: v1_1 myClassA11 DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA1: v1_1
+            Sample myClassA1: v1_1 myClassA11
+            Sample myClassA1: v1_1 myClassA11 DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
             DataNames:
             [myClassA:
               exact: true, 1, {v2_1}
@@ -1449,49 +1854,61 @@ public class TestTemplate {
         var hook1 = new Hook("Hook1");
         var hook2 = new Hook("Hook2");
 
-        // It is safe in separate Hook scopes.
-        var template1 = Template.make(() -> body(
-            hook1.anchor(
+        // It is safe in separate scopes.
+        var template1 = Template.make(() -> scope(
+            scope(
                 addDataName("name1", myInt, MUTABLE)
             ),
-            hook1.anchor(
+            scope(
                 addDataName("name1", myInt, MUTABLE)
-            )
+            ),
+            nameScope(
+                addDataName("name1", myInt, MUTABLE)
+            ),
+            nameScope(
+                addDataName("name1", myInt, MUTABLE)
+            ),
+            hook1.anchor(scope(
+                addDataName("name1", myInt, MUTABLE)
+            )),
+            hook1.anchor(scope(
+                addDataName("name1", myInt, MUTABLE)
+            ))
         ));
 
         // It is safe in separate Template scopes.
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             addDataName("name2", myInt, MUTABLE)
         ));
-        var template3 = Template.make(() -> body(
+        var template3 = Template.make(() -> scope(
             template2.asToken(),
             template2.asToken()
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             // The following is not safe, it would collide
             // with (1), because it would be inserted to the
             // hook1.anchor in template5, and hence be available
             // inside the scope where (1) is available.
             // See: testFailingAddNameDuplication8
             // addDataName("name", myInt, MUTABLE),
-            hook2.anchor(
+            hook2.anchor(scope(
                 // (2) This one is added second. Since it is
                 //     inside the hook2.anchor, it does not go
                 //     out to the hook1.anchor, and is not
                 //     available inside the scope of (1).
                 addDataName("name3", myInt, MUTABLE)
-            )
+            ))
         ));
-        var template5 = Template.make(() -> body(
-            hook1.anchor(
+        var template5 = Template.make(() -> scope(
+            hook1.anchor(scope(
                 // (1) this is the first one we add.
                 addDataName("name3", myInt, MUTABLE)
-            )
+            ))
         ));
 
         // Put it all together into a single test.
-        var template6 = Template.make(() -> body(
+        var template6 = Template.make(() -> scope(
             template1.asToken(),
             template3.asToken(),
             template5.asToken()
@@ -1502,31 +1919,128 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testDataNames6() {
+        var template = Template.make(() -> scope(
+            addDataName("x", myInt, IMMUTABLE),
+            "int x = 5;\n",
+            // A DataName can be captured, and used to define a new one with the same type.
+            // It is important that the new DataName can escape the hashtagScope, so we have
+            // access to it later.
+            // Using "scope", it does not escape.
+            dataNames(IMMUTABLE).exactOf(myInt).sample(dn -> scope(
+                addDataName("a", dn.type(), MUTABLE),
+                let("v1", "a"),
+                "int #v1 = x + 1;\n"
+            )),
+            // Using "transparentScope", it is available.
+            dataNames(IMMUTABLE).exactOf(myInt).sample(dn -> transparentScope(
+                addDataName("b", dn.type(), MUTABLE),
+                let("v2", "b"),
+                "int #v2 = x + 2;\n"
+            )),
+            // Using "nameScope", it does not escape.
+            dataNames(IMMUTABLE).exactOf(myInt).sample(dn -> nameScope(
+                addDataName("c", dn.type(), MUTABLE),
+                let("v3", "c"),
+                "int #v3 = x + 3;\n"
+            )),
+            // Using "hashtagScope", it is available.
+            dataNames(IMMUTABLE).exactOf(myInt).sample(dn -> hashtagScope(
+                addDataName("d", dn.type(), MUTABLE),
+                let("v4", "d"),
+                "int #v4 = x + 4;\n"
+            )),
+            // Using "setFuelCostScope", it is available.
+            dataNames(IMMUTABLE).exactOf(myInt).sample(dn -> setFuelCostScope(
+                addDataName("e", dn.type(), MUTABLE),
+                let("v5", "e"),
+                "int #v5 = x + 5;\n"
+            )),
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).forEach("name", "type", dn -> scope(
+                "available1: #name #type.\n"
+            )),
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).forEach("name", "type", dn -> hashtagScope(
+                "available2: #name #type.\n"
+            )),
+            // Check that hashtags escape correctly too.
+            "hashtag v2: #v2.\n",
+            "hashtag v3: #v3.\n",
+            "hashtag v5: #v5.\n",
+            let("v1", "aaa"),
+            let("v4", "ddd")
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            int x = 5;
+            int a = x + 1;
+            int b = x + 2;
+            int c = x + 3;
+            int d = x + 4;
+            int e = x + 5;
+            available1: x int.
+            available1: b int.
+            available1: d int.
+            available1: e int.
+            available2: x int.
+            available2: b int.
+            available2: d int.
+            available2: e int.
+            hashtag v2: b.
+            hashtag v3: c.
+            hashtag v5: e.
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testStructuralNames0() {
+        var template = Template.make(() -> scope(
+            // When a StructuralName is added, it is immediately available afterwards.
+            // This may seem trivial, but it requires that either both "add" and
+            // "sample" happen in lambda execution, or in token evaluation.
+            // Otherwise, one can float above the other, and lead to unintuitive
+            // behavior.
+            addStructuralName("x", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).sampleAndLetAs("v"),
+            "sample: #v."
+        ));
+
+        String code = template.render();
+        checkEQ(code, "sample: x.");
+    }
+
     public static void testStructuralNames1() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("type", (StructuralName.Type type) -> body(
+        var template1 = Template.make("type", (StructuralName.Type type) -> scope(
             "[#type:\n",
             "  exact: ",
-            structuralNames().exactOf(type).hasAny(),
+            structuralNames().exactOf(type).hasAny(h -> scope(h)),
             ", ",
-            structuralNames().exactOf(type).count(),
+            structuralNames().exactOf(type).count(c -> scope(c)),
             ", {",
-            String.join(", ", structuralNames().exactOf(type).toList().stream().map(StructuralName::name).toList()),
+            structuralNames().exactOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
             "}\n",
             "  subtype: ",
-            structuralNames().subtypeOf(type).hasAny(),
+            structuralNames().subtypeOf(type).hasAny(h -> scope(h)),
             ", ",
-            structuralNames().subtypeOf(type).count(),
+            structuralNames().subtypeOf(type).count(c -> scope(c)),
             ", {",
-            String.join(", ", structuralNames().subtypeOf(type).toList().stream().map(StructuralName::name).toList()),
+            structuralNames().subtypeOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
             "}\n",
             "  supertype: ",
-            structuralNames().supertypeOf(type).hasAny(),
+            structuralNames().supertypeOf(type).hasAny(h -> scope(h)),
             ", ",
-            structuralNames().supertypeOf(type).count(),
+            structuralNames().supertypeOf(type).count(c -> scope(c)),
             ", {",
-            String.join(", ", structuralNames().supertypeOf(type).toList().stream().map(StructuralName::name).toList()),
+            structuralNames().supertypeOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
             "}\n",
             "]\n"
         ));
@@ -1536,20 +2050,28 @@ public class TestTemplate {
                                                   myStructuralTypeA2,
                                                   myStructuralTypeA11,
                                                   myStructuralTypeB);
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "StructuralNames:\n",
             types.stream().map(t -> template1.asToken(t)).toList()
         ));
 
-        var template3 = Template.make("type", (StructuralName.Type type) -> body(
-            let("name", structuralNames().subtypeOf(type).sample()),
-            "Sample #type: #name\n"
+        var template3 = Template.make("type", (StructuralName.Type type) -> scope(
+            structuralNames().subtypeOf(type).sampleAndLetAs("name1"),
+            "Sample #type: #name1\n",
+            structuralNames().subtypeOf(type).sampleAndLetAs("name2", "type2"),
+            "Sample #type: #name2 #type2\n",
+            structuralNames().subtypeOf(type).sample((StructuralName sn) -> scope(
+                let("name3", sn.name()),
+                let("type3", sn.type()),
+                let("sn", sn), // format the whole StructuralName with toString
+                "Sample #type: #name3 #type3 #sn\n"
+            ))
         ));
 
-        var template4 = Template.make(() -> body(
+        var template4 = Template.make(() -> scope(
             "class $Q {\n",
             template2.asToken(),
-            hook1.anchor(
+            hook1.anchor(scope(
                 "Create name for myStructuralTypeA11, should be visible for the supertypes\n",
                 addStructuralName($("v1"), myStructuralTypeA11),
                 template3.asToken(myStructuralTypeA11),
@@ -1560,7 +2082,7 @@ public class TestTemplate {
                 template3.asToken(myStructuralTypeA11),
                 template3.asToken(myStructuralTypeA1),
                 template2.asToken()
-            ),
+            )),
             template2.asToken(),
             "}\n"
         ));
@@ -1596,12 +2118,22 @@ public class TestTemplate {
               supertype: false, 0, {}
             ]
             Create name for myStructuralTypeA11, should be visible for the supertypes
-            Sample StructuralA11: StructuralName[name=v1_1, type=StructuralA11, weight=1]
-            Sample StructuralA1: StructuralName[name=v1_1, type=StructuralA11, weight=1]
-            Sample StructuralA: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA11: v1_1
+            Sample StructuralA11: v1_1 StructuralA11
+            Sample StructuralA11: v1_1 StructuralA11 StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA1: v1_1
+            Sample StructuralA1: v1_1 StructuralA11
+            Sample StructuralA1: v1_1 StructuralA11 StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA: v1_1
+            Sample StructuralA: v1_1 StructuralA11
+            Sample StructuralA: v1_1 StructuralA11 StructuralName[name=v1_1, type=StructuralA11, weight=1]
             Create name for myStructuralTypeA, should never be visible for the subtypes
-            Sample StructuralA11: StructuralName[name=v1_1, type=StructuralA11, weight=1]
-            Sample StructuralA1: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA11: v1_1
+            Sample StructuralA11: v1_1 StructuralA11
+            Sample StructuralA11: v1_1 StructuralA11 StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA1: v1_1
+            Sample StructuralA1: v1_1 StructuralA11
+            Sample StructuralA1: v1_1 StructuralA11 StructuralName[name=v1_1, type=StructuralA11, weight=1]
             StructuralNames:
             [StructuralA:
               exact: true, 1, {v2_1}
@@ -1662,41 +2194,43 @@ public class TestTemplate {
     public static void testStructuralNames2() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make("type", (StructuralName.Type type) -> body(
+        var template1 = Template.make("type", (StructuralName.Type type) -> scope(
             "[#type: ",
-            structuralNames().exactOf(type).hasAny(),
+            structuralNames().exactOf(type).hasAny(h -> scope(h)),
             ", ",
-            structuralNames().exactOf(type).count(),
+            structuralNames().exactOf(type).count(c -> scope(c)),
             ", names: {",
-            String.join(", ", structuralNames().exactOf(type).toList().stream().map(StructuralName::name).toList()),
+            structuralNames().exactOf(type).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
             "}]\n"
         ));
 
-        var template2 = Template.make("name", "type", (String name, StructuralName.Type type) -> body(
-            addStructuralName(name, type),
+        var template2 = Template.make("name", "type", (String name, StructuralName.Type type) -> transparentScope(
+            addStructuralName(name, type), // escapes
             "define #type #name\n"
         ));
 
-        var template3 = Template.make("type", (StructuralName.Type type) -> body(
+        var template3 = Template.make("type", (StructuralName.Type type) -> scope(
             "{ $access\n",
             hook1.insert(template2.asToken($("name"), type)),
             "$name = 5\n",
             "} $access\n"
         ));
 
-        var template4 = Template.make("type", (StructuralName.Type type) -> body(
-            let("v", structuralNames().exactOf(type).sample().name()),
+        var template4 = Template.make("type", (StructuralName.Type type) -> scope(
+            structuralNames().exactOf(type).sampleAndLetAs("v"),
             "{ $sample\n",
             "blackhole(#v)\n",
             "} $sample\n"
         ));
 
-        var template8 = Template.make(() -> body(
+        var template8 = Template.make(() -> scope(
             "class $X {\n",
             template1.asToken(myStructuralTypeA),
             template1.asToken(myStructuralTypeB),
-            hook1.anchor(
-                "begin $body\n",
+            hook1.anchor(scope(
+                "begin $scope\n",
                 template1.asToken(myStructuralTypeA),
                 template1.asToken(myStructuralTypeB),
                 "start with A\n",
@@ -1711,7 +2245,7 @@ public class TestTemplate {
                 template4.asToken(myStructuralTypeB),
                 template1.asToken(myStructuralTypeA),
                 template1.asToken(myStructuralTypeB)
-            ),
+            )),
             template1.asToken(myStructuralTypeA),
             template1.asToken(myStructuralTypeB),
             "}\n"
@@ -1725,7 +2259,7 @@ public class TestTemplate {
             [StructuralB: false, 0, names: {}]
             define StructuralA name_6
             define StructuralB name_11
-            begin body_1
+            begin scope_1
             [StructuralA: false, 0, names: {}]
             [StructuralB: false, 0, names: {}]
             start with A
@@ -1755,16 +2289,269 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testStructuralNames3() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> scope(
+                let("name1", sn.name()),
+                "sn1: #name1.\n",
+                addStructuralName("scope_garbage1", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> nameScope(
+                // We cannot use "let" here (at least not easily), otherwise we get
+                // a duplicate hashtag replacement. It would probably be better style
+                // to use a "let", but we are just checking that "nameScope" works
+                // for reuse of names.
+                "sn2: ",  sn.name(), ".\n",
+                // But for testing, we still do a "let", just with different key.
+                // (This is probably bad practice, we just do this for testing)
+                let("name2_" + sn.name(), sn.name()),
+                addStructuralName("scope_garbage2", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> transparentScope(
+                // Same issue with hashtags as with "nameScope".
+                "sn3: ",  sn.name(), ".\n",
+                let("name3_" + sn.name(), sn.name()),
+                // Using the same name for each would lead to duplicates,
+                // so we have to modify the name here.
+                addStructuralName("x_" + sn.name(), myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> hashtagScope(
+                let("name4", sn.name()),
+                "sn4: #name4.\n",
+                // Same issue with duplicate names as with "transparentScope".
+                addStructuralName("y_" + sn.name(), myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> setFuelCostScope(
+                // Same issue with hashtags as with "nameScope".
+                "sn5: ",  sn.name(), ".\n",
+                let("name5_" + sn.name(), sn.name()),
+                // Same issue with duplicate names as with "transparentScope".
+                addStructuralName("z_" + sn.name(), myStructuralTypeA)
+            )),
+            "sn2: #name2_a #name2_b.\n", // hashtags escaped
+            "sn3: #name3_a #name3_b.\n", // hashtags escaped
+            "sn5: #name5_a #name5_b #name5_x_a #name5_x_b.\n", // hashtags escaped
+            let("name1", "shouldBeOK1"), // hashtag did not escape
+            let("name4", "shouldBeOk4")  // hashtag did not escape
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            sn1: a.
+            sn1: b.
+            sn2: a.
+            sn2: b.
+            sn3: a.
+            sn3: b.
+            sn4: a.
+            sn4: b.
+            sn4: x_a.
+            sn4: x_b.
+            sn5: a.
+            sn5: b.
+            sn5: x_a.
+            sn5: x_b.
+            sn5: y_a.
+            sn5: y_b.
+            sn5: y_x_a.
+            sn5: y_x_b.
+            sn2: a b.
+            sn3: a b.
+            sn5: a b x_a x_b.
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testStructuralNames4() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> scope(
+                let("name1", list.size()),
+                "list1: #name1.\n",
+                addStructuralName("scope_garbage1", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> nameScope(
+                let("name2", list.size()),
+                "list2: #name2.\n",
+                addStructuralName("scope_garbage2", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> transparentScope(
+                let("name3", list.size()),
+                "list3: #name3.\n",
+                addStructuralName("x", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> hashtagScope(
+                let("name4", list.size()),
+                "list4: #name4.\n",
+                addStructuralName("y", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> setFuelCostScope(
+                let("name5", list.size()),
+                "list5: #name5.\n",
+                addStructuralName("z", myStructuralTypeA)
+            )),
+            "list2: #name2.\n", // hashtag escaped
+            "list3: #name3.\n", // hashtag escaped
+            "list5: #name5.\n", // hashtag escaped
+            let("name1", "shouldBeOk4"),  // hashtag did not escape
+            let("name4", "shouldBeOk4"),  // hashtag did not escape
+            structuralNames().exactOf(myStructuralTypeA).forEach("name", "type", sn -> scope(
+                "available: #name #type.\n"
+            ))
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            list1: 2.
+            list2: 2.
+            list3: 2.
+            list4: 3.
+            list5: 4.
+            list2: 2.
+            list3: 2.
+            list5: 4.
+            available: a StructuralA.
+            available: b StructuralA.
+            available: x StructuralA.
+            available: y StructuralA.
+            available: z StructuralA.
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testStructuralNames5() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).count(c -> scope(
+                let("name1", c),
+                "list1: #name1.\n",
+                addStructuralName("scope_garbage1", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).count(c -> nameScope(
+                let("name2", c),
+                "list2: #name2.\n",
+                addStructuralName("scope_garbage2", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).count(c -> transparentScope(
+                let("name3", c),
+                "list3: #name3.\n",
+                addStructuralName("x", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).count(c -> hashtagScope(
+                let("name4", c),
+                "list4: #name4.\n",
+                addStructuralName("y", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).count(c -> setFuelCostScope(
+                let("name5", c),
+                "list5: #name5.\n",
+                addStructuralName("z", myStructuralTypeA)
+            )),
+            "list2: #name2.\n", // hashtag escaped
+            "list3: #name3.\n", // hashtag escaped
+            "list5: #name5.\n", // hashtag escaped
+            let("name1", "shouldBeOk4"),  // hashtag did not escape
+            let("name4", "shouldBeOk4"),  // hashtag did not escape
+            structuralNames().exactOf(myStructuralTypeA).forEach("name", "type", sn -> scope(
+                "available: #name #type.\n"
+            ))
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            list1: 2.
+            list2: 2.
+            list3: 2.
+            list4: 3.
+            list5: 4.
+            list2: 2.
+            list3: 2.
+            list5: 4.
+            available: a StructuralA.
+            available: b StructuralA.
+            available: x StructuralA.
+            available: y StructuralA.
+            available: z StructuralA.
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testStructuralNames6() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).hasAny(h -> scope(
+                let("name1", h),
+                "list1: #name1.\n",
+                addStructuralName("scope_garbage1", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).hasAny(h -> nameScope(
+                let("name2", h),
+                "list2: #name2.\n",
+                addStructuralName("scope_garbage2", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).hasAny(h -> transparentScope(
+                let("name3", h),
+                "list3: #name3.\n",
+                addStructuralName("x", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).hasAny(h -> hashtagScope(
+                let("name4", h),
+                "list4: #name4.\n",
+                addStructuralName("y", myStructuralTypeA)
+            )),
+            structuralNames().exactOf(myStructuralTypeA).hasAny(h -> setFuelCostScope(
+                let("name5", h),
+                "list5: #name5.\n",
+                addStructuralName("z", myStructuralTypeA)
+            )),
+            "list2: #name2.\n", // hashtag escaped
+            "list3: #name3.\n", // hashtag escaped
+            "list5: #name5.\n", // hashtag escaped
+            let("name1", "shouldBeOk4"),  // hashtag did not escape
+            let("name4", "shouldBeOk4"),  // hashtag did not escape
+            structuralNames().exactOf(myStructuralTypeA).forEach("name", "type", sn -> scope(
+                "available: #name #type.\n"
+            ))
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            list1: true.
+            list2: true.
+            list3: true.
+            list4: true.
+            list5: true.
+            list2: true.
+            list3: true.
+            list5: true.
+            available: a StructuralA.
+            available: b StructuralA.
+            available: x StructuralA.
+            available: y StructuralA.
+            available: z StructuralA.
+            """;
+        checkEQ(code, expected);
+    }
+
     record MyItem(DataName.Type type, String op) {}
 
     public static void testListArgument() {
-        var template1 = Template.make("item", (MyItem item) -> body(
+        var template1 = Template.make("item", (MyItem item) -> scope(
             let("type", item.type()),
             let("op", item.op()),
             "#type apply #op\n"
         ));
 
-        var template2 = Template.make("list", (List<MyItem> list) -> body(
+        var template2 = Template.make("list", (List<MyItem> list) -> scope(
             "class $Z {\n",
             // Use template1 for every item in the list.
             list.stream().map(item -> template1.asToken(item)).toList(),
@@ -1797,12 +2584,746 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testNestedScopes1() {
+        var listDataNames = Template.make(() -> scope(
+            "dataNames: {",
+            dataNames(MUTABLE).exactOf(myInt).forEach("name", "type", (DataName dn) -> scope(
+                "#name #type; "
+            )),
+            "}\n"
+        ));
+
+        var template = Template.make("x", (String x) -> scope(
+            "$start\n",
+            addDataName("vx", myInt, MUTABLE),
+            "x: #x.\n",
+            listDataNames.asToken(),
+            // A "transparentScope" nesting essencially does nothing but create
+            // a list of tokens. It passes through names and hashtags.
+            "open transparentScope:\n",
+            transparentScope(
+                "$transparentScope\n",
+                let("y", "YYY"),
+                addDataName("vy", myInt, MUTABLE),
+                "x: #x.\n",
+                "y: #y.\n",
+                listDataNames.asToken()
+            ),
+            "close transparentScope.\n",
+            "x: #x.\n",
+            "y: #y.\n",
+            listDataNames.asToken(),
+            // A "hashtagScope" nesting makes hashtags local, but names
+            // escape the nesting.
+            "open hashtagScope:\n",
+            hashtagScope(
+                "$hashtagScope\n",
+                let("z", "ZZZ1"),
+                "z: #z.\n",
+                addDataName("vz", myInt, MUTABLE),
+                listDataNames.asToken()
+            ),
+            "close hashtagScope.\n",
+            let("z", "ZZZ2"), // we can define it again outside.
+            "z: #z.\n",
+            listDataNames.asToken(),
+            // We can also use hashtagScopes for loops.
+            List.of("a", "b", "c").stream().map(str -> hashtagScope(
+                "$hashtagScope\n",
+                let("str", str), // the hashtag is local to every element
+                "str: #str.\n",
+                addDataName("v_" + str, myInt, MUTABLE),
+                listDataNames.asToken()
+            )).toList(),
+            "finish str list.\n",
+            listDataNames.asToken(),
+            // A "nameScope" nesting makes names local, but hashtags
+            // escape the nesting.
+            "open nameScope:\n",
+            nameScope(
+                "$nameScope\n",
+                let("p", "PPP"),
+                "p: #p.\n",
+                addDataName("vp", myInt, MUTABLE),
+                listDataNames.asToken()
+            ),
+            "close hashtagScope.\n",
+            "p: #p.\n",
+            listDataNames.asToken(),
+            // A "scope" nesting makes names and hashtags local
+            "open scope:\n",
+            scope(
+                "$scope\n",
+                let("q", "QQQ1"),
+                "q: #q.\n",
+                addDataName("vq", myInt, MUTABLE),
+                listDataNames.asToken()
+            ),
+            "close scope.\n",
+            let("q", "QQQ2"),
+            "q: #q.\n",
+            listDataNames.asToken(),
+            // A "setFuelCostScope" nesting behaves the same as "transparentScope", as we are not using fuel here.
+            "open setFuelCostScope:\n",
+            setFuelCostScope(
+                "$setFuelCostScope\n",
+                let("r", "RRR"),
+                "r: #r.\n",
+                addDataName("vr", myInt, MUTABLE),
+                listDataNames.asToken()
+            ),
+            "close setFuelCostScope.\n",
+            "r: #r.\n",
+            listDataNames.asToken()
+
+        ));
+
+        String code = template.render("XXX");
+        String expected =
+            """
+            start_1
+            x: XXX.
+            dataNames: {vx int; }
+            open transparentScope:
+            transparentScope_1
+            x: XXX.
+            y: YYY.
+            dataNames: {vx int; vy int; }
+            close transparentScope.
+            x: XXX.
+            y: YYY.
+            dataNames: {vx int; vy int; }
+            open hashtagScope:
+            hashtagScope_1
+            z: ZZZ1.
+            dataNames: {vx int; vy int; vz int; }
+            close hashtagScope.
+            z: ZZZ2.
+            dataNames: {vx int; vy int; vz int; }
+            hashtagScope_1
+            str: a.
+            dataNames: {vx int; vy int; vz int; v_a int; }
+            hashtagScope_1
+            str: b.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; }
+            hashtagScope_1
+            str: c.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; }
+            finish str list.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; }
+            open nameScope:
+            nameScope_1
+            p: PPP.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; vp int; }
+            close hashtagScope.
+            p: PPP.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; }
+            open scope:
+            scope_1
+            q: QQQ1.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; vq int; }
+            close scope.
+            q: QQQ2.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; }
+            open setFuelCostScope:
+            setFuelCostScope_1
+            r: RRR.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; vr int; }
+            close setFuelCostScope.
+            r: RRR.
+            dataNames: {vx int; vy int; vz int; v_a int; v_b int; v_c int; vr int; }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testNestedScopes2() {
+        var listDataNames = Template.make(() -> scope(
+            "dataNames: {",
+            dataNames(MUTABLE).exactOf(myInt).forEach("name", "type", (DataName dn) -> scope(
+                "#name #type; "
+            )),
+            "}\n"
+        ));
+
+        var template = Template.make(() -> scope(
+            // Define some global variables.
+            List.of("a", "b", "c").stream().map(str -> hashtagScope(
+                let("var", "g_" + str),
+                addDataName("g_" + str, myInt, MUTABLE),
+                "def global #var.\n"
+            )).toList(),
+            listDataNames.asToken(),
+            scope(
+                "open scope:\n",
+                // Define some variables.
+                List.of("i", "j", "k").stream().map(str -> hashtagScope(
+                    let("var", "v_" + str),
+                    addDataName("v_" + str, myInt, MUTABLE),
+                    "def #var.\n"
+                )).toList(),
+                listDataNames.asToken(),
+                scope(
+                    "open inner scope:\n",
+                    addDataName("v_local", myInt, MUTABLE),
+                    "def v_local.\n",
+                    listDataNames.asToken(),
+                    "close inner scope.\n"
+                ),
+                listDataNames.asToken(),
+                "close scope.\n"
+            ),
+            listDataNames.asToken()
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            def global g_a.
+            def global g_b.
+            def global g_c.
+            dataNames: {g_a int; g_b int; g_c int; }
+            open scope:
+            def v_i.
+            def v_j.
+            def v_k.
+            dataNames: {g_a int; g_b int; g_c int; v_i int; v_j int; v_k int; }
+            open inner scope:
+            def v_local.
+            dataNames: {g_a int; g_b int; g_c int; v_i int; v_j int; v_k int; v_local int; }
+            close inner scope.
+            dataNames: {g_a int; g_b int; g_c int; v_i int; v_j int; v_k int; }
+            close scope.
+            dataNames: {g_a int; g_b int; g_c int; }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testTemplateScopes() {
+        var statusTemplate = Template.make(() -> scope(
+            "{",
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
+            "}\n",
+            let("fuel", fuel()),
+            "fuel: #fuel\n"
+        ));
+
+        var scopeTemplate = Template.make(() -> scope(
+            "scope:\n",
+            let("local", "inner scope"),
+            addStructuralName("x", myStructuralTypeA),
+            statusTemplate.asToken(),
+            setFuelCost(50)
+        ));
+
+        var transparentScopeTemplate = Template.make(() -> transparentScope(
+            "transparentScope:\n",
+            let("local", "inner flag"),
+            addStructuralName("y", myStructuralTypeA), // should escape
+            statusTemplate.asToken(),
+            setFuelCost(50)
+        ));
+
+        var template = Template.make(() -> scope(
+            setFuelCost(1),
+            let("local", "root"),
+            addStructuralName("a", myStructuralTypeA),
+            statusTemplate.asToken(),
+            scopeTemplate.asToken(),
+            statusTemplate.asToken(),
+            transparentScopeTemplate.asToken(),
+            statusTemplate.asToken()
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            {a}
+            fuel: 99.0f
+            scope:
+            {a, x}
+            fuel: 89.0f
+            {a}
+            fuel: 99.0f
+            transparentScope:
+            {a, y}
+            fuel: 89.0f
+            {a, y}
+            fuel: 99.0f
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testHookAndScopes1() {
+        Hook hook1 = new Hook("Hook1");
+
+        var listNamesTemplate = Template.make(() -> scope(
+            "{",
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
+            "}\n"
+        ));
+
+        var insertScopeTemplate = Template.make("name", (String name) -> scope(
+            let("local", "insert scope garbage"),
+            addStructuralName(name, myStructuralTypeA),
+            "inserted scope: #name\n",
+            listNamesTemplate.asToken()
+        ));
+
+        var insertTransparentScopeTemplate = Template.make("name", (String name) -> transparentScope(
+            let("local", "insert transparentScope garbage"),
+            addStructuralName(name, myStructuralTypeA),
+            "inserted transparentScope: #name\n",
+            listNamesTemplate.asToken()
+        ));
+
+        var probeTemplate = Template.make(() -> scope(
+            "inserted probe:\n",
+            listNamesTemplate.asToken()
+        ));
+
+        var template = Template.make(() -> scope(
+            "scope:\n",
+            hook1.anchor(scope(
+                let("local", "scope garbage"),
+                addStructuralName("x1a", myStructuralTypeA),
+                "scope before insert scope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertScopeTemplate.asToken("x1b")),
+                "scope after insert scope:\n",
+                listNamesTemplate.asToken(),
+                "scope before insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertTransparentScopeTemplate.asToken("x1c")),
+                "scope after insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                "scope insert probe.\n",
+                hook1.insert(probeTemplate.asToken())
+            )),
+            "after scope:\n",
+            listNamesTemplate.asToken(),
+
+            "transparentScope:\n",
+            hook1.anchor(transparentScope(
+                let("transparentScope2", "abc"),
+                addStructuralName("x2a", myStructuralTypeA),
+                "transparentScope before insert scope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertScopeTemplate.asToken("x2b")),
+                "transparentScope after insert scope:\n",
+                listNamesTemplate.asToken(),
+                "transparentScope before insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertTransparentScopeTemplate.asToken("x2c")),
+                "transparentScope after insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                "transparentScope insert probe.\n",
+                hook1.insert(probeTemplate.asToken())
+            )),
+            "after transparentScope:\n",
+            listNamesTemplate.asToken(),
+            "transparentScope2: #transparentScope2\n",
+
+            "hashtagScope:\n",
+            hook1.anchor(hashtagScope(
+                let("local", "hashtagScope garbage"),
+                addStructuralName("x3a", myStructuralTypeA),
+                "hashtagScope before insert scope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertScopeTemplate.asToken("x3b")),
+                "hashtagScope after insert scope:\n",
+                listNamesTemplate.asToken(),
+                "hashtagScope before insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertTransparentScopeTemplate.asToken("x3c")),
+                "hashtagScope after insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                "hashtagScope insert probe.\n",
+                hook1.insert(probeTemplate.asToken())
+            )),
+            "after hashtagScope:\n",
+            listNamesTemplate.asToken(),
+
+            "nameScope:\n",
+            hook1.anchor(nameScope(
+                let("transparentScope4", "abcde"),
+                addStructuralName("x4a", myStructuralTypeA),
+                "nameScope before insert scope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertScopeTemplate.asToken("x4b")),
+                "nameScope after insert scope:\n",
+                listNamesTemplate.asToken(),
+                "nameScope before insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(insertTransparentScopeTemplate.asToken("x4c")),
+                "nameScope after insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                "nameScope insert probe.\n",
+                hook1.insert(probeTemplate.asToken())
+            )),
+            "after nameScope:\n",
+            listNamesTemplate.asToken(),
+            "transparentScope4: #transparentScope4\n",
+
+            let("local", "outer garbage")
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            scope:
+            inserted scope: x1b
+            {x1b}
+            inserted transparentScope: x1c
+            {x1c}
+            inserted probe:
+            {x1c}
+            scope before insert scope:
+            {x1a}
+            scope after insert scope:
+            {x1a}
+            scope before insert transparentScope:
+            {x1a}
+            scope after insert transparentScope:
+            {x1c, x1a}
+            scope insert probe.
+            after scope:
+            {}
+            transparentScope:
+            inserted scope: x2b
+            {x2a, x2b}
+            inserted transparentScope: x2c
+            {x2a, x2c}
+            inserted probe:
+            {x2a, x2c}
+            transparentScope before insert scope:
+            {x2a}
+            transparentScope after insert scope:
+            {x2a}
+            transparentScope before insert transparentScope:
+            {x2a}
+            transparentScope after insert transparentScope:
+            {x2a, x2c}
+            transparentScope insert probe.
+            after transparentScope:
+            {x2a, x2c}
+            transparentScope2: abc
+            hashtagScope:
+            inserted scope: x3b
+            {x2a, x2c, x3a, x3b}
+            inserted transparentScope: x3c
+            {x2a, x2c, x3a, x3c}
+            inserted probe:
+            {x2a, x2c, x3a, x3c}
+            hashtagScope before insert scope:
+            {x2a, x2c, x3a}
+            hashtagScope after insert scope:
+            {x2a, x2c, x3a}
+            hashtagScope before insert transparentScope:
+            {x2a, x2c, x3a}
+            hashtagScope after insert transparentScope:
+            {x2a, x2c, x3a, x3c}
+            hashtagScope insert probe.
+            after hashtagScope:
+            {x2a, x2c, x3a, x3c}
+            nameScope:
+            inserted scope: x4b
+            {x2a, x2c, x3a, x3c, x4b}
+            inserted transparentScope: x4c
+            {x2a, x2c, x3a, x3c, x4c}
+            inserted probe:
+            {x2a, x2c, x3a, x3c, x4c}
+            nameScope before insert scope:
+            {x2a, x2c, x3a, x3c, x4a}
+            nameScope after insert scope:
+            {x2a, x2c, x3a, x3c, x4a}
+            nameScope before insert transparentScope:
+            {x2a, x2c, x3a, x3c, x4a}
+            nameScope after insert transparentScope:
+            {x2a, x2c, x3a, x3c, x4c, x4a}
+            nameScope insert probe.
+            after nameScope:
+            {x2a, x2c, x3a, x3c}
+            transparentScope4: abcde
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testHookAndScopes2() {
+        Hook hook1 = new Hook("Hook1");
+
+        var listNamesTemplate = Template.make(() -> scope(
+            "{",
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
+            "}\n"
+        ));
+
+        var template = Template.make(() -> scope(
+            "scope:\n",
+            hook1.anchor(scope(
+                let("local0", "scope garbage"),
+                let("local1", "LOCAL1"),
+                addStructuralName("x1a", myStructuralTypeA),
+
+                "scope before insert scope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(scope(
+                    let("local2", "insert scope garbage"),
+                    let("name", "x1b"),
+                    addStructuralName("x1b", myStructuralTypeA), // does NOT escape to anchor scope
+                    "inserted scope: #name\n",
+                    "local1: #local1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "scope after insert scope:\n",
+                listNamesTemplate.asToken(),
+
+                "scope before insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(transparentScope(
+                    let("nameTransparentScope", "x1c"), // escapes to caller
+                    addStructuralName("x1c", myStructuralTypeA), // escapes to anchor scope
+                    "inserted transparentScope: #nameTransparentScope\n",
+                    "local1: #local1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "scope after insert transparentScope:\n",
+                "nameTransparentScope: #nameTransparentScope\n",
+                listNamesTemplate.asToken(),
+
+                "scope before insert nameScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(nameScope(
+                    let("nameNameScope", "x1d"), // escapes to caller
+                    addStructuralName("x1d", myStructuralTypeA), // does NOT escape to anchor scope
+                    "inserted nameScope: #nameNameScope\n",
+                    "local1: #local1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "scope after insert nameScope:\n",
+                "nameNameScope: #nameNameScope\n",
+                listNamesTemplate.asToken(),
+
+                "scope before insert hashtagScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(hashtagScope(
+                    let("local2", "insert hashtagScope garbage"),
+                    let("name", "x1e"), // escapes to caller
+                    addStructuralName("x1e", myStructuralTypeA), // escapes to anchor scope
+                    "inserted hashtagScope: #name\n",
+                    "local1: #local1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "scope after insert hashtagScope:\n",
+                listNamesTemplate.asToken(),
+
+                "scope insert probe.\n",
+                hook1.insert(scope(
+                    "inserted probe:\n",
+                    listNamesTemplate.asToken()
+                ))
+            )),
+            "after scope:\n",
+            listNamesTemplate.asToken(),
+
+            let("name", "name garbage"),
+            let("local0", "outer garbage 0"),
+            let("local1", "outer garbage 1"),
+            let("local2", "outer garbage 2"),
+            let("nameTransparentScope", "outer garbage nameTransparentScope"),
+            let("nameNameScope", "outer garbage nameNameScope")
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            scope:
+            inserted scope: x1b
+            local1: LOCAL1
+            {x1b}
+            inserted transparentScope: x1c
+            local1: LOCAL1
+            {x1c}
+            inserted nameScope: x1d
+            local1: LOCAL1
+            {x1c, x1d}
+            inserted hashtagScope: x1e
+            local1: LOCAL1
+            {x1c, x1e}
+            inserted probe:
+            {x1c, x1e}
+            scope before insert scope:
+            {x1a}
+            scope after insert scope:
+            {x1a}
+            scope before insert transparentScope:
+            {x1a}
+            scope after insert transparentScope:
+            nameTransparentScope: x1c
+            {x1c, x1a}
+            scope before insert nameScope:
+            {x1c, x1a}
+            scope after insert nameScope:
+            nameNameScope: x1d
+            {x1c, x1a}
+            scope before insert hashtagScope:
+            {x1c, x1a}
+            scope after insert hashtagScope:
+            {x1c, x1e, x1a}
+            scope insert probe.
+            after scope:
+            {}
+            """;
+        checkEQ(code, expected);
+    }
+
+    // Analogue to testHookAndScopes2, but with "transparentScope" instead of "scope".
+    public static void testHookAndScopes3() {
+        Hook hook1 = new Hook("Hook1");
+
+        var listNamesTemplate = Template.make(() -> scope(
+            "{",
+            structuralNames().exactOf(myStructuralTypeA).toList(list -> scope(
+                String.join(", ", list.stream().map(StructuralName::name).toList())
+            )),
+            "}\n"
+        ));
+
+        var template = Template.make(() -> scope(
+            "transparentScope:\n",
+            hook1.anchor(transparentScope(
+                let("global0", "transparentScope garbage"),
+                let("global1", "GLOBAL1"),
+                addStructuralName("x1a", myStructuralTypeA),
+
+                "transparentScope before insert scope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(scope(
+                    let("local2", "insert scope garbage"),
+                    let("name", "x1b"),
+                    addStructuralName("x1b", myStructuralTypeA), // does NOT escape to anchor scope
+                    "inserted scope: #name\n",
+                    "global1: #global1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "transparentScope after insert scope:\n",
+                listNamesTemplate.asToken(),
+
+                "transparentScope before insert transparentScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(transparentScope(
+                    let("nameTransparentScope", "x1c"), // escapes to caller
+                    addStructuralName("x1c", myStructuralTypeA), // escapes to anchor scope
+                    "inserted transparentScope: #nameTransparentScope\n",
+                    "global1: #global1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "transparentScope after insert transparentScope:\n",
+                "nameTransparentScope: #nameTransparentScope\n",
+                listNamesTemplate.asToken(),
+
+                "transparentScope before insert nameScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(nameScope(
+                    let("nameNameScope", "x1d"), // escapes to caller
+                    addStructuralName("x1d", myStructuralTypeA), // does NOT escape to anchor scope
+                    "inserted nameScope: #nameNameScope\n",
+                    "global1: #global1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "transparentScope after insert nameScope:\n",
+                "nameNameScope: #nameNameScope\n",
+                listNamesTemplate.asToken(),
+
+                "transparentScope before insert hashtagScope:\n",
+                listNamesTemplate.asToken(),
+                hook1.insert(hashtagScope(
+                    let("local2", "insert hashtagScope garbage"),
+                    let("name", "x1e"), // escapes to caller
+                    addStructuralName("x1e", myStructuralTypeA), // escapes to anchor scope
+                    "inserted hashtagScope: #name\n",
+                    "global1: #global1\n",
+                    listNamesTemplate.asToken()
+                )),
+                "transparentScope after insert hashtagScope:\n",
+                listNamesTemplate.asToken(),
+
+                "transparentScope insert probe.\n",
+                hook1.insert(scope(
+                    "inserted probe:\n",
+                    listNamesTemplate.asToken()
+                ))
+            )),
+            "after transparentScope:\n",
+            listNamesTemplate.asToken(),
+            """
+            global0: #global0
+            global1: #global1
+            nameTransparentScope: #nameTransparentScope
+            nameNameScope: #nameNameScope
+            """,
+            let("name", "name garbage"),
+            let("local2", "outer garbage 2")
+        ));
+
+        String code = template.render();
+        String expected =
+            """
+            transparentScope:
+            inserted scope: x1b
+            global1: GLOBAL1
+            {x1a, x1b}
+            inserted transparentScope: x1c
+            global1: GLOBAL1
+            {x1a, x1c}
+            inserted nameScope: x1d
+            global1: GLOBAL1
+            {x1a, x1c, x1d}
+            inserted hashtagScope: x1e
+            global1: GLOBAL1
+            {x1a, x1c, x1e}
+            inserted probe:
+            {x1a, x1c, x1e}
+            transparentScope before insert scope:
+            {x1a}
+            transparentScope after insert scope:
+            {x1a}
+            transparentScope before insert transparentScope:
+            {x1a}
+            transparentScope after insert transparentScope:
+            nameTransparentScope: x1c
+            {x1a, x1c}
+            transparentScope before insert nameScope:
+            {x1a, x1c}
+            transparentScope after insert nameScope:
+            nameNameScope: x1d
+            {x1a, x1c}
+            transparentScope before insert hashtagScope:
+            {x1a, x1c}
+            transparentScope after insert hashtagScope:
+            {x1a, x1c, x1e}
+            transparentScope insert probe.
+            after transparentScope:
+            {x1a, x1c, x1e}
+            global0: transparentScope garbage
+            global1: GLOBAL1
+            nameTransparentScope: x1c
+            nameNameScope: x1d
+            """;
+        checkEQ(code, expected);
+    }
+
     public static void testFailingNestedRendering() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "alpha\n"
         ));
 
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "beta\n",
             // Nested "render" call not allowed!
             template1.render(),
@@ -1813,63 +3334,63 @@ public class TestTemplate {
     }
 
     public static void testFailingDollarName1() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("x", $("")) // empty string not allowed
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName2() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("x", $("#abc")) // "#" character not allowed
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("x", $("abc#")) // "#" character not allowed
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName4() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("x", $(null)) // Null input to dollar
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName5() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "$" // empty dollar name
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName6() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "asdf$" // empty dollar name
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName7() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "asdf$1" // Bad pattern after dollar
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarName8() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "abc$$abc" // empty dollar name
         ));
         String code = template1.render();
     }
 
     public static void testFailingLetName1() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let(null, $("abc")) // Null input for hashtag name
         ));
         String code = template1.render();
@@ -1877,20 +3398,20 @@ public class TestTemplate {
 
     public static void testFailingHashtagName1() {
         // Empty Template argument
-        var template1 = Template.make("", (String x) -> body(
+        var template1 = Template.make("", (String x) -> scope(
         ));
         String code = template1.render("abc");
     }
 
     public static void testFailingHashtagName2() {
         // "#" character not allowed in template argument
-        var template1 = Template.make("abc#abc", (String x) -> body(
+        var template1 = Template.make("abc#abc", (String x) -> scope(
         ));
         String code = template1.render("abc");
     }
 
     public static void testFailingHashtagName3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // Empty let hashtag name not allowed
             let("", "abc")
         ));
@@ -1898,7 +3419,7 @@ public class TestTemplate {
     }
 
     public static void testFailingHashtagName4() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // "#" character not allowed in let hashtag name
             let("xyz#xyz", "abc")
         ));
@@ -1906,56 +3427,56 @@ public class TestTemplate {
     }
 
     public static void testFailingHashtagName5() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "#" // empty hashtag name
         ));
         String code = template1.render();
     }
 
     public static void testFailingHashtagName6() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "asdf#" // empty hashtag name
         ));
         String code = template1.render();
     }
 
     public static void testFailingHashtagName7() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "asdf#1" // Bad pattern after hashtag
         ));
         String code = template1.render();
     }
 
     public static void testFailingHashtagName8() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "abc##abc" // empty hashtag name
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarHashtagName1() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "#$" // empty hashtag name
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarHashtagName2() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "$#" // empty dollar name
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarHashtagName3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "#$name" // empty hashtag name
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarHashtagName4() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "$#name" // empty dollar name
         ));
         String code = template1.render();
@@ -1964,11 +3485,11 @@ public class TestTemplate {
     public static void testFailingHook() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "alpha\n"
         ));
 
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             "beta\n",
             // Use hook without hook1.anchor
             hook1.insert(template1.asToken()),
@@ -1978,20 +3499,40 @@ public class TestTemplate {
         String code = template2.render();
     }
 
-    public static void testFailingSample1() {
-        var template1 = Template.make(() -> body(
-            // No variable added yet.
-            let("v", dataNames(MUTABLE).exactOf(myInt).sample().name()),
+    public static void testFailingSample1a() {
+        var template1 = Template.make(() -> scope(
+            // No DataName added yet.
+            dataNames(MUTABLE).exactOf(myInt).sampleAndLetAs("v"),
             "v is #v\n"
         ));
 
         String code = template1.render();
     }
 
-    public static void testFailingSample2() {
-        var template1 = Template.make(() -> body(
+    public static void testFailingSample1b() {
+        var template1 = Template.make(() -> scope(
+            // No StructuralName added yet.
+            structuralNames().exactOf(myStructuralTypeA).sampleAndLetAs("v"),
+            "v is #v\n"
+        ));
+
+        String code = template1.render();
+    }
+
+    public static void testFailingSample2a() {
+        var template1 = Template.make(() -> scope(
             // no type restriction
-            let("v", dataNames(MUTABLE).sample().name()),
+            dataNames(MUTABLE).sampleAndLetAs("v"),
+            "v is #v\n"
+        ));
+
+        String code = template1.render();
+    }
+
+    public static void testFailingSample2b() {
+        var template1 = Template.make(() -> scope(
+            // no type restriction
+            structuralNames().sampleAndLetAs("v"),
             "v is #v\n"
         ));
 
@@ -2000,7 +3541,7 @@ public class TestTemplate {
 
     public static void testFailingHashtag1() {
         // Duplicate hashtag definition from arguments.
-        var template1 = Template.make("a", "a", (String _, String _) -> body(
+        var template1 = Template.make("a", "a", (String _, String _) -> scope(
             "nothing\n"
         ));
 
@@ -2008,7 +3549,7 @@ public class TestTemplate {
     }
 
     public static void testFailingHashtag2() {
-        var template1 = Template.make("a", (String _) -> body(
+        var template1 = Template.make("a", (String _) -> scope(
             // Duplicate hashtag name
             let("a", "x"),
             "nothing\n"
@@ -2018,7 +3559,7 @@ public class TestTemplate {
     }
 
     public static void testFailingHashtag3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             let("a", "x"),
             // Duplicate hashtag name
             let("a", "y"),
@@ -2029,7 +3570,7 @@ public class TestTemplate {
     }
 
     public static void testFailingHashtag4() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // Missing hashtag name definition
             "#a\n"
         ));
@@ -2037,9 +3578,20 @@ public class TestTemplate {
         String code = template1.render();
     }
 
+    public static void testFailingHashtag5() {
+        var template1 = Template.make(() -> scope(
+            "use before definition: #a\n",
+            // let is a token, and is only evaluated after
+            // the string above, and so the string above fails.
+            let("a", "x")
+        ));
+
+        String code = template1.render();
+    }
+
     public static void testFailingBinding1() {
         var binding = new TemplateBinding<Template.ZeroArgs>();
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "nothing\n"
         ));
         binding.bind(template1);
@@ -2049,7 +3601,7 @@ public class TestTemplate {
 
     public static void testFailingBinding2() {
         var binding = new TemplateBinding<Template.ZeroArgs>();
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             "nothing\n",
             // binding was never bound.
             binding.get()
@@ -2059,7 +3611,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddDataName1() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // Must pick either MUTABLE or IMMUTABLE.
             addDataName("name", myInt, MUTABLE_OR_IMMUTABLE)
         ));
@@ -2067,7 +3619,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddDataName2() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // weight out of bounds [0..1000]
             addDataName("name", myInt, MUTABLE, 0)
         ));
@@ -2075,7 +3627,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddDataName3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // weight out of bounds [0..1000]
             addDataName("name", myInt, MUTABLE, -1)
         ));
@@ -2083,7 +3635,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddDataName4() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // weight out of bounds [0..1000]
             addDataName("name", myInt, MUTABLE, 1001)
         ));
@@ -2091,7 +3643,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddStructuralName1() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // weight out of bounds [0..1000]
             addStructuralName("name", myStructuralTypeA, 0)
         ));
@@ -2099,7 +3651,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddStructuralName2() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // weight out of bounds [0..1000]
             addStructuralName("name", myStructuralTypeA, -1)
         ));
@@ -2107,7 +3659,7 @@ public class TestTemplate {
     }
 
     public static void testFailingAddStructuralName3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             // weight out of bounds [0..1000]
             addStructuralName("name", myStructuralTypeA, 1001)
         ));
@@ -2116,7 +3668,7 @@ public class TestTemplate {
 
     // Duplicate name in the same scope, name identical -> expect RendererException.
     public static void testFailingAddNameDuplication1() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addDataName("name", myInt, MUTABLE),
             addDataName("name", myInt, MUTABLE)
         ));
@@ -2125,7 +3677,7 @@ public class TestTemplate {
 
     // Duplicate name in the same scope, names have different mutability -> expect RendererException.
     public static void testFailingAddNameDuplication2() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addDataName("name", myInt, MUTABLE),
             addDataName("name", myInt, IMMUTABLE)
         ));
@@ -2134,7 +3686,7 @@ public class TestTemplate {
 
     // Duplicate name in the same scope, names have different type -> expect RendererException.
     public static void testFailingAddNameDuplication3() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addDataName("name", myInt, MUTABLE),
             addDataName("name", myLong, MUTABLE)
         ));
@@ -2143,7 +3695,7 @@ public class TestTemplate {
 
     // Duplicate name in the same scope, name identical -> expect RendererException.
     public static void testFailingAddNameDuplication4() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addStructuralName("name", myStructuralTypeA),
             addStructuralName("name", myStructuralTypeA)
         ));
@@ -2152,7 +3704,7 @@ public class TestTemplate {
 
     // Duplicate name in the same scope, names have different type -> expect RendererException.
     public static void testFailingAddNameDuplication5() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addStructuralName("name", myStructuralTypeA),
             addStructuralName("name", myStructuralTypeB)
         ));
@@ -2161,10 +3713,10 @@ public class TestTemplate {
 
     // Duplicate name in inner Template, name identical -> expect RendererException.
     public static void testFailingAddNameDuplication6() {
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addDataName("name", myInt, MUTABLE)
         ));
-        var template2 = Template.make(() -> body(
+        var template2 = Template.make(() -> scope(
             addDataName("name", myInt, MUTABLE),
             template1.asToken()
         ));
@@ -2175,11 +3727,11 @@ public class TestTemplate {
     public static void testFailingAddNameDuplication7() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make(() -> body(
+        var template1 = Template.make(() -> scope(
             addDataName("name", myInt, MUTABLE),
-            hook1.anchor(
+            hook1.anchor(scope(
                 addDataName("name", myInt, MUTABLE)
-            )
+            ))
         ));
         String code = template1.render();
     }
@@ -2188,19 +3740,94 @@ public class TestTemplate {
     public static void testFailingAddNameDuplication8() {
         var hook1 = new Hook("Hook1");
 
-        var template1 = Template.make(() -> body(
-            addDataName("name", myInt, MUTABLE)
+        var template1 = Template.make(() -> transparentScope(
+            addDataName("name", myInt, MUTABLE) // escapes
         ));
 
-        var template2 = Template.make(() -> body(
-            hook1.anchor(
+        var template2 = Template.make(() -> scope(
+            hook1.anchor(scope(
                 addDataName("name", myInt, MUTABLE),
                 hook1.insert(template1.asToken())
-            )
+            ))
         ));
         String code = template2.render();
     }
 
+    public static void testFailingScope1() {
+        var template = Template.make(() -> scope(
+            transparentScope(
+                let("x", "x1") // escapes
+            ),
+            let("x", "x2") // second definition
+        ));
+        String code = template.render();
+    }
+
+    public static void testFailingScope2() {
+        var template = Template.make(() -> scope(
+            nameScope(
+                let("x", "x1") // escapes
+            ),
+            let("x", "x2") // second definition
+        ));
+        String code = template.render();
+    }
+
+    public static void testFailingScope3() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> transparentScope(
+                let("x", sn.name()) // leads to duplicate hashtag
+            ))
+        ));
+        String code = template.render();
+    }
+
+    public static void testFailingScope4() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> nameScope(
+                let("x", sn.name()) // leads to duplicate hashtag
+            ))
+        ));
+        String code = template.render();
+    }
+
+    public static void testFailingScope5() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> transparentScope(
+                addStructuralName("x", myStructuralTypeA) // leads to duplicate name
+            ))
+        ));
+        String code = template.render();
+    }
+
+    public static void testFailingScope6() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> hashtagScope(
+                addStructuralName("x", myStructuralTypeA) // leads to duplicate name
+            ))
+        ));
+        String code = template.render();
+    }
+
+    public static void testFailingScope7() {
+        var template = Template.make(() -> scope(
+            addStructuralName("a", myStructuralTypeA),
+            addStructuralName("b", myStructuralTypeA),
+            structuralNames().exactOf(myStructuralTypeA).forEach(sn -> setFuelCostScope(
+                addStructuralName("x", myStructuralTypeA) // leads to duplicate name
+            ))
+        ));
+        String code = template.render();
+    }
+
     public static void expectRendererException(FailingTest test, String errorPrefix) {
         try {
             test.run();

From ad38a1253ae3ff92f7e0cf0fbc4d4726957b1443 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Thu, 20 Nov 2025 10:19:57 +0000
Subject: [PATCH 266/512] 8371557:
 java/net/httpclient/http3/H3RequestRejectedTest.java:
 javax.net.ssl.SSLHandshakeException: local endpoint (wildcard) and remote
 endpoint (loopback) ports conflict

Reviewed-by: jpai
---
 .../jdk/java/net/httpclient/http3/H3RequestRejectedTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java b/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java
index 361a78fdd47..1731ddae833 100644
--- a/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java
@@ -50,6 +50,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpRequest.BodyPublishers;
 import static java.nio.charset.StandardCharsets.US_ASCII;
+import static jdk.httpclient.test.lib.common.HttpServerAdapters.createClientBuilderForH3;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -100,7 +101,7 @@ class H3RequestRejectedTest {
      */
     @Test
     void testAlwaysRejected() throws Exception {
-        try (final HttpClient client = HttpClient.newBuilder()
+        try (final HttpClient client = createClientBuilderForH3()
                 .sslContext(sslContext).proxy(NO_PROXY).version(HTTP_3)
                 .build()) {
 
@@ -134,7 +135,7 @@ class H3RequestRejectedTest {
      */
     @Test
     void testRejectedRequest() throws Exception {
-        try (final HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+        try (final HttpClient client = createClientBuilderForH3().sslContext(sslContext)
                 .proxy(NO_PROXY).version(HTTP_3)
                 .build()) {
 

From c419dda4e99c3b72fbee95b93159db2e23b994b6 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 20 Nov 2025 11:37:07 +0000
Subject: [PATCH 267/512] 8372163: G1: Remove unused
 G1HeapRegion::remove_code_root

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/g1/g1HeapRegion.cpp | 4 ----
 src/hotspot/share/gc/g1/g1HeapRegion.hpp | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index b1eeb333d8d..361e19d4be5 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -307,10 +307,6 @@ void G1HeapRegion::add_code_root(nmethod* nm) {
   rem_set()->add_code_root(nm);
 }
 
-void G1HeapRegion::remove_code_root(nmethod* nm) {
-  rem_set()->remove_code_root(nm);
-}
-
 void G1HeapRegion::code_roots_do(NMethodClosure* blk) const {
   rem_set()->code_roots_do(blk);
 }
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
index 17ec3055b52..fe915b0dafe 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
@@ -543,7 +543,6 @@ public:
   // Routines for managing a list of code roots (attached to the
   // this region's RSet) that point into this heap region.
   void add_code_root(nmethod* nm);
-  void remove_code_root(nmethod* nm);
 
   // Applies blk->do_nmethod() to each of the entries in
   // the code roots list for this region

From 7b11bd1b1d8dbc9bedcd8cf14e78c8f5eb06a71f Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 20 Nov 2025 13:39:49 +0000
Subject: [PATCH 268/512] 8372047: ClassTransform.transformingMethodBodies
 andThen composes incorrectly

Reviewed-by: asotona
---
 .../classfile/impl/TransformImpl.java         | 18 ++---
 test/jdk/jdk/classfile/TransformTests.java    | 74 +++++++++++++++----
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
index 23387fcb098..4cb0517ec76 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,9 +120,9 @@ public final class TransformImpl {
 
         @Override
         public ClassTransform andThen(ClassTransform next) {
-            if (next instanceof ClassMethodTransform cmt)
-                return new ClassMethodTransform(transform.andThen(cmt.transform),
-                                                mm -> filter.test(mm) && cmt.filter.test(mm));
+            // Optimized for shared _ -> true filter in ClassTransform.transformingMethods(MethodTransform)
+            if (next instanceof ClassMethodTransform(var nextTransform, var nextFilter) && filter == nextFilter)
+                return new ClassMethodTransform(transform.andThen(nextTransform), filter);
             else
                 return UnresolvedClassTransform.super.andThen(next);
         }
@@ -143,9 +143,9 @@ public final class TransformImpl {
 
         @Override
         public ClassTransform andThen(ClassTransform next) {
-            if (next instanceof ClassFieldTransform cft)
-                return new ClassFieldTransform(transform.andThen(cft.transform),
-                                               mm -> filter.test(mm) && cft.filter.test(mm));
+            // Optimized for shared _ -> true filter in ClassTransform.transformingFields(FieldTransform)
+            if (next instanceof ClassFieldTransform(var nextTransform, var nextFilter) && filter == nextFilter)
+                return new ClassFieldTransform(transform.andThen(nextTransform), filter);
             else
                 return UnresolvedClassTransform.super.andThen(next);
         }
@@ -208,8 +208,8 @@ public final class TransformImpl {
 
         @Override
         public MethodTransform andThen(MethodTransform next) {
-            return (next instanceof TransformImpl.MethodCodeTransform mct)
-                   ? new TransformImpl.MethodCodeTransform(xform.andThen(mct.xform))
+            return (next instanceof MethodCodeTransform(var nextXform))
+                   ? new TransformImpl.MethodCodeTransform(xform.andThen(nextXform))
                    : UnresolvedMethodTransform.super.andThen(next);
 
         }
diff --git a/test/jdk/jdk/classfile/TransformTests.java b/test/jdk/jdk/classfile/TransformTests.java
index b78da8b4311..351aa1ae35a 100644
--- a/test/jdk/jdk/classfile/TransformTests.java
+++ b/test/jdk/jdk/classfile/TransformTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,25 +23,15 @@
 
 /*
  * @test
- * @bug 8335935 8336588
+ * @bug 8335935 8336588 8372047
  * @summary Testing ClassFile transformations.
  * @run junit TransformTests
  */
 
-import java.lang.classfile.ClassBuilder;
-import java.lang.classfile.ClassElement;
-import java.lang.classfile.ClassFile;
-import java.lang.classfile.ClassModel;
-import java.lang.classfile.ClassTransform;
-import java.lang.classfile.CodeBuilder;
-import java.lang.classfile.CodeElement;
-import java.lang.classfile.CodeModel;
-import java.lang.classfile.CodeTransform;
-import java.lang.classfile.FieldModel;
-import java.lang.classfile.FieldTransform;
-import java.lang.classfile.Label;
-import java.lang.classfile.MethodModel;
-import java.lang.classfile.MethodTransform;
+import java.lang.classfile.*;
+import java.lang.classfile.attribute.AnnotationDefaultAttribute;
+import java.lang.classfile.attribute.ConstantValueAttribute;
+import java.lang.classfile.attribute.SourceDebugExtensionAttribute;
 import java.lang.classfile.instruction.BranchInstruction;
 import java.lang.classfile.instruction.ConstantInstruction;
 import java.lang.classfile.instruction.LabelTarget;
@@ -54,8 +44,10 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import helpers.ByteArrayClassLoader;
+import jdk.internal.classfile.impl.TransformImpl;
 import org.junit.jupiter.api.Test;
 
 import static java.lang.classfile.ClassFile.*;
@@ -334,4 +326,54 @@ class TransformTests {
             return "foo";
         }
     }
+
+    @Test
+    void testFilteringTransformChaining() {
+        var cf = ClassFile.of();
+        var clazz = cf.parse(cf.build(ClassDesc.of("Test"), clb -> clb
+                .withField("one", CD_int, fb -> fb.with(ConstantValueAttribute.of(1)))
+                .withField("two", CD_int, fb -> fb.with(ConstantValueAttribute.of(2)))
+                .withMethod("one", MTD_void, 0, mb -> mb.with(AnnotationDefaultAttribute.of(AnnotationValue.ofInt(1))).withCode(CodeBuilder::return_))
+                .withMethod("two", MTD_void, 0, mb -> mb.with(AnnotationDefaultAttribute.of(AnnotationValue.ofInt(2))).withCode(CodeBuilder::return_))));
+
+        AtomicBoolean oneFieldCalled = new AtomicBoolean(false);
+        var oneFieldTransform = new TransformImpl.ClassFieldTransform((fb, fe) -> {
+            if (fe instanceof ConstantValueAttribute cv) {
+                assertEquals(1, ((Integer) cv.constant().constantValue()), "Should only transform one");
+            }
+            oneFieldCalled.set(true);
+            fb.with(fe);
+        }, fm -> fm.fieldName().equalsString("one"));
+        AtomicBoolean twoFieldCalled = new AtomicBoolean(false);
+        var twoFieldTransform = new TransformImpl.ClassFieldTransform((fb, fe) -> {
+            if (fe instanceof ConstantValueAttribute cv) {
+                assertEquals(2, ((Integer) cv.constant().constantValue()), "Should only transform two");
+            }
+            twoFieldCalled.set(true);
+            fb.with(fe);
+        }, fm -> fm.fieldName().equalsString("two"));
+        cf.transformClass(clazz, oneFieldTransform.andThen(twoFieldTransform));
+        assertTrue(oneFieldCalled.get(), "Field one not transformed");
+        assertTrue(twoFieldCalled.get(), "Field two not transformed");
+
+        AtomicBoolean oneMethodCalled = new AtomicBoolean(false);
+        var oneMethodTransform = ClassTransform.transformingMethods(mm -> mm.methodName().equalsString("one"), (mb, me) -> {
+            if (me instanceof AnnotationDefaultAttribute ada) {
+                assertEquals(1, ((AnnotationValue.OfInt) ada.defaultValue()).intValue(), "Should only transform one");
+            }
+            oneMethodCalled.set(true);
+            mb.with(me);
+        });
+        AtomicBoolean twoMethodCalled = new AtomicBoolean(false);
+        var twoMethodTransform = ClassTransform.transformingMethods(mm -> mm.methodName().equalsString("two"), (mb, me) -> {
+            if (me instanceof AnnotationDefaultAttribute ada) {
+                assertEquals(2, ((AnnotationValue.OfInt) ada.defaultValue()).intValue(), "Should only transform two");
+            }
+            twoMethodCalled.set(true);
+            mb.with(me);
+        });
+        cf.transformClass(clazz, oneMethodTransform.andThen(twoMethodTransform));
+        assertTrue(oneMethodCalled.get(), "Method one not transformed");
+        assertTrue(twoMethodCalled.get(), "Method two not transformed");
+    }
 }

From f125c76f5b53d90a09f58c22d6def7d843feaa50 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Thu, 20 Nov 2025 14:09:55 +0000
Subject: [PATCH 269/512] 8247690: RunTest does not support running of JTREG
 manual tests

Reviewed-by: erikj
---
 doc/testing.html  |  2 ++
 doc/testing.md    |  4 ++++
 make/RunTests.gmk | 10 ++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/testing.html b/doc/testing.html
index b9838735e4f..31f4fbd1778 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -535,6 +535,8 @@ failure. This helps to reproduce intermittent test failures. Defaults to
 <h4 id="report">REPORT</h4>
 <p>Use this report style when reporting test results (sent to JTReg as
 <code>-report</code>). Defaults to <code>files</code>.</p>
+<h4 id="manual">MANUAL</h4>
+<p>Set to <code>true</code> to execute manual tests only.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests
diff --git a/doc/testing.md b/doc/testing.md
index 0144610a5bf..b95f59de9fd 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -512,6 +512,10 @@ helps to reproduce intermittent test failures. Defaults to 0.
 Use this report style when reporting test results (sent to JTReg as `-report`).
 Defaults to `files`.
 
+#### MANUAL
+
+Set to `true` to execute manual tests only.
+
 ### Gtest keywords
 
 #### REPEAT
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 947389f64f9..21eb178343e 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -206,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \
         MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \
-        AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        AOT_JDK MANUAL $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
         $(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -911,7 +911,13 @@ define SetupRunJtregTestBody
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
 
-  $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
+  $1_JTREG_BASIC_OPTIONS += -ignore:quiet
+
+  ifeq ($$(JTREG_MANUAL), true)
+    $1_JTREG_BASIC_OPTIONS += -manual
+  else
+    $1_JTREG_BASIC_OPTIONS += -automatic
+  endif
 
   # Make it possible to specify the JIB_DATA_DIR for tests using the
   # JIB Artifact resolver

From b9ee9541cffb6c5a737b08a69ae04472b3bcab3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Thu, 20 Nov 2025 14:33:40 +0000
Subject: [PATCH 270/512] 8371200: ZGC: C2 allocation deopt race

Reviewed-by: aboldtch, stefank
---
 src/hotspot/share/gc/z/zBarrier.inline.hpp |  4 --
 src/hotspot/share/gc/z/zBarrierSet.cpp     | 20 ----------
 src/hotspot/share/gc/z/zGeneration.cpp     | 42 ++++++++++++--------
 src/hotspot/share/gc/z/zRelocate.cpp       | 45 ++++++++++++++++------
 src/hotspot/share/gc/z/zRelocate.hpp       |  1 +
 5 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/src/hotspot/share/gc/z/zBarrier.inline.hpp b/src/hotspot/share/gc/z/zBarrier.inline.hpp
index b5923f01628..766a6eb8e4c 100644
--- a/src/hotspot/share/gc/z/zBarrier.inline.hpp
+++ b/src/hotspot/share/gc/z/zBarrier.inline.hpp
@@ -86,10 +86,6 @@ inline void ZBarrier::self_heal(ZBarrierFastPath fast_path, volatile zpointer* p
   assert(ZPointer::is_remapped(heal_ptr), "invariant");
 
   for (;;) {
-    if (ptr == zpointer::null) {
-      assert(!ZVerifyOops || !ZHeap::heap()->is_in(uintptr_t(p)) || !ZHeap::heap()->is_old(p), "No raw null in old");
-    }
-
     assert_transition_monotonicity(ptr, heal_ptr);
 
     // Heal
diff --git a/src/hotspot/share/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp
index 87f93043bdf..643eba1947e 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -223,27 +223,7 @@ void ZBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {
     // breaks that promise. Take a few steps in the interpreter instead, which has
     // no such assumptions about where an object resides.
     deoptimize_allocation(thread);
-    return;
   }
-
-  if (!ZGeneration::young()->is_phase_mark_complete()) {
-    return;
-  }
-
-  if (!page->is_relocatable()) {
-    return;
-  }
-
-  if (ZRelocate::compute_to_age(age) != ZPageAge::old) {
-    return;
-  }
-
-  // If the object is young, we have to still be careful that it isn't racingly
-  // about to get promoted to the old generation. That causes issues when null
-  // pointers are supposed to be coloured, but the JIT is a bit sloppy and
-  // reinitializes memory with raw nulls. We detect this situation and detune
-  // rather than relying on the JIT to never be sloppy with redundant initialization.
-  deoptimize_allocation(thread);
 }
 
 void ZBarrierSet::print_on(outputStream* st) const {
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index d1680b6c336..2b632ef29a9 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -111,6 +111,16 @@ static const ZStatSampler ZSamplerJavaThreads("System", "Java Threads", ZStatUni
 ZGenerationYoung* ZGeneration::_young;
 ZGenerationOld*   ZGeneration::_old;
 
+class ZRendezvousHandshakeClosure : public HandshakeClosure {
+public:
+  ZRendezvousHandshakeClosure()
+    : HandshakeClosure("ZRendezvous") {}
+
+  void do_thread(Thread* thread) {
+    // Does nothing
+  }
+};
+
 ZGeneration::ZGeneration(ZGenerationId id, ZPageTable* page_table, ZPageAllocator* page_allocator)
   : _id(id),
     _page_allocator(page_allocator),
@@ -168,11 +178,19 @@ void ZGeneration::free_empty_pages(ZRelocationSetSelector* selector, int bulk) {
 }
 
 void ZGeneration::flip_age_pages(const ZRelocationSetSelector* selector) {
-  if (is_young()) {
-    _relocate.flip_age_pages(selector->not_selected_small());
-    _relocate.flip_age_pages(selector->not_selected_medium());
-    _relocate.flip_age_pages(selector->not_selected_large());
-  }
+  _relocate.flip_age_pages(selector->not_selected_small());
+  _relocate.flip_age_pages(selector->not_selected_medium());
+  _relocate.flip_age_pages(selector->not_selected_large());
+
+  // Perform a handshake between flip promotion and running the promotion barrier. This ensures
+  // that ZBarrierSet::on_slowpath_allocation_exit() observing a young page that was then racingly
+  // flip promoted, will run any stores without barriers to completion before responding to the
+  // handshake at the subsequent safepoint poll. This ensures that the flip promotion barriers always
+  // run after compiled code missing barriers, but before relocate start.
+  ZRendezvousHandshakeClosure cl;
+  Handshake::execute(&cl);
+
+  _relocate.barrier_flip_promoted_pages(_relocation_set.flip_promoted_pages());
 }
 
 static double fragmentation_limit(ZGenerationId generation) {
@@ -235,7 +253,9 @@ void ZGeneration::select_relocation_set(bool promote_all) {
   _relocation_set.install(&selector);
 
   // Flip age young pages that were not selected
-  flip_age_pages(&selector);
+  if (is_young()) {
+    flip_age_pages(&selector);
+  }
 
   // Setup forwarding table
   ZRelocationSetIterator rs_iter(&_relocation_set);
@@ -1280,16 +1300,6 @@ bool ZGenerationOld::uses_clear_all_soft_reference_policy() const {
   return _reference_processor.uses_clear_all_soft_reference_policy();
 }
 
-class ZRendezvousHandshakeClosure : public HandshakeClosure {
-public:
-  ZRendezvousHandshakeClosure()
-    : HandshakeClosure("ZRendezvous") {}
-
-  void do_thread(Thread* thread) {
-    // Does nothing
-  }
-};
-
 class ZRendezvousGCThreads: public VM_Operation {
  public:
   VMOp_Type type() const { return VMOp_ZRendezvousGCThreads; }
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index 69233da6f54..180ce22b041 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -1322,7 +1322,7 @@ private:
 
 public:
   ZFlipAgePagesTask(const ZArray<ZPage*>* pages)
-    : ZTask("ZPromotePagesTask"),
+    : ZTask("ZFlipAgePagesTask"),
       _iter(pages) {}
 
   virtual void work() {
@@ -1337,16 +1337,6 @@ public:
       // Figure out if this is proper promotion
       const bool promotion = to_age == ZPageAge::old;
 
-      if (promotion) {
-        // Before promoting an object (and before relocate start), we must ensure that all
-        // contained zpointers are store good. The marking code ensures that for non-null
-        // pointers, but null pointers are ignored. This code ensures that even null pointers
-        // are made store good, for the promoted objects.
-        prev_page->object_iterate([&](oop obj) {
-          ZIterator::basic_oop_iterate_safe(obj, ZBarrier::promote_barrier_on_young_oop_field);
-        });
-      }
-
       // Logging
       prev_page->log_msg(promotion ? " (flip promoted)" : " (flip survived)");
 
@@ -1360,7 +1350,7 @@ public:
 
       if (promotion) {
         ZGeneration::young()->flip_promote(prev_page, new_page);
-        // Defer promoted page registration times the lock is taken
+        // Defer promoted page registration
         promoted_pages.push(prev_page);
       }
 
@@ -1371,11 +1361,42 @@ public:
   }
 };
 
+class ZPromoteBarrierTask : public ZTask {
+private:
+  ZArrayParallelIterator<ZPage*> _iter;
+
+public:
+  ZPromoteBarrierTask(const ZArray<ZPage*>* pages)
+    : ZTask("ZPromoteBarrierTask"),
+      _iter(pages) {}
+
+  virtual void work() {
+    SuspendibleThreadSetJoiner sts_joiner;
+
+    for (ZPage* page; _iter.next(&page);) {
+      // When promoting an object (and before relocate start), we must ensure that all
+      // contained zpointers are store good. The marking code ensures that for non-null
+      // pointers, but null pointers are ignored. This code ensures that even null pointers
+      // are made store good, for the promoted objects.
+      page->object_iterate([&](oop obj) {
+        ZIterator::basic_oop_iterate_safe(obj, ZBarrier::promote_barrier_on_young_oop_field);
+      });
+
+      SuspendibleThreadSet::yield();
+    }
+  }
+};
+
 void ZRelocate::flip_age_pages(const ZArray<ZPage*>* pages) {
   ZFlipAgePagesTask flip_age_task(pages);
   workers()->run(&flip_age_task);
 }
 
+void ZRelocate::barrier_flip_promoted_pages(const ZArray<ZPage*>* pages) {
+  ZPromoteBarrierTask promote_barrier_task(pages);
+  workers()->run(&promote_barrier_task);
+}
+
 void ZRelocate::synchronize() {
   _queue.synchronize();
 }
diff --git a/src/hotspot/share/gc/z/zRelocate.hpp b/src/hotspot/share/gc/z/zRelocate.hpp
index d0ddf7deecf..50111f24ee5 100644
--- a/src/hotspot/share/gc/z/zRelocate.hpp
+++ b/src/hotspot/share/gc/z/zRelocate.hpp
@@ -119,6 +119,7 @@ public:
   void relocate(ZRelocationSet* relocation_set);
 
   void flip_age_pages(const ZArray<ZPage*>* pages);
+  void barrier_flip_promoted_pages(const ZArray<ZPage*>* pages);
 
   void synchronize();
   void desynchronize();

From 45a2fd37f0ebda35789006b4e607422f7c369017 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Thu, 20 Nov 2025 15:15:41 +0000
Subject: [PATCH 271/512] 8325448: Hybrid Public Key Encryption

Reviewed-by: mullan, ascarpino, abarashev
---
 .../com/sun/crypto/provider/DHKEM.java        | 361 +++++++----
 .../classes/com/sun/crypto/provider/HPKE.java | 588 ++++++++++++++++++
 .../com/sun/crypto/provider/SunJCE.java       |   2 +
 .../javax/crypto/spec/HPKEParameterSpec.java  | 443 +++++++++++++
 .../spec/snippet-files/PackageSnippets.java   |  76 +++
 .../sun/security/util/SliceableSecretKey.java |  51 ++
 .../provider/Cipher/HPKE/Compliance.java      | 289 +++++++++
 .../provider/Cipher/HPKE/Functions.java       | 113 ++++
 .../crypto/provider/Cipher/HPKE/KAT9180.java  | 126 ++++
 .../sun/crypto/provider/DHKEM/Compliance.java | 136 ++--
 .../security/provider/all/Deterministic.java  |  10 +-
 .../SliceableSecretKey/SoftSliceable.java     | 153 +++++
 12 files changed, 2119 insertions(+), 229 deletions(-)
 create mode 100644 src/java.base/share/classes/com/sun/crypto/provider/HPKE.java
 create mode 100644 src/java.base/share/classes/javax/crypto/spec/HPKEParameterSpec.java
 create mode 100644 src/java.base/share/classes/javax/crypto/spec/snippet-files/PackageSnippets.java
 create mode 100644 src/java.base/share/classes/sun/security/util/SliceableSecretKey.java
 create mode 100644 test/jdk/com/sun/crypto/provider/Cipher/HPKE/Compliance.java
 create mode 100644 test/jdk/com/sun/crypto/provider/Cipher/HPKE/Functions.java
 create mode 100644 test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
 create mode 100644 test/jdk/sun/security/util/SliceableSecretKey/SoftSliceable.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
index b27320ed24b..c7372a4c2c8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
@@ -26,26 +26,51 @@ package com.sun.crypto.provider;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.Serial;
 import java.math.BigInteger;
-import java.security.*;
-import java.security.interfaces.ECKey;
+import java.security.AsymmetricKey;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.ProviderException;
+import java.security.PublicKey;
+import java.security.SecureRandom;
 import java.security.interfaces.ECPublicKey;
-import java.security.interfaces.XECKey;
 import java.security.interfaces.XECPublicKey;
-import java.security.spec.*;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.ECParameterSpec;
+import java.security.spec.ECPoint;
+import java.security.spec.ECPrivateKeySpec;
+import java.security.spec.ECPublicKeySpec;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.security.spec.NamedParameterSpec;
+import java.security.spec.XECPrivateKeySpec;
+import java.security.spec.XECPublicKeySpec;
 import java.util.Arrays;
 import java.util.Objects;
-import javax.crypto.*;
-import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.DecapsulateException;
+import javax.crypto.KDF;
+import javax.crypto.KEM;
+import javax.crypto.KEMSpi;
+import javax.crypto.KeyAgreement;
+import javax.crypto.SecretKey;
 import javax.crypto.spec.HKDFParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 
 import sun.security.jca.JCAUtil;
-import sun.security.util.*;
-
-import jdk.internal.access.SharedSecrets;
+import sun.security.util.ArrayUtil;
+import sun.security.util.CurveDB;
+import sun.security.util.ECUtil;
+import sun.security.util.InternalPrivateKey;
+import sun.security.util.NamedCurve;
+import sun.security.util.SliceableSecretKey;
 
 // Implementing DHKEM defined inside https://www.rfc-editor.org/rfc/rfc9180.html,
-// without the AuthEncap and AuthDecap functions
 public class DHKEM implements KEMSpi {
 
     private static final byte[] KEM = new byte[]
@@ -65,80 +90,86 @@ public class DHKEM implements KEMSpi {
     private static final byte[] EMPTY = new byte[0];
 
     private record Handler(Params params, SecureRandom secureRandom,
-                           PrivateKey skR, PublicKey pkR)
+                           PrivateKey skS, PublicKey pkS, // sender keys
+                           PrivateKey skR, PublicKey pkR) // receiver keys
                 implements EncapsulatorSpi, DecapsulatorSpi {
 
         @Override
         public KEM.Encapsulated engineEncapsulate(int from, int to, String algorithm) {
-            Objects.checkFromToIndex(from, to, params.Nsecret);
+            Objects.checkFromToIndex(from, to, params.nsecret);
             Objects.requireNonNull(algorithm, "null algorithm");
             KeyPair kpE = params.generateKeyPair(secureRandom);
             PrivateKey skE = kpE.getPrivate();
             PublicKey pkE = kpE.getPublic();
-            byte[] pkEm = params.SerializePublicKey(pkE);
-            byte[] pkRm = params.SerializePublicKey(pkR);
-            byte[] kem_context = concat(pkEm, pkRm);
-            byte[] key = null;
+            byte[] pkEm = params.serializePublicKey(pkE);
+            byte[] pkRm = params.serializePublicKey(pkR);
             try {
-                byte[] dh = params.DH(skE, pkR);
-                key = params.ExtractAndExpand(dh, kem_context);
-                return new KEM.Encapsulated(
-                        new SecretKeySpec(key, from, to - from, algorithm),
-                        pkEm, null);
+                SecretKey key;
+                if (skS == null) {
+                    byte[] kem_context = concat(pkEm, pkRm);
+                    key = params.deriveKey(algorithm, from, to, kem_context,
+                            params.dh(skE, pkR));
+                } else {
+                    byte[] pkSm = params.serializePublicKey(pkS);
+                    byte[] kem_context = concat(pkEm, pkRm, pkSm);
+                    key = params.deriveKey(algorithm, from, to, kem_context,
+                            params.dh(skE, pkR), params.dh(skS, pkR));
+                }
+                return new KEM.Encapsulated(key, pkEm, null);
+            } catch (UnsupportedOperationException e) {
+                throw e;
             } catch (Exception e) {
                 throw new ProviderException("internal error", e);
-            } finally {
-                // `key` has been cloned into the `SecretKeySpec` within the
-                // returned `KEM.Encapsulated`, so it can now be cleared.
-                if (key != null) {
-                    Arrays.fill(key, (byte)0);
-                }
             }
         }
 
         @Override
         public SecretKey engineDecapsulate(byte[] encapsulation,
                 int from, int to, String algorithm) throws DecapsulateException {
-            Objects.checkFromToIndex(from, to, params.Nsecret);
+            Objects.checkFromToIndex(from, to, params.nsecret);
             Objects.requireNonNull(algorithm, "null algorithm");
             Objects.requireNonNull(encapsulation, "null encapsulation");
-            if (encapsulation.length != params.Npk) {
+            if (encapsulation.length != params.npk) {
                 throw new DecapsulateException("incorrect encapsulation size");
             }
-            byte[] key = null;
             try {
-                PublicKey pkE = params.DeserializePublicKey(encapsulation);
-                byte[] dh = params.DH(skR, pkE);
-                byte[] pkRm = params.SerializePublicKey(pkR);
-                byte[] kem_context = concat(encapsulation, pkRm);
-                key = params.ExtractAndExpand(dh, kem_context);
-                return new SecretKeySpec(key, from, to - from, algorithm);
+                PublicKey pkE = params.deserializePublicKey(encapsulation);
+                byte[] pkRm = params.serializePublicKey(pkR);
+                if (pkS == null) {
+                    byte[] kem_context = concat(encapsulation, pkRm);
+                    return params.deriveKey(algorithm, from, to, kem_context,
+                            params.dh(skR, pkE));
+                } else {
+                    byte[] pkSm = params.serializePublicKey(pkS);
+                    byte[] kem_context = concat(encapsulation, pkRm, pkSm);
+                    return params.deriveKey(algorithm, from, to, kem_context,
+                            params.dh(skR, pkE), params.dh(skR, pkS));
+                }
+            } catch (UnsupportedOperationException e) {
+                throw e;
             } catch (IOException | InvalidKeyException e) {
                 throw new DecapsulateException("Cannot decapsulate", e);
             } catch (Exception e) {
                 throw new ProviderException("internal error", e);
-            } finally {
-                if (key != null) {
-                    Arrays.fill(key, (byte)0);
-                }
             }
         }
 
         @Override
         public int engineSecretSize() {
-            return params.Nsecret;
+            return params.nsecret;
         }
 
         @Override
         public int engineEncapsulationSize() {
-            return params.Npk;
+            return params.npk;
         }
     }
 
     // Not really a random. For KAT test only. It generates key pair from ikm.
     public static class RFC9180DeriveKeyPairSR extends SecureRandom {
 
-        static final long serialVersionUID = 0L;
+        @Serial
+        private static final long serialVersionUID = 0L;
 
         private final byte[] ikm;
 
@@ -147,7 +178,7 @@ public class DHKEM implements KEMSpi {
             this.ikm = ikm;
         }
 
-        public KeyPair derive(Params params) {
+        private KeyPair derive(Params params) {
             try {
                 return params.deriveKeyPair(ikm);
             } catch (Exception e) {
@@ -183,9 +214,9 @@ public class DHKEM implements KEMSpi {
         ;
 
         private final int kem_id;
-        private final int Nsecret;
-        private final int Nsk;
-        private final int Npk;
+        private final int nsecret;
+        private final int nsk;
+        private final int npk;
         private final String kaAlgorithm;
         private final String keyAlgorithm;
         private final AlgorithmParameterSpec spec;
@@ -193,18 +224,18 @@ public class DHKEM implements KEMSpi {
 
         private final byte[] suiteId;
 
-        Params(int kem_id, int Nsecret, int Nsk, int Npk,
+        Params(int kem_id, int nsecret, int nsk, int npk,
                 String kaAlgorithm, String keyAlgorithm, AlgorithmParameterSpec spec,
                 String hkdfAlgorithm) {
             this.kem_id = kem_id;
             this.spec = spec;
-            this.Nsecret = Nsecret;
-            this.Nsk = Nsk;
-            this.Npk = Npk;
+            this.nsecret = nsecret;
+            this.nsk = nsk;
+            this.npk = npk;
             this.kaAlgorithm = kaAlgorithm;
             this.keyAlgorithm = keyAlgorithm;
             this.hkdfAlgorithm = hkdfAlgorithm;
-            suiteId = concat(KEM, I2OSP(kem_id, 2));
+            suiteId = concat(KEM, i2OSP(kem_id, 2));
         }
 
         private boolean isEC() {
@@ -224,18 +255,18 @@ public class DHKEM implements KEMSpi {
             }
         }
 
-        private byte[] SerializePublicKey(PublicKey k) {
+        private byte[] serializePublicKey(PublicKey k) {
             if (isEC()) {
                 ECPoint w = ((ECPublicKey) k).getW();
                 return ECUtil.encodePoint(w, ((NamedCurve) spec).getCurve());
             } else {
                 byte[] uArray = ((XECPublicKey) k).getU().toByteArray();
                 ArrayUtil.reverse(uArray);
-                return Arrays.copyOf(uArray, Npk);
+                return Arrays.copyOf(uArray, npk);
             }
         }
 
-        private PublicKey DeserializePublicKey(byte[] data)
+        private PublicKey deserializePublicKey(byte[] data)
                 throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
             KeySpec keySpec;
             if (isEC()) {
@@ -251,29 +282,59 @@ public class DHKEM implements KEMSpi {
             return KeyFactory.getInstance(keyAlgorithm).generatePublic(keySpec);
         }
 
-        private byte[] DH(PrivateKey skE, PublicKey pkR)
+        private SecretKey dh(PrivateKey skE, PublicKey pkR)
                 throws NoSuchAlgorithmException, InvalidKeyException {
             KeyAgreement ka = KeyAgreement.getInstance(kaAlgorithm);
             ka.init(skE);
             ka.doPhase(pkR, true);
-            return ka.generateSecret();
+            return ka.generateSecret("Generic");
         }
 
-        private byte[] ExtractAndExpand(byte[] dh, byte[] kem_context)
-                throws NoSuchAlgorithmException, InvalidKeyException {
-            KDF hkdf = KDF.getInstance(hkdfAlgorithm);
-            SecretKey eae_prk = LabeledExtract(hkdf, suiteId, EAE_PRK, dh);
-            try {
-                return LabeledExpand(hkdf, suiteId, eae_prk, SHARED_SECRET,
-                        kem_context, Nsecret);
-            } finally {
-                if (eae_prk instanceof SecretKeySpec s) {
-                    SharedSecrets.getJavaxCryptoSpecAccess()
-                            .clearSecretKeySpec(s);
+        // The final shared secret derivation of either the encapsulator
+        // or the decapsulator. The key slicing is implemented inside.
+        // Throws UOE if a slice of the key cannot be found.
+        private SecretKey deriveKey(String alg, int from, int to,
+                byte[] kem_context, SecretKey... dhs)
+                throws NoSuchAlgorithmException {
+            if (from == 0 && to == nsecret) {
+                return extractAndExpand(kem_context, alg, dhs);
+            } else {
+                // First get shared secrets in "Generic" and then get a slice
+                // of it in the requested algorithm.
+                var fullKey = extractAndExpand(kem_context, "Generic", dhs);
+                if ("RAW".equalsIgnoreCase(fullKey.getFormat())) {
+                    byte[] km = fullKey.getEncoded();
+                    if (km == null) {
+                        // Should not happen if format is "RAW"
+                        throw new UnsupportedOperationException("Key extract failed");
+                    } else {
+                        try {
+                            return new SecretKeySpec(km, from, to - from, alg);
+                        } finally {
+                            Arrays.fill(km, (byte)0);
+                        }
+                    }
+                } else if (fullKey instanceof SliceableSecretKey ssk) {
+                    return ssk.slice(alg, from, to);
+                } else {
+                    throw new UnsupportedOperationException("Cannot extract key");
                 }
             }
         }
 
+        private SecretKey extractAndExpand(byte[] kem_context, String alg, SecretKey... dhs)
+                throws NoSuchAlgorithmException {
+            var kdf = KDF.getInstance(hkdfAlgorithm);
+            var builder = labeledExtract(suiteId, EAE_PRK);
+            for (var dh : dhs) builder.addIKM(dh);
+            try {
+                return kdf.deriveKey(alg,
+                        labeledExpand(builder, suiteId, SHARED_SECRET, kem_context, nsecret));
+            } catch (InvalidAlgorithmParameterException e) {
+                throw new ProviderException(e);
+            }
+        }
+
         private PublicKey getPublicKey(PrivateKey sk)
                 throws InvalidKeyException {
             if (!(sk instanceof InternalPrivateKey)) {
@@ -298,45 +359,37 @@ public class DHKEM implements KEMSpi {
 
         // For KAT tests only. See RFC9180DeriveKeyPairSR.
         public KeyPair deriveKeyPair(byte[] ikm) throws Exception {
-            KDF hkdf = KDF.getInstance(hkdfAlgorithm);
-            SecretKey dkp_prk = LabeledExtract(hkdf, suiteId, DKP_PRK, ikm);
-            try {
-                if (isEC()) {
-                    NamedCurve curve = (NamedCurve) spec;
-                    BigInteger sk = BigInteger.ZERO;
-                    int counter = 0;
-                    while (sk.signum() == 0 ||
-                            sk.compareTo(curve.getOrder()) >= 0) {
-                        if (counter > 255) {
-                            throw new RuntimeException();
-                        }
-                        byte[] bytes = LabeledExpand(hkdf, suiteId, dkp_prk,
-                                CANDIDATE, I2OSP(counter, 1), Nsk);
-                        // bitmask is defined to be 0xFF for P-256 and P-384,
-                        // and 0x01 for P-521
-                        if (this == Params.P521) {
-                            bytes[0] = (byte) (bytes[0] & 0x01);
-                        }
-                        sk = new BigInteger(1, (bytes));
-                        counter = counter + 1;
+            var kdf = KDF.getInstance(hkdfAlgorithm);
+            var builder = labeledExtract(suiteId, DKP_PRK).addIKM(ikm);
+            if (isEC()) {
+                NamedCurve curve = (NamedCurve) spec;
+                BigInteger sk = BigInteger.ZERO;
+                int counter = 0;
+                while (sk.signum() == 0 || sk.compareTo(curve.getOrder()) >= 0) {
+                    if (counter > 255) {
+                        // So unlucky and should not happen
+                        throw new ProviderException("DeriveKeyPairError");
                     }
-                    PrivateKey k = DeserializePrivateKey(sk.toByteArray());
-                    return new KeyPair(getPublicKey(k), k);
-                } else {
-                    byte[] sk = LabeledExpand(hkdf, suiteId, dkp_prk, SK, EMPTY,
-                            Nsk);
-                    PrivateKey k = DeserializePrivateKey(sk);
-                    return new KeyPair(getPublicKey(k), k);
-                }
-            } finally {
-                if (dkp_prk instanceof SecretKeySpec s) {
-                    SharedSecrets.getJavaxCryptoSpecAccess()
-                            .clearSecretKeySpec(s);
+                    byte[] bytes = kdf.deriveData(labeledExpand(builder,
+                            suiteId, CANDIDATE, i2OSP(counter, 1), nsk));
+                    // bitmask is defined to be 0xFF for P-256 and P-384, and 0x01 for P-521
+                    if (this == Params.P521) {
+                        bytes[0] = (byte) (bytes[0] & 0x01);
+                    }
+                    sk = new BigInteger(1, (bytes));
+                    counter = counter + 1;
                 }
+                PrivateKey k = deserializePrivateKey(sk.toByteArray());
+                return new KeyPair(getPublicKey(k), k);
+            } else {
+                byte[] sk = kdf.deriveData(labeledExpand(builder,
+                        suiteId, SK, EMPTY, nsk));
+                PrivateKey k = deserializePrivateKey(sk);
+                return new KeyPair(getPublicKey(k), k);
             }
         }
 
-        private PrivateKey DeserializePrivateKey(byte[] data) throws Exception {
+        private PrivateKey deserializePrivateKey(byte[] data) throws Exception {
             KeySpec keySpec = isEC()
                     ? new ECPrivateKeySpec(new BigInteger(1, (data)), (NamedCurve) spec)
                     : new XECPrivateKeySpec(spec, data);
@@ -359,7 +412,22 @@ public class DHKEM implements KEMSpi {
             throw new InvalidAlgorithmParameterException("no spec needed");
         }
         Params params = paramsFromKey(pk);
-        return new Handler(params, getSecureRandom(secureRandom), null, pk);
+        return new Handler(params, getSecureRandom(secureRandom), null, null, null, pk);
+    }
+
+    // AuthEncap is not public KEM API
+    public EncapsulatorSpi engineNewAuthEncapsulator(PublicKey pkR, PrivateKey skS,
+            AlgorithmParameterSpec spec, SecureRandom secureRandom)
+            throws InvalidAlgorithmParameterException, InvalidKeyException {
+        if (pkR == null || skS == null) {
+            throw new InvalidKeyException("input key is null");
+        }
+        if (spec != null) {
+            throw new InvalidAlgorithmParameterException("no spec needed");
+        }
+        Params params = paramsFromKey(pkR);
+        return new Handler(params, getSecureRandom(secureRandom),
+                skS, params.getPublicKey(skS), null, pkR);
     }
 
     @Override
@@ -372,20 +440,34 @@ public class DHKEM implements KEMSpi {
             throw new InvalidAlgorithmParameterException("no spec needed");
         }
         Params params = paramsFromKey(sk);
-        return new Handler(params, null, sk, params.getPublicKey(sk));
+        return new Handler(params, null, null, null, sk, params.getPublicKey(sk));
     }
 
-    private Params paramsFromKey(Key k) throws InvalidKeyException {
-        if (k instanceof ECKey eckey) {
-            if (ECUtil.equals(eckey.getParams(), CurveDB.P_256)) {
+    // AuthDecap is not public KEM API
+    public DecapsulatorSpi engineNewAuthDecapsulator(
+            PrivateKey skR, PublicKey pkS, AlgorithmParameterSpec spec)
+            throws InvalidAlgorithmParameterException, InvalidKeyException {
+        if (skR == null || pkS == null) {
+            throw new InvalidKeyException("input key is null");
+        }
+        if (spec != null) {
+            throw new InvalidAlgorithmParameterException("no spec needed");
+        }
+        Params params = paramsFromKey(skR);
+        return new Handler(params, null, null, pkS, skR, params.getPublicKey(skR));
+    }
+
+    private Params paramsFromKey(AsymmetricKey k) throws InvalidKeyException {
+        var p = k.getParams();
+        if (p instanceof ECParameterSpec ecp) {
+            if (ECUtil.equals(ecp, CurveDB.P_256)) {
                 return Params.P256;
-            } else if (ECUtil.equals(eckey.getParams(), CurveDB.P_384)) {
+            } else if (ECUtil.equals(ecp, CurveDB.P_384)) {
                 return Params.P384;
-            } else if (ECUtil.equals(eckey.getParams(), CurveDB.P_521)) {
+            } else if (ECUtil.equals(ecp, CurveDB.P_521)) {
                 return Params.P521;
             }
-        } else if (k instanceof XECKey xkey
-                && xkey.getParams() instanceof NamedParameterSpec ns) {
+        } else if (p instanceof NamedParameterSpec ns) {
             if (ns.getName().equalsIgnoreCase("X25519")) {
                 return Params.X25519;
             } else if (ns.getName().equalsIgnoreCase("X448")) {
@@ -401,8 +483,11 @@ public class DHKEM implements KEMSpi {
         return o.toByteArray();
     }
 
-    private static byte[] I2OSP(int n, int w) {
-        assert n < 256;
+    // I2OSP(n, w) as defined in RFC 9180 Section 3.
+    // In DHKEM and HPKE, number is always <65536
+    // and converted to at most 2 bytes.
+    public static byte[] i2OSP(int n, int w) {
+        assert n < 65536;
         assert w == 1 || w == 2;
         if (w == 1) {
             return new byte[] { (byte) n };
@@ -411,32 +496,32 @@ public class DHKEM implements KEMSpi {
         }
     }
 
-    private static SecretKey LabeledExtract(KDF hkdf, byte[] suite_id,
-            byte[] label, byte[] ikm) throws InvalidKeyException {
-        SecretKeySpec s = new SecretKeySpec(concat(HPKE_V1, suite_id, label,
-                ikm), "IKM");
-        try {
-            HKDFParameterSpec spec =
-                    HKDFParameterSpec.ofExtract().addIKM(s).extractOnly();
-            return hkdf.deriveKey("Generic", spec);
-        } catch (InvalidAlgorithmParameterException |
-                 NoSuchAlgorithmException e) {
-            throw new InvalidKeyException(e.getMessage(), e);
-        } finally {
-            SharedSecrets.getJavaxCryptoSpecAccess().clearSecretKeySpec(s);
-        }
+    // Create a LabeledExtract builder with labels.
+    // You can add more IKM and salt into the result.
+    public static HKDFParameterSpec.Builder labeledExtract(
+            byte[] suiteId, byte[] label) {
+        return HKDFParameterSpec.ofExtract()
+                .addIKM(HPKE_V1).addIKM(suiteId).addIKM(label);
     }
 
-    private static byte[] LabeledExpand(KDF hkdf, byte[] suite_id,
-            SecretKey prk, byte[] label, byte[] info, int L)
-            throws InvalidKeyException {
-        byte[] labeled_info = concat(I2OSP(L, 2), HPKE_V1, suite_id, label,
-                info);
-        try {
-            return hkdf.deriveData(HKDFParameterSpec.expandOnly(
-                    prk, labeled_info, L));
-        } catch (InvalidAlgorithmParameterException iape) {
-            throw new InvalidKeyException(iape.getMessage(), iape);
-        }
+    // Create a labeled info from info and labels
+    private static byte[] labeledInfo(
+            byte[] suiteId, byte[] label, byte[] info, int length) {
+        return concat(i2OSP(length, 2), HPKE_V1, suiteId, label, info);
+    }
+
+    // LabeledExpand from a builder
+    public static HKDFParameterSpec labeledExpand(
+            HKDFParameterSpec.Builder builder,
+            byte[] suiteId, byte[] label, byte[] info, int length) {
+        return builder.thenExpand(
+                labeledInfo(suiteId, label, info, length), length);
+    }
+
+    // LabeledExpand from a prk
+    public static HKDFParameterSpec labeledExpand(
+            SecretKey prk, byte[] suiteId, byte[] label, byte[] info, int length) {
+        return HKDFParameterSpec.expandOnly(
+                prk, labeledInfo(suiteId, label, info, length), length);
     }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HPKE.java b/src/java.base/share/classes/com/sun/crypto/provider/HPKE.java
new file mode 100644
index 00000000000..eee5f59cc75
--- /dev/null
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HPKE.java
@@ -0,0 +1,588 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.crypto.provider;
+
+import sun.security.util.CurveDB;
+import sun.security.util.ECUtil;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.CipherSpi;
+import javax.crypto.DecapsulateException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KDF;
+import javax.crypto.KEM;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.HPKEParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.security.AlgorithmParameters;
+import java.security.AsymmetricKey;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.ProviderException;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.ECParameterSpec;
+import java.security.spec.NamedParameterSpec;
+import java.util.Arrays;
+
+public class HPKE extends CipherSpi {
+
+    private static final byte[] HPKE = new byte[]
+            {'H', 'P', 'K', 'E'};
+    private static final byte[] SEC = new byte[]
+            {'s', 'e', 'c'};
+    private static final byte[] PSK_ID_HASH = new byte[]
+            {'p', 's', 'k', '_', 'i', 'd', '_', 'h', 'a', 's', 'h'};
+    private static final byte[] INFO_HASH = new byte[]
+            {'i', 'n', 'f', 'o', '_', 'h', 'a', 's', 'h'};
+    private static final byte[] SECRET = new byte[]
+            {'s', 'e', 'c', 'r', 'e', 't'};
+    private static final byte[] EXP = new byte[]
+            {'e', 'x', 'p'};
+    private static final byte[] KEY = new byte[]
+            {'k', 'e', 'y'};
+    private static final byte[] BASE_NONCE = new byte[]
+            {'b', 'a', 's', 'e', '_', 'n', 'o', 'n', 'c', 'e'};
+
+    private static final int BEGIN = 1;
+    private static final int EXPORT_ONLY = 2; // init done with aead_id == 65535
+    private static final int ENCRYPT_AND_EXPORT = 3; // int done with AEAD
+    private static final int AFTER_FINAL = 4; // after doFinal, need reinit internal cipher
+
+    private int state = BEGIN;
+    private Impl impl;
+
+    @Override
+    protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
+        throw new NoSuchAlgorithmException(mode);
+    }
+
+    @Override
+    protected void engineSetPadding(String padding) throws NoSuchPaddingException {
+        throw new NoSuchPaddingException(padding);
+    }
+
+    @Override
+    protected int engineGetBlockSize() {
+        if (state == ENCRYPT_AND_EXPORT || state == AFTER_FINAL) {
+            return impl.aead.cipher.getBlockSize();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    protected int engineGetOutputSize(int inputLen) {
+        if (state == ENCRYPT_AND_EXPORT || state == AFTER_FINAL) {
+            return impl.aead.cipher.getOutputSize(inputLen);
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    protected byte[] engineGetIV() {
+        return (state == BEGIN || impl.kemEncaps == null)
+                ? null : impl.kemEncaps.clone();
+    }
+
+    @Override
+    protected AlgorithmParameters engineGetParameters() {
+        return null;
+    }
+
+    @Override
+    protected void engineInit(int opmode, Key key, SecureRandom random)
+            throws InvalidKeyException {
+        throw new InvalidKeyException("HPKEParameterSpec must be provided");
+    }
+
+    @Override
+    protected void engineInit(int opmode, Key key,
+            AlgorithmParameterSpec params, SecureRandom random)
+            throws InvalidKeyException, InvalidAlgorithmParameterException {
+        impl = new Impl(opmode);
+        if (!(key instanceof AsymmetricKey ak)) {
+            throw new InvalidKeyException("Not an asymmetric key");
+        }
+        if (params == null) {
+            throw new InvalidAlgorithmParameterException(
+                    "HPKEParameterSpec must be provided");
+        } else if (params instanceof HPKEParameterSpec hps) {
+            impl.init(ak, hps, random);
+        } else {
+            throw new InvalidAlgorithmParameterException(
+                    "Unsupported params type: " + params.getClass());
+        }
+        if (impl.hasEncrypt()) {
+            impl.aead.start(impl.opmode, impl.context.k, impl.context.computeNonce());
+            state = ENCRYPT_AND_EXPORT;
+        } else {
+            state = EXPORT_ONLY;
+        }
+    }
+
+    @Override
+    protected void engineInit(int opmode, Key key,
+            AlgorithmParameters params, SecureRandom random)
+            throws InvalidKeyException, InvalidAlgorithmParameterException {
+        throw new InvalidKeyException("HPKEParameterSpec must be provided");
+    }
+
+    // state is ENCRYPT_AND_EXPORT after this call succeeds
+    private void maybeReinitInternalCipher() {
+        if (state == BEGIN) {
+            throw new IllegalStateException("Illegal state: " + state);
+        }
+        if (state == EXPORT_ONLY) {
+            throw new UnsupportedOperationException();
+        }
+        if (state == AFTER_FINAL) {
+            impl.aead.start(impl.opmode, impl.context.k, impl.context.computeNonce());
+            state = ENCRYPT_AND_EXPORT;
+        }
+    }
+
+    @Override
+    protected byte[] engineUpdate(byte[] input, int inputOffset, int inputLen) {
+        maybeReinitInternalCipher();
+        return impl.aead.cipher.update(input, inputOffset, inputLen);
+    }
+
+    @Override
+    protected int engineUpdate(byte[] input, int inputOffset, int inputLen,
+            byte[] output, int outputOffset) throws ShortBufferException {
+        maybeReinitInternalCipher();
+        return impl.aead.cipher.update(
+                input, inputOffset, inputLen, output, outputOffset);
+    }
+
+    @Override
+    protected void engineUpdateAAD(byte[] src, int offset, int len) {
+        maybeReinitInternalCipher();
+        impl.aead.cipher.updateAAD(src, offset, len);
+    }
+
+    @Override
+    protected void engineUpdateAAD(ByteBuffer src) {
+        maybeReinitInternalCipher();
+        impl.aead.cipher.updateAAD(src);
+    }
+
+    @Override
+    protected byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)
+            throws IllegalBlockSizeException, BadPaddingException {
+        maybeReinitInternalCipher();
+        impl.context.IncrementSeq();
+        state = AFTER_FINAL;
+        if (input == null) { // a bug in doFinal(null, ?, ?)
+            return impl.aead.cipher.doFinal();
+        } else {
+            return impl.aead.cipher.doFinal(input, inputOffset, inputLen);
+        }
+    }
+
+    @Override
+    protected int engineDoFinal(byte[] input, int inputOffset, int inputLen,
+            byte[] output, int outputOffset) throws ShortBufferException,
+            IllegalBlockSizeException, BadPaddingException {
+        maybeReinitInternalCipher();
+        impl.context.IncrementSeq();
+        state = AFTER_FINAL;
+        return impl.aead.cipher.doFinal(
+                input, inputOffset, inputLen, output, outputOffset);
+    }
+
+    //@Override
+    protected SecretKey engineExportKey(String algorithm, byte[] context, int length) {
+        if (state == BEGIN) {
+            throw new IllegalStateException("State: " + state);
+        } else {
+            return impl.context.exportKey(algorithm, context, length);
+        }
+    }
+
+    //@Override
+    protected byte[] engineExportData(byte[] context, int length) {
+        if (state == BEGIN) {
+            throw new IllegalStateException("State: " + state);
+        } else {
+            return impl.context.exportData(context, length);
+        }
+    }
+
+    private static class AEAD {
+        final Cipher cipher;
+        final int nk, nn, nt;
+        final int id;
+        public AEAD(int id) throws InvalidAlgorithmParameterException {
+            this.id = id;
+            try {
+                switch (id) {
+                    case HPKEParameterSpec.AEAD_AES_128_GCM -> {
+                        cipher = Cipher.getInstance("AES/GCM/NoPadding");
+                        nk = 16;
+                    }
+                    case HPKEParameterSpec.AEAD_AES_256_GCM -> {
+                        cipher = Cipher.getInstance("AES/GCM/NoPadding");
+                        nk = 32;
+                    }
+                    case HPKEParameterSpec.AEAD_CHACHA20_POLY1305 -> {
+                        cipher = Cipher.getInstance("ChaCha20-Poly1305");
+                        nk = 32;
+                    }
+                    case HPKEParameterSpec.EXPORT_ONLY -> {
+                        cipher = null;
+                        nk = -1;
+                    }
+                    default -> throw new InvalidAlgorithmParameterException(
+                            "Unknown aead_id: " + id);
+                }
+            } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+                throw new ProviderException("Internal error", e);
+            }
+            nn = 12; nt = 16;
+        }
+
+        void start(int opmode, SecretKey key, byte[] nonce) {
+            try {
+                if (id == HPKEParameterSpec.AEAD_CHACHA20_POLY1305) {
+                    cipher.init(opmode, key, new IvParameterSpec(nonce));
+                } else {
+                    cipher.init(opmode, key, new GCMParameterSpec(nt * 8, nonce));
+                }
+            } catch (InvalidAlgorithmParameterException | InvalidKeyException e) {
+                throw new ProviderException("Internal error", e);
+            }
+        }
+    }
+
+    private static class Impl {
+
+        final int opmode;
+
+        HPKEParameterSpec params;
+        Context context;
+        AEAD aead;
+
+        byte[] suite_id;
+        String kdfAlg;
+        int kdfNh;
+
+        // only used on sender side
+        byte[] kemEncaps;
+
+        class Context {
+            final SecretKey k; // null if only export
+            final byte[] base_nonce;
+            final SecretKey exporter_secret;
+
+            byte[] seq = new byte[aead.nn];
+
+            public Context(SecretKey sk, byte[] base_nonce,
+                    SecretKey exporter_secret) {
+                this.k = sk;
+                this.base_nonce = base_nonce;
+                this.exporter_secret = exporter_secret;
+            }
+
+            SecretKey exportKey(String algorithm, byte[] exporter_context, int length) {
+                if (exporter_context == null) {
+                    throw new IllegalArgumentException("Null exporter_context");
+                }
+                try {
+                    var kdf = KDF.getInstance(kdfAlg);
+                    return kdf.deriveKey(algorithm, DHKEM.labeledExpand(
+                            exporter_secret, suite_id, SEC, exporter_context, length));
+                } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException e) {
+                    // algorithm not accepted by HKDF, length too big or too small
+                    throw new IllegalArgumentException("Invalid input", e);
+                }
+            }
+
+            byte[] exportData(byte[] exporter_context, int length) {
+                if (exporter_context == null) {
+                    throw new IllegalArgumentException("Null exporter_context");
+                }
+                try {
+                    var kdf = KDF.getInstance(kdfAlg);
+                    return kdf.deriveData(DHKEM.labeledExpand(
+                            exporter_secret, suite_id, SEC, exporter_context, length));
+                } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException e) {
+                    // algorithm not accepted by HKDF, length too big or too small
+                    throw new IllegalArgumentException("Invalid input", e);
+                }
+            }
+
+            private byte[] computeNonce() {
+                var result = new byte[aead.nn];
+                for (var i = 0; i < result.length; i++) {
+                    result[i] = (byte)(seq[i] ^ base_nonce[i]);
+                }
+                return result;
+            }
+
+            private void IncrementSeq() {
+                for (var i = seq.length - 1; i >= 0; i--) {
+                    if ((seq[i] & 0xff) == 0xff) {
+                        seq[i] = 0;
+                    } else {
+                        seq[i]++;
+                        return;
+                    }
+                }
+                // seq >= (1 << (8*aead.Nn)) - 1 when this method is called
+                throw new ProviderException("MessageLimitReachedError");
+            }
+        }
+
+        public Impl(int opmode) {
+            this.opmode = opmode;
+        }
+
+        public boolean hasEncrypt() {
+            return params.aead_id() != 65535;
+        }
+
+        // Section 7.2.1 of RFC 9180 has restrictions on size of psk, psk_id,
+        // info, and exporter_context (~2^61 for HMAC-SHA256 and ~2^125 for
+        // HMAC-SHA384 and HMAC-SHA512). This method does not pose any
+        // restrictions.
+        public void init(AsymmetricKey key, HPKEParameterSpec p, SecureRandom rand)
+                throws InvalidKeyException, InvalidAlgorithmParameterException {
+            if (opmode != Cipher.ENCRYPT_MODE && opmode != Cipher.DECRYPT_MODE) {
+                throw new UnsupportedOperationException(
+                        "Can only be used for encryption and decryption");
+            }
+            setParams(p);
+            SecretKey shared_secret;
+            if (opmode == Cipher.ENCRYPT_MODE) {
+                if (!(key instanceof PublicKey pk)) {
+                    throw new InvalidKeyException(
+                            "Cannot encrypt with private key");
+                }
+                if (p.encapsulation() != null) {
+                    throw new InvalidAlgorithmParameterException(
+                            "Must not provide key encapsulation message on sender side");
+                }
+                checkMatch(false, pk, params.kem_id());
+                KEM.Encapsulated enc;
+                switch (p.authKey()) {
+                    case null -> {
+                        var e = kem().newEncapsulator(pk, rand);
+                        enc = e.encapsulate();
+                    }
+                    case PrivateKey skS -> {
+                        checkMatch(true, skS, params.kem_id());
+                        // AuthEncap not public KEM API but it's internally supported
+                        var e = new DHKEM().engineNewAuthEncapsulator(pk, skS, null, rand);
+                        enc = e.engineEncapsulate(0, e.engineSecretSize(), "Generic");
+                    }
+                    default -> throw new InvalidAlgorithmParameterException(
+                            "Cannot auth with public key");
+                }
+                kemEncaps = enc.encapsulation();
+                shared_secret = enc.key();
+            } else {
+                if (!(key instanceof PrivateKey sk)) {
+                    throw new InvalidKeyException("Cannot decrypt with public key");
+                }
+                checkMatch(false, sk, params.kem_id());
+                try {
+                    var encap = p.encapsulation();
+                    if (encap == null) {
+                        throw new InvalidAlgorithmParameterException(
+                                "Must provide key encapsulation message on recipient side");
+                    }
+                    switch (p.authKey()) {
+                        case null -> {
+                            var d = kem().newDecapsulator(sk);
+                            shared_secret = d.decapsulate(encap);
+                        }
+                        case PublicKey pkS -> {
+                            checkMatch(true, pkS, params.kem_id());
+                            // AuthDecap not public KEM API but it's internally supported
+                            var d = new DHKEM().engineNewAuthDecapsulator(sk, pkS, null);
+                            shared_secret = d.engineDecapsulate(
+                                    encap, 0, d.engineSecretSize(), "Generic");
+                        }
+                        default -> throw new InvalidAlgorithmParameterException(
+                                "Cannot auth with private key");
+                    }
+                } catch (DecapsulateException e) {
+                    throw new InvalidAlgorithmParameterException(e);
+                }
+            }
+
+            var usePSK = usePSK(params.psk());
+            int mode = params.authKey() == null ? (usePSK ? 1 : 0) : (usePSK ? 3 : 2);
+            context = keySchedule(mode, shared_secret,
+                    params.info(),
+                    params.psk(),
+                    params.psk_id());
+        }
+
+        private static void checkMatch(boolean inSpec, AsymmetricKey k, int kem_id)
+                throws InvalidKeyException, InvalidAlgorithmParameterException {
+            var p = k.getParams();
+            switch (p) {
+                case ECParameterSpec ecp -> {
+                    if ((!ECUtil.equals(ecp, CurveDB.P_256)
+                            || kem_id != HPKEParameterSpec.KEM_DHKEM_P_256_HKDF_SHA256)
+                            && (!ECUtil.equals(ecp, CurveDB.P_384)
+                            || kem_id != HPKEParameterSpec.KEM_DHKEM_P_384_HKDF_SHA384)
+                            && (!ECUtil.equals(ecp, CurveDB.P_521)
+                            || kem_id != HPKEParameterSpec.KEM_DHKEM_P_521_HKDF_SHA512)) {
+                        var name = ECUtil.getCurveName(ecp);
+                        throw new InvalidAlgorithmParameterException(
+                                name + " does not match " + kem_id);
+                    }
+                }
+                case NamedParameterSpec ns -> {
+                    var name = ns.getName();
+                    if ((!name.equalsIgnoreCase("x25519")
+                            || kem_id != HPKEParameterSpec.KEM_DHKEM_X25519_HKDF_SHA256)
+                            && (!name.equalsIgnoreCase("x448")
+                            || kem_id != HPKEParameterSpec.KEM_DHKEM_X448_HKDF_SHA512)) {
+                        throw new InvalidAlgorithmParameterException(
+                                name + " does not match " + kem_id);
+                    }
+                }
+                case null, default -> {
+                    var msg = k.getClass() + " does not match " + kem_id;
+                    if (inSpec) {
+                        throw new InvalidAlgorithmParameterException(msg);
+                    } else {
+                        throw new InvalidKeyException(msg);
+                    }
+                }
+            }
+        }
+
+        private KEM kem() {
+            try {
+                return KEM.getInstance("DHKEM");
+            } catch (NoSuchAlgorithmException e) {
+                throw new ProviderException("Internal error", e);
+            }
+        }
+
+        private void setParams(HPKEParameterSpec p)
+                throws InvalidAlgorithmParameterException {
+            params = p;
+            suite_id = concat(
+                    HPKE,
+                    DHKEM.i2OSP(params.kem_id(), 2),
+                    DHKEM.i2OSP(params.kdf_id(), 2),
+                    DHKEM.i2OSP(params.aead_id(), 2));
+            switch (params.kdf_id()) {
+                case HPKEParameterSpec.KDF_HKDF_SHA256 -> {
+                    kdfAlg = "HKDF-SHA256";
+                    kdfNh = 32;
+                }
+                case HPKEParameterSpec.KDF_HKDF_SHA384 -> {
+                    kdfAlg = "HKDF-SHA384";
+                    kdfNh = 48;
+                }
+                case HPKEParameterSpec.KDF_HKDF_SHA512 -> {
+                    kdfAlg = "HKDF-SHA512";
+                    kdfNh = 64;
+                }
+                default -> throw new InvalidAlgorithmParameterException(
+                        "Unsupported kdf_id: " + params.kdf_id());
+            }
+            aead = new AEAD(params.aead_id());
+        }
+
+        private Context keySchedule(int mode,
+                SecretKey shared_secret,
+                byte[] info,
+                SecretKey psk,
+                byte[] psk_id) {
+            try {
+                var psk_id_hash_x = DHKEM.labeledExtract(suite_id, PSK_ID_HASH)
+                        .addIKM(psk_id).extractOnly();
+                var info_hash_x = DHKEM.labeledExtract(suite_id, INFO_HASH)
+                        .addIKM(info).extractOnly();
+
+                // deriveData must and can be called because all info to
+                // thw builder are just byte arrays. Any KDF impl can handle this.
+                var kdf = KDF.getInstance(kdfAlg);
+                var key_schedule_context = concat(new byte[]{(byte) mode},
+                        kdf.deriveData(psk_id_hash_x),
+                        kdf.deriveData(info_hash_x));
+
+                var secret_x_builder = DHKEM.labeledExtract(suite_id, SECRET);
+                if (psk != null) {
+                    secret_x_builder.addIKM(psk);
+                }
+                secret_x_builder.addSalt(shared_secret);
+                var secret_x = kdf.deriveKey("Generic", secret_x_builder.extractOnly());
+
+                // A new KDF object must be created because secret_x_builder
+                // might contain provider-specific keys which the previous
+                // KDF (provider already chosen) cannot handle.
+                kdf = KDF.getInstance(kdfAlg);
+                var exporter_secret = kdf.deriveKey("Generic", DHKEM.labeledExpand(
+                        secret_x, suite_id, EXP, key_schedule_context, kdfNh));
+
+                if (hasEncrypt()) {
+                    // ChaCha20-Poly1305 does not care about algorithm name
+                    var key = kdf.deriveKey("AES", DHKEM.labeledExpand(secret_x,
+                            suite_id, KEY, key_schedule_context, aead.nk));
+                    // deriveData must be called because we need to increment nonce
+                    var base_nonce = kdf.deriveData(DHKEM.labeledExpand(secret_x,
+                            suite_id, BASE_NONCE, key_schedule_context, aead.nn));
+                    return new Context(key, base_nonce, exporter_secret);
+                } else {
+                    return new Context(null, null, exporter_secret);
+                }
+            } catch (InvalidAlgorithmParameterException
+                     | NoSuchAlgorithmException | UnsupportedOperationException e) {
+                throw new ProviderException("Internal error", e);
+            }
+        }
+    }
+
+    private static boolean usePSK(SecretKey psk) {
+        return psk != null;
+    }
+
+    private static byte[] concat(byte[]... inputs) {
+        var o = new ByteArrayOutputStream();
+        Arrays.stream(inputs).forEach(o::writeBytes);
+        return o.toByteArray();
+    }
+}
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
index 22d5f17c6e0..4b38bd55809 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -371,6 +371,8 @@ public final class SunJCE extends Provider {
         ps("Cipher", "PBEWithHmacSHA512/256AndAES_256",
                 "com.sun.crypto.provider.PBES2Core$HmacSHA512_256AndAES_256");
 
+        ps("Cipher", "HPKE", "com.sun.crypto.provider.HPKE");
+
         /*
          * Key(pair) Generator engines
          */
diff --git a/src/java.base/share/classes/javax/crypto/spec/HPKEParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/HPKEParameterSpec.java
new file mode 100644
index 00000000000..6776ddcdb75
--- /dev/null
+++ b/src/java.base/share/classes/javax/crypto/spec/HPKEParameterSpec.java
@@ -0,0 +1,443 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package javax.crypto.spec;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import java.nio.charset.StandardCharsets;
+import java.security.AsymmetricKey;
+import java.security.Key;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+import java.util.HexFormat;
+import java.util.Objects;
+
+/**
+ * This immutable class specifies the set of parameters used with a {@code Cipher} for the
+ * <a href="https://www.rfc-editor.org/info/rfc9180">Hybrid Public Key Encryption</a>
+ * (HPKE) algorithm. HPKE is a public key encryption scheme for encrypting
+ * arbitrary-sized plaintexts with a recipient's public key. It combines a key
+ * encapsulation mechanism (KEM), a key derivation function (KDF), and an
+ * authenticated encryption with additional data (AEAD) cipher.
+ * <p>
+ * The <a href="{@docRoot}/../specs/security/standard-names.html#cipher-algorithms">
+ * standard algorithm name</a> for the cipher is "HPKE". Unlike most other
+ * ciphers, HPKE is not expressed as a transformation string of the form
+ * "algorithm/mode/padding". Therefore, the argument to {@code Cipher.getInstance}
+ * must be the single algorithm name "HPKE".
+ * <p>
+ * In HPKE, the sender's {@code Cipher} is always initialized with the
+ * recipient's public key in {@linkplain Cipher#ENCRYPT_MODE encrypt mode},
+ * while the recipient's {@code Cipher} object is initialized with its own
+ * private key in {@linkplain Cipher#DECRYPT_MODE decrypt mode}.
+ * <p>
+ * An {@code HPKEParameterSpec} object must be provided at HPKE
+ * {@linkplain Cipher#init(int, Key, AlgorithmParameterSpec) cipher initialization}.
+ * <p>
+ * The {@link #of(int, int, int)} static method returns an {@code HPKEParameterSpec}
+ * object with the specified KEM, KDF, and AEAD algorithm identifiers.
+ * The terms "KEM algorithm identifiers", "KDF algorithm identifiers", and
+ * "AEAD algorithm identifiers" refer to their respective numeric values
+ * (specifically, {@code kem_id}, {@code kdf_id}, and {@code aead_id}) as
+ * defined in <a href="https://www.rfc-editor.org/rfc/rfc9180.html#section-7">Section 7</a>
+ * of RFC 9180 and maintained on the
+ * <a href="https://www.iana.org/assignments/hpke/hpke.xhtml">IANA HPKE page</a>.
+ * <p>
+ * Once an {@code HPKEParameterSpec} object is created, additional methods
+ * are available to generate new {@code HPKEParameterSpec} objects with
+ * different features:
+ * <ul>
+ * <li>
+ * Application-supplied information can be provided using the
+ * {@link #withInfo(byte[])} method by both sides.
+ * <li>
+ * To authenticate using a pre-shared key ({@code mode_psk}), the
+ * pre-shared key and its identifier must be provided using the
+ * {@link #withPsk(SecretKey, byte[])} method by both sides.
+ * <li>
+ * To authenticate using an asymmetric key ({@code mode_auth}),
+ * the asymmetric keys must be provided using the {@link #withAuthKey(AsymmetricKey)}
+ * method. Precisely, the sender must call this method with its own private key
+ * and the recipient must call it with the sender's public key.
+ * <li>
+ * To authenticate using both a PSK and an asymmetric key
+ * ({@code mode_auth_psk}), both {@link #withAuthKey(AsymmetricKey)} and
+ * {@link #withPsk(SecretKey, byte[])} methods must be called as described above.
+ * <li>
+ * In HPKE, a shared secret is negotiated during the KEM step and a key
+ * encapsulation message must be transmitted from the sender to the recipient
+ * so that the recipient can recover the shared secret. On the sender side,
+ * after the cipher is initialized, the key encapsulation message can be
+ * retrieved using the {@link Cipher#getIV()} method. On the recipient side,
+ * this message must be supplied as part of an {@code HPKEParameterSpec}
+ * object obtained from the {@link #withEncapsulation(byte[])} method.
+ * </ul>
+ * For successful interoperability, both sides need to have identical algorithm
+ * identifiers, and supply identical
+ * {@code info}, {@code psk}, and {@code psk_id} or matching authentication
+ * keys if provided. For details about HPKE modes, refer to
+ * <a href="https://www.rfc-editor.org/rfc/rfc9180.html#section-5">Section 5</a>
+ * of RFC 9180.
+ * <p>
+ * If an HPKE cipher is {@linkplain Cipher#init(int, Key) initialized without
+ * parameters}, an {@code InvalidKeyException} is thrown.
+ * <p>
+ * At HPKE cipher initialization, if no HPKE implementation supports the
+ * provided key type, an {@code InvalidKeyException} is thrown. If the provided
+ * {@code HPKEParameterSpec} is not accepted by any HPKE implementation,
+ * an {@code InvalidAlgorithmParameterException} is thrown. For example:
+ * <ul>
+ * <li> An algorithm identifier is unsupported or does not match the provided key type.
+ * <li> A key encapsulation message is provided on the sender side.
+ * <li> A key encapsulation message is not provided on the recipient side.
+ * <li> An attempt to use {@code withAuthKey(key)} is made with an incompatible key.
+ * <li> An attempt to use {@code withAuthKey(key)} is made but {@code mode_auth}
+ *      or {@code mode_auth_psk} is not supported by the KEM algorithm used.
+ * </ul>
+ * After initialization, both the sender and recipient can process multiple
+ * messages in sequence with repeated {@code doFinal} calls, optionally preceded
+ * by one or more {@code updateAAD} and {@code update}. Each {@code doFinal}
+ * performs a complete HPKE encryption or decryption operation using a distinct
+ * IV derived from an internal sequence counter, as specified in
+ * <a href="https://www.rfc-editor.org/rfc/rfc9180.html#section-5.2">Section 5.2</a>
+ * of RFC 9180. On the recipient side, each {@code doFinal} call must correspond
+ * to exactly one complete ciphertext, and the number and order of calls must
+ * match those on the sender side. This differs from the direct use of an AEAD
+ * cipher, where the caller must provide a fresh IV and reinitialize the cipher
+ * for each message. By managing IVs internally, HPKE allows a single
+ * initialization to support multiple messages while still ensuring IV
+ * uniqueness and preserving AEAD security guarantees.
+ * <p>
+ * This example shows a sender and a recipient using HPKE to securely exchange
+ * messages with an X25519 key pair.
+ * {@snippet lang=java class="PackageSnippets" region="hpke-spec-example"}
+ *
+ * @implNote This class defines constants for some of the standard algorithm
+ * identifiers such as {@link #KEM_DHKEM_P_256_HKDF_SHA256},
+ * {@link #KDF_HKDF_SHA256}, and {@link #AEAD_AES_128_GCM}. An HPKE {@code Cipher}
+ * implementation may support all, some, or none of the algorithm identifiers
+ * defined here. An implementation may also support additional identifiers not
+ * listed here, including private or experimental values.
+ *
+ * @spec https://www.rfc-editor.org/info/rfc9180
+ *      RFC 9180: Hybrid Public Key Encryption
+ * @spec security/standard-names.html
+ *      Java Security Standard Algorithm Names
+ * @since 26
+ */
+public final class HPKEParameterSpec implements AlgorithmParameterSpec {
+
+    /**
+     * KEM algorithm identifier for DHKEM(P-256, HKDF-SHA256) as defined in RFC 9180.
+     */
+    public static final int KEM_DHKEM_P_256_HKDF_SHA256 = 0x10;
+
+    /**
+     * KEM algorithm identifier for DHKEM(P-384, HKDF-SHA384) as defined in RFC 9180.
+     */
+    public static final int KEM_DHKEM_P_384_HKDF_SHA384 = 0x11;
+
+    /**
+     * KEM algorithm identifier for DHKEM(P-521, HKDF-SHA512) as defined in RFC 9180.
+     */
+    public static final int KEM_DHKEM_P_521_HKDF_SHA512 = 0x12;
+
+    /**
+     * KEM algorithm identifier for DHKEM(X25519, HKDF-SHA256) as defined in RFC 9180.
+     */
+    public static final int KEM_DHKEM_X25519_HKDF_SHA256 = 0x20;
+
+    /**
+     * KEM algorithm identifier for DHKEM(X448, HKDF-SHA512) as defined in RFC 9180.
+     */
+    public static final int KEM_DHKEM_X448_HKDF_SHA512 = 0x21;
+
+    /**
+     * KDF algorithm identifier for HKDF-SHA256 as defined in RFC 9180.
+     */
+    public static final int KDF_HKDF_SHA256 = 0x1;
+
+    /**
+     * KDF algorithm identifier for HKDF-SHA384 as defined in RFC 9180.
+     */
+    public static final int KDF_HKDF_SHA384 = 0x2;
+
+    /**
+     * KDF algorithm identifier for HKDF-SHA512 as defined in RFC 9180.
+     */
+    public static final int KDF_HKDF_SHA512 = 0x3;
+
+    /**
+     * AEAD algorithm identifier for AES-128-GCM as defined in RFC 9180.
+     */
+    public static final int AEAD_AES_128_GCM = 0x1;
+
+    /**
+     * AEAD algorithm identifier for AES-256-GCM as defined in RFC 9180.
+     */
+    public static final int AEAD_AES_256_GCM = 0x2;
+
+    /**
+     * AEAD algorithm identifier for ChaCha20Poly1305 as defined in RFC 9180.
+     */
+    public static final int AEAD_CHACHA20_POLY1305 = 0x3;
+
+    /**
+     * AEAD algorithm identifier for Export-only as defined in RFC 9180.
+     */
+    public static final int EXPORT_ONLY = 0xffff;
+
+    private final int kem_id;
+    private final int kdf_id;
+    private final int aead_id;
+    private final byte[] info; // never null, can be empty
+    private final SecretKey psk; // null if not used
+    private final byte[] psk_id; // never null, can be empty
+    private final AsymmetricKey kS; // null if not used
+    private final byte[] encapsulation; // null if none
+
+    // Note: this constructor does not clone array arguments.
+    private HPKEParameterSpec(int kem_id, int kdf_id, int aead_id, byte[] info,
+            SecretKey psk, byte[] psk_id, AsymmetricKey kS, byte[] encapsulation) {
+        this.kem_id = kem_id;
+        this.kdf_id = kdf_id;
+        this.aead_id = aead_id;
+        this.info = info;
+        this.psk = psk;
+        this.psk_id = psk_id;
+        this.kS = kS;
+        this.encapsulation = encapsulation;
+    }
+
+    /**
+     * A factory method to create a new {@code HPKEParameterSpec} object with
+     * specified KEM, KDF, and AEAD algorithm identifiers in {@code mode_base}
+     * mode with an empty {@code info}.
+     *
+     * @param kem_id algorithm identifier for KEM, must be between 0 and 65535 (inclusive)
+     * @param kdf_id algorithm identifier for KDF, must be between 0 and 65535 (inclusive)
+     * @param aead_id algorithm identifier for AEAD, must be between 0 and 65535 (inclusive)
+     * @return a new {@code HPKEParameterSpec} object
+     * @throws IllegalArgumentException if any input value
+     *      is out of range (must be between 0 and 65535, inclusive).
+     */
+    public static HPKEParameterSpec of(int kem_id, int kdf_id, int aead_id) {
+        if (kem_id < 0 || kem_id > 65535) {
+            throw new IllegalArgumentException("Invalid kem_id: " + kem_id);
+        }
+        if (kdf_id < 0 || kdf_id > 65535) {
+            throw new IllegalArgumentException("Invalid kdf_id: " + kdf_id);
+        }
+        if (aead_id < 0 || aead_id > 65535) {
+            throw new IllegalArgumentException("Invalid aead_id: " + aead_id);
+        }
+        return new HPKEParameterSpec(kem_id, kdf_id, aead_id,
+                new byte[0], null, new byte[0], null, null);
+    }
+
+    /**
+     * Creates a new {@code HPKEParameterSpec} object with the specified
+     * {@code info} value.
+     * <p>
+     * For interoperability, RFC 9180 Section 7.2.1 recommends limiting
+     * this value to a maximum of 64 bytes.
+     *
+     * @param info application-supplied information.
+     *      The contents of the array are copied to protect
+     *      against subsequent modification.
+     * @return a new {@code HPKEParameterSpec} object
+     * @throws NullPointerException if {@code info} is {@code null}
+     * @throws IllegalArgumentException if {@code info} is empty.
+     */
+    public HPKEParameterSpec withInfo(byte[] info) {
+        Objects.requireNonNull(info);
+        if (info.length == 0) {
+            throw new IllegalArgumentException("info is empty");
+        }
+        return new HPKEParameterSpec(kem_id, kdf_id, aead_id,
+                info.clone(), psk, psk_id, kS, encapsulation);
+    }
+
+    /**
+     * Creates a new {@code HPKEParameterSpec} object with the specified
+     * {@code psk} and {@code psk_id} values.
+     * <p>
+     * RFC 9180 Section 5.1.2 requires the PSK MUST have at least 32 bytes
+     * of entropy. For interoperability, RFC 9180 Section 7.2.1 recommends
+     * limiting the key size and identifier length to a maximum of 64 bytes.
+     *
+     * @param psk pre-shared key
+     * @param psk_id identifier for PSK. The contents of the array are copied
+     *               to protect against subsequent modification.
+     * @return a new {@code HPKEParameterSpec} object
+     * @throws NullPointerException if {@code psk} or {@code psk_id} is {@code null}
+     * @throws IllegalArgumentException if {@code psk} is shorter than 32 bytes
+     *                                  or {@code psk_id} is empty
+     */
+    public HPKEParameterSpec withPsk(SecretKey psk, byte[] psk_id) {
+        Objects.requireNonNull(psk);
+        Objects.requireNonNull(psk_id);
+        if (psk_id.length == 0) {
+            throw new IllegalArgumentException("psk_id is empty");
+        }
+        if ("RAW".equalsIgnoreCase(psk.getFormat())) {
+            // We can only check when psk is extractable. We can only
+            // check the length and not the real entropy size
+            var keyBytes = psk.getEncoded();
+            assert keyBytes != null;
+            Arrays.fill(keyBytes, (byte)0);
+            if (keyBytes.length < 32) {
+                throw new IllegalArgumentException("psk is too short");
+            }
+        }
+        return new HPKEParameterSpec(kem_id, kdf_id, aead_id,
+                info, psk, psk_id.clone(), kS, encapsulation);
+    }
+
+    /**
+     * Creates a new {@code HPKEParameterSpec} object with the specified
+     * key encapsulation message value that will be used by the recipient.
+     *
+     * @param encapsulation the key encapsulation message.
+     *      The contents of the array are copied to protect against
+     *      subsequent modification.
+     *
+     * @return a new {@code HPKEParameterSpec} object
+     * @throws NullPointerException if {@code encapsulation} is {@code null}
+     */
+    public HPKEParameterSpec withEncapsulation(byte[] encapsulation) {
+        return new HPKEParameterSpec(kem_id, kdf_id, aead_id,
+                info, psk, psk_id, kS,
+                Objects.requireNonNull(encapsulation).clone());
+    }
+
+    /**
+     * Creates a new {@code HPKEParameterSpec} object with the specified
+     * authentication key value.
+     * <p>
+     * Note: this method does not check whether the KEM algorithm supports
+     * {@code mode_auth} or {@code mode_auth_psk}. If the resulting object is
+     * used to initialize an HPKE cipher with an unsupported mode, an
+     * {@code InvalidAlgorithmParameterException} will be thrown at that time.
+     *
+     * @param kS the authentication key
+     * @return a new {@code HPKEParameterSpec} object
+     * @throws NullPointerException if {@code kS} is {@code null}
+     */
+    public HPKEParameterSpec withAuthKey(AsymmetricKey kS) {
+        return new HPKEParameterSpec(kem_id, kdf_id, aead_id,
+                info, psk, psk_id,
+                Objects.requireNonNull(kS),
+                encapsulation);
+    }
+
+    /**
+     * {@return the algorithm identifier for KEM }
+     */
+    public int kem_id() {
+        return kem_id;
+    }
+
+    /**
+     * {@return the algorithm identifier for KDF }
+     */
+    public int kdf_id() {
+        return kdf_id;
+    }
+
+    /**
+     * {@return the algorithm identifier for AEAD }
+     */
+    public int aead_id() {
+        return aead_id;
+    }
+
+    /**
+     * {@return a copy of the application-supplied information, empty if none}
+     */
+    public byte[] info() {
+        return info.clone();
+    }
+
+    /**
+     * {@return pre-shared key, {@code null} if none}
+     */
+    public SecretKey psk() {
+        return psk;
+    }
+
+    /**
+     * {@return a copy of the identifier for PSK, empty if none}
+     */
+    public byte[] psk_id() {
+        return psk_id.clone();
+    }
+
+    /**
+     * {@return the key for authentication, {@code null} if none}
+     */
+    public AsymmetricKey authKey() {
+        return kS;
+    }
+
+    /**
+     * {@return a copy of the key encapsulation message, {@code null} if none}
+     */
+    public byte[] encapsulation() {
+        return encapsulation == null ? null : encapsulation.clone();
+    }
+
+    @Override
+    public String toString() {
+        return "HPKEParameterSpec{" +
+                "kem_id=" + kem_id +
+                ", kdf_id=" + kdf_id +
+                ", aead_id=" + aead_id +
+                ", info=" + bytesToString(info) +
+                ", " + (psk == null
+                        ? (kS == null ? "mode_base" : "mode_auth")
+                        : (kS == null ? "mode_psk" : "mode_auth_psk")) + "}";
+    }
+
+    // Returns a human-readable representation of a byte array.
+    private static String bytesToString(byte[] input) {
+        if (input.length == 0) {
+            return "(empty)";
+        } else {
+            for (byte b : input) {
+                if (b < 0x20 || b > 0x7E || b == '"') {
+                    // Non-ASCII or control characters are hard to read, and
+                    // `"` requires character escaping. If any of these are
+                    // present, return only the HEX representation.
+                    return HexFormat.of().formatHex(input);
+                }
+            }
+            // Otherwise, all characters are printable and safe.
+            // Return both HEX and ASCII representations.
+            return HexFormat.of().formatHex(input)
+                    + " (\"" + new String(input, StandardCharsets.US_ASCII) + "\")";
+        }
+    }
+}
diff --git a/src/java.base/share/classes/javax/crypto/spec/snippet-files/PackageSnippets.java b/src/java.base/share/classes/javax/crypto/spec/snippet-files/PackageSnippets.java
new file mode 100644
index 00000000000..e4074c1c4a9
--- /dev/null
+++ b/src/java.base/share/classes/javax/crypto/spec/snippet-files/PackageSnippets.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import javax.crypto.Cipher;
+import javax.crypto.spec.HPKEParameterSpec;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.util.Arrays;
+import java.util.HexFormat;
+
+class PackageSnippets {
+    public static void main(String[] args) throws Exception {
+
+        // @start region="hpke-spec-example"
+        // Recipient key pair generation
+        KeyPairGenerator g = KeyPairGenerator.getInstance("X25519");
+        KeyPair kp = g.generateKeyPair();
+
+        // The HPKE sender cipher is initialized with the recipient's public
+        // key and an HPKEParameterSpec using specified algorithm identifiers
+        // and application-supplied info.
+        Cipher senderCipher = Cipher.getInstance("HPKE");
+        HPKEParameterSpec ps = HPKEParameterSpec.of(
+                        HPKEParameterSpec.KEM_DHKEM_X25519_HKDF_SHA256,
+                        HPKEParameterSpec.KDF_HKDF_SHA256,
+                        HPKEParameterSpec.AEAD_AES_128_GCM)
+                .withInfo(HexFormat.of().parseHex("010203040506"));
+        senderCipher.init(Cipher.ENCRYPT_MODE, kp.getPublic(), ps);
+
+        // Retrieve the key encapsulation message (from the KEM step) from
+        // the sender.
+        byte[] kemEncap = senderCipher.getIV();
+
+        // The HPKE recipient cipher is initialized with its own private key,
+        // an HPKEParameterSpec using the same algorithm identifiers as used by
+        // the sender, and the key encapsulation message from the sender.
+        Cipher recipientCipher = Cipher.getInstance("HPKE");
+        HPKEParameterSpec pr = HPKEParameterSpec.of(
+                        HPKEParameterSpec.KEM_DHKEM_X25519_HKDF_SHA256,
+                        HPKEParameterSpec.KDF_HKDF_SHA256,
+                        HPKEParameterSpec.AEAD_AES_128_GCM)
+                .withInfo(HexFormat.of().parseHex("010203040506"))
+                .withEncapsulation(kemEncap);
+        recipientCipher.init(Cipher.DECRYPT_MODE, kp.getPrivate(), pr);
+
+        // Encryption and decryption
+        byte[] msg = "Hello World".getBytes(StandardCharsets.UTF_8);
+        byte[] ct = senderCipher.doFinal(msg);
+        byte[] pt = recipientCipher.doFinal(ct);
+
+        assert Arrays.equals(msg, pt);
+        // @end
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/util/SliceableSecretKey.java b/src/java.base/share/classes/sun/security/util/SliceableSecretKey.java
new file mode 100644
index 00000000000..4dc3fe0a3e8
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/SliceableSecretKey.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sun.security.util;
+
+import javax.crypto.SecretKey;
+
+/**
+ * An interface for <code>SecretKey</code>s that support using its slice as a new
+ * <code>SecretKey</code>.
+ * <p>
+ * This is mainly used by PKCS #11 implementations that support the
+ * EXTRACT_KEY_FROM_KEY mechanism even if the key itself is sensitive
+ * and non-extractable.
+ */
+public interface SliceableSecretKey {
+
+    /**
+     * Returns a slice as a new <code>SecretKey</code>.
+     *
+     * @param alg the new algorithm name
+     * @param from the byte offset of the new key in the full key
+     * @param to the to offset (exclusive) of the new key in the full key
+     * @return the new key
+     * @throws ArrayIndexOutOfBoundsException for improper <code>from</code>
+     *      and <code>to</code> values
+     * @throws UnsupportedOperationException if slicing is not supported
+     */
+    SecretKey slice(String alg, int from, int to);
+}
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/HPKE/Compliance.java b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/Compliance.java
new file mode 100644
index 00000000000..2e10bb23e82
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/Compliance.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.Asserts;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.HPKEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.NamedParameterSpec;
+
+import static javax.crypto.spec.HPKEParameterSpec.AEAD_AES_256_GCM;
+import static javax.crypto.spec.HPKEParameterSpec.KDF_HKDF_SHA256;
+import static javax.crypto.spec.HPKEParameterSpec.KEM_DHKEM_X25519_HKDF_SHA256;
+
+/*
+ * @test
+ * @bug 8325448
+ * @library /test/lib
+ * @summary HPKE compliance test
+ */
+public class Compliance {
+    public static void main(String[] args) throws Exception {
+
+        var kp = KeyPairGenerator.getInstance("X25519").generateKeyPair();
+        var info = "info".getBytes(StandardCharsets.UTF_8);
+        var psk = new SecretKeySpec(new byte[32], "ONE");
+        var shortKey = new SecretKeySpec(new byte[31], "ONE");
+        var psk_id = "psk_id".getBytes(StandardCharsets.UTF_8);
+        var emptyKey = new SecretKey() {
+            public String getAlgorithm() { return "GENERIC"; }
+            public String getFormat() { return "RAW"; }
+            public byte[] getEncoded() { return new byte[0]; }
+        };
+
+        // HPKEParameterSpec
+
+        // A typical spec
+        var spec = HPKEParameterSpec.of(
+                KEM_DHKEM_X25519_HKDF_SHA256,
+                KDF_HKDF_SHA256,
+                AEAD_AES_256_GCM);
+        Asserts.assertEQ(spec.kem_id(), KEM_DHKEM_X25519_HKDF_SHA256);
+        Asserts.assertEQ(spec.kdf_id(), KDF_HKDF_SHA256);
+        Asserts.assertEQ(spec.aead_id(), AEAD_AES_256_GCM);
+        Asserts.assertEQ(spec.authKey(), null);
+        Asserts.assertEQ(spec.encapsulation(), null);
+        Asserts.assertEqualsByteArray(spec.info(), new byte[0]);
+        Asserts.assertEQ(spec.psk(), null);
+        Asserts.assertEqualsByteArray(spec.psk_id(), new byte[0]);
+
+        // A fake spec but still valid
+        var specZero = HPKEParameterSpec.of(0, 0, 0);
+        Asserts.assertEQ(specZero.kem_id(), 0);
+        Asserts.assertEQ(specZero.kdf_id(), 0);
+        Asserts.assertEQ(specZero.aead_id(), 0);
+        Asserts.assertEQ(specZero.authKey(), null);
+        Asserts.assertEQ(specZero.encapsulation(), null);
+        Asserts.assertEqualsByteArray(specZero.info(), new byte[0]);
+        Asserts.assertEQ(specZero.psk(), null);
+        Asserts.assertEqualsByteArray(specZero.psk_id(), new byte[0]);
+
+        // identifiers
+        HPKEParameterSpec.of(65535, 65535, 65535);
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> HPKEParameterSpec.of(-1, 0, 0));
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> HPKEParameterSpec.of(0, -1, 0));
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> HPKEParameterSpec.of(0, 0, -1));
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> HPKEParameterSpec.of(65536, 0, 0));
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> HPKEParameterSpec.of(0, 65536, 0));
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> HPKEParameterSpec.of(0, 0, 65536));
+
+        // auth key
+        Asserts.assertTrue(spec.withAuthKey(kp.getPrivate()).authKey() != null);
+        Asserts.assertTrue(spec.withAuthKey(kp.getPublic()).authKey() != null);
+        Asserts.assertThrows(NullPointerException.class, () -> spec.withAuthKey(null));
+
+        // info
+        Asserts.assertEqualsByteArray(spec.withInfo(info).info(), info);
+        Asserts.assertThrows(NullPointerException.class, () -> spec.withInfo(null));
+        Asserts.assertThrows(IllegalArgumentException.class, () -> spec.withInfo(new byte[0]));
+
+        // encapsulation
+        Asserts.assertEqualsByteArray(spec.withEncapsulation(info).encapsulation(), info);
+        Asserts.assertThrows(NullPointerException.class, () -> spec.withEncapsulation(null));
+        Asserts.assertTrue(spec.withEncapsulation(new byte[0]).encapsulation().length == 0); // not emptiness check (yet)
+
+        // psk_id and psk
+        Asserts.assertEqualsByteArray(spec.withPsk(psk, psk_id).psk().getEncoded(), psk.getEncoded());
+        Asserts.assertEqualsByteArray(spec.withPsk(psk, psk_id).psk_id(), psk_id);
+        Asserts.assertThrows(NullPointerException.class, () -> spec.withPsk(psk, null));
+        Asserts.assertThrows(NullPointerException.class, () -> spec.withPsk(null, psk_id));
+        Asserts.assertThrows(NullPointerException.class, () -> spec.withPsk(null, null));
+        Asserts.assertThrows(IllegalArgumentException.class, () -> spec.withPsk(psk, new byte[0]));
+        Asserts.assertThrows(IllegalArgumentException.class, () -> spec.withPsk(emptyKey, psk_id));
+        Asserts.assertThrows(IllegalArgumentException.class, () -> spec.withPsk(shortKey, psk_id));
+
+        // toString
+        Asserts.assertTrue(spec.toString().contains("kem_id=32, kdf_id=1, aead_id=2"));
+        Asserts.assertTrue(spec.toString().contains("info=(empty),"));
+        Asserts.assertTrue(spec.withInfo(new byte[3]).toString().contains("info=000000,"));
+        Asserts.assertTrue(spec.withInfo("info".getBytes(StandardCharsets.UTF_8))
+                .toString().contains("info=696e666f (\"info\"),"));
+        Asserts.assertTrue(spec.withInfo("\"info\"".getBytes(StandardCharsets.UTF_8))
+                .toString().contains("info=22696e666f22,"));
+        Asserts.assertTrue(spec.withInfo("'info'".getBytes(StandardCharsets.UTF_8))
+                .toString().contains("info=27696e666f27 (\"'info'\"),"));
+        Asserts.assertTrue(spec.withInfo("i\\n\\f\\o".getBytes(StandardCharsets.UTF_8))
+                .toString().contains("info=695c6e5c665c6f (\"i\\n\\f\\o\"),"));
+        Asserts.assertTrue(spec.toString().contains("mode_base}"));
+        Asserts.assertTrue(spec.withPsk(psk, psk_id).toString().contains("mode_psk}"));
+        Asserts.assertTrue(spec.withAuthKey(kp.getPrivate()).toString().contains("mode_auth}"));
+        Asserts.assertTrue(spec.withAuthKey(kp.getPrivate()).withPsk(psk, psk_id).toString().contains("mode_auth_psk}"));
+
+        var c1 = Cipher.getInstance("HPKE");
+
+        Asserts.assertThrows(NoSuchAlgorithmException.class, () -> Cipher.getInstance("HPKE/None/NoPadding"));
+
+        // Still at BEGIN, not initialized
+        Asserts.assertEQ(c1.getIV(), null);
+        Asserts.assertEQ(c1.getParameters(), null);
+        Asserts.assertEquals(0, c1.getBlockSize());
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.getOutputSize(100));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.update(new byte[1]));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.update(new byte[1], 0, 1));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.updateAAD(new byte[1]));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.updateAAD(new byte[1], 0, 1));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.doFinal());
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.doFinal(new byte[1]));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.doFinal(new byte[1], 0, 1));
+        Asserts.assertThrows(IllegalStateException.class, () -> c1.doFinal(new byte[1], 0, 1, new byte[1024], 0));
+
+        c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(), spec);
+        var encap = c1.getIV();
+
+        // Does not support WRAP and UNWRAP mode
+        Asserts.assertThrows(UnsupportedOperationException.class,
+                () -> c1.init(Cipher.WRAP_MODE, kp.getPublic(), spec));
+        Asserts.assertThrows(UnsupportedOperationException.class,
+                () -> c1.init(Cipher.UNWRAP_MODE, kp.getPublic(), spec));
+
+        // Nulls
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, null, spec));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(), (HPKEParameterSpec) null));
+
+        // Cannot init sender with private key
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPrivate(), spec));
+
+        // Cannot provide key encap msg to sender
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        spec.withEncapsulation(encap)));
+
+        // Cannot init without HPKEParameterSpec
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic()));
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> c1.init(Cipher.DECRYPT_MODE, kp.getPrivate()));
+
+        // Cannot init with a spec not HPKEParameterSpec
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        NamedParameterSpec.X25519));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.DECRYPT_MODE, kp.getPrivate(),
+                        NamedParameterSpec.X25519));
+
+        // Cannot init recipient with public key
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> c1.init(Cipher.DECRYPT_MODE, kp.getPublic(),
+                        spec.withEncapsulation(new byte[32])));
+        // Cannot provide key encap msg to sender
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(), spec.withEncapsulation(encap)));
+        // Must provide key encap msg to recipient
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.DECRYPT_MODE, kp.getPrivate(), spec));
+
+        // Unsupported identifiers
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        HPKEParameterSpec.of(0, KDF_HKDF_SHA256, AEAD_AES_256_GCM)));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        HPKEParameterSpec.of(0x200, KDF_HKDF_SHA256, AEAD_AES_256_GCM)));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        HPKEParameterSpec.of(KEM_DHKEM_X25519_HKDF_SHA256, 4, AEAD_AES_256_GCM)));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        HPKEParameterSpec.of(KEM_DHKEM_X25519_HKDF_SHA256, KDF_HKDF_SHA256, 4)));
+
+        // HPKE
+        checkEncryptDecrypt(kp, spec, spec);
+
+        // extra features
+        var kp2 = KeyPairGenerator.getInstance("X25519").generateKeyPair();
+        checkEncryptDecrypt(kp,
+                spec.withInfo(info),
+                spec.withInfo(info));
+        checkEncryptDecrypt(kp,
+                spec.withPsk(psk, psk_id),
+                spec.withPsk(psk, psk_id));
+        checkEncryptDecrypt(kp,
+                spec.withAuthKey(kp2.getPrivate()),
+                spec.withAuthKey(kp2.getPublic()));
+        checkEncryptDecrypt(kp,
+                spec.withInfo(info).withPsk(psk, psk_id).withAuthKey(kp2.getPrivate()),
+                spec.withInfo(info).withPsk(psk, psk_id).withAuthKey(kp2.getPublic()));
+
+        // wrong keys
+        var kpRSA = KeyPairGenerator.getInstance("RSA").generateKeyPair();
+        var kpEC = KeyPairGenerator.getInstance("EC").generateKeyPair();
+
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kpRSA.getPublic(), spec));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kpEC.getPublic(), spec));
+
+        // mod_auth, wrong key type
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        spec.withAuthKey(kp2.getPublic())));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.DECRYPT_MODE, kp.getPrivate(),
+                        spec.withAuthKey(kp2.getPrivate())));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        spec.withAuthKey(kpRSA.getPrivate())));
+        Asserts.assertThrows(InvalidAlgorithmParameterException.class,
+                () -> c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(),
+                        spec.withAuthKey(kpEC.getPrivate())));
+    }
+
+    static void checkEncryptDecrypt(KeyPair kp, HPKEParameterSpec ps,
+            HPKEParameterSpec pr) throws Exception {
+
+        var c1 = Cipher.getInstance("HPKE");
+        var c2 = Cipher.getInstance("HPKE");
+        var aad = "AAD".getBytes(StandardCharsets.UTF_8);
+
+        c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(), ps);
+        Asserts.assertEquals(16, c1.getBlockSize());
+        Asserts.assertEquals(116, c1.getOutputSize(100));
+        c1.updateAAD(aad);
+        var ct = c1.doFinal(new byte[2]);
+
+        c2.init(Cipher.DECRYPT_MODE, kp.getPrivate(),
+                pr.withEncapsulation(c1.getIV()));
+        Asserts.assertEquals(16, c2.getBlockSize());
+        Asserts.assertEquals(84, c2.getOutputSize(100));
+        c2.updateAAD(aad);
+        Asserts.assertEqualsByteArray(c2.doFinal(ct), new byte[2]);
+    }
+}
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/HPKE/Functions.java b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/Functions.java
new file mode 100644
index 00000000000..9ebf4ce5c09
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/Functions.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.Asserts;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.HPKEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.spec.ECGenParameterSpec;
+import java.util.List;
+
+import static javax.crypto.spec.HPKEParameterSpec.AEAD_AES_128_GCM;
+import static javax.crypto.spec.HPKEParameterSpec.AEAD_AES_256_GCM;
+import static javax.crypto.spec.HPKEParameterSpec.AEAD_CHACHA20_POLY1305;
+import static javax.crypto.spec.HPKEParameterSpec.KDF_HKDF_SHA256;
+import static javax.crypto.spec.HPKEParameterSpec.KDF_HKDF_SHA384;
+import static javax.crypto.spec.HPKEParameterSpec.KDF_HKDF_SHA512;
+import static javax.crypto.spec.HPKEParameterSpec.KEM_DHKEM_P_256_HKDF_SHA256;
+import static javax.crypto.spec.HPKEParameterSpec.KEM_DHKEM_P_384_HKDF_SHA384;
+import static javax.crypto.spec.HPKEParameterSpec.KEM_DHKEM_P_521_HKDF_SHA512;
+import static javax.crypto.spec.HPKEParameterSpec.KEM_DHKEM_X25519_HKDF_SHA256;
+import static javax.crypto.spec.HPKEParameterSpec.KEM_DHKEM_X448_HKDF_SHA512;
+
+/*
+ * @test
+ * @bug 8325448
+ * @library /test/lib
+ * @summary HPKE running with different keys
+ */
+public class Functions {
+
+    record Params(String name, int kem) {}
+    static List<Params> PARAMS = List.of(
+            new Params("secp256r1", KEM_DHKEM_P_256_HKDF_SHA256),
+            new Params("secp384r1", KEM_DHKEM_P_384_HKDF_SHA384),
+            new Params("secp521r1", KEM_DHKEM_P_521_HKDF_SHA512),
+            new Params("X25519", KEM_DHKEM_X25519_HKDF_SHA256),
+            new Params("X448", KEM_DHKEM_X448_HKDF_SHA512)
+    );
+
+    public static void main(String[] args) throws Exception {
+
+        var msg = "hello".getBytes(StandardCharsets.UTF_8);
+        var msg2 = "goodbye".getBytes(StandardCharsets.UTF_8);
+        var info = "info".getBytes(StandardCharsets.UTF_8);
+        var psk = new SecretKeySpec("K".repeat(32).getBytes(StandardCharsets.UTF_8), "Generic");
+        var psk_id = "psk1".getBytes(StandardCharsets.UTF_8);
+
+        for (var param : PARAMS) {
+            var c1 = Cipher.getInstance("HPKE");
+            var c2 = Cipher.getInstance("HPKE");
+            var kp = genKeyPair(param.name());
+            var kp2 = genKeyPair(param.name());
+            for (var kdf : List.of(KDF_HKDF_SHA256, KDF_HKDF_SHA384, KDF_HKDF_SHA512)) {
+                for (var aead : List.of(AEAD_AES_256_GCM, AEAD_AES_128_GCM, AEAD_CHACHA20_POLY1305)) {
+
+                    var params = HPKEParameterSpec.of(param.kem, kdf, aead);
+                    System.out.println(params);
+
+                    c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(), params);
+                    c2.init(Cipher.DECRYPT_MODE, kp.getPrivate(), params.withEncapsulation(c1.getIV()));
+                    Asserts.assertEqualsByteArray(msg, c2.doFinal(c1.doFinal(msg)));
+                    Asserts.assertEqualsByteArray(msg2, c2.doFinal(c1.doFinal(msg2)));
+
+                    c1.init(Cipher.ENCRYPT_MODE, kp.getPublic(), params
+                            .withAuthKey(kp2.getPrivate())
+                            .withInfo(info)
+                            .withPsk(psk, psk_id));
+                    c2.init(Cipher.DECRYPT_MODE, kp.getPrivate(), params
+                            .withAuthKey(kp2.getPublic())
+                            .withInfo(info)
+                            .withPsk(psk, psk_id)
+                            .withEncapsulation(c1.getIV()));
+                    Asserts.assertEqualsByteArray(msg, c2.doFinal(c1.doFinal(msg)));
+                    Asserts.assertEqualsByteArray(msg2, c2.doFinal(c1.doFinal(msg2)));
+                }
+            }
+        }
+    }
+
+    static KeyPair genKeyPair(String name) throws Exception {
+        if (name.startsWith("secp")) {
+            var g = KeyPairGenerator.getInstance("EC");
+            g.initialize(new ECGenParameterSpec(name));
+            return g.generateKeyPair();
+        } else {
+            return KeyPairGenerator.getInstance(name).generateKeyPair();
+        }
+    }
+}
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
new file mode 100644
index 00000000000..f4717f57883
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8325448
+ * @summary KAT inside RFC 9180
+ * @library /test/lib
+ * @modules java.base/com.sun.crypto.provider
+ */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.artifacts.Artifact;
+import jdk.test.lib.artifacts.ArtifactResolver;
+import jdk.test.lib.json.JSONValue;
+
+import com.sun.crypto.provider.DHKEM;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.HPKEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HexFormat;
+
+/// This test is based on Appendix A (Test Vectors) of
+/// [RFC 9180](https://datatracker.ietf.org/doc/html/rfc9180#name-test-vectors)
+/// The test data is available as a JSON file at:
+/// https://github.com/cfrg/draft-irtf-cfrg-hpke/blob/5f503c564da00b0687b3de75f1dfbdfc4079ad31/test-vectors.json.
+///
+/// The JSON file can either be hosted on an artifactory server or
+/// provided via a local path with
+/// ```
+/// jtreg -Djdk.test.lib.artifacts.rfc9180-test-vectors=<local-json-file> KAT9180.java
+/// ```
+public class KAT9180 {
+
+    @Artifact(
+            organization = "jpg.tests.jdk.ietf",
+            name = "rfc9180-test-vectors",
+            revision = "5f503c5",
+            extension = "json",
+            unpack = false)
+    private static class RFC_9180_KAT {
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        var h = HexFormat.of();
+        Path archivePath = ArtifactResolver.fetchOne(RFC_9180_KAT.class);
+        System.out.println("Data path: " + archivePath);
+        var c1 = Cipher.getInstance("HPKE");
+        var c2 = Cipher.getInstance("HPKE");
+        var ts = JSONValue.parse(new String(Files.readAllBytes(archivePath), StandardCharsets.UTF_8));
+        for (var tg : ts.asArray()) {
+            var mode = Integer.parseInt(tg.get("mode").asString());
+            System.err.print('I');
+            var kem_id = Integer.parseInt(tg.get("kem_id").asString());
+            var kdf_id = Integer.parseInt(tg.get("kdf_id").asString());
+            var aead_id = Integer.parseInt(tg.get("aead_id").asString());
+            var ikmR = h.parseHex(tg.get("ikmR").asString());
+            var ikmE = h.parseHex(tg.get("ikmE").asString());
+            var info = h.parseHex(tg.get("info").asString());
+
+            var kpR = new DHKEM.RFC9180DeriveKeyPairSR(ikmR).derive(kem_id);
+            var spec = HPKEParameterSpec.of(kem_id, kdf_id, aead_id).withInfo(info);
+            var rand = new DHKEM.RFC9180DeriveKeyPairSR(ikmE);
+
+            if (mode == 1 || mode == 3) {
+                spec = spec.withPsk(
+                        new SecretKeySpec(h.parseHex(tg.get("psk").asString()), "Generic"),
+                        h.parseHex(tg.get("psk_id").asString()));
+            }
+            if (mode == 0 || mode == 1) {
+                c1.init(Cipher.ENCRYPT_MODE, kpR.getPublic(), spec, rand);
+                c2.init(Cipher.DECRYPT_MODE, kpR.getPrivate(),
+                        spec.withEncapsulation(c1.getIV()));
+            } else {
+                var ikmS = h.parseHex(tg.get("ikmS").asString());
+                var kpS = new DHKEM.RFC9180DeriveKeyPairSR(ikmS).derive(kem_id);
+                c1.init(Cipher.ENCRYPT_MODE, kpR.getPublic(),
+                        spec.withAuthKey(kpS.getPrivate()), rand);
+                c2.init(Cipher.DECRYPT_MODE, kpR.getPrivate(),
+                        spec.withEncapsulation(c1.getIV()).withAuthKey(kpS.getPublic()));
+            }
+            var enc = tg.get("encryptions");
+            if (enc != null) {
+                System.err.print('e');
+                var count = 0;
+                for (var p : enc.asArray()) {
+                    var aad = h.parseHex(p.get("aad").asString());
+                    var pt = h.parseHex(p.get("pt").asString());
+                    var ct = h.parseHex(p.get("ct").asString());
+                    c1.updateAAD(aad);
+                    var ct1 = c1.doFinal(pt);
+                    Asserts.assertEqualsByteArray(ct, ct1);
+                    c2.updateAAD(aad);
+                    var pt1 = c2.doFinal(ct);
+                    Asserts.assertEqualsByteArray(pt, pt1);
+                    count++;
+                }
+                System.err.print(count);
+            }
+        }
+    }
+}
diff --git a/test/jdk/com/sun/crypto/provider/DHKEM/Compliance.java b/test/jdk/com/sun/crypto/provider/DHKEM/Compliance.java
index 22c5c89b57b..d8814513b12 100644
--- a/test/jdk/com/sun/crypto/provider/DHKEM/Compliance.java
+++ b/test/jdk/com/sun/crypto/provider/DHKEM/Compliance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @run main/othervm Compliance
  */
 import jdk.test.lib.Asserts;
-import jdk.test.lib.Utils;
 
 import javax.crypto.DecapsulateException;
 import javax.crypto.KEM;
@@ -41,9 +40,7 @@ import java.security.*;
 import java.security.interfaces.ECPublicKey;
 import java.security.spec.*;
 import java.util.Arrays;
-import java.util.Objects;
 import java.util.Random;
-import java.util.function.Consumer;
 
 import com.sun.crypto.provider.DHKEM;
 
@@ -66,12 +63,10 @@ public class Compliance {
     private static void conform() {
         new KEM.Encapsulated(new SecretKeySpec(new byte[1], "X"), new byte[0], new byte[0]);
         new KEM.Encapsulated(new SecretKeySpec(new byte[1], "X"), new byte[0], null);
-        Utils.runAndCheckException(
-                () -> new KEM.Encapsulated(null, new byte[0], null),
-                NullPointerException.class);
-        Utils.runAndCheckException(
-                () -> new KEM.Encapsulated(new SecretKeySpec(new byte[1], "X"), null, null),
-                NullPointerException.class);
+        Asserts.assertThrows(NullPointerException.class,
+                () -> new KEM.Encapsulated(null, new byte[0], null));
+        Asserts.assertThrows(NullPointerException.class,
+                () -> new KEM.Encapsulated(new SecretKeySpec(new byte[1], "X"), null, null));
     }
 
     // basic should and shouldn't behaviors
@@ -86,37 +81,33 @@ public class Compliance {
         KEM.getInstance("DHKEM", (String) null);
         KEM.getInstance("DHKEM", (Provider) null);
         KEM kem = KEM.getInstance("DHKEM");
-        Utils.runAndCheckException(
-                () -> KEM.getInstance("OLALA"),
-                NoSuchAlgorithmException.class);
-        Utils.runAndCheckException(
-                () -> KEM.getInstance("DHKEM", "NoWhere"),
-                NoSuchProviderException.class);
-        Utils.runAndCheckException(
-                () -> KEM.getInstance("DHKEM", "SunRsaSign"),
-                NoSuchAlgorithmException.class);
+        Asserts.assertThrows(NoSuchAlgorithmException.class,
+                () -> KEM.getInstance("OLALA"));
+        Asserts.assertThrows(NoSuchProviderException.class,
+                () -> KEM.getInstance("DHKEM", "NoWhere"));
+        Asserts.assertThrows(NoSuchAlgorithmException.class,
+                () -> KEM.getInstance("DHKEM", "SunRsaSign"));
 
-        Utils.runAndCheckException(
-                () -> kem.newEncapsulator(null),
-                InvalidKeyException.class);
-        Utils.runAndCheckException(
-                () -> kem.newDecapsulator(null),
-                InvalidKeyException.class);
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> kem.newEncapsulator(null));
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> kem.newDecapsulator(null));
 
         // Still an EC key, rejected by implementation
-        Utils.runAndCheckException(
-                () -> kem.newEncapsulator(badECKey()),
-                ExChecker.of(InvalidKeyException.class).by(DHKEM.class));
+        checkThrownBy(Asserts.assertThrows(
+                InvalidKeyException.class,
+                () -> kem.newEncapsulator(badECKey())),
+                DHKEM.class.getName());
 
         // Not an EC key at all, rejected by framework coz it's not
         // listed in "SupportedKeyClasses" in SunJCE.java.
-        Utils.runAndCheckException(
-                () -> kem.newEncapsulator(kpRSA.getPublic()),
-                ExChecker.of(InvalidKeyException.class).by(KEM.class.getName() + "$DelayedKEM"));
+        checkThrownBy(Asserts.assertThrows(
+                InvalidKeyException.class,
+                () -> kem.newEncapsulator(kpRSA.getPublic())),
+                KEM.class.getName() + "$DelayedKEM");
 
-        Utils.runAndCheckException(
-                () -> kem.newDecapsulator(kpRSA.getPrivate()),
-                InvalidKeyException.class);
+        Asserts.assertThrows(InvalidKeyException.class,
+                () -> kem.newDecapsulator(kpRSA.getPrivate()));
 
         kem.newEncapsulator(kpX.getPublic(), null);
         kem.newEncapsulator(kpX.getPublic(), null, null);
@@ -125,15 +116,12 @@ public class Compliance {
         Asserts.assertEQ(enc1.key().getEncoded().length, e2.secretSize());
         Asserts.assertEQ(enc1.key().getAlgorithm(), "AES");
 
-        Utils.runAndCheckException(
-                () -> e2.encapsulate(-1, 12, "AES"),
-                IndexOutOfBoundsException.class);
-        Utils.runAndCheckException(
-                () -> e2.encapsulate(0, e2.secretSize() + 1, "AES"),
-                IndexOutOfBoundsException.class);
-        Utils.runAndCheckException(
-                () -> e2.encapsulate(0, e2.secretSize(), null),
-                NullPointerException.class);
+        Asserts.assertThrows(IndexOutOfBoundsException.class,
+                () -> e2.encapsulate(-1, 12, "AES"));
+        Asserts.assertThrows(IndexOutOfBoundsException.class,
+                () -> e2.encapsulate(0, e2.secretSize() + 1, "AES"));
+        Asserts.assertThrows(NullPointerException.class,
+                () -> e2.encapsulate(0, e2.secretSize(), null));
 
         KEM.Encapsulated enc = e2.encapsulate();
         Asserts.assertEQ(enc.key().getEncoded().length, e2.secretSize());
@@ -162,29 +150,23 @@ public class Compliance {
                 d.secretSize() - 16, d.secretSize(), "AES");
         Asserts.assertEQ(encTail.key(), decTail);
 
-        Utils.runAndCheckException(
-                () -> d.decapsulate(null),
-                NullPointerException.class);
-        Utils.runAndCheckException(
-                () -> d.decapsulate(enc.encapsulation(), -1, 12, "AES"),
-                IndexOutOfBoundsException.class);
-        Utils.runAndCheckException(
-                () -> d.decapsulate(enc.encapsulation(), 0, d.secretSize() + 1, "AES"),
-                IndexOutOfBoundsException.class);
-        Utils.runAndCheckException(
-                () -> d.decapsulate(enc.encapsulation(), 0, d.secretSize(), null),
-                NullPointerException.class);
+        Asserts.assertThrows(NullPointerException.class,
+                () -> d.decapsulate(null));
+        Asserts.assertThrows(IndexOutOfBoundsException.class,
+                () -> d.decapsulate(enc.encapsulation(), -1, 12, "AES"));
+        Asserts.assertThrows(IndexOutOfBoundsException.class,
+                () -> d.decapsulate(enc.encapsulation(), 0, d.secretSize() + 1, "AES"));
+        Asserts.assertThrows(NullPointerException.class,
+                () -> d.decapsulate(enc.encapsulation(), 0, d.secretSize(), null));
 
         KEM.Encapsulator e3 = kem.newEncapsulator(kpEC.getPublic());
         KEM.Encapsulated enc2 = e3.encapsulate();
         KEM.Decapsulator d3 = kem.newDecapsulator(kpX.getPrivate());
-        Utils.runAndCheckException(
-                () -> d3.decapsulate(enc2.encapsulation()),
-                DecapsulateException.class);
+        Asserts.assertThrows(DecapsulateException.class,
+                () -> d3.decapsulate(enc2.encapsulation()));
 
-        Utils.runAndCheckException(
-                () -> d3.decapsulate(new byte[100]),
-                DecapsulateException.class);
+        Asserts.assertThrows(DecapsulateException.class,
+                () -> d3.decapsulate(new byte[100]));
     }
 
     static class MySecureRandom extends SecureRandom {
@@ -273,34 +255,8 @@ public class Compliance {
         };
     }
 
-    // Used by Utils.runAndCheckException. Checks for type and final thrower.
-    record ExChecker(Class<? extends Throwable> ex, String caller)
-            implements Consumer<Throwable> {
-        ExChecker {
-            Objects.requireNonNull(ex);
-        }
-        static ExChecker of(Class<? extends Throwable> ex) {
-            return new ExChecker(ex, null);
-        }
-        ExChecker by(String caller) {
-            return new ExChecker(ex(), caller);
-        }
-        ExChecker by(Class<?> caller) {
-            return new ExChecker(ex(), caller.getName());
-        }
-        @Override
-        public void accept(Throwable t) {
-            if (t == null) {
-                throw new AssertionError("no exception thrown");
-            } else if (!ex.isAssignableFrom(t.getClass())) {
-                throw new AssertionError("exception thrown is " + t.getClass());
-            } else if (caller == null) {
-                return;
-            } else if (t.getStackTrace()[0].getClassName().equals(caller)) {
-                return;
-            } else {
-                throw new AssertionError("thrown by " + t.getStackTrace()[0].getClassName());
-            }
-        }
+    // Ensures `t` is thrown by `caller`
+    static <T extends Throwable> void checkThrownBy(T t, String caller) {
+        Asserts.assertEquals(caller, t.getStackTrace()[0].getClassName());
     }
 }
diff --git a/test/jdk/sun/security/provider/all/Deterministic.java b/test/jdk/sun/security/provider/all/Deterministic.java
index 8fb0e943768..60c56cd1b93 100644
--- a/test/jdk/sun/security/provider/all/Deterministic.java
+++ b/test/jdk/sun/security/provider/all/Deterministic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ import javax.crypto.KeyGenerator;
 import javax.crypto.spec.ChaCha20ParameterSpec;
 import javax.crypto.spec.DHParameterSpec;
 import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.HPKEParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
@@ -96,6 +97,11 @@ public class Deterministic {
             key = new SecretKeySpec("isthisakey".getBytes(StandardCharsets.UTF_8), "PBE");
             // Some cipher requires salt to be 8 byte long
             spec = new PBEParameterSpec("saltsalt".getBytes(StandardCharsets.UTF_8), 100);
+        } else if (alg.equals("HPKE")) {
+            key = KeyPairGenerator.getInstance("x25519").generateKeyPair().getPublic();
+            spec = HPKEParameterSpec.of(HPKEParameterSpec.KEM_DHKEM_X25519_HKDF_SHA256,
+                    HPKEParameterSpec.KDF_HKDF_SHA256,
+                    HPKEParameterSpec.AEAD_AES_256_GCM);
         } else {
             key = generateKey(alg.split("/")[0], s.getProvider());
             if (!alg.contains("/") || alg.contains("/ECB/")) {
@@ -239,6 +245,8 @@ public class Deterministic {
             return g.generateKey();
         } if (s.equals("RSA")) {
             return generateKeyPair("RSA", 3).getPublic();
+        } if (s.equals("HPKE")) {
+            return generateKeyPair("EC", 3).getPublic();
         } else {
             var g = KeyGenerator.getInstance(s, p);
             g.init(new SeededSecureRandom(SEED + 4));
diff --git a/test/jdk/sun/security/util/SliceableSecretKey/SoftSliceable.java b/test/jdk/sun/security/util/SliceableSecretKey/SoftSliceable.java
new file mode 100644
index 00000000000..6340b520a55
--- /dev/null
+++ b/test/jdk/sun/security/util/SliceableSecretKey/SoftSliceable.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import jdk.test.lib.Asserts;
+import sun.security.util.SliceableSecretKey;
+
+import javax.crypto.KDF;
+import javax.crypto.KDFParameters;
+import javax.crypto.KDFSpi;
+import javax.crypto.KEM;
+import javax.crypto.SecretKey;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Provider;
+import java.security.Security;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+
+/*
+ * @test
+ * @bug 8325448
+ * @library /test/lib /test/jdk/security/unsignedjce
+ * @build java.base/javax.crypto.ProviderVerifier
+ * @modules java.base/sun.security.util
+ * @run main/othervm SoftSliceable
+ * @summary Showcase how Sliceable can be used in DHKEM
+ */
+public class SoftSliceable {
+
+    public static void main(String[] args) throws Exception {
+
+        // Put an HKDF-SHA256 impl that is preferred to the SunJCE one
+        Security.insertProviderAt(new ProviderImpl(), 1);
+
+        // Just plain KEM calls
+        var kp = KeyPairGenerator.getInstance("X25519").generateKeyPair();
+        var k = KEM.getInstance("DHKEM");
+        var e = k.newEncapsulator(kp.getPublic());
+        var d = k.newDecapsulator(kp.getPrivate());
+        var enc = e.encapsulate(3, 9, "Generic");
+        var k2 = d.decapsulate(enc.encapsulation(), 3, 9, "Generic");
+        var k2full = d.decapsulate(enc.encapsulation());
+
+        if (enc.key() instanceof KeyImpl ki1
+                && k2 instanceof KeyImpl ki2
+                && k2full instanceof KeyImpl ki2full) {
+            // So the keys do come from the new provider, and
+            // 1. It has the correct length
+            Asserts.assertEquals(6, ki1.bytes.length);
+            // 2. encaps and decaps result in same keys
+            Asserts.assertEqualsByteArray(ki1.bytes, ki2.bytes);
+            // 3. The key is the correct slice from the full shared secret
+            Asserts.assertEqualsByteArray(
+                    Arrays.copyOfRange(ki2full.bytes, 3, 9), ki2.bytes);
+        } else {
+            throw new Exception("Unexpected key types");
+        }
+    }
+
+    // A trivial SliceableSecretKey that is non-extractable with getBytes()
+    public static class KeyImpl implements SecretKey, SliceableSecretKey {
+
+        private final byte[] bytes;
+        private final String algorithm;
+
+        public KeyImpl(byte[] bytes, String algorithm) {
+            this.bytes = bytes.clone();
+            this.algorithm = algorithm;
+        }
+
+        @Override
+        public String getAlgorithm() {
+            return algorithm;
+        }
+
+        @Override
+        public String getFormat() {
+            return null;
+        }
+
+        @Override
+        public byte[] getEncoded() {
+            return null;
+        }
+
+        @Override
+        public SecretKey slice(String alg, int from, int to) {
+            return new KeyImpl(Arrays.copyOfRange(bytes, from, to), algorithm);
+        }
+    }
+
+    // Our new provider
+    public static class ProviderImpl extends Provider {
+        public ProviderImpl() {
+            super("A", "A", "A");
+            put("KDF.HKDF-SHA256", KDFImpl.class.getName());
+        }
+    }
+
+    // Our new HKDF-SHA256 impl that always returns a KeyImpl object
+    public static class KDFImpl extends KDFSpi {
+
+        public KDFImpl(KDFParameters p)
+                throws InvalidAlgorithmParameterException {
+            super(p);
+        }
+
+        @Override
+        protected KDFParameters engineGetParameters() {
+            return null;
+        }
+
+        @Override
+        protected SecretKey engineDeriveKey(String alg, AlgorithmParameterSpec spec)
+                throws InvalidAlgorithmParameterException {
+            try {
+                var kdf = KDF.getInstance("HKDF-SHA256", "SunJCE");
+                var bytes = kdf.deriveData(spec);
+                return new KeyImpl(bytes, alg);
+            } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
+                throw new AssertionError("Cannot happen", e);
+            }
+        }
+
+        @Override
+        protected byte[] engineDeriveData(AlgorithmParameterSpec spec) {
+            throw new UnsupportedOperationException("Cannot derive data");
+        }
+    }
+}

From a89018582160a9d876f66925618c8b8f93190e67 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 20 Nov 2025 15:17:44 +0000
Subject: [PATCH 272/512] 8333727: Use JOpt in jpackage to parse command line
 8371384: libapplauncher.so is copied to a wrong location in two step
 packaging when --install-dir=/usr

Reviewed-by: almatvee
---
 .../share/classes/module-info.java            |    3 +-
 .../jpackage/internal/LinuxAppBundler.java    |   41 -
 .../internal/LinuxBundlingEnvironment.java    |  114 ++
 .../jpackage/internal/LinuxDebBundler.java    |   79 -
 .../jpackage/internal/LinuxFromOptions.java   |  119 ++
 .../jpackage/internal/LinuxFromParams.java    |  146 --
 .../internal/LinuxPackageBundler.java         |   88 -
 .../jdk/jpackage/internal/LinuxPackager.java  |    3 +-
 .../internal/LinuxPackagingPipeline.java      |   27 +-
 .../jpackage/internal/LinuxRpmBundler.java    |   80 -
 .../internal/model/LinuxLauncher.java         |    6 +-
 .../resources/LinuxResources.properties       |    4 -
 .../linux/classes/module-info.java.extra      |    9 +-
 .../jdk/jpackage/internal/MacAppBundler.java  |   81 -
 .../internal/MacBundlingEnvironment.java      |  110 ++
 .../jdk/jpackage/internal/MacDmgBundler.java  |   98 --
 .../jdk/jpackage/internal/MacFromOptions.java |  331 ++++
 .../jdk/jpackage/internal/MacFromParams.java  |  384 -----
 .../internal/MacPackagingPipeline.java        |   16 +-
 .../jdk/jpackage/internal/MacPkgBundler.java  |   99 --
 .../internal/model/MacApplication.java        |   38 +-
 .../resources/MacResources.properties         |    8 -
 .../macosx/classes/module-info.java.extra     |    9 +-
 .../internal/AddLauncherArguments.java        |  212 ---
 .../jpackage/internal/AppImageBundler.java    |  168 --
 .../jdk/jpackage/internal/AppImageFile.java   |  341 ++--
 .../jpackage/internal/ApplicationBuilder.java |   41 +-
 .../internal/ApplicationLayoutUtils.java      |   71 -
 .../jdk/jpackage/internal/Arguments.java      |  867 ----------
 .../jdk/jpackage/internal/BasicBundlers.java  |   86 -
 .../internal/BuildEnvFromOptions.java         |  104 ++
 .../jpackage/internal/BuildEnvFromParams.java |   74 -
 .../jdk/jpackage/internal/BundleParams.java   |   72 -
 .../jdk/jpackage/internal/Bundler.java        |  126 --
 .../jpackage/internal/BundlerParamInfo.java   |  179 ---
 .../jdk/jpackage/internal/Bundlers.java       |  112 --
 .../jdk/jpackage/internal/CLIHelp.java        |  116 --
 .../jdk/jpackage/internal/CfgFile.java        |   19 +-
 .../internal/DefaultBundlingEnvironment.java  |  283 ++++
 .../jdk/jpackage/internal/DeployParams.java   |  362 -----
 .../internal/FileAssociationGroup.java        |    4 +
 .../jdk/jpackage/internal/FromOptions.java    |  237 +++
 .../jdk/jpackage/internal/FromParams.java     |  251 ---
 .../jdk/jpackage/internal/IOUtils.java        |   10 +-
 .../internal/JLinkRuntimeBuilder.java         |   10 +-
 .../internal/JPackageToolProvider.java        |   58 -
 .../jdk/jpackage/internal/LauncherData.java   |  307 ----
 .../internal/LauncherFromOptions.java         |  189 +++
 .../jpackage/internal/LauncherFromParams.java |  156 --
 .../internal/LauncherStartupInfoBuilder.java  |  207 ++-
 .../jdk/jpackage/internal/OptionUtils.java    |   54 +
 .../jpackage/internal/OptionsTransformer.java |   86 +
 .../jdk/jpackage/internal/Packager.java       |    3 +-
 .../jpackage/internal/PackagingPipeline.java  |   33 +-
 .../internal/StandardBundlerParam.java        |  513 ------
 ...bstractBundler.java => TempDirectory.java} |   55 +-
 .../jdk/jpackage/internal/ValidOptions.java   |  187 ---
 .../internal/cli/AdditionalLauncher.java}     |   10 +-
 .../cli/BundlingOperationModifier.java        |   42 +
 .../cli/BundlingOperationOptionScope.java     |   38 +
 .../internal/cli/CliBundlingEnvironment.java  |   47 +
 .../jpackage/internal/cli/DefaultOptions.java |  191 +++
 .../jpackage/internal/cli/HelpFormatter.java  |  178 ++
 .../jdk/jpackage/internal/cli/I18N.java}      |   41 +-
 .../cli/JOptSimpleOptionsBuilder.java         |  817 ++++++++++
 .../jdk/jpackage/internal/cli/Main.java       |  224 +++
 .../internal/cli/MessageFormatUtils.java      |   79 +
 .../jdk/jpackage/internal/cli/Option.java     |   54 +
 .../OptionArrayValueConverter.java}           |   24 +-
 .../internal/cli/OptionIdentifier.java        |   53 +
 .../jdk/jpackage/internal/cli/OptionName.java |   68 +
 .../OptionScope.java}                         |   11 +-
 .../jpackage/internal/cli/OptionSource.java   |   68 +
 .../jdk/jpackage/internal/cli/OptionSpec.java |  180 +++
 .../internal/cli/OptionSpecBuilder.java       |  475 ++++++
 .../cli/OptionSpecMapperOptionScope.java      |  157 ++
 .../jpackage/internal/cli/OptionValue.java    |  190 +++
 .../internal/cli/OptionValueConverter.java    |  273 ++++
 .../cli/OptionValueExceptionFactory.java      |  183 +++
 .../jdk/jpackage/internal/cli/Options.java    |  202 +++
 .../internal/cli/OptionsAnalyzer.java         |  430 +++++
 .../internal/cli/OptionsProcessor.java        |  428 +++++
 .../cli/StandardAppImageFileOption.java       |  246 +++
 .../cli/StandardBundlingOperation.java        |  173 ++
 .../internal/cli/StandardFaOption.java        |  111 ++
 .../internal/cli/StandardHelpFormatter.java   |  398 +++++
 .../jpackage/internal/cli/StandardOption.java |  802 +++++++++
 .../internal/cli/StandardOptionContext.java   |   68 +
 .../StandardOptionValueExceptionFactory.java  |   79 +
 .../internal/cli/StandardValidator.java       |  162 ++
 .../internal/cli/StandardValueConverter.java  |   83 +
 .../jpackage/internal/cli/StringToken.java    |   57 +
 .../jdk/jpackage/internal/cli/Utils.java      |  109 ++
 .../jdk/jpackage/internal/cli/Validator.java  |  265 +++
 .../jpackage/internal/cli/ValueConverter.java |   68 +
 .../internal/cli/WithOptionIdentifier.java    |   38 +
 .../cli/WithOptionIdentifierStub.java}        |   14 +-
 .../internal/model/BundlingEnvironment.java   |   47 +-
 .../model/BundlingOperationDescriptor.java    |   53 +
 .../internal/model/ConfigException.java       |    7 +-
 .../internal/model/ExternalApplication.java   |  145 +-
 .../internal/model/JPackageException.java}    |   27 +-
 .../LauncherModularStartupInfoMixin.java      |   13 +-
 .../internal/model/PackagerException.java     |   84 -
 .../internal/model/RuntimeBuilder.java        |    2 +-
 .../resources/HelpResources.properties        |  629 ++++----
 .../resources/MainResources.properties        |   55 +-
 .../jdk/jpackage/internal/util/FileUtils.java |   14 +
 .../jpackage/internal/util/SetBuilder.java    |   87 +
 .../share/classes/jdk/jpackage/main/Main.java |   86 +-
 .../share/classes/module-info.java            |   14 +-
 .../internal/WinBundlingEnvironment.java      |  109 ++
 .../jdk/jpackage/internal/WinExeBundler.java  |   62 +-
 .../jdk/jpackage/internal/WinFromOpions.java  |  115 ++
 .../jdk/jpackage/internal/WinFromParams.java  |  164 --
 .../jdk/jpackage/internal/WinMsiBundler.java  |  122 --
 .../jdk/jpackage/internal/WinMsiPackager.java |    5 +-
 .../internal/WinPackagingPipeline.java        |   45 +-
 .../jpackage/internal/model/WinLauncher.java  |   10 +-
 .../resources/WinResources.properties         |    5 -
 .../windows/classes/module-info.java.extra    |    9 +-
 test/jdk/tools/jpackage/TEST.properties       |    2 +
 .../jdk/jpackage/test/AppImageFile.java       |   98 +-
 .../helpers/jdk/jpackage/test/MacHelper.java  |    2 +-
 .../jdk/jpackage/test/PackageType.java        |   90 +-
 test/jdk/tools/jpackage/junit/TEST.properties |    8 +-
 .../jpackage/internal/AppImageFileTest.java   |  678 ++++++--
 .../DefaultBundlingEnvironmentTest.java       |   58 +
 .../jpackage/internal/DeployParamsTest.java   |   74 -
 .../LauncherStartupInfoBuilderTest.java       |  155 ++
 .../internal/PackagingPipelineTest.java       |   43 +-
 .../internal/cli/DefaultOptionsTest.java      |   57 +
 .../internal/cli/ExpectedOptions.java         |   94 ++
 .../jdk/jpackage/internal/cli/HelpTest.java   |  181 +++
 .../cli/JOptSimpleOptionsBuilderTest.java     | 1428 +++++++++++++++++
 .../jdk/jpackage/internal/cli/MainTest.java   |  203 +++
 .../cli/MockupCliBundlingEnvironment.java     |  160 ++
 .../internal/cli/OptionIdentifierTest.java    |   63 +
 .../jpackage/internal/cli/OptionNameTest.java |  152 ++
 .../cli/OptionSpecMutatorOptionScopeTest.java |  144 ++
 .../jpackage/internal/cli/OptionSpecTest.java |  365 +++++
 .../cli/OptionValueConverterTest.java         |  216 +++
 .../cli/OptionValueExceptionFactoryTest.java  |  152 ++
 .../internal/cli/OptionValueTest.java         |  212 +++
 .../internal/cli/OptionsProcessorTest.java    |  786 +++++++++
 .../jpackage/internal/cli/OptionsTest.java    |  272 ++++
 .../cli/OptionsValidationFailTest.excludes    |   46 +
 .../cli/OptionsValidationFailTest.java        |  245 +++
 .../cli/StandardBundlingOperationTest.java    |  103 ++
 .../internal/cli/StandardOptionTest.java      |  639 ++++++++
 .../internal/cli/StandardValidatorTest.java   |  259 +++
 .../cli/StandardValueConverterTest.java       |  161 ++
 .../internal/cli/StringTokenTest.java         |   49 +
 .../jdk/jpackage/internal/cli/TestUtils.java  |  179 +++
 .../jdk/jpackage/internal/cli/UtilsTest.java  |   91 ++
 .../jpackage/internal/cli/ValidatorTest.java  |  284 ++++
 .../jdk/jpackage/internal/cli/help-linux.txt  |  197 +++
 .../jdk/jpackage/internal/cli/help-macos.txt  |  238 +++
 .../jpackage/internal/cli/help-windows.txt    |  205 +++
 .../jpackage/internal/cli/jpackage-options.md |   63 +
 .../jpackage/share/AppImagePackageTest.java   |    6 +-
 test/jdk/tools/jpackage/share/AsyncTest.java  |  222 +++
 test/jdk/tools/jpackage/share/ErrorTest.java  |    8 +-
 163 files changed, 18527 insertions(+), 6692 deletions(-)
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromOptions.java
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromOptions.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
 rename src/jdk.jpackage/share/classes/jdk/jpackage/internal/{AbstractBundler.java => TempDirectory.java} (53%)
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
 rename src/jdk.jpackage/{macosx/classes/jdk/jpackage/internal/MacBuildEnvFromParams.java => share/classes/jdk/jpackage/internal/cli/AdditionalLauncher.java} (76%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationModifier.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationOptionScope.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/CliBundlingEnvironment.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/DefaultOptions.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/HelpFormatter.java
 rename src/jdk.jpackage/{macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java => share/classes/jdk/jpackage/internal/cli/I18N.java} (56%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/MessageFormatUtils.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Option.java
 rename src/jdk.jpackage/share/classes/jdk/jpackage/internal/{model/BundleCreator.java => cli/OptionArrayValueConverter.java} (68%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionIdentifier.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionName.java
 rename src/jdk.jpackage/share/classes/jdk/jpackage/internal/{model/BundlingOperation.java => cli/OptionScope.java} (81%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSource.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValue.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueExceptionFactory.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Options.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardFaOption.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardHelpFormatter.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionContext.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StringToken.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifier.java
 rename src/jdk.jpackage/{macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java => share/classes/jdk/jpackage/internal/cli/WithOptionIdentifierStub.java} (69%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
 rename src/jdk.jpackage/{windows/classes/jdk/jpackage/internal/WinAppBundler.java => share/classes/jdk/jpackage/internal/model/JPackageException.java} (69%)
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java
 delete mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
 delete mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
 delete mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/LauncherStartupInfoBuilderTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/DefaultOptionsTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ExpectedOptions.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/HelpTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilderTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MockupCliBundlingEnvironment.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionIdentifierTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionNameTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueExceptionFactoryTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardBundlingOperationTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValidatorTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StringTokenTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/UtilsTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-linux.txt
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-macos.txt
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/jpackage-options.md
 create mode 100644 test/jdk/tools/jpackage/share/AsyncTest.java

diff --git a/src/jdk.internal.opt/share/classes/module-info.java b/src/jdk.internal.opt/share/classes/module-info.java
index ba6987f1ea9..728c2de500d 100644
--- a/src/jdk.internal.opt/share/classes/module-info.java
+++ b/src/jdk.internal.opt/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ module jdk.internal.opt {
     exports jdk.internal.joptsimple to
         jdk.jlink,
         jdk.jshell,
+        jdk.jpackage,
         jdk.jdeps;
     exports jdk.internal.opt to
         jdk.compiler,
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
deleted file mode 100644
index fe8d6bcf34f..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.util.Optional;
-
-public class LinuxAppBundler extends AppImageBundler {
-    public LinuxAppBundler() {
-        setAppImageSupplier((params, output) -> {
-            // Order is important!
-            var app = LinuxFromParams.APPLICATION.fetchFrom(params);
-            var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-            LinuxPackagingPipeline.build(Optional.empty())
-                    .excludeDirFromCopying(output.getParent())
-                    .create().execute(BuildEnv.withAppImageDir(env, output), app);
-        });
-    }
-}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
new file mode 100644
index 00000000000..cfd8ab391bb
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.LinuxFromOptions.createLinuxApplication;
+import static jdk.jpackage.internal.LinuxPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_DEB;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_RPM;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardBundlingOperation;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.util.Result;
+
+public class LinuxBundlingEnvironment extends DefaultBundlingEnvironment {
+
+    public LinuxBundlingEnvironment() {
+        super(build()
+                .defaultOperation(() -> {
+                    return LazyLoad.SYS_ENV.value().map(LinuxSystemEnvironment::nativePackageType).map(DESCRIPTORS::get);
+                })
+                .bundler(CREATE_LINUX_APP_IMAGE, LinuxBundlingEnvironment::createAppImage)
+                .bundler(CREATE_LINUX_DEB, LazyLoad::debSysEnv, LinuxBundlingEnvironment::createDebPackage)
+                .bundler(CREATE_LINUX_RPM, LazyLoad::rpmSysEnv, LinuxBundlingEnvironment::createRpmPackage));
+    }
+
+    private static void createDebPackage(Options options, LinuxDebSystemEnvironment sysEnv) {
+
+        createNativePackage(options,
+                LinuxFromOptions::createLinuxDebPackage,
+                buildEnv()::create,
+                LinuxBundlingEnvironment::buildPipeline,
+                (env, pkg, outputDir) -> {
+                    return new LinuxDebPackager(env, pkg, outputDir, sysEnv);
+                });
+    }
+
+    private static void createRpmPackage(Options options, LinuxRpmSystemEnvironment sysEnv) {
+
+        createNativePackage(options,
+                LinuxFromOptions::createLinuxRpmPackage,
+                buildEnv()::create,
+                LinuxBundlingEnvironment::buildPipeline,
+                (env, pkg, outputDir) -> {
+                    return new LinuxRpmPackager(env, pkg, outputDir, sysEnv);
+                });
+    }
+
+    private static void createAppImage(Options options) {
+
+        final var app = createLinuxApplication(options);
+
+        createApplicationImage(options, app, LinuxPackagingPipeline.build(Optional.empty()));
+    }
+
+    private static PackagingPipeline.Builder buildPipeline(LinuxPackage pkg) {
+        return LinuxPackagingPipeline.build(Optional.of(pkg));
+    }
+
+    private static BuildEnvFromOptions buildEnv() {
+        return new BuildEnvFromOptions().predefinedAppImageLayout(APPLICATION_LAYOUT);
+    }
+
+    private static final class LazyLoad {
+
+        static Result<LinuxDebSystemEnvironment> debSysEnv() {
+            return DEB_SYS_ENV;
+        }
+
+        static Result<LinuxRpmSystemEnvironment> rpmSysEnv() {
+            return RPM_SYS_ENV;
+        }
+
+        private static final Result<LinuxSystemEnvironment> SYS_ENV = LinuxSystemEnvironment.create();
+
+        private static final Result<LinuxDebSystemEnvironment> DEB_SYS_ENV = LinuxDebSystemEnvironment.create(SYS_ENV);
+
+        private static final Result<LinuxRpmSystemEnvironment> RPM_SYS_ENV = LinuxRpmSystemEnvironment.create(SYS_ENV);
+    }
+
+    private static final Map<PackageType, BundlingOperationDescriptor> DESCRIPTORS = Stream.of(
+            CREATE_LINUX_DEB,
+            CREATE_LINUX_RPM
+    ).collect(toMap(StandardBundlingOperation::packageType, StandardBundlingOperation::descriptor));
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
deleted file mode 100644
index 76a08519b48..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Optional;
-import jdk.jpackage.internal.model.LinuxDebPackage;
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.model.StandardPackageType;
-import jdk.jpackage.internal.util.Result;
-
-public class LinuxDebBundler extends LinuxPackageBundler {
-
-    public LinuxDebBundler() {
-        super(LinuxFromParams.DEB_PACKAGE);
-    }
-
-    @Override
-    public String getName() {
-        return I18N.getString("deb.bundler.name");
-    }
-
-    @Override
-    public String getID() {
-        return "deb";
-    }
-
-    @Override
-    public Path execute(Map<String, ? super Object> params, Path outputParentDir) throws PackagerException {
-
-        var pkg = LinuxFromParams.DEB_PACKAGE.fetchFrom(params);
-
-        return Packager.<LinuxDebPackage>build().outputDir(outputParentDir)
-                .pkg(pkg)
-                .env(BuildEnvFromParams.BUILD_ENV.fetchFrom(params))
-                .pipelineBuilderMutatorFactory((env, _, outputDir) -> {
-                    return new LinuxDebPackager(env, pkg, outputDir, sysEnv.orElseThrow());
-                }).execute(LinuxPackagingPipeline.build(Optional.of(pkg)));
-    }
-
-    @Override
-    protected Result<LinuxDebSystemEnvironment> sysEnv() {
-        return sysEnv;
-    }
-
-    @Override
-    public boolean isDefault() {
-        return sysEnv.value()
-                .map(LinuxSystemEnvironment::nativePackageType)
-                .map(StandardPackageType.LINUX_DEB::equals)
-                .orElse(false);
-    }
-
-    private final Result<LinuxDebSystemEnvironment> sysEnv = LinuxDebSystemEnvironment.create(SYS_ENV);
-}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromOptions.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromOptions.java
new file mode 100644
index 00000000000..799c92ce2e1
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromOptions.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.FromOptions.buildApplicationBuilder;
+import static jdk.jpackage.internal.FromOptions.createPackageBuilder;
+import static jdk.jpackage.internal.LinuxPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_APP_CATEGORY;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_DEB_MAINTAINER_EMAIL;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_MENU_GROUP;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_PACKAGE_DEPENDENCIES;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_PACKAGE_NAME;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_RELEASE;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_RPM_LICENSE_TYPE;
+import static jdk.jpackage.internal.cli.StandardOption.LINUX_SHORTCUT_HINT;
+import static jdk.jpackage.internal.model.StandardPackageType.LINUX_DEB;
+import static jdk.jpackage.internal.model.StandardPackageType.LINUX_RPM;
+
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LinuxApplication;
+import jdk.jpackage.internal.model.LinuxDebPackage;
+import jdk.jpackage.internal.model.LinuxLauncher;
+import jdk.jpackage.internal.model.LinuxLauncherMixin;
+import jdk.jpackage.internal.model.LinuxRpmPackage;
+import jdk.jpackage.internal.model.StandardPackageType;
+
+final class LinuxFromOptions {
+
+    static LinuxApplication createLinuxApplication(Options options) {
+
+        final var launcherFromOptions = new LauncherFromOptions().faWithDefaultDescription();
+
+        final var appBuilder = buildApplicationBuilder().create(options, launcherOptions -> {
+
+            final var launcher = launcherFromOptions.create(launcherOptions);
+
+            final var shortcut = LINUX_SHORTCUT_HINT.findIn(launcherOptions);
+
+            return LinuxLauncher.create(launcher, new LinuxLauncherMixin.Stub(shortcut));
+
+        }, (LinuxLauncher linuxLauncher, Launcher launcher) -> {
+            return LinuxLauncher.create(launcher, linuxLauncher);
+        }, APPLICATION_LAYOUT);
+
+        appBuilder.launchers().map(LinuxPackagingPipeline::normalizeShortcuts).ifPresent(appBuilder::launchers);
+
+        return LinuxApplication.create(appBuilder.create());
+    }
+
+    static LinuxRpmPackage createLinuxRpmPackage(Options options) {
+
+        final var superPkgBuilder = createLinuxPackageBuilder(options, LINUX_RPM);
+
+        final var pkgBuilder = new LinuxRpmPackageBuilder(superPkgBuilder);
+
+        LINUX_RPM_LICENSE_TYPE.ifPresentIn(options, pkgBuilder::licenseType);
+
+        return pkgBuilder.create();
+    }
+
+    static LinuxDebPackage createLinuxDebPackage(Options options) {
+
+        final var superPkgBuilder = createLinuxPackageBuilder(options, LINUX_DEB);
+
+        final var pkgBuilder = new LinuxDebPackageBuilder(superPkgBuilder);
+
+        LINUX_DEB_MAINTAINER_EMAIL.ifPresentIn(options, pkgBuilder::maintainerEmail);
+
+        final var pkg = pkgBuilder.create();
+
+        // Show warning if license file is missing
+        if (pkg.licenseFile().isEmpty()) {
+            Log.verbose(I18N.getString("message.debs-like-licenses"));
+        }
+
+        return pkg;
+    }
+
+    private static LinuxPackageBuilder createLinuxPackageBuilder(Options options, StandardPackageType type) {
+
+        final var app = createLinuxApplication(options);
+
+        final var superPkgBuilder = createPackageBuilder(options, app, type);
+
+        final var pkgBuilder = new LinuxPackageBuilder(superPkgBuilder);
+
+        LINUX_PACKAGE_DEPENDENCIES.ifPresentIn(options, pkgBuilder::additionalDependencies);
+        LINUX_APP_CATEGORY.ifPresentIn(options, pkgBuilder::category);
+        LINUX_MENU_GROUP.ifPresentIn(options, pkgBuilder::menuGroupName);
+        LINUX_RELEASE.ifPresentIn(options, pkgBuilder::release);
+        LINUX_PACKAGE_NAME.ifPresentIn(options, pkgBuilder::literalName);
+
+        return pkgBuilder;
+    }
+
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
deleted file mode 100644
index e9d1416b5c3..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.BundlerParamInfo.createStringBundlerParam;
-import static jdk.jpackage.internal.FromParams.createApplicationBuilder;
-import static jdk.jpackage.internal.FromParams.createApplicationBundlerParam;
-import static jdk.jpackage.internal.FromParams.createPackageBuilder;
-import static jdk.jpackage.internal.FromParams.createPackageBundlerParam;
-import static jdk.jpackage.internal.FromParams.findLauncherShortcut;
-import static jdk.jpackage.internal.LinuxPackagingPipeline.APPLICATION_LAYOUT;
-import static jdk.jpackage.internal.model.StandardPackageType.LINUX_DEB;
-import static jdk.jpackage.internal.model.StandardPackageType.LINUX_RPM;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
-
-import java.io.IOException;
-import java.util.Map;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.LinuxApplication;
-import jdk.jpackage.internal.model.LinuxDebPackage;
-import jdk.jpackage.internal.model.LinuxLauncher;
-import jdk.jpackage.internal.model.LinuxLauncherMixin;
-import jdk.jpackage.internal.model.LinuxRpmPackage;
-import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.StandardPackageType;
-
-final class LinuxFromParams {
-
-    private static LinuxApplication createLinuxApplication(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-        final var launcherFromParams = new LauncherFromParams();
-
-        final var app = createApplicationBuilder(params, toFunction(launcherParams -> {
-            final var launcher = launcherFromParams.create(launcherParams);
-            final var shortcut = findLauncherShortcut(LINUX_SHORTCUT_HINT, params, launcherParams);
-            return LinuxLauncher.create(launcher, new LinuxLauncherMixin.Stub(shortcut));
-        }), (LinuxLauncher linuxLauncher, Launcher launcher) -> {
-            return LinuxLauncher.create(launcher, linuxLauncher);
-        }, APPLICATION_LAYOUT).create();
-        return LinuxApplication.create(app);
-    }
-
-    private static LinuxPackageBuilder createLinuxPackageBuilder(
-            Map<String, ? super Object> params, StandardPackageType type) throws ConfigException, IOException {
-
-        final var app = APPLICATION.fetchFrom(params);
-
-        final var superPkgBuilder = createPackageBuilder(params, app, type);
-
-        final var pkgBuilder = new LinuxPackageBuilder(superPkgBuilder);
-
-        LINUX_PACKAGE_DEPENDENCIES.copyInto(params, pkgBuilder::additionalDependencies);
-        LINUX_CATEGORY.copyInto(params, pkgBuilder::category);
-        LINUX_MENU_GROUP.copyInto(params, pkgBuilder::menuGroupName);
-        RELEASE.copyInto(params, pkgBuilder::release);
-        LINUX_PACKAGE_NAME.copyInto(params, pkgBuilder::literalName);
-
-        return pkgBuilder;
-    }
-
-    private static LinuxRpmPackage createLinuxRpmPackage(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var superPkgBuilder = createLinuxPackageBuilder(params, LINUX_RPM);
-
-        final var pkgBuilder = new LinuxRpmPackageBuilder(superPkgBuilder);
-
-        LICENSE_TYPE.copyInto(params, pkgBuilder::licenseType);
-
-        return pkgBuilder.create();
-    }
-
-    private static LinuxDebPackage createLinuxDebPackage(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var superPkgBuilder = createLinuxPackageBuilder(params, LINUX_DEB);
-
-        final var pkgBuilder = new LinuxDebPackageBuilder(superPkgBuilder);
-
-        MAINTAINER_EMAIL.copyInto(params, pkgBuilder::maintainerEmail);
-
-        final var pkg = pkgBuilder.create();
-
-        // Show warning if license file is missing
-        if (pkg.licenseFile().isEmpty()) {
-            Log.verbose(I18N.getString("message.debs-like-licenses"));
-        }
-
-        return pkg;
-    }
-
-    static final BundlerParamInfo<LinuxApplication> APPLICATION = createApplicationBundlerParam(
-            LinuxFromParams::createLinuxApplication);
-
-    static final BundlerParamInfo<LinuxRpmPackage> RPM_PACKAGE = createPackageBundlerParam(
-            LinuxFromParams::createLinuxRpmPackage);
-
-    static final BundlerParamInfo<LinuxDebPackage> DEB_PACKAGE = createPackageBundlerParam(
-            LinuxFromParams::createLinuxDebPackage);
-
-    private static final BundlerParamInfo<String> LINUX_SHORTCUT_HINT = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_SHORTCUT_HINT.getId());
-
-    private static final BundlerParamInfo<String> LINUX_CATEGORY = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_CATEGORY.getId());
-
-    private static final BundlerParamInfo<String> LINUX_PACKAGE_DEPENDENCIES = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_PACKAGE_DEPENDENCIES.getId());
-
-    private static final BundlerParamInfo<String> LINUX_MENU_GROUP = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_MENU_GROUP.getId());
-
-    private static final BundlerParamInfo<String> RELEASE = createStringBundlerParam(
-            Arguments.CLIOptions.RELEASE.getId());
-
-    private static final BundlerParamInfo<String> LINUX_PACKAGE_NAME = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_BUNDLE_NAME.getId());
-
-    private static final BundlerParamInfo<String> LICENSE_TYPE = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_RPM_LICENSE_TYPE.getId());
-
-    private static final BundlerParamInfo<String> MAINTAINER_EMAIL = createStringBundlerParam(
-            Arguments.CLIOptions.LINUX_DEB_MAINTAINER.getId());
-}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
deleted file mode 100644
index 1f674c0be11..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import java.util.Map;
-import java.util.Objects;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.LinuxPackage;
-import jdk.jpackage.internal.util.Result;
-
-abstract class LinuxPackageBundler extends AbstractBundler {
-
-    LinuxPackageBundler(BundlerParamInfo<? extends LinuxPackage> pkgParam) {
-        this.pkgParam = Objects.requireNonNull(pkgParam);
-    }
-
-    @Override
-    public final boolean validate(Map<String, ? super Object> params)
-            throws ConfigException {
-
-        // Order is important!
-        pkgParam.fetchFrom(params);
-        BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-
-        LinuxSystemEnvironment sysEnv;
-        try {
-            sysEnv = sysEnv().orElseThrow();
-        } catch (RuntimeException ex) {
-            throw ConfigException.rethrowConfigException(ex);
-        }
-
-        if (!isDefault()) {
-            Log.verbose(I18N.format(
-                    "message.not-default-bundler-no-dependencies-lookup",
-                    getName()));
-        } else if (!sysEnv.soLookupAvailable()) {
-            final String advice;
-            if ("deb".equals(getID())) {
-                advice = "message.deb-ldd-not-available.advice";
-            } else {
-                advice = "message.rpm-ldd-not-available.advice";
-            }
-            // Let user know package dependencies will not be generated.
-            Log.error(String.format("%s\n%s", I18N.getString(
-                    "message.ldd-not-available"), I18N.getString(advice)));
-        }
-
-        return true;
-    }
-
-    @Override
-    public final String getBundleType() {
-        return "INSTALLER";
-    }
-
-    @Override
-    public boolean supported(boolean runtimeInstaller) {
-        return sysEnv().hasValue();
-    }
-
-    protected abstract Result<? extends LinuxSystemEnvironment> sysEnv();
-
-    private final BundlerParamInfo<? extends LinuxPackage> pkgParam;
-
-    static final Result<LinuxSystemEnvironment> SYS_ENV = LinuxSystemEnvironment.create();
-}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
index 806592904d1..af7f5288cc5 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
@@ -40,7 +40,6 @@ import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LinuxPackage;
-import jdk.jpackage.internal.model.PackagerException;
 
 abstract class LinuxPackager<T extends LinuxPackage> implements Consumer<PackagingPipeline.Builder> {
 
@@ -95,7 +94,7 @@ abstract class LinuxPackager<T extends LinuxPackage> implements Consumer<Packagi
 
     protected abstract void initLibProvidersLookup(LibProvidersLookup libProvidersLookup);
 
-    private void buildConfigFiles() throws PackagerException, IOException {
+    private void buildConfigFiles() throws IOException {
 
         final var data = createDefaultReplacementData();
 
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
index 6f6013b3091..4b846db3231 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
@@ -24,6 +24,7 @@
  */
 package jdk.jpackage.internal;
 
+import static jdk.jpackage.internal.ApplicationBuilder.normalizeLauncherProperty;
 import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
 
 import java.io.IOException;
@@ -36,8 +37,12 @@ import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
 import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.LinuxLauncher;
+import jdk.jpackage.internal.model.LinuxLauncherMixin;
 import jdk.jpackage.internal.model.LinuxPackage;
 import jdk.jpackage.internal.resources.ResourceLocator;
 
@@ -64,6 +69,17 @@ final class LinuxPackagingPipeline {
         return builder;
     }
 
+    static ApplicationLaunchers normalizeShortcuts(ApplicationLaunchers appLaunchers) {
+        return normalizeLauncherProperty(appLaunchers, launcher -> {
+            // Return "true" if shortcut is not configured for the launcher.
+            return launcher.shortcut().isEmpty();
+        }, (LinuxLauncher launcher) -> {
+            return launcher.shortcut().flatMap(LauncherShortcut::startupDirectory);
+        }, (launcher, shortcut) -> {
+            return LinuxLauncher.create(launcher, new LinuxLauncherMixin.Stub(Optional.of(new LauncherShortcut(shortcut))));
+        });
+    }
+
     private static void writeLauncherLib(
             AppImageBuildEnv<Application, LinuxApplicationLayout> env) throws IOException {
 
@@ -90,6 +106,15 @@ final class LinuxPackagingPipeline {
         });
     }
 
+    private static final ApplicationLayout LINUX_APPLICATION_LAYOUT = ApplicationLayout.build()
+            .launchersDirectory("bin")
+            .appDirectory("lib/app")
+            .runtimeDirectory("lib/runtime")
+            .desktopIntegrationDirectory("lib")
+            .appModsDirectory("lib/app/mods")
+            .contentDirectory("lib")
+            .create();
+
     static final LinuxApplicationLayout APPLICATION_LAYOUT = LinuxApplicationLayout.create(
-            ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT, Path.of("lib/libapplauncher.so"));
+            LINUX_APPLICATION_LAYOUT, Path.of("lib/libapplauncher.so"));
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
deleted file mode 100644
index c134aa91d6a..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Optional;
-import jdk.jpackage.internal.model.LinuxRpmPackage;
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.model.StandardPackageType;
-import jdk.jpackage.internal.util.Result;
-
-
-public class LinuxRpmBundler extends LinuxPackageBundler {
-
-    public LinuxRpmBundler() {
-        super(LinuxFromParams.RPM_PACKAGE);
-    }
-
-    @Override
-    public String getName() {
-        return I18N.getString("rpm.bundler.name");
-    }
-
-    @Override
-    public String getID() {
-        return "rpm";
-    }
-
-    @Override
-    public Path execute(Map<String, ? super Object> params, Path outputParentDir) throws PackagerException {
-
-        var pkg = LinuxFromParams.RPM_PACKAGE.fetchFrom(params);
-
-        return Packager.<LinuxRpmPackage>build().outputDir(outputParentDir)
-                .pkg(pkg)
-                .env(BuildEnvFromParams.BUILD_ENV.fetchFrom(params))
-                .pipelineBuilderMutatorFactory((env, _, outputDir) -> {
-                    return new LinuxRpmPackager(env, pkg, outputDir, sysEnv.orElseThrow());
-                }).execute(LinuxPackagingPipeline.build(Optional.of(pkg)));
-    }
-
-    @Override
-    protected Result<LinuxRpmSystemEnvironment> sysEnv() {
-        return sysEnv;
-    }
-
-    @Override
-    public boolean isDefault() {
-        return sysEnv.value()
-                .map(LinuxSystemEnvironment::nativePackageType)
-                .map(StandardPackageType.LINUX_RPM::equals)
-                .orElse(false);
-    }
-
-    private final Result<LinuxRpmSystemEnvironment> sysEnv = LinuxRpmSystemEnvironment.create(SYS_ENV);
-}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
index c84b5e3bbf5..3c654f604c2 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
@@ -24,6 +24,8 @@
  */
 package jdk.jpackage.internal.model;
 
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LINUX_LAUNCHER_SHORTCUT;
+
 import java.util.HashMap;
 import java.util.Map;
 import jdk.jpackage.internal.util.CompositeProxy;
@@ -39,7 +41,7 @@ public interface LinuxLauncher extends Launcher, LinuxLauncherMixin {
     default Map<String, String> extraAppImageFileData() {
         Map<String, String> map = new HashMap<>();
         shortcut().ifPresent(shortcut -> {
-            shortcut.store(SHORTCUT_ID, map::put);
+            shortcut.store(LINUX_LAUNCHER_SHORTCUT.getName(), map::put);
         });
         return map;
     }
@@ -55,6 +57,4 @@ public interface LinuxLauncher extends Launcher, LinuxLauncherMixin {
     public static LinuxLauncher create(Launcher launcher, LinuxLauncherMixin mixin) {
         return CompositeProxy.create(LinuxLauncher.class, launcher, mixin);
     }
-
-    public static final String SHORTCUT_ID = "linux-shortcut";
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
index a732d02c7d1..6f05b623064 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
@@ -23,10 +23,6 @@
 # questions.
 #
 #
-app.bundler.name=Linux Application Image
-deb.bundler.name=DEB Bundle
-rpm.bundler.name=RPM Bundle
-
 param.license-type.default=Unknown
 
 resource.deb-control-file=DEB control file
diff --git a/src/jdk.jpackage/linux/classes/module-info.java.extra b/src/jdk.jpackage/linux/classes/module-info.java.extra
index d32314b0429..7bef2286214 100644
--- a/src/jdk.jpackage/linux/classes/module-info.java.extra
+++ b/src/jdk.jpackage/linux/classes/module-info.java.extra
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,5 @@
  * questions.
  */
 
-provides jdk.jpackage.internal.Bundler with
-    jdk.jpackage.internal.LinuxAppBundler,
-    jdk.jpackage.internal.LinuxDebBundler,
-    jdk.jpackage.internal.LinuxRpmBundler;
-
+provides jdk.jpackage.internal.cli.CliBundlingEnvironment with
+    jdk.jpackage.internal.LinuxBundlingEnvironment;
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
deleted file mode 100644
index cce35ece117..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.StandardBundlerParam.OUTPUT_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-
-import java.util.Map;
-import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.util.function.ExceptionBox;
-
-public class MacAppBundler extends AppImageBundler {
-     public MacAppBundler() {
-         setAppImageSupplier((params, output) -> {
-
-             // Order is important!
-             final var app = MacFromParams.APPLICATION.fetchFrom(params);
-             final BuildEnv env;
-
-             if (StandardBundlerParam.hasPredefinedAppImage(params)) {
-                 env = MacBuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-                 final var pkg = MacPackagingPipeline.createSignAppImagePackage(app, env);
-                 MacPackagingPipeline.build(Optional.of(pkg)).create().execute(env, pkg, output);
-             } else {
-                 env = BuildEnv.withAppImageDir(MacBuildEnvFromParams.BUILD_ENV.fetchFrom(params), output);
-                 MacPackagingPipeline.build(Optional.empty())
-                         .excludeDirFromCopying(output.getParent())
-                         .excludeDirFromCopying(OUTPUT_DIR.fetchFrom(params)).create().execute(env, app);
-             }
-
-         });
-         setParamsValidator(MacAppBundler::doValidate);
-    }
-
-    private static void doValidate(Map<String, ? super Object> params)
-            throws ConfigException {
-
-        try {
-            MacFromParams.APPLICATION.fetchFrom(params);
-        } catch (ExceptionBox ex) {
-            if (ex.getCause() instanceof ConfigException cfgEx) {
-                throw cfgEx;
-            } else {
-                throw ex;
-            }
-        }
-
-        if (StandardBundlerParam.hasPredefinedAppImage(params)) {
-            if (!Optional.ofNullable(
-                    SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.FALSE)) {
-                throw new ConfigException(
-                        I18N.getString("error.app-image.mac-sign.required"),
-                        null);
-            }
-        }
-    }
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
new file mode 100644
index 00000000000..371a3c7307a
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.MacFromOptions.createMacApplication;
+import static jdk.jpackage.internal.MacPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.MacPackagingPipeline.createSignAppImagePackage;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_MAC_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_MAC_DMG;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_MAC_PKG;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.SIGN_MAC_APP_IMAGE;
+
+import java.util.Optional;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.model.MacPackage;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.util.Result;
+
+public class MacBundlingEnvironment extends DefaultBundlingEnvironment {
+
+    public MacBundlingEnvironment() {
+        super(build()
+                .defaultOperation(CREATE_MAC_DMG)
+                .bundler(SIGN_MAC_APP_IMAGE, MacBundlingEnvironment::signAppImage)
+                .bundler(CREATE_MAC_APP_IMAGE, MacBundlingEnvironment::createAppImage)
+                .bundler(CREATE_MAC_DMG, LazyLoad::dmgSysEnv, MacBundlingEnvironment::createDmdPackage)
+                .bundler(CREATE_MAC_PKG, MacBundlingEnvironment::createPkgPackage));
+    }
+
+    private static void createDmdPackage(Options options, MacDmgSystemEnvironment sysEnv) {
+        createNativePackage(options,
+                MacFromOptions::createMacDmgPackage,
+                buildEnv()::create,
+                MacBundlingEnvironment::buildPipeline,
+                (env, pkg, outputDir) -> {
+                    Log.verbose(I18N.format("message.building-dmg", pkg.app().name()));
+                    return new MacDmgPackager(env, pkg, outputDir, sysEnv);
+                });
+    }
+
+    private static void createPkgPackage(Options options) {
+        createNativePackage(options,
+                MacFromOptions::createMacPkgPackage,
+                buildEnv()::create,
+                MacBundlingEnvironment::buildPipeline,
+                (env, pkg, outputDir) -> {
+                    Log.verbose(I18N.format("message.building-pkg", pkg.app().name()));
+                    return new MacPkgPackager(env, pkg, outputDir);
+                });
+    }
+
+    private static void signAppImage(Options options) {
+
+        final var app = createMacApplication(options);
+
+        final var env = buildEnv().create(options, app);
+
+        final var pkg = createSignAppImagePackage(app, env);
+
+        buildPipeline(pkg).create().execute(env, pkg, env.appImageDir());
+    }
+
+    private static void createAppImage(Options options) {
+
+        final var app = createMacApplication(options);
+
+        createApplicationImage(options, app, MacPackagingPipeline.build(Optional.empty()));
+    }
+
+    private static PackagingPipeline.Builder buildPipeline(Package pkg) {
+        return MacPackagingPipeline.build(Optional.of(pkg));
+    }
+
+    private static BuildEnvFromOptions buildEnv() {
+        return new BuildEnvFromOptions()
+                .predefinedAppImageLayout(APPLICATION_LAYOUT)
+                .predefinedRuntimeImageLayout(MacPackage::guessRuntimeLayout);
+    }
+
+    private static final class LazyLoad {
+
+        static Result<MacDmgSystemEnvironment> dmgSysEnv() {
+            return DMG_SYS_ENV;
+        }
+
+        private static final Result<MacDmgSystemEnvironment> DMG_SYS_ENV = MacDmgSystemEnvironment.create();
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
deleted file mode 100644
index 0ddb987dbee..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.MacDmgPackage;
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.Result;
-
-public class MacDmgBundler extends MacBaseInstallerBundler {
-
-    @Override
-    public String getName() {
-        return I18N.getString("dmg.bundler.name");
-    }
-
-    @Override
-    public String getID() {
-        return "dmg";
-    }
-
-    @Override
-    public boolean validate(Map<String, ? super Object> params)
-            throws ConfigException {
-        try {
-            Objects.requireNonNull(params);
-
-            MacFromParams.DMG_PACKAGE.fetchFrom(params);
-
-            //run basic validation to ensure requirements are met
-            //we are not interested in return code, only possible exception
-            validateAppImageAndBundeler(params);
-
-            return true;
-        } catch (RuntimeException re) {
-            if (re.getCause() instanceof ConfigException) {
-                throw (ConfigException) re.getCause();
-            } else {
-                throw new ConfigException(re);
-            }
-        }
-    }
-
-    @Override
-    public Path execute(Map<String, ? super Object> params,
-            Path outputParentDir) throws PackagerException {
-
-        var pkg = MacFromParams.DMG_PACKAGE.fetchFrom(params);
-
-        Log.verbose(I18N.format("message.building-dmg", pkg.app().name()));
-
-        return Packager.<MacDmgPackage>build().outputDir(outputParentDir)
-                .pkg(pkg)
-                .env(MacBuildEnvFromParams.BUILD_ENV.fetchFrom(params))
-                .pipelineBuilderMutatorFactory((env, _, outputDir) -> {
-                    return new MacDmgPackager(env, pkg, outputDir, sysEnv.orElseThrow());
-                }).execute(MacPackagingPipeline.build(Optional.of(pkg)));
-    }
-
-    @Override
-    public boolean supported(boolean runtimeInstaller) {
-        return sysEnv.hasValue();
-    }
-
-    @Override
-    public boolean isDefault() {
-        return true;
-    }
-
-    private final Result<MacDmgSystemEnvironment> sysEnv = MacDmgSystemEnvironment.create();
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
new file mode 100644
index 00000000000..074014dede0
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.FromOptions.buildApplicationBuilder;
+import static jdk.jpackage.internal.FromOptions.createPackageBuilder;
+import static jdk.jpackage.internal.MacPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.MacRuntimeValidator.validateRuntimeHasJliLib;
+import static jdk.jpackage.internal.MacRuntimeValidator.validateRuntimeHasNoBinDir;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.SIGN_MAC_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.ICON;
+import static jdk.jpackage.internal.cli.StandardOption.APPCLASS;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_CATEGORY;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_IMAGE_SIGN_IDENTITY;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_STORE;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_BUNDLE_IDENTIFIER;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_BUNDLE_NAME;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_BUNDLE_SIGNING_PREFIX;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_DMG_CONTENT;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_ENTITLEMENTS;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_INSTALLER_SIGN_IDENTITY;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_SIGN;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_SIGNING_KEYCHAIN;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_SIGNING_KEY_NAME;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.model.MacPackage.RUNTIME_BUNDLE_LAYOUT;
+import static jdk.jpackage.internal.model.StandardPackageType.MAC_DMG;
+import static jdk.jpackage.internal.model.StandardPackageType.MAC_PKG;
+import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.ApplicationBuilder.MainLauncherStartupInfo;
+import jdk.jpackage.internal.SigningIdentityBuilder.ExpiredCertificateException;
+import jdk.jpackage.internal.SigningIdentityBuilder.StandardCertificateSelector;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardFaOption;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
+import jdk.jpackage.internal.model.ExternalApplication;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.MacApplication;
+import jdk.jpackage.internal.model.MacDmgPackage;
+import jdk.jpackage.internal.model.MacFileAssociation;
+import jdk.jpackage.internal.model.MacLauncher;
+import jdk.jpackage.internal.model.MacPackage;
+import jdk.jpackage.internal.model.MacPkgPackage;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.util.Result;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+
+
+final class MacFromOptions {
+
+    static MacApplication createMacApplication(Options options) {
+        return createMacApplicationInternal(options).app();
+    }
+
+    static MacDmgPackage createMacDmgPackage(Options options) {
+
+        final var app = createMacApplicationInternal(options);
+
+        final var superPkgBuilder = createMacPackageBuilder(options, app, MAC_DMG);
+
+        final var pkgBuilder = new MacDmgPackageBuilder(superPkgBuilder);
+
+        MAC_DMG_CONTENT.ifPresentIn(options, pkgBuilder::dmgContent);
+
+        return pkgBuilder.create();
+    }
+
+    static MacPkgPackage createMacPkgPackage(Options options) {
+
+        //
+        // One of "MacSignTest.testExpiredCertificate" test cases expects
+        // two error messages about expired certificates in the output: one for
+        // certificate for signing an app image, another certificate for signing a PKG.
+        // So creation of a PKG package is a bit messy.
+        //
+
+        final boolean sign = MAC_SIGN.findIn(options).orElse(false);
+        final boolean appStore = MAC_APP_STORE.findIn(options).orElse(false);
+
+        final var appResult = Result.create(() -> createMacApplicationInternal(options));
+
+        final Optional<MacPkgPackageBuilder> pkgBuilder;
+        if (appResult.hasValue()) {
+            final var superPkgBuilder = createMacPackageBuilder(options, appResult.orElseThrow(), MAC_PKG);
+            pkgBuilder = Optional.of(new MacPkgPackageBuilder(superPkgBuilder));
+        } else {
+            // Failed to create an app. Is it because of the expired certificate?
+            rethrowIfNotExpiredCertificateException(appResult);
+            // Yes, the certificate for signing the app image has expired.
+            // Keep going, try to create a signing config for the package.
+            pkgBuilder = Optional.empty();
+        }
+
+        if (sign) {
+            final var signingIdentityBuilder = createSigningIdentityBuilder(options);
+            MAC_INSTALLER_SIGN_IDENTITY.ifPresentIn(options, signingIdentityBuilder::signingIdentity);
+            MAC_SIGNING_KEY_NAME.findIn(options).ifPresent(userName -> {
+                final StandardCertificateSelector domain;
+                if (appStore) {
+                    domain = StandardCertificateSelector.APP_STORE_PKG_INSTALLER;
+                } else {
+                    domain = StandardCertificateSelector.PKG_INSTALLER;
+                }
+
+                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
+            });
+
+            if (pkgBuilder.isPresent()) {
+                pkgBuilder.orElseThrow().signingBuilder(signingIdentityBuilder);
+            } else {
+                //
+                // The certificate for signing the app image has expired. Can not create a
+                // package because there is no app.
+                // Try to create a signing config for the package and see if the certificate for
+                // signing the package is also expired.
+                //
+
+                final var expiredAppCertException = appResult.firstError().orElseThrow();
+
+                final var pkgSignConfigResult = Result.create(signingIdentityBuilder::create);
+                try {
+                    rethrowIfNotExpiredCertificateException(pkgSignConfigResult);
+                    // The certificate for the package signing config is also expired!
+                } catch (RuntimeException ex) {
+                    // Some error occurred trying to configure the signing config for the package.
+                    // Ignore it, bail out with the first error.
+                    rethrowUnchecked(expiredAppCertException);
+                }
+
+                Log.error(pkgSignConfigResult.firstError().orElseThrow().getMessage());
+                rethrowUnchecked(expiredAppCertException);
+            }
+        }
+
+        return pkgBuilder.orElseThrow().create();
+    }
+
+    private record ApplicationWithDetails(MacApplication app, Optional<ExternalApplication> externalApp) {
+        ApplicationWithDetails {
+            Objects.requireNonNull(app);
+            Objects.requireNonNull(externalApp);
+        }
+    }
+
+    private static ApplicationWithDetails createMacApplicationInternal(Options options) {
+
+        final var predefinedRuntimeLayout = PREDEFINED_RUNTIME_IMAGE.findIn(options)
+                .map(MacPackage::guessRuntimeLayout);
+
+        predefinedRuntimeLayout.ifPresent(layout -> {
+            validateRuntimeHasJliLib(layout);
+            if (MAC_APP_STORE.containsIn(options)) {
+                validateRuntimeHasNoBinDir(layout);
+            }
+        });
+
+        final var launcherFromOptions = new LauncherFromOptions().faMapper(MacFromOptions::createMacFa);
+
+        final var superAppBuilder = buildApplicationBuilder()
+                .runtimeLayout(RUNTIME_BUNDLE_LAYOUT)
+                .predefinedRuntimeLayout(predefinedRuntimeLayout.map(RuntimeLayout::unresolve).orElse(null))
+                .create(options, launcherOptions -> {
+                    var launcher = launcherFromOptions.create(launcherOptions);
+                    return MacLauncher.create(launcher);
+                }, (MacLauncher _, Launcher launcher) -> {
+                    return MacLauncher.create(launcher);
+                }, APPLICATION_LAYOUT);
+
+        if (PREDEFINED_APP_IMAGE.containsIn(options)) {
+            // Set the main launcher start up info.
+            // AppImageFile assumes the main launcher start up info is available when
+            // it is constructed from Application instance.
+            // This happens when jpackage signs predefined app image.
+            final var appImageFileOptions = superAppBuilder.externalApplication().orElseThrow().extra();
+            final var mainLauncherStartupInfo = new MainLauncherStartupInfo(APPCLASS.getFrom(appImageFileOptions));
+            final var launchers = superAppBuilder.launchers().orElseThrow();
+            final var mainLauncher = ApplicationBuilder.overrideLauncherStartupInfo(launchers.mainLauncher(), mainLauncherStartupInfo);
+            superAppBuilder.launchers(new ApplicationLaunchers(MacLauncher.create(mainLauncher), launchers.additionalLaunchers()));
+        }
+
+        final var app = superAppBuilder.create();
+
+        final var appBuilder = new MacApplicationBuilder(app);
+
+        PREDEFINED_APP_IMAGE.findIn(options)
+                .map(MacBundle::new)
+                .map(MacBundle::infoPlistFile)
+                .ifPresent(appBuilder::externalInfoPlistFile);
+
+        ICON.ifPresentIn(options, appBuilder::icon);
+        MAC_BUNDLE_NAME.ifPresentIn(options, appBuilder::bundleName);
+        MAC_BUNDLE_IDENTIFIER.ifPresentIn(options, appBuilder::bundleIdentifier);
+        MAC_APP_CATEGORY.ifPresentIn(options, appBuilder::category);
+
+        final boolean sign;
+        final boolean appStore;
+
+        if (PREDEFINED_APP_IMAGE.containsIn(options) && OptionUtils.bundlingOperation(options) != SIGN_MAC_APP_IMAGE) {
+            final var appImageFileOptions = superAppBuilder.externalApplication().orElseThrow().extra();
+            sign = MAC_SIGN.getFrom(appImageFileOptions);
+            appStore = MAC_APP_STORE.getFrom(appImageFileOptions);
+        } else {
+            sign = MAC_SIGN.getFrom(options);
+            appStore = MAC_APP_STORE.getFrom(options);
+        }
+
+        appBuilder.appStore(appStore);
+
+        if (sign) {
+            final var signingIdentityBuilder = createSigningIdentityBuilder(options);
+            MAC_APP_IMAGE_SIGN_IDENTITY.ifPresentIn(options, signingIdentityBuilder::signingIdentity);
+            MAC_SIGNING_KEY_NAME.findIn(options).ifPresent(userName -> {
+                final StandardCertificateSelector domain;
+                if (appStore) {
+                    domain = StandardCertificateSelector.APP_STORE_APP_IMAGE;
+                } else {
+                    domain = StandardCertificateSelector.APP_IMAGE;
+                }
+
+                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
+            });
+
+            final var signingBuilder = new AppImageSigningConfigBuilder(signingIdentityBuilder);
+            if (appStore) {
+                signingBuilder.entitlementsResourceName("sandbox.plist");
+            }
+
+            app.mainLauncher().flatMap(Launcher::startupInfo).ifPresentOrElse(
+                signingBuilder::signingIdentifierPrefix,
+                () -> {
+                    // Runtime installer does not have the main launcher, use
+                    // 'bundleIdentifier' as the prefix by default.
+                    var bundleIdentifier = appBuilder.create().bundleIdentifier();
+                    signingBuilder.signingIdentifierPrefix(bundleIdentifier + ".");
+                });
+            MAC_BUNDLE_SIGNING_PREFIX.ifPresentIn(options, signingBuilder::signingIdentifierPrefix);
+
+            MAC_ENTITLEMENTS.ifPresentIn(options, signingBuilder::entitlements);
+
+            appBuilder.signingBuilder(signingBuilder);
+        }
+
+        return new ApplicationWithDetails(appBuilder.create(), superAppBuilder.externalApplication());
+    }
+
+    private static MacPackageBuilder createMacPackageBuilder(Options options, ApplicationWithDetails app, PackageType type) {
+
+        final var builder = new MacPackageBuilder(createPackageBuilder(options, app.app(), type));
+
+        app.externalApp()
+                .map(ExternalApplication::extra)
+                .flatMap(MAC_SIGN::findIn)
+                .ifPresent(builder::predefinedAppImageSigned);
+
+        PREDEFINED_RUNTIME_IMAGE.findIn(options)
+                .map(MacBundle::new)
+                .filter(MacBundle::isValid)
+                .map(MacBundle::isSigned)
+                .ifPresent(builder::predefinedAppImageSigned);
+
+        return builder;
+    }
+
+    private static void rethrowIfNotExpiredCertificateException(Result<?> result) {
+        final var ex = result.firstError().orElseThrow();
+
+        if (ex instanceof ExpiredCertificateException) {
+            return;
+        }
+
+        if (ex instanceof ExceptionBox box) {
+            if (box.getCause() instanceof Exception cause) {
+                rethrowIfNotExpiredCertificateException(Result.ofError(cause));
+            }
+        }
+
+        rethrowUnchecked(ex);
+    }
+
+    private static SigningIdentityBuilder createSigningIdentityBuilder(Options options) {
+        final var builder = new SigningIdentityBuilder();
+        MAC_SIGNING_KEYCHAIN.findIn(options).map(Path::toString).ifPresent(builder::keychain);
+        return builder;
+    }
+
+    private static MacFileAssociation createMacFa(Options options, FileAssociation fa) {
+
+        final var builder = new MacFileAssociationBuilder();
+
+        StandardFaOption.MAC_CFBUNDLETYPEROLE.ifPresentIn(options, builder::cfBundleTypeRole);
+        StandardFaOption.MAC_LSHANDLERRANK.ifPresentIn(options, builder::lsHandlerRank);
+        StandardFaOption.MAC_NSSTORETYPEKEY.ifPresentIn(options, builder::nsPersistentStoreTypeKey);
+        StandardFaOption.MAC_NSDOCUMENTCLASS.ifPresentIn(options, builder::nsDocumentClass);
+        StandardFaOption.MAC_LSTYPEISPACKAGE.ifPresentIn(options, builder::lsTypeIsPackage);
+        StandardFaOption.MAC_LSDOCINPLACE.ifPresentIn(options, builder::lsSupportsOpeningDocumentsInPlace);
+        StandardFaOption.MAC_UIDOCBROWSER.ifPresentIn(options, builder::uiSupportsDocumentBrowser);
+        StandardFaOption.MAC_NSEXPORTABLETYPES.ifPresentIn(options, builder::nsExportableTypes);
+        StandardFaOption.MAC_UTTYPECONFORMSTO.ifPresentIn(options, builder::utTypeConformsTo);
+
+        return builder.create(fa);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
deleted file mode 100644
index 72c33ef6475..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.BundlerParamInfo.createBooleanBundlerParam;
-import static jdk.jpackage.internal.BundlerParamInfo.createPathBundlerParam;
-import static jdk.jpackage.internal.BundlerParamInfo.createStringBundlerParam;
-import static jdk.jpackage.internal.FromParams.createApplicationBuilder;
-import static jdk.jpackage.internal.FromParams.createApplicationBundlerParam;
-import static jdk.jpackage.internal.FromParams.createPackageBuilder;
-import static jdk.jpackage.internal.FromParams.createPackageBundlerParam;
-import static jdk.jpackage.internal.MacPackagingPipeline.APPLICATION_LAYOUT;
-import static jdk.jpackage.internal.MacRuntimeValidator.validateRuntimeHasJliLib;
-import static jdk.jpackage.internal.MacRuntimeValidator.validateRuntimeHasNoBinDir;
-import static jdk.jpackage.internal.StandardBundlerParam.DMG_CONTENT;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-import static jdk.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;
-import static jdk.jpackage.internal.model.MacPackage.RUNTIME_BUNDLE_LAYOUT;
-import static jdk.jpackage.internal.model.StandardPackageType.MAC_DMG;
-import static jdk.jpackage.internal.model.StandardPackageType.MAC_PKG;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.Callable;
-import java.util.function.Predicate;
-import jdk.jpackage.internal.ApplicationBuilder.MainLauncherStartupInfo;
-import jdk.jpackage.internal.SigningIdentityBuilder.ExpiredCertificateException;
-import jdk.jpackage.internal.SigningIdentityBuilder.StandardCertificateSelector;
-import jdk.jpackage.internal.model.ApplicationLaunchers;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.FileAssociation;
-import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.MacApplication;
-import jdk.jpackage.internal.model.MacDmgPackage;
-import jdk.jpackage.internal.model.MacFileAssociation;
-import jdk.jpackage.internal.model.MacLauncher;
-import jdk.jpackage.internal.model.MacPackage;
-import jdk.jpackage.internal.model.MacPkgPackage;
-import jdk.jpackage.internal.model.PackageType;
-import jdk.jpackage.internal.model.RuntimeLayout;
-import jdk.jpackage.internal.util.function.ExceptionBox;
-
-
-final class MacFromParams {
-
-    private static MacApplication createMacApplication(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var predefinedRuntimeLayout = PREDEFINED_RUNTIME_IMAGE.findIn(params)
-                .map(MacPackage::guessRuntimeLayout);
-
-        if (predefinedRuntimeLayout.isPresent()) {
-            validateRuntimeHasJliLib(predefinedRuntimeLayout.orElseThrow());
-            if (APP_STORE.findIn(params).orElse(false)) {
-                validateRuntimeHasNoBinDir(predefinedRuntimeLayout.orElseThrow());
-            }
-        }
-
-        final var launcherFromParams = new LauncherFromParams(Optional.of(MacFromParams::createMacFa));
-
-        final var superAppBuilder = createApplicationBuilder(params, toFunction(launcherParams -> {
-            var launcher = launcherFromParams.create(launcherParams);
-            return MacLauncher.create(launcher);
-        }), (MacLauncher _, Launcher launcher) -> {
-            return MacLauncher.create(launcher);
-        }, APPLICATION_LAYOUT, RUNTIME_BUNDLE_LAYOUT, predefinedRuntimeLayout.map(RuntimeLayout::unresolve));
-
-        if (hasPredefinedAppImage(params)) {
-            // Set the main launcher start up info.
-            // AppImageFile assumes the main launcher start up info is available when
-            // it is constructed from Application instance.
-            // This happens when jpackage signs predefined app image.
-            final var mainLauncherStartupInfo = new MainLauncherStartupInfo(superAppBuilder.mainLauncherClassName().orElseThrow());
-            final var launchers = superAppBuilder.launchers().orElseThrow();
-            final var mainLauncher = ApplicationBuilder.overrideLauncherStartupInfo(launchers.mainLauncher(), mainLauncherStartupInfo);
-            superAppBuilder.launchers(new ApplicationLaunchers(MacLauncher.create(mainLauncher), launchers.additionalLaunchers()));
-        }
-
-        final var app = superAppBuilder.create();
-
-        final var appBuilder = new MacApplicationBuilder(app);
-
-        if (hasPredefinedAppImage(params)) {
-            appBuilder.externalInfoPlistFile(PREDEFINED_APP_IMAGE.findIn(params).map(MacBundle::new).orElseThrow().infoPlistFile());
-        }
-
-        ICON.copyInto(params, appBuilder::icon);
-        MAC_CF_BUNDLE_NAME.copyInto(params, appBuilder::bundleName);
-        MAC_CF_BUNDLE_IDENTIFIER.copyInto(params, appBuilder::bundleIdentifier);
-        APP_CATEGORY.copyInto(params, appBuilder::category);
-
-        final boolean sign;
-        final boolean appStore;
-
-        if (hasPredefinedAppImage(params) && PACKAGE_TYPE.findIn(params).filter(Predicate.isEqual("app-image")).isEmpty()) {
-            final var appImageFileExtras = new MacAppImageFileExtras(superAppBuilder.externalApplication().orElseThrow());
-            sign = appImageFileExtras.signed();
-            appStore = appImageFileExtras.appStore();
-        } else {
-            sign = SIGN_BUNDLE.findIn(params).orElse(false);
-            appStore = APP_STORE.findIn(params).orElse(false);
-        }
-
-        appBuilder.appStore(appStore);
-
-        if (sign) {
-            final var signingIdentityBuilder = createSigningIdentityBuilder(params);
-            APP_IMAGE_SIGN_IDENTITY.copyInto(params, signingIdentityBuilder::signingIdentity);
-            SIGNING_KEY_USER.findIn(params).ifPresent(userName -> {
-                final StandardCertificateSelector domain;
-                if (appStore) {
-                    domain = StandardCertificateSelector.APP_STORE_APP_IMAGE;
-                } else {
-                    domain = StandardCertificateSelector.APP_IMAGE;
-                }
-
-                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
-            });
-
-            final var signingBuilder = new AppImageSigningConfigBuilder(signingIdentityBuilder);
-            if (appStore) {
-                signingBuilder.entitlementsResourceName("sandbox.plist");
-            }
-
-            final var bundleIdentifier = appBuilder.create().bundleIdentifier();
-            app.mainLauncher().flatMap(Launcher::startupInfo).ifPresentOrElse(
-                signingBuilder::signingIdentifierPrefix,
-                () -> {
-                    // Runtime installer does not have main launcher, so use
-                    // 'bundleIdentifier' as prefix by default.
-                    signingBuilder.signingIdentifierPrefix(
-                        bundleIdentifier + ".");
-                });
-            SIGN_IDENTIFIER_PREFIX.copyInto(params, signingBuilder::signingIdentifierPrefix);
-
-            ENTITLEMENTS.copyInto(params, signingBuilder::entitlements);
-
-            appBuilder.signingBuilder(signingBuilder);
-        }
-
-        return appBuilder.create();
-    }
-
-    private static MacPackageBuilder createMacPackageBuilder(
-            Map<String, ? super Object> params, MacApplication app,
-            PackageType type) throws ConfigException {
-        final var builder = new MacPackageBuilder(createPackageBuilder(params, app, type));
-
-        PREDEFINED_APP_IMAGE_FILE.findIn(params)
-                .map(MacAppImageFileExtras::new)
-                .map(MacAppImageFileExtras::signed)
-                .ifPresent(builder::predefinedAppImageSigned);
-
-        PREDEFINED_RUNTIME_IMAGE.findIn(params)
-                .map(MacBundle::new)
-                .filter(MacBundle::isValid)
-                .map(MacBundle::isSigned)
-                .ifPresent(builder::predefinedAppImageSigned);
-
-        return builder;
-    }
-
-    private static MacDmgPackage createMacDmgPackage(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var app = APPLICATION.fetchFrom(params);
-
-        final var superPkgBuilder = createMacPackageBuilder(params, app, MAC_DMG);
-
-        final var pkgBuilder = new MacDmgPackageBuilder(superPkgBuilder);
-
-        DMG_CONTENT.copyInto(params, pkgBuilder::dmgContent);
-
-        return pkgBuilder.create();
-    }
-
-    private record WithExpiredCertificateException<T>(Optional<T> obj, Optional<ExpiredCertificateException> certEx) {
-        WithExpiredCertificateException {
-            if (obj.isEmpty() == certEx.isEmpty()) {
-                throw new IllegalArgumentException();
-            }
-        }
-
-        static <U> WithExpiredCertificateException<U> of(Callable<U> callable) {
-            try {
-                return new WithExpiredCertificateException<>(Optional.of(callable.call()), Optional.empty());
-            } catch (ExpiredCertificateException ex) {
-                return new WithExpiredCertificateException<>(Optional.empty(), Optional.of(ex));
-            } catch (ExceptionBox ex) {
-                if (ex.getCause() instanceof ExpiredCertificateException certEx) {
-                    return new WithExpiredCertificateException<>(Optional.empty(), Optional.of(certEx));
-                }
-                throw ex;
-            } catch (RuntimeException ex) {
-                throw ex;
-            } catch (Throwable t) {
-                throw ExceptionBox.rethrowUnchecked(t);
-            }
-        }
-    }
-
-    private static MacPkgPackage createMacPkgPackage(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        // This is over complicated to make "MacSignTest.testExpiredCertificate" test pass.
-
-        final boolean sign = SIGN_BUNDLE.findIn(params).orElse(false);
-        final boolean appStore = APP_STORE.findIn(params).orElse(false);
-
-        final var appOrExpiredCertEx = WithExpiredCertificateException.of(() -> {
-            return APPLICATION.fetchFrom(params);
-        });
-
-        final Optional<MacPkgPackageBuilder> pkgBuilder;
-        if (appOrExpiredCertEx.obj().isPresent()) {
-            final var superPkgBuilder = createMacPackageBuilder(params, appOrExpiredCertEx.obj().orElseThrow(), MAC_PKG);
-            pkgBuilder = Optional.of(new MacPkgPackageBuilder(superPkgBuilder));
-        } else {
-            pkgBuilder = Optional.empty();
-        }
-
-        if (sign) {
-            final var signingIdentityBuilder = createSigningIdentityBuilder(params);
-            INSTALLER_SIGN_IDENTITY.copyInto(params, signingIdentityBuilder::signingIdentity);
-            SIGNING_KEY_USER.findIn(params).ifPresent(userName -> {
-                final StandardCertificateSelector domain;
-                if (appStore) {
-                    domain = StandardCertificateSelector.APP_STORE_PKG_INSTALLER;
-                } else {
-                    domain = StandardCertificateSelector.PKG_INSTALLER;
-                }
-
-                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
-            });
-
-            if (pkgBuilder.isPresent()) {
-                pkgBuilder.orElseThrow().signingBuilder(signingIdentityBuilder);
-            } else {
-                final var expiredPkgCert = WithExpiredCertificateException.of(() -> {
-                    return signingIdentityBuilder.create();
-                }).certEx();
-                expiredPkgCert.map(ConfigException::getMessage).ifPresent(Log::error);
-                throw appOrExpiredCertEx.certEx().orElseThrow();
-            }
-        }
-
-        return pkgBuilder.orElseThrow().create();
-    }
-
-    private static SigningIdentityBuilder createSigningIdentityBuilder(Map<String, ? super Object> params) {
-        final var builder = new SigningIdentityBuilder();
-        SIGNING_KEYCHAIN.copyInto(params, builder::keychain);
-        return builder;
-    }
-
-    private static MacFileAssociation createMacFa(FileAssociation fa, Map<String, ? super Object> params) {
-
-        final var builder = new MacFileAssociationBuilder();
-
-        FA_MAC_CFBUNDLETYPEROLE.copyInto(params, builder::cfBundleTypeRole);
-        FA_MAC_LSHANDLERRANK.copyInto(params, builder::lsHandlerRank);
-        FA_MAC_NSSTORETYPEKEY.copyInto(params, builder::nsPersistentStoreTypeKey);
-        FA_MAC_NSDOCUMENTCLASS.copyInto(params, builder::nsDocumentClass);
-        FA_MAC_LSTYPEISPACKAGE.copyInto(params, builder::lsTypeIsPackage);
-        FA_MAC_LSDOCINPLACE.copyInto(params, builder::lsSupportsOpeningDocumentsInPlace);
-        FA_MAC_UIDOCBROWSER.copyInto(params, builder::uiSupportsDocumentBrowser);
-        FA_MAC_NSEXPORTABLETYPES.copyInto(params, builder::nsExportableTypes);
-        FA_MAC_UTTYPECONFORMSTO.copyInto(params, builder::utTypeConformsTo);
-
-        return toFunction(builder::create).apply(fa);
-    }
-
-    static final BundlerParamInfo<MacApplication> APPLICATION = createApplicationBundlerParam(
-            MacFromParams::createMacApplication);
-
-    static final BundlerParamInfo<MacDmgPackage> DMG_PACKAGE = createPackageBundlerParam(
-            MacFromParams::createMacDmgPackage);
-
-    static final BundlerParamInfo<MacPkgPackage> PKG_PACKAGE = createPackageBundlerParam(
-            MacFromParams::createMacPkgPackage);
-
-    private static final BundlerParamInfo<String> MAC_CF_BUNDLE_NAME = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_BUNDLE_NAME.getId());
-
-    private static final BundlerParamInfo<String> APP_CATEGORY = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_CATEGORY.getId());
-
-    private static final BundlerParamInfo<Path> ENTITLEMENTS = createPathBundlerParam(
-            Arguments.CLIOptions.MAC_ENTITLEMENTS.getId());
-
-    private static final BundlerParamInfo<String> MAC_CF_BUNDLE_IDENTIFIER = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_BUNDLE_IDENTIFIER.getId());
-
-    private static final BundlerParamInfo<String> SIGN_IDENTIFIER_PREFIX = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_BUNDLE_SIGNING_PREFIX.getId());
-
-    private static final BundlerParamInfo<String> APP_IMAGE_SIGN_IDENTITY = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_APP_IMAGE_SIGN_IDENTITY.getId());
-
-    private static final BundlerParamInfo<String> INSTALLER_SIGN_IDENTITY = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getId());
-
-    private static final BundlerParamInfo<String> SIGNING_KEY_USER = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_SIGNING_KEY_NAME.getId());
-
-    private static final BundlerParamInfo<String> SIGNING_KEYCHAIN = createStringBundlerParam(
-            Arguments.CLIOptions.MAC_SIGNING_KEYCHAIN.getId());
-
-    private static final BundlerParamInfo<String> PACKAGE_TYPE = createStringBundlerParam(
-            Arguments.CLIOptions.PACKAGE_TYPE.getId());
-
-    private static final BundlerParamInfo<Boolean> APP_STORE = createBooleanBundlerParam(
-            Arguments.CLIOptions.MAC_APP_STORE.getId());
-
-    private static final BundlerParamInfo<String> FA_MAC_CFBUNDLETYPEROLE = createStringBundlerParam(
-            Arguments.MAC_CFBUNDLETYPEROLE);
-
-    private static final BundlerParamInfo<String> FA_MAC_LSHANDLERRANK = createStringBundlerParam(
-            Arguments.MAC_LSHANDLERRANK);
-
-    private static final BundlerParamInfo<String> FA_MAC_NSSTORETYPEKEY = createStringBundlerParam(
-            Arguments.MAC_NSSTORETYPEKEY);
-
-    private static final BundlerParamInfo<String> FA_MAC_NSDOCUMENTCLASS = createStringBundlerParam(
-            Arguments.MAC_NSDOCUMENTCLASS);
-
-    private static final BundlerParamInfo<Boolean> FA_MAC_LSTYPEISPACKAGE = createBooleanBundlerParam(
-            Arguments.MAC_LSTYPEISPACKAGE);
-
-    private static final BundlerParamInfo<Boolean> FA_MAC_LSDOCINPLACE = createBooleanBundlerParam(
-            Arguments.MAC_LSDOCINPLACE);
-
-    private static final BundlerParamInfo<Boolean> FA_MAC_UIDOCBROWSER = createBooleanBundlerParam(
-            Arguments.MAC_UIDOCBROWSER);
-
-    @SuppressWarnings("unchecked")
-    private static final BundlerParamInfo<List<String>> FA_MAC_NSEXPORTABLETYPES =
-            new BundlerParamInfo<>(
-                    Arguments.MAC_NSEXPORTABLETYPES,
-                    (Class<List<String>>) (Object) List.class,
-                    null,
-                    (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
-            );
-
-    @SuppressWarnings("unchecked")
-    private static final BundlerParamInfo<List<String>> FA_MAC_UTTYPECONFORMSTO =
-            new BundlerParamInfo<>(
-                    Arguments.MAC_UTTYPECONFORMSTO,
-                    (Class<List<String>>) (Object) List.class,
-                    null,
-                    (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
-            );
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
index b82b20c0c36..51fd15afabb 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
@@ -75,7 +75,6 @@ import jdk.jpackage.internal.model.MacFileAssociation;
 import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackageType;
-import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.util.FileUtils;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
@@ -268,7 +267,7 @@ final class MacPackagingPipeline {
         static <T extends AppImageLayout> AppImageTaskAction<MacApplication, T> withBundleLayout(AppImageTaskAction<MacApplication, T> action) {
             return new AppImageTaskAction<>() {
                 @Override
-                public void execute(AppImageBuildEnv<MacApplication, T> env) throws IOException, PackagerException {
+                public void execute(AppImageBuildEnv<MacApplication, T> env) throws IOException {
                     if (!env.envLayout().runtimeDirectory().getName(0).equals(Path.of("Contents"))) {
                         env = LayoutUtils.fromPackagerLayout(env);
                     }
@@ -610,11 +609,20 @@ final class MacPackagingPipeline {
         }
 
         @Override
-        public void execute(TaskAction taskAction) throws IOException, PackagerException {
+        public void execute(TaskAction taskAction) throws IOException {
             delegate.execute(taskAction);
         }
     }
 
+    private static final ApplicationLayout MAC_APPLICATION_LAYOUT = ApplicationLayout.build()
+            .launchersDirectory("Contents/MacOS")
+            .appDirectory("Contents/app")
+            .runtimeDirectory("Contents/runtime/Contents/Home")
+            .desktopIntegrationDirectory("Contents/Resources")
+            .appModsDirectory("Contents/app/mods")
+            .contentDirectory("Contents")
+            .create();
+
     static final MacApplicationLayout APPLICATION_LAYOUT = MacApplicationLayout.create(
-            ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT, Path.of("Contents/runtime"));
+            MAC_APPLICATION_LAYOUT, Path.of("Contents/runtime"));
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
deleted file mode 100644
index e827f238db3..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.MacPkgPackage;
-import jdk.jpackage.internal.model.PackagerException;
-
-public class MacPkgBundler extends MacBaseInstallerBundler {
-
-    @Override
-    public String getName() {
-        return I18N.getString("pkg.bundler.name");
-    }
-
-    @Override
-    public String getID() {
-        return "pkg";
-    }
-
-    @Override
-    public boolean validate(Map<String, ? super Object> params)
-            throws ConfigException {
-        try {
-            Objects.requireNonNull(params);
-
-            final var pkg = MacFromParams.PKG_PACKAGE.fetchFrom(params);
-
-            // run basic validation to ensure requirements are met
-            // we are not interested in return code, only possible exception
-            validateAppImageAndBundeler(params);
-
-            // hdiutil is always available so there's no need
-            // to test for availability.
-
-            return true;
-        } catch (RuntimeException re) {
-            if (re.getCause() instanceof ConfigException) {
-                throw (ConfigException) re.getCause();
-            } else {
-                throw new ConfigException(re);
-            }
-        }
-    }
-
-    @Override
-    public Path execute(Map<String, ? super Object> params,
-            Path outputParentDir) throws PackagerException {
-
-        var pkg = MacFromParams.PKG_PACKAGE.fetchFrom(params);
-
-        Log.verbose(I18N.format("message.building-pkg", pkg.app().name()));
-
-        return Packager.<MacPkgPackage>build().outputDir(outputParentDir)
-                .pkg(pkg)
-                .env(MacBuildEnvFromParams.BUILD_ENV.fetchFrom(params))
-                .pipelineBuilderMutatorFactory((env, _, outputDir) -> {
-                    return new MacPkgPackager(env, pkg, outputDir);
-                }).execute(MacPackagingPipeline.build(Optional.of(pkg)));
-    }
-
-    @Override
-    public boolean supported(boolean runtimeInstaller) {
-        return true;
-    }
-
-    @Override
-    public boolean isDefault() {
-        return false;
-    }
-
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
index 04ab7042ac5..cfe10e8a012 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
@@ -25,13 +25,18 @@
 package jdk.jpackage.internal.model;
 
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toUnmodifiableMap;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_APP_STORE;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_MAIN_CLASS;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_SIGNED;
 
 import java.nio.file.Path;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.cli.OptionValue;
 import jdk.jpackage.internal.util.CompositeProxy;
 
 public interface MacApplication extends Application, MacApplicationMixin {
@@ -76,7 +81,14 @@ public interface MacApplication extends Application, MacApplicationMixin {
 
     @Override
     default Map<String, String> extraAppImageFileData() {
-        return Stream.of(ExtraAppImageFileField.values()).collect(toMap(ExtraAppImageFileField::fieldName, x -> x.asString(this)));
+        return Stream.of(ExtraAppImageFileField.values()).map(field -> {
+            return field.findStringValue(this).map(value -> {
+                return Map.entry(field.fieldName(), value);
+            });
+        })
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
     public static MacApplication create(Application app, MacApplicationMixin mixin) {
@@ -84,23 +96,31 @@ public interface MacApplication extends Application, MacApplicationMixin {
     }
 
     public enum ExtraAppImageFileField {
-        SIGNED("signed", app -> Boolean.toString(app.sign())),
-        APP_STORE("app-store", app -> Boolean.toString(app.appStore()));
+        SIGNED(MAC_SIGNED, app -> {
+            return Optional.of(Boolean.toString(app.sign()));
+        }),
+        APP_STORE(MAC_APP_STORE, app -> {
+            return Optional.of(Boolean.toString(app.appStore()));
+        }),
+        APP_CLASS(MAC_MAIN_CLASS, app -> {
+            return app.mainLauncher().flatMap(Launcher::startupInfo).map(LauncherStartupInfo::qualifiedClassName);
+        }),
+        ;
 
-        ExtraAppImageFileField(String fieldName, Function<MacApplication, String> getter) {
-            this.fieldName = fieldName;
+        ExtraAppImageFileField(OptionValue<?> option, Function<MacApplication, Optional<String>> getter) {
+            this.fieldName = option.getName();
             this.getter = getter;
         }
 
-        public String fieldName() {
+        String fieldName() {
             return fieldName;
         }
 
-        String asString(MacApplication app) {
+        Optional<String> findStringValue(MacApplication app) {
             return getter.apply(app);
         }
 
         private final String fieldName;
-        private final Function<MacApplication, String> getter;
+        private final Function<MacApplication, Optional<String>> getter;
     }
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index afa71d84d5c..7ce20925439 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -23,12 +23,6 @@
 # questions.
 #
 #
-
-app.bundler.name=Mac Application Image
-store.bundler.name=Mac App Store Ready Bundler
-dmg.bundler.name=Mac DMG Package
-pkg.bundler.name=Mac PKG Package
-
 error.invalid-cfbundle-version.advice=Set a compatible 'app-version' value. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate found
 error.explicit-sign-no-cert.advice=Specify a valid mac-signing-key-user-name and mac-signing-keychain
@@ -60,7 +54,6 @@ resource.pkg-background-image=pkg background image
 resource.pkg-pdf=project definition file
 resource.launchd-plist-file=launchd plist file
 
-
 message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
 message.preparing-info-plist=Preparing Info.plist: {0}.
 message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used. The default icon will be used in it's place.
@@ -70,7 +63,6 @@ message.creating-association-with-null-extension=Creating association with null
 message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
 message.already.signed=File already signed: {0}.
 message.keychain.error=Error: unable to get keychain list.
-message.building-bundle=Building Mac App Store Package for {0}.
 message.invalid-identifier=invalid mac bundle identifier [{0}].
 message.invalid-identifier.advice=specify identifier with "--mac-package-identifier".
 message.building-dmg=Building DMG package for {0}.
diff --git a/src/jdk.jpackage/macosx/classes/module-info.java.extra b/src/jdk.jpackage/macosx/classes/module-info.java.extra
index 1496167cd4a..e6202dd1156 100644
--- a/src/jdk.jpackage/macosx/classes/module-info.java.extra
+++ b/src/jdk.jpackage/macosx/classes/module-info.java.extra
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,5 @@
  * questions.
  */
 
-provides jdk.jpackage.internal.Bundler with
-    jdk.jpackage.internal.MacAppBundler,
-    jdk.jpackage.internal.MacDmgBundler,
-    jdk.jpackage.internal.MacPkgBundler;
-
+provides jdk.jpackage.internal.cli.CliBundlingEnvironment with
+    jdk.jpackage.internal.MacBundlingEnvironment;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
deleted file mode 100644
index 93d037c6a45..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.Optional;
-
-import jdk.internal.util.OperatingSystem;
-
-import jdk.jpackage.internal.Arguments.CLIOptions;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-
-/*
- * AddLauncherArguments
- *
- * Processes a add-launcher properties file to create the Map of
- * bundle params applicable to the add-launcher:
- *
- * BundlerParams p = (new AddLauncherArguments(file)).getLauncherMap();
- *
- * A add-launcher is another executable program generated by either the
- * create-app-image mode or the create-installer mode.
- * The add-launcher may be the same program with different configuration,
- * or a completely different program created from the same files.
- *
- * There may be multiple add-launchers, each created by using the
- * command line arg "--add-launcher <file path>
- *
- * The add-launcher properties file may have any of:
- *
- * appVersion
- * description
- * module
- * main-jar
- * main-class
- * icon
- * arguments
- * java-options
- * launcher-as-service
- * win-console
- * win-shortcut
- * win-menu
- * linux-app-category
- * linux-shortcut
- *
- */
-class AddLauncherArguments {
-
-    private final String name;
-    private final String filename;
-    private Map<String, String> allArgs;
-    private Map<String, ? super Object> bundleParams;
-
-    AddLauncherArguments(String name, String filename) {
-        this.name = name;
-        this.filename = filename;
-    }
-
-    private void initLauncherMap() {
-        if (bundleParams != null) {
-            return;
-        }
-
-        allArgs = Arguments.getPropertiesFromFile(filename);
-        allArgs.put(CLIOptions.NAME.getId(), name);
-
-        bundleParams = new HashMap<>();
-        String mainJar = getOptionValue(CLIOptions.MAIN_JAR);
-        String mainClass = getOptionValue(CLIOptions.APPCLASS);
-        String module = getOptionValue(CLIOptions.MODULE);
-
-        if (module != null && mainClass != null) {
-            Arguments.putUnlessNull(bundleParams, CLIOptions.MODULE.getId(),
-                    module + "/" + mainClass);
-        } else if (module != null) {
-            Arguments.putUnlessNull(bundleParams, CLIOptions.MODULE.getId(),
-                    module);
-        } else {
-            Arguments.putUnlessNull(bundleParams, CLIOptions.MAIN_JAR.getId(),
-                    mainJar);
-            Arguments.putUnlessNull(bundleParams, CLIOptions.APPCLASS.getId(),
-                    mainClass);
-        }
-
-        Arguments.putUnlessNull(bundleParams, CLIOptions.NAME.getId(),
-                getOptionValue(CLIOptions.NAME));
-
-        Arguments.putUnlessNull(bundleParams, CLIOptions.VERSION.getId(),
-                getOptionValue(CLIOptions.VERSION));
-
-        Arguments.putUnlessNull(bundleParams, CLIOptions.DESCRIPTION.getId(),
-                getOptionValue(CLIOptions.DESCRIPTION));
-
-        Arguments.putUnlessNull(bundleParams, CLIOptions.RELEASE.getId(),
-                getOptionValue(CLIOptions.RELEASE));
-
-        Arguments.putUnlessNull(bundleParams, CLIOptions.ICON.getId(),
-                Optional.ofNullable(getOptionValue(CLIOptions.ICON)).map(
-                        Path::of).orElse(null));
-
-        Arguments.putUnlessNull(bundleParams,
-                CLIOptions.LAUNCHER_AS_SERVICE.getId(), getOptionValue(
-                CLIOptions.LAUNCHER_AS_SERVICE));
-
-        if (OperatingSystem.isWindows()) {
-            Arguments.putUnlessNull(bundleParams,
-                    CLIOptions.WIN_CONSOLE_HINT.getId(),
-                    getOptionValue(CLIOptions.WIN_CONSOLE_HINT));
-            Arguments.putUnlessNull(bundleParams, CLIOptions.WIN_SHORTCUT_HINT.getId(),
-                    getOptionValue(CLIOptions.WIN_SHORTCUT_HINT));
-            Arguments.putUnlessNull(bundleParams, CLIOptions.WIN_MENU_HINT.getId(),
-                    getOptionValue(CLIOptions.WIN_MENU_HINT));
-        }
-
-        if (OperatingSystem.isLinux()) {
-            Arguments.putUnlessNull(bundleParams, CLIOptions.LINUX_CATEGORY.getId(),
-                    getOptionValue(CLIOptions.LINUX_CATEGORY));
-            Arguments.putUnlessNull(bundleParams, CLIOptions.LINUX_SHORTCUT_HINT.getId(),
-                    getOptionValue(CLIOptions.LINUX_SHORTCUT_HINT));
-        }
-
-        // "arguments" and "java-options" even if value is null:
-        if (allArgs.containsKey(CLIOptions.ARGUMENTS.getId())) {
-            String argumentStr = getOptionValue(CLIOptions.ARGUMENTS);
-            bundleParams.put(CLIOptions.ARGUMENTS.getId(),
-                    Arguments.getArgumentList(argumentStr));
-        }
-
-        if (allArgs.containsKey(CLIOptions.JAVA_OPTIONS.getId())) {
-            String jvmargsStr = getOptionValue(CLIOptions.JAVA_OPTIONS);
-            bundleParams.put(CLIOptions.JAVA_OPTIONS.getId(),
-                    Arguments.getArgumentList(jvmargsStr));
-        }
-    }
-
-    private String getOptionValue(CLIOptions option) {
-        if (option == null || allArgs == null) {
-            return null;
-        }
-
-        String id = option.getId();
-
-        if (allArgs.containsKey(id)) {
-            return allArgs.get(id);
-        }
-
-        return null;
-    }
-
-    Map<String, ? super Object> getLauncherMap() {
-        initLauncherMap();
-        return bundleParams;
-    }
-
-    static Map<String, ? super Object> merge(
-            Map<String, ? super Object> original,
-            Map<String, ? super Object> additional, String... exclude) {
-        Map<String, ? super Object> tmp = new HashMap<>(original);
-        List.of(exclude).forEach(tmp::remove);
-
-        // remove LauncherData from map so it will be re-computed
-        tmp.remove(LAUNCHER_DATA.getID());
-        // remove "application-name" so it will be re-computed
-        tmp.remove(APP_NAME.getID());
-
-        if (additional.containsKey(CLIOptions.MODULE.getId())) {
-            tmp.remove(CLIOptions.MAIN_JAR.getId());
-            tmp.remove(CLIOptions.APPCLASS.getId());
-        } else if (additional.containsKey(CLIOptions.MAIN_JAR.getId())) {
-            tmp.remove(CLIOptions.MODULE.getId());
-        }
-        if (additional.containsKey(CLIOptions.ARGUMENTS.getId())) {
-            // if add launcher properties file contains "arguments", even with
-            // null value, disregard the "arguments" from command line
-            tmp.remove(CLIOptions.ARGUMENTS.getId());
-        }
-        if (additional.containsKey(CLIOptions.JAVA_OPTIONS.getId())) {
-            // same thing for java-options
-            tmp.remove(CLIOptions.JAVA_OPTIONS.getId());
-        }
-        tmp.putAll(additional);
-        return tmp;
-    }
-
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
deleted file mode 100644
index 192630a5656..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.Map;
-import java.util.Objects;
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
-
-
-class AppImageBundler extends AbstractBundler {
-
-    @Override
-    public final String getName() {
-        return I18N.getString("app.bundler.name");
-    }
-
-    @Override
-    public final String getID() {
-        return "app";
-    }
-
-    @Override
-    public final String getBundleType() {
-        return "IMAGE";
-    }
-
-    @Override
-    public final boolean validate(Map<String, ? super Object> params)
-            throws ConfigException {
-        try {
-            Objects.requireNonNull(params);
-
-            if (!params.containsKey(PREDEFINED_APP_IMAGE.getID())
-                    && !StandardBundlerParam.isRuntimeInstaller(params)) {
-                LAUNCHER_DATA.fetchFrom(params);
-            }
-
-            if (paramsValidator != null) {
-                paramsValidator.validate(params);
-            }
-        } catch (RuntimeException re) {
-            if (re.getCause() instanceof ConfigException) {
-                throw (ConfigException) re.getCause();
-            } else {
-                throw new ConfigException(re);
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public final Path execute(Map<String, ? super Object> params,
-            Path outputParentDir) throws PackagerException {
-
-        final var predefinedAppImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
-
-        try {
-            if (predefinedAppImage == null) {
-                Path rootDirectory = createRoot(params, outputParentDir);
-                appImageSupplier.prepareApplicationFiles(params, rootDirectory);
-                return rootDirectory;
-            } else {
-                appImageSupplier.prepareApplicationFiles(params, predefinedAppImage);
-                return predefinedAppImage;
-            }
-        } catch (PackagerException pe) {
-            throw pe;
-        } catch (RuntimeException|IOException ex) {
-            Log.verbose(ex);
-            throw new PackagerException(ex);
-        }
-    }
-
-    @Override
-    public final boolean supported(boolean runtimeInstaller) {
-        return true;
-    }
-
-    @Override
-    public final boolean isDefault() {
-        return false;
-    }
-
-    @FunctionalInterface
-    static interface AppImageSupplier {
-
-        void prepareApplicationFiles(Map<String, ? super Object> params,
-                Path root) throws PackagerException, IOException;
-    }
-
-    final AppImageBundler setAppImageSupplier(AppImageSupplier v) {
-        appImageSupplier = v;
-        return this;
-    }
-
-    final AppImageBundler setParamsValidator(ParamsValidator v) {
-        paramsValidator = v;
-        return this;
-    }
-
-    @FunctionalInterface
-    interface ParamsValidator {
-        void validate(Map<String, ? super Object> params) throws ConfigException;
-    }
-
-    private Path createRoot(Map<String, ? super Object> params,
-            Path outputDirectory) throws PackagerException, IOException {
-
-        IOUtils.writableOutputDir(outputDirectory);
-
-        String imageName = APP_NAME.fetchFrom(params);
-        if (OperatingSystem.isMacOS()) {
-            imageName = imageName + ".app";
-        }
-
-        Log.verbose(MessageFormat.format(
-                I18N.getString("message.creating-app-bundle"),
-                imageName, outputDirectory.toAbsolutePath()));
-
-        // Create directory structure
-        Path rootDirectory = outputDirectory.resolve(imageName);
-        if (Files.exists(rootDirectory)) {
-            throw new PackagerException("error.root-exists",
-                    rootDirectory.toAbsolutePath().toString());
-        }
-
-        Files.createDirectories(rootDirectory);
-
-        return rootDirectory;
-    }
-
-    private ParamsValidator paramsValidator;
-    private AppImageSupplier appImageSupplier;
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
index 8b8a22edc56..ec8c9a31173 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
@@ -25,148 +25,148 @@
 package jdk.jpackage.internal;
 
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableMap;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.APP_VERSION;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_AS_SERVICE;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_NAME;
 import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.OptionValue;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardAppImageFileOption.AppImageFileOptionScope;
+import jdk.jpackage.internal.cli.StandardAppImageFileOption.InvalidOptionValueException;
+import jdk.jpackage.internal.cli.StandardAppImageFileOption.MissingMandatoryOptionException;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.ExternalApplication;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.util.XmlUtils;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
 
-final class AppImageFile implements ExternalApplication {
+final class AppImageFile {
 
     AppImageFile(Application app) {
-        this(new ApplicationData(app));
-    }
-
-    private AppImageFile(ApplicationData app) {
-
-        appVersion = app.version();
-        launcherName = app.mainLauncherName();
-        mainClass = app.mainLauncherMainClassName();
-        extra = app.extra;
-        creatorVersion = getVersion();
-        creatorPlatform = getPlatform();
-        addLauncherInfos = app.additionalLaunchers;
-    }
-
-    @Override
-    public List<LauncherInfo> getAddLaunchers() {
-        return addLauncherInfos;
-    }
-
-    @Override
-    public String getAppVersion() {
-        return appVersion;
-    }
-
-    @Override
-    public String getAppName() {
-        return launcherName;
-    }
-
-    @Override
-    public String getLauncherName() {
-        return launcherName;
-    }
-
-    @Override
-    public String getMainClass() {
-        return mainClass;
-    }
-
-    @Override
-    public Map<String, String> getExtra() {
-        return extra;
+        appVersion = Objects.requireNonNull(app.version());
+        extra = Objects.requireNonNull(app.extraAppImageFileData());
+        launcherInfos = app.launchers().stream().map(LauncherInfo::new).toList();
     }
 
     /**
-     * Saves file with application image info in application image using values
-     * from this instance.
+     * Writes the values captured in this instance into the application image info
+     * file in the given application layout.
+     * <p>
+     * It is an equivalent to calling
+     * {@link #save(ApplicationLayout, OperatingSystem)} method with
+     * {@code OperatingSystem.current()} for the second parameter.
+     *
+     * @param appLayout the application layout
+     * @throws IOException if an I/O error occurs when writing
      */
     void save(ApplicationLayout appLayout) throws IOException {
+        save(appLayout, OperatingSystem.current());
+    }
+
+    /**
+     * Writes the values captured in this instance into the application image info
+     * file in the given application layout.
+     *
+     * @param appLayout the application layout
+     * @param os the target OS
+     * @throws IOException if an I/O error occurs when writing
+     */
+    void save(ApplicationLayout appLayout, OperatingSystem os) throws IOException {
         XmlUtils.createXml(getPathInAppImage(appLayout), xml -> {
             xml.writeStartElement("jpackage-state");
-            xml.writeAttribute("version", creatorVersion);
-            xml.writeAttribute("platform", creatorPlatform);
+            xml.writeAttribute("version", getVersion());
+            xml.writeAttribute("platform", getPlatform(os));
 
             xml.writeStartElement("app-version");
             xml.writeCharacters(appVersion);
             xml.writeEndElement();
 
-            xml.writeStartElement("main-launcher");
-            xml.writeCharacters(launcherName);
-            xml.writeEndElement();
-
-            xml.writeStartElement("main-class");
-            xml.writeCharacters(mainClass);
-            xml.writeEndElement();
-
             for (var extraKey : extra.keySet().stream().sorted().toList()) {
                 xml.writeStartElement(extraKey);
                 xml.writeCharacters(extra.get(extraKey));
                 xml.writeEndElement();
             }
 
-            for (var li : addLauncherInfos) {
-                xml.writeStartElement("add-launcher");
-                xml.writeAttribute("name", li.name());
-                xml.writeAttribute("service", Boolean.toString(li.service()));
-                for (var extraKey : li.extra().keySet().stream().sorted().toList()) {
-                    xml.writeStartElement(extraKey);
-                    xml.writeCharacters(li.extra().get(extraKey));
-                    xml.writeEndElement();
-                }
-                xml.writeEndElement();
+            launcherInfos.getFirst().save(xml, "main-launcher");
+
+            for (var li : launcherInfos.subList(1, launcherInfos.size())) {
+                li.save(xml, "add-launcher");
             }
         });
     }
 
     /**
-     * Returns path to application image info file.
-     * @param appLayout - application layout
+     * Returns the path to the application image info file in the given application layout.
+     *
+     * @param appLayout the application layout
      */
     static Path getPathInAppImage(ApplicationLayout appLayout) {
         return appLayout.appDirectory().resolve(FILENAME);
     }
 
     /**
-     * Loads application image info from application image.
-     * @param appImageDir - path at which to resolve the given application layout
-     * @param appLayout - application layout
+     * Loads application image info from the specified application layout.
+     * <p>
+     * It is an equivalent to calling
+     * {@link #load(ApplicationLayout, OperatingSystem)} method with
+     * {@code OperatingSystem.current()} for the second parameter.
+     *
+     * @param appLayout the application layout
      */
-    static AppImageFile load(Path appImageDir, ApplicationLayout appLayout) throws ConfigException, IOException {
-        var srcFilePath = getPathInAppImage(appLayout.resolveAt(appImageDir));
+    static ExternalApplication load(ApplicationLayout appLayout) {
+        return load(appLayout, OperatingSystem.current());
+    }
+
+    /**
+     * Loads application image info from the specified application layout and OS.
+     *
+     * @param appLayout the application layout
+     * @param os        the OS defining extra properties of the application and
+     *                  additional launchers
+     */
+    static ExternalApplication load(ApplicationLayout appLayout, OperatingSystem os) {
+        Objects.requireNonNull(appLayout);
+        Objects.requireNonNull(os);
+
+        final var appImageDir = appLayout.rootDirectory();
+        final var appImageFilePath = getPathInAppImage(appLayout);
+        final var relativeAppImageFilePath = appImageDir.relativize(appImageFilePath);
+
         try {
-            final Document doc = XmlUtils.initDocumentBuilder().parse(Files.newInputStream(srcFilePath));
+            final Document doc = XmlUtils.initDocumentBuilder().parse(Files.newInputStream(appImageFilePath));
 
             final XPath xPath = XPathFactory.newInstance().newXPath();
 
             final var isPlatformValid = XmlUtils.queryNodes(doc, xPath, "/jpackage-state/@platform").findFirst().map(
-                    Node::getNodeValue).map(getPlatform()::equals).orElse(false);
+                    Node::getNodeValue).map(getPlatform(os)::equals).orElse(false);
             if (!isPlatformValid) {
                 throw new InvalidAppImageFileException();
             }
@@ -177,102 +177,73 @@ final class AppImageFile implements ExternalApplication {
                 throw new InvalidAppImageFileException();
             }
 
-            final AppImageProperties props;
+            final var appOptions = AppImageFileOptionScope.APP.parse(appImageFilePath, AppImageProperties.main(doc, xPath), os);
+
+            final var mainLauncherOptions = LauncherElement.MAIN.readAll(doc, xPath).stream().reduce((_, second) -> {
+                return second;
+            }).map(launcherProps -> {
+                return AppImageFileOptionScope.LAUNCHER.parse(appImageFilePath, launcherProps, os);
+            }).orElseThrow(InvalidAppImageFileException::new);
+
+            final var addLauncherOptions = LauncherElement.ADDITIONAL.readAll(doc, xPath).stream().map(launcherProps -> {
+                return AppImageFileOptionScope.LAUNCHER.parse(appImageFilePath, launcherProps, os);
+            }).toList();
+
             try {
-                props = AppImageProperties.main(doc, xPath);
-            } catch (IllegalArgumentException ex) {
+                return ExternalApplication.create(Options.concat(appOptions, mainLauncherOptions), addLauncherOptions, os);
+            } catch (NoSuchElementException ex) {
                 throw new InvalidAppImageFileException(ex);
             }
 
-            final var additionalLaunchers = AppImageProperties.launchers(doc, xPath).stream().map(launcherProps -> {
-                try {
-                    return new LauncherInfo(launcherProps.get("name"),
-                            launcherProps.find("service").map(Boolean::parseBoolean).orElse(false), launcherProps.getExtra());
-                } catch (IllegalArgumentException ex) {
-                    throw new InvalidAppImageFileException(ex);
-                }
-            }).toList();
-
-            return new AppImageFile(new ApplicationData(props.get("app-version"), props.get("main-launcher"),
-                    props.get("main-class"), props.getExtra(), additionalLaunchers));
-
         } catch (XPathExpressionException ex) {
             // This should never happen as XPath expressions should be correct
-            throw new RuntimeException(ex);
+            throw ExceptionBox.rethrowUnchecked(ex);
         } catch (SAXException ex) {
-            // Exception reading input XML (probably malformed XML)
-            throw new IOException(ex);
+            // Malformed input XML
+            throw new JPackageException(I18N.format("error.malformed-app-image-file", relativeAppImageFilePath, appImageDir), ex);
         } catch (NoSuchFileException ex) {
-            throw I18N.buildConfigException("error.foreign-app-image", appImageDir).create();
-        } catch (InvalidAppImageFileException ex) {
+            // Don't save the original exception as its error message is redundant.
+            throw new JPackageException(I18N.format("error.missing-app-image-file", relativeAppImageFilePath, appImageDir));
+        } catch (InvalidAppImageFileException|InvalidOptionValueException|MissingMandatoryOptionException ex) {
             // Invalid input XML
-            throw I18N.buildConfigException("error.invalid-app-image", appImageDir, srcFilePath).create();
+            throw new JPackageException(I18N.format("error.invalid-app-image-file", relativeAppImageFilePath, appImageDir), ex);
+        } catch (IOException ex) {
+            throw new JPackageException(I18N.format("error.reading-app-image-file", relativeAppImageFilePath, appImageDir), ex);
         }
     }
 
-    static boolean getBooleanExtraFieldValue(String fieldId, ExternalApplication appImageFile) {
-        Objects.requireNonNull(fieldId);
-        Objects.requireNonNull(appImageFile);
-        return Optional.ofNullable(appImageFile.getExtra().get(fieldId)).map(Boolean::parseBoolean).orElse(false);
-    }
-
     static String getVersion() {
         return System.getProperty("java.version");
     }
 
-    static String getPlatform() {
-        return PLATFORM_LABELS.get(OperatingSystem.current());
+    static String getPlatform(OperatingSystem os) {
+        return Objects.requireNonNull(PLATFORM_LABELS.get(Objects.requireNonNull(os)));
     }
 
+
     private static final class AppImageProperties {
-        private AppImageProperties(Map<String, String> data, Set<String> stdKeys) {
-            this.data = data;
-            this.stdKeys = stdKeys;
+
+        static Map<String, String> main(Document xml, XPath xPath) throws XPathExpressionException {
+            return queryProperties(xml.getDocumentElement(), xPath, MAIN_PROPERTIES_XPATH_QUERY);
         }
 
-        static AppImageProperties main(Document xml, XPath xPath) throws XPathExpressionException {
-            final var data = queryProperties(xml.getDocumentElement(), xPath, MAIN_PROPERTIES_XPATH_QUERY);
-            return new AppImageProperties(data, MAIN_ELEMENT_NAMES);
-        }
+        static Map<String, String> launcher(Element launcherNode, XPath xPath) throws XPathExpressionException {
+            final var attrData = XmlUtils.toStream(launcherNode.getAttributes())
+                    .collect(toUnmodifiableMap(Node::getNodeName, Node::getNodeValue));
 
-        static AppImageProperties launcher(Element addLauncherNode, XPath xPath) throws XPathExpressionException {
-            final var attrData = XmlUtils.toStream(addLauncherNode.getAttributes())
-                    .collect(toMap(Node::getNodeName, Node::getNodeValue));
-
-            final var extraData = queryProperties(addLauncherNode, xPath, LAUNCHER_PROPERTIES_XPATH_QUERY);
+            final var extraData = queryProperties(launcherNode, xPath, LAUNCHER_PROPERTIES_XPATH_QUERY);
 
             final Map<String, String> data = new HashMap<>(attrData);
             data.putAll(extraData);
 
-            return new AppImageProperties(data, LAUNCHER_ATTR_NAMES);
-        }
-
-        static List<AppImageProperties> launchers(Document xml, XPath xPath) throws XPathExpressionException {
-            return XmlUtils.queryNodes(xml, xPath, "/jpackage-state/add-launcher")
-                    .map(Element.class::cast).map(toFunction(e -> {
-                        return launcher(e, xPath);
-                    })).toList();
-        }
-
-        String get(String name) {
-            return find(name).orElseThrow(InvalidAppImageFileException::new);
-        }
-
-        Optional<String> find(String name) {
-            return Optional.ofNullable(data.get(name));
-        }
-
-        Map<String, String> getExtra() {
-            Map<String, String> extra = new HashMap<>(data);
-            stdKeys.forEach(extra::remove);
-            return extra;
+            return data;
         }
 
         private static  Map<String, String> queryProperties(Element e, XPath xPath, String xpathExpr)
                 throws XPathExpressionException {
             return XmlUtils.queryNodes(e, xPath, xpathExpr)
                     .map(Element.class::cast)
-                    .collect(toMap(Node::getNodeName, selectedElement -> {
+                    .collect(toUnmodifiableMap(Node::getNodeName, selectedElement -> {
                         return selectedElement.getTextContent();
                     }, (a, b) -> b));
         }
@@ -285,13 +256,14 @@ final class AppImageFile implements ExternalApplication {
             return String.format("*[(%s) and not(*)]", otherElementNames);
         }
 
-        private final Map<String, String> data;
-        private final Set<String> stdKeys;
-
-        private static final Set<String> LAUNCHER_ATTR_NAMES = Set.of("name", "service");
+        private static final Set<String> LAUNCHER_ATTR_NAMES = Stream.of(
+                LAUNCHER_NAME
+        ).map(OptionValue::getName).collect(toUnmodifiableSet());
         private static final String LAUNCHER_PROPERTIES_XPATH_QUERY = xpathQueryForExtraProperties(LAUNCHER_ATTR_NAMES);
 
-        private static final Set<String> MAIN_ELEMENT_NAMES = Set.of("app-version", "main-launcher", "main-class");
+        private static final Set<String> MAIN_ELEMENT_NAMES = Stream.of(
+                APP_VERSION
+        ).map(OptionValue::getName).collect(toUnmodifiableSet());
         private static final String MAIN_PROPERTIES_XPATH_QUERY;
 
         static {
@@ -301,40 +273,64 @@ final class AppImageFile implements ExternalApplication {
 
             MAIN_PROPERTIES_XPATH_QUERY = String.format("%s|/jpackage-state/%s", nonEmptyMainElements,
                     xpathQueryForExtraProperties(Stream.concat(MAIN_ELEMENT_NAMES.stream(),
-                            Stream.of("add-launcher")).collect(toSet())));
+                            Stream.of("main-launcher", "add-launcher")).collect(toUnmodifiableSet())));
         }
     }
 
-    private record ApplicationData(String version, String mainLauncherName, String mainLauncherMainClassName,
-            Map<String, String> extra, List<LauncherInfo> additionalLaunchers) {
 
-        ApplicationData {
-            Objects.requireNonNull(version);
-            Objects.requireNonNull(mainLauncherName);
-            Objects.requireNonNull(mainLauncherMainClassName);
-            Objects.requireNonNull(extra);
-            Objects.requireNonNull(additionalLaunchers);
+    private enum LauncherElement {
+        MAIN("main-launcher"),
+        ADDITIONAL("add-launcher");
 
-            for (final var property : List.of(version, mainLauncherName, mainLauncherMainClassName)) {
-                if (property.isBlank()) {
-                    throw new IllegalArgumentException();
-                }
+        LauncherElement(String elementName) {
+            this.elementName = Objects.requireNonNull(elementName);
+        }
+
+        List<Map<String, String>> readAll(Document xml, XPath xPath) throws XPathExpressionException {
+            return XmlUtils.queryNodes(xml, xPath, "/jpackage-state/" + elementName + "[@name]")
+                    .map(Element.class::cast).map(toFunction(e -> {
+                        return AppImageProperties.launcher(e, xPath);
+                    })).toList();
+        }
+
+        private final String elementName;
+    }
+
+    private record LauncherInfo(String name, Map<String, String> properties) {
+        LauncherInfo {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(properties);
+        }
+
+        LauncherInfo(Launcher launcher) {
+            this(launcher.name(), properties(launcher));
+        }
+
+        void save(XMLStreamWriter xml, String elementName) throws IOException, XMLStreamException {
+            xml.writeStartElement(elementName);
+            xml.writeAttribute("name", name());
+            for (var key : properties().keySet().stream().sorted().toList()) {
+                xml.writeStartElement(key);
+                xml.writeCharacters(properties().get(key));
+                xml.writeEndElement();
             }
+            xml.writeEndElement();
         }
 
-        ApplicationData(Application app) {
-            this(app, app.mainLauncher().orElseThrow());
-        }
+        private static Map<String, String> properties(Launcher launcher) {
+            List<Map.Entry<String, String>> standardProps = new ArrayList<>();
+            if (launcher.isService()) {
+                standardProps.add(Map.entry(LAUNCHER_AS_SERVICE.getName(), Boolean.TRUE.toString()));
+            }
 
-        private ApplicationData(Application app, Launcher mainLauncher) {
-            this(app.version(), mainLauncher.name(), mainLauncher.startupInfo().orElseThrow().qualifiedClassName(),
-                    app.extraAppImageFileData(), app.additionalLaunchers().stream().map(launcher -> {
-                        return new LauncherInfo(launcher.name(), launcher.isService(),
-                                launcher.extraAppImageFileData());
-                    }).toList());
+            return Stream.concat(
+                    standardProps.stream(),
+                    launcher.extraAppImageFileData().entrySet().stream()
+            ).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
         }
     }
 
+
     private static class InvalidAppImageFileException extends RuntimeException {
 
         InvalidAppImageFileException() {
@@ -347,13 +343,10 @@ final class AppImageFile implements ExternalApplication {
         private static final long serialVersionUID = 1L;
     }
 
+
     private final String appVersion;
-    private final String launcherName;
-    private final String mainClass;
     private final Map<String, String> extra;
-    private final List<LauncherInfo> addLauncherInfos;
-    private final String creatorVersion;
-    private final String creatorPlatform;
+    private final List<LauncherInfo> launcherInfos;
 
     private static final String FILENAME = ".jpackage.xml";
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
index 76a5fc1a50c..e9324f65671 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
@@ -35,12 +35,13 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.ExternalApplication;
-import jdk.jpackage.internal.model.ExternalApplication.LauncherInfo;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.LauncherIcon;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
@@ -55,11 +56,9 @@ final class ApplicationBuilder {
         final var launchersAsList = Optional.ofNullable(launchers).map(
                 ApplicationLaunchers::asList).orElseGet(List::of);
 
-        final var launcherCount = launchersAsList.size();
-
-        if (launcherCount != launchersAsList.stream().map(Launcher::name).distinct().count()) {
-            throw buildConfigException("ERR_NoUniqueName").create();
-        }
+        launchersAsList.stream().collect(Collectors.toMap(Launcher::name, x -> x, (a, b) -> {
+            throw new JPackageException(I18N.format("error.launcher-duplicate-name", a.name()));
+        }));
 
         final String effectiveName;
         if (name != null) {
@@ -88,25 +87,8 @@ final class ApplicationBuilder {
         return this;
     }
 
-    ApplicationBuilder initFromExternalApplication(ExternalApplication app,
-            Function<LauncherInfo, Launcher> mapper) {
-
-        externalApp = Objects.requireNonNull(app);
-
-        if (version == null) {
-            version = app.getAppVersion();
-        }
-        if (name == null) {
-            name = app.getAppName();
-        }
-        runtimeBuilder = null;
-
-        var mainLauncherInfo = new LauncherInfo(app.getLauncherName(), false, Map.of());
-
-        launchers = new ApplicationLaunchers(
-                mapper.apply(mainLauncherInfo),
-                app.getAddLaunchers().stream().map(mapper).toList());
-
+    ApplicationBuilder externalApplication(ExternalApplication v) {
+        externalApp = v;
         return this;
     }
 
@@ -123,15 +105,6 @@ final class ApplicationBuilder {
         return Optional.ofNullable(externalApp);
     }
 
-    Optional<String> mainLauncherClassName() {
-        return launchers()
-                .map(ApplicationLaunchers::mainLauncher)
-                .flatMap(Launcher::startupInfo)
-                .map(LauncherStartupInfo::qualifiedClassName).or(() -> {
-                    return externalApplication().map(ExternalApplication::getMainClass);
-                });
-    }
-
     ApplicationBuilder appImageLayout(AppImageLayout v) {
         appImageLayout = v;
         return this;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
deleted file mode 100644
index 0ea72ae160c..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ApplicationLayout;
-
-
-final class ApplicationLayoutUtils {
-
-    public static final ApplicationLayout PLATFORM_APPLICATION_LAYOUT;
-
-    private static final ApplicationLayout WIN_APPLICATION_LAYOUT = ApplicationLayout.build()
-            .setAll("")
-            .appDirectory("app")
-            .runtimeDirectory("runtime")
-            .appModsDirectory(Path.of("app", "mods"))
-            .create();
-
-    private static final ApplicationLayout MAC_APPLICATION_LAYOUT = ApplicationLayout.build()
-            .launchersDirectory("Contents/MacOS")
-            .appDirectory("Contents/app")
-            .runtimeDirectory("Contents/runtime/Contents/Home")
-            .desktopIntegrationDirectory("Contents/Resources")
-            .appModsDirectory("Contents/app/mods")
-            .contentDirectory("Contents")
-            .create();
-
-    private static final ApplicationLayout LINUX_APPLICATION_LAYOUT = ApplicationLayout.build()
-            .launchersDirectory("bin")
-            .appDirectory("lib/app")
-            .runtimeDirectory("lib/runtime")
-            .desktopIntegrationDirectory("lib")
-            .appModsDirectory("lib/app/mods")
-            .contentDirectory("lib")
-            .create();
-
-    static {
-        switch (OperatingSystem.current()) {
-            case WINDOWS -> PLATFORM_APPLICATION_LAYOUT = WIN_APPLICATION_LAYOUT;
-            case MACOS -> PLATFORM_APPLICATION_LAYOUT = MAC_APPLICATION_LAYOUT;
-            case LINUX -> PLATFORM_APPLICATION_LAYOUT = LINUX_APPLICATION_LAYOUT;
-            default -> {
-                throw new UnsupportedOperationException();
-            }
-        }
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
deleted file mode 100644
index f0323bbd841..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
-import java.io.IOException;
-import java.io.Reader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Arguments
- *
- * This class encapsulates and processes the command line arguments,
- * in effect, implementing all the work of jpackage tool.
- *
- * The primary entry point, processArguments():
- * Processes and validates command line arguments, constructing DeployParams.
- * Validates the DeployParams, and generate the BundleParams.
- * Generates List of Bundlers from BundleParams valid for this platform.
- * Executes each Bundler in the list.
- */
-public class Arguments {
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MainResources");
-
-    private static final String FA_EXTENSIONS = "extension";
-    private static final String FA_CONTENT_TYPE = "mime-type";
-    private static final String FA_DESCRIPTION = "description";
-    private static final String FA_ICON = "icon";
-
-    // Mac specific file association keys
-    // String
-    public static final String MAC_CFBUNDLETYPEROLE = "mac.CFBundleTypeRole";
-    public static final String MAC_LSHANDLERRANK = "mac.LSHandlerRank";
-    public static final String MAC_NSSTORETYPEKEY = "mac.NSPersistentStoreTypeKey";
-    public static final String MAC_NSDOCUMENTCLASS = "mac.NSDocumentClass";
-    // Boolean
-    public static final String MAC_LSTYPEISPACKAGE = "mac.LSTypeIsPackage";
-    public static final String MAC_LSDOCINPLACE = "mac.LSSupportsOpeningDocumentsInPlace";
-    public static final String MAC_UIDOCBROWSER = "mac.UISupportsDocumentBrowser";
-     // Array of strings
-    public static final String MAC_NSEXPORTABLETYPES = "mac.NSExportableTypes";
-    public static final String MAC_UTTYPECONFORMSTO = "mac.UTTypeConformsTo";
-
-    // regexp for parsing args (for example, for additional launchers)
-    private static Pattern pattern = Pattern.compile(
-          "(?:(?:([\"'])(?:\\\\\\1|.)*?(?:\\1|$))|(?:\\\\[\"'\\s]|[^\\s]))++");
-
-    private DeployParams deployParams = null;
-
-    private int pos = 0;
-    private List<String> argList = null;
-
-    private List<CLIOptions> allOptions = null;
-
-    private boolean hasMainJar = false;
-    private boolean hasMainClass = false;
-    private boolean hasMainModule = false;
-    public boolean userProvidedBuildRoot = false;
-
-    private String buildRoot = null;
-    private String mainJarPath = null;
-
-    private boolean runtimeInstaller = false;
-
-    private List<AddLauncherArguments> addLaunchers = null;
-
-    private static final Map<String, CLIOptions> argIds = new HashMap<>();
-    private static final Map<String, CLIOptions> argShortIds = new HashMap<>();
-
-    static {
-        // init maps for parsing arguments
-        (EnumSet.allOf(CLIOptions.class)).forEach(option -> {
-            argIds.put(option.getIdWithPrefix(), option);
-            if (option.getShortIdWithPrefix() != null) {
-                argShortIds.put(option.getShortIdWithPrefix(), option);
-            }
-        });
-    }
-
-    private static final InheritableThreadLocal<Arguments> instance =
-            new InheritableThreadLocal<Arguments>();
-
-    public Arguments(String[] args) {
-        instance.set(this);
-
-        argList = new ArrayList<String>(args.length);
-        for (String arg : args) {
-            argList.add(arg);
-        }
-
-        pos = 0;
-
-        deployParams = new DeployParams();
-
-        allOptions = new ArrayList<>();
-
-        addLaunchers = new ArrayList<>();
-    }
-
-    // CLIOptions is public for DeployParamsTest
-    public enum CLIOptions {
-        PACKAGE_TYPE("type", "t", OptionCategories.PROPERTY, () -> {
-            var type = popArg();
-            context().deployParams.setTargetFormat(type);
-            setOptionValue("type", type);
-        }),
-
-        INPUT ("input", "i", OptionCategories.PROPERTY, () -> {
-            setOptionValue("input", popArg());
-        }),
-
-        OUTPUT ("dest", "d", OptionCategories.PROPERTY, () -> {
-            var path = Path.of(popArg());
-            setOptionValue("dest", path);
-        }),
-
-        DESCRIPTION ("description", OptionCategories.PROPERTY),
-
-        VENDOR ("vendor", OptionCategories.PROPERTY),
-
-        APPCLASS ("main-class", OptionCategories.PROPERTY, () -> {
-            context().hasMainClass = true;
-            setOptionValue("main-class", popArg());
-        }),
-
-        NAME ("name", "n", OptionCategories.PROPERTY),
-
-        VERBOSE ("verbose", OptionCategories.PROPERTY, () -> {
-            setOptionValue("verbose", true);
-            Log.setVerbose();
-        }),
-
-        RESOURCE_DIR("resource-dir",
-                OptionCategories.PROPERTY, () -> {
-            String resourceDir = popArg();
-            setOptionValue("resource-dir", resourceDir);
-        }),
-
-        DMG_CONTENT ("mac-dmg-content", OptionCategories.PROPERTY, () -> {
-            List<String> content = getArgumentList(popArg());
-            content.forEach(a -> setOptionValue("mac-dmg-content", a));
-        }),
-
-        ARGUMENTS ("arguments", OptionCategories.PROPERTY, () -> {
-            List<String> arguments = getArgumentList(popArg());
-            setOptionValue("arguments", arguments);
-        }),
-
-        JLINK_OPTIONS ("jlink-options", OptionCategories.PROPERTY, () -> {
-            List<String> options = getArgumentList(popArg());
-            setOptionValue("jlink-options", options);
-        }),
-
-        ICON ("icon", OptionCategories.PROPERTY),
-
-        COPYRIGHT ("copyright", OptionCategories.PROPERTY),
-
-        LICENSE_FILE ("license-file", OptionCategories.PROPERTY),
-
-        VERSION ("app-version", OptionCategories.PROPERTY),
-
-        RELEASE ("linux-app-release", OptionCategories.PROPERTY),
-
-        ABOUT_URL ("about-url", OptionCategories.PROPERTY),
-
-        JAVA_OPTIONS ("java-options", OptionCategories.PROPERTY, () -> {
-            List<String> args = getArgumentList(popArg());
-            args.forEach(a -> setOptionValue("java-options", a));
-        }),
-
-        APP_CONTENT ("app-content", OptionCategories.PROPERTY, () -> {
-            getArgumentList(popArg()).forEach(
-                    a -> setOptionValue("app-content", a));
-        }),
-
-        FILE_ASSOCIATIONS ("file-associations",
-                OptionCategories.PROPERTY, () -> {
-            Map<String, ? super Object> args = new HashMap<>();
-
-            // load .properties file
-            Map<String, String> initialMap = getPropertiesFromFile(popArg());
-
-            putUnlessNull(args, StandardBundlerParam.FA_EXTENSIONS.getID(),
-                    initialMap.get(FA_EXTENSIONS));
-
-            putUnlessNull(args, StandardBundlerParam.FA_CONTENT_TYPE.getID(),
-                    initialMap.get(FA_CONTENT_TYPE));
-
-            putUnlessNull(args, StandardBundlerParam.FA_DESCRIPTION.getID(),
-                    initialMap.get(FA_DESCRIPTION));
-
-            putUnlessNull(args, StandardBundlerParam.FA_ICON.getID(),
-                    initialMap.get(FA_ICON));
-
-            // Mac extended file association arguments
-            putUnlessNull(args, MAC_CFBUNDLETYPEROLE,
-                    initialMap.get(MAC_CFBUNDLETYPEROLE));
-
-            putUnlessNull(args, MAC_LSHANDLERRANK,
-                    initialMap.get(MAC_LSHANDLERRANK));
-
-            putUnlessNull(args, MAC_NSSTORETYPEKEY,
-                    initialMap.get(MAC_NSSTORETYPEKEY));
-
-            putUnlessNull(args, MAC_NSDOCUMENTCLASS,
-                    initialMap.get(MAC_NSDOCUMENTCLASS));
-
-            putUnlessNull(args, MAC_LSTYPEISPACKAGE,
-                    initialMap.get(MAC_LSTYPEISPACKAGE));
-
-            putUnlessNull(args, MAC_LSDOCINPLACE,
-                    initialMap.get(MAC_LSDOCINPLACE));
-
-            putUnlessNull(args, MAC_UIDOCBROWSER,
-                    initialMap.get(MAC_UIDOCBROWSER));
-
-            putUnlessNull(args, MAC_NSEXPORTABLETYPES,
-                    initialMap.get(MAC_NSEXPORTABLETYPES));
-
-            putUnlessNull(args, MAC_UTTYPECONFORMSTO,
-                    initialMap.get(MAC_UTTYPECONFORMSTO));
-
-            ArrayList<Map<String, ? super Object>> associationList =
-                new ArrayList<Map<String, ? super Object>>();
-
-            associationList.add(args);
-
-            // check that we really add _another_ value to the list
-            setOptionValue("file-associations", associationList);
-
-        }),
-
-        ADD_LAUNCHER ("add-launcher",
-                    OptionCategories.PROPERTY, () -> {
-            String spec = popArg();
-            String name = null;
-            String filename = spec;
-            if (spec.contains("=")) {
-                String[] values = spec.split("=", 2);
-                name = values[0];
-                filename = values[1];
-            }
-            context().addLaunchers.add(
-                new AddLauncherArguments(name, filename));
-        }),
-
-        TEMP_ROOT ("temp", OptionCategories.PROPERTY, () -> {
-            context().buildRoot = popArg();
-            context().userProvidedBuildRoot = true;
-            setOptionValue("temp", context().buildRoot);
-        }),
-
-        INSTALL_DIR ("install-dir", OptionCategories.PROPERTY),
-
-        PREDEFINED_APP_IMAGE ("app-image", OptionCategories.PROPERTY),
-
-        PREDEFINED_RUNTIME_IMAGE ("runtime-image", OptionCategories.PROPERTY),
-
-        MAIN_JAR ("main-jar",  OptionCategories.PROPERTY, () -> {
-            context().mainJarPath = popArg();
-            context().hasMainJar = true;
-            setOptionValue("main-jar", context().mainJarPath);
-        }),
-
-        MODULE ("module", "m", OptionCategories.MODULAR, () -> {
-            context().hasMainModule = true;
-            setOptionValue("module", popArg());
-        }),
-
-        ADD_MODULES ("add-modules", OptionCategories.MODULAR),
-
-        MODULE_PATH ("module-path", "p", OptionCategories.MODULAR),
-
-        LAUNCHER_AS_SERVICE ("launcher-as-service", OptionCategories.PROPERTY, () -> {
-            setOptionValue("launcher-as-service", true);
-        }),
-
-        MAC_SIGN ("mac-sign", "s", OptionCategories.PLATFORM_MAC, () -> {
-            setOptionValue("mac-sign", true);
-        }),
-
-        MAC_APP_STORE ("mac-app-store", OptionCategories.PLATFORM_MAC, () -> {
-            setOptionValue("mac-app-store", true);
-        }),
-
-        MAC_CATEGORY ("mac-app-category", OptionCategories.PLATFORM_MAC),
-
-        MAC_BUNDLE_NAME ("mac-package-name", OptionCategories.PLATFORM_MAC),
-
-        MAC_BUNDLE_IDENTIFIER("mac-package-identifier",
-                    OptionCategories.PLATFORM_MAC),
-
-        MAC_BUNDLE_SIGNING_PREFIX ("mac-package-signing-prefix",
-                    OptionCategories.PLATFORM_MAC),
-
-        MAC_SIGNING_KEY_NAME ("mac-signing-key-user-name",
-                    OptionCategories.PLATFORM_MAC),
-
-        MAC_APP_IMAGE_SIGN_IDENTITY ("mac-app-image-sign-identity",
-                    OptionCategories.PLATFORM_MAC),
-
-        MAC_INSTALLER_SIGN_IDENTITY ("mac-installer-sign-identity",
-                    OptionCategories.PLATFORM_MAC),
-
-        MAC_SIGNING_KEYCHAIN ("mac-signing-keychain",
-                    OptionCategories.PLATFORM_MAC),
-
-        MAC_ENTITLEMENTS ("mac-entitlements", OptionCategories.PLATFORM_MAC),
-
-        WIN_HELP_URL ("win-help-url", OptionCategories.PLATFORM_WIN),
-
-        WIN_UPDATE_URL ("win-update-url", OptionCategories.PLATFORM_WIN),
-
-        WIN_MENU_HINT ("win-menu", OptionCategories.PLATFORM_WIN,
-                createArgumentWithOptionalValueAction("win-menu")),
-
-        WIN_MENU_GROUP ("win-menu-group", OptionCategories.PLATFORM_WIN),
-
-        WIN_SHORTCUT_HINT ("win-shortcut", OptionCategories.PLATFORM_WIN,
-                createArgumentWithOptionalValueAction("win-shortcut")),
-
-        WIN_SHORTCUT_PROMPT ("win-shortcut-prompt",
-                OptionCategories.PLATFORM_WIN, () -> {
-            setOptionValue("win-shortcut-prompt", true);
-        }),
-
-        WIN_PER_USER_INSTALLATION ("win-per-user-install",
-                OptionCategories.PLATFORM_WIN, () -> {
-            setOptionValue("win-per-user-install", false);
-        }),
-
-        WIN_DIR_CHOOSER ("win-dir-chooser",
-                OptionCategories.PLATFORM_WIN, () -> {
-            setOptionValue("win-dir-chooser", true);
-        }),
-
-        WIN_UPGRADE_UUID ("win-upgrade-uuid",
-                OptionCategories.PLATFORM_WIN),
-
-        WIN_CONSOLE_HINT ("win-console", OptionCategories.PLATFORM_WIN, () -> {
-            setOptionValue("win-console", true);
-        }),
-
-        LINUX_BUNDLE_NAME ("linux-package-name",
-                OptionCategories.PLATFORM_LINUX),
-
-        LINUX_DEB_MAINTAINER ("linux-deb-maintainer",
-                OptionCategories.PLATFORM_LINUX),
-
-        LINUX_CATEGORY ("linux-app-category",
-                OptionCategories.PLATFORM_LINUX),
-
-        LINUX_RPM_LICENSE_TYPE ("linux-rpm-license-type",
-                OptionCategories.PLATFORM_LINUX),
-
-        LINUX_PACKAGE_DEPENDENCIES ("linux-package-deps",
-                OptionCategories.PLATFORM_LINUX),
-
-        LINUX_SHORTCUT_HINT ("linux-shortcut", OptionCategories.PLATFORM_LINUX,
-                createArgumentWithOptionalValueAction("linux-shortcut")),
-
-        LINUX_MENU_GROUP ("linux-menu-group", OptionCategories.PLATFORM_LINUX);
-
-        private final String id;
-        private final String shortId;
-        private final OptionCategories category;
-        private final Runnable action;
-        private static Arguments argContext;
-
-        private CLIOptions(String id, OptionCategories category) {
-            this(id, null, category, null);
-        }
-
-        private CLIOptions(String id, String shortId,
-                           OptionCategories category) {
-            this(id, shortId, category, null);
-        }
-
-        private CLIOptions(String id,
-                OptionCategories category, Runnable action) {
-            this(id, null, category, action);
-        }
-
-        private CLIOptions(String id, String shortId,
-                           OptionCategories category, Runnable action) {
-            this.id = id;
-            this.shortId = shortId;
-            this.action = action;
-            this.category = category;
-        }
-
-        public static Arguments context() {
-            return instance.get();
-        }
-
-        public String getId() {
-            return this.id;
-        }
-
-        String getIdWithPrefix() {
-            return "--" + this.id;
-        }
-
-        String getShortIdWithPrefix() {
-            return this.shortId == null ? null : "-" + this.shortId;
-        }
-
-        void execute() {
-            if (action != null) {
-                action.run();
-            } else {
-                defaultAction();
-            }
-        }
-
-        private void defaultAction() {
-            context().deployParams.addBundleArgument(id, popArg());
-        }
-
-        private static void setOptionValue(String option, Object value) {
-            context().deployParams.addBundleArgument(option, value);
-        }
-
-        private static String popArg() {
-            nextArg();
-            return (context().pos >= context().argList.size()) ?
-                            "" : context().argList.get(context().pos);
-        }
-
-        private static String getArg() {
-            return (context().pos >= context().argList.size()) ?
-                        "" : context().argList.get(context().pos);
-        }
-
-        private static void nextArg() {
-            context().pos++;
-        }
-
-        private static void prevArg() {
-            Objects.checkIndex(context().pos, context().argList.size());
-            context().pos--;
-        }
-
-        private static boolean hasNextArg() {
-            return context().pos < context().argList.size();
-        }
-
-        private static Runnable createArgumentWithOptionalValueAction(String option) {
-            Objects.requireNonNull(option);
-            return () -> {
-                nextArg();
-                if (hasNextArg()) {
-                    var value = getArg();
-                    if (value.startsWith("-")) {
-                        prevArg();
-                        setOptionValue(option, true);
-                    } else {
-                        setOptionValue(option, value);
-                    }
-                } else {
-                    setOptionValue(option, true);
-                }
-            };
-        }
-    }
-
-    enum OptionCategories {
-        MODULAR,
-        PROPERTY,
-        PLATFORM_MAC,
-        PLATFORM_WIN,
-        PLATFORM_LINUX;
-    }
-
-    public boolean processArguments() {
-        try {
-            // parse cmd line
-            String arg;
-            CLIOptions option;
-            for (; CLIOptions.hasNextArg(); CLIOptions.nextArg()) {
-                arg = CLIOptions.getArg();
-                if ((option = toCLIOption(arg)) != null) {
-                    // found a CLI option
-                    allOptions.add(option);
-                    option.execute();
-                } else {
-                    throw new PackagerException("ERR_InvalidOption", arg);
-                }
-            }
-
-            // display error for arguments that are not supported
-            // for current configuration.
-
-            validateArguments();
-
-            List<Map<String, ? super Object>> launchersAsMap =
-                    new ArrayList<>();
-
-            for (AddLauncherArguments sl : addLaunchers) {
-                launchersAsMap.add(sl.getLauncherMap());
-            }
-
-            deployParams.addBundleArgument(
-                    StandardBundlerParam.ADD_LAUNCHERS.getID(),
-                    launchersAsMap);
-
-            // at this point deployParams should be already configured
-
-            deployParams.validate();
-
-            BundleParams bp = deployParams.getBundleParams();
-
-            // validate name(s)
-            ArrayList<String> usedNames = new ArrayList<String>();
-            usedNames.add(bp.getName()); // add main app name
-
-            for (AddLauncherArguments sl : addLaunchers) {
-                Map<String, ? super Object> slMap = sl.getLauncherMap();
-                String slName =
-                        (String) slMap.get(Arguments.CLIOptions.NAME.getId());
-                if (slName == null) {
-                    throw new PackagerException("ERR_NoAddLauncherName");
-                }
-                // same rules apply to additional launcher names as app name
-                DeployParams.validateName(slName, false);
-                for (String usedName : usedNames) {
-                    if (slName.equals(usedName)) {
-                        throw new PackagerException("ERR_NoUniqueName");
-                    }
-                }
-                usedNames.add(slName);
-            }
-
-            generateBundle(bp.getBundleParamsAsMap());
-            return true;
-        } catch (Exception e) {
-            Log.verbose(e);
-            String msg1 = e.getMessage();
-            Log.fatalError(msg1);
-            if (e.getCause() != null && e.getCause() != e) {
-                String msg2 = e.getCause().getMessage();
-                if (msg2 != null && !msg1.contains(msg2)) {
-                    Log.fatalError(msg2);
-                }
-            }
-            return false;
-        }
-    }
-
-    private void validateArguments() throws PackagerException {
-        String type = deployParams.getTargetFormat();
-        String ptype = (type != null) ? type : "default";
-        boolean imageOnly = deployParams.isTargetAppImage();
-        boolean hasAppImage = allOptions.contains(
-                CLIOptions.PREDEFINED_APP_IMAGE);
-        boolean hasRuntime = allOptions.contains(
-                CLIOptions.PREDEFINED_RUNTIME_IMAGE);
-        boolean installerOnly = !imageOnly && hasAppImage;
-        boolean isMac = OperatingSystem.isMacOS();
-        runtimeInstaller = !imageOnly && hasRuntime && !hasAppImage &&
-                !hasMainModule && !hasMainJar;
-
-        for (CLIOptions option : allOptions) {
-            if (!ValidOptions.checkIfSupported(option)) {
-                // includes option valid only on different platform
-                throw new PackagerException("ERR_UnsupportedOption",
-                        option.getIdWithPrefix());
-            }
-            if ((imageOnly && !isMac) || (imageOnly && !hasAppImage && isMac)) {
-                if (!ValidOptions.checkIfImageSupported(option)) {
-                    throw new PackagerException("ERR_InvalidTypeOption",
-                        option.getIdWithPrefix(), type);
-                }
-            } else if (imageOnly && hasAppImage && isMac) { // Signing app image
-                if (!ValidOptions.checkIfSigningSupported(option)) {
-                    throw new PackagerException(
-                            "ERR_InvalidOptionWithAppImageSigning",
-                            option.getIdWithPrefix());
-                }
-            } else if (installerOnly || runtimeInstaller) {
-                if (!ValidOptions.checkIfInstallerSupported(option)) {
-                    if (runtimeInstaller) {
-                        throw new PackagerException("ERR_NoInstallerEntryPoint",
-                            option.getIdWithPrefix());
-                    } else {
-                        throw new PackagerException("ERR_InvalidTypeOption",
-                            option.getIdWithPrefix(), ptype);
-                   }
-                }
-            }
-        }
-        if (hasRuntime) {
-            if (hasAppImage) {
-                // note --runtime-image is only for image or runtime installer.
-                throw new PackagerException("ERR_MutuallyExclusiveOptions",
-                        CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(),
-                        CLIOptions.PREDEFINED_APP_IMAGE.getIdWithPrefix());
-            }
-            if (allOptions.contains(CLIOptions.ADD_MODULES)) {
-                throw new PackagerException("ERR_MutuallyExclusiveOptions",
-                        CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(),
-                        CLIOptions.ADD_MODULES.getIdWithPrefix());
-            }
-            if (allOptions.contains(CLIOptions.JLINK_OPTIONS)) {
-                throw new PackagerException("ERR_MutuallyExclusiveOptions",
-                        CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(),
-                        CLIOptions.JLINK_OPTIONS.getIdWithPrefix());
-            }
-        }
-        if (allOptions.contains(CLIOptions.MAC_SIGNING_KEY_NAME) &&
-            allOptions.contains(CLIOptions.MAC_APP_IMAGE_SIGN_IDENTITY)) {
-                throw new PackagerException("ERR_MutuallyExclusiveOptions",
-                        CLIOptions.MAC_SIGNING_KEY_NAME.getIdWithPrefix(),
-                        CLIOptions.MAC_APP_IMAGE_SIGN_IDENTITY.getIdWithPrefix());
-        }
-        if (allOptions.contains(CLIOptions.MAC_SIGNING_KEY_NAME) &&
-            allOptions.contains(CLIOptions.MAC_INSTALLER_SIGN_IDENTITY)) {
-                throw new PackagerException("ERR_MutuallyExclusiveOptions",
-                        CLIOptions.MAC_SIGNING_KEY_NAME.getIdWithPrefix(),
-                        CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getIdWithPrefix());
-        }
-        if (isMac && (imageOnly || "dmg".equals(type)) &&
-            allOptions.contains(CLIOptions.MAC_INSTALLER_SIGN_IDENTITY)) {
-                throw new PackagerException("ERR_InvalidTypeOption",
-                        CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getIdWithPrefix(),
-                        type);
-        }
-        if (allOptions.contains(CLIOptions.DMG_CONTENT)
-                && !("dmg".equals(type))) {
-            throw new PackagerException("ERR_InvalidTypeOption",
-                    CLIOptions.DMG_CONTENT.getIdWithPrefix(), ptype);
-        }
-        if (hasMainJar && hasMainModule) {
-            throw new PackagerException("ERR_BothMainJarAndModule");
-        }
-        if (imageOnly && !hasAppImage && !hasMainJar && !hasMainModule) {
-                throw new PackagerException("ERR_NoEntryPoint");
-        }
-    }
-
-    private jdk.jpackage.internal.Bundler getPlatformBundler() {
-        boolean appImage = deployParams.isTargetAppImage();
-        String type = deployParams.getTargetFormat();
-        String bundleType = (appImage ?  "IMAGE" : "INSTALLER");
-
-        for (jdk.jpackage.internal.Bundler bundler :
-                Bundlers.createBundlersInstance().getBundlers(bundleType)) {
-            if (type == null) {
-                if (bundler.isDefault()) {
-                    return bundler;
-                }
-            } else {
-                if (appImage || type.equalsIgnoreCase(bundler.getID())) {
-                    return bundler;
-                }
-            }
-        }
-        return null;
-    }
-
-    private void generateBundle(Map<String,? super Object> params)
-            throws PackagerException {
-
-        // the temp dir needs to be fetched from the params early,
-        // to prevent each copy of the params (such as may be used for
-        // additional launchers) from generating a separate temp dir when
-        // the default is used (the default is a new temp directory)
-        // The bundler.cleanup() below would not otherwise be able to
-        // clean these extra (and unneeded) temp directories.
-        StandardBundlerParam.TEMP_ROOT.fetchFrom(params);
-
-        // determine what bundler to run
-        jdk.jpackage.internal.Bundler bundler = getPlatformBundler();
-
-        if (bundler == null || !bundler.supported(runtimeInstaller)) {
-            String type = Optional.ofNullable(bundler).map(Bundler::getID).orElseGet(
-                    () -> deployParams.getTargetFormat());
-            throw new PackagerException("ERR_InvalidInstallerType", type);
-        }
-
-        Map<String, ? super Object> localParams = new HashMap<>(params);
-        try {
-            Path result = executeBundler(bundler, params, localParams);
-            if (result == null) {
-                throw new PackagerException("MSG_BundlerFailed",
-                        bundler.getID(), bundler.getName());
-            }
-            Log.verbose(MessageFormat.format(
-                    I18N.getString("message.bundle-created"),
-                    bundler.getName()));
-        } catch (ConfigException e) {
-            Log.verbose(e);
-            if (e.getAdvice() != null)  {
-                throw new PackagerException(e, "MSG_BundlerConfigException",
-                        bundler.getName(), e.getMessage(), e.getAdvice());
-            } else {
-                throw new PackagerException(e,
-                       "MSG_BundlerConfigExceptionNoAdvice",
-                        bundler.getName(), e.getMessage());
-            }
-        } catch (RuntimeException re) {
-            Log.verbose(re);
-            throw new PackagerException(re, "MSG_BundlerRuntimeException",
-                    bundler.getName(), re.toString());
-        } finally {
-            if (userProvidedBuildRoot) {
-                Log.verbose(MessageFormat.format(
-                        I18N.getString("message.debug-working-directory"),
-                        (Path.of(buildRoot)).toAbsolutePath().toString()));
-            } else {
-                // always clean up the temporary directory created
-                // when --temp option not used.
-                bundler.cleanup(localParams);
-            }
-        }
-    }
-
-    private static Path executeBundler(Bundler bundler, Map<String, ? super Object> params,
-            Map<String, ? super Object> localParams) throws ConfigException, PackagerException {
-        try {
-            bundler.validate(localParams);
-            return bundler.execute(localParams, StandardBundlerParam.OUTPUT_DIR.fetchFrom(params));
-        } catch (ConfigException|PackagerException ex) {
-            throw ex;
-        } catch (RuntimeException ex) {
-            if (ex.getCause() instanceof ConfigException cfgEx) {
-                throw cfgEx;
-            } else if (ex.getCause() instanceof PackagerException pkgEx) {
-                throw pkgEx;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-    static CLIOptions toCLIOption(String arg) {
-        CLIOptions option;
-        if ((option = argIds.get(arg)) == null) {
-            option = argShortIds.get(arg);
-        }
-        return option;
-    }
-
-    static Map<String, String> getPropertiesFromFile(String filename) {
-        Map<String, String> map = new HashMap<>();
-        // load properties file
-        Properties properties = new Properties();
-        try (Reader reader = Files.newBufferedReader(Path.of(filename))) {
-            properties.load(reader);
-        } catch (IOException e) {
-            Log.error("Exception: " + e.getMessage());
-        }
-
-        for (final String name: properties.stringPropertyNames()) {
-            map.put(name, properties.getProperty(name));
-        }
-
-        return map;
-    }
-
-    static List<String> getArgumentList(String inputString) {
-        List<String> list = new ArrayList<>();
-        if (inputString == null || inputString.isEmpty()) {
-             return list;
-        }
-
-        // The "pattern" regexp attempts to abide to the rule that
-        // strings are delimited by whitespace unless surrounded by
-        // quotes, then it is anything (including spaces) in the quotes.
-        Matcher m = pattern.matcher(inputString);
-        while (m.find()) {
-            String s = inputString.substring(m.start(), m.end()).trim();
-            // Ensure we do not have an empty string. trim() will take care of
-            // whitespace only strings. The regex preserves quotes and escaped
-            // chars so we need to clean them before adding to the List
-            if (!s.isEmpty()) {
-                list.add(unquoteIfNeeded(s));
-            }
-        }
-        return list;
-    }
-
-    static void putUnlessNull(Map<String, ? super Object> params,
-            String param, Object value) {
-        if (value != null) {
-            params.put(param, value);
-        }
-    }
-
-    private static String unquoteIfNeeded(String in) {
-        if (in == null) {
-            return null;
-        }
-
-        if (in.isEmpty()) {
-            return "";
-        }
-
-        // Use code points to preserve non-ASCII chars
-        StringBuilder sb = new StringBuilder();
-        int codeLen = in.codePointCount(0, in.length());
-        int quoteChar = -1;
-        for (int i = 0; i < codeLen; i++) {
-            int code = in.codePointAt(i);
-            if (code == '"' || code == '\'') {
-                // If quote is escaped make sure to copy it
-                if (i > 0 && in.codePointAt(i - 1) == '\\') {
-                    sb.deleteCharAt(sb.length() - 1);
-                    sb.appendCodePoint(code);
-                    continue;
-                }
-                if (quoteChar != -1) {
-                    if (code == quoteChar) {
-                        // close quote, skip char
-                        quoteChar = -1;
-                    } else {
-                        sb.appendCodePoint(code);
-                    }
-                } else {
-                    // opening quote, skip char
-                    quoteChar = code;
-                }
-            } else {
-                sb.appendCodePoint(code);
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java
deleted file mode 100644
index 7f444fe7337..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.ServiceLoader;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * BasicBundlers
- *
- * A basic bundlers collection that loads the default bundlers.
- * Loads the common bundlers.
- * <UL>
- *     <LI>Windows file image</LI>
- *     <LI>Mac .app</LI>
- *     <LI>Linux file image</LI>
- *     <LI>Windows MSI</LI>
- *     <LI>Windows EXE</LI>
- *     <LI>Mac DMG</LI>
- *     <LI>Mac PKG</LI>
- *     <LI>Linux DEB</LI>
- *     <LI>Linux RPM</LI>
- *
- * </UL>
- */
-public class BasicBundlers implements Bundlers {
-
-    boolean defaultsLoaded = false;
-
-    private final Collection<Bundler> bundlers = new CopyOnWriteArrayList<>();
-
-    @Override
-    public Collection<Bundler> getBundlers() {
-        return Collections.unmodifiableCollection(bundlers);
-    }
-
-    @Override
-    public Collection<Bundler> getBundlers(String type) {
-        if (type == null) return Collections.emptySet();
-        switch (type) {
-            case "NONE":
-                return Collections.emptySet();
-            case "ALL":
-                return getBundlers();
-            default:
-                return Arrays.asList(getBundlers().stream()
-                        .filter(b -> type.equalsIgnoreCase(b.getBundleType()))
-                        .toArray(Bundler[]::new));
-        }
-    }
-
-    // Loads bundlers from the META-INF/services direct
-    @Override
-    public void loadBundlersFromServices(ClassLoader cl) {
-        ServiceLoader<Bundler> loader = ServiceLoader.load(Bundler.class, cl);
-        for (Bundler aLoader : loader) {
-            bundlers.add(aLoader);
-        }
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromOptions.java
new file mode 100644
index 00000000000..8faabe97a3d
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromOptions.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.RESOURCE_DIR;
+import static jdk.jpackage.internal.cli.StandardOption.TEMP_ROOT;
+import static jdk.jpackage.internal.cli.StandardOption.VERBOSE;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.RuntimeLayout;
+
+final class BuildEnvFromOptions {
+
+    BuildEnvFromOptions() {
+        predefinedRuntimeImageLayout(RuntimeLayout.DEFAULT);
+    }
+
+    BuildEnvFromOptions predefinedAppImageLayout(Function<Path, ApplicationLayout> v) {
+        predefinedAppImageLayout = v;
+        return this;
+    }
+
+    BuildEnvFromOptions predefinedAppImageLayout(ApplicationLayout v) {
+        return predefinedAppImageLayout(path -> v.resolveAt(path));
+    }
+
+    BuildEnvFromOptions predefinedRuntimeImageLayout(Function<Path, RuntimeLayout> v) {
+        predefinedRuntimeImageLayout = v;
+        return this;
+    }
+
+    BuildEnvFromOptions predefinedRuntimeImageLayout(RuntimeLayout v) {
+        return predefinedRuntimeImageLayout(path -> v.resolveAt(path));
+    }
+
+    BuildEnv create(Options options, Application app) {
+        return create(options, app, Optional.empty());
+    }
+
+    BuildEnv create(Options options, Package pkg) {
+        return create(options, pkg.app(), Optional.of(pkg));
+    }
+
+    private BuildEnv create(Options options, Application app, Optional<Package> pkg) {
+        Objects.requireNonNull(options);
+        Objects.requireNonNull(app);
+        Objects.requireNonNull(pkg);
+        Objects.requireNonNull(predefinedAppImageLayout);
+        Objects.requireNonNull(predefinedRuntimeImageLayout);
+
+        final var builder = new BuildEnvBuilder(TEMP_ROOT.getFrom(options));
+
+        RESOURCE_DIR.ifPresentIn(options, builder::resourceDir);
+        VERBOSE.ifPresentIn(options, builder::verbose);
+
+        if (app.isRuntime()) {
+            var path = PREDEFINED_RUNTIME_IMAGE.getFrom(options);
+            builder.appImageLayout(predefinedRuntimeImageLayout.apply(path));
+        } else if (PREDEFINED_APP_IMAGE.containsIn(options)) {
+            var path = PREDEFINED_APP_IMAGE.getFrom(options);
+            builder.appImageLayout(predefinedAppImageLayout.apply(path));
+        } else {
+            pkg.ifPresentOrElse(builder::appImageDirFor, () -> {
+                builder.appImageDirFor(app);
+            });
+        }
+
+        return builder.create();
+    }
+
+    private Function<Path, ApplicationLayout> predefinedAppImageLayout;
+    private Function<Path, RuntimeLayout> predefinedRuntimeImageLayout;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
deleted file mode 100644
index 6fb1a342fbf..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
-
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.function.Function;
-import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.RuntimeLayout;
-
-final class BuildEnvFromParams {
-
-    static BuildEnv create(Map<String, ? super Object> params,
-            Function<Path, ApplicationLayout> predefinedAppImageLayoutProvider,
-            Function<Path, RuntimeLayout> predefinedRuntimeImageLayoutProvider) throws ConfigException {
-
-        final var builder = new BuildEnvBuilder(TEMP_ROOT.fetchFrom(params));
-
-        RESOURCE_DIR.copyInto(params, builder::resourceDir);
-        VERBOSE.copyInto(params, builder::verbose);
-
-        final var app = FromParams.APPLICATION.findIn(params).orElseThrow();
-
-        final var pkg = FromParams.getCurrentPackage(params);
-
-        if (app.isRuntime()) {
-            var layout = predefinedRuntimeImageLayoutProvider.apply(PREDEFINED_RUNTIME_IMAGE.findIn(params).orElseThrow());
-            builder.appImageLayout(layout);
-        } else if (StandardBundlerParam.hasPredefinedAppImage(params)) {
-            var layout = predefinedAppImageLayoutProvider.apply(PREDEFINED_APP_IMAGE.findIn(params).orElseThrow());
-            builder.appImageLayout(layout);
-        } else if (pkg.isPresent()) {
-            builder.appImageDirFor(pkg.orElseThrow());
-        } else {
-            builder.appImageDirFor(app);
-        }
-
-        return builder.create();
-    }
-
-    static final BundlerParamInfo<BuildEnv> BUILD_ENV = BundlerParamInfo.createBundlerParam(BuildEnv.class, params -> {
-        return create(params, PLATFORM_APPLICATION_LAYOUT::resolveAt, RuntimeLayout.DEFAULT::resolveAt);
-    });
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
deleted file mode 100644
index 937a3655e8b..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-
-public class BundleParams {
-
-    protected final Map<String, ? super Object> params;
-
-    /**
-     * create a new bundle with all default values
-     */
-    public BundleParams() {
-        params = new HashMap<>();
-    }
-
-    /**
-     * Create a bundle params with a copy of the params
-     * @param params map of initial parameters to be copied in.
-     */
-    public BundleParams(Map<String, ?> params) {
-        this.params = new HashMap<>(params);
-    }
-
-    public void addAllBundleParams(Map<String, ? super Object> params) {
-        this.params.putAll(params);
-    }
-
-    // NOTE: we do not care about application parameters here
-    // as they will be embedded into jar file manifest and
-    // java launcher will take care of them!
-
-    public Map<String, ? super Object> getBundleParamsAsMap() {
-        return new HashMap<>(params);
-    }
-
-    public String getName() {
-        return APP_NAME.fetchFrom(params);
-    }
-
-    private void putUnlessNull(String param, Object value) {
-        if (value != null) {
-            params.put(param, value);
-        }
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java
deleted file mode 100644
index 0d29677e826..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.Map;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
-
-/**
- * Bundler
- *
- * The basic interface implemented by all Bundlers.
- */
-public interface Bundler {
-    /**
-     * @return User Friendly name of this bundler.
-     */
-    String getName();
-
-    /**
-     * @return Command line identifier of the bundler.  Should be unique.
-     */
-    String getID();
-
-    /**
-     * @return The bundle type of the bundle that is created by this bundler.
-     */
-    String getBundleType();
-
-    /**
-     * Determines if this bundler will execute with the given parameters.
-     *
-     * @param params The parameters to be validate.  Validation may modify
-     *               the map, so if you are going to be using the same map
-     *               across multiple bundlers you should pass in a deep copy.
-     * @return true if valid
-     * @throws ConfigException If the configuration params are incorrect.  The
-     *         exception may contain advice on how to modify the params map
-     *         to make it valid.
-     */
-    public boolean validate(Map<String, ? super Object> params)
-            throws ConfigException;
-
-    /**
-     * Creates a bundle from existing content.
-     *
-     * If a call to {@link #validate(java.util.Map)} date} returns true with
-     * the parameters map, then you can expect a valid output.
-     * However if an exception was thrown out of validate or it returned
-     * false then you should not expect sensible results from this call.
-     * It may or may not return a value, and it may or may not throw an
-     * exception.  But any output should not be considered valid or sane.
-     *
-     * @param params The Bundle parameters,
-     *               Keyed by the id from the ParamInfo.  Execution may
-     *               modify the map, so if you are going to be using the
-     *               same map across multiple bundlers you should pass
-     *               in a deep copy.
-     * @param outputParentDir
-     *   The parent dir that the returned bundle will be placed in.
-     * @return The resulting bundled file
-     *
-     * For a bundler that produces a single artifact file this will be the
-     * location of that artifact (.exe file, .deb file, etc)
-     *
-     * For a bundler that produces a specific directory format output this will
-     * be the location of that specific directory (.app file, etc).
-     *
-     * For a bundler that produce multiple files, this will be a parent
-     * directory of those files (linux and windows images), whose name is not
-     * relevant to the result.
-     *
-     * @throws java.lang.IllegalArgumentException for any of the following
-     * reasons:
-     *  <ul>
-     *      <li>A required parameter is not found in the params list, for
-     *      example missing the main class.</li>
-     *      <li>A parameter has the wrong type of an object, for example a
-     *      String where a File is required</li>
-     *      <li>Bundler specific incompatibilities with the parameters, for
-     *      example a bad version number format or an application id with
-     *      forward slashes.</li>
-     *  </ul>
-     */
-    public Path execute(Map<String, ? super Object> params,
-            Path outputParentDir) throws PackagerException;
-
-     /**
-     * Removes temporary files that are used for bundling.
-     */
-    public void cleanup(Map<String, ? super Object> params);
-
-    /**
-     * Returns "true" if this bundler is supported on current platform.
-     */
-    public boolean supported(boolean runtimeInstaller);
-
-    /**
-     * Returns "true" if this bundler is he default for the current platform.
-     */
-    public boolean isDefault();
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
deleted file mode 100644
index 81030b18f6d..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import jdk.jpackage.internal.util.function.ThrowingFunction;
-
-/**
- * BundlerParamInfo<T>
- *
- * A BundlerParamInfo encapsulates an individual bundler parameter of type <T>.
- *
- * @param id The command line and hashmap name of the parameter
- *
- * @param valueType Type of the parameter
- *
- * @param defaultValueFunction If the value is not set, and no fallback value is found, the
- * parameter uses the value returned by the producer.
- *
- * @param stringConverter An optional string converter for command line arguments.
- */
-record BundlerParamInfo<T>(String id, Class<T> valueType,
-        Function<Map<String, ? super Object>, T> defaultValueFunction,
-        BiFunction<String, Map<String, ? super Object>, T> stringConverter) {
-
-    BundlerParamInfo {
-        Objects.requireNonNull(id);
-        Objects.requireNonNull(valueType);
-    }
-
-    static BundlerParamInfo<String> createStringBundlerParam(String id) {
-        return new BundlerParamInfo<>(id, String.class, null, null);
-    }
-
-    static BundlerParamInfo<Boolean> createBooleanBundlerParam(String id) {
-        return new BundlerParamInfo<>(id, Boolean.class, null, BundlerParamInfo::toBoolean);
-    }
-
-    static BundlerParamInfo<Path> createPathBundlerParam(String id) {
-        return new BundlerParamInfo<>(id, Path.class, null, BundlerParamInfo::toPath);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    static <U> BundlerParamInfo<U> createBundlerParam(String id, Class<? super U> valueType,
-            ThrowingFunction<Map<String, ? super Object>, U> valueCtor) {
-        return new BundlerParamInfo(id, valueType, ThrowingFunction.toFunction(valueCtor), null);
-    }
-
-    static <U> BundlerParamInfo<U> createBundlerParam(Class<? super U> valueType,
-            ThrowingFunction<Map<String, ? super Object>, U> valueCtor) {
-        return createBundlerParam(valueType.getName(), valueType, valueCtor);
-    }
-
-    static boolean toBoolean(String value, Map<String, ? super Object> params) {
-        if (value == null || "null".equalsIgnoreCase(value)) {
-            return false;
-        } else {
-            return Boolean.valueOf(value);
-        }
-    }
-
-    static Path toPath(String value, Map<String, ? super Object> params) {
-        return Path.of(value);
-    }
-
-    String getID() {
-        return id;
-    }
-
-    Class<T> getValueType() {
-        return valueType;
-    }
-
-    /**
-     * Returns true if value was not provided on command line for this parameter.
-     *
-     * @param params - params from which value will be fetch
-     * @return true if value was not provided on command line, false otherwise
-     */
-    boolean getIsDefaultValue(Map<String, ? super Object> params) {
-        Object o = params.get(getID());
-        if (o != null) {
-            return false; // We have user provided value
-        }
-
-        if (params.containsKey(getID())) {
-            return false; // explicit nulls are allowed for provided value
-        }
-
-        return true;
-    }
-
-    Function<Map<String, ? super Object>, T> getDefaultValueFunction() {
-        return defaultValueFunction;
-    }
-
-    BiFunction<String, Map<String, ? super Object>, T> getStringConverter() {
-        return stringConverter;
-    }
-
-    final T fetchFrom(Map<String, ? super Object> params) {
-        return fetchFrom(params, true);
-    }
-
-    @SuppressWarnings("unchecked")
-    final T fetchFrom(Map<String, ? super Object> params,
-            boolean invokeDefault) {
-        Object o = params.get(getID());
-        if (o instanceof String && getStringConverter() != null) {
-            return getStringConverter().apply((String) o, params);
-        }
-
-        Class<T> klass = getValueType();
-        if (klass.isInstance(o)) {
-            return (T) o;
-        }
-        if (o != null) {
-            throw new IllegalArgumentException("Param " + getID()
-                    + " should be of type " + getValueType()
-                    + " but is a " + o.getClass());
-        }
-        if (params.containsKey(getID())) {
-            // explicit nulls are allowed
-            return null;
-        }
-
-        if (invokeDefault && (getDefaultValueFunction() != null)) {
-            T result = getDefaultValueFunction().apply(params);
-            if (result != null) {
-                params.put(getID(), result);
-            }
-            return result;
-        }
-
-        // ultimate fallback
-        return null;
-    }
-
-    Optional<T> findIn(Map<String, ? super Object> params) {
-        if (params.containsKey(getID())) {
-            return Optional.of(fetchFrom(params, true));
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    void copyInto(Map<String, ? super Object> params, Consumer<T> consumer) {
-        findIn(params).ifPresent(consumer);
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java
deleted file mode 100644
index 955952d563d..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-/**
- * Bundlers
- *
- * The interface implemented by BasicBundlers
- */
-public interface Bundlers {
-
-    /**
-     * This convenience method will call
-     * {@link #createBundlersInstance(ClassLoader)}
-     * with the classloader that this Bundlers is loaded from.
-     *
-     * @return an instance of Bundlers loaded and configured from
-     *         the current ClassLoader.
-     */
-    public static Bundlers createBundlersInstance() {
-        return createBundlersInstance(Bundlers.class.getClassLoader());
-    }
-
-    /**
-     * This convenience method will automatically load a Bundlers instance
-     * from either META-INF/services or the default
-     * {@link BasicBundlers} if none are found in
-     * the services meta-inf.
-     *
-     * After instantiating the bundlers instance it will load the default
-     * bundlers via {@link #loadDefaultBundlers()} as well as requesting
-     * the services loader to load any other bundelrs via
-     * {@link #loadBundlersFromServices(ClassLoader)}.
-
-     *
-     * @param servicesClassLoader the classloader to search for
-     *                            META-INF/service registered bundlers
-     * @return an instance of Bundlers loaded and configured from
-     *         the specified ClassLoader
-     */
-    public static Bundlers createBundlersInstance(
-            ClassLoader servicesClassLoader) {
-        ServiceLoader<Bundlers> bundlersLoader =
-                ServiceLoader.load(Bundlers.class, servicesClassLoader);
-        Bundlers bundlers = null;
-        Iterator<Bundlers> iter = bundlersLoader.iterator();
-        if (iter.hasNext()) {
-            bundlers = iter.next();
-        }
-        if (bundlers == null) {
-            bundlers = new BasicBundlers();
-        }
-
-        bundlers.loadBundlersFromServices(servicesClassLoader);
-        return bundlers;
-    }
-
-    /**
-     * Returns all of the preconfigured, requested, and manually
-     * configured bundlers loaded with this instance.
-     *
-     * @return  a read-only collection of the requested bundlers
-     */
-    Collection<Bundler> getBundlers();
-
-    /**
-     * Returns all of the preconfigured, requested, and manually
-     * configured bundlers loaded with this instance that are of
-     * a specific BundleType, such as disk images, installers, or
-     * remote installers.
-     *
-     * @return a read-only collection of the requested bundlers
-     */
-    Collection<Bundler> getBundlers(String type);
-
-    /**
-     * Loads bundlers from the META-INF/services directly.
-     *
-     * This method is called from the
-     * {@link #createBundlersInstance(ClassLoader)}
-     * and {@link #createBundlersInstance()} methods.
-     */
-    void loadBundlersFromServices(ClassLoader cl);
-
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java
deleted file mode 100644
index 7790ebb3ebb..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import jdk.internal.util.OperatingSystem;
-
-import java.util.ResourceBundle;
-import java.io.File;
-import java.text.MessageFormat;
-
-
-/**
- * CLIHelp
- *
- * Generate and show the command line interface help message(s).
- */
-public class CLIHelp {
-
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.HelpResources");
-
-    // generates --help for jpackage's CLI
-    public static void showHelp(boolean noArgs) {
-
-        if (noArgs) {
-            Log.info(I18N.getString("MSG_Help_no_args"));
-        } else {
-            OperatingSystem platform = OperatingSystem.current();
-            String types;
-            String pLaunchOptions;
-            String pInstallOptions;
-            String pInstallDir;
-            String pAppImageDescription;
-            String pSignSampleUsage;
-            String pAppContentNote;
-            switch (platform) {
-                case MACOS:
-                    types = "{\"app-image\", \"dmg\", \"pkg\"}";
-                    pLaunchOptions = I18N.getString("MSG_Help_mac_launcher");
-                    pInstallOptions = I18N.getString("MSG_Help_mac_install");
-                    pInstallDir
-                            = I18N.getString("MSG_Help_mac_linux_install_dir");
-                    pAppImageDescription
-                            = I18N.getString("MSG_Help_mac_app_image");
-                    pSignSampleUsage
-                            = I18N.getString("MSG_Help_mac_sign_sample_usage");
-                    pAppContentNote
-                            = I18N.getString("MSG_Help_mac_app_content_note");
-                    break;
-                case LINUX:
-                    types = "{\"app-image\", \"rpm\", \"deb\"}";
-                    pLaunchOptions = "";
-                    pInstallOptions = I18N.getString("MSG_Help_linux_install");
-                    pInstallDir
-                            = I18N.getString("MSG_Help_mac_linux_install_dir");
-                    pAppImageDescription
-                            = I18N.getString("MSG_Help_default_app_image");
-                    pSignSampleUsage = "";
-                    pAppContentNote = "";
-                    break;
-                case WINDOWS:
-                    types = "{\"app-image\", \"exe\", \"msi\"}";
-                    pLaunchOptions = I18N.getString("MSG_Help_win_launcher");
-                    pInstallOptions = I18N.getString("MSG_Help_win_install");
-                    pInstallDir
-                            = I18N.getString("MSG_Help_win_install_dir");
-                    pAppImageDescription
-                            = I18N.getString("MSG_Help_default_app_image");
-                    pSignSampleUsage = "";
-                    pAppContentNote = "";
-                    break;
-                default:
-                    types = "{\"app-image\", \"exe\", \"msi\", \"rpm\", \"deb\", \"pkg\", \"dmg\"}";
-                    pLaunchOptions = I18N.getString("MSG_Help_win_launcher")
-                            + I18N.getString("MSG_Help_mac_launcher");
-                    pInstallOptions = I18N.getString("MSG_Help_win_install")
-                            + I18N.getString("MSG_Help_linux_install")
-                            + I18N.getString("MSG_Help_mac_install");
-                    pInstallDir
-                            = I18N.getString("MSG_Help_default_install_dir");
-                    pAppImageDescription
-                            = I18N.getString("MSG_Help_default_app_image");
-                    pSignSampleUsage = "";
-                    pAppContentNote = "";
-                    break;
-            }
-            Log.info(MessageFormat.format(I18N.getString("MSG_Help"),
-                    File.pathSeparator, types, pLaunchOptions,
-                    pInstallOptions, pInstallDir, pAppImageDescription,
-                    pSignSampleUsage, pAppContentNote));
-        }
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
index 6b4ba3c4410..9cb9fb5cba0 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
@@ -30,7 +30,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
+import java.util.Objects;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
@@ -47,10 +47,14 @@ final class CfgFile {
     CfgFile(Application app, Launcher launcher) {
         startupInfo = launcher.startupInfo().orElseThrow();
         outputFileName = launcher.executableName() + ".cfg";
-        version = app.version();
+        version = Objects.requireNonNull(app.version());
     }
 
     void create(ApplicationLayout appLayout) throws IOException {
+        Objects.requireNonNull(appLayout);
+
+        Objects.requireNonNull(startupInfo.qualifiedClassName());
+
         List<Map.Entry<String, Object>> content = new ArrayList<>();
 
         final var refs = new Referencies(appLayout);
@@ -58,7 +62,7 @@ final class CfgFile {
         content.add(Map.entry("[Application]", SECTION_TAG));
 
         if (startupInfo instanceof LauncherModularStartupInfo modularStartupInfo) {
-            content.add(Map.entry("app.mainmodule", modularStartupInfo.moduleName()
+            content.add(Map.entry("app.mainmodule", Objects.requireNonNull(modularStartupInfo.moduleName())
                     + "/" + startupInfo.qualifiedClassName()));
         } else if (startupInfo instanceof LauncherJarStartupInfo jarStartupInfo) {
             Path mainJarPath = refs.appDirectory().resolve(jarStartupInfo.jarPath());
@@ -67,16 +71,13 @@ final class CfgFile {
                 content.add(Map.entry("app.mainjar", mainJarPath));
             } else {
                 content.add(Map.entry("app.classpath", mainJarPath));
-            }
-
-            if (!jarStartupInfo.isJarWithMainClass()) {
                 content.add(Map.entry("app.mainclass", startupInfo.qualifiedClassName()));
             }
         } else {
             throw new UnsupportedOperationException();
         }
 
-        for (var value : Optional.ofNullable(startupInfo.classPath()).orElseGet(List::of)) {
+        for (var value : startupInfo.classPath()) {
             content.add(Map.entry("app.classpath",
                     refs.appDirectory().resolve(value).toString()));
         }
@@ -88,7 +89,7 @@ final class CfgFile {
                 "java-options", "-Djpackage.app-version=" + version));
 
         // add user supplied java options if there are any
-        for (var value : Optional.ofNullable(startupInfo.javaOptions()).orElseGet(List::of)) {
+        for (var value : startupInfo.javaOptions()) {
             content.add(Map.entry("java-options", value));
         }
 
@@ -98,7 +99,7 @@ final class CfgFile {
             content.add(Map.entry("java-options", refs.appModsDirectory()));
         }
 
-        var arguments = Optional.ofNullable(startupInfo.defaultParameters()).orElseGet(List::of);
+        var arguments = startupInfo.defaultParameters();
         if (!arguments.isEmpty()) {
             content.add(Map.entry("[ArgOptions]", SECTION_TAG));
             for (var value : arguments) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
new file mode 100644
index 00000000000..0bf7d6f41b2
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.CliBundlingEnvironment;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardBundlingOperation;
+import jdk.jpackage.internal.model.AppImagePackageType;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.StandardPackageType;
+import jdk.jpackage.internal.util.Result;
+
+class DefaultBundlingEnvironment implements CliBundlingEnvironment {
+
+    DefaultBundlingEnvironment(Builder builder) {
+        this(Optional.ofNullable(builder.defaultOperationSupplier), builder.bundlers);
+    }
+
+    DefaultBundlingEnvironment(Optional<Supplier<Optional<BundlingOperationDescriptor>>> defaultOperationSupplier,
+            Map<BundlingOperationDescriptor, Supplier<Result<Consumer<Options>>>> bundlers) {
+
+        this.bundlers = bundlers.entrySet().stream().collect(toMap(Map.Entry::getKey, e -> {
+            return new CachingSupplier<>(e.getValue());
+        }));
+
+        this.defaultOperationSupplier = Objects.requireNonNull(defaultOperationSupplier).map(CachingSupplier::new);
+    }
+
+
+    static final class Builder {
+
+        Builder defaultOperation(Supplier<Optional<BundlingOperationDescriptor>> v) {
+            defaultOperationSupplier = v;
+            return this;
+        }
+
+        Builder defaultOperation(StandardBundlingOperation v) {
+            return defaultOperation(() -> Optional.of(v.descriptor()));
+        }
+
+        Builder bundler(StandardBundlingOperation op, Supplier<Result<Consumer<Options>>> bundlerSupplier) {
+            bundlers.put(Objects.requireNonNull(op.descriptor()), Objects.requireNonNull(bundlerSupplier));
+            return this;
+        }
+
+        <T extends SystemEnvironment> Builder bundler(StandardBundlingOperation op,
+                Supplier<Result<T>> sysEnvResultSupplier, BiConsumer<Options, T> bundler) {
+            return bundler(op, createBundlerSupplier(sysEnvResultSupplier, bundler));
+        }
+
+        Builder bundler(StandardBundlingOperation op, Consumer<Options> bundler) {
+            Objects.requireNonNull(bundler);
+            return bundler(op, () -> Result.ofValue(bundler));
+        }
+
+        private Supplier<Optional<BundlingOperationDescriptor>> defaultOperationSupplier;
+        private final Map<BundlingOperationDescriptor, Supplier<Result<Consumer<Options>>>> bundlers = new HashMap<>();
+    }
+
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    static <T extends SystemEnvironment> Supplier<Result<Consumer<Options>>> createBundlerSupplier(
+            Supplier<Result<T>> sysEnvResultSupplier, BiConsumer<Options, T> bundler) {
+        Objects.requireNonNull(sysEnvResultSupplier);
+        Objects.requireNonNull(bundler);
+        return () -> {
+            return sysEnvResultSupplier.get().map(sysEnv -> {
+                return options -> {
+                    bundler.accept(options, sysEnv);
+                };
+            });
+        };
+    }
+
+    static void createApplicationImage(Options options, Application app, PackagingPipeline.Builder pipelineBuilder) {
+        Objects.requireNonNull(options);
+        Objects.requireNonNull(app);
+        Objects.requireNonNull(pipelineBuilder);
+
+        final var outputDir = OptionUtils.outputDir(options).resolve(app.appImageDirName());
+
+        IOUtils.writableOutputDir(outputDir.getParent());
+
+        final var env = new BuildEnvFromOptions()
+                .predefinedAppImageLayout(app.asApplicationLayout().orElseThrow())
+                .create(options, app);
+
+        Log.verbose(I18N.format("message.creating-app-bundle", outputDir.getFileName(), outputDir.toAbsolutePath().getParent()));
+
+        if (Files.exists(outputDir)) {
+            throw new JPackageException(I18N.format("error.root-exists", outputDir.toAbsolutePath()));
+        }
+
+        pipelineBuilder.excludeDirFromCopying(outputDir.getParent())
+                .create().execute(BuildEnv.withAppImageDir(env, outputDir), app);
+    }
+
+    static <T extends Package> void createNativePackage(Options options,
+            Function<Options, T> createPackage,
+            BiFunction<Options, T, BuildEnv> createBuildEnv,
+            PackagingPipeline.Builder pipelineBuilder,
+            Packager.PipelineBuilderMutatorFactory<T> pipelineBuilderMutatorFactory) {
+
+        Objects.requireNonNull(pipelineBuilder);
+        createNativePackage(options, createPackage, createBuildEnv, _ -> pipelineBuilder, pipelineBuilderMutatorFactory);
+    }
+
+    static <T extends Package> void createNativePackage(Options options,
+            Function<Options, T> createPackage,
+            BiFunction<Options, T, BuildEnv> createBuildEnv,
+            Function<T, PackagingPipeline.Builder> createPipelineBuilder,
+            Packager.PipelineBuilderMutatorFactory<T> pipelineBuilderMutatorFactory) {
+
+        Objects.requireNonNull(options);
+        Objects.requireNonNull(createPackage);
+        Objects.requireNonNull(createBuildEnv);
+        Objects.requireNonNull(createPipelineBuilder);
+        Objects.requireNonNull(pipelineBuilderMutatorFactory);
+
+        var pkg = Objects.requireNonNull(createPackage.apply(options));
+
+        Packager.<T>build().pkg(pkg)
+            .outputDir(OptionUtils.outputDir(options))
+            .env(Objects.requireNonNull(createBuildEnv.apply(options, pkg)))
+            .pipelineBuilderMutatorFactory(pipelineBuilderMutatorFactory)
+            .execute(Objects.requireNonNull(createPipelineBuilder.apply(pkg)));
+    }
+
+    @Override
+    public Optional<BundlingOperationDescriptor> defaultOperation() {
+        return defaultOperationSupplier.flatMap(Supplier::get);
+    }
+
+    @Override
+    public void createBundle(BundlingOperationDescriptor op, Options cmdline) {
+        final var bundler = getBundlerSupplier(op).get().orElseThrow();
+        Optional<Path> permanentWorkDirectory = Optional.empty();
+        try (var tempDir = new TempDirectory(cmdline)) {
+            if (!tempDir.deleteOnClose()) {
+                permanentWorkDirectory = Optional.of(tempDir.path());
+            }
+            bundler.accept(tempDir.options());
+
+            var packageType = OptionUtils.bundlingOperation(cmdline).packageType();
+
+            Log.verbose(I18N.format("message.bundle-created", I18N.getString(bundleTypeDescription(packageType, op.os()))));
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        } finally {
+            permanentWorkDirectory.ifPresent(workDir -> {
+                Log.verbose(I18N.format("message.debug-working-directory", workDir.toAbsolutePath()));
+            });
+        }
+    }
+
+    @Override
+    public Collection<? extends Exception> configurationErrors(BundlingOperationDescriptor op) {
+        return getBundlerSupplier(op).get().errors();
+    }
+
+    private Supplier<Result<Consumer<Options>>> getBundlerSupplier(BundlingOperationDescriptor op) {
+        return Optional.ofNullable(bundlers.get(op)).orElseThrow(NoSuchElementException::new);
+    }
+
+    private String bundleTypeDescription(PackageType type, OperatingSystem os) {
+        switch (type) {
+            case StandardPackageType stdType -> {
+                switch (stdType) {
+                    case WIN_MSI -> {
+                        return "bundle-type.win-msi";
+                    }
+                    case WIN_EXE -> {
+                        return "bundle-type.win-exe";
+                    }
+                    case LINUX_DEB -> {
+                        return "bundle-type.linux-deb";
+                    }
+                    case LINUX_RPM -> {
+                        return "bundle-type.linux-rpm";
+                    }
+                    case MAC_DMG -> {
+                        return "bundle-type.mac-dmg";
+                    }
+                    case MAC_PKG -> {
+                        return "bundle-type.mac-pkg";
+                    }
+                    default -> {
+                        throw new AssertionError();
+                    }
+                }
+            }
+            case AppImagePackageType appImageType -> {
+                switch (os) {
+                    case WINDOWS -> {
+                        return "bundle-type.win-app";
+                    }
+                    case LINUX -> {
+                        return "bundle-type.linux-app";
+                    }
+                    case MACOS -> {
+                        return "bundle-type.mac-app";
+                    }
+                    default -> {
+                        throw new AssertionError();
+                    }
+                }
+            }
+            default -> {
+                throw new AssertionError();
+            }
+        }
+    }
+
+
+    private static final class CachingSupplier<T> implements Supplier<T> {
+
+        CachingSupplier(Supplier<T> getter) {
+            this.getter = Objects.requireNonNull(getter);
+        }
+
+        @Override
+        public T get() {
+            return cachedValue.updateAndGet(v -> {
+                return Optional.ofNullable(v).orElseGet(getter);
+            });
+        }
+
+        private final Supplier<T> getter;
+        private final AtomicReference<T> cachedValue = new AtomicReference<>();
+    }
+
+
+    private final Map<BundlingOperationDescriptor, Supplier<Result<Consumer<Options>>>> bundlers;
+    private final Optional<CachingSupplier<Optional<BundlingOperationDescriptor>>> defaultOperationSupplier;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
deleted file mode 100644
index d7b4052d34a..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.InvalidPathException;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Stream;
-import jdk.jpackage.internal.model.PackagerException;
-
-/**
- * DeployParams
- *
- * This class is generated and used in Arguments.processArguments() as
- * intermediate step in generating the BundleParams and ultimately the Bundles
- */
-public class DeployParams {
-
-    String targetFormat = null; // means default type for this platform
-
-    // raw arguments to the bundler
-    Map<String, ? super Object> bundlerArguments = new LinkedHashMap<>();
-
-    static class Template {
-        Path in;
-        Path out;
-
-        Template(Path in, Path out) {
-            this.in = in;
-            this.out = out;
-        }
-    }
-
-    // we need to expand as in some cases
-    // (most notably jpackage)
-    // we may get "." as filename and assumption is we include
-    // everything in the given folder
-    // (IOUtils.copyfiles() have recursive behavior)
-    List<Path> expandFileset(Path root) throws IOException {
-        List<Path> files = new LinkedList<>();
-        if (!Files.isSymbolicLink(root)) {
-            if (Files.isDirectory(root)) {
-                try (Stream<Path> stream = Files.list(root)) {
-                    List<Path> children = stream.toList();
-                    if (children != null && children.size() > 0) {
-                        children.forEach(f -> {
-                            try {
-                                files.addAll(expandFileset(f));
-                            } catch (IOException ex) {
-                                throw new RuntimeException(ex);
-                            }
-                        });
-                    } else {
-                        // Include empty folders
-                        files.add(root);
-                    }
-                }
-            } else {
-                files.add(root);
-            }
-        }
-        return files;
-    }
-
-    static void validateName(String s, boolean forApp)
-            throws PackagerException {
-
-        String exceptionKey = forApp ?
-            "ERR_InvalidAppName" : "ERR_InvalidSLName";
-
-        if (s == null) {
-            if (forApp) {
-                return;
-            } else {
-                throw new PackagerException(exceptionKey);
-            }
-        }
-        if (s.length() == 0 || s.charAt(s.length() - 1) == '\\') {
-            throw new PackagerException(exceptionKey, s);
-        }
-        try {
-            // name must be valid path element for this file system
-            Path p = Path.of(s);
-            // and it must be a single name element in a path
-            if (p.getNameCount() != 1) {
-                throw new PackagerException(exceptionKey, s);
-            }
-        } catch (InvalidPathException ipe) {
-            throw new PackagerException(ipe, exceptionKey, s);
-        }
-
-        for (int i = 0; i < s.length(); i++) {
-            char a = s.charAt(i);
-            // We check for ASCII codes first which we accept. If check fails,
-            // check if it is acceptable extended ASCII or unicode character.
-            if (a < ' ' || a > '~') {
-                // Accept anything else including special chars like copyright
-                // symbols. Note: space will be included by ASCII check above,
-                // but other whitespace like tabs or new line will be rejected.
-                if (Character.isISOControl(a)  ||
-                        Character.isWhitespace(a)) {
-                    throw new PackagerException(exceptionKey, s);
-                }
-            } else if (a == '"' || a == '%') {
-                throw new PackagerException(exceptionKey, s);
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public void validate() throws PackagerException {
-        boolean hasModule = (bundlerArguments.get(
-                Arguments.CLIOptions.MODULE.getId()) != null);
-        boolean hasAppImage = (bundlerArguments.get(
-                Arguments.CLIOptions.PREDEFINED_APP_IMAGE.getId()) != null);
-        boolean hasMain = (bundlerArguments.get(
-                Arguments.CLIOptions.MAIN_JAR.getId()) != null);
-        boolean hasRuntimeImage = (bundlerArguments.get(
-                Arguments.CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId()) != null);
-        boolean hasInput = (bundlerArguments.get(
-                Arguments.CLIOptions.INPUT.getId()) != null);
-        boolean hasModulePath = (bundlerArguments.get(
-                Arguments.CLIOptions.MODULE_PATH.getId()) != null);
-        boolean hasMacAppStore = (bundlerArguments.get(
-                Arguments.CLIOptions.MAC_APP_STORE.getId()) != null);
-        boolean runtimeInstaller = !isTargetAppImage() &&
-                !hasAppImage && !hasModule && !hasMain && hasRuntimeImage;
-
-        if (isTargetAppImage()) {
-            // Module application requires --runtime-image or --module-path
-            if (hasModule) {
-                if (!hasModulePath && !hasRuntimeImage && !hasAppImage) {
-                    throw new PackagerException("ERR_MissingArgument",
-                            "--runtime-image or --module-path");
-                }
-            } else {
-                if (!hasInput && !hasAppImage) {
-                    throw new PackagerException("error.no-input-parameter");
-                }
-            }
-        } else {
-            if (!runtimeInstaller) {
-                if (hasModule) {
-                    if (!hasModulePath && !hasRuntimeImage && !hasAppImage) {
-                        throw new PackagerException("ERR_MissingArgument",
-                            "--runtime-image, --module-path or --app-image");
-                    }
-                } else {
-                    if (!hasInput && !hasAppImage) {
-                        throw new PackagerException("ERR_MissingArgument",
-                                "--input or --app-image");
-                    }
-                }
-            }
-        }
-
-        // if bundling non-modular image, or installer without app-image
-        // then we need some resources and a main class
-        if (!hasModule && !hasAppImage && !runtimeInstaller && !hasMain) {
-            throw new PackagerException("ERR_MissingArgument", "--main-jar");
-        }
-
-        String name = (String)bundlerArguments.get(
-                Arguments.CLIOptions.NAME.getId());
-        validateName(name, true);
-
-        // Validate app image if set
-        String appImage = (String)bundlerArguments.get(
-                Arguments.CLIOptions.PREDEFINED_APP_IMAGE.getId());
-        if (appImage != null) {
-            Path appImageDir = Path.of(appImage);
-            if (!Files.exists(appImageDir)
-                    || appImageDir.toFile().list() == null
-                    || appImageDir.toFile().list().length == 0) {
-                throw new PackagerException("ERR_AppImageNotExist", appImage);
-            }
-        }
-
-        // Validate temp dir
-        String root = (String)bundlerArguments.get(
-                Arguments.CLIOptions.TEMP_ROOT.getId());
-        if (root != null && Files.exists(Path.of(root))) {
-            try (Stream<Path> stream = Files.walk(Path.of(root), 1)) {
-                Path [] contents = stream.toArray(Path[]::new);
-                // contents.length > 1 because Files.walk(path) includes path
-                if (contents != null && contents.length > 1) {
-                    throw new PackagerException(
-                            "ERR_BuildRootInvalid", root);
-                }
-            } catch (IOException ioe) {
-                throw new PackagerException(ioe);
-            }
-        }
-
-        // Validate resource dir
-        String resources = (String)bundlerArguments.get(
-                Arguments.CLIOptions.RESOURCE_DIR.getId());
-        if (resources != null) {
-            if (!(Files.exists(Path.of(resources)))) {
-                throw new PackagerException(
-                    "message.resource-dir-does-not-exist",
-                    Arguments.CLIOptions.RESOURCE_DIR.getId(), resources);
-            }
-        }
-
-        // Validate predefined runtime dir
-        String runtime = (String)bundlerArguments.get(
-                Arguments.CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId());
-        if (runtime != null) {
-            if (!(Files.exists(Path.of(runtime)))) {
-                throw new PackagerException(
-                    "message.runtime-image-dir-does-not-exist",
-                    Arguments.CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId(),
-                    runtime);
-            }
-        }
-
-
-        // Validate license file if set
-        String license = (String)bundlerArguments.get(
-                Arguments.CLIOptions.LICENSE_FILE.getId());
-        if (license != null) {
-            if (!(Files.exists(Path.of(license)))) {
-                throw new PackagerException("ERR_LicenseFileNotExit");
-            }
-        }
-
-        // Validate icon file if set
-        String icon = (String)bundlerArguments.get(
-                Arguments.CLIOptions.ICON.getId());
-        if (icon != null) {
-            if (!(Files.exists(Path.of(icon)))) {
-                throw new PackagerException("ERR_IconFileNotExit",
-                        Path.of(icon).toAbsolutePath().toString());
-            }
-        }
-
-
-        if (hasMacAppStore) {
-            // Validate jlink-options if mac-app-store is set
-            Object jlinkOptions = bundlerArguments.get(
-                    Arguments.CLIOptions.JLINK_OPTIONS.getId());
-            if (jlinkOptions instanceof List) {
-                List<String> options = (List<String>) jlinkOptions;
-                if (!options.contains("--strip-native-commands")) {
-                    throw new PackagerException(
-                            "ERR_MissingJLinkOptMacAppStore",
-                            "--strip-native-commands");
-                }
-            }
-        }
-    }
-
-    void setTargetFormat(String t) {
-        targetFormat = t;
-    }
-
-    String getTargetFormat() {
-        return targetFormat;
-    }
-
-    boolean isTargetAppImage() {
-        return ("app-image".equals(targetFormat));
-    }
-
-    private static final Set<String> multi_args = new TreeSet<>(Arrays.asList(
-            StandardBundlerParam.JAVA_OPTIONS.getID(),
-            StandardBundlerParam.ARGUMENTS.getID(),
-            StandardBundlerParam.MODULE_PATH.getID(),
-            StandardBundlerParam.ADD_MODULES.getID(),
-            StandardBundlerParam.LIMIT_MODULES.getID(),
-            StandardBundlerParam.FILE_ASSOCIATIONS.getID(),
-            StandardBundlerParam.DMG_CONTENT.getID(),
-            StandardBundlerParam.APP_CONTENT.getID(),
-            StandardBundlerParam.JLINK_OPTIONS.getID()
-    ));
-
-    @SuppressWarnings("unchecked")
-    public void addBundleArgument(String key, Object value) {
-        // special hack for multi-line arguments
-        if (multi_args.contains(key)) {
-            Object existingValue = bundlerArguments.get(key);
-            if (existingValue instanceof String && value instanceof String) {
-                String delim = "\n\n";
-                if (key.equals(StandardBundlerParam.MODULE_PATH.getID())) {
-                    delim = File.pathSeparator;
-                } else if (
-                        key.equals(StandardBundlerParam.DMG_CONTENT.getID()) ||
-                        key.equals(StandardBundlerParam.APP_CONTENT.getID()) ||
-                        key.equals(StandardBundlerParam.ADD_MODULES.getID())) {
-                    delim = ",";
-                }
-                bundlerArguments.put(key, existingValue + delim + value);
-            } else if (existingValue instanceof List && value instanceof List) {
-                ((List)existingValue).addAll((List)value);
-            } else if (existingValue instanceof Map &&
-                value instanceof String && ((String)value).contains("=")) {
-                String[] mapValues = ((String)value).split("=", 2);
-                ((Map)existingValue).put(mapValues[0], mapValues[1]);
-            } else {
-                bundlerArguments.put(key, value);
-            }
-        } else {
-            bundlerArguments.put(key, value);
-        }
-    }
-
-    BundleParams getBundleParams() {
-        BundleParams bundleParams = new BundleParams();
-
-        // check for collisions
-        TreeSet<String> keys = new TreeSet<>(bundlerArguments.keySet());
-        keys.retainAll(bundleParams.getBundleParamsAsMap().keySet());
-
-        if (!keys.isEmpty()) {
-            throw new RuntimeException("Deploy Params and Bundler Arguments "
-                    + "overlap in the following values:" + keys.toString());
-        }
-
-        bundleParams.addAllBundleParams(bundlerArguments);
-
-        return bundleParams;
-    }
-
-    @Override
-    public String toString() {
-        return "DeployParams {" + "output: " + "}";
-    }
-
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
index 349a09f237c..ed89ffe1ef6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
@@ -111,6 +111,10 @@ final record FileAssociationGroup(List<FileAssociation> items) {
             return this;
         }
 
+        Optional<String> description() {
+            return Optional.ofNullable(description);
+        }
+
         Builder mimeTypes(Collection<String> v) {
             mimeTypes = Set.copyOf(v);
             return this;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
new file mode 100644
index 00000000000..6b74cab4e65
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.ApplicationBuilder.normalizeIcons;
+import static jdk.jpackage.internal.JLinkRuntimeBuilder.ensureBaseModuleInModulePath;
+import static jdk.jpackage.internal.OptionUtils.isRuntimeInstaller;
+import static jdk.jpackage.internal.cli.StandardOption.ABOUT_URL;
+import static jdk.jpackage.internal.cli.StandardOption.ADDITIONAL_LAUNCHERS;
+import static jdk.jpackage.internal.cli.StandardOption.ADD_MODULES;
+import static jdk.jpackage.internal.cli.StandardOption.APP_CONTENT;
+import static jdk.jpackage.internal.cli.StandardOption.APP_VERSION;
+import static jdk.jpackage.internal.cli.StandardOption.COPYRIGHT;
+import static jdk.jpackage.internal.cli.StandardOption.DESCRIPTION;
+import static jdk.jpackage.internal.cli.StandardOption.INPUT;
+import static jdk.jpackage.internal.cli.StandardOption.INSTALL_DIR;
+import static jdk.jpackage.internal.cli.StandardOption.JLINK_OPTIONS;
+import static jdk.jpackage.internal.cli.StandardOption.LICENSE_FILE;
+import static jdk.jpackage.internal.cli.StandardOption.MODULE_PATH;
+import static jdk.jpackage.internal.cli.StandardOption.NAME;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.RESOURCE_DIR;
+import static jdk.jpackage.internal.cli.StandardOption.VENDOR;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherModularStartupInfo;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.RuntimeLayout;
+
+final class FromOptions {
+
+    static ApplicationBuilderBuilder buildApplicationBuilder() {
+        return new ApplicationBuilderBuilder();
+    }
+
+    static PackageBuilder createPackageBuilder(Options options, Application app, PackageType type) {
+
+        final var builder = new PackageBuilder(app, type);
+
+        NAME.ifPresentIn(options, builder::name);
+        DESCRIPTION.ifPresentIn(options, builder::description);
+        APP_VERSION.ifPresentIn(options, builder::version);
+        ABOUT_URL.ifPresentIn(options, builder::aboutURL);
+        LICENSE_FILE.ifPresentIn(options, builder::licenseFile);
+        PREDEFINED_APP_IMAGE.ifPresentIn(options, builder::predefinedAppImage);
+        PREDEFINED_RUNTIME_IMAGE.ifPresentIn(options, builder::predefinedAppImage);
+        INSTALL_DIR.ifPresentIn(options, builder::installDir);
+
+        return builder;
+    }
+
+
+    static final class ApplicationBuilderBuilder {
+
+        private ApplicationBuilderBuilder() {
+        }
+
+        <T extends Launcher> ApplicationBuilder create(Options options,
+                Function<Options, Launcher> launcherCtor,
+                BiFunction<T, Launcher, T> launcherOverrideCtor,
+                ApplicationLayout appLayout) {
+
+            final Optional<RuntimeLayout> thePredefinedRuntimeLayout;
+            if (PREDEFINED_RUNTIME_IMAGE.containsIn(options)) {
+                thePredefinedRuntimeLayout = Optional.ofNullable(
+                        predefinedRuntimeLayout).or(() -> Optional.of(RuntimeLayout.DEFAULT));
+            } else {
+                thePredefinedRuntimeLayout = Optional.empty();
+            }
+
+            final var transfomer = new OptionsTransformer(options, appLayout);
+            final var appBuilder = createApplicationBuilder(
+                    transfomer.appOptions(),
+                    launcherCtor,
+                    launcherOverrideCtor,
+                    appLayout,
+                    Optional.ofNullable(runtimeLayout).orElse(RuntimeLayout.DEFAULT),
+                    thePredefinedRuntimeLayout);
+
+            transfomer.externalApp().ifPresent(appBuilder::externalApplication);
+
+            return appBuilder;
+        }
+
+        /**
+         * Sets the layout of the predefined runtime image.
+         * @param v the layout of the predefined runtime image. Null is permitted.
+         * @return this
+         */
+        ApplicationBuilderBuilder predefinedRuntimeLayout(RuntimeLayout v) {
+            predefinedRuntimeLayout = v;
+            return this;
+        }
+
+        /**
+         * Sets the layout of a runtime bundle.
+         * @param v the layout of a runtime bundle. Null is permitted.
+         * @return this
+         */
+        ApplicationBuilderBuilder runtimeLayout(RuntimeLayout v) {
+            runtimeLayout = v;
+            return this;
+        }
+
+        private RuntimeLayout runtimeLayout;
+        private RuntimeLayout predefinedRuntimeLayout;
+    }
+
+
+    private static <T extends Launcher> ApplicationBuilder createApplicationBuilder(Options options,
+            Function<Options, Launcher> launcherCtor,
+            BiFunction<T, Launcher, T> launcherOverrideCtor,
+            ApplicationLayout appLayout, RuntimeLayout runtimeLayout,
+            Optional<RuntimeLayout> predefinedRuntimeLayout) {
+
+        final var appBuilder = new ApplicationBuilder();
+
+        final var isRuntimeInstaller = isRuntimeInstaller(options);
+
+        final var predefinedRuntimeImage = PREDEFINED_RUNTIME_IMAGE.findIn(options);
+
+        final var predefinedRuntimeDirectory = predefinedRuntimeLayout.flatMap(layout -> {
+            return predefinedRuntimeImage.map(layout::resolveAt);
+        }).map(RuntimeLayout::runtimeDirectory);
+
+        NAME.findIn(options).or(() -> {
+            if (isRuntimeInstaller) {
+                return predefinedRuntimeImage.map(Path::getFileName).map(Path::toString);
+            } else {
+                return Optional.empty();
+            }
+        }).ifPresent(appBuilder::name);
+        DESCRIPTION.ifPresentIn(options, appBuilder::description);
+        APP_VERSION.ifPresentIn(options, appBuilder::version);
+        VENDOR.ifPresentIn(options, appBuilder::vendor);
+        COPYRIGHT.ifPresentIn(options, appBuilder::copyright);
+        INPUT.ifPresentIn(options, appBuilder::srcDir);
+        APP_CONTENT.ifPresentIn(options, appBuilder::contentDirs);
+
+        if (isRuntimeInstaller) {
+            appBuilder.appImageLayout(runtimeLayout);
+        } else {
+            appBuilder.appImageLayout(appLayout);
+
+            final var launchers = createLaunchers(options, launcherCtor);
+
+            if (PREDEFINED_APP_IMAGE.containsIn(options)) {
+                appBuilder.launchers(launchers);
+            } else {
+                appBuilder.launchers(normalizeIcons(launchers, RESOURCE_DIR.findIn(options), launcherOverrideCtor));
+
+                final var runtimeBuilderBuilder = new RuntimeBuilderBuilder();
+
+                runtimeBuilderBuilder.modulePath(ensureBaseModuleInModulePath(MODULE_PATH.findIn(options).orElseGet(List::of)));
+
+                if (!APP_VERSION.containsIn(options)) {
+                    // Version is not specified explicitly. Try to get it from the app's module.
+                    launchers.mainLauncher().startupInfo().ifPresent(startupInfo -> {
+                        if (startupInfo instanceof LauncherModularStartupInfo modularStartupInfo) {
+                            modularStartupInfo.moduleVersion().ifPresent(moduleVersion -> {
+                                appBuilder.version(moduleVersion);
+                                Log.verbose(I18N.format("message.module-version",
+                                        moduleVersion, modularStartupInfo.moduleName()));
+                            });
+                        }
+                    });
+                }
+
+                predefinedRuntimeDirectory.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
+                    final var startupInfos = launchers.asList().stream()
+                            .map(Launcher::startupInfo)
+                            .map(Optional::orElseThrow).toList();
+                    final var jlinkOptionsBuilder = runtimeBuilderBuilder.forNewRuntime(startupInfos);
+                    ADD_MODULES.findIn(options).map(Set::copyOf).ifPresent(jlinkOptionsBuilder::addModules);
+                    JLINK_OPTIONS.ifPresentIn(options, jlinkOptionsBuilder::options);
+                    jlinkOptionsBuilder.apply();
+                });
+
+                appBuilder.runtimeBuilder(runtimeBuilderBuilder.create());
+            }
+        }
+
+        return appBuilder;
+    }
+
+    private static ApplicationLaunchers createLaunchers(Options options, Function<Options, Launcher> launcherCtor) {
+        var launchers = ADDITIONAL_LAUNCHERS.getFrom(options);
+
+        var mainLauncher = launcherCtor.apply(options);
+
+        //
+        // Additional launcher should:
+        //  - Use description from the main launcher by default.
+        //
+        var mainLauncherDefaults = Options.of(Map.of(DESCRIPTION, mainLauncher.description()));
+
+        var additionalLaunchers = launchers.stream().map(launcherOptions -> {
+            return launcherOptions.copyWithParent(mainLauncherDefaults);
+        }).map(launcherCtor).toList();
+
+        return new ApplicationLaunchers(mainLauncher, additionalLaunchers);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
deleted file mode 100644
index cee7492dbc7..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.Arguments.CLIOptions.LINUX_SHORTCUT_HINT;
-import static jdk.jpackage.internal.Arguments.CLIOptions.WIN_MENU_HINT;
-import static jdk.jpackage.internal.Arguments.CLIOptions.WIN_SHORTCUT_HINT;
-import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_MODULES;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_CONTENT;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.JLINK_OPTIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_AS_SERVICE;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.LIMIT_MODULES;
-import static jdk.jpackage.internal.StandardBundlerParam.MODULE_PATH;
-import static jdk.jpackage.internal.StandardBundlerParam.NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.SOURCE_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;
-import static jdk.jpackage.internal.StandardBundlerParam.isRuntimeInstaller;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import jdk.jpackage.internal.model.Application;
-import jdk.jpackage.internal.model.ApplicationLaunchers;
-import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.ExternalApplication;
-import jdk.jpackage.internal.model.ExternalApplication.LauncherInfo;
-import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.LauncherShortcut;
-import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
-import jdk.jpackage.internal.model.PackageType;
-import jdk.jpackage.internal.model.ParseUtils;
-import jdk.jpackage.internal.model.RuntimeLayout;
-import jdk.jpackage.internal.util.function.ThrowingFunction;
-
-final class FromParams {
-
-    static <T extends Launcher> ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> params,
-            Function<Map<String, ? super Object>, Launcher> launcherMapper,
-            BiFunction<T, Launcher, T> launcherOverrideCtor,
-            ApplicationLayout appLayout) throws ConfigException, IOException {
-        return createApplicationBuilder(params, launcherMapper, launcherOverrideCtor, appLayout, RuntimeLayout.DEFAULT, Optional.of(RuntimeLayout.DEFAULT));
-    }
-
-    static <T extends Launcher> ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> params,
-            Function<Map<String, ? super Object>, Launcher> launcherMapper,
-            BiFunction<T, Launcher, T> launcherOverrideCtor,
-            ApplicationLayout appLayout, RuntimeLayout runtimeLayout,
-            Optional<RuntimeLayout> predefinedRuntimeLayout) throws ConfigException, IOException {
-
-        final var appBuilder = new ApplicationBuilder();
-
-        APP_NAME.copyInto(params, appBuilder::name);
-        DESCRIPTION.copyInto(params, appBuilder::description);
-        appBuilder.version(VERSION.fetchFrom(params));
-        VENDOR.copyInto(params, appBuilder::vendor);
-        COPYRIGHT.copyInto(params, appBuilder::copyright);
-        SOURCE_DIR.copyInto(params, appBuilder::srcDir);
-        APP_CONTENT.copyInto(params, appBuilder::contentDirs);
-
-        final var isRuntimeInstaller = isRuntimeInstaller(params);
-
-        final var predefinedRuntimeImage = PREDEFINED_RUNTIME_IMAGE.findIn(params);
-
-        final var predefinedRuntimeDirectory = predefinedRuntimeLayout.flatMap(
-                layout -> predefinedRuntimeImage.map(layout::resolveAt)).map(RuntimeLayout::runtimeDirectory);
-
-        if (isRuntimeInstaller) {
-            appBuilder.appImageLayout(runtimeLayout);
-        } else {
-            appBuilder.appImageLayout(appLayout);
-
-            if (hasPredefinedAppImage(params)) {
-                final var appImageFile = PREDEFINED_APP_IMAGE_FILE.fetchFrom(params);
-                appBuilder.initFromExternalApplication(appImageFile, launcherInfo -> {
-                    var launcherParams = mapLauncherInfo(appImageFile, launcherInfo);
-                    return launcherMapper.apply(mergeParams(params, launcherParams));
-                });
-            } else {
-                final var launchers = createLaunchers(params, launcherMapper);
-
-                final var runtimeBuilderBuilder = new RuntimeBuilderBuilder();
-
-                runtimeBuilderBuilder.modulePath(MODULE_PATH.fetchFrom(params));
-
-                predefinedRuntimeDirectory.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
-                    final var startupInfos = launchers.asList().stream()
-                            .map(Launcher::startupInfo)
-                            .map(Optional::orElseThrow).toList();
-                    final var jlinkOptionsBuilder = runtimeBuilderBuilder.forNewRuntime(startupInfos);
-                    ADD_MODULES.copyInto(params, jlinkOptionsBuilder::addModules);
-                    LIMIT_MODULES.copyInto(params, jlinkOptionsBuilder::limitModules);
-                    JLINK_OPTIONS.copyInto(params, jlinkOptionsBuilder::options);
-                    jlinkOptionsBuilder.apply();
-                });
-
-                final var normalizedLaunchers = ApplicationBuilder.normalizeIcons(launchers, RESOURCE_DIR.findIn(params), launcherOverrideCtor);
-
-                appBuilder.launchers(normalizedLaunchers).runtimeBuilder(runtimeBuilderBuilder.create());
-            }
-        }
-
-        return appBuilder;
-    }
-
-    static PackageBuilder createPackageBuilder(
-            Map<String, ? super Object> params, Application app,
-            PackageType type) throws ConfigException {
-
-        final var builder = new PackageBuilder(app, type);
-
-        builder.name(INSTALLER_NAME.fetchFrom(params));
-        DESCRIPTION.copyInto(params, builder::description);
-        VERSION.copyInto(params, builder::version);
-        ABOUT_URL.copyInto(params, builder::aboutURL);
-        LICENSE_FILE.findIn(params).map(Path::of).ifPresent(builder::licenseFile);
-        PREDEFINED_APP_IMAGE.findIn(params).ifPresent(builder::predefinedAppImage);
-        PREDEFINED_RUNTIME_IMAGE.findIn(params).ifPresent(builder::predefinedAppImage);
-        INSTALL_DIR.findIn(params).map(Path::of).ifPresent(builder::installDir);
-
-        return builder;
-    }
-
-    static <T extends Application> BundlerParamInfo<T> createApplicationBundlerParam(
-            ThrowingFunction<Map<String, ? super Object>, T> ctor) {
-        return BundlerParamInfo.createBundlerParam(Application.class, ctor);
-    }
-
-    static <T extends jdk.jpackage.internal.model.Package> BundlerParamInfo<T> createPackageBundlerParam(
-            ThrowingFunction<Map<String, ? super Object>, T> ctor) {
-        return BundlerParamInfo.createBundlerParam(jdk.jpackage.internal.model.Package.class, ctor);
-    }
-
-    static Optional<jdk.jpackage.internal.model.Package> getCurrentPackage(Map<String, ? super Object> params) {
-        return Optional.ofNullable((jdk.jpackage.internal.model.Package)params.get(
-                jdk.jpackage.internal.model.Package.class.getName()));
-    }
-
-    static Optional<LauncherShortcut> findLauncherShortcut(
-            BundlerParamInfo<String> shortcutParam,
-            Map<String, ? super Object> mainParams,
-            Map<String, ? super Object> launcherParams) {
-
-        Optional<String> launcherValue;
-        if (launcherParams == mainParams) {
-            // The main launcher
-            launcherValue = Optional.empty();
-        } else {
-            launcherValue = shortcutParam.findIn(launcherParams);
-        }
-
-        return launcherValue.map(ParseUtils::parseLauncherShortcutForAddLauncher).or(() -> {
-            return Optional.ofNullable(mainParams.get(shortcutParam.getID())).map(toFunction(value -> {
-                if (value instanceof Boolean) {
-                    return new LauncherShortcut(LauncherShortcutStartupDirectory.DEFAULT);
-                } else {
-                    try {
-                        return ParseUtils.parseLauncherShortcutForMainLauncher((String)value);
-                    } catch (IllegalArgumentException ex) {
-                        throw I18N.buildConfigException("error.invalid-option-value", value, "--" + shortcutParam.getID()).create();
-                    }
-                }
-            }));
-        });
-    }
-
-    private static ApplicationLaunchers createLaunchers(
-            Map<String, ? super Object> params,
-            Function<Map<String, ? super Object>, Launcher> launcherMapper) {
-        var launchers = ADD_LAUNCHERS.findIn(params).orElseGet(List::of);
-
-        var mainLauncher = launcherMapper.apply(params);
-        var additionalLaunchers = launchers.stream().map(launcherParams -> {
-            return launcherMapper.apply(mergeParams(params, launcherParams));
-        }).toList();
-
-        return new ApplicationLaunchers(mainLauncher, additionalLaunchers);
-    }
-
-    private static Map<String, ? super Object> mapLauncherInfo(ExternalApplication appImageFile, LauncherInfo launcherInfo) {
-        Map<String, ? super Object> launcherParams = new HashMap<>();
-        launcherParams.put(NAME.getID(), launcherInfo.name());
-        if (!appImageFile.getLauncherName().equals(launcherInfo.name())) {
-            // This is not the main launcher, accept the value
-            // of "launcher-as-service" from the app image file (.jpackage.xml).
-            launcherParams.put(LAUNCHER_AS_SERVICE.getID(), Boolean.toString(launcherInfo.service()));
-        }
-        launcherParams.putAll(launcherInfo.extra());
-        return launcherParams;
-    }
-
-    private static Map<String, ? super Object> mergeParams(Map<String, ? super Object> mainParams,
-            Map<String, ? super Object> launcherParams) {
-        if (!launcherParams.containsKey(DESCRIPTION.getID())) {
-            launcherParams = new HashMap<>(launcherParams);
-// FIXME: this is a good improvement but it fails existing tests
-//            launcherParams.put(DESCRIPTION.getID(), String.format("%s (%s)", DESCRIPTION.fetchFrom(
-//                    mainParams), APP_NAME.fetchFrom(launcherParams)));
-            launcherParams.put(DESCRIPTION.getID(), DESCRIPTION.fetchFrom(mainParams));
-        }
-        return AddLauncherArguments.merge(mainParams, launcherParams, ICON.getID(),
-                ADD_LAUNCHERS.getID(), FILE_ASSOCIATIONS.getID(), WIN_MENU_HINT.getId(),
-                WIN_SHORTCUT_HINT.getId(), LINUX_SHORTCUT_HINT.getId());
-    }
-
-    static final BundlerParamInfo<Application> APPLICATION = createApplicationBundlerParam(null);
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
index 427051719bb..aac113d7777 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
@@ -32,7 +32,7 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
-import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.model.JPackageException;
 
 /**
  * IOUtils
@@ -90,19 +90,17 @@ final class IOUtils {
         }
     }
 
-    static void writableOutputDir(Path outdir) throws PackagerException {
+    static void writableOutputDir(Path outdir) {
         if (!Files.isDirectory(outdir)) {
             try {
                 Files.createDirectories(outdir);
             } catch (IOException ex) {
-                throw new PackagerException("error.cannot-create-output-dir",
-                    outdir.toAbsolutePath().toString());
+                throw new JPackageException(I18N.format("error.cannot-create-output-dir", outdir.toAbsolutePath()));
             }
         }
 
         if (!Files.isWritable(outdir)) {
-            throw new PackagerException("error.cannot-write-to-output-dir",
-                    outdir.toAbsolutePath().toString());
+            throw new JPackageException(I18N.format("error.cannot-write-to-output-dir", outdir.toAbsolutePath()));
         }
     }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
index 6ac9758e179..50d8049bc2d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
@@ -36,7 +36,6 @@ import java.lang.module.ModuleReference;
 import java.lang.module.ResolvedModule;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -52,9 +51,9 @@ import java.util.stream.Stream;
 import jdk.internal.module.ModulePath;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.LauncherModularStartupInfo;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
-import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.model.RuntimeBuilder;
 
 final class JLinkRuntimeBuilder implements RuntimeBuilder {
@@ -64,7 +63,7 @@ final class JLinkRuntimeBuilder implements RuntimeBuilder {
     }
 
     @Override
-    public void create(AppImageLayout appImageLayout) throws PackagerException {
+    public void create(AppImageLayout appImageLayout) {
         var args = new ArrayList<String>();
         args.add("--output");
         args.add(appImageLayout.runtimeDirectory().toString());
@@ -79,7 +78,7 @@ final class JLinkRuntimeBuilder implements RuntimeBuilder {
         args.add(0, "jlink");
         Log.verbose(args, List.of(jlinkOut), retVal, -1);
         if (retVal != 0) {
-            throw new PackagerException("error.jlink.failed", jlinkOut);
+            throw new JPackageException(I18N.format("error.jlink.failed", jlinkOut));
         }
     }
 
@@ -182,8 +181,7 @@ final class JLinkRuntimeBuilder implements RuntimeBuilder {
         for (String option : options) {
             switch (option) {
                 case "--output", "--add-modules", "--module-path" -> {
-                    throw new ConfigException(MessageFormat.format(I18N.getString(
-                            "error.blocked.option"), option), null);
+                    throw I18N.buildConfigException("error.blocked.option", option).create();
                 }
                 default -> {
                     args.add(option);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java
deleted file mode 100644
index 079d03a076c..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.io.PrintWriter;
-import java.util.Optional;
-import java.util.spi.ToolProvider;
-
-/**
- * JPackageToolProvider
- *
- * This is the ToolProvider implementation exported
- * to java.util.spi.ToolProvider and ultimately javax.tools.ToolProvider
- */
-public class JPackageToolProvider implements ToolProvider {
-
-    public String name() {
-        return "jpackage";
-    }
-
-    public Optional<String> description() {
-        return Optional.of(jdk.jpackage.main.Main.I18N.getString("jpackage.description"));
-    }
-
-    public synchronized int run(
-            PrintWriter out, PrintWriter err, String... args) {
-        try {
-            return new jdk.jpackage.main.Main().execute(out, err, args);
-        } catch (RuntimeException re) {
-            Log.fatalError(re.getMessage());
-            Log.verbose(re);
-            return 1;
-        }
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
deleted file mode 100644
index 488e9106479..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import jdk.jpackage.internal.model.ConfigException;
-import java.io.File;
-import java.io.IOException;
-import java.lang.module.ModuleReference;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
-
-/**
- * Extracts data needed to run application from parameters.
- */
-final class LauncherData {
-    boolean isModular() {
-        return moduleInfo != null;
-    }
-
-    String qualifiedClassName() {
-        return qualifiedClassName;
-    }
-
-    boolean isClassNameFromMainJar() {
-        return jarMainClass != null;
-    }
-
-    String packageName() {
-        int sepIdx = qualifiedClassName.lastIndexOf('.');
-        if (sepIdx < 0) {
-            return "";
-        }
-        return qualifiedClassName.substring(sepIdx + 1);
-    }
-
-    String moduleName() {
-        verifyIsModular(true);
-        return moduleInfo.name();
-    }
-
-    List<Path> modulePath() {
-        verifyIsModular(true);
-        return modulePath;
-    }
-
-    Path mainJarName() {
-        verifyIsModular(false);
-        return mainJarName;
-    }
-
-    List<Path> classPath() {
-        return classPath;
-    }
-
-    String getAppVersion() {
-        if (isModular()) {
-            return moduleInfo.version().orElse(null);
-        }
-
-        return null;
-    }
-
-    private LauncherData() {
-    }
-
-    private void verifyIsModular(boolean isModular) {
-        if ((moduleInfo == null) == isModular) {
-            throw new IllegalStateException();
-        }
-    }
-
-    static LauncherData create(Map<String, ? super Object> params) throws
-            ConfigException, IOException {
-
-        final String mainModule = getMainModule(params);
-        final LauncherData result;
-        if (mainModule == null) {
-            result = createNonModular(params);
-        } else {
-            result = createModular(mainModule, params);
-        }
-        result.initClasspath(params);
-        return result;
-    }
-
-    private static LauncherData createModular(String mainModule,
-            Map<String, ? super Object> params) throws ConfigException,
-            IOException {
-
-        LauncherData launcherData = new LauncherData();
-
-        final int sepIdx = mainModule.indexOf("/");
-        final String moduleName;
-        if (sepIdx > 0) {
-            launcherData.qualifiedClassName = mainModule.substring(sepIdx + 1);
-            moduleName = mainModule.substring(0, sepIdx);
-        } else {
-            moduleName = mainModule;
-        }
-        launcherData.modulePath = getModulePath(params);
-
-        // Try to find module in the specified module path list.
-        ModuleReference moduleRef = JLinkRuntimeBuilder.createModuleFinder(
-                launcherData.modulePath).find(moduleName).orElse(null);
-
-        if (moduleRef != null) {
-            launcherData.moduleInfo = ModuleInfo.fromModuleReference(moduleRef);
-        } else if (params.containsKey(PREDEFINED_RUNTIME_IMAGE.getID())) {
-            // Failed to find module in the specified module path list and
-            // there is external runtime given to jpackage.
-            // Lookup module in this runtime.
-            Path cookedRuntime = PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
-            launcherData.moduleInfo = ModuleInfo.fromCookedRuntime(moduleName,
-                    cookedRuntime).orElse(null);
-        }
-
-        if (launcherData.moduleInfo == null) {
-            throw new ConfigException(MessageFormat.format(I18N.getString(
-                    "error.no-module-in-path"), moduleName), null);
-        }
-
-        if (launcherData.qualifiedClassName == null) {
-            launcherData.qualifiedClassName = launcherData.moduleInfo.mainClass().orElse(null);
-            if (launcherData.qualifiedClassName == null) {
-                throw new ConfigException(I18N.getString("ERR_NoMainClass"), null);
-            }
-        }
-
-        return launcherData;
-    }
-
-    private static LauncherData createNonModular(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-        LauncherData launcherData = new LauncherData();
-
-        launcherData.qualifiedClassName = getMainClass(params);
-
-        launcherData.mainJarName = getMainJarName(params);
-
-        Path mainJarDir = StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
-
-        final Path mainJarPath;
-        if (launcherData.mainJarName != null && mainJarDir != null) {
-            mainJarPath = mainJarDir.resolve(launcherData.mainJarName);
-            if (!Files.exists(mainJarPath)) {
-                throw new ConfigException(MessageFormat.format(I18N.getString(
-                        "error.main-jar-does-not-exist"),
-                        launcherData.mainJarName), I18N.getString(
-                        "error.main-jar-does-not-exist.advice"));
-            }
-        } else {
-            mainJarPath = null;
-        }
-
-        if (launcherData.qualifiedClassName == null) {
-            if (mainJarPath == null) {
-                throw new ConfigException(I18N.getString("error.no-main-class"),
-                        I18N.getString("error.no-main-class.advice"));
-            }
-
-            try (JarFile jf = new JarFile(mainJarPath.toFile())) {
-                Manifest m = jf.getManifest();
-                Attributes attrs = (m != null) ? m.getMainAttributes() : null;
-                if (attrs != null) {
-                    launcherData.qualifiedClassName = attrs.getValue(
-                            Attributes.Name.MAIN_CLASS);
-                    launcherData.jarMainClass = launcherData.qualifiedClassName;
-                }
-            }
-        }
-
-        if (launcherData.qualifiedClassName == null) {
-            throw new ConfigException(MessageFormat.format(I18N.getString(
-                    "error.no-main-class-with-main-jar"),
-                    launcherData.mainJarName), MessageFormat.format(
-                            I18N.getString(
-                                    "error.no-main-class-with-main-jar.advice"),
-                            launcherData.mainJarName));
-        }
-
-        return launcherData;
-    }
-
-    private void initClasspath(Map<String, ? super Object> params)
-            throws IOException {
-        Path inputDir = StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
-        if (inputDir == null) {
-            classPath = Collections.emptyList();
-        } else {
-            try (Stream<Path> walk = Files.walk(inputDir, Integer.MAX_VALUE)) {
-                Set<Path> jars = walk.filter(Files::isRegularFile)
-                        .filter(file -> file.toString().endsWith(".jar"))
-                        .map(p -> inputDir.toAbsolutePath()
-                                  .relativize(p.toAbsolutePath()))
-                        .collect(Collectors.toSet());
-                jars.remove(mainJarName);
-                classPath = jars.stream().sorted().toList();
-            }
-        }
-    }
-
-    private static String getMainClass(Map<String, ? super Object> params) {
-       return getStringParam(params, Arguments.CLIOptions.APPCLASS.getId());
-    }
-
-    private static Path getMainJarName(Map<String, ? super Object> params)
-            throws ConfigException {
-       return getPathParam(params, Arguments.CLIOptions.MAIN_JAR.getId());
-    }
-
-    private static String getMainModule(Map<String, ? super Object> params) {
-       return getStringParam(params, Arguments.CLIOptions.MODULE.getId());
-    }
-
-    private static String getStringParam(Map<String, ? super Object> params,
-            String paramName) {
-        Optional<Object> value = Optional.ofNullable(params.get(paramName));
-        return value.map(Object::toString).orElse(null);
-    }
-
-    private static <T> T getPathParam(String paramName, Supplier<T> func) throws ConfigException {
-        try {
-            return func.get();
-        } catch (InvalidPathException ex) {
-            throw new ConfigException(MessageFormat.format(I18N.getString(
-                    "error.not-path-parameter"), paramName,
-                    ex.getLocalizedMessage()), null, ex);
-        }
-    }
-
-    private static Path getPathParam(Map<String, ? super Object> params,
-            String paramName) throws ConfigException {
-        return getPathParam(paramName, () -> {
-            String value = getStringParam(params, paramName);
-            Path result = null;
-            if (value != null) {
-                result = Path.of(value);
-            }
-            return result;
-        });
-    }
-
-    private static List<Path> getModulePath(Map<String, ? super Object> params)
-            throws ConfigException {
-        List<Path> modulePath = getPathListParameter(Arguments.CLIOptions.MODULE_PATH.getId(), params);
-
-        if (params.containsKey(PREDEFINED_RUNTIME_IMAGE.getID())) {
-            Path runtimePath = PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
-            runtimePath = runtimePath.resolve("lib");
-            modulePath = Stream.of(modulePath, List.of(runtimePath))
-                    .flatMap(List::stream)
-                    .toList();
-        }
-
-        return modulePath;
-    }
-
-    private static List<Path> getPathListParameter(String paramName,
-            Map<String, ? super Object> params) throws ConfigException {
-        return getPathParam(paramName, () ->
-                params.get(paramName) instanceof String value ?
-                        Stream.of(value.split(File.pathSeparator)).map(Path::of).toList() : List.of());
-    }
-
-    private String qualifiedClassName;
-    private String jarMainClass;
-    private Path mainJarName;
-    private List<Path> classPath;
-    private List<Path> modulePath;
-    private ModuleInfo moduleInfo;
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
new file mode 100644
index 00000000000..0749cc48b9b
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.cli.StandardOption.APPCLASS;
+import static jdk.jpackage.internal.cli.StandardOption.ARGUMENTS;
+import static jdk.jpackage.internal.cli.StandardOption.DESCRIPTION;
+import static jdk.jpackage.internal.cli.StandardOption.FILE_ASSOCIATIONS;
+import static jdk.jpackage.internal.cli.StandardOption.ICON;
+import static jdk.jpackage.internal.cli.StandardOption.INPUT;
+import static jdk.jpackage.internal.cli.StandardOption.JAVA_OPTIONS;
+import static jdk.jpackage.internal.cli.StandardOption.LAUNCHER_AS_SERVICE;
+import static jdk.jpackage.internal.cli.StandardOption.MAIN_JAR;
+import static jdk.jpackage.internal.cli.StandardOption.MODULE;
+import static jdk.jpackage.internal.cli.StandardOption.MODULE_PATH;
+import static jdk.jpackage.internal.cli.StandardOption.NAME;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.stream.IntStream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.FileAssociationGroup.FileAssociationException;
+import jdk.jpackage.internal.FileAssociationGroup.FileAssociationNoExtensionsException;
+import jdk.jpackage.internal.FileAssociationGroup.FileAssociationNoMimesException;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardFaOption;
+import jdk.jpackage.internal.model.CustomLauncherIcon;
+import jdk.jpackage.internal.model.DefaultLauncherIcon;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherIcon;
+
+final class LauncherFromOptions {
+
+    LauncherFromOptions() {
+    }
+
+    LauncherFromOptions faGroupBuilderMutator(BiConsumer<FileAssociationGroup.Builder, LauncherBuilder> v) {
+        faGroupBuilderMutator = v;
+        return this;
+    }
+
+    LauncherFromOptions faMapper(BiFunction<Options, FileAssociation, FileAssociation> v) {
+        faMapper = v;
+        return this;
+    }
+
+    LauncherFromOptions faWithDefaultDescription() {
+        return faGroupBuilderMutator((faGroupBuilder, launcherBuilder) -> {
+            if (faGroupBuilder.description().isEmpty()) {
+                var description = String.format("%s association", launcherBuilder.create().name());
+                faGroupBuilder.description(description);
+            }
+        });
+    }
+
+    Launcher create(Options options) {
+        final var builder = new LauncherBuilder().defaultIconResourceName(defaultIconResourceName());
+
+        DESCRIPTION.ifPresentIn(options, builder::description);
+        builder.icon(toLauncherIcon(ICON.findIn(options).orElse(null)));
+        LAUNCHER_AS_SERVICE.ifPresentIn(options, builder::isService);
+        NAME.ifPresentIn(options, builder::name);
+
+        if (PREDEFINED_APP_IMAGE.findIn(options).isEmpty()) {
+            final var startupInfoBuilder = new LauncherStartupInfoBuilder();
+
+            INPUT.ifPresentIn(options, startupInfoBuilder::inputDir);
+            ARGUMENTS.ifPresentIn(options, startupInfoBuilder::defaultParameters);
+            JAVA_OPTIONS.ifPresentIn(options, startupInfoBuilder::javaOptions);
+            MAIN_JAR.ifPresentIn(options, startupInfoBuilder::mainJar);
+            APPCLASS.ifPresentIn(options, startupInfoBuilder::mainClassName);
+            MODULE.ifPresentIn(options, startupInfoBuilder::moduleName);
+            MODULE_PATH.ifPresentIn(options, startupInfoBuilder::modulePath);
+            PREDEFINED_RUNTIME_IMAGE.ifPresentIn(options, startupInfoBuilder::predefinedRuntimeImage);
+
+            builder.startupInfo(startupInfoBuilder.create());
+        }
+
+        final var faOptionsList = FILE_ASSOCIATIONS.findIn(options).orElseGet(List::of);
+
+        final var faGroups = IntStream.range(0, faOptionsList.size()).mapToObj(idx -> {
+            final var faOptions = faOptionsList.get(idx);
+
+            final var faGroupBuilder = FileAssociationGroup.build();
+
+            StandardFaOption.DESCRIPTION.ifPresentIn(faOptions, faGroupBuilder::description);
+            StandardFaOption.ICON.ifPresentIn(faOptions, faGroupBuilder::icon);
+            StandardFaOption.EXTENSIONS.ifPresentIn(faOptions, faGroupBuilder::extensions);
+            StandardFaOption.CONTENT_TYPE.ifPresentIn(faOptions, faGroupBuilder::mimeTypes);
+
+            faGroupBuilderMutator().ifPresent(mutator -> {
+                mutator.accept(faGroupBuilder, builder);
+            });
+
+            final var faID = idx + 1;
+
+            final FileAssociationGroup faGroup;
+            try {
+                faGroup = faGroupBuilder.create();
+            } catch (FileAssociationNoMimesException ex) {
+                throw I18N.buildConfigException()
+                        .message("error.no-content-types-for-file-association", faID)
+                        .advice("error.no-content-types-for-file-association.advice", faID)
+                        .create();
+            } catch (FileAssociationNoExtensionsException ex) {
+                // TODO: Must do something about this condition!
+                throw new AssertionError();
+            } catch (FileAssociationException ex) {
+                // Should never happen
+                throw new UnsupportedOperationException(ex);
+            }
+
+            return faMapper().map(mapper -> {
+                return new FileAssociationGroup(faGroup.items().stream().map(fa -> {
+                    return mapper.apply(faOptions, fa);
+                }).toList());
+            }).orElse(faGroup);
+
+        }).toList();
+
+        return builder.faGroups(faGroups).create();
+    }
+
+    private Optional<BiConsumer<FileAssociationGroup.Builder, LauncherBuilder>> faGroupBuilderMutator() {
+        return Optional.ofNullable(faGroupBuilderMutator);
+    }
+
+    private Optional<BiFunction<Options, FileAssociation, FileAssociation>> faMapper() {
+        return Optional.ofNullable(faMapper);
+    }
+
+    private static LauncherIcon toLauncherIcon(Path launcherIconPath) {
+        if (launcherIconPath == null) {
+            return DefaultLauncherIcon.INSTANCE;
+        } else if (launcherIconPath.toString().isEmpty()) {
+            return null;
+        } else {
+            return CustomLauncherIcon.create(launcherIconPath);
+        }
+    }
+
+    private static String defaultIconResourceName() {
+        switch (OperatingSystem.current()) {
+            case WINDOWS -> {
+                return "JavaApp.ico";
+            }
+            case LINUX -> {
+                return "JavaApp.png";
+            }
+            case MACOS -> {
+                return "JavaApp.icns";
+            }
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+
+    private BiConsumer<FileAssociationGroup.Builder, LauncherBuilder> faGroupBuilderMutator;
+    private BiFunction<Options, FileAssociation, FileAssociation> faMapper;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
deleted file mode 100644
index b4ce1cdb200..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.I18N.buildConfigException;
-import static jdk.jpackage.internal.StandardBundlerParam.ARGUMENTS;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_AS_SERVICE;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
-import static jdk.jpackage.internal.StandardBundlerParam.NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.stream.IntStream;
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.CustomLauncherIcon;
-import jdk.jpackage.internal.model.DefaultLauncherIcon;
-import jdk.jpackage.internal.model.FileAssociation;
-import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.LauncherIcon;
-
-record LauncherFromParams(Optional<BiFunction<FileAssociation, Map<String, ? super Object>, FileAssociation>> faExtension) {
-
-    LauncherFromParams {
-        Objects.requireNonNull(faExtension);
-    }
-
-    LauncherFromParams() {
-        this(Optional.empty());
-    }
-
-    Launcher create(Map<String, ? super Object> params) throws ConfigException {
-        final var builder = new LauncherBuilder().defaultIconResourceName(defaultIconResourceName());
-
-        DESCRIPTION.copyInto(params, builder::description);
-        builder.icon(toLauncherIcon(ICON.findIn(params).orElse(null)));
-        LAUNCHER_AS_SERVICE.copyInto(params, builder::isService);
-        NAME.copyInto(params, builder::name);
-
-        if (PREDEFINED_APP_IMAGE.findIn(params).isEmpty()) {
-            final var startupInfoBuilder = new LauncherStartupInfoBuilder();
-
-            startupInfoBuilder.launcherData(LAUNCHER_DATA.fetchFrom(params));
-            ARGUMENTS.copyInto(params, startupInfoBuilder::defaultParameters);
-            JAVA_OPTIONS.copyInto(params, startupInfoBuilder::javaOptions);
-
-            builder.startupInfo(startupInfoBuilder.create());
-        }
-
-        final var faParamsList = FILE_ASSOCIATIONS.findIn(params).orElseGet(List::of);
-
-        final var faGroups = IntStream.range(0, faParamsList.size()).mapToObj(idx -> {
-            final var faParams = faParamsList.get(idx);
-            return toSupplier(() -> {
-                final var faGroupBuilder = FileAssociationGroup.build();
-
-                if (OperatingSystem.current() == OperatingSystem.MACOS) {
-                    FA_DESCRIPTION.copyInto(faParams, faGroupBuilder::description);
-                } else {
-                    faGroupBuilder.description(FA_DESCRIPTION.findIn(faParams).orElseGet(() -> {
-                        return String.format("%s association", toSupplier(builder::create).get().name());
-                    }));
-                }
-
-                FA_ICON.copyInto(faParams, faGroupBuilder::icon);
-                FA_EXTENSIONS.copyInto(faParams, faGroupBuilder::extensions);
-                FA_CONTENT_TYPE.copyInto(faParams, faGroupBuilder::mimeTypes);
-
-                final var faID = idx + 1;
-
-                final FileAssociationGroup faGroup;
-                try {
-                    faGroup = faGroupBuilder.create();
-                } catch (FileAssociationGroup.FileAssociationNoMimesException ex) {
-                    throw buildConfigException()
-                            .message("error.no-content-types-for-file-association", faID)
-                            .advice("error.no-content-types-for-file-association.advice", faID)
-                            .create();
-                }
-
-                if (faExtension.isPresent()) {
-                    return new FileAssociationGroup(faGroup.items().stream().map(fa -> {
-                        return faExtension.get().apply(fa, faParams);
-                    }).toList());
-                } else {
-                    return faGroup;
-                }
-            }).get();
-        }).toList();
-
-        return builder.faGroups(faGroups).create();
-    }
-
-    private static LauncherIcon toLauncherIcon(Path launcherIconPath) {
-        if (launcherIconPath == null) {
-            return DefaultLauncherIcon.INSTANCE;
-        } else if (launcherIconPath.toString().isEmpty()) {
-            return null;
-        } else {
-            return CustomLauncherIcon.create(launcherIconPath);
-        }
-    }
-
-    private static String defaultIconResourceName() {
-        switch (OperatingSystem.current()) {
-            case WINDOWS -> {
-                return "JavaApp.ico";
-            }
-            case LINUX -> {
-                return "JavaApp.png";
-            }
-            case MACOS -> {
-                return "JavaApp.icns";
-            }
-            default -> {
-                throw new UnsupportedOperationException();
-            }
-        }
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
index 5273f2d251c..b2fc48af9e4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
@@ -24,69 +24,216 @@
  */
 package jdk.jpackage.internal;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.function.UnaryOperator;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.LauncherJarStartupInfo;
 import jdk.jpackage.internal.model.LauncherJarStartupInfoMixin;
 import jdk.jpackage.internal.model.LauncherModularStartupInfo;
 import jdk.jpackage.internal.model.LauncherModularStartupInfoMixin;
-import jdk.jpackage.internal.model.LauncherStartupInfo.Stub;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
 
 final class LauncherStartupInfoBuilder {
 
     LauncherStartupInfo create() {
-        return decorator.apply(new Stub(qualifiedClassName, javaOptions,
-                defaultParameters, classPath));
+        if (moduleName != null) {
+            return createModular();
+        } else if (mainJar != null) {
+            return createNonModular();
+        } else {
+            throw new JPackageException(I18N.format("ERR_NoEntryPoint"));
+        }
     }
 
-    LauncherStartupInfoBuilder launcherData(LauncherData launcherData) {
-        if (launcherData.isModular()) {
-            decorator = new ModuleStartupInfo(launcherData.moduleName());
-        } else {
-            decorator = new JarStartupInfo(launcherData.mainJarName(),
-                    launcherData.isClassNameFromMainJar());
-        }
-        classPath = launcherData.classPath();
-        qualifiedClassName = launcherData.qualifiedClassName();
+    LauncherStartupInfoBuilder inputDir(Path v) {
+        inputDir = v;
         return this;
     }
 
     LauncherStartupInfoBuilder javaOptions(List<String> v) {
+        if (v != null) {
+            v.forEach(Objects::requireNonNull);
+        }
         javaOptions = v;
         return this;
     }
 
     LauncherStartupInfoBuilder defaultParameters(List<String> v) {
+        if (v != null) {
+            v.forEach(Objects::requireNonNull);
+        }
         defaultParameters = v;
         return this;
     }
 
-    private static record ModuleStartupInfo(String moduleName) implements UnaryOperator<LauncherStartupInfo> {
+    LauncherStartupInfoBuilder mainJar(Path v) {
+        mainJar = v;
+        return this;
+    }
 
-        @Override
-        public LauncherStartupInfo apply(LauncherStartupInfo base) {
-            return LauncherModularStartupInfo.create(base,
-                    new LauncherModularStartupInfoMixin.Stub(moduleName));
+    LauncherStartupInfoBuilder mainClassName(String v) {
+        mainClassName = v;
+        return this;
+    }
+
+    LauncherStartupInfoBuilder predefinedRuntimeImage(Path v) {
+        cookedRuntimePath = v;
+        return this;
+    }
+
+    LauncherStartupInfoBuilder moduleName(String v) {
+        if (v == null) {
+            moduleName = null;
+        } else {
+            var slashIdx = v.indexOf('/');
+            if (slashIdx < 0) {
+                moduleName = v;
+            } else {
+                moduleName = v.substring(0, slashIdx);
+                if (slashIdx < v.length() - 1) {
+                    mainClassName(v.substring(slashIdx + 1));
+                }
+            }
+        }
+        return this;
+    }
+
+    LauncherStartupInfoBuilder modulePath(List<Path> v) {
+        modulePath = v;
+        return this;
+    }
+
+    private Optional<Path> inputDir() {
+        return Optional.ofNullable(inputDir);
+    }
+
+    private Optional<String> mainClassName() {
+        return Optional.ofNullable(mainClassName);
+    }
+
+    private Optional<Path> cookedRuntimePath() {
+        return Optional.ofNullable(cookedRuntimePath);
+    }
+
+    private LauncherStartupInfo createLauncherStartupInfo(String mainClassName, List<Path> classpath) {
+        Objects.requireNonNull(mainClassName);
+        classpath.forEach(Objects::requireNonNull);
+        return new LauncherStartupInfo.Stub(mainClassName,
+                Optional.ofNullable(javaOptions).orElseGet(List::of),
+                Optional.ofNullable(defaultParameters).orElseGet(List::of),
+                classpath);
+    }
+
+    private static List<Path> createClasspath(Path inputDir, Set<Path> excludes) {
+        excludes.forEach(Objects::requireNonNull);
+        try (final var walk = Files.walk(inputDir)) {
+            return walk.filter(Files::isRegularFile)
+                    .filter(file -> file.getFileName().toString().endsWith(".jar"))
+                    .map(inputDir::relativize)
+                    .filter(Predicate.not(excludes::contains))
+                    .distinct()
+                    .toList();
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
         }
     }
 
-    private static record JarStartupInfo(Path jarPath,
-            boolean isClassNameFromMainJar) implements
-            UnaryOperator<LauncherStartupInfo> {
+    private LauncherModularStartupInfo createModular() {
+        final var fullModulePath = getFullModulePath();
 
-        @Override
-        public LauncherStartupInfo apply(LauncherStartupInfo base) {
-            return LauncherJarStartupInfo.create(base,
-                    new LauncherJarStartupInfoMixin.Stub(jarPath,
-                            isClassNameFromMainJar));
-        }
+        // Try to find the module in the specified module path list.
+        final var moduleInfo = JLinkRuntimeBuilder.createModuleFinder(fullModulePath).find(moduleName)
+                .map(ModuleInfo::fromModuleReference).or(() -> {
+                    // Failed to find the module in the specified module path list.
+                    return cookedRuntimePath().flatMap(cookedRuntime -> {
+                        // Lookup the module in the external runtime.
+                        return ModuleInfo.fromCookedRuntime(moduleName, cookedRuntime);
+                    });
+                }).orElseThrow(() -> {
+                    return I18N.buildConfigException("error.no-module-in-path", moduleName).create();
+                });
+
+        final var effectiveMainClassName = mainClassName().or(moduleInfo::mainClass).orElseThrow(() -> {
+            return I18N.buildConfigException("ERR_NoMainClass").create();
+        });
+
+        // If module is located in the file system, exclude it from the classpath.
+        final var classpath = inputDir().map(theInputDir -> {
+            var classpathExcludes = moduleInfo.fileLocation().filter(moduleFile -> {
+                return moduleFile.startsWith(theInputDir);
+            }).map(theInputDir::relativize).map(Set::of).orElseGet(Set::of);
+            return createClasspath(theInputDir, classpathExcludes);
+        }).orElseGet(List::of);
+
+        return LauncherModularStartupInfo.create(
+                createLauncherStartupInfo(effectiveMainClassName, classpath),
+                new LauncherModularStartupInfoMixin.Stub(moduleInfo.name(), moduleInfo.version()));
     }
 
-    private String qualifiedClassName;
+    private List<Path> getFullModulePath() {
+        return cookedRuntimePath().map(runtimeImage -> {
+            return Stream.of(modulePath(), List.of(runtimeImage.resolve("lib"))).flatMap(List::stream).toList();
+        }).orElse(modulePath());
+    }
+
+    private List<Path> modulePath() {
+        return Optional.ofNullable(modulePath).orElseGet(List::of);
+    }
+
+    private LauncherJarStartupInfo createNonModular() {
+        final var theInputDir = inputDir().orElseThrow();
+
+        final var mainJarPath = theInputDir.resolve(mainJar);
+
+        if (!Files.exists(mainJarPath)) {
+            throw I18N.buildConfigException()
+                    .message("error.main-jar-does-not-exist", mainJar)
+                    .advice("error.main-jar-does-not-exist.advice")
+                    .create();
+        }
+
+        final var effectiveMainClassName = mainClassName().or(() -> {
+            try (final var jf = new JarFile(mainJarPath.toFile())) {
+                return Optional.ofNullable(jf.getManifest()).map(Manifest::getMainAttributes).map(attrs -> {
+                    return attrs.getValue(Attributes.Name.MAIN_CLASS);
+                });
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }).orElseThrow(() -> {
+            return I18N.buildConfigException()
+                    .message("error.no-main-class-with-main-jar", mainJar)
+                    .advice("error.no-main-class-with-main-jar.advice", mainJar)
+                    .create();
+        });
+
+        return LauncherJarStartupInfo.create(
+                createLauncherStartupInfo(effectiveMainClassName, createClasspath(theInputDir, Set.of(mainJar))),
+                new LauncherJarStartupInfoMixin.Stub(mainJar, mainClassName().isEmpty()));
+    }
+
+    // Modular options
+    private String moduleName;
+    private List<Path> modulePath;
+
+    // Non-modular options
+    private Path mainJar;
+
+    // Common options
+    private Path inputDir;
+    private String mainClassName;
     private List<String> javaOptions;
     private List<String> defaultParameters;
-    private List<Path> classPath;
-    private UnaryOperator<LauncherStartupInfo> decorator;
+    private Path cookedRuntimePath;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
new file mode 100644
index 00000000000..97e1274f078
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.cli.StandardOption.BUNDLING_OPERATION_DESCRIPTOR;
+import static jdk.jpackage.internal.cli.StandardOption.DEST;
+import static jdk.jpackage.internal.cli.StandardOption.MAIN_JAR;
+import static jdk.jpackage.internal.cli.StandardOption.MODULE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardBundlingOperation;
+
+final class OptionUtils {
+
+    static boolean isRuntimeInstaller(Options options) {
+        return PREDEFINED_RUNTIME_IMAGE.containsIn(options)
+                && !PREDEFINED_APP_IMAGE.containsIn(options)
+                && !MAIN_JAR.containsIn(options)
+                && !MODULE.containsIn(options);
+    }
+
+    static Path outputDir(Options options) {
+        return DEST.getFrom(options);
+    }
+
+    static StandardBundlingOperation bundlingOperation(Options options) {
+        return StandardBundlingOperation.valueOf(BUNDLING_OPERATION_DESCRIPTOR.getFrom(options)).orElseThrow();
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
new file mode 100644
index 00000000000..b146e5a7f8d
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.cli.StandardOption.ADDITIONAL_LAUNCHERS;
+import static jdk.jpackage.internal.cli.StandardOption.APP_VERSION;
+import static jdk.jpackage.internal.cli.StandardOption.DESCRIPTION;
+import static jdk.jpackage.internal.cli.StandardOption.ICON;
+import static jdk.jpackage.internal.cli.StandardOption.NAME;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.WithOptionIdentifier;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.ExternalApplication;
+
+record OptionsTransformer(Options mainOptions, Optional<ExternalApplication> externalApp) {
+
+    OptionsTransformer {
+        Objects.requireNonNull(mainOptions);
+        Objects.requireNonNull(externalApp);
+    }
+
+    OptionsTransformer(Options mainOptions, ApplicationLayout appLayout) {
+        this(mainOptions, PREDEFINED_APP_IMAGE.findIn(mainOptions).map(appLayout::resolveAt).map(AppImageFile::load));
+    }
+
+    Options appOptions() {
+        return externalApp.map(ea -> {
+            var overrideOptions = Map.<WithOptionIdentifier, Object>of(
+                    NAME, ea.appName(),
+                    APP_VERSION, ea.appVersion(),
+                    ADDITIONAL_LAUNCHERS, ea.addLaunchers().stream().map(li -> {
+                        return Options.concat(li.extra(), Options.of(Map.of(
+                                NAME, li.name(),
+                                // This should prevent the code building the Launcher instance
+                                // from the Options object from trying to create a startup info object.
+                                PREDEFINED_APP_IMAGE, PREDEFINED_APP_IMAGE.getFrom(mainOptions),
+                                //
+                                // For backward compatibility, descriptions of the additional
+                                // launchers in the predefined app image will be set to
+                                // the application description, if available, or to the name
+                                // of the main launcher in the predefined app image.
+                                //
+                                // All launchers in the predefined app image will have the same description.
+                                // This is wrong and should be revised.
+                                //
+                                DESCRIPTION, DESCRIPTION.findIn(mainOptions).orElseGet(ea::appName)
+                            )));
+                    }).toList()
+            );
+            return Options.concat(
+                    Options.of(overrideOptions),
+                    ea.extra(),
+                    // Remove icon if any from the application/launcher options.
+                    // If the icon is specified in the main options, it for the installer.
+                    mainOptions.copyWithout(ICON.id())
+            );
+        }).orElse(mainOptions);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Packager.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Packager.java
index 501fd64bdca..8e47b046eb1 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Packager.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Packager.java
@@ -29,7 +29,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import jdk.jpackage.internal.model.Package;
-import jdk.jpackage.internal.model.PackagerException;
 
 final class Packager<T extends Package> {
 
@@ -69,7 +68,7 @@ final class Packager<T extends Package> {
         return Objects.requireNonNull(env);
     }
 
-    Path execute(PackagingPipeline.Builder pipelineBuilder) throws PackagerException {
+    Path execute(PackagingPipeline.Builder pipelineBuilder) {
         Objects.requireNonNull(pkg);
         Objects.requireNonNull(env);
         Objects.requireNonNull(outputDir);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
index 6f4e0d0d2d8..a2750fee260 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
@@ -46,7 +46,6 @@ import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.Package;
-import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.pipeline.DirectedEdge;
 import jdk.jpackage.internal.pipeline.FixedDAG;
 import jdk.jpackage.internal.pipeline.TaskPipelineBuilder;
@@ -62,7 +61,7 @@ final class PackagingPipeline {
      * @param env the build environment
      * @param app the application
      */
-    void execute(BuildEnv env, Application app) throws PackagerException {
+    void execute(BuildEnv env, Application app) {
         execute(contextMapper.apply(createTaskContext(env, app)));
     }
 
@@ -81,7 +80,7 @@ final class PackagingPipeline {
      * @param pkg       the package
      * @param outputDir the output directory for the package file
      */
-    void execute(BuildEnv env, Package pkg, Path outputDir) throws PackagerException {
+    void execute(BuildEnv env, Package pkg, Path outputDir) {
         execute((StartupParameters)createPackagingTaskContext(env, pkg, outputDir, taskConfig));
     }
 
@@ -91,7 +90,7 @@ final class PackagingPipeline {
      *
      * @param startupParameters the pipeline startup parameters
      */
-    void execute(StartupParameters startupParameters) throws PackagerException {
+    void execute(StartupParameters startupParameters) {
         execute(contextMapper.apply(createTaskContext((PackagingTaskContext)startupParameters)));
     }
 
@@ -132,7 +131,7 @@ final class PackagingPipeline {
     }
 
     interface TaskContext extends Predicate<TaskID> {
-        void execute(TaskAction taskAction) throws IOException, PackagerException;
+        void execute(TaskAction taskAction) throws IOException;
     }
 
     record AppImageBuildEnv<T extends Application, U extends AppImageLayout>(BuildEnv env, T app) {
@@ -161,27 +160,27 @@ final class PackagingPipeline {
 
     @FunctionalInterface
     interface ApplicationImageTaskAction<T extends Application, U extends ApplicationLayout> extends TaskAction {
-        void execute(AppImageBuildEnv<T, U> env) throws IOException, PackagerException;
+        void execute(AppImageBuildEnv<T, U> env) throws IOException;
     }
 
     @FunctionalInterface
     interface AppImageTaskAction<T extends Application, U extends AppImageLayout> extends TaskAction {
-        void execute(AppImageBuildEnv<T, U> env) throws IOException, PackagerException;
+        void execute(AppImageBuildEnv<T, U> env) throws IOException;
     }
 
     @FunctionalInterface
     interface CopyAppImageTaskAction<T extends Package> extends TaskAction {
-        void execute(T pkg, AppImageLayout srcAppImage, AppImageLayout dstAppImage) throws IOException, PackagerException;
+        void execute(T pkg, AppImageLayout srcAppImage, AppImageLayout dstAppImage) throws IOException;
     }
 
     @FunctionalInterface
     interface PackageTaskAction<T extends Package, U extends AppImageLayout> extends TaskAction {
-        void execute(PackageBuildEnv<T, U> env) throws IOException, PackagerException;
+        void execute(PackageBuildEnv<T, U> env) throws IOException;
     }
 
     @FunctionalInterface
     interface NoArgTaskAction extends TaskAction {
-        void execute() throws IOException, PackagerException;
+        void execute() throws IOException;
     }
 
     record TaskConfig(Optional<TaskAction> action) {
@@ -493,7 +492,7 @@ final class PackagingPipeline {
         return new PackagingTaskContext(BuildEnv.withAppImageLayout(env, dstLayout), pkg, outputDir, srcLayout);
     }
 
-    private void execute(TaskContext context) throws PackagerException {
+    private void execute(TaskContext context) {
         final Map<TaskID, Callable<Void>> tasks = taskConfig.entrySet().stream().collect(toMap(Map.Entry::getKey, task -> {
             return createTask(context, task.getKey(), task.getValue());
         }));
@@ -508,14 +507,8 @@ final class PackagingPipeline {
 
         try {
             builder.create().call();
-        } catch (ExceptionBox ex) {
-            throw new PackagerException(ex.getCause());
-        } catch (RuntimeException ex) {
-            throw ex;
-        } catch (PackagerException ex) {
-            throw ex;
         } catch (Exception ex) {
-            throw new PackagerException(ex);
+            throw ExceptionBox.rethrowUnchecked(ex);
         }
     }
 
@@ -546,7 +539,7 @@ final class PackagingPipeline {
 
         @SuppressWarnings("unchecked")
         @Override
-        public void execute(TaskAction taskAction) throws IOException, PackagerException {
+        public void execute(TaskAction taskAction) throws IOException {
             if (taskAction instanceof PackageTaskAction<?, ?>) {
                 ((PackageTaskAction<Package, AppImageLayout>)taskAction).execute(pkgBuildEnv());
             } else if (taskAction instanceof CopyAppImageTaskAction<?>) {
@@ -600,7 +593,7 @@ final class PackagingPipeline {
 
         @SuppressWarnings("unchecked")
         @Override
-        public void execute(TaskAction taskAction) throws IOException, PackagerException {
+        public void execute(TaskAction taskAction) throws IOException {
             if (taskAction instanceof AppImageTaskAction<?, ?>) {
                 final var taskEnv = pkg.map(PackagingTaskContext::appImageBuildEnv).orElseGet(this::appBuildEnv);
                 ((AppImageTaskAction<Application, AppImageLayout>)taskAction).execute(taskEnv);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
deleted file mode 100644
index 2b35a6830f8..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.ExternalApplication;
-import static jdk.jpackage.internal.ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
-
-/**
- * Standard bundler parameters.
- *
- * Contains static definitions of all of the common bundler parameters.
- * (additional platform specific and mode specific bundler parameters
- * are defined in each of the specific bundlers)
- *
- * Also contains static methods that operate on maps of parameters.
- */
-final class StandardBundlerParam {
-
-    private static final String DEFAULT_VERSION = "1.0";
-    private static final String DEFAULT_RELEASE = "1";
-    private static final String[] DEFAULT_JLINK_OPTIONS = {
-            "--strip-native-commands",
-            "--strip-debug",
-            "--no-man-pages",
-            "--no-header-files"};
-
-    static final BundlerParamInfo<LauncherData> LAUNCHER_DATA = BundlerParamInfo.createBundlerParam(
-            LauncherData.class, LauncherData::create);
-
-    static final BundlerParamInfo<Path> SOURCE_DIR =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.INPUT.getId(),
-                    Path.class,
-                    p -> null,
-                    (s, p) -> Path.of(s)
-            );
-
-    static final BundlerParamInfo<Path> OUTPUT_DIR =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.OUTPUT.getId(),
-                    Path.class,
-                    p -> Path.of("").toAbsolutePath(),
-                    (s, p) -> Path.of(s)
-            );
-
-    // note that each bundler is likely to replace this one with
-    // their own converter
-    static final BundlerParamInfo<Path> MAIN_JAR =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.MAIN_JAR.getId(),
-                    Path.class,
-                    params -> LAUNCHER_DATA.fetchFrom(params).mainJarName(),
-                    null
-            );
-
-    static final BundlerParamInfo<Path> PREDEFINED_APP_IMAGE =
-            new BundlerParamInfo<>(
-            Arguments.CLIOptions.PREDEFINED_APP_IMAGE.getId(),
-            Path.class,
-            params -> null,
-            (s, p) -> Path.of(s));
-
-    static final BundlerParamInfo<ExternalApplication> PREDEFINED_APP_IMAGE_FILE = BundlerParamInfo.createBundlerParam(
-            ExternalApplication.class, params -> {
-                if (hasPredefinedAppImage(params)) {
-                    var appImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
-                    return AppImageFile.load(appImage, PLATFORM_APPLICATION_LAYOUT);
-                } else {
-                    return null;
-                }
-            });
-
-    static final BundlerParamInfo<String> MAIN_CLASS =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.APPCLASS.getId(),
-                    String.class,
-                    params -> {
-                        if (isRuntimeInstaller(params)) {
-                            return null;
-                        } else if (hasPredefinedAppImage(params)) {
-                            PREDEFINED_APP_IMAGE_FILE.fetchFrom(params).getMainClass();
-                        }
-                        return LAUNCHER_DATA.fetchFrom(params).qualifiedClassName();
-                    },
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<Path> PREDEFINED_RUNTIME_IMAGE =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId(),
-                    Path.class,
-                    params -> null,
-                    (s, p) -> Path.of(s)
-            );
-
-    // this is the raw --app-name arg - used in APP_NAME and INSTALLER_NAME
-    static final BundlerParamInfo<String> NAME =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.NAME.getId(),
-                    String.class,
-                    params -> null,
-                    (s, p) -> s
-            );
-
-    // this is the application name, either from the app-image (if given),
-    // the name (if given) derived from the main-class, or the runtime image
-    static final BundlerParamInfo<String> APP_NAME =
-            new BundlerParamInfo<>(
-                    "application-name",
-                    String.class,
-                    params -> {
-                        String appName = NAME.fetchFrom(params);
-                        if (hasPredefinedAppImage(params)) {
-                            appName = PREDEFINED_APP_IMAGE_FILE.fetchFrom(params).getLauncherName();
-                        } else if (appName == null) {
-                            String s = MAIN_CLASS.fetchFrom(params);
-                            if (s != null) {
-                                int idx = s.lastIndexOf(".");
-                                appName = (idx < 0) ? s : s.substring(idx+1);
-                            } else if (isRuntimeInstaller(params)) {
-                                Path f = PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
-                                if (f != null) {
-                                    appName = f.getFileName().toString();
-                                }
-                            }
-                        }
-                        return appName;
-                    },
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<String> INSTALLER_NAME =
-            new BundlerParamInfo<>(
-                    "installer-name",
-                    String.class,
-                    params -> {
-                        String installerName = NAME.fetchFrom(params);
-                        return (installerName != null) ? installerName :
-                                APP_NAME.fetchFrom(params);
-                    },
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<Path> ICON =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.ICON.getId(),
-                    Path.class,
-                    params -> null,
-                    (s, p) -> Path.of(s)
-            );
-
-    static final BundlerParamInfo<String> ABOUT_URL =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.ABOUT_URL.getId(),
-                    String.class,
-                    params -> null,
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<String> VENDOR =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.VENDOR.getId(),
-                    String.class,
-                    params -> I18N.getString("param.vendor.default"),
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<String> DESCRIPTION =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.DESCRIPTION.getId(),
-                    String.class,
-                    params -> params.containsKey(APP_NAME.getID())
-                            ? APP_NAME.fetchFrom(params)
-                            : I18N.getString("param.description.default"),
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<String> COPYRIGHT =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.COPYRIGHT.getId(),
-                    String.class,
-                    params -> MessageFormat.format(I18N.getString(
-                            "param.copyright.default"), new Date()),
-                    (s, p) -> s
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<String>> ARGUMENTS =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.ARGUMENTS.getId(),
-                    (Class<List<String>>) (Object) List.class,
-                    params -> Collections.emptyList(),
-                    (s, p) -> null
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<String>> JAVA_OPTIONS =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.JAVA_OPTIONS.getId(),
-                    (Class<List<String>>) (Object) List.class,
-                    params -> Collections.emptyList(),
-                    (s, p) -> Arrays.asList(s.split("\n\n"))
-            );
-
-    static final BundlerParamInfo<String> VERSION =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.VERSION.getId(),
-                    String.class,
-                    StandardBundlerParam::getDefaultAppVersion,
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<String> RELEASE =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.RELEASE.getId(),
-                    String.class,
-                    params -> DEFAULT_RELEASE,
-                    (s, p) -> s
-            );
-
-    public static final BundlerParamInfo<String> LICENSE_FILE =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.LICENSE_FILE.getId(),
-                    String.class,
-                    params -> null,
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<Path> TEMP_ROOT =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.TEMP_ROOT.getId(),
-                    Path.class,
-                    params -> {
-                        try {
-                            return Files.createTempDirectory("jdk.jpackage");
-                        } catch (IOException ioe) {
-                            return null;
-                        }
-                    },
-                    (s, p) -> Path.of(s)
-            );
-
-    public static final BundlerParamInfo<Path> CONFIG_ROOT =
-            new BundlerParamInfo<>(
-                "configRoot",
-                Path.class,
-                params -> {
-                    Path root = TEMP_ROOT.fetchFrom(params).resolve("config");
-                    try {
-                        Files.createDirectories(root);
-                    } catch (IOException ioe) {
-                        return null;
-                    }
-                    return root;
-                },
-                (s, p) -> null
-            );
-
-    static final BundlerParamInfo<Boolean> VERBOSE  =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.VERBOSE.getId(),
-                    Boolean.class,
-                    params -> false,
-                    // valueOf(null) is false, and we actually do want null
-                    (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
-                            true : Boolean.valueOf(s)
-            );
-
-    static final BundlerParamInfo<Path> RESOURCE_DIR =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.RESOURCE_DIR.getId(),
-                    Path.class,
-                    params -> null,
-                    (s, p) -> Path.of(s)
-            );
-
-    static final BundlerParamInfo<String> INSTALL_DIR =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.INSTALL_DIR.getId(),
-                    String.class,
-                     params -> null,
-                    (s, p) -> s
-    );
-
-    static final BundlerParamInfo<Boolean> LAUNCHER_AS_SERVICE =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.LAUNCHER_AS_SERVICE.getId(),
-                    Boolean.class,
-                    params -> false,
-                    // valueOf(null) is false, and we actually do want null
-                    (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
-                            true : Boolean.valueOf(s)
-            );
-
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<Map<String, ? super Object>>> ADD_LAUNCHERS =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.ADD_LAUNCHER.getId(),
-                    (Class<List<Map<String, ? super Object>>>) (Object)
-                            List.class,
-                    params -> new ArrayList<>(1),
-                    // valueOf(null) is false, and we actually do want null
-                    (s, p) -> null
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo
-            <List<Map<String, ? super Object>>> FILE_ASSOCIATIONS =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.FILE_ASSOCIATIONS.getId(),
-                    (Class<List<Map<String, ? super Object>>>) (Object)
-                            List.class,
-                    params -> new ArrayList<>(1),
-                    // valueOf(null) is false, and we actually do want null
-                    (s, p) -> null
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<String>> FA_EXTENSIONS =
-            new BundlerParamInfo<>(
-                    "fileAssociation.extension",
-                    (Class<List<String>>) (Object) List.class,
-                    params -> null, // null means not matched to an extension
-                    (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<String>> FA_CONTENT_TYPE =
-            new BundlerParamInfo<>(
-                    "fileAssociation.contentType",
-                    (Class<List<String>>) (Object) List.class,
-                    params -> null,
-                            // null means not matched to a content/mime type
-                    (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
-            );
-
-    static final BundlerParamInfo<String> FA_DESCRIPTION =
-            new BundlerParamInfo<>(
-                    "fileAssociation.description",
-                    String.class,
-                    p -> null,
-                    (s, p) -> s
-            );
-
-    static final BundlerParamInfo<Path> FA_ICON =
-            new BundlerParamInfo<>(
-                    "fileAssociation.icon",
-                    Path.class,
-                    ICON::fetchFrom,
-                    (s, p) -> Path.of(s)
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<Path>> DMG_CONTENT =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.DMG_CONTENT.getId(),
-                    (Class<List<Path>>) (Object)List.class,
-                    p -> Collections.emptyList(),
-                    (s, p) -> Stream.of(s.split(",")).map(Path::of).toList()
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<Path>> APP_CONTENT =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.APP_CONTENT.getId(),
-                    (Class<List<Path>>) (Object)List.class,
-                    p->Collections.emptyList(),
-                    (s, p) -> Stream.of(s.split(",")).map(Path::of).toList()
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<Path>> MODULE_PATH =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.MODULE_PATH.getId(),
-                    (Class<List<Path>>) (Object)List.class,
-                    p -> JLinkRuntimeBuilder.ensureBaseModuleInModulePath(List.of()),
-                    (s, p) -> {
-                        List<Path> modulePath = Stream.of(s.split(File.pathSeparator))
-                                .map(Path::of)
-                                .toList();
-                        return JLinkRuntimeBuilder.ensureBaseModuleInModulePath(modulePath);
-                    });
-
-    static final BundlerParamInfo<String> MODULE =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.MODULE.getId(),
-                    String.class,
-                    p -> null,
-                    (s, p) -> {
-                        return String.valueOf(s);
-                    });
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<Set<String>> ADD_MODULES =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.ADD_MODULES.getId(),
-                    (Class<Set<String>>) (Object) Set.class,
-                    p -> new LinkedHashSet<String>(),
-                    (s, p) -> new LinkedHashSet<>(Arrays.asList(s.split(",")))
-            );
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<String>> JLINK_OPTIONS =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.JLINK_OPTIONS.getId(),
-                    (Class<List<String>>) (Object) List.class,
-                    p -> Arrays.asList(DEFAULT_JLINK_OPTIONS),
-                    (s, p) -> null);
-
-    @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<Set<String>> LIMIT_MODULES =
-            new BundlerParamInfo<>(
-                    "limit-modules",
-                    (Class<Set<String>>) (Object) Set.class,
-                    p -> new LinkedHashSet<String>(),
-                    (s, p) -> new LinkedHashSet<>(Arrays.asList(s.split(",")))
-            );
-
-    static final BundlerParamInfo<Boolean> SIGN_BUNDLE =
-            new BundlerParamInfo<>(
-                    Arguments.CLIOptions.MAC_SIGN.getId(),
-                    Boolean.class,
-                    params -> false,
-                    (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
-                    null : Boolean.valueOf(s)
-        );
-
-    static boolean isRuntimeInstaller(Map<String, ? super Object> params) {
-        if (params.containsKey(MODULE.getID()) ||
-                params.containsKey(MAIN_JAR.getID()) ||
-                params.containsKey(PREDEFINED_APP_IMAGE.getID())) {
-            return false; // we are building or are given an application
-        }
-        // runtime installer requires --runtime-image, if this is false
-        // here then we should have thrown error validating args.
-        return params.containsKey(PREDEFINED_RUNTIME_IMAGE.getID());
-    }
-
-    static boolean hasPredefinedAppImage(Map<String, ? super Object> params) {
-        return params.containsKey(PREDEFINED_APP_IMAGE.getID());
-    }
-
-    private static String getDefaultAppVersion(Map<String, ? super Object> params) {
-        String appVersion = DEFAULT_VERSION;
-
-        if (isRuntimeInstaller(params)) {
-            return appVersion;
-        }
-
-        LauncherData launcherData = null;
-        try {
-            launcherData = LAUNCHER_DATA.fetchFrom(params);
-        } catch (RuntimeException ex) {
-            if (ex.getCause() instanceof ConfigException) {
-                return appVersion;
-            }
-            throw ex;
-        }
-
-        if (launcherData.isModular()) {
-            String moduleVersion = launcherData.getAppVersion();
-            if (moduleVersion != null) {
-                Log.verbose(MessageFormat.format(I18N.getString(
-                        "message.module-version"),
-                        moduleVersion,
-                        launcherData.moduleName()));
-                appVersion = moduleVersion;
-            }
-        }
-
-        return appVersion;
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
similarity index 53%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
index 762b65b530e..50d1701bf0d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,36 +22,51 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package jdk.jpackage.internal;
 
+import java.io.Closeable;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Map;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardOption;
 import jdk.jpackage.internal.util.FileUtils;
 
+final class TempDirectory implements Closeable {
 
-/**
- * AbstractBundler
- *
- * This is the base class all bundlers extend from.
- * It contains methods and parameters common to all bundlers.
- * The concrete implementations are in the platform specific bundlers.
- */
-abstract class AbstractBundler implements Bundler {
+    TempDirectory(Options options) throws IOException {
+        final var tempDir = StandardOption.TEMP_ROOT.findIn(options);
+        if (tempDir.isPresent()) {
+            this.path = tempDir.orElseThrow();
+            this.options = options;
+        } else {
+            this.path = Files.createTempDirectory("jdk.jpackage");
+            this.options = options.copyWithDefaultValue(StandardOption.TEMP_ROOT, path);
+        }
 
-    @Override
-    public String toString() {
-        return getName();
+        deleteOnClose = tempDir.isEmpty();
+    }
+
+    Options options() {
+        return options;
+    }
+
+    Path path() {
+        return path;
+    }
+
+    boolean deleteOnClose() {
+        return deleteOnClose;
     }
 
     @Override
-    public void cleanup(Map<String, ? super Object> params) {
-        try {
-            FileUtils.deleteRecursive(
-                    StandardBundlerParam.TEMP_ROOT.fetchFrom(params));
-        } catch (IOException e) {
-            Log.verbose(e.getMessage());
+    public void close() throws IOException {
+        if (deleteOnClose) {
+            FileUtils.deleteRecursive(path);
         }
     }
+
+    private final Path path;
+    private final Options options;
+    private final boolean deleteOnClose;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
deleted file mode 100644
index 89a2e4b56fe..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.util.EnumSet;
-import java.util.HashMap;
-
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.Arguments.CLIOptions;
-
-/**
- * ValidOptions
- *
- * Two basic methods for validating command line options.
- *
- * initArgs()
- *      Computes the Map of valid options for each mode on this Platform.
- *
- * checkIfSupported(CLIOptions arg)
- *      Determine if the given arg is valid on this platform.
- *
- * checkIfImageSupported(CLIOptions arg)
- *      Determine if the given arg is valid for creating app image.
- *
- * checkIfInstallerSupported(CLIOptions arg)
- *      Determine if the given arg is valid for creating installer.
- *
- * checkIfSigningSupported(CLIOptions arg)
- *      Determine if the given arg is valid for signing app image.
- *
- */
-class ValidOptions {
-
-    enum USE {
-        ALL,        // valid in all cases
-        LAUNCHER,   // valid when creating a launcher
-        INSTALL,    // valid when creating an installer
-        SIGN,       // valid when signing is requested
-    }
-
-    private static final HashMap<String, EnumSet<USE>> options = new HashMap<>();
-
-    // initializing list of mandatory arguments
-    static {
-        put(CLIOptions.NAME.getId(), USE.ALL);
-        put(CLIOptions.VERSION.getId(), USE.ALL);
-        put(CLIOptions.OUTPUT.getId(), USE.ALL);
-        put(CLIOptions.TEMP_ROOT.getId(), USE.ALL);
-        put(CLIOptions.VERBOSE.getId(),
-                EnumSet.of(USE.ALL, USE.SIGN));
-        put(CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId(), USE.ALL);
-        put(CLIOptions.RESOURCE_DIR.getId(), USE.ALL);
-        put(CLIOptions.DESCRIPTION.getId(), USE.ALL);
-        put(CLIOptions.VENDOR.getId(), USE.ALL);
-        put(CLIOptions.COPYRIGHT.getId(), USE.ALL);
-        put(CLIOptions.PACKAGE_TYPE.getId(),
-                EnumSet.of(USE.ALL, USE.SIGN));
-        put(CLIOptions.ICON.getId(), USE.ALL);
-
-        put(CLIOptions.INPUT.getId(), USE.LAUNCHER);
-        put(CLIOptions.MODULE.getId(), USE.LAUNCHER);
-        put(CLIOptions.MODULE_PATH.getId(), USE.LAUNCHER);
-        put(CLIOptions.ADD_MODULES.getId(), USE.LAUNCHER);
-        put(CLIOptions.MAIN_JAR.getId(), USE.LAUNCHER);
-        put(CLIOptions.APPCLASS.getId(), USE.LAUNCHER);
-        put(CLIOptions.ARGUMENTS.getId(), USE.LAUNCHER);
-        put(CLIOptions.JAVA_OPTIONS.getId(), USE.LAUNCHER);
-        put(CLIOptions.ADD_LAUNCHER.getId(), USE.LAUNCHER);
-        put(CLIOptions.JLINK_OPTIONS.getId(), USE.LAUNCHER);
-        put(CLIOptions.APP_CONTENT.getId(), USE.LAUNCHER);
-
-        put(CLIOptions.LICENSE_FILE.getId(), USE.INSTALL);
-        put(CLIOptions.INSTALL_DIR.getId(), USE.INSTALL);
-        put(CLIOptions.PREDEFINED_APP_IMAGE.getId(),
-                (OperatingSystem.isMacOS()) ?
-                        EnumSet.of(USE.INSTALL, USE.SIGN) :
-                        EnumSet.of(USE.INSTALL));
-        put(CLIOptions.LAUNCHER_AS_SERVICE.getId(), USE.INSTALL);
-
-        put(CLIOptions.ABOUT_URL.getId(), USE.INSTALL);
-
-        put(CLIOptions.FILE_ASSOCIATIONS.getId(),
-            (OperatingSystem.isMacOS()) ? USE.ALL : USE.INSTALL);
-
-        if (OperatingSystem.isWindows()) {
-            put(CLIOptions.WIN_CONSOLE_HINT.getId(), USE.LAUNCHER);
-
-            put(CLIOptions.WIN_HELP_URL.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_UPDATE_URL.getId(), USE.INSTALL);
-
-            put(CLIOptions.WIN_MENU_HINT.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_MENU_GROUP.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_SHORTCUT_HINT.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_SHORTCUT_PROMPT.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_DIR_CHOOSER.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_UPGRADE_UUID.getId(), USE.INSTALL);
-            put(CLIOptions.WIN_PER_USER_INSTALLATION.getId(),
-                    USE.INSTALL);
-        }
-
-        if (OperatingSystem.isMacOS()) {
-            put(CLIOptions.MAC_SIGN.getId(),
-                    EnumSet.of(USE.ALL, USE.SIGN));
-            put(CLIOptions.MAC_BUNDLE_NAME.getId(), USE.ALL);
-            put(CLIOptions.MAC_BUNDLE_IDENTIFIER.getId(), USE.ALL);
-            put(CLIOptions.MAC_BUNDLE_SIGNING_PREFIX.getId(),
-                    EnumSet.of(USE.ALL, USE.SIGN));
-            put(CLIOptions.MAC_SIGNING_KEY_NAME.getId(),
-                    EnumSet.of(USE.ALL, USE.SIGN));
-            put(CLIOptions.MAC_APP_IMAGE_SIGN_IDENTITY.getId(),
-                    EnumSet.of(USE.ALL, USE.SIGN));
-            put(CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getId(),
-                    EnumSet.of(USE.INSTALL, USE.SIGN));
-            put(CLIOptions.MAC_SIGNING_KEYCHAIN.getId(),
-                    EnumSet.of(USE.ALL, USE.SIGN));
-            put(CLIOptions.MAC_APP_STORE.getId(), USE.ALL);
-            put(CLIOptions.MAC_CATEGORY.getId(), USE.ALL);
-            put(CLIOptions.MAC_ENTITLEMENTS.getId(),
-                    EnumSet.of(USE.ALL, USE.SIGN));
-            put(CLIOptions.DMG_CONTENT.getId(), USE.INSTALL);
-        }
-
-        if (OperatingSystem.isLinux()) {
-            put(CLIOptions.LINUX_BUNDLE_NAME.getId(), USE.INSTALL);
-            put(CLIOptions.LINUX_DEB_MAINTAINER.getId(), USE.INSTALL);
-            put(CLIOptions.LINUX_CATEGORY.getId(), USE.INSTALL);
-            put(CLIOptions.LINUX_RPM_LICENSE_TYPE.getId(), USE.INSTALL);
-            put(CLIOptions.LINUX_PACKAGE_DEPENDENCIES.getId(),
-                    USE.INSTALL);
-            put(CLIOptions.LINUX_MENU_GROUP.getId(), USE.INSTALL);
-            put(CLIOptions.RELEASE.getId(), USE.INSTALL);
-            put(CLIOptions.LINUX_SHORTCUT_HINT.getId(), USE.INSTALL);
-        }
-    }
-
-    static boolean checkIfSupported(CLIOptions arg) {
-        return options.containsKey(arg.getId());
-    }
-
-    static boolean checkIfImageSupported(CLIOptions arg) {
-        EnumSet<USE> value = options.get(arg.getId());
-        return value.contains(USE.ALL) ||
-                value.contains(USE.LAUNCHER) ||
-                value.contains(USE.SIGN);
-    }
-
-    static boolean checkIfInstallerSupported(CLIOptions arg) {
-        EnumSet<USE> value = options.get(arg.getId());
-        return value.contains(USE.ALL) || value.contains(USE.INSTALL);
-    }
-
-    static boolean checkIfSigningSupported(CLIOptions arg) {
-        EnumSet<USE> value = options.get(arg.getId());
-        return value.contains(USE.SIGN);
-    }
-
-    private static EnumSet<USE> put(String key, USE value) {
-        return options.put(key, EnumSet.of(value));
-    }
-
-    private static EnumSet<USE> put(String key, EnumSet<USE> value) {
-        return options.put(key, value);
-    }
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBuildEnvFromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/AdditionalLauncher.java
similarity index 76%
rename from src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBuildEnvFromParams.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/AdditionalLauncher.java
index 31759c8c529..34019ff9e81 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBuildEnvFromParams.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/AdditionalLauncher.java
@@ -22,13 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.MacPackage;
+package jdk.jpackage.internal.cli;
 
-final class MacBuildEnvFromParams {
+import java.nio.file.Path;
 
-    static final BundlerParamInfo<BuildEnv> BUILD_ENV = BundlerParamInfo.createBundlerParam(BuildEnv.class, params -> {
-        return BuildEnvFromParams.create(params, MacPackagingPipeline.APPLICATION_LAYOUT::resolveAt, MacPackage::guessRuntimeLayout);
-    });
+
+record AdditionalLauncher(String name, Path propertyFile) {
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationModifier.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationModifier.java
new file mode 100644
index 00000000000..33525f3e54d
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationModifier.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+/**
+ * Modifiers for jpackage operations.
+ */
+enum BundlingOperationModifier implements OptionScope {
+    /**
+     * Create runtime native bundle.
+     */
+    BUNDLE_RUNTIME,
+
+    /**
+     * Create native bundle from the predefined app image.
+     */
+    BUNDLE_PREDEFINED_APP_IMAGE,
+
+    ;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationOptionScope.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationOptionScope.java
new file mode 100644
index 00000000000..04af5865baa
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationOptionScope.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+
+/**
+ * Bundling operation scope.
+ * <p>
+ * The scope of bundling operations. E.g., app image or native package bundling.
+ */
+interface BundlingOperationOptionScope extends OptionScope {
+    BundlingOperationDescriptor descriptor();
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/CliBundlingEnvironment.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/CliBundlingEnvironment.java
new file mode 100644
index 00000000000..09ff0997c14
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/CliBundlingEnvironment.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.NoSuchElementException;
+import jdk.jpackage.internal.model.BundlingEnvironment;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+
+/**
+ * CLI bundling environment.
+ */
+public interface CliBundlingEnvironment extends BundlingEnvironment {
+
+    /**
+     * Requests to run a bundling operation denoted with the given descriptor with
+     * the given values of command line options.
+     *
+     * @param op      the descriptor of the requested bundling operation
+     * @param cmdline the validated values of the command line options
+     * @throws NoSuchElementException if the specified descriptor is not one of the
+     *                                items in the list returned by
+     *                                {@link #supportedOperations()} method
+     */
+    void createBundle(BundlingOperationDescriptor op, Options cmdline);
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/DefaultOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/DefaultOptions.java
new file mode 100644
index 00000000000..91342500277
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/DefaultOptions.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toUnmodifiableMap;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+
+final class DefaultOptions implements Options {
+
+    DefaultOptions(Map<? extends WithOptionIdentifier, Object> values) {
+        this(values, Optional.empty());
+    }
+
+    DefaultOptions(
+            Map<? extends WithOptionIdentifier, Object> values,
+            Predicate<OptionName> optionNamesFilter) {
+
+        this(values, Optional.of(optionNamesFilter));
+    }
+
+    DefaultOptions(
+            Map<? extends WithOptionIdentifier, Object> values,
+            Optional<Predicate<OptionName>> optionNamesFilter) {
+
+        map = values.entrySet().stream().collect(toUnmodifiableMap(e -> {
+            return e.getKey().id();
+        }, e -> {
+            return new OptionIdentifierWithValue(e.getKey(), e.getValue());
+        }));
+
+        var optionNamesStream = optionNames(values.keySet().stream());
+        optionNames = optionNamesFilter.map(optionNamesStream::filter).orElse(optionNamesStream)
+                .collect(toUnmodifiableSet());
+    }
+
+    private DefaultOptions(Snapshot snapshot) {
+        map = snapshot.map();
+        optionNames = snapshot.optionNames();
+    }
+
+    static DefaultOptions create(Snapshot snapshot) {
+        var options = new DefaultOptions(snapshot);
+
+        var mapOptionNames = optionNames(
+                options.map.values().stream().map(OptionIdentifierWithValue::withId)
+        ).collect(toUnmodifiableSet());
+
+        for (var e : options.map.entrySet()) {
+            if (e.getKey() != e.getValue().withId().id()) {
+                throw new IllegalArgumentException("Corrupted options map");
+            }
+        }
+
+        if (!mapOptionNames.containsAll(snapshot.optionNames())) {
+            throw new IllegalArgumentException("Unexpected option names");
+        }
+        return options;
+    }
+
+    @Override
+    public Optional<Object> find(OptionIdentifier id) {
+        return Optional.ofNullable(map.get(Objects.requireNonNull(id))).map(OptionIdentifierWithValue::value);
+    }
+
+    @Override
+    public boolean contains(OptionName optionName) {
+        return optionNames.contains(Objects.requireNonNull(optionName));
+    }
+
+    @Override
+    public Set<? extends OptionIdentifier> ids() {
+        return Collections.unmodifiableSet(map.keySet());
+    }
+
+    @Override
+    public DefaultOptions copyWithout(Iterable<? extends OptionIdentifier> ids) {
+        return copy(StreamSupport.stream(ids.spliterator(), false), false);
+    }
+
+    @Override
+    public DefaultOptions copyWith(Iterable<? extends OptionIdentifier> ids) {
+        return copy(StreamSupport.stream(ids.spliterator(), false), true);
+    }
+
+    DefaultOptions add(DefaultOptions other) {
+        return new DefaultOptions(new Snapshot(Stream.of(this, other).flatMap(v -> {
+            return v.map.values().stream();
+        }).collect(toUnmodifiableMap(OptionIdentifierWithValue::id, x -> x, (first, _) -> {
+            return first;
+        })), Stream.of(this, other)
+                .map(DefaultOptions::optionNames)
+                .flatMap(Collection::stream)
+                .collect(toUnmodifiableSet())));
+    }
+
+    Set<OptionName> optionNames() {
+        return optionNames;
+    }
+
+    Set<WithOptionIdentifier> withOptionIdentifierSet() {
+        return map.values().stream()
+                .map(OptionIdentifierWithValue::withId)
+                .collect(toUnmodifiableSet());
+    }
+
+    record Snapshot(Map<OptionIdentifier, OptionIdentifierWithValue> map, Set<OptionName> optionNames) {
+        Snapshot {
+            Objects.requireNonNull(map);
+            Objects.requireNonNull(optionNames);
+        }
+    }
+
+    record OptionIdentifierWithValue(WithOptionIdentifier withId, Object value) {
+        OptionIdentifierWithValue {
+            Objects.requireNonNull(withId);
+            Objects.requireNonNull(value);
+        }
+
+        OptionIdentifier id() {
+            return withId.id();
+        }
+
+        OptionIdentifierWithValue copyWithValue(Object value) {
+            return new OptionIdentifierWithValue(withId, value);
+        }
+    }
+
+    private DefaultOptions copy(Stream<? extends OptionIdentifier> ids, boolean includes) {
+        var includeIds = ids.collect(toUnmodifiableSet());
+        return new DefaultOptions(map.values().stream().filter(v -> {
+            return includeIds.contains(v.id()) == includes;
+        }).collect(toUnmodifiableMap(OptionIdentifierWithValue::withId, OptionIdentifierWithValue::value)));
+    }
+
+    private static Stream<OptionName> optionNames(Stream<? extends WithOptionIdentifier> options) {
+        return options.map(v -> {
+            Optional<? extends OptionSpec<?>> spec;
+            switch (v) {
+                case Option option -> {
+                    spec = Optional.of(option.spec());
+                }
+                case OptionValue<?> optionValue -> {
+                    spec = optionValue.asOption().map(Option::spec);
+                }
+                default -> {
+                    spec = Optional.empty();
+                }
+            }
+            return spec;
+        }).filter(Optional::isPresent).map(Optional::get).map(OptionSpec::names).flatMap(Collection::stream);
+    }
+
+    static final DefaultOptions EMPTY = new DefaultOptions(Map.of());
+
+    private final Map<OptionIdentifier, OptionIdentifierWithValue> map;
+    private final Set<OptionName> optionNames;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/HelpFormatter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/HelpFormatter.java
new file mode 100644
index 00000000000..1d8a5eefc79
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/HelpFormatter.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+
+/**
+ * Generic help formatter.
+ */
+final class HelpFormatter {
+
+    private HelpFormatter(List<OptionGroup> optionGroups, OptionGroupFormatter formatter) {
+        this.optionGroups = Objects.requireNonNull(optionGroups);
+        this.formatter = Objects.requireNonNull(formatter);
+    }
+
+    void format(Consumer<CharSequence> sink) {
+        for (var group : optionGroups) {
+            formatter.format(group, sink);
+        }
+    }
+
+    static Builder build() {
+        return new Builder();
+    }
+
+
+    static final class Builder {
+
+        private Builder() {
+        }
+
+        HelpFormatter create() {
+            return new HelpFormatter(groups, validatedGroupFormatter());
+        }
+
+        Builder groups(Collection<OptionGroup> v) {
+            groups.addAll(v);
+            return this;
+        }
+
+        Builder groups(OptionGroup... v) {
+            return groups(List.of(v));
+        }
+
+        Builder groupFormatter(OptionGroupFormatter v) {
+            groupFormatter = v;
+            return this;
+        }
+
+        private OptionGroupFormatter validatedGroupFormatter() {
+            return Optional.ofNullable(groupFormatter).orElseGet(Builder::createConsoleFormatter);
+        }
+
+        private static OptionGroupFormatter createConsoleFormatter() {
+            return new ConsoleOptionGroupFormatter(new ConsoleOptionFormatter(2, 10));
+        }
+
+        private final List<OptionGroup> groups = new ArrayList<>();
+        private OptionGroupFormatter groupFormatter;
+    }
+
+
+    interface OptionFormatter {
+
+        public default void format(OptionSpec<?> optionSpec, Consumer<CharSequence> sink) {
+            format(optionSpec.names().stream().map(OptionName::formatForCommandLine).collect(Collectors.joining(" ")),
+                    optionSpec.valuePattern(),
+                    optionSpec.description(), sink);
+        }
+
+        void format(String optionNames, Optional<String> valuePattern, String description, Consumer<CharSequence> sink);
+    }
+
+    interface OptionGroupFormatter {
+
+        default void format(OptionGroup group, Consumer<CharSequence> sink) {
+            formatHeader(group.name(), sink);
+            formatBody(group.options(), sink);
+        }
+
+        void formatHeader(String gropName, Consumer<CharSequence> sink);
+
+        void formatBody(Iterable<? extends OptionSpec<?>> optionSpecs, Consumer<CharSequence> sink);
+    }
+
+
+    record ConsoleOptionFormatter(int nameOffset, int descriptionOffset) implements OptionFormatter {
+
+        @Override
+        public void format(String optionNames, Optional<String> valuePattern, String description, Consumer<CharSequence> sink) {
+            sink.accept(" ".repeat(nameOffset));
+            sink.accept(optionNames);
+            valuePattern.map(v -> " " + v).ifPresent(sink);
+            eol(sink);
+            final var descriptionOffsetStr = " ".repeat(descriptionOffset);
+            Stream.of(description.split("\\R")).map(line -> {
+                return descriptionOffsetStr + line;
+            }).forEach(line -> {
+                sink.accept(line);
+                eol(sink);
+            });
+        }
+    }
+
+
+    record ConsoleOptionGroupFormatter(OptionFormatter optionFormatter) implements OptionGroupFormatter {
+
+        ConsoleOptionGroupFormatter {
+            Objects.requireNonNull(optionFormatter);
+        }
+
+        @Override
+        public void formatHeader(String groupName, Consumer<CharSequence> sink) {
+            Objects.requireNonNull(groupName);
+            eol(sink);
+            sink.accept(groupName + ":");
+            eol(sink);
+        }
+
+        @Override
+        public void formatBody(Iterable<? extends OptionSpec<?>> optionSpecs, Consumer<CharSequence> sink) {
+            optionSpecs.forEach(optionSpec -> {
+                optionFormatter.format(optionSpec, sink);
+            });
+        }
+    }
+
+
+    record OptionGroup(String name, List<? extends OptionSpec<?>> options) {
+
+        OptionGroup {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(options);
+        }
+    }
+
+
+    static Consumer<CharSequence> eol(Consumer<CharSequence> sink) {
+        sink.accept(System.lineSeparator());
+        return sink;
+    }
+
+
+    private final List<OptionGroup> optionGroups;
+    private final OptionGroupFormatter formatter;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/I18N.java
similarity index 56%
rename from src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/I18N.java
index 5c912728c32..63c2b88039f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/I18N.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,31 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package jdk.jpackage.internal.cli;
 
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-
+import java.util.List;
 import java.util.Map;
-import jdk.jpackage.internal.model.ConfigException;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.util.MultiResourceBundle;
+import jdk.jpackage.internal.util.StringBundle;
 
-public abstract class MacBaseInstallerBundler extends AbstractBundler {
+final class I18N {
 
-    public MacBaseInstallerBundler() {
-        appImageBundler = new MacAppBundler();
+    private I18N() {
     }
 
-    protected void validateAppImageAndBundeler(
-            Map<String, ? super Object> params) throws ConfigException {
-        if (PREDEFINED_APP_IMAGE.fetchFrom(params) == null) {
-            appImageBundler.validate(params);
-        }
+    static String format(String key, Object ... args) {
+        return BUNDLE.format(key, args);
     }
 
-    @Override
-    public String getBundleType() {
-        return "INSTALLER";
-    }
+    private static final StringBundle BUNDLE;
 
-    private final Bundler appImageBundler;
+    static {
+        var prefix = "jdk.jpackage.internal.resources.";
+        BUNDLE = StringBundle.fromResourceBundle(MultiResourceBundle.create(
+                prefix + "MainResources",
+                Map.of(
+                        OperatingSystem.LINUX, List.of(prefix + "LinuxResources"),
+                        OperatingSystem.MACOS, List.of(prefix + "MacResources"),
+                        OperatingSystem.WINDOWS, List.of(prefix + "WinResources")
+                )
+        ));
+    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
new file mode 100644
index 00000000000..57b92471e4a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
@@ -0,0 +1,817 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toUnmodifiableMap;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import jdk.internal.joptsimple.ArgumentAcceptingOptionSpec;
+import jdk.internal.joptsimple.OptionParser;
+import jdk.internal.joptsimple.OptionSet;
+import jdk.jpackage.internal.cli.DefaultOptions.OptionIdentifierWithValue;
+import jdk.jpackage.internal.cli.DefaultOptions.Snapshot;
+import jdk.jpackage.internal.cli.OptionSpec.MergePolicy;
+import jdk.jpackage.internal.util.Result;
+
+
+/**
+ * Builds an instance of {@link Options} interface backed with joptsimple command
+ * line parser.
+ *
+ * Two types of command line argument processing are supported:
+ * <ol>
+ * <li>Parse command line. Parsed data is stored as a map of strings.
+ * <li>Convert strings to objects. Parsed data is stored as a map of objects.
+ * </ol>
+ */
+final class JOptSimpleOptionsBuilder {
+
+    Function<String[], Result<OptionsBuilder>> create() {
+        return createJOptSimpleParser()::parse;
+    }
+
+    JOptSimpleOptionsBuilder options(Collection<? extends WithOptionIdentifier> v) {
+        v.stream().map(u -> {
+            switch (u) {
+                case Option o -> {
+                    return o;
+                }
+                case OptionValue<?> ov -> {
+                    return ov.getOption();
+                }
+                default -> {
+                    throw new IllegalArgumentException();
+                }
+            }
+        }).forEach(options::add);
+        return this;
+    }
+
+    JOptSimpleOptionsBuilder options(WithOptionIdentifier... v) {
+        return options(List.of(v));
+    }
+
+    JOptSimpleOptionsBuilder optionSpecMapper(UnaryOperator<OptionSpec<?>> v) {
+        optionSpecMapper = v;
+        return this;
+    }
+
+    JOptSimpleOptionsBuilder jOptSimpleParserErrorHandler(Function<JOptSimpleError, ? extends Exception> v) {
+        jOptSimpleParserErrorHandler = v;
+        return this;
+    }
+
+    private JOptSimpleParser createJOptSimpleParser() {
+        return JOptSimpleParser.create(options, Optional.ofNullable(optionSpecMapper),
+                Optional.ofNullable(jOptSimpleParserErrorHandler));
+    }
+
+
+    static final class ConvertedOptionsBuilder {
+
+        private ConvertedOptionsBuilder(TypedOptions options) {
+            impl = Objects.requireNonNull(options);
+        }
+
+        Options create() {
+            return impl;
+        }
+
+        ConvertedOptionsBuilder copyWithExcludes(Collection<? extends OptionIdentifier> v) {
+            return new ConvertedOptionsBuilder(impl.copyWithout(v));
+        }
+
+        List<String> nonOptionArguments() {
+            return impl.nonOptionArguments();
+        }
+
+        List<OptionName> detectedOptions() {
+            return impl.detectedOptions();
+        }
+
+        private final TypedOptions impl;
+    }
+
+
+    static final class OptionsBuilder {
+
+        private OptionsBuilder(UntypedOptions options) {
+            impl = Objects.requireNonNull(options);
+        }
+
+        Result<ConvertedOptionsBuilder> convertedOptions() {
+            return impl.toTypedOptions().map(ConvertedOptionsBuilder::new);
+        }
+
+        Options create() {
+            return impl;
+        }
+
+        OptionsBuilder copyWithExcludes(Collection<? extends OptionIdentifier> v) {
+            return new OptionsBuilder(impl.copyWithout(v));
+        }
+
+        List<String> nonOptionArguments() {
+            return impl.nonOptionArguments();
+        }
+
+        List<OptionName> detectedOptions() {
+            return impl.detectedOptions();
+        }
+
+        private final UntypedOptions impl;
+    }
+
+
+    enum JOptSimpleErrorType {
+
+        // jdk.internal.joptsimple.UnrecognizedOptionException
+        UNRECOGNIZED_OPTION(() -> {
+            new OptionParser(false).parse("--foo");
+        }),
+
+        // jdk.internal.joptsimple.OptionMissingRequiredArgumentException
+        OPTION_MISSING_REQUIRED_ARGUMENT(() -> {
+            var parser = new OptionParser(false);
+            parser.accepts("foo").withRequiredArg();
+            parser.parse("--foo");
+        }),
+        ;
+
+        JOptSimpleErrorType(Runnable initializer) {
+            try {
+                initializer.run();
+                // Should never get to this point as the above line is expected to throw
+                // an exception of type `jdk.internal.joptsimple.OptionException`.
+                throw new AssertionError();
+            } catch (jdk.internal.joptsimple.OptionException ex) {
+                type = ex.getClass();
+            }
+        }
+
+        private final Class<? extends jdk.internal.joptsimple.OptionException> type;
+    }
+
+
+    record JOptSimpleError(JOptSimpleErrorType type, OptionName optionName) {
+
+        JOptSimpleError {
+            Objects.requireNonNull(type);
+            Objects.requireNonNull(optionName);
+        }
+
+        static JOptSimpleError create(jdk.internal.joptsimple.OptionException ex) {
+            var optionName = OptionName.of(ex.options().getFirst());
+            return Stream.of(JOptSimpleErrorType.values()).filter(v -> {
+                return v.type.isInstance(ex);
+            }).findFirst().map(v -> {
+                return new JOptSimpleError(v, optionName);
+            }).orElseThrow();
+        }
+    }
+
+
+    private record JOptSimpleParser(
+            OptionParser parser,
+            Map<OptionIdentifier, ? extends OptionSpec<?>> optionMap,
+            Optional<Function<JOptSimpleError, ? extends Exception>> jOptSimpleParserErrorHandler) {
+
+        private JOptSimpleParser {
+            Objects.requireNonNull(parser);
+            Objects.requireNonNull(optionMap);
+            Objects.requireNonNull(jOptSimpleParserErrorHandler);
+        }
+
+        Result<OptionsBuilder> parse(String... args) {
+            return applyParser(parser, args).map(optionSet -> {
+                final OptionSet mergerOptionSet;
+                if (optionMap.values().stream().allMatch(spec -> spec.names().size() == 1)) {
+                    // No specs with multiple names, merger not needed.
+                    mergerOptionSet = optionSet;
+                } else {
+                    final var parser2 = createOptionParser();
+                    final var optionSpecApplier = new OptionSpecApplier();
+                    for (final var spec : optionMap.values()) {
+                        optionSpecApplier.applyToParser(parser2, spec);
+                    }
+
+                    mergerOptionSet = parser2.parse(args);
+                }
+                return new OptionsBuilder(new UntypedOptions(optionSet, mergerOptionSet, optionMap));
+            });
+        }
+
+        static JOptSimpleParser create(Iterable<Option> options,
+                Optional<UnaryOperator<OptionSpec<?>>> optionSpecMapper,
+                Optional<Function<JOptSimpleError, ? extends Exception>> jOptSimpleParserErrorHandler) {
+            final var parser = createOptionParser();
+
+            // Create joptsimple option specs for distinct option names,
+            // i.e., individual joptsimple option spec for every name of jpackage option spec.
+            // This is needed to accurately detect what option names were passed.
+            final var optionSpecApplier = new OptionSpecApplier().generateForEveryName(true);
+
+            final var optionStream = StreamSupport.stream(options.spliterator(), false);
+
+            final var optionMap = optionSpecMapper.map(mapper -> {
+                return optionStream.map(option -> {
+                    return option.copyWithSpec(mapper.apply(option.spec()));
+                });
+            }).orElse(optionStream).peek(option -> {
+                optionSpecApplier.applyToParser(parser, option.spec());
+            }).collect(toUnmodifiableMap(Option::id, Option::spec));
+
+            return new JOptSimpleParser(parser, optionMap, jOptSimpleParserErrorHandler);
+        }
+
+        private Result<OptionSet> applyParser(OptionParser parser, String[] args) {
+            try {
+                return Result.ofValue(parser.parse(args));
+            } catch (jdk.internal.joptsimple.OptionException ex) {
+                return Result.ofError(jOptSimpleParserErrorHandler.map(handler -> {
+                    var err = handler.apply(JOptSimpleError.create(ex));
+                    return Objects.requireNonNull(err);
+                }).orElse(ex));
+            }
+        }
+
+        private static OptionParser createOptionParser() {
+            // No abbreviations!
+            // Otherwise for the configured option "foo" it will recognize "f" as its abbreviation.
+            return new OptionParser(false);
+        }
+    }
+
+
+    private static final class OptionSpecApplier {
+
+        <T> void applyToParser(OptionParser parser, OptionSpec<T> spec) {
+            final Stream<OptionSpec<T>> optionSpecs;
+            if (generateForEveryName) {
+                optionSpecs = spec.copyForEveryName();
+            } else {
+                optionSpecs = Stream.of(spec);
+            }
+
+            optionSpecs.forEach(v -> {
+                final var specBuilder = parser.acceptsAll(v.names().stream().map(OptionName::name).toList());
+                if (v.hasValue()) {
+                    if (v.isValueOptional()) {
+                        specBuilder.withOptionalArg();
+                    } else {
+                        specBuilder.withRequiredArg();
+                    }
+                }
+            });
+        }
+
+        OptionSpecApplier generateForEveryName(boolean v) {
+            generateForEveryName = v;
+            return this;
+        }
+
+        private boolean generateForEveryName;
+    }
+
+
+    sealed interface ExtendedOptions<T extends ExtendedOptions<T>> extends Options {
+
+        /**
+         * Gets the list of command line tokens not linked to any option in the order
+         * they appear on the command line.
+         *
+         * @return Gets the list of command line tokens not linked to any option in the
+         *         order they appear on the command line
+         */
+        List<String> nonOptionArguments();
+
+        /**
+         * Gets the list of names of detected options in the order they appear on the
+         * command line. A name will appear in the list as many times as the
+         * corresponding option on the command line.
+         *
+         * @return the list of names of detected options in the order they appear on the
+         *         command line
+         */
+        List<OptionName> detectedOptions();
+
+        DefaultOptions toDefaultOptions();
+    }
+
+
+    private static final class UntypedOptions implements ExtendedOptions<UntypedOptions> {
+
+        UntypedOptions(OptionSet optionSet, OptionSet mergerOptionSet, Map<OptionIdentifier, ? extends OptionSpec<?>> optionMap) {
+            this.optionSet = Objects.requireNonNull(optionSet);
+            this.mergerOptionSet = Objects.requireNonNull(mergerOptionSet);
+            optionNames = optionMap.values().stream()
+                    .map(OptionSpec::names)
+                    .flatMap(Collection::stream)
+                    .filter(optionName -> {
+                        return optionSet.has(optionName.name());
+                    }).collect(toUnmodifiableSet());
+            this.optionMap = optionMap.entrySet().stream().filter(e -> {
+                return !Collections.disjoint(optionNames, e.getValue().names());
+            }).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+        }
+
+        private UntypedOptions(UntypedOptions other, Collection<? extends OptionIdentifier> excludes) {
+            this(other.optionSet, other.mergerOptionSet, other.optionMap.entrySet().stream().filter(e -> {
+                return !excludes.contains(e.getKey());
+            }).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue)));
+        }
+
+        @Override
+        public UntypedOptions copyWithout(Iterable<? extends OptionIdentifier> ids) {
+            return new UntypedOptions(this, StreamSupport.stream(ids.spliterator(), false).toList());
+        }
+
+        @Override
+        public Set<? extends OptionIdentifier> ids() {
+            return optionMap.keySet();
+        }
+
+        @Override
+        public List<String> nonOptionArguments() {
+            return optionSet.nonOptionArguments().stream().map(String.class::cast).toList();
+        }
+
+        @Override
+        public List<OptionName> detectedOptions() {
+            return optionSet.specs().stream().flatMap(joptSpec -> {
+                return joptSpec.options().stream().map(OptionName::new);
+            }).filter(optionNames::contains).toList();
+        }
+
+        @Override
+        public DefaultOptions toDefaultOptions() {
+            return new DefaultOptions(optionMap.entrySet().stream().collect(toUnmodifiableMap(e -> {
+                return new Option(e.getKey(), e.getValue());
+            }, e -> {
+                return find(e.getKey()).orElseThrow();
+            })), optionNames::contains);
+        }
+
+        Result<TypedOptions> toTypedOptions() {
+
+            final List<Exception> errors = new ArrayList<>();
+
+            final var optionNameToOption = optionMap.entrySet().stream().map(e -> {
+                return e.getValue().names().stream().map(optionName -> {
+                    return Map.entry(optionName, new Option(e.getKey(), e.getValue()));
+                });
+            }).flatMap(x -> x).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+
+            var entries = OptionSpecWithValue.create(optionSet, mergerOptionSet, optionMap).stream().map(oswv -> {
+                var option = optionNameToOption.get(oswv.optionName());
+                if (!oswv.optionSpec().hasValue()) {
+                    return new OptionIdentifierWithValue(option, Boolean.TRUE);
+                } else {
+                    return oswv.convertValue().map(v -> {
+                        if (oswv.optionSpec().arrayValueConverter().isEmpty()) {
+                            return new OptionIdentifierWithValue(option, v);
+                        } else {
+                            return new OptionIdentifierWithValue(option, new ArrayList<>(List.of(v)));
+                        }
+                    }).peekErrors(errors::addAll).value().orElse(null);
+                }
+            }).filter(Objects::nonNull).toList();
+
+            if (!errors.isEmpty()) {
+                return Result.ofErrors(errors);
+            } else {
+                final Map<OptionIdentifier, OptionIdentifierWithValue> map = new HashMap<>();
+
+                for (var e : entries) {
+                    var option = (Option)e.withId();
+                    map.merge(option.id(), e, (a, b) -> {
+                        if (option.spec().arrayValueConverter().isEmpty()) {
+                            throw new AssertionError();
+                        } else {
+                            @SuppressWarnings("unchecked")
+                            var ar = ((List<Object>)a.value());
+
+                            @SuppressWarnings("unchecked")
+                            var br = ((List<Object>)b.value());
+
+                            ar.addAll(br);
+                            return e.copyWithValue(ar);
+                        }
+                    });
+                }
+
+                for (var value : map.values()) {
+                    var option = (Option)value.withId();
+                    if (option.spec().arrayValueConverter().isPresent()) {
+                        var arr = mergeArrayValues(option.spec().mergePolicy(), (List<?>)value.value());
+                        map.put(value.id(), value.copyWithValue(arr));
+                    }
+                }
+
+                return Result.ofValue(new TypedOptions(
+                        DefaultOptions.create(new Snapshot(map, optionNames)),
+                        detectedOptions(),
+                        nonOptionArguments()));
+            }
+        }
+
+        @Override
+        public Optional<Object> find(OptionIdentifier id) {
+            Objects.requireNonNull(id);
+            return Optional.ofNullable(optionMap.get(id)).map(spec -> {
+                var values = getValues(spec);
+                if (spec.hasValue()) {
+                    return values.toArray(String[]::new);
+                } else {
+                    return new String[0];
+                }
+            });
+        }
+
+        @Override
+        public boolean contains(OptionName optionName) {
+            return optionNames.contains(optionName);
+        }
+
+        private List<String> getValues(OptionSpec<?> spec) {
+            Objects.requireNonNull(spec);
+
+            final var values = optionValues(mergerOptionSet, spec.name());
+
+            if (!values.isEmpty()) {
+                return getOptionValue(values, spec.mergePolicy());
+            } else if (spec.names().stream().anyMatch(this::contains)) {
+                // The spec belongs to an option detected on the command line.
+                if (!spec.hasValue()) {
+                    // The spec belongs to an option without a value.
+                    return List.of();
+                } else if (spec.isValueOptional()) {
+                    // The spec belongs to an option with an optional value.
+                    return List.of(spec.name().formatForCommandLine());
+                }
+            }
+
+            throw new AssertionError();
+        }
+
+        private static Object mergeArrayValues(OptionSpec.MergePolicy mergePolicy, List<?> value) {
+            switch (mergePolicy) {
+                case USE_FIRST -> {
+                    // Find the first non-empty array, get its first element and wrap it into one-element array.
+                    return value.stream().filter(arr -> {
+                        return Array.getLength(arr) > 0;
+                    }).findFirst().map(arr -> {
+                        return asArray(Array.get(arr, 0));
+                    }).orElseGet(value::getFirst);
+                }
+                case USE_LAST -> {
+                    // Find the last non-empty array, get its last element and wrap it into one-element array.
+                    return value.reversed().stream().filter(arr -> {
+                        return Array.getLength(arr) > 0;
+                    }).findFirst().map(arr -> {
+                        return asArray(Array.get(arr, Array.getLength(arr) - 1));
+                    }).orElseGet(value::getFirst);
+                }
+                case CONCATENATE -> {
+                    return value.stream().filter(arr -> {
+                        return Array.getLength(arr) > 0;
+                    }).map(Object.class::cast).reduce((a, b) -> {
+                        final var al = Array.getLength(a);
+                        final var bl = Array.getLength(b);
+                        final var arr = Array.newInstance(a.getClass().componentType(), al + bl);
+                        System.arraycopy(a, 0, arr, 0, al);
+                        System.arraycopy(b, 0, arr, al, bl);
+                        return arr;
+                    }).orElseGet(value::getFirst);
+                }
+                default -> {
+                    throw new AssertionError();
+                }
+            }
+        }
+
+        private static Object asArray(Object v) {
+            final var arr = Array.newInstance(v.getClass(), 1);
+            Array.set(arr, 0, v);
+            return arr;
+        }
+
+        @SuppressWarnings("unchecked")
+        private static List<String> optionValues(OptionSet optionSet, OptionName optionName) {
+            return (List<String>)optionSet.valuesOf(optionName.name());
+        }
+
+
+        private record OptionSpecWithValue<T>(OptionSpec<T> optionSpec, Optional<String> optionValue) {
+
+            OptionSpecWithValue {
+                Objects.requireNonNull(optionSpec);
+                Objects.requireNonNull(optionValue);
+
+                if (optionSpec.names().size() != 1) {
+                    throw new IllegalArgumentException();
+                }
+
+                if (optionValue.isEmpty() && optionSpec.hasValue() && !optionSpec.isValueOptional()) {
+                    throw new IllegalArgumentException();
+                }
+            }
+
+            OptionName optionName() {
+                return optionSpec.name();
+            }
+
+            Result<T> convertValue() {
+                final var converter = optionSpec.converter().orElseThrow();
+
+                final Result<T> conversionResult = optionValue.map(v -> {
+                    return converter.convert(optionName(), StringToken.of(v));
+                }).orElseGet(() -> {
+                    return Result.ofValue(optionSpec.defaultOptionalValue().orElseThrow());
+                });
+
+                if (conversionResult.hasErrors()) {
+                    final var arrConverter = optionSpec.arrayValueConverter().orElse(null);
+
+                    if (arrConverter != null && optionSpec.mergePolicy() != MergePolicy.CONCATENATE) {
+                        // Maybe recoverable array conversion error
+                        final var tokens = arrConverter.tokenize(optionValue.orElseThrow());
+                        final String str = getOptionValue(List.of(tokens), optionSpec.mergePolicy()).getFirst();
+                        final String[] token = arrConverter.tokenize(str);
+                        if (token.length == 1 && str.equals(token[0])) {
+                            final var singleTokenConversionResult = converter.convert(optionName(), StringToken.of(str));
+                            if (singleTokenConversionResult.hasValue()) {
+                                return singleTokenConversionResult;
+                            }
+                        }
+                    }
+                }
+
+                return conversionResult;
+            }
+
+            static List<? extends OptionSpecWithValue<?>> create(OptionSet optionSet,
+                    OptionSet mergerOptionSet, Map<OptionIdentifier, ? extends OptionSpec<?>> optionMap) {
+
+                Objects.requireNonNull(optionSet);
+                Objects.requireNonNull(mergerOptionSet);
+                Objects.requireNonNull(optionMap);
+
+                final var optionsWithOptionalValues = optionsWithOptionalValues(mergerOptionSet);
+
+                final var nameToOptionValues = optionMap.values().stream().map(optionSpec -> {
+                    return optionSpec.names().stream();
+                }).flatMap(x -> x).collect(toUnmodifiableMap(OptionName::name, optionName -> {
+                    if (optionSet.has(optionName.name())) {
+                        return Optional.ofNullable(optionsWithOptionalValues.get(optionName)).orElseGet(() -> {
+                            return optionValues(optionSet, optionName).iterator();
+                        });
+                    } else {
+                        return List.<String>of().iterator();
+                    }
+                }));
+
+                final var nameToOptionSpec = optionMap.values().stream().map(spec -> {
+                    return spec.names().stream().map(name -> {
+                        return Map.entry(name.name(), spec.copyWithName(name));
+                    });
+                }).flatMap(x -> x).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+
+                final var nameGroups = optionMap.values().stream().map(optionSpec -> {
+                    return optionSpec.names().stream().map(optionName -> {
+                        return Map.entry(optionName, optionSpec.names());
+                    });
+                }).flatMap(x -> x).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+
+                // Iterate option values in the order they appear on the command line.
+                // OptionSet.specs() guarantees such order of option values.
+                try {
+                    return filterUnusedValues(nameGroups, optionSet.specs().stream().map(joptSpec -> {
+                        var optionNames = joptSpec.options();
+                        if (optionNames.size() != 1) {
+                            throw new AssertionError();
+                        }
+                        return optionNames.getFirst();
+                    }).filter(nameToOptionSpec::containsKey).map(name -> {
+                        var optionSpec = nameToOptionSpec.get(name);
+                        String optionValue;
+                        if (!optionSpec.hasValue()) {
+                            optionValue = null;
+                        } else {
+                            var it = nameToOptionValues.get(name);
+                            if (it.hasNext()) {
+                                optionValue = it.next();
+                            } else if (optionSpec.isValueOptional()) {
+                                return null;
+                            } else {
+                                throw new AssertionError();
+                            }
+                        }
+                        OptionSpecWithValue<?> oswv = new OptionSpecWithValue<>(optionSpec, Optional.ofNullable(optionValue));
+                        return oswv;
+                    }).filter(Objects::nonNull).toList());
+                } finally {
+                    if (nameToOptionValues.values().stream().anyMatch(Iterator::hasNext)) {
+                        throw new AssertionError("Unfetched option values detected");
+                    }
+                }
+            }
+
+            private static Map<OptionName, Iterator<String>> optionsWithOptionalValues(OptionSet optionSet) {
+                Objects.requireNonNull(optionSet);
+                return optionSet.specs().stream().distinct().filter(joptSpec -> {
+                    if (joptSpec instanceof ArgumentAcceptingOptionSpec<?> v) {
+                        return !v.requiresArgument();
+                    } else {
+                        return false;
+                    }
+                }).map(joptSpec -> {
+                    @SuppressWarnings("unchecked")
+                    List<String> optionValues = ((List<String>)optionSet.valuesOf(joptSpec));
+                    if (optionValues.isEmpty()) {
+                        // `joptSpec` is detected on the command line without a value.
+                        optionValues = Arrays.asList((String)null);
+                    }
+                    final var it = optionValues.iterator();
+                    return joptSpec.options().stream().map(OptionName::of).map(optionName -> {
+                        return Map.entry(optionName, it);
+                    });
+                }).flatMap(x -> x).collect(toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+            }
+
+            private static List<? extends OptionSpecWithValue<?>> filterUnusedValues(
+                    Map<OptionName, List<OptionName>> nameGroups, List<? extends OptionSpecWithValue<?>> items) {
+
+                items = filterFirstValues(nameGroups, items.reversed(), OptionSpec.MergePolicy.USE_LAST);
+                items = filterFirstValues(nameGroups, items.reversed(), OptionSpec.MergePolicy.USE_FIRST);
+
+                return items;
+            }
+
+            private static List<? extends OptionSpecWithValue<?>> filterFirstValues(
+                    Map<OptionName, List<OptionName>> nameGroups,
+                    List<? extends OptionSpecWithValue<?>> items,
+                    OptionSpec.MergePolicy mergePolicy) {
+
+                Objects.requireNonNull(nameGroups);
+                Objects.requireNonNull(items);
+                Objects.requireNonNull(mergePolicy);
+
+                Set<OptionName> encounteredNames = new HashSet<>();
+
+                return items.stream().filter(item -> {
+                    if (item.optionSpec().mergePolicy() != mergePolicy) {
+                        return true;
+                    } else if (!encounteredNames.contains(item.optionSpec().name())) {
+                        encounteredNames.addAll(Objects.requireNonNull(nameGroups.get(item.optionSpec().name())));
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }).toList();
+            }
+        }
+
+        private final OptionSet optionSet;
+        private final OptionSet mergerOptionSet;
+        private final Map<OptionIdentifier, ? extends OptionSpec<?>> optionMap;
+        private final Set<OptionName> optionNames;
+    }
+
+
+    private static final class TypedOptions implements ExtendedOptions<TypedOptions> {
+
+        TypedOptions(
+                DefaultOptions options,
+                List<OptionName> detectedOptions,
+                List<String> nonOptionArguments) {
+
+            this.options = Objects.requireNonNull(options);
+            this.nonOptionArguments = Objects.requireNonNull(nonOptionArguments);
+            this.detectedOptions = Objects.requireNonNull(detectedOptions);
+            assertNoUnexpectedOptionNames(options.withOptionIdentifierSet(), detectedOptions);
+        }
+
+        @Override
+        public TypedOptions copyWithout(Iterable<? extends OptionIdentifier> ids) {
+            var newOptions = options.copyWithout(ids);
+            var newDetectedOptions = detectedOptions.stream().filter(newOptions::contains).toList();
+            return new TypedOptions(newOptions, newDetectedOptions, nonOptionArguments);
+        }
+
+        @Override
+        public List<String> nonOptionArguments() {
+            return nonOptionArguments;
+        }
+
+        @Override
+        public List<OptionName> detectedOptions() {
+            return detectedOptions;
+        }
+
+        @Override
+        public Set<? extends OptionIdentifier> ids() {
+            return options.ids();
+        }
+
+        @Override
+        public Optional<Object> find(OptionIdentifier id) {
+            return options.find(id);
+        }
+
+        @Override
+        public boolean contains(OptionName optionName) {
+            return options.contains(optionName);
+        }
+
+        @Override
+        public DefaultOptions toDefaultOptions() {
+            return options;
+        }
+
+        private final DefaultOptions options;
+        private final List<String> nonOptionArguments;
+        private final List<OptionName> detectedOptions;
+    }
+
+
+    private static void assertNoUnexpectedOptionNames(Set<? extends WithOptionIdentifier> options, Collection<OptionName> optionNames) {
+        final var allowedOptionNames = options.stream()
+                .map(Option.class::cast)
+                .map(Option::spec)
+                .map(OptionSpec::names)
+                .flatMap(Collection::stream)
+                .toList();
+        if (!allowedOptionNames.containsAll(optionNames)) {
+            final var diff = new HashSet<>(optionNames);
+            diff.removeAll(allowedOptionNames);
+            throw new AssertionError(String.format("Unexpected option names: %s", diff.stream().map(OptionName::name).sorted().toList()));
+        }
+    }
+
+    private static <T> List<T> getOptionValue(List<T> values, OptionSpec.MergePolicy mergePolicy) {
+        Objects.requireNonNull(mergePolicy);
+        if (values.size() == 1) {
+            return values;
+        } else {
+            switch (mergePolicy) {
+                case USE_LAST -> {
+                    return List.of(values.getLast());
+                }
+                case USE_FIRST -> {
+                    return List.of(values.getFirst());
+                }
+                case CONCATENATE -> {
+                    return values;
+                }
+                default -> {
+                    throw new AssertionError();
+                }
+            }
+        }
+    }
+
+    private Collection<Option> options = new ArrayList<>();
+    private UnaryOperator<OptionSpec<?>> optionSpecMapper;
+    private Function<JOptSimpleError, ? extends Exception> jOptSimpleParserErrorHandler;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
new file mode 100644
index 00000000000..f377b22374d
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.StandardOption.HELP;
+import static jdk.jpackage.internal.cli.StandardOption.VERBOSE;
+import static jdk.jpackage.internal.cli.StandardOption.VERSION;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UncheckedIOException;
+import java.nio.file.NoSuchFileException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.spi.ToolProvider;
+import jdk.internal.opt.CommandLine;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.Log;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+
+/**
+ * Main jpackage entry point.
+ */
+public final class Main {
+
+    public static final class Provider implements ToolProvider {
+
+        @Override
+        public String name() {
+            return "jpackage";
+        }
+
+        @Override
+        public int run(PrintWriter out, PrintWriter err, String... args) {
+            return Main.run(out, err, args);
+        }
+    }
+
+
+    private Main() {
+    }
+
+    public static void main(String... args) {
+        var out = new PrintWriter(System.out, true);
+        var err = new PrintWriter(System.err, true);
+        System.exit(run(out, err, args));
+    }
+
+    public static int run(PrintWriter out, PrintWriter err, String... args) {
+        Objects.requireNonNull(out);
+        Objects.requireNonNull(err);
+
+        Log.setPrintWriter(out, err);
+
+        try {
+            try {
+                args = CommandLine.parse(args);
+            } catch (FileNotFoundException|NoSuchFileException ex) {
+                Log.fatalError(I18N.format("ERR_CannotParseOptions", ex.getMessage()));
+                return 1;
+            } catch (IOException ex) {
+                throw ExceptionBox.rethrowUnchecked(ex);
+            }
+
+            final var bundlingEnv = ServiceLoader.load(CliBundlingEnvironment.class,
+                    CliBundlingEnvironment.class.getClassLoader()).findFirst().orElseThrow();
+
+            final var parseResult = Utils.buildParser(OperatingSystem.current(), bundlingEnv).create().apply(args);
+
+            return new Runner().run(() -> {
+                final var parsedOptionsBuilder = parseResult.orElseThrow();
+
+                final var options = parsedOptionsBuilder.create();
+
+                final var nonOptionArgumentsError = !parsedOptionsBuilder.nonOptionArguments().isEmpty();
+
+                if (options.ids().isEmpty() && !nonOptionArgumentsError) {
+                    StandardHelpFormatter.INSTANCE.formatNoArgsHelp(out::append);
+                    return List.of();
+                } else if (HELP.containsIn(options)) {
+                    if (VERSION.containsIn(options)) {
+                        out.println(getVersion() + "\n");
+                    }
+                    StandardHelpFormatter.INSTANCE.format(out::append);
+                    return List.of();
+                } else if (VERSION.containsIn(options) && !nonOptionArgumentsError) {
+                    out.println(getVersion());
+                    return List.of();
+                }
+
+                if (VERBOSE.containsIn(options)) {
+                    Log.setVerbose();
+                }
+
+                final var optionsProcessor = new OptionsProcessor(parsedOptionsBuilder, bundlingEnv);
+
+                final var validationResult = optionsProcessor.validate();
+
+                final var bundlingResult = validationResult.map(optionsProcessor::runBundling);
+
+                if (bundlingResult.hasValue()) {
+                    return bundlingResult.orElseThrow();
+                } else {
+                    return bundlingResult.errors();
+                }
+            });
+        } finally {
+            try {
+                out.flush();
+            } finally {
+                err.flush();
+            }
+        }
+    }
+
+
+    record ErrorReporter(Consumer<Throwable> stackTracePrinter, Consumer<String> messagePrinter) {
+        ErrorReporter {
+            Objects.requireNonNull(stackTracePrinter);
+            Objects.requireNonNull(messagePrinter);
+        }
+
+        void reportError(Throwable t) {
+            if (t instanceof ConfigException cfgEx) {
+                printError(cfgEx, Optional.ofNullable(cfgEx.getAdvice()));
+            } else if (t instanceof ExceptionBox ex) {
+                reportError(ex.getCause());
+            } else if (t instanceof UncheckedIOException ex) {
+                reportError(ex.getCause());
+            } else {
+                printError(t, Optional.empty());
+            }
+        }
+
+        private void printError(Throwable t, Optional<String> advice) {
+            stackTracePrinter.accept(t);
+
+            String msg;
+            if (isAlienExceptionType(t)) {
+                msg = t.toString();
+            } else {
+                msg = t.getMessage();
+            }
+
+            messagePrinter.accept(I18N.format("message.error-header", msg));
+            advice.ifPresent(v -> messagePrinter.accept(I18N.format("message.advice-header", v)));
+        }
+
+        private static boolean isAlienExceptionType(Throwable t) {
+            switch (t) {
+                case JPackageException _ -> {
+                    return false;
+                }
+                case Utils.ParseException _ -> {
+                    return false;
+                }
+                case StandardOption.AddLauncherIllegalArgumentException _ -> {
+                    return false;
+                }
+                default -> {
+                    return true;
+                }
+            }
+        }
+    }
+
+
+    static final class Runner {
+
+        int run(Supplier<? extends Collection<? extends Exception>> r) {
+            final var exceptions = runIt(r);
+            if (exceptions.isEmpty()) {
+                return 0;
+            } else {
+                var errorReporter = new ErrorReporter(Log::verbose, Log::fatalError);
+                exceptions.forEach(errorReporter::reportError);
+                return 1;
+            }
+        }
+
+        private static Collection<? extends Exception> runIt(Supplier<? extends Collection<? extends Exception>> r) {
+            try {
+                return r.get();
+            } catch (RuntimeException ex) {
+                return List.of(ex);
+            }
+        }
+    }
+
+    private static String getVersion() {
+        return System.getProperty("java.version");
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/MessageFormatUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/MessageFormatUtils.java
new file mode 100644
index 00000000000..f184ab51f1c
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/MessageFormatUtils.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+final class MessageFormatUtils {
+
+    private MessageFormatUtils() {
+    }
+
+    static String createMessage(Options cmdline, String formatId, Object... args) {
+        return I18N.format(formatId, mapFormatArguments(cmdline, args));
+    }
+
+    static String createMessage(String formatId, Object... args) {
+        return I18N.format(formatId, mapFormatArguments(args));
+    }
+
+    static Object[] mapFormatArguments(Object... args) {
+        return mapFormatArguments(optionSpec -> {
+            return optionSpec.name().formatForCommandLine();
+        }, args);
+    }
+
+    static Object[] mapFormatArguments(Options cmdline, Object... args) {
+        Objects.requireNonNull(cmdline);
+        return mapFormatArguments(optionSpec -> {
+            return optionSpec.getFirstNameIn(cmdline).formatForCommandLine();
+        }, args);
+    }
+
+    private static Object[] mapFormatArguments(Function<OptionSpec<?>, String> optionSpecFormatter, Object... args) {
+        Objects.requireNonNull(optionSpecFormatter);
+        return Stream.of(args).map(arg -> {
+            return asOptionSpec(arg).map(optionSpecFormatter).orElseGet(() -> {
+                return Optional.ofNullable(arg).map(Object::toString).orElse(null);
+            });
+        }).toArray();
+    }
+
+    private static Optional<OptionSpec<?>> asOptionSpec(Object v) {
+        if (v instanceof OptionSpec<?> optionSpec) {
+            return Optional.of(optionSpec);
+        } else if (v instanceof OptionValue<?> ov) {
+            return asOptionSpec(ov.getSpec());
+        } else if (v instanceof Option option) {
+            return asOptionSpec(option.spec());
+        } else {
+            return Optional.empty();
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Option.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Option.java
new file mode 100644
index 00000000000..7f67c2933fc
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Option.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+/**
+ * Option identifier associated with option specification.
+ */
+record Option(OptionIdentifier id, OptionSpec<?> spec) implements WithOptionIdentifier {
+
+    Option {
+        Objects.requireNonNull(id);
+        Objects.requireNonNull(spec);
+    }
+
+    Option(OptionSpec<?> spec) {
+        this(OptionIdentifier.createIdentifier(), spec);
+    }
+
+    Option copyWithSpec(OptionSpec<?> spec) {
+        return new Option(id, spec);
+    }
+
+    static Predicate<Option> fromOptionSpecPredicate(Predicate<OptionSpec<?>> p) {
+        return option -> {
+            return p.test(option.spec());
+        };
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
similarity index 68%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
index 9fbb7d682a7..401d5e15d28 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
@@ -22,26 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
-package jdk.jpackage.internal.model;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
+package jdk.jpackage.internal.cli;
 
 /**
- * Creates a bundle from the given specification.
+ * Defines creating an option value of type {@link T[]} from a string.
+ *
+ * @param <T> option value element type
  */
-@FunctionalInterface
-public interface BundleCreator<T extends BundleSpec> {
+interface OptionArrayValueConverter<T> extends OptionValueConverter<T[]> {
 
     /**
-     * Creates a bundle from the given specification in the given directory.
+     * Splits the given string into tokens and returns the result.
      *
-     * @param spec the bundle specification
-     * @param dst the directory where to create the bundle
-     * @throws PackagerException if packaging error occurs
-     * @throws IOException if an I/O error occurs
+     * @param str the string to tokenize
+     * @return the result of tokenization of the input string
      */
-    void create(T spec, Path dst) throws PackagerException, IOException;
+    String[] tokenize(String str);
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionIdentifier.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionIdentifier.java
new file mode 100644
index 00000000000..4414adc3791
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionIdentifier.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+
+public sealed interface OptionIdentifier {
+
+    static OptionIdentifier createIdentifier() {
+        return new Details.DefaultOptionIdentifier();
+    }
+
+    static OptionIdentifier of(String id) {
+        return new Details.StringOptionIdentifier(id);
+    }
+
+    static final class Details {
+
+        private Details() {
+        }
+
+        static final class DefaultOptionIdentifier implements OptionIdentifier {}
+
+        record StringOptionIdentifier(String value) implements OptionIdentifier {
+            StringOptionIdentifier {
+                Objects.requireNonNull(value);
+            }
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionName.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionName.java
new file mode 100644
index 00000000000..6529074bd87
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionName.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+
+record OptionName(String name) implements Comparable<OptionName> {
+
+    OptionName(String name) {
+        Objects.requireNonNull(name);
+        if (name.isEmpty()) {
+            throw new IllegalArgumentException("Name should not be empty");
+        }
+
+        if (name.charAt(0) != '-') {
+            this.name = name;
+        } else if (name.length() == 1) {
+            throw new IllegalArgumentException("Short option without a name");
+        } else if (name.charAt(1) != '-') {
+            // Reverse operation for a short option name
+            this.name = name.substring(1, 2);
+        } else if (name.length() == 2) {
+            throw new IllegalArgumentException("Long option without a name");
+        } else {
+            // Reverse operation for a long option name
+            this.name = name.substring(2);
+        }
+    }
+
+    static OptionName of(String name) {
+        return new OptionName(name);
+    }
+
+    boolean isShort() {
+        return name.length() == 1;
+    }
+
+    String formatForCommandLine() {
+        return (isShort() ? "-" : "--") + name;
+    }
+
+    @Override
+    public int compareTo(OptionName other) {
+        return name.compareTo(other.name);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionScope.java
similarity index 81%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionScope.java
index 4a664a81bcf..62c6600654f 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionScope.java
@@ -22,14 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.jpackage.internal.model;
+
+package jdk.jpackage.internal.cli;
 
 /**
- * Generic bundling operation.
- * <p>
- * Bundling operation is comprised of creating of {@link BundleSpec} instance
- * and using it as an input for {@link BundleCreator#create()} method to create
- * a bundle.
+ * Option scope.
  */
-public interface BundlingOperation {
+interface OptionScope {
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSource.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSource.java
new file mode 100644
index 00000000000..4ec61701bad
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSource.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Source where command line options come from.
+ */
+sealed interface OptionSource {
+
+    static boolean isCommandLine(OptionSource v) {
+        return v.equals(COMMAND_LINE);
+    }
+
+    static Optional<Path> asFile(OptionSource v) {
+        return Optional.of(v)
+                .filter(Details.FileOptionSource.class::isInstance)
+                .map(Details.FileOptionSource.class::cast)
+                .map(Details.FileOptionSource::path);
+    }
+
+    static OptionSource fromFile(Path v) {
+        return new Details.FileOptionSource(v);
+    }
+
+    static final class Details {
+
+        private Details() {
+        }
+
+        private enum CommandLineOptionSource implements OptionSource {
+            VALUE
+        }
+
+        private record FileOptionSource(Path path) implements OptionSource {
+            FileOptionSource {
+                Objects.requireNonNull(path);
+            }
+        }
+    }
+
+    static final OptionSource COMMAND_LINE = Details.CommandLineOptionSource.VALUE;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
new file mode 100644
index 00000000000..c6aa46a6940
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+
+/**
+ * Option spec.
+ *
+ * Names are used to identify an option. Converter converts option value from a
+ * {@link String} to an object of type {@link T}. Scope defines where the option
+ * applies. The standard scopes are: {@link BundlingOperationOptionScope},
+ * {@link BundlingOperationModifier}. Merge policy defines how to handle
+ * multiple values of the option. Value pattern and description are targeted for
+ * help output.
+ *
+ * @param names                the names. Must be non-empty
+ * @param converter            the converter. Converts from a {@link String} to
+ *                             an object of type {@link T}
+ * @param scope                the scope. Must be non-empty
+ * @param defaultOptionalValue the default optional value or an empty
+ *                             {@link Optional} instance if the option has a
+ *                             mandatory value or doesn't have a value
+ * @param mergePolicy          the merge policy
+ * @param valuePattern         the value pattern. Used in help output
+ * @param description          the description. Used in help output
+ * @param <T>                  option value type
+ */
+record OptionSpec<T>(
+        List<OptionName> names,
+        Optional<OptionValueConverter<T>> converter,
+        Set<OptionScope> scope,
+        MergePolicy mergePolicy,
+        Optional<T> defaultOptionalValue,
+        Optional<String> valuePattern,
+        String description) {
+
+    enum MergePolicy {
+        USE_FIRST,
+        USE_LAST,
+        CONCATENATE
+    }
+
+    OptionSpec {
+        Objects.requireNonNull(names);
+        if (names.isEmpty()) {
+            throw new IllegalArgumentException("Empty name list");
+        }
+        Objects.requireNonNull(converter);
+        Objects.requireNonNull(scope);
+        if (scope.isEmpty()) {
+            throw new IllegalArgumentException("Empty scope");
+        }
+        Objects.requireNonNull(mergePolicy);
+        Objects.requireNonNull(valuePattern);
+        if (converter.isEmpty() && valuePattern.isPresent()) {
+            throw new IllegalArgumentException("Option without a value can not have a value pattern");
+        }
+        if (converter.isEmpty() && defaultOptionalValue.isPresent()) {
+            throw new IllegalArgumentException("Option with optional value should have a converter");
+        }
+        Objects.requireNonNull(description);
+
+        final var typeMustBeArray = mergePolicy.equals(MergePolicy.CONCATENATE);
+        final var type = valueType(converter);
+        if (typeMustBeArray && !type.map(Class::isArray).orElse(false)) {
+            throw new IllegalArgumentException(String.format("Invalid merge policy [%s] for type [%s]",
+                    mergePolicy, type.map(Class::getName).orElse("")));
+        }
+
+        names = List.copyOf(names);
+        scope = Set.copyOf(scope);
+    }
+
+    /**
+     * Returns the first (primary) name of this option spec.
+     *
+     * @return the first name of this option spec
+     */
+    OptionName name() {
+        return names.getFirst();
+    }
+
+    /**
+     * Returns all names but the first of this option spec. Returns an empty list if
+     * the option spec has only one name.
+     *
+     * @return the additional names
+     */
+    List<OptionName> otherNames() {
+        return names.subList(1, names.size());
+    }
+
+    /**
+     * Returns a stream of copy option spec objects, each having a single name.
+     * <p>
+     * If the option has three names "a", "b", and "c", the stream will have three
+     * option spec objects each with a single name. The first will have name "a", the
+     * second - "b", and the third "c".
+     *
+     * @return the stream of copy option spec objects each having a single name
+     */
+    Stream<OptionSpec<T>> copyForEveryName() {
+        return names().stream().map(v -> {
+            return new OptionSpec<>(List.of(v), converter, scope, mergePolicy, defaultOptionalValue, valuePattern, description);
+        });
+    }
+
+    <U> OptionSpec<U> copyWithConverter(OptionValueConverter<U> converter) {
+        if (!defaultOptionalValue.isEmpty()) {
+            throw new UnsupportedOperationException("Can not convert an option spec with optional value");
+        }
+        return new OptionSpec<>(names, Optional.of(converter), scope, mergePolicy, Optional.empty(), valuePattern, description);
+    }
+
+    OptionSpec<T> copyWithDescription(String description) {
+        return new OptionSpec<>(names, converter, scope, mergePolicy, defaultOptionalValue, valuePattern, Objects.requireNonNull(description));
+    }
+
+    OptionSpec<T> copyWithName(OptionName name) {
+        return new OptionSpec<>(List.of(name), converter, scope, mergePolicy, defaultOptionalValue, valuePattern, description);
+    }
+
+    List<OptionName> findNamesIn(Options cmdline) {
+        return names().stream().filter(cmdline::contains).toList();
+    }
+
+    OptionName getFirstNameIn(Options cmdline) {
+        return findNamesIn(cmdline).getFirst();
+    }
+
+    boolean hasValue() {
+        return converter.isPresent();
+    }
+
+    boolean isValueOptional() {
+        return defaultOptionalValue.isPresent();
+    }
+
+    Class<? extends T> valueType() {
+        return valueType(converter).orElseThrow();
+    }
+
+    @SuppressWarnings("unchecked")
+    <U> Optional<OptionArrayValueConverter<U>> arrayValueConverter() {
+        return converter.filter(OptionArrayValueConverter.class::isInstance).map(v -> (OptionArrayValueConverter<U>)v);
+    }
+
+    private static <T> Optional<Class<? extends T>> valueType(Optional<OptionValueConverter<T>> valueConverter) {
+        return valueConverter.map(OptionValueConverter::valueType);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
new file mode 100644
index 00000000000..e27d6472369
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.io.File;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.cli.OptionSpec.MergePolicy;
+
+final class OptionSpecBuilder<T> {
+
+    static <T> OptionSpecBuilder<T> create(Class<? extends T> valueType) {
+        return new OptionSpecBuilder<>(valueType);
+    }
+
+    static String pathSeparator() {
+        return File.pathSeparator;
+    }
+
+    static <T> Function<OptionValue.Builder<T[]>, OptionValue<List<T>>> toList() {
+        return builder -> {
+            return builder.to(List::of).create();
+        };
+    }
+
+    private OptionSpecBuilder(Class<? extends T> valueType) {
+        this.valueType = Objects.requireNonNull(valueType);
+    }
+
+    OptionSpecBuilder(OptionSpecBuilder<T> other) {
+        valueType = other.valueType;
+        name = other.name;
+        nameAliases.addAll(other.nameAliases);
+        description = other.description;
+        mergePolicy = other.mergePolicy;
+        scope = Set.copyOf(other.scope);
+        defaultValue = other.defaultValue;
+        defaultOptionalValue = other.defaultOptionalValue;
+        valuePattern = other.valuePattern;
+        converterBuilder = other.converterBuilder.copy();
+        validatorBuilder = other.validatorBuilder.copy();
+
+        if (other.arrayDefaultValue != null) {
+            arrayDefaultValue = Arrays.copyOf(other.arrayDefaultValue, other.arrayDefaultValue.length);
+        }
+        arrayValuePatternSeparator = other.arrayValuePatternSeparator;
+        arrayTokenizer = other.arrayTokenizer;
+    }
+
+    OptionSpecBuilder<T> copy() {
+        return new OptionSpecBuilder<>(this);
+    }
+
+    Class<? extends T> valueType() {
+        return valueType;
+    }
+
+    OptionValue<T> create() {
+        return toOptionValueBuilder().create();
+    }
+
+    OptionValue<T[]> createArray() {
+        return toArrayOptionValueBuilder().create();
+    }
+
+    <U> OptionValue<U> create(Function<OptionValue.Builder<T>, OptionValue<U>> transformer) {
+        return transformer.apply(toOptionValueBuilder());
+    }
+
+    <U> OptionValue<U> createArray(Function<OptionValue.Builder<T[]>, OptionValue<U>> transformer) {
+        return transformer.apply(toArrayOptionValueBuilder());
+    }
+
+    OptionValue.Builder<T> toOptionValueBuilder() {
+        final var builder = OptionValue.<T>build().spec(createOptionSpec());
+        defaultValue().ifPresent(builder::defaultValue);
+        return builder;
+    }
+
+    OptionValue.Builder<T[]> toArrayOptionValueBuilder() {
+        final var builder = OptionValue.<T[]>build().spec(createArrayOptionSpec());
+        defaultArrayValue().ifPresent(builder::defaultValue);
+        return builder;
+    }
+
+    OptionSpec<T> createOptionSpec() {
+        return new OptionSpec<>(
+                names(),
+                createConverter(),
+                scope,
+                mergePolicy().orElse(MergePolicy.USE_LAST),
+                defaultOptionalValue(),
+                valuePattern(),
+                description().orElse(""));
+    }
+
+    OptionSpec<T[]> createArrayOptionSpec() {
+        return new OptionSpec<>(
+                names(),
+                Optional.of(createArrayConverter()),
+                scope,
+                OptionSpecBuilder.this.mergePolicy().orElse(MergePolicy.CONCATENATE),
+                defaultArrayOptionalValue(),
+                Optional.of(arryValuePattern()),
+                OptionSpecBuilder.this.description().orElse(""));
+    }
+
+    OptionSpecBuilder<T> tokenizer(String splitRegexp) {
+        Objects.requireNonNull(splitRegexp);
+        return tokenizer(str -> {
+            return str.split(splitRegexp);
+        }).arrayValuePatternSeparator(splitRegexp);
+    }
+
+    OptionSpecBuilder<T> tokenizeOne() {
+        return tokenizer((Function<String, String[]>)null);
+    }
+
+    OptionSpecBuilder<T> tokenizer(Function<String, String[]> v) {
+        arrayTokenizer = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> mutate(Consumer<OptionSpecBuilder<T>> mutator) {
+        mutator.accept(this);
+        return this;
+    }
+
+    OptionSpecBuilder<T> validatorExceptionFormatString(String v) {
+        validatorBuilder.formatString(v);
+        return this;
+    }
+
+    OptionSpecBuilder<T> validatorExceptionFormatString(UnaryOperator<String> mutator) {
+        validatorBuilder.formatString(mutator.apply(validatorBuilder.formatString().orElse(null)));
+        return this;
+    }
+
+    OptionSpecBuilder<T> converterExceptionFormatString(String v) {
+        converterBuilder.formatString(v);
+        return this;
+    }
+
+    OptionSpecBuilder<T> converterExceptionFormatString(UnaryOperator<String> mutator) {
+        converterBuilder.formatString(mutator.apply(converterBuilder.formatString().orElse(null)));
+        return this;
+    }
+
+    OptionSpecBuilder<T> validatorExceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+        validatorBuilder.exceptionFactory(v);
+        return this;
+    }
+
+    OptionSpecBuilder<T> validatorExceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mutator) {
+        return validatorExceptionFactory(mutator.apply(validatorBuilder.exceptionFactory().orElse(null)));
+    }
+
+    OptionSpecBuilder<T> converterExceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+        converterBuilder.exceptionFactory(v);
+        return this;
+    }
+
+    OptionSpecBuilder<T> converterExceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mutator) {
+        return converterExceptionFactory(mutator.apply(converterBuilder.exceptionFactory().orElse(null)));
+    }
+
+    OptionSpecBuilder<T> exceptionFormatString(String v) {
+        return validatorExceptionFormatString(v).converterExceptionFormatString(v);
+    }
+
+    OptionSpecBuilder<T> exceptionFormatString(UnaryOperator<String> mutator) {
+        return validatorExceptionFormatString(mutator).converterExceptionFormatString(mutator);
+    }
+
+    OptionSpecBuilder<T> exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+        return validatorExceptionFactory(v).converterExceptionFactory(v);
+    }
+
+    OptionSpecBuilder<T> exceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mutator) {
+        return validatorExceptionFactory(mutator).converterExceptionFactory(mutator);
+    }
+
+    OptionSpecBuilder<T> converter(ValueConverter<T> v) {
+        converterBuilder.converter(v);
+        return this;
+    }
+
+    OptionSpecBuilder<T> converter(Function<String, T> v) {
+        return converter(ValueConverter.create(v, valueType));
+    }
+
+    OptionSpecBuilder<T> validator(Predicate<T> v) {
+        validatorBuilder.predicate(v::test);
+        return this;
+    }
+
+    @SuppressWarnings("overloads")
+    OptionSpecBuilder<T> validator(Consumer<T> v) {
+        validatorBuilder.consumer(v::accept);
+        return this;
+    }
+
+    @SuppressWarnings("overloads")
+    OptionSpecBuilder<T> validator(UnaryOperator<Validator.Builder<T, RuntimeException>> mutator) {
+        validatorBuilder = mutator.apply(validatorBuilder);
+        return this;
+    }
+
+    OptionSpecBuilder<T> withoutConverter() {
+        converterBuilder.converter(null);
+        return this;
+    }
+
+    OptionSpecBuilder<T> withoutValidator() {
+        validatorBuilder.predicate(null).consumer(null);
+        return this;
+    }
+
+    OptionSpecBuilder<T> name(String v) {
+        name = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> addAliases(String... v) {
+        nameAliases.addAll(List.of(v));
+        return this;
+    }
+
+    OptionSpecBuilder<T> description(String v) {
+        description = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> mergePolicy(MergePolicy v) {
+        mergePolicy = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> scope(OptionScope... v) {
+        return scope(Set.of(v));
+    }
+
+    OptionSpecBuilder<T> scope(Collection<? extends OptionScope> v) {
+        scope = Set.copyOf(v);
+        return this;
+    }
+
+    OptionSpecBuilder<T> scope(UnaryOperator<Set<OptionScope>> mutator) {
+        return scope(mutator.apply(scope().orElseGet(Set::of)));
+    }
+
+    OptionSpecBuilder<T> inScope(OptionScope... v) {
+        return inScope(Set.of(v));
+    }
+
+    OptionSpecBuilder<T> inScope(Collection<? extends OptionScope> v) {
+        final Set<OptionScope> newScope = new HashSet<>(v);
+        scope().ifPresent(newScope::addAll);
+        scope = newScope;
+        return this;
+    }
+
+    OptionSpecBuilder<T> outOfScope(OptionScope... v) {
+        return outOfScope(Set.of(v));
+    }
+
+    OptionSpecBuilder<T> outOfScope(Collection<? extends OptionScope> v) {
+        if (scope != null) {
+            final Set<OptionScope> newScope = new HashSet<>(scope);
+            newScope.removeAll(v);
+            scope = newScope;
+        }
+        return this;
+    }
+
+    OptionSpecBuilder<T> defaultValue(T v) {
+        defaultValue = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> defaultOptionalValue(T v) {
+        defaultOptionalValue = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> defaultArrayValue(T[] v) {
+        arrayDefaultValue = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> arrayValuePatternSeparator(String v) {
+        arrayValuePatternSeparator = v;
+        return this;
+    }
+
+    OptionSpecBuilder<T> valuePattern(String v) {
+        valuePattern = v;
+        return this;
+    }
+
+    private Optional<String> name() {
+        return Optional.ofNullable(name);
+    }
+
+    private Optional<String> description() {
+        return Optional.ofNullable(description);
+    }
+
+    private Optional<MergePolicy> mergePolicy() {
+        return Optional.ofNullable(mergePolicy);
+    }
+
+    private Optional<Set<OptionScope>> scope() {
+        return Optional.ofNullable(scope);
+    }
+
+    private Optional<T> defaultValue() {
+        return Optional.ofNullable(defaultValue);
+    }
+
+    private Optional<T[]> defaultArrayValue() {
+        return Optional.ofNullable(arrayDefaultValue).or(() -> {
+            return OptionSpecBuilder.this.defaultValue().map(this::toOneElementArray);
+        });
+    }
+
+    private Optional<T> defaultOptionalValue() {
+        return Optional.ofNullable(defaultOptionalValue);
+    }
+
+    private Optional<T[]> defaultArrayOptionalValue() {
+        return defaultOptionalValue().map(this::toOneElementArray);
+    }
+
+    private Optional<String> valuePattern() {
+        var hasOptionalValue = defaultOptionalValue().isPresent();
+        return Optional.ofNullable(valuePattern).or(this::defaultValuePattern).map(str -> {
+            if (str.isEmpty()) {
+                return "<>";
+            } else {
+                var sb = new StringBuilder();
+                switch (str.charAt(0)) {
+                    case '<', '[' -> {
+                    }
+                    default -> {
+                        if (hasOptionalValue) {
+                            sb.append("[");
+                        }
+                        sb.append("<");
+                    }
+                }
+                sb.append(str);
+                switch (str.charAt(str.length() - 1)) {
+                    case '>', ']' -> {
+                    }
+                    default -> {
+                        sb.append(">");
+                        if (hasOptionalValue) {
+                            sb.append("]");
+                        }
+                    }
+                }
+                return sb.toString();
+            }
+        });
+    }
+
+    private Optional<String> defaultValuePattern() {
+        return converterBuilder.converter().map(_ -> {
+            final var tokens = name.split("-");
+            return tokens[tokens.length - 1];
+        });
+    }
+
+    private List<OptionName> names() {
+        return Stream.of(
+                List.of(name().orElseThrow()),
+                nameAliases
+        ).flatMap(Collection::stream).map(OptionName::new).distinct().toList();
+    }
+
+    private Optional<OptionValueConverter<T>> createConverter() {
+        if (converterBuilder.converter().isPresent()) {
+            final var newBuilder = converterBuilder.copy();
+            createValidator().ifPresent(newBuilder::validator);
+            return Optional.of(newBuilder.create());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private Optional<Validator<T, ? extends RuntimeException>> createValidator() {
+        if (validatorBuilder.hasValidatingMethod()) {
+            return Optional.of(validatorBuilder.create());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private OptionValueConverter<T[]> createArrayConverter() {
+        final var newBuilder = converterBuilder.copy();
+        newBuilder.tokenizer(Optional.ofNullable(arrayTokenizer).orElse(str -> {
+            return new String[] { str };
+        }));
+        createValidator().ifPresent(newBuilder::validator);
+        return newBuilder.createArray();
+    }
+
+    private String arryValuePattern() {
+        final var elementValuePattern = OptionSpecBuilder.this.valuePattern().orElseThrow();
+        if (arrayValuePatternSeparator == null) {
+            return elementValuePattern;
+        } else {
+            return String.format("%s[%s%s...]", elementValuePattern, arrayValuePatternSeparator, elementValuePattern);
+        }
+    }
+
+    private T[] toOneElementArray(T v) {
+        Objects.requireNonNull(v);
+        @SuppressWarnings("unchecked")
+        final var arr = (T[]) Array.newInstance(valueType, 1);
+        arr[0] = v;
+        return arr;
+    }
+
+    private final Class<? extends T> valueType;
+    private String name;
+    private Collection<String> nameAliases = new LinkedHashSet<>();
+    private String description;
+    private MergePolicy mergePolicy;
+    private Set<OptionScope> scope;
+    private T defaultValue;
+    private T defaultOptionalValue;
+    private String valuePattern;
+    private OptionValueConverter.Builder<T> converterBuilder = OptionValueConverter.build();
+    private Validator.Builder<T, RuntimeException> validatorBuilder = Validator.build();
+
+    private T[] arrayDefaultValue;
+    private String arrayValuePatternSeparator;
+    private Function<String, String[]> arrayTokenizer;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
new file mode 100644
index 00000000000..ec781e107ea
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import jdk.jpackage.internal.util.SetBuilder;
+
+/**
+ * Option scope facilitating mapping of {@link OptionSpec} instances based on
+ * the given context.
+ *
+ * <p>
+ * Use with option specs whose behavior is a function of a context. E.g.: if
+ * option value validation depends on the current OS; if option description
+ * varies depending on the current OS.
+ *
+ * @param <T> the type of option value
+ * @param <T> the type of context
+ */
+interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
+
+    OptionSpec<T> createOptionSpec(U context, boolean createArray);
+
+    Class<? extends U> contextType();
+
+    @SuppressWarnings("unchecked")
+    static <T, U> OptionSpec<T> mapOptionSpec(OptionSpec<T> optionSpec, U context) {
+        return optionSpec.scope().stream()
+                .filter(OptionSpecMapperOptionScope.class::isInstance)
+                .map(OptionSpecMapperOptionScope.class::cast)
+                .filter(scope -> {
+                    return scope.contextType().isInstance(context);
+                })
+                .findFirst().map(scope -> {
+                    return ((OptionSpecMapperOptionScope<T, U>)scope).createOptionSpec(
+                            context, optionSpec.arrayValueConverter().isPresent());
+                }).orElse(optionSpec);
+    }
+
+    static <T, U> Consumer<OptionSpecBuilder<T>> createOptionSpecBuilderMutator(
+            Class<? extends U> contextType,
+            BiConsumer<OptionSpecBuilder<T>, U> mutator) {
+        Objects.requireNonNull(mutator);
+
+        return builder -> {
+            builder.scope(scope -> {
+                return Details.<T, U>addOptionSpecBuilderMutator(contextType, scope, mutator, builder);
+            });
+        };
+    }
+
+    static final class Details {
+
+        private Details() {
+        }
+
+        private static <T, U> Set<OptionScope> addOptionSpecBuilderMutator(
+                Class<? extends U> contextType,
+                Set<OptionScope> scope,
+                BiConsumer<OptionSpecBuilder<T>, U> optionSpecBuilderMutator,
+                OptionSpecBuilder<T> optionSpecBuilder) {
+
+            Objects.requireNonNull(contextType);
+            Objects.requireNonNull(scope);
+            Objects.requireNonNull(optionSpecBuilderMutator);
+            Objects.requireNonNull(optionSpecBuilder);
+
+            var contextOptionScope = scope.stream()
+                    .filter(AccumulatingContextOptionScope.class::isInstance)
+                    .map(AccumulatingContextOptionScope.class::cast)
+                    .filter(s -> {
+                        return s.contextType().equals(contextType);
+                    })
+                    .findFirst();
+            contextOptionScope.ifPresent(v -> {
+                @SuppressWarnings("unchecked")
+                var mutators = (AccumulatingContextOptionScope<T, U>)v;
+                mutators.addMutator(optionSpecBuilderMutator);
+                if (optionSpecBuilder != mutators.optionSpecBuilder) {
+                    throw new IllegalArgumentException();
+                }
+            });
+
+            if (contextOptionScope.isEmpty()) {
+                var mutators = new AccumulatingContextOptionScope<T, U>(optionSpecBuilder, contextType);
+                mutators.addMutator(optionSpecBuilderMutator);
+                scope = SetBuilder.build(OptionScope.class).add(scope).add(mutators).create();
+            }
+
+            return scope;
+        }
+
+        private static final class AccumulatingContextOptionScope<T, U> implements OptionSpecMapperOptionScope<T, U> {
+
+            AccumulatingContextOptionScope(OptionSpecBuilder<T> optionSpecBuilder, Class<? extends U> contextType) {
+                this.optionSpecBuilder = Objects.requireNonNull(optionSpecBuilder);
+                this.contextType = Objects.requireNonNull(contextType);
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public OptionSpec<T> createOptionSpec(U context, boolean createArray) {
+                var copy = optionSpecBuilder.copy();
+                for (var mutator : optionSpecBuilderMutators) {
+                    mutator.accept(copy, context);
+                }
+
+                if (createArray) {
+                    return (OptionSpec<T>)copy.createArrayOptionSpec();
+                } else {
+                    return copy.createOptionSpec();
+                }
+            }
+
+            @Override
+            public Class<? extends U> contextType() {
+                return contextType;
+            }
+
+            void addMutator(BiConsumer<OptionSpecBuilder<T>, U> mutator) {
+                optionSpecBuilderMutators.add(mutator);
+            }
+
+            private final OptionSpecBuilder<T> optionSpecBuilder;
+            private final Class<? extends U> contextType;
+            private final List<BiConsumer<OptionSpecBuilder<T>, U>> optionSpecBuilderMutators = new ArrayList<>();
+        }
+
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValue.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValue.java
new file mode 100644
index 00000000000..fcd33826b95
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValue.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Typed getter of option values in {@link Options} objects.
+ *
+ * @param <T> option value type.
+ */
+public sealed interface OptionValue<T> extends WithOptionIdentifier {
+
+    Optional<Option> asOption();
+
+    default Option getOption() {
+        return asOption().orElseThrow();
+    }
+
+    @SuppressWarnings("unchecked")
+    default OptionSpec<T> getSpec() {
+        return (OptionSpec<T>)getOption().spec();
+    }
+
+    default String getName() {
+        return getSpec().name().name();
+    }
+
+    @SuppressWarnings("unchecked")
+    default Optional<T> findIn(Options cmdline) {
+        return (Optional<T>)cmdline.find(id());
+    }
+
+    default T getFrom(Options cmdline) {
+        return findIn(cmdline).orElseThrow();
+    }
+
+    default void ifPresentIn(Options cmdline, Consumer<T> consumer) {
+        findIn(cmdline).ifPresent(consumer);
+    }
+
+    default boolean containsIn(Options cmdline) {
+        return cmdline.find(id()).isPresent();
+    }
+
+    static <U> OptionValue<U> create() {
+        return create(OptionIdentifier.createIdentifier());
+    }
+
+    static <U> OptionValue<U> create(OptionIdentifier id) {
+        return new Internal.Standard<>(id, Optional.empty(), Optional.empty());
+    }
+
+    static <U> Builder<U> build() {
+        return new Builder<>();
+    }
+
+    static final class Builder<T> {
+        OptionValue<T> create() {
+            if (conv != null) {
+                return conv.create(Optional.ofNullable(defaultValue));
+            } else {
+                return new Internal.Standard<>(
+                        Optional.ofNullable(id).orElseGet(OptionIdentifier::createIdentifier),
+                        Optional.ofNullable(spec),
+                        Optional.ofNullable(defaultValue));
+            }
+        }
+
+        Builder<T> defaultValue(T v) {
+            defaultValue = v;
+            return this;
+        }
+
+        Builder<T> spec(OptionSpec<?> v) {
+            spec = v;
+            conv = null;
+            return this;
+        }
+
+        Builder<T> id(OptionIdentifier v) {
+            id = v;
+            conv = null;
+            return this;
+        }
+
+        <U> Builder<T> from(OptionValue<U> base, Function<U, T> conv) {
+            id(null).spec(null);
+            this.conv = new Conv<>(base, conv);
+            return this;
+        }
+
+        <U> Builder<U> to(Function<T, U> conv) {
+            return OptionValue.<U>build().from(create(), conv);
+        }
+
+        private record Conv<U, V>(OptionValue<U> base, Function<U, V> conv) {
+            Conv {
+                Objects.requireNonNull(base);
+                Objects.requireNonNull(conv);
+            }
+
+            OptionValue<V> create(Optional<V> defaultValue) {
+                return new Internal.Mapping<>(base, conv, defaultValue);
+            }
+        }
+
+        private Conv<?, T> conv;
+        private T defaultValue;
+        private OptionIdentifier id;
+        private OptionSpec<?> spec;
+    }
+
+
+    static final class Internal {
+
+        private Internal() {
+        }
+
+        private record Standard<T>(OptionIdentifier id, Optional<OptionSpec<?>> spec, Optional<T> defaultValue) implements OptionValue<T> {
+
+            Standard {
+                Objects.requireNonNull(id);
+                Objects.requireNonNull(spec);
+                Objects.requireNonNull(defaultValue);
+            }
+
+            @Override
+            public Optional<Option> asOption() {
+                return spec.map(v -> {
+                    return new Option(id, v);
+                });
+            }
+
+            @Override
+            public Optional<T> findIn(Options cmdline) {
+                return OptionValue.super.findIn(cmdline).or(() -> defaultValue);
+            }
+        }
+
+        private record Mapping<T, U>(OptionValue<U> base, Function<U, T> conv, Optional<T> defaultValue) implements OptionValue<T> {
+
+            Mapping {
+                Objects.requireNonNull(base);
+                Objects.requireNonNull(conv);
+                Objects.requireNonNull(defaultValue);
+            }
+
+            @Override
+            public OptionIdentifier id() {
+                return base.id();
+            }
+
+            @Override
+            public Optional<Option> asOption() {
+                return base.asOption();
+            }
+
+            @Override
+            public Optional<T> findIn(Options cmdline) {
+                return base.findIn(cmdline).map(conv).or(() -> defaultValue);
+            }
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
new file mode 100644
index 00000000000..8544853d584
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import jdk.jpackage.internal.cli.Validator.ParsedValue;
+import jdk.jpackage.internal.util.Result;
+
+/**
+ * Defines creating an option value of type {@link T} from a string.
+ *
+ * @param <T> option value type
+ */
+interface OptionValueConverter<T> {
+
+    /**
+     * Converts the given string value corresponding to the given option name into a
+     * Java type.
+     *
+     * @param optionName  the option name
+     * @param optionValue the string value of the option to convert
+     * @return the conversion result
+     */
+    Result<T> convert(OptionName optionName, StringToken optionValue);
+
+    /**
+     * Gives the class of the type of values this converter converts to.
+     *
+     * @return the target class for conversion
+     */
+    Class<? extends T> valueType();
+
+    /**
+     * Thrown to indicate an error in the normal execution of the converter.
+     */
+    static final class ConverterException extends RuntimeException {
+
+        private ConverterException(Throwable cause) {
+            super(cause);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    static <T> Builder<T> build() {
+        return new Builder<>();
+    }
+
+    static final class Builder<T> {
+
+        private Builder() {
+        }
+
+        private Builder(Builder<T> other) {
+            converter = other.converter;
+            validator = other.validator;
+            tokenizer = other.tokenizer;
+            formatString = other.formatString;
+            exceptionFactory = other.exceptionFactory;
+        }
+
+        Builder<T> copy() {
+            return new Builder<>(this);
+        }
+
+        OptionValueConverter<T> create() {
+            return new DefaultOptionValueConverter<>(
+                    converter,
+                    formatString().orElseGet(() -> {
+                        if (exceptionFactory == null) {
+                            return "";
+                        } else {
+                            return null;
+                        }
+                    }),
+                    exceptionFactory().orElseGet(() -> {
+                        if (formatString == null) {
+                            return OptionValueExceptionFactory.unreachable();
+                        } else {
+                            return null;
+                        }
+                    }),
+                    validator());
+        }
+
+        OptionArrayValueConverter<T> createArray() {
+            return new DefaultOptionArrayValueConverter<>(create(), tokenizer);
+        }
+
+        Builder<T> converter(ValueConverter<T> v) {
+            converter = v;
+            return this;
+        }
+
+        Builder<T> validator(Validator<T, ? extends RuntimeException> v) {
+            validator = v;
+            return this;
+        }
+
+        Builder<T> tokenizer(Function<String, String[]> v) {
+            tokenizer = v;
+            return this;
+        }
+
+        Builder<T> formatString(String v) {
+            formatString = v;
+            return this;
+        }
+
+        Builder<T> exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+            exceptionFactory = v;
+            return this;
+        }
+
+        Builder<T> mutate(Consumer<Builder<T>> mutator) {
+            mutator.accept(this);
+            return this;
+        }
+
+        Optional<ValueConverter<T>> converter() {
+            return Optional.ofNullable(converter);
+        }
+
+        Optional<Validator<T, ? extends RuntimeException>> validator() {
+            return Optional.ofNullable(validator);
+        }
+
+        Optional<Function<String, String[]>> tokenizer() {
+            return Optional.ofNullable(tokenizer);
+        }
+
+        Optional<String> formatString() {
+            return Optional.ofNullable(formatString);
+        }
+
+        Optional<OptionValueExceptionFactory<? extends RuntimeException>> exceptionFactory() {
+            return Optional.ofNullable(exceptionFactory);
+        }
+
+
+        private record DefaultOptionValueConverter<T>(ValueConverter<T> converter, String formatString,
+                OptionValueExceptionFactory<? extends RuntimeException> exceptionFactory,
+                Optional<Validator<T, ? extends RuntimeException>> validator) implements OptionValueConverter<T> {
+
+            DefaultOptionValueConverter {
+                Objects.requireNonNull(converter);
+                Objects.requireNonNull(formatString);
+                Objects.requireNonNull(exceptionFactory);
+                Objects.requireNonNull(validator);
+            }
+
+            @Override
+            public Result<T> convert(OptionName optionName, StringToken optionValue) {
+                Objects.requireNonNull(optionName);
+
+                final T convertedValue;
+                try {
+                    convertedValue = converter.convert(optionValue.value());
+                } catch (Exception ex) {
+                    return handleException(optionName, optionValue, ex);
+                }
+
+                final List<? extends Exception> validationExceptions = validator.map(val -> {
+                    try {
+                        return val.validate(optionName, ParsedValue.create(convertedValue, optionValue));
+                    } catch (Validator.ValidatorException ex) {
+                        // All unexpected exceptions that the converter yields should be tunneled via ConverterException.
+                        throw new ConverterException(ex.getCause());
+                    }
+                }).orElseGet(List::of);
+
+                if (validationExceptions.isEmpty()) {
+                    return Result.ofValue(convertedValue);
+                } else {
+                    return Result.ofErrors(validationExceptions);
+                }
+            }
+
+            @Override
+            public Class<? extends T> valueType() {
+                return converter.valueType();
+            }
+
+            private Result<T> handleException(OptionName optionName, StringToken optionValue, Exception ex) {
+                if (ex instanceof IllegalArgumentException) {
+                    return Result.ofError(exceptionFactory.create(optionName, optionValue, formatString, Optional.of(ex)));
+                } else {
+                    throw new ConverterException(ex);
+                }
+            }
+        }
+
+
+        private record DefaultOptionArrayValueConverter<T>(OptionValueConverter<T> elementConverter,
+                Function<String, String[]> tokenizer) implements OptionArrayValueConverter<T> {
+
+            DefaultOptionArrayValueConverter {
+                Objects.requireNonNull(elementConverter);
+                Objects.requireNonNull(tokenizer);
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Result<T[]> convert(OptionName optionName, StringToken optionValue) {
+
+                final List<Exception> exceptions = new ArrayList<>();
+                final List<T> convertedValues = new ArrayList<>();
+
+                final var tokens = tokenize(optionValue.value());
+                for (var token : tokens) {
+                    final var result = elementConverter.convert(optionName, StringToken.of(optionValue.value(), token));
+                    exceptions.addAll(result.errors());
+                    if (exceptions.isEmpty()) {
+                        result.value().ifPresent(convertedValues::add);
+                    }
+                }
+
+                if (!exceptions.isEmpty()) {
+                    return Result.ofErrors(exceptions);
+                } else {
+                    return Result.ofValue(convertedValues.toArray(length -> {
+                        return (T[])Array.newInstance(elementConverter.valueType(), length);
+                    }));
+                }
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Class<? extends T[]> valueType() {
+                return (Class<? extends T[]>)elementConverter.valueType().arrayType();
+            }
+
+            @Override
+            public String[] tokenize(String str) {
+                return tokenizer.apply(Objects.requireNonNull(str));
+            }
+        }
+
+        private ValueConverter<T> converter;
+        private Validator<T, ? extends RuntimeException> validator;
+        private Function<String, String[]> tokenizer;
+        private String formatString;
+        private OptionValueExceptionFactory<? extends RuntimeException> exceptionFactory;
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueExceptionFactory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueExceptionFactory.java
new file mode 100644
index 00000000000..8b8c530cbe8
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueExceptionFactory.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+
+/**
+ * Factory producing exception objects for option value processing failures.
+ * <p>
+ * Errors in converting option string values into objects or validating objects
+ * created from option string values are typical option value processing
+ * failures.
+ *
+ * @param T type of produced exceptions
+ */
+@FunctionalInterface
+interface OptionValueExceptionFactory<T extends Exception> {
+
+    /**
+     * Create an exception object for the specified option name, value and optional
+     * cause.
+     *
+     * @param optionName   the name of the option
+     * @param optionValue  the value of the option
+     * @param formatString the format string for formatting the exception message
+     * @param cause        the cause if any, an empty {@ @link Optional} instance
+     *                     otherwise
+     * @return exception object
+     */
+    T create(OptionName optionName, StringToken optionValue, String formatString, Optional<Exception> cause);
+
+    static <T extends Exception> Builder<T> build() {
+        return new Builder<>();
+    }
+
+    static <T extends Exception> Builder<T> build(BiFunction<String, Throwable, T> ctor) {
+        final Builder<T> builder = build();
+        return builder.ctor(ctor);
+    }
+
+    static <T extends Exception> OptionValueExceptionFactory<T> unreachable() {
+        return (_, _, _, _) -> {
+            throw new UnsupportedOperationException();
+        };
+    }
+
+
+    @FunctionalInterface
+    interface ArgumentsMapper {
+        String[] apply(String formattedOptionName, StringToken optionValue);
+
+        static ArgumentsMapper appendArguments(ArgumentsMapper target, Object... args) {
+            return (optionName, optionValue) -> {
+                var arr = target.apply(optionName, optionValue);
+                return Stream.concat(Stream.of(arr), Stream.of(args).map(Object::toString)).toArray(String[]::new);
+            };
+        }
+    }
+
+
+    enum StandardArgumentsMapper implements ArgumentsMapper {
+        NAME_AND_VALUE((formattedOptionName, optionValue) -> {
+            return new String[] { formattedOptionName, optionValue.tokenizedString() };
+        }),
+        VALUE_AND_NAME((formattedOptionName, optionValue) -> {
+            return new String[] { optionValue.tokenizedString(), formattedOptionName };
+        }),
+        VALUE((formattedOptionName, optionValue) -> {
+            return new String[] { optionValue.tokenizedString() };
+        }),
+        NONE((formattedOptionName, optionValue) -> {
+            return new String[] {};
+        });
+
+        StandardArgumentsMapper(ArgumentsMapper impl) {
+            this.impl = Objects.requireNonNull(impl);
+        }
+
+        @Override
+        public String[] apply(String formattedOptionName, StringToken optionValue) {
+            return impl.apply(formattedOptionName, optionValue);
+        }
+
+        private final ArgumentsMapper impl;
+    }
+
+
+    static final class Builder<T extends Exception> {
+
+        OptionValueExceptionFactory<T> create() {
+            return OptionValueExceptionFactory.create(ctor,
+                    Optional.ofNullable(formatArgumentsTransformer).orElse(StandardArgumentsMapper.NAME_AND_VALUE),
+                    Optional.ofNullable(messageFormatter).orElse(I18N::format),
+                    printOptionPrefix);
+        }
+
+        Builder<T> messageFormatter(BiFunction<String, Object[], String> v) {
+            messageFormatter = v;
+            return this;
+        }
+
+        Builder<T> ctor(BiFunction<String, Throwable, T> v) {
+            ctor = v;
+            return this;
+        }
+
+        Builder<T> formatArgumentsTransformer(ArgumentsMapper v) {
+            formatArgumentsTransformer = v;
+            return this;
+        }
+
+        Builder<T> printOptionPrefix(boolean v) {
+            printOptionPrefix = v;
+            return this;
+        }
+
+        private BiFunction<String, Throwable, T> ctor;
+        private ArgumentsMapper formatArgumentsTransformer;
+        private BiFunction<String, Object[], String> messageFormatter;
+        private boolean printOptionPrefix = true;
+    }
+
+
+    private static <T extends Exception> OptionValueExceptionFactory<T> create(
+            BiFunction<String, Throwable, T> ctor,
+            ArgumentsMapper formatArgumentsTransformer,
+            BiFunction<String, Object[], String> messageFormatter,
+            boolean printOptionPrefix) {
+        Objects.requireNonNull(ctor);
+        Objects.requireNonNull(formatArgumentsTransformer);
+        Objects.requireNonNull(messageFormatter);
+
+        return new OptionValueExceptionFactory<>() {
+
+            @Override
+            public T create(OptionName optionName, StringToken optionValue, String formatString, Optional<Exception> cause) {
+                return Objects.requireNonNull(ctor.apply(createMessage(optionName, optionValue, formatString), cause.orElse(null)));
+            }
+
+            private String createMessage(OptionName optionName, StringToken optionValue, String formatString) {
+                Objects.requireNonNull(optionName);
+                Objects.requireNonNull(optionValue);
+                Objects.requireNonNull(formatString);
+
+                final String formattedOptionName;
+                if (printOptionPrefix) {
+                    formattedOptionName = optionName.formatForCommandLine();
+                } else {
+                    formattedOptionName = optionName.name();
+                }
+
+                final var args = Stream.of(formatArgumentsTransformer.apply(formattedOptionName, optionValue)).toArray();
+                return Objects.requireNonNull(messageFormatter.apply(formatString, args));
+            }
+        };
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Options.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Options.java
new file mode 100644
index 00000000000..975638ec801
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Options.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toUnmodifiableMap;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+
+/**
+ * R/O collection of objects associated with option identifiers.
+ * <p>
+ * Use {@link OptionValue} for typed access of the stored objects.
+ */
+public sealed interface Options permits
+        JOptSimpleOptionsBuilder.ExtendedOptions,
+        DefaultOptions {
+
+    Optional<Object> find(OptionIdentifier id);
+
+    boolean contains(OptionName optionName);
+
+    Set<? extends OptionIdentifier> ids();
+
+    default Optional<Object> find(WithOptionIdentifier withId) {
+        return find(withId.id());
+    }
+
+    default boolean contains(OptionIdentifier id) {
+        return find(id).isPresent();
+    }
+
+    default boolean contains(WithOptionIdentifier withId) {
+        return find(withId).isPresent();
+    }
+
+    default Options copyWithDefaultValue(WithOptionIdentifier withId, Object value) {
+        Objects.requireNonNull(value);
+        return copyWithDefaultValue(withId, () -> value);
+    }
+
+    default Options copyWithDefaultValue(WithOptionIdentifier withId, Supplier<Object> valueSupplier) {
+        Objects.requireNonNull(withId);
+        Objects.requireNonNull(valueSupplier);
+        if (contains(withId)) {
+            return this;
+        } else {
+            return copyWithParent(of(Map.of(withId, valueSupplier.get())));
+        }
+    }
+
+    default Options copyWithParent(Options other) {
+        return concat(this, other);
+    }
+
+    /**
+     * Creates a copy of this instance without the given option identifiers.
+     * <p>
+     * {@link #contains(OptionIdentifier)} called on the return instance with any of
+     * the given identifiers will return {@code false}.
+     * {@link #contains(OptionName)} called on the return instance with any option
+     * name of option specifications associated with given identifiers will return
+     * {@code false}.
+     *
+     * @param ids the identifiers to exclude
+     * @return a copy of this instance without the given option identifiers
+     */
+    default Options copyWithout(OptionIdentifier... ids) {
+        return copyWithout(List.of(ids));
+    }
+
+    /**
+     * Creates a copy of this instance without the given option identifiers.
+     * <p>
+     * Same as {@link #copyWithout(OptionIdentifier...)} but takes an
+     * {@code Iterable<OptionIdentifier>} instead of an {@code OptionIdentifier[]}.
+     *
+     * @param ids the identifiers to exclude
+     * @return a copy of this instance without the given option identifiers
+     */
+    Options copyWithout(Iterable<? extends OptionIdentifier> ids);
+
+    /**
+     * Creates a copy of this instance with all but the given option identifiers
+     * filtered out.
+     * <p>
+     * {@link #contains(OptionIdentifier)} called on the returned instance with any
+     * identifiers not in the given array will return {@code false}.
+     * {@link #contains(OptionName)} called on the returned instance with any name
+     * returned by {@link OptionSpec#name()} method called on option specifications
+     * of identifiers of type {@code Option} not from the given identifier array
+     * will return {@code false}.
+     *
+     * @param ids the identifiers to keep in the copy
+     * @return a copy of this instance with all but the given option identifiers
+     *         filtered out
+     */
+    default Options copyWith(OptionIdentifier... ids) {
+        return copyWith(List.of(ids));
+    }
+
+    /**
+     * Creates a copy of this instance with all but the given option identifiers
+     * filtered out.
+     * <p>
+     * Same as {@link #copyWith(OptionIdentifier...)} but takes an
+     * {@code Iterable<OptionIdentifier>} instead of an {@code OptionIdentifier[]}.
+     *
+     * @param ids the identifiers to keep in the copy
+     * @return a copy of this instance with all but the given option identifiers
+     *         filtered out
+     */
+    default Options copyWith(Iterable<? extends OptionIdentifier> ids) {
+        var excludes = new HashSet<>(ids());
+        ids.forEach(excludes::remove);
+        return copyWithout(excludes);
+    }
+
+    /**
+     * Returns a map representation of this instance.
+     * @return the map representation of this instance.
+     */
+    default Map<OptionIdentifier, Object> toMap() {
+        return StreamSupport.stream(ids().spliterator(), false).collect(toUnmodifiableMap(x -> x, id -> {
+            return find(id).orElseThrow();
+        }));
+    }
+
+    /**
+     * Creates {@code Options} instance from the map of objects with option
+     * identifiers and associated option values.
+     *
+     * @param map the map of objects with option identifiers and associated option
+     *            values
+     * @return a new {@code Options} instance
+     */
+    public static Options of(Map<? extends WithOptionIdentifier, Object> map) {
+        return new DefaultOptions(map);
+    }
+
+    /**
+     * Creates {@code Options} instance from the map of option identifiers and
+     * associated option values.
+     * <p>
+     * Similar to {@link #of(Map)} method, but {@link #contains(OptionName)} called
+     * on the return instance will always return {@code false}.
+     *
+     * @param map the map of option identifiers and associated option values
+     * @return a new {@code Options} instance
+     */
+    public static Options ofIDs(Map<OptionIdentifier, Object> map) {
+        return new DefaultOptions(map.entrySet().stream().collect(toUnmodifiableMap(e -> {
+            return new WithOptionIdentifierStub(e.getKey());
+        }, Map.Entry::getValue)));
+    }
+
+    public static Options concat(Options... options) {
+        return Stream.of(options).map(Options::toDefaultOptions).reduce(DefaultOptions.EMPTY, DefaultOptions::add);
+    }
+
+    private static DefaultOptions toDefaultOptions(Options v) {
+        switch (Objects.requireNonNull(v)) {
+            case DefaultOptions u -> {
+                return u;
+            }
+            case JOptSimpleOptionsBuilder.ExtendedOptions<?> u -> {
+                return u.toDefaultOptions();
+            }
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
new file mode 100644
index 00000000000..adba2f7abb4
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
@@ -0,0 +1,430 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.StandardOption.ADD_MODULES;
+import static jdk.jpackage.internal.cli.StandardOption.INPUT;
+import static jdk.jpackage.internal.cli.StandardOption.JLINK_OPTIONS;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_IMAGE_SIGN_IDENTITY;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_STORE;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_INSTALLER_SIGN_IDENTITY;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_SIGN;
+import static jdk.jpackage.internal.cli.StandardOption.MAC_SIGNING_KEY_NAME;
+import static jdk.jpackage.internal.cli.StandardOption.MAIN_JAR;
+import static jdk.jpackage.internal.cli.StandardOption.MODULE;
+import static jdk.jpackage.internal.cli.StandardOption.MODULE_PATH;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.cli.StandardOption.TYPE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingEnvironment;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.PackageType;
+
+/**
+ * Analyzes jpackage command line structure.
+ */
+final class OptionsAnalyzer {
+
+    OptionsAnalyzer(Options cmdline, BundlingEnvironment bundlingEnv) {
+        this(cmdline, getBundlingOperation(cmdline, OperatingSystem.current(), bundlingEnv), false);
+    }
+
+    OptionsAnalyzer(Options cmdline, StandardBundlingOperation bundlingOperation) {
+        this(cmdline, bundlingOperation, true);
+    }
+
+    private OptionsAnalyzer(Options cmdline, StandardBundlingOperation bundlingOperation, boolean typedOptions) {
+        this.cmdline = Objects.requireNonNull(cmdline);
+        this.bundlingOperation = Objects.requireNonNull(bundlingOperation);
+        this.typedOptions = typedOptions;
+        hasAppImage = PREDEFINED_APP_IMAGE.containsIn(cmdline);
+        isRuntimeInstaller = isRuntimeInstaller(cmdline, bundlingOperation);
+    }
+
+    BundlingOperationDescriptor bundlingOperation() {
+        return bundlingOperation.descriptor();
+    }
+
+    List<ExceptionWithOrigin> findErrors() {
+        if (hasAppImage && PREDEFINED_RUNTIME_IMAGE.containsIn(cmdline)) {
+            // Short circuit this erroneous case as bundling operation is ambiguous.
+            return List.of(new MutualExclusiveOptions(asOptionList(
+                    PREDEFINED_RUNTIME_IMAGE, PREDEFINED_APP_IMAGE)).validate(cmdline).orElseThrow());
+        }
+
+        final List<ExceptionWithOrigin> errors = new ArrayList<>();
+
+        StandardOption.options().stream()
+                .filter(cmdline::contains)
+                .map(Option::spec)
+                .filter(matchInScope(bundlingOperation).and(matchInScope(bundlingOperationModifiers())).negate())
+                .map(optionSpec -> {
+                    var err = onOutOfScopeOption(optionSpec);
+                    return errorWithOrigin(err, optionSpec);
+                }).forEach(errors::add);
+
+        MUTUAL_EXCLUSIVE_OPTIONS.stream().map(v -> {
+            return v.validate(cmdline);
+        }).filter(Optional::isPresent).map(Optional::orElseThrow).forEach(errors::add);
+
+        if (isBundlingAppImage() && Stream.of(MODULE, MAIN_JAR).noneMatch(ov -> {
+            return ov.containsIn(cmdline);
+        })) {
+            errors.add(errorWithOrigin(error("ERR_NoEntryPoint")));
+        }
+
+        if (bundlingOperation == StandardBundlingOperation.SIGN_MAC_APP_IMAGE && !MAC_SIGN.containsIn(cmdline)) {
+            errors.add(errorWithOrigin(error("error.app-image.mac-sign.required")));
+        }
+
+        if (isBuildingAppImage()) {
+            if (MAIN_JAR.containsIn(cmdline) && !INPUT.containsIn(cmdline)) {
+                errors.add(errorWithOrigin(error("error.no-input-parameter"), MAIN_JAR.getSpec()));
+            }
+
+            if (MODULE.containsIn(cmdline) && Stream.of(PREDEFINED_RUNTIME_IMAGE, MODULE_PATH).noneMatch(ov -> {
+                return ov.containsIn(cmdline);
+            })) {
+                errors.add(errorWithOrigin(error("ERR_MissingArgument2", PREDEFINED_RUNTIME_IMAGE, MODULE_PATH), MODULE.getSpec()));
+            }
+        }
+
+        if (typedOptions) {
+            errors.addAll(findErrorsInTypedOptions());
+        }
+
+        return errors;
+    }
+
+
+    record ExceptionWithOrigin(Exception error, List<? extends OptionSpec<?>> origin) {
+        ExceptionWithOrigin {
+            Objects.requireNonNull(error);
+            Objects.requireNonNull(origin);
+        }
+    }
+
+
+    static Stream<ExceptionWithOrigin> orderErrors(List<OptionName> optionNames, Collection<ExceptionWithOrigin> unorderedErrors) {
+        Objects.requireNonNull(optionNames);
+        Objects.requireNonNull(unorderedErrors);
+        return unorderedErrors.stream().sorted(Comparator.<ExceptionWithOrigin, Integer>comparing(err -> {
+            // Return minimal index of an option name from the origin of this error in the `optionNames` list.
+            return err.origin().stream()
+                    .map(OptionSpec::names)
+                    .flatMap(Collection::stream)
+                    .mapToInt(optionNames::indexOf)
+                    .filter(idx -> {
+                        return idx >= 0;
+                    }).min()
+                    // Errors without origin go first.
+                    .orElse(-1);
+        }));
+    }
+
+    private List<ExceptionWithOrigin> findErrorsInTypedOptions() {
+        final List<ExceptionWithOrigin> errors = new ArrayList<>();
+
+        if (MAC_APP_STORE.containsIn(cmdline)) {
+            JLINK_OPTIONS.ifPresentIn(cmdline, jlinkOptions -> {
+                if (!jlinkOptions.contains("--strip-native-commands")) {
+                    errors.add(errorWithOrigin(
+                            error("ERR_MissingJLinkOptMacAppStore", "--strip-native-commands"),
+                            Stream.of(MAC_APP_STORE, JLINK_OPTIONS).map(OptionValue::getSpec).toList()));
+                }
+            });
+        }
+
+        return errors;
+    }
+
+    private Set<BundlingOperationModifier> bundlingOperationModifiers() {
+        final Set<BundlingOperationModifier> modifiers = new HashSet<>();
+        if (isBundlingNativePackage()) {
+            if (hasAppImage) {
+                modifiers.add(BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE);
+            }
+            if (isRuntimeInstaller) {
+                modifiers.add(BundlingOperationModifier.BUNDLE_RUNTIME);
+            }
+        }
+        return modifiers;
+    }
+
+    /**
+     * Returns {@code true} if the output of the bundling operation is a new app
+     * image.
+     *
+     * @return {@code true} if the output of the bundling operation is a new app
+     *         image
+     */
+    private boolean isBundlingAppImage() {
+        return StandardBundlingOperation.CREATE_APP_IMAGE.contains(bundlingOperation);
+    }
+
+    /**
+     * Returns {@code true} if the output of the bundling operation is a new native
+     * package.
+     *
+     * @return {@code true} if the output of the bundling operation is a new native
+     *         package
+     */
+    private boolean isBundlingNativePackage() {
+        return StandardBundlingOperation.CREATE_NATIVE.contains(bundlingOperation);
+    }
+
+    /**
+     * Returns {@code true} if the output of the bundling operation is either a new
+     * app image or a new native package.
+     *
+     * @return {@code true} if the output of the bundling operation is either a new
+     *         app image or a new native package
+     */
+    private boolean isBundling() {
+        return StandardBundlingOperation.CREATE_BUNDLE.contains(bundlingOperation);
+    }
+
+    /**
+     * Returns {@code true} if the bundling operation will create an app image as
+     * an intermediate or final step.
+     *
+     * @return {@code true} if the bundling operation will create an app image as
+     *         an intermediate or final step
+     */
+    private boolean isBuildingAppImage() {
+        return bundlingOperationModifiers().isEmpty() && isBundling();
+    }
+
+    private RuntimeException onOutOfScopeOption(OptionSpec<?> optionSpec) {
+        Objects.requireNonNull(optionSpec);
+
+        if (optionSpec.scope().stream()
+                .filter(StandardBundlingOperation.class::isInstance)
+                .map(StandardBundlingOperation.class::cast)
+                .map(StandardBundlingOperation::os).noneMatch(bundlingOperation.os()::equals)) {
+            // The option is for different OS.
+            return error("ERR_UnsupportedOption", mapFormatArguments(optionSpec));
+        } else if (StandardBundlingOperation.SIGN_MAC_APP_IMAGE.equals(bundlingOperation)) {
+            // The option is not applicable when signing a predefined app image.
+            return error("ERR_InvalidOptionWithAppImageSigning", mapFormatArguments(optionSpec));
+        } else if (StandardBundlingOperation.CREATE_NATIVE.contains(bundlingOperation) && isRuntimeInstaller) {
+            // The option is not applicable when packaging of a runtime in a native bundle.
+            return error("ERR_NoInstallerEntryPoint", mapFormatArguments(optionSpec));
+        } else {
+            return error("ERR_InvalidTypeOption", mapFormatArguments(
+                    optionSpec, bundlingOperation.packageTypeValue()));
+        }
+    }
+
+    private Object[] mapFormatArguments(Object... args) {
+        return MessageFormatUtils.mapFormatArguments(cmdline, args);
+    }
+
+    private static StandardBundlingOperation getBundlingOperation(Options cmdline,
+            OperatingSystem os, BundlingEnvironment env) {
+        Objects.requireNonNull(cmdline);
+        Objects.requireNonNull(os);
+        Objects.requireNonNull(env);
+
+        final var typeOption = TYPE.getOption();
+
+        return cmdline.find(typeOption).map(obj -> {
+            if (obj instanceof PackageType packageType) {
+                return packageType;
+            } else {
+                return typeOption.spec()
+                        .converter().orElseThrow()
+                        .convert(typeOption.spec().name(), StringToken.of(((String[])obj)[0]))
+                        .orElseThrow();
+            }
+        }).map(packageType -> {
+            // Find standard bundling operations producing the given package type.
+            var bundlingOperations = Stream.of(StandardBundlingOperation.values()).filter(op -> {
+                return op.packageType().equals(packageType);
+            }).toList();
+
+            if (bundlingOperations.isEmpty()) {
+                // jpackage internal error: none of the standard bundling operations produce
+                // bundles of the `packageType`.
+                throw new AssertionError(String.format(
+                        "None of the standard bundling operations produce bundles of type [%s]",
+                        packageType));
+            } else if (bundlingOperations.size() == 1) {
+                return bundlingOperations.getFirst();
+            } else {
+                // Multiple standard bundling operations produce the `packageType` package type.
+                // Filter those that belong to the current OS
+                bundlingOperations = bundlingOperations.stream().filter(op -> {
+                    return op.os().equals(OperatingSystem.current());
+                }).toList();
+
+                if (bundlingOperations.isEmpty()) {
+                    // jpackage internal error: none of the standard bundling operations produce
+                    // bundles of the `packageType` on the current OS.
+                    throw new AssertionError(String.format(
+                            "None of the standard bundling operations produce bundles of type [%s] on %s",
+                            packageType, OperatingSystem.current()));
+                } else if (bundlingOperations.size() == 1) {
+                    return bundlingOperations.getFirst();
+                } else if (StandardBundlingOperation.MACOS_APP_IMAGE.containsAll(bundlingOperations)) {
+                    if (PREDEFINED_APP_IMAGE.containsIn(cmdline)) {
+                        return StandardBundlingOperation.SIGN_MAC_APP_IMAGE;
+                    } else {
+                        return StandardBundlingOperation.CREATE_MAC_APP_IMAGE;
+                    }
+                } else {
+                    // Pick the first one.
+                    return bundlingOperations.getFirst();
+                }
+            }
+        }).orElseGet(() -> {
+            // No package type specified, use the default bundling operation in the given environment.
+            return env.defaultOperation().map(descriptor -> {
+                return Stream.of(StandardBundlingOperation.values()).filter(op -> {
+                    return descriptor.equals(op.descriptor());
+                }).findFirst().orElseThrow(() -> {
+                    // jpackage internal error: none of the standard bundling operations match the
+                    // descriptor of the default bundling operation in the given environment.
+                    throw new AssertionError(String.format(
+                            "None of the standard bundling operations match bundling operation descriptor [%s]",
+                            descriptor));
+                });
+            }).orElseThrow(() -> {
+                throw new ConfigException(
+                        I18N.format("error.undefined-default-bundling-operation"),
+                        I18N.format("error.undefined-default-bundling-operation.advice", TYPE.getSpec().name().formatForCommandLine()));
+            });
+        });
+    }
+
+    private static boolean isRuntimeInstaller(Options cmdline, OptionScope bundlingOperation) {
+        return StandardBundlingOperation.CREATE_BUNDLE.contains(bundlingOperation)
+                && PREDEFINED_RUNTIME_IMAGE.containsIn(cmdline)
+                && !PREDEFINED_APP_IMAGE.containsIn(cmdline)
+                && !MAIN_JAR.containsIn(cmdline)
+                && !MODULE.containsIn(cmdline);
+    }
+
+    private static Predicate<OptionSpec<?>> matchInScope(Collection<? extends OptionScope> scope) {
+        Objects.requireNonNull(scope);
+        return optionSpec -> {
+            return optionSpec.scope().containsAll(scope);
+        };
+    }
+
+    private static Predicate<OptionSpec<?>> matchInScope(OptionScope... scope) {
+        return matchInScope(List.of(scope));
+    }
+
+    private static List<Option> asOptionList(OptionValue<?>... options) {
+        return Stream.of(options).map(OptionValue::getOption).toList();
+    }
+
+    private static RuntimeException error(String formatId, Object ... args) {
+        return new JPackageException(MessageFormatUtils.createMessage(formatId, args));
+    }
+
+    private static ExceptionWithOrigin errorWithOrigin(Exception error, OptionSpec<?>... origin) {
+        return errorWithOrigin(error, List.of(origin));
+    }
+
+    private static ExceptionWithOrigin errorWithOrigin(Exception error, List<? extends OptionSpec<?>> origin) {
+        return new ExceptionWithOrigin(error, origin);
+    }
+
+
+    private record MutualExclusiveOptions(List<Option> options, Function<Object[], RuntimeException> createException) {
+        MutualExclusiveOptions {
+            options.forEach(Objects::requireNonNull);
+            if (options.size() < 2) {
+                throw new IllegalArgumentException();
+            }
+            Objects.requireNonNull(createException);
+        }
+
+        Optional<ExceptionWithOrigin> validate(Options cmdline) {
+            final var detectedOptions = options.stream().filter(cmdline::contains).toList();
+            if (detectedOptions.size() > 1) {
+                final var errMesageformatArgs = detectedOptions.stream().map(Option::spec).map(optionSpec -> {
+                    return MessageFormatUtils.mapFormatArguments(cmdline, optionSpec)[0];
+                }).toArray();
+                return Optional.of(errorWithOrigin(
+                        createException.apply(errMesageformatArgs),
+                        detectedOptions.stream().map(Option::spec).toList()));
+            } else {
+                return Optional.empty();
+            }
+        }
+
+        MutualExclusiveOptions(List<Option> options) {
+            this(options, args -> {
+                return error("ERR_MutuallyExclusiveOptions", args);
+            });
+        }
+    }
+
+
+    private final Options cmdline;
+    private final StandardBundlingOperation bundlingOperation;
+    private final boolean typedOptions;
+    private final boolean hasAppImage;
+    private final boolean isRuntimeInstaller;
+
+    private static final List<MutualExclusiveOptions> MUTUAL_EXCLUSIVE_OPTIONS;
+
+    static {
+        final List<MutualExclusiveOptions> config = new ArrayList<>();
+
+        Stream.of(
+                asOptionList(PREDEFINED_RUNTIME_IMAGE, PREDEFINED_APP_IMAGE),
+                asOptionList(PREDEFINED_RUNTIME_IMAGE, ADD_MODULES),
+                asOptionList(PREDEFINED_RUNTIME_IMAGE, JLINK_OPTIONS),
+                asOptionList(MAC_SIGNING_KEY_NAME, MAC_APP_IMAGE_SIGN_IDENTITY),
+                asOptionList(MAC_SIGNING_KEY_NAME, MAC_INSTALLER_SIGN_IDENTITY)
+        ).map(MutualExclusiveOptions::new).forEach(config::add);
+
+        config.add(new MutualExclusiveOptions(asOptionList(MODULE, MAIN_JAR), _ -> {
+            return error("ERR_BothMainJarAndModule");
+        }));
+
+        MUTUAL_EXCLUSIVE_OPTIONS = List.copyOf(config);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
new file mode 100644
index 00000000000..1bc5c36989f
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
@@ -0,0 +1,428 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.cli.Option.fromOptionSpecPredicate;
+import static jdk.jpackage.internal.cli.StandardOption.ADDITIONAL_LAUNCHERS;
+import static jdk.jpackage.internal.cli.StandardOption.platformOption;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.ConvertedOptionsBuilder;
+import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.OptionsBuilder;
+import jdk.jpackage.internal.model.BundlingEnvironment;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.util.Result;
+
+/**
+ * Processes jpackage command line.
+ */
+final class OptionsProcessor {
+
+    OptionsProcessor(OptionsBuilder optionsBuilder, CliBundlingEnvironment bundlingEnv) {
+        this.optionsBuilder = Objects.requireNonNull(optionsBuilder);
+        this.bundlingEnv = Objects.requireNonNull(bundlingEnv);
+    }
+
+    record ValidatedOptions(Options options, BundlingOperationDescriptor bundlingOperation) {
+        ValidatedOptions {
+            Objects.requireNonNull(options);
+            Objects.requireNonNull(bundlingOperation);
+        }
+
+        String bundleTypeName() {
+            return bundlingOperation.bundleType();
+        }
+    }
+
+    Result<ValidatedOptions> validate() {
+        final Collection<Exception> allErrors = new ArrayList<>();
+
+        // Check for non-option arguments.
+        validateNonOptionArguments(optionsBuilder).ifPresent(allErrors::add);
+
+        // Parse the command line. The result is Options container of strings.
+        final var untypedOptions = optionsBuilder.create();
+
+        // Create command line structure analyzer.
+        final var analyzerResult = Result.create(() -> new OptionsAnalyzer(untypedOptions, bundlingEnv));
+        if (analyzerResult.hasErrors()) {
+            // Failed to derive the bundling operation from the command line.
+            allErrors.addAll(analyzerResult.mapErrors().errors());
+            return Result.ofErrors(allErrors);
+        }
+
+        final var analyzer = analyzerResult.orElseThrow();
+
+        // Validate the bundling operation.
+        final var bundlingOperationResult = validateBundlingOperation(analyzer.bundlingOperation()).map(op -> {
+            return Map.entry(StandardOption.BUNDLING_OPERATION_DESCRIPTOR, op);
+        });
+
+        bundlingOperationResult.peekErrors(allErrors::addAll);
+
+        // Validate command line structure.
+        final var structureErrors = analyzer.findErrors();
+        if (!structureErrors.isEmpty()) {
+            OptionsAnalyzer.orderErrors(
+                    optionsBuilder.detectedOptions(),
+                    structureErrors
+            ).map(err -> err.error()).forEach(allErrors::add);
+            return Result.ofErrors(allErrors);
+        }
+
+        final Result<ValidatedOptions> validatedOptionsResult = optionsBuilder
+                // Command line structure is valid.
+                // Run value converters that will convert strings into objects (e.g.: String -> Path)
+                .convertedOptions().map(ConvertedOptionsBuilder::create).map(convertedOptions -> {
+                    return new ValidatedOptions(convertedOptions, analyzer.bundlingOperation());
+                });
+
+        validatedOptionsResult.peekErrors(allErrors::addAll);
+
+        if (validatedOptionsResult.hasErrors()) {
+            // There are errors in the command line.
+            // Inspect additional launcher names to see if there are duplicates.
+            final var addLaunchers = untypedOptions.find(StandardOption.ADD_LAUNCHER_INTERNAL.id())
+                    .map(String[].class::cast)
+                    .map(Stream::of)
+                    .orElseGet(Stream::of).map(addLauncherStr -> {
+                        return addLauncherStr.split("=", 2)[0];
+                    }).map(addLauncherName -> {
+                        return Options.of(Map.of(StandardOption.NAME, addLauncherName));
+                    }).toArray(Options[]::new);
+
+            Map<WithOptionIdentifier, Object> options = new HashMap<>();
+            options.put(ADD_LAUNCHER_INTERNAL, addLaunchers);
+            untypedOptions.find(StandardOption.NAME.id()).ifPresent(strArray -> {
+                options.put(StandardOption.NAME, ((String[])strArray)[0]);
+            });
+
+            var result = validateAdditionalLaunchers(Options.of(options));
+            result.peekErrors(allErrors::addAll);
+        }
+
+        final var validatedAddLaunchersResult = validatedOptionsResult.value()
+                .map(ValidatedOptions::options)
+                .map(this::validateAdditionalLaunchers).map(result -> {
+                    return result.map(addLaunchers -> {
+                        return Map.entry(ADDITIONAL_LAUNCHERS, addLaunchers);
+                    });
+                }).orElseGet(() -> {
+                    return Result.ofValue(Map.entry(ADDITIONAL_LAUNCHERS, List.of()));
+                });
+
+        validatedAddLaunchersResult.peekErrors(allErrors::addAll);
+
+        final var validatedFaResult = Result.ofValue(Map.entry(
+                StandardOption.FILE_ASSOCIATIONS,
+                validatedOptionsResult.value()
+                        .map(ValidatedOptions::options)
+                        .map(FILE_ASSOCIATIONS_INTERNAL::getFrom)
+                        .orElseGet(List::of)
+        ));
+
+        validatedOptionsResult.value().ifPresent(validatedOptions -> {
+            // Second pass: analyze command line options with values converted from strings.
+            var errors = new OptionsAnalyzer(validatedOptions.options(),
+                    StandardBundlingOperation.valueOf(validatedOptions.bundlingOperation()).orElseThrow(() -> {
+                        // The bundle operation descriptor should correspond to one of the standard bundling operations.
+                        throw new AssertionError();
+                    })).findErrors();
+            OptionsAnalyzer.orderErrors(
+                    optionsBuilder.detectedOptions(),
+                    errors
+            ).map(err -> err.error()).forEach(allErrors::add);
+        });
+
+        if (!allErrors.isEmpty()) {
+            return Result.ofErrors(allErrors);
+        } else {
+            // No errors.
+            // Add synthesized option values and return the result.
+            final Map<WithOptionIdentifier, Object> extra = Stream.of(
+                    bundlingOperationResult,
+                    validatedAddLaunchersResult,
+                    validatedFaResult
+            ).map(Result::orElseThrow).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+            return validatedOptionsResult.map(validatedOptions -> {
+                return new ValidatedOptions(
+                        Options.concat(
+                                Options.of(extra),
+                                validatedOptions.options().copyWithout(ADD_LAUNCHER_INTERNAL.id(), FILE_ASSOCIATIONS_INTERNAL.id())),
+                        validatedOptions.bundlingOperation());
+            });
+        }
+    }
+
+    private static Optional<? extends Exception> validateNonOptionArguments(OptionsBuilder optionsBuilder) {
+        final var nonOptionArguments = optionsBuilder.nonOptionArguments();
+        if (nonOptionArguments.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(new JPackageException(I18N.format("error.non-option-arguments", nonOptionArguments.size())));
+        }
+    }
+
+    private Result<BundlingOperationDescriptor> validateBundlingOperation(BundlingOperationDescriptor bundlingOperation) {
+        Objects.requireNonNull(bundlingOperation);
+        try {
+            var errors = bundlingEnv.configurationErrors(bundlingOperation);
+            if (errors.isEmpty()) {
+                return Result.ofValue(bundlingOperation);
+            } else {
+                return Result.ofErrors(errors);
+            }
+        } catch (NoSuchElementException ex) {
+            // Bundling environment doesn't recognize the descriptor of a bundling operation.
+            return Result.ofError(new JPackageException(I18N.format("ERR_InvalidInstallerType", bundlingOperation.bundleType())));
+        }
+    }
+
+    Collection<? extends Exception> runBundling(ValidatedOptions validatedOptions) {
+        try {
+            bundlingEnv.createBundle(validatedOptions.bundlingOperation(), validatedOptions.options());
+            return List.of();
+        } catch (Exception ex) {
+            return List.of(ex);
+        }
+    }
+
+    /**
+     * Loads property file and processes properties as a command line.
+     * <p>
+     * Unrecognized options will be silently ignored.
+     *
+     * @param file             the source property file
+     * @param options          the recognized options
+     * @param optionSpecMapper optional option spec mapper
+     * @return {@link Options} instance containing validated property values or the list
+     *         of errors occured during option values processing
+     * @throws UncheckedIOException if an I/O error occurs
+     */
+    static Result<Options> processPropertyFile(Path file, Collection<Option> options,
+            Optional<UnaryOperator<OptionSpec<?>>> optionSpecMapper) {
+        final var props = new Properties();
+        try (var in = Files.newBufferedReader(file)) {
+            props.load(in);
+        } catch (IOException ex) {
+            return Result.ofError(ex);
+        }
+
+        // Convert the property file into command line arguments.
+        // Silently ignore unknown properties.
+        final var args = options.stream().map(option -> {
+            return option.spec().names().stream().map(optionName -> {
+                return Optional.ofNullable(props.getProperty(optionName.name())).map(stringOptionValue -> {
+                    return Stream.of(optionName.formatForCommandLine(), stringOptionValue);
+                }).orElse(null);
+            }).flatMap(x -> x);
+        }).flatMap(x -> x).filter(Objects::nonNull).toArray(String[]::new);
+
+        // Feed the contents of the property file as a command line arguments to the command line parser.
+        final var builder = new JOptSimpleOptionsBuilder().options(options);
+
+        optionSpecMapper.ifPresent(builder::optionSpecMapper);
+
+        final var result = builder.create().apply(args)
+                .flatMap(OptionsBuilder::convertedOptions)
+                .map(ConvertedOptionsBuilder::create);
+
+        return result.map(cmdline -> {
+            return cmdline.copyWithDefaultValue(StandardOption.SOURCE_PROPERY_FILE, file);
+        });
+    }
+
+    static UnaryOperator<OptionSpec<?>> optionSpecMapper(OperatingSystem os, BundlingEnvironment bundlingEnv) {
+        Objects.requireNonNull(os);
+        Objects.requireNonNull(bundlingEnv);
+
+        var context = new StandardOptionContext(os);
+
+        return optionSpec -> {
+            if (optionSpec.name().equals(StandardOption.ADD_LAUNCHER_INTERNAL.getSpec().name())) {
+                final var options = filterForPlatform(os, StandardOption.launcherOptions());
+                return optionSpec.copyWithConverter(new OptionsConverter<>(addLauncher -> {
+                    var localContext = context.forFile(addLauncher.propertyFile());
+                    var optionValues = processPropertyFile(addLauncher.propertyFile(), options, Optional.of(localContext::mapOptionSpec));
+                    return optionValues.map(o -> {
+                        return o.copyWithParent(Options.of(Map.of(StandardOption.NAME, addLauncher.name())));
+                    });
+                }, StandardOption.ADD_LAUNCHER_INTERNAL.getSpec()));
+            } else if (optionSpec.name().equals(StandardOption.FILE_ASSOCIATIONS_INTERNAL.getSpec().name())) {
+                final var options = filterForPlatform(os, StandardFaOption.options());
+                return optionSpec.copyWithConverter(new OptionsConverter<>(fa -> {
+                    var localContext = context.forFile(fa);
+                    return processPropertyFile(fa, options, Optional.of(localContext::mapOptionSpec));
+                }, StandardOption.FILE_ASSOCIATIONS_INTERNAL.getSpec()));
+            } else {
+                return context.mapOptionSpec(optionSpec);
+            }
+        };
+    }
+
+    private Result<List<Options>> validateAdditionalLaunchers(Options cmdline) {
+
+        final var addLaunchers = ADD_LAUNCHER_INTERNAL.getFrom(cmdline);
+
+        final List<Exception> errors = new ArrayList<>();
+
+        // Count launcher names.
+        final var names = Stream.concat(
+                StandardOption.NAME.findIn(cmdline).stream(),
+                addLaunchers.stream().map(StandardOption.NAME::getFrom)
+        ).collect(groupingBy(x -> x, counting()));
+
+        // Sort duplicated names alphabetically
+        names.entrySet().stream().filter(e -> {
+            // Filter duplicated names.
+            return e.getValue() > 1;
+        }).map(Map.Entry::getKey).sorted().map(name -> {
+            return new JPackageException(I18N.format("error.launcher-duplicate-name", name));
+        }).forEach(errors::add);
+
+        if (!errors.isEmpty()) {
+            return Result.ofErrors(errors);
+        } else {
+            return Result.ofValue(addLaunchers.stream().map(addLauncherOptionValues -> {
+
+                //
+                // For additional launcher:
+                //  - Override name.
+                //  - Ignore icon configured for the app/main launcher.
+                //  - Ignore shortcuts configured for the app/main launcher.
+                //  - If the additional launcher is modular, delete non-modular options of the main launcher.
+                //  - If the additional launcher is non-modular, delete modular options of the main launcher.
+                //  - Combine other option values with the main option values.
+                //
+
+                List<OptionValue<?>> excludes = new ArrayList<>();
+                excludes.add(StandardOption.ICON);
+                excludes.add(StandardOption.LINUX_SHORTCUT_HINT);
+                excludes.add(StandardOption.WIN_MENU_HINT);
+                excludes.add(StandardOption.WIN_SHORTCUT_HINT);
+                if (StandardOption.MODULE.containsIn(addLauncherOptionValues)) {
+                    excludes.add(StandardOption.MAIN_JAR);
+                    excludes.add(StandardOption.APPCLASS);
+                }
+                if (StandardOption.MAIN_JAR.containsIn(addLauncherOptionValues)) {
+                    excludes.add(StandardOption.MODULE);
+                }
+
+                return Options.concat(
+                        addLauncherOptionValues,
+                        cmdline.copyWithout(excludes.stream().map(WithOptionIdentifier::id).toList()));
+            }).toList());
+        }
+    }
+
+    private static Collection<Option> filterForPlatform(OperatingSystem os, Collection<Option> options) {
+        return options.stream().filter(fromOptionSpecPredicate(platformOption(os))).toList();
+    }
+
+
+    private static final class OptionsConverter<T> implements OptionArrayValueConverter<Options> {
+
+        OptionsConverter(Function<T, Result<Options>> mapper, OptionSpec<T[]> optionSpec) {
+            this(mapper, optionSpec.<T>arrayValueConverter().orElseThrow());
+        }
+
+        OptionsConverter(Function<T, Result<Options>> mapper, OptionArrayValueConverter<T> converter) {
+            this.mapper = Objects.requireNonNull(mapper);
+            this.converter = Objects.requireNonNull(converter);
+        }
+
+        static <T> OptionValue<List<Options>> optionValue(OptionIdentifier id) {
+            return OptionValue.<Options[]>build().id(id).to(List::of).defaultValue(List.of()).create();
+        }
+
+        @Override
+        public Result<Options[]> convert(OptionName optionName, StringToken optionValue) {
+            return converter.convert(optionName, optionValue).flatMap(arr -> {
+                return Stream.of(arr).map(mapper).reduce(Result.<List<Options>>ofValue(new ArrayList<>()), (result, o) -> {
+                    if (Result.allHaveValues(result, o)) {
+                        return result.map(v -> {
+                            v.add(o.orElseThrow());
+                            return v;
+                        });
+                    } else {
+                        return o.mapErrors();
+                    }
+                }, (x, y) -> {
+                    var errors = Stream.of(x, y).map(Result::errors).flatMap(Collection::stream).toList();
+                    if (errors.isEmpty()) {
+                        return Result.ofValue(Stream.of(x, y).map(Result::orElseThrow).flatMap(Collection::stream).toList());
+                    } else {
+                        return Result.ofErrors(errors);
+                    }
+                }).map(v -> v.toArray(Options[]::new));
+            });
+        }
+
+        @Override
+        public Class<Options[]> valueType() {
+            return Options[].class;
+        }
+
+        @Override
+        public String[] tokenize(String str) {
+            return converter.tokenize(str);
+        }
+
+        private final OptionArrayValueConverter<T> converter;
+        private final Function<T, Result<Options>> mapper;
+    }
+
+
+    private final JOptSimpleOptionsBuilder.OptionsBuilder optionsBuilder;
+    private final CliBundlingEnvironment bundlingEnv;
+
+    private static final OptionValue<List<Options>> ADD_LAUNCHER_INTERNAL =
+            OptionsConverter.optionValue(StandardOption.ADD_LAUNCHER_INTERNAL.id());
+
+    private static final OptionValue<List<Options>> FILE_ASSOCIATIONS_INTERNAL =
+            OptionsConverter.optionValue(StandardOption.FILE_ASSOCIATIONS_INTERNAL.id());
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
new file mode 100644
index 00000000000..95d49e722d6
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.fromOptionName;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.LauncherShortcut;
+
+/**
+ * jpackage options in the app image (".jpackage.xml") file
+ */
+public final class StandardAppImageFileOption {
+
+    private StandardAppImageFileOption() {
+    }
+
+
+    public enum AppImageFileOptionScope implements OptionScope {
+        APP,
+        LAUNCHER,
+        ;
+
+        public Stream<? extends OptionValue<?>> options(OperatingSystem os) {
+            var scope = StandardBundlingOperation.ofPlatform(os).collect(toSet());
+            return options().filter(ov -> {
+                return !Collections.disjoint(ov.getSpec().scope(), scope);
+            });
+        }
+
+        public Stream<? extends OptionValue<?>> options() {
+            return Utils.getOptionsWithSpecs(StandardAppImageFileOption.class).filter(ov -> {
+                return ov.getSpec().scope().contains(AppImageFileOptionScope.this);
+            });
+        }
+
+        public Options parse(Path appImageFile, Map<String, String> properties, OperatingSystem os) throws InvalidOptionValueException {
+            return parseProperties(appImageFile, properties, os, options().map(OptionValue::getOption));
+        }
+    }
+
+
+    private enum MandatoryOption implements OptionScope {
+        VALUE;
+    }
+
+
+    /**
+     * The name of a launcher.
+     */
+    public static final OptionValue<String> LAUNCHER_NAME = stringOption("name")
+            .inScope(AppImageFileOptionScope.LAUNCHER)
+            .inScope(MandatoryOption.VALUE)
+            .toOptionValueBuilder().id(StandardOption.NAME.id()).create();
+
+    /**
+     * The version of the application.
+     */
+    public static final OptionValue<String> APP_VERSION = stringOption("app-version")
+            .inScope(AppImageFileOptionScope.APP)
+            .inScope(MandatoryOption.VALUE)
+            .toOptionValueBuilder().id(StandardOption.APP_VERSION.id()).create();
+
+    /**
+     * Should install a launcher as a service?
+     */
+    public static final OptionValue<Boolean> LAUNCHER_AS_SERVICE = booleanOption("service")
+            .inScope(AppImageFileOptionScope.LAUNCHER)
+            .toOptionValueBuilder().id(StandardOption.LAUNCHER_AS_SERVICE.id()).create();
+
+
+    //
+    // Linux-specific
+    //
+
+    /**
+     * Configuration of the shortcut for a launcher. Linux-only.
+     */
+    public static final OptionValue<LauncherShortcut> LINUX_LAUNCHER_SHORTCUT = launcherShortcutOption("linux-shortcut")
+            .inScope(AppImageFileOptionScope.LAUNCHER)
+            .toOptionValueBuilder().id(StandardOption.LINUX_SHORTCUT_HINT.id()).create();
+
+
+    //
+    // Windows-specific
+    //
+
+    /**
+     * Configuration of the desktop shortcut for a launcher. Windows-only.
+     */
+    public static final OptionValue<LauncherShortcut> WIN_LAUNCHER_DESKTOP_SHORTCUT = launcherShortcutOption("win-shortcut")
+            .inScope(AppImageFileOptionScope.LAUNCHER)
+            .toOptionValueBuilder().id(StandardOption.WIN_SHORTCUT_HINT.id()).create();
+
+    /**
+     * Configuration of the start menu shortcut for a launcher. Windows-only.
+     */
+    public static final OptionValue<LauncherShortcut> WIN_LAUNCHER_MENU_SHORTCUT = launcherShortcutOption("win-menu")
+            .inScope(AppImageFileOptionScope.LAUNCHER)
+            .toOptionValueBuilder().id(StandardOption.WIN_MENU_HINT.id()).create();
+
+
+    //
+    // macOS-specific
+    //
+
+    /**
+     * Fully-qualified name of the main class of the main launcher.
+     */
+    public static final OptionValue<String> MAC_MAIN_CLASS = stringOption("main-class")
+            .inScope(AppImageFileOptionScope.APP)
+            .inScope(MandatoryOption.VALUE)
+            .mutate(setPlatformScope(OperatingSystem.MACOS))
+            .validator(StandardValidator.IS_CLASSNAME)
+            // In case of validation failure, report it with
+            // an exception of type InvalidOptionValueException with empty message.
+            .validatorExceptionFactory(
+                    OptionValueExceptionFactory.build(InvalidOptionValueException::new)
+                            .messageFormatter((_, _) -> "") // just a stub
+                            .create()
+            )
+            .validatorExceptionFormatString("") // just a stub, not used
+            .toOptionValueBuilder().id(StandardOption.APPCLASS.id()).create();
+
+    /**
+     * Is an application is for the App Store. macOS-only.
+     */
+    public static final OptionValue<Boolean> MAC_APP_STORE = booleanOption("app-store")
+            .inScope(AppImageFileOptionScope.APP)
+            .mutate(setPlatformScope(OperatingSystem.MACOS))
+            .toOptionValueBuilder().id(StandardOption.MAC_APP_STORE.id()).create();
+
+    /**
+     * Is an application image is signed. macOS-only.
+     */
+    public static final OptionValue<Boolean> MAC_SIGNED = booleanOption("signed")
+            .inScope(AppImageFileOptionScope.APP)
+            .mutate(setPlatformScope(OperatingSystem.MACOS))
+            .toOptionValueBuilder().id(StandardOption.MAC_SIGN.id()).create();
+
+
+    public static final class InvalidOptionValueException extends RuntimeException {
+
+        InvalidOptionValueException(String str, Throwable t) {
+            super(str, t);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    public static final class MissingMandatoryOptionException extends RuntimeException {
+
+        MissingMandatoryOptionException(String str) {
+            super(str);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    private static <T> OptionSpecBuilder<T> option(String name, Class<? extends T> valueType) {
+        return OptionSpecBuilder.<T>create(valueType)
+                .name(Objects.requireNonNull(name))
+                .description("")
+                .scope(fromOptionName(name))
+                .valuePattern("");
+    }
+
+    private static OptionSpecBuilder<String> stringOption(String name) {
+        return option(name, String.class).mutate(StandardOption.stringOptionMutator());
+    }
+
+    private static OptionSpecBuilder<Boolean> booleanOption(String name) {
+        return option(name, Boolean.class).mutate(StandardOption.booleanOptionMutator());
+    }
+
+    private static OptionSpecBuilder<LauncherShortcut> launcherShortcutOption(String name) {
+        return option(name, LauncherShortcut.class).mutate(StandardOption.launcherShortcutOptionMutator());
+    }
+
+    private static Options parseProperties(
+            Path appImageFile,
+            Map<String, String> properties,
+            OperatingSystem os,
+            Stream<Option> options) throws InvalidOptionValueException, MissingMandatoryOptionException {
+
+        var scope = StandardBundlingOperation.ofPlatform(os).collect(toSet());
+
+        var context = new StandardOptionContext(os).forFile(appImageFile);
+
+        return Options.of(options.filter(option -> {
+            return !Collections.disjoint(option.spec().scope(), scope);
+        }).map(option -> {
+            var spec = context.mapOptionSpec(option.spec());
+            var strValue = Optional.ofNullable(properties.get(spec.name().name()));
+
+            if (strValue.isEmpty() && spec.scope().contains(MandatoryOption.VALUE)) {
+                throw new MissingMandatoryOptionException(String.format("Missing mandatory '%s' property", spec.name().name()));
+            }
+
+            return strValue.map(v -> {
+                return spec.converter().orElseThrow().convert(spec.name(), StringToken.of(v)).orElseThrow();
+            }).map(v -> {
+                return Map.entry(option, v);
+            });
+        }).filter(Optional::isPresent).map(Optional::get).collect(toMap(Map.Entry::getKey, Map.Entry::getValue)));
+    }
+
+    private static <T> Consumer<OptionSpecBuilder<T>> setPlatformScope(OperatingSystem os) {
+        return builder -> {
+            builder.outOfScope(StandardBundlingOperation.values()).inScope(StandardBundlingOperation.ofPlatform(os).toList());
+        };
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
new file mode 100644
index 00000000000..988589884cc
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.model.AppImagePackageType.APP_IMAGE;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.StandardPackageType;
+import jdk.jpackage.internal.util.SetBuilder;
+
+
+/**
+ * Standard jpackage operations.
+ */
+public enum StandardBundlingOperation implements BundlingOperationOptionScope {
+    CREATE_WIN_APP_IMAGE(APP_IMAGE, "^(?!(linux-|mac-|win-exe-|win-msi-))", OperatingSystem.WINDOWS),
+    CREATE_LINUX_APP_IMAGE(APP_IMAGE, "^(?!(win-|mac-|linux-rpm-|linux-deb-))", OperatingSystem.LINUX),
+    CREATE_MAC_APP_IMAGE(APP_IMAGE, "^(?!(linux-|win-|mac-dmg-|mac-pkg-))", OperatingSystem.MACOS),
+    CREATE_WIN_EXE(StandardPackageType.WIN_EXE, "^(?!(linux-|mac-|win-msi-))", OperatingSystem.WINDOWS),
+    CREATE_WIN_MSI(StandardPackageType.WIN_MSI, "^(?!(linux-|mac-|win-exe-))", OperatingSystem.WINDOWS),
+    CREATE_LINUX_RPM(StandardPackageType.LINUX_RPM, "^(?!(win-|mac-|linux-deb-))", OperatingSystem.LINUX),
+    CREATE_LINUX_DEB(StandardPackageType.LINUX_DEB, "^(?!(win-|mac-|linux-rpm-))", OperatingSystem.LINUX),
+    CREATE_MAC_PKG(StandardPackageType.MAC_PKG, "^(?!(linux-|win-|mac-dmg-))", OperatingSystem.MACOS),
+    CREATE_MAC_DMG(StandardPackageType.MAC_DMG, "^(?!(linux-|win-|mac-pkg-))", OperatingSystem.MACOS),
+    SIGN_MAC_APP_IMAGE(APP_IMAGE, OperatingSystem.MACOS, "sign");
+
+    StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os, String descriptorVerb) {
+        this.packageType = Objects.requireNonNull(packageType);
+        optionNamePredicate = Pattern.compile(optionNameRegexp).asPredicate();
+        this.os = Objects.requireNonNull(os);
+        this.descriptorVerb = Objects.requireNonNull(descriptorVerb);
+    }
+
+    StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os) {
+        this(packageType, optionNameRegexp, os, "create");
+    }
+
+    StandardBundlingOperation(PackageType packageType, OperatingSystem os, String descriptorVerb) {
+        this.packageType = Objects.requireNonNull(packageType);
+        optionNamePredicate = v -> false;
+        this.os = Objects.requireNonNull(os);
+        this.descriptorVerb = Objects.requireNonNull(descriptorVerb);
+    }
+
+    OperatingSystem os() {
+        return os;
+    }
+
+    public String packageTypeValue() {
+        if (packageType.equals(APP_IMAGE)) {
+            return "app-image";
+        } else {
+            return ((StandardPackageType)packageType).suffix().substring(1);
+        }
+    }
+
+    public PackageType packageType() {
+        return packageType;
+    }
+
+    @Override
+    public BundlingOperationDescriptor descriptor() {
+        return new BundlingOperationDescriptor(os(), packageTypeValue(), descriptorVerb);
+    }
+
+    public static Optional<StandardBundlingOperation> valueOf(BundlingOperationDescriptor descriptor) {
+        Objects.requireNonNull(descriptor);
+        return Stream.of(values()).filter(op -> {
+            return op.descriptor().equals(descriptor);
+        }).findFirst();
+    }
+
+    static Stream<StandardBundlingOperation> ofPlatform(OperatingSystem os) {
+        return Stream.of(values()).filter(platform(os));
+    }
+
+    static Set<BundlingOperationOptionScope> fromOptionName(String optionName) {
+        Objects.requireNonNull(optionName);
+        return Stream.of(StandardBundlingOperation.values()).filter(v -> {
+            return v.optionNamePredicate.test(optionName);
+        }).collect(Collectors.toUnmodifiableSet());
+    }
+
+    static Predicate<StandardBundlingOperation> platform(OperatingSystem os) {
+        Objects.requireNonNull(os);
+        return op -> {
+            return  op.os() == os;
+        };
+    }
+
+    static Stream<StandardBundlingOperation> narrow(Stream<OptionScope> scope) {
+        return scope.filter(StandardBundlingOperation.class::isInstance).map(StandardBundlingOperation.class::cast);
+    }
+
+    static final Set<BundlingOperationOptionScope> WINDOWS_CREATE_BUNDLE = Set.of(
+            CREATE_WIN_APP_IMAGE, CREATE_WIN_MSI, CREATE_WIN_EXE);
+
+    static final Set<BundlingOperationOptionScope> LINUX_CREATE_BUNDLE = Set.of(
+            CREATE_LINUX_APP_IMAGE, CREATE_LINUX_RPM, CREATE_LINUX_DEB);
+
+    static final Set<BundlingOperationOptionScope> MACOS_CREATE_BUNDLE = Set.of(
+            CREATE_MAC_APP_IMAGE, CREATE_MAC_DMG, CREATE_MAC_PKG);
+
+    static final Set<BundlingOperationOptionScope> WINDOWS_CREATE_NATIVE = Set.of(
+            CREATE_WIN_MSI, CREATE_WIN_EXE);
+
+    static final Set<BundlingOperationOptionScope> LINUX_CREATE_NATIVE = Set.of(
+            CREATE_LINUX_RPM, CREATE_LINUX_DEB);
+
+    static final Set<BundlingOperationOptionScope> MACOS_CREATE_NATIVE = Set.of(
+            CREATE_MAC_DMG, CREATE_MAC_PKG);
+
+    static final Set<BundlingOperationOptionScope> WINDOWS = WINDOWS_CREATE_BUNDLE;
+
+    static final Set<BundlingOperationOptionScope> LINUX = LINUX_CREATE_BUNDLE;
+
+    static final Set<BundlingOperationOptionScope> MACOS = SetBuilder.build(
+            BundlingOperationOptionScope.class).add(MACOS_CREATE_BUNDLE).add(SIGN_MAC_APP_IMAGE).create();
+
+    static final Set<BundlingOperationOptionScope> MACOS_APP_IMAGE = Set.of(
+            SIGN_MAC_APP_IMAGE, CREATE_MAC_APP_IMAGE);
+
+    static final Set<BundlingOperationOptionScope> MAC_SIGNING = MACOS;
+
+    static final Set<BundlingOperationOptionScope> CREATE_APP_IMAGE = Set.of(
+            CREATE_WIN_APP_IMAGE, CREATE_LINUX_APP_IMAGE, CREATE_MAC_APP_IMAGE);
+
+    static final Set<BundlingOperationOptionScope> CREATE_NATIVE = Set.of(
+            CREATE_WIN_MSI, CREATE_WIN_EXE,
+            CREATE_LINUX_RPM, CREATE_LINUX_DEB,
+            CREATE_MAC_DMG, CREATE_MAC_PKG);
+
+    static final Set<BundlingOperationOptionScope> CREATE_BUNDLE = Stream.of(
+            CREATE_APP_IMAGE,
+            CREATE_NATIVE
+    ).flatMap(Set::stream).collect(Collectors.toUnmodifiableSet());
+
+    private final Predicate<String> optionNamePredicate;
+    private final OperatingSystem os;
+    private final PackageType packageType;
+    private final String descriptorVerb;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardFaOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardFaOption.java
new file mode 100644
index 00000000000..71f2cc72397
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardFaOption.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static jdk.jpackage.internal.cli.OptionSpecBuilder.toList;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * jpackage file association options
+ */
+public final class StandardFaOption {
+
+    private StandardFaOption() {
+    }
+
+    public static final OptionValue<String> DESCRIPTION = stringOption("description").create();
+
+    public static final OptionValue<Path> ICON = fileOption("icon").create();
+
+    public static final OptionValue<List<String>> EXTENSIONS = stringOption("extension").tokenizer("(,|\\s)+").createArray(toList());
+
+    public static final OptionValue<List<String>> CONTENT_TYPE = stringOption("mime-type").tokenizer("(,|\\s)+").createArray(toList());
+
+    //
+    // MacOS-specific
+    //
+
+    public static final OptionValue<String> MAC_CFBUNDLETYPEROLE = stringOption("mac.CFBundleTypeRole").create();
+
+    public static final OptionValue<String> MAC_LSHANDLERRANK = stringOption("mac.LSHandlerRank").create();
+
+    public static final OptionValue<String> MAC_NSSTORETYPEKEY = stringOption("mac.NSPersistentStoreTypeKey").create();
+
+    public static final OptionValue<String> MAC_NSDOCUMENTCLASS = stringOption("mac.NSDocumentClass").create();
+
+    public static final OptionValue<Boolean> MAC_LSTYPEISPACKAGE = booleanOption("mac.LSTypeIsPackage").create();
+
+    public static final OptionValue<Boolean> MAC_LSDOCINPLACE = booleanOption("mac.LSSupportsOpeningDocumentsInPlace").create();
+
+    public static final OptionValue<Boolean> MAC_UIDOCBROWSER = booleanOption("mac.UISupportsDocumentBrowser").create();
+
+    public static final OptionValue<List<String>> MAC_NSEXPORTABLETYPES = stringOption("mac.NSExportableTypes").tokenizer("(,|\\s)+").createArray(toList());
+
+    public static final OptionValue<List<String>> MAC_UTTYPECONFORMSTO = stringOption("mac.UTTypeConformsTo").tokenizer("(,|\\s)+").createArray(toList());
+
+    /**
+     * Returns public and package-private options with option specs defined in
+     * {@link StandardFaOption} class.
+     *
+     * @return public and package-private options defined in
+     *         {@link StandardFaOption} class
+     */
+    static Set<Option> options() {
+        return Utils.getOptionsWithSpecs(StandardFaOption.class).map(OptionValue::getOption).collect(toUnmodifiableSet());
+    }
+
+    private static <T> OptionSpecBuilder<T> option(String name, Class<? extends T> valueType) {
+        return OptionSpecBuilder.<T>create(valueType)
+                .name(Objects.requireNonNull(name))
+                .description("")
+                .scope(scopeFromOptionName(name))
+                .valuePattern("");
+    }
+
+    private static OptionSpecBuilder<String> stringOption(String name) {
+        return option(name, String.class).mutate(StandardOption.stringOptionMutator());
+    }
+
+    private static OptionSpecBuilder<Path> fileOption(String name) {
+        return option(name, Path.class).mutate(StandardOption.fileOptionMutator());
+    }
+
+    private static OptionSpecBuilder<Boolean> booleanOption(String name) {
+        return option(name, Boolean.class).mutate(StandardOption.booleanOptionMutator()).defaultValue(null);
+    }
+
+    private static Set<? extends OptionScope> scopeFromOptionName(String name) {
+        if (name.startsWith("mac.")) {
+            return Set.of(StandardBundlingOperation.CREATE_MAC_PKG);
+        } else {
+            return StandardBundlingOperation.CREATE_NATIVE;
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardHelpFormatter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardHelpFormatter.java
new file mode 100644
index 00000000000..d938e602257
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardHelpFormatter.java
@@ -0,0 +1,398 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.internal.cli.HelpFormatter.eol;
+import static jdk.jpackage.internal.cli.StandardOption.platformOption;
+import static jdk.jpackage.internal.cli.StandardOption.sharedOption;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.HelpFormatter.ConsoleOptionFormatter;
+import jdk.jpackage.internal.cli.HelpFormatter.ConsoleOptionGroupFormatter;
+import jdk.jpackage.internal.cli.HelpFormatter.OptionFormatter;
+import jdk.jpackage.internal.cli.HelpFormatter.OptionGroup;
+import jdk.jpackage.internal.cli.HelpFormatter.OptionGroupFormatter;
+import jdk.jpackage.internal.util.StringBundle;
+
+/**
+ * jpackage help formatter
+ */
+final class StandardHelpFormatter {
+
+    enum OptionGroupID {
+        SAMPLES("sample", OptionGroupContent::sampleGroupContent),
+
+        GENERIC_OPTIONS("generic", OptionGroupContent::genericGroupContent),
+
+        RUNTIME_IMAGE_OPTIONS("runtime-image", OptionGroupContent::runtimeImageGroupContent),
+
+        APPLICATION_IMAGE_OPTIONS("app-image", OptionGroupContent::appImageGroupContent),
+
+        LAUNCHER_OPTIONS_SHARED("launcher", OptionGroupContent::launcherGroupContent),
+        LAUNCHER_OPTIONS_PLATFORM("launcher-platform", OptionGroupContent::launcherPlatformGroupContent),
+
+        PACKAGE_OPTIONS_SHARED("package", OptionGroupContent::nativePackageGroupContent),
+        PACKAGE_OPTIONS_PLATFORM("package-platform", OptionGroupContent::nativePackagePlatformGroupContent),
+        ;
+
+        OptionGroupID(String name, Function<OperatingSystem, OptionGroupContent> optionGroupContentCreator) {
+            this.name = "help.option-group." + Objects.requireNonNull(name);
+            this.optionGroupContentCreator = Objects.requireNonNull(optionGroupContentCreator);
+        }
+
+        String groupName() {
+            return name;
+        }
+
+        Optional<OptionGroup> createNonEmptyOptionGroup(OperatingSystem os) {
+            var optionGroup = optionGroupContentCreator.apply(os).createOptionGroup(name);
+            if (optionGroup.options().isEmpty()) {
+                return Optional.empty();
+            } else {
+                return Optional.of(optionGroup);
+            }
+        }
+
+        private final String name;
+        private final Function<OperatingSystem, OptionGroupContent> optionGroupContentCreator;
+    }
+
+    static final class OptionGroupContent {
+
+        static OptionGroupContent sampleGroupContent(OperatingSystem os) {
+            List<String> ids = new ArrayList<>();
+            ids.add("help.option-group.sample.create-native-package");
+            ids.add("help.option-group.sample.create-app-image");
+            ids.add("help.option-group.sample.create-runtime-installer");
+            if (os.equals(OperatingSystem.MACOS)) {
+                ids.add("help.option-group.sample.sign-app-image");
+            }
+            return new OptionGroupContent(ids.stream().map(descriptionId -> {
+                return dummyOptionSpec(descriptionId, descriptionId);
+            }).toList());
+        }
+
+        static OptionGroupContent genericGroupContent(OperatingSystem os) {
+            return shared(os).options(genericOptions()).create();
+        }
+
+        static OptionGroupContent runtimeImageGroupContent(OperatingSystem os) {
+            return shared(os).options(runtimeImageOptions()).create();
+        }
+
+        static OptionGroupContent appImageGroupContent(OperatingSystem os) {
+            return shared(os).options(appImageOptions()).create();
+        }
+
+        static OptionGroupContent launcherGroupContent(OperatingSystem os) {
+            return shared(os).options(launcherOptions(os)).create();
+        }
+
+        static OptionGroupContent launcherPlatformGroupContent(OperatingSystem os) {
+            return platform(os).options(launcherOptions(os)).create();
+        }
+
+        static OptionGroupContent nativePackageGroupContent(OperatingSystem os) {
+            return shared(os).options(nativePackageOptions(os)).create();
+        }
+
+        static OptionGroupContent nativePackagePlatformGroupContent(OperatingSystem os) {
+            return platform(os).options(nativePackageOptions(os)).create();
+        }
+
+        private OptionGroupContent(List<? extends OptionSpec<?>> optionSpecs) {
+            this.optionSpecs = List.copyOf(optionSpecs);
+        }
+
+        private OptionGroup createOptionGroup(String name) {
+            return new OptionGroup(name, optionSpecs);
+        }
+
+        private static Builder shared(OperatingSystem os) {
+            return new Builder(os, sharedOption()).optionSpecDescriptionGetter(standardOptionSpecDescriptionGetter(os));
+        }
+
+        private static Builder platform(OperatingSystem os) {
+            return new Builder(os, Predicate.not(sharedOption()));
+        }
+
+        private static final class Builder {
+
+            private Builder(OperatingSystem os, Predicate<OptionSpec<?>> platformFilter) {
+                this.context = new StandardOptionContext(os);
+                this.platformFilter = Objects.requireNonNull(platformFilter);
+            }
+
+            OptionGroupContent create() {
+                return new OptionGroupContent(optionSpecs.stream()
+                        .filter(platformFilter).sorted(optionSpecSorter()).toList());
+            }
+
+            Builder optionSpecDescriptionGetter(Function<OptionSpec<?>, String> v) {
+                descriptionGetter = v;
+                return this;
+            }
+
+            Builder options(Stream<? extends OptionSpec<?>> v) {
+                optionSpecs.addAll(v.<OptionSpec<?>>map(context::mapOptionSpec).map(optionSpec -> {
+                    return optionSpec.copyWithDescription(getDescription(optionSpec));
+                }).toList());
+                return this;
+            }
+
+            private String getDescription(OptionSpec<?> optionSpec) {
+                Objects.requireNonNull(optionSpec);
+                return Optional.ofNullable(descriptionGetter).orElse(
+                        OptionGroupContent::getDefaultOptionSpecDescription).apply(optionSpec);
+            }
+
+            private final StandardOptionContext context;
+            private final Predicate<OptionSpec<?>> platformFilter;
+            private Function<OptionSpec<?>, String> descriptionGetter;
+            private List<OptionSpec<?>> optionSpecs = new ArrayList<>();
+        }
+
+        private static Stream<? extends OptionSpec<?>> genericOptions() {
+            return Stream.of(
+                    StandardOption.TYPE,
+                    StandardOption.APP_VERSION,
+                    StandardOption.COPYRIGHT,
+                    StandardOption.DESCRIPTION,
+                    StandardOption.HELP,
+                    StandardOption.ICON,
+                    StandardOption.NAME,
+                    StandardOption.DEST,
+                    StandardOption.TEMP_ROOT,
+                    StandardOption.VENDOR,
+                    StandardOption.VERBOSE,
+                    StandardOption.VERSION
+            ).map(OptionValue::getSpec);
+        }
+
+        private static Stream<? extends OptionSpec<?>> appImageOptions() {
+            return Stream.of(
+                    StandardOption.INPUT,
+                    StandardOption.APP_CONTENT
+            ).map(OptionValue::getSpec);
+        }
+
+        private static Stream<? extends OptionSpec<?>> runtimeImageOptions() {
+            return Stream.of(
+                    StandardOption.ADD_MODULES,
+                    StandardOption.MODULE_PATH,
+                    StandardOption.JLINK_OPTIONS,
+                    StandardOption.PREDEFINED_RUNTIME_IMAGE
+            ).map(OptionValue::getSpec);
+        }
+
+        private static Stream<? extends OptionSpec<?>> launcherOptions(OperatingSystem os) {
+            final var fromPropertyFile = StandardOption.launcherOptions().stream()
+                    .map(Option::spec)
+                    .filter(platformOption(os))
+                    .filter(spec -> {
+                        // Want options applicable to the app image bundling on the current platform.
+                        return StandardBundlingOperation.narrow(spec.scope().stream())
+                                .filter(StandardBundlingOperation.CREATE_APP_IMAGE::contains)
+                                .findFirst().isPresent();
+                    })
+                    .filter(Predicate.not(genericOptions().toList()::contains));
+
+            final Stream<? extends OptionSpec<?>> additional = Stream.of(
+                    StandardOption.ADD_LAUNCHER_INTERNAL
+            ).map(OptionValue::getSpec);
+
+            return Stream.concat(fromPropertyFile, additional);
+        }
+
+        private static Stream<? extends OptionSpec<?>> nativePackageOptions(OperatingSystem os) {
+            // The most straightforward way to get the list of these options is to
+            // subtract the options from other groups from the list of all supported options.
+            // This presumes this method is called after the other enum elements have been initialized.
+            final var base = StandardOption.options().stream().map(Option::spec).filter(platformOption(os))
+                    .filter(Predicate.not(Stream.of(
+                            genericOptions(),
+                            appImageOptions(),
+                            runtimeImageOptions(),
+                            launcherOptions(os)).flatMap(x -> x).collect(toSet())::contains));
+
+            return Stream.concat(base, Stream.of(StandardOption.RUNTIME_INSTALLER_RUNTIME_IMAGE));
+        }
+
+        private static String getDefaultOptionSpecDescription(OptionSpec<?> optionSpec) {
+            return I18N.getString(optionSpec.description());
+        }
+
+        private static Function<OptionSpec<?>, String> standardOptionSpecDescriptionGetter(OperatingSystem os) {
+            return optionSpec -> {
+                return getDefaultOptionSpecDescription(optionSpec);
+            };
+        }
+
+        private final List<OptionSpec<?>> optionSpecs;
+    }
+
+
+    private static final class GroupFormatter implements OptionGroupFormatter {
+
+        @Override
+        public void formatHeader(String groupName, Consumer<CharSequence> sink) {
+            groupFormatter.formatHeader(I18N.getString(groupName), sink);
+        }
+
+        @Override
+        public void formatBody(Iterable<? extends OptionSpec<?>> optionSpecs, Consumer<CharSequence> sink) {
+            groupFormatter.formatBody(optionSpecs, sink);
+        }
+
+        @Override
+        public void format(HelpFormatter.OptionGroup group, Consumer<CharSequence> sink) {
+            formatHeader(group.name(), sink);
+            if (group.name().equals(OptionGroupID.GENERIC_OPTIONS.groupName())) {
+                optionSpecFormatter.format("@<filename>", Optional.empty(), I18N.getString("help.option.argument-file"), sink);
+            }
+            formatBody(group.options(), sink);
+        }
+
+        private final OptionFormatter optionSpecFormatter = new ConsoleOptionFormatter(2, 0);
+        private final OptionGroupFormatter groupFormatter = new ConsoleOptionGroupFormatter(optionSpecFormatter);
+    }
+
+
+    private static final class SampleGroupFormatter implements OptionGroupFormatter {
+
+        @Override
+        public void formatHeader(String groupName, Consumer<CharSequence> sink) {
+            var formattedName = I18N.getString(groupName) + ":";
+            sink.accept(formattedName);
+            eol(sink);
+            sink.accept("-".repeat(formattedName.length()));
+            eol(sink);
+        }
+
+        @Override
+        public void formatBody(Iterable<? extends OptionSpec<?>> optionSpecs, Consumer<CharSequence> sink) {
+            boolean first = true;
+            for (var optionSpec : optionSpecs) {
+                if (first) {
+                    first = false;
+                } else {
+                    eol(sink);
+                }
+                sink.accept(I18N.getString(optionSpec.description()));
+                eol(sink);
+            }
+        }
+    }
+
+
+    StandardHelpFormatter(OperatingSystem os) {
+
+        samplesHelpFormatter = HelpFormatter.build()
+                .groupFormatter(new SampleGroupFormatter())
+                .groups(OptionGroupID.SAMPLES.createNonEmptyOptionGroup(os).orElseThrow())
+                .create();
+
+        final var builder = HelpFormatter.build().groupFormatter(new GroupFormatter());
+
+        Stream.of(OptionGroupID.values())
+                .filter(Predicate.<OptionGroupID>isEqual(OptionGroupID.SAMPLES).negate())
+                .map(optionGroupID -> {
+                    return optionGroupID.createNonEmptyOptionGroup(os);
+                })
+                .filter(Optional::isPresent)
+                .map(Optional::orElseThrow)
+                .forEach(builder::groups);
+
+        mainHelpFormatter = builder.create();
+    }
+
+    void format(Consumer<CharSequence> sink) {
+        sink.accept(I18N.getString("help.header"));
+        eol(sink);
+        eol(sink);
+        samplesHelpFormatter.format(sink);
+        mainHelpFormatter.format(sink);
+    }
+
+    void formatNoArgsHelp(Consumer<CharSequence> sink) {
+        sink.accept(I18N.getString("help.header"));
+        eol(sink);
+        sink.accept(I18N.format("help.short"));
+        eol(sink);
+    }
+
+    static Comparator<OptionSpec<?>> optionSpecSorter() {
+        // Sort alphabetically by the first name except of the "--type" option, it goes first.
+        return Comparator.comparing(OptionSpec::name, new Comparator<OptionName>() {
+
+            @Override
+            public int compare(OptionName o1, OptionName o2) {
+                if (o1.equals(TYPE) && o2.equals(TYPE)) {
+                    return 0;
+                } else if (o1.equals(TYPE)) {
+                    return -1;
+                } else if (o2.equals(TYPE)) {
+                    return 1;
+                } else {
+                    return o1.compareTo(o2);
+                }
+            }
+
+            private static final OptionName TYPE = StandardOption.TYPE.getSpec().name();
+        });
+    }
+
+    private static OptionSpec<?> dummyOptionSpec(String name, String description) {
+        return new OptionSpec<>(
+                List.of(OptionName.of(name)),
+                Optional.empty(),
+                Set.copyOf(StandardBundlingOperation.CREATE_BUNDLE),
+                OptionSpec.MergePolicy.USE_FIRST,
+                Optional.empty(),
+                Optional.empty(),
+                description);
+    }
+
+    private final HelpFormatter samplesHelpFormatter;
+    private final HelpFormatter mainHelpFormatter;
+
+    private static final StringBundle I18N = StringBundle.fromResourceBundle(ResourceBundle.getBundle(
+            "jdk.jpackage.internal.resources.HelpResources"));
+
+    static final StandardHelpFormatter INSTANCE = new StandardHelpFormatter(OperatingSystem.current());
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
new file mode 100644
index 00000000000..bd9bd0f6040
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
@@ -0,0 +1,802 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static jdk.jpackage.internal.cli.OptionSpecBuilder.pathSeparator;
+import static jdk.jpackage.internal.cli.OptionSpecBuilder.toList;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_MAC_PKG;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_NATIVE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.SIGN_MAC_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.fromOptionName;
+import static jdk.jpackage.internal.cli.StandardOptionContext.createOptionSpecBuilderMutator;
+import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERROR_WITHOUT_CONTEXT;
+import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERROR_WITH_VALUE;
+import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERROR_WITH_VALUE_AND_OPTION_NAME;
+import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.forMessageWithOptionValueAndName;
+import static jdk.jpackage.internal.cli.StandardValueConverter.addLauncherShortcutConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.booleanConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.identityConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.mainLauncherShortcutConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.pathConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.uuidConv;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.util.SetBuilder;
+
+/**
+ * jpackage command line options
+ */
+public final class StandardOption {
+
+    private StandardOption() {
+    }
+
+    private static final Set<OperatingSystem> SUPPORTED_OS = Set.of(
+            OperatingSystem.LINUX, OperatingSystem.WINDOWS, OperatingSystem.MACOS);
+
+
+    /**
+     * Scope of options configuring a launcher.
+     */
+    enum LauncherProperty implements OptionScope {
+        VALUE
+    }
+
+
+    /**
+     * Modes in which bundling operations don't involve building of an app image.
+     */
+    private static final Set<BundlingOperationModifier> NOT_BUILDING_APP_IMAGE = Set.of(
+            // jpackage will not build an app image when bundling runtime native package
+            BundlingOperationModifier.BUNDLE_RUNTIME,
+            // jpackage will not build an app image if predefined app image is supplied
+            BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE);
+
+    private static final Set<OptionScope> MAC_SIGNING = new SetBuilder<OptionScope>()
+            .add(StandardBundlingOperation.MAC_SIGNING)
+            .add(NOT_BUILDING_APP_IMAGE)
+            .create();
+
+
+    static final OptionValue<Boolean> HELP = auxilaryOption("help").addAliases("h", "?").create();
+
+    static final OptionValue<Boolean> VERSION = auxilaryOption("version").create();
+
+    public static final OptionValue<Boolean> VERBOSE = auxilaryOption("verbose").create();
+
+    public static final OptionValue<PackageType> TYPE = option("type", PackageType.class).addAliases("t")
+            .scope(StandardBundlingOperation.values()).inScope(NOT_BUILDING_APP_IMAGE)
+            .converterExceptionFactory(ERROR_WITH_VALUE).converterExceptionFormatString("ERR_InvalidInstallerType")
+            .converter(str -> {
+                Objects.requireNonNull(str);
+                return Stream.of(StandardBundlingOperation.values()).filter(bundlingOperation -> {
+                    return bundlingOperation.packageTypeValue().equals(str);
+                }).map(StandardBundlingOperation::packageType).findFirst().orElseThrow(IllegalArgumentException::new);
+            })
+            .description("help.option.type" + resourceKeySuffix(OperatingSystem.current()))
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                b.description("help.option.type" + resourceKeySuffix(context.os()));
+            })).create();
+
+    public static final OptionValue<Path> INPUT = directoryOption("input").addAliases("i")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .create();
+
+    public static final OptionValue<Path> DEST = directoryOption("dest").addAliases("d")
+            .valuePattern("destination path")
+            .validator(StandardValidator.IS_DIRECTORY_OR_NON_EXISTENT)
+            .defaultValue(Path.of("").toAbsolutePath())
+            .create();
+
+    public static final OptionValue<String> DESCRIPTION = stringOption("description")
+            .inScope(LauncherProperty.VALUE)
+            .valuePattern("description string")
+            .create();
+
+    public static final OptionValue<String> VENDOR = stringOption("vendor").valuePattern("vendor string").create();
+
+    public static final OptionValue<String> APPCLASS = stringOption("main-class")
+            .valuePattern("class name")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<String> NAME = stringOption("name").addAliases("n")
+            .validator(StandardValidator.IS_NAME_VALID)
+            .validatorExceptionFactory(ERROR_WITH_VALUE).validatorExceptionFormatString("ERR_InvalidAppName")
+            .create();
+
+    public static final OptionValue<Path> RESOURCE_DIR = directoryOption("resource-dir")
+            .scope(StandardBundlingOperation.values()).inScope(NOT_BUILDING_APP_IMAGE)
+            .create();
+
+    public static final OptionValue<List<String>> ARGUMENTS = escapedStringListOption("arguments")
+            .valuePattern("main class arguments")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .inScope(LauncherProperty.VALUE)
+            .createArray(toList());
+
+    public static final OptionValue<List<String>> JLINK_OPTIONS = escapedStringListOption("jlink-options")
+            .valuePattern("jlink options")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .createArray(toList());
+
+    public static final OptionValue<Path> ICON = fileOption("icon")
+            .validator(new Predicate<>() {
+                @Override
+                public boolean test(Path path) {
+                    if (!path.toString().isEmpty()) {
+                        return StandardValidator.IS_FILE_OR_SYMLINK.test(path);
+                    } else {
+                        return true;
+                    }
+                }
+            })
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<String> COPYRIGHT = stringOption("copyright").valuePattern("copyright string").create();
+
+    public static final OptionValue<Path> LICENSE_FILE = fileOption("license-file")
+            .validatorExceptionFormatString("ERR_LicenseFileNotExit")
+            .validatorExceptionFactory(ERROR_WITHOUT_CONTEXT)
+            .create();
+
+    public static final OptionValue<String> APP_VERSION = stringOption("app-version").create();
+
+    public static final OptionValue<String> ABOUT_URL = urlOption("about-url")
+            .scope(CREATE_NATIVE).inScope(NOT_BUILDING_APP_IMAGE)
+            .create();
+
+    public static final OptionValue<List<String>> JAVA_OPTIONS = escapedStringListOption("java-options")
+            .valuePattern("java options")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .inScope(LauncherProperty.VALUE)
+            .createArray(toList());
+
+    public static final OptionValue<List<Path>> APP_CONTENT = pathOption("app-content")
+            .tokenizer(",")
+            .valuePattern("additional content")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                if (context.os() == OperatingSystem.MACOS) {
+                    b.description("help.option.app-content" + resourceKeySuffix(context.os()));
+                }
+            }))
+            .createArray(toList());
+
+    static final OptionValue<Path[]> FILE_ASSOCIATIONS_INTERNAL = fileOption("file-associations")
+            .tokenizer(pathSeparator())
+            .outOfScope(BundlingOperationModifier.BUNDLE_RUNTIME)
+            .createArray();
+
+    static final OptionValue<AdditionalLauncher[]> ADD_LAUNCHER_INTERNAL = createAddLauncherOption("add-launcher");
+
+    public static final OptionValue<Path> TEMP_ROOT = directoryOption("temp")
+            .validatorExceptionFactory((optionName, optionValue, formatString, cause) -> {
+                if (cause.orElseThrow() instanceof StandardValidator.DirectoryListingIOException) {
+                    formatString = "error.path-parameter-ioexception";
+                    return ERROR_WITH_VALUE_AND_OPTION_NAME.create(optionName, optionValue, formatString, cause);
+                } else {
+                    return ERROR_WITH_VALUE.create(optionName, optionValue, formatString, cause);
+                }
+            })
+            .validatorExceptionFormatString("ERR_BuildRootInvalid")
+            .validator(StandardValidator.IS_DIRECTORY_EMPTY_OR_NON_EXISTENT)
+            .create();
+
+    public static final OptionValue<Path> INSTALL_DIR = pathOption("install-dir")
+            .valuePattern("directory path")
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                if (context.os() == OperatingSystem.WINDOWS) {
+                    b.description("help.option.install-dir" + resourceKeySuffix(context.os()));
+                }
+            }))
+            .create();
+
+    public static final OptionValue<Path> PREDEFINED_APP_IMAGE = directoryOption("app-image")
+            .scope(CREATE_NATIVE).inScope(SIGN_MAC_APP_IMAGE).inScope(BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE)
+            .validatorExceptionFactory(ERROR_WITH_VALUE)
+            .validatorExceptionFormatString("ERR_AppImageNotExist")
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                if (context.os() == OperatingSystem.MACOS) {
+                    b.description("help.option.app-image" + resourceKeySuffix(context.os()));
+                }
+            }))
+            .create();
+
+    public static final OptionValue<Path> PREDEFINED_RUNTIME_IMAGE = directoryOption("runtime-image")
+            .outOfScope(BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE)
+            .create();
+
+    static final OptionSpec<Path> RUNTIME_INSTALLER_RUNTIME_IMAGE = directoryOption("runtime-image")
+            .outOfScope(BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE)
+            .description("help.option.installer-runtime-image")
+            .createOptionSpec();
+
+    public static final OptionValue<Path> MAIN_JAR = pathOption("main-jar")
+            .valuePattern("main jar file")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<String> MODULE = stringOption("module").addAliases("m")
+            .valuePattern("<module name>[/<main class>]")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<List<String>> ADD_MODULES = stringOption("add-modules").tokenizer(",")
+            .valuePattern("module name")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .createArray(toList());
+
+    public static final OptionValue<List<Path>> MODULE_PATH = pathOption("module-path").addAliases("p").tokenizer(pathSeparator())
+            .valuePattern("module path")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                if (context.os() == OperatingSystem.WINDOWS) {
+                    b.description("help.option.module-path" + resourceKeySuffix(context.os()));
+                }
+            }))
+            .createArray(toList());
+
+    public static final OptionValue<Boolean> LAUNCHER_AS_SERVICE = booleanOption("launcher-as-service")
+            .scope(nativeBundling())
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    //
+    // Linux-specific
+    //
+
+    public static final OptionValue<String> LINUX_RELEASE = stringOption("linux-app-release").scope(nativeBundling()).create();
+
+    public static final OptionValue<String> LINUX_PACKAGE_NAME = stringOption("linux-package-name")
+            .valuePattern("package name")
+            .scope(nativeBundling()).create();
+
+    public static final OptionValue<String> LINUX_DEB_MAINTAINER_EMAIL = stringOption("linux-deb-maintainer")
+            .valuePattern("email address")
+            .create();
+
+    public static final OptionValue<String> LINUX_APP_CATEGORY = stringOption("linux-app-category").scope(nativeBundling()).create();
+
+    public static final OptionValue<String> LINUX_RPM_LICENSE_TYPE = stringOption("linux-rpm-license-type")
+            .valuePattern("license type")
+            .scope(nativeBundling()).create();
+
+    public static final OptionValue<String> LINUX_PACKAGE_DEPENDENCIES = stringOption("linux-package-deps")
+            .valuePattern("package-dep-string")
+            .scope(nativeBundling()).create();
+
+    public static final OptionValue<LauncherShortcut> LINUX_SHORTCUT_HINT = launcherShortcutOption("linux-shortcut")
+            .scope(nativeBundling())
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<String> LINUX_MENU_GROUP = stringOption("linux-menu-group")
+            .valuePattern("menu-group-name")
+            .scope(nativeBundling()).create();
+
+    //
+    // MacOS-specific
+    //
+
+    public static final OptionValue<List<Path>> MAC_DMG_CONTENT = pathOption("mac-dmg-content")
+            .valuePattern("additional content path")
+            .tokenizer(",")
+            .createArray(toList());
+
+    public static final OptionValue<Boolean> MAC_SIGN = booleanOption("mac-sign").scope(MAC_SIGNING).addAliases("s").create();
+
+    public static final OptionValue<Boolean> MAC_APP_STORE = booleanOption("mac-app-store").create();
+
+    public static final OptionValue<String> MAC_APP_CATEGORY = stringOption("mac-app-category").create();
+
+    public static final OptionValue<String> MAC_BUNDLE_NAME = stringOption("mac-package-name")
+            .valuePattern("package name")
+            .create();
+
+    public static final OptionValue<String> MAC_BUNDLE_IDENTIFIER = stringOption("mac-package-identifier")
+            .valuePattern("package identifier")
+            .create();
+
+    public static final OptionValue<String> MAC_BUNDLE_SIGNING_PREFIX = stringOption("mac-package-signing-prefix").scope(MAC_SIGNING).create();
+
+    public static final OptionValue<String> MAC_SIGNING_KEY_NAME = stringOption("mac-signing-key-user-name").scope(MAC_SIGNING).create();
+
+    public static final OptionValue<String> MAC_APP_IMAGE_SIGN_IDENTITY = stringOption("mac-app-image-sign-identity").scope(MAC_SIGNING).create();
+
+    public static final OptionValue<String> MAC_INSTALLER_SIGN_IDENTITY = stringOption("mac-installer-sign-identity")
+            .scope(CREATE_MAC_PKG).inScope(NOT_BUILDING_APP_IMAGE)
+            .create();
+
+    public static final OptionValue<Path> MAC_SIGNING_KEYCHAIN = pathOption("mac-signing-keychain")
+            .valuePattern("keychain name")
+            .scope(MAC_SIGNING).create();
+
+    public static final OptionValue<Path> MAC_ENTITLEMENTS = fileOption("mac-entitlements")
+            .valuePattern("file path")
+            .scope(MAC_SIGNING).create();
+
+    //
+    // Windows-specific
+    //
+
+    public static final OptionValue<String> WIN_HELP_URL = urlOption("win-help-url").scope(nativeBundling()).create();
+
+    public static final OptionValue<String> WIN_UPDATE_URL = urlOption("win-update-url").scope(nativeBundling()).create();
+
+    public static final OptionValue<LauncherShortcut> WIN_MENU_HINT = launcherShortcutOption("win-menu")
+            .scope(nativeBundling())
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<String> WIN_MENU_GROUP = stringOption("win-menu-group")
+            .valuePattern("menu group name")
+            .scope(nativeBundling()).create();
+
+    public static final OptionValue<LauncherShortcut> WIN_SHORTCUT_HINT = launcherShortcutOption("win-shortcut")
+            .scope(nativeBundling())
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    public static final OptionValue<Boolean> WIN_SHORTCUT_PROMPT = booleanOption("win-shortcut-prompt").scope(nativeBundling()).create();
+
+    public static final OptionValue<Boolean> WIN_PER_USER_INSTALLATION = booleanOption("win-per-user-install").scope(nativeBundling()).create();
+
+    public static final OptionValue<Boolean> WIN_INSTALLDIR_CHOOSER = booleanOption("win-dir-chooser").scope(nativeBundling()).create();
+
+    public static final OptionValue<UUID> WIN_UPGRADE_UUID = uuidOption("win-upgrade-uuid").scope(nativeBundling()).create();
+
+    public static final OptionValue<Boolean> WIN_CONSOLE_HINT = booleanOption("win-console")
+            .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .inScope(LauncherProperty.VALUE)
+            .create();
+
+    //
+    // Synthetic options
+    //
+
+    /**
+     * Processed additional launcher property files.
+     * <p>
+     * Items in the list are in the order "--add-launcher" options appeared on the
+     * command line. Every item in the list has {@link #SOURCE_PROPERY_FILE} option
+     * with the value set to the source property file and {@link #NAME} option with
+     * the value set to the additional launcher name.
+     */
+    public static final OptionValue<List<Options>> ADDITIONAL_LAUNCHERS = OptionValue.create();
+
+    /**
+     * Processed file association property files.
+     * <p>
+     * Items in the list are in the order "--file-associations" options appeared on
+     * the command line. Every item in the list has {@link #SOURCE_PROPERY_FILE}
+     * option with the value set to the source property file.
+     */
+    public static final OptionValue<List<Options>> FILE_ASSOCIATIONS = OptionValue.create();
+
+    public static final OptionValue<Path> SOURCE_PROPERY_FILE = OptionValue.create();
+
+    public static final OptionValue<BundlingOperationDescriptor> BUNDLING_OPERATION_DESCRIPTOR = OptionValue.create();
+
+    /**
+     * Returns options configuring a launcher.
+     *
+     * @return the options configuring a launcher
+     */
+    static Set<Option> launcherOptions() {
+        return options().stream().filter(option -> {
+            return option.spec().scope().stream().anyMatch(LauncherProperty.class::isInstance);
+        }).collect(toUnmodifiableSet());
+    }
+
+    /**
+     * Returns public and package-private options with option specs defined in
+     * {@link StandardOption} class.
+     *
+     * @return public and package-private options defined in
+     *         {@link StandardOption} class
+     */
+    static Set<Option> options() {
+        return Utils.getOptionsWithSpecs(StandardOption.class).map(OptionValue::getOption).collect(toUnmodifiableSet());
+    }
+
+    /**
+     * Returns a {@link Predicate} that returns {@code true} if the given option
+     * spec denotes an option supported on all platforms.
+     *
+     * @return the predicate
+     */
+    static Predicate<OptionSpec<?>> sharedOption() {
+        return optionSpec -> {
+            final var optionSupportedOSs = StandardBundlingOperation.narrow(optionSpec.scope().stream())
+                    .map(StandardBundlingOperation::os).collect(toUnmodifiableSet());
+            return optionSupportedOSs.equals(SUPPORTED_OS);
+        };
+    }
+
+    /**
+     * Returns a {@link Predicate} that returns {@code true} if the given option
+     * spec denotes an option supported on the given platform.
+     *
+     * @param os the platform
+     * @return the predicate
+     */
+    static Predicate<OptionSpec<?>> platformOption(OperatingSystem os) {
+        Objects.requireNonNull(os);
+        return optionSpec -> {
+            return StandardBundlingOperation.narrow(optionSpec.scope().stream()).filter(op -> {
+                return op.os().equals(os);
+            }).findFirst().isPresent();
+        };
+    }
+
+    static Consumer<OptionSpecBuilder<String>> stringOptionMutator() {
+        return builder -> {
+            builder.converter(identityConv());
+        };
+    }
+
+    static Consumer<OptionSpecBuilder<Path>> pathOptionMutator() {
+        return builder -> {
+            builder.converter(pathConv())
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                context.asFileSource().ifPresent(propertyFile -> {
+                    b.converterExceptionFactory(forMessageWithOptionValueAndName(propertyFile));
+                    b.converterExceptionFormatString("error.properties-parameter-not-path");
+                });
+            }))
+            .converterExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+            .converterExceptionFormatString("error.parameter-not-path");
+        };
+    }
+
+    static Consumer<OptionSpecBuilder<Path>> fileOptionMutator() {
+        return builder -> {
+            builder.mutate(pathOptionMutator())
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                context.asFileSource().ifPresent(propertyFile -> {
+                    b.validatorExceptionFactory(forMessageWithOptionValueAndName(propertyFile));
+                    b.validatorExceptionFormatString("error.properties-parameter-not-file");
+                });
+            }))
+            .validator(StandardValidator.IS_FILE_OR_SYMLINK)
+            .validatorExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+            .validatorExceptionFormatString("error.parameter-not-file");
+        };
+    }
+
+    static Consumer<OptionSpecBuilder<Path>> directoryOptionMutator() {
+        return builder -> {
+            builder.mutate(pathOptionMutator())
+            .validator(StandardValidator.IS_DIRECTORY)
+            .validatorExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+            .validatorExceptionFormatString("error.parameter-not-directory");
+        };
+    }
+
+    static Consumer<OptionSpecBuilder<Boolean>> booleanOptionMutator() {
+        return builder -> {
+            builder.mutate(createOptionSpecBuilderMutator((b, context) -> {
+                context.asFileSource().ifPresent(propertyFile -> {
+                    b.converter(booleanConv());
+                });
+            })).valuePattern(null).defaultValue(Boolean.FALSE);
+        };
+    }
+
+    static Consumer<OptionSpecBuilder<LauncherShortcut>> launcherShortcutOptionMutator() {
+        return builder -> {
+            builder.mutate(createOptionSpecBuilderMutator((b, context) -> {
+                context.asFileSource().ifPresent(propertyFile -> {
+                    b.converter(addLauncherShortcutConv()).defaultOptionalValue(null);
+                    b.converterExceptionFactory(forMessageWithOptionValueAndName(propertyFile));
+                    b.converterExceptionFormatString("error.properties-parameter-not-launcher-shortcut-dir");
+                });
+            }))
+            .converterExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+            .converterExceptionFormatString("error.invalid-option-value")
+            .converter(mainLauncherShortcutConv())
+            .defaultOptionalValue(new LauncherShortcut(LauncherShortcutStartupDirectory.DEFAULT))
+            .valuePattern("shortcut startup directory");
+        };
+    }
+
+    private static <T> OptionSpecBuilder<T> option(String name, Class<? extends T> valueType) {
+        return OptionSpecBuilder.<T>create(valueType)
+                .name(Objects.requireNonNull(name))
+                .description("help.option." + name)
+                .scope(fromOptionName(name))
+                .scope(scope -> {
+                    return SetBuilder.build(OptionScope.class)
+                            .add(scope)
+                            .add(BundlingOperationModifier.values())
+                            .create();
+                });
+    }
+
+    private static OptionSpecBuilder<String> stringOption(String name) {
+        return option(name, String.class).mutate(stringOptionMutator());
+    }
+
+    private static OptionSpecBuilder<UUID> uuidOption(String name) {
+        return option(name, UUID.class)
+                .converter(uuidConv())
+                .converterExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                .converterExceptionFormatString("error.parameter-not-uuid");
+    }
+
+    private static OptionSpecBuilder<Path> pathOption(String name) {
+        return option(name, Path.class).mutate(pathOptionMutator());
+    }
+
+    private static OptionSpecBuilder<Path> fileOption(String name) {
+        return option(name, Path.class)
+                .valuePattern("file path")
+                .mutate(fileOptionMutator());
+    }
+
+    private static OptionSpecBuilder<Path> directoryOption(String name) {
+        return option(name, Path.class)
+                .valuePattern("directory path")
+                .mutate(directoryOptionMutator());
+    }
+
+    private static OptionSpecBuilder<String> urlOption(String name) {
+        return stringOption(name)
+                .valuePattern("url")
+                .validator(StandardValidator.IS_URL)
+                .validatorExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                .validatorExceptionFormatString("error.parameter-not-url");
+    }
+
+    private static OptionSpecBuilder<Boolean> booleanOption(String name) {
+        return option(name, Boolean.class).mutate(booleanOptionMutator());
+    }
+
+    private static OptionSpecBuilder<LauncherShortcut> launcherShortcutOption(String name) {
+        return option(name, LauncherShortcut.class).mutate(launcherShortcutOptionMutator());
+    }
+
+    private static OptionSpecBuilder<Boolean> auxilaryOption(String name) {
+        return booleanOption(name)
+                .scope(StandardBundlingOperation.values())
+                .inScope(NOT_BUILDING_APP_IMAGE);
+    }
+
+    private static OptionSpecBuilder<String> escapedStringListOption(String name) {
+        return stringOption(name).tokenizer(str -> {
+            return Arguments.getArgumentList(str).toArray(String[]::new);
+        }).converter(Arguments::unquoteIfNeeded);
+    }
+
+    private static UnaryOperator<Set<OptionScope>> nativeBundling() {
+        return scope -> {
+            return new SetBuilder<OptionScope>()
+                    .set(scope)
+                    .remove(new SetBuilder<OptionScope>().set(StandardBundlingOperation.values()).remove(CREATE_NATIVE).create())
+                    .create();
+        };
+    }
+
+    private static OptionValue<AdditionalLauncher[]> createAddLauncherOption(String name) {
+        OptionValueConverter<Path> propertyFileConverter = fileOption(name)
+                .create().getSpec().converter().orElseThrow();
+
+        return option(name, AdditionalLauncher.class)
+                .valuePattern("<launcher name>=<file path>")
+                .description("help.option.add-launcher" + resourceKeySuffix(OperatingSystem.current()))
+                .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                    b.description("help.option.add-launcher" + resourceKeySuffix(context.os()));
+                }))
+                .outOfScope(NOT_BUILDING_APP_IMAGE)
+                .converterExceptionFormatString("")
+                .converterExceptionFactory((optionName, optionValue, formatString, cause) -> {
+                    final var theCause = cause.orElseThrow();
+                    if (theCause instanceof AddLauncherSyntaxException) {
+                        return ERROR_WITHOUT_CONTEXT.create(optionName,
+                                optionValue, "ERR_NoAddLauncherName", cause);
+                    } else {
+                        return (RuntimeException)theCause;
+                    }
+                }).converter(value -> {
+                    var components = value.split("=", 2);
+                    if (components.length != 2) {
+                        throw new AddLauncherSyntaxException();
+                    }
+
+                    final var launcherName = components[0];
+
+                    if (!StandardValidator.IS_NAME_VALID.test(launcherName)) {
+                        throw new AddLauncherInvalidNameException(I18N.format("ERR_InvalidSLName", launcherName));
+                    }
+
+                    final Path propertyFile;
+                    try {
+                        propertyFile = propertyFileConverter.convert(OptionName.of(name),
+                                StringToken.of(value, components[1])).orElseThrow();
+                    } catch (JPackageException ex) {
+                        throw new AddLauncherInvalidPropertyFileException(I18N.format(
+                                "error.parameter-add-launcher-not-file", components[1], launcherName));
+                    }
+
+                    return new AdditionalLauncher(launcherName, propertyFile);
+                }).defaultArrayValue(new AdditionalLauncher[0]).createArray();
+    }
+
+    private static String resourceKeySuffix(OperatingSystem os) {
+        switch (os) {
+            case LINUX -> {
+                return ".linux";
+            }
+            case MACOS -> {
+                return ".mac";
+            }
+            case WINDOWS -> {
+                return ".win";
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+
+    static class AddLauncherIllegalArgumentException extends IllegalArgumentException {
+
+        AddLauncherIllegalArgumentException(String message) {
+            super(message);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    static final class AddLauncherInvalidNameException extends AddLauncherIllegalArgumentException {
+
+        AddLauncherInvalidNameException(String message) {
+            super(message);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    static final class AddLauncherInvalidPropertyFileException extends AddLauncherIllegalArgumentException {
+
+        AddLauncherInvalidPropertyFileException(String msg) {
+            super(msg);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    private static final class AddLauncherSyntaxException extends IllegalArgumentException {
+
+        AddLauncherSyntaxException() {
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    private static final class Arguments {
+
+        //
+        // This is a an extract copied from jdk.jpackage.internal.Arguments class with the following changes:
+        //  - Don't call unquoteIfNeeded() from getArgumentList().
+        //  - Edit a comment in getArgumentList().
+        //  - Insert Objects.requireNonNull() calls.
+        //  - throw IllegalArgumentException from unquoteIfNeeded() if the input string is empty.
+        //
+
+        // regexp for parsing args (for example, for additional launchers)
+        private static Pattern pattern = Pattern.compile(
+              "(?:(?:([\"'])(?:\\\\\\1|.)*?(?:\\1|$))|(?:\\\\[\"'\\s]|[^\\s]))++");
+
+        static List<String> getArgumentList(String inputString) {
+            Objects.requireNonNull(inputString);
+
+            List<String> list = new ArrayList<>();
+            if (inputString.isEmpty()) {
+                 return list;
+            }
+
+            // The "pattern" regexp attempts to abide to the rule that
+            // strings are delimited by whitespace unless surrounded by
+            // quotes, then it is anything (including spaces) in the quotes.
+            Matcher m = pattern.matcher(inputString);
+            while (m.find()) {
+                String s = inputString.substring(m.start(), m.end()).trim();
+                // Ensure we do not have an empty string. trim() will take care of
+                // whitespace only strings. The regex preserves quotes and escaped
+                // chars.
+                if (!s.isEmpty()) {
+                    list.add(s);
+                }
+            }
+            return list;
+        }
+
+        static String unquoteIfNeeded(String in) {
+            Objects.requireNonNull(in);
+            if (in.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+
+            // Use code points to preserve non-ASCII chars
+            StringBuilder sb = new StringBuilder();
+            int codeLen = in.codePointCount(0, in.length());
+            int quoteChar = -1;
+            for (int i = 0; i < codeLen; i++) {
+                int code = in.codePointAt(i);
+                if (code == '"' || code == '\'') {
+                    // If quote is escaped make sure to copy it
+                    if (i > 0 && in.codePointAt(i - 1) == '\\') {
+                        sb.deleteCharAt(sb.length() - 1);
+                        sb.appendCodePoint(code);
+                        continue;
+                    }
+                    if (quoteChar != -1) {
+                        if (code == quoteChar) {
+                            // close quote, skip char
+                            quoteChar = -1;
+                        } else {
+                            sb.appendCodePoint(code);
+                        }
+                    } else {
+                        // opening quote, skip char
+                        quoteChar = code;
+                    }
+                } else {
+                    sb.appendCodePoint(code);
+                }
+            }
+            return sb.toString();
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionContext.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionContext.java
new file mode 100644
index 00000000000..007d8d7ef90
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionContext.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import jdk.internal.util.OperatingSystem;
+
+/**
+ * The standard context for parsing command line options.
+ */
+record StandardOptionContext(OperatingSystem os, OptionSource src) {
+
+    StandardOptionContext {
+        Objects.requireNonNull(os);
+        Objects.requireNonNull(src);
+    }
+
+    StandardOptionContext(OperatingSystem os) {
+        this(os, OptionSource.COMMAND_LINE);
+    }
+
+    StandardOptionContext() {
+        this(OperatingSystem.current());
+    }
+
+    StandardOptionContext forFile(Path file) {
+        return new StandardOptionContext(os, OptionSource.fromFile(file));
+    }
+
+    Optional<Path> asFileSource() {
+        return OptionSource.asFile(src);
+    }
+
+    <T> OptionSpec<T> mapOptionSpec(OptionSpec<T> optionSpec) {
+        return OptionSpecMapperOptionScope.mapOptionSpec(optionSpec, this);
+    }
+
+    static <T> Consumer<OptionSpecBuilder<T>> createOptionSpecBuilderMutator(
+            BiConsumer<OptionSpecBuilder<T>, StandardOptionContext> mutator) {
+        return OptionSpecMapperOptionScope.createOptionSpecBuilderMutator(StandardOptionContext.class, mutator);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
new file mode 100644
index 00000000000..e79d283b386
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.nio.file.Path;
+import java.util.function.UnaryOperator;
+import jdk.jpackage.internal.cli.OptionValueExceptionFactory.ArgumentsMapper;
+import jdk.jpackage.internal.cli.OptionValueExceptionFactory.StandardArgumentsMapper;
+import jdk.jpackage.internal.model.JPackageException;
+
+final class StandardOptionValueExceptionFactory {
+
+    static OptionValueExceptionFactory<JPackageException> forMessageWithOptionValue(Path propertyFile) {
+        return forMessageWithOptionValue(appendPath(propertyFile)).printOptionPrefix(false).create();
+    }
+
+    static OptionValueExceptionFactory<JPackageException> forMessageWithOptionValueAndName(Path propertyFile) {
+        return forMessageWithOptionValueAndName(appendPath(propertyFile)).printOptionPrefix(false).create();
+    }
+
+    static OptionValueExceptionFactory<JPackageException> forFixedMessage(Path propertyFile) {
+        return forFixedMessage(appendPath(propertyFile)).printOptionPrefix(false).create();
+    }
+
+    private StandardOptionValueExceptionFactory() {
+    }
+
+    private static UnaryOperator<ArgumentsMapper> appendPath(Path path) {
+        return argumentsMapper -> {
+            return ArgumentsMapper.appendArguments(argumentsMapper, path);
+        };
+    }
+
+    private static OptionValueExceptionFactory.Builder<JPackageException> forMessageWithOptionValue(UnaryOperator<ArgumentsMapper> mapper) {
+        return OptionValueExceptionFactory.build(JPackageException::new)
+                .formatArgumentsTransformer(mapper.apply(StandardArgumentsMapper.VALUE));
+    }
+
+    private static OptionValueExceptionFactory.Builder<JPackageException> forMessageWithOptionValueAndName(UnaryOperator<ArgumentsMapper> mapper) {
+        return OptionValueExceptionFactory.build(JPackageException::new)
+                .formatArgumentsTransformer(mapper.apply(StandardArgumentsMapper.VALUE_AND_NAME));
+    }
+
+    private static OptionValueExceptionFactory.Builder<JPackageException> forFixedMessage(UnaryOperator<ArgumentsMapper> mapper) {
+        return OptionValueExceptionFactory.build(JPackageException::new)
+                .formatArgumentsTransformer(mapper.apply(StandardArgumentsMapper.NONE));
+    }
+
+    static final OptionValueExceptionFactory<JPackageException> ERROR_WITH_VALUE =
+            forMessageWithOptionValue(UnaryOperator.identity()).create();
+
+    static final OptionValueExceptionFactory<JPackageException> ERROR_WITHOUT_CONTEXT =
+            forFixedMessage(UnaryOperator.identity()).create();
+
+    static final OptionValueExceptionFactory<JPackageException> ERROR_WITH_VALUE_AND_OPTION_NAME =
+            forMessageWithOptionValueAndName(UnaryOperator.identity()).create();
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
new file mode 100644
index 00000000000..0038740f9df
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.io.IOException;
+import java.lang.constant.ClassDesc;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import jdk.jpackage.internal.cli.Validator.ValidatingConsumerException;
+import jdk.jpackage.internal.util.FileUtils;
+
+final public class StandardValidator {
+
+    private StandardValidator() {
+    }
+
+    public static final Predicate<Path> IS_DIRECTORY = Files::isDirectory;
+
+    public static final Predicate<Path> IS_FILE_OR_SYMLINK = path -> {
+        if (Files.isRegularFile(path)) {
+            return true;
+        } else if (Files.isSymbolicLink(path)) {
+            try {
+                return Files.isRegularFile(FileUtils.readSymlinkTargetRecursive(path));
+            } catch (IOException ex) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    };
+
+    public static final Predicate<Path> IS_DIRECTORY_OR_NON_EXISTENT = path -> {
+        return !Files.exists(path) || Files.isDirectory(path);
+    };
+
+    static final Consumer<Path> IS_DIRECTORY_EMPTY_OR_NON_EXISTENT = path -> {
+        if (Files.exists(path)) {
+            if (Files.isDirectory(path)) {
+                try (var dirContents = Files.list(path)) {
+                    if (dirContents.findAny().isPresent()) {
+                        throw new ValidatingConsumerException(new DirectoryNotEmptyException(path.toString()));
+                    }
+                } catch (IOException ex) {
+                    throw new ValidatingConsumerException(new DirectoryListingIOException(ex));
+                }
+            } else {
+                throw new ValidatingConsumerException(new NotDirectoryException(path.toString()));
+            }
+        }
+    };
+
+    public static Predicate<Path> IS_DIRECTORY_EMPTY_OR_NON_EXISTENT_PREDICATE = toPredicate(IS_DIRECTORY_EMPTY_OR_NON_EXISTENT);
+
+    static final Consumer<String> IS_URL = url -> {
+        try {
+            new URI(url);
+        } catch (URISyntaxException ex) {
+            throw new ValidatingConsumerException(ex);
+        }
+    };
+
+    public static Predicate<String> IS_URL_PREDICATE = toPredicate(IS_URL);
+
+    static final Consumer<String> IS_CLASSNAME = str -> {
+        try {
+            ClassDesc.of(str);
+        } catch (IllegalArgumentException ex) {
+            throw new ValidatingConsumerException(ex);
+        }
+    };
+
+    public static Predicate<String> IS_CLASSNAME_PREDICATE = toPredicate(IS_CLASSNAME);
+
+    // Copied from DeployParams.validateName()
+    public static final Predicate<String> IS_NAME_VALID = s -> {
+        if (s.length() == 0 || s.indexOf('\\') != -1 || s.indexOf('/') != -1 || s.isBlank() || !s.equals(s.trim())) {
+            return false;
+        }
+
+        try {
+            // name must be valid path element for this file system
+            Path p = Path.of(s);
+            // and it must be a single name element in a path
+            if (p.getNameCount() != 1) {
+                return false;
+            }
+        } catch (InvalidPathException ipe) {
+            return false;
+        }
+
+        for (int i = 0; i < s.length(); i++) {
+            char a = s.charAt(i);
+            // We check for ASCII codes first which we accept. If check fails,
+            // check if it is acceptable extended ASCII or unicode character.
+            if (a < ' ' || a > '~') {
+                // Accept anything else including special chars like copyright
+                // symbols. Note: space will be included by ASCII check above,
+                // but other whitespace like tabs or new line will be rejected.
+                if (Character.isISOControl(a)|| Character.isWhitespace(a)) {
+                    return false;
+                }
+            } else if (a == '"' || a == '%') {
+                return false;
+            }
+        }
+
+        return true;
+    };
+
+
+    public static final class DirectoryListingIOException extends RuntimeException {
+
+        DirectoryListingIOException(IOException cause) {
+            super(Objects.requireNonNull(cause));
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    private static <T> Predicate<T> toPredicate(Consumer<T> validator) {
+        return v -> {
+            try {
+                validator.accept(v);
+                return true;
+            } catch (ValidatingConsumerException ex) {
+                return false;
+            }
+        };
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
new file mode 100644
index 00000000000..3a310166fa8
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.UUID;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.ParseUtils;
+
+
+final class StandardValueConverter {
+
+    private StandardValueConverter() {
+    }
+
+    static ValueConverter<String> identityConv() {
+        return IDENTITY_CONV;
+    }
+
+    static ValueConverter<Path> pathConv() {
+        return PATH_CONV;
+    }
+
+    static ValueConverter<UUID> uuidConv() {
+        return UUID_CONV;
+    }
+
+    static ValueConverter<Boolean> booleanConv() {
+        return BOOLEAN_CONV;
+    }
+
+    static ValueConverter<LauncherShortcut> mainLauncherShortcutConv() {
+        return MAIN_LAUNCHER_SHORTCUT_CONV;
+    }
+
+    static ValueConverter<LauncherShortcut> addLauncherShortcutConv() {
+        return ADD_LAUNCHER_SHORTCUT_CONV;
+    }
+
+    private static final ValueConverter<String> IDENTITY_CONV = ValueConverter.create(x -> x, String.class);
+
+    private static final ValueConverter<Path> PATH_CONV = ValueConverter.create(str -> {
+        try {
+            return Path.of(str);
+        } catch (InvalidPathException ex) {
+            throw new IllegalArgumentException(ex);
+        }
+    }, Path.class);
+
+    private static final ValueConverter<UUID> UUID_CONV = ValueConverter.create(UUID::fromString, UUID.class);
+
+    private static final ValueConverter<Boolean> BOOLEAN_CONV = ValueConverter.create(Boolean::valueOf, Boolean.class);
+
+    private static final ValueConverter<LauncherShortcut> MAIN_LAUNCHER_SHORTCUT_CONV = ValueConverter.create(
+            ParseUtils::parseLauncherShortcutForMainLauncher, LauncherShortcut.class);
+
+    private static final ValueConverter<LauncherShortcut> ADD_LAUNCHER_SHORTCUT_CONV = ValueConverter.create(
+            ParseUtils::parseLauncherShortcutForAddLauncher, LauncherShortcut.class);
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StringToken.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StringToken.java
new file mode 100644
index 00000000000..5a9a4bf0c45
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StringToken.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+
+/**
+ * A token of a tokenized string.
+ *
+ * @param tokenizedString the tokenized string from which this token was extracted
+ * @param value           the value of this token
+ */
+record StringToken(String tokenizedString, String value) {
+    StringToken {
+        Objects.requireNonNull(tokenizedString);
+        Objects.requireNonNull(value);
+
+        if (!tokenizedString.contains(value)) {
+            throw new IllegalArgumentException(String.format(
+                    "String token [%s] must be a substring of the tokenized string [%s]", value, tokenizedString));
+        }
+    }
+
+    StringToken(String value) {
+        this(value, value);
+    }
+
+    static StringToken of(String value) {
+        return new StringToken(value);
+    }
+
+    static StringToken of(String tokenizedString, String value) {
+        return new StringToken(tokenizedString, value);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
new file mode 100644
index 00000000000..0565a8f1235
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+
+import java.lang.reflect.Modifier;
+import java.util.Objects;
+import java.util.function.IntPredicate;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingEnvironment;
+
+final class Utils {
+
+    private Utils() {
+    }
+
+    /**
+     * Returns stream of option values with option specs defined in the specified
+     * class.
+     * <p>
+     * The method uses reflection to get public and package private fields of type
+     * {@link OptionValue} and filters those associated with {@link OptionSpec}
+     * instances.
+     *
+     * @param c the target class
+     * @return stream of option values with option specs defined in the specified
+     *         class
+     */
+    static Stream<? extends OptionValue<?>> getOptionsWithSpecs(Class<?> c) {
+        return Stream.of(c.getDeclaredFields()).filter(f -> {
+            return Modifier.isStatic(f.getModifiers());
+        }).filter(f -> {
+            if (Modifier.isPublic(f.getModifiers())) {
+                // Public is OK.
+                return true;
+            } else {
+                // Package-private is OK.
+                return Stream.<IntPredicate>of(Modifier::isPublic, Modifier::isPrivate, Modifier::isProtected).map(p -> {
+                    return p.test(f.getModifiers());
+                }).allMatch(v -> !v);
+            }
+        }).map(f -> {
+            f.setAccessible(true);
+            return toFunction(f::get).apply(null);
+        }).map(v -> {
+            OptionValue<?> result;
+            if (v instanceof OptionValue<?> ov && ov.asOption().isPresent()) {
+                result = ov;
+            } else {
+                result = null;
+            }
+            return result;
+        }).filter(Objects::nonNull);
+    }
+
+    static JOptSimpleOptionsBuilder buildParser(OperatingSystem os, BundlingEnvironment bundlingEnv) {
+        return new JOptSimpleOptionsBuilder()
+                .options(StandardOption.options())
+                .optionSpecMapper(OptionsProcessor.optionSpecMapper(os, bundlingEnv))
+                .jOptSimpleParserErrorHandler(errDesc -> {
+                    final String formatId;
+                    switch (errDesc.type()) {
+                        case UNRECOGNIZED_OPTION -> {
+                            formatId = "ERR_InvalidOption";
+                        }
+                        case OPTION_MISSING_REQUIRED_ARGUMENT -> {
+                            formatId = "ERR_InvalidOption";
+                        }
+                        default -> {
+                            throw new AssertionError();
+                        }
+                    }
+                    return new ParseException(I18N.format(formatId, errDesc.optionName().formatForCommandLine()));
+                });
+    }
+
+    static final class ParseException extends RuntimeException {
+
+        ParseException(String msg) {
+            super(msg);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
new file mode 100644
index 00000000000..0ddf0e1984f
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+@FunctionalInterface
+interface Validator<T, U extends Exception> {
+
+    List<U> validate(OptionName optionName, ParsedValue<T> optionValue);
+
+    default Validator<T, ? extends Exception> andThen(Validator<T, ? extends Exception> after) {
+        return reduce(this, after);
+    }
+
+    /**
+     * Thrown to indicate that the given value didn't pass validation.
+     */
+    static final class ValidatingConsumerException extends RuntimeException {
+
+        ValidatingConsumerException(String msg, Exception cause) {
+            super(msg, Objects.requireNonNull(cause));
+        }
+
+        ValidatingConsumerException(Throwable cause) {
+            super(Objects.requireNonNull(cause));
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    /**
+     * Thrown to indicate an error in the normal execution of a validator.
+     */
+    static final class ValidatorException extends RuntimeException {
+
+        private ValidatorException(Exception cause) {
+            super(cause);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    sealed interface ParsedValue<T> {
+        StringToken sourceToken();
+        T value();
+
+        static <T> ParsedValue<T> create(T value, StringToken sourceToken) {
+            return new Details.DefaultParsedValue<>(value, sourceToken);
+        }
+    }
+
+
+    static <T, U extends Exception> Builder<T, U> build() {
+        return new Builder<>();
+    }
+
+
+    static final class Builder<T, U extends Exception> {
+
+        Validator<T, U> create() {
+            return new Details.ScalarValidator<>(
+                    Optional.ofNullable(predicate),
+                    Optional.ofNullable(consumer),
+                    formatString().orElseGet(() -> {
+                        if (exceptionFactory == null) {
+                            return "";
+                        } else {
+                            return null;
+                        }
+                    }),
+                    exceptionFactory().orElseGet(() -> {
+                        if (formatString == null) {
+                            return OptionValueExceptionFactory.unreachable();
+                        } else {
+                            return null;
+                        }
+                    }));
+        }
+
+        private Builder() {
+        }
+
+        Builder(Builder<T, U> other) {
+            predicate = other.predicate;
+            consumer = other.consumer;
+            formatString = other.formatString;
+            exceptionFactory = other.exceptionFactory;
+        }
+
+        Builder<T, U> copy() {
+            return new Builder<>(this);
+        }
+
+        Builder<T, U> predicate(Predicate<T> v) {
+            consumer = null;
+            predicate = v;
+            return this;
+        }
+
+        Builder<T, U> consumer(Consumer<T> v) {
+            predicate = null;
+            consumer = v;
+            return this;
+        }
+
+        Builder<T, U> formatString(String v) {
+            formatString = v;
+            return this;
+        }
+
+        Builder<T, U> exceptionFactory(OptionValueExceptionFactory<? extends U> v) {
+            exceptionFactory = v;
+            return this;
+        }
+
+        Builder<T, U> mutate(Consumer<Builder<T, U>> mutator) {
+            mutator.accept(this);
+            return this;
+        }
+
+        Optional<Predicate<T>> predicate() {
+            return Optional.ofNullable(predicate);
+        }
+
+        Optional<Consumer<T>> consumer() {
+            return Optional.ofNullable(consumer);
+        }
+
+        boolean hasValidatingMethod() {
+            return predicate().isPresent() || consumer().isPresent();
+        }
+
+        Optional<String> formatString() {
+            return Optional.ofNullable(formatString);
+        }
+
+        Optional<OptionValueExceptionFactory<? extends U>> exceptionFactory() {
+            return Optional.ofNullable(exceptionFactory);
+        }
+
+        private Predicate<T> predicate;
+        private Consumer<T> consumer;
+        private String formatString;
+        private OptionValueExceptionFactory<? extends U> exceptionFactory;
+    }
+
+
+    static final class Details {
+
+        private Details() {
+        }
+
+        private record ScalarValidator<T, U extends Exception>(Optional<Predicate<T>> predicate, Optional<Consumer<T>> consumer,
+                String formatString, OptionValueExceptionFactory<? extends U> exceptionFactory) implements Validator<T, U> {
+
+            ScalarValidator {
+                Objects.requireNonNull(predicate);
+                Objects.requireNonNull(consumer);
+                if (predicate.isEmpty() == consumer.isEmpty()) {
+                    throw new IllegalArgumentException("Either consumer or predicate must be non-empty");
+                }
+                Objects.requireNonNull(formatString);
+                Objects.requireNonNull(exceptionFactory);
+            }
+
+            @Override
+            public List<U> validate(OptionName optionName, ParsedValue<T> optionValue) {
+                Objects.requireNonNull(optionName);
+                Objects.requireNonNull(optionValue);
+
+                try {
+                    return predicate.map(validator -> {
+                        if (validator.test(optionValue.value())) {
+                            return List.<U>of();
+                        } else {
+                            return List.of((U)exceptionFactory.create(
+                                    optionName,
+                                    optionValue.sourceToken(),
+                                    formatString,
+                                    Optional.empty()));
+                        }
+                    }).or(() -> {
+                        return consumer.map(validator -> {
+                            try {
+                                validator.accept(optionValue.value());
+                                return List.of();
+                            } catch (RuntimeException ex) {
+                                return handleException(optionName, optionValue, ex);
+                            }
+                        });
+                    }).orElseThrow();
+                } catch (Exception ex) {
+                    throw new ValidatorException(ex);
+                }
+            }
+
+            private List<U> handleException(OptionName optionName,  ParsedValue<T> optionValue, RuntimeException ex) {
+                if (ex instanceof ValidatingConsumerException) {
+                    return List.of((U)exceptionFactory.create(
+                            optionName,
+                            optionValue.sourceToken(),
+                            formatString,
+                            Optional.of((Exception)ex.getCause())));
+                } else if (ex instanceof IllegalArgumentException) {
+                    return List.of((U)exceptionFactory.create(
+                            optionName,
+                            optionValue.sourceToken(),
+                            formatString,
+                            Optional.of(ex)));
+                } else {
+                    throw ex;
+                }
+            }
+        }
+
+
+        private record DefaultParsedValue<T>(T value, StringToken sourceToken) implements ParsedValue<T> {
+            DefaultParsedValue {
+                Objects.requireNonNull(sourceToken);
+                Objects.requireNonNull(value);
+            }
+        }
+    }
+
+    @SafeVarargs
+    private static <T> Validator<T, ? extends Exception> reduce(Validator<T, ? extends Exception>... validators) {
+        @SuppressWarnings("varargs")
+        var theValidators = List.of(validators);
+        return (optionName, optionValue) -> {
+            return theValidators.stream().map(validator -> {
+                return validator.validate(optionName, optionValue);
+            }).flatMap(Collection::stream).map(Exception.class::cast).toList();
+        };
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
new file mode 100644
index 00000000000..ba52ca35f50
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+interface ValueConverter<T> {
+
+    /**
+     * Converts the given string value into a Java type.
+     *
+     * @param value the string to convert
+     * @return the converted value
+     * @throws IllegalArgumentException if the given string value can not be
+     *                                  converted to an object of type {@link T}
+     */
+    T convert(String value) throws IllegalArgumentException;
+
+    /**
+     * Gives the class of the type of values this converter converts to.
+     *
+     * @return the target class for conversion
+     */
+    Class<? extends T> valueType();
+
+    static <T> ValueConverter<T> create(Function<String, T> mapper, Class<? extends T> type) {
+        Objects.requireNonNull(mapper);
+        Objects.requireNonNull(type);
+
+        return new ValueConverter<>() {
+
+            @Override
+            public T convert(String value) {
+                Objects.requireNonNull(value);
+                return Objects.requireNonNull(mapper.apply(value));
+            }
+
+            @Override
+            public Class<? extends T> valueType() {
+                return type;
+            }
+
+        };
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifier.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifier.java
new file mode 100644
index 00000000000..28fc3d3eb4e
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifier.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.cli;
+
+/**
+ * A type with an option identifier.
+ */
+public sealed interface WithOptionIdentifier permits Option, OptionValue, WithOptionIdentifierStub {
+
+    OptionIdentifier id();
+
+    static WithOptionIdentifier stub(OptionIdentifier id) {
+        return new WithOptionIdentifierStub(id);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifierStub.java
similarity index 69%
rename from src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifierStub.java
index fefa2e69557..e3216f6d6b7 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifierStub.java
@@ -22,17 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.AppImageFile.getBooleanExtraFieldValue;
+package jdk.jpackage.internal.cli;
 
-import jdk.jpackage.internal.model.ExternalApplication;
-import jdk.jpackage.internal.model.MacApplication.ExtraAppImageFileField;
+import java.util.Objects;
 
-record MacAppImageFileExtras(boolean signed, boolean appStore) {
+record WithOptionIdentifierStub(OptionIdentifier id) implements WithOptionIdentifier {
 
-    MacAppImageFileExtras(ExternalApplication app) {
-        this(getBooleanExtraFieldValue(ExtraAppImageFileField.SIGNED.fieldName(), app),
-                getBooleanExtraFieldValue(ExtraAppImageFileField.APP_STORE.fieldName(), app));
+    WithOptionIdentifierStub {
+        Objects.requireNonNull(id);
     }
+
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
index dcb85ecc75c..88218b544bd 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
@@ -24,7 +24,10 @@
  */
 package jdk.jpackage.internal.model;
 
-import java.util.Set;
+import java.util.Collection;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
 
 /**
  * Bundling environment. Defines available bundling operations.
@@ -32,35 +35,25 @@ import java.util.Set;
 public interface BundlingEnvironment {
 
     /**
-     * Returns the default bundling operation.
-     * <p>
-     * The returned value should be one of the elements in the collection returned by {@link #enabledOperations()} method.
-     * @return the default bundling operation
-     * @throws ConfigException in not a single bundling operation can be performed.
+     * Returns descriptor of the default bundling operation if there is such or an
+     * empty {@link Optional} instance otherwise.
+     *
+     * @return the default bundling operation or an empty {@link Optional} instance
+     *         if there is no such
      */
-    BundlingOperation defaultOperation() throws ConfigException;
+    Optional<BundlingOperationDescriptor> defaultOperation();
 
     /**
-     * Returns supported bundling operations.
-     * @return the supported bundling operations
+     * Returns configuration errors or an empty list if there are no such errors for
+     * the target bundling operation.
+     *
+     * @param op the descriptor of the target bundling operation
+     * @return the list of configuration errors or an empty list if there are no
+     *         such errors for the specified bundling operation
+     * @throws NoSuchElementException if the specified descriptor denotes an
+     *                                unsupported bundling operation
      */
-    Set<BundlingOperation> supportedOperations();
-
-    /**
-     * Returns enabled bundling operations.
-     * <p>
-     * The returned value should be a subset of the set returned by {@link #supportedOperations()} method.
-     * @return the enabled bundling operations
-     */
-    default Set<BundlingOperation> enabledOperations() {
-        return supportedOperations();
+    default Collection<? extends Exception> configurationErrors(BundlingOperationDescriptor op) {
+        return List.of();
     }
-
-    /**
-     * Returns a bundle creator corresponding to the given bundling operation in this bundling environment.
-     * @param op the bundling operation
-     * @return bundle creator corresponding to the given bundling operation in this bundling environment
-     * @throws IllegalArgumentException if the given bundling operation is not enabled in this bundling environment
-     */
-    BundleCreator<?> getBundleCreator(BundlingOperation op);
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
new file mode 100644
index 00000000000..70e51c849eb
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.model;
+
+import java.util.Objects;
+import jdk.internal.util.OperatingSystem;
+
+/**
+ * Descriptor of a generic bundling operation.
+ *
+ * @param os         the target bundle platform
+ * @param bundleType the target bundle type
+ * @param verb       the action to be applied to the target bundle
+ */
+public record BundlingOperationDescriptor(OperatingSystem os, String bundleType, String verb) {
+    public BundlingOperationDescriptor {
+        Objects.requireNonNull(os);
+        Objects.requireNonNull(bundleType);
+        Objects.requireNonNull(verb);
+    }
+
+    @Override
+    public String toString() {
+        return os.name() + ":" + verb + ":" + bundleType;
+    }
+
+    public static BundlingOperationDescriptor valueOf(String str) {
+        final var components = str.split(":");
+        return new BundlingOperationDescriptor(OperatingSystem.valueOf(components[0]), components[1], components[2]);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
index a2a799d7f1b..d7e636ac0db 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
@@ -46,7 +46,7 @@ import jdk.jpackage.internal.util.StringBundle;
  *         .create();
  * }
  */
-public class ConfigException extends Exception {
+public class ConfigException extends JPackageException {
     private static final long serialVersionUID = 1L;
     private final String advice;
 
@@ -60,9 +60,8 @@ public class ConfigException extends Exception {
         this.advice = advice;
     }
 
-    public ConfigException(Throwable cause) {
-        super(cause);
-        this.advice = null;
+    public ConfigException(String msg, Throwable cause) {
+        this(msg, null, cause);
     }
 
     public String getAdvice() {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java
index a4a928feb70..e46bdd00f12 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java
@@ -24,15 +24,29 @@
  */
 package jdk.jpackage.internal.model;
 
+import static jdk.jpackage.internal.cli.StandardOption.APP_VERSION;
+import static jdk.jpackage.internal.cli.StandardOption.NAME;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardAppImageFileOption.AppImageFileOptionScope;
+import jdk.jpackage.internal.cli.WithOptionIdentifier;
 
 
 /**
  * Description of an external application image.
  */
-public interface ExternalApplication {
+public sealed interface ExternalApplication {
+
+    /**
+     * Returns the main launcher configured for the application.
+     * @return the main launcher configured for the application
+     */
+    LauncherInfo mainLauncher();
 
     /**
      * Returns the list of additional launchers configured for the application.
@@ -40,47 +54,130 @@ public interface ExternalApplication {
      * Returns an empty list for an application without additional launchers.
      * @return the list of additional launchers configured for the application
      */
-    List<LauncherInfo> getAddLaunchers();
+    List<LauncherInfo> addLaunchers();
 
     /**
      * Returns application version.
      * @return the application version
      */
-    String getAppVersion();
+    String appVersion();
 
     /**
      * Returns application name.
      * @return the application name
      */
-    String getAppName();
-
-    /**
-     * Returns main launcher name.
-     * @return the main launcher name
-     */
-    String getLauncherName();
-
-    /**
-     * Returns main class name.
-     * @return the main class name
-     */
-    String getMainClass();
+    String appName();
 
     /**
      * Returns additional properties.
      * @return the additional properties
      */
-    Map<String, String> getExtra();
+    Options extra();
 
     /**
-     * Additional launcher description.
+     * Launcher description.
      */
-    record LauncherInfo(String name, boolean service, Map<String, String> extra) {
-        public LauncherInfo {
-            Objects.requireNonNull(name);
-            Objects.requireNonNull(extra);
-            if (name.isBlank()) {
-                throw new IllegalArgumentException();
+    sealed interface LauncherInfo {
+
+        /**
+         * Gets the name of the launcher.
+         * @return the name of the launcher
+         */
+        String name();
+
+        /**
+         * Gets optional properties of the launcher.
+         * @return the optional properties of the launcher
+         */
+        Options extra();
+
+        /**
+         * Returns {@code Options} representation of this instance.
+         * <p>
+         * Return value contains the value of {@link #NAME} property merged with the
+         * {@code Options} instance returned by the {@link #extra()} method.
+         *
+         * @return the {@code Options} representation of this instance
+         */
+        default Options asOptions() {
+            return Options.concat(Options.of(Map.of(NAME, name())), extra());
+        }
+
+        static LauncherInfo create(Options options) {
+            return new Internal.DefaultLauncherInfo(options);
+        }
+    }
+
+    static ExternalApplication create(Options appOptions, List<Options> addLauncherOptions, OperatingSystem os) {
+
+        var launcherRecognizedOptions = AppImageFileOptionScope.LAUNCHER.options(os).map(WithOptionIdentifier::id).toList();
+
+        var recognizedOptions = Stream.concat(
+                launcherRecognizedOptions.stream(),
+                AppImageFileOptionScope.APP.options(os).map(WithOptionIdentifier::id)
+        ).toList();
+
+        appOptions = appOptions.copyWith(recognizedOptions);
+
+        var addLaunchres = addLauncherOptions.stream().map(options -> {
+            return options.copyWith(launcherRecognizedOptions);
+        }).map(Internal.DefaultLauncherInfo::new).map(LauncherInfo.class::cast).toList();
+
+        return new Internal.DefaultExternalApplication(appOptions, addLaunchres);
+    }
+
+
+    static final class Internal {
+
+        private Internal() {
+        }
+
+        private record DefaultExternalApplication(Options options, List<LauncherInfo> addLaunchers) implements ExternalApplication {
+
+            DefaultExternalApplication {
+                Objects.requireNonNull(options);
+                Objects.requireNonNull(addLaunchers);
+            }
+
+            @Override
+            public String appVersion() {
+                return APP_VERSION.getFrom(options);
+            }
+
+            @Override
+            public String appName() {
+                return NAME.getFrom(options);
+            }
+
+            @Override
+            public Options extra() {
+                return options
+                        .copyWithout(APP_VERSION.id(), NAME.id())
+                        .copyWithout(AppImageFileOptionScope.LAUNCHER.options().map(WithOptionIdentifier::id).toList());
+            }
+
+            @Override
+            public LauncherInfo mainLauncher() {
+                return new DefaultLauncherInfo(options.copyWithout(extra().ids()));
+            }
+        }
+
+        private record DefaultLauncherInfo(Options options) implements LauncherInfo {
+
+            DefaultLauncherInfo {
+                Objects.requireNonNull(options);
+            }
+
+            @Override
+            public String name() {
+                return NAME.getFrom(options);
+            }
+
+            @Override
+            public Options extra() {
+                return options
+                        .copyWithout(NAME.id())
+                        .copyWithout(AppImageFileOptionScope.APP.options().map(WithOptionIdentifier::id).toList());
             }
         }
     }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
similarity index 69%
rename from src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
index 7bd799b8788..9727f21d2d7 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
@@ -23,17 +23,22 @@
  * questions.
  */
 
-package jdk.jpackage.internal;
+package jdk.jpackage.internal.model;
 
-public class WinAppBundler extends AppImageBundler {
-    public WinAppBundler() {
-        setAppImageSupplier((params, output) -> {
-            // Order is important!
-            var app = WinFromParams.APPLICATION.fetchFrom(params);
-            var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-            WinPackagingPipeline.build()
-                    .excludeDirFromCopying(output.getParent())
-                    .create().execute(BuildEnv.withAppImageDir(env, output), app);
-        });
+import java.util.Objects;
+
+/**
+ * Generic jpackage exception with non-null message.
+ */
+public class JPackageException extends RuntimeException {
+
+    public JPackageException(String msg) {
+        super(Objects.requireNonNull(msg));
     }
+
+    public JPackageException(String msg, Throwable cause) {
+        super(Objects.requireNonNull(msg), cause);
+    }
+
+    private static final long serialVersionUID = 1L;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
index 4a72d93a4b7..c558b787bc4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
@@ -24,6 +24,8 @@
  */
 package jdk.jpackage.internal.model;
 
+import java.util.Optional;
+
 /**
  * Details of application launcher startup configuration using Java module.
  */
@@ -35,10 +37,19 @@ public interface LauncherModularStartupInfoMixin {
      */
     String moduleName();
 
+    /**
+     * Gets the main module version if available or an empty {@link Optional}
+     * otherwise.
+     *
+     * @return the main module version if available or an empty {@link Optional}
+     *         otherwise
+     */
+    Optional<String> moduleVersion();
+
     /**
      * Default implementation of {@link LauncherModularStartupInfoMixin} interface.
      */
-    record Stub(String moduleName) implements LauncherModularStartupInfoMixin {
+    record Stub(String moduleName, Optional<String> moduleVersion) implements LauncherModularStartupInfoMixin {
     }
 
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
deleted file mode 100644
index 4ac2599a381..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal.model;
-
-import jdk.jpackage.internal.util.StringBundle;
-
-/**
- * Signals that error has occurred at packaging phase.
- * <p>
- * The preferred way to construct instances of this class is to use
- * {@link jdk.jpackage.internal.util.LocalizedExceptionBuilder#buildLocalizedException(StringBundle)} methods
- *
- * {@snippet :
- * StringBundle i18n = getStringBundle(); // Some way to obtain a string bundle with localized messages
- *
- * throw buildLocalizedException(i18n).message("error.no.name").create();
- * }
- */
-public class PackagerException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public PackagerException(Throwable cause) {
-        super(cause);
-    }
-
-    public PackagerException(String key, Throwable cause) {
-        super(I18N.getString(key), cause);
-    }
-
-    public PackagerException(String key) {
-        super(I18N.getString(key));
-    }
-
-    public PackagerException(String key, Object... arguments) {
-        super(I18N.format(key, arguments));
-    }
-
-    public PackagerException(Throwable cause, String key, Object... arguments) {
-        super(I18N.format(key, arguments), cause);
-    }
-
-    /**
-     * Throws the cause of the given {@link RuntimeException} exception
-     * as {@link PackagerException} if the cause is of this type or re-throws the given
-     * {@link RuntimeException} exception as-is otherwise.
-     * <p>
-     * Never return a value. It always throws some exception object.
-     *
-     * @param ex exception to re-throw
-     * @return doesn't return value
-     * @throws PackagerException
-     */
-    public static RuntimeException rethrowPackagerException(RuntimeException ex) throws PackagerException {
-        if (ex.getCause() instanceof PackagerException pkgEx) {
-            throw pkgEx;
-        } else {
-            throw ex;
-        }
-    }
-
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
index 89d370b58e0..3b30d367e25 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
@@ -44,7 +44,7 @@ public interface RuntimeBuilder {
      * @param appImageLayout the app image where to create Java runtime.
      * @throws PackagerException if packaging error occurs
      */
-    void create(AppImageLayout appImageLayout) throws PackagerException;
+    void create(AppImageLayout appImageLayout);
 
     /**
      * Returns {@code true} if "--strip-native-commands" was not used with jlink.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
index df87a63cb8e..466f58ee68e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
@@ -24,10 +24,11 @@
 #
 #
 
-MSG_Help=Usage: jpackage <options>\n\
-\n\
-Sample usages:\n\
---------------\n\
+help.header=Usage: jpackage <options>
+
+help.short=Use jpackage --help (or -h) for a list of possible options
+
+help.option-group.sample.create-native-package=\
 \    Generate an application package suitable for the host system:\n\
 \        For a modular application:\n\
 \            jpackage -n name -p modulePath -m moduleName/className\n\
@@ -35,7 +36,9 @@ Sample usages:\n\
 \            jpackage -i inputDir -n name \\\n\
 \                --main-class className --main-jar myJar.jar\n\
 \        From a pre-built application image:\n\
-\            jpackage -n name --app-image appImageDir\n\
+\            jpackage -n name --app-image appImageDir
+
+help.option-group.sample.create-app-image=\
 \    Generate an application image:\n\
 \        For a modular application:\n\
 \            jpackage --type app-image -n name -p modulePath \\\n\
@@ -48,296 +51,378 @@ Sample usages:\n\
 \                --add-modules moduleName \\\n\
 \                --no-header-files [<additional jlink options>...]\n\
 \            jpackage --type app-image -n name \\\n\
-\                -m moduleName/className --runtime-image appRuntimeImage\n\
+\                -m moduleName/className --runtime-image appRuntimeImage
+
+help.option-group.sample.create-runtime-installer=\
 \    Generate a Java runtime package:\n\
-\        jpackage -n name --runtime-image <runtime-image>\n\
-\{6}\
-\n\
-Generic Options:\n\
-\  @<filename> \n\
-\          Read options and/or mode from a file \n\
-\          This option can be used multiple times.\n\
-\  --type -t <type> \n\
-\          The type of package to create\n\
-\          Valid values are: {1} \n\
-\          If this option is not specified a platform dependent\n\
-\          default type will be created.\n\
-\  --app-version <version>\n\
-\          Version of the application and/or package\n\
-\  --copyright <copyright string>\n\
-\          Copyright for the application\n\
-\  --description <description string>\n\
-\          Description of the application\n\
-\  --help -h \n\
-\          Print the usage text with a list and description of each valid\n\
-\          option for the current platform to the output stream, and exit\n\
-\  --icon <file path>\n\
-\          Path of the icon of the application package\n\
+\        jpackage -n name --runtime-image <runtime-image>
+
+help.option-group.sample.sign-app-image=\
+\    Sign the predefined application image:\n\
+\        jpackage --type app-image --app-image <app-image> \\\n\
+\            --mac-sign [<additional signing options>...]\n\
+\        Note: the only additional options that are permitted in this mode are:\n\
+\              the set of additional mac signing options and --verbose
+
+help.option-group.sample=Sample usages
+help.option-group.generic=Generic Options
+help.option-group.runtime-image=Options for creating the runtime image
+help.option-group.app-image=Options for creating the application image
+help.option-group.launcher=Options for creating the application launcher(s)
+help.option-group.launcher-platform=Platform dependent option for creating the application launcher
+help.option-group.package=Options for creating the application package
+help.option-group.package-platform=Platform dependent options for creating the application package
+
+help.option.argument-file=\
+\          Read options and/or mode from a file\n\
+\          This option can be used multiple times.
+
+help.option.about-url=\
+\          URL of the application's home page
+
+help.option.add-launcher.win=\
+\          Name of launcher, and a path to a Properties file that contains\n\
+\          a list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
-\  --name -n <name>\n\
-\          Name of the application and/or package\n\
-\  --dest -d <destination path>\n\
-\          Path where generated output file is placed\n\
+\          The keys "arguments", "description", "icon", "java-options",\n\
+\          "launcher-as-service", "main-class", "main-jar", "module",\n\
+\          "win-console", "win-menu", and "win-shortcut" can be used.\n\
+\          These options are added to, or used to overwrite, the original\n\
+\          command line options to build an additional alternative launcher.\n\
+\          The main application launcher will be built from the command line\n\
+\          options. Additional alternative launchers can be built using\n\
+\          this option, and this option can be used multiple times to\n\
+\          build multiple additional launchers.
+
+help.option.add-launcher.linux=\
+\          Name of launcher, and a path to a Properties file that contains\n\
+\          a list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
-\          Defaults to the current working directory.\n\
-\  --temp <directory path>\n\
-\          Path of a new or empty directory used to create temporary files\n\
+\          The keys "arguments", "description", "icon", "java-options",\n\
+\          "launcher-as-service", "linux-shortcut", "main-class", "main-jar",\n\
+\          and "module" can be used.\n\
+\          These options are added to, or used to overwrite, the original\n\
+\          command line options to build an additional alternative launcher.\n\
+\          The main application launcher will be built from the command line\n\
+\          options. Additional alternative launchers can be built using\n\
+\          this option, and this option can be used multiple times to\n\
+\          build multiple additional launchers.
+
+help.option.add-launcher.mac=\
+\          Name of launcher, and a path to a Properties file that contains\n\
+\          a list of key, value pairs\n\
 \          (absolute path or relative to the current directory)\n\
-\          If specified, the temp dir will not be removed upon the task\n\
-\          completion and must be removed manually.\n\
-\          If not specified, a temporary directory will be created and\n\
-\          removed upon the task completion.\n\
-\  --vendor <vendor string>\n\
-\          Vendor of the application\n\
-\  --verbose\n\
-\          Enables verbose output\n\
-\  --version\n\
-\          Print the product version to the output stream and exit.\n\
-\n\
-\Options for creating the runtime image:\n\
-\  --add-modules <module name>[,<module name>...]\n\
+\          The keys "arguments", "description", "icon", "java-options",\n\
+\          "launcher-as-service", "main-class", "main-jar", and "module"\n\
+\          can be used.\n\
+\          These options are added to, or used to overwrite, the original\n\
+\          command line options to build an additional alternative launcher.\n\
+\          The main application launcher will be built from the command line\n\
+\          options. Additional alternative launchers can be built using\n\
+\          this option, and this option can be used multiple times to\n\
+\          build multiple additional launchers.
+
+help.option.add-modules=\
 \          A comma (",") separated list of modules to add\n\
 \          This module list, along with the main module (if specified)\n\
 \          will be passed to jlink as the --add-module argument.\n\
 \          If not specified, either just the main module (if --module is\n\
-\          specified), or the default set of modules (if --main-jar is \n\
+\          specified), or the default set of modules (if --main-jar is\n\
 \          specified) are used.\n\
-\          This option can be used multiple times.\n\
-\  --module-path -p <module path>...\n\
-\          A {0} separated list of paths\n\
+\          This option can be used multiple times.
+
+help.option.app-content=\
+\          A comma separated list of paths to files and/or directories\n\
+\          to add to the application payload.\n\
+\          This option can be used more than once.
+
+help.option.app-content.mac=\
+\          A comma separated list of paths to files and/or directories\n\
+\          to add to the application payload.\n\
+\          This option can be used more than once.\n\
+\          Note: The value should be a directory with the "Resources"\n\
+\          subdirectory (or any other directory that is valid in the "Contents"\n\
+\          directory of the application bundle). Otherwise, jpackage may produce\n\
+\          invalid application bundle which may fail code signing and/or\n\
+\          notarization.
+
+help.option.app-image=\
+\          Location of the predefined application image that is used\n\
+\          to build an installable package\n\
+\          (absolute path or relative to the current directory)
+
+help.option.app-image.mac=\
+\          Location of the predefined application image that is used\n\
+\          to build an installable package or to sign the predefined\n\
+\          application image\n\
+\          (absolute path or relative to the current directory)
+
+help.option.app-version=\
+\          Version of the application and/or package
+
+help.option.arguments=\
+\          Command line arguments to pass to the main class if no command\n\
+\          line arguments are given to the launcher\n\
+\          This option can be used multiple times.
+
+help.option.copyright=\
+\          Copyright for the application
+
+help.option.description=\
+\          Description of the application
+
+help.option.dest=\
+\          Path where generated output file is placed\n\
+\          (absolute path or relative to the current directory)\n\
+\          Defaults to the current working directory.
+
+help.option.file-associations=\
+\          Path to a Properties file that contains list of key, value pairs\n\
+\          (absolute path or relative to the current directory)\n\
+\          The keys "extension", "mime-type", "icon", and "description"\n\
+\          can be used to describe the association.\n\
+\          This option can be used multiple times.
+
+help.option.help=\
+\          Print the usage text with a list and description of each valid\n\
+\          option for the current platform to the output stream, and exit
+
+help.option.icon=\
+\          Path of the icon of the application package\n\
+\          (absolute path or relative to the current directory)
+
+help.option.input=\
+\          Path of the input directory that contains the files to be packaged\n\
+\          (absolute path or relative to the current directory)\n\
+\          All files in the input directory will be packaged into the\n\
+\          application image.
+
+help.option.install-dir=\
+\          Absolute path of the installation directory of the application
+
+help.option.install-dir.win=\
+\          Relative sub-path of the installation location of\n\
+\          the application such as "Program Files" or "AppData".
+
+help.option.installer-runtime-image=\
+\          Path of the predefined runtime image to install\n\
+\          (absolute path or relative to the current directory)\n\
+\          Option is required when creating a runtime package.
+
+help.option.java-options=\
+\          Options to pass to the Java runtime\n\
+\          This option can be used multiple times.
+
+help.option.jlink-options=\
+\          A space separated list of options to pass to jlink\n\
+\          If not specified, defaults to "--strip-native-commands\n\
+\          --strip-debug --no-man-pages --no-header-files".\n\
+\          This option can be used multiple times.
+
+help.option.launcher-as-service=\
+\          Request to create an installer that will register the main\n\
+\          application launcher as a background service-type application.
+
+help.option.license-file=\
+\          Path to the license file\n\
+\          (absolute path or relative to the current directory)
+
+help.option.linux-app-category=\
+\          Group value of the RPM <name>.spec file or\n\
+\          Section value of DEB control file
+
+help.option.linux-app-release=\
+\          Release value of the RPM <name>.spec file or\n\
+\          Debian revision value of the DEB control file
+
+help.option.linux-deb-maintainer=\
+\          Maintainer for .deb package
+
+help.option.linux-menu-group=\
+\          Menu group this application is placed in
+
+help.option.linux-package-deps=\
+\          Required packages or capabilities for the application
+
+help.option.linux-package-name=\
+\          Name for Linux package, defaults to the application name
+
+help.option.linux-rpm-license-type=\
+\          Type of the license ("License: <value>" of the RPM .spec)
+
+help.option.linux-shortcut=\
+\          Creates a shortcut for the application.
+
+help.option.mac-app-category=\
+\          String used to construct LSApplicationCategoryType in\n\
+\          application plist.  The default value is "utilities".
+
+help.option.mac-app-image-sign-identity=\
+\          Identity used to sign application image. This value will be passed\n\
+\          directly to --sign option of "codesign" tool. This option cannot\n\
+\          be combined with --mac-signing-key-user-name.
+
+help.option.mac-app-store=\
+\          Indicates that the jpackage output is intended for the\n\
+\          Mac App Store.
+
+help.option.mac-dmg-content=\
+\          Include all the referenced content in the dmg.\n\
+\          This option can be used multiple times.
+
+help.option.mac-entitlements=\
+\          Path to file containing entitlements to use when signing\n\
+\          executables and libraries in the bundle.
+
+help.option.mac-installer-sign-identity=\
+\          Identity used to sign "pkg" installer. This value will be passed\n\
+\          directly to --sign option of "productbuild" tool. This option\n\
+\          cannot be combined with --mac-signing-key-user-name.
+
+help.option.mac-package-identifier=\
+\          An identifier that uniquely identifies the application for macOS\n\
+\          Defaults to the main class name.\n\
+\          May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),\n\
+\          and period (.) characters.
+
+help.option.mac-package-name=\
+\          Name of the application as it appears in the Menu Bar\n\
+\          This can be different from the application name.\n\
+\          This name must be less than 16 characters long and be suitable for\n\
+\          displaying in the menu bar and the application Info window.\n\
+\          Defaults to the application name.
+
+help.option.mac-package-signing-prefix=\
+\          When signing the application package, this value is prefixed\n\
+\          to all components that need to be signed that don't have\n\
+\          an existing package identifier.
+
+help.option.mac-sign=\
+\          Request that the package or the predefined application image be\n\
+\          signed.
+
+help.option.mac-signing-keychain=\
+\          Name of the keychain to search for the signing identity\n\
+\          If not specified, the standard keychains are used.
+
+help.option.mac-signing-key-user-name=\
+\          Team or user name portion of Apple signing identities. For direct\n\
+\          control of the signing identity used to sign application images or\n\
+\          installers use --mac-app-image-sign-identity and/or\n\
+\          --mac-installer-sign-identity. This option cannot be combined with\n\
+\          --mac-app-image-sign-identity or --mac-installer-sign-identity.
+
+help.option.main-class=\
+\          Qualified name of the application main class to execute\n\
+\          This option can only be used if --main-jar is specified.
+
+help.option.main-jar=\
+\          The main JAR of the application; containing the main class\n\
+\          (specified as a path relative to the input path)\n\
+\          Either --module or --main-jar option can be specified but not\n\
+\          both.
+
+help.option.module=\
+\          The main module (and optionally main class) of the application\n\
+\          This module must be located on the module path.\n\
+\          When this option is specified, the main module will be linked\n\
+\          in the Java runtime image.  Either --module or --main-jar\n\
+\          option can be specified but not both.
+
+help.option.module-path=\
+\          A : separated list of paths\n\
 \          Each path is either a directory of modules or the path to a\n\
 \          modular jar.\n\
 \          (Each path is absolute or relative to the current directory.)\n\
-\          This option can be used multiple times.\n\
-\  --jlink-options <jlink options> \n\
-\          A space separated list of options to pass to jlink \n\
-\          If not specified, defaults to "--strip-native-commands \n\
-\          --strip-debug --no-man-pages --no-header-files". \n\
-\          This option can be used multiple times.\n\
-\  --runtime-image <directory path>\n\
+\          This option can be used multiple times.
+help.option.module-path.win=\
+\          A ; separated list of paths\n\
+\          Each path is either a directory of modules or the path to a\n\
+\          modular jar.\n\
+\          (Each path is absolute or relative to the current directory.)\n\
+\          This option can be used multiple times.
+
+help.option.name=\
+\          Name of the application and/or package
+
+help.option.resource-dir=\
+\          Path to override jpackage resources\n\
+\          Icons, template files, and other resources of jpackage can be\n\
+\          over-ridden by adding replacement resources to this directory.\n\
+\          (absolute path or relative to the current directory)
+
+help.option.runtime-image=\
 \          Path of the predefined runtime image that will be copied into\n\
 \          the application image\n\
 \          (absolute path or relative to the current directory)\n\
 \          If --runtime-image is not specified, jpackage will run jlink to\n\
 \          create the runtime image using options:\n\
 \          --strip-debug, --no-header-files, --no-man-pages, and\n\
-\          --strip-native-commands.\n\
-\n\
-\Options for creating the application image:\n\
-\  --input -i <directory path>\n\
-\          Path of the input directory that contains the files to be packaged\n\
-\          (absolute path or relative to the current directory)\n\
-\          All files in the input directory will be packaged into the\n\
-\          application image.\n\
-\  --app-content <additional content>[,<additional content>...]\n\
-\          A comma separated list of paths to files and/or directories\n\
-\          to add to the application payload.\n\
-\          This option can be used more than once.\n\
-{7}\n\
-\Options for creating the application launcher(s):\n\
-\  --add-launcher <launcher name>=<file path>\n\
-\          Name of launcher, and a path to a Properties file that contains\n\
-\          a list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "module", "main-jar", "main-class", "description",\n\
-\          "arguments", "java-options", "app-version", "icon",\n\
-\          "launcher-as-service",\n\
-\          "win-console", "win-shortcut", "win-menu",\n\
-\          "linux-app-category", and "linux-shortcut" can be used.\n\
-\          These options are added to, or used to overwrite, the original\n\
-\          command line options to build an additional alternative launcher.\n\
-\          The main application launcher will be built from the command line\n\
-\          options. Additional alternative launchers can be built using\n\
-\          this option, and this option can be used multiple times to\n\
-\          build multiple additional launchers. \n\
-\  --arguments <main class arguments>\n\
-\          Command line arguments to pass to the main class if no command\n\
-\          line arguments are given to the launcher\n\
-\          This option can be used multiple times.\n\
-\  --java-options <java options>\n\
-\          Options to pass to the Java runtime\n\
-\          This option can be used multiple times.\n\
-\  --main-class <class name>\n\
-\          Qualified name of the application main class to execute\n\
-\          This option can only be used if --main-jar is specified.\n\
-\  --main-jar <main jar file>\n\
-\          The main JAR of the application; containing the main class\n\
-\          (specified as a path relative to the input path)\n\
-\          Either --module or --main-jar option can be specified but not\n\
-\          both.\n\
-\  --module -m <module name>[/<main class>]\n\
-\          The main module (and optionally main class) of the application\n\
-\          This module must be located on the module path.\n\
-\          When this option is specified, the main module will be linked\n\
-\          in the Java runtime image.  Either --module or --main-jar\n\
-\          option can be specified but not both.\n\
-{2}\n\
-\Options for creating the application package:\n\
-\  --about-url <url>\n\
-\          URL of the application''s home page\n\
-\  --app-image <directory path>\n\
-\          {5}\
-\          (absolute path or relative to the current directory)\n\
-\  --file-associations <file path>\n\
-\          Path to a Properties file that contains list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "extension", "mime-type", "icon", and "description"\n\
-\          can be used to describe the association.\n\
-\          This option can be used multiple times.\n\
-\  --install-dir <directory path>\n\
-\          {4}\
-\  --license-file <file path>\n\
-\          Path to the license file\n\
-\          (absolute path or relative to the current directory)\n\
-\  --resource-dir <directory path>\n\
-\          Path to override jpackage resources\n\
-\          Icons, template files, and other resources of jpackage can be\n\
-\          over-ridden by adding replacement resources to this directory.\n\
-\          (absolute path or relative to the current directory)\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image to install\n\
-\          (absolute path or relative to the current directory)\n\
-\          Option is required when creating a runtime package.\n\
-\  --launcher-as-service\n\
-\          Request to create an installer that will register the main\n\
-\          application launcher as a background service-type application.\n\
-\n\
-\Platform dependent options for creating the application package:\n\
-{3}
+\          --strip-native-commands.
 
-MSG_Help_win_launcher=\
-\n\
-\Platform dependent option for creating the application launcher:\n\
-\  --win-console\n\
+help.option.temp=\
+\          Path of a new or empty directory used to create temporary files\n\
+\          (absolute path or relative to the current directory)\n\
+\          If specified, the temp dir will not be removed upon the task\n\
+\          completion and must be removed manually.\n\
+\          If not specified, a temporary directory will be created and\n\
+\          removed upon the task completion.
+
+help.option.type.win=\
+\          The type of package to create\n\
+\          Valid values are: {"app-image", "exe", "msi"}\n\
+\          If this option is not specified a platform dependent\n\
+\          default type will be created.
+help.option.type.linux=\
+\          The type of package to create\n\
+\          Valid values are: {"app-image", "deb", "rpm"}\n\
+\          If this option is not specified a platform dependent\n\
+\          default type will be created.
+help.option.type.mac=\
+\          The type of package to create\n\
+\          Valid values are: {"app-image", "dmg", "pkg"}\n\
+\          If this option is not specified a platform dependent\n\
+\          default type will be created.
+
+help.option.vendor=\
+\          Vendor of the application
+
+help.option.verbose=\
+\          Enables verbose output
+
+help.option.version=\
+\          Print the product version to the output stream and exit.
+
+help.option.win-console=\
 \          Creates a console launcher for the application, should be\n\
-\          specified for application which requires console interactions\n\
+\          specified for application which requires console interactions
 
-MSG_Help_win_install=\
-\  --win-dir-chooser\n\
+help.option.win-dir-chooser=\
 \          Adds a dialog to enable the user to choose a directory in which\n\
-\          the product is installed.\n\
-\  --win-help-url <url>\n\
-\          URL where user can obtain further information or technical support\n\
-\  --win-menu\n\
-\          Request to add a Start menu shortcut for this application\n\
-\  --win-menu-group <menu group name>\n\
-\          Start Menu group this application is placed in\n\
-\  --win-per-user-install\n\
-\          Request to perform an install on a per-user basis\n\
-\  --win-shortcut\n\
-\          Request to add desktop shortcut for this application\n\
-\  --win-shortcut-prompt\n\
+\          the product is installed.
+
+help.option.win-help-url=\
+\          URL where user can obtain further information or technical support
+
+help.option.win-menu=\
+\          Request to add a Start menu shortcut for this application
+
+help.option.win-menu-group=\
+\          Start Menu group this application is placed in
+
+help.option.win-per-user-install=\
+\          Request to perform an install on a per-user basis
+
+help.option.win-shortcut=\
+\          Request to add desktop shortcut for this application
+
+help.option.win-shortcut-prompt=\
 \          Adds a dialog to enable the user to choose if shortcuts\n\
-\          will be created by installer.\n\
-\  --win-update-url <url>\n\
-\          URL of available application update information\n\
-\  --win-upgrade-uuid <id string>\n\
-\          UUID associated with upgrades for this package\n\
+\          will be created by installer.
 
-MSG_Help_win_install_dir=\
-\Relative sub-path under the default installation location\n\
+help.option.win-update-url=\
+\          URL of available application update information
 
-MSG_Help_mac_install=\
-\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
-\          Include all the referenced content in the dmg.\n\
-\          This option can be used multiple times. \n\
+help.option.win-upgrade-uuid=\
+\          UUID associated with upgrades for this package
 
-MSG_Help_mac_launcher=\
-\  --mac-package-identifier <ID string>\n\
-\          An identifier that uniquely identifies the application for macOS\n\
-\          Defaults to the main class name.\n\
-\          May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),\n\
-\          and period (.) characters.\n\
-\  --mac-package-name <name string>\n\
-\          Name of the application as it appears in the Menu Bar\n\
-\          This can be different from the application name.\n\
-\          This name must be less than 16 characters long and be suitable for\n\
-\          displaying in the menu bar and the application Info window.\n\
-\          Defaults to the application name.\n\
-\  --mac-package-signing-prefix <prefix string>\n\
-\          When signing the application package, this value is prefixed\n\
-\          to all components that need to be signed that don't have\n\
-\          an existing package identifier.\n\
-\  --mac-sign\n\
-\          Request that the package or the predefined application image be\n\
-\          signed.\n\
-\  --mac-signing-keychain <keychain name>\n\
-\          Name of the keychain to search for the signing identity\n\
-\          If not specified, the standard keychains are used.\n\
-\  --mac-signing-key-user-name <team name>\n\
-\          Team or user name portion of Apple signing identities. For direct\n\
-\          control of the signing identity used to sign application images or\n\
-\          installers use --mac-app-image-sign-identity and/or\n\
-\          --mac-installer-sign-identity. This option cannot be combined with\n\
-\          --mac-app-image-sign-identity or --mac-installer-sign-identity.\n\
-\  --mac-app-image-sign-identity <identity>\n\
-\          Identity used to sign application image. This value will be passed\n\
-\          directly to --sign option of "codesign" tool. This option cannot\n\
-\          be combined with --mac-signing-key-user-name.\n\
-\  --mac-installer-sign-identity <identity>\n\
-\          Identity used to sign "pkg" installer. This value will be passed\n\
-\          directly to --sign option of "productbuild" tool. This option\n\
-\          cannot be combined with --mac-signing-key-user-name.\n\
-\  --mac-app-store\n\
-\          Indicates that the jpackage output is intended for the\n\
-\          Mac App Store.\n\
-\  --mac-entitlements <file path>\n\
-\          Path to file containing entitlements to use when signing\n\
-\          executables and libraries in the bundle.\n\
-\  --mac-app-category <category string>\n\
-\          String used to construct LSApplicationCategoryType in\n\
-\          application plist.  The default value is "utilities".\n\
-
-MSG_Help_linux_install=\
-\  --linux-package-name <package name>\n\
-\          Name for Linux package, defaults to the application name\n\
-\  --linux-deb-maintainer <email address>\n\
-\          Maintainer for .deb package\n\
-\  --linux-menu-group <menu-group-name>\n\
-\          Menu group this application is placed in\n\
-\  --linux-package-deps <package-dep-string>\n\
-\          Required packages or capabilities for the application\n\
-\  --linux-rpm-license-type <type string>\n\
-\          Type of the license ("License: <value>" of the RPM .spec)\n\
-\  --linux-app-release <release value>\n\
-\          Release value of the RPM <name>.spec file or \n\
-\          Debian revision value of the DEB control file\n\
-\  --linux-app-category <category value>\n\
-\          Group value of the RPM <name>.spec file or \n\
-\          Section value of DEB control file\n\
-\  --linux-shortcut\n\
-\          Creates a shortcut for the application.\n\
-
-MSG_Help_mac_linux_install_dir=\
-\Absolute path of the installation directory of the application\n\
-
-MSG_Help_default_install_dir=\
-\Absolute path of the installation directory of the application on OS X\n\
-\          or Linux. Relative sub-path of the installation location of\n\
-\          the application such as "Program Files" or "AppData" on Windows.\n\
-
-MSG_Help_no_args=Usage: jpackage <options>\n\
-\Use jpackage --help (or -h) for a list of possible options\
-
-MSG_Help_default_app_image=\
-\Location of the predefined application image that is used\n\
-\          to build an installable package\n\
-
-MSG_Help_mac_app_image=\
-\Location of the predefined application image that is used\n\
-\          to build an installable package or to sign the predefined\n\
-\          application image\n\
-
-MSG_Help_mac_sign_sample_usage=\
-\    Sign the predefined application image:\n\
-\        jpackage --type app-image --app-image <app-image> \\\n\
-\            --mac-sign [<additional signing options>...]\n\
-\        Note: the only additional options that are permitted in this mode are:\n\
-\              the set of additional mac signing options and --verbose\n\
-
-MSG_Help_mac_app_content_note=\
-\          Note: The value should be a directory with the "Resources"\n\
-\          subdirectory (or any other directory that is valid in the "Contents"\n\
-\          directory of the application bundle). Otherwise, jpackage may produce\n\
-\          invalid application bundle which may fail code signing and/or\n\
-\          notarization.\n\
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
index 2a81b1c102c..9e7dfc25de6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
@@ -24,12 +24,19 @@
 #
 #
 
-jpackage.description=package a self-contained Java application
-
 param.copyright.default=Copyright (C) {0,date,YYYY}
-param.description.default=None
 param.vendor.default=Unknown
 
+bundle-type.win-app=Windows Application Image
+bundle-type.win-exe=EXE Installer Package
+bundle-type.win-msi=MSI Installer Package
+bundle-type.mac-app=Mac Application Image
+bundle-type.mac-dmg=Mac DMG Package
+bundle-type.mac-pkg=Mac PKG Package
+bundle-type.linux-app=Linux Application Image
+bundle-type.linux-deb=DEB Bundle
+bundle-type.linux-rpm=RPM Bundle
+
 resource.post-app-image-script=script to run after application image is populated
 
 message.using-default-resource=Using default package resource {0} {1} (add {2} to the resource-dir to customize).
@@ -37,13 +44,14 @@ message.no-default-resource=No default package resource {0} (add {1} to the reso
 message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
 message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
 message.creating-app-bundle=Creating app package: {0} in {1}
-message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exist
-message.resource-dir-does-not-exist=Specified resource directory {0}: {1} does not exist
 message.debug-working-directory=Kept working directory for debug: {0}
 message.bundle-created=Succeeded in building {0} package
 message.module-version=Using version "{0}" from module "{1}" as application version
 message.module-class=Using class "{0}" from module "{1}" as application main class
 
+message.error-header={0}
+message.advice-header=Advice to fix: {0}
+
 error.version-string-empty=Version may not be empty string
 error.version-string-zero-length-component=Version [{0}] contains a zero length component
 error.version-string-invalid-component=Version [{0}] contains invalid component [{1}]
@@ -53,19 +61,34 @@ error.cannot-write-to-output-dir=Destination directory {0} is not writable
 error.root-exists=Error: Application destination directory {0} already exists
 error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}
 error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest
-error.no-main-class=A main class was not specified nor was one found in the supplied application resources
-error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest
 error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory
 error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory
 error.no-module-in-path="Failed to find {0} module in module path"
-error.not-path-parameter="Invalid value of {0} parameter: {1}"
 error.no-input-parameter="Missing --input parameter for non modular application"
 
+error.non-option-arguments=Found {0} non-option arguments on the command line. Non-option arguments are not allowed
+error.undefined-default-bundling-operation=Default bundling operation is undefined
+error.undefined-default-bundling-operation.advice=Add {0} parameter to the command line
+error.parameter-not-uuid=The value "{0}" provided for parameter {1} is not a valid UUID
+error.parameter-not-path=The value "{0}" provided for parameter {1} is not a valid path
+error.parameter-not-file=The value "{0}" provided for parameter {1} is not a file
+error.parameter-not-directory=The value "{0}" provided for parameter {1} is not a directory
+error.parameter-not-url=The value "{0}" provided for parameter {1} is not a valid URL
+error.parameter-not-launcher-shortcut-dir=The value "{0}" provided for parameter {1} is not a valid shortcut startup directory
+error.path-parameter-ioexception=I/O error accessing path value "{0}" of parameter {1}
+error.parameter-add-launcher-malformed=The value "{0}" provided for parameter {1} does not match the pattern <name>=<file path>
+error.parameter-add-launcher-not-file=The value of path to a property file "{0}" provided for additional launcher "{1}" is not a valid file path
+error.properties-parameter-not-path=The value "{0}" provided for property "{1}" in "{2}" file is not a valid path
+error.properties-parameter-not-file=The value "{0}" provided for property "{1}" in "{2}" file is not a file
+error.properties-parameter-not-launcher-shortcut-dir=The value "{0}" provided for property "{1}" in "{2}" file is not a valid shortcut startup directory
+
 error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}
 error.no-content-types-for-file-association.advice=Specify MIME type for File Association number {0}
 error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}
 error.too-many-content-types-for-file-association.advice=Specify only one MIME type for File Association number {0}
 
+error.launcher-duplicate-name=Multiple launchers have the same name "{0}". Launchers should have unique names
+
 error.tool-error=Can not validate "{0}". Reason: {1}
 error.tool-not-executable="{0}" is not executable
 error.tool-not-found=Can not find "{0}"
@@ -78,19 +101,15 @@ error.blocked.option=jlink option [{0}] is not permitted in --jlink-options
 error.no.name=Name not specified with --name and cannot infer one from app-image
 error.no.name.advice=Specify name with --name
 
-error.foreign-app-image=Error: Missing .jpackage.xml file in app-image dir "{0}"
-error.invalid-app-image=Error: app-image dir "{0}" generated by another jpackage version or malformed "{1}" file
+error.missing-app-image-file=Error: "{0}" file is missing in the predefined app image "{1}"
+error.invalid-app-image-file=Error: "{0}" file in the predefined app image "{1}" is corrupted or was created by another version of jpackage
+error.malformed-app-image-file=Error: "{0}" file in the predefined app image "{1}" contains malformed XML data
+error.reading-app-image-file=Error: Failed to read "{0}" file in the predefined app image "{1}"
 
 error.invalid-install-dir=Invalid installation directory "{0}"
 
 error.invalid-option-value=Invalid value "{0}" of option {1}
 
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
-MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1} \n\
-Advice to fix: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}
-MSG_BundlerRuntimeException=Bundler {0} failed because of {1}
-
 ERR_NoMainClass=Error: Main application class is missing
 ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform
 ERR_InvalidTypeOption=Error: Option [{0}] is not valid with type [{1}]
@@ -99,13 +118,11 @@ ERR_MutuallyExclusiveOptions=Error: Mutually exclusive options [{0}] and [{1}]
 ERR_InvalidOptionWithAppImageSigning=Error: Option [{0}] is not valid when signing application image
 
 ERR_MissingArgument=Error: Missing argument: {0}
-ERR_MissingRequiredArgument=Error: {0} argument requires at least one of [{1}] argument(s)
+ERR_MissingArgument2=Error: Missing argument: {0} or {1}
 ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
 ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>)
-ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name
 ERR_InvalidAppName=Error: Invalid Application name: {0}
 ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}
-ERR_IconFileNotExit=Error: Specified icon file [{0}] does not exist
 ERR_LicenseFileNotExit=Error: Specified license file does not exist
 ERR_BuildRootInvalid=Error: temp ({0}) must be non-existent or empty directory
 ERR_InvalidOption=Error: Invalid Option: [{0}]
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
index cb1bcaa51b1..49c395642f4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.nio.file.CopyOption;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
+import java.nio.file.NotLinkException;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
@@ -100,6 +101,19 @@ public final class FileUtils {
         }
     }
 
+    public static Path readSymlinkTargetRecursive(Path symlink) throws IOException, NotLinkException {
+        try {
+            var target = Files.readSymbolicLink(symlink);
+            if (Files.isSymbolicLink(target)) {
+                return readSymlinkTargetRecursive(target);
+            } else {
+                return target;
+            }
+        } catch (NotLinkException ex) {
+            throw ex;
+        }
+    }
+
     private static boolean isPathMatch(Path what, List<Path> paths) {
         return paths.stream().anyMatch(what::endsWith);
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
new file mode 100644
index 00000000000..b9d3140c5f9
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.util;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public final class SetBuilder<T> {
+
+    public static <T> SetBuilder<T> build(Class<? extends T> type) {
+        return new SetBuilder<>();
+    }
+
+    public SetBuilder<T> set(Collection<? extends T> v) {
+        return clear().add(v);
+    }
+
+    @SafeVarargs
+    @SuppressWarnings("varargs")
+    public final SetBuilder<T> set(T... v) {
+        return set(List.of(v));
+    }
+
+    public SetBuilder<T> add(Collection<? extends T> v) {
+        values.addAll(v);
+        return this;
+    }
+
+    @SafeVarargs
+    @SuppressWarnings("varargs")
+    public final SetBuilder<T> add(T... v) {
+        return add(List.of(v));
+    }
+
+    public SetBuilder<T> remove(Collection<? extends T> v) {
+        values.removeAll(v);
+        return this;
+    }
+
+    @SafeVarargs
+    @SuppressWarnings("varargs")
+    public final SetBuilder<T> remove(T... v) {
+        return remove(List.of(v));
+    }
+
+    public SetBuilder<T> clear() {
+        values.clear();
+        return this;
+    }
+
+    public SetBuilder<T> emptyAllowed(boolean v) {
+        emptyAllowed = v;
+        return this;
+    }
+
+    public Set<T> create() {
+        if (values.isEmpty() && !emptyAllowed) {
+            throw new UnsupportedOperationException();
+        }
+        return Set.copyOf(values);
+    }
+
+    private boolean emptyAllowed;
+    private final Set<T> values = new HashSet<>();
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
index 9ead69890cc..a3321ffe4d3 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
@@ -25,98 +25,16 @@
 
 package jdk.jpackage.main;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.NoSuchFileException;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-import jdk.internal.opt.CommandLine;
-import jdk.jpackage.internal.Arguments;
-import jdk.jpackage.internal.CLIHelp;
-import jdk.jpackage.internal.Log;
-
 public class Main {
 
-    public static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MainResources");
-
     /**
      * main(String... args)
      * This is the entry point for the jpackage tool.
      *
      * @param args command line arguments
      */
-    public static void main(String... args) throws Exception {
-
-        PrintWriter out = new PrintWriter(System.out);
-        PrintWriter err = new PrintWriter(System.err);
-        int status = new jdk.jpackage.main.Main().execute(out, err, args);
-        System.exit(status);
-    }
-
-    /**
-     * execute() - this is the entry point for the ToolProvider API.
-     *
-     * @param out output stream
-     * @param err error output stream
-     * @param args command line arguments
-     * @return an exit code. 0 means success, non-zero means an error occurred.
-     */
-    public int execute(PrintWriter out, PrintWriter err, String... args) {
-        Log.setPrintWriter(out, err);
-
-        try {
-            String[] newArgs;
-            try {
-                newArgs = CommandLine.parse(args);
-            } catch (FileNotFoundException|NoSuchFileException fnfe) {
-                Log.fatalError(MessageFormat.format(I18N.getString(
-                        "ERR_CannotParseOptions"), fnfe.getMessage()));
-                return 1;
-            } catch (IOException ioe) {
-                Log.fatalError(ioe.getMessage());
-                return 1;
-            }
-
-            if (newArgs.length == 0) {
-                CLIHelp.showHelp(true);
-            } else if (hasHelp(newArgs)){
-                if (hasVersion(newArgs)) {
-                    Log.info(System.getProperty("java.version") + "\n");
-                }
-                CLIHelp.showHelp(false);
-            } else if (hasVersion(newArgs)) {
-                Log.info(System.getProperty("java.version"));
-            } else {
-                Arguments arguments = new Arguments(newArgs);
-                if (!arguments.processArguments()) {
-                    // processArguments() will log error message if failed.
-                    return 1;
-                }
-            }
-            return 0;
-        } finally {
-            Log.flush();
-        }
-    }
-
-    private boolean hasHelp(String[] args) {
-        for (String a : args) {
-            if ("--help".equals(a) || "-h".equals(a)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean hasVersion(String[] args) {
-        for (String a : args) {
-            if ("--version".equals(a)) {
-                return true;
-            }
-        }
-        return false;
+    public static void main(String... args) {
+        jdk.jpackage.internal.cli.Main.main(args);
     }
 
 }
diff --git a/src/jdk.jpackage/share/classes/module-info.java b/src/jdk.jpackage/share/classes/module-info.java
index 5536e9be75b..090c54f0fab 100644
--- a/src/jdk.jpackage/share/classes/module-info.java
+++ b/src/jdk.jpackage/share/classes/module-info.java
@@ -35,12 +35,6 @@
  * or the {@link java.util.ServiceLoader service loader} with the name
  * {@code "jpackage"}.
  *
- * @implNote The {@code jpackage} tool is not thread-safe. An application
- * should not call either of the
- * {@link java.util.spi.ToolProvider ToolProvider} {@code run} methods
- * concurrently, even with separate {@code "jpackage"} {@code ToolProvider}
- * instances, or undefined behavior may result.
- *
  * @provides java.util.spi.ToolProvider
  *     Use {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst("jpackage")}
  *     to obtain an instance of a {@code ToolProvider} that provides the equivalent
@@ -56,12 +50,8 @@ module jdk.jpackage {
     requires java.naming;
     requires java.desktop;
 
-    uses jdk.jpackage.internal.Bundler;
-    uses jdk.jpackage.internal.Bundlers;
-
-    provides jdk.jpackage.internal.Bundlers with
-        jdk.jpackage.internal.BasicBundlers;
+        uses jdk.jpackage.internal.cli.CliBundlingEnvironment;
 
     provides java.util.spi.ToolProvider
-        with jdk.jpackage.internal.JPackageToolProvider;
+        with jdk.jpackage.internal.cli.Main.Provider;
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
new file mode 100644
index 00000000000..38547999290
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.WinFromOpions.createWinApplication;
+import static jdk.jpackage.internal.WinPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_EXE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_MSI;
+
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.util.Result;
+
+public class WinBundlingEnvironment extends DefaultBundlingEnvironment {
+
+    public WinBundlingEnvironment() {
+        super(build()
+                .defaultOperation(CREATE_WIN_EXE)
+                .bundler(CREATE_WIN_APP_IMAGE, WinBundlingEnvironment::createAppImage)
+                .bundler(CREATE_WIN_EXE, LazyLoad::sysEnv, WinBundlingEnvironment::createExePackage)
+                .bundler(CREATE_WIN_MSI, LazyLoad::sysEnv, WinBundlingEnvironment::createMsiPackage));
+    }
+
+    private static void createMsiPackage(Options options, WinSystemEnvironment sysEnv) {
+
+        createNativePackage(options,
+                WinFromOpions::createWinMsiPackage,
+                buildEnv()::create,
+                WinPackagingPipeline.build(),
+                (env, pkg, outputDir) -> {
+
+                    traceWixToolset(sysEnv);
+
+                    return new WinMsiPackager(env, pkg, outputDir, sysEnv);
+                });
+    }
+
+    private static void createExePackage(Options options, WinSystemEnvironment sysEnv) {
+
+        createNativePackage(options,
+                WinFromOpions::createWinExePackage,
+                buildEnv()::create,
+                WinPackagingPipeline.build(),
+                (env, pkg, outputDir) -> {
+
+                    traceWixToolset(sysEnv);
+
+                    final var msiOutputDir = env.buildRoot().resolve("msi");
+
+                    var msiPackager = new WinMsiPackager(env, pkg.msiPackage(),
+                            msiOutputDir, sysEnv);
+                    var exePackager = new WinExePackager(env, pkg, outputDir, msiOutputDir);
+
+                    return msiPackager.andThen(exePackager);
+                });
+    }
+
+    private static void createAppImage(Options options) {
+
+        final var app = createWinApplication(options);
+
+        createApplicationImage(options, app, WinPackagingPipeline.build());
+    }
+
+    private static BuildEnvFromOptions buildEnv() {
+        return new BuildEnvFromOptions().predefinedAppImageLayout(APPLICATION_LAYOUT);
+    }
+
+    private static void traceWixToolset(WinSystemEnvironment sysEnv) {
+        final var wixToolset = sysEnv.wixToolset();
+
+        for (var tool : wixToolset.getType().getTools()) {
+            Log.verbose(I18N.format("message.tool-version",
+                    wixToolset.getToolPath(tool).getFileName(),
+                    wixToolset.getVersion()));
+        }
+    }
+
+    private static final class LazyLoad {
+
+        static Result<WinSystemEnvironment> sysEnv() {
+            return SYS_ENV;
+        }
+
+        private static final Result<WinSystemEnvironment> SYS_ENV = WinSystemEnvironment.create();
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
index f61a26f0774..6341ca0d55c 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
@@ -24,72 +24,12 @@
  */
 package jdk.jpackage.internal;
 
-import java.nio.file.Path;
-import java.util.Map;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.model.WinMsiPackage;
-
 @SuppressWarnings("restricted")
-public class WinExeBundler extends AbstractBundler {
+final class WinExeBundler {
 
     static {
         System.loadLibrary("jpackage");
     }
 
-    @Override
-    public String getName() {
-        return I18N.getString("exe.bundler.name");
-    }
-
-    @Override
-    public String getID() {
-        return "exe";
-    }
-
-    @Override
-    public String getBundleType() {
-        return "INSTALLER";
-    }
-
-    @Override
-    public boolean supported(boolean platformInstaller) {
-        return msiBundler.supported(platformInstaller);
-    }
-
-    @Override
-    public boolean isDefault() {
-        return true;
-    }
-
-    @Override
-    public boolean validate(Map<String, ? super Object> params)
-            throws ConfigException {
-        return msiBundler.validate(params, WinFromParams.EXE_PACKAGE);
-    }
-
-    @Override
-    public Path execute(Map<String, ? super Object> params, Path outdir)
-            throws PackagerException {
-
-        // Order is important!
-        var pkg = WinFromParams.EXE_PACKAGE.fetchFrom(params);
-        var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-
-        var msiOutputDir = env.buildRoot().resolve("msi");
-
-        return Packager.<WinMsiPackage>build().outputDir(msiOutputDir)
-                .pkg(pkg.msiPackage())
-                .env(env)
-                .pipelineBuilderMutatorFactory((packagingEnv, msiPackage, _) -> {
-                    var msiPackager = new WinMsiPackager(packagingEnv, msiPackage,
-                            msiOutputDir, msiBundler.sysEnv.orElseThrow());
-                    var exePackager = new WinExePackager(packagingEnv, pkg, outdir, msiOutputDir);
-                    return msiPackager.andThen(exePackager);
-                }).execute(WinPackagingPipeline.build());
-    }
-
     static native int embedMSI(long resourceLock, String msiPath);
-
-    private final WinMsiBundler msiBundler = new WinMsiBundler();
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java
new file mode 100644
index 00000000000..6fd6d0a7b96
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static jdk.jpackage.internal.FromOptions.buildApplicationBuilder;
+import static jdk.jpackage.internal.FromOptions.createPackageBuilder;
+import static jdk.jpackage.internal.WinPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.cli.StandardOption.ICON;
+import static jdk.jpackage.internal.cli.StandardOption.RESOURCE_DIR;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_CONSOLE_HINT;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_HELP_URL;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_INSTALLDIR_CHOOSER;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_MENU_GROUP;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_MENU_HINT;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_PER_USER_INSTALLATION;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_SHORTCUT_HINT;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_SHORTCUT_PROMPT;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_UPDATE_URL;
+import static jdk.jpackage.internal.cli.StandardOption.WIN_UPGRADE_UUID;
+import static jdk.jpackage.internal.model.StandardPackageType.WIN_MSI;
+
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.WinApplication;
+import jdk.jpackage.internal.model.WinExePackage;
+import jdk.jpackage.internal.model.WinLauncher;
+import jdk.jpackage.internal.model.WinLauncherMixin;
+import jdk.jpackage.internal.model.WinMsiPackage;
+
+final class WinFromOpions {
+
+    static WinApplication createWinApplication(Options options) {
+
+        final var launcherFromOptions = new LauncherFromOptions().faWithDefaultDescription();
+
+        final var appBuilder = buildApplicationBuilder().create(options, launcherOptions -> {
+
+            final var launcher = launcherFromOptions.create(launcherOptions);
+
+            final boolean isConsole = WIN_CONSOLE_HINT.getFrom(launcherOptions);
+
+            final var startMenuShortcut = WIN_MENU_HINT.findIn(launcherOptions);
+
+            final var desktopShortcut = WIN_SHORTCUT_HINT.findIn(launcherOptions);
+
+            return WinLauncher.create(launcher, new WinLauncherMixin.Stub(isConsole, startMenuShortcut, desktopShortcut));
+
+        }, (WinLauncher winLauncher, Launcher launcher) -> {
+            return WinLauncher.create(launcher, winLauncher);
+        }, APPLICATION_LAYOUT);
+
+        appBuilder.launchers().map(WinPackagingPipeline::normalizeShortcuts).ifPresent(appBuilder::launchers);
+
+        return WinApplication.create(appBuilder.create());
+    }
+
+    static WinMsiPackage createWinMsiPackage(Options options) {
+
+        final var app = createWinApplication(options);
+
+        final var superPkgBuilder = createPackageBuilder(options, app, WIN_MSI);
+
+        final var pkgBuilder = new WinMsiPackageBuilder(superPkgBuilder);
+
+        WIN_HELP_URL.ifPresentIn(options, pkgBuilder::helpURL);
+        pkgBuilder.isSystemWideInstall(!WIN_PER_USER_INSTALLATION.getFrom(options));
+        WIN_MENU_GROUP.ifPresentIn(options, pkgBuilder::startMenuGroupName);
+        WIN_UPDATE_URL.ifPresentIn(options, pkgBuilder::updateURL);
+        WIN_INSTALLDIR_CHOOSER.ifPresentIn(options, pkgBuilder::withInstallDirChooser);
+        WIN_SHORTCUT_PROMPT.ifPresentIn(options, pkgBuilder::withShortcutPrompt);
+
+        if (app.isService()) {
+            RESOURCE_DIR.ifPresentIn(options, resourceDir -> {
+                pkgBuilder.serviceInstaller(resourceDir.resolve("service-installer.exe"));
+            });
+        }
+
+        WIN_UPGRADE_UUID.ifPresentIn(options, pkgBuilder::upgradeCode);
+
+        return pkgBuilder.create();
+    }
+
+    static WinExePackage createWinExePackage(Options options) {
+
+        final var msiPkg = createWinMsiPackage(options);
+
+        final var pkgBuilder = new WinExePackageBuilder(msiPkg);
+
+        ICON.ifPresentIn(options, pkgBuilder::icon);
+
+        return pkgBuilder.create();
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
deleted file mode 100644
index 2d4225f5a5b..00000000000
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.BundlerParamInfo.createBooleanBundlerParam;
-import static jdk.jpackage.internal.BundlerParamInfo.createStringBundlerParam;
-import static jdk.jpackage.internal.FromParams.createApplicationBuilder;
-import static jdk.jpackage.internal.FromParams.createApplicationBundlerParam;
-import static jdk.jpackage.internal.FromParams.createPackageBuilder;
-import static jdk.jpackage.internal.FromParams.createPackageBundlerParam;
-import static jdk.jpackage.internal.FromParams.findLauncherShortcut;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
-import static jdk.jpackage.internal.WinPackagingPipeline.APPLICATION_LAYOUT;
-import static jdk.jpackage.internal.model.StandardPackageType.WIN_MSI;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.WinApplication;
-import jdk.jpackage.internal.model.WinExePackage;
-import jdk.jpackage.internal.model.WinLauncher;
-import jdk.jpackage.internal.model.WinLauncherMixin;
-import jdk.jpackage.internal.model.WinMsiPackage;
-
-final class WinFromParams {
-
-    private static WinApplication createWinApplication(
-            Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var launcherFromParams = new LauncherFromParams();
-
-        final var app = createApplicationBuilder(params, toFunction(launcherParams -> {
-
-            final var launcher = launcherFromParams.create(launcherParams);
-
-            final boolean isConsole = CONSOLE_HINT.findIn(launcherParams).orElse(false);
-
-            final var startMenuShortcut = findLauncherShortcut(WIN_MENU_HINT, params, launcherParams);
-
-            final var desktopShortcut = findLauncherShortcut(WIN_SHORTCUT_HINT, params, launcherParams);
-
-            return WinLauncher.create(launcher, new WinLauncherMixin.Stub(isConsole, startMenuShortcut, desktopShortcut));
-
-        }), (WinLauncher winLauncher, Launcher launcher) -> {
-            return WinLauncher.create(launcher, winLauncher);
-        }, APPLICATION_LAYOUT).create();
-
-        return WinApplication.create(app);
-    }
-
-    private static WinMsiPackage createWinMsiPackage(Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var app = APPLICATION.fetchFrom(params);
-
-        final var superPkgBuilder = createPackageBuilder(params, app, WIN_MSI);
-
-        final var pkgBuilder = new WinMsiPackageBuilder(superPkgBuilder);
-
-        HELP_URL.copyInto(params, pkgBuilder::helpURL);
-        MSI_SYSTEM_WIDE.copyInto(params, pkgBuilder::isSystemWideInstall);
-        MENU_GROUP.copyInto(params, pkgBuilder::startMenuGroupName);
-        UPDATE_URL.copyInto(params, pkgBuilder::updateURL);
-        INSTALLDIR_CHOOSER.copyInto(params, pkgBuilder::withInstallDirChooser);
-        SHORTCUT_PROMPT.copyInto(params, pkgBuilder::withShortcutPrompt);
-
-        if (app.isService()) {
-            RESOURCE_DIR.copyInto(params, resourceDir -> {
-                pkgBuilder.serviceInstaller(resourceDir.resolve("service-installer.exe"));
-            });
-        }
-
-        try {
-            UPGRADE_UUID.findIn(params).map(UUID::fromString).ifPresent(pkgBuilder::upgradeCode);
-        } catch (IllegalArgumentException ex) {
-            throw new ConfigException(ex);
-        }
-
-        return pkgBuilder.create();
-    }
-
-    private static WinExePackage createWinExePackage(Map<String, ? super Object> params) throws ConfigException, IOException {
-
-        final var msiPkg = MSI_PACKAGE.fetchFrom(params);
-
-        final var pkgBuilder = new WinExePackageBuilder(msiPkg);
-
-        ICON.copyInto(params, pkgBuilder::icon);
-
-        return pkgBuilder.create();
-    }
-
-    static final BundlerParamInfo<WinApplication> APPLICATION = createApplicationBundlerParam(
-            WinFromParams::createWinApplication);
-
-    static final BundlerParamInfo<WinMsiPackage> MSI_PACKAGE = createPackageBundlerParam(
-            WinFromParams::createWinMsiPackage);
-
-    static final BundlerParamInfo<WinExePackage> EXE_PACKAGE = createPackageBundlerParam(
-            WinFromParams::createWinExePackage);
-
-    private static final BundlerParamInfo<String> WIN_MENU_HINT = createStringBundlerParam(
-            Arguments.CLIOptions.WIN_MENU_HINT.getId());
-
-    private static final BundlerParamInfo<String> WIN_SHORTCUT_HINT = createStringBundlerParam(
-            Arguments.CLIOptions.WIN_SHORTCUT_HINT.getId());
-
-    public static final BundlerParamInfo<Boolean> CONSOLE_HINT = createBooleanBundlerParam(
-            Arguments.CLIOptions.WIN_CONSOLE_HINT.getId());
-
-    private static final BundlerParamInfo<Boolean> INSTALLDIR_CHOOSER = new BundlerParamInfo<>(
-            Arguments.CLIOptions.WIN_DIR_CHOOSER.getId(),
-            Boolean.class,
-            null,
-            (s, p) -> Boolean.valueOf(s)
-    );
-
-    private static final BundlerParamInfo<Boolean> SHORTCUT_PROMPT = new BundlerParamInfo<>(
-            Arguments.CLIOptions.WIN_SHORTCUT_PROMPT.getId(),
-            Boolean.class,
-            null,
-            (s, p) -> Boolean.valueOf(s)
-    );
-
-    private static final BundlerParamInfo<String> MENU_GROUP = createStringBundlerParam(
-            Arguments.CLIOptions.WIN_MENU_GROUP.getId());
-
-    private static final BundlerParamInfo<Boolean> MSI_SYSTEM_WIDE = createBooleanBundlerParam(
-            Arguments.CLIOptions.WIN_PER_USER_INSTALLATION.getId());
-
-    private static final BundlerParamInfo<String> HELP_URL = createStringBundlerParam(
-            Arguments.CLIOptions.WIN_HELP_URL.getId());
-
-    private static final BundlerParamInfo<String> UPDATE_URL = createStringBundlerParam(
-            Arguments.CLIOptions.WIN_UPDATE_URL.getId());
-
-    private static final BundlerParamInfo<String> UPGRADE_UUID = createStringBundlerParam(
-            Arguments.CLIOptions.WIN_UPGRADE_UUID.getId());
-}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
deleted file mode 100644
index 24aa3e0573a..00000000000
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import static jdk.jpackage.internal.model.ConfigException.rethrowConfigException;
-
-import java.nio.file.Path;
-import java.util.Map;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.Package;
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.model.WinMsiPackage;
-import jdk.jpackage.internal.util.Result;
-
-public class WinMsiBundler  extends AbstractBundler {
-
-    public WinMsiBundler() {
-    }
-
-    @Override
-    public String getName() {
-        return I18N.getString("msi.bundler.name");
-    }
-
-    @Override
-    public String getID() {
-        return "msi";
-    }
-
-    @Override
-    public String getBundleType() {
-        return "INSTALLER";
-    }
-
-    @Override
-    public boolean supported(boolean platformInstaller) {
-        try {
-            try {
-                sysEnv.orElseThrow();
-                return true;
-            } catch (RuntimeException ex) {
-                ConfigException.rethrowConfigException(ex);
-            }
-        } catch (ConfigException ce) {
-            Log.error(ce.getMessage());
-            if (ce.getAdvice() != null) {
-                Log.error(ce.getAdvice());
-            }
-        } catch (Exception e) {
-            Log.error(e.getMessage());
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isDefault() {
-        return false;
-    }
-
-    @Override
-    public boolean validate(Map<String, ? super Object> params) throws ConfigException {
-        return validate(params, WinFromParams.MSI_PACKAGE);
-    }
-
-    boolean validate(Map<String, ? super Object> params, BundlerParamInfo<? extends Package> pkgParam)
-            throws ConfigException {
-        try {
-            // Order is important!
-            pkgParam.fetchFrom(params);
-            BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-
-            final var wixToolset = sysEnv.orElseThrow().wixToolset();
-
-            for (var tool : wixToolset.getType().getTools()) {
-                Log.verbose(I18N.format("message.tool-version",
-                        wixToolset.getToolPath(tool).getFileName(),
-                        wixToolset.getVersion()));
-            }
-
-            return true;
-        } catch (RuntimeException re) {
-            throw rethrowConfigException(re);
-        }
-    }
-
-    @Override
-    public Path execute(Map<String, ? super Object> params,
-            Path outputParentDir) throws PackagerException {
-
-        return Packager.<WinMsiPackage>build().outputDir(outputParentDir)
-                .pkg(WinFromParams.MSI_PACKAGE.fetchFrom(params))
-                .env(BuildEnvFromParams.BUILD_ENV.fetchFrom(params))
-                .pipelineBuilderMutatorFactory((env, pkg, outputDir) -> {
-                    return new WinMsiPackager(env, pkg, outputDir, sysEnv.orElseThrow());
-                }).execute(WinPackagingPipeline.build());
-    }
-
-    final Result<WinSystemEnvironment> sysEnv = WinSystemEnvironment.create();
-}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
index 99b6c367fec..915d034bd82 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
@@ -53,7 +53,6 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import jdk.jpackage.internal.model.AppImageLayout;
-import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.model.RuntimeLayout;
 import jdk.jpackage.internal.model.WinMsiPackage;
 import org.w3c.dom.Document;
@@ -172,7 +171,7 @@ final class WinMsiPackager implements Consumer<PackagingPipeline.Builder> {
                         .add();
     }
 
-    private void prepareConfigFiles() throws PackagerException, IOException {
+    private void prepareConfigFiles() throws IOException {
 
         pkg.licenseFile().ifPresent(licenseFile -> {
             // need to copy license file to the working directory
@@ -314,7 +313,7 @@ final class WinMsiPackager implements Consumer<PackagingPipeline.Builder> {
         wixPipeline = wixPipelineBuilder.create(wixToolset);
     }
 
-    private void buildPackage() throws PackagerException, IOException {
+    private void buildPackage() throws IOException {
         final var msiOut = outputDir.resolve(pkg.packageFileNameWithSuffix());
         Log.verbose(I18N.format("message.generating-msi", msiOut.toAbsolutePath()));
         wixPipeline.buildMsi(msiOut.toAbsolutePath());
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
index f359a61ce7b..690017215a3 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
@@ -24,19 +24,26 @@
  */
 package jdk.jpackage.internal;
 
+import static jdk.jpackage.internal.ApplicationBuilder.normalizeLauncherProperty;
 import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 import jdk.jpackage.internal.PackagingPipeline.AppImageBuildEnv;
 import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
 import jdk.jpackage.internal.PackagingPipeline.CopyAppImageTaskID;
 import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.model.LauncherShortcut;
 import jdk.jpackage.internal.model.WinApplication;
 import jdk.jpackage.internal.model.WinLauncher;
+import jdk.jpackage.internal.model.WinLauncherMixin;
 
 final class WinPackagingPipeline {
 
@@ -53,8 +60,35 @@ final class WinPackagingPipeline {
                         .applicationAction(WinPackagingPipeline::rebrandLaunchers).add();
     }
 
+    static ApplicationLaunchers normalizeShortcuts(ApplicationLaunchers appLaunchers) {
+
+        appLaunchers = normalizeShortcuts(appLaunchers, WinLauncher::startMenuShortcut, (launcher, shortcut) -> {
+            return new WinLauncherMixin.Stub(launcher.isConsole(), shortcut, launcher.desktopShortcut());
+        });
+
+        appLaunchers = normalizeShortcuts(appLaunchers, WinLauncher::desktopShortcut, (launcher, shortcut) -> {
+            return new WinLauncherMixin.Stub(launcher.isConsole(), launcher.startMenuShortcut(), shortcut);
+        });
+
+        return appLaunchers;
+    }
+
+    private static ApplicationLaunchers normalizeShortcuts(
+            ApplicationLaunchers appLaunchers,
+            Function<WinLauncher, Optional<LauncherShortcut>> shortcutGetter,
+            BiFunction<WinLauncherMixin, Optional<LauncherShortcut>, WinLauncherMixin> shortcutOverrider) {
+        return normalizeLauncherProperty(appLaunchers, launcher -> {
+            // Return "true" if shortcut is not configured for the launcher.
+            return shortcutGetter.apply(launcher).isEmpty();
+        }, (WinLauncher launcher) -> {
+            return shortcutGetter.apply(launcher).flatMap(LauncherShortcut::startupDirectory);
+        }, (launcher, shortcut) -> {
+            return WinLauncher.create(launcher, shortcutOverrider.apply(launcher, Optional.of(new LauncherShortcut(shortcut))));
+        });
+    }
+
     private static void rebrandLaunchers(AppImageBuildEnv<WinApplication, ApplicationLayout> env)
-            throws IOException, PackagerException {
+            throws IOException {
         for (var launcher : env.app().launchers()) {
             final var iconTarget = createLauncherIconResource(launcher, env.env()::createResource).map(iconResource -> {
                 var iconDir = env.env().buildRoot().resolve("icons");
@@ -79,5 +113,10 @@ final class WinPackagingPipeline {
         }
     }
 
-    static final ApplicationLayout APPLICATION_LAYOUT = ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
+    static final ApplicationLayout APPLICATION_LAYOUT = ApplicationLayout.build()
+            .setAll("")
+            .appDirectory("app")
+            .runtimeDirectory("runtime")
+            .appModsDirectory(Path.of("app", "mods"))
+            .create();
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
index 3052029a33c..8dbed334201 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
@@ -24,6 +24,9 @@
  */
 package jdk.jpackage.internal.model;
 
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.WIN_LAUNCHER_DESKTOP_SHORTCUT;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.WIN_LAUNCHER_MENU_SHORTCUT;
+
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -48,10 +51,10 @@ public interface WinLauncher extends Launcher, WinLauncherMixin {
     default Map<String, String> extraAppImageFileData() {
         Map<String, String> map = new HashMap<>();
         desktopShortcut().ifPresent(shortcut -> {
-            shortcut.store(SHORTCUT_DESKTOP_ID, map::put);
+            shortcut.store(WIN_LAUNCHER_DESKTOP_SHORTCUT.getName(), map::put);
         });
         startMenuShortcut().ifPresent(shortcut -> {
-            shortcut.store(SHORTCUT_START_MENU_ID, map::put);
+            shortcut.store(WIN_LAUNCHER_MENU_SHORTCUT.getName(), map::put);
         });
         return map;
     }
@@ -59,7 +62,4 @@ public interface WinLauncher extends Launcher, WinLauncherMixin {
     public static WinLauncher create(Launcher launcher, WinLauncherMixin mixin) {
         return CompositeProxy.create(WinLauncher.class, launcher, mixin);
     }
-
-    public static final String SHORTCUT_START_MENU_ID = "win-menu";
-    public static final String SHORTCUT_DESKTOP_ID = "win-shortcut";
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
index c2be3756426..50be1a0a1e5 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
@@ -23,11 +23,6 @@
 # questions.
 #
 #
-
-app.bundler.name=Windows Application Image
-exe.bundler.name=EXE Installer Package
-msi.bundler.name=MSI Installer Package
-
 param.menu-group.default=Unknown
 
 resource.executable-properties-template=Template for creating executable properties file
diff --git a/src/jdk.jpackage/windows/classes/module-info.java.extra b/src/jdk.jpackage/windows/classes/module-info.java.extra
index d9d3bde1e4d..425fc7fa528 100644
--- a/src/jdk.jpackage/windows/classes/module-info.java.extra
+++ b/src/jdk.jpackage/windows/classes/module-info.java.extra
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,5 @@
  * questions.
  */
 
-provides jdk.jpackage.internal.Bundler with
-    jdk.jpackage.internal.WinAppBundler,
-    jdk.jpackage.internal.WinExeBundler,
-    jdk.jpackage.internal.WinMsiBundler;
-
+provides jdk.jpackage.internal.cli.CliBundlingEnvironment with
+    jdk.jpackage.internal.WinBundlingEnvironment;
diff --git a/test/jdk/tools/jpackage/TEST.properties b/test/jdk/tools/jpackage/TEST.properties
index 84d7dbea7ea..19eda305364 100644
--- a/test/jdk/tools/jpackage/TEST.properties
+++ b/test/jdk/tools/jpackage/TEST.properties
@@ -23,6 +23,8 @@ exclusiveAccess.dirs = \
 
 modules = \
     jdk.jpackage/jdk.jpackage.internal:+open \
+    jdk.jpackage/jdk.jpackage.internal.cli \
+    jdk.jpackage/jdk.jpackage.internal.model \
     jdk.jpackage/jdk.jpackage.internal.util \
     jdk.jpackage/jdk.jpackage.internal.util.function \
     jdk.jpackage/jdk.jpackage.internal.resources:+open \
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
index e676e0d1e87..0e4ca785c96 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
@@ -25,24 +25,27 @@ package jdk.jpackage.test;
 import static java.util.stream.Collectors.toMap;
 import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.util.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
-public record AppImageFile(String mainLauncherName, String mainLauncherClassName,
+public record AppImageFile(String mainLauncherName, Optional<String> mainLauncherClassName,
         String version, boolean macSigned, boolean macAppStore, Map<String, Map<String, String>> launchers) {
 
     public static Path getPathInAppImage(Path appImageDir) {
@@ -61,14 +64,21 @@ public record AppImageFile(String mainLauncherName, String mainLauncherClassName
         }
     }
 
-    public AppImageFile(String mainLauncherName, String mainLauncherClassName) {
+    public AppImageFile(String mainLauncherName, Optional<String> mainLauncherClassName) {
         this(mainLauncherName, mainLauncherClassName, "1.0", false, false, Map.of(mainLauncherName, Map.of()));
     }
 
+    public AppImageFile(String mainLauncherName, String mainLauncherClassName) {
+        this(mainLauncherName, Optional.of(mainLauncherClassName));
+    }
+
     public Map<String, Map<String, String>> addLaunchers() {
-        return launchers.entrySet().stream().filter(e -> {
+        var map = launchers.entrySet().stream().filter(e -> {
             return !e.getKey().equals(mainLauncherName);
-        }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+        }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue, (k, _) -> {
+            throw new IllegalStateException(String.format("Duplicate key %s", k));
+        }, LinkedHashMap::new));
+        return Collections.unmodifiableMap(map);
     }
 
     public void save(Path appImageDir) throws IOException {
@@ -82,12 +92,14 @@ public record AppImageFile(String mainLauncherName, String mainLauncherClassName
             xml.writeEndElement();
 
             xml.writeStartElement("main-launcher");
-            xml.writeCharacters(mainLauncherName);
+            xml.writeAttribute("name", mainLauncherName);
             xml.writeEndElement();
 
-            xml.writeStartElement("main-class");
-            xml.writeCharacters(mainLauncherClassName);
-            xml.writeEndElement();
+            mainLauncherClassName.ifPresent(toConsumer(v -> {
+                xml.writeStartElement("main-class");
+                xml.writeCharacters(v);
+                xml.writeEndElement();
+            }));
 
             xml.writeStartElement("signed");
             xml.writeCharacters(Boolean.toString(macSigned));
@@ -120,11 +132,8 @@ public record AppImageFile(String mainLauncherName, String mainLauncherClassName
 
             var version = xPath.evaluate("/jpackage-state/app-version/text()", doc);
 
-            var mainLauncherName = xPath.evaluate(
-                    "/jpackage-state/main-launcher/text()", doc);
-
-            var mainLauncherClassName = xPath.evaluate(
-                    "/jpackage-state/main-class/text()", doc);
+            var mainLauncherClassName = Optional.ofNullable(xPath.evaluate(
+                    "/jpackage-state/main-class/text()", doc));
 
             var macSigned = Optional.ofNullable(xPath.evaluate(
                     "/jpackage-state/signed/text()", doc)).map(
@@ -134,38 +143,51 @@ public record AppImageFile(String mainLauncherName, String mainLauncherClassName
                     "/jpackage-state/app-store/text()", doc)).map(
                             Boolean::parseBoolean).orElse(false);
 
-            var addLaunchers = XmlUtils.queryNodes(doc, xPath, "/jpackage-state/add-launcher").map(Element.class::cast).map(toFunction(addLauncher -> {
-                Map<String, String> launcherProps = new HashMap<>();
-
-                // @name and @service attributes.
-                XmlUtils.toStream(addLauncher.getAttributes()).forEach(attr -> {
-                    launcherProps.put(attr.getNodeName(), attr.getNodeValue());
-                });
-
-                // Extra properties.
-                XmlUtils.queryNodes(addLauncher, xPath, "*[count(*) = 0]").map(Element.class::cast).forEach(e -> {
-                    launcherProps.put(e.getNodeName(), e.getTextContent());
-                });
-
-                return launcherProps;
+            var addLaunchers = XmlUtils.queryNodes(doc, xPath, "/jpackage-state/add-launcher").map(Element.class::cast).map(toFunction(launcher -> {
+                return readLauncherProperties(xPath, launcher);
             }));
 
-            var mainLauncherProperties = Map.of("name", mainLauncherName);
+            var mainLauncher = XmlUtils.queryNodes(doc, xPath, "/jpackage-state/main-launcher[last()]").map(Element.class::cast).map(toFunction(launcher -> {
+                return readLauncherProperties(xPath, launcher);
+            })).findFirst().orElseThrow();
 
-            var launchers = Stream.concat(Stream.of(mainLauncherProperties), addLaunchers).collect(toMap(attrs -> {
-                return Objects.requireNonNull(attrs.get("name"));
-            }, attrs -> {
-                Map<String, String> copy = new HashMap<>(attrs);
-                copy.remove("name");
-                return Map.copyOf(copy);
-            }));
+            var mainLauncherName = mainLauncher.get("name");
 
-            return new AppImageFile(mainLauncherName, mainLauncherClassName,
-                    version, macSigned, macAppStore, launchers);
+            var launchers = Stream.concat(Stream.of(mainLauncher), addLaunchers).collect(toMap(launcherProps -> {
+                return Objects.requireNonNull(launcherProps.get("name"));
+            }, launcherProps -> {
+                launcherProps.remove("name");
+                return Collections.unmodifiableMap(launcherProps);
+            }, (k, _) -> {
+                throw new IllegalStateException(String.format("Duplicate key %s", k));
+            }, LinkedHashMap::new));
+
+            return new AppImageFile(
+                    mainLauncherName,
+                    mainLauncherClassName,
+                    version,
+                    macSigned,
+                    macAppStore,
+                    Collections.unmodifiableMap(launchers));
 
         }).get();
     }
 
+    private static HashMap<String, String> readLauncherProperties(XPath xPath, Element launcherElement) throws XPathExpressionException {
+        HashMap<String, String> launcherProps = new HashMap<>();
+
+        var name = Objects.requireNonNull(xPath.evaluate("@name", launcherElement));
+
+        launcherProps.put("name", name);
+
+        // Extra properties.
+        XmlUtils.queryNodes(launcherElement, xPath, "*[count(*) = 0]").map(Element.class::cast).forEach(e -> {
+            launcherProps.put(e.getNodeName(), e.getTextContent());
+        });
+
+        return launcherProps;
+    }
+
     private static String getVersion() {
         return System.getProperty("java.version");
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
index 4e239e16b59..a6d24af2b25 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -793,7 +793,7 @@ public final class MacHelper {
                 PropertyFinder.cmdlineOptionWithValue("--mac-package-identifier").or(
                         PropertyFinder.cmdlineOptionWithValue("--main-class").map(getPackageIdFromClassName)
                 ),
-                PropertyFinder.appImageFile(AppImageFile::mainLauncherClassName).map(getPackageIdFromClassName)
+                PropertyFinder.appImageFileOptional(AppImageFile::mainLauncherClassName).map(getPackageIdFromClassName)
         ).orElseGet(cmd::name);
     }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
index a48798172dd..be85c42eac9 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
@@ -22,36 +22,32 @@
  */
 package jdk.jpackage.test;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
-
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.jpackage.internal.Log;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingEnvironment;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.util.function.ThrowingSupplier;
 
 /**
  * jpackage type traits.
  */
 public enum PackageType {
-    WIN_MSI(".msi",
-            TKit.isWindows() ? "jdk.jpackage.internal.WinMsiBundler" : null),
-    WIN_EXE(".exe",
-            TKit.isWindows() ? "jdk.jpackage.internal.WinMsiBundler" : null),
-    LINUX_DEB(".deb",
-            TKit.isLinux() ? "jdk.jpackage.internal.LinuxDebBundler" : null),
-    LINUX_RPM(".rpm",
-            TKit.isLinux() ? "jdk.jpackage.internal.LinuxRpmBundler" : null),
-    MAC_DMG(".dmg", TKit.isOSX() ? "jdk.jpackage.internal.MacDmgBundler" : null),
-    MAC_PKG(".pkg", TKit.isOSX() ? "jdk.jpackage.internal.MacPkgBundler" : null),
+    WIN_MSI(".msi", OperatingSystem.WINDOWS),
+    WIN_EXE(".exe", OperatingSystem.WINDOWS),
+    LINUX_DEB(".deb", OperatingSystem.LINUX),
+    LINUX_RPM(".rpm", OperatingSystem.LINUX),
+    MAC_DMG(".dmg", OperatingSystem.MACOS),
+    MAC_PKG(".pkg", OperatingSystem.MACOS),
     IMAGE;
 
     PackageType() {
@@ -61,10 +57,10 @@ public enum PackageType {
         enabled = true;
     }
 
-    PackageType(String packageName, String bundleSuffix, String bundlerClass) {
+    PackageType(String packageName, String bundleSuffix, OperatingSystem os) {
         type  = Objects.requireNonNull(packageName);
         suffix = Objects.requireNonNull(bundleSuffix);
-        supported = Optional.ofNullable(bundlerClass).map(PackageType::isBundlerSupported).orElse(false);
+        supported = isSupported(new BundlingOperationDescriptor(os, type, "create"));
         enabled = supported && !Inner.DISABLED_PACKAGERS.contains(getType());
 
         if (suffix != null && enabled) {
@@ -72,8 +68,8 @@ public enum PackageType {
         }
     }
 
-    PackageType(String bundleSuffix, String bundlerClass) {
-        this(bundleSuffix.substring(1), bundleSuffix, bundlerClass);
+    PackageType(String bundleSuffix, OperatingSystem os) {
+        this(bundleSuffix.substring(1), bundleSuffix, os);
     }
 
     void applyTo(JPackageCommand cmd) {
@@ -105,42 +101,12 @@ public enum PackageType {
         return null;
     }
 
-    private static boolean isBundlerSupportedImpl(String bundlerClass) {
+    private static boolean isSupported(BundlingOperationDescriptor op) {
         try {
-            Class<?> clazz = Class.forName(bundlerClass);
-            Method supported = clazz.getMethod("supported", boolean.class);
-            return ((Boolean) supported.invoke(
-                    clazz.getConstructor().newInstance(), true));
-        } catch (ClassNotFoundException | IllegalAccessException ex) {
-        } catch (InstantiationException | NoSuchMethodException
-                | InvocationTargetException ex) {
-            rethrowUnchecked(ex);
+            return Inner.BUNDLING_ENV.configurationErrors(op).isEmpty();
+        } catch (NoSuchElementException ex) {
+            return false;
         }
-        return false;
-    }
-
-    private static boolean isBundlerSupported(String bundlerClass) {
-        AtomicBoolean reply = new AtomicBoolean();
-        try {
-            // Capture jpackage's activity on configuring bundlers.
-            // Log configuration is thread-local.
-            // Call Log.setPrintWriter and Log.setVerbose in a separate
-            // thread to keep the main log configuration intact.
-            var thread = new Thread(() -> {
-                Log.setPrintWriter(new PrintWriter(System.out), new PrintWriter(System.err));
-                Log.setVerbose();
-                try {
-                    reply.set(isBundlerSupportedImpl(bundlerClass));
-                } finally {
-                    Log.flush();
-                }
-            });
-            thread.run();
-            thread.join();
-        } catch (InterruptedException ex) {
-            rethrowUnchecked(ex);
-        }
-        return reply.get();
     }
 
     private static Set<PackageType> orderedSet(PackageType... types) {
@@ -155,13 +121,21 @@ public enum PackageType {
     public static final Set<PackageType> LINUX = orderedSet(LINUX_DEB, LINUX_RPM);
     public static final Set<PackageType> WINDOWS = orderedSet(WIN_MSI, WIN_EXE);
     public static final Set<PackageType> MAC = orderedSet(MAC_DMG, MAC_PKG);
-    public static final Set<PackageType> NATIVE = Stream.concat(
-            Stream.concat(LINUX.stream(), WINDOWS.stream()),
-            MAC.stream()).collect(Collectors.toUnmodifiableSet());
+    public static final Set<PackageType> NATIVE = Stream.of(LINUX, WINDOWS, MAC)
+            .flatMap(Collection::stream).collect(Collectors.toUnmodifiableSet());
 
     private static final class Inner {
         private static final Set<String> DISABLED_PACKAGERS = Optional.ofNullable(
                 TKit.tokenizeConfigProperty("disabledPackagers")).orElse(
                 TKit.isLinuxAPT() ? Set.of("rpm") : Collections.emptySet());
+
+        private static final BundlingEnvironment BUNDLING_ENV = ServiceLoader.load(
+                ThrowingSupplier.toSupplier(() -> {
+                    @SuppressWarnings("unchecked")
+                    var reply = (Class<BundlingEnvironment>)Class.forName("jdk.jpackage.internal.cli.CliBundlingEnvironment");
+                    return reply;
+                }).get(),
+                BundlingEnvironment.class.getClassLoader()
+        ).findFirst().orElseThrow();
     }
 }
diff --git a/test/jdk/tools/jpackage/junit/TEST.properties b/test/jdk/tools/jpackage/junit/TEST.properties
index c540eb76869..f979d918a68 100644
--- a/test/jdk/tools/jpackage/junit/TEST.properties
+++ b/test/jdk/tools/jpackage/junit/TEST.properties
@@ -1,8 +1,14 @@
 JUnit.dirs = share
 
-lib.dirs = /test/jdk/tools/jpackage/helpers /test/jdk/tools/jpackage/junit/tools
+# /test/jdk/tools/jpackage/share is needed to load ErrorTest class used in
+# jdk.jpackage.internal.cli.StandardValueConverterTest unit test.
+lib.dirs = \
+        /test/jdk/tools/jpackage/helpers \
+        /test/jdk/tools/jpackage/share \
+        /test/jdk/tools/jpackage/junit/tools
 
 modules=jdk.jpackage/jdk.jpackage.internal:+open \
+        jdk.jpackage/jdk.jpackage.internal.cli:+open \
         jdk.jpackage/jdk.jpackage.internal.model:+open \
         jdk.jpackage/jdk.jpackage.internal.pipeline:+open \
         jdk.jpackage/jdk.jpackage.internal.util:+open \
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
index 2bbb16c71d3..c22309922d7 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
@@ -23,123 +23,63 @@
 
 package jdk.jpackage.internal;
 
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_AS_SERVICE;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_NAME;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LINUX_LAUNCHER_SHORTCUT;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_APP_STORE;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_SIGNED;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.WIN_LAUNCHER_DESKTOP_SHORTCUT;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.WIN_LAUNCHER_MENU_SHORTCUT;
+import static jdk.jpackage.internal.cli.StandardOption.APPCLASS;
+import static jdk.jpackage.internal.cli.StandardOption.APP_VERSION;
+import static jdk.jpackage.internal.cli.StandardOption.NAME;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.OptionIdentifier;
+import jdk.jpackage.internal.cli.OptionValue;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardAppImageFileOption.AppImageFileOptionScope;
+import jdk.jpackage.internal.cli.WithOptionIdentifier;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExternalApplication;
 import jdk.jpackage.internal.model.ExternalApplication.LauncherInfo;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.LauncherStartupInfo;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
+import jdk.jpackage.test.ObjectMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 
 public class AppImageFileTest {
 
-    static AppImageBuilder build() {
-        return new AppImageBuilder();
-    }
-
-    static class AppImageBuilder {
-
-        AppImageBuilder version(String v) {
-            version = Objects.requireNonNull(v);
-            return this;
-        }
-
-        AppImageBuilder launcherName(String v) {
-            launcherName = Objects.requireNonNull(v);
-            return this;
-        }
-
-        AppImageBuilder mainClass(String v) {
-            mainClass = Objects.requireNonNull(v);
-            return this;
-        }
-
-        AppImageBuilder addExtra(Map<String, String> v) {
-            extra.putAll(v);
-            return this;
-        }
-
-        AppImageBuilder addExtra(String key, String value) {
-            extra.putAll(Map.of(key, value));
-            return this;
-        }
-
-        AppImageBuilder addlauncher(String name) {
-            return addlauncher(name, false);
-        }
-
-        AppImageBuilder addlauncher(String name, boolean isService) {
-            return addlauncher(name, isService, Map.of());
-        }
-
-        AppImageBuilder addlauncher(String name, boolean isService, Map<String, String> extra) {
-            Objects.requireNonNull(name);
-            Objects.requireNonNull(extra);
-            addLauncherInfos.add(new LauncherInfo(name, isService, extra));
-            return this;
-        }
-
-        AppImageBuilder addlauncher(String name, Map<String, String> extra) {
-            return addlauncher(name, false, extra);
-        }
-
-        AppImageFile create() {
-            final var additionalLaunchers = addLauncherInfos.stream().map(li -> {
-                return (Launcher)new Launcher.Stub(li.name(), Optional.empty(),
-                        List.of(), li.service(), null, Optional.empty(), null, li.extra());
-            }).toList();
-
-            final var startupInfo = new LauncherStartupInfo.Stub(mainClass, List.of(), List.of(), List.of());
-            final var mainLauncher = new Launcher.Stub(launcherName, Optional.of(startupInfo),
-                    List.of(), false, null, Optional.empty(), null, Map.of());
-
-            final var app = new Application.Stub(null, null, version, null, null,
-                    Optional.empty(), List.of(), null, Optional.empty(),
-                    new ApplicationLaunchers(mainLauncher, additionalLaunchers).asList(), extra);
-
-            return new AppImageFile(app);
-        }
-
-        void createInDir(Path dir) {
-            final var file = create();
-            final var copy = toSupplier(() -> {
-                file.save(DUMMY_LAYOUT.resolveAt(dir));
-                return AppImageFile.load(dir, DUMMY_LAYOUT);
-            }).get();
-
-            assertEquals(file, copy);
-        }
-
-        private String version = "1.0";
-        private String launcherName = "Foo";
-        private String mainClass = "Main";
-        private Map<String, String> extra = new HashMap<>();
-        private List<LauncherInfo> addLauncherInfos = new ArrayList<>();
-    }
-
     @Test
     public void testSimple() {
         build().createInDir(tempFolder);
@@ -147,135 +87,533 @@ public class AppImageFileTest {
 
     @ParameterizedTest
     @MethodSource
-    public void testExtra(Map<String, String> extra) {
+    public void testArbitraryExtra(Map<String, String> extra) {
         build().addExtra(extra).createInDir(tempFolder);
     }
 
-    private static Stream<Map<String, String>> testExtra() {
-        return Stream.of(Map.of("a", "b"), Map.of("foo", ""));
-    }
-
     @Test
     public void testAdditionalLaunchers() {
-        build().addlauncher("T")
-                .addlauncher("U", true)
-                .addlauncher("F", Map.of("prop", "one", "prop2", "two", "prop3", ""))
+        build().addlauncher("T").commit()
+                .addlauncher("U").service(true).commit()
+                .addlauncher("F").addExtra(Map.of("prop", "one", "prop2", "two", "prop3", "")).commit()
                 .createInDir(tempFolder);
     }
 
+    @Test
+    public void testMalformedXml() throws IOException {
+        var ex = assertThrowsExactly(JPackageException.class, () -> createFromXml(List.of("<a>"), OperatingSystem.current(), tempFolder));
+        Assertions.assertEquals(I18N.format("error.malformed-app-image-file", ".jpackage.xml", tempFolder), ex.getMessage());
+        assertNotNull(ex.getCause());
+    }
+
+    @Test
+    public void testNoSuchFile() throws IOException {
+        var ex = assertThrowsExactly(JPackageException.class, () -> AppImageFile.load(DUMMY_LAYOUT.resolveAt(tempFolder)));
+        Assertions.assertEquals(I18N.format("error.missing-app-image-file", ".jpackage.xml", tempFolder), ex.getMessage());
+        assertNull(ex.getCause());
+    }
+
+    @Test
+    public void testDirectory() throws IOException {
+        Files.createDirectory(AppImageFile.getPathInAppImage(DUMMY_LAYOUT.resolveAt(tempFolder)));
+
+        var ex = assertThrowsExactly(JPackageException.class, () -> AppImageFile.load(DUMMY_LAYOUT.resolveAt(tempFolder)));
+        Assertions.assertEquals(I18N.format("error.reading-app-image-file", ".jpackage.xml", tempFolder), ex.getMessage());
+        assertNotNull(ex.getCause());
+    }
+
+    @Test
+    @EnabledOnOs(value = OS.WINDOWS, disabledReason = "Can reliably lock a file using FileLock to cuase an IOException on Windows only")
+    @SuppressWarnings("try")
+    public void testGenericIOException() throws IOException {
+
+        final var appImageFile = AppImageFile.getPathInAppImage(DUMMY_LAYOUT.resolveAt(tempFolder));
+        Files.writeString(appImageFile, "");
+
+        try (var out = new FileOutputStream(appImageFile.toFile()); var lock = out.getChannel().lock()) {
+            var ex = assertThrowsExactly(JPackageException.class, () -> AppImageFile.load(DUMMY_LAYOUT.resolveAt(tempFolder)));
+            Assertions.assertEquals(I18N.format("error.reading-app-image-file", ".jpackage.xml", tempFolder), ex.getMessage());
+            assertNotNull(ex.getCause());
+        }
+    }
+
     @ParameterizedTest
     @MethodSource
     public void testInavlidXml(List<String> xmlData) throws IOException {
-        assertThrowsExactly(ConfigException.class, () -> createFromXml(xmlData), () -> {
-            return I18N.format("error.invalid-app-image", tempFolder, ".jpackage.xml");
-        });
-    }
-
-    private static Stream<List<String>> testInavlidXml() {
-        return Stream.of(List.of("<foo/>"),
-                List.of("<jpackage-state/>"),
-                createXml(),
-                createXml("<main-launcher></main-launcher>"),
-                createXml("<main-launcher>Foo</main-launcher>", "<main-class></main-class>"),
-                createXml("<add-launcher>A</add-launcher>")
-        );
+        var ex = assertThrowsExactly(JPackageException.class, () -> createFromXml(xmlData, OperatingSystem.current(), tempFolder));
+        Assertions.assertEquals(I18N.format("error.invalid-app-image-file", ".jpackage.xml", tempFolder), ex.getMessage());
+        assertNotNull(ex.getCause());
     }
 
     @ParameterizedTest
     @MethodSource
-    public void testValidXml(AppImageFile expected, List<String> xmlData) throws IOException, ConfigException {
-        final var actual = createFromXml(xmlData);
-        assertEquals(expected, actual);
+    public void testValidXml(ReadTestSpec testSpec) throws IOException {
+        testSpec.test(tempFolder);
     }
 
-    private static Stream<Arguments> testValidXml() {
-        return Stream.of(
-                Arguments.of(build().version("72").launcherName("Y").mainClass("main.Class").create(), createXml(
-                        "<main-launcher>Y</main-launcher>",
+
+    private static final class AppBuilder {
+
+        AppBuilder version(String v) {
+            version = Objects.requireNonNull(v);
+            return this;
+        }
+
+        AppBuilder appName(String v) {
+            appName = Objects.requireNonNull(v);
+            return this;
+        }
+
+        AppBuilder mainClass(String v) {
+            mainClass = Objects.requireNonNull(v);
+            return this;
+        }
+
+        AppBuilder addExtra(Map<String, String> v) {
+            extra.add(v);
+            return this;
+        }
+
+        <T> AppBuilder addExtra(WithOptionIdentifier option, T value) {
+            extra.add(option, value);
+            return this;
+        }
+
+        LauncherBuilder addlauncher(String name) {
+            return new LauncherBuilder(name);
+        }
+
+        LauncherBuilder mainlauncher() {
+            return mainLauncherBuilder;
+        }
+
+        ExternalApplication createExternalApplication(OperatingSystem os) {
+            var mainLauncherInfo = mainLauncherBuilder.createLauncherInfo();
+
+            var appOptions = Options.concat(
+                    Options.of(Map.of(
+                            APP_VERSION, version,
+                            NAME, appName,
+                            APPCLASS, mainClass)
+                    ),
+                    extra.asObjectValues(),
+                    mainLauncherInfo.asOptions());
+
+            return ExternalApplication.create(
+                    appOptions,
+                    addLauncherBuilders.stream()
+                            .map(LauncherBuilder::createLauncherInfo)
+                            .map(LauncherInfo::asOptions).toList(),
+                    os);
+        }
+
+        private Application createApplication() {
+            var mainLauncher = mainLauncherBuilder.createLauncher();
+
+            var fullExtra = extra.asStringValues();
+            if (OperatingSystem.isMacOS() && !fullExtra.containsKey(APPCLASS.getName())) {
+                fullExtra = new HashMap<>(fullExtra);
+                fullExtra.put(APPCLASS.getName(), mainClass);
+            }
+
+            return new Application.Stub(
+                    null,
+                    null,
+                    version,
+                    null,
+                    null,
+                    Optional.empty(),
+                    List.of(),
+                    null,
+                    Optional.empty(),
+                    new ApplicationLaunchers(
+                            mainLauncher,
+                            addLauncherBuilders.stream().map(LauncherBuilder::createLauncher).toList()).asList(),
+                    fullExtra);
+        }
+
+        void createInDir(Path dir) {
+            final var app = createApplication();
+            final var copy = toSupplier(() -> {
+                var layout = DUMMY_LAYOUT.resolveAt(dir);
+                new AppImageFile(app).save(layout);
+                return AppImageFile.load(layout);
+            }).get();
+
+            assertEquals(createExternalApplication(OperatingSystem.current()), copy);
+        }
+
+
+        final class LauncherBuilder {
+            private LauncherBuilder(String name) {
+                this.name = Optional.of(name);
+            }
+
+            private LauncherBuilder() {
+                this.name = Optional.empty();
+            }
+
+            LauncherBuilder service(boolean v) {
+                service = v;
+                return this;
+            }
+
+            LauncherBuilder addExtra(Map<String, String> v) {
+                extra.add(v);
+                return this;
+            }
+
+            <T> LauncherBuilder addExtra(WithOptionIdentifier option, T value) {
+                extra.add(option, value);
+                return this;
+            }
+
+            AppBuilder commit() {
+                if (!isMainLauncher()) {
+                    addLauncherBuilders.add(this);
+                }
+                return AppBuilder.this;
+            }
+
+            private Launcher createLauncher() {
+                return new Launcher.Stub(
+                        name(),
+                        Optional.empty(),
+                        List.of(),
+                        service,
+                        null,
+                        Optional.empty(),
+                        null,
+                        extra.asStringValues());
+            }
+
+            private String name() {
+                if (isMainLauncher()) {
+                    return Objects.requireNonNull(appName);
+                } else {
+                    return name.orElseThrow();
+                }
+            }
+
+            private boolean isMainLauncher() {
+                return name.isEmpty();
+            }
+
+            private LauncherInfo createLauncherInfo() {
+                var allProps = new ExtraPropertyBuilder(extra);
+                if (service) {
+                    allProps.add(LAUNCHER_AS_SERVICE, Boolean.valueOf(service));
+                }
+                allProps.add(LAUNCHER_NAME, name());
+                return LauncherInfo.create(allProps.asObjectValues());
+            }
+
+            private final Optional<String> name;
+            private boolean service;
+            private final ExtraPropertyBuilder extra = new ExtraPropertyBuilder();
+        }
+
+
+        private static final class ExtraPropertyBuilder {
+
+            ExtraPropertyBuilder() {
+            }
+
+            ExtraPropertyBuilder(ExtraPropertyBuilder other) {
+                stringValues.putAll(other.stringValues);
+                objValues.putAll(other.objValues);
+            }
+
+            ExtraPropertyBuilder add(Map<String, String> v) {
+                stringValues.putAll(v);
+                return this;
+            }
+
+            <T> ExtraPropertyBuilder add(WithOptionIdentifier option, T value) {
+                objValues.put(option, Objects.requireNonNull(value));
+                return this;
+            }
+
+            Map<String, String> asStringValues() {
+                return Map.copyOf(stringValues);
+            }
+
+            Options asObjectValues() {
+                return Options.of(objValues);
+            }
+
+            private final Map<String, String> stringValues = new HashMap<>();
+            private final Map<WithOptionIdentifier, Object> objValues = new HashMap<>();
+        }
+
+
+        private String version = "1.0";
+        private String appName = "Foo";
+        private String mainClass = "Main";
+        private final ExtraPropertyBuilder extra = new ExtraPropertyBuilder();
+        private final LauncherBuilder mainLauncherBuilder = new LauncherBuilder();
+        private final List<LauncherBuilder> addLauncherBuilders = new ArrayList<>();
+    }
+
+
+    private record ReadTestSpec(ExternalApplication expected, List<String> xmlData, OperatingSystem os) {
+
+        ReadTestSpec {
+            Objects.requireNonNull(expected);
+            Objects.requireNonNull(xmlData);
+            Objects.requireNonNull(os);
+        }
+
+        void test(Path appImageDir) throws IOException {
+            var actual = createFromXml(xmlData, os, appImageDir);
+            assertEquals(expected, actual);
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static final class Builder {
+
+            Builder expect(AppBuilder builder) {
+                return expect(builder.createExternalApplication(os));
+            }
+
+            Builder expect(ExternalApplication v) {
+                expected = v;
+                return this;
+            }
+
+            Builder xml(String... xml) {
+                xmlData = List.of(xml);
+                return this;
+            }
+
+            Builder os(OperatingSystem v) {
+                os = v;
+                return this;
+            }
+
+            ReadTestSpec create() {
+                return new ReadTestSpec(expected, createXml(os, xmlData.toArray(String[]::new)), os);
+            }
+
+            private ExternalApplication expected;
+            private List<String> xmlData;
+            private OperatingSystem os = OperatingSystem.LINUX;
+        }
+    }
+
+
+    private static AppBuilder build() {
+        return new AppBuilder();
+    }
+
+    private static Stream<Map<String, String>> testArbitraryExtra() {
+        return Stream.of(Map.of("a", "b"), Map.of("foo", ""));
+    }
+
+    private static List<List<String>> testInavlidXml() {
+        List<List<String>> data = new ArrayList<>();
+
+        var os = OperatingSystem.current();
+
+        data.addAll(List.of
+                (List.of("<foo/>"),
+                createValidBodyWithHeader(null, null),
+                createValidBodyWithHeader("foo", "foo"),
+                createValidBodyWithHeader(null, "foo"),
+                createValidBodyWithHeader("foo", null),
+                createValidBodyWithHeader(AppImageFile.getPlatform(os), null),
+                createValidBodyWithHeader(AppImageFile.getPlatform(os), "foo"),
+                createValidBodyWithHeader(null, AppImageFile.getVersion()),
+                createValidBodyWithHeader("foo", AppImageFile.getVersion()),
+                createXml(os, "<main-launcher></main-launcher>"),
+                createXml(os, "<main-launcher>A</main-launcher>"),
+                createXml(os, "<add-launcher>A</add-launcher>"),
+                createXml(os, createValidBodyWithHeader(AppImageFile.getPlatform(os), AppImageFile.getVersion()).toArray(String[]::new)),
+                createWithHeader(AppImageFile.getPlatform(os), AppImageFile.getVersion(), () -> {
+                    // Missing 'app-version' element.
+                    return List.of(
+                            "<main-launcher name='D'/>",
+                            "<main-class>Hello</main-class>"
+                    );
+                })
+        ));
+
+        if (OperatingSystem.isMacOS()) {
+            data.add(createXml(os, "<main-launcher name='Foo'/>", "<main-class></main-class>"));
+        }
+
+        return data;
+    }
+
+    private static List<String> createValidBodyWithHeader(String platform, String version) {
+        return createWithHeader(platform, version, () -> {
+            return List.of(
+                    "<main-launcher name='D'/>",
+                    "<app-version>100</app-version>",
+                    "<main-class>Hello</main-class>"
+            );
+        });
+    }
+
+    private static List<String> createWithHeader(String platform, String version, Supplier<List<String>> body) {
+
+        var sb = new StringBuilder();
+        sb.append("<jpackage-state");
+        Optional.ofNullable(platform).ifPresent(v -> {
+            sb.append(String.format(" platform=\"%s\"", v));
+        });
+        Optional.ofNullable(version).ifPresent(v -> {
+            sb.append(String.format(" version=\"%s\"", v));
+        });
+        sb.append(">");
+
+        return Stream.of(List.of(sb.toString()), body.get(), List.of("</jpackage-state>")).flatMap(Collection::stream).toList();
+    }
+
+
+    private static Collection<ReadTestSpec> platformSpecificProperties() {
+        var builder = ReadTestSpec.build().xml(
+                "<app-version>1.34</app-version>",
+                "<main-class>Foo</main-class>",
+                "<y/>",
+                "<x>property-x</x>",
+                "<signed>true</signed>",
+                "<app-store>False</app-store>",
+                "<add-launcher name='add-launcher'>",
+                "  <service>true</service>",
+                "  <linux-shortcut>true</linux-shortcut>",
+                "  <win-shortcut>false</win-shortcut>",
+                "  <win-menu>app-dir</win-menu>",
+                "</add-launcher>",
+                "<main-launcher name='Bar'/>"
+        );
+
+        Supplier<AppBuilder.LauncherBuilder> appBuilder = () -> {
+            return build().mainClass("Foo").version("1.34").appName("Bar").addlauncher("add-launcher").service(true);
+        };
+
+        List<ReadTestSpec> testCases = new ArrayList<>();
+        testCases.add(builder.os(OperatingSystem.LINUX).expect(appBuilder.get()
+                .addExtra(LINUX_LAUNCHER_SHORTCUT, new LauncherShortcut(LauncherShortcutStartupDirectory.DEFAULT)).commit()).create());
+
+        testCases.add(builder.os(OperatingSystem.WINDOWS).expect(appBuilder.get()
+                .addExtra(WIN_LAUNCHER_DESKTOP_SHORTCUT, new LauncherShortcut())
+                .addExtra(WIN_LAUNCHER_MENU_SHORTCUT, new LauncherShortcut(LauncherShortcutStartupDirectory.APP_DIR)).commit()).create());
+
+        testCases.add(builder.os(OperatingSystem.MACOS).expect(appBuilder.get().commit()
+                .addExtra(MAC_APP_STORE, false)
+                .addExtra(MAC_SIGNED, true)).create());
+
+        return testCases;
+    }
+
+    private static Stream<ReadTestSpec> testValidXml() {
+        return Stream.concat(platformSpecificProperties().stream(), Stream.of(
+                ReadTestSpec.build().expect(
+                        build().version("72").appName("Y").mainClass("main.Class")
+                ).xml(
+                        "<main-launcher name='Y'/>",
                         "<app-version>72</app-version>",
-                        "<main-class>main.Class</main-class>")
+                        "<main-class>main.Class</main-class>"
                 ),
-                Arguments.of(build().addExtra("x", "property-x").addExtra("signed", "false")
-                        .addExtra("y", "").addlauncher("another-launcher").addlauncher("service-launcher", true)
-                        .addlauncher("launcher-with-extra", Map.of("a", "", "b", "", "c", "Q"))
-                        .addlauncher("service-launcher-with-extra", true, Map.of("h", "F")).create(), createXml(
-                        "<app-version>1.0</app-version>",
-                        "<main-class>Main</main-class>",
-                        "<y/>",
-                        "<x>property-x</x>",
-                        "<signed>false</signed>",
-                        "<add-launcher name='service-launcher' service='true'/>",
-                        "<add-launcher name='another-launcher'></add-launcher>",
-                        "<add-launcher name='launcher-with-extra'><a></a><b/><c>Q</c></add-launcher>",
-                        "<add-launcher name='service-launcher-with-extra' service='true'><h>F</h></add-launcher>",
-                        "<main-launcher>Foo</main-launcher>")
-                ),
-                Arguments.of(build().addExtra("signed", "FalsE").create(), createXml(
+                ReadTestSpec.build().os(OperatingSystem.LINUX).expect(
+                        build()
+                        .addlauncher("another-launcher")
+                                .addExtra(LINUX_LAUNCHER_SHORTCUT, new LauncherShortcut(LauncherShortcutStartupDirectory.APP_DIR))
+                                .commit()
+                        .addlauncher("service-launcher")
+                                .service(true)
+                                .commit()
+                ).xml(
                         "<app-version>1.2</app-version>",
                         "<app-version>1.0</app-version>",
                         "<main-class>OverwrittenMain</main-class>",
                         "<main-class>Main</main-class>",
-                        "<main-launcher>Bar</main-launcher>",
-                        "<main-launcher>Foo</main-launcher>",
-                        "<signed>false</signed>",
-                        "<signed>FalsE</signed>")
-                ),
-                Arguments.of(build().addExtra("signed", "true").addExtra("with-comment", "ab")
-                        .addlauncher("a", Map.of("bar", "foo")).create(), createXml(
-                        "<app-version>1.0</app-version>",
-                        "<main-class>Main</main-class>",
-                        "<main-launcher>Foo</main-launcher>",
+                        "<x>property-x</x>",
                         "<signed>true</signed>",
-                        "<with-comment>a<!-- This is a comment -->b</with-comment>",
-                        "<add-launcher name='a'><name>foo</name><bar>foo</bar><service>true</service></add-launcher>",
-                        "<other><nested>false</nested></other>",
-                        "<another-other>A<child/>B</another-other>")
+                        "<add-launcher name='service-launcher' service='true'>",
+                        "  <linux-shortcut><nested>foo</nested></linux-shortcut>",
+                        "</add-launcher>",
+                        "<add-launcher name='another-launcher'>",
+                        "  <linux-shortcut>true</linux-shortcut>",
+                        "  <linux-shortcut>app-<!-- This is a comment -->dir</linux-shortcut>",
+                        "</add-launcher>",
+                        "<main-launcher name='Bar'/>",
+                        "<main-launcher name='Foo'/>"
                 )
-        );
+        ).map(ReadTestSpec.Builder::create));
     }
 
-    private AppImageFile createFromXml(List<String> xmlData) throws IOException, ConfigException {
-        Path path = AppImageFile.getPathInAppImage(DUMMY_LAYOUT.resolveAt(tempFolder));
-        path.toFile().mkdirs();
-        Files.delete(path);
+    private static ExternalApplication createFromXml(List<String> xmlData, OperatingSystem os, Path appImageDir) throws IOException {
+        Path path = AppImageFile.getPathInAppImage(DUMMY_LAYOUT.resolveAt(appImageDir));
 
         List<String> data = new ArrayList<>();
         data.add("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>");
         data.addAll(xmlData);
 
-        Files.write(path, data, StandardOpenOption.CREATE,
-                    StandardOpenOption.TRUNCATE_EXISTING);
+        Files.write(path, data, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
 
-        AppImageFile image = AppImageFile.load(tempFolder, DUMMY_LAYOUT);
+        ExternalApplication image = AppImageFile.load(DUMMY_LAYOUT.resolveAt(appImageDir), os);
         return image;
     }
 
-    private static void assertEquals(AppImageFile expected, AppImageFile actual) {
-        assertPropertyEquals(expected, actual, AppImageFile::getAppVersion);
-        assertPropertyEquals(expected, actual, AppImageFile::getLauncherName);
-        assertPropertyEquals(expected, actual, AppImageFile::getMainClass);
-        assertPropertyEquals(expected, actual, AppImageFile::getExtra);
-        Assertions.assertEquals(additionaLaunchersAsMap(expected), additionaLaunchersAsMap(actual));
+    private static void assertEquals(ExternalApplication expected, ExternalApplication actual) {
+        Assertions.assertEquals(OM.map(expected), OM.map(actual));
     }
 
-    private static Map<String, AppImageFile.LauncherInfo> additionaLaunchersAsMap(AppImageFile file) {
-        return file.getAddLaunchers().stream().collect(Collectors.toMap(AppImageFile.LauncherInfo::name, x -> x));
+    private static Map<String, Map<String, Object>> additionaLaunchersAsMap(ExternalApplication file) {
+        return file.addLaunchers().stream().collect(toMap(LauncherInfo::name, li -> {
+            return toPropertyMap(li.asOptions());
+        }));
     }
 
-    private static <T, U> void assertPropertyEquals(T expected, T actual, Function<T, U> getProperty) {
-        Assertions.assertEquals(getProperty.apply(expected), getProperty.apply(actual));
-    }
-
-    private static final List<String> createXml(String ...xml) {
+    private static final List<String> createXml(OperatingSystem os, String ...xml) {
         final List<String> content = new ArrayList<>();
-        content.add(String.format("<jpackage-state platform=\"%s\" version=\"%s\">", AppImageFile.getPlatform(), AppImageFile.getVersion()));
+        content.add(String.format("<jpackage-state platform=\"%s\" version=\"%s\">", AppImageFile.getPlatform(os), AppImageFile.getVersion()));
         content.addAll(List.of(xml));
         content.add("</jpackage-state>");
         return content;
     }
 
+    private static Map<String, Object> toPropertyMap(Options options) {
+        return options.toMap().entrySet().stream().collect(toMap(e -> {
+            return Objects.requireNonNull(OPTIONS.get(e.getKey()));
+        }, Map.Entry::getValue));
+    }
+
     @TempDir
     private Path tempFolder;
 
+    private static final ObjectMapper OM;
+
     private static final ApplicationLayout DUMMY_LAYOUT = ApplicationLayout.build().setAll("").create();
+
+    private final static Map<OptionIdentifier, String> OPTIONS = Stream.of(AppImageFileOptionScope.values())
+            .flatMap(AppImageFileOptionScope::options)
+            .collect(toMap(OptionValue::id, OptionValue::getName));
+
+    static {
+        var app = build().addlauncher("foo").commit().createExternalApplication(OperatingSystem.current());
+
+        OM = ObjectMapper.standard()
+                .subst(ExternalApplication.class, "addLaunchers", obj -> {
+                    return additionaLaunchersAsMap(obj);
+                })
+                .subst(ExternalApplication.class, "extra", obj -> {
+                    return toPropertyMap(obj.extra());
+                })
+                .subst(LauncherInfo.class, "extra", obj -> {
+                    return toPropertyMap(obj.extra());
+                })
+                .subst(LauncherInfo.class, "asOptions", obj -> {
+                    return toPropertyMap(obj.asOptions());
+                })
+                .exceptLeafClasses().add(NAME.id().getClass().getName()).apply()
+                .exceptSomeMethods(app.getClass()).add("options").apply()
+                .exceptSomeMethods(app.mainLauncher().getClass()).add("options").apply()
+                .create();
+    }
 }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
new file mode 100644
index 00000000000..ef5b118d7cf
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Optional;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import org.junit.jupiter.api.Test;
+
+
+public class DefaultBundlingEnvironmentTest {
+
+    @Test
+    void testDefaultBundlingOperation() {
+
+        var executed = new int[1];
+
+        var descriptor = new BundlingOperationDescriptor(OperatingSystem.current(), "foo", "build");
+
+        var env = new DefaultBundlingEnvironment(DefaultBundlingEnvironment.build().defaultOperation(() -> {
+            executed[0] = executed[0] + 1;
+            return Optional.of(descriptor);
+        }));
+
+        // Assert the default bundling operation supplier is not called in the ctor.
+        assertEquals(0, executed[0]);
+
+        // Assert the default bundling operation is as expected.
+        assertEquals(descriptor, env.defaultOperation().orElseThrow());
+        assertEquals(1, executed[0]);
+
+        // Assert the default bundling operation supplier is called only once.
+        assertEquals(descriptor, env.defaultOperation().orElseThrow());
+        assertEquals(1, executed[0]);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
deleted file mode 100644
index 70ede94e344..00000000000
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jpackage.internal;
-
-import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import jdk.jpackage.internal.model.PackagerException;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-
-public class DeployParamsTest {
-
-    @Test
-    public void testValidAppName() throws PackagerException {
-        initParamsAppName();
-
-        setAppNameAndValidate("Test");
-
-        setAppNameAndValidate("Test Name");
-
-        setAppNameAndValidate("Test - Name !!!");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {"Test\nName", "Test\rName", "TestName\\", "Test \" Name"})
-    public void testInvalidAppName(String appName) throws PackagerException {
-        initParamsAppName();
-        var ex = assertThrowsExactly(PackagerException.class, () -> setAppNameAndValidate(appName));
-
-        assertTrue(ex.getMessage().startsWith("Error: Invalid Application name"));
-    }
-
-    // Returns deploy params initialized to pass all validation, except for
-    // app name
-    private void initParamsAppName() {
-        params = new DeployParams();
-
-        params.addBundleArgument(Arguments.CLIOptions.APPCLASS.getId(),
-                "TestClass");
-        params.addBundleArgument(Arguments.CLIOptions.MAIN_JAR.getId(),
-                "test.jar");
-        params.addBundleArgument(Arguments.CLIOptions.INPUT.getId(), "input");
-    }
-
-    private void setAppNameAndValidate(String appName) throws PackagerException {
-        params.addBundleArgument(Arguments.CLIOptions.NAME.getId(), appName);
-        params.validate();
-    }
-
-    private DeployParams params;
-}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/LauncherStartupInfoBuilderTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/LauncherStartupInfoBuilderTest.java
new file mode 100644
index 00000000000..ebbd4ab1c63
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/LauncherStartupInfoBuilderTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LauncherJarStartupInfo;
+import jdk.jpackage.internal.model.LauncherJarStartupInfoMixin;
+import jdk.jpackage.internal.model.LauncherModularStartupInfo;
+import jdk.jpackage.internal.model.LauncherModularStartupInfoMixin;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.HelloApp;
+import jdk.jpackage.test.JUnitAdapter;
+import jdk.jpackage.test.JavaAppDesc;
+import jdk.jpackage.test.ObjectMapper;
+import jdk.jpackage.test.TKit;
+
+public class LauncherStartupInfoBuilderTest extends JUnitAdapter {
+
+    public record TestSpec(JavaAppDesc javaAppDesc, boolean withMainClass, Object expectedInfo) {
+        public TestSpec {
+            Objects.requireNonNull(javaAppDesc);
+            Objects.requireNonNull(expectedInfo);
+        }
+
+        void test() throws ConfigException {
+            final var workDir = TKit.createTempDirectory("input");
+
+            HelloApp.createBundle(javaAppDesc, workDir);
+
+            final var builder = new LauncherStartupInfoBuilder();
+
+            builder.inputDir(workDir);
+
+            if (withMainClass) {
+                builder.mainClassName(javaAppDesc.className());
+            }
+
+            Optional.ofNullable(javaAppDesc.moduleName()).ifPresentOrElse(moduleName -> {
+                if (javaAppDesc.isWithMainClass()) {
+                    builder.moduleName(moduleName + "/" + javaAppDesc.className());
+                } else {
+                    builder.moduleName(moduleName);
+                }
+                builder.modulePath(List.of(workDir));
+            }, () -> {
+                builder.mainJar(Path.of(javaAppDesc.jarFileName()));
+            });
+
+            final var actualInfo = builder.create();
+
+            assertEquals(expectedInfo, OM.map(actualInfo));
+        }
+
+        static final class Builder {
+            TestSpec create() {
+                return new TestSpec(javaAppDesc, withMainClass, OM.map(createInfo()));
+            }
+
+            Builder javaAppDesc(String v) {
+                javaAppDesc = JavaAppDesc.parse(v);
+                return this;
+            }
+
+            Builder withMainClass(boolean v) {
+                withMainClass = v;
+                return this;
+            }
+
+            private LauncherStartupInfo createInfo() {
+                final var base = createBaseInfo();
+                if (javaAppDesc.moduleName() != null) {
+                    return LauncherModularStartupInfo.create(base, createModularMixin());
+                } else {
+                    return LauncherJarStartupInfo.create(base, createJarMixin());
+                }
+            }
+
+            private LauncherStartupInfo createBaseInfo() {
+                return new LauncherStartupInfo.Stub(javaAppDesc.className(), List.of(), List.of(), classPath);
+            }
+
+            private LauncherJarStartupInfoMixin createJarMixin() {
+                return new LauncherJarStartupInfoMixin.Stub(Path.of(javaAppDesc.jarFileName()),
+                        !withMainClass && javaAppDesc.isWithMainClass());
+            }
+
+            private LauncherModularStartupInfoMixin createModularMixin() {
+                return new LauncherModularStartupInfoMixin.Stub(javaAppDesc.moduleName(),
+                        Optional.ofNullable(javaAppDesc.moduleVersion()));
+            }
+
+            private JavaAppDesc javaAppDesc;
+            private boolean withMainClass = true;
+            private List<Path> classPath = new ArrayList<>();
+        }
+    }
+
+    @Test
+    @ParameterSupplier
+    public static void test(TestSpec spec) throws ConfigException {
+        spec.test();
+    }
+
+    public static Collection<Object[]> test() {
+        return Stream.of(
+                build(""),
+                build("foo.jar:foo.bar.U"),
+                build("foo.jar:foo.bar.U!"),
+                build("foo.jar:foo.bar.U!").withMainClass(false),
+                build("a.b/d.c.O").withMainClass(true),
+                build("a.b/d.c.O@3.5.7-beta").withMainClass(true),
+                build("a.b/d.c.O!"),
+                build("a.b/d.c.O!").withMainClass(false)
+        ).map(TestSpec.Builder::create).map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
+
+    private static TestSpec.Builder build(String javaAppDesc) {
+        return new TestSpec.Builder().javaAppDesc(javaAppDesc);
+    }
+
+    private static final ObjectMapper OM = ObjectMapper.standard().create();
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
index 24c1d62c34f..8168b876d2f 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
@@ -57,12 +57,11 @@ import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackageType;
-import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.model.RuntimeBuilder;
 import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -74,7 +73,7 @@ public class PackagingPipelineTest {
 
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    void testBuildApplication(boolean withRuntimeBuilder, @TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testBuildApplication(boolean withRuntimeBuilder, @TempDir Path workDir) throws IOException {
 
         final var app = createApp(TEST_LAYOUT_1, withRuntimeBuilder ? Optional.of(TestRuntimeBuilder.INSTANCE) : Optional.empty());
         final var env = buildEnv(workDir.resolve("build")).appImageDirFor(app).create();
@@ -115,7 +114,7 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testCopyApplication(@TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testCopyApplication(@TempDir Path workDir) throws IOException {
 
         final var srcApp = createApp(TEST_LAYOUT_1, TestRuntimeBuilder.INSTANCE);
 
@@ -170,7 +169,7 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testCreatePackage(@TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testCreatePackage(@TempDir Path workDir) throws IOException {
 
         final var outputDir = workDir.resolve("bundles");
         final var pkg = buildPackage(createApp(TEST_LAYOUT_1_WITH_INSTALL_DIR, TestRuntimeBuilder.INSTANCE)).create();
@@ -209,7 +208,7 @@ public class PackagingPipelineTest {
 
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    void testCreateRuntimeInstaller(boolean transformLayout, @TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testCreateRuntimeInstaller(boolean transformLayout, @TempDir Path workDir) throws IOException {
 
         final AppImageLayout srcLayout;
         if (transformLayout) {
@@ -273,7 +272,7 @@ public class PackagingPipelineTest {
 
     @ParameterizedTest
     @EnumSource(ExternalAppImageMode.class)
-    void testCreatePackageFromExternalAppImage(ExternalAppImageMode mode, @TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testCreatePackageFromExternalAppImage(ExternalAppImageMode mode, @TempDir Path workDir) throws IOException {
 
         final ApplicationLayout appLayout;
         final ExpectedAppImage expectedAppImage;
@@ -322,7 +321,7 @@ public class PackagingPipelineTest {
 
     @ParameterizedTest
     @EnumSource(names={"COPY", "COPY_FROM_BUILD_ENV"})
-    void testCreatePackageFromExternalAppImageNoCopyAction(ExternalAppImageMode mode, @TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testCreatePackageFromExternalAppImageNoCopyAction(ExternalAppImageMode mode, @TempDir Path workDir) throws IOException {
 
         final ApplicationLayout appLayout = TEST_LAYOUT_1_WITH_INSTALL_DIR;
 
@@ -379,7 +378,7 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testCreatePackageFromExternalAppImageWithoutExternalAppImageError(@TempDir Path workDir) throws ConfigException, PackagerException, IOException {
+    void testCreatePackageFromExternalAppImageWithoutExternalAppImageError(@TempDir Path workDir) throws IOException {
 
         final var env = setupBuildEnvForExternalAppImage(workDir);
         final var pkg = buildPackage(createApp(TEST_LAYOUT_1_WITH_INSTALL_DIR)).create();
@@ -389,7 +388,7 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testExceptionRethrow_RuntimeException() throws ConfigException, PackagerException, IOException {
+    void testExceptionRethrow_RuntimeException() throws IOException {
 
         final var expectedException = new RuntimeException("foo");
         final var ex = testExceptionRethrow(expectedException, expectedException.getClass(), () -> {
@@ -399,9 +398,9 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testExceptionRethrow_PackagerException() throws ConfigException, PackagerException, IOException {
+    void testExceptionRethrow_PackagerException() throws IOException {
 
-        final var expectedException = new PackagerException("param.vendor.default");
+        final var expectedException = new RuntimeException("param.vendor.default");
         final var ex = testExceptionRethrow(expectedException, expectedException.getClass(), () -> {
             throw expectedException;
         });
@@ -409,17 +408,17 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testExceptionRethrow_Exception() throws ConfigException, PackagerException, IOException {
+    void testExceptionRethrow_Exception() throws IOException {
 
         final var expectedException = new Exception("foo");
-        final var ex = testExceptionRethrow(expectedException, PackagerException.class, () -> {
+        final var ex = testExceptionRethrow(expectedException, ExceptionBox.class, () -> {
             rethrowUnchecked(expectedException);
         });
         assertSame(expectedException, ex.getCause());
     }
 
     @Test
-    void testAppImageAction() throws PackagerException, IOException {
+    void testAppImageAction() throws IOException {
 
         final var app = createApp(TEST_LAYOUT_1);
         final var env = dummyBuildEnv();
@@ -439,7 +438,7 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testAppImageActionWithPackage() throws PackagerException, IOException {
+    void testAppImageActionWithPackage() throws IOException {
 
         final var pkg = buildPackage(createApp(TEST_LAYOUT_1, TestRuntimeBuilder.INSTANCE)).create();
         final var env = dummyBuildEnv();
@@ -462,7 +461,7 @@ public class PackagingPipelineTest {
     }
 
     @Test
-    void testPackageActionWithApplication() throws PackagerException, IOException {
+    void testPackageActionWithApplication() throws IOException {
 
         final var app = createApp(TEST_LAYOUT_1);
         final var env = dummyBuildEnv();
@@ -480,7 +479,7 @@ public class PackagingPipelineTest {
 
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    void testContextMapper(boolean allowAll) throws PackagerException, IOException {
+    void testContextMapper(boolean allowAll) throws IOException {
 
         var builder = PackagingPipeline.buildStandard().contextMapper(ctx -> {
             return new TaskContext() {
@@ -490,7 +489,7 @@ public class PackagingPipelineTest {
                 }
 
                 @Override
-                public void execute(TaskAction taskAction) throws IOException, PackagerException {
+                public void execute(TaskAction taskAction) throws IOException {
                     if (!allowAll) {
                         throw new AssertionError();
                     }
@@ -538,7 +537,7 @@ public class PackagingPipelineTest {
 
     private static Exception testExceptionRethrow(Exception expectedException,
             Class<? extends Exception> expectedCatchExceptionType,
-            NoArgTaskAction throwAction) throws PackagerException, IOException {
+            NoArgTaskAction throwAction) throws IOException {
 
         final var app = createApp(TEST_LAYOUT_1);
         final var env = dummyBuildEnv();
@@ -551,7 +550,7 @@ public class PackagingPipelineTest {
         return assertThrowsExactly(expectedCatchExceptionType, () -> pipeline.execute(env,  app));
     }
 
-    private static BuildEnv setupBuildEnvForExternalAppImage(Path workDir) throws ConfigException {
+    private static BuildEnv setupBuildEnvForExternalAppImage(Path workDir) {
         // Create an app image in `env.appImageDir()` directory.
         final var env = buildEnv(workDir.resolve("build"))
                 .appImageLayout(TEST_LAYOUT_1.resolveAt(Path.of("a/b/c")).resetRootDirectory())
@@ -565,7 +564,7 @@ public class PackagingPipelineTest {
 
     private static void createAndVerifyPackage(PackagingPipeline.Builder builder, Package pkg,
             BuildEnv env, Path outputDir, String logMsgHeader, ExpectedAppImage expectedAppImage,
-            TaskID... expectedExecutedTaskActions) throws PackagerException, IOException {
+            TaskID... expectedExecutedTaskActions) throws IOException {
         Objects.requireNonNull(logMsgHeader);
 
         final var startupParameters = builder.createStartupParameters(env, pkg, outputDir);
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/DefaultOptionsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/DefaultOptionsTest.java
new file mode 100644
index 00000000000..26d9e51dbce
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/DefaultOptionsTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.OptionIdentifier.createIdentifier;
+import static jdk.jpackage.internal.cli.WithOptionIdentifier.stub;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.util.Map;
+import java.util.Set;
+import jdk.jpackage.internal.cli.DefaultOptions.OptionIdentifierWithValue;
+import jdk.jpackage.internal.cli.DefaultOptions.Snapshot;
+import org.junit.jupiter.api.Test;
+
+public class DefaultOptionsTest {
+
+    @Test
+    public void test_ctor_Snapshot_bad_option_names() {
+        var ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            DefaultOptions.create(new Snapshot(Map.of(), Set.of(OptionName.of("foo"))));
+        });
+
+        assertEquals("Unexpected option names", ex.getMessage());
+    }
+
+    @Test
+    public void test_ctor_Snapshot_bad_option_map() {
+        var ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            DefaultOptions.create(new Snapshot(
+                    Map.of(createIdentifier(), new OptionIdentifierWithValue(stub(createIdentifier()), "foo")),
+                    Set.of()));
+        });
+
+        assertEquals("Corrupted options map", ex.getMessage());
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ExpectedOptions.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ExpectedOptions.java
new file mode 100644
index 00000000000..39519efa477
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ExpectedOptions.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.test.JUnitUtils.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+final class ExpectedOptions {
+
+    static ExpectedOptions expectOptions() {
+        return new ExpectedOptions();
+    }
+
+    ExpectedOptions add(OptionIdentifier id, Object expectedValue) {
+        expected.put(Objects.requireNonNull(id), Objects.requireNonNull(expectedValue));
+        return this;
+    }
+
+    ExpectedOptions add(OptionValue<?> ov, Object expectedValue) {
+        ov.asOption().map(Option::spec).map(OptionSpec::names).ifPresent(names -> {
+            expectedOptionNames.put(ov.id(), names);
+        });
+        return add(ov.id(), expectedValue);
+    }
+
+    ExpectedOptions add(Option o, Object expectedValue) {
+        expectedOptionNames.put(o.id(), o.spec().names());
+        return add(o.id(), expectedValue);
+    }
+
+    void apply(Options options) {
+        for (var e : expected.entrySet()) {
+            var actualValue = options.find(e.getKey()).orElseThrow();
+            var expectedValue = e.getValue();
+            if (expectedValue.getClass().isArray()) {
+                assertArrayEquals(expectedValue, actualValue);
+            } else {
+                assertEquals(expectedValue, actualValue);
+            }
+        }
+
+        expectedOptionNames.values().stream().flatMap(Collection::stream).forEach(optionName -> {
+            assertTrue(options.contains(optionName));
+        });
+
+        assertEquals(convertArrayValuesToLists(expected), convertArrayValuesToLists(options.toMap()));
+        assertEquals(expected.keySet(), options.ids());
+    }
+
+    private Map<OptionIdentifier, Object> convertArrayValuesToLists(Map<OptionIdentifier, Object> map) {
+        return map.entrySet().stream().map(e -> {
+            var value = e.getValue();
+            if (value.getClass().isArray()) {
+                var objArray = new Object[Array.getLength(value)];
+                System.arraycopy(value, 0, objArray, 0, objArray.length);
+                return Map.<OptionIdentifier, Object>entry(e.getKey(), List.of(objArray));
+            } else {
+                return e;
+            }
+        }).collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private final Map<OptionIdentifier, Object> expected = new HashMap<>();
+    private final Map<OptionIdentifier, Collection<OptionName>> expectedOptionNames = new HashMap<>();
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/HelpTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/HelpTest.java
new file mode 100644
index 00000000000..d84c08bfcb3
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/HelpTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.test.JUnitAdapter;
+import jdk.jpackage.test.TKit;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class HelpTest extends JUnitAdapter.TestSrcInitializer {
+
+    @Test
+    public void testHelpOption() {
+        final var cmdline = new JOptSimpleOptionsBuilder()
+                .options(StandardOption.options())
+                .create().apply(new String[] { "-h" }).orElseThrow().create();
+
+        assertTrue(StandardOption.HELP.containsIn(cmdline));
+    }
+
+    @Disabled
+    @ParameterizedTest
+    @EnumSource(names = {"WINDOWS", "LINUX", "MACOS"})
+    public void printHelp(OperatingSystem os) {
+        new StandardHelpFormatter(os).format(System.out::print);
+    }
+
+    @Disabled
+    @ParameterizedTest
+    @EnumSource(names = {"WINDOWS", "LINUX", "MACOS"})
+    public void updateGoldenHelpFiles(OperatingSystem os) throws IOException {
+        try (var sink = Files.newBufferedWriter(goldenHelpOutputFile(os)); var pw = new PrintWriter(sink)) {
+            new StandardHelpFormatter(os).format(pw::append);
+        }
+    }
+
+    @Test
+    public void printHelp() {
+        StandardHelpFormatter.INSTANCE.format(System.out::print);
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void verifyHelp() throws IOException {
+        verifyHelp(StandardHelpFormatter.INSTANCE, OperatingSystem.current());
+    }
+
+    @Test
+    public void testOptionGroupNamesUnique() {
+        // Test group names are unique.
+        Stream.of(StandardHelpFormatter.OptionGroupID.values())
+                .map(StandardHelpFormatter.OptionGroupID::groupName)
+                .collect(Collectors.toMap(x -> x, x -> x));
+    }
+
+    @ParameterizedTest
+    @EnumSource(names = {"WINDOWS", "LINUX", "MACOS"})
+    public void testOptionGroups(OperatingSystem os) {
+
+        final var groups = Stream.of(StandardHelpFormatter.OptionGroupID.values())
+                .filter(Predicate.isEqual(StandardHelpFormatter.OptionGroupID.SAMPLES).negate())
+                .map(optionGroupID -> {
+                    return optionGroupID.createNonEmptyOptionGroup(os);
+                })
+                .filter(Optional::isPresent).map(Optional::orElseThrow)
+                .collect(Collectors.toMap(HelpFormatter.OptionGroup::name, HelpFormatter.OptionGroup::options));
+
+        // Names of all options supported on the given platform.
+        final var allOptionNames = StandardOption.options().stream().map(Option::spec)
+                .filter(StandardOption.platformOption(os))
+                .map(OptionSpec::names).flatMap(Collection::stream)
+                .sorted().toList();
+
+        // Names of all options in the help groups.
+        final var groupOptions = groups.values().stream().flatMap(Collection::stream)
+                .map(OptionSpec::names).flatMap(Collection::stream)
+                .sorted().toList();
+
+        // Test that each option belongs to only one group except of `--runtime-image`
+        groupOptions.stream().collect(Collectors.toMap(x -> x, x -> x, (a, b) -> {
+            if (a.equals(StandardOption.PREDEFINED_RUNTIME_IMAGE.getSpec().name())) {
+                return a;
+            } else {
+                throw new AssertionError(String.format("Option [%s] is included in multiple groups", a.name()));
+            }
+        }));
+
+        // Test that each option is added to some group.
+        assertEquals(allOptionNames, groupOptions.stream().distinct().toList());
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testOptionSpecSorter(List<String> unsortedNames, List<String> expectedNames) {
+        var sortedNames = unsortedNames.stream()
+                .map(HelpTest::dummyOptionSpec)
+                .sorted(StandardHelpFormatter.optionSpecSorter())
+                .map(OptionSpec::name)
+                .map(OptionName::name).toList();
+        assertEquals(expectedNames, sortedNames);
+    }
+
+    private static Iterable<Arguments> testOptionSpecSorter() {
+        return List.of(
+                Arguments.of(List.of("a", "type", "w"), List.of("type", "a", "w")),
+                Arguments.of(List.of("type", "type", "w"), List.of("type", "type", "w")),
+                Arguments.of(List.of("a", "type", "type"), List.of("type", "type", "a")),
+                Arguments.of(List.of("type", "w", "type"), List.of("type", "type", "w"))
+        );
+    }
+
+    private static OptionSpec<?> dummyOptionSpec(String name) {
+        return new OptionSpec<>(
+                List.of(OptionName.of(name)),
+                Optional.empty(),
+                Set.of(new OptionScope() {}),
+                OptionSpec.MergePolicy.USE_FIRST,
+                Optional.empty(),
+                Optional.empty(),
+                "");
+    }
+
+    private static void verifyHelp(StandardHelpFormatter helpFormatter, OperatingSystem os) throws IOException {
+
+        var sb = new StringBuilder();
+        helpFormatter.format(sb::append);
+
+        var help = new BufferedReader(new StringReader(sb.toString())).lines().toList();
+
+        var expectedHelp = Files.readAllLines(goldenHelpOutputFile(os));
+
+        assertEquals(expectedHelp, help);
+    }
+
+    private static Path goldenHelpOutputFile(OperatingSystem os) {
+        String fname = String.format("help-%s.txt", os.name().toLowerCase());
+        return TKit.TEST_SRC_ROOT.resolve("junit/share/jdk.jpackage/jdk/jpackage/internal/cli", fname);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilderTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilderTest.java
new file mode 100644
index 00000000000..2daa13139a2
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilderTest.java
@@ -0,0 +1,1428 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.ExpectedOptions.expectOptions;
+import static jdk.jpackage.internal.cli.OptionSpecBuilder.pathSeparator;
+import static jdk.jpackage.internal.cli.OptionSpecBuilder.toList;
+import static jdk.jpackage.internal.cli.StandardValueConverter.identityConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.pathConv;
+import static jdk.jpackage.internal.cli.TestUtils.arrayElements;
+import static jdk.jpackage.test.JUnitUtils.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.JOptSimpleErrorType;
+import jdk.jpackage.internal.cli.OptionSpec.MergePolicy;
+import jdk.jpackage.internal.cli.OptionValueConverter.ConverterException;
+import jdk.jpackage.internal.cli.OptionValueExceptionFactory.StandardArgumentsMapper;
+import jdk.jpackage.internal.cli.TestUtils.OptionFailure;
+import jdk.jpackage.internal.cli.TestUtils.TestException;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.util.Result;
+import jdk.jpackage.test.JUnitUtils.ExceptionPattern;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class JOptSimpleOptionsBuilderTest {
+
+    enum ParserMode {
+        PARSE,
+        CONVERT
+    }
+
+    public record TestSpec(Map<OptionValue<?>, ExpectedValue<?>> options, List<String> args) {
+        public TestSpec {
+            Objects.requireNonNull(options);
+            Objects.requireNonNull(args);
+        }
+
+        void test(ParserMode parserMode) {
+            final var parser = createParser(parserMode, options.keySet());
+
+            final var cmdline = parser.apply(args);
+
+            for (final var e : options.entrySet()) {
+                final var optionValue = e.getKey();
+                final var expectedValue = e.getValue();
+                final Object actualValue;
+                if (parserMode.equals(ParserMode.PARSE)) {
+                    actualValue = cmdline.find(optionValue.getOption()).orElseThrow();
+                } else {
+                    actualValue = optionValue.getFrom(cmdline);
+                }
+                expectedValue.assertIt(actualValue);
+            }
+        }
+
+
+        static final class Builder {
+
+            TestSpec create() {
+                return new TestSpec(options, args);
+            }
+
+            final class OptionValueBuilder<T> {
+
+                OptionValueBuilder<T> expectParse(String... expectedValue) {
+                    expectedValues.put(ParserMode.PARSE, new ExpectedValue<>(expectedValue, Assertions::assertArrayEquals));
+                    return this;
+                 }
+
+                OptionValueBuilder<T> expect(T expectedValue) {
+                   return expect(expectedValue, defaultAsserter());
+                }
+
+                OptionValueBuilder<T> expect(T expectedValue, BiConsumer<T, T> asserter) {
+                    expectedValues.put(ParserMode.CONVERT, new ExpectedValue<>(expectedValue, asserter));
+                    return this;
+                }
+
+                Builder commit() {
+                    if (expectedValues.isEmpty()) {
+                        throw new UnsupportedOperationException("Missing expected value");
+                    }
+
+                    if (parserMode == null) {
+                        if (expectedValues.size() > 1) {
+                            throw new UnsupportedOperationException("Ambigous expected value");
+                        }
+                        options.put(option, expectedValues.values().iterator().next());
+                    } else {
+                        options.put(option, Optional.ofNullable(expectedValues.get(parserMode)).orElseThrow(() -> {
+                            return new UnsupportedOperationException("Mismatched expected value");
+                        }));
+                    }
+
+                    return Builder.this;
+                }
+
+                private OptionValueBuilder(OptionValue<T> option) {
+                    this.option = Objects.requireNonNull(option);
+                }
+
+                private final OptionValue<T> option;
+                private final Map<ParserMode, ExpectedValue<?>> expectedValues = new HashMap<>();
+            }
+
+            <T> OptionValueBuilder<T> optionValue(OptionValue<T> option) {
+                return new OptionValueBuilder<>(option);
+            }
+
+            Builder optionUntypedValue(OptionValue<?> option, String... expectedValue) {
+                return new OptionValueBuilder<>(option).expectParse(expectedValue).commit();
+             }
+
+            <T> Builder optionValue(OptionValue<T> option, T expectedValue) {
+               return optionValue(option, expectedValue, defaultAsserter());
+            }
+
+            <T> Builder optionValue(OptionValue<T> option, T expectedValue, BiConsumer<T, T> asserter) {
+                return new OptionValueBuilder<>(option).expect(expectedValue, asserter).commit();
+            }
+
+            Builder args(String...v) {
+                return args(List.of(v));
+            }
+
+            Builder args(Collection<String> v) {
+                args.addAll(v);
+                return this;
+            }
+
+            Builder mode(ParserMode v) {
+                parserMode = v;
+                return this;
+            }
+
+            private static <T> BiConsumer<T, T> defaultAsserter() {
+                return (expected, actual) -> {
+                    if (expected.getClass().isArray()) {
+                        assertArrayEquals(expected, actual);
+                    } else {
+                        assertEquals(expected, actual);
+                    }
+                };
+            }
+
+            private ParserMode parserMode;
+            private final Map<OptionValue<?>, ExpectedValue<?>> options = new HashMap<>();
+            private final List<String> args = new ArrayList<>();
+        }
+
+
+        private record ExpectedValue<T>(T value, BiConsumer<T, T> asserter) {
+            ExpectedValue {
+                Objects.requireNonNull(value);
+                Objects.requireNonNull(asserter);
+            }
+
+            @SuppressWarnings("unchecked")
+            void assertIt(Object actual) {
+                asserter.accept(value, (T)actual);
+            }
+        }
+    }
+
+    enum ShortNameTestCase {
+        LONG(hasLongOption().and(hasShortOption().negate()), addLongOption()),
+        SHORT(hasLongOption().negate().and(hasShortOption()), addShortOption()),
+        LONG_AND_SHORT(hasLongOption().and(hasShortOption()), addLongOption(), addShortOption()),
+        SHORT_AND_LONG(hasLongOption().and(hasShortOption()), addShortOption(), addLongOption()),
+        NONE(hasLongOption().negate().and(hasShortOption().negate()))
+        ;
+
+        @SafeVarargs
+        ShortNameTestCase(Predicate<Options> validator, BiConsumer<Type, List<String>>... optionInitializers) {
+            this.optionInitializer = (type, args) -> {
+                for (final var optionInitializer : optionInitializers) {
+                    optionInitializer.accept(type, args);
+                }
+            };
+            this.validator = validator;
+        }
+
+        void run(Type type, ParserMode parserMode) {
+            final var parser = createParser(parserMode, type.optionValue);
+            final List<String> args = new ArrayList<>();
+            optionInitializer.accept(type, args);
+            assertTrue(validator.test(parser.apply(args)));
+        }
+
+        private static Predicate<Options> hasLongOption() {
+            return cmdline -> {
+                return cmdline.contains(LONG_NAME);
+            };
+        }
+
+        private static Predicate<Options> hasShortOption() {
+            return cmdline -> {
+                return cmdline.contains(SHORT_NAME);
+            };
+        }
+
+        private static BiConsumer<Type, List<String>> addLongOption() {
+            return (type, args) -> {
+                args.add(LONG_NAME.formatForCommandLine());
+                type.valueInitializer.accept(FOO, args);
+            };
+        }
+
+        private static BiConsumer<Type, List<String>> addShortOption() {
+            return (type, args) -> {
+                args.add(SHORT_NAME.formatForCommandLine());
+                type.valueInitializer.accept(BAR, args);
+            };
+        }
+
+        private enum Type {
+            STRING(stringOption(LONG_NAME.name()).addAliases(SHORT_NAME.name()).create(), (optionValue, args) -> {
+                args.add(optionValue);
+            }),
+            BOOLEAN(booleanOption(LONG_NAME.name()).addAliases(SHORT_NAME.name()).create(), (optionValue, args) -> {}),
+            ;
+
+            Type(OptionValue<?> optionValue, BiConsumer<String, List<String>> valueInitializer) {
+                this.optionValue = Objects.requireNonNull(optionValue);
+                this.valueInitializer = Objects.requireNonNull(valueInitializer);
+            }
+
+            final OptionValue<?> optionValue;
+            final BiConsumer<String, List<String>> valueInitializer;
+        }
+
+        private final BiConsumer<Type, List<String>> optionInitializer;
+        private final Predicate<Options> validator;
+
+        private static final OptionName LONG_NAME = OptionName.of("input");
+        private static final OptionName SHORT_NAME = OptionName.of("i");
+
+        private static final String FOO = "foo";
+        private static final String BAR = "bar";
+    }
+
+    @ParameterizedTest
+    @EnumSource(ShortNameTestCase.class)
+    public void testShortNameString(ShortNameTestCase testCase) {
+        for (final var parserMode : ParserMode.values()) {
+            testCase.run(ShortNameTestCase.Type.STRING, parserMode);
+        }
+    }
+
+    @ParameterizedTest
+    @EnumSource(ShortNameTestCase.class)
+    public void testShortNameBoolean(ShortNameTestCase testCase) {
+        for (final var parserMode : List.of(ParserMode.CONVERT)) {
+            testCase.run(ShortNameTestCase.Type.BOOLEAN, parserMode);
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test(TestSpec spec) {
+        spec.test(ParserMode.CONVERT);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testStringVector(TestSpec spec) {
+        spec.test(ParserMode.CONVERT);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testOptionalValueParse(TestSpec spec) {
+        spec.test(ParserMode.PARSE);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testOptionalValueConvert(TestSpec spec) {
+        spec.test(ParserMode.CONVERT);
+    }
+
+    @ParameterizedTest
+    @EnumSource(ParserMode.class)
+    public void testOptionalValueNoDefault(ParserMode parserMode) {
+        var option = option("x", Integer.class).converter(Integer::valueOf).defaultOptionalValue(17).create();
+        var option2 = option("y", Integer.class).converter(Integer::valueOf).create();
+
+        var cmdline = createParser(parserMode, option, option2).apply(List.of("-y", "77"));
+
+        assertTrue(option.findIn(cmdline).isEmpty());
+        assertTrue(option2.findIn(cmdline).isPresent());
+    }
+
+    @Test
+    public void testConversionErrors(@TempDir Path tmpDir) {
+
+        final var dirOption = pathOption("dir").addAliases("r").tokenizer(",");
+
+        final var urlOption = stringOption("url").converter(str -> {
+            try {
+                new URI(str);
+                return str;
+            } catch (URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
+        });
+
+        final var lruOption = option("lru", URI.class).converter(str -> {
+            try {
+                return new URI(str);
+            } catch (URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
+        }).mergePolicy(MergePolicy.USE_FIRST);
+
+        new FaultyParserArgsConfig()
+                .options(urlOption, lruOption)
+                .arrayOptions(dirOption)
+                .args("--dir=*,foo,,bar", "-r", "file", "-r", "file,*")
+                .args("--url=http://foo", "--url=:foo")
+                .args("--lru=:bar", "--lru=http://bar")
+                .expectError("dir", StringToken.of("*,foo,,bar", "*"))
+                .expectError("r", StringToken.of("file,*", "*"))
+                .expectError("url", ":foo")
+                .expectError("lru", ":bar")
+                .test();
+
+        // Test errors are recorded in the order they appear on the command line.
+        new FaultyParserArgsConfig()
+                .options(urlOption, lruOption)
+                .arrayOptions(dirOption)
+                .args("--lru=:bar", "--lru=http://bar")
+                .args("--dir=*,foo,,bar", "-r", "file")
+                .args("--url=http://foo", "--url=:foo")
+                .args("-r", "file,*")
+                .expectError("lru", ":bar")
+                .expectError("dir", StringToken.of("*,foo,,bar", "*"))
+                .expectError("url", ":foo")
+                .expectError("r", StringToken.of("file,*", "*"))
+                .test();
+    }
+
+    @Test
+    public void testValidationErrors() {
+
+        final var numberArrayOption = option("number", Integer.class)
+                .addAliases("n")
+                .validator((Predicate<Integer>)(v -> v > 0))
+                .tokenizer(",")
+                .converter(Integer::valueOf);
+
+        new FaultyParserArgsConfig()
+                .arrayOptions(numberArrayOption)
+                .args("--number=56,23", "--number=2,-34,-45", "-n", "2,-17,0,56")
+                .expectError("number", StringToken.of("2,-34,-45", "-34"))
+                .expectError("number", StringToken.of("2,-34,-45", "-45"))
+                .expectError("n", StringToken.of("2,-17,0,56", "-17"))
+                .expectError("n", StringToken.of("2,-17,0,56", "0"))
+                .test();
+
+        // Test errors are recorded in the order they appear on the command line.
+        new FaultyParserArgsConfig()
+                .arrayOptions(numberArrayOption)
+                .args("--number=56,23", "-n", "2,-17,0,56", "--number=2,-45,-34")
+                .expectError("n", StringToken.of("2,-17,0,56", "-17"))
+                .expectError("n", StringToken.of("2,-17,0,56", "0"))
+                .expectError("number", StringToken.of("2,-45,-34", "-45"))
+                .expectError("number", StringToken.of("2,-45,-34", "-34"))
+                .test();
+    }
+
+    enum ConverterErrorOrigin {
+        CONVERTER,
+        VALIDATOR
+    }
+
+    @ParameterizedTest
+    @EnumSource(ConverterErrorOrigin.class)
+    public void testConverterError(ConverterErrorOrigin exceptionOrigin) {
+
+        final var scalarException = new RuntimeException("Scalar error");
+        final var arrayException = new RuntimeException("Array error");
+
+        final Function<RuntimeException, Consumer<OptionSpecBuilder<String>>> mutatorCreator = ex -> {
+            return builder -> {
+                switch (exceptionOrigin) {
+                    case CONVERTER -> {
+                        builder.converter(_ -> {
+                            throw ex;
+                        });
+                    }
+
+                    case VALIDATOR -> {
+                        builder.validator(new Consumer<>() {
+
+                            @Override
+                            public void accept(String t) {
+                                throw ex;
+                            }
+
+                        });
+                    }
+                }
+            };
+        };
+
+        final var scalarOption = stringOption("val").mutate(mutatorCreator.apply(scalarException));
+
+        final var arrayOption = stringOption("arr").mutate(mutatorCreator.apply(arrayException));
+
+        final var cfg = new FaultyParserArgsConfig()
+                .options(scalarOption, stringOption("good"))
+                .arrayOptions(arrayOption);
+
+        cfg.clearArgs()
+                .args("--val=10")
+                .expectConverterException(scalarException)
+                .test();
+
+        cfg.clearArgs()
+                .args("--arr=foo")
+                .expectConverterException(arrayException)
+                .test();
+
+        cfg.clearArgs()
+                .args("--arr=bar", "--val=57")
+                .expectConverterException(arrayException)
+                .test();
+
+        cfg.clearArgs()
+                .args("--val=57", "--arr=bar")
+                .expectConverterException(scalarException)
+                .test();
+    }
+
+    @Test
+    public void testArrayUnrecoverableMergeFailure() {
+
+        new FaultyParserArgsConfig()
+                .arrayOptions(pathOption("path").tokenizer(",").mergePolicy(MergePolicy.USE_FIRST))
+                .args("--path=*,foo", "--path=bar")
+                .expectError("path", StringToken.of("*,foo", "*"))
+                .test();
+
+        new FaultyParserArgsConfig()
+                .arrayOptions(pathOption("path").tokenizer(",").mergePolicy(MergePolicy.USE_LAST))
+                .args("--path=bar", "--path=foo,*")
+                .expectError("path", StringToken.of("foo,*", "*"))
+                .test();
+    }
+
+    @Test
+    public void testScalarUnrecoverableMergeFailure() {
+
+        new FaultyParserArgsConfig()
+                .options(pathOption("path").mergePolicy(MergePolicy.USE_FIRST))
+                .args("--path=*", "--path=bar")
+                .expectError("path", StringToken.of("*", "*"))
+                .test();
+
+        new FaultyParserArgsConfig()
+                .options(pathOption("path").mergePolicy(MergePolicy.USE_LAST))
+                .args("--path=bar", "--path=*")
+                .expectError("path", StringToken.of("*", "*"))
+                .test();
+    }
+
+    @ParameterizedTest
+    @MethodSource("testMergePolicy")
+    public void testMergePolicyScalar(MergePolicy mergePolicy, ParserMode parserMode) {
+
+        if (mergePolicy == MergePolicy.CONCATENATE) {
+            assertThrowsExactly(IllegalArgumentException.class,
+                    option("foo", Object.class).mergePolicy(mergePolicy)::create);
+            return;
+        }
+
+        final var strOption = stringOption("str").mergePolicy(mergePolicy).create();
+
+        final var monthOption = stringOption("month").addAliases("m")
+                .mergePolicy(mergePolicy).create();
+
+        final var intOption = option("int", Integer.class).addAliases("i")
+                .converter(Integer::valueOf).mergePolicy(mergePolicy).create();
+
+        final var floatOption = option("d", Double.class)
+                .converter(Double::valueOf).mergePolicy(mergePolicy).create();
+
+        final var builder = build()
+                .args("-d", "1000", "--month=June", "--int=10", "-m", "July", "-i", "45", "-m", "August")
+                .args("--str=", "--str=A");
+
+        if (parserMode.equals(ParserMode.PARSE)) {
+            builder.optionUntypedValue(strOption, mergeUntypedValues(List.of("", "A"), mergePolicy));
+            builder.optionUntypedValue(monthOption, mergeUntypedValues(List.of("June", "July", "August"), mergePolicy));
+            builder.optionUntypedValue(intOption, mergeUntypedValues(List.of("10", "45"), mergePolicy));
+            builder.optionUntypedValue(floatOption, new String[] {"1000"});
+        } else {
+            builder.optionValue(strOption, mergeScalarValues(List.of("", "A"), mergePolicy));
+            builder.optionValue(monthOption, mergeScalarValues(List.of("June", "July", "August"), mergePolicy));
+            builder.optionValue(intOption, mergeScalarValues(List.of(10, 45), mergePolicy));
+            builder.optionValue(floatOption, Double.valueOf(1000));
+        }
+
+        builder.create().test(parserMode);
+    }
+
+    @ParameterizedTest
+    @MethodSource("testMergePolicy")
+    public void testMergePolicyArray(MergePolicy mergePolicy, ParserMode parserMode) {
+
+        final var monthOption = stringOption("month").addAliases("m")
+                .mergePolicy(mergePolicy)
+                .tokenizer(Pattern.quote("+"))
+                .createArray();
+
+        final var intOption = option("int", Integer.class).addAliases("i")
+                .converter(Integer::valueOf)
+                .mergePolicy(mergePolicy)
+                .tokenizer(TestUtils.splitOrEmpty(":"))
+                .createArray();
+
+        final var floatOption = option("d", Double.class)
+                .converter(Double::valueOf)
+                .mergePolicy(mergePolicy)
+                .tokenizer(Pattern.quote("|"))
+                .createArray();
+
+        final var builder = build().args("-d", "1000", "--int=", "--month=June", "--int=10:333", "-m", "July+July", "-i", "45", "-m", "August", "--int=");
+
+        if (parserMode.equals(ParserMode.PARSE)) {
+            builder.optionUntypedValue(monthOption,
+                    mergeUntypedValues(List.of("June", "July+July", "August"), mergePolicy));
+            builder.optionUntypedValue(intOption,
+                    mergeUntypedValues(List.of("", "10:333", "45", ""), mergePolicy));
+            builder.optionUntypedValue(floatOption, new String[] {"1000"});
+        } else {
+            builder.optionValue(monthOption,
+                    mergeArrayValues(arrayElements(String.class, List.of("June", "July", "July", "August")), mergePolicy));
+            builder.optionValue(intOption,
+                    mergeArrayValues(arrayElements(Integer.class, Arrays.asList(null, 10, 333, 45, null)), mergePolicy));
+            builder.optionValue(floatOption, new Double[] {Double.valueOf(1000)});
+        }
+
+        builder.create().test(parserMode);
+    }
+
+    @ParameterizedTest
+    @MethodSource("testMergePolicy")
+    public void testMergePolicyNoValue(MergePolicy mergePolicy, ParserMode parserMode) {
+
+        if (mergePolicy == MergePolicy.CONCATENATE) {
+            assertThrowsExactly(IllegalArgumentException.class, booleanOption("foo").mergePolicy(mergePolicy)::create);
+            return;
+        }
+
+        final var aOption = booleanOption("a").mergePolicy(mergePolicy).create();
+        final var bOption = booleanOption("boo").addAliases("b").mergePolicy(mergePolicy).create();
+
+        final var builder = build().args("-a", "-boo", "-b");
+
+        if (parserMode.equals(ParserMode.PARSE)) {
+            builder.optionUntypedValue(aOption, new String[0]);
+            builder.optionUntypedValue(bOption, new String[0]);
+        } else {
+            builder.optionValue(aOption, mergeScalarValues(List.of(true), mergePolicy));
+            builder.optionValue(bOption, mergeScalarValues(List.of(true, true), mergePolicy));
+        }
+
+        builder.create().test(parserMode);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void testUnrecognizedOptionMapping(boolean onlyUnrecognizedOption) {
+
+        final var option = option("x", Object.class).converter(_ -> {
+            throw new RuntimeException();
+        }).create();
+
+        final List<String> args = new ArrayList<>();
+
+        if (!onlyUnrecognizedOption) {
+            args.addAll(List.of("-x", "foo"));
+        }
+        args.add("--unrecognized");
+
+        final var result = new JOptSimpleOptionsBuilder().options(option).create().apply(args.toArray(String[]::new));
+
+        assertFalse(result.hasValue());
+        assertEquals(1, result.errors().size());
+
+        assertTrue(new ExceptionPattern()
+                .isInstanceOf(jdk.internal.joptsimple.OptionException.class)
+                .match(result.errors().iterator().next()));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testErrorMapping(String expectedErrorMessage, String[] args) {
+
+        var booleanOption = booleanOption("bool").addAliases("b").create();
+        var stringOption = stringOption("str").addAliases("s").create();
+
+        final var parse = new JOptSimpleOptionsBuilder()
+                .options(booleanOption, stringOption)
+                .jOptSimpleParserErrorHandler(err -> {
+                    return new TestException(String.format("%s:%s", err.type(), err.optionName().formatForCommandLine()));
+                })
+                .create();
+
+        final var expectedExceptions = List.of(new TestException(expectedErrorMessage));
+        final var actualExceptions = parse.apply(args).errors();
+
+        assertEquals(
+                expectedExceptions.stream().map(Exception::getMessage).toList(),
+                actualExceptions.stream().map(Exception::getMessage).toList());
+    }
+
+    @Test
+    public void testNullErrorMapping() {
+        final var parse = new JOptSimpleOptionsBuilder().jOptSimpleParserErrorHandler(_ -> {
+            return null;
+        }).create();
+
+        assertThrowsExactly(NullPointerException.class, () -> parse.apply(new String[] {"--foo"}));
+    }
+
+    @Test
+    public void testNoErrorMapping() {
+        var errors = new JOptSimpleOptionsBuilder()
+                .options(stringOption("str").create())
+                .create()
+                .apply(new String[] {"--str"}).errors();
+
+        assertEquals(1, errors.size());
+        assertTrue(errors.iterator().next() instanceof jdk.internal.joptsimple.OptionException);
+    }
+
+    @Test
+    public void test_optionSpecMapper() {
+        var mappedOption = stringOption("foo").create();
+        var unmappedOption = stringOption("bar").create();
+        var unusedOption = stringOption("baz").create();
+
+        final var parse = new JOptSimpleOptionsBuilder().optionSpecMapper(optionSpec -> {
+            if (optionSpec.name().equals(mappedOption.getSpec().name())) {
+                return optionSpec.copyWithConverter(OptionValueConverter.<String>build()
+                        .converter(ValueConverter.create(str -> {
+                            return str.toUpperCase();
+                        }, String.class)).create());
+            } else {
+                return optionSpec;
+            }
+        }).options(mappedOption, unmappedOption, unusedOption).create();
+
+        var optionValues = parse.apply(new String[] {"--foo=Value", "--bar", "Value"})
+                .orElseThrow().convertedOptions().orElseThrow().create();
+
+        assertEquals("VALUE", mappedOption.getFrom(optionValues));
+        assertEquals("Value", unmappedOption.getFrom(optionValues));
+        assertFalse(unusedOption.containsIn(optionValues));
+    }
+
+    @ParameterizedTest
+    @EnumSource(ParserMode.class)
+    public void test_Options_find_negative(ParserMode mode) {
+        final var booleanOption = booleanOption("b").create();
+        final var booleanOption2 = booleanOption("b2").create();
+
+        final var stringOption = stringOption("str").create();
+        final var stringOption2 = stringOption("str2").create();
+
+        final List<OptionValue<?>> allOptions = List.of(booleanOption, booleanOption2, stringOption, stringOption2);
+
+        final BiFunction<Collection<OptionValue<?>>, List<String>, Options> parse = (options, args) -> {
+            var theParse = new JOptSimpleOptionsBuilder().options(options).create();
+            var builder = theParse.apply(args.toArray(String[]::new)).orElseThrow();
+
+            switch (mode) {
+                case PARSE -> {
+                    return builder.create();
+                }
+                case CONVERT -> {
+                    return builder.convertedOptions().orElseThrow().create();
+                }
+                default -> {
+                    throw new AssertionError();
+                }
+            }
+        };
+
+        var optionValues = parse.apply(List.of(booleanOption, stringOption), List.of());
+
+        assertTrue(optionValues.find(booleanOption.id()).isEmpty());
+        assertTrue(optionValues.find(booleanOption2.id()).isEmpty());
+        assertTrue(optionValues.find(stringOption.id()).isEmpty());
+        assertTrue(optionValues.find(stringOption2.id()).isEmpty());
+
+        optionValues = parse.apply(allOptions, List.of());
+
+        assertTrue(optionValues.find(booleanOption.id()).isEmpty());
+        assertTrue(optionValues.find(booleanOption2.id()).isEmpty());
+        assertTrue(optionValues.find(stringOption.id()).isEmpty());
+        assertTrue(optionValues.find(stringOption2.id()).isEmpty());
+
+        optionValues = parse.apply(allOptions, List.of("--b2"));
+
+        assertTrue(optionValues.find(booleanOption.id()).isEmpty());
+        assertTrue(optionValues.find(booleanOption2.id()).isPresent());
+        assertTrue(optionValues.find(stringOption.id()).isEmpty());
+        assertTrue(optionValues.find(stringOption2.id()).isEmpty());
+
+        optionValues = parse.apply(allOptions, List.of("--str="));
+
+        assertTrue(optionValues.find(booleanOption.id()).isEmpty());
+        assertTrue(optionValues.find(booleanOption2.id()).isEmpty());
+        assertTrue(optionValues.find(stringOption.id()).isPresent());
+        assertTrue(optionValues.find(stringOption2.id()).isEmpty());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_copyWithExcludes(boolean withRedirects) {
+        final var aOption = stringOption("astr").createArray();
+        final var bOption = stringOption("bstr").tokenizeOne().createArray();
+        final var cOption = stringOption("cstr").tokenizeOne().converter(str -> {
+            throw new RuntimeException();
+        }).createArray();
+
+        var builder = new JOptSimpleOptionsBuilder().options(aOption, bOption, cOption);
+        if (withRedirects) {
+            builder.optionSpecMapper(spec -> {
+                return spec.copyWithDescription("Foo");
+            });
+        }
+
+        var vanillaParsedOptionBuilder = builder.create().apply(new String[] {
+                "--astr", "1", "--bstr", "2", "--astr", "3", "--bstr", "4", "--cstr", "foo"
+        }).orElseThrow();
+
+        var parsedOptionBuilder = vanillaParsedOptionBuilder;
+        var options = parsedOptionBuilder.create();
+
+        assertEquals(Set.of(aOption.id(), bOption.id(), cOption.id()), options.ids());
+        assertEquals(List.of("1", "3"), List.of(aOption.getFrom(options)));
+        assertEquals(List.of("2", "4"), List.of(bOption.getFrom(options)));
+        assertEquals(List.of("foo"), List.of(cOption.getFrom(options)));
+
+        parsedOptionBuilder = parsedOptionBuilder.copyWithExcludes(List.of(cOption.id()));
+        options = parsedOptionBuilder.create();
+
+        assertEquals(Set.of(aOption.id(), bOption.id()), options.ids());
+        assertEquals(List.of("1", "3"), List.of(aOption.getFrom(options)));
+        assertEquals(List.of("2", "4"), List.of(bOption.getFrom(options)));
+        assertFalse(cOption.containsIn(options));
+
+        parsedOptionBuilder = parsedOptionBuilder.copyWithExcludes(List.of(bOption.id()));
+        options = parsedOptionBuilder.create();
+
+        assertEquals(Set.of(aOption.id()), options.ids());
+        assertEquals(List.of("1", "3"), List.of(aOption.getFrom(options)));
+        assertFalse(bOption.containsIn(options));
+        assertFalse(cOption.containsIn(options));
+
+        var optionBuilder = vanillaParsedOptionBuilder.copyWithExcludes(List.of(cOption.id())).convertedOptions().orElseThrow();
+        options = optionBuilder.create();
+
+        assertEquals(Set.of(aOption.id(), bOption.id()), options.ids());
+        assertEquals(List.of("1", "3"), List.of(aOption.getFrom(options)));
+        assertEquals(List.of("2", "4"), List.of(bOption.getFrom(options)));
+        assertFalse(cOption.containsIn(options));
+
+        optionBuilder = optionBuilder.copyWithExcludes(List.of(aOption.id()));
+        options = optionBuilder.create();
+
+        assertEquals(Set.of(bOption.id()), options.ids());
+        assertFalse(aOption.containsIn(options));
+        assertEquals(List.of("2", "4"), List.of(bOption.getFrom(options)));
+        assertFalse(cOption.containsIn(options));
+    }
+
+    @ParameterizedTest
+    @EnumSource(ParserMode.class)
+    public void test_Options_concat(ParserMode mode) {
+        final var a = stringOption("a").create();
+        final var b = stringOption("b").create();
+        final var c = stringOption("c").create();
+
+        var builder = new JOptSimpleOptionsBuilder().options(a, b, c);
+
+        var parsedOptionBuilder = builder.create().apply(new String[] {
+                "-a", "foo", "-b", "bar"
+        }).orElseThrow();
+
+        Options optionsFromJoptSimple;
+        var expectedOptions = expectOptions();
+        switch (mode) {
+            case PARSE -> {
+                optionsFromJoptSimple = parsedOptionBuilder.create();
+                expectedOptions.add(a, new String[] {"foo"});
+            }
+            case CONVERT -> {
+                optionsFromJoptSimple = parsedOptionBuilder.convertedOptions().orElseThrow().create();
+                expectedOptions.add(a, "foo");
+            }
+            default -> {
+                throw new AssertionError();
+            }
+        }
+
+        var options = Options.concat(Options.of(Map.of(b, "buz")), optionsFromJoptSimple, Options.of(Map.of(c, 100)));
+
+        expectedOptions.add(c, 100).add(b, "buz").apply(options);
+    }
+
+    @ParameterizedTest
+    @EnumSource(ParserMode.class)
+    public void test_Options_copyWith(ParserMode mode) {
+        final var a = stringOption("a").create();
+        final var b = stringOption("b").create();
+        final var c = stringOption("c").create();
+
+        var builder = new JOptSimpleOptionsBuilder().options(a, b, c);
+
+        var parsedOptionBuilder = builder.create().apply(new String[] {
+                "-a", "foo", "-b", "bar"
+        }).orElseThrow();
+
+        Options optionsFromJoptSimple;
+        var expectedOptions = expectOptions();
+        switch (mode) {
+            case PARSE -> {
+                optionsFromJoptSimple = parsedOptionBuilder.create();
+                expectedOptions.add(a, new String[] {"foo"});
+            }
+            case CONVERT -> {
+                optionsFromJoptSimple = parsedOptionBuilder.convertedOptions().orElseThrow().create();
+                expectedOptions.add(a, "foo");
+            }
+            default -> {
+                throw new AssertionError();
+            }
+        }
+
+        var options = optionsFromJoptSimple.copyWith(a.id(), c.id());
+
+        expectedOptions.apply(options);
+
+        options = Options.concat(optionsFromJoptSimple.copyWith(a.id(), c.id()), Options.of(Map.of(c, 100)), Options.of(Map.of(b, "buz")));
+
+        expectedOptions.add(c, 100).add(b, "buz").apply(options);
+    }
+
+    @Test
+    public void test_detectedOptions() {
+        final var aOption = stringOption("astr").addAliases("a").createArray();
+        final var bOption = stringOption("bstr").addAliases("b").defaultOptionalValue("empty").create();
+        final var cOption = stringOption("cstr").addAliases("c").create();
+        final var dOption = booleanOption("dbool").addAliases("d").create();
+        final var eOption = booleanOption("ebool").addAliases("e").create();
+
+        var builder = new JOptSimpleOptionsBuilder().options(aOption, bOption, cOption, dOption, eOption);
+
+        assertEquals(List.of(), builder.create().apply(new String[] {}).orElseThrow().detectedOptions());
+
+        var vanillaParsedOptionBuilder = builder.create().apply(new String[] {
+                "-ddededa", "1", "--bstr", "--astr", "3", "--bstr", "4", "--ebool", "--cstr", "foo", "-b"
+        }).orElseThrow();
+
+        var parsedOptionBuilder = vanillaParsedOptionBuilder;
+        var detectedOptions = parsedOptionBuilder.detectedOptions();
+
+        assertEquals(
+                List.of("d", "d", "e", "d", "e", "d", "a", "bstr", "astr", "bstr", "ebool", "cstr", "b"),
+                detectedOptions.stream().map(OptionName::name).toList());
+
+        var convertedDetectedOptions = parsedOptionBuilder.convertedOptions().orElseThrow().detectedOptions();
+        assertEquals(detectedOptions, convertedDetectedOptions);
+
+        parsedOptionBuilder = vanillaParsedOptionBuilder.copyWithExcludes(List.of(eOption.id()));
+        detectedOptions = parsedOptionBuilder.detectedOptions();
+
+        assertEquals(
+                List.of("d", "d", "d", "d", "a", "bstr", "astr", "bstr", "cstr", "b"),
+                detectedOptions.stream().map(OptionName::name).toList());
+
+        convertedDetectedOptions = parsedOptionBuilder.convertedOptions().orElseThrow().detectedOptions();
+        assertEquals(detectedOptions, convertedDetectedOptions);
+
+        convertedDetectedOptions = parsedOptionBuilder.convertedOptions().orElseThrow().copyWithExcludes(List.of(aOption.id())).detectedOptions();
+        assertEquals(
+                List.of("d", "d", "d", "d", "bstr", "bstr", "cstr", "b"),
+                convertedDetectedOptions.stream().map(OptionName::name).toList());
+    }
+
+    private static <T> T mergeScalarValues(List<T> values, MergePolicy mergePolicy) {
+        switch (mergePolicy) {
+            case USE_FIRST -> {
+                return values.getFirst();
+            }
+            case USE_LAST -> {
+                return values.getLast();
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private static <T> T[] mergeArrayValues(List<T[]> values, MergePolicy mergePolicy) {
+        switch (mergePolicy) {
+            case USE_FIRST -> {
+                return values.getFirst();
+            }
+            case USE_LAST -> {
+                return values.getLast();
+            }
+            case CONCATENATE -> {
+                return values.stream().map(Stream::of).flatMap(x -> x).toList().toArray(values.getFirst());
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private static String[] mergeUntypedValues(List<String> values, MergePolicy mergePolicy) {
+        switch (mergePolicy) {
+            case USE_FIRST -> {
+                return values.subList(0, 1).toArray(String[]::new);
+            }
+            case USE_LAST -> {
+                return values.subList(values.size() - 1, values.size()).toArray(String[]::new);
+            }
+            case CONCATENATE -> {
+                return values.toArray(String[]::new);
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private static List<Object[]> testMergePolicy() {
+        final List<Object[]> data = new ArrayList<>();
+        for (var mergePolicy : MergePolicy.values()) {
+            for (var parserMode : ParserMode.values()) {
+                data.add(new Object[] { mergePolicy, parserMode });
+            }
+        }
+        return data;
+    }
+
+    private static Collection<Object[]> testErrorMapping() {
+        return List.<Object[]>of(
+                testErrorMappingTestCase(JOptSimpleErrorType.UNRECOGNIZED_OPTION, "-a", "-a"),
+                testErrorMappingTestCase(JOptSimpleErrorType.UNRECOGNIZED_OPTION, "-a", "--a"),
+                testErrorMappingTestCase(JOptSimpleErrorType.UNRECOGNIZED_OPTION, "-f", "-foo"),
+                // Two unrecognizable options, only the first one will be reported
+                testErrorMappingTestCase(JOptSimpleErrorType.UNRECOGNIZED_OPTION, "--foo", "--foo", "-z"),
+                testErrorMappingTestCase(JOptSimpleErrorType.UNRECOGNIZED_OPTION, "-z", "-z", "--foo"),
+
+                testErrorMappingTestCase(JOptSimpleErrorType.OPTION_MISSING_REQUIRED_ARGUMENT, "--str", "--str")
+        );
+    }
+
+    private static Object[] testErrorMappingTestCase(JOptSimpleErrorType type, String optionName, String... args) {
+        Objects.requireNonNull(type);
+        Objects.requireNonNull(optionName);
+        return new Object[] { String.format("%s:%s", type, optionName), args };
+    }
+
+    private static Collection<TestSpec> testOptionalValueParse() {
+        return testOptionalValue(ParserMode.PARSE);
+    }
+
+    private static Collection<TestSpec> testOptionalValueConvert() {
+        return testOptionalValue(ParserMode.CONVERT);
+    }
+
+    private static Collection<TestSpec> testOptionalValue(ParserMode parserMode) {
+        return Stream.of(
+                build().mode(parserMode).args("-x")
+                .optionValue(option("x", Integer.class).converter(Integer::valueOf).defaultOptionalValue(17).create())
+                .expectParse("-x").expect(17).commit(),
+
+                build().mode(parserMode).args("-x")
+                .optionValue(option("yy", Integer.class).addAliases("x").converter(Integer::valueOf).defaultOptionalValue(17).create())
+                .expectParse("--yy").expect(17).commit(),
+
+                build().mode(parserMode).args("--yy")
+                .optionValue(option("yy", Integer.class).addAliases("x").converter(Integer::valueOf).defaultOptionalValue(17).create())
+                .expectParse("--yy").expect(17).commit(),
+
+                build().mode(parserMode).args("-x", "23")
+                .optionValue(option("x", Integer.class).converter(Integer::valueOf).defaultOptionalValue(17).create())
+                .expectParse("23").expect(23).commit(),
+
+                //
+                // joptsimple discards instances of an option without values if there is an instance of the option with a value
+                //
+
+                build().mode(parserMode).args("-x", "-x", "23")
+                .optionValue(option("x", Integer.class).converter(Integer::valueOf).defaultOptionalValue(17).create())
+                .expectParse("23").expect(23).commit(),
+
+                build().mode(parserMode).args("-x", "-x", "23:17", "-x", "56", "-x")
+                .optionValue(option("x", Integer.class).converter(Integer::valueOf).defaultOptionalValue(17).tokenizer(":").createArray())
+                .expectParse("23:17", "56").expect(new Integer[] {23, 17, 56}).commit(),
+
+                build().mode(parserMode).args("-x", "-x", "-x")
+                .optionValue(option("x", Integer.class).converter(Integer::valueOf).defaultOptionalValue(17).tokenizer(":").createArray())
+                .expectParse("-x").expect(new Integer[] {17}).commit(),
+
+                build().mode(parserMode).args("-x", "--yy")
+                .optionValue(option("yy", Integer.class).addAliases("x").converter(Integer::valueOf).defaultOptionalValue(17).tokenizer(":").createArray())
+                .expectParse("--yy").expect(new Integer[] {17}).commit(),
+
+                build().mode(parserMode).args("-x", "--yy", "-x", "--yy", "-x", "--yy")
+                .optionValue(option("yy", Integer.class).addAliases("x").converter(Integer::valueOf).defaultOptionalValue(17).tokenizer(":").createArray())
+                .expectParse("--yy").expect(new Integer[] {17}).commit(),
+
+                build().mode(parserMode).args("-x", "--yy", "23:17", "-x", "56", "-x")
+                .optionValue(option("yy", Integer.class).addAliases("x").converter(Integer::valueOf).defaultOptionalValue(17).tokenizer(":").createArray())
+                .expectParse("23:17", "56").expect(new Integer[] {23, 17, 56}).commit(),
+
+                build().mode(parserMode).args("-x", "--yy", "23", "-x", "56", "-x")
+                .optionValue(option("yy", Integer.class).addAliases("x").converter(Integer::valueOf).defaultOptionalValue(17).create())
+                .expectParse("56").expect(56).commit()
+        ).map(TestSpec.Builder::create).toList();
+    }
+
+    private static Collection<TestSpec> test() {
+        final var pwd = Path.of("").toAbsolutePath();
+        return Stream.of(
+                build().optionValue(
+                        directoryOption("input").addAliases("i").create(),
+                        pwd
+                ).args("--input", "", "-i", pwd.toString()),
+
+                build().optionValue(
+                        directoryOption("dir").tokenizer(pathSeparator()).createArray(),
+                        new Path[] { pwd, Path.of(".") }
+                ).args("--dir=" + pwd.toString() + pathSeparator() + "."),
+
+                build().optionValue(
+                        stringOption("arguments").tokenizer("\\s+").createArray(toList()),
+                        List.of("", "a", "b", "c", "", "de")
+                ).args("--arguments", " a b  c", "--arguments", " de"),
+
+                build().optionValue(
+                        stringOption("arguments").tokenizer(";+").createArray(toList()),
+                        List.of("a b", "c", "de")
+                ).args("--arguments", "a b;;c", "--arguments", "de;"),
+
+                build().optionValue(stringOption("foo").create(), "--foo").args("--foo", "--foo"),
+
+                build().args("--foo")
+                        .optionValue(booleanOption("foo").create(), true)
+                        .optionValue(booleanOption("bar").create(), false),
+
+                build().args("-x", "").optionValue(stringOption("x").create(), ""),
+                build().args("-x", "").optionValue(stringOption("x").createArray(), new String[] {""}),
+                build().args("-x", "", "-x", "").optionValue(stringOption("x").createArray(), new String[] {"", ""}),
+
+                // Test merging order.
+                build().optionValue(
+                        stringOption("x").addAliases("y").tokenizeOne().createArray(toList()),
+                        List.of("10", "RR", "P", "Z")
+                ).args("-x", "10", "-y", "RR", "-x", "P", "-y", "Z"),
+
+                // Test converters are not executed on discarded invalid values (recoverable conversion errors).
+                build().optionValue(
+                        option("x", Integer.class).converter(Integer::valueOf).create(),
+                        100
+                ).args("-x", "a", "-x", "100"),
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_FIRST)
+                                .exceptionFormatString("")
+                                .exceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                                .converter(Integer::valueOf).tokenizer(",").createArray(),
+                        new Integer[] {34}
+                ).args("-x", "34,A", "-x", "f"),
+
+                // Test the last array element (recoverable conversion errors).
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_LAST)
+                                .converter(Integer::valueOf).tokenizer(",").createArray(toList()),
+                        List.of(78)
+                ).args("-x", "1,3,78"),
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_LAST)
+                                .exceptionFormatString("")
+                                .exceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                                .converter(Integer::valueOf).tokenizer(",").createArray(toList()),
+                        List.of(78)
+                ).args("-x", "1,ZZZ,78"),
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_LAST)
+                                .converter(Integer::valueOf).tokenizer(",").createArray(toList()),
+                        List.of(35)
+                ).args("-x", "1,3,78", "-x", "a", "-x", "35"),
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_LAST)
+                                .converter(Integer::valueOf).tokenizer(TestUtils.splitOrEmpty(",")).createArray(toList()),
+                        List.of()
+                ).args("-x", "1,3,78", "-x", ""),
+
+                // Test the first array element (recoverable conversion errors).
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_FIRST)
+                                .exceptionFormatString("")
+                                .exceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                                .converter(Integer::valueOf).tokenizer(",").createArray(toList()),
+                        List.of(1)
+                ).args("-x", "1,ZZZ,78"),
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_FIRST)
+                                .converter(Integer::valueOf).tokenizer(",").createArray(toList()),
+                        List.of(1)
+                ).args("-x", "1,3,78", "-x", "a", "-x", "35"),
+                build().optionValue(
+                        option("x", Integer.class).mergePolicy(MergePolicy.USE_FIRST)
+                                .converter(Integer::valueOf).tokenizer(TestUtils.splitOrEmpty(",")).createArray(toList()),
+                        List.of()
+                ).args("-x", "", "-x", "1,23,78"),
+
+                // Test array value is a scalar for parser.
+                build().optionValue(
+                        option("arr", int[].class).converter(str -> {
+                            return Stream.of(str.split(",")).map(Integer::valueOf).mapToInt(Integer::intValue).toArray();
+                        }).create(),
+                        new int[] {1, 45, 67}
+                ).args("--arr=1,45,67"),
+
+                // Test that parser can handle multi-dimensional arrays.
+                build().optionValue(
+                        option("arr", int[].class).converter(str -> {
+                            if (str.isEmpty()) {
+                                return new int[0];
+                            } else {
+                                return Stream.of(str.split(",")).map(Integer::valueOf).mapToInt(Integer::intValue).toArray();
+                            }
+                        }).tokenizer(":").createArray(toList()),
+                        List.of(new int[] {1, 45, 67}, new int[0], new int[] {3}, new int[] {56}, new int[] {77, 82}),
+                        (expected, actual) -> {
+                            assertEquals(expected.size(), actual.size());
+                            for (int i = 0; i != expected.size(); i++) {
+                                assertArrayEquals(expected.get(i), actual.get(i));
+                            }
+                        }
+                ).args("--arr=1,45,67::3:56", "--arr=77,82")
+
+        ).map(TestSpec.Builder::create).toList();
+    }
+
+    private static Collection<TestSpec> testStringVector() {
+        final var args = List.of("--foo", "1 22 333", "--foo", "44 44");
+        return Stream.of(
+                build().optionValue(
+                        stringOption("foo").createArray(),
+                        new String[] { "1 22 333", "44 44" }
+                ).args(args),
+
+                build().optionValue(
+                        stringOption("foo").tokenizeOne().createArray(toList()),
+                        List.of("1 22 333", "44 44")
+                ).args(args),
+
+                build().optionValue(
+                        stringOption("foo").tokenizer("\\s+").createArray(),
+                        new String[] { "1", "22", "333", "44", "44" }
+                ).args(args),
+
+                build().optionValue(
+                        stringOption("foo").tokenizer("\\s+").createArray(toList()),
+                        List.of("1", "22", "333", "44", "44")
+                ).args(args)
+        ).map(TestSpec.Builder::create).toList();
+    }
+
+    private static <T> OptionSpecBuilder<T> option(String name, Class<? extends T> valueType) {
+        return OptionSpecBuilder.<T>create(valueType)
+                .name(Objects.requireNonNull(name))
+                .scope(new BundlingOperationOptionScope() {
+                    @Override
+                    public BundlingOperationDescriptor descriptor() {
+                        throw new AssertionError();
+                    }});
+    }
+
+    private static OptionSpecBuilder<String> stringOption(String name) {
+        return option(name, String.class).converter(identityConv());
+    }
+
+    private static OptionSpecBuilder<Path> pathOption(String name) {
+        return option(name, Path.class)
+                .converter(pathConv())
+                // "*" is an invalid symbol in Windows paths and valid in Linux paths.
+                // Add a validator to make it invalid on all platforms to simplify testing.
+                .validator(new Predicate<Path>() {
+                    @Override
+                    public boolean test(Path path) {
+                        return path.toString().indexOf("*") == -1;
+                    }
+                })
+                .converterExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                .converterExceptionFormatString(FORMAT_STRING_ILLEGAL_PATH);
+    }
+
+    private static OptionSpecBuilder<Path> directoryOption(String name) {
+        return pathOption(name)
+                .validator(StandardValidator.IS_DIRECTORY)
+                .validatorExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                .validatorExceptionFormatString(FORMAT_STRING_NOT_DIRECTORY);
+    }
+
+    private static OptionSpecBuilder<Boolean> booleanOption(String name) {
+        return option(name, Boolean.class).defaultValue(Boolean.FALSE);
+    }
+
+    private static Function<List<String>, Options> createParser(ParserMode mode, OptionValue<?>... options) {
+        return createParser(mode, List.of(options));
+    }
+
+    private static Function<List<String>, Options> createParser(ParserMode mode, Iterable<OptionValue<?>> options) {
+        Objects.requireNonNull(mode);
+        final var parse = new JOptSimpleOptionsBuilder().options(StreamSupport.stream(options.spliterator(), false)
+                .map(OptionValue::getOption).toList()).create();
+        return args -> {
+            final var builder = parse.apply(args.toArray(String[]::new)).orElseThrow();
+            switch (mode) {
+                case PARSE -> {
+                    return builder.create();
+                }
+                case CONVERT -> {
+                    return builder.convertedOptions().orElseThrow().create();
+                }
+                default -> {
+                    throw new IllegalArgumentException();
+                }
+            }
+        };
+    }
+
+    private static TestSpec.Builder build() {
+        return new TestSpec.Builder();
+    }
+
+
+    private static final class FaultyParserArgsConfig {
+
+        void test() {
+
+            final Collection<OptionFailure> recordedErrors = new ArrayList<>();
+
+            final List<OptionValue<?>> optionValues = new ArrayList<>();
+
+            optionSpecBuilders.stream().map(builder -> {
+                configureExceptions(builder);
+                return builder.exceptionFactory(TestUtils.recordExceptions(recordedErrors));
+            }).map(OptionSpecBuilder::create).forEach(optionValues::add);
+
+            arrayOptionSpecBuilders.stream().map(builder -> {
+                configureExceptions(builder);
+                return builder.exceptionFactory(TestUtils.recordExceptions(recordedErrors));
+            }).map(OptionSpecBuilder::createArray).forEach(optionValues::add);
+
+            final var parser = new JOptSimpleOptionsBuilder().options(optionValues).create();
+
+            final Supplier<Result<?>> createCmdline = parser.apply(args.toArray(String[]::new)).orElseThrow()::convertedOptions;
+
+            if (expectedConverterException == null) {
+                final var result = createCmdline.get();
+
+                assertFalse(result.hasValue());
+
+                // Not all exceptions recorded by TestUtils.recordExceptions() facility
+                // will be returned by JOptSimpleOptionsBuilder.OptionsBuilder.convertedOptions()
+                // because it may run a converter multiple times on the same option value,
+                // attempting to recover from a previous error.
+                var actualErrors = result.errors().stream().map(exception -> {
+                    return recordedErrors.stream().filter(recorderdFailure -> {
+                        return (recorderdFailure.exception().orElseThrow() == exception);
+                    }).findFirst().map(OptionFailure::withoutException).orElseThrow();
+                }).toList();
+
+                assertEquals(expectedErrors, actualErrors);
+
+            } else {
+                final var ex = assertThrowsExactly(ConverterException.class, () -> createCmdline.get());
+                assertSame(expectedConverterException, ex.getCause());
+            }
+        }
+
+        FaultyParserArgsConfig args(Collection<String> v) {
+            args.addAll(v);
+            return this;
+        }
+
+        FaultyParserArgsConfig args(String... v) {
+            return args(List.of(v));
+        }
+
+        FaultyParserArgsConfig clearArgs() {
+            args.clear();
+            return this;
+        }
+
+        FaultyParserArgsConfig options(Collection<OptionSpecBuilder<?>> v) {
+            optionSpecBuilders.addAll(v);
+            return this;
+        }
+
+        FaultyParserArgsConfig options(OptionSpecBuilder<?>... v) {
+            return options(List.of(v));
+        }
+
+        FaultyParserArgsConfig arrayOptions(Collection<OptionSpecBuilder<?>> v) {
+            arrayOptionSpecBuilders.addAll(v);
+            return this;
+        }
+
+        FaultyParserArgsConfig arrayOptions(OptionSpecBuilder<?>... v) {
+            return arrayOptions(List.of(v));
+        }
+
+        FaultyParserArgsConfig expectErrors(Collection<OptionFailure> v) {
+            expectedErrors.addAll(v);
+            return this;
+        }
+
+        FaultyParserArgsConfig expectErrors(OptionFailure... v) {
+            return expectErrors(List.of(v));
+        }
+
+        FaultyParserArgsConfig expectError(String optionName, String optionValue) {
+            return expectError(optionName, StringToken.of(optionValue));
+        }
+
+        FaultyParserArgsConfig expectError(String optionName, StringToken optionValue) {
+            return expectErrors(new OptionFailure(optionName, optionValue));
+        }
+
+        FaultyParserArgsConfig expectConverterException(Exception v) {
+            expectedConverterException = v;
+            return this;
+        }
+
+        private static void configureExceptions(OptionSpecBuilder<?> builder) {
+            builder.exceptionFactory(factory -> {
+                if (factory == null) {
+                    builder.exceptionFormatString("Option value [%s] of option %s");
+                    factory = ERROR_WITH_VALUE_AND_OPTION_NAME;
+                }
+                return factory;
+            });
+        }
+
+        private final List<String> args = new ArrayList<>();
+        private final Collection<OptionSpecBuilder<?>> optionSpecBuilders = new ArrayList<>();
+        private final Collection<OptionSpecBuilder<?>> arrayOptionSpecBuilders = new ArrayList<>();
+        private final List<OptionFailure> expectedErrors = new ArrayList<>();
+        private Exception expectedConverterException;
+    }
+
+
+    private static final String FORMAT_STRING_ILLEGAL_PATH = "The value '%s' provided for parameter %s is not a valid path";
+
+    private static final String FORMAT_STRING_NOT_DIRECTORY = "The value '%s' provided for parameter %s is not a directory path";
+
+    private static final OptionValueExceptionFactory<? extends RuntimeException> ERROR_WITH_VALUE_AND_OPTION_NAME = OptionValueExceptionFactory.build(TestException::new)
+            .formatArgumentsTransformer(StandardArgumentsMapper.VALUE_AND_NAME)
+            .messageFormatter(String::format)
+            .create();
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
new file mode 100644
index 00000000000..41142382c39
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.test.JUnitAdapter;
+import jdk.jpackage.test.TKit;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class MainTest extends JUnitAdapter.TestSrcInitializer {
+
+    @ParameterizedTest
+    @MethodSource
+    public void testOutput(TestSpec test) throws IOException {
+        test.run();
+    }
+
+    private static Collection<TestSpec> testOutput() {
+        return Stream.of(
+                // Print the tool version
+                build().expectShortHelp(),
+                // Print the tool version
+                build().args("--version").expectVersion(),
+                // Print the tool version
+                build().args("foo", "bar").expectErrors(I18N.format("error.non-option-arguments", 2)),
+                // Valid command line requesting to print the full help.
+                build().args("-h").expectFullHelp(),
+                // Valid command line requesting to build a package and print the full help.
+                build().args("--main-jar", "hello.jar", "-?", "--main-class", "foo").expectFullHelp(),
+                // Valid command line requesting to build a package and print the full help and the version of the tool.
+                build().args("--main-jar", "hello.jar", "-?", "--main-class", "foo", "--version").expectVersionWithHelp(),
+                // Valid command line requesting to print the full help and the version of the tool.
+                build().args("--help", "--version").expectVersionWithHelp(),
+                // Invalid command line requesting to print the version of the tool.
+                build().args("foo", "--version").expectErrors(I18N.format("error.non-option-arguments", 1))
+        ).map(TestSpec.Builder::create).toList();
+    }
+
+
+    record TestSpec(List<String> args, int expectedExitCode, List<String> expectedStdout, List<String> expectedStderr) {
+
+        TestSpec {
+            Objects.requireNonNull(args);
+            Objects.requireNonNull(expectedStdout);
+            Objects.requireNonNull(expectedStderr);
+        }
+
+        void run() {
+            var result = ExecutionResult.create(args.toArray(String[]::new));
+            assertEquals(expectedExitCode, result.exitCode());
+            assertEquals(expectedStdout, result.stdout());
+            assertEquals(expectedStderr, result.stderr());
+        }
+
+
+        static final class Builder {
+
+            TestSpec create() {
+                return new TestSpec(args, expectedExitCode, expectedStdout, expectedStderr);
+            }
+
+            Builder args(String... v) {
+                return args(List.of(v));
+            }
+
+            Builder args(Collection<String> v) {
+                args.addAll(v);
+                return this;
+            }
+
+            Builder expectStdout(String... lines) {
+                return expectStdout(List.of(lines));
+            }
+
+            Builder expectStdout(Collection<String> lines) {
+                return append(expectedStdout, lines);
+            }
+
+            Builder expectStderr(String... lines) {
+                return expectStderr(List.of(lines));
+            }
+
+            Builder expectStderr(Collection<String> lines) {
+                return append(expectedStderr, lines);
+            }
+
+            Builder expectShortHelp() {
+                var sb = new StringBuilder();
+                new StandardHelpFormatter(OperatingSystem.current()).formatNoArgsHelp(sb::append);
+                return expectStdout(lines(sb.toString()));
+            }
+
+            Builder expectFullHelp() {
+                try {
+                    return expectStdout(Files.readAllLines(goldenHelpOutputFile(OperatingSystem.current())));
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            }
+
+            Builder expectVersion() {
+                return expectStdout(System.getProperty("java.version"));
+            }
+
+            Builder expectVersionWithHelp() {
+                return expectVersion().expectStdout("").expectFullHelp();
+            }
+
+            Builder expectErrors(String... msg) {
+                return expectErrorExitCode().expectStderr(Stream.of(msg).map(v -> {
+                    return I18N.format("message.error-header", v);
+                }).toList());
+            }
+
+            Builder expectExitCode(int v) {
+                expectedExitCode = v;
+                return this;
+            }
+
+            Builder expectErrorExitCode() {
+                return expectExitCode(1);
+            }
+
+            private Builder append(List<String> sink, Collection<String> lines) {
+                lines.forEach(sink::add);
+                return this;
+            }
+
+            private List<String> args = new ArrayList<>();
+            private int expectedExitCode;
+            private List<String> expectedStdout = new ArrayList<>();
+            private List<String> expectedStderr = new ArrayList<>();
+        }
+    }
+
+
+    private record ExecutionResult(List<String> stdout, List<String> stderr, int exitCode) {
+
+        ExecutionResult {
+            Objects.requireNonNull(stdout);
+            Objects.requireNonNull(stderr);
+        }
+
+        static ExecutionResult create(String... args) {
+            var stdout = new StringWriter();
+            var stderr = new StringWriter();
+
+            var exitCode = Main.run(new PrintWriter(stdout), new PrintWriter(stderr), args);
+
+            return new ExecutionResult(lines(stdout.toString()), lines(stderr.toString()), exitCode);
+        }
+    }
+
+
+    private static TestSpec.Builder build() {
+        return new TestSpec.Builder();
+    }
+
+    private static List<String> lines(String str) {
+        return new BufferedReader(new StringReader(str)).lines().toList();
+    }
+
+    private static Path goldenHelpOutputFile(OperatingSystem os) {
+        String fname = String.format("help-%s.txt", os.name().toLowerCase());
+        return TKit.TEST_SRC_ROOT.resolve("junit/share/jdk.jpackage/jdk/jpackage/internal/cli", fname);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MockupCliBundlingEnvironment.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MockupCliBundlingEnvironment.java
new file mode 100644
index 00000000000..c11b4bec443
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MockupCliBundlingEnvironment.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+
+final class MockupCliBundlingEnvironment implements CliBundlingEnvironment {
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    private MockupCliBundlingEnvironment(
+            Optional<BundlingOperationDescriptor> defaultOperation,
+            BiConsumer<BundlingOperationDescriptor, Options> createBundleCallback,
+            Map<BundlingOperationDescriptor, List<Exception>> knownOperations) {
+
+        this.defaultOperation = Objects.requireNonNull(defaultOperation);
+        this.createBundleCallback = Objects.requireNonNull(createBundleCallback);
+        this.knownOperations = Map.copyOf(knownOperations);
+    }
+
+    @Override
+    public Optional<BundlingOperationDescriptor> defaultOperation() {
+        return defaultOperation;
+    }
+
+    @Override
+    public void createBundle(BundlingOperationDescriptor op, Options cmdline) {
+        createBundleCallback.accept(throwIfUnknownBundlingOperation(op), cmdline);
+    }
+
+    @Override
+    public Collection<? extends Exception> configurationErrors(BundlingOperationDescriptor op) {
+        throwIfUnknownBundlingOperation(op);
+        return Optional.ofNullable(knownOperations.get(op)).orElseGet(List::of);
+    }
+
+    private BundlingOperationDescriptor throwIfUnknownBundlingOperation(BundlingOperationDescriptor op) {
+        if (!knownOperations.containsKey(Objects.requireNonNull(op))) {
+            throw new NoSuchElementException(String.format("Unknown bunbdling operation: [%s]", op));
+        }
+        return op;
+    }
+
+    static StandardBundlingOperation createAppImageBundlingOperation(OperatingSystem os) {
+        Objects.requireNonNull(os);
+        return StandardBundlingOperation.CREATE_APP_IMAGE.stream()
+                .map(StandardBundlingOperation.class::cast)
+                .filter(StandardBundlingOperation.platform(os))
+                .findFirst().orElseThrow();
+    }
+
+
+    static final class Builder {
+
+        CliBundlingEnvironment create() {
+            return new MockupCliBundlingEnvironment(
+                    defaultOperation(),
+                    createBundleCallback().orElse((_, _) -> {}),
+                    knownOperations);
+        }
+
+        Builder defaultOperation(BundlingOperationDescriptor v) {
+            defaultOperation = v;
+            return this;
+        }
+
+        Builder knownOperation(BundlingOperationDescriptor v) {
+            knownOperations.putIfAbsent(Objects.requireNonNull(v), List.of());
+            return this;
+        }
+
+        Builder createAppImageByDefault(OperatingSystem os) {
+            return defaultOperation(createAppImageBundlingOperation(os).descriptor());
+        }
+
+        Builder createAppImageByDefault() {
+            return createAppImageByDefault(OperatingSystem.current());
+        }
+
+        Builder createBundleCallback(Consumer<Options> v) {
+            return createBundleCallback((_, options) -> v.accept(options));
+        }
+
+        Builder createBundleCallback(BiConsumer<BundlingOperationDescriptor, Options> v) {
+            createBundleCallback = v;
+            return this;
+        }
+
+        Builder configurationErrors(BundlingOperationDescriptor targetOperation, List<Exception> v) {
+            if (targetOperation != null) {
+                knownOperations.merge(targetOperation, v, (x, y) -> {
+                    List<Exception> errors = new ArrayList<>(x);
+                    errors.addAll(y);
+                    return errors;
+                });
+            } else if (!knownOperations.isEmpty()) {
+                knownOperations.keySet().forEach(op -> {
+                    configurationErrors(op, v);
+                });
+            } else {
+                throw new UnsupportedOperationException("Can not set errors for unknown bundling operations");
+            }
+            return this;
+        }
+
+        Builder configurationErrors(BundlingOperationDescriptor targetOperation, Exception... errors) {
+            return configurationErrors(targetOperation, List.of(errors));
+        }
+
+        private Optional<BiConsumer<BundlingOperationDescriptor, Options>> createBundleCallback() {
+            return Optional.ofNullable(createBundleCallback);
+        }
+
+        private Optional<BundlingOperationDescriptor> defaultOperation() {
+            return Optional.ofNullable(defaultOperation);
+        }
+
+        private BundlingOperationDescriptor defaultOperation;
+        private BiConsumer<BundlingOperationDescriptor, Options> createBundleCallback;
+        private final Map<BundlingOperationDescriptor, List<Exception>> knownOperations = new HashMap<>();
+    }
+
+
+    private final Optional<BundlingOperationDescriptor> defaultOperation;
+    private final BiConsumer<BundlingOperationDescriptor, Options> createBundleCallback;
+    private final Map<BundlingOperationDescriptor, List<Exception>> knownOperations;
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionIdentifierTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionIdentifierTest.java
new file mode 100644
index 00000000000..e9872602520
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionIdentifierTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.OptionIdentifier.createIdentifier;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import org.junit.jupiter.api.Test;
+
+public class OptionIdentifierTest {
+
+    @Test
+    public void test_createUnique() {
+
+        var a = createIdentifier();
+        var b = createIdentifier();
+
+        assertNotNull(a);
+        assertNotNull(b);
+
+        assertNotSame(a, b);
+        assertNotEquals(a, b);
+    }
+
+    @Test
+    public void test_of() {
+
+        assertThrowsExactly(NullPointerException.class, () -> OptionIdentifier.of(null));
+
+        var a = OptionIdentifier.of("a");
+
+        assertNotNull(a);
+
+        assertNotEquals("a", a);
+        assertNotEquals(createIdentifier(), a);
+        assertEquals(OptionIdentifier.of("a"), a);
+        assertNotEquals(OptionIdentifier.of("A"), a);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionNameTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionNameTest.java
new file mode 100644
index 00000000000..7a77106edbf
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionNameTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class OptionNameTest {
+
+    record TestSpec(String value, String expectedName, String expectedOnCmdLine, boolean expectedIsShort) {
+        TestSpec {
+            Objects.requireNonNull(value);
+            Objects.requireNonNull(expectedName);
+            Objects.requireNonNull(expectedOnCmdLine);
+        }
+
+        void run() {
+            final var optionName = OptionName.of(value);
+
+            assertEquals(expectedName, optionName.name());
+            assertEquals(expectedOnCmdLine, optionName.formatForCommandLine());
+            assertEquals(expectedIsShort, optionName.isShort());
+        }
+
+        static final class Builder {
+
+            TestSpec create() {
+                return new TestSpec(value, validatedExpectedName(), validatedExpectedOnCmdLine(), validatedExpectedIsShort());
+            }
+
+            Builder value(String v) {
+                value = v;
+                return this;
+            }
+
+            Builder expectedName(String v) {
+                expectedName = v;
+                return this;
+            }
+
+            Builder expectedOnCmdLine(String v) {
+                expectedOnCmdLine = v;
+                return this;
+            }
+
+            Builder isShort() {
+                expectedIsShort = true;
+                return this;
+            }
+
+            private String validatedExpectedName() {
+                return Optional.ofNullable(expectedName).orElse(value);
+            }
+
+            private String validatedExpectedOnCmdLine() {
+                return Optional.ofNullable(expectedOnCmdLine).orElseGet(() -> {
+                    if (validatedExpectedIsShort()) {
+                        return "-" + validatedExpectedName();
+                    } else {
+                        return "--" + validatedExpectedName();
+                    }
+                });
+            }
+
+            private boolean validatedExpectedIsShort() {
+                return Optional.ofNullable(expectedIsShort).orElseGet(() -> {
+                    return validatedExpectedName().length() == 1;
+                });
+            }
+
+            private String value;
+            private String expectedName;
+            private String expectedOnCmdLine;
+            private Boolean expectedIsShort;
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test(TestSpec testSpec) {
+        testSpec.run();
+    }
+
+    private static List<TestSpec> test() {
+        return Stream.of(
+                build("foo"),
+                build("x"),
+                build("--foo").expectedName("foo"),
+                build("--f").expectedName("f").isShort(),
+                build("-foo").expectedName("f").isShort(),
+                build("-x").expectedName("x").isShort(),
+                build("---").expectedName("-")
+        ).map(TestSpec.Builder::create).toList();
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void negativeTest(Map.Entry<String, String> testSpec) {
+        final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> OptionName.of(testSpec.getKey()));
+        assertEquals(testSpec.getValue(), ex.getMessage());
+    }
+
+    @Test
+    public void compareTest() {
+        assertTrue(0 == OptionName.of("a").compareTo(OptionName.of("a")));
+        assertTrue(OptionName.of("a").compareTo(OptionName.of("b")) < 0);
+        assertTrue(OptionName.of("b").compareTo(OptionName.of("a")) > 0);
+    }
+
+    private static Collection<Map.Entry<String, String>> negativeTest() {
+        return Map.of(
+                "", "Name should not be empty",
+                "-", "Short option without a name",
+                "--", "Long option without a name"
+        ).entrySet();
+    }
+
+    private static TestSpec.Builder build(String value) {
+        return new TestSpec.Builder().value(value);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
new file mode 100644
index 00000000000..1849a3b5333
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class OptionSpecMutatorOptionScopeTest {
+
+    record DummyContext(int value) {
+        <T> OptionSpec<T> mapOptionSpec(OptionSpec<T> optionSpec) {
+            return OptionSpecMapperOptionScope.mapOptionSpec(optionSpec, this);
+        }
+
+        static <T> Consumer<OptionSpecBuilder<T>> createOptionSpecBuilderMutator(
+                BiConsumer<OptionSpecBuilder<T>, DummyContext> mutator) {
+            return OptionSpecMapperOptionScope.createOptionSpecBuilderMutator(DummyContext.class, mutator);
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_mapOptionSpec_scalar(boolean multipleMutators) {
+
+        var theSpecBuilder = OptionSpecBuilder.<String>create(String.class).converter(str -> {
+            return "123";
+        }).name("foo");
+
+        DummyContext.<String>createOptionSpecBuilderMutator((specBuilder, context) -> {
+            specBuilder.converter(str -> {
+                return Integer.toString(context.value());
+            });
+        }).accept(theSpecBuilder);
+
+        if (multipleMutators) {
+            DummyContext.<String>createOptionSpecBuilderMutator((specBuilder, _) -> {
+                specBuilder.name("Foo");
+            }).accept(theSpecBuilder);
+        }
+
+        var spec = theSpecBuilder.createOptionSpec();
+
+        var mappedSpec = new DummyContext(731).mapOptionSpec(spec);
+
+        if (multipleMutators) {
+            assertEquals(OptionName.of("Foo"), mappedSpec.name());
+        } else {
+            assertEquals(OptionName.of("foo"), mappedSpec.name());
+        }
+
+        assertEquals("731", mappedSpec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+
+        assertEquals(OptionName.of("foo"), spec.name());
+
+        assertEquals("123", spec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+    }
+
+    @Test
+    public void test_mapOptionSpec_array() {
+
+        var theSpecBuilder = OptionSpecBuilder.<String>create(String.class).converter(str -> {
+            return "123";
+        }).name("foo");
+
+        DummyContext.<String>createOptionSpecBuilderMutator((specBuilder, context) -> {
+            specBuilder.converter(str -> {
+                return Integer.toString(context.value());
+            });
+        }).accept(theSpecBuilder);
+
+        var spec = theSpecBuilder.createArrayOptionSpec();
+
+        var mappedSpec = new DummyContext(731).mapOptionSpec(spec);
+
+        assertArrayEquals(new String[] {"731"}, mappedSpec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+
+        assertEquals(OptionName.of("foo"), spec.name());
+
+        assertArrayEquals(new String[] {"123"}, spec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+
+    }
+
+    @Test
+    public void test_createOptionSpecBuilderMutator_multiple() {
+
+        var theSpecBuilder = OptionSpecBuilder.<Integer>create(Integer.class).converter(Integer::parseInt);
+
+        DummyContext.<Integer>createOptionSpecBuilderMutator((specBuilder, context) -> {
+            specBuilder.description("Foo");
+        }).accept(theSpecBuilder);
+
+        DummyContext.<Integer>createOptionSpecBuilderMutator((specBuilder, context) -> {
+            specBuilder.name("animal");
+        }).accept(theSpecBuilder);
+
+        DummyContext.<Integer>createOptionSpecBuilderMutator((specBuilder, context) -> {
+            specBuilder.addAliases("fox");
+        }).accept(theSpecBuilder);
+
+        DummyContext.<Integer>createOptionSpecBuilderMutator((specBuilder, context) -> {
+            specBuilder.addAliases("dog");
+        }).accept(theSpecBuilder);
+
+        var spec = theSpecBuilder.name("cat").createArrayOptionSpec();
+
+        var mappedSpec = new DummyContext(0).mapOptionSpec(spec);
+
+        assertEquals(Stream.of("cat").map(OptionName::of).toList(), spec.names());
+        assertEquals("", spec.description());
+
+        assertEquals(Stream.of("animal", "fox", "dog").map(OptionName::of).toList(), mappedSpec.names());
+        assertEquals("Foo", mappedSpec.description());
+
+        assertEquals(spec.converter(), mappedSpec.converter());
+    }
+
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
new file mode 100644
index 00000000000..a92c677d9cf
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.StandardValueConverter.identityConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.pathConv;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+import java.util.stream.IntStream;
+import jdk.jpackage.internal.cli.OptionSpec.MergePolicy;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class OptionSpecTest {
+
+    @Test
+    public void test_otherNames() {
+        assertEquals(toOptionNames("b", "foo"), buildSpec().names("a", "b", "foo").create().otherNames());
+        assertEquals(toOptionNames(), buildSpec().names("a").create().otherNames());
+        assertEquals(toOptionNames("b", "a"), buildSpec().names("a", "b", "a").create().otherNames());
+    }
+
+    @Test
+    public void test_names() {
+        assertEquals(toOptionNames("a", "b", "foo"), buildSpec().names("a", "b", "foo").create().names());
+        assertEquals(toOptionNames("a"), buildSpec().names("a").create().names());
+        assertEquals(toOptionNames("a", "b", "a"), buildSpec().names("a", "b", "a").create().names());
+    }
+
+    @Test
+    public void test_name() {
+        assertEquals(OptionName.of("a"), buildSpec().names("a", "b", "foo").create().name());
+        assertEquals(OptionName.of("a"), buildSpec().names("a").create().name());
+    }
+
+    @Test
+    public void test_valueType() {
+        assertThrows(RuntimeException.class, buildSpec().names("foo").create()::valueType);
+        assertEquals(String.class, OptionSpecTest.<String>buildSpec().names("foo").converter(converter(identityConv())).create().valueType());
+        assertEquals(Path.class, OptionSpecTest.<Path>buildSpec().names("foo").converter(converter(pathConv())).create().valueType());
+    }
+
+    @Test
+    public void test_hasValue() {
+        assertFalse(buildSpec().names("foo").create().hasValue());
+        assertTrue(OptionSpecTest.<String>buildSpec().names("foo").converter(converter(identityConv())).create().hasValue());
+        assertTrue(OptionSpecTest.<Path>buildSpec().names("foo").converter(converter(pathConv())).create().hasValue());
+    }
+
+    @Test
+    public void test_isValueOptional() {
+        assertFalse(buildSpec().names("foo").create().isValueOptional());
+        assertFalse(OptionSpecTest.<String>buildSpec().names("foo").converter(converter(identityConv())).create().isValueOptional());
+        assertTrue(OptionSpecTest.<String>buildSpec().names("foo").converter(converter(identityConv())).defaultOptionalValue("str").create().isValueOptional());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_copyWithConverter(boolean hasInitialConverter) {
+
+        final var scope = Set.of((OptionScope)new OptionScope() {});
+
+        final OptionSpecBuilder<?> builder;
+        if (hasInitialConverter) {
+            builder = OptionSpecTest.<String>buildSpec().converter(converter(identityConv()));
+        } else {
+            builder = buildSpec();
+        }
+
+        UnaryOperator<OptionSpecBuilder<?>> builderMutator = v -> {
+            v.names("foo", "bar").description("description").scope(scope);
+            if (hasInitialConverter) {
+                v.valuePattern("<value>");
+            }
+            return v;
+        };
+
+        final var converter = converter(pathConv());
+
+        final var spec = builderMutator.apply(builder).create();
+
+        assertThrowsExactly(NullPointerException.class, () -> spec.copyWithConverter(null));
+
+        final var actualConvSpec = spec.copyWithConverter(converter);
+
+        final var expectedConvSpec = builderMutator.apply(OptionSpecTest.<Path>buildSpec().converter(converter)).create();
+
+        assertEquals(expectedConvSpec, actualConvSpec);
+    }
+
+    @Test
+    public void test_copyWithConverter_fail() {
+        var spec = OptionSpecTest.<String>buildSpec()
+                .names("foo")
+                .valuePattern("<value>")
+                .defaultOptionalValue("str")
+                .converter(converter(identityConv()))
+                .description("Hello!").create();
+
+        final var pathConverter = converter(pathConv());
+
+        assertThrowsExactly(UnsupportedOperationException.class, () -> spec.copyWithConverter(pathConverter));
+    }
+
+    @Test
+    public void test_copyWithDescription() {
+
+        final var builder = OptionSpecTest.<String>buildSpec()
+                .names("foo", "bar")
+                .valuePattern("<value>")
+                .converter(converter(identityConv()))
+                .description("Hello!");
+
+        final var spec = builder.create();
+
+        assertThrowsExactly(NullPointerException.class, () -> spec.copyWithDescription(null));
+
+        final var actualConvSpec = spec.copyWithDescription("Bye!");
+
+        final var expectedConvSpec = builder.description("Bye!").create();
+
+        assertEquals(expectedConvSpec, actualConvSpec);
+    }
+
+    @Test
+    public void test_copyWithName() {
+
+        final var builder = OptionSpecTest.<String>buildSpec()
+                .names("foo", "bar")
+                .valuePattern("<value>")
+                .converter(converter(identityConv()))
+                .description("Hello!");
+
+        final var spec = builder.create();
+
+        assertThrowsExactly(NullPointerException.class, () -> spec.copyWithName(null));
+
+        final var actualConvSpec = spec.copyWithName(OptionName.of("buz"));
+
+        final var expectedConvSpec = builder.names("buz").create();
+
+        assertEquals(expectedConvSpec, actualConvSpec);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_findNamesIn_and_getFirstNameIn(boolean found) {
+
+        var spec = OptionSpecTest.<String>buildSpec().names("z", "a", "b").converter(converter(identityConv())).create();
+
+        final Options options;
+        if (found) {
+            options = Options.of(Map.of(OptionValue.<String>build().spec(spec).create(), 100));
+        } else {
+            options = Options.of(Map.of());
+        }
+
+        final List<OptionName> expectedNames;
+        if (found) {
+            expectedNames = toOptionNames("z", "a", "b");
+        } else {
+            expectedNames = List.of();
+        }
+
+        assertEquals(expectedNames, spec.findNamesIn(options));
+
+        if (found) {
+            assertEquals(expectedNames.getFirst(), spec.getFirstNameIn(options));
+        } else {
+            assertThrowsExactly(NoSuchElementException.class, () -> spec.getFirstNameIn(options));
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_arrayValueConverter(boolean empty) {
+
+        final Optional<OptionArrayValueConverter<String>> arrayConverter;
+        final OptionSpec<?> spec;
+        if (empty) {
+            arrayConverter = Optional.empty();
+            spec = OptionSpecTest.<String>buildSpec().names("foo").converter(converter(identityConv())).create();
+        } else {
+            arrayConverter = Optional.of(buildConverter(identityConv()).tokenizer(str -> new String[] {str}).createArray());
+            spec = OptionSpecTest.<String[]>buildSpec().names("foo").converter(arrayConverter.get()).create();
+        }
+
+        assertEquals(arrayConverter, spec.arrayValueConverter());
+    }
+
+    @Test
+    public void testInvalid() {
+        IllegalArgumentException ex;
+
+        ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            buildSpec().names().create();
+        });
+        assertEquals("Empty name list", ex.getMessage());
+
+        ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            buildSpec().names("foo").scope(Set.of()).create();
+        });
+        assertEquals("Empty scope", ex.getMessage());
+
+        ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            buildSpec().names("foo").mergePolicy(MergePolicy.CONCATENATE).create();
+        });
+        assertEquals("Invalid merge policy [" + MergePolicy.CONCATENATE + "] for type []", ex.getMessage());
+
+        ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            OptionSpecTest.<String>buildSpec().names("foo")
+                    .converter(converter(identityConv()))
+                    .mergePolicy(MergePolicy.CONCATENATE)
+                    .create();
+        });
+        assertEquals("Invalid merge policy [" + MergePolicy.CONCATENATE + "] for type [" + String.class.getName() + "]", ex.getMessage());
+
+        ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            buildSpec().names("foo").valuePattern("<int>").create();
+        });
+        assertEquals("Option without a value can not have a value pattern", ex.getMessage());
+
+        ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            buildSpec().names("foo").defaultOptionalValue(new Object()).create();
+        });
+        assertEquals("Option with optional value should have a converter", ex.getMessage());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_generateForEveryName(boolean hasValue) {
+
+        final var names = List.of("a", "b", "foo");
+
+        final OptionSpecBuilder<?> builder;
+        if (hasValue) {
+            builder = OptionSpecTest.<String>buildSpec().names(names).converter(converter(identityConv()));
+        } else {
+            builder = buildSpec().names(names);
+        }
+
+        final var optionSpecs = builder.create().copyForEveryName().toList();
+
+        assertEquals(names.size(), optionSpecs.size());
+
+        IntStream.range(0, names.size()).forEach(i -> {
+            assertEquals(builder.names(names.get(i)).create(), optionSpecs.get(i));
+        });
+    }
+
+    private static <T> OptionSpecBuilder<T> buildSpec() {
+        return new OptionSpecBuilder<>();
+    }
+
+    private static List<OptionName> toOptionNames(Collection<String> names) {
+        return names.stream().map(OptionName::of).toList();
+    }
+
+    private static List<OptionName> toOptionNames(String... names) {
+        return toOptionNames(List.of(names));
+    }
+
+    private static <T> OptionValueConverter<T> converter(ValueConverter<T> conv) {
+        return buildConverter(conv).create();
+    }
+
+    private static <T> OptionValueConverter.Builder<T> buildConverter(ValueConverter<T> conv) {
+        return OptionValueConverter.<T>build().converter(conv);
+    }
+
+
+    private static final class OptionSpecBuilder<T> {
+
+        OptionSpec<T> create() {
+            return new OptionSpec<>(
+                    Optional.ofNullable(names).orElseGet(List::of),
+                    Optional.ofNullable(converter),
+                    Optional.ofNullable(scope).orElseGet(Set::of),
+                    mergePolicy,
+                    Optional.ofNullable(defaultOptionalValue),
+                    Optional.ofNullable(valuePattern),
+                    description);
+        }
+
+        OptionSpecBuilder<T> names(String... v) {
+            return names(List.of(v));
+        }
+
+        OptionSpecBuilder<T> description(String v) {
+            description = v;
+            return this;
+        }
+
+        OptionSpecBuilder<T> names(List<String> v) {
+            names = Optional.ofNullable(v).map(OptionSpecTest::toOptionNames).orElse(null);
+            return this;
+        }
+
+        OptionSpecBuilder<T> converter(OptionValueConverter<T> v) {
+            converter = v;
+            return this;
+        }
+
+        OptionSpecBuilder<T> defaultOptionalValue(T v) {
+            defaultOptionalValue = v;
+            return this;
+        }
+
+        OptionSpecBuilder<T> scope(Set<OptionScope> v) {
+            scope = v;
+            return this;
+        }
+
+        OptionSpecBuilder<T> mergePolicy(MergePolicy v) {
+            mergePolicy = v;
+            return this;
+        }
+
+        OptionSpecBuilder<T> valuePattern(String v) {
+            valuePattern = v;
+            return this;
+        }
+
+        private List<OptionName> names;
+        private OptionValueConverter<T> converter;
+        private T defaultOptionalValue;
+        private Set<OptionScope> scope = Set.of(new OptionScope() {});
+        private MergePolicy mergePolicy = MergePolicy.USE_LAST;
+        private String valuePattern;
+        private String description = "";
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
new file mode 100644
index 00000000000..c026ee0639f
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.TestUtils.assertExceptionListEquals;
+import static jdk.jpackage.internal.cli.TestUtils.configureConverter;
+import static jdk.jpackage.internal.cli.TestUtils.configureValidator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.cli.OptionValueConverter.ConverterException;
+import jdk.jpackage.internal.cli.TestUtils.TestException;
+import jdk.jpackage.internal.util.Result;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class OptionValueConverterTest {
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test(boolean positive) {
+
+        final var converter = OptionValueConverter.build().converter(ValueConverter.create(str -> {
+            return Integer.valueOf(str);
+        }, Integer.class)).mutate(configureConverter()).create();
+
+        if (positive) {
+            final var token = StringToken.of("758");
+            assertEquals(758, converter.convert(OptionName.of("number"), token).orElseThrow());
+        } else {
+            final var token = StringToken.of("foo");
+            final var result = converter.convert(OptionName.of("number"), token);
+
+            assertEquals(1, result.errors().size());
+
+            final var ex = result.firstError().orElseThrow();
+
+            assertNotNull(ex.getCause());
+            assertTrue(ex.getCause() instanceof NumberFormatException);
+            assertEquals("Option --number: bad substring [foo] in string [foo]", ex.getMessage());
+        }
+    }
+
+    @Test
+    public void test_Builder_defaults() {
+
+        var converter = OptionValueConverter.<Integer>build()
+                .converter(ValueConverter.create(Integer::valueOf, Integer.class)).create();
+
+        Function<String, Result<Integer>> convertString = (v) -> {
+            return converter.convert(OptionName.of("foo"), StringToken.of(v));
+        };
+
+        assertEquals(10, convertString.apply("10").orElseThrow());
+
+        assertThrowsExactly(UnsupportedOperationException.class, () -> convertString.apply(""));
+    }
+
+    @Test
+    public void test_Builder_invalid() {
+
+        assertThrowsExactly(NullPointerException.class, OptionValueConverter.build()
+                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
+                .mutate(configureConverter())
+                .formatString(null)::create);
+
+        assertThrowsExactly(NullPointerException.class, OptionValueConverter.build()
+                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
+                .mutate(configureConverter())
+                .exceptionFactory(null)::create);
+    }
+
+    @Test
+    public void test_Builder_copy() {
+
+        Function<String, String[]> tokenizer = _ -> { throw new UnsupportedOperationException(); };
+
+        var builder = OptionValueConverter.<Integer>build()
+                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
+                .validator(Validator.<Integer, RuntimeException>build().predicate(_ -> true).create())
+                .mutate(configureConverter())
+                .tokenizer(tokenizer);
+
+        var copy = builder.copy();
+
+        assertNotSame(copy,  builder);
+
+        assertSame(builder.converter().orElse(null), copy.converter().orElse(null));
+        assertSame(builder.formatString().orElse(null), copy.formatString().orElse(null));
+        assertSame(builder.exceptionFactory().orElse(null), copy.exceptionFactory().orElse(null));
+        assertSame(builder.tokenizer().orElse(null), copy.tokenizer().orElse(null));
+        assertSame(builder.validator().orElse(null), copy.validator().orElse(null));
+
+        copy.formatString("foo");
+
+        assertNotEquals(builder.formatString().orElse(null), copy.formatString().orElse(null));
+    }
+
+    @Test
+    public void test_Builder_createArray() {
+
+        var converter = OptionValueConverter.<Integer>build()
+                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
+                .mutate(configureConverter())
+                .tokenizer(str -> str.split(":"))
+                .createArray();
+
+        assertNotEquals(List.of(100, 67, 145), List.of(converter.convert(OptionName.of("foo"), StringToken.of("110:67:145")).orElseThrow()));
+
+        assertEquals(Integer[].class, converter.valueType());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_Builder_createArray_exceptions(boolean validateInConveter) {
+
+        var numberFormatException = assertThrowsExactly(NumberFormatException.class, () -> Integer.valueOf("str"));
+
+        var builder = OptionValueConverter.<Integer>build()
+                .mutate(configureConverter())
+                .formatString("Ops")
+                .tokenizer(str -> str.split(":"));
+
+        if (validateInConveter) {
+            builder.converter(ValueConverter.create(str -> {
+                var i = Integer.valueOf(str);
+                if (i < 0) {
+                    throw new IllegalArgumentException(str);
+                } else {
+                    return i;
+                }
+            }, Integer.class));
+        } else {
+            builder.converter(ValueConverter.create(Integer::valueOf, Integer.class));
+            builder.validator(Validator.<Integer, RuntimeException>build().consumer(i -> {
+                if (i < 0) {
+                    throw new IllegalArgumentException(i.toString());
+                }
+            }).mutate(configureValidator()).formatString("Ops").create());
+        }
+
+        var converter = builder.createArray();
+
+        var result = converter.convert(OptionName.of("foo"), StringToken.of("100:-10:-10:67:str:145:-7"));
+
+        assertExceptionListEquals(Stream.of(
+                new IllegalArgumentException("-10"),
+                new IllegalArgumentException("-10"),
+                numberFormatException,
+                new IllegalArgumentException("-7")
+        ).map(ex -> {
+            return new TestException("Ops", ex);
+        }).toList(), result.errors());
+    }
+
+    @Test
+    public void testConverterException() {
+
+        final var exception = new RuntimeException("Always fail");
+
+        final var converter = OptionValueConverter.build().converter(ValueConverter.create(str -> {
+            throw exception;
+        }, Integer.class)).mutate(configureConverter()).create();
+
+        final var token = StringToken.of("foo");
+        final var ex = assertThrowsExactly(ConverterException.class, () -> converter.convert(OptionName.of("number"), token));
+
+        assertSame(exception, ex.getCause());
+    }
+
+    @Test
+    public void testValidatorExceptionTunneling() {
+
+        final var exception = new RuntimeException("Always fail");
+
+        final var converter = OptionValueConverter.build().converter(ValueConverter.create(str -> {
+            return Integer.valueOf(str);
+        }, Object.class)).mutate(configureConverter()).validator(Validator.<Object, RuntimeException>build().predicate(_ -> {
+            throw exception;
+        }).mutate(configureValidator()).create()).create();
+
+        final var token = StringToken.of("100");
+        final var ex = assertThrowsExactly(ConverterException.class, () -> converter.convert(OptionName.of("number"), token));
+
+        assertSame(exception, ex.getCause());
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueExceptionFactoryTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueExceptionFactoryTest.java
new file mode 100644
index 00000000000..5f630c1d739
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueExceptionFactoryTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.TestUtils.assertExceptionEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+import jdk.jpackage.internal.cli.OptionValueExceptionFactory.StandardArgumentsMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class OptionValueExceptionFactoryTest {
+
+    @Test
+    public void test_unreachable() {
+
+        var factory = OptionValueExceptionFactory.unreachable();
+
+        assertThrowsExactly(UnsupportedOperationException.class, () -> {
+            factory.create(OptionName.of("foo"), StringToken.of("str"), "", Optional.empty());
+        });
+    }
+
+    @ParameterizedTest
+    @EnumSource(StandardArgumentsMapper.class)
+    public void testStandardArgumentsMapper(StandardArgumentsMapper mapper) {
+
+        final Supplier<List<String>> arguments = () -> {
+            return List.of(mapper.apply(TEST_OPTION_NAME.name(), TEST_OPTION_VALUE));
+        };
+
+        switch (mapper) {
+            case NAME_AND_VALUE -> {
+                assertEquals(List.of("foo", "str"), arguments.get());
+            }
+            case VALUE_AND_NAME -> {
+                assertEquals(List.of("str", "foo"), arguments.get());
+            }
+            case NONE -> {
+                assertEquals(List.of(), arguments.get());
+            }
+            case VALUE -> {
+                assertEquals(List.of("str"), arguments.get());
+            }
+            default -> {
+                throw new AssertionError();
+            }
+        }
+    }
+
+    @Test
+    public void test_Builder_defaults() {
+
+        var factory = buildTestFactory().create();
+
+        var ex = factory.create(TEST_OPTION_NAME, TEST_OPTION_VALUE, "error.parameter-not-file", Optional.empty());
+
+        assertExceptionEquals(new Exception(I18N.format("error.parameter-not-file", "--foo", "str")), ex);
+    }
+
+    @Test
+    public void test_Builder_formatArgumentsTransformer() {
+
+        var factory = buildTestFactory().formatArgumentsTransformer(StandardArgumentsMapper.VALUE_AND_NAME).create();
+
+        var ex = factory.create(TEST_OPTION_NAME, TEST_OPTION_VALUE, "error.parameter-not-file", Optional.empty());
+
+        assertExceptionEquals(new Exception(I18N.format("error.parameter-not-file", "str", "--foo")), ex);
+    }
+
+    @Test
+    public void test_Builder_messageFormatter() {
+
+        var factory = buildTestFactory().messageFormatter(String::format).create();
+
+        var ex = factory.create(TEST_OPTION_NAME, TEST_OPTION_VALUE, "The value of option %s is [%s]", Optional.empty());
+
+        assertExceptionEquals(new Exception("The value of option --foo is [str]"), ex);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_Builder_printOptionPrefix(boolean printOptionPrefix) {
+
+        var factory = buildTestFactory().printOptionPrefix(printOptionPrefix).create();
+
+        var ex = factory.create(TEST_OPTION_NAME, TEST_OPTION_VALUE, "error.parameter-not-file", Optional.empty());
+
+        String formattedOptionName;
+        if (printOptionPrefix) {
+            formattedOptionName = "--foo";
+        } else {
+            formattedOptionName = "foo";
+        }
+        assertExceptionEquals(new Exception(I18N.format("error.parameter-not-file", formattedOptionName, "str")), ex);
+    }
+
+    @Test
+    public void testWithCause() {
+
+        var factory = buildTestFactory().messageFormatter(String::format).create();
+
+        var ex = factory.create(TEST_OPTION_NAME, TEST_OPTION_VALUE, "The value of option %s is [%s]", Optional.of(new IllegalArgumentException("Ops")));
+
+        assertExceptionEquals(new Exception("The value of option --foo is [str]", new IllegalArgumentException("Ops")), ex);
+    }
+
+    @Test
+    public void test_ArgumentsMapper_appendArguments() {
+
+        var maper = OptionValueExceptionFactory.ArgumentsMapper.appendArguments((formattedOptionName, optionValue) -> {
+            return new String[] { optionValue.value(), formattedOptionName, optionValue.tokenizedString() };
+        }, 100, "foo");
+
+        List<String> args = List.of(maper.apply("--bar", StringToken.of("strrr", "tr")));
+
+        assertEquals(List.of("tr", "--bar", "strrr", "100", "foo"), args);
+    }
+
+    private static OptionValueExceptionFactory.Builder<Exception> buildTestFactory() {
+        return OptionValueExceptionFactory.build(Exception::new);
+    }
+
+    private static final OptionName TEST_OPTION_NAME = OptionName.of("foo");
+    private static final StringToken TEST_OPTION_VALUE = StringToken.of("str", "s");
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueTest.java
new file mode 100644
index 00000000000..df9cdf5eb24
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueTest.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import org.junit.jupiter.api.Test;
+
+public class OptionValueTest {
+
+    @Test
+    public void test_asOption() {
+
+        assertFalse(OptionValue.create().asOption().isPresent());
+
+        assertTrue(build(String.class, "foo").create().asOption().isPresent());
+    }
+
+    @Test
+    public void test_getOption() {
+
+        assertThrowsExactly(NoSuchElementException.class, OptionValue.create()::getOption);
+
+        assertNotNull(build(String.class, "foo").create().getOption());
+    }
+
+    @Test
+    public void test_getSpec() {
+
+        assertThrowsExactly(NoSuchElementException.class, OptionValue.create()::getSpec);
+
+        assertNotNull(build(String.class, "foo").create().getSpec());
+    }
+
+    @Test
+    public void test_getName() {
+
+        assertThrowsExactly(NoSuchElementException.class, OptionValue.create()::getName);
+
+        assertEquals("foo", build(String.class, "foo").create().getName());
+    }
+
+    @Test
+    public void test_ifPresentIn() {
+
+        var option = build(String.class, "foo").create();
+
+        String value[] = new String[1];
+
+        option.ifPresentIn(EMPTY_OPTIONS, _ -> {
+            throw new AssertionError();
+        });
+
+        assertNull(value[0]);
+
+        option.ifPresentIn(Options.of(Map.of(option, "bar")), v -> {
+            value[0] = v;
+        });
+
+        assertEquals("bar", value[0]);
+    }
+
+    @Test
+    public void test_containsIn() {
+        test_containsIn(OptionValue.create());
+        test_containsIn(OptionValue.<Integer>build().defaultValue(45).create());
+        test_containsIn(build(Path[].class, "foo").create());
+    }
+
+    @Test
+    public void test_Builder_build() {
+
+        var builder = OptionValue.<Integer>build();
+
+        var a = builder.create();
+        var b = builder.create();
+
+        assertNotNull(a.id());
+        assertTrue(a.asOption().isEmpty());
+
+        assertNotNull(b.id());
+        assertTrue(b.asOption().isEmpty());
+
+        assertNotEquals(a.id(), b.id());
+        assertEquals(a.id().getClass(), b.id().getClass());
+    }
+
+    @Test
+    public void test_Builder_defaultValue() {
+
+        var option = OptionValue.<Integer>build().defaultValue(100).create();
+
+        assertEquals(100, option.getFrom(EMPTY_OPTIONS));
+
+        assertEquals(300, option.getFrom(Options.of(Map.of(option, 300))));
+    }
+
+    @Test
+    public void test_Builder_defaultValue_withSpec() {
+
+        var option = OptionValue.<Integer>build().defaultValue(100)
+                .spec(build(Integer.class, "foo").createOptionSpec())
+                .create();
+
+        assertEquals(100, option.getFrom(EMPTY_OPTIONS));
+
+        assertEquals(300, option.getFrom(Options.of(Map.of(option, 300))));
+    }
+
+    @Test
+    public void test_Builder_from() {
+
+        var option = OptionValue.<Integer>build().from(OptionValue.<String>create(), Integer::valueOf).create();
+
+        assertFalse(option.containsIn(EMPTY_OPTIONS));
+
+        assertEquals(300, option.getFrom(Options.of(Map.of(option, "300"))));
+    }
+
+    @Test
+    public void test_Builder_to() {
+
+        var listOption = OptionValue.build().to(List::of).create();
+
+        assertFalse(listOption.containsIn(EMPTY_OPTIONS));
+
+        assertEquals(List.of(300), listOption.getFrom(Options.of(Map.of(listOption, 300))));
+    }
+
+    @Test
+    public void test_Builder_to_fromAnotherOption() {
+
+        var option = OptionValue.<String>build().from(OptionValue.<String>create(), x -> x).defaultValue("abc").create();
+
+        OptionValue<List<String>> listOption = OptionValue.<String>build().from(option, x -> x).to(List::of).create();
+
+        assertSame(option.id(), listOption.id());
+        assertFalse(listOption.containsIn(EMPTY_OPTIONS));
+
+        assertEquals(List.of("abc"), listOption.getFrom(EMPTY_OPTIONS));
+        assertEquals("abc", option.getFrom(EMPTY_OPTIONS));
+
+        var options = Options.of(Map.of(option, "Hello"));
+
+        assertEquals(List.of("Hello"), listOption.getFrom(options));
+        assertEquals("Hello", option.getFrom(options));
+    }
+
+    @Test
+    public void testContainsPathArray() {
+
+        OptionValue<String> option = build(String.class, "foo").create();
+
+        var options = Options.of(Map.of(option, new Object()));
+
+        // OptionValue.contains() should work regardless the type of its value stored in Options object.
+        assertTrue(option.containsIn(options));
+
+        // Attempt to find a value will fail if the value is of incompatible type.
+        assertThrowsExactly(ClassCastException.class, () -> option.getFrom(options).length());
+    }
+
+    private static void test_containsIn(OptionValue<?> option) {
+        Objects.requireNonNull(option);
+
+        var anotherOption = OptionValue.create();
+
+        assertFalse(option.containsIn(EMPTY_OPTIONS));
+        assertFalse(option.containsIn(Options.of(Map.of(anotherOption, ""))));
+
+        assertTrue(option.containsIn(Options.of(Map.of(option, new int[10]))));
+        assertTrue(option.containsIn(Options.of(Map.of(option, new Object()))));
+    }
+
+    private static <T> OptionSpecBuilder<T> build(Class<? extends T> type, String name) {
+        return OptionSpecBuilder.<T>create(type).name(Objects.requireNonNull(name)).scope(new OptionScope() {});
+    }
+
+    private static final Options EMPTY_OPTIONS = Options.of(Map.of());
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
new file mode 100644
index 00000000000..4712adf15c1
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
@@ -0,0 +1,786 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.TestUtils.assertExceptionListEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.StandardOption.AddLauncherInvalidPropertyFileException;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.StandardPackageType;
+import jdk.jpackage.internal.util.Result;
+import jdk.jpackage.test.JUnitUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class OptionsProcessorTest {
+
+    @Test
+    public void test_processPropertyFile(@TempDir Path workDir) throws IOException {
+        final var propFile = workDir.resolve("launcher.properties");
+        Files.write(propFile, List.of("description=bar", "type=msi"));
+
+        final var result = processPropertyFile(propFile,
+                StandardOption.TYPE, StandardOption.DESCRIPTION);
+
+        assertTrue(result.hasValue());
+
+        assertEquals(StandardPackageType.WIN_MSI, StandardOption.TYPE.getFrom(result.orElseThrow()));
+        assertEquals("bar", StandardOption.DESCRIPTION.getFrom(result.orElseThrow()));
+
+        assertFalse(StandardOption.INPUT.containsIn(result.orElseThrow()));
+
+        assertEquals(propFile, StandardOption.SOURCE_PROPERY_FILE.getFrom(result.orElseThrow()));
+    }
+
+    @ParameterizedTest
+    @EnumSource(BooleanProperty.class)
+    public void test_processPropertyFile_Boolean(BooleanProperty value, @TempDir Path workDir) throws IOException {
+        final var propFile = workDir.resolve("launcher.properties");
+        Files.write(propFile, List.of("launcher-as-service=" + value.propertyValue()));
+
+        final var props = processPropertyFile(propFile,
+                StandardOption.LAUNCHER_AS_SERVICE).orElseThrow();
+
+        assertEquals(value.expectedValue(), StandardOption.LAUNCHER_AS_SERVICE.getFrom(props));
+    }
+
+    @Test
+    public void testMandatoryOptionsPresent(@TempDir Path workDir) {
+        build().createAppImageByDefault().withMockupMainJar(workDir).createBundleCallback(cmdline -> {
+            assertEquals(List.of(), StandardOption.ADDITIONAL_LAUNCHERS.getFrom(cmdline));
+            assertEquals(List.of(), StandardOption.FILE_ASSOCIATIONS.getFrom(cmdline));
+        }).create().execute();
+    }
+
+    @Test
+    public void testAdditionLauncher(@TempDir Path workDir) throws IOException {
+
+        final var propFile = workDir.resolve("launcher.properties");
+        Files.write(propFile, List.of("arguments=a b c"));
+
+        build().createAppImageByDefault().withMockupMainJar(workDir).createBundleCallback(cmdline -> {
+            assertFalse(StandardOption.ADD_LAUNCHER_INTERNAL.containsIn(cmdline));
+
+            var addLaunchers = StandardOption.ADDITIONAL_LAUNCHERS.getFrom(cmdline);
+            assertEquals(1, addLaunchers.size());
+
+            var addLauncher = addLaunchers.getFirst();
+
+            assertEquals("foo", StandardOption.NAME.getFrom(addLauncher));
+            assertEquals(propFile, StandardOption.SOURCE_PROPERY_FILE.getFrom(addLauncher));
+            assertEquals(List.of("a", "b", "c"), StandardOption.ARGUMENTS.getFrom(addLauncher));
+
+        }).create("--add-launcher", "foo=" + propFile).execute();
+    }
+
+    @Test
+    public void testFa(@TempDir Path workDir) throws IOException {
+
+        final var propFile = workDir.resolve("fa.properties");
+        Files.write(propFile, List.of("description=Hello"));
+
+        build().createAppImageByDefault().withMockupMainJar(workDir).createBundleCallback(cmdline -> {
+            assertFalse(StandardOption.FILE_ASSOCIATIONS_INTERNAL.containsIn(cmdline));
+
+            var fas = StandardOption.FILE_ASSOCIATIONS.getFrom(cmdline);
+            assertEquals(1, fas.size());
+
+            var fa = fas.getFirst();
+
+            assertEquals("Hello", StandardFaOption.DESCRIPTION.getFrom(fa));
+            assertEquals(propFile, StandardOption.SOURCE_PROPERY_FILE.getFrom(fa));
+
+        }).create("--file-associations=" + propFile).execute();
+    }
+
+    /**
+     * Test that it fails if there are "non-option" arguments on the command line.
+     */
+    @Test
+    public void testNonOptionArgumntsError(@TempDir Path workDir) {
+
+        build()
+        .withDefaultBundlingOperation(true)
+        .createAppImageBundlingOperation()
+        .expectValidationErrors(
+                new JPackageException(I18N.format("error.non-option-arguments", 1)),
+                new JPackageException(I18N.format("ERR_NoEntryPoint"))
+        ).create("foo").validate();
+
+        build()
+        .createAppImageBundlingOperation()
+        .expectValidationErrors(
+                new JPackageException(I18N.format("error.non-option-arguments", 3)),
+                new JPackageException(I18N.format("ERR_NoEntryPoint"))
+        ).create("some", "-t", "app-image", "foo", "bar", "--dest", "dir").validate();
+    }
+
+    /**
+     * Test that it fails as expected when `--type` option is missing and the
+     * bundling environment doesn't have the default bundling operation.
+     */
+    @Test
+    public void testNoDefaultBundlingOperation() {
+        build().expectValidationErrors(
+                new ConfigException(
+                        I18N.format("error.undefined-default-bundling-operation"),
+                        I18N.format("error.undefined-default-bundling-operation.advice", "--type")
+                )
+        ).create().validate();
+    }
+
+    /**
+     * Test that it fails as expected when `--type` option is missing and the
+     * default bundling operation of the bundling environment is unrecognizable.
+     */
+    @Test
+    public void testUnknownDefaultBundlingOperation() {
+        var descriptor = new BundlingOperationDescriptor(OperatingSystem.current(), "foo", "create");
+
+        var err = assertThrowsExactly(AssertionError.class, build().withDefaultBundlingOperation(true)
+                .bundlingOperation(descriptor)
+                .create()::validate);
+
+        assertEquals(String.format("None of the standard bundling operations match bundling operation descriptor [%s]", descriptor), err.getMessage());
+    }
+
+    /**
+     * Test that it fails as expected when the value of `--type` option is a valid
+     * bundle type but unsupported by the bundling environment.
+     */
+    @Test
+    public void testUnsupportedBundlingOperation() {
+        var err = new JPackageException(I18N.format("ERR_InvalidInstallerType", "msi"));
+        build().createAppImageByDefault().expectBundlingEnvironmentConfigurationErrors(err)
+                .expectValidationErrors(err)
+                .create("-t", "msi").validate();
+    }
+
+    /**
+     * Test that it fails as expected when the value of `--type` option is unrecognizable.
+     */
+    @Test
+    public void testUnknownBundlingOperation() {
+        var err = new JPackageException(I18N.format("ERR_InvalidInstallerType", "foo"), new IllegalArgumentException());
+        build().createAppImageByDefault().expectBundlingEnvironmentConfigurationErrors(err)
+                .expectValidationErrors(err)
+                .create("-t", "foo").validate();
+    }
+
+    /**
+     * Test that the error occurred at the bundling phase is propagated as expected.
+     */
+    @Test
+    public void testBundlingOperationError(@TempDir Path workDir) {
+        var validator = build().createAppImageByDefault().createBundleCallback(_ -> {
+            throw new RuntimeException("No bundling for you");
+        }).withMockupMainJar(workDir).create();
+
+        var validatedOptions = validator.validate().orElseThrow();
+
+        assertExceptionListEquals(List.of(new RuntimeException("No bundling for you")), validator.runBundling(validatedOptions));
+    }
+
+    /**
+     * Test that internal errors that occur when configuring bundlers in the
+     * bundling environment are reported as expected.
+     */
+    @Test
+    public void testBundlingOperationConfigurationErrors(@TempDir Path workDir) {
+        build().createAppImageByDefault()
+                .expectBundlingEnvironmentConfigurationErrors(
+                        new UnsupportedOperationException("Ops"),
+                        new Exception("Yikes"),
+                        new NoSuchElementException("Goofy")
+                )
+                .expectValidationErrors(
+                        new UnsupportedOperationException("Ops"),
+                        new Exception("Yikes"),
+                        new NoSuchElementException("Goofy")
+                )
+                .withMockupMainJar(workDir).create().validate();
+    }
+
+    /**
+     * Test that the options analyzer can detect and report multiple errors in
+     * untyped command line values.
+     * <p>
+     * Options analyzer examines command line options without accessing their values
+     * as converters have not been run on them yet. At this phase the analyzer can
+     * detect the type of a bundling operation, test if specific option is on the
+     * command line or not and analyze if specific combinations of options are
+     * valid.
+     */
+    @Test
+    public void testMultipleCommandLineStructureAnalyzerErrors() {
+        build().createAppImageByDefault().expectValidationErrors(
+                new JPackageException(I18N.format("ERR_BothMainJarAndModule")),
+                new JPackageException(I18N.format("ERR_MissingArgument2", "--runtime-image", "--module-path")),
+                new JPackageException(I18N.format("error.no-input-parameter"))
+        ).validationErrorsOrdered(false).create("-m", "com.foo", "--main-jar", "main.jar").validate();
+    }
+
+    /**
+     * Test that options analyzer can detect and report multiple errors in typed
+     * command line values.
+     */
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void testTypedOptionValuesAnalyzerErrors(boolean expectError, @TempDir Path workDir) {
+        var builder = build().platform(OperatingSystem.MACOS).withMockupMainJar(workDir).createAppImageByDefault();
+
+        if (expectError) {
+            builder.expectValidationErrors(
+                    new JPackageException(I18N.format("ERR_MissingJLinkOptMacAppStore", "--strip-native-commands"))
+            )
+            .create("--mac-app-store", "--jlink-options=").validate();
+        } else {
+            builder.create("--mac-app-store", "--jlink-options", "--strip-debug --strip-native-commands").validate();
+        }
+    }
+
+    /**
+     * Test that multiple converter/validator errors are in the same order as
+     * erroneous options on the command line.
+     */
+    @Test
+    public void testMultipleOptionValueConverterErrors(@TempDir Path workDir) {
+        build().createAppImageByDefault().expectValidationErrors(
+                // --i
+                new JPackageException(I18N.format("error.parameter-not-directory", workDir.resolve("non-existent"), "-i")),
+                // --name
+                new JPackageException(I18N.format("ERR_InvalidAppName", "He/llo"))
+        )
+        .create("--main-jar=foo.jar", "-i", workDir.resolve("non-existent"), "--name=He/llo").validate();
+
+        build().createAppImageByDefault().expectValidationErrors(
+                // --name
+                new JPackageException(I18N.format("ERR_InvalidAppName", "He/llo")),
+                // --i
+                new JPackageException(I18N.format("error.parameter-not-directory", workDir.resolve("non-existent"), "-i"))
+        )
+        .create("--main-jar=foo.jar", "--name=He/llo", "-i", workDir.resolve("non-existent")).validate();
+    }
+
+    @Test
+    public void testMultipleErrors(@TempDir Path workDir) throws IOException {
+
+        final var invalidPropertyFile = workDir.resolve("invalid.properties");
+
+        try (var writer = Files.newBufferedWriter(invalidPropertyFile)) {
+            var props = new Properties();
+            props.setProperty("icon", workDir.toString());
+            props.store(writer, null);
+        }
+
+        build().createAppImageByDefault()
+        .expectBundlingEnvironmentConfigurationErrors(
+                new UnsupportedOperationException("Ops"),
+                new Exception("Yikes"),
+                new NoSuchElementException("Goofy")
+        )
+        .expectValidationErrors(
+                new UnsupportedOperationException("Ops"),
+                new Exception("Yikes"),
+                new NoSuchElementException("Goofy"),
+                new JPackageException(I18N.format("error.properties-parameter-not-file", workDir, "icon", invalidPropertyFile)),
+                new JPackageException(I18N.format("error.parameter-not-directory", workDir.resolve("non-existent"), "-i")),
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "a"))
+        )
+        .withMockupMainJar(workDir).create("--add-launcher=a=" + invalidPropertyFile, "--name=a", "-i", workDir.resolve("non-existent")).validate();
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1})
+    public void testMultipleErrors2(int testType, @TempDir Path workDir) throws IOException {
+
+        List<String> badOptions;
+        switch (testType) {
+            case 0 -> {
+                badOptions = List.of("--linux-shortcut", "--win-console");
+            }
+            case 1 -> {
+                badOptions = List.of("--win-console", "--linux-shortcut");
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        var builder = build().os(OperatingSystem.WINDOWS)
+                .bundlingOperation(StandardBundlingOperation.CREATE_WIN_MSI.descriptor())
+                .expectValidationErrors(new JPackageException(I18N.format("ERR_InvalidInstallerType", "dmg")));
+
+        for (var badOption : badOptions) {
+            builder.expectValidationErrors(new JPackageException(I18N.format("ERR_UnsupportedOption", badOption)));
+        }
+
+        List<Object> args = new ArrayList<>(List.of("-t", "dmg", "-i", workDir.resolve("non-existent")));
+        args.addAll(badOptions);
+        args.addAll(List.of("--mac-package-name", "foo"));
+        builder.create(args).validate();
+    }
+
+    @Test
+    public void testMultipleErrors3(@TempDir Path workDir) throws IOException {
+
+        build().os(OperatingSystem.WINDOWS)
+                .bundlingOperation(StandardBundlingOperation.CREATE_WIN_MSI.descriptor())
+                .withDefaultBundlingOperation(true)
+                .expectValidationErrors(
+                        new JPackageException(I18N.format("ERR_UnsupportedOption", "--linux-shortcut")),
+                        new JPackageException(I18N.format("ERR_UnsupportedOption", "--mac-package-name")),
+                        new JPackageException(I18N.format("ERR_UnsupportedOption", "--linux-menu-group"))
+                )
+                .create("-i", workDir.resolve("non-existent"), "--linux-shortcut", "--mac-package-name", "foo", "--linux-menu-group", "grp").validate();
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1, 2})
+    public void testMultipleErrors4(int testType, @TempDir Path workDir) throws IOException {
+
+        List<String> args;
+        List<String> expectedErrors = null;
+
+        switch (testType) {
+            case 0 -> {
+                args = List.of("--linux-shortcut", "--mac-package-name", "foo", "-p", "m1", "--linux-menu-group", "grp", "-p", "m2", "--app-image", "foo");
+                expectedErrors = List.of(
+                        I18N.format("ERR_UnsupportedOption", "--linux-shortcut"),
+                        I18N.format("ERR_UnsupportedOption", "--mac-package-name"),
+                        I18N.format("ERR_InvalidTypeOption", "-p", "msi"),
+                        I18N.format("ERR_UnsupportedOption", "--linux-menu-group")
+                );
+            }
+            case 1 -> {
+                args = List.of("--linux-shortcut", "--mac-package-name", "foo", "--module-path", "m1", "--linux-menu-group", "grp", "-p", "m2", "--app-image", "foo");
+                expectedErrors = List.of(
+                        I18N.format("ERR_UnsupportedOption", "--linux-shortcut"),
+                        I18N.format("ERR_UnsupportedOption", "--mac-package-name"),
+                        I18N.format("ERR_InvalidTypeOption", "--module-path", "msi"),
+                        I18N.format("ERR_UnsupportedOption", "--linux-menu-group")
+                );
+            }
+            case 2 -> {
+                args = List.of("--linux-shortcut", "--mac-package-name", "foo", "-p", "m1", "--linux-menu-group", "grp", "--module-path", "m2", "--app-image", "foo");
+                expectedErrors = List.of(
+                        I18N.format("ERR_UnsupportedOption", "--linux-shortcut"),
+                        I18N.format("ERR_UnsupportedOption", "--mac-package-name"),
+                        I18N.format("ERR_InvalidTypeOption", "--module-path", "msi"),
+                        I18N.format("ERR_UnsupportedOption", "--linux-menu-group")
+                );
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        build().os(OperatingSystem.WINDOWS)
+                .withDefaultBundlingOperation(true)
+                .bundlingOperation(StandardBundlingOperation.CREATE_WIN_MSI.descriptor())
+                .expectValidationErrors(expectedErrors.stream().map(JPackageException::new).toList())
+                .create(args.toArray()).validate();
+    }
+
+
+    /**
+     * Test that it will collect all errors when processing multiple property files
+     * for additional launchers.
+     */
+    @Test
+    @EnabledOnOs(value = OS.WINDOWS, disabledReason = "Can reliably lock a file using FileLock to cuase an IOException on Windows only")
+    @SuppressWarnings("try")
+    public void testMultipleAddLauncherErrors(@TempDir Path workDir) throws IOException {
+
+        final var lockedPropertyFile = workDir.resolve("locked.properties");
+        Files.write(lockedPropertyFile, List.of(""));
+
+        final var invalidPropertyFile = workDir.resolve("invalid.properties");
+        Files.write(invalidPropertyFile, List.of("icon=*.png"));
+
+        final var nonExistentPropertyFile = workDir.resolve("non-existent.properties");
+
+        try (var out = new FileOutputStream(lockedPropertyFile.toFile()); var lock = out.getChannel().lock()) {
+
+            final IOException lockedException = assertThrowsExactly(IOException.class, () -> {
+                Files.readAllBytes(lockedPropertyFile);
+            });
+
+            build().createAppImageByDefault().expectValidationErrors(
+                    // --name=Hello*
+                    new JPackageException(I18N.format("ERR_InvalidAppName", "Hello*")),
+
+                    // --i "non-existent"
+                    new JPackageException(I18N.format("error.parameter-not-directory", workDir.resolve("non-existent"), "-i")),
+
+                    // --main-jar=?.jar
+                    new JPackageException(I18N.format("error.parameter-not-path", "?.jar", "--main-jar"), new IllegalArgumentException()),
+
+                    // icon=*.png in "invalid.properties"
+                    new JPackageException(I18N.format("error.properties-parameter-not-path", "*.png", "icon", invalidPropertyFile), new IllegalArgumentException()),
+
+                    // "locked.properties"
+                    lockedException,
+
+                    // "non-existent.properties"
+                    new AddLauncherInvalidPropertyFileException(I18N.format("error.parameter-add-launcher-not-file", nonExistentPropertyFile, "b")),
+
+                    new JPackageException(I18N.format("error.launcher-duplicate-name", "b"))
+            )
+            .create("--name=Hello*", "-i", workDir.resolve("non-existent"), "--main-jar=?.jar",
+                    "--add-launcher", "a=" + invalidPropertyFile,
+                    "--add-launcher", "b=" + lockedPropertyFile,
+                    "--add-launcher", "b=" + nonExistentPropertyFile).validate();
+        }
+    }
+
+    @Test
+    public void testDuplicateAddLauncherErrors(@TempDir Path workDir) throws IOException {
+
+        final var propertyFile = workDir.resolve("foo.properties");
+        Files.write(propertyFile, List.of(""));
+
+        build().createAppImageByDefault().withMockupMainJar(workDir).expectValidationErrors(
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "a"))
+        )
+        .create("--name=a", "--add-launcher=a=" + propertyFile).validate();
+
+        build().createAppImageByDefault().withMockupMainJar(workDir).expectValidationErrors(
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "a"))
+        )
+        .create("--name=a", "--add-launcher=a=" + propertyFile, "--add-launcher=a=" + propertyFile, "--add-launcher=a=" + propertyFile).validate();
+
+        build().createAppImageByDefault().withMockupMainJar(workDir).expectValidationErrors(
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "a")),
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "b"))
+        )
+        .create("-name=c",
+                "--add-launcher=a=" + propertyFile,
+                "--add-launcher=b=" + propertyFile,
+                "--add-launcher=a=" + propertyFile,
+                "--add-launcher=b=" + propertyFile).validate();
+
+        build().createAppImageByDefault().withMockupMainJar(workDir).expectValidationErrors(
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "a")),
+                new JPackageException(I18N.format("error.launcher-duplicate-name", "b"))
+        )
+        .create("-name=c",
+                "--add-launcher=b=" + propertyFile,
+                "--add-launcher=a=" + propertyFile,
+                "--add-launcher=b=" + propertyFile,
+                "--add-launcher=a=" + propertyFile).validate();
+    }
+
+    enum BooleanProperty {
+
+        TRUE("true", true),
+        TRUE_UPPERCASE_FIRST("True", true),
+        TRUE_UPPERCASE_ALL("TRUE", true),
+        TRUE_UPPERCASE_LAST("truE", true),
+        TRUE_UPPERCASE_MIDDLE("tRUe", true),
+        FALSE("false", false),
+        FALSE_UPPERCASE("FALSE", false),
+        EMPTY("", false),
+        RANDOM("foo", false),
+        TRUELISH("truee", false),
+        FALSEISH("fals", false),
+        ;
+
+        BooleanProperty(String propertyValue, boolean expectedValue) {
+            this.propertyValue = Objects.requireNonNull(propertyValue);
+            this.expectedValue = Objects.requireNonNull(expectedValue);
+        }
+
+        String propertyValue() {
+            return propertyValue;
+        }
+
+        boolean expectedValue() {
+            return expectedValue;
+        }
+
+        private final String propertyValue;
+        private final boolean expectedValue;
+    }
+
+    private static Result<Options> processPropertyFile(Path propFile, OptionValue<?>... options) {
+        return OptionsProcessor.processPropertyFile(propFile,
+                Stream.of(options).map(OptionValue::getOption).toList(),
+                Optional.of(spec -> {
+                    return new StandardOptionContext(OperatingSystem.current()).forFile(propFile).mapOptionSpec(spec);
+                }));
+    }
+
+    private static OptionsProcessorValidatorBuilder build() {
+        return new OptionsProcessorValidatorBuilder();
+    }
+
+
+    private record OptionsProcessorValidator(
+            OptionsProcessor optionsProcessor,
+            CreateBundleCallbackRecorder recorder,
+            Collection<Map<String, Object>> expectedValidationErrors) {
+
+        OptionsProcessorValidator {
+            Objects.requireNonNull(optionsProcessor);
+            Objects.requireNonNull(recorder);
+            Objects.requireNonNull(expectedValidationErrors);
+        }
+
+        Result<OptionsProcessor.ValidatedOptions> validate() {
+            var curExecutedCounter = recorder.executedCounter();
+
+            var result = optionsProcessor.validate();
+
+            // Assert validation doesn't trigger bundling.
+            assertEquals(curExecutedCounter, recorder.executedCounter());
+
+            var errors = result.errors().stream().map(JUnitUtils::exceptionAsPropertyMap).map(propertyMap -> {
+                // Don't dive into the cause chain, stop at the first one.
+                Optional.ofNullable(propertyMap.get("getCause")).ifPresent(causePropertyMap -> {
+                    ((Map<?, ?>)causePropertyMap).remove("getCause");
+                    ((Map<?, ?>)causePropertyMap).remove("getMessage");
+                });
+                return propertyMap;
+            }).toList();
+            if (expectedValidationErrors instanceof Set<?>) {
+                assertEquals(expectedValidationErrors, Set.copyOf(errors));
+            } else {
+                assertEquals(expectedValidationErrors, errors);
+            }
+
+            return result;
+        }
+
+        Collection<? extends Exception> runBundling(OptionsProcessor.ValidatedOptions validatedOptions) {
+            var curExecutedCounter = recorder.executedCounter();
+
+            var result = optionsProcessor.runBundling(validatedOptions);
+
+            assertEquals(curExecutedCounter + 1, recorder.executedCounter());
+
+            return result;
+        }
+
+        void execute() {
+            var exceptions = runBundling(validate().orElseThrow());
+
+            for (var ex : exceptions) {
+                ex.printStackTrace();
+            }
+
+            assertEquals(List.of(), exceptions);
+        }
+    }
+
+
+    private static final class CreateBundleCallbackRecorder implements Consumer<Options> {
+
+        CreateBundleCallbackRecorder(Optional<Consumer<Options>> callback) {
+            this.callback = Objects.requireNonNull(callback);
+        }
+
+        @Override
+        public void accept(Options cmdline) {
+            executedCounter++;
+            callback.ifPresent(c -> c.accept(cmdline));
+        }
+
+        int executedCounter() {
+            return executedCounter;
+        }
+
+        private final Optional<Consumer<Options>> callback;
+        private int executedCounter;
+    }
+
+
+    private static final class OptionsProcessorValidatorBuilder {
+
+        OptionsProcessorValidator create(Object... args) {
+            return create(List.of(args));
+        }
+
+        OptionsProcessorValidator create(Iterable<Object> args) {
+
+            var stringArgs = Stream.concat(
+                    baseArgs.stream(),
+                    StreamSupport.stream(args.spliterator(), false).map(Object::toString)
+            ).toArray(String[]::new);
+
+            var recorder = new CreateBundleCallbackRecorder(createBundleCallback());
+
+            CliBundlingEnvironment bundlingEnv = bundlingEnvironmentBuilder.createBundleCallback(recorder).create();
+
+            var optionsBuilder = Utils.buildParser(os, bundlingEnv).create().apply(stringArgs).orElseThrow();
+
+            var op = new OptionsProcessor(optionsBuilder, bundlingEnv);
+
+            Collection<Map<String, Object>> errors;
+            if (expectedValidationErrorsOrdered) {
+                errors = expectedValidationErrors.stream().map(JUnitUtils::exceptionAsPropertyMap).toList();
+            } else {
+                errors = expectedValidationErrors.stream().map(JUnitUtils::exceptionAsPropertyMap).collect(Collectors.toSet());
+            }
+
+            return new OptionsProcessorValidator(op, recorder, errors);
+        }
+
+        OptionsProcessorValidatorBuilder args(Iterable<Object> v) {
+            StreamSupport.stream(v.spliterator(), false).map(Object::toString).forEach(baseArgs::add);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder args(Object... args) {
+            return args(List.of(args));
+        }
+
+        OptionsProcessorValidatorBuilder os(OperatingSystem v) {
+            os = Objects.requireNonNull(v);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder withMockupMainJar(Path inputDir) {
+
+            try {
+                Files.write(inputDir.resolve("mockup.jar"), new byte[] {});
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+
+            return args("--input", inputDir, "--main-jar", "mockup.jar");
+        }
+
+        OptionsProcessorValidatorBuilder withDefaultBundlingOperation(boolean v) {
+            withDefaultBundlingOperation = v;
+            if (withDefaultBundlingOperation) {
+                bundlingEnvironmentBuilder.defaultOperation(bundlingOperation);
+            } else {
+                bundlingEnvironmentBuilder.defaultOperation(null);
+            }
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder bundlingOperation(BundlingOperationDescriptor v) {
+            bundlingOperation = Objects.requireNonNull(v);
+            bundlingEnvironmentBuilder.knownOperation(bundlingOperation);
+            withDefaultBundlingOperation(withDefaultBundlingOperation);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder createAppImageBundlingOperation() {
+            return bundlingOperation(MockupCliBundlingEnvironment.createAppImageBundlingOperation(os).descriptor());
+        }
+
+        OptionsProcessorValidatorBuilder createAppImageByDefault() {
+            return createAppImageBundlingOperation().withDefaultBundlingOperation(true);
+        }
+
+        OptionsProcessorValidatorBuilder platform(OperatingSystem v) {
+            os = Objects.requireNonNull(v);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder createBundleCallback(Consumer<Options> v) {
+            createBundleCallback = v;
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder expectValidationErrors(Iterable<? extends Exception> v) {
+            v.forEach(this::expectValidationError);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder expectValidationError(Exception v) {
+
+            if (expectedValidationErrors.stream().anyMatch(err -> {
+                return err.getMessage().equals(v.getMessage());
+            })) {
+                throw new IllegalArgumentException(String.format("Error message [%s] already expected", v.getMessage()));
+            }
+            expectedValidationErrors.add(v);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder expectValidationErrors(Exception... errors) {
+            return expectValidationErrors(List.of(errors));
+        }
+
+        OptionsProcessorValidatorBuilder expectBundlingEnvironmentConfigurationErrors(List<Exception> v) {
+            bundlingEnvironmentBuilder.configurationErrors(bundlingOperation, v);
+            return this;
+        }
+
+        OptionsProcessorValidatorBuilder expectBundlingEnvironmentConfigurationErrors(Exception... errors) {
+            return expectBundlingEnvironmentConfigurationErrors(List.of(errors));
+        }
+
+        OptionsProcessorValidatorBuilder validationErrorsOrdered(boolean v) {
+            expectedValidationErrorsOrdered = v;
+            return this;
+        }
+
+        private Optional<Consumer<Options>> createBundleCallback() {
+            return Optional.ofNullable(createBundleCallback);
+        }
+
+        private final List<String> baseArgs = new ArrayList<>();
+        private BundlingOperationDescriptor bundlingOperation;
+        private OperatingSystem os = OperatingSystem.current();
+        private boolean withDefaultBundlingOperation;
+        private final List<Exception> expectedValidationErrors = new ArrayList<>();
+        private Consumer<Options> createBundleCallback;
+        private boolean expectedValidationErrorsOrdered = true;
+        private final MockupCliBundlingEnvironment.Builder bundlingEnvironmentBuilder = MockupCliBundlingEnvironment.build();
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsTest.java
new file mode 100644
index 00000000000..15de77260cc
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsTest.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.ExpectedOptions.expectOptions;
+import static jdk.jpackage.internal.cli.OptionIdentifier.createIdentifier;
+import static jdk.jpackage.internal.cli.WithOptionIdentifier.stub;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class OptionsTest {
+
+    @Test
+    public void test_ofIDs() {
+        var fooID = createIdentifier();
+        var barID = createIdentifier();
+        var buzID = createIdentifier();
+
+        var options = Options.ofIDs(Map.of(fooID, "Hello", barID, 100));
+
+        expectOptions().add(fooID, "Hello").add(barID, 100).apply(options);
+        assertFalse(options.find(buzID).isPresent());
+    }
+
+    @Test
+    public void test_of_duplicate_id() {
+        var withId = stub(createIdentifier());
+        var barO = dummyOption("bar");
+        var barOV = OptionValue.build().spec(dummyOptionSpec("another-bar")).id(barO.id()).create();
+
+        assertThrowsExactly(IllegalStateException.class, () -> {
+            Options.of(Map.of(withId, "Hello", barO, 100, barOV, "Bye"));
+        });
+    }
+
+    @Test
+    public void test_of() {
+        var withId = stub(createIdentifier());
+        var bar = dummyOption("bar");
+        var buz = OptionValue.build().spec(dummyOptionSpec("another-bar")).create();
+
+        var options = Options.of(Map.of(withId, "Hello", bar, 100, buz, "Bye"));
+
+        expectOptions().add(withId.id(), "Hello").add(bar, 100).add(buz, "Bye").apply(options);
+    }
+
+    @Test
+    public void test_of_empty() {
+        var options = Options.of(Map.of());
+
+        assertFalse(options.contains(createIdentifier()));
+
+        var barID = dummyOption("bar");
+        assertFalse(options.contains(barID));
+        assertFalse(options.contains(barID.spec().name()));
+    }
+
+    @Test
+    public void test_of_Option() {
+        var fooID = createIdentifier();
+        var barID = dummyOption("bar");
+        var buzID = createIdentifier();
+
+        var options = Options.of(Map.of(stub(fooID), "Hello", barID, 100));
+
+        expectOptions().add(fooID, "Hello").add(barID, 100).apply(options);
+        assertFalse(options.find(buzID).isPresent());
+        assertFalse(options.contains(OptionName.of("foo")));
+    }
+
+    @Test
+    public void test_toMap() {
+        var idA = createIdentifier();
+        var idB = createIdentifier();
+
+        var a = Options.ofIDs(Map.of(idA, "Foo", idB, true));
+        var b = Options.concat(Options.ofIDs(Map.of(idA, "Foo")), Options.ofIDs(Map.of(idB, true)));
+
+        assertEquals(a.toMap(), b.toMap());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_copyWithDefaultValue(boolean supplier) {
+        var fooID = createIdentifier();
+        var barOV = OptionValue.build().spec(dummyOptionSpec("bar")).create();
+
+        var options = Options.ofIDs(Map.of(fooID, "Hello"));
+        var expected = expectOptions().add(fooID, "Hello");
+
+        expected.apply(options);
+        assertFalse(options.contains(barOV.getSpec().name()));
+
+        if (supplier) {
+            options = options.copyWithDefaultValue(barOV, () -> 89);
+        } else {
+            options = options.copyWithDefaultValue(barOV, 89);
+        }
+        expected.add(barOV, 89).apply(options);
+
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_copyWithDefaultValue_nop(boolean supplier) {
+        var fooID = createIdentifier();
+        var barOV = OptionValue.build().spec(dummyOptionSpec("bar")).create();
+
+        var options = Options.of(Map.of(stub(fooID), "Hello", barOV, 89));
+        var expected = expectOptions().add(fooID, "Hello").add(barOV, 89);
+
+        expected.apply(options);
+        if (supplier) {
+            options = options.copyWithDefaultValue(barOV, () -> {
+                Assertions.fail("Should not be called");
+                return null;
+            });
+        } else {
+            options = options.copyWithDefaultValue(barOV, 75);
+        }
+        expected.apply(options);
+    }
+
+    @Test
+    public void test_copyWithParent() {
+        var fooID = createIdentifier();
+        var barID = dummyOption("bar");
+
+        var options = Options.ofIDs(Map.of(fooID, "Hello"));
+        expectOptions().add(fooID, "Hello").apply(options);
+        assertFalse(options.contains(barID.spec().name()));
+
+        var parentOptions = Options.of(Map.of(barID, 89));
+        expectOptions().add(barID, 89).apply(parentOptions);
+
+        expectOptions().add(fooID, "Hello").add(barID, 89).apply(options.copyWithParent(parentOptions));
+    }
+
+    @Test
+    public void test_copyWithout() {
+        var a = createIdentifier();
+        var b = OptionIdentifier.of("foo");
+        var c = dummyOption("bar", "b");
+        var d = dummyOption("str", "s", "q");
+
+        var options = Options.concat(
+                Options.ofIDs(Map.of(a, "Hello", b, 189)),
+                Options.of(Map.of(c, Set.of(78, "56"), d, List.of(100)))
+        );
+
+        expectOptions().add(a, "Hello").add(b, 189).add(c, Set.of(78, "56")).add(d, List.of(100)).apply(options);
+
+        var without = options.copyWithout(a, d.id());
+
+        expectOptions().add(b, 189).add(c, Set.of(78, "56")).apply(without);
+
+        assertFalse(without.contains(a));
+        assertFalse(without.contains(d));
+        for (var name : d.spec().names()) {
+            assertFalse(without.contains(name));
+        }
+    }
+
+    @Test
+    public void test_copyWithout_duplicate_option_name() {
+        var x = dummyOption("b", "c", "d");
+        var y = dummyOption("a", "b", "d");
+
+        var options = Options.of(Map.of(x, "Hello", y, 189));
+
+        assertTrue(options.contains(OptionName.of("a")));
+        assertTrue(options.contains(OptionName.of("b")));
+        assertTrue(options.contains(OptionName.of("c")));
+        assertTrue(options.contains(OptionName.of("d")));
+
+        var without = options.copyWithout(x.id());
+
+        assertTrue(without.contains(OptionName.of("a")));
+        assertTrue(without.contains(OptionName.of("b")));
+        assertFalse(without.contains(OptionName.of("c")));
+        assertTrue(without.contains(OptionName.of("d")));
+    }
+
+    @Test
+    public void test_copyWith() {
+        var a = createIdentifier();
+        var b = OptionIdentifier.of("foo");
+        var c = dummyOption("bar", "b");
+        var d = dummyOption("str", "s", "q");
+        var unused = createIdentifier();
+
+        var options = Options.of(Map.of(stub(a), "Hello", stub(b), 189, c, Set.of(78, "56"), d, List.of(100)));
+
+        expectOptions().add(a, "Hello").add(b, 189).add(c, Set.of(78, "56")).add(d, List.of(100)).apply(options);
+
+        var with = options.copyWith(a, c.id(), unused);
+
+        expectOptions().add(a, "Hello").add(c, Set.of(78, "56")).apply(with);
+
+        assertFalse(with.contains(b));
+        assertFalse(with.contains(d));
+        assertFalse(with.contains(unused));
+        for (var name : d.spec().names()) {
+            assertFalse(with.contains(name));
+        }
+    }
+
+    @Test
+    public void test_copyWithParent_override() {
+        var fooID = createIdentifier();
+        var barID = dummyOption("bar");
+
+        var options = Options.concat(
+                Options.ofIDs(Map.of(fooID, "Hello")),
+                Options.of(Map.of(barID, 137))
+        );
+        var expected = expectOptions().add(fooID, "Hello").add(barID, 137);
+        expected.apply(options);
+
+        var parentOptions = Options.of(Map.of(barID, 89));
+        expectOptions().add(barID, 89).apply(parentOptions);
+
+        expected.apply(options.copyWithParent(parentOptions));
+    }
+
+    private static Option dummyOption(String... names) {
+        return new Option(dummyOptionSpec(names));
+    }
+
+    private static OptionSpec<String> dummyOptionSpec(String... names) {
+        return new OptionSpec<>(
+                Stream.of(names).map(OptionName::of).toList(),
+                Optional.empty(),
+                Set.of(new OptionScope() {}),
+                OptionSpec.MergePolicy.USE_FIRST,
+                Optional.empty(),
+                Optional.empty(),
+                "");
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
new file mode 100644
index 00000000000..4f1dda06f68
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
@@ -0,0 +1,46 @@
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 0.2]; errors=[message.version-string-first-number-not-zero, error.invalid-cfbundle-version.advice])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.2.3.4]; errors=[message.version-string-too-many-components, error.invalid-cfbundle-version.advice])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.]; errors=[error.version-string-zero-length-component+[1.]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.b.3]; errors=[error.version-string-invalid-component+[1.b.3, b.3]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, ]; errors=[error.version-string-empty])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --add-modules]; errors=[error.blocked.option+[--add-modules]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --foo]; errors=[error.jlink.failed+[Error: unknown option: --foo]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --module-path]; errors=[error.blocked.option+[--module-path]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --output]; errors=[error.blocked.option+[--output]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--main-jar, non-existent.jar]; errors=[error.main-jar-does-not-exist+[non-existent.jar]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[error.invalid-runtime-image-missing-file+[@@EMPTY_DIR@@, lib/**/libjli.dylib]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-del=[--main-class]; errors=[error.no-main-class-with-main-jar+[hello.jar], error.no-main-class-with-main-jar.advice+[hello.jar]])
+ErrorTest.test(IMAGE; args-add=[--module, com.foo.bar, --runtime-image, @@JAVA_HOME@@]; errors=[error.no-module-in-path+[com.foo.bar]])
+ErrorTest.test(IMAGE; args-add=[--module, java.base, --runtime-image, @@JAVA_HOME@@]; errors=[ERR_NoMainClass])
+ErrorTest.test(LINUX_DEB; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[error.deb-invalid-value-for-package-name+[#], error.deb-invalid-value-for-package-name.advice])
+ErrorTest.test(LINUX_RPM; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[error.rpm-invalid-value-for-package-name+[#], error.rpm-invalid-value-for-package-name.advice])
+ErrorTest.test(MAC_PKG; app-desc=Hello; args-add=[--mac-package-identifier, #1]; errors=[message.invalid-identifier+[#1]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--mac-app-store, --runtime-image, @@JAVA_HOME@@]; errors=[error.invalid-runtime-image-bin-dir+[@@JAVA_HOME@@], error.invalid-runtime-image-bin-dir.advice+[--mac-app-store]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[error.invalid-runtime-image-missing-file+[@@EMPTY_DIR@@, lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[error.invalid-runtime-image-missing-file+[@@EMPTY_DIR@@, lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.2.3.4.5]; errors=[error.msi-product-version-components+[1.2.3.4.5], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.2.65536]; errors=[error.msi-product-version-build-out-of-range+[1.2.65536], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.256]; errors=[error.msi-product-version-minor-out-of-range+[1.256], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1234]; errors=[error.msi-product-version-components+[1234], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[error.msi-product-version-major-out-of-range+[256.1], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--launcher-as-service]; errors=[error.missing-service-installer, error.missing-service-installer.advice])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.2.3.4.5]; errors=[error.msi-product-version-components+[1.2.3.4.5], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.2.65536]; errors=[error.msi-product-version-build-out-of-range+[1.2.65536], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.256]; errors=[error.msi-product-version-minor-out-of-range+[1.256], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1234]; errors=[error.msi-product-version-components+[1234], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[error.msi-product-version-major-out-of-range+[256.1], error.version-string-wrong-format.advice])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--launcher-as-service]; errors=[error.missing-service-installer, error.missing-service-installer.advice])
+ErrorTest.test(args-add=[@foo]; errors=[ERR_CannotParseOptions+[foo]])
+ErrorTest.testMacSigningIdentityValidation(IMAGE, --mac-app-image-sign-identity, true)
+ErrorTest.testMacSigningIdentityValidation(IMAGE, --mac-signing-key-user-name, false)
+ErrorTest.testMacSigningIdentityValidation(MAC_DMG, --mac-app-image-sign-identity, true)
+ErrorTest.testMacSigningIdentityValidation(MAC_DMG, --mac-signing-key-user-name, false)
+ErrorTest.testMacSigningIdentityValidation(MAC_PKG, --mac-app-image-sign-identity, true)
+ErrorTest.testMacSigningIdentityValidation(MAC_PKG, --mac-installer-sign-identity, true)
+ErrorTest.testMacSigningIdentityValidation(MAC_PKG, --mac-signing-key-user-name, false)
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
new file mode 100644
index 00000000000..a46cb20815f
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UncheckedIOException;
+import java.lang.invoke.MethodHandles;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.spi.ToolProvider;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.util.Result;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JUnitAdapter;
+import jdk.jpackage.test.JavaTool;
+import jdk.jpackage.test.TKit;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.condition.EnabledIf;
+
+/**
+ * Runs some ErrorTest test cases from an IDE on a mockup jpackage tool
+ * provider.
+ * <p>
+ * ErrorTest is comprised of test cases that pass faulty command line arguments
+ * to jpackage and expect it to fail. It is natural to reuse these test cases to
+ * test jpackage command line validation.
+ * <p>
+ * ErrorTest provides better test coverage, but it is a jtreg test, it runs
+ * slowly and there is no integration of jtreg tests in IDEs. This JUnit test
+ * class leverages ErrorTest test cases to test jpackage command line validation
+ * from an IDE.
+ *
+ * <p>
+ * The scenario breaks down into two components:
+ * <ol>
+ * <li>Load ErrorTest jtreg test
+ * <li>Setup custom jpackage tool provider
+ * </ol>
+ *
+ * <h1>1. Load ErrorTest jtreg test</h1>
+ * <p>
+ * Build OptionsValidationFailTest, ErrorTest and its nested classes such that
+ * they reside in the unnamed module together with the classes from the
+ * "jdk.jpackage.test" package.
+ * <p>
+ * There is no straightforward way to access classes in the unnamed package
+ * outside their module. However, these classes (class files) can be accessed as
+ * resources. So the workaround is to read class files of classes in the unnamed
+ * package and load them using a custom class loader.
+ * <p>
+ * jpackage jtreg tests are in the unnamed package according to jtreg
+ * recommendations, see
+ * <a href="https://openjdk.org/jtreg/faq.html#how-should-i-organize-tests-libraries-and-other-test-related-files">jtreg FAQ</a>
+ */
+@EnabledIf("jtregErrorTestAvailable")
+public class OptionsValidationFailTest {
+
+    @BeforeAll
+    public static void setCustomJPackageToolProvider() {
+        JPackageCommand.useToolProviderByDefault(new ToolProvider() {
+
+            @Override
+            public String name() {
+                return "jpackage-mockup";
+            }
+
+            @Override
+            public int run(PrintWriter out, PrintWriter err, String... args) {
+
+                var errorReporter = new Main.ErrorReporter(ex -> {
+                    ex.printStackTrace(err);
+                }, out::append);
+
+                return parse(args).peekErrors(errors -> {
+                    final var firstErr = errors.stream().findFirst().orElseThrow();
+                    errorReporter.reportError(firstErr);
+                }).map(builder -> {
+                    var result = new OptionsProcessor(builder, bundlingEnv).validate();
+                    if (result.hasValue()) {
+                        return 0;
+                    } else {
+                        result.peekErrors(errors -> {
+                            errors.forEach(errorReporter::reportError);
+                        });
+                        return 1;
+                    }
+                }).value().orElse(1);
+            }
+
+            private Result<JOptSimpleOptionsBuilder.OptionsBuilder> parse(String... args) {
+                return Utils.buildParser(OperatingSystem.current(), bundlingEnv).create().apply(args);
+            }
+
+            private final CliBundlingEnvironment bundlingEnv = new CliBundlingEnvironment() {
+
+                @Override
+                public Optional<BundlingOperationDescriptor> defaultOperation() {
+                    switch (OperatingSystem.current()) {
+                        case WINDOWS -> {
+                            return Optional.of(StandardBundlingOperation.CREATE_WIN_EXE.descriptor());
+                        }
+                        case LINUX -> {
+                            return Optional.of(StandardBundlingOperation.CREATE_LINUX_RPM.descriptor());
+                        }
+                        case MACOS -> {
+                            return Optional.of(StandardBundlingOperation.CREATE_MAC_PKG.descriptor());
+                        }
+                        default -> {
+                            throw new UnsupportedOperationException();
+                        }
+                    }
+                }
+
+                @Override
+                public void createBundle(BundlingOperationDescriptor op, Options cmdline) {
+                    throw new AssertionError();
+                }
+
+            };
+        });
+    }
+
+    @AfterAll
+    public static void resetJPackageToolProvider() {
+        Optional.ofNullable(JavaTool.JPACKAGE.asToolProvider()).ifPresentOrElse(
+                JPackageCommand::useToolProviderByDefault, JPackageCommand::useExecutableByDefault);
+    }
+
+    @TestFactory
+    Stream<DynamicTest> getTestCasesFromErrorTest() throws Throwable {
+        final var jpackageTestsUnnamedModule = JUnitAdapter.class.getModule();
+
+        final var testClassloader = new InMemoryClassLoader(Stream.of(
+                "ErrorTest",
+                "ErrorTest$ArgumentGroup",
+                "ErrorTest$PackageTypeSpec",
+                "ErrorTest$TestSpec$Builder",
+                "ErrorTest$TestSpec",
+                "ErrorTest$Token",
+                "ErrorTest$UnsupportedPlatformOption"
+        ).collect(Collectors.toMap(x -> x, className -> {
+            try (final var in = Objects.requireNonNull(jpackageTestsUnnamedModule.getResourceAsStream(className + ".class"))) {
+                final var buffer= new ByteArrayOutputStream();
+                in.transferTo(buffer);
+                return buffer.toByteArray();
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        })));
+
+        final var thisModule = getClass().getModule();
+        if (thisModule.isNamed()) {
+            for (final var m : List.of(testClassloader.getUnnamedModule(), jpackageTestsUnnamedModule)) {
+                thisModule.addOpens("jdk.jpackage.internal", m);
+            }
+        }
+
+        final var defaultExcludesFile = TKit.TEST_SRC_ROOT.resolve(String.format(
+                "junit/share/jdk.jpackage/%s.excludes", OptionsValidationFailTest.class.getName().replace(".", "/")));
+
+        final var defaultExcludes = Files.readAllLines(defaultExcludesFile).stream().map(testDesc -> {
+            return "--jpt-exclude=" + testDesc;
+        });
+
+        final var defaultIncludes = Stream.of(
+//              "ErrorTest.test(NATIVE; args-add=[--runtime-image, @@JAVA_HOME@@, --app-image, app-image]; errors=[ERR_MutuallyExclusiveOptions+[--runtime-image, --app-image]])"
+        ).map(testDesc -> {
+            return "--jpt-include=" + testDesc;
+        });
+
+        return JUnitAdapter.createJPackageTests(testClassloader, Stream.of(
+                defaultExcludes,
+                defaultIncludes,
+                Stream.of("--jpt-run=ErrorTest")
+        ).flatMap(x -> x).toArray(String[]::new));
+    }
+
+    private static boolean jtregErrorTestAvailable() {
+        final var jpackageTestsUnnamedModule = JUnitAdapter.class.getModule();
+
+        try (final var in = jpackageTestsUnnamedModule.getResourceAsStream("ErrorTest.class")) {
+            return in != null;
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    private static final class InMemoryClassLoader extends ClassLoader {
+        InMemoryClassLoader(Map<String, byte[]> classes) {
+            super(InMemoryClassLoader.class.getClassLoader());
+            this.classes = Objects.requireNonNull(classes);
+        }
+
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            final var classBytes = classes.get(name);
+            if (classBytes != null) {
+                return defineClass(name, classBytes, 0, classBytes.length);
+            } else {
+                return getParent().loadClass(name);
+            }
+        }
+
+        private final Map<String, byte[]> classes;
+    }
+
+    static {
+        // Ensure JUnitAdapter class is initialized to get the value of the "test.src"
+        // property set when the test is executed by a test runner other than jtreg.
+        toRunnable(() -> MethodHandles.lookup().ensureInitialized(JUnitAdapter.class)).run();
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardBundlingOperationTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardBundlingOperationTest.java
new file mode 100644
index 00000000000..117234ae8d5
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardBundlingOperationTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class StandardBundlingOperationTest {
+
+    @Test
+    public void testUniqueDescriptors() {
+        Stream.of(StandardBundlingOperation.values()).collect(toMap(StandardBundlingOperation::descriptor, x -> x));
+    }
+
+    @Test
+    public void test_valueOf() {
+        for (var op : StandardBundlingOperation.values()) {
+            assertSame(op, StandardBundlingOperation.valueOf(op.descriptor()).orElseThrow());
+        }
+
+        assertFalse(StandardBundlingOperation.valueOf(BundlingOperationDescriptor.valueOf("WINDOWS:create:foo")).isPresent());
+    }
+
+    @Test
+    public void test_ofPlatform() {
+        var combined = Stream.of(OperatingSystem.WINDOWS, OperatingSystem.MACOS, OperatingSystem.LINUX)
+                .map(StandardBundlingOperation::ofPlatform)
+                .flatMap(x -> x).sorted().toList();
+
+        var whole = Stream.of(StandardBundlingOperation.values()).sorted().toList();
+
+        assertEquals(whole, combined);
+    }
+
+    @Test
+    public void test_narrow() {
+        assertEquals(
+                List.of(StandardBundlingOperation.CREATE_LINUX_APP_IMAGE),
+                StandardBundlingOperation.narrow(Stream.of(StandardBundlingOperation.CREATE_LINUX_APP_IMAGE, new OptionScope() {})).toList());
+
+        assertEquals(List.of(), StandardBundlingOperation.narrow(Stream.of(new OptionScope() {})).toList());
+        assertEquals(List.of(), StandardBundlingOperation.narrow(Stream.of()).toList());
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testFromOptionName(Map.Entry<String, Set<BundlingOperationOptionScope>> testSpec) {
+        final var actualScope = StandardBundlingOperation.fromOptionName(testSpec.getKey());
+        assertEquals(testSpec.getValue(), actualScope);
+    }
+
+    private static List<Map.Entry<String, Set<BundlingOperationOptionScope>>> testFromOptionName() {
+        return List.of(
+                Map.entry("foo", StandardBundlingOperation.CREATE_BUNDLE),
+                Map.entry("win-foo", StandardBundlingOperation.WINDOWS),
+                Map.entry("linux-foo", StandardBundlingOperation.LINUX),
+                Map.entry("mac-foo", MAC_CREATE_BUNDLE),
+                Map.entry("win-exe-foo", Set.of(StandardBundlingOperation.CREATE_WIN_EXE)),
+                Map.entry("win-msi-foo", Set.of(StandardBundlingOperation.CREATE_WIN_MSI)),
+                Map.entry("linux-rpm-foo", Set.of(StandardBundlingOperation.CREATE_LINUX_RPM)),
+                Map.entry("linux-deb-foo", Set.of(StandardBundlingOperation.CREATE_LINUX_DEB)),
+                Map.entry("mac-dmg-foo", Set.of(StandardBundlingOperation.CREATE_MAC_DMG)),
+                Map.entry("mac-pkg-foo", Set.of(StandardBundlingOperation.CREATE_MAC_PKG))
+        );
+    }
+
+    private static final Set<BundlingOperationOptionScope> MAC_CREATE_BUNDLE = Set.of(
+            StandardBundlingOperation.CREATE_MAC_APP_IMAGE,
+            StandardBundlingOperation.CREATE_MAC_DMG,
+            StandardBundlingOperation.CREATE_MAC_PKG);
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
new file mode 100644
index 00000000000..20807952b72
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
@@ -0,0 +1,639 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.Files;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.ConvertedOptionsBuilder;
+import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.OptionsBuilder;
+import jdk.jpackage.internal.cli.StandardOption.LauncherProperty;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
+import jdk.jpackage.internal.util.StringBundle;
+import jdk.jpackage.test.Comm;
+import jdk.jpackage.test.JUnitAdapter;
+import jdk.jpackage.test.TKit;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
+
+    @Test
+    public void testNamesUnique() {
+
+        final var options = StandardOption.options();
+
+        // Test option names are unique. Let Collectors.toMap() do it.
+        options.stream()
+                .map(Option::spec)
+                .map(OptionSpec::names)
+                .flatMap(Collection::stream)
+                .map(OptionName::name)
+                .collect(toMap(x -> x, x -> x));
+    }
+
+    @Test
+    public void testDescription() {
+
+        final var options = StandardOption.options();
+
+        var i18n = StringBundle.fromResourceBundle(ResourceBundle.getBundle("jdk.jpackage.internal.resources.HelpResources"));
+
+        options.stream().map(Option::spec).map(OptionSpec::description).forEach(i18n::getString);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "icon"})
+    public void test_ICON(String name, @TempDir Path workDir) throws IOException {
+
+        if (!name.isEmpty()) {
+            var file = workDir.resolve(name);
+
+            Files.write(file, new byte[0]);
+
+            name = file.toString();
+        }
+
+        var spec = StandardOption.ICON.getSpec();
+
+        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(name));
+
+        assertEquals(Path.of(name), result.orElseThrow());
+    }
+
+    @Test
+    public void test_ICON_validator_fail(@TempDir Path workDir) {
+
+        var spec = StandardOption.ICON.getSpec();
+
+        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(workDir.toString()));
+
+        var ex = assertThrows(JPackageException.class, result::orElseThrow);
+
+        assertEquals(I18N.format("error.parameter-not-file", workDir, "--icon"), ex.getMessage());
+    }
+
+    @Test
+    public void test_ICON_validator_fail_in_property_file(@TempDir Path workDir) {
+
+        var propertyFile = Path.of("foo.properties");
+
+        var spec = new StandardOptionContext().forFile(propertyFile).mapOptionSpec(StandardOption.ICON.getSpec());
+
+        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(workDir.toString()));
+
+        var ex = assertThrows(JPackageException.class, result::orElseThrow);
+
+        assertEquals(I18N.format("error.properties-parameter-not-file", workDir, "icon", propertyFile), ex.getMessage());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "non-existent"})
+    public void test_TEMP_ROOT_valid(String dir, @TempDir Path workDir) {
+
+        var spec = StandardOption.TEMP_ROOT.getSpec();
+
+        var tempRoot = workDir.resolve(dir);
+
+        var value = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString())).orElseThrow();
+
+        assertEquals(tempRoot, value);
+    }
+
+    @Test
+    public void test_TEMP_ROOT_invalid(@TempDir Path workDir) throws IOException {
+
+        var spec = StandardOption.TEMP_ROOT.getSpec();
+
+        var tempRoot = workDir.resolve("file");
+
+        Files.writeString(tempRoot, "foo");
+
+        var ex = assertThrowsExactly(JPackageException.class,
+                spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
+        assertEquals(I18N.format("ERR_BuildRootInvalid", tempRoot), ex.getMessage());
+        assertEquals(NotDirectoryException.class, ex.getCause().getClass());
+
+        tempRoot = workDir;
+
+        ex = assertThrowsExactly(JPackageException.class,
+                spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
+        assertEquals(I18N.format("ERR_BuildRootInvalid", tempRoot), ex.getMessage());
+        assertEquals(DirectoryNotEmptyException.class, ex.getCause().getClass());
+    }
+
+    @Test
+    public void test_TYPE_valid() {
+
+        var spec = StandardOption.TYPE.getSpec();
+
+        Stream.of(StandardBundlingOperation.values()).forEach(bundlingOperation -> {
+            var pkgTypeStr = bundlingOperation.packageTypeValue();
+            var pkgType = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(pkgTypeStr)).orElseThrow();
+            assertSame(bundlingOperation.packageType(), pkgType);
+        });
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "msii", "RPM", "App-image"})
+    public void test_TYPE_invalid(String name) {
+
+        var spec = StandardOption.TYPE.getSpec();
+
+        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(name));
+
+        var ex = assertThrows(JPackageException.class, result::orElseThrow);
+
+        assertEquals(I18N.format("ERR_InvalidInstallerType", name), ex.getMessage());
+    }
+
+    @Test
+    public void test_booleanOptionMutator() {
+
+        var option = OptionSpecBuilder.create(Boolean.class).name("foo").mutate(StandardOption.booleanOptionMutator()).create();
+
+        var empty = Options.of(Map.of());
+
+        // Expect the default value.
+        assertTrue(option.findIn(empty).isPresent());
+
+        // Expect the option is not found.
+        assertFalse(option.containsIn(empty));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testLauncherShortcutOptions(LauncherShortcutTestSpec testSpec) {
+        testSpec.test();
+    }
+
+    @Test
+    public void test_launcherOptions() {
+        var options = StandardOption.launcherOptions().stream().map(Option::id).toList();
+
+        // Test some that should be in the set
+        assertTrue(options.contains(StandardOption.ARGUMENTS.id()));
+        assertTrue(options.contains(StandardOption.MODULE.id()));
+        assertTrue(options.contains(StandardOption.APPCLASS.id()));
+        assertTrue(options.contains(StandardOption.WIN_CONSOLE_HINT.id()));
+
+        // Test some that should NOT be in the set
+        assertFalse(options.contains(StandardOption.NAME.id()));
+        assertFalse(options.contains(StandardOption.INSTALL_DIR.id()));
+    }
+
+    @Test
+    public void test_sharedOption() {
+
+        var pred = StandardOption.sharedOption();
+
+        var options = StandardOption.options().stream().filter(option -> {
+            return pred.test(option.spec());
+        }).map(Option::id).toList();
+
+        // Test some that should be in the set
+        assertTrue(options.contains(StandardOption.NAME.id()));
+        assertTrue(options.contains(StandardOption.INSTALL_DIR.id()));
+
+        // Test some that should NOT be in the set
+        assertFalse(options.contains(StandardOption.WIN_CONSOLE_HINT.id()));
+        assertFalse(options.contains(StandardOption.LINUX_MENU_GROUP.id()));
+        assertFalse(options.contains(StandardOption.MAC_APP_CATEGORY.id()));
+    }
+
+    @ParameterizedTest
+    @EnumSource(names = {"WINDOWS", "LINUX", "MACOS"})
+    public void test_platformOption(OperatingSystem os) {
+
+        var pred = StandardOption.platformOption(os);
+
+        var options = StandardOption.options().stream().filter(option -> {
+            return pred.test(option.spec());
+        }).map(Option::id).toList();
+
+        // Test some that should be in the set
+        assertTrue(options.contains(StandardOption.NAME.id()));
+        assertTrue(options.contains(StandardOption.INSTALL_DIR.id()));
+
+        switch (os) {
+            case WINDOWS -> {
+                assertTrue(options.contains(StandardOption.WIN_CONSOLE_HINT.id()));
+                assertFalse(options.contains(StandardOption.LINUX_MENU_GROUP.id()));
+                assertFalse(options.contains(StandardOption.MAC_APP_CATEGORY.id()));
+            }
+            case LINUX -> {
+                assertFalse(options.contains(StandardOption.WIN_CONSOLE_HINT.id()));
+                assertTrue(options.contains(StandardOption.LINUX_MENU_GROUP.id()));
+                assertFalse(options.contains(StandardOption.MAC_APP_CATEGORY.id()));
+            }
+            case MACOS -> {
+                assertFalse(options.contains(StandardOption.WIN_CONSOLE_HINT.id()));
+                assertFalse(options.contains(StandardOption.LINUX_MENU_GROUP.id()));
+                assertTrue(options.contains(StandardOption.MAC_APP_CATEGORY.id()));
+            }
+            default -> {
+                throw new AssertionError();
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_ARGUMENTS(String value, List<String> expectedTokens) {
+
+        var spec = StandardOption.ARGUMENTS.getOption().spec();
+
+        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(value));
+
+        assertEquals(expectedTokens, List.of(result.map(String[].class::cast).orElseThrow()));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testAddLauncherOption(AddLauncherTestSpec testSpec, @TempDir Path workDir) throws IOException {
+        testSpec.test(workDir);
+    }
+
+    @Disabled
+    @Test
+    public void printMarkdownOptionTable() {
+        OptionSpecFormatter.groupByOption(System.out::println,
+                StandardOption.options().stream().map(Option::spec).toList());
+    }
+
+    @Disabled
+    @Test
+    public void updateMarkdownOptionTable() throws IOException {
+        try (var sink = Files.newBufferedWriter(GOLDEN_JPACKAGE_OPTIONS_MD); var pw = new PrintWriter(sink)) {
+            OptionSpecFormatter.groupByOption(pw::println,
+                    StandardOption.options().stream().map(Option::spec).toList());
+        }
+    }
+
+    @Test
+    public void verifyOptions() throws IOException {
+
+        List<String> optionTable = new ArrayList<>();
+
+        OptionSpecFormatter.groupByOption(optionTable::add,
+                StandardOption.options().stream().map(Option::spec).toList());
+
+        var expectedOptionTable = Files.readAllLines(GOLDEN_JPACKAGE_OPTIONS_MD);
+
+        assertEquals(expectedOptionTable, optionTable);
+    }
+
+    private static Collection<Arguments> test_ARGUMENTS() {
+        return List.of(
+                Arguments.of("abc", List.of("abc")),
+                Arguments.of("a b c", List.of("a", "b", "c")),
+                Arguments.of("a=10 -Dorg.acme.name='John Smith' c=\\\"foo\\\"", List.of("a=10", "-Dorg.acme.name=John Smith", "c=\"foo\"")),
+                Arguments.of("\"\"", List.of("")),
+                Arguments.of(" ", List.of()),
+                Arguments.of("", List.of())
+        );
+    }
+
+
+    record AddLauncherTestSpec(Optional<AdditionalLauncher> expected, List<String> expectedErrors, Optional<String> optionValue) {
+        AddLauncherTestSpec {
+            if (expected.isEmpty() == expectedErrors.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        void test(Path workDir) throws IOException {
+            final List<String> args = new ArrayList<>();
+            args.add(StandardOption.ADD_LAUNCHER_INTERNAL.getSpec().name().formatForCommandLine());
+            optionValue.ifPresent(args::add);
+            if (optionValue.isEmpty()) {
+                var path = workDir.resolve(expected.orElseThrow().propertyFile());
+                Files.createDirectories(path.getParent());
+                Files.createFile(path);
+                expected.map(v -> v.name() + "=" + path).ifPresent(args::add);
+            }
+
+            final var result = new JOptSimpleOptionsBuilder().options(StandardOption.ADD_LAUNCHER_INTERNAL).create()
+                    .apply(args.toArray(String[]::new))
+                    .flatMap(OptionsBuilder::convertedOptions).map(ConvertedOptionsBuilder::create);
+
+            if (expectedErrors.isEmpty()) {
+                final var cmdline = result.orElseThrow();
+                assertEquals(expected.map(List::of).orElseGet(List::of), Stream.of(StandardOption.ADD_LAUNCHER_INTERNAL.getFrom(cmdline)).map(v -> {
+                    if (optionValue.isEmpty()) {
+                        return new AdditionalLauncher(v.name(), workDir.relativize(v.propertyFile()));
+                    } else {
+                        return v;
+                    }
+                }).toList());
+            } else {
+                assertEquals(expectedErrors.stream().toList(), result.errors().stream().map(Exception::getMessage).toList());
+            }
+        }
+
+        static final class Builder {
+
+            AddLauncherTestSpec create() {
+                return new AddLauncherTestSpec(Optional.ofNullable(expected), expectedErrors, Optional.ofNullable(optionValue));
+            }
+
+            Builder expect(String name, String path) {
+                expected = new AdditionalLauncher(name, Path.of(path));
+                return this;
+            }
+
+            Builder expectErrors(String... v) {
+                expectedErrors.addAll(List.of(v));
+                return this;
+            }
+
+            Builder optionValue(String v) {
+                optionValue = v;
+                return this;
+            }
+
+            private AdditionalLauncher expected;
+            private List<String> expectedErrors = new ArrayList<>();
+            private String optionValue;
+        }
+    }
+
+
+    private static Collection<AddLauncherTestSpec> testAddLauncherOption() {
+        return Stream.of(
+                buildAddLauncherTest().expect("foo", "some.properties"),
+                buildAddLauncherTest().expect("foo", "a/b/some.properties").expect("bar", "="),
+                buildAddLauncherTest().expect("a", "a.properties").expect("a", "b.properties"),
+                buildAddLauncherTest().optionValue("some").expectErrors(I18N.format("ERR_NoAddLauncherName")),
+                buildAddLauncherTest().optionValue("").expectErrors(I18N.format("ERR_NoAddLauncherName")),
+                buildAddLauncherTest().optionValue("=").expectErrors(I18N.format("ERR_InvalidSLName", "")),
+                buildAddLauncherTest().optionValue("a=").expectErrors(I18N.format("error.parameter-add-launcher-not-file", "", "a")),
+                buildAddLauncherTest().optionValue("=a").expectErrors(I18N.format("ERR_InvalidSLName", "")),
+                // Not a path
+                buildAddLauncherTest().optionValue("foo=*").expectErrors(I18N.format("error.parameter-add-launcher-not-file", "*", "foo")),
+                // The path is a directory
+                buildAddLauncherTest().optionValue("foo=.").expectErrors(I18N.format("error.parameter-add-launcher-not-file", ".", "foo")),
+                // The path doesn't exist
+                buildAddLauncherTest().optionValue("Foo=foo/bar/buz/111.z").expectErrors(I18N.format("error.parameter-add-launcher-not-file", "foo/bar/buz/111.z", "Foo"))
+        ).map(AddLauncherTestSpec.Builder::create).toList();
+    }
+
+    private static AddLauncherTestSpec.Builder buildAddLauncherTest() {
+        return new AddLauncherTestSpec.Builder();
+    }
+
+
+    record LauncherShortcutTestSpec(OptionValue<LauncherShortcut> option, Optional<LauncherShortcut> expected, List<String> expectedErrors, boolean propertyFile, Optional<String> optionValue) {
+        LauncherShortcutTestSpec {
+            Objects.requireNonNull(option);
+            if (expected.isEmpty() == expectedErrors.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        void test() {
+            final List<String> args = new ArrayList<>();
+            args.add(option.getSpec().name().formatForCommandLine());
+            optionValue.ifPresent(args::add);
+
+            final var builder = new JOptSimpleOptionsBuilder().options(option);
+            if (propertyFile) {
+                builder.optionSpecMapper(spec -> {
+                    return new StandardOptionContext().forFile(DUMMY_PROPERTY_FILE).mapOptionSpec(spec);
+                });
+            }
+
+            final var result = builder.create()
+                    .apply(args.toArray(String[]::new))
+                    .flatMap(OptionsBuilder::convertedOptions).map(ConvertedOptionsBuilder::create);
+
+            if (expectedErrors.isEmpty()) {
+                assertEquals(expected.orElseThrow(), option.getFrom(result.orElseThrow()));
+            } else {
+                assertEquals(expectedErrors.stream().toList(), result.errors().stream().map(Exception::getMessage).toList());
+            }
+        }
+
+        static final class Builder {
+
+            LauncherShortcutTestSpec create() {
+                var theExpected = Optional.ofNullable(expected);
+                return new LauncherShortcutTestSpec(
+                        option,
+                        theExpected,
+                        theExpected.map(v -> {
+                            return List.<String>of();
+                        }).orElseGet(() -> {
+                            if (propertyFile) {
+                                return List.of(I18N.format("error.properties-parameter-not-launcher-shortcut-dir",
+                                        optionValue, option.getSpec().name().name(), DUMMY_PROPERTY_FILE));
+                            } else {
+                                return List.of(I18N.format("error.invalid-option-value", optionValue, option.getSpec().name().formatForCommandLine()));
+                            }
+                        }), propertyFile, Optional.ofNullable(optionValue));
+            }
+
+            Builder option(OptionValue<LauncherShortcut> v) {
+                option = v;
+                return this;
+            }
+
+            Builder expect(LauncherShortcut v) {
+                expected = v;
+                if (expected != null) {
+                    optionValue(v.startupDirectory().map(LauncherShortcutStartupDirectory::asStringValue).orElse(null));
+                } else {
+                    optionValue(null);
+                }
+                return this;
+            }
+
+            Builder expect(LauncherShortcutStartupDirectory v) {
+                return expect(new LauncherShortcut(v));
+            }
+
+            Builder propertyFile(boolean v) {
+                propertyFile = v;
+                return this;
+            }
+
+            Builder optionValue(String v) {
+                optionValue = v;
+                return this;
+            }
+
+
+            OptionValue<LauncherShortcut> option;
+            private boolean propertyFile;
+            private LauncherShortcut expected;
+            private String optionValue;
+        }
+
+        private static final Path DUMMY_PROPERTY_FILE = Path.of("foo.properties");
+    }
+
+
+    private static Collection<LauncherShortcutTestSpec> testLauncherShortcutOptions() {
+        return Stream.of(
+                buildLauncherShortcutTest().expect(LauncherShortcutStartupDirectory.DEFAULT).optionValue(null),
+                buildLauncherShortcutTest().expect(LauncherShortcutStartupDirectory.APP_DIR),
+                buildLauncherShortcutTest().expect(LauncherShortcutStartupDirectory.DEFAULT).propertyFile(true),
+                buildLauncherShortcutTest().expect(LauncherShortcutStartupDirectory.APP_DIR).propertyFile(true),
+                buildLauncherShortcutTest().expect(new LauncherShortcut()).optionValue("false").propertyFile(true),
+                buildLauncherShortcutTest().optionValue(LauncherShortcutStartupDirectory.DEFAULT.asStringValue()),
+                buildLauncherShortcutTest().optionValue("false"),
+                buildLauncherShortcutTest().optionValue(""),
+                buildLauncherShortcutTest().expect(new LauncherShortcut()).optionValue("").propertyFile(true),
+                buildLauncherShortcutTest().optionValue("bar"),
+                buildLauncherShortcutTest().expect(new LauncherShortcut()).optionValue("bar").propertyFile(true)
+        ).map(builder -> {
+            return Stream.of(
+                    StandardOption.LINUX_SHORTCUT_HINT,
+                    StandardOption.WIN_MENU_HINT,
+                    StandardOption.WIN_SHORTCUT_HINT
+            ).map(builder::option).map(LauncherShortcutTestSpec.Builder::create);
+        }).flatMap(x -> x).toList();
+    }
+
+    private static LauncherShortcutTestSpec.Builder buildLauncherShortcutTest() {
+        return new LauncherShortcutTestSpec.Builder();
+    }
+
+    private static final class OptionSpecFormatter {
+        static void groupByOption(Consumer<String>sink, Collection<? extends OptionSpec<?>> specs) {
+            sink.accept("| Option | Scope | With runtime installer | With predefined app image | Recognized in add launcher .property file | Merge");
+            sink.accept("| --- | --- | :---: | :---: | :---: | :---: |");
+            for (final var spec : specs.stream().sorted(Comparator.comparing(v -> { return v.name().name(); })).toList()) {
+                final var mods = filterByType(spec.scope(), BundlingOperationModifier.class);
+                sink.accept(String.format("| %s | %s | %s | %s | %s | %s |",
+                        formatOptionNames(spec),
+                        format(filterByType(spec.scope(), BundlingOperationOptionScope.class)),
+                        (mods.contains(BundlingOperationModifier.BUNDLE_RUNTIME) ? "x" : ""),
+                        (mods.contains(BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE) ? "x" : ""),
+                        (!filterByType(spec.scope(), LauncherProperty.class).isEmpty() ? "x" : ""),
+                        spec.mergePolicy()
+                ));
+            }
+        }
+
+        private static String formatOptionNames(OptionSpec<?> spec) {
+            return spec.names().stream().map(OptionName::formatForCommandLine).collect(joining(", "));
+        }
+
+        private static String format(OptionScope op) {
+            return Optional.ofNullable(KNOWN_BUNDLING_OPERATIONS.get(op)).orElseGet(op::toString);
+        }
+
+        private static String format(Set<OptionScope> ops) {
+            final List<String> knownScopeLabels = new ArrayList<>();
+
+            for (;;) {
+                final var theOps = ops;
+                final var bestMatchedKnownScope = KNOWN_SCOPES.keySet().stream().map(knownGroup -> {
+                    return Comm.compare(theOps, knownGroup);
+                }).filter(comm -> {
+                    return comm.unique2().isEmpty();
+                }).max(Comparator.comparing(comm -> {
+                    return comm.common().size();
+                }));
+
+                if (bestMatchedKnownScope.isEmpty()) {
+                    break;
+                } else {
+                    knownScopeLabels.add(KNOWN_SCOPES.get(bestMatchedKnownScope.orElseThrow().common()));
+                    ops = bestMatchedKnownScope.orElseThrow().unique1();
+                }
+            }
+
+            return Stream.concat(
+                    knownScopeLabels.stream(),
+                    ops.stream().map(OptionSpecFormatter::format)
+            ).sorted().collect(joining(", "));
+        }
+
+        private static Set<OptionScope> filterByType(Collection<OptionScope> ops, Class<? extends OptionScope> filterType) {
+            return ops.stream().filter(filterType::isInstance).collect(Collectors.toSet());
+        }
+
+        private static final Map<OptionScope, String> KNOWN_BUNDLING_OPERATIONS = Map.of(
+                StandardBundlingOperation.CREATE_WIN_APP_IMAGE, "app-image-win",
+                StandardBundlingOperation.CREATE_LINUX_APP_IMAGE, "app-image-linux",
+                StandardBundlingOperation.CREATE_MAC_APP_IMAGE, "app-image-mac",
+                StandardBundlingOperation.CREATE_WIN_EXE, "win-exe",
+                StandardBundlingOperation.CREATE_WIN_MSI, "win-msi",
+                StandardBundlingOperation.CREATE_LINUX_RPM, "linux-rpm",
+                StandardBundlingOperation.CREATE_LINUX_DEB, "linux-deb",
+                StandardBundlingOperation.CREATE_MAC_PKG, "mac-pkg",
+                StandardBundlingOperation.CREATE_MAC_DMG, "mac-dmg",
+                StandardBundlingOperation.SIGN_MAC_APP_IMAGE, "mac-sign"
+        );
+
+        private static final Map<Set<OptionScope>, String> KNOWN_SCOPES = Map.of(
+                Set.copyOf(StandardBundlingOperation.CREATE_APP_IMAGE), "app-image",
+                Set.copyOf(StandardBundlingOperation.WINDOWS), "win",
+                Set.copyOf(StandardBundlingOperation.MACOS), "mac",
+                Set.of(StandardBundlingOperation.CREATE_MAC_APP_IMAGE, StandardBundlingOperation.CREATE_MAC_DMG, StandardBundlingOperation.CREATE_MAC_PKG), "mac-bundle",
+                Set.copyOf(StandardBundlingOperation.LINUX), "linux",
+                Set.copyOf(StandardBundlingOperation.CREATE_NATIVE), "native-bundle",
+                Set.copyOf(StandardBundlingOperation.CREATE_BUNDLE), "bundle",
+                Set.of(StandardBundlingOperation.values()), "all"
+        );
+    }
+
+    private static final Path GOLDEN_JPACKAGE_OPTIONS_MD = TKit.TEST_SRC_ROOT.resolve(
+            "junit/share/jdk.jpackage/jdk/jpackage/internal/cli/jpackage-options.md");
+
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValidatorTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValidatorTest.java
new file mode 100644
index 00000000000..23e2fe895f5
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValidatorTest.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.Files;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.jpackage.test.JUnitUtils.ExceptionPattern;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.Validator.ValidatingConsumerException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class StandardValidatorTest {
+
+    @Test
+    public void test_IS_DIRECTORY(@TempDir Path tempDir) throws IOException {
+
+        final var testee = StandardValidator.IS_DIRECTORY;
+
+        assertTrue(testee.test(tempDir));
+        assertFalse(testee.test(tempDir.resolve("foo")));
+
+        final var file = tempDir.resolve("foo");
+        Files.writeString(file, "foo");
+
+        assertFalse(testee.test(file));
+        assertTrue(testee.test(tempDir));
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.test(null));
+    }
+
+    @Test
+    public void test_IS_FILE_OR_SYMLINK(@TempDir Path tempDir) throws IOException {
+
+        final var testee = StandardValidator.IS_FILE_OR_SYMLINK;
+
+        assertFalse(testee.test(tempDir));
+        assertFalse(testee.test(tempDir.resolve("foo")));
+
+        final var file = tempDir.resolve("foo");
+        Files.writeString(file, "foo");
+
+        assertTrue(testee.test(file));
+        assertFalse(testee.test(tempDir));
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.test(null));
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void test_IS_FILE_OR_SYMLINK_symlink_file(@TempDir Path tempDir) throws IOException {
+
+        final var file = tempDir.resolve("foo");
+        Files.writeString(file, "foo");
+
+        final var symlink = Files.createSymbolicLink(tempDir.resolve("foo-symlink"), file);
+
+        assertTrue(StandardValidator.IS_FILE_OR_SYMLINK.test(symlink));
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void test_IS_FILE_OR_SYMLINK_symlink_dir(@TempDir Path tempDir) throws IOException {
+
+        final var symlink = Files.createSymbolicLink(tempDir.resolve("foo-symlink"), tempDir);
+
+        assertFalse(StandardValidator.IS_FILE_OR_SYMLINK.test(symlink));
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void test_IS_FILE_OR_SYMLINK_symlink_invalid(@TempDir Path tempDir) throws IOException {
+
+        final var symlink = Files.createSymbolicLink(tempDir.resolve("foo-symlink"), tempDir.resolve("foo"));
+
+        assertFalse(StandardValidator.IS_FILE_OR_SYMLINK.test(symlink));
+    }
+
+    @Test
+    public void test_IS_DIRECTORY_OR_NON_EXISTENT(@TempDir Path tempDir) throws IOException {
+
+        final var testee = StandardValidator.IS_DIRECTORY_OR_NON_EXISTENT;
+
+        assertTrue(testee.test(tempDir));
+        assertTrue(testee.test(tempDir.resolve("foo")));
+
+        final var file = tempDir.resolve("foo");
+        Files.writeString(file, "foo");
+
+        assertFalse(testee.test(file));
+        assertTrue(testee.test(tempDir));
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.test(null));
+    }
+
+    @Test
+    public void test_IS_DIRECTORY_EMPTY_OR_NON_EXISTENT(@TempDir Path tempDir) throws IOException {
+
+        final var testee = StandardValidator.IS_DIRECTORY_EMPTY_OR_NON_EXISTENT;
+
+        assertDoesNotThrow(() -> testee.accept(tempDir));
+        assertDoesNotThrow(() -> testee.accept(tempDir.resolve("foo")));
+
+        final var file = tempDir.resolve("foo");
+        Files.writeString(file, "foo");
+
+        var cause = assertThrowsExactly(ValidatingConsumerException.class, () -> testee.accept(file)).getCause();
+        assertEquals(NotDirectoryException.class, cause.getClass());
+
+        cause = assertThrowsExactly(ValidatingConsumerException.class, () -> testee.accept(tempDir)).getCause();
+        assertEquals(DirectoryNotEmptyException.class, cause.getClass());
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.accept(null));
+    }
+
+    @Test
+    public void test_IS_URL() {
+
+        final var testee = StandardValidator.IS_URL;
+
+        assertDoesNotThrow(() -> testee.accept("http://foo"));
+
+        final var ex = assertThrowsExactly(ValidatingConsumerException.class, () -> testee.accept(":"));
+
+        assertNotNull(ex.getCause());
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.accept(null));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_IS_NAME_VALID_valid(String name) {
+
+        final var testee = StandardValidator.IS_NAME_VALID;
+
+        assertTrue(testee.test(name));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_IS_NAME_VALID_invalid(String name) {
+
+        final var testee = StandardValidator.IS_NAME_VALID;
+
+        assertFalse(testee.test(name));
+    }
+
+    @Test
+    public void test_IS_NAME_VALID_null() {
+
+        final var testee = StandardValidator.IS_NAME_VALID;
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.test(null));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"Foo", "1", "public"})
+    public void test_IS_CLASSNAME_valid(String classname) {
+
+        final var testee = StandardValidator.IS_CLASSNAME;
+
+        testee.accept(classname);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "a/b"})
+    public void test_IS_CLASSNAME_invalid(String classname) {
+
+        final var testee = StandardValidator.IS_CLASSNAME;
+
+        final var ex = assertThrowsExactly(ValidatingConsumerException.class, () -> testee.accept(classname));
+
+        assertTrue(new ExceptionPattern().isCauseInstanceOf(IllegalArgumentException.class).match(ex));
+    }
+
+    @Test
+    public void test_IS_CLASSNAME_null() {
+
+        final var testee = StandardValidator.IS_CLASSNAME;
+
+        assertThrowsExactly(NullPointerException.class, () -> testee.accept(null));
+    }
+
+    private static Stream<Arguments> test_IS_NAME_VALID_valid() {
+        List<String> data = new ArrayList<>();
+        data.addAll(List.of(
+                "a",
+                "a!",
+                "name with space"
+        ));
+
+        if (!OperatingSystem.isWindows()) {
+            data.addAll(List.of("a?", "*foo*"));
+        }
+
+        return data.stream().map(Arguments::of);
+    }
+
+    private static Stream<Arguments> test_IS_NAME_VALID_invalid() {
+        List<String> data = new ArrayList<>();
+        data.addAll(List.of(
+                " ",
+                "a\0b",
+                "foo ",
+                "",
+                "a/b",
+                "a\\b",
+                "ab\\",
+                "ab/",
+                "a%b",
+                "a\"b"
+        ));
+
+        if (OperatingSystem.isWindows()) {
+            data.addAll(List.of("a?", "*foo*"));
+        }
+
+        return data.stream().map(Arguments::of);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
new file mode 100644
index 00000000000..6b16b1099c7
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import jdk.jpackage.internal.model.LauncherShortcut;
+import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class StandardValueConverterTest {
+
+    @Test
+    public void test_identityConv() {
+
+        final var testee = StandardValueConverter.identityConv();
+
+        assertEquals("foo", testee.convert("foo"));
+    }
+
+    @Test
+    public void testNullValue() {
+        assertThrowsExactly(NullPointerException.class, () -> StandardValueConverter.identityConv().convert(null));
+        assertThrowsExactly(NullPointerException.class, () -> StandardValueConverter.pathConv().convert(null));
+        assertThrowsExactly(NullPointerException.class, () -> StandardValueConverter.uuidConv().convert(null));
+        assertThrowsExactly(NullPointerException.class, () -> StandardValueConverter.booleanConv().convert(null));
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_pathConv(boolean positive) {
+
+        final var testee = StandardValueConverter.pathConv();
+
+        if (positive) {
+            assertEquals(Path.of("foo"), testee.convert("foo"));
+        } else {
+            final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> testee.convert("\0"));
+            assertNotNull(ex.getCause());
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_booleanConv(String value, Boolean expected) {
+
+        assertEquals(expected, StandardValueConverter.booleanConv().convert(value));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_mainLauncherShortcutConv(String value, LauncherShortcut expected) {
+
+        assertEquals(expected, StandardValueConverter.mainLauncherShortcutConv().convert(value));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_mainLauncherShortcutConv_invalid(String value) {
+
+        assertThrowsExactly(IllegalArgumentException.class, () -> StandardValueConverter.mainLauncherShortcutConv().convert(value));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_addLauncherShortcutConv(String value, LauncherShortcut expected) {
+
+        assertEquals(expected, StandardValueConverter.addLauncherShortcutConv().convert(value));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    @Disabled("There is no invalid string value!")
+    public void test_addLauncherShortcutConv_invalid(String value) {
+
+        assertThrowsExactly(IllegalArgumentException.class, () -> StandardValueConverter.addLauncherShortcutConv().convert(value));
+    }
+
+    private static List<Object[]> test_booleanConv() {
+        return List.<Object[]>of(
+                booleanConvTestCase("", false),
+                booleanConvTestCase("true", true),
+                booleanConvTestCase("True", true),
+                booleanConvTestCase("TRUE", true),
+                booleanConvTestCase("true2", false),
+                booleanConvTestCase("false", false),
+                booleanConvTestCase("false2", false)
+        );
+    }
+
+    private static Object[] booleanConvTestCase(String value, boolean expected) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(expected);
+        return new Object[] { value, expected };
+    }
+
+    private static List<Object[]> test_mainLauncherShortcutConv() {
+        return List.<Object[]>of(
+                launcherShortcutConvTestCase("app-dir", new LauncherShortcut(LauncherShortcutStartupDirectory.APP_DIR))
+        );
+    }
+
+    private static List<Arguments> test_mainLauncherShortcutConv_invalid() {
+        return List.of(
+                Arguments.of("true"),
+                Arguments.of("false"),
+                Arguments.of("App-dir"),
+                Arguments.of("APP-DIR")
+        );
+    }
+
+    private static List<Object[]> test_addLauncherShortcutConv() {
+        return List.<Object[]>of(
+                launcherShortcutConvTestCase("app-dir", new LauncherShortcut(LauncherShortcutStartupDirectory.APP_DIR)),
+                launcherShortcutConvTestCase("true", new LauncherShortcut(LauncherShortcutStartupDirectory.DEFAULT)),
+                launcherShortcutConvTestCase("false", new LauncherShortcut()),
+                launcherShortcutConvTestCase("APP-DIR", new LauncherShortcut())
+        );
+    }
+
+    private static List<Arguments> test_addLauncherShortcutConv_invalid() {
+        return List.of(
+        );
+    }
+
+    private static Object[] launcherShortcutConvTestCase(String value, LauncherShortcut expected) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(expected);
+        return new Object[] { value, expected };
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StringTokenTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StringTokenTest.java
new file mode 100644
index 00000000000..742ca3c9a3f
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StringTokenTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import org.junit.jupiter.api.Test;
+
+public class StringTokenTest {
+
+    @Test
+    public void test() {
+        assertToken("abc", "a", StringToken.of("abc", "a"));
+        assertToken("abc", "", StringToken.of("abc", ""));
+        assertToken("abc", "abc", StringToken.of("abc"));
+        assertToken("", "", StringToken.of(""));
+        assertToken("abc", "bc", StringToken.of("abc", "bc"));
+
+        assertThrowsExactly(IllegalArgumentException.class, () -> StringToken.of("abc", "d"));
+        assertThrowsExactly(IllegalArgumentException.class, () -> StringToken.of("abc", "cb"));
+        assertThrowsExactly(IllegalArgumentException.class, () -> StringToken.of("abc", "abcd"));
+    }
+
+    private static void assertToken(String expectedTokenizedString, String expectedValue, StringToken token) {
+        assertEquals(expectedTokenizedString, token.tokenizedString());
+        assertEquals(expectedValue, token.value());
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
new file mode 100644
index 00000000000..d3e9ecb09e9
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import java.util.stream.StreamSupport;
+import jdk.jpackage.test.JUnitUtils;
+
+final class TestUtils {
+
+    private TestUtils() {
+    }
+
+    static UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> recordExceptions(Collection<OptionFailure> sink) {
+        return exceptionFactory -> {
+            return new RecordingExceptionFactory(exceptionFactory, sink::add);
+        };
+    }
+
+    static <T> Consumer<Validator.Builder<T, RuntimeException>> configureValidator() {
+        return builder -> {
+            builder.exceptionFactory(DEFAULT_EXCEPTION_FACTORY).formatString(DEFAULT_EXCEPTION_MESSAGE_FORMAT_STRING);
+        };
+    }
+
+    static <T> Consumer<Validator.Builder<T, Exception>> configureCheckedValidator() {
+        return builder -> {
+            builder.exceptionFactory(DEFAULT_EXCEPTION_FACTORY).formatString(DEFAULT_EXCEPTION_MESSAGE_FORMAT_STRING);
+        };
+    }
+
+    static <T> Consumer<OptionValueConverter.Builder<T>> configureConverter() {
+        return builder -> {
+            builder.exceptionFactory(DEFAULT_EXCEPTION_FACTORY).formatString(DEFAULT_EXCEPTION_MESSAGE_FORMAT_STRING);
+        };
+    }
+
+    static void assertExceptionEquals(Exception expected, Exception actual) {
+        assertEquals(JUnitUtils.exceptionAsPropertyMap(expected), JUnitUtils.exceptionAsPropertyMap(actual));
+    }
+
+    static void assertExceptionListEquals(Collection<? extends Exception> expected, Collection<? extends Exception> actual) {
+        assertEquals(
+                expected.stream().map(JUnitUtils::exceptionAsPropertyMap).toList(),
+                actual.stream().map(JUnitUtils::exceptionAsPropertyMap).toList()
+        );
+    }
+
+
+    static Function<String, String[]> splitOrEmpty(String splitRegexp) {
+        Objects.requireNonNull(splitRegexp);
+        return str -> {
+            if (str.isEmpty()) {
+                return new String[0];
+            } else {
+                return str.split(splitRegexp);
+            }
+        };
+    }
+
+    static <T> List<T[]> arrayElements(Class<? extends T> elementType, Iterable<T> elements) {
+        Objects.requireNonNull(elementType);
+        return StreamSupport.stream(elements.spliterator(), false).map(e -> {
+            @SuppressWarnings("unchecked")
+            final var arr = (T[])Array.newInstance(elementType, e == null ? 0 : 1);
+            if (e != null) {
+                Array.set(arr, 0, e);
+            }
+            return arr;
+        }).toList();
+    }
+
+
+    record OptionFailure(OptionName optionName, StringToken optionValue, Optional<Exception> exception) {
+        OptionFailure {
+            Objects.requireNonNull(optionName);
+            Objects.requireNonNull(optionValue);
+            Objects.requireNonNull(exception);
+        }
+
+        OptionFailure(OptionName optionName, StringToken optionValue) {
+            this(optionName, optionValue, Optional.empty());
+        }
+
+        OptionFailure(String optionName, StringToken optionValue) {
+            this(OptionName. of(optionName), optionValue);
+        }
+
+        OptionFailure(OptionName optionName, String optionValue) {
+            this(optionName, StringToken.of(optionValue));
+        }
+
+        OptionFailure(String optionName, String optionValue) {
+            this(OptionName. of(optionName), optionValue);
+        }
+
+        OptionFailure withoutException() {
+            return exception.map(_ -> new OptionFailure(optionName, optionValue, Optional.empty())).orElse(this);
+        }
+
+        static Comparator<OptionFailure> compareNameAndValue() {
+            return Comparator.comparing(OptionFailure::optionName).thenComparing(v -> {
+                return v.optionValue().value();
+            }).thenComparing(v -> {
+                return v.optionValue().tokenizedString();
+            });
+        }
+    }
+
+
+    static final class TestException extends RuntimeException {
+
+        TestException(String msg) {
+            super(msg);
+        }
+
+        TestException(String msg, Throwable cause) {
+            super(msg, cause);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    private record RecordingExceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> factory,
+            Consumer<OptionFailure> sink) implements OptionValueExceptionFactory<RuntimeException> {
+
+        RecordingExceptionFactory {
+            Objects.requireNonNull(factory);
+            Objects.requireNonNull(sink);
+        }
+
+        @Override
+        public RuntimeException create(OptionName optionName, StringToken optionValue, String formatString, Optional<Exception> cause) {
+            final var ex = factory.create(optionName, optionValue, formatString, cause);
+            sink.accept(new OptionFailure(optionName, optionValue, Optional.of(ex)));
+            return ex;
+        }
+    }
+
+    private static final String DEFAULT_EXCEPTION_MESSAGE_FORMAT_STRING = "Option %s: bad substring [%s] in string [%s]";
+
+    private static final OptionValueExceptionFactory<? extends RuntimeException> DEFAULT_EXCEPTION_FACTORY = OptionValueExceptionFactory.build(TestException::new)
+            .formatArgumentsTransformer((String formattedOptionName, StringToken optionValue) -> {
+                return new String[] { formattedOptionName, optionValue.value(), optionValue.tokenizedString() };
+            })
+            .messageFormatter(String::format)
+            .create();
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/UtilsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/UtilsTest.java
new file mode 100644
index 00000000000..9cc06a7b886
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/UtilsTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Optional;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.BundlingEnvironment;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.test.JUnitUtils.ExceptionPattern;
+import org.junit.jupiter.api.Test;
+
+public class UtilsTest {
+
+    @Test
+    public void testInvalidOption() {
+        var errors = buildParser().create().apply(new String[] {"--foo"}).errors();
+        assertEquals(1, errors.size());
+
+        assertTrue(new ExceptionPattern()
+                .isInstanceOf(Utils.ParseException.class)
+                .hasMessage(I18N.format("ERR_InvalidOption", "--foo"))
+                .match(errors.iterator().next()));
+    }
+
+    @Test
+    public void testMissingValueOption() {
+        var errors = buildParser().create().apply(new String[] {"--name"}).errors();
+        assertEquals(1, errors.size());
+
+        assertTrue(new ExceptionPattern()
+                .isInstanceOf(Utils.ParseException.class)
+                .hasMessage(I18N.format("ERR_InvalidOption", "--name"))
+                .match(errors.iterator().next()));
+    }
+
+    @Test
+    public void test_getOptionsWithSpecs() {
+
+        var options = Utils.getOptionsWithSpecs(UtilsTest.class).map(OptionValue::getOption).collect(toUnmodifiableSet());
+
+        assertEquals(2, options.size());
+
+        assertFalse(options.contains(A.getOption()));
+        assertTrue(options.contains(B.getOption()));
+        assertTrue(options.contains(C.getOption()));
+    }
+
+    private static final OptionValue<String> A = dummyOptionValue("a");
+
+    static final OptionValue<String> B = dummyOptionValue("b");
+
+    public static final OptionValue<String> C = dummyOptionValue("c");
+
+    private static OptionValue<String> dummyOptionValue(String name) {
+        return OptionSpecBuilder.create(String.class).name(name).scope(new OptionScope() {}).create();
+    }
+
+    private static JOptSimpleOptionsBuilder buildParser() {
+        return Utils.buildParser(OperatingSystem.LINUX, new BundlingEnvironment() {
+            @Override
+            public Optional<BundlingOperationDescriptor> defaultOperation() {
+                return Optional.empty();
+            }
+        });
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
new file mode 100644
index 00000000000..d4c48df6a0c
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+import static jdk.jpackage.internal.cli.TestUtils.assertExceptionListEquals;
+import static jdk.jpackage.internal.cli.TestUtils.configureCheckedValidator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import jdk.jpackage.internal.cli.TestUtils.TestException;
+import jdk.jpackage.internal.cli.Validator.ParsedValue;
+import jdk.jpackage.internal.cli.Validator.ValidatingConsumerException;
+import jdk.jpackage.internal.cli.Validator.ValidatorException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class ValidatorTest {
+
+    enum ValidatorType {
+        PREDICATE,
+        CONSUMER
+    }
+
+
+    @ParameterizedTest
+    @EnumSource(ValidatorType.class)
+    public void test(ValidatorType type) {
+
+        final Validator.Builder<Object, Exception> builder = Validator.build();
+
+        switch (type) {
+            case CONSUMER -> builder.consumer(_ -> {});
+            case PREDICATE -> builder.predicate(_ -> true);
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+
+        final var validator = builder.mutate(configureCheckedValidator()).create();
+
+        final var optionName = OptionName.of("obj");
+        final var optionValue = ParsedValue.create(new Object(), StringToken.of("foo"));
+        assertEquals(List.of(), validator.validate(optionName, optionValue));
+    }
+
+    @Test
+    public void test_predicate_negative() {
+
+        final var validator =  Validator.build().predicate(_ -> false).mutate(configureCheckedValidator()).create();
+
+        final var optionName = OptionName.of("obj");
+        final var optionValue = ParsedValue.create(new Object(), StringToken.of("foo"));
+
+        final var exceptions = validator.validate(optionName, optionValue);
+        assertExceptionListEquals(List.of(new TestException("Option --obj: bad substring [foo] in string [foo]")), exceptions);
+    }
+
+
+    enum ValidatorConsumerType {
+        CONSUMER_IllegalArgumentException,
+        CONSUMER_ValidatingConsumerException
+    }
+
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_consumer_negative(ValidatorConsumerType type, boolean withCause) {
+
+        final Validator.Builder<Object, Exception> builder = Validator.build();
+
+        final Exception cause;
+        if (withCause) {
+            cause = new FooException("foo cause");
+        } else {
+            cause = null;
+        }
+
+        final RuntimeException validatorException;
+        final Exception expectedCause;
+
+        switch (type) {
+            case CONSUMER_IllegalArgumentException -> {
+                validatorException = new IllegalArgumentException("Invalid value", cause);
+                expectedCause = validatorException;
+            }
+
+            case CONSUMER_ValidatingConsumerException -> {
+                if (cause != null) {
+                    validatorException = new ValidatingConsumerException("Invalid value", cause);
+                    expectedCause = cause;
+                } else {
+                    assertThrows(NullPointerException.class, () -> {
+                        new ValidatingConsumerException("Invalid value", cause);
+                    });
+                    return;
+                }
+            }
+
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+
+        final var validator = builder.consumer(_ -> {
+            throw validatorException;
+        }).mutate(configureCheckedValidator()).create();
+
+        final var optionName = OptionName.of("obj");
+        final var optionValue = ParsedValue.create(new Object(), StringToken.of("foo"));
+
+        final var exceptions = validator.validate(optionName, optionValue);
+        assertExceptionListEquals(List.of(new TestException("Option --obj: bad substring [foo] in string [foo]", expectedCause)), exceptions);
+    }
+
+    @Test
+    public void testBuilderWithoutExceptionOrFormatStringFactory() {
+
+        Supplier<Validator.Builder<String, RuntimeException>> build = () -> {
+            return Validator.<String, RuntimeException>build().predicate(_ -> true);
+        };
+
+        build.get().create();
+        build.get().formatString(null).create();
+        assertThrowsExactly(NullPointerException.class, build.get().formatString("foo")::create);
+        assertThrowsExactly(NullPointerException.class, build.get().formatString("")::create);
+        assertThrowsExactly(NullPointerException.class, build.get().formatString(null).exceptionFactory(OptionValueExceptionFactory.unreachable())::create);
+    }
+
+    @Test
+    public void testBuilderCopy() {
+
+        var builder = Validator.<String, RuntimeException>build()
+                .predicate(_ -> true)
+                .formatString("foo")
+                .exceptionFactory(OptionValueExceptionFactory.unreachable());
+
+        var copy = builder.copy();
+
+        assertSame(builder.consumer().orElse(null), copy.consumer().orElse(null));
+        assertSame(builder.predicate().orElse(null), copy.predicate().orElse(null));
+        assertSame(builder.exceptionFactory().orElse(null), copy.exceptionFactory().orElse(null));
+        assertSame(builder.formatString().orElse(null), copy.formatString().orElse(null));
+
+        builder.consumer(_ -> {});
+
+        copy = builder.copy();
+
+        assertSame(builder.consumer().orElse(null), copy.consumer().orElse(null));
+        assertSame(builder.predicate(), copy.predicate());
+        assertSame(builder.exceptionFactory().orElse(null), copy.exceptionFactory().orElse(null));
+        assertSame(builder.formatString().orElse(null), copy.formatString().orElse(null));
+
+        copy.predicate(_ -> false);
+
+        assertNotSame(builder.consumer(), copy.consumer());
+        assertNotSame(builder.predicate(), copy.predicate());
+    }
+
+    @Test
+    public void test_andThen() {
+
+        Function<String, Validator<String, Exception>> createFailingValidator = exceptionMessage -> {
+            Objects.requireNonNull(exceptionMessage);
+            var exceptionFactory = OptionValueExceptionFactory.build().ctor(TestException::new).messageFormatter((_, _) -> {
+                return exceptionMessage;
+            }).create();
+
+            return Validator.<String, Exception>build()
+                    .predicate(_ -> false)
+                    .formatString("")
+                    .exceptionFactory(exceptionFactory).create();
+        };
+
+        Function<Validator<String, ? extends Exception>, List<? extends Exception>> validate = validator -> {
+            return validator.validate(OptionName.of("a"), ParsedValue.create("str", StringToken.of("str")));
+        };
+
+        var pass = Validator.<String, RuntimeException>build().predicate(_ -> true).create();
+
+        var foo = createFailingValidator.apply("foo");
+        var bar = createFailingValidator.apply("bar");
+        var buz = createFailingValidator.apply("buz");
+
+        assertExceptionListEquals(List.of(
+                new TestException("foo"),
+                new TestException("bar"),
+                new TestException("buz")
+        ),  validate.apply(foo.andThen(bar).andThen(pass).andThen(buz)));
+
+        assertExceptionListEquals(List.of(
+                new TestException("bar"),
+                new TestException("buz"),
+                new TestException("foo")
+        ),  validate.apply(pass.andThen(bar).andThen(buz).andThen(foo)));
+
+        assertExceptionListEquals(List.of(
+                new TestException("foo"),
+                new TestException("foo")
+        ),  validate.apply(foo.andThen(foo)));
+    }
+
+    @ParameterizedTest
+    @EnumSource(ValidatorType.class)
+    public void testValidatorException(ValidatorType type) {
+
+        final Validator.Builder<String, Exception> builder = Validator.build();
+
+        switch (type) {
+            case CONSUMER -> builder.consumer(_ -> {
+                throw VALITDATOR_EXCEPTION;
+            });
+
+            case PREDICATE -> builder.predicate(_ -> {
+                throw VALITDATOR_EXCEPTION;
+            });
+
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+
+        final var validator = builder.mutate(configureCheckedValidator()).create();
+
+        final var token = StringToken.of("foo");
+        final var ex = assertThrowsExactly(ValidatorException.class, () -> {
+            validator.validate(OptionName.of("foo"), ParsedValue.create(token.value(), token));
+        });
+
+        assertSame(VALITDATOR_EXCEPTION, ex.getCause());
+    }
+
+    private static List<Object[]> test_consumer_negative() {
+        final List<Object[]> data = new ArrayList<>();
+        for (var type : ValidatorConsumerType.values()) {
+            for (var withCause : List.of(true, false)) {
+                data.add(new Object[] { type, withCause });
+            }
+        }
+        return data;
+    }
+
+
+    static final class FooException extends Exception {
+
+        FooException(String msg) {
+            super(msg);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
+    static final RuntimeException VALITDATOR_EXCEPTION = new RuntimeException("Always fail");
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-linux.txt b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-linux.txt
new file mode 100644
index 00000000000..4eb94cc8bd2
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-linux.txt
@@ -0,0 +1,197 @@
+Usage: jpackage <options>
+
+Sample usages:
+--------------
+    Generate an application package suitable for the host system:
+        For a modular application:
+            jpackage -n name -p modulePath -m moduleName/className
+        For a non-modular application:
+            jpackage -i inputDir -n name \
+                --main-class className --main-jar myJar.jar
+        From a pre-built application image:
+            jpackage -n name --app-image appImageDir
+
+    Generate an application image:
+        For a modular application:
+            jpackage --type app-image -n name -p modulePath \
+                -m moduleName/className
+        For a non-modular application:
+            jpackage --type app-image -i inputDir -n name \
+                --main-class className --main-jar myJar.jar
+        To provide your own options to jlink, run jlink separately:
+            jlink --output appRuntimeImage -p modulePath \
+                --add-modules moduleName \
+                --no-header-files [<additional jlink options>...]
+            jpackage --type app-image -n name \
+                -m moduleName/className --runtime-image appRuntimeImage
+
+    Generate a Java runtime package:
+        jpackage -n name --runtime-image <runtime-image>
+
+Generic Options:
+  @<filename>
+          Read options and/or mode from a file
+          This option can be used multiple times.
+  --type -t <type>
+          The type of package to create
+          Valid values are: {"app-image", "deb", "rpm"}
+          If this option is not specified a platform dependent
+          default type will be created.
+  --app-version <version>
+          Version of the application and/or package
+  --copyright <copyright string>
+          Copyright for the application
+  --description <description string>
+          Description of the application
+  --dest -d <destination path>
+          Path where generated output file is placed
+          (absolute path or relative to the current directory)
+          Defaults to the current working directory.
+  --help -h -?
+          Print the usage text with a list and description of each valid
+          option for the current platform to the output stream, and exit
+  --icon <file path>
+          Path of the icon of the application package
+          (absolute path or relative to the current directory)
+  --name -n <name>
+          Name of the application and/or package
+  --temp <directory path>
+          Path of a new or empty directory used to create temporary files
+          (absolute path or relative to the current directory)
+          If specified, the temp dir will not be removed upon the task
+          completion and must be removed manually.
+          If not specified, a temporary directory will be created and
+          removed upon the task completion.
+  --vendor <vendor string>
+          Vendor of the application
+  --verbose
+          Enables verbose output
+  --version
+          Print the product version to the output stream and exit.
+
+Options for creating the runtime image:
+  --add-modules <module name>[,<module name>...]
+          A comma (",") separated list of modules to add
+          This module list, along with the main module (if specified)
+          will be passed to jlink as the --add-module argument.
+          If not specified, either just the main module (if --module is
+          specified), or the default set of modules (if --main-jar is
+          specified) are used.
+          This option can be used multiple times.
+  --jlink-options <jlink options>
+          A space separated list of options to pass to jlink
+          If not specified, defaults to "--strip-native-commands
+          --strip-debug --no-man-pages --no-header-files".
+          This option can be used multiple times.
+  --module-path -p <module path>[:<module path>...]
+          A : separated list of paths
+          Each path is either a directory of modules or the path to a
+          modular jar.
+          (Each path is absolute or relative to the current directory.)
+          This option can be used multiple times.
+  --runtime-image <directory path>
+          Path of the predefined runtime image that will be copied into
+          the application image
+          (absolute path or relative to the current directory)
+          If --runtime-image is not specified, jpackage will run jlink to
+          create the runtime image using options:
+          --strip-debug, --no-header-files, --no-man-pages, and
+          --strip-native-commands.
+
+Options for creating the application image:
+  --app-content <additional content>[,<additional content>...]
+          A comma separated list of paths to files and/or directories
+          to add to the application payload.
+          This option can be used more than once.
+  --input -i <directory path>
+          Path of the input directory that contains the files to be packaged
+          (absolute path or relative to the current directory)
+          All files in the input directory will be packaged into the
+          application image.
+
+Options for creating the application launcher(s):
+  --add-launcher <launcher name>=<file path>
+          Name of launcher, and a path to a Properties file that contains
+          a list of key, value pairs
+          (absolute path or relative to the current directory)
+          The keys "arguments", "description", "icon", "java-options",
+          "launcher-as-service", "linux-shortcut", "main-class", "main-jar",
+          and "module" can be used.
+          These options are added to, or used to overwrite, the original
+          command line options to build an additional alternative launcher.
+          The main application launcher will be built from the command line
+          options. Additional alternative launchers can be built using
+          this option, and this option can be used multiple times to
+          build multiple additional launchers.
+  --arguments <main class arguments>
+          Command line arguments to pass to the main class if no command
+          line arguments are given to the launcher
+          This option can be used multiple times.
+  --java-options <java options>
+          Options to pass to the Java runtime
+          This option can be used multiple times.
+  --main-class <class name>
+          Qualified name of the application main class to execute
+          This option can only be used if --main-jar is specified.
+  --main-jar <main jar file>
+          The main JAR of the application; containing the main class
+          (specified as a path relative to the input path)
+          Either --module or --main-jar option can be specified but not
+          both.
+  --module -m <module name>[/<main class>]
+          The main module (and optionally main class) of the application
+          This module must be located on the module path.
+          When this option is specified, the main module will be linked
+          in the Java runtime image.  Either --module or --main-jar
+          option can be specified but not both.
+
+Options for creating the application package:
+  --about-url <url>
+          URL of the application's home page
+  --app-image <directory path>
+          Location of the predefined application image that is used
+          to build an installable package
+          (absolute path or relative to the current directory)
+  --file-associations <file path>[:<file path>...]
+          Path to a Properties file that contains list of key, value pairs
+          (absolute path or relative to the current directory)
+          The keys "extension", "mime-type", "icon", and "description"
+          can be used to describe the association.
+          This option can be used multiple times.
+  --install-dir <directory path>
+          Absolute path of the installation directory of the application
+  --launcher-as-service
+          Request to create an installer that will register the main
+          application launcher as a background service-type application.
+  --license-file <file path>
+          Path to the license file
+          (absolute path or relative to the current directory)
+  --resource-dir <directory path>
+          Path to override jpackage resources
+          Icons, template files, and other resources of jpackage can be
+          over-ridden by adding replacement resources to this directory.
+          (absolute path or relative to the current directory)
+  --runtime-image <directory path>
+          Path of the predefined runtime image to install
+          (absolute path or relative to the current directory)
+          Option is required when creating a runtime package.
+
+Platform dependent options for creating the application package:
+  --linux-app-category <category>
+          Group value of the RPM <name>.spec file or
+          Section value of DEB control file
+  --linux-app-release <release>
+          Release value of the RPM <name>.spec file or
+          Debian revision value of the DEB control file
+  --linux-deb-maintainer <email address>
+          Maintainer for .deb package
+  --linux-menu-group <menu-group-name>
+          Menu group this application is placed in
+  --linux-package-deps <package-dep-string>
+          Required packages or capabilities for the application
+  --linux-package-name <package name>
+          Name for Linux package, defaults to the application name
+  --linux-rpm-license-type <license type>
+          Type of the license ("License: <value>" of the RPM .spec)
+  --linux-shortcut [<shortcut startup directory>]
+          Creates a shortcut for the application.
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-macos.txt b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-macos.txt
new file mode 100644
index 00000000000..dd4c000b8a1
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-macos.txt
@@ -0,0 +1,238 @@
+Usage: jpackage <options>
+
+Sample usages:
+--------------
+    Generate an application package suitable for the host system:
+        For a modular application:
+            jpackage -n name -p modulePath -m moduleName/className
+        For a non-modular application:
+            jpackage -i inputDir -n name \
+                --main-class className --main-jar myJar.jar
+        From a pre-built application image:
+            jpackage -n name --app-image appImageDir
+
+    Generate an application image:
+        For a modular application:
+            jpackage --type app-image -n name -p modulePath \
+                -m moduleName/className
+        For a non-modular application:
+            jpackage --type app-image -i inputDir -n name \
+                --main-class className --main-jar myJar.jar
+        To provide your own options to jlink, run jlink separately:
+            jlink --output appRuntimeImage -p modulePath \
+                --add-modules moduleName \
+                --no-header-files [<additional jlink options>...]
+            jpackage --type app-image -n name \
+                -m moduleName/className --runtime-image appRuntimeImage
+
+    Generate a Java runtime package:
+        jpackage -n name --runtime-image <runtime-image>
+
+    Sign the predefined application image:
+        jpackage --type app-image --app-image <app-image> \
+            --mac-sign [<additional signing options>...]
+        Note: the only additional options that are permitted in this mode are:
+              the set of additional mac signing options and --verbose
+
+Generic Options:
+  @<filename>
+          Read options and/or mode from a file
+          This option can be used multiple times.
+  --type -t <type>
+          The type of package to create
+          Valid values are: {"app-image", "dmg", "pkg"}
+          If this option is not specified a platform dependent
+          default type will be created.
+  --app-version <version>
+          Version of the application and/or package
+  --copyright <copyright string>
+          Copyright for the application
+  --description <description string>
+          Description of the application
+  --dest -d <destination path>
+          Path where generated output file is placed
+          (absolute path or relative to the current directory)
+          Defaults to the current working directory.
+  --help -h -?
+          Print the usage text with a list and description of each valid
+          option for the current platform to the output stream, and exit
+  --icon <file path>
+          Path of the icon of the application package
+          (absolute path or relative to the current directory)
+  --name -n <name>
+          Name of the application and/or package
+  --temp <directory path>
+          Path of a new or empty directory used to create temporary files
+          (absolute path or relative to the current directory)
+          If specified, the temp dir will not be removed upon the task
+          completion and must be removed manually.
+          If not specified, a temporary directory will be created and
+          removed upon the task completion.
+  --vendor <vendor string>
+          Vendor of the application
+  --verbose
+          Enables verbose output
+  --version
+          Print the product version to the output stream and exit.
+
+Options for creating the runtime image:
+  --add-modules <module name>[,<module name>...]
+          A comma (",") separated list of modules to add
+          This module list, along with the main module (if specified)
+          will be passed to jlink as the --add-module argument.
+          If not specified, either just the main module (if --module is
+          specified), or the default set of modules (if --main-jar is
+          specified) are used.
+          This option can be used multiple times.
+  --jlink-options <jlink options>
+          A space separated list of options to pass to jlink
+          If not specified, defaults to "--strip-native-commands
+          --strip-debug --no-man-pages --no-header-files".
+          This option can be used multiple times.
+  --module-path -p <module path>[:<module path>...]
+          A : separated list of paths
+          Each path is either a directory of modules or the path to a
+          modular jar.
+          (Each path is absolute or relative to the current directory.)
+          This option can be used multiple times.
+  --runtime-image <directory path>
+          Path of the predefined runtime image that will be copied into
+          the application image
+          (absolute path or relative to the current directory)
+          If --runtime-image is not specified, jpackage will run jlink to
+          create the runtime image using options:
+          --strip-debug, --no-header-files, --no-man-pages, and
+          --strip-native-commands.
+
+Options for creating the application image:
+  --app-content <additional content>[,<additional content>...]
+          A comma separated list of paths to files and/or directories
+          to add to the application payload.
+          This option can be used more than once.
+          Note: The value should be a directory with the "Resources"
+          subdirectory (or any other directory that is valid in the "Contents"
+          directory of the application bundle). Otherwise, jpackage may produce
+          invalid application bundle which may fail code signing and/or
+          notarization.
+  --input -i <directory path>
+          Path of the input directory that contains the files to be packaged
+          (absolute path or relative to the current directory)
+          All files in the input directory will be packaged into the
+          application image.
+
+Options for creating the application launcher(s):
+  --add-launcher <launcher name>=<file path>
+          Name of launcher, and a path to a Properties file that contains
+          a list of key, value pairs
+          (absolute path or relative to the current directory)
+          The keys "arguments", "description", "icon", "java-options",
+          "launcher-as-service", "main-class", "main-jar", and "module"
+          can be used.
+          These options are added to, or used to overwrite, the original
+          command line options to build an additional alternative launcher.
+          The main application launcher will be built from the command line
+          options. Additional alternative launchers can be built using
+          this option, and this option can be used multiple times to
+          build multiple additional launchers.
+  --arguments <main class arguments>
+          Command line arguments to pass to the main class if no command
+          line arguments are given to the launcher
+          This option can be used multiple times.
+  --java-options <java options>
+          Options to pass to the Java runtime
+          This option can be used multiple times.
+  --main-class <class name>
+          Qualified name of the application main class to execute
+          This option can only be used if --main-jar is specified.
+  --main-jar <main jar file>
+          The main JAR of the application; containing the main class
+          (specified as a path relative to the input path)
+          Either --module or --main-jar option can be specified but not
+          both.
+  --module -m <module name>[/<main class>]
+          The main module (and optionally main class) of the application
+          This module must be located on the module path.
+          When this option is specified, the main module will be linked
+          in the Java runtime image.  Either --module or --main-jar
+          option can be specified but not both.
+
+Options for creating the application package:
+  --about-url <url>
+          URL of the application's home page
+  --app-image <directory path>
+          Location of the predefined application image that is used
+          to build an installable package or to sign the predefined
+          application image
+          (absolute path or relative to the current directory)
+  --file-associations <file path>[:<file path>...]
+          Path to a Properties file that contains list of key, value pairs
+          (absolute path or relative to the current directory)
+          The keys "extension", "mime-type", "icon", and "description"
+          can be used to describe the association.
+          This option can be used multiple times.
+  --install-dir <directory path>
+          Absolute path of the installation directory of the application
+  --launcher-as-service
+          Request to create an installer that will register the main
+          application launcher as a background service-type application.
+  --license-file <file path>
+          Path to the license file
+          (absolute path or relative to the current directory)
+  --resource-dir <directory path>
+          Path to override jpackage resources
+          Icons, template files, and other resources of jpackage can be
+          over-ridden by adding replacement resources to this directory.
+          (absolute path or relative to the current directory)
+  --runtime-image <directory path>
+          Path of the predefined runtime image to install
+          (absolute path or relative to the current directory)
+          Option is required when creating a runtime package.
+
+Platform dependent options for creating the application package:
+  --mac-app-category <category>
+          String used to construct LSApplicationCategoryType in
+          application plist.  The default value is "utilities".
+  --mac-app-image-sign-identity <identity>
+          Identity used to sign application image. This value will be passed
+          directly to --sign option of "codesign" tool. This option cannot
+          be combined with --mac-signing-key-user-name.
+  --mac-app-store
+          Indicates that the jpackage output is intended for the
+          Mac App Store.
+  --mac-dmg-content <additional content path>[,<additional content path>...]
+          Include all the referenced content in the dmg.
+          This option can be used multiple times.
+  --mac-entitlements <file path>
+          Path to file containing entitlements to use when signing
+          executables and libraries in the bundle.
+  --mac-installer-sign-identity <identity>
+          Identity used to sign "pkg" installer. This value will be passed
+          directly to --sign option of "productbuild" tool. This option
+          cannot be combined with --mac-signing-key-user-name.
+  --mac-package-identifier <package identifier>
+          An identifier that uniquely identifies the application for macOS
+          Defaults to the main class name.
+          May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),
+          and period (.) characters.
+  --mac-package-name <package name>
+          Name of the application as it appears in the Menu Bar
+          This can be different from the application name.
+          This name must be less than 16 characters long and be suitable for
+          displaying in the menu bar and the application Info window.
+          Defaults to the application name.
+  --mac-package-signing-prefix <prefix>
+          When signing the application package, this value is prefixed
+          to all components that need to be signed that don't have
+          an existing package identifier.
+  --mac-sign -s
+          Request that the package or the predefined application image be
+          signed.
+  --mac-signing-key-user-name <name>
+          Team or user name portion of Apple signing identities. For direct
+          control of the signing identity used to sign application images or
+          installers use --mac-app-image-sign-identity and/or
+          --mac-installer-sign-identity. This option cannot be combined with
+          --mac-app-image-sign-identity or --mac-installer-sign-identity.
+  --mac-signing-keychain <keychain name>
+          Name of the keychain to search for the signing identity
+          If not specified, the standard keychains are used.
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt
new file mode 100644
index 00000000000..b72ba310f3f
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt
@@ -0,0 +1,205 @@
+Usage: jpackage <options>
+
+Sample usages:
+--------------
+    Generate an application package suitable for the host system:
+        For a modular application:
+            jpackage -n name -p modulePath -m moduleName/className
+        For a non-modular application:
+            jpackage -i inputDir -n name \
+                --main-class className --main-jar myJar.jar
+        From a pre-built application image:
+            jpackage -n name --app-image appImageDir
+
+    Generate an application image:
+        For a modular application:
+            jpackage --type app-image -n name -p modulePath \
+                -m moduleName/className
+        For a non-modular application:
+            jpackage --type app-image -i inputDir -n name \
+                --main-class className --main-jar myJar.jar
+        To provide your own options to jlink, run jlink separately:
+            jlink --output appRuntimeImage -p modulePath \
+                --add-modules moduleName \
+                --no-header-files [<additional jlink options>...]
+            jpackage --type app-image -n name \
+                -m moduleName/className --runtime-image appRuntimeImage
+
+    Generate a Java runtime package:
+        jpackage -n name --runtime-image <runtime-image>
+
+Generic Options:
+  @<filename>
+          Read options and/or mode from a file
+          This option can be used multiple times.
+  --type -t <type>
+          The type of package to create
+          Valid values are: {"app-image", "exe", "msi"}
+          If this option is not specified a platform dependent
+          default type will be created.
+  --app-version <version>
+          Version of the application and/or package
+  --copyright <copyright string>
+          Copyright for the application
+  --description <description string>
+          Description of the application
+  --dest -d <destination path>
+          Path where generated output file is placed
+          (absolute path or relative to the current directory)
+          Defaults to the current working directory.
+  --help -h -?
+          Print the usage text with a list and description of each valid
+          option for the current platform to the output stream, and exit
+  --icon <file path>
+          Path of the icon of the application package
+          (absolute path or relative to the current directory)
+  --name -n <name>
+          Name of the application and/or package
+  --temp <directory path>
+          Path of a new or empty directory used to create temporary files
+          (absolute path or relative to the current directory)
+          If specified, the temp dir will not be removed upon the task
+          completion and must be removed manually.
+          If not specified, a temporary directory will be created and
+          removed upon the task completion.
+  --vendor <vendor string>
+          Vendor of the application
+  --verbose
+          Enables verbose output
+  --version
+          Print the product version to the output stream and exit.
+
+Options for creating the runtime image:
+  --add-modules <module name>[,<module name>...]
+          A comma (",") separated list of modules to add
+          This module list, along with the main module (if specified)
+          will be passed to jlink as the --add-module argument.
+          If not specified, either just the main module (if --module is
+          specified), or the default set of modules (if --main-jar is
+          specified) are used.
+          This option can be used multiple times.
+  --jlink-options <jlink options>
+          A space separated list of options to pass to jlink
+          If not specified, defaults to "--strip-native-commands
+          --strip-debug --no-man-pages --no-header-files".
+          This option can be used multiple times.
+  --module-path -p <module path>[;<module path>...]
+          A ; separated list of paths
+          Each path is either a directory of modules or the path to a
+          modular jar.
+          (Each path is absolute or relative to the current directory.)
+          This option can be used multiple times.
+  --runtime-image <directory path>
+          Path of the predefined runtime image that will be copied into
+          the application image
+          (absolute path or relative to the current directory)
+          If --runtime-image is not specified, jpackage will run jlink to
+          create the runtime image using options:
+          --strip-debug, --no-header-files, --no-man-pages, and
+          --strip-native-commands.
+
+Options for creating the application image:
+  --app-content <additional content>[,<additional content>...]
+          A comma separated list of paths to files and/or directories
+          to add to the application payload.
+          This option can be used more than once.
+  --input -i <directory path>
+          Path of the input directory that contains the files to be packaged
+          (absolute path or relative to the current directory)
+          All files in the input directory will be packaged into the
+          application image.
+
+Options for creating the application launcher(s):
+  --add-launcher <launcher name>=<file path>
+          Name of launcher, and a path to a Properties file that contains
+          a list of key, value pairs
+          (absolute path or relative to the current directory)
+          The keys "arguments", "description", "icon", "java-options",
+          "launcher-as-service", "main-class", "main-jar", "module",
+          "win-console", "win-menu", and "win-shortcut" can be used.
+          These options are added to, or used to overwrite, the original
+          command line options to build an additional alternative launcher.
+          The main application launcher will be built from the command line
+          options. Additional alternative launchers can be built using
+          this option, and this option can be used multiple times to
+          build multiple additional launchers.
+  --arguments <main class arguments>
+          Command line arguments to pass to the main class if no command
+          line arguments are given to the launcher
+          This option can be used multiple times.
+  --java-options <java options>
+          Options to pass to the Java runtime
+          This option can be used multiple times.
+  --main-class <class name>
+          Qualified name of the application main class to execute
+          This option can only be used if --main-jar is specified.
+  --main-jar <main jar file>
+          The main JAR of the application; containing the main class
+          (specified as a path relative to the input path)
+          Either --module or --main-jar option can be specified but not
+          both.
+  --module -m <module name>[/<main class>]
+          The main module (and optionally main class) of the application
+          This module must be located on the module path.
+          When this option is specified, the main module will be linked
+          in the Java runtime image.  Either --module or --main-jar
+          option can be specified but not both.
+
+Platform dependent option for creating the application launcher:
+  --win-console
+          Creates a console launcher for the application, should be
+          specified for application which requires console interactions
+
+Options for creating the application package:
+  --about-url <url>
+          URL of the application's home page
+  --app-image <directory path>
+          Location of the predefined application image that is used
+          to build an installable package
+          (absolute path or relative to the current directory)
+  --file-associations <file path>[;<file path>...]
+          Path to a Properties file that contains list of key, value pairs
+          (absolute path or relative to the current directory)
+          The keys "extension", "mime-type", "icon", and "description"
+          can be used to describe the association.
+          This option can be used multiple times.
+  --install-dir <directory path>
+          Relative sub-path of the installation location of
+          the application such as "Program Files" or "AppData".
+  --launcher-as-service
+          Request to create an installer that will register the main
+          application launcher as a background service-type application.
+  --license-file <file path>
+          Path to the license file
+          (absolute path or relative to the current directory)
+  --resource-dir <directory path>
+          Path to override jpackage resources
+          Icons, template files, and other resources of jpackage can be
+          over-ridden by adding replacement resources to this directory.
+          (absolute path or relative to the current directory)
+  --runtime-image <directory path>
+          Path of the predefined runtime image to install
+          (absolute path or relative to the current directory)
+          Option is required when creating a runtime package.
+
+Platform dependent options for creating the application package:
+  --win-dir-chooser
+          Adds a dialog to enable the user to choose a directory in which
+          the product is installed.
+  --win-help-url <url>
+          URL where user can obtain further information or technical support
+  --win-menu [<shortcut startup directory>]
+          Request to add a Start menu shortcut for this application
+  --win-menu-group <menu group name>
+          Start Menu group this application is placed in
+  --win-per-user-install
+          Request to perform an install on a per-user basis
+  --win-shortcut [<shortcut startup directory>]
+          Request to add desktop shortcut for this application
+  --win-shortcut-prompt
+          Adds a dialog to enable the user to choose if shortcuts
+          will be created by installer.
+  --win-update-url <url>
+          URL of available application update information
+  --win-upgrade-uuid <uuid>
+          UUID associated with upgrades for this package
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/jpackage-options.md b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/jpackage-options.md
new file mode 100644
index 00000000000..60b79451547
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/jpackage-options.md
@@ -0,0 +1,63 @@
+| Option | Scope | With runtime installer | With predefined app image | Recognized in add launcher .property file | Merge
+| --- | --- | :---: | :---: | :---: | :---: |
+| --about-url | native-bundle | x | x |  | USE_LAST |
+| --add-launcher | bundle |  |  |  | CONCATENATE |
+| --add-modules | bundle |  |  |  | CONCATENATE |
+| --app-content | bundle |  |  |  | CONCATENATE |
+| --app-image | mac-sign, native-bundle |  | x |  | USE_LAST |
+| --app-version | bundle | x | x |  | USE_LAST |
+| --arguments | bundle |  |  | x | CONCATENATE |
+| --copyright | bundle | x | x |  | USE_LAST |
+| --description | bundle | x | x | x | USE_LAST |
+| --dest, -d | bundle | x | x |  | USE_LAST |
+| --file-associations | bundle |  | x |  | CONCATENATE |
+| --help, -h, -? | all | x | x |  | USE_LAST |
+| --icon | bundle | x | x | x | USE_LAST |
+| --input, -i | bundle |  |  |  | USE_LAST |
+| --install-dir | bundle | x | x |  | USE_LAST |
+| --java-options | bundle |  |  | x | CONCATENATE |
+| --jlink-options | bundle |  |  |  | CONCATENATE |
+| --launcher-as-service | native-bundle | x | x | x | USE_LAST |
+| --license-file | bundle | x | x |  | USE_LAST |
+| --linux-app-category | linux-deb, linux-rpm | x | x |  | USE_LAST |
+| --linux-app-release | linux-deb, linux-rpm | x | x |  | USE_LAST |
+| --linux-deb-maintainer | linux-deb | x | x |  | USE_LAST |
+| --linux-menu-group | linux-deb, linux-rpm | x | x |  | USE_LAST |
+| --linux-package-deps | linux-deb, linux-rpm | x | x |  | USE_LAST |
+| --linux-package-name | linux-deb, linux-rpm | x | x |  | USE_LAST |
+| --linux-rpm-license-type | linux-rpm | x | x |  | USE_LAST |
+| --linux-shortcut | linux-deb, linux-rpm | x | x | x | USE_LAST |
+| --mac-app-category | mac-bundle | x | x |  | USE_LAST |
+| --mac-app-image-sign-identity | mac | x | x |  | USE_LAST |
+| --mac-app-store | mac-bundle | x | x |  | USE_LAST |
+| --mac-dmg-content | mac-dmg | x | x |  | CONCATENATE |
+| --mac-entitlements | mac | x | x |  | USE_LAST |
+| --mac-installer-sign-identity | mac-pkg | x | x |  | USE_LAST |
+| --mac-package-identifier | mac-bundle | x | x |  | USE_LAST |
+| --mac-package-name | mac-bundle | x | x |  | USE_LAST |
+| --mac-package-signing-prefix | mac | x | x |  | USE_LAST |
+| --mac-sign, -s | mac | x | x |  | USE_LAST |
+| --mac-signing-key-user-name | mac | x | x |  | USE_LAST |
+| --mac-signing-keychain | mac | x | x |  | USE_LAST |
+| --main-class | bundle |  |  | x | USE_LAST |
+| --main-jar | bundle |  |  | x | USE_LAST |
+| --module, -m | bundle |  |  | x | USE_LAST |
+| --module-path, -p | bundle |  |  |  | CONCATENATE |
+| --name, -n | bundle | x | x |  | USE_LAST |
+| --resource-dir | all | x | x |  | USE_LAST |
+| --runtime-image | bundle | x |  |  | USE_LAST |
+| --temp | bundle | x | x |  | USE_LAST |
+| --type, -t | all | x | x |  | USE_LAST |
+| --vendor | bundle | x | x |  | USE_LAST |
+| --verbose | all | x | x |  | USE_LAST |
+| --version | all | x | x |  | USE_LAST |
+| --win-console | win |  |  | x | USE_LAST |
+| --win-dir-chooser | win-exe, win-msi | x | x |  | USE_LAST |
+| --win-help-url | win-exe, win-msi | x | x |  | USE_LAST |
+| --win-menu | win-exe, win-msi | x | x | x | USE_LAST |
+| --win-menu-group | win-exe, win-msi | x | x |  | USE_LAST |
+| --win-per-user-install | win-exe, win-msi | x | x |  | USE_LAST |
+| --win-shortcut | win-exe, win-msi | x | x | x | USE_LAST |
+| --win-shortcut-prompt | win-exe, win-msi | x | x |  | USE_LAST |
+| --win-update-url | win-exe, win-msi | x | x |  | USE_LAST |
+| --win-upgrade-uuid | win-exe, win-msi | x | x |  | USE_LAST |
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index c3faa1ffb65..e6dd3dad3c4 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -174,7 +174,7 @@ public class AppImagePackageTest {
         final var appImageDir = appImageCmd.outputBundle();
 
         final var expectedError = JPackageStringBundle.MAIN.cannedFormattedString(
-                "error.invalid-app-image", appImageDir, AppImageFile.getPathInAppImage(appImageDir));
+                "error.invalid-app-image-file", AppImageFile.getPathInAppImage(Path.of("")), appImageDir);
 
         configureBadAppImage(appImageDir, expectedError).addRunOnceInitializer(() -> {
             appImageCmd.execute();
@@ -186,8 +186,8 @@ public class AppImagePackageTest {
     }
 
     private static PackageTest configureBadAppImage(Path appImageDir) {
-        return configureBadAppImage(appImageDir,
-                JPackageStringBundle.MAIN.cannedFormattedString("error.foreign-app-image", appImageDir));
+        return configureBadAppImage(appImageDir, JPackageStringBundle.MAIN.cannedFormattedString(
+                "error.missing-app-image-file", AppImageFile.getPathInAppImage(Path.of("")), appImageDir));
     }
 
     private static PackageTest configureBadAppImage(Path appImageDir, CannedFormattedString expectedError) {
diff --git a/test/jdk/tools/jpackage/share/AsyncTest.java b/test/jdk/tools/jpackage/share/AsyncTest.java
new file mode 100644
index 00000000000..b2755d4594f
--- /dev/null
+++ b/test/jdk/tools/jpackage/share/AsyncTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+import java.util.spi.ToolProvider;
+import java.util.stream.IntStream;
+import jdk.jpackage.internal.util.function.ThrowingRunnable;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.HelloApp;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JavaTool;
+import jdk.jpackage.test.JavaAppDesc;
+import jdk.jpackage.test.Main;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
+
+/*
+ * @test
+ * @summary Runs multiple jpackage tool provider instances asynchronously
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror AsyncTest.java
+ * @run main/othervm/timeout=1080 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=AsyncTest
+ */
+public class AsyncTest {
+
+    @Test
+    public void test() throws Throwable {
+
+        // Create test jar only once.
+        // Besides of saving time, this avoids asynchronous invocations of java tool provider that randomly fail.
+        APP_JAR.set(HelloApp.createBundle(JavaAppDesc.parse("Hello!"), TKit.workDir()));
+
+        //
+        // Run test cases from InternalAsyncTest class asynchronously.
+        // Spawn a thread for every test case.
+        // Input data for test cases will be cooked asynchronously but in a safe way because every test case has an isolated work directory.
+        // Multiple jpackage tool provider instances will be invoked asynchronously.
+        //
+
+        try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+
+            var testFuncNames = List.of("testAppImage", "testNativeBundle");
+
+            var runArg = String.format("--jpt-run=%s", AsyncInnerTest.class.getName());
+
+            var futures = executor.invokeAll(IntStream.range(0, JOB_COUNT).mapToObj(Integer::toString).<Workload>mapMulti((idx, consumer) -> {
+                for (var testFuncName : testFuncNames) {
+                    var id = String.format("%s(%s)", testFuncName, idx);
+                    consumer.accept(new Workload(() -> {
+                        Main.main(runArg, String.format("--jpt-include=%s", id));
+                    }, id));
+                }
+            }).toList());
+
+            // Wait for all test cases completion.
+            for (var future : futures) {
+                future.get(3, TimeUnit.MINUTES);
+            }
+
+            Throwable[] fatalError = new Throwable[1];
+
+            for (var future : futures) {
+                var result = future.get();
+                TKit.trace(String.format("[%s] STDOUT BEGIN\n%s", result.id(), result.stdoutBuffer()));
+                TKit.trace(String.format("[%s] STDOUT END", result.id()));
+                TKit.trace(String.format("[%s] STDERR BEGIN\n%s", result.id(), result.stderrBuffer()));
+                TKit.trace(String.format("[%s] STDERR END", result.id()));
+                result.throwable().filter(Predicate.not(TKit::isSkippedException)).ifPresent(t -> {
+                    fatalError[0] = t;
+                });
+            }
+
+            if (fatalError[0] != null) {
+                throw fatalError[0];
+            }
+        }
+    }
+
+    public static final class AsyncInnerTest {
+
+        @Test
+        @ParameterSupplier("ids")
+        public void testAppImage(int id) throws Exception {
+            init(new JPackageCommand()).setPackageType(PackageType.IMAGE).executeAndAssertImageCreated();
+        }
+
+        @Test
+        @ParameterSupplier("ids")
+        public void testNativeBundle(int id) throws Exception {
+            new PackageTest().addInitializer(AsyncTest::init).run(Action.CREATE_AND_UNPACK);
+        }
+
+        public static Collection<Object[]> ids() {
+            return IntStream.range(0, JOB_COUNT).mapToObj(Integer::valueOf).map(v -> {
+                return new Object[] {v};
+            }).toList();
+        }
+    }
+
+    private static JPackageCommand init(JPackageCommand cmd) {
+        return cmd.useToolProvider(true).setFakeRuntime()
+                .setDefaultInputOutput()
+                .setArgumentValue("--input", APP_JAR.get().getParent())
+                .setArgumentValue("--main-jar", APP_JAR.get().getFileName())
+                .setArgumentValue("--name", "Foo");
+    }
+
+
+    private record Result(String stdoutBuffer, String stderrBuffer, String id, Optional<Throwable> throwable) {
+
+        Result {
+            Objects.requireNonNull(stdoutBuffer);
+            Objects.requireNonNull(stderrBuffer);
+            Objects.requireNonNull(id);
+            Objects.requireNonNull(throwable);
+        }
+    }
+
+
+    private record Workload(
+            ByteArrayOutputStream stdoutBuffer,
+            ByteArrayOutputStream stderrBuffer,
+            ThrowingRunnable runnable,
+            String id) implements Callable<Result>  {
+
+        Workload {
+            Objects.requireNonNull(stdoutBuffer);
+            Objects.requireNonNull(stderrBuffer);
+            Objects.requireNonNull(runnable);
+            Objects.requireNonNull(id);
+        }
+
+        Workload(ThrowingRunnable runnable, String id) {
+            this(new ByteArrayOutputStream(), new ByteArrayOutputStream(), runnable, id);
+        }
+
+        private String stdoutBufferAsString() {
+            return new String(stdoutBuffer.toByteArray(), StandardCharsets.UTF_8);
+        }
+
+        private String stderrBufferAsString() {
+            return new String(stderrBuffer.toByteArray(), StandardCharsets.UTF_8);
+        }
+
+        @Override
+        public Result call() {
+            // Reset the current test inherited in the state from the parent thread.
+            TKit.state(DEFAULT_STATE);
+
+            var defaultToolProvider = JavaTool.JPACKAGE.asToolProvider();
+
+            JPackageCommand.useToolProviderByDefault(new ToolProvider() {
+
+                @Override
+                public int run(PrintWriter out, PrintWriter err, String... args) {
+                    try (var bufOut = new PrintWriter(stdoutBuffer, true, StandardCharsets.UTF_8);
+                            var bufErr = new PrintWriter(stderrBuffer, true, StandardCharsets.UTF_8)) {
+                        return defaultToolProvider.run(bufOut, bufErr, args);
+                    }
+                }
+
+                @Override
+                public String name() {
+                    return defaultToolProvider.name();
+                }
+            });
+
+            Optional<Throwable> err = Optional.empty();
+            try (var bufOut = new PrintStream(stdoutBuffer, true, StandardCharsets.UTF_8);
+                    var bufErr = new PrintStream(stderrBuffer, true, StandardCharsets.UTF_8)) {
+                TKit.withStackTraceStream(() -> {
+                    TKit.withMainLogStream(runnable, bufOut);
+                }, bufErr);
+            } catch (Throwable t) {
+                err = Optional.of(t);
+            }
+            return new Result(stdoutBufferAsString(), stderrBufferAsString(), id, err);
+        }
+    }
+
+
+    private static final int JOB_COUNT = 30;
+    private static final TKit.State DEFAULT_STATE = TKit.state();
+    private static final InheritableThreadLocal<Path> APP_JAR = new InheritableThreadLocal<>();
+}
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index ad23b5c2917..af9ca84848f 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -401,16 +401,16 @@ public final class ErrorTest {
                     .error("error.main-jar-does-not-exist", "non-existent.jar"),
             // non-existent runtime
             testSpec().addArgs("--runtime-image", "non-existent.runtime")
-                    .error("message.runtime-image-dir-does-not-exist", "runtime-image", "non-existent.runtime"),
+                    .error("error.parameter-not-directory", "non-existent.runtime", "--runtime-image"),
             // non-existent app image
             testSpec().noAppDesc().nativeType().addArgs("--name", "foo", "--app-image", "non-existent.appimage")
                     .error("ERR_AppImageNotExist", "non-existent.appimage"),
             // non-existent resource-dir
             testSpec().addArgs("--resource-dir", "non-existent.dir")
-                    .error("message.resource-dir-does-not-exist", "resource-dir", "non-existent.dir"),
+                    .error("error.parameter-not-directory", "non-existent.dir", "--resource-dir"),
             // non-existent icon
             testSpec().addArgs("--icon", "non-existent.icon")
-                    .error("ERR_IconFileNotExit", cannedAbsolutePath("non-existent.icon")),
+                    .error("error.parameter-not-file", "non-existent.icon", "--icon"),
             // non-existent license file
             testSpec().nativeType().addArgs("--license-file", "non-existent.license")
                     .error("ERR_LicenseFileNotExit"),
@@ -541,7 +541,7 @@ public final class ErrorTest {
             testSpec().addArgs("--add-launcher", Token.ADD_LAUNCHER_PROPERTY_FILE.token())
                     .error("ERR_NoAddLauncherName"),
             testSpec().removeArgs("--name").addArgs("--name", "foo", "--add-launcher", "foo=" + Token.ADD_LAUNCHER_PROPERTY_FILE.token())
-                    .error("ERR_NoUniqueName")
+                    .error("error.launcher-duplicate-name", "foo")
         ));
     }
 

From 267ce91766c0500485ac3d9d36dfef0c09505498 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 20 Nov 2025 15:47:48 +0000
Subject: [PATCH 273/512] 8372149: G1: Remove unnecessary num_added_to_group
 from G1CollectionSetCandidates::set_candidates_from_marking()

Reviewed-by: iwalulya, ayang
---
 src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
index 47340fad768..d71108d4d0e 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
@@ -267,8 +267,6 @@ void G1CollectionSetCandidates::set_candidates_from_marking(G1HeapRegion** candi
   // the same MixedGC.
   uint group_limit = p->calc_min_old_cset_length(num_candidates);
 
-  uint num_added_to_group = 0;
-
   G1CSetCandidateGroup::reset_next_group_id();
   G1CSetCandidateGroup* current = nullptr;
 
@@ -279,7 +277,7 @@ void G1CollectionSetCandidates::set_candidates_from_marking(G1HeapRegion** candi
     assert(!contains(r), "must not contain region %u", r->hrm_index());
     _contains_map[r->hrm_index()] = CandidateOrigin::Marking;
 
-    if (num_added_to_group == group_limit) {
+    if (current->length() == group_limit) {
       if (group_limit != G1OldCSetGroupSize) {
         group_limit = G1OldCSetGroupSize;
       }
@@ -287,10 +285,8 @@ void G1CollectionSetCandidates::set_candidates_from_marking(G1HeapRegion** candi
       _from_marking_groups.append(current);
 
       current = new G1CSetCandidateGroup();
-      num_added_to_group = 0;
     }
     current->add(r);
-    num_added_to_group++;
   }
 
   _from_marking_groups.append(current);

From ea19ad2ac8a1fa9d4124be9a8e05cf4c6f6231bd Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Thu, 20 Nov 2025 15:54:25 +0000
Subject: [PATCH 274/512] 8347167: Reduce allocation in
 com.sun.net.httpserver.Headers::normalize

Reviewed-by: vyazici, dfuchs, michaelm
---
 .../com/sun/net/httpserver/Headers.java       |  76 ++++++++---
 .../com/sun/net/httpserver/HeadersTest.java   |  90 ++++++++++++-
 .../net/httpserver/HeaderNormalization.java   | 120 ++++++++++++++++++
 3 files changed, 267 insertions(+), 19 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/sun/net/httpserver/HeaderNormalization.java

diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
index 84535027eb4..7d11bd42c94 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,29 +109,69 @@ public class Headers implements Map<String,List<String>> {
     }
 
     /**
-     * Normalize the key by converting to following form.
-     * First {@code char} upper case, rest lower case.
-     * key is presumed to be {@code ASCII}.
+     * {@return the normalized header name of the following form: the first
+     * character in upper-case, the rest in lower-case}
+     * The input header name is assumed to be encoded in ASCII.
+     *
+     * @implSpec
+     * This method is performance-sensitive; update with care.
+     *
+     * @param key an ASCII-encoded header name
+     * @throws NullPointerException on null {@code key}
+     * @throws IllegalArgumentException if {@code key} contains {@code \r} or {@code \n}
      */
-    private String normalize(String key) {
+    private static String normalize(String key) {
+
+        // Fast path for the empty key
         Objects.requireNonNull(key);
-        int len = key.length();
-        if (len == 0) {
+        int l = key.length();
+        if (l == 0) {
             return key;
         }
-        char[] b = key.toCharArray();
-        if (b[0] >= 'a' && b[0] <= 'z') {
-            b[0] = (char)(b[0] - ('a' - 'A'));
-        } else if (b[0] == '\r' || b[0] == '\n')
-            throw new IllegalArgumentException("illegal character in key");
 
-        for (int i=1; i<len; i++) {
-            if (b[i] >= 'A' && b[i] <= 'Z') {
-                b[i] = (char) (b[i] + ('a' - 'A'));
-            } else if (b[i] == '\r' || b[i] == '\n')
-                throw new IllegalArgumentException("illegal character in key");
+        // Find the first non-normalized `char`
+        int i = 0;
+        char c = key.charAt(i);
+        if (!(c == '\r' || c == '\n' || (c >= 'a' && c <= 'z'))) {
+            i++;
+            for (; i < l; i++) {
+                c = key.charAt(i);
+                if (c == '\r' || c == '\n' || (c >= 'A' && c <= 'Z')) {
+                    break;
+                }
+            }
         }
-        return new String(b);
+
+        // Fast path for the already normalized key
+        if (i == l) {
+            return key;
+        }
+
+        // Upper-case the first `char`
+        char[] cs = key.toCharArray();
+        int o = 'a' - 'A';
+        if (i == 0) {
+            if (c == '\r' || c == '\n') {
+                throw new IllegalArgumentException("illegal character in key at index " + i);
+            }
+            if (c >= 'a' && c <= 'z') {
+                cs[0] = (char) (c - o);
+            }
+            i++;
+        }
+
+        // Lower-case the secondary `char`s
+        for (; i < l; i++) {
+            c = cs[i];
+            if (c >= 'A' && c <= 'Z') {
+                cs[i] = (char) (c + o);
+            } else if (c == '\r' || c == '\n') {
+                throw new IllegalArgumentException("illegal character in key at index " + i);
+            }
+        }
+
+        return new String(cs);
+
     }
 
     @Override
diff --git a/test/jdk/com/sun/net/httpserver/HeadersTest.java b/test/jdk/com/sun/net/httpserver/HeadersTest.java
index dffa4143c0f..c37aba0424f 100644
--- a/test/jdk/com/sun/net/httpserver/HeadersTest.java
+++ b/test/jdk/com/sun/net/httpserver/HeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
@@ -62,6 +65,8 @@ import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
@@ -288,7 +293,14 @@ public class HeadersTest {
         final var list = new ArrayList<String>();
         list.add(null);
         assertThrows(NPE, () -> h0.putAll(Map.of("a", list)));
+        assertThrows(IAE, () -> h0.putAll(Map.of("a", List.of("\r"))));
         assertThrows(IAE, () -> h0.putAll(Map.of("a", List.of("\n"))));
+        assertThrows(IAE, () -> h0.putAll(Map.of("a", List.of("a\r"))));
+        assertThrows(IAE, () -> h0.putAll(Map.of("a", List.of("a\n"))));
+        assertThrows(IAE, () -> h0.putAll(Map.of("\r", List.of("a"))));
+        assertThrows(IAE, () -> h0.putAll(Map.of("\n", List.of("a"))));
+        assertThrows(IAE, () -> h0.putAll(Map.of("a\r", List.of("a"))));
+        assertThrows(IAE, () -> h0.putAll(Map.of("a\n", List.of("a"))));
 
         final var h1 = new Headers();
         h1.put("a", List.of("1"));
@@ -443,5 +455,81 @@ public class HeadersTest {
         List.of(List.of("1"), List.of("1", "2", "3")).forEach(v -> assertTrue(h.containsValue(v)));
     }
 
+    @Test
+    public static void testNormalizeOnNull() {
+        assertThrows(NullPointerException.class, () -> normalize(null));
+    }
+
+    @DataProvider
+    public static Object[][] illegalKeys() {
+        var illegalChars = List.of('\r', '\n');
+        var illegalStrings = Stream
+                // Insert an illegal char at every possible position of following strings
+                .of("Ab", "ab", "_a", "2a")
+                .flatMap(s -> IntStream
+                        .range(0, s.length() + 1)
+                        .boxed()
+                        .flatMap(i -> illegalChars
+                                .stream()
+                                .map(c -> s.substring(0, i) + c + s.substring(i))));
+        return Stream
+                .concat(illegalChars.stream().map(c -> "" + c), illegalStrings)
+                .map(s -> new Object[]{s})
+                .toArray(Object[][]::new);
+    }
+
+    @Test(dataProvider = "illegalKeys")
+    public static void testNormalizeOnIllegalKeys(String illegalKey) {
+        assertThrows(IllegalArgumentException.class, () -> normalize(illegalKey));
+    }
+
+    @DataProvider
+    public static Object[][] normalizedKeys() {
+        return new Object[][]{
+                // Empty string
+                {""},
+                // Non-alpha prefix
+                {"_"},
+                {"0"},
+                {"_xy-@"},
+                {"0xy-@"},
+                // Upper-case prefix
+                {"A"},
+                {"B"},
+                {"Ayz-@"},
+                {"Byz-@"},
+        };
+    }
+
+    @Test(dataProvider = "normalizedKeys")
+    public static void testNormalizeOnNormalizedKeys(String normalizedKey) {
+        // Verify that the fast-path is taken
+        assertSame(normalize(normalizedKey), normalizedKey);
+    }
+
+    @DataProvider
+    public static Object[][] notNormalizedKeys() {
+        return new Object[][]{
+                {"a"},
+                {"b"},
+                {"axy-@"},
+                {"bxy-@"},
+        };
+    }
+
+    @Test(dataProvider = "notNormalizedKeys")
+    public static void testNormalizeOnNotNormalizedKeys(String notNormalizedKey) {
+        var normalizedKey = normalize(notNormalizedKey);
+        // Verify that the fast-path is *not* taken
+        assertNotSame(normalizedKey, notNormalizedKey);
+        // Verify the result
+        var expectedNormalizedKey = normalizedKey.substring(0, 1).toUpperCase() + normalizedKey.substring(1);
+        assertEquals(normalizedKey, expectedNormalizedKey);
+    }
+
+    private static String normalize(String key) {
+        return Headers.of(key, "foo").keySet().iterator().next();
+    }
+
     // Immutability tests in UnmodifiableHeadersTest.java
 }
diff --git a/test/micro/org/openjdk/bench/sun/net/httpserver/HeaderNormalization.java b/test/micro/org/openjdk/bench/sun/net/httpserver/HeaderNormalization.java
new file mode 100644
index 00000000000..19470f77271
--- /dev/null
+++ b/test/micro/org/openjdk/bench/sun/net/httpserver/HeaderNormalization.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.sun.net.httpserver;
+
+import com.sun.net.httpserver.Headers;
+import org.openjdk.jmh.annotations.*;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * Benchmarks {@code jdk.httpserver} header normalization.
+ * <p>
+ * You can run this benchmark as follows:
+ * <pre>{@code
+ * make run-test TEST="micro:HeaderNormalization" MICRO="OPTIONS=-prof gc"
+ * }</pre>
+ */
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 3, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3, jvmArgs = {
+        "--add-exports", "jdk.httpserver/com.sun.net.httpserver=ALL-UNNAMED",
+        "--add-opens", "jdk.httpserver/com.sun.net.httpserver=ALL-UNNAMED",
+})
+public class HeaderNormalization {
+
+    private static final Function<String, String> NORMALIZE = findNormalize();
+
+    private static Function<String, String> findNormalize() {
+        var lookup = MethodHandles.lookup();
+        MethodHandle handle;
+        try {
+            handle = MethodHandles
+                    .privateLookupIn(Headers.class, lookup)
+                    .findStatic(
+                            Headers.class, "normalize",
+                            MethodType.methodType(String.class, String.class));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return key -> {
+            try {
+                return (String) handle.invokeExact(key);
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        };
+    }
+
+    @Param({
+            "Accept-charset",   // Already normalized
+            "4ccept-charset",   // Already normalized with a non-alpha first letter
+            "accept-charset",   // Only the first `a` must be upper-cased
+            "Accept-Charset",   // Only `c` must be lower-cased
+            "ACCEPT-CHARSET",   // All secondary must be lower-cased
+    })
+    private String key;
+
+    @Benchmark
+    public String n26() {
+        return NORMALIZE.apply(key);
+    }
+
+    @Benchmark
+    public String n25() {
+        return normalize25(key);
+    }
+
+    /**
+     * The {@code com.sun.net.httpserver.Headers::normalize} method used in Java 25 and before.
+     */
+    private static String normalize25(String key) {
+        Objects.requireNonNull(key);
+        int len = key.length();
+        if (len == 0) {
+            return key;
+        }
+        char[] b = key.toCharArray();
+        if (b[0] >= 'a' && b[0] <= 'z') {
+            b[0] = (char)(b[0] - ('a' - 'A'));
+        } else if (b[0] == '\r' || b[0] == '\n')
+            throw new IllegalArgumentException("illegal character in key");
+
+        for (int i=1; i<len; i++) {
+            if (b[i] >= 'A' && b[i] <= 'Z') {
+                b[i] = (char) (b[i] + ('a' - 'A'));
+            } else if (b[i] == '\r' || b[i] == '\n')
+                throw new IllegalArgumentException("illegal character in key");
+        }
+        return new String(b);
+    }
+
+}

From de0a1f8f5191cc188800d7d06855322d272f91d6 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 20 Nov 2025 17:55:06 +0000
Subject: [PATCH 275/512] 8372277: Fix for JDK-8369517 is applied starting from
 source 24 instead of 26

Reviewed-by: liach
---
 .../share/classes/com/sun/tools/javac/comp/Attr.java          | 2 +-
 .../methodReference/ResultTypeNotBeingCapturedTest.java       | 1 +
 .../lambda/methodReference/ResultTypeNotBeingCapturedTest.out | 4 ++--
 .../methodReference/ResultTypeNotBeingCapturedTest_2.out      | 4 ++++
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest_2.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index c723caf1843..3f72ada94e8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -176,7 +176,7 @@ public class Attr extends JCTree.Visitor {
                              Feature.UNCONDITIONAL_PATTERN_IN_INSTANCEOF.allowedInSource(source);
         sourceName = source.name;
         useBeforeDeclarationWarning = options.isSet("useBeforeDeclarationWarning");
-        captureMRefReturnType = Source.Feature.ERASE_POLY_SIG_RETURN_TYPE.allowedInSource(source);
+        captureMRefReturnType = Source.Feature.CAPTURE_MREF_RETURN_TYPE.allowedInSource(source);
 
         statInfo = new ResultInfo(KindSelector.NIL, Type.noType);
         varAssignmentInfo = new ResultInfo(KindSelector.ASG, Type.noType);
diff --git a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java
index a87dd8b302d..6b67f77dafb 100644
--- a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java
+++ b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.java
@@ -26,6 +26,7 @@
  * @bug 8369517
  * @summary Compilation mismatch for equivalent lambda and method reference
  * @compile/fail/ref=ResultTypeNotBeingCapturedTest.out -XDrawDiagnostics ResultTypeNotBeingCapturedTest.java
+ * @compile/fail/ref=ResultTypeNotBeingCapturedTest_2.out -XDrawDiagnostics -source 25 ResultTypeNotBeingCapturedTest.java
  */
 
 import java.util.function.Supplier;
diff --git a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out
index bcd4dbad07b..359ce120c79 100644
--- a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out
+++ b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest.out
@@ -1,3 +1,3 @@
-ResultTypeNotBeingCapturedTest.java:43:66: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
-ResultTypeNotBeingCapturedTest.java:47:42: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
+ResultTypeNotBeingCapturedTest.java:44:66: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
+ResultTypeNotBeingCapturedTest.java:48:42: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
 2 errors
diff --git a/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest_2.out b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest_2.out
new file mode 100644
index 00000000000..1b0248fc2cd
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/methodReference/ResultTypeNotBeingCapturedTest_2.out
@@ -0,0 +1,4 @@
+- compiler.warn.source.no.system.modules.path: 25, (compiler.misc.source.no.system.modules.path: 25)
+ResultTypeNotBeingCapturedTest.java:48:42: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<compiler.misc.type.captureof: 1, ?>>, ResultTypeNotBeingCapturedTest.X<ResultTypeNotBeingCapturedTest.X<?>>)
+1 error
+1 warning

From b3acc4841f6d9c8fd484df68fd2882dab0aa1788 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Thu, 20 Nov 2025 18:10:47 +0000
Subject: [PATCH 276/512] 8362894: PKCS12 KeyStore PBMAC1 interoperability
 testing

Reviewed-by: rhalade
---
 .../pkcs12/KeytoolOpensslInteropTest.java     |  9 +++++++-
 test/jdk/sun/security/pkcs12/params/README    |  2 ++
 test/jdk/sun/security/pkcs12/params/os6       | 23 +++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/sun/security/pkcs12/params/os6

diff --git a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
index 4974ba06649..eee55998f0b 100644
--- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
+++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test id=GenerateOpensslPKCS12
- * @bug 8076190 8242151 8153005 8266182
+ * @bug 8076190 8242151 8153005 8266182 8362894
  * @summary This is java keytool <-> openssl interop test. This test generates
  *          some openssl keystores on the fly, java operates on it and
  *          vice versa.
@@ -138,6 +138,11 @@ public class KeytoolOpensslInteropTest {
                 "pass:changeit", "-certpbe", "AES-256-CBC", "-keypbe",
                 "AES-256-CBC", "-macalg", "SHA512")
                 .shouldHaveExitValue(0);
+
+        ProcessTools.executeCommand(opensslPath, "pkcs12", "-export", "-in",
+                        "kandc", "-out", "os6", "-name", "a", "-passout",
+                        "pass:changeit", "-pbmac1_pbkdf2", "-macalg", "sha256")
+                .shouldHaveExitValue(0);
     }
 
     private static void testWithJavaCommands() throws Throwable {
@@ -168,6 +173,8 @@ public class KeytoolOpensslInteropTest {
         // no storepass no cert
         check("os5", "a", null, "changeit", true, false, true);
 
+        check("os6", "a", "changeit", "changeit", true, true, true);
+
         // keytool
 
         // Current default pkcs12 setting
diff --git a/test/jdk/sun/security/pkcs12/params/README b/test/jdk/sun/security/pkcs12/params/README
index eca9e1b8d8a..dbd1f857d63 100644
--- a/test/jdk/sun/security/pkcs12/params/README
+++ b/test/jdk/sun/security/pkcs12/params/README
@@ -14,6 +14,8 @@ openssl pkcs12 -export -in kandc -out os4 -name a -passout pass:changeit \
         -certpbe PBE-SHA1-RC4-128 -keypbe PBE-SHA1-RC4-128 -macalg SHA224
 openssl pkcs12 -export -in kandc -out os5 -name a -passout pass:changeit \
         -certpbe AES-256-CBC -keypbe AES-256-CBC -macalg SHA512
+openssl pkcs12 -export -in kandc -out os6 -name a -passout pass:changeit \
+        -pbmac1_pbkdf2  -macalg sha256
 for a in *; do
     openssl base64 -in $a -out ../$a
 done
diff --git a/test/jdk/sun/security/pkcs12/params/os6 b/test/jdk/sun/security/pkcs12/params/os6
new file mode 100644
index 00000000000..69602978d3b
--- /dev/null
+++ b/test/jdk/sun/security/pkcs12/params/os6
@@ -0,0 +1,23 @@
+MIIEOgIBAzCCA7QGCSqGSIb3DQEHAaCCA6UEggOhMIIDnTCCAmoGCSqGSIb3DQEH
+BqCCAlswggJXAgEAMIICUAYJKoZIhvcNAQcBMF8GCSqGSIb3DQEFDTBSMDEGCSqG
+SIb3DQEFDDAkBBBEpg+dmjxfnLMTmaHD/RjPAgIIADAMBggqhkiG9w0CCQUAMB0G
+CWCGSAFlAwQBKgQQT731bM49PtePx/S4Xf6UZICCAeBeDpWGfpMn8d+wcAoHjUyg
++ceG2y75ac4UVsnVSpYCZaPHcOvUDbTAk5ylMGseLvl3x7xHmovIlShW1IBUWpTe
+LhWNpa2f5yZ7t/BXB/oJFT7ol17WznHgmmCi6XbdiGq1YSV3X7SQEBw8WBWeOjGb
+IURTAZCLMbGLXkSdg+2DRgP+PpM/Y29vFK2vo72s8bfYS9bGitEreyafP/jv8GxN
+6SZx9+FSpTQ92Yj8qyFxvkR4fDyBnYe50KLf/bZmGMBq/d19lxNoheLGfuZ2ZM7W
+Mw+wePBJsyntJfcce8iWjt6M8epVmx8SwarNkLU3UiX5XPDGJnnI/0QXEvJ2skQW
+y9kCTP4DRYd2kg0tRvpsrK2DraP6xxBCviixoil1rbiQHmOhj6RKx1grGw94nvZq
+JM7rZbKN3DvjSwjRn8S2QvycqGYhrQhwoQGqajmCuuBrkM6FCQUKjoWja1XCeQ3Q
+8aRnQxwypB46Jrvvn4t3GghF3ZJ0X9LuimXQo9GAXf+X7eNOPpjFrIWlgICTgRN+
+v9elrcUOUKb9C24/Zws/B3nq8fvB9WY0Q9qaVZz9KUKfPjK1QwEr++5xJ5sBZgJz
+kZNV0n4dxe4oCN+pE9ztpEswf4sWER92G+YDZB0IEV4wggErBgkqhkiG9w0BBwGg
+ggEcBIIBGDCCARQwggEQBgsqhkiG9w0BDAoBAqCBxjCBwzBfBgkqhkiG9w0BBQ0w
+UjAxBgkqhkiG9w0BBQwwJAQQvMlpTtrcoqg0XEC3z6KFEgICCAAwDAYIKoZIhvcN
+AgkFADAdBglghkgBZQMEASoEEO7wolHeKZyoyII6h3l+iQ4EYEyg6yJWNUWo8ug2
+QNsXVUWmUb9nfu0+nIuhnpBwRewveSv+XMZ+C8szRQsefeMdfjzy91M/ZSHkR73K
+HcKdUTVI5zNdBd61g9VNL6CvQCPZIj7AW5bsJ2cZg/GjpsepcDE4MBEGCSqGSIb3
+DQEJFDEEHgIAYTAjBgkqhkiG9w0BCRUxFgQUxCJpJWSVzAG4ZpwKuIUAgKBtWAkw
+fTBtMEkGCSqGSIb3DQEFDjA8MCwGCSqGSIb3DQEFDDAfBAgMIRBR5kB3lgICCAAC
+ASAwDAYIKoZIhvcNAgkFADAMBggqhkiG9w0CCQUABCDM5Ec9Anci3+OswMqEX22f
+uAUrp9IqJSBF3ZY2g86utgQIDCEQUeZAd5YCAggA

From aa7718d1d2008c240c197383c493955d8b654bf3 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Thu, 20 Nov 2025 18:40:21 +0000
Subject: [PATCH 277/512] 8372110: GenShen: Fix erroneous assert

Reviewed-by: ysr
---
 .../share/gc/shenandoah/shenandoahScanRemembered.cpp       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index 34713898fc6..44064dbd1a9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -250,6 +250,8 @@ HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, con
 
   HeapWord* right = MIN2(region->top(), end_range_of_interest);
   HeapWord* end_of_search_next = MIN2(right, tams);
+  // Since end_range_of_interest may not align on a card boundary, last_relevant_card_index is conservative.  Not all of the
+  // memory within the last relevant card's span is < right.
   size_t last_relevant_card_index;
   if (end_range_of_interest == _end_of_heap) {
     last_relevant_card_index = _rs->card_index_for_addr(end_range_of_interest - 1);
@@ -352,9 +354,8 @@ HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, con
             return nullptr;
           }
         } while (!starts_object(following_card_index));
-        assert(_rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index),
-               "Result must precede right");
-        return _rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index);
+        HeapWord* result_candidate = _rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index);
+        return (result_candidate >= right)? nullptr: result_candidate;
       }
     }
   }

From 0187f4df967d5b32807cfb9c1028cb75fe99b05d Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 20 Nov 2025 18:47:55 +0000
Subject: [PATCH 278/512] 8372023: Javac JMH failures

Reviewed-by: liach
---
 test/benchmarks/micros-javac/pom.xml                        | 6 ++++++
 .../org/openjdk/bench/langtools/javac/JavacBenchmark.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/benchmarks/micros-javac/pom.xml b/test/benchmarks/micros-javac/pom.xml
index 5a8a40d7a9a..4dc0962e9c4 100644
--- a/test/benchmarks/micros-javac/pom.xml
+++ b/test/benchmarks/micros-javac/pom.xml
@@ -28,6 +28,12 @@
     <version>1.0-SNAPSHOT</version>
     <name>OpenJDK Microbenchmark of Java Compile</name>
     <properties>
+        <!--
+         the code below is being compiled with source 25, see JDK-8372023,
+         if the source version being compiled changes to 26 or 26+, then
+         some adjustments will be needed at:
+         test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
+        -->
         <javac.benchmark.openjdk.zip.download.url>https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_windows-x64_bin.zip</javac.benchmark.openjdk.zip.download.url>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.36</jmh.version>
diff --git a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
index 1afffc6d044..de13f6771b9 100644
--- a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
+++ b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
@@ -188,7 +188,7 @@ public class JavacBenchmark {
                 };
             }
         }) {
-            String[] cmdLine = new String[] {"-XDcompilePolicy=simple", "-implicit:none", "-nowarn", "--module-source-path", root.toString(), "-d", root.toString(), "-XDignore.symbol.file=true", "@" + srcList.toString()};
+            String[] cmdLine = new String[] {"-source", "25", "-XDcompilePolicy=simple", "-implicit:none", "-nowarn", "--module-source-path", root.toString(), "-d", root.toString(), "-XDignore.symbol.file=true", "@" + srcList.toString()};
             if (new Main("javac").compile(cmdLine, ctx).exitCode != 0) {
                 throw new IOException("compilation failed");
             }

From 41d6dc3a15fd3041aaee7b9b7f7980ede5f7940d Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 20 Nov 2025 18:53:37 +0000
Subject: [PATCH 279/512] 8372117: Correct the misleading comment in
 Character.UnicodeBlock

Reviewed-by: bpb, joehw, jlu
---
 src/java.base/share/classes/java/lang/Character.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index d866202909c..b71849eaee7 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -743,7 +743,8 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      */
     public static final class UnicodeBlock extends Subset {
         /**
-         * NUM_ENTITIES should match the total number of UnicodeBlocks.
+         * NUM_ENTITIES should match the total number of UnicodeBlock identifier
+         * names plus their aliases.
          * It should be adjusted whenever the Unicode Character Database
          * is upgraded.
          */

From 45246bc72daf68b905d7342f478e53bfe2883796 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 20 Nov 2025 23:06:55 +0000
Subject: [PATCH 280/512] 8371965: Convert TaskQueueSuper to use Atomic<T>

Reviewed-by: iwalulya, tschatzl
---
 src/hotspot/share/gc/shared/taskqueue.hpp | 105 +++++++++++++---------
 1 file changed, 62 insertions(+), 43 deletions(-)

diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp
index 1c36e18894a..3a751852ab6 100644
--- a/src/hotspot/share/gc/shared/taskqueue.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.hpp
@@ -25,13 +25,16 @@
 #ifndef SHARE_GC_SHARED_TASKQUEUE_HPP
 #define SHARE_GC_SHARED_TASKQUEUE_HPP
 
+#include "cppstdlib/type_traits.hpp"
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
+#include "metaprogramming/primitiveConversions.hpp"
 #include "oops/oopsHierarchy.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/powerOfTwo.hpp"
 #include "utilities/stack.hpp"
 
 #if TASKQUEUE_STATS
@@ -100,76 +103,92 @@ void TaskQueueStats::reset() {
 }
 #endif // TASKQUEUE_STATS
 
+// Helper for TaskQueueSuper, encoding {queue index, tag} pair in a form that
+// supports atomic access to the pair.
+class TaskQueueAge {
+  friend struct PrimitiveConversions::Translate<TaskQueueAge>;
+
+public:
+  // Internal type used for indexing the queue, and for the tag.
+  using idx_t = NOT_LP64(uint16_t) LP64_ONLY(uint32_t);
+
+  explicit TaskQueueAge(size_t data = 0) : _data{data} {}
+  TaskQueueAge(idx_t top, idx_t tag) : _fields{top, tag} {}
+
+  idx_t top() const { return _fields._top; }
+  idx_t tag() const { return _fields._tag; }
+
+  bool operator==(const TaskQueueAge& other) const { return _data == other._data; }
+
+private:
+  struct Fields {
+    idx_t _top;
+    idx_t _tag;
+  };
+  union {
+    size_t _data;    // Provides access to _fields as a single integral value.
+    Fields _fields;
+  };
+  // _data must be able to hold combined _fields. Must be equal to ensure
+  // there isn't any padding that could be uninitialized by 2-arg ctor.
+  static_assert(sizeof(_data) == sizeof(_fields));
+};
+
+// Support for Atomic<TaskQueueAge>.
+template<>
+struct PrimitiveConversions::Translate<TaskQueueAge> : public std::true_type {
+  using Value = TaskQueueAge;
+  using Decayed = decltype(TaskQueueAge::_data);
+
+  static Decayed decay(Value x) { return x._data; }
+  static Value recover(Decayed x) { return Value(x); }
+};
+
 // TaskQueueSuper collects functionality common to all GenericTaskQueue instances.
 
 template <unsigned int N, MemTag MT>
 class TaskQueueSuper: public CHeapObj<MT> {
 protected:
-  // Internal type for indexing the queue; also used for the tag.
-  typedef NOT_LP64(uint16_t) LP64_ONLY(uint32_t) idx_t;
-  STATIC_ASSERT(N == idx_t(N)); // Ensure N fits in an idx_t.
+  using Age = TaskQueueAge;
+  using idx_t = Age::idx_t;
+  static_assert(N == idx_t(N)); // Ensure N fits in an idx_t.
 
   // N must be a power of 2 for computing modulo via masking.
   // N must be >= 2 for the algorithm to work at all, though larger is better.
-  STATIC_ASSERT(N >= 2);
-  STATIC_ASSERT(is_power_of_2(N));
+  static_assert(N >= 2);
+  static_assert(is_power_of_2(N));
   static const uint MOD_N_MASK = N - 1;
 
-  class Age {
-    friend class TaskQueueSuper;
-
-  public:
-    explicit Age(size_t data = 0) : _data(data) {}
-    Age(idx_t top, idx_t tag) { _fields._top = top; _fields._tag = tag; }
-
-    idx_t top() const { return _fields._top; }
-    idx_t tag() const { return _fields._tag; }
-
-    bool operator ==(const Age& other) const { return _data == other._data; }
-
-  private:
-    struct fields {
-      idx_t _top;
-      idx_t _tag;
-    };
-    union {
-      size_t _data;
-      fields _fields;
-    };
-    STATIC_ASSERT(sizeof(size_t) >= sizeof(fields));
-  };
-
   uint bottom_relaxed() const {
-    return AtomicAccess::load(&_bottom);
+    return _bottom.load_relaxed();
   }
 
   uint bottom_acquire() const {
-    return AtomicAccess::load_acquire(&_bottom);
+    return _bottom.load_acquire();
   }
 
   void set_bottom_relaxed(uint new_bottom) {
-    AtomicAccess::store(&_bottom, new_bottom);
+    _bottom.store_relaxed(new_bottom);
   }
 
   void release_set_bottom(uint new_bottom) {
-    AtomicAccess::release_store(&_bottom, new_bottom);
+    _bottom.release_store(new_bottom);
   }
 
   Age age_relaxed() const {
-    return Age(AtomicAccess::load(&_age._data));
+    return _age.load_relaxed();
   }
 
   void set_age_relaxed(Age new_age) {
-    AtomicAccess::store(&_age._data, new_age._data);
+    _age.store_relaxed(new_age);
   }
 
   Age cmpxchg_age(Age old_age, Age new_age) {
-    return Age(AtomicAccess::cmpxchg(&_age._data, old_age._data, new_age._data));
+    return _age.compare_exchange(old_age, new_age);
   }
 
   idx_t age_top_relaxed() const {
-    // Atomically accessing a subfield of an "atomic" member.
-    return AtomicAccess::load(&_age._fields._top);
+    return _age.load_relaxed().top();
   }
 
   // These both operate mod N.
@@ -222,16 +241,16 @@ private:
   DEFINE_PAD_MINUS_SIZE(0, DEFAULT_PADDING_SIZE, 0);
 
   // Index of the first free element after the last one pushed (mod N).
-  volatile uint _bottom;
-  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_PADDING_SIZE, sizeof(uint));
+  Atomic<uint> _bottom;
+  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_PADDING_SIZE, sizeof(_bottom));
 
   // top() is the index of the oldest pushed element (mod N), and tag()
   // is the associated epoch, to distinguish different modifications of
   // the age.  There is no available element if top() == _bottom or
   // (_bottom - top()) mod N == N-1; the latter indicates underflow
   // during concurrent pop_local/pop_global.
-  volatile Age _age;
-  DEFINE_PAD_MINUS_SIZE(2, DEFAULT_PADDING_SIZE, sizeof(Age));
+  Atomic<Age> _age;
+  DEFINE_PAD_MINUS_SIZE(2, DEFAULT_PADDING_SIZE, sizeof(_age));
 
   NONCOPYABLE(TaskQueueSuper);
 

From 0972ba681cdc81b77e9b4353db8ee835216d242e Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Fri, 21 Nov 2025 00:04:41 +0000
Subject: [PATCH 281/512] 8371383: Test
 sun/security/tools/jarsigner/DefaultOptions.java failed due to
 CertificateNotYetValidException

Reviewed-by: weijun
---
 test/jdk/sun/security/tools/jarsigner/DefaultOptions.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java b/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java
index 72756de6f8b..fe8adfb8962 100644
--- a/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java
+++ b/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,10 @@ public class DefaultOptions {
         keytool("-genkeypair -dname CN=CA -alias ca -keyalg rsa -ext bc:c")
                 .shouldHaveExitValue(0);
         keytool("-alias a -certreq -file a.req");
-        keytool("-alias ca -gencert -infile a.req -outfile a.cert");
+
+        // The start date is set to -1M to prevent the certificate not yet
+        // valid during fast enough execution.
+        keytool("-alias ca -gencert -infile a.req -outfile a.cert -startdate -1M");
         keytool("-alias a -import -file a.cert").shouldHaveExitValue(0);
 
         Files.write(Path.of("js.conf"), List.of(

From d887359b5a8bffedcbf1b3ca6f0eae13b7636add Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 21 Nov 2025 00:38:44 +0000
Subject: [PATCH 282/512] 8370976: Review the behavioral changes of core
 reflection descriptor parsing migration

Reviewed-by: rriggs, jvernee
---
 .../share/classes/java/lang/Class.java        | 14 +++--
 .../classes/java/lang/invoke/MethodType.java  |  4 --
 .../sun/invoke/util/BytecodeDescriptor.java   | 62 +++++++++++++------
 .../BadEnclosingMethodTest.java               | 13 +++-
 .../annotation/MalformedAnnotationTest.java   | 55 +++++++++++++---
 test/jdk/java/lang/invoke/MethodTypeTest.java |  5 ++
 .../invoke/util/BytecodeDescriptorTest.java   | 21 +++++++
 7 files changed, 137 insertions(+), 37 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index cfd2fc82235..f96ad9ff972 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -43,6 +43,7 @@ import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.GenericSignatureFormatError;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
@@ -1445,7 +1446,6 @@ public final class Class<T> implements java.io.Serializable,
             if (!enclosingInfo.isMethod())
                 return null;
 
-            // Descriptor already validated by VM
             List<Class<?>> types = BytecodeDescriptor.parseMethod(enclosingInfo.getDescriptor(), getClassLoader());
             Class<?>   returnType       = types.removeLast();
             Class<?>[] parameterClasses = types.toArray(EMPTY_CLASS_ARRAY);
@@ -1533,8 +1533,15 @@ public final class Class<T> implements java.io.Serializable,
 
         String getName() { return name; }
 
-        String getDescriptor() { return descriptor; }
-
+        String getDescriptor() {
+            // hotspot validates this descriptor to be either a field or method
+            // descriptor as the "type" in a NameAndType in verification.
+            // So this can still be a field descriptor
+            if (descriptor.isEmpty() || descriptor.charAt(0) != '(') {
+                throw new GenericSignatureFormatError("Bad method signature: " + descriptor);
+            }
+            return descriptor;
+        }
     }
 
     private static Class<?> toClass(Type o) {
@@ -1567,7 +1574,6 @@ public final class Class<T> implements java.io.Serializable,
             if (!enclosingInfo.isConstructor())
                 return null;
 
-            // Descriptor already validated by VM
             List<Class<?>> types = BytecodeDescriptor.parseMethod(enclosingInfo.getDescriptor(), getClassLoader());
             types.removeLast();
             Class<?>[] parameterClasses = types.toArray(EMPTY_CLASS_ARRAY);
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java
index 3d15ce68710..afbe63709fd 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodType.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java
@@ -1194,10 +1194,6 @@ class MethodType
     static MethodType fromDescriptor(String descriptor, ClassLoader loader)
         throws IllegalArgumentException, TypeNotPresentException
     {
-        if (!descriptor.startsWith("(") ||  // also generates NPE if needed
-            descriptor.indexOf(')') < 0 ||
-            descriptor.indexOf('.') >= 0)
-            throw newIllegalArgumentException("not a method descriptor: "+descriptor);
         List<Class<?>> types = BytecodeDescriptor.parseMethod(descriptor, loader);
         Class<?> rtype = types.remove(types.size() - 1);
         Class<?>[] ptypes = listToArray(types);
diff --git a/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java b/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
index bd5ea6d7635..b3671d19333 100644
--- a/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
+++ b/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
@@ -63,33 +63,24 @@ public class BytecodeDescriptor {
     /// @throws TypeNotPresentException if a reference type cannot be found by
     ///         the loader (before the descriptor is found invalid)
     public static List<Class<?>> parseMethod(String descriptor, ClassLoader loader) {
-        return parseMethod(descriptor, 0, descriptor.length(), loader);
-    }
-
-    /**
-     * @param loader the class loader in which to look up the types (null means
-     *               bootstrap class loader)
-     */
-    static List<Class<?>> parseMethod(String bytecodeSignature,
-            int start, int end, ClassLoader loader) {
-        String str = bytecodeSignature;
-        int[] i = {start};
+        int end = descriptor.length(); // implicit null check
+        int[] i = {0};
         var ptypes = new ArrayList<Class<?>>();
-        if (i[0] < end && str.charAt(i[0]) == '(') {
+        if (i[0] < end && descriptor.charAt(i[0]) == '(') {
             ++i[0];  // skip '('
-            while (i[0] < end && str.charAt(i[0]) != ')') {
-                Class<?> pt = parseSig(str, i, end, loader);
+            while (i[0] < end && descriptor.charAt(i[0]) != ')') {
+                Class<?> pt = parseSig(descriptor, i, end, loader);
                 if (pt == null || pt == void.class)
-                    parseError(str, "bad argument type");
+                    parseError(descriptor, "bad argument type");
                 ptypes.add(pt);
             }
             ++i[0];  // skip ')'
         } else {
-            parseError(str, "not a method type");
+            parseError(descriptor, "not a method type");
         }
-        Class<?> rtype = parseSig(str, i, end, loader);
+        Class<?> rtype = parseSig(descriptor, i, end, loader);
         if (rtype == null || i[0] != end)
-            parseError(str, "bad return type");
+            parseError(descriptor, "bad return type");
         ptypes.add(rtype);
         return ptypes;
     }
@@ -115,8 +106,22 @@ public class BytecodeDescriptor {
         if (i[0] == end)  return null;
         char c = str.charAt(i[0]++);
         if (c == 'L') {
-            int begc = i[0], endc = str.indexOf(';', begc);
-            if (endc < 0)  return null;
+            int begc = i[0];
+            int identifierStart = begc;
+            int endc;
+            while (true) {
+                int next = nextNonIdentifier(str, identifierStart, end);
+                if (identifierStart == next || next >= end) return null;  // Empty name segment, or the end
+                char ch = str.charAt(next);
+                if (ch == ';') {
+                    endc = next;
+                    break;
+                } else if (ch == '/') {
+                    identifierStart = next + 1;  // Next name segment
+                } else {
+                    return null;  // Bad char [ or .
+                }
+            }
             i[0] = endc+1;
             String name = str.substring(begc, endc).replace('/', '.');
             try {
@@ -148,6 +153,23 @@ public class BytecodeDescriptor {
         }
     }
 
+    private static final int CHECK_OFFSET = 32;
+    private static final long NON_IDENTIFIER_MASK = (1L << ('.' - CHECK_OFFSET))
+            | (1L << ('/' - CHECK_OFFSET))
+            | (1L << (';' - CHECK_OFFSET))
+            | (1L << ('[' - CHECK_OFFSET));
+
+    private static int nextNonIdentifier(String str, int index, int end) {
+        while (index < end) {
+            int check = str.charAt(index) - CHECK_OFFSET;
+            if ((check & -Long.SIZE) == 0 && (NON_IDENTIFIER_MASK & (1L << check)) != 0) {
+                break;
+            }
+            index++;
+        }
+        return index;
+    }
+
     public static String unparse(Class<?> type) {
         if (type == Object.class) {
             return "Ljava/lang/Object;";
diff --git a/test/jdk/java/lang/Class/getEnclosingMethod/BadEnclosingMethodTest.java b/test/jdk/java/lang/Class/getEnclosingMethod/BadEnclosingMethodTest.java
index f673d01c835..dea1141d542 100644
--- a/test/jdk/java/lang/Class/getEnclosingMethod/BadEnclosingMethodTest.java
+++ b/test/jdk/java/lang/Class/getEnclosingMethod/BadEnclosingMethodTest.java
@@ -34,6 +34,7 @@ import org.junit.jupiter.api.Test;
 
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.attribute.EnclosingMethodAttribute;
+import java.lang.reflect.GenericSignatureFormatError;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
@@ -93,8 +94,16 @@ class BadEnclosingMethodTest {
      */
     @Test
     void testMalformedTypes() throws Exception {
-        assertThrows(ClassFormatError.class, () -> loadTestClass("methodName", "(L[;)V"));
-        assertThrows(ClassFormatError.class, () -> loadTestClass(INIT_NAME, "(L[;)V"));
+        assertThrowsExactly(ClassFormatError.class, () -> loadTestClass("methodName", "(L[;)V"));
+        assertThrowsExactly(ClassFormatError.class, () -> loadTestClass(INIT_NAME, "(L[;)V"));
+        assertThrowsExactly(ClassFormatError.class, () -> loadTestClass(INIT_NAME, "(Lmissing/;)V"));
+        assertThrowsExactly(ClassFormatError.class, () -> loadTestClass(INIT_NAME, "()L/Missing;"));
+        // only throw if the query type match the method/constructor type
+        assertDoesNotThrow(() -> loadTestClass(INIT_NAME, "Ljava/lang/Object;").getEnclosingMethod());
+        assertDoesNotThrow(() -> loadTestClass("method", "[I").getEnclosingConstructor());
+        // We have to manually intercept field-typed "methods"
+        assertThrows(GenericSignatureFormatError.class, () -> loadTestClass(INIT_NAME, "Ljava/lang/Object;").getEnclosingConstructor());
+        assertThrows(GenericSignatureFormatError.class, () -> loadTestClass("method", "[I").getEnclosingMethod());
     }
 
     /**
diff --git a/test/jdk/java/lang/annotation/MalformedAnnotationTest.java b/test/jdk/java/lang/annotation/MalformedAnnotationTest.java
index e7096000fb1..513deb8c7e9 100644
--- a/test/jdk/java/lang/annotation/MalformedAnnotationTest.java
+++ b/test/jdk/java/lang/annotation/MalformedAnnotationTest.java
@@ -31,6 +31,9 @@
 
 import jdk.test.lib.ByteCodeLoader;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -41,6 +44,8 @@ import java.lang.classfile.ClassFile;
 import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
 import java.lang.constant.ClassDesc;
 import java.lang.reflect.GenericSignatureFormatError;
+import java.util.Arrays;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -56,22 +61,58 @@ class MalformedAnnotationTest {
         Class<?> value();
     }
 
+    static Stream<String> badFieldDescriptors() {
+        return Arrays.stream(new String[] {
+                "Not a_descriptor",
+                "()V",
+                "Ljava/lang/Object",
+                "Ljava/",
+                "Ljava/util/Map.Entry;",
+                "[".repeat(256) + "I",
+                "Lbad.Name;",
+                "Lbad[Name;",
+                "L;",
+                "L/Missing;",
+                "Lmissing/;",
+        });
+    }
+
     /**
      * Ensures bad class descriptors in annotations lead to
      * {@link GenericSignatureFormatError} and the error message contains the
      * malformed descriptor string.
      */
-    @Test
-    void testMalformedClassValue() throws Exception {
-        var badDescString = "Not a_descriptor";
+    @ParameterizedTest
+    @MethodSource("badFieldDescriptors")
+    void testMalformedClassValue(String badDescString) throws Exception {
+        var cl = spinClass(badDescString);
+        var ex = assertThrows(GenericSignatureFormatError.class, () -> cl.getDeclaredAnnotation(ClassCarrier.class));
+        assertTrue(ex.getMessage().contains(badDescString), () -> "Uninformative error: " + ex);
+    }
+
+    private static Class<?> spinClass(String desc) throws Exception {
         var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb -> clb
                 .with(RuntimeVisibleAnnotationsAttribute.of(
                         Annotation.of(ClassCarrier.class.describeConstable().orElseThrow(),
                                 AnnotationElement.of("value", AnnotationValue.ofClass(clb
-                                        .constantPool().utf8Entry(badDescString))))
+                                        .constantPool().utf8Entry(desc))))
                 )));
-        var cl = new ByteCodeLoader("Test", bytes, MalformedAnnotationTest.class.getClassLoader()).loadClass("Test");
-        var ex = assertThrows(GenericSignatureFormatError.class, () -> cl.getDeclaredAnnotation(ClassCarrier.class));
-        assertTrue(ex.getMessage().contains(badDescString), () -> "Uninformative error: " + ex);
+        return new ByteCodeLoader("Test", bytes, ClassCarrier.class.getClassLoader()).loadClass("Test");
+    }
+
+    static Stream<String> goodFieldDescriptors() {
+        return Arrays.stream(new String[] {
+                "Ljava/lang/Object<*>;", // previously MalformedParameterizedTypeException
+                "[Ljava/util/Optional<*>;", // previously ClassCastException
+                "Ljava/util/Map$Entry<**>;", // previously ClassCastException
+        });
+    }
+
+    @ParameterizedTest
+    @MethodSource("goodFieldDescriptors")
+    void testLegalClassValue(String goodDescString) throws Exception {
+        var cl = spinClass(goodDescString);
+        var anno = cl.getDeclaredAnnotation(ClassCarrier.class);
+        assertThrows(TypeNotPresentException.class, anno::value);
     }
 }
diff --git a/test/jdk/java/lang/invoke/MethodTypeTest.java b/test/jdk/java/lang/invoke/MethodTypeTest.java
index 70949236066..8ac03d1a7fd 100644
--- a/test/jdk/java/lang/invoke/MethodTypeTest.java
+++ b/test/jdk/java/lang/invoke/MethodTypeTest.java
@@ -230,6 +230,11 @@ public class MethodTypeTest {
                 "(" + "[".repeat(256) + "J)I",
                 "(java/lang/Object)V",
                 "()java/lang/Object",
+                "()Lbad.Name;",
+                "()Lbad[Name;",
+                "(L;)V",
+                "(L/Missing;)I",
+                "(Lmissing/;)Z",
         };
     }
 
diff --git a/test/jdk/sun/invoke/util/BytecodeDescriptorTest.java b/test/jdk/sun/invoke/util/BytecodeDescriptorTest.java
index fa99c20e644..2d07b08dcb7 100644
--- a/test/jdk/sun/invoke/util/BytecodeDescriptorTest.java
+++ b/test/jdk/sun/invoke/util/BytecodeDescriptorTest.java
@@ -79,7 +79,13 @@ class BytecodeDescriptorTest {
         assertSame(int.class,      BytecodeDescriptor.parseClass("I", null),                  "primitive");
         assertSame(long[][].class, BytecodeDescriptor.parseClass("[[J", null),                "array");
         assertSame(Object.class,   BytecodeDescriptor.parseClass("Ljava/lang/Object;", null), "class or interface");
+        assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("java.lang.Object", null),    "binary name");
+        assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("L[a;", null),                "bad class or interface");
+        assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("Ljava.lang.Object;", null),  "bad class or interface");
         assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("java/lang/Object", null),    "internal name");
+        assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("L;", null),                  "empty name");
+        assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("Lmissing/;", null),          "empty name part");
+        assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("L/Missing;", null),          "empty name part");
         assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("[V", null),                  "bad array");
         assertSame(Class.forName("[".repeat(255) + "I"), BytecodeDescriptor.parseClass("[".repeat(255) + "I", null),   "good array");
         assertThrows(IllegalArgumentException.class, () -> BytecodeDescriptor.parseClass("[".repeat(256) + "I", null), "bad array");
@@ -110,6 +116,21 @@ class BytecodeDescriptorTest {
         assertThrows(IllegalArgumentException.class,
                      () -> BytecodeDescriptor.parseClass("([".repeat(256) + "I)J", null),
                      "bad arg");
+        assertThrows(IllegalArgumentException.class,
+                     () -> BytecodeDescriptor.parseMethod("(Ljava.lang.Object;)V", null),
+                     "bad arg");
+        assertThrows(IllegalArgumentException.class,
+                     () -> BytecodeDescriptor.parseMethod("(Ljava/lang[Object;)V", null),
+                     "bad arg");
+        assertThrows(IllegalArgumentException.class,
+                     () -> BytecodeDescriptor.parseMethod("(L;)V", null),
+                     "bad arg");
+        assertThrows(IllegalArgumentException.class,
+                     () -> BytecodeDescriptor.parseMethod("(Ljava/lang/;)V", null),
+                     "bad arg");
+        assertThrows(IllegalArgumentException.class,
+                     () -> BytecodeDescriptor.parseMethod("(L/Object;)V", null),
+                     "bad arg");
 
         assertEquals(List.of(foo1, bar1),
                      BytecodeDescriptor.parseMethod("(" + FOO_DESC + ")" + BAR_DESC, cl1),

From 2358d40cbcafb851425176cacf65cc3be1ae12a2 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 21 Nov 2025 00:46:00 +0000
Subject: [PATCH 283/512] 8371953: Document null handling in core reflection
 APIs

Reviewed-by: alanb
---
 .../share/classes/java/lang/Class.java        | 61 ++++++++---------
 .../java/lang/reflect/AccessibleObject.java   |  2 +
 .../classes/java/lang/reflect/Array.java      | 10 +--
 .../lang/reflect/ClassFileFormatVersion.java  |  1 +
 .../reflect/InaccessibleObjectException.java  |  4 +-
 .../reflect/InvocationTargetException.java    |  8 +--
 .../reflect/MalformedParametersException.java |  4 +-
 .../classes/java/lang/reflect/Proxy.java      |  3 +-
 .../reflect/UndeclaredThrowableException.java |  8 +--
 .../jdk/java/lang/Class/NullBehaviorTest.java | 65 +++++++++++++++++++
 .../AccessFlag/AccessFlagNullCheckTest.java   | 54 +++++++++++++++
 .../AccessibleObjectNullCheckTest.java        | 46 +++++++++++++
 .../reflect/Array/ArrayArgumentCheckTest.java | 65 +++++++++++++++++++
 .../reflect/ClassFileFormatVersionTest.java   | 46 +++++++++++++
 .../ExceptionClassesNullCheckTest.java        | 55 ++++++++++++++++
 .../reflect/Proxy/ProxyNullCheckTest.java     | 59 +++++++++++++++++
 16 files changed, 440 insertions(+), 51 deletions(-)
 create mode 100644 test/jdk/java/lang/Class/NullBehaviorTest.java
 create mode 100644 test/jdk/java/lang/reflect/AccessFlag/AccessFlagNullCheckTest.java
 create mode 100644 test/jdk/java/lang/reflect/AccessibleObject/AccessibleObjectNullCheckTest.java
 create mode 100644 test/jdk/java/lang/reflect/Array/ArrayArgumentCheckTest.java
 create mode 100644 test/jdk/java/lang/reflect/ClassFileFormatVersionTest.java
 create mode 100644 test/jdk/java/lang/reflect/ExceptionClassesNullCheckTest.java
 create mode 100644 test/jdk/java/lang/reflect/Proxy/ProxyNullCheckTest.java

diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index f96ad9ff972..eab1993a2b4 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -160,6 +160,10 @@ import sun.reflect.annotation.*;
  * other members are the classes and interfaces whose declarations are
  * enclosed within the top-level class declaration.
  *
+ * <p> Unless otherwise specified, methods in this class throw a
+ * {@link NullPointerException} when they are called with {@code null}
+ * or an array that contains {@code null} as an argument.
+ *
  * <h2><a id=hiddenClasses>Hidden Classes</a></h2>
  * A class or interface created by the invocation of
  * {@link java.lang.invoke.MethodHandles.Lookup#defineHiddenClass(byte[], boolean, MethodHandles.Lookup.ClassOption...)
@@ -530,7 +534,8 @@ public final class Class<T> implements java.io.Serializable,
      *                   (which implies linking). See Section {@jls
      *                   12.4} of <cite>The Java Language
      *                   Specification</cite>.
-     * @param loader     class loader from which the class must be loaded
+     * @param loader     class loader from which the class must be loaded,
+     *                   may be {@code null}
      * @return           class object representing the desired class
      *
      * @throws    LinkageError if the linkage fails
@@ -589,8 +594,6 @@ public final class Class<T> implements java.io.Serializable,
      * @return {@code Class} object of the given name defined in the given module;
      *         {@code null} if not found.
      *
-     * @throws NullPointerException if the given module or name is {@code null}
-     *
      * @throws LinkageError if the linkage fails
      *
      * @jls 12.2 Loading of Classes and Interfaces
@@ -620,8 +623,6 @@ public final class Class<T> implements java.io.Serializable,
      *
      * @param primitiveName the name of the primitive type to find
      *
-     * @throws NullPointerException if the argument is {@code null}
-     *
      * @jls 4.2 Primitive Types and Values
      * @jls 15.8.2 Class Literals
      * @since 22
@@ -757,7 +758,7 @@ public final class Class<T> implements java.io.Serializable,
      * this {@code Class} object represents a primitive type, this method
      * returns {@code false}.
      *
-     * @param   obj the object to check
+     * @param   obj the object to check, may be {@code null}
      * @return  true if {@code obj} is an instance of this class
      *
      * @since 1.1
@@ -787,8 +788,6 @@ public final class Class<T> implements java.io.Serializable,
      * @param     cls the {@code Class} object to be checked
      * @return    the {@code boolean} value indicating whether objects of the
      *            type {@code cls} can be assigned to objects of this class
-     * @throws    NullPointerException if the specified Class parameter is
-     *            null.
      * @since     1.1
      */
     @IntrinsicCandidate
@@ -2057,7 +2056,6 @@ public final class Class<T> implements java.io.Serializable,
      *         {@code name}
      * @throws NoSuchFieldException if a field with the specified name is
      *         not found.
-     * @throws NullPointerException if {@code name} is {@code null}
      *
      * @since 1.1
      * @jls 8.2 Class Members
@@ -2148,13 +2146,13 @@ public final class Class<T> implements java.io.Serializable,
      * overriding method as it would have a more specific return type.
      *
      * @param name the name of the method
-     * @param parameterTypes the list of parameters
+     * @param parameterTypes the list of parameters, may be {@code null}
      * @return the {@code Method} object that matches the specified
      *         {@code name} and {@code parameterTypes}
-     * @throws NoSuchMethodException if a matching method is not found
+     * @throws NoSuchMethodException if a matching method is not found,
+     *         if {@code parameterTypes} contains {@code null},
      *         or if the name is {@value ConstantDescs#INIT_NAME} or
-     *         {@value ConstantDescs#CLASS_INIT_NAME}.
-     * @throws NullPointerException if {@code name} is {@code null}
+     *         {@value ConstantDescs#CLASS_INIT_NAME}
      *
      * @jls 8.2 Class Members
      * @jls 8.4 Method Declarations
@@ -2185,12 +2183,13 @@ public final class Class<T> implements java.io.Serializable,
      * represented by this {@code Class} object whose formal parameter
      * types match those specified by {@code parameterTypes}.
      *
-     * @param parameterTypes the parameter array
+     * @param parameterTypes the parameter array, may be {@code null}
      * @return the {@code Constructor} object of the public constructor that
      *         matches the specified {@code parameterTypes}
      * @throws NoSuchMethodException if a matching constructor is not found,
-     *         including when this {@code Class} object represents
-     *         an interface, a primitive type, an array class, or void.
+     *         if this {@code Class} object represents an interface, a primitive
+     *         type, an array class, or void, or if {@code parameterTypes}
+     *         contains {@code null}
      *
      * @see #getDeclaredConstructor(Class[])
      * @since 1.1
@@ -2371,7 +2370,6 @@ public final class Class<T> implements java.io.Serializable,
      *          class
      * @throws  NoSuchFieldException if a field with the specified name is
      *          not found.
-     * @throws  NullPointerException if {@code name} is {@code null}
      *
      * @since 1.1
      * @jls 8.2 Class Members
@@ -2406,11 +2404,13 @@ public final class Class<T> implements java.io.Serializable,
      * method does not find the {@code clone()} method.
      *
      * @param name the name of the method
-     * @param parameterTypes the parameter array
-     * @return  the {@code Method} object for the method of this class
-     *          matching the specified name and parameters
-     * @throws  NoSuchMethodException if a matching method is not found.
-     * @throws  NullPointerException if {@code name} is {@code null}
+     * @param parameterTypes the parameter array, may be {@code null}
+     * @return the {@code Method} object for the method of this class
+     *         matching the specified name and parameters
+     * @throws NoSuchMethodException if a matching method is not found,
+     *         if {@code parameterTypes} contains {@code null},
+     *         or if the name is {@value ConstantDescs#INIT_NAME} or
+     *         {@value ConstantDescs#CLASS_INIT_NAME}
      *
      * @jls 8.2 Class Members
      * @jls 8.4 Method Declarations
@@ -2477,12 +2477,13 @@ public final class Class<T> implements java.io.Serializable,
      * declared in a non-static context, the formal parameter types
      * include the explicit enclosing instance as the first parameter.
      *
-     * @param parameterTypes the parameter array
+     * @param parameterTypes the parameter array, may be {@code null}
      * @return  The {@code Constructor} object for the constructor with the
      *          specified parameter list
      * @throws  NoSuchMethodException if a matching constructor is not found,
-     *          including when this {@code Class} object represents
-     *          an interface, a primitive type, an array class, or void.
+     *          if this {@code Class} object represents an interface, a
+     *          primitive type, an array class, or void, or if
+     *          {@code parameterTypes} contains {@code null}
      *
      * @see #getConstructor(Class[])
      * @since 1.1
@@ -2541,7 +2542,6 @@ public final class Class<T> implements java.io.Serializable,
      *          resource with this name is found, or the resource is in a package
      *          that is not {@linkplain Module#isOpen(String, Module) open} to at
      *          least the caller module.
-     * @throws  NullPointerException If {@code name} is {@code null}
      *
      * @see Module#getResourceAsStream(String)
      * @since  1.1
@@ -2637,7 +2637,6 @@ public final class Class<T> implements java.io.Serializable,
      *         resource is in a package that is not
      *         {@linkplain Module#isOpen(String, Module) open} to at least the caller
      *         module.
-     * @throws NullPointerException If {@code name} is {@code null}
      * @since  1.1
      */
     @CallerSensitive
@@ -3479,7 +3478,7 @@ public final class Class<T> implements java.io.Serializable,
      * Casts an object to the class or interface represented
      * by this {@code Class} object.
      *
-     * @param obj the object to be cast
+     * @param obj the object to be cast, may be {@code null}
      * @return the object after casting, or null if obj is null
      *
      * @throws ClassCastException if the object is not
@@ -3534,7 +3533,6 @@ public final class Class<T> implements java.io.Serializable,
      * <p>Note that any annotation returned by this method is a
      * declaration annotation.
      *
-     * @throws NullPointerException {@inheritDoc}
      * @since 1.5
      */
     @Override
@@ -3547,7 +3545,6 @@ public final class Class<T> implements java.io.Serializable,
 
     /**
      * {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
      * @since 1.5
      */
     @Override
@@ -3560,7 +3557,6 @@ public final class Class<T> implements java.io.Serializable,
      * <p>Note that any annotations returned by this method are
      * declaration annotations.
      *
-     * @throws NullPointerException {@inheritDoc}
      * @since 1.8
      */
     @Override
@@ -3590,7 +3586,6 @@ public final class Class<T> implements java.io.Serializable,
      * <p>Note that any annotation returned by this method is a
      * declaration annotation.
      *
-     * @throws NullPointerException {@inheritDoc}
      * @since 1.8
      */
     @Override
@@ -3606,7 +3601,6 @@ public final class Class<T> implements java.io.Serializable,
      * <p>Note that any annotations returned by this method are
      * declaration annotations.
      *
-     * @throws NullPointerException {@inheritDoc}
      * @since 1.8
      */
     @Override
@@ -3837,6 +3831,7 @@ public final class Class<T> implements java.io.Serializable,
      * @since 11
      */
     public boolean isNestmateOf(Class<?> c) {
+        Objects.requireNonNull(c);
         if (this == c) {
             return true;
         }
diff --git a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
index 1637d26b571..54000b916e2 100644
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
@@ -97,6 +97,8 @@ public class AccessibleObject implements AnnotatedElement {
      *         objects in the array
      * @throws SecurityException if an element in the array is a constructor for {@code
      *         java.lang.Class}
+     * @throws NullPointerException if {@code array} or any of its elements is
+     *         {@code null}
      */
     @CallerSensitive
     public static void setAccessible(AccessibleObject[] array, boolean flag) {
diff --git a/src/java.base/share/classes/java/lang/reflect/Array.java b/src/java.base/share/classes/java/lang/reflect/Array.java
index 2fbad52c374..4e676c050d7 100644
--- a/src/java.base/share/classes/java/lang/reflect/Array.java
+++ b/src/java.base/share/classes/java/lang/reflect/Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,8 +98,8 @@ class Array {
      * @param dimensions an array of {@code int} representing the dimensions of
      * the new array
      * @return the new array
-     * @throws    NullPointerException if the specified
-     * {@code componentType} argument is null
+     * @throws    NullPointerException if any of the specified
+     * {@code componentType} or {@code dimensions} arguments is null
      * @throws    IllegalArgumentException if the specified {@code dimensions}
      * argument is a zero-dimensional array, if componentType is {@link
      * Void#TYPE}, or if the number of dimensions of the requested array
@@ -117,8 +117,8 @@ class Array {
      *
      * @param array the array
      * @return the length of the array
-     * @throws    IllegalArgumentException if the object argument is not
-     * an array
+     * @throws NullPointerException if {@code array} is {@code null}
+     * @throws IllegalArgumentException if {@code array} is not an array
      */
     @IntrinsicCandidate
     public static native int getLength(Object array)
diff --git a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java b/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
index 4a63dd157f8..16fe000091c 100644
--- a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
+++ b/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
@@ -433,6 +433,7 @@ public enum ClassFileFormatVersion {
      * ClassFileFormatVersion.valueOf(Runtime.Version.parse("17"))}
      *
      * @param rv runtime version to map to a class file format version
+     * @throws NullPointerException if {@code rv} is {@code null}
      * @throws IllegalArgumentException if the feature of version
      * argument is greater than the feature of the platform version.
      */
diff --git a/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java b/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java
index 7bc9ea33b2b..29d6eb13602 100644
--- a/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java
+++ b/src/java.base/share/classes/java/lang/reflect/InaccessibleObjectException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ public class InaccessibleObjectException extends RuntimeException {
      * message.
      *
      * @param msg
-     *        The detail message
+     *        The detail message, may be {@code null}
      */
     public InaccessibleObjectException(String msg) {
         super(msg);
diff --git a/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java b/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
index a6ef4fa289c..efdca9bcbd1 100644
--- a/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
+++ b/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ public class InvocationTargetException extends ReflectiveOperationException {
     /**
      * Constructs a InvocationTargetException with a target exception.
      *
-     * @param target the target exception
+     * @param target the target exception, may be {@code null}
      */
     public InvocationTargetException(Throwable target) {
         super((Throwable)null);  // Disallow initCause
@@ -73,8 +73,8 @@ public class InvocationTargetException extends ReflectiveOperationException {
      * Constructs a InvocationTargetException with a target exception
      * and a detail message.
      *
-     * @param target the target exception
-     * @param s      the detail message
+     * @param target the target exception, may be {@code null}
+     * @param s      the detail message, may be {@code null}
      */
     public InvocationTargetException(Throwable target, String s) {
         super(s, null);  // Disallow initCause
diff --git a/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
index ae2da8c9279..fa754be5474 100644
--- a/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
+++ b/src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ public class MalformedParametersException extends RuntimeException {
     /**
      * Create a {@code MalformedParametersException}.
      *
-     * @param reason The reason for the exception.
+     * @param reason The reason for the exception, may be {@code null}
      */
     public MalformedParametersException(String reason) {
         super(reason);
diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java
index dc512e86590..b811deb863d 100644
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java
@@ -897,7 +897,8 @@ public class Proxy implements java.io.Serializable {
      * of interfaces but in a different order will result in two distinct
      * proxy classes.
      *
-     * @param   loader the class loader to define the proxy class
+     * @param   loader the class loader to define the proxy class, may be
+     *          {@code null} to represent the bootstrap class loader
      * @param   interfaces the list of interfaces for the proxy class
      *          to implement
      * @param   h the invocation handler to dispatch method invocations to
diff --git a/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java b/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
index 0b086330de2..25d8affa474 100644
--- a/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
+++ b/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public class UndeclaredThrowableException extends RuntimeException {
      * specified {@code Throwable}.
      *
      * @param   undeclaredThrowable the undeclared checked exception
-     *          that was thrown
+     *          that was thrown, may be {@code null}
      */
     public UndeclaredThrowableException(Throwable undeclaredThrowable) {
         super(null, undeclaredThrowable);  // Disallow initCause
@@ -72,8 +72,8 @@ public class UndeclaredThrowableException extends RuntimeException {
      * specified {@code Throwable} and a detail message.
      *
      * @param   undeclaredThrowable the undeclared checked exception
-     *          that was thrown
-     * @param   s the detail message
+     *          that was thrown, may be {@code null}
+     * @param   s the detail message, may be {@code null}
      */
     public UndeclaredThrowableException(Throwable undeclaredThrowable,
                                         String s)
diff --git a/test/jdk/java/lang/Class/NullBehaviorTest.java b/test/jdk/java/lang/Class/NullBehaviorTest.java
new file mode 100644
index 00000000000..a38972a8aaf
--- /dev/null
+++ b/test/jdk/java/lang/Class/NullBehaviorTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary Check null argument behaviors for java.lang.Class APIs.
+ * @run junit NullBehaviorTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class NullBehaviorTest {
+    @Test
+    void nullChecks() {
+        assertThrows(NullPointerException.class, () -> Class.forName(null));
+        assertDoesNotThrow(() -> Class.forName("java.lang.Object", false, null));
+        assertThrows(NullPointerException.class, () -> Class.forName(null, false, null));
+        assertThrows(NullPointerException.class, () -> Class.forName(null, "java.lang.Object"));
+        assertThrows(NullPointerException.class, () -> Class.forName(Object.class.getModule(), null));
+        assertThrows(NullPointerException.class, () -> Class.forPrimitiveName(null));
+        assertFalse(Object.class.isInstance(null));
+        assertThrows(NullPointerException.class, () -> Object.class.isAssignableFrom(null));
+        assertThrows(NullPointerException.class, () -> Object.class.getField(null));
+        assertThrows(NullPointerException.class, () -> Object.class.getDeclaredField(null));
+        assertThrows(NullPointerException.class, () -> Object.class.getMethod(null));
+        assertThrows(NullPointerException.class, () -> Object.class.getDeclaredMethod(null));
+        assertDoesNotThrow(() -> Object.class.getMethod("hashCode", (Class<?>[]) null));
+        assertDoesNotThrow(() -> Object.class.getDeclaredMethod("hashCode", (Class<?>[]) null));
+        assertThrows(NoSuchMethodException.class, () -> Object.class.getMethod("hashCode", new Class[]{null}));
+        assertThrows(NoSuchMethodException.class, () -> Object.class.getDeclaredMethod("hashCode", new Class[]{null}));
+        assertDoesNotThrow(() -> Object.class.getConstructor((Class<?>[]) null));
+        assertDoesNotThrow(() -> Object.class.getDeclaredConstructor((Class<?>[]) null));
+        assertThrows(NoSuchMethodException.class, () -> Object.class.getConstructor(new Class[]{null}));
+        assertThrows(NoSuchMethodException.class, () -> Object.class.getDeclaredConstructor(new Class[]{null}));
+        assertThrows(NullPointerException.class, () -> Object.class.getResourceAsStream(null));
+        assertThrows(NullPointerException.class, () -> Object.class.getResource(null));
+        assertDoesNotThrow(() -> Object.class.cast(null));
+        assertThrows(NullPointerException.class, () -> Object.class.asSubclass(null));
+        assertThrows(NullPointerException.class, () -> Object.class.isNestmateOf(null));
+        assertThrows(NullPointerException.class, () -> int.class.isNestmateOf(null));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/AccessFlag/AccessFlagNullCheckTest.java b/test/jdk/java/lang/reflect/AccessFlag/AccessFlagNullCheckTest.java
new file mode 100644
index 00000000000..b847a27df2b
--- /dev/null
+++ b/test/jdk/java/lang/reflect/AccessFlag/AccessFlagNullCheckTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary Null checks for AccessFlag and Location.
+ * @run junit AccessFlagNullCheckTest
+ */
+
+import java.lang.reflect.AccessFlag;
+import java.lang.reflect.ClassFileFormatVersion;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class AccessFlagNullCheckTest {
+    @Test
+    void accessFlagNullChecks() {
+        assertThrows(NullPointerException.class, () -> AccessFlag.valueOf(null));
+        assertThrows(NullPointerException.class, () -> AccessFlag.PUBLIC.locations(null));
+        assertThrows(NullPointerException.class, () -> AccessFlag.maskToAccessFlags(0, null));
+        assertThrows(NullPointerException.class, () -> AccessFlag.maskToAccessFlags(0, AccessFlag.Location.CLASS, null));
+        assertThrows(NullPointerException.class, () -> AccessFlag.maskToAccessFlags(0, null, ClassFileFormatVersion.RELEASE_1));
+    }
+
+    @Test
+    void locationNullChecks() {
+        assertThrows(NullPointerException.class, () -> AccessFlag.Location.valueOf(null));
+        assertThrows(NullPointerException.class, () -> AccessFlag.Location.CLASS.flags(null));
+        assertThrows(NullPointerException.class, () -> AccessFlag.Location.CLASS.flagsMask(null));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/AccessibleObjectNullCheckTest.java b/test/jdk/java/lang/reflect/AccessibleObject/AccessibleObjectNullCheckTest.java
new file mode 100644
index 00000000000..562903b370e
--- /dev/null
+++ b/test/jdk/java/lang/reflect/AccessibleObject/AccessibleObjectNullCheckTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary API null checks for AccessibleObject.
+ * @run junit AccessibleObjectNullCheckTest
+ */
+
+import java.lang.reflect.AccessibleObject;
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class AccessibleObjectNullCheckTest {
+    @Test
+    void nullChecks() throws ReflectiveOperationException {
+        assertThrows(NullPointerException.class, () -> AccessibleObject.setAccessible(null, false));
+        assertThrows(NullPointerException.class, () -> AccessibleObject.setAccessible(new AccessibleObject[]{ null }, false));
+        var accessible = Objects.requireNonNull(Object.class.getMethod("toString"));
+        assertThrows(IllegalArgumentException.class, () -> accessible.canAccess(null));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Array/ArrayArgumentCheckTest.java b/test/jdk/java/lang/reflect/Array/ArrayArgumentCheckTest.java
new file mode 100644
index 00000000000..a08913716e1
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Array/ArrayArgumentCheckTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary General argument checks for Array APIs.
+ * @run junit ArrayArgumentCheckTest
+ */
+
+import java.lang.constant.ConstantDescs;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Array;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class ArrayArgumentCheckTest {
+    @Test
+    void newArrayChecks() throws ReflectiveOperationException {
+        // Single newInstance
+        assertDoesNotThrow(() -> Array.newInstance(Object.class, 0));
+        assertThrows(NullPointerException.class, () -> Array.newInstance(null, 0));
+        assertThrows(NegativeArraySizeException.class, () -> Array.newInstance(Object.class, -1));
+        assertThrows(IllegalArgumentException.class, () -> Array.newInstance(void.class, 0));
+        var object255ArrayType = ConstantDescs.CD_Object.arrayType(255).resolveConstantDesc(MethodHandles.publicLookup());
+        assertThrows(IllegalArgumentException.class, () -> Array.newInstance(object255ArrayType, 0));
+        // Multi-level newInstance
+        assertDoesNotThrow(() -> Array.newInstance(Object.class, 0));
+        assertThrows(NullPointerException.class, () -> Array.newInstance(null, new int[1]));
+        assertThrows(NullPointerException.class, () -> Array.newInstance(Object.class, (int[]) null));
+        assertThrows(NegativeArraySizeException.class, () -> Array.newInstance(Object.class, new int[]{3, -1, 5}));
+        assertThrows(IllegalArgumentException.class, () -> Array.newInstance(Object.class));
+        var object254ArrayType = ConstantDescs.CD_Object.arrayType(254).resolveConstantDesc(MethodHandles.publicLookup());
+        assertThrows(IllegalArgumentException.class, () -> Array.newInstance(object254ArrayType, new int[] {2, 3}));
+    }
+
+    @Test
+    void getLengthChecks() {
+        assertThrows(NullPointerException.class, () -> Array.getLength(null));
+        assertThrows(IllegalArgumentException.class, () -> Array.getLength(5));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/ClassFileFormatVersionTest.java b/test/jdk/java/lang/reflect/ClassFileFormatVersionTest.java
new file mode 100644
index 00000000000..ffd2ed5ffd3
--- /dev/null
+++ b/test/jdk/java/lang/reflect/ClassFileFormatVersionTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary General tests for ClassFileFormatVersion.
+ * @run junit ClassFileFormatVersionTest
+ */
+
+import java.lang.reflect.ClassFileFormatVersion;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class ClassFileFormatVersionTest {
+    @Test
+    void argumentChecks() {
+        assertThrows(NullPointerException.class, () -> ClassFileFormatVersion.valueOf((String) null));
+        assertThrows(NullPointerException.class, () -> ClassFileFormatVersion.valueOf((Runtime.Version) null));
+        assertThrows(IllegalArgumentException.class, () -> ClassFileFormatVersion.valueOf("Absent"));
+        var runtimeVersion = Runtime.Version.parse("99999999");
+        assertThrows(IllegalArgumentException.class, () -> ClassFileFormatVersion.valueOf(runtimeVersion));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/ExceptionClassesNullCheckTest.java b/test/jdk/java/lang/reflect/ExceptionClassesNullCheckTest.java
new file mode 100644
index 00000000000..4b777bacc09
--- /dev/null
+++ b/test/jdk/java/lang/reflect/ExceptionClassesNullCheckTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary Null arguments for exception classes in java.lang.reflect package.
+ * @run junit ExceptionClassesNullCheckTest
+ */
+
+import java.lang.reflect.GenericSignatureFormatError;
+import java.lang.reflect.InaccessibleObjectException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.MalformedParameterizedTypeException;
+import java.lang.reflect.MalformedParametersException;
+import java.lang.reflect.UndeclaredThrowableException;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+class ExceptionClassesNullCheckTest {
+    @Test
+    void argumentChecks() {
+        // Add casts to preserve compilation if they add new constructor overloads
+        assertDoesNotThrow(() -> new GenericSignatureFormatError((String) null));
+        assertDoesNotThrow(() -> new InaccessibleObjectException((String) null));
+        assertDoesNotThrow(() -> new InvocationTargetException((Throwable) null));
+        assertDoesNotThrow(() -> new InvocationTargetException(null, null));
+        assertDoesNotThrow(() -> new MalformedParameterizedTypeException((String) null));
+        assertDoesNotThrow(() -> new MalformedParametersException((String) null));
+        assertDoesNotThrow(() -> new UndeclaredThrowableException((Throwable) null));
+        assertDoesNotThrow(() -> new UndeclaredThrowableException(null, null));
+    }
+}
diff --git a/test/jdk/java/lang/reflect/Proxy/ProxyNullCheckTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyNullCheckTest.java
new file mode 100644
index 00000000000..f60baba3b3b
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyNullCheckTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371953
+ * @summary Basic API null checks for Proxy.
+ * @run junit ProxyNullCheckTest
+ */
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ProxyNullCheckTest {
+    @SuppressWarnings("deprecation")
+    @Test
+    void nullChecks() throws ReflectiveOperationException {
+        InvocationHandler h = (_, _, _) -> null;
+        // newProxyInstance
+        assertDoesNotThrow(() -> Proxy.newProxyInstance(null, new Class[0], h));
+        assertThrows(NullPointerException.class, () -> Proxy.newProxyInstance(null, null, h));
+        assertThrows(NullPointerException.class, () -> Proxy.newProxyInstance(null, new Class[] { null }, h));
+        assertThrows(NullPointerException.class, () -> Proxy.newProxyInstance(null, new Class[0], null));
+        // getProxyClass
+        assertDoesNotThrow(() -> Proxy.getProxyClass(null, new Class[0]));
+        assertThrows(NullPointerException.class, () -> Proxy.getProxyClass(null, (Class[]) null));
+        assertThrows(NullPointerException.class, () -> Proxy.getProxyClass(null, new Class[] { null }));
+        // isProxyClass
+        assertFalse(Proxy.isProxyClass(Object.class));
+        assertThrows(NullPointerException.class, () -> Proxy.isProxyClass(null));
+        // getInvocationHandler
+        assertThrows(NullPointerException.class, () -> Proxy.getInvocationHandler(null));
+        assertThrows(IllegalArgumentException.class, () -> Proxy.getInvocationHandler(42));
+    }
+}

From c2ea75b81f74ff586fdd9c51168e8f4c7a7b2a6a Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Fri, 21 Nov 2025 01:10:35 +0000
Subject: [PATCH 284/512] 8353749: Improve security warning when using JKS or
 JCEKS keystores

Reviewed-by: weijun
---
 .../com/sun/crypto/provider/JceKeyStore.java  |  16 ++
 .../sun/security/provider/JavaKeyStore.java   |  22 ++-
 .../keytool/resources/keytool.properties      |   3 +-
 .../sun/security/tools/jarsigner/Main.java    |  25 +++
 .../jarsigner/resources/jarsigner.properties  |   2 +
 .../compatibility/Compatibility.java          |   3 +
 .../tools/jarsigner/warnings/Test.java        |   7 +
 .../keytool/OutdatedKeyStoreWarning.java      | 176 ++++++++++++++++++
 .../sun/security/tools/keytool/WeakAlg.java   |  86 +++++++--
 9 files changed, 319 insertions(+), 21 deletions(-)
 create mode 100644 test/jdk/sun/security/tools/keytool/OutdatedKeyStoreWarning.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
index ec8e0f3757d..ad98653b9c2 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
@@ -661,6 +661,10 @@ public final class JceKeyStore extends KeyStoreSpi {
                     dos.close();
                 }
             }
+
+            if (debug != null) {
+                emitWeakKeyStoreWarning();
+            }
         }
     }
 
@@ -862,6 +866,10 @@ public final class JceKeyStore extends KeyStoreSpi {
                         secretKeyCount);
                 }
 
+                if (debug != null) {
+                    emitWeakKeyStoreWarning();
+                }
+
                 /*
                  * If a password has been provided, we check the keyed digest
                  * at the end. If this check fails, the store has been tampered
@@ -978,4 +986,12 @@ public final class JceKeyStore extends KeyStoreSpi {
             return Status.UNDECIDED;
         }
     }
+
+    private void emitWeakKeyStoreWarning() {
+        debug.println("WARNING: JCEKS uses outdated cryptographic "
+                + "algorithms and will be removed in a future "
+                + "release. Migrate to PKCS12 using:");
+        debug.println("keytool -importkeystore -srckeystore <keystore> "
+                + "-destkeystore <keystore> -deststoretype pkcs12");
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java b/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
index 3e771c015f4..73ca0c6bf16 100644
--- a/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
+++ b/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -627,6 +627,10 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
 
             dos.write(digest);
             dos.flush();
+
+            if (debug != null) {
+                emitWeakKeyStoreWarning();
+            }
         }
     }
 
@@ -790,6 +794,10 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
                     privateKeyCount + ". trusted key count: " + trustedKeyCount);
             }
 
+            if (debug != null) {
+                emitWeakKeyStoreWarning();
+            }
+
             /*
              * If a password has been provided, we check the keyed digest
              * at the end. If this check fails, the store has been tampered
@@ -838,4 +846,16 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
         }
         return passwdBytes;
     }
+
+    private void emitWeakKeyStoreWarning() {
+        String type = this.getClass().getSimpleName().
+                toUpperCase(Locale.ROOT);
+        if (type.equals("JKS")){
+            debug.println("WARNING: JKS uses outdated cryptographic "
+                    + "algorithms and will be removed in a future "
+                    + "release. Migrate to PKCS12 using:");
+            debug.println("keytool -importkeystore -srckeystore <keystore> "
+                    + "-destkeystore <keystore> -deststoretype pkcs12");
+        }
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties
index fb03573a7d5..751e3af9c9c 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties
@@ -321,7 +321,8 @@ Unable.to.parse.denyAfter.string.in.exception.message=Unable to parse denyAfter
 whose.sigalg.weak=%1$s uses the %2$s signature algorithm which is considered a security risk.
 whose.key.disabled=%1$s uses a %2$s which is considered a security risk and is disabled.
 whose.key.weak=%1$s uses a %2$s which is considered a security risk. It will be disabled in a future update.
-jks.storetype.warning=The %1$s keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+jks.storetype.warning=%1$s uses outdated cryptographic algorithms and will be removed in a future release. Migrate to PKCS12 using:\n\
+keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
 migrate.keystore.warning=Migrated "%1$s" to %4$s. The %2$s keystore is backed up as "%3$s".
 backup.keystore.warning=The original keystore "%1$s" is backed up as "%3$s"...
 importing.keystore.status=Importing keystore %1$s to %2$s...
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index f2c76058434..12967972a88 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -167,6 +167,7 @@ public class Main {
     char[] storepass; // keystore password
     boolean protectedPath; // protected authentication path
     String storetype; // keystore type
+    String realStoreType;
     String providerName; // provider name
     List<String> providers = null; // list of provider names
     List<String> providerClasses = null; // list of provider classes
@@ -240,6 +241,7 @@ public class Main {
     private boolean signerSelfSigned = false;
     private boolean allAliasesFound = true;
     private boolean hasMultipleManifests = false;
+    private boolean weakKeyStore = false;
 
     private Throwable chainNotValidatedReason = null;
     private Throwable tsaChainNotValidatedReason = null;
@@ -1482,6 +1484,12 @@ public class Main {
             warnings.add(rb.getString("external.file.attributes.detected"));
         }
 
+        if (weakKeyStore) {
+            warnings.add(String.format(rb.getString(
+                    "jks.storetype.warning"),
+                    realStoreType, keystore));
+        }
+
         if ((strict) && (!errors.isEmpty())) {
             result = isSigning
                     ? rb.getString("jar.signed.with.signer.errors.")
@@ -2422,6 +2430,23 @@ public class Main {
                             is.close();
                         }
                     }
+
+                    File storeFile = new File(keyStoreName);
+                    if (storeFile.exists()) {
+                        // Probe for real type. A JKS can be loaded as PKCS12 because
+                        // DualFormat support, vice versa.
+                        try {
+                            KeyStore keyStore = KeyStore.getInstance(storeFile, storepass);
+                            realStoreType = keyStore.getType();
+                            if (realStoreType.equalsIgnoreCase("JKS")
+                                    || realStoreType.equalsIgnoreCase("JCEKS")) {
+                                weakKeyStore = true;
+                            }
+                        } catch (KeyStoreException e) {
+                            // Probing not supported, therefore cannot be JKS or JCEKS.
+                            // Skip the legacy type warning at all.
+                        }
+                    }
                 }
                 Enumeration<String> aliases = store.aliases();
                 while (aliases.hasMoreElements()) {
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
index b490d386e59..a16420daf8f 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
@@ -222,3 +222,5 @@ entry.1.is.signed.in.jarinputstream.but.is.not.signed.in.jarfile=Entry %s is sig
 jar.contains.internal.inconsistencies.result.in.different.contents.via.jarfile.and.jarinputstream=This JAR file contains internal inconsistencies that may result in different contents when reading via JarFile and JarInputStream:
 signature.verification.failed.on.entry.1.when.reading.via.jarinputstream=Signature verification failed on entry %s when reading via JarInputStream
 signature.verification.failed.on.entry.1.when.reading.via.jarfile=Signature verification failed on entry %s when reading via JarFile
+jks.storetype.warning=%1$s uses outdated cryptographic algorithms and will be removed in a future release. Migrate to PKCS12 using:\n\
+keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
index 25bb67c230b..92b081b4508 100644
--- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
+++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
@@ -850,6 +850,9 @@ public class Compatibility {
             if (Test.CERTIFICATE_SELF_SIGNED.equals(line)) continue;
             if (Test.HAS_EXPIRED_CERT_VERIFYING_WARNING.equals(line)
                     && signItem.certInfo.expired) continue;
+
+            if (line.contains(Test.OUTDATED_KEYSTORE_WARNING1)) continue;
+            if (line.contains(Test.OUTDATED_KEYSTORE_WARNING2)) continue;
             System.out.println("verifyingStatus: unexpected line: " + line);
             return Status.ERROR; // treat unexpected warnings as error
         }
diff --git a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
index 224fa754eec..97c05d7c2cb 100644
--- a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
+++ b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
@@ -151,6 +151,13 @@ public abstract class Test {
     static final String WEAK_KEY_WARNING
             = "will be disabled in a future update.";
 
+    static final String OUTDATED_KEYSTORE_WARNING1
+            = "uses outdated cryptographic algorithms and will be "
+            + "removed in a future release. Migrate to PKCS12 using:";
+
+    static final String OUTDATED_KEYSTORE_WARNING2
+            = "keytool -importkeystore -srckeystore";
+
     static final String JAR_SIGNED = "jar signed.";
 
     static final String JAR_VERIFIED = "jar verified.";
diff --git a/test/jdk/sun/security/tools/keytool/OutdatedKeyStoreWarning.java b/test/jdk/sun/security/tools/keytool/OutdatedKeyStoreWarning.java
new file mode 100644
index 00000000000..1506b13c51d
--- /dev/null
+++ b/test/jdk/sun/security/tools/keytool/OutdatedKeyStoreWarning.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8353749
+ * @summary Validate that keytool and jarsigner emit warnings for
+ *         JKS and JCEKS keystore with java.security.debug=keystore
+ * @library /test/lib
+ * @modules java.base/sun.security.tools.keytool
+ *          java.base/sun.security.x509
+ * @run main/othervm -Djava.security.debug=keystore OutdatedKeyStoreWarning
+ */
+
+import java.io.FileOutputStream;
+import java.nio.file.Path;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.Locale;
+
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.util.JarUtils;
+
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.x509.X500Name;
+
+public class OutdatedKeyStoreWarning {
+
+    private static final String KS_WARNING1 =
+            "uses outdated cryptographic algorithms and will be removed " +
+            "in a future release. Migrate to PKCS12 using:";
+
+    private static final String KS_WARNING2=
+            "keytool -importkeystore -srckeystore <keystore> " +
+            "-destkeystore <keystore> -deststoretype pkcs12";
+
+    public static void main(String[] args) throws Exception {
+        String[] ksTypes = {"JKS", "JCEKS"};
+
+        for (String type : ksTypes) {
+            String ksFile = type.toLowerCase() + ".ks";
+            String cmdWarning = type + " " + KS_WARNING1;
+
+            checkWarnings(type, () -> {
+                SecurityTools.keytool(String.format(
+                        "-genkeypair -keystore %s -storetype %s -storepass changeit " +
+                        "-keypass changeit -keyalg ec -alias a1 -dname CN=me " +
+                        "-J-Djava.security.debug=keystore",
+                        ksFile, type.toLowerCase()))
+                        .shouldContain("Warning:")
+                        .shouldContain(cmdWarning)
+                        .shouldContain(KS_WARNING2)
+                        .shouldHaveExitValue(0);
+            });
+
+            JarUtils.createJarFile(Path.of("unsigned.jar"), Path.of("."), Path.of(ksFile));
+            checkWarnings(type, () -> {
+                SecurityTools.jarsigner(String.format(
+                        "-keystore %s -storetype %s -storepass changeit -signedjar signed.jar " +
+                        "unsigned.jar a1 " +
+                        "-J-Djava.security.debug=keystore",
+                        ksFile, type.toLowerCase()))
+                        .shouldContain("Warning:")
+                        .shouldContain(cmdWarning)
+                        .shouldContain(KS_WARNING2)
+                        .shouldHaveExitValue(0);
+            });
+
+            checkWarnings(type, () -> {
+                SecurityTools.jarsigner(String.format(
+                        "-verify -keystore %s -storetype %s -storepass changeit signed.jar " +
+                        "-J-Djava.security.debug=keystore",
+                        ksFile, type.toLowerCase()))
+                        .shouldContain("Warning:")
+                        .shouldContain(cmdWarning)
+                        .shouldContain(KS_WARNING2)
+                        .shouldHaveExitValue(0);
+            });
+        }
+
+        for (String type : ksTypes) {
+            checkStoreAPIWarning(type);
+        }
+    }
+
+    private static void checkWarnings(String type, RunnableWithException r) throws Exception {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        PrintStream origErr = System.err;
+        PrintStream origOut = System.out;
+
+        try {
+            PrintStream pStream = new PrintStream(bOut);
+            System.setErr(pStream);
+            System.setOut(pStream);
+            r.run();
+        } finally {
+            System.setErr(origErr);
+            System.setOut(origOut);
+        }
+
+        String msg = bOut.toString();
+        if (!msg.contains("WARNING: " + type.toUpperCase(Locale.ROOT)) ||
+                !msg.contains(KS_WARNING1) ||
+                !msg.contains(KS_WARNING2) ||
+                !msg.contains("Warning:")) {
+            throw new RuntimeException("Expected warning not found for " + type + ":\n" + msg);
+        }
+    }
+
+    // Test case for: KeyStore.getInstance("JKS" or "JCEKS"), load(null, null), and
+    // store it where warning should be emitted.
+    private static void checkStoreAPIWarning(String type) throws Exception {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        PrintStream origErr = System.err;
+        PrintStream origOut = System.out;
+
+        try {
+            PrintStream pStream = new PrintStream(bOut);
+            System.setErr(pStream);
+            System.setOut(pStream);
+
+            KeyStore ks = KeyStore.getInstance(type);
+            ks.load(null, null);
+
+            CertAndKeyGen cag = new CertAndKeyGen("EC", "SHA256withECDSA");
+            cag.generate("secp256r1");
+            X509Certificate cert = cag.getSelfCertificate(new X500Name("CN=one"), 3600);
+            ks.setKeyEntry("dummy", cag.getPrivateKey(), "changeit".toCharArray(),
+                    new Certificate[] {cert});
+
+            try (FileOutputStream fos = new FileOutputStream(type.toLowerCase() +
+                    "_storeAPI.ks")) {
+                ks.store(fos, "changeit".toCharArray());
+            }
+        } finally {
+            System.setErr(origErr);
+            System.setOut(origOut);
+        }
+
+        String msg = bOut.toString();
+        if (!msg.contains("WARNING: " + type.toUpperCase(Locale.ROOT)) ||
+                !msg.contains(KS_WARNING1) ||
+                !msg.contains(KS_WARNING2)) {
+            throw new RuntimeException("Expected warning not found for KeyStore.store() API (" +
+                    type + "):\n" + msg);
+        }
+    }
+
+    @FunctionalInterface
+    interface RunnableWithException {
+        void run() throws Exception;
+    }
+}
diff --git a/test/jdk/sun/security/tools/keytool/WeakAlg.java b/test/jdk/sun/security/tools/keytool/WeakAlg.java
index 13c610cd55f..de2435a4f4b 100644
--- a/test/jdk/sun/security/tools/keytool/WeakAlg.java
+++ b/test/jdk/sun/security/tools/keytool/WeakAlg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8171319 8177569 8182879 8172404
+ * @bug 8171319 8177569 8182879 8172404 8353749
  * @summary keytool should print out warnings when reading or generating
   *         cert/cert req using weak algorithms
  * @library /test/lib
@@ -226,7 +226,8 @@ public class WeakAlg {
 
         // No warning for cacerts, all certs
         kt0("-cacerts -list -storepass changeit")
-                .shouldNotContain("proprietary format");
+                .shouldNotContain("outdated cryptographic algorithms")
+                .shouldNotContain("keytool -importkeystore -srckeystore");
 
         rm("ks");
         rm("ks2");
@@ -242,7 +243,10 @@ public class WeakAlg {
 
         // warn if migrating to JKS
         importkeystore("ks", "ks2", "-deststoretype jks")
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
 
         rm("ks");
         rm("ks2");
@@ -252,17 +256,35 @@ public class WeakAlg {
         kt("-importcert -alias b -file a.crt -storetype jks -noprompt")
                 .shouldNotContain("Warning:");
         kt("-genkeypair -keyalg DSA -alias a -dname CN=A")
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-list")
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-list -storetype pkcs12") // warn if JKS used as PKCS12
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-exportcert -alias a -file a.crt")
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-printcert -file a.crt") // warning since -keystore option is supported
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-certreq -alias a -file a.req")
-                .shouldContain("JKS keystore uses a proprietary format");
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-printcertreq -file a.req") // no warning if keystore not touched
                 .shouldNotContain("Warning:");
 
@@ -276,21 +298,42 @@ public class WeakAlg {
         rm("ks");
 
         kt("-genkeypair -keyalg DSA -alias a -dname CN=A -storetype jceks")
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-list")
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-importcert -alias b -file a.crt -noprompt")
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-exportcert -alias a -file a.crt")
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-printcert -file a.crt") // warning since -keystore option is supported
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-certreq -alias a -file a.req")
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
         kt("-printcertreq -file a.req")
                 .shouldNotContain("Warning:");
         kt("-genseckey -alias c -keyalg AES -keysize 128")
-                .shouldContain("JCEKS keystore uses a proprietary format");
+                .shouldContain("JCEKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12");
     }
 
     static void checkImportKeyStore() throws Exception {
@@ -336,7 +379,10 @@ public class WeakAlg {
         // Migration
         importkeystore("ks", "ks", "-deststoretype jks")
                 .shouldContain("Warning:")
-                .shouldContain("JKS keystore uses a proprietary format")
+                .shouldContain("JKS uses outdated cryptographic algorithms" +
+                        " and will be removed")
+                .shouldMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12")
                 .shouldMatch("Migrated.*JKS.*PKCS12.*ks.old5");
 
         Asserts.assertEQ(
@@ -346,7 +392,9 @@ public class WeakAlg {
 
         importkeystore("ks", "ks", "-srcstoretype PKCS12")
                 .shouldContain("Warning:")
-                .shouldNotContain("proprietary format")
+                .shouldNotContain("outdated cryptographic algorithms")
+                .shouldNotMatch("keytool -importkeystore -srckeystore." +
+                        "*-destkeystore.*-deststoretype pkcs12")
                 .shouldMatch("Migrated.*PKCS12.*JKS.*ks.old6");
 
         Asserts.assertEQ(

From df24b901768599ac7111655b87dfeedbe0e66f9d Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 21 Nov 2025 02:48:20 +0000
Subject: [PATCH 285/512] 8360571: Description of launchers is lost in two
 phase packaging

Reviewed-by: almatvee
---
 .../jdk/jpackage/internal/AppImageFile.java   |  2 +
 .../jpackage/internal/OptionsTransformer.java | 15 +----
 .../cli/StandardAppImageFileOption.java       |  8 +++
 .../jdk/jpackage/test/AppImageFile.java       | 22 ++++--
 .../jdk/jpackage/test/LauncherVerifier.java   |  2 +-
 .../jpackage/internal/AppImageFileTest.java   | 67 ++++++++++++++++---
 6 files changed, 89 insertions(+), 27 deletions(-)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
index ec8c9a31173..b6b4322302e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
@@ -29,6 +29,7 @@ import static java.util.stream.Collectors.toUnmodifiableMap;
 import static java.util.stream.Collectors.toUnmodifiableSet;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.APP_VERSION;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_AS_SERVICE;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.DESCRIPTION;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_NAME;
 import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 
@@ -322,6 +323,7 @@ final class AppImageFile {
             if (launcher.isService()) {
                 standardProps.add(Map.entry(LAUNCHER_AS_SERVICE.getName(), Boolean.TRUE.toString()));
             }
+            standardProps.add(Map.entry(DESCRIPTION.getName(), launcher.description()));
 
             return Stream.concat(
                     standardProps.stream(),
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
index b146e5a7f8d..a01be089a49 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
@@ -26,7 +26,6 @@ package jdk.jpackage.internal;
 
 import static jdk.jpackage.internal.cli.StandardOption.ADDITIONAL_LAUNCHERS;
 import static jdk.jpackage.internal.cli.StandardOption.APP_VERSION;
-import static jdk.jpackage.internal.cli.StandardOption.DESCRIPTION;
 import static jdk.jpackage.internal.cli.StandardOption.ICON;
 import static jdk.jpackage.internal.cli.StandardOption.NAME;
 import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
@@ -60,18 +59,8 @@ record OptionsTransformer(Options mainOptions, Optional<ExternalApplication> ext
                                 NAME, li.name(),
                                 // This should prevent the code building the Launcher instance
                                 // from the Options object from trying to create a startup info object.
-                                PREDEFINED_APP_IMAGE, PREDEFINED_APP_IMAGE.getFrom(mainOptions),
-                                //
-                                // For backward compatibility, descriptions of the additional
-                                // launchers in the predefined app image will be set to
-                                // the application description, if available, or to the name
-                                // of the main launcher in the predefined app image.
-                                //
-                                // All launchers in the predefined app image will have the same description.
-                                // This is wrong and should be revised.
-                                //
-                                DESCRIPTION, DESCRIPTION.findIn(mainOptions).orElseGet(ea::appName)
-                            )));
+                                PREDEFINED_APP_IMAGE, PREDEFINED_APP_IMAGE.getFrom(mainOptions)
+                        )));
                     }).toList()
             );
             return Options.concat(
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
index 95d49e722d6..330a650e513 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
@@ -99,6 +99,14 @@ public final class StandardAppImageFileOption {
             .inScope(AppImageFileOptionScope.LAUNCHER)
             .toOptionValueBuilder().id(StandardOption.LAUNCHER_AS_SERVICE.id()).create();
 
+    /**
+     * The description of a launcher.
+     */
+    public static final OptionValue<String> DESCRIPTION = stringOption("description")
+            .inScope(AppImageFileOptionScope.LAUNCHER)
+            .inScope(MandatoryOption.VALUE)
+            .toOptionValueBuilder().id(StandardOption.DESCRIPTION.id()).create();
+
 
     //
     // Linux-specific
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
index 0e4ca785c96..967fd8cb653 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
@@ -23,9 +23,9 @@
 package jdk.jpackage.test;
 
 import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -37,6 +37,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
@@ -75,8 +77,8 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
     public Map<String, Map<String, String>> addLaunchers() {
         var map = launchers.entrySet().stream().filter(e -> {
             return !e.getKey().equals(mainLauncherName);
-        }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue, (k, _) -> {
-            throw new IllegalStateException(String.format("Duplicate key %s", k));
+        }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue, (v, _) -> {
+            throw new IllegalStateException(String.format("Duplicate value [%s]", v));
         }, LinkedHashMap::new));
         return Collections.unmodifiableMap(map);
     }
@@ -93,6 +95,7 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
 
             xml.writeStartElement("main-launcher");
             xml.writeAttribute("name", mainLauncherName);
+            writeLauncherDescription(xml, mainLauncherName);
             xml.writeEndElement();
 
             mainLauncherClassName.ifPresent(toConsumer(v -> {
@@ -113,6 +116,9 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
                 xml.writeStartElement("add-launcher");
                 xml.writeAttribute("name", al);
                 var props = launchers.get(al);
+                if (!props.containsKey("description")) {
+                    writeLauncherDescription(xml, al);
+                }
                 for (var prop : props.keySet().stream().sorted().toList()) {
                     xml.writeStartElement(prop);
                     xml.writeCharacters(props.get(prop));
@@ -158,8 +164,8 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
             }, launcherProps -> {
                 launcherProps.remove("name");
                 return Collections.unmodifiableMap(launcherProps);
-            }, (k, _) -> {
-                throw new IllegalStateException(String.format("Duplicate key %s", k));
+            }, (v, _) -> {
+                throw new IllegalStateException(String.format("Duplicate value [%s]", v));
             }, LinkedHashMap::new));
 
             return new AppImageFile(
@@ -173,6 +179,12 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
         }).get();
     }
 
+    private static void writeLauncherDescription(XMLStreamWriter xml, String description) throws XMLStreamException {
+        xml.writeStartElement("description");
+        xml.writeCharacters(Objects.requireNonNull(description));
+        xml.writeEndElement();
+    }
+
     private static HashMap<String, String> readLauncherProperties(XPath xPath, Element launcherElement) throws XPathExpressionException {
         HashMap<String, String> launcherProps = new HashMap<>();
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
index da5b8583c72..bae038d071c 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
@@ -444,7 +444,7 @@ public final class LauncherVerifier {
         return PropertyFinder.findLauncherProperty(cmd, launcherName,
                 PropertyFinder.cmdlineOptionWithValue("--description"),
                 PropertyFinder.launcherPropertyFile("description"),
-                PropertyFinder.nop()
+                PropertyFinder.appImageFileLauncher(cmd, launcherName, "description")
         ).orElseGet(() -> {
             if (cmd.isMainLauncher(launcherName)) {
                 return cmd.mainLauncherName();
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
index c22309922d7..375c6aa637a 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
@@ -24,6 +24,7 @@
 package jdk.jpackage.internal;
 
 import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.cli.StandardAppImageFileOption.DESCRIPTION;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_AS_SERVICE;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_NAME;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LINUX_LAUNCHER_SHORTCUT;
@@ -258,6 +259,11 @@ public class AppImageFileTest {
                 return this;
             }
 
+            LauncherBuilder description(String v) {
+                description = v;
+                return this;
+            }
+
             LauncherBuilder addExtra(Map<String, String> v) {
                 extra.add(v);
                 return this;
@@ -281,7 +287,7 @@ public class AppImageFileTest {
                         Optional.empty(),
                         List.of(),
                         service,
-                        null,
+                        description(),
                         Optional.empty(),
                         null,
                         extra.asStringValues());
@@ -295,6 +301,10 @@ public class AppImageFileTest {
                 }
             }
 
+            private String description() {
+                return Optional.ofNullable(description).orElseGet(this::name);
+            }
+
             private boolean isMainLauncher() {
                 return name.isEmpty();
             }
@@ -305,11 +315,13 @@ public class AppImageFileTest {
                     allProps.add(LAUNCHER_AS_SERVICE, Boolean.valueOf(service));
                 }
                 allProps.add(LAUNCHER_NAME, name());
+                allProps.add(DESCRIPTION, description());
                 return LauncherInfo.create(allProps.asObjectValues());
             }
 
             private final Optional<String> name;
             private boolean service;
+            private String description;
             private final ExtraPropertyBuilder extra = new ExtraPropertyBuilder();
         }
 
@@ -435,9 +447,29 @@ public class AppImageFileTest {
                 createWithHeader(AppImageFile.getPlatform(os), AppImageFile.getVersion(), () -> {
                     // Missing 'app-version' element.
                     return List.of(
-                            "<main-launcher name='D'/>",
+                            "<main-launcher name='D'>",
+                            "  <description>Foo</description>",
+                            "</main-launcher>",
                             "<main-class>Hello</main-class>"
                     );
+                }),
+                createWithHeader(AppImageFile.getPlatform(os), AppImageFile.getVersion(), () -> {
+                    // Missing 'description' element in the main launcher.
+                    return List.of(
+                            "<app-version>321</app-version>",
+                            "<main-launcher name='B'/>"
+                    );
+                }),
+                createWithHeader(AppImageFile.getPlatform(os), AppImageFile.getVersion(), () -> {
+                    // Missing 'description' element in the additional launcher.
+                    return List.of(
+                            "<app-version>123</app-version>",
+                            "<main-launcher name='B'>",
+                            "  <description>Foo</description>",
+                            "</main-launcher>",
+                            "<main-class>Hello</main-class>",
+                            "<add-launcher name='C'/>"
+                    );
                 })
         ));
 
@@ -451,7 +483,9 @@ public class AppImageFileTest {
     private static List<String> createValidBodyWithHeader(String platform, String version) {
         return createWithHeader(platform, version, () -> {
             return List.of(
-                    "<main-launcher name='D'/>",
+                    "<main-launcher name='D'>",
+                    "  <description>Blah-Blah-Blah</description>",
+                    "</main-launcher>",
                     "<app-version>100</app-version>",
                     "<main-class>Hello</main-class>"
             );
@@ -483,16 +517,24 @@ public class AppImageFileTest {
                 "<signed>true</signed>",
                 "<app-store>False</app-store>",
                 "<add-launcher name='add-launcher'>",
+                "  <description>Quick brown fox</description>",
                 "  <service>true</service>",
                 "  <linux-shortcut>true</linux-shortcut>",
                 "  <win-shortcut>false</win-shortcut>",
                 "  <win-menu>app-dir</win-menu>",
                 "</add-launcher>",
-                "<main-launcher name='Bar'/>"
+                "<main-launcher name='Bar'>",
+                "  <description>Bar launcher description</description>",
+                "</main-launcher>"
         );
 
         Supplier<AppBuilder.LauncherBuilder> appBuilder = () -> {
-            return build().mainClass("Foo").version("1.34").appName("Bar").addlauncher("add-launcher").service(true);
+            return build()
+                    .mainClass("Foo")
+                    .version("1.34")
+                    .appName("Bar")
+                    .mainlauncher().description("Bar launcher description").commit()
+                    .addlauncher("add-launcher").service(true).description("Quick brown fox");
         };
 
         List<ReadTestSpec> testCases = new ArrayList<>();
@@ -513,19 +555,24 @@ public class AppImageFileTest {
     private static Stream<ReadTestSpec> testValidXml() {
         return Stream.concat(platformSpecificProperties().stream(), Stream.of(
                 ReadTestSpec.build().expect(
-                        build().version("72").appName("Y").mainClass("main.Class")
+                        build().version("72").mainlauncher().description("Blah-Blah-Blah").commit().appName("Y").mainClass("main.Class")
                 ).xml(
-                        "<main-launcher name='Y'/>",
+                        "<main-launcher name='Y'>",
+                        "  <description>Blah-Blah-Blah</description>",
+                        "</main-launcher>",
                         "<app-version>72</app-version>",
                         "<main-class>main.Class</main-class>"
                 ),
                 ReadTestSpec.build().os(OperatingSystem.LINUX).expect(
                         build()
+                        .mainlauncher().description("Main launcher description").commit()
                         .addlauncher("another-launcher")
                                 .addExtra(LINUX_LAUNCHER_SHORTCUT, new LauncherShortcut(LauncherShortcutStartupDirectory.APP_DIR))
+                                .description("another-launcher description")
                                 .commit()
                         .addlauncher("service-launcher")
                                 .service(true)
+                                .description("service-launcher description")
                                 .commit()
                 ).xml(
                         "<app-version>1.2</app-version>",
@@ -536,13 +583,17 @@ public class AppImageFileTest {
                         "<signed>true</signed>",
                         "<add-launcher name='service-launcher' service='true'>",
                         "  <linux-shortcut><nested>foo</nested></linux-shortcut>",
+                        "  <description>service-launcher description</description>",
                         "</add-launcher>",
                         "<add-launcher name='another-launcher'>",
                         "  <linux-shortcut>true</linux-shortcut>",
                         "  <linux-shortcut>app-<!-- This is a comment -->dir</linux-shortcut>",
+                        "  <description>another-launcher description</description>",
                         "</add-launcher>",
                         "<main-launcher name='Bar'/>",
-                        "<main-launcher name='Foo'/>"
+                        "<main-launcher name='Foo'>",
+                        "  <description>Main launcher description</description>",
+                        "</main-launcher>"
                 )
         ).map(ReadTestSpec.Builder::create));
     }

From 5922c3cbac43795275422f2484082d1e725e4bcc Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Fri, 21 Nov 2025 08:21:20 +0000
Subject: [PATCH 286/512] 8371990: Remove two second delayed OOME after GC
 shutdown

Reviewed-by: kbarrett, tschatzl, ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 18 +++------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  3 ++
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  2 +-
 src/hotspot/share/gc/g1/g1Policy.cpp          |  7 ----
 src/hotspot/share/gc/g1/g1RemSet.cpp          | 10 +----
 .../gc/parallel/parallelScavengeHeap.cpp      |  5 ---
 src/hotspot/share/gc/serial/serialHeap.cpp    |  5 ---
 src/hotspot/share/gc/shared/collectedHeap.cpp | 37 ++++++-------------
 src/hotspot/share/gc/shared/collectedHeap.hpp | 14 +++----
 .../share/gc/shared/gcVMOperations.cpp        | 25 ++++++++++++-
 .../share/gc/shared/gcVMOperations.hpp        | 28 +++++++++-----
 src/hotspot/share/memory/universe.cpp         | 16 ++++----
 src/hotspot/share/memory/universe.hpp         |  5 ---
 src/hotspot/share/services/cpuTimeUsage.cpp   |  1 -
 14 files changed, 78 insertions(+), 98 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index d18f61ff507..5567d84bee4 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -478,11 +478,6 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(uint node_index, size_t word_
     log_trace(gc, alloc)("%s: Unsuccessfully scheduled collection allocating %zu words",
                          Thread::current()->name(), word_size);
 
-    if (is_shutting_down()) {
-      stall_for_vm_shutdown();
-      return nullptr;
-    }
-
     // Has the gc overhead limit been reached in the meantime? If so, this mutator
     // should receive null even when unsuccessfully scheduling a collection as well
     // for global consistency.
@@ -738,11 +733,6 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size) {
     log_trace(gc, alloc)("%s: Unsuccessfully scheduled collection allocating %zu",
                          Thread::current()->name(), word_size);
 
-    if (is_shutting_down()) {
-      stall_for_vm_shutdown();
-      return nullptr;
-    }
-
     // Has the gc overhead limit been reached in the meantime? If so, this mutator
     // should receive null even when unsuccessfully scheduling a collection as well
     // for global consistency.
@@ -1645,6 +1635,10 @@ jint G1CollectedHeap::initialize() {
   return JNI_OK;
 }
 
+bool G1CollectedHeap::concurrent_mark_is_terminating() const {
+  return _cm_thread->should_terminate();
+}
+
 void G1CollectedHeap::stop() {
   // Stop all concurrent threads. We do this to make sure these threads
   // do not continue to execute and access resources (e.g. logging)
@@ -1965,8 +1959,8 @@ bool G1CollectedHeap::try_collect_concurrently(size_t allocation_word_size,
     }
 
     // If VMOp skipped initiating concurrent marking cycle because
-    // we're terminating, then we're done.
-    if (is_shutting_down()) {
+    // we're shutting down, then we're done.
+    if (op.is_shutting_down()) {
       LOG_COLLECT_CONCURRENTLY(cause, "skipped: terminating");
       return false;
     }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 5dccf41e909..aff7166d391 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -917,6 +917,9 @@ public:
   // specified by the policy object.
   jint initialize() override;
 
+  // Returns whether concurrent mark threads (and the VM) are about to terminate.
+  bool concurrent_mark_is_terminating() const;
+
   void safepoint_synchronize_begin() override;
   void safepoint_synchronize_end() override;
 
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index d37fe9ea7ba..456d543fa10 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1883,7 +1883,7 @@ bool G1ConcurrentMark::concurrent_cycle_abort() {
   // nothing, but this situation should be extremely rare (a full gc after shutdown
   // has been signalled is already rare), and this work should be negligible compared
   // to actual full gc work.
-  if (!cm_thread()->in_progress() && !_g1h->is_shutting_down()) {
+  if (!cm_thread()->in_progress() && !_g1h->concurrent_mark_is_terminating()) {
     return false;
   }
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 19573e11cd7..828782d21eb 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -669,7 +669,6 @@ bool G1Policy::should_retain_evac_failed_region(uint index) const {
 }
 
 void G1Policy::record_pause_start_time() {
-  assert(!_g1h->is_shutting_down(), "Invariant!");
   Ticks now = Ticks::now();
   _cur_pause_start_sec = now.seconds();
 
@@ -1280,12 +1279,6 @@ void G1Policy::decide_on_concurrent_start_pause() {
   // concurrent start pause).
   assert(!collector_state()->in_concurrent_start_gc(), "pre-condition");
 
-  // We should not be starting a concurrent start pause if the concurrent mark
-  // thread is terminating.
-  if (_g1h->is_shutting_down()) {
-    return;
-  }
-
   if (collector_state()->initiate_conc_mark_if_possible()) {
     // We had noticed on a previous pause that the heap occupancy has
     // gone over the initiating threshold and we should start a
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index f0bacefd71c..cb3afb80eea 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1018,14 +1018,8 @@ class G1MergeHeapRootsTask : public WorkerTask {
       // the pause occurs during the Concurrent Cleanup for Next Mark phase.
       // Only at that point the region's bitmap may contain marks while being in the collection
       // set at the same time.
-      //
-      // There is one exception: shutdown might have aborted the Concurrent Cleanup for Next
-      // Mark phase midway, which might have also left stale marks in old generation regions.
-      // There might actually have been scheduled multiple collections, but at that point we do
-      // not care that much about performance and just do the work multiple times if needed.
-      return (_g1h->collector_state()->clear_bitmap_in_progress() ||
-              _g1h->is_shutting_down()) &&
-              hr->is_old();
+      return _g1h->collector_state()->clear_bitmap_in_progress() &&
+             hr->is_old();
     }
 
   public:
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 747e2f3228c..3a13d0d0535 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -344,11 +344,6 @@ HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size, bool is_tlab) {
         assert(is_in_or_null(op.result()), "result not in heap");
         return op.result();
       }
-
-      if (is_shutting_down()) {
-        stall_for_vm_shutdown();
-        return nullptr;
-      }
     }
 
     // Was the gc-overhead reached inside the safepoint? If so, this mutator
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 00d74e691eb..03ad1282f5f 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -337,11 +337,6 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size, bool is_tlab) {
       break;
     }
 
-    if (is_shutting_down()) {
-      stall_for_vm_shutdown();
-      return nullptr;
-    }
-
     // Give a warning if we seem to be looping forever.
     if ((QueuedAllocationWarningCount > 0) &&
         (try_count % QueuedAllocationWarningCount == 0)) {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index c8dd39e72be..4207f83e0a4 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -62,6 +62,8 @@
 
 class ClassLoaderData;
 
+bool CollectedHeap::_is_shutting_down = false;
+
 size_t CollectedHeap::_lab_alignment_reserve = SIZE_MAX;
 Klass* CollectedHeap::_filler_object_klass = nullptr;
 size_t CollectedHeap::_filler_array_max_size = 0;
@@ -386,11 +388,6 @@ MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loa
       return op.result();
     }
 
-    if (is_shutting_down()) {
-      stall_for_vm_shutdown();
-      return nullptr;
-    }
-
     loop_count++;
     if ((QueuedAllocationWarningCount > 0) &&
         (loop_count % QueuedAllocationWarningCount == 0)) {
@@ -605,30 +602,20 @@ void CollectedHeap::post_initialize() {
   initialize_serviceability();
 }
 
-bool CollectedHeap::is_shutting_down() const {
-  return Universe::is_shutting_down();
+bool CollectedHeap::is_shutting_down() {
+  assert(Heap_lock->owned_by_self(), "Protected by this lock");
+  return _is_shutting_down;
 }
 
-void CollectedHeap::stall_for_vm_shutdown() {
-  assert(is_shutting_down(), "Precondition");
-  // Stall the thread (2 seconds) instead of an indefinite wait to avoid deadlock
-  // if the VM shutdown triggers a GC.
-  // The 2-seconds sleep is:
-  //   - long enough to keep daemon threads stalled, while the shutdown
-  //     sequence completes in the common case.
-  //   - short enough to avoid excessive stall time if the shutdown itself
-  //     triggers a GC.
-  JavaThread::current()->sleep(2 * MILLIUNITS);
+void CollectedHeap::initiate_shutdown() {
+  {
+    // Acquire the Heap_lock to synchronize with VM_Heap_Sync_Operations,
+    // which may depend on the value of _is_shutting_down flag.
+    MutexLocker hl(Heap_lock);
+    _is_shutting_down = true;
+  }
 
-  ResourceMark rm;
-  log_warning(gc, alloc)("%s: Stall for VM-Shutdown timed out; allocation may fail with OOME", Thread::current()->name());
-}
-
-void CollectedHeap::before_exit() {
   print_tracing_info();
-
-  // Stop any on-going concurrent work and prepare for exit.
-  stop();
 }
 
 size_t CollectedHeap::bootstrap_max_memory() const {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 6be0057480d..6f335b1cdf4 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -96,6 +96,8 @@ class CollectedHeap : public CHeapObj<mtGC> {
   friend class MemAllocator;
 
  private:
+  static bool _is_shutting_down;
+
   GCHeapLog*      _heap_log;
   GCMetaspaceLog* _metaspace_log;
 
@@ -209,11 +211,10 @@ protected:
   // Default implementation does nothing.
   virtual void print_tracing_info() const = 0;
 
+ public:
   // Stop any onging concurrent work and prepare for exit.
   virtual void stop() = 0;
 
- public:
-
   static inline size_t filler_array_max_size() {
     return _filler_array_max_size;
   }
@@ -245,14 +246,9 @@ protected:
   // This is the correct place to place such initialization methods.
   virtual void post_initialize();
 
-  bool is_shutting_down() const;
+  static bool is_shutting_down();
 
-  // If the VM is shutting down, we may have skipped VM_CollectForAllocation.
-  // In this case, stall the allocation request briefly in the hope that
-  // the VM shutdown completes before the allocation request returns.
-  void stall_for_vm_shutdown();
-
-  void before_exit();
+  void initiate_shutdown();
 
   // Stop and resume concurrent GC threads interfering with safepoint operations
   virtual void safepoint_synchronize_begin() {}
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp
index 36aa0c9843d..3f5e9bd4f6b 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp
@@ -92,6 +92,22 @@ static bool should_use_gclocker() {
   return UseSerialGC || UseParallelGC;
 }
 
+static void block_if_java_thread() {
+  Thread* thread = Thread::current();
+  if (thread->is_Java_thread()) {
+    // Block here and allow the shutdown to complete
+    while (true) {
+      // The call to wait has a few important effects:
+      // 1) Block forever (minus spurious wake-ups, hence the loop)
+      // 2) Release the Heap_lock, which is taken by the shutdown code
+      // 3) Transition to blocked state so that the final VM_Exit operation can be scheduled
+      Heap_lock->wait();
+    }
+  } else {
+    assert(thread->is_ConcurrentGC_thread(), "Unexpected thread type");
+  }
+}
+
 bool VM_GC_Operation::doit_prologue() {
   assert(_gc_cause != GCCause::_no_gc, "Illegal GCCause");
 
@@ -110,8 +126,15 @@ bool VM_GC_Operation::doit_prologue() {
   }
   VM_Heap_Sync_Operation::doit_prologue();
 
+  _is_shutting_down = CollectedHeap::is_shutting_down();
+  if (_is_shutting_down) {
+    // Block forever if a Java thread is triggering a GC after
+    // the GC has started to shut down.
+    block_if_java_thread();
+  }
+
   // Check invocations
-  if (skip_operation() || Universe::is_shutting_down()) {
+  if (skip_operation() || _is_shutting_down) {
     // skip collection
     Heap_lock->unlock();
     if (should_use_gclocker()) {
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index 5048bc3c1ed..321ad8e435f 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -110,23 +110,23 @@ class VM_GC_Operation: public VM_Heap_Sync_Operation {
   uint           _full_gc_count_before;    // full gc count before acquiring the Heap_lock
   bool           _full;                    // whether a "full" collection
   bool           _prologue_succeeded;      // whether doit_prologue succeeded
+  bool           _is_shutting_down;        // whether the operation found that the GC is shutting down
   GCCause::Cause _gc_cause;                // the putative cause for this gc op
 
   virtual bool skip_operation() const;
 
  public:
   VM_GC_Operation(uint gc_count_before,
-                  GCCause::Cause _cause,
+                  GCCause::Cause cause,
                   uint full_gc_count_before,
-                  bool full) : VM_Heap_Sync_Operation() {
-    _full = full;
-    _prologue_succeeded = false;
-    _gc_count_before    = gc_count_before;
-
-    _gc_cause           = _cause;
-
-    _full_gc_count_before = full_gc_count_before;
-  }
+                  bool full)
+    : VM_Heap_Sync_Operation(),
+      _gc_count_before(gc_count_before),
+      _full_gc_count_before(full_gc_count_before),
+      _full(full),
+      _prologue_succeeded(false),
+      _is_shutting_down(false),
+      _gc_cause(cause) {}
 
   virtual const char* cause() const;
 
@@ -139,6 +139,14 @@ class VM_GC_Operation: public VM_Heap_Sync_Operation {
   virtual bool allow_nested_vm_operations() const  { return true; }
   virtual bool gc_succeeded() const { return _prologue_succeeded; }
 
+  // This function returns the value of CollectedHeap::is_shutting_down() that
+  // was recorded in the prologue. Unlike CollectedHeap::is_shutting_down(),
+  // this function can be called without acquiring the Heap_lock.
+  //
+  // This function exists so that code that tries to schedule a GC operation
+  // can check if it was refused because the JVM is about to shut down.
+  bool is_shutting_down() const { return _is_shutting_down; }
+
   static void notify_gc_begin(bool full = false);
   static void notify_gc_end();
 };
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index d389fe81806..4d2897be5eb 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -182,7 +182,6 @@ int             Universe::_base_vtable_size = 0;
 bool            Universe::_bootstrapping = false;
 bool            Universe::_module_initialized = false;
 bool            Universe::_fully_initialized = false;
-volatile bool   Universe::_is_shutting_down = false;
 
 OopStorage*     Universe::_vm_weak = nullptr;
 OopStorage*     Universe::_vm_global = nullptr;
@@ -1374,15 +1373,14 @@ static void log_cpu_time() {
 }
 
 void Universe::before_exit() {
-  {
-    // Acquire the Heap_lock to synchronize with VM_Heap_Sync_Operations,
-    // which may depend on the value of _is_shutting_down flag.
-    MutexLocker hl(Heap_lock);
-    log_cpu_time();
-    AtomicAccess::release_store(&_is_shutting_down, true);
-  }
+  // Tell the GC that it is time to shutdown and to block requests for new GC pauses.
+  heap()->initiate_shutdown();
 
-  heap()->before_exit();
+  // Log CPU time statistics before stopping the GC threads.
+  log_cpu_time();
+
+  // Stop the GC threads.
+  heap()->stop();
 
   // Print GC/heap related information.
   Log(gc, exit) log;
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index df2c1d66d3c..b2325c67ca0 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -128,9 +128,6 @@ class Universe: AllStatic {
   static bool _module_initialized;                    // true after call_initPhase2 called
   static bool _fully_initialized;                     // true after universe_init and initialize_vtables called
 
-  // Shutdown
-  static volatile bool _is_shutting_down;
-
   // the array of preallocated errors with backtraces
   static objArrayOop  preallocated_out_of_memory_errors();
 
@@ -328,8 +325,6 @@ class Universe: AllStatic {
   static bool is_module_initialized()                 { return _module_initialized; }
   static bool is_fully_initialized()                  { return _fully_initialized; }
 
-  static bool is_shutting_down()                  { return  AtomicAccess::load_acquire(&_is_shutting_down); }
-
   static bool        on_page_boundary(void* addr);
   static bool        should_fill_in_stack_trace(Handle throwable);
   static void check_alignment(uintx size, uintx alignment, const char* name);
diff --git a/src/hotspot/share/services/cpuTimeUsage.cpp b/src/hotspot/share/services/cpuTimeUsage.cpp
index 0c7ecfdb655..27b5e90fbaf 100644
--- a/src/hotspot/share/services/cpuTimeUsage.cpp
+++ b/src/hotspot/share/services/cpuTimeUsage.cpp
@@ -36,7 +36,6 @@
 volatile bool CPUTimeUsage::Error::_has_error = false;
 
 static inline jlong thread_cpu_time_or_zero(Thread* thread) {
-  assert(!Universe::is_shutting_down(), "Should not query during shutdown");
   jlong cpu_time = os::thread_cpu_time(thread);
   if (cpu_time == -1) {
     CPUTimeUsage::Error::mark_error();

From eeb7c3f2e8e645938d9db0cf61c1d98d751f2845 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 21 Nov 2025 09:23:58 +0000
Subject: [PATCH 287/512] 8371895: Lower GCTimeLimit in
 TestUseGCOverheadLimit.java

Reviewed-by: ayang, iwalulya, shade
---
 test/hotspot/jtreg/gc/TestUseGCOverheadLimit.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/gc/TestUseGCOverheadLimit.java b/test/hotspot/jtreg/gc/TestUseGCOverheadLimit.java
index bc4c6bd6278..dcc501c7710 100644
--- a/test/hotspot/jtreg/gc/TestUseGCOverheadLimit.java
+++ b/test/hotspot/jtreg/gc/TestUseGCOverheadLimit.java
@@ -67,7 +67,7 @@ public class TestUseGCOverheadLimit {
       "-XX:ParallelGCThreads=1",      // Make GCs take longer.
       "-XX:+UseGCOverheadLimit",
       "-Xlog:gc=debug",
-      "-XX:GCTimeLimit=90",           // Ease the CPU requirement a little.
+      "-XX:GCTimeLimit=80",           // Ease the CPU requirement.
       "-Xmx128m",
       Allocating.class.getName()
     };

From 88ec4e615a3008408184b7ed92010adc75d63853 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 21 Nov 2025 09:39:51 +0000
Subject: [PATCH 288/512] 8372154: AArch64: Match rule failure with some
 CompareAndSwap operand shapes

Reviewed-by: aph, adinn
---
 src/hotspot/cpu/aarch64/aarch64.ad | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index e8f9733fe7e..3a64c767864 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -3388,28 +3388,28 @@ encode %{
   // aarch64_enc_cmpxchg_acq is that we use load-acquire in the
   // CompareAndSwap sequence to serve as a barrier on acquiring a
   // lock.
-  enc_class aarch64_enc_cmpxchg_acq(memory mem, iRegLNoSp oldval, iRegLNoSp newval) %{
+  enc_class aarch64_enc_cmpxchg_acq(memory mem, iRegL oldval, iRegL newval) %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::xword, /*acquire*/ true, /*release*/ true,
                /*weak*/ false, noreg);
   %}
 
-  enc_class aarch64_enc_cmpxchgw_acq(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+  enc_class aarch64_enc_cmpxchgw_acq(memory mem, iRegI oldval, iRegI newval) %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::word, /*acquire*/ true, /*release*/ true,
                /*weak*/ false, noreg);
   %}
 
-  enc_class aarch64_enc_cmpxchgs_acq(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+  enc_class aarch64_enc_cmpxchgs_acq(memory mem, iRegI oldval, iRegI newval) %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::halfword, /*acquire*/ true, /*release*/ true,
                /*weak*/ false, noreg);
   %}
 
-  enc_class aarch64_enc_cmpxchgb_acq(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+  enc_class aarch64_enc_cmpxchgb_acq(memory mem, iRegI oldval, iRegI newval) %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::byte, /*acquire*/ true, /*release*/ true,
@@ -3417,7 +3417,7 @@ encode %{
   %}
 
   // auxiliary used for CompareAndSwapX to set result register
-  enc_class aarch64_enc_cset_eq(iRegINoSp res) %{
+  enc_class aarch64_enc_cset_eq(iRegI res) %{
     Register res_reg = as_Register($res$$reg);
     __ cset(res_reg, Assembler::EQ);
   %}
@@ -8403,7 +8403,7 @@ instruct castVVMask(pRegGov dst)
 // XXX No flag versions for CompareAndSwap{I,L,P,N} because matcher
 // can't match them
 
-instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
 
   match(Set res (CompareAndSwapB mem (Binary oldval newval)));
   ins_cost(2 * VOLATILE_REF_COST);
@@ -8421,7 +8421,7 @@ instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoS
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
 
   match(Set res (CompareAndSwapS mem (Binary oldval newval)));
   ins_cost(2 * VOLATILE_REF_COST);
@@ -8439,7 +8439,7 @@ instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoS
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
 
   match(Set res (CompareAndSwapI mem (Binary oldval newval)));
   ins_cost(2 * VOLATILE_REF_COST);
@@ -8457,7 +8457,7 @@ instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoS
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapL(iRegINoSp res, indirect mem, iRegLNoSp oldval, iRegLNoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
 
   match(Set res (CompareAndSwapL mem (Binary oldval newval)));
   ins_cost(2 * VOLATILE_REF_COST);
@@ -8494,7 +8494,7 @@ instruct compareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegNNoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
 
   match(Set res (CompareAndSwapN mem (Binary oldval newval)));
   predicate(n->as_LoadStore()->barrier_data() == 0);
@@ -8515,7 +8515,7 @@ instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegNNoS
 
 // alternative CompareAndSwapX when we are eliding barriers
 
-instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
 
   predicate(needs_acquiring_load_exclusive(n));
   match(Set res (CompareAndSwapB mem (Binary oldval newval)));
@@ -8534,7 +8534,7 @@ instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegI
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
 
   predicate(needs_acquiring_load_exclusive(n));
   match(Set res (CompareAndSwapS mem (Binary oldval newval)));
@@ -8553,7 +8553,7 @@ instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegI
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
 
   predicate(needs_acquiring_load_exclusive(n));
   match(Set res (CompareAndSwapI mem (Binary oldval newval)));
@@ -8572,7 +8572,7 @@ instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegI
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapLAcq(iRegINoSp res, indirect mem, iRegLNoSp oldval, iRegLNoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
 
   predicate(needs_acquiring_load_exclusive(n));
   match(Set res (CompareAndSwapL mem (Binary oldval newval)));
@@ -8610,7 +8610,7 @@ instruct compareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP new
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegNNoSp newval, rFlagsReg cr) %{
+instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
 
   predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
   match(Set res (CompareAndSwapN mem (Binary oldval newval)));

From b7dc3afd099978aaa100eef37325736493caa84c Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Fri, 21 Nov 2025 09:53:10 +0000
Subject: [PATCH 289/512] 8371574: Improve code coverage of PEM classes decode
 functionality

Reviewed-by: rhalade
---
 test/jdk/java/security/PEM/PEMDecoderTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/jdk/java/security/PEM/PEMDecoderTest.java b/test/jdk/java/security/PEM/PEMDecoderTest.java
index 3ae088329b4..b6db58b0ed3 100644
--- a/test/jdk/java/security/PEM/PEMDecoderTest.java
+++ b/test/jdk/java/security/PEM/PEMDecoderTest.java
@@ -163,6 +163,16 @@ public class PEMDecoderTest {
         }
         System.out.println("PASS");
 
+        System.out.println("Check if PEM decode decodes content correctly");
+        final String tmpContent = "1234567";
+        final PEM tmpPem = new PEM("ONE", tmpContent);
+        if (!Arrays.equals(
+                Base64.getDecoder().decode(tmpContent),
+                tmpPem.decode())) {
+            throw new AssertionError("PEM decode error");
+        }
+        System.out.println("PASS");
+
         System.out.println("Decode to EncryptedPrivateKeyInfo: ");
         EncryptedPrivateKeyInfo ekpi =
             d.decode(PEMData.ed25519ep8.pem(), EncryptedPrivateKeyInfo.class);

From 8a5c9e08c0605c28cac235129adff7bb248d0627 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Fri, 21 Nov 2025 09:55:05 +0000
Subject: [PATCH 290/512] 8372146: Follow-up changes to the Lazy Constants JEP

Reviewed-by: liach, mcimadamore, jvernee
---
 .../share/classes/java/lang/LazyConstant.java     | 15 ++++++++++-----
 src/java.base/share/classes/java/util/List.java   |  4 ++--
 src/java.base/share/classes/java/util/Map.java    |  2 +-
 .../java/lang/LazyConstant/LazyConstantTest.java  |  9 ---------
 test/jdk/java/lang/LazyConstant/LazyListTest.java |  3 ++-
 test/jdk/java/lang/LazyConstant/LazyMapTest.java  |  3 ++-
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/LazyConstant.java b/src/java.base/share/classes/java/lang/LazyConstant.java
index 34f3d754a10..703d67b8abf 100644
--- a/src/java.base/share/classes/java/lang/LazyConstant.java
+++ b/src/java.base/share/classes/java/lang/LazyConstant.java
@@ -39,12 +39,16 @@ import java.util.function.Supplier;
  * <p>
  * A lazy constant is created using the factory method
  * {@linkplain LazyConstant#of(Supplier) LazyConstant.of({@code <computing function>})}.
+ * <p>
  * When created, the lazy constant is <em>not initialized</em>, meaning it has no contents.
+ * <p>
  * The lazy constant (of type {@code T}) can then be <em>initialized</em>
  * (and its contents retrieved) by calling {@linkplain #get() get()}. The first time
  * {@linkplain #get() get()} is called, the underlying <em>computing function</em>
  * (provided at construction) will be invoked and the result will be used to initialize
- * the constant. Once a lazy constant is initialized, its contents can <em>never change</em>
+ * the constant.
+ * <p>
+ * Once a lazy constant is initialized, its contents can <em>never change</em>
  * and will be retrieved over and over again upon subsequent {@linkplain #get() get()}
  * invocations.
  * <p>
@@ -64,7 +68,7 @@ import java.util.function.Supplier;
  *        // ...
  *    }
  * }
- *}
+ * }
  * <p>
  * Initially, the lazy constant is <em>not initialized</em>. When {@code logger.get()}
  * is first invoked, it evaluates the computing function and initializes the constant to
@@ -121,7 +125,7 @@ import java.util.function.Supplier;
  *     }
  *
  * }
- *}
+ * }
  * Calling {@code BAR.get()} will create the {@code Bar} singleton if it is not already
  * created. Upon such a creation, a dependent {@code Foo} will first be created if
  * the {@code Foo} does not already exist.
@@ -238,10 +242,11 @@ public sealed interface LazyConstant<T>
     // Object methods
 
     /**
-     * {@return if this lazy constant is the same as the provided {@code obj}}
+     * {@return {@code true} if this lazy constant is the same instance as
+     *          the provided {@code obj}, otherwise {@code false}}
      * <p>
      * In other words, equals compares the identity of this lazy constant and {@code obj}
-     * to determine equality. Hence, two lazy constants with the same contents are
+     * to determine equality. Hence, two distinct lazy constants with the same contents are
      * <em>not</em> equal.
      * <p>
      * This method never triggers initialization of this lazy constant.
diff --git a/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java
index 6ab80b83ef8..43408de292a 100644
--- a/src/java.base/share/classes/java/util/List.java
+++ b/src/java.base/share/classes/java/util/List.java
@@ -1207,7 +1207,7 @@ public interface List<E> extends SequencedCollection<E> {
      * The provided computing function is guaranteed to be successfully
      * invoked at most once per list index, even in a multi-threaded environment.
      * Competing threads accessing an element already under computation will block until
-     * an element is computed or the computing function completes abnormally
+     * an element is computed or the computing function completes abnormally.
      * <p>
      * If invoking the provided computing function throws an exception, it is rethrown
      * to the initial caller and no value for the element is recorded.
@@ -1235,7 +1235,7 @@ public interface List<E> extends SequencedCollection<E> {
      * one or more lazy elements.
      * <p>
      * The returned lazy list strongly references its computing
-     * function used to compute elements at least so long as there are uninitialized
+     * function used to compute elements at least as long as there are uninitialized
      * elements.
      * <p>
      * The returned List is <em>not</em> {@linkplain Serializable}.
diff --git a/src/java.base/share/classes/java/util/Map.java b/src/java.base/share/classes/java/util/Map.java
index abee819069f..177f0522b1b 100644
--- a/src/java.base/share/classes/java/util/Map.java
+++ b/src/java.base/share/classes/java/util/Map.java
@@ -1788,7 +1788,7 @@ public interface Map<K, V> {
      * one or more lazy elements.
      * <p>
      * The returned lazy map strongly references its underlying
-     * computing function used to compute values at least so long as there are
+     * computing function used to compute values at least as long as there are
      * uncomputed values.
      * <p>
      * The returned Map is <em>not</em> {@linkplain Serializable}.
diff --git a/test/jdk/java/lang/LazyConstant/LazyConstantTest.java b/test/jdk/java/lang/LazyConstant/LazyConstantTest.java
index af194cbcc01..485138bc492 100644
--- a/test/jdk/java/lang/LazyConstant/LazyConstantTest.java
+++ b/test/jdk/java/lang/LazyConstant/LazyConstantTest.java
@@ -224,13 +224,4 @@ final class LazyConstantTest {
         };
     }
 
-    record Lazy<T>(LazyConstant<T> underlying) implements Supplier<T> {
-        @Override
-        public T get() { return underlying.get(); }
-
-        static <T> Lazy<T> of(Supplier<? extends T> computingFunction) {
-            return new Lazy<>(LazyConstant.of(computingFunction));
-        }
-    }
-
 }
diff --git a/test/jdk/java/lang/LazyConstant/LazyListTest.java b/test/jdk/java/lang/LazyConstant/LazyListTest.java
index 046f9107b17..111e3cf8ab2 100644
--- a/test/jdk/java/lang/LazyConstant/LazyListTest.java
+++ b/test/jdk/java/lang/LazyConstant/LazyListTest.java
@@ -24,7 +24,8 @@
 /* @test
  * @summary Basic tests for lazy list methods
  * @enablePreview
- * @run junit/othervm --add-opens java.base/java.util=ALL-UNNAMED LazyListTest
+ * @modules java.base/java.util:+open
+ * @run junit LazyListTest
  */
 
 import org.junit.jupiter.api.Test;
diff --git a/test/jdk/java/lang/LazyConstant/LazyMapTest.java b/test/jdk/java/lang/LazyConstant/LazyMapTest.java
index 766313c9173..889ec43df6a 100644
--- a/test/jdk/java/lang/LazyConstant/LazyMapTest.java
+++ b/test/jdk/java/lang/LazyConstant/LazyMapTest.java
@@ -24,7 +24,8 @@
 /* @test
  * @summary Basic tests for lazy map methods
  * @enablePreview
- * @run junit/othervm --add-opens java.base/java.util=ALL-UNNAMED LazyMapTest
+ * @modules java.base/java.util:+open
+ * @run junit LazyMapTest
  */
 
 import org.junit.jupiter.api.Test;

From d57fc1b6dc313eb004892b180960ebcee1cb04c7 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratochvil@openjdk.org>
Date: Fri, 21 Nov 2025 10:02:19 +0000
Subject: [PATCH 291/512] 8372135: clang compilation error

Reviewed-by: stefank, jsjolen, kbarrett
---
 src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
index 8aeb64ef18c..f556bc57f26 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
@@ -209,14 +209,14 @@ class CgroupV1Subsystem: public CgroupSubsystem {
 
     bool pids_max(uint64_t& result) override;
     bool pids_current(uint64_t& result) override;
-    bool is_containerized();
+    bool is_containerized() override;
 
-    const char * container_type() {
+    const char * container_type() override {
       return "cgroupv1";
     }
-    CachingCgroupController<CgroupMemoryController>* memory_controller() { return _memory; }
-    CachingCgroupController<CgroupCpuController>* cpu_controller() { return _cpu; }
-    CgroupCpuacctController* cpuacct_controller() { return _cpuacct; }
+    CachingCgroupController<CgroupMemoryController>* memory_controller() override { return _memory; }
+    CachingCgroupController<CgroupCpuController>* cpu_controller() override { return _cpu; }
+    CgroupCpuacctController* cpuacct_controller() override { return _cpuacct; }
 
   private:
     /* controllers */

From 30410fe265d8d32fb41bae88ab882115271cdf75 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 21 Nov 2025 11:19:49 +0000
Subject: [PATCH 292/512] 8333871: Check return values of sysinfo

Reviewed-by: dholmes, mdoerr, alanb
---
 src/hotspot/os/linux/os_linux.cpp                 | 14 +++++++++-----
 src/java.base/unix/native/libjava/java_props_md.c |  8 ++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index a345663dd5b..b9f8307673c 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -2433,6 +2433,7 @@ void os::Linux::print_uptime_info(outputStream* st) {
   if (ret == 0) {
     os::print_dhm(st, "OS uptime:", (long) sinfo.uptime);
   }
+  assert(ret == 0, "sysinfo failed: %s", os::strerror(errno));
 }
 
 bool os::Linux::print_container_info(outputStream* st) {
@@ -2597,7 +2598,8 @@ void os::print_memory_info(outputStream* st) {
 
   // values in struct sysinfo are "unsigned long"
   struct sysinfo si;
-  sysinfo(&si);
+  int ret = sysinfo(&si);
+  assert(ret == 0, "sysinfo failed: %s", os::strerror(errno));
   physical_memory_size_type phys_mem = physical_memory();
   st->print(", physical " PHYS_MEM_TYPE_FORMAT "k",
             phys_mem >> 10);
@@ -2605,10 +2607,12 @@ void os::print_memory_info(outputStream* st) {
   (void)os::available_memory(avail_mem);
   st->print("(" PHYS_MEM_TYPE_FORMAT "k free)",
             avail_mem >> 10);
-  st->print(", swap " UINT64_FORMAT "k",
-            ((jlong)si.totalswap * si.mem_unit) >> 10);
-  st->print("(" UINT64_FORMAT "k free)",
-            ((jlong)si.freeswap * si.mem_unit) >> 10);
+  if (ret == 0) {
+    st->print(", swap " UINT64_FORMAT "k",
+              ((jlong)si.totalswap * si.mem_unit) >> 10);
+    st->print("(" UINT64_FORMAT "k free)",
+              ((jlong)si.freeswap * si.mem_unit) >> 10);
+  }
   st->cr();
   st->print("Page Sizes: ");
   _page_sizes.print_on(st);
diff --git a/src/java.base/unix/native/libjava/java_props_md.c b/src/java.base/unix/native/libjava/java_props_md.c
index 000eb4b953e..30d0ca67652 100644
--- a/src/java.base/unix/native/libjava/java_props_md.c
+++ b/src/java.base/unix/native/libjava/java_props_md.c
@@ -388,8 +388,12 @@ GetJavaProperties(JNIEnv *env)
     /* supported instruction sets */
     {
         char list[258];
-        sysinfo(SI_ISALIST, list, sizeof(list));
-        sprops.cpu_isalist = strdup(list);
+        int ret = sysinfo(SI_ISALIST, list, sizeof(list));
+        if (ret == 0) {
+            sprops.cpu_isalist = strdup(list);
+        } else {
+            sprops.cpu_isalist = NULL;
+        }
     }
 #else
     sprops.cpu_isalist = NULL;

From d01e7d9850a57dd8e4849e2b7db6eacb37605647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Fri, 21 Nov 2025 13:44:09 +0000
Subject: [PATCH 293/512] 8371783: Refactor GCCause in
 VM_CollectForMetadataAllocation

Reviewed-by: kbarrett, ayang
---
 src/hotspot/share/gc/shared/collectedHeap.cpp  |  3 +--
 src/hotspot/share/gc/shared/gcVMOperations.cpp | 16 ++++++++++------
 src/hotspot/share/gc/shared/gcVMOperations.hpp |  3 +--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 4207f83e0a4..8576781f7c8 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -379,8 +379,7 @@ MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loa
                                        word_size,
                                        mdtype,
                                        gc_count,
-                                       full_gc_count,
-                                       GCCause::_metadata_GC_threshold);
+                                       full_gc_count);
 
     VMThread::execute(&op);
 
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp
index 3f5e9bd4f6b..6dbfd56b4e9 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp
@@ -220,9 +220,8 @@ VM_CollectForMetadataAllocation::VM_CollectForMetadataAllocation(ClassLoaderData
                                                                  size_t size,
                                                                  Metaspace::MetadataType mdtype,
                                                                  uint gc_count_before,
-                                                                 uint full_gc_count_before,
-                                                                 GCCause::Cause gc_cause)
-    : VM_GC_Collect_Operation(gc_count_before, gc_cause, full_gc_count_before, true),
+                                                                 uint full_gc_count_before)
+    : VM_GC_Collect_Operation(gc_count_before, GCCause::_metadata_GC_threshold, full_gc_count_before, true),
       _result(nullptr), _size(size), _mdtype(mdtype), _loader_data(loader_data) {
   assert(_size != 0, "An allocation should always be requested with this operation.");
   AllocTracer::send_allocation_requiring_gc_event(_size * HeapWordSize, GCId::peek());
@@ -231,8 +230,11 @@ VM_CollectForMetadataAllocation::VM_CollectForMetadataAllocation(ClassLoaderData
 void VM_CollectForMetadataAllocation::doit() {
   SvcGCMarker sgcm(SvcGCMarker::FULL);
 
-  CollectedHeap* heap = Universe::heap();
-  GCCauseSetter gccs(heap, _gc_cause);
+  // Note: GCCauseSetter is intentionally not used here.
+  // The specific GC cause is set directly in downstream calls that initiate
+  // collections, allowing us to accurately reflect different situations:
+  // - A typical metadata allocation failure triggers a collection.
+  // - As a last resort, a collection clears soft references if prior attempts fail.
 
   // Check again if the space is available.  Another thread
   // may have similarly failed a metadata allocation and induced
@@ -255,8 +257,10 @@ void VM_CollectForMetadataAllocation::doit() {
   }
 #endif
 
+  CollectedHeap* heap = Universe::heap();
+
   // Don't clear the soft refs yet.
-  heap->collect_as_vm_thread(GCCause::_metadata_GC_threshold);
+  heap->collect_as_vm_thread(_gc_cause);
   // After a GC try to allocate without expanding.  Could fail
   // and expansion will be tried below.
   _result = _loader_data->metaspace_non_null()->allocate(_size, _mdtype);
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index 321ad8e435f..a9aee2faf5d 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -222,8 +222,7 @@ class VM_CollectForMetadataAllocation: public VM_GC_Collect_Operation {
                                   size_t size,
                                   Metaspace::MetadataType mdtype,
                                   uint gc_count_before,
-                                  uint full_gc_count_before,
-                                  GCCause::Cause gc_cause);
+                                  uint full_gc_count_before);
 
   virtual VMOp_Type type() const { return VMOp_CollectForMetadataAllocation; }
   virtual void doit();

From 018284d08cd5b4c2c1a5735b5d11e63dc769fb37 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 21 Nov 2025 13:52:51 +0000
Subject: [PATCH 294/512] 8372162: G1: Merge subclasses of G1IHOPControl into
 parent class

Reviewed-by: tschatzl, iwalulya
---
 src/hotspot/share/gc/g1/g1IHOPControl.cpp     | 234 ++++++++----------
 src/hotspot/share/gc/g1/g1IHOPControl.hpp     | 134 ++++------
 .../share/gc/g1/g1OldGenAllocationTracker.hpp |   2 -
 src/hotspot/share/gc/g1/g1Policy.cpp          |  15 +-
 .../gtest/gc/g1/test_g1IHOPControl.cpp        |  20 +-
 5 files changed, 171 insertions(+), 234 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.cpp b/src/hotspot/share/gc/g1/g1IHOPControl.cpp
index 34c8cd0366b..43698e9f12b 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.cpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.cpp
@@ -28,14 +28,63 @@
 #include "gc/g1/g1Trace.hpp"
 #include "logging/log.hpp"
 
-G1IHOPControl::G1IHOPControl(double initial_ihop_percent,
-                             G1OldGenAllocationTracker const* old_gen_alloc_tracker) :
-  _initial_ihop_percent(initial_ihop_percent),
-  _target_occupancy(0),
-  _last_allocation_time_s(0.0),
-  _old_gen_alloc_tracker(old_gen_alloc_tracker)
-{
-  assert(_initial_ihop_percent >= 0.0 && _initial_ihop_percent <= 100.0, "Initial IHOP value must be between 0 and 100 but is %.3f", initial_ihop_percent);
+double G1IHOPControl::predict(const TruncatedSeq* seq) const {
+  assert(_is_adaptive, "precondition");
+  assert(_predictor != nullptr, "precondition");
+
+  return  _predictor->predict_zero_bounded(seq);
+}
+
+bool G1IHOPControl::have_enough_data_for_prediction() const {
+  assert(_is_adaptive, "precondition");
+
+  return ((size_t)_marking_times_s.num() >= G1AdaptiveIHOPNumInitialSamples) &&
+         ((size_t)_allocation_rate_s.num() >= G1AdaptiveIHOPNumInitialSamples);
+}
+
+double G1IHOPControl::last_marking_length_s() const {
+  return _marking_times_s.last();
+}
+
+size_t G1IHOPControl::actual_target_threshold() const {
+  assert(_is_adaptive, "precondition");
+
+  // The actual target threshold takes the heap reserve and the expected waste in
+  // free space  into account.
+  // _heap_reserve is that part of the total heap capacity that is reserved for
+  // eventual promotion failure.
+  // _heap_waste is the amount of space will never be reclaimed in any
+  // heap, so can not be used for allocation during marking and must always be
+  // considered.
+  double safe_total_heap_percentage =
+    MIN2((double)(_heap_reserve_percent + _heap_waste_percent), 100.0);
+
+  return (size_t)MIN2(
+    G1CollectedHeap::heap()->max_capacity() * (100.0 - safe_total_heap_percentage) / 100.0,
+    _target_occupancy * (100.0 - _heap_waste_percent) / 100.0
+  );
+}
+
+G1IHOPControl::G1IHOPControl(double ihop_percent,
+                             const G1OldGenAllocationTracker* old_gen_alloc_tracker,
+                             bool adaptive,
+                             const G1Predictions* predictor,
+                             size_t heap_reserve_percent,
+                             size_t heap_waste_percent)
+  : _is_adaptive(adaptive),
+    _initial_ihop_percent(ihop_percent),
+    _target_occupancy(0),
+    _heap_reserve_percent(heap_reserve_percent),
+    _heap_waste_percent(heap_waste_percent),
+    _last_allocation_time_s(0.0),
+    _old_gen_alloc_tracker(old_gen_alloc_tracker),
+    _predictor(predictor),
+    _marking_times_s(10, 0.05),
+    _allocation_rate_s(10, 0.05),
+    _last_unrestrained_young_size(0) {
+  assert(_initial_ihop_percent >= 0.0 && _initial_ihop_percent <= 100.0,
+         "IHOP percent out of range: %.3f", ihop_percent);
+  assert(!_is_adaptive || _predictor != nullptr, "precondition");
 }
 
 void G1IHOPControl::update_target_occupancy(size_t new_target_occupancy) {
@@ -50,9 +99,34 @@ void G1IHOPControl::report_statistics(G1NewTracer* new_tracer, size_t non_young_
 }
 
 void G1IHOPControl::update_allocation_info(double allocation_time_s, size_t additional_buffer_size) {
-  assert(allocation_time_s >= 0.0, "Allocation time must be positive but is %.3f", allocation_time_s);
-
+  assert(allocation_time_s > 0, "Invalid allocation time: %.3f", allocation_time_s);
   _last_allocation_time_s = allocation_time_s;
+  double alloc_rate = _old_gen_alloc_tracker->last_period_old_gen_growth() / allocation_time_s;
+  _allocation_rate_s.add(alloc_rate);
+  _last_unrestrained_young_size = additional_buffer_size;
+}
+
+void G1IHOPControl::update_marking_length(double marking_length_s) {
+  assert(marking_length_s >= 0.0, "Invalid marking length: %.3f", marking_length_s);
+  _marking_times_s.add(marking_length_s);
+}
+
+size_t G1IHOPControl::get_conc_mark_start_threshold() {
+  guarantee(_target_occupancy > 0, "Target occupancy must be initialized");
+
+  if (!_is_adaptive || !have_enough_data_for_prediction()) {
+    return (size_t)(_initial_ihop_percent * _target_occupancy / 100.0);
+  }
+
+  double pred_marking_time = predict(&_marking_times_s);
+  double pred_rate = predict(&_allocation_rate_s);
+  size_t pred_bytes = (size_t)(pred_marking_time * pred_rate);
+  size_t predicted_needed = pred_bytes + _last_unrestrained_young_size;
+  size_t internal_threshold = actual_target_threshold();
+
+  return predicted_needed < internal_threshold
+         ? internal_threshold - predicted_needed
+         : 0;
 }
 
 void G1IHOPControl::print_log(size_t non_young_occupancy) {
@@ -68,6 +142,23 @@ void G1IHOPControl::print_log(size_t non_young_occupancy) {
                       _last_allocation_time_s * 1000.0,
                       _last_allocation_time_s > 0.0 ? _old_gen_alloc_tracker->last_period_old_gen_bytes() / _last_allocation_time_s : 0.0,
                       last_marking_length_s() * 1000.0);
+
+  if (!_is_adaptive) {
+    return;
+  }
+
+  size_t actual_threshold = actual_target_threshold();
+  log_debug(gc, ihop)("Adaptive IHOP information (value update), threshold: %zuB (%1.2f), internal target threshold: %zuB, "
+                      "non-young occupancy: %zuB, additional buffer size: %zuB, predicted old gen allocation rate: %1.2fB/s, "
+                      "predicted marking phase length: %1.2fms, prediction active: %s",
+                      cur_conc_mark_start_threshold,
+                      percent_of(cur_conc_mark_start_threshold, actual_threshold),
+                      actual_threshold,
+                      non_young_occupancy,
+                      _last_unrestrained_young_size,
+                      predict(&_allocation_rate_s),
+                      predict(&_marking_times_s) * 1000.0,
+                      have_enough_data_for_prediction() ? "true" : "false");
 }
 
 void G1IHOPControl::send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy) {
@@ -78,121 +169,14 @@ void G1IHOPControl::send_trace_event(G1NewTracer* tracer, size_t non_young_occup
                                        _old_gen_alloc_tracker->last_period_old_gen_bytes(),
                                        _last_allocation_time_s,
                                        last_marking_length_s());
-}
 
-G1StaticIHOPControl::G1StaticIHOPControl(double ihop_percent,
-                                         G1OldGenAllocationTracker const* old_gen_alloc_tracker) :
-  G1IHOPControl(ihop_percent, old_gen_alloc_tracker),
-  _last_marking_length_s(0.0) {
-}
-
-G1AdaptiveIHOPControl::G1AdaptiveIHOPControl(double ihop_percent,
-                                             G1OldGenAllocationTracker const* old_gen_alloc_tracker,
-                                             G1Predictions const* predictor,
-                                             size_t heap_reserve_percent,
-                                             size_t heap_waste_percent) :
-  G1IHOPControl(ihop_percent, old_gen_alloc_tracker),
-  _heap_reserve_percent(heap_reserve_percent),
-  _heap_waste_percent(heap_waste_percent),
-  _predictor(predictor),
-  _marking_times_s(10, 0.05),
-  _allocation_rate_s(10, 0.05),
-  _last_unrestrained_young_size(0)
-{
-}
-
-size_t G1AdaptiveIHOPControl::actual_target_threshold() const {
-  guarantee(_target_occupancy > 0, "Target occupancy still not updated yet.");
-  // The actual target threshold takes the heap reserve and the expected waste in
-  // free space  into account.
-  // _heap_reserve is that part of the total heap capacity that is reserved for
-  // eventual promotion failure.
-  // _heap_waste is the amount of space will never be reclaimed in any
-  // heap, so can not be used for allocation during marking and must always be
-  // considered.
-
-  double safe_total_heap_percentage = MIN2((double)(_heap_reserve_percent + _heap_waste_percent), 100.0);
-
-  return (size_t)MIN2(
-    G1CollectedHeap::heap()->max_capacity() * (100.0 - safe_total_heap_percentage) / 100.0,
-    _target_occupancy * (100.0 - _heap_waste_percent) / 100.0
-    );
-}
-
-double G1AdaptiveIHOPControl::predict(TruncatedSeq const* seq) const {
-  return _predictor->predict_zero_bounded(seq);
-}
-
-bool G1AdaptiveIHOPControl::have_enough_data_for_prediction() const {
-  return ((size_t)_marking_times_s.num() >= G1AdaptiveIHOPNumInitialSamples) &&
-         ((size_t)_allocation_rate_s.num() >= G1AdaptiveIHOPNumInitialSamples);
-}
-
-size_t G1AdaptiveIHOPControl::get_conc_mark_start_threshold() {
-  if (have_enough_data_for_prediction()) {
-    double pred_marking_time = predict(&_marking_times_s);
-    double pred_promotion_rate = predict(&_allocation_rate_s);
-    size_t pred_promotion_size = (size_t)(pred_marking_time * pred_promotion_rate);
-
-    size_t predicted_needed_bytes_during_marking =
-      pred_promotion_size +
-      // In reality we would need the maximum size of the young gen during
-      // marking. This is a conservative estimate.
-      _last_unrestrained_young_size;
-
-    size_t internal_threshold = actual_target_threshold();
-    size_t predicted_initiating_threshold = predicted_needed_bytes_during_marking < internal_threshold ?
-                                            internal_threshold - predicted_needed_bytes_during_marking :
-                                            0;
-    return predicted_initiating_threshold;
-  } else {
-    // Use the initial value.
-    return (size_t)(_initial_ihop_percent * _target_occupancy / 100.0);
+  if (_is_adaptive) {
+    tracer->report_adaptive_ihop_statistics(get_conc_mark_start_threshold(),
+                                            actual_target_threshold(),
+                                            non_young_occupancy,
+                                            _last_unrestrained_young_size,
+                                            predict(&_allocation_rate_s),
+                                            predict(&_marking_times_s),
+                                            have_enough_data_for_prediction());
   }
 }
-
-double G1AdaptiveIHOPControl::last_mutator_period_old_allocation_rate() const {
-  assert(_last_allocation_time_s > 0, "This should not be called when the last GC is full");
-
-  return _old_gen_alloc_tracker->last_period_old_gen_growth() / _last_allocation_time_s;
-}
-
-void G1AdaptiveIHOPControl::update_allocation_info(double allocation_time_s,
-                                                   size_t additional_buffer_size) {
-  G1IHOPControl::update_allocation_info(allocation_time_s, additional_buffer_size);
-  _allocation_rate_s.add(last_mutator_period_old_allocation_rate());
-
-  _last_unrestrained_young_size = additional_buffer_size;
-}
-
-void G1AdaptiveIHOPControl::update_marking_length(double marking_length_s) {
-   assert(marking_length_s >= 0.0, "Marking length must be larger than zero but is %.3f", marking_length_s);
-  _marking_times_s.add(marking_length_s);
-}
-
-void G1AdaptiveIHOPControl::print_log(size_t non_young_occupancy) {
-  G1IHOPControl::print_log(non_young_occupancy);
-  size_t actual_threshold = actual_target_threshold();
-  log_debug(gc, ihop)("Adaptive IHOP information (value update), threshold: %zuB (%1.2f), internal target threshold: %zuB, "
-                      "non-young occupancy: %zuB, additional buffer size: %zuB, predicted old gen allocation rate: %1.2fB/s, "
-                      "predicted marking phase length: %1.2fms, prediction active: %s",
-                      get_conc_mark_start_threshold(),
-                      percent_of(get_conc_mark_start_threshold(), actual_threshold),
-                      actual_threshold,
-                      non_young_occupancy,
-                      _last_unrestrained_young_size,
-                      predict(&_allocation_rate_s),
-                      predict(&_marking_times_s) * 1000.0,
-                      have_enough_data_for_prediction() ? "true" : "false");
-}
-
-void G1AdaptiveIHOPControl::send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy) {
-  G1IHOPControl::send_trace_event(tracer, non_young_occupancy);
-  tracer->report_adaptive_ihop_statistics(get_conc_mark_start_threshold(),
-                                          actual_target_threshold(),
-                                          non_young_occupancy,
-                                          _last_unrestrained_young_size,
-                                          predict(&_allocation_rate_s),
-                                          predict(&_marking_times_s),
-                                          have_enough_data_for_prediction());
-}
diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.hpp b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
index 392a12a785a..b6e80d9b422 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.hpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
@@ -32,89 +32,32 @@
 class G1Predictions;
 class G1NewTracer;
 
-// Base class for algorithms that calculate the heap occupancy at which
-// concurrent marking should start. This heap usage threshold should be relative
-// to old gen size.
+// Implements two strategies for calculating the concurrent mark starting occupancy threshold:
+// - Static mode: Uses a fixed percentage of the target heap occupancy.
+// - Adaptive mode: Predicts a threshold based on allocation rates and marking durations
+//   to ensure the target occupancy is never exceeded during marking.
 class G1IHOPControl : public CHeapObj<mtGC> {
- protected:
+ private:
+  const bool _is_adaptive;
+
   // The initial IHOP value relative to the target occupancy.
   double _initial_ihop_percent;
+
   // The target maximum occupancy of the heap. The target occupancy is the number
   // of bytes when marking should be finished and reclaim started.
   size_t _target_occupancy;
 
+  // Percentage of maximum heap capacity we should avoid to touch
+  const size_t _heap_reserve_percent;
+
+  // Percentage of free heap that should be considered as waste.
+  const size_t _heap_waste_percent;
+
   // Most recent complete mutator allocation period in seconds.
   double _last_allocation_time_s;
-
   const G1OldGenAllocationTracker* _old_gen_alloc_tracker;
-  // Initialize an instance with the old gen allocation tracker and the
-  // initial IHOP value in percent. The target occupancy will be updated
-  // at the first heap expansion.
-  G1IHOPControl(double ihop_percent, G1OldGenAllocationTracker const* old_gen_alloc_tracker);
-
-  // Most recent time from the end of the concurrent start to the start of the first
-  // mixed gc.
-  virtual double last_marking_length_s() const = 0;
-
-  virtual void print_log(size_t non_young_occupancy);
-  virtual void send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy);
-
-public:
-  virtual ~G1IHOPControl() { }
-
-  // Get the current non-young occupancy at which concurrent marking should start.
-  virtual size_t get_conc_mark_start_threshold() = 0;
-
-  // Adjust target occupancy.
-  virtual void update_target_occupancy(size_t new_target_occupancy);
-  // Update information about time during which allocations in the Java heap occurred,
-  // how large these allocations were in bytes, and an additional buffer.
-  // The allocations should contain any amount of space made unusable for further
-  // allocation, e.g. any waste caused by TLAB allocation, space at the end of
-  // humongous objects that can not be used for allocation, etc.
-  // Together with the target occupancy, this additional buffer should contain the
-  // difference between old gen size and total heap size at the start of reclamation,
-  // and space required for that reclamation.
-  virtual void update_allocation_info(double allocation_time_s, size_t additional_buffer_size);
-  // Update the time spent in the mutator beginning from the end of concurrent start to
-  // the first mixed gc.
-  virtual void update_marking_length(double marking_length_s) = 0;
-
-  void report_statistics(G1NewTracer* tracer, size_t non_young_occupancy);
-};
-
-// The returned concurrent mark starting occupancy threshold is a fixed value
-// relative to the maximum heap size.
-class G1StaticIHOPControl : public G1IHOPControl {
-  // Most recent mutator time between the end of concurrent mark to the start of the
-  // first mixed gc.
-  double _last_marking_length_s;
- protected:
-  double last_marking_length_s() const { return _last_marking_length_s; }
- public:
-  G1StaticIHOPControl(double ihop_percent, G1OldGenAllocationTracker const* old_gen_alloc_tracker);
-
-  size_t get_conc_mark_start_threshold() {
-    guarantee(_target_occupancy > 0, "Target occupancy must have been initialized.");
-    return (size_t) (_initial_ihop_percent * _target_occupancy / 100.0);
-  }
-
-  virtual void update_marking_length(double marking_length_s) {
-   assert(marking_length_s > 0.0, "Marking length must be larger than zero but is %.3f", marking_length_s);
-    _last_marking_length_s = marking_length_s;
-  }
-};
-
-// This algorithm tries to return a concurrent mark starting occupancy value that
-// makes sure that during marking the given target occupancy is never exceeded,
-// based on predictions of current allocation rate and time periods between
-// concurrent start and the first mixed gc.
-class G1AdaptiveIHOPControl : public G1IHOPControl {
-  size_t _heap_reserve_percent; // Percentage of maximum heap capacity we should avoid to touch
-  size_t _heap_waste_percent;   // Percentage of free heap that should be considered as waste.
-
-  const G1Predictions * _predictor;
 
+  const G1Predictions* _predictor;
   TruncatedSeq _marking_times_s;
   TruncatedSeq _allocation_rate_s;
 
@@ -128,35 +71,48 @@ class G1AdaptiveIHOPControl : public G1IHOPControl {
   size_t _last_unrestrained_young_size;
 
   // Get a new prediction bounded below by zero from the given sequence.
-  double predict(TruncatedSeq const* seq) const;
+  double predict(const TruncatedSeq* seq) const;
 
   bool have_enough_data_for_prediction() const;
+  double last_marking_length_s() const;
 
   // The "actual" target threshold the algorithm wants to keep during and at the
   // end of marking. This is typically lower than the requested threshold, as the
   // algorithm needs to consider restrictions by the environment.
   size_t actual_target_threshold() const;
 
-  // This method calculates the old gen allocation rate based on the net survived
-  // bytes that are allocated in the old generation in the last mutator period.
-  double last_mutator_period_old_allocation_rate() const;
- protected:
-  virtual double last_marking_length_s() const { return _marking_times_s.last(); }
-
-  virtual void print_log(size_t non_young_occupancy);
-  virtual void send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy);
+ void print_log(size_t non_young_occupancy);
+ void send_trace_event(G1NewTracer* tracer, size_t non_young_occupancy);
 
  public:
-  G1AdaptiveIHOPControl(double ihop_percent,
-                        G1OldGenAllocationTracker const* old_gen_alloc_tracker,
-                        G1Predictions const* predictor,
-                        size_t heap_reserve_percent, // The percentage of total heap capacity that should not be tapped into.
-                        size_t heap_waste_percent);  // The percentage of the free space in the heap that we think is not usable for allocation.
+  G1IHOPControl(double ihop_percent,
+                const G1OldGenAllocationTracker* old_gen_alloc_tracker,
+                bool adaptive,
+                const G1Predictions* predictor,
+                size_t heap_reserve_percent,
+                size_t heap_waste_percent);
 
-  virtual size_t get_conc_mark_start_threshold();
+  // Adjust target occupancy.
+  void update_target_occupancy(size_t new_target_occupancy);
 
-  virtual void update_allocation_info(double allocation_time_s, size_t additional_buffer_size);
-  virtual void update_marking_length(double marking_length_s);
+  // Update information about time during which allocations in the Java heap occurred,
+  // how large these allocations were in bytes, and an additional buffer.
+  // The allocations should contain any amount of space made unusable for further
+  // allocation, e.g. any waste caused by TLAB allocation, space at the end of
+  // humongous objects that can not be used for allocation, etc.
+  // Together with the target occupancy, this additional buffer should contain the
+  // difference between old gen size and total heap size at the start of reclamation,
+  // and space required for that reclamation.
+  void update_allocation_info(double allocation_time_s, size_t additional_buffer_size);
+
+  // Update the time spent in the mutator beginning from the end of concurrent start to
+  // the first mixed gc.
+  void update_marking_length(double marking_length_s);
+
+  // Get the current non-young occupancy at which concurrent marking should start.
+  size_t get_conc_mark_start_threshold();
+
+  void report_statistics(G1NewTracer* tracer, size_t non_young_occupancy);
 };
 
 #endif // SHARE_GC_G1_G1IHOPCONTROL_HPP
diff --git a/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp b/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp
index 265c7029e14..aa5e3c6c942 100644
--- a/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp
+++ b/src/hotspot/share/gc/g1/g1OldGenAllocationTracker.hpp
@@ -28,8 +28,6 @@
 #include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 
-class G1AdaptiveIHOPControl;
-
 // Track allocation details in the old generation.
 class G1OldGenAllocationTracker : public CHeapObj<mtGC> {
   // Total number of bytes allocated in the old generation at the end
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 828782d21eb..6eef6cbfa87 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -1025,15 +1025,12 @@ void G1Policy::record_young_collection_end(bool concurrent_operation_is_full_mar
 
 G1IHOPControl* G1Policy::create_ihop_control(const G1OldGenAllocationTracker* old_gen_alloc_tracker,
                                              const G1Predictions* predictor) {
-  if (G1UseAdaptiveIHOP) {
-    return new G1AdaptiveIHOPControl(InitiatingHeapOccupancyPercent,
-                                     old_gen_alloc_tracker,
-                                     predictor,
-                                     G1ReservePercent,
-                                     G1HeapWastePercent);
-  } else {
-    return new G1StaticIHOPControl(InitiatingHeapOccupancyPercent, old_gen_alloc_tracker);
-  }
+  return new G1IHOPControl(InitiatingHeapOccupancyPercent,
+                           old_gen_alloc_tracker,
+                           G1UseAdaptiveIHOP,
+                           predictor,
+                           G1ReservePercent,
+                           G1HeapWastePercent);
 }
 
 bool G1Policy::update_ihop_prediction(double mutator_time_s,
diff --git a/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp b/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp
index af6c5513e49..ff661fde00d 100644
--- a/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp
@@ -62,16 +62,16 @@ static void test_update_humongous(G1IHOPControl* ctrl,
 }
 
 // @requires UseG1GC
-TEST_VM(G1StaticIHOPControl, simple) {
+TEST_VM(G1IHOPControl, static_simple) {
   // Test requires G1
   if (!UseG1GC) {
     return;
   }
-
+  const bool is_adaptive = false;
   const size_t initial_ihop = 45;
 
   G1OldGenAllocationTracker alloc_tracker;
-  G1StaticIHOPControl ctrl(initial_ihop, &alloc_tracker);
+  G1IHOPControl ctrl(initial_ihop, &alloc_tracker, is_adaptive, nullptr, 0, 0);
   ctrl.update_target_occupancy(100);
 
   size_t threshold = ctrl.get_conc_mark_start_threshold();
@@ -99,12 +99,13 @@ TEST_VM(G1StaticIHOPControl, simple) {
 }
 
 // @requires UseG1GC
-TEST_VM(G1AdaptiveIHOPControl, simple) {
+TEST_VM(G1IHOPControl, adaptive_simple) {
   // Test requires G1
   if (!UseG1GC) {
     return;
   }
 
+  const bool is_adaptive = true;
   const size_t initial_threshold = 45;
   const size_t young_size = 10;
   const size_t target_size = 100;
@@ -114,7 +115,7 @@ TEST_VM(G1AdaptiveIHOPControl, simple) {
 
   G1OldGenAllocationTracker alloc_tracker;
   G1Predictions pred(0.95);
-  G1AdaptiveIHOPControl ctrl(initial_threshold, &alloc_tracker, &pred, 0, 0);
+  G1IHOPControl ctrl(initial_threshold, &alloc_tracker, is_adaptive, &pred, 0, 0);
   ctrl.update_target_occupancy(target_size);
 
   // First "load".
@@ -177,12 +178,13 @@ TEST_VM(G1AdaptiveIHOPControl, simple) {
   EXPECT_GT(threshold, settled_ihop3);
 }
 
-TEST_VM(G1AdaptiveIHOPControl, humongous) {
+TEST_VM(G1IHOPControl, adaptive_humongous) {
   // Test requires G1
   if (!UseG1GC) {
     return;
   }
 
+  const bool is_adaptive = true;
   const size_t initial_threshold = 45;
   const size_t young_size = 10;
   const size_t target_size = 100;
@@ -191,7 +193,7 @@ TEST_VM(G1AdaptiveIHOPControl, humongous) {
 
   G1OldGenAllocationTracker alloc_tracker;
   G1Predictions pred(0.95);
-  G1AdaptiveIHOPControl ctrl(initial_threshold, &alloc_tracker, &pred, 0, 0);
+  G1IHOPControl ctrl(initial_threshold, &alloc_tracker, is_adaptive, &pred, 0, 0);
   ctrl.update_target_occupancy(target_size);
 
   size_t old_bytes = 100;
@@ -213,7 +215,7 @@ TEST_VM(G1AdaptiveIHOPControl, humongous) {
   EXPECT_EQ(threshold, target_threshold);
 
   // Load 2
-  G1AdaptiveIHOPControl ctrl2(initial_threshold, &alloc_tracker, &pred, 0, 0);
+  G1IHOPControl ctrl2(initial_threshold, &alloc_tracker, is_adaptive, &pred, 0, 0);
   ctrl2.update_target_occupancy(target_size);
   test_update_humongous(&ctrl2, &alloc_tracker, duration, old_bytes, humongous_bytes,
                         humongous_bytes_after_gc, young_size, marking_time);
@@ -229,7 +231,7 @@ TEST_VM(G1AdaptiveIHOPControl, humongous) {
   // Load 3
   humongous_bytes_after_last_gc = humongous_bytes_after_gc;
   humongous_bytes_after_gc = 50;
-  G1AdaptiveIHOPControl ctrl3(initial_threshold, &alloc_tracker, &pred, 0, 0);
+  G1IHOPControl ctrl3(initial_threshold, &alloc_tracker, is_adaptive, &pred, 0, 0);
   ctrl3.update_target_occupancy(target_size);
   test_update_humongous(&ctrl3, &alloc_tracker, duration, old_bytes, humongous_bytes,
                         humongous_bytes_after_gc, young_size, marking_time);

From 41e0017bdbd8c818a57509a914ae77c2a903a01c Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 21 Nov 2025 13:53:01 +0000
Subject: [PATCH 295/512] 8372269: Parallel: Remove unused
 ParallelScavengeHeap::base

Reviewed-by: aboldtch, fandreuzzi, tschatzl
---
 src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index 0221fd2a90e..5d8ddbcaaed 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -202,7 +202,6 @@ public:
   bool requires_barriers(stackChunkOop obj) const override;
 
   MemRegion reserved_region() const { return _reserved; }
-  HeapWord* base() const { return _reserved.start(); }
 
   // Memory allocation.
   HeapWord* mem_allocate(size_t size) override;

From f9127720459017bb250327dcd3e5c51316536068 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 21 Nov 2025 14:56:56 +0000
Subject: [PATCH 296/512] 8372290: jpackage test lib improvements

Reviewed-by: almatvee
---
 .../jdk/tools/jpackage/clean_stashed_files.sh | 10 ++-
 test/jdk/tools/jpackage/clean_test_output.sh  |  3 +
 .../jdk/jpackage/test/AdditionalLauncher.java | 38 +--------
 .../jdk/jpackage/test/CannedArgument.java     | 28 +++++++
 .../jpackage/test/CannedFormattedString.java  | 27 ++++--
 .../jdk/jpackage/test/ConfigFilesStasher.java |  2 +-
 .../jdk/jpackage/test/JPackageCommand.java    | 20 ++++-
 .../test/LauncherAsServiceVerifier.java       | 14 +---
 .../jdk/jpackage/test/LauncherShortcut.java   |  1 -
 .../jdk/jpackage/test/LauncherVerifier.java   |  1 -
 .../jdk/jpackage/test/PropertyFile.java       | 82 +++++++++++++++++++
 .../jdk/jpackage/test/PropertyFinder.java     |  1 -
 .../jpackage/share/AppImagePackageTest.java   | 19 +++++
 test/jdk/tools/jpackage/share/ErrorTest.java  |  6 +-
 14 files changed, 189 insertions(+), 63 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedArgument.java
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFile.java

diff --git a/test/jdk/tools/jpackage/clean_stashed_files.sh b/test/jdk/tools/jpackage/clean_stashed_files.sh
index db393877b19..161541cfe58 100644
--- a/test/jdk/tools/jpackage/clean_stashed_files.sh
+++ b/test/jdk/tools/jpackage/clean_stashed_files.sh
@@ -80,6 +80,7 @@ linuxAllActions="${linuxActions} ${linuxRpmActions} ${linuxDebActions}"
 actions='
   rmPostImageScript
   sortAppImageListing
+  derandomizeServiceTestCfgFiles
 '
 allActions="${actions} ${winAllActions} ${macAllActions} ${linuxAllActions}"
 
@@ -94,6 +95,13 @@ sortAppImageListing() {
   find "$stash_dir" -name 'app-image-listing.txt' -type f -exec sort -o {} {} \;
 }
 
+derandomizeServiceTestCfgFiles() {
+  # Convert variable part of 'java-options=-Djpackage.test.appOutput=/tmp/AddLServiceTest-0000019a5a3fac9c-launcher-as-service.txt'
+  # in '*.cfg' files of the ServiceTest test.
+  find "$stash_dir" -path '*/ServiceTest/*.cfg' -type f | xargs -I {} sed $sed_inplace_option \
+      -e 's|ServiceTest-[[:xdigit:]]\{1,\}-\([^ ]*\.txt\)|ServiceTest-<SEED>-\1|g' \
+      '{}'
+}
 
 #
 # MAC:
@@ -120,7 +128,7 @@ macDmgFilterScpt() {
   #  - Trim random absolute temp path
   #  - Replace "/dmg-workdir/" (new) with "/images/" (old)
   find "$stash_dir" -name '*.scpt' -type f | xargs -I {} sed $sed_inplace_option \
-      -e 's|/jdk.jpackage[0-9]\{1,\}/|/jdk.jpackage/|' \
+      -e 's|/jdk\.jpackage[0-9]\{1,\}/|/jdk.jpackage/|' \
       -e 's|/dmg-workdir/|/images/|' \
       '{}'
 }
diff --git a/test/jdk/tools/jpackage/clean_test_output.sh b/test/jdk/tools/jpackage/clean_test_output.sh
index 200d6add299..e59ce46a86f 100644
--- a/test/jdk/tools/jpackage/clean_test_output.sh
+++ b/test/jdk/tools/jpackage/clean_test_output.sh
@@ -114,6 +114,9 @@ filterFile () {
       # Use the same name for all exceptions.
       -e 's|[^ ]\{1,\}\.[^ ]\{1,\}\Exception:|<Exception>:|g'
       -e 's|[^ ]\{1,\}\.[^ ]\{1,\}\ExceptionBox:|<Exception>:|g'
+
+      # Convert variable part of 'ServiceTest-0000019a5516cf7a-A2-launcher-as-service.txt' path
+      -e 's|ServiceTest-[[:xdigit:]]\{1,\}-\([^ ]*\.txt\)|ServiceTest-<SEED>-\1|g'
   )
 
   sed $sed_inplace_option "$1" "${expressions[@]}"
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
index 4f0e3f4e485..95373fa0d61 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
@@ -22,13 +22,11 @@
  */
 package jdk.jpackage.test;
 
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 import static jdk.jpackage.test.LauncherShortcut.LINUX_SHORTCUT;
 import static jdk.jpackage.test.LauncherShortcut.WIN_DESKTOP_SHORTCUT;
 import static jdk.jpackage.test.LauncherShortcut.WIN_START_MENU_SHORTCUT;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,9 +37,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.function.BiConsumer;
+import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.test.LauncherShortcut.StartupDirectory;
@@ -205,15 +203,13 @@ public final class AdditionalLauncher {
 
     public static PropertyFile getAdditionalLauncherProperties(
             JPackageCommand cmd, String launcherName) {
-        PropertyFile shell[] = new PropertyFile[1];
+        var result = Slot.<PropertyFile>createEmpty();
         forEachAdditionalLauncher(cmd, (name, propertiesFilePath) -> {
             if (name.equals(launcherName)) {
-                shell[0] = toSupplier(() -> {
-                    return new PropertyFile(propertiesFilePath);
-                }).get();
+                result.set(new PropertyFile(propertiesFilePath));
             }
         });
-        return Objects.requireNonNull(shell[0]);
+        return result.get();
     }
 
     private void initialize(JPackageCommand cmd) throws IOException {
@@ -245,32 +241,6 @@ public final class AdditionalLauncher {
         createFileHandler.accept(propsFile, properties.entrySet());
     }
 
-    public static final class PropertyFile {
-
-        PropertyFile(Map<String, String> data) {
-            this.data = new Properties();
-            this.data.putAll(data);
-        }
-
-        PropertyFile(Path path) throws IOException {
-            data = new Properties();
-            try (var reader = Files.newBufferedReader(path)) {
-                data.load(reader);
-            }
-        }
-
-        public Optional<String> findProperty(String name) {
-            Objects.requireNonNull(name);
-            return Optional.ofNullable(data.getProperty(name));
-        }
-
-        public Optional<Boolean> findBooleanProperty(String name) {
-            return findProperty(name).map(Boolean::parseBoolean);
-        }
-
-        private final Properties data;
-    }
-
     private List<String> javaOptions;
     private List<String> defaultArguments;
     private Path icon;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedArgument.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedArgument.java
new file mode 100644
index 00000000000..b50d12ac4ec
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedArgument.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.test;
+
+@FunctionalInterface
+public interface CannedArgument {
+    public String getValue();
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java
index 940dd47e06d..09f867da786 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java
@@ -23,26 +23,23 @@
 package jdk.jpackage.test;
 
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 
-public record CannedFormattedString(BiFunction<String, Object[], String> formatter, String key, Object[] args) {
+public record CannedFormattedString(BiFunction<String, Object[], String> formatter, String key, Object[] args) implements CannedArgument {
 
-    @FunctionalInterface
-    public interface CannedArgument {
-        public String value();
-    }
-
-    public static Object cannedArgument(Supplier<Object> supplier, String label) {
+    public static CannedArgument cannedArgument(Supplier<Object> supplier, String label) {
         Objects.requireNonNull(supplier);
         Objects.requireNonNull(label);
         return new CannedArgument() {
 
             @Override
-            public String value() {
+            public String getValue() {
                 return supplier.get().toString();
             }
 
@@ -61,6 +58,10 @@ public record CannedFormattedString(BiFunction<String, Object[], String> formatt
         return cannedAbsolutePath(Path.of(v));
     }
 
+    public CannedFormattedString mapArgs(UnaryOperator<Object> mapper) {
+        return new CannedFormattedString(formatter, key, Stream.of(args).map(mapper).toArray());
+    }
+
     public CannedFormattedString {
         Objects.requireNonNull(formatter);
         Objects.requireNonNull(key);
@@ -71,13 +72,21 @@ public record CannedFormattedString(BiFunction<String, Object[], String> formatt
     public String getValue() {
         return formatter.apply(key, Stream.of(args).map(arg -> {
             if (arg instanceof CannedArgument cannedArg) {
-                return cannedArg.value();
+                return cannedArg.getValue();
             } else {
                 return arg;
             }
         }).toArray());
     }
 
+    public CannedFormattedString addPrefix(String prefixKey) {
+        Objects.requireNonNull(prefixKey);
+        return new CannedFormattedString((theKey, theArgs) -> {
+            var str = formatter.apply((String)theArgs[0], Arrays.copyOfRange(theArgs, 1, theArgs.length));
+            return formatter.apply(theKey, new Object[] {str});
+        }, prefixKey, Stream.concat(Stream.of(key), Stream.of(args)).toArray());
+    }
+
     @Override
     public String toString() {
         if (args.length == 0) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
index 0b3f5defbac..d62cab83dd8 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
@@ -211,7 +211,7 @@ final class ConfigFilesStasher {
     }
 
     private static boolean isWithServices(JPackageCommand cmd) {
-        return cmd.launcherNames(true).stream().anyMatch(launcherName -> {
+        return !cmd.isImagePackageType() && cmd.launcherNames(true).stream().anyMatch(launcherName -> {
             return LauncherAsServiceVerifier.launcherAsService(cmd, launcherName);
         });
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
index 98d991e38f3..197e835ed8d 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -25,10 +25,10 @@ package jdk.jpackage.test;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
-import static java.util.stream.Collectors.toCollection;
 import static jdk.jpackage.test.AdditionalLauncher.forEachAdditionalLauncher;
 
 import java.io.FileOutputStream;
@@ -864,6 +864,14 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         };
     }
 
+    public static CannedFormattedString makeError(CannedFormattedString v) {
+        return v.addPrefix("message.error-header");
+    }
+
+    public static CannedFormattedString makeAdvice(CannedFormattedString v) {
+        return v.addPrefix("message.advice-header");
+    }
+
     public String getValue(CannedFormattedString str) {
         return new CannedFormattedString(str.formatter(), str.key(), Stream.of(str.args()).map(arg -> {
             if (arg instanceof CannedArgument cannedArg) {
@@ -1240,6 +1248,9 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         PREDEFINED_APP_IMAGE_COPY(cmd -> {
             Optional.ofNullable(cmd.getArgumentValue("--app-image")).filter(_ -> {
                 return !TKit.isOSX() || !MacHelper.signPredefinedAppImage(cmd);
+            }).filter(_ -> {
+                // Don't examine the contents of the output app image if this is Linux package installing in the "/usr" subtree.
+                return Optional.<Boolean>ofNullable(cmd.onLinuxPackageInstallDir(null, _ -> false)).orElse(true);
             }).map(Path::of).ifPresent(predefinedAppImage -> {
 
                 TKit.trace(String.format(
@@ -1282,7 +1293,12 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
                 TKit.trace("Done");
             });
-        })
+        }),
+        LINUX_APPLAUNCHER_LIB(cmd -> {
+            if (TKit.isLinux() && !cmd.isRuntime()) {
+                TKit.assertFileExists(cmd.appLayout().libapplauncher());
+            }
+        }),
         ;
 
         StandardAssert(Consumer<JPackageCommand> action) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
index ce6faf99034..0be6cf685f6 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
@@ -246,19 +246,13 @@ public final class LauncherAsServiceVerifier {
                     PropertyFinder.nop()
             ).map(Boolean::parseBoolean).orElse(false);
         } else {
-            var mainLauncherValue = PropertyFinder.findLauncherProperty(cmd, null,
-                    PropertyFinder.cmdlineBooleanOption("--launcher-as-service"),
-                    PropertyFinder.nop(),
-                    PropertyFinder.nop()
-            ).map(Boolean::parseBoolean).orElse(false);
-
-            var value = PropertyFinder.findLauncherProperty(cmd, launcherName,
+            return PropertyFinder.findLauncherProperty(cmd, launcherName,
                     PropertyFinder.nop(),
                     PropertyFinder.launcherPropertyFile("launcher-as-service"),
                     PropertyFinder.appImageFileLauncher(cmd, launcherName, "service").defaultValue(Boolean.FALSE.toString())
-            ).map(Boolean::parseBoolean);
-
-            return value.orElse(mainLauncherValue);
+            ).map(Boolean::parseBoolean).orElseGet(() -> {
+                return launcherAsService(cmd, null);
+            });
         }
     }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherShortcut.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherShortcut.java
index 2cc5fcc95fc..94852eed09f 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherShortcut.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherShortcut.java
@@ -32,7 +32,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import jdk.jpackage.test.AdditionalLauncher.PropertyFile;
 
 public enum LauncherShortcut {
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
index bae038d071c..89468ef7f86 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
@@ -44,7 +44,6 @@ import jdk.jpackage.internal.resources.ResourceLocator;
 import jdk.jpackage.internal.util.PListReader;
 import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
-import jdk.jpackage.test.AdditionalLauncher.PropertyFile;
 import jdk.jpackage.test.LauncherShortcut.StartupDirectory;
 import org.xml.sax.SAXException;
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFile.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFile.java
new file mode 100644
index 00000000000..2fe32ce6fd1
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFile.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.test;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
+public final class PropertyFile {
+
+    PropertyFile(Map<String, String> data) {
+        this.data = new Properties();
+        this.data.putAll(data);
+        path = Optional.empty();
+    }
+
+    PropertyFile(Path path) {
+        data = new Properties();
+        try (var reader = Files.newBufferedReader(path)) {
+            data.load(reader);
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+        this.path = Optional.of(path);
+    }
+
+    public Optional<String> findProperty(String name) {
+        Objects.requireNonNull(name);
+        return Optional.ofNullable(data.getProperty(name));
+    }
+
+    public Optional<Boolean> findBooleanProperty(String name) {
+        return findProperty(name).map(Boolean::parseBoolean);
+    }
+
+    public Optional<Path> path() {
+        return path;
+    }
+
+    public Path getPath() {
+        return path().orElseThrow();
+    }
+
+    public Map<String, String> toMap() {
+        return data.entrySet().stream().collect(Collectors.toUnmodifiableMap(e -> {
+            return (String)e.getKey();
+        }, e -> {
+            return (String)e.getValue();
+        }));
+    }
+
+    private final Properties data;
+    private final Optional<Path> path;
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
index 54e3ef2ec54..6c612fa9ba5 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
@@ -30,7 +30,6 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
-import jdk.jpackage.test.AdditionalLauncher.PropertyFile;
 
 final class PropertyFinder {
 
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index e6dd3dad3c4..bfd731b67d5 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.function.Predicate;
+import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.util.XmlUtils;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
@@ -185,6 +186,24 @@ public class AppImagePackageTest {
         }).run(Action.CREATE);
     }
 
+    /**
+     * Test building Linux package from the predefined app image with installation
+     * directory in the "/usr" subtree.
+     */
+    @Test(ifOS = OperatingSystem.LINUX)
+    public static void testUsrInstallDir() {
+        final var appImageCmd = createAppImageCommand();
+
+        new PackageTest()
+        .addRunOnceInitializer(appImageCmd::execute)
+        .usePredefinedAppImage(appImageCmd)
+        .addBundleDesktopIntegrationVerifier(false)
+        .addInitializer(cmd -> {
+            cmd.addArguments("--install-dir", "/usr");
+        })
+        .run();
+    }
+
     private static PackageTest configureBadAppImage(Path appImageDir) {
         return configureBadAppImage(appImageDir, JPackageStringBundle.MAIN.cannedFormattedString(
                 "error.missing-app-image-file", AppImageFile.getPathInAppImage(Path.of("")), appImageDir));
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index af9ca84848f..4395db77212 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -27,7 +27,6 @@ import static jdk.internal.util.OperatingSystem.LINUX;
 import static jdk.internal.util.OperatingSystem.MACOS;
 import static jdk.internal.util.OperatingSystem.WINDOWS;
 import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
-import static jdk.jpackage.test.CannedFormattedString.cannedAbsolutePath;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -46,6 +45,7 @@ import jdk.jpackage.internal.util.TokenReplace;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedArgument;
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
@@ -141,7 +141,7 @@ public final class ErrorTest {
         private final TokenReplace tokenReplace = new TokenReplace(token());
     }
 
-    record PackageTypeSpec(Optional<PackageType> type, boolean anyNativeType) implements CannedFormattedString.CannedArgument {
+    record PackageTypeSpec(Optional<PackageType> type, boolean anyNativeType) implements CannedArgument {
         PackageTypeSpec {
             Objects.requireNonNull(type);
             if (type.isPresent() && anyNativeType) {
@@ -166,7 +166,7 @@ public final class ErrorTest {
         }
 
         @Override
-        public String value() {
+        public String getValue() {
             return resolvedType().getType();
         }
 

From e439909b7d3ee8db3a09c3d3354ead56dd5397d7 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 21 Nov 2025 14:58:46 +0000
Subject: [PATCH 297/512] 8372292: Remove redundant "throws ConfigException"

Reviewed-by: almatvee
---
 .../internal/LinuxDebPackageBuilder.java      |  3 +-
 .../internal/LinuxPackageBuilder.java         | 25 ++++++-------
 .../internal/LinuxRpmPackageBuilder.java      |  3 +-
 .../AppImageSigningConfigBuilder.java         | 24 ++++++-------
 .../internal/MacApplicationBuilder.java       | 36 +++++++------------
 .../internal/MacDmgPackageBuilder.java        |  3 +-
 .../internal/MacFileAssociationBuilder.java   |  4 +--
 .../jpackage/internal/MacPackageBuilder.java  |  3 +-
 .../internal/MacPackagingPipeline.java        | 10 +++---
 .../internal/MacPkgPackageBuilder.java        | 15 +++-----
 .../internal/MacRuntimeValidator.java         |  5 ++-
 .../internal/SigningIdentityBuilder.java      |  8 ++---
 .../jpackage/internal/ApplicationBuilder.java | 29 ++++++---------
 .../jpackage/internal/BuildEnvBuilder.java    |  3 +-
 .../internal/JLinkRuntimeBuilder.java         |  5 ++-
 .../jpackage/internal/LauncherBuilder.java    | 16 ++++-----
 .../jdk/jpackage/internal/PackageBuilder.java |  6 ++--
 .../internal/RuntimeBuilderBuilder.java       | 15 +++-----
 .../internal/model/ConfigException.java       | 19 ----------
 .../internal/WinExePackageBuilder.java        |  8 ++---
 .../internal/WinMsiPackageBuilder.java        |  4 +--
 .../internal/WinSystemEnvironment.java        |  4 +--
 .../jdk/jpackage/internal/WixTool.java        |  2 +-
 23 files changed, 88 insertions(+), 162 deletions(-)

diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
index 50e371d5c76..d7b6559abe1 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
@@ -26,7 +26,6 @@ package jdk.jpackage.internal;
 
 import java.util.Objects;
 import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LinuxDebPackage;
 import jdk.jpackage.internal.model.LinuxDebPackageMixin;
 
@@ -36,7 +35,7 @@ final class LinuxDebPackageBuilder {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
-    LinuxDebPackage create() throws ConfigException {
+    LinuxDebPackage create() {
         if (pkgBuilder.category().isEmpty()) {
             pkgBuilder.category(DEFAULTS.category());
         }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
index 4cfb8a26c8f..bc7c301ace2 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
@@ -32,12 +32,11 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LinuxApplication;
 import jdk.jpackage.internal.model.LinuxPackage;
-import jdk.jpackage.internal.model.RuntimeLayout;
 import jdk.jpackage.internal.model.LinuxPackageMixin;
 import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.RuntimeLayout;
 import jdk.jpackage.internal.model.StandardPackageType;
 
 final class LinuxPackageBuilder {
@@ -46,20 +45,17 @@ final class LinuxPackageBuilder {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
-    LinuxPackage create() throws ConfigException {
-        if (literalName != null) {
-            pkgBuilder.name(literalName);
-        } else {
+    LinuxPackage create() {
+        pkgBuilder.name(Optional.ofNullable(literalName).orElseGet(() -> {
             // Lower case and turn spaces/underscores into dashes
-            pkgBuilder.name(pkgBuilder.create().packageName().toLowerCase().replaceAll("[ _]", "-"));
-        }
+            return pkgBuilder.create().packageName().toLowerCase().replaceAll("[ _]", "-");
+        }));
 
         final var tmpPkg = pkgBuilder.create();
 
-        final var stdPkgType = tmpPkg.asStandardPackageType();
-        if (stdPkgType.isPresent()) {
-            validatePackageName(tmpPkg.packageName(), stdPkgType.orElseThrow());
-        }
+        tmpPkg.asStandardPackageType().ifPresent(stdPkgType -> {
+            validatePackageName(tmpPkg.packageName(), stdPkgType);
+        });
 
         final AppImageLayout relativeInstalledLayout;
         if (create(tmpPkg).isInstallDirInUsrTree()) {
@@ -81,7 +77,7 @@ final class LinuxPackageBuilder {
                 .create());
     }
 
-    private LinuxPackage create(Package pkg) throws ConfigException {
+    private LinuxPackage create(Package pkg) {
         return LinuxPackage.create(pkg, new LinuxPackageMixin.Stub(
                 Optional.ofNullable(menuGroupName).orElseGet(DEFAULTS::menuGroupName),
                 category(),
@@ -137,8 +133,7 @@ final class LinuxPackageBuilder {
                 lib.resolve("lib/libapplauncher.so"));
     }
 
-    private static void validatePackageName(String packageName,
-            StandardPackageType pkgType) throws ConfigException {
+    private static void validatePackageName(String packageName, StandardPackageType pkgType) {
         switch (pkgType) {
             case LINUX_DEB -> {
                 //
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
index bc361eac759..f97a7741e42 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
@@ -26,7 +26,6 @@ package jdk.jpackage.internal;
 
 import java.util.Objects;
 import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LinuxRpmPackage;
 import jdk.jpackage.internal.model.LinuxRpmPackageMixin;
 
@@ -36,7 +35,7 @@ final class LinuxRpmPackageBuilder {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
-    LinuxRpmPackage create() throws ConfigException {
+    LinuxRpmPackage create() {
         if (pkgBuilder.release().isEmpty()) {
             pkgBuilder.release("1");
         }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
index bb043830f3c..6fc7fe004c2 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
@@ -28,7 +28,6 @@ import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.model.AppImageSigningConfig;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
 
 final class AppImageSigningConfigBuilder {
@@ -62,21 +61,20 @@ final class AppImageSigningConfigBuilder {
         return this;
     }
 
-    Optional<AppImageSigningConfig> create() throws ConfigException {
-        final var identityCfg = signingIdentityBuilder.create();
-        if (identityCfg.isEmpty()) {
-            return Optional.empty();
-        } else {
+    Optional<AppImageSigningConfig> create() {
+        return signingIdentityBuilder.create().map(cfg -> {
             final var validatedEntitlements = validatedEntitlements();
-            return identityCfg.map(cfg -> {
-                return new AppImageSigningConfig.Stub(cfg.identity(), signingIdentifierPrefix,
-                        validatedEntitlements, cfg.keychain().map(Keychain::name),
-                        Optional.ofNullable(entitlementsResourceName).orElse("entitlements.plist"));
-            });
-        }
+            return new AppImageSigningConfig.Stub(
+                    Objects.requireNonNull(cfg.identity()),
+                    Objects.requireNonNull(signingIdentifierPrefix),
+                    validatedEntitlements,
+                    cfg.keychain().map(Keychain::name),
+                    Optional.ofNullable(entitlementsResourceName).orElse("entitlements.plist")
+            );
+        });
     }
 
-    private Optional<Path> validatedEntitlements() throws ConfigException {
+    private Optional<Path> validatedEntitlements() {
         return Optional.ofNullable(entitlements);
     }
 
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
index 226bb9e8134..5f126305aed 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
@@ -28,17 +28,15 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
-import java.util.Set;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.AppImageSigningConfig;
 import jdk.jpackage.internal.model.Application;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.MacApplication;
 import jdk.jpackage.internal.model.MacApplicationMixin;
-import jdk.jpackage.internal.model.AppImageLayout;
-import jdk.jpackage.internal.model.AppImageSigningConfig;
 
 final class MacApplicationBuilder {
 
@@ -92,7 +90,7 @@ final class MacApplicationBuilder {
         return this;
     }
 
-    MacApplication create() throws ConfigException {
+    MacApplication create() {
         if (externalInfoPlistFile != null) {
             return createCopyForExternalInfoPlistFile().create();
         }
@@ -136,7 +134,7 @@ final class MacApplicationBuilder {
         return true;
     }
 
-    private static void validateAppVersion(Application app) throws ConfigException {
+    private static void validateAppVersion(Application app) {
         try {
             CFBundleVersion.of(app.version());
         } catch (IllegalArgumentException ex) {
@@ -156,7 +154,7 @@ final class MacApplicationBuilder {
         }
     }
 
-    private MacApplicationBuilder createCopyForExternalInfoPlistFile() throws ConfigException {
+    private MacApplicationBuilder createCopyForExternalInfoPlistFile() {
         try {
             final var plistFile = AppImageInfoPListFile.loadFromInfoPList(externalInfoPlistFile);
 
@@ -187,15 +185,11 @@ final class MacApplicationBuilder {
         }
     }
 
-    private Optional<AppImageSigningConfig> createSigningConfig() throws ConfigException {
-        if (signingBuilder != null) {
-            return signingBuilder.create();
-        } else {
-            return Optional.empty();
-        }
+    private Optional<AppImageSigningConfig> createSigningConfig() {
+        return Optional.ofNullable(signingBuilder).flatMap(AppImageSigningConfigBuilder::create);
     }
 
-    private String validatedBundleName() throws ConfigException {
+    private String validatedBundleName() {
         final var value = Optional.ofNullable(bundleName).orElseGet(() -> {
             final var appName = app.name();
 // Commented out for backward compatibility
@@ -214,7 +208,7 @@ final class MacApplicationBuilder {
         return value;
     }
 
-    private String validatedBundleIdentifier() throws ConfigException {
+    private String validatedBundleIdentifier() {
         final var value = Optional.ofNullable(bundleIdentifier).orElseGet(() -> {
             return app.mainLauncher()
                     .flatMap(Launcher::startupInfo)
@@ -238,16 +232,12 @@ final class MacApplicationBuilder {
         return value;
     }
 
-    private String validatedCategory() throws ConfigException {
+    private String validatedCategory() {
         return "public.app-category." + Optional.ofNullable(category).orElseGet(DEFAULTS::category);
     }
 
-    private Optional<Path> validatedIcon() throws ConfigException {
-        if (icon != null) {
-            LauncherBuilder.validateIcon(icon);
-        }
-
-        return Optional.ofNullable(icon);
+    private Optional<Path> validatedIcon() {
+        return Optional.ofNullable(icon).map(LauncherBuilder::validateIcon);
     }
 
     private record Defaults(String category) {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
index c2b9c25f327..10754b1f1b6 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
@@ -28,7 +28,6 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.MacDmgPackage;
 import jdk.jpackage.internal.model.MacDmgPackageMixin;
 
@@ -52,7 +51,7 @@ final class MacDmgPackageBuilder {
         return Optional.ofNullable(dmgContent).orElseGet(List::of);
     }
 
-    MacDmgPackage create() throws ConfigException {
+    MacDmgPackage create() {
         final var pkg = pkgBuilder.create();
 
         return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java
index c86b3a15cbb..7b9e5478f74 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java
@@ -27,15 +27,13 @@ package jdk.jpackage.internal;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.FileAssociation;
 import jdk.jpackage.internal.model.MacFileAssociation;
 import jdk.jpackage.internal.model.MacFileAssociationMixin;
 
 final class MacFileAssociationBuilder {
 
-    MacFileAssociation create(FileAssociation fa) throws ConfigException {
+    MacFileAssociation create(FileAssociation fa) {
         Objects.requireNonNull(fa);
 
         final var mixin = new MacFileAssociationMixin.Stub(
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java
index 9576f6a6a99..e19f234d0d6 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java
@@ -29,7 +29,6 @@ import static jdk.jpackage.internal.MacPackagingPipeline.LayoutUtils.packagerLay
 
 import java.nio.file.Files;
 import java.util.Objects;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.MacApplication;
 import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.MacPackageMixin;
@@ -49,7 +48,7 @@ final class MacPackageBuilder {
         return pkgBuilder;
     }
 
-    MacPackage create() throws ConfigException {
+    MacPackage create() {
 
         final var app = (MacApplication)pkgBuilder.app();
 
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
index 51fd15afabb..53f297282ba 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
@@ -224,10 +224,12 @@ final class MacPackagingPipeline {
         if (!app.sign()) {
             throw new IllegalArgumentException();
         }
-        return toSupplier(() -> {
-            return new PackageBuilder(app, SignAppImagePackageType.VALUE).predefinedAppImage(
-                    Objects.requireNonNull(env.appImageDir())).installDir(Path.of("/foo")).create();
-        }).get();
+        return new PackageBuilder(
+                app,
+                SignAppImagePackageType.VALUE
+        ).predefinedAppImage(
+                Objects.requireNonNull(env.appImageDir())
+        ).installDir(Path.of("/foo")).create();
     }
 
     static final class LayoutUtils {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
index 663b8b16265..b81340354e1 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
@@ -26,7 +26,6 @@ package jdk.jpackage.internal;
 
 import java.util.Objects;
 import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.MacPkgPackage;
 import jdk.jpackage.internal.model.MacPkgPackageMixin;
 import jdk.jpackage.internal.model.PkgSigningConfig;
@@ -42,20 +41,16 @@ final class MacPkgPackageBuilder {
         return this;
     }
 
-    MacPkgPackage create() throws ConfigException {
+    MacPkgPackage create() {
         var pkg = MacPkgPackage.create(pkgBuilder.create(), new MacPkgPackageMixin.Stub(createSigningConfig()));
         validatePredefinedAppImage(pkg);
         return pkg;
     }
 
-    private Optional<PkgSigningConfig> createSigningConfig() throws ConfigException {
-        if (signingBuilder != null) {
-            return signingBuilder.create().map(cfg -> {
-                return new PkgSigningConfig.Stub(cfg.identity(), cfg.keychain().map(Keychain::name));
-            });
-        } else {
-            return Optional.empty();
-        }
+    private Optional<PkgSigningConfig> createSigningConfig() {
+        return Optional.ofNullable(signingBuilder).flatMap(SigningIdentityBuilder::create).map(cfg -> {
+            return new PkgSigningConfig.Stub(cfg.identity(), cfg.keychain().map(Keychain::name));
+        });
     }
 
     private static void validatePredefinedAppImage(MacPkgPackage pkg) {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacRuntimeValidator.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacRuntimeValidator.java
index e7ef6a23fa7..cfab12cbcba 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacRuntimeValidator.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacRuntimeValidator.java
@@ -30,12 +30,11 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.function.Predicate;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.RuntimeLayout;
 
 final class MacRuntimeValidator {
 
-    static void validateRuntimeHasJliLib(RuntimeLayout runtimeLayout) throws ConfigException {
+    static void validateRuntimeHasJliLib(RuntimeLayout runtimeLayout) {
         final var jliName = Path.of("libjli.dylib");
         try (var walk = Files.walk(runtimeLayout.runtimeDirectory().resolve("lib"))) {
             if (walk.map(Path::getFileName).anyMatch(Predicate.isEqual(jliName))) {
@@ -51,7 +50,7 @@ final class MacRuntimeValidator {
                 runtimeLayout.unresolve().runtimeDirectory().resolve("lib/**").resolve(jliName)).create();
     }
 
-    static void validateRuntimeHasNoBinDir(RuntimeLayout runtimeLayout) throws ConfigException {
+    static void validateRuntimeHasNoBinDir(RuntimeLayout runtimeLayout) {
         if (Files.isDirectory(runtimeLayout.runtimeDirectory().resolve("bin"))) {
             throw I18N.buildConfigException()
                     .message("error.invalid-runtime-image-bin-dir", runtimeLayout.rootDirectory())
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
index f90e76bb23d..9a57ce1e697 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
@@ -82,7 +82,7 @@ final class SigningIdentityBuilder {
         return this;
     }
 
-    Optional<SigningConfig> create() throws ConfigException {
+    Optional<SigningConfig> create() {
         if (signingIdentity == null && certificateSelector == null) {
             return Optional.empty();
         } else {
@@ -90,11 +90,11 @@ final class SigningIdentityBuilder {
         }
     }
 
-    private Optional<Keychain> validatedKeychain() throws ConfigException {
+    private Optional<Keychain> validatedKeychain() {
         return Optional.ofNullable(keychain).map(Keychain::new);
     }
 
-    private SigningIdentity validatedSigningIdentity() throws ConfigException {
+    private SigningIdentity validatedSigningIdentity() {
         if (signingIdentity != null) {
             return new SigningIdentityImpl(signingIdentity);
         }
@@ -142,7 +142,7 @@ final class SigningIdentityBuilder {
     }
 
     private static X509Certificate selectSigningIdentity(List<X509Certificate> certs,
-            CertificateSelector certificateSelector, Optional<Keychain> keychain) throws ConfigException {
+            CertificateSelector certificateSelector, Optional<Keychain> keychain) {
         Objects.requireNonNull(certificateSelector);
         Objects.requireNonNull(keychain);
         switch (certs.size()) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
index e9324f65671..6896668ffdc 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
@@ -35,13 +35,10 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.ExternalApplication;
-import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.LauncherIcon;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
@@ -50,26 +47,17 @@ import jdk.jpackage.internal.model.RuntimeBuilder;
 
 final class ApplicationBuilder {
 
-    Application create() throws ConfigException {
+    Application create() {
         Objects.requireNonNull(appImageLayout);
 
         final var launchersAsList = Optional.ofNullable(launchers).map(
                 ApplicationLaunchers::asList).orElseGet(List::of);
 
-        launchersAsList.stream().collect(Collectors.toMap(Launcher::name, x -> x, (a, b) -> {
-            throw new JPackageException(I18N.format("error.launcher-duplicate-name", a.name()));
-        }));
-
-        final String effectiveName;
-        if (name != null) {
-            effectiveName = name;
-        } else if (!launchersAsList.isEmpty()) {
-            effectiveName = launchers.mainLauncher().name();
-        } else {
-            throw buildConfigException("error.no.name").advice("error.no.name.advice").create();
-        }
-
-        Objects.requireNonNull(launchersAsList);
+        final String effectiveName = Optional.ofNullable(name).or(() -> {
+            return Optional.ofNullable(launchers).map(ApplicationLaunchers::mainLauncher).map(Launcher::name);
+        }).orElseThrow(() -> {
+            return buildConfigException("error.no.name").advice("error.no.name.advice").create();
+        });
 
         return new Application.Stub(
                 effectiveName,
@@ -79,7 +67,10 @@ final class ApplicationBuilder {
                 Optional.ofNullable(copyright).orElseGet(DEFAULTS::copyright),
                 Optional.ofNullable(srcDir),
                 Optional.ofNullable(contentDirs).orElseGet(List::of),
-                appImageLayout, Optional.ofNullable(runtimeBuilder), launchersAsList, Map.of());
+                appImageLayout,
+                Optional.ofNullable(runtimeBuilder),
+                launchersAsList,
+                Map.of());
     }
 
     ApplicationBuilder runtimeBuilder(RuntimeBuilder v) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
index ba70913eca9..a33df975072 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
@@ -31,7 +31,6 @@ import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.resources.ResourceLocator;
 
@@ -41,7 +40,7 @@ final class BuildEnvBuilder {
         this.root = Objects.requireNonNull(root);
     }
 
-    BuildEnv create() throws ConfigException {
+    BuildEnv create() {
         var exceptionBuilder = I18N.buildConfigException("ERR_BuildRootInvalid", root);
         if (Files.isDirectory(root)) {
             try (var rootDirContents = Files.list(root)) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
index 50d8049bc2d..37f166a4e7c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
@@ -50,7 +50,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.internal.module.ModulePath;
 import jdk.jpackage.internal.model.AppImageLayout;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.LauncherModularStartupInfo;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
@@ -95,7 +94,7 @@ final class JLinkRuntimeBuilder implements RuntimeBuilder {
     }
 
     static RuntimeBuilder createJLinkRuntimeBuilder(List<Path> modulePath, Set<String> addModules,
-            Set<String> limitModules, List<String> options, List<LauncherStartupInfo> startupInfos) throws ConfigException {
+            Set<String> limitModules, List<String> options, List<LauncherStartupInfo> startupInfos) {
         return new JLinkRuntimeBuilder(createJLinkCmdline(modulePath, addModules, limitModules,
                 options, startupInfos));
     }
@@ -147,7 +146,7 @@ final class JLinkRuntimeBuilder implements RuntimeBuilder {
     }
 
     private static List<String> createJLinkCmdline(List<Path> modulePath, Set<String> addModules,
-            Set<String> limitModules, List<String> options, List<LauncherStartupInfo> startupInfos) throws ConfigException {
+            Set<String> limitModules, List<String> options, List<LauncherStartupInfo> startupInfos) {
         List<String> launcherModules = startupInfos.stream().map(si -> {
             if (si instanceof LauncherModularStartupInfo siModular) {
                 return siModular.moduleName();
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
index 0f6b5d6ac8d..e3720e0a776 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
@@ -25,7 +25,6 @@
 package jdk.jpackage.internal;
 
 import static jdk.jpackage.internal.I18N.buildConfigException;
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -34,23 +33,20 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.CustomLauncherIcon;
-import jdk.jpackage.internal.model.DefaultLauncherIcon;
 import jdk.jpackage.internal.model.FileAssociation;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.Launcher.Stub;
-import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.model.LauncherIcon;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
-import jdk.jpackage.internal.model.ResourceDirLauncherIcon;
+import jdk.jpackage.internal.util.PathUtils;
 
 final class LauncherBuilder {
 
-    Launcher create() throws ConfigException {
+    Launcher create() {
         CustomLauncherIcon.fromLauncherIcon(icon)
                 .map(CustomLauncherIcon::path)
-                .ifPresent(toConsumer(LauncherBuilder::validateIcon));
+                .ifPresent(LauncherBuilder::validateIcon);
 
         final var fa = createFileAssociations(faSources, Optional.ofNullable(faTraits).orElse(DEFAULT_FA_TRAITS));
 
@@ -123,7 +119,7 @@ final class LauncherBuilder {
                     .setCategory("icon");
     }
 
-    static void validateIcon(Path icon) throws ConfigException {
+    static Path validateIcon(Path icon) {
         switch (OperatingSystem.current()) {
             case WINDOWS -> {
                 if (!icon.getFileName().toString().toLowerCase().endsWith(".ico")) {
@@ -144,13 +140,15 @@ final class LauncherBuilder {
                 throw new UnsupportedOperationException();
             }
         }
+
+        return icon;
     }
 
     record FileAssociationTraits() {
     }
 
     private static List<FileAssociation> createFileAssociations(
-            List<FileAssociationGroup> groups, FileAssociationTraits faTraits) throws ConfigException {
+            List<FileAssociationGroup> groups, FileAssociationTraits faTraits) {
 
         Objects.requireNonNull(groups);
         Objects.requireNonNull(faTraits);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
index f93cd0eab14..f537a1ea0a2 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
@@ -31,7 +31,6 @@ import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.Package.Stub;
 import jdk.jpackage.internal.model.PackageType;
@@ -44,7 +43,7 @@ final class PackageBuilder {
         this.type = Objects.requireNonNull(type);
     }
 
-    Package create() throws ConfigException {
+    Package create() {
         final var validatedName = validatedName();
 
         Path relativeInstallDir;
@@ -208,8 +207,7 @@ final class PackageBuilder {
         });
     }
 
-    private static Path mapInstallDir(Path installDir, PackageType pkgType)
-            throws ConfigException {
+    private static Path mapInstallDir(Path installDir, PackageType pkgType) {
         var ex = buildConfigException("error.invalid-install-dir", installDir).create();
 
         if (installDir.getNameCount() == 0) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
index dcaf097b1a3..a7d9bad39b1 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
@@ -25,7 +25,6 @@
 package jdk.jpackage.internal;
 
 import static jdk.jpackage.internal.model.RuntimeBuilder.getDefaultModulePath;
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -38,7 +37,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
 import jdk.jpackage.internal.model.RuntimeBuilder;
 import jdk.jpackage.internal.util.FileUtils;
@@ -112,8 +110,7 @@ final class RuntimeBuilderBuilder {
         );
     }
 
-    private static RuntimeBuilder createCopyingRuntimeBuilder(Path runtimeDir,
-            Path... modulePath) throws ConfigException {
+    private static RuntimeBuilder createCopyingRuntimeBuilder(Path runtimeDir, Path... modulePath) {
         return appImageLayout -> {
             try {
                 // copy whole runtime, skipping jmods and src.zip
@@ -147,10 +144,9 @@ final class RuntimeBuilderBuilder {
 
         @Override
         public RuntimeBuilder get() {
-            return toSupplier(() -> createCopyingRuntimeBuilder(
+            return createCopyingRuntimeBuilder(
                     predefinedRuntimeImage,
-                    Optional.ofNullable(thiz.modulePath).orElseGet(List::of).toArray(Path[]::new))
-            ).get();
+                    Optional.ofNullable(thiz.modulePath).orElseGet(List::of).toArray(Path[]::new));
         }
     }
 
@@ -160,13 +156,12 @@ final class RuntimeBuilderBuilder {
 
         @Override
         public RuntimeBuilder get() {
-            return toSupplier(() -> JLinkRuntimeBuilder.createJLinkRuntimeBuilder(
+            return JLinkRuntimeBuilder.createJLinkRuntimeBuilder(
                     Optional.ofNullable(thiz.modulePath).orElseGet(List::of),
                     Optional.ofNullable(addModules).orElseGet(Set::of),
                     Optional.ofNullable(limitModules).orElseGet(Set::of),
                     Optional.ofNullable(options).orElseGet(List::of),
-                    startupInfos)
-            ).get();
+                    startupInfos);
         }
     }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
index d7e636ac0db..793432729c2 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
@@ -104,23 +104,4 @@ public class ConfigException extends JPackageException {
 
         private String advice;
     }
-
-    /**
-     * Throws the cause of the given {@link RuntimeException} exception
-     * as {@link ConfigException} if the cause is of this type or re-throws the given
-     * {@link RuntimeException} exception as-is otherwise.
-     * <p>
-     * Never return a value. It always throws some exception object.
-     *
-     * @param ex exception to re-throw
-     * @return doesn't return value
-     * @throws ConfigException
-     */
-    public static RuntimeException rethrowConfigException(RuntimeException ex) throws ConfigException {
-        if (ex.getCause() instanceof ConfigException configEx) {
-            throw configEx;
-        } else {
-            throw ex;
-        }
-    }
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java
index 28d1c3b6ff1..651b5c1d59f 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java
@@ -27,7 +27,6 @@ package jdk.jpackage.internal;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.WinExePackage;
 import jdk.jpackage.internal.model.WinMsiPackage;
 
@@ -37,11 +36,8 @@ final class WinExePackageBuilder {
         this.pkg = Objects.requireNonNull(pkg);
     }
 
-    WinExePackage create() throws ConfigException {
-        if (icon != null) {
-            LauncherBuilder.validateIcon(icon);
-        }
-        return WinExePackage.create(pkg, Optional.ofNullable(icon));
+    WinExePackage create() {
+        return WinExePackage.create(pkg, Optional.ofNullable(icon).map(LauncherBuilder::validateIcon));
     }
 
     WinExePackageBuilder icon(Path v) {
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
index 9d52d0a47ad..7695cf04ac1 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
@@ -32,9 +32,7 @@ import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-
 import jdk.jpackage.internal.model.Application;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.MsiVersion;
 import jdk.jpackage.internal.model.WinMsiPackage;
 import jdk.jpackage.internal.model.WinMsiPackageMixin;
@@ -45,7 +43,7 @@ final class WinMsiPackageBuilder {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
-    WinMsiPackage create() throws ConfigException {
+    WinMsiPackage create() {
         var pkg = pkgBuilder.create();
 
         try {
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java
index 33b5a09a31b..ab0cc37b9fe 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
-
 import java.util.Objects;
 import jdk.jpackage.internal.util.Result;
 
@@ -36,6 +34,6 @@ record WinSystemEnvironment(WixToolset wixToolset) implements SystemEnvironment
     }
 
     static Result<WinSystemEnvironment> create() {
-        return Result.create(toSupplier(WixTool::createToolset)).map(WinSystemEnvironment::new);
+        return Result.create(WixTool::createToolset).map(WinSystemEnvironment::new);
     }
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
index 6e72511e080..e2ed175fbf3 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
@@ -89,7 +89,7 @@ public enum WixTool {
         }
     }
 
-    static WixToolset createToolset() throws ConfigException {
+    static WixToolset createToolset() {
         Function<List<ToolLookupResult>, Map<WixTool, ToolInfo>> conv = lookupResults -> {
             return lookupResults.stream().filter(ToolLookupResult::isValid).collect(Collectors.
                     groupingBy(lookupResult -> {

From 3b1eb7623180ac1b1d69622481589c43749dbbfc Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 21 Nov 2025 15:39:05 +0000
Subject: [PATCH 298/512] 8367585: Prevent creation of unrepresentable
 Utf8Entry

Reviewed-by: asotona
---
 .../classfile/attribute/package-info.java     |   5 +-
 .../classfile/constantpool/package-info.java  |   5 +-
 .../classfile/instruction/package-info.java   |   7 +-
 .../java/lang/classfile/package-info.java     |  30 +-
 .../classfile/impl/AbstractPoolEntry.java     |   7 +-
 .../classfile/impl/BufWriterImpl.java         |   7 +-
 .../jdk/internal/util/ModifiedUtf.java        |  48 +--
 test/jdk/jdk/classfile/LimitsTest.java        |  76 +++++
 test/jdk/jdk/classfile/SignaturesTest.java    | 299 +++++++++++-------
 .../jdk/internal/util/ModifiedUtfTest.java    |  13 -
 10 files changed, 327 insertions(+), 170 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/attribute/package-info.java b/src/java.base/share/classes/java/lang/classfile/attribute/package-info.java
index 1ddd0511d85..43bf1984a00 100644
--- a/src/java.base/share/classes/java/lang/classfile/attribute/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/attribute/package-info.java
@@ -32,9 +32,8 @@
  * including {@link Attribute}, {@link AttributedElement}, {@link AttributeMapper}, and {@link CustomAttribute}, which
  * do not reside in this package.
  * <p>
- * Unless otherwise specified, passing {@code null} or an array or collection containing a {@code null} element as an
- * argument to a constructor or method of any Class-File API class or interface will cause a {@link NullPointerException}
- * to be thrown.
+ * APIs in this package perform {@linkplain java.lang.classfile##checks null and unrepresentable argument checks},
+ * unless otherwise noted.
  *
  * <h2 id="reading">Reading Attributes</h2>
  * The general way to obtain attributes is through {@link AttributedElement}.  In addition to that, many attributes
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/package-info.java b/src/java.base/share/classes/java/lang/classfile/constantpool/package-info.java
index 66e72496d3a..0828e04ae22 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/package-info.java
@@ -30,9 +30,8 @@
  * {@code class} file format.  Constant pool entries are low-level models to faithfully represent the exact structure
  * of a {@code class} file.
  * <p>
- * Unless otherwise specified, passing {@code null} or an array or collection containing a {@code null} element as an
- * argument to a constructor or method of any Class-File API class or interface will cause a {@link NullPointerException}
- * to be thrown.
+ * APIs in this package perform {@linkplain java.lang.classfile##checks null and unrepresentable argument checks},
+ * unless otherwise noted.
  *
  * <h2 id="reading">Reading the constant pool entries</h2>
  * When read from {@code class} files, the pool entries are lazily inflated; the contents of these entries, besides the
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java b/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java
index e732aadf1ec..990731721a8 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,8 @@
  * The {@code java.lang.classfile.instruction} package contains interfaces describing code instructions.
  * Implementations of these interfaces are immutable.
  * <p>
- * Unless otherwise specified, passing {@code null} or an array or collection containing a {@code null} element as an
- * argument to a constructor or method of any Class-File API class or interface will cause a {@link NullPointerException}
- * to be thrown.
+ * APIs in this package perform {@linkplain java.lang.classfile##checks null and unrepresentable argument checks},
+ * unless otherwise noted.
  *
  * <h2 id="reading">Reading of instructions</h2>
  * Instructions and pseudo-instructions are usually accessed from a {@link CodeModel}, such as {@link CodeModel#forEach
diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index da9ad7fbf0d..460f6699e7b 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -250,12 +250,6 @@
  * the convenience method {@code CodeBuilder.invoke}, which in turn behaves
  * as if it calls method {@code CodeBuilder.with}. This composing of method calls on the
  * builder enables the composing of transforms (as described later).
- * <p>
- * Unless otherwise noted, passing a {@code null} argument to a constructor
- * or method of any Class-File API class or interface will cause a {@link
- * NullPointerException} to be thrown. Additionally,
- * invoking a method with an array or collection containing a {@code null} element
- * will cause a {@code NullPointerException}, unless otherwise specified.
  *
  * <h3>Symbolic information</h3>
  * To describe symbolic information for classes and types, the API uses the
@@ -272,14 +266,22 @@
  * symbolic information, one accepting nominal descriptors, and the other
  * accepting constant pool entries.
  *
- * <h3>Consistency checks, syntax checks and verification</h3>
- * The Class-File API performs checks to ensure arguments are representable in
- * the {@code class} file format.  A value that is lost when it is built to a
- * {@code class} file and re-parsed to a model is rejected with an {@link
- * IllegalArgumentException}.  For example, a negative value or a value over
- * {@code 65535} is lost when built to a {@link ##u2 u2} item, with
- * the range {@code [0, 65535]}.  In particular, any variable-sized table
- * exceeding its maximum representable size is rejected.
+ * <h3 id="checks">Consistency checks, syntax checks and verification</h3>
+ * The Class-File API performs checks to ensure arguments to construct {@code
+ * class} file structures are representable in the {@code class} file format.
+ * An argument value that cannot be representable by its data type is rejected
+ * with an {@link IllegalArgumentException}.  For example, an {@code int} value
+ * cannot be out of the range of its {@linkplain java.lang.classfile##data-types
+ * data type}; a {@code List} cannot exceed the maximum representable size of
+ * its table data type, or contain an unrepresentable element.  Restrictions
+ * based on underlying data type, such as the {@code int} and {@code List} ones
+ * before, are specified on the corresponding APIs.  Unless otherwise noted, in
+ * all structures, a {@code String} cannot exceed {@code 65535} bytes when
+ * represented in modified UTF-8 format.
+ * <p>
+ * Unless otherwise noted, passing null or an array or collection that contains
+ * null as an element to a constructor or method of any Class-File API class or
+ * interface will cause a {@link NullPointerException} to be thrown.
  * <p>
  * No consistency checks are performed while building or transforming classfiles
  * (except for null and representable arguments checks). All builders and
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index 962a2057585..ec747d06c21 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -35,6 +35,7 @@ import jdk.internal.access.SharedSecrets;
 import jdk.internal.constant.ClassOrInterfaceDescImpl;
 import jdk.internal.constant.PrimitiveClassDescImpl;
 import jdk.internal.util.ArraysSupport;
+import jdk.internal.util.ModifiedUtf;
 import jdk.internal.vm.annotation.Stable;
 
 import static java.util.Objects.requireNonNull;
@@ -141,7 +142,7 @@ public abstract sealed class AbstractPoolEntry {
         @Stable TypeDescriptor typeSym;
 
         Utf8EntryImpl(ConstantPool cpm, int index,
-                          byte[] rawBytes, int offset, int rawLen) {
+                      byte[] rawBytes, int offset, int rawLen) {
             super(cpm, index, 0);
             this.rawBytes = rawBytes;
             this.offset = offset;
@@ -154,6 +155,10 @@ public abstract sealed class AbstractPoolEntry {
         }
 
         Utf8EntryImpl(ConstantPool cpm, int index, String s, int contentHash) {
+            // Prevent creation of unwritable entries
+            if (!ModifiedUtf.isValidLengthInConstantPool(s)) {
+                throw new IllegalArgumentException("utf8 length out of range of u2: " + ModifiedUtf.utfLen(s));
+            }
             super(cpm, index, 0);
             this.rawBytes = null;
             this.offset = 0;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
index b30592a4ebd..6daef5cab9a 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
@@ -277,10 +277,9 @@ public final class BufWriterImpl implements BufWriter {
         int strlen = str.length();
         int countNonZeroAscii = JLA.countNonZeroAscii(str);
         long utflenLong = utfLen(str, countNonZeroAscii);
-        if (!ExactConversionsSupport.isLongToCharExact(utflenLong)) {
-            throw new IllegalArgumentException("utf8 length out of range of u2: " + utflenLong);
-        }
-        int utflen = (int)utflenLong;
+        // Utf8Entry should always be writable
+        assert ExactConversionsSupport.isLongToCharExact(utflenLong) : utflenLong;
+        int utflen = (int) utflenLong;
         reserveSpace(utflen + 3);
 
         int offset = this.offset;
diff --git a/src/java.base/share/classes/jdk/internal/util/ModifiedUtf.java b/src/java.base/share/classes/jdk/internal/util/ModifiedUtf.java
index 46885e12adf..4221ec22de3 100644
--- a/src/java.base/share/classes/jdk/internal/util/ModifiedUtf.java
+++ b/src/java.base/share/classes/jdk/internal/util/ModifiedUtf.java
@@ -28,19 +28,17 @@ package jdk.internal.util;
 
 import jdk.internal.vm.annotation.ForceInline;
 
-/**
- * Helper to JDK UTF putChar and Calculate length
- *
- * @since 24
- */
-public abstract class ModifiedUtf {
-    // Maximum number of bytes allowed for a Modified UTF-8 encoded string
-    // in a ClassFile constant pool entry (CONSTANT_Utf8_info).
+/// Utilities for string encoding and decoding with the
+/// [Modified UTF-8][java.io.DataInput##modified-utf-8] format.
+public final class ModifiedUtf {
+    /// Maximum number of bytes allowed for a Modified UTF-8 encoded string
+    /// in a [java.lang.classfile.constantpool.Utf8Entry] or a hotspot `Symbol`.
     public static final int CONSTANT_POOL_UTF8_MAX_BYTES = 65535;
 
     private ModifiedUtf() {
     }
 
+    /// Writes a char to the pre-sized modified UTF buffer.
     @ForceInline
     public static int putChar(byte[] buf, int offset, char c) {
         if (c != 0 && c < 0x80) {
@@ -58,11 +56,23 @@ public abstract class ModifiedUtf {
         return offset;
     }
 
-    /**
-     * Calculate the utf length of a string
-     * @param str input string
-     * @param countNonZeroAscii the number of non-zero ascii characters in the prefix calculated by JLA.countNonZeroAscii(str)
-     */
+    /// Calculate the encoded length of an input String.
+    /// For many workloads that have fast paths for ASCII-only prefixes,
+    /// [#utfLen(String, int)] skips scanning that prefix.
+    ///
+    /// @param str input string
+    public static long utfLen(String str) {
+        return utfLen(str, 0);
+    }
+
+    /// Calculate the encoded length of trailing parts of an input String,
+    /// after [jdk.internal.access.JavaLangAccess#countNonZeroAscii(String)]
+    /// calculates the number of contiguous single-byte characters in the
+    /// beginning of the string.
+    ///
+    /// @param str input string
+    /// @param countNonZeroAscii the number of non-zero ascii characters in the
+    ///        prefix calculated by JLA.countNonZeroAscii(str)
     @ForceInline
     public static long utfLen(String str, int countNonZeroAscii) {
         long utflen = str.length();
@@ -74,11 +84,11 @@ public abstract class ModifiedUtf {
         return utflen;
     }
 
-    /**
-     * Checks whether the Modified UTF-8 encoded length of the given string
-     * fits within the ClassFile constant pool limit (u2 length = 65535 bytes).
-     * @param str the string to check
-     */
+    /// Checks whether an input String can be encoded in a
+    /// [java.lang.classfile.constantpool.Utf8Entry], or represented as a
+    /// hotspot `Symbol` (which has the same length limit).
+    ///
+    /// @param str input string
     @ForceInline
     public static boolean isValidLengthInConstantPool(String str) {
         // Quick approximation: each char can be at most 3 bytes in Modified UTF-8.
@@ -91,7 +101,7 @@ public abstract class ModifiedUtf {
             return false;
         }
         // Check exact Modified UTF-8 length.
-        long utfLen = utfLen(str, 0);
+        long utfLen = utfLen(str);
         return utfLen <= CONSTANT_POOL_UTF8_MAX_BYTES;
     }
 }
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 0b347c835db..165f33ff44e 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8320360 8330684 8331320 8331655 8331940 8332486 8335820 8336833 8361635
+ *      8367585
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -52,17 +53,23 @@ import java.lang.classfile.instruction.SwitchCase;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
+import java.lang.constant.ModuleDesc;
+import java.lang.constant.PackageDesc;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
+import java.util.stream.Stream;
 
 import jdk.internal.classfile.impl.BufWriterImpl;
 import jdk.internal.classfile.impl.DirectCodeBuilder;
 import jdk.internal.classfile.impl.DirectMethodBuilder;
 import jdk.internal.classfile.impl.LabelContext;
+import jdk.internal.classfile.impl.TemporaryConstantPool;
 import jdk.internal.classfile.impl.UnboundAttribute;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
@@ -447,4 +454,73 @@ class LimitsTest {
         var cpb = ConstantPoolBuilder.of();
         cpb.intEntry(-cpb.intEntry(0).hashCode());
     }
+
+    static List<String> legalStrings() {
+        var empty = "";
+        var allAscii = "e".repeat(0xFFFF);
+        // 3-byte utf8 characters
+        var largeChars = String.valueOf((char) 0x800).repeat(0xFFFF / 3);
+        return List.of(empty, allAscii, largeChars);
+    }
+
+    @ParameterizedTest
+    @MethodSource("legalStrings")
+    void testStringLengthInLimit(String st) {
+        TemporaryConstantPool.INSTANCE.utf8Entry(st);
+        ConstantPoolBuilder.of().utf8Entry(st);
+    }
+
+    static List<String> oversizedStrings() {
+        var allAscii = "e".repeat(0x10000);
+        // 3-byte utf8 characters
+        var largeChars = String.valueOf((char) 0x800).repeat(0xFFFF / 3 + 1);
+        return List.of(allAscii, largeChars);
+    }
+
+    @ParameterizedTest
+    @MethodSource("oversizedStrings")
+    void testStringLengthOverLimit(String st) {
+        assertThrows(IllegalArgumentException.class, () -> TemporaryConstantPool.INSTANCE.utf8Entry(st));
+        assertThrows(IllegalArgumentException.class, () -> ConstantPoolBuilder.of().utf8Entry(st));
+    }
+
+    static Stream<ConstantPoolBuilder> pools() {
+        return Stream.of(ConstantPoolBuilder.of(), TemporaryConstantPool.INSTANCE);
+    }
+
+    @ParameterizedTest
+    @MethodSource("pools")
+    void testSingleReferenceNominalDescriptorOverLimit(ConstantPoolBuilder cpb) {
+        var fittingName = "A" + "a".repeat(65532); // fits "enveloped" L ;
+        var borderName = "B" + "b".repeat(65534); // fits only "not enveloped"
+        var overflowName = "C" + "b".repeat(65535); // nothing fits
+
+        var fittingClassDesc = ClassDesc.of(fittingName);
+        var borderClassDesc = ClassDesc.of(borderName);
+        var overflowClassDesc = ClassDesc.of(overflowName);
+        cpb.classEntry(fittingClassDesc);
+        cpb.utf8Entry(fittingClassDesc);
+        cpb.classEntry(borderClassDesc);
+        assertThrows(IllegalArgumentException.class, () -> cpb.utf8Entry(borderClassDesc));
+        assertThrows(IllegalArgumentException.class, () -> cpb.classEntry(overflowClassDesc));
+        assertThrows(IllegalArgumentException.class, () -> cpb.utf8Entry(overflowClassDesc));
+
+        cpb.packageEntry(PackageDesc.of(borderName));
+        assertThrows(IllegalArgumentException.class, () -> cpb.packageEntry(PackageDesc.of(overflowName)));
+        cpb.moduleEntry(ModuleDesc.of(borderName));
+        assertThrows(IllegalArgumentException.class, () -> cpb.moduleEntry(ModuleDesc.of(overflowName)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("pools")
+    void testMethodTypeDescOverLimit(ConstantPoolBuilder cpb) {
+        var borderReturnMtd = MethodTypeDesc.of(ClassDesc.of("R" + "r".repeat(65530)));
+        var overflowReturnMtd = MethodTypeDesc.of(ClassDesc.of("R" + "r".repeat(65531)));
+        var borderParamMtd = MethodTypeDesc.of(CD_void, ClassDesc.of("P" + "p".repeat(65529)));
+        var overflowParamMtd = MethodTypeDesc.of(CD_void, ClassDesc.of("P" + "p".repeat(65530)));
+        cpb.utf8Entry(borderParamMtd);
+        cpb.utf8Entry(borderReturnMtd);
+        assertThrows(IllegalArgumentException.class, () -> cpb.utf8Entry(overflowReturnMtd));
+        assertThrows(IllegalArgumentException.class, () -> cpb.utf8Entry(overflowParamMtd));
+    }
 }
diff --git a/test/jdk/jdk/classfile/SignaturesTest.java b/test/jdk/jdk/classfile/SignaturesTest.java
index 95fa8be4602..bf437aa5c35 100644
--- a/test/jdk/jdk/classfile/SignaturesTest.java
+++ b/test/jdk/jdk/classfile/SignaturesTest.java
@@ -24,10 +24,11 @@
 /*
  * @test
  * @summary Testing Signatures.
- * @bug 8321540 8319463 8357955 8368050 8368331
+ * @bug 8321540 8319463 8357955 8368050 8367585 8368331
  * @run junit SignaturesTest
  */
 import java.io.IOException;
+import java.lang.classfile.attribute.SignatureAttribute;
 import java.lang.constant.ClassDesc;
 import java.net.URI;
 import java.nio.file.FileSystem;
@@ -35,6 +36,7 @@ import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -52,9 +54,8 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static helpers.ClassRecord.assertEqualsDeep;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static java.lang.constant.ConstantDescs.*;
-import java.util.function.Consumer;
-import java.util.function.Function;
 
 class SignaturesTest {
 
@@ -270,114 +271,134 @@ class SignaturesTest {
                 "ClassDesc derived from signature");
     }
 
-    @Test
-    void testBadTypeSignatures() {
-        """
-        LObject
-        LObject;B
-        LIterable<LFoo>
-        LIterable<<
-        TBar
-        TBar<LFoo;>
-        B<LFoo;>
-        B<LFoo;>;V
-        X
-        [LObject
-        [LIterable<LFoo>
-        [LIterable<<
-        [TBar
-        [TBar<LFoo;>
-        [B<LFoo;>
-        [X
-        LSet<+Kind<**>;>;
-        LSet<?Kind<*>;>;
-        ()V
-        Ljava/util/Opt<Ljava/lang/Integer;>ional;
-        Lcom/example/Outer<Ljava/lang/String;>.package/Inner<[I>;
-        LSample>;
-        LSample:Other;
-        LOuter<[JTT;>.[Inner;
-        TA:J;
-        LEmpty<>;
-        L
-        Lcom
-        Lcom/example/
-        Lcom/example/Outer<
-        Lcom/example/Outer<Ljava/
-        Lcom/example/Outer<Ljava/lang/String
-        Lcom/example/Outer<Ljava/lang/String;
-        Lcom/example/Outer<Ljava/lang/String;>
-        Lcom/example/Outer<Ljava/lang/String;>.
-        Lcom/example/Outer<Ljava/lang/String;>.Inner<[I>
-        [V
-        """.lines().forEach(assertThrows(Signature::parseFrom));
+    static Stream<String> badTypeSignatures() {
+        return """
+                LObject
+                LObject;B
+                LIterable<LFoo>
+                LIterable<<
+                TBar
+                TBar<LFoo;>
+                B<LFoo;>
+                B<LFoo;>;V
+                X
+                [LObject
+                [LIterable<LFoo>
+                [LIterable<<
+                [TBar
+                [TBar<LFoo;>
+                [B<LFoo;>
+                [X
+                LSet<+Kind<**>;>;
+                LSet<?Kind<*>;>;
+                ()V
+                Ljava/util/Opt<Ljava/lang/Integer;>ional;
+                Lcom/example/Outer<Ljava/lang/String;>.package/Inner<[I>;
+                LSample>;
+                LSample:Other;
+                LOuter<[JTT;>.[Inner;
+                TA:J;
+                LEmpty<>;
+                L
+                Lcom
+                Lcom/example/
+                Lcom/example/Outer<
+                Lcom/example/Outer<Ljava/
+                Lcom/example/Outer<Ljava/lang/String
+                Lcom/example/Outer<Ljava/lang/String;
+                Lcom/example/Outer<Ljava/lang/String;>
+                Lcom/example/Outer<Ljava/lang/String;>.
+                Lcom/example/Outer<Ljava/lang/String;>.Inner<[I>
+                [V
+                """.lines();
     }
 
-    @Test
-    void testGoodTypeSignatures() {
-        """
-        Ljava/util/Optional<Ljava/lang/Integer;>;
-        Lcom/example/Outer<Ljava/lang/Integer;>.Inner<[I>;
-        LSample;
-        LOuter<[JTT;>.Inner;
-        LOuter.Inner;
-        """.lines().forEach(Signature::parseFrom);
+    @ParameterizedTest
+    @MethodSource("badTypeSignatures")
+    void testBadTypeSignatures(String s) {
+        assertThrows(IllegalArgumentException.class, () -> Signature.parseFrom(s));
     }
 
-    @Test
-    void testBadClassSignatures() {
-        """
-        Ljava/lang/Object;Ljava/lang/Iterable<LFoo;>
-        LObject
-        LObject;B
-        LIterable<LFoo>
-        LIterable<<
-        TBar
-        TBar<LFoo;>
-        B<LFoo;>
-        B<LFoo;>;V
-        X
-        LFoo<TK;>.It;L
-        <K+LObject;>LFoo<TK;;>;LFoo<TK;>;LBar;
-        <K:LObject;>>LFoo<TK;>;
-        <K:LObject;>LFoo<+>;
-        ()V
-        <K:Ljava/lang/Object;>Ljava/lang/Object;TK;
-        Ljava/lang/Object;[Ljava/lang/Object;
-        [Ljava/util/Optional<[I>;
-        [I
-        <K:Ljava/lang/Object;>TK;
-        <K;Q:Ljava/lang/Object;>Ljava/lang/Object;
-        <:Ljava/lang/Object;>Ljava/lang/Object;
-        <>Ljava/lang/Object;
-        """.lines().forEach(assertThrows(ClassSignature::parseFrom));
+    static Stream<String> goodTypeSignatures() {
+        return """
+                Ljava/util/Optional<Ljava/lang/Integer;>;
+                Lcom/example/Outer<Ljava/lang/Integer;>.Inner<[I>;
+                LSample;
+                LOuter<[JTT;>.Inner;
+                LOuter.Inner;
+                """.lines();
     }
 
-    @Test
-    void testBadMethodSignatures() {
-        """
-        LObject;
-        B
-        ()V^
-        ()V^B
-        ()V^X
-        (LObject;)
-        (LObject)V
-        ()LIterable<LFoo>
-        ()LIterable<<
-        ()TBar
-        ()TBar;B
-        (TBar<LFoo;>)V
-        (B<LFoo;>)V
-        (X)
-        ()X
-        ()VB
-        ()LSet<+Kind<**>;>;
-        (LSet<?Kind<*>;>;)V
-        <T::LA>()V
-        (TT;I)VI
-        (V)V
-        """.lines().forEach(assertThrows(MethodSignature::parseFrom));
+    @ParameterizedTest
+    @MethodSource("goodTypeSignatures")
+    void testGoodTypeSignature(String s) {
+        Signature.parseFrom(s);
+    }
+
+    static Stream<String> badClassSignatures() {
+        return """
+                Ljava/lang/Object;Ljava/lang/Iterable<LFoo;>
+                LObject
+                LObject;B
+                LIterable<LFoo>
+                LIterable<<
+                TBar
+                TBar<LFoo;>
+                B<LFoo;>
+                B<LFoo;>;V
+                X
+                LFoo<TK;>.It;L
+                <K+LObject;>LFoo<TK;;>;LFoo<TK;>;LBar;
+                <K:LObject;>>LFoo<TK;>;
+                <K:LObject;>LFoo<+>;
+                ()V
+                <K:Ljava/lang/Object;>Ljava/lang/Object;TK;
+                Ljava/lang/Object;[Ljava/lang/Object;
+                [Ljava/util/Optional<[I>;
+                [I
+                <K:Ljava/lang/Object;>TK;
+                <K;Q:Ljava/lang/Object;>Ljava/lang/Object;
+                <:Ljava/lang/Object;>Ljava/lang/Object;
+                <>Ljava/lang/Object;
+                """.lines();
+    }
+
+    @ParameterizedTest
+    @MethodSource("badClassSignatures")
+    void testBadClassSignature(String s) {
+        assertThrows(IllegalArgumentException.class, () -> ClassSignature.parseFrom(s));
+    }
+
+    static Stream<String> badMethodSignatures() {
+        return """
+                LObject;
+                B
+                ()V^
+                ()V^B
+                ()V^X
+                (LObject;)
+                (LObject)V
+                ()LIterable
+                ()LIterable
+                ()TBar
+                ()TBar;B
+                (TBar<LFoo;
+                (B<LFoo;>)V
+                (X)
+                ()X
+                ()VB
+                ()LSet<+Kin
+                (LSet<?Kind
+                <T::LA>()V
+                (TT;I)VI
+                (V)V
+                """.lines();
+    }
+
+    @ParameterizedTest
+    @MethodSource("badMethodSignatures")
+    void testBadMethodSignature(String s) {
+        assertThrows(IllegalArgumentException.class, () -> MethodSignature.parseFrom(s));
     }
 
     @Test
@@ -385,16 +406,76 @@ class SignaturesTest {
         var sig = Signature.parseFrom("I");
         var arrSig = Signature.parseFrom("[I");
         for (int dim : List.of(256, -1, 0))
-            Assertions.assertThrows(IllegalArgumentException.class, () -> Signature.ArrayTypeSig.of(dim, sig));
+            assertThrows(IllegalArgumentException.class, () -> Signature.ArrayTypeSig.of(dim, sig));
         for (int dim : List.of(255, -1, 0))
-            Assertions.assertThrows(IllegalArgumentException.class, () -> Signature.ArrayTypeSig.of(dim, arrSig));
+            assertThrows(IllegalArgumentException.class, () -> Signature.ArrayTypeSig.of(dim, arrSig));
         for (int dim : List.of(255, 1))
             Signature.ArrayTypeSig.of(dim, sig);
         for (int dim : List.of(254, 1))
             Signature.ArrayTypeSig.of(dim, arrSig);
     }
 
-    private Consumer<String> assertThrows(Function<String, ?> parser) {
-        return s -> Assertions.assertThrows(IllegalArgumentException.class, () -> parser.apply(s), s);
+    static Stream<Signature> longTypeSignatures() {
+        var longAsciiName = "A" + "a".repeat(65536);
+        var longCharName = "§".repeat(32768);
+        var simpleClassSig = ClassTypeSig.of(longAsciiName);
+        var nestedSig = ClassTypeSig.of(simpleClassSig, longCharName);
+        var typeVarSig = TypeVarSig.of(longCharName);
+        var parameterizedSig = ClassTypeSig.of(longCharName, TypeArg.of(nestedSig), TypeArg.unbounded());
+        var parameterizedNestedSig = ClassTypeSig.of(nestedSig, longAsciiName, TypeArg.superOf(simpleClassSig));
+        return Stream.of(simpleClassSig, nestedSig, typeVarSig, parameterizedSig, parameterizedNestedSig);
+    }
+
+    @ParameterizedTest
+    @MethodSource("longTypeSignatures")
+    void testLongTypeSignature(Signature sig) {
+        var st = sig.signatureString();
+        Signature.parseFrom(st); // Valid signature
+        assertThrows(IllegalArgumentException.class, () -> SignatureAttribute.of(sig)); // Cannot write to class
+    }
+
+    static Stream<ClassSignature> longClassSignatures() {
+        var longAsciiName = "A" + "a".repeat(65536);
+        var longCharName = "§".repeat(32768);
+        var simpleClassSig = ClassTypeSig.of(longAsciiName);
+        var longSuperClass = ClassSignature.of(simpleClassSig);
+        var longNameParam = TypeParam.of(longCharName, ClassTypeSig.of(CD_String));
+        var longBoundParam = TypeParam.of("T", simpleClassSig);
+        var longNameParamClass = ClassSignature.of(List.of(longNameParam), ClassTypeSig.of(CD_Object));
+        var longBoundParamClass = ClassSignature.of(List.of(longBoundParam), ClassTypeSig.of(CD_Number));
+        return Stream.of(longSuperClass, longNameParamClass, longBoundParamClass);
+    }
+
+    @ParameterizedTest
+    @MethodSource("longClassSignatures")
+    void testLongClassSignature(ClassSignature sig) {
+        var st = sig.signatureString();
+        ClassSignature.parseFrom(st); // Valid signature
+        assertThrows(IllegalArgumentException.class, () -> SignatureAttribute.of(sig)); // Cannot write to class
+    }
+
+    static Stream<MethodSignature> longMethodSignatures() {
+        var longAsciiName = "A" + "a".repeat(65536);
+        var longCharName = "§".repeat(32768);
+        var simpleClassSig = ClassTypeSig.of(longAsciiName);
+        var longNameTypeVar = TypeVarSig.of(longCharName);
+        var longReturnMethod = MethodSignature.of(simpleClassSig);
+        var longNameParam = TypeParam.of(longCharName, ClassTypeSig.of(CD_String));
+        var longNameParamMethod = MethodSignature.of(List.of(longNameParam), List.of(), BaseTypeSig.of(CD_void));
+        var longThrowMethod = MethodSignature.of(List.of(), List.of(longNameTypeVar), ClassTypeSig.of(CD_Number));
+        var longParameterMethod = MethodSignature.of(BaseTypeSig.of(CD_int), simpleClassSig);
+
+        var eachParameter = ClassTypeSig.of("A" + "a".repeat(250));
+        var parameterArray = Collections.nCopies(300, eachParameter).toArray(Signature[]::new);
+        var manyParameterMethod = MethodSignature.of(BaseTypeSig.of(CD_void), parameterArray);
+        return Stream.of(longReturnMethod, longNameParamMethod, longThrowMethod, longParameterMethod, manyParameterMethod);
+    }
+
+    @ParameterizedTest
+    @MethodSource("longMethodSignatures")
+    void testLongMethodSignature(MethodSignature sig) {
+        var st = sig.signatureString();
+        MethodSignature.parseFrom(st); // Valid signature
+        assertThrows(IllegalArgumentException.class, () -> SignatureAttribute.of(sig)); // Cannot write to class
     }
 }
diff --git a/test/jdk/jdk/internal/util/ModifiedUtfTest.java b/test/jdk/jdk/internal/util/ModifiedUtfTest.java
index 7572acfba24..3376a8eb6ae 100644
--- a/test/jdk/jdk/internal/util/ModifiedUtfTest.java
+++ b/test/jdk/jdk/internal/util/ModifiedUtfTest.java
@@ -104,19 +104,6 @@ public class ModifiedUtfTest {
         } catch (UTFDataFormatException e) {
         }
 
-        BufWriterImpl bufWriter = new BufWriterImpl(ConstantPoolBuilder.of(), (ClassFileImpl) ClassFile.of());
-        Method writeUtfEntry = bufWriter.getClass().getDeclaredMethod("writeUtfEntry", String.class);
-        writeUtfEntry.setAccessible(true);
-        try {
-            writeUtfEntry.invoke(bufWriter, largeString);
-            throw new RuntimeException("Expected IllegalArgumentException was not thrown.");
-        } catch (InvocationTargetException e) {
-            Throwable cause = e.getCause();
-            if (!(cause instanceof IllegalArgumentException)) {
-                throw new RuntimeException("Expected IllegalArgumentException was not thrown.");
-            }
-        }
-
         /**
          * In the writeUTF function, utfLen is used to calculate the length of the string to be written
          * and store it in the stream header. This test uses the HeaderCaptureOutputStream inner class

From 5f806e7f8b66c14954a07005be3bceb2f812fbff Mon Sep 17 00:00:00 2001
From: Oumaiyma Intissar <49239111+OumaIntissar@users.noreply.github.com>
Date: Fri, 21 Nov 2025 15:42:36 +0000
Subject: [PATCH 299/512] 8367049: URLPermission.<init> throws
 StringIndexOutOfBoundsException in avm mode

Reviewed-by: michaelm, dfuchs, coffeys
---
 .../share/classes/java/net/HostPortrange.java |  5 ++
 .../share/classes/java/net/URLPermission.java |  3 +
 .../net/URLPermission/EmptyAuthorityTest.java | 68 +++++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 test/jdk/java/net/URLPermission/EmptyAuthorityTest.java

diff --git a/src/java.base/share/classes/java/net/HostPortrange.java b/src/java.base/share/classes/java/net/HostPortrange.java
index 289846841c9..f7a5b911633 100644
--- a/src/java.base/share/classes/java/net/HostPortrange.java
+++ b/src/java.base/share/classes/java/net/HostPortrange.java
@@ -60,6 +60,11 @@ class HostPortrange {
     }
 
     HostPortrange(String scheme, String host) {
+        // Defensive validation first
+        if (host == null || host.isEmpty()) {
+            throw new IllegalArgumentException("Invalid URL authority");
+        }
+
         // Parse the host name.  A name has up to three components, the
         // hostname, a port number, or two numbers representing a port
         // range.   "www.example.com:8080-9090" is a valid host name.
diff --git a/src/java.base/share/classes/java/net/URLPermission.java b/src/java.base/share/classes/java/net/URLPermission.java
index bf87cad8077..ac51d6c60a1 100644
--- a/src/java.base/share/classes/java/net/URLPermission.java
+++ b/src/java.base/share/classes/java/net/URLPermission.java
@@ -527,6 +527,9 @@ public final class URLPermission extends Permission {
         HostPortrange p;
 
         Authority(String scheme, String authority) {
+            if (authority == null || authority.isEmpty()) {
+                throw new IllegalArgumentException("Invalid URL: authority is empty");
+            }
             int at = authority.indexOf('@');
             if (at == -1) {
                     p = new HostPortrange(scheme, authority);
diff --git a/test/jdk/java/net/URLPermission/EmptyAuthorityTest.java b/test/jdk/java/net/URLPermission/EmptyAuthorityTest.java
new file mode 100644
index 00000000000..06dd21b71ea
--- /dev/null
+++ b/test/jdk/java/net/URLPermission/EmptyAuthorityTest.java
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* This code is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/*
+* @test
+* @bug 8367049
+* @summary URLPermission must reject empty/missing host authority with IAE (no SIOOBE)
+* @run testng EmptyAuthorityTest
+*/
+
+import java.net.URLPermission;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class EmptyAuthorityTest {
+
+    @DataProvider(name = "badUrls")
+    public Object[][] badUrls() {
+        return new Object[][]{
+                { "http:///path" }, // empty authority
+                { "https:///x" }, // empty authority
+                { "http://@/x" }, // userinfo + empty host
+                { "http://user@/x" }, // userinfo + empty host
+                { "http://[]/x" } // empty IPv6 literal
+        };
+    }
+
+    @DataProvider(name = "goodUrls")
+    public Object[][] goodUrls() {
+        return new Object[][]{
+                { "http://example.com/x" },
+                { "http://example.com:80/x" },
+                { "http://[::1]/x" },
+                { "http://[::1]:8080/x" }
+        };
+    }
+
+    @Test(dataProvider = "badUrls")
+    public void rejectsEmptyOrMalformedAuthority(String url) {
+        Assert.expectThrows(IllegalArgumentException.class, () -> new URLPermission(url));
+    }
+
+    @Test(dataProvider = "goodUrls")
+    public void acceptsValidAuthorities(String url) {
+        new URLPermission(url); // should not throw
+    }
+}

From e24e7827c4241fdf5e178df811f0d0f813363743 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 21 Nov 2025 15:57:23 +0000
Subject: [PATCH 300/512] 8372319: com/sun/crypto/provider/Cipher/HPKE/KAT9180
 test has external dependencies

Reviewed-by: stuefe, myankelevich
---
 .../com/sun/crypto/provider/Cipher/HPKE/KAT9180.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
index f4717f57883..024d5f977a7 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
@@ -38,11 +38,14 @@ import com.sun.crypto.provider.DHKEM;
 import javax.crypto.Cipher;
 import javax.crypto.spec.HPKEParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HexFormat;
 
+import jtreg.SkippedException;
+
 /// This test is based on Appendix A (Test Vectors) of
 /// [RFC 9180](https://datatracker.ietf.org/doc/html/rfc9180#name-test-vectors)
 /// The test data is available as a JSON file at:
@@ -67,7 +70,14 @@ public class KAT9180 {
 
     public static void main(String[] args) throws Exception {
         var h = HexFormat.of();
-        Path archivePath = ArtifactResolver.fetchOne(RFC_9180_KAT.class);
+        Path archivePath = null;
+        try {
+            archivePath = ArtifactResolver.fetchOne(RFC_9180_KAT.class);
+        } catch (IOException e) {
+            if (e.getMessage().contains("Cannot find the artifact")) {
+                throw new SkippedException("RFC_9180_KAT test vectors are not available.");
+            }
+        }
         System.out.println("Data path: " + archivePath);
         var c1 = Cipher.getInstance("HPKE");
         var c2 = Cipher.getInstance("HPKE");

From e4b583ab708eadd526d5cc0c03129a7970e05320 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 21 Nov 2025 17:28:21 +0000
Subject: [PATCH 301/512] 8372294: Fix Malformed problem list entry in
 ProblemList-jvmti-stress-agent.txt

Reviewed-by: sspitsyn, lmesnik
---
 test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt b/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
index 1e6c0c735a9..eb4131691c9 100644
--- a/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
+++ b/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
@@ -33,7 +33,7 @@ gc/stringdedup/TestStringDeduplicationPrintOptions.java 8362562 generic-all
 
 
 serviceability/jvmti/events/SingleStep/singlestep02/singlestep02.java       8362350 generic-all
-vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/TestDescription.java	8362350 generic-all
+vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/TestDescription.java    8362350 generic-all
 
 # Incompatbile tests
 

From 5b5d85b0fd4405590d69ad72474ef51fc4aa9699 Mon Sep 17 00:00:00 2001
From: Eric Caspole <ecaspole@openjdk.org>
Date: Fri, 21 Nov 2025 18:00:45 +0000
Subject: [PATCH 302/512] 8372360: Exclude jdk.jsobject from micros-javac input
 source packages

Reviewed-by: vromero
---
 .../java/org/openjdk/bench/langtools/javac/JavacBenchmark.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
index de13f6771b9..28c5c57a073 100644
--- a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
+++ b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
@@ -94,7 +94,7 @@ public class JavacBenchmark {
             try (ZipInputStream zis = new ZipInputStream(new BufferedInputStream(JavacBenchmark.class.getResourceAsStream("/src.zip")))) {
                 for (ZipEntry entry; (entry = zis.getNextEntry()) != null;) {
                     final String ename = entry.getName();
-                    if (!ename.startsWith("java.desktop") && !ename.startsWith("jdk.internal.vm.compiler") && !ename.startsWith("jdk.aot") && !ename.startsWith("jdk.accessibility")) {
+                    if (!ename.startsWith("java.desktop") && !ename.startsWith("jdk.internal.vm.compiler") && !ename.startsWith("jdk.aot") && !ename.startsWith("jdk.accessibility") && !ename.startsWith("jdk.jsobject")) {
                         if (!entry.isDirectory() && ename.endsWith(".java")) {
                             Path dst = root.resolve(ename);
                             Files.createDirectories(dst.getParent());

From 3a45e615973727446c9081b5affbbe7ffe7c3bea Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 21 Nov 2025 18:19:05 +0000
Subject: [PATCH 303/512] 8369129: Raster createPackedRaster methods
 specification clean up

Reviewed-by: jdv, serb
---
 .../share/classes/java/awt/image/Raster.java  | 217 ++++++--
 .../Raster/CreateRasterExceptionTest.java     | 508 +++++++++++++++++-
 2 files changed, 669 insertions(+), 56 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/image/Raster.java b/src/java.desktop/share/classes/java/awt/image/Raster.java
index 9f346cb304a..053e7c1eec5 100644
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -265,9 +265,15 @@ public class Raster {
      *         {@code location.x + w} or
      *         {@code location.y + h} results in integer overflow
      * @throws IllegalArgumentException if {@code scanlineStride}
-     *         is less than 0
-     * @throws IllegalArgumentException if {@code pixelStride} is less than 0
+     *         is less than or equal to 0
+     * @throws IllegalArgumentException if {@code pixelStride} is less than or equal to 0
+     * @throws IllegalArgumentException if {@code w * pixelStride} is greater
+     *         than {@code scanlineStride}
+     * @throws IllegalArgumentException if the data size need to store all
+     *          lines of the image is greater than {@code Integer.MAX_VALUE}
      * @throws NullPointerException if {@code bandOffsets} is null
+     * @throws IllegalArgumentException if any element of {@code bandOffsets} is greater
+     *         than {@code pixelStride} or the {@code scanlineStride}
      */
     public static WritableRaster createInterleavedRaster(int dataType,
                                                          int w, int h,
@@ -285,14 +291,25 @@ public class Raster {
             throw new IllegalArgumentException("Dimensions (width="+w+
                                                " height="+h+") are too large");
         }
-        if (pixelStride < 0) {
-            throw new IllegalArgumentException("pixelStride is < 0");
+        if (pixelStride <= 0) {
+            throw new IllegalArgumentException("pixelStride is <= 0");
         }
-        if (scanlineStride < 0) {
-            throw new IllegalArgumentException("scanlineStride is < 0");
+        if (scanlineStride <= 0) {
+            throw new IllegalArgumentException("scanlineStride is <= 0");
         }
-        int size = scanlineStride * (h - 1) + // first (h - 1) scans
-            pixelStride * w; // last scan
+        if (bandOffsets == null) {
+            throw new NullPointerException("bandOffsets is null");
+        }
+        lsz = (long)w * pixelStride;
+        if (lsz > scanlineStride) {
+            throw new IllegalArgumentException("w * pixelStride is too large");
+        }
+        lsz = (long)scanlineStride * (long)(h - 1) + // first (h - 1) scans
+            (long)pixelStride * (long)w; // last scan
+        if (lsz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("size too large to store image");
+        }
+        int size = (int)lsz;
 
         if (location == null) {
             location = new Point(0, 0);
@@ -415,6 +432,10 @@ public class Raster {
      *         is less than 0
      * @throws ArrayIndexOutOfBoundsException if {@code bankIndices}
      *         is {@code null}
+     * @throws IllegalArgumentException if the lengths of {@code bankIndices}
+     *         and {@code bandOffsets} are different.
+     * @throws IllegalArgumentException if the data size need to store all
+     *          lines of a bank of the image is greater than {@code Integer.MAX_VALUE}
      * @throws NullPointerException if {@code bandOffsets} is {@code null}
      */
     public static WritableRaster createBandedRaster(int dataType,
@@ -423,9 +444,6 @@ public class Raster {
                                                     int[] bankIndices,
                                                     int[] bandOffsets,
                                                     Point location) {
-        DataBuffer d;
-        int bands = bandOffsets.length;
-
         if (w <= 0 || h <= 0) {
              throw new IllegalArgumentException("w and h must be positive");
         }
@@ -440,7 +458,11 @@ public class Raster {
         }
         if (bandOffsets == null) {
             throw new
-                ArrayIndexOutOfBoundsException("Band offsets array is null");
+                NullPointerException("Band offsets array is null");
+        }
+        if (bandOffsets.length != bankIndices.length) {
+            throw new IllegalArgumentException(
+                                   "bankIndices.length != bandOffsets.length");
         }
         if (location != null) {
             if ((w + location.getX() > Integer.MAX_VALUE) ||
@@ -451,6 +473,9 @@ public class Raster {
             }
         }
 
+        DataBuffer d;
+        int bands = bandOffsets.length;
+
         // Figure out the #banks and the largest band offset
         int maxBank = bankIndices[0];
         int maxBandOff = bandOffsets[0];
@@ -463,9 +488,15 @@ public class Raster {
             }
         }
         int banks = maxBank + 1;
-        int size = maxBandOff +
-            scanlineStride * (h - 1) + // first (h - 1) scans
-            w; // last scan
+
+        lsz = (long) maxBandOff +
+              (long)scanlineStride * (h - 1) + // first (h - 1) scans
+               w; // last scan
+        if (lsz > Integer.MAX_VALUE) {
+             throw new IllegalArgumentException("storage size is too large");
+        }
+
+        int size = (int)lsz;
 
         switch(dataType) {
         case DataBuffer.TYPE_BYTE:
@@ -508,11 +539,14 @@ public class Raster {
      * @param location  the upper-left corner of the {@code Raster}
      * @return a WritableRaster object with the specified data type,
      *         width, height, and band masks.
-     * @throws RasterFormatException if {@code w} or {@code h}
-     *         is less than or equal to zero, or computing either
+     * @throws NullPointerException if {@code bandMasks} is null
+     * @throws IllegalArgumentException if {@code w} and {@code h}
+     *         are not both greater than 0
+     * @throws IllegalArgumentException if the product of {@code w}
+     *         and {@code h} is greater than {@code Integer.MAX_VALUE}
+     * @throws RasterFormatException if computing either
      *         {@code location.x + w} or
-     *         {@code location.y + h} results in integer
-     *         overflow
+     *         {@code location.y + h} results in integer overflow
      * @throws IllegalArgumentException if {@code dataType} is not
      *         one of the supported data types, which are
      *         {@code DataBuffer.TYPE_BYTE},
@@ -525,6 +559,24 @@ public class Raster {
                                                     Point location) {
         DataBuffer d;
 
+        if (w <= 0 || h <= 0) {
+             throw new IllegalArgumentException("w and h must be positive");
+        }
+        long lsz = (long)w * h;
+        if (lsz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("Dimensions (width="+w+
+                                               " height="+h+") are too large");
+        }
+
+        if (location != null) {
+            if ((w + location.getX() > Integer.MAX_VALUE) ||
+                (h + location.getY() > Integer.MAX_VALUE)) {
+              throw new RasterFormatException(
+                 "location.x + w and location.y + h " +
+                 " cannot exceed Integer.MAX_VALUE");
+            }
+        }
+
         switch(dataType) {
         case DataBuffer.TYPE_BYTE:
             d = new DataBufferByte(w*h);
@@ -573,17 +625,19 @@ public class Raster {
      * @param location  the upper-left corner of the {@code Raster}
      * @return a WritableRaster object with the specified data type,
      *         width, height, number of bands, and bits per band.
-     * @throws RasterFormatException if {@code w} or {@code h}
-     *         is less than or equal to zero, or computing either
-     *         {@code location.x + w} or
-     *         {@code location.y + h} results in integer
-     *         overflow
+     * @throws IllegalArgumentException if {@code bitsPerBand} or
+     *         {@code bands} is not greater than zero
      * @throws IllegalArgumentException if the product of
      *         {@code bitsPerBand} and {@code bands} is
      *         greater than the number of bits held by
      *         {@code dataType}
-     * @throws IllegalArgumentException if {@code bitsPerBand} or
-     *         {@code bands} is not greater than zero
+     * @throws IllegalArgumentException if {@code w} and {@code h}
+     *         are not both greater than 0
+     * @throws IllegalArgumentException if the product of {@code w}
+     *         and {@code h} is greater than {@code Integer.MAX_VALUE}
+     * @throws RasterFormatException if computing either
+     *         {@code location.x + w} or
+     *         {@code location.y + h} results in integer overflow
      * @throws IllegalArgumentException if {@code dataType} is not
      *         one of the supported data types, which are
      *         {@code DataBuffer.TYPE_BYTE},
@@ -607,18 +661,37 @@ public class Raster {
                                                ") must be greater than 0");
         }
 
+        if (w <= 0 || h <= 0) {
+             throw new IllegalArgumentException("w and h must be positive");
+        }
+        long lsz = (long)w * h;
+        if (lsz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("Dimensions (width="+w+
+                                               " height="+h+") are too large");
+        }
+
+        if (location != null) {
+            if ((w + location.getX() > Integer.MAX_VALUE) ||
+                (h + location.getY() > Integer.MAX_VALUE)) {
+              throw new RasterFormatException(
+                 "location.x + w and location.y + h " +
+                 " cannot exceed Integer.MAX_VALUE");
+            }
+        }
+
+        int shift = (bands-1)*bitsPerBand;
+
+        /* Make sure the total mask size will fit in the data type */
+        if (shift+bitsPerBand > DataBuffer.getDataTypeSize(dataType)) {
+            throw new IllegalArgumentException("bitsPerBand("+
+                                               bitsPerBand+") * bands is "+
+                                               " greater than data type "+
+                                               "size.");
+        }
         if (bands != 1) {
             int[] masks = new int[bands];
             int mask = (1 << bitsPerBand) - 1;
-            int shift = (bands-1)*bitsPerBand;
 
-            /* Make sure the total mask size will fit in the data type */
-            if (shift+bitsPerBand > DataBuffer.getDataTypeSize(dataType)) {
-                throw new IllegalArgumentException("bitsPerBand("+
-                                                   bitsPerBand+") * bands is "+
-                                                   " greater than data type "+
-                                                   "size.");
-            }
             switch(dataType) {
             case DataBuffer.TYPE_BYTE:
             case DataBuffer.TYPE_USHORT:
@@ -693,6 +766,7 @@ public class Raster {
      *         {@code DataBuffer.TYPE_USHORT}.
      * @throws RasterFormatException if {@code dataBuffer} has more
      *         than one bank.
+     * @throws RasterFormatException if {@code dataBuffer} is too small.
      * @throws IllegalArgumentException if {@code w} and {@code h} are not
      *         both > 0
      * @throws IllegalArgumentException if the product of {@code w}
@@ -704,6 +778,8 @@ public class Raster {
      *         is less than 0
      * @throws IllegalArgumentException if {@code pixelStride} is less than 0
      * @throws NullPointerException if {@code bandOffsets} is null
+     * @throws IllegalArgumentException if any element of {@code bandOffsets} is greater
+     *         than {@code pixelStride} or the {@code scanlineStride}
 
      */
     public static WritableRaster createInterleavedRaster(DataBuffer dataBuffer,
@@ -779,6 +855,10 @@ public class Raster {
      *         bank indices and band offsets.
      * @throws NullPointerException if {@code dataBuffer} is null,
      *         or {@code bankIndices} is null, or {@code bandOffsets} is null
+     * @throws IllegalArgumentException if the lengths of {@code bankIndices}
+     *         and {@code bandOffsets} are different.
+     * @throws ArrayIndexOutOfBoundsException if any element of {@code bankIndices}
+     *         is greater or equal to the number of bands in {@code dataBuffer}
      * @throws IllegalArgumentException if {@code dataType} is not
      *         one of the supported data types, which are
      *         {@code DataBuffer.TYPE_BYTE},
@@ -883,11 +963,14 @@ public class Raster {
      * @return a WritableRaster object with the specified
      *         {@code DataBuffer}, width, height, scanline stride,
      *         and band masks.
-     * @throws RasterFormatException if {@code w} or {@code h}
-     *         is less than or equal to zero, or computing either
+     * @throws NullPointerException if {@code bandMasks} is null
+     * @throws IllegalArgumentException if {@code w} and {@code h}
+     *         are not both greater than 0
+     * @throws IllegalArgumentException if the product of {@code w}
+     *         and {@code h} is greater than {@code Integer.MAX_VALUE}
+     * @throws RasterFormatException if computing either
      *         {@code location.x + w} or
-     *         {@code location.y + h} results in integer
-     *         overflow
+     *         {@code location.y + h} results in integer overflow
      * @throws IllegalArgumentException if {@code dataBuffer} is not
      *         one of the supported data types, which are
      *         {@code DataBuffer.TYPE_BYTE},
@@ -906,6 +989,25 @@ public class Raster {
         if (dataBuffer == null) {
             throw new NullPointerException("DataBuffer cannot be null");
         }
+
+        if (w <= 0 || h <= 0) {
+             throw new IllegalArgumentException("w and h must be positive");
+        }
+        long lsz = (long)w * h;
+        if (lsz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("Dimensions (width="+w+
+                                               " height="+h+") are too large");
+        }
+
+        if (location != null) {
+            if ((w + location.getX() > Integer.MAX_VALUE) ||
+                (h + location.getY() > Integer.MAX_VALUE)) {
+              throw new RasterFormatException(
+                 "location.x + w and location.y + h " +
+                 " cannot exceed Integer.MAX_VALUE");
+            }
+        }
+
         if (location == null) {
            location = new Point(0,0);
         }
@@ -960,11 +1062,13 @@ public class Raster {
      * @return a WritableRaster object with the specified
      *         {@code DataBuffer}, width, height, and
      *         bits per pixel.
-     * @throws RasterFormatException if {@code w} or {@code h}
-     *         is less than or equal to zero, or computing either
+     * @throws IllegalArgumentException if {@code w} and {@code h}
+     *         are not both greater than 0
+     * @throws IllegalArgumentException if the product of {@code w}
+     *         and {@code h} is greater than {@code Integer.MAX_VALUE}
+     * @throws RasterFormatException if computing either
      *         {@code location.x + w} or
-     *         {@code location.y + h} results in integer
-     *         overflow
+     *         {@code location.y + h} results in integer overflow
      * @throws IllegalArgumentException if {@code dataType} is not
      *         one of the supported data types, which are
      *         {@code DataBuffer.TYPE_BYTE},
@@ -972,6 +1076,8 @@ public class Raster {
      *         or {@code DataBuffer.TYPE_INT}
      * @throws RasterFormatException if {@code dataBuffer} has more
      *         than one bank.
+     * @throws RasterFormatException if {@code bitsPixel} is less than 1 or
+     *         not a power of 2 or exceeds the {@code dataBuffer} element size.
      * @throws NullPointerException if {@code dataBuffer} is null
      */
     public static WritableRaster createPackedRaster(DataBuffer dataBuffer,
@@ -982,6 +1088,25 @@ public class Raster {
         if (dataBuffer == null) {
             throw new NullPointerException("DataBuffer cannot be null");
         }
+        if (w <= 0 || h <= 0) {
+             throw new IllegalArgumentException("w and h must be positive");
+        }
+        long lsz = (long)w * h;
+
+        if (lsz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("Dimensions (width="+w+
+                                               " height="+h+") are too large");
+        }
+
+        if (location != null) {
+            if ((w + location.getX() > Integer.MAX_VALUE) ||
+                (h + location.getY() > Integer.MAX_VALUE)) {
+              throw new RasterFormatException(
+                 "location.x + w and location.y + h " +
+                 " cannot exceed Integer.MAX_VALUE");
+            }
+        }
+
         if (location == null) {
            location = new Point(0,0);
         }
@@ -1000,6 +1125,12 @@ public class Raster {
                                       " must only have 1 bank.");
         }
 
+        if ((bitsPerPixel < 1) || (bitsPerPixel > DataBuffer.getDataTypeSize(dataType))) {
+            // NB MPPSM checks power of 2 condition
+            throw new
+                RasterFormatException("bitsPerPixel must be > 0 and a power of 2 that " +
+                                      "does not exceed data buffer element size");
+        }
         MultiPixelPackedSampleModel mppsm =
                 new MultiPixelPackedSampleModel(dataType, w, h, bitsPerPixel);
 
diff --git a/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java b/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
index defef9b3b65..d89de44401b 100644
--- a/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
+++ b/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8255800
+ * @bug 8255800 8369129
  * @summary verify Raster + SampleModel creation vs spec.
  */
 
@@ -42,26 +42,40 @@ public class CreateRasterExceptionTest {
     static int[] negBankIndices = new int[] { -1, 0};
     static int[] bandOffsets = new int[] { 0, 0};
     static int[] bandOffsets2 = new int[] { 0, 0, 0, 0};
+    static int[] bandMasks1 = new int[] { 0x0ff };
     static int[] zeroBandOffsets = new int[] {};
     static DataBuffer dBuffer = new DataBufferByte(15);
+    static DataBuffer dBuffer1 = new DataBufferByte(1);
 
     static void noException() {
          Thread.dumpStack();
          throw new RuntimeException("No expected exception");
     }
 
-    /* Except a version starting with "17" or higher */
-    static void checkIsOldVersion(Throwable t) {
+    /**
+      * If running on a JDK of the targetVersion or later, throw
+      * a RuntimeException because the exception argument
+      * should not have occured. However it is expected on
+      * prior versions because that was the previous behaviour.
+      * @param targetVersion to check
+      * @param t the thrown exception to print
+      */
+    static void checkIsOldVersion(int targetVersion, Throwable t) {
         String version = System.getProperty("java.version");
         version = version.split("\\D")[0];
         int v = Integer.parseInt(version);
-        if (v >= 17) {
+        if (v >= targetVersion) {
             t.printStackTrace();
             throw new RuntimeException(
                            "Unexpected exception for version " + v);
         }
     }
 
+    /* Except a version starting with "17" or higher */
+    static void checkIsOldVersion(Throwable t) {
+        checkIsOldVersion(17, t);
+    }
+
     public static void main(String[] args) {
          componentSampleModelTests1();
          componentSampleModelTests2();
@@ -73,6 +87,10 @@ public class CreateRasterExceptionTest {
          interleavedRasterTests1();
          interleavedRasterTests2();
          interleavedRasterTests3();
+         packedRasterTests1();
+         packedRasterTests2();
+         packedRasterTests3();
+         packedRasterTests4();
          System.out.println();
          System.out.println(" ** Test Passed **");
     }
@@ -734,7 +752,7 @@ public class CreateRasterExceptionTest {
             /* @throws ArrayIndexOutOfBoundsException if
              * {@code bankIndices} is null
              */
-            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, 0,
+            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, 1,
                                       null, bandOffsets, null);
             noException();
         } catch (ArrayIndexOutOfBoundsException t) {
@@ -747,7 +765,7 @@ public class CreateRasterExceptionTest {
             /* @throws NullPointerException if {@code bandOffsets}
              * is null
              */
-            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, 0,
+            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, 1,
                                       bankIndices, null, null);
             noException();
         } catch (NullPointerException t) {
@@ -756,6 +774,21 @@ public class CreateRasterExceptionTest {
             System.out.println(t);
         }
 
+        try {
+            /* @throws IllegalArgumentException if the lengths of {@code bankIndices}
+             *         and {@code bandOffsets} are different.
+             */
+            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, 1,
+                                      bankIndices, bandOffsets2, null);
+            noException();
+        } catch (ArrayIndexOutOfBoundsException t) {
+          checkIsOldVersion(26, t);
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for different array lengths");
+            System.out.println(t);
+        }
+
         try {
             /* @throws IllegalArgumentException if {@code dataType} is
              * not one of the supported data types for this sample model
@@ -894,6 +927,21 @@ public class CreateRasterExceptionTest {
             System.out.println(t);
         }
 
+        try {
+            /* @throws ArrayIndexOutOfBoundsException if any element of {@code bankIndices}
+             *         is greater or equal to the number of bands in {@code dataBuffer}
+             */
+            int[] indices = new int[] { 0, 1, 2 };
+            int[] offsets = new int[] { 0, 0, 0 };
+            Raster.createBandedRaster(dBuffer, 1, 1, 1,
+                                      indices, offsets, null);
+            noException();
+        } catch (ArrayIndexOutOfBoundsException t) {
+            System.out.println(
+                   "Got expected exception for bad bank index");
+            System.out.println(t);
+        }
+
         try {
             /*
              * @throws IllegalArgumentException if {@code dataType}
@@ -1045,6 +1093,25 @@ public class CreateRasterExceptionTest {
             System.out.println(t);
         }
 
+        try {
+            /* @throws IllegalArgumentException if the data size
+             * needs to store all lines is greater than
+             * {@code Integer.MAX_VALUE}
+             */
+            Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
+                    1000, 1000,
+                    Integer.MAX_VALUE/2 , 1,
+                    bandOffsets, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println("Got expected exception for overflow");
+            System.out.println(t);
+        } catch (NegativeArraySizeException t) {
+            checkIsOldVersion(26, t);
+            System.out.println("Got expected exception for overflow");
+            System.out.println(t);
+        }
+
         try {
             /* @throws RasterFormatException if computing either
              * {@code location.x + w} or
@@ -1062,10 +1129,10 @@ public class CreateRasterExceptionTest {
 
         try {
              /* @throws IllegalArgumentException if
-              * {@code scanlineStride} is less than 0
+              * {@code scanlineStride} is less than or equal to 0
               */
             Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-                                      1, 1, -3, 1, bandOffsets, null);
+                                      1, 1, 0, 1, bandOffsets, null);
             noException();
         } catch (IllegalArgumentException t) {
             System.out.println(
@@ -1075,15 +1142,17 @@ public class CreateRasterExceptionTest {
 
         try {
              /* @throws IllegalArgumentException if {@code pixelStride}
-              * is less than 0
+              * is less than or equal to 0
               */
             Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-                                      1, 1, 3, -1, bandOffsets, null);
+                                      1, 1, 3, 0, bandOffsets, null);
             noException();
         } catch (IllegalArgumentException t) {
             System.out.println(
                    "Got expected exception for pixelStride < 0");
             System.out.println(t);
+        } catch (RasterFormatException t) {
+            checkIsOldVersion(26, t);
         } catch (NegativeArraySizeException t) {
             checkIsOldVersion(t);
             System.out.println(
@@ -1091,12 +1160,25 @@ public class CreateRasterExceptionTest {
             System.out.println(t);
         }
 
+        try {
+            /* @throws IllegalArgumentException if (w * pixelStride)
+             * is greater than scanlineStride
+             */
+            Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
+                                  1, 1, 0, 1, bandOffsets, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for incorrect stride");
+            System.out.println(t);
+        }
+
         try {
             /* @throws NullPointerException if {@code bandOffsets}
              * is null
              */
             Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-                                  1, 1, 0, 1, null, null);
+                                  1, 1, 1, 1, null, null);
             noException();
         } catch (NullPointerException t) {
             System.out.println(
@@ -1187,6 +1269,18 @@ public class CreateRasterExceptionTest {
             System.out.println(t);
         }
 
+        try {
+             /* @throws RasterFormatException if {@code dataBuffer} is too small.
+              */
+            Raster.createInterleavedRaster(dBuffer1, 5, 1, 15, 1,
+                                      bandOffsets, null);
+            noException();
+        } catch (RasterFormatException t) {
+            System.out.println(
+                "Got expected exception for databuffer too small");
+            System.out.println(t);
+        }
+
         try {
              /* @throws IllegalArgumentException if {@code pixelStride}
               * is less than 0
@@ -1199,7 +1293,6 @@ public class CreateRasterExceptionTest {
                    "Got expected exception for pixelStride < 0");
             System.out.println(t);
         } catch (NegativeArraySizeException t) {
-if (t != null) throw t;
             checkIsOldVersion(t);
             System.out.println(
                    "Got expected exception for pixelStride < 0");
@@ -1242,9 +1335,398 @@ if (t != null) throw t;
                                       bandOffsets, null);
             noException();
         } catch (RasterFormatException t) {
+            System.out.println(
+                   "Got expected exception for bad databuffer banks");
+            System.out.println(t);
+        }
+
+        try {
+             /* @throws IllegalArgumentException if any element of {@code bandOffsets} is greater
+             *  than {@code pixelStride} or the {@code scanlineStride}
+             */
+            int[] offsets = new int[] { 0, 1, 2};
+            Raster.createInterleavedRaster(dBuffer,
+                                  1, 1, 1, 1, offsets, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for element too large");
+            System.out.println(t);
+        }
+
+    }
+
+    /*  createPackedRaster(int dataType,
+     *                     int w, int h,
+     *                     int[] bandMasks,
+     *                     Point location)
+     *
+     */
+     static void packedRasterTests1() {
+
+        System.out.println();
+        System.out.println("** packedRasterTests1");
+
+         try {
+             /* @throws IllegalArgumentException if {@code w} and {@code h}
+              *         are not both greater than 0
+              */
+             Raster.createPackedRaster(DataBuffer.TYPE_BYTE, 0, 0, bandMasks1, null);
+            noException();
+         } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for zero w / h");
+            System.out.println(t);
+         }
+
+         try {
+             /* @throws IllegalArgumentException if {@code w} * {@code h}
+              *         is greater than {@code Integer.MAX_VALUE}
+              */
+             Raster.createPackedRaster(DataBuffer.TYPE_BYTE,
+                                       Integer.MAX_VALUE/10, Integer.MAX_VALUE/10,
+                                       bandMasks1, null);
+            noException();
+         } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for overflow");
+            System.out.println(t);
+         }
+
+        try {
+            /* @throws RasterFormatException if computing either
+             * {@code location.x + w} or
+             * {@code location.y + h} results in integer overflow
+             */
+            Point pt = new Point(5, 1);
+            Raster.createPackedRaster(DataBuffer.TYPE_BYTE,
+                                      Integer.MAX_VALUE-2, 1,
+                                      bandMasks1, pt);
+            noException();
+        } catch (RasterFormatException t) {
+            System.out.println("Got expected exception for overflow");
+            System.out.println(t);
+        }
+
+        try {
+            /* @throws IllegalArgumentException if {@code dataType}
+             * is not one of the supported data types
+             */
+            Raster.createPackedRaster(1000, 1, 1, bandMasks1, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for bad databuffer type");
+            System.out.println(t);
+        }
+     }
+
+    /*  createPackedRaster(int dataType,
+     *                     int w, int h,
+     *                     int bands,
+     *                     int bitsPerBand,
+     *                     Point location)
+     */
+     static void packedRasterTests2() {
+
+        System.out.println();
+        System.out.println("** packedRasterTests2");
+
+         try {
+             /* @throws IllegalArgumentException if {@code w} and {@code h}
+              *         are not both greater than 0
+              */
+             Raster.createPackedRaster(DataBuffer.TYPE_BYTE, 0, 0, 1, 8, null);
+             noException();
+         } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for zero w / h");
+            System.out.println(t);
+         }
+
+         try {
+             /* @throws IllegalArgumentException if {@code w} * {@code h}
+              *         is greater than {@code Integer.MAX_VALUE}
+              */
+             Raster.createPackedRaster(DataBuffer.TYPE_BYTE,
+                                       Integer.MAX_VALUE/10, Integer.MAX_VALUE/10,
+                                       1, 8, null);
+             noException();
+         } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for overflow");
+            System.out.println(t);
+         }
+
+        try {
+            /* @throws RasterFormatException if computing either
+             * {@code location.x + w} or
+             * {@code location.y + h} results in integer overflow
+             */
+            Point pt = new Point(5, 1);
+            Raster.createPackedRaster(DataBuffer.TYPE_BYTE,
+                                      Integer.MAX_VALUE-2, 1,
+                                      1, 8, pt);
+            noException();
+        } catch (RasterFormatException t) {
+            System.out.println("Got expected exception for overflow");
+            System.out.println(t);
+        }
+
+        try {
+             /* @throws IllegalArgumentException if {@code bitsPerBand} or
+              *         {@code bands} is not greater than zero
+              */
+            Raster.createPackedRaster(DataBuffer.TYPE_BYTE, 1, 1,
+                                       0, 8, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for 0 bands");
+            System.out.println(t);
+        }
+
+        try {
+            /* @throws IllegalArgumentException if {@code bitsPerBand} or
+             *         {@code bands} is not greater than zero
+             */
+            Raster.createPackedRaster(DataBuffer.TYPE_BYTE, 1, 1,
+                                       8, 0, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for 0 bitsPerBand");
+            System.out.println(t);
+        }
+
+        try {
+            /* @throws IllegalArgumentException if the product of
+             *         {@code bitsPerBand} and {@code bands} is
+             *         greater than the number of bits held by
+             *         {@code dataType}
+             */
+            Raster.createPackedRaster(DataBuffer.TYPE_BYTE, 1, 1,
+                                       2, 8, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for bands per sample");
+            System.out.println(t);
+        }
+
+        try {
+            /* @throws IllegalArgumentException if {@code dataType}
+             * is not one of the supported data types
+             */
+            Raster.createPackedRaster(1000, 1, 1, 1, 8, null);
+            noException();
+        } catch (IllegalArgumentException t) {
             System.out.println(
                    "Got expected exception for bad databuffer type");
             System.out.println(t);
         }
     }
+
+    /*  createPackedRaster(DataBuffer dataBuffer,
+     *                     int w, int h,
+     *                     int scanlineStride,
+     *                     int[] bandMasks,
+     *                     Point location)
+     */
+    static void packedRasterTests3() {
+
+        System.out.println();
+        System.out.println("** packedRasterTests3");
+
+        try {
+             /* @throws IllegalArgumentException if {@code w} and {@code h}
+              *         are not both greater than 0
+              */
+            Raster.createPackedRaster(dBuffer, 0, 1, 1, bandMasks1, null);
+           noException();
+        } catch (IllegalArgumentException t) {
+           System.out.println(
+                  "Got expected exception for zero w / h");
+           System.out.println(t);
+        }
+
+        try {
+            /* @throws IllegalArgumentException if {@code w} * {@code h}
+             *         is greater than {@code Integer.MAX_VALUE}
+             */
+            Raster.createPackedRaster(dBuffer,
+                                      Integer.MAX_VALUE/10, Integer.MAX_VALUE/10,
+                                      1, bandMasks1, null);
+           noException();
+        } catch (IllegalArgumentException t) {
+           System.out.println(
+                  "Got expected exception for overflow");
+           System.out.println(t);
+        }
+
+       try {
+           /* @throws RasterFormatException if computing either
+            * {@code location.x + w} or
+            * {@code location.y + h} results in integer overflow
+            */
+           Point pt = new Point(5, 1);
+           Raster.createPackedRaster(dBuffer,
+                                     Integer.MAX_VALUE-2, 1,
+                                     1, bandMasks1, pt);
+           noException();
+       } catch (RasterFormatException t) {
+           System.out.println("Got expected exception for overflow");
+           System.out.println(t);
+       }
+
+       try {
+            /* @throws NullPointerException if databuffer is null.
+             */
+            Raster.createPackedRaster(null,
+                                      1, 1,
+                                      1, bandMasks1, null);
+           noException();
+       } catch (NullPointerException t) {
+          System.out.println(
+                  "Got expected exception for null data buffer");
+           System.out.println(t);
+       }
+
+       try {
+            /* @throws RasterFormatException if {@code dataBuffer}
+             * has more than one bank.
+             */
+            DataBufferByte dbuffer2 = new DataBufferByte(20, 2);
+            Raster.createPackedRaster(dbuffer2, 1, 1, 1, bandMasks1, null);
+            noException();
+        } catch (RasterFormatException t) {
+            System.out.println(
+                   "Got expected exception for bad databuffer banks");
+            System.out.println(t);
+        }
+       try {
+            /* @throws IllegalArgumentException if {@code dataBuffer}
+             * is not one of the supported data types
+             */
+            DataBufferFloat dbFloat = new DataBufferFloat(20);
+            Raster.createPackedRaster(dbFloat, 1, 1, 1, bandMasks1, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for bad databuffer type");
+            System.out.println(t);
+        }
+   }
+
+    /* createPackedRaster(DataBuffer dataBuffer,
+     *               int w, int h,
+     *               int bitsPerPixel,
+     *               Point location)
+     */
+    static void packedRasterTests4() {
+
+        System.out.println();
+        System.out.println("** packedRasterTests4");
+
+        try {
+             /* @throws IllegalArgumentException if {@code w} and {@code h}
+              *         are not both greater than 0
+              */
+            Raster.createPackedRaster(dBuffer, 0, 1, 8, null);
+           noException();
+        } catch (IllegalArgumentException t) {
+           System.out.println(
+                  "Got expected exception for zero w / h");
+           System.out.println(t);
+        }
+
+        try {
+            /* @throws IllegalArgumentException if {@code w} * {@code h}
+             *         is greater than {@code Integer.MAX_VALUE}
+             */
+            Raster.createPackedRaster(dBuffer,
+                                      Integer.MAX_VALUE/10, Integer.MAX_VALUE/10,
+                                      8, null);
+           noException();
+        } catch (IllegalArgumentException t) {
+           System.out.println(
+                  "Got expected exception for overflow");
+           System.out.println(t);
+        }
+
+       try {
+           /* @throws RasterFormatException if computing either
+            * {@code location.x + w} or
+            * {@code location.y + h} results in integer overflow
+            */
+           Point pt = new Point(5, 1);
+           Raster.createPackedRaster(dBuffer,
+                                     Integer.MAX_VALUE-2, 1,
+                                     8, pt);
+           noException();
+       } catch (RasterFormatException t) {
+           System.out.println("Got expected exception for overflow");
+           System.out.println(t);
+       }
+
+       try {
+            /* @throws IllegalArgumentException if {@code dataBuffer}
+             * is not one of the supported data types
+             */
+            DataBufferFloat dbFloat = new DataBufferFloat(20);
+            Raster.createPackedRaster(dbFloat, 1, 1, 8, null);
+            noException();
+        } catch (IllegalArgumentException t) {
+            System.out.println(
+                   "Got expected exception for bad databuffer type");
+            System.out.println(t);
+        }
+
+        try {
+            /* @throws RasterFormatException if {@code dataBuffer}
+             * has more than one bank.
+             */
+            DataBufferByte dbb = new DataBufferByte(100, 2);
+            Raster.createPackedRaster(dbb, 1, 1, 8, null);
+            noException();
+        } catch (RasterFormatException t) {
+            System.out.println(
+                   "Got expected exception for bad databuffer banks");
+            System.out.println(t);
+        }
+
+        try {
+            /* @throws NullPointerException if databuffer is null.
+             */
+           Raster.createPackedRaster(null, 1, 1, 8, null);
+           noException();
+       } catch (NullPointerException t) {
+          System.out.println(
+                  "Got expected exception for null data buffer");
+           System.out.println(t);
+       }
+
+       int[] badbpp = { 0, 6, 16 };
+       for (int bpp : badbpp) {
+           try {
+               /* @throws RasterFormatException if {@code bitsPixel} is less than 1 or
+                * not a power of 2 or exceeds the {@code dataBuffer} element size.
+                */
+               System.out.println("Test bpp=" + bpp);
+               Raster.createPackedRaster(dBuffer, 1, 1, bpp, null);
+               noException();
+           } catch (RasterFormatException t) {
+              System.out.println(
+                      "Got expected exception for bitsPerPixel");
+               System.out.println(t);
+           } catch (ArithmeticException t) {
+               checkIsOldVersion(26, t);
+               if (bpp != 0) {
+                   throw new RuntimeException("Unexpected arithmetic exception");
+               }
+               System.out.println("Got expected arithmetic exception");
+               System.out.println(t);
+        }
+       }
+    }
 }

From 2b5cd14ea5c571e0d55df8293e49b9a0db521a46 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 21 Nov 2025 18:45:57 +0000
Subject: [PATCH 304/512] 8282441: [LOOM] The debug agent should attempt to
 free vthread ThreadNodes

Reviewed-by: amenkov, sspitsyn
---
 .../share/native/libjdwp/threadControl.c      | 262 ++++++++++++++----
 1 file changed, 205 insertions(+), 57 deletions(-)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index bfeffe85678..491182a583f 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,6 +137,9 @@ typedef struct {
 
 static DeferredEventModeList deferredEventModes;
 
+static ThreadNode *
+insertThread(JNIEnv *env, ThreadList *list, jthread thread);
+
 /* Get the state of the thread direct from JVMTI */
 static jvmtiError
 threadState(jthread thread, jint *pstate)
@@ -277,6 +280,35 @@ findThread(ThreadList *list, jthread thread)
     return node;
 }
 
+/* Creates a new ThreadNode for a vthread if one is needed. */
+static ThreadNode *
+createVThreadNodeIfNeeded(jthread thread) {
+    ThreadNode *node = findThread(&otherThreads, thread);
+    if (node != NULL) {
+        //tty_message("createVThreadNodeIfNeeded: thread is on otherThreads");
+        // Don't create a new node if it is on otherThreads list. Also don't return
+        // the existing node because if it is on otherThreads, it is not running.
+        return NULL;
+    }
+
+    // See if we have a vthread that is alive. If we do, create a ThreadNode
+    // for it. Otherwise just return NULL.
+    jint vthread_state = 0;
+    jvmtiError error = threadState(thread, &vthread_state);
+    if (error != JVMTI_ERROR_NONE) {
+        EXIT_ERROR(error, "getting vthread state");
+    }
+    if ((vthread_state & JVMTI_THREAD_STATE_ALIVE) == 0) {
+        return NULL; // Don't create a new ThreadNode if thread is not alive
+    }
+    node = insertThread(getEnv(), &runningVThreads, thread);
+    if (node->suspendCount > 0 && !node->suspendOnStart) {
+        node->toBeResumed = JNI_TRUE;
+    }
+
+    return node;
+}
+
 /* Search for a running thread, including vthreads. */
 static ThreadNode *
 findRunningThread(jthread thread)
@@ -284,6 +316,16 @@ findRunningThread(jthread thread)
     ThreadNode *node;
     if (isVThread(thread)) {
         node = findThread(&runningVThreads, thread);
+        if (node == NULL && !gdata->includeVThreads) {
+            // Unlike platform threads, we don't always have a ThreadNode for all vthreads.
+            // They can be freed if not holding on to any relevant state info. It's also
+            // possible that the vthread was created before the debugger attached. Also
+            // in the future we won't be enabling VIRTUAL_THREAD_START events in some
+            // cases, which means we won't be creating a ThreadNode when the vthread is
+            // created. If for any of the above reasons the ThreadNode lookup failed,
+            // we'll create one for the vthread now, but only if really needed.
+            node = createVThreadNodeIfNeeded(thread);
+        }
     } else {
         node = findThread(&runningThreads, thread);
     }
@@ -370,6 +412,23 @@ insertThread(JNIEnv *env, ThreadList *list, jthread thread)
             EXIT_ERROR(AGENT_ERROR_OUT_OF_MEMORY,"thread table entry");
             return NULL;
         }
+
+#ifdef DEBUG_THREADNAME
+        {
+            /* Set the thread name */
+            jvmtiThreadInfo info;
+            jvmtiError error;
+
+            memset(&info, 0, sizeof(info));
+            error = JVMTI_FUNC_PTR(gdata->jvmti,GetThreadInfo)
+                    (gdata->jvmti, node->thread, &info);
+            if (info.name != NULL) {
+                strncpy(node->name, info.name, sizeof(node->name) - 1);
+                jvmtiDeallocate(info.name);
+            }
+        }
+#endif
+
         if (!is_vthread) {
             if (threadControl_isDebugThread(node->thread)) {
                 /* Remember if it is a debug thread */
@@ -418,22 +477,6 @@ insertThread(JNIEnv *env, ThreadList *list, jthread thread)
         node->eventBag = eventBag;
         addNode(list, node);
 
-#ifdef DEBUG_THREADNAME
-        {
-            /* Set the thread name */
-            jvmtiThreadInfo info;
-            jvmtiError error;
-
-            memset(&info, 0, sizeof(info));
-            error = JVMTI_FUNC_PTR(gdata->jvmti,GetThreadInfo)
-                    (gdata->jvmti, node->thread, &info);
-            if (info.name != NULL) {
-                strncpy(node->name, info.name, sizeof(node->name) - 1);
-                jvmtiDeallocate(info.name);
-            }
-        }
-#endif
-
         /* Set thread local storage for quick thread -> node access.
          *   Threads that are not yet started do not allow setting of TLS. These
          *   threads go on the otherThreads list and have their TLS set
@@ -491,8 +534,7 @@ removeResumed(JNIEnv *env, ThreadList *list)
 static void
 removeVThreads(JNIEnv *env)
 {
-    ThreadList *list = &runningVThreads;
-    ThreadNode *node = list->first;
+    ThreadNode *node = runningVThreads.first;
     while (node != NULL) {
         ThreadNode *temp = node->next;
         removeNode(node);
@@ -501,6 +543,94 @@ removeVThreads(JNIEnv *env)
     }
 }
 
+/*
+ * Free (garbage collect) a vthread node if it is unused. This can only be called when
+ * locks are held so we don't need to worry about other threads changing the state
+ * of the ThreadNode while we are looking at it. We also need to make sure the
+ * ThreadNode is not in use for operations like single stepping or invoking.
+ */
+static void
+freeUnusedVThreadNode(JNIEnv *env, ThreadNode* node)
+{
+    if (gdata->includeVThreads) {
+        return;
+    }
+
+    /*
+     * node->suspendCount requires special handling to see if it triggers having
+     * to keep the node around. It's possible for it to be 0 yet we still need to
+     * keep the node around. Also, it's possbile for it to be non-zero yet we
+     * don't need to keep the node around. More details in the comments below.
+     */
+    if (node->suspendCount == 0) {
+        /*
+         * Normally a suspendCount of 0 does not result in having to keep the
+         * node. However, if the suspendAllCount is not 0, then we do. Otherwise
+         * when the node is recreated later it will end up assuming suspendAllCount
+         * as its suspendCount rather than 0, which would be incorrect. This
+         * mismatch in suspend counts happens when there is a suspendAll in place,
+         * and ThreadReference.resume() is used to decrement the thread's
+         * suspendCount to 0.
+         */
+        if (suspendAllCount > 0) {
+            return;
+        }
+    } else {
+        /*
+         * Although at first it might seem that a non-zero suspendCount would require
+         * keeping the node, we don't have to if node->suspendCount == suspendAllCount,
+         * because when the node is recreated it will get suspendAllCount assigned to it.
+         * So we only worry about keeping the node around if the two counts are not equal.
+         */
+        if (node->suspendCount != suspendAllCount) {
+            return;
+        }
+
+    }
+
+    // All of the following conditions must be met to free this node. Note
+    // suspendCount checks were already made above, so are not included below. If
+    // we got here, then suspendCount checks passed w.r.t. being able to free the node.
+    // Also note we don't need to check node->toBeResumed. If it is set, that implies
+    // node->suspendCount > 0, and that will trigger toBeResumed getting set when
+    // the ThreadNode is recreated. See createVThreadNodeIfNeeded().
+    if (!node->suspendOnStart &&
+        node->current_ei == 0 &&
+        node->cleInfo.ei == 0 &&
+        !node->currentInvoke.pending &&
+        !node->currentInvoke.started &&
+        !node->currentInvoke.available &&
+        !node->currentStep.pending &&
+        node->instructionStepMode != JVMTI_ENABLE &&
+        !node->pendingInterrupt &&
+        !node->popFrameEvent &&
+        !node->popFrameProceed &&
+        !node->popFrameThread &&
+        node->pendingStop == NULL)
+    {
+        removeNode(node);
+        clearThread(env, node);
+    }
+}
+
+/*
+ * Free (garbage collect) vthread nodes if unused. See freeUnusedVThreadNode() above.
+ */
+static void
+freeUnusedVThreadNodes(JNIEnv *env)
+{
+    if (gdata->includeVThreads) {
+        return;
+    }
+
+    ThreadNode *node = runningVThreads.first;
+    while (node != NULL) {
+        ThreadNode *temp = node->next;
+        freeUnusedVThreadNode(env, node);
+        node = temp;
+    }
+}
+
 static void
 moveNode(ThreadList *source, ThreadList *dest, ThreadNode *node)
 {
@@ -1139,6 +1269,7 @@ commonResumeList(JNIEnv *env)
 
 /*
  * This function must be called after preSuspend and before postSuspend.
+ * Only called for platform threads.
  */
 static jvmtiError
 commonSuspendList(JNIEnv *env, jint initCount, jthread *initList)
@@ -1160,15 +1291,17 @@ commonSuspendList(JNIEnv *env, jint initCount, jthread *initList)
      */
     for (i = 0; i < initCount; i++) {
         ThreadNode *node;
+        jthread thread = initList[i];
+        JDI_ASSERT(!isVThread(thread));
 
         /*
          * If the thread is not between its start and end events, we should
          * still suspend it. To keep track of things, add the thread
          * to a separate list of threads so that we'll resume it later.
          */
-        node = findThread(&runningThreads, initList[i]);
+        node = findThread(&runningThreads, thread);
         if (node == NULL) {
-            node = insertThread(env, &otherThreads, initList[i]);
+            node = insertThread(env, &otherThreads, thread);
         }
 
         if (node->isDebugThread) {
@@ -1187,7 +1320,7 @@ commonSuspendList(JNIEnv *env, jint initCount, jthread *initList)
 
         if (node->suspendCount == 0) {
             /* thread is not suspended yet so put it on the request list */
-            reqList[reqCnt++] = initList[i];
+            reqList[reqCnt++] = thread;
         }
     }
 
@@ -1255,10 +1388,16 @@ commonResume(jthread thread)
     ThreadNode *node;
 
     /*
-     * The thread is normally between its start and end events, but if
-     * not, check the auxiliary list used by threadControl_suspendThread.
+     * We need to call findRunningThread(thread) here instead of just calling
+     * findThread(NULL, thread) because it's possible that there is not currently a
+     * ThreadNode for the thread, and findRunningThread() will create one in that case.
      */
-    node = findThread(NULL, thread);
+    node = findRunningThread(thread);
+    if (node == NULL) {
+        // The thread is normally between its start and end events, but if not,
+        // check the auxiliary list used by commonSuspend() and commonSuspendList().
+        node = findThread(&otherThreads, thread);
+    }
 #if 0
     tty_message("commonResume: node(%p) suspendCount(%d) %s", node, node->suspendCount, node->name);
 #endif
@@ -1336,24 +1475,9 @@ threadControl_suspendCount(jthread thread, jint *count)
     } else {
         /*
          * If the node is in neither list, the debugger never suspended
-         * this thread, so the suspend count is 0, unless it is a vthread.
+         * this thread, so the suspend count is 0.
          */
-        if (isVThread(thread)) {
-            jint vthread_state = 0;
-            jvmtiError error = threadState(thread, &vthread_state);
-            if (error != JVMTI_ERROR_NONE) {
-                EXIT_ERROR(error, "getting vthread state");
-            }
-            if (vthread_state == 0) {
-                // If state == 0, then this is a new vthread that has not been started yet.
-                *count = 0;
-            } else {
-                // This is a started vthread that we are not tracking. Use suspendAllCount.
-                *count = suspendAllCount;
-            }
-        } else {
-            *count = 0;
-        }
+        *count = 0;
     }
 
     debugMonitorExit(threadLock);
@@ -1406,9 +1530,6 @@ threadControl_suspendAll(void)
 {
     jvmtiError error;
     JNIEnv    *env;
-#if 0
-    tty_message("threadControl_suspendAll: suspendAllCount(%d)", suspendAllCount);
-#endif
 
     env = getEnv();
 
@@ -1416,6 +1537,8 @@ threadControl_suspendAll(void)
 
     preSuspend();
 
+    //tty_message("threadControl_suspendAll: suspendAllCount(%d)", suspendAllCount);
+
     /*
      * Get a list of all threads and suspend them.
      */
@@ -1425,6 +1548,11 @@ threadControl_suspendAll(void)
         jint count;
 
         if (gdata->vthreadsSupported) {
+            // Now is a good time to garbage collect vthread nodes. We want to do it before
+            // any suspendAll because it will prevent the suspended nodes from being freed.
+            if (!gdata->includeVThreads) {
+                freeUnusedVThreadNodes(env);
+            }
             /* Tell JVMTI to suspend all virtual threads. */
             if (suspendAllCount == 0) {
                 error = JVMTI_FUNC_PTR(gdata->jvmti, SuspendAllVirtualThreads)
@@ -1528,9 +1656,6 @@ threadControl_resumeAll(void)
 {
     jvmtiError error;
     JNIEnv    *env;
-#if 0
-    tty_message("threadControl_resumeAll: suspendAllCount(%d)", suspendAllCount);
-#endif
 
     env = getEnv();
 
@@ -1539,6 +1664,8 @@ threadControl_resumeAll(void)
     eventHandler_lock(); /* for proper lock order */
     debugMonitorEnter(threadLock);
 
+    //tty_message("threadControl_resumeAll: suspendAllCount(%d)", suspendAllCount);
+
     if (gdata->vthreadsSupported) {
         if (suspendAllCount == 1) {
             jint excludeCnt = 0;
@@ -2092,7 +2219,7 @@ threadControl_onEventHandlerEntry(jbyte sessionID, EventInfo *evinfo, jobject cu
         processDeferredEventModes(env, thread, node);
     }
     if (ei == EI_THREAD_END) {
-        // If the node was previously freed, then it was just recreated and we need
+        // If the node was previously freed and was just now recreated, we need
         // to mark it as started.
         node->isStarted = JNI_TRUE;
     }
@@ -2148,17 +2275,30 @@ threadControl_onEventHandlerExit(EventIndex ei, jthread thread,
 
     log_debugee_location("threadControl_onEventHandlerExit()", thread, NULL, 0);
 
-    if (ei == EI_THREAD_END) {
+    if (ei == EI_THREAD_END || ei == EI_THREAD_START) {
         eventHandler_lock(); /* for proper lock order - see removeThread() call below */
         debugMonitorEnter(threadLock);
         node = findRunningThread(thread);
         if (node == NULL) {
            EXIT_ERROR(AGENT_ERROR_NULL_POINTER,"thread list corrupted");
         }
-        removeThread(env, node); // Grabs handlerLock, thus the reason for first grabbing it above.
-        node = NULL; // We exiting the threadLock. No longer safe to access.
-        debugMonitorExit(threadLock);
-        eventHandler_unlock();
+        // Remove nodes for exiting threads, but also remove nodes for vthreads
+        // that are just starting to help prevent their accumulation. There can't
+        // possibly be any state related information in the node at this point. A new
+        // one will be created later if necessary, such as when a new event arrives.
+        if (ei == EI_THREAD_END || (node->is_vthread && !gdata->includeVThreads)) {
+            removeThread(env, node); // Grabs handlerLock, thus the reason for first grabbing it above.
+            node = NULL; // Node has been freed. No longer safe to access.
+       } else {
+            // EI_THREAD_START for a platform thread, or we are tracking vthreads.
+            // In either case we are not removing the thread node.
+            // Just clear these two fields. Others are not set yet. Also no need to
+            // worry about pending tasks like we do below for other event types.
+            node->eventBag = eventBag;
+            node->current_ei = 0;
+       }
+       debugMonitorExit(threadLock);
+       eventHandler_unlock();
     } else {
         debugMonitorEnter(threadLock);
         node = findRunningThread(thread);
@@ -2173,7 +2313,7 @@ threadControl_onEventHandlerExit(EventIndex ei, jthread thread,
         node->pendingStop = NULL;
         node->eventBag = eventBag;
         node->current_ei = 0;
-        node = NULL; // We exiting the threadLock. No longer safe to access.
+        node = NULL; // We're exiting the threadLock. No longer safe to access.
         // doPendingTasks() may do an upcall to java, and we don't want to hold any
         // locks when doing that. Thus we got all our node updates done first
         // and can now exit the threadLock.
@@ -2189,6 +2329,8 @@ threadControl_onEventHandlerExit(EventIndex ei, jthread thread,
             // until now. Otherwise there are complaints when JNI IsVirtualThread is called.
             JNI_FUNC_PTR(env,Throw)(env, currentException);
         }
+        // Note: Threads that were just created or are about to die don't have pending
+        // tasks, which is why this is the only code path where we call doPendingTasks().
         doPendingTasks(env, thread, pendingInterrupt, pendingStop);
         if (pendingStop != NULL) {
           tossGlobalRef(env, &pendingStop);
@@ -2207,6 +2349,7 @@ threadControl_applicationThreadStatus(jthread thread,
 
     log_debugee_location("threadControl_applicationThreadStatus()", thread, NULL, 0);
 
+    eventHandler_lock(); // Needed to safely access HANDLING_EVENT(node)
     debugMonitorEnter(threadLock);
 
     error = threadState(thread, &state);
@@ -2229,6 +2372,7 @@ threadControl_applicationThreadStatus(jthread thread,
     }
 
     debugMonitorExit(threadLock);
+    eventHandler_unlock();
 
     return error;
 }
@@ -2334,6 +2478,7 @@ threadControl_stop(jthread thread, jobject throwable)
 
     log_debugee_location("threadControl_stop()", thread, NULL, 0);
 
+    eventHandler_lock(); // Needed to safely access HANDLING_EVENT(node)
     debugMonitorEnter(threadLock);
 
     node = findThread(&runningThreads, thread);
@@ -2351,6 +2496,7 @@ threadControl_stop(jthread thread, jobject throwable)
     }
 
     debugMonitorExit(threadLock);
+    eventHandler_unlock();
 
     return error;
 }
@@ -2579,7 +2725,7 @@ threadControl_dumpAllThreads()
     tty_message("suspendAllCount: %d", suspendAllCount);
     tty_message("Dumping runningThreads:");
     dumpThreadList(&runningThreads);
-    tty_message("\nDumping runningVThreads:");
+    tty_message("\nDumping runningVThreads(numRunningVThreads=%d):", numRunningVThreads);
     dumpThreadList(&runningVThreads);
     tty_message("\nDumping otherThreads:");
     dumpThreadList(&otherThreads);
@@ -2650,9 +2796,11 @@ dumpThread(ThreadNode *node) {
     // kept small so it doesn't generate too much output.
     tty_message("\tsuspendCount: %d", node->suspendCount);
 #if 0
+    tty_message("\ttoBeResumed: %d", node->toBeResumed);
+    tty_message("\tisStarted: %d", node->isStarted);
+    tty_message("\tsuspendOnStart: %d", node->suspendOnStart);
     tty_message("\tsuspendAllCount: %d", suspendAllCount);
     tty_message("\tthreadState: 0x%x", getThreadState(node));
-    tty_message("\ttoBeResumed: %d", node->toBeResumed);
     tty_message("\tis_vthread: %d", node->is_vthread);
     tty_message("\tpendingInterrupt: %d", node->pendingInterrupt);
     tty_message("\tcurrentInvoke.pending: %d", node->currentInvoke.pending);

From 2d815ac61b437835163d4014bfed16f0f3faea50 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Fri, 21 Nov 2025 19:07:54 +0000
Subject: [PATCH 305/512] 8349535: Refactor ./pkcs11/Provider/MultipleLogins.sh
 to java test

Reviewed-by: rhalade
---
 .../pkcs11/Provider/MultipleLogins.java       |  60 +++++---
 .../pkcs11/Provider/MultipleLogins.sh         | 139 ------------------
 2 files changed, 37 insertions(+), 162 deletions(-)
 delete mode 100644 test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh

diff --git a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java
index 073dd557cbd..de95186304a 100644
--- a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java
+++ b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,17 @@
  * questions.
  */
 
+/*
+ * @test
+ * @bug 8240256 8269034
+ * @summary
+ * @library /test/lib/ /sun/security/pkcs11/
+ * @modules jdk.crypto.cryptoki/sun.security.pkcs11
+ * @run main/othervm
+ *        -DCUSTOM_P11_CONFIG=${test.src}/MultipleLogins-nss.txt
+ *        -DCUSTOM_DB_DIR=./nss/db
+ *        MultipleLogins
+ */
 
 import sun.security.pkcs11.SunPKCS11;
 
@@ -30,6 +41,7 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginException;
+
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.security.*;
@@ -37,28 +49,30 @@ import java.security.*;
 import jdk.test.lib.util.ForceGC;
 import jtreg.SkippedException;
 
-public class MultipleLogins {
-    private static final String KS_TYPE = "PKCS11";
+public class MultipleLogins extends PKCS11Test {
     private static final int NUM_PROVIDERS = 20;
     private static final SunPKCS11[] providers = new SunPKCS11[NUM_PROVIDERS];
 
     public static void main(String[] args) throws Exception {
-        String nssConfig = null;
-        try {
-            nssConfig = PKCS11Test.getNssConfig();
-        } catch (SkippedException exc) {
-            System.out.println("Skipping test: " + exc.getMessage());
-        }
+        // This bypasses the PKCS11Test settings and run the mandatory
+        // main method directly. This is needed to keep the custom logic of the test
+        new MultipleLogins().main((Provider)null);
+    }
+
+    @Override
+    public void main(Provider p) throws Exception {
+        copyNssCertKeyToClassesDir();
+
+        String nssConfig = getNssConfig();
 
         if (nssConfig == null) {
             // No test framework support yet. Ignore
-            System.out.println("No NSS config found. Skipping.");
-            return;
+            throw new SkippedException("No NSS config found. Skipping.");
         }
 
-        for (int i =0; i < NUM_PROVIDERS; i++) {
+        for (int i = 0; i < NUM_PROVIDERS; i++) {
             // loop to set up test without security manger
-            providers[i] = (SunPKCS11)PKCS11Test.newPKCS11Provider();
+            providers[i] = (SunPKCS11)newPKCS11Provider();
         }
 
         for (int i =0; i < NUM_PROVIDERS; i++) {
@@ -68,7 +82,7 @@ public class MultipleLogins {
         }
 
         WeakReference<SunPKCS11>[] weakRef = new WeakReference[NUM_PROVIDERS];
-        for (int i =0; i < NUM_PROVIDERS; i++) {
+        for (int i = 0; i < NUM_PROVIDERS; i++) {
             weakRef[i] = new WeakReference<>(providers[i]);
             providers[i].logout();
 
@@ -95,7 +109,7 @@ public class MultipleLogins {
     }
 
     private static void test(SunPKCS11 p) throws Exception {
-        KeyStore ks = KeyStore.getInstance(KS_TYPE, p);
+        KeyStore ks = KeyStore.getInstance(PKCS11, p);
         p.setCallbackHandler(new PasswordCallbackHandler());
         try {
             ks.load(null, (char[]) null);
@@ -111,23 +125,23 @@ public class MultipleLogins {
         try {
             ks.load(null, (char[]) null);
         } catch (IOException e) {
-            if (e.getCause() instanceof LoginException &&
-                    e.getCause().getMessage().contains("No token present")) {
-                // expected
-            } else {
+            if (!(e.getCause() instanceof LoginException) ||
+                !(e.getCause().getMessage().contains("No token present"))) {
+
                 throw new RuntimeException("Token was present", e);
-            }
+            } // else expected
         }
     }
 
     public static class PasswordCallbackHandler implements CallbackHandler {
         public void handle(Callback[] callbacks)
                 throws IOException, UnsupportedCallbackException {
-            if (!(callbacks[0] instanceof PasswordCallback)) {
+            if (callbacks[0] instanceof PasswordCallback pc) {
+                pc.setPassword(null);
+            } else {
                 throw new UnsupportedCallbackException(callbacks[0]);
             }
-            PasswordCallback pc = (PasswordCallback)callbacks[0];
-            pc.setPassword(null);
+
         }
     }
 }
diff --git a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh b/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh
deleted file mode 100644
index b30410d9845..00000000000
--- a/test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 8240256 8269034
-# @summary
-# @library /test/lib/
-# @build jdk.test.lib.util.ForceGC
-#        jdk.test.lib.Platform
-#        jdk.test.lib.Utils
-# @run shell MultipleLogins.sh
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-
-# if running by hand on windows, change TESTSRC and TESTCLASSES to "."
-if [ "${TESTSRC}" = "" ] ; then
-    TESTSRC=`pwd`
-fi
-if [ "${TESTCLASSES}" = "" ] ; then
-    TESTCLASSES=`pwd`
-fi
-
-if [ "${TESTCLASSPATH}" = "" ] ; then
-    TESTCLASSPATH=`pwd`
-fi
-
-if [ "${COMPILEJAVA}" = "" ]; then
-    COMPILEJAVA="${TESTJAVA}"
-fi
-echo TESTSRC=${TESTSRC}
-echo TESTCLASSES=${TESTCLASSES}
-echo TESTJAVA=${TESTJAVA}
-echo COMPILEJAVA=${COMPILEJAVA}
-echo ""
-
-# let java test exit if platform unsupported
-
-OS=`uname -s`
-case "$OS" in
-  Linux )
-    FS="/"
-    PS=":"
-    CP="${FS}bin${FS}cp"
-    CHMOD="${FS}bin${FS}chmod"
-    ;;
-  Darwin )
-    FS="/"
-    PS=":"
-    CP="${FS}bin${FS}cp"
-    CHMOD="${FS}bin${FS}chmod"
-    ;;
-  AIX )
-    FS="/"
-    PS=":"
-    CP="${FS}bin${FS}cp"
-    CHMOD="${FS}bin${FS}chmod"
-    ;;
-  Windows* )
-    FS="\\"
-    PS=";"
-    CP="cp"
-    CHMOD="chmod"
-    ;;
-  CYGWIN* )
-    FS="/"
-    PS=";"
-    CP="cp"
-    CHMOD="chmod"
-    #
-    # javac does not like /cygdrive produced by `pwd`
-    #
-    TESTSRC=`cygpath -d ${TESTSRC}`
-    ;;
-  * )
-    echo "Unrecognized system!"
-    exit 1;
-    ;;
-esac
-
-# first make cert/key DBs writable
-
-${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}cert9.db ${TESTCLASSES}
-${CHMOD} +w ${TESTCLASSES}${FS}cert9.db
-
-${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}key4.db ${TESTCLASSES}
-${CHMOD} +w ${TESTCLASSES}${FS}key4.db
-
-${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}cert8.db ${TESTCLASSES}
-${CHMOD} +w ${TESTCLASSES}${FS}cert8.db
-
-${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}key3.db ${TESTCLASSES}
-${CHMOD} +w ${TESTCLASSES}${FS}key3.db
-
-# compile test
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-        -classpath ${TESTCLASSPATH} \
-        -d ${TESTCLASSES} \
-        --add-modules jdk.crypto.cryptoki \
-        --add-exports jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED \
-        ${TESTSRC}${FS}..${FS}..${FS}..${FS}..${FS}..${FS}lib${FS}jdk${FS}test${FS}lib${FS}artifacts${FS}*.java \
-        ${TESTSRC}${FS}..${FS}..${FS}..${FS}..${FS}..${FS}lib${FS}jtreg${FS}*.java \
-        ${TESTSRC}${FS}MultipleLogins.java \
-        ${TESTSRC}${FS}..${FS}PKCS11Test.java
-
-TEST_ARGS="${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSPATH} \
-        --add-modules jdk.crypto.cryptoki \
-        --add-exports jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED \
-        -DCUSTOM_DB_DIR=${TESTCLASSES} \
-        -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}MultipleLogins-nss.txt \
-        -Dtest.src=${TESTSRC} \
-        -Dtest.classes=${TESTCLASSES} \
-        -Djava.security.debug=${DEBUG}"
-
-# run test without security manager
-${TESTJAVA}${FS}bin${FS}java ${TEST_ARGS} MultipleLogins || exit 10
-
-echo Done
-exit 0

From ee9d553e51c01529495b8ca34b296b6e684e905d Mon Sep 17 00:00:00 2001
From: Igor Rudenko <iostream64@gmail.com>
Date: Fri, 21 Nov 2025 21:45:58 +0000
Subject: [PATCH 306/512] 8372307: Clean up the leftover code comment
 references to file.encoding in java_props_md.c

Reviewed-by: naoto
---
 src/java.base/unix/native/libjava/java_props_md.c    | 2 +-
 src/java.base/windows/native/libjava/java_props_md.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/unix/native/libjava/java_props_md.c b/src/java.base/unix/native/libjava/java_props_md.c
index 30d0ca67652..1cbc3665ebc 100644
--- a/src/java.base/unix/native/libjava/java_props_md.c
+++ b/src/java.base/unix/native/libjava/java_props_md.c
@@ -442,7 +442,7 @@ GetJavaProperties(JNIEnv *env)
 
     /* Determine the language, country, variant, and encoding from the host,
      * and store these in the user.language, user.country, user.variant and
-     * file.encoding system properties. */
+     * native.encoding system properties. */
     setlocale(LC_ALL, "");
     if (ParseLocale(env, LC_CTYPE,
                     &(sprops.format_language),
diff --git a/src/java.base/windows/native/libjava/java_props_md.c b/src/java.base/windows/native/libjava/java_props_md.c
index 75587a09d0b..e152dbe9bef 100644
--- a/src/java.base/windows/native/libjava/java_props_md.c
+++ b/src/java.base/windows/native/libjava/java_props_md.c
@@ -569,7 +569,7 @@ GetJavaProperties(JNIEnv* env)
     /*
      *  user.language
      *  user.script, user.country, user.variant (if user's environment specifies them)
-     *  file.encoding
+     *  native.encoding
      */
     {
         /*

From d3328b4bd0b2c2b03b4aaf7ebe929c14c4186402 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Sun, 23 Nov 2025 14:52:59 +0000
Subject: [PATCH 307/512] 8372125: containers/docker/TestPids.java fails after
 8365606

Reviewed-by: cnorrbin, sgehwolf
---
 test/hotspot/jtreg/containers/docker/TestPids.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/containers/docker/TestPids.java b/test/hotspot/jtreg/containers/docker/TestPids.java
index 62bd70dc61f..7d5f1b0cdf9 100644
--- a/test/hotspot/jtreg/containers/docker/TestPids.java
+++ b/test/hotspot/jtreg/containers/docker/TestPids.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -115,8 +115,8 @@ public class TestPids {
                 Asserts.assertEquals(parts.length, 2);
                 String actual = parts[1].replaceAll("\\s","");
                 if (expectedValue.equals("max")) {
-                    // Unlimited pids accept max or -1
-                    if (actual.equals("max") || actual.equals("-1")) {
+                    // Unlimited pids accept max/-1/unlimited
+                    if (actual.equals("max") || actual.equals("-1") || actual.equals("unlimited")) {
                         System.out.println("Found expected " + actual + " for unlimited pids value.");
                     } else {
                         try {

From e18e95ed11c1df7eeb162c2303f027564ed6f6aa Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Sun, 23 Nov 2025 19:47:09 +0000
Subject: [PATCH 308/512] 8346962: Test CRLReadTimeout.java fails with -Xcomp
 on a fastdebug build

Reviewed-by: rhalade
---
 .../x509/URICertStore/CRLReadTimeout.java     | 89 +++++++++++++++----
 1 file changed, 73 insertions(+), 16 deletions(-)

diff --git a/test/jdk/sun/security/x509/URICertStore/CRLReadTimeout.java b/test/jdk/sun/security/x509/URICertStore/CRLReadTimeout.java
index 1076aafb6b0..84b8dead425 100644
--- a/test/jdk/sun/security/x509/URICertStore/CRLReadTimeout.java
+++ b/test/jdk/sun/security/x509/URICertStore/CRLReadTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,45 +22,101 @@
  */
 
 /*
- * @test
+ * @test id=0
  * @bug 8191808 8179502
  * @summary check that CRL download is interrupted if it takes too long
  * @modules java.base/sun.security.x509
  *          java.base/sun.security.util
  * @library /test/lib
- * @run main/othervm -Dcom.sun.security.crl.readtimeout=1
+ * @run main/othervm -Djava.security.debug=certpath -Dcom.sun.security.crl.readtimeout=1
  *      CRLReadTimeout 5000 false
- * @run main/othervm -Dcom.sun.security.crl.readtimeout=1s
+ */
+
+/*
+ * @test id=1
+ * @bug 8191808 8179502
+ * @summary check that CRL download is interrupted if it takes too long
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.util
+ * @library /test/lib
+ * @run main/othervm -Djava.security.debug=certpath -Dcom.sun.security.crl.readtimeout=1s
  *      CRLReadTimeout 5000 false
- * @run main/othervm -Dcom.sun.security.crl.readtimeout=4
- *      CRLReadTimeout 1000 true
- * @run main/othervm -Dcom.sun.security.crl.readtimeout=1500ms
- *      CRLReadTimeout 5000 false
- * @run main/othervm -Dcom.sun.security.crl.readtimeout=4500ms
+ */
+
+/*
+ * @test id=2
+ * @bug 8191808 8179502
+ * @summary check that CRL download is interrupted if it takes too long
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.util
+ * @library /test/lib
+ * @run main/othervm -Djava.security.debug=certpath -Dcom.sun.security.crl.readtimeout=200
  *      CRLReadTimeout 1000 true
  */
 
-import java.io.*;
+/*
+ * @test id=3
+ * @bug 8191808 8179502
+ * @summary check that CRL download is interrupted if it takes too long
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.util
+ * @library /test/lib
+ * @run main/othervm -Djava.security.debug=certpath -Dcom.sun.security.crl.readtimeout=1500ms
+ *      CRLReadTimeout 5000 false
+ */
+
+/*
+ * @test id=4
+ * @bug 8191808 8179502
+ * @summary check that CRL download is interrupted if it takes too long
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.util
+ * @library /test/lib
+ * @run main/othervm -Djava.security.debug=certpath -Dcom.sun.security.crl.readtimeout=4500ms
+ *      CRLReadTimeout 100 true
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.math.BigInteger;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketTimeoutException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.PrivateKey;
-import java.security.cert.*;
+import java.security.cert.CRLException;
+import java.security.cert.CertPath;
+import java.security.cert.CertPathValidator;
+import java.security.cert.CertPathValidatorException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.PKIXParameters;
+import java.security.cert.PKIXRevocationChecker;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static java.security.cert.PKIXRevocationChecker.Option.*;
+import static java.security.cert.PKIXRevocationChecker.Option.NO_FALLBACK;
+import static java.security.cert.PKIXRevocationChecker.Option.PREFER_CRLS;
+import static java.security.cert.PKIXRevocationChecker.Option.SOFT_FAIL;
 
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.SecurityTools;
 import jdk.test.lib.process.OutputAnalyzer;
 import sun.security.util.SignatureUtil;
-import sun.security.x509.*;
+import sun.security.x509.AuthorityKeyIdentifierExtension;
+import sun.security.x509.CRLExtensions;
+import sun.security.x509.CRLNumberExtension;
+import sun.security.x509.KeyIdentifier;
+import sun.security.x509.X500Name;
+import sun.security.x509.X509CRLImpl;
 
 public class CRLReadTimeout {
 
@@ -117,9 +173,10 @@ public class CRLReadTimeout {
         // unwrap soft fail exceptions and check for SocketTimeoutException
         List<CertPathValidatorException> softExc = prc.getSoftFailExceptions();
         if (expectedPass) {
-            if (softExc.size() > 0) {
+            if (!softExc.isEmpty()) {
                 throw new RuntimeException("Expected to pass, found " +
-                        softExc.size() + " soft fail exceptions");
+                                           softExc.size() +
+                                           " soft fail exceptions");
             }
         } else {
             boolean foundSockTOExc = false;
@@ -182,7 +239,7 @@ public class CRLReadTimeout {
         }
 
         public void start() throws IOException {
-            server.bind(new InetSocketAddress(0), 0);
+            server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
             server.createContext("/crl", t -> {
                 try (InputStream is = t.getRequestBody()) {
                     is.readAllBytes();

From 3f47e5795378fda6da90dd45e043cb491a73e792 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 24 Nov 2025 05:19:10 +0000
Subject: [PATCH 309/512] 8372240: Convert FreeListAllocator to use Atomic<T>

Reviewed-by: tschatzl, stefank
---
 .../share/gc/shared/freeListAllocator.cpp     | 38 +++++++++----------
 .../share/gc/shared/freeListAllocator.hpp     | 24 ++++++------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/hotspot/share/gc/shared/freeListAllocator.cpp b/src/hotspot/share/gc/shared/freeListAllocator.cpp
index c6801c2be18..990bf88aade 100644
--- a/src/hotspot/share/gc/shared/freeListAllocator.cpp
+++ b/src/hotspot/share/gc/shared/freeListAllocator.cpp
@@ -41,26 +41,26 @@ FreeListAllocator::PendingList::PendingList() :
 
 size_t FreeListAllocator::PendingList::add(FreeNode* node) {
   assert(node->next() == nullptr, "precondition");
-  FreeNode* old_head = AtomicAccess::xchg(&_head, node);
+  FreeNode* old_head = _head.exchange(node);
   if (old_head != nullptr) {
     node->set_next(old_head);
   } else {
     assert(_tail == nullptr, "invariant");
     _tail = node;
   }
-  return AtomicAccess::add(&_count, size_t(1));
+  return _count.add_then_fetch(1u);
 }
 
 typename FreeListAllocator::NodeList FreeListAllocator::PendingList::take_all() {
-  NodeList result{AtomicAccess::load(&_head), _tail, AtomicAccess::load(&_count)};
-  AtomicAccess::store(&_head, (FreeNode*)nullptr);
+  NodeList result{_head.load_relaxed(), _tail, _count.load_relaxed()};
+  _head.store_relaxed(nullptr);
   _tail = nullptr;
-  AtomicAccess::store(&_count, size_t(0));
+  _count.store_relaxed(0u);
   return result;
 }
 
 size_t FreeListAllocator::PendingList::count() const {
-  return  AtomicAccess::load(&_count);
+  return _count.load_relaxed();
 }
 
 FreeListAllocator::FreeListAllocator(const char* name, FreeListConfig* config) :
@@ -85,7 +85,7 @@ void FreeListAllocator::delete_list(FreeNode* list) {
 }
 
 FreeListAllocator::~FreeListAllocator() {
-  uint index = AtomicAccess::load(&_active_pending_list);
+  uint index = _active_pending_list.load_relaxed();
   NodeList pending_list = _pending_lists[index].take_all();
   delete_list(pending_list._head);
   delete_list(_free_list.pop_all());
@@ -93,18 +93,18 @@ FreeListAllocator::~FreeListAllocator() {
 
 // Drop existing nodes and reset all counters
 void FreeListAllocator::reset() {
-  uint index = AtomicAccess::load(&_active_pending_list);
+  uint index = _active_pending_list.load_relaxed();
   _pending_lists[index].take_all();
   _free_list.pop_all();
-  _free_count = 0;
+  _free_count.store_relaxed(0u);
 }
 
 size_t FreeListAllocator::free_count() const {
-  return AtomicAccess::load(&_free_count);
+  return _free_count.load_relaxed();
 }
 
 size_t FreeListAllocator::pending_count() const {
-  uint index = AtomicAccess::load(&_active_pending_list);
+  uint index = _active_pending_list.load_relaxed();
   return _pending_lists[index].count();
 }
 
@@ -124,7 +124,7 @@ void* FreeListAllocator::allocate() {
     // Decrement count after getting buffer from free list.  This, along
     // with incrementing count before adding to free list, ensures count
     // never underflows.
-    size_t count = AtomicAccess::sub(&_free_count, 1u);
+    size_t count = _free_count.sub_then_fetch(1u);
     assert((count + 1) != 0, "_free_count underflow");
     return node;
   } else {
@@ -149,7 +149,7 @@ void FreeListAllocator::release(void* free_node) {
   // we're done with what might be the pending list to be transferred.
   {
     GlobalCounter::CriticalSection cs(Thread::current());
-    uint index = AtomicAccess::load_acquire(&_active_pending_list);
+    uint index = _active_pending_list.load_acquire();
     size_t count = _pending_lists[index].add(node);
     if (count <= _config->transfer_threshold()) return;
   }
@@ -164,17 +164,17 @@ void FreeListAllocator::release(void* free_node) {
 // in-progress transfer.
 bool FreeListAllocator::try_transfer_pending() {
   // Attempt to claim the lock.
-  if (AtomicAccess::load(&_transfer_lock) || // Skip CAS if likely to fail.
-      AtomicAccess::cmpxchg(&_transfer_lock, false, true)) {
+  if (_transfer_lock.load_relaxed() || // Skip CAS if likely to fail.
+      _transfer_lock.compare_exchange(false, true)) {
     return false;
   }
   // Have the lock; perform the transfer.
 
   // Change which pending list is active.  Don't need an atomic RMW since
   // we have the lock and we're the only writer.
-  uint index = AtomicAccess::load(&_active_pending_list);
+  uint index = _active_pending_list.load_relaxed();
   uint new_active = (index + 1) % ARRAY_SIZE(_pending_lists);
-  AtomicAccess::release_store(&_active_pending_list, new_active);
+  _active_pending_list.release_store(new_active);
 
   // Wait for all critical sections in the buffer life-cycle to complete.
   // This includes _free_list pops and adding to the now inactive pending
@@ -186,11 +186,11 @@ bool FreeListAllocator::try_transfer_pending() {
   size_t count = transfer_list._entry_count;
   if (count > 0) {
     // Update count first so no underflow in allocate().
-    AtomicAccess::add(&_free_count, count);
+    _free_count.add_then_fetch(count);
     _free_list.prepend(*transfer_list._head, *transfer_list._tail);
     log_trace(gc, freelist)
              ("Transferred %s pending to free: %zu", name(), count);
   }
-  AtomicAccess::release_store(&_transfer_lock, false);
+  _transfer_lock.release_store(false);
   return true;
 }
diff --git a/src/hotspot/share/gc/shared/freeListAllocator.hpp b/src/hotspot/share/gc/shared/freeListAllocator.hpp
index 07e075a6725..dd163f0fe67 100644
--- a/src/hotspot/share/gc/shared/freeListAllocator.hpp
+++ b/src/hotspot/share/gc/shared/freeListAllocator.hpp
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/lockFreeStack.hpp"
 
@@ -62,15 +62,15 @@ public:
 // to the free list making them available for re-allocation.
 class FreeListAllocator {
   struct FreeNode {
-    FreeNode* volatile _next;
+    Atomic<FreeNode*> _next;
 
     FreeNode() : _next (nullptr) { }
 
-    FreeNode* next() { return AtomicAccess::load(&_next); }
+    FreeNode* next() { return _next.load_relaxed(); }
 
-    FreeNode* volatile* next_addr() { return &_next; }
+    Atomic<FreeNode*>* next_addr() { return &_next; }
 
-    void set_next(FreeNode* next) { AtomicAccess::store(&_next, next); }
+    void set_next(FreeNode* next) { _next.store_relaxed(next); }
   };
 
   struct NodeList {
@@ -85,8 +85,8 @@ class FreeListAllocator {
 
   class PendingList {
     FreeNode* _tail;
-    FreeNode* volatile _head;
-    volatile size_t _count;
+    Atomic<FreeNode*> _head;
+    Atomic<size_t> _count;
 
     NONCOPYABLE(PendingList);
 
@@ -105,20 +105,20 @@ class FreeListAllocator {
     NodeList take_all();
   };
 
-  static FreeNode* volatile* next_ptr(FreeNode& node) { return node.next_addr(); }
-  typedef LockFreeStack<FreeNode, &next_ptr> Stack;
+  static Atomic<FreeNode*>* next_ptr(FreeNode& node) { return node.next_addr(); }
+  using Stack = LockFreeStack<FreeNode, &next_ptr>;
 
   FreeListConfig* _config;
   char _name[DEFAULT_PADDING_SIZE - sizeof(FreeListConfig*)];  // Use name as padding.
 
 #define DECLARE_PADDED_MEMBER(Id, Type, Name) \
   Type Name; DEFINE_PAD_MINUS_SIZE(Id, DEFAULT_PADDING_SIZE, sizeof(Type))
-  DECLARE_PADDED_MEMBER(1, volatile size_t, _free_count);
+  DECLARE_PADDED_MEMBER(1, Atomic<size_t>, _free_count);
   DECLARE_PADDED_MEMBER(2, Stack, _free_list);
-  DECLARE_PADDED_MEMBER(3, volatile bool, _transfer_lock);
+  DECLARE_PADDED_MEMBER(3, Atomic<bool>, _transfer_lock);
 #undef DECLARE_PADDED_MEMBER
 
-  volatile uint _active_pending_list;
+  Atomic<uint> _active_pending_list;
   PendingList _pending_lists[2];
 
   void delete_list(FreeNode* list);

From 43af7b59765fa9820726de276bae9d1fcd2ba3ca Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 24 Nov 2025 05:55:48 +0000
Subject: [PATCH 310/512] 8371309: Diagnostic.getEndPosition can throw an NPE
 with typical broken code

Reviewed-by: vromero
---
 .../com/sun/tools/javac/tree/JCTree.java      |  11 +-
 .../com/sun/tools/javac/tree/TreeInfo.java    |   5 +
 .../javac/diags/DiagnosticGetEndPosition.java | 217 ++++++++++++++++++
 3 files changed, 231 insertions(+), 2 deletions(-)
 create mode 100644 test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
index 0436f68b9e3..6501fd5d96c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -505,7 +505,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
 
     // for default DiagnosticPosition
     public int getStartPosition() {
-        return TreeInfo.getStartPos(this);
+        return noNoPos(TreeInfo.getStartPos(this));
     }
 
     // for default DiagnosticPosition
@@ -515,7 +515,14 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
 
     // for default DiagnosticPosition
     public int getEndPosition(EndPosTable endPosTable) {
-        return TreeInfo.getEndPos(this, endPosTable);
+        return noNoPos(TreeInfo.getEndPos(this, endPosTable));
+    }
+
+    private int noNoPos(int position) {
+        if (position == JCDiagnostic.NOPOS) {
+            return pos;
+        }
+        return position;
     }
 
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index af823024fab..3f73bfd2296 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -651,6 +651,11 @@ public class TreeInfo {
         if (tree == null)
             return Position.NOPOS;
 
+        if (endPosTable == null) {
+            // fall back on limited info in the tree
+            return endPos(tree);
+        }
+
         int mapPos = endPosTable.getEndPos(tree);
         if (mapPos != Position.NOPOS)
             return mapPos;
diff --git a/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java b/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java
new file mode 100644
index 00000000000..1835cd46167
--- /dev/null
+++ b/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8371309
+ * @summary Verify that Diagnostic.getEndPosition works reasonably
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @run junit DiagnosticGetEndPosition
+ */
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+import com.sun.source.util.JavacTask;
+
+import org.junit.jupiter.api.Test;
+
+import toolbox.ToolBox;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class DiagnosticGetEndPosition {
+    final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    final ToolBox tb = new ToolBox();
+
+    @Test
+    public void testGetEndPositionDuringParsing() {
+        JavaFileObject testFile =
+                SimpleJavaFileObject.forSource(URI.create("mem:///Test.java"),
+                                               """
+                                               public class Test extends {}
+                                               """);
+        compiler.getTask(
+            null,
+            null,
+            diagnostic -> assertEquals(26, diagnostic.getEndPosition()),
+            null,
+            null,
+            List.of(testFile)
+        ).call();
+    }
+
+    @Test
+    public void testNoErrorsFromInternalParses() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                          """
+                          module m {
+                             exports test;
+                          }
+                          """,
+                          """
+                          package test;
+                          public class Test extends {}
+                          """);
+
+        try (var fm = compiler.getStandardFileManager(null, null, null)) {
+            compiler.getTask(
+                null,
+                null,
+                d -> fail(d.toString()),
+                List.of("-sourcepath", src.toString()),
+                null,
+                fm.getJavaFileObjects(src.resolve("module-info.java"))
+            ).call();
+        }
+    }
+
+    @Test
+    public void testGetEndPositionWorkForImplicitParse() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        String implCode = """
+                          package test;
+                          public class Impl {
+                              public static final int C = 1 / 0;
+                          }
+                          """;
+        tb.writeJavaFiles(src,
+                          implCode,
+                          """
+                          package test;
+                          public class Test {
+                              Impl i; //force parsing of Impl
+                          }
+                          """);
+
+        try (var fm = compiler.getStandardFileManager(null, null, null)) {
+            compiler.getTask(
+                null,
+                null,
+                d -> assertEquals("", //ideally would be "0", but the positions are not fully set yet
+                                  implCode.substring((int) d.getStartPosition(),
+                                                     (int) d.getEndPosition())),
+                List.of("-sourcepath", src.toString(), "-Xlint:divzero"),
+                null,
+                fm.getJavaFileObjects(src.resolve("test").resolve("Test.java"))
+            ).call();
+        }
+    }
+
+    @Test
+    public void testWronglyNamedClass() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        tb.writeFile(src.resolve("test").resolve("WronglyNamed.java"),
+                     """
+                     package test;
+                     class SomeOtherName {}
+                     """);
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          public class Test {
+                              WronglyNamed l; //parse WronglyNamed.java
+                          }
+                          """);
+
+        try (var fm = compiler.getStandardFileManager(null, null, null)) {
+            compiler.getTask(
+                null,
+                null,
+                null,
+                List.of("-sourcepath", src.toString()),
+                null,
+                fm.getJavaFileObjects(tb.findJavaFiles(src))
+            ).call();
+        }
+    }
+
+    @Test
+    public void testWronglyNamedPackageInfo() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        tb.writeFile(src.resolve("test").resolve("package-info.java"),
+                     """
+                     package wrongpackage;
+                     """);
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          public class Test {
+                          }
+                          """);
+
+        try (var fm = compiler.getStandardFileManager(null, null, null)) {
+            JavacTask task = (JavacTask) compiler.getTask(
+                null,
+                null,
+                null,
+                List.of("-sourcepath", src.toString()),
+                null,
+                fm.getJavaFileObjects(src.resolve("test").resolve("Test.java"))
+            );
+            task.analyze();
+            task.getElements().getPackageElement("test").getAnnotationMirrors();
+        }
+    }
+
+    @Test
+    public void testGetEndPositionSyntheticTree() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        String testCode = """
+                          package test;
+                          public class Test extends Base {
+                          }
+                          class Base {
+                              Base(int i) {}
+                          }
+                          """;
+
+        tb.writeJavaFiles(src, testCode);
+
+        try (var fm = compiler.getStandardFileManager(null, null, null)) {
+            compiler.getTask(
+                null,
+                null,
+                d -> assertEquals("",
+                                  testCode.substring((int) d.getStartPosition(),
+                                                     (int) d.getEndPosition())),
+                List.of("-sourcepath", src.toString(), "-Xlint:divzero"),
+                null,
+                fm.getJavaFileObjects(src.resolve("test").resolve("Test.java"))
+            ).call();
+        }
+    }
+}

From 99be0e73ce9779e85c9ec6598e0a7ce964d62e82 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 24 Nov 2025 07:47:13 +0000
Subject: [PATCH 311/512] 8371581: C2: PhaseCCP should reach fixpoint by
 revisiting deeply-Value-d nodes

Reviewed-by: epeter, vlivanov, qamai
---
 src/hotspot/share/opto/phaseX.cpp | 84 +++++++++++++++++++++++--------
 src/hotspot/share/opto/phaseX.hpp |  4 +-
 2 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 1fe911aa7ac..4a0933b89f2 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1132,7 +1132,7 @@ void PhaseIterGVN::verify_empty_worklist(Node* node) {
 // (1) Integer "widen" changes, but the range is the same.
 // (2) LoadNode performs deep traversals. Load is not notified for changes far away.
 // (3) CmpPNode performs deep traversals if it compares oopptr. CmpP is not notified for changes far away.
-bool PhaseIterGVN::verify_Value_for(Node* n) {
+bool PhaseIterGVN::verify_Value_for(Node* n, bool strict) {
   // If we assert inside type(n), because the type is still a null, then maybe
   // the node never went through gvn.transform, which would be a bug.
   const Type* told = type(n);
@@ -1152,7 +1152,7 @@ bool PhaseIterGVN::verify_Value_for(Node* n) {
   }
   // Exception (2)
   // LoadNode performs deep traversals. Load is not notified for changes far away.
-  if (n->is_Load() && !told->singleton()) {
+  if (!strict && n->is_Load() && !told->singleton()) {
     // MemNode::can_see_stored_value looks up through many memory nodes,
     // which means we would need to notify modifications from far up in
     // the inputs all the way down to the LoadNode. We don't do that.
@@ -1160,7 +1160,7 @@ bool PhaseIterGVN::verify_Value_for(Node* n) {
   }
   // Exception (3)
   // CmpPNode performs deep traversals if it compares oopptr. CmpP is not notified for changes far away.
-  if (n->Opcode() == Op_CmpP && type(n->in(1))->isa_oopptr() && type(n->in(2))->isa_oopptr()) {
+  if (!strict && n->Opcode() == Op_CmpP && type(n->in(1))->isa_oopptr() && type(n->in(2))->isa_oopptr()) {
     // SubNode::Value
     // CmpPNode::sub
     // MemNode::detect_ptr_independence
@@ -2799,6 +2799,7 @@ void PhaseCCP::analyze() {
   // Compile is over. The local arena gets de-allocated at the end of its scope.
   ResourceArea local_arena(mtCompiler);
   Unique_Node_List worklist(&local_arena);
+  Unique_Node_List worklist_revisit(&local_arena);
   DEBUG_ONLY(Unique_Node_List worklist_verify(&local_arena);)
 
   // Push root onto worklist
@@ -2807,45 +2808,86 @@ void PhaseCCP::analyze() {
   assert(_root_and_safepoints.size() == 0, "must be empty (unused)");
   _root_and_safepoints.push(C->root());
 
-  // Pull from worklist; compute new value; push changes out.
-  // This loop is the meat of CCP.
+  // This is the meat of CCP: pull from worklist; compute new value; push changes out.
+
+  // Do the first round. Since all initial types are TOP, this will visit all alive nodes.
   while (worklist.size() != 0) {
     Node* n = fetch_next_node(worklist);
     DEBUG_ONLY(worklist_verify.push(n);)
+    if (needs_revisit(n)) {
+      worklist_revisit.push(n);
+    }
     if (n->is_SafePoint()) {
       // Make sure safepoints are processed by PhaseCCP::transform even if they are
       // not reachable from the bottom. Otherwise, infinite loops would be removed.
       _root_and_safepoints.push(n);
     }
-    const Type* new_type = n->Value(this);
-    if (new_type != type(n)) {
-      DEBUG_ONLY(verify_type(n, new_type, type(n));)
-      dump_type_and_node(n, new_type);
-      set_type(n, new_type);
-      push_child_nodes_to_worklist(worklist, n);
-    }
-    if (KillPathsReachableByDeadTypeNode && n->is_Type() && new_type == Type::TOP) {
-      // Keep track of Type nodes to kill CFG paths that use Type
-      // nodes that become dead.
-      _maybe_top_type_nodes.push(n);
-    }
+    analyze_step(worklist, n);
   }
+
+  // More rounds to catch updates far in the graph.
+  // Revisit nodes that might be able to refine their types at the end of the round.
+  // If so, process these nodes. If there is remaining work, start another round.
+  do {
+    while (worklist.size() != 0) {
+      Node* n = fetch_next_node(worklist);
+      analyze_step(worklist, n);
+    }
+    for (uint t = 0; t < worklist_revisit.size(); t++) {
+      Node* n = worklist_revisit.at(t);
+      analyze_step(worklist, n);
+    }
+  } while (worklist.size() != 0);
+
   DEBUG_ONLY(verify_analyze(worklist_verify);)
 }
 
+void PhaseCCP::analyze_step(Unique_Node_List& worklist, Node* n) {
+  const Type* new_type = n->Value(this);
+  if (new_type != type(n)) {
+    DEBUG_ONLY(verify_type(n, new_type, type(n));)
+    dump_type_and_node(n, new_type);
+    set_type(n, new_type);
+    push_child_nodes_to_worklist(worklist, n);
+  }
+  if (KillPathsReachableByDeadTypeNode && n->is_Type() && new_type == Type::TOP) {
+    // Keep track of Type nodes to kill CFG paths that use Type
+    // nodes that become dead.
+    _maybe_top_type_nodes.push(n);
+  }
+}
+
+// Some nodes can refine their types due to type change somewhere deep
+// in the graph. We will need to revisit them before claiming convergence.
+// Add nodes here if particular *Node::Value is doing deep graph traversals
+// not handled by PhaseCCP::push_more_uses().
+bool PhaseCCP::needs_revisit(Node* n) const {
+  // LoadNode performs deep traversals. Load is not notified for changes far away.
+  if (n->is_Load()) {
+    return true;
+  }
+  // CmpPNode performs deep traversals if it compares oopptr. CmpP is not notified for changes far away.
+  if (n->Opcode() == Op_CmpP && type(n->in(1))->isa_oopptr() && type(n->in(2))->isa_oopptr()) {
+    return true;
+  }
+  return false;
+}
+
 #ifdef ASSERT
 // For every node n on verify list, check if type(n) == n->Value()
-// We have a list of exceptions, see comments in verify_Value_for.
+// Note for CCP the non-convergence can lead to unsound analysis and mis-compilation.
+// Therefore, we are verifying Value convergence strictly.
 void PhaseCCP::verify_analyze(Unique_Node_List& worklist_verify) {
   bool failure = false;
   while (worklist_verify.size()) {
     Node* n = worklist_verify.pop();
-    failure |= verify_Value_for(n);
+    failure |= verify_Value_for(n, /* strict = */ true);
   }
   // If we get this assert, check why the reported nodes were not processed again in CCP.
   // We should either make sure that these nodes are properly added back to the CCP worklist
-  // in PhaseCCP::push_child_nodes_to_worklist() to update their type or add an exception
-  // in the verification code above if that is not possible for some reason (like Load nodes).
+  // in PhaseCCP::push_child_nodes_to_worklist() to update their type in the same round,
+  // or that they are added in PhaseCCP::needs_revisit() so that analysis revisits
+  // them at the end of the round.
   assert(!failure, "PhaseCCP not at fixpoint: analysis result may be unsound.");
 }
 #endif
diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp
index 083e77bf6d9..473231e6af5 100644
--- a/src/hotspot/share/opto/phaseX.hpp
+++ b/src/hotspot/share/opto/phaseX.hpp
@@ -490,7 +490,7 @@ public:
   void optimize();
 #ifdef ASSERT
   void verify_optimize();
-  bool verify_Value_for(Node* n);
+  bool verify_Value_for(Node* n, bool strict = false);
   bool verify_Ideal_for(Node* n, bool can_reshape);
   bool verify_Identity_for(Node* n);
   void verify_empty_worklist(Node* n);
@@ -659,6 +659,8 @@ class PhaseCCP : public PhaseIterGVN {
 
   // Worklist algorithm identifies constants
   void analyze();
+  void analyze_step(Unique_Node_List& worklist, Node* n);
+  bool needs_revisit(Node* n) const;
 #ifdef ASSERT
   void verify_type(Node* n, const Type* tnew, const Type* told);
   // For every node n on verify list, check if type(n) == n->Value()

From 0f014446875b39b937e997d9dcb4734659f7cefe Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 24 Nov 2025 08:34:11 +0000
Subject: [PATCH 312/512] 8371998: G1: Rename
 G1MergeHeapRootsTask::G1ClearBitmapClosure to be more distinct

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1RemSet.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index cb3afb80eea..d0633466f37 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -992,10 +992,11 @@ class G1MergeHeapRootsTask : public WorkerTask {
     }
   };
 
-  // Closure to make sure that the marking bitmap is clear for any old region in
-  // the collection set.
-  // This is needed to be able to use the bitmap for evacuation failure handling.
-  class G1ClearBitmapClosure : public G1HeapRegionClosure {
+  // Closure to prepare the collection set regions for evacuation failure, i.e. make
+  // sure that the mark bitmap is clear for any old region in the collection set.
+  //
+  // These mark bitmaps record the evacuation failed objects.
+  class G1PrepareRegionsForEvacFailClosure : public G1HeapRegionClosure {
     G1CollectedHeap* _g1h;
     G1RemSetScanState* _scan_state;
     bool _initial_evacuation;
@@ -1023,7 +1024,7 @@ class G1MergeHeapRootsTask : public WorkerTask {
     }
 
   public:
-    G1ClearBitmapClosure(G1CollectedHeap* g1h, G1RemSetScanState* scan_state, bool initial_evacuation) :
+    G1PrepareRegionsForEvacFailClosure(G1CollectedHeap* g1h, G1RemSetScanState* scan_state, bool initial_evacuation) :
       _g1h(g1h),
       _scan_state(scan_state),
       _initial_evacuation(initial_evacuation)
@@ -1172,8 +1173,8 @@ public:
 
     // Preparation for evacuation failure handling.
     {
-      G1ClearBitmapClosure clear(g1h, _scan_state, _initial_evacuation);
-      g1h->collection_set_iterate_increment_from(&clear, &_hr_claimer, worker_id);
+      G1PrepareRegionsForEvacFailClosure prepare_evac_failure(g1h, _scan_state, _initial_evacuation);
+      g1h->collection_set_iterate_increment_from(&prepare_evac_failure, &_hr_claimer, worker_id);
     }
   }
 };

From a7bb99ed007f593783ff8ca00b26f48d9ad632d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Mon, 24 Nov 2025 09:24:19 +0000
Subject: [PATCH 313/512] 8372119: Missing copyright header in MinMaxVector

Reviewed-by: chagedorn, thartmann
---
 .../openjdk/bench/java/lang/MinMaxVector.java | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java b/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java
index fa42d0be834..549814a69b2 100644
--- a/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java
+++ b/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2025, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 package org.openjdk.bench.java.lang;
 
 import org.openjdk.jmh.annotations.Benchmark;

From 0c1ef366686b7ff1b461e2617f7f3b7a71467c04 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Mon, 24 Nov 2025 10:29:04 +0000
Subject: [PATCH 314/512] 8372256: ClassCastException in
 `ConcurrentHashMap#equals`

Reviewed-by: dl, alanb
---
 .../util/concurrent/ConcurrentHashMap.java    | 18 +++++++++++++-----
 .../concurrent/tck/ConcurrentHashMapTest.java | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
index 4cb7048a798..9295f0deb59 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -1372,12 +1372,20 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
             Node<K,V>[] t;
             int f = (t = table) == null ? 0 : t.length;
             Traverser<K,V> it = new Traverser<K,V>(t, f, 0, f);
-            for (Node<K,V> p; (p = it.advance()) != null; ) {
-                V val = p.val;
-                Object v = m.get(p.key);
-                if (v == null || (v != val && !v.equals(val)))
-                    return false;
+
+            try {
+                for (Node<K,V> p; (p = it.advance()) != null; ) {
+                    V val = p.val;
+                    Object v = m.get(p.key);
+                    if (v == null || (v != val && !v.equals(val)))
+                        return false;
+                }
+            } catch (ClassCastException | NullPointerException _) {
+                // m.get(p.key) is contractually allowed to throw CCE or NPE
+                // but CHM doesn't allow null keys, so NPE shouldn't occur in practice
+                return false;
             }
+
             for (Map.Entry<?,?> e : m.entrySet()) {
                 Object mk, mv, v;
                 if ((mk = e.getKey()) == null ||
diff --git a/test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java b/test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java
index c87571b01f7..168594832c2 100644
--- a/test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java
+++ b/test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java
@@ -40,6 +40,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
@@ -878,6 +879,24 @@ public class ConcurrentHashMapTest extends JSR166TestCase {
         } catch (IllegalStateException success) {}
     }
 
+    public void testMapEqualsIfClassCastExceptionOccurs() {
+        class MonotypeKeyMap extends HashMap<Byte, Object> {
+            @Override public Object get(Object key) {
+                return super.get((Byte)key); // Force cast, allowed by spec
+            }
+        }
+
+        var mkm = new MonotypeKeyMap();
+        mkm.put((byte)1, "value1");
+        var similar = new ConcurrentHashMap<Byte, Object>();
+        similar.put((byte)1, "value1");
+        var different = new ConcurrentHashMap<String, String>();
+        different.put("test1", "value1");
+
+        assertTrue(similar.equals(mkm));
+        assertFalse(different.equals(mkm));
+    }
+
     private static Item findValue(ConcurrentHashMap<Item, Item> map,
                                   Item key) {
         return (key.value % 5 == 0) ?  key :

From 8ae4ea8114c4c7616a3e882aca71f882630a8e02 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Mon, 24 Nov 2025 12:42:21 +0000
Subject: [PATCH 315/512] 8371262: sun/security/pkcs11/Cipher/KeyWrap tests may
 silently skip

Reviewed-by: rhalade
---
 .../pkcs11/Cipher/KeyWrap/NISTWrapKAT.java    | 77 +++++++++++++------
 .../pkcs11/Cipher/KeyWrap/TestGeneral.java    | 46 ++++++++---
 .../pkcs11/Cipher/KeyWrap/XMLEncKAT.java      | 19 +++--
 3 files changed, 101 insertions(+), 41 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/NISTWrapKAT.java b/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/NISTWrapKAT.java
index e1f32ea8076..e8f637e0b0c 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/NISTWrapKAT.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/NISTWrapKAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,19 @@
  * @summary Verify that the AES-Key-Wrap and AES-Key-Wrap-Pad ciphers
  * work as expected using NIST test vectors.
  */
+import jtreg.SkippedException;
+
 import java.security.Key;
 import java.security.AlgorithmParameters;
 import java.security.Provider;
-import javax.crypto.*;
-import javax.crypto.spec.*;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.math.BigInteger;
+import java.util.List;
 
 // adapted from com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java
 public class NISTWrapKAT extends PKCS11Test {
@@ -73,8 +79,11 @@ public class NISTWrapKAT extends PKCS11Test {
             "308D49692B5F8CF638D54BB4B985633504237329964C76EBB3F669870A708DBC";
     private static String KWP_AES256_224 =
             "0942747DB07032A3F04CDB2E7DE1CBA038F92BC355393AE9A0E4AE8C901912AC3D3AF0F16D240607";
-     // from RFC 5649 sec6
-     private static String KEK2 = "5840DF6E29B02AF1AB493B705BF16EA1AE8338F4DCC176A8";
+    // from RFC 5649 sec6
+    private static String KEK2 =
+            "5840DF6E29B02AF1AB493B705BF16EA1AE8338F4DCC176A8";
+
+    private static final List<String> skippedList = new ArrayList <>();
 
     private static byte[] toBytes(String hex, int hexLen) {
         if (hexLen < hex.length()) {
@@ -91,10 +100,18 @@ public class NISTWrapKAT extends PKCS11Test {
             byte[] out = new byte[outLen];
             if (val.length < outLen) {
                 // enlarge
-                System.arraycopy(val, 0, out, outLen - val.length, val.length);
+                System.arraycopy(val,
+                        0,
+                        out,
+                        outLen - val.length,
+                        val.length);
             } else {
                 // truncate
-                System.arraycopy(val, val.length - outLen, out, 0, outLen);
+                System.arraycopy(val,
+                        val.length - outLen,
+                        out,
+                        0,
+                        outLen);
             }
             return out;
         }
@@ -143,7 +160,8 @@ public class NISTWrapKAT extends PKCS11Test {
               "AFBEB0F07DFBF5419200F2CCB50BB24F" },
             { "AES/KWP/NoPadding", KEK2, 24,
               "C37B7E6492584340BED12207808941155068F738", 20,
-              "138BDEAA9B8FA7FC61F97742E72248EE5AE6AE5360D1AE6A5F54F373FA543B6A" },
+              "138BDEAA9B8FA7FC61F97742E72248EE5AE6AE5360D1AE6A5F54F373FA543B6A"
+            },
             // some more test vectors for KW and KWP
             // from csrc.nist.gov/groups/STM/cavp/documents/mac/kwtestvectors.zip
             { "AES/KW/NoPadding", "7575da3a93607cc2bfd8cec7aadfd9a6", 16,
@@ -257,6 +275,9 @@ public class NISTWrapKAT extends PKCS11Test {
         int allowed = Cipher.getMaxAllowedKeyLength("AES");
         if (keyLen > allowed) {
             System.out.println("=> skip, exceeds max allowed size " + allowed);
+            skippedList.add(algo + " Cipher with wrapping " +
+                            dataLen + "-byte key with " + 8 * keyLen +
+                            "-bit KEK exceeds max allowed size " + allowed);
             return;
         }
         Cipher c1 = Cipher.getInstance(algo,
@@ -275,7 +296,8 @@ public class NISTWrapKAT extends PKCS11Test {
         c1.init(Cipher.WRAP_MODE, cipherKey);
         IvParameterSpec ivSpec = new IvParameterSpec(c1.getIV());
         c2.init(Cipher.WRAP_MODE, cipherKey, ivSpec);
-        AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
+        AlgorithmParameters params =
+                AlgorithmParameters.getInstance("AES");
         params.init(ivSpec);
         c3.init(Cipher.WRAP_MODE, cipherKey, params);
 
@@ -300,9 +322,12 @@ public class NISTWrapKAT extends PKCS11Test {
         params.init(ivSpec);
         c3.init(Cipher.UNWRAP_MODE, cipherKey, params);
 
-        Key unwrapped = c1.unwrap(wrapped, "AES", Cipher.SECRET_KEY);
-        Key unwrapped2 = c2.unwrap(wrapped, "AES", Cipher.SECRET_KEY);
-        Key unwrapped3 = c3.unwrap(wrapped, "AES", Cipher.SECRET_KEY);
+        Key unwrapped =
+                c1.unwrap(wrapped, "AES", Cipher.SECRET_KEY);
+        Key unwrapped2 =
+                c2.unwrap(wrapped, "AES", Cipher.SECRET_KEY);
+        Key unwrapped3 =
+                c3.unwrap(wrapped, "AES", Cipher.SECRET_KEY);
 
         if (!Arrays.equals(unwrapped.getEncoded(), dataVal) ||
                 !Arrays.equals(unwrapped2.getEncoded(), dataVal) ||
@@ -320,6 +345,9 @@ public class NISTWrapKAT extends PKCS11Test {
         int allowed = Cipher.getMaxAllowedKeyLength("AES");
         if (keyLen > allowed) {
             System.out.println("=> skip, exceeds max allowed size " + allowed);
+            skippedList.add(algo + " Cipher with enc " +
+                            dataLen + "-byte data with " + 8 * keyLen +
+                            "-bit KEK exceeds max allowed size " + allowed);
             return;
         }
         Cipher c1 = Cipher.getInstance(algo,
@@ -336,7 +364,8 @@ public class NISTWrapKAT extends PKCS11Test {
         c1.init(Cipher.ENCRYPT_MODE, cipherKey);
         IvParameterSpec ivSpec = new IvParameterSpec(c1.getIV());
         c2.init(Cipher.ENCRYPT_MODE, cipherKey, ivSpec);
-        AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
+        AlgorithmParameters params =
+                AlgorithmParameters.getInstance("AES");
         params.init(ivSpec);
         c3.init(Cipher.ENCRYPT_MODE, cipherKey, params);
 
@@ -384,18 +413,22 @@ public class NISTWrapKAT extends PKCS11Test {
     @Override
     public void main(Provider p) throws Exception {
         Object[][] testDatum = testData();
-        for (int i = 0; i < testDatum.length; i++) {
-            Object[] td = testDatum[i];
+        for (Object[] td : testDatum) {
             String algo = (String) td[0];
             if (p.getService("Cipher", algo) == null) {
-                System.out.println("Skip, due to no support:  " + algo);
-                continue;
+                skippedList.add("No support for " + algo);
             }
-            testKeyWrap(algo, (String)td[1], (int)td[2], (String)td[3],
-                    (int)td[4], (String)td[5], p);
-            testEnc(algo, (String)td[1], (int)td[2], (String)td[3],
-                    (int)td[4], (String)td[5], p);
+            testKeyWrap(algo, (String) td[1], (int) td[2], (String) td[3],
+                    (int) td[4], (String) td[5], p);
+            testEnc(algo, (String) td[1], (int) td[2], (String) td[3],
+                    (int) td[4], (String) td[5], p);
+        }
+
+        if (!skippedList.isEmpty()) {
+            throw new SkippedException("One or more tests skipped "
+                                       + skippedList);
+        } else {
+            System.out.println("All Tests Passed");
         }
-        System.out.println("Test Passed");
     }
 }
diff --git a/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/TestGeneral.java b/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/TestGeneral.java
index 0cfb4557572..f5e4494fc59 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/TestGeneral.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/TestGeneral.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,30 @@
  * @library /test/lib ../..
  * @run main/othervm TestGeneral
  */
+import jtreg.SkippedException;
+
 import java.nio.ByteBuffer;
+import java.security.AlgorithmParameters;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.Key;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HexFormat;
-import java.security.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
+import java.util.List;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 
 // adapted from com/sun/crypto/provider/Cipher/KeyWrap/TestGeneral.java
 public class TestGeneral extends PKCS11Test {
 
     private static final byte[] DATA_32 =
-            Arrays.copyOf("1234567890123456789012345678901234".getBytes(), 32);
+            Arrays.copyOf("1234567890123456789012345678901234".getBytes(),
+                    32);
     private static final SecretKey KEY =
             new SecretKeySpec(DATA_32, 0, 16, "AES");
     private static final int KW_IV_LEN = 8;
@@ -49,7 +61,8 @@ public class TestGeneral extends PKCS11Test {
     private static final int MAX_KWP_PAD_LEN = 7; // 0-7
 
     public static void testEnc(Cipher c, byte[] in, int startLen, int inc,
-            IvParameterSpec[] ivs, int maxPadLen) throws Exception {
+                               IvParameterSpec[] ivs, int maxPadLen)
+            throws Exception {
 
         System.out.println("testEnc, input len=" + startLen + " w/ inc=" +
                 inc);
@@ -96,7 +109,7 @@ public class TestGeneral extends PKCS11Test {
     }
 
     public static void testKAT(Cipher c, String keyStr, String inStr,
-            String expectedStr) throws Exception {
+                               String expectedStr) throws Exception {
 
         System.out.println("testKAT, input len: " + inStr.length()/2);
 
@@ -245,16 +258,21 @@ public class TestGeneral extends PKCS11Test {
         SecretKey aes256 = new SecretKeySpec(DATA_32, "AES");
         SecretKey any256 = new SecretKeySpec(DATA_32, "ANY");
         PrivateKey priv = KeyPairGenerator.getInstance
-                ("RSA", System.getProperty("test.provider.name","SunRsaSign"))
+                ("RSA",
+                        System.getProperty(
+                                "test.provider.name",
+                                "SunRsaSign"))
                 .generateKeyPair().getPrivate();
 
         String[] algos = {
             "AES/KW/PKCS5Padding", "AES/KW/NoPadding", "AES/KWP/NoPadding"
         };
+
+        final List<String> skippedList  = new ArrayList<>();
+
         for (String a : algos) {
             if (p.getService("Cipher", a) == null) {
-                System.out.println("Skip, due to no support:  " + a);
-                continue;
+                skippedList.add(a);
             }
 
             System.out.println("Testing " + a);
@@ -329,6 +347,12 @@ public class TestGeneral extends PKCS11Test {
             testWrap(c, keys, ivs, padLen);
             testIv(c, ivLen, allowCustomIv);
         }
-        System.out.println("All Tests Passed");
+
+        if (!skippedList.isEmpty()) {
+            throw new SkippedException("One or more tests skipped " +
+                                       "due to no support " + skippedList);
+        } else {
+            System.out.println("All Tests Passed");
+        }
     }
 }
diff --git a/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/XMLEncKAT.java b/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/XMLEncKAT.java
index 1857e619cc6..5ba02416c8b 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/XMLEncKAT.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/KeyWrap/XMLEncKAT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,16 @@
  * @library /test/lib ../..
  * @run main/othervm XMLEncKAT
  */
+import jtreg.SkippedException;
+
 import java.util.Base64;
 import java.security.Key;
-import java.security.AlgorithmParameters;
 import java.security.Provider;
-import javax.crypto.*;
-import javax.crypto.spec.*;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
-import java.io.IOException;
 
 // adapted from com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java
 public class XMLEncKAT extends PKCS11Test {
@@ -105,7 +107,9 @@ public class XMLEncKAT extends PKCS11Test {
         // first test UNWRAP with known values
         for (int i = 0; i < base64Wrapped.length; i++) {
             byte[] wrappedKey = base64D.decode(base64Wrapped[i]);
-            key[i] = c.unwrap(wrappedKey, "AES", Cipher.SECRET_KEY);
+            key[i] = c.unwrap(wrappedKey,
+                    "AES",
+                    Cipher.SECRET_KEY);
             if (c.getIV() != null) {
                 params[i] = new IvParameterSpec(c.getIV());
             }
@@ -131,8 +135,7 @@ public class XMLEncKAT extends PKCS11Test {
         String wrapAlg = "AESWrap";
 
         if (p.getService("Cipher", wrapAlg) == null) {
-            System.out.println("Skip, due to no support:  " + wrapAlg);
-            return;
+            throw new SkippedException("No support " + wrapAlg);
         }
 
         String keyAlg = "AES";

From 0a963b612d0fcbfe002340098341862096650945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 24 Nov 2025 13:40:55 +0000
Subject: [PATCH 316/512] 8371701: Add ability to set NUMA-affinity for threads

Reviewed-by: aboldtch, ayang
---
 src/hotspot/os/aix/os_aix.cpp         |  3 ++
 src/hotspot/os/bsd/os_bsd.cpp         |  3 ++
 src/hotspot/os/linux/os_linux.cpp     | 78 +++++++++++++++++++++++++++
 src/hotspot/os/linux/os_linux.hpp     | 17 ++++++
 src/hotspot/os/windows/os_windows.cpp |  1 +
 src/hotspot/share/runtime/os.hpp      |  1 +
 6 files changed, 103 insertions(+)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 5f81912c0d6..48bd5e05816 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1747,6 +1747,9 @@ size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
 }
 
+void os::numa_set_thread_affinity(Thread *thread, int node) {
+}
+
 void os::numa_make_global(char *addr, size_t bytes) {
 }
 
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 3e5fa8b84e1..0b37cb100f6 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1581,6 +1581,9 @@ size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
 }
 
+void os::numa_set_thread_affinity(Thread *thread, int node) {
+}
+
 void os::numa_make_global(char *addr, size_t bytes) {
 }
 
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index b9f8307673c..456927d2a64 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -2995,6 +2995,10 @@ size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
 }
 
+void os::numa_set_thread_affinity(Thread* thread, int node) {
+  Linux::numa_set_thread_affinity(thread->osthread()->thread_id(), node);
+}
+
 void os::numa_make_global(char *addr, size_t bytes) {
   Linux::numa_interleave_memory(addr, bytes);
 }
@@ -3177,6 +3181,8 @@ bool os::Linux::libnuma_init() {
                                               libnuma_dlsym(handle, "numa_set_bind_policy")));
       set_numa_bitmask_isbitset(CAST_TO_FN_PTR(numa_bitmask_isbitset_func_t,
                                                libnuma_dlsym(handle, "numa_bitmask_isbitset")));
+      set_numa_bitmask_clearbit(CAST_TO_FN_PTR(numa_bitmask_clearbit_func_t,
+                                               libnuma_dlsym(handle, "numa_bitmask_clearbit")));
       set_numa_bitmask_equal(CAST_TO_FN_PTR(numa_bitmask_equal_func_t,
                                             libnuma_dlsym(handle, "numa_bitmask_equal")));
       set_numa_distance(CAST_TO_FN_PTR(numa_distance_func_t,
@@ -3191,20 +3197,32 @@ bool os::Linux::libnuma_init() {
                                             libnuma_dlsym(handle, "numa_set_preferred")));
       set_numa_get_run_node_mask(CAST_TO_FN_PTR(numa_get_run_node_mask_func_t,
                                                 libnuma_v2_dlsym(handle, "numa_get_run_node_mask")));
+      set_numa_sched_setaffinity(CAST_TO_FN_PTR(numa_sched_setaffinity_func_t,
+                                                libnuma_v2_dlsym(handle, "numa_sched_setaffinity")));
+      set_numa_allocate_cpumask(CAST_TO_FN_PTR(numa_allocate_cpumask_func_t,
+                                               libnuma_v2_dlsym(handle, "numa_allocate_cpumask")));
 
       if (numa_available() != -1) {
         set_numa_all_nodes((unsigned long*)libnuma_dlsym(handle, "numa_all_nodes"));
         set_numa_all_nodes_ptr((struct bitmask **)libnuma_dlsym(handle, "numa_all_nodes_ptr"));
         set_numa_nodes_ptr((struct bitmask **)libnuma_dlsym(handle, "numa_nodes_ptr"));
+        set_numa_all_cpus_ptr((struct bitmask **)libnuma_dlsym(handle, "numa_all_cpus_ptr"));
         set_numa_interleave_bitmask(_numa_get_interleave_mask());
         set_numa_membind_bitmask(_numa_get_membind());
         set_numa_cpunodebind_bitmask(_numa_get_run_node_mask());
+
         // Create an index -> node mapping, since nodes are not always consecutive
         _nindex_to_node = new (mtInternal) GrowableArray<int>(0, mtInternal);
         rebuild_nindex_to_node_map();
+
         // Create a cpu -> node mapping
         _cpu_to_node = new (mtInternal) GrowableArray<int>(0, mtInternal);
         rebuild_cpu_to_node_map();
+
+        // Create a node -> CPUs mapping
+        _numa_affinity_masks = new (mtInternal) GrowableArray<struct bitmask*>(0, mtInternal);
+        build_numa_affinity_masks();
+
         return true;
       }
     }
@@ -3240,6 +3258,42 @@ size_t os::Linux::default_guard_size(os::ThreadType thr_type) {
   return ((thr_type == java_thread || thr_type == compiler_thread) ? 0 : os::vm_page_size());
 }
 
+void os::Linux::build_numa_affinity_masks() {
+  // We only build the affinity masks if running libnuma v2 (_numa_node_to_cpus_v2
+  // is available) and we have the affinity mask of the process when it started.
+  if (_numa_node_to_cpus_v2 == nullptr || _numa_all_cpus_ptr == nullptr) {
+    return;
+  }
+
+  // It's important that we respect any user configuration by removing the
+  // CPUs we're not allowed to run on from the affinity mask. For example,
+  // if the user runs the JVM with "numactl -C 0-1,4-5" on a machine with
+  // the following NUMA setup:
+  // NUMA 0: CPUs 0-3, NUMA 1: CPUs 4-7
+  // We expect to get the following affinity masks:
+  // Affinity masks: idx 0 = (0, 1), idx 1 = (4, 5)
+
+  const int num_nodes = get_existing_num_nodes();
+  const unsigned num_cpus = (unsigned)os::processor_count();
+
+  for (int i = 0; i < num_nodes; i++) {
+    struct bitmask* affinity_mask = _numa_allocate_cpumask();
+
+    // Fill the affinity mask with all CPUs belonging to NUMA node i
+    _numa_node_to_cpus_v2(i, affinity_mask);
+
+    // Clear the bits of all CPUs that the process is not allowed to
+    // execute tasks on
+    for (unsigned j = 0; j < num_cpus; j++) {
+      if (!_numa_bitmask_isbitset(_numa_all_cpus_ptr, j)) {
+        _numa_bitmask_clearbit(affinity_mask, j);
+      }
+    }
+
+    _numa_affinity_masks->push(affinity_mask);
+  }
+}
+
 void os::Linux::rebuild_nindex_to_node_map() {
   int highest_node_number = Linux::numa_max_node();
 
@@ -3355,6 +3409,25 @@ int os::Linux::numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen)
   return -1;
 }
 
+void os::Linux::numa_set_thread_affinity(pid_t tid, int node) {
+  // We only set affinity if running libnuma v2 (_numa_sched_setaffinity
+  // is available) and we have all affinity mask
+  if (_numa_sched_setaffinity == nullptr ||
+      _numa_all_cpus_ptr == nullptr ||
+      _numa_affinity_masks->is_empty()) {
+    return;
+  }
+
+  if (node == -1) {
+    // If the node is -1, the affinity is reverted to the original affinity
+    // of the thread when the VM was started
+    _numa_sched_setaffinity(tid, _numa_all_cpus_ptr);
+  } else {
+    // Normal case, set the affinity to the corresponding affinity mask
+    _numa_sched_setaffinity(tid, _numa_affinity_masks->at(node));
+  }
+}
+
 int os::Linux::get_node_by_cpu(int cpu_id) {
   if (cpu_to_node() != nullptr && cpu_id >= 0 && cpu_id < cpu_to_node()->length()) {
     return cpu_to_node()->at(cpu_id);
@@ -3364,6 +3437,7 @@ int os::Linux::get_node_by_cpu(int cpu_id) {
 
 GrowableArray<int>* os::Linux::_cpu_to_node;
 GrowableArray<int>* os::Linux::_nindex_to_node;
+GrowableArray<struct bitmask*>* os::Linux::_numa_affinity_masks;
 os::Linux::sched_getcpu_func_t os::Linux::_sched_getcpu;
 os::Linux::numa_node_to_cpus_func_t os::Linux::_numa_node_to_cpus;
 os::Linux::numa_node_to_cpus_v2_func_t os::Linux::_numa_node_to_cpus_v2;
@@ -3375,17 +3449,21 @@ os::Linux::numa_interleave_memory_func_t os::Linux::_numa_interleave_memory;
 os::Linux::numa_interleave_memory_v2_func_t os::Linux::_numa_interleave_memory_v2;
 os::Linux::numa_set_bind_policy_func_t os::Linux::_numa_set_bind_policy;
 os::Linux::numa_bitmask_isbitset_func_t os::Linux::_numa_bitmask_isbitset;
+os::Linux::numa_bitmask_clearbit_func_t os::Linux::_numa_bitmask_clearbit;
 os::Linux::numa_bitmask_equal_func_t os::Linux::_numa_bitmask_equal;
 os::Linux::numa_distance_func_t os::Linux::_numa_distance;
 os::Linux::numa_get_membind_func_t os::Linux::_numa_get_membind;
 os::Linux::numa_get_interleave_mask_func_t os::Linux::_numa_get_interleave_mask;
 os::Linux::numa_get_run_node_mask_func_t os::Linux::_numa_get_run_node_mask;
+os::Linux::numa_sched_setaffinity_func_t os::Linux::_numa_sched_setaffinity;
+os::Linux::numa_allocate_cpumask_func_t os::Linux::_numa_allocate_cpumask;
 os::Linux::numa_move_pages_func_t os::Linux::_numa_move_pages;
 os::Linux::numa_set_preferred_func_t os::Linux::_numa_set_preferred;
 os::Linux::NumaAllocationPolicy os::Linux::_current_numa_policy;
 unsigned long* os::Linux::_numa_all_nodes;
 struct bitmask* os::Linux::_numa_all_nodes_ptr;
 struct bitmask* os::Linux::_numa_nodes_ptr;
+struct bitmask* os::Linux::_numa_all_cpus_ptr;
 struct bitmask* os::Linux::_numa_interleave_bitmask;
 struct bitmask* os::Linux::_numa_membind_bitmask;
 struct bitmask* os::Linux::_numa_cpunodebind_bitmask;
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index df96a17d8e9..9c0b6723b38 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -45,6 +45,10 @@ class os::Linux {
   static GrowableArray<int>* _cpu_to_node;
   static GrowableArray<int>* _nindex_to_node;
 
+  static GrowableArray<struct bitmask*>* _numa_affinity_masks;
+
+  static void build_numa_affinity_masks();
+
  protected:
 
   static physical_memory_size_type _physical_memory;
@@ -230,8 +234,11 @@ class os::Linux {
   typedef void (*numa_set_preferred_func_t)(int node);
   typedef void (*numa_set_bind_policy_func_t)(int policy);
   typedef int (*numa_bitmask_isbitset_func_t)(struct bitmask *bmp, unsigned int n);
+  typedef int (*numa_bitmask_clearbit_func_t)(struct bitmask *bmp, unsigned int n);
   typedef int (*numa_bitmask_equal_func_t)(struct bitmask *bmp1, struct bitmask *bmp2);
   typedef int (*numa_distance_func_t)(int node1, int node2);
+  typedef int (*numa_sched_setaffinity_func_t)(pid_t pid, struct bitmask* mask);
+  typedef struct bitmask* (*numa_allocate_cpumask_func_t)(void);
 
   static sched_getcpu_func_t _sched_getcpu;
   static numa_node_to_cpus_func_t _numa_node_to_cpus;
@@ -244,6 +251,7 @@ class os::Linux {
   static numa_interleave_memory_v2_func_t _numa_interleave_memory_v2;
   static numa_set_bind_policy_func_t _numa_set_bind_policy;
   static numa_bitmask_isbitset_func_t _numa_bitmask_isbitset;
+  static numa_bitmask_clearbit_func_t _numa_bitmask_clearbit;
   static numa_bitmask_equal_func_t _numa_bitmask_equal;
   static numa_distance_func_t _numa_distance;
   static numa_get_membind_func_t _numa_get_membind;
@@ -251,9 +259,12 @@ class os::Linux {
   static numa_get_interleave_mask_func_t _numa_get_interleave_mask;
   static numa_move_pages_func_t _numa_move_pages;
   static numa_set_preferred_func_t _numa_set_preferred;
+  static numa_sched_setaffinity_func_t _numa_sched_setaffinity;
+  static numa_allocate_cpumask_func_t _numa_allocate_cpumask;
   static unsigned long* _numa_all_nodes;
   static struct bitmask* _numa_all_nodes_ptr;
   static struct bitmask* _numa_nodes_ptr;
+  static struct bitmask* _numa_all_cpus_ptr;
   static struct bitmask* _numa_interleave_bitmask;
   static struct bitmask* _numa_membind_bitmask;
   static struct bitmask* _numa_cpunodebind_bitmask;
@@ -269,6 +280,7 @@ class os::Linux {
   static void set_numa_interleave_memory_v2(numa_interleave_memory_v2_func_t func) { _numa_interleave_memory_v2 = func; }
   static void set_numa_set_bind_policy(numa_set_bind_policy_func_t func) { _numa_set_bind_policy = func; }
   static void set_numa_bitmask_isbitset(numa_bitmask_isbitset_func_t func) { _numa_bitmask_isbitset = func; }
+  static void set_numa_bitmask_clearbit(numa_bitmask_clearbit_func_t func) { _numa_bitmask_clearbit = func; }
   static void set_numa_bitmask_equal(numa_bitmask_equal_func_t func) { _numa_bitmask_equal = func; }
   static void set_numa_distance(numa_distance_func_t func) { _numa_distance = func; }
   static void set_numa_get_membind(numa_get_membind_func_t func) { _numa_get_membind = func; }
@@ -279,9 +291,12 @@ class os::Linux {
   static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }
   static void set_numa_all_nodes_ptr(struct bitmask **ptr) { _numa_all_nodes_ptr = (ptr == nullptr ? nullptr : *ptr); }
   static void set_numa_nodes_ptr(struct bitmask **ptr) { _numa_nodes_ptr = (ptr == nullptr ? nullptr : *ptr); }
+  static void set_numa_all_cpus_ptr(struct bitmask **ptr) { _numa_all_cpus_ptr = (ptr == nullptr ? nullptr : *ptr); }
   static void set_numa_interleave_bitmask(struct bitmask* ptr)     { _numa_interleave_bitmask = ptr ;   }
   static void set_numa_membind_bitmask(struct bitmask* ptr)        { _numa_membind_bitmask = ptr ;      }
   static void set_numa_cpunodebind_bitmask(struct bitmask* ptr)        { _numa_cpunodebind_bitmask = ptr ;      }
+  static void set_numa_sched_setaffinity(numa_sched_setaffinity_func_t func) { _numa_sched_setaffinity = func; }
+  static void set_numa_allocate_cpumask(numa_allocate_cpumask_func_t func) { _numa_allocate_cpumask = func; }
   static int sched_getcpu_syscall(void);
 
   enum NumaAllocationPolicy{
@@ -292,6 +307,8 @@ class os::Linux {
   static NumaAllocationPolicy _current_numa_policy;
 
  public:
+  static void numa_set_thread_affinity(pid_t tid, int node);
+
   static int sched_getcpu()  { return _sched_getcpu != nullptr ? _sched_getcpu() : -1; }
   static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen);
   static int numa_max_node() { return _numa_max_node != nullptr ? _numa_max_node() : -1; }
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index ce2baeaf46c..28b20f3cdaf 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -3752,6 +3752,7 @@ size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
 }
 
+void os::numa_set_thread_affinity(Thread *thread, int node) { }
 void os::numa_make_global(char *addr, size_t bytes)    { }
 void os::numa_make_local(char *addr, size_t bytes, int lgrp_hint)    { }
 size_t os::numa_get_groups_num()                       { return MAX2(numa_node_list_holder.get_count(), 1); }
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index e008f29eecc..b65bf643cbf 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -534,6 +534,7 @@ class os: AllStatic {
   static void   realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // NUMA-specific interface
+  static void   numa_set_thread_affinity(Thread* thread, int node);
   static void   numa_make_local(char *addr, size_t bytes, int lgrp_hint);
   static void   numa_make_global(char *addr, size_t bytes);
   static size_t numa_get_groups_num();

From aec54726df7efdea6f85ccd26763acb7ee839e2f Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 24 Nov 2025 14:07:54 +0000
Subject: [PATCH 317/512] 8372159: HttpClient SelectorManager thread could be a
 VirtualThread

Reviewed-by: djelinski
---
 .../jdk/internal/net/http/HttpClientImpl.java |  36 ++-
 .../jdk/internal/net/http/common/Utils.java   |   9 +
 .../http/quic/ConnectionTerminatorImpl.java   |   3 +-
 .../net/http/quic/IdleTimeoutManager.java     |   6 +-
 .../internal/net/http/quic/QuicEndpoint.java  |   9 +-
 .../internal/net/http/quic/QuicSelector.java  |   2 +-
 .../java/net/httpclient/ReferenceTracker.java |   8 +-
 .../httpclient/http2/H2SelectorVTTest.java    | 228 ++++++++++++++++++
 .../net/httpclient/http3/H3QuicVTTest.java    |   9 +
 9 files changed, 283 insertions(+), 27 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index 6ea196a4d1c..af9fd3b96ba 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -98,6 +98,7 @@ import jdk.internal.net.http.common.OperationTrackers.Trackable;
 import jdk.internal.net.http.common.OperationTrackers.Tracker;
 import jdk.internal.net.http.common.Utils.SafeExecutor;
 import jdk.internal.net.http.common.Utils.SafeExecutorService;
+import jdk.internal.net.http.common.Utils.UseVTForSelector;
 import jdk.internal.net.http.websocket.BuilderImpl;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
@@ -126,6 +127,16 @@ final class HttpClientImpl extends HttpClient implements Trackable {
     static final long IDLE_CONNECTION_TIMEOUT_H2 = getTimeoutProp("jdk.httpclient.keepalive.timeout.h2", KEEP_ALIVE_TIMEOUT);
     static final long IDLE_CONNECTION_TIMEOUT_H3 = getTimeoutProp("jdk.httpclient.keepalive.timeout.h3", IDLE_CONNECTION_TIMEOUT_H2);
 
+    static final UseVTForSelector USE_VT_FOR_SELECTOR =
+        Utils.useVTForSelector("jdk.internal.httpclient.tcp.selector.useVirtualThreads", "default");
+    private static boolean useVtForSelector() {
+        return switch (USE_VT_FOR_SELECTOR) {
+            case ALWAYS -> true;
+            case NEVER -> false;
+            default -> true;
+        };
+    }
+
     // Define the default factory as a static inner class
     // that embeds all the necessary logic to avoid
     // the risk of using a lambda that might keep a reference on the
@@ -293,7 +304,6 @@ final class HttpClientImpl extends HttpClient implements Trackable {
         if (pending.cf.isDone()) return res;
 
         var client = pending.client;
-        var cf = pending.cf;
         var id = pending.id;
         boolean added = client.pendingRequests.add(pending);
         // this may immediately remove `pending` from the set is the cf is already completed
@@ -342,6 +352,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
     private final boolean isDefaultExecutor;
     private final SSLContext sslContext;
     private final SSLParameters sslParams;
+    private final Thread selmgrThread;
     private final SelectorManager selmgr;
     private final FilterFactory filters;
     private final Http2ClientImpl client2;
@@ -509,7 +520,11 @@ final class HttpClientImpl extends HttpClient implements Trackable {
             // unlikely
             throw new UncheckedIOException(e);
         }
-        selmgr.setDaemon(true);
+        selmgrThread = useVtForSelector()
+                ? Thread.ofVirtual().name("HttpClient-" + id + "-SelectorManager")
+                .inheritInheritableThreadLocals(false).unstarted(selmgr)
+                : Thread.ofPlatform().name("HttpClient-" + id + "-SelectorManager")
+                .inheritInheritableThreadLocals(false).daemon().unstarted(selmgr);
         filters = new FilterFactory();
         initFilters();
         assert facadeRef.get() != null;
@@ -528,7 +543,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
 
     private void start() {
         try {
-            selmgr.start();
+            selmgrThread.start();
         } catch (Throwable t) {
             isStarted.set(true);
             throw t;
@@ -635,7 +650,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
     @Override
     public boolean awaitTermination(Duration duration) throws InterruptedException {
         // Implicit NPE will be thrown if duration is null
-        return selmgr.join(duration);
+        return selmgrThread.join(duration);
     }
 
     @Override
@@ -927,7 +942,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
     }
 
     boolean isSelectorThread() {
-        return Thread.currentThread() == selmgr;
+        return Thread.currentThread() == selmgrThread;
     }
 
     AltServicesRegistry registry() { return registry; }
@@ -1157,7 +1172,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
     }
 
     // Main loop for this client's selector
-    private static final class SelectorManager extends Thread {
+    private static final class SelectorManager implements Runnable {
 
         // For testing purposes we have an internal System property that
         // can control the frequency at which the selector manager will wake
@@ -1196,9 +1211,6 @@ final class HttpClientImpl extends HttpClient implements Trackable {
         private final ReentrantLock lock = new ReentrantLock();
 
         SelectorManager(HttpClientImpl ref) throws IOException {
-            super(null, null,
-                  "HttpClient-" + ref.id + "-SelectorManager",
-                  0, false);
             owner = ref;
             debug = ref.debug;
             debugtimeout = ref.debugtimeout;
@@ -1221,7 +1233,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
         }
 
         void eventUpdated(AsyncEvent e) throws ClosedChannelException {
-            if (Thread.currentThread() == this) {
+            if (owner.isSelectorThread()) {
                 SelectionKey key = e.channel().keyFor(selector);
                 if (key != null && key.isValid()) {
                     SelectorAttachment sa = (SelectorAttachment) key.attachment();
@@ -1315,6 +1327,10 @@ final class HttpClientImpl extends HttpClient implements Trackable {
             if (!inSelectorThread) selector.wakeup();
         }
 
+        String getName() {
+            return owner.selmgrThread.getName();
+        }
+
         // Only called by the selector manager thread
         private void shutdown() {
             try {
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
index a02506cff5c..20b0338215c 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
@@ -242,6 +242,15 @@ public final class Utils {
                 return true;
             };
 
+    public enum UseVTForSelector { ALWAYS, NEVER, DEFAULT }
+
+    public static UseVTForSelector useVTForSelector(String property, String defval) {
+        String useVtForSelector = System.getProperty(property, defval);
+        return Stream.of(UseVTForSelector.values())
+                .filter((v) -> v.name().equalsIgnoreCase(useVtForSelector))
+                .findFirst().orElse(UseVTForSelector.DEFAULT);
+    }
+
     public static <T extends Throwable> T addSuppressed(T x, Throwable suppressed) {
         if (x != suppressed && suppressed != null) {
             var sup = x.getSuppressed();
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
index 150d6233953..0f5aa4cb7ac 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
@@ -143,8 +143,9 @@ final class ConnectionTerminatorImpl implements ConnectionTerminator {
             Log.logError("{0}: stateless reset from peer ({1})", connection.logTag(),
                     (peerIsServer ? "server" : "client"));
         }
+        var label = "quic:" + connection.uniqueId();
         final SilentTermination st = forSilentTermination("stateless reset from peer ("
-                + (peerIsServer ? "server" : "client") + ")");
+                + (peerIsServer ? "server" : "client") + ") on " + label);
         terminate(st);
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java
index a7469f18ed8..72ce0290038 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java
@@ -346,8 +346,10 @@ final class IdleTimeoutManager {
             }
         }
         // silently close the connection and discard all its state
-        final TerminationCause cause = forSilentTermination("connection idle timed out ("
-                + timeoutMillis + " milli seconds)");
+        var type = connection.isClientConnection() ? "client" : "server";
+        var label = "quic:" + connection.uniqueId();
+        final TerminationCause cause = forSilentTermination(type + " connection idle timed out ("
+                + timeoutMillis + " milli seconds) on " + label);
         connection.terminator.terminate(cause);
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
index d9bf5fe6dcf..b1de5ef4bfd 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
@@ -62,6 +62,7 @@ import jdk.internal.net.http.common.SequentialScheduler;
 import jdk.internal.net.http.common.TimeLine;
 import jdk.internal.net.http.common.TimeSource;
 import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.common.Utils.UseVTForSelector;
 import jdk.internal.net.http.quic.QuicSelector.QuicNioSelector;
 import jdk.internal.net.http.quic.QuicSelector.QuicVirtualThreadPoller;
 import jdk.internal.net.http.quic.packets.QuicPacket.HeadersType;
@@ -116,7 +117,6 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
     static final boolean DGRAM_SEND_ASYNC;
     static final int MAX_BUFFERED_HIGH;
     static final int MAX_BUFFERED_LOW;
-    enum UseVTForSelector { ALWAYS, NEVER, DEFAULT }
     static final UseVTForSelector USE_VT_FOR_SELECTOR;
     static {
         // This default value is the maximum payload size of
@@ -144,11 +144,8 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
         if (maxBufferLow >= maxBufferHigh) maxBufferLow = maxBufferHigh >> 1;
         MAX_BUFFERED_HIGH = maxBufferHigh;
         MAX_BUFFERED_LOW = maxBufferLow;
-        String useVtForSelector =
-                System.getProperty("jdk.internal.httpclient.quic.selector.useVirtualThreads", "default");
-        USE_VT_FOR_SELECTOR = Stream.of(UseVTForSelector.values())
-                .filter((v) -> v.name().equalsIgnoreCase(useVtForSelector))
-                .findFirst().orElse(UseVTForSelector.DEFAULT);
+        var property = "jdk.internal.httpclient.quic.selector.useVirtualThreads";
+        USE_VT_FOR_SELECTOR = Utils.useVTForSelector(property, "default");
     }
 
     /**
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java
index 9fa825459ff..02db895d27c 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicSelector.java
@@ -45,9 +45,9 @@ import jdk.internal.net.http.common.Logger;
 import jdk.internal.net.http.common.TimeLine;
 import jdk.internal.net.http.common.TimeSource;
 import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.common.Utils.UseVTForSelector;
 import jdk.internal.net.http.quic.QuicEndpoint.QuicVirtualThreadedEndpoint;
 import jdk.internal.net.http.quic.QuicEndpoint.QuicSelectableEndpoint;
-import jdk.internal.net.http.quic.QuicEndpoint.UseVTForSelector;
 
 import static jdk.internal.net.http.quic.QuicEndpoint.USE_VT_FOR_SELECTOR;
 
diff --git a/test/jdk/java/net/httpclient/ReferenceTracker.java b/test/jdk/java/net/httpclient/ReferenceTracker.java
index 6ea97ab6ac2..f167a086fba 100644
--- a/test/jdk/java/net/httpclient/ReferenceTracker.java
+++ b/test/jdk/java/net/httpclient/ReferenceTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -390,12 +390,6 @@ public class ReferenceTracker {
         }
     }
 
-    private boolean isSelectorManager(Thread t) {
-        String name = t.getName();
-        if (name == null) return false;
-        return name.contains("SelectorManager");
-    }
-
     // This is a slightly more permissive check than the default checks,
     // it only verifies that all CFs returned by send/sendAsync have been
     // completed, and that all opened channels have been closed, and that
diff --git a/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java b/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java
new file mode 100644
index 00000000000..b980df99138
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLContext;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.test.lib.net.SimpleSSLContext;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_2;
+
+/*
+ * @test id=default
+ * @bug 8372159
+ * @summary Verifies whether `SelectorManager` uses virtual threads
+ *          as expected when no explicit configuration is provided
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors
+ *              H2SelectorVTTest
+ */
+/*
+ * @test id=never
+ * @bug 8372159
+ * @summary Verifies that `SelectorManager` does *not* use virtual threads
+            when explicitly configured to "never" use them
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.tcp.selector.useVirtualThreads=never
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors
+ *              H2SelectorVTTest
+ */
+/*
+ * @test id=always
+ * @bug 8372159
+ * @summary Verifies that `SelectorManager` does *always* use virtual threads
+            when explicitly configured to "always" use them
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.tcp.selector.useVirtualThreads=always
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors
+ *              H2SelectorVTTest
+ */
+/*
+ * @test id=explicit-default
+ * @bug 8372159
+ * @summary Verifies whether `SelectorManager` uses virtual threads
+ *          as expected when `default` is explicitly configured
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.tcp.selector.useVirtualThreads=default
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors
+ *              H2SelectorVTTest
+ */
+/*
+ * @test id=garbage
+ * @bug 8372159
+ * @summary Verifies whether `SelectorManager` uses virtual threads when
+            it is configured using an invalid value
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.internal.httpclient.tcp.selector.useVirtualThreads=garbage
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,headers,errors
+ *              H2SelectorVTTest
+ */
+// -Djava.security.debug=all
+class H2SelectorVTTest implements HttpServerAdapters {
+
+    private static SSLContext sslContext;
+    private static HttpTestServer h2Server;
+    private static String requestURI;
+
+    enum UseVTForSelector { ALWAYS, NEVER, DEFAULT }
+    private static final String PROP_NAME = "jdk.internal.httpclient.tcp.selector.useVirtualThreads";
+    private static final UseVTForSelector USE_VT_FOR_SELECTOR;
+    static {
+        String useVtForSelector =
+                System.getProperty(PROP_NAME, "default");
+        USE_VT_FOR_SELECTOR = Stream.of(UseVTForSelector.values())
+                .filter((v) -> v.name().equalsIgnoreCase(useVtForSelector))
+                .findFirst().orElse(UseVTForSelector.DEFAULT);
+    }
+
+    private static boolean isTCPSelectorThreadVirtual() {
+        return switch (USE_VT_FOR_SELECTOR) {
+            case ALWAYS -> true;
+            case NEVER  -> false;
+            default     -> true;
+        };
+    }
+
+    @BeforeAll
+    static void beforeClass() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null) {
+            throw new AssertionError("Unexpected null sslContext");
+        }
+        // create a h2 server
+        h2Server = HttpTestServer.create(HTTP_2, sslContext);
+        h2Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
+        h2Server.start();
+        System.out.println("Server started at " + h2Server.getAddress());
+        requestURI = "https://" + h2Server.serverAuthority() + "/hello";
+    }
+
+    @AfterAll
+    static void afterClass() throws Exception {
+        if (h2Server != null) {
+            System.out.println("Stopping server " + h2Server.getAddress());
+            h2Server.stop();
+        }
+    }
+
+    /**
+     * Issues various HTTP/2 requests and verifies the responses are received
+     */
+    @Test
+    void testBasicRequests() throws Exception {
+        try (final HttpClient client = HttpClient.newBuilder()
+                .proxy(NO_PROXY)
+                .sslContext(sslContext).build()) {
+            final URI reqURI = new URI(requestURI);
+            final HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(reqURI);
+
+            // GET
+            final HttpRequest req1 = reqBuilder.copy().GET().build();
+            System.out.println("\nIssuing request: " + req1);
+            final HttpResponse<?> resp1 = client.send(req1, BodyHandlers.ofString());
+            Assertions.assertEquals(200, resp1.statusCode(), "unexpected response code for GET request");
+            assertSelectorThread(client);
+
+            // POST
+            final HttpRequest req2 = reqBuilder.copy().POST(BodyPublishers.ofString("foo")).build();
+            System.out.println("\nIssuing request: " + req2);
+            final HttpResponse<?> resp2 = client.send(req2, BodyHandlers.ofString());
+            Assertions.assertEquals(200, resp2.statusCode(), "unexpected response code for POST request");
+            assertSelectorThread(client);
+
+            // HEAD
+            final HttpRequest req3 = reqBuilder.copy().HEAD().build();
+            System.out.println("\nIssuing request: " + req3);
+            final HttpResponse<?> resp3 = client.send(req3, BodyHandlers.ofString());
+            Assertions.assertEquals(200, resp3.statusCode(), "unexpected response code for HEAD request");
+            assertSelectorThread(client);
+        }
+    }
+
+    // This method attempts to determine whether the selector thread
+    // is a platform thread or a virtual thread, and throws if expectations
+    // ar not met.
+    // Since we don't have access to the selector thread, the method
+    // uses a roundabout way to figure this out: it enumerates all
+    // platform threads, and if it finds a thread whose name matches
+    // the expected name of the selector thread it concludes that the
+    // selector thread is a platform thread. Otherwise, it assumes
+    // that the thread is virtual.
+    private static void assertSelectorThread(HttpClient client) {
+        String cname = client.toString();
+        String clientId = cname.substring(cname.indexOf('(') + 1, cname.length() -1);
+        String name = "HttpClient-" + clientId + "-SelectorManager";
+        Set<String> threads = new HashSet<>(Thread.getAllStackTraces().keySet().stream()
+                .map(Thread::getName)
+                .toList());
+        boolean found = threads.contains(name);
+        String status = found == isTCPSelectorThreadVirtual() ? "ERROR" : "SUCCESS";
+        String propval = System.getProperty(PROP_NAME);
+        if (propval == null) {
+            System.out.printf("%s not defined, virtual=%s, thread found=%s%n",
+                    PROP_NAME, isTCPSelectorThreadVirtual(), found);
+        } else {
+            System.out.printf("%s=%s, virtual=%s, thread found=%s%n",
+                    PROP_NAME, propval, isTCPSelectorThreadVirtual(), found);
+        }
+        final String msg;
+        if (found) {
+            msg = "%s found in %s".formatted(name, threads);
+            System.out.printf("%s: %s%n", status, msg);
+        } else {
+            msg = "%s not found in %s".formatted(name, threads);
+            System.out.printf("%s: %s%n", status, msg);
+        }
+        Assertions.assertEquals(!isTCPSelectorThreadVirtual(), found, msg);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java b/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
index c9af069c728..b00f6b1522d 100644
--- a/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
@@ -196,6 +196,15 @@ class H3QuicVTTest implements HttpServerAdapters {
         }
     }
 
+    // This method attempts to determine whether the quic selector thread
+    // is a platform thread or a virtual thread, and throws if expectations
+    // are not met.
+    // Since we don't have access to the quic selector thread, the method
+    // uses a roundabout way to figure this out: it enumerates all
+    // platform threads, and if it finds a thread whose name matches
+    // the expected name of the quic selector thread it concludes that the
+    // selector thread is a platform thread. Otherwise, it assumes
+    // that the thread is virtual.
     private static void assertSelectorThread(HttpClient client) {
         String clientId = client.toString().substring(client.toString().indexOf('('));
         String name = "Thread(QuicSelector(HttpClientImpl" + clientId + "))";

From c12389d006c94d619da69b81ece317b878c0c1bb Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 24 Nov 2025 15:09:45 +0000
Subject: [PATCH 318/512] 8372359: Clean jpackage error messages

Reviewed-by: almatvee
---
 .../resources/LinuxResources.properties       |   1 -
 .../resources/MacResources.properties         |  17 +--
 .../jpackage/internal/BuildEnvBuilder.java    |  22 +---
 .../internal/cli/OptionsAnalyzer.java         |   7 +-
 .../jpackage/internal/cli/StandardOption.java |  20 +--
 .../StandardOptionValueExceptionFactory.java  |  16 ---
 .../resources/MainResources.properties        |  48 +++----
 .../resources/WinResources.properties         |   3 -
 .../internal/cli/OptionsProcessorTest.java    |   2 +-
 .../cli/OptionsValidationFailTest.excludes    |  78 +++++------
 .../internal/cli/StandardOptionTest.java      |  11 +-
 test/jdk/tools/jpackage/share/BasicTest.java  |   2 +-
 test/jdk/tools/jpackage/share/ErrorTest.java  | 124 +++++++++++-------
 .../tools/jpackage/share/ModulePathTest.java  |   2 +-
 14 files changed, 162 insertions(+), 191 deletions(-)

diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
index 6f05b623064..3aabe1f4ba5 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
@@ -54,7 +54,6 @@ message.output-to-location=Package (.deb) saved to: {0}.
 message.debs-like-licenses=Debian packages should specify a license. The absence of a license will cause some linux distributions to complain about the quality of the application.
 message.outputting-bundle-location=Generating RPM for installer to: {0}.
 message.output-bundle-location=Package (.rpm) saved to: {0}.
-message.creating-association-with-null-extension=Creating association with null extension.
 
 message.ldd-not-available=ldd command not found. Package dependencies will not be generated.
 message.deb-ldd-not-available.advice=Install "libc-bin" DEB package to get ldd.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index 7ce20925439..d01297aa814 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -26,17 +26,14 @@
 error.invalid-cfbundle-version.advice=Set a compatible 'app-version' value. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate found
 error.explicit-sign-no-cert.advice=Specify a valid mac-signing-key-user-name and mac-signing-keychain
-error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration
-error.must-sign-app-store.advice=Use --mac-sign option with appropriate user-name and keychain
-error.certificate.expired=Error: Certificate expired {0}
+error.certificate.expired=Certificate expired {0}
 error.cert.not.found=No certificate found matching [{0}] using keychain [{1}]
 error.multiple.certs.found=Multiple certificates matching name [{0}] found in keychain [{1}]
-error.app-image.mac-sign.required=Error: --mac-sign option is required with predefined application image and with type [app-image]
-error.tool.failed.with.output=Error: "{0}" failed with following output:
+error.app-image.mac-sign.required=--mac-sign option is required with predefined application image and with type [app-image]
+error.tool.failed.with.output="{0}" failed with following output:
 error.invalid-runtime-image-missing-file=Runtime image "{0}" is missing "{1}" file
 error.invalid-runtime-image-bin-dir=Runtime image "{0}" should not contain "bin" folder
 error.invalid-runtime-image-bin-dir.advice=Use --strip-native-commands jlink option when generating runtime image used with {0} option
-resource.bundle-config-file=Bundle config file
 resource.app-info-plist=Application Info.plist
 resource.app-runtime-info-plist=Embedded Java Runtime Info.plist
 resource.runtime-info-plist=Java Runtime Info.plist
@@ -59,14 +56,10 @@ message.preparing-info-plist=Preparing Info.plist: {0}.
 message.icon-not-icns= The specified icon "{0}" is not an ICNS file and will not be used. The default icon will be used in it's place.
 message.version-string-too-many-components='app-version' may have between 1 and 3 numbers: 1, 1.2, 1.2.3.
 message.version-string-first-number-not-zero=The first number in an app-version cannot be zero or negative.
-message.creating-association-with-null-extension=Creating association with null extension.
-message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
-message.already.signed=File already signed: {0}.
-message.keychain.error=Error: unable to get keychain list.
-message.invalid-identifier=invalid mac bundle identifier [{0}].
+message.keychain.error=Unable to get keychain list.
+message.invalid-identifier=Invalid mac bundle identifier [{0}].
 message.invalid-identifier.advice=specify identifier with "--mac-package-identifier".
 message.building-dmg=Building DMG package for {0}.
-message.running-script=Running shell script on application image [{0}].
 message.preparing-dmg-setup=Preparing dmg setup: {0}.
 message.creating-dmg-file=Creating DMG file: {0}.
 message.dmg-cannot-be-overwritten=Dmg file exists [{0}] and can not be removed.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
index a33df975072..17b805b8259 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
@@ -24,8 +24,8 @@
  */
 package jdk.jpackage.internal;
 
-import java.io.IOException;
-import java.nio.file.Files;
+import static jdk.jpackage.internal.cli.StandardValidator.IS_DIRECTORY_EMPTY_OR_NON_EXISTENT_PREDICATE;
+
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
@@ -41,19 +41,11 @@ final class BuildEnvBuilder {
     }
 
     BuildEnv create() {
-        var exceptionBuilder = I18N.buildConfigException("ERR_BuildRootInvalid", root);
-        if (Files.isDirectory(root)) {
-            try (var rootDirContents = Files.list(root)) {
-                if (rootDirContents.findAny().isPresent()) {
-                    // The root directory is not empty.
-                    throw exceptionBuilder.create();
-                }
-            } catch (IOException ioe) {
-                throw exceptionBuilder.cause(ioe).create();
-            }
-        } else if (Files.exists(root)) {
-            // The root is not a directory.
-            throw exceptionBuilder.create();
+        // The directory should be validated earlier with a proper error message.
+        // Here is only a sanity check.
+        if (!IS_DIRECTORY_EMPTY_OR_NON_EXISTENT_PREDICATE.test(root)) {
+            throw new UnsupportedOperationException(
+                    String.format("Root work directory [%s] should be empty or non existent", root));
         }
 
         return BuildEnv.create(root, Optional.ofNullable(resourceDir), verbose,
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
index adba2f7abb4..67e87d55d8b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
@@ -418,13 +418,10 @@ final class OptionsAnalyzer {
                 asOptionList(PREDEFINED_RUNTIME_IMAGE, ADD_MODULES),
                 asOptionList(PREDEFINED_RUNTIME_IMAGE, JLINK_OPTIONS),
                 asOptionList(MAC_SIGNING_KEY_NAME, MAC_APP_IMAGE_SIGN_IDENTITY),
-                asOptionList(MAC_SIGNING_KEY_NAME, MAC_INSTALLER_SIGN_IDENTITY)
+                asOptionList(MAC_SIGNING_KEY_NAME, MAC_INSTALLER_SIGN_IDENTITY),
+                asOptionList(MODULE, MAIN_JAR)
         ).map(MutualExclusiveOptions::new).forEach(config::add);
 
-        config.add(new MutualExclusiveOptions(asOptionList(MODULE, MAIN_JAR), _ -> {
-            return error("ERR_BothMainJarAndModule");
-        }));
-
         MUTUAL_EXCLUSIVE_OPTIONS = List.copyOf(config);
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
index bd9bd0f6040..6de3b7e5c5c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
@@ -32,7 +32,6 @@ import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_NATIVE;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.SIGN_MAC_APP_IMAGE;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.fromOptionName;
 import static jdk.jpackage.internal.cli.StandardOptionContext.createOptionSpecBuilderMutator;
-import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERROR_WITHOUT_CONTEXT;
 import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERROR_WITH_VALUE;
 import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERROR_WITH_VALUE_AND_OPTION_NAME;
 import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.forMessageWithOptionValueAndName;
@@ -177,10 +176,7 @@ public final class StandardOption {
 
     public static final OptionValue<String> COPYRIGHT = stringOption("copyright").valuePattern("copyright string").create();
 
-    public static final OptionValue<Path> LICENSE_FILE = fileOption("license-file")
-            .validatorExceptionFormatString("ERR_LicenseFileNotExit")
-            .validatorExceptionFactory(ERROR_WITHOUT_CONTEXT)
-            .create();
+    public static final OptionValue<Path> LICENSE_FILE = fileOption("license-file").create();
 
     public static final OptionValue<String> APP_VERSION = stringOption("app-version").create();
 
@@ -216,12 +212,10 @@ public final class StandardOption {
             .validatorExceptionFactory((optionName, optionValue, formatString, cause) -> {
                 if (cause.orElseThrow() instanceof StandardValidator.DirectoryListingIOException) {
                     formatString = "error.path-parameter-ioexception";
-                    return ERROR_WITH_VALUE_AND_OPTION_NAME.create(optionName, optionValue, formatString, cause);
-                } else {
-                    return ERROR_WITH_VALUE.create(optionName, optionValue, formatString, cause);
                 }
+                return ERROR_WITH_VALUE_AND_OPTION_NAME.create(optionName, optionValue, formatString, cause);
             })
-            .validatorExceptionFormatString("ERR_BuildRootInvalid")
+            .validatorExceptionFormatString("error.parameter-not-empty-directory")
             .validator(StandardValidator.IS_DIRECTORY_EMPTY_OR_NON_EXISTENT)
             .create();
 
@@ -236,8 +230,6 @@ public final class StandardOption {
 
     public static final OptionValue<Path> PREDEFINED_APP_IMAGE = directoryOption("app-image")
             .scope(CREATE_NATIVE).inScope(SIGN_MAC_APP_IMAGE).inScope(BundlingOperationModifier.BUNDLE_PREDEFINED_APP_IMAGE)
-            .validatorExceptionFactory(ERROR_WITH_VALUE)
-            .validatorExceptionFormatString("ERR_AppImageNotExist")
             .mutate(createOptionSpecBuilderMutator((b, context) -> {
                 if (context.os() == OperatingSystem.MACOS) {
                     b.description("help.option.app-image" + resourceKeySuffix(context.os()));
@@ -538,7 +530,7 @@ public final class StandardOption {
                 });
             }))
             .converterExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
-            .converterExceptionFormatString("error.invalid-option-value")
+            .converterExceptionFormatString("error.parameter-not-launcher-shortcut-dir")
             .converter(mainLauncherShortcutConv())
             .defaultOptionalValue(new LauncherShortcut(LauncherShortcutStartupDirectory.DEFAULT))
             .valuePattern("shortcut startup directory");
@@ -637,8 +629,8 @@ public final class StandardOption {
                 .converterExceptionFactory((optionName, optionValue, formatString, cause) -> {
                     final var theCause = cause.orElseThrow();
                     if (theCause instanceof AddLauncherSyntaxException) {
-                        return ERROR_WITHOUT_CONTEXT.create(optionName,
-                                optionValue, "ERR_NoAddLauncherName", cause);
+                        return ERROR_WITH_VALUE_AND_OPTION_NAME.create(optionName,
+                                optionValue, "error.parameter-add-launcher-malformed", cause);
                     } else {
                         return (RuntimeException)theCause;
                     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
index e79d283b386..d125c402142 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
@@ -32,18 +32,10 @@ import jdk.jpackage.internal.model.JPackageException;
 
 final class StandardOptionValueExceptionFactory {
 
-    static OptionValueExceptionFactory<JPackageException> forMessageWithOptionValue(Path propertyFile) {
-        return forMessageWithOptionValue(appendPath(propertyFile)).printOptionPrefix(false).create();
-    }
-
     static OptionValueExceptionFactory<JPackageException> forMessageWithOptionValueAndName(Path propertyFile) {
         return forMessageWithOptionValueAndName(appendPath(propertyFile)).printOptionPrefix(false).create();
     }
 
-    static OptionValueExceptionFactory<JPackageException> forFixedMessage(Path propertyFile) {
-        return forFixedMessage(appendPath(propertyFile)).printOptionPrefix(false).create();
-    }
-
     private StandardOptionValueExceptionFactory() {
     }
 
@@ -63,17 +55,9 @@ final class StandardOptionValueExceptionFactory {
                 .formatArgumentsTransformer(mapper.apply(StandardArgumentsMapper.VALUE_AND_NAME));
     }
 
-    private static OptionValueExceptionFactory.Builder<JPackageException> forFixedMessage(UnaryOperator<ArgumentsMapper> mapper) {
-        return OptionValueExceptionFactory.build(JPackageException::new)
-                .formatArgumentsTransformer(mapper.apply(StandardArgumentsMapper.NONE));
-    }
-
     static final OptionValueExceptionFactory<JPackageException> ERROR_WITH_VALUE =
             forMessageWithOptionValue(UnaryOperator.identity()).create();
 
-    static final OptionValueExceptionFactory<JPackageException> ERROR_WITHOUT_CONTEXT =
-            forFixedMessage(UnaryOperator.identity()).create();
-
     static final OptionValueExceptionFactory<JPackageException> ERROR_WITH_VALUE_AND_OPTION_NAME =
             forMessageWithOptionValueAndName(UnaryOperator.identity()).create();
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
index 9e7dfc25de6..c61e60fe4ec 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
@@ -47,7 +47,6 @@ message.creating-app-bundle=Creating app package: {0} in {1}
 message.debug-working-directory=Kept working directory for debug: {0}
 message.bundle-created=Succeeded in building {0} package
 message.module-version=Using version "{0}" from module "{1}" as application version
-message.module-class=Using class "{0}" from module "{1}" as application main class
 
 message.error-header={0}
 message.advice-header=Advice to fix: {0}
@@ -58,7 +57,7 @@ error.version-string-invalid-component=Version [{0}] contains invalid component
 
 error.cannot-create-output-dir=Destination directory {0} cannot be created
 error.cannot-write-to-output-dir=Destination directory {0} is not writable
-error.root-exists=Error: Application destination directory {0} already exists
+error.root-exists=Application destination directory {0} already exists
 error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}
 error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest
 error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory
@@ -73,6 +72,7 @@ error.parameter-not-uuid=The value "{0}" provided for parameter {1} is not a val
 error.parameter-not-path=The value "{0}" provided for parameter {1} is not a valid path
 error.parameter-not-file=The value "{0}" provided for parameter {1} is not a file
 error.parameter-not-directory=The value "{0}" provided for parameter {1} is not a directory
+error.parameter-not-empty-directory=The value "{0}" provided for parameter {1} is not an empty directory or non existent path
 error.parameter-not-url=The value "{0}" provided for parameter {1} is not a valid URL
 error.parameter-not-launcher-shortcut-dir=The value "{0}" provided for parameter {1} is not a valid shortcut startup directory
 error.path-parameter-ioexception=I/O error accessing path value "{0}" of parameter {1}
@@ -101,33 +101,25 @@ error.blocked.option=jlink option [{0}] is not permitted in --jlink-options
 error.no.name=Name not specified with --name and cannot infer one from app-image
 error.no.name.advice=Specify name with --name
 
-error.missing-app-image-file=Error: "{0}" file is missing in the predefined app image "{1}"
-error.invalid-app-image-file=Error: "{0}" file in the predefined app image "{1}" is corrupted or was created by another version of jpackage
-error.malformed-app-image-file=Error: "{0}" file in the predefined app image "{1}" contains malformed XML data
-error.reading-app-image-file=Error: Failed to read "{0}" file in the predefined app image "{1}"
+error.missing-app-image-file="{0}" file is missing in the predefined app image "{1}"
+error.invalid-app-image-file="{0}" file in the predefined app image "{1}" is corrupted or was created by another version of jpackage
+error.malformed-app-image-file="{0}" file in the predefined app image "{1}" contains malformed XML data
+error.reading-app-image-file=Failed to read "{0}" file in the predefined app image "{1}"
 
 error.invalid-install-dir=Invalid installation directory "{0}"
 
-error.invalid-option-value=Invalid value "{0}" of option {1}
+ERR_NoMainClass=Main application class is missing
+ERR_UnsupportedOption=Option [{0}] is not valid on this platform
+ERR_InvalidTypeOption=Option [{0}] is not valid with type [{1}]
+ERR_NoInstallerEntryPoint=Option [{0}] is not valid without --module or --main-jar entry point option
+ERR_MutuallyExclusiveOptions=Mutually exclusive options [{0}] and [{1}]
+ERR_InvalidOptionWithAppImageSigning=Option [{0}] is not valid when signing application image
 
-ERR_NoMainClass=Error: Main application class is missing
-ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform
-ERR_InvalidTypeOption=Error: Option [{0}] is not valid with type [{1}]
-ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option
-ERR_MutuallyExclusiveOptions=Error: Mutually exclusive options [{0}] and [{1}]
-ERR_InvalidOptionWithAppImageSigning=Error: Option [{0}] is not valid when signing application image
-
-ERR_MissingArgument=Error: Missing argument: {0}
-ERR_MissingArgument2=Error: Missing argument: {0} or {1}
-ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
-ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>)
-ERR_InvalidAppName=Error: Invalid Application name: {0}
-ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}
-ERR_LicenseFileNotExit=Error: Specified license file does not exist
-ERR_BuildRootInvalid=Error: temp ({0}) must be non-existent or empty directory
-ERR_InvalidOption=Error: Invalid Option: [{0}]
-ERR_InvalidInstallerType=Error: Invalid or unsupported type: [{0}]
-ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options
-ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option
-ERR_CannotParseOptions=Error: Processing @filename option: {0}
-ERR_MissingJLinkOptMacAppStore=Error: --mac-app-store argument requires a {0} option for --jlink-options argument
+ERR_MissingArgument2=Missing argument: {0} or {1}
+ERR_InvalidAppName=Invalid Application name: {0}
+ERR_InvalidSLName=Invalid Add Launcher name: {0}
+ERR_InvalidOption=Invalid Option: [{0}]
+ERR_InvalidInstallerType=Invalid or unsupported type: [{0}]
+ERR_NoEntryPoint=creating application image requires --main-jar or --module Option
+ERR_CannotParseOptions=Processing @filename option: {0}
+ERR_MissingJLinkOptMacAppStore=--mac-app-store argument requires a {0} option for --jlink-options argument
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
index 50be1a0a1e5..1f485e6c6c8 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
@@ -26,7 +26,6 @@
 param.menu-group.default=Unknown
 
 resource.executable-properties-template=Template for creating executable properties file
-resource.setup-icon=setup dialog icon
 resource.post-msi-script=script to run after msi file for exe installer is created
 resource.wxl-file=WiX localization file
 resource.main-wix-file=Main WiX project file
@@ -60,12 +59,10 @@ message.potential.windows.defender.issue=Warning: Windows Defender may prevent j
 message.outputting-to-location=Generating EXE for installer to: {0}.
 message.output-location=Installer (.exe) saved to: {0}
 message.tool-version=Detected [{0}] version [{1}].
-message.creating-association-with-null-extension=Creating association with null extension.
 message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
 message.use-wix36-features=WiX {0} detected. Enabling advanced cleanup action.
 message.product-code=MSI ProductCode: {0}.
 message.upgrade-code=MSI UpgradeCode: {0}.
 message.preparing-msi-config=Preparing MSI config: {0}.
 message.generating-msi=Generating MSI: {0}.
-message.invalid.install.dir=Warning: Invalid install directory {0}. Install directory should be a relative sub-path under the default installation location such as "Program Files". Defaulting to application name "{1}".
 
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
index 4712adf15c1..53b726d8f1a 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
@@ -264,7 +264,7 @@ public class OptionsProcessorTest {
     @Test
     public void testMultipleCommandLineStructureAnalyzerErrors() {
         build().createAppImageByDefault().expectValidationErrors(
-                new JPackageException(I18N.format("ERR_BothMainJarAndModule")),
+                new JPackageException(I18N.format("ERR_MutuallyExclusiveOptions", "-m", "--main-jar")),
                 new JPackageException(I18N.format("ERR_MissingArgument2", "--runtime-image", "--module-path")),
                 new JPackageException(I18N.format("error.no-input-parameter"))
         ).validationErrorsOrdered(false).create("-m", "com.foo", "--main-jar", "main.jar").validate();
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
index 4f1dda06f68..0e7545bd83d 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
@@ -1,42 +1,42 @@
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 0.2]; errors=[message.version-string-first-number-not-zero, error.invalid-cfbundle-version.advice])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.2.3.4]; errors=[message.version-string-too-many-components, error.invalid-cfbundle-version.advice])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.]; errors=[error.version-string-zero-length-component+[1.]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.b.3]; errors=[error.version-string-invalid-component+[1.b.3, b.3]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, ]; errors=[error.version-string-empty])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --add-modules]; errors=[error.blocked.option+[--add-modules]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --foo]; errors=[error.jlink.failed+[Error: unknown option: --foo]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --module-path]; errors=[error.blocked.option+[--module-path]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --output]; errors=[error.blocked.option+[--output]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--main-jar, non-existent.jar]; errors=[error.main-jar-does-not-exist+[non-existent.jar]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[error.invalid-runtime-image-missing-file+[@@EMPTY_DIR@@, lib/**/libjli.dylib]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-del=[--main-class]; errors=[error.no-main-class-with-main-jar+[hello.jar], error.no-main-class-with-main-jar.advice+[hello.jar]])
-ErrorTest.test(IMAGE; args-add=[--module, com.foo.bar, --runtime-image, @@JAVA_HOME@@]; errors=[error.no-module-in-path+[com.foo.bar]])
-ErrorTest.test(IMAGE; args-add=[--module, java.base, --runtime-image, @@JAVA_HOME@@]; errors=[ERR_NoMainClass])
-ErrorTest.test(LINUX_DEB; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[error.deb-invalid-value-for-package-name+[#], error.deb-invalid-value-for-package-name.advice])
-ErrorTest.test(LINUX_RPM; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[error.rpm-invalid-value-for-package-name+[#], error.rpm-invalid-value-for-package-name.advice])
-ErrorTest.test(MAC_PKG; app-desc=Hello; args-add=[--mac-package-identifier, #1]; errors=[message.invalid-identifier+[#1]])
-ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--mac-app-store, --runtime-image, @@JAVA_HOME@@]; errors=[error.invalid-runtime-image-bin-dir+[@@JAVA_HOME@@], error.invalid-runtime-image-bin-dir.advice+[--mac-app-store]])
-ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[error.invalid-runtime-image-missing-file+[@@EMPTY_DIR@@, lib/**/libjli.dylib]])
-ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
-ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
-ErrorTest.test(NATIVE; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[error.invalid-runtime-image-missing-file+[@@EMPTY_DIR@@, lib/**/libjli.dylib]])
-ErrorTest.test(NATIVE; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
-ErrorTest.test(NATIVE; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[error.invalid-runtime-image-missing-file+[@@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
-ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.2.3.4.5]; errors=[error.msi-product-version-components+[1.2.3.4.5], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.2.65536]; errors=[error.msi-product-version-build-out-of-range+[1.2.65536], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.256]; errors=[error.msi-product-version-minor-out-of-range+[1.256], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1234]; errors=[error.msi-product-version-components+[1234], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[error.msi-product-version-major-out-of-range+[256.1], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--launcher-as-service]; errors=[error.missing-service-installer, error.missing-service-installer.advice])
-ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.2.3.4.5]; errors=[error.msi-product-version-components+[1.2.3.4.5], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.2.65536]; errors=[error.msi-product-version-build-out-of-range+[1.2.65536], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.256]; errors=[error.msi-product-version-minor-out-of-range+[1.256], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1234]; errors=[error.msi-product-version-components+[1234], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[error.msi-product-version-major-out-of-range+[256.1], error.version-string-wrong-format.advice])
-ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--launcher-as-service]; errors=[error.missing-service-installer, error.missing-service-installer.advice])
-ErrorTest.test(args-add=[@foo]; errors=[ERR_CannotParseOptions+[foo]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 0.2]; errors=[message.error-header+[message.version-string-first-number-not-zero], message.advice-header+[error.invalid-cfbundle-version.advice]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.2.3.4]; errors=[message.error-header+[message.version-string-too-many-components], message.advice-header+[error.invalid-cfbundle-version.advice]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.]; errors=[message.error-header+[error.version-string-zero-length-component, 1.]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.b.3]; errors=[message.error-header+[error.version-string-invalid-component, 1.b.3, b.3]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, ]; errors=[message.error-header+[error.version-string-empty]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --add-modules]; errors=[message.error-header+[error.blocked.option, --add-modules]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --foo]; errors=[message.error-header+[error.jlink.failed, Error: unknown option: --foo]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --module-path]; errors=[message.error-header+[error.blocked.option, --module-path]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --output]; errors=[message.error-header+[error.blocked.option, --output]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--main-jar, non-existent.jar]; errors=[message.error-header+[error.main-jar-does-not-exist, non-existent.jar]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@EMPTY_DIR@@, lib/**/libjli.dylib]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-del=[--main-class]; errors=[message.error-header+[error.no-main-class-with-main-jar, hello.jar], message.advice-header+[error.no-main-class-with-main-jar.advice, hello.jar]])
+ErrorTest.test(IMAGE; args-add=[--module, com.foo.bar, --runtime-image, @@JAVA_HOME@@]; errors=[message.error-header+[error.no-module-in-path, com.foo.bar]])
+ErrorTest.test(IMAGE; args-add=[--module, java.base, --runtime-image, @@JAVA_HOME@@]; errors=[message.error-header+[ERR_NoMainClass]])
+ErrorTest.test(LINUX_DEB; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[message.error-header+[error.deb-invalid-value-for-package-name, #], message.advice-header+[error.deb-invalid-value-for-package-name.advice]])
+ErrorTest.test(LINUX_RPM; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[message.error-header+[error.rpm-invalid-value-for-package-name, #], message.advice-header+[error.rpm-invalid-value-for-package-name.advice]])
+ErrorTest.test(MAC_PKG; app-desc=Hello; args-add=[--mac-package-identifier, #1]; errors=[message.error-header+[message.invalid-identifier, #1]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--mac-app-store, --runtime-image, @@JAVA_HOME@@]; errors=[message.error-header+[error.invalid-runtime-image-bin-dir, @@JAVA_HOME@@], message.advice-header+[error.invalid-runtime-image-bin-dir.advice, --mac-app-store]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@EMPTY_DIR@@, lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@EMPTY_DIR@@, lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
+ErrorTest.test(NATIVE; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.2.3.4.5]; errors=[message.error-header+[error.msi-product-version-components, 1.2.3.4.5], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.2.65536]; errors=[message.error-header+[error.msi-product-version-build-out-of-range, 1.2.65536], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1.256]; errors=[message.error-header+[error.msi-product-version-minor-out-of-range, 1.256], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 1234]; errors=[message.error-header+[error.msi-product-version-components, 1234], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[message.error-header+[error.msi-product-version-major-out-of-range, 256.1], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_EXE; app-desc=Hello; args-add=[--launcher-as-service]; errors=[message.error-header+[error.missing-service-installer], message.advice-header+[error.missing-service-installer.advice]])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.2.3.4.5]; errors=[message.error-header+[error.msi-product-version-components, 1.2.3.4.5], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.2.65536]; errors=[message.error-header+[error.msi-product-version-build-out-of-range, 1.2.65536], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1.256]; errors=[message.error-header+[error.msi-product-version-minor-out-of-range, 1.256], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1234]; errors=[message.error-header+[error.msi-product-version-components, 1234], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[message.error-header+[error.msi-product-version-major-out-of-range, 256.1], message.advice-header+[error.version-string-wrong-format.advice]])
+ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--launcher-as-service]; errors=[message.error-header+[error.missing-service-installer], message.advice-header+[error.missing-service-installer.advice]])
+ErrorTest.test(args-add=[@foo]; errors=[message.error-header+[ERR_CannotParseOptions, foo]])
 ErrorTest.testMacSigningIdentityValidation(IMAGE, --mac-app-image-sign-identity, true)
 ErrorTest.testMacSigningIdentityValidation(IMAGE, --mac-signing-key-user-name, false)
 ErrorTest.testMacSigningIdentityValidation(MAC_DMG, --mac-app-image-sign-identity, true)
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
index 20807952b72..b786f484cb4 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
@@ -164,14 +164,14 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var ex = assertThrowsExactly(JPackageException.class,
                 spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
-        assertEquals(I18N.format("ERR_BuildRootInvalid", tempRoot), ex.getMessage());
+        assertEquals(I18N.format("error.parameter-not-empty-directory", tempRoot, "--temp"), ex.getMessage());
         assertEquals(NotDirectoryException.class, ex.getCause().getClass());
 
         tempRoot = workDir;
 
         ex = assertThrowsExactly(JPackageException.class,
                 spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
-        assertEquals(I18N.format("ERR_BuildRootInvalid", tempRoot), ex.getMessage());
+        assertEquals(I18N.format("error.parameter-not-empty-directory", tempRoot, "--temp"), ex.getMessage());
         assertEquals(DirectoryNotEmptyException.class, ex.getCause().getClass());
     }
 
@@ -417,8 +417,8 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
                 buildAddLauncherTest().expect("foo", "some.properties"),
                 buildAddLauncherTest().expect("foo", "a/b/some.properties").expect("bar", "="),
                 buildAddLauncherTest().expect("a", "a.properties").expect("a", "b.properties"),
-                buildAddLauncherTest().optionValue("some").expectErrors(I18N.format("ERR_NoAddLauncherName")),
-                buildAddLauncherTest().optionValue("").expectErrors(I18N.format("ERR_NoAddLauncherName")),
+                buildAddLauncherTest().optionValue("some").expectErrors(I18N.format("error.parameter-add-launcher-malformed", "some", "--add-launcher")),
+                buildAddLauncherTest().optionValue("").expectErrors(I18N.format("error.parameter-add-launcher-malformed", "", "--add-launcher")),
                 buildAddLauncherTest().optionValue("=").expectErrors(I18N.format("ERR_InvalidSLName", "")),
                 buildAddLauncherTest().optionValue("a=").expectErrors(I18N.format("error.parameter-add-launcher-not-file", "", "a")),
                 buildAddLauncherTest().optionValue("=a").expectErrors(I18N.format("ERR_InvalidSLName", "")),
@@ -481,7 +481,8 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
                                 return List.of(I18N.format("error.properties-parameter-not-launcher-shortcut-dir",
                                         optionValue, option.getSpec().name().name(), DUMMY_PROPERTY_FILE));
                             } else {
-                                return List.of(I18N.format("error.invalid-option-value", optionValue, option.getSpec().name().formatForCommandLine()));
+                                return List.of(I18N.format("error.parameter-not-launcher-shortcut-dir",
+                                        optionValue, option.getSpec().name().formatForCommandLine()));
                             }
                         }), propertyFile, Optional.ofNullable(optionValue));
             }
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index 7dcd9f73d2d..958fe150711 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -410,7 +410,7 @@ public final class BasicTest {
         if (TestTempType.TEMPDIR_NOT_EMPTY.equals(type)) {
             pkgTest.setExpectedExitCode(1).addInitializer(cmd -> {
                 cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString(
-                        "ERR_BuildRootInvalid", cmd.getArgumentValue("--temp")));
+                        "error.parameter-not-empty-directory", cmd.getArgumentValue("--temp"), "--temp"));
             }).addBundleVerifier(cmd -> {
                 // Check jpackage didn't use the supplied directory.
                 Path tempDir = Path.of(cmd.getArgumentValue("--temp"));
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index 4395db77212..955c17e6043 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -27,6 +27,8 @@ import static jdk.internal.util.OperatingSystem.LINUX;
 import static jdk.internal.util.OperatingSystem.MACOS;
 import static jdk.internal.util.OperatingSystem.WINDOWS;
 import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+import static jdk.jpackage.test.JPackageCommand.makeAdvice;
+import static jdk.jpackage.test.JPackageCommand.makeError;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -39,6 +41,7 @@ import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.util.TokenReplace;
@@ -200,7 +203,7 @@ public final class ErrorTest {
     }
 
     public record TestSpec(Optional<PackageTypeSpec> type, Optional<String> appDesc, List<String> addArgs,
-            List<String> removeArgs, List<CannedFormattedString> expectedErrors) {
+            List<String> removeArgs, List<CannedFormattedString> expectedMessages) {
 
         static final class Builder {
 
@@ -265,26 +268,30 @@ public final class ErrorTest {
                 return removeArgs(List.of(v));
             }
 
-            Builder setErrors(List<CannedFormattedString> v) {
-                expectedErrors = v;
+            Builder setMessages(List<CannedFormattedString> v) {
+                expectedMessages = v;
                 return this;
             }
 
-            Builder setErrors(CannedFormattedString... v) {
-                return setErrors(List.of(v));
+            Builder setMessages(CannedFormattedString... v) {
+                return setMessages(List.of(v));
             }
 
-            Builder errors(List<CannedFormattedString> v) {
-                expectedErrors.addAll(v);
+            Builder messages(List<CannedFormattedString> v) {
+                expectedMessages.addAll(v);
                 return this;
             }
 
-            Builder errors(CannedFormattedString... v) {
-                return errors(List.of(v));
+            Builder messages(CannedFormattedString... v) {
+                return messages(List.of(v));
             }
 
             Builder error(String key, Object ... args) {
-                return errors(JPackageStringBundle.MAIN.cannedFormattedString(key, args));
+                return messages(makeError(JPackageStringBundle.MAIN.cannedFormattedString(key, args)));
+            }
+
+            Builder advice(String key, Object ... args) {
+                return messages(makeAdvice(JPackageStringBundle.MAIN.cannedFormattedString(key, args)));
             }
 
             Builder invalidTypeArg(String arg, String... otherArgs) {
@@ -298,14 +305,14 @@ public final class ErrorTest {
 
             TestSpec create() {
                 return new TestSpec(Optional.ofNullable(type), Optional.ofNullable(appDesc),
-                        List.copyOf(addArgs), List.copyOf(removeArgs), List.copyOf(expectedErrors));
+                        List.copyOf(addArgs), List.copyOf(removeArgs), List.copyOf(expectedMessages));
             }
 
             private PackageTypeSpec type = new PackageTypeSpec(PackageType.IMAGE);
             private String appDesc = DEFAULT_APP_DESC;
             private List<String> addArgs = new ArrayList<>();
             private List<String> removeArgs = new ArrayList<>();
-            private List<CannedFormattedString> expectedErrors = new ArrayList<>();
+            private List<CannedFormattedString> expectedMessages = new ArrayList<>();
         }
 
         public TestSpec {
@@ -315,7 +322,7 @@ public final class ErrorTest {
             addArgs.forEach(Objects::requireNonNull);
             Objects.requireNonNull(removeArgs);
             removeArgs.forEach(Objects::requireNonNull);
-            if (expectedErrors.isEmpty()) {
+            if (expectedMessages.isEmpty()) {
                 throw new IllegalArgumentException("The list of expected errors must be non-empty");
             }
         }
@@ -353,10 +360,14 @@ public final class ErrorTest {
                 cmd.clearArguments().addArguments(newArgs);
             }
 
-            defaultInit(cmd, expectedErrors);
+            defaultInit(cmd, expectedMessages);
             cmd.execute(1);
         }
 
+        TestSpec mapExpectedMessages(UnaryOperator<CannedFormattedString> mapper) {
+            return new TestSpec(type, appDesc, addArgs, removeArgs, expectedMessages.stream().map(mapper).toList());
+        }
+
         @Override
         public final String toString() {
             final var sb = new StringBuilder();
@@ -372,7 +383,7 @@ public final class ErrorTest {
             if (!removeArgs.isEmpty()) {
                 sb.append("args-del=").append(removeArgs).append("; ");
             }
-            sb.append("errors=").append(expectedErrors);
+            sb.append("errors=").append(expectedMessages);
             return sb.toString();
         }
 
@@ -395,7 +406,7 @@ public final class ErrorTest {
             // no main-class
             testSpec().removeArgs("--main-class")
                     .error("error.no-main-class-with-main-jar", "hello.jar")
-                    .error("error.no-main-class-with-main-jar.advice", "hello.jar"),
+                    .advice("error.no-main-class-with-main-jar.advice", "hello.jar"),
             // non-existent main jar
             testSpec().addArgs("--main-jar", "non-existent.jar")
                     .error("error.main-jar-does-not-exist", "non-existent.jar"),
@@ -404,7 +415,7 @@ public final class ErrorTest {
                     .error("error.parameter-not-directory", "non-existent.runtime", "--runtime-image"),
             // non-existent app image
             testSpec().noAppDesc().nativeType().addArgs("--name", "foo", "--app-image", "non-existent.appimage")
-                    .error("ERR_AppImageNotExist", "non-existent.appimage"),
+                    .error("error.parameter-not-directory", "non-existent.appimage", "--app-image"),
             // non-existent resource-dir
             testSpec().addArgs("--resource-dir", "non-existent.dir")
                     .error("error.parameter-not-directory", "non-existent.dir", "--resource-dir"),
@@ -413,7 +424,7 @@ public final class ErrorTest {
                     .error("error.parameter-not-file", "non-existent.icon", "--icon"),
             // non-existent license file
             testSpec().nativeType().addArgs("--license-file", "non-existent.license")
-                    .error("ERR_LicenseFileNotExit"),
+                    .error("error.parameter-not-file", "non-existent.license", "--license-file"),
             // invalid type
             testSpec().addArgs("--type", "invalid-type")
                     .error("ERR_InvalidInstallerType", "invalid-type"),
@@ -421,16 +432,13 @@ public final class ErrorTest {
             testSpec().removeArgs("--input").error("error.no-input-parameter"),
             // no --module-path
             testSpec().appDesc("com.other/com.other.Hello").removeArgs("--module-path")
-                    .error("ERR_MissingArgument", "--runtime-image or --module-path"),
+                    .error("ERR_MissingArgument2", "--runtime-image", "--module-path"),
             // no main class in module path
             testSpec().noAppDesc().addArgs("--module", "java.base", "--runtime-image", Token.JAVA_HOME.token())
                     .error("ERR_NoMainClass"),
             // no module in module path
             testSpec().noAppDesc().addArgs("--module", "com.foo.bar", "--runtime-image", Token.JAVA_HOME.token())
                     .error("error.no-module-in-path", "com.foo.bar"),
-            // --main-jar and --module-name
-            testSpec().noAppDesc().addArgs("--main-jar", "foo.jar", "--module", "foo.bar")
-                    .error("ERR_BothMainJarAndModule"),
             // non-existing argument file
             testSpec().noAppDesc().notype().addArgs("@foo")
                     .error("ERR_CannotParseOptions", "foo"),
@@ -439,6 +447,12 @@ public final class ErrorTest {
                     .error("error.jlink.failed", "Error: unknown option: --foo")
         ).map(TestSpec.Builder::create).toList());
 
+        // --main-jar and --module-name
+        createMutuallyExclusive(
+                new ArgumentGroup("--module", "foo.bar"),
+                new ArgumentGroup("--main-jar", "foo.jar")
+        ).map(TestSpec.Builder::noAppDesc).map(TestSpec.Builder::create).forEach(testCases::add);
+
         // forbidden jlink options
         testCases.addAll(Stream.of("--output", "--add-modules", "--module-path").map(opt -> {
             return testSpec().addArgs("--jlink-options", opt).error("error.blocked.option", opt);
@@ -533,13 +547,21 @@ public final class ErrorTest {
     public static void testAdditionLaunchers(TestSpec spec) {
         final Path propsFile = TKit.createTempFile("add-launcher.properties");
         TKit.createPropertiesFile(propsFile, Map.of());
-        spec.test(Map.of(Token.ADD_LAUNCHER_PROPERTY_FILE, cmd -> propsFile));
+        spec.mapExpectedMessages(cannedStr -> {
+            return cannedStr.mapArgs(arg -> {
+                if (arg == Token.ADD_LAUNCHER_PROPERTY_FILE) {
+                    return propsFile;
+                } else {
+                    return arg;
+                }
+            });
+        }).test(Map.of(Token.ADD_LAUNCHER_PROPERTY_FILE, cmd -> propsFile));
     }
 
     public static Collection<Object[]> testAdditionLaunchers() {
         return fromTestSpecBuilders(Stream.of(
             testSpec().addArgs("--add-launcher", Token.ADD_LAUNCHER_PROPERTY_FILE.token())
-                    .error("ERR_NoAddLauncherName"),
+                    .error("error.parameter-add-launcher-malformed", Token.ADD_LAUNCHER_PROPERTY_FILE, "--add-launcher"),
             testSpec().removeArgs("--name").addArgs("--name", "foo", "--add-launcher", "foo=" + Token.ADD_LAUNCHER_PROPERTY_FILE.token())
                     .error("error.launcher-duplicate-name", "foo")
         ));
@@ -577,24 +599,24 @@ public final class ErrorTest {
             return Stream.of(
                     testSpec().type(type).addArgs("--launcher-as-service")
                             .error("error.missing-service-installer")
-                            .error("error.missing-service-installer.advice"),
+                            .advice("error.missing-service-installer.advice"),
                     // The below version strings are invalid for msi and exe packaging.
                     // They are valid for app image packaging.
                     testSpec().type(type).addArgs("--app-version", "1234")
                             .error("error.msi-product-version-components", "1234")
-                            .error("error.version-string-wrong-format.advice"),
+                            .advice("error.version-string-wrong-format.advice"),
                     testSpec().type(type).addArgs("--app-version", "1.2.3.4.5")
                             .error("error.msi-product-version-components", "1.2.3.4.5")
-                            .error("error.version-string-wrong-format.advice"),
+                            .advice("error.version-string-wrong-format.advice"),
                     testSpec().type(type).addArgs("--app-version", "256.1")
                             .error("error.msi-product-version-major-out-of-range", "256.1")
-                            .error("error.version-string-wrong-format.advice"),
+                            .advice("error.version-string-wrong-format.advice"),
                     testSpec().type(type).addArgs("--app-version", "1.256")
                             .error("error.msi-product-version-minor-out-of-range", "1.256")
-                            .error("error.version-string-wrong-format.advice"),
+                            .advice("error.version-string-wrong-format.advice"),
                     testSpec().type(type).addArgs("--app-version", "1.2.65536")
                             .error("error.msi-product-version-build-out-of-range", "1.2.65536")
-                            .error("error.version-string-wrong-format.advice")
+                            .advice("error.version-string-wrong-format.advice")
             );
         }).flatMap(x -> x).map(TestSpec.Builder::create).toList());
 
@@ -610,10 +632,10 @@ public final class ErrorTest {
         testCases.addAll(Stream.of(
                 testSpec().addArgs("--app-version", "0.2")
                         .error("message.version-string-first-number-not-zero")
-                        .error("error.invalid-cfbundle-version.advice"),
+                        .advice("error.invalid-cfbundle-version.advice"),
                 testSpec().addArgs("--app-version", "1.2.3.4")
                         .error("message.version-string-too-many-components")
-                        .error("error.invalid-cfbundle-version.advice"),
+                        .advice("error.invalid-cfbundle-version.advice"),
                 testSpec().invalidTypeArg("--mac-installer-sign-identity", "foo"),
                 testSpec().type(PackageType.MAC_DMG).invalidTypeArg("--mac-installer-sign-identity", "foo"),
                 testSpec().invalidTypeArg("--mac-dmg-content", "foo"),
@@ -659,10 +681,10 @@ public final class ErrorTest {
         testCases.addAll(Stream.of(
                 testSpec().type(PackageType.LINUX_DEB).addArgs("--linux-package-name", "#")
                         .error("error.deb-invalid-value-for-package-name", "#")
-                        .error("error.deb-invalid-value-for-package-name.advice"),
+                        .advice("error.deb-invalid-value-for-package-name.advice"),
                 testSpec().type(PackageType.LINUX_RPM).addArgs("--linux-package-name", "#")
                         .error("error.rpm-invalid-value-for-package-name", "#")
-                        .error("error.rpm-invalid-value-for-package-name.advice")
+                        .advice("error.rpm-invalid-value-for-package-name.advice")
         ).map(TestSpec.Builder::create).toList());
 
         invalidShortcut(testCases::add, "--linux-shortcut");
@@ -683,12 +705,14 @@ public final class ErrorTest {
         final var signingId = "foo";
 
         final List<CannedFormattedString> errorMessages = new ArrayList<>();
-        errorMessages.add(JPackageStringBundle.MAIN.cannedFormattedString(
-                "error.cert.not.found", "Developer ID Application: " + signingId, ""));
+        errorMessages.add(makeError(JPackageStringBundle.MAIN.cannedFormattedString(
+                "error.cert.not.found", "Developer ID Application: " + signingId, "")));
         errorMessages.addAll(Stream.of(
-                "error.explicit-sign-no-cert",
-                "error.explicit-sign-no-cert.advice"
-        ).map(JPackageStringBundle.MAIN::cannedFormattedString).toList());
+                Map.<String, UnaryOperator<CannedFormattedString>>entry("error.explicit-sign-no-cert", JPackageCommand::makeError),
+                Map.<String, UnaryOperator<CannedFormattedString>>entry("error.explicit-sign-no-cert.advice", JPackageCommand::makeAdvice)
+        ).map(e -> {
+            return e.getValue().apply(JPackageStringBundle.MAIN.cannedFormattedString(e.getKey()));
+        }).toList());
 
         final var cmd = JPackageCommand.helloAppImage()
                 .ignoreDefaultVerbose(true)
@@ -725,21 +749,21 @@ public final class ErrorTest {
     private static void invalidShortcut(Consumer<TestSpec> accumulator, String shortcutOption) {
         Objects.requireNonNull(shortcutOption);
         Stream.of("true", "false", "").map(value -> {
-            return testSpec().nativeType().addArgs(shortcutOption, value).error("error.invalid-option-value", value, shortcutOption).create();
+            return testSpec().nativeType().addArgs(shortcutOption, value).error("error.parameter-not-launcher-shortcut-dir", value, shortcutOption).create();
         }).forEach(accumulator);
     }
 
     private static void macInvalidRuntime(Consumer<TestSpec> accumulator) {
-        var runtimeWithBinDirErr = JPackageStringBundle.MAIN.cannedFormattedString(
+        var runtimeWithBinDirErr = makeError(JPackageStringBundle.MAIN.cannedFormattedString(
                 "error.invalid-runtime-image-bin-dir", JPackageCommand.cannedArgument(cmd -> {
                     return Path.of(cmd.getArgumentValue("--runtime-image"));
-                }, Token.JAVA_HOME.token()));
-        var runtimeWithBinDirErrAdvice = JPackageStringBundle.MAIN.cannedFormattedString(
-                "error.invalid-runtime-image-bin-dir.advice", "--mac-app-store");
+                }, Token.JAVA_HOME.token())));
+        var runtimeWithBinDirErrAdvice = makeAdvice(JPackageStringBundle.MAIN.cannedFormattedString(
+                "error.invalid-runtime-image-bin-dir.advice", "--mac-app-store"));
 
         Stream.of(
                 testSpec().nativeType().addArgs("--mac-app-store", "--runtime-image", Token.JAVA_HOME.token())
-                        .errors(runtimeWithBinDirErr, runtimeWithBinDirErrAdvice)
+                        .messages(runtimeWithBinDirErr, runtimeWithBinDirErrAdvice)
         ).map(TestSpec.Builder::create).forEach(accumulator);
 
         Stream.of(
@@ -771,14 +795,14 @@ public final class ErrorTest {
         }
 
         TestSpec.Builder applyTo(TestSpec.Builder builder) {
-            return builder.addArgs("--runtime-image", runtimeDir.token()).errors(expectedErrorMsg());
+            return builder.addArgs("--runtime-image", runtimeDir.token()).messages(expectedErrorMsg());
         }
 
         private CannedFormattedString expectedErrorMsg() {
-            return JPackageStringBundle.MAIN.cannedFormattedString(
+            return makeError(JPackageStringBundle.MAIN.cannedFormattedString(
                     "error.invalid-runtime-image-missing-file", JPackageCommand.cannedArgument(cmd -> {
                         return Path.of(cmd.getArgumentValue("--runtime-image"));
-                    }, runtimeDir.token()), missingFile);
+                    }, runtimeDir.token()), missingFile));
         }
     }
 
@@ -849,7 +873,7 @@ public final class ErrorTest {
         );
     }
 
-    private static void defaultInit(JPackageCommand cmd, List<CannedFormattedString> expectedErrors) {
+    private static void defaultInit(JPackageCommand cmd, List<CannedFormattedString> expectedMessages) {
 
         // Disable default logic adding `--verbose` option
         // to jpackage command line.
@@ -860,7 +884,7 @@ public final class ErrorTest {
         // with jpackage arguments in this test.
         cmd.ignoreDefaultRuntime(true);
 
-        cmd.validateOutput(expectedErrors.toArray(CannedFormattedString[]::new));
+        cmd.validateOutput(expectedMessages.toArray(CannedFormattedString[]::new));
     }
 
     private static <T> Collection<Object[]> toTestArgs(Stream<T> stream) {
diff --git a/test/jdk/tools/jpackage/share/ModulePathTest.java b/test/jdk/tools/jpackage/share/ModulePathTest.java
index 06b30ec89e7..5e053fc0fae 100644
--- a/test/jdk/tools/jpackage/share/ModulePathTest.java
+++ b/test/jdk/tools/jpackage/share/ModulePathTest.java
@@ -126,7 +126,7 @@ public final class ModulePathTest {
             final CannedFormattedString expectedErrorMessage;
             if (modulePathArgs.isEmpty()) {
                 expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
-                        "ERR_MissingArgument", "--runtime-image or --module-path");
+                        "ERR_MissingArgument2", "--runtime-image", "--module-path");
             } else {
                 expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
                         "error.no-module-in-path", appDesc.moduleName());

From a091af1db34bc9e1646b687aad7704c3105d7ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Mon, 24 Nov 2025 15:10:54 +0000
Subject: [PATCH 319/512] 8371475: HttpClient: Implement CUBIC congestion
 controller

Reviewed-by: dfuchs
---
 .../quic/QuicBaseCongestionController.java    | 318 ++++++++++++++++++
 .../net/http/quic/QuicConnectionImpl.java     |  12 +-
 .../quic/QuicCubicCongestionController.java   | 170 ++++++++++
 .../jdk/internal/net/http/quic/QuicPacer.java |   2 -
 .../quic/QuicRenoCongestionController.java    | 267 +--------------
 .../H3MultipleConnectionsToSameHost.java      |  25 ++
 .../net/httpclient/http3/H3SimpleGet.java     |  12 +
 .../net/httpclient/http3/H3SimpleTest.java    |   7 +-
 .../java/net/httpclient/quic/CubicTest.java   | 213 ++++++++++++
 9 files changed, 764 insertions(+), 262 deletions(-)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicBaseCongestionController.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCubicCongestionController.java
 create mode 100644 test/jdk/java/net/httpclient/quic/CubicTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicBaseCongestionController.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicBaseCongestionController.java
new file mode 100644
index 00000000000..7dd3276f0d3
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicBaseCongestionController.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.net.http.quic;
+
+import jdk.internal.net.http.common.Deadline;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.TimeLine;
+import jdk.internal.net.http.common.TimeSource;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.quic.frames.AckFrame;
+import jdk.internal.net.http.quic.packets.QuicPacket;
+
+import java.util.Collection;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Implementation of the common parts of a QUIC congestion controller based on RFC 9002.
+ *
+ * This class implements the common parts of a congestion controller:
+ * - slow start
+ * - loss recovery
+ * - cooperation with pacer
+ *
+ * Subclasses implement congestion window growth in congestion avoidance phase.
+ *
+ * @spec https://www.rfc-editor.org/info/rfc9002
+ *      RFC 9002: QUIC Loss Detection and Congestion Control
+ */
+abstract class QuicBaseCongestionController implements QuicCongestionController {
+    // higher of 14720 and 2*maxDatagramSize; we use fixed maxDatagramSize
+    private static final int INITIAL_WINDOW = Math.max(14720, 2 * QuicConnectionImpl.DEFAULT_DATAGRAM_SIZE);
+    private static final int MAX_BYTES_IN_FLIGHT = Math.clamp(
+            Utils.getLongProperty("jdk.httpclient.quic.maxBytesInFlight", 1 << 24),
+            1 << 14, 1 << 24);
+    final TimeLine timeSource;
+    final String dbgTag;
+    final Lock lock = new ReentrantLock();
+    long congestionWindow = INITIAL_WINDOW;
+    int maxDatagramSize = QuicConnectionImpl.DEFAULT_DATAGRAM_SIZE;
+    int minimumWindow = 2 * maxDatagramSize;
+    long bytesInFlight;
+    // maximum bytes in flight seen since the last congestion event
+    long maxBytesInFlight;
+    Deadline congestionRecoveryStartTime;
+    long ssThresh = Long.MAX_VALUE;
+
+    private final QuicPacer pacer;
+
+    QuicBaseCongestionController(String dbgTag, QuicRttEstimator rttEstimator) {
+        this(dbgTag, TimeSource.source(), rttEstimator);
+    }
+
+    // Allows to pass a custom timeline for testing
+    QuicBaseCongestionController(String dbgTag, TimeLine source, QuicRttEstimator rttEstimator) {
+        this.dbgTag = dbgTag;
+        this.timeSource = source;
+        this.pacer = new QuicPacer(rttEstimator, this);
+    }
+
+    boolean inCongestionRecovery(Deadline sentTime) {
+        return (congestionRecoveryStartTime != null &&
+                !sentTime.isAfter(congestionRecoveryStartTime));
+    }
+
+    abstract void onCongestionEvent(Deadline sentTime);
+
+    private static boolean inFlight(QuicPacket packet) {
+        // packet is in flight if it contains anything other than a single ACK frame
+        // specifically, a packet containing padding is considered to be in flight.
+        return packet.frames().size() != 1 ||
+                !(packet.frames().get(0) instanceof AckFrame);
+    }
+
+    @Override
+    public boolean canSendPacket() {
+        lock.lock();
+        try {
+            if (bytesInFlight >= MAX_BYTES_IN_FLIGHT) {
+                return false;
+            }
+            if (isCwndLimited() || isPacerLimited()) {
+                return false;
+            }
+            return true;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void updateMaxDatagramSize(int newSize) {
+        lock.lock();
+        try {
+            if (minimumWindow != newSize * 2) {
+                minimumWindow = newSize * 2;
+                maxDatagramSize = newSize;
+                congestionWindow = Math.max(congestionWindow, minimumWindow);
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void packetSent(int packetBytes) {
+        lock.lock();
+        try {
+            bytesInFlight += packetBytes;
+            if (bytesInFlight > maxBytesInFlight) {
+                maxBytesInFlight = bytesInFlight;
+            }
+            pacer.packetSent(packetBytes);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void packetAcked(int packetBytes, Deadline sentTime) {
+        lock.lock();
+        try {
+            long oldWindow = congestionWindow;
+            assert oldWindow >= minimumWindow :
+                    "Congestion window lower than minimum: %s < %s".formatted(oldWindow, minimumWindow);
+            bytesInFlight -= packetBytes;
+            // RFC 9002 says we should not increase cwnd when application limited.
+            // The concept itself is poorly defined.
+            // Here we limit cwnd growth based on the maximum bytes in flight
+            // observed since the last congestion event
+            if (inCongestionRecovery(sentTime)) {
+                if (Log.quicCC() && Log.trace()) {
+                    Log.logQuic(dbgTag + " Acked, in recovery: bytes: " + packetBytes +
+                            ", in flight: " + bytesInFlight);
+                }
+                return;
+            }
+            boolean isAppLimited;
+            if (congestionWindow < ssThresh) {
+                isAppLimited = congestionWindow >= 2 * maxBytesInFlight;
+                if (!isAppLimited) {
+                    congestionWindow += packetBytes;
+                }
+            } else {
+                isAppLimited = congestionAvoidanceAcked(packetBytes, sentTime);
+            }
+            if (Log.quicCC() && Log.trace()) {
+                if (isAppLimited) {
+                    Log.logQuic(dbgTag + " Acked, not blocked: bytes: " + packetBytes +
+                            ", in flight: " + bytesInFlight);
+                } else {
+                    Log.logQuic(dbgTag + " Acked, increased: bytes: " + packetBytes +
+                            ", in flight: " + bytesInFlight +
+                            ", new cwnd:" + congestionWindow);
+                }
+            }
+            assert congestionWindow >= oldWindow :
+                    "Window size decreased on ACK: %s to %s".formatted(oldWindow, congestionWindow);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    abstract boolean congestionAvoidanceAcked(int packetBytes, Deadline sentTime);
+
+    @Override
+    public void packetLost(Collection<QuicPacket> lostPackets, Deadline sentTime, boolean persistent) {
+        lock.lock();
+        try {
+            for (QuicPacket packet : lostPackets) {
+                if (inFlight(packet)) {
+                    bytesInFlight -= packet.size();
+                }
+            }
+            onCongestionEvent(sentTime);
+            if (persistent) {
+                congestionWindow = minimumWindow;
+                congestionRecoveryStartTime = null;
+                if (Log.quicCC()) {
+                    Log.logQuic(dbgTag + " Persistent congestion: ssThresh: " + ssThresh +
+                            ", in flight: " + bytesInFlight +
+                            ", cwnd:" + congestionWindow);
+                }
+            }
+            assert congestionWindow >= minimumWindow :
+                    "Congestion window lower than minimum: %s < %s".formatted(congestionWindow, minimumWindow);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void packetDiscarded(Collection<QuicPacket> discardedPackets) {
+        lock.lock();
+        try {
+            for (QuicPacket packet : discardedPackets) {
+                if (inFlight(packet)) {
+                    bytesInFlight -= packet.size();
+                }
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public long congestionWindow() {
+        lock.lock();
+        try {
+            return congestionWindow;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public long initialWindow() {
+        lock.lock();
+        try {
+            return Math.max(14720, 2 * maxDatagramSize);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public long maxDatagramSize() {
+        lock.lock();
+        try {
+            return maxDatagramSize;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public boolean isSlowStart() {
+        lock.lock();
+        try {
+            return congestionWindow < ssThresh;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void updatePacer(Deadline now) {
+        lock.lock();
+        try {
+            pacer.updateQuota(now);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public boolean isPacerLimited() {
+        lock.lock();
+        try {
+            return !pacer.canSend();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public boolean isCwndLimited() {
+        lock.lock();
+        try {
+            return congestionWindow - bytesInFlight < maxDatagramSize;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public Deadline pacerDeadline() {
+        lock.lock();
+        try {
+            return pacer.twoPacketDeadline();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void appLimited() {
+        lock.lock();
+        try {
+            pacer.appLimited();
+        } finally {
+            lock.unlock();
+        }
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index 7ebe09e008e..d90ad1b217e 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -334,7 +334,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
         this.connectionId = this.endpoint.idFactory().newConnectionId();
         this.logTag = logTagFormat.formatted(labelId);
         this.dbgTag = dbgTag(quicInstance, logTag);
-        this.congestionController = new QuicRenoCongestionController(dbgTag, rttEstimator);
+        this.congestionController = createCongestionController(dbgTag, rttEstimator);
         this.originalVersion = this.quicVersion = firstFlightVersion == null
                 ? QuicVersion.firstFlightVersion(quicInstance.getAvailableVersions())
                 : firstFlightVersion;
@@ -366,6 +366,16 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
         if (debug.on()) debug.log("Quic Connection Created");
     }
 
+    private static QuicCongestionController createCongestionController
+            (String dbgTag, QuicRttEstimator rttEstimator) {
+        String algo = System.getProperty("jdk.internal.httpclient.quic.congestionController", "cubic");
+        if (algo.equalsIgnoreCase("reno")) {
+            return new QuicRenoCongestionController(dbgTag, rttEstimator);
+        } else {
+            return new QuicCubicCongestionController(dbgTag, rttEstimator);
+        }
+    }
+
     @Override
     public final long uniqueId() {
         return labelId;
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCubicCongestionController.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCubicCongestionController.java
new file mode 100644
index 00000000000..a7a1cd0c0bc
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicCubicCongestionController.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.net.http.quic;
+
+import jdk.internal.net.http.common.Deadline;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.TimeLine;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Implementation of the CUBIC congestion controller
+ * based on RFC 9438.
+ *
+ * @spec https://www.rfc-editor.org/rfc/rfc9438.html
+ *       RFC 9438: CUBIC for Fast and Long-Distance Networks
+ */
+public final class QuicCubicCongestionController extends QuicBaseCongestionController {
+
+    public static final double BETA = 0.7;
+    public static final double ALPHA = 3 * (1 - BETA) / (1 + BETA);
+    private static final double C = 0.4;
+    private final QuicRttEstimator rttEstimator;
+    // Cubic curve inflection point, in bytes
+    private long wMaxBytes;
+    // cwnd before the most recent congestion event
+    private long cwndPriorBytes;
+    // "t" from RFC 9438
+    private long timeNanos;
+    // "K" from RFC 9438
+    private long kNanos;
+    // estimate for the Reno-friendly congestion window
+    private long wEstBytes;
+    // the most recent time when the congestion window was filled
+    private Deadline lastFullWindow;
+
+    public QuicCubicCongestionController(String dbgTag, QuicRttEstimator rttEstimator) {
+        super(dbgTag, rttEstimator);
+        this.rttEstimator = rttEstimator;
+    }
+
+    // for testing
+    public QuicCubicCongestionController(TimeLine source, QuicRttEstimator rttEstimator) {
+        super("TEST", source, rttEstimator);
+        this.rttEstimator = rttEstimator;
+    }
+
+    @Override
+    public void packetSent(int packetBytes) {
+        lock.lock();
+        try {
+            super.packetSent(packetBytes);
+            if (isCwndLimited()) {
+                Deadline now = timeSource.instant();
+                if (lastFullWindow == null) {
+                    lastFullWindow = now;
+                } else {
+                    long timePassedNanos = Deadline.between(lastFullWindow, now).toNanos();
+                    if (timePassedNanos > 0) {
+                        /* "The elapsed time MUST NOT include periods during which cwnd
+                           has not been updated due to application-limited behavior"
+                           "A flow is application limited if it is currently sending less
+                            than what is allowed by the congestion window."
+
+                           We are sending asynchronously; one thread is sending data,
+                           a separate thread is processing the acknowledgements.
+                           We can't rely on cwnd being fully utilized when we process an ack, because
+                           most of the time it won't be.
+
+                           Instead, we assume that if we filled the cwnd, we were not application-limited
+                           in the last RTT (which is a pretty good approximation because of pacing),
+                           and acknowledgements for all packets sent prior to filling the cwnd
+                           count towards cwnd increase.
+                         */
+                        long rttNanos = TimeUnit.MICROSECONDS.toNanos(rttEstimator.state().smoothedRttMicros());
+                        timeNanos += Math.min(timePassedNanos, rttNanos);
+                        lastFullWindow = now;
+                    }
+                }
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+
+    boolean congestionAvoidanceAcked(int packetBytes, Deadline sentTime) {
+        boolean isAppLimited = sentTime.isAfter(lastFullWindow);
+        if (!isAppLimited) {
+            if (wEstBytes < cwndPriorBytes) {
+                wEstBytes += Math.max((long) (ALPHA * maxDatagramSize * packetBytes / congestionWindow), 1);
+            } else {
+                wEstBytes += Math.max((long)maxDatagramSize * packetBytes / congestionWindow, 1);
+            }
+            // target = Wcubic(t + RTT)
+            long rttNanos = TimeUnit.MICROSECONDS.toNanos(rttEstimator.state().smoothedRttMicros());
+            double dblTargetBytes = wCubicBytes(timeNanos + rttNanos);
+            assert dblTargetBytes > 0 : "Unexpected negative target bytes";
+            long targetBytes = (long) Math.min(dblTargetBytes, 1.5 * congestionWindow);
+            if (targetBytes > congestionWindow) {
+                long oldWindow = congestionWindow;
+                congestionWindow += Math.max((targetBytes - congestionWindow) * packetBytes / congestionWindow, 1L);
+                assert congestionWindow > oldWindow :
+                        "Window size decreased: %s to %s".formatted(oldWindow, congestionWindow);
+            }
+            if (wEstBytes > congestionWindow) {
+                congestionWindow = wEstBytes;
+            }
+        }
+        return isAppLimited;
+    }
+
+    // Wcubic(t) = C * (t-K [seconds])^3 + Wmax (segments)
+    private double wCubicBytes(long timeNanos) {
+        return (C * maxDatagramSize * Math.pow((timeNanos - kNanos) / 1e9, 3)) + wMaxBytes;
+    }
+
+    void onCongestionEvent(Deadline sentTime) {
+        if (inCongestionRecovery(sentTime)) {
+            return;
+        }
+        if (congestionWindow < wMaxBytes) {
+            // fast convergence
+            wMaxBytes = (long) ((1 + BETA) * congestionWindow / 2);
+        } else {
+            wMaxBytes = congestionWindow;
+        }
+        cwndPriorBytes = congestionWindow;
+        congestionRecoveryStartTime = timeSource.instant();
+        ssThresh = (long)(congestionWindow * BETA);
+        wEstBytes = congestionWindow = Math.max(minimumWindow, ssThresh);
+        maxBytesInFlight = 0;
+        timeNanos = 0;
+        // set lastFullWindow to prevent rapid timeNanos growth
+        lastFullWindow = congestionRecoveryStartTime;
+        // ((wmax_segments - cwnd_segments) / C) ^ (1/3) seconds
+        kNanos = (long)(Math.cbrt((wMaxBytes - congestionWindow) / C / maxDatagramSize) * 1_000_000_000);
+        // kNanos may be negative if we reduced the window below minimum,
+        // and fast convergence was used. This is acceptable.
+        if (Log.quicCC()) {
+            Log.logQuic(dbgTag + " Congestion: ssThresh: " + ssThresh +
+                    ", in flight: " + bytesInFlight +
+                    ", cwnd:" + congestionWindow +
+                    ", K: " + TimeUnit.NANOSECONDS.toMillis(kNanos) + " ms");
+        }
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java
index 0ba7d78038b..50d8485785f 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacer.java
@@ -30,10 +30,8 @@ import jdk.internal.net.http.common.Log;
 import jdk.internal.net.http.common.Utils;
 import jdk.internal.util.OperatingSystem;
 
-import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Implementation of pacing.
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java
index ff51aafc131..2594c00055f 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicRenoCongestionController.java
@@ -27,15 +27,6 @@ package jdk.internal.net.http.quic;
 
 import jdk.internal.net.http.common.Deadline;
 import jdk.internal.net.http.common.Log;
-import jdk.internal.net.http.common.TimeLine;
-import jdk.internal.net.http.common.TimeSource;
-import jdk.internal.net.http.common.Utils;
-import jdk.internal.net.http.quic.frames.AckFrame;
-import jdk.internal.net.http.quic.packets.QuicPacket;
-
-import java.util.Collection;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Implementation of QUIC congestion controller based on RFC 9002.
@@ -46,38 +37,20 @@ import java.util.concurrent.locks.ReentrantLock;
  * @spec https://www.rfc-editor.org/info/rfc9002
  *      RFC 9002: QUIC Loss Detection and Congestion Control
  */
-class QuicRenoCongestionController implements QuicCongestionController {
-    // higher of 14720 and 2*maxDatagramSize; we use fixed maxDatagramSize
-    private static final int INITIAL_WINDOW = Math.max(14720, 2 * QuicConnectionImpl.DEFAULT_DATAGRAM_SIZE);
-    private static final int MAX_BYTES_IN_FLIGHT = Math.clamp(
-            Utils.getLongProperty("jdk.httpclient.quic.maxBytesInFlight", 1 << 24),
-            1 << 14, 1 << 24);
-    private final TimeLine timeSource;
-    private final String dbgTag;
-    private final Lock lock = new ReentrantLock();
-    private long congestionWindow = INITIAL_WINDOW;
-    private int maxDatagramSize = QuicConnectionImpl.DEFAULT_DATAGRAM_SIZE;
-    private int minimumWindow = 2 * maxDatagramSize;
-    private long bytesInFlight;
-    // maximum bytes in flight seen since the last congestion event
-    private long maxBytesInFlight;
-    private Deadline congestionRecoveryStartTime;
-    private long ssThresh = Long.MAX_VALUE;
-
-    private final QuicPacer pacer;
-
+final class QuicRenoCongestionController extends QuicBaseCongestionController {
     public QuicRenoCongestionController(String dbgTag, QuicRttEstimator rttEstimator) {
-        this.dbgTag = dbgTag;
-        this.timeSource = TimeSource.source();
-        this.pacer = new QuicPacer(rttEstimator, this);
+        super(dbgTag, rttEstimator);
     }
 
-    private boolean inCongestionRecovery(Deadline sentTime) {
-        return (congestionRecoveryStartTime != null &&
-                !sentTime.isAfter(congestionRecoveryStartTime));
+    boolean congestionAvoidanceAcked(int packetBytes, Deadline sentTime) {
+        boolean isAppLimited = congestionWindow > maxBytesInFlight + 2L * maxDatagramSize;
+        if (!isAppLimited) {
+            congestionWindow += Math.max((long) maxDatagramSize * packetBytes / congestionWindow, 1L);
+        }
+        return isAppLimited;
     }
 
-    private void onCongestionEvent(Deadline sentTime) {
+    void onCongestionEvent(Deadline sentTime) {
         if (inCongestionRecovery(sentTime)) {
             return;
         }
@@ -91,226 +64,4 @@ class QuicRenoCongestionController implements QuicCongestionController {
                     ", cwnd:" + congestionWindow);
         }
     }
-
-    private static boolean inFlight(QuicPacket packet) {
-        // packet is in flight if it contains anything other than a single ACK frame
-        // specifically, a packet containing padding is considered to be in flight.
-        return packet.frames().size() != 1 ||
-                !(packet.frames().get(0) instanceof AckFrame);
-    }
-
-    @Override
-    public boolean canSendPacket() {
-        lock.lock();
-        try {
-            if (bytesInFlight >= MAX_BYTES_IN_FLIGHT) {
-                return false;
-            }
-            if (isCwndLimited() || isPacerLimited()) {
-                return false;
-            }
-            return true;
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void updateMaxDatagramSize(int newSize) {
-        lock.lock();
-        try {
-            if (minimumWindow != newSize * 2) {
-                minimumWindow = newSize * 2;
-                maxDatagramSize = newSize;
-                congestionWindow = Math.max(congestionWindow, minimumWindow);
-            }
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void packetSent(int packetBytes) {
-        lock.lock();
-        try {
-            bytesInFlight += packetBytes;
-            if (bytesInFlight > maxBytesInFlight) {
-                maxBytesInFlight = bytesInFlight;
-            }
-            pacer.packetSent(packetBytes);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void packetAcked(int packetBytes, Deadline sentTime) {
-        lock.lock();
-        try {
-            bytesInFlight -= packetBytes;
-            // RFC 9002 says we should not increase cwnd when application limited.
-            // The concept itself is poorly defined.
-            // Here we limit cwnd growth based on the maximum bytes in flight
-            // observed since the last congestion event
-            if (inCongestionRecovery(sentTime)) {
-                if (Log.quicCC() && Log.trace()) {
-                    Log.logQuic(dbgTag + " Acked, in recovery: bytes: " + packetBytes +
-                            ", in flight: " + bytesInFlight);
-                }
-                return;
-            }
-            boolean isAppLimited;
-            if (congestionWindow < ssThresh) {
-                isAppLimited = congestionWindow >= 2 * maxBytesInFlight;
-                if (!isAppLimited) {
-                    congestionWindow += packetBytes;
-                }
-            } else {
-                isAppLimited = congestionWindow > maxBytesInFlight + 2L * maxDatagramSize;
-                if (!isAppLimited) {
-                    congestionWindow += Math.max((long) maxDatagramSize * packetBytes / congestionWindow, 1L);
-                }
-            }
-            if (Log.quicCC() && Log.trace()) {
-                if (isAppLimited) {
-                    Log.logQuic(dbgTag + " Acked, not blocked: bytes: " + packetBytes +
-                            ", in flight: " + bytesInFlight);
-                } else {
-                    Log.logQuic(dbgTag + " Acked, increased: bytes: " + packetBytes +
-                            ", in flight: " + bytesInFlight +
-                            ", new cwnd:" + congestionWindow);
-                }
-            }
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void packetLost(Collection<QuicPacket> lostPackets, Deadline sentTime, boolean persistent) {
-        lock.lock();
-        try {
-            for (QuicPacket packet : lostPackets) {
-                if (inFlight(packet)) {
-                    bytesInFlight -= packet.size();
-                }
-            }
-            onCongestionEvent(sentTime);
-            if (persistent) {
-                congestionWindow = minimumWindow;
-                congestionRecoveryStartTime = null;
-                if (Log.quicCC()) {
-                    Log.logQuic(dbgTag + " Persistent congestion: ssThresh: " + ssThresh +
-                            ", in flight: " + bytesInFlight +
-                            ", cwnd:" + congestionWindow);
-                }
-            }
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void packetDiscarded(Collection<QuicPacket> discardedPackets) {
-        lock.lock();
-        try {
-            for (QuicPacket packet : discardedPackets) {
-                if (inFlight(packet)) {
-                    bytesInFlight -= packet.size();
-                }
-            }
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public long congestionWindow() {
-        lock.lock();
-        try {
-            return congestionWindow;
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public long initialWindow() {
-        lock.lock();
-        try {
-            return Math.max(14720, 2 * maxDatagramSize);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public long maxDatagramSize() {
-        lock.lock();
-        try {
-            return maxDatagramSize;
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public boolean isSlowStart() {
-        lock.lock();
-        try {
-            return congestionWindow < ssThresh;
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void updatePacer(Deadline now) {
-        lock.lock();
-        try {
-            pacer.updateQuota(now);
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public boolean isPacerLimited() {
-        lock.lock();
-        try {
-            return !pacer.canSend();
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public boolean isCwndLimited() {
-        lock.lock();
-        try {
-            return congestionWindow - bytesInFlight < maxDatagramSize;
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public Deadline pacerDeadline() {
-        lock.lock();
-        try {
-            return pacer.twoPacketDeadline();
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void appLimited() {
-        lock.lock();
-        try {
-            pacer.appLimited();
-        } finally {
-            lock.unlock();
-        }
-    }
 }
diff --git a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
index 45024c58e1f..34d5163760f 100644
--- a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
+++ b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
@@ -94,6 +94,31 @@
  *          limit is artificially low, in order to cause concurrent connections
  *          to the same host to be created, with non-blocking IO and selector
  */
+/*
+ * @test id=reno-cc
+ * @bug 8087112
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.http2.Http2TestServer
+ * @run testng/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
+ *                     -Djdk.httpclient.quic.idleTimeout=120
+ *                     -Djdk.httpclient.keepalive.timeout.h3=120
+ *                     -Djdk.test.server.quic.idleTimeout=90
+ *                     -Djdk.httpclient.quic.minPtoBackoffTime=60
+ *                     -Djdk.httpclient.quic.maxPtoBackoffTime=120
+ *                     -Djdk.httpclient.quic.maxPtoBackoff=9
+ *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
+ *                     -Djdk.httpclient.quic.maxEndpoints=1
+ *                     -Djdk.httpclient.quic.maxBidiStreams=2
+ *                     -Djdk.httpclient.retryOnStreamlimit=50
+ *                     -Djdk.httpclient.HttpClient.log=errors,http3,quic:hs:retransmit
+ *                     -Dsimpleget.requests=100
+ *                     -Djdk.internal.httpclient.quic.congestionController=reno
+ *                     H3MultipleConnectionsToSameHost
+ * @summary Send 100 large concurrent requests, with connections whose max stream
+ *          limit is artificially low, in order to cause concurrent connections
+ *          to the same host to be created, with Reno congestion controller
+ */
 
 // Interesting additional settings for debugging and manual testing:
 // -----------------------------------------------------------------
diff --git a/test/jdk/java/net/httpclient/http3/H3SimpleGet.java b/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
index e75ad04263a..fe0217e64b6 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
@@ -148,6 +148,18 @@
  *                      H3SimpleGet
  */
 
+/*
+ * @test id=reno-cc
+ * @bug 8087112
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
+ *        jdk.httpclient.test.lib.http2.Http2TestServer
+ * @run testng/othervm/timeout=480 -Djdk.internal.httpclient.quic.congestionController=reno
+ *                     H3SimpleGet
+ * @summary send multiple GET requests using Reno congestion controller
+ */
+
+
 // Interesting additional settings for debugging and manual testing:
 // -----------------------------------------------------------------
 // -Djdk.httpclient.HttpClient.log=requests,errors,quic:retransmit:control,http3
diff --git a/test/jdk/java/net/httpclient/http3/H3SimpleTest.java b/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
index 73c766f1eab..8531f10bea7 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
@@ -46,7 +46,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  * @test
  * @summary Basic test to verify that simple GET/POST/HEAD
  *          requests work as expected with HTTP/3, using IPv4
- *          or IPv6
+ *          or IPv6, using CUBIC or Reno
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
@@ -64,6 +64,11 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *              -Djava.net.preferIPv4Stack=true
  *              H3SimpleTest
+ * @run testng/othervm
+ *              -Djdk.internal.httpclient.debug=true
+ *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
+ *              -Djdk.internal.httpclient.quic.congestionController=reno
+ *              H3SimpleTest
  */
 // -Djava.security.debug=all
 public class H3SimpleTest implements HttpServerAdapters {
diff --git a/test/jdk/java/net/httpclient/quic/CubicTest.java b/test/jdk/java/net/httpclient/quic/CubicTest.java
new file mode 100644
index 00000000000..f4b08e6d9b7
--- /dev/null
+++ b/test/jdk/java/net/httpclient/quic/CubicTest.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.internal.net.http.common.Deadline;
+import jdk.internal.net.http.common.TimeLine;
+import jdk.internal.net.http.quic.*;
+import jdk.internal.net.http.quic.frames.PaddingFrame;
+import jdk.internal.net.http.quic.frames.QuicFrame;
+import jdk.internal.net.http.quic.packets.QuicPacket;
+import org.junit.jupiter.api.Test;
+
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
+import java.util.List;
+
+import static jdk.internal.net.http.quic.QuicCubicCongestionController.ALPHA;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/*
+ * @test
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=trace,quic:cc CubicTest
+ */
+public class CubicTest {
+    static class TimeSource implements TimeLine {
+        final Deadline first = jdk.internal.net.http.common.TimeSource.now();
+        volatile Deadline current = first;
+        public synchronized Deadline advance(long duration, TemporalUnit unit) {
+            return current = current.plus(duration, unit);
+        }
+        public Deadline advanceMillis(long millis) {
+            return advance(millis, ChronoUnit.MILLIS);
+        }
+        @Override
+        public Deadline instant() {
+            return current;
+        }
+    }
+
+    private final TimeSource timeSource = new TimeSource();
+
+    private class TestQuicPacket implements QuicPacket {
+        private final int size;
+
+        public TestQuicPacket(int size) {
+            this.size = size;
+        }
+
+        @Override
+        public List<QuicFrame> frames() {
+            // fool congestion controller that this packet is in flight
+            return List.of(new PaddingFrame(1));
+        }
+
+        @Override
+        public QuicConnectionId destinationId() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public PacketNumberSpace numberSpace() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public int size() {
+            return size;
+        }
+
+        @Override
+        public HeadersType headersType() {
+            throw new AssertionError("Should not come here");
+        }
+
+        @Override
+        public PacketType packetType() {
+            throw new AssertionError("Should not come here");
+        }
+    }
+
+    @Test
+    public void testReduction() {
+        System.err.println("***** testReduction *****");
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1, 0, Deadline.MIN);
+        QuicCongestionController cc = new QuicCubicCongestionController(timeSource, rtt);
+        int packetSize = (int) cc.maxDatagramSize();
+        assertEquals(cc.initialWindow(), cc.congestionWindow(), "Unexpected starting congestion window");
+        do {
+            cc.packetSent(packetSize);
+            // reduce to 70% of the last value, but not below 2*SMSS
+            long newCongestionWindow = Math.max((long) (QuicCubicCongestionController.BETA * cc.congestionWindow()), 2 * packetSize);
+            cc.packetLost(List.of(new TestQuicPacket(packetSize)), Deadline.MAX, false);
+            assertEquals(newCongestionWindow, cc.congestionWindow(), "Unexpected reduced congestion window");
+        } while (cc.congestionWindow() > 2 * packetSize);
+    }
+
+    @Test
+    public void testAppLimited() {
+        System.err.println("***** testAppLimited *****");
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1, 0, Deadline.MIN);
+        QuicCongestionController cc = new QuicCubicCongestionController(timeSource, rtt);
+        int packetSize = (int) cc.maxDatagramSize();
+        assertEquals(cc.initialWindow(), cc.congestionWindow(), "Unexpected starting congestion window");
+        cc.packetSent(packetSize);
+        long newCongestionWindow = (long) (QuicCubicCongestionController.BETA * cc.congestionWindow());
+        // lose packet to exit slow start
+        cc.packetLost(List.of(new TestQuicPacket(packetSize)), Deadline.MAX, false);
+        assertEquals(newCongestionWindow, cc.congestionWindow(), "Unexpected reduced congestion window");
+        Deadline sentTime = timeSource.instant().plus(1, ChronoUnit.NANOS);
+        // congestion window should not increase when sender is app-limited
+        cc.packetSent(packetSize);
+        cc.packetAcked(packetSize, sentTime);
+        assertEquals(newCongestionWindow, cc.congestionWindow(), "Unexpected congestion window change");
+    }
+
+    @Test
+    public void testRenoFriendly() {
+        System.err.println("***** testRenoFriendly *****");
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1, 0, Deadline.MIN);
+        QuicCongestionController cc = new QuicCubicCongestionController(timeSource, rtt);
+        int packetSize = (int) cc.maxDatagramSize();
+        assertEquals(cc.initialWindow(), cc.congestionWindow(), "Unexpected starting congestion window");
+        int startingWindow = (int) cc.congestionWindow();
+        // lose packet to exit slow start
+        cc.packetSent(packetSize);
+        long newCongestionWindow = (long) (QuicCubicCongestionController.BETA * cc.congestionWindow());
+        cc.packetLost(List.of(new TestQuicPacket(packetSize)), timeSource.instant(), false);
+        assertEquals(newCongestionWindow, cc.congestionWindow(), "Unexpected reduced congestion window");
+        // exit loss recovery to start increasing cwnd
+        Deadline sentTime = timeSource.advanceMillis(1);
+        do {
+            // test that the window increases roughly by ALPHA * maxDatagramSize every RTT
+            int startingCwnd = (int) cc.congestionWindow();
+            cc.packetSent(startingCwnd);
+            // we ack the entire window in one call; in practice the increase will be slower
+            // because cwnd increases (and increase rate reduces) after every call to packetAcked
+            cc.packetAcked(startingCwnd, sentTime);
+            long expectedCwnd = (long) (startingCwnd + ALPHA * packetSize);
+            long actualCwnd = cc.congestionWindow();
+            assertEquals(expectedCwnd, actualCwnd,  1.0,
+                    "actual cwnd not within the expected range");
+        } while (cc.congestionWindow() < startingWindow);
+        // test that the window increases roughly by maxDatagramSize every RTT after passing cwndPrior
+        int startingCwnd = (int) cc.congestionWindow();
+        cc.packetSent(startingCwnd);
+        cc.packetAcked(startingCwnd, sentTime);
+        int expectedCwnd = startingCwnd + packetSize;
+        long actualCwnd = cc.congestionWindow();
+        assertEquals(expectedCwnd, actualCwnd,  1.0,
+                "actual cwnd not within the expected range");
+    }
+
+    @Test
+    public void testCubic() {
+        /*
+         Manually created test vector:
+         - ramp up the congestion window to 36 packets
+         - trigger congestion; window will be reduced to 25.2 packets, K=3 seconds
+         - set RTT = 1.5 seconds, advance "t" to 1.5 seconds,
+           send and acknowledge a whole cwnd of data
+         - cwnd should be back to 36 packets, give or take a few bytes.
+         */
+        System.err.println("***** testCubic *****");
+        QuicRttEstimator rtt = new QuicRttEstimator();
+        rtt.consumeRttSample(1_500_000, 0, Deadline.MIN);
+        QuicCongestionController cc = new QuicCubicCongestionController(timeSource, rtt);
+        int packetSize = (int) cc.maxDatagramSize();
+        long cwnd = cc.congestionWindow();
+        // ramp up the congestion window to 36 packets
+        int tmp = (int) (36 * packetSize - cwnd);
+        cc.packetSent(tmp + packetSize);
+        cc.packetAcked(tmp, timeSource.instant());
+        assertEquals(36*packetSize, cc.congestionWindow(), "Unexpected congestion window");
+        long newCongestionWindow = (long) (QuicCubicCongestionController.BETA * cc.congestionWindow());
+        // trigger congestion; window will be reduced to 25.2 packets, K=3 seconds
+        cc.packetLost(List.of(new TestQuicPacket(packetSize)), timeSource.instant(), false);
+        assertEquals(newCongestionWindow, cc.congestionWindow(), "Unexpected reduced congestion window");
+        // advance "t" to 1.5 seconds,
+        Deadline sentTime = timeSource.advanceMillis(1500);
+        // send and acknowledge a whole cwnd of data
+        tmp = (int) cc.congestionWindow();
+        cc.packetSent(tmp);
+        // we ack the entire window in one call; in practice the increase will be slower
+        // because cwnd increases (and increase rate reduces) after every call to packetAcked
+        cc.packetAcked(tmp, sentTime);
+        long expectedCwnd = 36 * packetSize;
+        long actualCwnd = cc.congestionWindow();
+        assertEquals(expectedCwnd, actualCwnd,  1.0,
+                "actual cwnd not within the expected range");
+    }
+}

From f8cf9ca69cfef286c80559bfe1d147b6303d10d2 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Mon, 24 Nov 2025 15:58:17 +0000
Subject: [PATCH 320/512] 8370039: GenShen: array copy SATB barrier
 improvements

Reviewed-by: kdnilsen, ysr, shade
---
 .../gc/shenandoah/shenandoahBarrierSet.hpp    |  2 +-
 .../shenandoahBarrierSet.inline.hpp           | 79 +++++--------------
 2 files changed, 20 insertions(+), 61 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
index 0d38cc757f4..2b5bc766a46 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
@@ -129,7 +129,7 @@ public:
 
 private:
   template <class T>
-  inline void arraycopy_marking(T* src, T* dst, size_t count, bool is_old_marking);
+  inline void arraycopy_marking(T* dst, size_t count);
   template <class T>
   inline void arraycopy_evacuation(T* src, size_t count);
   template <class T>
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index b176446452a..adeea8ebf96 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -387,13 +387,11 @@ template <class T, bool HAS_FWD, bool EVAC, bool ENQUEUE>
 void ShenandoahBarrierSet::arraycopy_work(T* src, size_t count) {
   // Young cycles are allowed to run when old marking is in progress. When old marking is in progress,
   // this barrier will be called with ENQUEUE=true and HAS_FWD=false, even though the young generation
-  // may have forwarded objects. In this case, the `arraycopy_work` is first called with HAS_FWD=true and
-  // ENQUEUE=false.
-  assert(HAS_FWD == _heap->has_forwarded_objects() || _heap->is_concurrent_old_mark_in_progress(),
-         "Forwarded object status is sane");
+  // may have forwarded objects.
+  assert(HAS_FWD == _heap->has_forwarded_objects() || _heap->is_concurrent_old_mark_in_progress(), "Forwarded object status is sane");
   // This function cannot be called to handle marking and evacuation at the same time (they operate on
   // different sides of the copy).
-  assert((HAS_FWD || EVAC) != ENQUEUE, "Cannot evacuate and mark both sides of copy.");
+  static_assert((HAS_FWD || EVAC) != ENQUEUE, "Cannot evacuate and mark both sides of copy.");
 
   Thread* thread = Thread::current();
   SATBMarkQueue& queue = ShenandoahThreadLocalData::satb_mark_queue(thread);
@@ -412,7 +410,7 @@ void ShenandoahBarrierSet::arraycopy_work(T* src, size_t count) {
         shenandoah_assert_forwarded_except(elem_ptr, obj, _heap->cancelled_gc());
         ShenandoahHeap::atomic_update_oop(fwd, elem_ptr, o);
       }
-      if (ENQUEUE && !ctx->is_marked_strong_or_old(obj)) {
+      if (ENQUEUE && !ctx->is_marked_strong(obj)) {
         _satb_mark_queue_set.enqueue_known_active(queue, obj);
       }
     }
@@ -426,68 +424,29 @@ void ShenandoahBarrierSet::arraycopy_barrier(T* src, T* dst, size_t count) {
     return;
   }
 
-  char gc_state = ShenandoahThreadLocalData::gc_state(Thread::current());
-  if ((gc_state & ShenandoahHeap::EVACUATION) != 0) {
-    arraycopy_evacuation(src, count);
-  } else if ((gc_state & ShenandoahHeap::UPDATE_REFS) != 0) {
-    arraycopy_update(src, count);
+  const char gc_state = ShenandoahThreadLocalData::gc_state(Thread::current());
+  if ((gc_state & ShenandoahHeap::MARKING) != 0) {
+    // If marking old or young, we must evaluate the SATB barrier. This will be the only
+    // action if we are not marking old. If we are marking old, we must still evaluate the
+    // load reference barrier for a young collection.
+    arraycopy_marking(dst, count);
   }
 
-  if (_heap->mode()->is_generational()) {
-    assert(ShenandoahSATBBarrier, "Generational mode assumes SATB mode");
-    if ((gc_state & ShenandoahHeap::YOUNG_MARKING) != 0) {
-      arraycopy_marking(src, dst, count, false);
-    }
-    if ((gc_state & ShenandoahHeap::OLD_MARKING) != 0) {
-      arraycopy_marking(src, dst, count, true);
-    }
-  } else if ((gc_state & ShenandoahHeap::MARKING) != 0) {
-    arraycopy_marking(src, dst, count, false);
+  if ((gc_state & ShenandoahHeap::EVACUATION) != 0) {
+    assert((gc_state & ShenandoahHeap::YOUNG_MARKING) == 0, "Cannot be marking young during evacuation");
+    arraycopy_evacuation(src, count);
+  } else if ((gc_state & ShenandoahHeap::UPDATE_REFS) != 0) {
+    assert((gc_state & ShenandoahHeap::YOUNG_MARKING) == 0, "Cannot be marking young during update-refs");
+    arraycopy_update(src, count);
   }
 }
 
 template <class T>
-void ShenandoahBarrierSet::arraycopy_marking(T* src, T* dst, size_t count, bool is_old_marking) {
+void ShenandoahBarrierSet::arraycopy_marking(T* dst, size_t count) {
   assert(_heap->is_concurrent_mark_in_progress(), "only during marking");
-  /*
-   * Note that an old-gen object is considered live if it is live at the start of OLD marking or if it is promoted
-   * following the start of OLD marking.
-   *
-   * 1. Every object promoted following the start of OLD marking will be above TAMS within its old-gen region
-   * 2. Every object live at the start of OLD marking will be referenced from a "root" or it will be referenced from
-   *    another live OLD-gen object.  With regards to old-gen, roots include stack locations and all of live young-gen.
-   *    All root references to old-gen are identified during a bootstrap young collection.  All references from other
-   *    old-gen objects will be marked during the traversal of all old objects, or will be marked by the SATB barrier.
-   *
-   * During old-gen marking (which is interleaved with young-gen collections), call arraycopy_work() if:
-   *
-   * 1. The overwritten array resides in old-gen and it is below TAMS within its old-gen region
-   * 2. Do not call arraycopy_work for any array residing in young-gen because young-gen collection is idle at this time
-   *
-   * During young-gen marking, call arraycopy_work() if:
-   *
-   * 1. The overwritten array resides in young-gen and is below TAMS within its young-gen region
-   * 2. Additionally, if array resides in old-gen, regardless of its relationship to TAMS because this old-gen array
-   *    may hold references to young-gen
-   */
   if (ShenandoahSATBBarrier) {
-    T* array = dst;
-    HeapWord* array_addr = reinterpret_cast<HeapWord*>(array);
-    ShenandoahHeapRegion* r = _heap->heap_region_containing(array_addr);
-    if (is_old_marking) {
-      // Generational, old marking
-      assert(_heap->mode()->is_generational(), "Invariant");
-      if (r->is_old() && (array_addr < _heap->marking_context()->top_at_mark_start(r))) {
-        arraycopy_work<T, false, false, true>(array, count);
-      }
-    } else if (_heap->mode()->is_generational()) {
-      // Generational, young marking
-      if (r->is_old() || (array_addr < _heap->marking_context()->top_at_mark_start(r))) {
-        arraycopy_work<T, false, false, true>(array, count);
-      }
-    } else if (array_addr < _heap->marking_context()->top_at_mark_start(r)) {
-      // Non-generational, marking
-      arraycopy_work<T, false, false, true>(array, count);
+    if (!_heap->marking_context()->allocated_after_mark_start(reinterpret_cast<HeapWord*>(dst))) {
+      arraycopy_work<T, false, false, true>(dst, count);
     }
   }
 }

From 67b57f4f758f2fea647a3b6a68c0372a8f9e121b Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vpetko@openjdk.org>
Date: Mon, 24 Nov 2025 16:01:40 +0000
Subject: [PATCH 321/512] 8370978: Zero JVM fails to build on i386 after
 JDK-8351149

Reviewed-by: shade, aseoane
---
 src/hotspot/os/linux/os_linux.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 456927d2a64..30033903ca3 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1770,7 +1770,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
     {EM_LOONGARCH,   EM_LOONGARCH, ELFCLASS64, ELFDATA2LSB, (char*)"LoongArch"},
   };
 
-#if    (defined AMD64)
+#if  (defined IA32)
+  static  Elf32_Half running_arch_code=EM_386;
+#elif   (defined AMD64) || (defined X32)
   static  Elf32_Half running_arch_code=EM_X86_64;
 #elif  (defined __sparc) && (defined _LP64)
   static  Elf32_Half running_arch_code=EM_SPARCV9;
@@ -1804,7 +1806,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
   static  Elf32_Half running_arch_code=EM_LOONGARCH;
 #else
     #error Method os::dll_load requires that one of following is defined:\
-        AARCH64, ALPHA, ARM, AMD64, LOONGARCH64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
+        AARCH64, ALPHA, ARM, AMD64, IA32, LOONGARCH64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
 #endif
 
   // Identify compatibility class for VM's architecture and library's architecture
@@ -1866,6 +1868,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
 }
 
 void * os::Linux::dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
+#ifndef IA32
   bool ieee_handling = IEEE_subnormal_handling_OK();
   if (!ieee_handling) {
     Events::log_dll_message(nullptr, "IEEE subnormal handling check failed before loading %s", filename);
@@ -1888,9 +1891,14 @@ void * os::Linux::dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
   // numerical "accuracy", but we need to protect Java semantics first
   // and foremost. See JDK-8295159.
 
+  // This workaround is ineffective on IA32 systems because the MXCSR
+  // register (which controls flush-to-zero mode) is not stored in the
+  // legacy fenv.
+
   fenv_t default_fenv;
   int rtn = fegetenv(&default_fenv);
   assert(rtn == 0, "fegetenv must succeed");
+#endif // IA32
 
   void* result;
   JFR_ONLY(NativeLibraryLoadEvent load_event(filename, &result);)
@@ -1910,6 +1918,7 @@ void * os::Linux::dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
   } else {
     Events::log_dll_message(nullptr, "Loaded shared library %s", filename);
     log_info(os)("shared library load of %s was successful", filename);
+#ifndef IA32
     // Quickly test to make sure subnormals are correctly handled.
     if (! IEEE_subnormal_handling_OK()) {
       // We just dlopen()ed a library that mangled the floating-point flags.
@@ -1935,6 +1944,7 @@ void * os::Linux::dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
         assert(false, "fesetenv didn't work");
       }
     }
+#endif // IA32
   }
   return result;
 }

From 217726009492af5a1143c98b97cc39b580850c5d Mon Sep 17 00:00:00 2001
From: Ruben Ayrapetyan <ruben.ayrapetyan@arm.com>
Date: Mon, 24 Nov 2025 16:59:25 +0000
Subject: [PATCH 322/512] 8371458: [REDO] Remove exception handler stub code in
 C2

Co-authored-by: Martin Doerr <mdoerr@openjdk.org>
Reviewed-by: mdoerr, dlong
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  41 ++---
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |  14 +-
 .../cpu/aarch64/c1_LIRAssembler_aarch64.hpp   |   2 +-
 .../cpu/aarch64/nativeInst_aarch64.cpp        |   6 -
 .../cpu/aarch64/nativeInst_aarch64.hpp        |  29 +++-
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp   |   2 -
 src/hotspot/cpu/arm/arm.ad                    |  49 ++----
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |  14 +-
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp   |   2 +-
 src/hotspot/cpu/arm/nativeInst_arm_32.hpp     |   7 +
 src/hotspot/cpu/arm/runtime_arm.cpp           |   2 -
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |   9 +-
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp   |   2 +-
 src/hotspot/cpu/ppc/nativeInst_ppc.hpp        |  10 +-
 src/hotspot/cpu/ppc/ppc.ad                    |  37 ++--
 src/hotspot/cpu/ppc/runtime_ppc.cpp           |   1 -
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  19 +--
 .../cpu/riscv/c1_LIRAssembler_riscv.cpp       |  14 +-
 .../cpu/riscv/c1_LIRAssembler_riscv.hpp       |   2 +-
 src/hotspot/cpu/riscv/nativeInst_riscv.hpp    |   9 +-
 src/hotspot/cpu/riscv/riscv.ad                |  39 ++---
 src/hotspot/cpu/riscv/runtime_riscv.cpp       |   2 -
 src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp |  17 +-
 src/hotspot/cpu/s390/nativeInst_s390.hpp      |   7 +
 src/hotspot/cpu/s390/runtime_s390.cpp         |   2 -
 src/hotspot/cpu/s390/s390.ad                  |  56 ++----
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |   6 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |  16 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp   |   2 +-
 src/hotspot/cpu/x86/nativeInst_x86.hpp        |  10 +-
 src/hotspot/cpu/x86/runtime_x86_64.cpp        |   2 -
 src/hotspot/cpu/x86/x86.ad                    |  53 ++----
 src/hotspot/os/posix/signals_posix.cpp        |   2 +-
 src/hotspot/os/windows/os_windows.cpp         |   2 +-
 src/hotspot/share/ci/ciEnv.cpp                |   4 +-
 src/hotspot/share/code/nmethod.cpp            |  23 ++-
 src/hotspot/share/code/nmethod.hpp            |   4 +-
 src/hotspot/share/code/nmethod.inline.hpp     |   2 +-
 src/hotspot/share/opto/output.cpp             |   6 +-
 src/hotspot/share/runtime/deoptimization.cpp  |   3 +
 src/hotspot/share/runtime/frame.cpp           |   4 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   8 +
 src/hotspot/share/runtime/vmStructs.cpp       |   2 +-
 .../classes/sun/jvm/hotspot/code/NMethod.java |  28 +--
 .../sun/jvm/hotspot/runtime/Frame.java        |   2 +-
 .../jtreg/runtime/vthread/Deoptimization.java | 159 ++++++++++++++++++
 46 files changed, 424 insertions(+), 308 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/vthread/Deoptimization.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 3a64c767864..364db407bd3 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1,6 +1,7 @@
 //
 // Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2014, 2024, Red Hat, Inc. All rights reserved.
+// Copyright 2025 Arm Limited and/or its affiliates.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -1194,15 +1195,10 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return MacroAssembler::far_codestub_branch_size();
-  }
-
   static uint size_deopt_handler() {
-    // count one adr and one far branch instruction
+    // count one branch instruction and one far call instruction sequence
     return NativeInstruction::instruction_size + MacroAssembler::far_codestub_branch_size();
   }
 };
@@ -2261,25 +2257,6 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 
 //=============================================================================
 
-// Emit exception handler code.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
-{
-  // mov rscratch1 #exception_blob_entry_point
-  // br rscratch1
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-  int offset = __ offset();
-  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-  __ end_a_stub();
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
@@ -2290,14 +2267,20 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
     ciEnv::current()->record_failure("CodeCache is full");
     return 0;  // CodeBuffer::expand failed
   }
-  int offset = __ offset();
 
-  __ adr(lr, __ pc());
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  int offset = __ offset();
+  Label start;
+  __ bind(start);
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ b(start);
 
   assert(__ offset() - offset == (int) size_deopt_handler(), "overflow");
+  assert(__ offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 // REQUIRED MATCHER CODE
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 9ab463125fe..37a6a130e0d 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -449,12 +449,20 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  __ adr(lr, pc());
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ b(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
+  assert(code_offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::add_debug_info_for_branch(address adr, CodeEmitInfo* info) {
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 12b941fc4f7..729cd2827b7 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -71,7 +71,7 @@ friend class ArrayCopyStub;
     //            CompiledDirectCall::to_trampoline_stub_size()
     _call_stub_size = 13 * NativeInstruction::instruction_size,
     _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
-    _deopt_handler_size = 7 * NativeInstruction::instruction_size
+    _deopt_handler_size = 4 * NativeInstruction::instruction_size
   };
 
 public:
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
index 5a7fececafa..f2003dd9b55 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -394,12 +394,6 @@ void NativePostCallNop::make_deopt() {
   NativeDeoptInstruction::insert(addr_at(0));
 }
 
-#ifdef ASSERT
-static bool is_movk_to_zr(uint32_t insn) {
-  return ((insn & 0xffe0001f) == 0xf280001f);
-}
-#endif
-
 bool NativePostCallNop::patch(int32_t oopmap_slot, int32_t cb_offset) {
   if (((oopmap_slot & 0xff) != oopmap_slot) || ((cb_offset & 0xffffff) != cb_offset)) {
     return false; // cannot encode
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index df5d97c2376..c30cb911d96 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -526,14 +526,31 @@ inline NativeLdSt* NativeLdSt_at(address addr) {
 // can store an offset from the initial nop to the nmethod.
 
 class NativePostCallNop: public NativeInstruction {
+private:
+  static bool is_movk_to_zr(uint32_t insn) {
+    return ((insn & 0xffe0001f) == 0xf280001f);
+  }
+
 public:
+  enum AArch64_specific_constants {
+    // The two parts should be checked separately to prevent out of bounds access in case
+    // the return address points to the deopt handler stub code entry point which could be
+    // at the end of page.
+    first_check_size = instruction_size
+  };
+
   bool check() const {
-    uint64_t insns = *(uint64_t*)addr_at(0);
-    // Check for two instructions: nop; movk zr, xx
-    // These instructions only ever appear together in a post-call
-    // NOP, so it's unnecessary to check that the third instruction is
-    // a MOVK as well.
-    return (insns & 0xffe0001fffffffff) == 0xf280001fd503201f;
+    // Check the first instruction is NOP.
+    if (is_nop()) {
+      uint32_t insn = *(uint32_t*)addr_at(first_check_size);
+      // Check next instruction is MOVK zr, xx.
+      // These instructions only ever appear together in a post-call
+      // NOP, so it's unnecessary to check that the third instruction is
+      // a MOVK as well.
+      return is_movk_to_zr(insn);
+    }
+
+    return false;
   }
 
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const {
diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index d45f9865bd2..e36aa21b567 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -260,8 +260,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in aarch64.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 92c0df68deb..af010caf616 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -105,14 +105,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return ( 3 * 4 );
-  }
-
-
   static uint size_deopt_handler() {
     return ( 9 * 4 );
   }
@@ -876,26 +870,6 @@ uint MachUEPNode::size(PhaseRegAlloc *ra_) const {
 
 //=============================================================================
 
-// Emit exception handler code.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-
-  int offset = __ offset();
-
-  // OK to trash LR, because exception blob will kill it
-  __ jump(OptoRuntime::exception_blob()->entry_point(), relocInfo::runtime_call_type, LR_tmp);
-
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-
-  __ end_a_stub();
-
-  return offset;
-}
-
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   // Can't use any of the current frame's registers as we may have deopted
   // at a poll and everything can be live.
@@ -906,19 +880,28 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
 
   int offset = __ offset();
-  address deopt_pc = __ pc();
 
-  __ sub(SP, SP, wordSize); // make room for saved PC
-  __ push(LR); // save LR that may be live when we get here
-  __ mov_relative_address(LR, deopt_pc);
-  __ str(LR, Address(SP, wordSize)); // save deopt PC
-  __ pop(LR); // restore LR
+  Label start;
+  __ bind(start);
+
   __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
 
+  int entry_offset = __ offset();
+  address deopt_pc = __ pc();
+  // Preserve R0 and reserve space for the address of the entry point
+  __ push(RegisterSet(R0) | RegisterSet(R1));
+  // Store the entry point address
+  __ mov_relative_address(R0, deopt_pc);
+  __ str(R0, Address(SP, wordSize));
+  __ pop(R0); // restore R0
+  __ b(start);
+
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
+  assert(__ offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
 
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 bool Matcher::match_rule_supported(int opcode) {
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index 219c49d1f14..f168a34f140 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -272,14 +272,22 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  __ mov_relative_address(LR, __ pc());
-  __ push(LR); // stub expects LR to be saved
+  Label start;
+  __ bind(start);
+
   __ jump(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type, noreg);
 
+  int entry_offset = __ offset();
+  __ mov_relative_address(LR, __ pc());
+  __ push(LR); // stub expects LR to be saved
+  __ b(start);
+
   assert(code_offset() - offset <= deopt_handler_size(), "overflow");
+  assert(code_offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
index 77d13532685..615d2f188ff 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
@@ -54,7 +54,7 @@
   enum {
     _call_stub_size = 16,
     _exception_handler_size = PRODUCT_ONLY(68) NOT_PRODUCT(68+60),
-    _deopt_handler_size = 16
+    _deopt_handler_size = 20
   };
 
  public:
diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
index ee856bcfe60..82385bf0244 100644
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
@@ -430,6 +430,13 @@ inline NativeCall* nativeCall_before(address return_address) {
 
 class NativePostCallNop: public NativeInstruction {
 public:
+  enum arm_specific_constants {
+    // If the check is adjusted to read beyond size of the instruction sequence at the deopt
+    // handler stub code entry point, it has to happen in two stages - to prevent out of bounds
+    // access in case the return address points to the entry point which could be at
+    // the end of page.
+    first_check_size = instruction_size
+  };
   bool check() const { return is_nop(); }
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const { return false; }
   bool patch(int32_t oopmap_slot, int32_t cb_offset) { return false; }
diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index 8d48de5795a..29fd0aa0a10 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -182,8 +182,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------ generate_exception_blob ---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in sparc.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 108da2039f6..0b48653ae64 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -264,12 +264,19 @@ int LIR_Assembler::emit_deopt_handler() {
   }
 
   int offset = code_offset();
+  Label start;
+
+  __ bind(start);
   __ bl64_patchable(SharedRuntime::deopt_blob()->unpack(), relocInfo::runtime_call_type);
+  int entry_offset = __ offset();
+  __ b(start);
 
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
+  assert(code_offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
index e4de2eb5c46..6a2f6264850 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
@@ -63,7 +63,7 @@ enum {
   _static_call_stub_size = 4 * BytesPerInstWord + MacroAssembler::b64_patchable_size, // or smaller
   _call_stub_size = _static_call_stub_size + MacroAssembler::trampoline_stub_size, // or smaller
   _exception_handler_size = MacroAssembler::b64_patchable_size, // or smaller
-  _deopt_handler_size = MacroAssembler::bl64_patchable_size
+  _deopt_handler_size = MacroAssembler::bl64_patchable_size + BytesPerInstWord
 };
 
   // '_static_call_stub_size' is only used on ppc (see LIR_Assembler::emit_static_call_stub()
diff --git a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
index dcb5c2bb3cb..75ca50674bf 100644
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
@@ -51,8 +51,6 @@ class NativeInstruction {
   friend class Relocation;
 
  public:
-  bool is_post_call_nop() const { return MacroAssembler::is_post_call_nop(long_at(0)); }
-
   bool is_jump() const { return Assembler::is_b(long_at(0)); } // See NativeGeneralJump.
 
   bool is_sigtrap_ic_miss_check() {
@@ -531,6 +529,14 @@ class NativePostCallNop: public NativeInstruction {
 };
 
 public:
+  enum ppc_specific_constants {
+    // If the check is adjusted to read beyond size of the instruction at the deopt handler stub
+    // code entry point, it has to happen in two stages - to prevent out of bounds access in case
+    // the return address points to the entry point which could be at the end of page.
+    first_check_size = BytesPerInstWord
+  };
+
+  bool is_post_call_nop() const { return MacroAssembler::is_post_call_nop(long_at(0)); }
   bool check() const { return is_post_call_nop(); }
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const {
     uint32_t instr_bits = long_at(0);
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index c169d673aaf..762536df07f 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2088,17 +2088,11 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    // The exception_handler is a b64_patchable.
-    return MacroAssembler::b64_patchable_size;
-  }
-
   static uint size_deopt_handler() {
     // The deopt_handler is a bl64_patchable.
-    return MacroAssembler::bl64_patchable_size;
+    return MacroAssembler::bl64_patchable_size + BytesPerInstWord;
   }
 
 };
@@ -2114,22 +2108,6 @@ public:
 
 source %{
 
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-
-  int offset = __ offset();
-  __ b64_patchable((address)OptoRuntime::exception_blob()->content_begin(),
-                       relocInfo::runtime_call_type);
-  assert(__ offset() - offset == (int)size_exception_handler(), "must be fixed size");
-  __ end_a_stub();
-
-  return offset;
-}
-
 // The deopt_handler is like the exception handler, but it calls to
 // the deoptimization blob instead of jumping to the exception blob.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
@@ -2140,12 +2118,23 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
 
   int offset = __ offset();
+
+  Label start;
+  __ bind(start);
+
   __ bl64_patchable((address)SharedRuntime::deopt_blob()->unpack(),
                         relocInfo::runtime_call_type);
+
+  int entry_offset = __ offset();
+
+  __ b(start);
+
   assert(__ offset() - offset == (int) size_deopt_handler(), "must be fixed size");
+  assert(__ offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 //=============================================================================
diff --git a/src/hotspot/cpu/ppc/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp
index 2654075f702..ab658e9de58 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -46,7 +46,6 @@
 
 //------------------------------generate_exception_blob---------------------------
 // Creates exception blob at the end.
-// Using exception blob, this code is jumped from a compiled method.
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index db45a2fa4c8..4e427ace404 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -83,7 +83,6 @@ class RegisterSaver {
   static OopMap* push_frame_reg_args_and_save_live_registers(MacroAssembler* masm,
                          int* out_frame_size_in_bytes,
                          bool generate_oop_map,
-                         int return_pc_adjustment,
                          ReturnPCLocation return_pc_location,
                          bool save_vectors = false);
   static void    restore_live_registers_and_pop_frame(MacroAssembler* masm,
@@ -262,7 +261,6 @@ static const RegisterSaver::LiveRegType RegisterSaver_LiveVecRegs[] = {
 OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssembler* masm,
                          int* out_frame_size_in_bytes,
                          bool generate_oop_map,
-                         int return_pc_adjustment,
                          ReturnPCLocation return_pc_location,
                          bool save_vectors) {
   // Push an abi_reg_args-frame and store all registers which may be live.
@@ -271,7 +269,6 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
   // propagated to the RegisterMap of the caller frame during
   // StackFrameStream construction (needed for deoptimization; see
   // compiledVFrame::create_stack_value).
-  // If return_pc_adjustment != 0 adjust the return pc by return_pc_adjustment.
   // Updated return pc is returned in R31 (if not return_pc_is_pre_saved).
 
   // calculate frame size
@@ -305,14 +302,11 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
   // Do the save_LR by hand and adjust the return pc if requested.
   switch (return_pc_location) {
     case return_pc_is_lr: __ mflr(R31); break;
-    case return_pc_is_pre_saved: assert(return_pc_adjustment == 0, "unsupported"); break;
+    case return_pc_is_pre_saved: break;
     case return_pc_is_thread_saved_exception_pc: __ ld(R31, thread_(saved_exception_pc)); break;
     default: ShouldNotReachHere();
   }
   if (return_pc_location != return_pc_is_pre_saved) {
-    if (return_pc_adjustment != 0) {
-      __ addi(R31, R31, return_pc_adjustment);
-    }
     __ std(R31, frame_size_in_bytes + _abi0(lr), R1_SP);
   }
 
@@ -2907,22 +2901,15 @@ void SharedRuntime::generate_deopt_blob() {
   //  deopt_handler:      call_deopt_stub
   //  cur. return pc  --> ...
   //
-  // So currently SR_LR points behind the call in the deopt handler.
-  // We adjust it such that it points to the start of the deopt handler.
   // The return_pc has been stored in the frame of the deoptee and
   // will replace the address of the deopt_handler in the call
   // to Deoptimization::fetch_unroll_info below.
-  // We can't grab a free register here, because all registers may
-  // contain live values, so let the RegisterSaver do the adjustment
-  // of the return pc.
-  const int return_pc_adjustment_no_exception = -MacroAssembler::bl64_patchable_size;
 
   // Push the "unpack frame"
   // Save everything in sight.
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &first_frame_size_in_bytes,
                                                                    /*generate_oop_map=*/ true,
-                                                                   return_pc_adjustment_no_exception,
                                                                    RegisterSaver::return_pc_is_lr);
   assert(map != nullptr, "OopMap must have been created");
 
@@ -2957,7 +2944,6 @@ void SharedRuntime::generate_deopt_blob() {
   RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                              &first_frame_size_in_bytes,
                                                              /*generate_oop_map=*/ false,
-                                                             /*return_pc_adjustment_exception=*/ 0,
                                                              RegisterSaver::return_pc_is_pre_saved);
 
   // Deopt during an exception. Save exec mode for unpack_frames.
@@ -2975,7 +2961,6 @@ void SharedRuntime::generate_deopt_blob() {
   RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                              &first_frame_size_in_bytes,
                                                              /*generate_oop_map=*/ false,
-                                                             /*return_pc_adjustment_reexecute=*/ 0,
                                                              RegisterSaver::return_pc_is_pre_saved);
   __ li(exec_mode_reg, Deoptimization::Unpack_reexecute);
 #endif
@@ -3266,7 +3251,6 @@ SafepointBlob* SharedRuntime::generate_handler_blob(StubId id, address call_ptr)
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &frame_size_in_bytes,
                                                                    /*generate_oop_map=*/ true,
-                                                                   /*return_pc_adjustment=*/0,
                                                                    return_pc_location, save_vectors);
 
   // The following is basically a call_VM. However, we need the precise
@@ -3367,7 +3351,6 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(StubId id, address destination
   map = RegisterSaver::push_frame_reg_args_and_save_live_registers(masm,
                                                                    &frame_size_in_bytes,
                                                                    /*generate_oop_map*/ true,
-                                                                   /*return_pc_adjustment*/ 0,
                                                                    RegisterSaver::return_pc_is_lr);
 
   // Use noreg as last_Java_pc, the return pc will be reconstructed
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index 9d8ae770ccf..e77a2067e89 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -377,12 +377,20 @@ int LIR_Assembler::emit_deopt_handler() {
 
   int offset = code_offset();
 
-  __ auipc(ra, 0);
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ j(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
+  assert(code_offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index e4efb2c171d..ed2ab0c4861 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -72,7 +72,7 @@ private:
     // See emit_exception_handler for detail
     _exception_handler_size = DEBUG_ONLY(256) NOT_DEBUG(32), // or smaller
     // See emit_deopt_handler for detail
-    // auipc (1) + far_jump (2)
+    // far_call (2) + j (1)
     _deopt_handler_size = 1 * MacroAssembler::instruction_size +
                           2 * MacroAssembler::instruction_size
   };
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
index d990cfbc50d..b28e33759b2 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
@@ -311,12 +311,19 @@ inline bool NativeInstruction::is_jump_or_nop() {
 // can store an offset from the initial nop to the nmethod.
 class NativePostCallNop: public NativeInstruction {
 public:
+  enum RISCV_specific_constants {
+    // The two parts should be checked separately to prevent out of bounds access in
+    // case the return address points to the deopt handler stub code entry point
+    // which could be at the end of page.
+    first_check_size = instruction_size
+  };
+
   bool check() const {
     // Check for two instructions: nop; lui zr, hi20
     // These instructions only ever appear together in a post-call
     // NOP, so it's unnecessary to check that the third instruction is
     // an addiw as well.
-    return is_nop() && MacroAssembler::is_lui_to_zr_at(addr_at(4));
+    return is_nop() && MacroAssembler::is_lui_to_zr_at(addr_at(first_check_size));
   }
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const;
   bool patch(int32_t oopmap_slot, int32_t cb_offset);
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 7acbb5a478b..bb2ed57ef82 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1049,15 +1049,10 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return MacroAssembler::far_branch_size();
-  }
-
   static uint size_deopt_handler() {
-    // count auipc + far branch
+    // count far call + j
     return NativeInstruction::instruction_size + MacroAssembler::far_branch_size();
   }
 };
@@ -1838,25 +1833,6 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 
 //=============================================================================
 
-// Emit exception handler code.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
-{
-  // auipc t1, #exception_blob_entry_point
-  // jr (offset)t1
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-  int offset = __ offset();
-  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-  __ end_a_stub();
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
@@ -1867,12 +1843,19 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
   }
   int offset = __ offset();
 
-  __ auipc(ra, 0);
-  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ far_call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+  __ j(start);
 
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
+  assert(__ offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 
 }
 // REQUIRED MATCHER CODE
diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
index e1add8dbb82..c52d5a31066 100644
--- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -249,8 +249,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in riscv.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index 298234156c3..93d6051aa76 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -272,14 +272,27 @@ int LIR_Assembler::emit_deopt_handler() {
     // Not enough space left for the handler.
     bailout("deopt handler overflow");
     return -1;
-  }  int offset = code_offset();
+  }
+
+  int offset = code_offset();
+
+  Label start;
+  __ bind(start);
+
   // Size must be constant (see HandlerImpl::emit_deopt_handler).
   __ load_const(Z_R1_scratch, SharedRuntime::deopt_blob()->unpack());
   __ call(Z_R1_scratch);
+
+  int entry_offset = __ offset();
+
+  __ z_bru(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
+  assert(code_offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::jobject2reg(jobject o, Register reg) {
diff --git a/src/hotspot/cpu/s390/nativeInst_s390.hpp b/src/hotspot/cpu/s390/nativeInst_s390.hpp
index 16400df3f26..9852bc410b1 100644
--- a/src/hotspot/cpu/s390/nativeInst_s390.hpp
+++ b/src/hotspot/cpu/s390/nativeInst_s390.hpp
@@ -649,6 +649,13 @@ class NativeGeneralJump: public NativeInstruction {
 
 class NativePostCallNop: public NativeInstruction {
 public:
+  enum z_specific_constants {
+    // Once the check is implemented, this has to specify number of bytes checked on the first
+    // read. If the check would read beyond size of the instruction at the deopt handler stub
+    // code entry point, then it has to happen in two stages - to prevent out of bounds access
+    // in case the return address points to the entry point which could be at the end of page.
+    first_check_size = 0 // check is unimplemented
+  };
   bool check() const { Unimplemented(); return false; }
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const { return false; }
   bool patch(int32_t oopmap_slot, int32_t cb_offset) { Unimplemented(); return false; }
diff --git a/src/hotspot/cpu/s390/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp
index 314c407af91..658fba069b4 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -43,8 +43,6 @@
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in s390.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index cab3965ecfa..6fe051b55c7 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1649,15 +1649,10 @@ source_hpp %{ // Header information of the source block.
 class HandlerImpl {
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    return NativeJump::max_instruction_size();
-  }
-
   static uint size_deopt_handler() {
-    return NativeCall::max_instruction_size();
+    return NativeCall::max_instruction_size() + MacroAssembler::jump_pcrelative_size();
   }
 };
 
@@ -1672,43 +1667,6 @@ public:
 
 source %{
 
-// This exception handler code snippet is placed after the method's
-// code. It is the return point if an exception occurred. it jumps to
-// the exception blob.
-//
-// If the method gets deoptimized, the method and this code snippet
-// get patched.
-//
-// 1) Trampoline code gets patched into the end of this exception
-//   handler. the trampoline code jumps to the deoptimization blob.
-//
-// 2) The return address in the method's code will get patched such
-//   that it jumps to the trampoline.
-//
-// 3) The handler will get patched such that it does not jump to the
-//   exception blob, but to an entry in the deoptimization blob being
-//   aware of the exception.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
-  Register temp_reg = Z_R1;
-
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;          // CodeBuffer::expand failed
-  }
-
-  int offset = __ offset();
-  // Use unconditional pc-relative jump with 32-bit range here.
-  __ load_const_optimized(temp_reg, (address)OptoRuntime::exception_blob()->content_begin());
-  __ z_br(temp_reg);
-
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-
-  __ end_a_stub();
-
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   address        base = __ start_a_stub(size_deopt_handler());
@@ -1720,14 +1678,24 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
   int offset = __ offset();
 
+  Label start;
+  __ bind(start);
+
   // Size_deopt_handler() must be exact on zarch, so for simplicity
   // we do not use load_const_opt here.
   __ load_const(Z_R1, SharedRuntime::deopt_blob()->unpack());
   __ call(Z_R1);
+
+  int entry_offset = __ offset();
+
+  __ z_bru(start);
+
   assert(__ offset() - offset == (int) size_deopt_handler(), "must be fixed size");
+  assert(__ offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
 
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 //=============================================================================
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index a3605f649cc..5b6f7dcd984 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2544,14 +2544,10 @@ void SharedRuntime::generate_deopt_blob() {
   // Normal entry (non-exception case)
   //
   // We have been called from the deopt handler of the deoptee.
-  // Z_R14 points behind the call in the deopt handler. We adjust
-  // it such that it points to the start of the deopt handler.
+  // Z_R14 points to the entry point of the deopt handler.
   // The return_pc has been stored in the frame of the deoptee and
   // will replace the address of the deopt_handler in the call
   // to Deoptimization::fetch_unroll_info below.
-  // The (int) cast is necessary, because -((unsigned int)14)
-  // is an unsigned int.
-  __ add2reg(Z_R14, -(int)NativeCall::max_instruction_size());
 
   const Register   exec_mode_reg = Z_tmp_1;
 
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index edeb0baea0e..a2ea7af606d 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -450,14 +450,22 @@ int LIR_Assembler::emit_deopt_handler() {
   }
 
   int offset = code_offset();
-  InternalAddress here(__ pc());
 
-  __ pushptr(here.addr(), rscratch1);
-  __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  Label start;
+  __ bind(start);
+
+  __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+
+  __ jmp(start);
+
   guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
+  assert(code_offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
 
-  return offset;
+  return entry_offset;
 }
 
 void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
index 8524dc90276..33f7b063e77 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
@@ -48,7 +48,7 @@
   enum {
     _call_stub_size = 28,
     _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175),
-    _deopt_handler_size = 17
+    _deopt_handler_size = 7
   };
 
 public:
diff --git a/src/hotspot/cpu/x86/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp
index 3e767006480..ec7fc3b154a 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp
@@ -73,6 +73,7 @@ class NativeInstruction {
   s_char sbyte_at(int offset) const    { return *(s_char*) addr_at(offset); }
   u_char ubyte_at(int offset) const    { return *(u_char*) addr_at(offset); }
 
+  jshort short_at(int offset) const    { return *(jshort*) addr_at(offset); }
   jint int_at(int offset) const         { return *(jint*) addr_at(offset); }
 
   intptr_t ptr_at(int offset) const    { return *(intptr_t*) addr_at(offset); }
@@ -578,10 +579,15 @@ public:
     instruction_code = 0x0f,
     instruction_size = 8,
     instruction_offset = 0,
-    displacement_offset = 4
+    displacement_offset = 4,
+
+    // The two parts should be checked separately to prevent out of bounds access in case
+    // the return address points to the deopt handler stub code entry point which could be
+    // at the end of page.
+    first_check_size = 2
   };
 
-  bool check() const { return int_at(0) == 0x841f0f; }
+  bool check() const { return short_at(0) == 0x1f0f && short_at(first_check_size) == 0x0084; }
   bool decode(int32_t& oopmap_slot, int32_t& cb_offset) const {
     int32_t data = int_at(displacement_offset);
     if (data == 0) {
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index 7b98cf4fad7..5bf65299a0c 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -242,8 +242,6 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
 
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in x86_64.ad file)
 //
 // Given an exception pc at a call we call into the runtime for the
 // handler in this method. This handler might merely restore state
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index a9748617e1f..be9889b0a99 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -2767,21 +2767,11 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(C2_MacroAssembler *masm);
   static int emit_deopt_handler(C2_MacroAssembler* masm);
 
-  static uint size_exception_handler() {
-    // NativeCall instruction size is the same as NativeJump.
-    // exception handler starts out as jump and can be patched to
-    // a call be deoptimization.  (4932387)
-    // Note that this value is also credited (in output.cpp) to
-    // the size of the code section.
-    return NativeJump::instruction_size;
-  }
-
   static uint size_deopt_handler() {
-    // three 5 byte instructions plus one move for unreachable address.
-    return 15+3;
+    // one call and one jmp.
+    return 7;
   }
 };
 
@@ -2873,24 +2863,6 @@ int MachNode::compute_padding(int current_offset) const {
   }
 }
 
-// Emit exception handler code.
-// Stuff framesize into a register and call a VM stub routine.
-int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
-
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  address base = __ start_a_stub(size_exception_handler());
-  if (base == nullptr) {
-    ciEnv::current()->record_failure("CodeCache is full");
-    return 0;  // CodeBuffer::expand failed
-  }
-  int offset = __ offset();
-  __ jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
-  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
-  __ end_a_stub();
-  return offset;
-}
-
 // Emit deopt handler code.
 int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
@@ -2903,21 +2875,20 @@ int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   }
   int offset = __ offset();
 
-  address the_pc = (address) __ pc();
-  Label next;
-  // push a "the_pc" on the stack without destroying any registers
-  // as they all may be live.
+  Label start;
+  __ bind(start);
 
-  // push address of "next"
-  __ call(next, relocInfo::none); // reloc none is fine since it is a disp32
-  __ bind(next);
-  // adjust it so it matches "the_pc"
-  __ subptr(Address(rsp, 0), __ offset() - offset);
+  __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  int entry_offset = __ offset();
+
+  __ jmp(start);
 
-  __ jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
   assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow %d", (__ offset() - offset));
+  assert(__ offset() - entry_offset >= NativePostCallNop::first_check_size,
+         "out of bounds read in post-call NOP check");
   __ end_a_stub();
-  return offset;
+  return entry_offset;
 }
 
 static Assembler::Width widthForType(BasicType bt) {
diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 5833e324070..625eb63445a 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -621,7 +621,7 @@ int JVM_HANDLE_XXX_SIGNAL(int sig, siginfo_t* info,
       if (cb != nullptr && cb->is_nmethod()) {
         nmethod* nm = cb->as_nmethod();
         assert(nm->insts_contains_inclusive(pc), "");
-        address deopt = nm->deopt_handler_begin();
+        address deopt = nm->deopt_handler_entry();
         assert(deopt != nullptr, "");
 
         frame fr = os::fetch_frame_from_context(uc);
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 28b20f3cdaf..8a450a291d3 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2795,7 +2795,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
         if (cb != nullptr && cb->is_nmethod()) {
           nmethod* nm = cb->as_nmethod();
           frame fr = os::fetch_frame_from_context((void*)exceptionInfo->ContextRecord);
-          address deopt = nm->deopt_handler_begin();
+          address deopt = nm->deopt_handler_entry();
           assert(nm->insts_contains_inclusive(pc), "");
           nm->set_original_pc(&fr, pc);
           // Set pc to handler
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 79ab881e7f6..92bacc4c2c3 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1057,7 +1057,9 @@ void ciEnv::register_method(ciMethod* target,
     }
 
     assert(offsets->value(CodeOffsets::Deopt) != -1, "must have deopt entry");
-    assert(offsets->value(CodeOffsets::Exceptions) != -1, "must have exception entry");
+
+    assert(compiler->type() == compiler_c2 ||
+           offsets->value(CodeOffsets::Exceptions) != -1, "must have exception entry");
 
     nm =  nmethod::new_nmethod(method,
                                compile_id(),
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index d91af9b4991..c2f8b46f00e 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1302,7 +1302,7 @@ nmethod::nmethod(
     }
     // Native wrappers do not have deopt handlers. Make the values
     // something that will never match a pc like the nmethod vtable entry
-    _deopt_handler_offset    = 0;
+    _deopt_handler_entry_offset    = 0;
     _unwind_handler_offset   = 0;
 
     CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
@@ -1442,7 +1442,7 @@ nmethod::nmethod(const nmethod &nm) : CodeBlob(nm._name, nm._kind, nm._size, nm.
   _skipped_instructions_size    = nm._skipped_instructions_size;
   _stub_offset                  = nm._stub_offset;
   _exception_offset             = nm._exception_offset;
-  _deopt_handler_offset         = nm._deopt_handler_offset;
+  _deopt_handler_entry_offset   = nm._deopt_handler_entry_offset;
   _unwind_handler_offset        = nm._unwind_handler_offset;
   _num_stack_arg_slots          = nm._num_stack_arg_slots;
   _oops_size                    = nm._oops_size;
@@ -1704,19 +1704,26 @@ nmethod::nmethod(
         _exception_offset        = -1;
       }
       if (offsets->value(CodeOffsets::Deopt) != -1) {
-        _deopt_handler_offset    = code_offset() + offsets->value(CodeOffsets::Deopt);
+        _deopt_handler_entry_offset    = code_offset() + offsets->value(CodeOffsets::Deopt);
       } else {
-        _deopt_handler_offset    = -1;
+        _deopt_handler_entry_offset    = -1;
       }
     } else
 #endif
     {
       // Exception handler and deopt handler are in the stub section
-      assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set");
       assert(offsets->value(CodeOffsets::Deopt     ) != -1, "must be set");
 
-      _exception_offset          = _stub_offset + offsets->value(CodeOffsets::Exceptions);
-      _deopt_handler_offset      = _stub_offset + offsets->value(CodeOffsets::Deopt);
+      bool has_exception_handler = (offsets->value(CodeOffsets::Exceptions) != -1);
+      assert(has_exception_handler == (compiler->type() != compiler_c2),
+             "C2 compiler doesn't provide exception handler stub code.");
+      if (has_exception_handler) {
+        _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions);
+      } else {
+        _exception_offset = -1;
+      }
+
+      _deopt_handler_entry_offset = _stub_offset + offsets->value(CodeOffsets::Deopt);
     }
     if (offsets->value(CodeOffsets::UnwindHandler) != -1) {
       // C1 generates UnwindHandler at the end of instructions section.
@@ -4024,7 +4031,7 @@ const char* nmethod::nmethod_section_label(address pos) const {
   // Check stub_code before checking exception_handler or deopt_handler.
   if (pos == this->stub_begin())                                        label = "[Stub Code]";
   if (JVMCI_ONLY(_exception_offset >= 0 &&) pos == exception_begin())          label = "[Exception Handler]";
-  if (JVMCI_ONLY(_deopt_handler_offset != -1 &&) pos == deopt_handler_begin()) label = "[Deopt Handler Code]";
+  if (JVMCI_ONLY(_deopt_handler_entry_offset != -1 &&) pos == deopt_handler_entry()) label = "[Deopt Handler Entry Point]";
   return label;
 }
 
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 34accf428b6..0fa9d7fda9e 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -229,7 +229,7 @@ class nmethod : public CodeBlob {
   int _exception_offset;
   // All deoptee's will resume execution at this location described by
   // this offset.
-  int _deopt_handler_offset;
+  int _deopt_handler_entry_offset;
   // Offset (from insts_end) of the unwind handler if it exists
   int16_t  _unwind_handler_offset;
   // Number of arguments passed on the stack
@@ -617,7 +617,7 @@ public:
   address stub_begin            () const { return           header_begin() + _stub_offset             ; }
   address stub_end              () const { return           code_end()     ; }
   address exception_begin       () const { return           header_begin() + _exception_offset        ; }
-  address deopt_handler_begin   () const { return           header_begin() + _deopt_handler_offset    ; }
+  address deopt_handler_entry   () const { return           header_begin() + _deopt_handler_entry_offset    ; }
   address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (insts_end() - _unwind_handler_offset) : nullptr; }
   oop*    oops_begin            () const { return (oop*)    data_begin(); }
   oop*    oops_end              () const { return (oop*)    data_end(); }
diff --git a/src/hotspot/share/code/nmethod.inline.hpp b/src/hotspot/share/code/nmethod.inline.hpp
index 44331db669c..ecee3c0c31a 100644
--- a/src/hotspot/share/code/nmethod.inline.hpp
+++ b/src/hotspot/share/code/nmethod.inline.hpp
@@ -34,7 +34,7 @@
 inline bool nmethod::is_deopt_pc(address pc) { return is_deopt_entry(pc); }
 
 inline bool nmethod::is_deopt_entry(address pc) {
-  return pc == deopt_handler_begin();
+  return pc == deopt_handler_entry();
 }
 
 // class ExceptionCache methods
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 84c01c68e38..136fc8ac864 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1347,20 +1347,18 @@ CodeBuffer* PhaseOutput::init_buffer() {
 
   // nmethod and CodeBuffer count stubs & constants as part of method's code.
   // class HandlerImpl is platform-specific and defined in the *.ad files.
-  int exception_handler_req = HandlerImpl::size_exception_handler() + MAX_stubs_size; // add marginal slop for handler
   int deopt_handler_req     = HandlerImpl::size_deopt_handler()     + MAX_stubs_size; // add marginal slop for handler
   stub_req += MAX_stubs_size;   // ensure per-stub margin
   code_req += MAX_inst_size;    // ensure per-instruction margin
 
   if (StressCodeBuffers)
-    code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
+    code_req = const_req = stub_req = deopt_handler_req = 0x10;  // force expansion
 
   int total_req =
           const_req +
           code_req +
           pad_req +
           stub_req +
-          exception_handler_req +
           deopt_handler_req;               // deopt handler
 
   CodeBuffer* cb = code_buffer();
@@ -1789,8 +1787,6 @@ void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) {
   // Only java methods have exception handlers and deopt handlers
   // class HandlerImpl is platform-specific and defined in the *.ad files.
   if (C->method()) {
-    // Emit the exception handler code.
-    _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(masm));
     if (C->failing()) {
       return; // CodeBuffer::expand failed
     }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 0aa7b392b17..e2029a26d37 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -498,6 +498,9 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
                         RegisterMap::WalkContinuation::skip);
   // Now get the deoptee with a valid map
   frame deoptee = stub_frame.sender(&map);
+  if (exec_mode == Unpack_deopt) {
+    assert(deoptee.is_deoptimized_frame(), "frame is not marked for deoptimization");
+  }
   // Set the deoptee nmethod
   assert(current->deopt_compiled_method() == nullptr, "Pending deopt!");
   nmethod* nm = deoptee.cb()->as_nmethod_or_null();
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index b5cd4acc75d..8f969600ba8 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -206,7 +206,7 @@ address frame::raw_pc() const {
   if (is_deoptimized_frame()) {
     nmethod* nm = cb()->as_nmethod_or_null();
     assert(nm != nullptr, "only nmethod is expected here");
-    return nm->deopt_handler_begin() - pc_return_offset;
+    return nm->deopt_handler_entry() - pc_return_offset;
   } else {
     return (pc() - pc_return_offset);
   }
@@ -355,7 +355,7 @@ void frame::deoptimize(JavaThread* thread) {
 
   // If the call site is a MethodHandle call site use the MH deopt handler.
   nmethod* nm = _cb->as_nmethod();
-  address deopt = nm->deopt_handler_begin();
+  address deopt = nm->deopt_handler_entry();
 
   NativePostCallNop* inst = nativePostCallNop_at(pc());
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 79c7c0b32b4..e277e1fb569 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -87,6 +87,9 @@
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
 #if INCLUDE_JFR
 #include "jfr/jfr.inline.hpp"
 #endif
@@ -601,6 +604,11 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
       // The deferred StackWatermarkSet::after_unwind check will be performed in
       // * OptoRuntime::handle_exception_C_helper for C2 code
       // * exception_handler_for_pc_helper via Runtime1::handle_exception_from_callee_id for C1 code
+#ifdef COMPILER2
+      if (nm->compiler_type() == compiler_c2) {
+        return OptoRuntime::exception_blob()->entry_point();
+      }
+#endif // COMPILER2
       return nm->exception_begin();
     }
   }
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index a75e67e9b56..e1ab063cfd6 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -534,7 +534,7 @@
   nonstatic_field(nmethod,                     _osr_link,                                     nmethod*)                              \
   nonstatic_field(nmethod,                     _state,                                        volatile signed char)                  \
   nonstatic_field(nmethod,                     _exception_offset,                             int)                                   \
-  nonstatic_field(nmethod,                     _deopt_handler_offset,                         int)                                   \
+  nonstatic_field(nmethod,                     _deopt_handler_entry_offset,                   int)                                   \
   nonstatic_field(nmethod,                     _orig_pc_offset,                               int)                                   \
   nonstatic_field(nmethod,                     _stub_offset,                                  int)                                   \
   nonstatic_field(nmethod,                     _immutable_data_ref_count_offset,              int)                                   \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index 91302dba0f6..f935c56b536 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -48,7 +48,7 @@ public class NMethod extends CodeBlob {
 
   /** Offsets for different nmethod parts */
   private static CIntegerField exceptionOffsetField;
-  private static CIntegerField deoptHandlerOffsetField;
+  private static CIntegerField deoptHandlerEntryOffsetField;
   private static CIntegerField origPCOffsetField;
   private static CIntegerField stubOffsetField;
   private static CIntField     handlerTableOffsetField;
@@ -86,7 +86,7 @@ public class NMethod extends CodeBlob {
     immutableDataField                 = type.getAddressField("_immutable_data");
     immutableDataSizeField             = type.getCIntegerField("_immutable_data_size");
     exceptionOffsetField               = type.getCIntegerField("_exception_offset");
-    deoptHandlerOffsetField            = type.getCIntegerField("_deopt_handler_offset");
+    deoptHandlerEntryOffsetField       = type.getCIntegerField("_deopt_handler_entry_offset");
     origPCOffsetField                  = type.getCIntegerField("_orig_pc_offset");
     stubOffsetField                    = type.getCIntegerField("_stub_offset");
     scopesPCsOffsetField               = type.getCIntegerField("_scopes_pcs_offset");
@@ -121,16 +121,16 @@ public class NMethod extends CodeBlob {
   public boolean isOSRMethod()    { return getEntryBCI() != VM.getVM().getInvocationEntryBCI(); }
 
   /** Boundaries for different parts */
-  public Address constantsBegin()             { return contentBegin();                                     }
-  public Address constantsEnd()               { return codeBegin();                                        }
-  public Address instsBegin()                 { return codeBegin();                                        }
-  public Address instsEnd()                   { return headerBegin().addOffsetTo(getStubOffset());         }
-  public Address exceptionBegin()             { return headerBegin().addOffsetTo(getExceptionOffset());    }
-  public Address deoptHandlerBegin()          { return headerBegin().addOffsetTo(getDeoptHandlerOffset()); }
-  public Address stubBegin()                  { return headerBegin().addOffsetTo(getStubOffset());         }
-  public Address stubEnd()                    { return dataBegin();                                        }
-  public Address oopsBegin()                  { return dataBegin();                                        }
-  public Address oopsEnd()                    { return dataEnd();                                          }
+  public Address constantsBegin()             { return contentBegin();                                          }
+  public Address constantsEnd()               { return codeBegin();                                             }
+  public Address instsBegin()                 { return codeBegin();                                             }
+  public Address instsEnd()                   { return headerBegin().addOffsetTo(getStubOffset());              }
+  public Address exceptionBegin()             { return headerBegin().addOffsetTo(getExceptionOffset());         }
+  public Address deoptHandlerEntry()          { return headerBegin().addOffsetTo(getDeoptHandlerEntryOffset()); }
+  public Address stubBegin()                  { return headerBegin().addOffsetTo(getStubOffset());              }
+  public Address stubEnd()                    { return dataBegin();                                             }
+  public Address oopsBegin()                  { return dataBegin();                                             }
+  public Address oopsEnd()                    { return dataEnd();                                               }
 
   public Address immutableDataBegin()         { return immutableDataField.getValue(addr);                         }
   public Address immutableDataEnd()           { return immutableDataBegin().addOffsetTo(getImmutableDataSize());  }
@@ -262,7 +262,7 @@ public class NMethod extends CodeBlob {
   // Deopt
   // Return true is the PC is one would expect if the frame is being deopted.
   public boolean isDeoptPc      (Address pc) { return isDeoptEntry(pc); }
-  public boolean isDeoptEntry   (Address pc) { return pc == deoptHandlerBegin(); }
+  public boolean isDeoptEntry   (Address pc) { return pc == deoptHandlerEntry(); }
 
   /** Tells whether frames described by this nmethod can be
       deoptimized. Note: native wrappers cannot be deoptimized. */
@@ -490,7 +490,7 @@ public class NMethod extends CodeBlob {
 
   private int getEntryBCI()                     { return (int) entryBCIField                    .getValue(addr); }
   private int getExceptionOffset()              { return (int) exceptionOffsetField             .getValue(addr); }
-  private int getDeoptHandlerOffset()           { return (int) deoptHandlerOffsetField          .getValue(addr); }
+  private int getDeoptHandlerEntryOffset()      { return (int) deoptHandlerEntryOffsetField     .getValue(addr); }
   private int getStubOffset()                   { return (int) stubOffsetField                  .getValue(addr); }
   private int getScopesDataOffset()             { return (int) scopesDataOffsetField            .getValue(addr); }
   private int getScopesPCsOffset()              { return (int) scopesPCsOffsetField             .getValue(addr); }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
index 27efb631f79..ee9e0ecdafd 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java
@@ -87,7 +87,7 @@ public abstract class Frame implements Cloneable {
       CodeBlob cb = VM.getVM().getCodeCache().findBlob(pc);
       if (cb != null && cb.isJavaMethod()) {
         NMethod nm = (NMethod) cb;
-        if (pc.equals(nm.deoptHandlerBegin())) {
+        if (pc.equals(nm.deoptHandlerEntry())) {
           if (Assert.ASSERTS_ENABLED) {
             Assert.that(this.getUnextendedSP() != null, "null SP in Java frame");
           }
diff --git a/test/hotspot/jtreg/runtime/vthread/Deoptimization.java b/test/hotspot/jtreg/runtime/vthread/Deoptimization.java
new file mode 100644
index 00000000000..050848c3a72
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/vthread/Deoptimization.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test id=vthread-deopt-c1
+ * @summary Deoptimization test for virtual threads (C1)
+ * @requires vm.continuations
+ * @requires vm.compiler1.enabled
+ * @requires vm.opt.TieredStopAtLevel != 0
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                   -XX:-BackgroundCompilation
+ *                   -XX:TieredStopAtLevel=1
+ *                   Deoptimization
+ */
+
+/**
+ * @test id=vthread-deopt-c2
+ * @summary Deoptimization test for virtual threads (C2)
+ * @requires vm.continuations
+ * @requires vm.compiler2.enabled
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                   -XX:-BackgroundCompilation
+ *                   -XX:-TieredCompilation
+ *                   Deoptimization
+ */
+
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.Objects;
+import jdk.test.whitebox.WhiteBox;
+
+public class Deoptimization {
+    static final WhiteBox white_box = WhiteBox.getWhiteBox();
+
+    static class TestTask implements Runnable {
+        CyclicBarrier start_barrier = null;
+        AtomicInteger completed_number = new AtomicInteger(0);
+
+        public void reset(int barrier_parties) {
+            start_barrier = new CyclicBarrier(barrier_parties);
+            completed_number.set(0);
+        }
+
+        public int getNumberWaiting() {
+            return start_barrier.getNumberWaiting();
+        }
+
+        public int getNumberCompleted() {
+            return completed_number.get();
+        }
+
+        public void await() throws BrokenBarrierException, InterruptedException {
+            start_barrier.await();
+        }
+
+        public void run() {
+            try {
+                await();
+            } catch(BrokenBarrierException e) {
+                return;
+            } catch(InterruptedException e) {
+                return;
+            }
+
+            completed_number.getAndIncrement();
+        }
+    }
+
+    static void test(TestTask task, Method method, int vthreads_num) throws Exception {
+        task.reset(vthreads_num + 1 /* 1 for the main thread */);
+
+        Thread[] vthreads = new Thread[vthreads_num];
+        for (int i = 0; i < vthreads_num; i++) {
+            vthreads[i] = Thread.startVirtualThread(task);
+        }
+
+        while (task.getNumberWaiting() != vthreads_num) {
+            Thread.onSpinWait();
+        }
+
+        if (method != null) {
+            if (!white_box.isMethodCompiled(method, false)) {
+                throw new Error("Unexpectedly, it is not compiled.");
+            }
+
+            white_box.deoptimizeMethod(method);
+
+            if (white_box.isMethodCompiled(method, false)) {
+                throw new Error("Unexpectedly, it is compiled.");
+            }
+        }
+
+        task.await();
+
+        for (int i = 0; i < vthreads_num; i++) {
+            vthreads[i].join();
+        }
+
+        if (task.getNumberCompleted() != vthreads_num) {
+            throw new Error("Some threads didn't reach completion");
+        }
+    }
+
+    static int getIntegerOption(String option_name) {
+        Object option_object = white_box.getVMFlag(option_name);
+        String option_string = Objects.toString(option_object);
+        return Integer.parseInt(option_string);
+    }
+
+    public static void main(String[] args) throws Exception {
+        int tiered_stop_at_level = getIntegerOption("TieredStopAtLevel");
+
+        Method method_run = TestTask.class.getMethod("run");
+        white_box.testSetDontInlineMethod(method_run, true);
+
+        Method method_await = TestTask.class.getMethod("await");
+        white_box.testSetDontInlineMethod(method_await, true);
+
+        TestTask task = new TestTask();
+
+        // Warm-up
+        test(task, null, 2);
+
+        white_box.enqueueMethodForCompilation(method_run, tiered_stop_at_level);
+
+        // Deoptimization test
+        test(task, method_run, 10000);
+    }
+}

From 8bafc2f0aecbbe548573712a9dc31c9764f82f71 Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <qamai@openjdk.org>
Date: Mon, 24 Nov 2025 18:12:36 +0000
Subject: [PATCH 323/512] 8371789: C2: More explicit dump results for TypePtr

Reviewed-by: chagedorn, vlivanov
---
 src/hotspot/share/opto/type.cpp               | 231 ++++++------------
 src/hotspot/share/opto/type.hpp               |  20 +-
 .../compiler/lib/ir_framework/IRNode.java     |  24 +-
 3 files changed, 109 insertions(+), 166 deletions(-)

diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index 96fee925e5d..ecb8c2c1cd8 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -45,6 +45,8 @@
 #include "opto/type.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/checkedCast.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/stringUtils.hpp"
 
@@ -2979,15 +2981,22 @@ const char *const TypePtr::ptr_msg[TypePtr::lastPTR] = {
 
 #ifndef PRODUCT
 void TypePtr::dump2( Dict &d, uint depth, outputStream *st ) const {
-  if( _ptr == Null ) st->print("null");
-  else st->print("%s *", ptr_msg[_ptr]);
-  if( _offset == OffsetTop ) st->print("+top");
-  else if( _offset == OffsetBot ) st->print("+bot");
-  else if( _offset ) st->print("+%d", _offset);
+  st->print("ptr:%s", ptr_msg[_ptr]);
+  dump_offset(st);
   dump_inline_depth(st);
   dump_speculative(st);
 }
 
+void TypePtr::dump_offset(outputStream* st) const {
+  if (_offset == OffsetBot) {
+    st->print("+bot");
+  } else if (_offset == OffsetTop) {
+    st->print("+top");
+  } else {
+    st->print("+%d", _offset);
+  }
+}
+
 /**
  *dump the speculative part of the type
  */
@@ -3159,11 +3168,12 @@ uint TypeRawPtr::hash(void) const {
 
 //------------------------------dump2------------------------------------------
 #ifndef PRODUCT
-void TypeRawPtr::dump2( Dict &d, uint depth, outputStream *st ) const {
-  if( _ptr == Constant )
-    st->print(INTPTR_FORMAT, p2i(_bits));
-  else
+void TypeRawPtr::dump2(Dict& d, uint depth, outputStream* st) const {
+  if (_ptr == Constant) {
+    st->print("rawptr:Constant:" INTPTR_FORMAT, p2i(_bits));
+  } else {
     st->print("rawptr:%s", ptr_msg[_ptr]);
+  }
 }
 #endif
 
@@ -3798,24 +3808,29 @@ uint TypeOopPtr::hash(void) const {
 
 //------------------------------dump2------------------------------------------
 #ifndef PRODUCT
-void TypeOopPtr::dump2( Dict &d, uint depth, outputStream *st ) const {
+void TypeOopPtr::dump2(Dict& d, uint depth, outputStream* st) const {
   st->print("oopptr:%s", ptr_msg[_ptr]);
-  if( _klass_is_exact ) st->print(":exact");
-  if( const_oop() ) st->print(INTPTR_FORMAT, p2i(const_oop()));
-  switch( _offset ) {
-  case OffsetTop: st->print("+top"); break;
-  case OffsetBot: st->print("+any"); break;
-  case         0: break;
-  default:        st->print("+%d",_offset); break;
+  if (_klass_is_exact) {
+    st->print(":exact");
   }
-  if (_instance_id == InstanceTop)
-    st->print(",iid=top");
-  else if (_instance_id != InstanceBot)
-    st->print(",iid=%d",_instance_id);
-
+  if (const_oop() != nullptr) {
+    st->print(":" INTPTR_FORMAT, p2i(const_oop()));
+  }
+  dump_offset(st);
+  dump_instance_id(st);
   dump_inline_depth(st);
   dump_speculative(st);
 }
+
+void TypeOopPtr::dump_instance_id(outputStream* st) const {
+  if (_instance_id == InstanceTop) {
+    st->print(",iid=top");
+  } else if (_instance_id == InstanceBot) {
+    st->print(",iid=bot");
+  } else {
+    st->print(",iid=%d", _instance_id);
+  }
+}
 #endif
 
 //------------------------------singleton--------------------------------------
@@ -4453,50 +4468,30 @@ bool TypeInstPtr::maybe_java_subtype_of_helper(const TypeOopPtr* other, bool thi
 #ifndef PRODUCT
 void TypeInstPtr::dump2(Dict &d, uint depth, outputStream* st) const {
   // Print the name of the klass.
+  st->print("instptr:");
   klass()->print_name_on(st);
   _interfaces->dump(st);
 
-  switch( _ptr ) {
-  case Constant:
-    if (WizardMode || Verbose) {
-      ResourceMark rm;
-      stringStream ss;
+  if (_ptr == Constant && (WizardMode || Verbose)) {
+    ResourceMark rm;
+    stringStream ss;
 
-      st->print(" ");
-      const_oop()->print_oop(&ss);
-      // 'const_oop->print_oop()' may emit newlines('\n') into ss.
-      // suppress newlines from it so -XX:+Verbose -XX:+PrintIdeal dumps one-liner for each node.
-      char* buf = ss.as_string(/* c_heap= */false);
-      StringUtils::replace_no_expand(buf, "\n", "");
-      st->print_raw(buf);
-    }
-  case BotPTR:
-    if (!WizardMode && !Verbose) {
-      if( _klass_is_exact ) st->print(":exact");
-      break;
-    }
-  case TopPTR:
-  case AnyNull:
-  case NotNull:
-    st->print(":%s", ptr_msg[_ptr]);
-    if( _klass_is_exact ) st->print(":exact");
-    break;
-  default:
-    break;
+    st->print(" ");
+    const_oop()->print_oop(&ss);
+    // 'const_oop->print_oop()' may emit newlines('\n') into ss.
+    // suppress newlines from it so -XX:+Verbose -XX:+PrintIdeal dumps one-liner for each node.
+    char* buf = ss.as_string(/* c_heap= */false);
+    StringUtils::replace_no_expand(buf, "\n", "");
+    st->print_raw(buf);
   }
 
-  if( _offset ) {               // Dump offset, if any
-    if( _offset == OffsetBot )      st->print("+any");
-    else if( _offset == OffsetTop ) st->print("+unknown");
-    else st->print("+%d", _offset);
+  st->print(":%s", ptr_msg[_ptr]);
+  if (_klass_is_exact) {
+    st->print(":exact");
   }
 
-  st->print(" *");
-  if (_instance_id == InstanceTop)
-    st->print(",iid=top");
-  else if (_instance_id != InstanceBot)
-    st->print(",iid=%d",_instance_id);
-
+  dump_offset(st);
+  dump_instance_id(st);
   dump_inline_depth(st);
   dump_speculative(st);
 }
@@ -5089,26 +5084,17 @@ const Type *TypeAryPtr::xdual() const {
 //------------------------------dump2------------------------------------------
 #ifndef PRODUCT
 void TypeAryPtr::dump2( Dict &d, uint depth, outputStream *st ) const {
-  _ary->dump2(d,depth,st);
+  st->print("aryptr:");
+  _ary->dump2(d, depth, st);
   _interfaces->dump(st);
 
-  switch( _ptr ) {
-  case Constant:
+  if (_ptr == Constant) {
     const_oop()->print(st);
-    break;
-  case BotPTR:
-    if (!WizardMode && !Verbose) {
-      if( _klass_is_exact ) st->print(":exact");
-      break;
-    }
-  case TopPTR:
-  case AnyNull:
-  case NotNull:
-    st->print(":%s", ptr_msg[_ptr]);
-    if( _klass_is_exact ) st->print(":exact");
-    break;
-  default:
-    break;
+  }
+
+  st->print(":%s", ptr_msg[_ptr]);
+  if (_klass_is_exact) {
+    st->print(":exact");
   }
 
   if( _offset != 0 ) {
@@ -5126,12 +5112,8 @@ void TypeAryPtr::dump2( Dict &d, uint depth, outputStream *st ) const {
       }
     }
   }
-  st->print(" *");
-  if (_instance_id == InstanceTop)
-    st->print(",iid=top");
-  else if (_instance_id != InstanceBot)
-    st->print(",iid=%d",_instance_id);
 
+  dump_instance_id(st);
   dump_inline_depth(st);
   dump_speculative(st);
 }
@@ -5490,13 +5472,10 @@ const Type *TypeMetadataPtr::xdual() const {
 #ifndef PRODUCT
 void TypeMetadataPtr::dump2( Dict &d, uint depth, outputStream *st ) const {
   st->print("metadataptr:%s", ptr_msg[_ptr]);
-  if( metadata() ) st->print(INTPTR_FORMAT, p2i(metadata()));
-  switch( _offset ) {
-  case OffsetTop: st->print("+top"); break;
-  case OffsetBot: st->print("+any"); break;
-  case         0: break;
-  default:        st->print("+%d",_offset); break;
+  if (metadata() != nullptr) {
+    st->print(":" INTPTR_FORMAT, p2i(metadata()));
   }
+  dump_offset(st);
 }
 #endif
 
@@ -5644,44 +5623,6 @@ intptr_t TypeKlassPtr::get_con() const {
   return (intptr_t)k->constant_encoding();
 }
 
-//------------------------------dump2------------------------------------------
-// Dump Klass Type
-#ifndef PRODUCT
-void TypeKlassPtr::dump2(Dict & d, uint depth, outputStream *st) const {
-  switch(_ptr) {
-  case Constant:
-    st->print("precise ");
-  case NotNull:
-    {
-      const char *name = klass()->name()->as_utf8();
-      if (name) {
-        st->print("%s: " INTPTR_FORMAT, name, p2i(klass()));
-      } else {
-        ShouldNotReachHere();
-      }
-      _interfaces->dump(st);
-    }
-  case BotPTR:
-    if (!WizardMode && !Verbose && _ptr != Constant) break;
-  case TopPTR:
-  case AnyNull:
-    st->print(":%s", ptr_msg[_ptr]);
-    if (_ptr == Constant) st->print(":exact");
-    break;
-  default:
-    break;
-  }
-
-  if (_offset) {               // Dump offset, if any
-    if (_offset == OffsetBot)      { st->print("+any"); }
-    else if (_offset == OffsetTop) { st->print("+unknown"); }
-    else                            { st->print("+%d", _offset); }
-  }
-
-  st->print(" *");
-}
-#endif
-
 //=============================================================================
 // Convenience common pre-built types.
 
@@ -6036,6 +5977,15 @@ const TypeKlassPtr* TypeInstKlassPtr::try_improve() const {
   return this;
 }
 
+#ifndef PRODUCT
+void TypeInstKlassPtr::dump2(Dict& d, uint depth, outputStream* st) const {
+  st->print("instklassptr:");
+  klass()->print_name_on(st);
+  _interfaces->dump(st);
+  st->print(":%s", ptr_msg[_ptr]);
+  dump_offset(st);
+}
+#endif // PRODUCT
 
 const TypeAryKlassPtr *TypeAryKlassPtr::make(PTR ptr, const Type* elem, ciKlass* k, int offset) {
   return (TypeAryKlassPtr*)(new TypeAryKlassPtr(ptr, elem, k, offset))->hashcons();
@@ -6507,34 +6457,11 @@ ciKlass* TypeAryKlassPtr::klass() const {
 // Dump Klass Type
 #ifndef PRODUCT
 void TypeAryKlassPtr::dump2( Dict & d, uint depth, outputStream *st ) const {
-  switch( _ptr ) {
-  case Constant:
-    st->print("precise ");
-  case NotNull:
-    {
-      st->print("[");
-      _elem->dump2(d, depth, st);
-      _interfaces->dump(st);
-      st->print(": ");
-    }
-  case BotPTR:
-    if( !WizardMode && !Verbose && _ptr != Constant ) break;
-  case TopPTR:
-  case AnyNull:
-    st->print(":%s", ptr_msg[_ptr]);
-    if( _ptr == Constant ) st->print(":exact");
-    break;
-  default:
-    break;
-  }
-
-  if( _offset ) {               // Dump offset, if any
-    if( _offset == OffsetBot )      { st->print("+any"); }
-    else if( _offset == OffsetTop ) { st->print("+unknown"); }
-    else                            { st->print("+%d", _offset); }
-  }
-
-  st->print(" *");
+  st->print("aryklassptr:[");
+  _elem->dump2(d, depth, st);
+  _interfaces->dump(st);
+  st->print(":%s", ptr_msg[_ptr]);
+  dump_offset(st);
 }
 #endif
 
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index c61c2a64278..4666cfbcf2d 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -1176,15 +1176,15 @@ protected:
   int hash_speculative() const;
   const TypePtr* add_offset_speculative(intptr_t offset) const;
   const TypePtr* with_offset_speculative(intptr_t offset) const;
-#ifndef PRODUCT
-  void dump_speculative(outputStream *st) const;
-#endif
 
   // utility methods to work on the inline depth of the type
   int dual_inline_depth() const;
   int meet_inline_depth(int depth) const;
+
 #ifndef PRODUCT
-  void dump_inline_depth(outputStream *st) const;
+  void dump_speculative(outputStream* st) const;
+  void dump_inline_depth(outputStream* st) const;
+  void dump_offset(outputStream* st) const;
 #endif
 
   // TypeInstPtr (TypeAryPtr resp.) and TypeInstKlassPtr (TypeAryKlassPtr resp.) implement very similar meet logic.
@@ -1364,6 +1364,10 @@ protected:
   virtual ciKlass* exact_klass_helper() const { return nullptr; }
   virtual ciKlass* klass() const { return _klass;     }
 
+#ifndef PRODUCT
+  void dump_instance_id(outputStream* st) const;
+#endif // PRODUCT
+
 public:
 
   bool is_java_subtype_of(const TypeOopPtr* other) const {
@@ -1832,9 +1836,6 @@ public:
 
   virtual const TypeKlassPtr* try_improve() const { return this; }
 
-#ifndef PRODUCT
-  virtual void dump2( Dict &d, uint depth, outputStream *st ) const; // Specialized per-Type dumping
-#endif
 private:
   virtual bool is_meet_subtype_of(const TypePtr* other) const {
     return is_meet_subtype_of_helper(other->is_klassptr(), klass_is_exact(), other->is_klassptr()->klass_is_exact());
@@ -1914,6 +1915,11 @@ public:
   // Convenience common pre-built types.
   static const TypeInstKlassPtr* OBJECT; // Not-null object klass or below
   static const TypeInstKlassPtr* OBJECT_OR_NULL; // Maybe-null version of same
+
+#ifndef PRODUCT
+  virtual void dump2(Dict& d, uint depth, outputStream* st) const;
+#endif // PRODUCT
+
 private:
   virtual bool is_meet_subtype_of_helper(const TypeKlassPtr* other, bool this_xk, bool other_xk) const;
 };
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 25ebcc94844..a730fcb30cf 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -3208,16 +3208,26 @@ public class IRNode {
     }
 
     // Typename in load/store have the structure:
-    // @fully/qualified/package/name/to/TheClass+12 *
+    // @ptrtype:fully/qualified/package/name/to/TheClass:ptrlattice+12
+    // with ptrtype being the kind of the type such as instptr, aryptr, etc, and ptrlattice being
+    // the kind of the value such as BotPTR, NotNull, etc.
     // And variation:
-    // - after @, we can have "stable:" or other labels, with optional space after ':'
-    // - the class can actually be a subclass, with $ separator (and it must be ok to give only the deepest one
+    // - after ptrtype, we can have "stable:" or other labels, with optional space after ':'
+    // - the class can actually be a nested class, with $ separator (and it must be ok to give only the deepest one
     // - after the class name, we can have a comma-separated list of implemented interfaces enclosed in parentheses
-    // - before the offset, we can have something like ":NotNull", either way, seeing "+" or ":" means the end of the type
     // Worst case, it can be something like:
-    // @bla: bli:a/b/c$d$e (f/g,h/i/j):NotNull+24 *
-    private static final String LOAD_STORE_PREFIX = "@(\\w+: ?)*[\\w/\\$]*\\b";
-    private static final String LOAD_STORE_SUFFIX = "( \\([^\\)]+\\))?(:|\\+)\\S* \\*";
+    // @bla: bli:a/b/c$d$e (f/g,h/i/j):NotNull+24
+
+    // @ matches the start character of the pattern
+    // (\w+: ?)+ tries to match the pattern 'ptrtype:' or 'stable:' with optional trailing whitespaces
+    // (\w/)* tries to match the pattern 'a/b/`
+    // (\w$)* tries to match the pattern 'c$d$'
+    // \b asserts that the next character is a word character
+    private static final String LOAD_STORE_PREFIX = "@(\\w+: ?)+(\\w/)*(\\w$)*\\b";
+    // ( \([^\)]+\))? tries to match the pattern ' (f/g,h/i/j)'
+    // :\w+ tries to match the pattern ':NotNull'
+    // .* tries to match the remaining of the pattern
+    private static final String LOAD_STORE_SUFFIX = "( \\([^\\)]+\\))?:\\w+.*";
 
     private static void loadOfNodes(String irNodePlaceholder, String irNodeRegex) {
         String regex = START + irNodeRegex + MID + LOAD_STORE_PREFIX + IS_REPLACED + LOAD_STORE_SUFFIX + END;

From 507a6d327f1c613a130273727ee4154b5b4d7ca4 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 24 Nov 2025 21:22:41 +0000
Subject: [PATCH 324/512] 8368001:
 java/text/Format/NumberFormat/NumberRoundTrip.java timed out

Reviewed-by: naoto
---
 .../Format/NumberFormat/NumberRoundTrip.java  | 270 +++++++-----------
 1 file changed, 99 insertions(+), 171 deletions(-)

diff --git a/test/jdk/java/text/Format/NumberFormat/NumberRoundTrip.java b/test/jdk/java/text/Format/NumberFormat/NumberRoundTrip.java
index f8a57e3ae62..be69d835c32 100644
--- a/test/jdk/java/text/Format/NumberFormat/NumberRoundTrip.java
+++ b/test/jdk/java/text/Format/NumberFormat/NumberRoundTrip.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,28 @@
 
 /*
  * @test
- * @summary round trip test NumberFormat
+ * @bug 4266589 8031145 8164791 8316696 8368001
+ * @summary NumberFormat round trip testing of parsing and formatting.
+ *      This test checks 4 factory instances per locale against ~20 numeric inputs.
+ *      Samples ~1/4 of the available locales provided by NumberFormat.
  * @key randomness
+ * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
  * @run junit NumberRoundTrip
  */
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.Locale;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.fail;
+import jdk.test.lib.RandomFactory;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * This class tests the round-trip behavior of NumberFormat, DecimalFormat, and DigitList.
@@ -44,187 +53,106 @@ import static org.junit.jupiter.api.Assertions.fail;
  * Two tests are applied:  String preservation, and numeric preservation.  String
  * preservation is exact; numeric preservation is not.  However, numeric preservation
  * should extend to the few least-significant bits.
- * //bug472
  */
 public class NumberRoundTrip {
-    static final boolean STRING_COMPARE = true;
-    static final boolean EXACT_NUMERIC_COMPARE = false;
-    static final double MAX_ERROR = 1e-14;
-    static double max_numeric_error = 0;
-    static double min_numeric_error = 1;
 
-    String localeName, formatName;
+    private static final Random RND = RandomFactory.getRandom();
 
-    @Test
-    public void TestNumberFormatRoundTrip() {
-        System.out.println("Default Locale");
-        localeName = "Default Locale";
-        formatName = "getInstance";
-        doTest(NumberFormat.getInstance());
-        formatName = "getNumberInstance";
-        doTest(NumberFormat.getNumberInstance());
-        formatName = "getCurrencyInstance";
-        doTest(NumberFormat.getCurrencyInstance());
-        formatName = "getPercentInstance";
-        doTest(NumberFormat.getPercentInstance());
+    @ParameterizedTest
+    @MethodSource
+    void testNumberFormatRoundTrip(NumberFormat fmt) {
+        fmt.setMaximumFractionDigits(Integer.MAX_VALUE);
+        Stream.concat(numbers.stream(), randomNumbers())
+                .forEach(num -> test(fmt, num));
+    }
 
-        Locale[] loc = NumberFormat.getAvailableLocales();
-        for (int i=0; i<loc.length; ++i) {
-            System.out.println(loc[i].getDisplayName());
-            localeName = loc[i].toString();
-            formatName = "getInstance";
-            doTest(NumberFormat.getInstance(loc[i]));
-            formatName = "getNumberInstance";
-            doTest(NumberFormat.getNumberInstance(loc[i]));
-            formatName = "getCurrencyInstance";
-            doTest(NumberFormat.getCurrencyInstance(loc[i]));
-            formatName = "getPercentInstance";
-            doTest(NumberFormat.getPercentInstance(loc[i]));
+    private void test(NumberFormat fmt, Number num) {
+        String originalFormatted = fmt.format(num);
+        Number parsedNum = Assertions.assertDoesNotThrow(() -> fmt.parse(originalFormatted),
+                "Failed parse(format(%s))".formatted(num));
+        String parsedFormatted = fmt.format(parsedNum);
+        var equal = originalFormatted.equals(parsedFormatted);
+        // Try BigDecimal parsing, if not equal
+        if (!equal) {
+            var df = Assertions.assertInstanceOf(DecimalFormat.class, fmt);
+            df.setParseBigDecimal(true);
+            parsedNum = Assertions.assertDoesNotThrow(() -> fmt.parse(originalFormatted),
+                    "Failed BigDecimal parse(format(%s))".formatted(num));
+            parsedFormatted = fmt.format(parsedNum);
+            df.setParseBigDecimal(false);
+            Assertions.assertEquals(originalFormatted, parsedFormatted,
+                    "Failed to round-trip format(parse(format(%s)))".formatted(num));
         }
-
-        System.out.println("Numeric error " +
-              min_numeric_error + " to " +
-              max_numeric_error);
+        // Numeric mismatch to the amount of 1e-14 is tolerable
+        var error = proportionalError(num, parsedNum);
+        Assertions.assertFalse(error > 1e-14,
+                "Round tripping %s caused numeric error: %s".formatted(num, error));
     }
 
-    public void doTest(NumberFormat fmt) {
-        doTest(fmt, Double.NaN);
-        doTest(fmt, Double.POSITIVE_INFINITY);
-        doTest(fmt, Double.NEGATIVE_INFINITY);
-
-        doTest(fmt, 500);
-        doTest(fmt, 0);
-        doTest(fmt, 5555555555555555L);
-        doTest(fmt, 55555555555555555L);
-        doTest(fmt, 9223372036854775807L);
-        doTest(fmt, 9223372036854775808.0);
-        doTest(fmt, -9223372036854775808L);
-        doTest(fmt, -9223372036854775809.0);
-
-        for (int i=0; i<2; ++i) {
-            doTest(fmt, randomDouble(1));
-            doTest(fmt, randomDouble(10000));
-            doTest(fmt, Math.floor(randomDouble(10000)));
-            doTest(fmt, randomDouble(1e50));
-            doTest(fmt, randomDouble(1e-50));
-            doTest(fmt, randomDouble(1e100));
-            // The use of double d such that isInfinite(100d) causes the
-            // numeric test to fail with percent formats (bug 4266589).
-            // Largest double s.t. 100d < Inf: d=1.7976931348623156E306
-            doTest(fmt, randomDouble(1e306));
-            doTest(fmt, randomDouble(1e-323));
-            doTest(fmt, randomDouble(1e-100));
-        }
+    // Regular, number, currency, and percent instance per locale
+    private static Stream<Arguments> testNumberFormatRoundTrip() {
+        return Stream.concat(
+                // Default Locale
+                Stream.of(
+                        Arguments.of(NumberFormat.getInstance()),
+                        Arguments.of(NumberFormat.getNumberInstance()),
+                        Arguments.of(NumberFormat.getCurrencyInstance()),
+                        Arguments.of(NumberFormat.getPercentInstance())),
+                // ~1000 locales returned from provider.
+                // Too expensive to test all locales, so sample a reasonable amount
+                Arrays.stream(NumberFormat.getAvailableLocales())
+                        .filter(_ -> RND.nextDouble() < .25)
+                        .flatMap(loc -> Stream.of(
+                        Arguments.of(NumberFormat.getInstance(loc)),
+                        Arguments.of(NumberFormat.getNumberInstance(loc)),
+                        Arguments.of(NumberFormat.getCurrencyInstance(loc)),
+                        Arguments.of(NumberFormat.getPercentInstance(loc)))
+                )
+        );
     }
 
-    /**
-     * Return a random value from -range..+range.
-     */
-    public double randomDouble(double range) {
-        double a = Math.random();
-        return (2.0 * range * a) - range;
+    // Fixed set of numbers to test each locale against
+    private static final List<Number> numbers = List.of(
+            Double.NaN,
+            Double.POSITIVE_INFINITY,
+            Double.NEGATIVE_INFINITY,
+            500,
+            0,
+            5555555555555555L,
+            55555555555555555L,
+            9223372036854775807L,
+            9223372036854775808.0,
+            -9223372036854775808L,
+            -9223372036854775809.0
+    );
+
+    // Compute fresh batch of random numbers per locale
+    private Stream<Number> randomNumbers() {
+        return Stream.of(
+                randomDouble(1),
+                randomDouble(10000),
+                Math.floor(randomDouble(10000)),
+                randomDouble(1e50),
+                randomDouble(1e-50),
+                randomDouble(1e100),
+                // The use of double d such that isInfinite(100d) causes the
+                // numeric test to fail with percent formats (bug 4266589).
+                // Largest double s.t. 100d < Inf: d=1.7976931348623156E306
+                randomDouble(1e306),
+                randomDouble(1e-323),
+                randomDouble(1e-100)
+        );
     }
 
-    public void doTest(NumberFormat fmt, double value) {
-        doTest(fmt, Double.valueOf(value));
+    // Return a random value from -range..+range.
+    private static double randomDouble(double range) {
+        return RND.nextDouble(-range, range);
     }
 
-    public void doTest(NumberFormat fmt, long value) {
-        doTest(fmt, Long.valueOf(value));
-    }
-
-    static double proportionalError(Number a, Number b) {
+    private static double proportionalError(Number a, Number b) {
         double aa = a.doubleValue(), bb = b.doubleValue();
         double error = aa - bb;
         if (aa != 0 && bb != 0) error /= aa;
         return Math.abs(error);
     }
-
-    public void doTest(NumberFormat fmt, Number value) {
-        fmt.setMaximumFractionDigits(Integer.MAX_VALUE);
-        String s = fmt.format(value), s2 = null;
-        Number n = null;
-        String err = "";
-        try {
-            System.out.println("  " + value + " F> " + escape(s));
-            n = fmt.parse(s);
-            System.out.println("  " + escape(s) + " P> " + n);
-            s2 = fmt.format(n);
-            System.out.println("  " + n + " F> " + escape(s2));
-
-            if (STRING_COMPARE) {
-                if (!s.equals(s2)) {
-                    if (fmt instanceof DecimalFormat) {
-                        System.out.println("Text mismatch: expected: " + s + ", got: " + s2 + " --- Try BigDecimal parsing.");
-                        ((DecimalFormat)fmt).setParseBigDecimal(true);
-                        n = fmt.parse(s);
-                        System.out.println("  " + escape(s) + " P> " + n);
-                        s2 = fmt.format(n);
-                        System.out.println("  " + n + " F> " + escape(s2));
-                        ((DecimalFormat)fmt).setParseBigDecimal(false);
-
-                        if (!s.equals(s2)) {
-                            err = "STRING ERROR(DecimalFormat): ";
-                        }
-                    } else {
-                        err = "STRING ERROR(NumberFormat): ";
-                    }
-                }
-            }
-
-            if (EXACT_NUMERIC_COMPARE) {
-                if (value.doubleValue() != n.doubleValue()) {
-                    err += "NUMERIC ERROR: ";
-                }
-            } else {
-                // Compute proportional error
-                double error = proportionalError(value, n);
-
-                if (error > MAX_ERROR) {
-                    err += "NUMERIC ERROR " + error + ": ";
-                }
-
-                if (error > max_numeric_error) max_numeric_error = error;
-                if (error < min_numeric_error) min_numeric_error = error;
-            }
-
-            String message = value + typeOf(value) + " F> " +
-                escape(s) + " P> " +
-                n + typeOf(n) + " F> " +
-                escape(s2);
-            if (err.length() > 0) {
-                fail("*** " + err + " with " +
-                      formatName + " in " + localeName +
-                      " " + message);
-            } else {
-                System.out.println(message);
-            }
-        } catch (ParseException e) {
-            fail("*** " + e.toString() + " with " +
-                  formatName + " in " + localeName);
-        }
-    }
-
-    static String typeOf(Number n) {
-        if (n instanceof Long) return " Long";
-        if (n instanceof Double) return " Double";
-        return " Number";
-    }
-
-    static String escape(String s) {
-        StringBuffer buf = new StringBuffer();
-        for (int i=0; i<s.length(); ++i) {
-            char c = s.charAt(i);
-            if (c < (char)0xFF) {
-                buf.append(c);
-            } else {
-                buf.append("\\U");
-                buf.append(Integer.toHexString((c & 0xF000) >> 12));
-                buf.append(Integer.toHexString((c & 0x0F00) >> 8));
-                buf.append(Integer.toHexString((c & 0x00F0) >> 4));
-                buf.append(Integer.toHexString(c & 0x000F));
-            }
-        }
-        return buf.toString();
-    }
 }

From e00dec58083302fb74ebc994a65232c6367aee44 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Mon, 24 Nov 2025 22:10:10 +0000
Subject: [PATCH 325/512] 8371667: Shenandoah: Re-design alloc request type
 enum for better efficiency and cleaner code

Reviewed-by: shade, kdnilsen
---
 .../gc/shenandoah/shenandoahAllocRequest.hpp  | 133 ++++++++----------
 .../share/gc/shenandoah/shenandoahFreeSet.cpp |  32 ++---
 .../shenandoahHeapRegion.inline.hpp           |   2 +
 3 files changed, 70 insertions(+), 97 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
index 78ae78f4c24..05ecfb254a2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
@@ -31,15 +31,37 @@
 
 class ShenandoahAllocRequest : StackObj {
 public:
-  enum Type {
-    _alloc_shared,      // Allocate common, outside of TLAB
-    _alloc_shared_gc,   // Allocate common, outside of GCLAB/PLAB
-    _alloc_cds,         // Allocate for CDS
-    _alloc_tlab,        // Allocate TLAB
-    _alloc_gclab,       // Allocate GCLAB
-    _alloc_plab,        // Allocate PLAB
-    _ALLOC_LIMIT
-  };
+  // Alloc type is an int value with encoded bits in scheme as:
+  // [x|xx|xx|xx]
+  //          ^---- Requester:
+  //                  00 -- mutator
+  //                  10 -- mutator (CDS)
+  //                  01 -- GC
+  //       ^------- Purpose:
+  //                  00 -- shared
+  //                  01 -- TLAB/GCLAB
+  //                  11 -- PLAB
+  //    ^---------- Affiliation:
+  //                  00 -- YOUNG
+  //                  01 -- OLD
+  //                  11 -- OLD, promotion
+  typedef int Type;
+
+  static constexpr int bit_gc_alloc         = 1 << 0;
+  static constexpr int bit_cds_alloc        = 1 << 1;
+  static constexpr int bit_lab_alloc        = 1 << 2;
+  static constexpr int bit_plab_alloc       = 1 << 3;
+  static constexpr int bit_old_alloc        = 1 << 4;
+  static constexpr int bit_promotion_alloc  = 1 << 5;
+
+  static constexpr Type _alloc_shared              = 0;
+  static constexpr Type _alloc_tlab                = bit_lab_alloc;
+  static constexpr Type _alloc_cds                 = bit_cds_alloc;
+  static constexpr Type _alloc_shared_gc           = bit_gc_alloc;
+  static constexpr Type _alloc_shared_gc_old       = bit_gc_alloc | bit_old_alloc;
+  static constexpr Type _alloc_shared_gc_promotion = bit_gc_alloc | bit_old_alloc | bit_promotion_alloc;
+  static constexpr Type _alloc_gclab               = bit_gc_alloc | bit_lab_alloc;
+  static constexpr Type _alloc_plab                = bit_gc_alloc | bit_lab_alloc | bit_plab_alloc | bit_old_alloc;
 
   static const char* alloc_type_to_string(Type type) {
     switch (type) {
@@ -47,6 +69,10 @@ public:
         return "Shared";
       case _alloc_shared_gc:
         return "Shared GC";
+      case _alloc_shared_gc_old:
+        return "Shared GC Old";
+      case _alloc_shared_gc_promotion:
+        return "Shared GC Promotion";
       case _alloc_cds:
         return "CDS";
       case _alloc_tlab:
@@ -80,20 +106,14 @@ private:
   // This is the type of the request.
   Type _alloc_type;
 
-  // This is the generation which the request is targeting.
-  ShenandoahAffiliation const _affiliation;
-
-  // True if this request is trying to copy any object from young to old (promote).
-  bool _is_promotion;
-
 #ifdef ASSERT
   // Check that this is set before being read.
   bool _actual_size_set;
 #endif
 
-  ShenandoahAllocRequest(size_t _min_size, size_t _requested_size, Type _alloc_type, ShenandoahAffiliation affiliation, bool is_promotion = false) :
+  ShenandoahAllocRequest(size_t _min_size, size_t _requested_size, Type _alloc_type) :
           _min_size(_min_size), _requested_size(_requested_size),
-          _actual_size(0), _waste(0), _alloc_type(_alloc_type), _affiliation(affiliation), _is_promotion(is_promotion)
+          _actual_size(0), _waste(0), _alloc_type(_alloc_type)
 #ifdef ASSERT
           , _actual_size_set(false)
 #endif
@@ -101,31 +121,34 @@ private:
 
 public:
   static inline ShenandoahAllocRequest for_tlab(size_t min_size, size_t requested_size) {
-    return ShenandoahAllocRequest(min_size, requested_size, _alloc_tlab, ShenandoahAffiliation::YOUNG_GENERATION);
+    return ShenandoahAllocRequest(min_size, requested_size, _alloc_tlab);
   }
 
   static inline ShenandoahAllocRequest for_gclab(size_t min_size, size_t requested_size) {
-    return ShenandoahAllocRequest(min_size, requested_size, _alloc_gclab, ShenandoahAffiliation::YOUNG_GENERATION);
+    return ShenandoahAllocRequest(min_size, requested_size, _alloc_gclab);
   }
 
   static inline ShenandoahAllocRequest for_plab(size_t min_size, size_t requested_size) {
-    return ShenandoahAllocRequest(min_size, requested_size, _alloc_plab, ShenandoahAffiliation::OLD_GENERATION);
+    return ShenandoahAllocRequest(min_size, requested_size, _alloc_plab);
   }
 
   static inline ShenandoahAllocRequest for_shared_gc(size_t requested_size, ShenandoahAffiliation affiliation, bool is_promotion = false) {
     if (is_promotion) {
-      assert(affiliation == ShenandoahAffiliation::OLD_GENERATION, "Should only promote to old generation");
-      return ShenandoahAllocRequest(0, requested_size, _alloc_shared_gc, affiliation, true);
+      assert(affiliation == OLD_GENERATION, "Should only promote to old generation");
+      return ShenandoahAllocRequest(0, requested_size, _alloc_shared_gc_promotion);
     }
-    return ShenandoahAllocRequest(0, requested_size, _alloc_shared_gc, affiliation);
+    if (affiliation == OLD_GENERATION) {
+      return ShenandoahAllocRequest(0, requested_size, _alloc_shared_gc_old);
+    }
+    return ShenandoahAllocRequest(0, requested_size, _alloc_shared_gc);
   }
 
   static inline ShenandoahAllocRequest for_shared(size_t requested_size) {
-    return ShenandoahAllocRequest(0, requested_size, _alloc_shared, ShenandoahAffiliation::YOUNG_GENERATION);
+    return ShenandoahAllocRequest(0, requested_size, _alloc_shared);
   }
 
   static inline ShenandoahAllocRequest for_cds(size_t requested_size) {
-    return ShenandoahAllocRequest(0, requested_size, _alloc_cds, ShenandoahAffiliation::YOUNG_GENERATION);
+    return ShenandoahAllocRequest(0, requested_size, _alloc_cds);
   }
 
   inline size_t size() const {
@@ -167,71 +190,35 @@ public:
   }
 
   inline bool is_mutator_alloc() const {
-    switch (_alloc_type) {
-      case _alloc_tlab:
-      case _alloc_shared:
-      case _alloc_cds:
-        return true;
-      case _alloc_gclab:
-      case _alloc_plab:
-      case _alloc_shared_gc:
-        return false;
-      default:
-        ShouldNotReachHere();
-        return false;
-    }
+    return (_alloc_type & bit_gc_alloc) == 0;
   }
 
   inline bool is_gc_alloc() const {
-    switch (_alloc_type) {
-      case _alloc_tlab:
-      case _alloc_shared:
-      case _alloc_cds:
-        return false;
-      case _alloc_gclab:
-      case _alloc_plab:
-      case _alloc_shared_gc:
-        return true;
-      default:
-        ShouldNotReachHere();
-        return false;
-    }
+    return (_alloc_type & bit_gc_alloc) != 0;
   }
 
   inline bool is_lab_alloc() const {
-    switch (_alloc_type) {
-      case _alloc_tlab:
-      case _alloc_gclab:
-      case _alloc_plab:
-        return true;
-      case _alloc_shared:
-      case _alloc_shared_gc:
-      case _alloc_cds:
-        return false;
-      default:
-        ShouldNotReachHere();
-        return false;
-    }
+    return (_alloc_type & bit_lab_alloc) != 0;
   }
 
-  bool is_old() const {
-    return _affiliation == OLD_GENERATION;
+  inline bool is_old() const {
+    return (_alloc_type & bit_old_alloc) != 0;
   }
 
-  bool is_young() const {
-    return _affiliation == YOUNG_GENERATION;
+  inline bool is_young() const {
+    return (_alloc_type & bit_old_alloc) == 0;
   }
 
-  ShenandoahAffiliation affiliation() const {
-    return _affiliation;
+  inline ShenandoahAffiliation affiliation() const {
+    return (_alloc_type & bit_old_alloc) == 0 ? YOUNG_GENERATION : OLD_GENERATION ;
   }
 
   const char* affiliation_name() const {
-    return shenandoah_affiliation_name(_affiliation);
+    return shenandoah_affiliation_name(affiliation());
   }
 
-  bool is_promotion() const {
-    return _is_promotion;
+  inline bool is_promotion() const {
+    return (_alloc_type & bit_promotion_alloc) != 0;
   }
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 0deb3b5ba4c..ab7985b3d34 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -1311,19 +1311,11 @@ HeapWord* ShenandoahFreeSet::allocate_single(ShenandoahAllocRequest& req, bool&
 
   // Overwrite with non-zero (non-null) values only if necessary for allocation bookkeeping.
 
-  switch (req.type()) {
-    case ShenandoahAllocRequest::_alloc_tlab:
-    case ShenandoahAllocRequest::_alloc_shared:
-    case ShenandoahAllocRequest::_alloc_cds:
-      return allocate_for_mutator(req, in_new_region);
-    case ShenandoahAllocRequest::_alloc_gclab:
-    case ShenandoahAllocRequest::_alloc_plab:
-    case ShenandoahAllocRequest::_alloc_shared_gc:
-      return allocate_for_collector(req, in_new_region);
-    default:
-      ShouldNotReachHere();
+  if (req.is_mutator_alloc()) {
+    return allocate_for_mutator(req, in_new_region);
+  } else {
+    return allocate_for_collector(req, in_new_region);
   }
-  return nullptr;
 }
 
 HeapWord* ShenandoahFreeSet::allocate_for_mutator(ShenandoahAllocRequest &req, bool &in_new_region) {
@@ -1619,21 +1611,13 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
   if (req.is_mutator_alloc()) {
     request_generation = _heap->mode()->is_generational()? _heap->young_generation(): _heap->global_generation();
     orig_partition = ShenandoahFreeSetPartitionId::Mutator;
-  } else if (req.type() == ShenandoahAllocRequest::_alloc_gclab) {
-    request_generation = _heap->mode()->is_generational()? _heap->young_generation(): _heap->global_generation();
-    orig_partition = ShenandoahFreeSetPartitionId::Collector;
-  } else if (req.type() == ShenandoahAllocRequest::_alloc_plab) {
+  } else if (req.is_old()) {
     request_generation = _heap->old_generation();
     orig_partition = ShenandoahFreeSetPartitionId::OldCollector;
   } else {
-    assert(req.type() == ShenandoahAllocRequest::_alloc_shared_gc, "Unexpected allocation type");
-    if (req.is_old()) {
-      request_generation = _heap->old_generation();
-      orig_partition = ShenandoahFreeSetPartitionId::OldCollector;
-    } else {
-      request_generation = _heap->mode()->is_generational()? _heap->young_generation(): _heap->global_generation();
-      orig_partition = ShenandoahFreeSetPartitionId::Collector;
-    }
+    // Not old collector alloc, so this is a young collector gclab or shared allocation
+    request_generation = _heap->mode()->is_generational()? _heap->young_generation(): _heap->global_generation();
+    orig_partition = ShenandoahFreeSetPartitionId::Collector;
   }
   if (alloc_capacity(r) < PLAB::min_size() * HeapWordSize) {
     // Regardless of whether this allocation succeeded, if the remaining memory is less than PLAB:min_size(), retire this region.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
index cad9dc0e932..636f65e2553 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
@@ -129,6 +129,8 @@ inline void ShenandoahHeapRegion::adjust_alloc_metadata(ShenandoahAllocRequest::
   switch (type) {
     case ShenandoahAllocRequest::_alloc_shared:
     case ShenandoahAllocRequest::_alloc_shared_gc:
+    case ShenandoahAllocRequest::_alloc_shared_gc_old:
+    case ShenandoahAllocRequest::_alloc_shared_gc_promotion:
     case ShenandoahAllocRequest::_alloc_cds:
       // Counted implicitly by tlab/gclab allocs
       break;

From 42b108b445b359e1d4b1043dbc1cbd42f551c19c Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Mon, 24 Nov 2025 22:14:24 +0000
Subject: [PATCH 326/512] 8372155: ReleaseInfoPlugin doesn't handle input file
 as UTF-8 properly

Reviewed-by: alanb, jpai
---
 .../internal/plugins/ReleaseInfoPlugin.java   | 10 ++-
 .../tools/jlink/resources/plugins.properties  |  6 +-
 .../jlink/plugins/ReleaseInfoPluginTest.java  | 82 +++++++++++++++++++
 3 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/tools/jlink/plugins/ReleaseInfoPluginTest.java

diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
index b4301ea8e45..25789b4d172 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,13 @@
 package jdk.tools.jlink.internal.plugins;
 
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.io.UncheckedIOException;
 import java.lang.module.ModuleDescriptor;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
@@ -107,8 +109,8 @@ public final class ReleaseInfoPlugin extends AbstractPlugin {
             default: {
                 // --release-info <file>
                 Properties props = new Properties();
-                try (FileInputStream fis = new FileInputStream(operation)) {
-                    props.load(fis);
+                try (Reader reader = Files.newBufferedReader(Path.of(operation))) {
+                    props.load(reader); // Use reader API so as to read in as UTF-8
                 } catch (IOException exp) {
                     throw new UncheckedIOException(exp);
                 }
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
index a4b780a15c3..e9be0b4e587 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key li
 
 release-info.description=\
 <file> option is to load release properties from the supplied file.\n\
+\       The specified file is expected to be encoded in UTF-8.\n\
 add: is to add properties to the 'release' file.\n\
 Any number of <key>=<value> pairs can be passed.\n\
 del: is to delete the list of keys in release file.
@@ -46,7 +47,8 @@ del: is to delete the list of keys in release file.
 release-info.usage=\
 \  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n\
 \                            <file> option is to load release properties from\n\
-\                            the supplied file.\n\
+\                            the supplied file. The specified file is expected\n\
+\                            to be encoded in UTF-8.\n\
 \                            add: is to add properties to the 'release' file.\n\
 \                            Any number of <key>=<value> pairs can be passed.\n\
 \                            del: is to delete the list of keys in release file.
diff --git a/test/jdk/tools/jlink/plugins/ReleaseInfoPluginTest.java b/test/jdk/tools/jlink/plugins/ReleaseInfoPluginTest.java
new file mode 100644
index 00000000000..7db3639e24a
--- /dev/null
+++ b/test/jdk/tools/jlink/plugins/ReleaseInfoPluginTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2025, IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.process.*;
+import jdk.test.lib.Asserts;
+
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.util.Properties;
+
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
+
+import tests.Helper;
+
+/* @test
+ * @bug 8372155
+ * @summary Test the --release-info <file> plugin option
+ * @library ../../lib
+ * @library /test/lib
+ * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jimage
+ *          java.base/jdk.internal.jimage
+ * @build tests.*
+ * @run main/othervm ReleaseInfoPluginTest
+ */
+
+public class ReleaseInfoPluginTest {
+
+    private static final String NON_ASCII = "ößäakl vendor oy";
+    private static final String IMPL = "IMPLEMENTOR";
+    private static final boolean LINKABLE_RUNTIME = LinkableRuntimeImage.isLinkableRuntime();
+
+    public static void main(String[] args) throws Throwable {
+
+        Helper helper = Helper.newHelper(LINKABLE_RUNTIME);
+        if (helper == null) {
+            System.err.println("Test not run");
+            return;
+        }
+        var utf8File = Path.of("release-info-utf-8.txt");
+        Files.writeString(utf8File, IMPL + "=\"" + NON_ASCII + "\"", StandardCharsets.UTF_8);
+        Path image = helper.generateDefaultImage(
+                             new String[] {
+                               "--release-info", utf8File.toString()
+                             }, "java.base").assertSuccess();
+
+        // release file produced should have IMPLEMENTOR in
+        // UTF-8 encoding
+        Path release = image.resolve("release");
+        Properties props = new Properties();
+        try (Reader reader= Files.newBufferedReader(release)) {
+            props.load(reader); // Load as UTF-8
+        }
+        String noQuotesMods = ((String)props.get("MODULES")).replace("\"", "");
+        Asserts.assertEquals("java.base", noQuotesMods);
+        String noQuotesActual = ((String)props.get(IMPL)).replace("\"", "");
+        Asserts.assertEquals(NON_ASCII, noQuotesActual);
+    }
+
+}

From dea95e65a2493b545f78243025d1a5a4957a3806 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Tue, 25 Nov 2025 02:29:49 +0000
Subject: [PATCH 327/512] 8371869: RISC-V: too many warnings when build on
 BPI-F3 SBC

Reviewed-by: fjiang, mli
---
 src/hotspot/cpu/riscv/vm_version_riscv.hpp        | 15 +++++++++------
 .../os_cpu/linux_riscv/vm_version_linux_riscv.cpp | 10 +++++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 16f2e5d8f5b..168a3a576d0 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -89,11 +89,12 @@ class VM_Version : public Abstract_VM_Version {
           FLAG_SET_DEFAULT(flag, true);                                                                     \
         } else {                                                                                            \
           FLAG_SET_DEFAULT(flag, false);                                                                    \
-          stringStream ss;                                                                                  \
-          deps_string(ss, dep0, ##__VA_ARGS__);                                                             \
-          warning("Cannot enable " #flag ", it's missing dependent extension(s) %s", ss.as_string(true));   \
           /* Sync CPU features with flags */                                                                \
           disable_feature();                                                                                \
+          stringStream ss;                                                                                  \
+          ss.print("missing dependent extension(s): ");                                                     \
+          deps_string(ss, dep0, ##__VA_ARGS__);                                                             \
+          log_disabled(ss.as_string(true));                                                                 \
         }                                                                                                   \
       } else {                                                                                              \
         /* Sync CPU features with flags */                                                                  \
@@ -101,11 +102,12 @@ class VM_Version : public Abstract_VM_Version {
           disable_feature();                                                                                \
         } else if (!deps_all_enabled(dep0, ##__VA_ARGS__)) {                                                \
           FLAG_SET_DEFAULT(flag, false);                                                                    \
-          stringStream ss;                                                                                  \
-          deps_string(ss, dep0, ##__VA_ARGS__);                                                             \
-          warning("Cannot enable " #flag ", it's missing dependent extension(s) %s", ss.as_string(true));   \
           /* Sync CPU features with flags */                                                                \
           disable_feature();                                                                                \
+          stringStream ss;                                                                                  \
+          ss.print("missing dependent extension(s): ");                                                     \
+          deps_string(ss, dep0, ##__VA_ARGS__);                                                             \
+          log_disabled(ss.as_string(true));                                                                 \
         }                                                                                                   \
       }                                                                                                     \
   }                                                                                                         \
@@ -136,6 +138,7 @@ class VM_Version : public Abstract_VM_Version {
       RVExtFeatures::current()->clear_feature(_cpu_feature_index);
     }
     void log_enabled();
+    void log_disabled(const char* reason);
 
    protected:
     bool deps_all_enabled(RVExtFeatureValue* dep0, ...) {
diff --git a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
index 0799de014a9..35cbb75e8ff 100644
--- a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
@@ -104,11 +104,15 @@ uint32_t VM_Version::cpu_vector_length() {
 }
 
 void VM_Version::RVExtFeatureValue::log_enabled() {
-  log_debug(os, cpu)("Enabled RV64 feature \"%s\"", pretty());
+  log_info(os, cpu)("Enabled RV64 feature \"%s\"", pretty());
+}
+
+void VM_Version::RVExtFeatureValue::log_disabled(const char* reason) {
+  log_info(os, cpu)("Disabled RV64 feature \"%s\" (%s)", pretty(), reason);
 }
 
 void VM_Version::RVNonExtFeatureValue::log_enabled() {
-  log_debug(os, cpu)("Enabled RV64 feature \"%s\" (%ld)", pretty(), value());
+  log_info(os, cpu)("Enabled RV64 feature \"%s\" (%ld)", pretty(), value());
 }
 
 void VM_Version::setup_cpu_available_features() {
@@ -193,7 +197,7 @@ void VM_Version::setup_cpu_available_features() {
     // via PR_RISCV_SCOPE_PER_THREAD, i.e. on VM attach/deattach.
     int ret = prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_ON, PR_RISCV_SCOPE_PER_PROCESS);
     if (ret == 0) {
-      log_debug(os, cpu)("UseCtxFencei (PR_RISCV_CTX_SW_FENCEI_ON) enabled.");
+      log_info(os, cpu)("UseCtxFencei (PR_RISCV_CTX_SW_FENCEI_ON) enabled.");
     } else {
       FLAG_SET_ERGO(UseCtxFencei, false);
       log_info(os, cpu)("UseCtxFencei (PR_RISCV_CTX_SW_FENCEI_ON) disabled, unsupported by kernel.");

From cc5b35bf69dcf9e7e8037642c94e8d7e5847952d Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 25 Nov 2025 07:05:46 +0000
Subject: [PATCH 328/512] 8370887: DelayScheduler.replace method may break the
 4-ary heap in certain scenarios

Co-authored-by: Doug Lea <dl@openjdk.org>
Reviewed-by: vklang
---
 .../java/util/concurrent/DelayScheduler.java  |  69 ++++++---
 .../AscendingOrderAfterReplace.java           | 140 ++++++++++++++++++
 2 files changed, 191 insertions(+), 18 deletions(-)
 create mode 100644 test/jdk/java/util/concurrent/DelayScheduler/AscendingOrderAfterReplace.java

diff --git a/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java b/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java
index d1f8283489b..1ded0211932 100644
--- a/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java
+++ b/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java
@@ -360,31 +360,36 @@ final class DelayScheduler extends Thread {
                         u.heapIndex = -1;
                     }
                 }
-                if (t != null) {       // sift down
-                    for (int cs; (cs = (k << 2) + 1) < n; ) {
-                        ScheduledForkJoinTask<?> leastChild = null, c;
+                if (t != null) {
+                    while (k > 0) {    // sift up if replaced with smaller value
+                        ScheduledForkJoinTask<?> parent; int pk;
+                        if ((parent = h[pk = (k - 1) >>> 2]) == null ||
+                            parent.when <= d)
+                            break;
+                        parent.heapIndex = k;
+                        h[k] = parent;
+                        k = pk;
+                    }
+                    for (int cs; (cs = (k << 2) + 1) < n; ) { // sift down
+                        ScheduledForkJoinTask<?> leastChild = null;
                         int leastIndex = 0;
-                        long leastValue = Long.MAX_VALUE;
-                        for (int ck = cs, j = 4;;) { // at most 4 children
-                            if ((c = h[ck]) == null)
-                                break;
-                            long cd = c.when;
-                            if (c.status < 0 && alsoReplace < 0) {
-                                alsoReplace = ck;    // at most once per pass
-                                c.heapIndex = -1;
-                            }
-                            else if (leastChild == null || cd < leastValue) {
+                        long leastValue = d;    // at most 4 children
+                        for (int ck, j = 0; j < 4 && (ck = j + cs) < n; ++j) {
+                            ScheduledForkJoinTask<?> c; long cd;
+                            if ((c = h[ck]) != null && (cd = c.when) < leastValue) {
                                 leastValue = cd;
                                 leastIndex = ck;
                                 leastChild = c;
                             }
-                            if (--j == 0 || ++ck >= n)
-                                break;
                         }
-                        if (leastChild == null || d <= leastValue)
+                        if (leastChild == null) // already ordered
                             break;
-                        leastChild.heapIndex = k;
-                        h[k] = leastChild;
+                        if ((h[k] = leastChild).status >= 0 || alsoReplace >= 0)
+                            leastChild.heapIndex = k;
+                        else {
+                            leastChild.heapIndex = -1;
+                            alsoReplace = k;
+                        }
                         k = leastIndex;
                     }
                     t.heapIndex = k;
@@ -393,6 +398,7 @@ final class DelayScheduler extends Thread {
                 k = alsoReplace;
             }
         }
+        assert checkHeap(h, n);
         return n;
     }
 
@@ -451,6 +457,33 @@ final class DelayScheduler extends Thread {
         }
     }
 
+    /**
+     * Invariant checks
+     */
+    private static boolean checkHeap(ScheduledForkJoinTask<?>[] h, int n) {
+        for (int i = 0; i < h.length; ++i) {
+            ScheduledForkJoinTask<?> t = h[i];
+            if (t == null) {         // unused slots all null
+                if (i < n)
+                    return false;
+            }
+            else {
+                long v = t.when;
+                int x = t.heapIndex;
+                if (x != i && x >= 0) // valid index unless removing
+                    return false;
+                if (i > 0 && h[(i - 1) >>> 2].when > v) // ordered wrt parent
+                    return false;
+                int cs = (i << 2) + 1; // ordered wrt children
+                for (int ck, j = 0; j < 4 && (ck = cs + j) < n; ++j) {
+                    if (h[ck].when < v)
+                        return false;
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * Task class for DelayScheduler operations
      */
diff --git a/test/jdk/java/util/concurrent/DelayScheduler/AscendingOrderAfterReplace.java b/test/jdk/java/util/concurrent/DelayScheduler/AscendingOrderAfterReplace.java
new file mode 100644
index 00000000000..fd72b8148d2
--- /dev/null
+++ b/test/jdk/java/util/concurrent/DelayScheduler/AscendingOrderAfterReplace.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8370887
+ * @summary Test that cancelling a delayed task doesn't impact the ordering that other
+ *     delayed tasks execute
+ */
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class AscendingOrderAfterReplace {
+
+    private static final int[] DELAYS_IN_MS = { 3000, 3400, 3900, 3800, 3700, 3600, 3430, 3420, 3310, 3500, 3200 };
+
+    public static void main(String[] args) throws Exception {
+        for (int i = 1; i < DELAYS_IN_MS.length; i++) {
+            System.out.println("=== Test " + i + " ===");
+            while (!testCancel(DELAYS_IN_MS, i)) { }
+        }
+    }
+
+    /**
+     * Schedule the delayed tasks, cancel one of them, and check that the remaining tasks
+     * execute in the ascending order of delay.
+     * @return true if the test passed, false if a retry is needed
+     * @throws RuntimeException if the test fails
+     */
+    private static boolean testCancel(int[] delays, int indexToCancel) throws Exception {
+        log("Delayed tasks: " + toString(delays));
+
+        // delayed tasks add to this queue when they execute
+        var queue = new LinkedTransferQueue<Integer>();
+
+        // pool with one thread to ensure that delayed tasks don't execute concurrently
+        try (var pool = new ForkJoinPool(1)) {
+            long startNanos = System.nanoTime();
+            Future<?>[] futures = Arrays.stream(delays)
+                    .mapToObj(d -> pool.schedule(() -> {
+                        log("Triggered " + d);
+                        queue.add(d);
+                    }, d, MILLISECONDS))
+                    .toArray(Future[]::new);
+            long endNanos = System.nanoTime();
+            log("Delayed tasks submitted");
+
+            // check submit took < min diffs between two delays
+            long submitTime = Duration.ofNanos(endNanos - startNanos).toMillis();
+            long minDiff = minDifference(delays);
+            if (submitTime >= minDiff) {
+                log("Submit took >= " + minDiff + " ms, need to retry");
+                pool.shutdownNow();
+                return false;
+            }
+
+            // give a bit of time for -delayScheduler thread to process pending tasks
+            Thread.sleep(minValue(delays) / 2);
+            log("Cancel " + delays[indexToCancel]);
+            futures[indexToCancel].cancel(true);
+        }
+
+        // delayed tasks should have executed in ascending order of their delay
+        int[] executed = queue.stream().mapToInt(Integer::intValue).toArray();
+        log("Executed: " + toString(executed));
+        if (!isAscendingOrder(executed)) {
+            throw new RuntimeException("Not in ascending order!");
+        }
+        return true;
+    }
+
+    /**
+     * Return the minimum element.
+     */
+    private static int minValue(int[] array) {
+        return IntStream.of(array).min().orElseThrow();
+    }
+
+    /**
+     * Return the minimum difference between any two elements.
+     */
+    private static int minDifference(int[] array) {
+        int[] sorted = array.clone();
+        Arrays.sort(sorted);
+        return IntStream.range(1, sorted.length)
+                .map(i -> sorted[i] - sorted[i - 1])
+                .min()
+                .orElse(0);
+    }
+
+    /**
+     * Return true if the array is in ascending order.
+     */
+    private static boolean isAscendingOrder(int[] array) {
+        return IntStream.range(1, array.length)
+                .allMatch(i -> array[i - 1] <= array[i]);
+    }
+
+    /**
+     * Returns a String containing the elements of an array in index order.
+     */
+    private static String toString(int[] array) {
+        return IntStream.of(array)
+                .mapToObj(Integer::toString)
+                .collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    private static void log(String message) {
+        System.out.println(Instant.now() + " " + message);
+    }
+}
+

From 1226873ab94d2cc341ddb7040aa60c3bf3614feb Mon Sep 17 00:00:00 2001
From: Francesco Nigro <nigro.fra@gmail.com>
Date: Tue, 25 Nov 2025 08:07:17 +0000
Subject: [PATCH 329/512] 8372410: ThreadFactory used by
 Thread.Builder::factory uses non-optimal VarHandle

Reviewed-by: alanb, adinn, liach
---
 src/java.base/share/classes/java/lang/ThreadBuilders.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/ThreadBuilders.java b/src/java.base/share/classes/java/lang/ThreadBuilders.java
index 62c29651d11..033c237877c 100644
--- a/src/java.base/share/classes/java/lang/ThreadBuilders.java
+++ b/src/java.base/share/classes/java/lang/ThreadBuilders.java
@@ -309,7 +309,7 @@ class ThreadBuilders {
 
         String nextThreadName() {
             if (hasCounter) {
-                return name + (long) COUNT.getAndAdd(this, 1);
+                return name + (long) COUNT.getAndAdd(this, 1L);
             } else {
                 return name;
             }

From 5ef2c9aa09247f9853bf04db0df962fcff764499 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 25 Nov 2025 08:25:12 +0000
Subject: [PATCH 330/512] 8370438: Offer link time optimization support on
 library level

Reviewed-by: erikj, serb, azvegint
---
 make/autoconf/flags-cflags.m4                  | 12 ++++++++++++
 make/autoconf/flags-ldflags.m4                 |  4 ++++
 make/autoconf/spec.gmk.template                |  5 +++++
 make/common/NativeCompilation.gmk              |  1 +
 make/common/native/Flags.gmk                   |  9 +++++++++
 make/hotspot/lib/CompileJvm.gmk                |  1 +
 make/hotspot/lib/JvmFeatures.gmk               | 18 ++++--------------
 .../java.desktop/lib/ClientLibraries.gmk       |  1 +
 8 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 9d58a280998..6298bcae416 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -282,10 +282,17 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM="-O0"
     C_O_FLAG_NONE="-O0"
 
+    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+      C_O_FLAG_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects"
+    else
+      C_O_FLAG_LTO="-flto -fno-strict-aliasing"
+    fi
+
     if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
       C_O_FLAG_HIGHEST_JVM="${C_O_FLAG_HIGHEST_JVM} -finline-functions"
       C_O_FLAG_HIGHEST="${C_O_FLAG_HIGHEST} -finline-functions"
       C_O_FLAG_HI="${C_O_FLAG_HI} -finline-functions"
+      C_O_FLAG_LTO="${C_O_FLAG_LTO} -ffat-lto-objects"
     fi
 
     # -D_FORTIFY_SOURCE=2 hardening option needs optimization (at least -O1) enabled
@@ -317,6 +324,7 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM=""
     C_O_FLAG_NONE="-Od"
     C_O_FLAG_SIZE="-O1"
+    C_O_FLAG_LTO="-GL"
   fi
 
   # Now copy to C++ flags
@@ -328,6 +336,7 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   CXX_O_FLAG_DEBUG_JVM="$C_O_FLAG_DEBUG_JVM"
   CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
   CXX_O_FLAG_SIZE="$C_O_FLAG_SIZE"
+  CXX_O_FLAG_LTO="$C_O_FLAG_LTO"
 
   # Adjust optimization flags according to debug level.
   case $DEBUG_LEVEL in
@@ -360,12 +369,15 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   AC_SUBST(C_O_FLAG_NORM)
   AC_SUBST(C_O_FLAG_NONE)
   AC_SUBST(C_O_FLAG_SIZE)
+  AC_SUBST(C_O_FLAG_LTO)
+
   AC_SUBST(CXX_O_FLAG_HIGHEST_JVM)
   AC_SUBST(CXX_O_FLAG_HIGHEST)
   AC_SUBST(CXX_O_FLAG_HI)
   AC_SUBST(CXX_O_FLAG_NORM)
   AC_SUBST(CXX_O_FLAG_NONE)
   AC_SUBST(CXX_O_FLAG_SIZE)
+  AC_SUBST(CXX_O_FLAG_LTO)
 ])
 
 AC_DEFUN([FLAGS_SETUP_CFLAGS],
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 66f8904db89..ad131b20e27 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -61,6 +61,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     fi
 
     BASIC_LDFLAGS_JVM_ONLY=""
+    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing"
 
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
@@ -68,6 +69,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
         -fPIC"
 
+    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing"
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
@@ -87,6 +89,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS="-opt:ref"
     BASIC_LDFLAGS_JDK_ONLY="-incremental:no"
     BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
+    LDFLAGS_LTO="-LTCG:INCREMENTAL"
   fi
 
   if (test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang) \
@@ -148,6 +151,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Export some intermediate variables for compatibility
   LDFLAGS_CXX_JDK="$DEBUGLEVEL_LDFLAGS_JDK_ONLY"
+  AC_SUBST(LDFLAGS_LTO)
   AC_SUBST(LDFLAGS_CXX_JDK)
   AC_SUBST(LDFLAGS_CXX_PARTIAL_LINKING)
 ])
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 0b336721d65..b3d58704c50 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -513,12 +513,14 @@ C_O_FLAG_HI := @C_O_FLAG_HI@
 C_O_FLAG_NORM := @C_O_FLAG_NORM@
 C_O_FLAG_NONE := @C_O_FLAG_NONE@
 C_O_FLAG_SIZE := @C_O_FLAG_SIZE@
+C_O_FLAG_LTO := @C_O_FLAG_LTO@
 CXX_O_FLAG_HIGHEST_JVM := @CXX_O_FLAG_HIGHEST_JVM@
 CXX_O_FLAG_HIGHEST := @CXX_O_FLAG_HIGHEST@
 CXX_O_FLAG_HI := @CXX_O_FLAG_HI@
 CXX_O_FLAG_NORM := @CXX_O_FLAG_NORM@
 CXX_O_FLAG_NONE := @CXX_O_FLAG_NONE@
 CXX_O_FLAG_SIZE := @CXX_O_FLAG_SIZE@
+CXX_O_FLAG_LTO  := @CXX_O_FLAG_LTO@
 
 GENDEPS_FLAGS := @GENDEPS_FLAGS@
 
@@ -587,6 +589,9 @@ LDFLAGS_CXX_JDK := @LDFLAGS_CXX_JDK@
 # LDFLAGS specific to partial linking.
 LDFLAGS_CXX_PARTIAL_LINKING := @LDFLAGS_CXX_PARTIAL_LINKING@
 
+# LDFLAGS specific to link time optimization
+LDFLAGS_LTO := @LDFLAGS_LTO@
+
 # Sometimes a different linker is needed for c++ libs
 LDCXX := @LDCXX@
 # The flags for linking libstdc++ linker.
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 9721f1c0aca..28e186adf5f 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -98,6 +98,7 @@ include native/Paths.gmk
 #   SYSROOT_CFLAGS the compiler flags for using the specific sysroot
 #   SYSROOT_LDFLAGS the linker flags for using the specific sysroot
 #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST, HIGHEST_JVM, SIZE
+#   LINK_TIME_OPTIMIZATION if set to true, enables link time optimization
 #   DISABLED_WARNINGS_<toolchain> Disable the given warnings for the specified toolchain
 #   DISABLED_WARNINGS_<toolchain>_<OS> Disable the given warnings for the specified
 #       toolchain and target OS
diff --git a/make/common/native/Flags.gmk b/make/common/native/Flags.gmk
index 747e090b816..843701cb4db 100644
--- a/make/common/native/Flags.gmk
+++ b/make/common/native/Flags.gmk
@@ -194,6 +194,11 @@ define SetupCompilerFlags
     $1_EXTRA_CXXFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
   endif
 
+  ifeq (true, $$($1_LINK_TIME_OPTIMIZATION))
+    $1_EXTRA_CFLAGS += $(C_O_FLAG_LTO)
+    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_LTO)
+  endif
+
   ifeq (NONE, $$($1_OPTIMIZATION))
     $1_OPT_CFLAGS := $(C_O_FLAG_NONE)
     $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE)
@@ -222,6 +227,10 @@ define SetupLinkerFlags
   # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and TOOLCHAIN_TYPE
   # dependent variables for LDFLAGS and LIBS, and additionally the pair dependent
   # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS
+  ifeq ($$($1_LINK_TIME_OPTIMIZATION), true)
+    $1_EXTRA_LDFLAGS += $(LDFLAGS_LTO)
+  endif
+
   $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \
       $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)) $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))
   $1_EXTRA_LIBS += $$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) \
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index a8b90c92e4d..b0ea27e5081 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -234,6 +234,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LIBS := $(JVM_LIBS), \
     OPTIMIZATION := $(JVM_OPTIMIZATION), \
+    LINK_TIME_OPTIMIZATION := $(JVM_LTO), \
     OBJECT_DIR := $(JVM_OUTPUTDIR)/objs, \
     STRIPFLAGS := $(JVM_STRIPFLAGS), \
     EMBED_MANIFEST := true, \
diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 79bbd6a4106..90ea8a985e3 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -175,22 +175,12 @@ ifeq ($(call check-jvm-feature, link-time-opt), true)
   # Set JVM_OPTIMIZATION directly so other jvm-feature flags can override it
   # later on if desired
   JVM_OPTIMIZATION := HIGHEST_JVM
-  ifeq ($(call isCompiler, gcc), true)
-    JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing \
-        -fno-fat-lto-objects
-    JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto \
-        -fuse-linker-plugin -fno-strict-aliasing
-  else ifeq ($(call isCompiler, clang), true)
-    JVM_CFLAGS_FEATURES += -flto -fno-strict-aliasing
-    ifeq ($(call isBuildOs, aix), true)
-      JVM_CFLAGS_FEATURES += -ffat-lto-objects
-    endif
-    JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto -fno-strict-aliasing
-  else ifeq ($(call isCompiler, microsoft), true)
-    JVM_CFLAGS_FEATURES += -GL
-    JVM_LDFLAGS_FEATURES += -LTCG:INCREMENTAL
+  JVM_LTO := true
+  ifneq ($(call isCompiler, microsoft), true)
+    JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM)
   endif
 else
+  JVM_LTO := false
   ifeq ($(call isCompiler, gcc), true)
     JVM_LDFLAGS_FEATURES += -O1
   endif
diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 2c29092cdd6..b036973b776 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -226,6 +226,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
       OPTIMIZATION := SIZE, \
+      LINK_TIME_OPTIMIZATION := true, \
       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
           $(ICONV_CFLAGS), \

From 34d6cc0d89cbc840e8c358988c51e8d560b8dbb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Tue, 25 Nov 2025 08:32:26 +0000
Subject: [PATCH 331/512] 8372344: QUIC transfer may deadlock if pacing rate is
 too high

Reviewed-by: dfuchs, vyazici
---
 .../net/http/quic/PacketSpaceManager.java       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java
index 90031decdb4..487a8a186f6 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PacketSpaceManager.java
@@ -385,10 +385,10 @@ public sealed class PacketSpaceManager implements PacketSpace
             }
             packetEmitter.checkAbort(PacketSpaceManager.this.packetNumberSpace);
             // Handle is called from within the executor
-            var nextDeadline = this.nextDeadline;
+            Deadline newDeadline;
             Deadline now = now();
-            congestionController.updatePacer(now);
             do {
+                congestionController.updatePacer(now);
                 transmitNow = false;
                 var closed = !isOpenForTransmission();
                 if (closed) {
@@ -534,16 +534,17 @@ public sealed class PacketSpaceManager implements PacketSpace
                     packetEmitter.ptoBackoffIncreased(PacketSpaceManager.this, backoff);
                 }
 
-                // if nextDeadline is not Deadline.MAX the task will be
+                // if newDeadline is not Deadline.MAX the task will be
                 // automatically rescheduled.
                 if (debug.on()) debug.log("handle: refreshing deadline");
-                nextDeadline = computeNextDeadline();
-            } while(!nextDeadline.isAfter(now));
+                newDeadline = computeNextDeadline();
+                now = now();
+            } while(!newDeadline.isAfter(now));
 
-            logNoDeadline(nextDeadline, true);
-            if (Deadline.MAX.equals(nextDeadline)) return;
+            logNoDeadline(newDeadline, true);
+            if (Deadline.MAX.equals(newDeadline)) return;
             // we have a new deadline
-            packetEmitter.reschedule(this, nextDeadline);
+            packetEmitter.reschedule(this, newDeadline);
         }
 
         /**

From ba3d4c43118bb5a2d9fb7cea9c6cd1ec63360ccd Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 25 Nov 2025 08:54:39 +0000
Subject: [PATCH 332/512] 8372337: clang compilation error on
 hardware_constructive_interference_size

Reviewed-by: aboldtch
---
 src/hotspot/share/cppstdlib/new.hpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/cppstdlib/new.hpp b/src/hotspot/share/cppstdlib/new.hpp
index 3536ac13288..ea9d6c88c87 100644
--- a/src/hotspot/share/cppstdlib/new.hpp
+++ b/src/hotspot/share/cppstdlib/new.hpp
@@ -79,11 +79,10 @@ class [[deprecated]] bad_array_new_length;
 // version to decide whether to redeclare deprecated.
 
 #if defined(__clang__)
-#if __clang_major__ >= 19
-// clang18 and earlier may accept the declaration but go wrong with uses.
-// Different warnings and link-time failures are both possible.
-#define CAN_DEPRECATE_HARDWARE_INTERFERENCE_SIZES 1
-#endif // restrict clang version
+// Some versions of clang with some stdlibs reject the declaration. Others may
+// accept the declaration but go wrong with uses.  Different warnings and
+// link-time failures are both possible.
+// Known to have problems at least through clang19.
 
 #elif defined(__GNUC__)
 #if (__GNUC__ > 13) || (__GNUC__ == 13 && __GNUC_MINOR__ >= 2)

From 42f333352408e03389fb37ea8ad8537a4a271b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Tue, 25 Nov 2025 09:07:35 +0000
Subject: [PATCH 333/512] 8371368: SIGSEGV in JfrVframeStream::next_vframe() on
 arm64

Reviewed-by: egahlin
---
 src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp | 2 +-
 test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index f7a725fce6d..b5720351bdf 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -217,7 +217,7 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
           const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
           if (is_valid(pc_desc)) {
             intptr_t* const synthetic_sp = sender_sp - sampled_nm->frame_size();
-            top_frame = frame(synthetic_sp, synthetic_sp, sender_sp, pc_desc->real_pc(sampled_nm), sampled_nm);
+            top_frame = frame(synthetic_sp, synthetic_sp, sender_sp - 2, pc_desc->real_pc(sampled_nm), sampled_nm);
             in_continuation = is_in_continuation(top_frame, jt);
             return true;
           }
diff --git a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
index c337a8128ab..bfffb5e6f1d 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -32,6 +32,7 @@ import jdk.test.lib.jfr.EventNames;
  * @library /test/lib
  * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
  * @run main/othervm jdk.jfr.event.profiling.TestFullStackTrace
+ * @run main/othervm -XX:CompileCommand=compileonly,jdk.test.lib.jfr.RecurseThread::recurse* -XX:+PreserveFramePointer jdk.jfr.event.profiling.TestFullStackTrace
  */
 public class TestFullStackTrace {
 

From 67ef81eb78b28e5dcdf91785b476dfd0858cbd16 Mon Sep 17 00:00:00 2001
From: Patrick Strawderman <pstrawderman@netflix.com>
Date: Tue, 25 Nov 2025 10:13:57 +0000
Subject: [PATCH 334/512] 8362958: Unnecessary copying / sorting in Streams
 using Comparator.naturalOrder()

Reviewed-by: vklang, liach
---
 .../classes/java/util/stream/SortedOps.java   | 16 ++++++------
 .../java/util/stream/StreamOpFlag.java        | 24 ++++++++++--------
 .../java/util/stream/StreamOpFlagsTest.java   | 25 +++++++++++--------
 .../tests/java/util/stream/SortedOpTest.java  |  7 +++++-
 4 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/java.base/share/classes/java/util/stream/SortedOps.java b/src/java.base/share/classes/java/util/stream/SortedOps.java
index 91892eba44f..1286735ebd9 100644
--- a/src/java.base/share/classes/java/util/stream/SortedOps.java
+++ b/src/java.base/share/classes/java/util/stream/SortedOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,13 +108,10 @@ final class SortedOps {
          * {@code Comparable}.
          */
         OfRef(AbstractPipeline<?, T, ?> upstream) {
-            super(upstream, StreamShape.REFERENCE,
-                  StreamOpFlag.IS_ORDERED | StreamOpFlag.IS_SORTED);
-            this.isNaturalSort = true;
             // Will throw CCE when we try to sort if T is not Comparable
             @SuppressWarnings("unchecked")
             Comparator<? super T> comp = (Comparator<? super T>) Comparator.naturalOrder();
-            this.comparator = comp;
+            this(upstream, comp);
         }
 
         /**
@@ -123,10 +120,13 @@ final class SortedOps {
          * @param comparator The comparator to be used to evaluate ordering.
          */
         OfRef(AbstractPipeline<?, T, ?> upstream, Comparator<? super T> comparator) {
+            Objects.requireNonNull(comparator);
+            boolean isNaturalSort = Comparator.naturalOrder().equals(comparator);
+            this.comparator = comparator;
+            this.isNaturalSort = isNaturalSort;
             super(upstream, StreamShape.REFERENCE,
-                  StreamOpFlag.IS_ORDERED | StreamOpFlag.NOT_SORTED);
-            this.isNaturalSort = false;
-            this.comparator = Objects.requireNonNull(comparator);
+                  StreamOpFlag.IS_ORDERED |
+                          (isNaturalSort ? StreamOpFlag.IS_SORTED : StreamOpFlag.NOT_SORTED));
         }
 
         @Override
diff --git a/src/java.base/share/classes/java/util/stream/StreamOpFlag.java b/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
index df98125cbc0..0e7b2f6607b 100644
--- a/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
+++ b/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
  */
 package java.util.stream;
 
+import java.util.Comparator;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Spliterator;
@@ -738,9 +739,9 @@ enum StreamOpFlag {
      *
      * @implSpec
      * If the spliterator is naturally {@code SORTED} (the associated
-     * {@code Comparator} is {@code null}) then the characteristic is converted
-     * to the {@link #SORTED} flag, otherwise the characteristic is not
-     * converted.
+     * {@code Comparator} is {@code null} or {@code Comparator.naturalOrder()}) then
+     * the characteristic is converted to the {@link #SORTED} flag, otherwise
+     * the characteristic is not converted.
      *
      * @param spliterator the spliterator from which to obtain characteristic
      *        bit set.
@@ -748,14 +749,15 @@ enum StreamOpFlag {
      */
     static int fromCharacteristics(Spliterator<?> spliterator) {
         int characteristics = spliterator.characteristics();
-        if ((characteristics & Spliterator.SORTED) != 0 && spliterator.getComparator() != null) {
-            // Do not propagate the SORTED characteristic if it does not correspond
-            // to a natural sort order
-            return characteristics & SPLITERATOR_CHARACTERISTICS_MASK & ~Spliterator.SORTED;
-        }
-        else {
-            return characteristics & SPLITERATOR_CHARACTERISTICS_MASK;
+        if ((characteristics & Spliterator.SORTED) != 0) {
+            Comparator<?> comparator = spliterator.getComparator();
+            if (comparator != null && !Comparator.naturalOrder().equals(comparator)) {
+                // Do not propagate the SORTED characteristic if it does not correspond
+                // to a natural sort order
+                return characteristics & SPLITERATOR_CHARACTERISTICS_MASK & ~Spliterator.SORTED;
+            }
         }
+        return characteristics & SPLITERATOR_CHARACTERISTICS_MASK;
     }
 
     /**
diff --git a/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java
index aa47aa2a103..8d894a34234 100644
--- a/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java
+++ b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,20 +335,20 @@ public class StreamOpFlagsTest {
     }
 
     public void testSpliteratorSorted() {
-        class SortedEmptySpliterator implements Spliterator<Object> {
-            final Comparator<Object> c;
+        class SortedEmptySpliterator<T extends Comparable<? super T>> implements Spliterator<T> {
+            final Comparator<T> c;
 
-            SortedEmptySpliterator(Comparator<Object> c) {
+            SortedEmptySpliterator(Comparator<T> c) {
                 this.c = c;
             }
 
             @Override
-            public Spliterator<Object> trySplit() {
+            public Spliterator<T> trySplit() {
                 return null;
             }
 
             @Override
-            public boolean tryAdvance(Consumer<? super Object> action) {
+            public boolean tryAdvance(Consumer<? super T> action) {
                 return false;
             }
 
@@ -363,19 +363,24 @@ public class StreamOpFlagsTest {
             }
 
             @Override
-            public Comparator<? super Object> getComparator() {
+            public Comparator<? super T> getComparator() {
                 return c;
             }
-        };
+        }
 
         {
-            int flags = StreamOpFlag.fromCharacteristics(new SortedEmptySpliterator(null));
+            int flags = StreamOpFlag.fromCharacteristics(new SortedEmptySpliterator<>(null));
             assertEquals(flags, StreamOpFlag.IS_SORTED);
         }
 
         {
-            int flags = StreamOpFlag.fromCharacteristics(new SortedEmptySpliterator((a, b) -> 0));
+            int flags = StreamOpFlag.fromCharacteristics(new SortedEmptySpliterator<>((a, b) -> 0));
             assertEquals(flags, 0);
         }
+
+        {
+            int flags = StreamOpFlag.fromCharacteristics(new SortedEmptySpliterator<String>(Comparator.naturalOrder()));
+            assertEquals(flags, StreamOpFlag.IS_SORTED);
+        }
     }
 }
diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java
index 3ca690e9096..7e695f97819 100644
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package org.openjdk.tests.java.util.stream;
 import org.testng.annotations.Test;
 
 import java.util.*;
+import java.util.Comparator;
 import java.util.Spliterators;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiFunction;
@@ -115,10 +116,14 @@ public class SortedOpTest extends OpTestCase {
 
         Collections.reverse(to10);
         assertSorted(to10.stream().sorted().iterator());
+        assertSorted(to10.stream().sorted(Comparator.naturalOrder()).iterator());
 
         Spliterator<Integer> s = to10.stream().sorted().spliterator();
         assertTrue(s.hasCharacteristics(Spliterator.SORTED));
 
+        s = to10.stream().sorted(Comparator.naturalOrder()).spliterator();
+        assertTrue(s.hasCharacteristics(Spliterator.SORTED));
+
         s = to10.stream().sorted(cInteger.reversed()).spliterator();
         assertFalse(s.hasCharacteristics(Spliterator.SORTED));
     }

From c19b12927d2ac901ec8ccaa2de5897ee4c47af56 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Tue, 25 Nov 2025 11:13:59 +0000
Subject: [PATCH 335/512] 8326498: java.net.http.HttpClient connection leak
 using http/2

Reviewed-by: vyazici, djelinski, dfuchs
---
 .../jdk/internal/net/http/Exchange.java       |  10 +-
 .../internal/net/http/Http2ClientImpl.java    |   9 +-
 .../internal/net/http/Http2Connection.java    | 525 +++++++++---------
 .../net/http/Http2TerminationCause.java       | 281 ++++++++++
 .../jdk/internal/net/http/HttpConnection.java |   4 +-
 .../net/http/HttpClientImplAccess.java        |  67 +++
 .../httpclient/http2/BurstyRequestsTest.java  | 208 +++++++
 .../net/httpclient/http2/H2GoAwayTest.java    |   6 +-
 .../lib/http2/Http2TestServerConnection.java  |   9 +-
 .../internal/net/http/ConnectionPoolTest.java |  10 +-
 10 files changed, 854 insertions(+), 275 deletions(-)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/Http2TerminationCause.java
 create mode 100644 test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientImplAccess.java
 create mode 100644 test/jdk/java/net/httpclient/http2/BurstyRequestsTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
index c50a4922e80..64ff093152f 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
@@ -27,11 +27,9 @@ package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.net.ProtocolException;
-import java.net.http.HttpClient.Version;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -708,12 +706,10 @@ final class Exchange<T> {
                             if (s == null) {
                                 // s can be null if an exception occurred
                                 // asynchronously while sending the preface.
-                                Throwable t = c.getRecordedCause();
+                                final Http2TerminationCause tc = c.getTerminationCause();
                                 IOException ioe;
-                                if (t != null) {
-                                    if (!cached)
-                                        c.close();
-                                    ioe = new IOException("Can't get stream 1: " + t, t);
+                                if (tc != null) {
+                                    ioe = new IOException("Can't get stream 1", tc.getCloseCause());
                                 } else {
                                     ioe = new IOException("Can't get stream 1");
                                 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
index cc8a2a7142b..6121a0c1673 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package jdk.internal.net.http;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Base64;
@@ -234,11 +233,8 @@ class Http2ClientImpl {
         }
     }
 
-    private EOFException STOPPED;
     void stop() {
         if (debug.on()) debug.log("stopping");
-        STOPPED = new EOFException("HTTP/2 client stopped");
-        STOPPED.setStackTrace(new StackTraceElement[0]);
         connectionPoolLock.lock();
         try {
             stopping = true;
@@ -253,10 +249,7 @@ class Http2ClientImpl {
     private boolean close(Http2Connection h2c) {
         // close all streams
         try { h2c.closeAllStreams(); } catch (Throwable t) {}
-        // send GOAWAY
         try { h2c.close(); } catch (Throwable t) {}
-        // attempt graceful shutdown
-        try { h2c.shutdown(STOPPED); } catch (Throwable t) {}
         // double check and close any new streams
         try { h2c.closeAllStreams(); } catch (Throwable t) {}
         // Allows for use of removeIf in stop()
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
index 63889fa6af2..94b8505da47 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
@@ -25,21 +25,20 @@
 
 package jdk.internal.net.http;
 
+import java.io.Closeable;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
 import java.net.InetSocketAddress;
 import java.net.ProtocolException;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpHeaders;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.net.http.HttpConnectTimeoutException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -49,6 +48,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Flow;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
@@ -56,6 +56,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.function.Supplier;
+
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;
 
@@ -130,7 +131,7 @@ import static jdk.internal.net.http.frame.SettingsFrame.MAX_HEADER_LIST_SIZE;
  * and incoming stream creation (Server push). Incoming frames destined for a
  * stream are provided by calling Stream.incoming().
  */
-class Http2Connection  {
+class Http2Connection implements Closeable {
 
     final Logger debug = Utils.getDebugLogger(this::dbgString);
     static final Logger DEBUG_LOGGER =
@@ -143,6 +144,8 @@ class Http2Connection  {
     private static final int MAX_SERVER_STREAM_ID = Integer.MAX_VALUE - 1; // 2147483646
     // may be null; must be accessed/updated with the stateLock held
     private IdleConnectionTimeoutEvent idleConnectionTimeoutEvent;
+    private final AtomicBoolean goAwaySent = new AtomicBoolean();
+    private final AtomicBoolean goAwayRecvd = new AtomicBoolean();
 
     /**
      * Flag set when no more streams to be opened on this connection.
@@ -215,7 +218,7 @@ class Http2Connection  {
         }
 
         /**
-         * {@link #shutdown(Throwable) Shuts down} the connection, unless this event is
+         * {@link #close(Http2TerminationCause) Closes} the connection, unless this event is
          * {@link #cancelled}
          */
         @Override
@@ -228,26 +231,20 @@ class Http2Connection  {
             try {
                 if (cancelled) {
                     if (debug.on()) {
-                        debug.log("Not initiating idle connection shutdown");
-                    }
-                    return;
-                }
-                if (!markIdleShutdownInitiated()) {
-                    if (debug.on()) {
-                        debug.log("Unexpected state %s, skipping idle connection shutdown",
-                                describeClosedState(closedState));
+                        debug.log("Idle timeout event already cancelled, not initiating idle connection close");
                     }
                     return;
                 }
+                // the connection has been idle long enough, we now
+                // mark a state indicating that the connection is chosen
+                // for idle termination and should not be handed out (from the pool)
+                // for newer requests.
+                connTerminator.markForIdleTermination();
             } finally {
                 stateLock.unlock();
             }
-            if (debug.on()) {
-                debug.log("Initiating shutdown of HTTP connection which is idle for too long");
-            }
-            HttpConnectTimeoutException hte = new HttpConnectTimeoutException(
-                    "HTTP connection idle, no active streams. Shutting down.");
-            shutdown(hte);
+            // terminate the connection due to being idle long enough
+            connTerminator.idleTimedOut();
         }
 
         /**
@@ -256,7 +253,7 @@ class Http2Connection  {
         void cancel() {
             assert stateLock.isHeldByCurrentThread() : "Current thread doesn't hold " + stateLock;
             // mark as cancelled to prevent potentially already triggered event from actually
-            // doing the shutdown
+            // doing the close
             this.cancelled = true;
             // cancel the timer to prevent the event from being triggered (if it hasn't already)
             client().cancelTimer(this);
@@ -376,16 +373,7 @@ class Http2Connection  {
     }
 
 
-    private static final int HALF_CLOSED_LOCAL  = 1;
-    private static final int HALF_CLOSED_REMOTE = 2;
-    private static final int SHUTDOWN_REQUESTED = 4;
-    // state when idle connection management initiates a shutdown of the connection, after
-    // which the connection will go into SHUTDOWN_REQUESTED state
-    private static final int IDLE_SHUTDOWN_INITIATED = 8;
     private final ReentrantLock stateLock = new ReentrantLock();
-    private volatile int closedState;
-
-    //-------------------------------------
     final HttpConnection connection;
     private final Http2ClientImpl client2;
     private final ConcurrentHashMap<Integer,Stream<?>> streams = new ConcurrentHashMap<>();
@@ -403,7 +391,9 @@ class Http2Connection  {
     private final Decoder hpackIn;
     final SettingsFrame clientSettings;
     private volatile SettingsFrame serverSettings;
+
     private record PushContinuationState(PushPromiseDecoder pushContDecoder, PushPromiseFrame pushContFrame) {}
+
     private volatile PushContinuationState pushContinuationState;
     private final String key; // for HttpClientImpl.connections map
     private final FramesDecoder framesDecoder;
@@ -418,7 +408,7 @@ class Http2Connection  {
     private final FramesController framesController = new FramesController();
     private final Http2TubeSubscriber subscriber;
     final ConnectionWindowUpdateSender windowUpdater;
-    private final AtomicReference<Throwable> cause = new AtomicReference<>();
+    private final Terminator connTerminator = new Terminator();
     private volatile Supplier<ByteBuffer> initial;
     private volatile Stream<?> initialStream;
 
@@ -640,35 +630,31 @@ class Http2Connection  {
     }
 
     void abandonStream() {
-        boolean shouldClose = false;
         stateLock.lock();
         try {
             long reserved = --numReservedClientStreams;
             assert reserved >= 0;
-            if (finalStream && reserved == 0 && streams.isEmpty()) {
-                shouldClose = true;
-            }
         } catch (Throwable t) {
-            shutdown(t); // in case the assert fires...
+            close(Http2TerminationCause.forException(t)); // in case the assert fires...
         } finally {
             stateLock.unlock();
         }
 
-        // We should close the connection here if
-        // it's not pooled. If it's not pooled it will
-        // be marked final stream, reserved will be 0
-        // after decrementing it by one, and there should
-        // be no active request-response streams.
-        if (shouldClose) {
-            shutdown(new IOException("HTTP/2 connection abandoned"));
+        // if the connection is eligible to be closed, we close it here
+        if (shouldClose()) {
+            close(Http2TerminationCause.noErrorTermination());
         }
-
     }
 
-    boolean shouldClose() {
+    /*
+     * return true if the connection is marked as "final stream" and there
+     * are no active streams on that connection and the connection isn't
+     * reserved for a new stream.
+     */
+    final boolean shouldClose() {
         stateLock.lock();
         try {
-            return finalStream() && streams.isEmpty();
+            return finalStream() && streams.isEmpty() && numReservedClientStreams == 0;
         } finally {
             stateLock.unlock();
         }
@@ -840,22 +826,8 @@ class Http2Connection  {
         return clientSettings.getParameter(MAX_CONCURRENT_STREAMS);
     }
 
-    void close() {
-        if (markHalfClosedLocal()) {
-            // we send a GOAWAY frame only if the remote side hasn't already indicated
-            // the intention to close the connection by previously sending a GOAWAY of its own
-            if (connection.channel().isOpen() && !isMarked(closedState, HALF_CLOSED_REMOTE)) {
-                Log.logTrace("Closing HTTP/2 connection: to {0}", connection.address());
-                GoAwayFrame f = new GoAwayFrame(0,
-                        ErrorFrame.NO_ERROR,
-                        "Requested by user".getBytes(UTF_8));
-                // TODO: set last stream. For now zero ok.
-                sendFrame(f);
-            }
-        }
-    }
-
     long count;
+
     final void asyncReceive(ByteBuffer buffer) {
         // We don't need to read anything and
         // we don't want to send anything back to the server
@@ -904,44 +876,26 @@ class Http2Connection  {
         } catch (Throwable e) {
             String msg = Utils.stackTrace(e);
             Log.logTrace(msg);
-            shutdown(e);
+            close(Http2TerminationCause.forException(e));
         }
     }
 
-    Throwable getRecordedCause() {
-        return cause.get();
+    /**
+     * Closes the connection normally (with a NO_ERROR termination cause), if not already closed.
+     */
+    @Override
+    public final void close() {
+        close(Http2TerminationCause.noErrorTermination());
     }
 
-    void shutdown(Throwable t) {
-        int state = closedState;
-        if (debug.on()) debug.log(() -> "Shutting down h2c (state="+describeClosedState(state)+"): " + t);
-        stateLock.lock();
-        try {
-            if (!markShutdownRequested()) return;
-            cause.compareAndSet(null, t);
-        } finally {
-            stateLock.unlock();
-        }
-
-        if (Log.errors()) {
-            if (t!= null && (!(t instanceof EOFException) || isActive())) {
-                Log.logError(t);
-            } else if (t != null) {
-                Log.logError("Shutting down connection: {0}", t.getMessage());
-            } else {
-                Log.logError("Shutting down connection");
-            }
-        }
-        client2.removeFromPool(this);
-        subscriber.stop(cause.get());
-        for (Stream<?> s : streams.values()) {
-            try {
-                s.connectionClosing(t);
-            } catch (Throwable e) {
-                Log.logError("Failed to close stream {0}: {1}", s.streamid, e);
-            }
-        }
-        connection.close(cause.get());
+    /**
+     * Closes the connection with the given termination cause, if not already closed.
+     *
+     * @param tc the termination cause. cannot be null.
+     */
+    final void close(final Http2TerminationCause tc) {
+        Objects.requireNonNull(tc, "termination cause cannot be null");
+        this.connTerminator.terminate(tc);
     }
 
     /**
@@ -981,15 +935,14 @@ class Http2Connection  {
         } else {
             if (frame instanceof SettingsFrame) {
                 // The stream identifier for a SETTINGS frame MUST be zero
-                framesDecoder.close(
+                protocolError(ErrorFrame.PROTOCOL_ERROR,
                         "The stream identifier for a SETTINGS frame MUST be zero");
-                protocolError(GoAwayFrame.PROTOCOL_ERROR);
                 return;
             }
 
             if (frame instanceof PushPromiseFrame && !serverPushEnabled()) {
                 String protocolError = "received a PUSH_PROMISE when SETTINGS_ENABLE_PUSH is 0";
-                protocolError(ResetFrame.PROTOCOL_ERROR, protocolError);
+                protocolError(ErrorFrame.PROTOCOL_ERROR, protocolError);
                 return;
             }
 
@@ -1144,7 +1097,9 @@ class Http2Connection  {
     // Otherwise, if the frame is dropped after having been added to the
     // inputQ, releaseUnconsumed above should be called.
     final void dropDataFrame(DataFrame df) {
-        if (isMarked(closedState, SHUTDOWN_REQUESTED)) return;
+        if (!isOpen()) {
+            return;
+        }
         if (debug.on()) {
             debug.log("Dropping data frame for stream %d (%d payload bytes)",
                     df.streamid(), df.payloadLength());
@@ -1154,7 +1109,9 @@ class Http2Connection  {
 
     final void ensureWindowUpdated(DataFrame df) {
         try {
-            if (isMarked(closedState, SHUTDOWN_REQUESTED)) return;
+            if (!isOpen()) {
+                return;
+            }
             int length = df.payloadLength();
             if (length > 0) {
                 windowUpdater.update(length);
@@ -1251,12 +1208,16 @@ class Http2Connection  {
             case AltSvcFrame.TYPE -> processAltSvcFrame(0, (AltSvcFrame) frame,
                     connection, connection.client());
 
-            default -> protocolError(ErrorFrame.PROTOCOL_ERROR);
+            default -> protocolError(ErrorFrame.PROTOCOL_ERROR, "unknown frame: " + frame);
         }
     }
 
-    boolean isOpen() {
-        return !isMarkedForShutdown() && connection.channel().isOpen();
+    /**
+     * Returns true if this connection hasn't been terminated and the underlying
+     * {@linkplain NetworkChannel#isOpen() channel is open}. false otherwise.
+     */
+    final boolean isOpen() {
+        return this.connTerminator.terminationCause.get() == null && connection.channel().isOpen();
     }
 
     void resetStream(int streamid, int code) {
@@ -1295,6 +1256,7 @@ class Http2Connection  {
         }
 
     }
+
     private void decrementStreamsCount0(int streamid) {
         Stream<?> s = streams.get(streamid);
         if (s == null || !s.deRegister())
@@ -1346,8 +1308,7 @@ class Http2Connection  {
             // corresponding entry in the window controller.
             windowController.removeStream(streamid);
         }
-        if (finalStream() && streams.isEmpty()) {
-            // should be only 1 stream, but there might be more if server push
+        if (shouldClose()) {
             close();
         } else {
             // Start timer if property present and not already created
@@ -1372,9 +1333,7 @@ class Http2Connection  {
     /**
      * Increments this connection's send Window by the amount in the given frame.
      */
-    private void handleWindowUpdate(WindowUpdateFrame f)
-        throws IOException
-    {
+    private void handleWindowUpdate(WindowUpdateFrame f) {
         int amount = f.getUpdate();
         if (amount <= 0) {
             // ## temporarily disable to workaround a bug in Jetty where it
@@ -1383,37 +1342,19 @@ class Http2Connection  {
         } else {
             boolean success = windowController.increaseConnectionWindow(amount);
             if (!success) {
-                protocolError(ErrorFrame.FLOW_CONTROL_ERROR);  // overflow
+                protocolError(ErrorFrame.FLOW_CONTROL_ERROR, null);  // overflow
             }
         }
     }
 
-    private void protocolError(int errorCode)
-        throws IOException
-    {
-        protocolError(errorCode, null);
+    private void protocolError(final int errorCode, final String msg) {
+        final Http2TerminationCause terminationCause =
+                Http2TerminationCause.forH2Error(errorCode, msg);
+        framesDecoder.close(terminationCause.getLogMsg());
+        close(terminationCause);
     }
 
-    private void protocolError(int errorCode, String msg)
-        throws IOException
-    {
-        String protocolError = "protocol error" + (msg == null?"":(": " + msg));
-        ProtocolException protocolException =
-                new ProtocolException(protocolError);
-        this.cause.compareAndSet(null, protocolException);
-        if (markHalfClosedLocal()) {
-            framesDecoder.close(protocolError);
-            subscriber.stop(protocolException);
-            if (debug.on()) debug.log("Sending GOAWAY due to " + protocolException);
-            GoAwayFrame frame = new GoAwayFrame(0, errorCode);
-            sendFrame(frame);
-        }
-        shutdown(protocolException);
-    }
-
-    private void handleSettings(SettingsFrame frame)
-        throws IOException
-    {
+    private void handleSettings(SettingsFrame frame) {
         assert frame.streamid() == 0;
         if (!frame.getFlag(SettingsFrame.ACK)) {
             int newWindowSize = frame.getParameter(INITIAL_WINDOW_SIZE);
@@ -1430,9 +1371,7 @@ class Http2Connection  {
         }
     }
 
-    private void handlePing(PingFrame frame)
-        throws IOException
-    {
+    private void handlePing(PingFrame frame) {
         frame.setFlag(PingFrame.ACK);
         sendUnorderedFrame(frame);
     }
@@ -1442,7 +1381,7 @@ class Http2Connection  {
         assert lastProcessedStream >= 0 : "unexpected last stream id: "
                 + lastProcessedStream + " in GOAWAY frame";
 
-        markHalfClosedRemote();
+        goAwayRecvd.set(true);
         setFinalStream(); // don't allow any new streams on this connection
         if (debug.on()) {
             debug.log("processing incoming GOAWAY with last processed stream id:%s in frame %s",
@@ -1599,20 +1538,20 @@ class Http2Connection  {
         // must be done with "stateLock" held to co-ordinate idle connection management
         stateLock.lock();
         try {
-            cancelIdleShutdownEvent();
-            // consider the reservation successful only if the connection's state hasn't moved
-            // to "being closed"
-            return isOpen();
+            cancelIdleCloseEvent();
+            // consider the reservation successful only if the connection is open and
+            // hasn't been chosen for idle termination
+            return !this.connTerminator.isMarkedForIdleTermination() && isOpen();
         } finally {
             stateLock.unlock();
         }
     }
 
     /**
-     * Cancels any event that might have been scheduled to shutdown this connection. Must be called
+     * Cancels any event that might have been scheduled to close this connection. Must be called
      * with the stateLock held.
      */
-    private void cancelIdleShutdownEvent() {
+    private void cancelIdleCloseEvent() {
         assert stateLock.isHeldByCurrentThread() : "Current thread doesn't hold " + stateLock;
         if (idleConnectionTimeoutEvent == null) {
             return;
@@ -1627,20 +1566,23 @@ class Http2Connection  {
         // the stream is closed.
         stateLock.lock();
         try {
-            if (!isMarkedForShutdown()) {
+            if (isOpen() && !this.connTerminator.isMarkedForIdleTermination()) {
                 if (debug.on()) {
                     debug.log("Opened stream %d", streamid);
                 }
                 client().streamReference();
                 streams.put(streamid, stream);
-                cancelIdleShutdownEvent();
+                // don't consider the connection idle anymore
+                cancelIdleCloseEvent();
                 return;
             }
         } finally {
             stateLock.unlock();
         }
         if (debug.on()) debug.log("connection closed: closing stream %d", stream);
-        stream.cancel(new IOException("Stream " + streamid + " cancelled", cause.get()));
+        final Http2TerminationCause terminationCause = getTerminationCause();
+        assert terminationCause != null : "termination cause is null";
+        stream.cancel(new IOException("Stream " + streamid + " cancelled", terminationCause.getCloseCause()));
     }
 
     /**
@@ -1743,11 +1685,10 @@ class Http2Connection  {
         int streamid = nextstreamid;
         Throwable cause = null;
         synchronized (this) {
-            if (isMarked(closedState, SHUTDOWN_REQUESTED)) {
-                cause = this.cause.get();
-                if (cause == null) {
-                    cause = new IOException("Connection closed");
-                }
+            if (!isOpen()) {
+                final Http2TerminationCause terminationCause = getTerminationCause();
+                assert terminationCause != null : "termination cause is null";
+                cause = terminationCause.getCloseCause();
             }
         }
         if (cause != null) {
@@ -1762,7 +1703,7 @@ class Http2Connection  {
             return stream;
         } else {
             stream.cancelImpl(new IOException("Request cancelled"));
-            if (finalStream() && streams.isEmpty()) {
+            if (shouldClose()) {
                 close();
             }
             return null;
@@ -1795,14 +1736,12 @@ class Http2Connection  {
             }
             publisher.signalEnqueued();
         } catch (IOException e) {
-            if (!isMarked(closedState, SHUTDOWN_REQUESTED)) {
-                if (!client2.stopping()) {
-                    Log.logError(e);
-                    shutdown(e);
-                } else if (debug.on()) {
-                    debug.log("Failed to send %s while stopping: %s", frame, e);
-                }
+            if (!client2.stopping()) {
+                Log.logError(e);
+            } else if (debug.on()) {
+                debug.log("Failed to send %s while stopping: %s", frame, e);
             }
+            close(Http2TerminationCause.forException(e));
         }
     }
 
@@ -1817,14 +1756,12 @@ class Http2Connection  {
             publisher.enqueue(encodeFrame(frame));
             publisher.signalEnqueued();
         } catch (IOException e) {
-            if (!isMarked(closedState, SHUTDOWN_REQUESTED)) {
-                if (!client2.stopping()) {
-                    Log.logError(e);
-                    shutdown(e);
-                } else if (debug.on()) {
-                    debug.log("Failed to send %s while stopping: %s", frame, e);
-                }
+            if (!client2.stopping()) {
+                Log.logError(e);
+            } else if (debug.on()) {
+                debug.log("Failed to send %s while stopping: %s", frame, e);
             }
+            close(Http2TerminationCause.forException(e));
         }
     }
 
@@ -1839,10 +1776,12 @@ class Http2Connection  {
             publisher.enqueueUnordered(encodeFrame(frame));
             publisher.signalEnqueued();
         } catch (IOException e) {
-            if (!isMarked(closedState, SHUTDOWN_REQUESTED)) {
+            if (!client2.stopping()) {
                 Log.logError(e);
-                shutdown(e);
+            } else if (debug.on()) {
+                debug.log("Failed to send %s while stopping: %s", frame, e);
             }
+            close(Http2TerminationCause.forException(e));
         }
     }
 
@@ -1868,6 +1807,7 @@ class Http2Connection  {
             try {
                 while (!queue.isEmpty() && !scheduler.isStopped()) {
                     ByteBuffer buffer = queue.poll();
+                    assert buffer != null : "null buffer obtained from non-empty queue";
                     if (debug.on())
                         debug.log("sending %d to Http2Connection.asyncReceive",
                                   buffer.remaining());
@@ -1877,7 +1817,12 @@ class Http2Connection  {
                 errorRef.compareAndSet(null, t);
             } finally {
                 Throwable x = errorRef.get();
-                if (x != null) {
+                // if there was any error or if the TubeSubscriber completed normally,
+                // then close the connection
+                if (x != null || completed) {
+                    // although the connection terminator stops the scheduler too,
+                    // we don't want to wait that "long" and instead we should immediately
+                    // stop the scheduler so that we don't enter "processQueue" anymore.
                     scheduler.stop();
                     if (client2.stopping()) {
                         if (debug.on()) {
@@ -1888,7 +1833,11 @@ class Http2Connection  {
                             debug.log("Stopping scheduler", x);
                         }
                     }
-                    Http2Connection.this.shutdown(x);
+                    // terminate the connection
+                    final Http2TerminationCause tc = (x != null)
+                            ? Http2TerminationCause.forException(x)
+                            : Http2TerminationCause.noErrorTermination();
+                    Http2Connection.this.close(tc);
                 }
             }
         }
@@ -1938,11 +1887,17 @@ class Http2Connection  {
         @Override
         public void onComplete() {
             if (completed) return;
-            String msg = isActive()
-                    ? "EOF reached while reading"
-                    : "Idle connection closed by HTTP/2 peer";
-            if (debug.on()) debug.log(msg);
-            errorRef.compareAndSet(null, new EOFException(msg));
+            if (isActive()) {
+                final String msg = "EOF reached while reading";
+                errorRef.compareAndSet(null, new EOFException(msg));
+                if (debug.on()) {
+                    debug.log(msg);
+                }
+            } else {
+                if (debug.on()) {
+                    debug.log("HTTP/2 connection (with no active streams) closed by peer");
+                }
+            }
             completed = true;
             runOrSchedule();
         }
@@ -1955,16 +1910,13 @@ class Http2Connection  {
             dropped = true;
         }
 
-        void stop(Throwable error) {
-            if (errorRef.compareAndSet(null, error)) {
-                completed = true;
-                scheduler.stop();
-                queue.clear();
-                if (subscription != null) {
-                    subscription.cancel();
-                }
-                queue.clear();
+        private void close() {
+            scheduler.stop();
+            queue.clear();
+            if (subscription != null) {
+                subscription.cancel();
             }
+            queue.clear();
         }
     }
 
@@ -1990,6 +1942,7 @@ class Http2Connection  {
     static final class ConnectionWindowUpdateSender extends WindowUpdateSender {
 
         final int initialWindowSize;
+
         public ConnectionWindowUpdateSender(Http2Connection connection,
                                             int initialWindowSize) {
             super(connection, initialWindowSize);
@@ -2004,13 +1957,9 @@ class Http2Connection  {
         @Override
         protected boolean windowSizeExceeded(long received) {
             if (connection.isOpen()) {
-                try {
-                    connection.protocolError(ErrorFrame.FLOW_CONTROL_ERROR,
-                            "connection window exceeded (%s > %s)"
-                                    .formatted(received, windowSize));
-                } catch (IOException io) {
-                    connection.shutdown(io);
-                }
+                connection.protocolError(ErrorFrame.FLOW_CONTROL_ERROR,
+                        "connection window exceeded (%s > %s)"
+                                .formatted(received, windowSize));
             }
             return true;
         }
@@ -2033,72 +1982,144 @@ class Http2Connection  {
         }
     }
 
-    private boolean isMarked(int state, int mask) {
-        return (state & mask) == mask;
-    }
-
-    private boolean isMarkedForShutdown() {
-        final int closedSt = closedState;
-        return isMarked(closedSt, IDLE_SHUTDOWN_INITIATED)
-                || isMarked(closedSt, SHUTDOWN_REQUESTED);
-    }
-
-    private boolean markShutdownRequested() {
-        return markClosedState(SHUTDOWN_REQUESTED);
-    }
-
-    private boolean markHalfClosedLocal() {
-        return markClosedState(HALF_CLOSED_LOCAL);
-    }
-
-    private boolean markHalfClosedRemote() {
-        return markClosedState(HALF_CLOSED_REMOTE);
-    }
-
-    private boolean markIdleShutdownInitiated() {
-        return markClosedState(IDLE_SHUTDOWN_INITIATED);
-    }
-
-    private boolean markClosedState(int flag) {
-        int state, desired;
-        do {
-            state = desired = closedState;
-            if ((state & flag) == flag) return false;
-            desired = state | flag;
-        } while (!CLOSED_STATE.compareAndSet(this, state, desired));
-        return true;
-    }
-
-    String describeClosedState(int state) {
-        if (state == 0) return "active";
-        String desc = null;
-        if (isMarked(state, IDLE_SHUTDOWN_INITIATED)) {
-            desc = "idle-shutdown-initiated";
+    private void sendGoAway(final GoAwayFrame goAway) {
+        // currently we send a GOAWAY just once irrespective of what value the
+        // last stream id was in the GOAWAY frame
+        if (!goAwaySent.compareAndSet(false, true)) {
+            // already sent
+            return;
         }
-        if (isMarked(state, SHUTDOWN_REQUESTED)) {
-            desc = desc == null ? "shutdown" : desc + "+shutdown";
+        if (Log.trace()) {
+            Log.logTrace("{0} sending GOAWAY {1}", connection, goAway);
+        } else if (debug.on()) {
+            debug.log("sending GOAWAY " + goAway);
         }
-        if (isMarked(state, HALF_CLOSED_LOCAL | HALF_CLOSED_REMOTE)) {
-            if (desc == null) return "closed";
-            else return desc + "+closed";
-        }
-        if (isMarked(state, HALF_CLOSED_LOCAL)) {
-            if (desc == null) return "half-closed-local";
-            else return desc + "+half-closed-local";
-        }
-        if (isMarked(state, HALF_CLOSED_REMOTE)) {
-            if (desc == null) return "half-closed-remote";
-            else return desc + "+half-closed-remote";
-        }
-        return "0x" + Integer.toString(state, 16);
+        // this merely enqueues the frame
+        sendFrame(goAway);
     }
 
-    private static final VarHandle CLOSED_STATE;
-    static {
-        try {
-            CLOSED_STATE = MethodHandles.lookup().findVarHandle(Http2Connection.class, "closedState", int.class);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
+    /**
+     * Returns the termination cause if the connection is closed, else returns null.
+     */
+    final Http2TerminationCause getTerminationCause() {
+        return this.connTerminator.determineTerminationCause();
+    }
+
+    // Responsible for doing all the necessary work for closing a Http2Connection
+    private final class Terminator {
+        // the cause for closing the connection. Must only be set in the
+        // Terminator.terminate(Http2TerminationCause) method.
+        private final AtomicReference<Http2TerminationCause> terminationCause = new AtomicReference<>();
+        // true if it has been decided to terminate the connection due to being idle,
+        // false otherwise. should be accessed only when holding the stateLock
+        private boolean chosenForIdleTermination;
+
+        private void terminate(final Http2TerminationCause terminationCause) {
+            Objects.requireNonNull(terminationCause, "termination cause cannot be null");
+            // allow to be terminated only once
+            stateLock.lock();
+            try {
+                final boolean success = this.terminationCause.compareAndSet(null, terminationCause);
+                if (!success) {
+                    // already terminated or is being terminated by some other thread
+                    return;
+                }
+                // disable the idle timeout event, since we are now going to terminate the
+                // connection
+                Http2Connection.this.cancelIdleCloseEvent();
+            } finally {
+                stateLock.unlock();
+            }
+            // do the actual termination
+            doTerminate();
+        }
+
+        private void doTerminate() {
+            final Http2TerminationCause tc = terminationCause.get();
+            assert tc != null : "missing termination cause";
+            // we send a GOAWAY frame only if the remote side hasn't already indicated
+            // the intention to close the connection by previously sending a GOAWAY of its own
+            if (!Http2Connection.this.goAwayRecvd.get()) {
+                final int lastStream = 0; // TODO: set last stream. For now zero is ok.
+                final String peerVisibleReason = tc.getPeerVisibleReason();
+                final GoAwayFrame goAway;
+                if (peerVisibleReason == null) {
+                    goAway = new GoAwayFrame(lastStream, tc.getCloseCode());
+                } else {
+                    goAway = new GoAwayFrame(lastStream, tc.getCloseCode(),
+                            peerVisibleReason.getBytes(UTF_8));
+                }
+                sendGoAway(goAway);
+            }
+            // now close the connection
+
+            if (Log.errors() || debug.on()) {
+                final String stateStr = "Abnormal close=" + tc.isAbnormalClose() +
+                        ", has active streams=" + isActive() +
+                        ", GOAWAY received=" + goAwayRecvd.get() +
+                        ", GOAWAY sent=" + goAwaySent.get();
+                if (Log.errors()) {
+                    Log.logError("Closing connection {0} ({1}) due to: {2}",
+                            connection, stateStr, tc);
+                } else {
+                    debug.log("Closing connection (" + stateStr + ") due to: " + tc);
+                }
+            }
+            // close the TubeSubscriber
+            subscriber.close();
+            client2.removeFromPool(Http2Connection.this);
+            // notify the HTTP/2 streams of the connection closure
+            for (final Stream<?> s : streams.values()) {
+                try {
+                    s.connectionClosing(tc.getCloseCause());
+                } catch (Throwable e) {
+                    Log.logError("Failed to close stream {0}: {1}", s.streamid, e);
+                }
+            }
+            // close the underlying connection
+            connection.close(tc.getCloseCause());
+        }
+
+        private void markForIdleTermination() {
+            assert stateLock.isHeldByCurrentThread() : Thread.currentThread()
+                    + " not holding stateLock";
+            this.chosenForIdleTermination = true;
+        }
+
+        private boolean isMarkedForIdleTermination() {
+            assert stateLock.isHeldByCurrentThread() : Thread.currentThread()
+                    + " not holding stateLock";
+            return this.chosenForIdleTermination;
+        }
+
+        private void idleTimedOut() {
+            if (debug.on()) {
+                debug.log("closing connection due to being idle");
+            }
+            this.terminate(Http2TerminationCause.idleTimedOut());
+        }
+
+        /**
+         * Returns the termination cause for the connection. This method guarantees that if the
+         * {@linkplain Http2Connection#isOpen() connection is not open}, when this method is called,
+         * then it returns a non-null termination cause. Returns null if the connection is open.
+         */
+        private Http2TerminationCause determineTerminationCause() {
+            final Http2TerminationCause tc = this.terminationCause.get();
+            if (tc != null) {
+                // already terminated, return the cause
+                return tc;
+            }
+            if (!connection.channel().isOpen()) {
+                // if the underlying SocketChannel isn't open, then terminate the connection.
+                // that way when Http2Connection.isOpen() returns false in that situation, then this
+                // getTerminationCause() will return a termination cause.
+                terminate(Http2TerminationCause.forException(new ClosedChannelException()));
+                final Http2TerminationCause terminated = this.terminationCause.get();
+                assert terminated != null : "missing termination cause";
+                return terminated;
+            }
+            return null; // connection still open
         }
     }
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2TerminationCause.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2TerminationCause.java
new file mode 100644
index 00000000000..89b08cf8888
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2TerminationCause.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.internal.net.http;
+
+
+import java.io.IOException;
+import java.net.ProtocolException;
+import java.util.Objects;
+
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.frame.ErrorFrame;
+
+/**
+ * Termination cause for an {@linkplain Http2Connection HTTP/2 connection}
+ */
+public abstract sealed class Http2TerminationCause {
+    private String logMsg;
+    private String peerVisibleReason;
+    private final int closeCode;
+    private final Throwable originalCause;
+    private final IOException reportedCause;
+
+    private Http2TerminationCause(final int closeCode, final Throwable closeCause) {
+        this.closeCode = closeCode;
+        this.originalCause = closeCause;
+        if (closeCause != null) {
+            this.logMsg = closeCause.toString();
+        }
+        this.reportedCause = toReportedCause(this.originalCause, this.logMsg);
+    }
+
+    private Http2TerminationCause(final int closeCode, final String loggedAs) {
+        this.closeCode = closeCode;
+        this.originalCause = null;
+        this.logMsg = loggedAs;
+        this.reportedCause = toReportedCause(null, this.logMsg);
+    }
+
+    /**
+     * Returns the error code (specified for HTTP/2 ErrorFrame) that caused the
+     * connection termination.
+     */
+    public final int getCloseCode() {
+        return this.closeCode;
+    }
+
+    /**
+     * Returns the {@link IOException} that is considered the cause of the connection termination.
+     * Even a {@linkplain #isAbnormalClose() normal} termination will have
+     * an {@code IOException} associated with it, so this method will always return a non-null instance.
+     */
+    public final IOException getCloseCause() {
+        return this.reportedCause;
+    }
+
+    /**
+     * Returns {@code true} if the connection was terminated due to some exception. {@code false}
+     * otherwise.
+     * A normal connection termination (for example, the connection idle timing out locally)
+     * is not considered as an abnormal termination and this method returns {@code false} for
+     * such cases.
+     */
+    public abstract boolean isAbnormalClose();
+
+    /**
+     * Returns the connection termination cause, represented as a string. Unlike the
+     * {@linkplain #getPeerVisibleReason() peer-visible reason}, this log message will not be
+     * sent across to the peer and it is thus allowed to include additional details that might
+     * help debugging a connection termination.
+     */
+    public final String getLogMsg() {
+        return logMsg;
+    }
+
+    /**
+     * Returns the connection termination cause, represented as a string. This represents the
+     * "debugData" that is sent to the peer in a
+     * {@linkplain  jdk.internal.net.http.frame.GoAwayFrame GOAWAY frame}.
+     */
+    public final String getPeerVisibleReason() {
+        return this.peerVisibleReason;
+    }
+
+    /**
+     * Sets the connection termination cause, represented as a string, which will be sent
+     * to the peer in a {@linkplain  jdk.internal.net.http.frame.GoAwayFrame GOAWAY frame}.
+     * Unlike the {@link #getLogMsg() log message},
+     * it is expected that this peer-visible reason will not contain anything that is not meant
+     * to be viewed by the peer.
+     */
+    protected final void setPeerVisibleReason(final String reasonPhrase) {
+        this.peerVisibleReason = reasonPhrase;
+    }
+
+    /**
+     * Returns a connection termination cause that represents an
+     * {@linkplain #isAbnormalClose() abnormal} termination due to the given {@code cause}.
+     *
+     * @param cause the termination cause, cannot be null.
+     */
+    public static Http2TerminationCause forException(final Throwable cause) {
+        Objects.requireNonNull(cause);
+        if (cause instanceof ProtocolException pe) {
+            return new ProtocolError(pe);
+        }
+        return new InternalError(cause);
+    }
+
+    /**
+     * Returns a connection termination cause that represents a
+     * {@linkplain #isAbnormalClose() normal} termination.
+     */
+    public static Http2TerminationCause noErrorTermination() {
+        return NoError.INSTANCE;
+    }
+
+    /**
+     * Returns a connection termination cause that represents a
+     * {@linkplain #isAbnormalClose() normal} termination due to the connection
+     * being idle.
+     */
+    public static Http2TerminationCause idleTimedOut() {
+        return NoError.IDLE_TIMED_OUT;
+    }
+
+    /**
+     * Returns a connection termination cause that represents an
+     * {@linkplain #isAbnormalClose() abnormal} termination due to the given {@code errorCode}.
+     * Although this method does no checks for the {@code errorCode}, it is expected to be one
+     * of the error codes specified by the HTTP/2 RFC for the ErrorFrame.
+     *
+     * @param errorCode the error code
+     * @param loggedAs  optional log message to be associated with this termination cause
+     */
+    public static Http2TerminationCause forH2Error(final int errorCode, final String loggedAs) {
+        if (errorCode == ErrorFrame.PROTOCOL_ERROR) {
+            return new ProtocolError(loggedAs);
+        } else if (errorCode == ErrorFrame.FLOW_CONTROL_ERROR) {
+            // we treat flow control error as a protocol error currently
+            return new ProtocolError(loggedAs, true);
+        }
+        return new H2StandardError(errorCode, loggedAs);
+    }
+
+    private static IOException toReportedCause(final Throwable original,
+                                               final String fallbackExceptionMsg) {
+        if (original == null) {
+            return fallbackExceptionMsg == null
+                    ? new IOException("connection terminated")
+                    : new IOException(fallbackExceptionMsg);
+        } else if (original instanceof IOException ioe) {
+            return ioe;
+        } else {
+            return Utils.toIOException(original);
+        }
+    }
+
+    private static final class NoError extends Http2TerminationCause {
+        private static final IOException NO_ERROR_MARKER =
+                new IOException("HTTP/2 connection closed normally - no error");
+        private static final IOException NO_ERROR_IDLE_TIMED_OUT_MARKER =
+                new IOException("HTTP/2 connection idle timed out - no error");
+
+        static {
+            // remove the stacktrace from the marker exception instances
+            NO_ERROR_MARKER.setStackTrace(new StackTraceElement[0]);
+            NO_ERROR_IDLE_TIMED_OUT_MARKER.setStackTrace(new StackTraceElement[0]);
+        }
+
+        private static final NoError INSTANCE = new NoError(false);
+        private static final NoError IDLE_TIMED_OUT = new NoError(true);
+
+        private final boolean idleTimedOut;
+
+        private NoError(final boolean idleTimedOut) {
+            super(ErrorFrame.NO_ERROR,
+                    idleTimedOut ? NO_ERROR_IDLE_TIMED_OUT_MARKER : NO_ERROR_MARKER);
+            this.idleTimedOut = idleTimedOut;
+            setPeerVisibleReason(idleTimedOut ? "idle timed out" : "no error");
+        }
+
+        @Override
+        public boolean isAbnormalClose() {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return this.idleTimedOut
+                    ? "No error - idle timed out"
+                    : "No error - normal termination";
+        }
+    }
+
+    private static sealed class H2StandardError extends Http2TerminationCause {
+        private H2StandardError(final int errCode, final String msg) {
+            super(errCode, msg);
+            setPeerVisibleReason(ErrorFrame.stringForCode(errCode));
+        }
+
+        private H2StandardError(final int errCode, final Throwable cause) {
+            super(errCode, cause);
+            setPeerVisibleReason(ErrorFrame.stringForCode(errCode));
+        }
+
+        @Override
+        public boolean isAbnormalClose() {
+            return getCloseCode() != ErrorFrame.NO_ERROR;
+        }
+
+        @Override
+        public String toString() {
+            return ErrorFrame.stringForCode(this.getCloseCode());
+        }
+    }
+
+    private static final class ProtocolError extends H2StandardError {
+        private ProtocolError(final String msg) {
+            this(msg, false);
+        }
+
+        private ProtocolError(final String msg, final boolean flowControlError) {
+            super(flowControlError
+                            ? ErrorFrame.FLOW_CONTROL_ERROR
+                            : ErrorFrame.PROTOCOL_ERROR,
+                    new ProtocolException(msg));
+        }
+
+        private ProtocolError(final ProtocolException pe) {
+            super(ErrorFrame.PROTOCOL_ERROR, pe);
+        }
+
+        @Override
+        public boolean isAbnormalClose() {
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "Protocol error - " + this.getLogMsg();
+        }
+    }
+
+    private static final class InternalError extends Http2TerminationCause {
+        private InternalError(final Throwable cause) {
+            super(ErrorFrame.INTERNAL_ERROR, cause);
+        }
+
+        @Override
+        public boolean isAbnormalClose() {
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "Internal error - " + this.getLogMsg();
+        }
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
index 0219b0960d7..115bc56f804 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
@@ -540,9 +540,7 @@ abstract class HttpConnection implements Closeable {
      * Closes this connection due to the given cause.
      * @param cause the cause for which the connection is closed, may be null
      */
-    void close(Throwable cause) {
-        close();
-    }
+    abstract void close(Throwable cause);
 
     /**
      * {@return the underlying connection flow, if applicable}
diff --git a/test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientImplAccess.java b/test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientImplAccess.java
new file mode 100644
index 00000000000..875ac5426dd
--- /dev/null
+++ b/test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientImplAccess.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.internal.net.http;
+
+import java.lang.reflect.Field;
+import java.net.http.HttpClient;
+import java.util.Objects;
+import java.util.Set;
+
+public final class HttpClientImplAccess {
+
+    private static final Field openedConnections; // Set<> jdk.internal.net.http.HttpClientImpl#openedConnections
+
+    static {
+        try {
+            openedConnections = Class.forName("jdk.internal.net.http.HttpClientImpl")
+                    .getDeclaredField("openedConnections");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private HttpClientImplAccess() {
+        throw new AssertionError();
+    }
+
+    private static HttpClientImpl impl(final HttpClient client) {
+        if (client instanceof HttpClientImpl impl) return impl;
+        if (client instanceof HttpClientFacade facade) return facade.impl;
+        return null;
+    }
+
+    /**
+     * Returns the {@code jdk.internal.net.http.HttpClientImpl#openedConnections Set}.
+     * Returns null if the underlying client isn't of type jdk.internal.net.http.HttpClientImpl.
+     */
+    public static Set<?> getOpenedConnections(final HttpClient client)
+            throws IllegalAccessException {
+        Objects.requireNonNull(client, "client");
+        final HttpClientImpl clientImpl = impl(client);
+        if (clientImpl == null) {
+            return null;
+        }
+        openedConnections.setAccessible(true);
+        return (Set<?>) openedConnections.get(clientImpl);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/http2/BurstyRequestsTest.java b/test/jdk/java/net/httpclient/http2/BurstyRequestsTest.java
new file mode 100644
index 00000000000..6d293e16941
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http2/BurstyRequestsTest.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.net.ssl.SSLSession;
+
+import jdk.httpclient.test.lib.http2.BodyOutputStream;
+import jdk.httpclient.test.lib.http2.Http2Handler;
+import jdk.httpclient.test.lib.http2.Http2TestExchange;
+import jdk.httpclient.test.lib.http2.Http2TestExchangeSupplier;
+import jdk.httpclient.test.lib.http2.Http2TestServer;
+import jdk.httpclient.test.lib.http2.Http2TestServerConnection;
+import jdk.internal.net.http.HttpClientImplAccess;
+import jdk.internal.net.http.common.HttpHeadersBuilder;
+import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_2;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/*
+ * @test
+ * @bug 8326498 8361091
+ * @summary verify that the HttpClient does not leak connections when dealing with
+ *          sudden rush of HTTP/2 requests
+ * @library /test/lib /test/jdk/java/net/httpclient/lib ../access
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.http2.Http2TestServer
+ *        jdk.httpclient.test.lib.http2.Http2Handler
+ *        jdk.httpclient.test.lib.http2.Http2TestExchange
+ *        jdk.httpclient.test.lib.http2.Http2TestExchangeSupplier
+ *        java.net.http/jdk.internal.net.http.HttpClientImplAccess
+ * @run junit ${test.main.class}
+ */
+class BurstyRequestsTest {
+
+    private static final String HANDLER_PATH = "/8326498/";
+
+    // we use a h2c server but it doesn't matter if it is h2c or h2
+    private static Http2TestServer http2Server;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        http2Server = new Http2TestServer(false, 0);
+        http2Server.setExchangeSupplier(new ExchangeSupplier());
+        http2Server.addHandler(new Handler(), HANDLER_PATH);
+        http2Server.start();
+        System.err.println("started HTTP/2 server " + http2Server.getAddress());
+    }
+
+    @AfterAll
+    static void afterAll() {
+        if (http2Server != null) {
+            System.err.println("stopping server " + http2Server.getAddress());
+            http2Server.stop();
+        }
+    }
+
+    /*
+     * Issues a burst of HTTP/2 requests to the same server (host/port) and expects all of
+     * them to complete normally.
+     * Once these requests have completed, the test then peeks into an internal field of the
+     * HttpClientImpl to verify that the client is holding on to at most 1 connection.
+     */
+    @Test
+    void testOpenConnections() throws Exception {
+        final URI reqURI = URIBuilder.newBuilder()
+                .scheme("http")
+                .host(http2Server.getAddress().getAddress())
+                .port(http2Server.getAddress().getPort())
+                .path(HANDLER_PATH)
+                .build();
+        final HttpRequest req = HttpRequest.newBuilder().uri(reqURI).build();
+
+        final int numRequests = 20;
+        // latch for the tasks to wait on, before issuing the requests
+        final CountDownLatch startLatch = new CountDownLatch(numRequests);
+        final List<Future<Void>> futures = new ArrayList<>();
+
+        try (final ExecutorService executor = Executors.newCachedThreadPool();
+             final HttpClient client = HttpClient.newBuilder()
+                     .proxy(NO_PROXY)
+                     .version(HTTP_2)
+                     .build()) {
+            // our test needs to peek into the internal field of jdk.internal.net.http.HttpClientImpl
+            final Set<?> openedConnections = HttpClientImplAccess.getOpenedConnections(client);
+            assertNotNull(openedConnections, "HttpClientImpl#openedConnections field is null or not available");
+
+            for (int i = 0; i < numRequests; i++) {
+                final Future<Void> f = executor.submit(new RequestIssuer(startLatch, client, req));
+                futures.add(f);
+            }
+            // wait for the requests to complete
+            for (final Future<Void> f : futures) {
+                f.get();
+            }
+            System.err.println("all " + numRequests + " requests completed successfully");
+            // the request completion happens asynchronously to the closing of the HTTP/2 Stream
+            // as well as the HTTP/2 connection. we wait for at most 1 connection to be retained
+            // by HttpClientImpl.
+            System.err.println("waiting for at least " + (numRequests - 1) + " connections to be closed");
+            // now verify that the current open TCP connections is not more than 1.
+            // we let the test timeout if we never reach that count.
+            int size = openedConnections.size();
+            System.err.println("currently " + size + " open connections: " + openedConnections);
+            while (size > 1) {
+                // wait
+                Thread.sleep(100);
+                final int prev = size;
+                size = openedConnections.size();
+                if (prev != size) {
+                    System.err.println("currently " + size + " open connections: " + openedConnections);
+                }
+            }
+            // we expect at most 1 connection will stay open
+            assertTrue((size == 0 || size == 1),
+                    "unexpected number of current open connections: " + size);
+        }
+    }
+
+    private static final class RequestIssuer implements Callable<Void> {
+        private final CountDownLatch startLatch;
+        private final HttpClient client;
+        private final HttpRequest request;
+
+        private RequestIssuer(final CountDownLatch startLatch, final HttpClient client,
+                              final HttpRequest request) {
+            this.startLatch = startLatch;
+            this.client = client;
+            this.request = request;
+        }
+
+        @Override
+        public Void call() throws Exception {
+            this.startLatch.countDown(); // announce our arrival
+            this.startLatch.await(); // wait for other threads to arrive
+            // issue the request
+            final HttpResponse<Void> resp = this.client.send(request, BodyHandlers.discarding());
+            if (resp.statusCode() != 200) {
+                throw new AssertionError("unexpected response status code: " + resp.statusCode());
+            }
+            return null;
+        }
+    }
+
+    private static final class Handler implements Http2Handler {
+        private static final int NO_RESP_BODY = -1;
+
+        @Override
+        public void handle(final Http2TestExchange exchange) throws IOException {
+            System.err.println("handling request " + exchange.getRequestURI());
+            exchange.sendResponseHeaders(200, NO_RESP_BODY);
+        }
+    }
+
+    private static final class ExchangeSupplier implements Http2TestExchangeSupplier {
+
+        @Override
+        public Http2TestExchange get(int streamid, String method, HttpHeaders reqheaders,
+                                     HttpHeadersBuilder rspheadersBuilder, URI uri, InputStream is,
+                                     SSLSession sslSession, BodyOutputStream os,
+                                     Http2TestServerConnection conn, boolean pushAllowed) {
+            // don't close the connection when/if the client sends a GOAWAY
+            conn.closeConnOnIncomingGoAway = false;
+            return Http2TestExchangeSupplier.ofDefault().get(streamid, method, reqheaders,
+                    rspheadersBuilder, uri, is, sslSession, os, conn, pushAllowed);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java b/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java
index 755bb2e16cc..c5db99ce164 100644
--- a/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java
+++ b/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -250,11 +250,15 @@ public class H2GoAwayTest {
                         } catch (ExecutionException ee) {
                             final Throwable cause = ee.getCause();
                             if (!(cause instanceof IOException ioe)) {
+                                System.err.println("unexpected exception: " + cause
+                                        + ", for request " + REQ_URI_BASE + reqQueryPart);
                                 throw cause;
                             }
                             // verify it failed for the right reason
                             if (ioe.getMessage() == null
                                     || !ioe.getMessage().contains("request not processed by peer")) {
+                                System.err.println("unexpected exception message: " + ioe.getMessage()
+                                        + ", for request " + REQ_URI_BASE + reqQueryPart);
                                 // propagate the original failure
                                 throw ioe;
                             }
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServerConnection.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServerConnection.java
index 20668d281c8..63c0ba5f5b8 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServerConnection.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServerConnection.java
@@ -117,6 +117,7 @@ public class Http2TestServerConnection {
     final Properties properties;
     volatile boolean stopping;
     volatile int nextPushStreamId = 2;
+    public volatile boolean closeConnOnIncomingGoAway = true;
     ConcurrentLinkedQueue<PingRequest> pings = new ConcurrentLinkedQueue<>();
     // the max stream id of a processed H2 request. -1 implies none were processed.
     private final AtomicInteger maxProcessedRequestStreamId = new AtomicInteger(-1);
@@ -537,8 +538,12 @@ public class Http2TestServerConnection {
             outputQ.put(frame);
             return;
         } else if (f instanceof GoAwayFrame) {
-            System.err.println(server.name + ": Closing connection: "+ f.toString());
-            close(ErrorFrame.NO_ERROR);
+            if (closeConnOnIncomingGoAway) {
+                System.err.println(server.name + ": Closing connection: "+ f.toString());
+                close(ErrorFrame.NO_ERROR);
+            } else {
+                System.err.println(server.name + ": Will not close connection for incoming GOAWAY: " + f);
+            }
         } else if (f instanceof PingFrame) {
             handlePing((PingFrame)f);
         } else
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
index 27d2b98a34d..90cac20dbfd 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
@@ -501,9 +501,15 @@ public class ConnectionPoolTest {
         @Override SocketChannel channel() {return channel;}
         @Override
         public void close() {
-            closed=finished=true;
-            System.out.println("closed: " + this);
+            this.close(null);
         }
+
+        @Override
+        void close(final Throwable cause) {
+            closed=finished=true;
+            System.out.println("closed: " + this + " cause: " + cause);
+        }
+
         @Override
         public String toString() {
             return "HttpConnectionStub: " + address + " proxy: " + proxy;

From 49176e322bbb9ed1ef2f534b949b937770b54162 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Tue, 25 Nov 2025 11:39:25 +0000
Subject: [PATCH 336/512] 8372103: Metal JButton doesn't show focus if no text
 or icon

Reviewed-by: azvegint, tr
---
 .../javax/swing/plaf/metal/MetalButtonUI.java |  9 ++-
 .../javax/swing/plaf/metal/MetalFocusBug.java | 74 +++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/swing/plaf/metal/MetalFocusBug.java

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
index 0bbbab7b45f..c940b4dcead 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -217,6 +217,13 @@ public class MetalButtonUI extends BasicButtonUI {
         // If there is an icon and no text
         else if ( isIcon ) {
             focusRect.setBounds( iconRect );
+        } else {
+            Rectangle emptyRect = new Rectangle();
+            emptyRect.x = 5;
+            emptyRect.y = 5;
+            emptyRect.width = b.getWidth() - emptyRect.x * 2;
+            emptyRect.height = b.getHeight() - emptyRect.y * 2;
+            focusRect.setBounds(emptyRect);
         }
 
         g.setColor(getFocusColor());
diff --git a/test/jdk/javax/swing/plaf/metal/MetalFocusBug.java b/test/jdk/javax/swing/plaf/metal/MetalFocusBug.java
new file mode 100644
index 00000000000..ff3d555a1b0
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/metal/MetalFocusBug.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8372103
+ * @summary Verifies Metal JButton show focus even if there's no text or icon
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual MetalFocusBug
+ */
+
+import java.awt.Color;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.UIManager;
+
+public class MetalFocusBug {
+
+    static final String INSTRUCTIONS = """
+        A JFrame is shown with 2 JButtons.
+        A button "Top" at TOP and
+        another button with empty text and without icon at the bottom.
+        Initially the focus is at the "TOP" button.
+        Verify that Red color focus rectangle is around the "TOP" text.
+        Press "Tab" key and verify the bottom button gets focus via
+        red color focus rectangle.
+        If red color focus rectangle is seen at the bottom button,
+        press Pass else press Fail.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        // Set Metal L&F
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(MetalFocusBug::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        // Make focus rectangle very obvious.
+        UIManager.put("Button.focus", new ColorUIResource(Color.RED));
+        JFrame frame = new JFrame("MetalFocusBug");
+        frame.getContentPane().add(new JButton("TOP"), "North");
+        frame.getContentPane().add(new JButton(""), "Center");
+        frame.setSize(300, 300);
+        return frame;
+    }
+}

From 35f4a7410cdaaa9d3ce68148cb81e893ad0d93de Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 25 Nov 2025 13:00:07 +0000
Subject: [PATCH 337/512] 8366888: C2: incorrect assertion predicate with short
 running long counted loop

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: chagedorn, bmaillard
---
 src/hotspot/share/opto/loopTransform.cpp      |  1 -
 src/hotspot/share/opto/loopnode.cpp           | 38 ++++++++-
 src/hotspot/share/opto/loopnode.hpp           |  2 +
 src/hotspot/share/opto/node.hpp               |  7 +-
 src/hotspot/share/opto/predicates.cpp         | 75 +++++++++++++++--
 src/hotspot/share/opto/predicates.hpp         | 20 +++++
 ...untedLoopWithLongRCBadAssertPredicate.java | 81 +++++++++++++++++++
 ...ntedLoopWithLongRCBadAssertPredicate2.java | 54 +++++++++++++
 8 files changed, 266 insertions(+), 12 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate.java
 create mode 100644 test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate2.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 31d1cbe0443..5c65103677b 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1411,7 +1411,6 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
 
   C->print_method(PHASE_BEFORE_PRE_MAIN_POST, 4, main_head);
 
-  Node *pre_header= main_head->in(LoopNode::EntryControl);
   Node *init      = main_head->init_trip();
   Node *incr      = main_end ->incr();
   Node *limit     = main_end ->limit();
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index dfff7ef96a5..03cc5cbcff6 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -1162,13 +1162,16 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
 class CloneShortLoopPredicateVisitor : public PredicateVisitor {
   ClonePredicateToTargetLoop _clone_predicate_to_loop;
   PhaseIdealLoop* const _phase;
+  Node* const _new_init;
 
 public:
   CloneShortLoopPredicateVisitor(LoopNode* target_loop_head,
+                                 Node* new_init,
                                  const NodeInSingleLoopBody &node_in_loop_body,
                                  PhaseIdealLoop* phase)
     : _clone_predicate_to_loop(target_loop_head, node_in_loop_body, phase),
-      _phase(phase) {
+      _phase(phase),
+      _new_init(new_init) {
   }
   NONCOPYABLE(CloneShortLoopPredicateVisitor);
 
@@ -1180,11 +1183,32 @@ public:
   }
 
   void visit(const TemplateAssertionPredicate& template_assertion_predicate) override {
-    _clone_predicate_to_loop.clone_template_assertion_predicate(template_assertion_predicate);
+    _clone_predicate_to_loop.clone_template_assertion_predicate_and_replace_init(template_assertion_predicate, _new_init);
     template_assertion_predicate.kill(_phase->igvn());
   }
 };
 
+// For an int counted loop, try_make_short_running_loop() transforms the loop from:
+//     for (int = start; i < stop; i+= stride) { ... }
+// to
+//     for (int = 0; i < stop - start; i+= stride) { ... }
+// Template Assertion Predicates added so far were with an init value of start. They need to be updated with the new
+// init value of 0 (otherwise when a template assertion predicate is turned into an initialized assertion predicate, it
+// performs an incorrect check):
+//                                zero
+//        init                     |
+//         |           ===>   OpaqueLoopInit   init
+//  OpaqueLoopInit                         \   /
+//                                          AddI
+//
+Node* PhaseIdealLoop::new_assertion_predicate_opaque_init(Node* entry_control, Node* init, Node* int_zero) {
+  OpaqueLoopInitNode* new_opaque_init = new OpaqueLoopInitNode(C, int_zero);
+  register_new_node(new_opaque_init, entry_control);
+  Node* new_init = new AddINode(new_opaque_init, init);
+  register_new_node(new_init, entry_control);
+  return new_init;
+}
+
 // If the loop is either statically known to run for a small enough number of iterations or if profile data indicates
 // that, we don't want an outer loop because the overhead of having an outer loop whose backedge is never taken, has a
 // measurable cost. Furthermore, creating the loop nest usually causes one iteration of the loop to be peeled so
@@ -1236,6 +1260,7 @@ bool PhaseIdealLoop::try_make_short_running_loop(IdealLoopTree* loop, jint strid
   }
   register_new_node(new_limit, entry_control);
 
+  Node* int_zero = intcon(0);
   PhiNode* phi = head->phi()->as_Phi();
   if (profile_short_running_loop) {
     // Add a Short Running Long Loop Predicate. It's the first predicate in the predicate chain before entering a loop
@@ -1261,9 +1286,11 @@ bool PhaseIdealLoop::try_make_short_running_loop(IdealLoopTree* loop, jint strid
     if (!short_running_long_loop_predicate_block->has_parse_predicate()) { // already trapped
       return false;
     }
+    Node* new_init = new_assertion_predicate_opaque_init(entry_control, init, int_zero);
+
     PredicateIterator predicate_iterator(entry_control);
     NodeInSingleLoopBody node_in_short_loop_body(this, loop);
-    CloneShortLoopPredicateVisitor clone_short_loop_predicates_visitor(head, node_in_short_loop_body, this);
+    CloneShortLoopPredicateVisitor clone_short_loop_predicates_visitor(head, new_init, node_in_short_loop_body, this);
     predicate_iterator.for_each(clone_short_loop_predicates_visitor);
 
     entry_control = head->skip_strip_mined()->in(LoopNode::EntryControl);
@@ -1311,6 +1338,10 @@ bool PhaseIdealLoop::try_make_short_running_loop(IdealLoopTree* loop, jint strid
     register_new_node(new_limit, predicates.entry());
   } else {
     assert(bt == T_INT && known_short_running_loop, "only CountedLoop statically known to be short running");
+    PredicateIterator predicate_iterator(entry_control);
+    Node* new_init = new_assertion_predicate_opaque_init(entry_control, init, int_zero);
+    UpdateInitForTemplateAssertionPredicates update_init_for_template_assertion_predicates(new_init, this);
+    predicate_iterator.for_each(update_init_for_template_assertion_predicates);
   }
   IfNode* exit_test = head->loopexit();
 
@@ -1320,7 +1351,6 @@ bool PhaseIdealLoop::try_make_short_running_loop(IdealLoopTree* loop, jint strid
     register_new_node(new_limit, entry_control);
   }
 
-  Node* int_zero = intcon(0);
   if (stride_con < 0) {
     new_limit = new SubINode(int_zero, new_limit);
     register_new_node(new_limit, entry_control);
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 1e34331f213..3b97d76773f 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1969,6 +1969,8 @@ public:
 
   Node* ensure_node_and_inputs_are_above_pre_end(CountedLoopEndNode* pre_end, Node* node);
 
+  Node* new_assertion_predicate_opaque_init(Node* entry_control, Node* init, Node* int_zero);
+
   bool try_make_short_running_loop(IdealLoopTree* loop, jint stride_con, const Node_List& range_checks, const uint iters_limit);
 
   ConINode* intcon(jint i);
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 6067bcbac8d..ec80fb6a0ab 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -2176,7 +2176,10 @@ class BFSActions : public StackObj {
   virtual bool is_target_node(Node* node) const = 0;
 
   // Defines an action that should be taken when we visit a target node in the BFS traversal.
-  virtual void target_node_action(Node* target_node) = 0;
+  // To give more freedom, we pass the direct child node to the target node such that
+  // child->in(i) == target node. This allows to also directly replace the target node instead
+  // of only updating its inputs.
+  virtual void target_node_action(Node* child, uint i) = 0;
 };
 
 // Class to perform a BFS traversal on the data nodes from a given start node. The provided BFSActions guide which
@@ -2198,7 +2201,7 @@ class DataNodeBFS : public StackObj {
         Node* input = next->in(j);
         if (_bfs_actions.is_target_node(input)) {
           assert(_bfs_actions.should_visit(input), "must also pass node filter");
-          _bfs_actions.target_node_action(input);
+          _bfs_actions.target_node_action(next, j);
         } else if (_bfs_actions.should_visit(input)) {
           _nodes_to_visit.push(input);
         }
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 208bd6583c5..2489ff563a9 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -198,12 +198,21 @@ TemplateAssertionPredicate TemplateAssertionPredicate::clone_and_replace_opaque_
                                                                                       Node* new_opaque_input,
                                                                                       CountedLoopNode* new_loop_node,
                                                                                       PhaseIdealLoop* phase) const {
-  DEBUG_ONLY(verify();)
   OpaqueLoopInitNode* new_opaque_init = new OpaqueLoopInitNode(phase->C, new_opaque_input);
   phase->register_new_node(new_opaque_init, new_control);
+  return clone_and_replace_init(new_control, new_opaque_init, new_loop_node, phase);
+}
+
+// Clone this Template Assertion Predicate and replace the old OpaqueLoopInit node with 'new_init'.
+// Note: 'new_init' could also have the 'OpaqueLoopInit` as parent node further up.
+TemplateAssertionPredicate TemplateAssertionPredicate::clone_and_replace_init(Node* new_control,
+                                                                              Node* new_init,
+                                                                              CountedLoopNode* new_loop_node,
+                                                                              PhaseIdealLoop* phase) const {
+  DEBUG_ONLY(verify();)
   TemplateAssertionExpression template_assertion_expression(opaque_node(), phase);
   OpaqueTemplateAssertionPredicateNode* new_opaque_node =
-      template_assertion_expression.clone_and_replace_init(new_control, new_opaque_init, new_loop_node);
+      template_assertion_expression.clone_and_replace_init(new_control, new_init, new_loop_node);
   AssertionPredicateIfCreator assertion_predicate_if_creator(phase);
   IfTrueNode* success_proj = assertion_predicate_if_creator.create_for_template(new_control, _if_node->Opcode(),
                                                                                 new_opaque_node,
@@ -238,8 +247,40 @@ class ReplaceOpaqueStrideInput : public BFSActions {
     return node->is_OpaqueLoopStride();
   }
 
-  void target_node_action(Node* target_node) override {
-    _igvn.replace_input_of(target_node, 1, _new_opaque_stride_input);
+  void target_node_action(Node* child, uint i) override {
+    assert(child->in(i)->is_OpaqueLoopStride(), "must be OpaqueLoopStride");
+    _igvn.replace_input_of(child->in(i), 1, _new_opaque_stride_input);
+  }
+};
+
+// This class is used to replace the OpaqueLoopInitNode with a new node while leaving the other nodes
+// unchanged.
+class ReplaceOpaqueInitNode : public BFSActions {
+  Node* _new_opaque_init_node;
+  PhaseIterGVN& _igvn;
+
+  public:
+  ReplaceOpaqueInitNode(Node* new_opaque_init_node, PhaseIterGVN& igvn)
+      : _new_opaque_init_node(new_opaque_init_node),
+        _igvn(igvn) {}
+  NONCOPYABLE(ReplaceOpaqueInitNode);
+
+  void replace_for(OpaqueTemplateAssertionPredicateNode* opaque_node) {
+    DataNodeBFS bfs(*this);
+    bfs.run(opaque_node);
+  }
+
+  bool should_visit(Node* node) const override {
+    return TemplateAssertionExpressionNode::is_maybe_in_expression(node);
+  }
+
+  bool is_target_node(Node* node) const override {
+    return node->is_OpaqueLoopInit();
+  }
+
+  void target_node_action(Node* child, uint i) override {
+    assert(child->in(i)->is_OpaqueLoopInit(), "must be old OpaqueLoopInit");
+    _igvn.replace_input_of(child, i, _new_opaque_init_node);
   }
 };
 
@@ -250,6 +291,13 @@ void TemplateAssertionPredicate::replace_opaque_stride_input(Node* new_stride, P
   replace_opaque_stride_input.replace_for(opaque_node());
 }
 
+// Replace the OpaqueLoopInitNode with 'new_init' and leave the other nodes unchanged.
+void TemplateAssertionPredicate::replace_opaque_init_node(Node* new_init, PhaseIterGVN& igvn) const {
+  DEBUG_ONLY(verify();)
+  ReplaceOpaqueInitNode replace_opaque_init_node(new_init, igvn);
+  replace_opaque_init_node.replace_for(opaque_node());
+}
+
 // Create a new Initialized Assertion Predicate from this template at the template success projection.
 InitializedAssertionPredicate TemplateAssertionPredicate::initialize(PhaseIdealLoop* phase) const {
   DEBUG_ONLY(verify();)
@@ -308,7 +356,8 @@ class OpaqueLoopNodesVerifier : public BFSActions {
     return node->is_Opaque1();
   }
 
-  void target_node_action(Node* target_node) override {
+  void target_node_action(Node* child, uint i) override {
+    Node* target_node = child->in(i);
     if (target_node->is_OpaqueLoopInit()) {
       assert(!_found_init, "should only find one OpaqueLoopInitNode");
       _found_init = true;
@@ -1094,6 +1143,18 @@ void ClonePredicateToTargetLoop::clone_template_assertion_predicate(
   _target_loop_predicate_chain.insert_predicate(cloned_template_assertion_predicate);
 }
 
+// Clones the provided Template Assertion Predicate to the head of the current predicate chain at the target loop and
+// replaces the current OpaqueLoopInit with 'new_init'.
+//  Note: 'new_init' could also have the 'OpaqueLoopInit` as parent node further up.
+void ClonePredicateToTargetLoop::clone_template_assertion_predicate_and_replace_init(
+    const TemplateAssertionPredicate& template_assertion_predicate, Node* new_init) {
+  TemplateAssertionPredicate cloned_template_assertion_predicate =
+      template_assertion_predicate.clone_and_replace_init(_old_target_loop_entry, new_init, _target_loop_head->as_CountedLoop(), _phase);
+  template_assertion_predicate.rewire_loop_data_dependencies(cloned_template_assertion_predicate.tail(),
+                                                             _node_in_loop_body, _phase);
+  _target_loop_predicate_chain.insert_predicate(cloned_template_assertion_predicate);
+}
+
 CloneUnswitchedLoopPredicatesVisitor::CloneUnswitchedLoopPredicatesVisitor(
     LoopNode* true_path_loop_head, LoopNode* false_path_loop_head,
     const NodeInOriginalLoopBody& node_in_true_path_loop_body, const NodeInClonedLoopBody& node_in_false_path_loop_body,
@@ -1182,6 +1243,10 @@ void UpdateStrideForAssertionPredicates::connect_initialized_assertion_predicate
   }
 }
 
+void UpdateInitForTemplateAssertionPredicates::visit(const TemplateAssertionPredicate& template_assertion_predicate) {
+  template_assertion_predicate.replace_opaque_init_node(_new_init, _phase->igvn());
+}
+
 // Do the following to find and eliminate useless Parse and Template Assertion Predicates:
 // 1. Mark all Parse and Template Assertion Predicates "maybe useful".
 // 2. Walk through the loop tree and iterate over all Predicates above each loop head. All found Parse and Template
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index 32b1c1cd3c4..cd0832cc062 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -438,7 +438,10 @@ class TemplateAssertionPredicate : public Predicate {
   TemplateAssertionPredicate clone(Node* new_control, CountedLoopNode* new_loop_node, PhaseIdealLoop* phase) const;
   TemplateAssertionPredicate clone_and_replace_opaque_input(Node* new_control, Node* new_opaque_input,
                                                             CountedLoopNode* new_loop_node, PhaseIdealLoop* phase) const;
+  TemplateAssertionPredicate clone_and_replace_init(Node* new_control, Node* new_input,
+                                                    CountedLoopNode* new_loop_node, PhaseIdealLoop* phase) const;
   void replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn) const;
+  void replace_opaque_init_node(Node* new_init, PhaseIterGVN& igvn) const;
   InitializedAssertionPredicate initialize(PhaseIdealLoop* phase) const;
   void rewire_loop_data_dependencies(IfTrueNode* target_predicate, const NodeInLoopBody& data_in_loop_body,
                                      const PhaseIdealLoop* phase) const;
@@ -1228,6 +1231,7 @@ public:
   }
 
   void clone_template_assertion_predicate(const TemplateAssertionPredicate& template_assertion_predicate);
+  void clone_template_assertion_predicate_and_replace_init(const TemplateAssertionPredicate& template_assertion_predicate, Node* new_init);
 };
 
 // Visitor to clone Parse and Template Assertion Predicates from a loop to its unswitched true and false path loop.
@@ -1300,6 +1304,22 @@ class UpdateStrideForAssertionPredicates : public PredicateVisitor {
   void visit(const InitializedAssertionPredicate& initialized_assertion_predicate) override;
 };
 
+// This visitor replaces the OpaqueLoopInitNode for an Assertion Predicate with the expression passed as input.
+class UpdateInitForTemplateAssertionPredicates : public PredicateVisitor {
+  Node* const _new_init;
+  PhaseIdealLoop* const _phase;
+
+public:
+  UpdateInitForTemplateAssertionPredicates(Node* const new_init, PhaseIdealLoop* phase)
+      : _new_init(new_init),
+        _phase(phase) {}
+  NONCOPYABLE(UpdateInitForTemplateAssertionPredicates);
+
+  using PredicateVisitor::visit;
+
+  void visit(const TemplateAssertionPredicate& template_assertion_predicate) override;
+};
+
 // Eliminate all useless Parse and Template Assertion Predicates. They become useless when they can no longer be found
 // from a loop head. We mark these useless to clean them up later during IGVN. A Predicate that is marked useless will
 // no longer be visited by a PredicateVisitor.
diff --git a/test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate.java b/test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate.java
new file mode 100644
index 00000000000..334f369cd6b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8366888
+ * @summary C2: incorrect assertion predicate with short running long counted loop
+  *
+ * @run main/othervm -XX:-BackgroundCompilation TestShortCountedLoopWithLongRCBadAssertPredicate
+ * @run main TestShortCountedLoopWithLongRCBadAssertPredicate
+ */
+
+import java.util.Objects;
+
+public class TestShortCountedLoopWithLongRCBadAssertPredicate {
+    public static void main(String[] args) {
+        float[] floatArray = new float[1000];
+        for (int i = 0; i < 20_000; i++) {
+            test1(floatArray, 10000);
+            test2(floatArray, 10000);
+            test3(100, 1100, floatArray, 10000);
+            test4(999, 0, floatArray, 10000);
+        }
+    }
+
+    private static float test1(float[] floatArray, long longRange) {
+        float v = 0;
+        for (int i = 100; i < 1100; i++) {
+            v += floatArray[i - 100];
+            Objects.checkIndex(i, longRange);
+        }
+        return v;
+    }
+
+    private static float test2(float[] floatArray, long longRange) {
+        float v = 0;
+        for (int i = 999; i >= 0; i--) {
+            v += floatArray[i];
+            Objects.checkIndex(i, longRange);
+        }
+        return v;
+    }
+
+    private static float test3(int start, int stop, float[] floatArray, long longRange) {
+        float v = 0;
+        for (int i = start; i < stop; i++) {
+            v += floatArray[i - 100];
+            Objects.checkIndex(i, longRange);
+        }
+        return v;
+    }
+
+    private static float test4(int start, int stop, float[] floatArray, long longRange) {
+        float v = 0;
+        for (int i = start; i >= stop; i--) {
+            v += floatArray[i];
+            Objects.checkIndex(i, longRange);
+        }
+        return v;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate2.java b/test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate2.java
new file mode 100644
index 00000000000..13f38f080ed
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/longcountedloops/TestShortCountedLoopWithLongRCBadAssertPredicate2.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8366888
+ * @summary C2: incorrect assertion predicate with short running long counted loop
+ *
+ * @run main/othervm -XX:CompileOnly=TestShortCountedLoopWithLongRCBadAssertPredicate2::test -Xbatch TestShortCountedLoopWithLongRCBadAssertPredicate2
+ * @run main/othervm TestShortCountedLoopWithLongRCBadAssertPredicate2
+ */
+
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+
+public class TestShortCountedLoopWithLongRCBadAssertPredicate2 {
+    private static MemorySegment ms = MemorySegment.ofArray(new byte[80000]);
+    private static final ValueLayout.OfByte BYTE = ValueLayout.JAVA_BYTE;
+    static byte[] bArr = new byte[80000];
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 10000; i++) {
+            test(i);
+        }
+    }
+
+    public static void test(int start) {
+        int end = start + 100;
+        int i = 0;
+        while (start < end) {
+            bArr[i++] = ms.get(BYTE, start++);
+        }
+    }
+}

From c00d29afa9c3de65b1ca4e98dbb9e6f6931d7437 Mon Sep 17 00:00:00 2001
From: Roman Marchenko <rmarchenko@openjdk.org>
Date: Tue, 25 Nov 2025 13:41:51 +0000
Subject: [PATCH 338/512] 8372414: Command "make test-prebuilt" fails when
 listing tests

Reviewed-by: erikj
---
 make/RunTests.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 21eb178343e..1f50b97531b 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1157,6 +1157,7 @@ define SetupRunJtregTestBody
 	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR) + $$($1_SKIPPED))) \
 	, \
 	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0) \
+	  $$(eval $1_PASSED := 0) \
 	  $$(eval $1_RUNTIME_SKIPPED := 0) \
 	  $$(eval $1_SKIPPED := 0) \
 	  $$(eval $1_FAILED := 0) \

From d94c52ccf2fed3fc66d25a34254c9b581c175fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Tue, 25 Nov 2025 13:43:25 +0000
Subject: [PATCH 339/512] 8367656: Refactor Constantpool's operand array into
 two

Reviewed-by: coleenp, sspitsyn, dholmes
---
 .../share/cds/aotConstantPoolResolver.cpp     |   4 +-
 .../share/classfile/classFileParser.cpp       |  72 ++---
 src/hotspot/share/oops/bsmAttribute.hpp       | 170 ++++++++++
 .../share/oops/bsmAttribute.inline.hpp        |  55 ++++
 src/hotspot/share/oops/constantPool.cpp       | 300 ++++++++----------
 src/hotspot/share/oops/constantPool.hpp       | 132 ++------
 .../prims/jvmtiClassFileReconstituter.cpp     |  22 +-
 .../share/prims/jvmtiRedefineClasses.cpp      | 146 ++++-----
 .../share/prims/jvmtiRedefineClasses.hpp      |  26 +-
 src/hotspot/share/runtime/vmStructs.cpp       |   7 +-
 .../sun/jvm/hotspot/oops/ConstantPool.java    |  68 ++--
 .../sun/jvm/hotspot/utilities/U4Array.java    |  64 ++++
 12 files changed, 610 insertions(+), 456 deletions(-)
 create mode 100644 src/hotspot/share/oops/bsmAttribute.hpp
 create mode 100644 src/hotspot/share/oops/bsmAttribute.inline.hpp
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U4Array.java

diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.cpp b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
index ddf7d32ed70..c4bb26f6fb1 100644
--- a/src/hotspot/share/cds/aotConstantPoolResolver.cpp
+++ b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
@@ -449,7 +449,7 @@ bool AOTConstantPoolResolver::check_lambda_metafactory_signature(ConstantPool* c
 }
 
 bool AOTConstantPoolResolver::check_lambda_metafactory_methodtype_arg(ConstantPool* cp, int bsms_attribute_index, int arg_i) {
-  int mt_index = cp->bsm_attribute_entry(bsms_attribute_index)->argument_index(arg_i);
+  int mt_index = cp->bsm_attribute_entry(bsms_attribute_index)->argument(arg_i);
   if (!cp->tag_at(mt_index).is_method_type()) {
     // malformed class?
     return false;
@@ -465,7 +465,7 @@ bool AOTConstantPoolResolver::check_lambda_metafactory_methodtype_arg(ConstantPo
 }
 
 bool AOTConstantPoolResolver::check_lambda_metafactory_methodhandle_arg(ConstantPool* cp, int bsms_attribute_index, int arg_i) {
-  int mh_index = cp->bsm_attribute_entry(bsms_attribute_index)->argument_index(arg_i);
+  int mh_index = cp->bsm_attribute_entry(bsms_attribute_index)->argument(arg_i);
   if (!cp->tag_at(mh_index).is_method_handle()) {
     // malformed class?
     return false;
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index eb8a2a389b9..68890775051 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -47,6 +47,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/annotations.hpp"
+#include "oops/bsmAttribute.inline.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/fieldInfo.hpp"
 #include "oops/fieldStreams.inline.hpp"
@@ -3298,8 +3299,9 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(const ClassFil
                                                                   TRAPS) {
   assert(cfs != nullptr, "invariant");
   assert(cp != nullptr, "invariant");
+  const int cp_size = cp->length();
 
-  const u1* const current_start = cfs->current();
+  const u1* const current_before_parsing = cfs->current();
 
   guarantee_property(attribute_byte_length >= sizeof(u2),
                      "Invalid BootstrapMethods attribute length %u in class file %s",
@@ -3308,57 +3310,40 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(const ClassFil
 
   cfs->guarantee_more(attribute_byte_length, CHECK);
 
-  const int attribute_array_length = cfs->get_u2_fast();
+  const int num_bootstrap_methods = cfs->get_u2_fast();
 
-  guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
+  guarantee_property(_max_bootstrap_specifier_index < num_bootstrap_methods,
                      "Short length on BootstrapMethods in class file %s",
                      CHECK);
 
+  const u4 bootstrap_methods_u2_len = (attribute_byte_length - sizeof(u2)) / sizeof(u2);
 
-  // The attribute contains a counted array of counted tuples of shorts,
-  // represending bootstrap specifiers:
-  //    length*{bootstrap_method_index, argument_count*{argument_index}}
-  const unsigned int operand_count = (attribute_byte_length - (unsigned)sizeof(u2)) / (unsigned)sizeof(u2);
-  // operand_count = number of shorts in attr, except for leading length
-
-  // The attribute is copied into a short[] array.
-  // The array begins with a series of short[2] pairs, one for each tuple.
-  const int index_size = (attribute_array_length * 2);
-
-  Array<u2>* const operands =
-    MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK);
-
-  // Eagerly assign operands so they will be deallocated with the constant
+  // Eagerly assign the arrays so that they will be deallocated with the constant
   // pool if there is an error.
-  cp->set_operands(operands);
+  BSMAttributeEntries::InsertionIterator iter =
+    cp->bsm_entries().start_extension(num_bootstrap_methods,
+                                      bootstrap_methods_u2_len,
+                                      _loader_data,
+                                      CHECK);
 
-  int operand_fill_index = index_size;
-  const int cp_size = cp->length();
-
-  for (int n = 0; n < attribute_array_length; n++) {
-    // Store a 32-bit offset into the header of the operand array.
-    ConstantPool::operand_offset_at_put(operands, n, operand_fill_index);
-
-    // Read a bootstrap specifier.
+  for (int i = 0; i < num_bootstrap_methods; i++) {
     cfs->guarantee_more(sizeof(u2) * 2, CHECK);  // bsm, argc
-    const u2 bootstrap_method_index = cfs->get_u2_fast();
-    const u2 argument_count = cfs->get_u2_fast();
+    u2 bootstrap_method_ref = cfs->get_u2_fast();
+    u2 num_bootstrap_arguments = cfs->get_u2_fast();
     guarantee_property(
-      valid_cp_range(bootstrap_method_index, cp_size) &&
-      cp->tag_at(bootstrap_method_index).is_method_handle(),
-      "bootstrap_method_index %u has bad constant type in class file %s",
-      bootstrap_method_index,
-      CHECK);
+       valid_cp_range(bootstrap_method_ref, cp_size) &&
+       cp->tag_at(bootstrap_method_ref).is_method_handle(),
+       "bootstrap_method_index %u has bad constant type in class file %s",
+       bootstrap_method_ref,
+       CHECK);
+    cfs->guarantee_more(sizeof(u2) * num_bootstrap_arguments, CHECK); // argv[argc]
 
-    guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
-      "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
-      CHECK);
+    BSMAttributeEntry* entry = iter.reserve_new_entry(bootstrap_method_ref, num_bootstrap_arguments);
+    guarantee_property(entry != nullptr,
+                       "Invalid BootstrapMethods num_bootstrap_methods."
+                       " The total amount of space reserved for the BootstrapMethod attribute was not sufficient", CHECK);
 
-    operands->at_put(operand_fill_index++, bootstrap_method_index);
-    operands->at_put(operand_fill_index++, argument_count);
-
-    cfs->guarantee_more(sizeof(u2) * argument_count, CHECK);  // argv[argc]
-    for (int j = 0; j < argument_count; j++) {
+    for (int argi = 0; argi < num_bootstrap_arguments; argi++) {
       const u2 argument_index = cfs->get_u2_fast();
       guarantee_property(
         valid_cp_range(argument_index, cp_size) &&
@@ -3366,10 +3351,11 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(const ClassFil
         "argument_index %u has bad constant type in class file %s",
         argument_index,
         CHECK);
-      operands->at_put(operand_fill_index++, argument_index);
+      entry->set_argument(argi, argument_index);
     }
   }
-  guarantee_property(current_start + attribute_byte_length == cfs->current(),
+  cp->bsm_entries().end_extension(iter, _loader_data, CHECK);
+  guarantee_property(current_before_parsing + attribute_byte_length == cfs->current(),
                      "Bad length on BootstrapMethods in class file %s",
                      CHECK);
 }
diff --git a/src/hotspot/share/oops/bsmAttribute.hpp b/src/hotspot/share/oops/bsmAttribute.hpp
new file mode 100644
index 00000000000..a28d2757fb0
--- /dev/null
+++ b/src/hotspot/share/oops/bsmAttribute.hpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_OOPS_BSMATTRIBUTE_HPP
+#define SHARE_OOPS_BSMATTRIBUTE_HPP
+
+#include "oops/array.hpp"
+#include "utilities/checkedCast.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class ClassLoaderData;
+
+class BSMAttributeEntry {
+  friend class ConstantPool;
+  friend class BSMAttributeEntries;
+
+  u2 _bootstrap_method_index;
+  u2 _argument_count;
+
+  // The argument indexes are stored right after the object, in a contiguous array.
+  // [ bsmi_0 argc_0 arg_00 arg_01 ... arg_0N bsmi_1 argc_1 arg_10 ... arg_1N ... ]
+  // So in order to find the argument array, jump over ourselves.
+  const u2* argument_indexes() const {
+    return reinterpret_cast<const u2*>(this + 1);
+  }
+  u2* argument_indexes() {
+    return reinterpret_cast<u2*>(this + 1);
+  }
+  // These are overlays on top of the BSMAttributeEntries data array, do not construct.
+  BSMAttributeEntry() = delete;
+  NONCOPYABLE(BSMAttributeEntry);
+
+  void copy_args_into(BSMAttributeEntry* entry) const;
+
+public:
+  // Offsets for SA
+  enum {
+    _bsmi_offset = 0,
+    _argc_offset = 1,
+    _argv_offset = 2
+  };
+
+  int bootstrap_method_index() const {
+    return _bootstrap_method_index;
+  }
+  int argument_count() const {
+    return _argument_count;
+  }
+  int argument(int n) const {
+    assert(checked_cast<u2>(n) < _argument_count, "oob");
+    return argument_indexes()[n];
+  }
+
+  void set_argument(int index, u2 value) {
+    assert(index >= 0 && index < argument_count(), "invariant");
+    argument_indexes()[index] = value;
+  }
+
+  // How many u2s are required to store a BSM entry with argc arguments?
+  static int u2s_required (u2 argc) {
+    return 1 /* index */ + 1  /* argc */ + argc /* argv */;
+  }
+};
+
+// The BSMAttributeEntries stores the state of the BootstrapMethods attribute.
+class BSMAttributeEntries {
+  friend class VMStructs;
+  friend class JVMCIVMStructs;
+
+public:
+  class InsertionIterator {
+    friend BSMAttributeEntries;
+    BSMAttributeEntries* _insert_into;
+    // Current unused offset into BSMAEs offset array.
+    int _cur_offset;
+    // Current unused offset into BSMAEs bsm-data array.
+    int _cur_array;
+  public:
+    InsertionIterator() : _insert_into(nullptr), _cur_offset(-1), _cur_array(-1) {}
+    InsertionIterator(BSMAttributeEntries* insert_into, int cur_offset, int cur_array)
+    : _insert_into(insert_into),
+      _cur_offset(cur_offset),
+      _cur_array(cur_array) {}
+    InsertionIterator(const InsertionIterator&) = default;
+    InsertionIterator& operator=(const InsertionIterator&) = default;
+
+    int current_offset() const { return _cur_offset; }
+    // Add a new BSMAE, reserving the necessary memory for filling the argument vector.
+    // Returns null if there isn't enough space.
+    inline BSMAttributeEntry* reserve_new_entry(u2 bsmi, u2 argc);
+  };
+
+private:
+  // Each bootstrap method has a variable-sized array associated with it.
+  // We want constant-time lookup of the Nth BSM. Therefore, we use an offset table,
+  // such that the Nth BSM is located at _bootstrap_methods[_offsets[N]].
+  Array<u4>* _offsets;
+  Array<u2>* _bootstrap_methods;
+
+  // Copy the first num_entries into iter.
+  void copy_into(InsertionIterator& iter, int num_entries) const;
+
+public:
+  BSMAttributeEntries() : _offsets(nullptr), _bootstrap_methods(nullptr) {}
+  BSMAttributeEntries(Array<u4>* offsets, Array<u2>* bootstrap_methods)
+    : _offsets(offsets),
+      _bootstrap_methods(bootstrap_methods) {}
+
+  bool is_empty() const {
+    return _offsets == nullptr && _bootstrap_methods == nullptr;
+  }
+
+  Array<u4>*& offsets() { return _offsets; }
+  const Array<u4>* const& offsets() const { return _offsets; }
+  Array<u2>*& bootstrap_methods() { return _bootstrap_methods; }
+  const Array<u2>* const& bootstrap_methods() const { return _bootstrap_methods; }
+
+  BSMAttributeEntry* entry(int bsms_attribute_index) {
+    return reinterpret_cast<BSMAttributeEntry*>(_bootstrap_methods->adr_at(_offsets->at(bsms_attribute_index)));
+  }
+  const BSMAttributeEntry* entry(int bsms_attribute_index) const {
+    return reinterpret_cast<BSMAttributeEntry*>(_bootstrap_methods->adr_at(_offsets->at(bsms_attribute_index)));
+  }
+
+  int number_of_entries() const {
+    return _offsets == nullptr ? 0 : _offsets->length();
+  }
+
+  // The number of U2s the BSM data consists of.
+  int array_length() const {
+    return _bootstrap_methods == nullptr ? 0 :  _bootstrap_methods->length();
+  }
+
+  void deallocate_contents(ClassLoaderData* loader_data);
+
+  // Extend to have the space for both this BSMAEntries and other's.
+  // Does not copy in the other's BSMAEntrys, that must be done via the InsertionIterator.
+  // This starts an insertion iterator. Any call to start_extension must have a matching end_extension call.
+  InsertionIterator start_extension(const BSMAttributeEntries& other, ClassLoaderData* loader_data, TRAPS);
+  // Extend the BSMAEntries with an additional number_of_entries with a total data_size.
+  InsertionIterator start_extension(int number_of_entries, int data_size, ClassLoaderData* loader_data, TRAPS);
+  // Reallocates the underlying memory to fit the limits of the InsertionIterator precisely.
+  // This ends an insertion iteration. The memory is truncated to fit exactly the data used.
+  void end_extension(InsertionIterator& iter, ClassLoaderData* loader_data, TRAPS);
+  // Append all of the BSMAEs in other into this.
+  void append(const BSMAttributeEntries& other, ClassLoaderData* loader_data, TRAPS);
+};
+
+#endif // SHARE_OOPS_BSMATTRIBUTE_HPP
diff --git a/src/hotspot/share/oops/bsmAttribute.inline.hpp b/src/hotspot/share/oops/bsmAttribute.inline.hpp
new file mode 100644
index 00000000000..e678c280c26
--- /dev/null
+++ b/src/hotspot/share/oops/bsmAttribute.inline.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_OOPS_BSMATTRIBUTE_INLINE_HPP
+#define SHARE_OOPS_BSMATTRIBUTE_INLINE_HPP
+
+#include "oops/bsmAttribute.hpp"
+
+inline BSMAttributeEntry* BSMAttributeEntries::InsertionIterator::reserve_new_entry(u2 bsmi, u2 argc) {
+  assert(_insert_into->offsets() != nullptr, "must");
+  assert(_insert_into->bootstrap_methods() != nullptr, "must");
+
+  if (_cur_offset + 1 > _insert_into->offsets()->length() ||
+      _cur_array + BSMAttributeEntry::u2s_required(argc) > _insert_into->bootstrap_methods()->length()) {
+    return nullptr;
+  }
+  _insert_into->offsets()->at_put(_cur_offset, _cur_array);
+  BSMAttributeEntry* e = _insert_into->entry(_cur_offset);
+  e->_bootstrap_method_index = bsmi;
+  e->_argument_count = argc;
+
+  _cur_array += 1 + 1 + argc;
+  _cur_offset += 1;
+  return e;
+}
+
+inline void BSMAttributeEntry::copy_args_into(BSMAttributeEntry* entry) const {
+  assert(entry->argument_count() == this->argument_count(), "must be same");
+  for (int i = 0; i < argument_count(); i++) {
+    entry->set_argument(i, this->argument(i));
+  }
+}
+
+#endif // SHARE_OOPS_BSMATTRIBUTE_INLINE_HPP
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 95a43b07bd7..640b2f2460f 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -131,8 +131,7 @@ void ConstantPool::deallocate_contents(ClassLoaderData* loader_data) {
   MetadataFactory::free_array<Klass*>(loader_data, resolved_klasses());
   set_resolved_klasses(nullptr);
 
-  MetadataFactory::free_array<jushort>(loader_data, operands());
-  set_operands(nullptr);
+  bsm_entries().deallocate_contents(loader_data);
 
   release_C_heap_structures();
 
@@ -152,7 +151,8 @@ void ConstantPool::metaspace_pointers_do(MetaspaceClosure* it) {
   it->push(&_tags, MetaspaceClosure::_writable);
   it->push(&_cache);
   it->push(&_pool_holder);
-  it->push(&_operands);
+  it->push(&bsm_entries().offsets());
+  it->push(&bsm_entries().bootstrap_methods());
   it->push(&_resolved_klasses, MetaspaceClosure::_writable);
 
   for (int i = 0; i < length(); i++) {
@@ -761,7 +761,7 @@ Method* ConstantPool::method_at_if_loaded(const constantPoolHandle& cpool,
   if (cpool->cache() == nullptr)  return nullptr;  // nothing to load yet
   if (!(which >= 0 && which < cpool->resolved_method_entries_length())) {
     // FIXME: should be an assert
-    log_debug(class, resolve)("bad operand %d in:", which); cpool->print();
+    log_debug(class, resolve)("bad BSM %d in:", which); cpool->print();
     return nullptr;
   }
   return cpool->cache()->method_if_resolved(which);
@@ -1562,8 +1562,8 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
     int i1 = bootstrap_methods_attribute_index(index1);
     int i2 = cp2->bootstrap_methods_attribute_index(index2);
     bool match_entry = compare_entry_to(k1, cp2, k2);
-    bool match_operand = compare_operand_to(i1, cp2, i2);
-    return (match_entry && match_operand);
+    bool match_bsm = compare_bootstrap_entry_to(i1, cp2, i2);
+    return (match_entry && match_bsm);
   } break;
 
   case JVM_CONSTANT_InvokeDynamic:
@@ -1573,8 +1573,8 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
     int i1 = bootstrap_methods_attribute_index(index1);
     int i2 = cp2->bootstrap_methods_attribute_index(index2);
     bool match_entry = compare_entry_to(k1, cp2, k2);
-    bool match_operand = compare_operand_to(i1, cp2, i2);
-    return (match_entry && match_operand);
+    bool match_bsm = compare_bootstrap_entry_to(i1, cp2, i2);
+    return (match_entry && match_bsm);
   } break;
 
   case JVM_CONSTANT_String:
@@ -1608,140 +1608,29 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
   return false;
 } // end compare_entry_to()
 
-
-// Resize the operands array with delta_len and delta_size.
+// Extend the BSMAttributeEntries with the length and size of the ext_cp BSMAttributeEntries.
 // Used in RedefineClasses for CP merge.
-void ConstantPool::resize_operands(int delta_len, int delta_size, TRAPS) {
-  int old_len  = operand_array_length(operands());
-  int new_len  = old_len + delta_len;
-  int min_len  = (delta_len > 0) ? old_len : new_len;
-
-  int old_size = operands()->length();
-  int new_size = old_size + delta_size;
-  int min_size = (delta_size > 0) ? old_size : new_size;
-
-  ClassLoaderData* loader_data = pool_holder()->class_loader_data();
-  Array<u2>* new_ops = MetadataFactory::new_array<u2>(loader_data, new_size, CHECK);
-
-  // Set index in the resized array for existing elements only
-  for (int idx = 0; idx < min_len; idx++) {
-    int offset = operand_offset_at(idx);                       // offset in original array
-    operand_offset_at_put(new_ops, idx, offset + 2*delta_len); // offset in resized array
-  }
-  // Copy the bootstrap specifiers only
-  Copy::conjoint_memory_atomic(operands()->adr_at(2*old_len),
-                               new_ops->adr_at(2*new_len),
-                               (min_size - 2*min_len) * sizeof(u2));
-  // Explicitly deallocate old operands array.
-  // Note, it is not needed for 7u backport.
-  if ( operands() != nullptr) { // the safety check
-    MetadataFactory::free_array<u2>(loader_data, operands());
-  }
-  set_operands(new_ops);
-} // end resize_operands()
+BSMAttributeEntries::InsertionIterator
+ConstantPool::start_extension(const constantPoolHandle& ext_cp, TRAPS) {
+  BSMAttributeEntries::InsertionIterator iter =
+    bsm_entries().start_extension(ext_cp->bsm_entries(), pool_holder()->class_loader_data(),
+                                  CHECK_(BSMAttributeEntries::InsertionIterator()));
+  return iter;
+}
 
 
-// Extend the operands array with the length and size of the ext_cp operands.
-// Used in RedefineClasses for CP merge.
-void ConstantPool::extend_operands(const constantPoolHandle& ext_cp, TRAPS) {
-  int delta_len = operand_array_length(ext_cp->operands());
-  if (delta_len == 0) {
-    return; // nothing to do
-  }
-  int delta_size = ext_cp->operands()->length();
-
-  assert(delta_len  > 0 && delta_size > 0, "extended operands array must be bigger");
-
-  if (operand_array_length(operands()) == 0) {
-    ClassLoaderData* loader_data = pool_holder()->class_loader_data();
-    Array<u2>* new_ops = MetadataFactory::new_array<u2>(loader_data, delta_size, CHECK);
-    // The first element index defines the offset of second part
-    operand_offset_at_put(new_ops, 0, 2*delta_len); // offset in new array
-    set_operands(new_ops);
-  } else {
-    resize_operands(delta_len, delta_size, CHECK);
-  }
-
-} // end extend_operands()
+void ConstantPool::end_extension(BSMAttributeEntries::InsertionIterator iter, TRAPS) {
+  bsm_entries().end_extension(iter, pool_holder()->class_loader_data(), THREAD);
+}
 
 
-// Shrink the operands array to a smaller array with new_len length.
-// Used in RedefineClasses for CP merge.
-void ConstantPool::shrink_operands(int new_len, TRAPS) {
-  int old_len = operand_array_length(operands());
-  if (new_len == old_len) {
-    return; // nothing to do
-  }
-  assert(new_len < old_len, "shrunken operands array must be smaller");
-
-  int free_base  = operand_next_offset_at(new_len - 1);
-  int delta_len  = new_len - old_len;
-  int delta_size = 2*delta_len + free_base - operands()->length();
-
-  resize_operands(delta_len, delta_size, CHECK);
-
-} // end shrink_operands()
-
-
-void ConstantPool::copy_operands(const constantPoolHandle& from_cp,
-                                 const constantPoolHandle& to_cp,
-                                 TRAPS) {
-
-  int from_oplen = operand_array_length(from_cp->operands());
-  int old_oplen  = operand_array_length(to_cp->operands());
-  if (from_oplen != 0) {
-    ClassLoaderData* loader_data = to_cp->pool_holder()->class_loader_data();
-    // append my operands to the target's operands array
-    if (old_oplen == 0) {
-      // Can't just reuse from_cp's operand list because of deallocation issues
-      int len = from_cp->operands()->length();
-      Array<u2>* new_ops = MetadataFactory::new_array<u2>(loader_data, len, CHECK);
-      Copy::conjoint_memory_atomic(
-          from_cp->operands()->adr_at(0), new_ops->adr_at(0), len * sizeof(u2));
-      to_cp->set_operands(new_ops);
-    } else {
-      int old_len  = to_cp->operands()->length();
-      int from_len = from_cp->operands()->length();
-      int old_off  = old_oplen * sizeof(u2);
-      int from_off = from_oplen * sizeof(u2);
-      // Use the metaspace for the destination constant pool
-      Array<u2>* new_operands = MetadataFactory::new_array<u2>(loader_data, old_len + from_len, CHECK);
-      int fillp = 0, len = 0;
-      // first part of dest
-      Copy::conjoint_memory_atomic(to_cp->operands()->adr_at(0),
-                                   new_operands->adr_at(fillp),
-                                   (len = old_off) * sizeof(u2));
-      fillp += len;
-      // first part of src
-      Copy::conjoint_memory_atomic(from_cp->operands()->adr_at(0),
-                                   new_operands->adr_at(fillp),
-                                   (len = from_off) * sizeof(u2));
-      fillp += len;
-      // second part of dest
-      Copy::conjoint_memory_atomic(to_cp->operands()->adr_at(old_off),
-                                   new_operands->adr_at(fillp),
-                                   (len = old_len - old_off) * sizeof(u2));
-      fillp += len;
-      // second part of src
-      Copy::conjoint_memory_atomic(from_cp->operands()->adr_at(from_off),
-                                   new_operands->adr_at(fillp),
-                                   (len = from_len - from_off) * sizeof(u2));
-      fillp += len;
-      assert(fillp == new_operands->length(), "");
-
-      // Adjust indexes in the first part of the copied operands array.
-      for (int j = 0; j < from_oplen; j++) {
-        int offset = operand_offset_at(new_operands, old_oplen + j);
-        assert(offset == operand_offset_at(from_cp->operands(), j), "correct copy");
-        offset += old_len;  // every new tuple is preceded by old_len extra u2's
-        operand_offset_at_put(new_operands, old_oplen + j, offset);
-      }
-
-      // replace target operands array with combined array
-      to_cp->set_operands(new_operands);
-    }
-  }
-} // end copy_operands()
+void ConstantPool::copy_bsm_entries(const constantPoolHandle& from_cp,
+                                    const constantPoolHandle& to_cp,
+                                    TRAPS) {
+  to_cp->bsm_entries().append(from_cp->bsm_entries(),
+                              to_cp->pool_holder()->class_loader_data(),
+                              THREAD);
+}
 
 
 // Copy this constant pool's entries at start_i to end_i (inclusive)
@@ -1771,7 +1660,7 @@ void ConstantPool::copy_cp_to_impl(const constantPoolHandle& from_cp, int start_
       break;
     }
   }
-  copy_operands(from_cp, to_cp, CHECK);
+  copy_bsm_entries(from_cp, to_cp, THREAD);
 
 } // end copy_cp_to_impl()
 
@@ -1895,7 +1784,7 @@ void ConstantPool::copy_entry_to(const constantPoolHandle& from_cp, int from_i,
   {
     int k1 = from_cp->bootstrap_methods_attribute_index(from_i);
     int k2 = from_cp->bootstrap_name_and_type_ref_index_at(from_i);
-    k1 += operand_array_length(to_cp->operands());  // to_cp might already have operands
+    k1 += to_cp->bsm_entries().array_length();  // to_cp might already have a BSM attribute
     to_cp->dynamic_constant_at_put(to_i, k1, k2);
   } break;
 
@@ -1903,7 +1792,7 @@ void ConstantPool::copy_entry_to(const constantPoolHandle& from_cp, int from_i,
   {
     int k1 = from_cp->bootstrap_methods_attribute_index(from_i);
     int k2 = from_cp->bootstrap_name_and_type_ref_index_at(from_i);
-    k1 += operand_array_length(to_cp->operands());  // to_cp might already have operands
+    k1 += to_cp->bsm_entries().array_length();  // to_cp might already have a BSM attribute
     to_cp->invoke_dynamic_at_put(to_i, k1, k2);
   } break;
 
@@ -1939,9 +1828,9 @@ int ConstantPool::find_matching_entry(int pattern_i,
 
 // Compare this constant pool's bootstrap specifier at idx1 to the constant pool
 // cp2's bootstrap specifier at idx2.
-bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, int idx2) {
-  BSMAttributeEntry* e1 = bsm_attribute_entry(idx1);
-  BSMAttributeEntry* e2 = cp2->bsm_attribute_entry(idx2);
+bool ConstantPool::compare_bootstrap_entry_to(int idx1, const constantPoolHandle& cp2, int idx2) {
+  const BSMAttributeEntry* const e1 = bsm_attribute_entry(idx1);
+  const BSMAttributeEntry* const e2 = cp2->bsm_attribute_entry(idx2);
   int k1 = e1->bootstrap_method_index();
   int k2 = e2->bootstrap_method_index();
   bool match = compare_entry_to(k1, cp2, k2);
@@ -1949,34 +1838,37 @@ bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, i
   if (!match) {
     return false;
   }
-  int argc = e1->argument_count();
-  if (argc == e2->argument_count()) {
-    for (int j = 0; j < argc; j++) {
-      k1 = e1->argument_index(j);
-      k2 = e2->argument_index(j);
-      match = compare_entry_to(k1, cp2, k2);
-      if (!match) {
-        return false;
-      }
-    }
-    return true;           // got through loop; all elements equal
+
+  const int argc = e1->argument_count();
+  if (argc != e2->argument_count()) {
+    return false;
   }
-  return false;
-} // end compare_operand_to()
+
+  for (int j = 0; j < argc; j++) {
+    k1 = e1->argument(j);
+    k2 = e2->argument(j);
+    match = compare_entry_to(k1, cp2, k2);
+    if (!match) {
+      return false;
+    }
+  }
+
+  return true; // got through loop; all elements equal
+} // end compare_bootstrap_entry_to()
 
 // Search constant pool search_cp for a bootstrap specifier that matches
 // this constant pool's bootstrap specifier data at pattern_i index.
 // Return the index of a matching bootstrap attribute record or (-1) if there is no match.
-int ConstantPool::find_matching_operand(int pattern_i,
-                    const constantPoolHandle& search_cp, int search_len) {
-  for (int i = 0; i < search_len; i++) {
-    bool found = compare_operand_to(pattern_i, search_cp, i);
+int ConstantPool::find_matching_bsm_entry(int pattern_i,
+                                          const constantPoolHandle& search_cp, int offset_limit) {
+  for (int i = 0; i < offset_limit; i++) {
+    bool found = compare_bootstrap_entry_to(pattern_i, search_cp, i);
     if (found) {
       return i;
     }
   }
   return -1;  // bootstrap specifier data not found; return unused index (-1)
-} // end find_matching_operand()
+} // end find_matching_bsm_entry()
 
 
 #ifndef PRODUCT
@@ -2411,7 +2303,7 @@ void ConstantPool::print_value_on(outputStream* st) const {
   assert(is_constantPool(), "must be constantPool");
   st->print("constant pool [%d]", length());
   if (has_preresolution()) st->print("/preresolution");
-  if (operands() != nullptr)  st->print("/operands[%d]", operands()->length());
+  if (!bsm_entries().is_empty())  st->print("/BSMs[%d]", bsm_entries().bootstrap_methods()->length());
   print_address_on(st);
   if (pool_holder() != nullptr) {
     st->print(" for ");
@@ -2446,3 +2338,87 @@ void ConstantPool::verify_on(outputStream* st) {
     guarantee(pool_holder()->is_klass(),    "should be klass");
   }
 }
+
+void BSMAttributeEntries::deallocate_contents(ClassLoaderData* loader_data) {
+  MetadataFactory::free_array<u4>(loader_data, this->_offsets);
+  MetadataFactory::free_array<u2>(loader_data, this->_bootstrap_methods);
+  this->_offsets = nullptr;
+  this->_bootstrap_methods = nullptr;
+}
+
+void BSMAttributeEntries::copy_into(InsertionIterator& iter, int num_entries) const {
+  assert(num_entries + iter._cur_offset <= iter._insert_into->_offsets->length(), "must");
+  for (int i = 0; i < num_entries; i++) {
+    const BSMAttributeEntry* e = entry(i);
+    BSMAttributeEntry* e_new = iter.reserve_new_entry(e->bootstrap_method_index(), e->argument_count());
+    assert(e_new != nullptr, "must be");
+    e->copy_args_into(e_new);
+  }
+}
+
+BSMAttributeEntries::InsertionIterator
+BSMAttributeEntries::start_extension(const BSMAttributeEntries& other, ClassLoaderData* loader_data, TRAPS) {
+  InsertionIterator iter = start_extension(other.number_of_entries(), other.array_length(),
+                                           loader_data, CHECK_(BSMAttributeEntries::InsertionIterator()));
+  return iter;
+}
+
+BSMAttributeEntries::InsertionIterator
+BSMAttributeEntries::start_extension(int number_of_entries, int array_length,
+                                     ClassLoaderData* loader_data, TRAPS) {
+  InsertionIterator extension_iterator(this, this->number_of_entries(), this->array_length());
+  int new_number_of_entries = this->number_of_entries() + number_of_entries;
+  int new_array_length = this->array_length() + array_length;
+  int invalid_index = new_array_length;
+
+  Array<u4>* new_offsets =
+    MetadataFactory::new_array<u4>(loader_data, new_number_of_entries, invalid_index, CHECK_(InsertionIterator()));
+  Array<u2>* new_array = MetadataFactory::new_array<u2>(loader_data, new_array_length, CHECK_(InsertionIterator()));
+  { // Copy over all the old BSMAEntry's and their respective offsets
+    BSMAttributeEntries carrier(new_offsets, new_array);
+    InsertionIterator copy_iter(&carrier, 0, 0);
+    copy_into(copy_iter, this->number_of_entries());
+  }
+  // Replace content
+  deallocate_contents(loader_data);
+  _offsets = new_offsets;
+  _bootstrap_methods = new_array;
+  return extension_iterator;
+}
+
+
+void BSMAttributeEntries::append(const BSMAttributeEntries& other, ClassLoaderData* loader_data, TRAPS) {
+  if (other.number_of_entries() == 0) {
+    return; // Done!
+  }
+  InsertionIterator iter = start_extension(other, loader_data, CHECK);
+  other.copy_into(iter, other.number_of_entries());
+  end_extension(iter, loader_data, THREAD);
+}
+
+void BSMAttributeEntries::end_extension(InsertionIterator& iter, ClassLoaderData* loader_data, TRAPS) {
+  assert(iter._insert_into == this, "must be");
+  assert(iter._cur_offset <= this->_offsets->length(), "must be");
+  assert(iter._cur_array <= this->_bootstrap_methods->length(), "must be");
+
+  // Did we fill up all of the available space? If so, do nothing.
+  if (iter._cur_offset == this->_offsets->length() &&
+      iter._cur_array == this->_bootstrap_methods->length()) {
+    return;
+  }
+
+  // We used less, truncate by allocating new arrays
+  Array<u4>* new_offsets =
+      MetadataFactory::new_array<u4>(loader_data, iter._cur_offset, 0, CHECK);
+  Array<u2>* new_array =
+    MetadataFactory::new_array<u2>(loader_data, iter._cur_array, CHECK);
+  { // Copy over the constructed BSMAEntry's
+    BSMAttributeEntries carrier(new_offsets, new_array);
+    InsertionIterator copy_iter(&carrier, 0, 0);
+    copy_into(copy_iter, iter._cur_offset);
+  }
+
+  deallocate_contents(loader_data);
+  _offsets = new_offsets;
+  _bootstrap_methods = new_array;
+}
diff --git a/src/hotspot/share/oops/constantPool.hpp b/src/hotspot/share/oops/constantPool.hpp
index 9cbeb1245be..6c519945f4d 100644
--- a/src/hotspot/share/oops/constantPool.hpp
+++ b/src/hotspot/share/oops/constantPool.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "oops/arrayOop.hpp"
+#include "oops/bsmAttribute.inline.hpp"
 #include "oops/cpCache.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oopHandle.hpp"
@@ -77,43 +78,6 @@ public:
   }
 };
 
-class BSMAttributeEntry {
-  friend class ConstantPool;
-  u2 _bootstrap_method_index;
-  u2 _argument_count;
-
-  // The argument indexes are stored right after the object, in a contiguous array.
-  // [ bsmi_0 argc_0 arg_00 arg_01 ... arg_0N bsmi_1 argc_1 arg_10 ... arg_1N ... ]
-  // So in order to find the argument array, jump over ourselves.
-  const u2* argument_indexes() const {
-    return reinterpret_cast<const u2*>(this + 1);
-  }
-  u2* argument_indexes() {
-    return reinterpret_cast<u2*>(this + 1);
-  }
-  // These are overlays on top of the operands array. Do not construct.
-  BSMAttributeEntry() = delete;
-
-public:
-  // Offsets for SA
-  enum {
-    _bsmi_offset = 0,
-    _argc_offset = 1,
-    _argv_offset = 2
-  };
-
-  int bootstrap_method_index() const {
-    return _bootstrap_method_index;
-  }
-  int argument_count() const {
-    return _argument_count;
-  }
-  int argument_index(int n) const {
-    assert(checked_cast<u2>(n) < _argument_count, "oob");
-    return argument_indexes()[n];
-  }
-};
-
 class ConstantPool : public Metadata {
   friend class VMStructs;
   friend class JVMCIVMStructs;
@@ -126,7 +90,8 @@ class ConstantPool : public Metadata {
   Array<u1>*           _tags;        // the tag array describing the constant pool's contents
   ConstantPoolCache*   _cache;       // the cache holding interpreter runtime information
   InstanceKlass*       _pool_holder; // the corresponding class
-  Array<u2>*           _operands;    // for variable-sized (InvokeDynamic) nodes, usually empty
+
+  BSMAttributeEntries _bsm_entries;
 
   // Consider using an array of compressed klass pointers to
   // save space on 64-bit platforms.
@@ -167,8 +132,6 @@ class ConstantPool : public Metadata {
 
   u1* tag_addr_at(int cp_index) const            { return tags()->adr_at(cp_index); }
 
-  void set_operands(Array<u2>* operands)       { _operands = operands; }
-
   u2 flags() const                             { return _flags; }
   void set_flags(u2 f)                         { _flags = f; }
 
@@ -208,7 +171,13 @@ class ConstantPool : public Metadata {
   virtual bool is_constantPool() const      { return true; }
 
   Array<u1>* tags() const                   { return _tags; }
-  Array<u2>* operands() const               { return _operands; }
+
+  BSMAttributeEntries& bsm_entries() {
+    return _bsm_entries;
+  }
+  const BSMAttributeEntries& bsm_entries() const {
+    return _bsm_entries;
+  }
 
   bool has_preresolution() const            { return (_flags & _has_preresolution) != 0; }
   void set_has_preresolution() {
@@ -556,76 +525,21 @@ class ConstantPool : public Metadata {
     assert(tag_at(cp_index).has_bootstrap(), "Corrupted constant pool");
     return extract_low_short_from_int(*int_at_addr(cp_index));
   }
-  // The first part of the operands array consists of an index into the second part.
-  // Extract a 32-bit index value from the first part.
-  static int operand_offset_at(Array<u2>* operands, int bsms_attribute_index) {
-    int n = (bsms_attribute_index * 2);
-    assert(n >= 0 && n+2 <= operands->length(), "oob");
-    // The first 32-bit index points to the beginning of the second part
-    // of the operands array.  Make sure this index is in the first part.
-    DEBUG_ONLY(int second_part = build_int_from_shorts(operands->at(0),
-                                                       operands->at(1)));
-    assert(second_part == 0 || n+2 <= second_part, "oob (2)");
-    int offset = build_int_from_shorts(operands->at(n+0),
-                                       operands->at(n+1));
-    // The offset itself must point into the second part of the array.
-    assert(offset == 0 || (offset >= second_part && offset <= operands->length()), "oob (3)");
-    return offset;
-  }
-  static void operand_offset_at_put(Array<u2>* operands, int bsms_attribute_index, int offset) {
-    int n = bsms_attribute_index * 2;
-    assert(n >= 0 && n+2 <= operands->length(), "oob");
-    operands->at_put(n+0, extract_low_short_from_int(offset));
-    operands->at_put(n+1, extract_high_short_from_int(offset));
-  }
-  static int operand_array_length(Array<u2>* operands) {
-    if (operands == nullptr || operands->length() == 0)  return 0;
-    int second_part = operand_offset_at(operands, 0);
-    return (second_part / 2);
-  }
-
-#ifdef ASSERT
-  // operand tuples fit together exactly, end to end
-  static int operand_limit_at(Array<u2>* operands, int bsms_attribute_index) {
-    int nextidx = bsms_attribute_index + 1;
-    if (nextidx == operand_array_length(operands))
-      return operands->length();
-    else
-      return operand_offset_at(operands, nextidx);
-  }
-#endif //ASSERT
-
-  // These functions are used in RedefineClasses for CP merge
-  int operand_offset_at(int bsms_attribute_index) {
-    assert(0 <= bsms_attribute_index &&
-           bsms_attribute_index < operand_array_length(operands()),
-           "Corrupted CP operands");
-    return operand_offset_at(operands(), bsms_attribute_index);
-  }
 
   BSMAttributeEntry* bsm_attribute_entry(int bsms_attribute_index) {
-    int offset = operand_offset_at(bsms_attribute_index);
-    return reinterpret_cast<BSMAttributeEntry*>(operands()->adr_at(offset));
+    return _bsm_entries.entry(bsms_attribute_index);
   }
 
-  int operand_next_offset_at(int bsms_attribute_index) {
-    BSMAttributeEntry* bsme = bsm_attribute_entry(bsms_attribute_index);
-    u2* argv_start = bsme->argument_indexes();
-    int offset = argv_start - operands()->data();
-    return offset + bsme->argument_count();
-  }
-  // Compare a bootstrap specifier data in the operands arrays
-  bool compare_operand_to(int bsms_attribute_index1, const constantPoolHandle& cp2,
-                          int bsms_attribute_index2);
-  // Find a bootstrap specifier data in the operands array
-  int find_matching_operand(int bsms_attribute_index, const constantPoolHandle& search_cp,
-                            int operands_cur_len);
-  // Resize the operands array with delta_len and delta_size
-  void resize_operands(int delta_len, int delta_size, TRAPS);
-  // Extend the operands array with the length and size of the ext_cp operands
-  void extend_operands(const constantPoolHandle& ext_cp, TRAPS);
-  // Shrink the operands array to a smaller array with new_len length
-  void shrink_operands(int new_len, TRAPS);
+  bool compare_bootstrap_entry_to(int bsms_attribute_index1, const constantPoolHandle& cp2,
+                                  int bsms_attribute_index2);
+  // Find a BSM entry in search_cp that matches the BSM at bsm_attribute_index.
+  // Return -1 if not found.
+  int find_matching_bsm_entry(int bsms_attribute_index, const constantPoolHandle& search_cp,
+                              int offset_limit);
+  // Extend the BSM attribute storage to fit both the current data and the BSM data in ext_cp.
+  // Use the returned InsertionIterator to fill out the newly allocated space.
+  BSMAttributeEntries::InsertionIterator start_extension(const constantPoolHandle& ext_cp, TRAPS);
+  void end_extension(BSMAttributeEntries::InsertionIterator iter, TRAPS);
 
   u2 bootstrap_method_ref_index_at(int cp_index) {
     assert(tag_at(cp_index).has_bootstrap(), "Corrupted constant pool");
@@ -641,7 +555,7 @@ class ConstantPool : public Metadata {
     int bsmai = bootstrap_methods_attribute_index(cp_index);
     BSMAttributeEntry* bsme = bsm_attribute_entry(bsmai);
     assert((uint)j < (uint)bsme->argument_count(), "oob");
-    return bsm_attribute_entry(bsmai)->argument_index(j);
+    return bsm_attribute_entry(bsmai)->argument(j);
   }
 
   // The following methods (name/signature/klass_ref_at, klass_ref_at_noresolve,
@@ -848,7 +762,7 @@ private:
   }
   static void copy_cp_to_impl(const constantPoolHandle& from_cp, int start_cpi, int end_cpi, const constantPoolHandle& to_cp, int to_cpi, TRAPS);
   static void copy_entry_to(const constantPoolHandle& from_cp, int from_cpi, const constantPoolHandle& to_cp, int to_cpi);
-  static void copy_operands(const constantPoolHandle& from_cp, const constantPoolHandle& to_cp, TRAPS);
+  static void copy_bsm_entries(const constantPoolHandle& from_cp, const constantPoolHandle& to_cp, TRAPS);
   int  find_matching_entry(int pattern_i, const constantPoolHandle& search_cp);
   int  version() const                    { return _saved._version; }
   void set_version(int version)           { _saved._version = version; }
diff --git a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
index a441d405f8d..5077a1743b9 100644
--- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
+++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
@@ -25,6 +25,7 @@
 #include "classfile/symbolTable.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "memory/universe.hpp"
+#include "oops/bsmAttribute.inline.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/fieldStreams.inline.hpp"
 #include "oops/instanceKlass.inline.hpp"
@@ -389,20 +390,13 @@ void JvmtiClassFileReconstituter::write_annotations_attribute(const char* attr_n
 //    } bootstrap_methods[num_bootstrap_methods];
 //  }
 void JvmtiClassFileReconstituter::write_bootstrapmethod_attribute() {
-  Array<u2>* operands = cpool()->operands();
   write_attribute_name_index("BootstrapMethods");
-  int num_bootstrap_methods = ConstantPool::operand_array_length(operands);
-
-  // calculate length of attribute
-  u4 length = sizeof(u2); // num_bootstrap_methods
-  for (int n = 0; n < num_bootstrap_methods; n++) {
-    u2 num_bootstrap_arguments = cpool()->bsm_attribute_entry(n)->argument_count();
-    length += sizeof(u2); // bootstrap_method_ref
-    length += sizeof(u2); // num_bootstrap_arguments
-    length += (u4)sizeof(u2) * num_bootstrap_arguments; // bootstrap_arguments[num_bootstrap_arguments]
-  }
+  u4 length = sizeof(u2) + // Size of num_bootstrap_methods
+              // The rest of the data for the attribute is exactly the u2s in the data array.
+              sizeof(u2) * cpool()->bsm_entries().array_length();
   write_u4(length);
 
+  int num_bootstrap_methods = cpool()->bsm_entries().number_of_entries();
   // write attribute
   write_u2(checked_cast<u2>(num_bootstrap_methods));
   for (int n = 0; n < num_bootstrap_methods; n++) {
@@ -411,7 +405,7 @@ void JvmtiClassFileReconstituter::write_bootstrapmethod_attribute() {
     write_u2(bsme->bootstrap_method_index());
     write_u2(num_bootstrap_arguments);
     for (int arg = 0; arg < num_bootstrap_arguments; arg++) {
-      u2 bootstrap_argument = bsme->argument_index(arg);
+      u2 bootstrap_argument = bsme->argument(arg);
       write_u2(bootstrap_argument);
     }
   }
@@ -798,7 +792,7 @@ void JvmtiClassFileReconstituter::write_class_attributes() {
   if (type_anno != nullptr) {
     ++attr_count;     // has RuntimeVisibleTypeAnnotations attribute
   }
-  if (cpool()->operands() != nullptr) {
+  if (!cpool()->bsm_entries().is_empty()) {
     ++attr_count;
   }
   if (ik()->nest_host_index() != 0) {
@@ -843,7 +837,7 @@ void JvmtiClassFileReconstituter::write_class_attributes() {
   if (ik()->record_components() != nullptr) {
     write_record_attribute();
   }
-  if (cpool()->operands() != nullptr) {
+  if (!cpool()->bsm_entries().is_empty()) {
     write_bootstrapmethod_attribute();
   }
   if (inner_classes_length > 0) {
diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index ef8875d582e..13b239b4df0 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -45,7 +45,8 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/annotations.hpp"
-#include "oops/constantPool.hpp"
+#include "oops/bsmAttribute.inline.hpp"
+#include "oops/constantPool.inline.hpp"
 #include "oops/fieldStreams.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/klassVtable.hpp"
@@ -573,9 +574,9 @@ void VM_RedefineClasses::append_entry(const constantPoolHandle& scratch_cp,
     case JVM_CONSTANT_Dynamic:  // fall through
     case JVM_CONSTANT_InvokeDynamic:
     {
-      // Index of the bootstrap specifier in the operands array
+      // Index of the bootstrap specifier in the BSM array
       int old_bs_i = scratch_cp->bootstrap_methods_attribute_index(scratch_i);
-      int new_bs_i = find_or_append_operand(scratch_cp, old_bs_i, merge_cp_p,
+      int new_bs_i = find_or_append_bsm_entry(scratch_cp, old_bs_i, merge_cp_p,
                                             merge_cp_length_p);
       // The bootstrap method NameAndType_info index
       int old_ref_i = scratch_cp->bootstrap_name_and_type_ref_index_at(scratch_i);
@@ -591,10 +592,11 @@ void VM_RedefineClasses::append_entry(const constantPoolHandle& scratch_cp,
           ("Dynamic entry@%d name_and_type_index change: %d to %d", *merge_cp_length_p, old_ref_i, new_ref_i);
       }
 
-      if (scratch_cp->tag_at(scratch_i).is_dynamic_constant())
+      if (scratch_cp->tag_at(scratch_i).is_dynamic_constant()) {
         (*merge_cp_p)->dynamic_constant_at_put(*merge_cp_length_p, new_bs_i, new_ref_i);
-      else
+      } else {
         (*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, new_bs_i, new_ref_i);
+      }
       if (scratch_i != *merge_cp_length_p) {
         // The new entry in *merge_cp_p is at a different index than
         // the new entry in scratch_cp so we need to map the index values.
@@ -660,10 +662,10 @@ u2 VM_RedefineClasses::find_or_append_indirect_entry(const constantPoolHandle& s
 } // end find_or_append_indirect_entry()
 
 
-// Append a bootstrap specifier into the merge_cp operands that is semantically equal
-// to the scratch_cp operands bootstrap specifier passed by the old_bs_i index.
+// Append a bootstrap specifier into the merge_cp BSM entries that is semantically equal
+// to the scratch_cp BSM entries' bootstrap specifier passed by the old_bs_i index.
 // Recursively append new merge_cp entries referenced by the new bootstrap specifier.
-void VM_RedefineClasses::append_operand(const constantPoolHandle& scratch_cp, const int old_bs_i,
+int VM_RedefineClasses::append_bsm_entry(const constantPoolHandle& scratch_cp, const int old_bs_i,
        constantPoolHandle *merge_cp_p, int *merge_cp_length_p) {
 
   BSMAttributeEntry* old_bsme = scratch_cp->bsm_attribute_entry(old_bs_i);
@@ -672,90 +674,82 @@ void VM_RedefineClasses::append_operand(const constantPoolHandle& scratch_cp, co
                                                merge_cp_length_p);
   if (new_ref_i != old_ref_i) {
     log_trace(redefine, class, constantpool)
-      ("operands entry@%d bootstrap method ref_index change: %d to %d", _operands_cur_length, old_ref_i, new_ref_i);
+      ("BSM attribute entry@%d bootstrap method ref_index change: %d to %d", _bsmae_iter.current_offset() - 1, old_ref_i, new_ref_i);
   }
 
-  Array<u2>* merge_ops = (*merge_cp_p)->operands();
-  int new_bs_i = _operands_cur_length;
-  // We have _operands_cur_length == 0 when the merge_cp operands is empty yet.
-  // However, the operand_offset_at(0) was set in the extend_operands() call.
-  int new_base = (new_bs_i == 0) ? (*merge_cp_p)->operand_offset_at(0)
-                                 : (*merge_cp_p)->operand_next_offset_at(new_bs_i - 1);
-  u2 argc      = old_bsme->argument_count();
-
-  ConstantPool::operand_offset_at_put(merge_ops, _operands_cur_length, new_base);
-  merge_ops->at_put(new_base++, new_ref_i);
-  merge_ops->at_put(new_base++, argc);
-
-  for (int i = 0; i < argc; i++) {
-    u2 old_arg_ref_i = old_bsme->argument_index(i);
+  const int new_bs_i = _bsmae_iter.current_offset();
+  BSMAttributeEntry* new_bsme =
+    _bsmae_iter.reserve_new_entry(new_ref_i, old_bsme->argument_count());
+  assert(new_bsme != nullptr, "must be");
+  for (int i = 0; i < new_bsme->argument_count(); i++) {
+    u2 old_arg_ref_i = old_bsme->argument(i);
     u2 new_arg_ref_i = find_or_append_indirect_entry(scratch_cp, old_arg_ref_i, merge_cp_p,
                                                      merge_cp_length_p);
-    merge_ops->at_put(new_base++, new_arg_ref_i);
+    new_bsme->set_argument(i, new_arg_ref_i);
+
     if (new_arg_ref_i != old_arg_ref_i) {
       log_trace(redefine, class, constantpool)
-        ("operands entry@%d bootstrap method argument ref_index change: %d to %d",
-         _operands_cur_length, old_arg_ref_i, new_arg_ref_i);
+        ("BSM attribute entry@%d bootstrap method argument ref_index change: %d to %d",
+         _bsmae_iter.current_offset() - 1, old_arg_ref_i, new_arg_ref_i);
     }
   }
-  if (old_bs_i != _operands_cur_length) {
-    // The bootstrap specifier in *merge_cp_p is at a different index than
-    // that in scratch_cp so we need to map the index values.
-    map_operand_index(old_bs_i, new_bs_i);
-  }
-  _operands_cur_length++;
-} // end append_operand()
+  // This is only for the logging
+  map_bsm_index(old_bs_i, new_bs_i);
+  return new_bs_i;
+} // end append_bsm_entry()
 
 
-int VM_RedefineClasses::find_or_append_operand(const constantPoolHandle& scratch_cp,
+int VM_RedefineClasses::find_or_append_bsm_entry(const constantPoolHandle& scratch_cp,
       int old_bs_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p) {
 
+  const int max_offset_in_merge = _bsmae_iter.current_offset();
   int new_bs_i = old_bs_i; // bootstrap specifier index
-  bool match = (old_bs_i < _operands_cur_length) &&
-               scratch_cp->compare_operand_to(old_bs_i, *merge_cp_p, old_bs_i);
+  // Has the old_bs_i index been used already? Check if it's the same so we know
+  // whether or not a remapping is required.
+  bool match = (old_bs_i < max_offset_in_merge) &&
+               scratch_cp->compare_bootstrap_entry_to(old_bs_i, *merge_cp_p, old_bs_i);
 
   if (!match) {
     // forward reference in *merge_cp_p or not a direct match
-    int found_i = scratch_cp->find_matching_operand(old_bs_i, *merge_cp_p,
-                                                    _operands_cur_length);
+    int found_i = scratch_cp->find_matching_bsm_entry(old_bs_i, *merge_cp_p,
+                                                      max_offset_in_merge);
     if (found_i != -1) {
-      guarantee(found_i != old_bs_i, "compare_operand_to() and find_matching_operand() disagree");
-      // found a matching operand somewhere else in *merge_cp_p so just need a mapping
+      guarantee(found_i != old_bs_i, "compare_bootstrap_entry_to() and find_matching_bsm_entry() disagree");
+      // found a matching BSM entry somewhere else in *merge_cp_p so just need a mapping
       new_bs_i = found_i;
-      map_operand_index(old_bs_i, found_i);
+      map_bsm_index(old_bs_i, found_i);
     } else {
       // no match found so we have to append this bootstrap specifier to *merge_cp_p
-      append_operand(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p);
-      new_bs_i = _operands_cur_length - 1;
+      new_bs_i = append_bsm_entry(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p);
     }
   }
   return new_bs_i;
-} // end find_or_append_operand()
+} // end find_or_append_bsm_entry()
 
 
-void VM_RedefineClasses::finalize_operands_merge(const constantPoolHandle& merge_cp, TRAPS) {
-  if (merge_cp->operands() == nullptr) {
+void VM_RedefineClasses::finalize_bsm_entries_merge(const constantPoolHandle& merge_cp, TRAPS) {
+  if (merge_cp->bsm_entries().number_of_entries() == 0) {
     return;
   }
-  // Shrink the merge_cp operands
-  merge_cp->shrink_operands(_operands_cur_length, CHECK);
+  // Finished extending the BSMAEs
+  merge_cp->end_extension(_bsmae_iter, CHECK);
 
   if (log_is_enabled(Trace, redefine, class, constantpool)) {
     // don't want to loop unless we are tracing
     int count = 0;
-    for (int i = 1; i < _operands_index_map_p->length(); i++) {
-      int value = _operands_index_map_p->at(i);
+    for (int i = 1; i < _bsm_index_map_p->length(); i++) {
+      int value = _bsm_index_map_p->at(i);
       if (value != -1) {
-        log_trace(redefine, class, constantpool)("operands_index_map[%d]: old=%d new=%d", count, i, value);
+        log_trace(redefine, class, constantpool)("bsm_index_map[%d]: old=%d new=%d", count, i, value);
         count++;
       }
     }
   }
   // Clean-up
-  _operands_index_map_p = nullptr;
-  _operands_cur_length = 0;
-  _operands_index_map_count = 0;
-} // end finalize_operands_merge()
+  _bsm_index_map_p = nullptr;
+  _bsm_index_map_count = 0;
+  _bsmae_iter = BSMAttributeEntries::InsertionIterator();
+} // end finalize_bsmentries_merge()
 
 // Symbol* comparator for qsort
 // The caller must have an active ResourceMark.
@@ -1272,26 +1266,26 @@ u2 VM_RedefineClasses::find_new_index(int old_index) {
 // Find new bootstrap specifier index value for old bootstrap specifier index
 // value by searching the index map. Returns unused index (-1) if there is
 // no mapped value for the old bootstrap specifier index.
-int VM_RedefineClasses::find_new_operand_index(int old_index) {
-  if (_operands_index_map_count == 0) {
+int VM_RedefineClasses::find_new_bsm_index(int old_index) {
+  if (_bsm_index_map_count == 0) {
     // map is empty so nothing can be found
     return -1;
   }
 
-  if (old_index == -1 || old_index >= _operands_index_map_p->length()) {
+  if (old_index == -1 || old_index >= _bsm_index_map_p->length()) {
     // The old_index is out of range so it is not mapped.
     // This should not happen in regular constant pool merging use.
     return -1;
   }
 
-  int value = _operands_index_map_p->at(old_index);
+  int value = _bsm_index_map_p->at(old_index);
   if (value == -1) {
     // the old_index is not mapped
     return -1;
   }
 
   return value;
-} // end find_new_operand_index()
+} // end find_new_bsm_index()
 
 
 // The bug 6214132 caused the verification to fail.
@@ -1560,22 +1554,15 @@ void VM_RedefineClasses::map_index(const constantPoolHandle& scratch_cp,
 
 
 // Map old_index to new_index as needed.
-void VM_RedefineClasses::map_operand_index(int old_index, int new_index) {
-  if (find_new_operand_index(old_index) != -1) {
-    // old_index is already mapped
-    return;
-  }
-
+void VM_RedefineClasses::map_bsm_index(int old_index, int new_index) {
   if (old_index == new_index) {
     // no mapping is needed
     return;
   }
-
-  _operands_index_map_p->at_put(old_index, new_index);
-  _operands_index_map_count++;
-
+  _bsm_index_map_p->at_put(old_index, new_index);
+  _bsm_index_map_count++;
   log_trace(redefine, class, constantpool)("mapped bootstrap specifier at index %d to %d", old_index, new_index);
-} // end map_index()
+} // end map_bsm_index()
 
 
 // Merge old_cp and scratch_cp and return the results of the merge via
@@ -1639,8 +1626,8 @@ bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
       }
     } // end for each old_cp entry
 
-    ConstantPool::copy_operands(old_cp, merge_cp_p, CHECK_false);
-    merge_cp_p->extend_operands(scratch_cp, CHECK_false);
+    ConstantPool::copy_bsm_entries(old_cp, merge_cp_p, CHECK_false);
+    _bsmae_iter = merge_cp_p->start_extension(scratch_cp, CHECK_false);
 
     // We don't need to sanity check that *merge_cp_length_p is within
     // *merge_cp_p bounds since we have the minimum on-entry check above.
@@ -1737,7 +1724,7 @@ bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
       ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
        merge_cp_length_p, scratch_i, _index_map_count);
   }
-  finalize_operands_merge(merge_cp_p, CHECK_false);
+  finalize_bsm_entries_merge(merge_cp_p, CHECK_false);
 
   return true;
 } // end merge_constant_pools()
@@ -1807,12 +1794,11 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
   _index_map_count = 0;
   _index_map_p = new intArray(scratch_cp->length(), scratch_cp->length(), -1);
 
-  _operands_cur_length = ConstantPool::operand_array_length(old_cp->operands());
-  _operands_index_map_count = 0;
-  int operands_index_map_len = ConstantPool::operand_array_length(scratch_cp->operands());
-  _operands_index_map_p = new intArray(operands_index_map_len, operands_index_map_len, -1);
+  _bsm_index_map_count = 0;
+  int bsm_data_len = scratch_cp->bsm_entries().array_length();
+  _bsm_index_map_p = new intArray(bsm_data_len, bsm_data_len, -1);
 
-  // reference to the cp holder is needed for copy_operands()
+  // reference to the cp holder is needed for reallocating the BSM attribute
   merge_cp->set_pool_holder(scratch_class);
   bool result = merge_constant_pools(old_cp, scratch_cp, merge_cp,
                   merge_cp_length, THREAD);
@@ -3500,7 +3486,7 @@ void VM_RedefineClasses::set_new_constant_pool(
   smaller_cp->set_version(version);
 
   // attach klass to new constant pool
-  // reference to the cp holder is needed for copy_operands()
+  // reference to the cp holder is needed for reallocating the BSM attribute
   smaller_cp->set_pool_holder(scratch_class);
 
   smaller_cp->copy_fields(scratch_cp());
diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp
index d2eda1f3eed..3f1b555b175 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp
@@ -363,11 +363,16 @@ class VM_RedefineClasses: public VM_Operation {
   int                         _index_map_count;
   intArray *                  _index_map_p;
 
-  // _operands_index_map_count is just an optimization for knowing if
-  // _operands_index_map_p contains any entries.
-  int                         _operands_cur_length;
-  int                         _operands_index_map_count;
-  intArray *                  _operands_index_map_p;
+  // _bsm_index_map_count is just an optimization for knowing if
+  // _bsm_index_map_p contains any entries.
+  int                         _bsm_index_map_count;
+  intArray *                  _bsm_index_map_p;
+
+  // After merge_constant_pools "Pass 0", the BSMAttribute entries of merge_cp_p will have been expanded to fit
+  // scratch_cp's BSMAttribute entries as well.
+  // However, the newly acquired space will not have been filled in yet.
+  // To append to this new space, the iterator is used.
+  BSMAttributeEntries::InsertionIterator _bsmae_iter;
 
   // ptr to _class_count scratch_classes
   InstanceKlass**             _scratch_classes;
@@ -429,17 +434,18 @@ class VM_RedefineClasses: public VM_Operation {
   // Support for constant pool merging (these routines are in alpha order):
   void append_entry(const constantPoolHandle& scratch_cp, int scratch_i,
     constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
-  void append_operand(const constantPoolHandle& scratch_cp, int scratch_bootstrap_spec_index,
+  // Returns the index of the appended BSM
+  int append_bsm_entry(const constantPoolHandle& scratch_cp, int scratch_bootstrap_spec_index,
     constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
-  void finalize_operands_merge(const constantPoolHandle& merge_cp, TRAPS);
+  void finalize_bsm_entries_merge(const constantPoolHandle& merge_cp, TRAPS);
   u2 find_or_append_indirect_entry(const constantPoolHandle& scratch_cp, int scratch_i,
     constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
-  int find_or_append_operand(const constantPoolHandle& scratch_cp, int scratch_bootstrap_spec_index,
+  int find_or_append_bsm_entry(const constantPoolHandle& scratch_cp, int scratch_bootstrap_spec_index,
     constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
   u2 find_new_index(int old_index);
-  int find_new_operand_index(int old_bootstrap_spec_index);
+  int find_new_bsm_index(int old_bootstrap_spec_index);
   void map_index(const constantPoolHandle& scratch_cp, int old_index, int new_index);
-  void map_operand_index(int old_bootstrap_spec_index, int new_bootstrap_spec_index);
+  void map_bsm_index(int old_bootstrap_spec_index, int new_bootstrap_spec_index);
   bool merge_constant_pools(const constantPoolHandle& old_cp,
     const constantPoolHandle& scratch_cp, constantPoolHandle& merge_cp_p,
     int& merge_cp_length_p, TRAPS);
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index e1ab063cfd6..25a99c2d758 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -54,6 +54,7 @@
 #include "oops/array.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"
+#include "oops/bsmAttribute.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/constMethod.hpp"
 #include "oops/cpCache.hpp"
@@ -166,10 +167,12 @@
   nonstatic_field(ArrayKlass,                  _dimension,                                    int)                                   \
   volatile_nonstatic_field(ArrayKlass,         _higher_dimension,                             ObjArrayKlass*)                        \
   volatile_nonstatic_field(ArrayKlass,         _lower_dimension,                              ArrayKlass*)                           \
+  nonstatic_field(BSMAttributeEntries,         _offsets,                                      Array<u4>*)                            \
+  nonstatic_field(BSMAttributeEntries,         _bootstrap_methods,                            Array<u2>*)                            \
+  nonstatic_field(ConstantPool,                _bsm_entries,                                  BSMAttributeEntries)                   \
   nonstatic_field(ConstantPool,                _tags,                                         Array<u1>*)                            \
   nonstatic_field(ConstantPool,                _cache,                                        ConstantPoolCache*)                    \
   nonstatic_field(ConstantPool,                _pool_holder,                                  InstanceKlass*)                        \
-  nonstatic_field(ConstantPool,                _operands,                                     Array<u2>*)                            \
   nonstatic_field(ConstantPool,                _resolved_klasses,                             Array<Klass*>*)                        \
   nonstatic_field(ConstantPool,                _length,                                       int)                                   \
   nonstatic_field(ConstantPool,                _minor_version,                                u2)                                    \
@@ -733,6 +736,7 @@
   unchecked_nonstatic_field(Array<int>,                _data,                                 sizeof(int))                           \
   unchecked_nonstatic_field(Array<u1>,                 _data,                                 sizeof(u1))                            \
   unchecked_nonstatic_field(Array<u2>,                 _data,                                 sizeof(u2))                            \
+  unchecked_nonstatic_field(Array<u4>,                 _data,                                 sizeof(u4))                            \
   unchecked_nonstatic_field(Array<Method*>,            _data,                                 sizeof(Method*))                       \
   unchecked_nonstatic_field(Array<Klass*>,             _data,                                 sizeof(Klass*))                        \
   unchecked_nonstatic_field(Array<ResolvedFieldEntry>, _data,                                 sizeof(ResolvedFieldEntry))            \
@@ -964,6 +968,7 @@
   declare_toplevel_type(volatile Metadata*)                               \
                                                                           \
   declare_toplevel_type(DataLayout)                                       \
+  declare_toplevel_type(BSMAttributeEntries)                              \
                                                                           \
   /********/                                                              \
   /* Oops */                                                              \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
index 563d9d3ac4a..3a4ea5546a1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
@@ -88,8 +88,11 @@ public class ConstantPool extends Metadata implements ClassConstants {
   private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
     Type type   = db.lookupType("ConstantPool");
     tags        = type.getAddressField("_tags");
-    operands    = type.getAddressField("_operands");
     cache       = type.getAddressField("_cache");
+    bsm_entries = type.getField("_bsm_entries").getOffset();
+    Type bsmae_type = db.lookupType("BSMAttributeEntries");
+    bsm_entries_offsets = bsmae_type.getAddressField("_offsets");
+    bsm_entries_bootstrap_methods = bsmae_type.getAddressField("_bootstrap_methods");
     poolHolder  = new MetadataField(type.getAddressField("_pool_holder"), 0);
     length      = new CIntField(type.getCIntegerField("_length"), 0);
     resolved_klasses = type.getAddressField("_resolved_klasses");
@@ -112,9 +115,11 @@ public class ConstantPool extends Metadata implements ClassConstants {
   public boolean isConstantPool()      { return true; }
 
   private static AddressField tags;
-  private static AddressField operands;
   private static AddressField cache;
   private static AddressField resolved_klasses;
+  private static long bsm_entries; // Offset in the constantpool where the Bsm_Entries are found
+  private static AddressField bsm_entries_offsets;
+  private static AddressField bsm_entries_bootstrap_methods;
   private static MetadataField poolHolder;
   private static CIntField length; // number of elements in oop
   private static CIntField majorVersion;
@@ -130,10 +135,6 @@ public class ConstantPool extends Metadata implements ClassConstants {
   private static int INDY_ARGV_OFFSET;
 
   public U1Array           getTags()       { return new U1Array(tags.getValue(getAddress())); }
-  public U2Array           getOperands()   {
-    Address addr = operands.getValue(getAddress());
-    return VMObjectFactory.newObject(U2Array.class, addr);
-  }
   public ConstantPoolCache getCache()      {
     Address addr = cache.getValue(getAddress());
     return VMObjectFactory.newObject(ConstantPoolCache.class, addr);
@@ -435,26 +436,23 @@ public class ConstantPool extends Metadata implements ClassConstants {
     return res;
   }
 
+  private U4Array getOffsets() {
+     Address a =  getAddress().addOffsetTo(bsm_entries);
+     if (a == null) return null;
+     a = bsm_entries_offsets.getValue(a);
+     return VMObjectFactory.newObject(U4Array.class, a);
+  }
+  private U2Array getBootstrapMethods() {
+    Address a =  getAddress().addOffsetTo(bsm_entries);
+    if (a == null) return null;
+    return VMObjectFactory.newObject(U2Array.class, bsm_entries_bootstrap_methods.getValue(a));
+  }
+
   public int getBootstrapMethodsCount() {
-    U2Array operands = getOperands();
+    U4Array offsets = getOffsets();
     int count = 0;
-    if (operands != null) {
-      // Operands array consists of two parts. First part is an array of 32-bit values which denote
-      // index of the bootstrap method data in the operands array. Note that elements of operands array are of type short.
-      // So each element of first part occupies two slots in the array.
-      // Second part is the bootstrap methods data.
-      // This layout allows us to get BSM count by getting the index of first BSM and dividing it by 2.
-      //
-      // The example below shows layout of operands array with 3 bootstrap methods.
-      // First part has 3 32-bit values indicating the index of the respective bootstrap methods in
-      // the operands array.
-      // The first BSM is at index 6. So the count in this case is 6/2=3.
-      //
-      //            <-----first part----><-------second part------->
-      // index:     0     2      4      6        i2       i3
-      // operands:  |  6  |  i2  |  i3  |  bsm1  |  bsm2  |  bsm3  |
-      //
-      count = getOperandOffsetAt(operands, 0) / 2;
+    if (offsets != null) {
+      count = offsets.length();
     }
     if (DEBUG) {
       System.err.println("ConstantPool.getBootstrapMethodsCount: count = " + count);
@@ -463,12 +461,12 @@ public class ConstantPool extends Metadata implements ClassConstants {
   }
 
   public int getBootstrapMethodArgsCount(int bsmIndex) {
-    U2Array operands = getOperands();
+    U4Array offs = getOffsets();
+    U2Array bsms = getBootstrapMethods();
     if (Assert.ASSERTS_ENABLED) {
-      Assert.that(operands != null, "Operands is not present");
+      Assert.that(offs != null && bsms != null, "BSM attribute is not present");
     }
-    int bsmOffset = getOperandOffsetAt(operands, bsmIndex);
-    int argc = operands.at(bsmOffset + INDY_ARGC_OFFSET);
+    int argc = bsms.at(offs.at(bsmIndex) + INDY_ARGC_OFFSET);
     if (DEBUG) {
       System.err.println("ConstantPool.getBootstrapMethodArgsCount: bsm index = " + bsmIndex + ", args count = " + argc);
     }
@@ -476,15 +474,16 @@ public class ConstantPool extends Metadata implements ClassConstants {
   }
 
   public short[] getBootstrapMethodAt(int bsmIndex) {
-    U2Array operands = getOperands();
-    if (operands == null)  return null;  // safety first
-    int basePos = getOperandOffsetAt(operands, bsmIndex);
+    U4Array offs = getOffsets();
+    U2Array bsms = getBootstrapMethods();
+    if (offs == null || bsms == null) return null; // safety first
+    int basePos = offs.at(bsmIndex);
     int argv = basePos + INDY_ARGV_OFFSET;
-    int argc = operands.at(basePos + INDY_ARGC_OFFSET);
+    int argc = getBootstrapMethodArgsCount(bsmIndex);
     int endPos = argv + argc;
     short[] values = new short[endPos - basePos];
     for (int j = 0; j < values.length; j++) {
-        values[j] = operands.at(basePos+j);
+      values[j] = bsms.at(basePos+j);
     }
     return values;
   }
@@ -773,8 +772,7 @@ public class ConstantPool extends Metadata implements ClassConstants {
 
   // Return the offset of the requested Bootstrap Method in the operands array
   private int getOperandOffsetAt(U2Array operands, int bsmIndex) {
-    return VM.getVM().buildIntFromShorts(operands.at(bsmIndex * 2),
-                                         operands.at(bsmIndex * 2 + 1));
+      return 0;
   }
 
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U4Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U4Array.java
new file mode 100644
index 00000000000..9836614d2c9
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/U4Array.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.utilities;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+import sun.jvm.hotspot.types.WrongTypeException;
+import sun.jvm.hotspot.utilities.Observable;
+import sun.jvm.hotspot.utilities.Observer;
+
+public class U4Array extends GenericArray {
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+      public void update(Observable o, Object data) {
+        initialize(VM.getVM().getTypeDataBase());
+      }
+    });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+    elemType = db.lookupType("u4");
+    Type type = db.lookupType("Array<u4>");
+    dataFieldOffset = type.getAddressField("_data").getOffset();
+  }
+
+  private static long dataFieldOffset;
+  protected static Type elemType;
+
+  public U4Array(Address addr) {
+    super(addr, dataFieldOffset);
+  }
+
+  public int at(int i) {
+    return (int)getIntegerAt(i);
+  }
+
+  public Type getElemType() {
+    return elemType;
+  }
+}

From 81ea1442a86795dafbf96c875fbecc65210804be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 25 Nov 2025 14:53:53 +0000
Subject: [PATCH 340/512] 8372412: Increase buffer size for ring-buffer events
 in CollectedHeap

Reviewed-by: stefank, tschatzl
---
 src/hotspot/share/gc/shared/collectedHeap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 8576781f7c8..a59ea3745ab 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -69,7 +69,7 @@ Klass* CollectedHeap::_filler_object_klass = nullptr;
 size_t CollectedHeap::_filler_array_max_size = 0;
 size_t CollectedHeap::_stack_chunk_max_size = 0;
 
-class GCLogMessage : public FormatBuffer<512> {};
+class GCLogMessage : public FormatBuffer<1024> {};
 
 template <>
 void EventLogBase<GCLogMessage>::print(outputStream* st, GCLogMessage& m) {

From c1230068dc4501c52999ac0bbb3a2e5933453f09 Mon Sep 17 00:00:00 2001
From: Ivan Sukhanov <ivan261104@gmail.com>
Date: Tue, 25 Nov 2025 18:13:48 +0000
Subject: [PATCH 341/512] 8363943: ARM32: Represent Registers as values

Reviewed-by: shade, bulasevich
---
 src/hotspot/cpu/arm/arm_32.ad                 |  32 +-
 src/hotspot/cpu/arm/assembler_arm_32.hpp      |   2 +-
 src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp      |   2 +-
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |   8 +-
 src/hotspot/cpu/arm/interp_masm_arm.cpp       |   4 +-
 src/hotspot/cpu/arm/register_arm.cpp          |  30 +-
 src/hotspot/cpu/arm/register_arm.hpp          | 547 ++++++++++--------
 src/hotspot/cpu/arm/sharedRuntime_arm.cpp     |  10 +-
 src/hotspot/cpu/arm/vmreg_arm.cpp             |   4 +-
 src/hotspot/cpu/arm/vmreg_arm.hpp             |   8 +-
 src/hotspot/cpu/arm/vmreg_arm.inline.hpp      |   8 +-
 .../linux_arm/macroAssembler_linux_arm_32.cpp |   6 +-
 12 files changed, 376 insertions(+), 285 deletions(-)

diff --git a/src/hotspot/cpu/arm/arm_32.ad b/src/hotspot/cpu/arm/arm_32.ad
index 00bf3bd61e4..9438e8da8b5 100644
--- a/src/hotspot/cpu/arm/arm_32.ad
+++ b/src/hotspot/cpu/arm/arm_32.ad
@@ -62,22 +62,22 @@ register %{
 // Integer/Long Registers
 // ----------------------------
 
-reg_def R_R0 (SOC, SOC, Op_RegI,  0,  R(0)->as_VMReg());
-reg_def R_R1 (SOC, SOC, Op_RegI,  1,  R(1)->as_VMReg());
-reg_def R_R2 (SOC, SOC, Op_RegI,  2,  R(2)->as_VMReg());
-reg_def R_R3 (SOC, SOC, Op_RegI,  3,  R(3)->as_VMReg());
-reg_def R_R4 (SOC, SOE, Op_RegI,  4,  R(4)->as_VMReg());
-reg_def R_R5 (SOC, SOE, Op_RegI,  5,  R(5)->as_VMReg());
-reg_def R_R6 (SOC, SOE, Op_RegI,  6,  R(6)->as_VMReg());
-reg_def R_R7 (SOC, SOE, Op_RegI,  7,  R(7)->as_VMReg());
-reg_def R_R8 (SOC, SOE, Op_RegI,  8,  R(8)->as_VMReg());
-reg_def R_R9 (SOC, SOE, Op_RegI,  9,  R(9)->as_VMReg());
-reg_def R_R10(NS,  SOE, Op_RegI, 10, R(10)->as_VMReg());
-reg_def R_R11(NS,  SOE, Op_RegI, 11, R(11)->as_VMReg());
-reg_def R_R12(SOC, SOC, Op_RegI, 12, R(12)->as_VMReg());
-reg_def R_R13(NS,  NS,  Op_RegI, 13, R(13)->as_VMReg());
-reg_def R_R14(SOC, SOC, Op_RegI, 14, R(14)->as_VMReg());
-reg_def R_R15(NS,  NS,  Op_RegI, 15, R(15)->as_VMReg());
+reg_def R_R0 (SOC, SOC, Op_RegI,  0,  as_Register(0)->as_VMReg());
+reg_def R_R1 (SOC, SOC, Op_RegI,  1,  as_Register(1)->as_VMReg());
+reg_def R_R2 (SOC, SOC, Op_RegI,  2,  as_Register(2)->as_VMReg());
+reg_def R_R3 (SOC, SOC, Op_RegI,  3,  as_Register(3)->as_VMReg());
+reg_def R_R4 (SOC, SOE, Op_RegI,  4,  as_Register(4)->as_VMReg());
+reg_def R_R5 (SOC, SOE, Op_RegI,  5,  as_Register(5)->as_VMReg());
+reg_def R_R6 (SOC, SOE, Op_RegI,  6,  as_Register(6)->as_VMReg());
+reg_def R_R7 (SOC, SOE, Op_RegI,  7,  as_Register(7)->as_VMReg());
+reg_def R_R8 (SOC, SOE, Op_RegI,  8,  as_Register(8)->as_VMReg());
+reg_def R_R9 (SOC, SOE, Op_RegI,  9,  as_Register(9)->as_VMReg());
+reg_def R_R10(NS,  SOE, Op_RegI, 10, as_Register(10)->as_VMReg());
+reg_def R_R11(NS,  SOE, Op_RegI, 11, as_Register(11)->as_VMReg());
+reg_def R_R12(SOC, SOC, Op_RegI, 12, as_Register(12)->as_VMReg());
+reg_def R_R13(NS,  NS,  Op_RegI, 13, as_Register(13)->as_VMReg());
+reg_def R_R14(SOC, SOC, Op_RegI, 14, as_Register(14)->as_VMReg());
+reg_def R_R15(NS,  NS,  Op_RegI, 15, as_Register(15)->as_VMReg());
 
 // ----------------------------
 // Float/Double Registers
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
index ae13644ecf9..d6524f08680 100644
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
@@ -114,7 +114,7 @@ class RegisterSet {
   }
 
   RegisterSet(Register first, Register last) {
-    assert(first < last, "encoding constraint");
+    assert(first->encoding() < last->encoding(), "encoding constraint");
     _encoding = (1 << (last->encoding() + 1)) - (1 << first->encoding());
   }
 
diff --git a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
index 8e49cfcbcaa..3ef02e44b65 100644
--- a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
@@ -181,7 +181,7 @@ void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
   const Register lock_reg = _lock_reg->as_pointer_register();
 
   ce->verify_reserved_argument_area_size(2);
-  if (obj_reg < lock_reg) {
+  if (obj_reg->encoding() < lock_reg->encoding()) {
     __ stmia(SP, RegisterSet(obj_reg) | RegisterSet(lock_reg));
   } else {
     __ str(obj_reg, Address(SP));
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index f168a34f140..b314577c2c8 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -2639,11 +2639,11 @@ void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type,
     const Register src_hi = src->as_register_hi();
     assert(addr->index()->is_illegal() && addr->disp() == 0, "The address is simple already");
 
-    if (src_lo < src_hi) {
+    if (src_lo->encoding() < src_hi->encoding()) {
       null_check_offset = __ offset();
       __ stmia(addr->base()->as_register(), RegisterSet(src_lo) | RegisterSet(src_hi));
     } else {
-      assert(src_lo < Rtemp, "Rtemp is higher than any allocatable register");
+      assert(src_lo->encoding() < Rtemp->encoding(), "Rtemp is higher than any allocatable register");
       __ mov(Rtemp, src_hi);
       null_check_offset = __ offset();
       __ stmia(addr->base()->as_register(), RegisterSet(src_lo) | RegisterSet(Rtemp));
@@ -2656,10 +2656,10 @@ void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type,
     assert(addr->index()->is_illegal() && addr->disp() == 0, "The address is simple already");
 
     null_check_offset = __ offset();
-    if (dest_lo < dest_hi) {
+    if (dest_lo->encoding() < dest_hi->encoding()) {
       __ ldmia(addr->base()->as_register(), RegisterSet(dest_lo) | RegisterSet(dest_hi));
     } else {
-      assert(dest_lo < Rtemp, "Rtemp is higher than any allocatable register");
+      assert(dest_lo->encoding() < Rtemp->encoding(), "Rtemp is higher than any allocatable register");
       __ ldmia(addr->base()->as_register(), RegisterSet(dest_lo) | RegisterSet(Rtemp));
       __ mov(dest_hi, Rtemp);
     }
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.cpp b/src/hotspot/cpu/arm/interp_masm_arm.cpp
index 720413c9c5b..23ecea24eb2 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp
@@ -409,7 +409,7 @@ void InterpreterMacroAssembler::pop_i(Register r) {
 
 void InterpreterMacroAssembler::pop_l(Register lo, Register hi) {
   assert_different_registers(lo, hi);
-  assert(lo < hi, "lo must be < hi");
+  assert(lo->encoding() < hi->encoding(), "lo must be < hi");
   pop(RegisterSet(lo) | RegisterSet(hi));
 }
 
@@ -459,7 +459,7 @@ void InterpreterMacroAssembler::push_i(Register r) {
 
 void InterpreterMacroAssembler::push_l(Register lo, Register hi) {
   assert_different_registers(lo, hi);
-  assert(lo < hi, "lo must be < hi");
+  assert(lo->encoding() < hi->encoding(), "lo must be < hi");
   push(RegisterSet(lo) | RegisterSet(hi));
 }
 
diff --git a/src/hotspot/cpu/arm/register_arm.cpp b/src/hotspot/cpu/arm/register_arm.cpp
index ea3ef87e670..296c55e2e16 100644
--- a/src/hotspot/cpu/arm/register_arm.cpp
+++ b/src/hotspot/cpu/arm/register_arm.cpp
@@ -25,12 +25,19 @@
 #include "register_arm.hpp"
 #include "utilities/debug.hpp"
 
-const int ConcreteRegisterImpl::max_gpr = ConcreteRegisterImpl::num_gpr;
-const int ConcreteRegisterImpl::max_fpr = ConcreteRegisterImpl::num_fpr +
-                                          ConcreteRegisterImpl::max_gpr;
+Register::RegisterImpl all_RegisterImpls [Register::number_of_registers + 1];
+FloatRegister::FloatRegisterImpl all_FloatRegisterImpls [FloatRegister::number_of_registers + 1];
+VFPSystemRegister::VFPSystemRegisterImpl all_VFPSystemRegisterImpls [VFPSystemRegister::number_of_registers + 1] {
+  { -1 }, //vfpsnoreg
+  { VFPSystemRegister::FPSID },
+  { VFPSystemRegister::FPSCR },
+  { VFPSystemRegister::MVFR0 },
+  { VFPSystemRegister::MVFR1 }
+};
 
-const char* RegisterImpl::name() const {
-  const char* names[number_of_registers] = {
+const char* Register::RegisterImpl::name() const {
+  static const char* names[number_of_registers + 1] = {
+    "noreg",
     "r0", "r1", "r2", "r3", "r4", "r5", "r6",
 #if (FP_REG_NUM == 7)
     "fp",
@@ -45,13 +52,14 @@ const char* RegisterImpl::name() const {
 #endif
     "r12", "sp", "lr", "pc"
   };
-  return is_valid() ? names[encoding()] : "noreg";
+  return names[encoding() + 1];
 }
 
-const char* FloatRegisterImpl::name() const {
-  const char* names[number_of_registers] = {
-     "s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
-     "s8",  "s9", "s10", "s11", "s12", "s13", "s14", "s15",
+const char* FloatRegister::FloatRegisterImpl::name() const {
+  static const char* names[number_of_registers + 1] = {
+    "fnoreg",
+    "s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
+    "s8",  "s9", "s10", "s11", "s12", "s13", "s14", "s15",
     "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23",
     "s24", "s25", "s26", "s27", "s28", "s29", "s30", "s31"
 #ifdef COMPILER2
@@ -61,5 +69,5 @@ const char* FloatRegisterImpl::name() const {
     "s56", "s57?","s58", "s59?","s60", "s61?","s62", "s63?"
 #endif
   };
-  return is_valid() ? names[encoding()] : "fnoreg";
+  return names[encoding() + 1];
 }
diff --git a/src/hotspot/cpu/arm/register_arm.hpp b/src/hotspot/cpu/arm/register_arm.hpp
index e0688af0d36..401d25a4fce 100644
--- a/src/hotspot/cpu/arm/register_arm.hpp
+++ b/src/hotspot/cpu/arm/register_arm.hpp
@@ -31,26 +31,6 @@
 class VMRegImpl;
 typedef VMRegImpl* VMReg;
 
-// These are declared ucontext.h
-#undef R0
-#undef R1
-#undef R2
-#undef R3
-#undef R4
-#undef R5
-#undef R6
-#undef R7
-#undef R8
-#undef R9
-#undef R10
-#undef R11
-#undef R12
-#undef R13
-#undef R14
-#undef R15
-
-#define R(r)   ((Register)(r))
-
 /////////////////////////////////
 // Support for different ARM ABIs
 // Note: default ABI is for linux
@@ -94,25 +74,86 @@ typedef VMRegImpl* VMReg;
 #define ALIGN_WIDE_ARGUMENTS 1
 #endif
 
-#define R0     ((Register)0)
-#define R1     ((Register)1)
-#define R2     ((Register)2)
-#define R3     ((Register)3)
-#define R4     ((Register)4)
-#define R5     ((Register)5)
-#define R6     ((Register)6)
-#define R7     ((Register)7)
-#define R8     ((Register)8)
-#define R9     ((Register)9)
-#define R10    ((Register)10)
-#define R11    ((Register)11)
-#define R12    ((Register)12)
-#define R13    ((Register)13)
-#define R14    ((Register)14)
-#define R15    ((Register)15)
+class Register {
+ private:
+  int _encoding;
+
+  constexpr explicit Register(int encoding) : _encoding(encoding) {}
+
+ public:
+  enum {
+    number_of_registers = 16,
+    max_slots_per_register = 1
+  };
+
+  class RegisterImpl : public AbstractRegisterImpl {
+    friend class Register;
+
+    static constexpr const RegisterImpl* first();
+
+   public:
+
+    // accessors and testers
+    int raw_encoding() const { return this - first(); }
+    int encoding() const     { assert(is_valid(), "invalid register"); return raw_encoding(); }
+    bool is_valid() const    { return 0 <= raw_encoding() && raw_encoding() < number_of_registers; }
+
+    inline Register successor() const;
+
+    VMReg as_VMReg() const;
+
+    const char* name() const;
+  };
 
 
-#define FP     ((Register)FP_REG_NUM)
+  inline friend constexpr Register as_Register(int encoding);
+
+  constexpr Register() : _encoding(-1) {} //noreg
+
+  int operator==(const Register r) const { return _encoding == r._encoding; }
+  int operator!=(const Register r) const { return _encoding != r._encoding; }
+
+  const RegisterImpl* operator->() const { return RegisterImpl::first() + _encoding; }
+};
+
+extern Register::RegisterImpl all_RegisterImpls[Register::number_of_registers + 1] INTERNAL_VISIBILITY;
+
+inline constexpr const Register::RegisterImpl* Register::RegisterImpl::first() {
+  return all_RegisterImpls + 1;
+}
+
+constexpr Register noreg = Register();
+
+inline constexpr Register as_Register(int encoding) {
+  if (0 <= encoding && encoding < Register::number_of_registers) {
+    return Register(encoding);
+  }
+  return noreg;
+}
+
+inline Register Register::RegisterImpl::successor() const {
+  assert(is_valid(), "sainty");
+  return as_Register(encoding() + 1);
+}
+
+constexpr Register R0  = as_Register( 0);
+constexpr Register R1  = as_Register( 1);
+constexpr Register R2  = as_Register( 2);
+constexpr Register R3  = as_Register( 3);
+constexpr Register R4  = as_Register( 4);
+constexpr Register R5  = as_Register( 5);
+constexpr Register R6  = as_Register( 6);
+constexpr Register R7  = as_Register( 7);
+constexpr Register R8  = as_Register( 8);
+constexpr Register R9  = as_Register( 9);
+constexpr Register R10 = as_Register(10);
+constexpr Register R11 = as_Register(11);
+constexpr Register R12 = as_Register(12);
+constexpr Register R13 = as_Register(13);
+constexpr Register R14 = as_Register(14);
+constexpr Register R15 = as_Register(15);
+
+constexpr Register FP = as_Register(FP_REG_NUM);
 
 // Safe use of registers which may be FP on some platforms.
 //
@@ -122,185 +163,170 @@ typedef VMRegImpl* VMReg;
 // as FP on supported ABIs (and replace R# by altFP_#_11). altFP_#_11
 // must be #define to R11 if and only if # is FP_REG_NUM.
 #if (FP_REG_NUM == 7)
-#define altFP_7_11     ((Register)11)
+constexpr Register altFP_7_11 = R11;
 #else
-#define altFP_7_11     ((Register)7)
+constexpr Register altFP_7_11 = R7;
 #endif
-#define SP     R13
-#define LR     R14
-#define PC     R15
+constexpr Register SP = R13;
+constexpr Register LR = R14;
+constexpr Register PC = R15;
 
 
 
-class RegisterImpl;
-typedef RegisterImpl* Register;
+class FloatRegister {
+ private:
+  int _encoding;
 
-inline Register as_Register(int encoding) {
-  return (Register)(intptr_t)encoding;
-}
+  constexpr explicit FloatRegister(int encoding) : _encoding(encoding) {}
 
-class RegisterImpl : public AbstractRegisterImpl {
  public:
   enum {
-    number_of_registers = 16
+    number_of_registers = NOT_COMPILER2(32) COMPILER2_PRESENT(64),
+    max_slots_per_register = 1
   };
 
-  Register successor() const      { return as_Register(encoding() + 1); }
+  class FloatRegisterImpl : public AbstractRegisterImpl {
+    friend class FloatRegister;
 
-  inline friend Register as_Register(int encoding);
+    static constexpr const FloatRegisterImpl* first();
 
-  VMReg as_VMReg();
+   public:
 
-  // accessors
-  int   encoding() const          { assert(is_valid(), "invalid register"); return value(); }
-  const char* name() const;
+    // accessors and testers
+    int raw_encoding() const { return this - first(); }
+    int encoding() const     { assert(is_valid(), "invalid register"); return raw_encoding(); }
+    bool is_valid() const    { return 0 <= raw_encoding() && raw_encoding() < number_of_registers; }
 
+    inline FloatRegister successor() const;
 
-  // testers
-  bool is_valid() const           { return 0 <= value() && value() < number_of_registers; }
+    VMReg as_VMReg() const;
 
+    int hi_bits() const {
+      return (encoding() >> 1) & 0xf;
+    }
+
+    int lo_bit() const {
+      return encoding() & 1;
+    }
+
+    int hi_bit() const {
+      return encoding() >> 5;
+    }
+
+    const char* name() const;
+  };
+
+  inline friend constexpr FloatRegister as_FloatRegister(int encoding);
+
+  constexpr FloatRegister() : _encoding(-1) {} // fnoreg
+
+  int operator==(const FloatRegister r) const { return _encoding == r._encoding; }
+  int operator!=(const FloatRegister r) const { return _encoding != r._encoding; }
+
+  const FloatRegisterImpl* operator->() const { return FloatRegisterImpl::first() + _encoding; }
 };
 
-CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
+extern FloatRegister::FloatRegisterImpl all_FloatRegisterImpls[FloatRegister::number_of_registers + 1] INTERNAL_VISIBILITY;
 
-
-// Use FloatRegister as shortcut
-class FloatRegisterImpl;
-typedef FloatRegisterImpl* FloatRegister;
-
-inline FloatRegister as_FloatRegister(int encoding) {
-  return (FloatRegister)(intptr_t)encoding;
+inline constexpr const FloatRegister::FloatRegisterImpl* FloatRegister::FloatRegisterImpl::first() {
+  return all_FloatRegisterImpls + 1;
 }
 
-class FloatRegisterImpl : public AbstractRegisterImpl {
- public:
-  enum {
-    number_of_registers = NOT_COMPILER2(32) COMPILER2_PRESENT(64)
-  };
+constexpr FloatRegister fnoreg = FloatRegister();
 
-  inline friend FloatRegister as_FloatRegister(int encoding);
-
-  VMReg as_VMReg();
-
-  int   encoding() const          { assert(is_valid(), "invalid register"); return value(); }
-  bool  is_valid() const          { return 0 <= (intx)this && (intx)this < number_of_registers; }
-  FloatRegister successor() const { return as_FloatRegister(encoding() + 1); }
-
-  const char* name() const;
-
-  int hi_bits() const {
-    return (encoding() >> 1) & 0xf;
+inline constexpr FloatRegister as_FloatRegister(int encoding) {
+  if (0 <= encoding && encoding < FloatRegister::number_of_registers) {
+    return FloatRegister(encoding);
   }
+  return fnoreg;
+}
 
-  int lo_bit() const {
-    return encoding() & 1;
-  }
-
-  int hi_bit() const {
-    return encoding() >> 5;
-  }
-};
-
-CONSTANT_REGISTER_DECLARATION(FloatRegister, fnoreg, (-1));
+inline FloatRegister FloatRegister::FloatRegisterImpl::successor() const {
+  assert(is_valid(), "sainty");
+  return as_FloatRegister(encoding() + 1);
+}
 
 
 /*
  * S1-S6 are named with "_reg" suffix to avoid conflict with
  * constants defined in sharedRuntimeTrig.cpp
  */
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S0,     ( 0));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S1_reg, ( 1));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S2_reg, ( 2));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S3_reg, ( 3));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S4_reg, ( 4));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S5_reg, ( 5));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S6_reg, ( 6));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S7,     ( 7));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S8,     ( 8));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S9,     ( 9));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S10,    (10));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S11,    (11));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S12,    (12));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S13,    (13));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S14,    (14));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S15,    (15));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S16,    (16));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S17,    (17));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S18,    (18));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S19,    (19));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S20,    (20));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S21,    (21));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S22,    (22));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S23,    (23));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S24,    (24));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S25,    (25));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S26,    (26));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S27,    (27));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S28,    (28));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S29,    (29));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S30,    (30));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, S31,    (31));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, Stemp,  (30));
+constexpr FloatRegister S0  = as_FloatRegister( 0);
+constexpr FloatRegister S1_reg = as_FloatRegister(1);
+constexpr FloatRegister S2_reg = as_FloatRegister(2);
+constexpr FloatRegister S3_reg = as_FloatRegister(3);
+constexpr FloatRegister S4_reg = as_FloatRegister(4);
+constexpr FloatRegister S5_reg = as_FloatRegister(5);
+constexpr FloatRegister S6_reg = as_FloatRegister(6);
+constexpr FloatRegister S7  = as_FloatRegister( 7);
+constexpr FloatRegister S8  = as_FloatRegister( 8);
+constexpr FloatRegister S9  = as_FloatRegister( 9);
+constexpr FloatRegister S10 = as_FloatRegister(10);
+constexpr FloatRegister S11 = as_FloatRegister(11);
+constexpr FloatRegister S12 = as_FloatRegister(12);
+constexpr FloatRegister S13 = as_FloatRegister(13);
+constexpr FloatRegister S14 = as_FloatRegister(14);
+constexpr FloatRegister S15 = as_FloatRegister(15);
+constexpr FloatRegister S16 = as_FloatRegister(16);
+constexpr FloatRegister S17 = as_FloatRegister(17);
+constexpr FloatRegister S18 = as_FloatRegister(18);
+constexpr FloatRegister S19 = as_FloatRegister(19);
+constexpr FloatRegister S20 = as_FloatRegister(20);
+constexpr FloatRegister S21 = as_FloatRegister(21);
+constexpr FloatRegister S22 = as_FloatRegister(22);
+constexpr FloatRegister S23 = as_FloatRegister(23);
+constexpr FloatRegister S24 = as_FloatRegister(24);
+constexpr FloatRegister S25 = as_FloatRegister(25);
+constexpr FloatRegister S26 = as_FloatRegister(26);
+constexpr FloatRegister S27 = as_FloatRegister(27);
+constexpr FloatRegister S28 = as_FloatRegister(28);
+constexpr FloatRegister S29 = as_FloatRegister(29);
+constexpr FloatRegister S30 = as_FloatRegister(30);
+constexpr FloatRegister S31 = as_FloatRegister(31);
+constexpr FloatRegister Stemp = S30;
 
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D0,     ( 0));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D1,     ( 2));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D2,     ( 4));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D3,     ( 6));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D4,     ( 8));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D5,     ( 10));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D6,     ( 12));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D7,     ( 14));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D8,     ( 16));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D9,     ( 18));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D10,    ( 20));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D11,    ( 22));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D12,    ( 24));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D13,    ( 26));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D14,    ( 28));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D15,    (30));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D16,    (32));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D17,    (34));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D18,    (36));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D19,    (38));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D20,    (40));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D21,    (42));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D22,    (44));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D23,    (46));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D24,    (48));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D25,    (50));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D26,    (52));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D27,    (54));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D28,    (56));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D29,    (58));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D30,    (60));
-CONSTANT_REGISTER_DECLARATION(FloatRegister, D31,    (62));
+constexpr FloatRegister D0  = as_FloatRegister( 0);
+constexpr FloatRegister D1  = as_FloatRegister( 2);
+constexpr FloatRegister D2  = as_FloatRegister( 4);
+constexpr FloatRegister D3  = as_FloatRegister( 6);
+constexpr FloatRegister D4  = as_FloatRegister( 8);
+constexpr FloatRegister D5  = as_FloatRegister(10);
+constexpr FloatRegister D6  = as_FloatRegister(12);
+constexpr FloatRegister D7  = as_FloatRegister(14);
+constexpr FloatRegister D8  = as_FloatRegister(16);
+constexpr FloatRegister D9  = as_FloatRegister(18);
+constexpr FloatRegister D10 = as_FloatRegister(20);
+constexpr FloatRegister D11 = as_FloatRegister(22);
+constexpr FloatRegister D12 = as_FloatRegister(24);
+constexpr FloatRegister D13 = as_FloatRegister(26);
+constexpr FloatRegister D14 = as_FloatRegister(28);
+constexpr FloatRegister D15 = as_FloatRegister(30);
+constexpr FloatRegister D16 = as_FloatRegister(32);
+constexpr FloatRegister D17 = as_FloatRegister(34);
+constexpr FloatRegister D18 = as_FloatRegister(36);
+constexpr FloatRegister D19 = as_FloatRegister(38);
+constexpr FloatRegister D20 = as_FloatRegister(40);
+constexpr FloatRegister D21 = as_FloatRegister(42);
+constexpr FloatRegister D22 = as_FloatRegister(44);
+constexpr FloatRegister D23 = as_FloatRegister(46);
+constexpr FloatRegister D24 = as_FloatRegister(48);
+constexpr FloatRegister D25 = as_FloatRegister(50);
+constexpr FloatRegister D26 = as_FloatRegister(52);
+constexpr FloatRegister D27 = as_FloatRegister(54);
+constexpr FloatRegister D28 = as_FloatRegister(56);
+constexpr FloatRegister D29 = as_FloatRegister(58);
+constexpr FloatRegister D30 = as_FloatRegister(60);
+constexpr FloatRegister D31 = as_FloatRegister(62);
 
 
 class ConcreteRegisterImpl : public AbstractRegisterImpl {
  public:
   enum {
-    log_vmregs_per_word = LogBytesPerWord - LogBytesPerInt, // VMRegs are of 4-byte size
-#ifdef COMPILER2
-    log_bytes_per_fpr  = 2, // quad vectors
-#else
-    log_bytes_per_fpr  = 2, // double vectors
-#endif
-    log_words_per_fpr  = log_bytes_per_fpr - LogBytesPerWord,
-    words_per_fpr      = 1 << log_words_per_fpr,
-    log_vmregs_per_fpr = log_bytes_per_fpr - LogBytesPerInt,
-    log_vmregs_per_gpr = log_vmregs_per_word,
-    vmregs_per_gpr = 1 << log_vmregs_per_gpr,
-    vmregs_per_fpr = 1 << log_vmregs_per_fpr,
+    max_gpr = Register::number_of_registers * Register::max_slots_per_register,
+    max_fpr = max_gpr + FloatRegister::number_of_registers * FloatRegister::max_slots_per_register,
 
-    num_gpr  = RegisterImpl::number_of_registers << log_vmregs_per_gpr,
-    max_gpr0 = num_gpr,
-    num_fpr  = FloatRegisterImpl::number_of_registers << log_vmregs_per_fpr,
-    max_fpr0 = max_gpr0 + num_fpr,
-    number_of_registers = num_gpr + num_fpr + 1+1 // APSR and FPSCR so that c2's REG_COUNT <= ConcreteRegisterImpl::number_of_registers
+    number_of_registers = max_fpr + 1+1 // APSR and FPSCR so that c2's REG_COUNT <= ConcreteRegisterImpl::number_of_registers
   };
-
-  static const int max_gpr;
-  static const int max_fpr;
 };
 
 typedef AbstractRegSet<Register> RegSet;
@@ -328,100 +354,156 @@ inline FloatRegister AbstractRegSet<FloatRegister>::last() {
 
 
 
-class VFPSystemRegisterImpl;
-typedef VFPSystemRegisterImpl* VFPSystemRegister;
-class VFPSystemRegisterImpl : public AbstractRegisterImpl {
+class VFPSystemRegister {
+ private:
+  int _store_idx;
+
+  constexpr explicit VFPSystemRegister(int store_idx) : _store_idx(store_idx) {}
+
+  enum {
+    _FPSID_store_idx = 0,
+    _FPSCR_store_idx = 1,
+    _MVFR0_store_idx = 2,
+    _MVFR1_store_idx = 3
+  };
+
  public:
-  int   encoding() const          { return value(); }
+  enum {
+    FPSID = 0,
+    FPSCR = 1,
+    MVFR0 = 6,
+    MVFR1 = 7,
+    number_of_registers = 4
+  };
+
+  class VFPSystemRegisterImpl : public AbstractRegisterImpl {
+    friend class VFPSystemRegister;
+
+    int _encoding;
+
+    static constexpr const VFPSystemRegisterImpl* first();
+
+   public:
+    constexpr VFPSystemRegisterImpl(int encoding) : _encoding(encoding) {}
+
+    int   encoding() const { return _encoding; }
+  };
+
+  inline friend constexpr VFPSystemRegister as_VFPSystemRegister(int encoding);
+
+  constexpr VFPSystemRegister() : _store_idx(-1) {} // vfpsnoreg
+
+  int operator==(const VFPSystemRegister r) const { return _store_idx == r._store_idx; }
+  int operator!=(const VFPSystemRegister r) const { return _store_idx != r._store_idx; }
+
+  const VFPSystemRegisterImpl* operator->() const { return VFPSystemRegisterImpl::first() + _store_idx; }
 };
 
-#define FPSID     ((VFPSystemRegister)0)
-#define FPSCR     ((VFPSystemRegister)1)
-#define MVFR0     ((VFPSystemRegister)0x6)
-#define MVFR1     ((VFPSystemRegister)0x7)
+extern VFPSystemRegister::VFPSystemRegisterImpl all_VFPSystemRegisterImpls[VFPSystemRegister::number_of_registers + 1] INTERNAL_VISIBILITY;
+
+inline constexpr const VFPSystemRegister::VFPSystemRegisterImpl* VFPSystemRegister::VFPSystemRegisterImpl::first() {
+  return all_VFPSystemRegisterImpls + 1;
+}
+
+constexpr VFPSystemRegister vfpsnoreg = VFPSystemRegister();
+
+inline constexpr VFPSystemRegister as_VFPSystemRegister(int encoding) {
+  switch (encoding) {
+    case VFPSystemRegister::FPSID: return VFPSystemRegister(VFPSystemRegister::_FPSID_store_idx);
+    case VFPSystemRegister::FPSCR: return VFPSystemRegister(VFPSystemRegister::_FPSCR_store_idx);
+    case VFPSystemRegister::MVFR0: return VFPSystemRegister(VFPSystemRegister::_MVFR0_store_idx);
+    case VFPSystemRegister::MVFR1: return VFPSystemRegister(VFPSystemRegister::_MVFR1_store_idx);
+    default: return vfpsnoreg;
+  }
+}
+
+constexpr VFPSystemRegister FPSID = as_VFPSystemRegister(VFPSystemRegister::FPSID);
+constexpr VFPSystemRegister FPSCR = as_VFPSystemRegister(VFPSystemRegister::FPSCR);
+constexpr VFPSystemRegister MVFR0 = as_VFPSystemRegister(VFPSystemRegister::MVFR0);
+constexpr VFPSystemRegister MVFR1 = as_VFPSystemRegister(VFPSystemRegister::MVFR1);
 
 /*
  * Register definitions shared across interpreter and compiler
  */
-#define Rexception_obj   R4
-#define Rexception_pc    R5
+constexpr Register Rexception_obj = R4;
+constexpr Register Rexception_pc = R5;
 
 /*
  * Interpreter register definitions common to C++ and template interpreters.
  */
-#define Rlocals          R8
-#define Rmethod          R9
-#define Rthread          R10
-#define Rtemp            R12
+constexpr Register Rlocals = R8;
+constexpr Register Rmethod = R9;
+constexpr Register Rthread = R10;
+constexpr Register Rtemp = R12;
 
 // Interpreter calling conventions
 
-#define Rparams          SP
-#define Rsender_sp       R4
+constexpr Register Rparams = SP;
+constexpr Register Rsender_sp = R4;
 
 // JSR292
 //  Note: R5_mh is needed only during the call setup, including adapters
 //  This does not seem to conflict with Rexception_pc
 //  In case of issues, R3 might be OK but adapters calling the runtime would have to save it
-#define R5_mh            R5 // MethodHandle register, used during the call setup
+constexpr Register R5_mh = R5; // MethodHandle register, used during the call setup
 
 /*
  * C++ Interpreter Register Defines
  */
-#define Rsave0   R4
-#define Rsave1   R5
-#define Rsave2   R6
-#define Rstate   altFP_7_11 // R7 or R11
-#define Ricklass R8
+constexpr Register Rsave0 = R4;
+constexpr Register Rsave1 = R5;
+constexpr Register Rsave2 = R6;
+constexpr Register Rstate = altFP_7_11; // R7 or R11
+constexpr Register Ricklass = R8;
 
 /*
  * TemplateTable Interpreter Register Usage
  */
 
 // Temporary registers
-#define R0_tmp                 R0
-#define R1_tmp                 R1
-#define R2_tmp                 R2
-#define R3_tmp                 R3
-#define R4_tmp                 R4
-#define R5_tmp                 R5
-#define R12_tmp                R12
-#define LR_tmp                 LR
+constexpr Register R0_tmp = R0;
+constexpr Register R1_tmp = R1;
+constexpr Register R2_tmp = R2;
+constexpr Register R3_tmp = R3;
+constexpr Register R4_tmp = R4;
+constexpr Register R5_tmp = R5;
+constexpr Register R12_tmp = R12;
+constexpr Register LR_tmp = LR;
 
-#define S0_tmp                 S0
-#define S1_tmp                 S1_reg
+constexpr FloatRegister S0_tmp = S0;
+constexpr FloatRegister S1_tmp = S1_reg;
 
-#define D0_tmp                 D0
-#define D1_tmp                 D1
+constexpr FloatRegister D0_tmp = D0;
+constexpr FloatRegister D1_tmp = D1;
 
 // Temporary registers saved across VM calls (according to C calling conventions)
-#define Rtmp_save0             R4
-#define Rtmp_save1             R5
+constexpr Register Rtmp_save0 = R4;
+constexpr Register Rtmp_save1 = R5;
 
 // Cached TOS value
-#define R0_tos                 R0
+constexpr Register R0_tos = R0;
 
-#define R0_tos_lo              R0
-#define R1_tos_hi              R1
+constexpr Register R0_tos_lo = R0;
+constexpr Register R1_tos_hi = R1;
 
-#define S0_tos                 S0
-#define D0_tos                 D0
+constexpr FloatRegister S0_tos = S0;
+constexpr FloatRegister D0_tos = D0;
 
 // Dispatch table
-#define RdispatchTable         R6
+constexpr Register RdispatchTable = R6;
 
 // Bytecode pointer
-#define Rbcp                   altFP_7_11
+constexpr Register Rbcp = altFP_7_11;
 
 // Pre-loaded next bytecode for the dispatch
-#define R3_bytecode            R3
+constexpr Register R3_bytecode = R3;
 
 // Conventions between bytecode templates and stubs
-#define R2_ClassCastException_obj        R2
-#define R4_ArrayIndexOutOfBounds_index   R4
+constexpr Register R2_ClassCastException_obj = R2;
+constexpr Register R4_ArrayIndexOutOfBounds_index = R4;
 
 // Interpreter expression stack top
-#define Rstack_top             SP
+constexpr Register Rstack_top = SP;
 
 /*
  * Linux 32-bit ARM C ABI Register calling conventions
@@ -444,10 +526,11 @@ class VFPSystemRegisterImpl : public AbstractRegisterImpl {
  *   R14 (LR)   Link register
  *   R15 (PC)   Program Counter
  */
-#define c_rarg0  R0
-#define c_rarg1  R1
-#define c_rarg2  R2
-#define c_rarg3  R3
+
+constexpr Register c_rarg0 = R0;
+constexpr Register c_rarg1 = R1;
+constexpr Register c_rarg2 = R2;
+constexpr Register c_rarg3 = R3;
 
 
 #define GPR_PARAMS    4
@@ -455,10 +538,10 @@ class VFPSystemRegisterImpl : public AbstractRegisterImpl {
 
 // Java ABI
 // XXX Is this correct?
-#define j_rarg0  c_rarg0
-#define j_rarg1  c_rarg1
-#define j_rarg2  c_rarg2
-#define j_rarg3  c_rarg3
+constexpr Register j_rarg0 = c_rarg0;
+constexpr Register j_rarg1 = c_rarg1;
+constexpr Register j_rarg2 = c_rarg2;
+constexpr Register j_rarg3 = c_rarg3;
 
 
 #endif // CPU_ARM_REGISTER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 76e38d29478..13e1f4493ff 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -70,7 +70,7 @@ public:
 
 
   enum RegisterLayout {
-    fpu_save_size = FloatRegisterImpl::number_of_registers,
+    fpu_save_size = FloatRegister::number_of_registers,
 #ifndef __SOFTFP__
     D0_offset = 0,
 #endif
@@ -139,8 +139,8 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm,
     if (VM_Version::has_vfp3_32()) {
       __ fpush(FloatRegisterSet(D16, 16));
     } else {
-      if (FloatRegisterImpl::number_of_registers > 32) {
-        assert(FloatRegisterImpl::number_of_registers == 64, "nb fp registers should be 64");
+      if (FloatRegister::number_of_registers > 32) {
+        assert(FloatRegister::number_of_registers == 64, "nb fp registers should be 64");
         __ sub(SP, SP, 32 * wordSize);
       }
     }
@@ -182,8 +182,8 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_lr
     if (VM_Version::has_vfp3_32()) {
       __ fpop(FloatRegisterSet(D16, 16));
     } else {
-      if (FloatRegisterImpl::number_of_registers > 32) {
-        assert(FloatRegisterImpl::number_of_registers == 64, "nb fp registers should be 64");
+      if (FloatRegister::number_of_registers > 32) {
+        assert(FloatRegister::number_of_registers == 64, "nb fp registers should be 64");
         __ add(SP, SP, 32 * wordSize);
       }
     }
diff --git a/src/hotspot/cpu/arm/vmreg_arm.cpp b/src/hotspot/cpu/arm/vmreg_arm.cpp
index 4ce1dd0be20..efaf38ef729 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.cpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.cpp
@@ -30,14 +30,14 @@ void VMRegImpl::set_regName() {
   Register reg = ::as_Register(0);
   int i;
   for (i = 0; i < ConcreteRegisterImpl::max_gpr; reg = reg->successor()) {
-    for (int j = 0; j < (1 << ConcreteRegisterImpl::log_vmregs_per_gpr); j++) {
+    for (int j = 0; j < Register::max_slots_per_register; j++) {
       regName[i++] = reg->name();
     }
   }
 #ifndef __SOFTFP__
   FloatRegister freg = ::as_FloatRegister(0);
   for ( ; i < ConcreteRegisterImpl::max_fpr ; ) {
-    for (int j = 0; j < (1 << ConcreteRegisterImpl::log_vmregs_per_fpr); j++) {
+    for (int j = 0; j < Register::max_slots_per_register; j++) {
       regName[i++] = freg->name();
     }
     freg = freg->successor();
diff --git a/src/hotspot/cpu/arm/vmreg_arm.hpp b/src/hotspot/cpu/arm/vmreg_arm.hpp
index c13f443b804..f1dfd09a1e6 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.hpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.hpp
@@ -36,20 +36,20 @@
   inline Register as_Register() {
     assert(is_Register(), "must be");
     assert(is_concrete(), "concrete register expected");
-    return ::as_Register(value() >> ConcreteRegisterImpl::log_vmregs_per_gpr);
+    return ::as_Register(value() / Register::max_slots_per_register);
   }
 
   inline FloatRegister as_FloatRegister() {
     assert(is_FloatRegister(), "must be");
     assert(is_concrete(), "concrete register expected");
-    return ::as_FloatRegister((value() - ConcreteRegisterImpl::max_gpr) >> ConcreteRegisterImpl::log_vmregs_per_fpr);
+    return ::as_FloatRegister((value() - ConcreteRegisterImpl::max_gpr) / FloatRegister::max_slots_per_register);
   }
 
   inline bool is_concrete() {
     if (is_Register()) {
-      return ((value() & right_n_bits(ConcreteRegisterImpl::log_vmregs_per_gpr)) == 0);
+      return (value() % Register::max_slots_per_register == 0);
     } else if (is_FloatRegister()) {
-      return (((value() - ConcreteRegisterImpl::max_gpr) & right_n_bits(ConcreteRegisterImpl::log_vmregs_per_fpr)) == 0);
+      return (value() % FloatRegister::max_slots_per_register == 0); // Single slot
     } else {
       return false;
     }
diff --git a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
index f122b9ede70..3e5c18dbda0 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
@@ -25,11 +25,11 @@
 #ifndef CPU_ARM_VMREG_ARM_INLINE_HPP
 #define CPU_ARM_VMREG_ARM_INLINE_HPP
 
-inline VMReg RegisterImpl::as_VMReg() {
-  return VMRegImpl::as_VMReg(encoding() << ConcreteRegisterImpl::log_vmregs_per_gpr);
+inline VMReg Register::RegisterImpl::as_VMReg() const {
+  return VMRegImpl::as_VMReg(encoding() * Register::max_slots_per_register);
 }
 
-inline VMReg FloatRegisterImpl::as_VMReg() {
-  return VMRegImpl::as_VMReg((encoding() << ConcreteRegisterImpl::log_vmregs_per_fpr) + ConcreteRegisterImpl::max_gpr);
+inline VMReg FloatRegister::FloatRegisterImpl::as_VMReg() const {
+  return VMRegImpl::as_VMReg((encoding() * FloatRegister::max_slots_per_register) + ConcreteRegisterImpl::max_gpr);
 }
 #endif // CPU_ARM_VMREG_ARM_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/macroAssembler_linux_arm_32.cpp b/src/hotspot/os_cpu/linux_arm/macroAssembler_linux_arm_32.cpp
index e74daaa6d66..e4737191cfc 100644
--- a/src/hotspot/os_cpu/linux_arm/macroAssembler_linux_arm_32.cpp
+++ b/src/hotspot/os_cpu/linux_arm/macroAssembler_linux_arm_32.cpp
@@ -246,9 +246,9 @@ void MacroAssembler::atomic_cas64(Register memval_lo, Register memval_hi, Regist
     Label loop;
     assert_different_registers(memval_lo, memval_hi, result, oldval_lo,
                                oldval_hi, newval_lo, newval_hi, base);
-    assert(memval_hi == memval_lo + 1 && memval_lo < R9, "cmpxchg_long: illegal registers");
-    assert(oldval_hi == oldval_lo + 1 && oldval_lo < R9, "cmpxchg_long: illegal registers");
-    assert(newval_hi == newval_lo + 1 && newval_lo < R9, "cmpxchg_long: illegal registers");
+    assert(memval_hi == as_Register(memval_lo->encoding() + 1) && memval_lo->encoding() < R9->encoding(), "cmpxchg_long: illegal registers");
+    assert(oldval_hi == as_Register(oldval_lo->encoding() + 1) && oldval_lo->encoding() < R9->encoding(), "cmpxchg_long: illegal registers");
+    assert(newval_hi == as_Register(newval_lo->encoding() + 1) && newval_lo->encoding() < R9->encoding(), "cmpxchg_long: illegal registers");
     assert(result != R10, "cmpxchg_long: illegal registers");
     assert(base != R10, "cmpxchg_long: illegal registers");
 

From c0abecdd1ffe59314bc17aeec0684cdda33a222d Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 25 Nov 2025 18:48:17 +0000
Subject: [PATCH 342/512] 8372441: JFR: Improve logging of
 TestBackToBackSensitive

Reviewed-by: mgronlun
---
 .../runtime/TestBackToBackSensitive.java      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java b/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java
index 91fcd60f87d..147caee82ea 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java
@@ -67,6 +67,7 @@ public class TestBackToBackSensitive {
                 if (cl != null) {
                     if (cl.getType().getName().contains("PlatformClassLoader")) {
                         classLoaderStatistics.add(e.getStartTime());
+                        System.out.println("Class loader" + e);
                     }
                 }
             });
@@ -87,20 +88,20 @@ public class TestBackToBackSensitive {
             r1.stop();
             long chunkFiles = filesInRepository();
             System.out.println("Number of chunk files: " + chunkFiles);
+            // When jdk.PhysicalMemory is expected to be emitted:
+            // Chunk 1: begin, end
+            // Chunk 2: begin, end
+            // Chunk 3: begin, end
+            // Chunk 4: begin, end
+            assertCount(r1, "jdk.PhysicalMemory", physicalMemory, 2 * chunkFiles);
             // When jdk.ClassLoaderStatistics and jdk.ThreadThreadDump are expected to be
             // emitted:
             // Chunk 1: begin, end
             // Chunk 2: begin, end
             // Chunk 3: end
             // Chunk 4: end
-            assertCount("jdk.ThreadDump", threadDumps, 2 + 2 + (chunkFiles - 2));
-            assertCount("jdk.ClassLoaderStatistics", classLoaderStatistics, 2 + 2 + (chunkFiles - 2));
-            // When jdk.PhysicalMemory is expected to be emitted:
-            // Chunk 1: begin, end
-            // Chunk 2: begin, end
-            // Chunk 3: begin, end
-            // Chunk 4: begin, end
-            assertCount("jdk.PhysicalMemory", physicalMemory, 2 * chunkFiles);
+            assertCount(r1, "jdk.ThreadDump", threadDumps, 2 + 2 + (chunkFiles - 2));
+            assertCount(r1, "jdk.ClassLoaderStatistics", classLoaderStatistics, 2 + 2 + (chunkFiles - 2));
         }
     }
 
@@ -109,13 +110,15 @@ public class TestBackToBackSensitive {
         return Files.list(repository).filter(p -> p.toString().endsWith(".jfr")).count();
     }
 
-    private static void assertCount(String eventName, Set<Instant> timestamps, long expected) throws Exception {
+    private static void assertCount(RecordingStream stream, String eventName, Set<Instant> timestamps, long expected) throws Exception {
         System.out.println("Timestamps for " + eventName + ":");
         for (Instant timestamp : timestamps) {
             System.out.println(timestamp);
         }
         int count = timestamps.size();
         if (count != expected) {
+            System.out.println("Dumping failure file.");
+            stream.dump(Path.of("failure.jfr"));
             throw new Exception("Expected " + expected + "  timestamps for event " + eventName + ", but got " + count);
         }
     }

From b36b69470968b1578877cfe9658892a5fe44e38e Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Tue, 25 Nov 2025 22:42:53 +0000
Subject: [PATCH 343/512] 8371259: ML-DSA AVX2 and AVX512 intrinsics and
 improvements

Reviewed-by: sviswanathan, mpowers, ascarpino
---
 src/hotspot/cpu/x86/assembler_x86.cpp         |   40 +
 src/hotspot/cpu/x86/assembler_x86.hpp         |    5 +
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |    1 +
 .../x86/stubGenerator_x86_64_dilithium.cpp    | 1664 ++++++++++-------
 src/hotspot/cpu/x86/vm_version_x86.cpp        |    3 +-
 .../provider/acvp/ML_DSA_Intrinsic_Test.java  |  516 +++++
 6 files changed, 1549 insertions(+), 680 deletions(-)
 create mode 100644 test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index e3ba0ebb56a..cbc5c6988d4 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -3860,6 +3860,46 @@ void Assembler::evmovdquq(Address dst, KRegister mask, XMMRegister src, bool mer
   emit_operand(src, dst, 0);
 }
 
+void Assembler::vmovsldup(XMMRegister dst, XMMRegister src, int vector_len) {
+  assert(vector_len == AVX_512bit ? VM_Version::supports_evex() : VM_Version::supports_avx(), "");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x12, (0xC0 | encode));
+}
+
+void Assembler::vmovshdup(XMMRegister dst, XMMRegister src, int vector_len) {
+  assert(vector_len == AVX_512bit ? VM_Version::supports_evex() : VM_Version::supports_avx(), "");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x16, (0xC0 | encode));
+}
+
+void Assembler::evmovsldup(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len) {
+  assert(VM_Version::supports_evex(), "");
+  assert(vector_len == AVX_512bit || VM_Version::supports_avx512vl(), "");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
+  attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_is_evex_instruction();
+  if (merge) {
+    attributes.reset_is_clear_context();
+  }
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x12, (0xC0 | encode));
+}
+
+void Assembler::evmovshdup(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len) {
+  assert(VM_Version::supports_evex(), "");
+  assert(vector_len == AVX_512bit || VM_Version::supports_avx512vl(), "");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
+  attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_is_evex_instruction();
+  if (merge) {
+    attributes.reset_is_clear_context();
+  }
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x16, (0xC0 | encode));
+}
+
 // Uses zero extension on 64bit
 
 void Assembler::movl(Register dst, int32_t imm32) {
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index c863191df4c..43471a88391 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1664,6 +1664,11 @@ private:
   void evmovdqaq(XMMRegister dst, Address src, int vector_len);
   void evmovdqaq(XMMRegister dst, KRegister mask, Address src, bool merge, int vector_len);
 
+  void vmovsldup(XMMRegister dst, XMMRegister src, int vector_len);
+  void vmovshdup(XMMRegister dst, XMMRegister src, int vector_len);
+  void evmovsldup(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len);
+  void evmovshdup(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len);
+
   // Move lower 64bit to high 64bit in 128bit register
   void movlhps(XMMRegister dst, XMMRegister src);
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 4cecaa55345..695eea6ad03 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -1368,6 +1368,7 @@ public:
 
   void vpcmpeqw(XMMRegister dst, XMMRegister nds, Address src, int vector_len);
   void vpcmpeqw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
+  using Assembler::evpcmpeqd;
   void evpcmpeqd(KRegister kdst, KRegister mask, XMMRegister nds, AddressLiteral src, int vector_len, Register rscratch = noreg);
 
   // Vector compares
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_dilithium.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_dilithium.cpp
index 9555d60c8a4..b9590939468 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_dilithium.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_dilithium.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Intel Corporation. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +31,6 @@
 
 #define __ _masm->
 
-#define xmm(i) as_XMMRegister(i)
-
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */
 #else
@@ -40,15 +39,13 @@
 
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
-#define XMMBYTES 64
-
 // Constants
 //
 ATTRIBUTE_ALIGNED(64) static const uint32_t dilithiumAvx512Consts[] = {
     58728449, // montQInvModR
-    8380417, // dilithium_q
-    2365951, // montRSquareModQ
-    5373807 // Barrett addend for modular reduction
+    8380417,  // dilithium_q
+    2365951,  // montRSquareModQ
+    5373807   // Barrett addend for modular reduction
 };
 
 const int montQInvModRIdx = 0;
@@ -60,392 +57,590 @@ static address dilithiumAvx512ConstsAddr(int offset) {
   return ((address) dilithiumAvx512Consts) + offset;
 }
 
-const Register scratch = r10;
-const XMMRegister montMulPerm = xmm28;
-const XMMRegister montQInvModR = xmm30;
-const XMMRegister dilithium_q = xmm31;
+ATTRIBUTE_ALIGNED(64) static const uint32_t unshufflePerms[] = {
+  // Shuffle for the 128-bit element swap (uint64_t)
+  0, 0, 1,  0, 8,  0, 9, 0, 4, 0, 5, 0, 12, 0, 13, 0,
+  10, 0, 11, 0, 2, 0, 3, 0, 14, 0, 15, 0, 6, 0, 7, 0,
 
+  // Final shuffle for AlmostNtt
+  0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23,
+  24, 8, 25, 9, 26, 10, 27, 11, 28, 12, 29, 13, 30, 14, 31, 15,
 
-ATTRIBUTE_ALIGNED(64) static const uint32_t dilithiumAvx512Perms[] = {
-     // collect montmul results into the destination register
-    17, 1, 19, 3, 21, 5, 23, 7, 25, 9, 27, 11, 29, 13, 31, 15,
-    // ntt
-    // level 4
-    0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23,
-    8, 9, 10, 11, 12, 13, 14, 15, 24, 25, 26, 27, 28, 29, 30, 31,
-    // level 5
-    0, 1, 2, 3, 16, 17, 18, 19, 8, 9, 10, 11, 24, 25, 26, 27,
-    4, 5, 6, 7, 20, 21, 22, 23, 12, 13, 14, 15, 28, 29, 30, 31,
-    // level 6
-    0, 1, 16, 17, 4, 5, 20, 21, 8, 9, 24, 25, 12, 13, 28, 29,
-    2, 3, 18, 19, 6, 7, 22, 23, 10, 11, 26, 27, 14, 15, 30, 31,
-    // level 7
-    0, 16, 2, 18, 4, 20, 6, 22, 8, 24, 10, 26, 12, 28, 14, 30,
-    1, 17, 3, 19, 5, 21, 7, 23, 9, 25, 11, 27, 13, 29, 15, 31,
-    0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23,
-    8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31,
-
-    // ntt inverse
-    // level 0
-    0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30,
-    1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31,
-    // level 1
-    0, 16, 2, 18, 4, 20, 6, 22, 8, 24, 10, 26, 12, 28, 14, 30,
-    1, 17, 3, 19, 5, 21, 7, 23, 9, 25, 11, 27, 13, 29, 15, 31,
-    // level 2
-    0, 1, 16, 17, 4, 5, 20, 21, 8, 9, 24, 25, 12, 13, 28, 29,
-    2, 3, 18, 19, 6, 7, 22, 23, 10, 11, 26, 27, 14, 15, 30, 31,
-    // level 3
-    0, 1, 2, 3, 16, 17, 18, 19, 8, 9, 10, 11, 24, 25, 26, 27,
-    4, 5, 6, 7, 20, 21, 22, 23, 12, 13, 14, 15, 28, 29, 30, 31,
-    // level 4
-    0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23,
-    8, 9, 10, 11, 12, 13, 14, 15, 24, 25, 26, 27, 28, 29, 30, 31
+  // Initial shuffle for AlmostInverseNtt
+  0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30,
+  17, 19, 21, 23, 25, 27, 29, 31, 1, 3, 5, 7, 9, 11, 13, 15
 };
 
-const int montMulPermsIdx = 0;
-const int nttL4PermsIdx = 64;
-const int nttL5PermsIdx = 192;
-const int nttL6PermsIdx = 320;
-const int nttL7PermsIdx = 448;
-const int nttInvL0PermsIdx = 704;
-const int nttInvL1PermsIdx = 832;
-const int nttInvL2PermsIdx = 960;
-const int nttInvL3PermsIdx = 1088;
-const int nttInvL4PermsIdx = 1216;
-
-static address dilithiumAvx512PermsAddr() {
-  return (address) dilithiumAvx512Perms;
+static address unshufflePermsAddr(int offset) {
+  return ((address) unshufflePerms) + offset*64;
 }
 
-// We do Montgomery multiplications of two vectors of 16 ints each in 4 steps:
-// 1. Do the multiplications of the corresponding even numbered slots into
-//    the odd numbered slots of a third register.
-// 2. Swap the even and odd numbered slots of the original input registers.
-// 3. Similar to step 1, but into a different output register.
-// 4. Combine the outputs of step 1 and step 3 into the output of the Montgomery
-//    multiplication.
-// (For levels 0-6 in the Ntt and levels 1-7 of the inverse Ntt we only swap the
-// odd-even slots of the first multiplicand as in the second (zetas) the
-// odd slots contain the same number as the corresponding even one.)
-// The indexes of the registers to be multiplied
-// are in inputRegs1[] and inputRegs[2].
-// The results go to the registers whose indexes are in outputRegs.
-// scratchRegs should contain 12 different register indexes.
-// The set in outputRegs should not overlap with the set of the middle four
-// scratch registers.
-// The sets in inputRegs1 and inputRegs2 cannot overlap with the set of the
-// first eight scratch registers.
-// In most of the cases, the odd and the corresponding even slices of the
-// registers indexed by the numbers in inputRegs2 will contain the same number,
-// this should be indicated by calling this function with
-// input2NeedsShuffle=false .
+// The following function swaps elements A<->B, C<->D, and so forth.
+// input1[] is shuffled in place; shuffle of input2[] is copied to output2[].
+// Element size (in bits) is specified by size parameter.
+// +-----+-----+-----+-----+-----
+// |     |  A  |     |  C  | ...
+// +-----+-----+-----+-----+-----
+// +-----+-----+-----+-----+-----
+// |  B  |     |  D  |     | ...
+// +-----+-----+-----+-----+-----
 //
-static void montMul64(int outputRegs[], int inputRegs1[], int inputRegs2[],
-                      int scratchRegs[], bool input2NeedsShuffle,
-                      MacroAssembler *_masm) {
+// NOTE: size 0 and 1 are used for initial and final shuffles respectively of
+// dilithiumAlmostInverseNtt and dilithiumAlmostNtt. For size 0 and 1, input1[]
+// and input2[] are modified in-place (and output2 is used as a temporary)
+//
+// Using C++ lambdas for improved readability (to hide parameters that always repeat)
+static auto whole_shuffle(Register scratch, KRegister mergeMask1, KRegister mergeMask2,
+  const XMMRegister unshuffle1, const XMMRegister unshuffle2, int vector_len, MacroAssembler *_masm) {
 
-  for (int i = 0; i < 4; i++) {
-    __ vpmuldq(xmm(scratchRegs[i]), xmm(inputRegs1[i]), xmm(inputRegs2[i]),
-               Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 4; i++) {
-    __ vpmulld(xmm(scratchRegs[i + 4]), xmm(scratchRegs[i]), montQInvModR,
-               Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 4; i++) {
-    __ vpmuldq(xmm(scratchRegs[i + 4]), xmm(scratchRegs[i + 4]), dilithium_q,
-               Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 4; i++) {
-    __ evpsubd(xmm(scratchRegs[i + 4]), k0, xmm(scratchRegs[i]),
-               xmm(scratchRegs[i + 4]), false, Assembler::AVX_512bit);
+  int regCnt = 4;
+  if (vector_len == Assembler::AVX_256bit) {
+    regCnt = 2;
   }
 
-  for (int i = 0; i < 4; i++) {
-    __ vpshufd(xmm(inputRegs1[i]), xmm(inputRegs1[i]), 0xB1,
-               Assembler::AVX_512bit);
-    if (input2NeedsShuffle) {
-       __ vpshufd(xmm(inputRegs2[i]), xmm(inputRegs2[i]), 0xB1,
-                  Assembler::AVX_512bit);
+  return [=](const XMMRegister output2[], const XMMRegister input1[],
+    const XMMRegister input2[], int size) {
+    if (vector_len == Assembler::AVX_256bit) {
+      switch (size) {
+        case 128:
+          for (int i = 0; i < regCnt; i++) {
+            __ vperm2i128(output2[i], input1[i], input2[i], 0b110001);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vinserti128(input1[i], input1[i], input2[i], 1);
+          }
+          break;
+        case 64:
+          for (int i = 0; i < regCnt; i++) {
+            __ vshufpd(output2[i], input1[i], input2[i], 0b11111111, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vshufpd(input1[i], input1[i], input2[i], 0b00000000, vector_len);
+          }
+          break;
+        case 32:
+          for (int i = 0; i < regCnt; i++) {
+            __ vmovshdup(output2[i], input1[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vpblendd(output2[i], output2[i], input2[i], 0b10101010, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vmovsldup(input2[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vpblendd(input1[i], input1[i], input2[i], 0b10101010, vector_len);
+          }
+          break;
+        // Special cases
+        case 1: // initial shuffle for dilithiumAlmostInverseNtt
+          // shuffle all even 32bit columns to input1, and odd to input2
+          for (int i = 0; i < regCnt; i++) {
+            // 0b-3-1-3-1
+            __ vshufps(output2[i], input1[i], input2[i], 0b11011101, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            // 0b-2-0-2-0
+            __ vshufps(input1[i], input1[i], input2[i], 0b10001000, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vpermq(input2[i], output2[i], 0b11011000, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            // 0b-3-1-2-0
+            __ vpermq(input1[i], input1[i], 0b11011000, vector_len);
+          }
+          break;
+        case 0: // final unshuffle for dilithiumAlmostNtt
+          // reverse case 1: all even are in input1 and odd in input2, put back
+          for (int i = 0; i < regCnt; i++) {
+            __ vpunpckhdq(output2[i], input1[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vpunpckldq(input1[i], input1[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vperm2i128(input2[i], input1[i], output2[i], 0b110001);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vinserti128(input1[i], input1[i], output2[i], 1);
+          }
+          break;
+        default:
+          assert(false, "Don't call here");
+      }
+    } else {
+      switch (size) {
+        case 256:
+          for (int i = 0; i < regCnt; i++) {
+            // 0b-3-2-3-2
+            __ evshufi64x2(output2[i], input1[i], input2[i], 0b11101110, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vinserti64x4(input1[i], input1[i], input2[i], 1);
+          }
+          break;
+        case 128:
+          for (int i = 0; i < regCnt; i++) {
+            __ vmovdqu(output2[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evpermt2q(output2[i], unshuffle2, input1[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evpermt2q(input1[i], unshuffle1, input2[i], vector_len);
+          }
+
+          break;
+        case 64:
+          for (int i = 0; i < regCnt; i++) {
+            __ vshufpd(output2[i], input1[i], input2[i], 0b11111111, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ vshufpd(input1[i], input1[i], input2[i], 0b00000000, vector_len);
+          }
+          break;
+        case 32:
+          for (int i = 0; i < regCnt; i++) {
+            __ vmovdqu(output2[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evmovshdup(output2[i], mergeMask2, input1[i], true, vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evmovsldup(input1[i], mergeMask1, input2[i], true, vector_len);
+          }
+          break;
+        // Special cases
+        case 1: // initial shuffle for dilithiumAlmostInverseNtt
+          // shuffle all even 32bit columns to input1, and odd to input2
+          for (int i = 0; i < regCnt; i++) {
+            __ vmovdqu(output2[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evpermt2d(input2[i], unshuffle2, input1[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evpermt2d(input1[i], unshuffle1, output2[i], vector_len);
+          }
+          break;
+        case 0: // final unshuffle for dilithiumAlmostNtt
+          // reverse case 1: all even are in input1 and odd in input2, put back
+          for (int i = 0; i < regCnt; i++) {
+            __ vmovdqu(output2[i], input2[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evpermt2d(input2[i], unshuffle2, input1[i], vector_len);
+          }
+          for (int i = 0; i < regCnt; i++) {
+            __ evpermt2d(input1[i], unshuffle1, output2[i], vector_len);
+          }
+          break;
+        default:
+          assert(false, "Don't call here");
+      }
     }
-  }
-
-  for (int i = 0; i < 4; i++) {
-    __ vpmuldq(xmm(scratchRegs[i]), xmm(inputRegs1[i]), xmm(inputRegs2[i]),
-               Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 4; i++) {
-    __ vpmulld(xmm(scratchRegs[i + 8]), xmm(scratchRegs[i]), montQInvModR,
-               Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 4; i++) {
-    __ vpmuldq(xmm(scratchRegs[i + 8]), xmm(scratchRegs[i + 8]), dilithium_q,
-               Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 4; i++) {
-    __ evpsubd(xmm(outputRegs[i]), k0, xmm(scratchRegs[i]),
-               xmm(scratchRegs[i + 8]), false, Assembler::AVX_512bit);
-  }
-
-  for (int i = 0; i < 4; i++) {
-    __ evpermt2d(xmm(outputRegs[i]), montMulPerm, xmm(scratchRegs[i + 4]),
-                 Assembler::AVX_512bit);
-  }
+  }; // return
 }
 
-static void montMul64(int outputRegs[], int inputRegs1[], int inputRegs2[],
-                       int scratchRegs[], MacroAssembler *_masm) {
-   montMul64(outputRegs, inputRegs1, inputRegs2, scratchRegs, false, _masm);
-}
-
-static void sub_add(int subResult[], int addResult[],
-                    int input1[], int input2[], MacroAssembler *_masm) {
-
-  for (int i = 0; i < 4; i++) {
-    __ evpsubd(xmm(subResult[i]), k0, xmm(input1[i]), xmm(input2[i]), false,
-               Assembler::AVX_512bit);
+// We do Montgomery multiplications of two AVX registers in 4 steps:
+// 1. Do the multiplications of the corresponding even numbered slots into
+//    the odd numbered slots of the scratch2 register.
+// 2. Swap the even and odd numbered slots of the original input registers.(*Note)
+// 3. Similar to step 1, but multiplication result is placed into output register.
+// 4. Combine odd/even slots respectively from the scratch2 and output registers
+//    into the output register for the final result of the Montgomery multiplication.
+// (*Note: For levels 0-6 in the Ntt and levels 1-7 of the inverse Ntt, need NOT
+//         swap the second operand (zetas) since the odd slots contain the same number
+//         as the corresponding even one. This is indicated by input2NeedsShuffle=false)
+//
+// The registers to be multiplied are in input1[] and inputs2[]. The results go
+// into output[]. Two scratch[] register arrays are expected. input1[] can
+// overlap with either output[] or scratch1[]
+// - If AVX512, all register arrays are of length 4
+// - If AVX2, first two registers of each array are in xmm0-xmm15 range
+// Constants montQInvModR, dilithium_q and mergeMask expected to have already
+// been loaded.
+//
+// Using C++ lambdas for improved readability (to hide parameters that always repeat)
+static auto whole_montMul(XMMRegister montQInvModR, XMMRegister dilithium_q,
+    KRegister mergeMask, int vector_len, MacroAssembler *_masm) {
+  int regCnt = 4;
+  int regSize = 64;
+  if (vector_len == Assembler::AVX_256bit) {
+    regCnt = 2;
+    regSize = 32;
   }
 
-  for (int i = 0; i < 4; i++) {
-    __ evpaddd(xmm(addResult[i]), k0, xmm(input1[i]), xmm(input2[i]), false,
-               Assembler::AVX_512bit);
-  }
-}
+  return [=](const XMMRegister output[], const XMMRegister input1[],
+    const XMMRegister input2[], const XMMRegister scratch1[],
+    const XMMRegister scratch2[], bool input2NeedsShuffle = false) {
+    // (Register overloading) Can't always use scratch1 (could override input1).
+    // If so, use output:
+    const XMMRegister* scratch = scratch1 == input1 ? output: scratch1;
 
-static void loadPerm(int destinationRegs[], Register perms,
-                      int offset, MacroAssembler *_masm) {
-  __ evmovdqul(xmm(destinationRegs[0]), Address(perms, offset),
-                 Assembler::AVX_512bit);
-  for (int i = 1; i < 4; i++) {
-      __ evmovdqul(xmm(destinationRegs[i]), xmm(destinationRegs[0]),
-                   Assembler::AVX_512bit);
+    // scratch = input1_even * intput2_even
+    for (int i = 0; i < regCnt; i++) {
+      __ vpmuldq(scratch[i], input1[i], input2[i], vector_len);
     }
+
+    // scratch2_low = scratch_low * montQInvModR
+    for (int i = 0; i < regCnt; i++) {
+      __ vpmuldq(scratch2[i], scratch[i], montQInvModR, vector_len);
+    }
+
+    // scratch2 = scratch2_low * dilithium_q
+    for (int i = 0; i < regCnt; i++) {
+      __ vpmuldq(scratch2[i], scratch2[i], dilithium_q, vector_len);
+    }
+
+    // scratch2_high = scratch2_high - scratch_high
+    for (int i = 0; i < regCnt; i++) {
+      __ vpsubd(scratch2[i], scratch[i], scratch2[i], vector_len);
+    }
+
+    // input1_even = input1_odd
+    // input2_even = input2_odd
+    for (int i = 0; i < regCnt; i++) {
+      __ vpshufd(input1[i], input1[i], 0xB1, vector_len);
+      if (input2NeedsShuffle) {
+        __ vpshufd(input2[i], input2[i], 0xB1, vector_len);
+      }
+    }
+
+    // scratch1 = input1_even*intput2_even
+    for (int i = 0; i < regCnt; i++) {
+      __ vpmuldq(scratch1[i], input1[i], input2[i], vector_len);
+    }
+
+    // output = scratch1_low * montQInvModR
+    for (int i = 0; i < regCnt; i++) {
+      __ vpmuldq(output[i], scratch1[i], montQInvModR, vector_len);
+    }
+
+    // output = output * dilithium_q
+    for (int i = 0; i < regCnt; i++) {
+      __ vpmuldq(output[i], output[i], dilithium_q, vector_len);
+    }
+
+    // output_high = scratch1_high - output_high
+    for (int i = 0; i < regCnt; i++) {
+      __ vpsubd(output[i], scratch1[i], output[i], vector_len);
+    }
+
+    // output = select(output_high, scratch2_high)
+    if (vector_len == Assembler::AVX_256bit) {
+      for (int i = 0; i < regCnt; i++) {
+        __ vmovshdup(scratch2[i], scratch2[i], vector_len);
+      }
+      for (int i = 0; i < regCnt; i++) {
+        __ vpblendd(output[i], output[i], scratch2[i], 0b01010101, vector_len);
+      }
+    } else {
+      for (int i = 0; i < regCnt; i++) {
+        __ evmovshdup(output[i], mergeMask, scratch2[i], true, vector_len);
+      }
+    }
+  }; // return
 }
 
-static void load4Xmms(int destinationRegs[], Register source, int offset,
-                       MacroAssembler *_masm) {
-  for (int i = 0; i < 4; i++) {
-    __ evmovdqul(xmm(destinationRegs[i]), Address(source, offset + i * XMMBYTES),
-                 Assembler::AVX_512bit);
+static void sub_add(const XMMRegister subResult[], const XMMRegister addResult[],
+                    const XMMRegister input1[], const XMMRegister input2[],
+                    int vector_len, MacroAssembler *_masm) {
+  int regCnt = 4;
+  if (vector_len == Assembler::AVX_256bit) {
+    regCnt = 2;
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(subResult[i], input1[i], input2[i], vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpaddd(addResult[i], input1[i], input2[i], vector_len);
   }
 }
 
-static void loadXmm29(Register source, int offset, MacroAssembler *_masm) {
-    __ evmovdqul(xmm29, Address(source, offset), Assembler::AVX_512bit);
-}
+static void loadXmms(const XMMRegister destinationRegs[], Register source, int offset,
+                     int vector_len, MacroAssembler *_masm, int regCnt = -1, int memStep = -1) {
 
-static void store4Xmms(Register destination, int offset, int xmmRegs[],
-                       MacroAssembler *_masm) {
-  for (int i = 0; i < 4; i++) {
-    __ evmovdqul(Address(destination, offset + i * XMMBYTES), xmm(xmmRegs[i]),
-                 Assembler::AVX_512bit);
+  if (vector_len == Assembler::AVX_256bit) {
+    regCnt = regCnt == -1 ? 2 : regCnt;
+    memStep = memStep == -1 ? 32 : memStep;
+  } else {
+    regCnt = 4;
+    memStep = 64;
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vmovdqu(destinationRegs[i], Address(source, offset + i * memStep), vector_len);
   }
 }
 
-static int xmm0_3[] = {0, 1, 2, 3};
-static int xmm0145[] = {0, 1, 4, 5};
-static int xmm0246[] = {0, 2, 4, 6};
-static int xmm0426[] = {0, 4, 2, 6};
-static int xmm1357[] = {1, 3, 5, 7};
-static int xmm1537[] = {1, 5, 3, 7};
-static int xmm2367[] = {2, 3, 6, 7};
-static int xmm4_7[] = {4, 5, 6, 7};
-static int xmm8_11[] = {8, 9, 10, 11};
-static int xmm12_15[] = {12, 13, 14, 15};
-static int xmm16_19[] = {16, 17, 18, 19};
-static int xmm20_23[] = {20, 21, 22, 23};
-static int xmm20222426[] = {20, 22, 24, 26};
-static int xmm21232527[] = {21, 23, 25, 27};
-static int xmm24_27[] = {24, 25, 26, 27};
-static int xmm4_20_24[] = {4, 5, 6, 7, 20, 21, 22, 23, 24, 25, 26, 27};
-static int xmm16_27[] = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27};
-static int xmm29_29[] = {29, 29, 29, 29};
+static void storeXmms(Register destination, int offset, const XMMRegister xmmRegs[],
+                      int vector_len, MacroAssembler *_masm, int regCnt = -1, int memStep = -1) {
+  if (vector_len == Assembler::AVX_256bit) {
+    regCnt = regCnt == -1 ? 2 : regCnt;
+    memStep = memStep == -1 ? 32 : memStep;
+  } else {
+    regCnt = 4;
+    memStep = 64;
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vmovdqu(Address(destination, offset + i * memStep), xmmRegs[i], vector_len);
+  }
+}
 
 // Dilithium NTT function except for the final "normalization" to |coeff| < Q.
 // Implements
 // static int implDilithiumAlmostNtt(int[] coeffs, int zetas[]) {}
 //
 // coeffs (int[256]) = c_rarg0
-// zetas (int[256]) = c_rarg1
+// zetas (int[128*8]) = c_rarg1
 //
-//
-static address generate_dilithiumAlmostNtt_avx512(StubGenerator *stubgen,
-                                                  MacroAssembler *_masm) {
-
+static address generate_dilithiumAlmostNtt_avx(StubGenerator *stubgen,
+                                               int vector_len, MacroAssembler *_masm) {
   __ align(CodeEntryAlignment);
   StubId stub_id = StubId::stubgen_dilithiumAlmostNtt_id;
   StubCodeMark mark(stubgen, stub_id);
   address start = __ pc();
   __ enter();
 
-  Label L_loop, L_end;
-
   const Register coeffs = c_rarg0;
   const Register zetas = c_rarg1;
-  const Register iterations = c_rarg2;
-
-  const Register perms = r11;
-
-  __ lea(perms, ExternalAddress(dilithiumAvx512PermsAddr()));
-
-  __ evmovdqul(montMulPerm, Address(perms, montMulPermsIdx), Assembler::AVX_512bit);
+  const Register scratch = r10;
 
   // Each level represents one iteration of the outer for loop of the Java version
   // In each of these iterations half of the coefficients are (Montgomery)
   // multiplied by a zeta corresponding to the coefficient and then these
   // products will be added to and subtracted from the other half of the
-  // coefficients. In each level we just collect the coefficients (using
-  // evpermi2d() instructions where necessary, i.e. in levels 4-7) that need to
+  // coefficients. In each level we just shuffle the coefficients that need to
   // be multiplied by the zetas in one set, the rest to another set of vector
   // registers, then redistribute the addition/substraction results.
 
   // For levels 0 and 1 the zetas are not different within the 4 xmm registers
-  // that we would use for them, so we use only one, xmm29.
-  loadXmm29(zetas, 0, _masm);
+  // that we would use for them, so we use only one register.
+
+  // AVX2 version uses the first half of these arrays
+  const XMMRegister Coeffs1[] = {xmm0, xmm1, xmm16, xmm17};
+  const XMMRegister Coeffs2[] = {xmm2, xmm3, xmm18, xmm19};
+  const XMMRegister Coeffs3[] = {xmm4, xmm5, xmm20, xmm21};
+  const XMMRegister Coeffs4[] = {xmm6, xmm7, xmm22, xmm23};
+  const XMMRegister Scratch1[] = {xmm8, xmm9, xmm24, xmm25};
+  const XMMRegister Scratch2[] = {xmm10, xmm11, xmm26, xmm27};
+  const XMMRegister Zetas1[] = {xmm12, xmm12, xmm12, xmm12};
+  const XMMRegister Zetas2[] = {xmm12, xmm12, xmm13, xmm13};
+  const XMMRegister Zetas3[] = {xmm12, xmm13, xmm28, xmm29};
+  const XMMRegister montQInvModR = xmm14;
+  const XMMRegister dilithium_q = xmm15;
+  const XMMRegister unshuffle1 = xmm30;
+  const XMMRegister unshuffle2 = xmm31;
+  KRegister mergeMask1 = k1;
+  KRegister mergeMask2 = k2;
+  // lambdas to hide repeated parameters
+  auto shuffle = whole_shuffle(scratch, mergeMask1, mergeMask2, unshuffle1, unshuffle2, vector_len, _masm);
+  auto montMul64 = whole_montMul(montQInvModR, dilithium_q, mergeMask2, vector_len, _masm);
+
   __ vpbroadcastd(montQInvModR,
                   ExternalAddress(dilithiumAvx512ConstsAddr(montQInvModRIdx)),
-                  Assembler::AVX_512bit, scratch); // q^-1 mod 2^32
+                  vector_len, scratch); // q^-1 mod 2^32
   __ vpbroadcastd(dilithium_q,
                   ExternalAddress(dilithiumAvx512ConstsAddr(dilithium_qIdx)),
-                  Assembler::AVX_512bit, scratch); // q
+                  vector_len, scratch); // q
 
-  // load all coefficients into the vector registers Zmm_0-Zmm_15,
-  // 16 coefficients into each
-  load4Xmms(xmm0_3, coeffs, 0, _masm);
-  load4Xmms(xmm4_7, coeffs, 4 * XMMBYTES, _masm);
-  load4Xmms(xmm8_11, coeffs, 8 * XMMBYTES, _masm);
-  load4Xmms(xmm12_15, coeffs, 12 * XMMBYTES, _masm);
+  if (vector_len == Assembler::AVX_512bit) {
+    // levels 0-3, register shuffles:
+    const XMMRegister Coeffs1_1[] = {xmm0, xmm1, xmm2, xmm3};
+    const XMMRegister Coeffs2_1[] = {xmm16, xmm17, xmm18, xmm19};
+    const XMMRegister Coeffs3_1[] = {xmm4, xmm5, xmm6, xmm7};
+    const XMMRegister Coeffs4_1[] = {xmm20, xmm21, xmm22, xmm23};
+    const XMMRegister Coeffs1_2[] = {xmm0, xmm16, xmm2, xmm18};
+    const XMMRegister Coeffs2_2[] = {xmm1, xmm17, xmm3, xmm19};
+    const XMMRegister Coeffs3_2[] = {xmm4, xmm20, xmm6, xmm22};
+    const XMMRegister Coeffs4_2[] = {xmm5, xmm21, xmm7, xmm23};
 
-  // level 0 and 1 can be done entirely in registers as the zetas on these
-  // levels are the same for all the montmuls that we can do in parallel
+    // Constants for shuffle and montMul64
+    __ mov64(scratch, 0b1010101010101010);
+    __ kmovwl(mergeMask1, scratch);
+    __ knotwl(mergeMask2, mergeMask1);
+    __ vmovdqu(unshuffle1, ExternalAddress(unshufflePermsAddr(0)), vector_len, scratch);
+    __ vmovdqu(unshuffle2, ExternalAddress(unshufflePermsAddr(1)), vector_len, scratch);
 
-  // level 0
-  montMul64(xmm16_19, xmm8_11, xmm29_29, xmm16_27, _masm);
-  sub_add(xmm8_11, xmm0_3, xmm0_3, xmm16_19, _masm);
-  montMul64(xmm16_19, xmm12_15, xmm29_29, xmm16_27, _masm);
-  loadXmm29(zetas, 512, _masm); // for level 1
-  sub_add(xmm12_15, xmm4_7, xmm4_7, xmm16_19, _masm);
+    int memStep = 4 * 64; // 4*64-byte registers
+    loadXmms(Coeffs1, coeffs, 0*memStep, vector_len, _masm);
+    loadXmms(Coeffs2, coeffs, 1*memStep, vector_len, _masm);
+    loadXmms(Coeffs3, coeffs, 2*memStep, vector_len, _masm);
+    loadXmms(Coeffs4, coeffs, 3*memStep, vector_len, _masm);
 
-  // level 1
+    // level 0-3 can be done by shuffling registers (also notice fewer zetas loads, they repeat)
+    // level 0 - 128
+    // scratch1 = coeffs3 * zetas1
+    // coeffs3, coeffs1 = coeffs1 ± scratch1
+    // scratch1 = coeffs4 * zetas1
+    // coeffs4, coeffs2 = coeffs2 ± scratch1
+    __ vmovdqu(Zetas1[0], Address(zetas, 0), vector_len);
+    montMul64(Scratch1, Coeffs3, Zetas1, Coeffs3, Scratch2);
+    sub_add(Coeffs3, Coeffs1, Coeffs1, Scratch1, vector_len, _masm);
+    montMul64(Scratch1, Coeffs4, Zetas1, Coeffs4, Scratch2);
+    sub_add(Coeffs4, Coeffs2, Coeffs2, Scratch1, vector_len, _masm);
 
-  montMul64(xmm16_19, xmm4_7, xmm29_29, xmm16_27, _masm);
-  loadXmm29(zetas, 768, _masm);
-  sub_add(xmm4_7, xmm0_3, xmm0_3, xmm16_19, _masm);
-  montMul64(xmm16_19, xmm12_15, xmm29_29, xmm16_27, _masm);
-  sub_add(xmm12_15, xmm8_11, xmm8_11, xmm16_19, _masm);
+    // level 1 - 64
+    __ vmovdqu(Zetas1[0], Address(zetas,        512), vector_len);
+    montMul64(Scratch1, Coeffs2, Zetas1, Coeffs2, Scratch2);
+    sub_add(Coeffs2, Coeffs1, Coeffs1, Scratch1, vector_len, _masm);
 
-  // levels 2 to 7 are done in 2 batches, by first saving half of the coefficients
-  // from level 1 into memory, doing all the level 2 to level 7 computations
-  // on the remaining half in the vector registers, saving the result to
-  // memory after level 7, then loading back the coefficients that we saved after
-  // level 1 and do the same computation with those
+    __ vmovdqu(Zetas1[0], Address(zetas, 4*64 + 512), vector_len);
+    montMul64(Scratch1, Coeffs4, Zetas1, Coeffs4, Scratch2);
+    sub_add(Coeffs4, Coeffs3, Coeffs3, Scratch1, vector_len, _masm);
 
-  store4Xmms(coeffs, 8 * XMMBYTES, xmm8_11, _masm);
-  store4Xmms(coeffs, 12 * XMMBYTES, xmm12_15, _masm);
+    // level 2 - 32
+    __ vmovdqu(Zetas2[0], Address(zetas,        2 * 512), vector_len);
+    __ vmovdqu(Zetas2[2], Address(zetas, 2*64 + 2 * 512), vector_len);
+    montMul64(Scratch1, Coeffs2_1, Zetas2, Coeffs2_1, Scratch2);
+    sub_add(Coeffs2_1, Coeffs1_1, Coeffs1_1, Scratch1, vector_len, _masm);
 
-  __ movl(iterations, 2);
+    __ vmovdqu(Zetas2[0], Address(zetas, 4*64 + 2 * 512), vector_len);
+    __ vmovdqu(Zetas2[2], Address(zetas, 6*64 + 2 * 512), vector_len);
+    montMul64(Scratch1, Coeffs4_1, Zetas2, Coeffs4_1, Scratch2);
+    sub_add(Coeffs4_1, Coeffs3_1, Coeffs3_1, Scratch1, vector_len, _masm);
 
-  __ align(OptoLoopAlignment);
-  __ BIND(L_loop);
+    // level 3 - 16
+    loadXmms(Zetas3, zetas, 3 * 512, vector_len, _masm);
+    montMul64(Scratch1, Coeffs2_2, Zetas3, Coeffs2_2, Scratch2);
+    sub_add(Coeffs2_2, Coeffs1_2, Coeffs1_2, Scratch1, vector_len, _masm);
 
-  __ subl(iterations, 1);
+    loadXmms(Zetas3, zetas, 4*64 + 3 * 512, vector_len, _masm);
+    montMul64(Scratch1, Coeffs4_2, Zetas3, Coeffs4_2, Scratch2);
+    sub_add(Coeffs4_2, Coeffs3_2, Coeffs3_2, Scratch1, vector_len, _masm);
 
-  // level 2
-  load4Xmms(xmm12_15, zetas, 2 * 512, _masm);
-  montMul64(xmm16_19, xmm2367, xmm12_15, xmm16_27, _masm);
-  load4Xmms(xmm12_15, zetas, 3 * 512, _masm); // for level 3
-  sub_add(xmm2367, xmm0145, xmm0145, xmm16_19, _masm);
+    for (int level = 4, distance = 8; level<8; level++, distance /= 2) {
+      // zetas = load(level * 512)
+      // coeffs1_2, scratch1 = shuffle(coeffs1_2, coeffs2_2)
+      // scratch1 = scratch1 * zetas
+      // coeffs2_2 = coeffs1_2 - scratch1
+      // coeffs1_2 = coeffs1_2 + scratch1
+      loadXmms(Zetas3, zetas, level * 512, vector_len, _masm);
+      shuffle(Scratch1, Coeffs1_2, Coeffs2_2, distance * 32); // Coeffs2_2 freed
+      montMul64(Scratch1, Scratch1, Zetas3, Coeffs2_2, Scratch2, level==7);
+      sub_add(Coeffs2_2, Coeffs1_2, Coeffs1_2, Scratch1, vector_len, _masm);
 
-  // level 3
+      loadXmms(Zetas3, zetas, 4*64 + level * 512, vector_len, _masm);
+      shuffle(Scratch1, Coeffs3_2, Coeffs4_2, distance * 32); // Coeffs4_2 freed
+      montMul64(Scratch1, Scratch1, Zetas3, Coeffs4_2, Scratch2, level==7);
+      sub_add(Coeffs4_2, Coeffs3_2, Coeffs3_2, Scratch1, vector_len, _masm);
+    }
 
-  montMul64(xmm16_19, xmm1357, xmm12_15, xmm16_27, _masm);
-  sub_add(xmm1357, xmm0246, xmm0246, xmm16_19, _masm);
+    // Constants for final unshuffle
+    __ vmovdqu(unshuffle1, ExternalAddress(unshufflePermsAddr(2)), vector_len, scratch);
+    __ vmovdqu(unshuffle2, ExternalAddress(unshufflePermsAddr(3)), vector_len, scratch);
+    shuffle(Scratch1, Coeffs1_2, Coeffs2_2, 0);
+    shuffle(Scratch1, Coeffs3_2, Coeffs4_2, 0);
 
-  // level 4
-  loadPerm(xmm16_19, perms, nttL4PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttL4PermsIdx + 64, _masm);
-  load4Xmms(xmm24_27, zetas, 4 * 512, _masm);
+    storeXmms(coeffs, 0*memStep, Coeffs1, vector_len, _masm);
+    storeXmms(coeffs, 1*memStep, Coeffs2, vector_len, _masm);
+    storeXmms(coeffs, 2*memStep, Coeffs3, vector_len, _masm);
+    storeXmms(coeffs, 3*memStep, Coeffs4, vector_len, _masm);
+  } else { // Assembler::AVX_256bit
+    // levels 0-4, register shuffles:
+    const XMMRegister Coeffs1_1[] = {xmm0, xmm2};
+    const XMMRegister Coeffs2_1[] = {xmm1, xmm3};
+    const XMMRegister Coeffs3_1[] = {xmm4, xmm6};
+    const XMMRegister Coeffs4_1[] = {xmm5, xmm7};
 
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i/2 + 16), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
+    const XMMRegister Coeffs1_2[] = {xmm0, xmm1, xmm2, xmm3};
+    const XMMRegister Coeffs2_2[] = {xmm4, xmm5, xmm6, xmm7};
+
+    // Since we cannot fit the entire payload into registers, we process the
+    // input in two stages. For the first half, load 8 registers, each 32 integers
+    // apart. With one load, we can process level 0-2 (128-, 64- and 32-integers
+    // apart). For the remaining levels, load 8 registers from consecutive memory
+    // (16-, 8-, 4-, 2-, 1-integer apart)
+    // Levels 5, 6, 7 (4-, 2-, 1-integer apart) require shuffles within registers.
+    // On the other levels, shuffles can be done by rearranging the register order
+
+    // Four batches of 8 registers each, 128 bytes apart
+    for (int i=0; i<4; i++) {
+      loadXmms(Coeffs1_2, coeffs, i*32 + 0*128, vector_len, _masm, 4, 128);
+      loadXmms(Coeffs2_2, coeffs, i*32 + 4*128, vector_len, _masm, 4, 128);
+
+      // level 0-2 can be done by shuffling registers (also notice fewer zetas loads, they repeat)
+      // level 0 - 128
+      __ vmovdqu(Zetas1[0], Address(zetas, 0), vector_len);
+      montMul64(Scratch1, Coeffs3, Zetas1, Coeffs3, Scratch2);
+      sub_add(Coeffs3, Coeffs1, Coeffs1, Scratch1, vector_len, _masm);
+      montMul64(Scratch1, Coeffs4, Zetas1, Coeffs4, Scratch2);
+      sub_add(Coeffs4, Coeffs2, Coeffs2, Scratch1, vector_len, _masm);
+
+      // level 1 - 64
+      __ vmovdqu(Zetas1[0], Address(zetas,        512), vector_len);
+      montMul64(Scratch1, Coeffs2, Zetas1, Coeffs2, Scratch2);
+      sub_add(Coeffs2, Coeffs1, Coeffs1, Scratch1, vector_len, _masm);
+
+      __ vmovdqu(Zetas1[0], Address(zetas, 4*64 + 512), vector_len);
+      montMul64(Scratch1, Coeffs4, Zetas1, Coeffs4, Scratch2);
+      sub_add(Coeffs4, Coeffs3, Coeffs3, Scratch1, vector_len, _masm);
+
+      // level 2 - 32
+      loadXmms(Zetas3, zetas, 2 * 512, vector_len, _masm, 2, 128);
+      montMul64(Scratch1, Coeffs2_1, Zetas3, Coeffs2_1, Scratch2);
+      sub_add(Coeffs2_1, Coeffs1_1, Coeffs1_1, Scratch1, vector_len, _masm);
+
+      loadXmms(Zetas3, zetas, 4*64 + 2 * 512, vector_len, _masm, 2, 128);
+      montMul64(Scratch1, Coeffs4_1, Zetas3, Coeffs4_1, Scratch2);
+      sub_add(Coeffs4_1, Coeffs3_1, Coeffs3_1, Scratch1, vector_len, _masm);
+
+      storeXmms(coeffs, i*32 + 0*128, Coeffs1_2, vector_len, _masm, 4, 128);
+      storeXmms(coeffs, i*32 + 4*128, Coeffs2_2, vector_len, _masm, 4, 128);
+    }
+
+    // Four batches of 8 registers, consecutive loads
+    for (int i=0; i<4; i++) {
+      loadXmms(Coeffs1_2, coeffs,       i*256, vector_len, _masm, 4);
+      loadXmms(Coeffs2_2, coeffs, 128 + i*256, vector_len, _masm, 4);
+
+      // level 3 - 16
+      __ vmovdqu(Zetas1[0], Address(zetas, i*128 + 3 * 512), vector_len);
+      montMul64(Scratch1, Coeffs2, Zetas1, Coeffs2, Scratch2);
+      sub_add(Coeffs2, Coeffs1, Coeffs1, Scratch1, vector_len, _masm);
+
+      __ vmovdqu(Zetas1[0], Address(zetas, i*128 + 64 + 3 * 512), vector_len);
+      montMul64(Scratch1, Coeffs4, Zetas1, Coeffs4, Scratch2);
+      sub_add(Coeffs4, Coeffs3, Coeffs3, Scratch1, vector_len, _masm);
+
+      // level 4 - 8
+      loadXmms(Zetas3, zetas, i*128 + 4 * 512, vector_len, _masm);
+      montMul64(Scratch1, Coeffs2_1, Zetas3, Coeffs2_1, Scratch2);
+      sub_add(Coeffs2_1, Coeffs1_1, Coeffs1_1, Scratch1, vector_len, _masm);
+
+      loadXmms(Zetas3, zetas, i*128 + 64 + 4 * 512, vector_len, _masm);
+      montMul64(Scratch1, Coeffs4_1, Zetas3, Coeffs4_1, Scratch2);
+      sub_add(Coeffs4_1, Coeffs3_1, Coeffs3_1, Scratch1, vector_len, _masm);
+
+      for (int level = 5, distance = 4; level<8; level++, distance /= 2) {
+        // zetas = load(level * 512)
+        // coeffs1_2, scratch1 = shuffle(coeffs1_2, coeffs2_2)
+        // scratch1 = scratch1 * zetas
+        // coeffs2_2 = coeffs1_2 - scratch1
+        // coeffs1_2 = coeffs1_2 + scratch1
+        loadXmms(Zetas3, zetas, i*128 + level * 512, vector_len, _masm);
+        shuffle(Scratch1, Coeffs1_1, Coeffs2_1, distance * 32); //Coeffs2_2 freed
+        montMul64(Scratch1, Scratch1, Zetas3, Coeffs2_1, Scratch2, level==7);
+        sub_add(Coeffs2_1, Coeffs1_1, Coeffs1_1, Scratch1, vector_len, _masm);
+
+        loadXmms(Zetas3, zetas, i*128 + 64 + level * 512, vector_len, _masm);
+        shuffle(Scratch1, Coeffs3_1, Coeffs4_1, distance * 32); //Coeffs4_2 freed
+        montMul64(Scratch1, Scratch1, Zetas3, Coeffs4_1, Scratch2, level==7);
+        sub_add(Coeffs4_1, Coeffs3_1, Coeffs3_1, Scratch1, vector_len, _masm);
+      }
+
+      shuffle(Scratch1, Coeffs1_1, Coeffs2_1, 0);
+      shuffle(Scratch1, Coeffs3_1, Coeffs4_1, 0);
+
+      storeXmms(coeffs,       i*256, Coeffs1_2, vector_len, _masm, 4);
+      storeXmms(coeffs, 128 + i*256, Coeffs2_2, vector_len, _masm, 4);
+    }
   }
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i / 2 + 12), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-
-  montMul64(xmm12_15, xmm12_15, xmm24_27, xmm4_20_24, _masm);
-  sub_add(xmm1357, xmm0246, xmm16_19, xmm12_15, _masm);
-
-  // level 5
-  loadPerm(xmm16_19, perms, nttL5PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttL5PermsIdx + 64, _masm);
-  load4Xmms(xmm24_27, zetas, 5 * 512, _masm);
-
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i/2 + 16), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i / 2 + 12), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-
-  montMul64(xmm12_15, xmm12_15, xmm24_27, xmm4_20_24, _masm);
-  sub_add(xmm1357, xmm0246, xmm16_19, xmm12_15, _masm);
-
-  // level 6
-  loadPerm(xmm16_19, perms, nttL6PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttL6PermsIdx + 64, _masm);
-  load4Xmms(xmm24_27, zetas, 6 * 512, _masm);
-
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i/2 + 16), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i / 2 + 12), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-
-  montMul64(xmm12_15, xmm12_15, xmm24_27, xmm4_20_24, _masm);
-  sub_add(xmm1357, xmm0246, xmm16_19, xmm12_15, _masm);
-
-  // level 7
-  loadPerm(xmm16_19, perms, nttL7PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttL7PermsIdx + 64, _masm);
-  load4Xmms(xmm24_27, zetas, 7 * 512, _masm);
-
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i / 2 + 16), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i / 2 + 12), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-  }
-
-  montMul64(xmm12_15, xmm12_15, xmm24_27, xmm4_20_24, true, _masm);
-  loadPerm(xmm0246, perms, nttL7PermsIdx + 2 * XMMBYTES, _masm);
-  loadPerm(xmm1357, perms, nttL7PermsIdx + 3 * XMMBYTES, _masm);
-  sub_add(xmm21232527, xmm20222426, xmm16_19, xmm12_15, _masm);
-
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i), xmm(i + 20), xmm(i + 21), Assembler::AVX_512bit);
-    __ evpermi2d(xmm(i + 1), xmm(i + 20), xmm(i + 21), Assembler::AVX_512bit);
-  }
-
-  __ cmpl(iterations, 0);
-  __ jcc(Assembler::equal, L_end);
-
-  store4Xmms(coeffs, 0, xmm0_3, _masm);
-  store4Xmms(coeffs, 4 * XMMBYTES, xmm4_7, _masm);
-
-  load4Xmms(xmm0_3, coeffs, 8 * XMMBYTES, _masm);
-  load4Xmms(xmm4_7, coeffs, 12 * XMMBYTES, _masm);
-
-  __ addptr(zetas, 4 * XMMBYTES);
-
-  __ jmp(L_loop);
-
-  __ BIND(L_end);
-
-  store4Xmms(coeffs, 8 * XMMBYTES, xmm0_3, _masm);
-  store4Xmms(coeffs, 12 * XMMBYTES, xmm4_7, _masm);
 
   __ leave(); // required for proper stackwalking of RuntimeStub frame
   __ mov64(rax, 0); // return 0
@@ -459,173 +654,234 @@ static address generate_dilithiumAlmostNtt_avx512(StubGenerator *stubgen,
 // static int implDilithiumAlmostInverseNtt(int[] coeffs, int[] zetas) {}
 //
 // coeffs (int[256]) = c_rarg0
-// zetas (int[256]) = c_rarg1
-static address generate_dilithiumAlmostInverseNtt_avx512(StubGenerator *stubgen,
-                                                         MacroAssembler *_masm) {
-
+// zetas (int[128*8]) = c_rarg1
+static address generate_dilithiumAlmostInverseNtt_avx(StubGenerator *stubgen,
+                                        int vector_len, MacroAssembler *_masm) {
   __ align(CodeEntryAlignment);
   StubId stub_id = StubId::stubgen_dilithiumAlmostInverseNtt_id;
   StubCodeMark mark(stubgen, stub_id);
   address start = __ pc();
   __ enter();
 
-  Label L_loop, L_end;
-
   const Register coeffs = c_rarg0;
   const Register zetas = c_rarg1;
+  const Register scratch = r10;
 
-  const Register iterations = c_rarg2;
+  // AVX2 version uses the first half of these arrays
+  const XMMRegister Coeffs1[] = {xmm0, xmm1, xmm16, xmm17};
+  const XMMRegister Coeffs2[] = {xmm2, xmm3, xmm18, xmm19};
+  const XMMRegister Coeffs3[] = {xmm4, xmm5, xmm20, xmm21};
+  const XMMRegister Coeffs4[] = {xmm6, xmm7, xmm22, xmm23};
+  const XMMRegister Scratch1[] = {xmm8, xmm9, xmm24, xmm25};
+  const XMMRegister Scratch2[] = {xmm10, xmm11, xmm26, xmm27};
+  const XMMRegister Zetas1[] = {xmm12, xmm12, xmm12, xmm12};
+  const XMMRegister Zetas2[] = {xmm12, xmm12, xmm13, xmm13};
+  const XMMRegister Zetas3[] = {xmm12, xmm13, xmm28, xmm29};
+  const XMMRegister montQInvModR = xmm14;
+  const XMMRegister dilithium_q = xmm15;
+  const XMMRegister unshuffle1 = xmm30;
+  const XMMRegister unshuffle2 = xmm31;
+  KRegister mergeMask1 = k1;
+  KRegister mergeMask2 = k2;
+  // lambdas to hide repeated parameters
+  auto shuffle = whole_shuffle(scratch, mergeMask1, mergeMask2, unshuffle1, unshuffle2, vector_len, _masm);
+  auto montMul64 = whole_montMul(montQInvModR, dilithium_q, mergeMask2, vector_len, _masm);
 
-  const Register perms = r11;
-
-  __ lea(perms, ExternalAddress(dilithiumAvx512PermsAddr()));
-
-  __ evmovdqul(montMulPerm, Address(perms, montMulPermsIdx), Assembler::AVX_512bit);
   __ vpbroadcastd(montQInvModR,
                   ExternalAddress(dilithiumAvx512ConstsAddr(montQInvModRIdx)),
-                  Assembler::AVX_512bit, scratch); // q^-1 mod 2^32
+                  vector_len, scratch); // q^-1 mod 2^32
   __ vpbroadcastd(dilithium_q,
                   ExternalAddress(dilithiumAvx512ConstsAddr(dilithium_qIdx)),
-                  Assembler::AVX_512bit, scratch); // q
+                  vector_len, scratch); // q
 
   // Each level represents one iteration of the outer for loop of the
   // Java version.
   // In each of these iterations half of the coefficients are added to and
   // subtracted from the other half of the coefficients then the result of
-  // the substartion is (Montgomery) multiplied by the corresponding zetas.
-  // In each level we just collect the coefficients (using evpermi2d()
-  // instructions where necessary, i.e. on levels 0-4) so that the results of
+  // the subtraction is (Montgomery) multiplied by the corresponding zetas.
+  // In each level we just shuffle the coefficients so that the results of
   // the additions and subtractions go to the vector registers so that they
   // align with each other and the zetas.
 
-  // We do levels 0-6 in two batches, each batch entirely in the vector registers
-  load4Xmms(xmm0_3, coeffs, 0, _masm);
-  load4Xmms(xmm4_7, coeffs, 4 * XMMBYTES, _masm);
+  if (vector_len == Assembler::AVX_512bit) {
+    // levels 4-7, register shuffles:
+    const XMMRegister Coeffs1_1[] = {xmm0, xmm1, xmm2, xmm3};
+    const XMMRegister Coeffs2_1[] = {xmm16, xmm17, xmm18, xmm19};
+    const XMMRegister Coeffs3_1[] = {xmm4, xmm5, xmm6, xmm7};
+    const XMMRegister Coeffs4_1[] = {xmm20, xmm21, xmm22, xmm23};
+    const XMMRegister Coeffs1_2[] = {xmm0, xmm16, xmm2, xmm18};
+    const XMMRegister Coeffs2_2[] = {xmm1, xmm17, xmm3, xmm19};
+    const XMMRegister Coeffs3_2[] = {xmm4, xmm20, xmm6, xmm22};
+    const XMMRegister Coeffs4_2[] = {xmm5, xmm21, xmm7, xmm23};
 
-  __ movl(iterations, 2);
+    // Constants for shuffle and montMul64
+    __ mov64(scratch, 0b1010101010101010);
+    __ kmovwl(mergeMask1, scratch);
+    __ knotwl(mergeMask2, mergeMask1);
+    __ vmovdqu(unshuffle1, ExternalAddress(unshufflePermsAddr(4)), vector_len, scratch);
+    __ vmovdqu(unshuffle2, ExternalAddress(unshufflePermsAddr(5)), vector_len, scratch);
 
-  __ align(OptoLoopAlignment);
-  __ BIND(L_loop);
+    int memStep = 4 * 64;
+    loadXmms(Coeffs1, coeffs, 0*memStep, vector_len, _masm);
+    loadXmms(Coeffs2, coeffs, 1*memStep, vector_len, _masm);
+    loadXmms(Coeffs3, coeffs, 2*memStep, vector_len, _masm);
+    loadXmms(Coeffs4, coeffs, 3*memStep, vector_len, _masm);
 
-  __ subl(iterations, 1);
+    shuffle(Scratch1, Coeffs1_2, Coeffs2_2, 1);
+    shuffle(Scratch1, Coeffs3_2, Coeffs4_2, 1);
 
-  // level 0
-  loadPerm(xmm8_11, perms, nttInvL0PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttInvL0PermsIdx + 64, _masm);
+    // Constants for shuffle(128)
+    __ vmovdqu(unshuffle1, ExternalAddress(unshufflePermsAddr(0)), vector_len, scratch);
+    __ vmovdqu(unshuffle2, ExternalAddress(unshufflePermsAddr(1)), vector_len, scratch);
+    for (int level = 0, distance = 1; level<4; level++, distance *= 2) {
+      // zetas = load(level * 512)
+      // coeffs1_2 = coeffs1_2 + coeffs2_2
+      // scratch1 = coeffs1_2 - coeffs2_2
+      // scratch1 = scratch1 * zetas
+      // coeffs1_2, coeffs2_2 = shuffle(coeffs1_2, scratch1)
+      loadXmms(Zetas3, zetas, level * 512, vector_len, _masm);
+      sub_add(Scratch1, Coeffs1_2, Coeffs1_2, Coeffs2_2, vector_len, _masm); // Coeffs2_2 freed
+      montMul64(Scratch1, Scratch1, Zetas3, Coeffs2_2, Scratch2, level==0);
+      shuffle(Coeffs2_2, Coeffs1_2, Scratch1, distance * 32);
 
-  for (int i = 0; i < 8; i += 2) {
-    __ evpermi2d(xmm(i / 2 + 8), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
-    __ evpermi2d(xmm(i / 2 + 12), xmm(i), xmm(i + 1), Assembler::AVX_512bit);
+      loadXmms(Zetas3, zetas, 4*64 + level * 512, vector_len, _masm);
+      sub_add(Scratch1, Coeffs3_2, Coeffs3_2, Coeffs4_2, vector_len, _masm); // Coeffs4_2 freed
+      montMul64(Scratch1, Scratch1, Zetas3, Coeffs4_2, Scratch2, level==0);
+      shuffle(Coeffs4_2, Coeffs3_2, Scratch1, distance * 32);
+    }
+
+    // level 4
+    loadXmms(Zetas3, zetas, 4 * 512, vector_len, _masm);
+    sub_add(Scratch1, Coeffs1_2, Coeffs1_2, Coeffs2_2, vector_len, _masm); // Coeffs2_2 freed
+    montMul64(Coeffs2_2, Scratch1, Zetas3, Scratch1, Scratch2);
+
+    loadXmms(Zetas3, zetas, 4*64 + 4 * 512, vector_len, _masm);
+    sub_add(Scratch1, Coeffs3_2, Coeffs3_2, Coeffs4_2, vector_len, _masm); // Coeffs4_2 freed
+    montMul64(Coeffs4_2, Scratch1, Zetas3, Scratch1, Scratch2);
+
+    // level 5
+    __ vmovdqu(Zetas2[0], Address(zetas,        5 * 512), vector_len);
+    __ vmovdqu(Zetas2[2], Address(zetas, 2*64 + 5 * 512), vector_len);
+    sub_add(Scratch1, Coeffs1_1, Coeffs1_1, Coeffs2_1, vector_len, _masm); // Coeffs2_1 freed
+    montMul64(Coeffs2_1, Scratch1, Zetas2, Scratch1, Scratch2);
+
+    __ vmovdqu(Zetas2[0], Address(zetas, 4*64 + 5 * 512), vector_len);
+    __ vmovdqu(Zetas2[2], Address(zetas, 6*64 + 5 * 512), vector_len);
+    sub_add(Scratch1, Coeffs3_1, Coeffs3_1, Coeffs4_1, vector_len, _masm); // Coeffs4_1 freed
+    montMul64(Coeffs4_1, Scratch1, Zetas2, Scratch1, Scratch2);
+
+    // level 6
+    __ vmovdqu(Zetas1[0], Address(zetas,        6 * 512), vector_len);
+    sub_add(Scratch1, Coeffs1, Coeffs1, Coeffs2, vector_len, _masm); // Coeffs2 freed
+    montMul64(Coeffs2, Scratch1, Zetas1, Scratch1, Scratch2);
+
+    __ vmovdqu(Zetas1[0], Address(zetas, 4*64 + 6 * 512), vector_len);
+    sub_add(Scratch1, Coeffs3, Coeffs3, Coeffs4, vector_len, _masm); // Coeffs4 freed
+    montMul64(Coeffs4, Scratch1, Zetas1, Scratch1, Scratch2);
+
+    // level 7
+    __ vmovdqu(Zetas1[0], Address(zetas, 7 * 512), vector_len);
+    sub_add(Scratch1, Coeffs1, Coeffs1, Coeffs3, vector_len, _masm); // Coeffs3 freed
+    montMul64(Coeffs3, Scratch1, Zetas1, Scratch1, Scratch2);
+    sub_add(Scratch1, Coeffs2, Coeffs2, Coeffs4, vector_len, _masm); // Coeffs4 freed
+    montMul64(Coeffs4, Scratch1, Zetas1, Scratch1, Scratch2);
+
+    storeXmms(coeffs, 0*memStep, Coeffs1, vector_len, _masm);
+    storeXmms(coeffs, 1*memStep, Coeffs2, vector_len, _masm);
+    storeXmms(coeffs, 2*memStep, Coeffs3, vector_len, _masm);
+    storeXmms(coeffs, 3*memStep, Coeffs4, vector_len, _masm);
+  } else { // Assembler::AVX_256bit
+    // Permutations of Coeffs1, Coeffs2, Coeffs3 and Coeffs4
+    const XMMRegister Coeffs1_1[] = {xmm0, xmm2};
+    const XMMRegister Coeffs2_1[] = {xmm1, xmm3};
+    const XMMRegister Coeffs3_1[] = {xmm4, xmm6};
+    const XMMRegister Coeffs4_1[] = {xmm5, xmm7};
+
+    const XMMRegister Coeffs1_2[] = {xmm0, xmm1, xmm2, xmm3};
+    const XMMRegister Coeffs2_2[] = {xmm4, xmm5, xmm6, xmm7};
+
+    // Four batches of 8 registers, consecutive loads
+    for (int i=0; i<4; i++) {
+      loadXmms(Coeffs1_2, coeffs,       i*256, vector_len, _masm, 4);
+      loadXmms(Coeffs2_2, coeffs, 128 + i*256, vector_len, _masm, 4);
+
+      shuffle(Scratch1, Coeffs1_1, Coeffs2_1, 1);
+      shuffle(Scratch1, Coeffs3_1, Coeffs4_1, 1);
+
+      for (int level = 0, distance = 1; level <= 2; level++, distance *= 2) {
+        // zetas = load(level * 512)
+        // coeffs1_2 = coeffs1_2 + coeffs2_2
+        // scratch1 = coeffs1_2 - coeffs2_2
+        // scratch1 = scratch1 * zetas
+        // coeffs1_2, coeffs2_2 = shuffle(coeffs1_2, scratch1)
+        loadXmms(Zetas3, zetas, i*128 + level * 512, vector_len, _masm);
+        sub_add(Scratch1, Coeffs1_1, Coeffs1_1, Coeffs2_1, vector_len, _masm); // Coeffs2_1 freed
+        montMul64(Scratch1, Scratch1, Zetas3, Coeffs2_1, Scratch2, level==0);
+        shuffle(Coeffs2_1, Coeffs1_1, Scratch1, distance * 32);
+
+        loadXmms(Zetas3, zetas, i*128 + 64 + level * 512, vector_len, _masm);
+        sub_add(Scratch1, Coeffs3_1, Coeffs3_1, Coeffs4_1, vector_len, _masm); // Coeffs4_1 freed
+        montMul64(Scratch1, Scratch1, Zetas3, Coeffs4_1, Scratch2, level==0);
+        shuffle(Coeffs4_1, Coeffs3_1, Scratch1, distance * 32);
+      }
+
+      // level 3
+      loadXmms(Zetas3, zetas, i*128 + 3 * 512, vector_len, _masm);
+      sub_add(Scratch1, Coeffs1_1, Coeffs1_1, Coeffs2_1, vector_len, _masm); // Coeffs2_1 freed
+      montMul64(Coeffs2_1, Scratch1, Zetas3, Scratch1, Scratch2);
+
+      loadXmms(Zetas3, zetas, i*128 + 64 + 3 * 512, vector_len, _masm);
+      sub_add(Scratch1, Coeffs3_1, Coeffs3_1, Coeffs4_1, vector_len, _masm); // Coeffs4_1 freed
+      montMul64(Coeffs4_1, Scratch1, Zetas3, Scratch1, Scratch2);
+
+      // level 4
+      __ vmovdqu(Zetas1[0], Address(zetas, i*128 + 4 * 512), vector_len);
+      sub_add(Scratch1, Coeffs1, Coeffs1, Coeffs2, vector_len, _masm); // Coeffs2 freed
+      montMul64(Coeffs2, Scratch1, Zetas1, Scratch1, Scratch2);
+
+      __ vmovdqu(Zetas1[0], Address(zetas, i*128 + 64 + 4 * 512), vector_len);
+      sub_add(Scratch1, Coeffs3, Coeffs3, Coeffs4, vector_len, _masm); // Coeffs4 freed
+      montMul64(Coeffs4, Scratch1, Zetas1, Scratch1, Scratch2);
+
+      storeXmms(coeffs,       i*256, Coeffs1_2, vector_len, _masm, 4);
+      storeXmms(coeffs, 128 + i*256, Coeffs2_2, vector_len, _masm, 4);
+    }
+
+    // Four batches of 8 registers each, 128 bytes apart
+    for (int i=0; i<4; i++) {
+      loadXmms(Coeffs1_2, coeffs, i*32 + 0*128, vector_len, _masm, 4, 128);
+      loadXmms(Coeffs2_2, coeffs, i*32 + 4*128, vector_len, _masm, 4, 128);
+
+      // level 5
+      loadXmms(Zetas3, zetas, 5 * 512, vector_len, _masm, 2, 128);
+      sub_add(Scratch1, Coeffs1_1, Coeffs1_1, Coeffs2_1, vector_len, _masm); // Coeffs2_1 freed
+      montMul64(Coeffs2_1, Scratch1, Zetas3, Scratch1, Scratch2);
+
+      loadXmms(Zetas3, zetas, 4*64 + 5 * 512, vector_len, _masm, 2, 128);
+      sub_add(Scratch1, Coeffs3_1, Coeffs3_1, Coeffs4_1, vector_len, _masm); // Coeffs4_1 freed
+      montMul64(Coeffs4_1, Scratch1, Zetas3, Scratch1, Scratch2);
+
+      // level 6
+      __ vmovdqu(Zetas1[0], Address(zetas,        6 * 512), vector_len);
+      sub_add(Scratch1, Coeffs1, Coeffs1, Coeffs2, vector_len, _masm); // Coeffs2 freed
+      montMul64(Coeffs2, Scratch1, Zetas1, Scratch1, Scratch2);
+
+      __ vmovdqu(Zetas1[0], Address(zetas, 4*64 + 6 * 512), vector_len);
+      sub_add(Scratch1, Coeffs3, Coeffs3, Coeffs4, vector_len, _masm); // Coeffs4 freed
+      montMul64(Coeffs4, Scratch1, Zetas1, Scratch1, Scratch2);
+
+      // level 7
+      __ vmovdqu(Zetas1[0], Address(zetas, 7 * 512), vector_len);
+      sub_add(Scratch1, Coeffs1, Coeffs1, Coeffs3, vector_len, _masm); // Coeffs3 freed
+      montMul64(Coeffs3, Scratch1, Zetas1, Scratch1, Scratch2);
+      sub_add(Scratch1, Coeffs2, Coeffs2, Coeffs4, vector_len, _masm); // Coeffs4 freed
+      montMul64(Coeffs4, Scratch1, Zetas1, Scratch1, Scratch2);
+
+      storeXmms(coeffs, i*32 + 0*128, Coeffs1_2, vector_len, _masm, 4, 128);
+      storeXmms(coeffs, i*32 + 4*128, Coeffs2_2, vector_len, _masm, 4, 128);
+    }
   }
 
-  load4Xmms(xmm4_7, zetas, 0, _masm);
-  sub_add(xmm24_27, xmm0_3, xmm8_11, xmm12_15, _masm);
-  montMul64(xmm4_7, xmm4_7, xmm24_27, xmm16_27, true, _masm);
-
-  // level 1
-  loadPerm(xmm8_11, perms, nttInvL1PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttInvL1PermsIdx + 64, _masm);
-
-  for (int i = 0; i < 4; i++) {
-    __ evpermi2d(xmm(i + 8), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-    __ evpermi2d(xmm(i + 12), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-  }
-
-  load4Xmms(xmm4_7, zetas, 512, _masm);
-  sub_add(xmm24_27, xmm0_3, xmm8_11, xmm12_15, _masm);
-  montMul64(xmm4_7, xmm24_27, xmm4_7, xmm16_27, _masm);
-
-  // level 2
-  loadPerm(xmm8_11, perms, nttInvL2PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttInvL2PermsIdx + 64, _masm);
-
-  for (int i = 0; i < 4; i++) {
-    __ evpermi2d(xmm(i + 8), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-    __ evpermi2d(xmm(i + 12), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-  }
-
-  load4Xmms(xmm4_7, zetas, 2 * 512, _masm);
-  sub_add(xmm24_27, xmm0_3, xmm8_11, xmm12_15, _masm);
-  montMul64(xmm4_7, xmm24_27, xmm4_7, xmm16_27, _masm);
-
-  // level 3
-  loadPerm(xmm8_11, perms, nttInvL3PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttInvL3PermsIdx + 64, _masm);
-
-  for (int i = 0; i < 4; i++) {
-    __ evpermi2d(xmm(i + 8), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-    __ evpermi2d(xmm(i + 12), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-  }
-
-  load4Xmms(xmm4_7, zetas, 3 * 512, _masm);
-  sub_add(xmm24_27, xmm0_3, xmm8_11, xmm12_15, _masm);
-  montMul64(xmm4_7, xmm24_27, xmm4_7, xmm16_27, _masm);
-
-  // level 4
-  loadPerm(xmm8_11, perms, nttInvL4PermsIdx, _masm);
-  loadPerm(xmm12_15, perms, nttInvL4PermsIdx + 64, _masm);
-
-  for (int i = 0; i < 4; i++) {
-    __ evpermi2d(xmm(i + 8), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-    __ evpermi2d(xmm(i + 12), xmm(i), xmm(i + 4), Assembler::AVX_512bit);
-  }
-
-  load4Xmms(xmm4_7, zetas, 4 * 512, _masm);
-  sub_add(xmm24_27, xmm0_3, xmm8_11, xmm12_15, _masm);
-  montMul64(xmm4_7, xmm24_27, xmm4_7, xmm16_27, _masm);
-
-  // level 5
-  load4Xmms(xmm12_15, zetas, 5 * 512, _masm);
-  sub_add(xmm8_11, xmm0_3, xmm0426, xmm1537, _masm);
-  montMul64(xmm4_7, xmm8_11, xmm12_15, xmm16_27, _masm);
-
-  // level 6
-  load4Xmms(xmm12_15, zetas, 6 * 512, _masm);
-  sub_add(xmm8_11, xmm0_3, xmm0145, xmm2367, _masm);
-  montMul64(xmm4_7, xmm8_11, xmm12_15, xmm16_27, _masm);
-
-  __ cmpl(iterations, 0);
-  __ jcc(Assembler::equal, L_end);
-
-  // save the coefficients of the first batch, adjust the zetas
-  // and load the second batch of coefficients
-  store4Xmms(coeffs, 0, xmm0_3, _masm);
-  store4Xmms(coeffs, 4 * XMMBYTES, xmm4_7, _masm);
-
-  __ addptr(zetas, 4 * XMMBYTES);
-
-  load4Xmms(xmm0_3, coeffs, 8 * XMMBYTES, _masm);
-  load4Xmms(xmm4_7, coeffs, 12 * XMMBYTES, _masm);
-
-  __ jmp(L_loop);
-
-  __ BIND(L_end);
-
-  // load the coeffs of the first batch of coefficients that were saved after
-  // level 6 into Zmm_8-Zmm_15 and do the last level entirely in the vector
-  // registers
-  load4Xmms(xmm8_11, coeffs, 0, _masm);
-  load4Xmms(xmm12_15, coeffs, 4 * XMMBYTES, _masm);
-
-  // level 7
-
-  loadXmm29(zetas, 7 * 512, _masm);
-
-  for (int i = 0; i < 8; i++) {
-    __ evpaddd(xmm(i + 16), k0, xmm(i), xmm(i + 8), false, Assembler::AVX_512bit);
-  }
-
-  for (int i = 0; i < 8; i++) {
-    __ evpsubd(xmm(i), k0, xmm(i + 8), xmm(i), false, Assembler::AVX_512bit);
-  }
-
-  store4Xmms(coeffs, 0, xmm16_19, _masm);
-  store4Xmms(coeffs, 4 * XMMBYTES, xmm20_23, _masm);
-  montMul64(xmm0_3, xmm0_3, xmm29_29, xmm16_27, _masm);
-  montMul64(xmm4_7, xmm4_7, xmm29_29, xmm16_27, _masm);
-  store4Xmms(coeffs, 8 * XMMBYTES, xmm0_3, _masm);
-  store4Xmms(coeffs, 12 * XMMBYTES, xmm4_7, _masm);
-
   __ leave(); // required for proper stackwalking of RuntimeStub frame
   __ mov64(rax, 0); // return 0
   __ ret(0);
@@ -641,8 +897,8 @@ static address generate_dilithiumAlmostInverseNtt_avx512(StubGenerator *stubgen,
 // result (int[256]) = c_rarg0
 // poly1 (int[256]) = c_rarg1
 // poly2 (int[256]) = c_rarg2
-static address generate_dilithiumNttMult_avx512(StubGenerator *stubgen,
-                                                MacroAssembler *_masm) {
+static address generate_dilithiumNttMult_avx(StubGenerator *stubgen,
+                                     int vector_len, MacroAssembler *_masm) {
 
   __ align(CodeEntryAlignment);
   StubId stub_id = StubId::stubgen_dilithiumNttMult_id;
@@ -655,40 +911,60 @@ static address generate_dilithiumNttMult_avx512(StubGenerator *stubgen,
   const Register result = c_rarg0;
   const Register poly1 = c_rarg1;
   const Register poly2 = c_rarg2;
-
-  const Register perms = r10; // scratch reused after not needed any more
+  const Register scratch = r10;
   const Register len = r11;
 
-  const XMMRegister montRSquareModQ = xmm29;
+  const XMMRegister montQInvModR = xmm8;
+  const XMMRegister dilithium_q = xmm9;
+
+  const XMMRegister Poly1[] = {xmm0, xmm1, xmm16, xmm17};
+  const XMMRegister Poly2[] = {xmm2, xmm3, xmm18, xmm19};
+  const XMMRegister Scratch1[] = {xmm4, xmm5, xmm20, xmm21};
+  const XMMRegister Scratch2[] = {xmm6, xmm7, xmm22, xmm23};
+  const XMMRegister MontRSquareModQ[] = {xmm10, xmm10, xmm10, xmm10};
+  KRegister mergeMask = k1;
+  // lambda to hide repeated parameters
+  auto montMul64 = whole_montMul(montQInvModR, dilithium_q, mergeMask, vector_len, _masm);
 
   __ vpbroadcastd(montQInvModR,
                   ExternalAddress(dilithiumAvx512ConstsAddr(montQInvModRIdx)),
-                  Assembler::AVX_512bit, scratch); // q^-1 mod 2^32
+                  vector_len, scratch); // q^-1 mod 2^32
   __ vpbroadcastd(dilithium_q,
                   ExternalAddress(dilithiumAvx512ConstsAddr(dilithium_qIdx)),
-                  Assembler::AVX_512bit, scratch); // q
-  __ vpbroadcastd(montRSquareModQ,
+                  vector_len, scratch); // q
+  __ vpbroadcastd(MontRSquareModQ[0],
                   ExternalAddress(dilithiumAvx512ConstsAddr(montRSquareModQIdx)),
-                  Assembler::AVX_512bit, scratch); // 2^64 mod q
+                  vector_len, scratch); // 2^64 mod q
+  if (vector_len == Assembler::AVX_512bit) {
+    __ mov64(scratch, 0b0101010101010101);
+    __ kmovwl(mergeMask, scratch);
+  }
 
-  __ lea(perms, ExternalAddress(dilithiumAvx512PermsAddr()));
-  __ evmovdqul(montMulPerm, Address(perms, montMulPermsIdx), Assembler::AVX_512bit);
+  // Total payload is 256*int32s.
+  // - memStep is number of bytes one iteration processes.
+  // - loopCnt is number of iterations it will take to process entire payload.
+  int loopCnt = 4;
+  int memStep = 4 * 64;
+  if (vector_len == Assembler::AVX_256bit) {
+    loopCnt = 16;
+    memStep = 2 * 32;
+  }
 
-  __ movl(len, 4);
+  __ movl(len, loopCnt);
 
   __ align(OptoLoopAlignment);
   __ BIND(L_loop);
 
-  load4Xmms(xmm4_7, poly2, 0, _masm);
-  load4Xmms(xmm0_3, poly1, 0, _masm);
-  montMul64(xmm4_7, xmm4_7, xmm29_29, xmm16_27, _masm);
-  montMul64(xmm0_3, xmm0_3, xmm4_7, xmm16_27, true, _masm);
-  store4Xmms(result, 0, xmm0_3, _masm);
+  loadXmms(Poly2, poly2, 0, vector_len, _masm);
+  loadXmms(Poly1, poly1, 0, vector_len, _masm);
+  montMul64(Poly2, Poly2, MontRSquareModQ, Scratch1, Scratch2);
+  montMul64(Poly1, Poly1, Poly2,           Scratch1, Scratch2, true);
+  storeXmms(result, 0, Poly1, vector_len, _masm);
 
   __ subl(len, 1);
-  __ addptr(poly1, 4 * XMMBYTES);
-  __ addptr(poly2, 4 * XMMBYTES);
-  __ addptr(result, 4 * XMMBYTES);
+  __ addptr(poly1, memStep);
+  __ addptr(poly2, memStep);
+  __ addptr(result, memStep);
   __ cmpl(len, 0);
   __ jcc(Assembler::notEqual, L_loop);
 
@@ -705,8 +981,8 @@ static address generate_dilithiumNttMult_avx512(StubGenerator *stubgen,
 //
 // coeffs (int[256]) = c_rarg0
 // constant (int) = c_rarg1
-static address generate_dilithiumMontMulByConstant_avx512(StubGenerator *stubgen,
-                                                          MacroAssembler *_masm) {
+static address generate_dilithiumMontMulByConstant_avx(StubGenerator *stubgen,
+                                        int vector_len, MacroAssembler *_masm) {
 
   __ align(CodeEntryAlignment);
   StubId stub_id = StubId::stubgen_dilithiumMontMulByConstant_id;
@@ -718,38 +994,64 @@ static address generate_dilithiumMontMulByConstant_avx512(StubGenerator *stubgen
 
   const Register coeffs = c_rarg0;
   const Register rConstant = c_rarg1;
-
-  const Register perms = c_rarg2; // not used for argument
+  const Register scratch = r10;
   const Register len = r11;
 
-  const XMMRegister constant = xmm29;
+  const XMMRegister montQInvModR = xmm8;
+  const XMMRegister dilithium_q = xmm9;
 
-  __ lea(perms, ExternalAddress(dilithiumAvx512PermsAddr()));
+  const XMMRegister Coeffs1[] = {xmm0, xmm1, xmm16, xmm17};
+  const XMMRegister Coeffs2[] = {xmm2, xmm3, xmm18, xmm19};
+  const XMMRegister Scratch1[] = {xmm4, xmm5, xmm20, xmm21};
+  const XMMRegister Scratch2[] = {xmm6, xmm7, xmm22, xmm23};
+  const XMMRegister Constant[] = {xmm10, xmm10, xmm10, xmm10};
+  XMMRegister constant = Constant[0];
+  KRegister mergeMask = k1;
+  // lambda to hide repeated parameters
+  auto montMul64 = whole_montMul(montQInvModR, dilithium_q, mergeMask, vector_len, _masm);
 
-  // the following four vector registers are used in montMul64
+  // load constants for montMul64
   __ vpbroadcastd(montQInvModR,
                   ExternalAddress(dilithiumAvx512ConstsAddr(montQInvModRIdx)),
-                  Assembler::AVX_512bit, scratch); // q^-1 mod 2^32
+                  vector_len, scratch); // q^-1 mod 2^32
   __ vpbroadcastd(dilithium_q,
                   ExternalAddress(dilithiumAvx512ConstsAddr(dilithium_qIdx)),
-                  Assembler::AVX_512bit, scratch); // q
-  __ evmovdqul(montMulPerm, Address(perms, montMulPermsIdx), Assembler::AVX_512bit);
-  __ evpbroadcastd(constant, rConstant, Assembler::AVX_512bit); // constant multiplier
+                  vector_len, scratch); // q
+  if (vector_len == Assembler::AVX_256bit) {
+    __ movdl(constant, rConstant);
+    __ vpbroadcastd(constant, constant, vector_len); // constant multiplier
+  } else {
+    __ evpbroadcastd(constant, rConstant, Assembler::AVX_512bit); // constant multiplier
 
-  __ movl(len, 2);
+    __ mov64(scratch, 0b0101010101010101); //dw-mask
+    __ kmovwl(mergeMask, scratch);
+  }
+
+  // Total payload is 256*int32s.
+  // - memStep is number of bytes one montMul64 processes.
+  // - loopCnt is number of iterations it will take to process entire payload.
+  // - (two memSteps per loop)
+  int memStep = 4 * 64;
+  int loopCnt = 2;
+  if (vector_len == Assembler::AVX_256bit) {
+    memStep = 2 * 32;
+    loopCnt = 8;
+  }
+
+  __ movl(len, loopCnt);
 
   __ align(OptoLoopAlignment);
   __ BIND(L_loop);
 
-  load4Xmms(xmm0_3, coeffs, 0, _masm);
-  load4Xmms(xmm4_7, coeffs, 4 * XMMBYTES, _masm);
-  montMul64(xmm0_3, xmm0_3, xmm29_29, xmm16_27, _masm);
-  montMul64(xmm4_7, xmm4_7, xmm29_29, xmm16_27, _masm);
-  store4Xmms(coeffs, 0, xmm0_3, _masm);
-  store4Xmms(coeffs, 4 * XMMBYTES, xmm4_7, _masm);
+  loadXmms(Coeffs1, coeffs, 0,       vector_len, _masm);
+  loadXmms(Coeffs2, coeffs, memStep, vector_len, _masm);
+  montMul64(Coeffs1, Coeffs1, Constant, Scratch1, Scratch2);
+  montMul64(Coeffs2, Coeffs2, Constant, Scratch1, Scratch2);
+  storeXmms(coeffs, 0,       Coeffs1, vector_len, _masm);
+  storeXmms(coeffs, memStep, Coeffs2, vector_len, _masm);
 
   __ subl(len, 1);
-  __ addptr(coeffs, 512);
+  __ addptr(coeffs, 2 * memStep);
   __ cmpl(len, 0);
   __ jcc(Assembler::notEqual, L_loop);
 
@@ -769,9 +1071,8 @@ static address generate_dilithiumMontMulByConstant_avx512(StubGenerator *stubgen
 // highPart (int[256]) = c_rarg2
 // twoGamma2  (int) = c_rarg3
 // multiplier (int) = c_rarg4
-static address generate_dilithiumDecomposePoly_avx512(StubGenerator *stubgen,
-                                                      MacroAssembler *_masm) {
-
+static address generate_dilithiumDecomposePoly_avx(StubGenerator *stubgen,
+                                      int vector_len, MacroAssembler *_masm) {
   __ align(CodeEntryAlignment);
   StubId stub_id = StubId::stubgen_dilithiumDecomposePoly_id;
   StubCodeMark mark(stubgen, stub_id);
@@ -785,26 +1086,45 @@ static address generate_dilithiumDecomposePoly_avx512(StubGenerator *stubgen,
   const Register highPart = c_rarg2;
   const Register rTwoGamma2 = c_rarg3;
 
+  const Register scratch = r10;
   const Register len = r11;
-  const XMMRegister zero = xmm24;
-  const XMMRegister one = xmm25;
-  const XMMRegister qMinus1 = xmm26;
-  const XMMRegister gamma2 = xmm27;
-  const XMMRegister twoGamma2 = xmm28;
-  const XMMRegister barrettMultiplier = xmm29;
-  const XMMRegister barrettAddend = xmm30;
 
-  __ vpxor(zero, zero, zero, Assembler::AVX_512bit); // 0
-  __ vpternlogd(xmm0, 0xff, xmm0, xmm0, Assembler::AVX_512bit); // -1
-  __ vpsubd(one, zero, xmm0, Assembler::AVX_512bit); // 1
+  const XMMRegister one = xmm0;
+  const XMMRegister gamma2 = xmm1;
+  const XMMRegister twoGamma2 = xmm2;
+  const XMMRegister barrettMultiplier = xmm3;
+  const XMMRegister barrettAddend = xmm4;
+  const XMMRegister dilithium_q = xmm5;
+  const XMMRegister zero = xmm29;     // AVX512-only
+  const XMMRegister minusOne = xmm30; // AVX512-only
+  const XMMRegister qMinus1 = xmm31;  // AVX512-only
+
+  XMMRegister RPlus[] = {xmm6, xmm7, xmm16, xmm17};
+  XMMRegister Quotient[] = {xmm8, xmm9, xmm18, xmm19};
+  XMMRegister R0[] = {xmm10, xmm11, xmm20, xmm21};
+  XMMRegister Mask[] = {xmm12, xmm13, xmm22, xmm23};
+  XMMRegister Tmp1[] = {xmm14, xmm15, xmm24, xmm25};
+
   __ vpbroadcastd(dilithium_q,
                   ExternalAddress(dilithiumAvx512ConstsAddr(dilithium_qIdx)),
-                  Assembler::AVX_512bit, scratch); // q
+                  vector_len, scratch); // q
   __ vpbroadcastd(barrettAddend,
                   ExternalAddress(dilithiumAvx512ConstsAddr(barrettAddendIdx)),
-                  Assembler::AVX_512bit, scratch); // addend for Barrett reduction
+                  vector_len, scratch); // addend for Barrett reduction
+  if (vector_len == Assembler::AVX_512bit) {
+    __ vpxor(zero, zero, zero, vector_len); // 0
+    __ vpternlogd(minusOne, 0xff, minusOne, minusOne, vector_len); // -1
+    __ vpsrld(one, minusOne, 31, vector_len);
+    __ vpsubd(qMinus1, dilithium_q, one, vector_len); // q - 1
+    __ evpbroadcastd(twoGamma2, rTwoGamma2, vector_len); // 2 * gamma2
+  } else {
+    __ vpcmpeqd(one, one, one, vector_len);
+    __ vpsrld(one, one, 31, vector_len);
+    __ movdl(twoGamma2, rTwoGamma2);
+    __ vpbroadcastd(twoGamma2, twoGamma2, vector_len); // 2 * gamma2
+  }
 
-  __ evpbroadcastd(twoGamma2, rTwoGamma2, Assembler::AVX_512bit); // 2 * gamma2
+  __ vpsrad(gamma2, twoGamma2, 1, vector_len); // gamma2
 
   #ifndef _WIN64
     const Register rMultiplier = c_rarg4;
@@ -813,201 +1133,185 @@ static address generate_dilithiumDecomposePoly_avx512(StubGenerator *stubgen,
     const Register rMultiplier = c_rarg3; // arg3 is already consumed, reused here
     __ movptr(rMultiplier, multiplier_mem);
   #endif
-  __ evpbroadcastd(barrettMultiplier, rMultiplier,
-                   Assembler::AVX_512bit); // multiplier for mod 2 * gamma2 reduce
+  if (vector_len == Assembler::AVX_512bit) {
+    __ evpbroadcastd(barrettMultiplier, rMultiplier,
+                  vector_len); // multiplier for mod 2 * gamma2 reduce
+  } else {
+    __ movdl(barrettMultiplier, rMultiplier);
+    __ vpbroadcastd(barrettMultiplier, barrettMultiplier, vector_len);
+  }
 
-  __ evpsubd(qMinus1, k0, dilithium_q, one, false, Assembler::AVX_512bit); // q - 1
-  __ evpsrad(gamma2, k0, twoGamma2, 1, false, Assembler::AVX_512bit); // gamma2
+  // Total payload is 1024 bytes
+  int memStep = 4 * 64; // Number of bytes per loop iteration
+  int regCnt = 4; // Register array length
+  if (vector_len == Assembler::AVX_256bit) {
+    memStep = 2 * 32;
+    regCnt = 2;
+  }
 
   __ movl(len, 1024);
 
   __ align(OptoLoopAlignment);
   __ BIND(L_loop);
 
-  load4Xmms(xmm0_3, input, 0, _masm);
+  loadXmms(RPlus, input, 0, vector_len, _masm);
 
-  __ addptr(input, 4 * XMMBYTES);
+  __ addptr(input, memStep);
 
-  // rplus in xmm0
   // rplus = rplus - ((rplus + 5373807) >> 23) * dilithium_q;
-  __ evpaddd(xmm4, k0, xmm0, barrettAddend, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm5, k0, xmm1, barrettAddend, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm6, k0, xmm2, barrettAddend, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm7, k0, xmm3, barrettAddend, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpaddd(Tmp1[i], RPlus[i], barrettAddend, vector_len);
+  }
 
-  __ evpsrad(xmm4, k0, xmm4, 23, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm5, k0, xmm5, 23, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm6, k0, xmm6, 23, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm7, k0, xmm7, 23, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsrad(Tmp1[i], Tmp1[i], 23, vector_len);
+  }
 
-  __ evpmulld(xmm4, k0, xmm4, dilithium_q, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm5, k0, xmm5, dilithium_q, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm6, k0, xmm6, dilithium_q, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm7, k0, xmm7, dilithium_q, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpmulld(Tmp1[i], Tmp1[i], dilithium_q, vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(RPlus[i], RPlus[i], Tmp1[i], vector_len);
+  }
 
-  __ evpsubd(xmm0, k0, xmm0, xmm4, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm1, k0, xmm1, xmm5, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm2, k0, xmm2, xmm6, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm3, k0, xmm3, xmm7, false, Assembler::AVX_512bit);
-  // rplus in xmm0
   // rplus = rplus + ((rplus >> 31) & dilithium_q);
-  __ evpsrad(xmm4, k0, xmm0, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm5, k0, xmm1, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm6, k0, xmm2, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm7, k0, xmm3, 31, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsrad(Tmp1[i], RPlus[i], 31, vector_len);
+  }
 
-  __ evpandd(xmm4, k0, xmm4, dilithium_q, false, Assembler::AVX_512bit);
-  __ evpandd(xmm5, k0, xmm5, dilithium_q, false, Assembler::AVX_512bit);
-  __ evpandd(xmm6, k0, xmm6, dilithium_q, false, Assembler::AVX_512bit);
-  __ evpandd(xmm7, k0, xmm7, dilithium_q, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpand(Tmp1[i], Tmp1[i], dilithium_q, vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpaddd(RPlus[i], RPlus[i], Tmp1[i], vector_len);
+  }
 
-  __ evpaddd(xmm0, k0, xmm0, xmm4, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm1, k0, xmm1, xmm5, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm2, k0, xmm2, xmm6, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm3, k0, xmm3, xmm7, false, Assembler::AVX_512bit);
-  // rplus in xmm0
   // int quotient = (rplus * barrettMultiplier) >> 22;
-  __ evpmulld(xmm4, k0, xmm0, barrettMultiplier, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm5, k0, xmm1, barrettMultiplier, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm6, k0, xmm2, barrettMultiplier, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm7, k0, xmm3, barrettMultiplier, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpmulld(Quotient[i], RPlus[i], barrettMultiplier, vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsrad(Quotient[i], Quotient[i], 22, vector_len);
+  }
 
-  __ evpsrad(xmm4, k0, xmm4, 22, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm5, k0, xmm5, 22, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm6, k0, xmm6, 22, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm7, k0, xmm7, 22, false, Assembler::AVX_512bit);
-  // quotient in xmm4
   // int r0 = rplus - quotient * twoGamma2;
-  __ evpmulld(xmm8, k0, xmm4, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm9, k0, xmm5, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm10, k0, xmm6, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpmulld(xmm11, k0, xmm7, twoGamma2, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpmulld(R0[i], Quotient[i], twoGamma2, vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(R0[i], RPlus[i], R0[i], vector_len);
+  }
 
-  __ evpsubd(xmm8, k0, xmm0, xmm8, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm9, k0, xmm1, xmm9, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm10, k0, xmm2, xmm10, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm11, k0, xmm3, xmm11, false, Assembler::AVX_512bit);
-  // r0 in xmm8
   // int mask = (twoGamma2 - r0) >> 22;
-  __ evpsubd(xmm12, k0, twoGamma2, xmm8, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm13, k0, twoGamma2, xmm9, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm14, k0, twoGamma2, xmm10, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm15, k0, twoGamma2, xmm11, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(Mask[i], twoGamma2, R0[i], vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsrad(Mask[i], Mask[i], 22, vector_len);
+  }
 
-  __ evpsrad(xmm12, k0, xmm12, 22, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm13, k0, xmm13, 22, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm14, k0, xmm14, 22, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm15, k0, xmm15, 22, false, Assembler::AVX_512bit);
-  // mask in xmm12
   // r0 -= (mask & twoGamma2);
-  __ evpandd(xmm16, k0, xmm12, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm17, k0, xmm13, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm18, k0, xmm14, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm19, k0, xmm15, twoGamma2, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpand(Tmp1[i], Mask[i], twoGamma2, vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(R0[i], R0[i], Tmp1[i], vector_len);
+  }
 
-  __ evpsubd(xmm8, k0, xmm8, xmm16, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm9, k0, xmm9, xmm17, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm10, k0, xmm10, xmm18, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm11, k0, xmm11, xmm19, false, Assembler::AVX_512bit);
-  // r0 in xmm8
   // quotient += (mask & 1);
-  __ evpandd(xmm16, k0, xmm12, one, false, Assembler::AVX_512bit);
-  __ evpandd(xmm17, k0, xmm13, one, false, Assembler::AVX_512bit);
-  __ evpandd(xmm18, k0, xmm14, one, false, Assembler::AVX_512bit);
-  __ evpandd(xmm19, k0, xmm15, one, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpand(Tmp1[i], Mask[i], one, vector_len);
+  }
 
-  __ evpaddd(xmm4, k0, xmm4, xmm16, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm5, k0, xmm5, xmm17, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm6, k0, xmm6, xmm18, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm7, k0, xmm7, xmm19, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpaddd(Quotient[i], Quotient[i], Tmp1[i], vector_len);
+  }
 
   // mask = (twoGamma2 / 2 - r0) >> 31;
-  __ evpsubd(xmm12, k0, gamma2, xmm8, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm13, k0, gamma2, xmm9, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm14, k0, gamma2, xmm10, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm15, k0, gamma2, xmm11, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(Mask[i], gamma2, R0[i], vector_len);
+  }
 
-  __ evpsrad(xmm12, k0, xmm12, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm13, k0, xmm13, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm14, k0, xmm14, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm15, k0, xmm15, 31, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsrad(Mask[i], Mask[i], 31, vector_len);
+  }
 
   // r0 -= (mask & twoGamma2);
-  __ evpandd(xmm16, k0, xmm12, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm17, k0, xmm13, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm18, k0, xmm14, twoGamma2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm19, k0, xmm15, twoGamma2, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpand(Tmp1[i], Mask[i], twoGamma2, vector_len);
+  }
+
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(R0[i], R0[i], Tmp1[i], vector_len);
+  }
 
-  __ evpsubd(xmm8, k0, xmm8, xmm16, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm9, k0, xmm9, xmm17, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm10, k0, xmm10, xmm18, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm11, k0, xmm11, xmm19, false, Assembler::AVX_512bit);
-  // r0 in xmm8
   // quotient += (mask & 1);
-  __ evpandd(xmm16, k0, xmm12, one, false, Assembler::AVX_512bit);
-  __ evpandd(xmm17, k0, xmm13, one, false, Assembler::AVX_512bit);
-  __ evpandd(xmm18, k0, xmm14, one, false, Assembler::AVX_512bit);
-  __ evpandd(xmm19, k0, xmm15, one, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpand(Tmp1[i], Mask[i], one, vector_len);
+  }
 
-  __ evpaddd(xmm4, k0, xmm4, xmm16, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm5, k0, xmm5, xmm17, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm6, k0, xmm6, xmm18, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm7, k0, xmm7, xmm19, false, Assembler::AVX_512bit);
-  // quotient in xmm4
+  for (int i = 0; i < regCnt; i++) {
+    __ vpaddd(Quotient[i], Quotient[i], Tmp1[i], vector_len);
+  }
+  // r1 in RPlus
   // int r1 = rplus - r0 - (dilithium_q - 1);
-  __ evpsubd(xmm16, k0, xmm0, xmm8, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm17, k0, xmm1, xmm9, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm18, k0, xmm2, xmm10, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm19, k0, xmm3, xmm11, false, Assembler::AVX_512bit);
-
-  __ evpsubd(xmm16, k0, xmm16, xmm26, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm17, k0, xmm17, xmm26, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm18, k0, xmm18, xmm26, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm19, k0, xmm19, xmm26, false, Assembler::AVX_512bit);
-  // r1 in xmm16
   // r1 = (r1 | (-r1)) >> 31; // 0 if rplus - r0 == (dilithium_q - 1), -1 otherwise
-  __ evpsubd(xmm20, k0, zero, xmm16, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm21, k0, zero, xmm17, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm22, k0, zero, xmm18, false, Assembler::AVX_512bit);
-  __ evpsubd(xmm23, k0, zero, xmm19, false, Assembler::AVX_512bit);
+  for (int i = 0; i < regCnt; i++) {
+    __ vpsubd(RPlus[i], RPlus[i], R0[i], vector_len);
+  }
 
-  __ evporq(xmm16, k0, xmm16, xmm20, false, Assembler::AVX_512bit);
-  __ evporq(xmm17, k0, xmm17, xmm21, false, Assembler::AVX_512bit);
-  __ evporq(xmm18, k0, xmm18, xmm22, false, Assembler::AVX_512bit);
-  __ evporq(xmm19, k0, xmm19, xmm23, false, Assembler::AVX_512bit);
+  if (vector_len == Assembler::AVX_512bit) {
+    KRegister EqMsk[] = {k1, k2, k3, k4};
+    for (int i = 0; i < regCnt; i++) {
+      __ evpcmpeqd(EqMsk[i], k0, RPlus[i], qMinus1, vector_len);
+    }
 
-  __ evpsubd(xmm12, k0, zero, one, false, Assembler::AVX_512bit); // -1
+    // r0 += ~r1; // add -1 or keep as is, using EqMsk as filter
+    for (int i = 0; i < regCnt; i++) {
+      __ evpaddd(R0[i], EqMsk[i], R0[i], minusOne, true, vector_len);
+    }
 
-  __ evpsrad(xmm0, k0, xmm16, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm1, k0, xmm17, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm2, k0, xmm18, 31, false, Assembler::AVX_512bit);
-  __ evpsrad(xmm3, k0, xmm19, 31, false, Assembler::AVX_512bit);
-  // r1 in xmm0
-  // r0 += ~r1;
-  __ evpxorq(xmm20, k0, xmm0, xmm12, false, Assembler::AVX_512bit);
-  __ evpxorq(xmm21, k0, xmm1, xmm12, false, Assembler::AVX_512bit);
-  __ evpxorq(xmm22, k0, xmm2, xmm12, false, Assembler::AVX_512bit);
-  __ evpxorq(xmm23, k0, xmm3, xmm12, false, Assembler::AVX_512bit);
+    // r1 in Quotient
+    // r1 = r1 & quotient; // copy 0 or keep as is, using EqMsk as filter
+    for (int i = 0; i < regCnt; i++) {
+      __ evpandd(Quotient[i], EqMsk[i], Quotient[i], zero, true, vector_len);
+    }
+  } else {
+    const XMMRegister qMinus1 = Tmp1[0];
+    __ vpsubd(qMinus1, dilithium_q, one, vector_len); // q - 1
 
-  __ evpaddd(xmm8, k0, xmm8, xmm20, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm9, k0, xmm9, xmm21, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm10, k0, xmm10, xmm22, false, Assembler::AVX_512bit);
-  __ evpaddd(xmm11, k0, xmm11, xmm23, false, Assembler::AVX_512bit);
-  // r0 in xmm8
-  // r1 = r1 & quotient;
-  __ evpandd(xmm0, k0, xmm4, xmm0, false, Assembler::AVX_512bit);
-  __ evpandd(xmm1, k0, xmm5, xmm1, false, Assembler::AVX_512bit);
-  __ evpandd(xmm2, k0, xmm6, xmm2, false, Assembler::AVX_512bit);
-  __ evpandd(xmm3, k0, xmm7, xmm3, false, Assembler::AVX_512bit);
-  // r1 in xmm0
+    for (int i = 0; i < regCnt; i++) {
+      __ vpcmpeqd(Mask[i], RPlus[i], qMinus1, vector_len);
+    }
+
+    // r0 += ~r1;
+    // Mask already negated
+    for (int i = 0; i < regCnt; i++) {
+      __ vpaddd(R0[i], R0[i], Mask[i], vector_len);
+    }
+
+    // r1 in Quotient
+    // r1 = r1 & quotient;
+    for (int i = 0; i < regCnt; i++) {
+      __ vpandn(Quotient[i], Mask[i], Quotient[i], vector_len);
+    }
+  }
+
+  // r1 in Quotient
   // lowPart[m] = r0;
   // highPart[m] = r1;
-  store4Xmms(highPart, 0, xmm0_3, _masm);
-  store4Xmms(lowPart, 0, xmm8_11, _masm);
+  storeXmms(highPart, 0, Quotient, vector_len, _masm);
+  storeXmms(lowPart, 0, R0, vector_len, _masm);
 
-  __ addptr(highPart, 4 * XMMBYTES);
-  __ addptr(lowPart, 4 * XMMBYTES);
-  __ subl(len, 4 * XMMBYTES);
+  __ addptr(highPart, memStep);
+  __ addptr(lowPart, memStep);
+  __ subl(len, memStep);
   __ jcc(Assembler::notEqual, L_loop);
 
   __ leave(); // required for proper stackwalking of RuntimeStub frame
@@ -1018,17 +1322,21 @@ static address generate_dilithiumDecomposePoly_avx512(StubGenerator *stubgen,
 }
 
 void StubGenerator::generate_dilithium_stubs() {
+  int vector_len = Assembler::AVX_256bit;
+  if (VM_Version::supports_evex() && VM_Version::supports_avx512bw()) {
+    vector_len = Assembler::AVX_512bit;
+  }
   // Generate Dilithium intrinsics code
   if (UseDilithiumIntrinsics) {
-      StubRoutines::_dilithiumAlmostNtt =
-        generate_dilithiumAlmostNtt_avx512(this, _masm);
-      StubRoutines::_dilithiumAlmostInverseNtt =
-        generate_dilithiumAlmostInverseNtt_avx512(this, _masm);
-      StubRoutines::_dilithiumNttMult =
-        generate_dilithiumNttMult_avx512(this, _masm);
-      StubRoutines::_dilithiumMontMulByConstant =
-        generate_dilithiumMontMulByConstant_avx512(this, _masm);
-      StubRoutines::_dilithiumDecomposePoly =
-        generate_dilithiumDecomposePoly_avx512(this, _masm);
+    StubRoutines::_dilithiumAlmostNtt =
+        generate_dilithiumAlmostNtt_avx(this, vector_len, _masm);
+    StubRoutines::_dilithiumAlmostInverseNtt =
+        generate_dilithiumAlmostInverseNtt_avx(this, vector_len, _masm);
+    StubRoutines::_dilithiumNttMult =
+        generate_dilithiumNttMult_avx(this, vector_len, _masm);
+    StubRoutines::_dilithiumMontMulByConstant =
+        generate_dilithiumMontMulByConstant_avx(this, vector_len, _masm);
+    StubRoutines::_dilithiumDecomposePoly =
+        generate_dilithiumDecomposePoly_avx(this, vector_len, _masm);
   }
 }
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 4961aed61c3..747daefd51d 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1271,8 +1271,7 @@ void VM_Version::get_processor_features() {
   }
 
   // Dilithium Intrinsics
-  // Currently we only have them for AVX512
-  if (supports_evex() && supports_avx512bw()) {
+  if (UseAVX > 1) {
       if (FLAG_IS_DEFAULT(UseDilithiumIntrinsics)) {
           UseDilithiumIntrinsics = true;
       }
diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
new file mode 100644
index 00000000000..60c0804891d
--- /dev/null
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
@@ -0,0 +1,516 @@
+/*
+ * Copyright (c) 2025, Intel Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Arrays;
+import java.util.Random;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+import java.util.HexFormat;
+
+/*
+ * @test
+ * @library /test/lib
+ * @key randomness
+ * @modules java.base/sun.security.provider:+open
+ * @run main/othervm ML_DSA_Intrinsic_Test -XX:+UnlockDiagnosticVMOptions -XX:-UseDilithiumIntrinsics
+ */
+/*
+ * @test
+ * @library /test/lib
+ * @key randomness
+ * @modules java.base/sun.security.provider:+open
+ * @run main/othervm -XX:UseAVX=2 ML_DSA_Intrinsic_Test
+ */
+/*
+ * @test
+ * @library /test/lib
+ * @key randomness
+ * @modules java.base/sun.security.provider:+open
+ * @run main ML_DSA_Intrinsic_Test
+ */
+
+// To run manually: java --add-opens java.base/sun.security.provider=ALL-UNNAMED --add-exports java.base/sun.security.provider=ALL-UNNAMED
+//  -XX:+UnlockDiagnosticVMOptions -XX:+UseDilithiumIntrinsics test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
+
+public class ML_DSA_Intrinsic_Test {
+    public static void main(String[] args) throws Exception {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        Class<?> kClazz = sun.security.provider.ML_DSA.class;
+
+        Method m = kClazz.getDeclaredMethod("implDilithiumNttMult",
+                int[].class, int[].class, int[].class);
+        m.setAccessible(true);
+        MethodHandle mult = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumNttMultJava",
+                int[].class, int[].class, int[].class);
+        m.setAccessible(true);
+        MethodHandle multJava = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumMontMulByConstant",
+                int[].class, int.class);
+        m.setAccessible(true);
+        MethodHandle multConst = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumMontMulByConstantJava",
+                int[].class, int.class);
+        m.setAccessible(true);
+        MethodHandle multConstJava = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumDecomposePoly",
+                int[].class, int[].class, int[].class, int.class, int.class);
+        m.setAccessible(true);
+        MethodHandle decompose = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("decomposePolyJava",
+                int[].class, int[].class, int[].class, int.class, int.class);
+        m.setAccessible(true);
+        MethodHandle decomposeJava = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumAlmostNtt",
+        int[].class, int[].class);
+        m.setAccessible(true);
+        MethodHandle almostNtt = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumAlmostNttJava",
+                int[].class);
+        m.setAccessible(true);
+        MethodHandle almostNttJava = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumAlmostInverseNtt",
+        int[].class, int[].class);
+        m.setAccessible(true);
+        MethodHandle inverseNtt = lookup.unreflect(m);
+
+        m = kClazz.getDeclaredMethod("implDilithiumAlmostInverseNttJava",
+                int[].class);
+        m.setAccessible(true);
+        MethodHandle inverseNttJava = lookup.unreflect(m);
+
+        // Hint: if test fails, you can hardcode the seed to make the test more reproducible
+        Random rnd = new Random();
+        long seed = rnd.nextLong();
+        rnd.setSeed(seed);
+        //Note: it might be useful to increase this number during development of new intrinsics
+        final int repeat = 10000000;
+        int[] coeffs1 = new int[ML_DSA_N];
+        int[] coeffs2 = new int[ML_DSA_N];
+        int[] prod1 = new int[ML_DSA_N];
+        int[] prod2 = new int[ML_DSA_N];
+        int[] prod3 = new int[ML_DSA_N];
+        int[] prod4 = new int[ML_DSA_N];
+        try {
+            for (int i = 0; i < repeat; i++) {
+                // Hint: if test fails, you can hardcode the seed to make the test more reproducible:
+                // rnd.setSeed(seed);
+                testMult(prod1, prod2, coeffs1, coeffs2, mult, multJava, rnd, seed, i);
+                testMultConst(prod1, prod2, multConst, multConstJava, rnd, seed, i);
+                testDecompose(prod1, prod2, prod3, prod4, coeffs1, coeffs2, decompose, decomposeJava, rnd, seed, i);
+                testAlmostNtt(coeffs1, coeffs2, almostNtt, almostNttJava, rnd, seed, i);
+                testInverseNtt(coeffs1, coeffs2, inverseNtt, inverseNttJava, rnd, seed, i);
+            }
+            System.out.println("Fuzz Success");
+        } catch (Throwable e) {
+            System.out.println("Fuzz Failed: " + e);
+        }
+    }
+
+    private static final int ML_DSA_N = 256;
+    public static void testMult(int[] prod1, int[] prod2, int[] coeffs1, int[] coeffs2,
+        MethodHandle mult, MethodHandle multJava, Random rnd,
+        long seed, int i) throws Exception, Throwable {
+
+        for (int j = 0; j<ML_DSA_N; j++) {
+            coeffs1[j] = rnd.nextInt();
+            coeffs2[j] = rnd.nextInt();
+        }
+
+        mult.invoke(prod1, coeffs1, coeffs2);
+        multJava.invoke(prod2, coeffs1, coeffs2);
+
+        if (!Arrays.equals(prod1, prod2)) {
+                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result mult mismatch: " + formatOf(prod1) + " != " + formatOf(prod2));
+        }
+    }
+
+    public static void testMultConst(int[] prod1, int[] prod2,
+        MethodHandle multConst, MethodHandle multConstJava, Random rnd,
+        long seed, int i) throws Exception, Throwable {
+
+        for (int j = 0; j<ML_DSA_N; j++) {
+            prod1[j] = prod2[j] = rnd.nextInt();
+        }
+        // Per Algorithm 3 in https://eprint.iacr.org/2018/039.pdf, one of the inputs is bound, which prevents overflows
+        int dilithium_q = 8380417;
+        int c = rnd.nextInt(dilithium_q);
+
+        multConst.invoke(prod1, c);
+        multConstJava.invoke(prod2, c);
+
+        if (!Arrays.equals(prod1, prod2)) {
+                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result multConst mismatch: " + formatOf(prod1) + " != " + formatOf(prod2));
+        }
+    }
+
+    public static void testDecompose(int[] low1, int[] high1, int[] low2, int[] high2, int[] coeffs1, int[] coeffs2,
+        MethodHandle decompose, MethodHandle decomposeJava, Random rnd,
+        long seed, int i) throws Exception, Throwable {
+
+        for (int j = 0; j<ML_DSA_N; j++) {
+            coeffs1[j] = coeffs2[j] = rnd.nextInt();
+        }
+        int gamma2 = 95232;
+        if (rnd.nextBoolean()) {
+            gamma2 = rnd.nextInt();
+        }
+        int multiplier = (gamma2 == 95232 ? 22 : 8);
+
+        decompose.invoke(coeffs1, low1, high1, 2 * gamma2, multiplier);
+        decomposeJava.invoke(coeffs2, low2, high2, 2 * gamma2, multiplier);
+
+        if (!Arrays.equals(low1, low2)) {
+                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result low mismatch: " + formatOf(low1) + " != " + formatOf(low2));
+        }
+
+        if (!Arrays.equals(high1, high2)) {
+                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result high mismatch: " + formatOf(high1) + " != " + formatOf(high2));
+        }
+    }
+
+    public static void testAlmostNtt(int[] coeffs1, int[] coeffs2,
+        MethodHandle almostNtt, MethodHandle almostNttJava, Random rnd,
+        long seed, int i) throws Exception, Throwable {
+        for (int j = 0; j<ML_DSA_N; j++) {
+            coeffs1[j] = coeffs2[j] = rnd.nextInt();
+        }
+
+        almostNtt.invoke(coeffs1, MONT_ZETAS_FOR_VECTOR_NTT);
+        almostNttJava.invoke(coeffs2);
+
+        if (!Arrays.equals(coeffs1, coeffs2)) {
+            throw new RuntimeException("[Seed "+seed+"@"+i+"] Result AlmostNtt mismatch: " + formatOf(coeffs1) + " != " + formatOf(coeffs2));
+        }
+    }
+
+    public static void testInverseNtt(int[] coeffs1, int[] coeffs2,
+        MethodHandle inverseNtt, MethodHandle inverseNttJava, Random rnd,
+        long seed, int i) throws Exception, Throwable {
+        for (int j = 0; j<ML_DSA_N; j++) {
+            coeffs1[j] = coeffs2[j] = rnd.nextInt();
+        }
+
+        inverseNtt.invoke(coeffs1, MONT_ZETAS_FOR_VECTOR_INVERSE_NTT);
+        inverseNttJava.invoke(coeffs2);
+
+        if (!Arrays.equals(coeffs1, coeffs2)) {
+            throw new RuntimeException("[Seed "+seed+"@"+i+"] Result InverseNtt mismatch: " + formatOf(coeffs1) + " != " + formatOf(coeffs2));
+        }
+    }
+
+    private static CharSequence formatOf(int[] arr) {
+        StringBuilder b = new StringBuilder(arr.length*8);
+        HexFormat hex = HexFormat.of();
+        for (int j = 0; j<arr.length; j++) {
+            b.append(hex.toHexDigits(arr[j]));
+        }
+        return b.toString();
+    }
+
+    // Copied constants from sun.security.provider.ML_DSA
+    private static final int[] MONT_ZETAS_FOR_VECTOR_INVERSE_NTT = new int[]{
+            -1976782, 846154, -1400424, -3937738, 1362209, 48306, -3919660, 554416,
+            3545687, -1612842, 976891, -183443, 2286327, 420899, 2235985, 2939036,
+            3833893, 260646, 1104333, 1667432, -1910376, 1803090, -1723600, 426683,
+            -472078, -1717735, 975884, -2213111, -269760, -3866901, -3523897, 3038916,
+            1799107, 3694233, -1652634, -810149, -3014001, -1616392, -162844, 3183426,
+            1207385, -185531, -3369112, -1957272, 164721, -2454455, -2432395, 2013608,
+            3776993, -594136, 3724270, 2584293, 1846953, 1671176, 2831860, 542412,
+            -3406031, -2235880, -777191, -1500165, 1374803, 2546312, -1917081, 1279661,
+            1962642, -3306115, -1312455, 451100, 1430225, 3318210, -1237275, 1333058,
+            1050970, -1903435, -1869119, 2994039, 3548272, -2635921, -1250494, 3767016,
+            -1595974, -2486353, -1247620, -4055324, -1265009, 2590150, -2691481, -2842341,
+            -203044, -1735879, 3342277, -3437287, -4108315, 2437823, -286988, -342297,
+            3595838, 768622, 525098, 3556995, -3207046, -2031748, 3122442, 655327,
+            522500, 43260, 1613174, -495491, -819034, -909542, -1859098, -900702,
+            3193378, 1197226, 3759364, 3520352, -3513181, 1235728, -2434439, -266997,
+            3562462, 2446433, -2244091, 3342478, -3817976, -2316500, -3407706, -2091667,
+
+            -3839961, -3839961, 3628969, 3628969, 3881060, 3881060, 3019102, 3019102,
+            1439742, 1439742, 812732, 812732, 1584928, 1584928, -1285669, -1285669,
+            -1341330, - 1341330, -1315589, -1315589, 177440, 177440, 2409325, 2409325,
+            1851402, 1851402, -3159746, -3159746, 3553272, 3553272, -189548, -189548,
+            1316856, 1316856, -759969, -759969, 210977, 210977, -2389356, -2389356,
+            3249728, 3249728, -1653064, -1653064, 8578, 8578, 3724342, 3724342,
+            -3958618, -3958618, -904516, -904516, 1100098, 1100098, -44288, -44288,
+            -3097992, -3097992, -508951, -508951, -264944, -264944, 3343383, 3343383,
+            1430430, 1430430, -1852771, -1852771, -1349076, -1349076, 381987, 381987,
+            1308169, 1308169, 22981, 22981, 1228525, 1228525, 671102, 671102,
+            2477047, 2477047, 411027, 411027, 3693493, 3693493, 2967645, 2967645,
+            -2715295, -2715295, -2147896, -2147896, 983419, 983419, -3412210, -3412210,
+            -126922, -126922, 3632928, 3632928, 3157330, 3157330, 3190144, 3190144,
+            1000202, 1000202, 4083598, 4083598, -1939314, -1939314, 1257611, 1257611,
+            1585221, 1585221, -2176455, -2176455, -3475950, -3475950, 1452451, 1452451,
+            3041255, 3041255, 3677745, 3677745, 1528703, 1528703, 3930395, 3930395,
+
+            2797779, 2797779, 2797779, 2797779, -2071892, -2071892, -2071892, -2071892,
+            2556880, 2556880, 2556880, 2556880, -3900724, -3900724, -3900724, -3900724,
+            -3881043, -3881043, -3881043, -3881043, -954230, -954230, -954230, -954230,
+            -531354, -531354, -531354, -531354, -811944, -811944, -811944, -811944,
+            -3699596, -3699596, -3699596, -3699596, 1600420, 1600420, 1600420, 1600420,
+            2140649, 2140649, 2140649, 2140649, -3507263, -3507263, -3507263, -3507263,
+            3821735, 3821735, 3821735, 3821735, -3505694, -3505694, -3505694, -3505694,
+            1643818, 1643818, 1643818, 1643818, 1699267, 1699267, 1699267, 1699267,
+            539299, 539299, 539299, 539299, -2348700, -2348700, -2348700, -2348700,
+            300467, 300467, 300467, 300467, -3539968, -3539968, -3539968, -3539968,
+            2867647, 2867647, 2867647, 2867647, -3574422, -3574422, -3574422, -3574422,
+            3043716, 3043716, 3043716, 3043716, 3861115, 3861115, 3861115, 3861115,
+            -3915439, -3915439, -3915439, -3915439, 2537516, 2537516, 2537516, 2537516,
+            3592148, 3592148, 3592148, 3592148, 1661693, 1661693, 1661693, 1661693,
+            -3530437, -3530437, -3530437, -3530437, -3077325, -3077325, -3077325, -3077325,
+            -95776, -95776, -95776, -95776, -2706023, -2706023, -2706023, -2706023,
+
+            -280005, -280005, -280005, -280005, -280005, -280005, -280005, -280005,
+            -4010497, -4010497, -4010497, -4010497, -4010497, -4010497, -4010497, -4010497,
+            19422, 19422, 19422, 19422, 19422, 19422, 19422, 19422,
+            -1757237, -1757237, -1757237, -1757237, -1757237, -1757237, -1757237, -1757237,
+            3277672, 3277672, 3277672, 3277672, 3277672, 3277672, 3277672, 3277672,
+            1399561, 1399561, 1399561, 1399561, 1399561, 1399561, 1399561, 1399561,
+            3859737, 3859737, 3859737, 3859737, 3859737, 3859737, 3859737, 3859737,
+            2118186, 2118186, 2118186, 2118186, 2118186, 2118186, 2118186, 2118186,
+            2108549, 2108549, 2108549, 2108549, 2108549, 2108549, 2108549, 2108549,
+            -2619752, -2619752, -2619752, -2619752, -2619752, -2619752, -2619752, -2619752,
+            1119584, 1119584, 1119584, 1119584, 1119584, 1119584, 1119584, 1119584,
+            549488, 549488, 549488, 549488, 549488, 549488, 549488, 549488,
+            -3585928, -3585928, -3585928, -3585928, -3585928, -3585928, -3585928, -3585928,
+            1079900, 1079900, 1079900, 1079900, 1079900, 1079900, 1079900, 1079900,
+            -1024112, -1024112, -1024112, -1024112, -1024112, -1024112, -1024112, -1024112,
+            -2725464, -2725464, -2725464, -2725464, -2725464, -2725464, -2725464, -2725464,
+
+            -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103,
+            -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103,
+            -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497,
+            -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497,
+            2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855,
+            2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855,
+            -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733,
+            -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733,
+            2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905,
+            2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905,
+            359251, 359251, 359251, 359251, 359251, 359251, 359251, 359251,
+            359251, 359251, 359251, 359251, 359251, 359251, 359251, 359251,
+            -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451,
+            -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451,
+            -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347,
+            -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347,
+
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847
+    };
+
+    private static final int[] MONT_ZETAS_FOR_VECTOR_NTT = new int[]{
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+
+            1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347,
+            1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347,
+            2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451,
+            2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451,
+            -359251, -359251, -359251, -359251, -359251, -359251, -359251, -359251,
+            -359251, -359251, -359251, -359251, -359251, -359251, -359251, -359251,
+            -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905,
+            -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905,
+            3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733,
+            3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733,
+            -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855,
+            -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855,
+            3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497,
+            3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497,
+            2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103,
+            2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103,
+
+            2725464, 2725464, 2725464, 2725464, 2725464, 2725464, 2725464, 2725464,
+            1024112, 1024112, 1024112, 1024112, 1024112, 1024112, 1024112, 1024112,
+            -1079900, -1079900, -1079900, -1079900, -1079900, -1079900, -1079900, -1079900,
+            3585928, 3585928, 3585928, 3585928, 3585928, 3585928, 3585928, 3585928,
+            -549488, -549488, -549488, -549488, -549488, -549488, -549488, -549488,
+            -1119584, -1119584, -1119584, -1119584, -1119584, -1119584, -1119584, -1119584,
+            2619752, 2619752, 2619752, 2619752, 2619752, 2619752, 2619752, 2619752,
+            -2108549, -2108549, -2108549, -2108549, -2108549, -2108549, -2108549, -2108549,
+            -2118186, -2118186, -2118186, -2118186, -2118186, -2118186, -2118186, -2118186,
+            -3859737, -3859737, -3859737, -3859737, -3859737, -3859737, -3859737, -3859737,
+            -1399561, -1399561, -1399561, -1399561, -1399561, -1399561, -1399561, -1399561,
+            -3277672, -3277672, -3277672, -3277672, -3277672, -3277672, -3277672, -3277672,
+            1757237, 1757237, 1757237, 1757237, 1757237, 1757237, 1757237, 1757237,
+            -19422, -19422, -19422, -19422, -19422, -19422, -19422, -19422,
+            4010497, 4010497, 4010497, 4010497, 4010497, 4010497, 4010497, 4010497,
+            280005, 280005, 280005, 280005, 280005, 280005, 280005, 280005,
+
+            2706023, 2706023, 2706023, 2706023, 95776, 95776, 95776, 95776,
+            3077325, 3077325, 3077325, 3077325, 3530437, 3530437, 3530437, 3530437,
+            -1661693, -1661693, -1661693, -1661693, -3592148, -3592148, -3592148, -3592148,
+            -2537516, -2537516, -2537516, -2537516, 3915439, 3915439, 3915439, 3915439,
+            -3861115, -3861115, -3861115, -3861115, -3043716, -3043716, -3043716, -3043716,
+            3574422, 3574422, 3574422, 3574422, -2867647, -2867647, -2867647, -2867647,
+            3539968, 3539968, 3539968, 3539968, -300467, -300467, -300467, -300467,
+            2348700, 2348700, 2348700, 2348700, -539299, -539299, -539299, -539299,
+            -1699267, -1699267, -1699267, -1699267, -1643818, -1643818, -1643818, -1643818,
+            3505694, 3505694, 3505694, 3505694, -3821735, -3821735, -3821735, -3821735,
+            3507263, 3507263, 3507263, 3507263, -2140649, -2140649, -2140649, -2140649,
+            -1600420, -1600420, -1600420, -1600420, 3699596, 3699596, 3699596, 3699596,
+            811944, 811944, 811944, 811944, 531354, 531354, 531354, 531354,
+            954230, 954230, 954230, 954230, 3881043, 3881043, 3881043, 3881043,
+            3900724, 3900724, 3900724, 3900724, -2556880, -2556880, -2556880, -2556880,
+            2071892, 2071892, 2071892, 2071892, -2797779, -2797779, -2797779, -2797779,
+
+            -3930395, -3930395, -1528703, -1528703, -3677745, -3677745, -3041255, -3041255,
+            -1452451, -1452451, 3475950, 3475950, 2176455, 2176455, -1585221, -1585221,
+            -1257611, -1257611, 1939314, 1939314, -4083598, -4083598, -1000202, -1000202,
+            -3190144, -3190144, -3157330, -3157330, -3632928, -3632928, 126922, 126922,
+            3412210, 3412210, -983419, -983419, 2147896, 2147896, 2715295, 2715295,
+            -2967645, -2967645, -3693493, -3693493, -411027, -411027, -2477047, -2477047,
+            -671102, -671102, -1228525, -1228525, -22981, -22981, -1308169, -1308169,
+            -381987, -381987, 1349076, 1349076, 1852771, 1852771, -1430430, -1430430,
+            -3343383, -3343383, 264944, 264944, 508951, 508951, 3097992, 3097992,
+            44288, 44288, -1100098, -1100098, 904516, 904516, 3958618, 3958618,
+            -3724342, -3724342, -8578, -8578, 1653064, 1653064, -3249728, -3249728,
+            2389356, 2389356, -210977, -210977, 759969, 759969, -1316856, -1316856,
+            189548, 189548, -3553272, -3553272, 3159746, 3159746, -1851402, -1851402,
+            -2409325, -2409325, -177440, -177440, 1315589, 1315589, 1341330, 1341330,
+            1285669, 1285669, -1584928, -1584928, -812732, -812732, -1439742, -1439742,
+            -3019102, -3019102, -3881060, -3881060, -3628969, -3628969, 3839961, 3839961,
+
+            2091667, 3407706, 2316500, 3817976, -3342478, 2244091, -2446433, -3562462,
+            266997, 2434439, -1235728, 3513181, -3520352, -3759364, -1197226, -3193378,
+            900702, 1859098, 909542, 819034, 495491, -1613174, -43260, -522500,
+            -655327, -3122442, 2031748, 3207046, -3556995, -525098, -768622, -3595838,
+            342297, 286988, -2437823, 4108315, 3437287, -3342277, 1735879, 203044,
+            2842341, 2691481, -2590150, 1265009, 4055324, 1247620, 2486353, 1595974,
+            -3767016, 1250494, 2635921, -3548272, -2994039, 1869119, 1903435, -1050970,
+            -1333058, 1237275, -3318210, -1430225, -451100, 1312455, 3306115, -1962642,
+            -1279661, 1917081, -2546312, -1374803, 1500165, 777191, 2235880, 3406031,
+            -542412, -2831860, -1671176, -1846953, -2584293, -3724270, 594136, -3776993,
+            -2013608, 2432395, 2454455, -164721, 1957272, 3369112, 185531, -1207385,
+            -3183426, 162844, 1616392, 3014001, 810149, 1652634, -3694233, -1799107,
+            -3038916, 3523897, 3866901, 269760, 2213111, -975884, 1717735, 472078,
+            -426683, 1723600, -1803090, 1910376, -1667432, -1104333, -260646, -3833893,
+            -2939036, -2235985, -420899, -2286327, 183443, -976891, 1612842, -3545687,
+            -554416, 3919660, -48306, -1362209, 3937738, 1400424, -846154, 1976782
+    };
+}

From d9b6c314872ee626c725d119023179ae93639f54 Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <fandreuzzi@openjdk.org>
Date: Wed, 26 Nov 2025 01:18:48 +0000
Subject: [PATCH 344/512] 8372324:
 jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java#Parallel failed

Reviewed-by: egahlin, mbaesken, ayang
---
 .../TestStringDeduplicationEvent.java         | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java
index 3221e76b4d2..d86ab220539 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStringDeduplicationEvent.java
@@ -22,7 +22,6 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-import java.lang.reflect.Field;
 import java.lang.management.ManagementFactory;
 import java.lang.management.GarbageCollectorMXBean;
 import java.util.List;
@@ -123,16 +122,8 @@ import jdk.test.whitebox.WhiteBox;
  */
 
 public class TestStringDeduplicationEvent {
-    private static Field valueField;
-
-    static {
-        try {
-            valueField = String.class.getDeclaredField("value");
-            valueField.setAccessible(true);
-        } catch (Exception exception) {
-            throw new RuntimeException(exception);
-        }
-    }
+    static volatile String string;
+    static volatile String duplicateString;
 
     public static void main(String[] args) throws Exception {
         boolean zgc = isZgc();
@@ -142,9 +133,8 @@ public class TestStringDeduplicationEvent {
             recording.onEvent(EventNames.StringDeduplication, e -> recording.close());
             recording.startAsync();
 
-            String base = TestStringDeduplicationEvent.class.getSimpleName();
-            String duplicate = new StringBuilder(base).toString();
-            assert(getValue(base) != getValue(duplicate));
+            string = TestStringDeduplicationEvent.class.getSimpleName();
+            duplicateString = new StringBuilder(string).toString();
 
             if (zgc) {
                 // ZGC only triggers string deduplications from major collections
@@ -157,14 +147,6 @@ public class TestStringDeduplicationEvent {
         }
     }
 
-    private static Object getValue(String string) {
-        try {
-            return valueField.get(string);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     private static boolean isZgc() {
         List<GarbageCollectorMXBean> gcs = ManagementFactory.getGarbageCollectorMXBeans();
         return gcs.getFirst().getName().contains("ZGC");

From 65f1ad616977428fcb498479132086777dc929cb Mon Sep 17 00:00:00 2001
From: Mat Carter <macarte@openjdk.org>
Date: Wed, 26 Nov 2025 02:01:27 +0000
Subject: [PATCH 345/512] 8370203: Add jcmd AOT.end_recording diagnostic
 command

Reviewed-by: vlivanov, kvn
---
 src/hotspot/share/cds/aotMetaspace.cpp        |  15 ++
 src/hotspot/share/cds/aotMetaspace.hpp        |   3 +
 .../share/services/diagnosticCommand.cpp      |  24 +++
 .../share/services/diagnosticCommand.hpp      |  15 ++
 .../aotCache/DiagnosticCommandMBeanTest.java  | 162 ++++++++++++++++++
 .../aotCache/JcmdAOTEndRecordingTest.java     |  93 ++++++++++
 6 files changed, 312 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/DiagnosticCommandMBeanTest.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/JcmdAOTEndRecordingTest.java

diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index 42d41e6ae89..e1815c2df3c 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -114,6 +114,7 @@ intx AOTMetaspace::_relocation_delta;
 char* AOTMetaspace::_requested_base_address;
 Array<Method*>* AOTMetaspace::_archived_method_handle_intrinsics = nullptr;
 bool AOTMetaspace::_use_optimized_module_handling = true;
+int volatile AOTMetaspace::_preimage_static_archive_dumped = 0;
 FileMapInfo* AOTMetaspace::_output_mapinfo = nullptr;
 
 // The CDS archive is divided into the following regions:
@@ -1056,7 +1057,21 @@ void AOTMetaspace::exercise_runtime_cds_code(TRAPS) {
   CDSProtectionDomain::to_file_URL("dummy.jar", Handle(), CHECK);
 }
 
+bool AOTMetaspace::preimage_static_archive_dumped() {
+  assert(CDSConfig::is_dumping_preimage_static_archive(), "Required");
+  return AtomicAccess::load_acquire(&_preimage_static_archive_dumped) == 1;
+}
+
 void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS) {
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    // When dumping to the AOT configuration file ensure this function is only executed once.
+    // Multiple invocations may happen via JCmd, during VM exit or other means (in the future)
+    // from different threads and possibly concurrently.
+    if (AtomicAccess::cmpxchg(&_preimage_static_archive_dumped, 0, 1) != 0) {
+      return;
+    }
+  }
+
   if (CDSConfig::is_dumping_classic_static_archive()) {
     // We are running with -Xshare:dump
     load_classes(CHECK);
diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp
index 1712a7865ad..ab78787288f 100644
--- a/src/hotspot/share/cds/aotMetaspace.hpp
+++ b/src/hotspot/share/cds/aotMetaspace.hpp
@@ -60,6 +60,7 @@ class AOTMetaspace : AllStatic {
   static char* _requested_base_address;
   static bool _use_optimized_module_handling;
   static Array<Method*>* _archived_method_handle_intrinsics;
+  static int volatile _preimage_static_archive_dumped;
   static FileMapInfo* _output_mapinfo;
 
  public:
@@ -115,6 +116,8 @@ public:
   // inside the metaspace of the dynamic static CDS archive
   static bool in_aot_cache_dynamic_region(void* p) NOT_CDS_RETURN_(false);
 
+  static bool preimage_static_archive_dumped() NOT_CDS_RETURN_(false);
+
   static void unrecoverable_loading_error(const char* message = "unrecoverable error");
   static void report_loading_error(const char* format, ...) ATTRIBUTE_PRINTF(1, 0);
   static void unrecoverable_writing_error(const char* message = nullptr);
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 5bef650891d..91b23904676 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotMetaspace.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
@@ -165,6 +166,7 @@ void DCmd::register_dcmds(){
 
 #if INCLUDE_CDS
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<DumpSharedArchiveDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<AOTEndRecordingDCmd>(full_export, true, false));
 #endif // INCLUDE_CDS
 
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<NMTDCmd>(full_export, true, false));
@@ -986,6 +988,28 @@ void ClassesDCmd::execute(DCmdSource source, TRAPS) {
   VMThread::execute(&vmop);
 }
 
+#if INCLUDE_CDS
+void AOTEndRecordingDCmd::execute(DCmdSource source, TRAPS) {
+  if (!CDSConfig::is_dumping_preimage_static_archive()) {
+    output()->print_cr("AOT.end_recording is unsupported when VM flags -XX:AOTMode=record or -XX:AOTCacheOutput=<file> are missing.");
+    return;
+  }
+
+  if (AOTMetaspace::preimage_static_archive_dumped()) {
+    output()->print_cr("Recording has already ended.");
+    return;
+  }
+
+  AOTMetaspace::dump_static_archive(THREAD);
+  if (!AOTMetaspace::preimage_static_archive_dumped()) {
+    output()->print_cr("Error: Failed to end recording.");
+    return;
+  }
+
+  output()->print_cr("Recording ended successfully.");
+}
+#endif // INCLUDE_CDS
+
 #if INCLUDE_CDS
 #define DEFAULT_CDS_ARCHIVE_FILENAME "java_pid%p_<subcmd>.jsa"
 
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index 2364b0ce4cd..c41e7bf2e2e 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -325,6 +325,21 @@ public:
   virtual void execute(DCmdSource source, TRAPS);
 };
 
+#if INCLUDE_CDS
+class AOTEndRecordingDCmd : public DCmd {
+public:
+  AOTEndRecordingDCmd(outputStream* output, bool heap) : DCmd(output, heap) { }
+    static const char* name() { return "AOT.end_recording"; }
+    static const char* description() {
+      return "End AOT recording.";
+    }
+    static const char* impact() {
+      return "Medium: Pause time depends on number of loaded classes";
+    }
+    virtual void execute(DCmdSource source, TRAPS);
+};
+#endif // INCLUDE_CDS
+
 #if INCLUDE_CDS
 class DumpSharedArchiveDCmd: public DCmdWithParser {
 protected:
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/DiagnosticCommandMBeanTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/DiagnosticCommandMBeanTest.java
new file mode 100644
index 00000000000..5f836b608cf
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/DiagnosticCommandMBeanTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2025, Microsoft, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+
+/*
+ * @test
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.cds.write.archived.java.heap
+ * @summary Sanity test for DiagnosticCommand MBean ability to invoke AOT.end_recording
+ * @library /test/jdk/lib/testlibrary /test/lib
+ *          /test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes
+ * @build DiagnosticCommandMBeanTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar DiagnosticCommandMBeanApp
+ * @run driver DiagnosticCommandMBeanTest
+ */
+
+import java.lang.management.ManagementFactory;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.ReflectionException;
+import javax.management.MalformedObjectNameException;
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class DiagnosticCommandMBeanTest {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "DiagnosticCommandMBeanApp";
+    public static void main(String[] args) throws Exception {
+        Tester tester = new Tester();
+        tester.runAOTWorkflow();
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+               "-Xlog:cds+class=trace",
+                "--add-modules=jdk.management"
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass, runMode.name()
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            var name = runMode.name();
+            if (runMode.isApplicationExecuted()) {
+                if(runMode == RunMode.TRAINING) {
+                    out.shouldContain("Hello Leyden " + name);
+                    out.shouldContain("AOT.end_recording invoked successfully");
+                    out.shouldContain("Successfully stopped recording");
+                } else if (runMode == RunMode.ASSEMBLY) {
+                    out.shouldNotContain("Hello Leyden ");
+                } else if (runMode == RunMode.PRODUCTION) {
+                    out.shouldContain("Hello Leyden " + name);
+                    out.shouldContain("AOT.end_recording invoked successfully");
+                    out.shouldContain("Failed to stop recording");
+                }
+                out.shouldNotContain("Exception occurred!");
+                out.shouldHaveExitValue(0);
+            }
+        }
+    }
+}
+
+class DiagnosticCommandMBeanApp {
+    public static void main(String[] args) {
+        System.out.println("Hello Leyden " + args[0]);
+       /*
+        * The following code is based on: docs/api/jdk.management/com/sun/management/DiagnosticCommandMBean.html
+        *
+        * Copied from the documentation for reference:
+        *
+        * ... The DiagnosticCommandMBean is generated at runtime and is subject to modifications during the lifetime of
+        * the Java virtual machine. A diagnostic command is represented as an operation of the DiagnosticCommandMBean
+        * interface. Each diagnostic command has:
+        *
+        *    - the diagnostic command name which is the name being referenced in the HotSpot Virtual Machine
+        *    - the MBean operation name which is the name generated for the diagnostic command operation invocation. The
+        *      MBean operation name is implementation dependent
+        *
+        * The recommended way to transform a diagnostic command name into a MBean operation name is as follows:
+        *
+        *    - All characters from the first one to the first dot are set to be lower-case characters
+        *    - Every dot or underline character is removed and the following character is set to be an upper-case character
+        *    - All other characters are copied without modification
+        *
+        * A diagnostic command may or may not support options or arguments. All the operations return String and
+        * either take no parameter for operations that do not support any option or argument, or take a String[]
+        * parameter for operations that support at least one option or argument. Each option or argument must be stored in
+        * a single String.
+        */
+        try {
+            MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+            ObjectName diagName = new ObjectName("com.sun.management:type=DiagnosticCommand");
+
+            // The DiagnosticCommand MBean operations expect a String array parameter for command arguments
+            // Even though AOT.end_recording doesn't need any arguments, you still need to pass an empty String array
+            // The MBean framework requires you to specify both the parameters and their types (signatures)
+            Object[] params = { new String[0] };
+            String[] signature = { "[Ljava.lang.String;" };
+
+            // The JCmd AOT.end_recording is invoked using 'aotEndRecording'
+            String result = (String) server.invoke(diagName, "aotEndRecording", params, signature);
+
+            // The result is the string output from the command
+            System.out.println("AOT.end_recording invoked successfully");
+            if (result.contains("Recording ended successfully")) {
+                System.out.println("Successfully stopped recording");
+            } else {
+                System.out.println("Failed to stop recording");
+            }
+        } catch (MBeanException e) {
+            System.out.println("MBeanException occurred!");
+        } catch (ReflectionException e) {
+            System.out.println("ReflectionException occurred!");
+        } catch (MalformedObjectNameException e) {
+            System.out.println("MalformedObjectNameException occurred!");
+        } catch (InstanceNotFoundException e) {
+            System.out.println("InstanceNotFoundException occurred!");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JcmdAOTEndRecordingTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JcmdAOTEndRecordingTest.java
new file mode 100644
index 00000000000..50c6b6de298
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JcmdAOTEndRecordingTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025, Microsoft, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.cds.write.archived.java.heap
+ * @summary Sanity test for Jcmd AOT.end_recording command
+ * @library /test/lib
+ * @build JcmdAOTEndRecordingTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar LingeredApp.jar
+ *              jdk/test/lib/apps/LingeredApp
+ *              jdk/test/lib/apps/LingeredApp$1
+ *              jdk/test/lib/apps/LingeredApp$SteadyStateLock
+ *              jdk/test/lib/process/OutputBuffer
+ * @run driver JcmdAOTEndRecordingTest
+ */
+
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+import jdk.test.lib.process.OutputAnalyzer;
+import java.io.IOException;
+
+public class JcmdAOTEndRecordingTest {
+    public static void main(String[] args)  throws Exception {
+        test(false);
+        test(true);
+    }
+
+    static void test(boolean isTraining) throws Exception {
+        LingeredApp theApp = null;
+        try {
+            theApp = new LingeredApp();
+            theApp.setUseDefaultClasspath(false);
+            if (isTraining) {
+                LingeredApp.startApp(theApp,
+                                     "-cp", "LingeredApp.jar",
+                                     "-XX:AOTMode=record",
+                                     "-XX:AOTConfiguration=LingeredApp.aotconfig");
+            } else {
+                LingeredApp.startApp(theApp,
+                                     "-cp", "LingeredApp.jar");
+            }
+            long pid = theApp.getPid();
+
+            JDKToolLauncher jcmd = JDKToolLauncher.createUsingTestJDK("jcmd");
+            jcmd.addToolArg(String.valueOf(pid));
+            jcmd.addToolArg("AOT.end_recording");
+
+            try {
+                OutputAnalyzer output = ProcessTools.executeProcess(jcmd.getCommand());
+                if (isTraining) {
+                    output.shouldContain("Recording ended successfully");
+                } else {
+                    // this message is output when the VM is not recording AOT data
+                    output.shouldContain("AOT.end_recording is unsupported");
+                }
+                output.shouldHaveExitValue(0);
+            } catch (Exception e) {
+                throw new RuntimeException("Test failed: " + e);
+            }
+        }
+        catch (IOException e) {
+            throw new RuntimeException("Test failed: " + e);
+        }
+        finally {
+            LingeredApp.stopApp(theApp);
+        }
+    }
+}
\ No newline at end of file

From 4ffdf7af88f6c0a69663eb249957dbceea3cb697 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Wed, 26 Nov 2025 05:46:06 +0000
Subject: [PATCH 346/512] 8366224: Introduce DecimalDigits.appendPair for
 efficient two-digit formatting and refactor DateTimeHelper

Reviewed-by: liach, rriggs
---
 .../share/classes/java/time/MonthDay.java     | 12 ++--
 .../share/classes/java/time/YearMonth.java    | 15 ++---
 .../share/classes/java/time/ZoneOffset.java   | 11 ++--
 .../java/time/chrono/ChronoLocalDateImpl.java | 18 ++++--
 .../jdk/internal/util/DateTimeHelper.java     | 29 +++++-----
 .../jdk/internal/util/DecimalDigits.java      | 55 +++++++++++++++++++
 6 files changed, 104 insertions(+), 36 deletions(-)

diff --git a/src/java.base/share/classes/java/time/MonthDay.java b/src/java.base/share/classes/java/time/MonthDay.java
index a25c9beec95..26ca69bbe0d 100644
--- a/src/java.base/share/classes/java/time/MonthDay.java
+++ b/src/java.base/share/classes/java/time/MonthDay.java
@@ -88,6 +88,8 @@ import java.time.temporal.UnsupportedTemporalTypeException;
 import java.time.temporal.ValueRange;
 import java.util.Objects;
 
+import jdk.internal.util.DecimalDigits;
+
 /**
  * A month-day in the ISO-8601 calendar system, such as {@code --12-03}.
  * <p>
@@ -764,10 +766,12 @@ public final class MonthDay
      */
     @Override
     public String toString() {
-        return new StringBuilder(10).append("--")
-            .append(month < 10 ? "0" : "").append(month)
-            .append(day < 10 ? "-0" : "-").append(day)
-            .toString();
+        StringBuilder buf = new StringBuilder(10);
+        buf.append("--");
+        DecimalDigits.appendPair(buf, month);
+        buf.append('-');
+        DecimalDigits.appendPair(buf, day);
+        return buf.toString();
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/YearMonth.java b/src/java.base/share/classes/java/time/YearMonth.java
index b3d1aff7bc2..665c8c85544 100644
--- a/src/java.base/share/classes/java/time/YearMonth.java
+++ b/src/java.base/share/classes/java/time/YearMonth.java
@@ -101,6 +101,8 @@ import java.time.temporal.UnsupportedTemporalTypeException;
 import java.time.temporal.ValueRange;
 import java.util.Objects;
 
+import jdk.internal.util.DecimalDigits;
+
 /**
  * A year-month in the ISO-8601 calendar system, such as {@code 2007-12}.
  * <p>
@@ -1213,18 +1215,17 @@ public final class YearMonth
     public String toString() {
         int absYear = Math.abs(year);
         StringBuilder buf = new StringBuilder(9);
-        if (absYear < 1000) {
+        if (absYear < 10000) {
             if (year < 0) {
-                buf.append(year - 10000).deleteCharAt(1);
-            } else {
-                buf.append(year + 10000).deleteCharAt(0);
+                buf.append('-');
             }
+            DecimalDigits.appendQuad(buf, absYear);
         } else {
             buf.append(year);
         }
-        return buf.append(month < 10 ? "-0" : "-")
-            .append(month)
-            .toString();
+        buf.append('-');
+        DecimalDigits.appendPair(buf, month);
+        return buf.toString();
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/ZoneOffset.java b/src/java.base/share/classes/java/time/ZoneOffset.java
index 4199d17735c..2a45e7cbf82 100644
--- a/src/java.base/share/classes/java/time/ZoneOffset.java
+++ b/src/java.base/share/classes/java/time/ZoneOffset.java
@@ -88,6 +88,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
+import jdk.internal.util.DecimalDigits;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -465,12 +466,14 @@ public final class ZoneOffset
             StringBuilder buf = new StringBuilder();
             int absHours = absTotalSeconds / SECONDS_PER_HOUR;
             int absMinutes = (absTotalSeconds / SECONDS_PER_MINUTE) % MINUTES_PER_HOUR;
-            buf.append(totalSeconds < 0 ? "-" : "+")
-                .append(absHours < 10 ? "0" : "").append(absHours)
-                .append(absMinutes < 10 ? ":0" : ":").append(absMinutes);
+            buf.append(totalSeconds < 0 ? '-' : '+');
+            DecimalDigits.appendPair(buf, absHours);
+            buf.append(':');
+            DecimalDigits.appendPair(buf, absMinutes);
             int absSeconds = absTotalSeconds % SECONDS_PER_MINUTE;
             if (absSeconds != 0) {
-                buf.append(absSeconds < 10 ? ":0" : ":").append(absSeconds);
+                buf.append(':');
+                DecimalDigits.appendPair(buf, absSeconds);
             }
             return buf.toString();
         }
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
index ca226b70d24..67f08c5cb4f 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
@@ -74,6 +74,8 @@ import java.time.temporal.UnsupportedTemporalTypeException;
 import java.time.temporal.ValueRange;
 import java.util.Objects;
 
+import jdk.internal.util.DecimalDigits;
+
 /**
  * A date expressed in terms of a standard year-month-day calendar system.
  * <p>
@@ -426,18 +428,22 @@ abstract class ChronoLocalDateImpl<D extends ChronoLocalDate>
 
     @Override
     public String toString() {
-        // getLong() reduces chances of exceptions in toString()
-        long yoe = getLong(YEAR_OF_ERA);
-        long moy = getLong(MONTH_OF_YEAR);
-        long dom = getLong(DAY_OF_MONTH);
+        // Using get() instead of getLong() for performance reasons,
+        // as the values of YEAR_OF_ERA, MONTH_OF_YEAR, and DAY_OF_MONTH
+        // are guaranteed to be within the int range for all chronologies.
+        int yoe = get(YEAR_OF_ERA);
+        int moy = get(MONTH_OF_YEAR);
+        int dom = get(DAY_OF_MONTH);
         StringBuilder buf = new StringBuilder(30);
         buf.append(getChronology().toString())
                 .append(" ")
                 .append(getEra())
                 .append(" ")
                 .append(yoe)
-                .append(moy < 10 ? "-0" : "-").append(moy)
-                .append(dom < 10 ? "-0" : "-").append(dom);
+                .append('-');
+        DecimalDigits.appendPair(buf, moy);
+        buf.append('-');
+        DecimalDigits.appendPair(buf, dom);
         return buf.toString();
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java b/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java
index bbb0b6738d1..4d9d560fded 100644
--- a/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java
+++ b/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java
@@ -49,24 +49,23 @@ public final class DateTimeHelper {
      * Requires extra capacity of 10 to avoid StringBuilder reallocation.
      */
     public static void formatTo(StringBuilder buf, LocalDate date) {
-        int year  = date.getYear(),
-            month = date.getMonthValue(),
-            day   = date.getDayOfMonth();
-        int absYear = Math.abs(year);
-        if (absYear < 1000) {
+        int year    = date.getYear(),
+            absYear = Math.abs(year);
+        if (absYear < 10000) {
             if (year < 0) {
                 buf.append('-');
             }
-            buf.repeat('0', absYear < 10 ? 3 : absYear < 100 ? 2 : 1);
-            buf.append(absYear);
+            DecimalDigits.appendQuad(buf, absYear);
         } else {
             if (year > 9999) {
                 buf.append('+');
             }
             buf.append(year);
         }
-        buf.append(month < 10 ? "-0" : "-").append(month)
-           .append(day < 10 ? "-0" : "-").append(day);
+        buf.append('-');
+        DecimalDigits.appendPair(buf, date.getMonthValue());
+        buf.append('-');
+        DecimalDigits.appendPair(buf, date.getDayOfMonth());
     }
 
     /**
@@ -74,14 +73,14 @@ public final class DateTimeHelper {
      * Requires extra capacity of 18 to avoid StringBuilder reallocation.
      */
     public static void formatTo(StringBuilder buf, LocalTime time) {
-        int hour   = time.getHour(),
-            minute = time.getMinute(),
-            second = time.getSecond(),
+        DecimalDigits.appendPair(buf, time.getHour());
+        buf.append(':');
+        DecimalDigits.appendPair(buf, time.getMinute());
+        int second = time.getSecond(),
             nano   = time.getNano();
-        buf.append(hour < 10 ? "0" : "").append(hour)
-           .append(minute < 10 ? ":0" : ":").append(minute);
         if ((second | nano) > 0) {
-            buf.append(second < 10 ? ":0" : ":").append(second);
+            buf.append(':');
+            DecimalDigits.appendPair(buf, second);
             if (nano > 0) {
                 buf.append('.');
                 int zeros = 9 - DecimalDigits.stringSize(nano);
diff --git a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
index 6c0c745651e..b55b6ce63b0 100644
--- a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
@@ -25,6 +25,8 @@
 
 package jdk.internal.util;
 
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.Stable;
 
@@ -36,6 +38,7 @@ import static jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET;
  * @since 21
  */
 public final class DecimalDigits {
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
     /**
@@ -443,4 +446,56 @@ public final class DecimalDigits {
         assert charPos >= 0 && charPos < (buf.length >> 1);
         UNSAFE.putCharUnaligned(buf, ARRAY_BYTE_BASE_OFFSET + ((long) charPos << 1), (char) c);
     }
+
+    /**
+     * Appends the two-digit string representation of the {@code int}
+     * argument to the given {@code StringBuilder}.
+     * <p>
+     * The integer {@code v} is formatted as two decimal digits.
+     * Values from 0 to 9 are formatted with a leading zero (e.g., 5 becomes "05"),
+     * and values from 10 to 99 are formatted as regular two-digit numbers.
+     * If the value is outside the range 0-99, the behavior is unspecified.
+     *
+     * @param buf the {@code StringBuilder} to append to.
+     * @param v the {@code int} value (should be between 0 and 99 inclusive).
+     */
+    public static void appendPair(StringBuilder buf, int v) {
+        // The & 0x7f operation keeps the index within the safe range [0, 127] for the DIGITS array,
+        // which allows the JIT compiler to eliminate array bounds checks for performance.
+        int packed = DIGITS[v & 0x7f];
+        // The temporary String and byte[] objects created here are typically eliminated
+        // by the JVM's escape analysis and scalar replacement optimizations during
+        // runtime compilation, avoiding actual heap allocations in optimized code.
+        buf.append(
+                JLA.uncheckedNewStringWithLatin1Bytes(
+                        new byte[] {(byte) packed, (byte) (packed >> 8)}));
+    }
+
+    /**
+     * Appends the four-digit string representation of the {@code int}
+     * argument to the given {@code StringBuilder}.
+     * <p>
+     * The integer {@code v} is formatted as four decimal digits.
+     * Values from 0 to 9 are formatted with leading zeros (e.g., 5 becomes "0005"),
+     * values from 10 to 99 add two leading zeros (e.g., 25 becomes "0025"),
+     * values from 100 to 999 add one leading zero (e.g., 123 becomes "0123"),
+     * and values from 1000 to 9999 have no leading zeros.
+     * If the value is outside the range 0-9999, the behavior is unspecified.
+     *
+     * @param buf the {@code StringBuilder} to append to.
+     * @param v the {@code int} value (should be between 0 and 9999 inclusive).
+     */
+    public static void appendQuad(StringBuilder buf, int v) {
+        // The & 0x7f operation keeps the index within the safe range [0, 127] for the DIGITS array,
+        // which allows the JIT compiler to eliminate array bounds checks for performance.
+        int packedHigh = DIGITS[(v / 100) & 0x7f];
+        int packedLow  = DIGITS[(v % 100) & 0x7f];
+        // The temporary String and byte[] objects created here are typically eliminated
+        // by the JVM's escape analysis and scalar replacement optimizations during
+        // runtime compilation, avoiding actual heap allocations in optimized code.
+        buf.append(
+                JLA.uncheckedNewStringWithLatin1Bytes(
+                        new byte[] {(byte) packedHigh, (byte) (packedHigh >> 8),
+                                    (byte) packedLow,  (byte) (packedLow  >> 8)}));
+    }
 }

From 7cc584fbe6ce3d2f14d96ffb7e9650fd3498aa7a Mon Sep 17 00:00:00 2001
From: Sorna Sarathi N <ssarathi@openjdk.org>
Date: Wed, 26 Nov 2025 05:47:45 +0000
Subject: [PATCH 347/512] 8372399: Add missing CPE statements

Reviewed-by: asemenyuk
---
 .../share/classes/jdk/jpackage/internal/util/SetBuilder.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
index b9d3140c5f9..18736b4ed7e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
@@ -4,7 +4,9 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

From e13dfd3ec39b0550eede83aa766deaad105995fc Mon Sep 17 00:00:00 2001
From: Neha Joshi <neha.j.joshi@oracle.com>
Date: Wed, 26 Nov 2025 05:53:58 +0000
Subject: [PATCH 348/512] 8370942:
 test/jdk/java/security/Provider/NewInstance.java and
 /test/jdk/java/security/cert/CertStore/NoLDAP.java may skip without notifying

Reviewed-by: myankelevich, rhalade
---
 .../java/security/Provider/NewInstance.java   | 29 ++++++++++++++-----
 .../java/security/cert/CertStore/NoLDAP.java  | 11 ++++---
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/test/jdk/java/security/Provider/NewInstance.java b/test/jdk/java/security/Provider/NewInstance.java
index ad69f468925..547b9111682 100644
--- a/test/jdk/java/security/Provider/NewInstance.java
+++ b/test/jdk/java/security/Provider/NewInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,21 +26,34 @@
  * @bug 8039853
  * @summary Provider.Service.newInstance() does not work with current
             JDK JGSS Mechanisms
+ * @library /test/lib
  */
 
-import java.security.*;
-import java.util.*;
+
+import jtreg.SkippedException;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class NewInstance {
 
     public static void main(String[] args) throws Exception {
-        for (Provider p : Security.getProviders()) {
+
+        System.out.println("Removing SunPCSC provider from the list (A smartcard might not be installed).");
+        final List<Provider> providers = Arrays.stream(Security.getProviders())
+                .filter(provider -> !provider.getName().equals("SunPCSC"))
+                .collect(Collectors.toList());
+
+        for (Provider p : providers) {
             System.out.println("---------");
             System.out.println(p.getName() + ":" + p.getInfo());
-            if (p.getName().equals("SunPCSC")) {
-                System.out.println("A smartcard might not be installed. Skip test.");
-                continue;
-            }
             Set<Provider.Service> set = p.getServices();
             Iterator<Provider.Service> i = set.iterator();
 
diff --git a/test/jdk/java/security/cert/CertStore/NoLDAP.java b/test/jdk/java/security/cert/CertStore/NoLDAP.java
index 868411e63c4..812a978931d 100644
--- a/test/jdk/java/security/cert/CertStore/NoLDAP.java
+++ b/test/jdk/java/security/cert/CertStore/NoLDAP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,23 @@
  * @bug 8004502
  * @summary Sanity check that NoSuchAlgorithmException is thrown when requesting
  *   a CertStore of type "LDAP" and LDAP is not available.
+ * @library /test/lib
  */
 
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertStore;
 import java.security.cert.LDAPCertStoreParameters;
+import jtreg.SkippedException;
 
 
 public class NoLDAP {
     public static void main(String[] args) throws Exception {
         try {
             Class.forName("javax.naming.ldap.LdapName");
-            System.out.println("LDAP is present, test skipped");
-            return;
-        } catch (ClassNotFoundException ignore) { }
+            throw new SkippedException("LDAP is present");
+        } catch (ClassNotFoundException ignore) {
+            System.err.println("Expected: class not found exception " + ignore.getMessage());
+        }
 
         try {
             CertStore.getInstance("LDAP", new LDAPCertStoreParameters());

From cdf5fbed9bd8366e4ee9ab9cb538db88d7bcc7c0 Mon Sep 17 00:00:00 2001
From: Neha Joshi <neha.j.joshi@oracle.com>
Date: Wed, 26 Nov 2025 06:16:08 +0000
Subject: [PATCH 349/512] 8334928: Test
 sun/security/ssl/SSLSocketImpl/ReuseAddr.java failed: java.net.BindException:
 Address already in use

Reviewed-by: rhalade
---
 test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java | 2 ++
 test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index 0891523ac11..51706cec927 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -190,6 +190,7 @@ public class SSLSocketTemplate extends SSLContextTemplate {
         try {
             sslServerSocket.setSoTimeout(30000);
             sslSocket = (SSLSocket)sslServerSocket.accept();
+            System.out.println("Connection established on port : " +serverPort);
         } catch (SocketTimeoutException ste) {
             // Ignore the test case if no connection within 30 seconds.
             System.out.println(
@@ -228,6 +229,7 @@ public class SSLSocketTemplate extends SSLContextTemplate {
             }
         } finally {
             sslSocket.close();
+            System.out.println("Connection closed on port : " +serverPort);
         }
     }
 
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java
index f7e677bbbd0..68761f10c59 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/ReuseAddr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ import java.net.BindException;
 
 public class ReuseAddr extends SSLSocketTemplate {
 
-    private static final int MAX_ATTEMPTS = 3;
+    private static final int MAX_ATTEMPTS = 15;
 
     @Override
     protected void doServerSide() throws Exception {
@@ -65,6 +65,7 @@ public class ReuseAddr extends SSLSocketTemplate {
                     System.err.println(msg);
                     throw new AssertionError("Failed to reuse address: " + msg, x);
                 } else {
+                    Thread.sleep(100*i);
                     System.out.println("Retrying...");
                 }
             }

From f3fddd6e9062e9f70c276d31247a7417b9571390 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 26 Nov 2025 06:17:44 +0000
Subject: [PATCH 350/512] 8372251: Convert PartialArrayStepper/State to use
 Atomic<T>

Reviewed-by: iwalulya, tschatzl
---
 .../share/gc/shared/partialArrayState.cpp      | 18 +++++++++---------
 .../share/gc/shared/partialArrayState.hpp      | 13 +++++++------
 .../gc/shared/partialArrayTaskStepper.hpp      |  5 +++--
 .../shared/partialArrayTaskStepper.inline.hpp  |  6 ++----
 .../gc/shared/test_partialArrayTaskStepper.cpp | 11 ++++++-----
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
index 39c1fe4fc78..6f714d48a35 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -47,7 +47,7 @@ PartialArrayState::PartialArrayState(oop src, oop dst,
 }
 
 void PartialArrayState::add_references(size_t count) {
-  size_t new_count = AtomicAccess::add(&_refcount, count, memory_order_relaxed);
+  size_t new_count = _refcount.add_then_fetch(count, memory_order_relaxed);
   assert(new_count >= count, "reference count overflow");
 }
 
@@ -92,7 +92,7 @@ PartialArrayState* PartialArrayStateAllocator::allocate(oop src, oop dst,
 }
 
 void PartialArrayStateAllocator::release(PartialArrayState* state) {
-  size_t refcount = AtomicAccess::sub(&state->_refcount, size_t(1), memory_order_release);
+  size_t refcount = state->_refcount.sub_then_fetch(1u, memory_order_release);
   if (refcount != 0) {
     assert(refcount + 1 != 0, "refcount underflow");
   } else {
@@ -116,25 +116,25 @@ PartialArrayStateManager::~PartialArrayStateManager() {
 }
 
 Arena* PartialArrayStateManager::register_allocator() {
-  uint idx = AtomicAccess::fetch_then_add(&_registered_allocators, 1u, memory_order_relaxed);
+  uint idx = _registered_allocators.fetch_then_add(1u, memory_order_relaxed);
   assert(idx < _max_allocators, "exceeded configured max number of allocators");
   return ::new (&_arenas[idx]) Arena(mtGC);
 }
 
 #ifdef ASSERT
 void PartialArrayStateManager::release_allocator() {
-  uint old = AtomicAccess::fetch_then_add(&_released_allocators, 1u, memory_order_relaxed);
-  assert(old < AtomicAccess::load(&_registered_allocators), "too many releases");
+  uint old = _released_allocators.fetch_then_add(1u, memory_order_relaxed);
+  assert(old < _registered_allocators.load_relaxed(), "too many releases");
 }
 #endif // ASSERT
 
 void PartialArrayStateManager::reset() {
-  uint count = AtomicAccess::load(&_registered_allocators);
-  assert(count == AtomicAccess::load(&_released_allocators),
+  uint count = _registered_allocators.load_relaxed();
+  assert(count == _released_allocators.load_relaxed(),
          "some allocators still active");
   for (uint i = 0; i < count; ++i) {
     _arenas[i].~Arena();
   }
-  AtomicAccess::store(&_registered_allocators, 0u);
-  DEBUG_ONLY(AtomicAccess::store(&_released_allocators, 0u);)
+  _registered_allocators.store_relaxed(0u);
+  DEBUG_ONLY(_released_allocators.store_relaxed(0u);)
 }
diff --git a/src/hotspot/share/gc/shared/partialArrayState.hpp b/src/hotspot/share/gc/shared/partialArrayState.hpp
index 3208c6d6807..3dafeb0f14c 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
@@ -60,8 +61,8 @@ class PartialArrayState {
   oop _source;
   oop _destination;
   size_t _length;
-  volatile size_t _index;
-  volatile size_t _refcount;
+  Atomic<size_t> _index;
+  Atomic<size_t> _refcount;
 
   friend class PartialArrayStateAllocator;
 
@@ -90,7 +91,7 @@ public:
 
   // A pointer to the start index for the next segment to process, for atomic
   // update.
-  volatile size_t* index_addr() { return &_index; }
+  Atomic<size_t>* index_addr() { return &_index; }
 };
 
 // This class provides memory management for PartialArrayStates.
@@ -178,8 +179,8 @@ class PartialArrayStateManager : public CHeapObj<mtGC> {
   // The number of allocators that have been registered/released.
   // Atomic to support concurrent registration, and concurrent release.
   // Phasing restriction forbids registration concurrent with release.
-  volatile uint _registered_allocators;
-  DEBUG_ONLY(volatile uint _released_allocators;)
+  Atomic<uint> _registered_allocators;
+  DEBUG_ONLY(Atomic<uint> _released_allocators;)
 
   // These are all for sole use of the befriended allocator class.
   Arena* register_allocator();
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
index a68d9bd3612..11499ca2ffe 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #define SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_HPP
 
 #include "oops/arrayOop.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class PartialArrayState;
@@ -73,7 +74,7 @@ private:
   uint _task_fanout;
 
   // For unit tests.
-  inline Step next_impl(size_t length, volatile size_t* index_addr) const;
+  inline Step next_impl(size_t length, Atomic<size_t>* index_addr) const;
 };
 
 #endif // SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_HPP
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
index 3693abaf8cf..aaa86e2de16 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
@@ -46,15 +46,13 @@ PartialArrayTaskStepper::start(size_t length) const {
 }
 
 PartialArrayTaskStepper::Step
-PartialArrayTaskStepper::next_impl(size_t length, volatile size_t* index_addr) const {
+PartialArrayTaskStepper::next_impl(size_t length, Atomic<size_t>* index_addr) const {
   // The start of the next task is in the state's index.
   // Atomically increment by the chunk size to claim the associated chunk.
   // Because we limit the number of enqueued tasks to being no more than the
   // number of remaining chunks to process, we can use an atomic add for the
   // claim, rather than a CAS loop.
-  size_t start = AtomicAccess::fetch_then_add(index_addr,
-                                              _chunk_size,
-                                              memory_order_relaxed);
+  size_t start = index_addr->fetch_then_add(_chunk_size, memory_order_relaxed);
 
   assert(start < length, "invariant: start %zu, length %zu", start, length);
   assert(((length - start) % _chunk_size) == 0,
diff --git a/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp b/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp
index 0ebfc8e01dd..977e7a9d949 100644
--- a/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp
+++ b/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp
@@ -24,6 +24,7 @@
 
 #include "gc/shared/partialArrayTaskStepper.inline.hpp"
 #include "memory/allStatic.hpp"
+#include "runtime/atomic.hpp"
 #include "unittest.hpp"
 
 using Step = PartialArrayTaskStepper::Step;
@@ -33,7 +34,7 @@ class PartialArrayTaskStepper::TestSupport : AllStatic {
 public:
   static Step next(const Stepper* stepper,
                    size_t length,
-                   size_t* to_length_addr) {
+                   Atomic<size_t>* to_length_addr) {
     return stepper->next_impl(length, to_length_addr);
   }
 };
@@ -42,9 +43,9 @@ using StepperSupport = PartialArrayTaskStepper::TestSupport;
 
 static uint simulate(const Stepper* stepper,
                      size_t length,
-                     size_t* to_length_addr) {
+                     Atomic<size_t>* to_length_addr) {
   Step init = stepper->start(length);
-  *to_length_addr = init._index;
+  to_length_addr->store_relaxed(init._index);
   uint queue_count = init._ncreate;
   uint task = 0;
   for ( ; queue_count > 0; ++task) {
@@ -57,9 +58,9 @@ static uint simulate(const Stepper* stepper,
 
 static void run_test(size_t length, size_t chunk_size, uint n_workers) {
   const PartialArrayTaskStepper stepper(n_workers, chunk_size);
-  size_t to_length;
+  Atomic<size_t> to_length;
   uint tasks = simulate(&stepper, length, &to_length);
-  ASSERT_EQ(length, to_length);
+  ASSERT_EQ(length, to_length.load_relaxed());
   ASSERT_EQ(tasks, length / chunk_size);
 }
 

From 3ef3f259bbf4bf40638f53319ec4eea7fdd147e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Arias=20de=20Reyna=20Dom=C3=ADnguez?=
 <mariasde@ibm.com>
Date: Wed, 26 Nov 2025 06:39:31 +0000
Subject: [PATCH 351/512] 8372253: Improve logging to show why a class was
 excluded from AOT Cache

Reviewed-by: asmehra, iklam
---
 src/hotspot/share/cds/aotMetaspace.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index e1815c2df3c..f56050d4d31 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -1370,8 +1370,11 @@ bool AOTMetaspace::try_link_class(JavaThread* current, InstanceKlass* ik) {
     ik->link_class(THREAD);
     if (HAS_PENDING_EXCEPTION) {
       ResourceMark rm(THREAD);
-      aot_log_warning(aot)("Preload Warning: Verification failed for %s",
-                    ik->external_name());
+      oop message = java_lang_Throwable::message(current->pending_exception());
+      aot_log_warning(aot)("Preload Warning: Verification failed for %s because a %s was thrown: %s",
+                            ik->external_name(),
+                            current->pending_exception()->klass()->external_name(),
+                            message == nullptr ? "(no message)" : java_lang_String::as_utf8_string(message));
       CLEAR_PENDING_EXCEPTION;
       SystemDictionaryShared::set_class_has_failed_verification(ik);
     } else {

From 46ee8d550e42f756dd04fa67ed549c93b632df77 Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Wed, 26 Nov 2025 06:48:19 +0000
Subject: [PATCH 352/512] 8372547: New test
 sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java should be restricted to
 x86_64

Reviewed-by: dholmes
---
 test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
index 60c0804891d..ea04b3c7eec 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
@@ -37,6 +37,7 @@ import java.util.HexFormat;
  */
 /*
  * @test
+ * @requires os.simpleArch == "x64"
  * @library /test/lib
  * @key randomness
  * @modules java.base/sun.security.provider:+open

From 275cb9f28799081878e0a7c53ce1c0450f4e963e Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Wed, 26 Nov 2025 07:55:43 +0000
Subject: [PATCH 353/512] 8360510: C2: Template Assertion Predicates are not
 cloned to the inner counted loop with -XX:+StressDuplicateBackedge

Reviewed-by: epeter, roland
---
 src/hotspot/share/opto/loopopts.cpp           | 45 +++++++++-
 ...stVerifyLoopOptimizationsHitsMemLimit.java |  6 +-
 .../assertion/TestAssertionPredicates.java    | 13 +++
 ...plicateBackedgeWithAssertionPredicate.java | 89 +++++++++++++++++++
 4 files changed, 149 insertions(+), 4 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/assertion/TestStressDuplicateBackedgeWithAssertionPredicate.java

diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 3ef6a085b1c..ee3f138b8af 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -4180,6 +4180,33 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
   return true;
 }
 
+#ifdef ASSERT
+
+// Moves Template Assertion Predicates to a target loop by cloning and killing the old ones. The target loop is the
+// original, not-cloned loop. This is currently only used with StressLoopBackedge which is a develop flag only and
+// false with product builds. We can therefore guard it with an ifdef. More details can be found at the use-site.
+class MoveAssertionPredicatesVisitor : public PredicateVisitor {
+  ClonePredicateToTargetLoop _clone_predicate_to_loop;
+  PhaseIdealLoop* const _phase;
+
+public:
+  MoveAssertionPredicatesVisitor(LoopNode* target_loop_head,
+                                 const NodeInSingleLoopBody &node_in_loop_body,
+                                 PhaseIdealLoop* phase)
+    : _clone_predicate_to_loop(target_loop_head, node_in_loop_body, phase),
+      _phase(phase) {
+  }
+  NONCOPYABLE(MoveAssertionPredicatesVisitor);
+
+  using PredicateVisitor::visit;
+
+  void visit(const TemplateAssertionPredicate& template_assertion_predicate) override {
+    _clone_predicate_to_loop.clone_template_assertion_predicate(template_assertion_predicate);
+    template_assertion_predicate.kill(_phase->igvn());
+  }
+};
+#endif // ASSERT
+
 // Transform:
 //
 // loop<-----------------+
@@ -4248,6 +4275,7 @@ bool PhaseIdealLoop::duplicate_loop_backedge(IdealLoopTree *loop, Node_List &old
   IfNode* exit_test = nullptr;
   uint inner;
   float f;
+#ifdef ASSERT
   if (StressDuplicateBackedge) {
     if (head->is_strip_mined()) {
       return false;
@@ -4266,7 +4294,9 @@ bool PhaseIdealLoop::duplicate_loop_backedge(IdealLoopTree *loop, Node_List &old
     }
 
     inner = 1;
-  } else {
+  } else
+#endif //ASSERT
+  {
     // Is the shape of the loop that of a counted loop...
     Node* back_control = loop_exit_control(head, loop);
     if (back_control == nullptr) {
@@ -4457,6 +4487,19 @@ bool PhaseIdealLoop::duplicate_loop_backedge(IdealLoopTree *loop, Node_List &old
     }
   }
 
+#ifdef ASSERT
+  if (StressDuplicateBackedge && head->is_CountedLoop()) {
+    // The Template Assertion Predicates from the old counted loop are now at the new outer loop - clone them to
+    // the inner counted loop and kill the old ones. We only need to do this with debug builds because
+    // StressDuplicateBackedge is a devlop flag and false by default. Without StressDuplicateBackedge 'head' will be a
+    // non-counted loop, and thus we have no Template Assertion Predicates above the old loop to move down.
+    PredicateIterator predicate_iterator(outer_head->in(LoopNode::EntryControl));
+    NodeInSingleLoopBody node_in_body(this, loop);
+    MoveAssertionPredicatesVisitor move_assertion_predicates_visitor(head, node_in_body, this);
+    predicate_iterator.for_each(move_assertion_predicates_visitor);
+  }
+#endif // ASSERT
+
   C->set_major_progress();
 
   C->print_method(PHASE_AFTER_DUPLICATE_LOOP_BACKEDGE, 4, outer_head);
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java b/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
index a2834c26dcc..fbe69ad0e04 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
@@ -37,15 +37,15 @@ package compiler.loopopts;
  *      -XX:CompileCommand=memlimit,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test,100M~crash
  *      -XX:-TieredCompilation -Xcomp -XX:PerMethodTrapLimit=0
  *      -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations
- *      -XX:StressSeed=1870557292
+ *      -XX:StressSeed=1870557292 -XX:-StressDuplicateBackedge
  *      compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
  *      -XX:CompileCommand=compileonly,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test
  *      -XX:CompileCommand=memlimit,compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit::test,100M~crash
  *      -XX:-TieredCompilation -Xcomp -XX:PerMethodTrapLimit=0
- *      -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations
+ *      -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations -XX:-StressDuplicateBackedge
  *      compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
- * @run main compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
+ * @run main/othervm -XX:-StressDuplicateBackedge compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
  */
 
 public class TestVerifyLoopOptimizationsHitsMemLimit {
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
index 8f30dce15bc..c3ccf4eff43 100644
--- a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
@@ -144,6 +144,19 @@
  *                   compiler.predicates.assertion.TestAssertionPredicates DataUpdate
  */
 
+/*
+ * @test id=DataUpdateZGC
+ * @key randomness
+ * @bug 8288981 8350577 0360510
+ * @requires vm.compiler2.enabled
+ * @requires vm.gc.Z
+ * @run main/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:+AbortVMOnCompilationFailure -XX:+UseZGC
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-KillPathsReachableByDeadTypeNode
+ *                   compiler.predicates.assertion.TestAssertionPredicates DataUpdate
+ */
+
 /*
  * @test id=CloneDown
  * @bug 8288981 8350577
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestStressDuplicateBackedgeWithAssertionPredicate.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestStressDuplicateBackedgeWithAssertionPredicate.java
new file mode 100644
index 00000000000..02082137bf0
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestStressDuplicateBackedgeWithAssertionPredicate.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8360510
+ * @summary Test that StressDuplicateBackedge correctly clones Template Assertion Predicates to the inner counted loop.
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+StressDuplicateBackedge
+ *                   compiler.predicates.assertion.TestStressDuplicateBackedgeWithAssertionPredicate
+ * @run main compiler.predicates.assertion.TestStressDuplicateBackedgeWithAssertionPredicate
+ */
+
+package compiler.predicates.assertion;
+
+public class TestStressDuplicateBackedgeWithAssertionPredicate {
+    static int[] iArr = new int[100];
+    static int iFld;
+    static long lFld;
+
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 10000; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        // 5) Once the inner empty loop is removed (step 4), we can apply the "duplicate backedge
+        //    optimization" to the initial outer counted loop which is now the only loop left. Note
+        //    that we can do that even though it is a counted loop: This is stressed with
+        //    StressDuplicateLoopBackedge.
+        // 6) We do the following "duplicate loop backedge" transformation with current mainline:
+        //
+        //                                     Template Assertion
+        //      Template Assertion                 Predicates
+        //          Predicates                         |
+        //              |              ====>          ...
+        //             ...                             |
+        //              |                             Loop       # Outer Non-Counted Loop (newly added)
+        //          CountedLoop                       |
+        //                                        CountedLoop    # Inner Counted Loop (old)
+        //
+        // 7) After the transformation, the Template Assertion Predicates are still at the Outer Non-Counted Loop.
+        //    As a result, we find them to be useless in the next predicate elimination call with
+        //    EliminateUselessPredicates because they cannot be found from the Inner Counted Loop (we stop at
+        //    Loop which is not a predicate). However, we have verification code in place that checks that we
+        //    can only find useless Template Assertion Predicates if the associated counted loop node is dead.
+        //    This is not the case and we crash with an assertion failure.
+        //
+        //    The fix is to move the Template Assertion Predicates to the Inner Counted Loop again.
+        for (int i = 0; i < 100; i++) {
+            // 3) Loop Predication will hoist this range checkout out of the loop with Template
+            //    Assertion Predicates.
+            iArr[i] = 34;
+
+            // 1) We need an inner empty loop to make sure the outer counter loop is not strip mined.
+            //    Otherwise, we cannot apply the duplicate backedge optimization to the outer loop.
+            // 4) Found to be empty and removed.
+            for (int j = 0; j < 10; j++) {}
+
+            // 2) We need some region inside the outer loop, otherwise, we cannot apply the duplicate
+            //    backedge optimization.
+            if (i == 3) {
+                lFld = 34;
+            } else {
+                iFld = 2;
+            }
+        }
+    }
+}

From 5fe731d55a54ace42de4a15d612dba310de9d977 Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <snatarajan@openjdk.org>
Date: Wed, 26 Nov 2025 09:27:31 +0000
Subject: [PATCH 354/512] 8349835: C2: Simplify IGV property printing

Reviewed-by: rcastanedalo, dfenacci, chagedorn
---
 src/hotspot/share/opto/idealGraphPrinter.cpp | 211 +++++++++----------
 src/hotspot/share/opto/idealGraphPrinter.hpp |   3 +-
 2 files changed, 98 insertions(+), 116 deletions(-)

diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 6a738878a1b..b28949e27c2 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -35,6 +35,96 @@
 
 #ifndef PRODUCT
 
+// Support for printing properties
+class PrintProperties
+{
+private:
+  IdealGraphPrinter* _printer;
+
+public:
+  PrintProperties(IdealGraphPrinter* printer) : _printer(printer) {}
+  void print_node_properties(Node* node);
+  void print_lrg_properties(const LRG& lrg, const char* buffer);
+  void print_property(int flag, const char* name);
+  void print_property(int flag, const char* name, const char* val);
+  void print_property(int flag, const char* name, int val);
+};
+
+void PrintProperties::print_node_properties(Node* node) {
+  const jushort flags = node->flags();
+  print_property((flags & Node::Flag_is_Copy), "is_copy");
+  print_property((flags & Node::Flag_rematerialize), "rematerialize");
+  print_property((flags & Node::Flag_needs_anti_dependence_check), "needs_anti_dependence_check");
+  print_property((flags & Node::Flag_is_macro), "is_macro");
+  print_property((flags & Node::Flag_is_Con), "is_con");
+  print_property((flags & Node::Flag_is_cisc_alternate), "is_cisc_alternate");
+  print_property((flags & Node::Flag_is_dead_loop_safe), "is_dead_loop_safe");
+  print_property((flags & Node::Flag_may_be_short_branch), "may_be_short_branch");
+  print_property((flags & Node::Flag_has_call), "has_call");
+  print_property((flags & Node::Flag_has_swapped_edges), "has_swapped_edges");
+  Matcher* matcher = _printer->C->matcher();
+  if (matcher != nullptr) {
+    print_property(matcher->is_shared(node),"is_shared");
+    print_property(!(matcher->is_shared(node)), "is_shared", IdealGraphPrinter::FALSE_VALUE);
+    print_property(matcher->is_dontcare(node), "is_dontcare");
+    print_property(!(matcher->is_dontcare(node)),"is_dontcare", IdealGraphPrinter::FALSE_VALUE);
+    Node* old = matcher->find_old_node(node);
+    if (old != nullptr) {
+      print_property(true, "old_node_idx", old->_idx);
+    }
+  }
+}
+
+void PrintProperties::print_lrg_properties(const LRG &lrg, const char *buffer) {
+  print_property(true, "mask", buffer);
+  print_property(true, "mask_size", lrg.mask_size());
+  if (lrg._degree_valid) {
+    print_property(true, "degree", lrg.degree());
+  }
+  print_property(true, "num_regs", lrg.num_regs());
+  print_property(true, "reg_pressure", lrg.reg_pressure());
+  print_property(true, "cost", lrg._cost);
+  print_property(true, "area", lrg._area);
+  print_property(true, "score", lrg.score());
+  print_property((lrg._risk_bias != 0), "risk_bias", lrg._risk_bias);
+  print_property((lrg._copy_bias != 0), "copy_bias", lrg._copy_bias);
+  print_property(lrg.is_singledef(), "is_singledef");
+  print_property(lrg.is_multidef(), "is_multidef");
+  print_property(lrg._is_oop, "is_oop");
+  print_property(lrg._is_float, "is_float");
+  print_property(lrg._is_vector, "is_vector");
+  print_property(lrg._is_predicate, "is_predicate");
+  print_property(lrg._is_scalable, "is_scalable");
+  print_property(lrg._was_spilled1, "was_spilled1");
+  print_property(lrg._was_spilled2, "was_spilled2");
+  print_property(lrg._direct_conflict, "direct_conflict");
+  print_property(lrg._fat_proj, "fat_proj");
+  print_property(lrg._was_lo, "_was_lo");
+  print_property(lrg._has_copy, "has_copy");
+  print_property(lrg._at_risk, "at_risk");
+  print_property(lrg._must_spill, "must_spill");
+  print_property(lrg._is_bound, "is_bound");
+  print_property((lrg._msize_valid && lrg._degree_valid && lrg.lo_degree()), "trivial");
+}
+
+void PrintProperties::print_property(int flag, const char* name) {
+  if (flag != 0) {
+    _printer->print_prop(name, IdealGraphPrinter::TRUE_VALUE);
+  }
+}
+
+void PrintProperties::print_property(int flag, const char* name, const char* val) {
+  if (flag != 0) {
+    _printer->print_prop(name, val);
+  }
+}
+
+void PrintProperties::print_property(int flag, const char* name, int val) {
+  if (flag != 0) {
+    _printer->print_prop(name, val);
+  }
+}
+
 // Constants
 // Keep consistent with Java constants
 const char *IdealGraphPrinter::INDENT = "  ";
@@ -522,54 +612,8 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
       print_prop("jvms", buffer);
     }
 
-    const jushort flags = node->flags();
-    if (flags & Node::Flag_is_Copy) {
-      print_prop("is_copy", "true");
-    }
-    if (flags & Node::Flag_rematerialize) {
-      print_prop("rematerialize", "true");
-    }
-    if (flags & Node::Flag_needs_anti_dependence_check) {
-      print_prop("needs_anti_dependence_check", "true");
-    }
-    if (flags & Node::Flag_is_macro) {
-      print_prop("is_macro", "true");
-    }
-    if (flags & Node::Flag_is_Con) {
-      print_prop("is_con", "true");
-    }
-    if (flags & Node::Flag_is_cisc_alternate) {
-      print_prop("is_cisc_alternate", "true");
-    }
-    if (flags & Node::Flag_is_dead_loop_safe) {
-      print_prop("is_dead_loop_safe", "true");
-    }
-    if (flags & Node::Flag_may_be_short_branch) {
-      print_prop("may_be_short_branch", "true");
-    }
-    if (flags & Node::Flag_has_call) {
-      print_prop("has_call", "true");
-    }
-    if (flags & Node::Flag_has_swapped_edges) {
-      print_prop("has_swapped_edges", "true");
-    }
-
-    if (C->matcher() != nullptr) {
-      if (C->matcher()->is_shared(node)) {
-        print_prop("is_shared", "true");
-      } else {
-        print_prop("is_shared", "false");
-      }
-      if (C->matcher()->is_dontcare(node)) {
-        print_prop("is_dontcare", "true");
-      } else {
-        print_prop("is_dontcare", "false");
-      }
-      Node* old = C->matcher()->find_old_node(node);
-      if (old != nullptr) {
-        print_prop("old_node_idx", old->_idx);
-      }
-    }
+    PrintProperties print_node(this);
+    print_node.print_node_properties(node);
 
     if (node->is_Proj()) {
       print_prop("con", (int)node->as_Proj()->_con);
@@ -1145,73 +1189,10 @@ void IdealGraphPrinter::print(const char* name, Node* node, GrowableArray<const
       buffer[0] = 0;
       stringStream lrg_mask_stream(buffer, sizeof(buffer) - 1);
       lrg.mask().dump(&lrg_mask_stream);
-      print_prop("mask", buffer);
-      print_prop("mask_size", lrg.mask_size());
-      if (lrg._degree_valid) {
-        print_prop("degree", lrg.degree());
-      }
-      print_prop("num_regs", lrg.num_regs());
-      print_prop("reg_pressure", lrg.reg_pressure());
-      print_prop("cost", lrg._cost);
-      print_prop("area", lrg._area);
-      print_prop("score", lrg.score());
-      if (lrg._risk_bias != 0) {
-        print_prop("risk_bias", lrg._risk_bias);
-      }
-      if (lrg._copy_bias != 0) {
-        print_prop("copy_bias", lrg._copy_bias);
-      }
-      if (lrg.is_singledef()) {
-        print_prop("is_singledef", TRUE_VALUE);
-      }
-      if (lrg.is_multidef()) {
-        print_prop("is_multidef", TRUE_VALUE);
-      }
-      if (lrg._is_oop) {
-        print_prop("is_oop", TRUE_VALUE);
-      }
-      if (lrg._is_float) {
-        print_prop("is_float", TRUE_VALUE);
-      }
-      if (lrg._is_vector) {
-        print_prop("is_vector", TRUE_VALUE);
-      }
-      if (lrg._is_predicate) {
-        print_prop("is_predicate", TRUE_VALUE);
-      }
-      if (lrg._is_scalable) {
-        print_prop("is_scalable", TRUE_VALUE);
-      }
-      if (lrg._was_spilled1) {
-        print_prop("was_spilled1", TRUE_VALUE);
-      }
-      if (lrg._was_spilled2) {
-        print_prop("was_spilled2", TRUE_VALUE);
-      }
-      if (lrg._direct_conflict) {
-        print_prop("direct_conflict", TRUE_VALUE);
-      }
-      if (lrg._fat_proj) {
-        print_prop("fat_proj", TRUE_VALUE);
-      }
-      if (lrg._was_lo) {
-        print_prop("_was_lo", TRUE_VALUE);
-      }
-      if (lrg._has_copy) {
-        print_prop("has_copy", TRUE_VALUE);
-      }
-      if (lrg._at_risk) {
-        print_prop("at_risk", TRUE_VALUE);
-      }
-      if (lrg._must_spill) {
-        print_prop("must_spill", TRUE_VALUE);
-      }
-      if (lrg._is_bound) {
-        print_prop("is_bound", TRUE_VALUE);
-      }
-      if (lrg._msize_valid && lrg._degree_valid && lrg.lo_degree()) {
-        print_prop("trivial", TRUE_VALUE);
-      }
+
+      PrintProperties print_node(this);
+      print_node.print_lrg_properties(lrg, buffer);
+
       tail(PROPERTIES_ELEMENT);
       tail(LIVE_RANGE_ELEMENT);
     }
diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp
index 2159779ddfa..a0a13f897ce 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp
@@ -46,8 +46,9 @@ class ConnectionGraph;
 class Parse;
 
 class IdealGraphPrinter : public CHeapObj<mtCompiler> {
- private:
+  friend class PrintProperties;
 
+private:
   static const char *INDENT;
   static const char *TOP_ELEMENT;
   static const char *GROUP_ELEMENT;

From 5291e1c1e1ddc19d814dbdb3a981049fe40575ea Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Wed, 26 Nov 2025 09:29:55 +0000
Subject: [PATCH 355/512] 8372513: Shenandoah: ShenandoahMaxRegionSize can
 produce an unaligned heap alignment

Reviewed-by: jsikstro, eosterlund, shade
---
 .../share/gc/shenandoah/shenandoahArguments.cpp       |  3 ++-
 src/hotspot/share/runtime/arguments.cpp               |  1 +
 .../gc/shenandoah/options/TestRegionSizeArgs.java     | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index a7cf8e638dd..c1fa4b964b7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -37,6 +37,7 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "utilities/defaultStream.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 void ShenandoahArguments::initialize() {
 #if !(defined AARCH64 || defined AMD64 || defined PPC64 || defined RISCV64)
@@ -205,7 +206,7 @@ void ShenandoahArguments::initialize() {
 }
 
 size_t ShenandoahArguments::conservative_max_heap_alignment() {
-  size_t align = ShenandoahMaxRegionSize;
+  size_t align = next_power_of_2(ShenandoahMaxRegionSize);
   if (UseLargePages) {
     align = MAX2(align, os::large_page_size());
   }
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 55ee7641a5f..ff1de899bdd 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1482,6 +1482,7 @@ void Arguments::set_conservative_max_heap_alignment() {
                                           os::vm_allocation_granularity(),
                                           os::max_page_size(),
                                           GCArguments::compute_heap_alignment());
+  assert(is_power_of_2(_conservative_max_heap_alignment), "Expected to be a power-of-2");
 }
 
 jint Arguments::set_ergonomics_flags() {
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java b/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java
index a8d5155584b..80962f0ffa6 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java
@@ -192,6 +192,17 @@ public class TestRegionSizeArgs {
             output.shouldHaveExitValue(0);
         }
 
+        // This used to assert that _conservative_max_heap_alignment is not a power-of-2.
+        {
+            OutputAnalyzer output = ProcessTools.executeLimitedTestJava("-XX:+UnlockExperimentalVMOptions",
+                    "-XX:+UseShenandoahGC",
+                    "-Xms100m",
+                    "-Xmx1g",
+                    "-XX:ShenandoahMaxRegionSize=33m",
+                    "-version");
+            output.shouldHaveExitValue(0);
+        }
+
     }
 
     private static void testMaxRegionSize() throws Exception {

From ac046628edaee66d1469c49864b70bdefee6570e Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 26 Nov 2025 10:06:51 +0000
Subject: [PATCH 356/512] 8372336: javac fails with an exception when a class
 is missing while evaluating conditional expression

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Resolve.java     |   7 +-
 .../tools/javac/recovery/AttrRecovery.java    | 103 +++++++++++++++++-
 2 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index eea766f57c1..07f2a742bcb 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -2810,7 +2810,12 @@ public class Resolve {
     Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
                                   Symbol location, Type site, Name name, List<Type> argtypes,
                                   List<Type> typeargtypes) {
-        return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes);
+        try {
+            return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes);
+        } catch (CompletionFailure cf) {
+            chk.completionError(pos, cf);
+            return methodNotFound.access(name, site.tsym);
+        }
     }
     private Symbol resolveQualifiedMethod(MethodResolutionContext resolveContext,
                                   DiagnosticPosition pos, Env<AttrContext> env,
diff --git a/test/langtools/tools/javac/recovery/AttrRecovery.java b/test/langtools/tools/javac/recovery/AttrRecovery.java
index f8d02d0ddf1..9a37ce60654 100644
--- a/test/langtools/tools/javac/recovery/AttrRecovery.java
+++ b/test/langtools/tools/javac/recovery/AttrRecovery.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8301580 8322159 8333107 8332230 8338678 8351260 8366196
+ * @bug 8301580 8322159 8333107 8332230 8338678 8351260 8366196 8372336
  * @summary Verify error recovery w.r.t. Attr
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -32,11 +32,14 @@
  * @run main AttrRecovery
  */
 
+import com.sun.source.tree.MemberReferenceTree;
+import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.VariableTree;
 import com.sun.source.util.TaskEvent;
 import com.sun.source.util.TaskListener;
 import com.sun.source.util.TreePathScanner;
 import com.sun.source.util.Trees;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -394,4 +397,102 @@ public class AttrRecovery extends TestRunner {
             error("Expected: " + expected + ", but got: " + actual);
         }
     }
+
+    @Test //JDK-8372336
+    public void testCompletionFailureNoBreakInvocation() throws Exception {
+        Path curPath = Path.of(".");
+        Path lib = curPath.resolve("lib");
+        Path classes = lib.resolve("classes");
+        Files.createDirectories(classes);
+        new JavacTask(tb)
+            .outdir(classes)
+            .sources("""
+                     package test;
+                     public class Intermediate extends Base {}
+                     """,
+                     """
+                     package test;
+                     public class Base {
+                         public int get() {
+                             return -1;
+                         }
+                     }
+                     """)
+            .run()
+            .writeAll();
+
+        Files.delete(classes.resolve("test").resolve("Base.class"));
+
+        record TestCase(String code, String... expectedErrors) {}
+        TestCase[] testCases = new TestCase[] {
+            new TestCase("""
+                         package test;
+                         public class Test {
+                             private void test(Intermediate i) {
+                                 int j = i != null ? i.get() : -1;
+                             }
+                         }
+                         """,
+                         "Test.java:4:30: compiler.err.cant.access: test.Base, (compiler.misc.class.file.not.found: test.Base)",
+                         "1 error"),
+            new TestCase("""
+                         package test;
+                         public class Test {
+                             private void test(Intermediate i) {
+                                 i.get();
+                             }
+                         }
+                         """,
+                         "Test.java:4:10: compiler.err.cant.access: test.Base, (compiler.misc.class.file.not.found: test.Base)",
+                         "1 error")
+        };
+
+        for (TestCase tc : testCases) {
+            List<String> actual = new JavacTask(tb)
+                    .options("-XDrawDiagnostics", "-XDdev")
+                    .classpath(classes)
+                    .sources(tc.code())
+                    .outdir(curPath)
+                    .callback(task -> {
+                        task.addTaskListener(new TaskListener() {
+                            @Override
+                            public void finished(TaskEvent e) {
+                                if (e.getKind() != TaskEvent.Kind.ANALYZE) {
+                                    return ;
+                                }
+                                Trees trees = Trees.instance(task);
+                                new TreePathScanner<Void, Void>() {
+                                    @Override
+                                    public Void visitMethodInvocation(MethodInvocationTree node, Void p) {
+                                        if (!node.toString().contains("super")) {
+                                            verifyElement();
+                                        }
+                                        return super.visitMethodInvocation(node, p);
+                                    }
+                                    @Override
+                                    public Void visitMemberReference(MemberReferenceTree node, Void p) {
+                                        verifyElement();
+                                        return super.visitMemberReference(node, p);
+                                    }
+                                    private void verifyElement() {
+                                        Element el = trees.getElement(getCurrentPath());
+                                        if (!el.getSimpleName().contentEquals("get")) {
+                                            error("Expected good Element, but got: " + el);
+                                        }
+                                    }
+                                }.scan(e.getCompilationUnit(), null);
+                            }
+                        });
+                    })
+                    .run(Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(OutputKind.DIRECT);
+
+            List<String> expected = List.of(tc.expectedErrors);
+
+            if (!Objects.equals(actual, expected)) {
+                error("Expected: " + expected + ", but got: " + actual);
+            }
+        }
+    }
 }

From 4ae2f31f3d2027daa0a5ccba6180e7bb27413aa5 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 26 Nov 2025 12:49:42 +0000
Subject: [PATCH 357/512] 8371626: [linux] use icf=all for linking libraries

Reviewed-by: goetz, erikj
---
 make/autoconf/flags-ldflags.m4 | 7 +++++++
 make/autoconf/toolchain.m4     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index ad131b20e27..572790b567b 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -50,7 +50,14 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # add -z,relro (mark relocations read only) for all libs
     # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
     # add --no-as-needed to disable default --as-needed link flag on some GCC toolchains
+    # add --icf=all (Identical Code Folding — merges identical functions)
     BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
+    if test "x$LINKER_TYPE" = "xgold"; then
+      if test x$DEBUG_LEVEL = xrelease; then
+        BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--icf=all"
+      fi
+    fi
+
     # Linux : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       if test "x$OPENJDK_TARGET_CPU" = xs390x; then
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 4662c62d901..15210efe4a7 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -516,6 +516,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     if [ [[ "$LINKER_VERSION_STRING" == *gold* ]] ]; then
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*) .*/\1/'` ]
+      LINKER_TYPE=gold
     else
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]

From c146805da5708b479bf8dd0180acd06657b72788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20H=C3=BCbner?= <phubner@openjdk.org>
Date: Wed, 26 Nov 2025 13:05:41 +0000
Subject: [PATCH 358/512] 8368551: Core dump warning may be confusing

Reviewed-by: stuefe, dholmes
---
 src/hotspot/os/linux/os_linux.cpp             |  2 +-
 src/hotspot/os/posix/os_posix.cpp             | 39 ++++++++++++++-----
 .../TestCrashOnOutOfMemoryError.java          |  6 +--
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 30033903ca3..efeeec6f484 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -5163,7 +5163,7 @@ int os::get_core_path(char* buffer, size_t bufferSize) {
 
     if (core_pattern[0] == '|') {
       written = jio_snprintf(buffer, bufferSize,
-                             "\"%s\" (or dumping to %s/core.%d)",
+                             "\"%s\" (alternatively, falling back to %s/core.%d)",
                              &core_pattern[1], p, current_process_id());
     } else if (pid_pos != nullptr) {
       *pid_pos = '\0';
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 1a04cbba0de..8f1f07dd055 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -108,41 +108,60 @@ size_t os::_os_min_stack_allowed = PTHREAD_STACK_MIN;
 
 // Check core dump limit and report possible place where core can be found
 void os::check_core_dump_prerequisites(char* buffer, size_t bufferSize, bool check_only) {
+  stringStream buf(buffer, bufferSize);
   if (!FLAG_IS_DEFAULT(CreateCoredumpOnCrash) && !CreateCoredumpOnCrash) {
-    jio_snprintf(buffer, bufferSize, "CreateCoredumpOnCrash is disabled from command line");
-    VMError::record_coredump_status(buffer, false);
+    buf.print("CreateCoredumpOnCrash is disabled from command line");
+    VMError::record_coredump_status(buf.freeze(), false);
   } else {
     struct rlimit rlim;
     bool success = true;
     bool warn = true;
     char core_path[PATH_MAX];
     if (get_core_path(core_path, PATH_MAX) <= 0) {
-      jio_snprintf(buffer, bufferSize, "core.%d (may not exist)", current_process_id());
+      // In the warning message, let the user know.
+      if (check_only) {
+        buf.print("the core path couldn't be determined. It commonly defaults to ");
+      }
+      buf.print("core.%d%s", current_process_id(), check_only ? "" : " (may not exist)");
 #ifdef LINUX
     } else if (core_path[0] == '"') { // redirect to user process
-      jio_snprintf(buffer, bufferSize, "Core dumps may be processed with %s", core_path);
+      if (check_only) {
+        buf.print("core dumps may be further processed by the following: ");
+      } else {
+        buf.print("Determined by the following: ");
+      }
+      buf.print("%s", core_path);
 #endif
     } else if (getrlimit(RLIMIT_CORE, &rlim) != 0) {
-      jio_snprintf(buffer, bufferSize, "%s (may not exist)", core_path);
+      if (check_only) {
+        buf.print("the rlimit couldn't be determined. If resource limits permit, the core dump will be located at ");
+      }
+      buf.print("%s%s", core_path, check_only ? "" : " (may not exist)");
     } else {
       switch(rlim.rlim_cur) {
         case RLIM_INFINITY:
-          jio_snprintf(buffer, bufferSize, "%s", core_path);
+          buf.print("%s", core_path);
           warn = false;
           break;
         case 0:
-          jio_snprintf(buffer, bufferSize, "Core dumps have been disabled. To enable core dumping, try \"ulimit -c unlimited\" before starting Java again");
+          buf.print("%s dumps have been disabled. To enable core dumping, try \"ulimit -c unlimited\" before starting Java again", check_only ? "core" : "Core");
           success = false;
           break;
         default:
-          jio_snprintf(buffer, bufferSize, "%s (max size " UINT64_FORMAT " k). To ensure a full core dump, try \"ulimit -c unlimited\" before starting Java again", core_path, uint64_t(rlim.rlim_cur) / K);
+          if (check_only) {
+            buf.print("core dumps are constrained ");
+          } else {
+             buf.print( "%s ", core_path);
+          }
+          buf.print( "(max size " UINT64_FORMAT " k). To ensure a full core dump, try \"ulimit -c unlimited\" before starting Java again", uint64_t(rlim.rlim_cur) / K);
           break;
       }
     }
+    const char* result = buf.freeze();
     if (!check_only) {
-      VMError::record_coredump_status(buffer, success);
+      VMError::record_coredump_status(result, success);
     } else if (warn) {
-      warning("CreateCoredumpOnCrash specified, but %s", buffer);
+      warning("CreateCoredumpOnCrash specified, but %s", result);
     }
   }
 }
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
index 0be39d22ebe..26d1f726feb 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,8 +72,8 @@ public class TestCrashOnOutOfMemoryError {
            #
            # JRE version: OpenJDK Runtime Environment (9.0) (build 1.9.0-internal-debug-cheleswer_2015_10_20_14_32-b00)
            # Java VM: OpenJDK 64-Bit Server VM (1.9.0-internal-debug-cheleswer_2015_10_20_14_32-b00, mixed mode, tiered, compressed oops, serial gc, linux-amd64)
-           # Core dump will be written. Default location: Core dumps may be processed with "/usr/share/apport/apport %p %s %c %P" (or dumping to
-             /home/cheleswer/Desktop/core.6212)
+           # Core dump will be written. Default location: Determined by the following:
+           "/usr/share/apport/apport %p %s %c %P" (alternatively, falling back to /home/cheleswer/Desktop/core.6212)
            #
            # An error report file with more information is saved as:
            # /home/cheleswer/Desktop/hs_err_pid6212.log

From 74354f23dbb0fc852d216c8f1d3e5f80d406cfc6 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Wed, 26 Nov 2025 13:25:57 +0000
Subject: [PATCH 359/512] 8372585: TestVerifyLoopOptimizationsHitsMemLimit
 fails with product builds

Reviewed-by: rcastanedalo, thartmann
---
 .../loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java b/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
index fbe69ad0e04..90a8287004f 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestVerifyLoopOptimizationsHitsMemLimit.java
@@ -45,7 +45,8 @@ package compiler.loopopts;
  *      -XX:-TieredCompilation -Xcomp -XX:PerMethodTrapLimit=0
  *      -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations -XX:-StressDuplicateBackedge
  *      compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
- * @run main/othervm -XX:-StressDuplicateBackedge compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-StressDuplicateBackedge
+ *                   compiler.loopopts.TestVerifyLoopOptimizationsHitsMemLimit
  */
 
 public class TestVerifyLoopOptimizationsHitsMemLimit {

From 85d4f551b1f82f1b43155a4ac3c5026ac580410e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 26 Nov 2025 13:36:58 +0000
Subject: [PATCH 360/512] 8372055: Fragment link tag does not work in package
 info

Reviewed-by: liach
---
 .../com/sun/tools/javac/api/JavacTrees.java   |  18 ++-
 .../formats/html/taglets/LinkTaglet.java      |   5 +
 .../jdk/javadoc/internal/doclint/Checker.java |  15 +-
 .../testSeeLinkAnchor/TestSeeLinkAnchor.java  | 139 ++++++++++++++++--
 4 files changed, 156 insertions(+), 21 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index f933ef36565..22ee2393a02 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -413,7 +413,18 @@ public class JavacTrees extends DocTrees {
             }
 
             if (ref.qualifierExpression == null) {
-                tsym = env.enclClass.sym;
+                // Resolve target for unqualified reference based on declaring element
+                tsym = switch (path.getLeaf().getKind()) {
+                    case PACKAGE -> env.toplevel.packge;
+                    case MODULE -> env.toplevel.modle;
+                    case COMPILATION_UNIT ->
+                        // Treat unqualified reference in legacy package.html as package reference.
+                        // Unqualified references in doc-files only need to work locally, so null is fine.
+                        path.getCompilationUnit().getSourceFile().isNameCompatible("package", JavaFileObject.Kind.HTML)
+                                ? env.toplevel.packge
+                                : null;
+                    default -> env.enclClass.sym;  // Class or class member reference
+                };
                 memberName = (Name) ref.memberName;
             } else {
                 // Check if qualifierExpression is a type or package, using the methods javac provides.
@@ -470,8 +481,11 @@ public class JavacTrees extends DocTrees {
                 }
             }
 
-            if (memberName == null)
+            if (memberName == null) {
                 return tsym;
+            } else if (tsym == null || tsym.getKind() == ElementKind.PACKAGE || tsym.getKind() == ElementKind.MODULE) {
+                return null;  // Non-null member name in non-class context
+            }
 
             if (tsym.type.isPrimitive()) {
                 return null;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
index 914f70ced47..62b003afd96 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
@@ -50,6 +50,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
 import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlId;
 import jdk.javadoc.internal.html.HtmlTree;
 import jdk.javadoc.internal.html.Text;
 
@@ -159,6 +160,10 @@ public class LinkTaglet extends BaseTaglet {
                         Optional.of(refSignature));
             }
             refFragment = refFragment.substring(1);
+            if (ref == null && refSignature.startsWith("##")) {
+                // Unqualified local anchor link in doc-file
+                return htmlWriter.links.createLink(HtmlId.of(refFragment), labelContent);
+            }
         }
         if (refClass == null) {
             ModuleElement refModule = ch.getReferencedModule(ref);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index 3669c800a8e..43405c3ebb0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -1004,12 +1004,15 @@ public class Checker extends DocTreePathScanner<Void, Void> {
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitReference(ReferenceTree tree, Void ignore) {
-        Element e = env.trees.getElement(getCurrentPath());
-        if (e == null) {
-            reportBadReference(tree);
-        } else if ((inLink || inSee)
-                && e.getKind() == ElementKind.CLASS && e.asType().getKind() != TypeKind.DECLARED) {
-            reportBadReference(tree);
+        // Exclude same-file anchor links from reference checks
+        if (!tree.getSignature().startsWith("##")) {
+            Element e = env.trees.getElement(getCurrentPath());
+            if (e == null) {
+                reportBadReference(tree);
+            } else if ((inLink || inSee)
+                    && e.getKind() == ElementKind.CLASS && e.asType().getKind() != TypeKind.DECLARED) {
+                reportBadReference(tree);
+            }
         }
         return super.visitReference(tree, ignore);
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSeeLinkAnchor/TestSeeLinkAnchor.java b/test/langtools/jdk/javadoc/doclet/testSeeLinkAnchor/TestSeeLinkAnchor.java
index 626e4870401..f59de2e5e70 100644
--- a/test/langtools/jdk/javadoc/doclet/testSeeLinkAnchor/TestSeeLinkAnchor.java
+++ b/test/langtools/jdk/javadoc/doclet/testSeeLinkAnchor/TestSeeLinkAnchor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,11 @@ public class TestSeeLinkAnchor extends JavadocTester {
             """
                     Link to <a href="../p2/package-summary.html#package-p2-heading"><code>heading in package p2</code></a>""",
             """
-                    Plain link to <a href="../p2/Class2.html#class2-sub-heading">sub heading above</a></div>""",
+                    Plain link to <a href="../p2/Class2.html#class2-sub-heading">heading in Class2</a></div>""",
+            """
+                    <li><a href="#main">unqualified link to heading above</a></li>
+                    <li><a href="#main">qualified link to heading above</a></li>
+                    """,
             """
                     <li><a href="../p2/Class2.html#class2main">See main heading in p2.Class2</a></li>
                     <li><a href="../p2/package-summary.html#package-p2-heading">See heading in p2</a></li>
@@ -89,13 +93,19 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     Plain link <a href="../p1/Class1.html#main">to Class1</a>.""");
         checkOrder("p2/package-summary.html",
             """
-                    <a href="Class2.html#class2-sub-heading">See sub heading in p2.Class2</a>""");
+                    <li><a href="Class2.html#class2-sub-heading">See sub heading in p2.Class2</a></li>
+                    <li><a href="#package-p2-heading">local qualified link</a></li>
+                    <li><a href="#package-p2-heading">local unqualified link</a></li>
+                    """);
 
         checkOrder("p2/doc-files/file.html",
             """
                     Plain link to <a href="../../p1/Class1.html#main">heading in p1.ClassA</a>.""",
             """
-                    <a href="../Class2.html#class2main">See main heading in p2.ClassB</a>""");
+                    <li><a href="../Class2.html#class2main">See main heading in p2.ClassB</a></li>
+                    <li><a href="../package-summary.html#package-p2-heading">package link</a></li>
+                    <li><a href="#package-p2-html-file-heading">local anchor</a></li>
+                    """);
     }
 
     @Test
@@ -112,12 +122,57 @@ public class TestSeeLinkAnchor extends JavadocTester {
         checkOrder("m1/module-summary.html",
             """
                     <a href="../m2/com/m2/Class2.html#main-heading">See main heading in Class2</a>""");
+        checkOrder("m1/com/m1/package-summary.html",
+            """
+                    <div class="block"><a href="#package-anchor">Link to local anchor</a>.
+                    """,
+            """
+                    <span id="package-anchor" class="search-tag-result">package-anchor</span></div>
+                    """,
+            """
+                    <ul class="tag-list">
+                    <li><a href="#package-anchor">unqualified local anchor</a></li>
+                    <li><a href="#package-anchor">qualified local anchor</a></li>
+                    <li><a href="#package-anchor">fully qualified local anchor</a></li>
+                    </ul>
+                    """);
         checkOrder("m1/com/m1/Class1.html",
             """
                     <a href="../../../m2/com/m2/Class2.html#sub"><code>sub heading in Class2</code></a>.""",
             """
-                    <li><a href="../../../m2/com/m2/Class2.html#main-heading">See main heading in Class2</a></li>
-                    <li><a href="../../module-summary.html#module-m1-heading">See heading in module m1</a></li>
+                    <p>More links:
+                    <ul>
+                    <li><a href="../../../m2/com/m2/Class2.html#sub">qualified remote link</a></li>
+                    <li><a href="../../../m2/com/m2/Class2.html#sub">unqualified remote link</a></li>
+                    <li><a href="../../module-summary.html#module-m1-heading">module anchor link</a></li>
+                    <li><a href="package-summary.html#package-anchor">package anchor link</a></li>
+                    <li><a href="#class1-anchor">qualified local anchor link</a></li>
+                    <li><a href="#class1-anchor">unqualified local anchor link</a></li>
+                    </ul>
+                    """,
+            """
+                    <dt>See Also:</dt>
+                    <dd>
+                    <ul class="tag-list">
+                    <li><a href="../../../m2/com/m2/Class2.html#main-heading">qualified remote link</a></li>
+                    <li><a href="../../../m2/com/m2/Class2.html#main-heading">unqualified remote link</a></li>
+                    <li><a href="../../module-summary.html#module-m1-heading">module anchor link</a></li>
+                    <li><a href="package-summary.html#package-anchor">package anchor link</a></li>
+                    <li><a href="#class1-anchor">qualified local anchor link</a></li>
+                    <li><a href="#class1-anchor">unqualified local anchor link</a></li>
+                    </ul>
+                    """);
+        checkOrder("m2/module-summary.html",
+            """
+                    <a href="com/m2/package-summary.html#pkg-heading">Plain link to local anchor</a>.""");
+        checkOrder("m2/com/m2/package-summary.html",
+            """
+                    <a href="#pkg-heading">Plain link to local anchor</a>.
+                    """,
+            """
+                    <ul class="tag-list">
+                    <li><a href="#pkg-heading">See local anchor</a></li>
+                    </ul>
                     """);
         checkOrder("m2/com/m2/Class2.html",
             """
@@ -126,9 +181,14 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     Plain link to <a href="#sub">sub heading above</a>.""");
         checkOrder("m2/doc-files/file.html",
             """
-                    Link to <a href="../com/m2/Class2.html#main-heading"><code>heading in Class2</code></a>.""",
+                    Link to <a href="../com/m2/Class2.html#main-heading"><code>heading in Class2</code></a>.
+                    <a href="#docfile-heading">Plain link to local anchor</a>.
+                    """,
             """
-                    <li><a href="../../m1/module-summary.html#module-m1-heading">Heading in module m1</a></li>""");
+                    <ul class="tag-list">
+                    <li><a href="../../m1/module-summary.html#module-m1-heading">Heading in module m1</a></li>
+                    <li><a href="#docfile-heading">See local anchor</a></li>
+                    """);
     }
 
     @Test
@@ -197,7 +257,9 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     <h2 id="main">Class1 Main</h2>
                     Link to {@link p2##package-p2-heading heading in package p2}
                     <h3>Class1 Sub</h3>
-                    Plain link to {@linkplain p2.Class2##class2-sub-heading sub heading above}
+                    Plain link to {@linkplain p2.Class2##class2-sub-heading heading in Class2}
+                    @see ##main unqualified link to heading above
+                    @see p1.Class1##main qualified link to heading above
                     """)
                 .addMembers(mb)
                 .write(src);
@@ -216,6 +278,8 @@ public class TestSeeLinkAnchor extends JavadocTester {
                      * <h2>Package p2</h2>
                      *
                      * @see p2.Class2##class2-sub-heading See sub heading in p2.Class2
+                     * @see p2##package-p2-heading local qualified link
+                     * @see ##package-p2-heading local unqualified link
                      */
                     package p2;
                     """);
@@ -227,6 +291,8 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     <body><h1>Package p2 HTML File</h1>
                     Plain link to {@linkplain p1.Class1##main heading in p1.ClassA}.
                     @see p2.Class2##class2main See main heading in p2.ClassB
+                    @see p2##package-p2-heading package link
+                    @see ##package-p2-html-file-heading local anchor
                     </body>
                     </html>
                     """);
@@ -235,13 +301,33 @@ public class TestSeeLinkAnchor extends JavadocTester {
     void generateModuleSources() throws Exception {
         new ModuleBuilder(tb, "m1")
                 .exports("com.m1")
+                .requires("m2")
                 .classes("""
                     package com.m1;
+
+                    import com.m2.Class2;
+
                     /**
                      * Link to the {@link m2/com.m2.Class2##sub sub heading in Class2}.
                      *
-                     * @see m2/com.m2.Class2##main-heading See main heading in Class2
-                     * @see m1/##module-m1-heading See heading in module m1
+                     * <p>More links:
+                     * <ul>
+                     * <li>{@linkplain com.m2.Class2##sub qualified remote link}</li>
+                     * <li>{@linkplain Class2##sub unqualified remote link}</li>
+                     * <li>{@linkplain m1/##module-m1-heading module anchor link}</li>
+                     * <li>{@linkplain com.m1##package-anchor package anchor link}</li>
+                     * <li>{@linkplain Class1##class1-anchor qualified local anchor link}</li>
+                     * <li>{@linkplain ##class1-anchor unqualified local anchor link}</li>
+                     * </ul>
+                     *
+                     * <p>{@index class1-anchor}
+                     *
+                     * @see com.m2.Class2##main-heading  qualified remote link
+                     * @see Class2##main-heading unqualified remote link
+                     * @see m1/##module-m1-heading module anchor link
+                     * @see com.m1##package-anchor package anchor link
+                     * @see Class1##class1-anchor qualified local anchor link
+                     * @see ##class1-anchor unqualified local anchor link
                      */
                     public class Class1 {}
                     """)
@@ -250,6 +336,17 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     @see m2/com.m2.Class2##main-heading See main heading in Class2
                     """)
                 .write(src);
+        tb.writeFile(src.resolve("m1/com/m1/package-info.java"), """
+                    /**
+                     * {@linkplain ##package-anchor Link to local anchor}.
+                     * {@index package-anchor}
+                     *
+                     * @see ##package-anchor unqualified local anchor
+                     * @see com.m1##package-anchor qualified local anchor
+                     * @see m1/com.m1##package-anchor fully qualified local anchor
+                     */
+                    package com.m1;
+                    """);
         new ModuleBuilder(tb, "m2")
                 .exports("com.m2")
                 .classes("""
@@ -264,14 +361,30 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     public class Class2 {}
                     """)
                 .write(src);
+        tb.writeFile(src.resolve("m2/com/m2/package.html"), """
+                    <html>
+                    <head><title>Package com.m2</title></head>
+                    <body>
+                    {@linkplain ##pkg-heading Plain link to local anchor}.
+
+                    <h2 id="pkg-heading">Package com.m2</h2>
+
+                    @see ##pkg-heading See local anchor
+                    </body>
+                    </html>
+                    """);
         Path docFiles = src.resolve("m2").resolve("doc-files");
         tb.writeFile(docFiles.resolve("file.html"),
                 """
                     <html>
                     <head><title>Module m2 HTML File</title></head>
-                    <body><h1>Module m2 HTML File</h1>
+                    <body>
+                    <h1 id=docfile-heading>Module m2 HTML File</h1>
                     Link to {@link com.m2.Class2##main-heading heading in Class2}.
+                    {@linkplain ##docfile-heading Plain link to local anchor}.
+
                     @see m1/##module-m1-heading Heading in module m1
+                    @see ##docfile-heading See local anchor
                     </body>
                     </html>
                     """);
@@ -297,4 +410,4 @@ public class TestSeeLinkAnchor extends JavadocTester {
                     """)
                 .write(src);
     }
-}
\ No newline at end of file
+}

From 0a3809f0be94c92c2c46f00fe5ff981afdd55cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 26 Nov 2025 14:07:06 +0000
Subject: [PATCH 361/512] 8369531: Wrong tooltip used in external class links

Reviewed-by: liach
---
 .../formats/html/HtmlDocletWriter.java        |  7 +-
 .../doclets/formats/html/HtmlLinkFactory.java |  4 +-
 .../doclets/formats/html/markup/Links.java    |  4 +-
 .../html/resources/standard.properties        |  1 -
 .../html/resources/standard_de.properties     |  1 -
 .../html/resources/standard_ja.properties     |  1 -
 .../html/resources/standard_zh_CN.properties  |  1 -
 .../TestClassCrossReferences.java             | 39 ++++----
 .../TestDocRootInlineTag.java                 |  6 +-
 .../TestExternalOverriddenMethod.java         | 18 ++--
 .../TestGenericTypeLink.java                  | 91 +++++++++----------
 .../doclet/testLinkOption/TestLinkOption.java | 41 ++++-----
 .../TestLinkOptionWithAutomaticModule.java    |  8 +-
 .../TestLinkOptionWithModule.java             | 14 +--
 .../testLinkOption/TestRedirectLinks.java     |  9 +-
 .../testLinkPlatform/TestLinkPlatform.java    | 40 ++++----
 .../TestLinkTagletWithModule.java             | 23 ++---
 .../testMarkdown/TestMarkdownLinks.java       | 12 +--
 .../doclet/testModules/TestModules.java       |  4 +-
 .../doclet/testPreview/TestPreview.java       |  6 +-
 .../testSeeTag/TestSeeTagWithModule.java      | 22 ++---
 .../testSnippetTag/TestSnippetMarkup.java     |  2 +-
 .../testTitleInHref/TestTitleInHref.java      |  2 +-
 23 files changed, 171 insertions(+), 185 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 6896b86279f..1f2c4d97dd3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -908,12 +908,13 @@ public abstract class HtmlDocletWriter {
      * @param refMemName the name of the member being referenced.  This should
      * be null or empty string if no member is being referenced.
      * @param label the label for the external link.
+     * @param title the title for the link
      * @param style optional style for the link.
      * @param code true if the label should be code font.
      * @return the link
      */
     public Content getCrossClassLink(TypeElement classElement, String refMemName,
-                                     Content label, HtmlStyle style, boolean code) {
+                                     Content label, String title, HtmlStyle style, boolean code) {
         if (classElement != null) {
             String className = utils.getSimpleName(classElement);
             PackageElement packageElement = utils.containingPackage(classElement);
@@ -931,9 +932,7 @@ public abstract class HtmlDocletWriter {
                 DocLink link = configuration.extern.getExternalLink(packageElement, pathToRoot,
                                 className + ".html", refMemName);
                 return links.createLink(link,
-                    (label == null) || label.isEmpty() ? defaultLabel : label, style,
-                    resources.getText("doclet.Href_Class_Or_Interface_Title",
-                        getLocalizedPackageName(packageElement)), true);
+                    (label == null) || label.isEmpty() ? defaultLabel : label, style, title, true);
             }
         }
         return null;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
index 4dbbd5e172a..cb8b3dbfd40 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
@@ -305,7 +305,7 @@ public class HtmlLinkFactory {
         } else {
             Content crossLink = m_writer.getCrossClassLink(
                 typeElement, linkInfo.getFragment(),
-                label, linkInfo.getStyle(), true);
+                label, linkInfo.getTitle(), linkInfo.getStyle(), true);
             if (crossLink != null) {
                 link.add(crossLink);
                 addSuperscript(link, flags, null, typeElement, previewTarget, restrictedTarget);
@@ -361,7 +361,7 @@ public class HtmlLinkFactory {
         if (fileName != null) {
             return m_writer.links.createLink(fileName.fragment(id.name()), label);
         } else if (typeElement != null) {
-            return (m_writer.getCrossClassLink(typeElement, id.name(), label, null, false));
+            return (m_writer.getCrossClassLink(typeElement, id.name(), label, null, null, false));
         } else {
             return label;
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
index 0af29135654..285ab260e0e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -197,7 +197,7 @@ public class Links {
         if (style != null) {
             l.setStyle(style);
         }
-        if (title != null && title.length() != 0) {
+        if (title != null && !title.isEmpty()) {
             l.put(HtmlAttr.TITLE, title);
         }
         if (isExternal) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index df3c2fc3a53..4366295477b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -51,7 +51,6 @@ doclet.Href_Annotation_Interface_Title=annotation interface in {0}
 doclet.Href_Enum_Title=enum in {0}
 doclet.Href_Enum_Class_Title=enum class in {0}
 doclet.Href_Type_Param_Title=type parameter in {0}
-doclet.Href_Class_Or_Interface_Title=class or interface in {0}
 doclet.Summary=Summary:
 doclet.Detail=Detail:
 doclet.Module_Sub_Nav=Module:
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
index 2669aa9bdc0..4cbb4b97774 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
@@ -51,7 +51,6 @@ doclet.Href_Annotation_Interface_Title=Annotationsschnittstelle in {0}
 doclet.Href_Enum_Title=Enum in {0}
 doclet.Href_Enum_Class_Title=Enum-Klasse in {0}
 doclet.Href_Type_Param_Title=Typparameter in {0}
-doclet.Href_Class_Or_Interface_Title=Klasse oder Schnittstelle in {0}
 doclet.Summary=Übersicht:
 doclet.Detail=Details:
 doclet.Module_Sub_Nav=Modul:
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index 1694dc980bc..2151b3f4a2e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -51,7 +51,6 @@ doclet.Href_Annotation_Interface_Title={0}内の注釈インタフェース
 doclet.Href_Enum_Title={0}内の列挙型
 doclet.Href_Enum_Class_Title={0}の列挙クラス
 doclet.Href_Type_Param_Title={0}内の型パラメータ
-doclet.Href_Class_Or_Interface_Title={0}内のクラスまたはインタフェース
 doclet.Summary=概要:
 doclet.Detail=詳細:
 doclet.Module_Sub_Nav=モジュール:
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index 8881171351e..66620d158bb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -51,7 +51,6 @@ doclet.Href_Annotation_Interface_Title={0} 中的批注接口
 doclet.Href_Enum_Title={0}中的枚举
 doclet.Href_Enum_Class_Title={0} 中的枚举类
 doclet.Href_Type_Param_Title={0}中的类型参数
-doclet.Href_Class_Or_Interface_Title={0}中的类或接口
 doclet.Summary=概要:
 doclet.Detail=详细资料:
 doclet.Module_Sub_Nav=模块:
diff --git a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java
index 982e38dafaa..1e9461454f7 100644
--- a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java
+++ b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4652655 4857717 8025633 8026567 8071982 8164407 8182765 8205593 8240169
+ *      8369531
  * @summary This test verifies that class cross references work properly.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -58,18 +59,18 @@ public class TestClassCrossReferences extends JavadocTester {
                 "<a href=\"" + uri + """
                     java/math/package-summary.html" class="external-link"><code>Link to math package</code></a>""",
                 "<a href=\"" + uri + """
-                    javax/swing/text/AbstractDocument.AttributeContext.html" title="class or interfa\
-                    ce in javax.swing.text" class="external-link"><code>Link to AttributeContext inn\
-                    erclass</code></a>""",
+                    javax/swing/text/AbstractDocument.AttributeContext.html" title="interface in jav\
+                    ax.swing.text" class="external-link"><code>Link to AttributeContext innerclass</\
+                    code></a>""",
                 "<a href=\"" + uri + """
-                    java/math/BigDecimal.html" title="class or interface in java.math" class="extern\
-                    al-link"><code>Link to external class BigDecimal</code></a>""",
+                    java/math/BigDecimal.html" title="class in java.math" class="external-link"><cod\
+                    e>Link to external class BigDecimal</code></a>""",
                 "<a href=\"" + uri + """
-                    java/math/BigInteger.html#gcd-java.math.BigInteger-" title="class or interface i\
-                    n java.math" class="external-link"><code>Link to external member gcd</code></a>""",
+                    java/math/BigInteger.html#gcd-java.math.BigInteger-" class="external-link"><code\
+                    >Link to external member gcd</code></a>""",
                 "<a href=\"" + uri + """
-                    javax/tools/SimpleJavaFileObject.html#uri" title="class or interface in javax.to\
-                    ols" class="external-link"><code>Link to external member URI</code></a>""",
+                    javax/tools/SimpleJavaFileObject.html#uri" class="external-link"><code>Link to e\
+                    xternal member URI</code></a>""",
                 """
                     <dl class="notes">
                     <dt>Overrides:</dt>
@@ -95,18 +96,18 @@ public class TestClassCrossReferences extends JavadocTester {
                 "<a href=\"" + uri + """
                     java/math/package-summary.html" class="external-link"><code>Link to math package</code></a>""",
                 "<a href=\"" + uri + """
-                    javax/swing/text/AbstractDocument.AttributeContext.html" title="class or interfa\
-                    ce in javax.swing.text" class="external-link"><code>Link to AttributeContext inn\
-                    erclass</code></a>""",
+                    javax/swing/text/AbstractDocument.AttributeContext.html" title="interface in jav\
+                    ax.swing.text" class="external-link"><code>Link to AttributeContext innerclass</\
+                    code></a>""",
                 "<a href=\"" + uri + """
-                    java/math/BigDecimal.html" title="class or interface in java.math" class="extern\
-                    al-link"><code>Link to external class BigDecimal</code></a>""",
+                    java/math/BigDecimal.html" title="class in java.math" class="external-link"><cod\
+                    e>Link to external class BigDecimal</code></a>""",
                 "<a href=\"" + uri + """
-                    java/math/BigInteger.html#gcd-java.math.BigInteger-" title="class or interface i\
-                    n java.math" class="external-link"><code>Link to external member gcd</code></a>""",
+                    java/math/BigInteger.html#gcd-java.math.BigInteger-" class="external-link"><code\
+                    >Link to external member gcd</code></a>""",
                 "<a href=\"" + uri + """
-                    javax/tools/SimpleJavaFileObject.html#uri" title="class or interface in javax.to\
-                    ols" class="external-link"><code>Link to external member URI</code></a>""",
+                    javax/tools/SimpleJavaFileObject.html#uri" class="external-link"><code>Link to e\
+                    xternal member URI</code></a>""",
                 """
                     <dl class="notes">
                     <dt>Overrides:</dt>
diff --git a/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java
index 04d1e0f14db..a1f97282c50 100644
--- a/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,11 +57,11 @@ public class TestDocRootInlineTag extends JavadocTester {
 
         checkOutput("TestDocRootTag.html", true,
                 "<a href=\"" + uri + """
-                    /java/io/File.html" title="class or interface in java.io" class="external-link"><code>File</code></a>""",
+                    /java/io/File.html" title="class in java.io" class="external-link"><code>File</code></a>""",
                 """
                     <a href="./index-all.html">index</a>""",
                 "<a href=\"" + uri + """
-                    /java/io/File.html" title="class or interface in java.io" class="external-link"><code>Second File Link</code></a>""",
+                    /java/io/File.html" title="class in java.io" class="external-link"><code>Second File Link</code></a>""",
                 "The value of @docRoot is \"./\"");
 
         checkOutput("index-all.html", true,
diff --git a/test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java b/test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java
index 889b2edd1b5..7fd5c054f89 100644
--- a/test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java
+++ b/test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4857717 8025633 8026567 8164407 8182765 8205593
+ * @bug 4857717 8025633 8026567 8164407 8182765 8205593 8369531
  * @summary Test to make sure that externally overridden and implemented methods
  * are documented properly.  The method should still include "implements" or
  * "overrides" documentation even though the method is external.
@@ -56,15 +56,17 @@ public class TestExternalOverriddenMethod extends JavadocTester {
                 """
                     <dt>Overrides:</dt>
                     <dd><code><a href=\"""" + uri + """
-                    /java/io/FilterReader.html#read--" title="class or interface in java.io" class="\
-                    external-link">read</a></code>&nbsp;in class&nbsp;<code><a href=\"""" + uri + """
-                    /java/io/FilterReader.html" title="class or interface in java.io" class="external-link">FilterReader</a></code></dd>""",
+                    /java/io/FilterReader.html#read--" class="external-link">read</a></code>&nbsp;in \
+                    class&nbsp;<code><a href=\"""" + uri + """
+                    /java/io/FilterReader.html" title="class in java.io" class="external-link">Filter\
+                    Reader</a></code></dd>""",
                 """
                     <dt>Specified by:</dt>
                     <dd><code><a href=\"""" + uri + """
-                    /java/io/DataInput.html#readInt--" title="class or interface in java.io" class="\
-                    external-link">readInt</a></code>&nbsp;in interface&nbsp;<code><a href=\"""" + uri + """
-                    /java/io/DataInput.html" title="class or interface in java.io" class="external-link">DataInput</a></code></dd>"""
+                    /java/io/DataInput.html#readInt--" class="external-link">readInt</a></code>&nbsp;\
+                    in interface&nbsp;<code><a href=\"""" + uri + """
+                    /java/io/DataInput.html" title="interface in java.io" class="external-link">DataI\
+                    nput</a></code></dd>"""
         );
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java b/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
index b6317a1e581..72554ef34fe 100644
--- a/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
+++ b/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     8177280 8262992 8259499 8307377 8352249
+ * @bug     8177280 8262992 8259499 8307377 8352249 8369531
  * @summary see and link tag syntax should allow generic types
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -53,13 +53,13 @@ public class TestGenericTypeLink extends JavadocTester {
         checkOutput("pkg1/A.html", true,
                 """
                     <div class="block"><code><a href="http://example.com/docs/api/java.base/java/util/L\
-                    ist.html" title="class or interface in java.util" class="external-link">List</a>&lt\
-                    ;<a href="http://example.com/docs/api/java.base/java/lang/String.html" title="class\
-                     or interface in java.lang" class="external-link">String</a>&gt;</code>
-                    <a href="http://example.com/docs/api/java.base/java/util/List.html" title="class o\
-                    r interface in java.util" class="external-link">List</a>&lt;? extends <a href="http\
-                    ://example.com/docs/api/java.base/java/lang/CharSequence.html" title="class or inte\
-                    rface in java.lang" class="external-link">CharSequence</a>&gt;
+                    ist.html" title="interface in java.util" class="external-link">List</a>&lt;<a href=\
+                    "http://example.com/docs/api/java.base/java/lang/String.html" title="class in java.\
+                    lang" class="external-link">String</a>&gt;</code>
+                    <a href="http://example.com/docs/api/java.base/java/util/List.html" title="interfac\
+                    e in java.util" class="external-link">List</a>&lt;? extends <a href="http://example\
+                    .com/docs/api/java.base/java/lang/CharSequence.html" title="interface in java.lang"\
+                     class="external-link">CharSequence</a>&gt;
                     <a href="#someMethod(java.util.List,int)"><code>someMethod(ArrayList&lt;Integer&gt\
                     ;, int)</code></a>
                     <a href="#otherMethod(java.util.Map,double)"><code>otherMethod(Map&lt;String, Stri\
@@ -72,20 +72,19 @@ public class TestGenericTypeLink extends JavadocTester {
                     <dd>
                     <ul class="tag-list-long">
                     <li><code><a href="http://example.com/docs/api/java.base/java/util/Map.html" title="\
-                    class or interface in java.util" class="external-link">Map</a>&lt;<a href="http://ex\
-                    ample.com/docs/api/java.base/java/lang/String.html" title="class or interface in jav\
-                    a.lang" class="external-link">String</a>, ? extends <a href="http://example.com/\
-                    docs/api/java.base/java/lang/CharSequence.html" title="class or interface in java.la\
-                    ng" class="external-link">CharSequence</a>&gt;</code></li>
+                    interface in java.util" class="external-link">Map</a>&lt;<a href="http://example.com\
+                    /docs/api/java.base/java/lang/String.html" title="class in java.lang" class="externa\
+                    l-link">String</a>, ? extends <a href="http://example.com/docs/api/java.base/java/la\
+                    ng/CharSequence.html" title="interface in java.lang" class="external-link">CharSeque\
+                    nce</a>&gt;</code></li>
                     <li><code><a href="http://example.com/docs/api/java.base/java/util/Map.html" title="\
-                    class or interface in java.util" class="external-link">Map</a>&lt;<a href="http://ex\
-                    ample.com/docs/api/java.base/java/lang/String.html" title="class or interface in jav\
-                    a.lang" class="external-link">String</a>, ? super <a href="A.html" title="class \
-                    in pkg1">A</a>&lt;<a href="http://example.com/docs/api/java.base/java/lang/String.ht\
-                    ml" title="class or interface in java.lang" class="external-link">String</a>, ? \
-                    extends <a href="http://example.com/docs/api/java.base/java/lang/RuntimeException.ht\
-                    ml" title="class or interface in java.lang" class="external-link">RuntimeException</\
-                    a>&gt;&gt;</code></li>
+                    interface in java.util" class="external-link">Map</a>&lt;<a href="http://example.com\
+                    /docs/api/java.base/java/lang/String.html" title="class in java.lang" class="externa\
+                    l-link">String</a>, ? super <a href="A.html" title="class in pkg1">A</a>&lt;<a href=\
+                    "http://example.com/docs/api/java.base/java/lang/String.html" title="class in java.l\
+                    ang" class="external-link">String</a>, ? extends <a href="http://example.com/docs/ap\
+                    i/java.base/java/lang/RuntimeException.html" title="class in java.lang" class="exter\
+                    nal-link">RuntimeException</a>&gt;&gt;</code></li>
                     <li><a href="#someMethod(java.util.List,int)"><code>someMethod(List&lt;Number&gt;, i\
                     nt)</code></a></li>
                     <li><a href="#otherMethod(java.util.Map,double)"><code>otherMethod(Map&lt;String, ? \
@@ -96,11 +95,11 @@ public class TestGenericTypeLink extends JavadocTester {
         checkOutput("pkg1/A.SomeException.html", true,
                 """
                     <div class="block"><code><a href="A.html" title="class in pkg1">A</a>&lt;<a href="h\
-                    ttp://example.com/docs/api/java.base/java/lang/String.html" title="class or interfa\
-                    ce in java.lang" class="external-link">String</a>, <a href="A.SomeException.htm\
-                    l" title="class in pkg1">A.SomeException</a>&gt;</code>
-                    <a href="http://example.com/docs/api/java.base/java/util/Map.html" title="class or\
-                     interface in java.util" class="external-link">link to generic type with label</a>\
+                    ttp://example.com/docs/api/java.base/java/lang/String.html" title="class in java.la\
+                    ng" class="external-link">String</a>, <a href="A.SomeException.html" title="class i\
+                    n pkg1">A.SomeException</a>&gt;</code>
+                    <a href="http://example.com/docs/api/java.base/java/util/Map.html" title="\
+                    interface in java.util" class="external-link">link to generic type with label</a>\
                     </div>""",
                 """
                     <dl class="notes">
@@ -108,12 +107,11 @@ public class TestGenericTypeLink extends JavadocTester {
                     <dd>
                     <ul class="tag-list-long">
                     <li><code><a href="A.html" title="class in pkg1">A</a>&lt;<a href="http://example.c\
-                    om/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang\
-                    " class="external-link">String</a>, <a href="A.SomeException.html" title="class\
-                     in pkg1">A.SomeException</a>&gt;</code></li>
-                    <li><a href="http://example.com/docs/api/java.base/java/util/List.html" title="clas\
-                    s or interface in java.util" class="external-link">Link to generic type with label<\
-                    /a></li>
+                    om/docs/api/java.base/java/lang/String.html" title="class in java.lang" class="exte\
+                    rnal-link">String</a>, <a href="A.SomeException.html" title="class in pkg1">A.SomeE\
+                    xception</a>&gt;</code></li>
+                    <li><a href="http://example.com/docs/api/java.base/java/util/List.html" title="inte\
+                    rface in java.util" class="external-link">Link to generic type with label</a></li>
                     </ul>
                     </dd>
                     </dl>"""
@@ -125,19 +123,18 @@ public class TestGenericTypeLink extends JavadocTester {
                     <dd>
                     <ul class="tag-list-long">
                     <li><code><a href="A.html" title="class in pkg1">A</a>&lt;<a href="http://exampl\
-                    e.com/docs/api/java.base/java/lang/String.html" title="class or interface in jav\
-                    a.lang" class="external-link">String</a>, <a href="http://example.com/docs/a\
-                    pi/java.base/java/lang/RuntimeException.html" title="class or interface in java.\
-                    lang" class="external-link">RuntimeException</a>&gt;.<a href="A.Inner.html" titl\
-                    e="class in pkg1">Inner</a></code></li>
+                    e.com/docs/api/java.base/java/lang/String.html" title="class in java.lang" class\
+                    ="external-link">String</a>, <a href="http://example.com/docs/api/java.base/java\
+                    /lang/RuntimeException.html" title="class in java.lang" class="external-link">Ru\
+                    ntimeException</a>&gt;.<a href="A.Inner.html" title="class in pkg1">Inner</a></c\
+                    ode></li>
                     <li><code><a href="A.html" title="class in pkg1">A</a>&lt;<a href="A.html" title\
                     ="class in pkg1">A</a>&lt;<a href="http://example.com/docs/api/java.base/java/la\
-                    ng/String.html" title="class or interface in java.lang" class="external-link">St\
-                    ring</a>, <a href="http://example.com/docs/api/java.base/java/lang/RuntimeEx\
-                    ception.html" title="class or interface in java.lang" class="external-link">Runt\
-                    imeException</a>&gt;.<a href="A.Inner.html" title="class in pkg1">Inner</a>, \
-                    <a href="A.SomeException.html" title="class in pkg1">A.SomeException</a>&gt;</c\
-                    ode></li>
+                    ng/String.html" title="class in java.lang" class="external-link">String</a>, <a \
+                    href="http://example.com/docs/api/java.base/java/lang/RuntimeException.html" tit\
+                    le="class in java.lang" class="external-link">RuntimeException</a>&gt;.<a href="\
+                    A.Inner.html" title="class in pkg1">Inner</a>, <a href="A.SomeException.html" ti\
+                    tle="class in pkg1">A.SomeException</a>&gt;</code></li>
                     </ul>
                     </dd>
                     </dl>""");
@@ -148,10 +145,10 @@ public class TestGenericTypeLink extends JavadocTester {
                     /a></code></span></div>
                     <div class="block">Here's a generic link: <code><a href="A.html" title="class in\
                      pkg1">A</a>&lt;<a href="http://example.com/docs/api/java.base/java/lang/Object.\
-                    html" title="class or interface in java.lang" class="external-link">Object</a>, \
-                    <a href="http://example.com/docs/api/java.base/java/lang/RuntimeException.ht\
-                    ml" title="class or interface in java.lang" class="external-link">RuntimeExcepti\
-                    on</a>&gt;.<a href="A.Inner.html" title="class in pkg1">Inner</a>""");
+                    html" title="class in java.lang" class="external-link">Object</a>, <a href="http\
+                    ://example.com/docs/api/java.base/java/lang/RuntimeException.html" title="class \
+                    in java.lang" class="external-link">RuntimeException</a>&gt;.<a href="A.Inner.ht\
+                    ml" title="class in pkg1">Inner</a>""");
     }
 
     /**
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
index a645ef31dec..d13e6617247 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4720957 5020118 8026567 8038976 8184969 8164407 8182765 8205593
- *      8216497
+ *      8216497 8369531
  * @summary Test to make sure that -link and -linkoffline link to
  * right files, and URLs with and without trailing slash are accepted.
  * @library ../../lib
@@ -73,8 +73,8 @@ public class TestLinkOption extends JavadocTester {
 
         checkOutput("pkg/C.html", true,
                 "<a href=\"" + url + """
-                    java/lang/String.html" title="class or interface in java.lang" class="external-l\
-                    ink"><code>Link to String Class</code></a>""",
+                    java/lang/String.html" title="class in java.lang" class="external-link"><code>Li\
+                    nk to String Class</code></a>""",
                 //Make sure the parameters are formatted properly when the -link option is used.
                 """
                     (int&nbsp;p1,
@@ -84,20 +84,20 @@ public class TestLinkOption extends JavadocTester {
                     (int&nbsp;p1,
                      int&nbsp;p2,
                      <a href=\"""" + url + """
-                    java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;p3)""");
+                    java/lang/Object.html" title="class in java.lang" class="external-link">Object</a>&nbsp;p3)""");
 
         checkOutput("pkg/B.html", true,
                 """
                     <div class="block">A method with html tag the method <a href=\"""" + url + """
-                    java/lang/ClassLoader.html#getSystemClassLoader--" title="class or interface in \
-                    java.lang" class="external-link"><code><b>getSystemClassLoader()</b></code></a> \
-                    as the parent class loader.</div>""",
+                    java/lang/ClassLoader.html#getSystemClassLoader--" class="external-link"><code><\
+                    b>getSystemClassLoader()</b></code></a> as the parent class loader.</div>""",
                 """
                     <div class="block">is equivalent to invoking <code><a href="#createTempFile(java\
                     .lang.String,java.lang.String,java.io.File)"><code>createTempFile(prefix,&nbsp;s\
                     uffix,&nbsp;null)</code></a></code>.</div>""",
                 "<a href=\"" + url + """
-                    java/lang/String.html" title="class or interface in java.lang" class="external-link">Link-Plain to String Class</a>""",
+                    java/lang/String.html" title="class in java.lang" class="external-link">Link-Pla\
+                    in to String Class</a>""",
                 "<code><b>getSystemClassLoader()</b></code>",
                 "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code>",
                 """
@@ -121,8 +121,8 @@ public class TestLinkOption extends JavadocTester {
                     <div class="type-signature"><span class="modifiers">public abstract class </span\
                     ><span class="element-name type-name-label">StringBuilderChild</span>
                     <span class="extends-implements">extends <a href=\"""" + url + """
-                    java/lang/Object.html" title="class or interface in java.lang" class="external-l\
-                    ink">Object</a></span></div>"""
+                    java/lang/Object.html" title="class in java.lang" class="external-link">Object</\
+                    a></span></div>"""
         );
 
         // Generate the documentation using -linkoffline and a relative path as the first parameter.
@@ -137,7 +137,7 @@ public class TestLinkOption extends JavadocTester {
         checkOutput("pkg2/C2.html", true,
             """
                 This is a link to <a href="../../""" + out1 + """
-                /pkg/C.html" title="class or interface in pkg" class="external-link"><code>Class C</code></a>."""
+                /pkg/C.html" title="class in pkg" class="external-link"><code>Class C</code></a>."""
         );
 
         String out3 = "out3";
@@ -168,12 +168,12 @@ public class TestLinkOption extends JavadocTester {
                     <span class="extends-implements">extends java.lang.Object</span></div>
                     <div class="block">Test links.
                     <br>
-                    <a href="../../out2/pkg2/C2.html" title="class or interface in pkg2" class="ext\
-                    ernal-link"><code>link to pkg2.C2</code></a>
+                    <a href="../../out2/pkg2/C2.html" title="class in pkg2" class="external-link"><c\
+                    ode>link to pkg2.C2</code></a>
                     <br>
-                    <a href="../../out1/mylib/lang/StringBuilderChild.html" title="class or interfa\
-                    ce in mylib.lang" class="external-link"><code>link to mylib.lang.StringBuilderCh\
-                    ild</code></a>.</div>
+                    <a href="../../out1/mylib/lang/StringBuilderChild.html" title="class in mylib.la\
+                    ng" class="external-link"><code>link to mylib.lang.StringBuilderChild</code></a>\
+                    .</div>
                     """
         );
 
@@ -193,12 +193,11 @@ public class TestLinkOption extends JavadocTester {
                     <span class="extends-implements">extends java.lang.Object</span></div>
                     <div class="block">Test links.
                     <br>
-                    <a href="../../copy/out2/pkg2/C2.html" title="class or interface in pkg2" class\
-                    ="external-link"><code>link to pkg2.C2</code></a>
+                    <a href="../../copy/out2/pkg2/C2.html" title="class in pkg2" class="external-lin\
+                    k"><code>link to pkg2.C2</code></a>
                     <br>
-                    <a href="../../copy/out1/mylib/lang/StringBuilderChild.html" title="class or in\
-                    terface in mylib.lang" class="external-link"><code>link to mylib.lang.StringBuil\
-                    derChild</code></a>.</div>
+                    <a href="../../copy/out1/mylib/lang/StringBuilderChild.html" title="class in myl\
+                    ib.lang" class="external-link"><code>link to mylib.lang.StringBuilderChild</code></a>.</div>
                     """
         );
 
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java
index fb31822d0e9..3f1682946b3 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ public class TestLinkOptionWithAutomaticModule extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("p/MyClass.html", true,
                 """
-                    extends <a href="http://myWebsite/lib/LibClass.html" title="class or interface i\
+                    extends <a href="http://myWebsite/lib/LibClass.html" title="class i\
                     n lib" class="external-link">LibClass</a>""");
     }
 
@@ -129,7 +129,7 @@ public class TestLinkOptionWithAutomaticModule extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("my.module/p/MyClass.html", true,
                 """
-                    extends <a href="http://myWebsite/lib/LibClass.html" title="class or interface i\
+                    extends <a href="http://myWebsite/lib/LibClass.html" title="class i\
                     n lib" class="external-link">LibClass</a>""");
     }
 
@@ -154,7 +154,7 @@ public class TestLinkOptionWithAutomaticModule extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("my.module/p/MyClass.html", true,
                 """
-                    extends <a href="http://myWebsite/lib/LibClass.html" title="class or interface i\
+                    extends <a href="http://myWebsite/lib/LibClass.html" title="class i\
                     n lib" class="external-link">LibClass</a>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java
index 113cde3c60d..f2f095b255b 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("com.ex2/com/ex2/B.html", true,
                 """
-                    <a href="../../../../out1a/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link">A</a>""");
+                    <a href="../../../../out1a/com.ex1/com/ex1/A.html" title="class in com.ex1" class="external-link">A</a>""");
     }
 
     @Test
@@ -98,7 +98,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("com/ex2/B.html", true,
                 """
-                    <a href="../../../out2a/com/ex1/A.html" title="class or interface in com.ex1" class="external-link">A</a>""");
+                    <a href="../../../out2a/com/ex1/A.html" title="class in com.ex1" class="external-link">A</a>""");
     }
 
     @Test
@@ -121,7 +121,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
                 + "in ../out3a/ are in the unnamed module");
         checkOutput("com.ex2/com/ex2/B.html", true,
                 """
-                    <a href="../../../../out3a/com/ex1/A.html" title="class or interface in com.ex1" class="external-link">A</a>""");
+                    <a href="../../../../out3a/com/ex1/A.html" title="class in com.ex1" class="external-link">A</a>""");
     }
 
     @Test
@@ -143,7 +143,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
                 + "in ../out4a/ are in named modules");
         checkOutput("com/ex2/B.html", true,
                 """
-                    <a href="../../../out4a/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link">A</a>""");
+                    <a href="../../../out4a/com.ex1/com/ex1/A.html" title="class in com.ex1" class="external-link">A</a>""");
     }
 
     @Test
@@ -167,7 +167,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
                         + "in ../out5a/ are in the unnamed module");
         checkOutput("com.ex2/com/ex2/B.html", true,
                 """
-                    <a href="../../../../out5a/com/ex1/A.html" title="class or interface in com.ex1" class="external-link">A</a>""");
+                    <a href="../../../../out5a/com/ex1/A.html" title="class in com.ex1" class="external-link">A</a>""");
     }
 
     @Test
@@ -193,7 +193,7 @@ public class TestLinkOptionWithModule extends JavadocTester {
                         + "in ../out6a/ are in named modules");
         checkOutput("com/ex2/B.html", true,
                 """
-                    <a href="../../../out6a/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link">A</a>""");
+                    <a href="../../../out6a/com.ex1/com/ex1/A.html" title="class in com.ex1" class="external-link">A</a>""");
     }
 
     void initModulesAndPackages() throws Exception{
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
index 3c51b938396..2a415141229 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
@@ -162,11 +162,12 @@ public class TestRedirectLinks extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("pkg/B.html", true,
                 "<a href=\"" + apiURL + """
-                    /java.base/java/lang/String.html" title="class or interface in java.lang" class=\
+                    /java.base/java/lang/String.html" title="class in java.lang" class=\
                     "external-link">Link-Plain to String Class</a>""");
         checkOutput("pkg/C.html", true,
                 "<a href=\"" + apiURL + """
-                    /java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>""");
+                    /java.base/java/lang/Object.html" title="class in java.lang" class=\
+                    "external-link">Object</a>""");
     }
 
     private Path libApi = Path.of("libApi");
@@ -272,10 +273,10 @@ public class TestRedirectLinks extends JavadocTester {
                     "warning: URL " + oldURL + "/element-list was redirected to " + newURL + "/element-list");
             checkOutput("mC/p5/C5.html", true,
                     "extends <a href=\"" + oldURL + """
-                        /mA/p1/C1.html" title="class or interface in p1" class="external-link">C1</a>""");
+                        /mA/p1/C1.html" title="class in p1" class="external-link">C1</a>""");
             checkOutput("mC/p6/C6.html", true,
                     "<a href=\"" + oldURL + """
-                        /mB/p4/C4.html" title="class or interface in p4" class="external-link">C4</a>""");
+                        /mB/p4/C4.html" title="class in p4" class="external-link">C4</a>""");
         } finally {
             if (oldServer != null) {
                 out.println("Stopping old server on " + oldServer.getAddress());
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkPlatform/TestLinkPlatform.java b/test/langtools/jdk/javadoc/doclet/testLinkPlatform/TestLinkPlatform.java
index 5c22d6abb6d..5b2a751a295 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkPlatform/TestLinkPlatform.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkPlatform/TestLinkPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8216497 8297437
+ * @bug 8216497 8297437 8369531
  * @summary javadoc should auto-link to platform classes
  * @library /tools/lib ../../lib
  * @modules
@@ -106,15 +106,15 @@ public class TestLinkPlatform extends JavadocTester {
             if (version <= 9) {
                 checkOutput("p/q/A.html", true,
                         "<a href=\"" + url + "\"",
-                        "<a href=\"" + url + "#clone--\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#equals-java.lang.Object-\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#finalize--\" title=\"class or interface in java.lang\" class=\"external-link\">");
+                        "<a href=\"" + url + "#clone--\" title=\"clone()\" class=\"external-link\">",
+                        "<a href=\"" + url + "#equals-java.lang.Object-\" title=\"equals(Object)\" class=\"external-link\">",
+                        "<a href=\"" + url + "#finalize--\" title=\"finalize()\" class=\"external-link\">");
             } else {
                 checkOutput("p/q/A.html", true,
                         "<a href=\"" + url + "\"",
-                        "<a href=\"" + url + "#clone()\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#equals(java.lang.Object)\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#finalize()\" title=\"class or interface in java.lang\" class=\"external-link\">");
+                        "<a href=\"" + url + "#clone()\" title=\"clone()\" class=\"external-link\">",
+                        "<a href=\"" + url + "#equals(java.lang.Object)\" title=\"equals(Object)\" class=\"external-link\">",
+                        "<a href=\"" + url + "#finalize()\" title=\"finalize()\" class=\"external-link\">");
             }
         }
     }
@@ -136,15 +136,15 @@ public class TestLinkPlatform extends JavadocTester {
             if (version <= 9) {
                 checkOutput("p/q/A.html", true,
                         "<a href=\"" + url + "\"",
-                        "<a href=\"" + url + "#clone--\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#equals-java.lang.Object-\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#finalize--\" title=\"class or interface in java.lang\" class=\"external-link\">");
+                        "<a href=\"" + url + "#clone--\" title=\"clone()\" class=\"external-link\">",
+                        "<a href=\"" + url + "#equals-java.lang.Object-\" title=\"equals(Object)\" class=\"external-link\">",
+                        "<a href=\"" + url + "#finalize--\" title=\"finalize()\" class=\"external-link\">");
             } else {
                 checkOutput("p/q/A.html", true,
                         "<a href=\"" + url + "\"",
-                        "<a href=\"" + url + "#clone()\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#equals(java.lang.Object)\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#finalize()\" title=\"class or interface in java.lang\" class=\"external-link\">");
+                        "<a href=\"" + url + "#clone()\" title=\"clone()\" class=\"external-link\">",
+                        "<a href=\"" + url + "#equals(java.lang.Object)\" title=\"equals(Object)\" class=\"external-link\">",
+                        "<a href=\"" + url + "#finalize()\" title=\"finalize()\" class=\"external-link\">");
             }
         }
     }
@@ -166,15 +166,15 @@ public class TestLinkPlatform extends JavadocTester {
             if (version <= 9) {
                 checkOutput("p/q/A.html", true,
                         "<a href=\"" + url + "\"",
-                        "<a href=\"" + url + "#clone--\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#equals-java.lang.Object-\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#finalize--\" title=\"class or interface in java.lang\" class=\"external-link\">");
+                        "<a href=\"" + url + "#clone--\" title=\"clone()\" class=\"external-link\">",
+                        "<a href=\"" + url + "#equals-java.lang.Object-\" title=\"equals(Object)\" class=\"external-link\">",
+                        "<a href=\"" + url + "#finalize--\" title=\"finalize()\" class=\"external-link\">");
             } else {
                 checkOutput("p/q/A.html", true,
                         "<a href=\"" + url + "\"",
-                        "<a href=\"" + url + "#clone()\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#equals(java.lang.Object)\" title=\"class or interface in java.lang\" class=\"external-link\">",
-                        "<a href=\"" + url + "#finalize()\" title=\"class or interface in java.lang\" class=\"external-link\">");
+                        "<a href=\"" + url + "#clone()\" title=\"clone()\" class=\"external-link\">",
+                        "<a href=\"" + url + "#equals(java.lang.Object)\" title=\"equals(Object)\" class=\"external-link\">",
+                        "<a href=\"" + url + "#finalize()\" title=\"finalize()\" class=\"external-link\">");
             }
         }
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
index b10c746bde4..1b30fe365a4 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
@@ -107,20 +107,15 @@ public class TestLinkTagletWithModule extends JavadocTester {
                     <div class="block"><a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a>
                     <a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a>
                     <a href="../../../../../out1/m1/com/m1/lib/package-summary.html" class="external-link"><code>package link</code></a>
-                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class or interface in com.m1.lib"\
-                     class="external-link"><code>Lib</code></a>
-                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
-                     interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a>
-                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
-                     interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a>
+                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class in com.m1.lib" class="external-link"><code>Lib</code></a>
+                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" class="external-link"><code>Lib.method(String)</code></a>
+                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" class="external-link"><code>Lib.method(String)</code></a>
                     <a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
                     <a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
                     <a href="../../../../../out1/m2/com/m2/lib/package-summary.html" class="external-link">m2/com.m2.lib</a>
-                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class or interface in com.m2.lib" class="external-link">Lib</a>
-                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or\
-                     interface in com.m2.lib" class="external-link">class link</a>
-                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or\
-                     interface in com.m2.lib" class="external-link">Lib.method(String)</a></div>
+                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class in com.m2.lib" class="external-link">Lib</a>
+                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" class="external-link">class link</a>
+                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" class="external-link">Lib.method(String)</a></div>
                     """);
     }
 
@@ -164,9 +159,9 @@ public class TestLinkTagletWithModule extends JavadocTester {
                     <div class="block"><a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>package link</code></a>
                     <a href="../../../../out1/com.ex1/module-summary.html" class="external-link"><code>module link</code></a>
                     <a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>com.ex1/com.ex1</code></a>
-                    <a href="../../../../out1/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link"><code>class link</code></a>
-                    <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a>
-                    <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/A.html" title="class in com.ex1" class="external-link"><code>class link</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" class="external-link"><code>A.m()</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" class="external-link"><code>A.m()</code></a>
                     <a href="package-summary.html"><code>com.ex2</code></a>
                     <a href="../../module-summary.html"><code>com.ex2</code></a></div>
                     """);
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
index 7bfb17d6864..76fa87f4fff 100644
--- a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
@@ -245,19 +245,19 @@ public class TestMarkdownLinks extends JavadocTester {
                         "/api/java.base/java/util/package-summary.html\" class=\"external-link\"><code>java.util</code></a>",
 
                         "class <a href=\"https://",
-                        "/api/java.base/java/lang/String.html\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String</code></a>",
+                        "/api/java.base/java/lang/String.html\" title=\"class in java.lang\" class=\"external-link\"><code>String</code></a>",
 
                         "interface <a href=\"https://",
-                        "/api/java.base/java/lang/Runnable.html\" title=\"class or interface in java.lang\" class=\"external-link\"><code>Runnable</code></a>",
+                        "/api/java.base/java/lang/Runnable.html\" title=\"interface in java.lang\" class=\"external-link\"><code>Runnable</code></a>",
 
                         "a field <a href=\"https://",
-                        "/api/java.base/java/lang/String.html#CASE_INSENSITIVE_ORDER\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String.CASE_INSENSITIVE_ORDER</code></a>",
+                        "/api/java.base/java/lang/String.html#CASE_INSENSITIVE_ORDER\" class=\"external-link\"><code>String.CASE_INSENSITIVE_ORDER</code></a>",
 
                         "a constructor <a href=\"https://",
-                        "/api/java.base/java/lang/String.html#%3Cinit%3E()\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String()</code></a></li>",
+                        "/api/java.base/java/lang/String.html#%3Cinit%3E()\" class=\"external-link\"><code>String()</code></a></li>",
 
                         "a method <a href=\"https://",
-                        "/api/java.base/java/lang/String.html#chars()\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String.chars()</code></a>");
+                        "/api/java.base/java/lang/String.html#chars()\" class=\"external-link\"><code>String.chars()</code></a>");
     }
 
     /// Test the ability to include array elements in method signatures for
@@ -346,4 +346,4 @@ public class TestMarkdownLinks extends JavadocTester {
                     </dd>""");
 
     }
-}
\ No newline at end of file
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 5f140cc2c03..33a7249b596 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -1331,8 +1331,8 @@ public class TestModules extends JavadocTester {
         checkOutput("moduleB/testpkg3mdlB/package-summary.html", true,
                 """
                     <a href="https://docs.oracle.com/javase/9/docs/api/java.base/java/lang/String.ht\
-                    ml" title="class or interface in java.lang" class="external-link"><code>Link to \
-                    String Class</code></a>""");
+                    ml" title="class in java.lang" class="external-link"><code>Link to String Class<\
+                    /code></a>""");
         checkOutput("moduleB/testpkg3mdlB/package-summary.html", true,
                 """
                     <a href="https://docs.oracle.com/javase/9/docs/api/java.base/java/lang/package-s\
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
index b93c3715ddc..724b24ac71b 100644
--- a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
@@ -63,9 +63,9 @@ public class TestPreview extends JavadocTester {
         checkOutput("m/pkg/TestPreviewDeclarationUse.html", true,
                     "<code><a href=\"TestPreviewDeclaration.html\" title=\"interface in pkg\">TestPreviewDeclaration</a></code>");
         checkOutput("m/pkg/TestPreviewAPIUse.html", true,
-                "<a href=\"" + doc + "java.base/preview/Core.html\" title=\"class or interface in preview\" class="
+                "<a href=\"" + doc + "java.base/preview/Core.html\" title=\"class in preview\" class="
                         + "\"external-link\">Core</a><sup class=\"preview-mark\"><a href=\"" + doc + "java.base/pr"
-                        + "eview/Core.html#preview-preview.Core\" title=\"class or interface in preview\" class=\""
+                        + "eview/Core.html#preview-preview.Core\" class=\""
                         + "external-link\">PREVIEW</a>");
         checkOutput("m/pkg/DocAnnotation.html", true,
                 "<span class=\"modifiers\">public @interface </span><span class=\"element-name type-name-label\">DocAnnotation</span>");
@@ -254,7 +254,7 @@ public class TestPreview extends JavadocTester {
         checkOutput("api2/api/API.html", true,
                     "<p><a href=\"#test()\"><code>test()</code></a></p>",
                     "<p><a href=\"#testNoPreviewInSig()\"><code>testNoPreviewInSig()</code></a></p>",
-                    "title=\"class or interface in java.util\" class=\"external-link\">List</a>&lt;<a href=\"API.h"
+                    "title=\"interface in java.util\" class=\"external-link\">List</a>&lt;<a href=\"API.h"
                             + "tml\" title=\"class in api\">API</a><sup class=\"preview-mark\"><a href=\"#preview-"
                             + "api.API\">PREVIEW</a></sup>&gt;");
         checkOutput("api2/api/API2.html", true,
diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
index 810db378394..9c4c4da70e3 100644
--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
@@ -113,19 +113,15 @@ public class TestSeeTagWithModule extends JavadocTester {
                     <li><a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a></li>
                     <li><a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a></li>
                     <li><a href="../../../../../out1/m1/com/m1/lib/package-summary.html" class="external-link"><code>m1/com.m1.lib</code></a></li>
-                    <li><a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class or interface in com.m1.lib" class="external-link"><code>Lib</code></a></li>
-                    <li><a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or \
-                    interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a></li>
-                    <li><a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or \
-                    interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a></li>
+                    <li><a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class in com.m1.lib" class="external-link"><code>Lib</code></a></li>
+                    <li><a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" class="external-link"><code>Lib.method(String)</code></a></li>
+                    <li><a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" class="external-link"><code>Lib.method(String)</code></a></li>
                     <li><a href="../../../../../out1/m2/module-summary.html" class="external-link"><code>m2</code></a></li>
                     <li><a href="../../../../../out1/m2/module-summary.html" class="external-link"><code>m2</code></a></li>
                     <li><a href="../../../../../out1/m2/com/m2/lib/package-summary.html" class="external-link"><code>m2/com.m2.lib</code></a></li>
-                    <li><a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class or interface in com.m2.lib" class="external-link"><code>Lib</code></a></li>
-                    <li><a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or \
-                    interface in com.m2.lib" class="external-link"><code>Lib.method(String)</code></a></li>
-                    <li><a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or \
-                    interface in com.m2.lib" class="external-link"><code>Lib.method(String)</code></a></li>
+                    <li><a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class in com.m2.lib" class="external-link"><code>Lib</code></a></li>
+                    <li><a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" class="external-link"><code>Lib.method(String)</code></a></li>
+                    <li><a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" class="external-link"><code>Lib.method(String)</code></a></li>
                     """);
     }
 
@@ -175,9 +171,9 @@ public class TestSeeTagWithModule extends JavadocTester {
                     <li><a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>com.ex1</code></a></li>
                     <li><a href="../../../../out1/com.ex1/module-summary.html" class="external-link"><code>com.ex1</code></a></li>
                     <li><a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>com.ex1/com.ex1</code></a></li>
-                    <li><a href="../../../../out1/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link"><code>A</code></a></li>
-                    <li><a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a></li>
-                    <li><a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a></li>
+                    <li><a href="../../../../out1/com.ex1/com/ex1/A.html" title="class in com.ex1" class="external-link"><code>A</code></a></li>
+                    <li><a href="../../../../out1/com.ex1/com/ex1/A.html#m()" class="external-link"><code>A.m()</code></a></li>
+                    <li><a href="../../../../out1/com.ex1/com/ex1/A.html#m()" class="external-link"><code>A.m()</code></a></li>
                     <li><a href="package-summary.html"><code>com.ex2</code></a></li>
                     <li><a href="../../module-summary.html"><code>com.ex2</code></a></li>
                     """);
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
index be60a114040..c8b91dcba67 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
@@ -1123,7 +1123,7 @@ First line // @highlight :
             }
             String output = fileManager.getFileString(DOCUMENTATION_OUTPUT, "A.html");
             // use the [^<>] regex to select HTML elements that immediately enclose "content"
-            Matcher m = Pattern.compile("(?is)(<a href=\"[^<>]*\" title=\"[^<>]*\" class=\"[^<>]*\">)"
+            Matcher m = Pattern.compile("(?is)(<a href=\"[^<>]*\" class=\"[^<>]*\">)"
                     +  LABEL_PLACEHOLDER + "(</a>)").matcher(output);
             if (!m.find()) {
                 throw new IOException(output);
diff --git a/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java b/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
index 98ffc9e99a4..70a77fad5a7 100644
--- a/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
+++ b/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
@@ -59,7 +59,7 @@ public class TestTitleInHref extends JavadocTester {
                     <a href="Interface.html" title="interface in pkg">""",
                 //Test to make sure that the title shows up in cross link shows up
                 "<a href=\"" + uri + """
-                    /java/io/File.html" title="class or interface in java.io" class="external-link">\
+                    /java/io/File.html" title="class in java.io" class="external-link">\
                     <code>This is a cross link to class File</code></a>""");
     }
 }

From e3a085581bfa70437b73d4b0527a084e0c5c9aac Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 26 Nov 2025 14:58:50 +0000
Subject: [PATCH 362/512] 8371146: C2 SuperWord:
 VTransform::add_speculative_check uses pre_init that is pinned after
 Auto_Vectorization_Check, leading to bad graph

Reviewed-by: roland, chagedorn
---
 src/hotspot/share/opto/vectorization.cpp      |  33 +++--
 src/hotspot/share/opto/vectorization.hpp      |  24 ++++
 ...TestAliasingCheckPreLimitNotAvailable.java | 116 ++++++++++++++++++
 3 files changed, 164 insertions(+), 9 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java

diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 98f3d79c9f5..15b2df663b6 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -1022,27 +1022,39 @@ bool VPointer::can_make_speculative_aliasing_check_with(const VPointer& other) c
   // or at the multiversion_if. That is before the pre-loop. From the construction of
   // VPointer, we already know that all its variables (except iv) are pre-loop invariant.
   //
-  // For the computation of main_init, we also need the pre_limit, and so we need
-  // to check that this value is pre-loop invariant. In the case of non-equal iv_scales,
-  // we also need the main_limit in the aliasing check, and so this value must then
-  // also be pre-loop invariant.
+  // In VPointer::make_speculative_aliasing_check_with we compute main_init in all
+  // cases. For this, we require pre_init and pre_limit. These values must be available
+  // for the speculative check, i.e. their control must dominate the speculative check.
+  // Further, "if vp1.iv_scale() != vp2.iv_scale()" we additionally need to have
+  // main_limit available for the speculative check.
+  // Note: no matter if the speculative check is inserted as a predicate or at the
+  //       multiversion if, the speculative check happens before (dominates) the
+  //       pre-loop.
+  Node* pre_init = _vloop.pre_loop_end()->init_trip();
   Opaque1Node* pre_limit_opaq = _vloop.pre_loop_end()->limit()->as_Opaque1();
   Node* pre_limit = pre_limit_opaq->in(1);
   Node* main_limit = _vloop.cl()->limit();
-
-  if (!_vloop.is_pre_loop_invariant(pre_limit)) {
+  if (!_vloop.is_available_for_speculative_check(pre_init)) {
 #ifdef ASSERT
     if (_vloop.is_trace_speculative_aliasing_analysis()) {
-      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: pre_limit is not pre-loop independent!");
+      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: pre_limit is not available at speculative check!");
+    }
+#endif
+    return false;
+  }
+  if (!_vloop.is_available_for_speculative_check(pre_limit)) {
+#ifdef ASSERT
+    if (_vloop.is_trace_speculative_aliasing_analysis()) {
+      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: pre_limit is not available at speculative check!");
     }
 #endif
     return false;
   }
 
-  if (vp1.iv_scale() != vp2.iv_scale() && !_vloop.is_pre_loop_invariant(main_limit)) {
+  if (vp1.iv_scale() != vp2.iv_scale() && !_vloop.is_available_for_speculative_check(main_limit)) {
 #ifdef ASSERT
     if (_vloop.is_trace_speculative_aliasing_analysis()) {
-      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: main_limit is not pre-loop independent!");
+      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: main_limit is not available at speculative check!");
     }
 #endif
     return false;
@@ -1119,6 +1131,8 @@ BoolNode* VPointer::make_speculative_aliasing_check_with(const VPointer& other,
   Node* pre_limit = pre_limit_opaq->in(1);
   assert(_vloop.is_pre_loop_invariant(pre_init),  "needed for aliasing check before pre-loop");
   assert(_vloop.is_pre_loop_invariant(pre_limit), "needed for aliasing check before pre-loop");
+  assert(_vloop.is_available_for_speculative_check(pre_init),  "ctrl must be early enough to avoid cycles");
+  assert(_vloop.is_available_for_speculative_check(pre_limit), "ctrl must be early enough to avoid cycles");
 
   Node* pre_initL = new ConvI2LNode(pre_init);
   Node* pre_limitL = new ConvI2LNode(pre_limit);
@@ -1180,6 +1194,7 @@ BoolNode* VPointer::make_speculative_aliasing_check_with(const VPointer& other,
     jint main_iv_stride = _vloop.iv_stride();
     Node* main_limit = _vloop.cl()->limit();
     assert(_vloop.is_pre_loop_invariant(main_limit), "needed for aliasing check before pre-loop");
+    assert(_vloop.is_available_for_speculative_check(main_limit), "ctrl must be early enough to avoid cycles");
 
     Node* main_limitL = new ConvI2LNode(main_limit);
     phase->register_new_node_with_ctrl_of(main_limitL, pre_init);
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index f7099b5b7c0..aacd406f798 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -236,6 +236,8 @@ public:
   // Some nodes must be pre-loop invariant, so that they can be used for conditions
   // before or inside the pre-loop. For example, alignment of main-loop vector
   // memops must be achieved in the pre-loop, via the exit check in the pre-loop.
+  // Note: this condition is NOT strong enough for speculative checks, those happen
+  //       before the pre-loop. See is_available_for_speculative_check
   bool is_pre_loop_invariant(Node* n) const {
     // Must be in the main-loop, otherwise we can't access the pre-loop.
     // This fails during SuperWord::unrolling_analysis, but that is ok.
@@ -257,6 +259,28 @@ public:
     return is_before_pre_loop(early);
   }
 
+  // Nodes that are to be used in speculative checks must be available early enough.
+  // Note: the speculative check happens before the pre-loop, either at the auto
+  //       vectorization predicate or the multiversion if. This is before the
+  //       pre-loop, and thus the condition here is stronger then the one from
+  //       is_pre_loop_invariant.
+  bool is_available_for_speculative_check(Node* n) const {
+    assert(are_speculative_checks_possible(), "meaningless without speculative check");
+    ParsePredicateSuccessProj* parse_predicate_proj = auto_vectorization_parse_predicate_proj();
+    // Find the control of the predicate:
+    ProjNode* proj = (parse_predicate_proj != nullptr) ? parse_predicate_proj : multiversioning_fast_proj();
+    Node* check_ctrl = proj->in(0)->as_If()->in(0);
+
+    // Often, the control of n already dominates that of the predicate.
+    Node* n_ctrl = phase()->get_ctrl(n);
+    if (phase()->is_dominator(n_ctrl, check_ctrl)) { return true; }
+
+    // But in some cases, the ctrl of n is after that of the predicate,
+    // but the early ctrl is before the predicate.
+    Node* n_early = phase()->compute_early_ctrl(n, n_ctrl);
+    return phase()->is_dominator(n_early, check_ctrl);
+  }
+
   // Check if the loop passes some basic preconditions for vectorization.
   // Return indicates if analysis succeeded.
   bool check_preconditions();
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java
new file mode 100644
index 00000000000..e7009e87ae2
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=all-flags-fixed-stress-seed
+ * @bug 8371146
+ * @summary Test where the pre_init was pinned before the pre-loop but after the
+ *          Auto_Vectorization_Check, and so it should not be used for the auto
+ *          vectorization aliasing check, to avoid a bad (circular) graph.
+ * @requires vm.gc == "ZGC" | vm.gc == "null"
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestAliasingCheckPreLimitNotAvailable::test
+ *      -XX:-TieredCompilation
+ *      -Xcomp
+ *      -XX:+UseZGC
+ *      -XX:+UnlockDiagnosticVMOptions -XX:+StressLoopPeeling -XX:StressSeed=4
+ *      -XX:LoopUnrollLimit=48
+ *      compiler.loopopts.superword.TestAliasingCheckPreLimitNotAvailable
+ */
+
+/*
+ * @test id=all-flags-no-stress-seed
+ * @bug 8371146
+ * @requires vm.gc == "ZGC" | vm.gc == "null"
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestAliasingCheckPreLimitNotAvailable::test
+ *      -XX:-TieredCompilation
+ *      -Xcomp
+ *      -XX:+UseZGC
+ *      -XX:+UnlockDiagnosticVMOptions -XX:+StressLoopPeeling
+ *      -XX:LoopUnrollLimit=48
+ *      compiler.loopopts.superword.TestAliasingCheckPreLimitNotAvailable
+ */
+
+/*
+ * @test id=fewer-flags
+ * @bug 8371146
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestAliasingCheckPreLimitNotAvailable::test
+ *      -XX:-TieredCompilation
+ *      -Xcomp
+ *      -XX:LoopUnrollLimit=48
+ *      compiler.loopopts.superword.TestAliasingCheckPreLimitNotAvailable
+ */
+
+/*
+ * @test id=minimal-flags
+ * @bug 8371146
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:CompileCommand=compileonly,*TestAliasingCheckPreLimitNotAvailable::test
+ *      -XX:-TieredCompilation
+ *      -Xcomp
+ *      compiler.loopopts.superword.TestAliasingCheckPreLimitNotAvailable
+ */
+
+/*
+ * @test id=vanilla
+ * @bug 8371146
+ * @run main compiler.loopopts.superword.TestAliasingCheckPreLimitNotAvailable
+ */
+
+package compiler.loopopts.superword;
+
+public class TestAliasingCheckPreLimitNotAvailable {
+    static int sum;
+    static boolean condition;
+    static int zero;
+    static int twoDimensional[][] = new int[20][20];
+
+    static void test() {
+        int innerCount = 0;
+        int conditionCount = 0;
+        int oneDimensional[] = new int[10];
+        for (int i = 2; i > 0; --i) {
+            for (int j = i; j < 10; j++) {
+                innerCount += 1;
+                oneDimensional[1] += innerCount;
+                oneDimensional[j] += zero;
+                if (condition) {
+                    conditionCount += 1;
+                    oneDimensional[1] += conditionCount;
+                    sum += oneDimensional[1];
+                }
+                twoDimensional[j] = twoDimensional[j + 1];
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        test();
+    }
+}

From 1ce2a44e9f4fa9d558602dbd0489fefb0c9563ef Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Wed, 26 Nov 2025 15:11:10 +0000
Subject: [PATCH 363/512] 8371571: Consolidate and enhance bulk memory segment
 ops benchmarks

Reviewed-by: jvernee
---
 .../bench/java/lang/foreign/BulkOps.java      | 211 ------------------
 .../java/lang/foreign/SegmentBulkCopy.java    | 161 +++++++++----
 .../java/lang/foreign/SegmentBulkFill.java    | 164 +++++++-------
 .../java/lang/foreign/SegmentBulkHash.java    | 126 ++++++++---
 .../lang/foreign/SegmentBulkMismatch.java     | 155 +++++++++----
 5 files changed, 396 insertions(+), 421 deletions(-)
 delete mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java

diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java b/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java
deleted file mode 100644
index 60f36d9f157..00000000000
--- a/test/micro/org/openjdk/bench/java/lang/foreign/BulkOps.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- *  Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- *  This code is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 only, as
- *  published by the Free Software Foundation.
- *
- *  This code is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  version 2 for more details (a copy is included in the LICENSE file that
- *  accompanied this code).
- *
- *  You should have received a copy of the GNU General Public License version
- *  2 along with this work; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- *  or visit www.oracle.com if you need additional information or have any
- *  questions.
- *
- */
-
-package org.openjdk.bench.java.lang.foreign;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.CompilerControl;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
-import org.openjdk.jmh.annotations.Warmup;
-import jdk.internal.misc.Unsafe;
-
-import java.lang.foreign.Arena;
-import java.lang.foreign.MemorySegment;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.util.concurrent.TimeUnit;
-
-import static java.lang.foreign.ValueLayout.JAVA_INT;
-import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-
-@BenchmarkMode(Mode.AverageTime)
-@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
-@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
-@State(org.openjdk.jmh.annotations.Scope.Thread)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
-@Fork(value = 3, jvmArgs = { "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" })
-public class BulkOps {
-
-    static final Unsafe unsafe = Utils.unsafe;
-
-    static final int ELEM_SIZE = 1_000_000;
-    static final int CARRIER_SIZE = (int)JAVA_INT.byteSize();
-    static final int ALLOC_SIZE = ELEM_SIZE * CARRIER_SIZE;
-
-    final Arena arena = Arena.ofShared();
-
-    final long unsafe_addr = unsafe.allocateMemory(ALLOC_SIZE);
-    final MemorySegment segment = arena.allocate(ALLOC_SIZE, 1);
-
-    final IntBuffer buffer = IntBuffer.allocate(ELEM_SIZE);
-
-    final int[] ints = new int[ELEM_SIZE];
-    final MemorySegment bytesSegment = MemorySegment.ofArray(ints);
-    final long UNSAFE_INT_OFFSET = unsafe.arrayBaseOffset(int[].class);
-
-    // large(ish) segments/buffers with same content, 0, for mismatch, non-multiple-of-8 sized
-    static final int SIZE_WITH_TAIL = (1024 * 1024) + 7;
-    final MemorySegment mismatchSegmentLarge1;
-
-    {
-        mismatchSegmentLarge1 = arena.allocate(SIZE_WITH_TAIL, 1);
-    }
-
-    final MemorySegment mismatchSegmentLarge2 = arena.allocate(SIZE_WITH_TAIL, 1);
-    final ByteBuffer mismatchBufferLarge1 = ByteBuffer.allocateDirect(SIZE_WITH_TAIL);
-    final ByteBuffer mismatchBufferLarge2 = ByteBuffer.allocateDirect(SIZE_WITH_TAIL);
-
-    // mismatch at first byte
-    final MemorySegment mismatchSegmentSmall1 = arena.allocate(7, 1);
-    final MemorySegment mismatchSegmentSmall2 = arena.allocate(7, 1);
-    final ByteBuffer mismatchBufferSmall1 = ByteBuffer.allocateDirect(7);
-    final ByteBuffer mismatchBufferSmall2 = ByteBuffer.allocateDirect(7);
-
-    @Setup
-    public void setup() {
-        mismatchSegmentSmall1.fill((byte) 0xFF);
-        mismatchBufferSmall1.put((byte) 0xFF).clear();
-        // verify expected mismatch indices
-        long si = mismatchSegmentLarge1.mismatch(mismatchSegmentLarge2);
-        if (si != -1)
-            throw new AssertionError("Unexpected mismatch index:" + si);
-        int bi = mismatchBufferLarge1.mismatch(mismatchBufferLarge2);
-        if (bi != -1)
-            throw new AssertionError("Unexpected mismatch index:" + bi);
-        si = mismatchSegmentSmall1.mismatch(mismatchSegmentSmall2);
-        if (si != 0)
-            throw new AssertionError("Unexpected mismatch index:" + si);
-        bi = mismatchBufferSmall1.mismatch(mismatchBufferSmall2);
-        if (bi != 0)
-            throw new AssertionError("Unexpected mismatch index:" + bi);
-
-        for (int i = 0; i < ints.length ; i++) {
-            ints[i] = i;
-        }
-    }
-
-    @TearDown
-    public void tearDown() {
-        arena.close();
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void unsafe_fill() {
-        unsafe.setMemory(unsafe_addr, ALLOC_SIZE, (byte)42);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void segment_fill() {
-        segment.fill((byte)42);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void unsafe_copy() {
-        unsafe.copyMemory(ints, UNSAFE_INT_OFFSET, null, unsafe_addr, ALLOC_SIZE);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void segment_copy() {
-        segment.copyFrom(bytesSegment);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void segment_copy_static() {
-        MemorySegment.copy(ints, 0, segment, JAVA_INT_UNALIGNED, 0, ints.length);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void segment_copy_static_small() {
-        MemorySegment.copy(ints, 0, segment, JAVA_INT_UNALIGNED, 0, 10);
-    }
-
-    @Benchmark
-    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void segment_copy_static_small_dontinline() {
-        MemorySegment.copy(ints, 0, segment, JAVA_INT_UNALIGNED, 0, 10);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void unsafe_copy_small() {
-        unsafe.copyMemory(ints, UNSAFE_INT_OFFSET, null, unsafe_addr, 10 * CARRIER_SIZE);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void buffer_copy_small() {
-        buffer.put(0, ints, 0, 10);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void buffer_copy() {
-        buffer.put(0, ints, 0, ints.length);
-    }
-
-    @Benchmark
-    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public void segment_copy_static_dontinline() {
-        MemorySegment.copy(ints, 0, segment, JAVA_INT_UNALIGNED, 0, ints.length);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public long mismatch_large_segment() {
-        return mismatchSegmentLarge1.mismatch(mismatchSegmentLarge2);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public int mismatch_large_bytebuffer() {
-        return mismatchBufferLarge1.mismatch(mismatchBufferLarge2);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public long mismatch_small_segment() {
-        return mismatchSegmentSmall1.mismatch(mismatchSegmentSmall2);
-    }
-
-    @Benchmark
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    public int mismatch_small_bytebuffer() {
-        return mismatchBufferSmall1.mismatch(mismatchBufferSmall2);
-    }
-}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkCopy.java b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkCopy.java
index ca6f21d20e9..83522bd4f3c 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkCopy.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkCopy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,13 @@ import org.openjdk.jmh.annotations.Warmup;
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
 import java.nio.ByteBuffer;
+import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
+import static java.lang.foreign.ValueLayout.JAVA_LONG;
+
 @BenchmarkMode(Mode.AverageTime)
 @Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
@@ -49,63 +53,122 @@ import java.util.concurrent.TimeUnit;
 @Fork(value = 3)
 public class SegmentBulkCopy {
 
-    @Param({"2", "3", "4", "5", "6", "7", "8", "64", "512",
-            "4096", "32768", "262144", "2097152", "16777216", "134217728"})
-    public int ELEM_SIZE;
+    @Param({"2", "4", "8", "12", "16", "64", "512", "4096", "32768", "262144", "2097152", "16777216", "134217728"})
+    public int size;
 
-    byte[] srcArray;
-    byte[] dstArray;
-    MemorySegment heapSrcSegment;
-    MemorySegment heapDstSegment;
-    MemorySegment nativeSrcSegment;
-    MemorySegment nativeDstSegment;
-    ByteBuffer srcBuffer;
-    ByteBuffer dstBuffer;
+    public static class Array extends SegmentBulkCopy {
+
+        byte[] srcArray;
+        byte[] dstArray;
+
+        ByteBuffer srcBuffer;
+        ByteBuffer dstBuffer;
+
+        @Setup
+        public void setup() {
+            srcArray = new byte[size];
+            var rnd = new Random(42);
+            rnd.nextBytes(srcArray);
+            dstArray = new byte[size];
+            srcBuffer = ByteBuffer.wrap(srcArray);
+            dstBuffer = ByteBuffer.wrap(dstArray);
+        }
+
+        @Benchmark
+        public void arrayCopy() {
+            System.arraycopy(srcArray, 0, dstArray, 0, size);
+        }
+
+        @Benchmark
+        public void bufferCopy() {
+            dstBuffer.put(0, srcBuffer, 0, size);
+        }
 
-    @Setup
-    public void setup() {
-        srcArray = new byte[ELEM_SIZE];
-        dstArray = new byte[ELEM_SIZE];
-        heapSrcSegment = MemorySegment.ofArray(srcArray);
-        heapDstSegment = MemorySegment.ofArray(dstArray);
-        nativeSrcSegment = Arena.ofAuto().allocate(ELEM_SIZE);
-        nativeDstSegment = Arena.ofAuto().allocate(ELEM_SIZE);
-        srcBuffer = ByteBuffer.wrap(srcArray);
-        dstBuffer = ByteBuffer.wrap(dstArray);
     }
 
-    @Benchmark
-    public void arrayCopy() {
-        System.arraycopy(srcArray, 0, dstArray, 0, ELEM_SIZE);
-    }
+    public static class Segment extends SegmentBulkCopy {
 
-    @Benchmark
-    public void bufferCopy() {
-        dstBuffer.put(srcBuffer);
-    }
+        enum SegmentType {HEAP, NATIVE}
+        enum Alignment {ALIGNED, UNALIGNED}
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
-    @Benchmark
-    public void heapSegmentCopyJava() {
-        MemorySegment.copy(heapSrcSegment, 0, heapDstSegment, 0, ELEM_SIZE);
-    }
+        @Param({"HEAP", "NATIVE"})
+        String segmentType;
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
-    @Benchmark
-    public void heapSegmentCopyUnsafe() {
-        MemorySegment.copy(heapSrcSegment, 0, heapDstSegment, 0, ELEM_SIZE);
-    }
+        @Param({"ALIGNED", "UNALIGNED"})
+        String alignment;
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
-    @Benchmark
-    public void nativeSegmentCopyJava() {
-        MemorySegment.copy(nativeSrcSegment, 0, nativeDstSegment, 0, ELEM_SIZE);
-    }
+        MemorySegment srcSegment;
+        MemorySegment dstSegment;
+
+        @Setup
+        public void setup() {
+            // A long array is likely to be aligned at 8-byte boundaries
+            long[] baseArray;
+
+            baseArray = new long[size / Long.BYTES + 1];
+            var rnd = new Random(42);
+            for (int i = 0; i < baseArray.length; i++) {
+                baseArray[i] = rnd.nextLong();
+            }
+
+            switch (SegmentType.valueOf(segmentType)) {
+                case HEAP -> {
+                    srcSegment = MemorySegment.ofArray(baseArray);
+                    dstSegment = MemorySegment.ofArray(baseArray.clone());
+                }
+                case NATIVE -> {
+                    srcSegment = Arena.ofAuto().allocateFrom(JAVA_LONG, baseArray);
+                    dstSegment = Arena.ofAuto().allocateFrom(JAVA_LONG, baseArray);
+                }
+            }
+            switch (Alignment.valueOf(alignment)) {
+                case ALIGNED -> {
+                    srcSegment = srcSegment.asSlice(0, size);
+                    dstSegment = dstSegment.asSlice(0, size);
+                }
+                case UNALIGNED -> {
+                    srcSegment = srcSegment.asSlice(1, size);
+                    dstSegment = dstSegment.asSlice(1, size);
+                }
+            }
+        }
+
+        @Benchmark
+        @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=31"})
+        public void copy() {
+            MemorySegment.copy(srcSegment, 0, dstSegment, 0, size);
+        }
+
+        @Benchmark
+        public void copyLoopIntInt() {
+            for (int i = 0; i < (int) srcSegment.byteSize(); i++) {
+                final byte v = srcSegment.get(ValueLayout.JAVA_BYTE, i);
+                dstSegment.set(ValueLayout.JAVA_BYTE, i, v);
+            }
+        }
+
+        @Benchmark
+        public void copyLoopIntLong() {
+            for (int i = 0; i < srcSegment.byteSize(); i++) {
+                final byte v = srcSegment.get(ValueLayout.JAVA_BYTE, i);
+                dstSegment.set(ValueLayout.JAVA_BYTE, i, v);
+            }
+        }
+
+        @Benchmark
+        public void copyLoopLongLong() {
+            for (long i = 0; i < srcSegment.byteSize(); i++) {
+                final byte v = srcSegment.get(ValueLayout.JAVA_BYTE, i);
+                dstSegment.set(ValueLayout.JAVA_BYTE, i, v);
+            }
+        }
+
+        @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
+        @Benchmark
+        public void copyUnsafe() {
+            MemorySegment.copy(srcSegment, 0, dstSegment, 0, size);
+        }
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.copy=0"})
-    @Benchmark
-    public void nativeSegmentCopyUnsafe() {
-        MemorySegment.copy(nativeSrcSegment, 0, nativeDstSegment, 0, ELEM_SIZE);
     }
 
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java
index 96cf62cc5f6..3c4770731b6 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkFill.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,8 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import static java.lang.foreign.ValueLayout.JAVA_LONG;
+
 @BenchmarkMode(Mode.AverageTime)
 @Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
@@ -51,99 +53,105 @@ import java.util.concurrent.TimeUnit;
 @Fork(value = 3)
 public class SegmentBulkFill {
 
-    @Param({"2", "3", "4", "5", "6", "7", "8", "64", "512",
-            "4096", "32768", "262144", "2097152", "16777216", "134217728"})
-    public int ELEM_SIZE;
+    private static final byte ZERO = 0;
 
-    byte[] array;
-    MemorySegment heapSegment;
-    MemorySegment nativeSegment;
-    MemorySegment unalignedSegment;
-    ByteBuffer buffer;
+    @Param({"2", "4", "8", "12", "16", "64", "512", "4096", "32768", "262144", "2097152", "16777216", "134217728"})
+    public int size;
 
-    @Setup
-    public void setup() {
-        array = new byte[ELEM_SIZE];
-        heapSegment = MemorySegment.ofArray(array);
-        nativeSegment = Arena.ofAuto().allocate(ELEM_SIZE, 8);
-        unalignedSegment = Arena.ofAuto().allocate(ELEM_SIZE + 1, 8).asSlice(1);
-        buffer = ByteBuffer.wrap(array);
-    }
+    public static class Array extends SegmentBulkFill {
 
-    @Benchmark
-    public void arraysFill() {
-        Arrays.fill(array, (byte) 0);
-    }
+        byte[] array;
+        ByteBuffer buffer;
 
-    @Benchmark
-    public void arraysFillLoop() {
-        for (int i = 0; i < array.length; i++) {
-            array[i] = 0;
+        @Setup
+        public void setup() {
+            array = new byte[size];
+            buffer = ByteBuffer.wrap(array);
         }
-    }
 
-    @Benchmark
-    public void bufferFillLoop() {
-        for (int i = 0; i < array.length; i++) {
-            buffer.put(i, (byte)0);
+        @Benchmark
+        public void arraysFill() {
+            Arrays.fill(array, ZERO);
         }
-    }
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
-    @Benchmark
-    public void heapSegmentFillJava() {
-        heapSegment.fill((byte) 0);
-    }
-
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
-    @Benchmark
-    public void heapSegmentFillUnsafe() {
-        heapSegment.fill((byte) 0);
-    }
-
-    @Benchmark
-    public void heapSegmentFillLoop() {
-        for (long i = 0; i < heapSegment.byteSize(); i++) {
-            heapSegment.set(ValueLayout.JAVA_BYTE, i, (byte) 0);
+        @Benchmark
+        public void arraysFillLoop() {
+            for (int i = 0; i < array.length; i++) {
+                array[i] = ZERO;
+            }
         }
-    }
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
-    @Benchmark
-    public void nativeSegmentFillJava() {
-        nativeSegment.fill((byte) 0);
-    }
-
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
-    @Benchmark
-    public void nativeSegmentFillUnsafe() {
-        nativeSegment.fill((byte) 0);
-    }
-
-    @Benchmark
-    public void nativeSegmentFillLoop() {
-        for (long i = 0; i < nativeSegment.byteSize(); i++) {
-            nativeSegment.set(ValueLayout.JAVA_BYTE, i, (byte) 0);
+        @Benchmark
+        public void bufferFillLoop() {
+            for (int i = 0; i < array.length; i++) {
+                buffer.put(i, ZERO);
+            }
         }
+
     }
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
-    @Benchmark
-    public void unalignedSegmentFillJava() {
-        unalignedSegment.fill((byte) 0);
-    }
+    public static class Segment extends SegmentBulkFill {
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
-    @Benchmark
-    public void unalignedSegmentFillUnsafe() {
-        unalignedSegment.fill((byte) 0);
-    }
+        enum SegmentType {HEAP, NATIVE}
+        enum Alignment {ALIGNED, UNALIGNED}
 
-    @Benchmark
-    public void unalignedSegmentFillLoop() {
-        for (long i = 0; i < unalignedSegment.byteSize(); i++) {
-            unalignedSegment.set(ValueLayout.JAVA_BYTE, i, (byte) 0);
+        @Param({"HEAP", "NATIVE"})
+        String segmentType;
+
+        @Param({"ALIGNED", "UNALIGNED"})
+        String alignment;
+
+        MemorySegment segment;
+
+        @Setup
+        public void setup() {
+            // A long array is likely to be aligned at 8-byte boundaries
+            long[] baseArray = new long[size / Long.BYTES + 1];
+            var heapSegment = MemorySegment.ofArray(baseArray);
+
+            segment = switch (SegmentType.valueOf(segmentType)) {
+                case HEAP   -> heapSegment;
+                case NATIVE -> Arena.ofAuto().allocateFrom(JAVA_LONG, baseArray);
+            };
+            segment = switch (Alignment.valueOf(alignment)) {
+                case ALIGNED   -> segment.asSlice(0, size);
+                case UNALIGNED -> segment.asSlice(1, size);
+            };
         }
+
+        @Benchmark
+        @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=31"})
+        public void fill() {
+            segment.fill(ZERO);
+        }
+
+        @Benchmark
+        public void fillLoopIntInt() {
+            for (int i = 0; i < (int)segment.byteSize(); i++) {
+                segment.set(ValueLayout.JAVA_BYTE, i, ZERO);
+            }
+        }
+
+        @Benchmark
+        public void fillLoopIntLong() {
+            for (int i = 0; i < segment.byteSize(); i++) {
+                segment.set(ValueLayout.JAVA_BYTE, i, ZERO);
+            }
+        }
+
+        @Benchmark
+        public void fillLoopLongLong() {
+            for (long i = 0; i < segment.byteSize(); i++) {
+                segment.set(ValueLayout.JAVA_BYTE, i, ZERO);
+            }
+        }
+
+        @Benchmark
+        @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.fill=0"})
+        public void fillUnsafe() {
+            segment.fill(ZERO);
+        }
+
     }
 
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkHash.java b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkHash.java
index 927a7d3fb1f..0213916fcd6 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkHash.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkHash.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,7 @@ import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
+import static java.lang.foreign.ValueLayout.JAVA_LONG;
 
 @BenchmarkMode(Mode.AverageTime)
 @Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
@@ -54,47 +55,98 @@ import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 @Fork(value = 3, jvmArgs = {"--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED"})
 public class SegmentBulkHash {
 
-    @Param({"8", "64"})
-    public int ELEM_SIZE;
+    @Param({"2", "4", "8", "12", "16", "64", "512", "4096", "32768", "262144", "2097152", "16777216", "134217728"})
+    public int size;
 
-    byte[] array;
-    AbstractMemorySegmentImpl heapSegment;
-    AbstractMemorySegmentImpl nativeSegment;
+    public static class Array extends SegmentBulkHash {
 
-    @Setup
-    public void setup() {
-        // Always use the same alignment regardless of size
-        nativeSegment = (AbstractMemorySegmentImpl) Arena.ofAuto().allocate(ELEM_SIZE, 16);
-        var rnd = new Random(42);
-        for (int i = 0; i < ELEM_SIZE; i++) {
-            nativeSegment.set(JAVA_BYTE, i, (byte) rnd.nextInt(Byte.MIN_VALUE, Byte.MAX_VALUE));
+        byte[] array;
+
+        @Setup
+        public void setup() {
+            byte[]  randomArray = new byte[size + 1];
+            var rnd = new Random(42);
+            rnd.nextBytes(randomArray);
+
+            array = Arrays.copyOf(randomArray, size);
         }
-        array = nativeSegment.toArray(JAVA_BYTE);
-        heapSegment = (AbstractMemorySegmentImpl) MemorySegment.ofArray(array);
-    }
 
-    @Benchmark
-    public int array() {
-        return Arrays.hashCode(array);
-    }
-
-    @Benchmark
-    public int heapSegment() {
-        return SegmentBulkOperations.contentHash(heapSegment, 0, ELEM_SIZE);
-    }
-
-    @Benchmark
-    public int nativeSegment() {
-        return SegmentBulkOperations.contentHash(nativeSegment, 0, ELEM_SIZE);
-    }
-
-    @Benchmark
-    public int nativeSegmentJava() {
-        int result = 1;
-        for (long i = 0; i < ELEM_SIZE; i++) {
-            result = 31 * result + nativeSegment.get(JAVA_BYTE, i);
+        @Benchmark
+        public int array() {
+            return Arrays.hashCode(array);
         }
-        return result;
+
+    }
+
+    public static class Segment extends SegmentBulkHash {
+
+        enum SegmentType {HEAP, NATIVE}
+        enum Alignment {ALIGNED, UNALIGNED}
+
+        @Param({"HEAP", "NATIVE"})
+        String segmentType;
+
+        @Param({"ALIGNED", "UNALIGNED"})
+        String alignment;
+
+        AbstractMemorySegmentImpl segment;
+
+        @Setup
+        public void setup() {
+            // A long array is likely to be aligned at 8-byte boundaries
+            long[] baseArray;
+
+            baseArray = new long[size / Long.BYTES + 1];
+            var rnd = new Random(42);
+            for (int i = 0; i < baseArray.length; i++) {
+                baseArray[i] = rnd.nextLong();
+            }
+            var heapSegment = MemorySegment.ofArray(baseArray);
+
+            var s = switch (SegmentType.valueOf(segmentType)) {
+                    case HEAP   -> heapSegment;
+                    case NATIVE -> Arena.ofAuto().allocateFrom(JAVA_LONG, baseArray);
+            };
+            s = switch (Alignment.valueOf(alignment)) {
+                case ALIGNED   -> s.asSlice(0, size);
+                case UNALIGNED -> s.asSlice(1, size);
+            };
+
+            segment = (AbstractMemorySegmentImpl) s;
+        }
+
+        @Benchmark
+        public int hash() {
+            return SegmentBulkOperations.contentHash(segment, 0, size);
+        }
+
+        @Benchmark
+        public int hashLoopIntInt() {
+            int result = 1;
+            for (int i = 0; i < (int)segment.byteSize(); i++) {
+                result = 31 * result + segment.get(JAVA_BYTE, i);
+            }
+            return result;
+        }
+
+        @Benchmark
+        public int hashLoopIntLong() {
+            int result = 1;
+            for (int i = 0; i < segment.byteSize(); i++) {
+                result = 31 * result + segment.get(JAVA_BYTE, i);
+            }
+            return result;
+        }
+
+        @Benchmark
+        public int hashLoopLongLong() {
+            int result = 1;
+            for (long i = 0; i < segment.byteSize(); i++) {
+                result = 31 * result + segment.get(JAVA_BYTE, i);
+            }
+            return result;
+        }
+
     }
 
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkMismatch.java b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkMismatch.java
index 61ceb7b956e..aa4dd0b68f9 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkMismatch.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentBulkMismatch.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import org.openjdk.jmh.annotations.Warmup;
 
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
 import java.util.Arrays;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -52,60 +53,122 @@ import static java.lang.foreign.ValueLayout.*;
 @Fork(value = 3)
 public class SegmentBulkMismatch {
 
-    @Param({"2", "3", "4", "5", "6", "7", "8", "64", "512",
-            "4096", "32768", "262144", "2097152", "16777216", "134217728"})
-    public int ELEM_SIZE;
+    @Param({"2", "4", "8", "12", "16", "64", "512", "4096", "32768", "262144", "2097152", "16777216", "134217728"})
+    public int size;
 
-    MemorySegment srcNative;
-    MemorySegment dstNative;
-    byte[] srcArray;
-    byte[] dstArray;
-    MemorySegment srcHeap;
-    MemorySegment dstHeap;
+    public static class Array extends SegmentBulkMismatch {
 
-    @Setup
-    public void setup() {
-        // Always use the same alignment regardless of size
-        srcNative = Arena.ofAuto().allocate(ELEM_SIZE,16);
-        dstNative = Arena.ofAuto().allocate(ELEM_SIZE, 16);
-        var rnd = new Random(42);
-        for (int i = 0; i < ELEM_SIZE; i++) {
-            srcNative.set(JAVA_BYTE, i, (byte) rnd.nextInt(Byte.MIN_VALUE, Byte.MAX_VALUE));
+        byte[] srcArray;
+        byte[] dstArray;
+
+        @Setup
+        public void setup() {
+            srcArray = new byte[size];
+            var rnd = new Random(42);
+            rnd.nextBytes(srcArray);
+            dstArray = Arrays.copyOf(srcArray, size);
         }
-        dstNative.copyFrom(srcNative);
-        srcArray = srcNative.toArray(JAVA_BYTE);
-        dstArray = dstNative.toArray(JAVA_BYTE);
-        srcHeap = MemorySegment.ofArray(srcArray);
-        dstHeap = MemorySegment.ofArray(dstArray);
+
+        @Benchmark
+        public long array() {
+            return Arrays.mismatch(srcArray, dstArray);
+        }
+
     }
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
-    @Benchmark
-    public long nativeSegmentJava() {
-        return srcNative.mismatch(dstNative);
-    }
+    public static class Segment extends SegmentBulkMismatch {
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
-    @Benchmark
-    public long heapSegmentJava() {
-        return srcHeap.mismatch(dstHeap);
-    }
+        enum SegmentType {HEAP, NATIVE}
+        enum Alignment {ALIGNED, UNALIGNED}
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
-    @Benchmark
-    public long nativeSegmentUnsafe() {
-        return srcNative.mismatch(dstNative);
-    }
+        @Param({"HEAP", "NATIVE"})
+        String segmentType;
 
-    @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
-    @Benchmark
-    public long heapSegmentUnsafe() {
-        return srcHeap.mismatch(dstHeap);
-    }
+        @Param({"ALIGNED", "UNALIGNED"})
+        String alignment;
+
+        MemorySegment srcSegment;
+        MemorySegment dstSegment;
+
+        @Setup
+        public void setup() {
+            // A long array is likely to be aligned at 8-byte boundaries
+            long[] baseArray;
+
+            baseArray = new long[size / Long.BYTES + 1];
+            var rnd = new Random(42);
+            for (int i = 0; i < baseArray.length; i++) {
+                baseArray[i] = rnd.nextLong();
+            }
+
+            switch (SegmentType.valueOf(segmentType)) {
+                case HEAP -> {
+                    srcSegment = MemorySegment.ofArray(baseArray);
+                    dstSegment = MemorySegment.ofArray(baseArray.clone());
+                }
+                case NATIVE -> {
+                    var s = MemorySegment.ofArray(baseArray);
+                    srcSegment = Arena.ofAuto().allocateFrom(JAVA_LONG, baseArray);
+                    dstSegment = Arena.ofAuto().allocateFrom(JAVA_LONG, baseArray);
+                }
+            }
+            switch (Alignment.valueOf(alignment)) {
+                case ALIGNED -> {
+                    srcSegment = srcSegment.asSlice(0, size);
+                    dstSegment = dstSegment.asSlice(0, size);
+                }
+                case UNALIGNED -> {
+                    srcSegment = srcSegment.asSlice(1, size);
+                    dstSegment = dstSegment.asSlice(1, size);
+                }
+            }
+        }
+
+        @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=31"})
+        @Benchmark
+        public long mismatch() {
+            return srcSegment.mismatch(dstSegment);
+        }
+
+        @Fork(value = 3, jvmArgs = {"-Djava.lang.foreign.native.threshold.power.mismatch=0"})
+        @Benchmark
+        public long mismatchUnsafe() {
+            return srcSegment.mismatch(dstSegment);
+        }
+
+        @Benchmark
+        public long mismatchLoopIntInt() {
+            // Simplified version that assumes the segments are of equal size
+            for (int i = 0; i < (int)srcSegment.byteSize(); i++) {
+                if (srcSegment.get(ValueLayout.JAVA_BYTE, i) != dstSegment.get(ValueLayout.JAVA_BYTE, i)) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        @Benchmark
+        public long mismatchLoopIntLong() {
+            // Simplified version that assumes the segments are of equal size
+            for (int i = 0; i < srcSegment.byteSize(); i++) {
+                if (srcSegment.get(ValueLayout.JAVA_BYTE, i) != dstSegment.get(ValueLayout.JAVA_BYTE, i)) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        @Benchmark
+        public long mismatchLoopLongLong() {
+            // Simplified version that assumes the segments are of equal size
+            for (long i = 0; i < srcSegment.byteSize(); i++) {
+                if (srcSegment.get(ValueLayout.JAVA_BYTE, i) != dstSegment.get(ValueLayout.JAVA_BYTE, i)) {
+                    return i;
+                }
+            }
+            return -1;
+        }
 
-    @Benchmark
-    public long array() {
-        return Arrays.mismatch(srcArray, dstArray);
     }
 
 }

From 10ba0ab3c0017858bafb65b49a4cadd9a0351fb4 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@openjdk.org>
Date: Wed, 26 Nov 2025 15:33:16 +0000
Subject: [PATCH 364/512] 8371637: allocateNativeInternal sometimes return
 incorrectly aligned memory

Co-authored-by: Kurt Miller <kurt@openjdk.org>
Reviewed-by: mcimadamore, jvernee
---
 .../classes/jdk/internal/foreign/SegmentFactories.java    | 4 +++-
 test/jdk/java/foreign/TestMemoryAlignment.java            | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
index 3edcac2e44c..728ee235547 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
@@ -212,7 +212,9 @@ public class SegmentFactories {
             allocationBase = allocateMemoryWrapper(allocationSize);
             result = Utils.alignUp(allocationBase, byteAlignment);
         } else {
-            allocationSize = alignedSize;
+            // always allocate at least 'byteAlignment' bytes, so that malloc is guaranteed to
+            // return a pointer aligned to that alignment, for cases where byteAlignment > alignedSize
+            allocationSize = Math.max(alignedSize, byteAlignment);
             if (shouldReserve) {
                 AbstractMemorySegmentImpl.NIO_ACCESS.reserveMemory(allocationSize, byteSize);
             }
diff --git a/test/jdk/java/foreign/TestMemoryAlignment.java b/test/jdk/java/foreign/TestMemoryAlignment.java
index 44d28a07b05..a73635c8f08 100644
--- a/test/jdk/java/foreign/TestMemoryAlignment.java
+++ b/test/jdk/java/foreign/TestMemoryAlignment.java
@@ -60,8 +60,14 @@ public class TestMemoryAlignment {
         assertEquals(aligned.byteAlignment(), align); //unreasonable alignment here, to make sure access throws
         VarHandle vh = aligned.varHandle();
         try (Arena arena = Arena.ofConfined()) {
-            MemorySegment segment = arena.allocate(aligned);;
+            MemorySegment segment = arena.allocate(aligned);
             vh.set(segment, 0L, -42);
+
+            // Allocate another segment and fill it with data to
+            // check that the first segment is not overwritten
+            MemorySegment nextSegment = arena.allocate(aligned);
+            vh.set(nextSegment, 0L, 0xffffff);
+
             int val = (int)vh.get(segment, 0L);
             assertEquals(val, -42);
         }

From c028369dcb0a677541b89117b0800125bc7c6c33 Mon Sep 17 00:00:00 2001
From: Trevor Bond <trevorkbond@gmail.com>
Date: Wed, 26 Nov 2025 15:44:14 +0000
Subject: [PATCH 365/512] 8350938: ResourceParsingClassHierarchyResolver
 inflates all Utf8 CP entries

Reviewed-by: liach, jpai
---
 .../classfile/impl/ClassHierarchyImpl.java    | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassHierarchyImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassHierarchyImpl.java
index 5be14f42baa..e4e67afb17f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassHierarchyImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassHierarchyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.lang.classfile.ClassHierarchyResolver;
+import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.constant.ClassDesc;
 import java.util.Collection;
 import java.util.HashMap;
@@ -38,7 +37,6 @@ import java.util.Map;
 import java.util.function.Function;
 
 import static java.lang.classfile.ClassFile.ACC_INTERFACE;
-import static java.lang.classfile.constantpool.PoolEntry.*;
 import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.util.Objects.requireNonNull;
 import static jdk.internal.constant.ConstantUtils.referenceClassDesc;
@@ -164,31 +162,12 @@ public final class ClassHierarchyImpl {
         public ClassHierarchyResolver.ClassHierarchyInfo getClassInfo(ClassDesc classDesc) {
             var ci = streamProvider.apply(classDesc);
             if (ci == null) return null;
-            try (var in = new DataInputStream(new BufferedInputStream(ci))) {
-                in.skipBytes(8);
-                int cpLength = in.readUnsignedShort();
-                String[] cpStrings = new String[cpLength];
-                int[] cpClasses = new int[cpLength];
-                for (int i = 1; i < cpLength; i++) {
-                    int tag;
-                    switch (tag = in.readUnsignedByte()) {
-                        case TAG_UTF8 -> cpStrings[i] = in.readUTF();
-                        case TAG_CLASS -> cpClasses[i] = in.readUnsignedShort();
-                        case TAG_STRING, TAG_METHOD_TYPE, TAG_MODULE, TAG_PACKAGE -> in.skipBytes(2);
-                        case TAG_METHOD_HANDLE -> in.skipBytes(3);
-                        case TAG_INTEGER, TAG_FLOAT, TAG_FIELDREF, TAG_METHODREF, TAG_INTERFACE_METHODREF,
-                             TAG_NAME_AND_TYPE, TAG_DYNAMIC, TAG_INVOKE_DYNAMIC -> in.skipBytes(4);
-                        case TAG_LONG, TAG_DOUBLE -> {
-                            in.skipBytes(8);
-                            i++;
-                        }
-                        default -> throw new IllegalStateException("Bad tag (" + tag + ") at index (" + i + ")");
-                    }
-                }
-                boolean isInterface = (in.readUnsignedShort() & ACC_INTERFACE) != 0;
-                in.skipBytes(2);
-                int superIndex = in.readUnsignedShort();
-                var superClass = superIndex > 0 ? ClassDesc.ofInternalName(cpStrings[cpClasses[superIndex]]) : null;
+            try (ci) {
+                var reader = new ClassReaderImpl(ci.readAllBytes(), ClassFileImpl.DEFAULT_CONTEXT);
+                boolean isInterface = (reader.flags() & ACC_INTERFACE) != 0;
+                ClassDesc superClass = reader.superclassEntry()
+                        .map(ClassEntry::asSymbol)
+                        .orElse(null);
                 return new ClassHierarchyInfoImpl(superClass, isInterface);
             } catch (IOException ioe) {
                 throw new UncheckedIOException(ioe);

From 6e920fbdab17201886804bb53b59188b362f541d Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 26 Nov 2025 20:01:29 +0000
Subject: [PATCH 366/512] 8372380: Make hs_err reporting more robust for
 unattached threads

Reviewed-by: shade, aboldtch, kevinw
---
 src/hotspot/share/compiler/compilationMemoryStatistic.cpp | 6 ++++--
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp               | 3 ++-
 src/hotspot/share/gc/shared/gcLogPrecious.cpp             | 4 +++-
 src/hotspot/share/utilities/vmError.cpp                   | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index d1e2f6f34a0..1951fd066fc 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -1010,8 +1010,10 @@ void CompilationMemoryStatistic::print_error_report(outputStream* st) {
     oom_stats->print_peak_state_on(st);
     st->cr();
   }
-  st->print_cr("Compiler Memory Statistic, 10 most expensive compilations:");
-  print_all_by_size(st, false, false, 0, 10);
+  if (Thread::current_or_null_safe() != nullptr) {
+    st->print_cr("Compiler Memory Statistic, 10 most expensive compilations:");
+    print_all_by_size(st, false, false, 0, 10);
+  }
 }
 
 void CompilationMemoryStatistic::print_final_report(outputStream* st) {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 5567d84bee4..061241c24e2 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2355,7 +2355,8 @@ static void print_region_type(outputStream* st, const char* type, uint count, bo
 }
 
 void G1CollectedHeap::print_heap_on(outputStream* st) const {
-  size_t heap_used = Heap_lock->owned_by_self() ? used() : used_unlocked();
+  size_t heap_used = (Thread::current_or_null_safe() != nullptr &&
+                      Heap_lock->owned_by_self()) ? used() : used_unlocked();
   st->print("%-20s", "garbage-first heap");
   st->print(" total reserved %zuK, committed %zuK, used %zuK",
             _hrm.reserved().byte_size()/K, capacity()/K, heap_used/K);
diff --git a/src/hotspot/share/gc/shared/gcLogPrecious.cpp b/src/hotspot/share/gc/shared/gcLogPrecious.cpp
index 43bd58db1aa..d556eed1b69 100644
--- a/src/hotspot/share/gc/shared/gcLogPrecious.cpp
+++ b/src/hotspot/share/gc/shared/gcLogPrecious.cpp
@@ -25,6 +25,7 @@
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
+#include "runtime/thread.hpp"
 #include "utilities/ostream.hpp"
 
 stringStream* GCLogPrecious::_lines = nullptr;
@@ -83,7 +84,8 @@ void GCLogPrecious::print_on_error(outputStream* st) {
     return;
   }
 
-  if (!_lock->try_lock_without_rank_check()) {
+  if (Thread::current_or_null_safe() == nullptr ||
+      !_lock->try_lock_without_rank_check()) {
     st->print_cr("<Skipped>\n");
     return;
   }
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index e0cbb60c744..a290602e0be 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -664,6 +664,7 @@ void VMError::report(outputStream* st, bool _verbose) {
   BEGIN
   if (MemTracker::enabled() &&
       NmtVirtualMemory_lock != nullptr &&
+      _thread != nullptr &&
       NmtVirtualMemory_lock->owned_by_self()) {
     // Manually unlock to avoid reentrancy due to mallocs in detailed mode.
     NmtVirtualMemory_lock->unlock();
@@ -1305,7 +1306,7 @@ void VMError::report(outputStream* st, bool _verbose) {
     os::print_signal_handlers(st, buf, sizeof(buf));
     st->cr();
 
-  STEP_IF("Native Memory Tracking", _verbose)
+  STEP_IF("Native Memory Tracking", _verbose && _thread != nullptr)
     MemTracker::error_report(st);
     st->cr();
 

From 42db9ab629a6209aa471de8b3034c053b77629dd Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 26 Nov 2025 22:12:41 +0000
Subject: [PATCH 367/512] 8298432: Investigate the benefits of usage of
 GetPrimitiveArrayCritical in the cmm code

Reviewed-by: psadhukhan, jdv, azvegint
---
 .../classes/sun/java2d/cmm/lcms/LCMS.java     |  5 +-
 .../sun/java2d/cmm/lcms/LCMSImageLayout.java  | 20 +-----
 .../sun/java2d/cmm/lcms/LCMSTransform.java    |  3 +-
 src/java.desktop/share/native/liblcms/LCMS.c  | 66 ++++---------------
 4 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
index 63a1359323f..24b50003e3c 100644
--- a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
+++ b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,8 +136,7 @@ final class LCMS implements PCMM {
     static native void colorConvert(long trans, int width, int height,
                                     int srcOffset, int srcNextRowOffset,
                                     int dstOffset, int dstNextRowOffset,
-                                    Object srcData, Object dstData,
-                                    int srcType, int dstType);
+                                    Object srcData, Object dstData);
 
     private LCMS() {}
 
diff --git a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
index 663e11ff172..c7bae875282 100644
--- a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
+++ b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
@@ -31,7 +31,6 @@ import java.awt.image.ColorModel;
 import java.awt.image.ComponentColorModel;
 import java.awt.image.ComponentSampleModel;
 import java.awt.image.Raster;
-import java.lang.annotation.Native;
 import java.nio.ByteOrder;
 
 import sun.awt.image.ByteComponentRaster;
@@ -69,14 +68,7 @@ final class LCMSImageLayout {
 //  private static final int PT_BGRA_8        = PT_ABGR_8 | SWAPFIRST;
     private static final int SWAP_ENDIAN =
             ByteOrder.nativeOrder() == LITTLE_ENDIAN ? DOSWAP : 0;
-    @Native
-    private static final int DT_BYTE = 0;
-    @Native
-    private static final int DT_SHORT = 1;
-    @Native
-    private static final int DT_INT = 2;
     int pixelType;
-    int dataType;
     int width;
     int height;
     int nextRowOffset;
@@ -93,12 +85,10 @@ final class LCMSImageLayout {
      * @param  data the storage of pixels: {@code byte[], short[] or int[]}
      * @param  length the length of the data array
      * @param  nc the number of color components
-     * @param  dt the type of data array: DT_BYTE, DT_SHORT or DT_INT
      * @param  size the size of one color component in bytes
      */
-    private LCMSImageLayout(Object data, int length, int nc, int dt, int size) {
+    private LCMSImageLayout(Object data, int length, int nc, int size) {
         dataArray = data;
-        dataType = dt;
         dataArrayLength = length * size;
         pixelType = CHANNELS_SH(nc) | BYTES_SH(size);
         width = length / nc;
@@ -109,11 +99,11 @@ final class LCMSImageLayout {
     }
 
     LCMSImageLayout(byte[] data, int nc) {
-        this(data, data.length, nc, DT_BYTE, Byte.BYTES);
+        this(data, data.length, nc, Byte.BYTES);
     }
 
     LCMSImageLayout(short[] data, int nc) {
-        this(data, data.length, nc, DT_SHORT, Short.BYTES);
+        this(data, data.length, nc, Short.BYTES);
     }
 
     private LCMSImageLayout() {
@@ -186,7 +176,6 @@ final class LCMSImageLayout {
                 l.offset = safeMult(4, intRaster.getDataOffset(0));
                 l.dataArray = intRaster.getDataStorage();
                 l.dataArrayLength = 4 * intRaster.getDataStorage().length;
-                l.dataType = DT_INT;
             }
             case BufferedImage.TYPE_BYTE_GRAY, BufferedImage.TYPE_3BYTE_BGR,
                  BufferedImage.TYPE_4BYTE_ABGR,
@@ -201,7 +190,6 @@ final class LCMSImageLayout {
                 l.offset = byteRaster.getDataOffset(firstBand);
                 l.dataArray = byteRaster.getDataStorage();
                 l.dataArrayLength = byteRaster.getDataStorage().length;
-                l.dataType = DT_BYTE;
             }
             case BufferedImage.TYPE_USHORT_GRAY -> {
                 if (!(raster instanceof ShortComponentRaster shortRaster)) {
@@ -212,7 +200,6 @@ final class LCMSImageLayout {
                 l.offset = safeMult(2, shortRaster.getDataOffset(0));
                 l.dataArray = shortRaster.getDataStorage();
                 l.dataArrayLength = 2 * shortRaster.getDataStorage().length;
-                l.dataType = DT_SHORT;
             }
             default -> {
                 return null;
@@ -319,7 +306,6 @@ final class LCMSImageLayout {
             l.nextPixelOffset = br.getPixelStride();
 
             l.offset = br.getDataOffset(firstBand);
-            l.dataType = DT_BYTE;
             byte[] data = br.getDataStorage();
             l.dataArray = data;
             l.dataArrayLength = data.length;
diff --git a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
index 881a6556ace..3f4f510cf94 100644
--- a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
+++ b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
@@ -121,8 +121,7 @@ final class LCMSTransform implements ColorTransform {
         }
         LCMS.colorConvert(tfm.ID, in.width, in.height, in.offset,
                           in.nextRowOffset, out.offset, out.nextRowOffset,
-                          in.dataArray, out.dataArray,
-                          in.dataType, out.dataType);
+                          in.dataArray, out.dataArray);
         Reference.reachabilityFence(tfm); // prevent deallocation of "tfm.ID"
     }
 
diff --git a/src/java.desktop/share/native/liblcms/LCMS.c b/src/java.desktop/share/native/liblcms/LCMS.c
index 5cf7ee6c436..5d4ace7a624 100644
--- a/src/java.desktop/share/native/liblcms/LCMS.c
+++ b/src/java.desktop/share/native/liblcms/LCMS.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <memory.h>
 #include "sun_java2d_cmm_lcms_LCMS.h"
-#include "sun_java2d_cmm_lcms_LCMSImageLayout.h"
 #include "jni_util.h"
 #include "Trace.h"
 #include "Disposer.h"
@@ -46,10 +45,6 @@
 
 #define SigHead TagIdConst('h','e','a','d')
 
-#define DT_BYTE     sun_java2d_cmm_lcms_LCMSImageLayout_DT_BYTE
-#define DT_SHORT    sun_java2d_cmm_lcms_LCMSImageLayout_DT_SHORT
-#define DT_INT      sun_java2d_cmm_lcms_LCMSImageLayout_DT_INT
-
 /* Default temp profile list size */
 #define DF_ICC_BUF_SIZE 32
 
@@ -464,46 +459,17 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative
     }
 }
 
-static void *getILData(JNIEnv *env, jobject data, jint type) {
-    switch (type) {
-        case DT_BYTE:
-            return (*env)->GetByteArrayElements(env, data, 0);
-        case DT_SHORT:
-            return (*env)->GetShortArrayElements(env, data, 0);
-        case DT_INT:
-            return (*env)->GetIntArrayElements(env, data, 0);
-        default:
-            return NULL;
-    }
-}
-
-static void releaseILData(JNIEnv *env, void *pData, jint type, jobject data,
-                          jint mode) {
-    switch (type) {
-        case DT_BYTE:
-            (*env)->ReleaseByteArrayElements(env, data, (jbyte *) pData, mode);
-            break;
-        case DT_SHORT:
-            (*env)->ReleaseShortArrayElements(env, data, (jshort *) pData, mode);
-            break;
-        case DT_INT:
-            (*env)->ReleaseIntArrayElements(env, data, (jint *) pData, mode);
-            break;
-    }
-}
-
 /*
  * Class:     sun_java2d_cmm_lcms_LCMS
  * Method:    colorConvert
- * Signature: (JIIIIIIZZLjava/lang/Object;Ljava/lang/Object;)V
+ * Signature: (JIIIIIILjava/lang/Object;Ljava/lang/Object;)V
  */
 JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_colorConvert
   (JNIEnv *env, jclass cls, jlong ID, jint width, jint height, jint srcOffset,
    jint srcNextRowOffset, jint dstOffset, jint dstNextRowOffset,
-   jobject srcData, jobject dstData, jint srcDType, jint dstDType)
+   jobject srcData, jobject dstData)
 {
     cmsHTRANSFORM sTrans = jlong_to_ptr(ID);
-
     if (sTrans == NULL) {
         J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_colorConvert: transform == NULL");
         JNU_ThrowByName(env, "java/awt/color/CMMException",
@@ -511,28 +477,22 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_colorConvert
         return;
     }
 
-    void *inputBuffer = getILData(env, srcData, srcDType);
+    void *inputBuffer = (*env)->GetPrimitiveArrayCritical(env, srcData, NULL);
     if (inputBuffer == NULL) {
-        J2dRlsTraceLn(J2D_TRACE_ERROR, "");
         // An exception should have already been thrown.
         return;
     }
+    void *outputBuffer = (*env)->GetPrimitiveArrayCritical(env, dstData, NULL);
+    if (outputBuffer != NULL) {
+        char *input = (char *) inputBuffer + srcOffset;
+        char *output = (char *) outputBuffer + dstOffset;
 
-    void *outputBuffer = getILData(env, dstData, dstDType);
-    if (outputBuffer == NULL) {
-        releaseILData(env, inputBuffer, srcDType, srcData, JNI_ABORT);
-        // An exception should have already been thrown.
-        return;
+        cmsDoTransformLineStride(sTrans, input, output, width, height,
+                                 srcNextRowOffset, dstNextRowOffset, 0, 0);
+
+        (*env)->ReleasePrimitiveArrayCritical(env, dstData, outputBuffer, 0);
     }
-
-    char *input = (char *) inputBuffer + srcOffset;
-    char *output = (char *) outputBuffer + dstOffset;
-
-    cmsDoTransformLineStride(sTrans, input, output, width, height,
-                             srcNextRowOffset, dstNextRowOffset, 0, 0);
-
-    releaseILData(env, inputBuffer, srcDType, srcData, JNI_ABORT);
-    releaseILData(env, outputBuffer, dstDType, dstData, 0);
+    (*env)->ReleasePrimitiveArrayCritical(env, srcData, inputBuffer, JNI_ABORT);
 }
 
 static cmsBool _getHeaderInfo(cmsHPROFILE pf, jbyte* pBuffer, jint bufferSize)

From 847fbab7924848e0e88d112db1d5d0b71372d597 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 26 Nov 2025 22:17:19 +0000
Subject: [PATCH 368/512] 8352654: [REDO] nsk/jvmti/ tests should fail when 
 nsk_jvmti_setFailStatus() is called

Reviewed-by: amenkov, sspitsyn
---
 test/hotspot/jtreg/ProblemList.txt                          | 1 +
 .../jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp        | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 934ef03a987..55a43663568 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -167,6 +167,7 @@ vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
 
 vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
+vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java 8372206 generic-all
 vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/TestDescription.java 8288911 macosx-all
 
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
index 0b43e5ac782..ae2fb040dde 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -62,6 +63,9 @@ static volatile int currentAgentStatus = NSK_STATUS_PASSED;
 
 void nsk_jvmti_setFailStatus() {
     currentAgentStatus = NSK_STATUS_FAILED;
+    printf("Test failed by setFailStatus(). See log.");
+    fflush(stdout);
+    exit(97);
 }
 
 int nsk_jvmti_isFailStatus() {

From b054a5657105ace7e66f6044692e14bb075dfb6c Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Thu, 27 Nov 2025 03:06:14 +0000
Subject: [PATCH 369/512] 8351095: [macos] Add more jpackage tests for
 --mac-app-store option

Reviewed-by: asemenyuk
---
 .../test/LauncherAsServiceVerifier.java       | 10 ++++-
 .../helpers/jdk/jpackage/test/MacHelper.java  |  9 +++++
 .../jdk/jpackage/test/PropertyFinder.java     |  6 ++-
 .../tools/jpackage/macosx/PkgScriptsTest.java | 39 +++++++++++--------
 .../jdk/tools/jpackage/share/ServiceTest.java | 26 ++++++++++---
 5 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
index 0be6cf685f6..09a46ecb7d1 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
@@ -149,7 +149,11 @@ public final class LauncherAsServiceVerifier {
             applyToAdditionalLauncher(target);
         }
         target.test().ifPresent(pkg -> {
-            pkg.addInstallVerifier(this::verifyLauncherExecuted);
+            pkg.addInstallVerifier(cmd -> {
+                if (!MacHelper.isForAppStore(cmd)) {
+                    verifyLauncherExecuted(cmd);
+                }
+            });
         });
     }
 
@@ -239,7 +243,9 @@ public final class LauncherAsServiceVerifier {
     }
 
     static boolean launcherAsService(JPackageCommand cmd, String launcherName) {
-        if (cmd.isMainLauncher(launcherName)) {
+        if (MacHelper.isForAppStore(cmd)) {
+            return false;
+        } else if (cmd.isMainLauncher(launcherName)) {
             return PropertyFinder.findLauncherProperty(cmd, null,
                     PropertyFinder.cmdlineBooleanOption("--launcher-as-service"),
                     PropertyFinder.nop(),
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
index a6d24af2b25..caeb0a206fc 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -797,6 +797,15 @@ public final class MacHelper {
         ).orElseGet(cmd::name);
     }
 
+    public static boolean isForAppStore(JPackageCommand cmd) {
+        return PropertyFinder.findAppProperty(cmd,
+                PropertyFinder.cmdlineBooleanOption("--mac-app-store"),
+                PropertyFinder.appImageFile(appImageFile -> {
+                    return Boolean.toString(appImageFile.macAppStore());
+                })
+        ).map(Boolean::parseBoolean).orElse(false);
+    }
+
     public static boolean isXcodeDevToolsInstalled() {
         return Inner.XCODE_DEV_TOOLS_INSTALLED;
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
index 6c612fa9ba5..3d7ac490350 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PropertyFinder.java
@@ -106,7 +106,11 @@ final class PropertyFinder {
 
     static Finder<JPackageCommand> cmdlineBooleanOption(String optionName) {
         return target -> {
-            return Optional.of(target.hasArgument(optionName)).map(Boolean::valueOf).map(Object::toString);
+            if (target.hasArgument(optionName)) {
+                return Optional.of(Boolean.TRUE.toString());
+            } else {
+                return Optional.empty();
+            }
         };
     }
 
diff --git a/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java b/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java
index f52191f4a05..9ee85ae5245 100644
--- a/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java
+++ b/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java
@@ -22,6 +22,7 @@
  */
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -32,6 +33,7 @@ import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
+import jdk.jpackage.test.MacHelper;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
@@ -50,24 +52,23 @@ import jdk.jpackage.test.TKit;
  */
 public class PkgScriptsTest {
 
-    public static Collection<?> input() {
-        return List.of(new Object[][]{
-            { new PkgInstallScript[]{
-                    PkgInstallScript.PREINSTALL,
-                    PkgInstallScript.POSTINSTALL },
-            },
-            { new PkgInstallScript[]{
-                    PkgInstallScript.PREINSTALL },
-            },
-            { new PkgInstallScript[]{
-                    PkgInstallScript.POSTINSTALL },
-            },
-        });
+    public static Collection<Object[]> input() {
+        List<Object[]> data = new ArrayList<>();
+        for (var appStore : List.of(true, false)) {
+            for (var scriptRoles : List.of(
+                    List.of(PkgInstallScript.PREINSTALL, PkgInstallScript.POSTINSTALL),
+                    List.of(PkgInstallScript.PREINSTALL),
+                    List.of(PkgInstallScript.POSTINSTALL)
+            )) {
+                data.add(new Object[] {scriptRoles.toArray(PkgInstallScript[]::new), appStore});
+            }
+        }
+        return data;
     }
 
     @Test
     @ParameterSupplier("input")
-    public void test(PkgInstallScript[] customScriptRoles) {
+    public void test(PkgInstallScript[] customScriptRoles, boolean appStore) {
         var responseDir = TKit.createTempDirectory("response");
 
         var customScripts = Stream.of(customScriptRoles).map(role -> {
@@ -80,6 +81,9 @@ public class PkgScriptsTest {
             .forTypes(PackageType.MAC_PKG)
             .configureHelloApp()
             .addInitializer(cmd -> {
+                if (appStore) {
+                    cmd.addArgument("--mac-app-store");
+                }
                 cmd.addArguments("--resource-dir", TKit.createTempDirectory("resources"));
                 customScripts.forEach(customScript -> {
                     customScript.createFor(cmd);
@@ -156,10 +160,13 @@ public class PkgScriptsTest {
         }
 
         void verify(JPackageCommand cmd) {
+            var scriptsEnabled = !MacHelper.isForAppStore(cmd);
             if (cmd.isPackageUnpacked()) {
-                role.verifyExists(cmd, true);
-            } else {
+                role.verifyExists(cmd, scriptsEnabled);
+            } else if (scriptsEnabled) {
                 TKit.assertFileExists(responseFilePath(cmd));
+            } else {
+                TKit.assertPathExists(responseFilePath(cmd), false);
             }
         }
 
diff --git a/test/jdk/tools/jpackage/share/ServiceTest.java b/test/jdk/tools/jpackage/share/ServiceTest.java
index 226f8f16bdc..94d3421a2cd 100644
--- a/test/jdk/tools/jpackage/share/ServiceTest.java
+++ b/test/jdk/tools/jpackage/share/ServiceTest.java
@@ -33,6 +33,7 @@ import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import jdk.jpackage.test.AdditionalLauncher;
+import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.ConfigurationTarget;
@@ -155,14 +156,21 @@ public class ServiceTest {
     }
 
     @Test
-    @Parameter("true")
-    @Parameter("false")
-    public void testAddL(boolean mainLauncherAsService) {
+    @Parameter(value = {"true", "false"})
+    @Parameter(value = {"false", "false"})
+    @Parameter(value = {"true", "true"}, ifOS = OperatingSystem.MACOS)
+    @Parameter(value = {"false", "true"}, ifOS = OperatingSystem.MACOS)
+    public void testAddL(boolean mainLauncherAsService, boolean isMacAppStore) {
 
         final var uniqueOutputFile = uniqueOutputFile();
 
         createPackageTest()
                 .addHelloAppInitializer("com.buz.AddLaunchersServiceTest")
+                .addInitializer(cmd -> {
+                    if (isMacAppStore) {
+                        cmd.addArgument("--mac-app-store");
+                    }
+                })
                 .mutate(test -> {
                     if (mainLauncherAsService) {
                         LauncherAsServiceVerifier.build()
@@ -199,9 +207,11 @@ public class ServiceTest {
         }
 
     @Test
-    @Parameter("true")
-    @Parameter("false")
-    public void testAddLFromAppImage(boolean mainLauncherAsService) {
+    @Parameter(value = {"true", "false"})
+    @Parameter(value = {"false", "false"})
+    @Parameter(value = {"true", "true"}, ifOS = OperatingSystem.MACOS)
+    @Parameter(value = {"false", "true"}, ifOS = OperatingSystem.MACOS)
+    public void testAddLFromAppImage(boolean mainLauncherAsService, boolean isMacAppStore) {
 
         var uniqueOutputFile = uniqueOutputFile();
 
@@ -213,6 +223,10 @@ public class ServiceTest {
             appImageCmd.addInitializer(JPackageCommand::ignoreFakeRuntime);
         }
 
+        if (isMacAppStore) {
+            appImageCmd.cmd().orElseThrow().addArgument("--mac-app-store");
+        }
+
         if (mainLauncherAsService) {
             LauncherAsServiceVerifier.build()
                     .mutate(uniqueOutputFile).appendAppOutputFileNamePrefix("-")

From 55362e191d447c2116f111cef438700eca24aab1 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 27 Nov 2025 04:18:20 +0000
Subject: [PATCH 370/512] 8372385:
 tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
 fails

Reviewed-by: almatvee
---
 .../jdk/jpackage/internal/cli/MainTest.java   | 65 +++++++++++++++++--
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
index 41142382c39..246b3722cbf 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
@@ -36,6 +36,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.test.JUnitAdapter;
@@ -58,7 +60,9 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
                 // Print the tool version
                 build().args("--version").expectVersion(),
                 // Print the tool version
-                build().args("foo", "bar").expectErrors(I18N.format("error.non-option-arguments", 2)),
+                // Additional error messages may be printed if the default bundling operation
+                // can not be identified; don't verify these errors in the output.
+                build().args("foo", "bar").stderrMatchType(OutputMatchType.STARTS_WITH).expectErrors(I18N.format("error.non-option-arguments", 2)),
                 // Valid command line requesting to print the full help.
                 build().args("-h").expectFullHelp(),
                 // Valid command line requesting to build a package and print the full help.
@@ -68,12 +72,14 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
                 // Valid command line requesting to print the full help and the version of the tool.
                 build().args("--help", "--version").expectVersionWithHelp(),
                 // Invalid command line requesting to print the version of the tool.
-                build().args("foo", "--version").expectErrors(I18N.format("error.non-option-arguments", 1))
+                // Additional error messages may be printed if the default bundling operation
+                // can not be identified; don't verify these errors in the output.
+                build().args("foo", "--version").stderrMatchType(OutputMatchType.STARTS_WITH).expectErrors(I18N.format("error.non-option-arguments", 1))
         ).map(TestSpec.Builder::create).toList();
     }
 
 
-    record TestSpec(List<String> args, int expectedExitCode, List<String> expectedStdout, List<String> expectedStderr) {
+    record TestSpec(List<String> args, int expectedExitCode, ExpectedOutput expectedStdout, ExpectedOutput expectedStderr) {
 
         TestSpec {
             Objects.requireNonNull(args);
@@ -84,15 +90,19 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
         void run() {
             var result = ExecutionResult.create(args.toArray(String[]::new));
             assertEquals(expectedExitCode, result.exitCode());
-            assertEquals(expectedStdout, result.stdout());
-            assertEquals(expectedStderr, result.stderr());
+            expectedStdout.test(result.stdout());
+            expectedStderr.test(result.stderr());
         }
 
 
         static final class Builder {
 
             TestSpec create() {
-                return new TestSpec(args, expectedExitCode, expectedStdout, expectedStderr);
+                return new TestSpec(
+                        args,
+                        expectedExitCode,
+                        new ExpectedOutput(expectedStdout, Optional.ofNullable(stdoutMatchType).orElse(OutputMatchType.EQUALS)),
+                        new ExpectedOutput(expectedStderr, Optional.ofNullable(stderrMatchType).orElse(OutputMatchType.EQUALS)));
             }
 
             Builder args(String... v) {
@@ -104,6 +114,16 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
                 return this;
             }
 
+            Builder stdoutMatchType(OutputMatchType v) {
+                stdoutMatchType = v;
+                return this;
+            }
+
+            Builder stderrMatchType(OutputMatchType v) {
+                stderrMatchType = v;
+                return this;
+            }
+
             Builder expectStdout(String... lines) {
                 return expectStdout(List.of(lines));
             }
@@ -164,6 +184,8 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
 
             private List<String> args = new ArrayList<>();
             private int expectedExitCode;
+            private OutputMatchType stdoutMatchType;
+            private OutputMatchType stderrMatchType;
             private List<String> expectedStdout = new ArrayList<>();
             private List<String> expectedStderr = new ArrayList<>();
         }
@@ -188,6 +210,37 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
     }
 
 
+    private enum OutputMatchType {
+        EQUALS((_, actual) -> actual),
+        STARTS_WITH((expected, actual) -> {
+            if (expected.size() < actual.size()) {
+                return actual.subList(0, expected.size());
+            }
+            return actual;
+        }),
+        ;
+
+        OutputMatchType(BiFunction<List<String>, List<String>, List<String>> mapper) {
+            this.mapper = Objects.requireNonNull(mapper);
+        }
+
+        private final BiFunction<List<String>, List<String>, List<String>> mapper;
+    }
+
+
+    private record ExpectedOutput(List<String> content, OutputMatchType type) {
+        ExpectedOutput {
+            Objects.requireNonNull(content);
+            Objects.requireNonNull(type);
+        }
+
+        void test(List<String> lines) {
+            var filteredLines = type.mapper.apply(content, lines);
+            assertEquals(content, filteredLines);
+        }
+    }
+
+
     private static TestSpec.Builder build() {
         return new TestSpec.Builder();
     }

From 848c0c79b69c489db6c6bbb24644134fe33fd0ec Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 27 Nov 2025 05:29:46 +0000
Subject: [PATCH 371/512] 8372285: G1: Micro-optimize x86 barrier code

Reviewed-by: tschatzl, ayang
---
 .../x86/gc/g1/g1BarrierSetAssembler_x86.cpp   | 130 ++++++++----------
 1 file changed, 61 insertions(+), 69 deletions(-)

diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index 586135fcebc..34de9403ccf 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -89,10 +89,10 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
 
 void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                              Register addr, Register count, Register tmp) {
-  Label done;
+  Label L_done;
 
   __ testptr(count, count);
-  __ jcc(Assembler::zero, done);
+  __ jccb(Assembler::zero, L_done);
 
   // Calculate end address in "count".
   Address::ScaleFactor scale = UseCompressedOops ? Address::times_4 : Address::times_8;
@@ -111,31 +111,31 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   __ shrptr(count, CardTable::card_shift());
   __ addptr(count, tmp);
 
-  Label loop;
+  Label L_loop;
   // Iterate from start card to end card (inclusive).
-  __ bind(loop);
+  __ bind(L_loop);
 
-  Label is_clean_card;
+  Label L_is_clean_card;
   if (UseCondCardMark) {
     __ cmpb(Address(addr, 0), G1CardTable::clean_card_val());
-    __ jcc(Assembler::equal, is_clean_card);
+    __ jccb(Assembler::equal, L_is_clean_card);
   } else {
    __ movb(Address(addr, 0), G1CardTable::dirty_card_val());
   }
 
-  Label next_card;
-  __ bind(next_card);
+  Label L_next_card;
+  __ bind(L_next_card);
   __ addptr(addr, sizeof(CardTable::CardValue));
   __ cmpptr(addr, count);
-  __ jcc(Assembler::belowEqual, loop);
-  __ jmp(done);
+  __ jccb(Assembler::belowEqual, L_loop);
+  __ jmpb(L_done);
 
-  __ bind(is_clean_card);
-  // Card was clean. Dirty card and go to next..
+  __ bind(L_is_clean_card);
+  // Card was clean. Dirty card and go to next.
   __ movb(Address(addr, 0), G1CardTable::dirty_card_val());
-  __ jmp(next_card);
+  __ jmpb(L_next_card);
 
-  __ bind(done);
+  __ bind(L_done);
 }
 
 void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
@@ -157,22 +157,6 @@ void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorator
   }
 }
 
-static void generate_queue_insertion(MacroAssembler* masm, ByteSize index_offset, ByteSize buffer_offset, Label& runtime,
-                                     const Register thread, const Register value, const Register temp) {
-  // This code assumes that buffer index is pointer sized.
-  STATIC_ASSERT(in_bytes(SATBMarkQueue::byte_width_of_index()) == sizeof(intptr_t));
-  // Can we store a value in the given thread's buffer?
-  // (The index field is typed as size_t.)
-  __ movptr(temp, Address(thread, in_bytes(index_offset)));   // temp := *(index address)
-  __ testptr(temp, temp);                                     // index == 0?
-  __ jcc(Assembler::zero, runtime);                           // jump to runtime if index == 0 (full buffer)
-  // The buffer is not full, store value into it.
-  __ subptr(temp, wordSize);                                  // temp := next index
-  __ movptr(Address(thread, in_bytes(index_offset)), temp);   // *(index address) := next index
-  __ addptr(temp, Address(thread, in_bytes(buffer_offset)));  // temp := buffer address + next index
-  __ movptr(Address(temp, 0), value);                         // *(buffer address + next index) := value
-}
-
 static void generate_pre_barrier_fast_path(MacroAssembler* masm,
                                            const Register thread) {
   Address in_progress(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()));
@@ -190,21 +174,40 @@ static void generate_pre_barrier_slow_path(MacroAssembler* masm,
                                            const Register pre_val,
                                            const Register thread,
                                            const Register tmp,
-                                           Label& done,
-                                           Label& runtime) {
+                                           Label& L_done) {
+  Address index_addr(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset()));
+  Address buffer_addr(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset()));
+
+  // This code assumes that buffer index is pointer sized.
+  STATIC_ASSERT(in_bytes(SATBMarkQueue::byte_width_of_index()) == sizeof(intptr_t));
+
+  Label L_runtime;
+
   // Do we need to load the previous value?
   if (obj != noreg) {
     __ load_heap_oop(pre_val, Address(obj, 0), noreg, AS_RAW);
   }
+
   // Is the previous value null?
-  __ cmpptr(pre_val, NULL_WORD);
-  __ jcc(Assembler::equal, done);
-  generate_queue_insertion(masm,
-                           G1ThreadLocalData::satb_mark_queue_index_offset(),
-                           G1ThreadLocalData::satb_mark_queue_buffer_offset(),
-                           runtime,
-                           thread, pre_val, tmp);
-  __ jmp(done);
+  __ testptr(pre_val, pre_val);
+  __ jcc(Assembler::equal, L_done);
+
+  // Can we store a value in the given thread's buffer?
+  // (The index field is typed as size_t.)
+  __ movptr(tmp, index_addr);             // temp := *(index address)
+  __ testptr(tmp, tmp);                   // index == 0?
+  __ jccb(Assembler::zero, L_runtime);    // jump to runtime if index == 0 (full buffer)
+
+  // The buffer is not full, store value into it.
+  __ subptr(tmp, wordSize);               // temp := next index
+  __ movptr(index_addr, tmp);             // *(index address) := next index
+  __ addptr(tmp, buffer_addr);            // temp := buffer address + next index
+  __ movptr(Address(tmp, 0), pre_val);    // *(buffer address + next index) := value
+
+  // Jump out if done, or fall-through to runtime.
+  // "L_done" is far away, so jump cannot be short.
+  __ jmp(L_done);
+  __ bind(L_runtime);
 }
 
 void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
@@ -219,7 +222,6 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   const Register thread = r15_thread;
 
   Label done;
-  Label runtime;
 
   assert(pre_val != noreg, "check this code");
 
@@ -231,9 +233,7 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   generate_pre_barrier_fast_path(masm, thread);
   // If marking is not active (*(mark queue active address) == 0), jump to done
   __ jcc(Assembler::equal, done);
-  generate_pre_barrier_slow_path(masm, obj, pre_val, thread, tmp, done, runtime);
-
-  __ bind(runtime);
+  generate_pre_barrier_slow_path(masm, obj, pre_val, thread, tmp, done);
 
   // Determine and save the live input values
   __ push_call_clobbered_registers();
@@ -272,23 +272,23 @@ static void generate_post_barrier(MacroAssembler* masm,
                                   const Register store_addr,
                                   const Register new_val,
                                   const Register tmp1,
-                                  Label& done,
                                   bool new_val_may_be_null) {
 
   assert_different_registers(store_addr, new_val, tmp1, noreg);
 
   Register thread = r15_thread;
 
+  Label L_done;
   // Does store cross heap regions?
   __ movptr(tmp1, store_addr);                                    // tmp1 := store address
   __ xorptr(tmp1, new_val);                                       // tmp1 := store address ^ new value
   __ shrptr(tmp1, G1HeapRegion::LogOfHRGrainBytes);               // ((store address ^ new value) >> LogOfHRGrainBytes) == 0?
-  __ jcc(Assembler::equal, done);
+  __ jccb(Assembler::equal, L_done);
 
   // Crosses regions, storing null?
   if (new_val_may_be_null) {
-    __ cmpptr(new_val, NULL_WORD);                                // new value == null?
-    __ jcc(Assembler::equal, done);
+    __ testptr(new_val, new_val);                                 // new value == null?
+    __ jccb(Assembler::equal, L_done);
   }
 
   __ movptr(tmp1, store_addr);                                    // tmp1 := store address
@@ -298,20 +298,19 @@ static void generate_post_barrier(MacroAssembler* masm,
   __ addptr(tmp1, card_table_addr);                               // tmp1 := card address
   if (UseCondCardMark) {
     __ cmpb(Address(tmp1, 0), G1CardTable::clean_card_val());     // *(card address) == clean_card_val?
-    __ jcc(Assembler::notEqual, done);
+    __ jccb(Assembler::notEqual, L_done);
   }
   // Storing a region crossing, non-null oop, card is clean.
   // Dirty card.
   __ movb(Address(tmp1, 0), G1CardTable::dirty_card_val());       // *(card address) := dirty_card_val
+  __ bind(L_done);
 }
 
 void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
                                                   Register store_addr,
                                                   Register new_val,
                                                   Register tmp) {
-  Label done;
-  generate_post_barrier(masm, store_addr, new_val, tmp, done, true /* new_val_may_be_null */);
-  __ bind(done);
+  generate_post_barrier(masm, store_addr, new_val, tmp, true /* new_val_may_be_null */);
 }
 
 #if defined(COMPILER2)
@@ -354,7 +353,6 @@ void G1BarrierSetAssembler::g1_write_barrier_pre_c2(MacroAssembler* masm,
 void G1BarrierSetAssembler::generate_c2_pre_barrier_stub(MacroAssembler* masm,
                                                          G1PreBarrierStubC2* stub) const {
   Assembler::InlineSkippedInstructionsCounter skip_counter(masm);
-  Label runtime;
   Register obj = stub->obj();
   Register pre_val = stub->pre_val();
   Register thread = stub->thread();
@@ -362,9 +360,8 @@ void G1BarrierSetAssembler::generate_c2_pre_barrier_stub(MacroAssembler* masm,
   assert(stub->tmp2() == noreg, "not needed in this platform");
 
   __ bind(*stub->entry());
-  generate_pre_barrier_slow_path(masm, obj, pre_val, thread, tmp, *stub->continuation(), runtime);
+  generate_pre_barrier_slow_path(masm, obj, pre_val, thread, tmp, *stub->continuation());
 
-  __ bind(runtime);
   generate_c2_barrier_runtime_call(masm, stub, pre_val, CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry));
   __ jmp(*stub->continuation());
 }
@@ -374,9 +371,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm,
                                                      Register new_val,
                                                      Register tmp,
                                                      bool new_val_may_be_null) {
-  Label done;
-  generate_post_barrier(masm, store_addr, new_val, tmp, done, new_val_may_be_null);
-  __ bind(done);
+  generate_post_barrier(masm, store_addr, new_val, tmp, new_val_may_be_null);
 }
 
 #endif // COMPILER2
@@ -449,7 +444,7 @@ void G1BarrierSetAssembler::gen_pre_barrier_stub(LIR_Assembler* ce, G1PreBarrier
     ce->mem2reg(stub->addr(), stub->pre_val(), T_OBJECT, stub->patch_code(), stub->info(), false /*wide*/);
   }
 
-  __ cmpptr(pre_val_reg, NULL_WORD);
+  __ testptr(pre_val_reg, pre_val_reg);
   __ jcc(Assembler::equal, *stub->continuation());
   ce->store_parameter(stub->pre_val()->as_register(), 0);
   __ call(RuntimeAddress(bs->pre_barrier_c1_runtime_code_blob()->code_begin()));
@@ -465,9 +460,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm,
                                                      Register thread,
                                                      Register tmp1,
                                                      Register tmp2 /* unused on x86 */) {
-  Label done;
-  generate_post_barrier(masm, store_addr, new_val, tmp1, done, true /* new_val_may_be_null */);
-  masm->bind(done);
+  generate_post_barrier(masm, store_addr, new_val, tmp1, true /* new_val_may_be_null */);
 }
 
 #define __ sasm->
@@ -490,8 +483,7 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
   Address queue_index(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset()));
   Address buffer(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset()));
 
-  Label done;
-  Label runtime;
+  Label L_done, L_runtime;
 
   // Is marking still active?
   if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
@@ -500,13 +492,13 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
     assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
     __ cmpb(queue_active, 0);
   }
-  __ jcc(Assembler::equal, done);
+  __ jcc(Assembler::equal, L_done);
 
   // Can we store original value in the thread's buffer?
 
   __ movptr(tmp, queue_index);
   __ testptr(tmp, tmp);
-  __ jcc(Assembler::zero, runtime);
+  __ jccb(Assembler::zero, L_runtime);
   __ subptr(tmp, wordSize);
   __ movptr(queue_index, tmp);
   __ addptr(tmp, buffer);
@@ -514,9 +506,9 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
   // prev_val (rax)
   __ load_parameter(0, pre_val);
   __ movptr(Address(tmp, 0), pre_val);
-  __ jmp(done);
+  __ jmp(L_done);
 
-  __ bind(runtime);
+  __ bind(L_runtime);
 
   __ push_call_clobbered_registers();
 
@@ -526,7 +518,7 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
 
   __ pop_call_clobbered_registers();
 
-  __ bind(done);
+  __ bind(L_done);
 
   __ pop_ppx(rdx);
   __ pop_ppx(rax);

From 7cd3d7f157708ebb6ce972b46a1a90379f63d08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Thu, 27 Nov 2025 07:15:30 +0000
Subject: [PATCH 372/512] 8372376: ZGC: Inaccurate verification of raw nulls in
 flip promoting pages

Reviewed-by: stefank, sjohanss, aboldtch
---
 src/hotspot/share/gc/z/zVerify.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index 55f13be9b44..db3db14afa2 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -130,7 +130,10 @@ static void z_verify_root_oop_object(zaddress addr, void* p) {
 
 static void z_verify_old_oop(zpointer* p) {
   const zpointer o = *p;
-  assert(o != zpointer::null, "Old should not contain raw null");
+  if (o == zpointer::null) {
+    guarantee(ZGeneration::young()->is_phase_mark_complete(), "Only possible when flip promoting");
+    guarantee(ZHeap::heap()->page(p)->is_allocating(), "Raw nulls only possible in allocating pages");
+  }
   if (!z_is_null_relaxed(o)) {
     if (ZPointer::is_mark_good(o)) {
       // Even though the pointer is mark good, we can't verify that it should

From de546d0e03ff1823b73c32db1861b77efa9552d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Thu, 27 Nov 2025 09:02:18 +0000
Subject: [PATCH 373/512] 8371702: ZGC: NUMA-Affinity for Worker Threads in the
 Relocation Phase

Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org>
Reviewed-by: aboldtch, eosterlund
---
 src/hotspot/share/gc/z/zRelocate.cpp | 51 +++++++++++++++-------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index 180ce22b041..24c4bdeac16 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -1087,7 +1087,6 @@ private:
   ZRelocateSmallAllocator                   _small_allocator;
   ZRelocateMediumAllocator                  _medium_allocator;
   const size_t                              _total_forwardings;
-  volatile size_t                           _numa_local_forwardings;
 
 public:
   ZRelocateTask(ZRelocationSet* relocation_set,
@@ -1104,8 +1103,7 @@ public:
       _medium_targets(medium_targets),
       _small_allocator(_generation),
       _medium_allocator(_generation, shared_medium_targets),
-      _total_forwardings(relocation_set->nforwardings()),
-      _numa_local_forwardings(0) {
+      _total_forwardings(relocation_set->nforwardings()) {
 
     for (uint32_t i = 0; i < ZNUMA::count(); i++) {
       ZRelocationSetParallelIterator* const iter = _iters->addr(i);
@@ -1124,18 +1122,17 @@ public:
 
     // Signal that we're not using the queue anymore. Used mostly for asserts.
     _queue->deactivate();
-
-    if (ZNUMA::is_enabled()) {
-      log_debug(gc, reloc, numa)("Forwardings relocated NUMA-locally: %zu / %zu (%.0f%%)",
-                                 _numa_local_forwardings, _total_forwardings, percent_of(_numa_local_forwardings, _total_forwardings));
-    }
   }
 
   virtual void work() {
     ZRelocateWork<ZRelocateSmallAllocator> small(&_small_allocator, _small_targets->addr(), _generation);
     ZRelocateWork<ZRelocateMediumAllocator> medium(&_medium_allocator, _medium_targets->addr(), _generation);
+
     const uint32_t num_nodes = ZNUMA::count();
-    uint32_t numa_local_forwardings_worker = 0;
+    const uint32_t start_node = ZNUMA::id();
+    uint32_t current_node = start_node;
+    bool has_affinity = false;
+    bool has_affinity_current_node = false;
 
     const auto do_forwarding = [&](ZForwarding* forwarding) {
       ZPage* const page = forwarding->page();
@@ -1167,26 +1164,30 @@ public:
 
     const auto do_forwarding_one_from_iter = [&]() {
       ZForwarding* forwarding;
-      const uint32_t start_node = ZNUMA::id();
-      uint32_t current_node = start_node;
 
-      for (uint32_t i = 0; i < num_nodes; i++) {
+      for (;;) {
         if (_iters->get(current_node).next_if(&forwarding, check_numa_local, current_node)) {
-          claim_and_do_forwarding(forwarding);
-
-          if (current_node == start_node) {
-            // Track if this forwarding was relocated on the local NUMA node
-            numa_local_forwardings_worker++;
+          // Set thread affinity for NUMA-local processing (if needed)
+          if (UseNUMA && !has_affinity_current_node) {
+            os::numa_set_thread_affinity(Thread::current(), ZNUMA::numa_id_to_node(current_node));
+            has_affinity = true;
+            has_affinity_current_node = true;
           }
 
+          // Perform the forwarding task
+          claim_and_do_forwarding(forwarding);
           return true;
         }
 
-        // Check next node.
+        // No work found on the current node, move to the next node
         current_node = (current_node + 1) % num_nodes;
-      }
+        has_affinity_current_node = false;
 
-      return false;
+        // If we've looped back to the starting node there's no more work to do
+        if (current_node == start_node) {
+          return false;
+        }
+      }
     };
 
     for (;;) {
@@ -1209,11 +1210,13 @@ public:
       }
     }
 
-    if (ZNUMA::is_enabled()) {
-      AtomicAccess::add(&_numa_local_forwardings, numa_local_forwardings_worker, memory_order_relaxed);
-    }
-
     _queue->leave();
+
+    if (UseNUMA && has_affinity) {
+      // Restore the affinity of the thread so that it isn't bound to a specific
+      // node any more
+      os::numa_set_thread_affinity(Thread::current(), -1);
+    }
   }
 
   virtual void resize_workers(uint nworkers) {

From 141aebca38bc683cbff8a2dfe0cb98d3f0186a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Thu, 27 Nov 2025 09:08:34 +0000
Subject: [PATCH 374/512] 8372586: Crashes on ppc64(le) after JDK-8371368

Reviewed-by: mbaesken
---
 src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index b5720351bdf..534c9996cfe 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -217,7 +217,8 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
           const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
           if (is_valid(pc_desc)) {
             intptr_t* const synthetic_sp = sender_sp - sampled_nm->frame_size();
-            top_frame = frame(synthetic_sp, synthetic_sp, sender_sp - 2, pc_desc->real_pc(sampled_nm), sampled_nm);
+            intptr_t* const synthetic_fp = sender_sp AARCH64_ONLY( - frame::sender_sp_offset);
+            top_frame = frame(synthetic_sp, synthetic_sp, synthetic_fp, pc_desc->real_pc(sampled_nm), sampled_nm);
             in_continuation = is_in_continuation(top_frame, jt);
             return true;
           }

From 86aae125f1a4e16dfe2dd0faf63f96ae1ca7bcd0 Mon Sep 17 00:00:00 2001
From: David Briemann <dbriemann@openjdk.org>
Date: Thu, 27 Nov 2025 09:08:50 +0000
Subject: [PATCH 375/512] 8367487: Test
 compiler/loopopts/superword/TestReinterpretAndCast.java fails on Linux
 aarch64 with Cavium CPU

Reviewed-by: epeter, mdoerr
---
 .../superword/TestReinterpretAndCast.java       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java
index a72126ebad5..ab2801179f2 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java
@@ -162,7 +162,13 @@ public class TestReinterpretAndCast {
                   IRNode.STORE_VECTOR,       "> 0",
                   IRNode.VECTOR_REINTERPRET, "> 0"}, // We have at least I2F
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    IRNode.VECTOR_SIZE + "min(max_int, max_float, max_short)", "> 0",
+                  IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE + "min(max_int, max_float, max_short)", "> 0",
+                  IRNode.STORE_VECTOR,       "> 0",
+                  IRNode.VECTOR_REINTERPRET, "> 0"}, // We have at least I2F
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureAnd = {"asimd", "true", "fphp", "true", "asimdhp", "true"})
     public static void test2(int[] a, short[] b) {
         for (int i = 0; i < SIZE; i++) {
             int v0 = a[i];
@@ -202,7 +208,14 @@ public class TestReinterpretAndCast {
                   IRNode.STORE_VECTOR,       "> 0",
                   IRNode.VECTOR_REINTERPRET, "> 0"}, // We have at least F2I
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.LOAD_VECTOR_S,    IRNode.VECTOR_SIZE + "min(max_float, max_short, max_long)", "> 0",
+                  IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE + "min(max_float, max_short, max_long)", "> 0",
+                  IRNode.VECTOR_CAST_I2L,  IRNode.VECTOR_SIZE + "min(max_float, max_short, max_long)", "> 0",
+                  IRNode.STORE_VECTOR,       "> 0",
+                  IRNode.VECTOR_REINTERPRET, "> 0"}, // We have at least F2I
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureAnd = {"asimd", "true", "fphp", "true", "asimdhp", "true"})
     public static void test3(short[] a, long[] b) {
         for (int i = 0; i < SIZE; i++) {
             short v0 = a[i];

From 1f417e77615c570ca3002b13a1398b647133ad67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Thu, 27 Nov 2025 09:27:02 +0000
Subject: [PATCH 376/512] 8371887: HttpClient: SSLParameters with no protocols
 configured disable HTTP2+ support

Reviewed-by: jpai, dfuchs
---
 .../jdk/internal/net/quic/QuicTLSContext.java |  2 +-
 .../jdk/internal/net/http/HttpClientImpl.java | 36 ++++++++++++++++---
 .../jdk/internal/net/http/HttpConnection.java | 22 +-----------
 .../internal/net/http/HttpQuicConnection.java | 21 +----------
 .../java/net/httpclient/TlsContextTest.java   | 27 ++++++++++++--
 .../net/httpclient/http2/TLSConnection.java   | 10 ++++--
 .../http3/H3UnsupportedSSLParametersTest.java | 15 ++++++++
 7 files changed, 81 insertions(+), 52 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/net/quic/QuicTLSContext.java b/src/java.base/share/classes/jdk/internal/net/quic/QuicTLSContext.java
index 5cf0c999fb9..15b3c450d03 100644
--- a/src/java.base/share/classes/jdk/internal/net/quic/QuicTLSContext.java
+++ b/src/java.base/share/classes/jdk/internal/net/quic/QuicTLSContext.java
@@ -74,7 +74,7 @@ public final class QuicTLSContext {
     /**
      * {@return {@code true} if protocols of the given {@code parameters} support QUIC TLS, {@code false} otherwise}
      */
-    public static boolean isQuicCompatible(SSLParameters parameters) {
+    private static boolean isQuicCompatible(SSLParameters parameters) {
         String[] protocols = parameters.getProtocols();
         return protocols != null && Arrays.asList(protocols).contains("TLSv1.3");
     }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index af9fd3b96ba..54bad66d4fa 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -53,6 +53,7 @@ import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -126,6 +127,8 @@ final class HttpClientImpl extends HttpClient implements Trackable {
     // Defaults to value used for HTTP/1 Keep-Alive Timeout. Can be overridden by jdk.httpclient.keepalive.timeout.h2 property.
     static final long IDLE_CONNECTION_TIMEOUT_H2 = getTimeoutProp("jdk.httpclient.keepalive.timeout.h2", KEEP_ALIVE_TIMEOUT);
     static final long IDLE_CONNECTION_TIMEOUT_H3 = getTimeoutProp("jdk.httpclient.keepalive.timeout.h3", IDLE_CONNECTION_TIMEOUT_H2);
+    private final boolean hasRequiredH3TLS;
+    private final boolean hasRequiredH2TLS;
 
     static final UseVTForSelector USE_VT_FOR_SELECTOR =
         Utils.useVTForSelector("jdk.internal.httpclient.tcp.selector.useVirtualThreads", "default");
@@ -477,10 +480,17 @@ final class HttpClientImpl extends HttpClient implements Trackable {
                     "HTTP3 is not supported"));
         }
         sslParams = requireNonNullElseGet(builder.sslParams, sslContext::getDefaultSSLParameters);
-        boolean sslParamsSupportedForH3 = sslParams.getProtocols() == null
-                || sslParams.getProtocols().length == 0
-                || isQuicCompatible(sslParams);
-        if (version == Version.HTTP_3 && !sslParamsSupportedForH3) {
+        String[] sslProtocols = sslParams.getProtocols();
+        if (sslProtocols == null) {
+            sslProtocols = requireNonNullElseGet(sslContext.getDefaultSSLParameters().getProtocols(),
+                    () -> new String[0]);
+        }
+        // HTTP/3 MUST use TLS version 1.3 or higher
+        hasRequiredH3TLS = Arrays.asList(sslProtocols).contains("TLSv1.3");
+        // HTTP/2 MUST use TLS version 1.2 or higher for HTTP/2 over TLS
+        hasRequiredH2TLS = hasRequiredH3TLS || Arrays.asList(sslProtocols).contains("TLSv1.2");
+
+        if (version == Version.HTTP_3 && !hasRequiredH3TLS) {
             throw new UncheckedIOException(new UnsupportedProtocolVersionException(
                     "HTTP3 is not supported - TLSv1.3 isn't configured on SSLParameters"));
         }
@@ -507,7 +517,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
             debug.log("proxySelector is %s (user-supplied=%s)",
                       this.proxySelector, userProxySelector != null);
         authenticator = builder.authenticator;
-        boolean h3Supported = sslCtxSupportedForH3 && sslParamsSupportedForH3;
+        boolean h3Supported = sslCtxSupportedForH3 && hasRequiredH3TLS;
         registry = new AltServicesRegistry(id);
         connections = new ConnectionPool(id);
         client2 = new Http2ClientImpl(this);
@@ -530,6 +540,22 @@ final class HttpClientImpl extends HttpClient implements Trackable {
         assert facadeRef.get() != null;
     }
 
+    /**
+     * Returns true if the SSL parameter protocols contains at
+     * least one TLS version that HTTP/3 requires.
+     */
+    boolean hasRequiredHTTP3TLSVersion() {
+        return hasRequiredH3TLS;
+    }
+
+    /**
+     * Returns true if the SSL parameter protocols contains at
+     * least one TLS version that HTTP/2 requires.
+     */
+    boolean hasRequiredHTTP2TLSVersion() {
+        return hasRequiredH2TLS;
+    }
+
     // called when the facade is GC'ed.
     // Just wakes up the selector to cleanup...
     void facadeCleanup() {
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
index 115bc56f804..0c1388cec8a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
@@ -32,7 +32,6 @@ import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.nio.channels.NetworkChannel;
 import java.nio.channels.SocketChannel;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -43,8 +42,6 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.Flow;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiPredicate;
-import java.util.function.Predicate;
-import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpHeaders;
 
@@ -285,23 +282,6 @@ abstract class HttpConnection implements Closeable {
      */
     abstract HttpPublisher publisher();
 
-    // HTTP/2 MUST use TLS version 1.2 or higher for HTTP/2 over TLS
-    private static final Predicate<String> testRequiredHTTP2TLSVersion = proto ->
-            proto.equals("TLSv1.2") || proto.equals("TLSv1.3");
-
-   /**
-    * Returns true if the given client's SSL parameter protocols contains at
-    * least one TLS version that HTTP/2 requires.
-    */
-   private static final boolean hasRequiredHTTP2TLSVersion(HttpClient client) {
-       String[] protos = client.sslParameters().getProtocols();
-       if (protos != null) {
-           return Arrays.stream(protos).filter(testRequiredHTTP2TLSVersion).findAny().isPresent();
-       } else {
-           return false;
-       }
-   }
-
     /**
      * Factory for retrieving HttpConnections. A connection can be retrieved
      * from the connection pool, or a new one created if none available.
@@ -359,7 +339,7 @@ abstract class HttpConnection implements Closeable {
             } else {
                 assert !request.isHttp3Only(version); // should have failed before
                 String[] alpn = null;
-                if (version == HTTP_2 && hasRequiredHTTP2TLSVersion(client)) {
+                if (version == HTTP_2 && client.hasRequiredHTTP2TLSVersion()) {
                     // We only come here after we have checked the HTTP/2 connection pool.
                     // We will not negotiate HTTP/2 if we don't have the appropriate TLS version
                     alpn = new String[] { Alpns.H2, Alpns.HTTP_1_1 };
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java
index 0a22256f6c6..36f191fbd67 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpQuicConnection.java
@@ -31,11 +31,9 @@ import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.SocketOption;
 import java.net.URI;
-import java.net.http.HttpClient;
 import java.net.http.HttpConnectTimeoutException;
 import java.nio.channels.NetworkChannel;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -43,7 +41,6 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.function.Predicate;
 
 import javax.net.ssl.SNIServerName;
 import javax.net.ssl.SSLParameters;
@@ -81,9 +78,6 @@ abstract class HttpQuicConnection extends HttpConnection {
     // the alt-service which was advertised, from some origin, for this connection co-ordinates.
     // can be null, which indicates this wasn't created because of an alt-service
     private final AltService sourceAltService;
-    // HTTP/2 MUST use TLS version 1.3 or higher for HTTP/3 over TLS
-    private static final Predicate<String> testRequiredHTTP3TLSVersion = proto ->
-            proto.equals("TLSv1.3");
 
 
     HttpQuicConnection(Origin originServer, InetSocketAddress address, HttpClientImpl client,
@@ -178,19 +172,6 @@ abstract class HttpQuicConnection extends HttpConnection {
         return quicConnection;
     }
 
-    /**
-     * Returns true if the given client's SSL parameter protocols contains at
-     * least one TLS version that HTTP/3 requires.
-     */
-    private static boolean hasRequiredHTTP3TLSVersion(HttpClient client) {
-        String[] protos = client.sslParameters().getProtocols();
-        if (protos != null) {
-            return Arrays.stream(protos).anyMatch(testRequiredHTTP3TLSVersion);
-        } else {
-            return false;
-        }
-    }
-
     /**
      * Called when the HTTP/3 connection is established, either successfully or
      * unsuccessfully
@@ -260,7 +241,7 @@ abstract class HttpQuicConnection extends HttpConnection {
         // to using HTTP/2
         var debug = h3client.debug();
         var where = "HttpQuicConnection.getHttpQuicConnection";
-        if (proxy != null || !hasRequiredHTTP3TLSVersion(client)) {
+        if (proxy != null || !client.hasRequiredHTTP3TLSVersion()) {
             if (debug.on())
                 debug.log("%s: proxy required or SSL version mismatch", where);
             return null;
diff --git a/test/jdk/java/net/httpclient/TlsContextTest.java b/test/jdk/java/net/httpclient/TlsContextTest.java
index f24007f6d90..86b067f66f8 100644
--- a/test/jdk/java/net/httpclient/TlsContextTest.java
+++ b/test/jdk/java/net/httpclient/TlsContextTest.java
@@ -31,6 +31,8 @@ import java.net.http.HttpResponse;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLParameters;
+
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
@@ -49,7 +51,7 @@ import jdk.test.lib.security.SecurityUtils;
 
 /*
  * @test
- * @bug 8239594
+ * @bug 8239594 8371887
  * @summary This test verifies that the TLS version handshake respects ssl context
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext TlsContextTest
@@ -101,9 +103,25 @@ public class TlsContextTest implements HttpServerAdapters {
      * Tests various scenarios between client and server tls handshake with valid http
      */
     @Test(dataProvider = "scenarios")
-    public void testVersionProtocols(SSLContext context,
+    public void testVersionProtocolsNoParams(SSLContext context,
                                      Version version,
                                      String expectedProtocol) throws Exception {
+        runTest(context, version, expectedProtocol, false);
+    }
+
+    /**
+     * Tests various scenarios between client and server tls handshake with valid http,
+     * but with empty SSLParameters
+     */
+    @Test(dataProvider = "scenarios")
+    public void testVersionProtocolsEmptyParams(SSLContext context,
+                                             Version version,
+                                             String expectedProtocol) throws Exception {
+        runTest(context, version, expectedProtocol, true);
+    }
+
+    private void runTest(SSLContext context, Version version, String expectedProtocol,
+                         boolean setEmptyParams) throws Exception {
         // for HTTP/3 we won't accept to set the version to HTTP/3 on the
         //    client if we don't have TLSv1.3; We will set the version
         //    on the request instead in that case.
@@ -111,8 +129,11 @@ public class TlsContextTest implements HttpServerAdapters {
                 : HttpClient.newBuilder().version(version);
         var reqBuilder = HttpRequest.newBuilder(new URI(https2URI));
 
+        if (setEmptyParams) {
+            builder.sslParameters(new SSLParameters());
+        }
         HttpClient client = builder.sslContext(context)
-                                      .build();
+                .build();
         if (version == HTTP_3) {
             // warmup to obtain AltService
             client.send(reqBuilder.version(HTTP_2).GET().build(), ofString());
diff --git a/test/jdk/java/net/httpclient/http2/TLSConnection.java b/test/jdk/java/net/httpclient/http2/TLSConnection.java
index fd9cff38371..e4009219bca 100644
--- a/test/jdk/java/net/httpclient/http2/TLSConnection.java
+++ b/test/jdk/java/net/httpclient/http2/TLSConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ import jdk.httpclient.test.lib.http2.Http2Handler;
 
 /*
  * @test
- * @bug 8150769 8157107
+ * @bug 8150769 8157107 8371887
  * @library /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer
  * @summary Checks that SSL parameters can be set for HTTP/2 connection
@@ -135,6 +135,12 @@ public class TLSConnection {
             success &= checkCipherSuite(handler.getSSLSession(),
                     "TLS_RSA_WITH_AES_128_CBC_SHA");
 
+            success &= expectSuccess(
+                    "---\nTest #5: empty SSL parameters, "
+                            + "expect successful connection",
+                    () -> connect(uriString, new SSLParameters()));
+            success &= checkProtocol(handler.getSSLSession(), expectedTLSVersion(null));
+
             if (success) {
                 System.out.println("Test passed");
             } else {
diff --git a/test/jdk/java/net/httpclient/http3/H3UnsupportedSSLParametersTest.java b/test/jdk/java/net/httpclient/http3/H3UnsupportedSSLParametersTest.java
index 090dec2c189..790af245db8 100644
--- a/test/jdk/java/net/httpclient/http3/H3UnsupportedSSLParametersTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3UnsupportedSSLParametersTest.java
@@ -34,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /*
  * @test
+ * @bug 8371887
  * @summary Tests that a HttpClient configured with SSLParameters that doesn't include TLSv1.3
  *          cannot be used for HTTP3
  * @library /test/lib /test/jdk/java/net/httpclient/lib
@@ -75,4 +76,18 @@ public class H3UnsupportedSSLParametersTest {
                 .version(HttpClient.Version.HTTP_3).build();
         assertNotNull(client, "HttpClient is null");
     }
+
+    /**
+     * Builds a HttpClient with SSLParameters without protocol versions
+     * and expects the build() to succeed and return a HttpClient instance
+     */
+    @Test
+    public void testDefault() throws Exception {
+        final SSLParameters params = new SSLParameters();
+        final HttpClient client = HttpServerAdapters.createClientBuilderForH3()
+                .proxy(HttpClient.Builder.NO_PROXY)
+                .sslParameters(params)
+                .version(HttpClient.Version.HTTP_3).build();
+        assertNotNull(client, "HttpClient is null");
+    }
 }

From 4ac33956343bbfa3619ccb029ceed6c5a402f775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Thu, 27 Nov 2025 09:38:59 +0000
Subject: [PATCH 377/512] 8372150: Parallel: Tighten requirements around heap
 sizes with NUMA and Large Pages

Reviewed-by: ayang, stefank, aboldtch, stuefe
---
 .../share/gc/parallel/parallelArguments.cpp   | 102 +++++++++++-------
 .../share/gc/parallel/parallelArguments.hpp   |  10 +-
 .../share/gc/serial/serialArguments.cpp       |  39 +++++++
 .../share/gc/serial/serialArguments.hpp       |   7 +-
 src/hotspot/share/gc/shared/gcArguments.cpp   |  18 ----
 src/hotspot/share/gc/shared/gcArguments.hpp   |   4 +-
 src/hotspot/share/gc/shared/genArguments.cpp  |  18 ----
 src/hotspot/share/gc/shared/genArguments.hpp  |   7 +-
 .../share/gc/shared/jvmFlagConstraintsGC.cpp  |   2 +-
 src/hotspot/share/runtime/arguments.cpp       |   5 +-
 .../gtest/gc/shared/test_collectorPolicy.cpp  |  11 --
 11 files changed, 118 insertions(+), 105 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelArguments.cpp b/src/hotspot/share/gc/parallel/parallelArguments.cpp
index 629690a6258..be9673224f5 100644
--- a/src/hotspot/share/gc/parallel/parallelArguments.cpp
+++ b/src/hotspot/share/gc/parallel/parallelArguments.cpp
@@ -37,8 +37,45 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/powerOfTwo.hpp"
 
-size_t ParallelArguments::conservative_max_heap_alignment() {
-  return compute_heap_alignment();
+static size_t num_young_spaces() {
+  // When using NUMA, we create one MutableNUMASpace for each NUMA node
+  const size_t num_eden_spaces = UseNUMA ? os::numa_get_groups_num() : 1;
+
+  // The young generation must have room for eden + two survivors
+  return num_eden_spaces + 2;
+}
+
+static size_t num_old_spaces() {
+  return 1;
+}
+
+void ParallelArguments::initialize_alignments() {
+  // Initialize card size before initializing alignments
+  CardTable::initialize_card_size();
+  const size_t card_table_alignment = CardTable::ct_max_alignment_constraint();
+  SpaceAlignment = ParallelScavengeHeap::default_space_alignment();
+
+  if (UseLargePages) {
+    const size_t total_spaces = num_young_spaces() + num_old_spaces();
+    const size_t page_size =  os::page_size_for_region_unaligned(MaxHeapSize, total_spaces);
+    ParallelScavengeHeap::set_desired_page_size(page_size);
+
+    if (page_size == os::vm_page_size()) {
+      log_warning(gc, heap)("MaxHeapSize (%zu) must be large enough for %zu * page-size; Disabling UseLargePages for heap",
+                            MaxHeapSize, total_spaces);
+    }
+
+    if (page_size > SpaceAlignment) {
+      SpaceAlignment = page_size;
+    }
+
+    HeapAlignment = lcm(page_size, card_table_alignment);
+
+  } else {
+    assert(is_aligned(SpaceAlignment, os::vm_page_size()), "");
+    ParallelScavengeHeap::set_desired_page_size(os::vm_page_size());
+    HeapAlignment = card_table_alignment;
+  }
 }
 
 void ParallelArguments::initialize() {
@@ -98,49 +135,36 @@ void ParallelArguments::initialize() {
   FullGCForwarding::initialize_flags(heap_reserved_size_bytes());
 }
 
-void ParallelArguments::initialize_alignments() {
-  // Initialize card size before initializing alignments
-  CardTable::initialize_card_size();
-  SpaceAlignment = ParallelScavengeHeap::default_space_alignment();
-  HeapAlignment = compute_heap_alignment();
-}
+size_t ParallelArguments::conservative_max_heap_alignment() {
+  // The card marking array and the offset arrays for old generations are
+  // committed in os pages as well. Make sure they are entirely full (to
+  // avoid partial page problems), e.g. if 512 bytes heap corresponds to 1
+  // byte entry and the os page size is 4096, the maximum heap size should
+  // be 512*4096 = 2MB aligned.
 
-void ParallelArguments::initialize_heap_flags_and_sizes_one_pass() {
-  // Do basic sizing work
-  GenArguments::initialize_heap_flags_and_sizes();
-}
+  size_t alignment = CardTable::ct_max_alignment_constraint();
 
-void ParallelArguments::initialize_heap_flags_and_sizes() {
-  initialize_heap_flags_and_sizes_one_pass();
-
-  if (!UseLargePages) {
-    ParallelScavengeHeap::set_desired_page_size(os::vm_page_size());
-    return;
+  if (UseLargePages) {
+      // In presence of large pages we have to make sure that our
+      // alignment is large page aware.
+      alignment = lcm(os::large_page_size(), alignment);
   }
 
-  // If using large-page, need to update SpaceAlignment so that spaces are page-size aligned.
-  const size_t min_pages = 4; // 1 for eden + 1 for each survivor + 1 for old
-  const size_t page_sz = os::page_size_for_region_aligned(MinHeapSize, min_pages);
-  ParallelScavengeHeap::set_desired_page_size(page_sz);
-
-  if (page_sz == os::vm_page_size()) {
-    log_warning(gc, heap)("MinHeapSize (%zu) must be large enough for 4 * page-size; Disabling UseLargePages for heap", MinHeapSize);
-    return;
-  }
-
-  // Space is largepage-aligned.
-  size_t new_alignment = page_sz;
-  if (new_alignment != SpaceAlignment) {
-    SpaceAlignment = new_alignment;
-    // Redo everything from the start
-    initialize_heap_flags_and_sizes_one_pass();
-  }
-}
-
-size_t ParallelArguments::heap_reserved_size_bytes() {
-  return MaxHeapSize;
+  return alignment;
 }
 
 CollectedHeap* ParallelArguments::create_heap() {
   return new ParallelScavengeHeap();
 }
+
+size_t ParallelArguments::young_gen_size_lower_bound() {
+  return num_young_spaces() * SpaceAlignment;
+}
+
+size_t ParallelArguments::old_gen_size_lower_bound() {
+  return num_old_spaces() * SpaceAlignment;
+}
+
+size_t ParallelArguments::heap_reserved_size_bytes() {
+  return MaxHeapSize;
+}
diff --git a/src/hotspot/share/gc/parallel/parallelArguments.hpp b/src/hotspot/share/gc/parallel/parallelArguments.hpp
index 159441be792..729fe43b879 100644
--- a/src/hotspot/share/gc/parallel/parallelArguments.hpp
+++ b/src/hotspot/share/gc/parallel/parallelArguments.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +26,16 @@
 #ifndef SHARE_GC_PARALLEL_PARALLELARGUMENTS_HPP
 #define SHARE_GC_PARALLEL_PARALLELARGUMENTS_HPP
 
-#include "gc/shared/gcArguments.hpp"
 #include "gc/shared/genArguments.hpp"
 
-class CollectedHeap;
-
 class ParallelArguments : public GenArguments {
 private:
   virtual void initialize_alignments();
-  virtual void initialize_heap_flags_and_sizes();
-
-  void initialize_heap_flags_and_sizes_one_pass();
-
   virtual void initialize();
   virtual size_t conservative_max_heap_alignment();
   virtual CollectedHeap* create_heap();
+  virtual size_t young_gen_size_lower_bound();
+  virtual size_t old_gen_size_lower_bound();
 
 public:
   static size_t heap_reserved_size_bytes();
diff --git a/src/hotspot/share/gc/serial/serialArguments.cpp b/src/hotspot/share/gc/serial/serialArguments.cpp
index aed1c2353b4..efebec4fa38 100644
--- a/src/hotspot/share/gc/serial/serialArguments.cpp
+++ b/src/hotspot/share/gc/serial/serialArguments.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +28,49 @@
 #include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcArguments.hpp"
 
+static size_t compute_heap_alignment() {
+  // The card marking array and the offset arrays for old generations are
+  // committed in os pages as well. Make sure they are entirely full (to
+  // avoid partial page problems), e.g. if 512 bytes heap corresponds to 1
+  // byte entry and the os page size is 4096, the maximum heap size should
+  // be 512*4096 = 2MB aligned.
+
+  size_t alignment = CardTable::ct_max_alignment_constraint();
+
+  if (UseLargePages) {
+      // In presence of large pages we have to make sure that our
+      // alignment is large page aware.
+      alignment = lcm(os::large_page_size(), alignment);
+  }
+
+  return alignment;
+}
+
+void SerialArguments::initialize_alignments() {
+  // Initialize card size before initializing alignments
+  CardTable::initialize_card_size();
+  SpaceAlignment = (size_t)Generation::GenGrain;
+  HeapAlignment = compute_heap_alignment();
+}
+
 void SerialArguments::initialize() {
   GCArguments::initialize();
   FullGCForwarding::initialize_flags(MaxHeapSize);
 }
 
+size_t SerialArguments::conservative_max_heap_alignment() {
+  return MAX2((size_t)Generation::GenGrain, compute_heap_alignment());
+}
+
 CollectedHeap* SerialArguments::create_heap() {
   return new SerialHeap();
 }
+
+size_t SerialArguments::young_gen_size_lower_bound() {
+  // The young generation must be aligned and have room for eden + two survivors
+  return 3 * SpaceAlignment;
+}
+
+size_t SerialArguments::old_gen_size_lower_bound() {
+  return SpaceAlignment;
+}
diff --git a/src/hotspot/share/gc/serial/serialArguments.hpp b/src/hotspot/share/gc/serial/serialArguments.hpp
index 90c3225ff8d..774168eb626 100644
--- a/src/hotspot/share/gc/serial/serialArguments.hpp
+++ b/src/hotspot/share/gc/serial/serialArguments.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +28,14 @@
 
 #include "gc/shared/genArguments.hpp"
 
-class CollectedHeap;
-
 class SerialArguments : public GenArguments {
 private:
+  virtual void initialize_alignments();
   virtual void initialize();
+  virtual size_t conservative_max_heap_alignment();
   virtual CollectedHeap* create_heap();
+  virtual size_t young_gen_size_lower_bound();
+  virtual size_t old_gen_size_lower_bound();
 };
 
 #endif // SHARE_GC_SERIAL_SERIALARGUMENTS_HPP
diff --git a/src/hotspot/share/gc/shared/gcArguments.cpp b/src/hotspot/share/gc/shared/gcArguments.cpp
index d45e6a9c7dd..424427c12b6 100644
--- a/src/hotspot/share/gc/shared/gcArguments.cpp
+++ b/src/hotspot/share/gc/shared/gcArguments.cpp
@@ -62,24 +62,6 @@ void GCArguments::initialize_heap_sizes() {
   initialize_size_info();
 }
 
-size_t GCArguments::compute_heap_alignment() {
-  // The card marking array and the offset arrays for old generations are
-  // committed in os pages as well. Make sure they are entirely full (to
-  // avoid partial page problems), e.g. if 512 bytes heap corresponds to 1
-  // byte entry and the os page size is 4096, the maximum heap size should
-  // be 512*4096 = 2MB aligned.
-
-  size_t alignment = CardTable::ct_max_alignment_constraint();
-
-  if (UseLargePages) {
-      // In presence of large pages we have to make sure that our
-      // alignment is large page aware.
-      alignment = lcm(os::large_page_size(), alignment);
-  }
-
-  return alignment;
-}
-
 #ifdef ASSERT
 void GCArguments::assert_flags() {
   assert(InitialHeapSize <= MaxHeapSize, "Ergonomics decided on incompatible initial and maximum heap sizes");
diff --git a/src/hotspot/share/gc/shared/gcArguments.hpp b/src/hotspot/share/gc/shared/gcArguments.hpp
index fff41e85d8c..d8a4901f887 100644
--- a/src/hotspot/share/gc/shared/gcArguments.hpp
+++ b/src/hotspot/share/gc/shared/gcArguments.hpp
@@ -45,6 +45,8 @@ protected:
 
 public:
   virtual void initialize();
+
+  // Return the (conservative) maximum heap alignment
   virtual size_t conservative_max_heap_alignment() = 0;
 
   // Used by heap size heuristics to determine max
@@ -59,8 +61,6 @@ public:
   }
 
   void initialize_heap_sizes();
-
-  static size_t compute_heap_alignment();
 };
 
 #endif // SHARE_GC_SHARED_GCARGUMENTS_HPP
diff --git a/src/hotspot/share/gc/shared/genArguments.cpp b/src/hotspot/share/gc/shared/genArguments.cpp
index 9618c515b7d..5d5003f8d9f 100644
--- a/src/hotspot/share/gc/shared/genArguments.cpp
+++ b/src/hotspot/share/gc/shared/genArguments.cpp
@@ -42,17 +42,6 @@ size_t MaxOldSize = 0;
 // See more in JDK-8346005
 size_t OldSize = ScaleForWordSize(4*M);
 
-size_t GenArguments::conservative_max_heap_alignment() { return (size_t)Generation::GenGrain; }
-
-static size_t young_gen_size_lower_bound() {
-  // The young generation must be aligned and have room for eden + two survivors
-  return 3 * SpaceAlignment;
-}
-
-static size_t old_gen_size_lower_bound() {
-  return SpaceAlignment;
-}
-
 size_t GenArguments::scale_by_NewRatio_aligned(size_t base_size, size_t alignment) {
   return align_down_bounded(base_size / (NewRatio + 1), alignment);
 }
@@ -64,13 +53,6 @@ static size_t bound_minus_alignment(size_t desired_size,
   return MIN2(desired_size, max_minus);
 }
 
-void GenArguments::initialize_alignments() {
-  // Initialize card size before initializing alignments
-  CardTable::initialize_card_size();
-  SpaceAlignment = (size_t)Generation::GenGrain;
-  HeapAlignment = compute_heap_alignment();
-}
-
 void GenArguments::initialize_heap_flags_and_sizes() {
   GCArguments::initialize_heap_flags_and_sizes();
 
diff --git a/src/hotspot/share/gc/shared/genArguments.hpp b/src/hotspot/share/gc/shared/genArguments.hpp
index 80133bd1ec1..0ff9568575d 100644
--- a/src/hotspot/share/gc/shared/genArguments.hpp
+++ b/src/hotspot/share/gc/shared/genArguments.hpp
@@ -38,17 +38,16 @@ extern size_t OldSize;
 class GenArguments : public GCArguments {
   friend class TestGenCollectorPolicy; // Testing
 private:
-  virtual void initialize_alignments();
   virtual void initialize_size_info();
 
-  // Return the (conservative) maximum heap alignment
-  virtual size_t conservative_max_heap_alignment();
-
   DEBUG_ONLY(void assert_flags();)
   DEBUG_ONLY(void assert_size_info();)
 
   static size_t scale_by_NewRatio_aligned(size_t base_size, size_t alignment);
 
+  virtual size_t young_gen_size_lower_bound() = 0;
+  virtual size_t old_gen_size_lower_bound() = 0;
+
 protected:
   virtual void initialize_heap_flags_and_sizes();
 };
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
index 1ed3701fdab..cc446adba66 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
@@ -250,7 +250,7 @@ static JVMFlag::Error MaxSizeForHeapAlignment(const char* name, size_t value, bo
   } else
 #endif
   {
-    heap_alignment = GCArguments::compute_heap_alignment();
+    heap_alignment = Arguments::conservative_max_heap_alignment();
   }
 
   return MaxSizeForAlignment(name, value, heap_alignment, verbose);
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index ff1de899bdd..01fee949e33 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1478,10 +1478,9 @@ void Arguments::set_conservative_max_heap_alignment() {
   // the alignments imposed by several sources: any requirements from the heap
   // itself and the maximum page size we may run the VM with.
   size_t heap_alignment = GCConfig::arguments()->conservative_max_heap_alignment();
-  _conservative_max_heap_alignment = MAX4(heap_alignment,
+  _conservative_max_heap_alignment = MAX3(heap_alignment,
                                           os::vm_allocation_granularity(),
-                                          os::max_page_size(),
-                                          GCArguments::compute_heap_alignment());
+                                          os::max_page_size());
   assert(is_power_of_2(_conservative_max_heap_alignment), "Expected to be a power-of-2");
 }
 
diff --git a/test/hotspot/gtest/gc/shared/test_collectorPolicy.cpp b/test/hotspot/gtest/gc/shared/test_collectorPolicy.cpp
index b5e9c6de6a0..55c03f188cc 100644
--- a/test/hotspot/gtest/gc/shared/test_collectorPolicy.cpp
+++ b/test/hotspot/gtest/gc/shared/test_collectorPolicy.cpp
@@ -140,17 +140,6 @@ class TestGenCollectorPolicy {
       ASSERT_EQ(param, NewSize);
     }
   };
-
-  class SetMaxNewSizeCmd : public BinaryExecutor {
-   public:
-    SetMaxNewSizeCmd(size_t param1, size_t param2) : BinaryExecutor(param1, param2) { }
-    void execute() {
-      size_t heap_alignment = GCArguments::compute_heap_alignment();
-      size_t new_size_value = align_up(MaxHeapSize, heap_alignment)
-              - param1 + param2;
-      FLAG_SET_CMDLINE(MaxNewSize, new_size_value);
-    }
-  };
 };
 
 

From d350158e060c01acf49759dcbdd1f4d72530111b Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Thu, 27 Nov 2025 09:42:46 +0000
Subject: [PATCH 378/512] 8371740: LinkedTransferQueue.poll() returns null even
 though queue is not empty

Co-authored-by: Doug Lea <dl@openjdk.org>
Co-authored-by: Dr Heinz M. Kabutz <heinz@javaspecialists.eu>
Reviewed-by: alanb
---
 .../util/concurrent/LinkedTransferQueue.java  | 16 ++--
 .../concurrent/BlockingQueue/MissedPoll.java  | 78 +++++++++++++++++++
 2 files changed, 87 insertions(+), 7 deletions(-)
 create mode 100644 test/jdk/java/util/concurrent/BlockingQueue/MissedPoll.java

diff --git a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
index 118d648c7a2..787d8d5fecd 100644
--- a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
@@ -588,13 +588,15 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
             do {
                 m = p.item;
                 q = p.next;
-                if (p.isData != haveData && haveData != (m != null) &&
-                    p.cmpExItem(m, e) == m) {
-                    Thread w = p.waiter;    // matched complementary node
-                    if (p != h && h == cmpExHead(h, (q == null) ? p : q))
-                        h.next = h;         // advance head; self-link old
-                    LockSupport.unpark(w);
-                    return m;
+                if (p.isData != haveData && haveData != (m != null)) {
+                    if (p.cmpExItem(m, e) == m) {
+                        Thread w = p.waiter; // matched complementary node
+                        if (p != h && h == cmpExHead(h, (q == null) ? p : q))
+                            h.next = h;     // advance head; self-link old
+                        LockSupport.unpark(w);
+                        return m;
+                    }
+                    continue restart;
                 } else if (q == null) {
                     if (ns == 0L)           // try to append unless immediate
                         break restart;
diff --git a/test/jdk/java/util/concurrent/BlockingQueue/MissedPoll.java b/test/jdk/java/util/concurrent/BlockingQueue/MissedPoll.java
new file mode 100644
index 00000000000..9eb39634ce6
--- /dev/null
+++ b/test/jdk/java/util/concurrent/BlockingQueue/MissedPoll.java
@@ -0,0 +1,78 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371740
+ * @summary Checks for poll() (or peek) returning null when an element must exist.
+ */
+import java.util.*;
+import java.util.concurrent.*;
+
+public class MissedPoll {
+    public static void main(String... args) throws Throwable {
+        test(new LinkedTransferQueue<>());
+        test(new LinkedBlockingQueue<>());
+        test(new LinkedBlockingDeque<>());
+        test(new ArrayBlockingQueue<>(10));
+    }
+
+    private static void test(BlockingQueue<Integer> q)
+        throws ExecutionException, InterruptedException {
+        System.out.println(q.getClass());
+        try (var pool = Executors.newCachedThreadPool()) {
+            var futures = new ArrayList<Future<Integer>>();
+            var phaser = new Phaser(4) {
+                @Override
+                protected boolean onAdvance(int phase, int registeredParties) {
+                    q.clear();
+                    return super.onAdvance(phase, registeredParties);
+                }
+            };
+            for (var i = 0; i < 4; i++) {
+                futures.add(pool.submit(() -> {
+                    int errors = 0;
+                    for (int k = 0; k < 10; k++) {
+                        for (int j = 0; j < 1000; j++) {
+                            q.offer(j);
+                            if (q.peek() == null)
+                                ++errors;
+                            if (q.poll() == null)
+                                ++errors;
+                        }
+                        phaser.arriveAndAwaitAdvance();
+                    }
+                    return errors;
+                }));
+            }
+            for (var future : futures) {
+                Integer res;
+                if ((res = future.get()) != 0)
+                    throw new AssertionError("Expected 0 but got " + res);
+            }
+        }
+        if (!q.isEmpty())
+            throw new AssertionError("Queue is not empty: " + q);
+    }
+}

From 150def42dd7f22d949b4d788bfe5986f236b9b37 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 27 Nov 2025 12:42:42 +0000
Subject: [PATCH 379/512] 8369911: Test
 sun/java2d/marlin/ClipShapeTest.java#CubicDoDash, #Cubic and #Poly fail
 intermittent

Reviewed-by: mdoerr, rriggs, serb
---
 test/jdk/sun/java2d/marlin/ClipShapeTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/jdk/sun/java2d/marlin/ClipShapeTest.java b/test/jdk/sun/java2d/marlin/ClipShapeTest.java
index 3bdbd416e63..e77fca6924d 100644
--- a/test/jdk/sun/java2d/marlin/ClipShapeTest.java
+++ b/test/jdk/sun/java2d/marlin/ClipShapeTest.java
@@ -154,13 +154,12 @@ public final class ClipShapeTest {
     static final AtomicBoolean isMarlin = new AtomicBoolean();
     static final AtomicBoolean isClipRuntime = new AtomicBoolean();
 
+    static final Logger log = Logger.getLogger("sun.java2d.marlin");
+
     static {
         Locale.setDefault(Locale.US);
 
         // FIRST: Get Marlin runtime state from its log:
-
-        // initialize j.u.l Looger:
-        final Logger log = Logger.getLogger("sun.java2d.marlin");
         log.addHandler(new Handler() {
             @Override
             public void publish(LogRecord record) {

From 5f5bf1971ca622b053c4eae146298090d6944473 Mon Sep 17 00:00:00 2001
From: Ramkumar Sunderbabu <rsunderbabu@openjdk.org>
Date: Thu, 27 Nov 2025 13:00:36 +0000
Subject: [PATCH 380/512] 8319540: GC: Make TestSelectDefaultGC use
 createTestJavaProcessBuilder

Reviewed-by: lkorinth, stefank
---
 test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java b/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java
index af3f77a8a76..a5e144bcd15 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ public class TestSelectDefaultGC {
 
     public static void testDefaultGC(boolean actAsServer) throws Exception {
         // Start VM without specifying GC
-        OutputAnalyzer output = GCArguments.executeLimitedTestJava(
+        OutputAnalyzer output = GCArguments.executeTestJava(
             "-XX:" + (actAsServer ? "+" : "-") + "AlwaysActAsServerClassMachine",
             "-XX:" + (actAsServer ? "-" : "+") + "NeverActAsServerClassMachine",
             "-XX:+PrintFlagsFinal",

From 561c544d85ecdbfa7895e434e98aed8df250a305 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Thu, 27 Nov 2025 13:22:40 +0000
Subject: [PATCH 381/512] 8367096: jdk/open/test/jdk/sun/security/pkcs11/ rsa,
 ec, config, secmod and sslecc tests are skipping but showing as pass

Reviewed-by: rhalade
---
 .../pkcs11/Config/ReadConfInUTF16Env.java     |  6 +++---
 test/jdk/sun/security/pkcs11/PKCS11Test.java  |  2 +-
 .../security/pkcs11/Secmod/AddPrivateKey.java |  6 ++----
 .../pkcs11/Secmod/AddTrustedCert.java         |  5 +----
 .../sun/security/pkcs11/Secmod/Crypto.java    |  7 ++-----
 .../security/pkcs11/Secmod/GetPrivateKey.java |  7 ++-----
 .../pkcs11/Secmod/JksSetPrivateKey.java       |  7 ++-----
 .../security/pkcs11/Secmod/LoadKeystore.java  |  7 ++-----
 .../pkcs11/Secmod/TestNssDbSqlite.java        | 20 +++++--------------
 .../security/pkcs11/Secmod/TrustAnchors.java  |  7 ++-----
 test/jdk/sun/security/pkcs11/SecmodTest.java  |  5 ++---
 .../security/pkcs11/ec/ReadCertificates.java  |  4 ++--
 .../sun/security/pkcs11/ec/ReadPKCS12.java    |  4 ++--
 .../security/pkcs11/ec/TestKeyFactory.java    |  7 ++++---
 test/jdk/sun/security/pkcs11/rsa/KeyWrap.java | 10 +++++-----
 .../pkcs11/sslecc/ClientJSSEServerJSSE.java   |  4 ++--
 16 files changed, 39 insertions(+), 69 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java b/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java
index eacc0337cb6..23f5fc3d6a1 100644
--- a/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java
+++ b/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  */
 
 import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
 import org.testng.annotations.Test;
 
 import java.security.Provider;
@@ -47,8 +48,7 @@ public class ReadConfInUTF16Env {
         public static void main(String[] args) throws Exception {
             Provider p = Security.getProvider("SunPKCS11");
             if (p == null) {
-                System.out.println("Skipping test - no PKCS11 provider available");
-                return;
+                throw new SkippedException("No PKCS11 provider available");
             }
             System.out.println(p.getName());
         }
diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index 0e8d2d61d53..3b09f845f8e 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -828,7 +828,7 @@ public abstract class PKCS11Test {
 
     private void premain(Provider p) throws Exception {
         if (skipTest(p)) {
-            return;
+            throw new SkippedException("See logs for details");
         }
 
         long start = System.currentTimeMillis();
diff --git a/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java
index 29950d762e0..34a813ab858 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/AddPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,9 +62,7 @@ public class AddPrivateKey extends SecmodTest {
     private static final byte[] DATA = generateData(DATA_LENGTH);
 
     public static void main(String[] args) throws Exception {
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
 
         String configName = BASE + SEP + "nss.cfg";
         Provider p = getSunPKCS11(configName);
diff --git a/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java b/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java
index 7b4a5075da8..aaa38fe1c71 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java
@@ -31,7 +31,6 @@
  * @run main/othervm AddTrustedCert
  */
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.security.KeyStore;
@@ -47,9 +46,7 @@ import java.util.TreeSet;
 public class AddTrustedCert extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
 
         X509Certificate cert;
         try (InputStream in = new FileInputStream(BASE + SEP + "anchor.cer")) {
diff --git a/test/jdk/sun/security/pkcs11/Secmod/Crypto.java b/test/jdk/sun/security/pkcs11/Secmod/Crypto.java
index 1b4c0883e80..e9e9bd73321 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/Crypto.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/Crypto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @run main/othervm Crypto
  */
 
-import java.io.File;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.Provider;
@@ -40,9 +39,7 @@ import java.security.Signature;
 public class Crypto extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
 
         String configName = BASE + SEP + "nsscrypto.cfg";
         Provider p = getSunPKCS11(configName);
diff --git a/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java
index e89cafb920c..8d613ee63d2 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/GetPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
  * @run main/othervm GetPrivateKey
  */
 
-import java.io.File;
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.Provider;
@@ -46,9 +45,7 @@ import java.util.TreeSet;
 public class GetPrivateKey extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
 
         String configName = BASE + SEP + "nss.cfg";
         Provider p = getSunPKCS11(configName);
diff --git a/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java b/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java
index d6c084c882d..8549a338a58 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/JksSetPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @run main/othervm JksSetPrivateKey
  */
 
-import java.io.File;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.PrivateKey;
@@ -45,9 +44,7 @@ import java.util.TreeSet;
 public class JksSetPrivateKey extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
 
         String configName = BASE + SEP + "nss.cfg";
         Provider p = getSunPKCS11(configName);
diff --git a/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java b/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java
index 55c473ce90e..d657d805ca0 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/LoadKeystore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
  * @run main/othervm LoadKeystore
  */
 
-import java.io.File;
 import java.io.IOException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -42,9 +41,7 @@ import java.util.Collections;
 public class LoadKeystore extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (!initSecmod()) {
-            return;
-        }
+        initSecmod();
 
         String configName = BASE + SEP + "nss.cfg";
         Provider p = getSunPKCS11(configName);
diff --git a/test/jdk/sun/security/pkcs11/Secmod/TestNssDbSqlite.java b/test/jdk/sun/security/pkcs11/Secmod/TestNssDbSqlite.java
index 7b22a4abfc6..57309749e93 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/TestNssDbSqlite.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/TestNssDbSqlite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2017, 2025, Red Hat, Inc. and/or its affiliates.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -46,6 +46,7 @@ import java.security.KeyStore;
 import java.security.Provider;
 import java.security.Signature;
 
+import jtreg.SkippedException;
 import sun.security.rsa.SunRsaSign;
 import sun.security.jca.ProviderList;
 import sun.security.jca.Providers;
@@ -66,9 +67,7 @@ public final class TestNssDbSqlite extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
 
-        if (!initialize()) {
-            return;
-        }
+        initializeProvider();
 
         if (enableDebug) {
             System.out.println("SunPKCS11 provider: " +
@@ -110,16 +109,9 @@ public final class TestNssDbSqlite extends SecmodTest {
         }
     }
 
-    private static boolean initialize() throws Exception {
-        return initializeProvider();
-    }
-
-    private static boolean initializeProvider() throws Exception {
+    private static void initializeProvider() throws Exception {
         useSqlite(true);
-        if (!initSecmod()) {
-            System.out.println("Cannot init security module database, skipping");
-            return false;
-        }
+        initSecmod();
 
         sunPKCS11NSSProvider = getSunPKCS11(BASE + SEP + "nss-sqlite.cfg");
         sunJCEProvider = new com.sun.crypto.provider.SunJCE();
@@ -135,7 +127,5 @@ public final class TestNssDbSqlite extends SecmodTest {
         gen.generate(2048);
         privateKey = gen.getPrivateKey();
         certificate = gen.getSelfCertificate(new X500Name("CN=Me"), 365);
-
-        return true;
     }
 }
diff --git a/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java b/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java
index efe34478a9e..14977fde340 100644
--- a/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java
+++ b/test/jdk/sun/security/pkcs11/Secmod/TrustAnchors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @run main/othervm TrustAnchors
  */
 
-import java.io.File;
 import java.security.KeyStore;
 import java.security.Provider;
 import java.security.Security;
@@ -43,9 +42,7 @@ import java.util.TreeSet;
 public class TrustAnchors extends SecmodTest {
 
     public static void main(String[] args) throws Exception {
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
 
         // our secmod.db file says nssckbi.*so*, so NSS does not find the
         // *DLL* on Windows nor the *DYLIB* on Mac OSX.
diff --git a/test/jdk/sun/security/pkcs11/SecmodTest.java b/test/jdk/sun/security/pkcs11/SecmodTest.java
index 8201548bf9d..1979066e26a 100644
--- a/test/jdk/sun/security/pkcs11/SecmodTest.java
+++ b/test/jdk/sun/security/pkcs11/SecmodTest.java
@@ -42,7 +42,7 @@ public class SecmodTest extends PKCS11Test {
         useSqlite = b;
     }
 
-    static boolean initSecmod() throws Exception {
+    static void initSecmod() throws Exception {
         useNSS();
         LIBPATH = getNSSLibDir();
         // load all the libraries except libnss3 into memory
@@ -60,7 +60,7 @@ public class SecmodTest extends PKCS11Test {
             System.setProperty("pkcs11test.nss.db", DBDIR);
         }
         File dbdirFile = new File(DBDIR);
-        if (dbdirFile.exists() == false) {
+        if (!dbdirFile.exists()) {
             dbdirFile.mkdir();
         }
 
@@ -73,7 +73,6 @@ public class SecmodTest extends PKCS11Test {
             copyFile("key3.db", BASE, DBDIR);
             copyFile("cert8.db", BASE, DBDIR);
         }
-        return true;
     }
 
     private static void copyFile(String name, String srcDir, String dstDir) throws IOException {
diff --git a/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java b/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
index e2bfa3dc048..4ff17356eb6 100644
--- a/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
+++ b/test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
@@ -55,6 +55,7 @@ import java.util.List;
 import java.util.Map;
 import javax.security.auth.x500.X500Principal;
 import jdk.test.lib.security.Providers;
+import jtreg.SkippedException;
 
 public class ReadCertificates extends PKCS11Test {
 
@@ -78,8 +79,7 @@ public class ReadCertificates extends PKCS11Test {
     @Override
     public void main(Provider p) throws Exception {
         if (p.getService("Signature", "SHA1withECDSA") == null) {
-            System.out.println("Provider does not support ECDSA, skipping...");
-            return;
+            throw new SkippedException("Provider does not support ECDSA");
         }
 
         /*
diff --git a/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java b/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
index 15a5b14ec40..eea360b64fe 100644
--- a/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
+++ b/test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
@@ -54,6 +54,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import jdk.test.lib.security.Providers;
+import jtreg.SkippedException;
 
 public class ReadPKCS12 extends PKCS11Test {
 
@@ -66,8 +67,7 @@ public class ReadPKCS12 extends PKCS11Test {
     @Override
     public void main(Provider p) throws Exception {
         if (p.getService("Signature", "SHA1withECDSA") == null) {
-            System.out.println("Provider does not support ECDSA, skipping...");
-            return;
+            throw new SkippedException("Provider does not support ECDSA");
         }
 
         /*
diff --git a/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java b/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java
index d23c302f38f..94453dd649d 100644
--- a/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java
+++ b/test/jdk/sun/security/pkcs11/ec/TestKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
  * @run main/othervm TestKeyFactory
  */
 
+import jtreg.SkippedException;
+
 import java.security.Key;
 import java.security.KeyFactory;
 import java.security.KeyPair;
@@ -126,8 +128,7 @@ public class TestKeyFactory extends PKCS11Test {
     @Override
     public void main(Provider p) throws Exception {
         if (p.getService("KeyFactory", "EC") == null) {
-            System.out.println("Provider does not support EC, skipping");
-            return;
+            throw new SkippedException("Provider does not support EC, skipping");
         }
         int[] keyLengths = {256, 521};
         KeyFactory kf = KeyFactory.getInstance("EC", p);
diff --git a/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java b/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java
index 4fd4082f523..8d71b5e26ca 100644
--- a/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java
+++ b/test/jdk/sun/security/pkcs11/rsa/KeyWrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@
  * @run main/othervm KeyWrap
  */
 
+import jtreg.SkippedException;
+
 import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.Key;
@@ -54,8 +56,7 @@ public class KeyWrap extends PKCS11Test {
         try {
             Cipher.getInstance("RSA/ECB/PKCS1Padding", p);
         } catch (GeneralSecurityException e) {
-            System.out.println("Not supported by provider, skipping");
-            return;
+            throw new SkippedException("Not supported by provider, skipping");
         }
         KeyPair kp;
         try {
@@ -74,8 +75,7 @@ public class KeyWrap extends PKCS11Test {
                 kp = new KeyPair(pub, priv);
             } catch (NoSuchAlgorithmException | InvalidKeyException ee) {
                 ee.printStackTrace();
-                System.out.println("Provider does not support RSA, skipping");
-                return;
+                throw new SkippedException("Provider does not support RSA, skipping");
             }
         }
         System.out.println(kp);
diff --git a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
index c125464659b..2630d9e310b 100644
--- a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+++ b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
@@ -40,6 +40,7 @@
 import java.security.Provider;
 import java.security.Security;
 import jdk.test.lib.security.Providers;
+import jtreg.SkippedException;
 
 public class ClientJSSEServerJSSE extends PKCS11Test {
 
@@ -58,8 +59,7 @@ public class ClientJSSEServerJSSE extends PKCS11Test {
     @Override
     public void main(Provider p) throws Exception {
         if (p.getService("KeyFactory", "EC") == null) {
-            System.out.println("Provider does not support EC, skipping");
-            return;
+            throw new SkippedException("Provider does not support EC, skipping");
         }
         Providers.setAt(p, 1);
         CipherTest.main(new JSSEFactory(), cmdArgs);

From da8e41a368bd98a7a35f5706302ecb9475b58363 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Thu, 27 Nov 2025 13:23:14 +0000
Subject: [PATCH 382/512] 8365623: test/jdk/sun/security/pkcs11/tls/ tests
 skipped without skip exception

Reviewed-by: syan, rhalade
---
 test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java |  7 +++----
 .../security/pkcs11/tls/TestKeyMaterialChaCha20.java  | 11 +++++------
 .../jdk/sun/security/pkcs11/tls/TestMasterSecret.java |  7 ++++---
 test/jdk/sun/security/pkcs11/tls/TestPRF.java         |  7 ++++---
 test/jdk/sun/security/pkcs11/tls/TestPremaster.java   | 10 +++++-----
 .../jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java | 10 +++++-----
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
index 977ae5338bd..682c09bab41 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import java.io.BufferedReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.InvalidAlgorithmParameterException;
 import java.security.Provider;
 import java.security.ProviderException;
 import java.util.Arrays;
@@ -45,6 +44,7 @@ import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import jtreg.SkippedException;
 import sun.security.internal.spec.TlsKeyMaterialParameterSpec;
 import sun.security.internal.spec.TlsKeyMaterialSpec;
 
@@ -60,8 +60,7 @@ public class TestKeyMaterial extends PKCS11Test {
     @Override
     public void main(Provider provider) throws Exception {
         if (provider.getService("KeyGenerator", "SunTlsKeyMaterial") == null) {
-            System.out.println("Provider does not support algorithm, skipping");
-            return;
+            throw new SkippedException("Provider does not support algorithm, skipping");
         }
 
         try (BufferedReader reader = Files.newBufferedReader(
diff --git a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialChaCha20.java b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialChaCha20.java
index 51471fca65a..b784a3127c6 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialChaCha20.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialChaCha20.java
@@ -35,6 +35,8 @@ import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import java.security.Provider;
 import java.security.NoSuchAlgorithmException;
+
+import jtreg.SkippedException;
 import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
 import sun.security.internal.spec.TlsMasterSecretParameterSpec;
 import sun.security.internal.spec.TlsKeyMaterialParameterSpec;
@@ -52,20 +54,17 @@ public class TestKeyMaterialChaCha20 extends PKCS11Test {
         try {
             kg1 = KeyGenerator.getInstance("SunTlsRsaPremasterSecret", provider);
         } catch (Exception e) {
-            System.out.println("Skipping, SunTlsRsaPremasterSecret KeyGenerator not supported");
-            return;
+            throw new SkippedException("Skipping, SunTlsRsaPremasterSecret KeyGenerator not supported");
         }
         try {
             kg2 = KeyGenerator.getInstance("SunTls12MasterSecret", provider);
         } catch (Exception e) {
-            System.out.println("Skipping, SunTls12MasterSecret KeyGenerator not supported");
-            return;
+            throw new SkippedException("Skipping, SunTls12MasterSecret KeyGenerator not supported");
         }
         try {
             kg3 = KeyGenerator.getInstance("SunTls12KeyMaterial", provider);
         } catch (Exception e) {
-            System.out.println("Skipping, SunTls12KeyMaterial KeyGenerator not supported");
-            return;
+            throw new SkippedException("Skipping, SunTls12KeyMaterial KeyGenerator not supported");
         }
 
         kg1.init(new TlsRsaPremasterSecretParameterSpec(0x0303, 0x0303));
diff --git a/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java
index 52e2327cfc9..f969aece532 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestMasterSecret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,8 @@ import java.util.Arrays;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
+
+import jtreg.SkippedException;
 import sun.security.internal.interfaces.TlsMasterSecret;
 import sun.security.internal.spec.TlsMasterSecretParameterSpec;
 
@@ -56,8 +58,7 @@ public class TestMasterSecret extends PKCS11Test {
     @Override
     public void main(Provider provider) throws Exception {
         if (provider.getService("KeyGenerator", "SunTlsMasterSecret") == null) {
-            System.out.println("Not supported by provider, skipping");
-            return;
+            throw new SkippedException("Not supported by provider, skipping");
         }
 
         try (BufferedReader reader = Files.newBufferedReader(
diff --git a/test/jdk/sun/security/pkcs11/tls/TestPRF.java b/test/jdk/sun/security/pkcs11/tls/TestPRF.java
index ada1716c98b..662383095a9 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestPRF.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestPRF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@ import java.util.Arrays;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
+
+import jtreg.SkippedException;
 import sun.security.internal.spec.TlsPrfParameterSpec;
 
 public class TestPRF extends PKCS11Test {
@@ -53,8 +55,7 @@ public class TestPRF extends PKCS11Test {
     @Override
     public void main(Provider provider) throws Exception {
         if (provider.getService("KeyGenerator", "SunTlsPrf") == null) {
-            System.out.println("Provider does not support algorithm, skipping");
-            return;
+            throw new SkippedException("Provider does not support algorithm, skipping");
         }
 
         try (BufferedReader reader = Files.newBufferedReader(
diff --git a/test/jdk/sun/security/pkcs11/tls/TestPremaster.java b/test/jdk/sun/security/pkcs11/tls/TestPremaster.java
index 9ee1dddb8e5..d34330fa073 100644
--- a/test/jdk/sun/security/pkcs11/tls/TestPremaster.java
+++ b/test/jdk/sun/security/pkcs11/tls/TestPremaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@ import java.security.Provider;
 import java.security.InvalidAlgorithmParameterException;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
+
+import jtreg.SkippedException;
 import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
 
 public class TestPremaster extends PKCS11Test {
@@ -48,8 +50,7 @@ public class TestPremaster extends PKCS11Test {
     public void main(Provider provider) throws Exception {
         if (provider.getService(
                 "KeyGenerator", "SunTlsRsaPremasterSecret") == null) {
-            System.out.println("Not supported by provider, skipping");
-            return;
+            throw new SkippedException("Not supported by provider, skipping");
         }
         KeyGenerator kg;
         kg = KeyGenerator.getInstance("SunTlsRsaPremasterSecret", provider);
@@ -87,8 +88,7 @@ public class TestPremaster extends PKCS11Test {
         } catch (InvalidAlgorithmParameterException iape) {
             // S12 removed support for SSL v3.0
             if (clientVersion == 0x300 || serverVersion == 0x300) {
-                System.out.println("Skip testing SSLv3 due to no support");
-                return;
+                throw new SkippedException("Skip testing SSLv3 due to no support");
             }
             // unexpected, pass it up
             throw iape;
diff --git a/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java b/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
index c227e99d12b..d0b1407422a 100644
--- a/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
+++ b/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
@@ -71,6 +71,7 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManagerFactory;
 
 import jdk.test.lib.security.SecurityUtils;
+import jtreg.SkippedException;
 import sun.security.internal.spec.TlsMasterSecretParameterSpec;
 import sun.security.internal.spec.TlsPrfParameterSpec;
 import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
@@ -94,12 +95,11 @@ public final class FipsModeTLS extends SecmodTest {
         try {
             initialize();
         } catch (Exception e) {
-            System.out.println("Test skipped: failure during" +
-                    " initialization");
             if (enableDebug) {
                 System.out.println(e);
             }
-            return;
+            throw new SkippedException("Test skipped: failure during" +
+                                       " initialization");
         }
 
         if (shouldRun()) {
@@ -112,8 +112,8 @@ public final class FipsModeTLS extends SecmodTest {
 
             System.out.println("Test PASS - OK");
         } else {
-            System.out.println("Test skipped: TLS 1.2 mechanisms" +
-                    " not supported by current SunPKCS11 back-end");
+            throw new SkippedException("Test skipped: TLS 1.2 mechanisms" +
+                                       " not supported by current SunPKCS11 back-end");
         }
     }
 

From 6901c05c9d23cde41e2af510e7d610af66e40770 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Thu, 27 Nov 2025 14:17:13 +0000
Subject: [PATCH 383/512] 8371815: API docs for 2-arg StructuredTaskScope.open
 should say timeout may expire before or while waiting in join

Reviewed-by: vklang
---
 .../classes/java/util/concurrent/StructuredTaskScope.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
index 941d6bd55cb..01bf1158bf6 100644
--- a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
+++ b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
@@ -914,8 +914,8 @@ public sealed interface StructuredTaskScope<T, R>
      * forking subtasks will create an unnamed virtual thread for each subtask.
      *
      * <p> If a {@linkplain Configuration#withTimeout(Duration) timeout} is set then it
-     * starts when the scope is opened. If the timeout expires before the scope has
-     * {@linkplain #join() joined} then the scope is {@linkplain ##Cancellation cancelled}
+     * starts when the scope is opened. If the timeout expires before or while waiting in
+     * {@link #join()} then the scope is {@linkplain ##Cancellation cancelled}
      * and the {@code Joiner}'s {@link Joiner#onTimeout() onTimeout()} method is invoked
      * to optionally throw {@link TimeoutException TimeoutException}.
      *

From 683ef14bcec0e6c4825067229826ed4a53cd3d19 Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jnorlinder@openjdk.org>
Date: Thu, 27 Nov 2025 14:59:07 +0000
Subject: [PATCH 384/512] 8372625: [Linux] Remove unnecessary logic for
 supports_fast_thread_cpu_time

Reviewed-by: sjohanss, dholmes
---
 src/hotspot/os/linux/os_linux.cpp             | 72 +++++--------------
 src/hotspot/os/linux/os_linux.hpp             | 17 +----
 src/hotspot/share/runtime/cpuTimeCounters.cpp |  3 -
 3 files changed, 17 insertions(+), 75 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index efeeec6f484..a1d957eb77d 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -159,9 +159,7 @@ physical_memory_size_type os::Linux::_physical_memory = 0;
 address   os::Linux::_initial_thread_stack_bottom = nullptr;
 uintptr_t os::Linux::_initial_thread_stack_size   = 0;
 
-int (*os::Linux::_pthread_getcpuclockid)(pthread_t, clockid_t *) = nullptr;
 pthread_t os::Linux::_main_thread;
-bool os::Linux::_supports_fast_thread_cpu_time = false;
 const char * os::Linux::_libc_version = nullptr;
 const char * os::Linux::_libpthread_version = nullptr;
 
@@ -1475,29 +1473,6 @@ void os::Linux::capture_initial_stack(size_t max_size) {
 ////////////////////////////////////////////////////////////////////////////////
 // time support
 
-void os::Linux::fast_thread_clock_init() {
-  clockid_t clockid;
-  struct timespec tp;
-  int (*pthread_getcpuclockid_func)(pthread_t, clockid_t *) =
-      (int(*)(pthread_t, clockid_t *)) dlsym(RTLD_DEFAULT, "pthread_getcpuclockid");
-
-  // Switch to using fast clocks for thread cpu time if
-  // the clock_getres() returns 0 error code.
-  // Note, that some kernels may support the current thread
-  // clock (CLOCK_THREAD_CPUTIME_ID) but not the clocks
-  // returned by the pthread_getcpuclockid().
-  // If the fast POSIX clocks are supported then the clock_getres()
-  // must return at least tp.tv_sec == 0 which means a resolution
-  // better than 1 sec. This is extra check for reliability.
-
-  if (pthread_getcpuclockid_func &&
-      pthread_getcpuclockid_func(_main_thread, &clockid) == 0 &&
-      clock_getres(clockid, &tp) == 0 && tp.tv_sec == 0) {
-    _supports_fast_thread_cpu_time = true;
-    _pthread_getcpuclockid = pthread_getcpuclockid_func;
-  }
-}
-
 // thread_id is kernel thread id (similar to Solaris LWP id)
 intx os::current_thread_id() { return os::Linux::gettid(); }
 int os::current_process_id() {
@@ -4328,7 +4303,7 @@ OSReturn os::get_native_priority(const Thread* const thread,
 // For reference, please, see IEEE Std 1003.1-2004:
 //   http://www.unix.org/single_unix_specification
 
-jlong os::Linux::fast_thread_cpu_time(clockid_t clockid) {
+jlong os::Linux::total_thread_cpu_time(clockid_t clockid) {
   struct timespec tp;
   int status = clock_gettime(clockid, &tp);
   assert(status == 0, "clock_gettime error: %s", os::strerror(errno));
@@ -4556,8 +4531,6 @@ jint os::init_2(void) {
 
   os::Posix::init_2();
 
-  Linux::fast_thread_clock_init();
-
   if (PosixSignals::init() == JNI_ERR) {
     return JNI_ERR;
   }
@@ -4985,14 +4958,14 @@ int os::open(const char *path, int oflag, int mode) {
   return fd;
 }
 
-static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
+static jlong user_thread_cpu_time(Thread *thread);
 
-static jlong fast_cpu_time(Thread *thread) {
+static jlong total_thread_cpu_time(Thread *thread) {
     clockid_t clockid;
-    int rc = os::Linux::pthread_getcpuclockid(thread->osthread()->pthread_id(),
+    int rc = pthread_getcpuclockid(thread->osthread()->pthread_id(),
                                               &clockid);
     if (rc == 0) {
-      return os::Linux::fast_thread_cpu_time(clockid);
+      return os::Linux::total_thread_cpu_time(clockid);
     } else {
       // It's possible to encounter a terminated native thread that failed
       // to detach itself from the VM - which should result in ESRCH.
@@ -5009,41 +4982,31 @@ static jlong fast_cpu_time(Thread *thread) {
 // the fast estimate available on the platform.
 
 jlong os::current_thread_cpu_time() {
-  if (os::Linux::supports_fast_thread_cpu_time()) {
-    return os::Linux::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
-  } else {
-    // return user + sys since the cost is the same
-    return slow_thread_cpu_time(Thread::current(), true /* user + sys */);
-  }
+  return os::Linux::total_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
 }
 
 jlong os::thread_cpu_time(Thread* thread) {
-  // consistent with what current_thread_cpu_time() returns
-  if (os::Linux::supports_fast_thread_cpu_time()) {
-    return fast_cpu_time(thread);
-  } else {
-    return slow_thread_cpu_time(thread, true /* user + sys */);
-  }
+  return total_thread_cpu_time(thread);
 }
 
 jlong os::current_thread_cpu_time(bool user_sys_cpu_time) {
-  if (user_sys_cpu_time && os::Linux::supports_fast_thread_cpu_time()) {
-    return os::Linux::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
+  if (user_sys_cpu_time) {
+    return os::Linux::total_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
   } else {
-    return slow_thread_cpu_time(Thread::current(), user_sys_cpu_time);
+    return user_thread_cpu_time(Thread::current());
   }
 }
 
 jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
-  if (user_sys_cpu_time && os::Linux::supports_fast_thread_cpu_time()) {
-    return fast_cpu_time(thread);
+  if (user_sys_cpu_time) {
+    return total_thread_cpu_time(thread);
   } else {
-    return slow_thread_cpu_time(thread, user_sys_cpu_time);
+    return user_thread_cpu_time(thread);
   }
 }
 
 //  -1 on error.
-static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
+static jlong user_thread_cpu_time(Thread *thread) {
   pid_t  tid = thread->osthread()->thread_id();
   char *s;
   char stat[2048];
@@ -5080,11 +5043,8 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
                  &ldummy, &ldummy, &ldummy, &ldummy, &ldummy,
                  &user_time, &sys_time);
   if (count != 13) return -1;
-  if (user_sys_cpu_time) {
-    return ((jlong)sys_time + (jlong)user_time) * (1000000000 / os::Posix::clock_tics_per_second());
-  } else {
-    return (jlong)user_time * (1000000000 / os::Posix::clock_tics_per_second());
-  }
+
+  return (jlong)user_time * (1000000000 / os::Posix::clock_tics_per_second());
 }
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index 9c0b6723b38..dd07cb600b9 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -32,16 +32,12 @@
 class os::Linux {
   friend class os;
 
-  static int (*_pthread_getcpuclockid)(pthread_t, clockid_t *);
-
   static address   _initial_thread_stack_bottom;
   static uintptr_t _initial_thread_stack_size;
 
   static const char *_libc_version;
   static const char *_libpthread_version;
 
-  static bool _supports_fast_thread_cpu_time;
-
   static GrowableArray<int>* _cpu_to_node;
   static GrowableArray<int>* _nindex_to_node;
 
@@ -146,18 +142,7 @@ class os::Linux {
   static bool manually_expand_stack(JavaThread * t, address addr);
   static void expand_stack_to(address bottom);
 
-  // fast POSIX clocks support
-  static void fast_thread_clock_init(void);
-
-  static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) {
-    return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1;
-  }
-
-  static bool supports_fast_thread_cpu_time() {
-    return _supports_fast_thread_cpu_time;
-  }
-
-  static jlong fast_thread_cpu_time(clockid_t clockid);
+  static jlong total_thread_cpu_time(clockid_t clockid);
 
   static jlong sendfile(int out_fd, int in_fd, jlong* offset, jlong count);
 
diff --git a/src/hotspot/share/runtime/cpuTimeCounters.cpp b/src/hotspot/share/runtime/cpuTimeCounters.cpp
index e5364550b6c..e174407089c 100644
--- a/src/hotspot/share/runtime/cpuTimeCounters.cpp
+++ b/src/hotspot/share/runtime/cpuTimeCounters.cpp
@@ -118,8 +118,5 @@ ThreadTotalCPUTimeClosure::~ThreadTotalCPUTimeClosure() {
 }
 
 void ThreadTotalCPUTimeClosure::do_thread(Thread* thread) {
-  // The default code path (fast_thread_cpu_time()) asserts that
-  // pthread_getcpuclockid() and clock_gettime() must return 0. Thus caller
-  // must ensure the thread exists and has not terminated.
   _total += os::thread_cpu_time(thread);
 }

From b2f97131d643ad7ebde137617999f1689a204975 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Thu, 27 Nov 2025 15:43:53 +0000
Subject: [PATCH 385/512] 8317838:
 java/nio/channels/Channels/SocketChannelStreams.java running into timeout
 (aix)

Reviewed-by: alanb, mdoerr
---
 test/jdk/ProblemList.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 9452b3a1b9f..9904bd88626 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -586,7 +586,6 @@ java/net/MulticastSocket/Test.java                              7145658,8308807
 
 # jdk_nio
 
-java/nio/channels/Channels/SocketChannelStreams.java            8317838 aix-ppc64
 java/nio/channels/AsyncCloseAndInterrupt.java                   8368290 macosx-26.0.1
 
 java/nio/channels/DatagramChannel/AdaptorMulticasting.java      8308807,8144003 aix-ppc64,macosx-all

From 8a0672c819e09a16c30fbdf58dc2b81f50958da4 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Thu, 27 Nov 2025 17:56:04 +0000
Subject: [PATCH 386/512] 8372198: Avoid closing PlainHttpConnection while
 holding a lock

Reviewed-by: djelinski, jpai, vyazici
---
 .../jdk/internal/net/http/ConnectionPool.java |  36 +-
 .../jdk/internal/net/http/HttpClientImpl.java |   8 +
 .../net/http/PlainHttpConnection.java         |  20 +-
 .../httpclient/PlainConnectionLockTest.java   | 383 ++++++++++++++++++
 4 files changed, 422 insertions(+), 25 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/PlainConnectionLockTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java b/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
index 1d8cb013295..e1725aa92d5 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
@@ -205,32 +205,38 @@ final class ConnectionPool {
 
         // it's possible that cleanup may have been called.
         HttpConnection toClose = null;
+        boolean stopping = false;
         stateLock.lock();
         try {
             if (cleanup.isDone()) {
                 return;
-            } else if (stopped) {
-                conn.close();
-                return;
-            }
-            if (MAX_POOL_SIZE > 0 && expiryList.size() >= MAX_POOL_SIZE) {
-                toClose = expiryList.removeOldest();
-                if (toClose != null) removeFromPool(toClose);
-            }
-            if (conn instanceof PlainHttpConnection) {
-                putConnection(conn, plainPool);
+            } else if (stopping = stopped) {
+                toClose = conn;
             } else {
-                assert conn.isSecure();
-                putConnection(conn, sslPool);
+                if (MAX_POOL_SIZE > 0 && expiryList.size() >= MAX_POOL_SIZE) {
+                    toClose = expiryList.removeOldest();
+                    if (toClose != null) removeFromPool(toClose);
+                }
+                if (conn instanceof PlainHttpConnection) {
+                    putConnection(conn, plainPool);
+                } else {
+                    assert conn.isSecure();
+                    putConnection(conn, sslPool);
+                }
+                expiryList.add(conn, now, keepAlive);
             }
-            expiryList.add(conn, now, keepAlive);
         } finally {
             stateLock.unlock();
         }
         if (toClose != null) {
             if (debug.on()) {
-                debug.log("Maximum pool size reached: removing oldest connection %s",
-                          toClose.dbgString());
+                if (stopping) {
+                    debug.log("Stopping: close connection %s",
+                            toClose.dbgString());
+                } else {
+                    debug.log("Maximum pool size reached: removing oldest connection %s",
+                            toClose.dbgString());
+                }
             }
             close(toClose);
         }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index 54bad66d4fa..d02930f4f31 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -1359,6 +1359,13 @@ final class HttpClientImpl extends HttpClient implements Trackable {
 
         // Only called by the selector manager thread
         private void shutdown() {
+            // first stop the client to avoid seeing exceptions
+            // about "selector manager closed"
+            Log.logTrace("{0}: stopping", owner.dbgTag);
+            try {
+                owner.stop();
+            } catch (Throwable ignored) {
+            }
             try {
                 lock.lock();
                 try {
@@ -1371,6 +1378,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
                 }
             } catch (IOException ignored) {
             } finally {
+                // cleanup anything that might have been left behind
                 owner.stop();
             }
         }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
index e705aae72a1..45d242df671 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
@@ -311,20 +311,20 @@ class PlainHttpConnection extends HttpConnection {
             var connectTimerEvent = this.connectTimerEvent;
             if (connectTimerEvent != null)
                 client().cancelTimer(connectTimerEvent);
-            if (Log.channel()) {
-                Log.logChannel("Closing channel: " + chan);
-            }
-            try {
-                tube.signalClosed(errorRef.get());
-                chan.close();
-            } finally {
-                client().connectionClosed(this);
-            }
+        } finally {
+            stateLock.unlock();
+        }
+        if (Log.channel()) {
+            Log.logChannel("Closing channel: " + chan);
+        }
+        try {
+            tube.signalClosed(errorRef.get());
+            chan.close();
         } catch (IOException e) {
             debug.log("Closing resulted in " + e);
             Log.logTrace("Closing resulted in " + e);
         } finally {
-            stateLock.unlock();
+            client().connectionClosed(this);
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/PlainConnectionLockTest.java b/test/jdk/java/net/httpclient/PlainConnectionLockTest.java
new file mode 100644
index 00000000000..3205f87111a
--- /dev/null
+++ b/test/jdk/java/net/httpclient/PlainConnectionLockTest.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLContext;
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.httpclient.test.lib.common.TestServerConfigurator;
+import jdk.test.lib.net.SimpleSSLContext;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+
+/*
+ * @test id=default
+ * @bug 8372198
+ * @requires os.family != "windows"
+ * @summary Attempt to check that no deadlock occurs when
+ *          connections are closed by the ConnectionPool.
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @run junit/othervm
+ *              -Djdk.httpclient.HttpClient.log=errors
+ *              -Djdk.httpclient.connectionPoolSize=1
+ *              ${test.main.class}
+ */
+/*
+ * @test id=windows
+ * @bug 8372198
+ * @requires os.family == "windows"
+ * @summary Attempt to check that no deadlock occurs when
+ *          connections are closed by the ConnectionPool.
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ * @comment A special jtreg id for windows allows for experimentation
+ *          with different configuration - for instance, specifying
+ *          -Djdk.internal.httpclient.tcp.selector.useVirtualThreads=<always|never>
+ *          on the run command line, or specifying a different request count
+ *          with -DrequestCount=<integer>.
+ *          On windows, it seems important to set the backlog for the HTTP/1.1
+ *          server to at least the number of concurrent request. This is done
+ *          in the beforeTest() method.
+ *          If the test fails waiting for avalaible permits, due to system limitations,
+ *          even with the backlog correctly configure, adding a margin to the backlog
+ *          or reducing the requestCount could be envisaged.
+ * @run junit/othervm
+ *              -Djdk.httpclient.HttpClient.log=errors
+ *              -Djdk.httpclient.connectionPoolSize=1
+ *              ${test.main.class}
+ */
+
+// -Djava.security.debug=all
+class PlainConnectionLockTest implements HttpServerAdapters {
+
+    private SSLContext sslContext;
+    private HttpTestServer http1Server;
+    private HttpTestServer https1Server;
+    private String http1URI;
+    private String https1URI;
+    private ExecutorService serverExecutor;
+    private Semaphore responseSemaphore;
+    private Semaphore requestSemaphore;
+    private boolean successfulCompletion;
+    private static final int MANY = Integer.getInteger("requestCount", 100);
+
+    static {
+        HttpServerAdapters.enableServerLogging();
+    }
+
+    private boolean blockResponse(Semaphore request, Semaphore response) {
+        try {
+            request.release();
+            response.acquire();
+            return true;
+        } catch (InterruptedException x) {
+            Thread.currentThread().interrupt();  // Restore the interrupt
+            return false;
+        }
+    }
+
+
+    @BeforeEach
+    synchronized void beforeTest() throws Exception {
+        requestSemaphore = new Semaphore(0);
+        responseSemaphore = new Semaphore(0);
+        successfulCompletion = false;
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null) {
+            throw new AssertionError("Unexpected null sslContext");
+        }
+        serverExecutor = Executors.newThreadPerTaskExecutor(
+                Thread.ofVirtual().name("Http1Server", 0).factory());
+
+        // On Windows, sending 100 concurrent requests may
+        // fail if the server's connection backlog is less than 100.
+        // The default backlog is 50. Just make sure the backlog is
+        // big enough.
+        int backlog = Math.max(MANY, 50);
+
+        // create a https server for HTTP/1.1
+        var loopback = InetAddress.getLoopbackAddress();
+        var wrappedHttps1Server = HttpsServer.create(new InetSocketAddress(loopback, 0), backlog);
+        wrappedHttps1Server.setHttpsConfigurator(new TestServerConfigurator(loopback, sslContext));
+        https1Server = HttpTestServer.of(wrappedHttps1Server, serverExecutor);
+        https1Server.addHandler((exchange) -> {
+            if (blockResponse(requestSemaphore, responseSemaphore)) {
+                exchange.sendResponseHeaders(200, 0);
+            } else {
+                exchange.sendResponseHeaders(500, 0);
+            }
+        }, "/PlainConnectionLockTest/");
+        https1Server.start();
+        System.out.println("HTTPS Server started at " + https1Server.getAddress());
+        https1URI = "https://" + https1Server.serverAuthority() + "/PlainConnectionLockTest/https1";
+
+        // create a plain http server for HTTP/1.1
+        var wrappedHttp1Server = HttpServer.create(new InetSocketAddress(loopback, 0), backlog);
+        http1Server = HttpTestServer.of(wrappedHttp1Server, serverExecutor);
+        http1Server.addHandler((exchange) -> {
+            if (blockResponse(requestSemaphore, responseSemaphore)) {
+                exchange.sendResponseHeaders(200, 0);
+            } else {
+                exchange.sendResponseHeaders(500, 0);
+            }
+        }, "/PlainConnectionLockTest/");
+        http1Server.start();
+        System.out.println("HTTP Server started at " + http1Server.getAddress());
+        http1URI = "http://" + http1Server.serverAuthority() + "/PlainConnectionLockTest/http1";
+    }
+
+    @AfterEach
+    synchronized void afterTest() throws Exception {
+        if (http1Server != null) {
+            System.out.println("Stopping HTTP server " + http1Server.getAddress());
+            http1Server.stop();
+        }
+        if (https1Server != null) {
+            System.out.println("Stopping HTTPS server " + https1Server.getAddress());
+            https1Server.stop();
+        }
+        if (serverExecutor != null) {
+            System.out.println("Closing server executor");
+            if (successfulCompletion) {
+                serverExecutor.close();
+            } else {
+                // server handlers may be wedged.
+                serverExecutor.shutdownNow();
+            }
+        }
+        requestSemaphore = null;
+        responseSemaphore = null;
+        serverExecutor = null;
+        http1Server = null;
+        https1Server = null;
+        http1URI = null;
+        https1URI = null;
+        System.out.println("done\n");
+    }
+
+    @Test
+    void sendManyHttpRequestsNoShutdown() throws Exception {
+        try {
+            sendManyRequests(http1URI, MANY, false);
+        } catch (Throwable t) {
+            t.printStackTrace(System.out);
+            throw t;
+        }
+    }
+
+    @Test
+    void sendManyHttpRequestsShutdownNow() throws Exception {
+        try {
+            sendManyRequests(http1URI, MANY, true);
+        } catch (Throwable t) {
+            t.printStackTrace(System.out);
+            throw t;
+        }
+    }
+
+    @Test
+    void sendManyHttpsRequestsNoShutdown() throws Exception {
+        try {
+            sendManyRequests(https1URI, MANY, false);
+        } catch (Throwable t) {
+            t.printStackTrace(System.out);
+            throw t;
+        }
+    }
+
+    @Test
+    void sendManyHttpsRequestsShutdownNow() throws Exception {
+        try {
+            sendManyRequests(https1URI, MANY, true);
+        } catch (Throwable t) {
+            t.printStackTrace(System.out);
+            throw t;
+        }
+    }
+
+    private static void throwCause(CompletionException x) throws Exception {
+        var cause = x.getCause();
+        if (cause instanceof Exception ex) throw ex;
+        if (cause instanceof Error err) throw err;
+        throw x;
+    }
+
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    static Throwable getCause(Throwable exception) {
+        if (exception instanceof IOException) return exception;
+        if (exception instanceof CancellationException) return exception;
+        if (exception instanceof CompletionException) return getCause(exception.getCause());
+        if (exception instanceof ExecutionException) return getCause(exception.getCause());
+        return exception;
+    }
+
+    private synchronized void sendManyRequests(final String requestURI, final int many, boolean shutdown) throws Exception {
+        System.out.println("\n%sSending %s requests to %s, shutdown=%s\n".formatted(now(), many, requestURI, shutdown));
+        System.err.println("\n%sSending %s requests to %s, shutdown=%s\n".formatted(now(), many, requestURI, shutdown));
+        assert many > 0;
+        try (final HttpClient client = HttpClient.newBuilder()
+                .proxy(NO_PROXY)
+                .sslContext(sslContext).build()) {
+            List<CompletableFuture<HttpResponse<String>>> futures = new ArrayList<>();
+            final HttpRequest.Builder reqBuilder = HttpRequest.newBuilder().version(HTTP_1_1);
+            for (int i = 0; i < many; i++) {
+                // GET
+                final URI reqURI = new URI(requestURI + "?i=" + i);
+                final HttpRequest req = reqBuilder.copy().uri(reqURI).GET().build();
+                System.out.println(now() + "Issuing request: " + req);
+                var cf = client.sendAsync(req, BodyHandlers.ofString());
+                futures.add(cf);
+            }
+            System.out.printf("\n%sWaiting for %s requests to be handled on the server%n", now(), many);
+
+            int count = 0;
+            // wait for all exchanges to be handled
+            while (!requestSemaphore.tryAcquire(many, 5, TimeUnit.SECONDS)) {
+                count++;
+                System.out.printf("%sFailed to obtain %s permits after %ss - only %s available%n",
+                        now(), many, (count * 5), requestSemaphore.availablePermits());
+                for (var cf : futures) {
+                    if (cf.isDone() || cf.isCancelled()) {
+                        System.out.printf("%sFound some completed cf: %s%n", now(), cf);
+                        if (cf.isCancelled()) {
+                            System.out.printf("%scf is cancelled: %s%n", now(), cf);
+                            client.shutdownNow(); // make sure HttpCient::close won't block waiting for server
+                            var error = new AssertionError(now() + "A request cf was cancelled" + cf);
+                            System.out.printf("%s throwing: %s%n", now(), error);
+                            throw error;
+                        }
+                        if (cf.isCompletedExceptionally()) {
+                            System.out.printf("%scf is completed exceptionally: %s%n", now(), cf);
+                            var exception = getCause(cf.exceptionNow());
+                            System.out.printf("%sexception is: %s%n", now(), exception);
+                            client.shutdownNow(); // make sure HttpCient::close won't block waiting for server
+                            exception.printStackTrace(System.out);
+                            var error = new AssertionError(now() + "A request failed prematurely", exception);
+                            System.out.printf("%s throwing: %s%n", now(), error);
+                            throw error;
+                        }
+                        System.out.printf("%scf is completed prematurely: %s%n", now(), cf);
+                        client.shutdownNow(); // make sure HttpCient::close won't block waiting for server
+                        var error = new AssertionError(now() + "A request succeeded prematurely: " + cf.join());
+                        System.out.printf("%s throwing: %s%n", now(), error);
+                        throw error;
+                    }
+                }
+                System.out.printf("%sCouldn't acquire %s permits, only %s available - keep on waiting%n",
+                        now(), many, requestSemaphore.availablePermits());
+            }
+
+            System.out.println(now() + "All requests reached the server: releasing one response");
+            // allow one request to proceed
+            responseSemaphore.release();
+            try {
+                // wait for the first response.
+                System.out.println(now() + "Waiting for the first response");
+                CompletableFuture.anyOf(futures.toArray(new CompletableFuture[0])).join();
+                System.out.println(now() + "Got first response: " + futures.stream().filter(CompletableFuture::isDone)
+                        .findFirst().map(CompletableFuture::join));
+                if (shutdown) {
+                    System.out.println(now() + "Calling HttpClient::shutdownNow");
+                    client.shutdownNow();
+                    client.awaitTermination(Duration.ofSeconds(1));
+                }
+            } finally {
+                System.out.printf("%s Releasing %s remaining responses%n", now(), many - 1);
+                // now release the others.
+                responseSemaphore.release(many - 1);
+            }
+
+            // wait for all responses
+            System.out.printf("%sWaiting for all %s responses to complete%n", now(), many);
+            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).exceptionally(t -> null).join();
+
+            // check
+            System.out.printf("%sAll %s responses completed. Checking...%n%n", now(), many);
+            Set<String> conns = new HashSet<>();
+            int exceptionCount = 0;
+            int success = 0;
+            for (var respCF : futures) {
+                try {
+                    var resp = respCF.join();
+                    Assertions.assertEquals(200, resp.statusCode(),
+                            now() + "unexpected response code for GET request: " + resp);
+                    Assertions.assertTrue(conns.add(resp.connectionLabel().get()),
+                            now() + "unexepected reuse of connection: "
+                                    + resp.connectionLabel().get() + " found in " + conns);
+                    success++;
+                } catch (CompletionException x) {
+                    if (shutdown) exceptionCount++;
+                    else throwCause(x);
+                }
+            }
+            if (shutdown) {
+                if (success == 0) {
+                    throw new AssertionError(("%s%s: shutdownNow=%s: Expected at least one response, " +
+                            "got success=%s, exceptions=%s").formatted(now(), requestURI, shutdown, success, exceptionCount));
+                }
+            }
+            System.out.println("%sSuccess: %s: shutdownNow:%s, success=%s, exceptions:%s\n"
+                    .formatted(now(), requestURI, shutdown, success, exceptionCount));
+            successfulCompletion = true;
+        }
+    }
+}

From f1d90b8b25b78b15dc6529a5a6e45633eb250286 Mon Sep 17 00:00:00 2001
From: James Yuzawa <jtyuzawa@gmail.com>
Date: Thu, 27 Nov 2025 20:26:16 +0000
Subject: [PATCH 387/512] 8372134: ThreadLocalRandom no longer overrides
 nextGaussian

Reviewed-by: alanb, rgiulietti, vklang
---
 .../util/concurrent/ThreadLocalRandom.java    | 26 ++++++++++++-------
 .../java/util/random/RandomGenerator.java     |  3 +--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
index 3713d616a3a..deed7f018c3 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -128,11 +128,6 @@ public final class ThreadLocalRandom extends Random {
      * Implementations of non-core methods are mostly the same as in
      * SplittableRandom, that were in part derived from a previous
      * version of this class.
-     *
-     * This implementation of ThreadLocalRandom overrides the
-     * definition of the nextGaussian() method in the class Random,
-     * and instead uses the ziggurat-based algorithm that is the
-     * default for the RandomGenerator interface.
      */
 
     private static int mix32(long z) {
@@ -499,6 +494,23 @@ public final class ThreadLocalRandom extends Random {
         return super.nextLong(origin, bound);
     }
 
+    /**
+     * Returns a {@code double} value pseudorandomly chosen from a Gaussian
+     * (normal) distribution whose mean is 0 and whose standard deviation is 1.
+     *
+     * @return a {@code double} value pseudorandomly chosen from a
+     *         Gaussian distribution
+     *
+     * @implNote This implementation invokes the default implementation of
+     *           {@link java.util.random.RandomGenerator#nextGaussian()},
+     *           and so it uses McFarland's fast modified ziggurat algorithm
+     *           rather than the polar method described in the superclass.
+     */
+    @Override
+    public double nextGaussian() {
+        return RandomSupport.computeNextGaussian(this);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -510,7 +522,6 @@ public final class ThreadLocalRandom extends Random {
     /**
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
-     * @implNote {@inheritDoc}
      *
      * @since 17
      */
@@ -522,7 +533,6 @@ public final class ThreadLocalRandom extends Random {
     /**
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
-     * @implNote {@inheritDoc}
      *
      * @since 17
      */
@@ -542,7 +552,6 @@ public final class ThreadLocalRandom extends Random {
     /**
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
-     * @implNote {@inheritDoc}
      */
     @Override
     public double nextDouble(double bound) {
@@ -552,7 +561,6 @@ public final class ThreadLocalRandom extends Random {
     /**
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
-     * @implNote {@inheritDoc}
      */
     @Override
     public double nextDouble(double origin, double bound) {
diff --git a/src/java.base/share/classes/java/util/random/RandomGenerator.java b/src/java.base/share/classes/java/util/random/RandomGenerator.java
index e019e073a2d..2195774e591 100644
--- a/src/java.base/share/classes/java/util/random/RandomGenerator.java
+++ b/src/java.base/share/classes/java/util/random/RandomGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -917,7 +917,6 @@ public interface RandomGenerator {
      * a discrete distribution also plays a role.
      */
     default double nextGaussian() {
-        // See Knuth, TAOCP, Vol. 2, 3rd edition, Section 3.4.1 Algorithm C.
         return RandomSupport.computeNextGaussian(this);
     }
 

From 195b36f90b789b64f4a0fc867c620935d609a455 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 27 Nov 2025 23:05:51 +0000
Subject: [PATCH 388/512] 8372702:
 sun/security/pkcs11/tls/fips/FipsModeTLS.java does not compile after
 JDK-8367096

Reviewed-by: djelinski
---
 test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java b/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
index d0b1407422a..8799f2305bf 100644
--- a/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
+++ b/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
@@ -456,9 +456,8 @@ public final class FipsModeTLS extends SecmodTest {
         //  2. SUN (to handle X.509 certificates)
         //  3. SunJSSE (for a TLS engine)
 
-        if (initSecmod() == false) {
-            return;
-        }
+        initSecmod();
+
         String configName = BASE + SEP + "nss.cfg";
         sunPKCS11NSSProvider = getSunPKCS11(configName);
         System.out.println("SunPKCS11 provider: " + sunPKCS11NSSProvider);

From 0c6d1b9c8bfd7f4e39a6621c7a8f7bdcd044a05f Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 28 Nov 2025 06:39:03 +0000
Subject: [PATCH 389/512] 8371759: Add missing @Override annotations in
 com.sun.imageio package

Reviewed-by: tr, jdv, azvegint
---
 .../plugins/bmp/BMPImageReaderSpi.java        |  6 ++-
 .../plugins/bmp/BMPImageWriterSpi.java        |  6 ++-
 .../sun/imageio/plugins/bmp/BMPMetadata.java  | 11 +++++-
 .../plugins/bmp/BMPMetadataFormat.java        |  3 +-
 .../bmp/BMPMetadataFormatResources.java       |  3 +-
 .../plugins/common/BogusColorSpace.java       |  6 ++-
 .../plugins/common/InputStreamAdapter.java    |  4 +-
 .../plugins/common/SimpleCMYKColorSpace.java  |  8 +++-
 .../plugins/common/SimpleRenderedImage.java   | 22 ++++++++++-
 .../common/SingleTileRenderedImage.java       |  3 +-
 .../common/StandardMetadataFormat.java        |  3 +-
 .../StandardMetadataFormatResources.java      |  3 +-
 .../plugins/common/SubImageInputStream.java   |  6 ++-
 .../imageio/plugins/gif/GIFImageMetadata.java | 14 ++++++-
 .../plugins/gif/GIFImageMetadataFormat.java   |  3 +-
 .../gif/GIFImageMetadataFormatResources.java  |  3 +-
 .../plugins/gif/GIFImageReaderSpi.java        |  5 ++-
 .../plugins/gif/GIFImageWriterSpi.java        |  5 ++-
 .../sun/imageio/plugins/gif/GIFMetadata.java  |  3 +-
 .../plugins/gif/GIFStreamMetadata.java        | 15 ++++++-
 .../plugins/gif/GIFStreamMetadataFormat.java  |  3 +-
 .../gif/GIFStreamMetadataFormatResources.java |  3 +-
 .../plugins/gif/GIFWritableImageMetadata.java |  7 +++-
 .../gif/GIFWritableStreamMetadata.java        |  8 +++-
 .../plugins/jpeg/AdobeMarkerSegment.java      |  5 ++-
 .../plugins/jpeg/COMMarkerSegment.java        |  5 ++-
 .../plugins/jpeg/DHTMarkerSegment.java        |  7 +++-
 .../plugins/jpeg/DQTMarkerSegment.java        |  7 +++-
 .../plugins/jpeg/DRIMarkerSegment.java        |  5 ++-
 .../plugins/jpeg/JFIFMarkerSegment.java       | 39 +++++++++++++++++++
 .../plugins/jpeg/JPEGImageMetadataFormat.java |  3 +-
 .../JPEGImageMetadataFormatResources.java     |  3 +-
 .../jpeg/JPEGImageReaderResources.java        |  3 +-
 .../plugins/jpeg/JPEGImageReaderSpi.java      |  5 ++-
 .../jpeg/JPEGImageWriterResources.java        |  3 +-
 .../plugins/jpeg/JPEGImageWriterSpi.java      |  6 ++-
 .../imageio/plugins/jpeg/JPEGMetadata.java    | 11 ++++++
 .../plugins/jpeg/JPEGMetadataFormat.java      |  3 +-
 .../JPEGStreamMetadataFormatResources.java    |  3 +-
 .../imageio/plugins/jpeg/MarkerSegment.java   |  1 +
 .../plugins/jpeg/SOFMarkerSegment.java        |  7 +++-
 .../plugins/jpeg/SOSMarkerSegment.java        |  7 +++-
 .../plugins/png/PNGImageReaderSpi.java        |  5 ++-
 .../plugins/png/PNGImageWriterSpi.java        |  5 ++-
 .../sun/imageio/plugins/png/PNGMetadata.java  | 14 ++++++-
 .../plugins/png/PNGMetadataFormat.java        |  3 +-
 .../png/PNGMetadataFormatResources.java       |  3 +-
 .../plugins/tiff/TIFFBaseJPEGCompressor.java  |  3 +-
 .../tiff/TIFFCIELabColorConverter.java        |  4 +-
 .../plugins/tiff/TIFFDeflateDecompressor.java |  3 +-
 .../imageio/plugins/tiff/TIFFDeflater.java    |  3 +-
 .../plugins/tiff/TIFFExifJPEGCompressor.java  |  3 +-
 .../plugins/tiff/TIFFFaxCompressor.java       |  3 +-
 .../plugins/tiff/TIFFFaxDecompressor.java     |  4 +-
 .../imageio/plugins/tiff/TIFFFieldNode.java   | 13 ++++++-
 .../plugins/tiff/TIFFImageMetadata.java       | 13 ++++++-
 .../plugins/tiff/TIFFImageMetadataFormat.java |  3 +-
 .../TIFFImageMetadataFormatResources.java     |  3 +-
 .../plugins/tiff/TIFFImageReaderSpi.java      |  6 ++-
 .../plugins/tiff/TIFFImageWriterSpi.java      |  6 ++-
 .../plugins/tiff/TIFFJPEGCompressor.java      |  4 +-
 .../plugins/tiff/TIFFJPEGDecompressor.java    |  4 +-
 .../plugins/tiff/TIFFLSBCompressor.java       |  3 +-
 .../plugins/tiff/TIFFLSBDecompressor.java     |  3 +-
 .../plugins/tiff/TIFFLZWCompressor.java       |  4 +-
 .../plugins/tiff/TIFFLZWDecompressor.java     |  3 +-
 .../plugins/tiff/TIFFMetadataFormat.java      | 27 ++++++++++++-
 .../plugins/tiff/TIFFNullCompressor.java      |  3 +-
 .../plugins/tiff/TIFFNullDecompressor.java    |  5 ++-
 .../plugins/tiff/TIFFOldJPEGDecompressor.java |  3 +-
 .../plugins/tiff/TIFFPackBitsCompressor.java  |  3 +-
 .../tiff/TIFFPackBitsDecompressor.java        |  3 +-
 .../plugins/tiff/TIFFRLECompressor.java       |  3 +-
 .../plugins/tiff/TIFFRenderedImage.java       | 23 ++++++++++-
 .../plugins/tiff/TIFFStreamMetadata.java      |  6 ++-
 .../tiff/TIFFStreamMetadataFormat.java        |  3 +-
 .../TIFFStreamMetadataFormatResources.java    |  3 +-
 .../plugins/tiff/TIFFT4Compressor.java        |  4 +-
 .../plugins/tiff/TIFFT6Compressor.java        |  3 +-
 .../plugins/tiff/TIFFYCbCrColorConverter.java |  4 +-
 .../plugins/tiff/TIFFYCbCrDecompressor.java   | 36 ++++++++++++++++-
 .../plugins/wbmp/WBMPImageReaderSpi.java      |  6 ++-
 .../plugins/wbmp/WBMPImageWriterSpi.java      |  6 ++-
 .../imageio/plugins/wbmp/WBMPMetadata.java    |  9 ++++-
 .../plugins/wbmp/WBMPMetadataFormat.java      |  3 +-
 .../imageio/spi/FileImageInputStreamSpi.java  |  4 +-
 .../imageio/spi/FileImageOutputStreamSpi.java |  4 +-
 .../spi/InputStreamImageInputStreamSpi.java   |  6 ++-
 .../spi/OutputStreamImageOutputStreamSpi.java |  6 ++-
 .../imageio/spi/RAFImageInputStreamSpi.java   |  4 +-
 .../imageio/spi/RAFImageOutputStreamSpi.java  |  4 +-
 .../stream/CloseableDisposerRecord.java       |  3 +-
 .../com/sun/imageio/stream/StreamCloser.java  |  3 +-
 93 files changed, 491 insertions(+), 90 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
index a3098bd9684..63cc1464460 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ public class BMPImageReaderSpi extends ImageReaderSpi {
               null, null);
     }
 
+    @Override
     public void onRegistration(ServiceRegistry registry,
                                Class<?> category) {
         if (registered) {
@@ -69,10 +70,12 @@ public class BMPImageReaderSpi extends ImageReaderSpi {
         registered = true;
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard BMP Image Reader";
     }
 
+    @Override
     public boolean canDecodeInput(Object source) throws IOException {
         if (!(source instanceof ImageInputStream)) {
             return false;
@@ -87,6 +90,7 @@ public class BMPImageReaderSpi extends ImageReaderSpi {
         return full && (b[0] == 0x42) && (b[1] == 0x4d);
     }
 
+    @Override
     public ImageReader createReaderInstance(Object extension)
         throws IIOException {
         return new BMPImageReader(this);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
index ae6a7f65a3b..736a1c2194e 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,10 +66,12 @@ public class BMPImageWriterSpi extends ImageWriterSpi {
               null, null);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard BMP Image Writer";
     }
 
+    @Override
     public void onRegistration(ServiceRegistry registry,
                                Class<?> category) {
         if (registered) {
@@ -79,6 +81,7 @@ public class BMPImageWriterSpi extends ImageWriterSpi {
         registered = true;
     }
 
+    @Override
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         int dataType= type.getSampleModel().getDataType();
         if (dataType < DataBuffer.TYPE_BYTE || dataType > DataBuffer.TYPE_INT)
@@ -99,6 +102,7 @@ public class BMPImageWriterSpi extends ImageWriterSpi {
         return true;
     }
 
+    @Override
     public ImageWriter createWriterInstance(Object extension)
         throws IIOException {
         return new BMPImageWriter(this);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
index 5e5a4a52d35..48d3bb12f1c 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,10 +94,12 @@ public class BMPMetadata extends IIOMetadata implements BMPConstants {
               null, null);
     }
 
+    @Override
     public boolean isReadOnly() {
         return true;
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName.equals(nativeMetadataFormatName)) {
             return getNativeTree();
@@ -177,6 +179,7 @@ public class BMPMetadata extends IIOMetadata implements BMPConstants {
     }
 
     // Standard tree node methods
+    @Override
     protected IIOMetadataNode getStandardChromaNode() {
 
         if ((palette != null) && (paletteSize > 0)) {
@@ -202,6 +205,7 @@ public class BMPMetadata extends IIOMetadata implements BMPConstants {
         return null;
     }
 
+    @Override
     protected IIOMetadataNode getStandardCompressionNode() {
         IIOMetadataNode node = new IIOMetadataNode("Compression");
 
@@ -212,6 +216,7 @@ public class BMPMetadata extends IIOMetadata implements BMPConstants {
         return node;
     }
 
+    @Override
     protected IIOMetadataNode getStandardDataNode() {
         IIOMetadataNode node = new IIOMetadataNode("Data");
 
@@ -230,6 +235,7 @@ public class BMPMetadata extends IIOMetadata implements BMPConstants {
         return node;
     }
 
+    @Override
     protected IIOMetadataNode getStandardDimensionNode() {
         if (yPixelsPerMeter > 0.0F && xPixelsPerMeter > 0.0F) {
             IIOMetadataNode node = new IIOMetadataNode("Dimension");
@@ -251,14 +257,17 @@ public class BMPMetadata extends IIOMetadata implements BMPConstants {
         return null;
     }
 
+    @Override
     public void setFromTree(String formatName, Node root) {
         throw new IllegalStateException(I18N.getString("BMPMetadata1"));
     }
 
+    @Override
     public void mergeTree(String formatName, Node root) {
         throw new IllegalStateException(I18N.getString("BMPMetadata1"));
     }
 
+    @Override
     public void reset() {
         throw new IllegalStateException(I18N.getString("BMPMetadata1"));
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
index b9ea0ee0fe3..277169a34e0 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -194,6 +194,7 @@ public class BMPMetadataFormat extends IIOMetadataFormatImpl {
                      DATATYPE_STRING, true, null);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return true;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
index 1f2f444acd7..4d6c4fe49ec 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ public class BMPMetadataFormatResources extends ListResourceBundle {
 
     public BMPMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
index 5a064f4f4c5..107ee313b70 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,6 +79,7 @@ public class BogusColorSpace extends ColorSpace {
     // specified behavior of the methods vis-a-vis exceptions.
     //
 
+    @Override
     public float[] toRGB(float[] colorvalue) {
         if(colorvalue.length < getNumComponents()) {
             throw new ArrayIndexOutOfBoundsException
@@ -93,6 +94,7 @@ public class BogusColorSpace extends ColorSpace {
         return rgbvalue;
     }
 
+    @Override
     public float[] fromRGB(float[] rgbvalue) {
         if(rgbvalue.length < 3) {
             throw new ArrayIndexOutOfBoundsException
@@ -107,6 +109,7 @@ public class BogusColorSpace extends ColorSpace {
         return colorvalue;
     }
 
+    @Override
     public float[] toCIEXYZ(float[] colorvalue) {
         if(colorvalue.length < getNumComponents()) {
             throw new ArrayIndexOutOfBoundsException
@@ -121,6 +124,7 @@ public class BogusColorSpace extends ColorSpace {
         return xyzvalue;
     }
 
+    @Override
     public float[] fromCIEXYZ(float[] xyzvalue) {
         if(xyzvalue.length < 3) {
             throw new ArrayIndexOutOfBoundsException
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
index 1b63a54d8ff..b11ffeb6287 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,10 +39,12 @@ public class InputStreamAdapter extends InputStream {
         this.stream = stream;
     }
 
+    @Override
     public int read() throws IOException {
         return stream.read();
     }
 
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         return stream.read(b, off, len);
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
index a5c283e6c9c..1662d09984d 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,14 +58,17 @@ public final class SimpleCMYKColorSpace extends ColorSpace {
         csRGB = ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB);
     }
 
+    @Override
     public boolean equals(Object o) {
         return o instanceof SimpleCMYKColorSpace;
     }
 
+    @Override
     public int hashCode() {
         return System.identityHashCode(theInstance);
     }
 
+    @Override
     public float[] toRGB(float[] colorvalue) {
         float C = colorvalue[0];
         float M = colorvalue[1];
@@ -97,6 +100,7 @@ public final class SimpleCMYKColorSpace extends ColorSpace {
         return rgbvalue;
     }
 
+    @Override
     public float[] fromRGB(float[] rgbvalue) {
         // Convert from sRGB to linear RGB.
         for (int i = 0; i < 3; i++) {
@@ -128,10 +132,12 @@ public final class SimpleCMYKColorSpace extends ColorSpace {
         return new float[] {C, M, Y, K};
     }
 
+    @Override
     public float[] toCIEXYZ(float[] colorvalue) {
         return csRGB.toCIEXYZ(toRGB(colorvalue));
     }
 
+    @Override
     public float[] fromCIEXYZ(float[] xyzvalue) {
         return fromRGB(csRGB.fromCIEXYZ(xyzvalue));
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java
index 1d8c850b4a9..f598aeb06a1 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
     protected Hashtable<String,Object> properties = new Hashtable<String,Object>();
 
     /** Returns the X coordinate of the leftmost column of the image. */
+    @Override
     public int getMinX() {
         return minX;
     }
@@ -89,6 +90,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
     }
 
     /** Returns the X coordinate of the uppermost row of the image. */
+    @Override
     public int getMinY() {
         return minY;
     }
@@ -104,11 +106,13 @@ public abstract class SimpleRenderedImage implements RenderedImage {
     }
 
     /** Returns the width of the image. */
+    @Override
     public int getWidth() {
         return width;
     }
 
     /** Returns the height of the image. */
+    @Override
     public int getHeight() {
         return height;
     }
@@ -119,11 +123,13 @@ public abstract class SimpleRenderedImage implements RenderedImage {
     }
 
     /** Returns the width of a tile. */
+    @Override
     public int getTileWidth() {
         return tileWidth;
     }
 
     /** Returns the height of a tile. */
+    @Override
     public int getTileHeight() {
         return tileHeight;
     }
@@ -131,6 +137,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
     /**
      * Returns the X coordinate of the upper-left pixel of tile (0, 0).
      */
+    @Override
     public int getTileGridXOffset() {
         return tileGridXOffset;
     }
@@ -138,6 +145,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
     /**
      * Returns the Y coordinate of the upper-left pixel of tile (0, 0).
      */
+    @Override
     public int getTileGridYOffset() {
         return tileGridYOffset;
     }
@@ -147,6 +155,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * getMinTileX() is implemented in terms of getMinX()
      * and so does not need to be implemented by subclasses.
      */
+    @Override
     public int getMinTileX() {
         return XToTileX(getMinX());
     }
@@ -166,6 +175,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * of getMinTileX() and getMaxTileX() and so does not need to be
      * implemented by subclasses.
      */
+    @Override
     public int getNumXTiles() {
         return getMaxTileX() - getMinTileX() + 1;
     }
@@ -175,6 +185,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * is implemented in terms of getMinY() and so does not need to be
      * implemented by subclasses.
      */
+    @Override
     public int getMinTileY() {
         return YToTileY(getMinY());
     }
@@ -194,16 +205,19 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * of getMinTileY() and getMaxTileY() and so does not need to be
      * implemented by subclasses.
      */
+    @Override
     public int getNumYTiles() {
         return getMaxTileY() - getMinTileY() + 1;
     }
 
     /** Returns the SampleModel of the image. */
+    @Override
     public SampleModel getSampleModel() {
         return sampleModel;
     }
 
     /** Returns the ColorModel of the image. */
+    @Override
     public ColorModel getColorModel() {
         return colorModel;
     }
@@ -218,6 +232,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * <code>Object</code>, or the value
      * <code>java.awt.Image.UndefinedProperty.</code>
      */
+    @Override
     public Object getProperty(String name) {
         name = name.toLowerCase();
         Object value = properties.get(name);
@@ -232,6 +247,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * @return an array of <code>String</code>s representing valid
      *         property names.
      */
+    @Override
     public String[] getPropertyNames() {
         String[] names = null;
 
@@ -379,6 +395,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
         return ty*tileHeight + tileGridYOffset;
     }
 
+    @Override
     public Vector<RenderedImage> getSources() {
         return null;
     }
@@ -399,6 +416,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      *
      * @return a Raster containing a copy of this image's data.
      */
+    @Override
     public Raster getData() {
         Rectangle rect = new Rectangle(getMinX(), getMinY(),
                                        getWidth(), getHeight());
@@ -422,6 +440,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      *
      * @param bounds the region of the RenderedImage to be returned.
      */
+    @Override
     public Raster getData(Rectangle bounds) {
         // Get the image bounds.
         Rectangle imageBounds = getBounds();
@@ -511,6 +530,7 @@ public abstract class SimpleRenderedImage implements RenderedImage {
      * @return a reference to the supplied WritableRaster, or to a
      *         new WritableRaster if the supplied one was null.
      */
+    @Override
     public WritableRaster copyData(WritableRaster dest) {
         // Get the image bounds.
         Rectangle imageBounds = getBounds();
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java
index 0cbdefa9127..315270e5916 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SingleTileRenderedImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@ public class SingleTileRenderedImage extends SimpleRenderedImage {
     /**
      * Returns the image's Raster as tile (0, 0).
      */
+    @Override
     public Raster getTile(int tileX, int tileY) {
         if (tileX != 0 || tileY != 0) {
             throw new IllegalArgumentException("tileX != 0 || tileY != 0");
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
index d880c507cba..05fa72f24ae 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -492,6 +492,7 @@ public class StandardMetadataFormat extends IIOMetadataFormatImpl {
                      null);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
             return true;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
index 4a94450d003..20e81dd76fa 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class StandardMetadataFormatResources extends ListResourceBundle {
 
     public StandardMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
index 5d6bd401dc6..487f678c1eb 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ public final class SubImageInputStream extends ImageInputStreamImpl {
         this.startingLength = this.length = length;
     }
 
+    @Override
     public int read() throws IOException {
         if (length == 0) { // Local EOF
             return -1;
@@ -52,6 +53,7 @@ public final class SubImageInputStream extends ImageInputStreamImpl {
         }
     }
 
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         if (length == 0) { // Local EOF
             return -1;
@@ -63,10 +65,12 @@ public final class SubImageInputStream extends ImageInputStreamImpl {
         return bytes;
     }
 
+    @Override
     public long length() {
         return startingLength;
     }
 
+    @Override
     public void seek(long pos) throws IOException {
         stream.seek(pos - startingPos);
         streamPos = pos;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
index 061f3b1eaf0..bf2768af4e1 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,10 +115,12 @@ public class GIFImageMetadata extends GIFMetadata {
               null, null);
     }
 
+    @Override
     public boolean isReadOnly() {
         return true;
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName.equals(nativeMetadataFormatName)) {
             return getNativeTree();
@@ -252,6 +254,7 @@ public class GIFImageMetadata extends GIFMetadata {
         return root;
     }
 
+    @Override
     public IIOMetadataNode getStandardChromaNode() {
         IIOMetadataNode chroma_node = new IIOMetadataNode("Chroma");
         IIOMetadataNode node = null; // scratch node
@@ -294,6 +297,7 @@ public class GIFImageMetadata extends GIFMetadata {
         return chroma_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardCompressionNode() {
         IIOMetadataNode compression_node = new IIOMetadataNode("Compression");
         IIOMetadataNode node = null; // scratch node
@@ -315,6 +319,7 @@ public class GIFImageMetadata extends GIFMetadata {
         return compression_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDataNode() {
         IIOMetadataNode data_node = new IIOMetadataNode("Data");
         IIOMetadataNode node = null; // scratch node
@@ -332,6 +337,7 @@ public class GIFImageMetadata extends GIFMetadata {
         return data_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDimensionNode() {
         IIOMetadataNode dimension_node = new IIOMetadataNode("Dimension");
         IIOMetadataNode node = null; // scratch node
@@ -365,6 +371,7 @@ public class GIFImageMetadata extends GIFMetadata {
 
     // Document not in image
 
+    @Override
     public IIOMetadataNode getStandardTextNode() {
         if (comments == null) {
             return null;
@@ -391,6 +398,7 @@ public class GIFImageMetadata extends GIFMetadata {
         return text_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardTransparencyNode() {
         if (!transparentColorFlag) {
             return null;
@@ -414,22 +422,26 @@ public class GIFImageMetadata extends GIFMetadata {
         return transparency_node;
     }
 
+    @Override
     public void setFromTree(String formatName, Node root)
         throws IIOInvalidTreeException
     {
         throw new IllegalStateException("Metadata is read-only!");
     }
 
+    @Override
     protected void mergeNativeTree(Node root) throws IIOInvalidTreeException
     {
         throw new IllegalStateException("Metadata is read-only!");
     }
 
+    @Override
     protected void mergeStandardTree(Node root) throws IIOInvalidTreeException
     {
         throw new IllegalStateException("Metadata is read-only!");
     }
 
+    @Override
     public void reset() {
         throw new IllegalStateException("Metadata is read-only!");
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
index fa55d72bbda..5a6a85a2b57 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,6 +157,7 @@ public class GIFImageMetadataFormat extends IIOMetadataFormatImpl {
                      DATATYPE_STRING, true, null);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return true;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
index aa9697a8ee9..f9a29cdebba 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class GIFImageMetadataFormatResources extends ListResourceBundle {
 
     public GIFImageMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
index 96a5ba436aa..9484484abf8 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,10 +71,12 @@ public class GIFImageReaderSpi extends ImageReaderSpi {
               );
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard GIF image reader";
     }
 
+    @Override
     public boolean canDecodeInput(Object input) throws IOException {
         if (!(input instanceof ImageInputStream)) {
             return false;
@@ -91,6 +93,7 @@ public class GIFImageReaderSpi extends ImageReaderSpi {
             (b[4] == '7' || b[4] == '9') && b[5] == 'a';
     }
 
+    @Override
     public ImageReader createReaderInstance(Object extension) {
         return new GIFImageReader(this);
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
index 0f1b8aec102..6da6332eb50 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,6 +73,7 @@ public class GIFImageWriterSpi extends ImageWriterSpi {
               );
     }
 
+    @Override
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         if (type == null) {
             throw new IllegalArgumentException("type == null!");
@@ -94,10 +95,12 @@ public class GIFImageWriterSpi extends ImageWriterSpi {
         }
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard GIF image writer";
     }
 
+    @Override
     public ImageWriter createWriterInstance(Object extension) {
         return new GIFImageWriter(this);
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
index 5fb4dc007b7..dca232352d9 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -242,6 +242,7 @@ abstract class GIFMetadata extends IIOMetadata {
               extraMetadataFormatClassNames);
     }
 
+    @Override
     public void mergeTree(String formatName, Node root)
       throws IIOInvalidTreeException {
         if (formatName.equals(nativeMetadataFormatName)) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
index 31c1305b58a..b34e96907ee 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,10 +77,12 @@ public class GIFStreamMetadata extends GIFMetadata {
 
     }
 
+    @Override
     public boolean isReadOnly() {
         return true;
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName.equals(nativeMetadataFormatName)) {
             return getNativeTree();
@@ -149,6 +151,7 @@ public class GIFStreamMetadata extends GIFMetadata {
         return root;
     }
 
+    @Override
     public IIOMetadataNode getStandardChromaNode() {
         IIOMetadataNode chroma_node = new IIOMetadataNode("Chroma");
         IIOMetadataNode node = null; // scratch node
@@ -190,6 +193,7 @@ public class GIFStreamMetadata extends GIFMetadata {
         return chroma_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardCompressionNode() {
         IIOMetadataNode compression_node = new IIOMetadataNode("Compression");
         IIOMetadataNode node = null; // scratch node
@@ -208,6 +212,7 @@ public class GIFStreamMetadata extends GIFMetadata {
         return compression_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDataNode() {
         IIOMetadataNode data_node = new IIOMetadataNode("Data");
         IIOMetadataNode node = null; // scratch node
@@ -230,6 +235,7 @@ public class GIFStreamMetadata extends GIFMetadata {
         return data_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDimensionNode() {
         IIOMetadataNode dimension_node = new IIOMetadataNode("Dimension");
         IIOMetadataNode node = null; // scratch node
@@ -270,6 +276,7 @@ public class GIFStreamMetadata extends GIFMetadata {
         return dimension_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDocumentNode() {
         IIOMetadataNode document_node = new IIOMetadataNode("Document");
         IIOMetadataNode node = null; // scratch node
@@ -285,32 +292,38 @@ public class GIFStreamMetadata extends GIFMetadata {
         return document_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardTextNode() {
         // Not in stream
         return null;
     }
 
+    @Override
     public IIOMetadataNode getStandardTransparencyNode() {
         // Not in stream
         return null;
     }
 
+    @Override
     public void setFromTree(String formatName, Node root)
         throws IIOInvalidTreeException
     {
         throw new IllegalStateException("Metadata is read-only!");
     }
 
+    @Override
     protected void mergeNativeTree(Node root) throws IIOInvalidTreeException
     {
         throw new IllegalStateException("Metadata is read-only!");
     }
 
+    @Override
     protected void mergeStandardTree(Node root) throws IIOInvalidTreeException
     {
         throw new IllegalStateException("Metadata is read-only!");
     }
 
+    @Override
     public void reset() {
         throw new IllegalStateException("Metadata is read-only!");
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
index b598674ccb3..fcdb8b0d13e 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,6 +92,7 @@ public class GIFStreamMetadataFormat extends IIOMetadataFormatImpl {
                      "0", "255", true, true);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return true;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
index 0404b2c88da..65e9f89c557 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class GIFStreamMetadataFormatResources extends ListResourceBundle {
 
     public GIFStreamMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
index a3e8a769490..cec4f354ee0 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,10 +49,12 @@ class GIFWritableImageMetadata extends GIFImageMetadata {
               null, null);
     }
 
+    @Override
     public boolean isReadOnly() {
         return false;
     }
 
+    @Override
     public void reset() {
         // Fields from Image Descriptor
         imageLeftPosition = 0;
@@ -96,6 +98,7 @@ class GIFWritableImageMetadata extends GIFImageMetadata {
         return data.getBytes(ISO_8859_1);
     }
 
+    @Override
     protected void mergeNativeTree(Node root) throws IIOInvalidTreeException {
         Node node = root;
         if (!node.getNodeName().equals(nativeMetadataFormatName)) {
@@ -292,6 +295,7 @@ class GIFWritableImageMetadata extends GIFImageMetadata {
         }
     }
 
+    @Override
     protected void mergeStandardTree(Node root)
       throws IIOInvalidTreeException {
         Node node = root;
@@ -389,6 +393,7 @@ class GIFWritableImageMetadata extends GIFImageMetadata {
         }
     }
 
+    @Override
     public void setFromTree(String formatName, Node root)
         throws IIOInvalidTreeException
     {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
index 8a9a6d865a8..d8863cb4a2d 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,10 +55,12 @@ class GIFWritableStreamMetadata extends GIFStreamMetadata {
         reset();
     }
 
+    @Override
     public boolean isReadOnly() {
         return false;
     }
 
+    @Override
     public void mergeTree(String formatName, Node root)
       throws IIOInvalidTreeException {
         if (formatName.equals(nativeMetadataFormatName)) {
@@ -77,6 +79,7 @@ class GIFWritableStreamMetadata extends GIFStreamMetadata {
         }
     }
 
+    @Override
     public void reset() {
         version = null;
 
@@ -90,6 +93,7 @@ class GIFWritableStreamMetadata extends GIFStreamMetadata {
         globalColorTable = null;
     }
 
+    @Override
     protected void mergeNativeTree(Node root) throws IIOInvalidTreeException {
         Node node = root;
         if (!node.getNodeName().equals(nativeMetadataFormatName)) {
@@ -164,6 +168,7 @@ class GIFWritableStreamMetadata extends GIFStreamMetadata {
         }
     }
 
+    @Override
     protected void mergeStandardTree(Node root)
       throws IIOInvalidTreeException {
         Node node = root;
@@ -258,6 +263,7 @@ class GIFWritableStreamMetadata extends GIFStreamMetadata {
         }
     }
 
+    @Override
     public void setFromTree(String formatName, Node root)
         throws IIOInvalidTreeException
     {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java
index 551f4dc4d72..9b1fbd27fc4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,6 +73,7 @@ class AdobeMarkerSegment extends MarkerSegment {
         updateFromNativeNode(node, true);
     }
 
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("app14Adobe");
         node.setAttribute("version", Integer.toString(version));
@@ -108,6 +109,7 @@ class AdobeMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         length = 14;
         writeTag(ios);
@@ -124,6 +126,7 @@ class AdobeMarkerSegment extends MarkerSegment {
         (new AdobeMarkerSegment(transform)).write(ios);
     }
 
+    @Override
     void print () {
         printTag("Adobe APP14");
         System.out.print("Version: ");
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java
index f28e7b35658..f45bded991a 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,6 +104,7 @@ class COMMarkerSegment extends MarkerSegment {
      * as a user object and a string encoded using ISO-8895-1, as an
      * attribute.
      */
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("com");
         node.setAttribute("comment", getComment());
@@ -117,12 +118,14 @@ class COMMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format, directly from the data array.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         length = 2 + data.length;
         writeTag(ios);
         ios.write(data);
     }
 
+    @Override
     void print() {
         printTag("COM");
         System.out.println("<" + getComment() + ">");
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java
index c14402522db..634a266354d 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,6 +90,7 @@ class DHTMarkerSegment extends MarkerSegment {
         }
     }
 
+    @Override
     protected Object clone() {
         DHTMarkerSegment newGuy = (DHTMarkerSegment) super.clone();
         newGuy.tables = new ArrayList<>(tables.size());
@@ -99,6 +100,7 @@ class DHTMarkerSegment extends MarkerSegment {
         return newGuy;
     }
 
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("dht");
         for (int i= 0; i<tables.size(); i++) {
@@ -112,10 +114,12 @@ class DHTMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         // We don't write DHT segments; the IJG library does.
     }
 
+    @Override
     void print() {
         printTag("DHT");
         System.out.println("Num tables: " + tables.size());
@@ -201,6 +205,7 @@ class DHTMarkerSegment extends MarkerSegment {
 
         }
 
+        @Override
         protected Object clone() {
             Htable newGuy = null;
             try {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java
index 8b983afc245..02a372f5a23 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,7 @@ class DQTMarkerSegment extends MarkerSegment {
         }
     }
 
+    @Override
     protected Object clone() {
         DQTMarkerSegment newGuy = (DQTMarkerSegment) super.clone();
         newGuy.tables = new ArrayList<>(tables.size());
@@ -92,6 +93,7 @@ class DQTMarkerSegment extends MarkerSegment {
         return newGuy;
     }
 
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("dqt");
         for (int i= 0; i<tables.size(); i++) {
@@ -105,10 +107,12 @@ class DQTMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         // We don't write DQT segments; the IJG library does.
     }
 
+    @Override
     void print() {
         printTag("DQT");
         System.out.println("Num tables: " + tables.size());
@@ -264,6 +268,7 @@ class DQTMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         protected Object clone() {
             Qtable newGuy = null;
             try {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java
index 337c8d50c26..1bbd4cacf4a 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@ class DRIMarkerSegment extends MarkerSegment {
         updateFromNativeNode(node, true);
     }
 
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("dri");
         node.setAttribute("interval", Integer.toString(restartInterval));
@@ -71,10 +72,12 @@ class DRIMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         // We don't write DRI segments; the IJG library does.
     }
 
+    @Override
     void print() {
         printTag("DRI");
         System.out.println("Interval: " + restartInterval);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
index 4d1845ec071..b3eea722585 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
@@ -154,6 +154,7 @@ class JFIFMarkerSegment extends MarkerSegment {
     /**
      * Returns a deep-copy clone of this object.
      */
+    @Override
     protected Object clone() {
         JFIFMarkerSegment newGuy = (JFIFMarkerSegment) super.clone();
         if (!extSegments.isEmpty()) { // Clone the list with a deep copy
@@ -216,6 +217,7 @@ class JFIFMarkerSegment extends MarkerSegment {
      * Returns a tree of DOM nodes representing this object and any
      * subordinate JFXX extension or ICC Profile segments.
      */
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("app0JFIF");
         node.setAttribute("majorVersion", Integer.toString(majorVersion));
@@ -622,6 +624,7 @@ class JFIFMarkerSegment extends MarkerSegment {
     /**
      * Prints out the contents of this object to System.out for debugging.
      */
+    @Override
     void print() {
         printTag("JFIF");
         System.out.print("Version ");
@@ -767,6 +770,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         protected Object clone() {
             JFIFExtensionMarkerSegment newGuy =
                 (JFIFExtensionMarkerSegment) super.clone();
@@ -776,6 +780,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return newGuy;
         }
 
+        @Override
         IIOMetadataNode getNativeNode() {
             IIOMetadataNode node = new IIOMetadataNode("app0JFXX");
             node.setAttribute("extensionCode", Integer.toString(code));
@@ -793,6 +798,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             thumb.write(ios, writer);
         }
 
+        @Override
         void print() {
             printTag("JFXX");
             thumb.print();
@@ -826,6 +832,7 @@ class JFIFMarkerSegment extends MarkerSegment {
         abstract void write(ImageOutputStream ios,
                             JPEGImageWriter writer) throws IOException;
 
+        @Override
         protected Object clone() {
             try {
                 return super.clone();
@@ -907,14 +914,17 @@ class JFIFMarkerSegment extends MarkerSegment {
         }
 
 
+        @Override
         int getWidth() {
             return thumbWidth;
         }
 
+        @Override
         int getHeight() {
             return thumbHeight;
         }
 
+        @Override
         IIOMetadataNode getNativeNode() {
             IIOMetadataNode node = new IIOMetadataNode(name);
             node.setAttribute("thumbWidth", Integer.toString(thumbWidth));
@@ -922,6 +932,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return node;
         }
 
+        @Override
         void write(ImageOutputStream ios,
                    JPEGImageWriter writer) throws IOException {
             if ((thumbWidth > MAX_THUMB_WIDTH)
@@ -949,6 +960,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             writeThumbnailData(ios, data, writer);
         }
 
+        @Override
         void print() {
             System.out.print(name + " width: ");
             System.out.println(thumbWidth);
@@ -978,10 +990,12 @@ class JFIFMarkerSegment extends MarkerSegment {
             super(thumb);
         }
 
+        @Override
         int getLength() {
             return (thumbWidth*thumbHeight*3);
         }
 
+        @Override
         BufferedImage getThumbnail(ImageInputStream iis,
                                    JPEGImageReader reader)
             throws IOException {
@@ -1014,6 +1028,7 @@ class JFIFMarkerSegment extends MarkerSegment {
                                      null);
         }
 
+        @Override
         void write(ImageOutputStream ios,
                    JPEGImageWriter writer) throws IOException {
             super.write(ios, writer); // width and height
@@ -1050,10 +1065,12 @@ class JFIFMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         int getLength() {
             return (thumbWidth*thumbHeight + PALETTE_SIZE);
         }
 
+        @Override
         BufferedImage getThumbnail(ImageInputStream iis,
                                    JPEGImageReader reader)
             throws IOException {
@@ -1091,6 +1108,7 @@ class JFIFMarkerSegment extends MarkerSegment {
                                      null);
         }
 
+        @Override
         void write(ImageOutputStream ios,
                    JPEGImageWriter writer) throws IOException {
             super.write(ios, writer); // width and height
@@ -1221,6 +1239,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         int getWidth() {
             int retval = 0;
             SOFMarkerSegment sof =
@@ -1232,6 +1251,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return retval;
         }
 
+        @Override
         int getHeight() {
             int retval = 0;
             SOFMarkerSegment sof =
@@ -1249,21 +1269,31 @@ class JFIFMarkerSegment extends MarkerSegment {
             ThumbnailReadListener (JPEGImageReader reader) {
                 this.reader = reader;
             }
+            @Override
             public void sequenceStarted(ImageReader source, int minIndex) {}
+            @Override
             public void sequenceComplete(ImageReader source) {}
+            @Override
             public void imageStarted(ImageReader source, int imageIndex) {}
+            @Override
             public void imageProgress(ImageReader source,
                                       float percentageDone) {
                 reader.thumbnailProgress(percentageDone);
             }
+            @Override
             public void imageComplete(ImageReader source) {}
+            @Override
             public void thumbnailStarted(ImageReader source,
                 int imageIndex, int thumbnailIndex) {}
+            @Override
             public void thumbnailProgress(ImageReader source, float percentageDone) {}
+            @Override
             public void thumbnailComplete(ImageReader source) {}
+            @Override
             public void readAborted(ImageReader source) {}
         }
 
+        @Override
         BufferedImage getThumbnail(ImageInputStream iis,
                                    JPEGImageReader reader)
             throws IOException {
@@ -1279,6 +1309,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return ret;
         }
 
+        @Override
         protected Object clone() {
             JFIFThumbJPEG newGuy = (JFIFThumbJPEG) super.clone();
             if (thumbMetadata != null) {
@@ -1287,6 +1318,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return newGuy;
         }
 
+        @Override
         IIOMetadataNode getNativeNode() {
             IIOMetadataNode node = new IIOMetadataNode("JFIFthumbJPEG");
             if (thumbMetadata != null) {
@@ -1295,6 +1327,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return node;
         }
 
+        @Override
         int getLength() {
             if (data == null) {
                 return 0;
@@ -1303,6 +1336,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         void write(ImageOutputStream ios,
                    JPEGImageWriter writer) throws IOException {
             int progInterval = data.length / 20;  // approx. every 5%
@@ -1322,6 +1356,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         void print () {
             System.out.println("JFIF thumbnail stored as JPEG");
         }
@@ -1445,6 +1480,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             }
         }
 
+        @Override
         protected Object clone () {
             ICCMarkerSegment newGuy = (ICCMarkerSegment) super.clone();
             if (profile != null) {
@@ -1541,6 +1577,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return retval;
         }
 
+        @Override
         IIOMetadataNode getNativeNode() {
             IIOMetadataNode node = new IIOMetadataNode("app2ICC");
             if (profile != null) {
@@ -1553,10 +1590,12 @@ class JFIFMarkerSegment extends MarkerSegment {
          * No-op.  Profiles are never written from metadata.
          * They are written from the ColorSpace of the image.
          */
+        @Override
         void write(ImageOutputStream ios) throws IOException {
             // No-op
         }
 
+        @Override
         void print () {
             printTag("ICC Profile APP2");
         }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java
index 4c858a47ab1..20b94fb339b 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -337,6 +337,7 @@ public class JPEGImageMetadataFormat extends JPEGMetadataFormat {
                      tabids);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         // All images can have these
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java
index e242a355a17..3cbc0054c85 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,6 +122,7 @@ public class JPEGImageMetadataFormatResources
 
     public JPEGImageMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         // return a copy of the combined commonContents and imageContents;
         // in theory we want a deep clone of the combined arrays,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java
index e4b09197aa7..be6fc32a761 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class JPEGImageReaderResources extends ListResourceBundle {
 
     public JPEGImageReaderResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
index 450dd89b6f4..ab942ea8de2 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,12 @@ public class JPEGImageReaderSpi extends ImageReaderSpi {
               );
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard JPEG Image Reader";
     }
 
+    @Override
     public boolean canDecodeInput(Object source) throws IOException {
         if (!(source instanceof ImageInputStream)) {
             return false;
@@ -80,6 +82,7 @@ public class JPEGImageReaderSpi extends ImageReaderSpi {
         return false;
     }
 
+    @Override
     public ImageReader createReaderInstance(Object extension)
         throws IIOException {
         return new JPEGImageReader(this);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java
index 3db20b3d39d..3b2a149f6b4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class JPEGImageWriterResources extends ListResourceBundle {
 
     public JPEGImageWriterResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
index bd6bcc8d784..d6f5abbbccb 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,14 +63,17 @@ public class JPEGImageWriterSpi extends ImageWriterSpi {
               );
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard JPEG Image Writer";
     }
 
+    @Override
     public boolean isFormatLossless() {
         return false;
     }
 
+    @Override
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         SampleModel sampleModel = type.getSampleModel();
         ColorModel cm = type.getColorModel();
@@ -95,6 +98,7 @@ public class JPEGImageWriterSpi extends ImageWriterSpi {
         return true;
     }
 
+    @Override
     public ImageWriter createWriterInstance(Object extension)
         throws IIOException {
         return new JPEGImageWriter(this);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
index c7ad982b35a..3081fd43404 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
@@ -725,6 +725,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
 
     // Implement Cloneable, but restrict access
 
+    @Override
     protected Object clone() {
         JPEGMetadata newGuy = null;
         try {
@@ -755,6 +756,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
 
     // Tree methods
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName == null) {
             throw new IllegalArgumentException("null formatName!");
@@ -810,6 +812,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
 
     // Standard tree node methods
 
+    @Override
     protected IIOMetadataNode getStandardChromaNode() {
         hasAlpha = false;  // Unless we find otherwise
 
@@ -950,6 +953,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
         return chroma;
     }
 
+    @Override
     protected IIOMetadataNode getStandardCompressionNode() {
 
         IIOMetadataNode compression = new IIOMetadataNode("Compression");
@@ -980,6 +984,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
         return compression;
     }
 
+    @Override
     protected IIOMetadataNode getStandardDimensionNode() {
         // If we have a JFIF marker segment, we know a little
         // otherwise all we know is the orientation, which is always normal
@@ -1055,6 +1060,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
         return doc;
     }
 
+    @Override
     protected IIOMetadataNode getStandardTextNode() {
         IIOMetadataNode text = null;
         // Add a text entry for each COM Marker Segment
@@ -1073,6 +1079,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
         return text;
     }
 
+    @Override
     protected IIOMetadataNode getStandardTransparencyNode() {
         IIOMetadataNode trans = null;
         if (hasAlpha == true) {
@@ -1086,10 +1093,12 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
 
     // Editing
 
+    @Override
     public boolean isReadOnly() {
         return false;
     }
 
+    @Override
     public void mergeTree(String formatName, Node root)
         throws IIOInvalidTreeException {
         if (formatName == null) {
@@ -2160,6 +2169,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
     }
 
 
+    @Override
     public void setFromTree(String formatName, Node root)
         throws IIOInvalidTreeException {
         if (formatName == null) {
@@ -2404,6 +2414,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
 
     //// End of writer support
 
+    @Override
     public void reset() {
         if (resetSequence != null) {  // Otherwise no need to reset
             markerSequence = resetSequence;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java
index 475cc36359e..53b30f333f0 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,6 +123,7 @@ abstract class JPEGMetadataFormat extends IIOMetadataFormatImpl {
         addObjectValue("unknown", byte[].class, 1, MAX_JPEG_DATA_SIZE);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         // Just check if it appears in the format
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java
index ea6d2b70138..5e29101e83b 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ public class JPEGStreamMetadataFormatResources
 
     public JPEGStreamMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         // return a copy of commonContents; in theory we want a deep clone
         // of commonContents, but since it only contains (immutable) Strings,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java
index f4ba27b0fcd..74bf598c4d5 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java
@@ -110,6 +110,7 @@ class MarkerSegment implements Cloneable {
     /**
      * Deep copy of data array.
      */
+    @Override
     protected Object clone() {
         MarkerSegment newGuy = null;
         try {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
index e5b7e861924..fa7acba3325 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,7 @@ class SOFMarkerSegment extends MarkerSegment {
         updateFromNativeNode(node, true);
     }
 
+    @Override
     protected Object clone() {
         SOFMarkerSegment newGuy = (SOFMarkerSegment) super.clone();
         if (componentSpecs != null) {
@@ -107,6 +108,7 @@ class SOFMarkerSegment extends MarkerSegment {
         return newGuy;
     }
 
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("sof");
         node.setAttribute("process", Integer.toString(tag-JPEG.SOF0));
@@ -154,10 +156,12 @@ class SOFMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         // We don't write SOF segments; the IJG library does.
     }
 
+    @Override
     void print () {
         printTag("SOF");
         System.out.print("Sample precision: ");
@@ -231,6 +235,7 @@ class SOFMarkerSegment extends MarkerSegment {
                                                0, 3, true);
         }
 
+        @Override
         protected Object clone() {
             try {
                 return super.clone();
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java
index f40acdd0375..a34fc43486a 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,6 +89,7 @@ class SOSMarkerSegment extends MarkerSegment {
         updateFromNativeNode(node, true);
     }
 
+    @Override
     protected Object clone () {
         SOSMarkerSegment newGuy = (SOSMarkerSegment) super.clone();
         if (componentSpecs != null) {
@@ -101,6 +102,7 @@ class SOSMarkerSegment extends MarkerSegment {
         return newGuy;
     }
 
+    @Override
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("sos");
         node.setAttribute("numScanComponents",
@@ -152,10 +154,12 @@ class SOSMarkerSegment extends MarkerSegment {
      * Writes the data for this segment to the stream in
      * valid JPEG format.
      */
+    @Override
     void write(ImageOutputStream ios) throws IOException {
         // We don't write SOS segments; the IJG library does.
     }
 
+    @Override
     void print () {
         printTag("SOS");
         System.out.print("Start spectral selection: ");
@@ -208,6 +212,7 @@ class SOSMarkerSegment extends MarkerSegment {
                                             0, 3, true);
         }
 
+        @Override
         protected Object clone() {
             try {
                 return super.clone();
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
index 60105e30f8a..bf0576ecb74 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,10 +70,12 @@ public class PNGImageReaderSpi extends ImageReaderSpi {
               );
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard PNG image reader";
     }
 
+    @Override
     public boolean canDecodeInput(Object input) throws IOException {
         if (!(input instanceof ImageInputStream)) {
             return false;
@@ -96,6 +98,7 @@ public class PNGImageReaderSpi extends ImageReaderSpi {
                 b[7] == (byte)10);
     }
 
+    @Override
     public ImageReader createReaderInstance(Object extension) {
         return new PNGImageReader(this);
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
index 44080a05a16..3ce07aa4ba5 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,7 @@ public class PNGImageWriterSpi extends ImageWriterSpi {
                 );
     }
 
+    @Override
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         SampleModel sampleModel = type.getSampleModel();
         ColorModel colorModel = type.getColorModel();
@@ -116,10 +117,12 @@ public class PNGImageWriterSpi extends ImageWriterSpi {
         return true;
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard PNG image writer";
     }
 
+    @Override
     public ImageWriter createWriterInstance(Object extension) {
         return new PNGImageWriter(this);
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
index 03d00f7ae8e..730294c9f01 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -463,6 +463,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         IHDR_present = true;
     }
 
+    @Override
     public boolean isReadOnly() {
         return false;
     }
@@ -480,6 +481,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
     }
 
     // Deep clone
+    @Override
     public Object clone() {
         PNGMetadata metadata;
         try {
@@ -495,6 +497,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return metadata;
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName.equals(nativeMetadataFormatName)) {
             return getNativeTree();
@@ -847,6 +850,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return numChannels;
     }
 
+    @Override
     public IIOMetadataNode getStandardChromaNode() {
         IIOMetadataNode chroma_node = new IIOMetadataNode("Chroma");
         IIOMetadataNode node = null; // scratch node
@@ -919,6 +923,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return chroma_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardCompressionNode() {
         IIOMetadataNode compression_node = new IIOMetadataNode("Compression");
         IIOMetadataNode node = null; // scratch node
@@ -952,6 +957,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return sb.toString();
     }
 
+    @Override
     public IIOMetadataNode getStandardDataNode() {
         IIOMetadataNode data_node = new IIOMetadataNode("Data");
         IIOMetadataNode node = null; // scratch node
@@ -998,6 +1004,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return data_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDimensionNode() {
         IIOMetadataNode dimension_node = new IIOMetadataNode("Dimension");
         IIOMetadataNode node = null; // scratch node
@@ -1027,6 +1034,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return dimension_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDocumentNode() {
         IIOMetadataNode document_node = null;
 
@@ -1067,6 +1075,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return document_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardTextNode() {
         int numEntries = tEXt_keyword.size() +
             iTXt_keyword.size() + zTXt_keyword.size();
@@ -1114,6 +1123,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
         return text_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardTransparencyNode() {
         IIOMetadataNode transparency_node =
             new IIOMetadataNode("Transparency");
@@ -1285,6 +1295,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
             return getAttribute(node, name, null, true);
     }
 
+    @Override
     public void mergeTree(String formatName, Node root)
         throws IIOInvalidTreeException {
         if (formatName.equals(nativeMetadataFormatName)) {
@@ -2267,6 +2278,7 @@ public class PNGMetadata extends IIOMetadata implements Cloneable {
     }
 
     // Reset all instance variables to their initial state
+    @Override
     public void reset() {
         IHDR_present = false;
         PLTE_present = false;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
index b7d96dc3f2b..1518d097903 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -486,6 +486,7 @@ public class PNGMetadataFormat extends IIOMetadataFormatImpl {
         addObjectValue("UnknownChunk", byte.class, 0, Integer.MAX_VALUE);
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return true;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
index d99946bd890..818a2364e23 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class PNGMetadataFormatResources extends ListResourceBundle {
 
     public PNGMetadataFormatResources() {}
 
+    @Override
     protected Object[][] getContents() {
         return new Object[][] {
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java
index d5adb4e8d35..31806941e35 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,6 +335,7 @@ public abstract class TIFFBaseJPEGCompressor extends TIFFCompressor {
         return JPEGImageMetadata;
     }
 
+    @Override
     public final int encode(byte[] b, int off,
             int width, int height,
             int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java
index bc20c57da69..dbddc94516e 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCIELabColorConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@ public class TIFFCIELabColorConverter extends TIFFColorConverter {
         }
     }
 
+    @Override
     public void fromRGB(float r, float g, float b, float[] result) {
         float X =  0.412453f*r + 0.357580f*g + 0.180423f*b;
         float Y =  0.212671f*r + 0.715160f*g + 0.072169f*b;
@@ -100,6 +101,7 @@ public class TIFFCIELabColorConverter extends TIFFColorConverter {
         result[2] = clamp2(bStar);
     }
 
+    @Override
     public void toRGB(float x0, float x1, float x2, float[] rgb) {
         float LStar = x0*100.0f/255.0f;
         float aStar = (x1 > 128.0f) ? (x1 - 256.0f) : x1;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java
index 1ce7d56c1c7..5ade4bacfb4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflateDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@ public class TIFFDeflateDecompressor extends TIFFDecompressor {
         this.predictor = predictor;
     }
 
+    @Override
     public synchronized void decodeRaw(byte[] b,
                                        int dstOffset,
                                        int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java
index 0fde32a229f..3a5a10245df 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDeflater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@ public class TIFFDeflater extends TIFFCompressor {
         this.deflater = new Deflater(deflateLevel);
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java
index 3541ce110db..992cba6cbe5 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ public class TIFFExifJPEGCompressor extends TIFFBaseJPEGCompressor {
               param);
     }
 
+    @Override
     public void setMetadata(IIOMetadata metadata) {
         // Set the metadata.
         super.setMetadata(metadata);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java
index 5c126acab53..2af59c682c4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -242,6 +242,7 @@ abstract class TIFFFaxCompressor extends TIFFCompressor {
      *
      * @see #getMetadata()
      */
+    @Override
     public void setMetadata(IIOMetadata metadata) {
         super.setMetadata(metadata);
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java
index a1947dc6b72..64839c033da 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -591,6 +591,7 @@ class TIFFFaxDecompressor extends TIFFDecompressor {
      * Invokes the superclass method and then sets instance variables on
      * the basis of the metadata set on this decompressor.
      */
+    @Override
     public void beginDecoding() {
         super.beginDecoding();
 
@@ -627,6 +628,7 @@ class TIFFFaxDecompressor extends TIFFDecompressor {
         }
     }
 
+    @Override
     public void decodeRaw(byte[] b, int dstOffset,
                           int pixelBitStride, // will always be 1
                           int scanlineStride) throws IOException {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java
index 6f23fbad4f2..e8878d93315 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,6 +162,7 @@ public class TIFFFieldNode extends IIOMetadataNode {
 
     // Need to override this method to avoid a stack overflow exception
     // which will occur if super.appendChild is called from initialize().
+    @Override
     public Node appendChild(Node newChild) {
         if (newChild == null) {
             throw new NullPointerException("newChild == null!");
@@ -172,53 +173,63 @@ public class TIFFFieldNode extends IIOMetadataNode {
 
     // Override all methods which refer to child nodes.
 
+    @Override
     public boolean hasChildNodes() {
         initialize();
         return super.hasChildNodes();
     }
 
+    @Override
     public int getLength() {
         initialize();
         return super.getLength();
     }
 
+    @Override
     public Node getFirstChild() {
         initialize();
         return super.getFirstChild();
     }
 
+    @Override
     public Node getLastChild() {
         initialize();
         return super.getLastChild();
     }
 
+    @Override
     public Node getPreviousSibling() {
         initialize();
         return super.getPreviousSibling();
     }
 
+    @Override
     public Node getNextSibling() {
         initialize();
         return super.getNextSibling();
     }
 
+    @Override
     public Node insertBefore(Node newChild,
                              Node refChild) {
         initialize();
         return super.insertBefore(newChild, refChild);
     }
 
+    @Override
     public Node replaceChild(Node newChild,
                              Node oldChild) {
         initialize();
         return super.replaceChild(newChild, oldChild);
     }
 
+    @Override
     public Node removeChild(Node oldChild) {
         initialize();
         return super.removeChild(oldChild);
     }
 
+    @Override
     public Node cloneNode(boolean deep) {
         initialize();
         return super.cloneNode(deep);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java
index 82ae068d7e4..a3cf39505e6 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         rootIFD.addTIFFField(field);
     }
 
+    @Override
     public boolean isReadOnly() {
         return false;
     }
@@ -149,6 +150,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         return IFDRoot;
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName.equals(nativeMetadataFormatName)) {
             return getNativeTree();
@@ -181,6 +183,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         "Lab", // ICCLab
     };
 
+    @Override
     public IIOMetadataNode getStandardChromaNode() {
         IIOMetadataNode chroma_node = new IIOMetadataNode("Chroma");
         IIOMetadataNode node = null; // scratch node
@@ -278,6 +281,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         return chroma_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardCompressionNode() {
         IIOMetadataNode compression_node = new IIOMetadataNode("Compression");
         IIOMetadataNode node = null; // scratch node
@@ -336,6 +340,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         return sb.toString();
     }
 
+    @Override
     public IIOMetadataNode getStandardDataNode() {
         IIOMetadataNode data_node = new IIOMetadataNode("Data");
         IIOMetadataNode node = null; // scratch node
@@ -476,6 +481,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         "Rotate90",
     };
 
+    @Override
     public IIOMetadataNode getStandardDimensionNode() {
         IIOMetadataNode dimension_node = new IIOMetadataNode("Dimension");
         IIOMetadataNode node = null; // scratch node
@@ -604,6 +610,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         return dimension_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardDocumentNode() {
         IIOMetadataNode document_node = new IIOMetadataNode("Document");
         IIOMetadataNode node = null; // scratch node
@@ -669,6 +676,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         return document_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardTextNode() {
         IIOMetadataNode text_node = null;
         IIOMetadataNode node = null; // scratch node
@@ -705,6 +713,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         return text_node;
     }
 
+    @Override
     public IIOMetadataNode getStandardTransparencyNode() {
         IIOMetadataNode transparency_node =
             new IIOMetadataNode("Transparency");
@@ -1579,6 +1588,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         }
     }
 
+    @Override
     public void mergeTree(String formatName, Node root)
         throws IIOInvalidTreeException{
         if (formatName.equals(nativeMetadataFormatName)) {
@@ -1597,6 +1607,7 @@ public class TIFFImageMetadata extends IIOMetadata {
         }
     }
 
+    @Override
     public void reset() {
         rootIFD = new TIFFIFD(tagSets);
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java
index 59c425ec517..edfa3a5be9c 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ public class TIFFImageMetadataFormat extends TIFFMetadataFormat {
     static {
     }
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return false;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java
index 070836e8854..59e68d0dfe2 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,7 @@ public class TIFFImageMetadataFormatResources extends ListResourceBundle {
     public TIFFImageMetadataFormatResources() {
     }
 
+    @Override
     public Object[][] getContents() {
         return contents.clone();
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java
index 2332e4be2d1..ef21e0b2042 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,10 +56,12 @@ public class TIFFImageReaderSpi extends ImageReaderSpi {
               );
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard TIFF image reader";
     }
 
+    @Override
     public boolean canDecodeInput(Object input) throws IOException {
         if (!(input instanceof ImageInputStream)) {
             return false;
@@ -78,10 +80,12 @@ public class TIFFImageReaderSpi extends ImageReaderSpi {
                  b[2] == (byte)0x00 && b[3] == (byte)0x2a));
     }
 
+    @Override
     public ImageReader createReaderInstance(Object extension) {
         return new TIFFImageReader(this);
     }
 
+    @Override
     public void onRegistration(ServiceRegistry registry,
                                Class<?> category) {
         if (registered) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java
index 0b93cbedc0b..a742db6f6bb 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriterSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,18 +55,22 @@ public class TIFFImageWriterSpi extends ImageWriterSpi {
               );
     }
 
+    @Override
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         return true;
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard TIFF image writer";
     }
 
+    @Override
     public ImageWriter createWriterInstance(Object extension) {
         return new TIFFImageWriter(this);
     }
 
+    @Override
     public void onRegistration(ServiceRegistry registry,
                                Class<?> category) {
         if (registered) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java
index f524f34e32e..e73ccb2b282 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@ public class TIFFJPEGCompressor extends TIFFBaseJPEGCompressor {
     private static class JPEGSPIFilter implements ServiceRegistry.Filter {
         JPEGSPIFilter() {}
 
+        @Override
         public boolean filter(Object provider) {
             ImageReaderSpi readerSPI = (ImageReaderSpi)provider;
 
@@ -112,6 +113,7 @@ public class TIFFJPEGCompressor extends TIFFBaseJPEGCompressor {
      *
      * @see #getMetadata()
      */
+    @Override
     public void setMetadata(IIOMetadata metadata) {
         super.setMetadata(metadata);
 
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java
index 3c2ce905958..7353ccea56f 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@ public class TIFFJPEGDecompressor extends TIFFDecompressor {
 
     public TIFFJPEGDecompressor() {}
 
+    @Override
     public void beginDecoding() {
         // Initialize the JPEG reader if needed.
         if(this.JPEGReader == null) {
@@ -90,6 +91,7 @@ public class TIFFJPEGDecompressor extends TIFFDecompressor {
         }
     }
 
+    @Override
     public void decodeRaw(byte[] b,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java
index b7bceb89ae4..5052ffedbff 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ public class TIFFLSBCompressor extends TIFFCompressor {
         super("", BaselineTIFFTagSet.COMPRESSION_NONE, true);
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java
index d871b6a3e86..6724b779334 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLSBDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ public class TIFFLSBDecompressor extends TIFFDecompressor {
 
     public TIFFLSBDecompressor() {}
 
+    @Override
     public void decodeRaw(byte[] b,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java
index 4b2b945acb7..6780d65053f 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,10 +41,12 @@ public class TIFFLZWCompressor extends TIFFCompressor {
         this.predictor = predictorValue;
     }
 
+    @Override
     public void setStream(ImageOutputStream stream) {
         super.setStream(stream);
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java
index fc682589ce2..dcf5b2a7f71 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,7 @@ class TIFFLZWDecompressor extends TIFFDecompressor {
         flipBits = fillOrder == BaselineTIFFTagSet.FILL_ORDER_RIGHT_TO_LEFT;
     }
 
+    @Override
     public void decodeRaw(byte[] b,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java
index 1091cab9bb2..92d15bfdcb4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
     protected String resourceBaseName;
     protected String rootName;
 
+    @Override
     public String getRootName() {
         return rootName;
     }
@@ -85,16 +86,19 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info;
     }
 
+    @Override
     public int getElementMinChildren(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         return info.minChildren;
     }
 
+    @Override
     public int getElementMaxChildren(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         return info.maxChildren;
     }
 
+    @Override
     public String getElementDescription(String elementName, Locale locale) {
         if (!elementInfoMap.containsKey(elementName)) {
             throw new IllegalArgumentException("No such element: " +
@@ -103,64 +107,77 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return getResource(elementName, locale);
     }
 
+    @Override
     public int getChildPolicy(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         return info.childPolicy;
     }
 
+    @Override
     public String[] getChildNames(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         return info.childNames;
     }
 
+    @Override
     public String[] getAttributeNames(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         return info.attributeNames;
     }
 
+    @Override
     public int getAttributeValueType(String elementName, String attrName) {
         TIFFAttrInfo info = getAttrInfo(elementName, attrName);
         return info.valueType;
     }
 
+    @Override
     public int getAttributeDataType(String elementName, String attrName) {
         TIFFAttrInfo info = getAttrInfo(elementName, attrName);
         return info.dataType;
     }
 
+    @Override
     public boolean isAttributeRequired(String elementName, String attrName) {
         TIFFAttrInfo info = getAttrInfo(elementName, attrName);
         return info.isRequired;
     }
 
+    @Override
     public String getAttributeDefaultValue(String elementName,
                                            String attrName) {
         return null;
     }
 
+    @Override
     public String[] getAttributeEnumerations(String elementName,
                                              String attrName) {
         throw new IllegalArgumentException("The attribute is not an enumeration.");
     }
 
+    @Override
     public String getAttributeMinValue(String elementName, String attrName) {
         throw new IllegalArgumentException("The attribute is not a range.");
     }
 
+    @Override
     public String getAttributeMaxValue(String elementName, String attrName) {
         throw new IllegalArgumentException("The attribute is not a range.");
     }
 
+    @Override
     public int getAttributeListMinLength(String elementName, String attrName) {
         TIFFAttrInfo info = getAttrInfo(elementName, attrName);
         return info.listMinLength;
     }
 
+    @Override
     public int getAttributeListMaxLength(String elementName, String attrName) {
         TIFFAttrInfo info = getAttrInfo(elementName, attrName);
         return info.listMaxLength;
     }
 
+    @Override
     public String getAttributeDescription(String elementName, String attrName,
                                           Locale locale) {
         String key = elementName + "/" + attrName;
@@ -170,11 +187,13 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return getResource(key, locale);
     }
 
+    @Override
     public int getObjectValueType(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         return info.objectValueType;
     }
 
+    @Override
     public Class<?> getObjectClass(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
@@ -184,6 +203,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info.objectClass;
     }
 
+    @Override
     public Object getObjectDefaultValue(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
@@ -193,6 +213,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info.objectDefaultValue;
     }
 
+    @Override
     public Object[] getObjectEnumerations(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
@@ -202,6 +223,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info.objectEnumerations;
     }
 
+    @Override
     public Comparable<Object> getObjectMinValue(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
@@ -211,6 +233,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info.objectMinValue;
     }
 
+    @Override
     public Comparable<Object> getObjectMaxValue(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
@@ -220,6 +243,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info.objectMaxValue;
     }
 
+    @Override
     public int getObjectArrayMinLength(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
@@ -229,6 +253,7 @@ public abstract class TIFFMetadataFormat implements IIOMetadataFormat {
         return info.objectArrayMinLength;
     }
 
+    @Override
     public int getObjectArrayMaxLength(String elementName) {
         TIFFElementInfo info = getElementInfo(elementName);
         if (info.objectValueType == VALUE_NONE) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java
index fc366f791f7..8f6428035d9 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ public class TIFFNullCompressor extends TIFFCompressor {
         super("", BaselineTIFFTagSet.COMPRESSION_NONE, true);
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java
index 9b5a746eec1..b73580ef823 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@ public class TIFFNullDecompressor extends TIFFDecompressor {
     // change beginDecoding() and decode() to use the active region values
     // when random access is easy and the entire region values otherwise.
     //
+    @Override
     public void beginDecoding() {
         // Determine number of bits per pixel.
         int bitsPerPixel = 0;
@@ -89,6 +90,7 @@ public class TIFFNullDecompressor extends TIFFDecompressor {
         super.beginDecoding();
     }
 
+    @Override
     public void decode() throws IOException {
         super.decode();
 
@@ -105,6 +107,7 @@ public class TIFFNullDecompressor extends TIFFDecompressor {
         }
     }
 
+    @Override
     public void decodeRaw(byte[] b,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java
index 2935ca5caf8..77594ea8086 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -545,6 +545,7 @@ public class TIFFOldJPEGDecompressor extends TIFFJPEGDecompressor {
     // The strategy for cases 4-5 is to concatenate a tables stream created
     // in initialize() with the entropy coded data in each strip or tile.
     //
+    @Override
     public void decodeRaw(byte[] b,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java
index 119e4ad4906..b2341f12ed7 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsCompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,7 @@ public class TIFFPackBitsCompressor extends TIFFCompressor {
         return outOffset;
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java
index 0a5dfe8308e..61026f57fed 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,6 +72,7 @@ public class TIFFPackBitsDecompressor extends TIFFDecompressor {
         return dstIndex - dstOffset;
     }
 
+    @Override
     public void decodeRaw(byte[] b,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java
index 0bf59da81da..1e0270c6ecc 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,6 +87,7 @@ public class TIFFRLECompressor extends TIFFFaxCompressor {
         return outIndex;
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java
index 77e0c9a109c..dadabac3d68 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,74 +130,92 @@ public class TIFFRenderedImage implements RenderedImage {
         return newParam;
     }
 
+    @Override
     public Vector<RenderedImage> getSources() {
         return null;
     }
 
+    @Override
     public Object getProperty(String name) {
         return java.awt.Image.UndefinedProperty;
     }
 
+    @Override
     public String[] getPropertyNames() {
         return null;
     }
 
+    @Override
     public ColorModel getColorModel() {
         return its.getColorModel();
     }
 
+    @Override
     public SampleModel getSampleModel() {
         return its.getSampleModel();
     }
 
+    @Override
     public int getWidth() {
         return width;
     }
 
+    @Override
     public int getHeight() {
         return height;
     }
 
+    @Override
     public int getMinX() {
         return 0;
     }
 
+    @Override
     public int getMinY() {
         return 0;
     }
 
+    @Override
     public int getNumXTiles() {
         return (width + tileWidth - 1)/tileWidth;
     }
 
+    @Override
     public int getNumYTiles() {
         return (height + tileHeight - 1)/tileHeight;
     }
 
+    @Override
     public int getMinTileX() {
         return 0;
     }
 
+    @Override
     public int getMinTileY() {
         return 0;
     }
 
+    @Override
     public int getTileWidth() {
         return tileWidth;
     }
 
+    @Override
     public int getTileHeight() {
         return tileHeight;
     }
 
+    @Override
     public int getTileGridXOffset() {
         return 0;
     }
 
+    @Override
     public int getTileGridYOffset() {
         return 0;
     }
 
+    @Override
     public Raster getTile(int tileX, int tileY) {
         Rectangle tileRect = new Rectangle(tileX*tileWidth,
                                            tileY*tileHeight,
@@ -206,10 +224,12 @@ public class TIFFRenderedImage implements RenderedImage {
         return getData(tileRect);
     }
 
+    @Override
     public Raster getData() {
         return read(new Rectangle(0, 0, getWidth(), getHeight()));
     }
 
+    @Override
     public Raster getData(Rectangle rect) {
         return read(rect);
     }
@@ -236,6 +256,7 @@ public class TIFFRenderedImage implements RenderedImage {
         }
     }
 
+    @Override
     public WritableRaster copyData(WritableRaster raster) {
         if (raster == null) {
             return read(new Rectangle(0, 0, getWidth(), getHeight()));
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java
index 96592cc62fb..ac9398fd6e9 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@ public class TIFFStreamMetadata extends IIOMetadata {
               null, null);
     }
 
+    @Override
     public boolean isReadOnly() {
         return false;
     }
@@ -64,6 +65,7 @@ public class TIFFStreamMetadata extends IIOMetadata {
         throw new IIOInvalidTreeException(reason, node);
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         IIOMetadataNode root = new IIOMetadataNode(nativeMetadataFormatName);
 
@@ -103,6 +105,7 @@ public class TIFFStreamMetadata extends IIOMetadata {
         }
     }
 
+    @Override
     public void mergeTree(String formatName, Node root)
         throws IIOInvalidTreeException {
         if (formatName.equals(nativeMetadataFormatName)) {
@@ -115,6 +118,7 @@ public class TIFFStreamMetadata extends IIOMetadata {
         }
     }
 
+    @Override
     public void reset() {
         this.byteOrder = ByteOrder.BIG_ENDIAN;
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java
index bf35133811e..50a3d32e239 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ public class TIFFStreamMetadataFormat extends TIFFMetadataFormat {
 
     private static TIFFStreamMetadataFormat theInstance = null;
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return false;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java
index 1e0ea272200..75977c15a41 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFStreamMetadataFormatResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ public class TIFFStreamMetadataFormatResources extends ListResourceBundle {
     public TIFFStreamMetadataFormatResources() {
     }
 
+    @Override
     public Object[][] getContents() {
         return contents.clone();
     }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java
index 55088e34dfe..99d45ce4866 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ public class TIFFT4Compressor extends TIFFFaxCompressor {
      *
      * @see #getMetadata()
      */
+    @Override
     public void setMetadata(IIOMetadata metadata) {
         super.setMetadata(metadata);
 
@@ -214,6 +215,7 @@ public class TIFFT4Compressor extends TIFFFaxCompressor {
         return outIndex;
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java
index 517c23bde54..7e2625d87e2 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -146,6 +146,7 @@ public class TIFFT6Compressor extends TIFFFaxCompressor {
         return outIndex;
     }
 
+    @Override
     public int encode(byte[] b, int off,
                       int width, int height,
                       int[] bitsPerSample,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java
index a006a3a1e38..b5dae8a9298 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrColorConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,6 +80,7 @@ public class TIFFYCbCrColorConverter extends TIFFColorConverter {
                 / CodingRange) + ReferenceBlack;
 
      */
+    @Override
     public void fromRGB(float r, float g, float b, float[] result) {
         // Convert RGB to full-range YCbCr.
         float Y = (lumaRed*r + lumaGreen*g + lumaBlue*b);
@@ -95,6 +96,7 @@ public class TIFFYCbCrColorConverter extends TIFFColorConverter {
             referenceBlackCr;
     }
 
+    @Override
     public void toRGB(float x0, float x1, float x2, float[] rgb) {
         // Convert YCbCr code to full-range YCbCr.
         float Y = (x0 - referenceBlackY)*CODING_RANGE_Y/
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java
index 0f10904cab4..c0623885d34 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
     // "Chained" decompressor methods.
     //
 
+    @Override
     public void setReader(ImageReader reader) {
         if(decompressor != null) {
             decompressor.setReader(reader);
@@ -102,6 +103,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setReader(reader);
     }
 
+    @Override
     public void setMetadata(IIOMetadata metadata) {
         if(decompressor != null) {
             decompressor.setMetadata(metadata);
@@ -109,6 +111,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setMetadata(metadata);
     }
 
+    @Override
     public void setPhotometricInterpretation(int photometricInterpretation) {
         if(decompressor != null) {
             decompressor.setPhotometricInterpretation(photometricInterpretation);
@@ -116,6 +119,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setPhotometricInterpretation(photometricInterpretation);
     }
 
+    @Override
     public void setCompression(int compression) {
         if(decompressor != null) {
             decompressor.setCompression(compression);
@@ -123,6 +127,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setCompression(compression);
     }
 
+    @Override
     public void setPlanar(boolean planar) {
         if(decompressor != null) {
             decompressor.setPlanar(planar);
@@ -130,6 +135,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setPlanar(planar);
     }
 
+    @Override
     public void setSamplesPerPixel(int samplesPerPixel) {
         if(decompressor != null) {
             decompressor.setSamplesPerPixel(samplesPerPixel);
@@ -137,6 +143,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSamplesPerPixel(samplesPerPixel);
     }
 
+    @Override
     public void setBitsPerSample(int[] bitsPerSample) {
         if(decompressor != null) {
             decompressor.setBitsPerSample(bitsPerSample);
@@ -144,6 +151,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setBitsPerSample(bitsPerSample);
     }
 
+    @Override
     public void setSampleFormat(int[] sampleFormat) {
         if(decompressor != null) {
             decompressor.setSampleFormat(sampleFormat);
@@ -151,6 +159,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSampleFormat(sampleFormat);
     }
 
+    @Override
     public void setExtraSamples(int[] extraSamples) {
         if(decompressor != null) {
             decompressor.setExtraSamples(extraSamples);
@@ -158,6 +167,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setExtraSamples(extraSamples);
     }
 
+    @Override
     public void setColorMap(char[] colorMap) {
         if(decompressor != null) {
             decompressor.setColorMap(colorMap);
@@ -165,6 +175,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setColorMap(colorMap);
     }
 
+    @Override
     public void setStream(ImageInputStream stream) {
         if(decompressor != null) {
             decompressor.setStream(stream);
@@ -173,6 +184,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         }
     }
 
+    @Override
     public void setOffset(long offset) {
         if(decompressor != null) {
             decompressor.setOffset(offset);
@@ -180,6 +192,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setOffset(offset);
     }
 
+    @Override
     public void setByteCount(int byteCount) throws IOException {
         if(decompressor != null) {
             decompressor.setByteCount(byteCount);
@@ -187,6 +200,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setByteCount(byteCount);
     }
 
+    @Override
     public void setSrcMinX(int srcMinX) {
         if(decompressor != null) {
             decompressor.setSrcMinX(srcMinX);
@@ -194,6 +208,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSrcMinX(srcMinX);
     }
 
+    @Override
     public void setSrcMinY(int srcMinY) {
         if(decompressor != null) {
             decompressor.setSrcMinY(srcMinY);
@@ -201,6 +216,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSrcMinY(srcMinY);
     }
 
+    @Override
     public void setSrcWidth(int srcWidth) {
         if(decompressor != null) {
             decompressor.setSrcWidth(srcWidth);
@@ -208,6 +224,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSrcWidth(srcWidth);
     }
 
+    @Override
     public void setSrcHeight(int srcHeight) {
         if(decompressor != null) {
             decompressor.setSrcHeight(srcHeight);
@@ -215,6 +232,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSrcHeight(srcHeight);
     }
 
+    @Override
     public void setSourceXOffset(int sourceXOffset) {
         if(decompressor != null) {
             decompressor.setSourceXOffset(sourceXOffset);
@@ -222,6 +240,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSourceXOffset(sourceXOffset);
     }
 
+    @Override
     public void setDstXOffset(int dstXOffset) {
         if(decompressor != null) {
             decompressor.setDstXOffset(dstXOffset);
@@ -229,6 +248,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setDstXOffset(dstXOffset);
     }
 
+    @Override
     public void setSourceYOffset(int sourceYOffset) {
         if(decompressor != null) {
             decompressor.setSourceYOffset(sourceYOffset);
@@ -236,6 +256,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSourceYOffset(sourceYOffset);
     }
 
+    @Override
     public void setDstYOffset(int dstYOffset) {
         if(decompressor != null) {
             decompressor.setDstYOffset(dstYOffset);
@@ -260,6 +281,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
     }
     */
 
+    @Override
     public void setSourceBands(int[] sourceBands) {
         if(decompressor != null) {
             decompressor.setSourceBands(sourceBands);
@@ -267,6 +289,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setSourceBands(sourceBands);
     }
 
+    @Override
     public void setDestinationBands(int[] destinationBands) {
         if(decompressor != null) {
             decompressor.setDestinationBands(destinationBands);
@@ -274,6 +297,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setDestinationBands(destinationBands);
     }
 
+    @Override
     public void setImage(BufferedImage image) {
         if(decompressor != null) {
             ColorModel cm = image.getColorModel();
@@ -287,6 +311,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setImage(image);
     }
 
+    @Override
     public void setDstMinX(int dstMinX) {
         if(decompressor != null) {
             decompressor.setDstMinX(dstMinX);
@@ -294,6 +319,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setDstMinX(dstMinX);
     }
 
+    @Override
     public void setDstMinY(int dstMinY) {
         if(decompressor != null) {
             decompressor.setDstMinY(dstMinY);
@@ -301,6 +327,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setDstMinY(dstMinY);
     }
 
+    @Override
     public void setDstWidth(int dstWidth) {
         if(decompressor != null) {
             decompressor.setDstWidth(dstWidth);
@@ -308,6 +335,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setDstWidth(dstWidth);
     }
 
+    @Override
     public void setDstHeight(int dstHeight) {
         if(decompressor != null) {
             decompressor.setDstHeight(dstHeight);
@@ -315,6 +343,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setDstHeight(dstHeight);
     }
 
+    @Override
     public void setActiveSrcMinX(int activeSrcMinX) {
         if(decompressor != null) {
             decompressor.setActiveSrcMinX(activeSrcMinX);
@@ -322,6 +351,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setActiveSrcMinX(activeSrcMinX);
     }
 
+    @Override
     public void setActiveSrcMinY(int activeSrcMinY) {
         if(decompressor != null) {
             decompressor.setActiveSrcMinY(activeSrcMinY);
@@ -329,6 +359,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setActiveSrcMinY(activeSrcMinY);
     }
 
+    @Override
     public void setActiveSrcWidth(int activeSrcWidth) {
         if(decompressor != null) {
             decompressor.setActiveSrcWidth(activeSrcWidth);
@@ -336,6 +367,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         super.setActiveSrcWidth(activeSrcWidth);
     }
 
+    @Override
     public void setActiveSrcHeight(int activeSrcHeight) {
         if(decompressor != null) {
             decompressor.setActiveSrcHeight(activeSrcHeight);
@@ -353,6 +385,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         }
     }
 
+    @Override
     public void beginDecoding() {
         if(decompressor != null) {
             decompressor.beginDecoding();
@@ -445,6 +478,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor {
         }
     }
 
+    @Override
     public void decodeRaw(byte[] buf,
                           int dstOffset,
                           int bitsPerPixel,
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
index acff45d5b72..9cd967140c9 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,7 @@ public class WBMPImageReaderSpi extends ImageReaderSpi {
               null, null);
     }
 
+    @Override
     public void onRegistration(ServiceRegistry registry,
                                Class<?> category) {
         if (registered) {
@@ -71,10 +72,12 @@ public class WBMPImageReaderSpi extends ImageReaderSpi {
         registered = true;
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard WBMP Image Reader";
     }
 
+    @Override
     public boolean canDecodeInput(Object source) throws IOException {
         if (!(source instanceof ImageInputStream)) {
             return false;
@@ -149,6 +152,7 @@ public class WBMPImageReaderSpi extends ImageReaderSpi {
         return result;
     }
 
+    @Override
     public ImageReader createReaderInstance(Object extension)
         throws IIOException {
         return new WBMPImageReader(this);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
index be2f2d96a38..d6d723c0110 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,10 +63,12 @@ public class WBMPImageWriterSpi extends ImageWriterSpi {
               null, null, null, null);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Standard WBMP Image Writer";
     }
 
+    @Override
     public void onRegistration(ServiceRegistry registry,
                                Class<?> category) {
         if (registered) {
@@ -76,6 +78,7 @@ public class WBMPImageWriterSpi extends ImageWriterSpi {
         registered = true;
     }
 
+    @Override
     public boolean canEncodeImage(ImageTypeSpecifier type) {
         SampleModel sm = type.getSampleModel();
         if (!(sm instanceof MultiPixelPackedSampleModel))
@@ -86,6 +89,7 @@ public class WBMPImageWriterSpi extends ImageWriterSpi {
         return true;
     }
 
+    @Override
     public ImageWriter createWriterInstance(Object extension)
         throws IIOException {
         return new WBMPImageWriter(this);
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
index 3a13bcca94f..f3a63ff7b13 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,10 +50,12 @@ public class WBMPMetadata extends IIOMetadata {
               null, null);
     }
 
+    @Override
     public boolean isReadOnly() {
         return true;
     }
 
+    @Override
     public Node getAsTree(String formatName) {
         if (formatName.equals(nativeMetadataFormatName)) {
             return getNativeTree();
@@ -76,14 +78,17 @@ public class WBMPMetadata extends IIOMetadata {
         return root;
     }
 
+    @Override
     public void setFromTree(String formatName, Node root) {
         throw new IllegalStateException(I18N.getString("WBMPMetadata1"));
     }
 
+    @Override
     public void mergeTree(String formatName, Node root) {
         throw new IllegalStateException(I18N.getString("WBMPMetadata1"));
     }
 
+    @Override
     public void reset() {
         throw new IllegalStateException(I18N.getString("WBMPMetadata1"));
     }
@@ -101,6 +106,7 @@ public class WBMPMetadata extends IIOMetadata {
     }
 
 
+    @Override
     protected IIOMetadataNode getStandardChromaNode() {
 
         IIOMetadataNode node = new IIOMetadataNode("Chroma");
@@ -112,6 +118,7 @@ public class WBMPMetadata extends IIOMetadata {
     }
 
 
+    @Override
     protected IIOMetadataNode getStandardDimensionNode() {
         IIOMetadataNode dimension_node = new IIOMetadataNode("Dimension");
         IIOMetadataNode node = null; // scratch node
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
index 49bce89164a..0aabaa132a3 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@ public class WBMPMetadataFormat extends IIOMetadataFormatImpl {
 
 
 
+    @Override
     public boolean canNodeAppear(String elementName,
                                  ImageTypeSpecifier imageType) {
         return true;
diff --git a/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
index 81070ff1cb6..3b52fb2b0f0 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,10 +43,12 @@ public class FileImageInputStreamSpi extends ImageInputStreamSpi {
         super(vendorName, version, inputClass);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Service provider that instantiates a FileImageInputStream from a File";
     }
 
+    @Override
     public ImageInputStream createInputStreamInstance(Object input,
                                                       boolean useCache,
                                                       File cacheDir) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
index 1ca08005fa1..aa906197d37 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,10 +43,12 @@ public class FileImageOutputStreamSpi extends ImageOutputStreamSpi {
         super(vendorName, version, outputClass);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Service provider that instantiates a FileImageOutputStream from a File";
     }
 
+    @Override
     public ImageOutputStream createOutputStreamInstance(Object output,
                                                         boolean useCache,
                                                         File cacheDir) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
index 2591f77a697..266b09c6d9d 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,18 +46,22 @@ public class InputStreamImageInputStreamSpi extends ImageInputStreamSpi {
         super(vendorName, version, inputClass);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Service provider that instantiates a FileCacheImageInputStream or MemoryCacheImageInputStream from an InputStream";
     }
 
+    @Override
     public boolean canUseCacheFile() {
         return true;
     }
 
+    @Override
     public boolean needsCacheFile() {
         return false;
     }
 
+    @Override
     public ImageInputStream createInputStreamInstance(Object input,
                                                       boolean useCache,
                                                       File cacheDir)
diff --git a/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
index 391e00feb46..01c7df2145d 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,18 +46,22 @@ public class OutputStreamImageOutputStreamSpi extends ImageOutputStreamSpi {
         super(vendorName, version, outputClass);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Service provider that instantiates an OutputStreamImageOutputStream from an OutputStream";
     }
 
+    @Override
     public boolean canUseCacheFile() {
         return true;
     }
 
+    @Override
     public boolean needsCacheFile() {
         return false;
     }
 
+    @Override
     public ImageOutputStream createOutputStreamInstance(Object output,
                                                         boolean useCache,
                                                         File cacheDir)
diff --git a/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
index b5c5112c14e..43498b30dbf 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,10 +44,12 @@ public class RAFImageInputStreamSpi extends ImageInputStreamSpi {
         super(vendorName, version, inputClass);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Service provider that instantiates a FileImageInputStream from a RandomAccessFile";
     }
 
+    @Override
     public ImageInputStream createInputStreamInstance(Object input,
                                                       boolean useCache,
                                                       File cacheDir) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java b/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
index 373f8754f08..1fe6438b27d 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,10 +44,12 @@ public class RAFImageOutputStreamSpi extends ImageOutputStreamSpi {
         super(vendorName, version, outputClass);
     }
 
+    @Override
     public String getDescription(Locale locale) {
         return "Service provider that instantiates a FileImageOutputStream from a RandomAccessFile";
     }
 
+    @Override
     public ImageOutputStream createOutputStreamInstance(Object output,
                                                         boolean useCache,
                                                         File cacheDir) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java b/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
index 5ea52def657..370606ea08f 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ public class CloseableDisposerRecord implements DisposerRecord {
         this.closeable = closeable;
     }
 
+    @Override
     public synchronized void dispose() {
         if (closeable != null) {
             try {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
index 229c470335b..7de400ad199 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@ public class StreamCloser {
 
             if (streamCloser == null) {
                 final Runnable streamCloserRunnable = new Runnable() {
+                    @Override
                     public void run() {
                         if (toCloseQueue != null) {
                             synchronized (StreamCloser.class) {

From 70b4eb249eb4bad727f83e0b004a0ce481208726 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 28 Nov 2025 08:45:57 +0000
Subject: [PATCH 390/512] 8372720: Problem list
 compiler/arguments/TestCodeEntryAlignment.java

Reviewed-by: mchevalier, epeter
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 55a43663568..7b4026484ca 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -79,6 +79,8 @@ compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64
 
 serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java 8369150 generic-all
 
+compiler/arguments/TestCodeEntryAlignment.java 8372703 macosx-x64
+
 #############################################################################
 
 # :hotspot_gc

From 0021dc04100befd107d3aa763510b28dd62cd62c Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 28 Nov 2025 08:54:07 +0000
Subject: [PATCH 391/512] 8372565: Convert SATBMarkQueue to use Atomic<T>

Reviewed-by: tschatzl, shade, iwalulya
---
 src/hotspot/share/gc/shared/bufferNode.hpp    |  9 +++++----
 src/hotspot/share/gc/shared/satbMarkQueue.cpp | 15 +++++++--------
 src/hotspot/share/gc/shared/satbMarkQueue.hpp |  9 +++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/gc/shared/bufferNode.hpp b/src/hotspot/share/gc/shared/bufferNode.hpp
index a453bbc964b..e4e2ff23fb1 100644
--- a/src/hotspot/share/gc/shared/bufferNode.hpp
+++ b/src/hotspot/share/gc/shared/bufferNode.hpp
@@ -27,6 +27,7 @@
 
 #include "cppstdlib/limits.hpp"
 #include "gc/shared/freeListAllocator.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/lockFreeStack.hpp"
@@ -38,7 +39,7 @@ class BufferNode {
 
   InternalSizeType _index;
   InternalSizeType _capacity;
-  BufferNode* volatile _next;
+  Atomic<BufferNode*> _next;
   void* _buffer[1];             // Pseudo flexible array member.
 
   BufferNode(InternalSizeType capacity)
@@ -58,11 +59,11 @@ public:
     return std::numeric_limits<InternalSizeType>::max();
   }
 
-  static BufferNode* volatile* next_ptr(BufferNode& bn) { return &bn._next; }
+  static Atomic<BufferNode*>* next_ptr(BufferNode& bn) { return &bn._next; }
   typedef LockFreeStack<BufferNode, &next_ptr> Stack;
 
-  BufferNode* next() const     { return _next;  }
-  void set_next(BufferNode* n) { _next = n;     }
+  BufferNode* next() const     { return _next.load_relaxed(); }
+  void set_next(BufferNode* n) { _next.store_relaxed(n); }
   size_t index() const         { return _index; }
 
   void set_index(size_t i)     {
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.cpp b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
index e6ffe39facf..93c52b499a0 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
@@ -27,7 +27,6 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
@@ -85,28 +84,28 @@ SATBMarkQueueSet::~SATBMarkQueueSet() {
 // remains set until the count is reduced to zero.
 
 // Increment count.  If count > threshold, set flag, else maintain flag.
-static void increment_count(volatile size_t* cfptr, size_t threshold) {
+static void increment_count(Atomic<size_t>* cfptr, size_t threshold) {
   size_t old;
-  size_t value = AtomicAccess::load(cfptr);
+  size_t value = cfptr->load_relaxed();
   do {
     old = value;
     value += 2;
     assert(value > old, "overflow");
     if (value > threshold) value |= 1;
-    value = AtomicAccess::cmpxchg(cfptr, old, value);
+    value = cfptr->compare_exchange(old, value);
   } while (value != old);
 }
 
 // Decrement count.  If count == 0, clear flag, else maintain flag.
-static void decrement_count(volatile size_t* cfptr) {
+static void decrement_count(Atomic<size_t>* cfptr) {
   size_t old;
-  size_t value = AtomicAccess::load(cfptr);
+  size_t value = cfptr->load_relaxed();
   do {
     assert((value >> 1) != 0, "underflow");
     old = value;
     value -= 2;
     if (value <= 1) value = 0;
-    value = AtomicAccess::cmpxchg(cfptr, old, value);
+    value = cfptr->compare_exchange(old, value);
   } while (value != old);
 }
 
@@ -332,7 +331,7 @@ void SATBMarkQueueSet::print_all(const char* msg) {
 #endif // PRODUCT
 
 void SATBMarkQueueSet::abandon_completed_buffers() {
-  AtomicAccess::store(&_count_and_process_flag, size_t(0));
+  _count_and_process_flag.store_relaxed(0u);
   BufferNode* buffers_to_delete = _list.pop_all();
   while (buffers_to_delete != nullptr) {
     BufferNode* bn = buffers_to_delete;
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.hpp b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
index e40b2a3ecf3..d2b14a3cc92 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "runtime/atomic.hpp"
 
 class Thread;
 class Monitor;
@@ -87,7 +88,7 @@ class SATBMarkQueueSet: public PtrQueueSet {
 
   DEFINE_PAD_MINUS_SIZE(1, DEFAULT_PADDING_SIZE, 0);
   PaddedEnd<BufferNode::Stack> _list;
-  volatile size_t _count_and_process_flag;
+  Atomic<size_t> _count_and_process_flag;
   // These are rarely (if ever) changed, so same cache line as count.
   size_t _process_completed_buffers_threshold;
   size_t _buffer_enqueue_threshold;
@@ -148,12 +149,12 @@ public:
   // The number of buffers in the list.  Racy and not updated atomically
   // with the set of completed buffers.
   size_t completed_buffers_num() const {
-    return _count_and_process_flag >> 1;
+    return _count_and_process_flag.load_relaxed() >> 1;
   }
 
   // Return true if completed buffers should be processed.
   bool process_completed_buffers() const {
-    return (_count_and_process_flag & 1) != 0;
+    return (_count_and_process_flag.load_relaxed() & 1) != 0;
   }
 
 #ifndef PRODUCT

From 08c16c384ac9dac22da960ad718ceb95b41ca660 Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jnorlinder@openjdk.org>
Date: Fri, 28 Nov 2025 08:57:02 +0000
Subject: [PATCH 392/512] 8372704: ThreadMXBean.getThreadUserTime may return
 total time

Reviewed-by: alanb, kevinw, dholmes
---
 .../share/classes/sun/management/ThreadImpl.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.management/share/classes/sun/management/ThreadImpl.java b/src/java.management/share/classes/sun/management/ThreadImpl.java
index be54ced066d..a246e01dd63 100644
--- a/src/java.management/share/classes/sun/management/ThreadImpl.java
+++ b/src/java.management/share/classes/sun/management/ThreadImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -308,7 +308,7 @@ public class ThreadImpl implements ThreadMXBean {
                 long id = ids[0];
                 Thread thread = Thread.currentThread();
                 if (id == thread.threadId()) {
-                    times[0] = thread.isVirtual() ? -1L : getThreadTotalCpuTime0(0);
+                    times[0] = thread.isVirtual() ? -1L : getThreadUserCpuTime0(0);
                 } else {
                     times[0] = getThreadUserCpuTime0(id);
                 }

From 78b155b2b5745fc88c13586f93b632f61e038a94 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Fri, 28 Nov 2025 12:05:17 +0000
Subject: [PATCH 393/512] 8372147: ConnectionFlowControlTest should use
 HttpResponse.connectionLabel()

Reviewed-by: dfuchs
---
 .../net/httpclient/http2/ConnectionFlowControlTest.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java b/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
index 1eaf331c261..767d31f13e5 100644
--- a/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
+++ b/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
@@ -27,7 +27,7 @@
  * @summary checks connection flow control
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
- * @run junit/othervm   -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm   -Djdk.internal.httpclient.debug=err
  *                      -Djdk.httpclient.connectionWindowSize=65535
  *                      -Djdk.httpclient.windowsize=16384
  *                      ConnectionFlowControlTest
@@ -122,7 +122,7 @@ public class ConnectionFlowControlTest {
                     final HttpClient cc = client;
                     var response = cc.send(request, BodyHandlers.ofInputStream());
                     responses.put(query, response);
-                    String ckey = response.headers().firstValue("X-Connection-Key").get();
+                    String ckey = response.connectionLabel().get();
                     if (label == null) label = ckey;
                     try {
                         if (i < max - 1) {
@@ -149,7 +149,7 @@ public class ConnectionFlowControlTest {
                     try {
                         String query = keys[i];
                         var response = responses.get(keys[i]);
-                        String ckey = response.headers().firstValue("X-Connection-Key").get();
+                        String ckey = response.connectionLabel().get();
                         if (label == null) label = ckey;
                         if (i < max - 1) {
                             // the connection window might be exceeded at i == max - 2, which
@@ -206,7 +206,7 @@ public class ConnectionFlowControlTest {
             System.out.println("\nSending last request:" + uriWithQuery);
             var response = client.send(request, BodyHandlers.ofString());
             if (label != null) {
-                String ckey = response.headers().firstValue("X-Connection-Key").get();
+                String ckey = response.connectionLabel().get();
                 assertNotEquals(label, ckey);
                 System.out.printf("last request %s sent on different connection as expected:" +
                         "\n\tlast: %s\n\tprevious: %s%n", query, ckey, label);
@@ -281,7 +281,6 @@ public class ConnectionFlowControlTest {
                 byte[] bytes = is.readAllBytes();
                 System.out.println("Server " + t.getLocalAddress() + " received:\n"
                         + t.getRequestURI() + ": " + new String(bytes, StandardCharsets.UTF_8));
-                t.getResponseHeaders().setHeader("X-Connection-Key", t.getConnectionKey());
 
                 if (bytes.length == 0) bytes = "no request body!".getBytes(StandardCharsets.UTF_8);
                 int window = Math.max(16384, Integer.getInteger("jdk.httpclient.windowsize", 2*16*1024));

From e071afbfe4507b6b3a306f90bb645465fdab0070 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Fri, 28 Nov 2025 13:02:44 +0000
Subject: [PATCH 394/512] 8351334: [ubsan] memoryReserver.cpp:552:60: runtime
 error: applying non-zero offset 1073741824 to null pointer

Reviewed-by: aboldtch, dholmes, jsjolen
---
 .../share/gc/shared/jvmFlagConstraintsGC.cpp  |  2 +-
 src/hotspot/share/memory/memoryReserver.cpp   | 51 ++++++++++---------
 src/hotspot/share/runtime/arguments.cpp       |  6 +--
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
index cc446adba66..ea3d644d105 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
@@ -285,7 +285,7 @@ JVMFlag::Error SoftMaxHeapSizeConstraintFunc(size_t value, bool verbose) {
 JVMFlag::Error HeapBaseMinAddressConstraintFunc(size_t value, bool verbose) {
   // If an overflow happened in Arguments::set_heap_size(), MaxHeapSize will have too large a value.
   // Check for this by ensuring that MaxHeapSize plus the requested min base address still fit within max_uintx.
-  if (UseCompressedOops && FLAG_IS_ERGO(MaxHeapSize) && (value > (max_uintx - MaxHeapSize))) {
+  if (value > (max_uintx - MaxHeapSize)) {
     JVMFlag::printError(verbose,
                         "HeapBaseMinAddress (%zu) or MaxHeapSize (%zu) is too large. "
                         "Sum of them must be less than or equal to maximum of size_t (%zu)\n",
diff --git a/src/hotspot/share/memory/memoryReserver.cpp b/src/hotspot/share/memory/memoryReserver.cpp
index 11a0422f7b0..e8d1887f59f 100644
--- a/src/hotspot/share/memory/memoryReserver.cpp
+++ b/src/hotspot/share/memory/memoryReserver.cpp
@@ -437,7 +437,7 @@ ReservedSpace HeapReserver::Instance::try_reserve_range(char *highest_start,
 
     if (reserved.is_reserved()) {
       if (reserved.base() >= aligned_heap_base_min_address &&
-          size <= (uintptr_t)(upper_bound - reserved.base())) {
+          size <= (size_t)(upper_bound - reserved.base())) {
         // Got a successful reservation.
         return reserved;
       }
@@ -546,16 +546,16 @@ ReservedHeapSpace HeapReserver::Instance::reserve_compressed_oops_heap(const siz
 
   const size_t attach_point_alignment = lcm(alignment, os_attach_point_alignment);
 
-  char* aligned_heap_base_min_address = align_up((char*)HeapBaseMinAddress, alignment);
-  size_t noaccess_prefix = ((aligned_heap_base_min_address + size) > (char*)OopEncodingHeapMax) ?
+  uintptr_t aligned_heap_base_min_address = align_up(MAX2(HeapBaseMinAddress, alignment), alignment);
+  size_t noaccess_prefix = ((aligned_heap_base_min_address + size) > OopEncodingHeapMax) ?
     noaccess_prefix_size : 0;
 
   ReservedSpace reserved{};
 
   // Attempt to alloc at user-given address.
   if (!FLAG_IS_DEFAULT(HeapBaseMinAddress)) {
-    reserved = try_reserve_memory(size + noaccess_prefix, alignment, page_size, aligned_heap_base_min_address);
-    if (reserved.base() != aligned_heap_base_min_address) { // Enforce this exact address.
+    reserved = try_reserve_memory(size + noaccess_prefix, alignment, page_size, (char*)aligned_heap_base_min_address);
+    if (reserved.base() != (char*)aligned_heap_base_min_address) { // Enforce this exact address.
       release(reserved);
       reserved = {};
     }
@@ -575,38 +575,41 @@ ReservedHeapSpace HeapReserver::Instance::reserve_compressed_oops_heap(const siz
 
     // Attempt to allocate so that we can run without base and scale (32-Bit unscaled compressed oops).
     // Give it several tries from top of range to bottom.
-    if (aligned_heap_base_min_address + size <= (char *)UnscaledOopHeapMax) {
+    if (aligned_heap_base_min_address + size <= UnscaledOopHeapMax) {
 
       // Calc address range within we try to attach (range of possible start addresses).
-      char* const highest_start = align_down((char *)UnscaledOopHeapMax - size, attach_point_alignment);
-      char* const lowest_start  = align_up(aligned_heap_base_min_address, attach_point_alignment);
-      reserved = try_reserve_range(highest_start, lowest_start, attach_point_alignment,
-                                   aligned_heap_base_min_address, (char *)UnscaledOopHeapMax, size, alignment, page_size);
+      uintptr_t const highest_start = align_down(UnscaledOopHeapMax - size, attach_point_alignment);
+      uintptr_t const lowest_start  = align_up(aligned_heap_base_min_address, attach_point_alignment);
+      assert(lowest_start <= highest_start, "lowest: " INTPTR_FORMAT " highest: " INTPTR_FORMAT ,
+                                          lowest_start, highest_start);
+      reserved = try_reserve_range((char*)highest_start, (char*)lowest_start, attach_point_alignment,
+                                   (char*)aligned_heap_base_min_address, (char*)UnscaledOopHeapMax, size, alignment, page_size);
     }
 
     // zerobased: Attempt to allocate in the lower 32G.
-    char *zerobased_max = (char *)OopEncodingHeapMax;
+    const uintptr_t zerobased_max = OopEncodingHeapMax;
 
     // Give it several tries from top of range to bottom.
     if (aligned_heap_base_min_address + size <= zerobased_max && // Zerobased theoretical possible.
         ((!reserved.is_reserved()) ||                            // No previous try succeeded.
-         (reserved.end() > zerobased_max))) {                    // Unscaled delivered an arbitrary address.
+         (reserved.end() > (char*)zerobased_max))) {             // Unscaled delivered an arbitrary address.
 
       // Release previous reservation
       release(reserved);
 
       // Calc address range within we try to attach (range of possible start addresses).
-      char *const highest_start = align_down(zerobased_max - size, attach_point_alignment);
+      uintptr_t const highest_start = align_down(zerobased_max - size, attach_point_alignment);
       // Need to be careful about size being guaranteed to be less
       // than UnscaledOopHeapMax due to type constraints.
-      char *lowest_start = aligned_heap_base_min_address;
-      uint64_t unscaled_end = UnscaledOopHeapMax - size;
-      if (unscaled_end < UnscaledOopHeapMax) { // unscaled_end wrapped if size is large
-        lowest_start = MAX2(lowest_start, (char*)unscaled_end);
+      uintptr_t lowest_start = aligned_heap_base_min_address;
+      if (size < UnscaledOopHeapMax) {
+        lowest_start = MAX2<uintptr_t>(lowest_start, UnscaledOopHeapMax - size);
       }
       lowest_start = align_up(lowest_start, attach_point_alignment);
-      reserved = try_reserve_range(highest_start, lowest_start, attach_point_alignment,
-                                   aligned_heap_base_min_address, zerobased_max, size, alignment, page_size);
+      assert(lowest_start <= highest_start, "lowest: " INTPTR_FORMAT " highest: " INTPTR_FORMAT,
+                                          lowest_start, highest_start);
+      reserved = try_reserve_range((char*)highest_start, (char*)lowest_start, attach_point_alignment,
+                                   (char*)aligned_heap_base_min_address, (char*)zerobased_max, size, alignment, page_size);
     }
 
     // Now we go for heaps with base != 0.  We need a noaccess prefix to efficiently
@@ -616,17 +619,17 @@ ReservedHeapSpace HeapReserver::Instance::reserve_compressed_oops_heap(const siz
     // Try to attach at addresses that are aligned to OopEncodingHeapMax. Disjointbase mode.
     char** addresses = get_attach_addresses_for_disjoint_mode();
     int i = 0;
-    while ((addresses[i] != nullptr) &&       // End of array not yet reached.
-           ((!reserved.is_reserved()) ||      // No previous try succeeded.
-           (reserved.end() > zerobased_max && // Not zerobased or unscaled address.
-                                              // Not disjoint address.
+    while ((addresses[i] != nullptr) &&              // End of array not yet reached.
+           ((!reserved.is_reserved()) ||             // No previous try succeeded.
+           (reserved.end() > (char*)zerobased_max && // Not zerobased or unscaled address.
+                                                     // Not disjoint address.
             !CompressedOops::is_disjoint_heap_base_address((address)reserved.base())))) {
 
       // Release previous reservation
       release(reserved);
 
       char* const attach_point = addresses[i];
-      assert(attach_point >= aligned_heap_base_min_address, "Flag support broken");
+      assert((uintptr_t)attach_point >= aligned_heap_base_min_address, "Flag support broken");
       reserved = try_reserve_memory(size + noaccess_prefix, alignment, page_size, attach_point);
       i++;
     }
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 01fee949e33..4a983095593 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1589,8 +1589,8 @@ void Arguments::set_heap_size() {
     }
 
     if (UseCompressedOops) {
-      size_t heap_end = HeapBaseMinAddress + MaxHeapSize;
-      size_t max_coop_heap = max_heap_for_compressed_oops();
+      uintptr_t heap_end = HeapBaseMinAddress + MaxHeapSize;
+      uintptr_t max_coop_heap = max_heap_for_compressed_oops();
 
       // Limit the heap size to the maximum possible when using compressed oops
       if (heap_end < max_coop_heap) {
@@ -1607,7 +1607,7 @@ void Arguments::set_heap_size() {
           aot_log_info(aot)("UseCompressedOops disabled due to "
                             "max heap %zu > compressed oop heap %zu. "
                             "Please check the setting of MaxRAMPercentage %5.2f.",
-                            reasonable_max, max_coop_heap, MaxRAMPercentage);
+                            reasonable_max, (size_t)max_coop_heap, MaxRAMPercentage);
           FLAG_SET_ERGO(UseCompressedOops, false);
         } else {
           reasonable_max = max_coop_heap;

From 52568bf4832b2bcc5dc547dbdf45a6a7172281fb Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 28 Nov 2025 22:50:18 +0000
Subject: [PATCH 395/512] 8372650: Convert GenericWaitBarrier to use Atomic<T>

Reviewed-by: shade, iwalulya
---
 .../share/utilities/waitBarrier_generic.cpp   | 35 +++++++++----------
 .../share/utilities/waitBarrier_generic.hpp   |  9 ++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/utilities/waitBarrier_generic.cpp b/src/hotspot/share/utilities/waitBarrier_generic.cpp
index a6436d93ffc..b268b10c757 100644
--- a/src/hotspot/share/utilities/waitBarrier_generic.cpp
+++ b/src/hotspot/share/utilities/waitBarrier_generic.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "runtime/atomicAccess.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/spinYield.hpp"
@@ -79,10 +78,10 @@
 
 void GenericWaitBarrier::arm(int barrier_tag) {
   assert(barrier_tag != 0, "Pre arm: Should be arming with armed value");
-  assert(AtomicAccess::load(&_barrier_tag) == 0,
+  assert(_barrier_tag.load_relaxed() == 0,
          "Pre arm: Should not be already armed. Tag: %d",
-         AtomicAccess::load(&_barrier_tag));
-  AtomicAccess::release_store(&_barrier_tag, barrier_tag);
+         _barrier_tag.load_relaxed());
+  _barrier_tag.release_store(barrier_tag);
 
   Cell &cell = tag_to_cell(barrier_tag);
   cell.arm(barrier_tag);
@@ -92,9 +91,9 @@ void GenericWaitBarrier::arm(int barrier_tag) {
 }
 
 void GenericWaitBarrier::disarm() {
-  int barrier_tag = AtomicAccess::load_acquire(&_barrier_tag);
+  int barrier_tag = _barrier_tag.load_acquire();
   assert(barrier_tag != 0, "Pre disarm: Should be armed. Tag: %d", barrier_tag);
-  AtomicAccess::release_store(&_barrier_tag, 0);
+  _barrier_tag.release_store(0);
 
   Cell &cell = tag_to_cell(barrier_tag);
   cell.disarm(barrier_tag);
@@ -121,7 +120,7 @@ void GenericWaitBarrier::Cell::arm(int32_t requested_tag) {
 
   SpinYield sp;
   while (true) {
-    state = AtomicAccess::load_acquire(&_state);
+    state = _state.load_acquire();
     assert(decode_tag(state) == 0,
            "Pre arm: Should not be armed. "
            "Tag: " INT32_FORMAT "; Waiters: " INT32_FORMAT,
@@ -134,7 +133,7 @@ void GenericWaitBarrier::Cell::arm(int32_t requested_tag) {
 
   // Try to swing cell to armed. This should always succeed after the check above.
   int64_t new_state = encode(requested_tag, 0);
-  int64_t prev_state = AtomicAccess::cmpxchg(&_state, state, new_state);
+  int64_t prev_state = _state.compare_exchange(state, new_state);
   if (prev_state != state) {
     fatal("Cannot arm the wait barrier. "
           "Tag: " INT32_FORMAT "; Waiters: " INT32_FORMAT,
@@ -145,14 +144,14 @@ void GenericWaitBarrier::Cell::arm(int32_t requested_tag) {
 int GenericWaitBarrier::Cell::signal_if_needed(int max) {
   int signals = 0;
   while (true) {
-    int cur = AtomicAccess::load_acquire(&_outstanding_wakeups);
+    int cur = _outstanding_wakeups.load_acquire();
     if (cur == 0) {
       // All done, no more waiters.
       return 0;
     }
     assert(cur > 0, "Sanity");
 
-    int prev = AtomicAccess::cmpxchg(&_outstanding_wakeups, cur, cur - 1);
+    int prev = _outstanding_wakeups.compare_exchange(cur, cur - 1);
     if (prev != cur) {
       // Contention, return to caller for early return or backoff.
       return prev;
@@ -172,7 +171,7 @@ void GenericWaitBarrier::Cell::disarm(int32_t expected_tag) {
   int32_t waiters;
 
   while (true) {
-    int64_t state = AtomicAccess::load_acquire(&_state);
+    int64_t state = _state.load_acquire();
     int32_t tag = decode_tag(state);
     waiters = decode_waiters(state);
 
@@ -182,7 +181,7 @@ void GenericWaitBarrier::Cell::disarm(int32_t expected_tag) {
            tag, waiters);
 
     int64_t new_state = encode(0, waiters);
-    if (AtomicAccess::cmpxchg(&_state, state, new_state) == state) {
+    if (_state.compare_exchange(state, new_state) == state) {
       // Successfully disarmed.
       break;
     }
@@ -191,19 +190,19 @@ void GenericWaitBarrier::Cell::disarm(int32_t expected_tag) {
   // Wake up waiters, if we have at least one.
   // Allow other threads to assist with wakeups, if possible.
   if (waiters > 0) {
-    AtomicAccess::release_store(&_outstanding_wakeups, waiters);
+    _outstanding_wakeups.release_store(waiters);
     SpinYield sp;
     while (signal_if_needed(INT_MAX) > 0) {
       sp.wait();
     }
   }
-  assert(AtomicAccess::load(&_outstanding_wakeups) == 0, "Post disarm: Should not have outstanding wakeups");
+  assert(_outstanding_wakeups.load_relaxed() == 0, "Post disarm: Should not have outstanding wakeups");
 }
 
 void GenericWaitBarrier::Cell::wait(int32_t expected_tag) {
   // Try to register ourselves as pending waiter.
   while (true) {
-    int64_t state = AtomicAccess::load_acquire(&_state);
+    int64_t state = _state.load_acquire();
     int32_t tag = decode_tag(state);
     if (tag != expected_tag) {
       // Cell tag had changed while waiting here. This means either the cell had
@@ -219,7 +218,7 @@ void GenericWaitBarrier::Cell::wait(int32_t expected_tag) {
            tag, waiters);
 
     int64_t new_state = encode(tag, waiters + 1);
-    if (AtomicAccess::cmpxchg(&_state, state, new_state) == state) {
+    if (_state.compare_exchange(state, new_state) == state) {
       // Success! Proceed to wait.
       break;
     }
@@ -238,7 +237,7 @@ void GenericWaitBarrier::Cell::wait(int32_t expected_tag) {
 
   // Register ourselves as completed waiter before leaving.
   while (true) {
-    int64_t state = AtomicAccess::load_acquire(&_state);
+    int64_t state = _state.load_acquire();
     int32_t tag = decode_tag(state);
     int32_t waiters = decode_waiters(state);
 
@@ -248,7 +247,7 @@ void GenericWaitBarrier::Cell::wait(int32_t expected_tag) {
            tag, waiters);
 
     int64_t new_state = encode(tag, waiters - 1);
-    if (AtomicAccess::cmpxchg(&_state, state, new_state) == state) {
+    if (_state.compare_exchange(state, new_state) == state) {
       // Success!
       break;
     }
diff --git a/src/hotspot/share/utilities/waitBarrier_generic.hpp b/src/hotspot/share/utilities/waitBarrier_generic.hpp
index 8ed9ef3ac6e..0cbba1041db 100644
--- a/src/hotspot/share/utilities/waitBarrier_generic.hpp
+++ b/src/hotspot/share/utilities/waitBarrier_generic.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/semaphore.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -43,10 +44,10 @@ private:
     Semaphore _sem;
 
     // Cell state, tracks the arming + waiters status
-    volatile int64_t _state;
+    Atomic<int64_t> _state;
 
     // Wakeups to deliver for current waiters
-    volatile int _outstanding_wakeups;
+    Atomic<int> _outstanding_wakeups;
 
     int signal_if_needed(int max);
 
@@ -83,7 +84,7 @@ private:
   // Trailing padding to protect the last cell.
   DEFINE_PAD_MINUS_SIZE(0, DEFAULT_PADDING_SIZE, 0);
 
-  volatile int _barrier_tag;
+  Atomic<int> _barrier_tag;
 
   // Trailing padding to insulate the rest of the barrier from adjacent
   // data structures. The leading padding is not needed, as cell padding

From 92e1357dfd2d874ef1a62ddd69c86a7bb189c6a2 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Sat, 29 Nov 2025 01:25:25 +0000
Subject: [PATCH 396/512] 8371802: Do not let QUIC connection to idle terminate
 when HTTP/3 is configured with a higher idle timeout

Reviewed-by: dfuchs
---
 .../internal/net/http/Http3Connection.java    |  68 +++-
 .../net/http/Http3ConnectionPool.java         |  29 +-
 .../net/http/quic/ConnectionTerminator.java   |  70 +++-
 .../http/quic/ConnectionTerminatorImpl.java   |  12 +-
 .../net/http/quic/IdleTimeoutManager.java     | 316 +++++++++++++-----
 .../net/http/quic/QuicConnectionImpl.java     |   4 +-
 .../net/http/quic/QuicTimedEvent.java         |   3 +-
 .../http3/H3IdleExceedsQuicIdleTimeout.java   | 178 ++++++++++
 8 files changed, 579 insertions(+), 101 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java
index b97a441881d..17f230f3b15 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java
@@ -126,11 +126,16 @@ public final class Http3Connection implements AutoCloseable {
     // as per spec
     // -1 is used to imply no GOAWAY received so far
     private final AtomicLong lowestGoAwayReceipt = new AtomicLong(-1);
+
+    private final Duration idleTimeoutDuration;
     private volatile IdleConnectionTimeoutEvent idleConnectionTimeoutEvent;
     // value of true implies no more streams will be initiated on this connection,
     // and the connection will be closed once the in-progress streams complete.
     private volatile boolean finalStream;
     private volatile boolean allowOnlyOneStream;
+    // true if this connection has been placed in the HTTP/3 connection pool of the HttpClient.
+    // false otherwise.
+    private volatile boolean presentInConnPool;
     // set to true if we decide to open a new connection
     // due to stream limit reached
     private volatile boolean streamLimitReached;
@@ -220,6 +225,17 @@ public final class Http3Connection implements AutoCloseable {
                 // in case of exception. Throws in the dependent
                 // action after wrapping the exception if needed.
                 .exceptionally(this::exceptionallyAndClose);
+
+        this.idleTimeoutDuration = client.client().idleConnectionTimeout(HTTP_3).orElse(null);
+        if (idleTimeoutDuration == null) {
+            // The absence of HTTP/3 idle timeout duration is considered to mean
+            // never idle terminating the connection
+            quicConnection.connectionTerminator().appLayerMaxIdle(Duration.MAX,
+                    this::isQUICTrafficGenerationRequired);
+        } else {
+            quicConnection.connectionTerminator().appLayerMaxIdle(idleTimeoutDuration,
+                    this::isQUICTrafficGenerationRequired);
+        }
         if (Log.http3()) {
             Log.logHttp3("HTTP/3 connection created for " + quicConnectionTag() + " - local address: "
                     + quicConnection.localAddress());
@@ -732,9 +748,8 @@ public final class Http3Connection implements AutoCloseable {
             try {
                 var te = idleConnectionTimeoutEvent;
                 if (te == null && exchangeStreams.isEmpty()) {
-                    te = idleConnectionTimeoutEvent = client.client().idleConnectionTimeout(HTTP_3)
-                            .map(IdleConnectionTimeoutEvent::new).orElse(null);
-                    if (te != null) {
+                    if (idleTimeoutDuration != null) {
+                        te = idleConnectionTimeoutEvent = new IdleConnectionTimeoutEvent();
                         client.client().registerTimer(te);
                     }
                 }
@@ -873,6 +888,48 @@ public final class Http3Connection implements AutoCloseable {
         }
     }
 
+    /**
+     * Mark this connection as being present or absent from the connection pool.
+     */
+    void setPooled(final boolean present) {
+        this.presentInConnPool = present;
+    }
+
+    /**
+     * This callback method is invoked by the QUIC layer when it notices that this
+     * connection hasn't seen any traffic for certain period of time. QUIC
+     * invokes this method to ask HTTP/3 whether the QUIC layer
+     * should generate traffic to keep this connection active.
+     * This method returns true, indicating that the traffic must be generated,
+     * if this HTTP/3 connection is in pool and there's no current request/response
+     * in progress over this connection (i.e. the HTTP/3 connection is idle in the
+     * pool waiting for any new requests to be issued by the application).
+     */
+    private boolean isQUICTrafficGenerationRequired() {
+        if (!isOpen()) {
+            return false;
+        }
+        lock();
+        try {
+            // if there's no HTTP/3 request/responses in progress and the connection is
+            // in the pool (thus idle), then we instruct QUIC to generate traffic on the
+            // QUIC connection to prevent it from being idle terminated.
+            final boolean generateTraffic = this.presentInConnPool
+                    && this.exchanges.isEmpty()
+                    && this.reservedStreamCount.get() == 0
+                    // a connection in the pool could be marked as
+                    // finalStream (for example when it receives a GOAWAY). we don't want
+                    // to generate explicit QUIC traffic for such connections too.
+                    && !this.finalStream;
+            if (debug.on()) {
+                debug.log("QUIC traffic generation required = " + generateTraffic);
+            }
+            return generateTraffic;
+        } finally {
+            unlock();
+        }
+    }
+
     /**
      * Cancels any event that might have been scheduled to shutdown this connection. Must be called
      * with the stateLock held.
@@ -893,8 +950,9 @@ public final class Http3Connection implements AutoCloseable {
         private boolean cancelled;
         private boolean idleShutDownInitiated;
 
-        IdleConnectionTimeoutEvent(Duration duration) {
-            super(duration);
+        IdleConnectionTimeoutEvent() {
+            assert idleTimeoutDuration != null : "idle timeout duration is null";
+            super(idleTimeoutDuration);
         }
 
         @Override
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http3ConnectionPool.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http3ConnectionPool.java
index eaacd8213cb..0f1fe2b7abf 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http3ConnectionPool.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http3ConnectionPool.java
@@ -155,23 +155,34 @@ class Http3ConnectionPool {
         assert key.equals(c.key());
         var altService = c.connection().getSourceAltService().orElse(null);
         if (altService != null && altService.wasAdvertised()) {
-            return advertised.putIfAbsent(key, c);
+            final var prev = advertised.putIfAbsent(key, c);
+            if (prev == null) {
+                c.setPooled(true); // mark the newly pooled connection as pooled
+            }
+            return prev;
         }
         assert altService == null || altService.originHasSameAuthority();
-        return unadvertised.putIfAbsent(key, c);
+        final var prev = unadvertised.putIfAbsent(key, c);
+        if (prev == null) {
+            c.setPooled(true); // mark the newly pooled connection as pooled
+        }
+        return prev;
     }
 
-    Http3Connection put(String key, Http3Connection c) {
+    void put(String key, Http3Connection c) {
         Objects.requireNonNull(key);
         Objects.requireNonNull(c);
         assert key.equals(c.key()) : "key mismatch %s -> %s"
                 .formatted(key, c.key());
         var altService = c.connection().getSourceAltService().orElse(null);
         if (altService != null && altService.wasAdvertised()) {
-            return advertised.put(key, c);
+            advertised.put(key, c);
+            c.setPooled(true);
+            return;
         }
         assert altService == null || altService.originHasSameAuthority();
-        return unadvertised.put(key, c);
+        unadvertised.put(key, c);
+        c.setPooled(true);
     }
 
     boolean remove(String key, Http3Connection c) {
@@ -189,11 +200,17 @@ class Http3ConnectionPool {
         }
 
         assert altService == null || altService.originHasSameAuthority();
-        return unadvertised.remove(key, c);
+        final boolean removed = unadvertised.remove(key, c);
+        if (removed) {
+            c.setPooled(false);
+        }
+        return removed;
     }
 
     void clear() {
+        advertised.values().forEach((c) -> c.setPooled(false));
         advertised.clear();
+        unadvertised.values().forEach((c) -> c.setPooled(false));
         unadvertised.clear();
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminator.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminator.java
index 24230a0883d..14559db4a11 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminator.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminator.java
@@ -24,15 +24,77 @@
  */
 package jdk.internal.net.http.quic;
 
-// responsible for managing the connection termination of a QUIC connection
+import java.time.Duration;
+import java.util.function.Supplier;
+
+/**
+ * Responsible for managing the connection termination of a QUIC connection
+ */
 public sealed interface ConnectionTerminator permits ConnectionTerminatorImpl {
 
-    // lets the terminator know that the connection is still alive and should not be
-    // idle timed out
-    void keepAlive();
+    /**
+     * Instructs the connection terminator to consider the connection as active
+     * at the present point in time. The connection terminator will then restart its
+     * idle timeout timer from this point in time.
+     * <p>
+     * This method must be called when an incoming packet is processed successfully
+     * or when an ack-eliciting packet is sent by the local endpoint on the connection.
+     */
+    void markActive();
 
+    /**
+     * Terminates the connection, if not already terminated, with the given cause.
+     * <p>
+     * A connection is terminated only once with a {@link TerminationCause}. However, this method
+     * can be called any number of times. If the connection is not already terminated,
+     * then this method does the necessary work to terminate the connection. Any subsequent
+     * invocations of this method, after the connection has been terminated, will not
+     * change the termination cause of the connection.
+     *
+     * @param cause the termination cause
+     */
     void terminate(TerminationCause cause);
 
+    /**
+     * Returns {@code true} if the connection is allowed for use, {@code false} otherwise.
+     * <p>
+     * This method is typically called when a connection that has been idle, is about to be used
+     * for handling some request. This method allows for co-ordination between the connection usage
+     * and the connection terminator to prevent the connection from being idle timed out when it is
+     * about to be used for some request. The connection must only be used if this method
+     * returns {@code true}.
+     *
+     * @return true if the connection can be used, false otherwise
+     */
     boolean tryReserveForUse();
 
+    /**
+     * Instructs the connection terminator that the application layer allows the
+     * connection to stay idle for the given {@code maxIdle} duration. If the QUIC
+     * layer has negotiated an idle timeout for the connection, that's lower than
+     * the application's {@code maxIdle} duration, then the connection terminator
+     * upon noticing absence of traffic over the connection for certain duration,
+     * calls the {@code trafficGenerationCheck} to check if the QUIC layer should
+     * explicitly generate some traffic to prevent the connection
+     * from idle terminating.
+     * <p>
+     * When the {@code trafficGenerationCheck} is invoked, the application layer
+     * must return {@code true} only if explicit traffic generation is necessary
+     * to keep the connection alive.
+     * <p>
+     * If the application layer wishes to never idle terminate the connection, then
+     * a {@code maxIdle} duration of {@linkplain Duration#MAX Duration.MAX} is recommended.
+     *
+     * @param maxIdle                the maximum idle duration of the connection,
+     *                               at the application layer
+     * @param trafficGenerationCheck the callback that will be invoked by the connection
+     *                               terminator to decide if the QUIC layer should generate
+     *                               any traffic to prevent the connection from idle terminating
+     * @throws NullPointerException     if either {@code maxIdle} or {@code trafficGenerationCheck}
+     *                                  is null
+     * @throws IllegalArgumentException if {@code maxIdle} is
+     *                                  {@linkplain Duration#isNegative() negative} or
+     *                                  {@linkplain Duration#isZero() zero}
+     */
+    void appLayerMaxIdle(Duration maxIdle, Supplier<Boolean> trafficGenerationCheck);
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
index 0f5aa4cb7ac..7870f4f1d8e 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
@@ -25,11 +25,13 @@
 package jdk.internal.net.http.quic;
 
 import java.nio.ByteBuffer;
+import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import jdk.internal.net.http.common.Log;
 import jdk.internal.net.http.common.Logger;
@@ -52,7 +54,6 @@ import static jdk.internal.net.http.quic.QuicConnectionImpl.QuicConnectionState.
 import static jdk.internal.net.http.quic.TerminationCause.appLayerClose;
 import static jdk.internal.net.http.quic.TerminationCause.forSilentTermination;
 import static jdk.internal.net.http.quic.TerminationCause.forTransportError;
-import static jdk.internal.net.quic.QuicTransportErrors.INTERNAL_ERROR;
 import static jdk.internal.net.quic.QuicTransportErrors.NO_ERROR;
 
 final class ConnectionTerminatorImpl implements ConnectionTerminator {
@@ -70,8 +71,8 @@ final class ConnectionTerminatorImpl implements ConnectionTerminator {
     }
 
     @Override
-    public void keepAlive() {
-        this.connection.idleTimeoutManager.keepAlive();
+    public void markActive() {
+        this.connection.idleTimeoutManager.markActive();
     }
 
     @Override
@@ -79,6 +80,11 @@ final class ConnectionTerminatorImpl implements ConnectionTerminator {
         return this.connection.idleTimeoutManager.tryReserveForUse();
     }
 
+    @Override
+    public void appLayerMaxIdle(final Duration maxIdle, final Supplier<Boolean> trafficGenerationCheck) {
+        this.connection.idleTimeoutManager.appLayerMaxIdle(maxIdle, trafficGenerationCheck);
+    }
+
     @Override
     public void terminate(final TerminationCause cause) {
         Objects.requireNonNull(cause);
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java
index 72ce0290038..375a0dc8e16 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/IdleTimeoutManager.java
@@ -24,12 +24,15 @@
  */
 package jdk.internal.net.http.quic;
 
+import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
 
 import jdk.internal.net.http.common.Deadline;
 import jdk.internal.net.http.common.Log;
@@ -58,17 +61,21 @@ final class IdleTimeoutManager {
     private IdleTimeoutEvent idleTimeoutEvent;
     // must be accessed only when holding stateLock
     private StreamDataBlockedEvent streamDataBlockedEvent;
-    // the time at which the last outgoing packet was sent or an
+    // the time (in nanos) at which the last outgoing packet was sent or an
     // incoming packet processed on the connection
-    private volatile long lastPacketActivityAt;
+    private volatile long lastPacketActivityNanos;
 
     private final ReentrantLock idleTerminationLock = new ReentrantLock();
     // true if it has been decided to terminate the connection due to being idle,
     // false otherwise. should be accessed only when holding the idleTerminationLock
     private boolean chosenForIdleTermination;
-    // the time at which the connection was last reserved for use.
+    // the time (in nanos) at which the connection was last reserved for use.
     // should be accessed only when holding the idleTerminationLock
-    private long lastUsageReservationAt;
+    private long lastUsageReservationNanos;
+
+    private final AtomicReference<Supplier<Boolean>> trafficGenerationCheck = new AtomicReference<>();
+    // must be accessed only when holding stateLock
+    private PingEvent pingEvent;
 
     IdleTimeoutManager(final QuicConnectionImpl connection) {
         this.connection = Objects.requireNonNull(connection, "connection");
@@ -79,28 +86,12 @@ final class IdleTimeoutManager {
      * Starts the idle timeout management for the connection. This should be called
      * after the handshake is complete for the connection.
      *
-     * @throw IllegalStateException if handshake hasn't yet completed or if the handshake
-     * has failed for the connection
+     * @throws IllegalStateException if handshake hasn't yet completed or if the handshake
+     *                               has failed for the connection
      */
     void start() {
-        final CompletableFuture<QuicTLSEngine.HandshakeState> handshakeCF =
-                this.connection.handshakeFlow().handshakeCF();
         // start idle management only for successfully completed handshake
-        if (!handshakeCF.isDone()) {
-            throw new IllegalStateException("handshake isn't yet complete,"
-                    + " cannot start idle connection management");
-        }
-        if (handshakeCF.isCompletedExceptionally()) {
-            throw new IllegalStateException("cannot start idle connection management for a failed"
-                    + " connection");
-        }
-        startTimers();
-    }
-
-    /**
-     * Starts the idle timeout timer of the QUIC connection, if not already started.
-     */
-    private void startTimers() {
+        requireSuccessfulHandshake();
         if (shutdown.get()) {
             return;
         }
@@ -116,6 +107,19 @@ final class IdleTimeoutManager {
         }
     }
 
+    private void requireSuccessfulHandshake() {
+        final CompletableFuture<QuicTLSEngine.HandshakeState> handshakeCF =
+                this.connection.handshakeFlow().handshakeCF();
+        if (!handshakeCF.isDone()) {
+            throw new IllegalStateException("handshake isn't yet complete," +
+                    " cannot use idle connection management");
+        }
+        if (handshakeCF.isCompletedExceptionally()) {
+            throw new IllegalStateException("cannot use idle connection management for a failed"
+                    + " connection");
+        }
+    }
+
     private void startIdleTerminationTimer() {
         assert stateLock.isHeldByCurrentThread() : "not holding state lock";
         final Optional<Long> idleTimeoutMillis = getIdleTimeout();
@@ -154,18 +158,14 @@ final class IdleTimeoutManager {
         }
         final QuicEndpoint endpoint = this.connection.endpoint();
         assert endpoint != null : "QUIC endpoint is null";
-        // disable the event (refreshDeadline() of IdleTimeoutEvent will return Deadline.MAX)
-        final Deadline nextDeadline = this.idleTimeoutEvent.nextDeadline;
-        if (!nextDeadline.equals(Deadline.MAX)) {
-            this.idleTimeoutEvent.nextDeadline = Deadline.MAX;
-            endpoint.timer().reschedule(this.idleTimeoutEvent, Deadline.MIN);
-        }
+        // disable the idle timeout timer event
+        disableTimedEvent(endpoint.timer(), this.idleTimeoutEvent);
         this.idleTimeoutEvent = null;
     }
 
     private void startStreamDataBlockedTimer() {
         assert stateLock.isHeldByCurrentThread() : "not holding state lock";
-        // 75% of idle timeout or if idle timeout is not configured, then 30 seconds
+        // 75% of QUIC idle timeout or if QUIC idle timeout is not configured, then 30 seconds
         final long timeoutMillis = getIdleTimeout()
                 .map((v) -> (long) (0.75 * v))
                 .orElse(30000L);
@@ -194,22 +194,95 @@ final class IdleTimeoutManager {
         }
         final QuicEndpoint endpoint = this.connection.endpoint();
         assert endpoint != null : "QUIC endpoint is null";
-        // disable the event (refreshDeadline() of StreamDataBlockedEvent will return Deadline.MAX)
-        final Deadline nextDeadline = this.streamDataBlockedEvent.nextDeadline;
-        if (!nextDeadline.equals(Deadline.MAX)) {
-            this.streamDataBlockedEvent.nextDeadline = Deadline.MAX;
-            endpoint.timer().reschedule(this.streamDataBlockedEvent, Deadline.MIN);
-        }
+        // disable the stream data blocked timer event
+        disableTimedEvent(endpoint.timer(), this.streamDataBlockedEvent);
         this.streamDataBlockedEvent = null;
     }
 
+    // set up a PING timer if the application layer's max idle duration for the connection
+    // is larger than that of the negotiated QUIC idle timeout for that connection
+    void appLayerMaxIdle(final Duration maxIdle, final Supplier<Boolean> trafficGenerationCheck) {
+        Objects.requireNonNull(maxIdle, "maxIdle");
+        Objects.requireNonNull(trafficGenerationCheck, "trafficGenerationCheck");
+        if (maxIdle.isZero() || maxIdle.isNegative()) {
+            throw new IllegalArgumentException("invalid maxIdle duration: " + maxIdle);
+        }
+        // the application layer must not configure its max idle duration
+        // until the QUIC connection's handshake has successfully completed
+        requireSuccessfulHandshake();
+
+        if (!this.trafficGenerationCheck.compareAndSet(null, trafficGenerationCheck)) {
+            throw new IllegalStateException("app layer max inactivity already set");
+        }
+        final Optional<Long> quicIdleTimeout = getIdleTimeout();
+        if (quicIdleTimeout.isEmpty()) {
+            // the QUIC connection will never idle timeout, nothing more to do
+            return;
+        }
+        // we start the PING sending timer event only if the QUIC layer idle timeout
+        // is lesser than the app layer's desired idle time
+        if (Duration.ofMillis(quicIdleTimeout.get()).compareTo(maxIdle) < 0) {
+            this.stateLock.lock();
+            try {
+                if (shutdown.get()) {
+                    return;
+                }
+                // QUIC connection has a lower idle timeout than the app layer. start a timer
+                // which checks with the app layer at regular intervals to decide whether to
+                // send a PING to keep the QUIC connection active.
+                startPingTimer();
+            } finally {
+                this.stateLock.unlock();
+            }
+        }
+    }
+
+    private void startPingTimer() {
+        assert stateLock.isHeldByCurrentThread() : "not holding state lock";
+        // we don't expect the timer to be started more than once
+        assert this.pingEvent == null : "PING timer already started";
+        final Optional<Long> quicIdleTimeout = getIdleTimeout();
+        assert quicIdleTimeout.isPresent() : "QUIC idle timeout is disabled, no need to start PING timer";
+        // potential PING generation every 75% of QUIC idle timeout
+        final long pingFrequencyMillis = (long) (0.75 * quicIdleTimeout.get());
+        assert pingFrequencyMillis > 0 : "unexpected ping frequency: " + pingFrequencyMillis;
+        final QuicTimerQueue timerQueue = connection.endpoint().timer();
+        final Deadline deadline = timeLine().instant().plusMillis(pingFrequencyMillis);
+        // create the timeout event and register with the QuicTimerQueue.
+        this.pingEvent = new PingEvent(deadline, pingFrequencyMillis);
+        timerQueue.offer(this.pingEvent);
+        if (debug.on()) {
+            debug.log("started periodic PING for connection,"
+                    + " ping event: " + this.pingEvent
+                    + " deadline: " + deadline);
+        } else {
+            Log.logQuic("{0} started periodic PING for connection,"
+                            + " ping event: {1} deadline: {2}",
+                    connection.logTag(), this.pingEvent, deadline);
+        }
+    }
+
+    private void stopPingTimer() {
+        assert stateLock.isHeldByCurrentThread() : "not holding state lock";
+        if (this.pingEvent == null) {
+            return;
+        }
+        final QuicEndpoint endpoint = this.connection.endpoint();
+        assert endpoint != null : "QUIC endpoint is null";
+        // disable the ping timer event
+        disableTimedEvent(endpoint.timer(), this.pingEvent);
+        this.pingEvent = null;
+        this.trafficGenerationCheck.set(null);
+    }
+
+
     /**
      * Attempts to notify the idle connection management that this connection should
      * be considered "in use". This way the idle connection management doesn't close
      * this connection during the time the connection is handed out from the pool and any
      * new stream created on that connection.
      *
-     * @return true if the connection has been successfully reserved and is {@link #isOpen()}. false
+     * @return true if the connection has been successfully reserved. false
      * otherwise; in which case the connection must not be handed out from the pool.
      */
     boolean tryReserveForUse() {
@@ -221,7 +294,7 @@ final class IdleTimeoutManager {
             }
             // if the connection is nearing idle timeout due to lack of traffic then
             // don't use it
-            final long lastPktActivity = lastPacketActivityAt;
+            final long lastPktActivity = lastPacketActivityNanos;
             final long currentNanos = System.nanoTime();
             final long inactivityMs = MILLISECONDS.convert((currentNanos - lastPktActivity),
                     NANOSECONDS);
@@ -232,7 +305,7 @@ final class IdleTimeoutManager {
                 return false;
             }
             // express interest in using the connection
-            this.lastUsageReservationAt = System.nanoTime();
+            this.lastUsageReservationNanos = System.nanoTime();
             return true;
         } finally {
             this.idleTerminationLock.unlock();
@@ -256,8 +329,9 @@ final class IdleTimeoutManager {
         return val == NO_IDLE_TIMEOUT ? Optional.empty() : Optional.of(val);
     }
 
-    void keepAlive() {
-        lastPacketActivityAt = System.nanoTime(); // TODO: timeline().instant()?
+    // consider the connection as active as of this moment
+    void markActive() {
+        lastPacketActivityNanos = System.nanoTime(); // TODO: timeline().instant()?
     }
 
     void shutdown() {
@@ -270,6 +344,7 @@ final class IdleTimeoutManager {
             // unregister the timeout events from the QuicTimerQueue
             stopIdleTerminationTimer();
             stopStreamDataBlockedTimer();
+            stopPingTimer();
         } finally {
             this.stateLock.unlock();
         }
@@ -318,6 +393,15 @@ final class IdleTimeoutManager {
         return this.connection.endpoint().timeSource();
     }
 
+    private static void disableTimedEvent(final QuicTimerQueue timer, final TimedEvent te) {
+        // disable the event (refreshDeadline() of TimedEvent will return Deadline.MAX)
+        final Deadline nextDeadline = te.nextDeadline;
+        if (!nextDeadline.equals(Deadline.MAX)) {
+            te.nextDeadline = Deadline.MAX;
+            timer.reschedule(te, Deadline.MIN);
+        }
+    }
+
     // called when the connection has been idle past its idle timeout duration
     private void idleTimedOut() {
         if (shutdown.get()) {
@@ -354,35 +438,51 @@ final class IdleTimeoutManager {
     }
 
     private long computeInactivityMillis() {
+        assert idleTerminationLock.isHeldByCurrentThread() : "not holding idle termination lock";
         final long currentNanos = System.nanoTime();
-        final long lastActiveNanos = Math.max(lastPacketActivityAt, lastUsageReservationAt);
+        final long lastActiveNanos = Math.max(lastPacketActivityNanos, lastUsageReservationNanos);
         return MILLISECONDS.convert((currentNanos - lastActiveNanos), NANOSECONDS);
     }
 
-    final class IdleTimeoutEvent implements QuicTimedEvent {
-        private final long eventId;
-        private volatile Deadline deadline;
-        private volatile Deadline nextDeadline;
+    sealed abstract class TimedEvent implements QuicTimedEvent {
+        protected final long eventId;
+        protected volatile Deadline deadline;
+        protected volatile Deadline nextDeadline;
 
-        private IdleTimeoutEvent(final Deadline deadline) {
+        private TimedEvent(final Deadline deadline) {
             assert deadline != null : "timeout deadline is null";
             this.deadline = this.nextDeadline = deadline;
             this.eventId = QuicTimerQueue.newEventId();
         }
 
         @Override
-        public Deadline deadline() {
+        public final Deadline deadline() {
             return this.deadline;
         }
 
         @Override
-        public Deadline refreshDeadline() {
+        public final Deadline refreshDeadline() {
             if (shutdown.get()) {
                 return this.deadline = this.nextDeadline = Deadline.MAX;
             }
             return this.deadline = this.nextDeadline;
         }
 
+        @Override
+        public final long eventId() {
+            return this.eventId;
+        }
+
+        @Override
+        public abstract Deadline handle();
+    }
+
+    final class IdleTimeoutEvent extends TimedEvent {
+
+        private IdleTimeoutEvent(final Deadline deadline) {
+            super(deadline);
+        }
+
         @Override
         public Deadline handle() {
             if (shutdown.get()) {
@@ -442,41 +542,18 @@ final class IdleTimeoutManager {
             }
         }
 
-        @Override
-        public long eventId() {
-            return this.eventId;
-        }
-
         @Override
         public String toString() {
             return "QuicIdleTimeoutEvent-" + this.eventId;
         }
     }
 
-    final class StreamDataBlockedEvent implements QuicTimedEvent {
-        private final long eventId;
+    final class StreamDataBlockedEvent extends TimedEvent {
         private final long timeoutMillis;
-        private volatile Deadline deadline;
-        private volatile Deadline nextDeadline;
 
         private StreamDataBlockedEvent(final Deadline deadline, final long timeoutMillis) {
-            assert deadline != null : "timeout deadline is null";
-            this.deadline = this.nextDeadline = deadline;
+            super(deadline);
             this.timeoutMillis = timeoutMillis;
-            this.eventId = QuicTimerQueue.newEventId();
-        }
-
-        @Override
-        public Deadline deadline() {
-            return this.deadline;
-        }
-
-        @Override
-        public Deadline refreshDeadline() {
-            if (shutdown.get()) {
-                return this.deadline = this.nextDeadline = Deadline.MAX;
-            }
-            return this.deadline = this.nextDeadline;
         }
 
         @Override
@@ -517,14 +594,95 @@ final class IdleTimeoutManager {
             }
         }
 
-        @Override
-        public long eventId() {
-            return this.eventId;
-        }
-
         @Override
         public String toString() {
             return "StreamDataBlockedEvent-" + this.eventId;
         }
     }
+
+
+    final class PingEvent extends TimedEvent {
+        private final long pingFrequencyNanos;
+        private final long idleTimeoutNanos;
+
+        private PingEvent(final Deadline deadline, final long pingFrequencyMillis) {
+            super(deadline);
+            this.pingFrequencyNanos = MILLISECONDS.toNanos(pingFrequencyMillis);
+            if (this.pingFrequencyNanos <= 0) {
+                throw new IllegalArgumentException("ping frequency is too small: "
+                        + pingFrequencyMillis + " milliseconds");
+            }
+            this.idleTimeoutNanos = MILLISECONDS.toNanos(getIdleTimeout().get());
+        }
+
+        @Override
+        public Deadline handle() {
+            if (shutdown.get()) {
+                // timeout manager is shutdown, nothing more to do
+                return this.nextDeadline = Deadline.MAX;
+            }
+            if (!shouldInitiateAppLayerCheck()) {
+                // reschedule for next round
+                this.nextDeadline = timeLine().instant().plusNanos(this.pingFrequencyNanos);
+                return this.nextDeadline;
+            }
+            // check with the app layer if traffic generation is required
+            final Supplier<Boolean> check = trafficGenerationCheck.get();
+            if (check == null) {
+                // generateTrafficCheck can be null if the timeout manager was shutdown
+                // when this event handling was in progress. don't send a PING frame
+                // in that case.
+                assert shutdown.get() : "trafficGenerationCheck is absent";
+                return this.nextDeadline = Deadline.MAX;
+            }
+            if (check.get()) {
+                // app layer OKed sending a PING
+                connection.requestSendPing();
+                if (debug.on()) {
+                    debug.log("enqueued a PING frame");
+                } else {
+                    Log.logQuic("{0} enqueued a PING frame", connection.logTag());
+                }
+            } else {
+                // app layer told us not to send a PING.
+                // we skip the PING generation only for the current round, no need
+                // to disable future PING checks
+                if (debug.on()) {
+                    debug.log("skipping PING generation");
+                } else {
+                    Log.logQuic("{0} skipping PING generation", connection.logTag());
+                }
+            }
+            this.nextDeadline = timeLine().instant().plusNanos(this.pingFrequencyNanos);
+            return this.nextDeadline;
+        }
+
+        @Override
+        public String toString() {
+            return "PingEvent-" + this.eventId;
+        }
+
+        // returns true if the app layer traffic generation check needs to be invoked,
+        // false otherwise.
+        private boolean shouldInitiateAppLayerCheck() {
+            final long lastPktAt = lastPacketActivityNanos;
+            final long now = System.nanoTime();
+            if ((now - lastPktAt) >= this.pingFrequencyNanos) {
+                // no traffic during the ping interval, initiate a app layer check
+                // to see if explicit traffic needs to be generated
+                return true;
+            }
+            // check if the connection will potentially idle terminate before the next
+            // ping check is scheduled, if yes, then initiate a app layer traffic
+            // generation check now
+            final long idleTerminationAt = lastPktAt + this.idleTimeoutNanos;
+            final long nextPingCheck = now + this.pingFrequencyNanos;
+            if (idleTerminationAt - nextPingCheck <= 0) {
+                return true;
+            }
+            // connection appears to be receiving traffic, no need to initiate app layer
+            // traffic generation check
+            return false;
+        }
+    }
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index d90ad1b217e..240f90852bc 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -1987,7 +1987,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
             case NONE -> throw new InternalError("Unrecognized packet type");
         }
         // packet has been processed successfully - connection isn't idle (RFC-9000, section 10.1)
-        this.terminator.keepAlive();
+        this.terminator.markActive();
         if (packetSpace != null) {
             packetSpace.packetReceived(
                     packetType,
@@ -2819,7 +2819,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
         // RFC-9000, section 10.1: An endpoint also restarts its idle timer when sending
         // an ack-eliciting packet ...
         if (packet.isAckEliciting()) {
-            this.terminator.keepAlive();
+            this.terminator.markActive();
         }
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicTimedEvent.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicTimedEvent.java
index 9269b12bf64..ac885c1950e 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicTimedEvent.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicTimedEvent.java
@@ -45,8 +45,7 @@ sealed interface QuicTimedEvent
         permits PacketSpaceManager.PacketTransmissionTask,
                 QuicTimerQueue.Marker,
                 QuicEndpoint.ClosedConnection,
-                IdleTimeoutManager.IdleTimeoutEvent,
-                IdleTimeoutManager.StreamDataBlockedEvent,
+                IdleTimeoutManager.TimedEvent,
                 QuicConnectionImpl.MaxInitialTimer {
 
     /**
diff --git a/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java b/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
new file mode 100644
index 00000000000..6b62fcf6043
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpOption;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestExchange;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_3;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/*
+ * @test
+ * @bug 8371802
+ * @summary verify that if a higher idle timeout is configured for a HTTP/3 connection
+ *          then a lower negotiated QUIC idle timeout doesn't cause QUIC to
+ *          idle terminate the connection
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.test.lib.net.SimpleSSLContext
+ *
+ * @comment this test has some explicit delays to simulate a idle connection, the timeout=180
+ *          is merely to provide some leeway to the test and prevent timing out the test on busy
+ *          systems
+ * @run junit/othervm/timeout=180 -Djdk.httpclient.quic.idleTimeout=30
+ *                    -Djdk.httpclient.keepalive.timeout.h3=120
+ *                    ${test.main.class}
+ */
+class H3IdleExceedsQuicIdleTimeout {
+
+    private static final String REQ_PATH = "/8371802";
+
+    private static HttpTestServer h3Server;
+    private static SSLContext sslCtx;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        sslCtx = new SimpleSSLContext().get();
+        assert sslCtx != null : "SSLContext is null";
+        h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslCtx);
+        h3Server.addHandler(new Handler(), REQ_PATH);
+        h3Server.start();
+        System.err.println("HTTP/3 server started at " + h3Server.getAddress());
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        if (h3Server != null) {
+            System.err.println("stopping server at " + h3Server.getAddress());
+            h3Server.stop();
+        }
+    }
+
+    /*
+     * With QUIC idle connection timeout configured to be lower than the HTTP/3 idle timeout,
+     * this test issues a HTTP/3 request and expects that request to establish a QUIC connection
+     * and receive a successful response. The test then stays idle for a duration larger
+     * than the QUIC idle timeout and issues a HTTP/3 request again after that idle period.
+     * The test then expects that the second request too is responded by the previously opened
+     * connection, thus proving that the QUIC layer did the necessary work to prevent the (idle)
+     * connection from terminating.
+     */
+    @Test
+    void testQUICKeepsConnAlive() throws Exception {
+        final long quicIdleTimeoutSecs = 30;
+        assertEquals(quicIdleTimeoutSecs,
+                Integer.parseInt(System.getProperty("jdk.httpclient.quic.idleTimeout")),
+                "unexpected QUIC idle timeout");
+        assertEquals(120,
+                Integer.parseInt(System.getProperty("jdk.httpclient.keepalive.timeout.h3")),
+                "unexpected HTTP/3 idle timeout");
+        try (final HttpClient client = HttpClient.newBuilder()
+                .sslContext(sslCtx)
+                .proxy(NO_PROXY)
+                .version(HTTP_3)
+                .build()) {
+
+            final URI req1URI = URIBuilder.newBuilder()
+                    .scheme("https")
+                    .host(h3Server.getAddress().getAddress())
+                    .port(h3Server.getAddress().getPort())
+                    .path(REQ_PATH)
+                    .query("i=1")
+                    .build();
+            System.err.println("issuing request " + req1URI);
+            final HttpRequest req1 = HttpRequest.newBuilder()
+                    .uri(req1URI)
+                    .setOption(HttpOption.H3_DISCOVERY, HTTP_3_URI_ONLY)
+                    .build();
+            final HttpResponse<Void> resp1 = client.send(req1, BodyHandlers.discarding());
+            assertEquals(200, resp1.statusCode(), "unexpected status code");
+            final String resp1ConnLabel = resp1.connectionLabel().orElse(null);
+            System.err.println("first request handled by connection: " + resp1ConnLabel);
+            assertNotNull(resp1ConnLabel, "missing connection label on response");
+            assertEquals(HTTP_3, resp1.version(), "unexpected response version");
+            // don't generate any more traffic from the HTTP/3 side for longer than the QUIC
+            // idle timeout
+            stayIdle(quicIdleTimeoutSecs + 13, TimeUnit.SECONDS);
+            // now send the HTTP/3 request and expect the same previous connection to handle
+            // respond to this request
+            final URI req2URI = URIBuilder.newBuilder()
+                    .scheme("https")
+                    .host(h3Server.getAddress().getAddress())
+                    .port(h3Server.getAddress().getPort())
+                    .path(REQ_PATH)
+                    .query("i=2")
+                    .build();
+            System.err.println("issuing request " + req2URI);
+            final HttpRequest req2 = HttpRequest.newBuilder()
+                    .uri(req2URI)
+                    .setOption(HttpOption.H3_DISCOVERY, HTTP_3_URI_ONLY)
+                    .build();
+            final HttpResponse<Void> resp2 = client.send(req2, BodyHandlers.discarding());
+            assertEquals(200, resp2.statusCode(), "unexpected status code");
+            final String resp2ConnLabel = resp2.connectionLabel().orElse(null);
+            System.err.println("second request handled by connection: " + resp2ConnLabel);
+            assertEquals(resp1ConnLabel, resp2ConnLabel, "second request handled by a different connection");
+            assertEquals(HTTP_3, resp2.version(), "unexpected response version");
+        }
+    }
+
+    private static void stayIdle(final long time, final TimeUnit unit) throws InterruptedException {
+        // await on a CountDownLatch which no one counts down. this is merely
+        // to avoid using Thread.sleep(...) and other similar constructs and then
+        // having to deal with spurious wakeups.
+        final boolean countedDown = new CountDownLatch(1).await(time, unit);
+        assertFalse(countedDown, "wasn't expected to be counted down");
+    }
+
+    private static final class Handler implements HttpTestHandler {
+        private static final int NO_RESP_BODY = 0;
+
+        @Override
+        public void handle(final HttpTestExchange exchange) throws IOException {
+            System.err.println("handling request " + exchange.getRequestURI());
+            exchange.sendResponseHeaders(200, NO_RESP_BODY);
+        }
+    }
+}

From 282f339406d67d189e06c0bf8c7ca8d8cf5774e0 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Sun, 30 Nov 2025 12:53:00 +0000
Subject: [PATCH 397/512] 8369432: Add Support for JDBC 4.5 MR

Reviewed-by: alanb, rriggs
---
 .../share/classes/java/sql/Array.java         |  38 +-
 src/java.sql/share/classes/java/sql/Blob.java |  42 +-
 src/java.sql/share/classes/java/sql/Clob.java |  40 +-
 .../share/classes/java/sql/Connection.java    | 316 +++++-
 .../classes/java/sql/DriverPropertyInfo.java  |  11 +-
 .../share/classes/java/sql/JDBCType.java      |  18 +-
 .../share/classes/java/sql/NClob.java         |  11 +-
 .../share/classes/java/sql/SQLPermission.java |  26 +-
 .../share/classes/java/sql/SQLUtils.java      | 431 +++++++++
 .../share/classes/java/sql/SQLXML.java        |  44 +-
 .../share/classes/java/sql/Statement.java     | 143 +--
 .../share/classes/java/sql/Timestamp.java     |  16 +-
 .../share/classes/java/sql/Types.java         |  23 +-
 .../share/classes/java/sql/package-info.java  |  42 +-
 .../test/sql/CallableStatementTests.java      | 101 +-
 .../sql/testng/test/sql/ConnectionTests.java  | 123 +++
 .../test/sql/PreparedStatementTests.java      | 103 +-
 .../sql/testng/test/sql/StatementTests.java   | 127 +--
 .../sql/testng/test/sql/TimestampTests.java   |  40 +-
 test/jdk/java/sql/testng/util/BaseTest.java   | 127 ++-
 .../testng/util/StubCallableStatement.java    |  20 +-
 .../java/sql/testng/util/StubConnection.java  |  19 +-
 .../sql/testng/util/StubDatabaseMetaData.java | 907 ++++++++++++++++++
 .../testng/util/StubPreparedStatement.java    |  23 +-
 .../java/sql/testng/util/StubStatement.java   |  17 +-
 .../test/rowset/serial/SQLInputImplTests.java |   6 +-
 .../rowset/serial/SQLOutputImplTests.java     |   3 +-
 27 files changed, 2460 insertions(+), 357 deletions(-)
 create mode 100644 src/java.sql/share/classes/java/sql/SQLUtils.java
 create mode 100644 test/jdk/java/sql/testng/test/sql/ConnectionTests.java
 create mode 100644 test/jdk/java/sql/testng/util/StubDatabaseMetaData.java

diff --git a/src/java.sql/share/classes/java/sql/Array.java b/src/java.sql/share/classes/java/sql/Array.java
index 1c42d3e5b79..8fe84f4f930 100644
--- a/src/java.sql/share/classes/java/sql/Array.java
+++ b/src/java.sql/share/classes/java/sql/Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,13 +61,19 @@ package java.sql;
  * If the connection's type map or a type map supplied to a method has no entry
  * for the base type, the elements are mapped according to the standard mapping.
  * <p>
+ * To release resources used by the {@code Array} object, applications must call
+ * either the {@link #free()} or the {@link #close()} method.  Any attempt to
+ * invoke a method other than {@link #free()} or {@link #close()} after the
+ * {@code Array} object has been closed, will result in a {@link SQLException}
+ * being thrown.
+ * <P>
  * All methods on the {@code Array} interface must be fully implemented if the
  * JDBC driver supports the data type.
  *
  * @since 1.2
  */
 
-public interface Array {
+public interface Array extends AutoCloseable {
 
   /**
    * Retrieves the SQL type name of the elements in
@@ -345,21 +351,35 @@ public interface Array {
                           java.util.Map<String,Class<?>> map)
     throws SQLException;
     /**
-     * This method frees the {@code Array} object and releases the resources that
-     * it holds. The object is invalid once the {@code free}
-     * method is called.
+     * Closes and releases the resources held by this {@code Array} object.
      * <p>
-     * After {@code free} has been called, any attempt to invoke a
-     * method other than {@code free} will result in a {@code SQLException}
-     * being thrown.  If {@code free} is called multiple times, the subsequent
-     * calls to {@code free} are treated as a no-op.
+     * If the {@code Array} object is already closed, then invoking this method
+     * has no effect.
      *
      * @throws SQLException if an error occurs releasing
      * the Array's resources
      * @throws SQLFeatureNotSupportedException if the JDBC driver does not support
      * this method
      * @since 1.6
+     * @see #close()
      */
     void free() throws SQLException;
 
+    /**
+     * Closes and releases the resources held by this {@code Array} object.
+     * <p>
+     * If the {@code Array} object is already closed, then invoking this method
+     * has no effect.
+     *
+     * @throws SQLException                    if an error occurs releasing
+     *                                         the Array's resources
+     * @throws SQLFeatureNotSupportedException if the JDBC driver
+     *                                         does not support this method
+     * @implSpec The default implementation calls the {@link #free()} method.
+     * @see #free()
+     * @since 26
+     */
+    default void close() throws SQLException {
+      free();
+    };
 }
diff --git a/src/java.sql/share/classes/java/sql/Blob.java b/src/java.sql/share/classes/java/sql/Blob.java
index 5bf9cfcb7ad..4f5619616eb 100644
--- a/src/java.sql/share/classes/java/sql/Blob.java
+++ b/src/java.sql/share/classes/java/sql/Blob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.io.InputStream;
  * the Java programming language of an SQL
  * {@code BLOB} value.  An SQL {@code BLOB} is a built-in type
  * that stores a Binary Large Object as a column value in a row of
- * a database table. By default drivers implement {@code Blob} using
+ * a database table. By default, drivers implement {@code Blob} using
  * an SQL {@code locator(BLOB)}, which means that a
  * {@code Blob} object contains a logical pointer to the
  * SQL {@code BLOB} data rather than the data itself.
@@ -50,13 +50,19 @@ import java.io.InputStream;
  * {@code BLOB} value. In addition, this interface has methods for updating
  * a {@code BLOB} value.
  * <p>
+ * To release resources used by the {@code Blob} object, applications must call
+ * either the {@link #free()} or the {@link #close()} method.  Any attempt to
+ * invoke a method other than {@link #free()} or {@link #close()} after the
+ * {@code Blob} object has been closed, will result in a {@link SQLException}
+ * being thrown.
+ * <P>
  * All methods on the {@code Blob} interface must be fully implemented if the
  * JDBC driver supports the data type.
  *
  * @since 1.2
  */
 
-public interface Blob {
+public interface Blob extends AutoCloseable {
 
   /**
    * Returns the number of bytes in the {@code BLOB} value
@@ -266,20 +272,17 @@ public interface Blob {
     void truncate(long len) throws SQLException;
 
     /**
-     * This method frees the {@code Blob} object and releases the resources that
-     * it holds. The object is invalid once the {@code free}
-     * method is called.
+     * Closes and releases the resources held by this {@code Blob} object.
      * <p>
-     * After {@code free} has been called, any attempt to invoke a
-     * method other than {@code free} will result in an {@code SQLException}
-     * being thrown.  If {@code free} is called multiple times, the subsequent
-     * calls to {@code free} are treated as a no-op.
+     * If the {@code Blob} object is already closed, then invoking this method
+     * has no effect.
      *
      * @throws SQLException if an error occurs releasing
      *         the Blob's resources
      * @throws SQLFeatureNotSupportedException if the JDBC driver
      *         does not support this method
      * @since 1.6
+     * @see #close()
      */
     void free() throws SQLException;
 
@@ -303,4 +306,23 @@ public interface Blob {
      * @since 1.6
      */
     InputStream getBinaryStream(long pos, long length) throws SQLException;
+
+    /**
+     * Closes and releases the resources held by this {@code Blob} object.
+     * <p>
+     * If the {@code Blob} object is already closed, then invoking this method
+     * has no effect.
+     *
+     * @implSpec The default implementation calls the {@link #free()} method.
+     *
+     * @throws SQLException if an error occurs releasing
+     *         the Blob's resources
+     * @throws SQLFeatureNotSupportedException if the JDBC driver
+     *         does not support this method
+     * @since 26
+     * @see #free()
+     */
+    default void close() throws SQLException {
+      free();
+    };
 }
diff --git a/src/java.sql/share/classes/java/sql/Clob.java b/src/java.sql/share/classes/java/sql/Clob.java
index 15e6897f711..141f7de81af 100644
--- a/src/java.sql/share/classes/java/sql/Clob.java
+++ b/src/java.sql/share/classes/java/sql/Clob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import java.io.Reader;
  * An SQL {@code CLOB} is a built-in type
  * that stores a Character Large Object as a column value in a row of
  * a database table.
- * By default drivers implement a {@code Clob} object using an SQL
+ * By default, drivers implement a {@code Clob} object using an SQL
  * {@code locator(CLOB)}, which means that a {@code Clob} object
  * contains a logical pointer to the SQL {@code CLOB} data rather than
  * the data itself. A {@code Clob} object is valid for the duration
@@ -49,13 +49,19 @@ import java.io.Reader;
  * access an SQL {@code CLOB} value.  In addition, this interface
  * has methods for updating a {@code CLOB} value.
  * <p>
+ * To release resources used by the {@code Clob} object, applications must call
+ * either the {@link #free()} or the {@link #close()} method.  Any attempt to
+ * invoke a method other than {@link #free()} or {@link #close()} after the
+ * {@code Clob} object has been closed, will result in a {@link SQLException}
+ * being thrown.
+ * <P>
  * All methods on the {@code Clob} interface must be
  * fully implemented if the JDBC driver supports the data type.
  *
  * @since 1.2
  */
 
-public interface Clob {
+public interface Clob extends AutoCloseable {
 
   /**
    * Retrieves the number of characters
@@ -310,14 +316,10 @@ public interface Clob {
     void truncate(long len) throws SQLException;
 
     /**
-     * This method releases the resources that the {@code Clob} object
-     * holds.  The object is invalid once the {@code free} method
-     * is called.
+     * Closes and releases the resources held by this {@code Clob} object.
      * <p>
-     * After {@code free} has been called, any attempt to invoke a
-     * method other than {@code free} will result in a {@code SQLException}
-     * being thrown.  If {@code free} is called multiple times, the subsequent
-     * calls to {@code free} are treated as a no-op.
+     * If the {@code Clob} object is already closed, then invoking this method
+     * has no effect.
      *
      * @throws SQLException if an error occurs releasing
      *         the Clob's resources
@@ -325,6 +327,7 @@ public interface Clob {
      * @throws SQLFeatureNotSupportedException if the JDBC driver
      *         does not support this method
      * @since 1.6
+     * @see #close()
      */
     void free() throws SQLException;
 
@@ -350,4 +353,21 @@ public interface Clob {
      */
     Reader getCharacterStream(long pos, long length) throws SQLException;
 
+    /**
+     * Closes and releases the resources held by this {@code Clob} object.
+     * <p>
+     * If the {@code Clob} object is already closed, then invoking this method
+     * has no effect.
+     *
+     * @throws SQLException                    if an error occurs releasing
+     *                                         the Clob's resources
+     * @throws SQLFeatureNotSupportedException if the JDBC driver
+     *                                         does not support this method
+     * @implSpec The default implementation calls the {@link #free()} method.
+     * @see #free()
+     * @since 26
+     */
+    default void close() throws SQLException {
+      free();
+    };
 }
diff --git a/src/java.sql/share/classes/java/sql/Connection.java b/src/java.sql/share/classes/java/sql/Connection.java
index 19f283f5762..946459adf7b 100644
--- a/src/java.sql/share/classes/java/sql/Connection.java
+++ b/src/java.sql/share/classes/java/sql/Connection.java
@@ -43,8 +43,8 @@ import java.util.Map;
  *  should use the appropriate {@code Connection} method such as
  *  {@code setAutoCommit} or {@code setTransactionIsolation}.
  *  Applications should not invoke SQL commands directly to change the connection's
- *   configuration when there is a JDBC method available.  By default a {@code Connection} object is in
- * auto-commit mode, which means that it automatically commits changes
+ *  configuration when there is a JDBC method available.  By default, a {@code Connection}
+ *  object is in auto-commit mode, which means that it automatically commits changes
  * after executing each statement. If auto-commit mode has been
  * disabled, the method {@code commit} must be called explicitly in
  * order to commit changes; otherwise, database changes will not be saved.
@@ -77,7 +77,7 @@ import java.util.Map;
  *      con.setTypeMap(map);
  * </pre>
  *
- * @see DriverManager#getConnection
+ * @see DriverManager#getConnection(String)
  * @see Statement
  * @see ResultSet
  * @see DatabaseMetaData
@@ -1505,7 +1505,7 @@ public interface Connection extends Wrapper, AutoCloseable {
      * </ul>
      * @throws SQLException if an error occurs
      * @since 9
-     * @see endRequest
+     * @see #endRequest()
      * @see javax.sql.PooledConnection
      */
     default void beginRequest() throws SQLException {
@@ -1548,7 +1548,7 @@ public interface Connection extends Wrapper, AutoCloseable {
      * </ul>
      * @throws SQLException if an error occurs
      * @since 9
-     * @see beginRequest
+     * @see #beginRequest()
      * @see javax.sql.PooledConnection
      */
     default void endRequest() throws SQLException {
@@ -1676,5 +1676,311 @@ public interface Connection extends Wrapper, AutoCloseable {
     default void setShardingKey(ShardingKey shardingKey) throws SQLException {
         throw new SQLFeatureNotSupportedException("setShardingKey not implemented");
     }
+    // JDBC 4.5
 
+    /**
+     * Returns a {@code String} enclosed in single quotes. Any occurrence of a
+     * single quote within the string will be replaced by two single quotes.
+     *
+     * <blockquote>
+     * <table class="striped">
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr><th scope="col">Value</th><th scope="col">Result</th></tr>
+     * </thead>
+     * <tbody style="text-align:center">
+     * <tr> <th scope="row">Hello</th> <td>'Hello'</td> </tr>
+     * <tr> <th scope="row">G'Day</th> <td>'G''Day'</td> </tr>
+     * <tr> <th scope="row">'G''Day'</th>
+     * <td>'''G''''Day'''</td> </tr>
+     * <tr> <th scope="row">I'''M</th> <td>'I''''''M'</td>
+     * </tr>
+     *
+     * </tbody>
+     * </table>
+     * </blockquote>
+     * @implSpec
+     * The default implementation creates the literal as:
+     * {@code "'" + val.replace("'", "''") + "'"}.
+     * @implNote
+     * JDBC driver implementations may need to provide their own implementation
+     * of this method in order to meet the requirements of the underlying
+     * datasource.
+     * @param val a character string
+     * @return A string enclosed by single quotes with every single quote
+     * converted to two single quotes
+     * @throws NullPointerException if val is {@code null}
+     * @throws SQLException if a database access error occurs
+     *
+     * @since 26
+     */
+    default String enquoteLiteral(String val) throws SQLException {
+        return SQLUtils.enquoteLiteral(val);
+    }
+
+    /**
+     * Returns a {@link #isSimpleIdentifier(String) simple SQL identifier} or a
+     * delimited identifier.  A delimited identifier represents the name of a
+     * database object such as a table, column, or view that is enclosed by a
+     * delimiter, which is typically a double quote as defined by the SQL standard.
+     * <p>
+     * If {@code identifier} is a simple SQL identifier:
+     * <ul>
+     * <li>If {@code alwaysDelimit} is {@code false}, return the original value</li>
+     * <li>if {@code alwaysDelimit} is {@code true}, enquote the original value
+     * and return as a delimited identifier</li>
+     * </ul>
+     *
+     * If {@code identifier} is not a simple SQL identifier, the delimited
+     * {@code identifier} to be returned must be enclosed by the delimiter
+     * returned from {@link DatabaseMetaData#getIdentifierQuoteString}. If
+     * the datasource does not support delimited identifiers, a
+     * {@code SQLFeatureNotSupportedException} is thrown.
+     * <p>
+     * A {@code SQLException} will be thrown if {@code identifier} contains any
+     * invalid characters within a delimited identifier or the identifier length
+     * is invalid for the datasource.
+     *
+     * @implSpec
+     * The default implementation uses the following criteria to
+     * determine a valid simple SQL identifier:
+     * <ul>
+     * <li>The string is not enclosed in double quotes</li>
+     * <li>The first character is an alphabetic character from a ({@code '\u005C0061'})
+     * through z ({@code '\u005Cu007A'}), or from A ({@code '\u005Cu0041'})
+     * through Z ({@code '\u005Cu005A'})</li>
+     * <li>The name only contains alphanumeric characters([0-9A-Za-z])
+     * or the character "_"</li>
+     * </ul>
+     *
+     * The default implementation will throw a {@code SQLException} if:
+     * <ul>
+     * <li> {@link DatabaseMetaData#getIdentifierQuoteString} does not return a
+     * double quote</li>
+     * <li>{@code identifier} contains a {@code null} character or double quote</li>
+     * <li>The length of {@code identifier} is less than 1 or greater than 128 characters
+     * </ul>
+     * <blockquote>
+     * <table class="striped" >
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr>
+     * <th scope="col">identifier</th>
+     * <th scope="col">alwaysDelimit</th>
+     * <th scope="col">Result</th></tr>
+     * </thead>
+     * <tbody>
+     * <tr>
+     * <th scope="row">Hello</th>
+     * <td>false</td>
+     * <td>Hello</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">Hello</th>
+     * <td>true</td>
+     * <td>"Hello"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">G'Day</th>
+     * <td>false</td>
+     * <td>"G'Day"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Bruce Wayne"</th>
+     * <td>false</td>
+     * <td>"Bruce Wayne"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Bruce Wayne"</th>
+     * <td>true</td>
+     * <td>"Bruce Wayne"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>false</td>
+     * <td>"select"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>true</td>
+     * <td>"select"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">GoodDay$</th>
+     * <td>false</td>
+     * <td>"GoodDay$"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">Hello"World</th>
+     * <td>false</td>
+     * <td>SQLException</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Hello"World"</th>
+     * <td>false</td>
+     * <td>SQLException</td>
+     * </tr>
+     * </tbody>
+     * </table>
+     * </blockquote>
+     * @implNote
+     * JDBC driver implementations may need to provide their own implementation
+     * of this method in order to meet the requirements of the underlying
+     * datasource.
+     * @param identifier a SQL identifier
+     * @param alwaysDelimit indicates if a simple SQL identifier should be
+     * returned as a delimited identifier
+     * @return A simple SQL identifier or a delimited identifier
+     * @throws SQLException if identifier is not a valid identifier
+     * @throws SQLFeatureNotSupportedException if the datasource does not support
+     * delimited identifiers
+     * @throws NullPointerException if identifier is {@code null}
+     *
+     * @since 26
+     */
+    default String enquoteIdentifier(String identifier, boolean alwaysDelimit) throws SQLException {
+        String delimiter = this.getMetaData().getIdentifierQuoteString();
+        return SQLUtils.enquoteIdentifier(delimiter, identifier, alwaysDelimit);
+    }
+
+    /**
+     * Returns whether {@code identifier} is a simple SQL identifier.
+     * A simple SQL identifier is referred to as regular (or ordinary) identifier
+     * within the SQL standard.  A regular identifier represents the name of a database
+     * object such as a table, column, or view.
+     * <p>
+     * The rules for a regular Identifier are:
+     * <ul>
+     * <li>The first character is an alphabetic character from a ({@code '\u005Cu0061'})
+     * through z ({@code '\u005Cu007A'}), or from A ({@code '\u005Cu0041'})
+     * through Z ({@code '\u005Cu005A'})</li>
+     * <li>The name only contains alphanumeric characters([0-9A-Za-z])
+     * or the character "_"</li>
+     * <li>It cannot be a SQL reserved word</li>
+     * </ul>
+     * <p>
+     * A datasource may have additional rules for a regular identifier such as:
+     * <ul>
+     * <li>Supports additional characters within the name based on
+     * the locale being used</li>
+     * <li>Supports a different maximum length for the identifier</li>
+     * </ul>
+     *
+     * @implSpec The default implementation uses the following criteria to
+     * determine a valid simple SQL identifier:
+     * <ul>
+     * <li>The identifier is not enclosed in double quotes</li>
+     * <li>The first character is an alphabetic character from a through z, or
+     * from A through Z</li>
+     * <li>The identifier only contains alphanumeric characters([0-9A-Za-z]) or
+     * the character "_"</li>
+     * <li>The identifier is not a SQL reserved word</li>
+     * <li>The identifier is between 1 and 128 characters in length inclusive</li>
+     * </ul>
+     *
+     * <blockquote>
+     * <table class="striped" >
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr>
+     * <th scope="col">identifier</th>
+     * <th scope="col">Simple Identifier</th>
+     * </thead>
+     *
+     * <tbody>
+     * <tr>
+     * <th scope="row">Hello</th>
+     * <td>true</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">G'Day</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Bruce Wayne"</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">GoodDay$</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">Hello"World</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Hello"World"</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>false</td>
+     * <tr>
+     * <th scope="row">"from"</th>
+     * <td>false</td>
+     * </tr>
+     * </tbody>
+     * </table>
+     * </blockquote>
+     * @implNote JDBC driver implementations may need to provide their own
+     * implementation of this method in order to meet the requirements of the
+     * underlying datasource.
+     * @param identifier a SQL identifier
+     * @return true if a simple SQL identifier, false otherwise
+     * @throws NullPointerException if identifier is {@code null}
+     * @throws SQLException if a database access error occurs
+     *
+     * @since 26
+     */
+    default boolean isSimpleIdentifier(String identifier) throws SQLException {
+        return SQLUtils.isSimpleIdentifier(identifier);
+    }
+
+    /**
+     * Returns a {@code String} representing a National Character Set Literal
+     * enclosed in single quotes and prefixed with a upper case letter N.
+     * Any occurrence of a single quote within the string will be replaced
+     * by two single quotes.
+     *
+     * <blockquote>
+     * <table class="striped">
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr>
+     * <th scope="col">Value</th>
+     * <th scope="col">Result</th>
+     * </tr>
+     * </thead>
+     * <tbody>
+     * <tr> <th scope="row">Hello</th> <td>N'Hello'</td> </tr>
+     * <tr> <th scope="row">G'Day</th> <td>N'G''Day'</td> </tr>
+     * <tr> <th scope="row">'G''Day'</th>
+     * <td>N'''G''''Day'''</td> </tr>
+     * <tr> <th scope="row">I'''M</th> <td>N'I''''''M'</td>
+     * <tr> <th scope="row">N'Hello'</th> <td>N'N''Hello'''</td> </tr>
+     *
+     * </tbody>
+     * </table>
+     * </blockquote>
+     * @implSpec
+     * The default implementation creates the literal as:
+     * {@code "N'" + val.replace("'", "''") + "'"}.
+     * @implNote
+     * JDBC driver implementations may need to provide their own implementation
+     * of this method in order to meet the requirements of the underlying
+     * datasource. An implementation of enquoteNCharLiteral may accept a different
+     * set of characters than that accepted by the same drivers implementation of
+     * enquoteLiteral.
+     * @param val a character string
+     * @return the result of replacing every single quote character in the
+     * argument by two single quote characters where this entire result is
+     * then prefixed with 'N'.
+     * @throws NullPointerException if val is {@code null}
+     * @throws SQLException if a database access error occurs
+     *
+     * @since 26
+     */
+    default String enquoteNCharLiteral(String val) throws SQLException {
+        return SQLUtils.enquoteNCharLiteral(val);
+    }
 }
diff --git a/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java b/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java
index c5f5fc30ee9..426a49b7ae0 100644
--- a/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java
+++ b/src/java.sql/share/classes/java/sql/DriverPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,13 @@
 
 package java.sql;
 
+import java.util.Properties;
+
 /**
  * <p>Driver properties for making a connection. The
- * {@code DriverPropertyInfo} class is of interest only to advanced programmers
- * who need to interact with a Driver via the method
- * {@code getDriverProperties} to discover
- * and supply properties for connections.
+ * {@code DriverPropertyInfo} class is of interest only to advanced programmers.
+ * The method {@link Driver#getPropertyInfo(String, Properties)} may be used
+ * to discover Driver properties.
  *
  * @since 1.1
  */
diff --git a/src/java.sql/share/classes/java/sql/JDBCType.java b/src/java.sql/share/classes/java/sql/JDBCType.java
index 9c9d314b7f1..9da51c27925 100644
--- a/src/java.sql/share/classes/java/sql/JDBCType.java
+++ b/src/java.sql/share/classes/java/sql/JDBCType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,7 +200,21 @@ public enum JDBCType implements SQLType {
     /**
      * Identifies the generic SQL type {@code TIMESTAMP_WITH_TIMEZONE}.
      */
-    TIMESTAMP_WITH_TIMEZONE(Types.TIMESTAMP_WITH_TIMEZONE);
+    TIMESTAMP_WITH_TIMEZONE(Types.TIMESTAMP_WITH_TIMEZONE),
+
+    /* JDBC 4.5 Types */
+
+    /**
+     * Identifies the generic SQL type {@code DECFLOAT}.
+     * @since 26
+     */
+    DECFLOAT(Types.DECFLOAT),
+
+    /**
+     * Identifies the generic SQL type {@code JSON}.
+     * @since 26
+     */
+    JSON(Types.JSON);
 
     /**
      * The Integer value for the JDBCType.  It maps to a value in
diff --git a/src/java.sql/share/classes/java/sql/NClob.java b/src/java.sql/share/classes/java/sql/NClob.java
index 587f6e1f843..0639f894146 100644
--- a/src/java.sql/share/classes/java/sql/NClob.java
+++ b/src/java.sql/share/classes/java/sql/NClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,8 @@ package java.sql;
  * An SQL {@code NCLOB} is a built-in type
  * that stores a Character Large Object using the National Character Set
  *  as a column value in a row of  a database table.
- * <P>The {@code NClob} interface extends the {@code Clob} interface
+ * <P>
+ * The {@code NClob} interface extends the {@code Clob} interface
  * which provides methods for getting the
  * length of an SQL {@code NCLOB} value,
  * for materializing a {@code NCLOB} value on the client, and for
@@ -44,6 +45,12 @@ package java.sql;
  * access an SQL {@code NCLOB} value.  In addition, this interface
  * has methods for updating a {@code NCLOB} value.
  * <p>
+ * To release resources used by the {@code NClob} object, applications must call
+ * either the {@link #free()} or the {@link #close()} method.  Any attempt to
+ * invoke a method other than {@link #free()} or {@link #close()} after the
+ * {@code NClob} object has been closed, will result in a {@link SQLException}
+ * being thrown.
+ * <P>
  * All methods on the {@code NClob} interface must be fully implemented if the
  * JDBC driver supports the data type.
  *
diff --git a/src/java.sql/share/classes/java/sql/SQLPermission.java b/src/java.sql/share/classes/java/sql/SQLPermission.java
index 84e41c51a33..f9a0c7e2ed6 100644
--- a/src/java.sql/share/classes/java/sql/SQLPermission.java
+++ b/src/java.sql/share/classes/java/sql/SQLPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,30 +29,14 @@ package java.sql;
 import java.security.*;
 
 /**
- * A {@code SQLPermission} object contains
- * a name (also referred to as a "target name") but no actions
- * list; there is either a named permission or there is not.
- * The target name is the name of the permission. The
- * naming convention follows the  hierarchical property naming convention.
- * In addition, an asterisk
- * may appear at the end of the name, following a ".", or by itself, to
- * signify a wildcard match. For example: {@code loadLibrary.*}
- * and {@code *} signify a wildcard match,
- * while {@code *loadLibrary} and {@code a*b} do not.
- *
- * @apiNote
- * This permission cannot be used for controlling access to resources
- * as the Security Manager is no longer supported.
+ * This class was only useful in conjunction with the {@link java.lang.SecurityManager},
+ * which is no longer supported. There is no replacement for this class.
  *
  * @since 1.3
- * @see java.security.BasicPermission
- * @see java.security.Permission
- * @see java.security.Permissions
- * @see java.security.PermissionCollection
- * @see java.lang.SecurityManager
  *
+ * @deprecated There is no replacement for this class.
  */
-
+@Deprecated(since="26", forRemoval=true)
 public final class SQLPermission extends BasicPermission {
 
     /**
diff --git a/src/java.sql/share/classes/java/sql/SQLUtils.java b/src/java.sql/share/classes/java/sql/SQLUtils.java
new file mode 100644
index 00000000000..49757d7e8ad
--- /dev/null
+++ b/src/java.sql/share/classes/java/sql/SQLUtils.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.sql;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Utility class used by the Connection & Statement interfaces for their
+ * shared default methods.
+ */
+class SQLUtils {
+    // Pattern used to verify if an identifier is a Simple SQL identifier
+    private static final Pattern SIMPLE_IDENTIFIER_PATTERN
+            = Pattern.compile("[\\p{Alpha}][\\p{Alnum}_]*");
+    // Pattern to check if an identifier contains a null character or a double quote
+     private static final Pattern INVALID_IDENTIFIER_CHARACTERS_PATTERN
+            = Pattern.compile("[^\u0000\"]+");
+     // SQL 2023 reserved words
+    private static final String[] SQL2023_RESERVED_WORDS = {
+            "ABS", "ABSENT", "ACOS", "ALL", "ALLOCATE", "ALTER", "AND", "ANY",
+            "ANY_VALUE", "ARE", "ARRAY", "ARRAY_AGG", "ARRAY_MAX_CARDINALITY",
+            "AS", "ASENSITIVE", "ASIN", "ASYMMETRIC", "AT", "ATAN",
+            "ATOMIC", "AUTHORIZATION", "AVG",
+            "BEGIN", "BEGIN_FRAME", "BEGIN_PARTITION", "BETWEEN", "BIGINT",
+            "BINARY", "BLOB", "BOOLEAN", "BOTH", "BTRIM", "BY",
+            "CALL", "CALLED", "CARDINALITY", "CASCADED", "CASE", "CAST", "CEIL",
+            "CEILING", "CHAR", "CHAR_LENGTH",
+            "CHARACTER", "CHARACTER_LENGTH", "CHECK", "CLASSIFIER", "CLOB",
+            "CLOSE", "COALESCE", "COLLATE", "COLLECT", "COLUMN", "COMMIT", "CONDITION",
+            "CONNECT", "CONSTRAINT", "CONTAINS", "CONVERT", "COPY", "CORR", "CORRESPONDING",
+            "COS", "COSH", "COUNT", "COVAR_POP", "COVAR_SAMP", "CREATE", "CROSS", "CUBE",
+            "CUME_DIST", "CURRENT",
+            "CURRENT_CATALOG", "CURRENT_DATE", "CURRENT_DEFAULT_TRANSFORM_GROUP", "CURRENT_PATH",
+            "CURRENT_ROLE", "CURRENT_SCHEMA", "CURRENT_TIME", "CURRENT_TIMESTAMP",
+            "CURRENT_TRANSFORM_GROUP_FOR_TYPE", "CURRENT_USER", "CURSOR", "CYCLE",
+            "DATE", "DAY", "DEALLOCATE", "DEC", "DECFLOAT", "DECIMAL", "DECLARE", "DEFAULT",
+            "DEFINE", "DELETE", "DENSE_RANK", "DEREF", "DESCRIBE", "DETERMINISTIC",
+            "DISCONNECT", "DISTINCT", "DOUBLE", "DROP", "DYNAMIC",
+            "EACH", "ELEMENT", "ELSE", "EMPTY", "END", "END_FRAME", "END_PARTITION",
+            "END-EXEC", "EQUALS", "ESCAPE", "EVERY", "EXCEPT", "EXEC", "EXECUTE",
+            "EXISTS", "EXP", "EXTERNAL", "EXTRACT",
+            "FALSE", "FETCH", "FILTER", "FIRST_VALUE", "FLOAT", "FLOOR", "FOR", "FOREIGN", "FRAME_ROW",
+            "FREE", "FROM", "FULL", "FUNCTION", "FUSION",
+            "GET", "GLOBAL", "GRANT", "GREATEST", "GROUP", "GROUPING", "GROUPS",
+            "HAVING", "HOLD", "HOUR",
+            "IDENTITY", "IN", "INDICATOR", "INITIAL", "INNER", "INOUT", "INSENSITIVE",
+            "INSERT", "INT", "INTEGER",
+            "INTERSECT", "INTERSECTION", "INTERVAL", "INTO", "IS",
+            "JOIN", "JSON", "JSON_ARRAY", "JSON_ARRAYAGG", "JSON_EXISTS",
+            "JSON_OBJECT", "JSON_OBJECTAGG", "JSON_QUERY", "JSON_SCALAR",
+            "JSON_SERIALIZE", "JSON_TABLE", "JSON_TABLE_PRIMITIVE", "JSON_VALUE",
+            "LAG", "LANGUAGE", "LARGE", " LAST_VALUE", "LATERAL", "LEAD",
+            "LEADING", "LEAST", "LEFT", "LIKE", "LIKE_REGEX", "LISTAGG",
+            "LN", "LOCAL", "LOCALTIME", "LOCALTIMESTAMP", "LOG", "LOG10",
+            "LOWER", "LPAD", "LTRIM",
+            "MATCH", "MATCH_NUMBER", "MATCH_RECOGNIZE", "MATCHES", "MAX",
+            "MEMBER", "MERGE", "METHOD", "MIN", "MINUTE", "MOD", "MODIFIES",
+            "MODULE", "MONTH", "MULTISET",
+            "NATIONAL", "NATURAL", "NCHAR", "NCLOB", "NEW", "NO", "NONE",
+            "NORMALIZE", "NOT", "NTH_VALUE", "NTILE", "NULL", "NULLIF", "NUMERIC",
+            "OCCURRENCES_REGEX", "OCTET_LENGTH", "OF", "OFFSET", "OLD", "OMIT",
+            "ON", "ONE", "ONLY", "OPEN", "OR", "ORDER", "OUT", "OUTER", "OUTPUT",
+            "OVER", "OVERLAPS", "OVERLAY",
+            "PARAMETER", "PARTITION", "PATTERN", "PER", "PERCENT", "PERCENT_RANK",
+            "PERCENTILE_CONT", "PERCENTILE_DISC", "PERIOD", "PORTION", "POSITION",
+            "POSITION_REGEX", "POWER", "PRECEDES",
+            "PRECISION", "PREPARE", "PRIMARY", "PROCEDURE", "PTF",
+            "RANGE", "RANK", "READS", "REAL", "RECURSIVE", "REF", "REFERENCES",
+            "REFERENCING", "REGR_AVGX", "REGR_AVGY", "REGR_COUNT", "REGR_INTERCEPT",
+            "REGR_R2", "REGR_SLOPE", "REGR_SXX", "REGR_SXY", "REGR_SYY",
+            "RELEASE", "RESULT", "RETURN", "RETURNS", "REVOKE", "RIGHT",
+            "ROLLBACK", "ROLLUP", "ROW", "ROW_NUMBER", "ROWS", "RPAD", "RTRIM",
+            "RUNNING",
+            "SAVEPOINT", "SCOPE", "SCROLL", "SEARCH", "SECOND", "SEEK",
+            "SELECT", "SENSITIVE", "SESSION_USER", "SET", "SHOW", "SIMILAR",
+            "SIN", "SINH", "SKIP", "SMALLINT",
+            "SOME", "SPECIFIC", "SPECIFICTYPE", "SQL", "SQLEXCEPTION", "SQLSTATE",
+            "SQLWARNING", "SQRT", "START", "STATIC", "STDDEV_POP", "STDDEV_SAMP",
+            "SUBMULTISET", "SUBSET", "SUBSTRING", "SUBSTRING_REGEX", "SUCCEEDS",
+            "SUM", "SYMMETRIC", "SYSTEM", "SYSTEM_TIME", "SYSTEM_USER",
+            "TABLE", "TABLESAMPLE", "TAN", "TANH", "THEN", "TIME", "TIMESTAMP",
+            "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO", "TRAILING", "TRANSLATE",
+            "TRANSLATE_REGEX", "TRANSLATION", "TREAT", "TRIGGER", "TRIM",
+            "TRIM_ARRAY", "TRUE", "TRUNCATE",
+            "UESCAPE", "UNION", "UNIQUE", "UNKNOWN", "UNNEST", "UPDATE", "UPPER",
+            "USER", "USING",
+            "VALUE", "VALUES", "VALUE_OF", "VAR_POP", "VAR_SAMP", "VARBINARY",
+            "VARCHAR", "VARYING", "VERSIONING",
+            "WHEN", "WHENEVER", "WHERE", "WHILE", "WIDTH_BUCKET", "WINDOW",
+            "WITH", "WITHIN", "WITHOUT",
+            "YEAR"
+    };
+    private static final Set<String> SQL_RESERVED_WORDS =
+            new HashSet<>(Arrays.asList(SQL2023_RESERVED_WORDS));
+
+    /**
+     * Returns a {@code String} enclosed in single quotes. Any occurrence of a
+     * single quote within the string will be replaced by two single quotes.
+     *
+     * <blockquote>
+     * <table class="striped">
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr><th scope="col">Value</th><th scope="col">Result</th></tr>
+     * </thead>
+     * <tbody style="text-align:center">
+     * <tr> <th scope="row">Hello</th> <td>'Hello'</td> </tr>
+     * <tr> <th scope="row">G'Day</th> <td>'G''Day'</td> </tr>
+     * <tr> <th scope="row">'G''Day'</th>
+     * <td>'''G''''Day'''</td> </tr>
+     * <tr> <th scope="row">I'''M</th> <td>'I''''''M'</td>
+     * </tr>
+     *
+     * </tbody>
+     * </table>
+     * </blockquote>
+     *
+     * @param val a character string
+     * @return A string enclosed by single quotes with every single quote
+     * converted to two single quotes
+     * @throws NullPointerException if val is {@code null}
+     * @throws SQLException         if a database access error occurs
+     * @implNote JDBC driver implementations may need to provide their own implementation
+     * of this method in order to meet the requirements of the underlying
+     * datasource.
+     */
+    static String enquoteLiteral(String val) throws SQLException {
+        return "'" + val.replace("'", "''") + "'";
+    }
+
+    /**
+     * Returns a {@link #isSimpleIdentifier(String) simple SQL identifier} or a
+     * delimited identifier.  A delimited identifier represents the name of a
+     * database object such as a table, column, or view that is enclosed by a
+     * delimiter, which is typically a double quote as defined by the SQL standard.
+     * <p>
+     * If {@code identifier} is a simple SQL identifier:
+     * <ul>
+     * <li>If {@code alwaysDelimit} is {@code false}, return the original value</li>
+     * <li>if {@code alwaysDelimit} is {@code true}, enquote the original value
+     * and return as a delimited identifier</li>
+     * </ul>
+     *
+     * If {@code identifier} is not a simple SQL identifier, the delimited
+     * {@code identifier} to be returned must be enclosed by the delimiter
+     * returned from {@link DatabaseMetaData#getIdentifierQuoteString}. If
+     * the datasource does not support delimited identifiers, a
+     * {@code SQLFeatureNotSupportedException} is thrown.
+     * <p>
+     * A {@code SQLException} will be thrown if {@code identifier} contains any
+     * invalid characters within a delimited identifier or the identifier length
+     * is invalid for the datasource.
+     *
+     * @implSpec
+     * The default implementation uses the following criteria to
+     * determine a valid simple SQL identifier:
+     * <ul>
+     * <li>The string is not enclosed in double quotes</li>
+     * <li>The first character is an alphabetic character from a ({@code '\u005C0061'})
+     * through z ({@code '\u005Cu007A'}), or from A ({@code '\u005Cu0041'})
+     * through Z ({@code '\u005Cu005A'})</li>
+     * <li>The name only contains alphanumeric characters or the character "_"</li>
+     * </ul>
+     *
+     * The default implementation will throw a {@code SQLException} if:
+     * <ul>
+     * <li> {@link DatabaseMetaData#getIdentifierQuoteString} does not return a
+     * double quote</li>
+     * <li>{@code identifier} contains a {@code null} character or double quote</li>
+     * <li>The length of {@code identifier} is less than 1 or greater than 128 characters
+     * </ul>
+     * <blockquote>
+     * <table class="striped" >
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr>
+     * <th scope="col">identifier</th>
+     * <th scope="col">alwaysDelimit</th>
+     * <th scope="col">Result</th></tr>
+     * </thead>
+     * <tbody>
+     * <tr>
+     * <th scope="row">Hello</th>
+     * <td>false</td>
+     * <td>Hello</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">Hello</th>
+     * <td>true</td>
+     * <td>"Hello"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">G'Day</th>
+     * <td>false</td>
+     * <td>"G'Day"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Bruce Wayne"</th>
+     * <td>false</td>
+     * <td>"Bruce Wayne"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Bruce Wayne"</th>
+     * <td>true</td>
+     * <td>"Bruce Wayne"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>false</td>
+     * <td>"select"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>true</td>
+     * <td>"select"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">GoodDay$</th>
+     * <td>false</td>
+     * <td>"GoodDay$"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">Hello"World</th>
+     * <td>false</td>
+     * <td>SQLException</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Hello"World"</th>
+     * <td>false</td>
+     * <td>SQLException</td>
+     * </tr>
+     * </tbody>
+     * </table>
+     * </blockquote>
+     * @implNote
+     * JDBC driver implementations may need to provide their own implementation
+     * of this method in order to meet the requirements of the underlying
+     * datasource.
+     * @param identifier a SQL identifier
+     * @param alwaysDelimit indicates if a simple SQL identifier should be
+     * returned as a delimited identifier
+     * @return A simple SQL identifier or a delimited identifier
+     * @throws SQLException if identifier is not a valid identifier
+     * @throws SQLFeatureNotSupportedException if the datasource does not support
+     * delimited identifiers
+     * @throws NullPointerException if identifier is {@code null}
+     */
+    static String enquoteIdentifier(String delimiter, String identifier, boolean alwaysDelimit) throws SQLException {
+        int len = identifier.length();
+        if (len < 1 || len > 128) {
+            throw new SQLException("Invalid identifier length");
+        }
+        if (!delimiter.equals("\"")) {
+           throw new SQLException("Unsupported delimiter");
+        }
+        if (isSimpleIdentifier(identifier)) {
+            return alwaysDelimit ? "\"" + identifier + "\"" : identifier;
+        }
+        if (identifier.matches("^\".+\"$")) {
+            identifier = identifier.substring(1, len - 1);
+        }
+        // Enclose the identifier in double quotes.  If the identifier
+        // contains a null character or a double quote, throw a SQLException
+        if (INVALID_IDENTIFIER_CHARACTERS_PATTERN.matcher(identifier).matches()) {
+            return "\"" + identifier + "\"";
+        } else {
+            throw new SQLException("Invalid name");
+        }
+    }
+
+    /**
+     * Returns whether {@code identifier} is a simple SQL identifier.
+     * A simple SQL identifier is referred to as regular (or ordinary) identifier
+     * within the SQL standard.  A regular identifier represents the name of a database
+     * object such as a table, column, or view.
+     * <p>
+     * The rules for a regular Identifier are:
+     * <ul>
+     * <li>The first character is an alphabetic character from a ({@code '\u005Cu0061'})
+     * through z ({@code '\u005Cu007A'}), or from A ({@code '\u005Cu0041'})
+     * through Z ({@code '\u005Cu005A'})</li>
+     * <li>The name only contains alphanumeric characters or the character "_"</li>
+     * <li>It cannot be a SQL reserved word</li>
+     * </ul>
+     * <p>
+     * A datasource may have additional rules for a regular identifier such as:
+     * <ul>
+     * <li>Supports additional characters within the name based on
+     * the locale being used</li>
+     * <li>Supports a different maximum length for the identifier</li>
+     * </ul>
+     *
+     * @implSpec The default implementation uses the following criteria to
+     * determine a valid simple SQL identifier:
+     * <ul>
+     * <li>The identifier is not enclosed in double quotes</li>
+     * <li>The first character is an alphabetic character from a through z, or
+     * from A through Z</li>
+     * <li>The identifier only contains alphanumeric characters or the character
+     * "_"</li>
+     * <li>The identifier is not a SQL reserved word</li>
+     * <li>The identifier is between 1 and 128 characters in length inclusive</li>
+     * </ul>
+     *
+     * <blockquote>
+     * <table class="striped" >
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr>
+     * <th scope="col">identifier</th>
+     * <th scope="col">Simple Identifier</th>
+     * </thead>
+     *
+     * <tbody>
+     * <tr>
+     * <th scope="row">Hello</th>
+     * <td>true</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">G'Day</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Bruce Wayne"</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">GoodDay$</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">Hello"World</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"Hello"World"</th>
+     * <td>false</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>false</td>
+     * <tr>
+     * <th scope="row">"from"</th>
+     * <td>false</td>
+     * </tr>
+     * </tbody>
+     * </table>
+     * </blockquote>
+     * @implNote JDBC driver implementations may need to provide their own
+     * implementation of this method in order to meet the requirements of the
+     * underlying datasource.
+     * @param identifier a SQL identifier
+     * @return true if a simple SQL identifier, false otherwise
+     * @throws NullPointerException if identifier is {@code null}
+     * @throws SQLException if a database access error occurs
+     */
+    static boolean isSimpleIdentifier(String identifier) throws SQLException {
+        int len = identifier.length();
+        return !SQL_RESERVED_WORDS.contains(identifier.toUpperCase()) &&
+                len >= 1 && len <= 128
+                && SIMPLE_IDENTIFIER_PATTERN.matcher(identifier).matches();
+    }
+
+    /**
+     * Returns a {@code String} representing a National Character Set Literal
+     * enclosed in single quotes and prefixed with an upper case letter N.
+     * Any occurrence of a single quote within the string will be replaced
+     * by two single quotes.
+     *
+     * <blockquote>
+     * <table class="striped">
+     * <caption>Examples of the conversion:</caption>
+     * <thead>
+     * <tr>
+     * <th scope="col">Value</th>
+     * <th scope="col">Result</th>
+     * </tr>
+     * </thead>
+     * <tbody>
+     * <tr> <th scope="row">Hello</th> <td>N'Hello'</td> </tr>
+     * <tr> <th scope="row">G'Day</th> <td>N'G''Day'</td> </tr>
+     * <tr> <th scope="row">'G''Day'</th>
+     * <td>N'''G''''Day'''</td> </tr>
+     * <tr> <th scope="row">I'''M</th> <td>N'I''''''M'</td>
+     * <tr> <th scope="row">N'Hello'</th> <td>N'N''Hello'''</td> </tr>
+     *
+     * </tbody>
+     * </table>
+     * </blockquote>
+     *
+     * @param val a character string
+     * @return the result of replacing every single quote character in the
+     * argument by two single quote characters where this entire result is
+     * then prefixed with 'N'.
+     * @throws NullPointerException if val is {@code null}
+     * @throws SQLException         if a database access error occurs
+     * @implNote JDBC driver implementations may need to provide their own implementation
+     * of this method in order to meet the requirements of the underlying
+     * datasource. An implementation of enquoteNCharLiteral may accept a different
+     * set of characters than that accepted by the same drivers implementation of
+     * enquoteLiteral.
+     */
+    static String enquoteNCharLiteral(String val) throws SQLException {
+        return "N'" + val.replace("'", "''") + "'";
+    }
+}
diff --git a/src/java.sql/share/classes/java/sql/SQLXML.java b/src/java.sql/share/classes/java/sql/SQLXML.java
index 3edae8a9508..70d481822e2 100644
--- a/src/java.sql/share/classes/java/sql/SQLXML.java
+++ b/src/java.sql/share/classes/java/sql/SQLXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -170,14 +170,19 @@ import javax.xml.transform.Source;
  * The conceptual states of writable and not writable determine if one
  * of the writing APIs will set a value or throw an exception.
  * <p>
- * The state moves from readable to not readable once free() or any of the
+ * The state moves from readable to not readable once close(), free() or any of the
  * reading APIs are called: getBinaryStream(), getCharacterStream(), getSource(), and getString().
  * Implementations may also change the state to not writable when this occurs.
  * <p>
- * The state moves from writable to not writable once free() or any of the
+ * The state moves from writable to not writable once close(), free() or any of the
  * writing APIs are called: setBinaryStream(), setCharacterStream(), setResult(), and setString().
  * Implementations may also change the state to not readable when this occurs.
- *
+ * <p>
+ * To release resources used by the {@code SQLXML} object, applications must call
+ * either the {@link #free()} or the {@link #close()} method.  Any attempt to
+ * invoke a method other than {@link #free()} or {@link #close()} after the
+ * {@code SQLXML} object has been closed, will result in a {@link SQLException}
+ * being thrown.
  * <p>
  * All methods on the {@code SQLXML} interface must be fully implemented if the
  * JDBC driver supports the data type.
@@ -188,21 +193,19 @@ import javax.xml.transform.Source;
  * @see javax.xml.xpath
  * @since 1.6
  */
-public interface SQLXML
+public interface SQLXML extends AutoCloseable
 {
   /**
-   * This method closes this object and releases the resources that it held.
-   * The SQL XML object becomes invalid and neither readable or writable
-   * when this method is called.
+   * Closes and releases the resources held by this {@code SQLXML} object.
+   * <p>
+   * If the {@code SQLXML} object is already closed, then invoking this method
+   * has no effect.
    *
-   * After {@code free} has been called, any attempt to invoke a
-   * method other than {@code free} will result in a {@code SQLException}
-   * being thrown.  If {@code free} is called multiple times, the subsequent
-   * calls to {@code free} are treated as a no-op.
    * @throws SQLException if there is an error freeing the XML value.
    * @throws SQLFeatureNotSupportedException if the JDBC driver does not support
    * this method
    * @since 1.6
+   * @see #close()
    */
   void free() throws SQLException;
 
@@ -424,4 +427,21 @@ public interface SQLXML
    */
   <T extends Result> T setResult(Class<T> resultClass) throws SQLException;
 
+  /**
+   * Closes and releases the resources held by this {@code SQLXML} object.
+   * <p>
+   * If the {@code SQLXML} object is already closed, then invoking this method
+   * has no effect.
+   *
+   * @throws SQLException                    if an error occurs releasing
+   *                                         the SQLXML's resources
+   * @throws SQLFeatureNotSupportedException if the JDBC driver
+   *                                         does not support this method
+   * @implSpec The default implementation calls the {@link #free()} method.
+   * @see #free()
+   * @since 26
+   */
+  default void close() throws SQLException {
+    free();
+  };
 }
diff --git a/src/java.sql/share/classes/java/sql/Statement.java b/src/java.sql/share/classes/java/sql/Statement.java
index bb5a5cfd64d..4da510f6749 100644
--- a/src/java.sql/share/classes/java/sql/Statement.java
+++ b/src/java.sql/share/classes/java/sql/Statement.java
@@ -25,9 +25,6 @@
 
 package java.sql;
 
-import java.util.regex.Pattern;
-import static java.util.stream.Collectors.joining;
-
 /**
  * <P>The object used for executing a static SQL statement
  * and returning the results it produces.
@@ -1395,6 +1392,9 @@ public interface Statement extends Wrapper, AutoCloseable {
      * </tbody>
      * </table>
      * </blockquote>
+     * @implSpec
+     * The default implementation creates the literal as:
+     * {@code "'" + val.replace("'", "''") + "'"}.
      * @implNote
      * JDBC driver implementations may need to provide their own implementation
      * of this method in order to meet the requirements of the underlying
@@ -1407,46 +1407,50 @@ public interface Statement extends Wrapper, AutoCloseable {
      *
      * @since 9
      */
-     default String enquoteLiteral(String val)  throws SQLException {
-         return "'" + val.replace("'", "''") +  "'";
+     default String enquoteLiteral(String val) throws SQLException {
+         return SQLUtils.enquoteLiteral(val);
     }
 
-
-     /**
-     * Returns a SQL identifier. If {@code identifier} is a simple SQL identifier:
+    /**
+     * Returns a {@link #isSimpleIdentifier(String) simple SQL identifier} or a
+     * delimited identifier.  A delimited identifier represents the name of a
+     * database object such as a table, column, or view that is enclosed by a
+     * delimiter, which is typically a double quote as defined by the SQL standard.
+     * <p>
+     * If {@code identifier} is a simple SQL identifier:
      * <ul>
-     * <li>Return the original value if {@code alwaysQuote} is
-     * {@code false}</li>
-     * <li>Return a delimited identifier if {@code alwaysQuote} is
-     * {@code true}</li>
+     * <li>If {@code alwaysDelimit} is {@code false}, return the original value</li>
+     * <li>if {@code alwaysDelimit} is {@code true}, enquote the original value
+     * and return as a delimited identifier</li>
      * </ul>
      *
-     * If {@code identifier} is not a simple SQL identifier, {@code identifier} will be
-     * enclosed in double quotes if not already present. If the datasource does
-     * not support double quotes for delimited identifiers, the
-     * identifier should be enclosed by the string returned from
-     * {@link DatabaseMetaData#getIdentifierQuoteString}.  If the datasource
-     * does not support delimited identifiers, a
-     * {@code SQLFeatureNotSupportedException} should be thrown.
+     * If {@code identifier} is not a simple SQL identifier, the delimited
+     * {@code identifier} to be returned must be enclosed by the delimiter
+     * returned from {@link DatabaseMetaData#getIdentifierQuoteString}. If
+     * the datasource does not support delimited identifiers, a
+     * {@code SQLFeatureNotSupportedException} is thrown.
      * <p>
      * A {@code SQLException} will be thrown if {@code identifier} contains any
-     * characters invalid in a delimited identifier or the identifier length is
-     * invalid for the datasource.
+     * invalid characters within a delimited identifier or the identifier length
+     * is invalid for the datasource.
      *
      * @implSpec
      * The default implementation uses the following criteria to
      * determine a valid simple SQL identifier:
      * <ul>
      * <li>The string is not enclosed in double quotes</li>
-     * <li>The first character is an alphabetic character from a through z, or
-     * from A through Z</li>
-     * <li>The name only contains alphanumeric characters or the character "_"</li>
+     * <li>The first character is an alphabetic character from a ({@code '\u005C0061'})
+     * through z ({@code '\u005Cu007A'}), or from A ({@code '\u005Cu0041'})
+     * through Z ({@code '\u005Cu005A'})</li>
+     * <li>The name only contains alphanumeric characters([0-9A-Za-z])
+     * or the character "_"</li>
      * </ul>
      *
      * The default implementation will throw a {@code SQLException} if:
      * <ul>
-     * <li>{@code identifier} contains a {@code null} character or double quote and is not
-     * a simple SQL identifier.</li>
+     * <li> {@link DatabaseMetaData#getIdentifierQuoteString} does not return a
+     * double quote</li>
+     * <li>{@code identifier} contains a {@code null} character or double quote</li>
      * <li>The length of {@code identifier} is less than 1 or greater than 128 characters
      * </ul>
      * <blockquote>
@@ -1455,7 +1459,7 @@ public interface Statement extends Wrapper, AutoCloseable {
      * <thead>
      * <tr>
      * <th scope="col">identifier</th>
-     * <th scope="col">alwaysQuote</th>
+     * <th scope="col">alwaysDelimit</th>
      * <th scope="col">Result</th></tr>
      * </thead>
      * <tbody>
@@ -1485,6 +1489,16 @@ public interface Statement extends Wrapper, AutoCloseable {
      * <td>"Bruce Wayne"</td>
      * </tr>
      * <tr>
+     * <th scope="row">"select"</th>
+     * <td>false</td>
+     * <td>"select"</td>
+     * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>true</td>
+     * <td>"select"</td>
+     * </tr>
+     * <tr>
      * <th scope="row">GoodDay$</th>
      * <td>false</td>
      * <td>"GoodDay$"</td>
@@ -1507,8 +1521,8 @@ public interface Statement extends Wrapper, AutoCloseable {
      * of this method in order to meet the requirements of the underlying
      * datasource.
      * @param identifier a SQL identifier
-     * @param alwaysQuote indicates if a simple SQL identifier should be
-     * returned as a quoted identifier
+     * @param alwaysDelimit indicates if a simple SQL identifier should be
+     * returned as a delimited identifier
      * @return A simple SQL identifier or a delimited identifier
      * @throws SQLException if identifier is not a valid identifier
      * @throws SQLFeatureNotSupportedException if the datasource does not support
@@ -1517,36 +1531,43 @@ public interface Statement extends Wrapper, AutoCloseable {
      *
      * @since 9
      */
-    default String enquoteIdentifier(String identifier, boolean alwaysQuote) throws SQLException {
-        int len = identifier.length();
-        if (len < 1 || len > 128) {
-            throw new SQLException("Invalid name");
-        }
-        if (Pattern.compile("[\\p{Alpha}][\\p{Alnum}_]*").matcher(identifier).matches()) {
-            return alwaysQuote ?  "\"" + identifier + "\"" : identifier;
-        }
-        if (identifier.matches("^\".+\"$")) {
-            identifier = identifier.substring(1, len - 1);
-        }
-        if (Pattern.compile("[^\u0000\"]+").matcher(identifier).matches()) {
-            return "\"" + identifier + "\"";
-        } else {
-            throw new SQLException("Invalid name");
-        }
+    default String enquoteIdentifier(String identifier, boolean alwaysDelimit) throws SQLException {
+        return getConnection().enquoteIdentifier(identifier,alwaysDelimit);
     }
 
     /**
-     * Retrieves whether {@code identifier} is a simple SQL identifier.
+     * Returns whether {@code identifier} is a simple SQL identifier.
+     * A simple SQL identifier is referred to as regular (or ordinary) identifier
+     * within the SQL standard.  A regular identifier represents the name of a database
+     * object such as a table, column, or view.
+     * <p>
+     * The rules for a regular Identifier are:
+     * <ul>
+     * <li>The first character is an alphabetic character from a ({@code '\u005Cu0061'})
+     * through z ({@code '\u005Cu007A'}), or from A ({@code '\u005Cu0041'})
+     * through Z ({@code '\u005Cu005A'})</li>
+     * <li>The name only contains alphanumeric characters([0-9A-Za-z]) or the
+     * character "_"</li>
+     * <li>It cannot be a SQL reserved word</li>
+     * </ul>
+     * <p>
+     * A datasource may have additional rules for a regular identifier such as:
+     * <ul>
+     * <li>Supports additional characters within the name based on
+     * the locale being used</li>
+     * <li>Supports a different maximum length for the identifier</li>
+     * </ul>
      *
      * @implSpec The default implementation uses the following criteria to
      * determine a valid simple SQL identifier:
      * <ul>
-     * <li>The string is not enclosed in double quotes</li>
+     * <li>The identifier is not enclosed in double quotes</li>
      * <li>The first character is an alphabetic character from a through z, or
      * from A through Z</li>
-     * <li>The string only contains alphanumeric characters or the character
-     * "_"</li>
-     * <li>The string is between 1 and 128 characters in length inclusive</li>
+     * <li>The identifier only contains alphanumeric characters([0-9A-Za-z])
+     * or the character "_"</li>
+     * <li>The identifier is not a SQL reserved word</li>
+     * <li>The identifier is between 1 and 128 characters in length inclusive</li>
      * </ul>
      *
      * <blockquote>
@@ -1583,6 +1604,13 @@ public interface Statement extends Wrapper, AutoCloseable {
      * <th scope="row">"Hello"World"</th>
      * <td>false</td>
      * </tr>
+     * <tr>
+     * <th scope="row">"select"</th>
+     * <td>false</td>
+     * <tr>
+     * <th scope="row">"from"</th>
+     * <td>false</td>
+     * </tr>
      * </tbody>
      * </table>
      * </blockquote>
@@ -1590,16 +1618,14 @@ public interface Statement extends Wrapper, AutoCloseable {
      * implementation of this method in order to meet the requirements of the
      * underlying datasource.
      * @param identifier a SQL identifier
-     * @return  true if  a simple SQL identifier, false otherwise
+     * @return true if a simple SQL identifier, false otherwise
      * @throws NullPointerException if identifier is {@code null}
      * @throws SQLException if a database access error occurs
      *
      * @since 9
      */
     default boolean isSimpleIdentifier(String identifier) throws SQLException {
-        int len = identifier.length();
-        return len >= 1 && len <= 128
-                && Pattern.compile("[\\p{Alpha}][\\p{Alnum}_]*").matcher(identifier).matches();
+        return SQLUtils.isSimpleIdentifier(identifier);
     }
 
     /**
@@ -1628,7 +1654,10 @@ public interface Statement extends Wrapper, AutoCloseable {
     * </tbody>
     * </table>
     * </blockquote>
-    * @implNote
+    * @implSpec
+    * The default implementation creates the literal as:
+    * {@code "N'" + val.replace("'", "''") + "'"}.
+    *  @implNote
     * JDBC driver implementations may need to provide their own implementation
     * of this method in order to meet the requirements of the underlying
     * datasource. An implementation of enquoteNCharLiteral may accept a different
@@ -1643,7 +1672,7 @@ public interface Statement extends Wrapper, AutoCloseable {
     *
     * @since 9
     */
-    default String enquoteNCharLiteral(String val)  throws SQLException {
-        return "N'" + val.replace("'", "''") +  "'";
+    default String enquoteNCharLiteral(String val) throws SQLException {
+        return SQLUtils.enquoteNCharLiteral(val);
    }
 }
diff --git a/src/java.sql/share/classes/java/sql/Timestamp.java b/src/java.sql/share/classes/java/sql/Timestamp.java
index a91ab7210c5..c550291bb95 100644
--- a/src/java.sql/share/classes/java/sql/Timestamp.java
+++ b/src/java.sql/share/classes/java/sql/Timestamp.java
@@ -54,10 +54,7 @@ import java.time.LocalDateTime;
  * because the nanos component of a date is unknown.
  * As a result, the {@code Timestamp.equals(Object)}
  * method is not symmetric with respect to the
- * {@code java.util.Date.equals(Object)}
- * method.  Also, the {@code hashCode} method uses the underlying
- * {@code java.util.Date}
- * implementation and therefore does not include nanos in its computation.
+ * {@code java.util.Date.equals(Object)} method.
  * <P>
  * Due to the differences between the {@code Timestamp} class
  * and the {@code java.util.Date}
@@ -465,10 +462,15 @@ public class Timestamp extends java.util.Date {
     }
 
     /**
-     * {@inheritDoc}
+     * Returns a hash code value for this Timestamp. The result is the
+     * exclusive OR of the two halves of the primitive {@code long}
+     * value returned by the {@link #getTime} method. That is,
+     * the hash code is the value of the expression:
+     * {@snippet :
+     *   (int)(this.getTime()^(this.getTime() >>> 32))
+     * }
      *
-     * The {@code hashCode} method uses the underlying {@code java.util.Date}
-     * implementation and therefore does not include nanos in its computation.
+     * @return a hash code value for this Timestamp.
      *
      */
     @Override
diff --git a/src/java.sql/share/classes/java/sql/Types.java b/src/java.sql/share/classes/java/sql/Types.java
index 2b3b571647b..778d782ddaf 100644
--- a/src/java.sql/share/classes/java/sql/Types.java
+++ b/src/java.sql/share/classes/java/sql/Types.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -339,6 +339,27 @@ public class Types {
      */
     public static final int TIMESTAMP_WITH_TIMEZONE = 2014;
 
+
+    //--------------------------JDBC 4.5 -----------------------------
+
+    /**
+     * The constant in the Java programming language, sometimes referred to
+     * as a type code, that identifies the generic SQL type
+     * {@code DECFLOAT}.
+     *
+     * @since 26
+     */
+    public static final int DECFLOAT = 2015;
+
+    /**
+     * The constant in the Java programming language, sometimes referred to
+     * as a type code, that identifies the generic SQL type
+     * {@code JSON}.
+     *
+     * @since 26
+     */
+    public static final int JSON = 2016;
+
     // Prevent instantiation
     private Types() {}
 }
diff --git a/src/java.sql/share/classes/java/sql/package-info.java b/src/java.sql/share/classes/java/sql/package-info.java
index 495119effac..64b23dba76f 100644
--- a/src/java.sql/share/classes/java/sql/package-info.java
+++ b/src/java.sql/share/classes/java/sql/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,20 +38,22 @@
  * use and update data from a spread sheet, flat file, or any other tabular
  * data source.
  *
- * <h2>What the JDBC 4.3 API Includes</h2>
- * The JDBC 4.3 API includes both
+ * <h2>What the JDBC 4.5 API Includes</h2>
+ * The JDBC 4.5 API includes both
  * the {@code java.sql} package, referred to as the JDBC core API,
  * and the {@code javax.sql} package, referred to as the JDBC Optional
  * Package API. This complete JDBC API
- * is included in the Java Standard Edition (Java SE), version 7.
+ * is included in the Java Standard Edition (Java SE).
  * The {@code javax.sql} package extends the functionality of the JDBC API
  * from a client-side API to a server-side API, and it is an essential part
  * of the Java  Enterprise Edition
  * (Java EE) technology.
  *
  * <h2>Versions</h2>
- * The JDBC 4.3 API incorporates all of the previous JDBC API versions:
+ * The JDBC 4.5 API incorporates all the previous JDBC API versions:
  * <UL>
+ *     <LI> The JDBC 4.4 API</li>
+ *     <LI> The JDBC 4.3 API</li>
  *     <LI> The JDBC 4.2 API</li>
  *     <LI> The JDBC 4.1 API</li>
  *     <LI> The JDBC 4.0 API</li>
@@ -70,6 +72,10 @@
  * Javadoc comments for the JDBC API,
  * they indicate the following:
  * <UL>
+ *     <LI>Since 26 -- new in the JDBC 4.5 API and part of the Java SE platform,
+ *         version 26</li>
+ *      <LI>Since 24 -- new in the JDBC 4.4 API and part of the Java SE platform,
+ *         version 24</li>
  *     <LI>Since 9 -- new in the JDBC 4.3 API and part of the Java SE platform,
  *         version 9</li>
  *     <LI>Since 1.8 -- new in the JDBC 4.2 API and part of the Java SE platform,
@@ -126,6 +132,7 @@
  *       <LI>{@code Blob} interface -- mapping for SQL {@code BLOB}
  *       <LI>{@code Clob} interface -- mapping for SQL {@code CLOB}
  *       <LI>{@code Date} class -- mapping for SQL {@code DATE}
+ *       <LI>{@code JDBCType} class -- provides enum constants for SQL types
  *       <LI>{@code NClob} interface -- mapping for SQL {@code NCLOB}
  *       <LI>{@code Ref} interface -- mapping for SQL {@code REF}
  *       <LI>{@code RowId} interface -- mapping for SQL {@code ROWID}
@@ -166,6 +173,26 @@
  *      </UL>
  * </UL>
  *
+ *     <h3>{@code java.sql} and {@code javax.sql} Features Introduced in the JDBC 4.5 API</h3>
+ *  <UL>
+ *      <LI>The interfaces {@code Array}, {@code Blob}, {@code Clob}, {@code NClob}
+ *      and  {@code SQLXML} now extend the {@code AutoCloseable} interface and
+ *      include a default {@code close} method implementation</LI>
+ *     <LI>Added support to {@code Connection} for enquoting literals
+ *     and simple identifiers</LI>
+ *      <LI> {@code SQLPermissions} has been deprecated for removal</LI>
+ *      <LI> The SQL Types {@code JSON} and {@code DECFLOAT} have been added to
+ *           {@code JDBCType} and {@code Types}</LI>
+ *  </UL>
+ *     <h3>{@code java.sql} and {@code javax.sql} Features Introduced in the JDBC 4.4 API</h3>
+ *  <UL>
+ *      <LI>Remove mention of {@code SecurityManager} and {@code SecurityException}
+ *            as the {@code SecurityManager} is no longer supported</LI>
+ *      <LI> {@code SQLPermissions} can no longer be used to control access to
+ *            resources as the {@code SecurityManager} is no longer supported</LI>
+ *     <LI>Added support to {@code Connection} for enquoting literals
+ *     and simple identifiers</LI>
+ *  </UL>
  *     <h3>{@code java.sql} and {@code javax.sql} Features Introduced in the JDBC 4.3 API</h3>
  * <UL>
  *     <LI>Added {@code Sharding} support</LI>
@@ -232,7 +259,6 @@
  *
  * </UL>
  *
- *
  * <h3>{@code java.sql} and {@code javax.sql} Features Introduced in the JDBC 3.0 API</h3>
  * <UL>
  *   <LI>Pooled statements -- reuse of statements associated with a pooled
@@ -288,7 +314,6 @@
  *       handling and passing data
  * </UL>
  *
- *
  * <h3>Custom Mapping of UDTs</h3>
  * A user-defined type (UDT) defined in SQL can be mapped to a class in the Java
  * programming language. An SQL structured type or an SQL {@code DISTINCT}
@@ -317,7 +342,7 @@
  * <h2>Package Specification</h2>
  *
  * <ul>
- *   <li><a href="https://jcp.org/en/jsr/detail?id=221">JDBC 4.3 Specification</a>
+ *   <li><a href="https://jcp.org/en/jsr/detail?id=221">JDBC 4.5 Specification</a>
  * </ul>
  *
  * <h2>Related Documentation</h2>
@@ -326,7 +351,6 @@
  *   <li><a href="http://docs.oracle.com/javase/tutorial/jdbc/basics/index.html">
  *           Lesson:JDBC Basics(The Java Tutorials &gt; JDBC Database Access)</a>
  *
- *  <li>&ldquo;<i>JDBC API Tutorial and Reference, Third Edition</i>&rdquo;
  * </ul>
  * @since 1.1
  */
diff --git a/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java b/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java
index f917b6af4dc..7a4fe15ecac 100644
--- a/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java
+++ b/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,108 @@
  */
 package test.sql;
 
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import util.StubCallableStatement;
+import org.testng.annotations.Test;
+import util.BaseTest;
+import util.StubConnection;
 
-public class CallableStatementTests extends PreparedStatementTests {
+import java.sql.CallableStatement;
+import java.sql.SQLException;
+
+import static org.testng.Assert.assertEquals;
+
+public class CallableStatementTests extends BaseTest {
+    private CallableStatement cstmt;
 
     @BeforeMethod
     public void setUpMethod() throws Exception {
-        stmt = new StubCallableStatement();
+        cstmt = new StubConnection().prepareCall("{call SuperHero_Proc(?)}");
     }
 
+    @AfterMethod
+    public void tearDownMethod() throws Exception {
+        cstmt.close();
+    }
 
+    /*
+     * Verify that enquoteLiteral creates a  valid literal and converts every
+     * single quote to two single quotes
+     */
+    @Test(dataProvider = "validEnquotedLiteralValues")
+    public void test00(String s, String expected) throws SQLException {
+        assertEquals(cstmt.enquoteLiteral(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * enquoteLiteral is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test01() throws SQLException {
+        cstmt.enquoteLiteral(null);
+    }
+
+    /*
+     * Validate that enquoteIdentifier returns the expected value
+     */
+    @Test(dataProvider = "validIdentifierValues")
+    public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
+        assertEquals(cstmt.enquoteIdentifier(s, alwaysQuote), expected);
+    }
+
+    /*
+     * Validate that a SQLException is thrown for values that are not valid
+     * for a SQL identifier
+     */
+    @Test(dataProvider = "invalidIdentifierValues",
+            expectedExceptions = SQLException.class)
+    public void test03(String s, boolean alwaysQuote) throws SQLException {
+        cstmt.enquoteIdentifier(s, alwaysQuote);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown is the string passed to
+     * enquoteIdentiifer is null
+     */
+    @Test(dataProvider = "trueFalse",
+            expectedExceptions = NullPointerException.class)
+    public void test04(boolean alwaysQuote) throws SQLException {
+        cstmt.enquoteIdentifier(null, alwaysQuote);
+    }
+
+    /*
+     * Validate that isSimpleIdentifier returns the expected value
+     */
+    @Test(dataProvider = "simpleIdentifierValues")
+    public void test05(String s, boolean expected) throws SQLException {
+        assertEquals(cstmt.isSimpleIdentifier(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * isSimpleIdentifier is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test06() throws SQLException {
+        cstmt.isSimpleIdentifier(null);
+    }
+
+    /*
+     * Verify that enquoteLiteral creates a  valid literal and converts every
+     * single quote to two single quotes
+     */
+    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    public void test07(String s, String expected) throws SQLException {
+        assertEquals(cstmt.enquoteNCharLiteral(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * enquoteNCharLiteral is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test08() throws SQLException {
+        cstmt.enquoteNCharLiteral(null);
+    }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/ConnectionTests.java b/test/jdk/java/sql/testng/test/sql/ConnectionTests.java
new file mode 100644
index 00000000000..f40c2784e4a
--- /dev/null
+++ b/test/jdk/java/sql/testng/test/sql/ConnectionTests.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.sql;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import util.BaseTest;
+import util.StubConnection;
+
+import java.sql.SQLException;
+
+import static org.testng.Assert.*;
+
+public class ConnectionTests extends BaseTest {
+
+    protected StubConnection conn;
+
+    @BeforeMethod
+    public void setUpMethod() throws Exception {
+        conn = new StubConnection();
+    }
+
+    /*
+     * Verify that enquoteLiteral creates a  valid literal and converts every
+     * single quote to two single quotes
+     */
+    @Test(dataProvider = "validEnquotedLiteralValues")
+    public void test00(String s, String expected) throws SQLException {
+        assertEquals(conn.enquoteLiteral(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * enquoteLiteral is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test01() throws SQLException {
+        conn.enquoteLiteral(null);
+    }
+
+    /*
+     * Validate that enquoteIdentifier returns the expected value
+     */
+    @Test(dataProvider = "validIdentifierValues")
+    public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
+        assertEquals(conn.enquoteIdentifier(s, alwaysQuote), expected);
+    }
+
+    /*
+     * Validate that a SQLException is thrown for values that are not valid
+     * for a SQL identifier
+     */
+    @Test(dataProvider = "invalidIdentifierValues",
+            expectedExceptions = SQLException.class)
+    public void test03(String s, boolean alwaysQuote) throws SQLException {
+        conn.enquoteIdentifier(s, alwaysQuote);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown is the string passed to
+     * enquoteIdentiifer is null
+     */
+    @Test(dataProvider = "trueFalse",
+            expectedExceptions = NullPointerException.class)
+    public void test04(boolean alwaysQuote) throws SQLException {
+        conn.enquoteIdentifier(null, alwaysQuote);
+    }
+
+    /*
+     * Validate that isSimpleIdentifier returns the expected value
+     */
+    @Test(dataProvider = "simpleIdentifierValues")
+    public void test05(String s, boolean expected) throws SQLException {
+        assertEquals(conn.isSimpleIdentifier(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * isSimpleIdentifier is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test06() throws SQLException {
+        conn.isSimpleIdentifier(null);
+    }
+
+    /*
+     * Verify that enquoteLiteral creates a  valid literal and converts every
+     * single quote to two single quotes
+     */
+    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    public void test07(String s, String expected) throws SQLException {
+        assertEquals(conn.enquoteNCharLiteral(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * enquoteNCharLiteral is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test08() throws SQLException {
+        conn.enquoteNCharLiteral(null);
+    }
+}
diff --git a/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java b/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java
index d54763189c5..7813038361d 100644
--- a/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java
+++ b/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,109 @@
  */
 package test.sql;
 
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import util.StubPreparedStatement;
+import org.testng.annotations.Test;
+import util.BaseTest;
+import util.StubConnection;
 
-public class PreparedStatementTests extends StatementTests {
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import static org.testng.Assert.assertEquals;
+
+public class PreparedStatementTests extends BaseTest {
+
+    private PreparedStatement pstmt;
 
     @BeforeMethod
     public void setUpMethod() throws Exception {
-        stmt = new StubPreparedStatement();
+        pstmt = new StubConnection().prepareStatement("Select * from foo were bar = ?");
     }
 
+    @AfterMethod
+    public void tearDownMethod() throws Exception {
+        pstmt.close();
+    }
+
+    /*
+     * Verify that enquoteLiteral creates a  valid literal and converts every
+     * single quote to two single quotes
+     */
+    @Test(dataProvider = "validEnquotedLiteralValues")
+    public void test00(String s, String expected) throws SQLException {
+        assertEquals(pstmt.enquoteLiteral(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * enquoteLiteral is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test01() throws SQLException {
+        pstmt.enquoteLiteral(null);
+    }
+
+    /*
+     * Validate that enquoteIdentifier returns the expected value
+     */
+    @Test(dataProvider = "validIdentifierValues")
+    public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
+        assertEquals(pstmt.enquoteIdentifier(s, alwaysQuote), expected);
+    }
+
+    /*
+     * Validate that a SQLException is thrown for values that are not valid
+     * for a SQL identifier
+     */
+    @Test(dataProvider = "invalidIdentifierValues",
+            expectedExceptions = SQLException.class)
+    public void test03(String s, boolean alwaysQuote) throws SQLException {
+        pstmt.enquoteIdentifier(s, alwaysQuote);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown is the string passed to
+     * enquoteIdentiifer is null
+     */
+    @Test(dataProvider = "trueFalse",
+            expectedExceptions = NullPointerException.class)
+    public void test04(boolean alwaysQuote) throws SQLException {
+        pstmt.enquoteIdentifier(null, alwaysQuote);
+    }
+
+    /*
+     * Validate that isSimpleIdentifier returns the expected value
+     */
+    @Test(dataProvider = "simpleIdentifierValues")
+    public void test05(String s, boolean expected) throws SQLException {
+        assertEquals(pstmt.isSimpleIdentifier(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * isSimpleIdentifier is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test06() throws SQLException {
+        pstmt.isSimpleIdentifier(null);
+    }
+
+    /*
+     * Verify that enquoteLiteral creates a  valid literal and converts every
+     * single quote to two single quotes
+     */
+    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    public void test07(String s, String expected) throws SQLException {
+        assertEquals(pstmt.enquoteNCharLiteral(s), expected);
+    }
+
+    /*
+     * Validate a NullPointerException is thrown if the string passed to
+     * enquoteNCharLiteral is null
+     */
+    @Test(expectedExceptions = NullPointerException.class)
+    public void test08() throws SQLException {
+        pstmt.enquoteNCharLiteral(null);
+    }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/StatementTests.java b/test/jdk/java/sql/testng/test/sql/StatementTests.java
index 88697b77f9d..f2bfe712eb5 100644
--- a/test/jdk/java/sql/testng/test/sql/StatementTests.java
+++ b/test/jdk/java/sql/testng/test/sql/StatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,38 +23,31 @@
 package test.sql;
 
 import java.sql.SQLException;
+import java.sql.Statement;
+
 import static org.testng.Assert.assertEquals;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.testng.annotations.*;
 import util.BaseTest;
-import util.StubStatement;
+import util.StubConnection;
 
 public class StatementTests extends BaseTest {
 
-    protected StubStatement stmt;
-    protected static String maxIdentifier;
+    private Statement stmt;
 
     @BeforeMethod
     public void setUpMethod() throws Exception {
-        stmt = new StubStatement();
+        stmt = new StubConnection().createStatement();
     }
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        int maxLen = 128;
-        StringBuilder s = new StringBuilder(maxLen);
-        for (int i = 0; i < maxLen; i++) {
-            s.append('a');
-        }
-        maxIdentifier = s.toString();
+    @AfterMethod
+    public void tearDownMethod() throws Exception {
+        stmt.close();
     }
     /*
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-
     @Test(dataProvider = "validEnquotedLiteralValues")
     public void test00(String s, String expected) throws SQLException {
         assertEquals(stmt.enquoteLiteral(s), expected);
@@ -67,7 +60,6 @@ public class StatementTests extends BaseTest {
     @Test(expectedExceptions = NullPointerException.class)
     public void test01() throws SQLException {
         stmt.enquoteLiteral(null);
-
     }
 
     /*
@@ -76,7 +68,6 @@ public class StatementTests extends BaseTest {
     @Test(dataProvider = "validIdentifierValues")
     public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
         assertEquals(stmt.enquoteIdentifier(s, alwaysQuote), expected);
-
     }
 
     /*
@@ -87,7 +78,6 @@ public class StatementTests extends BaseTest {
             expectedExceptions = SQLException.class)
     public void test03(String s, boolean alwaysQuote) throws SQLException {
         stmt.enquoteIdentifier(s, alwaysQuote);
-
     }
 
     /*
@@ -98,7 +88,6 @@ public class StatementTests extends BaseTest {
             expectedExceptions = NullPointerException.class)
     public void test04(boolean alwaysQuote) throws SQLException {
         stmt.enquoteIdentifier(null, alwaysQuote);
-
     }
 
     /*
@@ -116,7 +105,6 @@ public class StatementTests extends BaseTest {
     @Test(expectedExceptions = NullPointerException.class)
     public void test06() throws SQLException {
         stmt.isSimpleIdentifier(null);
-
     }
 
     /*
@@ -136,97 +124,4 @@ public class StatementTests extends BaseTest {
     public void test08() throws SQLException {
         stmt.enquoteNCharLiteral(null);
     }
-
-    /*
-     * DataProvider used to provide strings that will be used to validate
-     * that enquoteLiteral converts a string to a literal and every instance of
-     * a single quote will be converted into two single quotes in the literal.
-     */
-    @DataProvider(name = "validEnquotedLiteralValues")
-    protected Object[][] validEnquotedLiteralValues() {
-        return new Object[][]{
-            {"Hello", "'Hello'"},
-            {"G'Day", "'G''Day'"},
-            {"'G''Day'", "'''G''''Day'''"},
-            {"I'''M", "'I''''''M'"},
-            {"The Dark Knight", "'The Dark Knight'"}
-
-        };
-    }
-
-    /*
-     * DataProvider used to provide strings that will be used to validate
-     * that enqouteIdentifier returns a simple SQL Identifier or a double
-     * quoted identifier
-     */
-    @DataProvider(name = "validIdentifierValues")
-    protected Object[][] validEnquotedIdentifierValues() {
-        return new Object[][]{
-            {"b", false, "b"},
-            {"b", true, "\"b\""},
-            {maxIdentifier, false, maxIdentifier},
-            {maxIdentifier, true, "\"" + maxIdentifier + "\""},
-            {"Hello", false, "Hello"},
-            {"Hello", true, "\"Hello\""},
-            {"G'Day", false, "\"G'Day\""},
-            {"G'Day", true, "\"G'Day\""},
-            {"Bruce Wayne", false, "\"Bruce Wayne\""},
-            {"Bruce Wayne", true, "\"Bruce Wayne\""},
-            {"GoodDay$", false, "\"GoodDay$\""},
-            {"GoodDay$", true, "\"GoodDay$\""},};
-    }
-
-    /*
-     * DataProvider used to provide strings are invalid for enquoteIdentifier
-     * resulting in a SQLException being thrown
-     */
-    @DataProvider(name = "invalidIdentifierValues")
-    protected Object[][] invalidEnquotedIdentifierValues() {
-        return new Object[][]{
-            {"Hel\"lo", false},
-            {"\"Hel\"lo\"", true},
-            {"Hello" + '\0', false},
-            {"", false},
-            {maxIdentifier + 'a', false},};
-    }
-
-    /*
-     * DataProvider used to provide strings that will be used to validate
-     * that isSimpleIdentifier returns the correct value based on the
-     * identifier specified.
-     */
-    @DataProvider(name = "simpleIdentifierValues")
-    protected Object[][] simpleIdentifierValues() {
-        return new Object[][]{
-            {"b", true},
-            {"Hello", true},
-            {"\"Gotham\"", false},
-            {"G'Day", false},
-            {"Bruce Wayne", false},
-            {"GoodDay$", false},
-            {"Dick_Grayson", true},
-            {"Batmobile1966", true},
-            {maxIdentifier, true},
-            {maxIdentifier + 'a', false},
-            {"", false},};
-    }
-
-    /*
-     * DataProvider used to provide strings that will be used to validate
-     * that enquoteNCharLiteral converts a string to a National Character
-     * literal and every instance of
-     * a single quote will be converted into two single quotes in the literal.
-     */
-    @DataProvider(name = "validEnquotedNCharLiteralValues")
-    protected Object[][] validEnquotedNCharLiteralValues() {
-        return new Object[][]{
-            {"Hello", "N'Hello'"},
-            {"G'Day", "N'G''Day'"},
-            {"'G''Day'", "N'''G''''Day'''"},
-            {"I'''M", "N'I''''''M'"},
-            {"N'Hello'", "N'N''Hello'''"},
-            {"The Dark Knight", "N'The Dark Knight'"}
-
-        };
-    }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/TimestampTests.java b/test/jdk/java/sql/testng/test/sql/TimestampTests.java
index fefe3276d47..6baea9fa26f 100644
--- a/test/jdk/java/sql/testng/test/sql/TimestampTests.java
+++ b/test/jdk/java/sql/testng/test/sql/TimestampTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -667,6 +667,44 @@ public class TimestampTests extends BaseTest {
         expectThrows(IllegalArgumentException.class, () -> Timestamp.from(Instant.MIN));
     }
 
+    /*
+     * Validate that two Timestamp hashCode values are equal when
+     * the Timestamp values match, including the nanos.
+     */
+    @Test
+    public void test54() {
+        long t = System.currentTimeMillis();
+        Timestamp ts1 = new Timestamp(t);
+        Timestamp ts2 = new Timestamp(t);
+        ts1.setNanos(123456789);
+        ts2.setNanos(123456789);
+        assertTrue(ts1.equals(ts1));
+        assertTrue(ts2.equals(ts2));
+        assertTrue(ts1.equals(ts2));
+        // As the Timestamp values, including the nanos are the same, the hashCode's
+        // should be equal
+        assertEquals(ts1.hashCode(), ts2.hashCode());
+    }
+
+    /*
+     * Validate that two Timestamp hashCode values are not equal when only
+     * the nanos value for the Timestamp differ.
+     */
+    @Test
+    public void test55() {
+        long t = System.currentTimeMillis();
+        Timestamp ts1 = new Timestamp(t);
+        Timestamp ts2 = new Timestamp(t);
+        // Modify the nanos so that the Timestamp values differ
+        ts1.setNanos(123456789);
+        ts2.setNanos(987654321);
+        assertTrue(ts1.equals(ts1));
+        assertTrue(ts2.equals(ts2));
+        assertFalse(ts1.equals(ts2));
+        // As the nanos differ, the hashCode values should differ
+        assertNotEquals(ts1.hashCode(), ts2.hashCode());
+    }
+
     /*
      * DataProvider used to provide Timestamps which are not valid and are used
      * to validate that an IllegalArgumentException will be thrown from the
diff --git a/test/jdk/java/sql/testng/util/BaseTest.java b/test/jdk/java/sql/testng/util/BaseTest.java
index 6821940b7ce..8751183726d 100644
--- a/test/jdk/java/sql/testng/util/BaseTest.java
+++ b/test/jdk/java/sql/testng/util/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.security.Policy;
 import java.sql.JDBCType;
 import java.sql.SQLException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
+
 import org.testng.annotations.DataProvider;
 
 public class BaseTest {
@@ -47,22 +43,7 @@ public class BaseTest {
     protected final int errorCode = 21;
     protected final String[] msgs = {"Exception 1", "cause 1", "Exception 2",
         "Exception 3", "cause 2"};
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @BeforeMethod
-    public void setUpMethod() throws Exception {
-    }
-
-    @AfterMethod
-    public void tearDownMethod() throws Exception {
-    }
+    private static final String MAX_LENGTH_IDENTIFIER = "a".repeat(128);
 
     /*
      * Take some form of SQLException, serialize and deserialize it
@@ -92,13 +73,6 @@ public class BaseTest {
         return o1;
     }
 
-    /*
-     * Utility Method used to set the current Policy
-     */
-    protected static void setPolicy(Policy p) {
-        Policy.setPolicy(p);
-    }
-
     /*
      * DataProvider used to specify the value to set and check for
      * methods using boolean values
@@ -123,4 +97,99 @@ public class BaseTest {
         }
         return o;
     }
+
+    /*
+     * DataProvider used to provide strings that will be used to validate
+     * that enquoteLiteral converts a string to a literal and every instance of
+     * a single quote will be converted into two single quotes in the literal.
+     */
+    @DataProvider(name = "validEnquotedLiteralValues")
+    protected Object[][] validEnquotedLiteralValues() {
+        return new Object[][]{
+                {"Hello", "'Hello'"},
+                {"G'Day", "'G''Day'"},
+                {"'G''Day'", "'''G''''Day'''"},
+                {"I'''M", "'I''''''M'"},
+                {"The Dark Knight", "'The Dark Knight'"},
+        };
+    }
+
+    /*
+     * DataProvider used to provide strings that will be used to validate
+     * that enqouteIdentifier returns a simple SQL Identifier or a
+     * quoted identifier
+     */
+    @DataProvider(name = "validIdentifierValues")
+    protected Object[][] validEnquotedIdentifierValues() {
+        return new Object[][]{
+                {"b", false, "b"},
+                {"b", true, "\"b\""},
+                {MAX_LENGTH_IDENTIFIER, false, MAX_LENGTH_IDENTIFIER},
+                {MAX_LENGTH_IDENTIFIER, true, "\"" + MAX_LENGTH_IDENTIFIER + "\""},
+                {"Hello", false, "Hello"},
+                {"Hello", true, "\"Hello\""},
+                {"G'Day", false, "\"G'Day\""},
+                {"G'Day", true, "\"G'Day\""},
+                {"Bruce Wayne", false, "\"Bruce Wayne\""},
+                {"Bruce Wayne", true, "\"Bruce Wayne\""},
+                {"select", false, "\"select\""},
+                {"table", true, "\"table\""},
+                {"GoodDay$", false, "\"GoodDay$\""},
+                {"GoodDay$", true, "\"GoodDay$\""},};
+    }
+
+    /*
+     * DataProvider used to provide strings are invalid for enquoteIdentifier
+     * resulting in a SQLException being thrown
+     */
+    @DataProvider(name = "invalidIdentifierValues")
+    protected Object[][] invalidEnquotedIdentifierValues() {
+        return new Object[][]{
+                {"Hel\"lo", false},
+                {"\"Hel\"lo\"", true},
+                {"Hello" + '\0', false},
+                {"", false},
+                {MAX_LENGTH_IDENTIFIER + 'a', false},};
+    }
+
+    /*
+     * DataProvider used to provide strings that will be used to validate
+     * that isSimpleIdentifier returns the correct value based on the
+     * identifier specified.
+     */
+    @DataProvider(name = "simpleIdentifierValues")
+    protected Object[][] simpleIdentifierValues() {
+        return new Object[][]{
+                {"b", true},
+                {"Hello", true},
+                {"\"Gotham\"", false},
+                {"G'Day", false},
+                {"Bruce Wayne", false},
+                {"GoodDay$", false},
+                {"Dick_Grayson", true},
+                {"Batmobile1966", true},
+                {MAX_LENGTH_IDENTIFIER, true},
+                {MAX_LENGTH_IDENTIFIER + 'a', false},
+                {"", false},
+                {"select", false}
+            };
+    }
+
+    /*
+     * DataProvider used to provide strings that will be used to validate
+     * that enquoteNCharLiteral converts a string to a National Character
+     * literal and every instance of
+     * a single quote will be converted into two single quotes in the literal.
+     */
+    @DataProvider(name = "validEnquotedNCharLiteralValues")
+    protected Object[][] validEnquotedNCharLiteralValues() {
+        return new Object[][]{
+                {"Hello", "N'Hello'"},
+                {"G'Day", "N'G''Day'"},
+                {"'G''Day'", "N'''G''''Day'''"},
+                {"I'''M", "N'I''''''M'"},
+                {"N'Hello'", "N'N''Hello'''"},
+                {"The Dark Knight", "N'The Dark Knight'"}
+        };
+    }
 }
diff --git a/test/jdk/java/sql/testng/util/StubCallableStatement.java b/test/jdk/java/sql/testng/util/StubCallableStatement.java
index 1833a44d56d..4a7c27314bb 100644
--- a/test/jdk/java/sql/testng/util/StubCallableStatement.java
+++ b/test/jdk/java/sql/testng/util/StubCallableStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,17 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.Calendar;
 import java.util.Map;
 
 public class StubCallableStatement  extends StubPreparedStatement
 implements CallableStatement{
 
+    public StubCallableStatement(StubConnection con) {
+        super(con);
+    }
+
     @Override
     public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -608,5 +601,4 @@ implements CallableStatement{
     public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-
 }
diff --git a/test/jdk/java/sql/testng/util/StubConnection.java b/test/jdk/java/sql/testng/util/StubConnection.java
index b9ab97062d3..cd013572adc 100644
--- a/test/jdk/java/sql/testng/util/StubConnection.java
+++ b/test/jdk/java/sql/testng/util/StubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,20 +44,25 @@ import java.util.concurrent.Executor;
 public class StubConnection implements Connection {
 
     private boolean autoCommit = false;
+    private boolean isclosed;
+
+    public StubConnection() {
+        isclosed = false;
+    }
 
     @Override
     public Statement createStatement() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return new StubStatement(this);
     }
 
     @Override
     public PreparedStatement prepareStatement(String sql) throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return new StubPreparedStatement(this);
     }
 
     @Override
     public CallableStatement prepareCall(String sql) throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return new StubCallableStatement(this);
     }
 
     @Override
@@ -89,17 +94,17 @@ public class StubConnection implements Connection {
 
     @Override
     public void close() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        isclosed = true;
     }
 
     @Override
     public boolean isClosed() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return isclosed;
     }
 
     @Override
     public DatabaseMetaData getMetaData() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return new StubDatabaseMetaData();
     }
 
     @Override
diff --git a/test/jdk/java/sql/testng/util/StubDatabaseMetaData.java b/test/jdk/java/sql/testng/util/StubDatabaseMetaData.java
new file mode 100644
index 00000000000..3bf70afaa8f
--- /dev/null
+++ b/test/jdk/java/sql/testng/util/StubDatabaseMetaData.java
@@ -0,0 +1,907 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package util;
+
+import java.sql.*;
+
+public class StubDatabaseMetaData implements DatabaseMetaData {
+    @Override
+    public boolean allProceduresAreCallable() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean allTablesAreSelectable() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public String getURL() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getUserName() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public boolean isReadOnly() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean nullsAreSortedHigh() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean nullsAreSortedLow() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean nullsAreSortedAtStart() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean nullsAreSortedAtEnd() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public String getDatabaseProductName() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getDatabaseProductVersion() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getDriverName() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getDriverVersion() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public int getDriverMajorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getDriverMinorVersion() {
+        return 0;
+    }
+
+    @Override
+    public boolean usesLocalFiles() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean usesLocalFilePerTable() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMixedCaseIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean storesUpperCaseIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean storesLowerCaseIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean storesMixedCaseIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public String getIdentifierQuoteString() throws SQLException {
+        return "\"";
+    }
+
+    @Override
+    public String getSQLKeywords() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getNumericFunctions() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getStringFunctions() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getSystemFunctions() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getTimeDateFunctions() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getSearchStringEscape() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getExtraNameCharacters() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public boolean supportsAlterTableWithAddColumn() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsAlterTableWithDropColumn() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsColumnAliasing() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean nullPlusNonNullIsNull() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsConvert() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsConvert(int fromType, int toType) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsTableCorrelationNames() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsDifferentTableCorrelationNames() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsExpressionsInOrderBy() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsOrderByUnrelated() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsGroupBy() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsGroupByUnrelated() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsGroupByBeyondSelect() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsLikeEscapeClause() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMultipleResultSets() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMultipleTransactions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsNonNullableColumns() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMinimumSQLGrammar() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCoreSQLGrammar() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsExtendedSQLGrammar() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsANSI92EntryLevelSQL() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsANSI92IntermediateSQL() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsANSI92FullSQL() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsIntegrityEnhancementFacility() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsOuterJoins() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsFullOuterJoins() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsLimitedOuterJoins() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public String getSchemaTerm() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getProcedureTerm() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public String getCatalogTerm() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public boolean isCatalogAtStart() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public String getCatalogSeparator() throws SQLException {
+        return "";
+    }
+
+    @Override
+    public boolean supportsSchemasInDataManipulation() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSchemasInProcedureCalls() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSchemasInTableDefinitions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSchemasInIndexDefinitions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCatalogsInDataManipulation() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCatalogsInProcedureCalls() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCatalogsInTableDefinitions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsPositionedDelete() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsPositionedUpdate() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSelectForUpdate() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsStoredProcedures() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSubqueriesInComparisons() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSubqueriesInExists() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSubqueriesInIns() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSubqueriesInQuantifieds() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCorrelatedSubqueries() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsUnion() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsUnionAll() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public int getMaxBinaryLiteralLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxCharLiteralLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxColumnNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxColumnsInGroupBy() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxColumnsInIndex() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxColumnsInOrderBy() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxColumnsInSelect() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxColumnsInTable() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxConnections() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxCursorNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxIndexLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxSchemaNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxProcedureNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxCatalogNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxRowSize() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public int getMaxStatementLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxStatements() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxTableNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxTablesInSelect() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getMaxUserNameLength() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getDefaultTransactionIsolation() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean supportsTransactions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsTransactionIsolationLevel(int level) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsDataManipulationTransactionsOnly() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getSchemas() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getCatalogs() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getTableTypes() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getVersionColumns(String catalog, String schema, String table) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getTypeInfo() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean supportsResultSetType(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean ownUpdatesAreVisible(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean ownDeletesAreVisible(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean ownInsertsAreVisible(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean othersUpdatesAreVisible(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean othersDeletesAreVisible(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean othersInsertsAreVisible(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean updatesAreDetected(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean deletesAreDetected(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean insertsAreDetected(int type) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsBatchUpdates() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Connection getConnection() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean supportsSavepoints() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsNamedParameters() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMultipleOpenResults() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsGetGeneratedKeys() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean supportsResultSetHoldability(int holdability) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public int getResultSetHoldability() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getDatabaseMajorVersion() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getDatabaseMinorVersion() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getJDBCMajorVersion() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getJDBCMinorVersion() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getSQLStateType() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean locatorsUpdateCopy() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean supportsStatementPooling() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public RowIdLifetime getRowIdLifetime() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public ResultSet getClientInfoProperties() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean generatedKeyAlwaysReturned() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;
+    }
+}
diff --git a/test/jdk/java/sql/testng/util/StubPreparedStatement.java b/test/jdk/java/sql/testng/util/StubPreparedStatement.java
index 4e272bcee2d..a3b95a65f4e 100644
--- a/test/jdk/java/sql/testng/util/StubPreparedStatement.java
+++ b/test/jdk/java/sql/testng/util/StubPreparedStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,15 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.Calendar;
 
 public class StubPreparedStatement extends StubStatement implements PreparedStatement{
 
+    public StubPreparedStatement(StubConnection con) {
+        super(con);
+    }
+
     @Override
     public ResultSet executeQuery() throws SQLException {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -319,5 +309,4 @@ public class StubPreparedStatement extends StubStatement implements PreparedStat
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-
 }
diff --git a/test/jdk/java/sql/testng/util/StubStatement.java b/test/jdk/java/sql/testng/util/StubStatement.java
index df792e2e4fe..c8f6a3ac071 100644
--- a/test/jdk/java/sql/testng/util/StubStatement.java
+++ b/test/jdk/java/sql/testng/util/StubStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,15 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
-import java.util.regex.Pattern;
-import static java.util.stream.Collectors.joining;
 
 public class StubStatement implements Statement {
 
+    protected final Connection con;
+
+    public StubStatement(StubConnection con) {
+        this.con = con;
+    }
+
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -44,7 +48,7 @@ public class StubStatement implements Statement {
 
     @Override
     public void close() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        con.close();
     }
 
     @Override
@@ -169,7 +173,7 @@ public class StubStatement implements Statement {
 
     @Override
     public Connection getConnection() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return con;
     }
 
     @Override
@@ -251,7 +255,4 @@ public class StubStatement implements Statement {
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-
-
-
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
index 95cc508828a..5bd10ed8848 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,6 @@ public class SQLInputImplTests extends BaseTest {
     private final String sqlType = "SUPERHERO";
 
     @BeforeMethod
-    @Override
     public void setUpMethod() throws Exception {
         map = new HashMap<>();
         impl = new TestSQLDataImpl("TestSQLData");
@@ -120,7 +119,6 @@ public class SQLInputImplTests extends BaseTest {
         SQLInputImpl sqli = new SQLInputImpl(values, map);
         Object o = sqli.readObject();
         assertTrue(hero.equals(o));
-
     }
 
     /*
@@ -204,8 +202,6 @@ public class SQLInputImplTests extends BaseTest {
         Object[] values = {struct};
         SQLInputImpl sqli = new SQLInputImpl(values, map);
         Object o = sqli.readObject();
-
         assertTrue(hero.equals(o));
-
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java
index 00f62df6f79..1f90c9981a7 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,6 @@ public class SQLOutputImplTests extends BaseTest {
     private SQLOutputImpl outImpl;
 
     @BeforeMethod
-    @Override
     public void setUpMethod() throws Exception {
         results = new Vector();
         impl = new TestSQLDataImpl("TestSQLData");

From 3fd551f9926601b05a13a22b556d55425a37ee4d Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 1 Dec 2025 02:29:53 +0000
Subject: [PATCH 398/512] 8371769: TestMemoryInvisibleParent.java fails with
 java.nio.file.AccessDeniedException

Reviewed-by: sgehwolf, shade
---
 .../docker/TestMemoryInvisibleParent.java     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java b/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
index 208dd603615..68331f26766 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
@@ -33,6 +33,7 @@ import java.nio.file.Path;
 import java.nio.file.Files;
 import java.util.ArrayList;
 
+import jdk.test.lib.Platform;
 import jtreg.SkippedException;
 
 /*
@@ -64,6 +65,9 @@ public class TestMemoryInvisibleParent {
         if (DockerTestUtils.isRootless()) {
             throw new SkippedException("Test skipped in rootless mode");
         }
+        if (!Platform.isRoot()) {
+            throw new SkippedException("Test should be run as root");
+        }
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         if ("cgroupv1".equals(metrics.getProvider())) {
@@ -84,16 +88,16 @@ public class TestMemoryInvisibleParent {
         Common.logNewTestCase("Cgroup V1 hidden parent memory limit: " + valueToSet);
 
         try {
-        String cgroupParent = setParentWithLimit(valueToSet);
-        DockerRunOptions opts = new DockerRunOptions(imageName, "/jdk/bin/java", "-version", "-Xlog:os+container=trace");
-        opts.appendTestJavaOptions = false;
-        if (DockerTestUtils.isPodman()) {
-            // Podman needs to run this test with engine option --cgroup-manager=cgroupfs
-            opts.addEngineOpts("--cgroup-manager", "cgroupfs");
-        }
-        opts.addDockerOpts("--cgroup-parent=/" + cgroupParent);
-        Common.run(opts)
-              .shouldContain("Hierarchical Memory Limit is: " + expectedValue);
+            String cgroupParent = setParentWithLimit(valueToSet);
+            DockerRunOptions opts = new DockerRunOptions(imageName, "/jdk/bin/java", "-version", "-Xlog:os+container=trace");
+            opts.appendTestJavaOptions = false;
+            if (DockerTestUtils.isPodman()) {
+                // Podman needs to run this test with engine option --cgroup-manager=cgroupfs
+                opts.addEngineOpts("--cgroup-manager", "cgroupfs");
+            }
+            opts.addDockerOpts("--cgroup-parent=/" + cgroupParent);
+            Common.run(opts)
+                  .shouldContain("Hierarchical Memory Limit is: " + expectedValue);
         } finally {
             // Reset the parent memory limit to unlimited (-1)
             setParentWithLimit(UNLIMITED);

From c7a489db9e4a7d696623fc2155a5504d9d2adb0d Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Mon, 1 Dec 2025 05:40:51 +0000
Subject: [PATCH 399/512] 8372534: Update Libpng to 1.6.51

Reviewed-by: serb, azvegint, prr
---
 .../java.desktop/lib/ClientLibraries.gmk      |   3 +-
 src/java.desktop/share/legal/libpng.md        |  12 +-
 .../native/libsplashscreen/libpng/CHANGES     |  53 +++++++
 .../native/libsplashscreen/libpng/README      |   4 +-
 .../share/native/libsplashscreen/libpng/png.c |  28 ++--
 .../share/native/libsplashscreen/libpng/png.h |  73 +++++----
 .../native/libsplashscreen/libpng/pngconf.h   |  47 +++---
 .../native/libsplashscreen/libpng/pngdebug.h  |  11 +-
 .../native/libsplashscreen/libpng/pngerror.c  | 140 +-----------------
 .../native/libsplashscreen/libpng/pngget.c    |   2 +-
 .../native/libsplashscreen/libpng/pnginfo.h   |  51 ++-----
 .../libsplashscreen/libpng/pnglibconf.h       |   2 +-
 .../native/libsplashscreen/libpng/pngmem.c    |   2 +-
 .../native/libsplashscreen/libpng/pngpread.c  |  10 +-
 .../native/libsplashscreen/libpng/pngpriv.h   |  88 ++++++++---
 .../native/libsplashscreen/libpng/pngread.c   |  87 ++++++++++-
 .../native/libsplashscreen/libpng/pngrio.c    |   4 +-
 .../native/libsplashscreen/libpng/pngrtran.c  | 116 ++++++++++-----
 .../native/libsplashscreen/libpng/pngrutil.c  |  14 +-
 .../native/libsplashscreen/libpng/pngset.c    |  19 +--
 .../native/libsplashscreen/libpng/pngstruct.h |  16 +-
 21 files changed, 436 insertions(+), 346 deletions(-)

diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index b036973b776..4cd7f5bac90 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -237,7 +237,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
       DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
       DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
-      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized unused-function, \
+      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized, \
       DISABLED_WARNINGS_gcc_pngerror.c := maybe-uninitialized, \
       DISABLED_WARNINGS_gcc_splashscreen_gfx_impl.c := implicit-fallthrough \
           maybe-uninitialized, \
@@ -248,7 +248,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_clang := deprecated-non-prototype, \
       DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
       DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_png.c := unused-function, \
       DISABLED_WARNINGS_clang_splashscreen_impl.c := sign-compare \
           unused-but-set-variable unused-function, \
       DISABLED_WARNINGS_clang_splashscreen_png.c := \
diff --git a/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md
index d43ccf2e8e4..8899491c6c0 100644
--- a/src/java.desktop/share/legal/libpng.md
+++ b/src/java.desktop/share/legal/libpng.md
@@ -1,4 +1,4 @@
-## libpng v1.6.47
+## libpng v1.6.51
 
 ### libpng License
 <pre>
@@ -9,7 +9,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
-Copyright (c) 1995-2025 The PNG Reference Library Authors.
+Copyright (C) 1995-2025 The PNG Reference Library Authors.
 Copyright (C) 2018-2025 Cosmin Truta
 Copyright (C) 1998-2018 Glenn Randers-Pehrson
 Copyright (C) 1996-1997 Andreas Dilger
@@ -173,6 +173,7 @@ Authors, for copyright and licensing purposes.
  * Lucas Chollet
  * Magnus Holmgren
  * Mandar Sahastrabuddhe
+ * Manfred Schlaegl
  * Mans Rullgard
  * Matt Sarett
  * Mike Klein
@@ -184,6 +185,7 @@ Authors, for copyright and licensing purposes.
  * Samuel Williams
  * Simon-Pierre Cadieux
  * Tim Wegner
+ * Tobias Stoeckmann
  * Tom Lane
  * Tom Tanner
  * Vadim Barkov
@@ -193,8 +195,9 @@ Authors, for copyright and licensing purposes.
     - Zixu Wang (王子旭)
  * Arm Holdings
     - Richard Townsend
- * Google Inc.
+ * Google LLC
     - Dan Field
+    - Dragoș Tiselice
     - Leon Scroggins III
     - Matt Sarett
     - Mike Klein
@@ -204,6 +207,8 @@ Authors, for copyright and licensing purposes.
     - GuXiWei (顾希伟)
     - JinBo (金波)
     - ZhangLixia (张利霞)
+ * Samsung Group
+    - Filip Wasil
 
 The build projects, the build scripts, the test scripts, and other
 files in the "projects", "scripts" and "tests" directories, have
@@ -214,3 +219,4 @@ of the tools-generated files that are distributed with libpng, have
 other copyright owners, and are released under other open source
 licenses.
 ```
+
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
index 834b5e19277..2478fd0fc08 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
@@ -6251,6 +6251,59 @@ Version 1.6.47 [February 18, 2025]
     colorspace precedence rules, due to pre-existing colorspace checks.
     (Reported by Bob Friesenhahn; fixed by John Bowler)
 
+Version 1.6.48 [April 30, 2025]
+  Fixed the floating-point version of the mDCv setter `png_set_mDCv`.
+    (Reported by Mohit Bakshi; fixed by John Bowler)
+  Added #error directives to discourage the inclusion of private
+    libpng implementation header files in PNG-supporting applications.
+  Added the CMake build option `PNG_LIBCONF_HEADER`, to be used as an
+    alternative to `DFA_XTRA`.
+  Removed the Travis CI configuration files, with heartfelt thanks for
+    their generous support of our project over the past five years!
+
+Version 1.6.49 [June 12, 2025]
+  Added SIMD-optimized code for the RISC-V Vector Extension (RVV).
+    (Contributed by Manfred Schlaegl, Dragos Tiselice and Filip Wasil)
+  Added various fixes and improvements to the build scripts and to
+    the sample code.
+
+Version 1.6.50 [July 1, 2025]
+  Improved the detection of the RVV Extension on the RISC-V platform.
+    (Contributed by Filip Wasil)
+  Replaced inline ASM with C intrinsics in the RVV code.
+    (Contributed by Filip Wasil)
+  Fixed a decoder defect in which unknown chunks trailing IDAT, set
+    to go through the unknown chunk handler, incorrectly triggered
+    out-of-place IEND errors.
+    (Contributed by John Bowler)
+  Fixed the CMake file for cross-platform builds that require `libm`.
+
+Version 1.6.51 [November 21, 2025]
+  Fixed CVE-2025-64505 (moderate severity):
+    Heap buffer overflow in `png_do_quantize` via malformed palette index.
+    (Reported by Samsung; analyzed by Fabio Gritti.)
+  Fixed CVE-2025-64506 (moderate severity):
+    Heap buffer over-read in `png_write_image_8bit` with 8-bit input and
+    `convert_to_8bit` enabled.
+    (Reported by Samsung and <weijinjinnihao@users.noreply.github.com>;
+    analyzed by Fabio Gritti.)
+  Fixed CVE-2025-64720 (high severity):
+    Buffer overflow in `png_image_read_composite` via incorrect palette
+    premultiplication.
+    (Reported by Samsung; analyzed by John Bowler.)
+  Fixed CVE-2025-65018 (high severity):
+    Heap buffer overflow in `png_combine_row` triggered via
+    `png_image_finish_read`.
+    (Reported by <yosiimich@users.noreply.github.com>.)
+  Fixed a memory leak in `png_set_quantize`.
+    (Reported by Samsung; analyzed by Fabio Gritti.)
+  Removed the experimental and incomplete ERROR_NUMBERS code.
+    (Contributed by Tobias Stoeckmann.)
+  Improved the RISC-V vector extension support; required RVV 1.0 or newer.
+    (Contributed by Filip Wasil.)
+  Added GitHub Actions workflows for automated testing.
+  Performed various refactorings and cleanups.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
 Subscription is required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README
index 57952fb215a..5ea329ee3da 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/README
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.47
+README for libpng version 1.6.51
 ================================
 
 See the note about version numbers near the top of `png.h`.
@@ -147,6 +147,7 @@ Files included in this distribution
     loongarch/    =>  Optimized code for LoongArch LSX
     mips/         =>  Optimized code for MIPS MSA and MIPS MMI
     powerpc/      =>  Optimized code for PowerPC VSX
+    riscv/        =>  Optimized code for the RISC-V platform
     ci/           =>  Scripts for continuous integration
     contrib/      =>  External contributions
         arm-neon/     =>  Optimized code for the ARM-NEON platform
@@ -162,6 +163,7 @@ Files included in this distribution
                           programs demonstrating the use of pngusr.dfa
         pngminus/     =>  Simple pnm2png and png2pnm programs
         pngsuite/     =>  Test images
+        riscv-rvv/    =>  Optimized code for the RISC-V Vector platform
         testpngs/     =>  Test images
         tools/        =>  Various tools
         visupng/      =>  VisualPng, a Windows viewer for PNG images
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
index 7b6de2f8ec3..7d85e7c8d5f 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
@@ -42,7 +42,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_47 Your_png_h_is_not_version_1_6_47;
+typedef png_libpng_version_1_6_51 Your_png_h_is_not_version_1_6_51;
 
 /* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
  * corresponding macro definitions.  This causes a compile time failure if
@@ -137,10 +137,16 @@ png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
    if (png_ptr == NULL)
       return NULL;
 
-   if (items >= (~(png_alloc_size_t)0)/size)
+   /* This check against overflow is vestigial, dating back from
+    * the old times when png_zalloc used to be an exported function.
+    * We're still keeping it here for now, as an extra-cautious
+    * prevention against programming errors inside zlib, although it
+    * should rather be a debug-time assertion instead.
+    */
+   if (size != 0 && items >= (~(png_alloc_size_t)0) / size)
    {
-      png_warning (png_voidcast(png_structrp, png_ptr),
-          "Potential overflow in png_zalloc()");
+      png_warning(png_voidcast(png_structrp, png_ptr),
+                  "Potential overflow in png_zalloc()");
       return NULL;
    }
 
@@ -267,10 +273,6 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
       png_warning(png_ptr, m);
 #endif
 
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-      png_ptr->flags = 0;
-#endif
-
       return 0;
    }
 
@@ -729,7 +731,7 @@ png_get_io_ptr(png_const_structrp png_ptr)
  * function of your own because "FILE *" isn't necessarily available.
  */
 void PNGAPI
-png_init_io(png_structrp png_ptr, png_FILE_p fp)
+png_init_io(png_structrp png_ptr, FILE *fp)
 {
    png_debug(1, "in png_init_io");
 
@@ -844,7 +846,7 @@ png_get_copyright(png_const_structrp png_ptr)
    return PNG_STRING_COPYRIGHT
 #else
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.47" PNG_STRING_NEWLINE \
+      "libpng version 1.6.51" PNG_STRING_NEWLINE \
       "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
@@ -1520,7 +1522,7 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
 }
 #endif /* COLORSPACE */
 
-#ifdef PNG_iCCP_SUPPORTED
+#ifdef PNG_READ_iCCP_SUPPORTED
 /* Error message generation */
 static char
 png_icc_tag_char(png_uint_32 byte)
@@ -1596,9 +1598,7 @@ png_icc_profile_error(png_const_structrp png_ptr, png_const_charp name,
 
    return 0;
 }
-#endif /* iCCP */
 
-#ifdef PNG_READ_iCCP_SUPPORTED
 /* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
  * is XYZ(0.9642,1.0,0.8249), which scales to:
  *
@@ -3998,7 +3998,7 @@ png_image_free_function(png_voidp argument)
 #  ifdef PNG_STDIO_SUPPORTED
       if (cp->owned_file != 0)
       {
-         FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
+         FILE *fp = png_voidcast(FILE *, cp->png_ptr->io_ptr);
          cp->owned_file = 0;
 
          /* Ignore errors here. */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
index ede12c34fe6..d39ff73552c 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.47
+ * libpng version 1.6.51
  *
  * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -43,7 +43,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.47, February 2025:
+ *   libpng versions 1.6.36, December 2018, through 1.6.51, November 2025:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -267,7 +267,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.47                  16    10647  16.so.16.47[.0]
+ *    1.6.51                  16    10651  16.so.16.51[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -303,7 +303,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.47"
+#define PNG_LIBPNG_VER_STRING "1.6.51"
 #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
 /* The versions of shared library builds should stay in sync, going forward */
@@ -314,7 +314,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 47
+#define PNG_LIBPNG_VER_RELEASE 51
 
 /* This should be zero for a public release, or non-zero for a
  * development version.
@@ -345,7 +345,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10647 /* 1.6.47 */
+#define PNG_LIBPNG_VER 10651 /* 1.6.51 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -455,7 +455,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_47;
+typedef char* png_libpng_version_1_6_51;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -1599,7 +1599,7 @@ PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
 
 #ifdef PNG_STDIO_SUPPORTED
 /* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
+PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, FILE *fp));
 #endif
 
 /* Replace the (error and abort), and warning functions with user
@@ -3117,7 +3117,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
     */
 
 PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-   FILE* file));
+   FILE *file));
    /* The PNG header is read from the stdio FILE object. */
 #endif /* STDIO */
 
@@ -3192,7 +3192,7 @@ PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
 PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
    int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
    const void *colormap));
-   /* Write the image to the given (FILE*). */
+   /* Write the image to the given FILE object. */
 #endif /* SIMPLIFIED_WRITE_STDIO */
 
 /* With all write APIs if image is in one of the linear formats with 16-bit
@@ -3332,26 +3332,45 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
  *           selected at run time.
  */
 #ifdef PNG_SET_OPTION_SUPPORTED
+
+/* HARDWARE: ARM Neon SIMD instructions supported */
 #ifdef PNG_ARM_NEON_API_SUPPORTED
-#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
-#endif
-#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
-#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
-#  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
-#endif
-#ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
-#  define PNG_IGNORE_ADLER32 8 /* SOFTWARE: disable Adler32 check on IDAT */
-#endif
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions
-                                * supported */
-#endif
-#ifdef PNG_MIPS_MMI_API_SUPPORTED
-#  define PNG_MIPS_MMI   12 /* HARDWARE: MIPS MMI SIMD instructions supported */
+#  define PNG_ARM_NEON 0
 #endif
 
-#define PNG_OPTION_NEXT  14 /* Next option - numbers must be even */
+/* SOFTWARE: Force maximum window */
+#define PNG_MAXIMUM_INFLATE_WINDOW 2
+
+/* SOFTWARE: Check ICC profile for sRGB */
+#define PNG_SKIP_sRGB_CHECK_PROFILE 4
+
+/* HARDWARE: MIPS MSA SIMD instructions supported */
+#ifdef PNG_MIPS_MSA_API_SUPPORTED
+#  define PNG_MIPS_MSA 6
+#endif
+
+/* SOFTWARE: Disable Adler32 check on IDAT */
+#ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
+#  define PNG_IGNORE_ADLER32 8
+#endif
+
+/* HARDWARE: PowerPC VSX SIMD instructions supported */
+#ifdef PNG_POWERPC_VSX_API_SUPPORTED
+#  define PNG_POWERPC_VSX 10
+#endif
+
+/* HARDWARE: MIPS MMI SIMD instructions supported */
+#ifdef PNG_MIPS_MMI_API_SUPPORTED
+#  define PNG_MIPS_MMI 12
+#endif
+
+/* HARDWARE: RISC-V RVV SIMD instructions supported */
+#ifdef PNG_RISCV_RVV_API_SUPPORTED
+#  define PNG_RISCV_RVV 14
+#endif
+
+/* Next option - numbers must be even */
+#define PNG_OPTION_NEXT 16
 
 /* Return values: NOTE: there are four values and 'off' is *not* zero */
 #define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
index 70bca6fa1c9..4bc5f7bb468 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.47
+ * libpng version 1.6.51
  *
  * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
@@ -248,25 +248,13 @@
   /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
 
 #  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
+#     error PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
 #  endif
 
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-   /* older Borland and MSC
-    * compilers used '__export' and required this to be after
-    * the type.
-    */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
+#  define PNG_DLL_EXPORT __declspec(dllexport)
+#  ifndef PNG_DLL_IMPORT
+#    define PNG_DLL_IMPORT __declspec(dllimport)
+#  endif
 
 #else /* !Windows */
 #  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
@@ -508,7 +496,7 @@
 #if CHAR_BIT == 8 && UCHAR_MAX == 255
    typedef unsigned char png_byte;
 #else
-#  error "libpng requires 8-bit bytes"
+#  error libpng requires 8-bit bytes
 #endif
 
 #if INT_MIN == -32768 && INT_MAX == 32767
@@ -516,7 +504,7 @@
 #elif SHRT_MIN == -32768 && SHRT_MAX == 32767
    typedef short png_int_16;
 #else
-#  error "libpng requires a signed 16-bit type"
+#  error libpng requires a signed 16-bit integer type
 #endif
 
 #if UINT_MAX == 65535
@@ -524,7 +512,7 @@
 #elif USHRT_MAX == 65535
    typedef unsigned short png_uint_16;
 #else
-#  error "libpng requires an unsigned 16-bit type"
+#  error libpng requires an unsigned 16-bit integer type
 #endif
 
 #if INT_MIN < -2147483646 && INT_MAX > 2147483646
@@ -532,7 +520,7 @@
 #elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
    typedef long int png_int_32;
 #else
-#  error "libpng requires a signed 32-bit (or more) type"
+#  error libpng requires a signed 32-bit (or longer) integer type
 #endif
 
 #if UINT_MAX > 4294967294U
@@ -540,7 +528,7 @@
 #elif ULONG_MAX > 4294967294U
    typedef unsigned long int png_uint_32;
 #else
-#  error "libpng requires an unsigned 32-bit (or more) type"
+#  error libpng requires an unsigned 32-bit (or longer) integer type
 #endif
 
 /* Prior to 1.6.0, it was possible to disable the use of size_t and ptrdiff_t.
@@ -621,10 +609,6 @@ typedef const png_fixed_point * png_const_fixed_point_p;
 typedef size_t                * png_size_tp;
 typedef const size_t          * png_const_size_tp;
 
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 typedef double       * png_doublep;
 typedef const double * png_const_doublep;
@@ -646,6 +630,15 @@ typedef double          * * png_doublepp;
 /* Pointers to pointers to pointers; i.e., pointer to array */
 typedef char            * * * png_charppp;
 
+#ifdef PNG_STDIO_SUPPORTED
+/* With PNG_STDIO_SUPPORTED it was possible to use I/O streams that were
+ * not necessarily stdio FILE streams, to allow building Windows applications
+ * before Win32 and Windows CE applications before WinCE 3.0, but that kind
+ * of support has long been discontinued.
+ */
+typedef FILE            * png_FILE_p; /* [Deprecated] */
+#endif
+
 #endif /* PNG_BUILDING_SYMBOL_TABLE */
 
 #endif /* PNGCONF_H */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
index 8eb5400ea9a..6ea2644dfcd 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
@@ -22,14 +22,14 @@
  * questions.
  */
 
-/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
+/* pngdebug.h - internal debugging macros for libpng
  *
  * This file is available under and governed by the GNU General Public
  * License version 2 only, as published by the Free Software Foundation.
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -39,6 +39,10 @@
  * and license in png.h
  */
 
+#ifndef PNGPRIV_H
+#  error This file must not be included by applications; please include <png.h>
+#endif
+
 /* Define PNG_DEBUG at compile time for debugging information.  Higher
  * numbers for PNG_DEBUG mean more debugging information.  This has
  * only been added since version 0.95 so it is not implemented throughout
@@ -63,9 +67,6 @@
 #define PNGDEBUG_H
 /* These settings control the formatting of messages in png.c and pngerror.c */
 /* Moved to pngdebug.h at 1.5.0 */
-#  ifndef PNG_LITERAL_SHARP
-#    define PNG_LITERAL_SHARP 0x23
-#  endif
 #  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
 #    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
 #  endif
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
index ea0103331d3..44c86ebfef9 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -68,46 +68,6 @@ PNG_FUNCTION(void,PNGAPI
 png_error,(png_const_structrp png_ptr, png_const_charp error_message),
     PNG_NORETURN)
 {
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   char msg[16];
-   if (png_ptr != NULL)
-   {
-      if ((png_ptr->flags &
-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
-      {
-         if (*error_message == PNG_LITERAL_SHARP)
-         {
-            /* Strip "#nnnn " from beginning of error message. */
-            int offset;
-            for (offset = 1; offset<15; offset++)
-               if (error_message[offset] == ' ')
-                  break;
-
-            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
-            {
-               int i;
-               for (i = 0; i < offset - 1; i++)
-                  msg[i] = error_message[i + 1];
-               msg[i - 1] = '\0';
-               error_message = msg;
-            }
-
-            else
-               error_message += offset;
-         }
-
-         else
-         {
-            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
-            {
-               msg[0] = '0';
-               msg[1] = '\0';
-               error_message = msg;
-            }
-         }
-      }
-   }
-#endif
    if (png_ptr != NULL && png_ptr->error_fn != NULL)
       (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),
           error_message);
@@ -245,21 +205,6 @@ void PNGAPI
 png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
 {
    int offset = 0;
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if ((png_ptr->flags &
-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
-#endif
-      {
-         if (*warning_message == PNG_LITERAL_SHARP)
-         {
-            for (offset = 1; offset < 15; offset++)
-               if (warning_message[offset] == ' ')
-                  break;
-         }
-      }
-   }
    if (png_ptr != NULL && png_ptr->warning_fn != NULL)
       (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
           warning_message + offset);
@@ -741,42 +686,9 @@ png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
     PNG_NORETURN)
 {
 #ifdef PNG_CONSOLE_IO_SUPPORTED
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   /* Check on NULL only added in 1.5.4 */
-   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)
-   {
-      /* Strip "#nnnn " from beginning of error message. */
-      int offset;
-      char error_number[16];
-      for (offset = 0; offset<15; offset++)
-      {
-         error_number[offset] = error_message[offset + 1];
-         if (error_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         error_number[offset - 1] = '\0';
-         fprintf(stderr, "libpng error no. %s: %s",
-             error_number, error_message + offset + 1);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng error: %s, offset=%d",
-             error_message, offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#endif
-   {
-      fprintf(stderr, "libpng error: %s", error_message ? error_message :
-         "undefined");
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
+   fprintf(stderr, "libpng error: %s", error_message ? error_message :
+      "undefined");
+   fprintf(stderr, PNG_STRING_NEWLINE);
 #else
    PNG_UNUSED(error_message) /* Make compiler happy */
 #endif
@@ -814,40 +726,8 @@ static void /* PRIVATE */
 png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
 {
 #ifdef PNG_CONSOLE_IO_SUPPORTED
-#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (*warning_message == PNG_LITERAL_SHARP)
-   {
-      int offset;
-      char warning_number[16];
-      for (offset = 0; offset < 15; offset++)
-      {
-         warning_number[offset] = warning_message[offset + 1];
-         if (warning_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         warning_number[offset + 1] = '\0';
-         fprintf(stderr, "libpng warning no. %s: %s",
-             warning_number, warning_message + offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng warning: %s",
-             warning_message);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#  endif
-
-   {
-      fprintf(stderr, "libpng warning: %s", warning_message);
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
+   fprintf(stderr, "libpng warning: %s", warning_message);
+   fprintf(stderr, PNG_STRING_NEWLINE);
 #else
    PNG_UNUSED(warning_message) /* Make compiler happy */
 #endif
@@ -895,12 +775,8 @@ png_get_error_ptr(png_const_structrp png_ptr)
 void PNGAPI
 png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
 {
-   if (png_ptr != NULL)
-   {
-      png_ptr->flags &=
-         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
-         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
-   }
+   PNG_UNUSED(png_ptr)
+   PNG_UNUSED(strip_mode)
 }
 #endif
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
index d67adbae247..ed2e7f886f5 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
index bc6ed3d09c9..c79c6cc780f 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
@@ -22,14 +22,14 @@
  * questions.
  */
 
-/* pnginfo.h - header file for PNG reference library
+/* pnginfo.h - internal structures for libpng
  *
  * This file is available under and governed by the GNU General Public
  * License version 2 only, as published by the Free Software Foundation.
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2013,2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -39,43 +39,20 @@
  * and license in png.h
  */
 
- /* png_info is a structure that holds the information in a PNG file so
- * that the application can find out the characteristics of the image.
- * If you are reading the file, this structure will tell you what is
- * in the PNG file.  If you are writing the file, fill in the information
- * you want to put into the PNG file, using png_set_*() functions, then
- * call png_write_info().
+#ifndef PNGPRIV_H
+#  error This file must not be included by applications; please include <png.h>
+#endif
+
+/* INTERNAL, PRIVATE definition of a PNG.
  *
- * The names chosen should be very close to the PNG specification, so
- * consult that document for information about the meaning of each field.
+ * png_info is a modifiable description of a PNG datastream.  The fields inside
+ * this structure are accessed through png_get_<CHUNK>() functions and modified
+ * using png_set_<CHUNK>() functions.
  *
- * With libpng < 0.95, it was only possible to directly set and read the
- * the values in the png_info_struct, which meant that the contents and
- * order of the values had to remain fixed.  With libpng 0.95 and later,
- * however, there are now functions that abstract the contents of
- * png_info_struct from the application, so this makes it easier to use
- * libpng with dynamic libraries, and even makes it possible to use
- * libraries that don't have all of the libpng ancillary chunk-handing
- * functionality.  In libpng-1.5.0 this was moved into a separate private
- * file that is not visible to applications.
- *
- * The following members may have allocated storage attached that should be
- * cleaned up before the structure is discarded: palette, trans, text,
- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
- * are automatically freed when the info structure is deallocated, if they were
- * allocated internally by libpng.  This behavior can be changed by means
- * of the png_data_freer() function.
- *
- * More allocation details: all the chunk-reading functions that
- * change these members go through the corresponding png_set_*
- * functions.  A function to clear these members is available: see
- * png_free_data().  The png_set_* functions do not depend on being
- * able to point info structure members to any of the storage they are
- * passed (they make their own copies), EXCEPT that the png_set_text
- * functions use the same storage passed to them in the text_ptr or
- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
- * functions do not make their own copies.
+ * Some functions in libpng do directly access members of png_info.  However,
+ * this should be avoided.  png_struct objects contain members which hold
+ * caches, sometimes optimised, of the values from png_info objects, and
+ * png_info is not passed to the functions which read and write image data.
  */
 #ifndef PNGINFO_H
 #define PNGINFO_H
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
index 906f855db0e..4cfae474751 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
@@ -31,7 +31,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  */
-/* libpng version 1.6.47 */
+/* libpng version 1.6.51 */
 
 /* Copyright (c) 2018-2025 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
index ba9eb4df402..12b71bcbc02 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
index 86d0c7aaa64..3bfa913000f 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -258,6 +258,14 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
          png_benign_error(png_ptr, "Too many IDATs found");
    }
 
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
+   {
+      /* These flags must be set consistently for all non-IDAT chunks,
+       * including the unknown chunks.
+       */
+      png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT | PNG_AFTER_IDAT;
+   }
+
    if (chunk_name == png_IHDR)
    {
       if (png_ptr->push_length != 13)
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
index 25bac4b9e69..dcd005efb34 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -48,8 +48,20 @@
  * they should be well aware of the issues that may arise from doing so.
  */
 
+
+/* pngpriv.h must be included first in each translation unit inside libpng.
+ * On the other hand, it must not be included at all, directly or indirectly,
+ * by any application code that uses the libpng API.
+ */
 #ifndef PNGPRIV_H
-#define PNGPRIV_H
+#  define PNGPRIV_H
+#else
+#  error Duplicate inclusion of pngpriv.h; please check the libpng source files
+#endif
+
+#if defined(PNG_H) || defined(PNGCONF_H) || defined(PNGLCONF_H)
+#  error This file must not be included by applications; please include <png.h>
+#endif
 
 /* Feature Test Macros.  The following are defined here to ensure that correctly
  * implemented libraries reveal the APIs libpng needs to build and hide those
@@ -86,7 +98,6 @@
  */
 #if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
 #  include <config.h>
-
    /* Pick up the definition of 'restrict' from config.h if it was read: */
 #  define PNG_RESTRICT restrict
 #endif
@@ -96,9 +107,7 @@
  * are not internal definitions may be required.  This is handled below just
  * before png.h is included, but load the configuration now if it is available.
  */
-#ifndef PNGLCONF_H
-#  include "pnglibconf.h"
-#endif
+#include "pnglibconf.h"
 
 /* Local renames may change non-exported API functions from png.h */
 #if defined(PNG_PREFIX) && !defined(PNGPREFIX_H)
@@ -163,6 +172,20 @@
 #  endif
 #endif
 
+#ifndef PNG_RISCV_RVV_OPT
+   /* RISCV_RVV optimizations are being controlled by the compiler settings,
+    * typically the target compiler will define __riscv but the rvv extension
+    * availability has to be explicitly stated. This is why if no
+    * PNG_RISCV_RVV_OPT was defined then a runtime check will be executed.
+    *
+    * To enable RISCV_RVV optimizations unconditionally, and compile the
+    * associated code, pass --enable-riscv-rvv=yes or --enable-riscv-rvv=on
+    * to configure or put -DPNG_RISCV_RVV_OPT=2 in CPPFLAGS.
+    */
+
+#  define PNG_RISCV_RVV_OPT 0
+#endif
+
 #if PNG_ARM_NEON_OPT > 0
    /* NEON optimizations are to be at least considered by libpng, so enable the
     * callbacks to do this.
@@ -308,6 +331,16 @@
 #   define PNG_LOONGARCH_LSX_IMPLEMENTATION 0
 #endif
 
+#if PNG_RISCV_RVV_OPT > 0 && __riscv_v >= 1000000
+#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_rvv
+#  ifndef PNG_RISCV_RVV_IMPLEMENTATION
+      /* Use the intrinsics code by default. */
+#     define PNG_RISCV_RVV_IMPLEMENTATION 1
+#  endif
+#else
+#  define PNG_RISCV_RVV_IMPLEMENTATION 0
+#endif /* PNG_RISCV_RVV_OPT > 0 && __riscv_v >= 1000000 */
+
 /* Is this a build of a DLL where compilation of the object modules requires
  * different preprocessor settings to those required for a simple library?  If
  * so PNG_BUILD_DLL must be set.
@@ -706,7 +739,7 @@
 /* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000U */
 /* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS      0x10000U */
 #define PNG_FLAG_LIBRARY_MISMATCH        0x20000U
-#define PNG_FLAG_STRIP_ERROR_NUMBERS     0x40000U
+                                  /*     0x40000U    unused */
 #define PNG_FLAG_STRIP_ERROR_TEXT        0x80000U
 #define PNG_FLAG_BENIGN_ERRORS_WARN     0x100000U /* Added to libpng-1.4.0 */
 #define PNG_FLAG_APP_WARNINGS_WARN      0x200000U /* Added to libpng-1.6.0 */
@@ -1020,17 +1053,15 @@
  * must match that used in the build, or we must be using pnglibconf.h.prebuilt:
  */
 #if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM
-#  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
-      "-I (include path) error: see the notes in pngpriv.h"
-   /* This means that when pnglibconf.h was built the copy of zlib.h that it
-    * used is not the same as the one being used here.  Because the build of
-    * libpng makes decisions to use inflateInit2 and inflateReset2 based on the
-    * zlib version number and because this affects handling of certain broken
-    * PNG files the -I directives must match.
+#  error The include path of <zlib.h> is incorrect
+   /* When pnglibconf.h was built, the copy of zlib.h that it used was not the
+    * same as the one being used here.  Considering how libpng makes decisions
+    * to use the zlib API based on the zlib version number, the -I options must
+    * match.
     *
-    * The most likely explanation is that you passed a -I in CFLAGS. This will
-    * not work; all the preprocessor directives and in particular all the -I
-    * directives must be in CPPFLAGS.
+    * A possible cause of this mismatch is that you passed an -I option in
+    * CFLAGS, which is unlikely to work.  All the preprocessor options, and all
+    * the -I options in particular, should be in CPPFLAGS.
     */
 #endif
 
@@ -1544,6 +1575,23 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_lsx,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
+#if PNG_RISCV_RVV_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_rvv,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+
 /* Choose the best filter to use and filter the row data */
 PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
     png_row_infop row_info),PNG_EMPTY);
@@ -2156,6 +2204,11 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_lsx,
     (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
+#  if PNG_RISCV_RVV_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_rvv,
+   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+#endif
+
 PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
    png_const_charp key, png_bytep new_key), PNG_EMPTY);
 
@@ -2191,4 +2244,3 @@ PNG_INTERNAL_FUNCTION(int,
 #endif
 
 #endif /* PNG_VERSION_INFO_ONLY */
-#endif /* PNGPRIV_H */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
index 8a6381e1b3e..b53668a09ce 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
@@ -731,7 +731,12 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
       png_uint_32 chunk_name = png_ptr->chunk_name;
 
       if (chunk_name != png_IDAT)
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+      {
+         /* These flags must be set consistently for all non-IDAT chunks,
+          * including the unknown chunks.
+          */
+         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT | PNG_AFTER_IDAT;
+      }
 
       if (chunk_name == png_IEND)
          png_handle_chunk(png_ptr, info_ptr, length);
@@ -838,7 +843,8 @@ png_read_destroy(png_structrp png_ptr)
 #endif
 
 #if defined(PNG_READ_EXPAND_SUPPORTED) && \
-    defined(PNG_ARM_NEON_IMPLEMENTATION)
+    (defined(PNG_ARM_NEON_IMPLEMENTATION) || \
+     defined(PNG_RISCV_RVV_IMPLEMENTATION))
    png_free(png_ptr, png_ptr->riffled_palette);
    png_ptr->riffled_palette = NULL;
 #endif
@@ -1357,7 +1363,7 @@ png_image_read_header(png_voidp argument)
 
 #ifdef PNG_STDIO_SUPPORTED
 int PNGAPI
-png_image_begin_read_from_stdio(png_imagep image, FILE* file)
+png_image_begin_read_from_stdio(png_imagep image, FILE *file)
 {
    if (image != NULL && image->version == PNG_IMAGE_VERSION)
    {
@@ -3152,6 +3158,54 @@ png_image_read_colormapped(png_voidp argument)
    }
 }
 
+/* Row reading for interlaced 16-to-8 bit depth conversion with local buffer. */
+static int
+png_image_read_direct_scaled(png_voidp argument)
+{
+   png_image_read_control *display = png_voidcast(png_image_read_control*,
+       argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+   png_bytep local_row = png_voidcast(png_bytep, display->local_row);
+   png_bytep first_row = png_voidcast(png_bytep, display->first_row);
+   ptrdiff_t row_bytes = display->row_bytes;
+   int passes;
+
+   /* Handle interlacing. */
+   switch (png_ptr->interlaced)
+   {
+      case PNG_INTERLACE_NONE:
+         passes = 1;
+         break;
+
+      case PNG_INTERLACE_ADAM7:
+         passes = PNG_INTERLACE_ADAM7_PASSES;
+         break;
+
+      default:
+         png_error(png_ptr, "unknown interlace type");
+   }
+
+   /* Read each pass using local_row as intermediate buffer. */
+   while (--passes >= 0)
+   {
+      png_uint_32 y = image->height;
+      png_bytep output_row = first_row;
+
+      for (; y > 0; --y)
+      {
+         /* Read into local_row (gets transformed 8-bit data). */
+         png_read_row(png_ptr, local_row, NULL);
+
+         /* Copy from local_row to user buffer. */
+         memcpy(output_row, local_row, (size_t)row_bytes);
+         output_row += row_bytes;
+      }
+   }
+
+   return 1;
+}
+
 /* Just the row reading part of png_image_read. */
 static int
 png_image_read_composite(png_voidp argument)
@@ -3570,6 +3624,7 @@ png_image_read_direct(png_voidp argument)
    int linear = (format & PNG_FORMAT_FLAG_LINEAR) != 0;
    int do_local_compose = 0;
    int do_local_background = 0; /* to avoid double gamma correction bug */
+   int do_local_scale = 0; /* for interlaced 16-to-8 bit conversion */
    int passes = 0;
 
    /* Add transforms to ensure the correct output format is produced then check
@@ -3703,8 +3758,16 @@ png_image_read_direct(png_voidp argument)
             png_set_expand_16(png_ptr);
 
          else /* 8-bit output */
+         {
             png_set_scale_16(png_ptr);
 
+            /* For interlaced images, use local_row buffer to avoid overflow
+             * in png_combine_row() which writes using IHDR bit-depth.
+             */
+            if (png_ptr->interlaced != 0)
+               do_local_scale = 1;
+         }
+
          change &= ~PNG_FORMAT_FLAG_LINEAR;
       }
 
@@ -3980,6 +4043,24 @@ png_image_read_direct(png_voidp argument)
       return result;
    }
 
+   else if (do_local_scale != 0)
+   {
+      /* For interlaced 16-to-8 conversion, use an intermediate row buffer
+       * to avoid buffer overflows in png_combine_row. The local_row is sized
+       * for the transformed (8-bit) output, preventing the overflow that would
+       * occur if png_combine_row wrote 16-bit data directly to the user buffer.
+       */
+      int result;
+      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
+
+      display->local_row = row;
+      result = png_safe_execute(image, png_image_read_direct_scaled, display);
+      display->local_row = NULL;
+      png_free(png_ptr, row);
+
+      return result;
+   }
+
    else
    {
       png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
index 961d010df42..50a424d0912 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -85,7 +85,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, size_t length)
    /* fread() returns 0 on error, so it is OK to store this in a size_t
     * instead of an int, which is what fread() actually returns.
     */
-   check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));
+   check = fread(data, 1, length, png_voidcast(FILE *, png_ptr->io_ptr));
 
    if (check != length)
       png_error(png_ptr, "Read Error");
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
index 4f31f8f07bc..a19615f49fe 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -57,6 +57,12 @@
 #  endif
 #endif
 
+#ifdef PNG_RISCV_RVV_IMPLEMENTATION
+#  if PNG_RISCV_RVV_IMPLEMENTATION == 1
+#    define PNG_RISCV_RVV_INTRINSICS_AVAILABLE
+#  endif
+#endif
+
 #ifdef PNG_READ_SUPPORTED
 
 /* Set the action on getting a CRC error for an ancillary or critical chunk. */
@@ -524,9 +530,19 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
    {
       int i;
 
+      /* Initialize the array to index colors.
+       *
+       * Ensure quantize_index can fit 256 elements (PNG_MAX_PALETTE_LENGTH)
+       * rather than num_palette elements. This is to prevent buffer overflows
+       * caused by malformed PNG files with out-of-range palette indices.
+       *
+       * Be careful to avoid leaking memory. Applications are allowed to call
+       * this function more than once per png_struct.
+       */
+      png_free(png_ptr, png_ptr->quantize_index);
       png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_alloc_size_t)num_palette);
-      for (i = 0; i < num_palette; i++)
+          PNG_MAX_PALETTE_LENGTH);
+      for (i = 0; i < PNG_MAX_PALETTE_LENGTH; i++)
          png_ptr->quantize_index[i] = (png_byte)i;
    }
 
@@ -538,15 +554,14 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
           * Perhaps not the best solution, but good enough.
           */
 
-         int i;
+         png_bytep quantize_sort;
+         int i, j;
 
-         /* Initialize an array to sort colors */
-         png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
+         /* Initialize the local array to sort colors. */
+         quantize_sort = (png_bytep)png_malloc(png_ptr,
              (png_alloc_size_t)num_palette);
-
-         /* Initialize the quantize_sort array */
          for (i = 0; i < num_palette; i++)
-            png_ptr->quantize_sort[i] = (png_byte)i;
+            quantize_sort[i] = (png_byte)i;
 
          /* Find the least used palette entries by starting a
           * bubble sort, and running it until we have sorted
@@ -558,19 +573,18 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
          for (i = num_palette - 1; i >= maximum_colors; i--)
          {
             int done; /* To stop early if the list is pre-sorted */
-            int j;
 
             done = 1;
             for (j = 0; j < i; j++)
             {
-               if (histogram[png_ptr->quantize_sort[j]]
-                   < histogram[png_ptr->quantize_sort[j + 1]])
+               if (histogram[quantize_sort[j]]
+                   < histogram[quantize_sort[j + 1]])
                {
                   png_byte t;
 
-                  t = png_ptr->quantize_sort[j];
-                  png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1];
-                  png_ptr->quantize_sort[j + 1] = t;
+                  t = quantize_sort[j];
+                  quantize_sort[j] = quantize_sort[j + 1];
+                  quantize_sort[j + 1] = t;
                   done = 0;
                }
             }
@@ -582,18 +596,18 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
          /* Swap the palette around, and set up a table, if necessary */
          if (full_quantize != 0)
          {
-            int j = num_palette;
+            j = num_palette;
 
             /* Put all the useful colors within the max, but don't
              * move the others.
              */
             for (i = 0; i < maximum_colors; i++)
             {
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
+               if ((int)quantize_sort[i] >= maximum_colors)
                {
                   do
                      j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
+                  while ((int)quantize_sort[j] >= maximum_colors);
 
                   palette[i] = palette[j];
                }
@@ -601,7 +615,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
          }
          else
          {
-            int j = num_palette;
+            j = num_palette;
 
             /* Move all the used colors inside the max limit, and
              * develop a translation table.
@@ -609,13 +623,13 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
             for (i = 0; i < maximum_colors; i++)
             {
                /* Only move the colors we need to */
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
+               if ((int)quantize_sort[i] >= maximum_colors)
                {
                   png_color tmp_color;
 
                   do
                      j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
+                  while ((int)quantize_sort[j] >= maximum_colors);
 
                   tmp_color = palette[j];
                   palette[j] = palette[i];
@@ -653,8 +667,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
                }
             }
          }
-         png_free(png_ptr, png_ptr->quantize_sort);
-         png_ptr->quantize_sort = NULL;
+         png_free(png_ptr, quantize_sort);
       }
       else
       {
@@ -1797,19 +1810,51 @@ png_init_read_transformations(png_structrp png_ptr)
                   }
                   else /* if (png_ptr->trans_alpha[i] != 0xff) */
                   {
-                     png_byte v, w;
+                     if ((png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0)
+                     {
+                        /* Premultiply only:
+                         * component = round((component * alpha) / 255)
+                         */
+                        png_uint_32 component;
 
-                     v = png_ptr->gamma_to_1[palette[i].red];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.red);
-                     palette[i].red = png_ptr->gamma_from_1[w];
+                        component = png_ptr->gamma_to_1[palette[i].red];
+                        component =
+                            (component * png_ptr->trans_alpha[i] + 128) / 255;
+                        palette[i].red = png_ptr->gamma_from_1[component];
 
-                     v = png_ptr->gamma_to_1[palette[i].green];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.green);
-                     palette[i].green = png_ptr->gamma_from_1[w];
+                        component = png_ptr->gamma_to_1[palette[i].green];
+                        component =
+                            (component * png_ptr->trans_alpha[i] + 128) / 255;
+                        palette[i].green = png_ptr->gamma_from_1[component];
 
-                     v = png_ptr->gamma_to_1[palette[i].blue];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue);
-                     palette[i].blue = png_ptr->gamma_from_1[w];
+                        component = png_ptr->gamma_to_1[palette[i].blue];
+                        component =
+                            (component * png_ptr->trans_alpha[i] + 128) / 255;
+                        palette[i].blue = png_ptr->gamma_from_1[component];
+                     }
+                     else
+                     {
+                        /* Composite with background color:
+                         * component =
+                         *    alpha * component + (1 - alpha) * background
+                         */
+                        png_byte v, w;
+
+                        v = png_ptr->gamma_to_1[palette[i].red];
+                        png_composite(w, v,
+                            png_ptr->trans_alpha[i], back_1.red);
+                        palette[i].red = png_ptr->gamma_from_1[w];
+
+                        v = png_ptr->gamma_to_1[palette[i].green];
+                        png_composite(w, v,
+                            png_ptr->trans_alpha[i], back_1.green);
+                        palette[i].green = png_ptr->gamma_from_1[w];
+
+                        v = png_ptr->gamma_to_1[palette[i].blue];
+                        png_composite(w, v,
+                            png_ptr->trans_alpha[i], back_1.blue);
+                        palette[i].blue = png_ptr->gamma_from_1[w];
+                     }
                   }
                }
                else
@@ -5032,13 +5077,8 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
    if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
-   {
       png_do_quantize(row_info, png_ptr->row_buf + 1,
           png_ptr->palette_lookup, png_ptr->quantize_index);
-
-      if (row_info->rowbytes == 0)
-         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-   }
 #endif /* READ_QUANTIZE */
 
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
index 6cf466d182a..07d53cb2c76 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -2441,10 +2441,6 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 #endif
 
-   /* TODO: this doesn't work and shouldn't be necessary. */
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
    buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
@@ -2515,10 +2511,6 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 #endif
 
-   /* TODO: should not be necessary. */
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
    /* Note, "length" is sufficient here; we won't be adding
     * a null terminator later.  The limit check in png_handle_chunk should be
     * sufficient.
@@ -2635,10 +2627,6 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 #endif
 
-   /* TODO: should not be necessary. */
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
    buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
index 1bfd292bd46..0b2844f1864 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
@@ -329,17 +329,14 @@ png_set_mDCV(png_const_structrp png_ptr, png_inforp info_ptr,
     double maxDL, double minDL)
 {
    png_set_mDCV_fixed(png_ptr, info_ptr,
-      /* The ITU approach is to scale by 50,000, not 100,000 so just divide
-       * the input values by 2 and use png_fixed:
-       */
-      png_fixed(png_ptr, white_x / 2, "png_set_mDCV(white(x))"),
-      png_fixed(png_ptr, white_y / 2, "png_set_mDCV(white(y))"),
-      png_fixed(png_ptr, red_x / 2, "png_set_mDCV(red(x))"),
-      png_fixed(png_ptr, red_y / 2, "png_set_mDCV(red(y))"),
-      png_fixed(png_ptr, green_x / 2, "png_set_mDCV(green(x))"),
-      png_fixed(png_ptr, green_y / 2, "png_set_mDCV(green(y))"),
-      png_fixed(png_ptr, blue_x / 2, "png_set_mDCV(blue(x))"),
-      png_fixed(png_ptr, blue_y / 2, "png_set_mDCV(blue(y))"),
+      png_fixed(png_ptr, white_x, "png_set_mDCV(white(x))"),
+      png_fixed(png_ptr, white_y, "png_set_mDCV(white(y))"),
+      png_fixed(png_ptr, red_x, "png_set_mDCV(red(x))"),
+      png_fixed(png_ptr, red_y, "png_set_mDCV(red(y))"),
+      png_fixed(png_ptr, green_x, "png_set_mDCV(green(x))"),
+      png_fixed(png_ptr, green_y, "png_set_mDCV(green(y))"),
+      png_fixed(png_ptr, blue_x, "png_set_mDCV(blue(x))"),
+      png_fixed(png_ptr, blue_y, "png_set_mDCV(blue(y))"),
       png_fixed_ITU(png_ptr, maxDL, "png_set_mDCV(maxDL)"),
       png_fixed_ITU(png_ptr, minDL, "png_set_mDCV(minDL)"));
 }
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
index d6c446564d1..8edb4bc393a 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
@@ -22,14 +22,14 @@
  * questions.
  */
 
-/* pngstruct.h - header file for PNG reference library
+/* pngstruct.h - internal structures for libpng
  *
  * This file is available under and governed by the GNU General Public
  * License version 2 only, as published by the Free Software Foundation.
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2022 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -39,11 +39,9 @@
  * and license in png.h
  */
 
-/* The structure that holds the information to read and write PNG files.
- * The only people who need to care about what is inside of this are the
- * people who will be modifying the library for their own special needs.
- * It should NOT be accessed directly by an application.
- */
+#ifndef PNGPRIV_H
+#  error This file must not be included by applications; please include <png.h>
+#endif
 
 #ifndef PNGSTRUCT_H
 #define PNGSTRUCT_H
@@ -406,7 +404,8 @@ struct png_struct_def
 
 /* New member added in libpng-1.6.36 */
 #if defined(PNG_READ_EXPAND_SUPPORTED) && \
-    defined(PNG_ARM_NEON_IMPLEMENTATION)
+    (defined(PNG_ARM_NEON_IMPLEMENTATION) || \
+     defined(PNG_RISCV_RVV_IMPLEMENTATION))
    png_bytep riffled_palette; /* buffer for accelerated palette expansion */
 #endif
 
@@ -435,7 +434,6 @@ struct png_struct_def
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
 /* The following three members were added at version 1.0.14 and 1.2.4 */
-   png_bytep quantize_sort;          /* working sort array */
    png_bytep index_to_palette;       /* where the original index currently is
                                         in the palette */
    png_bytep palette_to_index;       /* which original index points to this

From e0311ecb85b78b6d97387c17102a8b6759eefc36 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Mon, 1 Dec 2025 06:04:23 +0000
Subject: [PATCH 400/512] 8351016: RA support for EVEX to REX/REX2 demotion to
 optimize NDD instructions

Reviewed-by: sviswanathan, dlunden, vlivanov, qamai
---
 src/hotspot/cpu/aarch64/aarch64.ad           |   4 +
 src/hotspot/cpu/arm/arm.ad                   |   4 +
 src/hotspot/cpu/ppc/ppc.ad                   |   4 +
 src/hotspot/cpu/riscv/riscv.ad               |   4 +
 src/hotspot/cpu/s390/s390.ad                 |   4 +
 src/hotspot/cpu/x86/x86.ad                   | 167 ++++++++++++++-----
 src/hotspot/share/opto/chaitin.cpp           | 105 +++++++++---
 src/hotspot/share/opto/chaitin.hpp           |   3 +
 src/hotspot/share/opto/idealGraphPrinter.cpp |   1 +
 src/hotspot/share/opto/machnode.cpp          |   7 +
 src/hotspot/share/opto/machnode.hpp          |   1 +
 src/hotspot/share/opto/matcher.hpp           |   2 +
 src/hotspot/share/opto/node.hpp              |  40 ++---
 13 files changed, 268 insertions(+), 78 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 364db407bd3..fc53c10311b 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -2456,6 +2456,10 @@ bool Matcher::is_reg2reg_move(MachNode* m) {
   return false;
 }
 
+bool Matcher::is_register_biasing_candidate(const MachNode* mdef, int oper_index) {
+  return false;
+}
+
 bool Matcher::is_generic_vector(MachOper* opnd)  {
   return opnd->opcode() == VREG;
 }
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index af010caf616..606275d7666 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -1063,6 +1063,10 @@ bool Matcher::is_reg2reg_move(MachNode* m) {
   return false;
 }
 
+bool Matcher::is_register_biasing_candidate(const MachNode* mdef, int oper_index) {
+  return false;
+}
+
 bool Matcher::is_generic_vector(MachOper* opnd)  {
   ShouldNotReachHere();  // generic vector operands not supported
   return false;
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 762536df07f..87fcf112756 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2383,6 +2383,10 @@ bool Matcher::is_reg2reg_move(MachNode* m) {
   return false;
 }
 
+bool Matcher::is_register_biasing_candidate(const MachNode* mdef, int oper_index) {
+  return false;
+}
+
 bool Matcher::is_generic_vector(MachOper* opnd)  {
   ShouldNotReachHere();  // generic vector operands not supported
   return false;
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index bb2ed57ef82..3f5dd4ad0ee 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2053,6 +2053,10 @@ bool Matcher::is_reg2reg_move(MachNode* m) {
   return false;
 }
 
+bool Matcher::is_register_biasing_candidate(const MachNode* mdef, int oper_index) {
+  return false;
+}
+
 bool Matcher::is_generic_vector(MachOper* opnd) {
   ShouldNotReachHere(); // generic vector operands not supported
   return false;
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 6fe051b55c7..7d3e963a108 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -1865,6 +1865,10 @@ bool Matcher::is_reg2reg_move(MachNode* m) {
   return false;
 }
 
+bool Matcher::is_register_biasing_candidate(const MachNode* mdef, int oper_index) {
+  return false;
+}
+
 bool Matcher::is_generic_vector(MachOper* opnd)  {
   ShouldNotReachHere();  // generic vector operands not supported
   return false;
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index be9889b0a99..1d393897bca 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -2633,6 +2633,70 @@ bool Matcher::supports_vector_calling_convention(void) {
   return EnableVectorSupport;
 }
 
+static bool is_ndd_demotable(const MachNode* mdef) {
+  return ((mdef->flags() & Node::PD::Flag_ndd_demotable) != 0);
+}
+
+static bool is_ndd_demotable_commutative(const MachNode* mdef) {
+  return ((mdef->flags() & Node::PD::Flag_ndd_demotable_commutative) != 0);
+}
+
+static bool is_demotion_candidate(const MachNode* mdef) {
+  return (is_ndd_demotable(mdef) || is_ndd_demotable_commutative(mdef));
+}
+
+bool Matcher::is_register_biasing_candidate(const MachNode* mdef,
+                                            int oper_index) {
+  if (mdef == nullptr) {
+    return false;
+  }
+
+  if (mdef->num_opnds() <= oper_index || mdef->operand_index(oper_index) < 0 ||
+      mdef->in(mdef->operand_index(oper_index)) == nullptr) {
+    assert(oper_index != 1 || !is_demotion_candidate(mdef), "%s", mdef->Name());
+    assert(oper_index != 2 || !is_ndd_demotable_commutative(mdef), "%s", mdef->Name());
+    return false;
+  }
+
+  // Complex memory operand covers multiple incoming edges needed for
+  // address computation. Biasing def towards any address component will not
+  // result in NDD demotion by assembler.
+  if (mdef->operand_num_edges(oper_index) != 1) {
+    assert(!is_ndd_demotable(mdef), "%s", mdef->Name());
+    return false;
+  }
+
+  // Demotion candidate must be register mask compatible with definition.
+  const RegMask& oper_mask = mdef->in_RegMask(mdef->operand_index(oper_index));
+  if (!oper_mask.overlap(mdef->out_RegMask())) {
+    assert(!is_demotion_candidate(mdef), "%s", mdef->Name());
+    return false;
+  }
+
+  switch (oper_index) {
+  // First operand of MachNode corresponding to Intel APX NDD selection
+  // pattern can share its assigned register with definition operand if
+  // their live ranges do not overlap. In such a scenario we can demote
+  // it to legacy map0/map1 instruction by replacing its 4-byte extended
+  // EVEX prefix with shorter REX/REX2 encoding. Demotion candidates
+  // are decorated with a special flag by instruction selector.
+  case 1:
+    return is_demotion_candidate(mdef);
+
+  // Definition operand of commutative operation can be biased towards second
+  // operand.
+  case 2:
+    return is_ndd_demotable_commutative(mdef);
+
+  // Current scheme only selects up to two biasing candidates
+  default:
+    assert(false, "unhandled operand index: %s", mdef->Name());
+    break;
+  }
+
+  return false;
+}
+
 OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
   assert(EnableVectorSupport, "sanity");
   int lo = XMM0_num;
@@ -2812,7 +2876,7 @@ static inline bool is_clz_non_subword_predicate_evex(BasicType bt, int vlen_byte
 
 class Node::PD {
 public:
-  enum NodeFlags {
+  enum NodeFlags : uint64_t {
     Flag_intel_jcc_erratum    = Node::_last_flag << 1,
     Flag_sets_carry_flag      = Node::_last_flag << 2,
     Flag_sets_parity_flag     = Node::_last_flag << 3,
@@ -2824,7 +2888,9 @@ public:
     Flag_clears_zero_flag     = Node::_last_flag << 9,
     Flag_clears_overflow_flag = Node::_last_flag << 10,
     Flag_clears_sign_flag     = Node::_last_flag << 11,
-    _last_flag                = Flag_clears_sign_flag
+    Flag_ndd_demotable        = Node::_last_flag << 12,
+    Flag_ndd_demotable_commutative = Node::_last_flag << 13,
+    _last_flag                = Flag_ndd_demotable_commutative
   };
 };
 
@@ -9801,7 +9867,7 @@ instruct addI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (AddI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -9829,7 +9895,7 @@ instruct addI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (AddI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -9872,7 +9938,7 @@ instruct addI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (AddI src1 (LoadI src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable_commutative);
 
   ins_cost(150);
   format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
@@ -9929,6 +9995,7 @@ instruct incI_rReg_ndd(rRegI dst, rRegI src, immI_1 val, rFlagsReg cr)
   predicate(UseAPX && UseIncDec);
   match(Set dst (AddI src val));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "eincl    $dst, $src\t# int ndd" %}
   ins_encode %{
@@ -9983,6 +10050,7 @@ instruct decI_rReg_ndd(rRegI dst, rRegI src, immI_M1 val, rFlagsReg cr)
   predicate(UseAPX && UseIncDec);
   match(Set dst (AddI src val));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "edecl    $dst, $src\t# int ndd" %}
   ins_encode %{
@@ -10089,7 +10157,7 @@ instruct addL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (AddL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -10117,7 +10185,7 @@ instruct addL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (AddL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -10160,7 +10228,7 @@ instruct addL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (AddL src1 (LoadL src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable_commutative);
 
   ins_cost(150);
   format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
@@ -10216,6 +10284,7 @@ instruct incL_rReg_ndd(rRegL dst, rRegI src, immL1 val, rFlagsReg cr)
   predicate(UseAPX && UseIncDec);
   match(Set dst (AddL src val));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "eincq    $dst, $src\t# long ndd" %}
   ins_encode %{
@@ -10270,6 +10339,7 @@ instruct decL_rReg_ndd(rRegL dst, rRegL src, immL_M1 val, rFlagsReg cr)
   predicate(UseAPX && UseIncDec);
   match(Set dst (AddL src val));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "edecq    $dst, $src\t# long ndd" %}
   ins_encode %{
@@ -10984,7 +11054,7 @@ instruct subI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (SubI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -10998,7 +11068,7 @@ instruct subI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (SubI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -11041,7 +11111,7 @@ instruct subI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (SubI src1 (LoadI src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   ins_cost(150);
   format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
@@ -11099,7 +11169,7 @@ instruct subL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (SubL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -11113,7 +11183,7 @@ instruct subL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (SubL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -11156,7 +11226,7 @@ instruct subL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (SubL src1 (LoadL src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   ins_cost(150);
   format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
@@ -11228,7 +11298,7 @@ instruct negI_rReg_ndd(rRegI dst, rRegI src, immI_0 zero, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (SubI zero src));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "enegl    $dst, $src\t# int ndd" %}
   ins_encode %{
@@ -11256,7 +11326,7 @@ instruct negI_rReg_2_ndd(rRegI dst, rRegI src, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (NegI src));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "enegl    $dst, $src\t# int ndd" %}
   ins_encode %{
@@ -11297,7 +11367,7 @@ instruct negL_rReg_ndd(rRegL dst, rRegL src, immL0 zero, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (SubL zero src));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "enegq    $dst, $src\t# long ndd" %}
   ins_encode %{
@@ -11325,7 +11395,7 @@ instruct negL_rReg_2_ndd(rRegL dst, rRegL src, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (NegL src));
   effect(KILL cr);
-  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_ndd_demotable);
 
   format %{ "enegq    $dst, $src\t# long ndd" %}
   ins_encode %{
@@ -11370,6 +11440,7 @@ instruct mulI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (MulI src1 src2));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable_commutative);
 
   ins_cost(300);
   format %{ "eimull   $dst, $src1, $src2\t# int ndd" %}
@@ -11411,6 +11482,7 @@ instruct mulI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (MulI src1 (LoadI src2)));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   ins_cost(350);
   format %{ "eimull   $dst, $src1, $src2\t# int ndd" %}
@@ -11462,6 +11534,7 @@ instruct mulL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (MulL src1 src2));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable_commutative);
 
   ins_cost(300);
   format %{ "eimulq   $dst, $src1, $src2\t# long ndd" %}
@@ -11503,6 +11576,7 @@ instruct mulL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (MulL src1 (LoadL src2)));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable_commutative);
 
   ins_cost(350);
   format %{ "eimulq   $dst, $src1, $src2 \t# long" %}
@@ -11777,6 +11851,7 @@ instruct salI_rReg_immI2_ndd(rRegI dst, rRegI src, immI2 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (LShiftI src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "esall    $dst, $src, $shift\t# int(ndd)" %}
   ins_encode %{
@@ -11805,6 +11880,7 @@ instruct salI_rReg_imm_ndd(rRegI dst, rRegI src, immI8 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (LShiftI src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "esall    $dst, $src, $shift\t# int (ndd)" %}
   ins_encode %{
@@ -11911,6 +11987,7 @@ instruct sarI_rReg_imm_ndd(rRegI dst, rRegI src, immI8 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (RShiftI src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "esarl    $dst, $src, $shift\t# int (ndd)" %}
   ins_encode %{
@@ -12017,6 +12094,7 @@ instruct shrI_rReg_imm_ndd(rRegI dst, rRegI src, immI8 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (URShiftI src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "eshrl    $dst, $src, $shift\t # int (ndd)" %}
   ins_encode %{
@@ -12124,6 +12202,7 @@ instruct salL_rReg_immI2_ndd(rRegL dst, rRegL src, immI2 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (LShiftL src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "esalq    $dst, $src, $shift\t# long (ndd)" %}
   ins_encode %{
@@ -12152,6 +12231,7 @@ instruct salL_rReg_imm_ndd(rRegL dst, rRegL src, immI8 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (LShiftL src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "esalq    $dst, $src, $shift\t# long (ndd)" %}
   ins_encode %{
@@ -12258,6 +12338,7 @@ instruct sarL_rReg_imm_ndd(rRegL dst, rRegL src, immI shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (RShiftL src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "esarq    $dst, $src, $shift\t# long (ndd)" %}
   ins_encode %{
@@ -12364,6 +12445,7 @@ instruct shrL_rReg_imm_ndd(rRegL dst, rRegL src, immI8 shift, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (URShiftL src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "eshrq    $dst, $src, $shift\t# long (ndd)" %}
   ins_encode %{
@@ -12535,6 +12617,7 @@ instruct rolI_rReg_Var_ndd(rRegI dst, rRegI src, rcx_RegI shift, rFlagsReg cr)
   predicate(UseAPX && n->bottom_type()->basic_type() == T_INT);
   match(Set dst (RotateLeft src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "eroll    $dst, $src, $shift\t# rotate left (int ndd)" %}
   ins_encode %{
@@ -12599,6 +12682,7 @@ instruct rorI_rReg_Var_ndd(rRegI dst, rRegI src, rcx_RegI shift, rFlagsReg cr)
   predicate(UseAPX && n->bottom_type()->basic_type() == T_INT);
   match(Set dst (RotateRight src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "erorl    $dst, $src, $shift\t# rotate right(int ndd)" %}
   ins_encode %{
@@ -12651,6 +12735,7 @@ instruct rolL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr)
   predicate(!UseAPX && n->bottom_type()->basic_type() == T_LONG);
   match(Set dst (RotateLeft dst shift));
   effect(KILL cr);
+
   format %{ "rolq    $dst, $shift" %}
   ins_encode %{
     __ rolq($dst$$Register);
@@ -12664,6 +12749,7 @@ instruct rolL_rReg_Var_ndd(rRegL dst, rRegL src, rcx_RegI shift, rFlagsReg cr)
   predicate(UseAPX && n->bottom_type()->basic_type() == T_LONG);
   match(Set dst (RotateLeft src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "erolq    $dst, $src, $shift\t# rotate left(long ndd)" %}
   ins_encode %{
@@ -12728,6 +12814,7 @@ instruct rorL_rReg_Var_ndd(rRegL dst, rRegL src, rcx_RegI shift, rFlagsReg cr)
   predicate(UseAPX && n->bottom_type()->basic_type() == T_LONG);
   match(Set dst (RotateRight src shift));
   effect(KILL cr);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "erorq    $dst, $src, $shift\t# rotate right(long ndd)" %}
   ins_encode %{
@@ -12805,7 +12892,7 @@ instruct andI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (AndI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "eandl     $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -12898,7 +12985,7 @@ instruct andI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (AndI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "eandl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -12942,7 +13029,7 @@ instruct andI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (AndI src1 (LoadI src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   ins_cost(150);
   format %{ "eandl    $dst, $src1, $src2\t# int ndd" %}
@@ -13142,7 +13229,7 @@ instruct orI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -13171,7 +13258,7 @@ instruct orI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -13185,7 +13272,7 @@ instruct orI_rReg_imm_rReg_ndd(rRegI dst, immI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "eorl     $dst, $src2, $src1\t# int ndd" %}
   ins_encode %{
@@ -13229,7 +13316,7 @@ instruct orI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrI src1 (LoadI src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   ins_cost(150);
   format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
@@ -13305,7 +13392,7 @@ instruct xorI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (XorI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -13331,6 +13418,7 @@ instruct xorI_rReg_im1_ndd(rRegI dst, rRegI src, immI_M1 imm)
 %{
   match(Set dst (XorI src imm));
   predicate(UseAPX);
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "enotl    $dst, $src" %}
   ins_encode %{
@@ -13361,7 +13449,7 @@ instruct xorI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
   predicate(UseAPX && n->in(2)->bottom_type()->is_int()->get_con() != -1);
   match(Set dst (XorI src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
   ins_encode %{
@@ -13407,7 +13495,7 @@ instruct xorI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (XorI src1 (LoadI src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   ins_cost(150);
   format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
@@ -13486,7 +13574,7 @@ instruct andL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (AndL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "eandq     $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -13542,7 +13630,7 @@ instruct andL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (AndL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "eandq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -13586,7 +13674,7 @@ instruct andL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (AndL src1 (LoadL src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   ins_cost(150);
   format %{ "eandq    $dst, $src1, $src2\t# long ndd" %}
@@ -13789,7 +13877,7 @@ instruct orL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -13844,7 +13932,7 @@ instruct orL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -13858,7 +13946,7 @@ instruct orL_rReg_imm_rReg_ndd(rRegL dst, immL32 src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "eorq     $dst, $src2, $src1\t# long ndd" %}
   ins_encode %{
@@ -13903,7 +13991,7 @@ instruct orL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (OrL src1 (LoadL src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   ins_cost(150);
   format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
@@ -13982,7 +14070,7 @@ instruct xorL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
   predicate(UseAPX);
   match(Set dst (XorL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -14008,6 +14096,7 @@ instruct xorL_rReg_im1_ndd(rRegL dst,rRegL src, immL_M1 imm)
 %{
   predicate(UseAPX);
   match(Set dst (XorL src imm));
+  flag(PD::Flag_ndd_demotable);
 
   format %{ "enotq   $dst, $src" %}
   ins_encode %{
@@ -14038,7 +14127,7 @@ instruct xorL_rReg_rReg_imm(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
   predicate(UseAPX && n->in(2)->bottom_type()->is_long()->get_con() != -1L);
   match(Set dst (XorL src1 src2));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable);
 
   format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
   ins_encode %{
@@ -14084,7 +14173,7 @@ instruct xorL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   predicate(UseAPX);
   match(Set dst (XorL src1 (LoadL src2)));
   effect(KILL cr);
-  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag, PD::Flag_ndd_demotable_commutative);
 
   ins_cost(150);
   format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
@@ -16539,6 +16628,7 @@ instruct minI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2)
   predicate(UseAPX);
   match(Set dst (MinI src1 src2));
   effect(DEF dst, USE src1, USE src2);
+  flag(PD::Flag_ndd_demotable);
 
   ins_cost(200);
   expand %{
@@ -16590,6 +16680,7 @@ instruct maxI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2)
   predicate(UseAPX);
   match(Set dst (MaxI src1 src2));
   effect(DEF dst, USE src1, USE src2);
+  flag(PD::Flag_ndd_demotable);
 
   ins_cost(200);
   expand %{
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 524dee6e06a..667270d96b4 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -1471,6 +1471,65 @@ static OptoReg::Name find_first_set(LRG& lrg, RegMask& mask) {
   return assigned;
 }
 
+OptoReg::Name PhaseChaitin::select_bias_lrg_color(LRG& lrg) {
+  uint bias_lrg1_idx = _lrg_map.find(lrg._copy_bias);
+  uint bias_lrg2_idx = _lrg_map.find(lrg._copy_bias2);
+
+  // If bias_lrg1 has a color
+  if (bias_lrg1_idx != 0 && !_ifg->_yanked->test(bias_lrg1_idx)) {
+    OptoReg::Name reg = lrgs(bias_lrg1_idx).reg();
+    //  and it is legal for lrg
+    if (is_legal_reg(lrg, reg)) {
+      return reg;
+    }
+  }
+
+  // If bias_lrg2 has a color
+  if (bias_lrg2_idx != 0 && !_ifg->_yanked->test(bias_lrg2_idx)) {
+    OptoReg::Name reg = lrgs(bias_lrg2_idx).reg();
+    //  and it is legal for lrg
+    if (is_legal_reg(lrg, reg)) {
+      return reg;
+    }
+  }
+
+  uint bias_lrg_idx = 0;
+  if (bias_lrg1_idx != 0 && bias_lrg2_idx != 0) {
+    // Since none of the bias live ranges are part of the IFG yet, constrain the
+    // definition mask with the bias live range with the least degrees of
+    // freedom. This will increase the chances of register sharing once the bias
+    // live range becomes part of the IFG.
+    lrgs(bias_lrg1_idx).compute_set_mask_size();
+    lrgs(bias_lrg2_idx).compute_set_mask_size();
+    bias_lrg_idx = lrgs(bias_lrg1_idx).degrees_of_freedom() >
+                           lrgs(bias_lrg2_idx).degrees_of_freedom()
+                       ? bias_lrg2_idx
+                       : bias_lrg1_idx;
+  } else if (bias_lrg1_idx != 0) {
+    bias_lrg_idx = bias_lrg1_idx;
+  } else if (bias_lrg2_idx != 0) {
+    bias_lrg_idx = bias_lrg2_idx;
+  }
+
+  // Register masks with offset excludes all mask bits before the offset.
+  // Such masks are mainly used for allocation from stack slots. Constrain the
+  // register mask of definition live range using bias mask only if
+  // both masks have zero offset.
+  if (bias_lrg_idx != 0 && !lrg.mask().is_offset() &&
+      !lrgs(bias_lrg_idx).mask().is_offset()) {
+    // Choose a color which is legal for bias_lrg
+    ResourceMark rm(C->regmask_arena());
+    RegMask tempmask(lrg.mask(), C->regmask_arena());
+    tempmask.and_with(lrgs(bias_lrg_idx).mask());
+    tempmask.clear_to_sets(lrg.num_regs());
+    OptoReg::Name reg = find_first_set(lrg, tempmask);
+    if (OptoReg::is_valid(reg)) {
+      return reg;
+    }
+  }
+  return OptoReg::Bad;
+}
+
 // Choose a color using the biasing heuristic
 OptoReg::Name PhaseChaitin::bias_color(LRG& lrg) {
 
@@ -1492,25 +1551,10 @@ OptoReg::Name PhaseChaitin::bias_color(LRG& lrg) {
     }
   }
 
-  uint copy_lrg = _lrg_map.find(lrg._copy_bias);
-  if (copy_lrg != 0) {
-    // If he has a color,
-    if(!_ifg->_yanked->test(copy_lrg)) {
-      OptoReg::Name reg = lrgs(copy_lrg).reg();
-      //  And it is legal for you,
-      if (is_legal_reg(lrg, reg)) {
-        return reg;
-      }
-    } else if (!lrg.mask().is_offset()) {
-      // Choose a color which is legal for him
-      ResourceMark rm(C->regmask_arena());
-      RegMask tempmask(lrg.mask(), C->regmask_arena());
-      tempmask.and_with(lrgs(copy_lrg).mask());
-      tempmask.clear_to_sets(lrg.num_regs());
-      OptoReg::Name reg = find_first_set(lrg, tempmask);
-      if (OptoReg::is_valid(reg))
-        return reg;
-    }
+  // Try biasing the color with non-interfering bias live range[s].
+  OptoReg::Name reg = select_bias_lrg_color(lrg);
+  if (OptoReg::is_valid(reg)) {
+    return reg;
   }
 
   // If no bias info exists, just go with the register selection ordering
@@ -1524,7 +1568,7 @@ OptoReg::Name PhaseChaitin::bias_color(LRG& lrg) {
   // CNC - Fun hack.  Alternate 1st and 2nd selection.  Enables post-allocate
   // copy removal to remove many more copies, by preventing a just-assigned
   // register from being repeatedly assigned.
-  OptoReg::Name reg = lrg.mask().find_first_elem();
+  reg = lrg.mask().find_first_elem();
   if( (++_alternate & 1) && OptoReg::is_valid(reg) ) {
     // This 'Remove; find; Insert' idiom is an expensive way to find the
     // SECOND element in the mask.
@@ -1640,6 +1684,27 @@ uint PhaseChaitin::Select( ) {
         }
       }
     }
+
+    Node* def = lrg->_def;
+    if (lrg->is_singledef() && !lrg->_is_bound && def->is_Mach()) {
+      MachNode* mdef = def->as_Mach();
+      if (Matcher::is_register_biasing_candidate(mdef, 1)) {
+        Node* in1 = mdef->in(mdef->operand_index(1));
+        if (in1 != nullptr && lrg->_copy_bias == 0) {
+          lrg->_copy_bias = _lrg_map.find(in1);
+        }
+      }
+
+      // For commutative operations, def allocation can also be
+      // biased towards LRG of second input's def.
+      if (Matcher::is_register_biasing_candidate(mdef, 2)) {
+        Node* in2 = mdef->in(mdef->operand_index(2));
+        if (in2 != nullptr && lrg->_copy_bias2 == 0) {
+          lrg->_copy_bias2 = _lrg_map.find(in2);
+        }
+      }
+    }
+
     //assert(is_infinite_stack == lrg->mask().is_infinite_stack(), "nbrs must not change InfiniteStackedness");
     // Aligned pairs need aligned masks
     assert(!lrg->_is_vector || !lrg->_fat_proj, "sanity");
diff --git a/src/hotspot/share/opto/chaitin.hpp b/src/hotspot/share/opto/chaitin.hpp
index b477c54fcae..ac072e94e2b 100644
--- a/src/hotspot/share/opto/chaitin.hpp
+++ b/src/hotspot/share/opto/chaitin.hpp
@@ -63,6 +63,7 @@ public:
 
   uint _risk_bias;              // Index of LRG which we want to avoid color
   uint _copy_bias;              // Index of LRG which we want to share color
+  uint _copy_bias2;             // Index of second LRG which we want to share color
 
   uint _next;                   // Index of next LRG in linked list
   uint _prev;                   // Index of prev LRG in linked list
@@ -703,6 +704,8 @@ private:
   OptoReg::Name choose_color(LRG& lrg);
   // Helper function which implements biasing heuristic
   OptoReg::Name bias_color(LRG& lrg);
+  // Helper function which implements color biasing
+  OptoReg::Name select_bias_lrg_color(LRG& lrg);
 
   // Split uncolorable live ranges
   // Return new number of live ranges
diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index b28949e27c2..5070a9f00e1 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -88,6 +88,7 @@ void PrintProperties::print_lrg_properties(const LRG &lrg, const char *buffer) {
   print_property(true, "score", lrg.score());
   print_property((lrg._risk_bias != 0), "risk_bias", lrg._risk_bias);
   print_property((lrg._copy_bias != 0), "copy_bias", lrg._copy_bias);
+  print_property((lrg._copy_bias2 != 0), "copy_bias2", lrg._copy_bias2);
   print_property(lrg.is_singledef(), "is_singledef");
   print_property(lrg.is_multidef(), "is_multidef");
   print_property(lrg._is_oop, "is_oop");
diff --git a/src/hotspot/share/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp
index e58befd8032..ec861865ff5 100644
--- a/src/hotspot/share/opto/machnode.cpp
+++ b/src/hotspot/share/opto/machnode.cpp
@@ -460,6 +460,13 @@ int MachNode::operand_index(Node* def) const {
   return -1;
 }
 
+int MachNode::operand_num_edges(uint oper_index) const {
+  if (num_opnds() > oper_index) {
+    return _opnds[oper_index]->num_edges();
+  }
+  return 0;
+}
+
 //------------------------------peephole---------------------------------------
 // Apply peephole rule(s) to this instruction
 int MachNode::peephole(Block *block, int block_index, PhaseCFG* cfg_, PhaseRegAlloc *ra_) {
diff --git a/src/hotspot/share/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp
index 093f466678c..b60313b7f75 100644
--- a/src/hotspot/share/opto/machnode.hpp
+++ b/src/hotspot/share/opto/machnode.hpp
@@ -266,6 +266,7 @@ public:
   int  operand_index(uint operand) const;
   int  operand_index(const MachOper *oper) const;
   int  operand_index(Node* m) const;
+  int  operand_num_edges(uint operand) const;
 
   // Register class input is expected in
   virtual const RegMask &in_RegMask(uint) const;
diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp
index 01f11b1fdc9..ca13d0166a1 100644
--- a/src/hotspot/share/opto/matcher.hpp
+++ b/src/hotspot/share/opto/matcher.hpp
@@ -512,6 +512,8 @@ public:
   DEBUG_ONLY( bool verify_after_postselect_cleanup(); )
 
  public:
+  static bool is_register_biasing_candidate(const MachNode* mdef, int oper_index);
+
   // This routine is run whenever a graph fails to match.
   // If it returns, the compiler should bailout to interpreter without error.
   // In non-product mode, SoftMatchFailure is false to detect non-canonical
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index ec80fb6a0ab..2e19d1d247b 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -828,26 +828,26 @@ public:
   #undef DEFINE_CLASS_ID
 
   // Flags are sorted by usage frequency.
-  enum NodeFlags {
-    Flag_is_Copy                     = 1 << 0, // should be first bit to avoid shift
-    Flag_rematerialize               = 1 << 1,
-    Flag_needs_anti_dependence_check = 1 << 2,
-    Flag_is_macro                    = 1 << 3,
-    Flag_is_Con                      = 1 << 4,
-    Flag_is_cisc_alternate           = 1 << 5,
-    Flag_is_dead_loop_safe           = 1 << 6,
-    Flag_may_be_short_branch         = 1 << 7,
-    Flag_avoid_back_to_back_before   = 1 << 8,
-    Flag_avoid_back_to_back_after    = 1 << 9,
-    Flag_has_call                    = 1 << 10,
-    Flag_has_swapped_edges           = 1 << 11,
-    Flag_is_scheduled                = 1 << 12,
-    Flag_is_expensive                = 1 << 13,
-    Flag_is_predicated_vector        = 1 << 14,
-    Flag_for_post_loop_opts_igvn     = 1 << 15,
-    Flag_for_merge_stores_igvn       = 1 << 16,
-    Flag_is_removed_by_peephole      = 1 << 17,
-    Flag_is_predicated_using_blend   = 1 << 18,
+  enum NodeFlags : uint64_t {
+    Flag_is_Copy                     = 1ULL << 0, // should be first bit to avoid shift
+    Flag_rematerialize               = 1ULL << 1,
+    Flag_needs_anti_dependence_check = 1ULL << 2,
+    Flag_is_macro                    = 1ULL << 3,
+    Flag_is_Con                      = 1ULL << 4,
+    Flag_is_cisc_alternate           = 1ULL << 5,
+    Flag_is_dead_loop_safe           = 1ULL << 6,
+    Flag_may_be_short_branch         = 1ULL << 7,
+    Flag_avoid_back_to_back_before   = 1ULL << 8,
+    Flag_avoid_back_to_back_after    = 1ULL << 9,
+    Flag_has_call                    = 1ULL << 10,
+    Flag_has_swapped_edges           = 1ULL << 11,
+    Flag_is_scheduled                = 1ULL << 12,
+    Flag_is_expensive                = 1ULL << 13,
+    Flag_is_predicated_vector        = 1ULL << 14,
+    Flag_for_post_loop_opts_igvn     = 1ULL << 15,
+    Flag_for_merge_stores_igvn       = 1ULL << 16,
+    Flag_is_removed_by_peephole      = 1ULL << 17,
+    Flag_is_predicated_using_blend   = 1ULL << 18,
     _last_flag                       = Flag_is_predicated_using_blend
   };
 

From 81b26ba8131b74a7bb4309bd3608dda2ba99a6ca Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 1 Dec 2025 06:42:53 +0000
Subject: [PATCH 401/512] 8372685: C2 SuperWord: wrong requires in test after
 JDK-8371146

Reviewed-by: chagedorn, mbaesken
---
 .../superword/TestAliasingCheckPreLimitNotAvailable.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java
index e7009e87ae2..e86d6ec2314 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckPreLimitNotAvailable.java
@@ -27,7 +27,7 @@
  * @summary Test where the pre_init was pinned before the pre-loop but after the
  *          Auto_Vectorization_Check, and so it should not be used for the auto
  *          vectorization aliasing check, to avoid a bad (circular) graph.
- * @requires vm.gc == "ZGC" | vm.gc == "null"
+ * @requires vm.gc.Z
  * @run main/othervm
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:CompileCommand=compileonly,*TestAliasingCheckPreLimitNotAvailable::test
@@ -42,7 +42,7 @@
 /*
  * @test id=all-flags-no-stress-seed
  * @bug 8371146
- * @requires vm.gc == "ZGC" | vm.gc == "null"
+ * @requires vm.gc.Z
  * @run main/othervm
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:CompileCommand=compileonly,*TestAliasingCheckPreLimitNotAvailable::test

From ca96366c03b89fa90a015e6c2d5912a9f2554c92 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 1 Dec 2025 06:51:03 +0000
Subject: [PATCH 402/512] 8372528: Unify atomic exchange and compare exchange

Reviewed-by: kbarrett, stefank
---
 src/hotspot/cpu/ppc/atomicAccess_ppc.hpp      |   3 +
 .../bsd_aarch64/atomicAccess_bsd_aarch64.hpp  |   4 +
 .../os_cpu/bsd_x86/atomicAccess_bsd_x86.hpp   |   3 +
 .../os_cpu/bsd_zero/atomicAccess_bsd_zero.hpp |   3 +
 .../atomicAccess_linux_aarch64.hpp            |   3 +
 .../linux_arm/atomicAccess_linux_arm.hpp      |   2 +
 .../linux_riscv/atomicAccess_linux_riscv.hpp  |   4 +
 .../linux_s390/atomicAccess_linux_s390.hpp    |   3 +
 .../linux_x86/atomicAccess_linux_x86.hpp      |   3 +
 .../linux_zero/atomicAccess_linux_zero.hpp    |   3 +
 .../atomicAccess_windows_aarch64.hpp          |   5 +
 .../windows_x86/atomicAccess_windows_x86.hpp  |   5 +
 src/hotspot/share/runtime/atomic.hpp          |  86 +----------
 src/hotspot/share/runtime/atomicAccess.hpp    |   4 +-
 test/hotspot/gtest/runtime/test_atomic.cpp    | 145 ++++++++++--------
 .../gtest/runtime/test_atomicAccess.cpp       |   8 +-
 16 files changed, 137 insertions(+), 147 deletions(-)

diff --git a/src/hotspot/cpu/ppc/atomicAccess_ppc.hpp b/src/hotspot/cpu/ppc/atomicAccess_ppc.hpp
index a0ff19e6171..c4529b0eb1a 100644
--- a/src/hotspot/cpu/ppc/atomicAccess_ppc.hpp
+++ b/src/hotspot/cpu/ppc/atomicAccess_ppc.hpp
@@ -157,6 +157,9 @@ inline D AtomicAccess::PlatformAdd<8>::add_then_fetch(D volatile* dest, I add_va
   return result;
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/bsd_aarch64/atomicAccess_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/atomicAccess_bsd_aarch64.hpp
index 3d2c632ace8..67701775f94 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/atomicAccess_bsd_aarch64.hpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/atomicAccess_bsd_aarch64.hpp
@@ -52,12 +52,16 @@ struct AtomicAccess::PlatformAdd {
   }
 };
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<size_t byte_size>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<byte_size>::operator()(T volatile* dest,
                                                            T exchange_value,
                                                            atomic_memory_order order) const {
   STATIC_ASSERT(byte_size == sizeof(T));
+  STATIC_ASSERT(byte_size == 4 || byte_size == 8);
   T res = __atomic_exchange_n(dest, exchange_value, __ATOMIC_RELEASE);
   FULL_MEM_BARRIER;
   return res;
diff --git a/src/hotspot/os_cpu/bsd_x86/atomicAccess_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/atomicAccess_bsd_x86.hpp
index 1024c6b1418..29471300f3d 100644
--- a/src/hotspot/os_cpu/bsd_x86/atomicAccess_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/atomicAccess_bsd_x86.hpp
@@ -52,6 +52,9 @@ inline D AtomicAccess::PlatformAdd<4>::fetch_then_add(D volatile* dest, I add_va
   return old_value;
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/bsd_zero/atomicAccess_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/atomicAccess_bsd_zero.hpp
index 6a720dac54e..6c8684718fc 100644
--- a/src/hotspot/os_cpu/bsd_zero/atomicAccess_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/atomicAccess_bsd_zero.hpp
@@ -66,6 +66,9 @@ inline D AtomicAccess::PlatformAdd<8>::add_then_fetch(D volatile* dest, I add_va
   return res;
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/linux_aarch64/atomicAccess_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/atomicAccess_linux_aarch64.hpp
index 6e5f53edfa3..4ddb2b758b4 100644
--- a/src/hotspot/os_cpu/linux_aarch64/atomicAccess_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/atomicAccess_linux_aarch64.hpp
@@ -113,6 +113,9 @@ inline D AtomicAccess::PlatformAdd<8>::fetch_then_add(D volatile* dest, I add_va
   return atomic_fastcall(stub, dest, add_value);
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/linux_arm/atomicAccess_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/atomicAccess_linux_arm.hpp
index 5b5f9da51a6..390207f9e5e 100644
--- a/src/hotspot/os_cpu/linux_arm/atomicAccess_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/atomicAccess_linux_arm.hpp
@@ -118,6 +118,8 @@ inline D AtomicAccess::PlatformAdd<4>::add_then_fetch(D volatile* dest, I add_va
   return add_using_helper<int32_t>(ARMAtomicFuncs::_add_func, dest, add_value);
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
 
 template<>
 template<typename T>
diff --git a/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp
index 6d57ea55a83..bdbc0b8ac7f 100644
--- a/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp
@@ -152,6 +152,9 @@ inline T AtomicAccess::PlatformCmpxchg<4>::operator()(T volatile* dest __attribu
 }
 #endif
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<size_t byte_size>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<byte_size>::operator()(T volatile* dest,
@@ -164,6 +167,7 @@ inline T AtomicAccess::PlatformXchg<byte_size>::operator()(T volatile* dest,
 #endif
 
   STATIC_ASSERT(byte_size == sizeof(T));
+  STATIC_ASSERT(byte_size == 4 || byte_size == 8);
 
   if (order != memory_order_relaxed) {
     FULL_MEM_BARRIER;
diff --git a/src/hotspot/os_cpu/linux_s390/atomicAccess_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/atomicAccess_linux_s390.hpp
index 5849d69ae2f..f3c1e8f1a2c 100644
--- a/src/hotspot/os_cpu/linux_s390/atomicAccess_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/atomicAccess_linux_s390.hpp
@@ -209,6 +209,9 @@ inline D AtomicAccess::PlatformAdd<8>::add_then_fetch(D volatile* dest, I inc,
 //
 // The return value is the (unchanged) value from memory as it was when the
 // replacement succeeded.
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/linux_x86/atomicAccess_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/atomicAccess_linux_x86.hpp
index dd91444d0a3..6b43b5e8e09 100644
--- a/src/hotspot/os_cpu/linux_x86/atomicAccess_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/atomicAccess_linux_x86.hpp
@@ -52,6 +52,9 @@ inline D AtomicAccess::PlatformAdd<4>::fetch_then_add(D volatile* dest, I add_va
   return old_value;
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/linux_zero/atomicAccess_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/atomicAccess_linux_zero.hpp
index 376ef7a9dc9..96c46c6f59a 100644
--- a/src/hotspot/os_cpu/linux_zero/atomicAccess_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/atomicAccess_linux_zero.hpp
@@ -65,6 +65,9 @@ inline D AtomicAccess::PlatformAdd<8>::add_then_fetch(D volatile* dest, I add_va
   return res;
 }
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 template<>
 template<typename T>
 inline T AtomicAccess::PlatformXchg<4>::operator()(T volatile* dest,
diff --git a/src/hotspot/os_cpu/windows_aarch64/atomicAccess_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/atomicAccess_windows_aarch64.hpp
index 62b6e3f87ec..f8119654c50 100644
--- a/src/hotspot/os_cpu/windows_aarch64/atomicAccess_windows_aarch64.hpp
+++ b/src/hotspot/os_cpu/windows_aarch64/atomicAccess_windows_aarch64.hpp
@@ -68,6 +68,9 @@ DEFINE_INTRINSIC_ADD(InterlockedAdd64, __int64)
 
 #undef DEFINE_INTRINSIC_ADD
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 #define DEFINE_INTRINSIC_XCHG(IntrinsicName, IntrinsicType)               \
   template<>                                                              \
   template<typename T>                                                    \
@@ -75,6 +78,8 @@ DEFINE_INTRINSIC_ADD(InterlockedAdd64, __int64)
                                                                          T exchange_value, \
                                                                          atomic_memory_order order) const { \
     STATIC_ASSERT(sizeof(IntrinsicType) == sizeof(T));                    \
+    STATIC_ASSERT(sizeof(IntrinsicType) == 4 ||                           \
+                  sizeof(IntrinsicType) == 8);                            \
     return PrimitiveConversions::cast<T>(                                 \
       IntrinsicName(reinterpret_cast<IntrinsicType volatile *>(dest),     \
                     PrimitiveConversions::cast<IntrinsicType>(exchange_value))); \
diff --git a/src/hotspot/os_cpu/windows_x86/atomicAccess_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/atomicAccess_windows_x86.hpp
index a95da151688..aa78a401235 100644
--- a/src/hotspot/os_cpu/windows_x86/atomicAccess_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/atomicAccess_windows_x86.hpp
@@ -70,6 +70,9 @@ DEFINE_INTRINSIC_ADD(InterlockedAdd64, __int64)
 
 #undef DEFINE_INTRINSIC_ADD
 
+template<>
+struct AtomicAccess::PlatformXchg<1> : AtomicAccess::XchgUsingCmpxchg<1> {};
+
 #define DEFINE_INTRINSIC_XCHG(IntrinsicName, IntrinsicType)               \
   template<>                                                              \
   template<typename T>                                                    \
@@ -77,6 +80,8 @@ DEFINE_INTRINSIC_ADD(InterlockedAdd64, __int64)
                                                                          T exchange_value, \
                                                                          atomic_memory_order order) const { \
     STATIC_ASSERT(sizeof(IntrinsicType) == sizeof(T));                    \
+    STATIC_ASSERT(sizeof(IntrinsicType) == 4 ||                           \
+                  sizeof(IntrinsicType) == 8);                            \
     return PrimitiveConversions::cast<T>(                                 \
       IntrinsicName(reinterpret_cast<IntrinsicType volatile *>(dest),     \
                     PrimitiveConversions::cast<IntrinsicType>(exchange_value))); \
diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp
index 5b4d7d8659f..b8960fd796b 100644
--- a/src/hotspot/share/runtime/atomic.hpp
+++ b/src/hotspot/share/runtime/atomic.hpp
@@ -75,6 +75,7 @@
 //     v.release_store(x) -> void
 //     v.release_store_fence(x) -> void
 //     v.compare_exchange(x, y [, o]) -> T
+//     v.exchange(x [, o]) -> T
 //
 // (2) All atomic types are default constructible.
 //
@@ -92,7 +93,6 @@
 // (3) Atomic pointers and atomic integers additionally provide
 //
 //   member functions:
-//     v.exchange(x [, o]) -> T
 //     v.add_then_fetch(i [, o]) -> T
 //     v.sub_then_fetch(i [, o]) -> T
 //     v.fetch_then_add(i [, o]) -> T
@@ -102,10 +102,7 @@
 // type of i must be signed, or both must be unsigned. Atomic pointers perform
 // element arithmetic.
 //
-// (4) An atomic translated type additionally provides the exchange
-// function if its associated atomic decayed type provides that function.
-//
-// (5) Atomic integers additionally provide
+// (4) Atomic integers additionally provide
 //
 //   member functions:
 //     v.and_then_fetch(x [, o]) -> T
@@ -115,7 +112,7 @@
 //     v.fetch_then_or(x [, o]) -> T
 //     v.fetch_then_xor(x [, o]) -> T
 //
-// (6) Atomic pointers additionally provide
+// (5) Atomic pointers additionally provide
 //
 //   nested types:
 //     ElementType -> std::remove_pointer_t<T>
@@ -127,9 +124,6 @@
 // stand out a little more when used in surrounding non-atomic code. Without
 // the "AtomicAccess::" qualifier, some of those names are easily overlooked.
 //
-// Atomic bytes don't provide exchange(). This is because that operation
-// hasn't been implemented for 1 byte values. That could be changed if needed.
-//
 // Atomic for 2 byte integers is not supported. This is because atomic
 // operations of that size have not been implemented. There haven't been
 // required use-cases. Many platforms don't provide hardware support.
@@ -184,15 +178,8 @@ private:
 
   // Helper base classes, providing various parts of the APIs.
   template<typename T> class CommonCore;
-  template<typename T> class SupportsExchange;
   template<typename T> class SupportsArithmetic;
 
-  // Support conditional exchange() for atomic translated types.
-  template<typename T> class HasExchange;
-  template<typename T> class DecayedHasExchange;
-  template<typename Derived, typename T, bool = DecayedHasExchange<T>::value>
-  class TranslatedExchange;
-
 public:
   template<typename T, Category = category<T>()>
   class Atomic;
@@ -275,15 +262,7 @@ public:
                      atomic_memory_order order = memory_order_conservative) {
     return AtomicAccess::cmpxchg(value_ptr(), compare_value, new_value, order);
   }
-};
 
-template<typename T>
-class AtomicImpl::SupportsExchange : public CommonCore<T> {
-protected:
-  explicit SupportsExchange(T value) : CommonCore<T>(value) {}
-  ~SupportsExchange() = default;
-
-public:
   T exchange(T new_value,
              atomic_memory_order order = memory_order_conservative) {
     return AtomicAccess::xchg(this->value_ptr(), new_value, order);
@@ -291,7 +270,7 @@ public:
 };
 
 template<typename T>
-class AtomicImpl::SupportsArithmetic : public SupportsExchange<T> {
+class AtomicImpl::SupportsArithmetic : public CommonCore<T> {
   // Guarding the AtomicAccess calls with constexpr checking of Offset produces
   // better compile-time error messages.
   template<typename Offset>
@@ -311,7 +290,7 @@ class AtomicImpl::SupportsArithmetic : public SupportsExchange<T> {
   }
 
 protected:
-  explicit SupportsArithmetic(T value) : SupportsExchange<T>(value) {}
+  explicit SupportsArithmetic(T value) : CommonCore<T>(value) {}
   ~SupportsArithmetic() = default;
 
 public:
@@ -424,54 +403,8 @@ public:
 
 // Atomic translated type
 
-// Test whether Atomic<T> has exchange().
 template<typename T>
-class AtomicImpl::HasExchange {
-  template<typename Check> static void* test(decltype(&Check::exchange));
-  template<typename> static int test(...);
-  using test_type = decltype(test<Atomic<T>>(nullptr));
-public:
-  static constexpr bool value = std::is_pointer_v<test_type>;
-};
-
-// Test whether the atomic decayed type associated with T has exchange().
-template<typename T>
-class AtomicImpl::DecayedHasExchange {
-  using Translator = PrimitiveConversions::Translate<T>;
-  using Decayed = typename Translator::Decayed;
-
-  // "Unit test" HasExchange<>.
-  static_assert(HasExchange<int>::value);
-  static_assert(HasExchange<int*>::value);
-  static_assert(!HasExchange<char>::value);
-
-public:
-  static constexpr bool value = HasExchange<Decayed>::value;
-};
-
-// Base class for atomic translated type if atomic decayed type doesn't have
-// exchange().
-template<typename Derived, typename T, bool>
-class AtomicImpl::TranslatedExchange {};
-
-// Base class for atomic translated type if atomic decayed type does have
-// exchange().
-template<typename Derived, typename T>
-class AtomicImpl::TranslatedExchange<Derived, T, true> {
-public:
-  T exchange(T new_value,
-             atomic_memory_order order = memory_order_conservative) {
-    return static_cast<Derived*>(this)->exchange_impl(new_value, order);
-  }
-};
-
-template<typename T>
-class AtomicImpl::Atomic<T, AtomicImpl::Category::Translated>
-  : public TranslatedExchange<Atomic<T>, T>
-{
-  // Give TranslatedExchange<> access to exchange_impl() if needed.
-  friend class TranslatedExchange<Atomic<T>, T>;
-
+class AtomicImpl::Atomic<T, AtomicImpl::Category::Translated> {
   using Translator = PrimitiveConversions::Translate<T>;
   using Decayed = typename Translator::Decayed;
 
@@ -533,12 +466,7 @@ public:
                                            order));
   }
 
-private:
-  // Implementation of exchange() if needed.
-  // Exclude when not needed, to prevent reference to non-existent function
-  // of atomic decayed type if someone explicitly instantiates Atomic<T>.
-  template<typename Dep = Decayed, ENABLE_IF(HasExchange<Dep>::value)>
-  T exchange_impl(T new_value, atomic_memory_order order) {
+  T exchange(T new_value, atomic_memory_order order = memory_order_conservative) {
     return recover(_value.exchange(decay(new_value), order));
   }
 };
diff --git a/src/hotspot/share/runtime/atomicAccess.hpp b/src/hotspot/share/runtime/atomicAccess.hpp
index 72b7f92cf04..fb06f084366 100644
--- a/src/hotspot/share/runtime/atomicAccess.hpp
+++ b/src/hotspot/share/runtime/atomicAccess.hpp
@@ -419,8 +419,8 @@ private:
   struct XchgImpl;
 
   // Platform-specific implementation of xchg.  Support for sizes
-  // of 4, and sizeof(intptr_t) are required.  The class is a function
-  // object that must be default constructable, with these requirements:
+  // of 1, 4, and 8 are required.  The class is a function object
+  // that must be default constructable, with these requirements:
   //
   // - dest is of type T*.
   // - exchange_value is of type T.
diff --git a/test/hotspot/gtest/runtime/test_atomic.cpp b/test/hotspot/gtest/runtime/test_atomic.cpp
index dc492e523d1..b37c14d41a7 100644
--- a/test/hotspot/gtest/runtime/test_atomic.cpp
+++ b/test/hotspot/gtest/runtime/test_atomic.cpp
@@ -101,10 +101,10 @@ TEST_VM(AtomicIntegerTest, arith_uint64) {
 }
 
 template<typename T>
-struct AtomicIntegerXchgTestSupport {
+struct AtomicByteAndIntegerXchgTestSupport {
   Atomic<T> _test_value;
 
-  AtomicIntegerXchgTestSupport() : _test_value{} {}
+  AtomicByteAndIntegerXchgTestSupport() : _test_value{} {}
 
   void test() {
     T zero = 0;
@@ -116,13 +116,18 @@ struct AtomicIntegerXchgTestSupport {
   }
 };
 
+TEST_VM(AtomicIntegerTest, xchg_char) {
+  using Support = AtomicByteAndIntegerXchgTestSupport<char>;
+  Support().test();
+}
+
 TEST_VM(AtomicIntegerTest, xchg_int32) {
-  using Support = AtomicIntegerXchgTestSupport<int32_t>;
+  using Support = AtomicByteAndIntegerXchgTestSupport<int32_t>;
   Support().test();
 }
 
 TEST_VM(AtomicIntegerTest, xchg_int64) {
-  using Support = AtomicIntegerXchgTestSupport<int64_t>;
+  using Support = AtomicByteAndIntegerXchgTestSupport<int64_t>;
   Support().test();
 }
 
@@ -153,18 +158,16 @@ TEST_VM(AtomicIntegerTest, cmpxchg_int32) {
 
 TEST_VM(AtomicIntegerTest, cmpxchg_int64) {
   // Check if 64-bit atomics are available on the machine.
-  if (!VM_Version::supports_cx8()) return;
-
   using Support = AtomicIntegerCmpxchgTestSupport<int64_t>;
   Support().test();
 }
 
-struct AtomicCmpxchg1ByteStressSupport {
+struct AtomicXchgAndCmpxchg1ByteStressSupport {
   char _default_val;
   int  _base;
   Atomic<char> _array[7+32+7];
 
-  AtomicCmpxchg1ByteStressSupport() : _default_val(0x7a), _base(7) {}
+  AtomicXchgAndCmpxchg1ByteStressSupport() : _default_val(0x7a), _base(7) {}
 
   void validate(char val, char val2, int index) {
     for (int i = 0; i < 7; i++) {
@@ -182,35 +185,60 @@ struct AtomicCmpxchg1ByteStressSupport {
     }
   }
 
+  template <typename Exchange>
   void test_index(int index) {
+    Exchange exchange;
     char one = 1;
-    _array[index].compare_exchange(_default_val, one);
+    exchange(_array[index], _default_val, one);
     validate(_default_val, one, index);
 
-    _array[index].compare_exchange(one, _default_val);
+    exchange(_array[index], one, _default_val);
     validate(_default_val, _default_val, index);
   }
 
+  template <typename Exchange>
   void test() {
     for (size_t i = 0; i < ARRAY_SIZE(_array); ++i) {
       _array[i].store_relaxed(_default_val);
     }
     for (int i = _base; i < (_base+32); i++) {
-      test_index(i);
+      test_index<Exchange>(i);
     }
   }
+  void test_exchange() {
+    struct StressWithExchange {
+      void operator()(Atomic<char>& atomic, char compare_value, char new_value) {
+        EXPECT_EQ(compare_value, atomic.exchange(new_value));
+      }
+    };
+    test<StressWithExchange>();
+  }
+
+  void test_compare_exchange() {
+    struct StressWithCompareExchange {
+      void operator()(Atomic<char>& atomic, char compare_value, char new_value) {
+        EXPECT_EQ(compare_value, atomic.compare_exchange(compare_value, new_value));
+      }
+    };
+    test<StressWithCompareExchange>();
+  }
 };
 
-TEST_VM(AtomicCmpxchg1Byte, stress) {
-  AtomicCmpxchg1ByteStressSupport support;
-  support.test();
+TEST_VM(AtomicByteTest, stress_xchg) {
+  AtomicXchgAndCmpxchg1ByteStressSupport support;
+  support.test_exchange();
+}
+
+TEST_VM(AtomicByteTest, stress_cmpxchg) {
+  AtomicXchgAndCmpxchg1ByteStressSupport support;
+  support.test_compare_exchange();
 }
 
 template<typename T>
-struct AtomicEnumTestSupport {
+struct AtomicTestSupport {
   Atomic<T> _test_value;
 
-  AtomicEnumTestSupport() : _test_value{} {}
+  AtomicTestSupport() : _test_value{} {}
 
   void test_store_load(T value) {
     EXPECT_NE(value, _test_value.load_relaxed());
@@ -233,6 +261,13 @@ struct AtomicEnumTestSupport {
     EXPECT_EQ(value1, _test_value.exchange(value2));
     EXPECT_EQ(value2, _test_value.load_relaxed());
   }
+
+  template <T B, T C>
+  static void test() {
+    AtomicTestSupport().test_store_load(B);
+    AtomicTestSupport().test_cmpxchg(B, C);
+    AtomicTestSupport().test_xchg(B, C);
+  }
 };
 
 namespace AtomicEnumTestUnscoped {       // Scope the enumerators.
@@ -241,11 +276,7 @@ namespace AtomicEnumTestUnscoped {       // Scope the enumerators.
 
 TEST_VM(AtomicEnumTest, unscoped_enum) {
   using namespace AtomicEnumTestUnscoped;
-  using Support = AtomicEnumTestSupport<TestEnum>;
-
-  Support().test_store_load(B);
-  Support().test_cmpxchg(B, C);
-  Support().test_xchg(B, C);
+  AtomicTestSupport<TestEnum>::test<B, C>();
 }
 
 enum class AtomicEnumTestScoped { A, B, C };
@@ -253,11 +284,35 @@ enum class AtomicEnumTestScoped { A, B, C };
 TEST_VM(AtomicEnumTest, scoped_enum) {
   const AtomicEnumTestScoped B = AtomicEnumTestScoped::B;
   const AtomicEnumTestScoped C = AtomicEnumTestScoped::C;
-  using Support = AtomicEnumTestSupport<AtomicEnumTestScoped>;
+  AtomicTestSupport<AtomicEnumTestScoped>::test<B, C>();
+}
 
-  Support().test_store_load(B);
-  Support().test_cmpxchg(B, C);
-  Support().test_xchg(B, C);
+enum class AtomicEnumTestScoped64Bit : uint64_t { A, B, C };
+
+TEST_VM(AtomicEnumTest, scoped_enum_64_bit) {
+  const AtomicEnumTestScoped64Bit B = AtomicEnumTestScoped64Bit::B;
+  const AtomicEnumTestScoped64Bit C = AtomicEnumTestScoped64Bit::C;
+  AtomicTestSupport<AtomicEnumTestScoped64Bit>::test<B, C>();
+}
+
+enum class AtomicEnumTestScoped8Bit : uint8_t { A, B, C };
+
+TEST_VM(AtomicEnumTest, scoped_enum_8_bit) {
+  const AtomicEnumTestScoped8Bit B = AtomicEnumTestScoped8Bit::B;
+  const AtomicEnumTestScoped8Bit C = AtomicEnumTestScoped8Bit::C;
+  AtomicTestSupport<AtomicEnumTestScoped8Bit>::test<B, C>();
+}
+
+TEST_VM(AtomicByteTest, char_test) {
+  const char B = 0xB;
+  const char C = 0xC;
+  AtomicTestSupport<char>::test<B, C>();
+}
+
+TEST_VM(AtomicByteTest, bool_test) {
+  const bool B = true;
+  const bool C = false;
+  AtomicTestSupport<bool>::test<B, C>();
 }
 
 template<typename T>
@@ -514,40 +569,6 @@ struct PrimitiveConversions::Translate<TranslatedAtomicByteObject>
   static Value recover(Decayed x) { return Value(x); }
 };
 
-// Test whether Atomic<T> has exchange().
-// Note: This is intentionally a different implementation from what is used
-// by the atomic translated type to decide whether to provide exchange().
-// The intent is to make related testing non-tautological.
-// The two implementations must agree; it's a bug if they don't.
-template<typename T>
-class AtomicTypeHasExchange {
-  template<typename U,
-           typename AU = Atomic<U>,
-           typename = decltype(declval<AU>().exchange(declval<U>()))>
-  static char* test(int);
-
-  template<typename> static char test(...);
-
-  using test_type = decltype(test<T>(0));
-
-public:
-  static constexpr bool value = std::is_pointer_v<test_type>;
-};
-
-// Unit tests for AtomicTypeHasExchange.
-static_assert(AtomicTypeHasExchange<int>::value);
-static_assert(AtomicTypeHasExchange<int*>::value);
-static_assert(AtomicTypeHasExchange<TranslatedAtomicTestObject1>::value);
-static_assert(AtomicTypeHasExchange<TranslatedAtomicTestObject2>::value);
-static_assert(!AtomicTypeHasExchange<uint8_t>::value);
-
-// Verify translated byte type *doesn't* have exchange.
-static_assert(!AtomicTypeHasExchange<TranslatedAtomicByteObject>::value);
-
-// Verify that explicit instantiation doesn't attempt to reference the
-// non-existent exchange of the atomic decayed type.
-template class AtomicImpl::Atomic<TranslatedAtomicByteObject>;
-
 template<typename T>
 static void test_atomic_translated_type() {
   // This works even if T is not default constructible.
@@ -562,10 +583,8 @@ static void test_atomic_translated_type() {
                                                               Translated::recover(10))));
   EXPECT_EQ(10, Translated::decay(_test_value.load_relaxed()));
 
-  if constexpr (AtomicTypeHasExchange<T>::value) {
-    EXPECT_EQ(10, Translated::decay(_test_value.exchange(Translated::recover(20))));
-    EXPECT_EQ(20, Translated::decay(_test_value.load_relaxed()));
-  }
+  EXPECT_EQ(10, Translated::decay(_test_value.exchange(Translated::recover(20))));
+  EXPECT_EQ(20, Translated::decay(_test_value.load_relaxed()));
 }
 
 TEST_VM(AtomicTranslatedTypeTest, int_test) {
diff --git a/test/hotspot/gtest/runtime/test_atomicAccess.cpp b/test/hotspot/gtest/runtime/test_atomicAccess.cpp
index 6e05f429970..a489be71b19 100644
--- a/test/hotspot/gtest/runtime/test_atomicAccess.cpp
+++ b/test/hotspot/gtest/runtime/test_atomicAccess.cpp
@@ -100,6 +100,11 @@ struct AtomicAccessXchgTestSupport {
   }
 };
 
+TEST_VM(AtomicAccessXchgTest, int8) {
+  using Support = AtomicAccessXchgTestSupport<int8_t>;
+  Support().test();
+}
+
 TEST_VM(AtomicAccessXchgTest, int32) {
   using Support = AtomicAccessXchgTestSupport<int32_t>;
   Support().test();
@@ -136,9 +141,6 @@ TEST_VM(AtomicAccessCmpxchgTest, int32) {
 }
 
 TEST_VM(AtomicAccessCmpxchgTest, int64) {
-  // Check if 64-bit atomics are available on the machine.
-  if (!VM_Version::supports_cx8()) return;
-
   using Support = AtomicAccessCmpxchgTestSupport<int64_t>;
   Support().test();
 }

From 293fec7e28ed06f0942e94b1c21affdf6aabe9ca Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 1 Dec 2025 07:06:46 +0000
Subject: [PATCH 403/512] 8372461: [IR Framework] Multiple test failures after
 JDK-8371789

Reviewed-by: epeter, syan, dfenacci
---
 test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java | 9 ++++-----
 .../ir_framework/tests/TestIRMatching.java               | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index a730fcb30cf..787dedba9c6 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -523,13 +523,13 @@ public class IRNode {
 
     public static final String CHECKCAST_ARRAY = PREFIX + "CHECKCAST_ARRAY" + POSTFIX;
     static {
-        String regex = "(((?i:cmp|CLFI|CLR).*precise \\[.*:|.*(?i:mov|mv|or).*precise \\[.*:.*\\R.*(cmp|CMP|CLR))" + END;
+        String regex = "(((?i:cmp|CLFI|CLR).*aryklassptr:\\[.*:Constant|.*(?i:mov|mv|or).*aryklassptr:\\[.*:Constant.*\\R.*(cmp|CMP|CLR))" + END;
         optoOnly(CHECKCAST_ARRAY, regex);
     }
 
     public static final String CHECKCAST_ARRAY_OF = COMPOSITE_PREFIX + "CHECKCAST_ARRAY_OF" + POSTFIX;
     static {
-        String regex = "(((?i:cmp|CLFI|CLR).*precise \\[.*" + IS_REPLACED + ":|.*(?i:mov|mv|or).*precise \\[.*" + IS_REPLACED + ":.*\\R.*(cmp|CMP|CLR))" + END;
+        String regex = "(((?i:cmp|CLFI|CLR).*aryklassptr:\\[.*" + IS_REPLACED + ":.*:Constant|.*(?i:mov|mv|or).*aryklassptr:\\[.*" + IS_REPLACED + ":.*:Constant.*\\R.*(cmp|CMP|CLR))" + END;
         optoOnly(CHECKCAST_ARRAY_OF, regex);
     }
 
@@ -3220,10 +3220,9 @@ public class IRNode {
 
     // @ matches the start character of the pattern
     // (\w+: ?)+ tries to match the pattern 'ptrtype:' or 'stable:' with optional trailing whitespaces
-    // (\w/)* tries to match the pattern 'a/b/`
-    // (\w$)* tries to match the pattern 'c$d$'
+    // [\\w/\\$] tries to match the pattern such as 'a/b/', 'a/b', or '/b' but also nested class such as '$c' or '$c$d'
     // \b asserts that the next character is a word character
-    private static final String LOAD_STORE_PREFIX = "@(\\w+: ?)+(\\w/)*(\\w$)*\\b";
+    private static final String LOAD_STORE_PREFIX = "@(\\w+: ?)+[\\w/\\$]*\\b";
     // ( \([^\)]+\))? tries to match the pattern ' (f/g,h/i/j)'
     // :\w+ tries to match the pattern ':NotNull'
     // .* tries to match the remaining of the pattern
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
index 5615cce983a..142a30f34a9 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
@@ -255,9 +255,9 @@ public class TestIRMatching {
         } else {
             cmp = "cmp";
         }
-        runCheck(BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 1, cmp, "precise"),
-                 BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 2, 1,cmp, "precise", "MyClass"),
-                 BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 2, 2,cmp, "precise", "ir_framework/tests/MyClass"),
+        runCheck(BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 1, cmp, "Constant"),
+                 BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 2, 1,cmp, "Constant", "MyClass"),
+                 BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 2, 2,cmp, "Constant", "ir_framework/tests/MyClass"),
                  GoodFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 3),
                  Platform.isS390x() ? // There is no checkcast_arraycopy stub for C2 on s390
                      GoodFailOnConstraint.create(CheckCastArray.class, "arrayCopy(java.lang.Object[],java.lang.Class)", 1)

From a6bc9b3ba50c5d669213f082a32e30c9ab2f923d Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 1 Dec 2025 07:44:54 +0000
Subject: [PATCH 404/512] 8372588: [asan] serviceability/sa/TestJmapCore.java
 and TestJmapCoreMetaspace.java fail after recent improvements

Reviewed-by: stuefe, azeller, lucy
---
 test/hotspot/jtreg/serviceability/sa/TestJmapCore.java          | 1 +
 test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
index 9119ac45cc3..9e266e67119 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
@@ -25,6 +25,7 @@
  * @test TestJmapCore
  * @summary Test verifies that jhsdb jmap could generate heap dump from core when heap is full
  * @requires vm.hasSA
+ * @requires !vm.asan
  * @library /test/lib
  * @run driver/timeout=480 TestJmapCore run heap
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java b/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java
index b8e00e53848..6fc04c8de74 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java
@@ -25,6 +25,7 @@
  * @test TestJmapCoreMetaspace
  * @summary Test verifies that jhsdb jmap could generate heap dump from core when metaspace is full
  * @requires vm.hasSA
+ * @requires !vm.asan
  * @library /test/lib
  * @run driver/timeout=480 TestJmapCore run metaspace
  */

From 969eb1ce2419324582ee8d8108031323f82e125e Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Mon, 1 Dec 2025 07:51:39 +0000
Subject: [PATCH 405/512] 8365861: test/jdk/sun/security/pkcs11/Provider/ tests
 skipped without SkippedException

Reviewed-by: rhalade
---
 .../security/pkcs11/Provider/Absolute.java    |  9 +++++----
 .../pkcs11/Provider/ConfigShortPath.java      | 19 ++++++++++++-------
 .../security/pkcs11/Provider/LoginISE.java    | 19 ++++++++++++-------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/Provider/Absolute.java b/test/jdk/sun/security/pkcs11/Provider/Absolute.java
index c298c076b30..07a934030db 100644
--- a/test/jdk/sun/security/pkcs11/Provider/Absolute.java
+++ b/test/jdk/sun/security/pkcs11/Provider/Absolute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary load DLLs and launch executables using fully qualified path
  */
 
+import jtreg.SkippedException;
+
 import java.security.InvalidParameterException;
 import java.security.Provider;
 
@@ -40,12 +42,11 @@ public class Absolute {
         try {
             Provider p = PKCS11Test.getSunPKCS11(config);
             if (p == null) {
-                System.out.println("Skipping test - no PKCS11 provider available");
+                throw new SkippedException("Skipping test - no PKCS11 provider available");
             }
         } catch (InvalidParameterException ipe) {
             Throwable ex = ipe.getCause();
-            if (ex.getMessage().indexOf(
-                    "Absolute path required for library value:") != -1) {
+            if (ex.getMessage().contains("Absolute path required for library value:")) {
                 System.out.println("Test Passed: expected exception thrown");
             } else {
                 // rethrow
diff --git a/test/jdk/sun/security/pkcs11/Provider/ConfigShortPath.java b/test/jdk/sun/security/pkcs11/Provider/ConfigShortPath.java
index f229360f1af..120f289d211 100644
--- a/test/jdk/sun/security/pkcs11/Provider/ConfigShortPath.java
+++ b/test/jdk/sun/security/pkcs11/Provider/ConfigShortPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,17 @@
  * @bug 6581254 6986789 7196009 8062170
  * @summary Allow '~', '+', and quoted paths in config file
  * @author Valerie Peng
+ * @library /test/lib
  */
 
-import java.security.*;
-import java.io.*;
-import java.lang.reflect.*;
+import jtreg.SkippedException;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.InvalidParameterException;
+import java.security.Provider;
+import java.security.ProviderException;
+import java.security.Security;
 
 public class ConfigShortPath {
 
@@ -43,8 +49,7 @@ public class ConfigShortPath {
     public static void main(String[] args) throws Exception {
         Provider p = Security.getProvider("SunPKCS11");
         if (p == null) {
-            System.out.println("Skipping test - no PKCS11 provider available");
-            return;
+            throw new SkippedException("Skipping test - no PKCS11 provider available");
         }
 
         String osInfo = System.getProperty("os.name", "");
@@ -65,7 +70,7 @@ public class ConfigShortPath {
                 if (cause.getClass().getName().equals
                         ("sun.security.pkcs11.ConfigurationException")) {
                     // Error occurred during parsing
-                    if (cause.getMessage().indexOf("Unexpected") != -1) {
+                    if (cause.getMessage().contains("Unexpected")) {
                         throw (ProviderException) cause;
                     }
                 }
diff --git a/test/jdk/sun/security/pkcs11/Provider/LoginISE.java b/test/jdk/sun/security/pkcs11/Provider/LoginISE.java
index 5027770c5e6..d131a857216 100644
--- a/test/jdk/sun/security/pkcs11/Provider/LoginISE.java
+++ b/test/jdk/sun/security/pkcs11/Provider/LoginISE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,16 +21,22 @@
  * questions.
  */
 
-import java.io.*;
-import java.util.*;
-import java.security.*;
-import javax.security.auth.callback.*;
+import jtreg.SkippedException;
+
+import java.io.IOException;
+import java.security.AuthProvider;
+import java.security.Provider;
+import java.security.Security;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
 
 /**
  * @test
  * @bug 8130648
  * @summary make sure IllegalStateException is thrown for uninitialized
  * SunPKCS11 provider instance
+ * @library /test/lib
  */
 public class LoginISE {
 
@@ -38,8 +44,7 @@ public class LoginISE {
 
         Provider p = Security.getProvider("SunPKCS11");
         if (p == null) {
-            System.out.println("No un-initialized PKCS11 provider available; skip");
-            return;
+            throw new SkippedException("No un-initialized PKCS11 provider available; skip");
         }
         if (!(p instanceof AuthProvider)) {
             throw new RuntimeException("Error: expect AuthProvider!");

From ef5e744a8136c3d983bdf8721a84fd1488b3c7a8 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 1 Dec 2025 08:05:55 +0000
Subject: [PATCH 406/512] 8372684: G1: Missing load_acquire() in G1 allocation
 path

Reviewed-by: kbarrett, sjohanss
---
 src/hotspot/share/gc/g1/g1AllocRegion.cpp     | 67 ++++++++++---------
 src/hotspot/share/gc/g1/g1AllocRegion.hpp     | 13 ++--
 .../share/gc/g1/g1AllocRegion.inline.hpp      | 11 +--
 3 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index 7e748cf7e9f..1af7638102a 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -33,10 +33,10 @@
 #include "utilities/align.hpp"
 
 G1CollectedHeap* G1AllocRegion::_g1h = nullptr;
-G1HeapRegion* G1AllocRegion::_dummy_region = nullptr;
+Atomic<G1HeapRegion*> G1AllocRegion::_dummy_region;
 
 void G1AllocRegion::setup(G1CollectedHeap* g1h, G1HeapRegion* dummy_region) {
-  assert(_dummy_region == nullptr, "should be set once");
+  assert(_dummy_region.load_relaxed() == nullptr, "should be set once");
   assert(dummy_region != nullptr, "pre-condition");
   assert(dummy_region->free() == 0, "pre-condition");
 
@@ -46,11 +46,11 @@ void G1AllocRegion::setup(G1CollectedHeap* g1h, G1HeapRegion* dummy_region) {
   assert(dummy_region->par_allocate(1, 1, &assert_tmp) == nullptr, "should fail");
 
   _g1h = g1h;
-  _dummy_region = dummy_region;
+  _dummy_region.release_store(dummy_region);
 }
 
 size_t G1AllocRegion::fill_up_remaining_space(G1HeapRegion* alloc_region) {
-  assert(alloc_region != nullptr && alloc_region != _dummy_region,
+  assert(alloc_region != nullptr && alloc_region != _dummy_region.load_relaxed(),
          "pre-condition");
   size_t result = 0;
 
@@ -111,13 +111,13 @@ size_t G1AllocRegion::retire_internal(G1HeapRegion* alloc_region, bool fill_up)
 }
 
 size_t G1AllocRegion::retire(bool fill_up) {
-  assert_alloc_region(_alloc_region != nullptr, "not initialized properly");
+  assert_alloc_region(_alloc_region.load_relaxed() != nullptr, "not initialized properly");
 
   size_t waste = 0;
 
   trace("retiring");
-  G1HeapRegion* alloc_region = _alloc_region;
-  if (alloc_region != _dummy_region) {
+  G1HeapRegion* alloc_region = _alloc_region.load_acquire();
+  if (alloc_region != _dummy_region.load_relaxed()) {
     waste = retire_internal(alloc_region, fill_up);
     reset_alloc_region();
   }
@@ -127,7 +127,7 @@ size_t G1AllocRegion::retire(bool fill_up) {
 }
 
 HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size) {
-  assert_alloc_region(_alloc_region == _dummy_region, "pre-condition");
+  assert_alloc_region(_alloc_region.load_relaxed() == _dummy_region.load_relaxed(), "pre-condition");
 
   trace("attempting region allocation");
   G1HeapRegion* new_alloc_region = allocate_new_region(word_size);
@@ -138,7 +138,6 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size) {
     HeapWord* result = new_alloc_region->allocate(word_size);
     assert_alloc_region(result != nullptr, "the allocation should succeeded");
 
-    OrderAccess::storestore();
     // Note that we first perform the allocation and then we store the
     // region in _alloc_region. This is the reason why an active region
     // can never be empty.
@@ -154,16 +153,16 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size) {
 
 void G1AllocRegion::init() {
   trace("initializing");
-  assert_alloc_region(_alloc_region == nullptr, "pre-condition");
-  assert_alloc_region(_dummy_region != nullptr, "should have been set");
-  _alloc_region = _dummy_region;
+  assert_alloc_region(_alloc_region.load_relaxed() == nullptr, "pre-condition");
+  assert_alloc_region(_dummy_region.load_relaxed() != nullptr, "should have been set");
+  _alloc_region.release_store(_dummy_region.load_relaxed());
   _count = 0;
   trace("initialized");
 }
 
 void G1AllocRegion::set(G1HeapRegion* alloc_region) {
   trace("setting");
-  assert_alloc_region(_alloc_region == _dummy_region && _count == 0, "pre-condition");
+  assert_alloc_region(_alloc_region.load_relaxed() == _dummy_region.load_relaxed() && _count == 0, "pre-condition");
 
   update_alloc_region(alloc_region);
   trace("set");
@@ -175,19 +174,19 @@ void G1AllocRegion::update_alloc_region(G1HeapRegion* alloc_region) {
   // maintain the "the alloc region cannot be empty" invariant.
   assert_alloc_region(alloc_region != nullptr && !alloc_region->is_empty(), "pre-condition");
 
-  _alloc_region = alloc_region;
+  _alloc_region.release_store(alloc_region);
   _count += 1;
   trace("updated");
 }
 
 G1HeapRegion* G1AllocRegion::release() {
   trace("releasing");
-  G1HeapRegion* alloc_region = _alloc_region;
+  G1HeapRegion* alloc_region = _alloc_region.load_acquire();
   retire(false /* fill_up */);
-  assert_alloc_region(_alloc_region == _dummy_region, "post-condition of retire()");
-  _alloc_region = nullptr;
+  assert_alloc_region(_alloc_region.load_relaxed() == _dummy_region.load_relaxed(), "post-condition of retire()");
+  _alloc_region.store_relaxed(nullptr);
   trace("released");
-  return (alloc_region == _dummy_region) ? nullptr : alloc_region;
+  return (alloc_region == _dummy_region.load_relaxed()) ? nullptr : alloc_region;
 }
 
 #ifndef PRODUCT
@@ -211,12 +210,13 @@ void G1AllocRegion::trace(const char* str, size_t min_word_size, size_t desired_
 
     out->print("%s: %u ", _name, _count);
 
-    if (_alloc_region == nullptr) {
+    G1HeapRegion* alloc_region = _alloc_region.load_acquire();
+    if (alloc_region == nullptr) {
       out->print("null");
-    } else if (_alloc_region == _dummy_region) {
+    } else if (alloc_region == _dummy_region.load_relaxed()) {
       out->print("DUMMY");
     } else {
-      out->print(HR_FORMAT, HR_FORMAT_PARAMS(_alloc_region));
+      out->print(HR_FORMAT, HR_FORMAT_PARAMS(alloc_region));
     }
 
     out->print(" : %s", str);
@@ -235,7 +235,7 @@ void G1AllocRegion::trace(const char* str, size_t min_word_size, size_t desired_
 #endif // PRODUCT
 
 G1AllocRegion::G1AllocRegion(const char* name, uint node_index)
-  : _alloc_region(nullptr),
+  : _alloc_region(),
     _count(0),
     _name(name),
     _node_index(node_index)
@@ -250,7 +250,7 @@ void MutatorAllocRegion::retire_region(G1HeapRegion* alloc_region) {
 }
 
 void MutatorAllocRegion::init() {
-  assert(_retained_alloc_region == nullptr, "Pre-condition");
+  assert(_retained_alloc_region.load_relaxed() == nullptr, "Pre-condition");
   G1AllocRegion::init();
   _wasted_bytes = 0;
 }
@@ -261,8 +261,9 @@ bool MutatorAllocRegion::should_retain(G1HeapRegion* region) {
     return false;
   }
 
-  if (_retained_alloc_region != nullptr &&
-      free_bytes < _retained_alloc_region->free()) {
+  G1HeapRegion* retained_alloc_region = _retained_alloc_region.load_acquire();
+  if (retained_alloc_region != nullptr &&
+      free_bytes < retained_alloc_region->free()) {
     return false;
   }
 
@@ -278,10 +279,11 @@ size_t MutatorAllocRegion::retire(bool fill_up) {
     // free than the currently retained region.
     if (should_retain(current_region)) {
       trace("mutator retained");
-      if (_retained_alloc_region != nullptr) {
-        waste = retire_internal(_retained_alloc_region, true);
+      G1HeapRegion* retained_alloc_region = _retained_alloc_region.load_acquire();
+      if (retained_alloc_region != nullptr) {
+        waste = retire_internal(retained_alloc_region, true);
       }
-      _retained_alloc_region = current_region;
+      _retained_alloc_region.release_store(current_region);
     } else {
       waste = retire_internal(current_region, fill_up);
     }
@@ -300,7 +302,7 @@ size_t MutatorAllocRegion::used_in_alloc_regions() {
     used += hr->used();
   }
 
-  hr = _retained_alloc_region;
+  hr = _retained_alloc_region.load_acquire();
   if (hr != nullptr) {
     used += hr->used();
   }
@@ -313,9 +315,10 @@ G1HeapRegion* MutatorAllocRegion::release() {
   // The retained alloc region must be retired and this must be
   // done after the above call to release the mutator alloc region,
   // since it might update the _retained_alloc_region member.
-  if (_retained_alloc_region != nullptr) {
-    _wasted_bytes += retire_internal(_retained_alloc_region, false);
-    _retained_alloc_region = nullptr;
+  G1HeapRegion* retained_alloc_region = _retained_alloc_region.load_acquire();
+  if (retained_alloc_region != nullptr) {
+    _wasted_bytes += retire_internal(retained_alloc_region, false);
+    _retained_alloc_region.store_relaxed(nullptr);
   }
   log_debug(gc, alloc, region)("Mutator Allocation stats, regions: %u, wasted size: %zu%s (%4.1f%%)",
                                count(),
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
index 3e38332ee6f..248aa0a9da0 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
@@ -29,6 +29,7 @@
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionAttr.hpp"
 #include "gc/g1/g1NUMA.hpp"
+#include "runtime/atomic.hpp"
 
 class G1CollectedHeap;
 
@@ -40,8 +41,6 @@ class G1CollectedHeap;
 // replaced.
 
 class G1AllocRegion : public CHeapObj<mtGC> {
-
-private:
   // The active allocating region we are currently allocating out
   // of. The invariant is that if this object is initialized (i.e.,
   // init() has been called and release() has not) then _alloc_region
@@ -52,7 +51,7 @@ private:
   // then _alloc_region is null and this object should not be used to
   // satisfy allocation requests (it was done this way to force the
   // correct use of init() and release()).
-  G1HeapRegion* volatile _alloc_region;
+  Atomic<G1HeapRegion*> _alloc_region;
 
   // It keeps track of the distinct number of regions that are used
   // for allocation in the active interval of this object, i.e.,
@@ -71,7 +70,7 @@ private:
   // == end()). When we don't have a valid active region we make
   // _alloc_region point to this. This allows us to skip checking
   // whether the _alloc_region is null or not.
-  static G1HeapRegion* _dummy_region;
+  static Atomic<G1HeapRegion*> _dummy_region;
 
   // After a region is allocated by alloc_new_region, this
   // method is used to set it as the active alloc_region
@@ -124,9 +123,9 @@ public:
   static void setup(G1CollectedHeap* g1h, G1HeapRegion* dummy_region);
 
   G1HeapRegion* get() const {
-    G1HeapRegion * hr = _alloc_region;
+    G1HeapRegion * hr = _alloc_region.load_acquire();
     // Make sure that the dummy region does not escape this class.
-    return (hr == _dummy_region) ? nullptr : hr;
+    return (hr == _dummy_region.load_relaxed()) ? nullptr : hr;
   }
 
   uint count() { return _count; }
@@ -177,7 +176,7 @@ private:
   // Retained allocation region. Used to lower the waste generated
   // during mutation by having two active regions if the free space
   // in a region about to be retired still could fit a TLAB.
-  G1HeapRegion* volatile _retained_alloc_region;
+  Atomic<G1HeapRegion*> _retained_alloc_region;
 
   // Decide if the region should be retained, based on the free size
   // in it and the free size in the currently retained region, if any.
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
index af9156163ac..e1d23867ea3 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
@@ -32,13 +32,13 @@
 #define assert_alloc_region(p, message)                                  \
   do {                                                                   \
     assert((p), "[%s] %s c: %u r: " PTR_FORMAT,                          \
-           _name, (message), _count, p2i(_alloc_region)                  \
+           _name, (message), _count, p2i(_alloc_region.load_relaxed())   \
           );                                                             \
   } while (0)
 
 
 inline void G1AllocRegion::reset_alloc_region() {
-  _alloc_region = _dummy_region;
+  _alloc_region.store_relaxed(_dummy_region.load_relaxed());
 }
 
 inline HeapWord* G1AllocRegion::par_allocate(G1HeapRegion* alloc_region, size_t word_size) {
@@ -51,7 +51,7 @@ inline HeapWord* G1AllocRegion::par_allocate(G1HeapRegion* alloc_region, size_t
 inline HeapWord* G1AllocRegion::attempt_allocation(size_t min_word_size,
                                                    size_t desired_word_size,
                                                    size_t* actual_word_size) {
-  G1HeapRegion* alloc_region = _alloc_region;
+  G1HeapRegion* alloc_region = _alloc_region.load_acquire();
   assert_alloc_region(alloc_region != nullptr && !alloc_region->is_empty(), "not initialized properly");
 
   HeapWord* result = alloc_region->par_allocate(min_word_size, desired_word_size, actual_word_size);
@@ -97,8 +97,9 @@ inline HeapWord* G1AllocRegion::attempt_allocation_using_new_region(size_t min_w
 inline HeapWord* MutatorAllocRegion::attempt_retained_allocation(size_t min_word_size,
                                                                  size_t desired_word_size,
                                                                  size_t* actual_word_size) {
-  if (_retained_alloc_region != nullptr) {
-    HeapWord* result = _retained_alloc_region->par_allocate(min_word_size, desired_word_size, actual_word_size);
+  G1HeapRegion* retained_alloc_region = _retained_alloc_region.load_acquire();
+  if (retained_alloc_region != nullptr) {
+    HeapWord* result = retained_alloc_region->par_allocate(min_word_size, desired_word_size, actual_word_size);
     if (result != nullptr) {
       trace("alloc retained", min_word_size, desired_word_size, *actual_word_size, result);
       return result;

From 3481252ced7c06c44154ceccc56b12cfd9a490c3 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 1 Dec 2025 08:41:18 +0000
Subject: [PATCH 407/512] 8372188: AArch64: Generate atomic match rules from M4
 stencils

Reviewed-by: aph, haosun
---
 make/hotspot/gensrc/GensrcAdlc.gmk           |    1 +
 src/hotspot/cpu/aarch64/aarch64.ad           | 1032 ------------------
 src/hotspot/cpu/aarch64/aarch64_atomic.ad    |  909 +++++++++++++++
 src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 |  246 +++++
 src/hotspot/cpu/aarch64/cas.m4               |  161 ---
 5 files changed, 1156 insertions(+), 1193 deletions(-)
 create mode 100644 src/hotspot/cpu/aarch64/aarch64_atomic.ad
 create mode 100644 src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4
 delete mode 100644 src/hotspot/cpu/aarch64/cas.m4

diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
index 4cecc3070e7..14117421d1b 100644
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -170,6 +170,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
     AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
         $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH)_vector.ad \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH)_atomic.ad \
     )))
   endif
 
diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index fc53c10311b..9c76ed24788 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -3342,73 +3342,6 @@ encode %{
     __ cmpw(rscratch1, zr);
   %}
 
-  enc_class aarch64_enc_cmpxchg(memory mem, iRegLNoSp oldval, iRegLNoSp newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  enc_class aarch64_enc_cmpxchgw(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  enc_class aarch64_enc_cmpxchgs(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::halfword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  enc_class aarch64_enc_cmpxchgb(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::byte, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-
-  // The only difference between aarch64_enc_cmpxchg and
-  // aarch64_enc_cmpxchg_acq is that we use load-acquire in the
-  // CompareAndSwap sequence to serve as a barrier on acquiring a
-  // lock.
-  enc_class aarch64_enc_cmpxchg_acq(memory mem, iRegL oldval, iRegL newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  enc_class aarch64_enc_cmpxchgw_acq(memory mem, iRegI oldval, iRegI newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  enc_class aarch64_enc_cmpxchgs_acq(memory mem, iRegI oldval, iRegI newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::halfword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  enc_class aarch64_enc_cmpxchgb_acq(memory mem, iRegI oldval, iRegI newval) %{
-    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-    __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::byte, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, noreg);
-  %}
-
-  // auxiliary used for CompareAndSwapX to set result register
-  enc_class aarch64_enc_cset_eq(iRegI res) %{
-    Register res_reg = as_Register($res$$reg);
-    __ cset(res_reg, Assembler::EQ);
-  %}
-
   // prefetch encodings
 
   enc_class aarch64_enc_prefetchw(memory mem) %{
@@ -8380,971 +8313,6 @@ instruct castVVMask(pRegGov dst)
   ins_pipe(pipe_class_empty);
 %}
 
-// ============================================================================
-// Atomic operation instructions
-//
-
-// standard CompareAndSwapX when we are using barriers
-// these have higher priority than the rules selected by a predicate
-
-// XXX No flag versions for CompareAndSwap{I,L,P,N} because matcher
-// can't match them
-
-instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-
-  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
-  format %{
-    "cmpxchgb $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-
-  ins_encode(aarch64_enc_cmpxchgb(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-
-  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
-  format %{
-    "cmpxchgs $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-
-  ins_encode(aarch64_enc_cmpxchgs(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-
-  match(Set res (CompareAndSwapI mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchgw $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchgw(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
-
-  match(Set res (CompareAndSwapL mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchg $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchg(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
-
-  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  ins_cost(2 * VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchg $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchg(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
-
-  match(Set res (CompareAndSwapN mem (Binary oldval newval)));
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  ins_cost(2 * VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchgw $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchgw(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-// alternative CompareAndSwapX when we are eliding barriers
-
-instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
-  format %{
-    "cmpxchgb_acq $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-
-  ins_encode(aarch64_enc_cmpxchgb_acq(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
-  format %{
-    "cmpxchgs_acq $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-
-  ins_encode(aarch64_enc_cmpxchgs_acq(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndSwapI mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchgw_acq $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchgw_acq(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
-
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndSwapL mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchg_acq $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchg_acq(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
-
-  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
-  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchg_acq $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchg_acq(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
-
-  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (CompareAndSwapN mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-
-  effect(KILL cr);
-
- format %{
-    "cmpxchgw_acq $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
-    "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
- %}
-
- ins_encode(aarch64_enc_cmpxchgw_acq(mem, oldval, newval),
-            aarch64_enc_cset_eq(res));
-
-  ins_pipe(pipe_slow);
-%}
-
-
-// ---------------------------------------------------------------------
-
-// BEGIN This section of the file is automatically generated. Do not edit --------------
-
-// Sundry CAS operations.  Note that release is always true,
-// regardless of the memory ordering of the CAS.  This is because we
-// need the volatile case to be sequentially consistent but there is
-// no trailing StoreLoad barrier emitted by C2.  Unfortunately we
-// can't check the type of memory ordering here, so we always emit a
-// STLXR.
-
-// This section is generated from cas.m4
-
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgb $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::byte, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-    __ sxtbw($res$$Register, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgs $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::halfword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-    __ sxthw($res$$Register, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgw $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeL(iRegLNoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
-  match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchg $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeN(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgw $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchg $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgb_acq $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::byte, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-    __ sxtbw($res$$Register, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgs_acq $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::halfword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-    __ sxthw($res$$Register, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeLAcq(iRegLNoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangeNAcq(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
-  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgb $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::byte, /*acquire*/ false, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgs $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::halfword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgw $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ false, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
-  match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchg $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgw $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ false, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
-  ins_cost(2 * VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchg $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ false, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgb_acq $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::byte, /*acquire*/ true, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgs_acq $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::halfword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ true, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::word, /*acquire*/ true, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
-  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
-  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
-  ins_cost(VOLATILE_REF_COST);
-  effect(KILL cr);
-  format %{
-    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::xword, /*acquire*/ true, /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// END This section of the file is automatically generated. Do not edit --------------
-// ---------------------------------------------------------------------
-
-instruct get_and_setI(indirect mem, iRegI newv, iRegINoSp prev) %{
-  match(Set prev (GetAndSetI mem newv));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "atomic_xchgw  $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchgw($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setL(indirect mem, iRegL newv, iRegLNoSp prev) %{
-  match(Set prev (GetAndSetL mem newv));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "atomic_xchg  $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchg($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setN(indirect mem, iRegN newv, iRegINoSp prev) %{
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set prev (GetAndSetN mem newv));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "atomic_xchgw $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchgw($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setP(indirect mem, iRegP newv, iRegPNoSp prev) %{
-  predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set prev (GetAndSetP mem newv));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "atomic_xchg  $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchg($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setIAcq(indirect mem, iRegI newv, iRegINoSp prev) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set prev (GetAndSetI mem newv));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "atomic_xchgw_acq  $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchgalw($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setLAcq(indirect mem, iRegL newv, iRegLNoSp prev) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set prev (GetAndSetL mem newv));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "atomic_xchg_acq  $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchgal($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setNAcq(indirect mem, iRegN newv, iRegINoSp prev) %{
-  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
-  match(Set prev (GetAndSetN mem newv));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "atomic_xchgw_acq $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchgalw($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_setPAcq(indirect mem, iRegP newv, iRegPNoSp prev) %{
-  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
-  match(Set prev (GetAndSetP mem newv));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "atomic_xchg_acq  $prev, $newv, [$mem]" %}
-  ins_encode %{
-    __ atomic_xchgal($prev$$Register, $newv$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-
-instruct get_and_addL(indirect mem, iRegLNoSp newval, iRegL incr) %{
-  match(Set newval (GetAndAddL mem incr));
-  ins_cost(2 * VOLATILE_REF_COST + 1);
-  format %{ "get_and_addL $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_add($newval$$Register, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addL_no_res(indirect mem, Universe dummy, iRegL incr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddL mem incr));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "get_and_addL [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_add(noreg, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addLi(indirect mem, iRegLNoSp newval, immLAddSub incr) %{
-  match(Set newval (GetAndAddL mem incr));
-  ins_cost(2 * VOLATILE_REF_COST + 1);
-  format %{ "get_and_addL $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_add($newval$$Register, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addLi_no_res(indirect mem, Universe dummy, immLAddSub incr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddL mem incr));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "get_and_addL [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_add(noreg, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addI(indirect mem, iRegINoSp newval, iRegIorL2I incr) %{
-  match(Set newval (GetAndAddI mem incr));
-  ins_cost(2 * VOLATILE_REF_COST + 1);
-  format %{ "get_and_addI $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addw($newval$$Register, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addI_no_res(indirect mem, Universe dummy, iRegIorL2I incr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddI mem incr));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "get_and_addI [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addw(noreg, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addIi(indirect mem, iRegINoSp newval, immIAddSub incr) %{
-  match(Set newval (GetAndAddI mem incr));
-  ins_cost(2 * VOLATILE_REF_COST + 1);
-  format %{ "get_and_addI $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addw($newval$$Register, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addIi_no_res(indirect mem, Universe dummy, immIAddSub incr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddI mem incr));
-  ins_cost(2 * VOLATILE_REF_COST);
-  format %{ "get_and_addI [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addw(noreg, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addLAcq(indirect mem, iRegLNoSp newval, iRegL incr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set newval (GetAndAddL mem incr));
-  ins_cost(VOLATILE_REF_COST + 1);
-  format %{ "get_and_addL_acq $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addal($newval$$Register, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addL_no_resAcq(indirect mem, Universe dummy, iRegL incr) %{
-  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
-  match(Set dummy (GetAndAddL mem incr));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "get_and_addL_acq [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addal(noreg, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addLiAcq(indirect mem, iRegLNoSp newval, immLAddSub incr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set newval (GetAndAddL mem incr));
-  ins_cost(VOLATILE_REF_COST + 1);
-  format %{ "get_and_addL_acq $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addal($newval$$Register, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addLi_no_resAcq(indirect mem, Universe dummy, immLAddSub incr) %{
-  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
-  match(Set dummy (GetAndAddL mem incr));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "get_and_addL_acq [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addal(noreg, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addIAcq(indirect mem, iRegINoSp newval, iRegIorL2I incr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set newval (GetAndAddI mem incr));
-  ins_cost(VOLATILE_REF_COST + 1);
-  format %{ "get_and_addI_acq $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addalw($newval$$Register, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addI_no_resAcq(indirect mem, Universe dummy, iRegIorL2I incr) %{
-  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
-  match(Set dummy (GetAndAddI mem incr));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "get_and_addI_acq [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addalw(noreg, $incr$$Register, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addIiAcq(indirect mem, iRegINoSp newval, immIAddSub incr) %{
-  predicate(needs_acquiring_load_exclusive(n));
-  match(Set newval (GetAndAddI mem incr));
-  ins_cost(VOLATILE_REF_COST + 1);
-  format %{ "get_and_addI_acq $newval, [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addalw($newval$$Register, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
-instruct get_and_addIi_no_resAcq(indirect mem, Universe dummy, immIAddSub incr) %{
-  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
-  match(Set dummy (GetAndAddI mem incr));
-  ins_cost(VOLATILE_REF_COST);
-  format %{ "get_and_addI_acq [$mem], $incr" %}
-  ins_encode %{
-    __ atomic_addalw(noreg, $incr$$constant, as_Register($mem$$base));
-  %}
-  ins_pipe(pipe_serial);
-%}
-
 // Manifest a CmpU result in an integer register.
 // (src1 < src2) ? -1 : ((src1 > src2) ? 1 : 0)
 instruct cmpU3_reg_reg(iRegINoSp dst, iRegI src1, iRegI src2, rFlagsReg flags)
diff --git a/src/hotspot/cpu/aarch64/aarch64_atomic.ad b/src/hotspot/cpu/aarch64/aarch64_atomic.ad
new file mode 100644
index 00000000000..faac2a43110
--- /dev/null
+++ b/src/hotspot/cpu/aarch64/aarch64_atomic.ad
@@ -0,0 +1,909 @@
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2021, Red Hat Inc. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+// BEGIN This file is automatically generated. Do not edit --------------
+
+// Sundry CAS operations.  Note that release is always true,
+// regardless of the memory ordering of the CAS.  This is because we
+// need the volatile case to be sequentially consistent but there is
+// no trailing StoreLoad barrier emitted by C2.  Unfortunately we
+// can't check the type of memory ordering here, so we always emit a
+// STLXR.
+
+// This section is generated from aarch64_atomic_ad.m4
+
+
+instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgb $res = $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::byte, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+    __ sxtbw($res$$Register, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgs $res = $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::halfword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+    __ sxthw($res$$Register, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgw $res = $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeL(iRegLNoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
+  match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeN(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgw $res = $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgb_acq $res = $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::byte, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+    __ sxtbw($res$$Register, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgs_acq $res = $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::halfword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+    __ sxthw($res$$Register, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeLAcq(iRegLNoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeNAcq(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgb $res = $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::byte, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgs $res = $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::halfword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (CompareAndSwapI mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw $res = $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
+  match(Set res (CompareAndSwapL mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw $res = $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgb_acq $res = $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::byte, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgs_acq $res = $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::halfword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndSwapI mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (CompareAndSwapL mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw_acq $res = $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
+  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ false, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgb_weak $res = $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::byte, /*acquire*/ false, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgs_weak $res = $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::halfword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw_weak $res = $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ false, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
+  match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg_weak $res = $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw_weak $res = $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ false, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(2*VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg_weak $res = $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ false, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgb_acq_weak $res = $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::byte, /*acquire*/ true, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgs_acq_weak $res = $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::halfword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw_acq_weak $res = $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ true, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg_acq_weak $res = $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchgw_acq_weak $res = $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::word, /*acquire*/ true, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
+  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg_acq_weak $res = $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::xword, /*acquire*/ true, /*release*/ true,
+               /*weak*/ true, noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct getAndSetI(indirect mem, iRegI newval, iRegINoSp oldval) %{
+  match(Set oldval (GetAndSetI mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchgw  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchgw($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetL(indirect mem, iRegL newval, iRegLNoSp oldval) %{
+  match(Set oldval (GetAndSetL mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchg  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchg($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetN(indirect mem, iRegN newval, iRegNNoSp oldval) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set oldval (GetAndSetN mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchgw  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchgw($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetP(indirect mem, iRegP newval, iRegPNoSp oldval) %{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set oldval (GetAndSetP mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchg  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchg($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetIAcq(indirect mem, iRegI newval, iRegINoSp oldval) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set oldval (GetAndSetI mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchgw_acq  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchgalw($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetLAcq(indirect mem, iRegL newval, iRegLNoSp oldval) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set oldval (GetAndSetL mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchg_acq  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchgal($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetNAcq(indirect mem, iRegN newval, iRegNNoSp oldval) %{
+  predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
+  match(Set oldval (GetAndSetN mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchgw_acq  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchgalw($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndSetPAcq(indirect mem, iRegP newval, iRegPNoSp oldval) %{
+  predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
+  match(Set oldval (GetAndSetP mem newval));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "atomic_xchg_acq  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchgal($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddI(indirect mem, iRegINoSp newval, iRegIorL2I incr) %{
+  match(Set newval (GetAndAddI mem incr));
+  ins_cost(2*VOLATILE_REF_COST+1);
+  format %{ "get_and_addI $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addw($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddIAcq(indirect mem, iRegINoSp newval, iRegIorL2I incr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set newval (GetAndAddI mem incr));
+  ins_cost(VOLATILE_REF_COST+1);
+  format %{ "get_and_addI_acq $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addalw($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddINoRes(indirect mem, Universe dummy, iRegIorL2I incr) %{
+  predicate(n->as_LoadStore()->result_not_used());
+  match(Set dummy (GetAndAddI mem incr));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "get_and_addI noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addw(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddIAcqNoRes(indirect mem, Universe dummy, iRegIorL2I incr) %{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
+  match(Set dummy (GetAndAddI mem incr));
+  ins_cost(VOLATILE_REF_COST);
+  format %{ "get_and_addI_acq noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addalw(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddIConst(indirect mem, iRegINoSp newval, immIAddSub incr) %{
+  match(Set newval (GetAndAddI mem incr));
+  ins_cost(2*VOLATILE_REF_COST+1);
+  format %{ "get_and_addI $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addw($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddIAcqConst(indirect mem, iRegINoSp newval, immIAddSub incr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set newval (GetAndAddI mem incr));
+  ins_cost(VOLATILE_REF_COST+1);
+  format %{ "get_and_addI_acq $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addalw($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddINoResConst(indirect mem, Universe dummy, immIAddSub incr) %{
+  predicate(n->as_LoadStore()->result_not_used());
+  match(Set dummy (GetAndAddI mem incr));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "get_and_addI noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addw(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddIAcqNoResConst(indirect mem, Universe dummy, immIAddSub incr) %{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
+  match(Set dummy (GetAndAddI mem incr));
+  ins_cost(VOLATILE_REF_COST);
+  format %{ "get_and_addI_acq noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addalw(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddL(indirect mem, iRegLNoSp newval, iRegL incr) %{
+  match(Set newval (GetAndAddL mem incr));
+  ins_cost(2*VOLATILE_REF_COST+1);
+  format %{ "get_and_addL $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_add($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLAcq(indirect mem, iRegLNoSp newval, iRegL incr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set newval (GetAndAddL mem incr));
+  ins_cost(VOLATILE_REF_COST+1);
+  format %{ "get_and_addL_acq $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addal($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLNoRes(indirect mem, Universe dummy, iRegL incr) %{
+  predicate(n->as_LoadStore()->result_not_used());
+  match(Set dummy (GetAndAddL mem incr));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "get_and_addL noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_add(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLAcqNoRes(indirect mem, Universe dummy, iRegL incr) %{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
+  match(Set dummy (GetAndAddL mem incr));
+  ins_cost(VOLATILE_REF_COST);
+  format %{ "get_and_addL_acq noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addal(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLConst(indirect mem, iRegLNoSp newval, immLAddSub incr) %{
+  match(Set newval (GetAndAddL mem incr));
+  ins_cost(2*VOLATILE_REF_COST+1);
+  format %{ "get_and_addL $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_add($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLAcqConst(indirect mem, iRegLNoSp newval, immLAddSub incr) %{
+  predicate(needs_acquiring_load_exclusive(n));
+  match(Set newval (GetAndAddL mem incr));
+  ins_cost(VOLATILE_REF_COST+1);
+  format %{ "get_and_addL_acq $newval, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addal($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLNoResConst(indirect mem, Universe dummy, immLAddSub incr) %{
+  predicate(n->as_LoadStore()->result_not_used());
+  match(Set dummy (GetAndAddL mem incr));
+  ins_cost(2*VOLATILE_REF_COST);
+  format %{ "get_and_addL noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_add(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct getAndAddLAcqNoResConst(indirect mem, Universe dummy, immLAddSub incr) %{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));
+  match(Set dummy (GetAndAddL mem incr));
+  ins_cost(VOLATILE_REF_COST);
+  format %{ "get_and_addL_acq noreg, [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_addal(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}
diff --git a/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4
new file mode 100644
index 00000000000..721b720873a
--- /dev/null
+++ b/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4
@@ -0,0 +1,246 @@
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2021, Red Hat Inc. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+// BEGIN This file is automatically generated. Do not edit --------------
+
+// Sundry CAS operations.  Note that release is always true,
+// regardless of the memory ordering of the CAS.  This is because we
+// need the volatile case to be sequentially consistent but there is
+// no trailing StoreLoad barrier emitted by C2.  Unfortunately we
+// can't check the type of memory ordering here, so we always emit a
+// STLXR.
+
+// This section is generated from aarch64_atomic_ad.m4
+
+dnl Return Arg1 with two spaces before it. We need this because m4
+dnl strips leading spaces from macro args.
+define(`INDENT', `  $1')dnl
+dnl
+dnl
+dnl
+dnl ====================== CompareAndExchange*
+dnl
+define(`CAE_INSN1',
+`
+instruct compareAndExchange$1$7(iReg$2NoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
+ifelse($7,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),`dnl')
+  match(Set res (CompareAndExchange$1 mem (Binary oldval newval)));
+  ins_cost(`'ifelse($7,Acq,,2*)VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchg$5`'ifelse($7,Acq,_acq,) $res = $mem, $oldval, $newval\t# ($3) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::$4, /*acquire*/ ifelse($7,Acq,true,false), /*release*/ true,
+               /*weak*/ false, $res$$Register);
+    __ $6($res$$Register, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+define(`CAE_INSN2',
+`
+instruct compareAndExchange$1$6(iReg$2NoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
+ifelse($1$6,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));),
+       $1$6,NAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);),
+       $1,P,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
+       $1,N,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
+       $6,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
+       `dnl')
+  match(Set res (CompareAndExchange$1 mem (Binary oldval newval)));
+  ins_cost(`'ifelse($6,Acq,,2*)VOLATILE_REF_COST);
+  effect(TEMP_DEF res, KILL cr);
+  format %{
+    "cmpxchg$5`'ifelse($6,Acq,_acq,) $res = $mem, $oldval, $newval\t# ($3) if $mem == $oldval then $mem <-- $newval"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::$4, /*acquire*/ ifelse($6,Acq,true,false), /*release*/ true,
+               /*weak*/ false, $res$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+CAE_INSN1(B,    I,  byte,       byte,       b,  sxtbw,  )
+CAE_INSN1(S,    I,  short,      halfword,   s,  sxthw,  )
+CAE_INSN2(I,    I,  int,        word,       w,  ,   )
+CAE_INSN2(L,    L,  long,       xword,      ,   ,   )
+CAE_INSN2(N,    N,  narrow oop, word,       w,  ,   )
+CAE_INSN2(P,    P,  ptr,        xword,      ,   ,   )
+dnl
+CAE_INSN1(B,    I,  byte,       byte,       b,  sxtbw,  Acq)
+CAE_INSN1(S,    I,  short,      halfword,   s,  sxthw,  Acq)
+CAE_INSN2(I,    I,  int,        word,       w,  Acq)
+CAE_INSN2(L,    L,  long,       xword,      ,   Acq)
+CAE_INSN2(N,    N,  narrow oop, word,       w,  Acq)
+CAE_INSN2(P,    P,  ptr,        xword,      ,   Acq)
+dnl
+dnl
+dnl
+dnl ====================== (Weak)CompareAndSwap*
+dnl
+define(`CAS_INSN1',
+`
+instruct ifelse($7,Weak,'weakCompare`,'compare`)AndSwap$1$6(iRegINoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
+ifelse($6,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),`dnl')
+  match(Set res ($7CompareAndSwap$1 mem (Binary oldval newval)));
+  ins_cost(`'ifelse($6,Acq,,2*)VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg$5`'ifelse($6,Acq,_acq,)`'ifelse($7,Weak,_weak) $res = $mem, $oldval, $newval\t# ($3) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::$4, /*acquire*/ ifelse($6,Acq,true,false), /*release*/ true,
+               /*weak*/ ifelse($7,Weak,true,false), noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+define(`CAS_INSN2',
+`
+instruct ifelse($7,Weak,'weakCompare`,'compare`)AndSwap$1$6(iRegINoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
+ifelse($1$6,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));),
+       $1$6,NAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);),
+       $1,P,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
+       $1,N,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
+       $6,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
+       `dnl')
+  match(Set res ($7CompareAndSwap$1 mem (Binary oldval newval)));
+  ins_cost(`'ifelse($6,Acq,,2*)VOLATILE_REF_COST);
+  effect(KILL cr);
+  format %{
+    "cmpxchg$5`'ifelse($6,Acq,_acq,)`'ifelse($7,Weak,_weak) $res = $mem, $oldval, $newval\t# ($3) if $mem == $oldval then $mem <-- $newval"
+    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+  ins_encode %{
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
+               Assembler::$4, /*acquire*/ ifelse($6,Acq,true,false), /*release*/ true,
+               /*weak*/ ifelse($7,Weak,true,false), noreg);
+    __ csetw($res$$Register, Assembler::EQ);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+CAS_INSN1(B,    I,  byte,       byte,       b,  ,           )
+CAS_INSN1(S,    I,  short,      halfword,   s,  ,           )
+CAS_INSN2(I,    I,  int,        word,       w,  ,           )
+CAS_INSN2(L,    L,  long,       xword,      ,   ,           )
+CAS_INSN2(N,    N,  narrow oop, word,       w,  ,           )
+CAS_INSN2(P,    P,  ptr,        xword,      ,   ,           )
+dnl
+CAS_INSN1(B,    I,  byte,       byte,       b,  Acq,        )
+CAS_INSN1(S,    I,  short,      halfword,   s,  Acq,        )
+CAS_INSN2(I,    I,  int,        word,       w,  Acq,        )
+CAS_INSN2(L,    L,  long,       xword,      ,   Acq,        )
+CAS_INSN2(N,    N,  narrow oop, word,       w,  Acq,        )
+CAS_INSN2(P,    P,  ptr,        xword,      ,   Acq,        )
+dnl
+CAS_INSN1(B,    I,  byte,       byte,       b,  ,       Weak)
+CAS_INSN1(S,    I,  short,      halfword,   s,  ,       Weak)
+CAS_INSN2(I,    I,  int,        word,       w,  ,       Weak)
+CAS_INSN2(L,    L,  long,       xword,      ,   ,       Weak)
+CAS_INSN2(N,    N,  narrow oop, word,       w,  ,       Weak)
+CAS_INSN2(P,    P,  ptr,        xword,      ,   ,       Weak)
+dnl
+CAS_INSN1(B,    I,  byte,       byte,       b,  Acq,    Weak)
+CAS_INSN1(S,    I,  short,      halfword,   s,  Acq,    Weak)
+CAS_INSN2(I,    I,  int,        word,       w,  Acq,    Weak)
+CAS_INSN2(L,    L,  long,       xword,      ,   Acq,    Weak)
+CAS_INSN2(N,    N,  narrow oop, word,       w,  Acq,    Weak)
+CAS_INSN2(P,    P,  ptr,        xword,      ,   Acq,    Weak)
+dnl
+dnl
+dnl
+dnl ====================== GetAndSet*
+dnl
+define(`GAS_INSN1',
+`
+instruct getAndSet$1$3(indirect mem, iReg$1 newval, iReg$1NoSp oldval) %{
+ifelse($1$3,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));),
+       $1$3,NAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);),
+       $1,P,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
+       $1,N,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
+       $3,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
+       `dnl')
+  match(Set oldval (GetAndSet$1 mem newval));
+  ins_cost(`'ifelse($4,Acq,,2*)VOLATILE_REF_COST);
+  format %{ "atomic_xchg$2`'ifelse($3,Acq,_acq)  $oldval, $newval, [$mem]" %}
+  ins_encode %{
+    __ atomic_xchg`'ifelse($3,Acq,al)$2($oldval$$Register, $newval$$Register, as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}')dnl
+dnl
+GAS_INSN1(I,    w,  )
+GAS_INSN1(L,    ,   )
+GAS_INSN1(N,    w,  )
+GAS_INSN1(P,    ,   )
+dnl
+GAS_INSN1(I,    w,  Acq)
+GAS_INSN1(L,    ,   Acq)
+GAS_INSN1(N,    w,  Acq)
+GAS_INSN1(P,    ,   Acq)
+dnl
+dnl
+dnl
+dnl ====================== GetAndAdd*
+dnl
+define(`GAA_INSN1',
+`
+instruct getAndAdd$1$4$5$6(indirect mem, `'ifelse($5,NoRes,Universe dummy,iReg$1NoSp newval), `'ifelse($6,Const,imm$1AddSub incr,iReg$2 incr)) %{
+ifelse($4$5,AcqNoRes,INDENT(predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_exclusive(n));),
+       $5,NoRes,INDENT(predicate(n->as_LoadStore()->result_not_used());),
+       $4,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
+       `dnl')
+  match(Set ifelse($5,NoRes,dummy,newval) (GetAndAdd$1 mem incr));
+  ins_cost(`'ifelse($4,Acq,,2*)VOLATILE_REF_COST`'ifelse($5,NoRes,,+1));
+  format %{ "get_and_add$1`'ifelse($4,Acq,_acq) `'ifelse($5,NoRes,noreg,$newval), [$mem], $incr" %}
+  ins_encode %{
+    __ atomic_add`'ifelse($4,Acq,al)$3(`'ifelse($5,NoRes,noreg,$newval$$Register), `'ifelse($6,Const,$incr$$constant,$incr$$Register), as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_serial);
+%}')dnl
+dnl
+dnl
+GAA_INSN1(I,    IorL2I,     w,  ,       ,           )
+GAA_INSN1(I,    IorL2I,     w,  Acq,    ,           )
+GAA_INSN1(I,    IorL2I,     w,  ,       NoRes,      )
+GAA_INSN1(I,    IorL2I,     w,  Acq,    NoRes,      )
+GAA_INSN1(I,    I,          w,  ,       ,       Const)
+GAA_INSN1(I,    I,          w,  Acq,    ,       Const)
+GAA_INSN1(I,    I,          w,  ,       NoRes,  Const)
+GAA_INSN1(I,    I,          w,  Acq,    NoRes,  Const)
+dnl
+GAA_INSN1(L,    L,          ,   ,       ,           )
+GAA_INSN1(L,    L,          ,   Acq,    ,           )
+GAA_INSN1(L,    L,          ,   ,       NoRes,      )
+GAA_INSN1(L,    L,          ,   Acq,    NoRes,      )
+GAA_INSN1(L,    L,          ,   ,       ,       Const)
+GAA_INSN1(L,    L,          ,   Acq,    ,       Const)
+GAA_INSN1(L,    L,          ,   ,       NoRes,  Const)
+GAA_INSN1(L,    L,          ,   Acq,    NoRes,  Const)
+dnl
diff --git a/src/hotspot/cpu/aarch64/cas.m4 b/src/hotspot/cpu/aarch64/cas.m4
deleted file mode 100644
index 7e13e153db1..00000000000
--- a/src/hotspot/cpu/aarch64/cas.m4
+++ /dev/null
@@ -1,161 +0,0 @@
-dnl Copyright (c) 2016, 2021, Red Hat Inc. All rights reserved.
-dnl DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-dnl
-dnl This code is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License version 2 only, as
-dnl published by the Free Software Foundation.
-dnl
-dnl This code is distributed in the hope that it will be useful, but WITHOUT
-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-dnl version 2 for more details (a copy is included in the LICENSE file that
-dnl accompanied this code).
-dnl
-dnl You should have received a copy of the GNU General Public License version
-dnl 2 along with this work; if not, write to the Free Software Foundation,
-dnl Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-dnl Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-dnl or visit www.oracle.com if you need additional information or have any
-dnl questions.
-dnl
-dnl
-dnl Process this file with m4 cas.m4 to generate the CAE and wCAS
-dnl instructions used in aarch64.ad.
-dnl
-
-// BEGIN This section of the file is automatically generated. Do not edit --------------
-
-// Sundry CAS operations.  Note that release is always true,
-// regardless of the memory ordering of the CAS.  This is because we
-// need the volatile case to be sequentially consistent but there is
-// no trailing StoreLoad barrier emitted by C2.  Unfortunately we
-// can't check the type of memory ordering here, so we always emit a
-// STLXR.
-
-// This section is generated from cas.m4
-
-dnl Return Arg1 with two spaces before it. We need this because m4
-dnl strips leading spaces from macro args.
-define(`INDENT', `  $1')dnl
-dnl
-define(`CAS_INSN',
-`
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchange$1$6(iReg$2NoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
-ifelse($1$6,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));),
-       $1$6,NAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);),
-       $1,P,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
-       $1,N,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
-       $6,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
-       `dnl')
-  match(Set res (CompareAndExchange$1 mem (Binary oldval newval)));
-  ifelse($6,Acq,'ins_cost(VOLATILE_REF_COST);`,'ins_cost(2 * VOLATILE_REF_COST);`)
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchg$5`'ifelse($6,Acq,_acq,) $res = $mem, $oldval, $newval\t# ($3, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::$4, /*acquire*/ ifelse($6,Acq,true,false), /*release*/ true,
-               /*weak*/ false, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}')dnl
-define(`CAS_INSN4',
-`
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct compareAndExchange$1$7(iReg$2NoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
-ifelse($7,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),`dnl')
-  match(Set res (CompareAndExchange$1 mem (Binary oldval newval)));
-  ifelse($7,Acq,'ins_cost(VOLATILE_REF_COST);`,'ins_cost(2 * VOLATILE_REF_COST);`)
-  effect(TEMP_DEF res, KILL cr);
-  format %{
-    "cmpxchg$5`'ifelse($7,Acq,_acq,) $res = $mem, $oldval, $newval\t# ($3, weak) if $mem == $oldval then $mem <-- $newval"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::$4, /*acquire*/ ifelse($7,Acq,true,false), /*release*/ true,
-               /*weak*/ false, $res$$Register);
-    __ $6($res$$Register, $res$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}')dnl
-CAS_INSN4(B,I,byte,byte,b,sxtbw)
-CAS_INSN4(S,I,short,halfword,s,sxthw)
-CAS_INSN(I,I,int,word,w)
-CAS_INSN(L,L,long,xword)
-CAS_INSN(N,N,narrow oop,word,w)
-CAS_INSN(P,P,ptr,xword)
-dnl
-CAS_INSN4(B,I,byte,byte,b,sxtbw,Acq)
-CAS_INSN4(S,I,short,halfword,s,sxthw,Acq)
-CAS_INSN(I,I,int,word,w,Acq)
-CAS_INSN(L,L,long,xword,,Acq)
-CAS_INSN(N,N,narrow oop,word,w,Acq)
-CAS_INSN(P,P,ptr,xword,,Acq)
-dnl
-define(`CAS_INSN2',
-`
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwap$1$6(iRegINoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
-ifelse($6,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),`dnl')
-  match(Set res (WeakCompareAndSwap$1 mem (Binary oldval newval)));
-  ifelse($6,Acq,'ins_cost(VOLATILE_REF_COST);`,'ins_cost(2 * VOLATILE_REF_COST);`)
-  effect(KILL cr);
-  format %{
-    "cmpxchg$5`'ifelse($6,Acq,_acq,) $res = $mem, $oldval, $newval\t# ($3, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::$4, /*acquire*/ ifelse($6,Acq,true,false), /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}')dnl
-define(`CAS_INSN3',
-`
-// This pattern is generated automatically from cas.m4.
-// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
-instruct weakCompareAndSwap$1$6(iRegINoSp res, indirect mem, iReg$2 oldval, iReg$2 newval, rFlagsReg cr) %{
-ifelse($1$6,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));),
-       $1$6,NAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);),
-       $1,P,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
-       $1,N,INDENT(predicate(n->as_LoadStore()->barrier_data() == 0);),
-       $6,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
-       `dnl')
-  match(Set res (WeakCompareAndSwap$1 mem (Binary oldval newval)));
-  ifelse($6,Acq,'ins_cost(VOLATILE_REF_COST);`,'ins_cost(2 * VOLATILE_REF_COST);`)
-  effect(KILL cr);
-  format %{
-    "cmpxchg$5`'ifelse($6,Acq,_acq,) $res = $mem, $oldval, $newval\t# ($3, weak) if $mem == $oldval then $mem <-- $newval"
-    "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-  %}
-  ins_encode %{
-    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register,
-               Assembler::$4, /*acquire*/ ifelse($6,Acq,true,false), /*release*/ true,
-               /*weak*/ true, noreg);
-    __ csetw($res$$Register, Assembler::EQ);
-  %}
-  ins_pipe(pipe_slow);
-%}')dnl
-CAS_INSN2(B,I,byte,byte,b)
-CAS_INSN2(S,I,short,halfword,s)
-CAS_INSN3(I,I,int,word,w)
-CAS_INSN3(L,L,long,xword)
-CAS_INSN3(N,N,narrow oop,word,w)
-CAS_INSN3(P,P,ptr,xword)
-CAS_INSN2(B,I,byte,byte,b,Acq)
-CAS_INSN2(S,I,short,halfword,s,Acq)
-CAS_INSN3(I,I,int,word,w,Acq)
-CAS_INSN3(L,L,long,xword,,Acq)
-CAS_INSN3(N,N,narrow oop,word,w,Acq)
-CAS_INSN3(P,P,ptr,xword,,Acq)
-dnl
-
-// END This section of the file is automatically generated. Do not edit --------------

From 5bd7db034aaf8aa6780945e02a7f9a35e16b036e Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 1 Dec 2025 09:03:30 +0000
Subject: [PATCH 408/512] 8372730: Problem list
 compiler/arguments/TestCodeEntryAlignment.java on x64

Reviewed-by: lucy, goetz
---
 test/hotspot/jtreg/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 7b4026484ca..423bcdecaa8 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -79,7 +79,7 @@ compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64
 
 serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java 8369150 generic-all
 
-compiler/arguments/TestCodeEntryAlignment.java 8372703 macosx-x64
+compiler/arguments/TestCodeEntryAlignment.java 8372703 generic-x64
 
 #############################################################################
 

From 160148cc7b0c2774e7aa5fece653e41c9fa7c970 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 1 Dec 2025 11:28:22 +0000
Subject: [PATCH 409/512] 8372610: G1: JDK-8297692 broke code roots scan
 measurements

Reviewed-by: iwalulya, sjohanss
---
 src/hotspot/share/gc/g1/g1RemSet.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index d0633466f37..c7724de280f 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -611,23 +611,24 @@ void G1RemSet::scan_collection_set_code_roots(G1ParScanThreadState* pss,
                                               G1GCPhaseTimes::GCParPhases coderoots_phase,
                                               G1GCPhaseTimes::GCParPhases objcopy_phase) {
   EventGCPhaseParallel event;
-
   Tickspan code_root_scan_time;
   Tickspan code_root_trim_partially_time;
-  G1EvacPhaseWithTrimTimeTracker timer(pss, code_root_scan_time, code_root_trim_partially_time);
 
   G1GCPhaseTimes* p = _g1h->phase_times();
+  {
+    G1EvacPhaseWithTrimTimeTracker timer(pss, code_root_scan_time, code_root_trim_partially_time);
 
-  G1ScanCodeRootsClosure cl(_scan_state, pss, worker_id);
-  // Code roots work distribution occurs inside the iteration method. So scan all collection
-  // set regions for all threads.
-  _g1h->collection_set_iterate_increment_from(&cl, worker_id);
+    G1ScanCodeRootsClosure cl(_scan_state, pss, worker_id);
+    // Code roots work distribution occurs inside the iteration method. So scan all collection
+    // set regions for all threads.
+    _g1h->collection_set_iterate_increment_from(&cl, worker_id);
+
+    p->record_or_add_thread_work_item(coderoots_phase, worker_id, cl.code_roots_scanned(), G1GCPhaseTimes::CodeRootsScannedNMethods);
+  }
 
   p->record_or_add_time_secs(coderoots_phase, worker_id, code_root_scan_time.seconds());
   p->add_time_secs(objcopy_phase, worker_id, code_root_trim_partially_time.seconds());
 
-  p->record_or_add_thread_work_item(coderoots_phase, worker_id, cl.code_roots_scanned(), G1GCPhaseTimes::CodeRootsScannedNMethods);
-
   event.commit(GCId::current(), worker_id, G1GCPhaseTimes::phase_name(coderoots_phase));
 }
 

From f5eecc454eb78fc1a3714dfe3cb94113238dd3ac Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Mon, 1 Dec 2025 12:18:19 +0000
Subject: [PATCH 410/512] 8353738: Update TLS unit tests to not use
 certificates with MD5 signatures

Reviewed-by: djelinski, abarashev
---
 .../javax/management/security/keystoreAgent   | Bin 1325 -> 2710 bytes
 .../javax/management/security/keystoreClient  | Bin 1327 -> 2710 bytes
 .../javax/management/security/truststoreAgent | Bin 619 -> 2710 bytes
 .../management/security/truststoreClient      | Bin 618 -> 2710 bytes
 .../CriticalSubjectAltName.java               | 191 +++--
 .../net/ssl/HttpsURLConnection/crisubn.jks    | Bin 2794 -> 0 bytes
 .../net/ssl/HttpsURLConnection/trusted.jks    | Bin 743 -> 0 bytes
 .../HttpsURLConnection/DNSIdentities.java     | 705 ++---------------
 .../IPAddressDNSIdentities.java               | 681 +----------------
 .../IPAddressIPIdentities.java                | 690 +----------------
 .../HttpsURLConnection/IPIdentities.java      | 425 -----------
 .../https/HttpsURLConnection/Identities.java  | 710 ++----------------
 .../HttpsURLConnection/IdentitiesBase.java    | 187 +++++
 .../test/lib/security/CertificateBuilder.java |  14 +-
 14 files changed, 524 insertions(+), 3079 deletions(-)
 delete mode 100644 test/jdk/javax/net/ssl/HttpsURLConnection/crisubn.jks
 delete mode 100644 test/jdk/javax/net/ssl/HttpsURLConnection/trusted.jks
 delete mode 100644 test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
 create mode 100644 test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IdentitiesBase.java

diff --git a/test/jdk/javax/management/security/keystoreAgent b/test/jdk/javax/management/security/keystoreAgent
index cfb02e00c38b8e28e4dcf4b0fdc60b80bda58990..ebb95dd0dfa3b6852c2aea03ada04f74d918722c 100644
GIT binary patch
literal 2710
zcma);c{CJ`7RP6^4WhwVLYC})jCGiw>?BNNmt`7^q>+8!$B?pR&0Zo)Nj#=x$uOjl
zHEWhEl?<}RAf9*LJ9XY)@11+@x#xbq_ufCh=OPHu3=j~EAV4+fnWPhp682bu48TVO
z=wA>5RO%FqAqaHU|0U5CK?rntr#SmG)9IQ2v&8}hf*uj*v`?W1!u|IK9V@~fq4uX`
zLC8Qj(aT5+ifm=>QB|4V$DGWb5F;re5J-X@1QbHB&@=w~B8Z6&fDoW(x}IPJ#DO6|
zX$ZUdbH*{1#n#t!LGgx6p=B@#0W$c+7^HQ8F11`Jv0Na;W+AVM^;zFwP@)}<yoqJE
z)Q8A=5lf{wYuRpa%n`<L&oXil)Q-<sPq)8WdiGRJqZL&HSgu&b*)Z!5kG=xAE!kZ^
z{5Be(Q^T%UI88IxJl-EkrQO~N^4;{E^@=kc<vDj|C<-lWXMz?^VRr^n?L<=HuHy|?
z4V7aXk+Qh9*NFng_AAUR-thvh4$16N@Ie=T`+(;CVRkpLW<&Q3HECNie?B~_D1i2;
zIbx6P3{dOHL-%J_nYpP?lqq!~F6?%sT$wzFw~R>T>;`>iosjl1q~HQ_*FH7jwcEMi
z!RXq8q``c*TRd<~SK$$E%Sd8A*N$-;I_)HxGZU6qWLOX@`(0PmYYHDZ`~*&#F>y;1
z8M)<Ww47C;yl0qeoN|a`4}YqG?2NZbwY)6-OiqPMeNN*A`&vZV%HS&H4(aabYF_MR
zJjb_AtqqAe=rR{!f~4k?(c?d#(p<F>w37RT<kb9J-6GYScK+*m=lBEv^(Z&uwZ!ys
zxm#1+#GBeH!l-}zNVj+Hz_tf8JmXP{L&-FgVyZ|hLpC!BM|k3p;Y6A6y^P+$HJV4C
zWxMH{{d38QmTXqTW0LLs4s)t_U8axIy0ppiqk+=dC7a5ypN)RpZ5!>=<w<(x)`7tD
zJP-W_k?Ky?yXI;n0TDAfu!DdoDvLjZnUzEQ)1f>&p+i9{ZjE17`V*tPa-4-CswN39
z`uHUz<)UEb*?o!D1#!B!{Din4En>L4HG*m#k;hY)WYc?lZ%`Oe{n`(<D$;gP<Gxm7
z(^!|;Mh$ukWLV>S+vgf!s8Fc%yNTNy?y%@5#wyx*vlfWp?^1n*$<DgTt_ooui`1tf
z{bphVDT8|W!Up+0(PWXr0u}O3-UT%W+0td7uQz#V!<;be@_xT+$KLvEc47>p1#UN#
zs~%$xPVJhynWI0n%$FYBDGqf|f}K3(enqJ><LkqRQIn#?cq>-F>DHnT>%)ajMHiHn
zMYh_W6{~j*-xqX}0oo;9#5I$@M)b=fYhE6|0yo87on9v^_<BNlwr5^?p*wm}#0hJz
zjW+(J{CWddKJs4P2G%&dk~>lQEQjY$8t0_89|yYd(N^|}S%Cm3(q#(H;L*heg?Ziw
z*54sZQy;w;?>68K=e`;Q$kzXiRPu%rJ1(&zNylpy?mGlo6CJK;v^^zuCa@(1pD4j$
zT{)U|Cl+Oviz!p?b5!;kgTAOxy&WXxv~N_7>@4sR7em5WC^bzszFiMDCr9q>6%5oL
zd_6AOrIisHF~$`8LN(%9oeWQ4uGc=^*=cE}xTWOBvHah5jEaxz)|3$PYe%=nE6cw1
zScRr$ehA)}vgI*BCWoMcR&1otjfd>SbU(GLG<3_?nr7<9zOxpaX{3}FtXW#Vy_~=m
z`K1lAp_1KR<RK5b!nf%{DHxq?gQIK^LUw>lBKNweu&ji|%mxm*DUqsbiE?`y)l2ww
zqqu`P>gT|s+{U1*VsT_yy{rEIlSp~v((97VRah70wa}l7k;5OdPXZXSq=R89KeZJ4
zu(O8gAwyJ!4B9cwPMGP_HIl9w{(!snVY8O>s3&>f!M1oYwifeU$+#XWsX$;GV-AyP
z*Rxg7MDYH$OD0YQ7C|V$3lIvp1;7D95yF2YE(J~q%<85WPDlZ%f>cpfS5rbLo(2Kp
z`+JCi{t*G<a*CWmK)`9S{i6W?mr46Ozblnn?KkC-c!1HA)!|>7K=k}SCcUw01;dbU
z_yp03cgNT0yT%Z}pU>wJiNUTi1J<hXW7P6;2Pg#74M-SjTAujq%qEy^XyH7$P$I?r
z1^vNbSd6)O;mz{d7qD1IHhY7HB{b8zpk<8SYTvc|cIW&dE>7Vh2Ss~5T@#a#34zX5
z$8XB(jgyPuau-MzgS%rl9H^L4Gh#kTs(rvjz4P#`$bdJ0c@O$(V$dL*s-mwx5^Ij>
zZ8?Z*`V{gSW0-@bBZtxj*R<!$q(#vOZp>#reeQnu1qai6oqP8E-8)WM))K}=UtXlz
zrQ*s&!c2+2(!pv*e|1*#9LmdcKGX<1%CW#!&A?P`P&&odkP0LE-g>X^DSX-#Y>uK?
zxPxQsK%n71>}vYR1J24zQGr!i!m^IH@s_+}Pw+`bR?AL2j5)(II0n<><{uYheOua7
z0;h-JpC+QM`bv)i?t5O;ZZABu9_@1Andf|G!#`tP$eU<8>OP5-pulP7on+6+le)T?
z@<4B2pz8I7rXJD<cnO&aS)O=3T9Y;AosX&Wnn_?AooUz*U(I)gv03|CQN0#T4;Qx`
zk+iX$2pn#8?a+kby(to9_j2mkQF%sk7s764?Hwn4Q2Yxs!6?GQzrr~O%H=xAYvPOQ
z7_D``sj&F9iyg4gs_7THFl-~UU^eL`U@wYaBJ)pQdp<?_qPj{9$bUNHH}LCC_#9zg
z+S8FA?bBPMOMN+IlaIKfOveH$DB@U{vEWv9!p2XFG75G_`Z;a)ZgxqE(9(P$O)Wwy
zj3oxdhAZIOfLH$G64z@#UUD148S%y2mitL#9<id0eBV^?I**E*<hiX6fD@`UN#&7S
ztY}&|1?4{2VZqEBF^ub!HMgQ2d)!WIeO5<ybXi)}jQz;gU9hQ7vIUwore^|L9p<*@
z<@CBr4mr6{Bl0^AWQ$~$dA+kiLD`3Qxh?5AeXz*pfH%1y$MlMDmphvQmUWVUTj};w
z)z7az4o|<Elckj`bV1`fMVOVwU_ri{zhC4%MGx;ChL@@cb(}fev=uzl++xsbCN<F}
ze|CJAA^56O<MRxA_(BT<eG#zoJw6?&_st`?kvH%?$L?&y{>Lc-#Wuo7GlIwTq_edO
zaFHebso&#}rm)2|4E?LNdp_4FO@$(N{wh`L*^Fent3&d4TN5H0<>A({o1%{el`&Tm
zpv1VhnKmy!I;>N5y<vfv3%b-V#|r*Ak6*`F@mL4EFID{ocD#`X7oMof4E%|l$BJT>
z8z2UtdsQ06D!B)wl89|x^QmWggP%-tygmGKrE)I%zr|jD>ym8-ra#(R?U*Y#xmvw4
zOy0~!8$A82`Pn@IV2qmmg+L<|5Ujs{H4u;v01-O3k^jn9o*hH3scy;C(AjqKnPS<s
ok`x5rpUo8Ws(uIIWZ~jES0eahaf#vOGjKAVnbt9#{V$98ClS)wkN^Mx

literal 1325
zcmezO_TO6u1_mY|W&~r_#Prm>5+L*M{3&VyK$+bJO-$Pj_}I9#*%(<EwU`7M8Ce-v
znwS=wNzZV8k>3A9Z;R-&Gn3BG43#*>V^m=g{dlEL;e)p}a%T$OS$go)pZYj?d8^K<
zIc^QA>1+9wt*(2Xm)U&v{ek0ApL?1sO1VyXnX%k2a&pQ0d-%#3;ZWfc9tn<x=~EXq
z<OfEFUpo85OJhaU``0I1>|>WNvHq77(l(VrM)ddOPoZTq=I=4;DssR6+(yX4A~kR6
zw69UtJHIK<2>rEt`oj;AZTGJ|+sn*p<#?z6*#1cMezDg3pP34jr=%5rsy^g>{91PK
zq76lQy@|)&<5OPf1?o%}|9j%yo?8X1`}e1A``kC3X)3!s2e0@ns|u&rFQlszbuu&B
z!izeu3(9lY^jQ3kRXeod;xFkP7Vfd_D{sCwlV6(j&O$*?ET64KVd?J2p*y}c?!J8b
zKx*gR<4h|%%uhWtO8BFYEV3v<GMG1dM^YGX>_XSmhGh=Ud-I<@G;iMU@9XLHKhD=Q
z-w3vPrX=jy;c<%d$>P)dmVKQy$?vOI+}U8gOHyxcN$$M+py<$>%|-9tPhxm;Prl+T
zr(Cll_c}glp5Ge03R|uo-<lQv==6b2A+j%zzPj~<Z_eHd?t7t5X=bSl5_{hKX;0l@
z-2W!PV_w*wx0`R-wyNd)YW)}gAf%RSci#LO%kammV`aj!9?sA`SC}Tw+h(BAef0V@
zjlUQ6{@B=1b)&g)quB)Yd(l&-PXE6*Y2zPXK2A%G3zycL=c`}2pvNn7Uorgc^i$Sf
z=e<rlEo|#!H~+qHa;W-FDWlf8kI%bVeo$D{af5Z4^5Ky729ff=OqVtU6-Fd8E}w8g
z&tT(}=SS)cHR9IS<p}mBN!dBiQF^!jKX=4`;SJ%wbIbPpU1RaxnrXg6{LaGYy!ar)
zzwHZN8oNB5!NeDOlrQzuvUxcd-^OocO=g?t!#w>g&(5hIvOgz4Qgno#sevUhCF=lF
zvW7tu<3uJFhqt9?40zc%wc0$|zVk9Nvam83L>qD&aI!Invaks=xdj>W8SsEO9Kx)g
z#i>Q9hJptCAU?Y=hkH?KUVc(esv(a77f6Upm^rvK&yd%E8^q%lX7Mr#c7;hY3p0E9
zMi|J6^BR~Km>XCani-jy8byio8e1Be85=;kw6(l(KC)kd*_XMom%*U1lc}+hVeYPp
z^7|)oO+Ikj)`~}m`CwS*EO*OUyy@`~f2KY=GRMrsYL9A)#FDPv<+HzY1eJv8zVc{X
z#ah1bK0{l-zTANmSsR4@a<8bky!b~#mE@vdO?wy2=E<;XDrvFP-B+&H@4``V-2R-x
z1PwK(HM@j9O}xHFNx5(C7kftDcMo?oMFnIsF*7nSB0CQl70f_)2`-+P{V34y%!Us^
z^{MiIuT{S@;M`Tbr_e7&XiB&BzqOW@3!k|=p5Jn^@TSq5%YiKmr&^!d*mPaev6gj(
z&&|esy?G|nisS{GpPJ2%R!x^PpR_Hz*Wtn}!&$F{Zr+G%HnUpZ$SgFA<)pGes_xC`
s1RYCmjWelRZulO{m{9H0U*5Di<--A8#+8qI>{e=jSUrVB$KkIw0BqD5(*OVf

diff --git a/test/jdk/javax/management/security/keystoreClient b/test/jdk/javax/management/security/keystoreClient
index f0e0b7f57187520d475f57004e05ab8418f308d4..2382154441dee509bcad652d7dc2bb22a633d1ea 100644
GIT binary patch
literal 2710
zcma);XEYlO7sn+MBck@I?GzO&v7;KRN>QuBp2brmW>LFB%?gU-(F$6E+9hhWs(7rT
zX0=w3+EP?$#d`Xl_dR{i`{{i@+;h+U{qO&N{GSWQKpq1D^l%JBi-8%IXq5Pa6~G86
z!a(Ff7>LX-ED6VetNu#@6F?Yn-Y=Z{tFjna{^No|0Kg&)Smzhif_wgUfLY<TaE*UP
zC|nlA-7`p;P|0m$noqd0A2ZhJMNYG81OlbmfdDZ$l!58r7lF)RI=C<cvrD28z=IwH
zfPvUq?^QXJs|ZB|@eC`ug`~KFFrX3Tz2$kdRQJc%kA{)YLrW%hI0;N!Z}P}WK7K3o
z(m7E|fWU3_K8sSYp<MeZ`O-T)v$<Ny#?IcCdxrHLAfYpQbo!L1aZ5b%d<3KWMZ++t
z7L*v`+Sw;hia8@!_VL43Gj*EQkLAnLe-@&GgScC6;K%Kxn!FEOIvV^}%Vf;1g+!+b
z3?|u&P<Dc`9q=$N=+`%v4aku0yT#OZ^tZDsBn$mk7mHQe<wDd2Poly<*cD*6Lpu9V
zqVFHir8&RC>G<vq6O;7#iJaPsgX-<a$oRrfk9;gIi>9_aA)MZ7gf;saw=5V-@Sb`)
zj+EBr?LIur=djfrJUgXj4xx3i5{>!k;%Obgw6T4|WKE-z(n@bY!Jxkb-<tQ(k|6uN
zJi{g1?0uK*G+$~ob9btlpTh^);;d-nQJ%;<OQo4yy4j`^mbN(0T4Z(m?B%_~U?(%z
zNta}WwY#Ll**Vzt&psF-u`|^&EnZZUa((Y5U#C*TMYWNH1qFbs!9H|m0+_35Xx49=
z{rG?<A{HCWz35TM&e3FDqL4n9siI$rP0C3S<w$wYPSZ`#dGaEJTt{Si#}b3Ey4o4P
z)tuY6n@GtK*<Q<;FrV99TkGu;R9m_bn!+Ev*-Y5HJidntiu?@Kjb(H2JHw%tFU_#z
zJ-e=#)IWEExy5d_rDw{*+#fmktp!WZpO_tpKMyCBt>whAm~gSaHNPZ#>?@sHB6Y0+
zCoQh%oxUsw(4HJo>8j4e#pZX?$K8JsV0^gPBWr$^?dEg$)v@Sc%Cv3g_WliY&-p(n
zFV&*VELN(k#VV$5Dn}$47Dy|pwdN`~Kl!+}c-zKhbRPovsd%2%>O!eW68)SORx=V8
zi_2p+Mw^b1Q7nHEhWJK?*pi>M+&l5-W}QVOX+Ers!>(kg{$Pyt{8(Q$Fg#C+xHY67
zE-{&PuD|au8KnjB&-vu%YGmaBP5E3S*OZ<zi&IYX)YcQx7cm=|uF!|DfYt)hbJNs2
zMyw|<c!J7U54+x921qP4y{cmZiGe|7nhLhr1IObvNac*^qwp_-OCx!Y&9=gclM+mE
zTeaL&5ZyO{;3D1kSK-~4jRgk{-D)k0I--Rt`GLa+?`Y9BrUq*nR$&~3k?}aS_yMoU
zPrW*aZW=2yEA5R8#aj)%LwAf!xyBu_xPjMdBNsDzrJv%sY0&i`{<rsO#5RfoB=y@}
zz-qc2_IqAr(N~cTM@qloY`NVd8%Q1WXT&G5loAQ+m^k}-%P<P=VbIbOn{&RIRZ3Yb
zGL2oeQISoJ)a7%ZDvi-Sn%`1fvHCgQfv}zP!DXU?9!1qK@8$zfa18}<PIl^icO#<#
zca19-`>iW(XJ(g9Uj&9)P?W0iHsTef?(ow|!Q8_Sevsw|bPRXMD*e3fRm&$rOXgXN
z1JC>$GP55<iZ58bQMPv#8FnVSrxvh|RqT|xYiXZ_i5y0tdQV@MZ*w_~;J24jEsmg9
zb=~jv>1fRmR?nX9nozBh<!81KY|jg*36Y;jg}?w(B*)Of@v)!C!K(qBZO!?-1ZvDy
z6R&DweBEKum7`U6gOoXcuXnA@8K%W-`3G?$Sl8ySJ~K|`EJoSKF@01r0ZHvnm}czR
z)8w&=KQKU`-~zwnl9?L;6@k#9>B8xJ=sf7c;o|>DJP2+O=S?rPhZsU#Rb5pDiA1O?
zBUIoRP~h(+Mus8`$n6($0s`oMHS2#A!2b&AmX@}KuZJ+(q&<^U3X0$><T)z!|Acf;
zD|Ub=K2(g1ST}vOHskgHL%(47p~7wAl!a<rU5o?ofb+U7k+`hy1B%-+NGI^y?MMV3
z82WJ$GJ3+AVa6uKNB;Kb8QPYJjuqRb#W>D#9Q`zYb_X@|;G#tZoi-O&I={3uquZ%Z
z;+Oep*Tp(mk6_t?@PbOaFwhy&*m6;M;&G?>iLOVTfP~$q<ka_Ut1MdwJhp9AYAQ3`
zIJ~uQA#mYOdJeH^PWN~w$&UpR6x#D;_A19}cv<0-BO?SUrL6n~AMcUI%}*Y(E)p4@
zH?(a<*&>s)o(6=xs@5M_YQO$n+fO)6iOL-q9TSGsFkJPtaJVU~E-hHVVs&g(=RtBa
z(b6idjTN7_yJa85wZw4MyG_D<*Z(zyXc|p`pZ#d7CqMaabXU8(`zLwtNcqa0LZ(_5
z*YvSj)YL8k?Z1a4Egk4P&-*xXK3GJg3X(dI(yt)p?CuV`qgKk+halp?+dp``WcJ!?
z-L4pnt@QU1XrT1{$2;iZ<M262)qG$0$5q;VFE@=>StX#jU&;Q??k!H7SLn=W_Rz&l
zrplF6MxNlvv@XA=1m_06BOFLl7vj9_E6{#1U|-3qT}qO;ui|H3z|#eMAzMGYFsOjX
zqgx#(lA%S<ppPPYd{!qGG;+d%)?wD$4+<2|B8I+b3Xd!<pYh`96>s-W*Cme>!wRr^
zqS04gDuxl-YsM!}4Gw<#VT{-3X?O?OOYuyeEFU<8ZruDCazjQhqg2L3+y}{*70wB9
z<_tC1s&tNTVWQ2SaCU30Z=&)C9$xsqk{fd=RMHMWr1@I*dh@r{!xm$!v#;GA<`AE-
zbI}P9tnXG|4Rw>=#>?yM>J_OsqBbKlrCM`LXx9ql2sYYX`_nC_Q6YD8^6OV3@?uM2
zXeO%*idIp`Mw?s@Q8aFKb3-M0e~5ZR``O0*UHLAhw9InYHq9ijGja5xPC$GHCUI9q
zMD82(9HsUPh*aqR)#oLV)WKuIxx>gZ-I<297Ou#utNPLTbxu_On?{U-n*H_ANwh$e
zn&(}pdgD=r&HcFfFXdJPf;q!sOsB32TeXTApWlS<v$e@>2^OIcq?ZQD?+&Z{O;wUZ
zmGX)c=A1XI{aTHWhZWfN1)d&Vy=|O*!EVxGEmR_%&$@nW9Uo7Qt>SHL^rWaKM%<GA
zF;HX_JB7EDZ*}qk=}A$T@9%k}Y{F)#RwbhCIice<d`(}oqa?1%HNfIp>$Ar6P7ZFg
zcnfi=me^O0t>zLJ?BD5wJ1G#-WfKRBOpKc4`(V>QCxcmx_q=3HS&y6Hj)u{@!U@p|
z1##Tfdhs%fEy^`1aU?>OB5}!79)2B;fV2Mo)qnsn9Z1YN@+c4=6#+i@bn)RahkgRT
s<Y$zW27rOg&YWf1ca#s}mT8}e=%9{^4gs`RlmeT&v|l!E{3~Mq28Y)DXaE2J

literal 1327
zcmezO_TO6u1_mY|W&~rl<ebdZyb>V$@BAs&e}Pha44RmB81S)iX|pl1FlsRgGBUC<
zurx6(>Gsk;Sbn%ibz|G+b3czQnUma9n4fTi{d$GGnOoAbfE=z(YEH|V-QBqQb@r>N
zPcUo#X=u1lvGqW4=XH~nN=|XYIvpZ6%3d6ey5-+zwEe^nrxj6iuJAFY?RwbZZ`*k6
zqWOiyw{It$$#I=>)}X`3P0gnB+3CQy-)B9wn<J@z<mR*^=O68?=3TU;KPC0{L7ffx
z2Nv@?#>8Luv2$2(Vd^Toh1ZvOoPL{S9Vb!sR(;-_hMoFlbGdJ=W8P@u-NZR@<uln%
z&YDRco%$cQulQ!xlCb%!?`(U)SCY1i4>;V6wawl4@wFJA(Yexdr!3z_1^LQ4y2vOB
z@^7E4le*z<WV=?9k$~=9E#ut3vp)ack<_BQG)HOH(G3#U<aC3J-fjGqW8TB*_uJ{(
z1Cu}8Mfcx!J~}^F*=mk%<jmVQpWa$BYl`*n<o6ek-RsqxZ+4zrLFePlWgDaJyB>_c
zYQ1Bfo_<7-t6$fr=W(*XAFNn5{pU;ZyH;$f_CGr6roC6G-+s<$gT`j|^zQX}i+?tS
zuHpQco6Zq;`Oe{Z`M;B&dmenXWVNxNwnp}wD<WlU_e?Z6TJ!c*Qt4ZM+5hTB<v(gB
zaJ`Spu6${GWWvH77Z#ZNNnLz)TP(AwCFNY1%brL4PrH7Zah82FZ~7he+%+^t`o^V$
zmUe{;IQJJg{oNzloA4v^%ifb0f@kboVYpA_?7fM?-i2*)FSHAe_Bkwc>baeBf33X{
z^L?}UpAJiyB8|$qzNFdtZ+#OvdB579^E<b()XGhp^+G~Q&sRTom1)I)X6a=b_7Vx}
zE340aoaLbWK>OGu4n1FiI^{}xovLqo>PP#k&lT}a>a8jJn7Ko8X4(VSYm7JEJaJw(
zO=z*n`&6TKi#JbqZ8CdVH0$~6yIUqc7M-kJ)R5h}V$GqzybFQG2~prQ%^IO+YG4UW
z$~wTLtYOf^IFX6P;ce+f170>xtu~Lg@4SqREUXL$(T3axoNUaYENsF|Zb62820S1R
zhcK&WacWVjp`Zajh|ey};a-%Qm!FiAYRF^21rp*CW)3dRGvqbk2JyIsS-gybU15^U
z!pvU25e9PNyapx)<^~pqW=3YF=27Cj#+C+V#s*L>Z7pw{kL*`q{$+0LWiV*$WNK_=
z__FfU6roS@d?wSXCUu|u5~!fcQ?<KH@kzeW1oag$73EEBCTdpfjUNBxXZ#U+>FBa>
z)7%gK%SsPOr`BBg#3#;QePM@Jkb;Trl(lcH3|`cUzgSqnsk&#vXREg2lczuQT&%xQ
z6Cri5wQy;p@vkh!FOMT{rsTio`1<CqiG}T7&k6gPm>C%uk(~#O3TB|Y`fks?q-kzy
z!Fc?*!u*M@ZFR<%?=9TkIoH?Is>i)p(s<RowC1<Af6Zs@+^=6`{oRh4bN|r;3Ts5f
zU&-4jD9vXI<y={CJ|}-_bn+?Qj)O8zb6+YbU;jJVZLVI+`<9M8_f$@2GZD$J2M(wu
v<#$f$wQQ?#eqFfkdL?sh#mWOw?slmqU2KP}(^NNqu5c^<F0%OEbk;opG14Es

diff --git a/test/jdk/javax/management/security/truststoreAgent b/test/jdk/javax/management/security/truststoreAgent
index 5b5f698cb9788adac8266eadd48316742ddbd2f2..2382154441dee509bcad652d7dc2bb22a633d1ea 100644
GIT binary patch
literal 2710
zcma);XEYlO7sn+MBck@I?GzO&v7;KRN>QuBp2brmW>LFB%?gU-(F$6E+9hhWs(7rT
zX0=w3+EP?$#d`Xl_dR{i`{{i@+;h+U{qO&N{GSWQKpq1D^l%JBi-8%IXq5Pa6~G86
z!a(Ff7>LX-ED6VetNu#@6F?Yn-Y=Z{tFjna{^No|0Kg&)Smzhif_wgUfLY<TaE*UP
zC|nlA-7`p;P|0m$noqd0A2ZhJMNYG81OlbmfdDZ$l!58r7lF)RI=C<cvrD28z=IwH
zfPvUq?^QXJs|ZB|@eC`ug`~KFFrX3Tz2$kdRQJc%kA{)YLrW%hI0;N!Z}P}WK7K3o
z(m7E|fWU3_K8sSYp<MeZ`O-T)v$<Ny#?IcCdxrHLAfYpQbo!L1aZ5b%d<3KWMZ++t
z7L*v`+Sw;hia8@!_VL43Gj*EQkLAnLe-@&GgScC6;K%Kxn!FEOIvV^}%Vf;1g+!+b
z3?|u&P<Dc`9q=$N=+`%v4aku0yT#OZ^tZDsBn$mk7mHQe<wDd2Poly<*cD*6Lpu9V
zqVFHir8&RC>G<vq6O;7#iJaPsgX-<a$oRrfk9;gIi>9_aA)MZ7gf;saw=5V-@Sb`)
zj+EBr?LIur=djfrJUgXj4xx3i5{>!k;%Obgw6T4|WKE-z(n@bY!Jxkb-<tQ(k|6uN
zJi{g1?0uK*G+$~ob9btlpTh^);;d-nQJ%;<OQo4yy4j`^mbN(0T4Z(m?B%_~U?(%z
zNta}WwY#Ll**Vzt&psF-u`|^&EnZZUa((Y5U#C*TMYWNH1qFbs!9H|m0+_35Xx49=
z{rG?<A{HCWz35TM&e3FDqL4n9siI$rP0C3S<w$wYPSZ`#dGaEJTt{Si#}b3Ey4o4P
z)tuY6n@GtK*<Q<;FrV99TkGu;R9m_bn!+Ev*-Y5HJidntiu?@Kjb(H2JHw%tFU_#z
zJ-e=#)IWEExy5d_rDw{*+#fmktp!WZpO_tpKMyCBt>whAm~gSaHNPZ#>?@sHB6Y0+
zCoQh%oxUsw(4HJo>8j4e#pZX?$K8JsV0^gPBWr$^?dEg$)v@Sc%Cv3g_WliY&-p(n
zFV&*VELN(k#VV$5Dn}$47Dy|pwdN`~Kl!+}c-zKhbRPovsd%2%>O!eW68)SORx=V8
zi_2p+Mw^b1Q7nHEhWJK?*pi>M+&l5-W}QVOX+Ers!>(kg{$Pyt{8(Q$Fg#C+xHY67
zE-{&PuD|au8KnjB&-vu%YGmaBP5E3S*OZ<zi&IYX)YcQx7cm=|uF!|DfYt)hbJNs2
zMyw|<c!J7U54+x921qP4y{cmZiGe|7nhLhr1IObvNac*^qwp_-OCx!Y&9=gclM+mE
zTeaL&5ZyO{;3D1kSK-~4jRgk{-D)k0I--Rt`GLa+?`Y9BrUq*nR$&~3k?}aS_yMoU
zPrW*aZW=2yEA5R8#aj)%LwAf!xyBu_xPjMdBNsDzrJv%sY0&i`{<rsO#5RfoB=y@}
zz-qc2_IqAr(N~cTM@qloY`NVd8%Q1WXT&G5loAQ+m^k}-%P<P=VbIbOn{&RIRZ3Yb
zGL2oeQISoJ)a7%ZDvi-Sn%`1fvHCgQfv}zP!DXU?9!1qK@8$zfa18}<PIl^icO#<#
zca19-`>iW(XJ(g9Uj&9)P?W0iHsTef?(ow|!Q8_Sevsw|bPRXMD*e3fRm&$rOXgXN
z1JC>$GP55<iZ58bQMPv#8FnVSrxvh|RqT|xYiXZ_i5y0tdQV@MZ*w_~;J24jEsmg9
zb=~jv>1fRmR?nX9nozBh<!81KY|jg*36Y;jg}?w(B*)Of@v)!C!K(qBZO!?-1ZvDy
z6R&DweBEKum7`U6gOoXcuXnA@8K%W-`3G?$Sl8ySJ~K|`EJoSKF@01r0ZHvnm}czR
z)8w&=KQKU`-~zwnl9?L;6@k#9>B8xJ=sf7c;o|>DJP2+O=S?rPhZsU#Rb5pDiA1O?
zBUIoRP~h(+Mus8`$n6($0s`oMHS2#A!2b&AmX@}KuZJ+(q&<^U3X0$><T)z!|Acf;
zD|Ub=K2(g1ST}vOHskgHL%(47p~7wAl!a<rU5o?ofb+U7k+`hy1B%-+NGI^y?MMV3
z82WJ$GJ3+AVa6uKNB;Kb8QPYJjuqRb#W>D#9Q`zYb_X@|;G#tZoi-O&I={3uquZ%Z
z;+Oep*Tp(mk6_t?@PbOaFwhy&*m6;M;&G?>iLOVTfP~$q<ka_Ut1MdwJhp9AYAQ3`
zIJ~uQA#mYOdJeH^PWN~w$&UpR6x#D;_A19}cv<0-BO?SUrL6n~AMcUI%}*Y(E)p4@
zH?(a<*&>s)o(6=xs@5M_YQO$n+fO)6iOL-q9TSGsFkJPtaJVU~E-hHVVs&g(=RtBa
z(b6idjTN7_yJa85wZw4MyG_D<*Z(zyXc|p`pZ#d7CqMaabXU8(`zLwtNcqa0LZ(_5
z*YvSj)YL8k?Z1a4Egk4P&-*xXK3GJg3X(dI(yt)p?CuV`qgKk+halp?+dp``WcJ!?
z-L4pnt@QU1XrT1{$2;iZ<M262)qG$0$5q;VFE@=>StX#jU&;Q??k!H7SLn=W_Rz&l
zrplF6MxNlvv@XA=1m_06BOFLl7vj9_E6{#1U|-3qT}qO;ui|H3z|#eMAzMGYFsOjX
zqgx#(lA%S<ppPPYd{!qGG;+d%)?wD$4+<2|B8I+b3Xd!<pYh`96>s-W*Cme>!wRr^
zqS04gDuxl-YsM!}4Gw<#VT{-3X?O?OOYuyeEFU<8ZruDCazjQhqg2L3+y}{*70wB9
z<_tC1s&tNTVWQ2SaCU30Z=&)C9$xsqk{fd=RMHMWr1@I*dh@r{!xm$!v#;GA<`AE-
zbI}P9tnXG|4Rw>=#>?yM>J_OsqBbKlrCM`LXx9ql2sYYX`_nC_Q6YD8^6OV3@?uM2
zXeO%*idIp`Mw?s@Q8aFKb3-M0e~5ZR``O0*UHLAhw9InYHq9ijGja5xPC$GHCUI9q
zMD82(9HsUPh*aqR)#oLV)WKuIxx>gZ-I<297Ou#utNPLTbxu_On?{U-n*H_ANwh$e
zn&(}pdgD=r&HcFfFXdJPf;q!sOsB32TeXTApWlS<v$e@>2^OIcq?ZQD?+&Z{O;wUZ
zmGX)c=A1XI{aTHWhZWfN1)d&Vy=|O*!EVxGEmR_%&$@nW9Uo7Qt>SHL^rWaKM%<GA
zF;HX_JB7EDZ*}qk=}A$T@9%k}Y{F)#RwbhCIice<d`(}oqa?1%HNfIp>$Ar6P7ZFg
zcnfi=me^O0t>zLJ?BD5wJ1G#-WfKRBOpKc4`(V>QCxcmx_q=3HS&y6Hj)u{@!U@p|
z1##Tfdhs%fEy^`1aU?>OB5}!79)2B;fV2Mo)qnsn9Z1YN@+c4=6#+i@bn)RahkgRT
s<Y$zW27rOg&YWf1ca#s}mT8}e=%9{^4gs`RlmeT&v|l!E{3~Mq28Y)DXaE2J

literal 619
zcmezO_TO6u1_mY|W(3o0$vK&+c_l#h-}zI*tQc4$^h^ybfhu$inwT^UniwZCu{gXf
zy=cJ8#;Mij(e|B}k&%U!!64d@+klgeIh2J>n8_{3kk5bz#NiNT^(;;;N;MQT;0N*9
zg*n`dQuFeYa#9U>47fl-T*A!3rFn+D2HYSXw=j#BQLrmal3AG9%QwP6PMp`k#K7FZ
z!qCjf%+x$eoY&aWz|7bH%B8L4jq{QH%E-#V+}O)t(Ade;*vRl@<*6w`pXB*Wrd3Vq
zKKUh3L6xU!cbVdoe4z>ID`G0jo7zm&tk@ep{>jhyBlgnKW#Oi|AN-e<9*|D0x$=om
zoWJ_Q4zC~u6Wb|k-&h&Es1tv&uz*u_&xFrbZN(=~f9Sbbf1@Ts>R@Z((njN7S&CmC
zN8U`yf6ejr&0P}<+rOR@_A@avGB6@L4;U59KzH@so_k5t+|+{c_;H2#6J6Wtj4$6?
zxV>|(ucuXyd$FYPs&{G4Z*BjY&)T_PzsUN#9W&?tqX!h$h={+Ew^2}<&lJkJvfzA9
z{?zE?Q@kAqWt`@|R8YSDce2}Dy_WYa9eM7loX%z<l3x!TP)o}1oYHIAR^$A-aNYGv
i=Guyt2cq2V`esc3npzgTuGK>5-lbNr`wu<x{{aBs-^cF&

diff --git a/test/jdk/javax/management/security/truststoreClient b/test/jdk/javax/management/security/truststoreClient
index f6a6a0098aaabfaf4fd8ac5b6509b7235eb60a2b..ebb95dd0dfa3b6852c2aea03ada04f74d918722c 100644
GIT binary patch
literal 2710
zcma);c{CJ`7RP6^4WhwVLYC})jCGiw>?BNNmt`7^q>+8!$B?pR&0Zo)Nj#=x$uOjl
zHEWhEl?<}RAf9*LJ9XY)@11+@x#xbq_ufCh=OPHu3=j~EAV4+fnWPhp682bu48TVO
z=wA>5RO%FqAqaHU|0U5CK?rntr#SmG)9IQ2v&8}hf*uj*v`?W1!u|IK9V@~fq4uX`
zLC8Qj(aT5+ifm=>QB|4V$DGWb5F;re5J-X@1QbHB&@=w~B8Z6&fDoW(x}IPJ#DO6|
zX$ZUdbH*{1#n#t!LGgx6p=B@#0W$c+7^HQ8F11`Jv0Na;W+AVM^;zFwP@)}<yoqJE
z)Q8A=5lf{wYuRpa%n`<L&oXil)Q-<sPq)8WdiGRJqZL&HSgu&b*)Z!5kG=xAE!kZ^
z{5Be(Q^T%UI88IxJl-EkrQO~N^4;{E^@=kc<vDj|C<-lWXMz?^VRr^n?L<=HuHy|?
z4V7aXk+Qh9*NFng_AAUR-thvh4$16N@Ie=T`+(;CVRkpLW<&Q3HECNie?B~_D1i2;
zIbx6P3{dOHL-%J_nYpP?lqq!~F6?%sT$wzFw~R>T>;`>iosjl1q~HQ_*FH7jwcEMi
z!RXq8q``c*TRd<~SK$$E%Sd8A*N$-;I_)HxGZU6qWLOX@`(0PmYYHDZ`~*&#F>y;1
z8M)<Ww47C;yl0qeoN|a`4}YqG?2NZbwY)6-OiqPMeNN*A`&vZV%HS&H4(aabYF_MR
zJjb_AtqqAe=rR{!f~4k?(c?d#(p<F>w37RT<kb9J-6GYScK+*m=lBEv^(Z&uwZ!ys
zxm#1+#GBeH!l-}zNVj+Hz_tf8JmXP{L&-FgVyZ|hLpC!BM|k3p;Y6A6y^P+$HJV4C
zWxMH{{d38QmTXqTW0LLs4s)t_U8axIy0ppiqk+=dC7a5ypN)RpZ5!>=<w<(x)`7tD
zJP-W_k?Ky?yXI;n0TDAfu!DdoDvLjZnUzEQ)1f>&p+i9{ZjE17`V*tPa-4-CswN39
z`uHUz<)UEb*?o!D1#!B!{Din4En>L4HG*m#k;hY)WYc?lZ%`Oe{n`(<D$;gP<Gxm7
z(^!|;Mh$ukWLV>S+vgf!s8Fc%yNTNy?y%@5#wyx*vlfWp?^1n*$<DgTt_ooui`1tf
z{bphVDT8|W!Up+0(PWXr0u}O3-UT%W+0td7uQz#V!<;be@_xT+$KLvEc47>p1#UN#
zs~%$xPVJhynWI0n%$FYBDGqf|f}K3(enqJ><LkqRQIn#?cq>-F>DHnT>%)ajMHiHn
zMYh_W6{~j*-xqX}0oo;9#5I$@M)b=fYhE6|0yo87on9v^_<BNlwr5^?p*wm}#0hJz
zjW+(J{CWddKJs4P2G%&dk~>lQEQjY$8t0_89|yYd(N^|}S%Cm3(q#(H;L*heg?Ziw
z*54sZQy;w;?>68K=e`;Q$kzXiRPu%rJ1(&zNylpy?mGlo6CJK;v^^zuCa@(1pD4j$
zT{)U|Cl+Oviz!p?b5!;kgTAOxy&WXxv~N_7>@4sR7em5WC^bzszFiMDCr9q>6%5oL
zd_6AOrIisHF~$`8LN(%9oeWQ4uGc=^*=cE}xTWOBvHah5jEaxz)|3$PYe%=nE6cw1
zScRr$ehA)}vgI*BCWoMcR&1otjfd>SbU(GLG<3_?nr7<9zOxpaX{3}FtXW#Vy_~=m
z`K1lAp_1KR<RK5b!nf%{DHxq?gQIK^LUw>lBKNweu&ji|%mxm*DUqsbiE?`y)l2ww
zqqu`P>gT|s+{U1*VsT_yy{rEIlSp~v((97VRah70wa}l7k;5OdPXZXSq=R89KeZJ4
zu(O8gAwyJ!4B9cwPMGP_HIl9w{(!snVY8O>s3&>f!M1oYwifeU$+#XWsX$;GV-AyP
z*Rxg7MDYH$OD0YQ7C|V$3lIvp1;7D95yF2YE(J~q%<85WPDlZ%f>cpfS5rbLo(2Kp
z`+JCi{t*G<a*CWmK)`9S{i6W?mr46Ozblnn?KkC-c!1HA)!|>7K=k}SCcUw01;dbU
z_yp03cgNT0yT%Z}pU>wJiNUTi1J<hXW7P6;2Pg#74M-SjTAujq%qEy^XyH7$P$I?r
z1^vNbSd6)O;mz{d7qD1IHhY7HB{b8zpk<8SYTvc|cIW&dE>7Vh2Ss~5T@#a#34zX5
z$8XB(jgyPuau-MzgS%rl9H^L4Gh#kTs(rvjz4P#`$bdJ0c@O$(V$dL*s-mwx5^Ij>
zZ8?Z*`V{gSW0-@bBZtxj*R<!$q(#vOZp>#reeQnu1qai6oqP8E-8)WM))K}=UtXlz
zrQ*s&!c2+2(!pv*e|1*#9LmdcKGX<1%CW#!&A?P`P&&odkP0LE-g>X^DSX-#Y>uK?
zxPxQsK%n71>}vYR1J24zQGr!i!m^IH@s_+}Pw+`bR?AL2j5)(II0n<><{uYheOua7
z0;h-JpC+QM`bv)i?t5O;ZZABu9_@1Andf|G!#`tP$eU<8>OP5-pulP7on+6+le)T?
z@<4B2pz8I7rXJD<cnO&aS)O=3T9Y;AosX&Wnn_?AooUz*U(I)gv03|CQN0#T4;Qx`
zk+iX$2pn#8?a+kby(to9_j2mkQF%sk7s764?Hwn4Q2Yxs!6?GQzrr~O%H=xAYvPOQ
z7_D``sj&F9iyg4gs_7THFl-~UU^eL`U@wYaBJ)pQdp<?_qPj{9$bUNHH}LCC_#9zg
z+S8FA?bBPMOMN+IlaIKfOveH$DB@U{vEWv9!p2XFG75G_`Z;a)ZgxqE(9(P$O)Wwy
zj3oxdhAZIOfLH$G64z@#UUD148S%y2mitL#9<id0eBV^?I**E*<hiX6fD@`UN#&7S
ztY}&|1?4{2VZqEBF^ub!HMgQ2d)!WIeO5<ybXi)}jQz;gU9hQ7vIUwore^|L9p<*@
z<@CBr4mr6{Bl0^AWQ$~$dA+kiLD`3Qxh?5AeXz*pfH%1y$MlMDmphvQmUWVUTj};w
z)z7az4o|<Elckj`bV1`fMVOVwU_ri{zhC4%MGx;ChL@@cb(}fev=uzl++xsbCN<F}
ze|CJAA^56O<MRxA_(BT<eG#zoJw6?&_st`?kvH%?$L?&y{>Lc-#Wuo7GlIwTq_edO
zaFHebso&#}rm)2|4E?LNdp_4FO@$(N{wh`L*^Fent3&d4TN5H0<>A({o1%{el`&Tm
zpv1VhnKmy!I;>N5y<vfv3%b-V#|r*Ak6*`F@mL4EFID{ocD#`X7oMof4E%|l$BJT>
z8z2UtdsQ06D!B)wl89|x^QmWggP%-tygmGKrE)I%zr|jD>ym8-ra#(R?U*Y#xmvw4
zOy0~!8$A82`Pn@IV2qmmg+L<|5Ujs{H4u;v01-O3k^jn9o*hH3scy;C(AjqKnPS<s
ok`x5rpUo8Ws(uIIWZ~jES0eahaf#vOGjKAVnbt9#{V$98ClS)wkN^Mx

literal 618
zcmezO_TO6u1_mY|W(3o$iRr0%B|zri`BQw?Gq6VJnHpFE73df=F=-eyF-~M+ad=yL
z#(<ZNQ>)FR?K>|cBMU2oL9`*a0Vf-CC<~h~lUtA>p8*eu!y(M-S)5vwYA9&H58|^6
zbGR3!=H(~lq#E)VaDjxlgqed&^9*?nxIsK_VHPi=U{{zVvoN!lZ-jxIIIn?;fw_T&
zp_!4HsZo?Tud$_pnXv(sOIynu=Og=-k(GhDv6sQ1v6HE>kzwwxiSqj=aZNsO+t!Ll
zhxuSw=PY;2S-k1-5r3vWJ2J=2#A=Ufio}wx-Q}~ta|D%y>Av!4T*X?x@IFIZzrNgo
z6ImOC{&KIVxV-pBLY3sAUrl=#%;w3kYAR{5)7@9D*YCnnaNPc!!UPR9r!~8TK25y7
zMoGDE?iYJT-gggoG(`nuGBGnUFd{n-7!}MwcL^?@nEfcw@63h|LG`Kff3H=)GvM4+
zyr<AFMQBR5^}n^2mJ6S`JD%Tivhb$So6CVM3#VG2+Sqhm(y^9xh0o2#e7$)l(~9H;
zo1dD^j#f>VGoQ3AyVv2uEW=r^gl^u5Yc{i5-pDL8i{+%UK&tM|=mZ^0ZjCdkTW<Is
h%a~B@(_h{c@$4AGneF=-_dWdT+&I6*+D~K-Cjf`W!}9<D

diff --git a/test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java b/test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java
index cb11b17ebb5..464bb00fe82 100644
--- a/test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java
+++ b/test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java
@@ -27,31 +27,60 @@
 //
 
 /*
- * @test
+ * @test id=tls12
  * @bug 6668231
  * @summary Presence of a critical subjectAltName causes JSSE's SunX509 to
  *          fail trusted checks
- * @run main/othervm CriticalSubjectAltName
+ * @library /test/lib
+ * @modules java.base/sun.security.x509 java.base/sun.security.util
+ * @run main/othervm CriticalSubjectAltName TLSv1.2 MD5withRSA
  * @author Xuelei Fan
  */
 
+
 /*
- * This test depends on binary keystore, crisubn.jks and trusted.jks. Because
- * JAVA keytool cannot generate X509 certificate with SubjectAltName extension,
- * the certificates are generated with openssl toolkits and then imported into
- * JAVA keystore.
- *
- * The crisubn.jks holds a private key entry and the corresponding X509
- * certificate issued with an empty Subject field, and a critical
- * SubjectAltName extension.
- *
- * The trusted.jks holds the trusted certificate.
+ * @test id=tls13
+ * @bug 6668231
+ * @summary Presence of a critical subjectAltName causes JSSE's SunX509 to
+ *          fail trusted checks
+ * @library /test/lib
+ * @modules java.base/sun.security.x509 java.base/sun.security.util
+ * @run main/othervm CriticalSubjectAltName TLSv1.3 SHA256withRSA
+ * @author Xuelei Fan
  */
-import java.io.*;
-import java.net.*;
-import javax.net.ssl.*;
-import java.security.Security;
+
+
+import jdk.test.lib.security.CertificateBuilder;
+import sun.security.x509.GeneralName;
+import sun.security.x509.GeneralNames;
+import sun.security.x509.OIDName;
+import sun.security.x509.RFC822Name;
+import sun.security.x509.SubjectAlternativeNameExtension;
+
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.BufferedWriter;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
 import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.List;
+
+import jdk.test.lib.security.SecurityUtils;
 
 public class CriticalSubjectAltName implements HostnameVerifier {
     /*
@@ -70,20 +99,18 @@ public class CriticalSubjectAltName implements HostnameVerifier {
     /*
      * Where do we find the keystores?
      */
-    static String pathToStores = "./";
-    static String keyStoreFile = "crisubn.jks";
-    static String trustStoreFile = "trusted.jks";
-    static String passwd = "passphrase";
+    public static final char[] PASSPHRASE = "passphrase".toCharArray();
 
     /*
      * Is the server ready to serve?
      */
-    volatile static boolean serverReady = false;
+    private final CountDownLatch serverReady = new CountDownLatch(1);
+    private final int SERVER_WAIT_SECS = 10;
 
     /*
      * Turn on SSL debugging?
      */
-    static boolean debug = false;
+    static boolean debug = Boolean.getBoolean("test.debug");
 
     /*
      * If the client or server is doing some kind of object creation
@@ -101,17 +128,17 @@ public class CriticalSubjectAltName implements HostnameVerifier {
      * to avoid infinite hangs.
      */
     void doServerSide() throws Exception {
-        SSLServerSocketFactory sslssf =
-            (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
+        SSLContext ctx = createServerContext();
+        SSLServerSocketFactory sslssf = ctx.getServerSocketFactory();
         SSLServerSocket sslServerSocket =
             (SSLServerSocket) sslssf.createServerSocket(serverPort);
-        sslServerSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
+        sslServerSocket.setEnabledProtocols(new String[]{protocol});
         serverPort = sslServerSocket.getLocalPort();
 
         /*
          * Signal Client, we're ready for his connect.
          */
-        serverReady = true;
+        serverReady.countDown();
 
         SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
         OutputStream sslOS = sslSocket.getOutputStream();
@@ -122,6 +149,36 @@ public class CriticalSubjectAltName implements HostnameVerifier {
         sslSocket.close();
     }
 
+    private SSLContext createServerContext() throws Exception {
+        KeyStore ks = KeyStore.getInstance("PKCS12");
+        ks.load(null, null);
+        ks.setCertificateEntry("Trusted Cert", trustedCert);
+
+        Certificate[] chain = new Certificate[] {serverCert};
+        ks.setKeyEntry("Server key", serverKeys.getPrivate(),
+                PASSPHRASE, chain);
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        tmf.init(ks);
+
+        SSLContext ctx = SSLContext.getInstance(protocol);
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        kmf.init(ks, PASSPHRASE);
+        ctx.init(kmf.getKeyManagers(), null, null);
+        return ctx;
+    }
+
+    private SSLContext createClientContext() throws Exception {
+        KeyStore ks = KeyStore.getInstance("PKCS12");
+        ks.load(null, null);
+        ks.setCertificateEntry("Trusted Cert", trustedCert);
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        tmf.init(ks);
+        SSLContext ctx = SSLContext.getInstance(protocol);
+        ctx.init(null, tmf.getTrustManagers(), null);
+        return ctx;
+    }
+
     /*
      * Define the client side of the test.
      *
@@ -130,15 +187,12 @@ public class CriticalSubjectAltName implements HostnameVerifier {
      */
     void doClientSide() throws Exception {
 
-        /*
-         * Wait for server to get started.
-         */
-        while (!serverReady) {
-            Thread.sleep(50);
-        }
+        serverReady.await();
 
+        SSLContext ctx = createClientContext();
         URL url = new URL("https://localhost:"+serverPort+"/index.html");
         HttpsURLConnection urlc = (HttpsURLConnection)url.openConnection();
+        urlc.setSSLSocketFactory(ctx.getSocketFactory());
         urlc.setHostnameVerifier(this);
         urlc.getInputStream();
 
@@ -159,42 +213,73 @@ public class CriticalSubjectAltName implements HostnameVerifier {
     volatile Exception clientException = null;
 
     public static void main(String[] args) throws Exception {
-        // MD5 is used in this test case, don't disable MD5 algorithm.
-        Security.setProperty("jdk.certpath.disabledAlgorithms",
-                "MD2, RSA keySize < 1024");
-        Security.setProperty("jdk.tls.disabledAlgorithms",
-                "SSLv3, RC4, DH keySize < 768");
+        if (args[1].contains("MD5")) {
+            SecurityUtils.removeFromDisabledAlgs(
+                    "jdk.certpath.disabledAlgorithms", List.of("MD5"));
+            SecurityUtils.removeFromDisabledTlsAlgs("MD5");
+        }
 
-        String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-        String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-        System.setProperty("javax.net.ssl.keyStore", keyFilename);
-        System.setProperty("javax.net.ssl.keyStorePassword", passwd);
-        System.setProperty("javax.net.ssl.trustStore", trustFilename);
-        System.setProperty("javax.net.ssl.trustStorePassword", passwd);
-
-        if (debug)
+        if (debug) {
             System.setProperty("javax.net.debug", "all");
+        }
 
         /*
          * Start the tests.
          */
-        new CriticalSubjectAltName();
+        new CriticalSubjectAltName(args[0], args[1]);
     }
 
     Thread clientThread = null;
     Thread serverThread = null;
+    private final String protocol;
+    private KeyPair serverKeys;
+    private X509Certificate trustedCert;
+    private X509Certificate serverCert;
+
+    private void setupCertificates(String signatureAlg) throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        KeyPair caKeys = kpg.generateKeyPair();
+        serverKeys = kpg.generateKeyPair();
+
+        trustedCert = CertificateBuilder.newCertificateBuilder(
+            "CN=Someone, O=Some Org, ST=Some-State, C=US",
+                caKeys.getPublic(), caKeys.getPublic())
+                .addBasicConstraintsExt(true, true, -1)
+                .setOneHourValidity()
+                .build(null, caKeys.getPrivate(), signatureAlg);
+        if (debug) {
+            System.out.println("Trusted Certificate");
+            CertificateBuilder.printCertificate(trustedCert, System.out);
+        }
+
+        GeneralNames gns = new GeneralNames();
+        gns.add(new GeneralName(new RFC822Name("example@openjdk.net")));
+        gns.add(new GeneralName(new OIDName("1.2.3.4")));
+
+        serverCert = CertificateBuilder.newCertificateBuilder("",
+                serverKeys.getPublic(), caKeys.getPublic())
+                .setOneHourValidity()
+                .addBasicConstraintsExt(false, false, -1)
+                .addExtension(new SubjectAlternativeNameExtension(true, gns))
+                .setOneHourValidity()
+                .build(trustedCert, caKeys.getPrivate(), signatureAlg);
+        if (debug) {
+            System.out.println("Server Certificate");
+            CertificateBuilder.printCertificate(serverCert, System.out);
+        }
+    }
+
 
     /*
      * Primary constructor, used to drive remainder of the test.
      *
      * Fork off the other side, then do your work.
      */
-    CriticalSubjectAltName() throws Exception {
+    CriticalSubjectAltName(String protocol, String signatureAlg) throws Exception {
+        this.protocol = protocol;
+
+        setupCertificates(signatureAlg);
+
         if (separateServerThread) {
             startServer(true);
             startClient(false);
@@ -238,7 +323,7 @@ public class CriticalSubjectAltName implements HostnameVerifier {
                          * Release the client, if not active already...
                          */
                         System.err.println("Server died...");
-                        serverReady = true;
+                        serverReady.countDown();
                         serverException = e;
                     }
                 }
diff --git a/test/jdk/javax/net/ssl/HttpsURLConnection/crisubn.jks b/test/jdk/javax/net/ssl/HttpsURLConnection/crisubn.jks
deleted file mode 100644
index aee7d9f33792257b9c20599e198cb52e84e44303..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2794
zcmeH}SyYqP7RSFY6DE)XhOvxA<RS|93j|0ADuQJY1O$RqK%fxjF@(7-CYSj_K{QB<
zMH%8U;H`v7K_NiJTZ@8BLM3RCp)w;75vbvQX<1#~uCDv!%U!Dv=V9-C*4pRn{Xf66
z#f#!a000obFI0eEU;qGss#0$^vjMc1ktsxh<24W)aSdLwSCI%1fdByrkHH#b*=KFw
zK@f!oAUmQogvB6fC=3BXb0-oYd5N)yfOC(Dq8qw11DJH8JR~b|;s|>rPHh)P2vH9D
zK;l9Yq$IAGXgZ{+jE9Jji3vm`l1L=;Gs<{lGDI>q-!<P~BG#36?*O6!B&z^`Sh)xm
z3+ODJO3ikcy_hY0y7md>h#BW)lGl!H9!u?Px6@Yhc~z+0d)cWb1FHUdDD>v?R^y?>
ze;zQg?ISZkOBt5BW<$wvqqyX$uf?nGwdz}{NU{MD?FGj2`myVMwKfS;+ss$_MmD;w
znMZ>y&~qET-j`mGs#dbs-}Ha7_e|)m<RBgb2?Aghs{&$`LmF^_G(JEnp%j{oZAJjy
z;?`Nt^k!91WX6(-ks=f$3GYLNLc!<$bVG$>wZnTW8XIoBj3gleg@%wIxbtoaVHqId
z+6AP?j|?jEo48OgjZNiWISS;RQ>?|Na%-rb>IXjx<5D{vkyM$F@sYUvGY?Z6rR(mn
zN|aB_H~87VS!JloHElFlCGD-XGOQKk(GHxCw6wU&J=IVqLaF!Q<``QAsh<fq#Oeo=
z(RJ3${Kh@$mEXB-;JuGcd%C}%P4dO<u#`an9}R2CFFxVZaKD6j#;<x7t7Bmyx56TB
zhDC=vhyhWc0YV;xJC9-`D(^=+R>TBX_(<hGM$Uh|@Ogm6?G~lea;54yTI=m!9Um8U
z8nm%2MqG}h>7-Lwc^apJww79s*vsUTR{W<Z!_AM#<qP~ybgoIlV&wSL^XVOa_>c2v
zs{~p+6u0+cj|ci#)v3gxZf8&d?1&%J&u;jpZPjqKOQ+sr)a}{NMHj|`oog@vuE%;L
zzfBd#&%<Bt_~>%e(%tZ&`T^q;UyAZ8e?emoB$ka3V}*sKIu{;ZQX}67x>9%gS2ICp
zH4R#hU<<n_b}lMOHCG_>coWLbNTG*;N`cF;Q1{pad6})&{!wmOG3)S`#{9htC(V|1
za@LE&yR|~!tXGpSk0h}|+8iRJi6fTnsW&ZB9=u+2Y@OIwl;x$r@V$uBS9DzCIC~z|
zA_fC5a7$Dc^MC1F&ahpXz{TC*d>pQ{R{1D`hu0nb)><)BVQAtGeUCPF+~<|k>MT*C
zJH_F(XBW>SQg`xiFSnPxXP<8(D-Ecm>xbeTB3{%b&iHmcwd`e$LW8=G<9=@1Dzixr
z<~~`Ty_~1@omDnZn5O@{`|yC(%#bI?&Y<zNlYO9Tv@B;+j`Njh;9g$wwkaR;G&baW
zwcL8XnIBN@&eL3tTvrj?Jj&dkbX$MA*zoh1LA{a?Gi=Svthvfdv|CvU&99u+?nOC4
z)RVGjg=WL+1@|jo6yX=I#~gP%ksR_!%18B~>+Iuap|^Ywi^glU{~foY{8RD@z;GK&
z+H77z_Loja>6F-y&16PB=8XY`3#z<g2eOV=VSj0w$vFbZlJU5<%2<#dxUt1iYawj_
z!`r<_Z+KFJE<o9~il?qmUfUGoEJH?J!@Ybn2Gbw<olx)MpV+6+)+OidC~aAnQgmY=
z@Q8{`S@|HXCSmpTeY1;m7Iwcf`gbA+!$STPVuL-qL`MDLDZaNize{8iOl2a8LWF)J
zGMQ+;YeFzI{|8DJq_1m#<2uh4+)JaZC<`7D{V`vpr27c!W_&$d|31>FJV))&BV!ms
zyXOY84a^7Kwi{GCr4OU5W%m0KVrRA|?MymFD;?wZsZNuHSM+R&x$<MComWvkSZPnN
z*?*W4L7d3Bg*GiW1)bBhPa_jF{V%!fcs0v7>?Arm{v&A@rPUBjQ^^MfqYD8a`49%{
zpJfkby|D)IC@m!omsonVyStON9X*=PfIq7sZ5uj+85SHC2pjJ(SfRt{{JhKdhPPb(
z;XbzT&<{^m1|hBA7_0&*{W*gnJ;??bH9IJE=tCBPo*WPr8%ei{fs=*@MHofXnK?)U
z<R4oop=o2BaHhwMKJ7CVq6vkSH@xzFB2ecdY1wpEZ&;;<p@>~3aEn!4n;G(ciyuP8
zsznt3Yrrlj+@A9!>zTzOU2`Ay>1Isn-M8#9$aki`XFzP+SZ}^DJgOMiLwn|ZS6^-!
zm=EZW)_Y6+R?Z~7y1XSz+>s&@j-Aw%zQY}b{u%-P8Ug-mK>L3f0WuHHo!wu+LAs>S
O7Sr#R-7eCxQu+@^S{GCR

diff --git a/test/jdk/javax/net/ssl/HttpsURLConnection/trusted.jks b/test/jdk/javax/net/ssl/HttpsURLConnection/trusted.jks
deleted file mode 100644
index 0202bec16205771e8143c9bb2ca5d13d015dc6bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmezO_TO6u1_mY|W(3nLiSfyaK#n8_!;~outPy&q29`kiRR&E=%Yc}F0W%XL6B8qY
z0WTY;R+~rLcV0$D7FGrWcSCLiPB!LH7B*p~&|pJh13?gnLzpW#KQ~o3xFoS8)lkrY
zA0)^n%mETq@GnX?6foce2{8+^gM{+)QVrz9c?}E=jExNp4NXi;%%jA4jVugIjLe~2
z>RHq{AK4F#tPISJy$lA8olK353<qaCscH}ApVEHk*5^n|JF}@T$|L@}bu~)I9rgLO
zZK9;XzUcQpt6B_}%({}X{{62lI%VCO#%|{=N@^;vvM+PCYzeaT?~?gkEGgu0{@ucI
zXGW%dy+(o>1z*mub}oJLyX0e!p0moXR{Jz7)>q%pMNfZZviL*$mme1+g`zUHSEQ_D
zVrFDuT-><OpmCmoEHHp%`B=nQM7A0^UuRI6wCm;6r#}~`<g~mq))O_z2T3clWEiA1
zU{$ctdx<C20<8%c@jM_4g;`h)m>C)WBL^Wc888FGF0sD&`eo6LTbCN7g*I7loNv$2
z)gZc>vuf!o>o6H@#muGF2fdlCd0csOxO$?_RBhqju)A@Zc(~x^c#j{SiX;WLe&6g+
zF0|S~clG|RP|b-sHdYIk25z4Hl||+>*Q=smy;U`LzW<Zau3+8ZRMNABqkhrhpzplV
kj!(maAB8^N_;26ihyJ41YeP&q{eEa#sI1Gr<&!D{0G#6QF8}}l

diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
index 4b2dece0c75..7204fac35d1 100644
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
@@ -26,392 +26,44 @@
 // system properties in samevm/agentvm mode.
 //
 
-/* @test
+/* @test id=tls12
  * @bug 6766775
  * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
- * @run main/othervm DNSIdentities
+ * @library /test/lib
+ * @run main/othervm DNSIdentities TLSv1.2 MD5withRSA
  * @author Xuelei Fan
  */
 
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import javax.net.ssl.*;
-import java.security.Security;
-import java.security.KeyStore;
-import java.security.KeyFactory;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.spec.*;
-import java.security.interfaces.*;
-import java.math.BigInteger;
-
-/*
- * Certificates and key used in the test.
- *
- * TLS server certificate:
- * server private key:
- * -----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,D9AE407F6D0E389A
- *
- * WPrA7TFol/cQCcp9oHnXWNpYlvRbbIcQj0m+RKT2Iuzfus+DHt3Zadf8nJpKfX2e
- * h2rnhlzCN9M7djRDooZKDOPCsdBn51Au7HlZF3S3Opgo7D8XFM1a8t1Je4ke14oI
- * nw6QKYsBblRziPnP2PZ0zvX24nOv7bbY8beynlJHGs00VWSFdoH2DS0aE1p6D+3n
- * ptJuJ75dVfZFK4X7162APlNXevX8D6PEQpSiRw1rjjGGcnvQ4HdWk3BxDVDcCNJb
- * Y1aGNRxsjTDvPi3R9Qx2M+W03QzEPx4SR3ZHVskeSJHaetM0TM/w/45Paq4GokXP
- * ZeTnbEx1xmjkA7h+t4doLL4watx5F6yLsJzu8xB3lt/1EtmkYtLz1t7X4BetPAXz
- * zS69X/VwhKfsOI3qXBWuL2oHPyhDmT1gcaUQwEPSV6ogHEEQEDXdiUS8heNK13KF
- * TCQYFkETvV2BLxUhV1hypPzRQ6tUpJiAbD5KmoK2lD9slshG2QtvKQq0/bgkDY5J
- * LhDHV2dtcZ3kDPkkZXpbcJQvoeH3d09C5sIsuTFo2zgNR6oETHUc5TzP6FY2YYRa
- * QcK5HcmtsRRiXFm01ac+aMejJUIujjFt84SiKWT/73vC8AmY4tYcJBLjCg4XIxSH
- * fdDFLL1YZENNO5ivlp8mdiHqcawx+36L7DrEZQ8RZt6cqST5t/+XTdM74s6k81GT
- * pNsa82P2K2zmIUZ/DL2mKjW1vfRByw1NQFEBkN3vdyZxYfM/JyUzX4hbjXBEkh9Q
- * QYrcwLKLjis2QzSvK04B3bvRzRb+4ocWiso8ZPAXAIxZFBWDpTMM2A==
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICXAIBAAKBgQClrFscN6LdmYktsnm4j9VIpecchBeNaZzGrG358h0fORna03Ie
- * buxEzHCk3LoAMPagTz1UemFqzFfQCn+VKBg/mtmU8hvIJIh+/p0PPftXUwizIDPU
- * PxdHFNHN6gjYDnVOr77M0uyvqXpJ38LZrLgkQJCmA1Yq0DAFQCxPq9l0iQIDAQAB
- * AoGAbqcbg1E1mkR99uOJoNeQYKFOJyGiiXTMnXV1TseC4+PDfQBU7Dax35GcesBi
- * CtapIpFKKS5D+ozY6b7ZT8ojxuQ/uHLPAvz0WDR3ds4iRF8tyu71Q1ZHcQsJa17y
- * yO7UbkSSKn/Mp9Rb+/dKqftUGNXVFLqgHBOzN2s3We3bbbECQQDYBPKOg3hkaGHo
- * OhpHKqtQ6EVkldihG/3i4WejRonelXN+HRh1KrB2HBx0M8D/qAzP1i3rNSlSHer4
- * 59YRTJnHAkEAxFX/sVYSn07BHv9Zhn6XXct/Cj43z/tKNbzlNbcxqQwQerw3IH51
- * 8UH2YOA+GD3lXbKp+MytoFLWv8zg4YT/LwJAfqan75Z1R6lLffRS49bIiq8jwE16
- * rTrUJ+kv8jKxMqc9B3vXkxpsS1M/+4E8bqgAmvpgAb8xcsvHsBd9ErdukQJBAKs2
- * j67W75BrPjBI34pQ1LEfp56IGWXOrq1kF8IbCjxv3+MYRT6Z6UJFkpRymNPNDjsC
- * dgUYgITiGJHUGXuw3lMCQHEHqo9ZtXz92yFT+VhsNc29B8m/sqUJdtCcMd/jGpAF
- * u6GHufjqIZBpQsk63wbwESAPZZ+kk1O1kS5GIRLX608=
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *     d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *     1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *     ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *     7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *     9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *     d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *     7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *     30:05:40:2c:4f:ab:d9:74:89
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     6e:a7:1b:83:51:35:9a:44:7d:f6:e3:89:a0:d7:90:
- *     60:a1:4e:27:21:a2:89:74:cc:9d:75:75:4e:c7:82:
- *     e3:e3:c3:7d:00:54:ec:36:b1:df:91:9c:7a:c0:62:
- *     0a:d6:a9:22:91:4a:29:2e:43:fa:8c:d8:e9:be:d9:
- *     4f:ca:23:c6:e4:3f:b8:72:cf:02:fc:f4:58:34:77:
- *     76:ce:22:44:5f:2d:ca:ee:f5:43:56:47:71:0b:09:
- *     6b:5e:f2:c8:ee:d4:6e:44:92:2a:7f:cc:a7:d4:5b:
- *     fb:f7:4a:a9:fb:54:18:d5:d5:14:ba:a0:1c:13:b3:
- *     37:6b:37:59:ed:db:6d:b1
- * prime1:
- *     00:d8:04:f2:8e:83:78:64:68:61:e8:3a:1a:47:2a:
- *     ab:50:e8:45:64:95:d8:a1:1b:fd:e2:e1:67:a3:46:
- *     89:de:95:73:7e:1d:18:75:2a:b0:76:1c:1c:74:33:
- *     c0:ff:a8:0c:cf:d6:2d:eb:35:29:52:1d:ea:f8:e7:
- *     d6:11:4c:99:c7
- * prime2:
- *     00:c4:55:ff:b1:56:12:9f:4e:c1:1e:ff:59:86:7e:
- *     97:5d:cb:7f:0a:3e:37:cf:fb:4a:35:bc:e5:35:b7:
- *     31:a9:0c:10:7a:bc:37:20:7e:75:f1:41:f6:60:e0:
- *     3e:18:3d:e5:5d:b2:a9:f8:cc:ad:a0:52:d6:bf:cc:
- *     e0:e1:84:ff:2f
- * exponent1:
- *     7e:a6:a7:ef:96:75:47:a9:4b:7d:f4:52:e3:d6:c8:
- *     8a:af:23:c0:4d:7a:ad:3a:d4:27:e9:2f:f2:32:b1:
- *     32:a7:3d:07:7b:d7:93:1a:6c:4b:53:3f:fb:81:3c:
- *     6e:a8:00:9a:fa:60:01:bf:31:72:cb:c7:b0:17:7d:
- *     12:b7:6e:91
- * exponent2:
- *     00:ab:36:8f:ae:d6:ef:90:6b:3e:30:48:df:8a:50:
- *     d4:b1:1f:a7:9e:88:19:65:ce:ae:ad:64:17:c2:1b:
- *     0a:3c:6f:df:e3:18:45:3e:99:e9:42:45:92:94:72:
- *     98:d3:cd:0e:3b:02:76:05:18:80:84:e2:18:91:d4:
- *     19:7b:b0:de:53
- * coefficient:
- *     71:07:aa:8f:59:b5:7c:fd:db:21:53:f9:58:6c:35:
- *     cd:bd:07:c9:bf:b2:a5:09:76:d0:9c:31:df:e3:1a:
- *     90:05:bb:a1:87:b9:f8:ea:21:90:69:42:c9:3a:df:
- *     06:f0:11:20:0f:65:9f:a4:93:53:b5:91:2e:46:21:
- *     12:d7:eb:4f
- *
- *
- * server certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 8 (0x8)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:43:04 2008 GMT
- *         Not After : Aug 25 03:43:04 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Server, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *                 d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *                 1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *                 ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *                 7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *                 9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *                 d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *                 7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *                 30:05:40:2c:4f:ab:d9:74:89
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             ED:6E:DB:F4:B5:56:C8:FB:1A:06:61:3F:0F:08:BB:A6:04:D8:16:54
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             DNS:localhost
- * Signature Algorithm: md5WithRSAEncryption0
- *
- * -----BEGIN CERTIFICATE-----
- * MIICpDCCAg2gAwIBAgIBCDANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMDRaFw0yODA4MjUwMzQzMDRaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3
- * ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6
- * YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS
- * 7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjczBxMAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh
- * bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAoqVTciHtcvsUj+YaTct8tUh3aTCsKsac
- * PHhfQ+ObjiXSgxsKYTX7ym/wk/wvlbUcbqLKxsu7qrcJitH+H9heV1hEHEu65Uoi
- * nRugFruyOrwvAylV8Cm2af7ddilmYJ+sdJA6N2M3xJRxR0G2LFHEXDNEjYReyexn
- * JqCpf5uZGOo=
- * -----END CERTIFICATE-----
- *
- *
- * TLS client certificate:
- * client private key:
- * ----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,FA2A435CD35A9390
- *
- * Z+Y2uaETbsUWIyJUyVu1UV2G4rgFYJyACZT6Tp1KjRtxflSh2kXkJ9MpuXMXA0V4
- * Yy3fDzPqCL9NJmQAYRlAx/W/+j4F5EyMWDIx8fUxzONRZyoiwF7jLm+KscAfv6Pf
- * q7ItWOdj3z7IYrwlB8YIGd3F2cDKT3S+lYRk7rKb/qT7itbuHnY4Ardh3yl+MZak
- * jBp+ELUlRsUqSr1V0LoM+0rCCykarpyfhpxEcqsrl0v9Cyi5uhU50/oKv5zql3SH
- * l2ImgDjp3batAs8+Bd4NF2aqi0a7Hy44JUHxRm4caZryU/i/D9N1MbuM6882HLat
- * 5N0G+NaIUfywa8mjwq2D5aiit18HqKA6XeRRYeJ5Dvu9DCO4GeFSwcUFIBMI0L46
- * 7s114+oDodg57pMgITi+04vmUxvqlN9aiyd7f5Fgd7PeHGeOdbMz1NaJLJaPI9++
- * NakK8eK9iwT/Gdq0Uap5/CHW7vCT5PO+h3HY0STH0lWStXhdWnFO04zTdywsbSp+
- * DLpHeFT66shfeUlxR0PsCbG9vPRt/QmGLeYQZITppWo/ylSq4j+pRIuXvuWHdBRN
- * rTZ8QF4Y7AxQUXVz1j1++s6ZMHTzaK2i9HrhmDs1MbJl+QwWre3Xpv3LvTVz3k5U
- * wX8kuY1m3STt71QCaRWENq5sRaMImLxZbxc/ivFl9RAzUqo4NCxLod/QgA4iLqtO
- * ztnlpzwlC/F8HbQ1oqYWwnZAPhzU/cULtstl+Yrws2c2atO323LbPXZqbASySgig
- * sNpFXQMObdfP6LN23bY+1SvtK7V4NUTNhpdIc6INQAQ=
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICWwIBAAKBgQC78EA2rCZUTvSjWgAvaSFvuXo6k+yi9uGOx2PYLxIwmS6w8o/4
- * Jy0keCiE9wG/jUR53TvSVfPOPLJbIX3v/TNKsaP/xsibuQ98QTWX+ds6BWAFFa9Z
- * F5KjEK0WHOQHU6+odqJWKpLT+SjgeM9eH0irXBnd4WdDunWN9YKsQ5JEGwIDAQAB
- * AoGAEbdqNj0wN85hnWyEi/ObJU8UyKTdL9eaF72QGfcF/fLSxfd3vurihIeXOkGW
- * tpn4lIxYcVGM9CognhqgJpl11jFTQzn1KqZ+NEJRKkCHA4hDabKJbSC9fXHvRwrf
- * BsFpZqgiNxp3HseUTiwnaUVeyPgMt/jAj5nB5Sib+UyUxrECQQDnNQBiF2aifEg6
- * zbJOOC7he5CHAdkFxSxWVFVHL6EfXfqdLVkUohMbgZv+XxyIeU2biOExSg49Kds3
- * FOKgTau1AkEA0Bd1haj6QuCo8I0AXm2WO+MMTZMTvtHD/bGjKNM+fT4I8rKYnQRX
- * 1acHdqS9Xx2rNJqZgkMmpESIdPR2fc4yjwJALFeM6EMmqvj8/VIf5UJ/Mz14fXwM
- * PEARfckUxd9LnnFutCBTWlKvKXJVEZb6KO5ixPaegc57Jp3Vbh3yTN44lQJADD/1
- * SSMDaIB1MYP7a5Oj7m6VQNPRq8AJe5vDcRnOae0G9dKRrVyeFxO4GsHj6/+BHp2j
- * P8nYMn9eURQ7DXjf/QJAAQzMlWnKGSO8pyTDtnQx3hRMoUkOEhmNq4bQhLkYqtnY
- * FcqpUQ2qMjW+NiNWk5HnTrMS3L9EdJobMUzaNZLy4w==
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *     21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *     12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *     01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *     7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *     35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *     ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *     28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *     75:8d:f5:82:ac:43:92:44:1b
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     11:b7:6a:36:3d:30:37:ce:61:9d:6c:84:8b:f3:9b:
- *     25:4f:14:c8:a4:dd:2f:d7:9a:17:bd:90:19:f7:05:
- *     fd:f2:d2:c5:f7:77:be:ea:e2:84:87:97:3a:41:96:
- *     b6:99:f8:94:8c:58:71:51:8c:f4:2a:20:9e:1a:a0:
- *     26:99:75:d6:31:53:43:39:f5:2a:a6:7e:34:42:51:
- *     2a:40:87:03:88:43:69:b2:89:6d:20:bd:7d:71:ef:
- *     47:0a:df:06:c1:69:66:a8:22:37:1a:77:1e:c7:94:
- *     4e:2c:27:69:45:5e:c8:f8:0c:b7:f8:c0:8f:99:c1:
- *     e5:28:9b:f9:4c:94:c6:b1
- * prime1:
- *     00:e7:35:00:62:17:66:a2:7c:48:3a:cd:b2:4e:38:
- *     2e:e1:7b:90:87:01:d9:05:c5:2c:56:54:55:47:2f:
- *     a1:1f:5d:fa:9d:2d:59:14:a2:13:1b:81:9b:fe:5f:
- *     1c:88:79:4d:9b:88:e1:31:4a:0e:3d:29:db:37:14:
- *     e2:a0:4d:ab:b5
- * prime2:
- *     00:d0:17:75:85:a8:fa:42:e0:a8:f0:8d:00:5e:6d:
- *     96:3b:e3:0c:4d:93:13:be:d1:c3:fd:b1:a3:28:d3:
- *     3e:7d:3e:08:f2:b2:98:9d:04:57:d5:a7:07:76:a4:
- *     bd:5f:1d:ab:34:9a:99:82:43:26:a4:44:88:74:f4:
- *     76:7d:ce:32:8f
- * exponent1:
- *     2c:57:8c:e8:43:26:aa:f8:fc:fd:52:1f:e5:42:7f:
- *     33:3d:78:7d:7c:0c:3c:40:11:7d:c9:14:c5:df:4b:
- *     9e:71:6e:b4:20:53:5a:52:af:29:72:55:11:96:fa:
- *     28:ee:62:c4:f6:9e:81:ce:7b:26:9d:d5:6e:1d:f2:
- *     4c:de:38:95
- * exponent2:
- *     0c:3f:f5:49:23:03:68:80:75:31:83:fb:6b:93:a3:
- *     ee:6e:95:40:d3:d1:ab:c0:09:7b:9b:c3:71:19:ce:
- *     69:ed:06:f5:d2:91:ad:5c:9e:17:13:b8:1a:c1:e3:
- *     eb:ff:81:1e:9d:a3:3f:c9:d8:32:7f:5e:51:14:3b:
- *     0d:78:df:fd
- * coefficient:
- *     01:0c:cc:95:69:ca:19:23:bc:a7:24:c3:b6:74:31:
- *     de:14:4c:a1:49:0e:12:19:8d:ab:86:d0:84:b9:18:
- *     aa:d9:d8:15:ca:a9:51:0d:aa:32:35:be:36:23:56:
- *     93:91:e7:4e:b3:12:dc:bf:44:74:9a:1b:31:4c:da:
- *     35:92:f2:e3
- *
- * client certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 9 (0x9)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:43:24 2008 GMT
- *         Not After : Aug 25 03:43:24 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Client, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *                 21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *                 12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *                 01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *                 7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *                 35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *                 ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *                 28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *                 75:8d:f5:82:ac:43:92:44:1b
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             CD:BB:C8:85:AA:91:BD:FD:1D:BE:CD:67:7C:FF:B3:E9:4C:A8:22:E6
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             DNS:localhost
- * Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICpDCCAg2gAwIBAgIBCTANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMjRaFw0yODA4MjUwMzQzMjRaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas
- * JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV
- * 8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq
- * ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjczBxMAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh
- * bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAm25gJyqW1JznQ1EyOtTGswBVwfgBOf+F
- * HJuBTcflYQLbTD/AETPQJGvZU9tdhuLtbG3OPhR7vSY8zeAbfM3dbH7QFr3r47Gj
- * XEH7qM/MX+Z3ifVaC4MeJmrYQkYFSuKeyyKpdRVX4w4nnFHF6OsNASsYrMW6LpxN
- * cl/epUcHL7E=
- * -----END CERTIFICATE-----
- *
- *
- *
- * Trusted CA certificate:
- * Certificate:
- *   Data:
- *     Version: 3 (0x2)
- *     Serial Number: 0 (0x0)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 02:43:36 2008 GMT
- *         Not After : Aug 25 02:43:36 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:cb:c4:38:20:07:be:88:a7:93:b0:a1:43:51:2d:
- *                 d7:8e:85:af:54:dd:ad:a2:7b:23:5b:cf:99:13:53:
- *                 99:45:7d:ee:6d:ba:2d:bf:e3:ad:6e:3d:9f:1a:f9:
- *                 03:97:e0:17:55:ae:11:26:57:de:01:29:8e:05:3f:
- *                 21:f7:e7:36:e8:2e:37:d7:48:ac:53:d6:60:0e:c7:
- *                 50:6d:f6:c5:85:f7:8b:a6:c5:91:35:72:3c:94:ee:
- *                 f1:17:f0:71:e3:ec:1b:ce:ca:4e:40:42:b0:6d:ee:
- *                 6a:0e:d6:e5:ad:3c:0f:c9:ba:82:4f:78:f8:89:97:
- *                 89:2a:95:12:4c:d8:09:2a:e9
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Subject Key Identifier:
- *             FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *             DirName:/C=US/ST=Some-State/L=Some-City/O=Some-Org
- *             serial:00
- *
- *         X509v3 Basic Constraints:
- *             CA:TRUE
- *  Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
- * gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX
- * 4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj
- * 7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G
- * A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ
- * hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt
- * U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw
- * DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA
- * ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ
- * LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P
- * 6Mvf0r1PNTY2hwTJLJmKtg==
- * -----END CERTIFICATE---
+/* @test id=tls13
+ * @bug 6766775
+ * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
+ * @library /test/lib
+ * @run main/othervm DNSIdentities TLSv1.3 SHA256withRSA
+ * @author Xuelei Fan
  */
 
+import jdk.test.lib.security.CertificateBuilder;
+import jdk.test.lib.security.SecurityUtils;
+import sun.security.x509.DNSName;
+import sun.security.x509.GeneralName;
+import sun.security.x509.GeneralNames;
+import sun.security.x509.SubjectAlternativeNameExtension;
 
-public class DNSIdentities {
-    static Map cookies;
-    ServerSocket ss;
 
-    /*
-     * =============================================================
-     * Set the various variables needed for the tests, then
-     * specify what tests to run on each side.
-     */
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.List;
 
+
+public class DNSIdentities extends IdentitiesBase {
     /*
      * Should we run the client or server in a separate thread?
      * Both sides can throw exceptions, but do you have a preference
@@ -419,209 +71,6 @@ public class DNSIdentities {
      */
     static boolean separateServerThread = true;
 
-    /*
-     * Where do we find the keystores?
-     */
-    static String trusedCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB\n" +
-        "gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX\n" +
-        "4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj\n" +
-        "7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G\n" +
-        "A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ\n" +
-        "hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt\n" +
-        "U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw\n" +
-        "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA\n" +
-        "ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ\n" +
-        "LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P\n" +
-        "6Mvf0r1PNTY2hwTJLJmKtg==\n" +
-        "-----END CERTIFICATE-----";
-
-    static String serverCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICpDCCAg2gAwIBAgIBCDANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMDRaFw0yODA4MjUwMzQzMDRaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3\n" +
-        "ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6\n" +
-        "YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS\n" +
-        "7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjczBxMAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh\n" +
-        "bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAoqVTciHtcvsUj+YaTct8tUh3aTCsKsac\n" +
-        "PHhfQ+ObjiXSgxsKYTX7ym/wk/wvlbUcbqLKxsu7qrcJitH+H9heV1hEHEu65Uoi\n" +
-        "nRugFruyOrwvAylV8Cm2af7ddilmYJ+sdJA6N2M3xJRxR0G2LFHEXDNEjYReyexn\n" +
-        "JqCpf5uZGOo=\n" +
-        "-----END CERTIFICATE-----";
-
-    static String clientCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICpDCCAg2gAwIBAgIBCTANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMjRaFw0yODA4MjUwMzQzMjRaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas\n" +
-        "JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV\n" +
-        "8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq\n" +
-        "ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjczBxMAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh\n" +
-        "bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAm25gJyqW1JznQ1EyOtTGswBVwfgBOf+F\n" +
-        "HJuBTcflYQLbTD/AETPQJGvZU9tdhuLtbG3OPhR7vSY8zeAbfM3dbH7QFr3r47Gj\n" +
-        "XEH7qM/MX+Z3ifVaC4MeJmrYQkYFSuKeyyKpdRVX4w4nnFHF6OsNASsYrMW6LpxN\n" +
-        "cl/epUcHL7E=\n" +
-        "-----END CERTIFICATE-----";
-
-    static byte serverPrivateExponent[] = {
-        (byte)0x6e, (byte)0xa7, (byte)0x1b, (byte)0x83,
-        (byte)0x51, (byte)0x35, (byte)0x9a, (byte)0x44,
-        (byte)0x7d, (byte)0xf6, (byte)0xe3, (byte)0x89,
-        (byte)0xa0, (byte)0xd7, (byte)0x90, (byte)0x60,
-        (byte)0xa1, (byte)0x4e, (byte)0x27, (byte)0x21,
-        (byte)0xa2, (byte)0x89, (byte)0x74, (byte)0xcc,
-        (byte)0x9d, (byte)0x75, (byte)0x75, (byte)0x4e,
-        (byte)0xc7, (byte)0x82, (byte)0xe3, (byte)0xe3,
-        (byte)0xc3, (byte)0x7d, (byte)0x00, (byte)0x54,
-        (byte)0xec, (byte)0x36, (byte)0xb1, (byte)0xdf,
-        (byte)0x91, (byte)0x9c, (byte)0x7a, (byte)0xc0,
-        (byte)0x62, (byte)0x0a, (byte)0xd6, (byte)0xa9,
-        (byte)0x22, (byte)0x91, (byte)0x4a, (byte)0x29,
-        (byte)0x2e, (byte)0x43, (byte)0xfa, (byte)0x8c,
-        (byte)0xd8, (byte)0xe9, (byte)0xbe, (byte)0xd9,
-        (byte)0x4f, (byte)0xca, (byte)0x23, (byte)0xc6,
-        (byte)0xe4, (byte)0x3f, (byte)0xb8, (byte)0x72,
-        (byte)0xcf, (byte)0x02, (byte)0xfc, (byte)0xf4,
-        (byte)0x58, (byte)0x34, (byte)0x77, (byte)0x76,
-        (byte)0xce, (byte)0x22, (byte)0x44, (byte)0x5f,
-        (byte)0x2d, (byte)0xca, (byte)0xee, (byte)0xf5,
-        (byte)0x43, (byte)0x56, (byte)0x47, (byte)0x71,
-        (byte)0x0b, (byte)0x09, (byte)0x6b, (byte)0x5e,
-        (byte)0xf2, (byte)0xc8, (byte)0xee, (byte)0xd4,
-        (byte)0x6e, (byte)0x44, (byte)0x92, (byte)0x2a,
-        (byte)0x7f, (byte)0xcc, (byte)0xa7, (byte)0xd4,
-        (byte)0x5b, (byte)0xfb, (byte)0xf7, (byte)0x4a,
-        (byte)0xa9, (byte)0xfb, (byte)0x54, (byte)0x18,
-        (byte)0xd5, (byte)0xd5, (byte)0x14, (byte)0xba,
-        (byte)0xa0, (byte)0x1c, (byte)0x13, (byte)0xb3,
-        (byte)0x37, (byte)0x6b, (byte)0x37, (byte)0x59,
-        (byte)0xed, (byte)0xdb, (byte)0x6d, (byte)0xb1
-    };
-
-    static byte serverModulus[] = {
-        (byte)0x00,
-        (byte)0xa5, (byte)0xac, (byte)0x5b, (byte)0x1c,
-        (byte)0x37, (byte)0xa2, (byte)0xdd, (byte)0x99,
-        (byte)0x89, (byte)0x2d, (byte)0xb2, (byte)0x79,
-        (byte)0xb8, (byte)0x8f, (byte)0xd5, (byte)0x48,
-        (byte)0xa5, (byte)0xe7, (byte)0x1c, (byte)0x84,
-        (byte)0x17, (byte)0x8d, (byte)0x69, (byte)0x9c,
-        (byte)0xc6, (byte)0xac, (byte)0x6d, (byte)0xf9,
-        (byte)0xf2, (byte)0x1d, (byte)0x1f, (byte)0x39,
-        (byte)0x19, (byte)0xda, (byte)0xd3, (byte)0x72,
-        (byte)0x1e, (byte)0x6e, (byte)0xec, (byte)0x44,
-        (byte)0xcc, (byte)0x70, (byte)0xa4, (byte)0xdc,
-        (byte)0xba, (byte)0x00, (byte)0x30, (byte)0xf6,
-        (byte)0xa0, (byte)0x4f, (byte)0x3d, (byte)0x54,
-        (byte)0x7a, (byte)0x61, (byte)0x6a, (byte)0xcc,
-        (byte)0x57, (byte)0xd0, (byte)0x0a, (byte)0x7f,
-        (byte)0x95, (byte)0x28, (byte)0x18, (byte)0x3f,
-        (byte)0x9a, (byte)0xd9, (byte)0x94, (byte)0xf2,
-        (byte)0x1b, (byte)0xc8, (byte)0x24, (byte)0x88,
-        (byte)0x7e, (byte)0xfe, (byte)0x9d, (byte)0x0f,
-        (byte)0x3d, (byte)0xfb, (byte)0x57, (byte)0x53,
-        (byte)0x08, (byte)0xb3, (byte)0x20, (byte)0x33,
-        (byte)0xd4, (byte)0x3f, (byte)0x17, (byte)0x47,
-        (byte)0x14, (byte)0xd1, (byte)0xcd, (byte)0xea,
-        (byte)0x08, (byte)0xd8, (byte)0x0e, (byte)0x75,
-        (byte)0x4e, (byte)0xaf, (byte)0xbe, (byte)0xcc,
-        (byte)0xd2, (byte)0xec, (byte)0xaf, (byte)0xa9,
-        (byte)0x7a, (byte)0x49, (byte)0xdf, (byte)0xc2,
-        (byte)0xd9, (byte)0xac, (byte)0xb8, (byte)0x24,
-        (byte)0x40, (byte)0x90, (byte)0xa6, (byte)0x03,
-        (byte)0x56, (byte)0x2a, (byte)0xd0, (byte)0x30,
-        (byte)0x05, (byte)0x40, (byte)0x2c, (byte)0x4f,
-        (byte)0xab, (byte)0xd9, (byte)0x74, (byte)0x89
-    };
-
-    static byte clientPrivateExponent[] = {
-        (byte)0x11, (byte)0xb7, (byte)0x6a, (byte)0x36,
-        (byte)0x3d, (byte)0x30, (byte)0x37, (byte)0xce,
-        (byte)0x61, (byte)0x9d, (byte)0x6c, (byte)0x84,
-        (byte)0x8b, (byte)0xf3, (byte)0x9b, (byte)0x25,
-        (byte)0x4f, (byte)0x14, (byte)0xc8, (byte)0xa4,
-        (byte)0xdd, (byte)0x2f, (byte)0xd7, (byte)0x9a,
-        (byte)0x17, (byte)0xbd, (byte)0x90, (byte)0x19,
-        (byte)0xf7, (byte)0x05, (byte)0xfd, (byte)0xf2,
-        (byte)0xd2, (byte)0xc5, (byte)0xf7, (byte)0x77,
-        (byte)0xbe, (byte)0xea, (byte)0xe2, (byte)0x84,
-        (byte)0x87, (byte)0x97, (byte)0x3a, (byte)0x41,
-        (byte)0x96, (byte)0xb6, (byte)0x99, (byte)0xf8,
-        (byte)0x94, (byte)0x8c, (byte)0x58, (byte)0x71,
-        (byte)0x51, (byte)0x8c, (byte)0xf4, (byte)0x2a,
-        (byte)0x20, (byte)0x9e, (byte)0x1a, (byte)0xa0,
-        (byte)0x26, (byte)0x99, (byte)0x75, (byte)0xd6,
-        (byte)0x31, (byte)0x53, (byte)0x43, (byte)0x39,
-        (byte)0xf5, (byte)0x2a, (byte)0xa6, (byte)0x7e,
-        (byte)0x34, (byte)0x42, (byte)0x51, (byte)0x2a,
-        (byte)0x40, (byte)0x87, (byte)0x03, (byte)0x88,
-        (byte)0x43, (byte)0x69, (byte)0xb2, (byte)0x89,
-        (byte)0x6d, (byte)0x20, (byte)0xbd, (byte)0x7d,
-        (byte)0x71, (byte)0xef, (byte)0x47, (byte)0x0a,
-        (byte)0xdf, (byte)0x06, (byte)0xc1, (byte)0x69,
-        (byte)0x66, (byte)0xa8, (byte)0x22, (byte)0x37,
-        (byte)0x1a, (byte)0x77, (byte)0x1e, (byte)0xc7,
-        (byte)0x94, (byte)0x4e, (byte)0x2c, (byte)0x27,
-        (byte)0x69, (byte)0x45, (byte)0x5e, (byte)0xc8,
-        (byte)0xf8, (byte)0x0c, (byte)0xb7, (byte)0xf8,
-        (byte)0xc0, (byte)0x8f, (byte)0x99, (byte)0xc1,
-        (byte)0xe5, (byte)0x28, (byte)0x9b, (byte)0xf9,
-        (byte)0x4c, (byte)0x94, (byte)0xc6, (byte)0xb1
-    };
-
-    static byte clientModulus[] = {
-        (byte)0x00,
-        (byte)0xbb, (byte)0xf0, (byte)0x40, (byte)0x36,
-        (byte)0xac, (byte)0x26, (byte)0x54, (byte)0x4e,
-        (byte)0xf4, (byte)0xa3, (byte)0x5a, (byte)0x00,
-        (byte)0x2f, (byte)0x69, (byte)0x21, (byte)0x6f,
-        (byte)0xb9, (byte)0x7a, (byte)0x3a, (byte)0x93,
-        (byte)0xec, (byte)0xa2, (byte)0xf6, (byte)0xe1,
-        (byte)0x8e, (byte)0xc7, (byte)0x63, (byte)0xd8,
-        (byte)0x2f, (byte)0x12, (byte)0x30, (byte)0x99,
-        (byte)0x2e, (byte)0xb0, (byte)0xf2, (byte)0x8f,
-        (byte)0xf8, (byte)0x27, (byte)0x2d, (byte)0x24,
-        (byte)0x78, (byte)0x28, (byte)0x84, (byte)0xf7,
-        (byte)0x01, (byte)0xbf, (byte)0x8d, (byte)0x44,
-        (byte)0x79, (byte)0xdd, (byte)0x3b, (byte)0xd2,
-        (byte)0x55, (byte)0xf3, (byte)0xce, (byte)0x3c,
-        (byte)0xb2, (byte)0x5b, (byte)0x21, (byte)0x7d,
-        (byte)0xef, (byte)0xfd, (byte)0x33, (byte)0x4a,
-        (byte)0xb1, (byte)0xa3, (byte)0xff, (byte)0xc6,
-        (byte)0xc8, (byte)0x9b, (byte)0xb9, (byte)0x0f,
-        (byte)0x7c, (byte)0x41, (byte)0x35, (byte)0x97,
-        (byte)0xf9, (byte)0xdb, (byte)0x3a, (byte)0x05,
-        (byte)0x60, (byte)0x05, (byte)0x15, (byte)0xaf,
-        (byte)0x59, (byte)0x17, (byte)0x92, (byte)0xa3,
-        (byte)0x10, (byte)0xad, (byte)0x16, (byte)0x1c,
-        (byte)0xe4, (byte)0x07, (byte)0x53, (byte)0xaf,
-        (byte)0xa8, (byte)0x76, (byte)0xa2, (byte)0x56,
-        (byte)0x2a, (byte)0x92, (byte)0xd3, (byte)0xf9,
-        (byte)0x28, (byte)0xe0, (byte)0x78, (byte)0xcf,
-        (byte)0x5e, (byte)0x1f, (byte)0x48, (byte)0xab,
-        (byte)0x5c, (byte)0x19, (byte)0xdd, (byte)0xe1,
-        (byte)0x67, (byte)0x43, (byte)0xba, (byte)0x75,
-        (byte)0x8d, (byte)0xf5, (byte)0x82, (byte)0xac,
-        (byte)0x43, (byte)0x92, (byte)0x44, (byte)0x1b
-    };
-
-    static char passphrase[] = "passphrase".toCharArray();
 
     /*
      * Is the server ready to serve?
@@ -640,6 +89,20 @@ public class DNSIdentities {
 
     private SSLServerSocket sslServerSocket = null;
 
+    @Override
+    protected CertificateBuilder customizeServerCert(CertificateBuilder builder) throws Exception {
+        GeneralNames gns = new GeneralNames();
+        gns.add(new GeneralName(new DNSName("localhost")));
+        return builder.addExtension(new SubjectAlternativeNameExtension(true, gns));
+    }
+
+    @Override
+    protected CertificateBuilder customizeClientCert(CertificateBuilder builder) throws Exception {
+        GeneralNames gns = new GeneralNames();
+        gns.add(new GeneralName(new DNSName("localhost")));
+        return builder.addExtension(new SubjectAlternativeNameExtension(true, gns));
+    }
+
     /*
      * Define the server side of the test.
      *
@@ -647,8 +110,7 @@ public class DNSIdentities {
      * to avoid infinite hangs.
      */
     void doServerSide() throws Exception {
-        SSLContext context = getSSLContext(trusedCertStr, serverCertStr,
-            serverModulus, serverPrivateExponent, passphrase);
+        SSLContext context = getServerSSLContext();
         SSLServerSocketFactory sslssf = context.getServerSocketFactory();
 
         // doClientSide() connects to "localhost"
@@ -703,8 +165,7 @@ public class DNSIdentities {
     void doClientSide() throws Exception {
         SSLContext reservedSSLContext = SSLContext.getDefault();
         try {
-            SSLContext context = getSSLContext(trusedCertStr, clientCertStr,
-                clientModulus, clientPrivateExponent, passphrase);
+            SSLContext context = getClientSSLContext();
 
             SSLContext.setDefault(context);
 
@@ -748,12 +209,12 @@ public class DNSIdentities {
     volatile Exception serverException = null;
     volatile Exception clientException = null;
 
-    public static void main(String args[]) throws Exception {
-        // MD5 is used in this test case, don't disable MD5 algorithm.
-        Security.setProperty("jdk.certpath.disabledAlgorithms",
-                "MD2, RSA keySize < 1024");
-        Security.setProperty("jdk.tls.disabledAlgorithms",
-                "SSLv3, RC4, DH keySize < 768");
+    public static void main(String [] args) throws Exception {
+        if (args[1].contains("MD5")) {
+            SecurityUtils.removeFromDisabledAlgs(
+                    "jdk.certpath.disabledAlgorithms", List.of("MD5"));
+            SecurityUtils.removeFromDisabledTlsAlgs("MD5");
+        }
 
         if (debug)
             System.setProperty("javax.net.debug", "all");
@@ -761,7 +222,7 @@ public class DNSIdentities {
         /*
          * Start the tests.
          */
-        new DNSIdentities();
+        new DNSIdentities(args[0], args[1]);
     }
 
     Thread clientThread = null;
@@ -771,7 +232,8 @@ public class DNSIdentities {
      *
      * Fork off the other side, then do your work.
      */
-    DNSIdentities() throws Exception {
+    DNSIdentities(String protocol, String signatureAlg) throws Exception {
+        super(protocol, signatureAlg);
         if (separateServerThread) {
             startServer(true);
             startClient(false);
@@ -846,65 +308,4 @@ public class DNSIdentities {
             doClientSide();
         }
     }
-
-    // get the ssl context
-    private static SSLContext getSSLContext(String trusedCertStr,
-            String keyCertStr, byte[] modulus,
-            byte[] privateExponent, char[] passphrase) throws Exception {
-
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
-        is.close();
-
-        // create a key store
-        KeyStore ks = KeyStore.getInstance("JKS");
-        ks.load(null, null);
-
-        // import the trused cert
-        ks.setCertificateEntry("RSA Export Signer", trusedCert);
-
-        if (keyCertStr != null) {
-            // generate the private key.
-            RSAPrivateKeySpec priKeySpec = new RSAPrivateKeySpec(
-                                            new BigInteger(modulus),
-                                            new BigInteger(privateExponent));
-            KeyFactory kf = KeyFactory.getInstance("RSA");
-            RSAPrivateKey priKey =
-                    (RSAPrivateKey)kf.generatePrivate(priKeySpec);
-
-            // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
-
-            Certificate[] chain = new Certificate[2];
-            chain[0] = keyCert;
-            chain[1] = trusedCert;
-
-            // import the key entry.
-            ks.setKeyEntry("Whatever", priKey, passphrase, chain);
-        }
-
-        // create SSL context
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-        tmf.init(ks);
-
-        SSLContext ctx = SSLContext.getInstance("TLSv1.2");
-
-        if (keyCertStr != null) {
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-            kmf.init(ks, passphrase);
-
-            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } else {
-            ctx.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return ctx;
-    }
-
 }
diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
index dda6dc6078a..9fe9354ba60 100644
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,23 @@
  * questions.
  */
 
-/* @test
+/* @test id=tls12
  * @bug 6766775
  * @library /test/lib
  * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
- * @run main/othervm IPAddressDNSIdentities
  *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
  * @author Xuelei Fan
+ * @run main/othervm IPAddressDNSIdentities TLSv1.2 MD5withRSA
+ */
+
+
+/* @test id=tls13
+ * @bug 6766775
+ * @library /test/lib
+ * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
+ *
+ * @author Xuelei Fan
+ * @run main/othervm IPAddressDNSIdentities TLSv1.3 SHA256withRSA
  */
 
 import java.net.*;
@@ -44,372 +52,12 @@ import java.security.spec.*;
 import java.security.interfaces.*;
 import java.math.BigInteger;
 import jdk.test.lib.net.URIBuilder;
-
-/*
- * Certificates and key used in the test.
- *
- * TLS server certificate:
- * server private key:
- * -----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,D9AE407F6D0E389A
- *
- * WPrA7TFol/cQCcp9oHnXWNpYlvRbbIcQj0m+RKT2Iuzfus+DHt3Zadf8nJpKfX2e
- * h2rnhlzCN9M7djRDooZKDOPCsdBn51Au7HlZF3S3Opgo7D8XFM1a8t1Je4ke14oI
- * nw6QKYsBblRziPnP2PZ0zvX24nOv7bbY8beynlJHGs00VWSFdoH2DS0aE1p6D+3n
- * ptJuJ75dVfZFK4X7162APlNXevX8D6PEQpSiRw1rjjGGcnvQ4HdWk3BxDVDcCNJb
- * Y1aGNRxsjTDvPi3R9Qx2M+W03QzEPx4SR3ZHVskeSJHaetM0TM/w/45Paq4GokXP
- * ZeTnbEx1xmjkA7h+t4doLL4watx5F6yLsJzu8xB3lt/1EtmkYtLz1t7X4BetPAXz
- * zS69X/VwhKfsOI3qXBWuL2oHPyhDmT1gcaUQwEPSV6ogHEEQEDXdiUS8heNK13KF
- * TCQYFkETvV2BLxUhV1hypPzRQ6tUpJiAbD5KmoK2lD9slshG2QtvKQq0/bgkDY5J
- * LhDHV2dtcZ3kDPkkZXpbcJQvoeH3d09C5sIsuTFo2zgNR6oETHUc5TzP6FY2YYRa
- * QcK5HcmtsRRiXFm01ac+aMejJUIujjFt84SiKWT/73vC8AmY4tYcJBLjCg4XIxSH
- * fdDFLL1YZENNO5ivlp8mdiHqcawx+36L7DrEZQ8RZt6cqST5t/+XTdM74s6k81GT
- * pNsa82P2K2zmIUZ/DL2mKjW1vfRByw1NQFEBkN3vdyZxYfM/JyUzX4hbjXBEkh9Q
- * QYrcwLKLjis2QzSvK04B3bvRzRb+4ocWiso8ZPAXAIxZFBWDpTMM2A==
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICXAIBAAKBgQClrFscN6LdmYktsnm4j9VIpecchBeNaZzGrG358h0fORna03Ie
- * buxEzHCk3LoAMPagTz1UemFqzFfQCn+VKBg/mtmU8hvIJIh+/p0PPftXUwizIDPU
- * PxdHFNHN6gjYDnVOr77M0uyvqXpJ38LZrLgkQJCmA1Yq0DAFQCxPq9l0iQIDAQAB
- * AoGAbqcbg1E1mkR99uOJoNeQYKFOJyGiiXTMnXV1TseC4+PDfQBU7Dax35GcesBi
- * CtapIpFKKS5D+ozY6b7ZT8ojxuQ/uHLPAvz0WDR3ds4iRF8tyu71Q1ZHcQsJa17y
- * yO7UbkSSKn/Mp9Rb+/dKqftUGNXVFLqgHBOzN2s3We3bbbECQQDYBPKOg3hkaGHo
- * OhpHKqtQ6EVkldihG/3i4WejRonelXN+HRh1KrB2HBx0M8D/qAzP1i3rNSlSHer4
- * 59YRTJnHAkEAxFX/sVYSn07BHv9Zhn6XXct/Cj43z/tKNbzlNbcxqQwQerw3IH51
- * 8UH2YOA+GD3lXbKp+MytoFLWv8zg4YT/LwJAfqan75Z1R6lLffRS49bIiq8jwE16
- * rTrUJ+kv8jKxMqc9B3vXkxpsS1M/+4E8bqgAmvpgAb8xcsvHsBd9ErdukQJBAKs2
- * j67W75BrPjBI34pQ1LEfp56IGWXOrq1kF8IbCjxv3+MYRT6Z6UJFkpRymNPNDjsC
- * dgUYgITiGJHUGXuw3lMCQHEHqo9ZtXz92yFT+VhsNc29B8m/sqUJdtCcMd/jGpAF
- * u6GHufjqIZBpQsk63wbwESAPZZ+kk1O1kS5GIRLX608=
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *     d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *     1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *     ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *     7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *     9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *     d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *     7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *     30:05:40:2c:4f:ab:d9:74:89
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     6e:a7:1b:83:51:35:9a:44:7d:f6:e3:89:a0:d7:90:
- *     60:a1:4e:27:21:a2:89:74:cc:9d:75:75:4e:c7:82:
- *     e3:e3:c3:7d:00:54:ec:36:b1:df:91:9c:7a:c0:62:
- *     0a:d6:a9:22:91:4a:29:2e:43:fa:8c:d8:e9:be:d9:
- *     4f:ca:23:c6:e4:3f:b8:72:cf:02:fc:f4:58:34:77:
- *     76:ce:22:44:5f:2d:ca:ee:f5:43:56:47:71:0b:09:
- *     6b:5e:f2:c8:ee:d4:6e:44:92:2a:7f:cc:a7:d4:5b:
- *     fb:f7:4a:a9:fb:54:18:d5:d5:14:ba:a0:1c:13:b3:
- *     37:6b:37:59:ed:db:6d:b1
- * prime1:
- *     00:d8:04:f2:8e:83:78:64:68:61:e8:3a:1a:47:2a:
- *     ab:50:e8:45:64:95:d8:a1:1b:fd:e2:e1:67:a3:46:
- *     89:de:95:73:7e:1d:18:75:2a:b0:76:1c:1c:74:33:
- *     c0:ff:a8:0c:cf:d6:2d:eb:35:29:52:1d:ea:f8:e7:
- *     d6:11:4c:99:c7
- * prime2:
- *     00:c4:55:ff:b1:56:12:9f:4e:c1:1e:ff:59:86:7e:
- *     97:5d:cb:7f:0a:3e:37:cf:fb:4a:35:bc:e5:35:b7:
- *     31:a9:0c:10:7a:bc:37:20:7e:75:f1:41:f6:60:e0:
- *     3e:18:3d:e5:5d:b2:a9:f8:cc:ad:a0:52:d6:bf:cc:
- *     e0:e1:84:ff:2f
- * exponent1:
- *     7e:a6:a7:ef:96:75:47:a9:4b:7d:f4:52:e3:d6:c8:
- *     8a:af:23:c0:4d:7a:ad:3a:d4:27:e9:2f:f2:32:b1:
- *     32:a7:3d:07:7b:d7:93:1a:6c:4b:53:3f:fb:81:3c:
- *     6e:a8:00:9a:fa:60:01:bf:31:72:cb:c7:b0:17:7d:
- *     12:b7:6e:91
- * exponent2:
- *     00:ab:36:8f:ae:d6:ef:90:6b:3e:30:48:df:8a:50:
- *     d4:b1:1f:a7:9e:88:19:65:ce:ae:ad:64:17:c2:1b:
- *     0a:3c:6f:df:e3:18:45:3e:99:e9:42:45:92:94:72:
- *     98:d3:cd:0e:3b:02:76:05:18:80:84:e2:18:91:d4:
- *     19:7b:b0:de:53
- * coefficient:
- *     71:07:aa:8f:59:b5:7c:fd:db:21:53:f9:58:6c:35:
- *     cd:bd:07:c9:bf:b2:a5:09:76:d0:9c:31:df:e3:1a:
- *     90:05:bb:a1:87:b9:f8:ea:21:90:69:42:c9:3a:df:
- *     06:f0:11:20:0f:65:9f:a4:93:53:b5:91:2e:46:21:
- *     12:d7:eb:4f
- *
- *
- * server certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 8 (0x8)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:43:04 2008 GMT
- *         Not After : Aug 25 03:43:04 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Server, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *                 d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *                 1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *                 ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *                 7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *                 9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *                 d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *                 7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *                 30:05:40:2c:4f:ab:d9:74:89
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             ED:6E:DB:F4:B5:56:C8:FB:1A:06:61:3F:0F:08:BB:A6:04:D8:16:54
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             DNS:localhost
- * Signature Algorithm: md5WithRSAEncryption0
- *
- * -----BEGIN CERTIFICATE-----
- * MIICpDCCAg2gAwIBAgIBCDANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMDRaFw0yODA4MjUwMzQzMDRaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3
- * ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6
- * YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS
- * 7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjczBxMAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh
- * bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAoqVTciHtcvsUj+YaTct8tUh3aTCsKsac
- * PHhfQ+ObjiXSgxsKYTX7ym/wk/wvlbUcbqLKxsu7qrcJitH+H9heV1hEHEu65Uoi
- * nRugFruyOrwvAylV8Cm2af7ddilmYJ+sdJA6N2M3xJRxR0G2LFHEXDNEjYReyexn
- * JqCpf5uZGOo=
- * -----END CERTIFICATE-----
- *
- *
- * TLS client certificate:
- * client private key:
- * ----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,FA2A435CD35A9390
- *
- * Z+Y2uaETbsUWIyJUyVu1UV2G4rgFYJyACZT6Tp1KjRtxflSh2kXkJ9MpuXMXA0V4
- * Yy3fDzPqCL9NJmQAYRlAx/W/+j4F5EyMWDIx8fUxzONRZyoiwF7jLm+KscAfv6Pf
- * q7ItWOdj3z7IYrwlB8YIGd3F2cDKT3S+lYRk7rKb/qT7itbuHnY4Ardh3yl+MZak
- * jBp+ELUlRsUqSr1V0LoM+0rCCykarpyfhpxEcqsrl0v9Cyi5uhU50/oKv5zql3SH
- * l2ImgDjp3batAs8+Bd4NF2aqi0a7Hy44JUHxRm4caZryU/i/D9N1MbuM6882HLat
- * 5N0G+NaIUfywa8mjwq2D5aiit18HqKA6XeRRYeJ5Dvu9DCO4GeFSwcUFIBMI0L46
- * 7s114+oDodg57pMgITi+04vmUxvqlN9aiyd7f5Fgd7PeHGeOdbMz1NaJLJaPI9++
- * NakK8eK9iwT/Gdq0Uap5/CHW7vCT5PO+h3HY0STH0lWStXhdWnFO04zTdywsbSp+
- * DLpHeFT66shfeUlxR0PsCbG9vPRt/QmGLeYQZITppWo/ylSq4j+pRIuXvuWHdBRN
- * rTZ8QF4Y7AxQUXVz1j1++s6ZMHTzaK2i9HrhmDs1MbJl+QwWre3Xpv3LvTVz3k5U
- * wX8kuY1m3STt71QCaRWENq5sRaMImLxZbxc/ivFl9RAzUqo4NCxLod/QgA4iLqtO
- * ztnlpzwlC/F8HbQ1oqYWwnZAPhzU/cULtstl+Yrws2c2atO323LbPXZqbASySgig
- * sNpFXQMObdfP6LN23bY+1SvtK7V4NUTNhpdIc6INQAQ=
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICWwIBAAKBgQC78EA2rCZUTvSjWgAvaSFvuXo6k+yi9uGOx2PYLxIwmS6w8o/4
- * Jy0keCiE9wG/jUR53TvSVfPOPLJbIX3v/TNKsaP/xsibuQ98QTWX+ds6BWAFFa9Z
- * F5KjEK0WHOQHU6+odqJWKpLT+SjgeM9eH0irXBnd4WdDunWN9YKsQ5JEGwIDAQAB
- * AoGAEbdqNj0wN85hnWyEi/ObJU8UyKTdL9eaF72QGfcF/fLSxfd3vurihIeXOkGW
- * tpn4lIxYcVGM9CognhqgJpl11jFTQzn1KqZ+NEJRKkCHA4hDabKJbSC9fXHvRwrf
- * BsFpZqgiNxp3HseUTiwnaUVeyPgMt/jAj5nB5Sib+UyUxrECQQDnNQBiF2aifEg6
- * zbJOOC7he5CHAdkFxSxWVFVHL6EfXfqdLVkUohMbgZv+XxyIeU2biOExSg49Kds3
- * FOKgTau1AkEA0Bd1haj6QuCo8I0AXm2WO+MMTZMTvtHD/bGjKNM+fT4I8rKYnQRX
- * 1acHdqS9Xx2rNJqZgkMmpESIdPR2fc4yjwJALFeM6EMmqvj8/VIf5UJ/Mz14fXwM
- * PEARfckUxd9LnnFutCBTWlKvKXJVEZb6KO5ixPaegc57Jp3Vbh3yTN44lQJADD/1
- * SSMDaIB1MYP7a5Oj7m6VQNPRq8AJe5vDcRnOae0G9dKRrVyeFxO4GsHj6/+BHp2j
- * P8nYMn9eURQ7DXjf/QJAAQzMlWnKGSO8pyTDtnQx3hRMoUkOEhmNq4bQhLkYqtnY
- * FcqpUQ2qMjW+NiNWk5HnTrMS3L9EdJobMUzaNZLy4w==
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *     21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *     12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *     01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *     7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *     35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *     ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *     28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *     75:8d:f5:82:ac:43:92:44:1b
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     11:b7:6a:36:3d:30:37:ce:61:9d:6c:84:8b:f3:9b:
- *     25:4f:14:c8:a4:dd:2f:d7:9a:17:bd:90:19:f7:05:
- *     fd:f2:d2:c5:f7:77:be:ea:e2:84:87:97:3a:41:96:
- *     b6:99:f8:94:8c:58:71:51:8c:f4:2a:20:9e:1a:a0:
- *     26:99:75:d6:31:53:43:39:f5:2a:a6:7e:34:42:51:
- *     2a:40:87:03:88:43:69:b2:89:6d:20:bd:7d:71:ef:
- *     47:0a:df:06:c1:69:66:a8:22:37:1a:77:1e:c7:94:
- *     4e:2c:27:69:45:5e:c8:f8:0c:b7:f8:c0:8f:99:c1:
- *     e5:28:9b:f9:4c:94:c6:b1
- * prime1:
- *     00:e7:35:00:62:17:66:a2:7c:48:3a:cd:b2:4e:38:
- *     2e:e1:7b:90:87:01:d9:05:c5:2c:56:54:55:47:2f:
- *     a1:1f:5d:fa:9d:2d:59:14:a2:13:1b:81:9b:fe:5f:
- *     1c:88:79:4d:9b:88:e1:31:4a:0e:3d:29:db:37:14:
- *     e2:a0:4d:ab:b5
- * prime2:
- *     00:d0:17:75:85:a8:fa:42:e0:a8:f0:8d:00:5e:6d:
- *     96:3b:e3:0c:4d:93:13:be:d1:c3:fd:b1:a3:28:d3:
- *     3e:7d:3e:08:f2:b2:98:9d:04:57:d5:a7:07:76:a4:
- *     bd:5f:1d:ab:34:9a:99:82:43:26:a4:44:88:74:f4:
- *     76:7d:ce:32:8f
- * exponent1:
- *     2c:57:8c:e8:43:26:aa:f8:fc:fd:52:1f:e5:42:7f:
- *     33:3d:78:7d:7c:0c:3c:40:11:7d:c9:14:c5:df:4b:
- *     9e:71:6e:b4:20:53:5a:52:af:29:72:55:11:96:fa:
- *     28:ee:62:c4:f6:9e:81:ce:7b:26:9d:d5:6e:1d:f2:
- *     4c:de:38:95
- * exponent2:
- *     0c:3f:f5:49:23:03:68:80:75:31:83:fb:6b:93:a3:
- *     ee:6e:95:40:d3:d1:ab:c0:09:7b:9b:c3:71:19:ce:
- *     69:ed:06:f5:d2:91:ad:5c:9e:17:13:b8:1a:c1:e3:
- *     eb:ff:81:1e:9d:a3:3f:c9:d8:32:7f:5e:51:14:3b:
- *     0d:78:df:fd
- * coefficient:
- *     01:0c:cc:95:69:ca:19:23:bc:a7:24:c3:b6:74:31:
- *     de:14:4c:a1:49:0e:12:19:8d:ab:86:d0:84:b9:18:
- *     aa:d9:d8:15:ca:a9:51:0d:aa:32:35:be:36:23:56:
- *     93:91:e7:4e:b3:12:dc:bf:44:74:9a:1b:31:4c:da:
- *     35:92:f2:e3
- *
- * client certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 9 (0x9)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:43:24 2008 GMT
- *         Not After : Aug 25 03:43:24 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Client, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *                 21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *                 12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *                 01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *                 7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *                 35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *                 ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *                 28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *                 75:8d:f5:82:ac:43:92:44:1b
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             CD:BB:C8:85:AA:91:BD:FD:1D:BE:CD:67:7C:FF:B3:E9:4C:A8:22:E6
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             DNS:localhost
- * Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICpDCCAg2gAwIBAgIBCTANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMjRaFw0yODA4MjUwMzQzMjRaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas
- * JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV
- * 8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq
- * ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjczBxMAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh
- * bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAm25gJyqW1JznQ1EyOtTGswBVwfgBOf+F
- * HJuBTcflYQLbTD/AETPQJGvZU9tdhuLtbG3OPhR7vSY8zeAbfM3dbH7QFr3r47Gj
- * XEH7qM/MX+Z3ifVaC4MeJmrYQkYFSuKeyyKpdRVX4w4nnFHF6OsNASsYrMW6LpxN
- * cl/epUcHL7E=
- * -----END CERTIFICATE-----
- *
- *
- *
- * Trusted CA certificate:
- * Certificate:
- *   Data:
- *     Version: 3 (0x2)
- *     Serial Number: 0 (0x0)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 02:43:36 2008 GMT
- *         Not After : Aug 25 02:43:36 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:cb:c4:38:20:07:be:88:a7:93:b0:a1:43:51:2d:
- *                 d7:8e:85:af:54:dd:ad:a2:7b:23:5b:cf:99:13:53:
- *                 99:45:7d:ee:6d:ba:2d:bf:e3:ad:6e:3d:9f:1a:f9:
- *                 03:97:e0:17:55:ae:11:26:57:de:01:29:8e:05:3f:
- *                 21:f7:e7:36:e8:2e:37:d7:48:ac:53:d6:60:0e:c7:
- *                 50:6d:f6:c5:85:f7:8b:a6:c5:91:35:72:3c:94:ee:
- *                 f1:17:f0:71:e3:ec:1b:ce:ca:4e:40:42:b0:6d:ee:
- *                 6a:0e:d6:e5:ad:3c:0f:c9:ba:82:4f:78:f8:89:97:
- *                 89:2a:95:12:4c:d8:09:2a:e9
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Subject Key Identifier:
- *             FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *             DirName:/C=US/ST=Some-State/L=Some-City/O=Some-Org
- *             serial:00
- *
- *         X509v3 Basic Constraints:
- *             CA:TRUE
- *  Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
- * gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX
- * 4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj
- * 7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G
- * A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ
- * hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt
- * U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw
- * DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA
- * ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ
- * LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P
- * 6Mvf0r1PNTY2hwTJLJmKtg==
- * -----END CERTIFICATE---
- */
+import jdk.test.lib.security.CertificateBuilder;
+import jdk.test.lib.security.SecurityUtils;
 
 
-public class IPAddressDNSIdentities {
-    static Map cookies;
-    ServerSocket ss;
 
-    /*
-     * =============================================================
-     * Set the various variables needed for the tests, then
-     * specify what tests to run on each side.
-     */
+public class IPAddressDNSIdentities extends IdentitiesBase {
 
     /*
      * Should we run the client or server in a separate thread?
@@ -418,209 +66,6 @@ public class IPAddressDNSIdentities {
      */
     static boolean separateServerThread = true;
 
-    /*
-     * Where do we find the keystores?
-     */
-    static String trusedCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB\n" +
-        "gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX\n" +
-        "4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj\n" +
-        "7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G\n" +
-        "A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ\n" +
-        "hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt\n" +
-        "U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw\n" +
-        "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA\n" +
-        "ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ\n" +
-        "LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P\n" +
-        "6Mvf0r1PNTY2hwTJLJmKtg==\n" +
-        "-----END CERTIFICATE-----";
-
-    static String serverCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICpDCCAg2gAwIBAgIBCDANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMDRaFw0yODA4MjUwMzQzMDRaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3\n" +
-        "ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6\n" +
-        "YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS\n" +
-        "7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjczBxMAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh\n" +
-        "bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAoqVTciHtcvsUj+YaTct8tUh3aTCsKsac\n" +
-        "PHhfQ+ObjiXSgxsKYTX7ym/wk/wvlbUcbqLKxsu7qrcJitH+H9heV1hEHEu65Uoi\n" +
-        "nRugFruyOrwvAylV8Cm2af7ddilmYJ+sdJA6N2M3xJRxR0G2LFHEXDNEjYReyexn\n" +
-        "JqCpf5uZGOo=\n" +
-        "-----END CERTIFICATE-----";
-
-    static String clientCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICpDCCAg2gAwIBAgIBCTANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzQzMjRaFw0yODA4MjUwMzQzMjRaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas\n" +
-        "JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV\n" +
-        "8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq\n" +
-        "ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjczBxMAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAXBgNVHREBAf8EDTALgglsb2Nh\n" +
-        "bGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAm25gJyqW1JznQ1EyOtTGswBVwfgBOf+F\n" +
-        "HJuBTcflYQLbTD/AETPQJGvZU9tdhuLtbG3OPhR7vSY8zeAbfM3dbH7QFr3r47Gj\n" +
-        "XEH7qM/MX+Z3ifVaC4MeJmrYQkYFSuKeyyKpdRVX4w4nnFHF6OsNASsYrMW6LpxN\n" +
-        "cl/epUcHL7E=\n" +
-        "-----END CERTIFICATE-----";
-
-    static byte serverPrivateExponent[] = {
-        (byte)0x6e, (byte)0xa7, (byte)0x1b, (byte)0x83,
-        (byte)0x51, (byte)0x35, (byte)0x9a, (byte)0x44,
-        (byte)0x7d, (byte)0xf6, (byte)0xe3, (byte)0x89,
-        (byte)0xa0, (byte)0xd7, (byte)0x90, (byte)0x60,
-        (byte)0xa1, (byte)0x4e, (byte)0x27, (byte)0x21,
-        (byte)0xa2, (byte)0x89, (byte)0x74, (byte)0xcc,
-        (byte)0x9d, (byte)0x75, (byte)0x75, (byte)0x4e,
-        (byte)0xc7, (byte)0x82, (byte)0xe3, (byte)0xe3,
-        (byte)0xc3, (byte)0x7d, (byte)0x00, (byte)0x54,
-        (byte)0xec, (byte)0x36, (byte)0xb1, (byte)0xdf,
-        (byte)0x91, (byte)0x9c, (byte)0x7a, (byte)0xc0,
-        (byte)0x62, (byte)0x0a, (byte)0xd6, (byte)0xa9,
-        (byte)0x22, (byte)0x91, (byte)0x4a, (byte)0x29,
-        (byte)0x2e, (byte)0x43, (byte)0xfa, (byte)0x8c,
-        (byte)0xd8, (byte)0xe9, (byte)0xbe, (byte)0xd9,
-        (byte)0x4f, (byte)0xca, (byte)0x23, (byte)0xc6,
-        (byte)0xe4, (byte)0x3f, (byte)0xb8, (byte)0x72,
-        (byte)0xcf, (byte)0x02, (byte)0xfc, (byte)0xf4,
-        (byte)0x58, (byte)0x34, (byte)0x77, (byte)0x76,
-        (byte)0xce, (byte)0x22, (byte)0x44, (byte)0x5f,
-        (byte)0x2d, (byte)0xca, (byte)0xee, (byte)0xf5,
-        (byte)0x43, (byte)0x56, (byte)0x47, (byte)0x71,
-        (byte)0x0b, (byte)0x09, (byte)0x6b, (byte)0x5e,
-        (byte)0xf2, (byte)0xc8, (byte)0xee, (byte)0xd4,
-        (byte)0x6e, (byte)0x44, (byte)0x92, (byte)0x2a,
-        (byte)0x7f, (byte)0xcc, (byte)0xa7, (byte)0xd4,
-        (byte)0x5b, (byte)0xfb, (byte)0xf7, (byte)0x4a,
-        (byte)0xa9, (byte)0xfb, (byte)0x54, (byte)0x18,
-        (byte)0xd5, (byte)0xd5, (byte)0x14, (byte)0xba,
-        (byte)0xa0, (byte)0x1c, (byte)0x13, (byte)0xb3,
-        (byte)0x37, (byte)0x6b, (byte)0x37, (byte)0x59,
-        (byte)0xed, (byte)0xdb, (byte)0x6d, (byte)0xb1
-    };
-
-    static byte serverModulus[] = {
-        (byte)0x00,
-        (byte)0xa5, (byte)0xac, (byte)0x5b, (byte)0x1c,
-        (byte)0x37, (byte)0xa2, (byte)0xdd, (byte)0x99,
-        (byte)0x89, (byte)0x2d, (byte)0xb2, (byte)0x79,
-        (byte)0xb8, (byte)0x8f, (byte)0xd5, (byte)0x48,
-        (byte)0xa5, (byte)0xe7, (byte)0x1c, (byte)0x84,
-        (byte)0x17, (byte)0x8d, (byte)0x69, (byte)0x9c,
-        (byte)0xc6, (byte)0xac, (byte)0x6d, (byte)0xf9,
-        (byte)0xf2, (byte)0x1d, (byte)0x1f, (byte)0x39,
-        (byte)0x19, (byte)0xda, (byte)0xd3, (byte)0x72,
-        (byte)0x1e, (byte)0x6e, (byte)0xec, (byte)0x44,
-        (byte)0xcc, (byte)0x70, (byte)0xa4, (byte)0xdc,
-        (byte)0xba, (byte)0x00, (byte)0x30, (byte)0xf6,
-        (byte)0xa0, (byte)0x4f, (byte)0x3d, (byte)0x54,
-        (byte)0x7a, (byte)0x61, (byte)0x6a, (byte)0xcc,
-        (byte)0x57, (byte)0xd0, (byte)0x0a, (byte)0x7f,
-        (byte)0x95, (byte)0x28, (byte)0x18, (byte)0x3f,
-        (byte)0x9a, (byte)0xd9, (byte)0x94, (byte)0xf2,
-        (byte)0x1b, (byte)0xc8, (byte)0x24, (byte)0x88,
-        (byte)0x7e, (byte)0xfe, (byte)0x9d, (byte)0x0f,
-        (byte)0x3d, (byte)0xfb, (byte)0x57, (byte)0x53,
-        (byte)0x08, (byte)0xb3, (byte)0x20, (byte)0x33,
-        (byte)0xd4, (byte)0x3f, (byte)0x17, (byte)0x47,
-        (byte)0x14, (byte)0xd1, (byte)0xcd, (byte)0xea,
-        (byte)0x08, (byte)0xd8, (byte)0x0e, (byte)0x75,
-        (byte)0x4e, (byte)0xaf, (byte)0xbe, (byte)0xcc,
-        (byte)0xd2, (byte)0xec, (byte)0xaf, (byte)0xa9,
-        (byte)0x7a, (byte)0x49, (byte)0xdf, (byte)0xc2,
-        (byte)0xd9, (byte)0xac, (byte)0xb8, (byte)0x24,
-        (byte)0x40, (byte)0x90, (byte)0xa6, (byte)0x03,
-        (byte)0x56, (byte)0x2a, (byte)0xd0, (byte)0x30,
-        (byte)0x05, (byte)0x40, (byte)0x2c, (byte)0x4f,
-        (byte)0xab, (byte)0xd9, (byte)0x74, (byte)0x89
-    };
-
-    static byte clientPrivateExponent[] = {
-        (byte)0x11, (byte)0xb7, (byte)0x6a, (byte)0x36,
-        (byte)0x3d, (byte)0x30, (byte)0x37, (byte)0xce,
-        (byte)0x61, (byte)0x9d, (byte)0x6c, (byte)0x84,
-        (byte)0x8b, (byte)0xf3, (byte)0x9b, (byte)0x25,
-        (byte)0x4f, (byte)0x14, (byte)0xc8, (byte)0xa4,
-        (byte)0xdd, (byte)0x2f, (byte)0xd7, (byte)0x9a,
-        (byte)0x17, (byte)0xbd, (byte)0x90, (byte)0x19,
-        (byte)0xf7, (byte)0x05, (byte)0xfd, (byte)0xf2,
-        (byte)0xd2, (byte)0xc5, (byte)0xf7, (byte)0x77,
-        (byte)0xbe, (byte)0xea, (byte)0xe2, (byte)0x84,
-        (byte)0x87, (byte)0x97, (byte)0x3a, (byte)0x41,
-        (byte)0x96, (byte)0xb6, (byte)0x99, (byte)0xf8,
-        (byte)0x94, (byte)0x8c, (byte)0x58, (byte)0x71,
-        (byte)0x51, (byte)0x8c, (byte)0xf4, (byte)0x2a,
-        (byte)0x20, (byte)0x9e, (byte)0x1a, (byte)0xa0,
-        (byte)0x26, (byte)0x99, (byte)0x75, (byte)0xd6,
-        (byte)0x31, (byte)0x53, (byte)0x43, (byte)0x39,
-        (byte)0xf5, (byte)0x2a, (byte)0xa6, (byte)0x7e,
-        (byte)0x34, (byte)0x42, (byte)0x51, (byte)0x2a,
-        (byte)0x40, (byte)0x87, (byte)0x03, (byte)0x88,
-        (byte)0x43, (byte)0x69, (byte)0xb2, (byte)0x89,
-        (byte)0x6d, (byte)0x20, (byte)0xbd, (byte)0x7d,
-        (byte)0x71, (byte)0xef, (byte)0x47, (byte)0x0a,
-        (byte)0xdf, (byte)0x06, (byte)0xc1, (byte)0x69,
-        (byte)0x66, (byte)0xa8, (byte)0x22, (byte)0x37,
-        (byte)0x1a, (byte)0x77, (byte)0x1e, (byte)0xc7,
-        (byte)0x94, (byte)0x4e, (byte)0x2c, (byte)0x27,
-        (byte)0x69, (byte)0x45, (byte)0x5e, (byte)0xc8,
-        (byte)0xf8, (byte)0x0c, (byte)0xb7, (byte)0xf8,
-        (byte)0xc0, (byte)0x8f, (byte)0x99, (byte)0xc1,
-        (byte)0xe5, (byte)0x28, (byte)0x9b, (byte)0xf9,
-        (byte)0x4c, (byte)0x94, (byte)0xc6, (byte)0xb1
-    };
-
-    static byte clientModulus[] = {
-        (byte)0x00,
-        (byte)0xbb, (byte)0xf0, (byte)0x40, (byte)0x36,
-        (byte)0xac, (byte)0x26, (byte)0x54, (byte)0x4e,
-        (byte)0xf4, (byte)0xa3, (byte)0x5a, (byte)0x00,
-        (byte)0x2f, (byte)0x69, (byte)0x21, (byte)0x6f,
-        (byte)0xb9, (byte)0x7a, (byte)0x3a, (byte)0x93,
-        (byte)0xec, (byte)0xa2, (byte)0xf6, (byte)0xe1,
-        (byte)0x8e, (byte)0xc7, (byte)0x63, (byte)0xd8,
-        (byte)0x2f, (byte)0x12, (byte)0x30, (byte)0x99,
-        (byte)0x2e, (byte)0xb0, (byte)0xf2, (byte)0x8f,
-        (byte)0xf8, (byte)0x27, (byte)0x2d, (byte)0x24,
-        (byte)0x78, (byte)0x28, (byte)0x84, (byte)0xf7,
-        (byte)0x01, (byte)0xbf, (byte)0x8d, (byte)0x44,
-        (byte)0x79, (byte)0xdd, (byte)0x3b, (byte)0xd2,
-        (byte)0x55, (byte)0xf3, (byte)0xce, (byte)0x3c,
-        (byte)0xb2, (byte)0x5b, (byte)0x21, (byte)0x7d,
-        (byte)0xef, (byte)0xfd, (byte)0x33, (byte)0x4a,
-        (byte)0xb1, (byte)0xa3, (byte)0xff, (byte)0xc6,
-        (byte)0xc8, (byte)0x9b, (byte)0xb9, (byte)0x0f,
-        (byte)0x7c, (byte)0x41, (byte)0x35, (byte)0x97,
-        (byte)0xf9, (byte)0xdb, (byte)0x3a, (byte)0x05,
-        (byte)0x60, (byte)0x05, (byte)0x15, (byte)0xaf,
-        (byte)0x59, (byte)0x17, (byte)0x92, (byte)0xa3,
-        (byte)0x10, (byte)0xad, (byte)0x16, (byte)0x1c,
-        (byte)0xe4, (byte)0x07, (byte)0x53, (byte)0xaf,
-        (byte)0xa8, (byte)0x76, (byte)0xa2, (byte)0x56,
-        (byte)0x2a, (byte)0x92, (byte)0xd3, (byte)0xf9,
-        (byte)0x28, (byte)0xe0, (byte)0x78, (byte)0xcf,
-        (byte)0x5e, (byte)0x1f, (byte)0x48, (byte)0xab,
-        (byte)0x5c, (byte)0x19, (byte)0xdd, (byte)0xe1,
-        (byte)0x67, (byte)0x43, (byte)0xba, (byte)0x75,
-        (byte)0x8d, (byte)0xf5, (byte)0x82, (byte)0xac,
-        (byte)0x43, (byte)0x92, (byte)0x44, (byte)0x1b
-    };
-
-    static char passphrase[] = "passphrase".toCharArray();
 
     /*
      * Is the server ready to serve?
@@ -632,10 +77,6 @@ public class IPAddressDNSIdentities {
      */
     volatile static boolean closeReady = false;
 
-    /*
-     * Turn on SSL debugging?
-     */
-    static boolean debug = false;
 
     private SSLServerSocket sslServerSocket = null;
 
@@ -646,8 +87,7 @@ public class IPAddressDNSIdentities {
      * to avoid infinite hangs.
      */
     void doServerSide() throws Exception {
-        SSLContext context = getSSLContext(trusedCertStr, serverCertStr,
-            serverModulus, serverPrivateExponent, passphrase);
+        SSLContext context = getServerSSLContext();
         SSLServerSocketFactory sslssf = context.getServerSocketFactory();
 
         // doClientSide() connects to the loopback address
@@ -702,8 +142,7 @@ public class IPAddressDNSIdentities {
     void doClientSide() throws Exception {
         SSLContext reservedSSLContext = SSLContext.getDefault();
         try {
-            SSLContext context = getSSLContext(trusedCertStr, clientCertStr,
-                clientModulus, clientPrivateExponent, passphrase);
+            SSLContext context = getClientSSLContext();
 
             SSLContext.setDefault(context);
 
@@ -761,14 +200,21 @@ public class IPAddressDNSIdentities {
     volatile Exception serverException = null;
     volatile Exception clientException = null;
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
+        if (args[1].contains("MD5")) {
+            System.err.println("RE-ENABLING MD5");
+            SecurityUtils.removeFromDisabledAlgs(
+                    "jdk.certpath.disabledAlgorithms", List.of("MD5"));
+            SecurityUtils.removeFromDisabledTlsAlgs("MD5");
+        }
+
         if (debug)
             System.setProperty("javax.net.debug", "all");
 
         /*
          * Start the tests.
          */
-        new IPAddressDNSIdentities();
+        new IPAddressDNSIdentities(args[0], args[1]);
     }
 
     Thread clientThread = null;
@@ -778,7 +224,9 @@ public class IPAddressDNSIdentities {
      *
      * Fork off the other side, then do your work.
      */
-    IPAddressDNSIdentities() throws Exception {
+    IPAddressDNSIdentities(String protocol, String signatureAlgo) throws Exception {
+        super(protocol, signatureAlgo);
+
         if (separateServerThread) {
             startServer(true);
             startClient(false);
@@ -854,64 +302,17 @@ public class IPAddressDNSIdentities {
         }
     }
 
-    // get the ssl context
-    private static SSLContext getSSLContext(String trusedCertStr,
-            String keyCertStr, byte[] modulus,
-            byte[] privateExponent, char[] passphrase) throws Exception {
-
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
-        is.close();
-
-        // create a key store
-        KeyStore ks = KeyStore.getInstance("JKS");
-        ks.load(null, null);
-
-        // import the trused cert
-        ks.setCertificateEntry("RSA Export Signer", trusedCert);
-
-        if (keyCertStr != null) {
-            // generate the private key.
-            RSAPrivateKeySpec priKeySpec = new RSAPrivateKeySpec(
-                                            new BigInteger(modulus),
-                                            new BigInteger(privateExponent));
-            KeyFactory kf = KeyFactory.getInstance("RSA");
-            RSAPrivateKey priKey =
-                    (RSAPrivateKey)kf.generatePrivate(priKeySpec);
-
-            // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
-
-            Certificate[] chain = new Certificate[2];
-            chain[0] = keyCert;
-            chain[1] = trusedCert;
-
-            // import the key entry.
-            ks.setKeyEntry("Whatever", priKey, passphrase, chain);
-        }
-
-        // create SSL context
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-        tmf.init(ks);
-
-        SSLContext ctx = SSLContext.getInstance("TLS");
-
-        if (keyCertStr != null) {
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-            kmf.init(ks, passphrase);
-
-            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } else {
-            ctx.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return ctx;
+    @Override
+    protected CertificateBuilder customizeServerCert(CertificateBuilder builder)
+                                    throws Exception {
+        return builder.addExtension(CertificateBuilder.createDNSSubjectAltNameExt(
+                    true, "localhost"));
     }
 
+    @Override
+    protected CertificateBuilder customizeClientCert(CertificateBuilder builder)
+                                    throws Exception {
+        return builder.addExtension(CertificateBuilder.createDNSSubjectAltNameExt(
+                    true, "localhost"));
+    }
 }
diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
index a15093c821e..864b8cfdfb9 100644
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
@@ -26,387 +26,41 @@
 // system properties in samevm/agentvm mode.
 //
 
-/* @test
+/* @test id=tls12
  * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
  * @library /test/lib
  * @bug 6766775
- * @run main/othervm IPAddressIPIdentities
+ * @run main/othervm IPAddressIPIdentities TLSv1.2 MD5withRSA
  * @author Xuelei Fan
  */
 
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import javax.net.ssl.*;
-import java.security.Security;
-import java.security.KeyStore;
-import java.security.KeyFactory;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.spec.*;
-import java.security.interfaces.*;
-import java.math.BigInteger;
-import jdk.test.lib.net.URIBuilder;
-
-/*
- * Certificates and key used in the test.
- *
- * TLS server certificate:
- * server private key:
- * -----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,D9AE407F6D0E389A
- *
- * WPrA7TFol/cQCcp9oHnXWNpYlvRbbIcQj0m+RKT2Iuzfus+DHt3Zadf8nJpKfX2e
- * h2rnhlzCN9M7djRDooZKDOPCsdBn51Au7HlZF3S3Opgo7D8XFM1a8t1Je4ke14oI
- * nw6QKYsBblRziPnP2PZ0zvX24nOv7bbY8beynlJHGs00VWSFdoH2DS0aE1p6D+3n
- * ptJuJ75dVfZFK4X7162APlNXevX8D6PEQpSiRw1rjjGGcnvQ4HdWk3BxDVDcCNJb
- * Y1aGNRxsjTDvPi3R9Qx2M+W03QzEPx4SR3ZHVskeSJHaetM0TM/w/45Paq4GokXP
- * ZeTnbEx1xmjkA7h+t4doLL4watx5F6yLsJzu8xB3lt/1EtmkYtLz1t7X4BetPAXz
- * zS69X/VwhKfsOI3qXBWuL2oHPyhDmT1gcaUQwEPSV6ogHEEQEDXdiUS8heNK13KF
- * TCQYFkETvV2BLxUhV1hypPzRQ6tUpJiAbD5KmoK2lD9slshG2QtvKQq0/bgkDY5J
- * LhDHV2dtcZ3kDPkkZXpbcJQvoeH3d09C5sIsuTFo2zgNR6oETHUc5TzP6FY2YYRa
- * QcK5HcmtsRRiXFm01ac+aMejJUIujjFt84SiKWT/73vC8AmY4tYcJBLjCg4XIxSH
- * fdDFLL1YZENNO5ivlp8mdiHqcawx+36L7DrEZQ8RZt6cqST5t/+XTdM74s6k81GT
- * pNsa82P2K2zmIUZ/DL2mKjW1vfRByw1NQFEBkN3vdyZxYfM/JyUzX4hbjXBEkh9Q
- * QYrcwLKLjis2QzSvK04B3bvRzRb+4ocWiso8ZPAXAIxZFBWDpTMM2A==
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICXAIBAAKBgQClrFscN6LdmYktsnm4j9VIpecchBeNaZzGrG358h0fORna03Ie
- * buxEzHCk3LoAMPagTz1UemFqzFfQCn+VKBg/mtmU8hvIJIh+/p0PPftXUwizIDPU
- * PxdHFNHN6gjYDnVOr77M0uyvqXpJ38LZrLgkQJCmA1Yq0DAFQCxPq9l0iQIDAQAB
- * AoGAbqcbg1E1mkR99uOJoNeQYKFOJyGiiXTMnXV1TseC4+PDfQBU7Dax35GcesBi
- * CtapIpFKKS5D+ozY6b7ZT8ojxuQ/uHLPAvz0WDR3ds4iRF8tyu71Q1ZHcQsJa17y
- * yO7UbkSSKn/Mp9Rb+/dKqftUGNXVFLqgHBOzN2s3We3bbbECQQDYBPKOg3hkaGHo
- * OhpHKqtQ6EVkldihG/3i4WejRonelXN+HRh1KrB2HBx0M8D/qAzP1i3rNSlSHer4
- * 59YRTJnHAkEAxFX/sVYSn07BHv9Zhn6XXct/Cj43z/tKNbzlNbcxqQwQerw3IH51
- * 8UH2YOA+GD3lXbKp+MytoFLWv8zg4YT/LwJAfqan75Z1R6lLffRS49bIiq8jwE16
- * rTrUJ+kv8jKxMqc9B3vXkxpsS1M/+4E8bqgAmvpgAb8xcsvHsBd9ErdukQJBAKs2
- * j67W75BrPjBI34pQ1LEfp56IGWXOrq1kF8IbCjxv3+MYRT6Z6UJFkpRymNPNDjsC
- * dgUYgITiGJHUGXuw3lMCQHEHqo9ZtXz92yFT+VhsNc29B8m/sqUJdtCcMd/jGpAF
- * u6GHufjqIZBpQsk63wbwESAPZZ+kk1O1kS5GIRLX608=
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *     d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *     1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *     ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *     7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *     9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *     d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *     7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *     30:05:40:2c:4f:ab:d9:74:89
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     6e:a7:1b:83:51:35:9a:44:7d:f6:e3:89:a0:d7:90:
- *     60:a1:4e:27:21:a2:89:74:cc:9d:75:75:4e:c7:82:
- *     e3:e3:c3:7d:00:54:ec:36:b1:df:91:9c:7a:c0:62:
- *     0a:d6:a9:22:91:4a:29:2e:43:fa:8c:d8:e9:be:d9:
- *     4f:ca:23:c6:e4:3f:b8:72:cf:02:fc:f4:58:34:77:
- *     76:ce:22:44:5f:2d:ca:ee:f5:43:56:47:71:0b:09:
- *     6b:5e:f2:c8:ee:d4:6e:44:92:2a:7f:cc:a7:d4:5b:
- *     fb:f7:4a:a9:fb:54:18:d5:d5:14:ba:a0:1c:13:b3:
- *     37:6b:37:59:ed:db:6d:b1
- * prime1:
- *     00:d8:04:f2:8e:83:78:64:68:61:e8:3a:1a:47:2a:
- *     ab:50:e8:45:64:95:d8:a1:1b:fd:e2:e1:67:a3:46:
- *     89:de:95:73:7e:1d:18:75:2a:b0:76:1c:1c:74:33:
- *     c0:ff:a8:0c:cf:d6:2d:eb:35:29:52:1d:ea:f8:e7:
- *     d6:11:4c:99:c7
- * prime2:
- *     00:c4:55:ff:b1:56:12:9f:4e:c1:1e:ff:59:86:7e:
- *     97:5d:cb:7f:0a:3e:37:cf:fb:4a:35:bc:e5:35:b7:
- *     31:a9:0c:10:7a:bc:37:20:7e:75:f1:41:f6:60:e0:
- *     3e:18:3d:e5:5d:b2:a9:f8:cc:ad:a0:52:d6:bf:cc:
- *     e0:e1:84:ff:2f
- * exponent1:
- *     7e:a6:a7:ef:96:75:47:a9:4b:7d:f4:52:e3:d6:c8:
- *     8a:af:23:c0:4d:7a:ad:3a:d4:27:e9:2f:f2:32:b1:
- *     32:a7:3d:07:7b:d7:93:1a:6c:4b:53:3f:fb:81:3c:
- *     6e:a8:00:9a:fa:60:01:bf:31:72:cb:c7:b0:17:7d:
- *     12:b7:6e:91
- * exponent2:
- *     00:ab:36:8f:ae:d6:ef:90:6b:3e:30:48:df:8a:50:
- *     d4:b1:1f:a7:9e:88:19:65:ce:ae:ad:64:17:c2:1b:
- *     0a:3c:6f:df:e3:18:45:3e:99:e9:42:45:92:94:72:
- *     98:d3:cd:0e:3b:02:76:05:18:80:84:e2:18:91:d4:
- *     19:7b:b0:de:53
- * coefficient:
- *     71:07:aa:8f:59:b5:7c:fd:db:21:53:f9:58:6c:35:
- *     cd:bd:07:c9:bf:b2:a5:09:76:d0:9c:31:df:e3:1a:
- *     90:05:bb:a1:87:b9:f8:ea:21:90:69:42:c9:3a:df:
- *     06:f0:11:20:0f:65:9f:a4:93:53:b5:91:2e:46:21:
- *     12:d7:eb:4f
- *
- *
- * server certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 7 (0x7)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:27:57 2008 GMT
- *         Not After : Aug 25 03:27:57 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Server, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *                 d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *                 1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *                 ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *                 7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *                 9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *                 d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *                 7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *                 30:05:40:2c:4f:ab:d9:74:89
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             ED:6E:DB:F4:B5:56:C8:FB:1A:06:61:3F:0F:08:BB:A6:04:D8:16:54
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             IP Address:127.0.0.1
- * Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICnzCCAgigAwIBAgIBBzANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzI3NTdaFw0yODA4MjUwMzI3NTdaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3
- * ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6
- * YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS
- * 7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjbjBsMAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDASBgNVHREBAf8ECDAGhwR/AAAB
- * MA0GCSqGSIb3DQEBBAUAA4GBAFJjItCtCBZcjD69wdqfIbKmRFa6eJAjR6LcoDva
- * cKC/sDOLelpspiZ66Zb0Xdv5qQ7QrfOXt3K8QqJKRMdZLF9WfUfy0gJDM32ub91h
- * pu+TmcGPs+6RdrAQcuvU1ZDV9X8SMj7BtKaim4d5sqFw1npncKiA5xFn8vOYwdun
- * nZif
- * -----END CERTIFICATE-----
- *
- *
- * TLS client certificate:
- * client private key:
- * ----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,FA2A435CD35A9390
- *
- * Z+Y2uaETbsUWIyJUyVu1UV2G4rgFYJyACZT6Tp1KjRtxflSh2kXkJ9MpuXMXA0V4
- * Yy3fDzPqCL9NJmQAYRlAx/W/+j4F5EyMWDIx8fUxzONRZyoiwF7jLm+KscAfv6Pf
- * q7ItWOdj3z7IYrwlB8YIGd3F2cDKT3S+lYRk7rKb/qT7itbuHnY4Ardh3yl+MZak
- * jBp+ELUlRsUqSr1V0LoM+0rCCykarpyfhpxEcqsrl0v9Cyi5uhU50/oKv5zql3SH
- * l2ImgDjp3batAs8+Bd4NF2aqi0a7Hy44JUHxRm4caZryU/i/D9N1MbuM6882HLat
- * 5N0G+NaIUfywa8mjwq2D5aiit18HqKA6XeRRYeJ5Dvu9DCO4GeFSwcUFIBMI0L46
- * 7s114+oDodg57pMgITi+04vmUxvqlN9aiyd7f5Fgd7PeHGeOdbMz1NaJLJaPI9++
- * NakK8eK9iwT/Gdq0Uap5/CHW7vCT5PO+h3HY0STH0lWStXhdWnFO04zTdywsbSp+
- * DLpHeFT66shfeUlxR0PsCbG9vPRt/QmGLeYQZITppWo/ylSq4j+pRIuXvuWHdBRN
- * rTZ8QF4Y7AxQUXVz1j1++s6ZMHTzaK2i9HrhmDs1MbJl+QwWre3Xpv3LvTVz3k5U
- * wX8kuY1m3STt71QCaRWENq5sRaMImLxZbxc/ivFl9RAzUqo4NCxLod/QgA4iLqtO
- * ztnlpzwlC/F8HbQ1oqYWwnZAPhzU/cULtstl+Yrws2c2atO323LbPXZqbASySgig
- * sNpFXQMObdfP6LN23bY+1SvtK7V4NUTNhpdIc6INQAQ=
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICWwIBAAKBgQC78EA2rCZUTvSjWgAvaSFvuXo6k+yi9uGOx2PYLxIwmS6w8o/4
- * Jy0keCiE9wG/jUR53TvSVfPOPLJbIX3v/TNKsaP/xsibuQ98QTWX+ds6BWAFFa9Z
- * F5KjEK0WHOQHU6+odqJWKpLT+SjgeM9eH0irXBnd4WdDunWN9YKsQ5JEGwIDAQAB
- * AoGAEbdqNj0wN85hnWyEi/ObJU8UyKTdL9eaF72QGfcF/fLSxfd3vurihIeXOkGW
- * tpn4lIxYcVGM9CognhqgJpl11jFTQzn1KqZ+NEJRKkCHA4hDabKJbSC9fXHvRwrf
- * BsFpZqgiNxp3HseUTiwnaUVeyPgMt/jAj5nB5Sib+UyUxrECQQDnNQBiF2aifEg6
- * zbJOOC7he5CHAdkFxSxWVFVHL6EfXfqdLVkUohMbgZv+XxyIeU2biOExSg49Kds3
- * FOKgTau1AkEA0Bd1haj6QuCo8I0AXm2WO+MMTZMTvtHD/bGjKNM+fT4I8rKYnQRX
- * 1acHdqS9Xx2rNJqZgkMmpESIdPR2fc4yjwJALFeM6EMmqvj8/VIf5UJ/Mz14fXwM
- * PEARfckUxd9LnnFutCBTWlKvKXJVEZb6KO5ixPaegc57Jp3Vbh3yTN44lQJADD/1
- * SSMDaIB1MYP7a5Oj7m6VQNPRq8AJe5vDcRnOae0G9dKRrVyeFxO4GsHj6/+BHp2j
- * P8nYMn9eURQ7DXjf/QJAAQzMlWnKGSO8pyTDtnQx3hRMoUkOEhmNq4bQhLkYqtnY
- * FcqpUQ2qMjW+NiNWk5HnTrMS3L9EdJobMUzaNZLy4w==
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *     21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *     12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *     01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *     7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *     35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *     ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *     28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *     75:8d:f5:82:ac:43:92:44:1b
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     11:b7:6a:36:3d:30:37:ce:61:9d:6c:84:8b:f3:9b:
- *     25:4f:14:c8:a4:dd:2f:d7:9a:17:bd:90:19:f7:05:
- *     fd:f2:d2:c5:f7:77:be:ea:e2:84:87:97:3a:41:96:
- *     b6:99:f8:94:8c:58:71:51:8c:f4:2a:20:9e:1a:a0:
- *     26:99:75:d6:31:53:43:39:f5:2a:a6:7e:34:42:51:
- *     2a:40:87:03:88:43:69:b2:89:6d:20:bd:7d:71:ef:
- *     47:0a:df:06:c1:69:66:a8:22:37:1a:77:1e:c7:94:
- *     4e:2c:27:69:45:5e:c8:f8:0c:b7:f8:c0:8f:99:c1:
- *     e5:28:9b:f9:4c:94:c6:b1
- * prime1:
- *     00:e7:35:00:62:17:66:a2:7c:48:3a:cd:b2:4e:38:
- *     2e:e1:7b:90:87:01:d9:05:c5:2c:56:54:55:47:2f:
- *     a1:1f:5d:fa:9d:2d:59:14:a2:13:1b:81:9b:fe:5f:
- *     1c:88:79:4d:9b:88:e1:31:4a:0e:3d:29:db:37:14:
- *     e2:a0:4d:ab:b5
- * prime2:
- *     00:d0:17:75:85:a8:fa:42:e0:a8:f0:8d:00:5e:6d:
- *     96:3b:e3:0c:4d:93:13:be:d1:c3:fd:b1:a3:28:d3:
- *     3e:7d:3e:08:f2:b2:98:9d:04:57:d5:a7:07:76:a4:
- *     bd:5f:1d:ab:34:9a:99:82:43:26:a4:44:88:74:f4:
- *     76:7d:ce:32:8f
- * exponent1:
- *     2c:57:8c:e8:43:26:aa:f8:fc:fd:52:1f:e5:42:7f:
- *     33:3d:78:7d:7c:0c:3c:40:11:7d:c9:14:c5:df:4b:
- *     9e:71:6e:b4:20:53:5a:52:af:29:72:55:11:96:fa:
- *     28:ee:62:c4:f6:9e:81:ce:7b:26:9d:d5:6e:1d:f2:
- *     4c:de:38:95
- * exponent2:
- *     0c:3f:f5:49:23:03:68:80:75:31:83:fb:6b:93:a3:
- *     ee:6e:95:40:d3:d1:ab:c0:09:7b:9b:c3:71:19:ce:
- *     69:ed:06:f5:d2:91:ad:5c:9e:17:13:b8:1a:c1:e3:
- *     eb:ff:81:1e:9d:a3:3f:c9:d8:32:7f:5e:51:14:3b:
- *     0d:78:df:fd
- * coefficient:
- *     01:0c:cc:95:69:ca:19:23:bc:a7:24:c3:b6:74:31:
- *     de:14:4c:a1:49:0e:12:19:8d:ab:86:d0:84:b9:18:
- *     aa:d9:d8:15:ca:a9:51:0d:aa:32:35:be:36:23:56:
- *     93:91:e7:4e:b3:12:dc:bf:44:74:9a:1b:31:4c:da:
- *     35:92:f2:e3
- *
- * client certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 6 (0x6)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:27:34 2008 GMT
- *         Not After : Aug 25 03:27:34 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Client, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *                 21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *                 12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *                 01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *                 7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *                 35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *                 ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *                 28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *                 75:8d:f5:82:ac:43:92:44:1b
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             CD:BB:C8:85:AA:91:BD:FD:1D:BE:CD:67:7C:FF:B3:E9:4C:A8:22:E6
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             IP Address:127.0.0.1
- * Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICnzCCAgigAwIBAgIBBjANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzI3MzRaFw0yODA4MjUwMzI3MzRaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas
- * JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV
- * 8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq
- * ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjbjBsMAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDASBgNVHREBAf8ECDAGhwR/AAAB
- * MA0GCSqGSIb3DQEBBAUAA4GBACjj9PS+W6XOF7toFMwMOv/AemZeBOpcEF1Ei1Hx
- * HjvB6EOHkMY8tFm5OPzkiWiK3+s3awpSW0jWdzMYwrQJ3/klMsPDpI7PEuirqwHP
- * i5Wyl/vk7jmfWVcBO9MVhPUo4BYl4vS9aj6JA5QbkbkB95LOgT/BowY0WmHeVsXC
- * I9aw
- * -----END CERTIFICATE-----
- *
- *
- *
- * Trusted CA certificate:
- * Certificate:
- *   Data:
- *     Version: 3 (0x2)
- *     Serial Number: 0 (0x0)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 02:43:36 2008 GMT
- *         Not After : Aug 25 02:43:36 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:cb:c4:38:20:07:be:88:a7:93:b0:a1:43:51:2d:
- *                 d7:8e:85:af:54:dd:ad:a2:7b:23:5b:cf:99:13:53:
- *                 99:45:7d:ee:6d:ba:2d:bf:e3:ad:6e:3d:9f:1a:f9:
- *                 03:97:e0:17:55:ae:11:26:57:de:01:29:8e:05:3f:
- *                 21:f7:e7:36:e8:2e:37:d7:48:ac:53:d6:60:0e:c7:
- *                 50:6d:f6:c5:85:f7:8b:a6:c5:91:35:72:3c:94:ee:
- *                 f1:17:f0:71:e3:ec:1b:ce:ca:4e:40:42:b0:6d:ee:
- *                 6a:0e:d6:e5:ad:3c:0f:c9:ba:82:4f:78:f8:89:97:
- *                 89:2a:95:12:4c:d8:09:2a:e9
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Subject Key Identifier:
- *             FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *             DirName:/C=US/ST=Some-State/L=Some-City/O=Some-Org
- *             serial:00
- *
- *         X509v3 Basic Constraints:
- *             CA:TRUE
- *  Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
- * gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX
- * 4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj
- * 7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G
- * A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ
- * hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt
- * U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw
- * DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA
- * ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ
- * LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P
- * 6Mvf0r1PNTY2hwTJLJmKtg==
- * -----END CERTIFICATE---
+/* @test id=tls13
+ * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
+ * @library /test/lib
+ * @bug 6766775
+ * @run main/othervm IPAddressIPIdentities TLSv1.3 SHA256withRSA
+ * @author Xuelei Fan
  */
 
 
-public class IPAddressIPIdentities {
-    static Map cookies;
-    ServerSocket ss;
+
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URL;
+import jdk.test.lib.net.URIBuilder;
+import jdk.test.lib.security.SecurityUtils;
+import java.util.List;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+
+
+public class IPAddressIPIdentities extends IdentitiesBase {
 
     /*
      * =============================================================
@@ -421,211 +75,6 @@ public class IPAddressIPIdentities {
      */
     static boolean separateServerThread = true;
 
-    /*
-     * Where do we find the keystores?
-     */
-    static String trusedCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB\n" +
-        "gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX\n" +
-        "4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj\n" +
-        "7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G\n" +
-        "A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ\n" +
-        "hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt\n" +
-        "U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw\n" +
-        "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA\n" +
-        "ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ\n" +
-        "LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P\n" +
-        "6Mvf0r1PNTY2hwTJLJmKtg==\n" +
-        "-----END CERTIFICATE-----";
-
-    static String serverCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICnzCCAgigAwIBAgIBBzANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzI3NTdaFw0yODA4MjUwMzI3NTdaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3\n" +
-        "ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6\n" +
-        "YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS\n" +
-        "7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjbjBsMAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDASBgNVHREBAf8ECDAGhwR/AAAB\n" +
-        "MA0GCSqGSIb3DQEBBAUAA4GBAFJjItCtCBZcjD69wdqfIbKmRFa6eJAjR6LcoDva\n" +
-        "cKC/sDOLelpspiZ66Zb0Xdv5qQ7QrfOXt3K8QqJKRMdZLF9WfUfy0gJDM32ub91h\n" +
-        "pu+TmcGPs+6RdrAQcuvU1ZDV9X8SMj7BtKaim4d5sqFw1npncKiA5xFn8vOYwdun\n" +
-        "nZif\n" +
-        "-----END CERTIFICATE-----";
-
-    static String clientCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICnzCCAgigAwIBAgIBBjANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzI3MzRaFw0yODA4MjUwMzI3MzRaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas\n" +
-        "JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV\n" +
-        "8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq\n" +
-        "ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjbjBsMAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDASBgNVHREBAf8ECDAGhwR/AAAB\n" +
-        "MA0GCSqGSIb3DQEBBAUAA4GBACjj9PS+W6XOF7toFMwMOv/AemZeBOpcEF1Ei1Hx\n" +
-        "HjvB6EOHkMY8tFm5OPzkiWiK3+s3awpSW0jWdzMYwrQJ3/klMsPDpI7PEuirqwHP\n" +
-        "i5Wyl/vk7jmfWVcBO9MVhPUo4BYl4vS9aj6JA5QbkbkB95LOgT/BowY0WmHeVsXC\n" +
-        "I9aw\n" +
-        "-----END CERTIFICATE-----";
-
-
-    static byte serverPrivateExponent[] = {
-        (byte)0x6e, (byte)0xa7, (byte)0x1b, (byte)0x83,
-        (byte)0x51, (byte)0x35, (byte)0x9a, (byte)0x44,
-        (byte)0x7d, (byte)0xf6, (byte)0xe3, (byte)0x89,
-        (byte)0xa0, (byte)0xd7, (byte)0x90, (byte)0x60,
-        (byte)0xa1, (byte)0x4e, (byte)0x27, (byte)0x21,
-        (byte)0xa2, (byte)0x89, (byte)0x74, (byte)0xcc,
-        (byte)0x9d, (byte)0x75, (byte)0x75, (byte)0x4e,
-        (byte)0xc7, (byte)0x82, (byte)0xe3, (byte)0xe3,
-        (byte)0xc3, (byte)0x7d, (byte)0x00, (byte)0x54,
-        (byte)0xec, (byte)0x36, (byte)0xb1, (byte)0xdf,
-        (byte)0x91, (byte)0x9c, (byte)0x7a, (byte)0xc0,
-        (byte)0x62, (byte)0x0a, (byte)0xd6, (byte)0xa9,
-        (byte)0x22, (byte)0x91, (byte)0x4a, (byte)0x29,
-        (byte)0x2e, (byte)0x43, (byte)0xfa, (byte)0x8c,
-        (byte)0xd8, (byte)0xe9, (byte)0xbe, (byte)0xd9,
-        (byte)0x4f, (byte)0xca, (byte)0x23, (byte)0xc6,
-        (byte)0xe4, (byte)0x3f, (byte)0xb8, (byte)0x72,
-        (byte)0xcf, (byte)0x02, (byte)0xfc, (byte)0xf4,
-        (byte)0x58, (byte)0x34, (byte)0x77, (byte)0x76,
-        (byte)0xce, (byte)0x22, (byte)0x44, (byte)0x5f,
-        (byte)0x2d, (byte)0xca, (byte)0xee, (byte)0xf5,
-        (byte)0x43, (byte)0x56, (byte)0x47, (byte)0x71,
-        (byte)0x0b, (byte)0x09, (byte)0x6b, (byte)0x5e,
-        (byte)0xf2, (byte)0xc8, (byte)0xee, (byte)0xd4,
-        (byte)0x6e, (byte)0x44, (byte)0x92, (byte)0x2a,
-        (byte)0x7f, (byte)0xcc, (byte)0xa7, (byte)0xd4,
-        (byte)0x5b, (byte)0xfb, (byte)0xf7, (byte)0x4a,
-        (byte)0xa9, (byte)0xfb, (byte)0x54, (byte)0x18,
-        (byte)0xd5, (byte)0xd5, (byte)0x14, (byte)0xba,
-        (byte)0xa0, (byte)0x1c, (byte)0x13, (byte)0xb3,
-        (byte)0x37, (byte)0x6b, (byte)0x37, (byte)0x59,
-        (byte)0xed, (byte)0xdb, (byte)0x6d, (byte)0xb1
-    };
-
-    static byte serverModulus[] = {
-        (byte)0x00,
-        (byte)0xa5, (byte)0xac, (byte)0x5b, (byte)0x1c,
-        (byte)0x37, (byte)0xa2, (byte)0xdd, (byte)0x99,
-        (byte)0x89, (byte)0x2d, (byte)0xb2, (byte)0x79,
-        (byte)0xb8, (byte)0x8f, (byte)0xd5, (byte)0x48,
-        (byte)0xa5, (byte)0xe7, (byte)0x1c, (byte)0x84,
-        (byte)0x17, (byte)0x8d, (byte)0x69, (byte)0x9c,
-        (byte)0xc6, (byte)0xac, (byte)0x6d, (byte)0xf9,
-        (byte)0xf2, (byte)0x1d, (byte)0x1f, (byte)0x39,
-        (byte)0x19, (byte)0xda, (byte)0xd3, (byte)0x72,
-        (byte)0x1e, (byte)0x6e, (byte)0xec, (byte)0x44,
-        (byte)0xcc, (byte)0x70, (byte)0xa4, (byte)0xdc,
-        (byte)0xba, (byte)0x00, (byte)0x30, (byte)0xf6,
-        (byte)0xa0, (byte)0x4f, (byte)0x3d, (byte)0x54,
-        (byte)0x7a, (byte)0x61, (byte)0x6a, (byte)0xcc,
-        (byte)0x57, (byte)0xd0, (byte)0x0a, (byte)0x7f,
-        (byte)0x95, (byte)0x28, (byte)0x18, (byte)0x3f,
-        (byte)0x9a, (byte)0xd9, (byte)0x94, (byte)0xf2,
-        (byte)0x1b, (byte)0xc8, (byte)0x24, (byte)0x88,
-        (byte)0x7e, (byte)0xfe, (byte)0x9d, (byte)0x0f,
-        (byte)0x3d, (byte)0xfb, (byte)0x57, (byte)0x53,
-        (byte)0x08, (byte)0xb3, (byte)0x20, (byte)0x33,
-        (byte)0xd4, (byte)0x3f, (byte)0x17, (byte)0x47,
-        (byte)0x14, (byte)0xd1, (byte)0xcd, (byte)0xea,
-        (byte)0x08, (byte)0xd8, (byte)0x0e, (byte)0x75,
-        (byte)0x4e, (byte)0xaf, (byte)0xbe, (byte)0xcc,
-        (byte)0xd2, (byte)0xec, (byte)0xaf, (byte)0xa9,
-        (byte)0x7a, (byte)0x49, (byte)0xdf, (byte)0xc2,
-        (byte)0xd9, (byte)0xac, (byte)0xb8, (byte)0x24,
-        (byte)0x40, (byte)0x90, (byte)0xa6, (byte)0x03,
-        (byte)0x56, (byte)0x2a, (byte)0xd0, (byte)0x30,
-        (byte)0x05, (byte)0x40, (byte)0x2c, (byte)0x4f,
-        (byte)0xab, (byte)0xd9, (byte)0x74, (byte)0x89
-    };
-
-    static byte clientPrivateExponent[] = {
-        (byte)0x11, (byte)0xb7, (byte)0x6a, (byte)0x36,
-        (byte)0x3d, (byte)0x30, (byte)0x37, (byte)0xce,
-        (byte)0x61, (byte)0x9d, (byte)0x6c, (byte)0x84,
-        (byte)0x8b, (byte)0xf3, (byte)0x9b, (byte)0x25,
-        (byte)0x4f, (byte)0x14, (byte)0xc8, (byte)0xa4,
-        (byte)0xdd, (byte)0x2f, (byte)0xd7, (byte)0x9a,
-        (byte)0x17, (byte)0xbd, (byte)0x90, (byte)0x19,
-        (byte)0xf7, (byte)0x05, (byte)0xfd, (byte)0xf2,
-        (byte)0xd2, (byte)0xc5, (byte)0xf7, (byte)0x77,
-        (byte)0xbe, (byte)0xea, (byte)0xe2, (byte)0x84,
-        (byte)0x87, (byte)0x97, (byte)0x3a, (byte)0x41,
-        (byte)0x96, (byte)0xb6, (byte)0x99, (byte)0xf8,
-        (byte)0x94, (byte)0x8c, (byte)0x58, (byte)0x71,
-        (byte)0x51, (byte)0x8c, (byte)0xf4, (byte)0x2a,
-        (byte)0x20, (byte)0x9e, (byte)0x1a, (byte)0xa0,
-        (byte)0x26, (byte)0x99, (byte)0x75, (byte)0xd6,
-        (byte)0x31, (byte)0x53, (byte)0x43, (byte)0x39,
-        (byte)0xf5, (byte)0x2a, (byte)0xa6, (byte)0x7e,
-        (byte)0x34, (byte)0x42, (byte)0x51, (byte)0x2a,
-        (byte)0x40, (byte)0x87, (byte)0x03, (byte)0x88,
-        (byte)0x43, (byte)0x69, (byte)0xb2, (byte)0x89,
-        (byte)0x6d, (byte)0x20, (byte)0xbd, (byte)0x7d,
-        (byte)0x71, (byte)0xef, (byte)0x47, (byte)0x0a,
-        (byte)0xdf, (byte)0x06, (byte)0xc1, (byte)0x69,
-        (byte)0x66, (byte)0xa8, (byte)0x22, (byte)0x37,
-        (byte)0x1a, (byte)0x77, (byte)0x1e, (byte)0xc7,
-        (byte)0x94, (byte)0x4e, (byte)0x2c, (byte)0x27,
-        (byte)0x69, (byte)0x45, (byte)0x5e, (byte)0xc8,
-        (byte)0xf8, (byte)0x0c, (byte)0xb7, (byte)0xf8,
-        (byte)0xc0, (byte)0x8f, (byte)0x99, (byte)0xc1,
-        (byte)0xe5, (byte)0x28, (byte)0x9b, (byte)0xf9,
-        (byte)0x4c, (byte)0x94, (byte)0xc6, (byte)0xb1
-    };
-
-    static byte clientModulus[] = {
-        (byte)0x00,
-        (byte)0xbb, (byte)0xf0, (byte)0x40, (byte)0x36,
-        (byte)0xac, (byte)0x26, (byte)0x54, (byte)0x4e,
-        (byte)0xf4, (byte)0xa3, (byte)0x5a, (byte)0x00,
-        (byte)0x2f, (byte)0x69, (byte)0x21, (byte)0x6f,
-        (byte)0xb9, (byte)0x7a, (byte)0x3a, (byte)0x93,
-        (byte)0xec, (byte)0xa2, (byte)0xf6, (byte)0xe1,
-        (byte)0x8e, (byte)0xc7, (byte)0x63, (byte)0xd8,
-        (byte)0x2f, (byte)0x12, (byte)0x30, (byte)0x99,
-        (byte)0x2e, (byte)0xb0, (byte)0xf2, (byte)0x8f,
-        (byte)0xf8, (byte)0x27, (byte)0x2d, (byte)0x24,
-        (byte)0x78, (byte)0x28, (byte)0x84, (byte)0xf7,
-        (byte)0x01, (byte)0xbf, (byte)0x8d, (byte)0x44,
-        (byte)0x79, (byte)0xdd, (byte)0x3b, (byte)0xd2,
-        (byte)0x55, (byte)0xf3, (byte)0xce, (byte)0x3c,
-        (byte)0xb2, (byte)0x5b, (byte)0x21, (byte)0x7d,
-        (byte)0xef, (byte)0xfd, (byte)0x33, (byte)0x4a,
-        (byte)0xb1, (byte)0xa3, (byte)0xff, (byte)0xc6,
-        (byte)0xc8, (byte)0x9b, (byte)0xb9, (byte)0x0f,
-        (byte)0x7c, (byte)0x41, (byte)0x35, (byte)0x97,
-        (byte)0xf9, (byte)0xdb, (byte)0x3a, (byte)0x05,
-        (byte)0x60, (byte)0x05, (byte)0x15, (byte)0xaf,
-        (byte)0x59, (byte)0x17, (byte)0x92, (byte)0xa3,
-        (byte)0x10, (byte)0xad, (byte)0x16, (byte)0x1c,
-        (byte)0xe4, (byte)0x07, (byte)0x53, (byte)0xaf,
-        (byte)0xa8, (byte)0x76, (byte)0xa2, (byte)0x56,
-        (byte)0x2a, (byte)0x92, (byte)0xd3, (byte)0xf9,
-        (byte)0x28, (byte)0xe0, (byte)0x78, (byte)0xcf,
-        (byte)0x5e, (byte)0x1f, (byte)0x48, (byte)0xab,
-        (byte)0x5c, (byte)0x19, (byte)0xdd, (byte)0xe1,
-        (byte)0x67, (byte)0x43, (byte)0xba, (byte)0x75,
-        (byte)0x8d, (byte)0xf5, (byte)0x82, (byte)0xac,
-        (byte)0x43, (byte)0x92, (byte)0x44, (byte)0x1b
-    };
-
-    static char passphrase[] = "passphrase".toCharArray();
-
     /*
      * Is the server ready to serve?
      */
@@ -636,10 +85,6 @@ public class IPAddressIPIdentities {
      */
     volatile static boolean closeReady = false;
 
-    /*
-     * Turn on SSL debugging?
-     */
-    static boolean debug = false;
 
     private SSLServerSocket sslServerSocket = null;
 
@@ -650,8 +95,7 @@ public class IPAddressIPIdentities {
      * to avoid infinite hangs.
      */
     void doServerSide() throws Exception {
-        SSLContext context = getSSLContext(trusedCertStr, serverCertStr,
-            serverModulus, serverPrivateExponent, passphrase);
+        SSLContext context = getServerSSLContext();
         SSLServerSocketFactory sslssf = context.getServerSocketFactory();
 
         // doClientSide() connects to the loopback address
@@ -706,8 +150,7 @@ public class IPAddressIPIdentities {
     void doClientSide() throws Exception {
         SSLContext reservedSSLContext = SSLContext.getDefault();
         try {
-            SSLContext context = getSSLContext(trusedCertStr, clientCertStr,
-                clientModulus, clientPrivateExponent, passphrase);
+            SSLContext context = getClientSSLContext();
 
             SSLContext.setDefault(context);
 
@@ -757,11 +200,11 @@ public class IPAddressIPIdentities {
     volatile Exception clientException = null;
 
     public static void main(String args[]) throws Exception {
-        // MD5 is used in this test case, don't disable MD5 algorithm.
-        Security.setProperty("jdk.certpath.disabledAlgorithms",
-                "MD2, RSA keySize < 1024");
-        Security.setProperty("jdk.tls.disabledAlgorithms",
-                "SSLv3, RC4, DH keySize < 768");
+        if (args[1].contains("MD5")) {
+            SecurityUtils.removeFromDisabledAlgs(
+                    "jdk.certpath.disabledAlgorithms", List.of("MD5"));
+            SecurityUtils.removeFromDisabledTlsAlgs("MD5");
+        }
 
         if (debug)
             System.setProperty("javax.net.debug", "all");
@@ -769,7 +212,7 @@ public class IPAddressIPIdentities {
         /*
          * Start the tests.
          */
-        new IPAddressIPIdentities();
+        new IPAddressIPIdentities(args[0], args[1]);
     }
 
     Thread clientThread = null;
@@ -779,7 +222,9 @@ public class IPAddressIPIdentities {
      *
      * Fork off the other side, then do your work.
      */
-    IPAddressIPIdentities() throws Exception {
+    IPAddressIPIdentities(String protocol, String signatureAlg) throws Exception {
+        super(protocol, signatureAlg);
+
         if (separateServerThread) {
             startServer(true);
             startClient(false);
@@ -854,65 +299,4 @@ public class IPAddressIPIdentities {
             doClientSide();
         }
     }
-
-    // get the ssl context
-    private static SSLContext getSSLContext(String trusedCertStr,
-            String keyCertStr, byte[] modulus,
-            byte[] privateExponent, char[] passphrase) throws Exception {
-
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
-        is.close();
-
-        // create a key store
-        KeyStore ks = KeyStore.getInstance("JKS");
-        ks.load(null, null);
-
-        // import the trused cert
-        ks.setCertificateEntry("RSA Export Signer", trusedCert);
-
-        if (keyCertStr != null) {
-            // generate the private key.
-            RSAPrivateKeySpec priKeySpec = new RSAPrivateKeySpec(
-                                            new BigInteger(modulus),
-                                            new BigInteger(privateExponent));
-            KeyFactory kf = KeyFactory.getInstance("RSA");
-            RSAPrivateKey priKey =
-                    (RSAPrivateKey)kf.generatePrivate(priKeySpec);
-
-            // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
-
-            Certificate[] chain = new Certificate[2];
-            chain[0] = keyCert;
-            chain[1] = trusedCert;
-
-            // import the key entry.
-            ks.setKeyEntry("Whatever", priKey, passphrase, chain);
-        }
-
-        // create SSL context
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-        tmf.init(ks);
-
-        SSLContext ctx = SSLContext.getInstance("TLSv1.2");
-
-        if (keyCertStr != null) {
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-            kmf.init(ks, passphrase);
-
-            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } else {
-            ctx.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return ctx;
-    }
-
 }
diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
deleted file mode 100644
index 9ce71064b54..00000000000
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-//
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-//
-
-/* @test
- * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
- * @bug 6766775
- * @library /test/lib
- * @run main/othervm IPIdentities
- * @author Xuelei Fan
- */
-
-
-import java.io.PrintStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URL;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-
-import java.security.cert.Certificate;
-import java.math.BigInteger;
-import jdk.test.lib.net.URIBuilder;
-import jdk.test.lib.security.CertificateBuilder;
-import jdk.test.lib.security.CertificateBuilder.KeyUsage;
-import sun.security.x509.AuthorityKeyIdentifierExtension;
-import sun.security.x509.GeneralName;
-import sun.security.x509.GeneralNames;
-import sun.security.x509.KeyIdentifier;
-import sun.security.x509.SerialNumber;
-import sun.security.x509.X500Name;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.TrustManagerFactory;
-
-
-public class IPIdentities {
-
-    /*
-     * =============================================================
-     * Set the various variables needed for the tests, then
-     * specify what tests to run on each side.
-     */
-
-    /*
-     * Should we run the client or server in a separate thread?
-     * Both sides can throw exceptions, but do you have a preference
-     * as to which side should be the main thread.
-     */
-    static boolean separateServerThread = true;
-
-    static X509Certificate trustedCert;
-
-    static X509Certificate serverCert;
-
-    static X509Certificate clientCert;
-
-    static KeyPair serverKeys;
-    static KeyPair clientKeys;
-
-    static char passphrase[] = "passphrase".toCharArray();
-
-    /*
-     * Is the server ready to serve?
-     */
-    volatile static boolean serverReady = false;
-
-    /*
-     * Is the connection ready to close?
-     */
-    volatile static boolean closeReady = false;
-
-    /*
-     * Turn on SSL debugging?
-     */
-    static boolean debug = Boolean.getBoolean("test.debug");
-
-    private SSLServerSocket sslServerSocket = null;
-
-    /*
-     * Define the server side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
-     */
-    void doServerSide() throws Exception {
-        SSLContext context = getSSLContext(trustedCert, serverCert,
-            serverKeys, passphrase);
-        SSLServerSocketFactory sslssf = context.getServerSocketFactory();
-
-        // doClientSide() connects to the loopback address
-        InetAddress loopback = InetAddress.getLoopbackAddress();
-        InetSocketAddress address = new InetSocketAddress(loopback, serverPort);
-
-        sslServerSocket =
-            (SSLServerSocket) sslssf.createServerSocket();
-        sslServerSocket.bind(address);
-        serverPort = sslServerSocket.getLocalPort();
-
-        /*
-         * Signal Client, we're ready for his connect.
-         */
-        serverReady = true;
-
-        SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
-        sslSocket.setNeedClientAuth(true);
-
-        PrintStream out =
-                new PrintStream(sslSocket.getOutputStream());
-
-        try {
-            // ignore request data
-
-            // send the response
-            out.print("HTTP/1.1 200 OK\r\n");
-            out.print("Content-Type: text/html; charset=iso-8859-1\r\n");
-            out.print("Content-Length: "+ 9 +"\r\n");
-            out.print("\r\n");
-            out.print("Testing\r\n");
-            out.flush();
-        } finally {
-             // close the socket
-             while (!closeReady) {
-                 Thread.sleep(50);
-             }
-
-             System.out.println("Server closing socket");
-             sslSocket.close();
-             serverReady = false;
-        }
-
-    }
-
-    /*
-     * Define the client side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
-     */
-    void doClientSide() throws Exception {
-        SSLContext reservedSSLContext = SSLContext.getDefault();
-        try {
-            SSLContext context = getSSLContext(trustedCert, clientCert,
-                    clientKeys, passphrase);
-            SSLContext.setDefault(context);
-
-            /*
-             * Wait for server to get started.
-             */
-            while (!serverReady) {
-                Thread.sleep(50);
-            }
-
-            HttpsURLConnection http = null;
-
-            /* establish http connection to server */
-            URL url = URIBuilder.newBuilder()
-                .scheme("https")
-                .loopback()
-                .port(serverPort)
-                .path("/")
-                .toURL();
-            System.out.println("url is "+url.toString());
-
-            try {
-                http = (HttpsURLConnection)url.openConnection(Proxy.NO_PROXY);
-
-                int respCode = http.getResponseCode();
-                System.out.println("respCode = "+respCode);
-            } finally {
-                if (http != null) {
-                    http.disconnect();
-                }
-                closeReady = true;
-            }
-        } finally {
-            SSLContext.setDefault(reservedSSLContext);
-        }
-    }
-
-    /*
-     * =============================================================
-     * The remainder is just support stuff
-     */
-
-    // use any free port by default
-    volatile int serverPort = 0;
-
-    volatile Exception serverException = null;
-    volatile Exception clientException = null;
-
-    private static X509Certificate createTrustedCert(KeyPair caKeys) throws Exception {
-        SecureRandom random = new SecureRandom();
-
-        KeyIdentifier kid = new KeyIdentifier(caKeys.getPublic());
-        GeneralNames gns = new GeneralNames();
-        GeneralName name = new GeneralName(new X500Name(
-                "O=Some-Org, L=Some-City, ST=Some-State, C=US"));
-        gns.add(name);
-        BigInteger serialNumber = BigInteger.valueOf(random.nextLong(1000000)+1);
-        return CertificateBuilder.newCertificateBuilder(
-                "O=Some-Org, L=Some-City, ST=Some-State, C=US",
-                caKeys.getPublic(), caKeys.getPublic())
-                .setSerialNumber(serialNumber)
-                .addExtension(new AuthorityKeyIdentifierExtension(kid, gns,
-                        new SerialNumber(serialNumber)))
-                .addBasicConstraintsExt(true, true, -1)
-                .setOneHourValidity()
-                .build(null, caKeys.getPrivate(), "MD5WithRSA");
-    }
-
-    private static void setupCertificates() throws Exception {
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
-        KeyPair caKeys = kpg.generateKeyPair();
-        serverKeys = kpg.generateKeyPair();
-        clientKeys = kpg.generateKeyPair();
-
-        trustedCert = createTrustedCert(caKeys);
-        if (debug) {
-            System.out.println("----------- Trusted Cert -----------");
-            CertificateBuilder.printCertificate(trustedCert, System.out);
-        }
-
-        serverCert = CertificateBuilder.newCertificateBuilder(
-                "O=Some-Org, L=Some-City, ST=Some-State, C=US",
-                serverKeys.getPublic(), caKeys.getPublic(),
-                KeyUsage.DIGITAL_SIGNATURE, KeyUsage.NONREPUDIATION, KeyUsage.KEY_ENCIPHERMENT)
-                .addBasicConstraintsExt(false, false, -1)
-                .addExtension(CertificateBuilder.createIPSubjectAltNameExt(true, "127.0.0.1"))
-                .setOneHourValidity()
-                .build(trustedCert, caKeys.getPrivate(), "MD5WithRSA");
-        if (debug) {
-            System.out.println("----------- Server Cert -----------");
-            CertificateBuilder.printCertificate(serverCert, System.out);
-        }
-
-        clientCert = CertificateBuilder.newCertificateBuilder(
-                "CN=localhost, OU=SSL-Client, O=Some-Org, L=Some-City, ST=Some-State, C=US",
-                clientKeys.getPublic(), caKeys.getPublic(),
-                KeyUsage.DIGITAL_SIGNATURE, KeyUsage.NONREPUDIATION, KeyUsage.KEY_ENCIPHERMENT)
-                .addExtension(CertificateBuilder.createIPSubjectAltNameExt(true, "127.0.0.1"))
-                .addBasicConstraintsExt(false, false, -1)
-                .setOneHourValidity()
-                .build(trustedCert, caKeys.getPrivate(), "MD5WithRSA");
-        if (debug) {
-            System.out.println("----------- Client Cert -----------");
-            CertificateBuilder.printCertificate(clientCert, System.out);
-        }
-    }
-
-    public static void main(String args[]) throws Exception {
-        // MD5 is used in this test case, don't disable MD5 algorithm.
-        Security.setProperty("jdk.certpath.disabledAlgorithms",
-                "MD2, RSA keySize < 1024");
-        Security.setProperty("jdk.tls.disabledAlgorithms",
-                "SSLv3, RC4, DH keySize < 768");
-
-        if (debug) {
-            System.setProperty("javax.net.debug", "all");
-        }
-
-        setupCertificates();
-
-        /*
-         * Start the tests.
-         */
-        new IPIdentities();
-    }
-
-    Thread clientThread = null;
-    Thread serverThread = null;
-    /*
-     * Primary constructor, used to drive remainder of the test.
-     *
-     * Fork off the other side, then do your work.
-     */
-    IPIdentities() throws Exception {
-        if (separateServerThread) {
-            startServer(true);
-            startClient(false);
-        } else {
-            startClient(true);
-            startServer(false);
-        }
-
-        /*
-         * Wait for other side to close down.
-         */
-        if (separateServerThread) {
-            serverThread.join();
-        } else {
-            clientThread.join();
-        }
-
-        /*
-         * When we get here, the test is pretty much over.
-         *
-         * If the main thread excepted, that propagates back
-         * immediately.  If the other thread threw an exception, we
-         * should report back.
-         */
-        if (serverException != null)
-            throw serverException;
-        if (clientException != null)
-            throw clientException;
-    }
-
-    void startServer(boolean newThread) throws Exception {
-        if (newThread) {
-            serverThread = new Thread() {
-                public void run() {
-                    try {
-                        doServerSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our server thread just died.
-                         *
-                         * Release the client, if not active already...
-                         */
-                        System.err.println("Server died...");
-                        serverReady = true;
-                        serverException = e;
-                    }
-                }
-            };
-            serverThread.start();
-        } else {
-            doServerSide();
-        }
-    }
-
-    void startClient(boolean newThread) throws Exception {
-        if (newThread) {
-            clientThread = new Thread() {
-                public void run() {
-                    try {
-                        doClientSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our client thread just died.
-                         */
-                        System.err.println("Client died...");
-                        clientException = e;
-                    }
-                }
-            };
-            clientThread.start();
-        } else {
-            doClientSide();
-        }
-    }
-
-    // get the ssl context
-    private static SSLContext getSSLContext(X509Certificate trustedCert,
-            X509Certificate keyCert, KeyPair key, char[] passphrase) throws Exception {
-
-        // create a key store
-        KeyStore ks = KeyStore.getInstance("PKCS12");
-        ks.load(null, null);
-
-        // import the trused cert
-        ks.setCertificateEntry("RSA Export Signer", trustedCert);
-
-        if (keyCert != null) {
-            Certificate[] chain = new Certificate[2];
-            chain[0] = keyCert;
-            chain[1] = trustedCert;
-
-            // import the key entry.
-            ks.setKeyEntry("Whatever", key.getPrivate(), passphrase, chain);
-        }
-
-        // create SSL context
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-        tmf.init(ks);
-
-        SSLContext ctx = SSLContext.getInstance("TLSv1.2");
-
-        if (keyCert != null) {
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-            kmf.init(ks, passphrase);
-
-            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } else {
-            ctx.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return ctx;
-    }
-
-}
diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Identities.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
index 53960c05895..d7c69ba98a2 100644
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
@@ -26,386 +26,47 @@
 // system properties in samevm/agentvm mode.
 //
 
-/* @test
+/* @test id=tls12
  * @bug 6766775
  * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
- * @run main/othervm Identities
+ * @library /test/lib
+ * @run main/othervm Identities TLSv1.2 MD5withRSA
  * @author Xuelei Fan
  */
 
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import javax.net.ssl.*;
-import java.security.Security;
-import java.security.KeyStore;
-import java.security.KeyFactory;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.spec.*;
-import java.security.interfaces.*;
-import java.math.BigInteger;
 
-/*
- * Certificates and key used in the test.
- *
- * TLS server certificate:
- * server private key:
- * -----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,D9AE407F6D0E389A
- *
- * WPrA7TFol/cQCcp9oHnXWNpYlvRbbIcQj0m+RKT2Iuzfus+DHt3Zadf8nJpKfX2e
- * h2rnhlzCN9M7djRDooZKDOPCsdBn51Au7HlZF3S3Opgo7D8XFM1a8t1Je4ke14oI
- * nw6QKYsBblRziPnP2PZ0zvX24nOv7bbY8beynlJHGs00VWSFdoH2DS0aE1p6D+3n
- * ptJuJ75dVfZFK4X7162APlNXevX8D6PEQpSiRw1rjjGGcnvQ4HdWk3BxDVDcCNJb
- * Y1aGNRxsjTDvPi3R9Qx2M+W03QzEPx4SR3ZHVskeSJHaetM0TM/w/45Paq4GokXP
- * ZeTnbEx1xmjkA7h+t4doLL4watx5F6yLsJzu8xB3lt/1EtmkYtLz1t7X4BetPAXz
- * zS69X/VwhKfsOI3qXBWuL2oHPyhDmT1gcaUQwEPSV6ogHEEQEDXdiUS8heNK13KF
- * TCQYFkETvV2BLxUhV1hypPzRQ6tUpJiAbD5KmoK2lD9slshG2QtvKQq0/bgkDY5J
- * LhDHV2dtcZ3kDPkkZXpbcJQvoeH3d09C5sIsuTFo2zgNR6oETHUc5TzP6FY2YYRa
- * QcK5HcmtsRRiXFm01ac+aMejJUIujjFt84SiKWT/73vC8AmY4tYcJBLjCg4XIxSH
- * fdDFLL1YZENNO5ivlp8mdiHqcawx+36L7DrEZQ8RZt6cqST5t/+XTdM74s6k81GT
- * pNsa82P2K2zmIUZ/DL2mKjW1vfRByw1NQFEBkN3vdyZxYfM/JyUzX4hbjXBEkh9Q
- * QYrcwLKLjis2QzSvK04B3bvRzRb+4ocWiso8ZPAXAIxZFBWDpTMM2A==
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICXAIBAAKBgQClrFscN6LdmYktsnm4j9VIpecchBeNaZzGrG358h0fORna03Ie
- * buxEzHCk3LoAMPagTz1UemFqzFfQCn+VKBg/mtmU8hvIJIh+/p0PPftXUwizIDPU
- * PxdHFNHN6gjYDnVOr77M0uyvqXpJ38LZrLgkQJCmA1Yq0DAFQCxPq9l0iQIDAQAB
- * AoGAbqcbg1E1mkR99uOJoNeQYKFOJyGiiXTMnXV1TseC4+PDfQBU7Dax35GcesBi
- * CtapIpFKKS5D+ozY6b7ZT8ojxuQ/uHLPAvz0WDR3ds4iRF8tyu71Q1ZHcQsJa17y
- * yO7UbkSSKn/Mp9Rb+/dKqftUGNXVFLqgHBOzN2s3We3bbbECQQDYBPKOg3hkaGHo
- * OhpHKqtQ6EVkldihG/3i4WejRonelXN+HRh1KrB2HBx0M8D/qAzP1i3rNSlSHer4
- * 59YRTJnHAkEAxFX/sVYSn07BHv9Zhn6XXct/Cj43z/tKNbzlNbcxqQwQerw3IH51
- * 8UH2YOA+GD3lXbKp+MytoFLWv8zg4YT/LwJAfqan75Z1R6lLffRS49bIiq8jwE16
- * rTrUJ+kv8jKxMqc9B3vXkxpsS1M/+4E8bqgAmvpgAb8xcsvHsBd9ErdukQJBAKs2
- * j67W75BrPjBI34pQ1LEfp56IGWXOrq1kF8IbCjxv3+MYRT6Z6UJFkpRymNPNDjsC
- * dgUYgITiGJHUGXuw3lMCQHEHqo9ZtXz92yFT+VhsNc29B8m/sqUJdtCcMd/jGpAF
- * u6GHufjqIZBpQsk63wbwESAPZZ+kk1O1kS5GIRLX608=
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *     d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *     1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *     ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *     7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *     9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *     d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *     7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *     30:05:40:2c:4f:ab:d9:74:89
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     6e:a7:1b:83:51:35:9a:44:7d:f6:e3:89:a0:d7:90:
- *     60:a1:4e:27:21:a2:89:74:cc:9d:75:75:4e:c7:82:
- *     e3:e3:c3:7d:00:54:ec:36:b1:df:91:9c:7a:c0:62:
- *     0a:d6:a9:22:91:4a:29:2e:43:fa:8c:d8:e9:be:d9:
- *     4f:ca:23:c6:e4:3f:b8:72:cf:02:fc:f4:58:34:77:
- *     76:ce:22:44:5f:2d:ca:ee:f5:43:56:47:71:0b:09:
- *     6b:5e:f2:c8:ee:d4:6e:44:92:2a:7f:cc:a7:d4:5b:
- *     fb:f7:4a:a9:fb:54:18:d5:d5:14:ba:a0:1c:13:b3:
- *     37:6b:37:59:ed:db:6d:b1
- * prime1:
- *     00:d8:04:f2:8e:83:78:64:68:61:e8:3a:1a:47:2a:
- *     ab:50:e8:45:64:95:d8:a1:1b:fd:e2:e1:67:a3:46:
- *     89:de:95:73:7e:1d:18:75:2a:b0:76:1c:1c:74:33:
- *     c0:ff:a8:0c:cf:d6:2d:eb:35:29:52:1d:ea:f8:e7:
- *     d6:11:4c:99:c7
- * prime2:
- *     00:c4:55:ff:b1:56:12:9f:4e:c1:1e:ff:59:86:7e:
- *     97:5d:cb:7f:0a:3e:37:cf:fb:4a:35:bc:e5:35:b7:
- *     31:a9:0c:10:7a:bc:37:20:7e:75:f1:41:f6:60:e0:
- *     3e:18:3d:e5:5d:b2:a9:f8:cc:ad:a0:52:d6:bf:cc:
- *     e0:e1:84:ff:2f
- * exponent1:
- *     7e:a6:a7:ef:96:75:47:a9:4b:7d:f4:52:e3:d6:c8:
- *     8a:af:23:c0:4d:7a:ad:3a:d4:27:e9:2f:f2:32:b1:
- *     32:a7:3d:07:7b:d7:93:1a:6c:4b:53:3f:fb:81:3c:
- *     6e:a8:00:9a:fa:60:01:bf:31:72:cb:c7:b0:17:7d:
- *     12:b7:6e:91
- * exponent2:
- *     00:ab:36:8f:ae:d6:ef:90:6b:3e:30:48:df:8a:50:
- *     d4:b1:1f:a7:9e:88:19:65:ce:ae:ad:64:17:c2:1b:
- *     0a:3c:6f:df:e3:18:45:3e:99:e9:42:45:92:94:72:
- *     98:d3:cd:0e:3b:02:76:05:18:80:84:e2:18:91:d4:
- *     19:7b:b0:de:53
- * coefficient:
- *     71:07:aa:8f:59:b5:7c:fd:db:21:53:f9:58:6c:35:
- *     cd:bd:07:c9:bf:b2:a5:09:76:d0:9c:31:df:e3:1a:
- *     90:05:bb:a1:87:b9:f8:ea:21:90:69:42:c9:3a:df:
- *     06:f0:11:20:0f:65:9f:a4:93:53:b5:91:2e:46:21:
- *     12:d7:eb:4f
- *
- *
- * server certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 4 (0x4)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:21:16 2008 GMT
- *         Not After : Aug 25 03:21:16 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Server, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:a5:ac:5b:1c:37:a2:dd:99:89:2d:b2:79:b8:8f:
- *                 d5:48:a5:e7:1c:84:17:8d:69:9c:c6:ac:6d:f9:f2:
- *                 1d:1f:39:19:da:d3:72:1e:6e:ec:44:cc:70:a4:dc:
- *                 ba:00:30:f6:a0:4f:3d:54:7a:61:6a:cc:57:d0:0a:
- *                 7f:95:28:18:3f:9a:d9:94:f2:1b:c8:24:88:7e:fe:
- *                 9d:0f:3d:fb:57:53:08:b3:20:33:d4:3f:17:47:14:
- *                 d1:cd:ea:08:d8:0e:75:4e:af:be:cc:d2:ec:af:a9:
- *                 7a:49:df:c2:d9:ac:b8:24:40:90:a6:03:56:2a:d0:
- *                 30:05:40:2c:4f:ab:d9:74:89
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             ED:6E:DB:F4:B5:56:C8:FB:1A:06:61:3F:0F:08:BB:A6:04:D8:16:54
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             IP Address:127.0.0.1, DNS:localhost
- * Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICqjCCAhOgAwIBAgIBBDANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzIxMTZaFw0yODA4MjUwMzIxMTZaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3
- * ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6
- * YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS
- * 7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjeTB3MAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAdBgNVHREBAf8EEzARhwR/AAAB
- * gglsb2NhbGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAWTrftGaL73lKLgRTrChGR+F6
- * //qvs0OM94IOKVeHz36NO49cMJmhJSbKdiGIkppBgpLIBoWxZlN9NOO9oSXFYZsZ
- * rHaAe9/lWMtQM7XpjqjhWVhB5VPvWFbkorQFMtRYLf7pkonGPFq8GOO1s0TKhogC
- * jtYCdzlrU4v+om/J3H8=
- * -----END CERTIFICATE-----
- *
- *
- * TLS client certificate:
- * client private key:
- * ----BEGIN RSA PRIVATE KEY-----
- * Proc-Type: 4,ENCRYPTED
- * DEK-Info: DES-EDE3-CBC,FA2A435CD35A9390
- *
- * Z+Y2uaETbsUWIyJUyVu1UV2G4rgFYJyACZT6Tp1KjRtxflSh2kXkJ9MpuXMXA0V4
- * Yy3fDzPqCL9NJmQAYRlAx/W/+j4F5EyMWDIx8fUxzONRZyoiwF7jLm+KscAfv6Pf
- * q7ItWOdj3z7IYrwlB8YIGd3F2cDKT3S+lYRk7rKb/qT7itbuHnY4Ardh3yl+MZak
- * jBp+ELUlRsUqSr1V0LoM+0rCCykarpyfhpxEcqsrl0v9Cyi5uhU50/oKv5zql3SH
- * l2ImgDjp3batAs8+Bd4NF2aqi0a7Hy44JUHxRm4caZryU/i/D9N1MbuM6882HLat
- * 5N0G+NaIUfywa8mjwq2D5aiit18HqKA6XeRRYeJ5Dvu9DCO4GeFSwcUFIBMI0L46
- * 7s114+oDodg57pMgITi+04vmUxvqlN9aiyd7f5Fgd7PeHGeOdbMz1NaJLJaPI9++
- * NakK8eK9iwT/Gdq0Uap5/CHW7vCT5PO+h3HY0STH0lWStXhdWnFO04zTdywsbSp+
- * DLpHeFT66shfeUlxR0PsCbG9vPRt/QmGLeYQZITppWo/ylSq4j+pRIuXvuWHdBRN
- * rTZ8QF4Y7AxQUXVz1j1++s6ZMHTzaK2i9HrhmDs1MbJl+QwWre3Xpv3LvTVz3k5U
- * wX8kuY1m3STt71QCaRWENq5sRaMImLxZbxc/ivFl9RAzUqo4NCxLod/QgA4iLqtO
- * ztnlpzwlC/F8HbQ1oqYWwnZAPhzU/cULtstl+Yrws2c2atO323LbPXZqbASySgig
- * sNpFXQMObdfP6LN23bY+1SvtK7V4NUTNhpdIc6INQAQ=
- * -----END RSA PRIVATE KEY-----
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * MIICWwIBAAKBgQC78EA2rCZUTvSjWgAvaSFvuXo6k+yi9uGOx2PYLxIwmS6w8o/4
- * Jy0keCiE9wG/jUR53TvSVfPOPLJbIX3v/TNKsaP/xsibuQ98QTWX+ds6BWAFFa9Z
- * F5KjEK0WHOQHU6+odqJWKpLT+SjgeM9eH0irXBnd4WdDunWN9YKsQ5JEGwIDAQAB
- * AoGAEbdqNj0wN85hnWyEi/ObJU8UyKTdL9eaF72QGfcF/fLSxfd3vurihIeXOkGW
- * tpn4lIxYcVGM9CognhqgJpl11jFTQzn1KqZ+NEJRKkCHA4hDabKJbSC9fXHvRwrf
- * BsFpZqgiNxp3HseUTiwnaUVeyPgMt/jAj5nB5Sib+UyUxrECQQDnNQBiF2aifEg6
- * zbJOOC7he5CHAdkFxSxWVFVHL6EfXfqdLVkUohMbgZv+XxyIeU2biOExSg49Kds3
- * FOKgTau1AkEA0Bd1haj6QuCo8I0AXm2WO+MMTZMTvtHD/bGjKNM+fT4I8rKYnQRX
- * 1acHdqS9Xx2rNJqZgkMmpESIdPR2fc4yjwJALFeM6EMmqvj8/VIf5UJ/Mz14fXwM
- * PEARfckUxd9LnnFutCBTWlKvKXJVEZb6KO5ixPaegc57Jp3Vbh3yTN44lQJADD/1
- * SSMDaIB1MYP7a5Oj7m6VQNPRq8AJe5vDcRnOae0G9dKRrVyeFxO4GsHj6/+BHp2j
- * P8nYMn9eURQ7DXjf/QJAAQzMlWnKGSO8pyTDtnQx3hRMoUkOEhmNq4bQhLkYqtnY
- * FcqpUQ2qMjW+NiNWk5HnTrMS3L9EdJobMUzaNZLy4w==
- * -----END RSA PRIVATE KEY-----
- *
- * Private-Key: (1024 bit)
- * modulus:
- *     00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *     21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *     12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *     01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *     7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *     35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *     ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *     28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *     75:8d:f5:82:ac:43:92:44:1b
- * publicExponent: 65537 (0x10001)
- * privateExponent:
- *     11:b7:6a:36:3d:30:37:ce:61:9d:6c:84:8b:f3:9b:
- *     25:4f:14:c8:a4:dd:2f:d7:9a:17:bd:90:19:f7:05:
- *     fd:f2:d2:c5:f7:77:be:ea:e2:84:87:97:3a:41:96:
- *     b6:99:f8:94:8c:58:71:51:8c:f4:2a:20:9e:1a:a0:
- *     26:99:75:d6:31:53:43:39:f5:2a:a6:7e:34:42:51:
- *     2a:40:87:03:88:43:69:b2:89:6d:20:bd:7d:71:ef:
- *     47:0a:df:06:c1:69:66:a8:22:37:1a:77:1e:c7:94:
- *     4e:2c:27:69:45:5e:c8:f8:0c:b7:f8:c0:8f:99:c1:
- *     e5:28:9b:f9:4c:94:c6:b1
- * prime1:
- *     00:e7:35:00:62:17:66:a2:7c:48:3a:cd:b2:4e:38:
- *     2e:e1:7b:90:87:01:d9:05:c5:2c:56:54:55:47:2f:
- *     a1:1f:5d:fa:9d:2d:59:14:a2:13:1b:81:9b:fe:5f:
- *     1c:88:79:4d:9b:88:e1:31:4a:0e:3d:29:db:37:14:
- *     e2:a0:4d:ab:b5
- * prime2:
- *     00:d0:17:75:85:a8:fa:42:e0:a8:f0:8d:00:5e:6d:
- *     96:3b:e3:0c:4d:93:13:be:d1:c3:fd:b1:a3:28:d3:
- *     3e:7d:3e:08:f2:b2:98:9d:04:57:d5:a7:07:76:a4:
- *     bd:5f:1d:ab:34:9a:99:82:43:26:a4:44:88:74:f4:
- *     76:7d:ce:32:8f
- * exponent1:
- *     2c:57:8c:e8:43:26:aa:f8:fc:fd:52:1f:e5:42:7f:
- *     33:3d:78:7d:7c:0c:3c:40:11:7d:c9:14:c5:df:4b:
- *     9e:71:6e:b4:20:53:5a:52:af:29:72:55:11:96:fa:
- *     28:ee:62:c4:f6:9e:81:ce:7b:26:9d:d5:6e:1d:f2:
- *     4c:de:38:95
- * exponent2:
- *     0c:3f:f5:49:23:03:68:80:75:31:83:fb:6b:93:a3:
- *     ee:6e:95:40:d3:d1:ab:c0:09:7b:9b:c3:71:19:ce:
- *     69:ed:06:f5:d2:91:ad:5c:9e:17:13:b8:1a:c1:e3:
- *     eb:ff:81:1e:9d:a3:3f:c9:d8:32:7f:5e:51:14:3b:
- *     0d:78:df:fd
- * coefficient:
- *     01:0c:cc:95:69:ca:19:23:bc:a7:24:c3:b6:74:31:
- *     de:14:4c:a1:49:0e:12:19:8d:ab:86:d0:84:b9:18:
- *     aa:d9:d8:15:ca:a9:51:0d:aa:32:35:be:36:23:56:
- *     93:91:e7:4e:b3:12:dc:bf:44:74:9a:1b:31:4c:da:
- *     35:92:f2:e3
- *
- * client certificate:
- * Data:
- *     Version: 3 (0x2)
- *     Serial Number: 5 (0x5)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 03:22:10 2008 GMT
- *         Not After : Aug 25 03:22:10 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org, OU=SSL-Client, CN=localhost
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:bb:f0:40:36:ac:26:54:4e:f4:a3:5a:00:2f:69:
- *                 21:6f:b9:7a:3a:93:ec:a2:f6:e1:8e:c7:63:d8:2f:
- *                 12:30:99:2e:b0:f2:8f:f8:27:2d:24:78:28:84:f7:
- *                 01:bf:8d:44:79:dd:3b:d2:55:f3:ce:3c:b2:5b:21:
- *                 7d:ef:fd:33:4a:b1:a3:ff:c6:c8:9b:b9:0f:7c:41:
- *                 35:97:f9:db:3a:05:60:05:15:af:59:17:92:a3:10:
- *                 ad:16:1c:e4:07:53:af:a8:76:a2:56:2a:92:d3:f9:
- *                 28:e0:78:cf:5e:1f:48:ab:5c:19:dd:e1:67:43:ba:
- *                 75:8d:f5:82:ac:43:92:44:1b
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Basic Constraints:
- *             CA:FALSE
- *         X509v3 Key Usage:
- *             Digital Signature, Non Repudiation, Key Encipherment
- *         X509v3 Subject Key Identifier:
- *             CD:BB:C8:85:AA:91:BD:FD:1D:BE:CD:67:7C:FF:B3:E9:4C:A8:22:E6
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *
- *         X509v3 Subject Alternative Name: critical
- *             IP Address:127.0.0.1, DNS:localhost
- * Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICqjCCAhOgAwIBAgIBBTANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMzIyMTBaFw0yODA4MjUwMzIyMTBaMHIxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD
- * VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas
- * JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV
- * 8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq
- * ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjeTB3MAkGA1UdEwQCMAAw
- * CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV
- * HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAdBgNVHREBAf8EEzARhwR/AAAB
- * gglsb2NhbGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAwDc4f13abs9ZeEkrl5WV2Z74
- * BlmBhXu8ExtAvoF9q6Ug6xV1MDpxbD124KfUHHL0kNMhMB1WIpC0kOnQBxziNpfS
- * 7u6GOc3tWLSxw/sHoJGCefnRBllLZOoQuSBrWB8qgilL6HRmZ4UqDcXu4UCaLBZ0
- * KGDT5ASEN6Lq2GtiP4Y=
- * -----END CERTIFICATE-----
- *
- *
- *
- * Trusted CA certificate:
- * Certificate:
- *   Data:
- *     Version: 3 (0x2)
- *     Serial Number: 0 (0x0)
- *     Signature Algorithm: md5WithRSAEncryption
- *     Issuer: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Validity
- *         Not Before: Dec  8 02:43:36 2008 GMT
- *         Not After : Aug 25 02:43:36 2028 GMT
- *     Subject: C=US, ST=Some-State, L=Some-City, O=Some-Org
- *     Subject Public Key Info:
- *         Public Key Algorithm: rsaEncryption
- *         RSA Public Key: (1024 bit)
- *             Modulus (1024 bit):
- *                 00:cb:c4:38:20:07:be:88:a7:93:b0:a1:43:51:2d:
- *                 d7:8e:85:af:54:dd:ad:a2:7b:23:5b:cf:99:13:53:
- *                 99:45:7d:ee:6d:ba:2d:bf:e3:ad:6e:3d:9f:1a:f9:
- *                 03:97:e0:17:55:ae:11:26:57:de:01:29:8e:05:3f:
- *                 21:f7:e7:36:e8:2e:37:d7:48:ac:53:d6:60:0e:c7:
- *                 50:6d:f6:c5:85:f7:8b:a6:c5:91:35:72:3c:94:ee:
- *                 f1:17:f0:71:e3:ec:1b:ce:ca:4e:40:42:b0:6d:ee:
- *                 6a:0e:d6:e5:ad:3c:0f:c9:ba:82:4f:78:f8:89:97:
- *                 89:2a:95:12:4c:d8:09:2a:e9
- *             Exponent: 65537 (0x10001)
- *     X509v3 extensions:
- *         X509v3 Subject Key Identifier:
- *             FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *         X509v3 Authority Key Identifier:
- *             keyid:FA:B9:51:BF:4C:E7:D9:86:98:33:F9:E7:CB:1E:F1:33:49:F7:A8:14
- *             DirName:/C=US/ST=Some-State/L=Some-City/O=Some-Org
- *             serial:00
- *
- *         X509v3 Basic Constraints:
- *             CA:TRUE
- *  Signature Algorithm: md5WithRSAEncryption
- *
- * -----BEGIN CERTIFICATE-----
- * MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET
- * MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK
- * EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ
- * BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp
- * dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
- * gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX
- * 4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj
- * 7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G
- * A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ
- * hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt
- * U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw
- * DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA
- * ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ
- * LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P
- * 6Mvf0r1PNTY2hwTJLJmKtg==
- * -----END CERTIFICATE---
+/* @test id=tls13
+ * @bug 6766775
+ * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
+ * @library /test/lib
+ * @run main/othervm Identities TLSv1.3 SHA256withRSA
+ * @author Xuelei Fan
  */
 
+import jdk.test.lib.security.CertificateBuilder;
+import jdk.test.lib.security.SecurityUtils;
+import sun.security.x509.DNSName;
+import sun.security.x509.GeneralName;
+import sun.security.x509.GeneralNames;
+import sun.security.x509.IPAddressName;
+import sun.security.x509.SubjectAlternativeNameExtension;
 
-public class Identities {
-    static Map cookies;
-    ServerSocket ss;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.List;
+
+
+
+public class Identities extends IdentitiesBase {
     /*
      * =============================================================
      * Set the various variables needed for the tests, then
@@ -419,210 +80,6 @@ public class Identities {
      */
     static boolean separateServerThread = true;
 
-    /*
-     * Where do we find the keystores?
-     */
-    static String trusedCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICrDCCAhWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMjQzMzZaFw0yODA4MjUwMjQzMzZaMEkxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB\n" +
-        "gQDLxDggB76Ip5OwoUNRLdeOha9U3a2ieyNbz5kTU5lFfe5tui2/461uPZ8a+QOX\n" +
-        "4BdVrhEmV94BKY4FPyH35zboLjfXSKxT1mAOx1Bt9sWF94umxZE1cjyU7vEX8HHj\n" +
-        "7BvOyk5AQrBt7moO1uWtPA/JuoJPePiJl4kqlRJM2Akq6QIDAQABo4GjMIGgMB0G\n" +
-        "A1UdDgQWBBT6uVG/TOfZhpgz+efLHvEzSfeoFDBxBgNVHSMEajBogBT6uVG/TOfZ\n" +
-        "hpgz+efLHvEzSfeoFKFNpEswSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUt\n" +
-        "U3RhdGUxEjAQBgNVBAcTCVNvbWUtQ2l0eTERMA8GA1UEChMIU29tZS1PcmeCAQAw\n" +
-        "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBcIm534U123Hz+rtyYO5uA\n" +
-        "ofd81G6FnTfEAV8Kw9fGyyEbQZclBv34A9JsFKeMvU4OFIaixD7nLZ/NZ+IWbhmZ\n" +
-        "LovmJXyCkOufea73pNiZ+f/4/ScZaIlM/PRycQSqbFNd4j9Wott+08qxHPLpsf3P\n" +
-        "6Mvf0r1PNTY2hwTJLJmKtg==\n" +
-        "-----END CERTIFICATE-----";
-
-    static String serverCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICqjCCAhOgAwIBAgIBBDANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzIxMTZaFw0yODA4MjUwMzIxMTZaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtU2VydmVyMRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKWsWxw3\n" +
-        "ot2ZiS2yebiP1Uil5xyEF41pnMasbfnyHR85GdrTch5u7ETMcKTcugAw9qBPPVR6\n" +
-        "YWrMV9AKf5UoGD+a2ZTyG8gkiH7+nQ89+1dTCLMgM9Q/F0cU0c3qCNgOdU6vvszS\n" +
-        "7K+peknfwtmsuCRAkKYDVirQMAVALE+r2XSJAgMBAAGjeTB3MAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTtbtv0tVbI+xoGYT8PCLumBNgWVDAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAdBgNVHREBAf8EEzARhwR/AAAB\n" +
-        "gglsb2NhbGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAWTrftGaL73lKLgRTrChGR+F6\n" +
-        "//qvs0OM94IOKVeHz36NO49cMJmhJSbKdiGIkppBgpLIBoWxZlN9NOO9oSXFYZsZ\n" +
-        "rHaAe9/lWMtQM7XpjqjhWVhB5VPvWFbkorQFMtRYLf7pkonGPFq8GOO1s0TKhogC\n" +
-        "jtYCdzlrU4v+om/J3H8=\n" +
-        "-----END CERTIFICATE-----";
-
-    static String clientCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICqjCCAhOgAwIBAgIBBTANBgkqhkiG9w0BAQQFADBJMQswCQYDVQQGEwJVUzET\n" +
-        "MBEGA1UECBMKU29tZS1TdGF0ZTESMBAGA1UEBxMJU29tZS1DaXR5MREwDwYDVQQK\n" +
-        "EwhTb21lLU9yZzAeFw0wODEyMDgwMzIyMTBaFw0yODA4MjUwMzIyMTBaMHIxCzAJ\n" +
-        "BgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRIwEAYDVQQHEwlTb21lLUNp\n" +
-        "dHkxETAPBgNVBAoTCFNvbWUtT3JnMRMwEQYDVQQLEwpTU0wtQ2xpZW50MRIwEAYD\n" +
-        "VQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvwQDas\n" +
-        "JlRO9KNaAC9pIW+5ejqT7KL24Y7HY9gvEjCZLrDyj/gnLSR4KIT3Ab+NRHndO9JV\n" +
-        "8848slshfe/9M0qxo//GyJu5D3xBNZf52zoFYAUVr1kXkqMQrRYc5AdTr6h2olYq\n" +
-        "ktP5KOB4z14fSKtcGd3hZ0O6dY31gqxDkkQbAgMBAAGjeTB3MAkGA1UdEwQCMAAw\n" +
-        "CwYDVR0PBAQDAgXgMB0GA1UdDgQWBBTNu8iFqpG9/R2+zWd8/7PpTKgi5jAfBgNV\n" +
-        "HSMEGDAWgBT6uVG/TOfZhpgz+efLHvEzSfeoFDAdBgNVHREBAf8EEzARhwR/AAAB\n" +
-        "gglsb2NhbGhvc3QwDQYJKoZIhvcNAQEEBQADgYEAwDc4f13abs9ZeEkrl5WV2Z74\n" +
-        "BlmBhXu8ExtAvoF9q6Ug6xV1MDpxbD124KfUHHL0kNMhMB1WIpC0kOnQBxziNpfS\n" +
-        "7u6GOc3tWLSxw/sHoJGCefnRBllLZOoQuSBrWB8qgilL6HRmZ4UqDcXu4UCaLBZ0\n" +
-        "KGDT5ASEN6Lq2GtiP4Y=\n" +
-        "-----END CERTIFICATE-----";
-
-    static byte serverPrivateExponent[] = {
-        (byte)0x6e, (byte)0xa7, (byte)0x1b, (byte)0x83,
-        (byte)0x51, (byte)0x35, (byte)0x9a, (byte)0x44,
-        (byte)0x7d, (byte)0xf6, (byte)0xe3, (byte)0x89,
-        (byte)0xa0, (byte)0xd7, (byte)0x90, (byte)0x60,
-        (byte)0xa1, (byte)0x4e, (byte)0x27, (byte)0x21,
-        (byte)0xa2, (byte)0x89, (byte)0x74, (byte)0xcc,
-        (byte)0x9d, (byte)0x75, (byte)0x75, (byte)0x4e,
-        (byte)0xc7, (byte)0x82, (byte)0xe3, (byte)0xe3,
-        (byte)0xc3, (byte)0x7d, (byte)0x00, (byte)0x54,
-        (byte)0xec, (byte)0x36, (byte)0xb1, (byte)0xdf,
-        (byte)0x91, (byte)0x9c, (byte)0x7a, (byte)0xc0,
-        (byte)0x62, (byte)0x0a, (byte)0xd6, (byte)0xa9,
-        (byte)0x22, (byte)0x91, (byte)0x4a, (byte)0x29,
-        (byte)0x2e, (byte)0x43, (byte)0xfa, (byte)0x8c,
-        (byte)0xd8, (byte)0xe9, (byte)0xbe, (byte)0xd9,
-        (byte)0x4f, (byte)0xca, (byte)0x23, (byte)0xc6,
-        (byte)0xe4, (byte)0x3f, (byte)0xb8, (byte)0x72,
-        (byte)0xcf, (byte)0x02, (byte)0xfc, (byte)0xf4,
-        (byte)0x58, (byte)0x34, (byte)0x77, (byte)0x76,
-        (byte)0xce, (byte)0x22, (byte)0x44, (byte)0x5f,
-        (byte)0x2d, (byte)0xca, (byte)0xee, (byte)0xf5,
-        (byte)0x43, (byte)0x56, (byte)0x47, (byte)0x71,
-        (byte)0x0b, (byte)0x09, (byte)0x6b, (byte)0x5e,
-        (byte)0xf2, (byte)0xc8, (byte)0xee, (byte)0xd4,
-        (byte)0x6e, (byte)0x44, (byte)0x92, (byte)0x2a,
-        (byte)0x7f, (byte)0xcc, (byte)0xa7, (byte)0xd4,
-        (byte)0x5b, (byte)0xfb, (byte)0xf7, (byte)0x4a,
-        (byte)0xa9, (byte)0xfb, (byte)0x54, (byte)0x18,
-        (byte)0xd5, (byte)0xd5, (byte)0x14, (byte)0xba,
-        (byte)0xa0, (byte)0x1c, (byte)0x13, (byte)0xb3,
-        (byte)0x37, (byte)0x6b, (byte)0x37, (byte)0x59,
-        (byte)0xed, (byte)0xdb, (byte)0x6d, (byte)0xb1
-    };
-
-    static byte serverModulus[] = {
-        (byte)0x00,
-        (byte)0xa5, (byte)0xac, (byte)0x5b, (byte)0x1c,
-        (byte)0x37, (byte)0xa2, (byte)0xdd, (byte)0x99,
-        (byte)0x89, (byte)0x2d, (byte)0xb2, (byte)0x79,
-        (byte)0xb8, (byte)0x8f, (byte)0xd5, (byte)0x48,
-        (byte)0xa5, (byte)0xe7, (byte)0x1c, (byte)0x84,
-        (byte)0x17, (byte)0x8d, (byte)0x69, (byte)0x9c,
-        (byte)0xc6, (byte)0xac, (byte)0x6d, (byte)0xf9,
-        (byte)0xf2, (byte)0x1d, (byte)0x1f, (byte)0x39,
-        (byte)0x19, (byte)0xda, (byte)0xd3, (byte)0x72,
-        (byte)0x1e, (byte)0x6e, (byte)0xec, (byte)0x44,
-        (byte)0xcc, (byte)0x70, (byte)0xa4, (byte)0xdc,
-        (byte)0xba, (byte)0x00, (byte)0x30, (byte)0xf6,
-        (byte)0xa0, (byte)0x4f, (byte)0x3d, (byte)0x54,
-        (byte)0x7a, (byte)0x61, (byte)0x6a, (byte)0xcc,
-        (byte)0x57, (byte)0xd0, (byte)0x0a, (byte)0x7f,
-        (byte)0x95, (byte)0x28, (byte)0x18, (byte)0x3f,
-        (byte)0x9a, (byte)0xd9, (byte)0x94, (byte)0xf2,
-        (byte)0x1b, (byte)0xc8, (byte)0x24, (byte)0x88,
-        (byte)0x7e, (byte)0xfe, (byte)0x9d, (byte)0x0f,
-        (byte)0x3d, (byte)0xfb, (byte)0x57, (byte)0x53,
-        (byte)0x08, (byte)0xb3, (byte)0x20, (byte)0x33,
-        (byte)0xd4, (byte)0x3f, (byte)0x17, (byte)0x47,
-        (byte)0x14, (byte)0xd1, (byte)0xcd, (byte)0xea,
-        (byte)0x08, (byte)0xd8, (byte)0x0e, (byte)0x75,
-        (byte)0x4e, (byte)0xaf, (byte)0xbe, (byte)0xcc,
-        (byte)0xd2, (byte)0xec, (byte)0xaf, (byte)0xa9,
-        (byte)0x7a, (byte)0x49, (byte)0xdf, (byte)0xc2,
-        (byte)0xd9, (byte)0xac, (byte)0xb8, (byte)0x24,
-        (byte)0x40, (byte)0x90, (byte)0xa6, (byte)0x03,
-        (byte)0x56, (byte)0x2a, (byte)0xd0, (byte)0x30,
-        (byte)0x05, (byte)0x40, (byte)0x2c, (byte)0x4f,
-        (byte)0xab, (byte)0xd9, (byte)0x74, (byte)0x89
-    };
-
-    static byte clientPrivateExponent[] = {
-        (byte)0x11, (byte)0xb7, (byte)0x6a, (byte)0x36,
-        (byte)0x3d, (byte)0x30, (byte)0x37, (byte)0xce,
-        (byte)0x61, (byte)0x9d, (byte)0x6c, (byte)0x84,
-        (byte)0x8b, (byte)0xf3, (byte)0x9b, (byte)0x25,
-        (byte)0x4f, (byte)0x14, (byte)0xc8, (byte)0xa4,
-        (byte)0xdd, (byte)0x2f, (byte)0xd7, (byte)0x9a,
-        (byte)0x17, (byte)0xbd, (byte)0x90, (byte)0x19,
-        (byte)0xf7, (byte)0x05, (byte)0xfd, (byte)0xf2,
-        (byte)0xd2, (byte)0xc5, (byte)0xf7, (byte)0x77,
-        (byte)0xbe, (byte)0xea, (byte)0xe2, (byte)0x84,
-        (byte)0x87, (byte)0x97, (byte)0x3a, (byte)0x41,
-        (byte)0x96, (byte)0xb6, (byte)0x99, (byte)0xf8,
-        (byte)0x94, (byte)0x8c, (byte)0x58, (byte)0x71,
-        (byte)0x51, (byte)0x8c, (byte)0xf4, (byte)0x2a,
-        (byte)0x20, (byte)0x9e, (byte)0x1a, (byte)0xa0,
-        (byte)0x26, (byte)0x99, (byte)0x75, (byte)0xd6,
-        (byte)0x31, (byte)0x53, (byte)0x43, (byte)0x39,
-        (byte)0xf5, (byte)0x2a, (byte)0xa6, (byte)0x7e,
-        (byte)0x34, (byte)0x42, (byte)0x51, (byte)0x2a,
-        (byte)0x40, (byte)0x87, (byte)0x03, (byte)0x88,
-        (byte)0x43, (byte)0x69, (byte)0xb2, (byte)0x89,
-        (byte)0x6d, (byte)0x20, (byte)0xbd, (byte)0x7d,
-        (byte)0x71, (byte)0xef, (byte)0x47, (byte)0x0a,
-        (byte)0xdf, (byte)0x06, (byte)0xc1, (byte)0x69,
-        (byte)0x66, (byte)0xa8, (byte)0x22, (byte)0x37,
-        (byte)0x1a, (byte)0x77, (byte)0x1e, (byte)0xc7,
-        (byte)0x94, (byte)0x4e, (byte)0x2c, (byte)0x27,
-        (byte)0x69, (byte)0x45, (byte)0x5e, (byte)0xc8,
-        (byte)0xf8, (byte)0x0c, (byte)0xb7, (byte)0xf8,
-        (byte)0xc0, (byte)0x8f, (byte)0x99, (byte)0xc1,
-        (byte)0xe5, (byte)0x28, (byte)0x9b, (byte)0xf9,
-        (byte)0x4c, (byte)0x94, (byte)0xc6, (byte)0xb1
-    };
-
-    static byte clientModulus[] = {
-        (byte)0x00,
-        (byte)0xbb, (byte)0xf0, (byte)0x40, (byte)0x36,
-        (byte)0xac, (byte)0x26, (byte)0x54, (byte)0x4e,
-        (byte)0xf4, (byte)0xa3, (byte)0x5a, (byte)0x00,
-        (byte)0x2f, (byte)0x69, (byte)0x21, (byte)0x6f,
-        (byte)0xb9, (byte)0x7a, (byte)0x3a, (byte)0x93,
-        (byte)0xec, (byte)0xa2, (byte)0xf6, (byte)0xe1,
-        (byte)0x8e, (byte)0xc7, (byte)0x63, (byte)0xd8,
-        (byte)0x2f, (byte)0x12, (byte)0x30, (byte)0x99,
-        (byte)0x2e, (byte)0xb0, (byte)0xf2, (byte)0x8f,
-        (byte)0xf8, (byte)0x27, (byte)0x2d, (byte)0x24,
-        (byte)0x78, (byte)0x28, (byte)0x84, (byte)0xf7,
-        (byte)0x01, (byte)0xbf, (byte)0x8d, (byte)0x44,
-        (byte)0x79, (byte)0xdd, (byte)0x3b, (byte)0xd2,
-        (byte)0x55, (byte)0xf3, (byte)0xce, (byte)0x3c,
-        (byte)0xb2, (byte)0x5b, (byte)0x21, (byte)0x7d,
-        (byte)0xef, (byte)0xfd, (byte)0x33, (byte)0x4a,
-        (byte)0xb1, (byte)0xa3, (byte)0xff, (byte)0xc6,
-        (byte)0xc8, (byte)0x9b, (byte)0xb9, (byte)0x0f,
-        (byte)0x7c, (byte)0x41, (byte)0x35, (byte)0x97,
-        (byte)0xf9, (byte)0xdb, (byte)0x3a, (byte)0x05,
-        (byte)0x60, (byte)0x05, (byte)0x15, (byte)0xaf,
-        (byte)0x59, (byte)0x17, (byte)0x92, (byte)0xa3,
-        (byte)0x10, (byte)0xad, (byte)0x16, (byte)0x1c,
-        (byte)0xe4, (byte)0x07, (byte)0x53, (byte)0xaf,
-        (byte)0xa8, (byte)0x76, (byte)0xa2, (byte)0x56,
-        (byte)0x2a, (byte)0x92, (byte)0xd3, (byte)0xf9,
-        (byte)0x28, (byte)0xe0, (byte)0x78, (byte)0xcf,
-        (byte)0x5e, (byte)0x1f, (byte)0x48, (byte)0xab,
-        (byte)0x5c, (byte)0x19, (byte)0xdd, (byte)0xe1,
-        (byte)0x67, (byte)0x43, (byte)0xba, (byte)0x75,
-        (byte)0x8d, (byte)0xf5, (byte)0x82, (byte)0xac,
-        (byte)0x43, (byte)0x92, (byte)0x44, (byte)0x1b
-    };
-
-    static char passphrase[] = "passphrase".toCharArray();
-
     /*
      * Is the server ready to serve?
      */
@@ -633,13 +90,26 @@ public class Identities {
      */
     volatile static boolean closeReady = false;
 
-    /*
-     * Turn on SSL debugging?
-     */
-    static boolean debug = false;
 
     private SSLServerSocket sslServerSocket = null;
 
+
+    @Override
+    protected CertificateBuilder customizeServerCert(CertificateBuilder builder) throws Exception {
+        GeneralNames gns = new GeneralNames();
+        gns.add(new GeneralName(new IPAddressName("127.0.0.1")));
+        gns.add(new GeneralName(new DNSName("localhost")));
+        return builder.addExtension(new SubjectAlternativeNameExtension(true, gns));
+    }
+
+    @Override
+    protected CertificateBuilder customizeClientCert(CertificateBuilder builder) throws Exception {
+        GeneralNames gns = new GeneralNames();
+        gns.add(new GeneralName(new IPAddressName("127.0.0.1")));
+        gns.add(new GeneralName(new DNSName("localhost")));
+        return builder.addExtension(new SubjectAlternativeNameExtension(true, gns));
+    }
+
     /*
      * Define the server side of the test.
      *
@@ -647,8 +117,7 @@ public class Identities {
      * to avoid infinite hangs.
      */
     void doServerSide() throws Exception {
-        SSLContext context = getSSLContext(trusedCertStr, serverCertStr,
-            serverModulus, serverPrivateExponent, passphrase);
+        SSLContext context = getServerSSLContext();
         SSLServerSocketFactory sslssf = context.getServerSocketFactory();
 
         // doClientSide() connects to "localhost"
@@ -703,8 +172,7 @@ public class Identities {
     void doClientSide() throws Exception {
         SSLContext reservedSSLContext = SSLContext.getDefault();
         try {
-            SSLContext context = getSSLContext(trusedCertStr, clientCertStr,
-                clientModulus, clientPrivateExponent, passphrase);
+            SSLContext context = getClientSSLContext();
 
             SSLContext.setDefault(context);
 
@@ -749,19 +217,18 @@ public class Identities {
     volatile Exception clientException = null;
 
     public static void main(String args[]) throws Exception {
-        // MD5 is used in this test case, don't disable MD5 algorithm.
-        Security.setProperty("jdk.certpath.disabledAlgorithms",
-                "MD2, RSA keySize < 1024");
-        Security.setProperty("jdk.tls.disabledAlgorithms",
-                "SSLv3, RC4, DH keySize < 768");
-
+        if (args[1].contains("MD5")) {
+            SecurityUtils.removeFromDisabledAlgs(
+                    "jdk.certpath.disabledAlgorithms", List.of("MD5"));
+            SecurityUtils.removeFromDisabledTlsAlgs("MD5");
+        }
         if (debug)
             System.setProperty("javax.net.debug", "all");
 
         /*
          * Start the tests.
          */
-        new Identities();
+        new Identities(args[0], args[1]);
     }
 
     Thread clientThread = null;
@@ -771,7 +238,9 @@ public class Identities {
      *
      * Fork off the other side, then do your work.
      */
-    Identities() throws Exception {
+    Identities(String protocol, String signatureAlg) throws Exception {
+        super(protocol, signatureAlg);
+
         if (separateServerThread) {
             startServer(true);
             startClient(false);
@@ -846,65 +315,4 @@ public class Identities {
             doClientSide();
         }
     }
-
-    // get the ssl context
-    private static SSLContext getSSLContext(String trusedCertStr,
-            String keyCertStr, byte[] modulus,
-            byte[] privateExponent, char[] passphrase) throws Exception {
-
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        ByteArrayInputStream is =
-                    new ByteArrayInputStream(trusedCertStr.getBytes());
-        Certificate trusedCert = cf.generateCertificate(is);
-        is.close();
-
-        // create a key store
-        KeyStore ks = KeyStore.getInstance("JKS");
-        ks.load(null, null);
-
-        // import the trused cert
-        ks.setCertificateEntry("RSA Export Signer", trusedCert);
-
-        if (keyCertStr != null) {
-            // generate the private key.
-            RSAPrivateKeySpec priKeySpec = new RSAPrivateKeySpec(
-                                            new BigInteger(modulus),
-                                            new BigInteger(privateExponent));
-            KeyFactory kf = KeyFactory.getInstance("RSA");
-            RSAPrivateKey priKey =
-                    (RSAPrivateKey)kf.generatePrivate(priKeySpec);
-
-            // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
-
-            Certificate[] chain = new Certificate[2];
-            chain[0] = keyCert;
-            chain[1] = trusedCert;
-
-            // import the key entry.
-            ks.setKeyEntry("Whatever", priKey, passphrase, chain);
-        }
-
-        // create SSL context
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-        tmf.init(ks);
-
-        SSLContext ctx = SSLContext.getInstance("TLSv1.2");
-
-        if (keyCertStr != null) {
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-            kmf.init(ks, passphrase);
-
-            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } else {
-            ctx.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return ctx;
-    }
-
 }
diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IdentitiesBase.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IdentitiesBase.java
new file mode 100644
index 00000000000..88d3d92a8a1
--- /dev/null
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IdentitiesBase.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import jdk.test.lib.security.CertificateBuilder;
+import sun.security.x509.AuthorityKeyIdentifierExtension;
+import sun.security.x509.GeneralName;
+import sun.security.x509.GeneralNames;
+import sun.security.x509.KeyIdentifier;
+import sun.security.x509.SerialNumber;
+import sun.security.x509.X500Name;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+
+public abstract class IdentitiesBase {
+    static X509Certificate trustedCert;
+    static X509Certificate serverCert;
+    static X509Certificate clientCert;
+    static KeyPair serverKeys;
+    static KeyPair clientKeys;
+    static char[] passphrase = "passphrase".toCharArray();
+
+    protected final String protocol;
+    protected final String signatureAlg;
+
+    /*
+     * Turn on SSL debugging?
+     */
+    static boolean debug = Boolean.getBoolean("test.debug");
+
+    public IdentitiesBase(String protocol, String signatureAlg) throws Exception {
+        this.protocol = protocol;
+        this.signatureAlg = signatureAlg;
+
+        setupCertificates();
+    }
+
+    protected String getTrustedDname() {
+        return "O=Some-Org, L=Some-City, ST=Some-State, C=US";
+    }
+
+    protected String getServerDname() {
+        return "CN=localhost, OU=SSL-Server, O=Some-Org, L=Some-City, ST=Some-State, C=US";
+    }
+
+    protected String getClientDname() {
+        return "CN=localhost, OU=SSL-Client, O=Some-Org, L=Some-City, ST=Some-State, C=US";
+    }
+
+    protected CertificateBuilder customizeServerCert(CertificateBuilder builder) throws Exception {
+        return builder;
+    }
+
+    protected CertificateBuilder customizeClientCert(CertificateBuilder builder) throws Exception {
+        return builder;
+    }
+
+    private void setupCertificates() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        KeyPair caKeys = kpg.generateKeyPair();
+        serverKeys = kpg.generateKeyPair();
+        clientKeys = kpg.generateKeyPair();
+
+        trustedCert = createTrustedCert(getTrustedDname(), caKeys, signatureAlg);
+        if (debug) {
+            System.out.println("----------- Trusted Cert -----------");
+            CertificateBuilder.printCertificate(trustedCert, System.out);
+        }
+
+         CertificateBuilder builder = CertificateBuilder.newCertificateBuilder(
+                        getServerDname(),
+                        serverKeys.getPublic(), caKeys.getPublic(),
+                        CertificateBuilder.KeyUsage.DIGITAL_SIGNATURE,
+                        CertificateBuilder.KeyUsage.NONREPUDIATION,
+                        CertificateBuilder.KeyUsage.KEY_ENCIPHERMENT)
+                .addBasicConstraintsExt(false, false, -1)
+                .addExtension(CertificateBuilder.createIPSubjectAltNameExt(true, "127.0.0.1", "::1"))
+                .setOneHourValidity();
+        serverCert = customizeServerCert(builder)
+                .build(trustedCert, caKeys.getPrivate(), signatureAlg);
+        if (debug) {
+            System.out.println("----------- Server Cert -----------");
+            CertificateBuilder.printCertificate(serverCert, System.out);
+        }
+
+         builder = CertificateBuilder.newCertificateBuilder(
+                        getClientDname(),
+                        clientKeys.getPublic(), caKeys.getPublic(),
+                        CertificateBuilder.KeyUsage.DIGITAL_SIGNATURE,
+                        CertificateBuilder.KeyUsage.NONREPUDIATION,
+                        CertificateBuilder.KeyUsage.KEY_ENCIPHERMENT)
+                .addExtension(CertificateBuilder.createIPSubjectAltNameExt(true, "127.0.0.1", "::1"))
+                .addBasicConstraintsExt(false, false, -1)
+                .setOneHourValidity();
+        builder = customizeClientCert(builder);
+        clientCert = builder.build(trustedCert, caKeys.getPrivate(), signatureAlg);
+        if (debug) {
+            System.out.println("----------- Client Cert -----------");
+            CertificateBuilder.printCertificate(clientCert, System.out);
+        }
+    }
+
+    protected static X509Certificate createTrustedCert(String dname, KeyPair caKeys,
+                                                       String signatureAlgo) throws Exception {
+        SecureRandom random = new SecureRandom();
+
+        KeyIdentifier kid = new KeyIdentifier(caKeys.getPublic());
+        GeneralNames gns = new GeneralNames();
+        GeneralName name = new GeneralName(new X500Name(dname));
+        gns.add(name);
+        BigInteger serialNumber = BigInteger.valueOf(random.nextLong(1000000) + 1);
+        return CertificateBuilder.newCertificateBuilder(dname,
+                        caKeys.getPublic(), caKeys.getPublic())
+                .setSerialNumber(serialNumber)
+                .addExtension(new AuthorityKeyIdentifierExtension(kid, gns,
+                        new SerialNumber(serialNumber)))
+                .addBasicConstraintsExt(true, true, -1)
+                .setOneHourValidity()
+                .build(null, caKeys.getPrivate(), signatureAlgo);
+    }
+
+    protected SSLContext getClientSSLContext() throws Exception {
+        return getSSLContext(trustedCert, clientCert, clientKeys, passphrase);
+    }
+
+    protected SSLContext getServerSSLContext() throws Exception {
+        return getSSLContext(trustedCert, serverCert, serverKeys, passphrase);
+    }
+
+    // get the ssl context
+    private SSLContext getSSLContext(X509Certificate trustedCert,
+                   X509Certificate keyCert, KeyPair key, char[] passphrase)
+            throws Exception {
+
+        // create a key store
+        KeyStore ks = KeyStore.getInstance("PKCS12");
+        ks.load(null, null);
+
+        // import the trused cert
+        ks.setCertificateEntry("RSA Export Signer", trustedCert);
+
+        Certificate[] chain = new Certificate[2];
+        chain[0] = keyCert;
+        chain[1] = trustedCert;
+
+        // import the key entry.
+        ks.setKeyEntry("Whatever", key.getPrivate(), passphrase, chain);
+
+        // create SSL context
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        tmf.init(ks);
+
+        SSLContext ctx = SSLContext.getInstance(protocol);
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        kmf.init(ks, passphrase);
+        ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+        return ctx;
+    }
+}
diff --git a/test/lib/jdk/test/lib/security/CertificateBuilder.java b/test/lib/jdk/test/lib/security/CertificateBuilder.java
index d35a21e7ab5..6bf554c3517 100644
--- a/test/lib/jdk/test/lib/security/CertificateBuilder.java
+++ b/test/lib/jdk/test/lib/security/CertificateBuilder.java
@@ -153,22 +153,26 @@ public class CertificateBuilder {
      * @throws IOException
      */
     public static SubjectAlternativeNameExtension createDNSSubjectAltNameExt(
-            boolean critical, String dnsName) throws IOException {
+            boolean critical, String... dnsNames) throws IOException {
         GeneralNames gns = new GeneralNames();
-        gns.add(new GeneralName(new DNSName(dnsName)));
+        for (String dnsName : dnsNames) {
+            gns.add(new GeneralName(new DNSName(dnsName)));
+        }
         return new SubjectAlternativeNameExtension(critical, gns);
     }
 
     /**
      * Create a Subject Alternative Name extension for the given IP address
      * @param critical Sets the extension to critical or non-critical
-     * @param ipAddress IP address to use in the extension
+     * @param ipAddresses IP addresses to use in the extension
      * @throws IOException
      */
     public static SubjectAlternativeNameExtension createIPSubjectAltNameExt(
-            boolean critical, String ipAddress) throws IOException {
+            boolean critical, String... ipAddresses) throws IOException {
         GeneralNames gns = new GeneralNames();
-        gns.add(new GeneralName(new IPAddressName(ipAddress)));
+        for (String ip : ipAddresses) {
+            gns.add(new GeneralName(new IPAddressName(ip)));
+        }
         return new SubjectAlternativeNameExtension(critical, gns);
     }
 

From 785ca67e46c762ed0ffaeda1e26e5f90276181e8 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 1 Dec 2025 12:30:02 +0000
Subject: [PATCH 411/512] 8372409:
 java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java timed out
 during warmup

Reviewed-by: djelinski
---
 .../internal/net/http/Http3Connection.java    | 23 ++++++++++++++++++-
 .../H3MultipleConnectionsToSameHost.java      |  8 +++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java
index 17f230f3b15..6bf1b9184f8 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http3Connection.java
@@ -561,7 +561,28 @@ public final class Http3Connection implements AutoCloseable {
         if (debug.on()) debug.log("Reference h3 stream: " + streamId);
         client.client.h3StreamReference();
         exchanges.put(streamId, exchange);
-        exchange.start();
+        // It's possible that the connection will have been closed
+        // by the time we reach here.
+        // We need to double-check that the connection is still opened
+        // after having put the exchange to the exchanges map.
+        if (isOpen()) {
+            // only start the exchange if the connection is
+            // still open
+            exchange.start();
+        } else {
+            // Otherwise mark the exchange as unprocessed since we haven't
+            // sent the headers yet and the connection got closed
+            // before we started the exchange.
+            TerminationCause tc = quicConnection.terminationCause();
+            if (Log.http3()) {
+                Log.logHttp3("HTTP/3 exchange for {0}/streamId={1} unprocessed due to {2}",
+                        quicConnectionTag(), Long.toString(streamId), tc.getCloseCause());
+            }
+            exchange.exchange.markUnprocessedByPeer();
+            exchange.cancelImpl(tc.getCloseCause(),
+                    Http3Error.fromCode(tc.getCloseCode()).orElse(H3_NO_ERROR));
+        }
+        // OK to return the exchange even if already closed
         return exchange;
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
index 34d5163760f..862ccf22ddc 100644
--- a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
+++ b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
@@ -23,7 +23,7 @@
 
 /*
  * @test id=with-continuations
- * @bug 8087112
+ * @bug 8087112 8372409
  * @requires os.family != "windows" | ( os.name != "Windows 10" & os.name != "Windows Server 2016"
  *                                      & os.name != "Windows Server 2019" )
  * @library /test/lib /test/jdk/java/net/httpclient/lib
@@ -46,7 +46,7 @@
  */
 /*
  * @test id=without-continuations
- * @bug 8087112
+ * @bug 8087112 8372409
  * @requires os.family == "windows" & ( os.name == "Windows 10" | os.name == "Windows Server 2016"
  *                                     | os.name == "Windows Server 2019" )
  * @library /test/lib /test/jdk/java/net/httpclient/lib
@@ -71,7 +71,7 @@
  */
 /*
  * @test id=useNioSelector
- * @bug 8087112
+ * @bug 8087112 8372409
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.http2.Http2TestServer
@@ -96,7 +96,7 @@
  */
 /*
  * @test id=reno-cc
- * @bug 8087112
+ * @bug 8087112 8372409
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.http2.Http2TestServer

From b98114f4a20bcf3390114b56d05c38b23268979a Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 1 Dec 2025 13:28:21 +0000
Subject: [PATCH 412/512] 8365526: Crash with null Symbol passed to
 SystemDictionary::resolve_or_null

Reviewed-by: dholmes, never, jsjolen
---
 src/hotspot/share/classfile/resolutionErrors.cpp | 13 +++++++++++--
 src/hotspot/share/classfile/resolutionErrors.hpp |  7 ++-----
 src/hotspot/share/classfile/systemDictionary.cpp | 13 +++++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/classfile/resolutionErrors.cpp b/src/hotspot/share/classfile/resolutionErrors.cpp
index 25aa370d257..f5a335f17f3 100644
--- a/src/hotspot/share/classfile/resolutionErrors.cpp
+++ b/src/hotspot/share/classfile/resolutionErrors.cpp
@@ -73,7 +73,7 @@ void ResolutionErrorTable::add_entry(const constantPoolHandle& pool, int cp_inde
 
   ResolutionErrorKey key(pool(), cp_index);
   ResolutionErrorEntry *entry = new ResolutionErrorEntry(error, message, cause, cause_msg);
-  _resolution_error_table->put(key, entry);
+  _resolution_error_table->put_when_absent(key, entry);
 }
 
 // create new nest host error entry
@@ -85,7 +85,7 @@ void ResolutionErrorTable::add_entry(const constantPoolHandle& pool, int cp_inde
 
   ResolutionErrorKey key(pool(), cp_index);
   ResolutionErrorEntry *entry = new ResolutionErrorEntry(message);
-  _resolution_error_table->put(key, entry);
+  _resolution_error_table->put_when_absent(key, entry);
 }
 
 // find entry in the table
@@ -126,6 +126,15 @@ ResolutionErrorEntry::~ResolutionErrorEntry() {
   }
 }
 
+void ResolutionErrorEntry::set_nest_host_error(const char* message) {
+  // If a message is already set, free it.
+  if (nest_host_error() != nullptr) {
+    FREE_C_HEAP_ARRAY(char, _nest_host_error);
+  }
+  _nest_host_error = message;
+}
+
+
 class ResolutionErrorDeleteIterate : StackObj {
   ConstantPool* p;
 
diff --git a/src/hotspot/share/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp
index 60f8aea68ef..39859ad2b70 100644
--- a/src/hotspot/share/classfile/resolutionErrors.hpp
+++ b/src/hotspot/share/classfile/resolutionErrors.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,10 +91,7 @@ class ResolutionErrorEntry : public CHeapObj<mtClass> {
   ~ResolutionErrorEntry();
 
   // The incoming nest host error message is already in the C-Heap.
-  void set_nest_host_error(const char* message) {
-    _nest_host_error = message;
-  }
-
+  void set_nest_host_error(const char* message);
 
   Symbol*            error() const              { return _error; }
   const char*        message() const            { return _message; }
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 5c49a32b8d0..a17e7e129ce 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1864,14 +1864,19 @@ void SystemDictionary::add_nest_host_error(const constantPoolHandle& pool,
   {
     MutexLocker ml(Thread::current(), SystemDictionary_lock);
     ResolutionErrorEntry* entry = ResolutionErrorTable::find_entry(pool, which);
-    if (entry != nullptr && entry->nest_host_error() == nullptr) {
+    if (entry == nullptr) {
+      // Only add a new entry to the resolution error table if one hasn't been found for this
+      // constant pool index. In this case resolution succeeded but there's an error in this nest host
+      // that we use the table to record.
+      assert(pool->resolved_klass_at(which) != nullptr, "klass should be resolved if there is no entry");
+      ResolutionErrorTable::add_entry(pool, which, message);
+    } else {
       // An existing entry means we had a true resolution failure (LinkageError) with our nest host, but we
       // still want to add the error message for the higher-level access checks to report. We should
       // only reach here under the same error condition, so we can ignore the potential race with setting
-      // the message. If we see it is already set then we can ignore it.
+      // the message, and set it again.
+      assert(entry->nest_host_error() == nullptr || strcmp(entry->nest_host_error(), message) == 0, "should be the same message");
       entry->set_nest_host_error(message);
-    } else {
-      ResolutionErrorTable::add_entry(pool, which, message);
     }
   }
 }

From d328e4e7e2f58fbfeb661f3502f95016159d7230 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 1 Dec 2025 13:37:32 +0000
Subject: [PATCH 413/512] 8372272: Hotspot shared lib loading - add load
 attempts to Events::log

Reviewed-by: lucy, azeller
---
 src/hotspot/os/aix/os_aix.cpp         | 2 ++
 src/hotspot/os/bsd/os_bsd.cpp         | 2 ++
 src/hotspot/os/linux/os_linux.cpp     | 2 ++
 src/hotspot/os/windows/os_windows.cpp | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 48bd5e05816..7de031cac58 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1038,6 +1038,8 @@ static void* dll_load_library(const char *filename, int *eno, char *ebuf, int eb
     dflags |= RTLD_MEMBER;
   }
 
+  Events::log_dll_message(nullptr, "Attempting to load shared library %s", filename);
+
   void* result;
   const char* error_report = nullptr;
   JFR_ONLY(NativeLibraryLoadEvent load_event(filename, &result);)
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 0b37cb100f6..0889cc4cdf8 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1035,6 +1035,8 @@ void *os::Bsd::dlopen_helper(const char *filename, int mode, char *ebuf, int ebu
   int rtn = fegetenv(&default_fenv);
   assert(rtn == 0, "fegetenv must succeed");
 
+  Events::log_dll_message(nullptr, "Attempting to load shared library %s", filename);
+
   void* result;
   JFR_ONLY(NativeLibraryLoadEvent load_event(filename, &result);)
   result = ::dlopen(filename, RTLD_LAZY);
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index a1d957eb77d..cf64c22ddff 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1875,6 +1875,8 @@ void * os::Linux::dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
   assert(rtn == 0, "fegetenv must succeed");
 #endif // IA32
 
+  Events::log_dll_message(nullptr, "Attempting to load shared library %s", filename);
+
   void* result;
   JFR_ONLY(NativeLibraryLoadEvent load_event(filename, &result);)
   result = ::dlopen(filename, RTLD_LAZY);
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 8a450a291d3..b9aeb4e8dd6 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -1715,6 +1715,8 @@ static int _print_module(const char* fname, address base_address,
 // same architecture as Hotspot is running on
 void * os::dll_load(const char *name, char *ebuf, int ebuflen) {
   log_info(os)("attempting shared library load of %s", name);
+  Events::log_dll_message(nullptr, "Attempting to load shared library %s", name);
+
   void* result;
   JFR_ONLY(NativeLibraryLoadEvent load_event(name, &result);)
   result = LoadLibrary(name);

From a1cc8f4e4107e361f64cf51ff73985e471cdde03 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Mon, 1 Dec 2025 15:37:39 +0000
Subject: [PATCH 414/512] 8372444: Genshen: Optimize evacuation function

Reviewed-by: ysr, xpeng
---
 .../shenandoah/shenandoahGenerationalHeap.cpp | 71 +++++++++----------
 .../shenandoah/shenandoahGenerationalHeap.hpp |  4 +-
 .../shenandoahGenerationalHeap.inline.hpp     |  1 +
 .../gc/shenandoah/shenandoahOldGeneration.cpp |  2 +-
 .../gc/shenandoah/shenandoahOldGeneration.hpp |  2 +-
 5 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index e582ea6b189..134ae371bce 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -208,13 +208,13 @@ oop ShenandoahGenerationalHeap::evacuate_object(oop p, Thread* thread) {
 
   assert(ShenandoahThreadLocalData::is_evac_allowed(thread), "must be enclosed in oom-evac scope");
 
-  ShenandoahHeapRegion* r = heap_region_containing(p);
-  assert(!r->is_humongous(), "never evacuate humongous objects");
+  ShenandoahHeapRegion* from_region = heap_region_containing(p);
+  assert(!from_region->is_humongous(), "never evacuate humongous objects");
 
-  ShenandoahAffiliation target_gen = r->affiliation();
-  // gc_generation() can change asynchronously and should not be used here.
-  assert(active_generation() != nullptr, "Error");
-  if (active_generation()->is_young() && target_gen == YOUNG_GENERATION) {
+  // Try to keep the object in the same generation
+  const ShenandoahAffiliation target_gen = from_region->affiliation();
+
+  if (target_gen == YOUNG_GENERATION) {
     markWord mark = p->mark();
     if (mark.is_marked()) {
       // Already forwarded.
@@ -224,26 +224,31 @@ oop ShenandoahGenerationalHeap::evacuate_object(oop p, Thread* thread) {
     if (mark.has_displaced_mark_helper()) {
       // We don't want to deal with MT here just to ensure we read the right mark word.
       // Skip the potential promotion attempt for this one.
-    } else if (age_census()->is_tenurable(r->age() + mark.age())) {
-      oop result = try_evacuate_object(p, thread, r, OLD_GENERATION);
+    } else if (age_census()->is_tenurable(from_region->age() + mark.age())) {
+      // If the object is tenurable, try to promote it
+      oop result = try_evacuate_object<YOUNG_GENERATION, OLD_GENERATION>(p, thread, from_region->age());
+
+      // If we failed to promote this aged object, we'll fall through to code below and evacuate to young-gen.
       if (result != nullptr) {
         return result;
       }
-      // If we failed to promote this aged object, we'll fall through to code below and evacuate to young-gen.
     }
+    return try_evacuate_object<YOUNG_GENERATION, YOUNG_GENERATION>(p, thread, from_region->age());
   }
-  return try_evacuate_object(p, thread, r, target_gen);
+
+  assert(target_gen == OLD_GENERATION, "Expected evacuation to old");
+  return try_evacuate_object<OLD_GENERATION, OLD_GENERATION>(p, thread, from_region->age());
 }
 
 // try_evacuate_object registers the object and dirties the associated remembered set information when evacuating
 // to OLD_GENERATION.
-oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, ShenandoahHeapRegion* from_region,
-                                        ShenandoahAffiliation target_gen) {
+template<ShenandoahAffiliation FROM_GENERATION, ShenandoahAffiliation TO_GENERATION>
+oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, uint from_region_age) {
   bool alloc_from_lab = true;
   bool has_plab = false;
   HeapWord* copy = nullptr;
   size_t size = ShenandoahForwarding::size(p);
-  bool is_promotion = (target_gen == OLD_GENERATION) && from_region->is_young();
+  constexpr bool is_promotion = (TO_GENERATION == OLD_GENERATION) && (FROM_GENERATION == YOUNG_GENERATION);
 
 #ifdef ASSERT
   if (ShenandoahOOMDuringEvacALot &&
@@ -252,7 +257,7 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
   } else {
 #endif
     if (UseTLAB) {
-      switch (target_gen) {
+      switch (TO_GENERATION) {
         case YOUNG_GENERATION: {
           copy = allocate_from_gclab(thread, size);
           if ((copy == nullptr) && (size < ShenandoahThreadLocalData::gclab_size(thread))) {
@@ -300,7 +305,7 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
     if (copy == nullptr) {
       // If we failed to allocate in LAB, we'll try a shared allocation.
       if (!is_promotion || !has_plab || (size > PLAB::min_size())) {
-        ShenandoahAllocRequest req = ShenandoahAllocRequest::for_shared_gc(size, target_gen, is_promotion);
+        ShenandoahAllocRequest req = ShenandoahAllocRequest::for_shared_gc(size, TO_GENERATION, is_promotion);
         copy = allocate_memory(req);
         alloc_from_lab = false;
       }
@@ -314,8 +319,8 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
 #endif
 
   if (copy == nullptr) {
-    if (target_gen == OLD_GENERATION) {
-      if (from_region->is_young()) {
+    if (TO_GENERATION == OLD_GENERATION) {
+      if (FROM_GENERATION == YOUNG_GENERATION) {
         // Signal that promotion failed. Will evacuate this old object somewhere in young gen.
         old_generation()->handle_failed_promotion(thread, size);
         return nullptr;
@@ -327,14 +332,12 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
     }
 
     control_thread()->handle_alloc_failure_evac(size);
-
     oom_evac_handler()->handle_out_of_memory_during_evacuation();
-
     return ShenandoahBarrierSet::resolve_forwarded(p);
   }
 
   if (ShenandoahEvacTracking) {
-    evac_tracker()->begin_evacuation(thread, size * HeapWordSize, from_region->affiliation(), target_gen);
+    evac_tracker()->begin_evacuation(thread, size * HeapWordSize, FROM_GENERATION, TO_GENERATION);
   }
 
   // Copy the object:
@@ -342,8 +345,8 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
   oop copy_val = cast_to_oop(copy);
 
   // Update the age of the evacuated object
-  if (target_gen == YOUNG_GENERATION && is_aging_cycle()) {
-    ShenandoahHeap::increase_object_age(copy_val, from_region->age() + 1);
+  if (TO_GENERATION == YOUNG_GENERATION && is_aging_cycle()) {
+    increase_object_age(copy_val, from_region_age + 1);
   }
 
   // Try to install the new forwarding pointer.
@@ -360,18 +363,12 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
 
     if (ShenandoahEvacTracking) {
       // Record that the evacuation succeeded
-      evac_tracker()->end_evacuation(thread, size * HeapWordSize, from_region->affiliation(), target_gen);
+      evac_tracker()->end_evacuation(thread, size * HeapWordSize, FROM_GENERATION, TO_GENERATION);
     }
 
-    if (target_gen == OLD_GENERATION) {
-      old_generation()->handle_evacuation(copy, size, from_region->is_young());
-    } else {
-      // When copying to the old generation above, we don't care
-      // about recording object age in the census stats.
-      assert(target_gen == YOUNG_GENERATION, "Error");
+    if (TO_GENERATION == OLD_GENERATION) {
+      old_generation()->handle_evacuation(copy, size);
     }
-    shenandoah_assert_correct(nullptr, copy_val);
-    return copy_val;
   }  else {
     // Failed to evacuate. We need to deal with the object that is left behind. Since this
     // new allocation is certainly after TAMS, it will be considered live in the next cycle.
@@ -382,7 +379,7 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
       // For LAB allocations, it is enough to rollback the allocation ptr. Either the next
       // object will overwrite this stale copy, or the filler object on LAB retirement will
       // do this.
-      switch (target_gen) {
+      switch (TO_GENERATION) {
         case YOUNG_GENERATION: {
           ShenandoahThreadLocalData::gclab(thread)->undo_allocation(copy, size);
           break;
@@ -405,14 +402,16 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, Shena
       // we have to keep the fwdptr initialized and pointing to our (stale) copy.
       assert(size >= ShenandoahHeap::min_fill_size(), "previously allocated object known to be larger than min_size");
       fill_with_object(copy, size);
-      shenandoah_assert_correct(nullptr, copy_val);
-      // For non-LAB allocations, the object has already been registered
     }
-    shenandoah_assert_correct(nullptr, result);
-    return result;
   }
+  shenandoah_assert_correct(nullptr, result);
+  return result;
 }
 
+template oop ShenandoahGenerationalHeap::try_evacuate_object<YOUNG_GENERATION, YOUNG_GENERATION>(oop p, Thread* thread, uint from_region_age);
+template oop ShenandoahGenerationalHeap::try_evacuate_object<YOUNG_GENERATION, OLD_GENERATION>(oop p, Thread* thread, uint from_region_age);
+template oop ShenandoahGenerationalHeap::try_evacuate_object<OLD_GENERATION, OLD_GENERATION>(oop p, Thread* thread, uint from_region_age);
+
 inline HeapWord* ShenandoahGenerationalHeap::allocate_from_plab(Thread* thread, size_t size, bool is_promotion) {
   assert(UseTLAB, "TLABs should be enabled");
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
index ed0223dc6fd..704c8538397 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
@@ -87,7 +87,9 @@ public:
   void update_region_ages(ShenandoahMarkingContext* ctx);
 
   oop evacuate_object(oop p, Thread* thread) override;
-  oop try_evacuate_object(oop p, Thread* thread, ShenandoahHeapRegion* from_region, ShenandoahAffiliation target_gen);
+
+  template<ShenandoahAffiliation FROM_REGION, ShenandoahAffiliation TO_REGION>
+  oop try_evacuate_object(oop p, Thread* thread, uint from_region_age);
 
   // In the generational mode, we will use these two functions for young, mixed, and global collections.
   // For young and mixed, the generation argument will be the young generation, otherwise it will be the global generation.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.inline.hpp
index 8289b48185b..aa20c686bd8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.inline.hpp
@@ -34,4 +34,5 @@ inline bool ShenandoahGenerationalHeap::is_tenurable(const ShenandoahHeapRegion*
   return _age_census->is_tenurable(r->age());
 }
 
+
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHGENERATIONALHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index 338c99c7c55..838326c0288 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -619,7 +619,7 @@ void ShenandoahOldGeneration::log_failed_promotion(LogStream& ls, Thread* thread
   }
 }
 
-void ShenandoahOldGeneration::handle_evacuation(HeapWord* obj, size_t words, bool promotion) {
+void ShenandoahOldGeneration::handle_evacuation(HeapWord* obj, size_t words) const {
   // Only register the copy of the object that won the evacuation race.
   _card_scan->register_object_without_lock(obj);
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
index cd78ed4ef5e..614a1596287 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
@@ -179,7 +179,7 @@ public:
   void log_failed_promotion(LogStream& ls, Thread* thread, size_t size) const;
 
   // A successful evacuation re-dirties the cards and registers the object with the remembered set
-  void handle_evacuation(HeapWord* obj, size_t words, bool promotion);
+  void handle_evacuation(HeapWord* obj, size_t words) const;
 
   // Clear the flag after it is consumed by the control thread
   bool clear_failed_evacuation() {

From 002fff39aace870b27a9068de1662fcb0b3033a6 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 1 Dec 2025 16:57:59 +0000
Subject: [PATCH 415/512] 8220816: (fs) Files.createDirectory should make it
 more obvious that it fails when the directory already exists

Reviewed-by: alanb, jpai
---
 .../share/classes/java/nio/file/Files.java    | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java
index 80c771f5306..3f1d6fae4e4 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -203,7 +203,7 @@ public final class Files {
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
      * @throws  IOException
@@ -340,7 +340,7 @@ public final class Files {
      *          if an unsupported open option is specified or the array contains
      *          attributes that cannot be set atomically when creating the file
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          and the file is being opened for writing <i>(optional specific
      *          exception)</i>
@@ -377,7 +377,7 @@ public final class Files {
      * @throws  UnsupportedOperationException
      *          if an unsupported open option is specified
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          and the file is being opened for writing <i>(optional specific
      *          exception)</i>
@@ -575,10 +575,11 @@ public final class Files {
         Set.of(StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE);
 
     /**
-     * Creates a new and empty file, failing if the file already exists. The
-     * check for the existence of the file and the creation of the new file if
-     * it does not exist are a single operation that is atomic with respect to
-     * all other filesystem activities that might affect the directory.
+     * Creates a new and empty file, failing if {@code path} locates an existing
+     * file. The check for the existence of the file and the creation of the new
+     * file if it does not exist are a single operation that is atomic with
+     * respect to all other filesystem activities that might affect the
+     * directory.
      *
      * <p> The {@code attrs} parameter is optional {@link FileAttribute
      * file-attributes} to set atomically when creating the file. Each attribute
@@ -598,7 +599,7 @@ public final class Files {
      *          if the array contains an attribute that cannot be set atomically
      *          when creating the file
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists
+     *          if {@code path} locates an existing file
      *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs or the parent directory does not exist
@@ -611,7 +612,8 @@ public final class Files {
     }
 
     /**
-     * Creates a new directory. The check for the existence of the file and the
+     * Creates a new directory, failing if {@code dir} locates an existing
+     * file. The check for the existence of the file and the
      * creation of the directory if it does not exist are a single operation
      * that is atomic with respect to all other filesystem activities that might
      * affect the directory. The {@link #createDirectories createDirectories}
@@ -636,8 +638,8 @@ public final class Files {
      *          if the array contains an attribute that cannot be set atomically
      *          when creating the directory
      * @throws  FileAlreadyExistsException
-     *          if a directory could not otherwise be created because a file of
-     *          that name already exists <i>(optional specific exception)</i>
+     *          if {@code dir} locates an existing file
+     *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs or the parent directory does not exist
      */
@@ -676,8 +678,8 @@ public final class Files {
      *          if the array contains an attribute that cannot be set atomically
      *          when creating the directory
      * @throws  FileAlreadyExistsException
-     *          if {@code dir} exists but is not a directory <i>(optional specific
-     *          exception)</i>
+     *          if {@code dir} locates an existing file that is not a directory
+     *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
      */
@@ -930,7 +932,8 @@ public final class Files {
     }
 
     /**
-     * Creates a symbolic link to a target <i>(optional operation)</i>.
+     * Creates a symbolic link to a target, failing if {@code link} locates an
+     * existing file <i>(optional operation)</i>.
      *
      * <p> The {@code target} parameter is the target of the link. It may be an
      * {@link Path#isAbsolute absolute} or relative path and may not exist. When
@@ -964,8 +967,8 @@ public final class Files {
      *          array contains an attribute that cannot be set atomically when
      *          creating the symbolic link
      * @throws  FileAlreadyExistsException
-     *          if a file with the name already exists <i>(optional specific
-     *          exception)</i>
+     *          if {@code link} locates an existing file
+     *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
      */
@@ -978,7 +981,8 @@ public final class Files {
     }
 
     /**
-     * Creates a new link (directory entry) for an existing file <i>(optional
+     * Creates a new link (directory entry) for an existing file,
+     * failing if {@code link} locates an existing file <i>(optional
      * operation)</i>.
      *
      * <p> The {@code link} parameter locates the directory entry to create.
@@ -1007,8 +1011,8 @@ public final class Files {
      *          if the implementation does not support adding an existing file
      *          to a directory
      * @throws  FileAlreadyExistsException
-     *          if the entry could not otherwise be created because a file of
-     *          that name already exists <i>(optional specific exception)</i>
+     *          if {@code link} locates an existing file
+     *          <i>(optional specific exception)</i>
      * @throws  IOException
      *          if an I/O error occurs
      */
@@ -2711,7 +2715,7 @@ public final class Files {
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
      *
@@ -2754,7 +2758,7 @@ public final class Files {
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
      *
@@ -3161,7 +3165,7 @@ public final class Files {
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
      */
@@ -3222,7 +3226,7 @@ public final class Files {
      * @throws  UnsupportedOperationException
      *          if an unsupported option is specified
      * @throws  FileAlreadyExistsException
-     *          If a file of that name already exists and the {@link
+     *          If the path locates an existing file and the {@link
      *          StandardOpenOption#CREATE_NEW CREATE_NEW} option is specified
      *          <i>(optional specific exception)</i>
      */

From 6cb1c8f9cfcb797af788ca8fb490f388cc68f525 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Mon, 1 Dec 2025 17:29:15 +0000
Subject: [PATCH 416/512] 8371864: GaloisCounterMode.implGCMCrypt0 AVX512/AVX2
 intrinsics stubs cause AES-GCM encryption failure for certain payload sizes

Co-authored-by: Thomas Holenstein <tholenst@google.com>
Co-authored-by: Lukas Zobernig <zlukas@google.com>
Reviewed-by: shade, sviswanathan
---
 .../cpu/x86/stubGenerator_x86_64_aes.cpp      |   7 +-
 .../Cipher/AES/TestGCMSplitBound.java         | 145 ++++++++++++++++++
 2 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/com/sun/crypto/provider/Cipher/AES/TestGCMSplitBound.java

diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
index f0726ded7e5..1e728ffa279 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
@@ -3524,10 +3524,10 @@ void StubGenerator::aesgcm_avx512(Register in, Register len, Register ct, Regist
                                     false, true, false, false, false, ghashin_offset, aesout_offset, HashKey_32);
 
   ghash16_avx512(false, true, false, false, true, in, pos, avx512_subkeyHtbl, AAD_HASHx, SHUF_MASK, stack_offset, 16 * 16, 0, HashKey_16);
+  __ addl(pos, 16 * 16);
 
   __ bind(MESG_BELOW_32_BLKS);
   __ subl(len, 16 * 16);
-  __ addl(pos, 16 * 16);
   gcm_enc_dec_last_avx512(len, in, pos, AAD_HASHx, SHUF_MASK, avx512_subkeyHtbl, ghashin_offset, HashKey_16, true, true);
 
   __ bind(GHASH_DONE);
@@ -4016,13 +4016,15 @@ void StubGenerator::aesgcm_avx2(Register in, Register len, Register ct, Register
   const Register rounds = r10;
   const XMMRegister ctr_blockx = xmm9;
   const XMMRegister aad_hashx = xmm8;
-  Label encrypt_done, encrypt_by_8_new, encrypt_by_8;
+  Label encrypt_done, encrypt_by_8_new, encrypt_by_8, exit;
 
   //This routine should be called only for message sizes of 128 bytes or more.
   //Macro flow:
   //process 8 16 byte blocks in initial_num_blocks.
   //process 8 16 byte blocks at a time until all are done 'encrypt_by_8_new  followed by ghash_last_8'
   __ xorl(pos, pos);
+  __ cmpl(len, 128);
+  __ jcc(Assembler::less, exit);
 
   //Generate 8 constants for htbl
   generateHtbl_8_block_avx2(subkeyHtbl);
@@ -4090,6 +4092,7 @@ void StubGenerator::aesgcm_avx2(Register in, Register len, Register ct, Register
   __ vpxor(xmm0, xmm0, xmm0, Assembler::AVX_128bit);
   __ vpxor(xmm13, xmm13, xmm13, Assembler::AVX_128bit);
 
+  __ bind(exit);
  }
 
 #undef __
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AES/TestGCMSplitBound.java b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestGCMSplitBound.java
new file mode 100644
index 00000000000..133e68b344f
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/Cipher/AES/TestGCMSplitBound.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2025, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8371864
+ * @run main/othervm/timeout=600 TestGCMSplitBound
+ * @requires (os.simpleArch == "x64" & (vm.cpu.features ~= ".*avx2.*" |
+ *                                      vm.cpu.features ~= ".*avx512.*"))
+ * @summary Test GaloisCounterMode.implGCMCrypt0 AVX512/AVX2 intrinsics.
+ */
+
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
+import java.time.Duration;
+import java.util.Arrays;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class TestGCMSplitBound {
+
+    static final SecureRandom SECURE_RANDOM = newDefaultSecureRandom();
+
+    private static SecureRandom newDefaultSecureRandom() {
+        SecureRandom retval = new SecureRandom();
+        retval.nextLong(); // force seeding
+        return retval;
+    }
+
+    private static byte[] randBytes(int size) {
+        byte[] rand = new byte[size];
+        SECURE_RANDOM.nextBytes(rand);
+        return rand;
+    }
+
+    private static final int IV_SIZE_IN_BYTES = 12;
+    private static final int TAG_SIZE_IN_BYTES = 16;
+
+    private Cipher getCipher(final byte[] key, final byte[] aad,
+                             final byte[] nonce, int mode)
+        throws Exception {
+        SecretKey keySpec = new SecretKeySpec(key, "AES");
+        AlgorithmParameterSpec params =
+            new GCMParameterSpec(8 * TAG_SIZE_IN_BYTES, nonce, 0, nonce.length);
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(mode, keySpec, params);
+        if (aad != null && aad.length != 0) {
+            cipher.updateAAD(aad);
+        }
+        return cipher;
+    }
+
+    private byte[] gcmEncrypt(final byte[] key, final byte[] plaintext,
+                              final byte[] aad)
+        throws Exception {
+        byte[] nonce = randBytes(IV_SIZE_IN_BYTES);
+        Cipher cipher = getCipher(key, aad, nonce, Cipher.ENCRYPT_MODE);
+        int outputSize = cipher.getOutputSize(plaintext.length);
+        int len = IV_SIZE_IN_BYTES + outputSize;
+        byte[] output = new byte[len];
+        System.arraycopy(nonce, 0, output, 0, IV_SIZE_IN_BYTES);
+        cipher.doFinal(plaintext, 0, plaintext.length, output,
+                       IV_SIZE_IN_BYTES);
+        return output;
+    }
+
+    private byte[] gcmDecrypt(final byte[] key, final byte[] ciphertext,
+                              final byte[] aad)
+        throws Exception {
+        byte[] nonce = new byte[IV_SIZE_IN_BYTES];
+        System.arraycopy(ciphertext, 0, nonce, 0, IV_SIZE_IN_BYTES);
+        Cipher cipher = getCipher(key, aad, nonce, Cipher.DECRYPT_MODE);
+        return cipher.doFinal(ciphertext, IV_SIZE_IN_BYTES,
+                              ciphertext.length - IV_SIZE_IN_BYTES);
+    }
+
+    // x86-64 parallel intrinsic data size
+    private static final int PARALLEL_LEN = 512;
+    // max data size for x86-64 intrinsic
+    private static final int SPLIT_LEN = 1048576; // 1MB
+
+    private void encryptAndDecrypt(byte[] key, byte[] aad, byte[] message,
+                                   int messageSize)
+        throws Exception {
+        byte[] ciphertext = gcmEncrypt(key, message, aad);
+        byte[] decrypted = gcmDecrypt(key, ciphertext, aad);
+        if (ciphertext == null) {
+            throw new RuntimeException("ciphertext is null");
+        }
+        if (Arrays.compare(decrypted, 0, messageSize,
+                           message, 0, messageSize) != 0) {
+            throw new RuntimeException(
+                 "Decrypted message is different from the original message");
+        }
+    }
+
+    private void run() throws Exception {
+        byte[] aad = randBytes(20);
+        byte[] key = randBytes(16);
+        // Force JIT.
+        for (int i = 0; i < 100000; i++) {
+            byte[] message = randBytes(PARALLEL_LEN);
+            encryptAndDecrypt(key, aad, message, PARALLEL_LEN);
+        }
+        for (int messageSize = SPLIT_LEN - 300; messageSize <= SPLIT_LEN + 300;
+                                                messageSize++) {
+            byte[] message = randBytes(messageSize);
+            try {
+                encryptAndDecrypt(key, aad, message, messageSize);
+            } catch (Exception e) {
+                throw new RuntimeException("Failed for messageSize "
+                        + Integer.toHexString(messageSize), e);
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        TestGCMSplitBound test = new TestGCMSplitBound();
+        for (int i = 0; i < 3; i++) {
+            test.run();
+        }
+    }
+}

From 45c0600d3abfa4bcd0338840523c0df69283afe2 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 1 Dec 2025 18:17:00 +0000
Subject: [PATCH 417/512] 8372609: Bug4944439 does not enforce locale correctly

Reviewed-by: liach, jpai
---
 .../text/Format/NumberFormat/Bug4944439.java  | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/test/jdk/java/text/Format/NumberFormat/Bug4944439.java b/test/jdk/java/text/Format/NumberFormat/Bug4944439.java
index 561052e9a95..a13a36733e2 100644
--- a/test/jdk/java/text/Format/NumberFormat/Bug4944439.java
+++ b/test/jdk/java/text/Format/NumberFormat/Bug4944439.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,22 +23,19 @@
 
 /*
  * @test
- * @bug 4944439
+ * @bug 4944439 8372609
  * @summary Confirm that numbers where all digits after the decimal separator are 0
  *          and which are between Long.MIN_VALUE and Long.MAX_VALUE are returned
  *          as Long(not double).
  * @run junit Bug4944439
  */
 
-import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -47,21 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 public class Bug4944439 {
 
-    // Save JVM default locale
-    private static final Locale savedLocale = Locale.getDefault();
-    private static final DecimalFormat df = new DecimalFormat();
-
-    // Set JVM default locale to US for testing
-    @BeforeAll
-    static void initAll() {
-        Locale.setDefault(Locale.US);
-    }
-
-    // Restore JVM default locale
-    @AfterAll
-    static void tearDownAll() {
-        Locale.setDefault(savedLocale);
-    }
+    private static final NumberFormat df = NumberFormat.getInstance(Locale.US);
 
     // Check return type and value returned by DecimalFormat.parse() for longs
     @ParameterizedTest

From 79e99bb0778608733a677821a0bb35041e9fb939 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Mon, 1 Dec 2025 18:30:38 +0000
Subject: [PATCH 418/512] 8372566: Genshen: crash at
 ShenandoahScanRemembered::process_clusters after JDK-8371667

Reviewed-by: wkemper, kdnilsen, ysr
---
 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 22a59b5ac18..5c4d10ca8a5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1015,7 +1015,7 @@ HeapWord* ShenandoahHeap::allocate_memory_under_lock(ShenandoahAllocRequest& req
   // Record the plab configuration for this result and register the object.
   if (result != nullptr && req.is_old()) {
     old_generation()->configure_plab_for_current_thread(req);
-    if (req.type() == ShenandoahAllocRequest::_alloc_shared_gc) {
+    if (!req.is_lab_alloc()) {
       // Register the newly allocated object while we're holding the global lock since there's no synchronization
       // built in to the implementation of register_object().  There are potential races when multiple independent
       // threads are allocating objects, some of which might span the same card region.  For example, consider

From 84ffe87260753973835ea6b88443e28bcaf0122f Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 2 Dec 2025 08:38:22 +0000
Subject: [PATCH 419/512] 8342175: MemoryEaterMT fails intermittently with
 ExceptionInInitializerError

Reviewed-by: lmesnik, aboldtch
---
 test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java
index 6b33783306f..15bbc9eb964 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java
@@ -48,6 +48,9 @@ public class GC extends nsk.share.test.Tests {
 
                 public GCTestRunner(Test test, String[] args) {
                         super(test, args);
+                        // GC tests often run at the brink of OOME, make sure
+                        // LocalRandom is loaded, initialized, and has enough memory.
+                        LocalRandom.init();
                 }
 
                 private GCParams getGCParams(String[] args) {

From 7278d2e8e5835f090672f7625d391a1b4c1a6626 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 2 Dec 2025 09:39:29 +0000
Subject: [PATCH 420/512] 8372258: Improve TypeVariable support

Reviewed-by: liach
---
 .../java/lang/reflect/TypeVariable.java       |  4 +-
 .../reflectiveObjects/TypeVariableImpl.java   | 16 +++--
 ...otectInnerStateOfTypeVariableImplTest.java | 70 +++++++++++++++++++
 3 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/java/lang/reflect/Generics/ProtectInnerStateOfTypeVariableImplTest.java

diff --git a/src/java.base/share/classes/java/lang/reflect/TypeVariable.java b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
index 01746e34385..85e99fd3f92 100644
--- a/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
+++ b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ public interface TypeVariable<D extends GenericDeclaration> extends Type, Annota
     Type[] getBounds();
 
     /**
-     * Returns the {@code GenericDeclaration} object representing the
+     * Returns a {@code GenericDeclaration} object representing the
      * generic declaration declared for this type variable.
      *
      * @return the generic declaration declared for this type variable.
diff --git a/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
index 75750d38f2f..560e9a4f7c9 100644
--- a/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
+++ b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import java.lang.reflect.TypeVariable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
+
+import jdk.internal.reflect.ReflectionFactory;
 import sun.reflect.annotation.AnnotationSupport;
 import sun.reflect.annotation.TypeAnnotationParser;
 import sun.reflect.annotation.AnnotationType;
@@ -125,18 +127,24 @@ public class TypeVariableImpl<D extends GenericDeclaration>
     }
 
     /**
-     * Returns the {@code GenericDeclaration} object representing the
+     * Returns a {@code GenericDeclaration} object representing the
      * generic declaration that declared this type variable.
      *
-     * @return the generic declaration that declared this type variable.
+     * @return a generic declaration that declared this type variable.
      *
      * @since 1.5
      */
+    @SuppressWarnings("unchecked")
     public D getGenericDeclaration() {
         assert genericDeclaration instanceof Class<?> ||
                 genericDeclaration instanceof Method ||
                 genericDeclaration instanceof Constructor : "Unexpected kind of GenericDeclaration";
-        return genericDeclaration;
+        // If the `genericDeclaration` instance is mutable, we need to make a copy.
+        return switch (genericDeclaration) {
+            case Method method       -> (D) ReflectionFactory.getReflectionFactory().copyMethod(method);
+            case Constructor<?> ctor -> (D) ReflectionFactory.getReflectionFactory().copyConstructor(ctor);
+            default -> genericDeclaration;
+        };
     }
 
 
diff --git a/test/jdk/java/lang/reflect/Generics/ProtectInnerStateOfTypeVariableImplTest.java b/test/jdk/java/lang/reflect/Generics/ProtectInnerStateOfTypeVariableImplTest.java
new file mode 100644
index 00000000000..05a2a8e84de
--- /dev/null
+++ b/test/jdk/java/lang/reflect/Generics/ProtectInnerStateOfTypeVariableImplTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8372258
+ * @summary Test if a copy of the internal state is provided
+ * @run junit ProtectInnerStateOfTypeVariableImplTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.TypeVariable;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class ProtectInnerStateOfTypeVariableImplTest {
+
+    static final class Foo {
+        public <X> Foo() {
+        }
+
+        <X> X x() {
+            return null;
+        }
+    }
+
+    @Test
+    void testMethod() throws NoSuchMethodException {
+        Method method = Foo.class.getDeclaredMethod("x");
+        TypeVariable<Method> tv = method.getTypeParameters()[0];
+
+        Method gd = tv.getGenericDeclaration();
+        Method gd2 = tv.getGenericDeclaration();
+        assertNotSame(gd, gd2);
+    }
+
+    @Test
+    void testConstructor() throws NoSuchMethodException {
+        Constructor<?> ctor = Foo.class.getConstructor();
+        TypeVariable<? extends Constructor<?>> tv = ctor.getTypeParameters()[0];
+
+        Constructor<?> gd = tv.getGenericDeclaration();
+        Constructor<?> gd2 = tv.getGenericDeclaration();
+        assertNotSame(gd, gd2);
+    }
+
+}

From f636fcadd72eba7aefbf3f89777c14b3e3f19fb8 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 2 Dec 2025 10:58:44 +0000
Subject: [PATCH 421/512] 8372645: ParallelGC: Remove race between allocation
 and expansion before is_init_completed

Reviewed-by: ayang, sjohanss, eosterlund
---
 .../gc/parallel/parallelScavengeHeap.cpp      | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 3a13d0d0535..4d291120e4a 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -307,9 +307,13 @@ HeapWord* ParallelScavengeHeap::mem_allocate_cas_noexpand(size_t size, bool is_t
 
 HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size, bool is_tlab) {
   for (uint loop_count = 0; /* empty */; ++loop_count) {
-    HeapWord* result = mem_allocate_cas_noexpand(size, is_tlab);
-    if (result != nullptr) {
-      return result;
+    HeapWord* result;
+    {
+      ConditionalMutexLocker locker(Heap_lock, !is_init_completed());
+      result = mem_allocate_cas_noexpand(size, is_tlab);
+      if (result != nullptr) {
+        return result;
+      }
     }
 
     // Read total_collections() under the lock so that multiple
@@ -326,10 +330,15 @@ HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size, bool is_tlab) {
       }
 
       if (!is_init_completed()) {
-        // Can't do GC; try heap expansion to satisfy the request.
-        result = expand_heap_and_allocate(size, is_tlab);
-        if (result != nullptr) {
-          return result;
+        // Double checked locking, this ensure that is_init_completed() does not
+        // transition while expanding the heap.
+        MonitorLocker ml(InitCompleted_lock, Monitor::_no_safepoint_check_flag);
+        if (!is_init_completed()) {
+          // Can't do GC; try heap expansion to satisfy the request.
+          result = expand_heap_and_allocate(size, is_tlab);
+          if (result != nullptr) {
+            return result;
+          }
         }
       }
 

From e27abe8a979880f308c69ea53319565dcd2142b6 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 2 Dec 2025 10:59:04 +0000
Subject: [PATCH 422/512] 8372540: SerialGC: Remove race between allocation and
 expansion before is_init_completed

Reviewed-by: ayang, sjohanss, eosterlund
---
 src/hotspot/share/gc/serial/serialHeap.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 03ad1282f5f..faef3b89125 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -304,9 +304,12 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size, bool is_tlab) {
   HeapWord* result = nullptr;
 
   for (uint try_count = 1; /* break */; try_count++) {
-    result = mem_allocate_cas_noexpand(size, is_tlab);
-    if (result != nullptr) {
-      break;
+    {
+      ConditionalMutexLocker locker(Heap_lock, !is_init_completed());
+      result = mem_allocate_cas_noexpand(size, is_tlab);
+      if (result != nullptr) {
+        break;
+      }
     }
     uint gc_count_before;  // Read inside the Heap_lock locked region.
     {
@@ -320,10 +323,15 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size, bool is_tlab) {
       }
 
       if (!is_init_completed()) {
-        // Can't do GC; try heap expansion to satisfy the request.
-        result = expand_heap_and_allocate(size, is_tlab);
-        if (result != nullptr) {
-          return result;
+        // Double checked locking, this ensure that is_init_completed() does not
+        // transition while expanding the heap.
+        MonitorLocker ml(InitCompleted_lock, Monitor::_no_safepoint_check_flag);
+        if (!is_init_completed()) {
+          // Can't do GC; try heap expansion to satisfy the request.
+          result = expand_heap_and_allocate(size, is_tlab);
+          if (result != nullptr) {
+            return result;
+          }
         }
       }
 

From 3f046f6dec72392d0693655c0f0ef9189529ce45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 2 Dec 2025 11:56:22 +0000
Subject: [PATCH 423/512] 8372747: G1: Conservative heap alignment does not
 account for card table constraint

Reviewed-by: mdoerr, stefank, tschatzl, sjohanss
---
 src/hotspot/share/gc/g1/g1Arguments.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Arguments.cpp b/src/hotspot/share/gc/g1/g1Arguments.cpp
index 5cbafd2ae94..2be0e008c22 100644
--- a/src/hotspot/share/gc/g1/g1Arguments.cpp
+++ b/src/hotspot/share/gc/g1/g1Arguments.cpp
@@ -77,10 +77,11 @@ void G1Arguments::initialize_alignments() {
 }
 
 size_t G1Arguments::conservative_max_heap_alignment() {
-  if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
-    return G1HeapRegion::max_ergonomics_size();
-  }
-  return G1HeapRegion::max_region_size();
+  const size_t region_size = FLAG_IS_DEFAULT(G1HeapRegionSize)
+                           ? G1HeapRegion::max_ergonomics_size()
+                           : G1HeapRegion::max_region_size();
+
+  return calculate_heap_alignment(region_size);
 }
 
 void G1Arguments::initialize_verification_types() {

From fd7283be47489d3297aac6ecf6658ee9500b2891 Mon Sep 17 00:00:00 2001
From: Doug Lea <dl@openjdk.org>
Date: Tue, 2 Dec 2025 12:05:31 +0000
Subject: [PATCH 424/512] 8360046: Scalability issue when submitting virtual
 threads with almost empty tasks

Reviewed-by: vklang
---
 .../classes/java/lang/VirtualThread.java      |  18 +-
 .../java/util/concurrent/ForkJoinPool.java    | 632 +++++++++---------
 .../util/concurrent/forkjoin/Starvation.java  |  20 +-
 3 files changed, 341 insertions(+), 329 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 6064b46d50a..51543f835c1 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -315,6 +315,18 @@ final class VirtualThread extends BaseVirtualThread {
         }
     }
 
+    /**
+     * Submits the given task to the given executor. If the scheduler is a
+     * ForkJoinPool then the task is first adapted to a ForkJoinTask.
+     */
+    private void submit(Executor executor, Runnable task) {
+        if (executor instanceof ForkJoinPool pool) {
+            pool.submit(ForkJoinTask.adapt(task));
+        } else {
+            executor.execute(task);
+        }
+    }
+
     /**
      * Submits the runContinuation task to the scheduler. For the default scheduler,
      * and calling it on a worker thread, the task will be pushed to the local queue,
@@ -335,12 +347,12 @@ final class VirtualThread extends BaseVirtualThread {
                 if (currentThread().isVirtual()) {
                     Continuation.pin();
                     try {
-                        scheduler.execute(runContinuation);
+                        submit(scheduler, runContinuation);
                     } finally {
                         Continuation.unpin();
                     }
                 } else {
-                    scheduler.execute(runContinuation);
+                    submit(scheduler, runContinuation);
                 }
                 done = true;
             } catch (RejectedExecutionException ree) {
@@ -1536,4 +1548,4 @@ final class VirtualThread extends BaseVirtualThread {
         unblocker.setDaemon(true);
         unblocker.start();
     }
-}
\ No newline at end of file
+}
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
index 1f2c8d2ffa6..f289186e0ad 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -560,89 +560,70 @@ public class ForkJoinPool extends AbstractExecutorService
      * access (which is usually needed anyway).
      *
      * Signalling. Signals (in signalWork) cause new or reactivated
-     * workers to scan for tasks.  Method signalWork and its callers
-     * try to approximate the unattainable goal of having the right
-     * number of workers activated for the tasks at hand, but must err
-     * on the side of too many workers vs too few to avoid stalls:
+     * workers to scan for tasks.  SignalWork is invoked in two cases:
+     * (1) When a task is pushed onto an empty queue, and (2) When a
+     * worker takes a top-level task from a queue that has additional
+     * tasks. Together, these suffice in O(log(#threads)) steps to
+     * fully activate with at least enough workers, and ideally no
+     * more than required.  This ideal is unobtainable: Callers do not
+     * know whether another worker will finish its current task and
+     * poll for others without need of a signal (which is otherwise an
+     * advantage of work-stealing vs other schemes), and also must
+     * conservatively estimate the triggering conditions of emptiness
+     * or non-emptiness; all of which usually cause more activations
+     * than necessary (see below). (Method signalWork is also used as
+     * failsafe in case of Thread failures in deregisterWorker, to
+     * activate or create a new worker to replace them).
      *
-     *  * If computations are purely tree structured, it suffices for
-     *    every worker to activate another when it pushes a task into
-     *    an empty queue, resulting in O(log(#threads)) steps to full
-     *    activation. Emptiness must be conservatively approximated,
-     *    which may result in unnecessary signals.  Also, to reduce
-     *    resource usages in some cases, at the expense of slower
-     *    startup in others, activation of an idle thread is preferred
-     *    over creating a new one, here and elsewhere.
-     *
-     *  * At the other extreme, if "flat" tasks (those that do not in
-     *    turn generate others) come in serially from only a single
-     *    producer, each worker taking a task from a queue should
-     *    propagate a signal if there are more tasks in that
-     *    queue. This is equivalent to, but generally faster than,
-     *    arranging the stealer take multiple tasks, re-pushing one or
-     *    more on its own queue, and signalling (because its queue is
-     *    empty), also resulting in logarithmic full activation
-     *    time. If tasks do not not engage in unbounded loops based on
-     *    the actions of other workers with unknown dependencies loop,
-     *    this form of proagation can be limited to one signal per
-     *    activation (phase change). We distinguish the cases by
-     *    further signalling only if the task is an InterruptibleTask
-     *    (see below), which are the only supported forms of task that
-     *    may do so.
-     *
-     * * Because we don't know about usage patterns (or most commonly,
-     *    mixtures), we use both approaches, which present even more
-     *    opportunities to over-signal. (Failure to distinguish these
-     *    cases in terms of submission methods was arguably an early
-     *    design mistake.)  Note that in either of these contexts,
-     *    signals may be (and often are) unnecessary because active
-     *    workers continue scanning after running tasks without the
-     *    need to be signalled (which is one reason work stealing is
-     *    often faster than alternatives), so additional workers
-     *    aren't needed.
-     *
-     * * For rapidly branching tasks that require full pool resources,
-     *   oversignalling is OK, because signalWork will soon have no
-     *   more workers to create or reactivate. But for others (mainly
-     *   externally submitted tasks), overprovisioning may cause very
-     *   noticeable slowdowns due to contention and resource
-     *   wastage. We reduce impact by deactivating workers when
-     *   queues don't have accessible tasks, but reactivating and
-     *   rescanning if other tasks remain.
-     *
-     * * Despite these, signal contention and overhead effects still
-     *   occur during ramp-up and ramp-down of small computations.
+     * Top-Level scheduling
+     * ====================
      *
      * Scanning. Method runWorker performs top-level scanning for (and
      * execution of) tasks by polling a pseudo-random permutation of
      * the array (by starting at a given index, and using a constant
      * cyclically exhaustive stride.)  It uses the same basic polling
      * method as WorkQueue.poll(), but restarts with a different
-     * permutation on each invocation.  The pseudorandom generator
-     * need not have high-quality statistical properties in the long
+     * permutation on each rescan.  The pseudorandom generator need
+     * not have high-quality statistical properties in the long
      * term. We use Marsaglia XorShifts, seeded with the Weyl sequence
-     * from ThreadLocalRandom probes, which are cheap and
-     * suffice. Each queue's polling attempts to avoid becoming stuck
-     * when other scanners/pollers stall.  Scans do not otherwise
-     * explicitly take into account core affinities, loads, cache
-     * localities, etc, However, they do exploit temporal locality
-     * (which usually approximates these) by preferring to re-poll
-     * from the same queue after a successful poll before trying
-     * others, which also reduces bookkeeping, cache traffic, and
-     * scanning overhead. But it also reduces fairness, which is
-     * partially counteracted by giving up on detected interference
-     * (which also reduces contention when too many workers try to
-     * take small tasks from the same queue).
+     * from ThreadLocalRandom probes, which are cheap and suffice.
      *
      * Deactivation. When no tasks are found by a worker in runWorker,
-     * it tries to deactivate()), giving up (and rescanning) on "ctl"
-     * contention. To avoid missed signals during deactivation, the
-     * method rescans and reactivates if there may have been a missed
-     * signal during deactivation. To reduce false-alarm reactivations
-     * while doing so, we scan multiple times (analogously to method
-     * quiescent()) before trying to reactivate.  Because idle workers
-     * are often not yet blocked (parked), we use a WorkQueue field to
-     * advertise that a waiter actually needs unparking upon signal.
+     * it invokes deactivate, that first deactivates (to an IDLE
+     * phase).  Avoiding missed signals during deactivation requires a
+     * (conservative) rescan, reactivating if there may be tasks to
+     * poll. Because idle workers are often not yet blocked (parked),
+     * we use a WorkQueue field to advertise that a waiter actually
+     * needs unparking upon signal.
+     *
+     * When tasks are constructed as (recursive) DAGs, top-level
+     * scanning is usually infrequent, and doesn't encounter most
+     * of the following problems addressed by runWorker and awaitWork:
+     *
+     * Locality. Polls are organized into "runs", continuing until
+     * empty or contended, while also minimizing interference by
+     * postponing bookeeping to ends of runs. This may reduce
+     * fairness.
+     *
+     * Contention. When many workers try to poll few queues, they
+     * often collide, generating CAS failures and disrupting locality
+     * of workers already running their tasks. This also leads to
+     * stalls when tasks cannot be taken because other workers have
+     * not finished poll operations, which is detected by reading
+     * ahead in queue arrays. In both cases, workers restart scans in a
+     * way that approximates randomized backoff.
+     *
+     * Oversignalling. When many short top-level tasks are present in
+     * a small number of queues, the above signalling strategy may
+     * activate many more workers than needed, worsening locality and
+     * contention problems, while also generating more global
+     * contention (field ctl is CASed on every activation and
+     * deactivation). We filter out (both in runWorker and
+     * signalWork) attempted signals that are surely not needed
+     * because the signalled tasks are already taken.
+     *
+     * Shutdown and Quiescence
+     * =======================
      *
      * Quiescence. Workers scan looking for work, giving up when they
      * don't find any, without being sure that none are available.
@@ -892,9 +873,7 @@ public class ForkJoinPool extends AbstractExecutorService
      * shutdown, runners are interrupted so they can cancel. Since
      * external joining callers never run these tasks, they must await
      * cancellation by others, which can occur along several different
-     * paths. The inability to rely on caller-runs may also require
-     * extra signalling (resulting in scanning and contention) so is
-     * done only conditionally in methods push and runworker.
+     * paths.
      *
      * Across these APIs, rules for reporting exceptions for tasks
      * with results accessed via join() differ from those via get(),
@@ -961,9 +940,13 @@ public class ForkJoinPool extends AbstractExecutorService
      * less-contended applications. To help arrange this, some
      * non-reference fields are declared as "long" even when ints or
      * shorts would suffice.  For class WorkQueue, an
-     * embedded @Contended region segregates fields most heavily
-     * updated by owners from those most commonly read by stealers or
-     * other management.
+     * embedded @Contended isolates the very busy top index, along
+     * with status and bookkeeping fields written (mostly) by owners,
+     * that otherwise interfere with reading array and base
+     * fields. There are other variables commonly contributing to
+     * false-sharing-related performance issues (including fields of
+     * class Thread), but we can't do much about this except try to
+     * minimize access.
      *
      * Initial sizing and resizing of WorkQueue arrays is an even more
      * delicate tradeoff because the best strategy systematically
@@ -972,13 +955,11 @@ public class ForkJoinPool extends AbstractExecutorService
      * direct false-sharing and indirect cases due to GC bookkeeping
      * (cardmarks etc), and reduce the number of resizes, which are
      * not especially fast because they require atomic transfers.
-     * Currently, arrays for workers are initialized to be just large
-     * enough to avoid resizing in most tree-structured tasks, but
-     * larger for external queues where both false-sharing problems
-     * and the need for resizing are more common. (Maintenance note:
-     * any changes in fields, queues, or their uses, or JVM layout
-     * policies, must be accompanied by re-evaluation of these
-     * placement and sizing decisions.)
+     * Currently, arrays are initialized to be just large enough to
+     * avoid resizing in most tree-structured tasks, but grow rapidly
+     * until large.  (Maintenance note: any changes in fields, queues,
+     * or their uses, or JVM layout policies, must be accompanied by
+     * re-evaluation of these placement and sizing decisions.)
      *
      * Style notes
      * ===========
@@ -1061,17 +1042,11 @@ public class ForkJoinPool extends AbstractExecutorService
     static final int DEFAULT_COMMON_MAX_SPARES = 256;
 
     /**
-     * Initial capacity of work-stealing queue array for workers.
+     * Initial capacity of work-stealing queue array.
      * Must be a power of two, at least 2. See above.
      */
     static final int INITIAL_QUEUE_CAPACITY = 1 << 6;
 
-    /**
-     * Initial capacity of work-stealing queue array for external queues.
-     * Must be a power of two, at least 2. See above.
-     */
-    static final int INITIAL_EXTERNAL_QUEUE_CAPACITY = 1 << 9;
-
     // conversions among short, int, long
     static final int  SMASK           = 0xffff;      // (unsigned) short bits
     static final long LMASK           = 0xffffffffL; // lower 32 bits of long
@@ -1211,11 +1186,11 @@ public class ForkJoinPool extends AbstractExecutorService
         @jdk.internal.vm.annotation.Contended("w")
         int stackPred;             // pool stack (ctl) predecessor link
         @jdk.internal.vm.annotation.Contended("w")
+        volatile int parking;      // nonzero if parked in awaitWork
+        @jdk.internal.vm.annotation.Contended("w")
         volatile int source;       // source queue id (or DROPPED)
         @jdk.internal.vm.annotation.Contended("w")
         int nsteals;               // number of steals from other queues
-        @jdk.internal.vm.annotation.Contended("w")
-        volatile int parking;      // nonzero if parked in awaitWork
 
         // Support for atomic operations
         private static final Unsafe U;
@@ -1248,11 +1223,11 @@ public class ForkJoinPool extends AbstractExecutorService
          */
         WorkQueue(ForkJoinWorkerThread owner, int id, int cfg,
                   boolean clearThreadLocals) {
-            array = new ForkJoinTask<?>[owner == null ?
-                                        INITIAL_EXTERNAL_QUEUE_CAPACITY :
-                                        INITIAL_QUEUE_CAPACITY];
-            this.owner = owner;
             this.config = (clearThreadLocals) ? cfg | CLEAR_TLS : cfg;
+            if ((this.owner = owner) == null) {
+                array = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
+                phase = id | IDLE;
+            }
         }
 
         /**
@@ -1279,27 +1254,27 @@ public class ForkJoinPool extends AbstractExecutorService
          * @throws RejectedExecutionException if array could not be resized
          */
         final void push(ForkJoinTask<?> task, ForkJoinPool pool, boolean internal) {
-            int s = top, b = base, m, cap, room; ForkJoinTask<?>[] a;
-            if ((a = array) != null && (cap = a.length) > 0 && // else disabled
-                task != null) {
-                int pk = task.noUserHelp() + 1;             // prev slot offset
-                if ((room = (m = cap - 1) - (s - b)) >= 0) {
+            int s = top, b = base, m, cap, room; ForkJoinTask<?>[] a, na;
+            if ((a = array) != null && (cap = a.length) > 0) { // else disabled
+                int k = (m = cap - 1) & s;
+                if ((room = m - (s - b)) >= 0) {
                     top = s + 1;
-                    long pos = slotOffset(m & s);
+                    long pos = slotOffset(k);
                     if (!internal)
                         U.putReference(a, pos, task);       // inside lock
                     else
                         U.getAndSetReference(a, pos, task); // fully fenced
-                    if (room == 0)                          // resize
-                        growArray(a, cap, s);
+                    if (room == 0 && (na = growArray(a, cap, s)) != null)
+                        k = ((a = na).length - 1) & s;      // resize
                 }
                 if (!internal)
                     unlockPhase();
                 if (room < 0)
                     throw new RejectedExecutionException("Queue capacity exceeded");
-                if ((room == 0 || a[m & (s - pk)] == null) &&
-                    pool != null)
-                    pool.signalWork();   // may have appeared empty
+                if (pool != null &&
+                    (room == 0 ||
+                     U.getReferenceAcquire(a, slotOffset(m & (s - 1))) == null))
+                    pool.signalWork(a, k);    // may have appeared empty
             }
         }
 
@@ -1308,11 +1283,12 @@ public class ForkJoinPool extends AbstractExecutorService
          * @param a old array
          * @param cap old array capacity
          * @param s current top
+         * @return new array, or null on failure
          */
-        private void growArray(ForkJoinTask<?>[] a, int cap, int s) {
-            int newCap = cap << 1;
+        private ForkJoinTask<?>[] growArray(ForkJoinTask<?>[] a, int cap, int s) {
+            int newCap = (cap >= 1 << 16) ? cap << 1 : cap << 2;
+            ForkJoinTask<?>[] newArray = null;
             if (a != null && a.length == cap && cap > 0 && newCap > 0) {
-                ForkJoinTask<?>[] newArray = null;
                 try {
                     newArray = new ForkJoinTask<?>[newCap];
                 } catch (OutOfMemoryError ex) {
@@ -1329,34 +1305,45 @@ public class ForkJoinPool extends AbstractExecutorService
                     updateArray(newArray);           // fully fenced
                 }
             }
+            return newArray;
         }
 
         /**
-         * Takes next task, if one exists, in order specified by mode,
-         * so acts as either local-pop or local-poll. Called only by owner.
-         * @param fifo nonzero if FIFO mode
+         * Takes next task, if one exists, in lifo order.
          */
-        private ForkJoinTask<?> nextLocalTask(int fifo) {
+        private ForkJoinTask<?> localPop() {
             ForkJoinTask<?> t = null;
-            ForkJoinTask<?>[] a = array;
-            int b = base, p = top, cap;
-            if (p - b > 0 && a != null && (cap = a.length) > 0) {
-                for (int m = cap - 1, s, nb;;) {
-                    if (fifo == 0 || (nb = b + 1) == p) {
-                        if ((t = (ForkJoinTask<?>)U.getAndSetReference(
-                                 a, slotOffset(m & (s = p - 1)), null)) != null)
-                            updateTop(s);       // else lost race for only task
-                        break;
+            int s = top - 1, cap; long k; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0 &&
+                U.getReference(a, k = slotOffset((cap - 1) & s)) != null &&
+                (t = (ForkJoinTask<?>)U.getAndSetReference(a, k, null)) != null)
+                updateTop(s);
+            return t;
+        }
+
+        /**
+         * Takes next task, if one exists, in fifo order.
+         */
+        private ForkJoinTask<?> localPoll() {
+            ForkJoinTask<?> t = null;
+            int p = top, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0) {
+                for (int b = base; p - b > 0; ) {
+                    int nb = b + 1;
+                    long k = slotOffset((cap - 1) & b);
+                    if (U.getReference(a, k) == null) {
+                        if (nb == p)
+                            break;          // else base is lagging
+                        while (b == (b = U.getIntAcquire(this, BASE)))
+                            Thread.onSpinWait(); // spin to reduce memory traffic
                     }
-                    if ((t = (ForkJoinTask<?>)U.getAndSetReference(
-                             a, slotOffset(m & b), null)) != null) {
+                    else if ((t = (ForkJoinTask<?>)
+                              U.getAndSetReference(a, k, null)) != null) {
                         updateBase(nb);
                         break;
                     }
-                    while (b == (b = U.getIntAcquire(this, BASE)))
-                        Thread.onSpinWait();    // spin to reduce memory traffic
-                    if (p - b <= 0)
-                        break;
+                    else
+                        b = base;
                 }
             }
             return t;
@@ -1364,10 +1351,9 @@ public class ForkJoinPool extends AbstractExecutorService
 
         /**
          * Takes next task, if one exists, using configured mode.
-         * (Always internal, never called for Common pool.)
          */
         final ForkJoinTask<?> nextLocalTask() {
-            return nextLocalTask(config & FIFO);
+            return (config & FIFO) == 0 ? localPop() : localPoll();
         }
 
         /**
@@ -1443,12 +1429,12 @@ public class ForkJoinPool extends AbstractExecutorService
         // specialized execution methods
 
         /**
-         * Runs the given task, as well as remaining local tasks.
+         * Runs the given task, as well as remaining local tasks
          */
         final void topLevelExec(ForkJoinTask<?> task, int fifo) {
             while (task != null) {
                 task.doExec();
-                task = nextLocalTask(fifo);
+                task = (fifo != 0) ? localPoll() : localPop();
             }
         }
 
@@ -1578,7 +1564,7 @@ public class ForkJoinPool extends AbstractExecutorService
          * Cancels all local tasks. Called only by owner.
          */
         final void cancelTasks() {
-            for (ForkJoinTask<?> t; (t = nextLocalTask(0)) != null; ) {
+            for (ForkJoinTask<?> t; (t = localPop()) != null; ) {
                 try {
                     t.cancel(false);
                 } catch (Throwable ignore) {
@@ -1780,7 +1766,8 @@ public class ForkJoinPool extends AbstractExecutorService
      * @param w caller's WorkQueue
      */
     final void registerWorker(WorkQueue w) {
-        if (w != null && (runState & STOP) == 0L) {
+        if (w != null) {
+            w.array = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
             ThreadLocalRandom.localInit();
             int seed = w.stackPred = ThreadLocalRandom.getProbe();
             int phaseSeq = seed & ~((IDLE << 1) - 1); // initial phase tag
@@ -1858,17 +1845,18 @@ public class ForkJoinPool extends AbstractExecutorService
         }
         if ((tryTerminate(false, false) & STOP) == 0L &&
             phase != 0 && w != null && w.source != DROPPED) {
-            signalWork();                  // possibly replace
             w.cancelTasks();               // clean queue
+            signalWork(null, 0);           // possibly replace
         }
         if (ex != null)
             ForkJoinTask.rethrow(ex);
     }
 
     /**
-     * Releases an idle worker, or creates one if not enough exist.
+     * Releases an idle worker, or creates one if not enough exist,
+     * giving up if array a is nonnull and task at a[k] already taken.
      */
-    final void signalWork() {
+    final void signalWork(ForkJoinTask<?>[] a, int k) {
         int pc = parallelism;
         for (long c = ctl;;) {
             WorkQueue[] qs = queues;
@@ -1884,13 +1872,15 @@ public class ForkJoinPool extends AbstractExecutorService
             if (sp == 0) {
                 if ((short)(c >>> TC_SHIFT) >= pc)
                     break;
-                nc = ((c + TC_UNIT) & TC_MASK);
+                nc = ((c + TC_UNIT) & TC_MASK) | ac;
             }
             else if ((v = w) == null)
                 break;
             else
-                nc = (v.stackPred & LMASK) | (c & TC_MASK);
-            if (c == (c = compareAndExchangeCtl(c, nc | ac))) {
+                nc = (v.stackPred & LMASK) | (c & TC_MASK) | ac;
+            if (a != null && k < a.length && k >= 0 && a[k] == null)
+                break;
+            if (c == (c = ctl) && c == (c = compareAndExchangeCtl(c, nc))) {
                 if (v == null)
                     createWorker();
                 else {
@@ -1973,178 +1963,196 @@ public class ForkJoinPool extends AbstractExecutorService
      * @param w caller's WorkQueue (may be null on failed initialization)
      */
     final void runWorker(WorkQueue w) {
-        if (w != null) {
-            int phase = w.phase, r = w.stackPred;     // seed from registerWorker
-            int fifo = w.config & FIFO, nsteals = 0, src = -1;
-            for (;;) {
-                WorkQueue[] qs;
+        if (w != null && w.phase != 0) {                  // else unregistered
+            WorkQueue[] qs;
+            int r = w.stackPred;                          // seed from registerWorker
+            int fifo = (int)config & FIFO, rescans = 0, inactive = 0, taken = 0, n;
+            while ((runState & STOP) == 0L && (qs = queues) != null &&
+                   (n = qs.length) > 0) {
+                int i = r, step = (r >>> 16) | 1;
                 r ^= r << 13; r ^= r >>> 17; r ^= r << 5; // xorshift
-                if ((runState & STOP) != 0L || (qs = queues) == null)
-                    break;
-                int n = qs.length, i = r, step = (r >>> 16) | 1;
-                boolean rescan = false;
-                scan: for (int l = n; l > 0; --l, i += step) {  // scan queues
-                    int j, cap; WorkQueue q; ForkJoinTask<?>[] a;
-                    if ((q = qs[j = i & (n - 1)]) != null &&
-                        (a = q.array) != null && (cap = a.length) > 0) {
-                        for (int m = cap - 1, pb = -1, b = q.base;;) {
-                            ForkJoinTask<?> t; long k;
+                scan: for (int j = n; j != 0; --j, i += step) {
+                    WorkQueue q; int qid;
+                    if ((q = qs[qid = i & (n - 1)]) != null) {
+                        ForkJoinTask<?>[] a; int cap;     // poll queue
+                        while ((a = q.array) != null && (cap = a.length) > 0) {
+                            int b, nb, nk; long bp; ForkJoinTask<?> t;
                             t = (ForkJoinTask<?>)U.getReferenceAcquire(
-                                a, k = slotOffset(m & b));
-                            if (b != (b = q.base) || t == null ||
-                                !U.compareAndSetReference(a, k, t, null)) {
-                                if (a[b & m] == null) {
-                                    if (rescan)           // end of run
-                                        break scan;
-                                    if (a[(b + 1) & m] == null &&
-                                        a[(b + 2) & m] == null) {
-                                        break;            // probably empty
+                                a, bp = slotOffset((cap - 1) & (b = q.base)));
+                            long np = slotOffset(nk = (nb = b + 1) & (cap - 1));
+                            if (q.base == b) {            // else inconsistent
+                                if (t == null) {
+                                    if (q.array == a) {   // else resized
+                                        if (rescans > 0)  // ran or stalled
+                                            break scan;
+                                        if (U.getReference(a, np) == null &&
+                                            (rescans >= 0 ||
+                                             (U.getReferenceAcquire(a, bp) == null &&
+                                              q.top == q.base)))
+                                            break;
+                                        rescans = 1;      // may be stalled
                                     }
-                                    if (pb == (pb = b)) { // track progress
-                                        rescan = true;    // stalled; reorder scan
+                                }
+                                else if (inactive != 0) {
+                                    if ((inactive = tryReactivate(w)) != 0) {
+                                        rescans = 1;      // can't take yet
                                         break scan;
                                     }
                                 }
-                            }
-                            else {
-                                boolean propagate;
-                                int nb = q.base = b + 1, prevSrc = src;
-                                w.nsteals = ++nsteals;
-                                w.source = src = j;       // volatile
-                                rescan = true;
-                                int nh = t.noUserHelp();
-                                if (propagate =
-                                    (prevSrc != src || nh != 0) && a[nb & m] != null)
-                                    signalWork();
-                                w.topLevelExec(t, fifo);
-                                if ((b = q.base) != nb && !propagate)
-                                    break scan;          // reduce interference
+                                else if (U.compareAndSetReference(a, bp, t, null)) {
+                                    q.base = nb;
+                                    Object nt = U.getReferenceAcquire(a, np);
+                                    w.source = qid;
+                                    rescans = 1;
+                                    ++taken;
+                                    if (nt != null &&     // confirm a[nk]
+                                        U.getReferenceAcquire(a, np) == nt)
+                                        signalWork(a, nk); // propagate
+                                    w.topLevelExec(t, fifo);
+                                }
                             }
                         }
                     }
                 }
-                if (!rescan) {
-                    if (((phase = deactivate(w, phase)) & IDLE) != 0)
-                        break;
-                    src = -1;                            // re-enable propagation
+                if (rescans >= 0)
+                    --rescans;
+                else if (inactive == 0) {
+                    if ((inactive = deactivate(w, taken)) != 0)
+                        taken = 0;
                 }
+                else if (awaitWork(w) == 0)
+                    inactive = rescans = 0;
+                else
+                    break;
             }
         }
     }
 
     /**
-     * Deactivates and if necessary awaits signal or termination.
+     * Tries to deactivate worker, keeping active on contention
      *
-     * @param w the worker
-     * @param phase current phase
-     * @return current phase, with IDLE set if worker should exit
+     * @param w the work queue
+     * @param taken number of stolen tasks since last deactivation
+     * @return nonzero if inactive
      */
-    private int deactivate(WorkQueue w, int phase) {
-        if (w == null)                        // currently impossible
-            return IDLE;
-        int p = phase | IDLE, activePhase = phase + (IDLE << 1);
-        long pc = ctl, qc = (activePhase & LMASK) | ((pc - RC_UNIT) & UMASK);
-        int sp = w.stackPred = (int)pc;       // set ctl stack link
-        w.phase = p;
-        if (!compareAndSetCtl(pc, qc))        // try to enqueue
-            return w.phase = phase;           // back out on possible signal
-        int ac = (short)(qc >>> RC_SHIFT), n; long e; WorkQueue[] qs;
-        if (((e = runState) & STOP) != 0L ||
-            ((e & SHUTDOWN) != 0L && ac == 0 && quiescent() > 0) ||
-            (qs = queues) == null || (n = qs.length) <= 0)
-            return IDLE;                      // terminating
-
-        for (int prechecks = Math.min(ac, 2), // reactivation threshold
-             k = Math.max(n + (n << 1), SPIN_WAITS << 1);;) {
-            WorkQueue q; int cap; ForkJoinTask<?>[] a; long c;
-            if (w.phase == activePhase)
-                return activePhase;
-            if (--k < 0)
-                return awaitWork(w, p);       // block, drop, or exit
-            if ((q = qs[k & (n - 1)]) == null)
-                Thread.onSpinWait();
-            else if ((a = q.array) != null && (cap = a.length) > 0 &&
-                     a[q.base & (cap - 1)] != null && --prechecks < 0 &&
-                     (int)(c = ctl) == activePhase &&
-                     compareAndSetCtl(c, (sp & LMASK) | ((c + RC_UNIT) & UMASK)))
-                return w.phase = activePhase; // reactivate
+    private int deactivate(WorkQueue w, int taken) {
+        int inactive = 0, phase;
+        if (w != null && (inactive = (phase = w.phase) & IDLE) == 0) {
+            long sp = (phase + (IDLE << 1)) & LMASK, pc, c;
+            w.phase = phase | IDLE;
+            w.stackPred = (int)(pc = ctl);    // set ctl stack link
+            if (!compareAndSetCtl(            // try to enqueue
+                    pc, c = ((pc - RC_UNIT) & UMASK) | sp))
+                w.phase = phase;              // back out on contention
+            else {
+                if (taken != 0) {
+                    w.nsteals += taken;
+                    if ((w.config & CLEAR_TLS) != 0 &&
+                        (Thread.currentThread() instanceof ForkJoinWorkerThread f))
+                        f.resetThreadLocals(); // (instanceof check always true)
+                }
+                if (((c & RC_MASK) == 0L && quiescent() > 0) || taken == 0)
+                    inactive = w.phase & IDLE; // check quiescent termination
+                else {                         // spin for approx 1 scan cost
+                    int tc = (short)(c >>> TC_SHIFT);
+                    int spins = Math.max((tc << 1) + tc, SPIN_WAITS);
+                    while ((inactive = w.phase & IDLE) != 0 && --spins != 0)
+                        Thread.onSpinWait();
+                }
+            }
         }
+        return inactive;
+    }
+
+    /**
+     * Reactivates worker w if it is currently top of ctl stack
+     *
+     * @param w the work queue
+     * @return 0 if now active
+     */
+    private int tryReactivate(WorkQueue w) {
+        int inactive = 0;
+        if (w != null) {                         // always true; hoist checks
+            int sp = w.stackPred, phase, activePhase; long c;
+            if ((inactive = (phase = w.phase) & IDLE) != 0 &&
+                (int)(c = ctl) == (activePhase = phase + IDLE) &&
+                compareAndSetCtl(c, (sp & LMASK) | ((c + RC_UNIT) & UMASK))) {
+                w.phase = activePhase;
+                inactive = 0;
+            }
+        }
+        return inactive;
     }
 
     /**
      * Awaits signal or termination.
      *
      * @param w the work queue
-     * @param p current phase (known to be idle)
-     * @return current phase, with IDLE set if worker should exit
+     * @return 0 if now active
      */
-    private int awaitWork(WorkQueue w, int p) {
-        if (w != null) {
-            ForkJoinWorkerThread t; long deadline;
-            if ((w.config & CLEAR_TLS) != 0 && (t = w.owner) != null)
-                t.resetThreadLocals();          // clear before reactivate
-            if ((ctl & RC_MASK) > 0L)
-                deadline = 0L;
-            else if ((deadline =
-                      (((w.source != INVALID_ID) ? keepAlive : TIMEOUT_SLOP)) +
-                      System.currentTimeMillis()) == 0L)
-                deadline = 1L;                 // avoid zero
-            int activePhase = p + IDLE;
-            if ((p = w.phase) != activePhase && (runState & STOP) == 0L) {
+    private int awaitWork(WorkQueue w) {
+        int inactive = 0, phase;
+        if (w != null) {                          // always true; hoist checks
+            long waitTime = (w.source == INVALID_ID) ? 0L : keepAlive;
+            if ((inactive = (phase = w.phase) & IDLE) != 0) {
                 LockSupport.setCurrentBlocker(this);
-                w.parking = 1;                 // enable unpark
-                while ((p = w.phase) != activePhase) {
-                    boolean trimmable = false; int trim;
-                    Thread.interrupted();      // clear status
+                int activePhase = phase + IDLE;
+                for (long deadline = 0L;;) {
+                    Thread.interrupted();         // clear status
                     if ((runState & STOP) != 0L)
                         break;
-                    if (deadline != 0L) {
-                        if ((trim = tryTrim(w, p, deadline)) > 0)
-                            break;
-                        else if (trim < 0)
-                            deadline = 0L;
-                        else
-                            trimmable = true;
+                    boolean trimmable = false;    // use timed wait if trimmable
+                    long d = 0L, c;
+                    if (((c = ctl) & RC_MASK) == 0L && (int)c == activePhase) {
+                        long now = System.currentTimeMillis();
+                        if (deadline == 0L)
+                            deadline = waitTime + now;
+                        if (deadline - now <= TIMEOUT_SLOP) {
+                            if (tryTrim(w, c, activePhase))
+                                break;
+                            continue;             // lost race to trim
+                        }
+                        d = deadline;
+                        trimmable = true;
                     }
-                    U.park(trimmable, deadline);
+                    w.parking = 1;                // enable unpark and recheck
+                    if ((inactive = w.phase & IDLE) != 0)
+                        U.park(trimmable, d);
+                    w.parking = 0;                // close unpark window
+                    if (inactive == 0 || (inactive = w.phase & IDLE) == 0)
+                        break;
                 }
-                w.parking = 0;
                 LockSupport.setCurrentBlocker(null);
             }
         }
-        return p;
+        return inactive;
     }
 
     /**
      * Tries to remove and deregister worker after timeout, and release
-     * another to do the same.
-     * @return > 0: trimmed, < 0 : not trimmable, else 0
+     * another to do the same unless new tasks are found.
      */
-    private int tryTrim(WorkQueue w, int phase, long deadline) {
-        long c, nc; int stat, activePhase, vp, i; WorkQueue[] vs; WorkQueue v;
-        if ((activePhase = phase + IDLE) != (int)(c = ctl) || w == null)
-            stat = -1;                      // no longer ctl top
-        else if (deadline - System.currentTimeMillis() >= TIMEOUT_SLOP)
-            stat = 0;                       // spurious wakeup
-        else if (!compareAndSetCtl(
-                     c, nc = ((w.stackPred & LMASK) | (RC_MASK & c) |
-                               (TC_MASK & (c - TC_UNIT)))))
-            stat = -1;                      // lost race to signaller
-        else {
-            stat = 1;
-            w.source = DROPPED;
-            w.phase = activePhase;
-            if ((vp = (int)nc) != 0 && (vs = queues) != null &&
-                vs.length > (i = vp & SMASK) && (v = vs[i]) != null &&
-                compareAndSetCtl(           // try to wake up next waiter
-                    nc, ((UMASK & (nc + RC_UNIT)) |
-                         (nc & TC_MASK) | (v.stackPred & LMASK)))) {
-                v.source = INVALID_ID;      // enable cascaded timeouts
-                v.phase = vp;
-                U.unpark(v.owner);
+    private boolean tryTrim(WorkQueue w, long c, int activePhase) {
+        if (w != null) {
+            int vp, i; WorkQueue[] vs; WorkQueue v;
+            long nc = ((w.stackPred & LMASK) |
+                       ((RC_MASK & c) | (TC_MASK & (c - TC_UNIT))));
+            if (compareAndSetCtl(c, nc)) {
+                w.source = DROPPED;
+                w.phase = activePhase;
+                if ((vp = (int)nc) != 0 && (vs = queues) != null &&
+                    vs.length > (i = vp & SMASK) && (v = vs[i]) != null &&
+                    compareAndSetCtl(           // try to wake up next waiter
+                        nc, ((v.stackPred & LMASK) |
+                             ((UMASK & (nc + RC_UNIT)) | (nc & TC_MASK))))) {
+                    v.source = INVALID_ID;      // enable cascaded timeouts
+                    v.phase = vp;
+                    U.unpark(v.owner);
+                }
+                return true;
             }
         }
-        return stat;
+        return false;
     }
 
     /**
@@ -2561,52 +2569,35 @@ public class ForkJoinPool extends AbstractExecutorService
 
     /**
      * Finds and locks a WorkQueue for an external submitter, or
-     * throws RejectedExecutionException if shutdown or terminating.
-     * @param r current ThreadLocalRandom.getProbe() value
+     * throws RejectedExecutionException if shutdown
      * @param rejectOnShutdown true if RejectedExecutionException
-     *        should be thrown when shutdown (else only if terminating)
+     *        should be thrown when shutdown
      */
-    private WorkQueue submissionQueue(int r, boolean rejectOnShutdown) {
-        int reuse;                                   // nonzero if prefer create
-        if ((reuse = r) == 0) {
-            ThreadLocalRandom.localInit();           // initialize caller's probe
+    final WorkQueue externalSubmissionQueue(boolean rejectOnShutdown) {
+        int r;
+        if ((r = ThreadLocalRandom.getProbe()) == 0) {
+            ThreadLocalRandom.localInit();   // initialize caller's probe
             r = ThreadLocalRandom.getProbe();
         }
-        for (int probes = 0; ; ++probes) {
-            int n, i, id; WorkQueue[] qs; WorkQueue q;
-            if ((qs = queues) == null)
-                break;
-            if ((n = qs.length) <= 0)
+        for (;;) {
+            WorkQueue q; WorkQueue[] qs; int n, id, i;
+            if ((qs = queues) == null || (n = qs.length) <= 0)
                 break;
             if ((q = qs[i = (id = r & EXTERNAL_ID_MASK) & (n - 1)]) == null) {
-                WorkQueue w = new WorkQueue(null, id, 0, false);
-                w.phase = id;
-                boolean reject = ((lockRunState() & SHUTDOWN) != 0 &&
-                                  rejectOnShutdown);
-                if (!reject && queues == qs && qs[i] == null)
-                    q = qs[i] = w;                   // else lost race to install
+                WorkQueue newq = new WorkQueue(null, id, 0, false);
+                lockRunState();
+                if (qs[i] == null && queues == qs)
+                    q = qs[i] = newq;         // else lost race to install
                 unlockRunState();
-                if (q != null)
-                    return q;
-                if (reject)
+            }
+            if (q != null && q.tryLockPhase()) {
+                if (rejectOnShutdown && (runState & SHUTDOWN) != 0L) {
+                    q.unlockPhase();          // check while q lock held
                     break;
-                reuse = 0;
-            }
-            if (reuse == 0 || !q.tryLockPhase()) {   // move index
-                if (reuse == 0) {
-                    if (probes >= n >> 1)
-                        reuse = r;                   // stop prefering free slot
                 }
-                else if (q != null)
-                    reuse = 0;                       // probe on collision
-                r = ThreadLocalRandom.advanceProbe(r);
-            }
-            else if (rejectOnShutdown && (runState & SHUTDOWN) != 0L) {
-                q.unlockPhase();                     // check while q lock held
-                break;
-            }
-            else
                 return q;
+            }
+            r = ThreadLocalRandom.advanceProbe(r); // move
         }
         throw new RejectedExecutionException();
     }
@@ -2620,24 +2611,12 @@ public class ForkJoinPool extends AbstractExecutorService
         }
         else {                     // find and lock queue
             internal = false;
-            q = submissionQueue(ThreadLocalRandom.getProbe(), true);
+            q = externalSubmissionQueue(true);
         }
         q.push(task, signalIfEmpty ? this : null, internal);
         return task;
     }
 
-    /**
-     * Returns queue for an external submission, bypassing call to
-     * submissionQueue if already established and unlocked.
-     */
-    final WorkQueue externalSubmissionQueue(boolean rejectOnShutdown) {
-        WorkQueue[] qs; WorkQueue q; int n;
-        int r = ThreadLocalRandom.getProbe();
-        return (((qs = queues) != null && (n = qs.length) > 0 &&
-                 (q = qs[r & EXTERNAL_ID_MASK & (n - 1)]) != null && r != 0 &&
-                 q.tryLockPhase()) ? q : submissionQueue(r, rejectOnShutdown));
-    }
-
     /**
      * Returns queue for an external thread, if one exists that has
      * possibly ever submitted to the given pool (nonzero probe), or
@@ -3310,11 +3289,14 @@ public class ForkJoinPool extends AbstractExecutorService
      * @since 19
      */
     public int setParallelism(int size) {
+        int prevSize;
         if (size < 1 || size > MAX_CAP)
             throw new IllegalArgumentException();
         if ((config & PRESET_SIZE) != 0)
             throw new UnsupportedOperationException("Cannot override System property");
-        return getAndSetParallelism(size);
+        if ((prevSize = getAndSetParallelism(size)) < size)
+            signalWork(null, 0); // trigger worker activation
+        return prevSize;
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/forkjoin/Starvation.java b/test/jdk/java/util/concurrent/forkjoin/Starvation.java
index 8397e852ffa..d864fa0ba33 100644
--- a/test/jdk/java/util/concurrent/forkjoin/Starvation.java
+++ b/test/jdk/java/util/concurrent/forkjoin/Starvation.java
@@ -28,6 +28,7 @@
  */
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class Starvation {
@@ -42,7 +43,7 @@ public class Starvation {
             while (count.get() == c) Thread.onSpinWait();
             return null; }};
 
-    public static void main(String[] args) throws Exception {
+    static void testSubmitExternalCallable() throws Exception {
         try (var pool = new ForkJoinPool(2)) {
             for (int i = 0; i < 100_000; i++) {
                 var future1 = pool.submit(new AwaitCount(i));
@@ -53,4 +54,21 @@ public class Starvation {
             }
         }
     }
+
+    static void testSubmitAdaptedCallable() throws Exception {
+        try (var pool = new ForkJoinPool(2)) {
+            for (int i = 0; i < 100_000; i++) {
+                var future1 = pool.submit(new AwaitCount(i));
+                var future2 = pool.submit(ForkJoinTask.adapt(noop));
+                future2.get();
+                count.set(i + 1);
+                future1.get();
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        testSubmitExternalCallable();
+        testSubmitAdaptedCallable();
+    }
 }

From 13e062e7a36cf9880416a4e867de13778c6bed2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Tue, 2 Dec 2025 12:13:03 +0000
Subject: [PATCH 425/512] 8366578: Remove the field tagSize in various
 QuicPacketEncoder.OutgoingQuicPacket subclasses

Reviewed-by: jpai, dfuchs
---
 .../internal/net/http/quic/packets/QuicPacketEncoder.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/packets/QuicPacketEncoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/packets/QuicPacketEncoder.java
index 890c1a63a35..db519dc7557 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/packets/QuicPacketEncoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/packets/QuicPacketEncoder.java
@@ -577,7 +577,6 @@ public class QuicPacketEncoder {
         final byte[] encodedPacketNumber;
         final List<QuicFrame> frames;
         final int payloadSize;
-        private int tagSize;
 
         OutgoingHandshakePacket(QuicConnectionId sourceId,
                                 QuicConnectionId destinationId,
@@ -590,7 +589,6 @@ public class QuicPacketEncoder {
             this.encodedPacketNumber = encodedPacketNumber;
             this.frames = List.copyOf(frames);
             this.payloadSize = frames.stream().mapToInt(QuicFrame::size).reduce(0, Math::addExact);
-            this.tagSize = tagSize;
             this.length = computeLength(payloadSize, encodedPacketNumber.length, tagSize);
             this.size = computeSize(length);
         }
@@ -676,7 +674,6 @@ public class QuicPacketEncoder {
         final int size;
         final byte[] encodedPacketNumber;
         final List<QuicFrame> frames;
-        private int tagSize;
         final int payloadSize;
 
         OutgoingZeroRttPacket(QuicConnectionId sourceId,
@@ -689,7 +686,6 @@ public class QuicPacketEncoder {
             this.packetNumber = packetNumber;
             this.encodedPacketNumber = encodedPacketNumber;
             this.frames = List.copyOf(frames);
-            this.tagSize = tagSize;
             this.payloadSize = this.frames.stream().mapToInt(QuicFrame::size)
                     .reduce(0, Math::addExact);
             this.length = computeLength(payloadSize, encodedPacketNumber.length, tagSize);
@@ -778,7 +774,6 @@ public class QuicPacketEncoder {
         final int size;
         final byte[] encodedPacketNumber;
         final List<QuicFrame> frames;
-        private int tagSize;
         final int payloadSize;
 
         OutgoingOneRttPacket(QuicConnectionId destinationId,
@@ -789,7 +784,6 @@ public class QuicPacketEncoder {
             this.packetNumber = packetNumber;
             this.encodedPacketNumber = encodedPacketNumber;
             this.frames = List.copyOf(frames);
-            this.tagSize = tagSize;
             this.payloadSize = this.frames.stream().mapToInt(QuicFrame::size)
                     .reduce(0, Math::addExact);
             this.size = computeSize(payloadSize, encodedPacketNumber.length, tagSize);
@@ -853,7 +847,6 @@ public class QuicPacketEncoder {
         final int size;
         final byte[] encodedPacketNumber;
         final List<QuicFrame> frames;
-        private int tagSize;
         final int payloadSize;
 
         private record InitialPacketVariableComponents(int length, byte[] token, QuicConnectionId sourceId,
@@ -873,7 +866,6 @@ public class QuicPacketEncoder {
             this.packetNumber = packetNumber;
             this.encodedPacketNumber = encodedPacketNumber;
             this.frames = List.copyOf(frames);
-            this.tagSize = tagSize;
             this.payloadSize = this.frames.stream()
                     .mapToInt(QuicFrame::size)
                     .reduce(0, Math::addExact);

From 5cba2c8461005f2f7bcafdce622126a113f4bbd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Tue, 2 Dec 2025 12:13:21 +0000
Subject: [PATCH 426/512] 8368093: Remove Stream::createPseudoHeaders

Reviewed-by: dfuchs, jpai, vyazici
---
 .../classes/jdk/internal/net/http/Stream.java | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index 4b59a777de2..9a7ccd8f3a1 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -31,7 +31,6 @@ import java.io.UncheckedIOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.net.ProtocolException;
-import java.net.URI;
 import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.ResponseInfo;
 import java.nio.ByteBuffer;
@@ -973,36 +972,6 @@ class Stream<T> extends ExchangeImpl<T> {
         return headers;
     }
 
-    private static HttpHeaders createPseudoHeaders(HttpRequest request) {
-        HttpHeadersBuilder hdrs = new HttpHeadersBuilder();
-        String method = request.method();
-        hdrs.setHeader(":method", method);
-        URI uri = request.uri();
-        hdrs.setHeader(":scheme", uri.getScheme());
-        String host = uri.getHost();
-        int port = uri.getPort();
-        assert host != null;
-        if (port != -1) {
-            hdrs.setHeader(":authority", host + ":" + port);
-        } else {
-            hdrs.setHeader(":authority", host);
-        }
-        String query = uri.getRawQuery();
-        String path = uri.getRawPath();
-        if (path == null || path.isEmpty()) {
-            if (method.equalsIgnoreCase("OPTIONS")) {
-                path = "*";
-            } else {
-                path = "/";
-            }
-        }
-        if (query != null) {
-            path += "?" + query;
-        }
-        hdrs.setHeader(":path", Utils.encode(path));
-        return hdrs.build();
-    }
-
     HttpHeaders getRequestPseudoHeaders() {
         return requestPseudoHeaders;
     }

From 07856fce34ba14a83fc1ac0faffe3b5ba883e0b5 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Tue, 2 Dec 2025 12:17:40 +0000
Subject: [PATCH 427/512] 8372787: ModuleReader should throw IOException
 consistently when using --patch-module and ModuleReader is closed

Reviewed-by: alanb
---
 .../jdk/internal/module/ModulePatcher.java    |  20 ++-
 .../patched/PatchedModuleReaderTest.java      | 132 ++++++++++++++++++
 .../java.base/java/lang/PatchedFoo.java       |  26 ++++
 3 files changed, 177 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/lang/module/ModuleReader/patched/PatchedModuleReaderTest.java
 create mode 100644 test/jdk/java/lang/module/ModuleReader/patched/java.base/java/lang/PatchedFoo.java

diff --git a/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java b/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java
index d24cc77600c..eb3f25ceca7 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java
@@ -225,6 +225,7 @@ public final class ModulePatcher {
         private final ModuleReference mref;
         private final URL delegateCodeSourceURL;
         private volatile ModuleReader delegate;
+        private volatile boolean closed;
 
         /**
          * Creates the ModuleReader to reads resources in a patched module.
@@ -291,6 +292,15 @@ public final class ModulePatcher {
             return r;
         }
 
+        /**
+         * Throws an IOException if the ModuleReader is closed.
+         */
+        private void ensureOpen() throws IOException {
+            if (closed) {
+                throw new IOException("ModuleReader is closed");
+            }
+        }
+
         /**
          * Finds a resources in the patch locations. Returns null if not found
          * or the name is "module-info.class" as that cannot be overridden.
@@ -310,7 +320,7 @@ public final class ModulePatcher {
          * Finds a resource of the given name in the patched module.
          */
         public Resource findResource(String name) throws IOException {
-
+            assert !closed : "module reader is closed";
             // patch locations
             Resource r = findResourceInPatch(name);
             if (r != null)
@@ -354,6 +364,7 @@ public final class ModulePatcher {
 
         @Override
         public Optional<URI> find(String name) throws IOException {
+            ensureOpen();
             Resource r = findResourceInPatch(name);
             if (r != null) {
                 URI uri = URI.create(r.getURL().toString());
@@ -365,6 +376,7 @@ public final class ModulePatcher {
 
         @Override
         public Optional<InputStream> open(String name) throws IOException {
+            ensureOpen();
             Resource r = findResourceInPatch(name);
             if (r != null) {
                 return Optional.of(r.getInputStream());
@@ -375,6 +387,7 @@ public final class ModulePatcher {
 
         @Override
         public Optional<ByteBuffer> read(String name) throws IOException {
+            ensureOpen();
             Resource r = findResourceInPatch(name);
             if (r != null) {
                 ByteBuffer bb = r.getByteBuffer();
@@ -398,6 +411,7 @@ public final class ModulePatcher {
 
         @Override
         public Stream<String> list() throws IOException {
+            ensureOpen();
             Stream<String> s = delegate().list();
             for (ResourceFinder finder : finders) {
                 s = Stream.concat(s, finder.list());
@@ -407,6 +421,10 @@ public final class ModulePatcher {
 
         @Override
         public void close() throws IOException {
+            if (closed) {
+                return;
+            }
+            closed = true;
             closeAll(finders);
             delegate().close();
         }
diff --git a/test/jdk/java/lang/module/ModuleReader/patched/PatchedModuleReaderTest.java b/test/jdk/java/lang/module/ModuleReader/patched/PatchedModuleReaderTest.java
new file mode 100644
index 00000000000..80f4e324627
--- /dev/null
+++ b/test/jdk/java/lang/module/ModuleReader/patched/PatchedModuleReaderTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.lang.module.ModuleFinder;
+import java.lang.module.ModuleReader;
+import java.lang.module.ModuleReference;
+import java.net.URI;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/*
+ * @test
+ * @bug 8372787
+ * @summary Test the behaviour of ModuleReader when using --patch-module
+ * @comment patch the java.base module with a test specific resource
+ * @compile/module=java.base java/lang/PatchedFoo.java
+ * @run junit/othervm ${test.main.class}
+ */
+class PatchedModuleReaderTest {
+
+    private static ModuleReference patchedModuleRef;
+
+    @BeforeAll
+    static void beforeAll() {
+        patchedModuleRef = ModuleFinder.ofSystem()
+                .find("java.base")
+                .orElseThrow();
+    }
+
+    /*
+     * Verifies that the resource that was patched into a module
+     * is found by the ModuleReader.
+     */
+    @Test
+    void testResourceFound() throws Exception {
+        try (ModuleReader reader = patchedModuleRef.open()) {
+            String resourceName = "java/lang/PatchedFoo.class";
+            Optional<URI> res = reader.find(resourceName);
+            assertTrue(res.isPresent(), resourceName + " is missing in "
+                    + patchedModuleRef.descriptor().name() + " module");
+            URI uri = res.get();
+            assertEquals("file", uri.getScheme(),
+                    "unexpected scheme in resource URI " + uri);
+            assertTrue(uri.getPath().endsWith(resourceName),
+                    "unexpected path component " + uri.getPath()
+                            + " in resource URI " + uri);
+
+        }
+    }
+
+    /*
+     * Verifies the ModuleReader against a resource which isn't
+     * expected to be part of the patched module.
+     */
+    @Test
+    void testResourceNotFound() throws Exception {
+        try (ModuleReader reader = patchedModuleRef.open()) {
+            String nonExistentResource = "foo/bar/NonExistent.class";
+            Optional<URI> res = reader.find(nonExistentResource);
+            assertTrue(res.isEmpty(), "unexpected resource " + nonExistentResource
+                    + " in " + patchedModuleRef.descriptor().name() + " module");
+        }
+    }
+
+    /*
+     * This test opens a ModuleReader for a patched module, accumulates
+     * the Stream of resources from that ModuleReader and then closes that
+     * ModuleReader. It then verifies that the closed ModuleReader
+     * throws the specified IOException whenever it is used for subsequent
+     * operations on the Stream of resources.
+     */
+    @Test
+    void testIOExceptionAfterClose() throws Exception {
+        ModuleReader reader;
+        Stream<String> resources;
+        try (var _ = reader = patchedModuleRef.open()) {
+            // hold on to the available resources, to test them after the
+            // ModuleReader is closed
+            resources = reader.list();
+        } // close the ModuleReader
+
+        // verify IOException is thrown by the closed ModuleReader
+
+        assertThrows(IOException.class, () -> reader.list(),
+                "ModuleReader.list()");
+
+        resources.forEach(rn -> {
+            assertThrows(IOException.class, () -> reader.read(rn),
+                    "ModuleReader.read(String)");
+            assertThrows(IOException.class, () -> reader.open(rn),
+                    "ModuleReader.open(String)");
+            assertThrows(IOException.class, () -> reader.find(rn),
+                    "ModuleReader.find(String)");
+        });
+
+        // repeat the test for a non-existent resource
+        String nonExistentResource = "foo/bar/NonExistent.class";
+        assertThrows(IOException.class, () -> reader.read(nonExistentResource),
+                "ModuleReader.read(String)");
+        assertThrows(IOException.class, () -> reader.open(nonExistentResource),
+                "ModuleReader.open(String)");
+        assertThrows(IOException.class, () -> reader.find(nonExistentResource),
+                "ModuleReader.find(String)");
+    }
+}
diff --git a/test/jdk/java/lang/module/ModuleReader/patched/java.base/java/lang/PatchedFoo.java b/test/jdk/java/lang/module/ModuleReader/patched/java.base/java/lang/PatchedFoo.java
new file mode 100644
index 00000000000..814757134d6
--- /dev/null
+++ b/test/jdk/java/lang/module/ModuleReader/patched/java.base/java/lang/PatchedFoo.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang;
+
+public class PatchedFoo {
+}

From d3083ac05453c9dd303038f90ddab50d52124e51 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Tue, 2 Dec 2025 12:19:48 +0000
Subject: [PATCH 428/512] 8371194:
 serviceability/sa/TestJhsdbJstackMixedWithXComp.java failing

Co-authored-by: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Reviewed-by: cjplummer, pchilanomate
---
 .../debugger/bsd/BsdDebuggerLocal.java        |  48 ++++---
 .../sun/jvm/hotspot/debugger/cdbg/CFrame.java |  11 +-
 .../debugger/linux/LinuxCDebugger.java        |  14 +-
 .../linux/aarch64/LinuxAARCH64CFrame.java     |  39 +++++-
 .../linux/amd64/LinuxAMD64CFrame.java         |  67 ++++++---
 .../linux/ppc64/LinuxPPC64CFrame.java         |  10 +-
 .../linux/riscv64/LinuxRISCV64CFrame.java     |  26 +++-
 .../hotspot/runtime/aarch64/AARCH64Frame.java |  10 +-
 .../jvm/hotspot/runtime/amd64/AMD64Frame.java |   4 +-
 .../classes/sun/jvm/hotspot/tools/PStack.java | 131 ++++++++----------
 test/hotspot/jtreg/ProblemList.txt            |   1 -
 .../sa/TestJhsdbJstackMixedWithXComp.java     |  31 ++++-
 12 files changed, 256 insertions(+), 136 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
index 10f6881d010..efbb613994d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 package sun.jvm.hotspot.debugger.bsd;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.IntStream;
 
 import sun.jvm.hotspot.debugger.Address;
 import sun.jvm.hotspot.debugger.DebuggerBase;
@@ -75,10 +77,11 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
     // CDebugger support
     private BsdCDebugger cdbg;
 
-    // threadList and loadObjectList are filled by attach0 method
-    private List<ThreadProxy> threadList;
+    // loadObjectList is filled by attach0 method
     private List<LoadObject> loadObjectList;
 
+    private List<JavaThread> javaThreadList;
+
     // called by native method lookupByAddress0
     private ClosestSymbol createClosestSymbol(String name, long offset) {
        return new ClosestSymbol(name, offset);
@@ -241,10 +244,21 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
         }
     }
 
+    private void fillJavaThreadList() {
+      // TODO: thread list on macOS is now supported for corefile only.
+      if (!isCore && isDarwin) {
+          javaThreadList = Collections.emptyList();
+      } else {
+          Threads threads = VM.getVM().getThreads();
+          javaThreadList = IntStream.range(0, threads.getNumberOfThreads())
+                                    .mapToObj(threads::getJavaThreadAt)
+                                    .toList();
+      }
+    }
+
     /** From the Debugger interface via JVMDebugger */
     public synchronized void attach(int processID) throws DebuggerException {
         checkAttached();
-        threadList = new ArrayList<>();
         loadObjectList = new ArrayList<>();
         class AttachTask implements WorkerThreadTask {
            int pid;
@@ -264,7 +278,6 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
     /** From the Debugger interface via JVMDebugger */
     public synchronized void attach(String execName, String coreName) {
         checkAttached();
-        threadList = new ArrayList<>();
         loadObjectList = new ArrayList<>();
         attach0(execName, coreName);
         attached = true;
@@ -278,7 +291,7 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
             return false;
         }
 
-        threadList = null;
+        javaThreadList = null;
         loadObjectList = null;
 
         if (isCore) {
@@ -492,7 +505,12 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
     /** From the BsdCDebugger interface */
     public List<ThreadProxy> getThreadList() {
       requireAttach();
-      return threadList;
+      if (javaThreadList == null) {
+        fillJavaThreadList();
+      }
+      return javaThreadList.stream()
+                           .map(JavaThread::getThreadProxy)
+                           .toList();
     }
 
     /** From the BsdCDebugger interface */
@@ -561,21 +579,19 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
     /** this functions used for core file reading and called from native attach0,
         it returns an array of long integers as
         [thread_id, stack_start, stack_end, thread_id, stack_start, stack_end, ....] for
-        all java threads recorded in Threads. Also adds the ThreadProxy to threadList */
+        all java threads recorded in Threads. */
     public long[] getJavaThreadsInfo() {
         requireAttach();
-        Threads threads = VM.getVM().getThreads();
-        int len = threads.getNumberOfThreads();
-        long[] result = new long[len * 3];    // triple
+        if (javaThreadList == null) {
+            fillJavaThreadList();
+        }
+        long[] result = new long[javaThreadList.size() * 3];    // triple
         long beg, end;
         int i = 0;
-        for (int k = 0; k < threads.getNumberOfThreads(); k++) {
-            JavaThread t = threads.getJavaThreadAt(k);
+        for (var t : javaThreadList) {
             end = t.getStackBaseValue();
             beg = end - t.getStackSize();
-            BsdThread bsdt = (BsdThread)t.getThreadProxy();
-            long uid = bsdt.getUniqueThreadId();
-            if (threadList != null) threadList.add(bsdt);
+            long uid = ((BsdThread)t.getThreadProxy()).getUniqueThreadId();
             result[i] = uid;
             result[i + 1] = beg;
             result[i + 2] = end;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java
index 47f41fe1383..bc366ef02b5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 package sun.jvm.hotspot.debugger.cdbg;
 
 import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.utilities.*;
 
 /** Models a "C" programming language frame on the stack -- really
     just an arbitrary frame with hooks to access C and C++ debug
@@ -37,7 +39,7 @@ public interface CFrame {
   public CFrame sender(ThreadProxy th);
 
   /** Find sender frame with given FP and PC */
-  public default CFrame sender(ThreadProxy th, Address fp, Address pc) {
+  public default CFrame sender(ThreadProxy th, Address sp, Address fp, Address pc) {
     return sender(th);
   }
 
@@ -70,4 +72,9 @@ public interface CFrame {
   /** Visit all local variables in this frame if debug information is
       available. Automatically descends into compound types and arrays. */
   public void iterateLocals(ObjectVisitor v);
+
+  /** Get Frame instance assosiated with this CFrame. */
+  public default Frame toFrame() {
+    throw new UnsupportedPlatformException();
+  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
index 894e31949b2..e3543503216 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -81,9 +81,11 @@ class LinuxCDebugger implements CDebugger {
     String cpu = dbg.getCPU();
     if (cpu.equals("amd64")) {
        AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
+       Address sp  = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+       if (sp == null) return null;
        Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
        if (pc == null) return null;
-       return LinuxAMD64CFrame.getTopFrame(dbg, pc, context);
+       return LinuxAMD64CFrame.getTopFrame(dbg, sp, pc, context);
     }  else if (cpu.equals("ppc64")) {
         PPC64ThreadContext context = (PPC64ThreadContext) thread.getContext();
         Address sp = context.getRegisterAsAddress(PPC64ThreadContext.SP);
@@ -93,18 +95,22 @@ class LinuxCDebugger implements CDebugger {
         return new LinuxPPC64CFrame(dbg, sp, pc, LinuxDebuggerLocal.getAddressSize());
     } else if (cpu.equals("aarch64")) {
        AARCH64ThreadContext context = (AARCH64ThreadContext) thread.getContext();
+       Address sp = context.getRegisterAsAddress(AARCH64ThreadContext.SP);
+       if (sp == null) return null;
        Address fp = context.getRegisterAsAddress(AARCH64ThreadContext.FP);
        if (fp == null) return null;
        Address pc  = context.getRegisterAsAddress(AARCH64ThreadContext.PC);
        if (pc == null) return null;
-       return new LinuxAARCH64CFrame(dbg, fp, pc);
+       return new LinuxAARCH64CFrame(dbg, sp, fp, pc);
     } else if (cpu.equals("riscv64")) {
        RISCV64ThreadContext context = (RISCV64ThreadContext) thread.getContext();
+       Address sp = context.getRegisterAsAddress(RISCV64ThreadContext.SP);
+       if (sp == null) return null;
        Address fp = context.getRegisterAsAddress(RISCV64ThreadContext.FP);
        if (fp == null) return null;
        Address pc  = context.getRegisterAsAddress(RISCV64ThreadContext.PC);
        if (pc == null) return null;
-       return new LinuxRISCV64CFrame(dbg, fp, pc);
+       return new LinuxRISCV64CFrame(dbg, sp, fp, pc);
     } else {
        // Runtime exception thrown by LinuxThreadContextFactory if unknown cpu
        ThreadContext context = thread.getContext();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java
index 93edb43eb82..5f76e6308e9 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/aarch64/LinuxAARCH64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,10 +30,14 @@ import sun.jvm.hotspot.debugger.aarch64.*;
 import sun.jvm.hotspot.debugger.linux.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
+import sun.jvm.hotspot.code.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.aarch64.*;
 
 public final class LinuxAARCH64CFrame extends BasicCFrame {
-   public LinuxAARCH64CFrame(LinuxDebugger dbg, Address fp, Address pc) {
+   public LinuxAARCH64CFrame(LinuxDebugger dbg, Address sp, Address fp, Address pc) {
       super(dbg.getCDebugger());
+      this.sp = sp;
       this.fp = fp;
       this.pc = pc;
       this.dbg = dbg;
@@ -55,11 +59,11 @@ public final class LinuxAARCH64CFrame extends BasicCFrame {
 
    @Override
    public CFrame sender(ThreadProxy thread) {
-      return sender(thread, null, null);
+      return sender(thread, null, null, null);
    }
 
    @Override
-   public CFrame sender(ThreadProxy thread, Address nextFP, Address nextPC) {
+   public CFrame sender(ThreadProxy thread, Address nextSP, Address nextFP, Address nextPC) {
       // Check fp
       // Skip if both nextFP and nextPC are given - do not need to load from fp.
       if (nextFP == null && nextPC == null) {
@@ -86,7 +90,32 @@ public final class LinuxAARCH64CFrame extends BasicCFrame {
       if (nextPC == null) {
         return null;
       }
-      return new LinuxAARCH64CFrame(dbg, nextFP, nextPC);
+
+      if (nextSP == null) {
+        CodeCache cc = VM.getVM().getCodeCache();
+        CodeBlob currentBlob = cc.findBlobUnsafe(pc());
+
+        // This case is different from HotSpot. See JDK-8371194 for details.
+        if (currentBlob != null && (currentBlob.isContinuationStub() || currentBlob.isNativeMethod())) {
+          // Use FP since it should always be valid for these cases.
+          // TODO: These should be walked as Frames not CFrames.
+          nextSP = fp.addOffsetTo(2 * ADDRESS_SIZE);
+        } else {
+          CodeBlob codeBlob = cc.findBlobUnsafe(nextPC);
+          boolean useCodeBlob = codeBlob != null && codeBlob.getFrameSize() > 0;
+          nextSP = useCodeBlob ? nextFP.addOffsetTo((2 * ADDRESS_SIZE) - codeBlob.getFrameSize()) : nextFP;
+        }
+      }
+      if (nextSP == null) {
+        return null;
+      }
+
+      return new LinuxAARCH64CFrame(dbg, nextSP, nextFP, nextPC);
+   }
+
+   @Override
+   public Frame toFrame() {
+     return new AARCH64Frame(sp, fp, pc);
    }
 
    // package/class internals only
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java
index 9fa0fc20e99..612203634f3 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java
@@ -29,10 +29,12 @@ import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.linux.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.amd64.*;
 
 public final class LinuxAMD64CFrame extends BasicCFrame {
 
-   public static LinuxAMD64CFrame getTopFrame(LinuxDebugger dbg, Address rip, ThreadContext context) {
+   public static LinuxAMD64CFrame getTopFrame(LinuxDebugger dbg, Address rsp, Address rip, ThreadContext context) {
       Address libptr = dbg.findLibPtrByAddress(rip);
       Address cfa = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
       DwarfParser dwarf = null;
@@ -45,7 +47,7 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
           // DWARF processing should succeed when the frame is native
           // but it might fail if Common Information Entry (CIE) has language
           // personality routine and/or Language Specific Data Area (LSDA).
-          return new LinuxAMD64CFrame(dbg, cfa, rip, dwarf, true);
+          return new LinuxAMD64CFrame(dbg, rsp, cfa, rip, dwarf, true);
         }
 
         cfa = context.getRegisterAsAddress(dwarf.getCFARegister())
@@ -53,19 +55,20 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
       }
 
       return (cfa == null) ? null
-                           : new LinuxAMD64CFrame(dbg, cfa, rip, dwarf);
+                           : new LinuxAMD64CFrame(dbg, rsp, cfa, rip, dwarf);
    }
 
-   private LinuxAMD64CFrame(LinuxDebugger dbg, Address cfa, Address rip, DwarfParser dwarf) {
-      this(dbg, cfa, rip, dwarf, false);
+   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address cfa, Address rip, DwarfParser dwarf) {
+      this(dbg, rsp, cfa, rip, dwarf, false);
    }
 
-   private LinuxAMD64CFrame(LinuxDebugger dbg, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame) {
-      this(dbg, cfa, rip, dwarf, finalFrame, false);
+   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame) {
+      this(dbg, rsp, cfa, rip, dwarf, finalFrame, false);
    }
 
-   private LinuxAMD64CFrame(LinuxDebugger dbg, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame, boolean use1ByteBeforeToLookup) {
+   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame, boolean use1ByteBeforeToLookup) {
       super(dbg.getCDebugger());
+      this.rsp = rsp;
       this.cfa = cfa;
       this.rip = rip;
       this.dbg = dbg;
@@ -107,7 +110,14 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
          (!isNative || (isNative && nextCFA.greaterThan(cfa)));
    }
 
-   private Address getNextCFA(DwarfParser nextDwarf, ThreadContext context, Address senderFP) {
+   private Address getNextRSP() {
+     // next RSP should be previous slot of return address.
+     var bp = dwarf == null ? cfa.addOffsetTo(ADDRESS_SIZE) // top of BP points callser BP
+                            : cfa.addOffsetTo(dwarf.getReturnAddressOffsetFromCFA());
+     return bp.addOffsetTo(ADDRESS_SIZE);
+   }
+
+   private Address getNextCFA(DwarfParser nextDwarf, ThreadContext context, Address senderFP, Address senderPC) {
      Address nextCFA;
      boolean isNative = false;
 
@@ -115,13 +125,17 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
        senderFP = cfa.getAddressAt(0);  // RBP by default
      }
 
-     if (nextDwarf == null) { // Next frame is Java
+     if (VM.getVM().getCodeCache().contains(senderPC)) { // Next frame is Java
        nextCFA = (dwarf == null) ? senderFP // Current frame is Java
                                  : cfa.getAddressAt(dwarf.getBasePointerOffsetFromCFA()); // Current frame is Native
      } else { // Next frame is Native
-       if (dwarf == null) { // Current frame is Java
+       if (VM.getVM().getCodeCache().contains(pc())) { // Current frame is Java
          nextCFA = senderFP.addOffsetTo(-nextDwarf.getBasePointerOffsetFromCFA());
        } else { // Current frame is Native
+         if (nextDwarf == null) { // maybe runtime entrypoint (_start())
+           throw new DebuggerException("nextDwarf is null even though native call");
+         }
+
          isNative = true;
          int nextCFAReg = nextDwarf.getCFARegister();
          if (nextCFAReg == AMD64ThreadContext.RBP) {
@@ -130,10 +144,7 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
            Address nextRBP = rbp.getAddressAt(0);
            nextCFA = nextRBP.addOffsetTo(-nextDwarf.getBasePointerOffsetFromCFA());
          } else if (nextCFAReg == AMD64ThreadContext.RSP) {
-           // next RSP should be previous slot of return address.
-           Address nextRSP = cfa.addOffsetTo(dwarf.getReturnAddressOffsetFromCFA())
-                                .addOffsetTo(ADDRESS_SIZE);
-           nextCFA = nextRSP.addOffsetTo(nextDwarf.getCFAOffset());
+           nextCFA = getNextRSP().addOffsetTo(nextDwarf.getCFAOffset());
          } else {
            throw new DebuggerException("Unsupported CFA register: " + nextCFAReg);
          }
@@ -153,17 +164,22 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
 
    @Override
    public CFrame sender(ThreadProxy th) {
-     return sender(th, null, null);
+     return sender(th, null, null, null);
    }
 
    @Override
-   public CFrame sender(ThreadProxy th, Address fp, Address pc) {
+   public CFrame sender(ThreadProxy th, Address sp, Address fp, Address pc) {
      if (finalFrame) {
        return null;
      }
 
      ThreadContext context = th.getContext();
 
+     Address nextRSP = sp != null ? sp : getNextRSP();
+     if (nextRSP == null) {
+       return null;
+     }
+
      Address nextPC = pc != null ? pc : getNextPC(dwarf != null);
      if (nextPC == null) {
        return null;
@@ -183,13 +199,16 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
          // DWARF processing should succeed when the frame is native
          // but it might fail if Common Information Entry (CIE) has language
          // personality routine and/or Language Specific Data Area (LSDA).
-         return new LinuxAMD64CFrame(dbg, null, nextPC, nextDwarf, true);
+         return null;
        }
      }
 
-     Address nextCFA = getNextCFA(nextDwarf, context, fp);
-     return nextCFA == null ? null
-                            : new LinuxAMD64CFrame(dbg, nextCFA, nextPC, nextDwarf, false, fallback);
+     try {
+       Address nextCFA = getNextCFA(nextDwarf, context, fp, nextPC);
+       return new LinuxAMD64CFrame(dbg, nextRSP, nextCFA, nextPC, nextDwarf, false, fallback);
+     } catch (DebuggerException _) {
+       return null;
+     }
    }
 
    private DwarfParser createDwarfParser(Address pc) throws DebuggerException {
@@ -210,8 +229,14 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
      return nextDwarf;
    }
 
+   @Override
+   public Frame toFrame() {
+     return new AMD64Frame(rsp, cfa, rip);
+   }
+
    // package/class internals only
    private static final int ADDRESS_SIZE = 8;
+   private Address rsp;
    private Address rip;
    private Address cfa;
    private LinuxDebugger dbg;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java
index 424766fb1b4..c3724f14c2a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ppc64/LinuxPPC64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@ import sun.jvm.hotspot.debugger.ppc64.*;
 import sun.jvm.hotspot.debugger.linux.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.ppc64.*;
 
 public final class LinuxPPC64CFrame extends BasicCFrame {
   // package/class internals only
@@ -71,6 +73,12 @@ public final class LinuxPPC64CFrame extends BasicCFrame {
     return new LinuxPPC64CFrame(dbg, nextSP, nextPC, address_size);
   }
 
+  @Override
+  public Frame toFrame() {
+    // 2nd arg (raw_fp) would be derived from sp in c'tor of PPC64Frame.
+    return new PPC64Frame(sp, null, pc);
+  }
+
   public static int PPC64_STACK_BIAS = 0;
   private static int address_size;
   private Address pc;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java
index 76f45891c47..65563be59ec 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc.
  * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +31,17 @@ import sun.jvm.hotspot.debugger.riscv64.*;
 import sun.jvm.hotspot.debugger.linux.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.riscv64.*;
 
 public final class LinuxRISCV64CFrame extends BasicCFrame {
    private static final int C_FRAME_LINK_OFFSET        = -2;
    private static final int C_FRAME_RETURN_ADDR_OFFSET = -1;
+   private static final int C_FRAME_SENDER_SP_OFFSET   =  0;
 
-   public LinuxRISCV64CFrame(LinuxDebugger dbg, Address fp, Address pc) {
+   public LinuxRISCV64CFrame(LinuxDebugger dbg, Address sp, Address fp, Address pc) {
       super(dbg.getCDebugger());
+      this.sp = sp;
       this.fp = fp;
       this.pc = pc;
       this.dbg = dbg;
@@ -59,11 +63,11 @@ public final class LinuxRISCV64CFrame extends BasicCFrame {
 
    @Override
    public CFrame sender(ThreadProxy thread) {
-      return sender(thread, null, null);
+      return sender(thread, null, null, null);
    }
 
    @Override
-   public CFrame sender(ThreadProxy thread, Address nextFP, Address nextPC) {
+   public CFrame sender(ThreadProxy thread, Address nextSP, Address nextFP, Address nextPC) {
       // Check fp
       // Skip if both nextFP and nextPC are given - do not need to load from fp.
       if (nextFP == null && nextPC == null) {
@@ -77,6 +81,13 @@ public final class LinuxRISCV64CFrame extends BasicCFrame {
         }
       }
 
+      if (nextSP == null) {
+        nextSP = fp.getAddressAt(C_FRAME_SENDER_SP_OFFSET * ADDRESS_SIZE);
+      }
+      if (nextSP == null) {
+        return null;
+      }
+
       if (nextFP == null) {
         nextFP = fp.getAddressAt(C_FRAME_LINK_OFFSET * ADDRESS_SIZE);
       }
@@ -91,7 +102,12 @@ public final class LinuxRISCV64CFrame extends BasicCFrame {
         return null;
       }
 
-      return new LinuxRISCV64CFrame(dbg, nextFP, nextPC);
+      return new LinuxRISCV64CFrame(dbg, nextSP, nextFP, nextPC);
+   }
+
+   @Override
+   public Frame toFrame() {
+      return new RISCV64Frame(sp, fp, pc);
    }
 
    // package/class internals only
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java
index 5ae4cb703b3..7233d508cbc 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java
@@ -272,9 +272,7 @@ public class AARCH64Frame extends Frame {
     if (cb != null) {
       if (cb.isUpcallStub()) {
         return senderForUpcallStub(map, (UpcallStub)cb);
-      } else if (cb.isContinuationStub()) {
-        return senderForContinuationStub(map, cb);
-      } else {
+      } else if (cb.getFrameSize() > 0) {
         return senderForCompiledFrame(map, cb);
       }
     }
@@ -389,7 +387,11 @@ public class AARCH64Frame extends Frame {
     if (Assert.ASSERTS_ENABLED) {
         Assert.that(cb.getFrameSize() > 0, "must have non-zero frame size");
     }
-    Address senderSP = getUnextendedSP().addOffsetTo(cb.getFrameSize());
+
+    // TODO: senderSP should consider not only PreserveFramePointer but also _sp_is_trusted.
+    Address senderSP = !VM.getVM().getCommandLineBooleanFlag("PreserveFramePointer")
+                           ? getUnextendedSP().addOffsetTo(cb.getFrameSize())
+                           : getSenderSP();
 
     // The return_address is always the word on the stack
     Address senderPC = stripPAC(senderSP.getAddressAt(-1 * VM.getVM().getAddressSize()));
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java
index 360f62a253d..fa9d50160e1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java
@@ -272,9 +272,7 @@ public class AMD64Frame extends Frame {
     if (cb != null) {
       if (cb.isUpcallStub()) {
         return senderForUpcallStub(map, (UpcallStub)cb);
-      } else if (cb.isContinuationStub()) {
-        return senderForContinuationStub(map, cb);
-      } else {
+      } else if (cb.getFrameSize() > 0) {
         return senderForCompiledFrame(map, cb);
       }
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
index 9865fbbe0f2..29d2954efdc 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
@@ -70,7 +70,6 @@ public class PStack extends Tool {
       if (cdbg != null) {
          ConcurrentLocksPrinter concLocksPrinter = null;
          // compute and cache java Vframes.
-         initJFrameCache();
          if (concurrentLocks) {
             concLocksPrinter = new ConcurrentLocksPrinter(out);
          }
@@ -96,6 +95,7 @@ public class PStack extends Tool {
            return;
         }
          final boolean cdbgCanDemangle = cdbg.canDemangle();
+         Map<ThreadProxy, JavaThread> proxyToThread = createProxyToThread();;
          String fillerForAddress = " ".repeat(2 + 2 * (int) VM.getVM().getAddressSize()) + "\t";
          for (Iterator<ThreadProxy> itr = l.iterator() ; itr.hasNext();) {
             ThreadProxy th = itr.next();
@@ -109,6 +109,7 @@ public class PStack extends Tool {
                   jthread.printThreadInfoOn(out);
                }
                while (f != null) {
+                  Address senderSP = null;
                   Address senderFP = null;
                   Address senderPC = null;
                   ClosestSymbol sym = f.closestSymbolToPC();
@@ -131,7 +132,7 @@ public class PStack extends Tool {
                       // check interpreter frame
                       Interpreter interp = VM.getVM().getInterpreter();
                       if (interp.contains(pc)) {
-                         nameInfo = getJavaNames(th, f.localVariableBase());
+                         nameInfo = getJavaNames(jthread, f);
                          // print codelet name if we can't determine method
                          if (nameInfo == null || nameInfo.names() == null || nameInfo.names().length == 0) {
                             out.print("<interpreter> ");
@@ -156,7 +157,7 @@ public class PStack extends Tool {
                                   }
                                   out.println(" (Native method)");
                                } else {
-                                  nameInfo = getJavaNames(th, f.localVariableBase());
+                                  nameInfo = getJavaNames(jthread, f);
                                   // just print compiled code, if can't determine method
                                   if (nameInfo == null || nameInfo.names() == null || nameInfo.names().length == 0) {
                                     out.println("<Unknown compiled code>");
@@ -164,6 +165,12 @@ public class PStack extends Tool {
                                }
                             } else {
                                out.println("<" + cb.getName() + ">");
+                               if (cb.getFrameSize() > 0) {
+                                  Frame senderFrame = f.toFrame().sender(jthread.newRegisterMap(true));
+                                  senderSP = senderFrame.getSP();
+                                  senderFP = senderFrame.getFP();
+                                  senderPC = senderFrame.getPC();
+                               }
                             }
                          } else {
                             printUnknown(out);
@@ -180,11 +187,12 @@ public class PStack extends Tool {
                                  out.println(nameInfo.names()[i]);
                              }
                          }
+                         senderSP = nameInfo.senderSP();
                          senderFP = nameInfo.senderFP();
                          senderPC = nameInfo.senderPC();
                       }
                   }
-                  f = f.sender(th, senderFP, senderPC);
+                  f = f.sender(th, senderSP, senderFP, senderPC);
                }
             } catch (Exception exp) {
                exp.printStackTrace();
@@ -212,95 +220,74 @@ public class PStack extends Tool {
    }
 
    // -- Internals only below this point
-   private Map<ThreadProxy, JavaVFrame[]> jframeCache;
-   private Map<ThreadProxy, JavaThread> proxyToThread;
    private PrintStream out;
    private boolean verbose;
    private boolean concurrentLocks;
 
-   private void initJFrameCache() {
-      // cache frames for subsequent reference
-      jframeCache = new HashMap<>();
-      proxyToThread = new HashMap<>();
+   private Map<ThreadProxy, JavaThread> createProxyToThread() {
+      Map<ThreadProxy, JavaThread> proxyToThread = new HashMap<>();
       Threads threads = VM.getVM().getThreads();
       for (int i = 0; i < threads.getNumberOfThreads(); i++) {
-         JavaThread cur = threads.getJavaThreadAt(i);
-         List<JavaVFrame> tmp = new ArrayList<>(10);
-         try {
-            for (JavaVFrame vf = cur.getLastJavaVFrameDbg(); vf != null; vf = vf.javaSender()) {
-               tmp.add(vf);
-            }
-         } catch (Exception exp) {
-            // may be we may get frames for other threads, continue
-            // after printing stack trace.
-            exp.printStackTrace();
-         }
-         JavaVFrame[] jvframes = tmp.toArray(new JavaVFrame[0]);
-         jframeCache.put(cur.getThreadProxy(), jvframes);
-         proxyToThread.put(cur.getThreadProxy(), cur);
+         JavaThread jthread = threads.getJavaThreadAt(i);
+         proxyToThread.put(jthread.getThreadProxy(), jthread);
       }
+      return proxyToThread;
    }
 
    private void printUnknown(PrintStream out) {
       out.println("\t????????");
    }
 
-   private static record JavaNameInfo(String[] names, Address senderFP, Address senderPC) {};
-
-   private JavaNameInfo getJavaNames(ThreadProxy th, Address fp) {
-      if (fp == null) {
-         return null;
-      }
-      JavaVFrame[] jvframes = jframeCache.get(th);
-      if (jvframes == null) return null; // not a java thread
+   private static record JavaNameInfo(String[] names, Address senderSP, Address senderFP, Address senderPC) {};
 
+   private JavaNameInfo getJavaNames(JavaThread jthread, CFrame f) {
       List<String> names = new ArrayList<>(10);
-      JavaVFrame bottomJVFrame = null;
-      for (int fCount = 0; fCount < jvframes.length; fCount++) {
-         JavaVFrame vf = jvframes[fCount];
-         Frame f = vf.getFrame();
-         if (fp.equals(f.getFP())) {
-            bottomJVFrame = vf;
-            StringBuilder sb = new StringBuilder();
-            Method method = vf.getMethod();
-            // a special char to identify java frames in output
-            sb.append("* ");
-            sb.append(method.externalNameAndSignature());
-            sb.append(" bci:").append(vf.getBCI());
-            int lineNumber = method.getLineNumberFromBCI(vf.getBCI());
-            if (lineNumber != -1) {
-                sb.append(" line:").append(lineNumber);
-            }
-
-            if (verbose) {
-               sb.append(" Method*:").append(method.getAddress());
-            }
-
-            if (vf.isCompiledFrame()) {
-               sb.append(" (Compiled frame");
-               if (vf.isDeoptimized()) {
-                 sb.append(" [deoptimized]");
-               }
-            } else if (vf.isInterpretedFrame()) {
-               sb.append(" (Interpreted frame");
-            }
-            if (vf.mayBeImpreciseDbg()) {
-               sb.append("; information may be imprecise");
-            }
-            sb.append(")");
-            names.add(sb.toString());
-         }
-      }
-
+      Address senderSP = null;
       Address senderFP = null;
       Address senderPC = null;
-      if (bottomJVFrame != null) {
-         Frame senderFrame = bottomJVFrame.getFrame().sender((RegisterMap)bottomJVFrame.getRegisterMap().clone());
+      VFrame vf = VFrame.newVFrame(f.toFrame(), jthread.newRegisterMap(true), jthread, true, true);
+      while (vf != null && vf.isJavaFrame()) {
+         StringBuilder sb = new StringBuilder();
+         Method method = ((JavaVFrame)vf).getMethod();
+         // a special char to identify java frames in output
+         sb.append("* ");
+         sb.append(method.externalNameAndSignature());
+         sb.append(" bci:").append(((JavaVFrame)vf).getBCI());
+         int lineNumber = method.getLineNumberFromBCI(((JavaVFrame)vf).getBCI());
+         if (lineNumber != -1) {
+            sb.append(" line:").append(lineNumber);
+         }
+
+         if (verbose) {
+            sb.append(" Method*:").append(method.getAddress());
+         }
+
+         if (vf.isCompiledFrame()) {
+            sb.append(" (Compiled frame");
+            if (vf.isDeoptimized()) {
+               sb.append(" [deoptimized]");
+            }
+         } else if (vf.isInterpretedFrame()) {
+            sb.append(" (Interpreted frame");
+         }
+         if (vf.mayBeImpreciseDbg()) {
+            sb.append("; information may be imprecise");
+         }
+         sb.append(")");
+         names.add(sb.toString());
+
+         // Keep registers in sender Frame
+         Frame senderFrame = vf.getFrame()
+                               .sender((RegisterMap)vf.getRegisterMap().clone());
+         senderSP = senderFrame.getSP();
          senderFP = senderFrame.getFP();
          senderPC = senderFrame.getPC();
+
+         // Get sender VFrame for next stack walking
+         vf = vf.sender(true);
       }
 
-      return new JavaNameInfo(names.toArray(new String[0]), senderFP, senderPC);
+      return new JavaNameInfo(names.toArray(new String[0]), senderSP, senderFP, senderPC);
    }
 
    public void setVerbose(boolean verbose) {
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 423bcdecaa8..a51e8aef5ee 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -143,7 +143,6 @@ serviceability/sa/TestJmapCore.java               8318754 macosx-aarch64
 serviceability/sa/TestJmapCoreMetaspace.java      8318754 macosx-aarch64
 
 serviceability/sa/ClhsdbThreadContext.java        8356704 windows-x64
-serviceability/sa/TestJhsdbJstackMixedWithXComp.java 8371194 linux-x64
 
 serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java 8315980 linux-all,windows-x64
 
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithXComp.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithXComp.java
index 043a198331e..a26fc4532df 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithXComp.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithXComp.java
@@ -23,6 +23,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import jdk.test.lib.JDKToolLauncher;
@@ -32,7 +33,7 @@ import jdk.test.lib.apps.LingeredApp;
 import jdk.test.lib.process.OutputAnalyzer;
 
 /**
- * @test
+ * @test id=xcomp
  * @bug 8370176
  * @requires vm.hasSA
  * @requires os.family == "linux"
@@ -40,6 +41,28 @@ import jdk.test.lib.process.OutputAnalyzer;
  * @library /test/lib
  * @run driver TestJhsdbJstackMixedWithXComp
  */
+
+/**
+ * @test id=xcomp-preserve-frame-pointer
+ * @bug 8370176
+ * @requires vm.hasSA
+ * @requires os.family == "linux"
+ * @requires os.arch == "amd64"
+ * @library /test/lib
+ * @run driver TestJhsdbJstackMixedWithXComp -XX:+PreserveFramePointer
+ */
+
+/**
+ * @test id=xcomp-disable-tiered-compilation
+ * @bug 8370176
+ * @requires vm.hasSA
+ * @requires os.family == "linux"
+ * @requires os.arch == "amd64"
+ * @library /test/lib
+ * @run driver TestJhsdbJstackMixedWithXComp -XX:-TieredCompilation
+ */
+
+
 public class TestJhsdbJstackMixedWithXComp {
 
     private static void runJstack(LingeredApp app) throws Exception {
@@ -89,8 +112,12 @@ public class TestJhsdbJstackMixedWithXComp {
         LingeredApp app = null;
 
         try {
+            List<String> jvmOpts = new ArrayList<>();
+            jvmOpts.add("-Xcomp");
+            jvmOpts.addAll(Arrays.asList(args));
+
             app = new LingeredAppWithVirtualThread();
-            LingeredApp.startApp(app, "-Xcomp");
+            LingeredApp.startApp(app, jvmOpts.toArray(new String[0]));
             System.out.println("Started LingeredApp with pid " + app.getPid());
             runJstack(app);
             System.out.println("Test Completed");

From 6abf7b6f226adb580718a314dc218d87289c80ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 2 Dec 2025 12:38:16 +0000
Subject: [PATCH 429/512] 8371986: Remove the default value of
 InitialRAMPercentage

Reviewed-by: shade, aboldtch
---
 src/hotspot/share/gc/shared/gc_globals.hpp  | 2 +-
 src/hotspot/share/runtime/flags/jvmFlag.cpp | 2 +-
 src/java.base/share/man/java.md             | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index e86a8744847..d08e95378f7 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -291,7 +291,7 @@
           "size on systems with small physical memory size")                \
           range(0.0, 100.0)                                                 \
                                                                             \
-  product(double, InitialRAMPercentage, 0.2,                                \
+  product(double, InitialRAMPercentage, 0.0,                                \
           "Percentage of real memory used for initial heap size")           \
           range(0.0, 100.0)                                                 \
                                                                             \
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 487528c49bd..51517fa49db 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -162,7 +162,7 @@ void JVMFlag::print_on(outputStream* st, bool withComments, bool printRanges) co
     //      uintx ThresholdTolerance                       = 10                                        {product} {default}
     //     size_t TLABSize                                 = 0                                         {product} {default}
     //      uintx SurvivorRatio                            = 8                                         {product} {default}
-    //     double InitialRAMPercentage                     = 1.562500                                  {product} {default}
+    //     double InitialRAMPercentage                     = 0.000000                                  {product} {default}
     //      ccstr CompileCommandFile                       = MyFile.cmd                                {product} {command line}
     //  ccstrlist CompileOnly                              = Method1
     //            CompileOnly                             += Method2                                   {product} {command line}
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 462baa5a4a0..8517e161e3f 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -2455,8 +2455,7 @@ Java HotSpot VM.
 `-XX:InitialRAMPercentage=`*percent*
 :   Sets the initial amount of memory that the JVM will use for the Java heap
     before applying ergonomics heuristics as a percentage of the maximum amount
-    determined as described in the `-XX:MaxRAM` option. The default value is
-    0.2 percent.
+    determined as described in the `-XX:MaxRAM` option.
 
     The following example shows how to set the percentage of the initial
     amount of memory used for the Java heap:

From eecba58c6817dbac129c545604d6286dfdcf951f Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 2 Dec 2025 13:05:46 +0000
Subject: [PATCH 430/512] 8371587: Final mapping lost in
 ProcSmapsParser::parse_next

Reviewed-by: jsjolen, fandreuzzi
---
 src/hotspot/os/linux/procMapsParser.cpp       |  27 +++--
 src/hotspot/os/linux/procMapsParser.hpp       |   3 +-
 .../runtime/test_procMapsParser_linux.cpp     | 109 ++++++++++++++++++
 3 files changed, 125 insertions(+), 14 deletions(-)
 create mode 100644 test/hotspot/gtest/runtime/test_procMapsParser_linux.cpp

diff --git a/src/hotspot/os/linux/procMapsParser.cpp b/src/hotspot/os/linux/procMapsParser.cpp
index 47c5c6cc594..0663cae61f3 100644
--- a/src/hotspot/os/linux/procMapsParser.cpp
+++ b/src/hotspot/os/linux/procMapsParser.cpp
@@ -50,7 +50,14 @@ ProcSmapsParser::~ProcSmapsParser() {
 
 bool ProcSmapsParser::read_line() {
   _line[0] = '\0';
-  return ::fgets(_line, _linelen, _f) != nullptr;
+
+  if (::fgets(_line, _linelen, _f) == nullptr) {
+    // On error or EOF, ensure deterministic empty buffer
+    _line[0] = '\0';
+    return false;
+  } else {
+    return true;
+  }
 }
 
 bool ProcSmapsParser::is_header_line() {
@@ -101,8 +108,6 @@ void ProcSmapsParser::scan_additional_line(ProcSmapsInfo& out) {
   }
 }
 
-// Starts or continues parsing. Returns true on success,
-// false on EOF or on error.
 bool ProcSmapsParser::parse_next(ProcSmapsInfo& out) {
 
   // Information about a single mapping reaches across several lines.
@@ -117,15 +122,13 @@ bool ProcSmapsParser::parse_next(ProcSmapsInfo& out) {
   assert(is_header_line(), "Not a header line: \"%s\".", _line);
   scan_header_line(out);
 
-  // Now read until we encounter the next header line or EOF or an error.
-  bool ok = false, stop = false;
-  do {
-    ok = read_line();
-    stop = !ok || is_header_line();
-    if (!stop) {
-      scan_additional_line(out);
+  while (true) {
+    bool ok = read_line();
+    if (!ok || is_header_line()) {
+      break;  // EOF or next header
     }
-  } while (!stop);
+    scan_additional_line(out);
+  }
 
-  return ok;
+  return true;  // always return true if a mapping was parsed
 }
diff --git a/src/hotspot/os/linux/procMapsParser.hpp b/src/hotspot/os/linux/procMapsParser.hpp
index 06035333b2f..037af91358f 100644
--- a/src/hotspot/os/linux/procMapsParser.hpp
+++ b/src/hotspot/os/linux/procMapsParser.hpp
@@ -84,8 +84,7 @@ public:
   ProcSmapsParser(FILE* f);
   ~ProcSmapsParser();
 
-  // Starts or continues parsing. Returns true on success,
-  // false on EOF or on error.
+  // Starts or continues parsing. Returns true iff a mapping was parsed.
   bool parse_next(ProcSmapsInfo& out);
 };
 
diff --git a/test/hotspot/gtest/runtime/test_procMapsParser_linux.cpp b/test/hotspot/gtest/runtime/test_procMapsParser_linux.cpp
new file mode 100644
index 00000000000..0177acda49f
--- /dev/null
+++ b/test/hotspot/gtest/runtime/test_procMapsParser_linux.cpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifdef LINUX
+
+#include "procMapsParser.hpp"
+#include "unittest.hpp"
+
+#include <stdio.h>
+
+TEST(ProcSmapsParserTest, ParseMappings) {
+  const char* smaps_content =
+    "7f5a00000000-7f5a00001000 r--p 00000000 00:00 0                          [anon]\n"
+    "Size:                  4 kB\n"
+    "KernelPageSize:        4 kB\n"
+    "MMUPageSize:           4 kB\n"
+    "Rss:                   0 kB\n"
+    "Pss:                   0 kB\n"
+    "Shared_Clean:          0 kB\n"
+    "Shared_Dirty:          0 kB\n"
+    "Private_Clean:         0 kB\n"
+    "Private_Dirty:         0 kB\n"
+    "Referenced:            0 kB\n"
+    "Anonymous:             0 kB\n"
+    "LazyFree:              0 kB\n"
+    "AnonHugePages:         0 kB\n"
+    "ShmemPmdMapped:        0 kB\n"
+    "FilePmdMapped:         0 kB\n"
+    "Shared_Hugetlb:        0 kB\n"
+    "Private_Hugetlb:       0 kB\n"
+    "Swap:                  0 kB\n"
+    "SwapPss:               0 kB\n"
+    "Locked:                0 kB\n"
+    "THPeligible:    0\n"
+    "VmFlags: rd mr mw me ac \n"
+    "7f5a00001000-7f5a00002000 rw-p 00000000 00:00 0                          [anon]\n"
+    "Size:                  4 kB\n"
+    "KernelPageSize:        4 kB\n"
+    "MMUPageSize:           4 kB\n"
+    "Rss:                   4 kB\n"
+    "Pss:                   4 kB\n"
+    "Shared_Clean:          0 kB\n"
+    "Shared_Dirty:          0 kB\n"
+    "Private_Clean:         0 kB\n"
+    "Private_Dirty:         4 kB\n"
+    "Referenced:            4 kB\n"
+    "Anonymous:             4 kB\n"
+    "LazyFree:              0 kB\n"
+    "AnonHugePages:         0 kB\n"
+    "ShmemPmdMapped:        0 kB\n"
+    "FilePmdMapped:         0 kB\n"
+    "Shared_Hugetlb:        0 kB\n"
+    "Private_Hugetlb:       0 kB\n"
+    "Swap:                  0 kB\n"
+    "SwapPss:               0 kB\n"
+    "Locked:                0 kB\n"
+    "THPeligible:    0\n"
+    "VmFlags: rd wr mr mw me ac \n";
+
+  FILE* f = fmemopen((void*)smaps_content, strlen(smaps_content), "r");
+  ASSERT_TRUE(f != nullptr);
+
+  ProcSmapsParser parser(f);
+  ProcSmapsInfo info;
+
+  // First mapping
+  ASSERT_TRUE(parser.parse_next(info));
+  EXPECT_EQ((uintptr_t)info.from, 0x7f5a00000000ULL);
+  EXPECT_EQ((uintptr_t)info.to, 0x7f5a00001000ULL);
+  EXPECT_STREQ(info.prot, "r--p");
+  EXPECT_TRUE(info.rd);
+  EXPECT_FALSE(info.wr);
+
+  // Second mapping
+  ASSERT_TRUE(parser.parse_next(info));
+  EXPECT_EQ((uintptr_t)info.from, 0x7f5a00001000ULL);
+  EXPECT_EQ((uintptr_t)info.to, 0x7f5a00002000ULL);
+  EXPECT_STREQ(info.prot, "rw-p");
+  EXPECT_TRUE(info.rd);
+  EXPECT_TRUE(info.wr);
+
+  // End of file
+  ASSERT_FALSE(parser.parse_next(info));
+
+  fclose(f);
+}
+
+#endif // LINUX

From 6c01d3b08862447983b96daaf34a4c62daf54101 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 2 Dec 2025 13:10:37 +0000
Subject: [PATCH 431/512] 8372451: C2 SuperWord: "endless loop" assert. Need to
 implement proper worklist mechanism

Reviewed-by: mhaessig, chagedorn
---
 src/hotspot/share/opto/vtransform.cpp         | 115 ++++++++++++------
 src/hotspot/share/opto/vtransform.hpp         |  51 ++++++--
 .../superword/TestLongReductionChain.java     |  85 +++++++++++++
 3 files changed, 207 insertions(+), 44 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestLongReductionChain.java

diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
index b437d2e6eac..93aefe0d505 100644
--- a/src/hotspot/share/opto/vtransform.cpp
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -40,38 +40,76 @@ void VTransformGraph::add_vtnode(VTransformNode* vtnode) {
     }                                                 \
   )
 
-// This is similar to IGVN optimization. But we are a bit lazy, and don't care about
-// notification / worklist, since the list of nodes is rather small, and we don't
-// expect optimizations that trickle over the whole graph.
-void VTransformGraph::optimize(VTransform& vtransform) {
-  TRACE_OPTIMIZE( tty->print_cr("\nVTransformGraph::optimize"); )
-
-  bool progress = true;
-  DEBUG_ONLY(int pass_count = 0;)
-  while (progress) {
-    progress = false;
-    assert(++pass_count < 10, "ensure we do not have endless loops");
-    for (int i = 0; i < _vtnodes.length(); i++) {
-      VTransformNode* vtn = _vtnodes.at(i);
-      if (!vtn->is_alive()) { continue; }
-      progress |= vtn->optimize(_vloop_analyzer, vtransform);
-
-      // Nodes that have no use any more are dead.
-      if (vtn->out_strong_edges() == 0 &&
-          // There are some exceptions:
-          // 1. Memory phi uses are not modeled, so they appear to have no use here, but must be kept alive.
-          // 2. Similarly, some stores may not have their memory uses modeled, but need to be kept alive.
-          // 3. Outer node with strong inputs: is a use after the loop that we must keep alive.
-          !(vtn->isa_PhiScalar() != nullptr ||
-            vtn->is_load_or_store_in_loop() ||
-            (vtn->isa_Outer() != nullptr && vtn->has_strong_in_edge()))) {
-        vtn->mark_dead();
-        progress = true;
-      }
-    }
+void VTransformOptimize::worklist_push(VTransformNode* vtn) {
+  if (!_worklist_set.test_set(vtn->_idx)) {
+    _worklist.push(vtn);
   }
 }
 
+VTransformNode* VTransformOptimize::worklist_pop() {
+  VTransformNode* vtn = _worklist.pop();
+  _worklist_set.remove(vtn->_idx);
+  return vtn;
+}
+
+void VTransform::optimize() {
+  NOT_PRODUCT( if (vloop().is_trace_optimization()) { tty->print_cr("\nVTransform::optimize"); } )
+  ResourceMark rm;
+  VTransformOptimize vtoptimize(_vloop_analyzer, *this);
+  vtoptimize.optimize();
+}
+
+void VTransformOptimize::optimize() {
+  // Initialize: push all nodes to worklist.
+  for (int i = 0; i < _vtransform.graph().vtnodes().length(); i++) {
+    VTransformNode* vtn = _vtransform.graph().vtnodes().at(i);
+    worklist_push(vtn);
+  }
+
+  // We don't want to iterate too many times. We set some arbitrary limit,
+  // just to catch infinite loops.
+  DEBUG_ONLY( int allowed_steps = 100 * _worklist.length(); )
+
+  // Optimize iteratively.
+  while (_worklist.is_nonempty()) {
+    VTransformNode* vtn = worklist_pop();
+    optimize_step(vtn);
+    assert(--allowed_steps > 0, "no endless loop");
+  }
+
+  DEBUG_ONLY( verify(); )
+}
+
+#ifdef ASSERT
+void VTransformOptimize::verify() {
+  for (int i = 0; i < _vtransform.graph().vtnodes().length(); i++) {
+    VTransformNode* vtn = _vtransform.graph().vtnodes().at(i);
+    assert(!optimize_step(vtn), "Missed optimization during VTransform::optimize for %s", vtn->name());
+    assert(_worklist.is_empty(), "vtnode on worklist despite no progress for %s", vtn->name());
+  }
+}
+#endif
+
+// Return true if (and only if) we made progress.
+bool VTransformOptimize::optimize_step(VTransformNode* vtn) {
+  if (!vtn->is_alive()) { return false; }
+  bool progress = vtn->optimize(*this);
+
+  // Nodes that have no use any more are dead.
+  if (vtn->out_strong_edges() == 0 &&
+      // There are some exceptions:
+      // 1. Memory phi uses are not modeled, so they appear to have no use here, but must be kept alive.
+      // 2. Similarly, some stores may not have their memory uses modeled, but need to be kept alive.
+      // 3. Outer node with strong inputs: is a use after the loop that we must keep alive.
+      !(vtn->isa_PhiScalar() != nullptr ||
+        vtn->is_load_or_store_in_loop() ||
+        (vtn->isa_Outer() != nullptr && vtn->has_strong_in_edge()))) {
+    vtn->mark_dead(*this);
+    return true;
+  }
+  return progress;
+}
+
 // Compute a linearization of the graph. We do this with a reverse-post-order of a DFS.
 // This only works if the graph is a directed acyclic graph (DAG). The C2 graph, and
 // the VLoopDependencyGraph are both DAGs, but after introduction of vectors/packs, the
@@ -1141,8 +1179,8 @@ VTransformApplyResult VTransformBoolVectorNode::apply(VTransformApplyState& appl
   return VTransformApplyResult::make_vector(vn);
 }
 
-bool VTransformReductionVectorNode::optimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) {
-  return optimize_move_non_strict_order_reductions_out_of_loop(vloop_analyzer, vtransform);
+bool VTransformReductionVectorNode::optimize(VTransformOptimize& vtoptimize) {
+  return optimize_move_non_strict_order_reductions_out_of_loop(vtoptimize);
 }
 
 int VTransformReductionVectorNode::vector_reduction_opcode() const {
@@ -1213,7 +1251,7 @@ bool VTransformReductionVectorNode::requires_strict_order() const {
 //       become profitable, since the expensive reduction node is moved
 //       outside the loop, and instead cheaper element-wise vector accumulations
 //       are performed inside the loop.
-bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop_preconditions(VTransform& vtransform) {
+bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop_preconditions(const VTransform& vtransform) {
   // We have a phi with a single use.
   VTransformPhiScalarNode* phi = in_req(1)->isa_PhiScalar();
   if (phi == nullptr) {
@@ -1260,13 +1298,13 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
         current_red->element_basic_type() != bt ||
         current_red->vector_length() != vlen) {
       TRACE_OPTIMIZE(
-        tty->print("  Cannot move out of loop, other reduction node does not match:");
+        tty->print("  Cannot move out of loop, other reduction node does not match: ");
         print();
         tty->print("  other: ");
         if (current_red != nullptr) {
           current_red->print();
         } else {
-          tty->print("nullptr");
+          tty->print_cr("nullptr");
         }
       )
       return false; // not compatible
@@ -1314,7 +1352,8 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   return true; // success
 }
 
-bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) {
+bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_out_of_loop(VTransformOptimize& vtoptimize) {
+  VTransform& vtransform = vtoptimize.vtransform();
   if (!optimize_move_non_strict_order_reductions_out_of_loop_preconditions(vtransform)) {
     return false;
   }
@@ -1328,7 +1367,7 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   const uint vlen    = vector_length();
   const BasicType bt = element_basic_type();
   const int vopc     = VectorNode::opcode(sopc, bt);
-  PhaseIdealLoop* phase = vloop_analyzer.vloop().phase();
+  PhaseIdealLoop* phase = vtoptimize.vloop_analyzer().vloop().phase();
 
   // Create a vector of identity values.
   Node* identity = ReductionNode::make_identity_con_scalar(phase->igvn(), sopc, bt);
@@ -1341,6 +1380,7 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   // Look at old scalar phi.
   VTransformPhiScalarNode* phi_scalar = in_req(1)->isa_PhiScalar();
   PhiNode* old_phi = phi_scalar->node();
+  vtoptimize.worklist_push(phi_scalar);
   VTransformNode* init = phi_scalar->in_req(1);
 
   TRACE_OPTIMIZE(
@@ -1354,6 +1394,7 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
   phi_vector->init_req(0, phi_scalar->in_req(0));
   phi_vector->init_req(1, vtn_identity_vector);
   // Note: backedge comes later
+  vtoptimize.worklist_push(phi_vector);
 
   // Traverse down the chain of reductions, and replace them with vector_accumulators.
   VTransformReductionVectorNode* first_red   = this;
@@ -1365,6 +1406,8 @@ bool VTransformReductionVectorNode::optimize_move_non_strict_order_reductions_ou
     VTransformVectorNode* vector_accumulator = new (vtransform.arena()) VTransformElementWiseVectorNode(vtransform, 3, current_red->properties(), vopc);
     vector_accumulator->init_req(1, current_vector_accumulator);
     vector_accumulator->init_req(2, vector_input);
+    vtoptimize.worklist_push(current_red);
+    vtoptimize.worklist_push(vector_accumulator);
     TRACE_OPTIMIZE(
       tty->print("  replace    ");
       current_red->print();
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index a3e4977494e..b60c71945e1 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -24,6 +24,7 @@
 #ifndef SHARE_OPTO_VTRANSFORM_HPP
 #define SHARE_OPTO_VTRANSFORM_HPP
 
+#include "libadt/vectset.hpp"
 #include "opto/node.hpp"
 #include "opto/vectorization.hpp"
 #include "opto/vectornode.hpp"
@@ -192,7 +193,6 @@ public:
   const GrowableArray<VTransformNode*>& vtnodes() const { return _vtnodes; }
   const GrowableArray<VTransformNode*>& get_schedule() const { return _schedule; }
 
-  void optimize(VTransform& vtransform);
   bool schedule();
   bool has_store_to_load_forwarding_failure(const VLoopAnalyzer& vloop_analyzer) const;
   float cost_for_vector_loop() const;
@@ -257,7 +257,7 @@ public:
   DEBUG_ONLY( bool has_graph() const { return !_graph.is_empty(); } )
   VTransformGraph& graph() { return _graph; }
 
-  void optimize() { return _graph.optimize(*this); }
+  void optimize();
   bool schedule() { return _graph.schedule(); }
   bool is_profitable() const;
   float cost_for_vector_loop() const { return _graph.cost_for_vector_loop(); }
@@ -291,6 +291,36 @@ private:
   void apply_vectorization() const;
 };
 
+// We keep track of the worklist during optimizations.
+// The concept is somewhat parallel to IGVN: we keep on
+// optimizing vtnodes on the worklist, which may in turn
+// add more nodes to the list. We keep on optimizing until
+// no more nodes are on the worklist.
+class VTransformOptimize : public StackObj {
+private:
+  const VLoopAnalyzer& _vloop_analyzer;
+  VTransform& _vtransform;
+
+  GrowableArray<VTransformNode*> _worklist;
+  VectorSet _worklist_set;
+
+public:
+  VTransformOptimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) :
+    _vloop_analyzer(vloop_analyzer),
+    _vtransform(vtransform) {}
+
+  const VLoopAnalyzer& vloop_analyzer() const { return _vloop_analyzer; }
+  VTransform& vtransform() { return _vtransform; }
+
+  void worklist_push(VTransformNode* vtn);
+  void optimize();
+
+private:
+  VTransformNode* worklist_pop();
+  bool optimize_step(VTransformNode* vtn);
+  DEBUG_ONLY( void verify(); )
+};
+
 // Keeps track of the state during "VTransform::apply"
 // -> keep track of the already transformed nodes and the memory state.
 class VTransformApplyState : public StackObj {
@@ -531,10 +561,15 @@ public:
 
   bool is_alive() const { return _is_alive; }
 
-  void mark_dead() {
+  void mark_dead(VTransformOptimize& vtoptimize) {
     _is_alive = false;
-    // Remove all inputs
+    // Remove all inputs, and put inputs on worklist in
+    // case they are also dead.
     for (uint i = 0; i < req(); i++) {
+      VTransformNode* in = in_req(i);
+      if (in != nullptr) {
+        vtoptimize.worklist_push(in);
+      }
       set_req(i, nullptr);
     }
   }
@@ -558,7 +593,7 @@ public:
   virtual const VPointer& vpointer() const { ShouldNotReachHere(); }
   virtual bool is_loop_head_phi() const { return false; }
 
-  virtual bool optimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) { return false; }
+  virtual bool optimize(VTransformOptimize& vtoptimize) { return false; }
 
   virtual float cost(const VLoopAnalyzer& vloop_analyzer) const = 0;
 
@@ -868,7 +903,7 @@ public:
   VTransformReductionVectorNode(VTransform& vtransform, const VTransformVectorNodeProperties properties) :
     VTransformVectorNode(vtransform, 3, properties) {}
   virtual VTransformReductionVectorNode* isa_ReductionVector() override { return this; }
-  virtual bool optimize(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform) override;
+  virtual bool optimize(VTransformOptimize& vtoptimize) override;
   virtual float cost(const VLoopAnalyzer& vloop_analyzer) const override;
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "ReductionVector"; };)
@@ -876,8 +911,8 @@ public:
 private:
   int vector_reduction_opcode() const;
   bool requires_strict_order() const;
-  bool optimize_move_non_strict_order_reductions_out_of_loop_preconditions(VTransform& vtransform);
-  bool optimize_move_non_strict_order_reductions_out_of_loop(const VLoopAnalyzer& vloop_analyzer, VTransform& vtransform);
+  bool optimize_move_non_strict_order_reductions_out_of_loop_preconditions(const VTransform& vtransform);
+  bool optimize_move_non_strict_order_reductions_out_of_loop(VTransformOptimize& vtoptimize);
 };
 
 class VTransformPhiVectorNode : public VTransformVectorNode {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestLongReductionChain.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestLongReductionChain.java
new file mode 100644
index 00000000000..37dd964048f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestLongReductionChain.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts.superword;
+
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8372451
+ * @summary Test long reduction chain. Triggered bug with long chain of dead ReductionVector
+ *          vtnodes after optimize_move_non_strict_order_reductions_out_of_loop.
+ * @library /test/lib /
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=1000 -XX:MaxVectorSize=8 -Xbatch
+ *                   -XX:CompileCommand=compileonly,${test.main.class}::test
+ *                   ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+public class TestLongReductionChain {
+    static int RANGE = 1024*8;
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    public static void main(String[] args) {
+        int[] aI = generateI();
+        int[] bI = generateI();
+        int gold = test(aI, bI);
+
+        for (int i = 0; i < 1000; i++) {
+            int result = test(aI, bI);
+            if (result != gold) {
+                throw new RuntimeException("wrong value");
+            }
+        }
+    }
+
+    static int[] generateI() {
+        int[] a = new int[RANGE];
+        for (int i = 0; i < a.length; i++) {
+            a[i] = RANDOM.nextInt();
+        }
+        return a;
+    }
+
+    // Test creates a very long reduction chain, especially with -XX:LoopUnrollLimit=1000.
+    // Limiting the reduction vectors to 2 elements gets us a very long chain -XX:MaxVectorSize=8.
+    // During VTransform::optimize this means a long chain of nodes needs to be found as dead.
+    // Before the fix, this took too many rounds, and we hit an assert.
+    static int test(int[] a, int[] b) {
+        int s = 0;
+        for (int i = 0; i < RANGE; i+=8) {
+            s += a[i+0] * b[i+0];
+            s += a[i+1] * b[i+1];
+            s += a[i+2] * b[i+2];
+            s += a[i+3] * b[i+3];
+
+            s += a[i+4] & b[i+4];
+            s += a[i+5] & b[i+5];
+            s += a[i+6] & b[i+6];
+            s += a[i+7] & b[i+7];
+        }
+        return s;
+    }
+}

From c97d53a9529d9148aacd85a3b31d694f04df0758 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Tue, 2 Dec 2025 13:32:22 +0000
Subject: [PATCH 432/512] 8371470: Java Launcher does not fail when running
 compact java-file with private no-arg constructor

Reviewed-by: jpai
---
 .../tools/javac/launcher/SourceLauncher.java  |  6 ++++
 .../tools/javac/resources/launcher.properties |  6 ++++
 .../javac/launcher/SourceLauncherTest.java    | 35 +++++++++++++------
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
index 4d679403ee7..af7d79d4195 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
@@ -226,6 +226,8 @@ public final class SourceLauncher {
 
         Object instance = null;
 
+        // Similar to sun.launcher.LauncherHelper#checkAndLoadMain, including
+        // checks performed in LauncherHelper#validateMainMethod
         if (!isStatic) {
             if (Modifier.isAbstract(mainClass.getModifiers())) {
                 throw new Fault(Errors.CantInstantiate(mainClassName));
@@ -238,6 +240,10 @@ public final class SourceLauncher {
                 throw new Fault(Errors.CantFindConstructor(mainClassName));
             }
 
+            if (Modifier.isPrivate(constructor.getModifiers())) {
+                throw new Fault(Errors.CantUsePrivateConstructor(mainClassName));
+            }
+
             try {
                 constructor.setAccessible(true);
                 instance = constructor.newInstance();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
index 122e5dca80d..36d50afad0f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
@@ -124,6 +124,12 @@ launcher.err.cant.access.main.method=\
 launcher.err.cant.find.constructor=\
     can''t find no argument constructor in class: {0}
 
+# 0: string
+launcher.err.cant.use.private.constructor=\
+    no non-private zero argument constructor found in class {0}\n\
+    remove private from existing constructor or define as:\n\
+\   public {0}()
+
 # 0: string
 launcher.err.cant.access.constructor=\
     can''t access no argument constructor in class: {0}
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index 6b147d32d00..37d50674855 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -798,6 +798,22 @@ public class SourceLauncherTest extends TestRunner {
             }
         }
 
+    @Test
+    public void testPrivateConstructor(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                """
+                class PrivateConstructor {
+                    private PrivateConstructor() {}
+                    void main() {}
+                }
+                """);
+        testError(base.resolve("PrivateConstructor.java"), "",
+                """
+                error: no non-private zero argument constructor found in class PrivateConstructor
+                remove private from existing constructor or define as:
+                   public PrivateConstructor()""");
+    }
+
     @Test
     public void testAbstractClassInstanceMain(Path base) throws IOException {
         tb.writeJavaFiles(base,
@@ -904,14 +920,6 @@ public class SourceLauncherTest extends TestRunner {
         }
     }
 
-    void checkContains(String name, String found, String expect) {
-        expect = expect.replace("\n", tb.lineSeparator);
-        out.println(name + ": " + found);
-        if (!found.contains(expect)) {
-            error("Expected output not found: " + expect);
-        }
-    }
-
     void checkEqual(String name, List<String> found, List<String> expect) {
         out.println(name + ": " + found);
         tb.checkEqual(expect, found);
@@ -939,7 +947,6 @@ public class SourceLauncherTest extends TestRunner {
     }
 
     void checkFault(String name, Throwable found, String expect) {
-        expect = expect.replace("\n", tb.lineSeparator);
         out.println(name + ": " + found);
         if (found == null) {
             error("No exception thrown; expected Fault");
@@ -947,8 +954,14 @@ public class SourceLauncherTest extends TestRunner {
             if (!(found instanceof Fault)) {
                 error("Unexpected exception; expected Fault");
             }
-            if (!(found.getMessage().equals(expect))) {
-                error("Unexpected detail message; expected: " + expect);
+            String actual = found.getMessage();
+            List<String> actualLines = actual.lines().toList();
+            List<String> expectLines = expect.lines().toList();
+            if (!(actualLines.equals(expectLines))) {
+                error("Unexpected detail message; expected: \n"
+                      + expect.indent(2)
+                      + "\nactual:\n"
+                      + actual.indent(2));
             }
         }
     }

From 6f2169ff6996e0629ce80455959a21947fd5de2c Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 2 Dec 2025 13:55:45 +0000
Subject: [PATCH 433/512] 8372755: Remove local suppression of VS C4146
 warnings

Reviewed-by: ayang
---
 src/hotspot/os/windows/sharedRuntimeRem.cpp | 4 +---
 src/hotspot/share/runtime/atomicAccess.hpp  | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/hotspot/os/windows/sharedRuntimeRem.cpp b/src/hotspot/os/windows/sharedRuntimeRem.cpp
index aae93f701ec..fbcf68a5940 100644
--- a/src/hotspot/os/windows/sharedRuntimeRem.cpp
+++ b/src/hotspot/os/windows/sharedRuntimeRem.cpp
@@ -50,11 +50,9 @@ double SharedRuntime::fmod_winx64(double x, double y)
   hx ^= sx;                /* |x| */
   hy &= 0x7fffffff;       /* |y| */
 
-#pragma warning( disable : 4146 )
   /* purge off exception values */
   if ((hy | ly) == 0 || (hx >= 0x7ff00000) ||       /* y=0,or x not finite */
-    ((hy | ((ly | -ly) >> 31))>0x7ff00000))     /* or y is NaN */
-#pragma warning( default : 4146 )
+      ((hy | ((ly | -ly) >> 31))>0x7ff00000))       /* or y is NaN */
     return (x*y) / (x*y);
   if (hx <= hy) {
     if ((hx<hy) || (lx<ly)) return x;      /* |x|<|y| return x */
diff --git a/src/hotspot/share/runtime/atomicAccess.hpp b/src/hotspot/share/runtime/atomicAccess.hpp
index fb06f084366..c9a2dfb9383 100644
--- a/src/hotspot/share/runtime/atomicAccess.hpp
+++ b/src/hotspot/share/runtime/atomicAccess.hpp
@@ -635,7 +635,6 @@ inline void AtomicAccess::dec(D volatile* dest, atomic_memory_order order) {
   STATIC_ASSERT(std::is_pointer<D>::value || std::is_integral<D>::value);
   using I = std::conditional_t<std::is_pointer<D>::value, ptrdiff_t, D>;
   // Assumes two's complement integer representation.
-  #pragma warning(suppress: 4146)
   AtomicAccess::add(dest, I(-1), order);
 }
 
@@ -652,7 +651,6 @@ inline D AtomicAccess::sub(D volatile* dest, I sub_value, atomic_memory_order or
   STATIC_ASSERT(sizeof(I) <= sizeof(AddendType));
   AddendType addend = sub_value;
   // Assumes two's complement integer representation.
-  #pragma warning(suppress: 4146) // In case AddendType is not signed.
   return AtomicAccess::add(dest, -addend, order);
 }
 

From a62296d8a0858d63a930e91168254a9927f06783 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 2 Dec 2025 14:00:21 +0000
Subject: [PATCH 434/512] 8371464: C2: assert(no_dead_loop) failed: dead loop
 detected

Reviewed-by: chagedorn, dfenacci
---
 src/hotspot/share/opto/cfgnode.cpp            | 13 +--
 src/hotspot/share/opto/cfgnode.hpp            |  2 +-
 .../compiler/c2/TestDeadLoopAtMergeMem.java   | 83 +++++++++++++++++++
 3 files changed, 91 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestDeadLoopAtMergeMem.java

diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp
index 0293f42d791..0598f10b880 100644
--- a/src/hotspot/share/opto/cfgnode.cpp
+++ b/src/hotspot/share/opto/cfgnode.cpp
@@ -326,7 +326,7 @@ bool RegionNode::is_unreachable_region(const PhaseGVN* phase) {
 
   // First, cut the simple case of fallthrough region when NONE of
   // region's phis references itself directly or through a data node.
-  if (is_possible_unsafe_loop(phase)) {
+  if (is_possible_unsafe_loop()) {
     // If we have a possible unsafe loop, check if the region node is actually unreachable from root.
     if (is_unreachable_from_root(phase)) {
       _is_unreachable_region = true;
@@ -336,7 +336,7 @@ bool RegionNode::is_unreachable_region(const PhaseGVN* phase) {
   return false;
 }
 
-bool RegionNode::is_possible_unsafe_loop(const PhaseGVN* phase) const {
+bool RegionNode::is_possible_unsafe_loop() const {
   uint max = outcnt();
   uint i;
   for (i = 0; i < max; i++) {
@@ -634,8 +634,8 @@ Node *RegionNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     }
   } else if (can_reshape && cnt == 1) {
     // Is it dead loop?
-    // If it is LoopNopde it had 2 (+1 itself) inputs and
-    // one of them was cut. The loop is dead if it was EntryContol.
+    // If it is LoopNode it had 2 (+1 itself) inputs and
+    // one of them was cut. The loop is dead if it was EntryControl.
     // Loop node may have only one input because entry path
     // is removed in PhaseIdealLoop::Dominators().
     assert(!this->is_Loop() || cnt_orig <= 3, "Loop node should have 3 or less inputs");
@@ -1392,7 +1392,7 @@ bool PhiNode::try_clean_memory_phi(PhaseIterGVN* igvn) {
   }
   assert(is_diamond_phi() > 0, "sanity");
   assert(req() == 3, "same as region");
-  const Node* region = in(0);
+  RegionNode* region = in(0)->as_Region();
   for (uint i = 1; i < 3; i++) {
     Node* phi_input = in(i);
     if (phi_input != nullptr && phi_input->is_MergeMem() && region->in(i)->outcnt() == 1) {
@@ -1400,8 +1400,9 @@ bool PhiNode::try_clean_memory_phi(PhaseIterGVN* igvn) {
       MergeMemNode* merge_mem = phi_input->as_MergeMem();
       uint j = 3 - i;
       Node* other_phi_input = in(j);
-      if (other_phi_input != nullptr && other_phi_input == merge_mem->base_memory()) {
+      if (other_phi_input != nullptr && other_phi_input == merge_mem->base_memory() && !is_data_loop(region, phi_input, igvn)) {
         // merge_mem is a successor memory to other_phi_input, and is not pinned inside the diamond, so push it out.
+        // Only proceed if the transformation doesn't create a data loop
         // This will allow the diamond to collapse completely if there are no other phis left.
         igvn->replace_node(this, merge_mem);
         return true;
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index 78ad085e03d..bc0b38e2f97 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -84,7 +84,7 @@ private:
   bool _is_unreachable_region;
   LoopStatus _loop_status;
 
-  bool is_possible_unsafe_loop(const PhaseGVN* phase) const;
+  bool is_possible_unsafe_loop() const;
   bool is_unreachable_from_root(const PhaseGVN* phase) const;
 public:
   // Node layout (parallels PhiNode):
diff --git a/test/hotspot/jtreg/compiler/c2/TestDeadLoopAtMergeMem.java b/test/hotspot/jtreg/compiler/c2/TestDeadLoopAtMergeMem.java
new file mode 100644
index 00000000000..5c4dcc76a76
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestDeadLoopAtMergeMem.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8371464
+ * @summary C2: assert(no_dead_loop) failed: dead loop detected
+ * @run main/othervm -Xcomp -XX:CompileOnly=TestDeadLoopAtMergeMem::test TestDeadLoopAtMergeMem
+ * @run main TestDeadLoopAtMergeMem
+ */
+
+public class TestDeadLoopAtMergeMem {
+    static final int N = 400;
+    static long instanceCount;
+    boolean bFld;
+    float fArrFld[];
+    static int iArrFld[] = new int[N];
+    long vMeth_check_sum;
+
+    public static void main(String[] strArr) {
+        TestDeadLoopAtMergeMem r = new TestDeadLoopAtMergeMem();
+        for (int i = 0; i < 1000; i++) {
+            r.test((short) 0, instanceCount);
+        }
+    }
+
+    void test(short s, long l) {
+        int i11 = 6, i12, i13 = 6, i14 = 2;
+        byte byArr2[] = new byte[N];
+        init(byArr2, (byte) 4);
+        helper(66.118169, i11);
+        for (i12 = 3; i12 < 23; i12++) {
+            if (bFld) {
+                instanceCount = 5;
+            } else if (bFld) {
+                fArrFld[i12] = s;
+                do {
+                    try {
+                        i11 = i13 / i12 % i12;
+                    } catch (ArithmeticException a_e) {
+                    }
+                } while (i14 < 8);
+            }
+        }
+        for (int i15 : iArrFld) {
+            try {
+                i11 = 1 / i15;
+            } catch (ArithmeticException a_e) {
+            }
+        }
+        vMeth_check_sum += i11;
+    }
+
+    void helper(double d, int i) {
+        int i1[] = new int[N];
+    }
+
+    public static void init(byte[] a, byte seed) {
+        for (int j = 0; j < a.length; j++) {
+            a[j] = (byte) ((j % 2 == 0) ? seed + j : seed - j);
+        }
+    }
+}

From ca4ae8063edddda36fafafd06b9b1a88ffbf9d2e Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <qamai@openjdk.org>
Date: Tue, 2 Dec 2025 15:44:19 +0000
Subject: [PATCH 435/512] 8371964: C2 compilation asserts with "Unexpected
 load/store size"

Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/vectornode.cpp         | 20 +++++++++++++++++--
 .../arraycopy/TestArrayCopyDisjoint.java      |  7 +++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index a49f3d24fd4..57b94205e5e 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -22,6 +22,8 @@
  */
 
 #include "memory/allocation.inline.hpp"
+#include "opto/c2_globals.hpp"
+#include "opto/compile.hpp"
 #include "opto/connode.hpp"
 #include "opto/convertnode.hpp"
 #include "opto/mulnode.hpp"
@@ -1145,7 +1147,14 @@ Node* LoadVectorMaskedNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     if (ty && ty->is_con()) {
       BasicType mask_bt = Matcher::vector_element_basic_type(in(3));
       int load_sz = type2aelembytes(mask_bt) * ty->get_con();
-      assert(load_sz <= MaxVectorSize, "Unexpected load size");
+      if (load_sz > MaxVectorSize) {
+        // After loop opts, cast nodes are aggressively removed, if the input is then transformed
+        // into a constant that is outside the range of the removed cast, we may encounter it here.
+        // This should be a dead node then.
+        assert(Compile::current()->post_loop_opts_phase(), "Unexpected load size");
+        return phase->C->top();
+      }
+
       if (load_sz == MaxVectorSize) {
         Node* ctr = in(MemNode::Control);
         Node* mem = in(MemNode::Memory);
@@ -1164,7 +1173,14 @@ Node* StoreVectorMaskedNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     if (ty && ty->is_con()) {
       BasicType mask_bt = Matcher::vector_element_basic_type(in(4));
       int load_sz = type2aelembytes(mask_bt) * ty->get_con();
-      assert(load_sz <= MaxVectorSize, "Unexpected store size");
+      if (load_sz > MaxVectorSize) {
+        // After loop opts, cast nodes are aggressively removed, if the input is then transformed
+        // into a constant that is outside the range of the removed cast, we may encounter it here.
+        // This should be a dead node then.
+        assert(Compile::current()->post_loop_opts_phase(), "Unexpected store size");
+        return phase->C->top();
+      }
+
       if (load_sz == MaxVectorSize) {
         Node* ctr = in(MemNode::Control);
         Node* mem = in(MemNode::Memory);
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java
index 162ba20048d..73b1af90548 100644
--- a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@ import java.util.Random;
 
 /**
  * @test
- * @bug 8251871 8285301
+ * @bug 8251871 8285301 8371964
  * @summary Optimize arrayCopy using AVX-512 masked instructions.
  *
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+IgnoreUnrecognizedVMOptions
@@ -52,6 +52,9 @@ import java.util.Random;
  *      compiler.arraycopy.TestArrayCopyDisjoint
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+AlwaysAtomicAccesses
  *      compiler.arraycopy.TestArrayCopyDisjoint
+ * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:+UnlockDiagnosticVMOptions -XX:UseAVX=3 -XX:MaxVectorSize=32 -XX:ArrayOperationPartialInlineSize=32 -XX:+StressIGVN
+ *      compiler.arraycopy.TestArrayCopyDisjoint
  *
  */
 

From 8d5a37b060dd0ecf31f71dfe82ca4a565bc7f6d9 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Tue, 2 Dec 2025 16:09:10 +0000
Subject: [PATCH 436/512] 8371188: [s390x] Un-ProblemList
 TestUnreachableInnerLoop.java

Reviewed-by: aph, phubner
---
 test/hotspot/jtreg/ProblemList.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index a51e8aef5ee..f379f57a8e5 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -49,7 +49,6 @@ compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
 
 compiler/runtime/Test8168712.java#with-dtrace 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
 compiler/runtime/Test8168712.java#without-dtrace 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
-compiler/loopopts/TestUnreachableInnerLoop.java 8288981 linux-s390x
 
 compiler/c2/Test8004741.java 8235801 generic-all
 compiler/c2/irTests/TestDuplicateBackedge.java 8318904 generic-all

From 37d8e05eccc959b5b5e04b3da848f7de9220b00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Tue, 2 Dec 2025 16:22:47 +0000
Subject: [PATCH 437/512] 8372708: Javadoc ignores "-locale" and uses default
 locale for all messages and texts

Reviewed-by: liach
---
 .../html/resources/standard_en.properties     |  28 +++++
 .../toolkit/resources/doclets_en.properties   |  28 +++++
 .../TestSupportedLocales.java                 | 106 ++++++++++++++++++
 3 files changed, 162 insertions(+)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_en.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_en.properties
 create mode 100644 test/langtools/jdk/javadoc/tool/testLocaleOption/TestSupportedLocales.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_en.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_en.properties
new file mode 100644
index 00000000000..e1312e77aa4
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_en.properties
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Empty resource bundle to be used with English default bundle as parent.
+# This is necessary to make English resources available on systems using
+# one of the supported non-English locales as default locale.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_en.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_en.properties
new file mode 100644
index 00000000000..e1312e77aa4
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_en.properties
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Empty resource bundle to be used with English default bundle as parent.
+# This is necessary to make English resources available on systems using
+# one of the supported non-English locales as default locale.
diff --git a/test/langtools/jdk/javadoc/tool/testLocaleOption/TestSupportedLocales.java b/test/langtools/jdk/javadoc/tool/testLocaleOption/TestSupportedLocales.java
new file mode 100644
index 00000000000..6d4e24f0c3a
--- /dev/null
+++ b/test/langtools/jdk/javadoc/tool/testLocaleOption/TestSupportedLocales.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8372708
+ * @summary  Javadoc ignores "-locale" and uses default locale for all messages and texts
+ * @library  /tools/lib ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestSupportedLocales
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Locale;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestSupportedLocales extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestSupportedLocales();
+        tester.runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+
+    // A locale with an associated output message
+    record LocalizedOutput(Locale locale, String message) {}
+
+    // Console messages are determined by the system default locale
+    private final LocalizedOutput[] consoleOutput = new LocalizedOutput[] {
+            new LocalizedOutput(Locale.CHINA, "\u6b63\u5728\u6784\u9020 Javadoc \u4fe1\u606f..."),
+            new LocalizedOutput(Locale.GERMANY, "Javadoc-Informationen werden erstellt..."),
+            new LocalizedOutput(Locale.JAPAN, "Javadoc\u60c5\u5831\u3092\u69cb\u7bc9\u3057\u3066\u3044\u307e\u3059..."),
+            new LocalizedOutput(Locale.US, "Constructing Javadoc information..."),
+    };
+
+    // Documentation messages are determined by the -locale option
+    private final LocalizedOutput[] documentationOutput = new LocalizedOutput[] {
+            new LocalizedOutput(Locale.CHINA, "\u7c7b\u548c\u63a5\u53e3"),
+            new LocalizedOutput(Locale.GERMANY, "Klassen und Schnittstellen"),
+            new LocalizedOutput(Locale.JAPAN, "\u30af\u30e9\u30b9\u3068\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9"),
+            new LocalizedOutput(Locale.US, "Classes and Interfaces"),
+    };
+
+    // Test all combinations of system and documentation locales
+    @Test
+    public void testSupportedLocales(Path base) throws Exception {
+        var src = base.resolve("src");
+        initSource(src);
+        for (var console : consoleOutput) {
+            for (var documentation : documentationOutput) {
+                test(base, console, documentation);
+            }
+        }
+    }
+
+    void test(Path base, LocalizedOutput console, LocalizedOutput documentation) throws Exception {
+        var src = base.resolve("src");
+        var out = base.resolve(console.locale + "-" + documentation.locale);
+        Locale.setDefault(console.locale);
+        javadoc("-d", out.toString(),
+                "-locale", documentation.locale.toString(),
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+        checkOutput(Output.OUT, true, console.message);
+        checkOutput("p/package-summary.html", true, documentation.message);
+    }
+
+    private void initSource(Path src) throws IOException {
+        tb.writeJavaFiles(src, """
+            package p;
+            /**
+             * A class.
+             */
+            public class C {
+                private C() { }
+            }""");
+    }
+}

From 153c567a4d3a537277a8c599142511aa4f4f3ae3 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 2 Dec 2025 18:06:43 +0000
Subject: [PATCH 438/512] 8370905: Update vm.defmeth tests to use virtual
 threads

Reviewed-by: vlivanov, coleenp, pchilanomate
---
 .../vm/runtime/defmeth/StressTest.java        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java
index e8fe73cb48b..4106f12587b 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java
@@ -44,6 +44,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
+import jdk.test.lib.thread.TestThreadFactory;
 import nsk.share.TestFailure;
 import nsk.share.test.StressOptions;
 import nsk.share.test.Stresser;
@@ -82,16 +83,18 @@ public class StressTest implements Runnable {
     @Option(name="ignoreTestFailures", default_value="false", description="ignore failures of the executed tests")
     private boolean ignoreTestFailures;
 
-    class Worker extends Thread {
+    class Worker implements Runnable {
         private final Random rand;
 
         private volatile DefMethTest failedTest;
         private Throwable reason;
         private volatile long executedTests = 0;
 
-        public Worker(String id, long seed) {
-            setName(id);
-            this.rand = new Random(seed);
+        private final Thread thread;
+
+         Worker(String id, long seed) {
+             this.rand = new Random(seed);
+             this.thread = TestThreadFactory.newThread(this, id);
         }
 
         @Override
@@ -247,13 +250,13 @@ public class StressTest implements Runnable {
         }
 
         for (Worker worker : workers) {
-            worker.start();
+            worker.thread.start();
         }
     }
 
     private void interruptWorkers() {
         for (Worker worker : workers) {
-            worker.interrupt();
+            worker.thread.interrupt();
         }
     }
 
@@ -261,14 +264,14 @@ public class StressTest implements Runnable {
         boolean isFailed = false;
 
         for (Worker worker : workers) {
-            while (worker.isAlive()) {
+            while (worker.thread.isAlive()) {
                 try {
-                    worker.join();
+                    worker.thread.join();
                 } catch (InterruptedException e) {}
             }
 
             System.out.printf("%s: %s (executed: %d)\n",
-                    worker.getName(),
+                    worker.thread.getName(),
                     worker.isFailed() ? "FAILED: " + worker.getFailedTest() : "PASSED",
                     worker.getExecutedTests());
 
@@ -288,7 +291,7 @@ public class StressTest implements Runnable {
 
     private boolean workersAlive() {
         for (Worker worker : workers) {
-            if (!worker.isAlive()) {
+            if (!worker.thread.isAlive()) {
                 return false;
             }
         }

From ac0e6af8f90ba77375b2841a5c8aa05743884a1e Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 2 Dec 2025 18:16:49 +0000
Subject: [PATCH 439/512] 6185110: Undefined behaviour of SampleModel for
 width, height < 0

Reviewed-by: psadhukhan
---
 .../java/awt/image/BandedSampleModel.java     | 196 ++++------
 .../java/awt/image/ComponentSampleModel.java  | 200 ++++-------
 .../image/MultiPixelPackedSampleModel.java    |  18 +-
 .../classes/java/awt/image/SampleModel.java   | 171 ++++-----
 .../image/SinglePixelPackedSampleModel.java   | 144 +++-----
 .../SampleModelGetSamplesAndPixelsTest.java   | 337 ++++++++++++++++++
 6 files changed, 616 insertions(+), 450 deletions(-)
 create mode 100644 test/jdk/java/awt/image/SampleModelGetSamplesAndPixelsTest.java

diff --git a/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
index bad9abc6130..229c8a20d35 100644
--- a/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
@@ -293,6 +293,9 @@ public final class BandedSampleModel extends ComponentSampleModel
      * @param data      The DataBuffer containing the image data.
      * @return the data for the specified pixel.
      * @see #setDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code obj} is too small to hold the output.
      */
     public Object getDataElements(int x, int y, Object obj, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -401,15 +404,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Returns all samples for the specified pixel in an int array.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param iArray    If non-null, returns the samples in this array
-     * @param data      The DataBuffer containing the image data
-     * @return the samples for the specified pixel.
-     * @see #setPixel(int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -434,26 +432,19 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Returns all samples for the specified rectangle of pixels in
-     * an int array, one sample per data array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param iArray    If non-null, returns the samples in this array
-     * @param data      The DataBuffer containing the image data
-     * @return the samples for the pixels within the specified region.
-     * @see #setPixels(int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or {@code w} or {@code h} is negative.
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixels(int x, int y, int w, int h,
                            int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 >  height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -484,16 +475,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Returns as int the sample in a specified band for the pixel
-     * located at (x,y).
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to return
-     * @param data      The DataBuffer containing the image data
-     * @return the sample in the specified band for the specified pixel.
-     * @see #setSample(int, int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public int getSample(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -508,16 +493,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Returns the sample in a specified band
-     * for the pixel located at (x,y) as a float.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to return
-     * @param data      The DataBuffer containing the image data
-     * @return a float value that represents the sample in the specified
-     * band for the specified pixel.
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public float getSampleFloat(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -532,16 +511,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Returns the sample in a specified band
-     * for a pixel located at (x,y) as a double.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to return
-     * @param data      The DataBuffer containing the image data
-     * @return a double value that represents the sample in the specified
-     * band for the specified pixel.
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public double getSampleDouble(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -556,25 +529,16 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Returns the samples in a specified band for the specified rectangle
-     * of pixels in an int array, one sample per data array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param b         The band to return
-     * @param iArray    If non-null, returns the samples in this array
-     * @param data      The DataBuffer containing the image data
-     * @return the samples in the specified band for the pixels within
-     * the specified region.
-     * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
                             int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
-        if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
+        if ((x < 0) || (y < 0) || (w < 0) || (h < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
@@ -633,6 +597,9 @@ public final class BandedSampleModel extends ComponentSampleModel
      *                  object
      * @param data      The DataBuffer containing the image data
      * @see #getDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code obj} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code obj} is too small to hold the input.
      */
     public void setDataElements(int x, int y, Object obj, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -700,14 +667,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Sets a pixel in the DataBuffer using an int array of samples for input.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param iArray    The input samples in an int array
-     * @param data      The DataBuffer containing the image data
-     * @see #getPixel(int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the input.
      */
     public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -722,25 +685,19 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Sets all samples for a rectangle of pixels from an int array containing
-     * one sample per array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param iArray    The input samples in an int array
-     * @param data      The DataBuffer containing the image data
-     * @see #getPixels(int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or {@code w} or {@code h} is negative.
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
                           int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 >  height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -763,16 +720,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the DataBuffer using an int for input.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to set
-     * @param s         The input sample as an int
-     * @param data      The DataBuffer containing the image data
-     * @see #getSample(int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b, int s,
                           DataBuffer data) {
@@ -786,16 +737,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the DataBuffer using a float for input.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to set
-     * @param s         The input sample as a float
-     * @param data      The DataBuffer containing the image data
-     * @see #getSample(int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b,
                           float s ,
@@ -810,16 +755,10 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the DataBuffer using a double for input.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to set
-     * @param s         The input sample as a double
-     * @param data      The DataBuffer containing the image data
-     * @see #getSample(int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b,
                           double s,
@@ -834,23 +773,16 @@ public final class BandedSampleModel extends ComponentSampleModel
     }
 
     /**
-     * Sets the samples in the specified band for the specified rectangle
-     * of pixels from an int array containing one sample per data array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param b         The band to set
-     * @param iArray    The input sample array
-     * @param data      The DataBuffer containing the image data
-     * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
                            int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
-        if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
+        if ((x < 0) || (y < 0) || (w < 0) || (h < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
diff --git a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
index 7a3d67c7e6e..89a72b18dea 100644
--- a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
@@ -600,7 +600,7 @@ public class ComponentSampleModel extends SampleModel
      * @return the data of the specified pixel
      * @see #setDataElements(int, int, Object, DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if obj is too small to hold the output.
      */
@@ -707,20 +707,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Returns all samples for the specified pixel in an int array,
-     * one sample per array element.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if
-     * the coordinates are not in bounds.
-     * @param x         the X coordinate of the pixel location
-     * @param y         the Y coordinate of the pixel location
-     * @param iArray    If non-null, returns the samples in this array
-     * @param data      The DataBuffer containing the image data
-     * @return the samples of the specified pixel.
-     * @see #setPixel(int, int, int[], DataBuffer)
-     *
-     * @throws NullPointerException if data is null.
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if iArray is too small to hold the output.
+     * not in bounds, or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -742,26 +732,19 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Returns all samples for the specified rectangle of pixels in
-     * an int array, one sample per array element.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if
-     * the coordinates are not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param iArray    If non-null, returns the samples in this array
-     * @param data      The DataBuffer containing the image data
-     * @return the samples of the pixels within the specified region.
-     * @see #setPixels(int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixels(int x, int y, int w, int h,
                            int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || y > height || y1 < 0 || y1 >  height)
+        if (x < 0 || (w < 0) || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || (h < 0) || y >= height || y > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -790,16 +773,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Returns as int the sample in a specified band for the pixel
-     * located at (x,y).
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if
-     * the coordinates are not in bounds.
-     * @param x         the X coordinate of the pixel location
-     * @param y         the Y coordinate of the pixel location
-     * @param b         the band to return
-     * @param data      the {@code DataBuffer} containing the image data
-     * @return the sample in a specified band for the specified pixel
-     * @see #setSample(int, int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public int getSample(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -814,16 +791,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Returns the sample in a specified band
-     * for the pixel located at (x,y) as a float.
-     * An {@code ArrayIndexOutOfBoundsException} might be
-     * thrown if the coordinates are not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to return
-     * @param data      The DataBuffer containing the image data
-     * @return a float value representing the sample in the specified
-     * band for the specified pixel.
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public float getSampleFloat(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -837,18 +808,11 @@ public class ComponentSampleModel extends SampleModel
                                          bandOffsets[b]);
         return sample;
     }
-
     /**
-     * Returns the sample in a specified band
-     * for a pixel located at (x,y) as a double.
-     * An {@code ArrayIndexOutOfBoundsException} might be
-     * thrown if the coordinates are not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to return
-     * @param data      The DataBuffer containing the image data
-     * @return a double value representing the sample in the specified
-     * band for the specified pixel.
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public double getSampleDouble(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -864,25 +828,16 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Returns the samples in a specified band for the specified rectangle
-     * of pixels in an int array, one sample per data array element.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if
-     * the coordinates are not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         the width of the pixel rectangle
-     * @param h         the height of the pixel rectangle
-     * @param b         the band to return
-     * @param iArray    if non-{@code null}, returns the samples
-     *                  in this array
-     * @param data      the {@code DataBuffer} containing the image data
-     * @return the samples in the specified band of the specified pixel
-     * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
                             int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
-        if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
+        if ((x < 0) || (y < 0) || (w < 0) || ( h < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
@@ -943,6 +898,9 @@ public class ComponentSampleModel extends SampleModel
      * @param obj       a primitive array containing pixel data
      * @param data      the DataBuffer containing the image data
      * @see #getDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code obj} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if obj is too small to hold the input.
      */
     public void setDataElements(int x, int y, Object obj, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -1011,15 +969,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Sets a pixel in the {@code DataBuffer} using an int array of
-     * samples for input.  An {@code ArrayIndexOutOfBoundsException}
-     * might be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param iArray    The input samples in an int array
-     * @param data      The DataBuffer containing the image data
-     * @see #getPixel(int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the input.
      */
     public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -1034,25 +987,19 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Sets all samples for a rectangle of pixels from an int array containing
-     * one sample per array element.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if the
-     * coordinates are not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param iArray    The input samples in an int array
-     * @param data      The DataBuffer containing the image data
-     * @see #getPixels(int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
                           int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 >  height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -1075,16 +1022,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the {@code DataBuffer} using an int for input.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if the
-     * coordinates are not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         the band to set
-     * @param s         the input sample as an int
-     * @param data      the DataBuffer containing the image data
-     * @see #getSample(int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b, int s,
                           DataBuffer data) {
@@ -1098,16 +1039,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the {@code DataBuffer} using a float for input.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if
-     * the coordinates are not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to set
-     * @param s         The input sample as a float
-     * @param data      The DataBuffer containing the image data
-     * @see #getSample(int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b,
                           float s ,
@@ -1123,16 +1058,10 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the {@code DataBuffer} using a double for input.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if
-     * the coordinates are not in bounds.
-     * @param x         The X coordinate of the pixel location
-     * @param y         The Y coordinate of the pixel location
-     * @param b         The band to set
-     * @param s         The input sample as a double
-     * @param data      The DataBuffer containing the image data
-     * @see #getSample(int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b,
                           double s,
@@ -1148,23 +1077,16 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /**
-     * Sets the samples in the specified band for the specified rectangle
-     * of pixels from an int array containing one sample per data array element.
-     * An {@code ArrayIndexOutOfBoundsException} might be thrown if the
-     * coordinates are not in bounds.
-     * @param x         The X coordinate of the upper left pixel location
-     * @param y         The Y coordinate of the upper left pixel location
-     * @param w         The width of the pixel rectangle
-     * @param h         The height of the pixel rectangle
-     * @param b         The band to set
-     * @param iArray    The input samples in an int array
-     * @param data      The DataBuffer containing the image data
-     * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
                            int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
-        if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
+        if ((x < 0) || (y < 0) || (w < 0) || (h < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
diff --git a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
index 9254d9fa717..e40da604887 100644
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
@@ -343,7 +343,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * coordinates are not in bounds.
      * @param x         the X coordinate of the specified pixel
      * @param y         the Y coordinate of the specified pixel
-     * @param b         the band to return, which is assumed to be 0
+     * @param b         the band to return, which must be 0
      * @param data      the {@code DataBuffer} containing the image
      *                  data
      * @return the specified band containing the sample of the specified
@@ -374,7 +374,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * coordinates are not in bounds.
      * @param x the X coordinate of the specified pixel
      * @param y the Y coordinate of the specified pixel
-     * @param b the band to return, which is assumed to be 0
+     * @param b the band to set, which must be 0
      * @param s the input sample as an {@code int}
      * @param data the {@code DataBuffer} where image data is stored
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
@@ -448,6 +448,9 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * not in bounds, or if {@code obj} is not {@code null} or
      * not large enough to hold the pixel data
      * @see #setDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {code obj} is too small to hold the output.
      */
     public Object getDataElements(int x, int y, Object obj, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -527,8 +530,11 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param data the {@code DataBuffer} where image data is stored
      * @return an array containing the specified pixel.
      * @throws ArrayIndexOutOfBoundsException if the coordinates
-     *  are not in bounds
+     * are not in bounds, or if {@code iArray} is too small to hold the output.
      * @see #setPixel(int, int, int[], DataBuffer)
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -588,6 +594,9 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param obj a primitive array containing pixel data
      * @param data the {@code DataBuffer} containing the image data
      * @see #getDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code obj} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code obj} is too small to hold the input.
      */
     public void setDataElements(int x, int y, Object obj, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -638,6 +647,9 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param iArray the input pixel in an {@code int} array
      * @param data the {@code DataBuffer} containing the image data
      * @see #getPixel(int, int, int[], DataBuffer)
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the input.
      */
     public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
diff --git a/src/java.desktop/share/classes/java/awt/image/SampleModel.java b/src/java.desktop/share/classes/java/awt/image/SampleModel.java
index 678925ffd20..0ecd4162c60 100644
--- a/src/java.desktop/share/classes/java/awt/image/SampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SampleModel.java
@@ -231,9 +231,9 @@ public abstract class SampleModel
      * @return the samples for the specified pixel.
      * @see #setPixel(int, int, int[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if iArray is too small to hold the output.
+     * not in bounds, or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
 
@@ -293,9 +293,9 @@ public abstract class SampleModel
      * @see java.awt.image.DataBuffer
      * @see #setDataElements(int, int, Object, DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if obj is too small to hold the output.
+     * not in bounds, or if {@code obj} is too small to hold the output.
      */
     public abstract Object getDataElements(int x, int y,
                                            Object obj, DataBuffer data);
@@ -347,9 +347,10 @@ public abstract class SampleModel
      * @see #setDataElements(int, int, int, int, Object, DataBuffer)
      * @see java.awt.image.DataBuffer
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if obj is too small to hold the output.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code obj} is too small to hold the output.
      */
     public Object getDataElements(int x, int y, int w, int h,
                                   Object obj, DataBuffer data) {
@@ -362,8 +363,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -528,7 +529,7 @@ public abstract class SampleModel
      * @see #getDataElements(int, int, Object, DataBuffer)
      * @see java.awt.image.DataBuffer
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code obj} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if obj is too small to hold the input.
      */
@@ -577,7 +578,7 @@ public abstract class SampleModel
      * @see #getDataElements(int, int, int, int, Object, DataBuffer)
      * @see java.awt.image.DataBuffer
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code obj} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if obj is too small to hold the input.
      */
@@ -592,8 +593,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -695,9 +696,9 @@ public abstract class SampleModel
      * @return the samples for the specified pixel.
      * @see #setPixel(int, int, float[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if fArray is too small to hold the output.
+     * not in bounds, or if {@code fArray} is too small to hold the output.
      */
     public float[] getPixel(int x, int y, float[] fArray,
                             DataBuffer data) {
@@ -726,9 +727,9 @@ public abstract class SampleModel
      * @return the samples for the specified pixel.
      * @see #setPixel(int, int, double[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if dArray is too small to hold the output.
+     * not in bounds, or if {@code dArray} is too small to hold the output.
      */
     public double[] getPixel(int x, int y, double[] dArray,
                              DataBuffer data) {
@@ -760,9 +761,10 @@ public abstract class SampleModel
      * @return the samples for the specified region of pixels.
      * @see #setPixels(int, int, int, int, int[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if iArray is too small to hold the output.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getPixels(int x, int y, int w, int h,
                            int[] iArray, DataBuffer data) {
@@ -772,8 +774,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -808,9 +810,10 @@ public abstract class SampleModel
      * @return the samples for the specified region of pixels.
      * @see #setPixels(int, int, int, int, float[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if fArray is too small to hold the output.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code fArray} is too small to hold the output.
      */
     public float[] getPixels(int x, int y, int w, int h,
                              float[] fArray, DataBuffer data) {
@@ -820,8 +823,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -856,9 +859,10 @@ public abstract class SampleModel
      * @return the samples for the specified region of pixels.
      * @see #setPixels(int, int, int, int, double[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if dArray is too small to hold the output.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code dArray} is too small to hold the output.
      */
     public double[] getPixels(int x, int y, int w, int h,
                               double[] dArray, DataBuffer data) {
@@ -867,8 +871,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -903,7 +907,7 @@ public abstract class SampleModel
      * @return the sample in a specified band for the specified pixel.
      * @see #setSample(int, int, int, int, DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
      * the band index are not in bounds.
      */
@@ -921,7 +925,7 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @return the sample in a specified band for the specified pixel.
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
      * the band index are not in bounds.
      */
@@ -943,7 +947,7 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @return the sample in a specified band for the specified pixel.
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
      * the band index are not in bounds.
      */
@@ -971,10 +975,10 @@ public abstract class SampleModel
      *         of pixels.
      * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
-     * the band index are not in bounds, or if iArray is too small to
-     * hold the output.
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
                             int[] iArray, DataBuffer data) {
@@ -983,8 +987,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x1 < x || x1 > width ||
-            y < 0 || y1 < y || y1 > height)
+        if (x < 0 || w < 0 || x1 < x || x1 > width ||
+            y < 0 || h < 0 || y1 < y || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -1019,10 +1023,10 @@ public abstract class SampleModel
      *         of pixels.
      * @see #setSamples(int, int, int, int, int, float[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
-     * the band index are not in bounds, or if fArray is too small to
-     * hold the output.
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the output.
      */
     public float[] getSamples(int x, int y, int w, int h,
                               int b, float[] fArray,
@@ -1032,8 +1036,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x1 < x || x1 > width ||
-            y < 0 || y1 < y || y1 > height)
+        if (x < 0 || w < 0 || x1 < x || x1 > width ||
+            y < 0 || h < 0 || y1 < y || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates");
         }
@@ -1068,10 +1072,10 @@ public abstract class SampleModel
      *         of pixels.
      * @see #setSamples(int, int, int, int, int, double[], DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
-     * the band index are not in bounds, or if dArray is too small to
-     * hold the output.
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code dArray} is too small to hold the output.
      */
     public double[] getSamples(int x, int y, int w, int h,
                                int b, double[] dArray,
@@ -1081,8 +1085,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x1 < x || x1 > width ||
-            y < 0 || y1 < y || y1 > height)
+        if (x < 0 || w < 0 || x1 < x || x1 > width ||
+            y < 0 || h < 0 || y1 < y || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates");
         }
@@ -1111,9 +1115,9 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getPixel(int, int, int[], DataBuffer)
      *
-     * @throws NullPointerException if iArray or data is null.
+     * @throws NullPointerException if {@code iArray} or {code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if iArray is too small to hold the input.
+     * not in bounds, or if {@code iArray} is too small to hold the input.
      */
     public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
 
@@ -1131,9 +1135,9 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getPixel(int, int, float[], DataBuffer)
      *
-     * @throws NullPointerException if fArray or data is null.
+     * @throws NullPointerException if {@code fArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if fArray is too small to hold the input.
+     * not in bounds, or if {@code fArray} is too small to hold the input.
      */
     public void setPixel(int x, int y, float[] fArray, DataBuffer data) {
 
@@ -1150,9 +1154,9 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getPixel(int, int, double[], DataBuffer)
      *
-     * @throws NullPointerException if dArray or data is null.
+     * @throws NullPointerException if {@code dArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if fArray is too small to hold the input.
+     * not in bounds, or if {@code dArray} is too small to hold the input.
      */
     public void setPixel(int x, int y, double[] dArray, DataBuffer data) {
 
@@ -1173,9 +1177,10 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getPixels(int, int, int, int, int[], DataBuffer)
      *
-     * @throws NullPointerException if iArray or data is null.
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if iArray is too small to hold the input.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
                           int[] iArray, DataBuffer data) {
@@ -1183,8 +1188,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -1211,9 +1216,10 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getPixels(int, int, int, int, float[], DataBuffer)
      *
-     * @throws NullPointerException if fArray or data is null.
+     * @throws NullPointerException if {@code fArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if fArray is too small to hold the input.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code fArray} is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
                           float[] fArray, DataBuffer data) {
@@ -1221,8 +1227,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -1249,9 +1255,10 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getPixels(int, int, int, int, double[], DataBuffer)
      *
-     * @throws NullPointerException if dArray or data is null.
+     * @throws NullPointerException if {@code dArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
-     * not in bounds, or if dArray is too small to hold the input.
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code dArray} is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
                           double[] dArray, DataBuffer data) {
@@ -1259,8 +1266,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -1286,7 +1293,7 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getSample(int, int, int,  DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
      * the band index are not in bounds.
      */
@@ -1310,7 +1317,7 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getSample(int, int, int, DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
      * the band index are not in bounds.
      */
@@ -1338,7 +1345,7 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getSample(int, int, int, DataBuffer)
      *
-     * @throws NullPointerException if data is null.
+     * @throws NullPointerException if {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
      * the band index are not in bounds.
      */
@@ -1364,10 +1371,10 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
      *
-     * @throws NullPointerException if iArray or data is null.
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
-     * the band index are not in bounds, or if iArray is too small to
-     * hold the input.
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
                            int[] iArray, DataBuffer data) {
@@ -1375,8 +1382,8 @@ public abstract class SampleModel
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -1402,10 +1409,10 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getSamples(int, int, int, int, int, float[], DataBuffer)
      *
-     * @throws NullPointerException if fArray or data is null.
+     * @throws NullPointerException if {@code fArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
-     * the band index are not in bounds, or if fArray is too small to
-     * hold the input.
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code fArray} is too small to hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
                            float[] fArray, DataBuffer data) {
@@ -1413,8 +1420,8 @@ public abstract class SampleModel
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
@@ -1440,10 +1447,10 @@ public abstract class SampleModel
      * @param data      The DataBuffer containing the image data.
      * @see #getSamples(int, int, int, int, int, double[], DataBuffer)
      *
-     * @throws NullPointerException if dArray or data is null.
+     * @throws NullPointerException if {@code dArray} or {@code data} is {@code null}.
      * @throws ArrayIndexOutOfBoundsException if the coordinates or
-     * the band index are not in bounds, or if dArray is too small to
-     * hold the input.
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code dArray} is too small to hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
                            double[] dArray, DataBuffer data) {
@@ -1452,8 +1459,8 @@ public abstract class SampleModel
         int y1 = y + h;
 
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 > height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException("Invalid coordinates.");
         }
diff --git a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
index abb669e02c6..a75b5197c44 100644
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
@@ -357,6 +357,9 @@ public class SinglePixelPackedSampleModel extends SampleModel
      * @param data      The DataBuffer containing the image data.
      * @return the data for the specified pixel.
      * @see #setDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if obj is too small to hold the output.
      */
     public Object getDataElements(int x, int y, Object obj, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -416,15 +419,10 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Returns all samples in for the specified pixel in an int array.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location.
-     * @param y         The Y coordinate of the pixel location.
-     * @param iArray    If non-null, returns the samples in this array
-     * @param data      The DataBuffer containing the image data.
-     * @return all samples for the specified pixel.
-     * @see #setPixel(int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the output.
      */
     public int [] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -446,26 +444,20 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Returns all samples for the specified rectangle of pixels in
-     * an int array, one sample per array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location.
-     * @param y         The Y coordinate of the upper left pixel location.
-     * @param w         The width of the pixel rectangle.
-     * @param h         The height of the pixel rectangle.
-     * @param iArray    If non-null, returns the samples in this array.
-     * @param data      The DataBuffer containing the image data.
-     * @return all samples for the specified region of pixels.
-     * @see #setPixels(int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code iArray} is too small to hold the output.
      */
+    @Override
     public int[] getPixels(int x, int y, int w, int h,
                            int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 >  height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -493,17 +485,10 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Returns as int the sample in a specified band for the pixel
-     * located at (x,y).
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location.
-     * @param y         The Y coordinate of the pixel location.
-     * @param b         The band to return.
-     * @param data      The DataBuffer containing the image data.
-     * @return the sample in a specified band for the specified
-     *         pixel.
-     * @see #setSample(int, int, int, int, DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public int getSample(int x, int y, int b, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
@@ -516,25 +501,16 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Returns the samples for a specified band for the specified rectangle
-     * of pixels in an int array, one sample per array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location.
-     * @param y         The Y coordinate of the upper left pixel location.
-     * @param w         The width of the pixel rectangle.
-     * @param h         The height of the pixel rectangle.
-     * @param b         The band to return.
-     * @param iArray    If non-null, returns the samples in this array.
-     * @param data      The DataBuffer containing the image data.
-     * @return the samples for the specified band for the specified
-     *         region of pixels.
-     * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the output.
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
                            int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
-        if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
+        if ((x < 0) || (y < 0) || (w < 0) || (h < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
@@ -592,6 +568,9 @@ public class SinglePixelPackedSampleModel extends SampleModel
      * @param obj       A primitive array containing pixel data.
      * @param data      The DataBuffer containing the image data.
      * @see #getDataElements(int, int, Object, DataBuffer)
+     * @throws NullPointerException if {@code obj} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if obj is too small to hold the input.
      */
     public void setDataElements(int x, int y, Object obj, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
@@ -624,14 +603,10 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Sets a pixel in the DataBuffer using an int array of samples for input.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location.
-     * @param y         The Y coordinate of the pixel location.
-     * @param iArray    The input samples in an int array.
-     * @param data      The DataBuffer containing the image data.
-     * @see #getPixel(int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or if {@code iArray} is too small to hold the input.
      */
     public void setPixel(int x, int y,
                          int[] iArray,
@@ -650,25 +625,19 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Sets all samples for a rectangle of pixels from an int array containing
-     * one sample per array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location.
-     * @param y         The Y coordinate of the upper left pixel location.
-     * @param w         The width of the pixel rectangle.
-     * @param h         The height of the pixel rectangle.
-     * @param iArray    The input samples in an int array.
-     * @param data      The DataBuffer containing the image data.
-     * @see #getPixels(int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
+     * not in bounds, or {@code w} or {@code h} is negative
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
                           int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
-        if (x < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
-            y < 0 || y >= height || h > height || y1 < 0 || y1 >  height)
+        if (x < 0 || w < 0 || x >= width || w > width || x1 < 0 || x1 > width ||
+            y < 0 || h < 0 || y >= height || h > height || y1 < 0 || y1 > height)
         {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -692,17 +661,11 @@ public class SinglePixelPackedSampleModel extends SampleModel
         }
     }
 
-    /**
-     * Sets a sample in the specified band for the pixel located at (x,y)
-     * in the DataBuffer using an int for input.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the pixel location.
-     * @param y         The Y coordinate of the pixel location.
-     * @param b         The band to set.
-     * @param s         The input sample as an int.
-     * @param data      The DataBuffer containing the image data.
-     * @see #getSample(int, int, int, DataBuffer)
+    /*
+     * {inheritDoc}
+     * @throws NullPointerException if {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * the band index are not in bounds.
      */
     public void setSample(int x, int y, int b, int s,
                           DataBuffer data) {
@@ -718,23 +681,16 @@ public class SinglePixelPackedSampleModel extends SampleModel
     }
 
     /**
-     * Sets the samples in the specified band for the specified rectangle
-     * of pixels from an int array containing one sample per array element.
-     * ArrayIndexOutOfBoundsException may be thrown if the coordinates are
-     * not in bounds.
-     * @param x         The X coordinate of the upper left pixel location.
-     * @param y         The Y coordinate of the upper left pixel location.
-     * @param w         The width of the pixel rectangle.
-     * @param h         The height of the pixel rectangle.
-     * @param b         The band to set.
-     * @param iArray    The input samples in an int array.
-     * @param data      The DataBuffer containing the image data.
-     * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
+     * {@inheritDoc}
+     * @throws NullPointerException if {@code iArray} or {@code data} is {@code null}.
+     * @throws ArrayIndexOutOfBoundsException if the coordinates or
+     * band index are not in bounds, or {@code w} or {@code h} is negative,
+     * or if {@code iArray} is too small to hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
                           int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
-        if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
+        if ((x < 0) || (y < 0) || (w < 0) || (h < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
diff --git a/test/jdk/java/awt/image/SampleModelGetSamplesAndPixelsTest.java b/test/jdk/java/awt/image/SampleModelGetSamplesAndPixelsTest.java
new file mode 100644
index 00000000000..483bbe43d9e
--- /dev/null
+++ b/test/jdk/java/awt/image/SampleModelGetSamplesAndPixelsTest.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug     6185110
+ * @summary Verify get/set/Pixels/Samples APIs for bad parameters.
+ *
+ * @run     main SampleModelGetSamplesAndPixelsTest
+ */
+
+import java.awt.image.BandedSampleModel;
+import java.awt.image.ComponentSampleModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.MultiPixelPackedSampleModel;
+import java.awt.image.PixelInterleavedSampleModel;
+import java.awt.image.SampleModel;
+import java.awt.image.SinglePixelPackedSampleModel;
+import java.util.Vector;
+
+public class SampleModelGetSamplesAndPixelsTest {
+
+    static final int WIDTH = 100;
+    static final int HEIGHT = 100;
+    static final int DATATYPE = DataBuffer.TYPE_BYTE;
+    static final int NUMBANDS = 4;
+    static final int[] INTS = new int[WIDTH * HEIGHT + NUMBANDS];
+    static final float[] FLOATS = new float[WIDTH * HEIGHT + NUMBANDS];
+    static final double[] DOUBLES = new double[WIDTH * HEIGHT + NUMBANDS];
+    static final int[][] COORDS = {
+        { 1, 1, 1, 1, -1 }, // bad band
+        { 1, 1, 1, 1, NUMBANDS }, // bad band
+        { 1, 1, -1, 1, 0 }, // negative w
+        { 1, 1, -1, -1, 0 }, // negative w and h
+        { -4, 1, 1, 1, 0 }, // negative x
+        { -4, -4, 1, 1, 0 }, // negative x and y
+        { WIDTH+10, 0, 1, 1, 0 }, // x > width
+        { 0, HEIGHT+10, 1, 1, 0 }, // y > height
+        { WIDTH+10, HEIGHT+10, 1, 1, 0 }, // both x > width and y > height
+    };
+
+    public static void main(String[] args) {
+        Vector<Class<? extends SampleModel>> classes = new Vector<Class<? extends SampleModel>>();
+
+        classes.add(ComponentSampleModel.class);
+        classes.add(MultiPixelPackedSampleModel.class);
+        classes.add(SinglePixelPackedSampleModel.class);
+        classes.add(BandedSampleModel.class);
+        classes.add(PixelInterleavedSampleModel.class);
+
+        for (Class<? extends SampleModel> c : classes) {
+            doTest(c);
+        }
+    }
+
+    static void noException(SampleModel sm) {
+        System.err.println(sm);
+        throw new RuntimeException("No expected exception");
+    }
+
+    private static void doTest(Class<? extends SampleModel> c) {
+        System.out.println("Test for: " + c.getName());
+        SampleModel sm = createSampleModel(c);
+        doTestNull(sm);
+        for (int i = 0; i < COORDS.length; i++) {
+            int x = COORDS[i][0];
+            int y = COORDS[i][1];
+            int w = COORDS[i][2];
+            int h = COORDS[i][3];
+            int b = COORDS[i][4];
+            doTest(sm, x, y, w, h, b);
+        }
+     }
+
+    private static void doTestNull(SampleModel sm) {
+        doTestNull(sm, INTS);
+        doTestNull(sm, FLOATS);
+        doTestNull(sm, DOUBLES);
+    }
+
+    private static void doTestNull(SampleModel sm, int[] INTS) {
+        try {
+            sm.getSamples(1, 1, 1, 1, 0, INTS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.getSamples(1, 1, 1, 1, 0, INTS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.getPixels(1, 1, 1, 1, INTS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setPixels(1, 1, 1, 1, INTS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    private static void doTestNull(SampleModel sm, float[] FLOATS) {
+        try {
+            sm.getSamples(1, 1, 1, 1, 0, FLOATS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.getSamples(1, 1, 1, 1, 0, FLOATS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.getPixels(1, 1, 1, 1, FLOATS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setPixels(1, 1, 1, 1, FLOATS, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    private static void doTestNull(SampleModel sm, double[] DOUBLES) {
+        try {
+            sm.getSamples(1, 1, 1, 1, 0, DOUBLES, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.getSamples(1, 1, 1, 1, 0, DOUBLES, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.getPixels(1, 1, 1, 1, DOUBLES, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setPixels(1, 1, 1, 1, DOUBLES, null);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    private static void doTest(SampleModel sm, int x, int y, int w, int h, int b) {
+        doTest(sm, x, y, w, h, b, INTS);
+        doTest(sm, x, y, w, h, b, FLOATS);
+        doTest(sm, x, y, w, h, b, DOUBLES);
+    }
+
+    private static void doTest(SampleModel sm, int x, int y, int w, int h, int b, int[] INTS) {
+
+        // Now test each API with a non-null buffer and the specified values.
+        DataBuffer db = sm.createDataBuffer();
+
+        try {
+            sm.getSamples(x, y, w, h, b, INTS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setSamples(x, y, w, h, b, INTS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        if (b < 0 || b >= NUMBANDS) {
+             return; // Values were to test illegal bands, skip the rest.
+        }
+
+        try {
+            sm.getPixels(x, y, w, h, INTS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setPixels(x, y, w, h, INTS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    private static void doTest(SampleModel sm, int x, int y, int w, int h, int b, float[] FLOATS) {
+
+        // Now test each API with a non-null buffer and the specified values.
+        DataBuffer db = sm.createDataBuffer();
+
+        try {
+            sm.getSamples(x, y, w, h, b, FLOATS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setSamples(x, y, w, h, b, FLOATS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        if (b < 0 || b >= NUMBANDS) {
+             return; // Values were to test illegal bands, skip the rest.
+        }
+
+        try {
+            sm.getPixels(x, y, w, h, FLOATS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setPixels(x, y, w, h, FLOATS, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    private static void doTest(SampleModel sm, int x, int y, int w, int h, int b, double[] DOUBLES) {
+
+        // Now test each API with a non-null buffer and the specified values.
+        DataBuffer db = sm.createDataBuffer();
+
+        try {
+            sm.getSamples(x, y, w, h, b, DOUBLES, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setSamples(x, y, w, h, b, DOUBLES, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        if (b < 0 || b >= NUMBANDS) {
+             return; // Values were to test illegal bands, skip the rest.
+        }
+
+        try {
+            sm.getPixels(x, y, w, h, DOUBLES, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setPixels(x, y, w, h, DOUBLES, db);
+            noException(sm);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            System.out.println(e.getMessage());
+        }
+
+        try {
+            sm.setDataElements(0, 0, null, db);
+            noException(sm);
+        } catch (NullPointerException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    private static SampleModel createSampleModel(Class<? extends SampleModel> cls) {
+        SampleModel res = null;
+
+        if (cls == ComponentSampleModel.class) {
+            res = new ComponentSampleModel(DATATYPE, WIDTH, HEIGHT, 4, WIDTH * 4, new int[] { 0, 1, 2, 3 } );
+        } else if (cls == MultiPixelPackedSampleModel.class) {
+            res = new MultiPixelPackedSampleModel(DATATYPE, WIDTH, HEIGHT, 4);
+        } else if (cls == SinglePixelPackedSampleModel.class) {
+            res = new SinglePixelPackedSampleModel(DATATYPE, WIDTH, HEIGHT,
+                    new int[]{ 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff });
+        } else if (cls == BandedSampleModel.class) {
+            res = new BandedSampleModel(DATATYPE, WIDTH, HEIGHT, NUMBANDS);
+        } else if (cls == PixelInterleavedSampleModel.class) {
+            res = new PixelInterleavedSampleModel(DATATYPE, WIDTH, HEIGHT, 4, WIDTH * 4, new int[] { 0, 1, 2, 3 });
+        } else {
+            throw new RuntimeException("Unknown class " + cls);
+        }
+        return res;
+    }
+}

From 5627ff2d9165ee1f7354c1ff1626f4949ef7fa3f Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Tue, 2 Dec 2025 18:18:56 +0000
Subject: [PATCH 440/512] 8370766: JVM crashes when running
 compiler/exceptions/TestAccessErrorInCatch.java fails with -XX:+VerifyStack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Manuel Hässig <mhaessig@openjdk.org>
Reviewed-by: mhaessig, chagedorn
---
 src/hotspot/share/opto/doCall.cpp               | 17 +++++++++++------
 .../exceptions/TestAccessErrorInCatch.java      |  4 +++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp
index 91bb743618b..5533b19897b 100644
--- a/src/hotspot/share/opto/doCall.cpp
+++ b/src/hotspot/share/opto/doCall.cpp
@@ -1059,14 +1059,19 @@ void Parse::catch_inline_exceptions(SafePointNode* ex_map) {
   assert(!stopped(), "you should return if you finish the chain");
 
   // Oops, need to call into the VM to resolve the klasses at runtime.
-  // Note:  This call must not deoptimize, since it is not a real at this bci!
   kill_dead_locals();
 
-  make_runtime_call(RC_NO_LEAF | RC_MUST_THROW,
-                    OptoRuntime::rethrow_Type(),
-                    OptoRuntime::rethrow_stub(),
-                    nullptr, nullptr,
-                    ex_node);
+  { PreserveReexecuteState preexecs(this);
+    // When throwing an exception, set the reexecute flag for deoptimization.
+    // This is mostly needed to pass -XX:+VerifyStack sanity checks.
+    jvms()->set_should_reexecute(true);
+
+    make_runtime_call(RC_NO_LEAF | RC_MUST_THROW,
+                      OptoRuntime::rethrow_Type(),
+                      OptoRuntime::rethrow_stub(),
+                      nullptr, nullptr,
+                      ex_node);
+  }
 
   // Rethrow is a pure call, no side effects, only a result.
   // The result cannot be allocated, so we use I_O
diff --git a/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java b/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java
index 46541d76016..44cfd60cf38 100644
--- a/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java
+++ b/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java
@@ -23,16 +23,18 @@
 
 /*
  * @test
- * @bug 8367002
+ * @bug 8367002 8370766
  * @summary Compilers might not generate handlers for recursive exceptions
  *
  * @compile IllegalAccessInCatch.jasm
  * @run main/othervm -Xbatch
  *   -XX:CompileCommand=compileonly,IllegalAccessInCatch*::test
+ *   -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack
  *   -XX:-TieredCompilation
  *   TestAccessErrorInCatch
  * @run main/othervm -Xbatch
  *   -XX:CompileCommand=compileonly,IllegalAccessInCatch*::test
+ *   -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack
  *   -XX:TieredStopAtLevel=3
  *   TestAccessErrorInCatch
  */

From 618732ffc04ef393c9b8a3265c12ba66f31784d9 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Tue, 2 Dec 2025 19:36:43 +0000
Subject: [PATCH 441/512] 8371820: Further AES performance improvements for key
 schedule generation

Reviewed-by: rrich, valeriep
---
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 10 ++---
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp     |  2 +-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  4 +-
 .../cpu/x86/stubGenerator_x86_64_aes.cpp      | 10 ++---
 src/hotspot/share/opto/library_call.cpp       | 40 +++++++++----------
 src/hotspot/share/opto/library_call.hpp       |  2 +-
 .../com/sun/crypto/provider/AES_Crypt.java    | 33 ++++++++-------
 7 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 8dbc5dbac03..7e2f333ba40 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -2879,7 +2879,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKe (key) in little endian int array
   //
   address generate_aescrypt_encryptBlock() {
     __ align(CodeEntryAlignment);
@@ -2912,7 +2912,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKd (key) in little endian int array
   //
   address generate_aescrypt_decryptBlock() {
     assert(UseAES, "need AES cryptographic extension support");
@@ -2946,7 +2946,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKe (key) in little endian int array
   //   c_rarg3   - r vector byte array address
   //   c_rarg4   - input length
   //
@@ -3051,7 +3051,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKd (key) in little endian int array
   //   c_rarg3   - r vector byte array address
   //   c_rarg4   - input length
   //
@@ -3178,7 +3178,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKe (key) in little endian int array
   //   c_rarg3   - counter vector byte array address
   //   c_rarg4   - input length
   //   c_rarg5   - saved encryptedCounter start
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 948092bbb9a..e48778a8b9f 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -2956,7 +2956,7 @@ class StubGenerator: public StubCodeGenerator {
   // Arguments for generated stub:
   //   R3_ARG1   - source byte array address
   //   R4_ARG2   - destination byte array address
-  //   R5_ARG3   - K (key) in little endian int array
+  //   R5_ARG3   - sessionKe (key) in little endian int array
   address generate_aescrypt_decryptBlock() {
     assert(UseAES, "need AES instructions and misaligned SSE support");
     StubId stub_id = StubId::stubgen_aescrypt_decryptBlock_id;
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index e5eb15cb8e4..dff9a3d508e 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2463,7 +2463,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKe (key) in little endian int array
   //
   address generate_aescrypt_encryptBlock() {
     assert(UseAESIntrinsics, "need AES instructions (Zvkned extension) support");
@@ -2542,7 +2542,7 @@ class StubGenerator: public StubCodeGenerator {
   // Inputs:
   //   c_rarg0   - source byte array address
   //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg2   - sessionKe (key) in little endian int array
   //
   address generate_aescrypt_decryptBlock() {
     assert(UseAESIntrinsics, "need AES instructions (Zvkned extension) support");
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
index 1e728ffa279..24de32a6fe7 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
@@ -480,7 +480,7 @@ address StubGenerator::generate_counterMode_VectorAESCrypt()  {
 // Inputs:
 //   c_rarg0   - source byte array address
 //   c_rarg1   - destination byte array address
-//   c_rarg2   - K (key) in little endian int array
+//   c_rarg2   - sessionKe (key) in little endian int array
 //   c_rarg3   - counter vector byte array address
 //   Linux
 //     c_rarg4   -          input length
@@ -1063,7 +1063,7 @@ address StubGenerator::generate_cipherBlockChaining_decryptVectorAESCrypt() {
 // Inputs:
 //   c_rarg0   - source byte array address
 //   c_rarg1   - destination byte array address
-//   c_rarg2   - K (key) in little endian int array
+//   c_rarg2   - sessionKe (key) in little endian int array
 //
 address StubGenerator::generate_aescrypt_encryptBlock() {
   assert(UseAES, "need AES instructions and misaligned SSE support");
@@ -1158,7 +1158,7 @@ address StubGenerator::generate_aescrypt_encryptBlock() {
 // Inputs:
 //   c_rarg0   - source byte array address
 //   c_rarg1   - destination byte array address
-//   c_rarg2   - K (key) in little endian int array
+//   c_rarg2   - sessionKd (key) in little endian int array
 //
 address StubGenerator::generate_aescrypt_decryptBlock() {
   assert(UseAES, "need AES instructions and misaligned SSE support");
@@ -1255,7 +1255,7 @@ address StubGenerator::generate_aescrypt_decryptBlock() {
 // Inputs:
 //   c_rarg0   - source byte array address
 //   c_rarg1   - destination byte array address
-//   c_rarg2   - K (key) in little endian int array
+//   c_rarg2   - sessionKe (key) in little endian int array
 //   c_rarg3   - r vector byte array address
 //   c_rarg4   - input length
 //
@@ -1407,7 +1407,7 @@ address StubGenerator::generate_cipherBlockChaining_encryptAESCrypt() {
 // Inputs:
 //   c_rarg0   - source byte array address
 //   c_rarg1   - destination byte array address
-//   c_rarg2   - K (key) in little endian int array
+//   c_rarg2   - sessionKd (key) in little endian int array
 //   c_rarg3   - r vector byte array address
 //   c_rarg4   - input length
 //
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 7a213102efd..dc53cb08396 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -7173,6 +7173,7 @@ Node * LibraryCallKit::field_address_from_object(Node * fromObj, const char * fi
 bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
   address stubAddr = nullptr;
   const char *stubName;
+  bool is_decrypt = false;
   assert(UseAES, "need AES instruction support");
 
   switch(id) {
@@ -7183,6 +7184,7 @@ bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
   case vmIntrinsics::_aescrypt_decryptBlock:
     stubAddr = StubRoutines::aescrypt_decryptBlock();
     stubName = "aescrypt_decryptBlock";
+    is_decrypt = true;
     break;
   default:
     break;
@@ -7216,7 +7218,7 @@ bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
 
   // now need to get the start of its expanded key array
   // this requires a newer class file that has this array as littleEndian ints, otherwise we revert to java
-  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object, is_decrypt);
   if (k_start == nullptr) return false;
 
   // Call the stub.
@@ -7231,7 +7233,7 @@ bool LibraryCallKit::inline_aescrypt_Block(vmIntrinsics::ID id) {
 bool LibraryCallKit::inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id) {
   address stubAddr = nullptr;
   const char *stubName = nullptr;
-
+  bool is_decrypt = false;
   assert(UseAES, "need AES instruction support");
 
   switch(id) {
@@ -7242,6 +7244,7 @@ bool LibraryCallKit::inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id) {
   case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
     stubAddr = StubRoutines::cipherBlockChaining_decryptAESCrypt();
     stubName = "cipherBlockChaining_decryptAESCrypt";
+    is_decrypt = true;
     break;
   default:
     break;
@@ -7295,7 +7298,7 @@ bool LibraryCallKit::inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id) {
   aescrypt_object = _gvn.transform(aescrypt_object);
 
   // we need to get the start of the aescrypt_object's expanded key array
-  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object, is_decrypt);
   if (k_start == nullptr) return false;
 
   // similarly, get the start address of the r vector
@@ -7319,7 +7322,7 @@ bool LibraryCallKit::inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id) {
 bool LibraryCallKit::inline_electronicCodeBook_AESCrypt(vmIntrinsics::ID id) {
   address stubAddr = nullptr;
   const char *stubName = nullptr;
-
+  bool is_decrypt = false;
   assert(UseAES, "need AES instruction support");
 
   switch (id) {
@@ -7330,6 +7333,7 @@ bool LibraryCallKit::inline_electronicCodeBook_AESCrypt(vmIntrinsics::ID id) {
   case vmIntrinsics::_electronicCodeBook_decryptAESCrypt:
     stubAddr = StubRoutines::electronicCodeBook_decryptAESCrypt();
     stubName = "electronicCodeBook_decryptAESCrypt";
+    is_decrypt = true;
     break;
   default:
     break;
@@ -7381,7 +7385,7 @@ bool LibraryCallKit::inline_electronicCodeBook_AESCrypt(vmIntrinsics::ID id) {
   aescrypt_object = _gvn.transform(aescrypt_object);
 
   // we need to get the start of the aescrypt_object's expanded key array
-  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object, is_decrypt);
   if (k_start == nullptr) return false;
 
   // Call the stub, passing src_start, dest_start, k_start, r_start and src_len
@@ -7449,7 +7453,7 @@ bool LibraryCallKit::inline_counterMode_AESCrypt(vmIntrinsics::ID id) {
   Node* aescrypt_object = new CheckCastPPNode(control(), embeddedCipherObj, xtype);
   aescrypt_object = _gvn.transform(aescrypt_object);
   // we need to get the start of the aescrypt_object's expanded key array
-  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object, /* is_decrypt */ false);
   if (k_start == nullptr) return false;
   // similarly, get the start address of the r vector
   Node* obj_counter = load_field_from_object(counterMode_object, "counter", "[B");
@@ -7474,25 +7478,21 @@ bool LibraryCallKit::inline_counterMode_AESCrypt(vmIntrinsics::ID id) {
 }
 
 //------------------------------get_key_start_from_aescrypt_object-----------------------
-Node * LibraryCallKit::get_key_start_from_aescrypt_object(Node *aescrypt_object) {
-#if defined(PPC64) || defined(S390) || defined(RISCV64)
+Node* LibraryCallKit::get_key_start_from_aescrypt_object(Node* aescrypt_object, bool is_decrypt) {
   // MixColumns for decryption can be reduced by preprocessing MixColumns with round keys.
   // Intel's extension is based on this optimization and AESCrypt generates round keys by preprocessing MixColumns.
   // However, ppc64 vncipher processes MixColumns and requires the same round keys with encryption.
-  // The ppc64 and riscv64 stubs of encryption and decryption use the same round keys (sessionK[0]).
-  Node* objSessionK = load_field_from_object(aescrypt_object, "sessionK", "[[I");
-  assert (objSessionK != nullptr, "wrong version of com.sun.crypto.provider.AES_Crypt");
-  if (objSessionK == nullptr) {
-    return (Node *) nullptr;
-  }
-  Node* objAESCryptKey = load_array_element(objSessionK, intcon(0), TypeAryPtr::OOPS, /* set_ctrl */ true);
+  // The following platform specific stubs of encryption and decryption use the same round keys.
+#if defined(PPC64) || defined(S390) || defined(RISCV64)
+  bool use_decryption_key = false;
 #else
-  Node* objAESCryptKey = load_field_from_object(aescrypt_object, "K", "[I");
-#endif // PPC64
-  assert (objAESCryptKey != nullptr, "wrong version of com.sun.crypto.provider.AES_Crypt");
+  bool use_decryption_key = is_decrypt;
+#endif
+  Node* objAESCryptKey = load_field_from_object(aescrypt_object, use_decryption_key ? "sessionKd" : "sessionKe", "[I");
+  assert(objAESCryptKey != nullptr, "wrong version of com.sun.crypto.provider.AES_Crypt");
   if (objAESCryptKey == nullptr) return (Node *) nullptr;
 
-  // now have the array, need to get the start address of the K array
+  // now have the array, need to get the start address of the selected key array
   Node* k_start = array_element_address(objAESCryptKey, intcon(0), T_INT);
   return k_start;
 }
@@ -8628,7 +8628,7 @@ bool LibraryCallKit::inline_galoisCounterMode_AESCrypt() {
   Node* aescrypt_object = new CheckCastPPNode(control(), embeddedCipherObj, xtype);
   aescrypt_object = _gvn.transform(aescrypt_object);
   // we need to get the start of the aescrypt_object's expanded key array
-  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object);
+  Node* k_start = get_key_start_from_aescrypt_object(aescrypt_object, /* is_decrypt */ false);
   if (k_start == nullptr) return false;
   // similarly, get the start address of the r vector
   Node* cnt_start = array_element_address(counter, intcon(0), T_BYTE);
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index fbac1363dae..7dbb57c1e5c 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -338,7 +338,7 @@ class LibraryCallKit : public GraphKit {
   Node* inline_cipherBlockChaining_AESCrypt_predicate(bool decrypting);
   Node* inline_electronicCodeBook_AESCrypt_predicate(bool decrypting);
   Node* inline_counterMode_AESCrypt_predicate();
-  Node* get_key_start_from_aescrypt_object(Node* aescrypt_object);
+  Node* get_key_start_from_aescrypt_object(Node* aescrypt_object, bool is_decrypt);
   bool inline_ghash_processBlocks();
   bool inline_chacha20Block();
   bool inline_kyberNtt();
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java b/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
index 19dceae01af..27429f6a2fd 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AES_Crypt.java
@@ -54,11 +54,11 @@ final class AES_Crypt extends SymmetricCipher {
     private int rounds;
     private byte[] prevKey = null;
 
-    // Following two attributes are specific to Intrinsics where sessionK is
-    // used for PPC64, S390, and RISCV64 architectures, whereas K is used for
-    // everything else.
-    private int[][] sessionK = null;
-    private int[] K = null;
+    // Following attributes are specific to Intrinsics, where sessionKe is the
+    // unprocessed key that is also used for decryption on PPC64, S390 and
+    // RISCV64 architectures. Other ones use sessionKd for decryption.
+    private int[] sessionKe = null; // key for encryption
+    private int[] sessionKd = null; // preprocessed key for decryption
 
     // Round constant
     private static final int[] RCON = {
@@ -904,7 +904,6 @@ final class AES_Crypt extends SymmetricCipher {
      */
     void init(boolean decrypting, String algorithm, byte[] key)
             throws InvalidKeyException {
-        int decrypt = decrypting ? 1 : 0;
 
         if (!algorithm.equalsIgnoreCase("AES")
                 && !algorithm.equalsIgnoreCase("Rijndael")) {
@@ -920,21 +919,25 @@ final class AES_Crypt extends SymmetricCipher {
             throw new InvalidKeyException("Invalid key length (" + key.length
                     + ").");
         }
+
         if (!MessageDigest.isEqual(prevKey, key)) {
-            if (sessionK == null) {
-                sessionK = new int[2][];
-            } else {
-                Arrays.fill(sessionK[0], 0);
-                Arrays.fill(sessionK[1], 0);
+            if (sessionKe != null) {
+                Arrays.fill(sessionKe, 0);
+            }
+            sessionKe = genRoundKeys(key, rounds);
+            if (sessionKd != null) {
+                Arrays.fill(sessionKd, 0);
+                sessionKd = null;
             }
-            sessionK[0] = genRoundKeys(key, rounds);
-            sessionK[1] = genInvRoundKeys(sessionK[0], rounds);
             if (prevKey != null) {
                 Arrays.fill(prevKey, (byte) 0);
             }
             prevKey = key.clone();
         }
-        K = sessionK[decrypt];
+
+        if (decrypting && (sessionKd == null)) {
+            sessionKd = genInvRoundKeys(sessionKe, rounds);
+        }
     }
 
     /**
@@ -1035,6 +1038,7 @@ final class AES_Crypt extends SymmetricCipher {
      */
     @IntrinsicCandidate
     private void implEncryptBlock(byte[] p, int po, byte[] c, int co) {
+        int[] K = sessionKe;
         int ti0, ti1, ti2, ti3;
         int a0, a1, a2, a3;
         int w = K.length - WB;
@@ -1213,6 +1217,7 @@ final class AES_Crypt extends SymmetricCipher {
      */
     @IntrinsicCandidate
     private void implDecryptBlock(byte[] c, int co, byte[] p, int po) {
+        int[] K = sessionKd;
         int ti0, ti1, ti2, ti3;
         int a0, a1, a2, a3;
 

From b97ed667db0bd527461b2b385af3001f53d71c19 Mon Sep 17 00:00:00 2001
From: Xueming Shen <sherman@openjdk.org>
Date: Tue, 2 Dec 2025 19:47:18 +0000
Subject: [PATCH 442/512] 8365675: Add String Unicode Case-Folding Support

Reviewed-by: rriggs, naoto, ihse
---
 make/ToolsJdk.gmk                             |   2 +-
 .../tools/generatecharacter/CaseFolding.java  |  73 ----
 .../GenerateCaseFolding.java                  | 134 +++++++
 .../java.base/gensrc/GensrcCharacterData.gmk  |  17 +
 make/modules/java.base/gensrc/GensrcRegex.gmk |  17 -
 .../share/classes/java/lang/String.java       | 161 ++++++++-
 .../share/classes/java/lang/StringLatin1.java | 124 +++++++
 .../share/classes/java/lang/StringUTF16.java  |  74 +++-
 .../classes/java/util/regex/Pattern.java      |   2 +-
 .../internal/lang/CaseFolding.java.template   | 208 +++++++++++
 .../util/regex/CaseFolding.java.template      | 116 ------
 .../lang/String/UnicodeCaseFoldingTest.java   | 329 ++++++++++++++++++
 .../java/lang/StringCompareToFoldCase.java    | 200 +++++++++++
 13 files changed, 1245 insertions(+), 212 deletions(-)
 delete mode 100644 make/jdk/src/classes/build/tools/generatecharacter/CaseFolding.java
 create mode 100644 make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/CaseFolding.java.template
 delete mode 100644 src/java.base/share/classes/jdk/internal/util/regex/CaseFolding.java.template
 create mode 100644 test/jdk/java/lang/String/UnicodeCaseFoldingTest.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/StringCompareToFoldCase.java

diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index 629cadbf83a..b04d7820c91 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -79,7 +79,7 @@ TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_too
     build.tools.generateextraproperties.GenerateExtraProperties
 
 TOOL_GENERATECASEFOLDING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generatecharacter.CaseFolding
+    build.tools.generatecharacter.GenerateCaseFolding
 
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible
diff --git a/make/jdk/src/classes/build/tools/generatecharacter/CaseFolding.java b/make/jdk/src/classes/build/tools/generatecharacter/CaseFolding.java
deleted file mode 100644
index 9abc2059b6a..00000000000
--- a/make/jdk/src/classes/build/tools/generatecharacter/CaseFolding.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.generatecharacter;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class CaseFolding {
-
-    public static void main(String[] args) throws Throwable {
-        if (args.length != 3) {
-            System.err.println("Usage: java CaseFolding TemplateFile CaseFolding.txt CaseFolding.java");
-            System.exit(1);
-        }
-        var templateFile = Paths.get(args[0]);
-        var caseFoldingTxt = Paths.get(args[1]);
-        var genSrcFile = Paths.get(args[2]);
-        var supportedTypes = "^.*; [CTS]; .*$";
-        var caseFoldingEntries = Files.lines(caseFoldingTxt)
-            .filter(line -> !line.startsWith("#") && line.matches(supportedTypes))
-            .map(line -> {
-                String[] cols = line.split("; ");
-                return new String[] {cols[0], cols[1], cols[2]};
-            })
-            .filter(cols -> {
-                //  the folding case doesn't map back to the original char.
-                var cp1 = Integer.parseInt(cols[0], 16);
-                var cp2 = Integer.parseInt(cols[2], 16);
-                return Character.toUpperCase(cp2) != cp1 && Character.toLowerCase(cp2) != cp1;
-            })
-            .map(cols -> String.format("        entry(0x%s, 0x%s)", cols[0], cols[2]))
-            .collect(Collectors.joining(",\n", "", ""));
-
-        // hack, hack, hack! the logic does not pick 0131. just add manually to support 'I's.
-        // 0049; T; 0131; # LATIN CAPITAL LETTER I
-        final String T_0x0131_0x49 = String.format("        entry(0x%04x, 0x%04x),\n", 0x0131, 0x49);
-
-        // Generate .java file
-        Files.write(
-            genSrcFile,
-            Files.lines(templateFile)
-                .map(line -> line.contains("%%%Entries") ? T_0x0131_0x49 + caseFoldingEntries : line)
-                .collect(Collectors.toList()),
-            StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
-    }
-}
diff --git a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java
new file mode 100644
index 00000000000..2f6a9add5cb
--- /dev/null
+++ b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package build.tools.generatecharacter;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class GenerateCaseFolding {
+
+    public static void main(String[] args) throws Throwable {
+        if (args.length != 3) {
+            System.err.println("Usage: java GenerateCaseFolding TemplateFile CaseFolding.txt CaseFolding.java");
+            System.exit(1);
+        }
+        var templateFile = Paths.get(args[0]);
+        var caseFoldingTxt = Paths.get(args[1]);
+        var genSrcFile = Paths.get(args[2]);
+
+        // java.lang
+        var supportedTypes = "^.*; [CF]; .*$";  // full/1:M case folding
+        String[][] caseFoldings = Files.lines(caseFoldingTxt)
+                .filter(line -> !line.startsWith("#") && line.matches(supportedTypes))
+                .map(line -> {
+                    var fields = line.split("; ");
+                    var cp = fields[0];
+                    fields = fields[2].trim().split(" ");
+                    var folding = new String[fields.length + 1];
+                    folding[0] = cp;
+                    System.arraycopy(fields, 0, folding, 1, fields.length);
+                    return folding;
+                })
+                .toArray(size -> new String[size][]);
+
+        // util.regex
+        var expandedSupportedTypes = "^.*; [CTS]; .*$";
+        var expanded_caseFoldingEntries = Files.lines(caseFoldingTxt)
+                .filter(line -> !line.startsWith("#") && line.matches(expandedSupportedTypes))
+                .map(line -> {
+                    String[] cols = line.split("; ");
+                    return new String[]{cols[0], cols[1], cols[2]};
+                })
+                .filter(cols -> {
+                    // the folding case doesn't map back to the original char.
+                    var cp1 = Integer.parseInt(cols[0], 16);
+                    var cp2 = Integer.parseInt(cols[2], 16);
+                    return Character.toUpperCase(cp2) != cp1 && Character.toLowerCase(cp2) != cp1;
+                })
+                .map(cols -> String.format("        entry(0x%s, 0x%s)", cols[0], cols[2]))
+                .collect(Collectors.joining(",\n", "", ""));
+
+        // hack, hack, hack! the logic does not pick 0131. just add manually to support 'I's.
+        // 0049; T; 0131; # LATIN CAPITAL LETTER I
+        final String T_0x0131_0x49 = String.format("        entry(0x%04x, 0x%04x),\n", 0x0131, 0x49);
+
+        Files.write(
+                genSrcFile,
+                Files.lines(templateFile)
+                        .map(line -> line.contains("%%%Entries") ? genFoldingEntries(caseFoldings) : line)
+                        .map(line -> line.contains("%%%Expanded_Case_Map_Entries") ? T_0x0131_0x49 + expanded_caseFoldingEntries : line)
+                        .collect(Collectors.toList()),
+                StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+    }
+
+    private static long foldingToLong(String[] folding) {
+        int cp = Integer.parseInt(folding[0], 16);
+        long value = (long)Integer.parseInt(folding[1], 16);
+        if (!Character.isSupplementaryCodePoint(cp) && folding.length != 2) {
+            var shift = 16;
+            for (int j = 2; j < folding.length; j++) {
+                value |= (long)Integer.parseInt(folding[j], 16) << shift;
+                shift <<= 1;
+            }
+            value = value | (long) (folding.length - 1) << 48;
+        }
+        return value;
+    }
+
+    private static String genFoldingEntries(String[][] foldings) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("    private static final int[] CASE_FOLDING_CPS = {\n");
+        int width = 10;
+        for (int i = 0; i < foldings.length; i++) {
+            if (i % width == 0)
+                sb.append("        ");
+            sb.append(String.format("0X%s", foldings[i][0]));
+            if (i < foldings.length - 1)
+                sb.append(", ");
+            if (i % width == width - 1 || i == foldings.length - 1)
+                sb.append("\n");
+        }
+        sb.append("    };\n\n");
+
+        sb.append("    private static final long[] CASE_FOLDING_VALUES = {\n");
+        width = 6;
+        for (int i = 0; i < foldings.length; i++) {
+            if (i % width == 0)
+                sb.append("        "); // indent
+            sb.append(String.format("0x%013xL", foldingToLong(foldings[i])));
+            if (i < foldings.length - 1)
+                sb.append(", ");
+            if (i % width == width - 1 || i == foldings.length - 1) {
+                sb.append("\n");
+            }
+        }
+        sb.append("    };\n");
+        return sb.toString();
+    }
+}
diff --git a/make/modules/java.base/gensrc/GensrcCharacterData.gmk b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
index c05b126299b..d7947d907e2 100644
--- a/make/modules/java.base/gensrc/GensrcCharacterData.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
@@ -72,5 +72,22 @@ TARGETS += $(GENSRC_CHARACTERDATA)
 
 ################################################################################
 
+
+GENSRC_STRINGCASEFOLDING := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/lang/CaseFolding.java
+
+STRINGCASEFOLDING_TEMPLATE := $(MODULE_SRC)/share/classes/jdk/internal/lang/CaseFolding.java.template
+CASEFOLDINGTXT := $(MODULE_SRC)/share/data/unicodedata/CaseFolding.txt
+
+$(GENSRC_STRINGCASEFOLDING): $(BUILD_TOOLS_JDK) $(STRINGCASEFOLDING_TEMPLATE) $(CASEFOLDINGTXT)
+	$(call LogInfo, Generating $@)
+	$(call MakeTargetDir)
+	$(TOOL_GENERATECASEFOLDING) \
+	    $(STRINGCASEFOLDING_TEMPLATE) \
+	    $(CASEFOLDINGTXT) \
+	    $(GENSRC_STRINGCASEFOLDING)
+
+TARGETS += $(GENSRC_STRINGCASEFOLDING)
+
+
 endif # include guard
 include MakeIncludeEnd.gmk
diff --git a/make/modules/java.base/gensrc/GensrcRegex.gmk b/make/modules/java.base/gensrc/GensrcRegex.gmk
index a30f22b34d4..c46a029e2c2 100644
--- a/make/modules/java.base/gensrc/GensrcRegex.gmk
+++ b/make/modules/java.base/gensrc/GensrcRegex.gmk
@@ -50,22 +50,5 @@ TARGETS += $(GENSRC_INDICCONJUNCTBREAK)
 
 ################################################################################
 
-GENSRC_CASEFOLDING := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/util/regex/CaseFolding.java
-
-CASEFOLDINGTEMP := $(MODULE_SRC)/share/classes/jdk/internal/util/regex/CaseFolding.java.template
-CASEFOLDINGTXT := $(MODULE_SRC)/share/data/unicodedata/CaseFolding.txt
-
-$(GENSRC_CASEFOLDING): $(BUILD_TOOLS_JDK) $(CASEFOLDINGTEMP) $(CASEFOLDINGTXT)
-	$(call LogInfo, Generating $@)
-	$(call MakeTargetDir)
-	$(TOOL_GENERATECASEFOLDING) \
-	    $(CASEFOLDINGTEMP) \
-	    $(CASEFOLDINGTXT) \
-	    $(GENSRC_CASEFOLDING)
-
-TARGETS += $(GENSRC_CASEFOLDING)
-
-################################################################################
-
 endif # include guard
 include MakeIncludeEnd.gmk
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 52f908c9e98..d7aef113e15 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -117,9 +117,38 @@ import sun.nio.cs.UTF_8;
  * Unicode code points (i.e., characters), in addition to those for
  * dealing with Unicode code units (i.e., {@code char} values).
  *
- * <p>Unless otherwise noted, methods for comparing Strings do not take locale
- * into account.  The {@link java.text.Collator} class provides methods for
- * finer-grain, locale-sensitive String comparison.
+ * <p><b>String comparison and case-insensitive matching</b>
+ *
+ * <p>There are several related ways to compare {@code String} values; choose
+ * the one whose semantics fit your purpose:
+ *
+ * <ul>
+ *   <li><b>Exact content equality</b> — {@link #equals(Object)} checks that two
+ *       strings contain the identical char sequence of UTF-16 code units. This is
+ *       a strict, case-sensitive comparison suitable for exact matching, hashing
+ *       and any situation that requires bit-for-bit stability.</li>
+ *
+ *   <li><b>Simple case-insensitive equality</b> — {@link #equalsIgnoreCase(String)}
+ *       (and the corresponding {@link #compareToIgnoreCase(String)} and {@link #CASE_INSENSITIVE_ORDER})
+ *       performs a per-code-point, locale-independent comparison using
+ *       {@link Character#toUpperCase(int)} and {@link Character#toLowerCase(int)}.
+ *       It is convenient for many common case-insensitive checks.</li>
+ *
+ *   <li><b>Unicode case-folded equivalence</b> — {@link #equalsFoldCase(String)}
+ *       (and the corresponding {@link #compareToFoldCase(String)} and {@link #UNICODE_CASEFOLD_ORDER})
+ *       implement the Unicode <em>{@index "full case folding"}</em> rules defined in
+ *       <a href="https://www.unicode.org/Public/UCD/latest/ucd/CaseFolding.txt">Unicode CaseFolding.txt</a>.
+ *       Case folding is locale-independent and language-neutral and may map a single code
+ *       point to multiple code points (1:M mappings). For example, the German sharp
+ *       s ({@code U+00DF}) is folded to the sequence {@code "ss"}.
+ *       Use these methods when you need Unicode-compliant
+ *       <a href="https://www.unicode.org/versions/latest/core-spec/chapter-5/#G21790">
+ *       caseless matching</a>, searching, or ordering.</li>
+ * </ul>
+ *
+ * <p>Unless otherwise noted, methods for comparing Strings do not take locale into
+ * account. The {@link java.text.Collator} class provides methods for finer-grain,
+ * locale-sensitive String comparison.
  *
  * @implNote The implementation of the string concatenation operator is left to
  * the discretion of a Java compiler, as long as the compiler ultimately conforms
@@ -2179,6 +2208,7 @@ public final class String
      *          false} otherwise
      *
      * @see  #equals(Object)
+     * @see  #equalsFoldCase(String)
      * @see  #codePoints()
      */
     public boolean equalsIgnoreCase(String anotherString) {
@@ -2188,6 +2218,57 @@ public final class String
                 && regionMatches(true, 0, anotherString, 0, length());
     }
 
+    /**
+     * Compares this {@code String} to another {@code String} for equality,
+     * using <em>{@index "Unicode case folding"}</em>. Two strings are considered equal
+     * by this method if their case-folded forms are identical.
+     * <p>
+     * Case folding is defined by the Unicode Standard in
+     * <a href="https://www.unicode.org/Public/UCD/latest/ucd/CaseFolding.txt">CaseFolding.txt</a>,
+     * including 1:M mappings. For example, {@code "Fuß".equalsFoldCase("FUSS")}
+     * returns {@code true}, since the character {@code U+00DF} (sharp s) folds
+     * to {@code "ss"}.
+     * <p>
+     * Case folding is locale-independent and language-neutral, unlike
+     * locale-sensitive transformations such as {@link #toLowerCase()} or
+     * {@link #toUpperCase()}. It is intended for caseless matching,
+     * searching, and indexing.
+     *
+     * @apiNote
+     * This method is the Unicode-compliant alternative to
+     * {@link #equalsIgnoreCase(String)}. It implements full case folding as
+     * defined by the Unicode Standard, which may differ from the simpler
+     * per-character mapping performed by {@code equalsIgnoreCase}.
+     * For example:
+     * {@snippet lang=java :
+     * String a = "Fuß";
+     * String b = "FUSS";
+     * boolean equalsFoldCase = a.equalsFoldCase(b);       // returns true
+     * boolean equalsIgnoreCase = a.equalsIgnoreCase(b);   // returns false
+     * }
+     *
+     * @param  anotherString
+     *         The {@code String} to compare this {@code String} against
+     *
+     * @return  {@code true} if the given object is not {@code null} and represents
+     *          the same sequence of characters as this string under Unicode case
+     *          folding; {@code false} otherwise.
+     *
+     * @spec    https://www.unicode.org/versions/latest/core-spec/chapter-5/#G21790 Unicode Caseless Matching
+     * @see     #compareToFoldCase(String)
+     * @see     #equalsIgnoreCase(String)
+     * @since   26
+     */
+    public boolean equalsFoldCase(String anotherString) {
+        if (this == anotherString) {
+            return true;
+        }
+        if (anotherString == null) {
+            return false;
+        }
+        return UNICODE_CASEFOLD_ORDER.compare(this, anotherString) == 0;
+    }
+
     /**
      * Compares two strings lexicographically.
      * The comparison is based on the Unicode value of each character in
@@ -2303,12 +2384,86 @@ public final class String
      *          than this String, ignoring case considerations.
      * @see     java.text.Collator
      * @see     #codePoints()
+     * @see     #compareToFoldCase(String)
      * @since   1.2
      */
     public int compareToIgnoreCase(String str) {
         return CASE_INSENSITIVE_ORDER.compare(this, str);
     }
 
+    /**
+     * A Comparator that orders {@code String} objects as by
+     * {@link #compareToFoldCase(String) compareToFoldCase()}.
+     *
+     * @see     #compareToFoldCase(String)
+     * @since   26
+     */
+    public static final Comparator<String> UNICODE_CASEFOLD_ORDER
+            = new FoldCaseComparator();
+
+    private static class FoldCaseComparator implements Comparator<String> {
+
+        @Override
+        public int compare(String s1, String s2) {
+            byte[] v1 = s1.value;
+            byte[] v2 = s2.value;
+            if (s1.coder == s2.coder()) {
+                return s1.coder == LATIN1 ? StringLatin1.compareToFC(v1, v2)
+                                          : StringUTF16.compareToFC(v1, v2);
+            }
+            return s1.coder == LATIN1 ? StringLatin1.compareToFC_UTF16(v1, v2)
+                                      : StringUTF16.compareToFC_Latin1(v1, v2);
+        }
+    }
+
+    /**
+     * Compares two strings lexicographically using <em>{@index "Unicode case folding"}</em>.
+     * This method returns an integer whose sign is that of calling {@code compareTo}
+     * on the Unicode case folded version of the strings. Unicode Case folding
+     * eliminates differences in case according to the Unicode Standard, using the
+     * mappings defined in
+     * <a href="https://www.unicode.org/Public/UCD/latest/ucd/CaseFolding.txt">CaseFolding.txt</a>,
+     * including 1:M mappings, such as {@code"ß"} → {@code }"ss"}.
+     * <p>
+     * Case folding is a locale-independent, language-neutral form of case mapping,
+     * primarily intended for caseless matching. Unlike {@link #compareToIgnoreCase(String)},
+     * which applies a simpler locale-insensitive uppercase mapping. This method
+     * follows the Unicode <em>{@index "full"}</em> case folding, providing stable and
+     * consistent results across all environments.
+     * <p>
+     * Note that this method does <em>not</em> take locale into account, and may
+     * produce results that differ from locale-sensitive ordering. Use
+     * {@link java.text.Collator} for locale-sensitive comparison.
+     *
+     * @apiNote
+     * This method is the Unicode-compliant alternative to
+     * {@link #compareToIgnoreCase(String)}. It implements the
+     * <em>{@index "full case folding"}</em> as defined by the Unicode Standard, which
+     * may differ from the simpler per-character mapping performed by
+     * {@code compareToIgnoreCase}.
+     * For example:
+     * {@snippet lang=java :
+     * String a = "Fuß";
+     * String b = "FUSS";
+     * int cmpFoldCase = a.compareToFoldCase(b);     // returns 0
+     * int cmpIgnoreCase = a.compareToIgnoreCase(b); // returns > 0
+     * }
+     *
+     * @param   str   the {@code String} to be compared.
+     * @return  a negative integer, zero, or a positive integer as the specified
+     *          String is greater than, equal to, or less than this String,
+     *          ignoring case considerations by case folding.
+     *
+     * @spec    https://www.unicode.org/versions/latest/core-spec/chapter-5/#G21790 Unicode Caseless Matching
+     * @see     java.text.Collator
+     * @see     #compareToIgnoreCase(String)
+     * @see     #equalsFoldCase(String)
+     * @since   26
+     */
+    public int compareToFoldCase(String str) {
+        return UNICODE_CASEFOLD_ORDER.compare(this, str);
+    }
+
     /**
      * Tests if two string regions are equal.
      * <p>
diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java
index 61c62d049bc..21a8b2dd61a 100644
--- a/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -32,6 +32,8 @@ import java.util.function.Consumer;
 import java.util.function.IntConsumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+
+import jdk.internal.lang.CaseFolding;
 import jdk.internal.util.ArraysSupport;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
@@ -179,6 +181,128 @@ final class StringLatin1 {
         return len1 - len2;
     }
 
+    private static int compareToFC0(byte[] value, int off, int last, byte[] other, int ooff, int olast) {
+        int k1 = off, k2 = ooff;
+        boolean lo1 = false, lo2 = false;  // true if we have a leftover 's' from u+00df -> ss
+        while ((k1 < last || lo1) && (k2 < olast || lo2)) {
+            int c1, c2;
+            if (lo1) {
+                c1 = 0x73; // leftover 's'
+                lo1 = false;
+            } else {
+                c1 = getChar(value, k1++);
+                if (c1 == 0xdf) {
+                    c1 = 0x73;
+                    lo1 = true;
+                }
+            }
+            if (lo2) {
+                c2 = 0x73; // 's'
+                lo2 = false;
+            } else {
+                c2 = getChar(other, k2++);
+                if (c2 == 0xdf) {
+                    c2 = 0x73;
+                    lo2 = true;
+                }
+            }
+            if (!CharacterDataLatin1.equalsIgnoreCase((byte)c1, (byte)c2)) {
+                return Character.toLowerCase(c1) - Character.toLowerCase(c2);
+            }
+        }
+        if (k1 < last || lo1) {
+            return 1;
+        }
+        if (k2 < olast || lo2) {
+            return -1;
+        }
+        return 0;
+    }
+
+    static int compareToFC(byte[] value, byte[] other) {
+        int len = value.length;
+        int olen = other.length;
+        int lim = Math.min(len, olen);
+        for (int k = 0; k < lim; k++) {
+            byte b1 = value[k];
+            byte b2 = other[k];
+            if (!CharacterDataLatin1.equalsIgnoreCase(b1, b2)) {
+                int c1 = b1 & 0xff;
+                int c2 = b2 & 0xff;
+                if (c1 == 0xdf || c2 == 0xdf) {  // 0xdf is the only 1:M in latin1 range
+                    return compareToFC0(value, k, len, other, k, olen);
+                }
+                return Character.toLowerCase(c1) - Character.toLowerCase(c2);
+            }
+        }
+        return len - olen;
+    }
+
+    private static int compareToFC0_UTF16(byte[] value, int off, int last, byte[] other, int ooff, int olast) {
+        int f1 = 0, f2 = 0;
+        int k1 = off, k2 = ooff;
+        while ((k1 < last || f1 != 0) && (k2 < olast || f2 != 0)) {
+            int c1, c2;
+            if (f1 != 0) {
+                c1 = (f1 & 0xffff); f1 >>>= 16;
+            } else {
+                c1 = getChar(value, k1++);
+                var f = CaseFolding.fold(c1);
+                if (CaseFolding.isSingleCodePoint(f)) {
+                    c1 = (int)(f & 0xfffff);
+                } else {
+                    c1 = (int)f & 0xffff;
+                    f1 = (int)(f >>> 16);
+                }
+            }
+            if (f2 != 0) {
+                c2 = f2 & 0xffff; f2 >>>= 16;
+            } else {
+                c2 = StringUTF16.codePointAt(other, k2, olast, true);
+                k2 += Character.charCount(c2);
+                var f = CaseFolding.fold(c2);
+                if (CaseFolding.isSingleCodePoint(f)) {
+                    c2 = (int)(f & 0xfffff);
+                } else {
+                    c2 = (int)(f & 0xffff);
+                    f2 = (int)(f >>> 16);
+                }
+            }
+            if (c1 != c2) {
+                return c1 - c2;
+            }
+        }
+        if (k1 < last || f1 != 0) {
+            return 1;
+        }
+        if (k2 < olast || f2 != 0) {
+            return -1;
+        }
+        return 0;
+    }
+
+    // latin1 vs utf16
+    static int compareToFC_UTF16(byte[] value, byte[] other) {
+        int last = length(value);
+        int olast = StringUTF16.length(other);
+        int lim = Math.min(last, olast);
+        for (int k = 0; k < lim; k++) {
+            int cp1 = getChar(value, k);
+            int cp2 = StringUTF16.codePointAt(other, k, olast, true);
+            if (cp1 != cp2) {
+                long cf1 = CaseFolding.fold(cp1);
+                long cf2 = CaseFolding.fold(cp2);
+                if (cf1 != cf2) {
+                    if (!CaseFolding.isSingleCodePoint(cf1) || !CaseFolding.isSingleCodePoint(cf2)) {
+                        return compareToFC0_UTF16(value, k, last, other, k, olast);
+                    }
+                    return (int)(cf1 - cf2);
+                }
+            }
+        }
+        return last - olast;
+    }
+
     static int hashCode(byte[] value) {
         return ArraysSupport.hashCodeOfUnsigned(value, 0, value.length, 0);
     }
diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java
index 4e31c9728e9..75c9e8239ba 100644
--- a/src/java.base/share/classes/java/lang/StringUTF16.java
+++ b/src/java.base/share/classes/java/lang/StringUTF16.java
@@ -34,6 +34,7 @@ import java.util.function.IntConsumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import jdk.internal.lang.CaseFolding;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.util.ArraysSupport;
 import jdk.internal.vm.annotation.ForceInline;
@@ -93,7 +94,7 @@ final class StringUTF16 {
         return value.length >> 1;
     }
 
-    private static int codePointAt(byte[] value, int index, int end, boolean checked) {
+    static int codePointAt(byte[] value, int index, int end, boolean checked) {
         assert index < end;
         if (checked) {
             checkIndex(index, value);
@@ -592,6 +593,77 @@ final class StringUTF16 {
         return -StringLatin1.compareToCI_UTF16(other, value);
     }
 
+    public static int compareToFC_Latin1(byte[] value, byte[] other) {
+        return -StringLatin1.compareToFC_UTF16(other, value);
+    }
+
+    private static int compareToFC0(byte[] value, int off, int last, byte[] other, int ooff, int olast) {
+        int f1 = 0, f2 = 0;
+        int k1 = off, k2 = ooff;
+        while ((k1 < last || f1 != 0) && (k2 < olast || f2 != 0)) {
+            int c1, c2;
+            if (f1 != 0) {
+                c1 = f1 & 0xffff; f1 >>>= 16;
+            } else {
+                c1 = StringUTF16.codePointAt(value, k1, last, true);
+                k1 += Character.charCount(c1);
+                var f = CaseFolding.fold(c1);
+                if (CaseFolding.isSingleCodePoint(f)) {
+                    c1 = (int)(f & 0xfffff);
+                } else {
+                    c1 = (int)(f & 0xffff);
+                    f1 = (int)(f >> 16);
+                }
+            }
+            if (f2 != 0) {
+                c2 = f2 & 0xffff; f2 >>>= 16;
+            } else {
+                c2 = StringUTF16.codePointAt(other, k2, olast, true);
+                k2 += Character.charCount(c2);
+                var f = CaseFolding.fold(c2);
+                if (CaseFolding.isSingleCodePoint(f)) {
+                    c2 = (int)(f & 0xfffff);
+                } else {
+                    c2 = (int)(f & 0xffff);
+                    f2 = (int)(f >>> 16);
+                }
+            }
+            if (c1 != c2) {
+                return c1 - c2;
+            }
+        }
+        if (k1 < last || f1 != 0) {
+            return 1;
+        }
+        if (k2 < olast || f2 != 0) {
+            return -1;
+        }
+        return 0;
+    }
+
+    public static int compareToFC(byte[] value, byte[] other) {
+        int tlast = length(value);
+        int olast = length(other);
+        int lim = Math.min(tlast, olast);
+        int k = 0;
+        while (k < lim) {
+            int cp1 = codePointAt(value, k, tlast, true);
+            int cp2 = codePointAt(other, k, olast, true);
+            if (cp1 != cp2) {
+                long cf1 = CaseFolding.fold(cp1);
+                long cf2 = CaseFolding.fold(cp2);
+                if (cf1 != cf2) {
+                    if (!CaseFolding.isSingleCodePoint(cf1) || !CaseFolding.isSingleCodePoint(cf2)) {
+                        return compareToFC0(value, k, tlast, other, k, olast);
+                    }
+                    return (int) cf1 - (int) cf2;
+                }
+            }
+            k += Character.charCount(cp1);
+        }
+        return tlast - olast;
+    }
+
     static int hashCode(byte[] value) {
         return ArraysSupport.hashCodeOfUTF16(value, 0, value.length >> 1, 0);
     }
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 2908370acd5..58c9186924b 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -43,8 +43,8 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import jdk.internal.lang.CaseFolding;
 import jdk.internal.util.ArraysSupport;
-import jdk.internal.util.regex.CaseFolding;
 import jdk.internal.util.regex.Grapheme;
 
 /**
diff --git a/src/java.base/share/classes/jdk/internal/lang/CaseFolding.java.template b/src/java.base/share/classes/jdk/internal/lang/CaseFolding.java.template
new file mode 100644
index 00000000000..24a183c8da0
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/CaseFolding.java.template
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.lang;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static java.util.Map.entry;
+
+/**
+ * Utility class that handles Unicode case folding properties defined in
+ * CasingFolding.txt, including 1:M full case folding.
+ */
+public final class CaseFolding {
+
+    private CaseFolding()  {}
+
+   /**
+    * Tests whether the specified code point has a folding mapping entry defined.
+    *
+    * @param  cp
+    *         the Unicode code point to test
+    * @return {@code true} if the given code point has a case folding mapping entry
+    *         defined in (@code caseFoldingMap}, {@code false} otherwise
+    */
+    public static boolean isDefined(int cp) {
+         return getDefined(cp) != -1;
+    }
+
+   /**
+    * Returns the case-folded form of the specified code point according
+    * to the Unicode case folding mappings.
+    * <p>
+    * If the code point has no case folding mapping defined, this method returns
+    * the original code point.
+    *
+    * Possible combinations of the returning case-folding form as a long value
+    *
+    *  +---+---------+--------+---------+--------+--------+
+    *  | 1:1 mapping |  0000  |   0000  |  000x  |  xxxx  |  0041 => 0061 or 1E921 => 1E943
+    *  +---+---------+--------+---------+--------+--------+
+    *  | 1:2 mapping |  0002  |   0000  |  xxxx  |  xxxx  |  FB02 => 0066 006C
+    *  +---+---------+--------+---------+--------+--------+
+    *  | 1:3 mapping |  0003  |   xxxx  |  xxxx  |  xxxx  |  FB03 => 0066 0066 0069
+    *  +---+---------+--------+---------+--------+--------+
+    *
+    * @param  cp
+    *         the Unicode code point to fold
+    * @return a long value representing the case-folded form of the input
+    *         code point, encoded as TBD
+    */
+    public static long fold(int cp) {
+        var fold = getDefined(cp);
+        return fold == -1 ? cp : fold;
+    }
+
+    public static boolean isSingleCodePoint(long fold) {
+        return (fold >> 48) == 0;
+    }
+
+   /**
+    * Returns an expansion set to "close" a given regex Unicode character class range for case-sensitive
+    * matching, according to the
+    * <a href="https://www.unicode.org/reports/tr18/#Simple_Loose_Matches">Simple Loose Matches</a>
+    * rule defined in Unicode Technical Standard #18: Unicode Regular Expressions.
+    * <p>
+    * To conform with Level 1 of UTS #18, specifically RL1.5: Simple Loose Matches, simple case folding must
+    * be applied to literals and (optionally) to character classes. When applied to character classes, each
+    * character class is expected to be closed under simple case folding. See the standard for the
+    * detailed explanation and example of "closed".
+    * <p>
+    * RL1.5 states: To meet this requirement, an implementation that supports case-sensitive matching should
+    * <ol>
+    * <li>Provide at least the simple, default Unicode case-insensitive matching, and</li>
+    * <li>Specify which character properties or constructs are closed under the matching.</li>
+    * </ol>
+    * <p>
+    * In the {@code  Pattern} implementation, 5 types of constructs maybe case-sensitive when matching:
+    * back-refs, string slice (sequences), single, family(char-property) and class range. Single and
+    * family may appears independently or within a class.
+    * <p>
+    * For loose/case-insensitive matching, the back-refs, slices and singles apply {@code toUpperCase} and
+    * {@code toLowerCase} to both the pattern and the input string. This effectively 'close' the class for
+    * matching.
+    * <p>
+    * The family/char-properties are not "closed" and should remain unchanged. This is acceptable per RL1.5,
+    * if their behavior is clearly specified.
+    * <p>
+    * This method addresses that requirement for the "range" construct within in character class by computing
+    * the additional characters that should be included to close the range under simple case folding:
+    * <p>
+    * For each character in the input range {@code [start, end]} (inclusive), if the character has a simple
+    * case folding mapping in Unicode's CaseFolding.txt, the mapping is not a round-trip map, and the mapped
+    * character is not already in the range, then that mapped character (typically lowercase) is added to
+    * the expansion set.
+    * <p>
+    * This allows regex character class "range" implementation to use the returned expansion set to support
+    * additional case-insensitive matching, without duplicating characters already covered by the existing
+    * regex range implementation. The expectation is the matching is done using both the uppercase and
+    * lowercase forms of the input character, for example
+    *
+    * <pre>{@code
+    *
+    *     ch -> inRange(lower, Character.toUpperCase(ch), upper) ||
+    *           inRange(lower, Character.toLower(ch), upper) ||
+    *           additionalClosingCharacters.contains(Character.toUpperCase(ch)) ||
+    *           additionalClosingCharacters.contains(Character.toUpperCase(ch))
+    * }</pre>
+    *
+    * @param start the starting code point of the character range
+    * @param end the ending code point of the character range
+    * @return a {@code int[]} containing the all simple case equivalents of characters in the range, excluding
+    *         those already in the range
+    * @spec https://www.unicode.org/reports/tr18/#Simple_Loose_Matches
+    */
+    public static int[] getClassRangeClosingCharacters(int start, int end) {
+        int[] expanded = new int[expanded_case_cps.length];
+        int off = 0;
+        for (int cp : expanded_case_cps) {
+            if (cp >= start && cp <= end) {
+                int folding = expanded_case_map.get(cp);
+                if (folding < start || folding > end) {
+                    expanded[off++] = folding;
+                }
+            }
+        }
+        return Arrays.copyOf(expanded, off);
+    }
+
+    private static final Map<Integer, Integer> expanded_case_map = Map.ofEntries(
+%%%Expanded_Case_Map_Entries
+    );
+
+    private static final int[] expanded_case_cps = expanded_case_map.keySet()
+      .stream()
+      .mapToInt(Integer::intValue)
+      .toArray();
+
+    private static final int HASH_CP = 0;
+    private static final int HASH_INDEX = 1;
+    private static final int HASH_NEXT = 2;
+
+    private static int[][] hashKeys(int[] keys) {
+        var hashes = new int[keys.length << 1][3];  // cp + hash + next
+        var off = keys.length;
+        for (int i = 0; i < keys.length; i++) {
+            var cp = keys[i];
+            var hash = cp % keys.length;
+            while (hashes[hash][HASH_CP] != 0) {
+                var next = hashes[hash][HASH_NEXT];
+                if (next == 0) {
+                    hashes[hash][HASH_NEXT] = off;
+                    hash = off++;
+                    break;
+                } else {
+                    hash = next;
+                }
+            }
+            hashes[hash][HASH_CP] = cp;
+            hashes[hash][HASH_INDEX] = i;
+        }
+        return Arrays.copyOf(hashes, off);
+    }
+
+    private static long getDefined(int cp) {
+        var hashes = CASE_FOLDING_HASHES;
+        var length = CASE_FOLDING_CPS.length;  // hashed based on total defined.
+        var hash = cp % length;
+        while (hashes[hash][HASH_CP] != cp) {
+            var next = hashes[hash][HASH_NEXT];
+            if (next == 0) {
+                return -1;   // hash miss
+            }
+            hash = next;
+        }
+        var index = hashes[hash][HASH_INDEX];
+        return CASE_FOLDING_VALUES[index];
+    }
+
+%%%Entries
+
+    private static final int[][] CASE_FOLDING_HASHES = hashKeys(CASE_FOLDING_CPS);
+}
diff --git a/src/java.base/share/classes/jdk/internal/util/regex/CaseFolding.java.template b/src/java.base/share/classes/jdk/internal/util/regex/CaseFolding.java.template
deleted file mode 100644
index 8ffbde6c535..00000000000
--- a/src/java.base/share/classes/jdk/internal/util/regex/CaseFolding.java.template
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.util.regex;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Objects;
-
-import static java.util.Map.entry;
-
-public final class CaseFolding {
-
-    private static final Map<Integer, Integer> expanded_case_map = Map.ofEntries(
-%%%Entries
-    );
-
-    private static final int[] expanded_case_cps = expanded_case_map.keySet()
-      .stream()
-      .mapToInt(Integer::intValue)
-      .toArray();
-
-    private CaseFolding()  {}
-
-    /**
-     * Returns an expansion set to "close" a given regex Unicode character class range for case-sensitive
-     * matching, according to the
-     * <a href="https://www.unicode.org/reports/tr18/#Simple_Loose_Matches">Simple Loose Matches</a>
-     * rule defined in Unicode Technical Standard #18: Unicode Regular Expressions.
-     * <p>
-     * To conform with Level 1 of UTS #18, specifically RL1.5: Simple Loose Matches, simple case folding must
-     * be applied to literals and (optionally) to character classes. When applied to character classes, each
-     * character class is expected to be closed under simple case folding. See the standard for the
-     * detailed explanation and example of "closed".
-     * <p>
-     * RL1.5 states: To meet this requirement, an implementation that supports case-sensitive matching should
-     * <ol>
-     * <li>Provide at least the simple, default Unicode case-insensitive matching, and</li>
-     * <li>Specify which character properties or constructs are closed under the matching.</li>
-     * </ol>
-     * <p>
-     * In the {@code  Pattern} implementation, 5 types of constructs maybe case-sensitive when matching:
-     * back-refs, string slice (sequences), single, family(char-property) and class range. Single and
-     * family may appears independently or within a class.
-     * <p>
-     * For loose/case-insensitive matching, the back-refs, slices and singles apply {code toUpperCase} and
-     * {@code toLowerCase} to both the pattern and the input string. This effectively 'close' the class for
-     * matching.
-     * <p>
-     * The family/char-properties are not "closed" and should remain unchanged. This is acceptable per RL1.5,
-     * if their behavior is clearly specified.
-     * <p>
-     * This method addresses that requirement for the "range" construct within in character class by computing
-     * the additional characters that should be included to close the range under simple case folding:
-     * <p>
-     * For each character in the input range {@code [start, end]} (inclusive), if the character has a simple
-     * case folding mapping in Unicode's CaseFolding.txt, the mapping is not a round-trip map, and the mapped
-     * character is not already in the range, then that mapped character (typically lowercase) is added to
-     * the expansion set.
-     * <p>
-     * This allows regex character class "range" implementation to use the returned expansion set to support
-     * additional case-insensitive matching, without duplicating characters already covered by the existing
-     * regex range implementation. The expectation is the matching is done using both the uppercase and
-     * lowercase forms of the input character, for example
-     *
-     * <pre>{@code
-     *
-     *     ch -> inRange(lower, Character.toUpperCase(ch), upper) ||
-     *           inRange(lower, Character.toLower(ch), upper) ||
-     *           additionalClosingCharacters.contains(Character.toUpperCase(ch)) ||
-     *           additionalClosingCharacters.contains(Character.toUpperCase(ch))
-     * }</pre>
-     *
-     * <p>
-     * @spec https://www.unicode.org/reports/tr18/#Simple_Loose_Matches
-     * @param start the starting code point of the character range
-     * @param end the ending code point of the character range
-     * @return a {@code int[]} containing the all simple case equivalents of characters in the range, excluding
-     *         those already in the range
-     */
-    public static int[] getClassRangeClosingCharacters(int start, int end) {
-        int[] expanded = new int[expanded_case_cps.length];
-        int off = 0;
-        for (int cp : expanded_case_cps) {
-            if (cp >= start && cp <= end) {
-                int folding = expanded_case_map.get(cp);
-                if (folding < start || folding > end) {
-                    expanded[off++] = folding;
-                }
-            }
-        }
-        return Arrays.copyOf(expanded, off);
-    }
-}
diff --git a/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java b/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java
new file mode 100644
index 00000000000..86b3fba0a27
--- /dev/null
+++ b/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary tests unicode case-folding based String comparison and equality
+ * @bug 4397357
+ * @library /lib/testlibrary/java/lang
+ * @modules java.base/jdk.internal.lang:+open
+ * @run junit/othervm
+ * UnicodeCaseFoldingTest
+ */
+
+import java.nio.file.Files;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
+import java.util.ArrayList;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import jdk.internal.lang.CaseFolding;
+
+public class UnicodeCaseFoldingTest {
+
+    @Test
+    void testAllCommnFullCodePointsListedInCaseFoldinigTxt() throws Throwable {
+        var filter = "^.*; [CF]; .*$";  // C=common, F=full, for full case folding
+        var results = Files.lines(UCDFiles.CASEFOLDING)
+                .filter(line -> !line.startsWith("#") && line.matches(filter))
+                .map(line -> {
+                    var fields = line.split("; ");
+                    var cp = Integer.parseInt(fields[0], 16);
+                    fields = fields[2].trim().split(" ");
+                    var folding = new int[fields.length];
+                    for (int i = 0; i < folding.length; i++) {
+                        folding[i] = Integer.parseInt(fields[i], 16);
+                    }
+                    var source = new String(Character.toChars(cp));
+                    var expected = new String(folding, 0, folding.length);
+                    // (1) Verify the folding result matches expected
+                    assertEquals(expected, foldCase(source), "CaseFolding.fold(): ");
+
+                    // (2) Verify compareToFoldCase() result
+                    assertEquals(0, source.compareToFoldCase(expected), "source.compareToFoldCase(expected)");
+                    assertEquals(0, expected.compareToFoldCase(source), "expected.compareToFoldCase(source)");
+
+                    // (3) Verify equalsFoldCase() result
+                    assertEquals(true, source.equalsFoldCase(expected), "source.equalsFoldCase(expected)");
+                    assertEquals(true, expected.equalsFoldCase(source), "expected.equalsFoldCase(source)");
+                    return null;
+                })
+                .filter(error -> error != null)
+                .toArray();
+        assertEquals(0, results.length);
+    }
+
+    @Test
+    void testAllSimpleCodePointsListedInCaseFoldinigTxt() throws Throwable {
+        // S=simple, for simple case folding. The simple case folding should still matches
+        var filter = "^.*; [S]; .*$";
+        var results = Files.lines(UCDFiles.CASEFOLDING)
+                .filter(line -> !line.startsWith("#") && line.matches(filter))
+                .map(line -> {
+                    var fields = line.split("; ");
+                    var cp = Integer.parseInt(fields[0], 16);
+                    fields = fields[2].trim().split(" ");
+                    var folding = new int[fields.length];
+                    for (int i = 0; i < folding.length; i++) {
+                        folding[i] = Integer.parseInt(fields[i], 16);
+                    }
+                    var source = new String(Character.toChars(cp));
+                    var expected = new String(folding, 0, folding.length);
+
+                    // (1) Verify compareToFoldCase() result
+                    assertEquals(0, source.compareToFoldCase(expected), "source.compareToFoldCase(expected)");
+                    assertEquals(0, expected.compareToFoldCase(source), "expected.compareToFoldCase(source)");
+
+                    // (2) Verify equalsFoldCase() result
+                    assertEquals(true, source.equalsFoldCase(expected), "source.equalsFoldCase(expected)");
+                    assertEquals(true, expected.equalsFoldCase(source), "expected.equalsFoldCase(source)");
+                    return null;
+                })
+                .filter(error -> error != null)
+                .toArray();
+        assertEquals(0, results.length);
+    }
+
+    @Test
+    public void testAllCodePointsFoldToThemselvesIfNotListed() throws Exception {
+        // Collect all code points that appear in CaseFolding.txt
+        var listed = Files.lines(UCDFiles.CASEFOLDING)
+                .filter(line -> !line.startsWith("#") && line.matches("^.*; [CF]; .*$"))
+                .map(line -> Integer.parseInt(line.split("; ")[0], 16))
+                .collect(Collectors.toSet());
+
+        var failures = new ArrayList<String>();
+
+        // Scan BMP + Supplementary Plane 1 (U+0000..U+1FFFF)
+        for (int cp = Character.MIN_CODE_POINT; cp <= 0x1FFFF; cp++) {
+            if (!Character.isDefined(cp)) {
+                continue;     // skip undefined
+            }
+            if (Character.isSurrogate((char) cp)) {
+                continue; // skip surrogate code units
+            }
+            if (listed.contains(cp)) {
+                continue;          // already tested separately
+            }
+            String s = new String(Character.toChars(cp));
+            String folded = foldCase(s);
+            if (!s.equals(folded)) {
+                failures.add(String.format("Unexpected folding: U+%04X '%s' → '%s'", cp, s, folded));
+            }
+        }
+
+        assertEquals(0, failures.size(),
+                () -> "Some unlisted code points folded unexpectedly:\n"
+                        + String.join("\n", failures));
+    }
+
+    @ParameterizedTest(name = "CaseFold \"{0}\" → \"{1}\"")
+    @MethodSource("caseFoldTestCases")
+    void testIndividualCaseFolding(String input, String expected) {
+        assertEquals(expected, foldCase(input));
+    }
+
+    static Stream<Arguments> caseFoldTestCases() {
+        return Stream.of(
+                // ASCII simple cases
+                Arguments.of("ABC", "abc"),
+                Arguments.of("already", "already"),
+                Arguments.of("MiXeD123", "mixed123"),
+                // --- Latin-1 to non-Latin-1 fold ---
+                Arguments.of("aBc\u00B5Efg", "abc\u03BCefg"), // "µ" → "μ"
+                Arguments.of("test\u00B5\ud801\udc00X", "test\u03bc\ud801\udc28x"),
+                // German Eszett
+                Arguments.of("Stra\u00DFe", "strasse"), // "Straße"
+                Arguments.of("\u1E9E", "ss"), // "ẞ"  capital sharp S
+                // Turkish dotted I / dotless i
+                Arguments.of("I", "i"),
+                Arguments.of("\u0130", "i\u0307"), // capital dotted I → "i + dot above"
+                Arguments.of("\u0069\u0307", "i\u0307"), // small i + dot above remains
+                Arguments.of("\u0131", "\u0131"), // "ı" (dotless i stays dotless)
+
+                // Greek special cases ---
+                Arguments.of("\u039F\u03A3", "\u03BF\u03C3"), // "ΟΣ" → "οσ"  final sigma always folds to normal sigma
+                Arguments.of("\u1F88", "\u1F00\u03B9"), // "ᾈ" → "ἀι"    Alpha with psili + ypogegrammeni
+                Arguments.of("\u039C\u03AC\u03CA\u03BF\u03C2", "\u03BC\u03AC\u03CA\u03BF\u03C3"), // "Μάϊος" → "μάϊοσ"
+                Arguments.of("\u1F08", "\u1F00"), //  Ἀ (Capital Alpha with psili) → ἀ
+
+                // Supplementary Plane characters
+                Arguments.of("\uD801\uDC00", "\uD801\uDC28"), // Deseret Capital Letter Long I → Small
+                Arguments.of("\uD801\uDC01", "\uD801\uDC29"), // Deseret Capital Letter Long E → Small
+
+                // Supplementary inside ASCII
+                Arguments.of("abc\uD801\uDC00def", "abc\uD801\uDC28def"),
+                // Ligatures and compatibility folds
+                Arguments.of("\uFB00", "ff"), // ff → ff
+                Arguments.of("\uFB03", "ffi"), // ffi → ffi
+                Arguments.of("\u212A", "k"), // Kelvin sign → k
+
+                Arguments.of("abc\uFB00def", "abcffdef"), // ff → ff
+                Arguments.of("abc\uFB03def", "abcffidef"), // ffi → ffi
+                Arguments.of("abc\u212Adef", "abckdef"), // Kelvin sign → k
+
+                // --- Fullwidth ---
+                Arguments.of("\uFF21\uFF22\uFF23", "\uFF41\uFF42\uFF43"), // "ＡＢＣ" → "ａｂｃ"
+
+                // --- Armenian ---
+                Arguments.of("\u0531", "\u0561"), // "Ա" → "ա"
+
+                // --- Cherokee ---
+                Arguments.of("\u13A0", "\u13A0"), // Capital Cherokee A folds to itself
+                Arguments.of("\uAB70", "\u13A0") // Small Cherokee A folds Capital Cherokee A
+        );
+    }
+
+    static Stream<Arguments> caseFoldEqualProvider() {
+        return Stream.of(
+                Arguments.of("abc", "ABC"),
+                Arguments.of("aBcDe", "AbCdE"),
+                Arguments.of("\u00C0\u00E7", "\u00E0\u00C7"), // Àç vs àÇ
+                Arguments.of("straße", "STRASSE"), // ß → ss
+                Arguments.of("\uD83C\uDDE6", "\uD83C\uDDE6"), // 🇦 vs 🇦
+                Arguments.of("\u1E9E", "ss"), // ẞ (capital sharp S)
+                Arguments.of("\u03A3", "\u03C3"), // Σ vs σ (Greek Sigma)
+                Arguments.of("\u03C3", "\u03C2"), // σ vs ς (Greek sigma/final sigma)
+                Arguments.of("\u212B", "\u00E5"), // Å (Angstrom sign) vs å
+                Arguments.of("\uFB00", "ff"), // ff (ligature)
+                Arguments.of("\u01C5", "\u01C5"), // Dž (Latin capital D with small z with caron)
+                Arguments.of("Caf\u00E9", "CAF\u00C9"), // Café vs CAFÉ
+                Arguments.of("\u03BA\u03B1\u03BB\u03B7\u03BC\u03AD\u03C1\u03B1", "\u039A\u0391\u039B\u0397\u039C\u0388\u03A1\u0391"), // καλημέρα vs ΚΑΛΗΜΕΡΑ
+                Arguments.of("\u4E2D\u56FD", "\u4E2D\u56FD"), // 中国
+                Arguments.of("\u03B1", "\u0391"), // α vs Α (Greek alpha)
+                Arguments.of("\u212B", "\u00C5"), // Å vs Å
+                // from StringCompareToIgnoreCase
+                Arguments.of("\u0100\u0102\u0104\u0106\u0108", "\u0100\u0102\u0104\u0106\u0109"), // ĀĂĄĆĈ vs ĀĂĄĆĉ
+                Arguments.of("\u0101\u0103\u0105\u0107\u0109", "\u0100\u0102\u0104\u0106\u0109"), // āăąćĉ vs ĀĂĄĆĉ
+                Arguments.of("\ud801\udc00\ud801\udc01\ud801\udc02\ud801\udc03\ud801\udc04",
+                        "\ud801\udc00\ud801\udc01\ud801\udc02\ud801\udc03\ud801\udc2c"), // 𐐀𐐁𐐂𐐃𐐄 vs 𐐀𐐁𐐂𐐃𐐬
+                Arguments.of("\ud801\udc28\ud801\udc29\ud801\udc2a\ud801\udc2b\ud801\udc2c",
+                        "\ud801\udc00\ud801\udc01\ud801\udc02\ud801\udc03\ud801\udc2c") // 𐐨𐐩𐐪𐐫𐐬 vs 𐐀𐐁𐐂𐐃𐐬
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("caseFoldEqualProvider")
+    void testcompareToFoldCaseEquals(String s1, String s2) {
+        assertEquals(0, s1.compareToFoldCase(s2));
+        assertEquals(0, s2.compareToFoldCase(s1));
+        assertEquals(true, s1.equalsFoldCase(s2));
+        assertEquals(true, s2.equalsFoldCase(s1));
+        assertEquals(foldCase(s1), foldCase(s2));
+    }
+
+    static Stream<Arguments> caseFoldOrderingProvider() {
+        return Stream.of(
+                Arguments.of("asa", "aß", -1), // ß → ss → "asa" < "ass"
+                Arguments.of("aß", "asa", +1),
+                Arguments.of("a\u00DF", "ass", 0), // aß vs ass
+                Arguments.of("\uFB03", "ffi", 0), // ffi (ligature)
+                Arguments.of("\u00C5", "Z", 1), // Å vs Z
+                Arguments.of("A", "\u00C0", -1), // A vs À
+                Arguments.of("\u03A9", "\u03C9", 0), // Ω vs ω
+                Arguments.of("\u03C2", "\u03C3", 0), // ς vs σ
+                Arguments.of("\uD835\uDD23", "R", 1), // 𝔯 (fraktur r) vs R
+                Arguments.of("\uFF26", "E", 1), // Ｆ (full-width F) vs E
+                Arguments.of("\u00C9clair", "Eclair", 1), // Éclair vs Eclair
+                Arguments.of("\u03bc\u00df", "\u00b5s", 1),
+                Arguments.of("\u00b5s", "\u03bc\u00df", -1)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("caseFoldOrderingProvider")
+    void testcompareToFoldCaseOrdering(String s1, String s2, int expectedSign) {
+        int cmp = s1.compareToFoldCase(s2);
+        assertEquals(expectedSign, Integer.signum(cmp));
+    }
+
+    static Stream<Arguments> roundTripProvider() {
+        return Stream.of(
+                Arguments.of("abc"),
+                Arguments.of("ABC"),
+                Arguments.of("straße"),
+                Arguments.of("Àç"),
+                Arguments.of("aß"),
+                Arguments.of("\uFB02uff"), // fluff (ligature in "fluff")
+                Arguments.of("\u00C9COLE") // ÉCOLE
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("roundTripProvider")
+    void testCaseFoldRoundTrip(String s) {
+        String folded = foldCase(s);
+        assertEquals(0, s.compareToFoldCase(folded));
+        assertEquals(0, folded.compareToFoldCase(s));
+        assertEquals(true, s.equalsFoldCase(folded));
+        assertEquals(true, folded.equalsFoldCase(s));
+    }
+
+    // helper to test the integrity of folding mapping
+    private static int[] longToFolding(long value) {
+        int len = (int) (value >>> 48);
+        if (len == 0) {
+            return new int[]{(int) (value & 0xFFFFF)};
+        } else {
+            var folding = new int[len];
+            for (int i = 0; i < len; i++) {
+                folding[i] = (int) (value & 0xFFFF);
+                value >>= 16;
+            }
+            return folding;
+        }
+    }
+
+    private static String foldCase(String s) {
+        int first;
+        int len = s.length();
+        int cpCnt = 1;
+        for (first = 0; first < len; first += cpCnt) {
+            int cp = s.codePointAt(first);
+            if (CaseFolding.isDefined(cp)) {
+                break;
+            }
+            cpCnt = Character.charCount(cp);
+        }
+        if (first == len) {
+            return s;
+        }
+        StringBuilder sb = new StringBuilder(len);
+        sb.append(s, 0, first);
+        for (int i = first; i < len; i += cpCnt) {
+            int cp = s.codePointAt(i);
+            int[] folded = longToFolding(CaseFolding.fold(cp));
+            for (int f : folded) {
+                sb.appendCodePoint(f);
+            }
+            cpCnt = Character.charCount(cp);
+        }
+        return sb.toString();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/StringCompareToFoldCase.java b/test/micro/org/openjdk/bench/java/lang/StringCompareToFoldCase.java
new file mode 100644
index 00000000000..dff4d874705
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/StringCompareToFoldCase.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.*;
+import java.util.concurrent.TimeUnit;
+
+/*
+ * This benchmark naively explores String::compareToFoldCase performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+public class StringCompareToFoldCase {
+
+    private String asciiUpper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    private String asciiUpperLower = "ABCDEFGHIJKLMNOpqrstuvwxyz";
+    private String asciiLower = "abcdefghijklmnopqrstuvwxyz";
+
+    private String asciiWithDF = "abcdßßßßßßßßßßßßßßßßWXYZ";
+    private String asciiWithDFSS = "abcdssssssssssssssssßßßßßßßßWXYZ";
+
+    private String asciiLatine1 = "ABCDEFGHIJKLMNOpqrstuvwxyz0";
+    private String asciiLatin1UTF16 = "abcdefghijklmnopqrstuvwxyz\u0391";
+
+    private String greekUpper = "\u0391\u0392\u0393\u0394\u0395\u0391\u0392\u0393\u0394\u0395"; // ΑΒΓΔΕ
+    private String greekUpperLower = "\u0391\u0392\u0393\u0394\u0395\u0391\u0392\u0393\u0394\u03B5"; // ΑΒΓΔε
+    private String greekLower = "\u03B1\u03B2\u03B3\u03B4\u03B5\u03B1\u03B2\u03B3\u03B4\u03B5"; // αβγδε
+
+    public String supUpper = "\ud801\udc00\ud801\udc01\ud801\udc02\ud801\udc03\ud801\udc04";
+    public String supUpperLower = "\ud801\udc00\ud801\udc01\ud801\udc02\ud801\udc03\ud801\udc2c";
+    public String supLower = "\ud801\udc28\ud801\udc29\ud801\udc2a\ud801\udc2b\ud801\udc2c";
+
+    @Benchmark
+    public int asciiUpperLower() {
+        return asciiUpper.compareToIgnoreCase(asciiUpperLower);
+    }
+
+    @Benchmark
+    public int asciiLower() {
+        return asciiUpper.compareToIgnoreCase(asciiLower);
+    }
+
+    @Benchmark
+    public int greekUpperLower() {
+        return greekUpper.compareToIgnoreCase(greekUpperLower);
+    }
+
+    @Benchmark
+    public int greekLower() {
+        return greekUpper.compareToIgnoreCase(greekLower);
+    }
+
+    @Benchmark
+    public int latin1UTF16() {
+        return asciiLatine1.compareToIgnoreCase(asciiLatin1UTF16);
+    }
+
+    @Benchmark
+    public int supUpperLower() {
+        return supUpper.compareToIgnoreCase(supUpperLower);
+    }
+
+    @Benchmark
+    public int supLower() {
+        return supUpper.compareToIgnoreCase(supLower);
+    }
+
+    @Benchmark
+    public int asciiUpperLowerFC() {
+        return asciiUpper.compareToFoldCase(asciiUpperLower);
+    }
+
+    @Benchmark
+    public int asciiLowerFC() {
+        return asciiUpper.compareToFoldCase(asciiLower);
+    }
+
+    @Benchmark
+    public int asciiWithDFFC() {
+        return asciiWithDF.compareToFoldCase(asciiWithDFSS);
+    }
+
+    @Benchmark
+    public int greekUpperLowerFC() {
+        return greekUpper.compareToFoldCase(greekUpperLower);
+    }
+
+    @Benchmark
+    public int greekLowerFC() {
+        return greekUpper.compareToFoldCase(greekLower);
+    }
+
+    @Benchmark
+    public int latin1UTF16FC() {
+        return asciiLatine1.compareToFoldCase(asciiLatin1UTF16); }
+
+    @Benchmark
+    public int supUpperLowerFC() {
+        return supUpper.compareToFoldCase(supUpperLower);
+    }
+
+    @Benchmark
+    public int supLowerFC() {
+        return supUpper.compareToFoldCase(supLower);
+    }
+
+    @Benchmark
+    public boolean asciiUpperLowerEQ() {
+        return asciiUpper.equalsIgnoreCase(asciiUpperLower);
+    }
+
+    @Benchmark
+    public boolean asciiLowerEQ() {
+        return asciiUpper.equalsIgnoreCase(asciiLower);
+    }
+
+    @Benchmark
+    public boolean greekUpperLowerEQ() {
+        return greekUpper.equalsIgnoreCase(greekUpperLower);
+    }
+
+    @Benchmark
+    public boolean greekLowerEQ() {
+        return greekUpper.equalsIgnoreCase(greekLower);
+    }
+
+    @Benchmark
+    public boolean latin1UTF16EQ() {
+        return asciiLatine1.equalsIgnoreCase(asciiLatin1UTF16);
+    }
+
+    @Benchmark
+    public boolean supUpperLowerEQ() {
+        return supUpper.equalsIgnoreCase(supUpperLower);
+    }
+
+    @Benchmark
+    public boolean supLowerEQ() {
+        return supUpper.equalsIgnoreCase(supLower);
+    }
+
+    @Benchmark
+    public boolean asciiUpperLowerEQFC() {
+        return asciiUpper.equalsFoldCase(asciiUpperLower);
+    }
+
+    @Benchmark
+    public boolean asciiLowerEQFC() {
+        return asciiUpper.equalsFoldCase(asciiLower);
+    }
+
+    @Benchmark
+    public boolean greekUpperLowerEQFC() {
+        return greekUpper.equalsFoldCase(greekUpperLower);
+    }
+
+    @Benchmark
+    public boolean greekLowerEQFC() {
+        return greekUpper.equalsFoldCase(greekLower);
+    }
+
+    @Benchmark
+    public boolean latin1UTF16EQFC() {
+        return asciiLatine1.equalsFoldCase(asciiLatin1UTF16);
+    }
+
+    @Benchmark
+    public boolean supUpperLowerEQFC() {
+        return supUpper.equalsFoldCase(supUpperLower);
+    }
+
+    @Benchmark
+    public boolean supLowerEQFC() {
+        return supUpper.equalsFoldCase(supLower);
+    }
+ }

From 5a60e22bc415b3335cbb6a63873b1b44ff2bf9d0 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Tue, 2 Dec 2025 20:09:09 +0000
Subject: [PATCH 443/512] 8369618: Remove outdated reference to JDK 1.1 in the
 spec of BufferedImage.TYPE_INT_ARGB

Reviewed-by: azvegint, kizune, prr
---
 .../share/classes/java/awt/image/BufferedImage.java        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/image/BufferedImage.java b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
index 09c96a6560f..52bf8a8c4bf 100644
--- a/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
+++ b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,10 +100,7 @@ public class BufferedImage extends java.awt.Image
      * Represents an image with 8-bit RGBA color components packed into
      * integer pixels.  The image has a {@code DirectColorModel}
      * with alpha. The color data in this image is considered not to be
-     * premultiplied with alpha.  When this type is used as the
-     * {@code imageType} argument to a {@code BufferedImage}
-     * constructor, the created image is consistent with images
-     * created in the JDK1.1 and earlier releases.
+     * premultiplied with alpha.
      */
     public static final int TYPE_INT_ARGB = 2;
 

From 0bead70651ea3bf8dccf9942ef8d1bf3fb78c2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 2 Dec 2025 20:49:28 +0000
Subject: [PATCH 444/512] 8372961: [BACKOUT] Remove the default value of
 InitialRAMPercentage

Reviewed-by: stefank
---
 src/hotspot/share/gc/shared/gc_globals.hpp  | 2 +-
 src/hotspot/share/runtime/flags/jvmFlag.cpp | 2 +-
 src/java.base/share/man/java.md             | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index d08e95378f7..e86a8744847 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -291,7 +291,7 @@
           "size on systems with small physical memory size")                \
           range(0.0, 100.0)                                                 \
                                                                             \
-  product(double, InitialRAMPercentage, 0.0,                                \
+  product(double, InitialRAMPercentage, 0.2,                                \
           "Percentage of real memory used for initial heap size")           \
           range(0.0, 100.0)                                                 \
                                                                             \
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 51517fa49db..487528c49bd 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -162,7 +162,7 @@ void JVMFlag::print_on(outputStream* st, bool withComments, bool printRanges) co
     //      uintx ThresholdTolerance                       = 10                                        {product} {default}
     //     size_t TLABSize                                 = 0                                         {product} {default}
     //      uintx SurvivorRatio                            = 8                                         {product} {default}
-    //     double InitialRAMPercentage                     = 0.000000                                  {product} {default}
+    //     double InitialRAMPercentage                     = 1.562500                                  {product} {default}
     //      ccstr CompileCommandFile                       = MyFile.cmd                                {product} {command line}
     //  ccstrlist CompileOnly                              = Method1
     //            CompileOnly                             += Method2                                   {product} {command line}
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 8517e161e3f..462baa5a4a0 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -2455,7 +2455,8 @@ Java HotSpot VM.
 `-XX:InitialRAMPercentage=`*percent*
 :   Sets the initial amount of memory that the JVM will use for the Java heap
     before applying ergonomics heuristics as a percentage of the maximum amount
-    determined as described in the `-XX:MaxRAM` option.
+    determined as described in the `-XX:MaxRAM` option. The default value is
+    0.2 percent.
 
     The following example shows how to set the percentage of the initial
     amount of memory used for the Java heap:

From a2ad5ca93ef82797ecf3141d00216ef639a9e92d Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Tue, 2 Dec 2025 20:51:52 +0000
Subject: [PATCH 445/512] 8372939: Update JDK 26 spec URLs

Reviewed-by: liach
---
 .../share/classes/java/lang/reflect/ClassFileFormatVersion.java | 2 +-
 .../share/classes/javax/lang/model/SourceVersion.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java b/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
index 16fe000091c..a4009915922 100644
--- a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
+++ b/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
@@ -379,7 +379,7 @@ public enum ClassFileFormatVersion {
      * @since 26
      *
      * @see <a
-     * href="https://docs.oracle.com/javase/specs/jvms/se26/html/index.html">
+     * href="https://docs.oracle.com/en/java/javase/26/docs/specs/jvms/index.html">
      * <cite>The Java Virtual Machine Specification, Java SE 26 Edition</cite></a>
      */
     RELEASE_26(70),
diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index 6b4ae119504..1a46df64ffb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -476,7 +476,7 @@ public enum SourceVersion {
      * @since 26
      *
      * @see <a
-     * href="https://docs.oracle.com/javase/specs/jls/se26/html/index.html">
+     * href="https://docs.oracle.com/en/java/javase/26/docs/specs/jls/index.html">
      * <cite>The Java Language Specification, Java SE 26 Edition</cite></a>
      */
     RELEASE_26,

From 0fe1ffdc485e742eb3937f9fb26d14d6a11a76c4 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Tue, 2 Dec 2025 20:52:23 +0000
Subject: [PATCH 446/512] 8372940: Update symbol data script references

Reviewed-by: liach, darcy
---
 bin/generate-symbol-data.sh                | 2 +-
 doc/starting-next-release.md               | 2 +-
 src/jdk.compiler/share/data/symbols/README | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/generate-symbol-data.sh b/bin/generate-symbol-data.sh
index 283757a6918..14d8763ad81 100644
--- a/bin/generate-symbol-data.sh
+++ b/bin/generate-symbol-data.sh
@@ -38,7 +38,7 @@
 #   directory.
 # - open a terminal program and run these commands:
 #     cd "${JDK_CHECKOUT}"/src/jdk.compiler/share/data/symbols
-#     bash ../../../../../make/scripts/generate-symbol-data.sh "${JDK_N_INSTALL}"
+#     bash ../../../../../bin/generate-symbol-data.sh "${JDK_N_INSTALL}"
 # - this command will generate or update data for "--release N" into the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols
 #   directory, updating all registration necessary. If the goal was to update the data, and there are no
 #   new or changed files in the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols directory after running this script,
diff --git a/doc/starting-next-release.md b/doc/starting-next-release.md
index 10bc364a3e4..5bb9c5839a4 100644
--- a/doc/starting-next-release.md
+++ b/doc/starting-next-release.md
@@ -65,4 +65,4 @@ to be updated for a particular release.
 * `test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java`
    update annotation processor extended by `javac` tests to cover the new source version
 * `test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out` and `test/langtools/tools/javac/preview/classReaderTest/Client.preview.out`: update expected messages for preview errors and warnings
-
+* `test/langtools/tools/javac/versions/Versions.java`: add new source version to the set of valid sources and add new enum constant for the new class file version.
diff --git a/src/jdk.compiler/share/data/symbols/README b/src/jdk.compiler/share/data/symbols/README
index 4c9f38f77b0..50f68bbe2f2 100644
--- a/src/jdk.compiler/share/data/symbols/README
+++ b/src/jdk.compiler/share/data/symbols/README
@@ -1,3 +1,3 @@
 This directory contains history data for -release.
 
-Please see $JDK_TOP_DIR/make/scripts/generate-symbol-data.sh for main usage.
+Please see $JDK_TOP_DIR/bin/generate-symbol-data.sh for main usage.

From 8a28a76451b2bbde49c1c051cb66c784f9e3cdd2 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Tue, 2 Dec 2025 20:52:39 +0000
Subject: [PATCH 447/512] 8372937: Abbreviate list of supported releases

Reviewed-by: liach
---
 .../com/sun/tools/javac/main/Option.java      | 63 ++++++++++++++-----
 .../tools/javac/resources/javac.properties    |  6 +-
 .../options/HelpOutputColumnWidthTest.java    |  2 +-
 3 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index c14767a7a8c..664ebc4c9c6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -33,6 +33,8 @@ import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.Collator;
+import java.util.Collection;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -45,7 +47,6 @@ import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -323,12 +324,13 @@ public enum Option {
 
         @Override
         protected void help(Log log) {
-            StringJoiner sj = new StringJoiner(", ");
+            List<String> releases = new ArrayList<>();
             for(Source source :  Source.values()) {
                 if (source.isSupported())
-                    sj.add(source.name);
+                    releases.add(source.name);
             }
-            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, sj.toString()));
+            String formatted = formatAbbreviatedList(releases);
+            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, formatted));
         }
     },
 
@@ -344,12 +346,13 @@ public enum Option {
 
         @Override
         protected void help(Log log) {
-            StringJoiner sj = new StringJoiner(", ");
+            List<String> releases = new ArrayList<>();
             for(Target target :  Target.values()) {
                 if (target.isSupported())
-                    sj.add(target.name);
+                    releases.add(target.name);
             }
-            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, sj.toString()));
+            String formatted = formatAbbreviatedList(releases);
+            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, formatted));
         }
     },
 
@@ -364,15 +367,8 @@ public enum Option {
                                                                                            false))
                                                  .collect(Collectors.toCollection(LinkedHashSet :: new));
 
-            StringBuilder targets = new StringBuilder();
-            String delim = "";
-            for (String platform : platforms) {
-                targets.append(delim);
-                targets.append(platform);
-                delim = ", ";
-            }
-
-            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, targets.toString()));
+            String formatted = formatAbbreviatedList(platforms);
+            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, formatted));
         }
     },
 
@@ -1369,6 +1365,41 @@ public enum Option {
         log.printRawLines(WriterKind.STDOUT, LARGE_INDENT + descr.replace("\n", "\n" + LARGE_INDENT));
     }
 
+    /**
+     * Formats a collection of values as an abbreviated, comma separated list
+     * for use in javac help output.
+     *
+     * This helper assumes that the supported values form a dense sequence
+     * between the fourth and the (n - 3)rd entries.
+     * That matches the current policy for these values but is not
+     * guaranteed, and should be reconsidered if the structure of the values changes.
+     *
+     * @param values the values to format
+     * @return a comma separated representation of the values
+     */
+    private static String formatAbbreviatedList(Collection<String> values) {
+        List<String> list = (values instanceof List)
+                ? (List<String>) values
+                : new ArrayList<>(values);
+
+        int size = list.size();
+        if (size == 0) {
+            return "";
+        }
+        if (size <= 6) {
+            return String.join(", ", list);
+        }
+        StringJoiner sj = new StringJoiner(", ");
+        for (int i = 0; i < 3; i++) {
+            sj.add(list.get(i));
+        }
+        sj.add("...");
+        for (int i = size - 3; i < size; i++) {
+            sj.add(list.get(i));
+        }
+        return sj.toString();
+    }
+
     /**
      * Composes the initial synopsis of one of the forms for this option.
      * @param name the name of this form of the option
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index d5ee9469d22..7824772b1f3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -100,7 +100,8 @@ javac.opt.arg.Werror=\
     <key>(,<key>)*
 javac.opt.Werror.custom=\
     Specify lint categories for which warnings should terminate compilation,\n\
-    separated by comma. Precede a key by ''-'' to exclude the specified category.\n\
+    separated by comma.\n\
+    Precede a key by ''-'' to exclude the specified category.\n\
     Use --help-lint to see the supported keys.
 javac.opt.A=\
     Options to pass to annotation processors
@@ -358,7 +359,8 @@ javac.opt.prefer=\
     are found for an implicitly compiled class
 # L10N: do not localize: ''preview''
 javac.opt.preview=\
-    Enable preview language features. Also disables the ''preview'' lint category.\n\
+    Enable preview language features.\n\
+    Also disables the ''preview'' lint category.\n\
     To be used in conjunction with either -source or --release.
 javac.opt.AT=\
     Read options and filenames from file
diff --git a/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java b/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
index 4cef7e1916b..f46ef0219b5 100644
--- a/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
+++ b/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
@@ -47,7 +47,7 @@ import toolbox.Task;
 
 public class HelpOutputColumnWidthTest extends TestRunner {
 
-    public static final int MAX_COLUMNS = 84;
+    public static final int MAX_COLUMNS = 80;
 
     protected ToolBox tb;
 

From 37cd8d6ca0bc4638d81e9a3c1e0bc785861ffbef Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Tue, 2 Dec 2025 20:59:49 +0000
Subject: [PATCH 448/512] 8371501: Change IAE to NPE in java.awt.image.Kernel
 when data is null

Reviewed-by: prr, azvegint, aivanov
---
 .../share/classes/java/awt/image/Kernel.java  |  7 ++-
 .../ConvolveOp/KernelInitialisationTest.java  | 51 ++++++++++++-------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/image/Kernel.java b/src/java.desktop/share/classes/java/awt/image/Kernel.java
index d2b9760aba5..67f62e79b9e 100644
--- a/src/java.desktop/share/classes/java/awt/image/Kernel.java
+++ b/src/java.desktop/share/classes/java/awt/image/Kernel.java
@@ -25,6 +25,7 @@
 
 package java.awt.image;
 
+import java.util.Objects;
 
 /**
  * The {@code Kernel} class defines a matrix that describes how a
@@ -59,7 +60,7 @@ public class Kernel implements Cloneable {
      * @param width         width of the kernel
      * @param height        height of the kernel
      * @param data          kernel data in row major order
-     * @throws IllegalArgumentException if {@code data} is null
+     * @throws NullPointerException if {@code data} is null
      * @throws IllegalArgumentException if {@code width} or {@code height}
      *         is not positive
      * @throws IllegalArgumentException if product of {@code width} and
@@ -69,9 +70,7 @@ public class Kernel implements Cloneable {
      *         {@code height}
      */
     public Kernel(int width, int height, float[] data) {
-        if (data == null) {
-            throw new IllegalArgumentException("Data must not be null");
-        }
+        Objects.requireNonNull(data, "Data must not be null");
         if ((width <= 0) || (height <= 0)) {
             throw new IllegalArgumentException("Invalid width or height");
         }
diff --git a/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java b/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java
index 607f0a7a8dc..0d58472385c 100644
--- a/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java
+++ b/test/jdk/java/awt/image/ConvolveOp/KernelInitialisationTest.java
@@ -25,36 +25,49 @@
  * @test
  * @bug     8368729
  * @summary Tests that passing invalid values to Kernel constructor
- *          throws only IllegalArgumentException
+ *          throws only IllegalArgumentException or NullPointerException
  */
 
 import java.awt.image.Kernel;
 
 public class KernelInitialisationTest {
-    private static void expectIllegalArgumentException(Runnable code) {
+
+    private static void test(int width, int height, float[] data,
+                             Class<?> expected)
+    {
+        System.out.printf("Testing for width: %d, height: %d, data: %s%n",
+                          width, height, data == null ? "null" : "not null");
+        Class<?> actual = null;
         try {
-            code.run();
-            throw new RuntimeException("Expected IllegalArgumentException" +
-                " but no exception was thrown");
-        } catch (IllegalArgumentException e) {
-            // we expect IllegalArgumentException
+            new Kernel(width, height, data);
+        } catch (Exception e) {
+            actual = e.getClass();
+        }
+        if (actual != expected) {
+            System.err.println("Expected: " + expected);
+            System.err.println("Actual: " + actual);
+            throw new RuntimeException("Test failed");
         }
     }
 
-    private static void testKernel(int width, int height, float[] data) {
-        System.out.println("Testing for width: " + width + ", height: "
-            + height + ", data: " + (data == null ? "null" : "not null"));
-        expectIllegalArgumentException(() -> new Kernel(width, height, data));
+    private static void testIAE(int width, int height, int len) {
+        test(width, height, new float[len], IllegalArgumentException.class);
+    }
+
+    private static void testNPE(int width, int height) {
+        test(width, height, null, NullPointerException.class);
     }
 
     public static void main(String[] args) {
-        testKernel(-1, 1, new float[100]);
-        testKernel(1, -1, new float[100]);
-        testKernel(-1, -1, new float[100]);
-        testKernel(1, 1, null);
-
-        int width = 50;
-        int height = Integer.MAX_VALUE;
-        testKernel(width, height, new float[100]);
+        int[][] sizes = {{-1, 1}, {1, -1}, {-1, -1}, {50, Integer.MAX_VALUE}};
+        int[] lens = {1, 100};
+        for (int[] kernelSize : sizes) {
+            for (int len : lens) {
+                testIAE(kernelSize[0], kernelSize[1], len);
+            }
+            testNPE(kernelSize[0], kernelSize[1]);
+        }
+        testNPE(10, 10);     // NPE on valid width and height
+        testIAE(10, 10, 10); // IAE on valid width and height but small data
     }
 }

From 8f0cb57e439df87dee4c0ba7bbff0b981ebc3541 Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Tue, 2 Dec 2025 22:11:38 +0000
Subject: [PATCH 449/512] 8347831: Re-examine version check when cross linking

Co-authored-by: Magnus Ihse Bursie <ihse@openjdk.org>
Reviewed-by: erikj, alanb
---
 make/modules/java.base/Gensrc.gmk             | 22 ++++++
 make/modules/java.base/Java.gmk               |  2 +-
 .../misc/resources/release.txt.template       |  1 +
 .../jdk/tools/jlink/internal/JlinkTask.java   | 69 +++++++++++++------
 .../tools/jlink/resources/jlink.properties    |  4 +-
 5 files changed, 75 insertions(+), 23 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/misc/resources/release.txt.template

diff --git a/make/modules/java.base/Gensrc.gmk b/make/modules/java.base/Gensrc.gmk
index 79db438934e..e8236f0b0e4 100644
--- a/make/modules/java.base/Gensrc.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@@ -120,3 +120,25 @@ $(INTPOLY_GEN_DONE): $(INTPLOY_HEADER) $(BUILD_TOOLS_JDK)
 TARGETS += $(INTPOLY_GEN_DONE)
 
 ################################################################################
+
+RELEASE_FILE_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/jdk/internal/misc/resources/release.txt.template
+RELEASE_FILE_TARGET := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/internal/misc/resources/release.txt
+
+RELEASE_FILE_VARDEPS := $(COMPANY_NAME) $(VERSION_STRING) $(VERSION_DATE)
+RELEASE_FILE_VARDEPS_FILE := $(call DependOnVariable, RELEASE_FILE_VARDEPS, \
+    $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jlink_release_txt.vardeps)
+
+$(eval $(call SetupTextFileProcessing, BUILD_RELEASE_FILE, \
+    SOURCE_FILES := $(RELEASE_FILE_TEMPLATE), \
+    OUTPUT_FILE := $(RELEASE_FILE_TARGET), \
+    REPLACEMENTS := \
+        @@COMPANY_NAME@@ => $(COMPANY_NAME) ; \
+        @@VERSION_STRING@@ => $(VERSION_STRING) ; \
+        @@VERSION_DATE@@ => $(VERSION_DATE) , \
+))
+
+$(BUILD_RELEASE_FILE): $(RELEASE_FILE_VARDEPS_FILE)
+
+TARGETS += $(BUILD_RELEASE_FILE)
+
+################################################################################
diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk
index fc091377456..e20db38297d 100644
--- a/make/modules/java.base/Java.gmk
+++ b/make/modules/java.base/Java.gmk
@@ -34,7 +34,7 @@
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 JAVAC_FLAGS += -XDstringConcat=inline
-COPY += .icu .dat .spp .nrm content-types.properties \
+COPY += .icu .dat .spp .nrm .txt content-types.properties \
     hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
 CLEAN += intrinsic.properties
 
diff --git a/src/java.base/share/classes/jdk/internal/misc/resources/release.txt.template b/src/java.base/share/classes/jdk/internal/misc/resources/release.txt.template
new file mode 100644
index 00000000000..2d46f8f0e60
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/misc/resources/release.txt.template
@@ -0,0 +1 @@
+@@COMPANY_NAME@@-@@VERSION_STRING@@-@@VERSION_DATE@@
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
index 928b9a47934..03b9611c179 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -27,9 +27,11 @@ package jdk.tools.jlink.internal;
 import static jdk.tools.jlink.internal.TaskHelper.JLINK_BUNDLE;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.lang.module.Configuration;
@@ -56,6 +58,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -238,6 +241,27 @@ public class JlinkTask {
     }
 
     public static final String OPTIONS_RESOURCE = "jdk/tools/jlink/internal/options";
+    // Release information stored in the java.base module
+    private static final String JDK_RELEASE_RESOURCE = "jdk/internal/misc/resources/release.txt";
+
+    /**
+     * Read the release.txt from the module.
+     */
+    private static Optional<String> getReleaseInfo(ModuleReference mref) {
+        try {
+            Optional<InputStream> release = mref.open().open(JDK_RELEASE_RESOURCE);
+
+            if (release.isEmpty()) {
+                return Optional.empty();
+            }
+
+            try (var r = new BufferedReader(new InputStreamReader(release.get()))) {
+                return Optional.of(r.readLine());
+            }
+        } catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
+    }
 
     int run(String[] args) {
         if (log == null) {
@@ -410,7 +434,8 @@ public class JlinkTask {
 
         // Sanity check version if we use JMODs
         if (!isLinkFromRuntime) {
-            checkJavaBaseVersion(finder);
+            assert(finder.find("java.base").isPresent());
+            checkJavaBaseVersion(finder.find("java.base").get());
         }
 
         // Determine the roots set
@@ -561,32 +586,34 @@ public class JlinkTask {
         return finder;
     }
 
+    private static String getCurrentRuntimeVersion() {
+        ModuleReference current = ModuleLayer.boot()
+                .configuration()
+                .findModule("java.base")
+                .get()
+                .reference();
+        // This jlink runtime should always have the release.txt
+        return getReleaseInfo(current).get();
+    }
+
     /*
-     * Checks the version of the module descriptor of java.base for compatibility
-     * with the current runtime version.
+     * Checks the release information of the java.base used for target image
+     * for compatibility with the java.base used by jlink.
      *
-     * @throws IllegalArgumentException the descriptor of java.base has no
-     * version or the java.base version is not the same as the current runtime's
-     * version.
+     * @throws IllegalArgumentException  If  the `java.base` module reference `target`
+     * is not compatible with this jlink.
      */
-    private static void checkJavaBaseVersion(ModuleFinder finder) {
-        assert finder.find("java.base").isPresent();
+    private static void checkJavaBaseVersion(ModuleReference target) {
+        String currentRelease = getCurrentRuntimeVersion();
 
-        // use the version of java.base module, if present, as
-        // the release version for multi-release JAR files
-        ModuleDescriptor.Version v = finder.find("java.base").get()
-                .descriptor().version().orElseThrow(() ->
-                new IllegalArgumentException("No version in java.base descriptor")
-                        );
+        String targetRelease = getReleaseInfo(target).orElseThrow(() -> new IllegalArgumentException(
+                taskHelper.getMessage("err.jlink.version.missing", currentRelease)));
 
-        Runtime.Version version = Runtime.Version.parse(v.toString());
-        if (Runtime.version().feature() != version.feature() ||
-                Runtime.version().interim() != version.interim()) {
-            // jlink version and java.base version do not match.
-            // We do not (yet) support this mode.
+        if (!currentRelease.equals(targetRelease)) {
+            // Current runtime image and the target runtime image are not compatible build
             throw new IllegalArgumentException(taskHelper.getMessage("err.jlink.version.mismatch",
-                    Runtime.version().feature(), Runtime.version().interim(),
-                    version.feature(), version.interim()));
+                    currentRelease,
+                    targetRelease));
         }
     }
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
index 080d51506a6..374ed78f608 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
@@ -130,7 +130,9 @@ err.runtime.link.patched.module=jlink does not support linking from the run-time
 err.no.module.path=--module-path option must be specified with --add-modules ALL-MODULE-PATH
 err.empty.module.path=No module found in module path ''{0}'' with --add-modules ALL-MODULE-PATH
 err.limit.modules=--limit-modules not allowed with --add-modules ALL-MODULE-PATH
-err.jlink.version.mismatch=jlink version {0}.{1} does not match target java.base version {2}.{3}
+err.jlink.version.mismatch=jlink build ''{0}'' does not match target java.base build ''{1}''
+err.jlink.version.missing=jlink build ''{0}'' cannot find the build signature\
+\ in the java.base specified on module path, likely from an earlier build.
 err.automatic.module:automatic module cannot be used with jlink: {0} from {1}
 err.unknown.byte.order:unknown byte order {0}
 err.launcher.main.class.empty:launcher main class name cannot be empty: {0}

From b0a758f2180a8305c05e9640192818bbb31d7922 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 2 Dec 2025 22:27:54 +0000
Subject: [PATCH 450/512] 8372552: unhandled oop in the
 JvmtiEventController::set_user_enabled

Reviewed-by: cjplummer, amenkov, sspitsyn
---
 src/hotspot/share/prims/jvmtiEventController.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp
index 169ccbe035f..9df3bbb4b3e 100644
--- a/src/hotspot/share/prims/jvmtiEventController.cpp
+++ b/src/hotspot/share/prims/jvmtiEventController.cpp
@@ -1077,10 +1077,6 @@ JvmtiEventController::is_global_event(jvmtiEvent event_type) {
 void
 JvmtiEventController::set_user_enabled(JvmtiEnvBase *env, JavaThread *thread, oop thread_oop,
                                        jvmtiEvent event_type, bool enabled) {
-  if (event_type == JVMTI_EVENT_OBJECT_FREE) {
-    JvmtiEventControllerPrivate::flush_object_free_events(env);
-  }
-
   if (Threads::number_of_threads() == 0) {
     // during early VM start-up locks don't exist, but we are safely single threaded,
     // call the functionality without holding the JvmtiThreadState_lock.
@@ -1089,6 +1085,11 @@ JvmtiEventController::set_user_enabled(JvmtiEnvBase *env, JavaThread *thread, oo
     Thread* current = Thread::current();
     HandleMark hmi(current);
     Handle thread_oop_h = Handle(current, thread_oop);
+
+    if (event_type == JVMTI_EVENT_OBJECT_FREE) {
+      JvmtiEventControllerPrivate::flush_object_free_events(env);
+    }
+
     MutexLocker mu(JvmtiThreadState_lock);
     JvmtiEventControllerPrivate::set_user_enabled(env, thread, thread_oop_h, event_type, enabled);
   }
@@ -1238,4 +1239,4 @@ JvmtiEventController::vm_death() {
       break;
     }
   }
-}
\ No newline at end of file
+}

From f5e4cd7f0d12fd21399b192b32a5c9abfe8a3564 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 2 Dec 2025 23:48:58 +0000
Subject: [PATCH 451/512] 8372039: post_sampled_object_alloc is called while
 lock is handled

Reviewed-by: sspitsyn, eosterlund, amenkov
---
 .../share/cds/aotStreamedHeapLoader.cpp       |  1 +
 src/hotspot/share/cds/aotThread.cpp           |  2 +-
 src/hotspot/share/prims/jvmtiExport.cpp       | 26 ++---
 src/hotspot/share/prims/jvmtiExport.hpp       | 25 +----
 src/hotspot/share/runtime/javaThread.cpp      |  1 +
 src/hotspot/share/runtime/javaThread.hpp      | 12 ++-
 .../SamplingDuringInit.java                   | 46 +++++++++
 .../libSamplingDuringInit.cpp                 | 95 +++++++++++++++++++
 8 files changed, 164 insertions(+), 44 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/SamplingDuringInit.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/libSamplingDuringInit.cpp

diff --git a/src/hotspot/share/cds/aotStreamedHeapLoader.cpp b/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
index 9b6974bb48d..6719f9bf898 100644
--- a/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
+++ b/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
@@ -184,6 +184,7 @@ static size_t archive_object_size(oopDesc* archive_object) {
 oop AOTStreamedHeapLoader::allocate_object(oopDesc* archive_object, markWord mark, size_t size, TRAPS) {
   assert(!archive_object->is_stackChunk(), "no such objects are archived");
 
+  NoJvmtiEventsMark njem;
   oop heap_object;
 
   Klass* klass = archive_object->klass();
diff --git a/src/hotspot/share/cds/aotThread.cpp b/src/hotspot/share/cds/aotThread.cpp
index 26a6f4291cd..113a751d2a1 100644
--- a/src/hotspot/share/cds/aotThread.cpp
+++ b/src/hotspot/share/cds/aotThread.cpp
@@ -63,7 +63,7 @@ void AOTThread::initialize() {
   // This is important because this thread runs before JVMTI monitors are set up appropriately.
   // Therefore, callbacks would not work as intended. JVMTI has no business peeking at how we
   // materialize primordial objects from the AOT cache.
-  thread->toggle_is_disable_suspend();
+  thread->disable_jvmti_events();
 #endif
 
   JavaThread::vm_exit_on_osthread_failure(thread);
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 69d1fa2c974..14b7d886bce 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -3159,31 +3159,19 @@ void JvmtiObjectAllocEventCollector::record_allocation(oop obj) {
   _allocated->push(OopHandle(JvmtiExport::jvmti_oop_storage(), obj));
 }
 
-// Disable collection of VMObjectAlloc events
-NoJvmtiVMObjectAllocMark::NoJvmtiVMObjectAllocMark() : _collector(nullptr) {
-  // a no-op if VMObjectAlloc event is not enabled
-  if (!JvmtiExport::should_post_vm_object_alloc()) {
-    return;
-  }
+NoJvmtiEventsMark::NoJvmtiEventsMark() {
   Thread* thread = Thread::current_or_null();
   if (thread != nullptr && thread->is_Java_thread())  {
     JavaThread* current_thread = JavaThread::cast(thread);
-    JvmtiThreadState *state = current_thread->jvmti_thread_state();
-    if (state != nullptr) {
-      JvmtiVMObjectAllocEventCollector *collector;
-      collector = state->get_vm_object_alloc_event_collector();
-      if (collector != nullptr && collector->is_enabled()) {
-        _collector = collector;
-        _collector->set_enabled(false);
-      }
-    }
+    current_thread->disable_jvmti_events();
   }
 }
 
-// Re-Enable collection of VMObjectAlloc events (if previously enabled)
-NoJvmtiVMObjectAllocMark::~NoJvmtiVMObjectAllocMark() {
-  if (was_enabled()) {
-    _collector->set_enabled(true);
+NoJvmtiEventsMark::~NoJvmtiEventsMark() {
+  Thread* thread = Thread::current_or_null();
+  if (thread != nullptr && thread->is_Java_thread())  {
+    JavaThread* current_thread = JavaThread::cast(thread);
+    current_thread->enable_jvmti_events();
   }
 };
 
diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
index 66f5413c8f6..f6c9f3a74d5 100644
--- a/src/hotspot/share/prims/jvmtiExport.hpp
+++ b/src/hotspot/share/prims/jvmtiExport.hpp
@@ -585,29 +585,12 @@ class JvmtiSampledObjectAllocEventCollector : public JvmtiObjectAllocEventCollec
   static bool object_alloc_is_safe_to_sample() NOT_JVMTI_RETURN_(false);
 };
 
-// Marker class to disable the posting of VMObjectAlloc events
-// within its scope.
-//
-// Usage :-
-//
-// {
-//   NoJvmtiVMObjectAllocMark njm;
-//   :
-//   // VMObjAlloc event will not be posted
-//   JvmtiExport::vm_object_alloc_event_collector(obj);
-//   :
-// }
-
-class NoJvmtiVMObjectAllocMark : public StackObj {
- private:
-  // enclosing collector if enabled, null otherwise
-  JvmtiVMObjectAllocEventCollector *_collector;
-
-  bool was_enabled()    { return _collector != nullptr; }
+// Marker class to temporary disable posting of jvmti events.
+class NoJvmtiEventsMark : public StackObj {
 
  public:
-  NoJvmtiVMObjectAllocMark() NOT_JVMTI_RETURN;
-  ~NoJvmtiVMObjectAllocMark() NOT_JVMTI_RETURN;
+  NoJvmtiEventsMark() NOT_JVMTI_RETURN;
+  ~NoJvmtiEventsMark() NOT_JVMTI_RETURN;
 };
 
 
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 28bc47c4c74..a81a687a9c0 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -451,6 +451,7 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _is_in_VTMS_transition(false),
   _is_disable_suspend(false),
   _is_in_java_upcall(false),
+  _jvmti_events_disabled(0),
   _VTMS_transition_mark(false),
   _on_monitor_waited_event(false),
   _contended_entered_monitor(nullptr),
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index b0cd6fb3e4f..ba2aa42132f 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -325,6 +325,7 @@ class JavaThread: public Thread {
   bool                  _is_in_VTMS_transition;          // thread is in virtual thread mount state transition
   bool                  _is_disable_suspend;             // JVMTI suspend is temporarily disabled; used on current thread only
   bool                  _is_in_java_upcall;              // JVMTI is doing a Java upcall, so JVMTI events must be hidden
+  int                   _jvmti_events_disabled;          // JVMTI events disabled manually
   bool                  _VTMS_transition_mark;           // used for sync between VTMS transitions and disablers
   bool                  _on_monitor_waited_event;        // Avoid callee arg processing for enterSpecial when posting waited event
   ObjectMonitor*        _contended_entered_monitor;      // Monitor for pending monitor_contended_entered callback
@@ -748,10 +749,13 @@ public:
   void set_is_in_VTMS_transition(bool val);
 
   bool is_disable_suspend() const                { return _is_disable_suspend; }
-  void toggle_is_disable_suspend()               { _is_disable_suspend = !_is_disable_suspend; };
+  void toggle_is_disable_suspend()               { _is_disable_suspend = !_is_disable_suspend; }
 
   bool is_in_java_upcall() const                 { return _is_in_java_upcall; }
-  void toggle_is_in_java_upcall()                { _is_in_java_upcall = !_is_in_java_upcall; };
+  void toggle_is_in_java_upcall()                { _is_in_java_upcall = !_is_in_java_upcall; }
+
+  void disable_jvmti_events()                    { _jvmti_events_disabled++; }
+  void enable_jvmti_events()                     { _jvmti_events_disabled--; }
 
   bool VTMS_transition_mark() const              { return AtomicAccess::load(&_VTMS_transition_mark); }
   void set_VTMS_transition_mark(bool val)        { AtomicAccess::store(&_VTMS_transition_mark, val); }
@@ -760,7 +764,9 @@ public:
   // - is in a VTMS transition (_is_in_VTMS_transition)
   // - is in an interruptLock or similar critical section (_is_disable_suspend)
   // - JVMTI is making a Java upcall (_is_in_java_upcall)
-  bool should_hide_jvmti_events() const          { return _is_in_VTMS_transition || _is_disable_suspend || _is_in_java_upcall; }
+  bool should_hide_jvmti_events() const {
+    return _is_in_VTMS_transition || _is_disable_suspend || _is_in_java_upcall || _jvmti_events_disabled != 0;
+  }
 
   bool on_monitor_waited_event()             { return _on_monitor_waited_event; }
   void set_on_monitor_waited_event(bool val) { _on_monitor_waited_event = val; }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/SamplingDuringInit.java b/test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/SamplingDuringInit.java
new file mode 100644
index 00000000000..1dc885180c1
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/SamplingDuringInit.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8372039
+ * @summary The test verifies that object allocation sampling is disabled during AOT.
+ *
+ * Don't remove 'modules' line, it triggers the crash.
+ * @modules java.management
+ *
+ * @run main/othervm/native -agentlib:SamplingDuringInit SamplingDuringInit
+ * @run main/othervm/native -agentlib:SamplingDuringInit -XX:-UseCompressedOops SamplingDuringInit
+ */
+
+public class SamplingDuringInit {
+
+    public static Object[] tmp = new Object[1000];
+    public static void main(String[] args) throws Exception {
+        // Allocate some objects to trigger Sampling even if
+        // all JDK classes are preloaded.
+        for (int i = 0; i < tmp.length; i++) {
+            tmp[i] = new String("tmp" + i);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/libSamplingDuringInit.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/libSamplingDuringInit.cpp
new file mode 100644
index 00000000000..709012dfb57
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SampledObjectAlloc/SamplingDuringInit/libSamplingDuringInit.cpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "jvmti.h"
+#include "jvmti_common.hpp"
+
+#include <atomic>
+
+extern "C" {
+
+// SampledObjectAlloc event might be triggered on any thread
+static std::atomic<int> events_counter(0);
+
+JNIEXPORT void JNICALL
+SampledObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object, jclass object_klass, jlong size) {
+  events_counter++;
+  LOG("Sampled object, events_counter = %d\n", events_counter.load());
+}
+
+void JNICALL
+VMDeath(jvmtiEnv *jvmti, JNIEnv* jni) {
+  if (events_counter == 0) {
+    fatal(jni, "SampledObjectAlloc events counter shouldn't be zero");
+  }
+}
+
+jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+  jvmtiEnv* jvmti = nullptr;
+  jvmtiCapabilities caps;
+  jvmtiEventCallbacks callbacks;
+  jvmtiError err;
+  jint res;
+
+  LOG("AGENT INIT");
+  res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_9);
+  if (res != JNI_OK || jvmti == nullptr) {
+    LOG("Wrong result of a valid call to GetEnv!\n");
+    return JNI_ERR;
+  }
+
+  memset(&caps, 0, sizeof(caps));
+  caps.can_generate_sampled_object_alloc_events = 1;
+  if (jvmti->AddCapabilities(&caps) != JVMTI_ERROR_NONE) {
+    return JNI_ERR;
+  }
+
+  memset(&callbacks, 0, sizeof(callbacks));
+  callbacks.SampledObjectAlloc = &SampledObjectAlloc;
+  callbacks.VMDeath = &VMDeath;
+
+  err = jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks));
+  check_jvmti_error(err, "SetEventCallbacks");
+  /*
+   * Interval should be small enough to triggger sampling event while objects are init by VM.
+   */
+  err = jvmti->SetHeapSamplingInterval(10);
+  check_jvmti_error(err, "SetHeapSamplingInterval");
+
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, nullptr);
+  check_jvmti_error(err, "SetEventNotificationMode");
+
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, nullptr);
+  check_jvmti_error(err, "SetEventNotificationMode");
+
+  return JNI_OK;
+}
+
+JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+  return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *jvm, char *options, void *reserved) {
+  return Agent_Initialize(jvm, options, reserved);
+}
+}

From 1f206e5e1268cd0a7f477ed2d2f49103b8a99db6 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 3 Dec 2025 00:27:42 +0000
Subject: [PATCH 452/512] 8372850: Update comment in SourceVersion for language
 evolution history for changes in 26

Reviewed-by: liach
---
 .../share/classes/javax/lang/model/SourceVersion.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index 1a46df64ffb..e21e9e1db9a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -83,6 +83,10 @@ public enum SourceVersion {
      *      preview, flexible constructor bodies in third preview)
      *  25: module import declarations, compact source files and
      *      instance main methods, and flexible constructor bodies
+     *      (primitive Types in Patterns, instanceof, and switch in
+     *      third preview)
+     *  26: no changes (primitive Types in Patterns, instanceof, and
+     *      switch in in fourth preview)
      */
 
     /**

From 530493fed4066b1efcf3ec22253b110495767eca Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Wed, 3 Dec 2025 02:46:02 +0000
Subject: [PATCH 453/512] 8364146: JList getScrollableUnitIncrement return 0

Reviewed-by: prr, tr
---
 .../share/classes/javax/swing/JList.java      | 13 ++-
 test/jdk/javax/swing/JList/JListTest.java     | 86 +++++++++++++++++++
 2 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/javax/swing/JList/JListTest.java

diff --git a/src/java.desktop/share/classes/javax/swing/JList.java b/src/java.desktop/share/classes/javax/swing/JList.java
index 301813533d7..8d4497d6f9a 100644
--- a/src/java.desktop/share/classes/javax/swing/JList.java
+++ b/src/java.desktop/share/classes/javax/swing/JList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2497,6 +2497,9 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
     /**
      * Returns the distance to scroll to expose the next or previous
      * row (for vertical scrolling) or column (for horizontal scrolling).
+     * The scrolling distance returned will be positive,
+     * unless scrolling for the specified parameters is already
+     * at its furthest extent, in which case it will return zero.
      * <p>
      * For horizontal scrolling, if the layout orientation is {@code VERTICAL},
      * then the list's font size is returned (or {@code 1} if the font is
@@ -2507,8 +2510,9 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
      *                    {@code SwingConstants.VERTICAL}
      * @param direction less or equal to zero to scroll up/back,
      *                  greater than zero for down/forward
-     * @return the "unit" increment for scrolling in the specified direction;
-     *         always positive
+     * @return the non-negative "unit" increment
+     *         for scrolling in the specified direction
+     *
      * @see #getScrollableBlockIncrement
      * @see Scrollable#getScrollableUnitIncrement
      * @throws IllegalArgumentException if {@code visibleRect} is {@code null}, or
@@ -2529,7 +2533,8 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
                 /* Scroll Down */
                 if (direction > 0) {
                     Rectangle r = getCellBounds(row, row);
-                    return (r == null) ? 0 : r.height - (visibleRect.y - r.y);
+                    return (r == null) ? 0 :
+                            ((r.height - (visibleRect.y - r.y)) < 0) ? 0 : r.height - (visibleRect.y - r.y);
                 }
                 /* Scroll Up */
                 else {
diff --git a/test/jdk/javax/swing/JList/JListTest.java b/test/jdk/javax/swing/JList/JListTest.java
new file mode 100644
index 00000000000..fbc9bda69e3
--- /dev/null
+++ b/test/jdk/javax/swing/JList/JListTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8364146
+ * @key headful
+ * @summary Verifies JList getScrollableUnitIncrement return non-negative number
+ * @run main JListTest
+ */
+
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+public class JListTest {
+
+    private static JFrame f;
+
+    public static void main(String[] argv) throws Exception {
+
+        SwingUtilities.invokeAndWait(() -> {
+            try {
+                f = new JFrame();
+                String[] data = {"One", "Two", "Three", "Four", "Five", "Six ",
+                                 "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelv"};
+                JList<String> list = new JList<>(data);
+                list.setLayoutOrientation(JList.HORIZONTAL_WRAP);
+
+                JScrollPane sp = new JScrollPane(list);
+                sp.setPreferredSize(new Dimension(200, 200));
+                f.add(sp);
+                f.pack();
+                f.setVisible(true);
+
+                Rectangle cell = list.getCellBounds(1, data.length);
+                System.out.println(cell);
+                cell.y = list.getHeight() + 10;
+                int unit = list.getScrollableUnitIncrement(
+                                cell,
+                                SwingConstants.VERTICAL,
+                                -1);
+                System.out.println("Scrollable unit increment: " + unit);
+
+                if (unit < 0) {
+                    throw new RuntimeException("JList scrollable unit increment should be greater than 0.");
+                }
+                unit = list.getScrollableUnitIncrement(
+                                cell,
+                                SwingConstants.VERTICAL,
+                                1);
+                System.out.println("Scrollable unit increment: " + unit);
+                if (unit < 0) {
+                    throw new RuntimeException("JList scrollable unit increment should be greater than 0.");
+                }
+            } finally {
+                if (f != null) {
+                    f.dispose();
+                }
+            }
+        });
+    }
+}

From 8f3d0ade11ddb45bb1719b6818e1b51df237a59b Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 3 Dec 2025 08:06:15 +0000
Subject: [PATCH 454/512] 8371893: [macOS] use dead_strip linker option to
 reduce binary size

Reviewed-by: erikj, lucy, serb
---
 make/autoconf/flags-ldflags.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 572790b567b..18ec04d92b7 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -108,6 +108,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup OS-dependent LDFLAGS
   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
+    if test x$DEBUG_LEVEL = xrelease; then
+      BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,-dead_strip"
+    fi
     # FIXME: We should really generalize SetSharedLibraryOrigin instead.
     OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
     OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN -Wl,-reproducible"

From 2139c8c6e6e5c5f2c64ed3ad9ad8bd148a86efae Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 3 Dec 2025 08:08:14 +0000
Subject: [PATCH 455/512] 8372571: ResourceHashTable for some AOT data
 structures miss placement operator when allocating

Reviewed-by: aboldtch, jsjolen, kvn
---
 src/hotspot/share/cds/aotMappedHeapWriter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.cpp b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
index 98f400c989c..edd0aede246 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
@@ -86,9 +86,9 @@ void AOTMappedHeapWriter::init() {
   if (CDSConfig::is_dumping_heap()) {
     Universe::heap()->collect(GCCause::_java_lang_system_gc);
 
-    _buffer_offset_to_source_obj_table = new BufferOffsetToSourceObjectTable(/*size (prime)*/36137, /*max size*/1 * M);
+    _buffer_offset_to_source_obj_table = new (mtClassShared) BufferOffsetToSourceObjectTable(/*size (prime)*/36137, /*max size*/1 * M);
     _dumped_interned_strings = new (mtClass)DumpedInternedStrings(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE);
-    _fillers = new FillersTable();
+    _fillers = new (mtClassShared) FillersTable();
     _requested_bottom = nullptr;
     _requested_top = nullptr;
 

From a1e8694109ad87690e18fc03d17b6b9519092d81 Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Wed, 3 Dec 2025 09:01:40 +0000
Subject: [PATCH 456/512] 8371306: JDK-8367002 behavior might not match
 existing HotSpot behavior.

Reviewed-by: thartmann, dholmes
---
 src/hotspot/share/runtime/sharedRuntime.cpp               | 8 ++++++--
 .../jtreg/compiler/exceptions/IllegalAccessInCatch.jasm   | 1 +
 .../jtreg/compiler/exceptions/TestAccessErrorInCatch.java | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index e277e1fb569..3a7c60cf83e 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -809,6 +809,8 @@ address SharedRuntime::compute_compiled_exc_handler(nmethod* nm, address ret_pc,
   // determine handler bci, if any
   EXCEPTION_MARK;
 
+  Handle orig_exception(THREAD, exception());
+
   int handler_bci = -1;
   int scope_depth = 0;
   if (!force_unwind) {
@@ -830,7 +832,7 @@ address SharedRuntime::compute_compiled_exc_handler(nmethod* nm, address ret_pc,
         // thrown (bugs 4307310 and 4546590). Set "exception" reference
         // argument to ensure that the correct exception is thrown (4870175).
         recursive_exception_occurred = true;
-        exception = Handle(THREAD, PENDING_EXCEPTION);
+        exception.replace(PENDING_EXCEPTION);
         CLEAR_PENDING_EXCEPTION;
         if (handler_bci >= 0) {
           bci = handler_bci;
@@ -859,8 +861,10 @@ address SharedRuntime::compute_compiled_exc_handler(nmethod* nm, address ret_pc,
 
   // If the compiler did not anticipate a recursive exception, resulting in an exception
   // thrown from the catch bci, then the compiled exception handler might be missing.
-  // This is rare.  Just deoptimize and let the interpreter handle it.
+  // This is rare.  Just deoptimize and let the interpreter rethrow the original
+  // exception at the original bci.
   if (t == nullptr && recursive_exception_occurred) {
+    exception.replace(orig_exception()); // restore original exception
     bool make_not_entrant = false;
     return Deoptimization::deoptimize_for_missing_exception_handler(nm, make_not_entrant);
   }
diff --git a/test/hotspot/jtreg/compiler/exceptions/IllegalAccessInCatch.jasm b/test/hotspot/jtreg/compiler/exceptions/IllegalAccessInCatch.jasm
index beeffa69a97..78be0bbb177 100644
--- a/test/hotspot/jtreg/compiler/exceptions/IllegalAccessInCatch.jasm
+++ b/test/hotspot/jtreg/compiler/exceptions/IllegalAccessInCatch.jasm
@@ -46,6 +46,7 @@ super class IllegalAccessInCatch
     idiv;
     endtry t0;
     ireturn;
+    catch t0 java/lang/IllegalAccessError;
     catch t0 jdk/internal/agent/AgentConfigurationError; // loadable but not accessible from unnamed module
     stack_frame_type full;
     stack_map class java/lang/Throwable;
diff --git a/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java b/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java
index 44cfd60cf38..fa81fa93f11 100644
--- a/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java
+++ b/test/hotspot/jtreg/compiler/exceptions/TestAccessErrorInCatch.java
@@ -64,6 +64,11 @@ public class TestAccessErrorInCatch {
     }
 
     private static int invoke(MethodHandle mh) throws Throwable {
-        return (int) mh.invokeExact();
+        int expected = 1;
+        int ret = (int) mh.invokeExact();
+        if (ret != expected) {
+            throw new RuntimeException("Returned " + ret + " but expected " + expected);
+        }
+        return ret;
     }
 }

From b3e063c2c34ac12ae2a566617560ecc52253262d Mon Sep 17 00:00:00 2001
From: root <root@a3560046.lnxne.boe>
Date: Wed, 3 Dec 2025 09:04:11 +0000
Subject: [PATCH 457/512] 8372710: Update ProcessBuilder/Basic regex

Reviewed-by: shade, amitkumar
---
 test/jdk/java/lang/ProcessBuilder/Basic.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/lang/ProcessBuilder/Basic.java b/test/jdk/java/lang/ProcessBuilder/Basic.java
index 4377752650d..7034174f85c 100644
--- a/test/jdk/java/lang/ProcessBuilder/Basic.java
+++ b/test/jdk/java/lang/ProcessBuilder/Basic.java
@@ -85,8 +85,8 @@ public class Basic {
     static final String libpath = System.getenv("LIBPATH");
 
     /* Used for regex String matching for long error messages */
-    static final String PERMISSION_DENIED_ERROR_MSG = "(Permission denied|error=13)";
-    static final String NO_SUCH_FILE_ERROR_MSG = "(No such file|error=2)";
+    static final String PERMISSION_DENIED_ERROR_MSG = "(Permission denied|error:13)";
+    static final String NO_SUCH_FILE_ERROR_MSG = "(No such file|error:2)";
     static final String SPAWNHELPER_FAILURE_MSG = "(Possible reasons:)";
 
     /**

From e65fd45dc7c9383a77fbd5171b541c2a003d30d2 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 3 Dec 2025 09:17:08 +0000
Subject: [PATCH 458/512] 8366101: Replace the use of ThreadTracker with
 ScopedValue in java.util.jar.JarFile

Reviewed-by: vyazici, alanb
---
 .../share/classes/java/util/jar/JarFile.java  | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
index dc2d65bcc99..d1a8f1310a9 100644
--- a/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -27,7 +27,6 @@ package java.util.jar;
 
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.access.JavaUtilZipFileAccess;
-import jdk.internal.misc.ThreadTracker;
 import sun.security.util.ManifestEntryVerifier;
 import sun.security.util.SignatureFileVerifier;
 
@@ -213,6 +212,9 @@ public class JarFile extends ZipFile {
      */
     static final String INDEX_NAME = "META-INF/INDEX.LIST";
 
+    // this will be set when the thread is initializing a JAR verifier
+    private static final ScopedValue<Boolean> IN_VERIFIER_INIT = ScopedValue.newInstance();
+
     /**
      * Returns the version that represents the unversioned configuration of a
      * multi-release jar file.
@@ -1025,36 +1027,30 @@ public class JarFile extends ZipFile {
         }
     }
 
-    private static class ThreadTrackHolder {
-        static final ThreadTracker TRACKER = new ThreadTracker();
-    }
-
-    private static Object beginInit() {
-        return ThreadTrackHolder.TRACKER.begin();
-    }
-
-    private static void endInit(Object key) {
-        ThreadTrackHolder.TRACKER.end(key);
-    }
-
     synchronized void ensureInitialization() {
         try {
             maybeInstantiateVerifier();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        if (jv != null && !jvInitialized) {
-            Object key = beginInit();
-            try {
+        if (jv == null || jvInitialized) {
+            return;
+        }
+        // mark the current thread as initializing
+        // the JAR verifier
+        ScopedValue.where(IN_VERIFIER_INIT, true).run(new Runnable() {
+            @Override
+            public void run() {
                 initializeVerifier();
                 jvInitialized = true;
-            } finally {
-                endInit(key);
             }
-        }
+        });
     }
 
+    /**
+     * {@return true if the current thread is initializing a JAR verifier, false otherwise}
+     */
     static boolean isInitializing() {
-        return ThreadTrackHolder.TRACKER.contains(Thread.currentThread());
+        return IN_VERIFIER_INIT.isBound();
     }
 }

From a25e6f6462a5d77a2cb0dcec4f74e5e25d8565c4 Mon Sep 17 00:00:00 2001
From: Ramkumar Sunderbabu <rsunderbabu@openjdk.org>
Date: Wed, 3 Dec 2025 09:22:13 +0000
Subject: [PATCH 459/512] 8319158: Parallel: Make TestObjectTenuringFlags use
 createTestJavaProcessBuilder

Reviewed-by: stefank, aboldtch
---
 .../jtreg/gc/arguments/TestObjectTenuringFlags.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java b/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java
index 1590d7ac967..ed087480815 100644
--- a/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestObjectTenuringFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,8 @@ package gc.arguments;
 /*
  * @test TestObjectTenuringFlags
  * @bug 6521376
- * @requires vm.gc.Parallel
+ * @requires vm.gc.Parallel & vm.opt.NeverTenure == null & vm.opt.AlwaysTenure == null
+ *           & vm.opt.MaxTenuringThreshold == null & vm.opt.InitialTenuringThreshold == null
  * @summary Tests argument processing for NeverTenure, AlwaysTenure,
  * and MaxTenuringThreshold
  * @library /test/lib
@@ -161,7 +162,7 @@ public class TestObjectTenuringFlags {
     }
     Collections.addAll(vmOpts, "-XX:+UseParallelGC", "-XX:+PrintFlagsFinal", "-version");
 
-    OutputAnalyzer output = GCArguments.executeLimitedTestJava(vmOpts);
+    OutputAnalyzer output = GCArguments.executeTestJava(vmOpts);
 
     if (shouldFail) {
       output.shouldHaveExitValue(1);

From 177f3404dfb146be724d952f8c88b4d070e36b52 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 3 Dec 2025 09:24:33 +0000
Subject: [PATCH 460/512] 8372733: GHA: Bump to Ubuntu 24.04

Reviewed-by: erikj, ayang
---
 .github/workflows/build-alpine-linux.yml  |  2 +-
 .github/workflows/build-cross-compile.yml |  2 +-
 .github/workflows/build-linux.yml         | 20 ++++++++++++++++----
 .github/workflows/main.yml                |  6 +++---
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-alpine-linux.yml b/.github/workflows/build-alpine-linux.yml
index 0d366a4bdd0..a39b342a248 100644
--- a/.github/workflows/build-alpine-linux.yml
+++ b/.github/workflows/build-alpine-linux.yml
@@ -59,7 +59,7 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: alpine:3.20
 
diff --git a/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml
index b3c63f488a0..e70937f57b6 100644
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -48,7 +48,7 @@ on:
 jobs:
   build-cross-compile:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index f398625cb2c..0680dea6bbe 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -75,7 +75,7 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
@@ -115,9 +115,21 @@ jobs:
           if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
             sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
           fi
-          sudo apt-get update
-          sudo apt-get install --only-upgrade apt
-          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
+          sudo apt update
+          sudo apt install --only-upgrade apt
+          sudo apt install \
+            gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
+            g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
+            libasound2-dev${{ steps.arch.outputs.suffix }} \
+            libcups2-dev${{ steps.arch.outputs.suffix }} \
+            libfontconfig1-dev${{ steps.arch.outputs.suffix }} \
+            libx11-dev${{ steps.arch.outputs.suffix }} \
+            libxext-dev${{ steps.arch.outputs.suffix }} \
+            libxrandr-dev${{ steps.arch.outputs.suffix }} \
+            libxrender-dev${{ steps.arch.outputs.suffix }} \
+            libxt-dev${{ steps.arch.outputs.suffix }} \
+            libxtst-dev${{ steps.arch.outputs.suffix }} \
+            ${{ inputs.apt-extra-packages }}
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
       - name: 'Configure'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d1e8a8be3d..09e6ed65a47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -57,7 +57,7 @@ jobs:
 
   prepare:
     name: 'Prepare the run'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       # List of platforms to exclude by default
       EXCLUDED_PLATFORMS: 'alpine-linux-x64'
@@ -405,7 +405,7 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-24.04
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug
 
@@ -419,7 +419,7 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-24.04
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       static-suffix: "-static"
 

From 3e04e11482605e7734ef75bc477fe31107988f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Wed, 3 Dec 2025 09:28:30 +0000
Subject: [PATCH 461/512] 8372738: ZGC: C2 allocation reloc promotion deopt
 race

Reviewed-by: aboldtch, stefank
---
 src/hotspot/share/gc/z/zBarrierSet.cpp    |  7 ++--
 src/hotspot/share/gc/z/zGeneration.cpp    |  3 +-
 src/hotspot/share/gc/z/zPage.cpp          | 11 ++++-
 src/hotspot/share/gc/z/zPage.hpp          |  4 ++
 src/hotspot/share/gc/z/zRelocate.cpp      | 39 +++++++++++-------
 src/hotspot/share/gc/z/zRelocate.hpp      |  3 +-
 src/hotspot/share/gc/z/zRelocationSet.cpp | 49 +++++++++++++++++------
 src/hotspot/share/gc/z/zRelocationSet.hpp |  4 ++
 8 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/share/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp
index 643eba1947e..15b694b2ecc 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -217,11 +217,10 @@ static void deoptimize_allocation(JavaThread* thread) {
 
 void ZBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {
   const ZPage* const page = ZHeap::heap()->page(to_zaddress(new_obj));
-  const ZPageAge age = page->age();
-  if (age == ZPageAge::old) {
+  if (!page->allows_raw_null()) {
     // We promised C2 that its allocations would end up in young gen. This object
-    // breaks that promise. Take a few steps in the interpreter instead, which has
-    // no such assumptions about where an object resides.
+    // is too old to guarantee that. Take a few steps in the interpreter instead,
+    // which does not elide barriers based on the age of an object.
     deoptimize_allocation(thread);
   }
 }
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index 2b632ef29a9..a8c646bf895 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -190,7 +190,8 @@ void ZGeneration::flip_age_pages(const ZRelocationSetSelector* selector) {
   ZRendezvousHandshakeClosure cl;
   Handshake::execute(&cl);
 
-  _relocate.barrier_flip_promoted_pages(_relocation_set.flip_promoted_pages());
+  _relocate.barrier_promoted_pages(_relocation_set.flip_promoted_pages(),
+                                   _relocation_set.relocate_promoted_pages());
 }
 
 static double fragmentation_limit(ZGenerationId generation) {
diff --git a/src/hotspot/share/gc/z/zPage.cpp b/src/hotspot/share/gc/z/zPage.cpp
index 9f4654a655f..b6e0d162ef0 100644
--- a/src/hotspot/share/gc/z/zPage.cpp
+++ b/src/hotspot/share/gc/z/zPage.cpp
@@ -41,7 +41,8 @@ ZPage::ZPage(ZPageType type, ZPageAge age, const ZVirtualMemory& vmem, ZMultiPar
     _top(to_zoffset_end(start())),
     _livemap(object_max_count()),
     _remembered_set(),
-    _multi_partition_tracker(multi_partition_tracker) {
+    _multi_partition_tracker(multi_partition_tracker),
+    _relocate_promoted(false) {
   assert(!_virtual.is_null(), "Should not be null");
   assert((_type == ZPageType::small && size() == ZPageSizeSmall) ||
          (_type == ZPageType::medium && ZPageSizeMediumMin <= size() && size() <= ZPageSizeMediumMax) ||
@@ -70,6 +71,14 @@ ZPage* ZPage::clone_for_promotion() const {
   return page;
 }
 
+bool ZPage::allows_raw_null() const {
+  return is_young() && !AtomicAccess::load(&_relocate_promoted);
+}
+
+void ZPage::set_is_relocate_promoted() {
+  AtomicAccess::store(&_relocate_promoted, true);
+}
+
 ZGeneration* ZPage::generation() {
   return ZGeneration::generation(_generation_id);
 }
diff --git a/src/hotspot/share/gc/z/zPage.hpp b/src/hotspot/share/gc/z/zPage.hpp
index 96900a37680..0fc134e170a 100644
--- a/src/hotspot/share/gc/z/zPage.hpp
+++ b/src/hotspot/share/gc/z/zPage.hpp
@@ -52,6 +52,7 @@ private:
   ZLiveMap                      _livemap;
   ZRememberedSet                _remembered_set;
   ZMultiPartitionTracker* const _multi_partition_tracker;
+  volatile bool                 _relocate_promoted;
 
   const char* type_to_string() const;
 
@@ -103,6 +104,9 @@ public:
 
   ZPageAge age() const;
 
+  bool allows_raw_null() const;
+  void set_is_relocate_promoted();
+
   uint32_t seqnum() const;
   bool is_allocating() const;
   bool is_relocatable() const;
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index 24c4bdeac16..da07f67d859 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -1366,27 +1366,35 @@ public:
 
 class ZPromoteBarrierTask : public ZTask {
 private:
-  ZArrayParallelIterator<ZPage*> _iter;
+  ZArrayParallelIterator<ZPage*> _flip_promoted_iter;
+  ZArrayParallelIterator<ZPage*> _relocate_promoted_iter;
 
 public:
-  ZPromoteBarrierTask(const ZArray<ZPage*>* pages)
+  ZPromoteBarrierTask(const ZArray<ZPage*>* flip_promoted_pages,
+                      const ZArray<ZPage*>* relocate_promoted_pages)
     : ZTask("ZPromoteBarrierTask"),
-      _iter(pages) {}
+      _flip_promoted_iter(flip_promoted_pages),
+      _relocate_promoted_iter(relocate_promoted_pages) {}
 
   virtual void work() {
     SuspendibleThreadSetJoiner sts_joiner;
 
-    for (ZPage* page; _iter.next(&page);) {
-      // When promoting an object (and before relocate start), we must ensure that all
-      // contained zpointers are store good. The marking code ensures that for non-null
-      // pointers, but null pointers are ignored. This code ensures that even null pointers
-      // are made store good, for the promoted objects.
-      page->object_iterate([&](oop obj) {
-        ZIterator::basic_oop_iterate_safe(obj, ZBarrier::promote_barrier_on_young_oop_field);
-      });
+    auto promote_barriers = [&](ZArrayParallelIterator<ZPage*>* iter) {
+      for (ZPage* page; iter->next(&page);) {
+        // When promoting an object (and before relocate start), we must ensure that all
+        // contained zpointers are store good. The marking code ensures that for non-null
+        // pointers, but null pointers are ignored. This code ensures that even null pointers
+        // are made store good, for the promoted objects.
+        page->object_iterate([&](oop obj) {
+          ZIterator::basic_oop_iterate_safe(obj, ZBarrier::promote_barrier_on_young_oop_field);
+        });
 
-      SuspendibleThreadSet::yield();
-    }
+        SuspendibleThreadSet::yield();
+      }
+    };
+
+    promote_barriers(&_flip_promoted_iter);
+    promote_barriers(&_relocate_promoted_iter);
   }
 };
 
@@ -1395,8 +1403,9 @@ void ZRelocate::flip_age_pages(const ZArray<ZPage*>* pages) {
   workers()->run(&flip_age_task);
 }
 
-void ZRelocate::barrier_flip_promoted_pages(const ZArray<ZPage*>* pages) {
-  ZPromoteBarrierTask promote_barrier_task(pages);
+void ZRelocate::barrier_promoted_pages(const ZArray<ZPage*>* flip_promoted_pages,
+                                       const ZArray<ZPage*>* relocate_promoted_pages) {
+  ZPromoteBarrierTask promote_barrier_task(flip_promoted_pages, relocate_promoted_pages);
   workers()->run(&promote_barrier_task);
 }
 
diff --git a/src/hotspot/share/gc/z/zRelocate.hpp b/src/hotspot/share/gc/z/zRelocate.hpp
index 50111f24ee5..038efba83eb 100644
--- a/src/hotspot/share/gc/z/zRelocate.hpp
+++ b/src/hotspot/share/gc/z/zRelocate.hpp
@@ -119,7 +119,8 @@ public:
   void relocate(ZRelocationSet* relocation_set);
 
   void flip_age_pages(const ZArray<ZPage*>* pages);
-  void barrier_flip_promoted_pages(const ZArray<ZPage*>* pages);
+  void barrier_promoted_pages(const ZArray<ZPage*>* flip_promoted_pages,
+                              const ZArray<ZPage*>* relocate_promoted_pages);
 
   void synchronize();
   void desynchronize();
diff --git a/src/hotspot/share/gc/z/zRelocationSet.cpp b/src/hotspot/share/gc/z/zRelocationSet.cpp
index fb865934690..95ca6e56c45 100644
--- a/src/hotspot/share/gc/z/zRelocationSet.cpp
+++ b/src/hotspot/share/gc/z/zRelocationSet.cpp
@@ -38,6 +38,7 @@
 
 class ZRelocationSetInstallTask : public ZTask {
 private:
+  ZRelocationSet*                _relocation_set;
   ZForwardingAllocator* const    _allocator;
   ZForwarding**                  _forwardings;
   const size_t                   _nforwardings;
@@ -54,16 +55,6 @@ private:
     page->log_msg(" (relocation selected)");
 
     _forwardings[index] = forwarding;
-
-    if (forwarding->is_promotion()) {
-      // Before promoting an object (and before relocate start), we must ensure that all
-      // contained zpointers are store good. The marking code ensures that for non-null
-      // pointers, but null pointers are ignored. This code ensures that even null pointers
-      // are made store good, for the promoted objects.
-      page->object_iterate([&](oop obj) {
-        ZIterator::basic_oop_iterate_safe(obj, ZBarrier::promote_barrier_on_young_oop_field);
-      });
-    }
   }
 
   void install_small(ZForwarding* forwarding, size_t index) {
@@ -78,10 +69,18 @@ private:
     return ZRelocate::compute_to_age(page->age());
   }
 
+  void track_if_promoted(ZPage* page, ZForwarding* forwarding, ZArray<ZPage*>& relocate_promoted) {
+    if (forwarding->is_promotion()) {
+      page->set_is_relocate_promoted();
+      relocate_promoted.append(page);
+    }
+  }
+
 public:
-  ZRelocationSetInstallTask(ZForwardingAllocator* allocator, const ZRelocationSetSelector* selector)
+  ZRelocationSetInstallTask(ZRelocationSet* relocation_set, const ZRelocationSetSelector* selector)
     : ZTask("ZRelocationSetInstallTask"),
-      _allocator(allocator),
+      _relocation_set(relocation_set),
+      _allocator(&relocation_set->_allocator),
       _forwardings(nullptr),
       _nforwardings((size_t)selector->selected_small()->length() + (size_t)selector->selected_medium()->length()),
       _small(selector->selected_small()),
@@ -108,11 +107,14 @@ public:
     // Join the STS to block out VMThreads while running promote_barrier_on_young_oop_field
     SuspendibleThreadSetJoiner sts_joiner;
 
+    ZArray<ZPage*> relocate_promoted;
+
     // Allocate and install forwardings for small pages
     for (size_t page_index; _small_iter.next_index(&page_index);) {
       ZPage* page = _small->at(int(page_index));
       ZForwarding* const forwarding = ZForwarding::alloc(_allocator, page, to_age(page));
       install_small(forwarding, (size_t)_medium->length() + page_index);
+      track_if_promoted(page, forwarding, relocate_promoted);
 
       SuspendibleThreadSet::yield();
     }
@@ -122,9 +124,12 @@ public:
       ZPage* page = _medium->at(int(page_index));
       ZForwarding* const forwarding = ZForwarding::alloc(_allocator, page, to_age(page));
       install_medium(forwarding, page_index);
+      track_if_promoted(page, forwarding, relocate_promoted);
 
       SuspendibleThreadSet::yield();
     }
+
+    _relocation_set->register_relocate_promoted(relocate_promoted);
   }
 
   ZForwarding** forwardings() const {
@@ -143,6 +148,7 @@ ZRelocationSet::ZRelocationSet(ZGeneration* generation)
     _nforwardings(0),
     _promotion_lock(),
     _flip_promoted_pages(),
+    _relocate_promoted_pages(),
     _in_place_relocate_promoted_pages() {}
 
 ZWorkers* ZRelocationSet::workers() const {
@@ -157,9 +163,13 @@ ZArray<ZPage*>* ZRelocationSet::flip_promoted_pages() {
   return &_flip_promoted_pages;
 }
 
+ZArray<ZPage*>* ZRelocationSet::relocate_promoted_pages() {
+  return &_relocate_promoted_pages;
+}
+
 void ZRelocationSet::install(const ZRelocationSetSelector* selector) {
   // Install relocation set
-  ZRelocationSetInstallTask task(&_allocator, selector);
+  ZRelocationSetInstallTask task(this, selector);
   workers()->run(&task);
 
   _forwardings = task.forwardings();
@@ -189,6 +199,7 @@ void ZRelocationSet::reset(ZPageAllocator* page_allocator) {
 
   destroy_and_clear(page_allocator, &_in_place_relocate_promoted_pages);
   destroy_and_clear(page_allocator, &_flip_promoted_pages);
+  _relocate_promoted_pages.clear();
 }
 
 void ZRelocationSet::register_flip_promoted(const ZArray<ZPage*>& pages) {
@@ -199,6 +210,18 @@ void ZRelocationSet::register_flip_promoted(const ZArray<ZPage*>& pages) {
   }
 }
 
+void ZRelocationSet::register_relocate_promoted(const ZArray<ZPage*>& pages) {
+  if (pages.is_empty()) {
+    return;
+  }
+
+  ZLocker<ZLock> locker(&_promotion_lock);
+  for (ZPage* const page : pages) {
+    assert(!_relocate_promoted_pages.contains(page), "no duplicates allowed");
+    _relocate_promoted_pages.append(page);
+  }
+}
+
 void ZRelocationSet::register_in_place_relocate_promoted(ZPage* page) {
   ZLocker<ZLock> locker(&_promotion_lock);
   assert(!_in_place_relocate_promoted_pages.contains(page), "no duplicates allowed");
diff --git a/src/hotspot/share/gc/z/zRelocationSet.hpp b/src/hotspot/share/gc/z/zRelocationSet.hpp
index ee1a9447617..5f54df79805 100644
--- a/src/hotspot/share/gc/z/zRelocationSet.hpp
+++ b/src/hotspot/share/gc/z/zRelocationSet.hpp
@@ -37,6 +37,7 @@ class ZWorkers;
 
 class ZRelocationSet {
   template <bool> friend class ZRelocationSetIteratorImpl;
+  friend class ZRelocationSetInstallTask;
 
 private:
   ZGeneration*         _generation;
@@ -45,6 +46,7 @@ private:
   size_t               _nforwardings;
   ZLock                _promotion_lock;
   ZArray<ZPage*>       _flip_promoted_pages;
+  ZArray<ZPage*>       _relocate_promoted_pages;
   ZArray<ZPage*>       _in_place_relocate_promoted_pages;
 
   ZWorkers* workers() const;
@@ -58,8 +60,10 @@ public:
   void reset(ZPageAllocator* page_allocator);
   ZGeneration* generation() const;
   ZArray<ZPage*>* flip_promoted_pages();
+  ZArray<ZPage*>* relocate_promoted_pages();
 
   void register_flip_promoted(const ZArray<ZPage*>& pages);
+  void register_relocate_promoted(const ZArray<ZPage*>& pages);
   void register_in_place_relocate_promoted(ZPage* page);
 };
 

From 858d2e434dd4eb8aa94784bb1cd115554eec5dff Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jnorlinder@openjdk.org>
Date: Wed, 3 Dec 2025 09:35:59 +0000
Subject: [PATCH 462/512] 8372584: [Linux]: Replace reading proc to get thread
 user CPU time with clock_gettime

Reviewed-by: dholmes, kevinw, redestad
---
 src/hotspot/os/linux/os_linux.cpp             | 91 ++++++++-----------
 src/hotspot/os/linux/os_linux.hpp             |  2 +-
 .../bench/vm/runtime/ThreadMXBeanBench.java   | 55 +++++++++++
 3 files changed, 95 insertions(+), 53 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/vm/runtime/ThreadMXBeanBench.java

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index cf64c22ddff..880dbeccf7d 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -4305,7 +4305,7 @@ OSReturn os::get_native_priority(const Thread* const thread,
 // For reference, please, see IEEE Std 1003.1-2004:
 //   http://www.unix.org/single_unix_specification
 
-jlong os::Linux::total_thread_cpu_time(clockid_t clockid) {
+jlong os::Linux::thread_cpu_time(clockid_t clockid) {
   struct timespec tp;
   int status = clock_gettime(clockid, &tp);
   assert(status == 0, "clock_gettime error: %s", os::strerror(errno));
@@ -4960,20 +4960,42 @@ int os::open(const char *path, int oflag, int mode) {
   return fd;
 }
 
+// Since kernel v2.6.12 the Linux ABI has had support for encoding the clock
+// types in the last three bits. Bit 2 indicates whether a cpu clock refers to a
+// thread or a process. Bits 1 and 0 give the type: PROF=0, VIRT=1, SCHED=2, or
+// FD=3. The clock CPUCLOCK_VIRT (0b001) reports the thread's consumed user
+// time. POSIX compliant implementations of pthread_getcpuclockid return the
+// clock CPUCLOCK_SCHED (0b010) which reports the thread's consumed system+user
+// time (as mandated by the POSIX standard POSIX.1-2024/IEEE Std 1003.1-2024
+// §3.90).
+static bool get_thread_clockid(Thread* thread, clockid_t* clockid, bool total) {
+  constexpr clockid_t CLOCK_TYPE_MASK = 3;
+  constexpr clockid_t CPUCLOCK_VIRT = 1;
+
+  int rc = pthread_getcpuclockid(thread->osthread()->pthread_id(), clockid);
+  if (rc != 0) {
+    // It's possible to encounter a terminated native thread that failed
+    // to detach itself from the VM - which should result in ESRCH.
+    assert_status(rc == ESRCH, rc, "pthread_getcpuclockid failed");
+    return false;
+  }
+
+  if (!total) {
+    clockid_t clockid_tmp = *clockid;
+    clockid_tmp = (clockid_tmp & ~CLOCK_TYPE_MASK) | CPUCLOCK_VIRT;
+    *clockid = clockid_tmp;
+  }
+
+  return true;
+}
+
 static jlong user_thread_cpu_time(Thread *thread);
 
 static jlong total_thread_cpu_time(Thread *thread) {
-    clockid_t clockid;
-    int rc = pthread_getcpuclockid(thread->osthread()->pthread_id(),
-                                              &clockid);
-    if (rc == 0) {
-      return os::Linux::total_thread_cpu_time(clockid);
-    } else {
-      // It's possible to encounter a terminated native thread that failed
-      // to detach itself from the VM - which should result in ESRCH.
-      assert_status(rc == ESRCH, rc, "pthread_getcpuclockid failed");
-      return -1;
-    }
+  clockid_t clockid;
+  bool success = get_thread_clockid(thread, &clockid, true);
+
+  return success ? os::Linux::thread_cpu_time(clockid) : -1;
 }
 
 // current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
@@ -4984,7 +5006,7 @@ static jlong total_thread_cpu_time(Thread *thread) {
 // the fast estimate available on the platform.
 
 jlong os::current_thread_cpu_time() {
-  return os::Linux::total_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
+  return os::Linux::thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
 }
 
 jlong os::thread_cpu_time(Thread* thread) {
@@ -4993,7 +5015,7 @@ jlong os::thread_cpu_time(Thread* thread) {
 
 jlong os::current_thread_cpu_time(bool user_sys_cpu_time) {
   if (user_sys_cpu_time) {
-    return os::Linux::total_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
+    return os::Linux::thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
   } else {
     return user_thread_cpu_time(Thread::current());
   }
@@ -5007,46 +5029,11 @@ jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
   }
 }
 
-//  -1 on error.
 static jlong user_thread_cpu_time(Thread *thread) {
-  pid_t  tid = thread->osthread()->thread_id();
-  char *s;
-  char stat[2048];
-  size_t statlen;
-  char proc_name[64];
-  int count;
-  long sys_time, user_time;
-  char cdummy;
-  int idummy;
-  long ldummy;
-  FILE *fp;
+  clockid_t clockid;
+  bool success = get_thread_clockid(thread, &clockid, false);
 
-  os::snprintf_checked(proc_name, 64, "/proc/self/task/%d/stat", tid);
-  fp = os::fopen(proc_name, "r");
-  if (fp == nullptr) return -1;
-  statlen = fread(stat, 1, 2047, fp);
-  stat[statlen] = '\0';
-  fclose(fp);
-
-  // Skip pid and the command string. Note that we could be dealing with
-  // weird command names, e.g. user could decide to rename java launcher
-  // to "java 1.4.2 :)", then the stat file would look like
-  //                1234 (java 1.4.2 :)) R ... ...
-  // We don't really need to know the command string, just find the last
-  // occurrence of ")" and then start parsing from there. See bug 4726580.
-  s = strrchr(stat, ')');
-  if (s == nullptr) return -1;
-
-  // Skip blank chars
-  do { s++; } while (s && isspace((unsigned char) *s));
-
-  count = sscanf(s,"%c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu",
-                 &cdummy, &idummy, &idummy, &idummy, &idummy, &idummy,
-                 &ldummy, &ldummy, &ldummy, &ldummy, &ldummy,
-                 &user_time, &sys_time);
-  if (count != 13) return -1;
-
-  return (jlong)user_time * (1000000000 / os::Posix::clock_tics_per_second());
+  return success ? os::Linux::thread_cpu_time(clockid) : -1;
 }
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index dd07cb600b9..43f70b4af56 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -142,7 +142,7 @@ class os::Linux {
   static bool manually_expand_stack(JavaThread * t, address addr);
   static void expand_stack_to(address bottom);
 
-  static jlong total_thread_cpu_time(clockid_t clockid);
+  static jlong thread_cpu_time(clockid_t clockid);
 
   static jlong sendfile(int out_fd, int in_fd, jlong* offset, jlong count);
 
diff --git a/test/micro/org/openjdk/bench/vm/runtime/ThreadMXBeanBench.java b/test/micro/org/openjdk/bench/vm/runtime/ThreadMXBeanBench.java
new file mode 100644
index 00000000000..f041eb89f5a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/runtime/ThreadMXBeanBench.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.vm.runtime;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+@State(Scope.Benchmark)
+@Warmup(iterations = 2, time = 5)
+@Measurement(iterations = 5, time = 5)
+@BenchmarkMode(Mode.SampleTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Threads(1)
+@Fork(value = 10)
+public class ThreadMXBeanBench {
+    static final ThreadMXBean mxThreadBean = ManagementFactory.getThreadMXBean();
+    static long user; // To avoid dead-code elimination
+
+    @Benchmark
+    public void getCurrentThreadUserTime() throws Throwable {
+        user = mxThreadBean.getCurrentThreadUserTime();
+    }
+}

From 94977063baafc2e293193d284db408a069f12aca Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Wed, 3 Dec 2025 10:03:50 +0000
Subject: [PATCH 463/512] 8358706: Integer overflow with
 -XX:MinOopMapAllocation=-1

Reviewed-by: phubner, coleenp
---
 src/hotspot/share/runtime/globals.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index d002edd48cd..68b5d8254fd 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1671,8 +1671,9 @@ const int ObjectAlignmentInBytes = 8;
           "putback")                                                        \
                                                                             \
   /* new oopmap storage allocation */                                       \
-  develop(intx, MinOopMapAllocation,     8,                                 \
+  develop(int, MinOopMapAllocation, 8,                                      \
           "Minimum number of OopMap entries in an OopMapSet")               \
+          range(0, max_jint)                                                \
                                                                             \
   /* recompilation */                                                       \
   product_pd(intx, CompileThreshold,                                        \

From f1a4d1bfde652cf758117b93bbd02ae8248e805e Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Wed, 3 Dec 2025 10:06:01 +0000
Subject: [PATCH 464/512] 8372615: Many container tests fail when running
 rootless on cgroup v1

Reviewed-by: sgehwolf, dholmes
---
 .../containers/docker/DockerBasicTest.java    |  8 +++---
 .../jtreg/containers/docker/ShareTmpDir.java  |  8 +++---
 .../containers/docker/TestCPUAwareness.java   |  7 +++---
 .../jtreg/containers/docker/TestCPUSets.java  | 10 +++-----
 .../containers/docker/TestContainerInfo.java  |  8 +++---
 .../containers/docker/TestJFREvents.java      |  5 ++--
 .../docker/TestJFRNetworkEvents.java          |  8 +++---
 .../containers/docker/TestJFRWithJMX.java     |  7 +++---
 .../jtreg/containers/docker/TestJcmd.java     |  3 ++-
 .../docker/TestJcmdWithSideCar.java           |  8 +++---
 .../containers/docker/TestLimitsUpdating.java |  9 +++----
 .../docker/TestMemoryAwareness.java           |  5 +---
 .../docker/TestMemoryInvisibleParent.java     |  5 +---
 .../docker/TestMemoryWithCgroupV1.java        |  7 +++---
 .../docker/TestMemoryWithSubgroups.java       |  5 +---
 .../jtreg/containers/docker/TestMisc.java     | 16 +++---------
 .../jtreg/containers/docker/TestPids.java     |  7 +++---
 .../platform/docker/TestDockerBasic.java      |  9 +++----
 .../platform/docker/TestDockerCpuMetrics.java |  7 +++---
 .../docker/TestDockerMemoryMetrics.java       |  5 ++--
 .../TestDockerMemoryMetricsSubgroup.java      |  5 +---
 .../docker/TestGetFreeSwapSpaceSize.java      |  8 +++---
 .../platform/docker/TestLimitsUpdating.java   |  6 ++---
 .../platform/docker/TestPidsLimit.java        |  7 +++---
 .../platform/docker/TestSystemMetrics.java    |  5 +---
 .../docker/TestUseContainerSupport.java       |  5 +---
 .../containers/docker/DockerTestUtils.java    | 25 +++++++++++++------
 27 files changed, 83 insertions(+), 125 deletions(-)

diff --git a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
index 8e2c0b6a85a..e564cae9d8e 100644
--- a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
+++ b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build HelloDocker
@@ -45,10 +46,7 @@ public class DockerBasicTest {
     private static final String imageNameAndTag = Common.imageName("basic");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         DockerTestUtils.buildJdkContainerImage(imageNameAndTag);
 
         try {
diff --git a/test/hotspot/jtreg/containers/docker/ShareTmpDir.java b/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
index 9a4748563bd..a84cdacefa1 100644
--- a/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
+++ b/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * @requires container.support
  * @requires !vm.asan
  * @library /test/lib
+ * @modules java.base/jdk.internal.platform
  * @build WaitForFlagFile
  * @run driver ShareTmpDir
  */
@@ -50,10 +51,7 @@ public class ShareTmpDir {
     private static final String imageName = Common.imageName("sharetmpdir");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
index 99220201f66..26f160ab27d 100644
--- a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
+++ b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,9 +48,8 @@ public class TestCPUAwareness {
     private static final int availableCPUs = Runtime.getRuntime().availableProcessors();
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
 
         System.out.println("Test Environment: detected availableCPUs = " + availableCPUs);
         DockerTestUtils.buildJdkContainerImage(imageName);
diff --git a/test/hotspot/jtreg/containers/docker/TestCPUSets.java b/test/hotspot/jtreg/containers/docker/TestCPUSets.java
index 7894172e401..001914a6686 100644
--- a/test/hotspot/jtreg/containers/docker/TestCPUSets.java
+++ b/test/hotspot/jtreg/containers/docker/TestCPUSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
  * @requires (os.arch != "s390x")
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build AttemptOOM jdk.test.whitebox.WhiteBox PrintContainerInfo
@@ -52,11 +53,8 @@ public class TestCPUSets {
     private static final String imageName = Common.imageName("cpusets");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
diff --git a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
index b9b6fb65b75..a5579aa9528 100644
--- a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
+++ b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -31,6 +31,7 @@
  * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build CheckContainerized jdk.test.whitebox.WhiteBox PrintContainerInfo
@@ -49,10 +50,7 @@ public class TestContainerInfo {
     private static final String imageName = Common.imageName("container-info");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
diff --git a/test/hotspot/jtreg/containers/docker/TestJFREvents.java b/test/hotspot/jtreg/containers/docker/TestJFREvents.java
index 4c33ecfc79b..d46c422723b 100644
--- a/test/hotspot/jtreg/containers/docker/TestJFREvents.java
+++ b/test/hotspot/jtreg/containers/docker/TestJFREvents.java
@@ -34,6 +34,7 @@
  * @modules java.base/jdk.internal.platform
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build JfrReporter jdk.test.whitebox.WhiteBox
@@ -61,9 +62,7 @@ public class TestJFREvents {
 
     public static void main(String[] args) throws Exception {
         System.out.println("Test Environment: detected availableCPUs = " + availableCPUs);
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
 
         // If cgroups is not configured, report success.
         Metrics metrics = Metrics.systemMetrics();
diff --git a/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java b/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java
index c0dde368d1e..2c7120c577c 100644
--- a/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java
+++ b/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
  * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build JfrNetwork
@@ -48,10 +49,7 @@ public class TestJFRNetworkEvents {
 
     public static void main(String[] args) throws Exception {
         System.out.println("Test Environment: detected availableCPUs = " + availableCPUs);
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java b/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java
index efe1fa4ffbc..7c26af9b27a 100644
--- a/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java
+++ b/test/hotspot/jtreg/containers/docker/TestJFRWithJMX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build EventProducer
@@ -73,9 +74,7 @@ public class TestJFRWithJMX {
     static final AtomicReference<String> ipAddr = new AtomicReference();
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            throw new SkippedException("Docker is not supported on this host");
-        }
+        DockerTestUtils.checkCanTestDocker();
 
         if (DockerTestUtils.isPodman() & !Platform.isRoot()) {
             throw new SkippedException("test cannot be run under rootless podman configuration");
diff --git a/test/hotspot/jtreg/containers/docker/TestJcmd.java b/test/hotspot/jtreg/containers/docker/TestJcmd.java
index 8c210544bb6..3cfe2945e92 100644
--- a/test/hotspot/jtreg/containers/docker/TestJcmd.java
+++ b/test/hotspot/jtreg/containers/docker/TestJcmd.java
@@ -29,6 +29,7 @@
  * @requires container.support
  * @requires vm.flagless
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @library /test/lib
@@ -62,7 +63,7 @@ public class TestJcmd {
 
 
     public static void main(String[] args) throws Exception {
-        DockerTestUtils.canTestDocker();
+        DockerTestUtils.checkCanTestDocker();
 
         // podman versions below 3.3.1 hava a bug where cross-container testing with correct
         // permissions fails. See JDK-8273216
diff --git a/test/hotspot/jtreg/containers/docker/TestJcmdWithSideCar.java b/test/hotspot/jtreg/containers/docker/TestJcmdWithSideCar.java
index 91a07012f00..28a7a20553f 100644
--- a/test/hotspot/jtreg/containers/docker/TestJcmdWithSideCar.java
+++ b/test/hotspot/jtreg/containers/docker/TestJcmdWithSideCar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  * @requires vm.flagless
  * @requires !vm.asan
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @library /test/lib
@@ -95,10 +96,7 @@ public class TestJcmdWithSideCar {
     private static final String NET_BIND_SERVICE = "--cap-add=NET_BIND_SERVICE";
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         DockerTestUtils.buildJdkContainerImage(IMAGE_NAME);
 
         try {
diff --git a/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java b/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
index 7b05669085c..df8ba5b6161 100644
--- a/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
+++ b/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023, Red Hat, Inc.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,6 +32,7 @@
  * @requires container.support
  * @requires !vm.asan
  * @library /test/lib
+ * @modules java.base/jdk.internal.platform
  * @build jdk.test.whitebox.WhiteBox LimitUpdateChecker
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox
  * @run driver TestLimitsUpdating
@@ -54,10 +55,8 @@ public class TestLimitsUpdating {
     private static final String imageName = Common.imageName("limitsUpdating");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
index 10db6487fa2..4cf895156fe 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
@@ -59,10 +59,7 @@ public class TestMemoryAwareness {
     }
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java b/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
index 68331f26766..4854f663101 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryInvisibleParent.java
@@ -55,10 +55,7 @@ public class TestMemoryInvisibleParent {
             System.out.println("Cgroup not configured.");
             return;
         }
-        if (!DockerTestUtils.canTestDocker()) {
-            System.out.println("Unable to run docker tests.");
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
 
         ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryWithCgroupV1.java b/test/hotspot/jtreg/containers/docker/TestMemoryWithCgroupV1.java
index 3340f9de03c..1edc98035e4 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryWithCgroupV1.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryWithCgroupV1.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2022, Tencent. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,10 +52,8 @@ public class TestMemoryWithCgroupV1 {
             return;
         }
         if ("cgroupv1".equals(metrics.getProvider())) {
-            if (!DockerTestUtils.canTestDocker()) {
-                return;
-            }
-
+            DockerTestUtils.checkCanTestDocker();
+            DockerTestUtils.checkCanUseResourceLimits();
             Common.prepareWhiteBox();
             DockerTestUtils.buildJdkContainerImage(imageName);
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
index 3b901765ee9..35b7bf993f7 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
@@ -52,10 +52,7 @@ public class TestMemoryWithSubgroups {
             System.out.println("Cgroup not configured.");
             return;
         }
-        if (!DockerTestUtils.canTestDocker()) {
-            System.out.println("Unable to run docker tests.");
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
 
         ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMisc.java b/test/hotspot/jtreg/containers/docker/TestMisc.java
index 400119dac9d..fca3cef5513 100644
--- a/test/hotspot/jtreg/containers/docker/TestMisc.java
+++ b/test/hotspot/jtreg/containers/docker/TestMisc.java
@@ -46,14 +46,10 @@ import jtreg.SkippedException;
 
 
 public class TestMisc {
-    private static final Metrics metrics = Metrics.systemMetrics();
     private static final String imageName = Common.imageName("misc");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
@@ -102,14 +98,8 @@ public class TestMisc {
     // Test the mapping function on cgroups v2. Should also pass on cgroups v1 as it's
     // a direct mapping there.
     private static void testPrintContainerInfoCPUShares() throws Exception {
-        // Test won't work on cgv1 rootless podman since resource limits don't
-        // work there.
-        if ("cgroupv1".equals(metrics.getProvider()) &&
-            DockerTestUtils.isPodman() &&
-            DockerTestUtils.isRootless()) {
-            throw new SkippedException("Resource limits required for testPrintContainerInfoCPUShares(). " +
-                                       "This is cgv1 with podman in rootless mode. Test skipped.");
-        }
+        // Test won't work on cgv1 rootless since resource limits don't work there.
+        DockerTestUtils.checkCanUseResourceLimits();
         // Anything less than 1024 should return the back-mapped cpu-shares value without
         // rounding to next multiple of 1024 (on cg v2). Only ensure that we get
         // 'cpu_shares: <back-mapped-value>' over 'cpu_shares: no shares'.
diff --git a/test/hotspot/jtreg/containers/docker/TestPids.java b/test/hotspot/jtreg/containers/docker/TestPids.java
index 7d5f1b0cdf9..0e39268184e 100644
--- a/test/hotspot/jtreg/containers/docker/TestPids.java
+++ b/test/hotspot/jtreg/containers/docker/TestPids.java
@@ -31,6 +31,7 @@
  * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ *          java.base/jdk.internal.platform
  *          java.management
  * @build jdk.test.whitebox.WhiteBox PrintContainerInfo
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox
@@ -54,10 +55,8 @@ public class TestPids {
     static final String warning_kernel_no_pids_support = "WARNING: Your kernel does not support pids limit capabilities";
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerBasic.java b/test/jdk/jdk/internal/platform/docker/TestDockerBasic.java
index 9a531d692ed..bfc628a25fc 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerBasic.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerBasic.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, Red Hat, Inc.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * @requires container.support
  * @requires !vm.asan
  * @library /test/lib
+ * @modules java.base/jdk.internal.platform
  * @run main/timeout=360 TestDockerBasic
  */
 
@@ -42,10 +43,8 @@ public class TestDockerBasic {
     private static final String imageName = Common.imageName("javaDockerBasic");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java b/test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java
index ff039913b8f..042996a353b 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,8 @@ public class TestDockerCpuMetrics {
     private static final String imageName = Common.imageName("metrics-cpu");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
 
         // These tests create a docker image and run this image with
         // varying docker cpu options.  The arguments passed to the docker
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
index 2afb5ed93b1..818c2c04a1d 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
@@ -45,9 +45,8 @@ public class TestDockerMemoryMetrics {
     private static final String imageName = Common.imageName("metrics-memory");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
 
         // These tests create a docker image and run this image with
         // varying docker memory options.  The arguments passed to the docker
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
index f9dd405891c..7d5dbca6f7c 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
@@ -58,10 +58,7 @@ public class TestDockerMemoryMetricsSubgroup {
             System.out.println("Cgroup not configured.");
             return;
         }
-        if (!DockerTestUtils.canTestDocker()) {
-            System.out.println("Unable to run docker tests.");
-            return;
-        }
+        DockerTestUtils.checkCanTestDocker();
 
         ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
index dc70fe32b16..1e5160330de 100644
--- a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
+++ b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
@@ -29,9 +29,11 @@
  * @requires container.support
  * @requires !vm.asan
  * @library /test/lib
+ * @modules java.base/jdk.internal.platform
  * @build GetFreeSwapSpaceSize
  * @run driver/timeout=480 TestGetFreeSwapSpaceSize
  */
+
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerRunOptions;
 import jdk.test.lib.containers.docker.DockerTestUtils;
@@ -41,10 +43,8 @@ public class TestGetFreeSwapSpaceSize {
     private static final String imageName = Common.imageName("osbeanSwapSpace");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
index e4decb7f903..a3df580fed1 100644
--- a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
+++ b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
@@ -55,10 +55,8 @@ public class TestLimitsUpdating {
     private static final String imageName = Common.imageName("limitsUpdatingJDK");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
index 033562b3951..87ecae7ee62 100644
--- a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
+++ b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
@@ -30,6 +30,7 @@
  * @requires container.support
  * @requires !vm.asan
  * @library /test/lib
+ * @modules java.base/jdk.internal.platform
  * @build TestPidsLimit
  * @run driver/timeout=480 TestPidsLimit
  */
@@ -49,10 +50,8 @@ public class TestPidsLimit {
     private static final int UNLIMITED_PIDS_DOCKER = -1;
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
+        DockerTestUtils.checkCanUseResourceLimits();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java b/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java
index 49ec5663478..e6e78bd5cd8 100644
--- a/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java
@@ -42,10 +42,7 @@ public class TestSystemMetrics {
     private static final String imageName = Common.imageName("metrics");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java b/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
index d8d300401a0..e77783f395b 100644
--- a/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
+++ b/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
@@ -42,10 +42,7 @@ public class TestUseContainerSupport {
     private static final String imageName = Common.imageName("useContainerSupport");
 
     public static void main(String[] args) throws Exception {
-        if (!DockerTestUtils.canTestDocker()) {
-            return;
-        }
-
+        DockerTestUtils.checkCanTestDocker();
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
index 422671d65b7..ec3e6d773b1 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import jdk.internal.platform.Metrics;
 import jdk.test.lib.Container;
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
@@ -47,6 +48,7 @@ import jtreg.SkippedException;
 public class DockerTestUtils {
     private static boolean isDockerEngineAvailable = false;
     private static boolean wasDockerEngineChecked = false;
+    private static final Metrics metrics = Metrics.systemMetrics();
 
     // Specifies how many lines to copy from child STDOUT to main test output.
     // Having too many lines in the main test output will result
@@ -93,16 +95,12 @@ public class DockerTestUtils {
     }
 
     /**
-     * Convenience method, will check if docker engine is available and usable;
-     * will print the appropriate message when not available.
+     * Checks if the docker engine is available and usable, throws an exception if not.
      *
-     * @return true if docker engine is available
      * @throws Exception
      */
-    public static boolean canTestDocker() throws Exception {
-        if (isDockerEngineAvailable()) {
-            return true;
-        } else {
+    public static void checkCanTestDocker() throws Exception {
+        if (!isDockerEngineAvailable()) {
             throw new SkippedException("Docker engine is not available on this system");
         }
     }
@@ -133,6 +131,17 @@ public class DockerTestUtils {
         return execute(Container.ENGINE_COMMAND, "info", "-f", format).getStdout();
     }
 
+    /**
+     * Checks if the engine can use resource limits, throws an exception if not.
+     *
+     * @throws Exception
+     */
+    public static void checkCanUseResourceLimits() throws Exception {
+        if (isRootless() && "cgroupv1".equals(metrics.getProvider())) {
+            throw new SkippedException("Resource limits are not available on this system");
+        }
+    }
+
     /**
      * Determine if the engine is running in root-less mode.
      *

From 804ce0a2394cb3f837441976e5ef6eb4b9cab257 Mon Sep 17 00:00:00 2001
From: Richard Reingruber <rrich@openjdk.org>
Date: Wed, 3 Dec 2025 10:29:09 +0000
Subject: [PATCH 465/512] 8370473: C2: Better Aligment of Vector Spill Slots

Reviewed-by: goetz, mdoerr
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   3 +
 src/hotspot/cpu/ppc/ppc.ad                    |  70 ++++++-----
 src/hotspot/share/opto/chaitin.hpp            |   2 +-
 src/hotspot/share/opto/matcher.cpp            |  13 +--
 src/hotspot/share/opto/regmask.hpp            |  16 +--
 .../compiler/lib/ir_framework/IRNode.java     |   6 +
 .../vectorapi/TestVectorSpilling.java         | 110 ++++++++++++++++++
 7 files changed, 174 insertions(+), 46 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/TestVectorSpilling.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 9c76ed24788..b9252cc56ff 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -2003,6 +2003,9 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
 
   if (bottom_type()->isa_vect() && !bottom_type()->isa_vectmask()) {
     uint ireg = ideal_reg();
+    DEBUG_ONLY(int algm = MIN2(RegMask::num_registers(ireg), (int)Matcher::stack_alignment_in_slots()) * VMRegImpl::stack_slot_size);
+    assert((src_lo_rc != rc_stack) || is_aligned(src_offset, algm), "unaligned vector spill sp offset %d (src)", src_offset);
+    assert((dst_lo_rc != rc_stack) || is_aligned(dst_offset, algm), "unaligned vector spill sp offset %d (dst)", dst_offset);
     if (ireg == Op_VecA && masm) {
       int sve_vector_reg_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
       if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 87fcf112756..aa00609094e 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -1795,10 +1795,13 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
     return size;            // Self copy, no move.
 
   if (bottom_type()->isa_vect() != nullptr && ideal_reg() == Op_VecX) {
+    int src_offset = ra_->reg2offset(src_lo);
+    int dst_offset = ra_->reg2offset(dst_lo);
+    DEBUG_ONLY(int algm = MIN2(RegMask::num_registers(ideal_reg()), (int)Matcher::stack_alignment_in_slots()) * VMRegImpl::stack_slot_size);
+    assert((src_lo_rc != rc_stack) || is_aligned(src_offset, algm), "unaligned vector spill sp offset %d (src)", src_offset);
+    assert((dst_lo_rc != rc_stack) || is_aligned(dst_offset, algm), "unaligned vector spill sp offset %d (dst)", dst_offset);
     // Memory->Memory Spill.
     if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
-      int src_offset = ra_->reg2offset(src_lo);
-      int dst_offset = ra_->reg2offset(dst_lo);
       if (masm) {
         __ ld(R0, src_offset, R1_SP);
         __ std(R0, dst_offset, R1_SP);
@@ -1806,26 +1809,20 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
         __ std(R0, dst_offset+8, R1_SP);
       }
       size += 16;
+#ifndef PRODUCT
+      if (st != nullptr) {
+        st->print("%-7s [R1_SP + #%d] -> [R1_SP + #%d] \t// vector spill copy", "SPILL", src_offset, dst_offset);
+      }
+#endif // !PRODUCT
     }
     // VectorRegister->Memory Spill.
     else if (src_lo_rc == rc_vec && dst_lo_rc == rc_stack) {
       VectorSRegister Rsrc = as_VectorRegister(Matcher::_regEncode[src_lo]).to_vsr();
-      int dst_offset = ra_->reg2offset(dst_lo);
       if (PowerArchitecturePPC64 >= 9) {
-        if (is_aligned(dst_offset, 16)) {
-          if (masm) {
-            __ stxv(Rsrc, dst_offset, R1_SP); // matches storeV16_Power9
-          }
-          size += 4;
-        } else {
-          // Other alignment can be used by Vector API (VectorPayload in rearrangeOp,
-          // observed with VectorRearrangeTest.java on Power9).
-          if (masm) {
-            __ addi(R0, R1_SP, dst_offset);
-            __ stxvx(Rsrc, R0); // matches storeV16_Power9 (regarding element ordering)
-          }
-          size += 8;
+        if (masm) {
+          __ stxv(Rsrc, dst_offset, R1_SP); // matches storeV16_Power9
         }
+        size += 4;
       } else {
         if (masm) {
           __ addi(R0, R1_SP, dst_offset);
@@ -1833,24 +1830,25 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
         }
         size += 8;
       }
+#ifndef PRODUCT
+      if (st != nullptr) {
+        if (PowerArchitecturePPC64 >= 9) {
+          st->print("%-7s %s, [R1_SP + #%d] \t// vector spill copy", "STXV", Matcher::regName[src_lo], dst_offset);
+        } else {
+          st->print("%-7s R0, R1_SP, %d \t// vector spill copy\n\t"
+                    "%-7s %s, [R0] \t// vector spill copy", "ADDI", dst_offset, "STXVD2X", Matcher::regName[src_lo]);
+        }
+      }
+#endif // !PRODUCT
     }
     // Memory->VectorRegister Spill.
     else if (src_lo_rc == rc_stack && dst_lo_rc == rc_vec) {
       VectorSRegister Rdst = as_VectorRegister(Matcher::_regEncode[dst_lo]).to_vsr();
-      int src_offset = ra_->reg2offset(src_lo);
       if (PowerArchitecturePPC64 >= 9) {
-        if (is_aligned(src_offset, 16)) {
-          if (masm) {
-            __ lxv(Rdst, src_offset, R1_SP);
-          }
-          size += 4;
-        } else {
-          if (masm) {
-            __ addi(R0, R1_SP, src_offset);
-            __ lxvx(Rdst, R0);
-          }
-          size += 8;
+        if (masm) {
+          __ lxv(Rdst, src_offset, R1_SP);
         }
+        size += 4;
       } else {
         if (masm) {
           __ addi(R0, R1_SP, src_offset);
@@ -1858,6 +1856,16 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
         }
         size += 8;
       }
+#ifndef PRODUCT
+      if (st != nullptr) {
+        if (PowerArchitecturePPC64 >= 9) {
+          st->print("%-7s %s, [R1_SP + #%d] \t// vector spill copy", "LXV", Matcher::regName[dst_lo], src_offset);
+        } else {
+          st->print("%-7s R0, R1_SP, %d \t// vector spill copy\n\t"
+                    "%-7s %s, [R0] \t// vector spill copy", "ADDI", src_offset, "LXVD2X", Matcher::regName[dst_lo]);
+        }
+      }
+#endif // !PRODUCT
     }
     // VectorRegister->VectorRegister.
     else if (src_lo_rc == rc_vec && dst_lo_rc == rc_vec) {
@@ -1867,6 +1875,12 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
         __ xxlor(Rdst, Rsrc, Rsrc);
       }
       size += 4;
+#ifndef PRODUCT
+      if (st != nullptr) {
+        st->print("%-7s %s, %s, %s\t// vector spill copy",
+                  "XXLOR", Matcher::regName[dst_lo], Matcher::regName[src_lo], Matcher::regName[src_lo]);
+      }
+#endif // !PRODUCT
     }
     else {
       ShouldNotReachHere(); // No VR spill.
diff --git a/src/hotspot/share/opto/chaitin.hpp b/src/hotspot/share/opto/chaitin.hpp
index ac072e94e2b..2d4f7eeb3f2 100644
--- a/src/hotspot/share/opto/chaitin.hpp
+++ b/src/hotspot/share/opto/chaitin.hpp
@@ -144,7 +144,7 @@ public:
 
 private:
   // Number of registers this live range uses when it colors
-  uint16_t _num_regs;           // 2 for Longs and Doubles, 1 for all else
+  uint16_t _num_regs;           // byte size of the value divided by slot size which is 4
                                 // except _num_regs is kill count for fat_proj
 
   // For scalable register, num_regs may not be the actual physical register size.
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 159e13d8d23..69098befa38 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -285,13 +285,12 @@ void Matcher::match( ) {
     _parm_regs[i].set_pair(reg2, reg1);
   }
 
-  // Finally, make sure the incoming arguments take up an even number of
-  // words, in case the arguments or locals need to contain doubleword stack
-  // slots.  The rest of the system assumes that stack slot pairs (in
-  // particular, in the spill area) which look aligned will in fact be
-  // aligned relative to the stack pointer in the target machine.  Double
-  // stack slots will always be allocated aligned.
-  _new_SP = OptoReg::Name(align_up(_in_arg_limit, (int)RegMask::SlotsPerLong));
+  // Allocated register sets are aligned to their size. Offsets to the stack
+  // pointer have to be aligned to the size of the access. For this _new_SP is
+  // aligned to the size of the largest register set with the stack alignment as
+  // limit and a minimum of SlotsPerLong (2).
+  int vector_aligment = MIN2(C->max_vector_size(), stack_alignment_in_bytes()) / VMRegImpl::stack_slot_size;
+  _new_SP = OptoReg::Name(align_up(_in_arg_limit, MAX2((int)RegMask::SlotsPerLong, vector_aligment)));
 
   // Compute highest outgoing stack argument as
   //   _new_SP + out_preserve_stack_slots + max(outgoing argument size).
diff --git a/src/hotspot/share/opto/regmask.hpp b/src/hotspot/share/opto/regmask.hpp
index 453fbb45d33..421031fdf61 100644
--- a/src/hotspot/share/opto/regmask.hpp
+++ b/src/hotspot/share/opto/regmask.hpp
@@ -354,16 +354,12 @@ public:
   }
 
   // SlotsPerLong is 2, since slots are 32 bits and longs are 64 bits.
-  // Also, consider the maximum alignment size for a normally allocated
-  // value.  Since we allocate register pairs but not register quads (at
-  // present), this alignment is SlotsPerLong (== 2).  A normally
-  // aligned allocated register is either a single register, or a pair
-  // of adjacent registers, the lower-numbered being even.
-  // See also is_aligned_Pairs() below, and the padding added before
-  // Matcher::_new_SP to keep allocated pairs aligned properly.
-  // If we ever go to quad-word allocations, SlotsPerQuad will become
-  // the controlling alignment constraint.  Note that this alignment
-  // requirement is internal to the allocator, and independent of any
+  // We allocate single registers for 32 bit values and register pairs for 64
+  // bit values. The number of registers allocated for vectors match their size. E.g. for 128 bit
+  // vectors (VecX) we allocate a set of 4 registers. Allocated sets are adjacent and aligned.
+  // See RegMask::find_first_set(), is_aligned_pairs(), is_aligned_sets(), and the padding added before
+  // Matcher::_new_SP to keep allocated pairs and sets aligned properly.
+  // Note that this alignment requirement is internal to the allocator, and independent of any
   // particular platform.
   enum { SlotsPerLong = 2,
          SlotsPerVecA = 4,
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 787dedba9c6..85595b9b632 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1257,6 +1257,12 @@ public class IRNode {
         machOnly(MEM_TO_REG_SPILL_COPY, "MemToRegSpillCopy");
     }
 
+    public static final String MEM_TO_REG_SPILL_COPY_TYPE = COMPOSITE_PREFIX + "MEM_TO_REG_SPILL_COPY_TYPE" + POSTFIX;
+    static {
+        String regex = START + "MemToRegSpillCopy" + MID + IS_REPLACED + ".*" + END;
+        machOnly(MEM_TO_REG_SPILL_COPY_TYPE, regex);
+    }
+
     public static final String MIN = PREFIX + "MIN" + POSTFIX;
     static {
         beforeMatchingNameRegex(MIN, "Min(I|L)");
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorSpilling.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorSpilling.java
new file mode 100644
index 00000000000..9d9a85e174c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorSpilling.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2025 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.ir_framework.*;
+
+import jdk.incubator.vector.IntVector;
+import jdk.incubator.vector.VectorSpecies;
+
+import jdk.test.lib.Asserts;
+
+/**
+ * @test
+ * @bug 8370473
+ * @library /test/lib /
+ * @summary Test alignment of vector spill slots. It should match the vector size.
+ * @modules jdk.incubator.vector
+ * @requires vm.opt.final.MaxVectorSize == null | vm.opt.final.MaxVectorSize >= 16
+ *
+ * @run driver compiler.vectorapi.TestVectorSpilling
+ */
+
+public class TestVectorSpilling {
+
+    private static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_128;
+    private static int LENGTH = 1024;
+
+    private static int[] ia1;
+    private static int[] ia2;
+    private static int[] ir ;
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector");
+    }
+
+    static class LData {
+        // Rading from a volatile field prevents cse optimization
+        static volatile long vF = 1042;
+
+        long l1, l2, l3, l4, l5, l6, l7, l8;
+        public LData() {
+            l1 = vF; l2 = vF; l3 = vF; l4 = vF; l5 = vF; l6 = vF; l7 = vF; l8 = vF;
+        }
+        public long sum() {
+            return l1 + l2 + l3 + l4 + l5 + l6 + l7 + l8;
+        }
+    }
+
+
+    @Run(test = "test16ByteSpilling")
+    static void test16ByteSpilling_runner() {
+        test16ByteSpilling(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEM_TO_REG_SPILL_COPY_TYPE, "vectorx", "> 0"},
+        phase = {CompilePhase.FINAL_CODE},
+        applyIfCPUFeature= {"rvv", "false"})
+    static long test16ByteSpilling(long l1, long l2, long l3, long l4, long l5, long l6, long l7, long l8,
+                                   long l9 /* odd stack arg */) {
+        // To be scalar replaced and spilled to stack
+        LData d1 = new LData();
+        LData d2 = new LData();
+        LData d3 = new LData();
+
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector a1v = IntVector.fromArray(I_SPECIES, ia1, i);
+            IntVector a2v = IntVector.fromArray(I_SPECIES, ia2, i);
+            int scalar = spillPoint();
+            a1v.add(a2v)
+               .add(scalar).intoArray(ir, i);
+        }
+
+        return l1 + l2 + l3 + l4 + l5 + l6 + l7 + l8 + l9 + d1.sum() + d2.sum() + d3.sum();
+    }
+
+    @DontInline
+    static int spillPoint() {
+        return 42;
+    }
+
+    static {
+        ia1 = new int[LENGTH];
+        ia2 = new int[LENGTH];
+        ir  = new int[LENGTH];
+    }
+
+}

From 170ebdc5b7b5e54cc7bec60944898d35a24d760b Mon Sep 17 00:00:00 2001
From: Igor Rudenko <iostream64@gmail.com>
Date: Wed, 3 Dec 2025 10:37:55 +0000
Subject: [PATCH 466/512] 8346657: Improve out of bounds exception messages for
 MemorySegments

Reviewed-by: jvernee, liach, mcimadamore
---
 .../foreign/AbstractMemorySegmentImpl.java    | 58 ++++++++++++-------
 .../foreign/SegmentBulkOperations.java        |  2 +-
 .../jdk/internal/foreign/StringSupport.java   |  6 +-
 test/jdk/java/foreign/TestSegments.java       | 26 +++++++--
 4 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
index d7636032c28..a0c8a0a5a4f 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
@@ -33,6 +33,7 @@ import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.util.ArraysSupport;
 import jdk.internal.util.Preconditions;
+import jdk.internal.vm.annotation.DontInline;
 import jdk.internal.vm.annotation.ForceInline;
 import sun.nio.ch.DirectBuffer;
 
@@ -68,7 +69,7 @@ import java.util.stream.StreamSupport;
  * {@link MappedMemorySegmentImpl}.
  */
 public abstract sealed class AbstractMemorySegmentImpl
-        implements MemorySegment, SegmentAllocator, BiFunction<String, List<Number>, RuntimeException>
+        implements MemorySegment, SegmentAllocator
         permits HeapMemorySegmentImpl, NativeMemorySegmentImpl {
 
     static final JavaNioAccess NIO_ACCESS = SharedSecrets.getJavaNioAccess();
@@ -100,19 +101,19 @@ public abstract sealed class AbstractMemorySegmentImpl
 
     @Override
     public AbstractMemorySegmentImpl asSlice(long offset, long newSize) {
-        checkBounds(offset, newSize);
+        checkSliceBounds(offset, newSize);
         return asSliceNoCheck(offset, newSize);
     }
 
     @Override
     public AbstractMemorySegmentImpl asSlice(long offset) {
-        checkBounds(offset, 0);
+        checkSliceBounds(offset, 0);
         return asSliceNoCheck(offset, length - offset);
     }
 
     @Override
     public MemorySegment asSlice(long offset, long newSize, long byteAlignment) {
-        checkBounds(offset, newSize);
+        checkSliceBounds(offset, newSize);
         Utils.checkAlign(byteAlignment);
 
         if (!isAlignedForElement(offset, byteAlignment)) {
@@ -354,7 +355,7 @@ public abstract sealed class AbstractMemorySegmentImpl
     @ForceInline
     public void checkAccess(long offset, long length, boolean readOnly) {
         checkReadOnly(readOnly);
-        checkBounds(offset, length);
+        checkAccessBounds(offset, length);
     }
 
     @ForceInline
@@ -398,20 +399,40 @@ public abstract sealed class AbstractMemorySegmentImpl
     }
 
     @ForceInline
-    void checkBounds(long offset, long length) {
-        if (length > 0) {
-            Preconditions.checkIndex(offset, this.length - length + 1, this);
-        } else if (length < 0 || offset < 0 ||
-                offset > this.length - length) {
-            throw outOfBoundException(offset, length);
+    void checkSliceBounds(long offset, long length) {
+        try {
+            checkBounds(offset, length);
+        } catch (IndexOutOfBoundsException e) {
+            throwOutOfBounds(offset, length, /* isSlice = */ true);
         }
     }
 
-    @Override
-    public RuntimeException apply(String s, List<Number> numbers) {
-        long offset = numbers.get(0).longValue();
-        long length = byteSize() - numbers.get(1).longValue() + 1;
-        return outOfBoundException(offset, length);
+    @ForceInline
+    void checkAccessBounds(long offset, long length) {
+        try {
+            checkBounds(offset, length);
+        } catch (IndexOutOfBoundsException e) {
+            throwOutOfBounds(offset, length, /* isSlice = */ false);
+        }
+    }
+
+    @ForceInline
+    private void checkBounds(long offset, long length) {
+        if (length > 0) {
+            Preconditions.checkIndex(offset, this.length - length + 1, null);
+        } else if (length < 0 || offset < 0 ||
+                offset > this.length - length) {
+            throw new IndexOutOfBoundsException();
+        }
+    }
+
+    @DontInline
+    private void throwOutOfBounds(long offset, long length, boolean isSlice) {
+        String action = isSlice ? "get slice" : "access an element";
+        String msg = String.format("Out of bound access on segment %s; attempting to %s of length %d at offset %d " +
+                        "which is outside the valid range 0 <= offset+length < byteSize (=%d)",
+                this, action, length, offset, this.length);
+        throw new IndexOutOfBoundsException(msg);
     }
 
     @Override
@@ -429,11 +450,6 @@ public abstract sealed class AbstractMemorySegmentImpl
         return scope;
     }
 
-    private IndexOutOfBoundsException outOfBoundException(long offset, long length) {
-        return new IndexOutOfBoundsException(String.format("Out of bound access on segment %s; new offset = %d; new length = %d",
-                        this, offset, length));
-    }
-
     static class SegmentSplitter implements Spliterator<MemorySegment> {
         AbstractMemorySegmentImpl segment;
         long elemCount;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java b/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
index 5af4bc37692..ab6b78b73ee 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
@@ -194,7 +194,7 @@ public final class SegmentBulkOperations {
     @ForceInline
     public static int contentHash(AbstractMemorySegmentImpl segment, long fromOffset, long toOffset) {
         final long length = toOffset - fromOffset;
-        segment.checkBounds(fromOffset, length);
+        segment.checkSliceBounds(fromOffset, length);
         if (length == 0) {
             // The state has to be checked explicitly for zero-length segments
             segment.scope.checkValidState();
diff --git a/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java b/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
index bb6cb2d3915..208c6d54aab 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/StringSupport.java
@@ -145,7 +145,7 @@ public final class StringSupport {
                                  final long fromOffset,
                                  final long toOffset) {
         final long length = toOffset - fromOffset;
-        segment.checkBounds(fromOffset, length);
+        segment.checkSliceBounds(fromOffset, length);
         if (length < Byte.BYTES) {
             // There can be no null terminator present
             segment.scope.checkValidState();
@@ -179,7 +179,7 @@ public final class StringSupport {
                                   final long fromOffset,
                                   final long toOffset) {
         final long length = toOffset - fromOffset;
-        segment.checkBounds(fromOffset, length);
+        segment.checkSliceBounds(fromOffset, length);
         if (length < Short.BYTES) {
             // There can be no null terminator present
             segment.scope.checkValidState();
@@ -215,7 +215,7 @@ public final class StringSupport {
                                 final long fromOffset,
                                 final long toOffset) {
         final long length = toOffset - fromOffset;
-        segment.checkBounds(fromOffset, length);
+        segment.checkSliceBounds(fromOffset, length);
         if (length < Integer.BYTES) {
             // There can be no null terminator present
             segment.scope.checkValidState();
diff --git a/test/jdk/java/foreign/TestSegments.java b/test/jdk/java/foreign/TestSegments.java
index 2942b388d50..e9f3e8a87cc 100644
--- a/test/jdk/java/foreign/TestSegments.java
+++ b/test/jdk/java/foreign/TestSegments.java
@@ -212,14 +212,32 @@ public class TestSegments {
     }
 
     @Test
-    public void testSegmentOOBMessage() {
+    public void testSegmentAccessOOBMessage() {
         try {
             var segment = Arena.global().allocate(10, 1);
             segment.getAtIndex(ValueLayout.JAVA_INT, 2);
+            fail("Expected IndexOutOfBoundsException was not thrown");
         } catch (IndexOutOfBoundsException ex) {
-            assertTrue(ex.getMessage().contains("Out of bound access"));
-            assertTrue(ex.getMessage().contains("offset = 8"));
-            assertTrue(ex.getMessage().contains("length = 4"));
+            assertTrue(ex.getMessage().startsWith("Out of bound access"));
+            assertTrue(ex.getMessage().endsWith("attempting to access an element of length 4 at offset 8 " +
+                    "which is outside the valid range 0 <= offset+length < byteSize (=10)"));
+        } catch (Exception ex) {
+            fail("Unexpected exception type thrown: " + ex);
+        }
+    }
+
+    @Test
+    public void testSegmentSliceOOBMessage() {
+        try {
+            var segment = Arena.global().allocate(10, 1);
+            var slice = segment.asSlice(8, 4);
+            fail("Expected IndexOutOfBoundsException was not thrown");
+        } catch (IndexOutOfBoundsException ex) {
+            assertTrue(ex.getMessage().startsWith("Out of bound access"));
+            assertTrue(ex.getMessage().endsWith("attempting to get slice of length 4 at offset 8 " +
+                    "which is outside the valid range 0 <= offset+length < byteSize (=10)"));
+        } catch (Exception ex) {
+            fail("Unexpected exception type thrown: " + ex);
         }
     }
 

From 3f447edf0e22431628ebb74212f760209ea29d37 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 3 Dec 2025 10:55:12 +0000
Subject: [PATCH 467/512] 8372862: AArch64: Fix GetAndSet-acquire costs after
 JDK-8372188

Reviewed-by: dlong, mhaessig
---
 src/hotspot/cpu/aarch64/aarch64_atomic.ad    | 8 ++++----
 src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_atomic.ad b/src/hotspot/cpu/aarch64/aarch64_atomic.ad
index faac2a43110..3b05a637215 100644
--- a/src/hotspot/cpu/aarch64/aarch64_atomic.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_atomic.ad
@@ -695,7 +695,7 @@ instruct getAndSetP(indirect mem, iRegP newval, iRegPNoSp oldval) %{
 instruct getAndSetIAcq(indirect mem, iRegI newval, iRegINoSp oldval) %{
   predicate(needs_acquiring_load_exclusive(n));
   match(Set oldval (GetAndSetI mem newval));
-  ins_cost(2*VOLATILE_REF_COST);
+  ins_cost(VOLATILE_REF_COST);
   format %{ "atomic_xchgw_acq  $oldval, $newval, [$mem]" %}
   ins_encode %{
     __ atomic_xchgalw($oldval$$Register, $newval$$Register, as_Register($mem$$base));
@@ -706,7 +706,7 @@ instruct getAndSetIAcq(indirect mem, iRegI newval, iRegINoSp oldval) %{
 instruct getAndSetLAcq(indirect mem, iRegL newval, iRegLNoSp oldval) %{
   predicate(needs_acquiring_load_exclusive(n));
   match(Set oldval (GetAndSetL mem newval));
-  ins_cost(2*VOLATILE_REF_COST);
+  ins_cost(VOLATILE_REF_COST);
   format %{ "atomic_xchg_acq  $oldval, $newval, [$mem]" %}
   ins_encode %{
     __ atomic_xchgal($oldval$$Register, $newval$$Register, as_Register($mem$$base));
@@ -717,7 +717,7 @@ instruct getAndSetLAcq(indirect mem, iRegL newval, iRegLNoSp oldval) %{
 instruct getAndSetNAcq(indirect mem, iRegN newval, iRegNNoSp oldval) %{
   predicate(needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() == 0);
   match(Set oldval (GetAndSetN mem newval));
-  ins_cost(2*VOLATILE_REF_COST);
+  ins_cost(VOLATILE_REF_COST);
   format %{ "atomic_xchgw_acq  $oldval, $newval, [$mem]" %}
   ins_encode %{
     __ atomic_xchgalw($oldval$$Register, $newval$$Register, as_Register($mem$$base));
@@ -728,7 +728,7 @@ instruct getAndSetNAcq(indirect mem, iRegN newval, iRegNNoSp oldval) %{
 instruct getAndSetPAcq(indirect mem, iRegP newval, iRegPNoSp oldval) %{
   predicate(needs_acquiring_load_exclusive(n) && (n->as_LoadStore()->barrier_data() == 0));
   match(Set oldval (GetAndSetP mem newval));
-  ins_cost(2*VOLATILE_REF_COST);
+  ins_cost(VOLATILE_REF_COST);
   format %{ "atomic_xchg_acq  $oldval, $newval, [$mem]" %}
   ins_encode %{
     __ atomic_xchgal($oldval$$Register, $newval$$Register, as_Register($mem$$base));
diff --git a/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4
index 721b720873a..dc51754e7f9 100644
--- a/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4
@@ -187,7 +187,7 @@ ifelse($1$3,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_Lo
        $3,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));),
        `dnl')
   match(Set oldval (GetAndSet$1 mem newval));
-  ins_cost(`'ifelse($4,Acq,,2*)VOLATILE_REF_COST);
+  ins_cost(`'ifelse($3,Acq,,2*)VOLATILE_REF_COST);
   format %{ "atomic_xchg$2`'ifelse($3,Acq,_acq)  $oldval, $newval, [$mem]" %}
   ins_encode %{
     __ atomic_xchg`'ifelse($3,Acq,al)$2($oldval$$Register, $newval$$Register, as_Register($mem$$base));

From 125d1820f1f64e465a6b83360c48715a79e3d165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Wed, 3 Dec 2025 11:12:00 +0000
Subject: [PATCH 468/512] 8372393: Document requirement for separate metallib
 installation with Xcode 26.1.1

Reviewed-by: erikj
---
 doc/building.html | 5 +++++
 doc/building.md   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/doc/building.html b/doc/building.html
index 19313ebf43a..8e5a7625371 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -541,6 +541,11 @@ href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
 <p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.</p>
+<p>Starting with Xcode 26, introduced in macOS 26, the Metal toolchain
+no longer comes bundled with Xcode, so it needs to be installed
+separately. This can either be done via the Xcode's Settings/Components
+UI, or in the command line calling
+<code>xcodebuild -downloadComponent metalToolchain</code>.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
diff --git a/doc/building.md b/doc/building.md
index 1fbd395a9d1..b626027f101 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -352,6 +352,11 @@ on some strategies to deal with this.
 It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.
 
+Starting with Xcode 26, introduced in macOS 26, the Metal toolchain no longer
+comes bundled with Xcode, so it needs to be installed separately. This can
+either be done via the Xcode's Settings/Components UI, or in the command line
+calling `xcodebuild -downloadComponent metalToolchain`.
+
 The standard macOS environment contains the basic tooling needed to build, but
 for external libraries a package manager is recommended. The JDK uses
 [homebrew](https://brew.sh/) in the examples, but feel free to use whatever

From a655ea48453a321fb7cadc6ffb6111276497a929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Wed, 3 Dec 2025 12:31:26 +0000
Subject: [PATCH 469/512] 8371792: Refactor barrier loop tests out of
 TestIfMinMax

Reviewed-by: chagedorn, epeter, bmaillard
---
 .../compiler/c2/irTests/TestIfMinMax.java     | 38 +-------
 .../gcbarriers/TestMinMaxLongLoopBarrier.java | 86 +++++++++++++++++++
 2 files changed, 87 insertions(+), 37 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/gcbarriers/TestMinMaxLongLoopBarrier.java

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
index fdc0a83fb8b..bfcc775efeb 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
@@ -30,7 +30,7 @@ import jdk.test.lib.Utils;
 
 /*
  * @test
- * @bug 8324655 8329797 8331090
+ * @bug 8324655 8331090
  * @key randomness
  * @summary Test that if expressions are properly folded into min/max nodes
  * @library /test/lib /
@@ -139,42 +139,6 @@ public class TestIfMinMax {
         return a <= b ? b : a;
     }
 
-    public class Dummy {
-        long l;
-        public Dummy(long l) { this.l = l; }
-    }
-
-    @Setup
-    Object[] setupDummyArray() {
-        Dummy[] arr = new Dummy[512];
-        for (int i = 0; i < 512; i++) {
-            arr[i] = new Dummy(RANDOM.nextLong());
-        }
-        return new Object[] { arr };
-    }
-
-    @Test
-    @Arguments(setup = "setupDummyArray")
-    @IR(failOn = { IRNode.MAX_L })
-    public long testMaxLAndBarrierInLoop(Dummy[] arr) {
-        long result = 0;
-        for (int i = 0; i < arr.length; ++i) {
-            result += Math.max(arr[i].l, 1);
-        }
-        return result;
-    }
-
-    @Test
-    @Arguments(setup = "setupDummyArray")
-    @IR(failOn = { IRNode.MIN_L })
-    public long testMinLAndBarrierInLoop(Dummy[] arr) {
-        long result = 0;
-        for (int i = 0; i < arr.length; ++i) {
-            result += Math.min(arr[i].l, 1);
-        }
-        return result;
-    }
-
     @Setup
     static Object[] setupIntArrays() {
         int[] a = new int[512];
diff --git a/test/hotspot/jtreg/compiler/gcbarriers/TestMinMaxLongLoopBarrier.java b/test/hotspot/jtreg/compiler/gcbarriers/TestMinMaxLongLoopBarrier.java
new file mode 100644
index 00000000000..9f2ddc0d20e
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/gcbarriers/TestMinMaxLongLoopBarrier.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.gcbarriers;
+
+import compiler.lib.ir_framework.Arguments;
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.IRNode;
+import compiler.lib.ir_framework.Setup;
+import compiler.lib.ir_framework.Test;
+import compiler.lib.ir_framework.TestFramework;
+import jdk.test.lib.Utils;
+
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8329797
+ * @key randomness
+ * @summary Test that MinL/MaxL nodes are removed when GC barriers in loop
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class TestMinMaxLongLoopBarrier {
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    public class Dummy {
+        long l;
+        public Dummy(long l) { this.l = l; }
+    }
+
+    @Setup
+    Object[] setupDummyArray() {
+        Dummy[] arr = new Dummy[512];
+        for (int i = 0; i < 512; i++) {
+            arr[i] = new Dummy(RANDOM.nextLong());
+        }
+        return new Object[] { arr };
+    }
+
+    @Test
+    @Arguments(setup = "setupDummyArray")
+    @IR(failOn = { IRNode.MAX_L })
+    public long testMaxLAndBarrierInLoop(Dummy[] arr) {
+        long result = 0;
+        for (int i = 0; i < arr.length; ++i) {
+            result += Math.max(arr[i].l, 1);
+        }
+        return result;
+    }
+
+    @Test
+    @Arguments(setup = "setupDummyArray")
+    @IR(failOn = { IRNode.MIN_L })
+    public long testMinLAndBarrierInLoop(Dummy[] arr) {
+        long result = 0;
+        for (int i = 0; i < arr.length; ++i) {
+            result += Math.min(arr[i].l, 1);
+        }
+        return result;
+    }
+}

From abb75ba656ebe14e9e8e1d4a1765d64dfce9e661 Mon Sep 17 00:00:00 2001
From: Kerem Kat <krk@openjdk.org>
Date: Wed, 3 Dec 2025 13:01:32 +0000
Subject: [PATCH 470/512] 8372587: Put jdk/jfr/jvm/TestWaste.java into the
 ProblemList

Reviewed-by: dholmes
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 9904bd88626..1d547faf662 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -750,6 +750,7 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-
 jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java             8371014 aix-ppc64,linux-ppc64le
 jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
+jdk/jfr/jvm/TestWaste.java                                      8371630 generic-all
 
 ############################################################################
 

From afb6a0c2fecdb2114715290d5d463c9dccf93c28 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 3 Dec 2025 13:03:51 +0000
Subject: [PATCH 471/512] 8372958: SocketInputStream.read throws
 SocketException instead of returning -1 when input shutdown

Reviewed-by: djelinski, michaelm
---
 .../classes/sun/nio/ch/NioSocketImpl.java     |  23 +-
 test/jdk/java/net/Socket/AsyncShutdown.java   |  50 ++--
 .../java/net/vthread/BlockingSocketOps.java   | 242 ++++++++----------
 .../channels/vthread/BlockingChannelOps.java  |  89 ++-----
 4 files changed, 171 insertions(+), 233 deletions(-)

diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
index 5832e7f529a..57935ff5b00 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -289,6 +289,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
      */
     private int implRead(byte[] b, int off, int len, long remainingNanos) throws IOException {
         int n = 0;
+        SocketException ex = null;
         FileDescriptor fd = beginRead();
         try {
             if (connectionReset)
@@ -307,18 +308,24 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
                     n = tryRead(fd, b, off, len);
                 }
             }
-            return n;
         } catch (InterruptedIOException e) {
             throw e;
         } catch (ConnectionResetException e) {
             connectionReset = true;
             throw new SocketException("Connection reset");
         } catch (IOException ioe) {
-            // throw SocketException to maintain compatibility
-            throw asSocketException(ioe);
+            // translate to SocketException to maintain compatibility
+            ex = asSocketException(ioe);
         } finally {
             endRead(n > 0);
         }
+        if (n <= 0 && isInputClosed) {
+            return -1;
+        }
+        if (ex != null) {
+            throw ex;
+        }
+        return n;
     }
 
     /**
@@ -411,6 +418,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
      */
     private int implWrite(byte[] b, int off, int len) throws IOException {
         int n = 0;
+        SocketException ex = null;
         FileDescriptor fd = beginWrite();
         try {
             configureNonBlockingIfNeeded(fd, false);
@@ -419,15 +427,18 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
                 park(fd, Net.POLLOUT);
                 n = tryWrite(fd, b, off, len);
             }
-            return n;
         } catch (InterruptedIOException e) {
             throw e;
         } catch (IOException ioe) {
-            // throw SocketException to maintain compatibility
-            throw asSocketException(ioe);
+            // translate to SocketException to maintain compatibility
+            ex = asSocketException(ioe);
         } finally {
             endWrite(n > 0);
         }
+        if (ex != null) {
+            throw ex;
+        }
+        return n;
     }
 
     /**
diff --git a/test/jdk/java/net/Socket/AsyncShutdown.java b/test/jdk/java/net/Socket/AsyncShutdown.java
index cdc930b360c..159c08075ad 100644
--- a/test/jdk/java/net/Socket/AsyncShutdown.java
+++ b/test/jdk/java/net/Socket/AsyncShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,13 @@
 /*
  * @test
  * @requires (os.family == "linux" | os.family == "mac")
- * @run testng AsyncShutdown
  * @summary Test shutdownInput/shutdownOutput with threads blocked in read/write
+ * @run junit AsyncShutdown
  */
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -38,54 +40,56 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.*;
 
-@Test
-public class AsyncShutdown {
+class AsyncShutdown {
 
-    public void testShutdownInput1() throws IOException {
+    @ParameterizedTest
+    @ValueSource(booleans = { false, true })
+    void testShutdownInput(boolean timed) throws IOException {
         withConnection((s1, s2) -> {
+            InputStream in = s1.getInputStream();
             scheduleShutdownInput(s1, 2000);
-            int n = s1.getInputStream().read();
-            assertTrue(n == -1);
+            if (timed) {
+                s1.setSoTimeout(30*1000);
+            }
+            assertEquals(-1, in.read());
+            assertEquals(0, in.available());
         });
     }
 
-    public void testShutdownInput2() throws IOException {
-        withConnection((s1, s2) -> {
-            scheduleShutdownInput(s1, 2000);
-            s1.setSoTimeout(30*1000);
-            int n = s1.getInputStream().read();
-            assertTrue(n == -1);
-        });
-    }
-
-    public void testShutdownOutput1() throws IOException {
+    @Test
+    void testShutdownOutput1() throws IOException {
         withConnection((s1, s2) -> {
+            OutputStream out = s1.getOutputStream();
             scheduleShutdownOutput(s1, 2000);
             byte[] data = new byte[128*1024];
             try {
                 while (true) {
-                    s1.getOutputStream().write(data);
+                    out.write(data);
                 }
             } catch (IOException expected) { }
         });
     }
 
-    public void testShutdownOutput2() throws IOException {
+    @Test
+    void testShutdownOutput2() throws IOException {
         withConnection((s1, s2) -> {
             s1.setSoTimeout(100);
             try {
                 s1.getInputStream().read();
-                assertTrue(false);
+                fail();
             } catch (SocketTimeoutException e) { }
 
+            OutputStream out = s1.getOutputStream();
             scheduleShutdownOutput(s1, 2000);
             byte[] data = new byte[128*1024];
             try {
                 while (true) {
-                    s1.getOutputStream().write(data);
+                    out.write(data);
                 }
             } catch (IOException expected) { }
         });
diff --git a/test/jdk/java/net/vthread/BlockingSocketOps.java b/test/jdk/java/net/vthread/BlockingSocketOps.java
index 3c6b9cd5276..ef58e06b915 100644
--- a/test/jdk/java/net/vthread/BlockingSocketOps.java
+++ b/test/jdk/java/net/vthread/BlockingSocketOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,15 @@
  * questions.
  */
 
-/**
+/*
  * @test id=default
- * @bug 8284161
+ * @bug 8284161 8372958
  * @summary Test virtual threads doing blocking I/O on java.net Sockets
  * @library /test/lib
  * @run junit BlockingSocketOps
  */
 
-/**
+/*
  * @test id=poller-modes
  * @requires (os.family == "linux") | (os.family == "mac")
  * @library /test/lib
@@ -37,7 +37,7 @@
  * @run junit/othervm -Djdk.pollerMode=2 BlockingSocketOps
  */
 
-/**
+/*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @library /test/lib
@@ -60,6 +60,8 @@ import java.net.SocketTimeoutException;
 
 import jdk.test.lib.thread.VThreadRunner;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 
 class BlockingSocketOps {
@@ -90,19 +92,8 @@ class BlockingSocketOps {
     /**
      * Virtual thread blocks in read.
      */
-    @Test
-    void testSocketRead1() throws Exception {
-        testSocketRead(0);
-    }
-
-    /**
-     * Virtual thread blocks in timed read.
-     */
-    @Test
-    void testSocketRead2() throws Exception {
-        testSocketRead(60_000);
-    }
-
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
     void testSocketRead(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var connection = new Connection()) {
@@ -202,19 +193,8 @@ class BlockingSocketOps {
     /**
      * Socket close while virtual thread blocked in read.
      */
-    @Test
-    void testSocketReadAsyncClose1() throws Exception {
-        testSocketReadAsyncClose(0);
-    }
-
-    /**
-     * Socket close while virtual thread blocked in timed read.
-     */
-    @Test
-    void testSocketReadAsyncClose2() throws Exception {
-        testSocketReadAsyncClose(0);
-    }
-
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
     void testSocketReadAsyncClose(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var connection = new Connection()) {
@@ -230,7 +210,34 @@ class BlockingSocketOps {
                 try {
                     int n = s.getInputStream().read();
                     fail("read " + n);
-                } catch (SocketException expected) { }
+                } catch (SocketException expected) {
+                    log(expected);
+                }
+            }
+        });
+    }
+
+    /**
+     * Socket shutdownInput while virtual thread blocked in read.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testSocketReadAsyncShutdownInput(int timeout) throws Exception {
+        VThreadRunner.run(() -> {
+            try (var connection = new Connection()) {
+                Socket s = connection.socket1();
+
+                // delayed shutdown of input stream
+                InputStream in = s.getInputStream();
+                runAfterParkedAsync(s::shutdownInput);
+
+                // read should return -1
+                if (timeout > 0) {
+                    s.setSoTimeout(timeout);
+                }
+                assertEquals(-1, in.read());
+                assertEquals(0, in.available());
+                assertFalse(s.isClosed());
             }
         });
     }
@@ -238,19 +245,8 @@ class BlockingSocketOps {
     /**
      * Virtual thread interrupted while blocked in Socket read.
      */
-    @Test
-    void testSocketReadInterrupt1() throws Exception {
-        testSocketReadInterrupt(0);
-    }
-
-    /**
-     * Virtual thread interrupted while blocked in Socket read with timeout
-     */
-    @Test
-    void testSocketReadInterrupt2() throws Exception {
-        testSocketReadInterrupt(60_000);
-    }
-
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
     void testSocketReadInterrupt(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var connection = new Connection()) {
@@ -269,6 +265,7 @@ class BlockingSocketOps {
                     int n = s.getInputStream().read();
                     fail("read " + n);
                 } catch (SocketException expected) {
+                    log(expected);
                     assertTrue(Thread.interrupted());
                     assertTrue(s.isClosed());
                 }
@@ -285,7 +282,7 @@ class BlockingSocketOps {
             try (var connection = new Connection()) {
                 Socket s = connection.socket1();
 
-                // delayedclose of s
+                // delayed close of s
                 runAfterParkedAsync(s::close);
 
                 // write to s should block, then throw
@@ -295,7 +292,36 @@ class BlockingSocketOps {
                     for (;;) {
                         out.write(ba);
                     }
-                } catch (SocketException expected) { }
+                } catch (SocketException expected) {
+                    log(expected);
+                }
+            }
+        });
+    }
+
+    /**
+     * Socket shutdownOutput while virtual thread blocked in write.
+     */
+    @Test
+    void testSocketWriteAsyncShutdownOutput() throws Exception {
+        VThreadRunner.run(() -> {
+            try (var connection = new Connection()) {
+                Socket s = connection.socket1();
+
+                // delayed shutdown of output stream
+                OutputStream out = s.getOutputStream();
+                runAfterParkedAsync(s::shutdownOutput);
+
+                // write to s should block, then throw
+                try {
+                    byte[] ba = new byte[100*1024];
+                    for (;;) {
+                        out.write(ba);
+                    }
+                } catch (SocketException expected) {
+                    log(expected);
+                }
+                assertFalse(s.isClosed());
             }
         });
     }
@@ -321,6 +347,7 @@ class BlockingSocketOps {
                         out.write(ba);
                     }
                 } catch (SocketException expected) {
+                    log(expected);
                     assertTrue(Thread.interrupted());
                     assertTrue(s.isClosed());
                 }
@@ -355,7 +382,9 @@ class BlockingSocketOps {
                 try {
                     s1.getInputStream().read(ba);
                     fail();
-                } catch (SocketTimeoutException expected) { }
+                } catch (SocketTimeoutException expected) {
+                    log(expected);
+                }
             }
         });
     }
@@ -384,19 +413,8 @@ class BlockingSocketOps {
     /**
      * Virtual thread blocks in accept.
      */
-    @Test
-    void testServerSocketAccept2() throws Exception {
-        testServerSocketAccept(0);
-    }
-
-    /**
-     * Virtual thread blocks in timed accept.
-     */
-    @Test
-    void testServerSocketAccept3() throws Exception {
-        testServerSocketAccept(60_000);
-    }
-
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
     void testServerSocketAccept(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var listener = new ServerSocket()) {
@@ -422,19 +440,8 @@ class BlockingSocketOps {
     /**
      * ServerSocket close while virtual thread blocked in accept.
      */
-    @Test
-    void testServerSocketAcceptAsyncClose1() throws Exception {
-        testServerSocketAcceptAsyncClose(0);
-    }
-
-    /**
-     * ServerSocket close while virtual thread blocked in timed accept.
-     */
-    @Test
-    void testServerSocketAcceptAsyncClose2() throws Exception {
-        testServerSocketAcceptAsyncClose(60_000);
-    }
-
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
     void testServerSocketAcceptAsyncClose(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var listener = new ServerSocket()) {
@@ -451,7 +458,9 @@ class BlockingSocketOps {
                 try {
                     listener.accept().close();
                     fail("connection accepted???");
-                } catch (SocketException expected) { }
+                } catch (SocketException expected) {
+                    log(expected);
+                }
             }
         });
     }
@@ -459,19 +468,8 @@ class BlockingSocketOps {
     /**
      * Virtual thread interrupted while blocked in ServerSocket accept.
      */
-    @Test
-    void testServerSocketAcceptInterrupt1() throws Exception {
-        testServerSocketAcceptInterrupt(0);
-    }
-
-    /**
-     * Virtual thread interrupted while blocked in ServerSocket accept with timeout.
-     */
-    @Test
-    void testServerSocketAcceptInterrupt2() throws Exception {
-        testServerSocketAcceptInterrupt(60_000);
-    }
-
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
     void testServerSocketAcceptInterrupt(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var listener = new ServerSocket()) {
@@ -490,6 +488,7 @@ class BlockingSocketOps {
                     listener.accept().close();
                     fail("connection accepted???");
                 } catch (SocketException expected) {
+                    log(expected);
                     assertTrue(Thread.interrupted());
                     assertTrue(listener.isClosed());
                 }
@@ -529,20 +528,9 @@ class BlockingSocketOps {
     /**
      * Virtual thread blocks in DatagramSocket receive.
      */
-    @Test
-    void testDatagramSocketSendReceive2() throws Exception {
-        testDatagramSocketSendReceive(0);
-    }
-
-    /**
-     * Virtual thread blocks in DatagramSocket receive with timeout.
-     */
-    @Test
-    void testDatagramSocketSendReceive3() throws Exception {
-        testDatagramSocketSendReceive(60_000);
-    }
-
-    private void testDatagramSocketSendReceive(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testDatagramSocketSendReceive(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (DatagramSocket s1 = new DatagramSocket(null);
                  DatagramSocket s2 = new DatagramSocket(null)) {
@@ -585,7 +573,9 @@ class BlockingSocketOps {
                 try {
                     s.receive(p);
                     fail();
-                } catch (SocketTimeoutException expected) { }
+                } catch (SocketTimeoutException expected) {
+                    log(expected);
+                }
             }
         });
     }
@@ -593,20 +583,9 @@ class BlockingSocketOps {
     /**
      * DatagramSocket close while virtual thread blocked in receive.
      */
-    @Test
-    void testDatagramSocketReceiveAsyncClose1() throws Exception {
-        testDatagramSocketReceiveAsyncClose(0);
-    }
-
-    /**
-     * DatagramSocket close while virtual thread blocked with timeout.
-     */
-    @Test
-    void testDatagramSocketReceiveAsyncClose2() throws Exception {
-        testDatagramSocketReceiveAsyncClose(60_000);
-    }
-
-    private void testDatagramSocketReceiveAsyncClose(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testDatagramSocketReceiveAsyncClose(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (DatagramSocket s = new DatagramSocket(null)) {
                 InetAddress lh = InetAddress.getLoopbackAddress();
@@ -624,7 +603,9 @@ class BlockingSocketOps {
                     DatagramPacket p = new DatagramPacket(ba, ba.length);
                     s.receive(p);
                     fail();
-                } catch (SocketException expected) { }
+                } catch (SocketException expected) {
+                    log(expected);
+                }
             }
         });
     }
@@ -632,20 +613,9 @@ class BlockingSocketOps {
     /**
      * Virtual thread interrupted while blocked in DatagramSocket receive.
      */
-    @Test
-    void testDatagramSocketReceiveInterrupt1() throws Exception {
-        testDatagramSocketReceiveInterrupt(0);
-    }
-
-    /**
-     * Virtual thread interrupted while blocked in DatagramSocket receive with timeout.
-     */
-    @Test
-    void testDatagramSocketReceiveInterrupt2() throws Exception {
-        testDatagramSocketReceiveInterrupt(60_000);
-    }
-
-    private void testDatagramSocketReceiveInterrupt(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testDatagramSocketReceiveInterrupt(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (DatagramSocket s = new DatagramSocket(null)) {
                 InetAddress lh = InetAddress.getLoopbackAddress();
@@ -665,6 +635,7 @@ class BlockingSocketOps {
                     s.receive(p);
                     fail();
                 } catch (SocketException expected) {
+                    log(expected);
                     assertTrue(Thread.interrupted());
                     assertTrue(s.isClosed());
                 }
@@ -737,4 +708,11 @@ class BlockingSocketOps {
             }
         });
     }
+
+    /**
+     * Log to System.err to inline with the JUnit messages.
+     */
+    static void log(Throwable e) {
+        System.err.println(e);
+    }
 }
diff --git a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
index f04bece07b6..eb2229d927a 100644
--- a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
+++ b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
@@ -66,6 +66,8 @@ import java.util.concurrent.locks.LockSupport;
 
 import jdk.test.lib.thread.VThreadRunner;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 
 class BlockingChannelOps {
@@ -301,20 +303,9 @@ class BlockingChannelOps {
     /**
      * Virtual thread blocks in SocketChannel adaptor read.
      */
-    @Test
-    void testSocketAdaptorRead1() throws Exception {
-        testSocketAdaptorRead(0);
-    }
-
-    /**
-     * Virtual thread blocks in SocketChannel adaptor read with timeout.
-     */
-    @Test
-    void testSocketAdaptorRead2() throws Exception {
-        testSocketAdaptorRead(60_000);
-    }
-
-    private void testSocketAdaptorRead(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testSocketAdaptorRead(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var connection = new Connection()) {
                 SocketChannel sc1 = connection.channel1();
@@ -420,20 +411,9 @@ class BlockingChannelOps {
     /**
      * Virtual thread blocks in ServerSocketChannel adaptor accept.
      */
-    @Test
-    void testSocketChannelAdaptorAccept1() throws Exception {
-        testSocketChannelAdaptorAccept(0);
-    }
-
-    /**
-     * Virtual thread blocks in ServerSocketChannel adaptor accept with timeout.
-     */
-    @Test
-    void testSocketChannelAdaptorAccept2() throws Exception {
-        testSocketChannelAdaptorAccept(60_000);
-    }
-
-    private void testSocketChannelAdaptorAccept(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testSocketChannelAdaptorAccept(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (var ssc = ServerSocketChannel.open()) {
                 ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
@@ -546,20 +526,9 @@ class BlockingChannelOps {
     /**
      * Virtual thread blocks in DatagramSocket adaptor receive.
      */
-    @Test
-    void testDatagramSocketAdaptorReceive1() throws Exception {
-        testDatagramSocketAdaptorReceive(0);
-    }
-
-    /**
-     * Virtual thread blocks in DatagramSocket adaptor receive with timeout.
-     */
-    @Test
-    void testDatagramSocketAdaptorReceive2() throws Exception {
-        testDatagramSocketAdaptorReceive(60_000);
-    }
-
-    private void testDatagramSocketAdaptorReceive(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testDatagramSocketAdaptorReceive(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (DatagramChannel dc1 = DatagramChannel.open();
                  DatagramChannel dc2 = DatagramChannel.open()) {
@@ -585,21 +554,9 @@ class BlockingChannelOps {
     /**
      * DatagramChannel close while virtual thread blocked in adaptor receive.
      */
-    @Test
-    void testDatagramSocketAdaptorReceiveAsyncClose1() throws Exception {
-        testDatagramSocketAdaptorReceiveAsyncClose(0);
-    }
-
-    /**
-     * DatagramChannel close while virtual thread blocked in adaptor receive
-     * with timeout.
-     */
-    @Test
-    void testDatagramSocketAdaptorReceiveAsyncClose2() throws Exception {
-        testDatagramSocketAdaptorReceiveAsyncClose(60_1000);
-    }
-
-    private void testDatagramSocketAdaptorReceiveAsyncClose(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testDatagramSocketAdaptorReceiveAsyncClose(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (DatagramChannel dc = DatagramChannel.open()) {
                 InetAddress lh = InetAddress.getLoopbackAddress();
@@ -621,21 +578,9 @@ class BlockingChannelOps {
     /**
      * Virtual thread interrupted while blocked in DatagramSocket adaptor receive.
      */
-    @Test
-    void testDatagramSocketAdaptorReceiveInterrupt1() throws Exception {
-        testDatagramSocketAdaptorReceiveInterrupt(0);
-    }
-
-    /**
-     * Virtual thread interrupted while blocked in DatagramSocket adaptor receive
-     * with timeout.
-     */
-    @Test
-    void testDatagramSocketAdaptorReceiveInterrupt2() throws Exception {
-        testDatagramSocketAdaptorReceiveInterrupt(60_1000);
-    }
-
-    private void testDatagramSocketAdaptorReceiveInterrupt(int timeout) throws Exception {
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 60_000 })
+    void testDatagramSocketAdaptorReceiveInterrupt(int timeout) throws Exception {
         VThreadRunner.run(() -> {
             try (DatagramChannel dc = DatagramChannel.open()) {
                 InetAddress lh = InetAddress.getLoopbackAddress();

From 135661b4389663b8c2e348d9e61e72cc628636bb Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 3 Dec 2025 13:36:55 +0000
Subject: [PATCH 472/512] 8372179: Remove Unused
 ConcurrentHashTable::MultiGetHandle

Reviewed-by: dholmes, iwalulya
---
 .../share/utilities/concurrentHashTable.hpp     | 15 +--------------
 .../utilities/concurrentHashTable.inline.hpp    |  8 --------
 .../utilities/test_concurrentHashtable.cpp      | 17 ++---------------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/hotspot/share/utilities/concurrentHashTable.hpp b/src/hotspot/share/utilities/concurrentHashTable.hpp
index 48166b22126..a837a56a19a 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.hpp
@@ -451,8 +451,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
 
   // All callbacks for get are under critical sections. Other callbacks may be
   // under critical section or may have locked parts of table. Calling any
-  // methods on the table during a callback is not supported.Only MultiGetHandle
-  // supports multiple gets.
+  // methods on the table during a callback is not supported.
 
   // Get methods return true on found item with LOOKUP_FUNC and FOUND_FUNC is
   // called.
@@ -538,18 +537,6 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   // Must be done at a safepoint.
   void rehash_nodes_to(Thread* thread, ConcurrentHashTable<CONFIG, MT>* to_cht);
 
-  // Scoped multi getter.
-  class MultiGetHandle : private ScopedCS {
-   public:
-    MultiGetHandle(Thread* thread, ConcurrentHashTable<CONFIG, MT>* cht)
-      : ScopedCS(thread, cht) {}
-    // In the MultiGetHandle scope you can lookup items matching LOOKUP_FUNC.
-    // The VALUEs are safe as long as you never save the VALUEs outside the
-    // scope, e.g. after ~MultiGetHandle().
-    template <typename LOOKUP_FUNC>
-    VALUE* get(LOOKUP_FUNC& lookup_f, bool* grow_hint = nullptr);
-  };
-
  private:
   class BucketsOperation;
 
diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
index 908405d3617..eeaff0167b2 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
@@ -233,14 +233,6 @@ inline ConcurrentHashTable<CONFIG, MT>::
   GlobalCounter::critical_section_end(_thread, _cs_context);
 }
 
-template <typename CONFIG, MemTag MT>
-template <typename LOOKUP_FUNC>
-inline typename CONFIG::Value* ConcurrentHashTable<CONFIG, MT>::
-  MultiGetHandle::get(LOOKUP_FUNC& lookup_f, bool* grow_hint)
-{
-  return ScopedCS::_cht->internal_get(ScopedCS::_thread, lookup_f, grow_hint);
-}
-
 // HaveDeletables
 template <typename CONFIG, MemTag MT>
 template <typename EVALUATE_FUNC>
diff --git a/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp b/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
index 927b5ff3d42..775f0e17409 100644
--- a/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
+++ b/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
@@ -97,7 +97,6 @@ struct Config : public AllStatic {
 };
 
 typedef ConcurrentHashTable<Pointer, mtInternal> SimpleTestTable;
-typedef ConcurrentHashTable<Pointer, mtInternal>::MultiGetHandle SimpleTestGetHandle;
 typedef ConcurrentHashTable<Config, mtInternal> CustomTestTable;
 
 struct SimpleTestLookup {
@@ -345,10 +344,6 @@ static void cht_scope(Thread* thr) {
   SimpleTestLookup stl(val);
   SimpleTestTable* cht = new SimpleTestTable();
   EXPECT_TRUE(cht->insert(thr, stl, val)) << "Insert unique value failed.";
-  {
-    SimpleTestGetHandle get_handle(thr, cht);
-    EXPECT_EQ(*get_handle.get(stl), val) << "Getting a pre-existing value failed.";
-  }
   // We do remove here to make sure the value-handle 'unlocked' the table when leaving the scope.
   EXPECT_TRUE(cht->remove(thr, stl)) << "Removing a pre-existing value failed.";
   EXPECT_FALSE(cht_get_copy(cht, thr, stl) == val) << "Got a removed value.";
@@ -556,7 +551,6 @@ public:
 };
 
 typedef ConcurrentHashTable<TestInterface, mtInternal> TestTable;
-typedef ConcurrentHashTable<TestInterface, mtInternal>::MultiGetHandle TestGetHandle;
 
 struct TestLookup {
   uintptr_t _val;
@@ -788,15 +782,8 @@ public:
   bool test_loop() {
     for (uintptr_t v = 0x1; v < 0xFFF; v++ ) {
       uintptr_t tv;
-      if (v & 0x1) {
-        TestLookup tl(v);
-        tv = cht_get_copy(_cht, this, tl);
-      } else {
-        TestLookup tl(v);
-        TestGetHandle value_handle(this, _cht);
-        uintptr_t* tmp = value_handle.get(tl);
-        tv = tmp != nullptr ? *tmp : 0;
-      }
+      TestLookup tl(v);
+      tv = cht_get_copy(_cht, this, tl);
       EXPECT_TRUE(tv == 0 || tv == v) << "Got unknown value.";
     }
     return true;

From c0636734bdf19de6ba41c127aef1f090010c6d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Wed, 3 Dec 2025 14:34:05 +0000
Subject: [PATCH 473/512] 8372993: Serial: max_eden_size is too small after
 JDK-8368740

Reviewed-by: ayang, aboldtch, stefank
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp   |  5 ++++-
 .../jtreg/gc/arguments/TestNewSizeFlags.java       | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 0b2ba44c780..9ccc7b95529 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -236,7 +236,10 @@ DefNewGeneration::DefNewGeneration(ReservedSpace rs,
   // These values are exported as performance counters.
   uintx size = _virtual_space.reserved_size();
   _max_survivor_size = compute_survivor_size(size, SpaceAlignment);
-  _max_eden_size = size - (2*_max_survivor_size);
+
+  // Eden might grow to be almost as large as the entire young generation.
+  // We approximate this as the entire virtual space.
+  _max_eden_size = size;
 
   // allocate the performance counters
 
diff --git a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
index 2f454940863..f65f211b812 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
@@ -286,6 +286,20 @@ public class TestNewSizeFlags {
             if (YOUNG_GC_TYPE == GCTypes.YoungGCType.G1) {
                 return new MemoryUsage(edenUsageInit + survivorUsageInit, 0,
                         edenUsageCommited + survivorUsageCommited, Long.MAX_VALUE);
+            } else if (YOUNG_GC_TYPE == GCTypes.YoungGCType.DefNew) {
+                // Eden might grow to be almost the entire young generation,
+                // so it is approximated as the size for the entire young
+                // generation.
+                long youngGenUsageMax = edenUsage.getMax();
+
+                long combinedSurvivorUsageMax = 2 * survivorUsage.getMax();
+                if (combinedSurvivorUsageMax > youngGenUsageMax) {
+                  throw new RuntimeException("Unexpectedly large survivorUsage combined maximum value: " + combinedSurvivorUsageMax);
+                }
+
+                return new MemoryUsage(edenUsageInit + survivorUsageInit * 2, 0,
+                        edenUsageCommited + survivorUsageCommited * 2,
+                        youngGenUsageMax);
             } else {
                 return new MemoryUsage(edenUsageInit + survivorUsageInit * 2, 0,
                         edenUsageCommited + survivorUsageCommited * 2,

From 44e2d499f84458003aa73a149d1ae44735b71d91 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 3 Dec 2025 14:38:32 +0000
Subject: [PATCH 474/512] 8372705: The riscv-64 cross-compilation build is
 failing in the CI

Reviewed-by: dholmes, shade
---
 make/autoconf/flags-ldflags.m4 | 16 +++++++++-------
 make/autoconf/toolchain.m4     |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 18ec04d92b7..b0dc565b39f 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -34,7 +34,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain
-  FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+  FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
 
   AC_SUBST(ADLC_LDFLAGS)
 ])
@@ -52,11 +52,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # add --no-as-needed to disable default --as-needed link flag on some GCC toolchains
     # add --icf=all (Identical Code Folding — merges identical functions)
     BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
-    if test "x$LINKER_TYPE" = "xgold"; then
-      if test x$DEBUG_LEVEL = xrelease; then
-        BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--icf=all"
-      fi
-    fi
 
     # Linux : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
@@ -169,7 +164,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 ################################################################################
 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
 #      conditionals against.
-# $2 - Optional prefix for each variable defined.
+# $2 - Optional prefix for each variable defined (OPENJDK_BUILD_ or nothing).
+# $3 - Optional prefix for toolchain variables (BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
 [
   # Setup CPU-dependent basic LDFLAGS. These can differ between the target and
@@ -203,6 +199,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
     fi
   fi
 
+  if test "x${$3LD_TYPE}" = "xgold"; then
+    if test x$DEBUG_LEVEL = xrelease; then
+      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--icf=all"
+    fi
+  fi
+
   # Export variables according to old definitions, prefix with $2 if present.
   LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
       $OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 15210efe4a7..c882deb10a7 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -516,7 +516,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     if [ [[ "$LINKER_VERSION_STRING" == *gold* ]] ]; then
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*) .*/\1/'` ]
-      LINKER_TYPE=gold
+      $1_TYPE=gold
     else
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]

From 87c4b01ea3d94c25d260f0687addf7ecd154279a Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 3 Dec 2025 14:38:53 +0000
Subject: [PATCH 475/512] 8372943: Restore --with-tools-dir

Reviewed-by: mikael, tbell, shade
---
 make/autoconf/basic.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 316bfc5037d..bb6908d9194 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -353,7 +353,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
       [set up toolchain on Mac OS using a path to an Xcode installation])])
 
   UTIL_DEPRECATED_ARG_WITH(sys-root)
-  UTIL_DEPRECATED_ARG_WITH(tools-dir)
+
+  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
+      [Point to a nonstandard Visual Studio installation location on Windows by
+      specifying any existing directory 2 or 3 levels below the installation
+      root.])]
+  )
 
   if test "x$with_xcode_path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then

From 829b85813a3810eeecf6ce4b30b5c3d1fc34ad23 Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Wed, 3 Dec 2025 14:53:35 +0000
Subject: [PATCH 476/512] 8372703: Test
 compiler/arguments/TestCodeEntryAlignment.java failed: assert(allocates2(pc))
 failed: not in CodeBuffer memory

Reviewed-by: mhaessig, dfenacci, thartmann
---
 src/hotspot/cpu/x86/stubDeclarations_x86.hpp | 2 +-
 test/hotspot/jtreg/ProblemList.txt           | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/x86/stubDeclarations_x86.hpp b/src/hotspot/cpu/x86/stubDeclarations_x86.hpp
index 3e0e1d5bf07..971c8fd3c44 100644
--- a/src/hotspot/cpu/x86/stubDeclarations_x86.hpp
+++ b/src/hotspot/cpu/x86/stubDeclarations_x86.hpp
@@ -73,7 +73,7 @@
                                        do_arch_blob,                    \
                                        do_arch_entry,                   \
                                        do_arch_entry_init)              \
-  do_arch_blob(compiler, 109000 WINDOWS_ONLY(+2000))                    \
+  do_arch_blob(compiler, 120000 WINDOWS_ONLY(+2000))                    \
   do_stub(compiler, vector_float_sign_mask)                             \
   do_arch_entry(x86, compiler, vector_float_sign_mask,                  \
                 vector_float_sign_mask, vector_float_sign_mask)         \
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index f379f57a8e5..177c14da785 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -78,8 +78,6 @@ compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64
 
 serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java 8369150 generic-all
 
-compiler/arguments/TestCodeEntryAlignment.java 8372703 generic-x64
-
 #############################################################################
 
 # :hotspot_gc

From 1d753f116135cffa3ec9e8b4af3922aa647317dc Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Wed, 3 Dec 2025 15:14:57 +0000
Subject: [PATCH 477/512] 8373010: Update starting-next-release.html after
 JDK-8372940

Reviewed-by: jpai, erikj
---
 doc/starting-next-release.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/starting-next-release.html b/doc/starting-next-release.html
index 6cffdf38b0f..bbb48e243ad 100644
--- a/doc/starting-next-release.html
+++ b/doc/starting-next-release.html
@@ -119,6 +119,9 @@ cover the new source version</li>
 and
 <code>test/langtools/tools/javac/preview/classReaderTest/Client.preview.out</code>:
 update expected messages for preview errors and warnings</li>
+<li><code>test/langtools/tools/javac/versions/Versions.java</code>: add
+new source version to the set of valid sources and add new enum constant
+for the new class file version.</li>
 </ul>
 </body>
 </html>

From 3d54a802e38f425c7035c947758c887fec48e43a Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Wed, 3 Dec 2025 15:21:11 +0000
Subject: [PATCH 478/512] 8372995: SerialGC: Allow
 SerialHeap::allocate_loaded_archive_space expand old_gen

Reviewed-by: ayang, jsikstro
---
 src/hotspot/share/gc/serial/serialHeap.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index faef3b89125..932c06b8109 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -147,7 +147,8 @@ GrowableArray<MemoryPool*> SerialHeap::memory_pools() {
 
 HeapWord* SerialHeap::allocate_loaded_archive_space(size_t word_size) {
   MutexLocker ml(Heap_lock);
-  return old_gen()->allocate(word_size);
+  HeapWord* const addr = old_gen()->allocate(word_size);
+  return addr != nullptr ? addr : old_gen()->expand_and_allocate(word_size);
 }
 
 void SerialHeap::complete_loaded_archive_space(MemRegion archive_space) {

From 6d5bf9c801bbec3cd3580f889cc92415021f7322 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 3 Dec 2025 15:30:14 +0000
Subject: [PATCH 479/512] 8372999: Parallel: Old generation min size constraint
 broken

Reviewed-by: stefank, jsikstro
---
 .../share/gc/parallel/parallelScavengeHeap.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 4d291120e4a..9df3deedf89 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -891,9 +891,23 @@ void ParallelScavengeHeap::resize_after_young_gc(bool is_survivor_overflowing) {
 
   // Consider if should shrink old-gen
   if (!is_survivor_overflowing) {
-    // Upper bound for a single step shrink
-    size_t max_shrink_bytes = SpaceAlignment;
+    assert(old_gen()->capacity_in_bytes() >= old_gen()->min_gen_size(), "inv");
+
+    // Old gen min_gen_size constraint.
+    const size_t max_shrink_bytes_gen_size_constraint = old_gen()->capacity_in_bytes() - old_gen()->min_gen_size();
+
+    // Per-step delta to avoid too aggressive shrinking.
+    const size_t max_shrink_bytes_per_step_constraint = SpaceAlignment;
+
+    // Combining the above two constraints.
+    const size_t max_shrink_bytes = MIN2(max_shrink_bytes_gen_size_constraint,
+                                         max_shrink_bytes_per_step_constraint);
+
     size_t shrink_bytes = _size_policy->compute_old_gen_shrink_bytes(old_gen()->free_in_bytes(), max_shrink_bytes);
+
+    assert(old_gen()->capacity_in_bytes() >= shrink_bytes, "inv");
+    assert(old_gen()->capacity_in_bytes() - shrink_bytes >= old_gen()->min_gen_size(), "inv");
+
     if (shrink_bytes != 0) {
       if (MinHeapFreeRatio != 0) {
         size_t new_capacity = old_gen()->capacity_in_bytes() - shrink_bytes;

From af8977e40661db2edec069d524f7c9352c7de850 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Wed, 3 Dec 2025 15:32:46 +0000
Subject: [PATCH 480/512] 8372951: The property
 jdk.httpclient.quic.maxBidiStreams should be renamed to jdk.internal 8365794:
 StreamLimitTest vs H3StreamLimitReachedTest: consider renaming or merging

Reviewed-by: jpai
---
 .../net/http/quic/QuicConnectionImpl.java     | 14 ++++++-
 .../H3MultipleConnectionsToSameHost.java      | 10 ++---
 .../http3/H3StreamLimitReachedTest.java       | 42 +++++++++++++++++--
 .../net/httpclient/http3/StreamLimitTest.java |  5 ++-
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index 240f90852bc..c07df1c6eb2 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -174,17 +174,29 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
     public static final int SMALLEST_MAXIMUM_DATAGRAM_SIZE =
             QuicClient.SMALLEST_MAXIMUM_DATAGRAM_SIZE;
 
+    // The default value for the Quic maxInitialTimeout, in seconds. Will be clamped to [1, Integer.MAX_vALUE]
     public static final int DEFAULT_MAX_INITIAL_TIMEOUT = Math.clamp(
             Utils.getIntegerProperty("jdk.httpclient.quic.maxInitialTimeout", 30),
             1, Integer.MAX_VALUE);
+    // The default value for the initial_max_data transport parameter that a QuicConnectionImpl
+    // will send to its peer, if no value is provided by the higher level protocol.
     public static final long DEFAULT_INITIAL_MAX_DATA = Math.clamp(
             Utils.getLongProperty("jdk.httpclient.quic.maxInitialData", 15 << 20),
             0, 1L << 60);
+    // The default value for the initial_max_stream_data_bidi_local, initial_max_stream_data_bidi_remote,
+    // and initial_max_stream_data_uni transport parameters that a QuicConnectionImpl
+    // will send to its peer, if no value is provided by the higher level protocol.
     public static final long DEFAULT_INITIAL_STREAM_MAX_DATA = Math.clamp(
             Utils.getIntegerProperty("jdk.httpclient.quic.maxStreamInitialData", 6 << 20),
             0, 1L << 60);
+    // The default value for the initial_max_streams_bidi transport parameter that a QuicConnectionImpl
+    // will send to its peer, if no value is provided by the higher level protocol.
+    // The Http3ClientImpl typically provides a value of 0, so this property has no effect
+    // on QuicConnectionImpl instances created on behalf of the HTTP/3 client
     public static final int DEFAULT_MAX_BIDI_STREAMS =
-            Utils.getIntegerProperty("jdk.httpclient.quic.maxBidiStreams", 100);
+            Utils.getIntegerProperty("jdk.internal.httpclient.quic.maxBidiStreams", 100);
+    // The default value for the initial_max_streams_uni transport parameter that a QuicConnectionImpl
+    // will send to its peer, if no value is provided by the higher level protocol.
     public static final int DEFAULT_MAX_UNI_STREAMS =
             Utils.getIntegerProperty("jdk.httpclient.quic.maxUniStreams", 100);
     public static final boolean USE_DIRECT_BUFFER_POOL = Utils.getBooleanProperty(
diff --git a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
index 862ccf22ddc..2e4047cf5ea 100644
--- a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
+++ b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
@@ -37,7 +37,7 @@
  *                     -Djdk.internal.httpclient.quic.poller.usePlatformThreads=false
  *                     -Djdk.httpclient.quic.maxEndpoints=-1
  *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
- *                     -Djdk.httpclient.quic.maxBidiStreams=2
+ *                     -Djdk.internal.httpclient.quic.maxBidiStreams=2
  *                     -Djdk.httpclient.retryOnStreamlimit=50
  *                     -Djdk.httpclient.HttpClient.log=errors,http3,quic:retransmit
  *                     -Dsimpleget.requests=100
@@ -61,7 +61,7 @@
  *                     -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations
  *                     -Djdk.httpclient.quic.maxEndpoints=-1
  *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
- *                     -Djdk.httpclient.quic.maxBidiStreams=2
+ *                     -Djdk.internal.httpclient.quic.maxBidiStreams=2
  *                     -Djdk.httpclient.retryOnStreamlimit=50
  *                     -Djdk.httpclient.HttpClient.log=errors,http3,quic:retransmit
  *                     -Dsimpleget.requests=100
@@ -85,7 +85,7 @@
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
  *                     -Djdk.httpclient.quic.maxEndpoints=1
- *                     -Djdk.httpclient.quic.maxBidiStreams=2
+ *                     -Djdk.internal.httpclient.quic.maxBidiStreams=2
  *                     -Djdk.httpclient.retryOnStreamlimit=50
  *                     -Djdk.httpclient.HttpClient.log=errors,http3,quic:hs:retransmit
  *                     -Dsimpleget.requests=100
@@ -109,7 +109,7 @@
  *                     -Djdk.httpclient.quic.maxPtoBackoff=9
  *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
  *                     -Djdk.httpclient.quic.maxEndpoints=1
- *                     -Djdk.httpclient.quic.maxBidiStreams=2
+ *                     -Djdk.internal.httpclient.quic.maxBidiStreams=2
  *                     -Djdk.httpclient.retryOnStreamlimit=50
  *                     -Djdk.httpclient.HttpClient.log=errors,http3,quic:hs:retransmit
  *                     -Dsimpleget.requests=100
@@ -239,7 +239,7 @@ public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
             long done = System.nanoTime();
             System.out.println("Initialization and warmup took "+ TimeUnit.NANOSECONDS.toMillis(done-prestart)+" millis");
             // Thread.sleep(30000);
-            int maxBidiStreams = Utils.getIntegerNetProperty("jdk.httpclient.quic.maxBidiStreams", 100);
+            int maxBidiStreams = Utils.getIntegerNetProperty("jdk.internal.httpclient.quic.maxBidiStreams", 100);
             long timeout = MAX_STREAM_LIMIT_WAIT_TIMEOUT;
 
             Set<String> connections = new ConcurrentSkipListSet<>();
diff --git a/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java b/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
index 916a6a5221d..0de80c6d587 100644
--- a/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
@@ -23,6 +23,24 @@
 
 /*
  * @test id=with-default-wait
+ * @summary this test verifies that the correct connection is
+ *          used when a request is retried on a new connection
+ *          due to stream limit reached.
+ *          The maxBidiStreams limit is artificially set to 1.
+ *          This configuration uses the default wait for a stream
+ *          to become available before retrying.
+ *          Different configurations are tested if possible,
+ *          with both HTTP/3 only and HTTP/2 HTTP/3 with altsvc.
+ *          In one case the HTTP/3 only server will be listening
+ *          on the same port as the HTTP/2 server, with the
+ *          HTTP/2 server advertising an AltService on a different
+ *          port. In another case the AltService will be on the
+ *          same port as the HTTP/2 server and the HTTP/3 server
+ *          will be on a different port. In all case, the test
+ *          verifies that the right connection is picked up
+ *          for the retry.
+ * @bug 8372951
+ * @comment this test also tests bug 8372951
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.test.lib.Asserts
@@ -30,12 +48,30 @@
  *        jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:control
  *                     -Djdk.internal.httpclient.debug=false
- *                     -Djdk.httpclient.quic.maxBidiStreams=1
+ *                     -Djdk.internal.httpclient.quic.maxBidiStreams=1
  *                     H3StreamLimitReachedTest
  */
 
 /*
  * @test id=with-no-wait
+ * @summary this test verifies that the correct connection is
+ *          used when a request is retried on a new connection
+ *          due to stream limit reached.
+ *          The maxBidiStreams limit is artificially set to 1.
+ *          This configuration retries immediately on a new
+ *          connection when no stream is available.
+ *          Different configurations are tested if possible,
+ *          with both HTTP/3 only and HTTP/2 HTTP/3 with altsvc.
+ *          In one case the HTTP/3 only server will be listening
+ *          on the same port as the HTTP/2 server, with the
+ *          HTTP/2 server advertising an AltService on a different
+ *          port. In another case the AltService will be on the
+ *          same port as the HTTP/2 server and the HTTP/3 server
+ *          will be on a different port. In all case, the test
+ *          verifies that the right connection is picked up
+ *          for the retry.
+ * @bug 8372951
+ * @comment this test also tests bug 8372951
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.test.lib.Asserts
@@ -43,7 +79,7 @@
  *        jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:control
  *                     -Djdk.internal.httpclient.debug=false
- *                     -Djdk.httpclient.quic.maxBidiStreams=1
+ *                     -Djdk.internal.httpclient.quic.maxBidiStreams=1
  *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
  *                     -Djdk.httpclient.retryOnStreamlimit=9
  *                     H3StreamLimitReachedTest
@@ -93,7 +129,7 @@ import static org.testng.Assert.assertFalse;
 
 public class H3StreamLimitReachedTest implements HttpServerAdapters {
 
-    private static final String CLASS_NAME = H3ConnectionPoolTest.class.getSimpleName();
+    private static final String CLASS_NAME = H3StreamLimitReachedTest.class.getSimpleName();
 
     static int altsvcPort, https2Port, http3Port;
     static Http3TestServer http3OnlyServer;
diff --git a/test/jdk/java/net/httpclient/http3/StreamLimitTest.java b/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
index d8a920c8544..105417950a1 100644
--- a/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
@@ -56,7 +56,10 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 /*
  * @test
  * @summary verifies that when the Quic stream limit is reached
- *          then HTTP3 requests are retried on newer connection
+ *          then HTTP3 requests are retried on newer connection.
+ *          This test uses an HTTP/3 only test server, which is
+ *          configured to allow the test to control when a new
+ *          MAX_STREAMS frames is sent to the client.
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters

From c4321503976840f6630567c4fa430cd1ffca41fb Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 3 Dec 2025 16:37:10 +0000
Subject: [PATCH 481/512] 8372809: Test
 vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java
 failed: JVMTI_ERROR_THREAD_NOT_ALIVE

Reviewed-by: amenkov, sspitsyn
---
 .../share/native/libjdwp/threadControl.c      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index 491182a583f..39407133889 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -157,11 +157,20 @@ setThreadLocalStorage(jthread thread, ThreadNode *node)
 
     error = JVMTI_FUNC_PTR(gdata->jvmti,SetThreadLocalStorage)
             (gdata->jvmti, thread, (void*)node);
-    if ( error == JVMTI_ERROR_THREAD_NOT_ALIVE && node == NULL) {
-        /* Just return. This can happen when clearing the TLS. */
-        return;
-    } else if ( error != JVMTI_ERROR_NONE ) {
-        /* The jthread object must be valid, so this must be a fatal error */
+    if (error == JVMTI_ERROR_THREAD_NOT_ALIVE) {
+        if (node == NULL) {
+            // Just return. This can happen when clearing the TLS.
+            return;
+        }
+        if (isVThread(thread)) {
+            // Just return. This can happen with a vthread that is running and we
+            // had to create a ThreadNode for it. By the time we get here, it may
+            // have already terminated.
+            return;
+        }
+    }
+    if (error != JVMTI_ERROR_NONE) {
+        // The jthread object must be valid, so this must be a fatal error.
         EXIT_ERROR(error, "cannot set thread local storage");
     }
 }
@@ -251,9 +260,10 @@ findThread(ThreadList *list, jthread thread)
          * Otherwise the thread should not be on the runningThreads.
          */
         if ( !gdata->jvmtiCallBacksCleared ) {
-            /* The thread better not be on either list if the TLS lookup failed. */
+            // The thread better not be on the runningThreads list if the TLS lookup failed.
+            // It might be on the runningVThreads list because of how ThreadNodes for vthreads
+            // can be recreated just before terminating, so we don't check runningVThreads.
             JDI_ASSERT(!nonTlsSearch(getEnv(), &runningThreads, thread));
-            JDI_ASSERT(!nonTlsSearch(getEnv(), &runningVThreads, thread));
         } else {
             /*
              * Search the runningThreads and runningVThreads lists. The TLS lookup may have

From 0bcef61a6de027c1b7e481e2115016ee961707a5 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 3 Dec 2025 17:15:37 +0000
Subject: [PATCH 482/512] 8372957: After JDK-8282441 JDWP might allow some
 invalid FrameIDs to be used

Reviewed-by: amenkov, sspitsyn
---
 src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index 39407133889..734dd5eb7dc 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -70,6 +70,7 @@ typedef struct ThreadNode {
     unsigned int popFrameEvent : 1;
     unsigned int popFrameProceed : 1;
     unsigned int popFrameThread : 1;
+    unsigned int frameGeneration_accessed:1; /* true if frameGeneration accessed to produce a FrameID */
     EventIndex current_ei; /* Used to determine if we are currently handling an event on this thread. */
     jobject pendingStop;   /* Object we are throwing to stop the thread (ThreadReferenceImpl.stop). */
     jint suspendCount;     /* Number of outstanding suspends from the debugger. */
@@ -616,6 +617,7 @@ freeUnusedVThreadNode(JNIEnv *env, ThreadNode* node)
         !node->popFrameEvent &&
         !node->popFrameProceed &&
         !node->popFrameThread &&
+        !node->frameGeneration_accessed &&
         node->pendingStop == NULL)
     {
         removeNode(node);
@@ -2683,6 +2685,7 @@ threadControl_getFrameGeneration(jthread thread)
 
         if (node != NULL) {
             frameGeneration = node->frameGeneration;
+            node->frameGeneration_accessed = JNI_TRUE;
         }
     }
     debugMonitorExit(threadLock);

From fa6ca0bbd14436cd3778a7a3383183cd73688123 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 3 Dec 2025 17:25:05 +0000
Subject: [PATCH 483/512] 8362428: Update IANA Language Subtag Registry to
 Version 2025-08-25

Reviewed-by: lancea, naoto, iris
---
 .../data/lsrdata/language-subtag-registry.txt | 61 +++++++++++++++++--
 .../Locale/LanguageSubtagRegistryTest.java    |  4 +-
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/data/lsrdata/language-subtag-registry.txt b/src/java.base/share/data/lsrdata/language-subtag-registry.txt
index 64c40f28162..82618f9b40e 100644
--- a/src/java.base/share/data/lsrdata/language-subtag-registry.txt
+++ b/src/java.base/share/data/lsrdata/language-subtag-registry.txt
@@ -1,4 +1,4 @@
-File-Date: 2025-05-15
+File-Date: 2025-08-25
 %%
 Type: language
 Subtag: aa
@@ -3102,6 +3102,7 @@ Added: 2009-07-29
 Type: language
 Subtag: asb
 Description: Assiniboine
+Description: Nakoda Assiniboine
 Added: 2009-07-29
 %%
 Type: language
@@ -3269,6 +3270,7 @@ Added: 2009-07-29
 Type: language
 Subtag: atj
 Description: Atikamekw
+Description: Nehirowimowin
 Added: 2009-07-29
 %%
 Type: language
@@ -7981,6 +7983,7 @@ Added: 2009-07-29
 Type: language
 Subtag: clc
 Description: Chilcotin
+Description: Tsilhqot’in
 Added: 2009-07-29
 %%
 Type: language
@@ -8021,6 +8024,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: clm
+Description: Klallam
 Description: Clallam
 Added: 2009-07-29
 %%
@@ -13509,7 +13513,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: haa
-Description: Han
+Description: Hän
 Added: 2009-07-29
 %%
 Type: language
@@ -19022,6 +19026,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kwk
+Description: Kwak'wala
 Description: Kwakiutl
 Added: 2009-07-29
 %%
@@ -22262,7 +22267,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: mhn
-Description: Mócheno
+Description: Mòcheno
 Added: 2009-07-29
 %%
 Type: language
@@ -31655,6 +31660,7 @@ Added: 2009-07-29
 Type: language
 Subtag: sec
 Description: Sechelt
+Description: She shashishalhem
 Added: 2009-07-29
 %%
 Type: language
@@ -32003,6 +32009,7 @@ Added: 2009-07-29
 Type: language
 Subtag: shs
 Description: Shuswap
+Description: Secwepemctsín
 Added: 2009-07-29
 %%
 Type: language
@@ -33014,6 +33021,7 @@ Added: 2009-07-29
 Type: language
 Subtag: squ
 Description: Squamish
+Description: Sḵwx̱wú7mesh sníchim
 Added: 2009-07-29
 %%
 Type: language
@@ -34664,6 +34672,8 @@ Added: 2009-07-29
 Type: language
 Subtag: thp
 Description: Thompson
+Description: Nłeʔkepmxcín
+Description: Thompson River Salish
 Added: 2009-07-29
 %%
 Type: language
@@ -34684,6 +34694,7 @@ Added: 2009-07-29
 Type: language
 Subtag: tht
 Description: Tahltan
+Description: Tāłtān
 Added: 2009-07-29
 %%
 Type: language
@@ -42419,7 +42430,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: zmp
-Description: Mpuono
+Description: Mbuun
 Added: 2009-07-29
 %%
 Type: language
@@ -47639,6 +47650,12 @@ Comments: Denotes conventions established by the Academia Brasileira de
   Letras in 1943 and generally used in Brazil until 2009
 %%
 Type: variant
+Subtag: akhmimic
+Description: Akhmimic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: akuapem
 Description: Akuapem Twi
 Added: 2017-06-05
@@ -47814,6 +47831,12 @@ Comments: Black American Sign Language (BASL) or Black Sign Variation
   (BSV) is a dialect of American Sign Language (ASL)
 %%
 Type: variant
+Subtag: bohairic
+Description: Bohairic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: bohoric
 Description: Slovene in Bohorič alphabet
 Added: 2012-06-27
@@ -47898,6 +47921,12 @@ Comments: Represents the standard written form of Ladin in Fascia which
   unified the three subvarieties Cazet, Brach and Moenat
 %%
 Type: variant
+Subtag: fayyumic
+Description: Fayyumic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: fodom
 Description: Fodom standard of Ladin
 Added: 2024-03-04
@@ -48167,6 +48196,12 @@ Comments: Russian orthography as established by the 1917/1918
   orthographic reforms
 %%
 Type: variant
+Subtag: lycopol
+Description: Lycopolitan alias Subakhmimic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: mdcegyp
 Description: Ancient Egyptian hieroglyphs encoded in Manuel de Codage
 Added: 2025-02-06
@@ -48180,6 +48215,12 @@ Added: 2025-02-06
 Prefix: egy
 %%
 Type: variant
+Subtag: mesokem
+Description: Mesokemic alias Oxyrhynchite dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: metelko
 Description: Slovene in Metelko alphabet
 Added: 2012-06-27
@@ -48367,6 +48408,12 @@ Prefix: rm
 Comments: Supraregional Romansh written standard
 %%
 Type: variant
+Subtag: sahidic
+Description: Sahidic dialect of Coptic
+Added: 2025-07-14
+Prefix: cop
+%%
+Type: variant
 Subtag: saigon
 Description: The Sài Gòn variant of Vietnamese
 Added: 2025-03-10
@@ -48555,6 +48602,12 @@ Comments: The subtag represents the old orthography of the Latvian
   language used during c. 1600s–1920s.
 %%
 Type: variant
+Subtag: viennese
+Description: The Viennese dialect of German
+Added: 2025-06-22
+Prefix: de
+%%
+Type: variant
 Subtag: vivaraup
 Description: Vivaro-Alpine
 Added: 2018-04-22
diff --git a/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java b/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
index 12f5a96d3fb..07cc7a412b6 100644
--- a/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
+++ b/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
@@ -25,9 +25,9 @@
  * @test
  * @bug 8025703 8040211 8191404 8203872 8222980 8225435 8241082 8242010 8247432
  *      8258795 8267038 8287180 8302512 8304761 8306031 8308021 8313702 8318322
- *      8327631 8332424 8334418 8344589 8348328
+ *      8327631 8332424 8334418 8344589 8348328 8362428
  * @summary Checks the IANA language subtag registry data update
- *          (LSR Revision: 2025-05-15) with Locale and Locale.LanguageRange
+ *          (LSR Revision: 2025-08-25) with Locale and Locale.LanguageRange
  *          class methods.
  * @run main LanguageSubtagRegistryTest
  */

From 8d80778e05aee878f9a3e8beabe6a0cfd0a02c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Wed, 3 Dec 2025 18:02:06 +0000
Subject: [PATCH 484/512] 8373023: [REDO] Remove the default value of
 InitialRAMPercentage

Reviewed-by: stefank, sjohanss, aboldtch
---
 src/hotspot/share/gc/shared/gc_globals.hpp  |  2 +-
 src/hotspot/share/runtime/flags/jvmFlag.cpp |  2 +-
 src/java.base/share/man/java.md             |  3 +--
 test/hotspot/jtreg/ProblemList.txt          | 10 ++++++++++
 test/jdk/ProblemList.txt                    |  1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index e86a8744847..d08e95378f7 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -291,7 +291,7 @@
           "size on systems with small physical memory size")                \
           range(0.0, 100.0)                                                 \
                                                                             \
-  product(double, InitialRAMPercentage, 0.2,                                \
+  product(double, InitialRAMPercentage, 0.0,                                \
           "Percentage of real memory used for initial heap size")           \
           range(0.0, 100.0)                                                 \
                                                                             \
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 487528c49bd..51517fa49db 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -162,7 +162,7 @@ void JVMFlag::print_on(outputStream* st, bool withComments, bool printRanges) co
     //      uintx ThresholdTolerance                       = 10                                        {product} {default}
     //     size_t TLABSize                                 = 0                                         {product} {default}
     //      uintx SurvivorRatio                            = 8                                         {product} {default}
-    //     double InitialRAMPercentage                     = 1.562500                                  {product} {default}
+    //     double InitialRAMPercentage                     = 0.000000                                  {product} {default}
     //      ccstr CompileCommandFile                       = MyFile.cmd                                {product} {command line}
     //  ccstrlist CompileOnly                              = Method1
     //            CompileOnly                             += Method2                                   {product} {command line}
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 462baa5a4a0..8517e161e3f 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -2455,8 +2455,7 @@ Java HotSpot VM.
 `-XX:InitialRAMPercentage=`*percent*
 :   Sets the initial amount of memory that the JVM will use for the Java heap
     before applying ergonomics heuristics as a percentage of the maximum amount
-    determined as described in the `-XX:MaxRAM` option. The default value is
-    0.2 percent.
+    determined as described in the `-XX:MaxRAM` option.
 
     The following example shows how to set the percentage of the initial
     amount of memory used for the Java heap:
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 177c14da785..6c3d907961d 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -94,6 +94,7 @@ gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
 gc/shenandoah/TestRetainObjects.java#no-tlab 8361099 generic-all
 gc/shenandoah/TestSieveObjects.java#no-tlab 8361099 generic-all
 gc/shenandoah/TestSieveObjects.java#no-tlab-genshen 8361099 generic-all
+gc/cslocker/TestCSLocker.java 8373025 generic-all
 
 #############################################################################
 
@@ -139,6 +140,9 @@ serviceability/sa/ClhsdbPstack.java#core          8318754 macosx-aarch64
 serviceability/sa/TestJmapCore.java               8318754 macosx-aarch64
 serviceability/sa/TestJmapCoreMetaspace.java      8318754 macosx-aarch64
 
+serviceability/sa/ClhsdbScanOops.java#parallel    8373022 generic-all
+serviceability/sa/ClhsdbScanOops.java#serial      8373022 generic-all
+
 serviceability/sa/ClhsdbThreadContext.java        8356704 windows-x64
 
 serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java 8315980 linux-all,windows-x64
@@ -183,3 +187,9 @@ vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEa
 vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi005/TestDescription.java 8076494 windows-x64
 
 vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find006/TestDescription.java 8310144 macosx-aarch64
+
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java 8373022 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded002/TestDescription.java 8373022 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded003/TestDescription.java 8373022 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded004/TestDescription.java 8373022 generic-all
+vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded005/TestDescription.java 8373022 generic-all
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 1d547faf662..72a248408ac 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -715,6 +715,7 @@ javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all
 # jdk_jdi
 
 com/sun/jdi/InvokeHangTest.java                                 8218463 linux-all
+com/sun/jdi/MethodInvokeWithTraceOnTest.java                    8373022 generic-all
 
 ############################################################################
 

From e93b10d08456f720e303771a882e79660911e1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 3 Dec 2025 18:12:58 +0000
Subject: [PATCH 485/512] 8365400: Enhance JFR to emit file and module metadata
 for class loading

Reviewed-by: coleenp, egahlin
---
 .../share/cds/lambdaProxyClassDictionary.cpp  |   6 +-
 .../share/classfile/classFileParser.cpp       |   5 -
 .../share/classfile/classFileParser.hpp       |   2 +
 src/hotspot/share/classfile/klassFactory.cpp  |   7 +-
 .../share/classfile/systemDictionary.cpp      |  51 ++-
 .../share/classfile/systemDictionary.hpp      |   6 +-
 src/hotspot/share/classfile/vmClasses.cpp     |   7 +
 .../jfrEventClassTransformer.cpp              |   2 +-
 src/hotspot/share/jfr/jfr.cpp                 |  18 +-
 src/hotspot/share/jfr/jfr.hpp                 |   2 +
 src/hotspot/share/jfr/metadata/metadata.xml   |   1 +
 .../recorder/checkpoint/types/jfrTypeSet.cpp  |   5 +-
 .../checkpoint/types/jfrTypeSetUtils.cpp      |  49 +--
 .../checkpoint/types/jfrTypeSetUtils.hpp      |  18 +-
 .../types/jfrTypeSetUtils.inline.hpp          |  42 ++
 .../checkpoint/types/traceid/jfrTraceId.cpp   |   1 +
 .../share/jfr/recorder/jfrRecorder.cpp        |   9 +
 .../share/jfr/recorder/jfrRecorder.hpp        |   1 +
 .../recorder/service/jfrRecorderService.cpp   |   3 +
 .../share/jfr/support/jfrClassDefineEvent.cpp | 188 ++++++++
 .../share/jfr/support/jfrClassDefineEvent.hpp |  40 ++
 .../share/jfr/support/jfrKlassExtension.hpp   |   1 -
 .../share/jfr/support/jfrSymbolTable.cpp      | 406 +++++++++++-------
 .../share/jfr/support/jfrSymbolTable.hpp      | 179 ++++----
 .../jfr/support/jfrSymbolTable.inline.hpp     |  72 ++++
 .../share/jfr/support/jfrTraceIdExtension.hpp |   1 -
 .../jfr/utilities/jfrConcurrentHashtable.hpp  | 139 ++++++
 .../jfrConcurrentHashtable.inline.hpp         | 254 +++++++++++
 .../share/jfr/utilities/jfrLinkedList.hpp     |   5 +-
 .../jfr/utilities/jfrLinkedList.inline.hpp    |  36 +-
 src/hotspot/share/oops/klass.cpp              |   8 +-
 .../classes/jdk/jfr/internal/query/view.ini   |   9 +
 .../event/runtime/TestClassDefineEvent.java   |   2 +
 33 files changed, 1224 insertions(+), 351 deletions(-)
 create mode 100644 src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.inline.hpp
 create mode 100644 src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
 create mode 100644 src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp
 create mode 100644 src/hotspot/share/jfr/support/jfrSymbolTable.inline.hpp
 create mode 100644 src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.hpp
 create mode 100644 src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.inline.hpp

diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index f6da1a34af3..d091067c116 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -357,7 +357,7 @@ InstanceKlass* LambdaProxyClassDictionary::load_and_init_lambda_proxy_class(Inst
   InstanceKlass* nest_host = caller_ik->nest_host(THREAD);
   assert(nest_host == shared_nest_host, "mismatched nest host");
 
-  EventClassLoad class_load_start_event;
+  EventClassLoad class_load_event;
 
   // Add to class hierarchy, and do possible deoptimizations.
   lambda_ik->add_to_hierarchy(THREAD);
@@ -368,8 +368,8 @@ InstanceKlass* LambdaProxyClassDictionary::load_and_init_lambda_proxy_class(Inst
   if (JvmtiExport::should_post_class_load()) {
     JvmtiExport::post_class_load(THREAD, lambda_ik);
   }
-  if (class_load_start_event.should_commit()) {
-    SystemDictionary::post_class_load_event(&class_load_start_event, lambda_ik, ClassLoaderData::class_loader_data(class_loader()));
+  if (class_load_event.should_commit()) {
+    JFR_ONLY(SystemDictionary::post_class_load_event(&class_load_event, lambda_ik, ClassLoaderData::class_loader_data(class_loader()));)
   }
 
   lambda_ik->initialize(CHECK_NULL);
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 68890775051..312accb1df9 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -89,9 +89,6 @@
 #if INCLUDE_CDS
 #include "classfile/systemDictionaryShared.hpp"
 #endif
-#if INCLUDE_JFR
-#include "jfr/support/jfrTraceIdExtension.hpp"
-#endif
 
 // We generally try to create the oops directly when parsing, rather than
 // allocating temporary data structures and copying the bytes twice. A
@@ -5272,8 +5269,6 @@ void ClassFileParser::fill_instance_klass(InstanceKlass* ik,
     }
   }
 
-  JFR_ONLY(INIT_ID(ik);)
-
   // If we reach here, all is well.
   // Now remove the InstanceKlass* from the _klass_to_deallocate field
   // in order for it to not be destroyed in the ClassFileParser destructor.
diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
index 5d4236132f1..48cdacedc1e 100644
--- a/src/hotspot/share/classfile/classFileParser.hpp
+++ b/src/hotspot/share/classfile/classFileParser.hpp
@@ -500,6 +500,8 @@ class ClassFileParser {
 
   InstanceKlass* create_instance_klass(bool cf_changed_in_CFLH, const ClassInstanceInfo& cl_inst_info, TRAPS);
 
+  const ClassFileStream& stream() const { return *_stream; }
+
   const ClassFileStream* clone_stream() const;
 
   void set_klass_to_deallocate(InstanceKlass* klass);
diff --git a/src/hotspot/share/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp
index 50d327d7e8c..4e599feb3ff 100644
--- a/src/hotspot/share/classfile/klassFactory.cpp
+++ b/src/hotspot/share/classfile/klassFactory.cpp
@@ -37,7 +37,7 @@
 #include "runtime/handles.inline.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_JFR
-#include "jfr/support/jfrKlassExtension.hpp"
+#include "jfr/jfr.hpp"
 #endif
 
 
@@ -99,6 +99,9 @@ InstanceKlass* KlassFactory::check_shared_class_file_load_hook(
         new_ik->set_classpath_index(path_index);
       }
 
+
+      JFR_ONLY(Jfr::on_klass_creation(new_ik, parser, THREAD);)
+
       return new_ik;
     }
   }
@@ -213,7 +216,7 @@ InstanceKlass* KlassFactory::create_from_stream(ClassFileStream* stream,
     result->set_cached_class_file(cached_class_file);
   }
 
-  JFR_ONLY(ON_KLASS_CREATION(result, parser, THREAD);)
+  JFR_ONLY(Jfr::on_klass_creation(result, parser, THREAD);)
 
 #if INCLUDE_CDS
   if (CDSConfig::is_dumping_archive()) {
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index a17e7e129ce..ac57293687c 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -560,15 +560,6 @@ static InstanceKlass* handle_parallel_loading(JavaThread* current,
   return nullptr;
 }
 
-void SystemDictionary::post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld) {
-  assert(event != nullptr, "invariant");
-  assert(k != nullptr, "invariant");
-  event->set_loadedClass(k);
-  event->set_definingClassLoader(k->class_loader_data());
-  event->set_initiatingClassLoader(init_cld);
-  event->commit();
-}
-
 // SystemDictionary::resolve_instance_class_or_null is the main function for class name resolution.
 // After checking if the InstanceKlass already exists, it checks for ClassCircularityError and
 // whether the thread must wait for loading in parallel.  It eventually calls load_instance_class,
@@ -582,7 +573,7 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
   assert(name != nullptr && !Signature::is_array(name) &&
          !Signature::has_envelope(name), "invalid class name: %s", name == nullptr ? "nullptr" : name->as_C_string());
 
-  EventClassLoad class_load_start_event;
+  EventClassLoad class_load_event;
 
   HandleMark hm(THREAD);
 
@@ -713,8 +704,8 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
     return nullptr;
   }
 
-  if (class_load_start_event.should_commit()) {
-    post_class_load_event(&class_load_start_event, loaded_class, loader_data);
+  if (class_load_event.should_commit()) {
+    JFR_ONLY(post_class_load_event(&class_load_event, loaded_class, loader_data);)
   }
 
   // Make sure we have the right class in the dictionary
@@ -789,7 +780,7 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
                                                      const ClassLoadInfo& cl_info,
                                                      TRAPS) {
 
-  EventClassLoad class_load_start_event;
+  EventClassLoad class_load_event;
   ClassLoaderData* loader_data;
 
   // - for hidden classes that are not strong: create a new CLD that has a class holder and
@@ -819,15 +810,16 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
   k->add_to_hierarchy(THREAD);
   // But, do not add to dictionary.
 
+  if (class_load_event.should_commit()) {
+    JFR_ONLY(post_class_load_event(&class_load_event, k, loader_data);)
+  }
+
   k->link_class(CHECK_NULL);
 
   // notify jvmti
   if (JvmtiExport::should_post_class_load()) {
     JvmtiExport::post_class_load(THREAD, k);
   }
-  if (class_load_start_event.should_commit()) {
-    post_class_load_event(&class_load_start_event, k, loader_data);
-  }
 
   return k;
 }
@@ -1154,6 +1146,17 @@ void SystemDictionary::load_shared_class_misc(InstanceKlass* ik, ClassLoaderData
   }
 }
 
+#if INCLUDE_JFR
+void SystemDictionary::post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld) {
+  assert(event != nullptr, "invariant");
+  assert(k != nullptr, "invariant");
+  event->set_loadedClass(k);
+  event->set_definingClassLoader(k->class_loader_data());
+  event->set_initiatingClassLoader(init_cld);
+  event->commit();
+}
+#endif // INCLUDE_JFR
+
 // This is much more lightweight than SystemDictionary::resolve_or_null
 // - There's only a single Java thread at this point. No need for placeholder.
 // - All supertypes of ik have been loaded
@@ -1182,6 +1185,8 @@ void SystemDictionary::preload_class(Handle class_loader, InstanceKlass* ik, TRA
   }
 #endif
 
+  EventClassLoad class_load_event;
+
   ClassLoaderData* loader_data = ClassLoaderData::class_loader_data(class_loader());
   oop java_mirror = ik->archived_java_mirror();
   precond(java_mirror != nullptr);
@@ -1203,6 +1208,10 @@ void SystemDictionary::preload_class(Handle class_loader, InstanceKlass* ik, TRA
     update_dictionary(THREAD, ik, loader_data);
   }
 
+  if (class_load_event.should_commit()) {
+    JFR_ONLY(post_class_load_event(&class_load_event, ik, loader_data);)
+  }
+
   assert(ik->is_loaded(), "Must be in at least loaded state");
 }
 
@@ -1380,15 +1389,6 @@ InstanceKlass* SystemDictionary::load_instance_class(Symbol* name,
   return loaded_class;
 }
 
-static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def_cld) {
-  EventClassDefine event;
-  if (event.should_commit()) {
-    event.set_definedClass(k);
-    event.set_definingClassLoader(def_cld);
-    event.commit();
-  }
-}
-
 void SystemDictionary::define_instance_class(InstanceKlass* k, Handle class_loader, TRAPS) {
 
   ClassLoaderData* loader_data = k->class_loader_data();
@@ -1440,7 +1440,6 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, Handle class_load
   if (JvmtiExport::should_post_class_load()) {
     JvmtiExport::post_class_load(THREAD, k);
   }
-  post_class_define_event(k, loader_data);
 }
 
 // Support parallel classloading
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 99cb1d0b5d2..99e13fea61e 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -326,11 +326,10 @@ private:
   static void restore_archived_method_handle_intrinsics_impl(TRAPS) NOT_CDS_RETURN;
 
 protected:
-  // Used by AOTLinkedClassBulkLoader, LambdaProxyClassDictionary, and SystemDictionaryShared
+  // Used by AOTLinkedClassBulkLoader, LambdaProxyClassDictionary, VMClasses and SystemDictionaryShared
 
   static bool add_loader_constraint(Symbol* name, Klass* klass_being_linked,  Handle loader1,
                                     Handle loader2);
-  static void post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld);
   static InstanceKlass* load_shared_class(InstanceKlass* ik,
                                           Handle class_loader,
                                           Handle protection_domain,
@@ -342,6 +341,9 @@ protected:
   static InstanceKlass* find_or_define_instance_class(Symbol* class_name,
                                                       Handle class_loader,
                                                       InstanceKlass* k, TRAPS);
+  JFR_ONLY(static void post_class_load_event(EventClassLoad* event,
+                                             const InstanceKlass* k,
+                                             const ClassLoaderData* init_cld);)
 
 public:
   static bool is_system_class_loader(oop class_loader);
diff --git a/src/hotspot/share/classfile/vmClasses.cpp b/src/hotspot/share/classfile/vmClasses.cpp
index 0a3d33f4c5b..00d209a05ca 100644
--- a/src/hotspot/share/classfile/vmClasses.cpp
+++ b/src/hotspot/share/classfile/vmClasses.cpp
@@ -35,6 +35,7 @@
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
@@ -240,6 +241,8 @@ void vmClasses::resolve_shared_class(InstanceKlass* klass, ClassLoaderData* load
     return;
   }
 
+  EventClassLoad class_load_event;
+
   // add super and interfaces first
   InstanceKlass* super = klass->super();
   if (super != nullptr && super->class_loader_data() == nullptr) {
@@ -261,6 +264,10 @@ void vmClasses::resolve_shared_class(InstanceKlass* klass, ClassLoaderData* load
   dictionary->add_klass(THREAD, klass->name(), klass);
   klass->add_to_hierarchy(THREAD);
   assert(klass->is_loaded(), "Must be in at least loaded state");
+
+  if (class_load_event.should_commit()) {
+    JFR_ONLY(SystemDictionary::post_class_load_event(&class_load_event, klass, loader_data);)
+  }
 }
 
 #endif // INCLUDE_CDS
diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
index d5ef3502fa2..27accac2c00 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
@@ -1427,10 +1427,10 @@ static void transform(InstanceKlass*& ik, ClassFileParser& parser, JavaThread* t
   } else {
     JfrClassTransformer::cache_class_file_data(new_ik, stream, thread);
   }
+  JfrClassTransformer::copy_traceid(ik, new_ik);
   if (is_instrumented && JdkJfrEvent::is_subklass(new_ik)) {
     bless_commit_method(new_ik);
   }
-  JfrClassTransformer::copy_traceid(ik, new_ik);
   JfrClassTransformer::rewrite_klass_pointer(ik, new_ik, parser, thread);
 }
 
diff --git a/src/hotspot/share/jfr/jfr.cpp b/src/hotspot/share/jfr/jfr.cpp
index 7abf5c89945..3a2465e211d 100644
--- a/src/hotspot/share/jfr/jfr.cpp
+++ b/src/hotspot/share/jfr/jfr.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "classfile/classFileParser.hpp"
 #include "jfr/instrumentation/jfrEventClassTransformer.hpp"
 #include "jfr/jfr.hpp"
 #include "jfr/jni/jfrJavaSupport.hpp"
@@ -31,6 +32,7 @@
 #include "jfr/recorder/repository/jfrEmergencyDump.hpp"
 #include "jfr/recorder/repository/jfrRepository.hpp"
 #include "jfr/recorder/service/jfrOptionSet.hpp"
+#include "jfr/support/jfrClassDefineEvent.hpp"
 #include "jfr/support/jfrKlassExtension.hpp"
 #include "jfr/support/jfrResolution.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
@@ -78,13 +80,15 @@ void Jfr::on_unloading_classes() {
 }
 
 void Jfr::on_klass_creation(InstanceKlass*& ik, ClassFileParser& parser, TRAPS) {
+  JfrTraceId::assign(ik);
   if (IS_EVENT_OR_HOST_KLASS(ik)) {
     JfrEventClassTransformer::on_klass_creation(ik, parser, THREAD);
-    return;
-  }
-  if (JfrMethodTracer::in_use()) {
+  } else if (JfrMethodTracer::in_use()) {
     JfrMethodTracer::on_klass_creation(ik, parser, THREAD);
   }
+  if (!parser.is_internal()) {
+    JfrClassDefineEvent::on_creation(ik, parser, THREAD);
+  }
 }
 
 void Jfr::on_klass_redefinition(const InstanceKlass* ik, const InstanceKlass* scratch_klass) {
@@ -168,3 +172,11 @@ bool Jfr::on_flight_recorder_option(const JavaVMOption** option, char* delimiter
 bool Jfr::on_start_flight_recording_option(const JavaVMOption** option, char* delimiter) {
   return JfrOptionSet::parse_start_flight_recording_option(option, delimiter);
 }
+
+void Jfr::on_restoration(const Klass* k, JavaThread* jt) {
+  assert(k != nullptr, "invariant");
+  JfrTraceId::restore(k);
+  if (k->is_instance_klass()) {
+    JfrClassDefineEvent::on_restoration(InstanceKlass::cast(k), jt);
+  }
+}
diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp
index 2e1fc738a61..7b86e6c917e 100644
--- a/src/hotspot/share/jfr/jfr.hpp
+++ b/src/hotspot/share/jfr/jfr.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_JFR_JFR_HPP
 #define SHARE_JFR_JFR_HPP
 
+#include "jfr/utilities/jfrTypes.hpp"
 #include "memory/allStatic.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/exceptions.hpp"
@@ -78,6 +79,7 @@ class Jfr : AllStatic {
   static void initialize_main_thread(JavaThread* jt);
   static bool has_sample_request(JavaThread* jt);
   static void check_and_process_sample_request(JavaThread* jt);
+  static void on_restoration(const Klass* k, JavaThread* jt);
 };
 
 #endif // SHARE_JFR_JFR_HPP
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index eaafef37306..18a74454eb6 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -215,6 +215,7 @@
   <Event name="ClassDefine" category="Java Virtual Machine, Class Loading" label="Class Define" thread="true" stackTrace="true" startTime="false">
     <Field type="Class" name="definedClass" label="Defined Class" />
     <Field type="ClassLoader" name="definingClassLoader" label="Defining Class Loader" />
+    <Field type="Symbol" name="source" label="Source" />
   </Event>
 
   <Event name="ClassRedefinition" category="Java Virtual Machine, Class Loading" label="Class Redefinition" thread="false" stackTrace="false" startTime="false">
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index 375ab4d04e9..b1c502e17f8 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -30,11 +30,12 @@
 #include "classfile/vmClasses.hpp"
 #include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
 #include "jfr/recorder/checkpoint/types/jfrTypeSet.hpp"
-#include "jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp"
+#include "jfr/recorder/checkpoint/types/jfrTypeSetUtils.inline.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/support/jfrKlassUnloading.hpp"
+#include "jfr/support/jfrSymbolTable.inline.hpp"
 #include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
 #include "jfr/support/methodtracer/jfrMethodTracer.hpp"
 #include "jfr/utilities/jfrHashtable.hpp"
@@ -1262,7 +1263,7 @@ static size_t teardown() {
     clear_klasses_and_methods();
     clear_method_tracer_klasses();
     JfrKlassUnloading::clear();
-    _artifacts->increment_checkpoint_id();
+    _artifacts->clear();
     _initial_type_set = true;
   } else {
     _initial_type_set = false;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp
index c60556927ad..765bba69105 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp
@@ -23,18 +23,19 @@
  */
 
 #include "jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp"
+#include "jfr/support/jfrSymbolTable.inline.hpp"
 #include "jfr/utilities/jfrPredicate.hpp"
 #include "jfr/utilities/jfrRelation.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
 
-JfrArtifactSet::JfrArtifactSet(bool class_unload, bool previous_epoch) : _symbol_table(nullptr),
-                                                                         _klass_set(nullptr),
+JfrArtifactSet::JfrArtifactSet(bool class_unload, bool previous_epoch) : _klass_set(nullptr),
                                                                          _klass_loader_set(nullptr),
                                                                          _klass_loader_leakp_set(nullptr),
                                                                          _total_count(0),
-                                                                         _class_unload(class_unload) {
+                                                                         _class_unload(class_unload),
+                                                                         _previous_epoch(previous_epoch) {
   initialize(class_unload, previous_epoch);
   assert(!previous_epoch || _klass_loader_leakp_set != nullptr, "invariant");
   assert(_klass_loader_set != nullptr, "invariant");
@@ -47,12 +48,7 @@ static unsigned initial_klass_loader_leakp_set_size = 64;
 
 void JfrArtifactSet::initialize(bool class_unload, bool previous_epoch) {
   _class_unload = class_unload;
-  if (_symbol_table == nullptr) {
-    _symbol_table = JfrSymbolTable::create();
-    assert(_symbol_table != nullptr, "invariant");
-  }
-  assert(_symbol_table != nullptr, "invariant");
-  _symbol_table->set_class_unload(class_unload);
+  _previous_epoch = previous_epoch;
   _total_count = 0;
   // Resource allocations. Keep in this allocation order.
   if (previous_epoch) {
@@ -63,45 +59,33 @@ void JfrArtifactSet::initialize(bool class_unload, bool previous_epoch) {
 }
 
 void JfrArtifactSet::clear() {
-  if (_symbol_table != nullptr) {
-    _symbol_table->clear();
-  }
+  assert(_previous_epoch, "invariant");
+  JfrSymbolTable::clear_previous_epoch();
+  assert(_klass_loader_leakp_set != nullptr, "invariant");
+  initial_klass_loader_leakp_set_size = MAX2(initial_klass_loader_leakp_set_size, _klass_loader_leakp_set->table_size());
 }
 
 JfrArtifactSet::~JfrArtifactSet() {
-  delete _symbol_table;
   // _klass_loader_set, _klass_loader_leakp_set and
   // _klass_list will be cleared by a ResourceMark
 }
 
 traceid JfrArtifactSet::bootstrap_name(bool leakp) {
-  return _symbol_table->bootstrap_name(leakp);
-}
-
-traceid JfrArtifactSet::mark_hidden_klass_name(const Klass* klass, bool leakp) {
-  assert(klass->is_instance_klass(), "invariant");
-  return _symbol_table->mark_hidden_klass_name((const InstanceKlass*)klass, leakp);
-}
-
-traceid JfrArtifactSet::mark(uintptr_t hash, const Symbol* sym, bool leakp) {
-  return _symbol_table->mark(hash, sym, leakp);
+  return JfrSymbolTable::bootstrap_name(leakp);
 }
 
 traceid JfrArtifactSet::mark(const Klass* klass, bool leakp) {
-  return _symbol_table->mark(klass, leakp);
+  return JfrSymbolTable::mark(klass, leakp, _class_unload, _previous_epoch);
 }
 
 traceid JfrArtifactSet::mark(const Symbol* symbol, bool leakp) {
-  return _symbol_table->mark(symbol, leakp);
-}
-
-traceid JfrArtifactSet::mark(uintptr_t hash, const char* const str, bool leakp) {
-  return _symbol_table->mark(hash, str, leakp);
+  return JfrSymbolTable::mark(symbol, leakp, _class_unload, _previous_epoch);
 }
 
 bool JfrArtifactSet::has_klass_entries() const {
   return _klass_set->is_nonempty();
 }
+
 static inline bool not_in_set(JfrArtifactSet::JfrKlassSet* set, const Klass* k) {
   assert(set != nullptr, "invariant");
   assert(k != nullptr, "invariant");
@@ -129,10 +113,3 @@ size_t JfrArtifactSet::total_count() const {
   initial_klass_loader_set_size = MAX2(initial_klass_loader_set_size, _klass_loader_set->table_size());
   return _total_count;
 }
-
-void JfrArtifactSet::increment_checkpoint_id() {
-  assert(_symbol_table != nullptr, "invariant");
-  _symbol_table->increment_checkpoint_id();
-  assert(_klass_loader_leakp_set != nullptr, "invariant");
-  initial_klass_loader_leakp_set_size = MAX2(initial_klass_loader_leakp_set_size, _klass_loader_leakp_set->table_size());
-}
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
index 74200aef1f1..cc5ebb2be39 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
@@ -207,12 +207,12 @@ class JfrArtifactSet : public JfrCHeapObj {
   typedef JfrSet<JfrArtifactSetConfig> JfrKlassSet;
 
  private:
-  JfrSymbolTable* _symbol_table;
   JfrKlassSet* _klass_set;
   JfrKlassSet* _klass_loader_set;
   JfrKlassSet* _klass_loader_leakp_set;
   size_t _total_count;
   bool _class_unload;
+  bool _previous_epoch;
 
  public:
   JfrArtifactSet(bool class_unload, bool previous_epoch);
@@ -222,32 +222,20 @@ class JfrArtifactSet : public JfrCHeapObj {
   void initialize(bool class_unload, bool previous_epoch);
   void clear();
 
-  traceid mark(uintptr_t hash, const Symbol* sym, bool leakp);
   traceid mark(const Klass* klass, bool leakp);
   traceid mark(const Symbol* symbol, bool leakp);
-  traceid mark(uintptr_t hash, const char* const str, bool leakp);
-  traceid mark_hidden_klass_name(const Klass* klass, bool leakp);
   traceid bootstrap_name(bool leakp);
 
-  const JfrSymbolTable::SymbolEntry* map_symbol(const Symbol* symbol) const;
-  const JfrSymbolTable::SymbolEntry* map_symbol(uintptr_t hash) const;
-  const JfrSymbolTable::StringEntry* map_string(uintptr_t hash) const;
-
   bool has_klass_entries() const;
   size_t total_count() const;
   void register_klass(const Klass* k);
   bool should_do_cld_klass(const Klass* k, bool leakp);
-  void increment_checkpoint_id();
 
   template <typename T>
-  void iterate_symbols(T& functor) {
-    _symbol_table->iterate_symbols(functor);
-  }
+  void iterate_symbols(T& functor);
 
   template <typename T>
-  void iterate_strings(T& functor) {
-    _symbol_table->iterate_strings(functor);
-  }
+  void iterate_strings(T& functor);
 
   template <typename Writer>
   void tally(Writer& writer) {
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.inline.hpp
new file mode 100644
index 00000000000..a1a25c4e907
--- /dev/null
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.inline.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_INLINE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_INLINE_HPP
+
+#include "jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp"
+
+#include "jfr/support/jfrSymbolTable.inline.hpp"
+
+template <typename T>
+inline void JfrArtifactSet::iterate_symbols(T& functor) {
+  JfrSymbolTable::iterate_symbols(functor, _previous_epoch);
+}
+
+template <typename T>
+inline void JfrArtifactSet::iterate_strings(T& functor) {
+  JfrSymbolTable::iterate_strings(functor, _previous_epoch);
+}
+
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_INLINE_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
index 2fcb1a64baf..405fa25baff 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
@@ -109,6 +109,7 @@ static void check_klass(const Klass* klass) {
 
 void JfrTraceId::assign(const Klass* klass) {
   assert(klass != nullptr, "invariant");
+  assert(klass->trace_id() == 0, "invariant");
   klass->set_trace_id(next_class_id());
   check_klass(klass);
   const Klass* const super = klass->super();
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index f5214ff7942..6a6da0f9b04 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -43,6 +43,7 @@
 #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
 #include "jfr/recorder/storage/jfrStorage.hpp"
 #include "jfr/recorder/stringpool/jfrStringPool.hpp"
+#include "jfr/support/jfrSymbolTable.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "jfr/utilities/jfrTime.hpp"
 #include "jfr/writers/jfrJavaEventWriter.hpp"
@@ -315,6 +316,9 @@ bool JfrRecorder::create_components() {
   if (!create_thread_group_manager()) {
     return false;
   }
+  if (!create_symbol_table()) {
+    return false;
+  }
   return true;
 }
 
@@ -413,6 +417,10 @@ bool JfrRecorder::create_thread_group_manager() {
   return JfrThreadGroupManager::create();
 }
 
+bool JfrRecorder::create_symbol_table() {
+  return JfrSymbolTable::create();
+}
+
 void JfrRecorder::destroy_components() {
   JfrJvmtiAgent::destroy();
   if (_post_box != nullptr) {
@@ -453,6 +461,7 @@ void JfrRecorder::destroy_components() {
   }
   JfrEventThrottler::destroy();
   JfrThreadGroupManager::destroy();
+  JfrSymbolTable::destroy();
 }
 
 bool JfrRecorder::create_recorder_thread() {
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index 34cc8fda949..8cc4521669d 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -57,6 +57,7 @@ class JfrRecorder : public JfrCHeapObj {
   static bool create_thread_sampler();
   static bool create_cpu_time_thread_sampling();
   static bool create_event_throttler();
+  static bool create_symbol_table();
   static bool create_components();
   static void destroy_components();
   static void on_recorder_thread_exit();
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index 3f0b132f1a4..08250a1ae59 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -39,6 +39,7 @@
 #include "jfr/recorder/storage/jfrStorageControl.hpp"
 #include "jfr/recorder/stringpool/jfrStringPool.hpp"
 #include "jfr/support/jfrDeprecationManager.hpp"
+#include "jfr/support/jfrSymbolTable.inline.hpp"
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrThreadIterator.hpp"
 #include "jfr/utilities/jfrTime.hpp"
@@ -450,6 +451,7 @@ void JfrRecorderService::clear() {
 void JfrRecorderService::pre_safepoint_clear() {
   _storage.clear();
   JfrStackTraceRepository::clear();
+  JfrSymbolTable::allocate_next_epoch();
 }
 
 void JfrRecorderService::invoke_safepoint_clear() {
@@ -558,6 +560,7 @@ void JfrRecorderService::pre_safepoint_write() {
   }
   write_storage(_storage, _chunkwriter);
   write_stacktrace(_stack_trace_repository, _chunkwriter, true);
+  JfrSymbolTable::allocate_next_epoch();
 }
 
 void JfrRecorderService::invoke_safepoint_write() {
diff --git a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
new file mode 100644
index 00000000000..06f361ced8c
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotClassLocation.hpp"
+#include "classfile/classFileParser.hpp"
+#include "classfile/classFileStream.hpp"
+#include "classfile/classLoaderData.inline.hpp"
+#include "jfr/instrumentation/jfrClassTransformer.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/support/jfrClassDefineEvent.hpp"
+#include "jfr/support/jfrSymbolTable.hpp"
+#include "jfrfiles/jfrEventClasses.hpp"
+#include "oops/instanceKlass.hpp"
+#include "runtime/javaThread.hpp"
+
+ /*
+  * Two cases for JDK modules as outlined by JEP 200: The Modular JDK.
+  *
+  * The modular structure of the JDK implements the following principles:
+  * 1. Standard modules, whose specifications are governed by the JCP, have names starting with the string "java.".
+  * 2. All other modules are merely part of the JDK, and have names starting with the string "jdk.".
+  * */
+static inline bool is_jdk_module(const char* module_name) {
+  assert(module_name != nullptr, "invariant");
+  return strstr(module_name, "java.") == module_name || strstr(module_name, "jdk.") == module_name;
+}
+
+static inline bool is_unnamed_module(const ModuleEntry* module) {
+  return module == nullptr || !module->is_named();
+}
+
+static inline bool is_jdk_module(const ModuleEntry* module, JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  if (is_unnamed_module(module)) {
+    return false;
+  }
+  const Symbol* const module_symbol = module->name();
+  assert(module_symbol != nullptr, "invariant");
+  return is_jdk_module(module_symbol->as_C_string());
+}
+
+static inline bool is_jdk_module(const InstanceKlass* ik, JavaThread* jt) {
+  assert(ik != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  return is_jdk_module(ik->module(), jt);
+}
+
+static traceid module_path(const InstanceKlass* ik, JavaThread* jt) {
+  assert(ik != nullptr, "invariant");
+  const ModuleEntry* const module_entry = ik->module();
+  if (is_unnamed_module(module_entry)) {
+    return 0;
+  }
+  const char* const module_name = module_entry->name()->as_C_string();
+  assert(module_name != nullptr, "invariant");
+  if (is_jdk_module(module_name)) {
+    const size_t module_name_len = strlen(module_name);
+    char* const path = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, module_name_len + 6); // "jrt:/"
+    jio_snprintf(path, module_name_len + 6, "%s%s", "jrt:/", module_name);
+    return JfrSymbolTable::add(path);
+  }
+  return 0;
+}
+
+static traceid caller_path(const InstanceKlass* ik, JavaThread* jt) {
+  assert(ik != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(ik->class_loader_data()->is_the_null_class_loader_data(), "invariant");
+  const Klass* const caller = jt->security_get_caller_class(1);
+  // caller can be null, for example, during a JVMTI VM_Init hook
+  if (caller != nullptr) {
+    const char* caller_name = caller->external_name();
+    assert(caller_name != nullptr, "invariant");
+    const size_t caller_name_len = strlen(caller_name);
+    char* const path = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, caller_name_len + 13); // "instance of "
+    jio_snprintf(path, caller_name_len + 13, "%s%s", "instance of ", caller_name);
+    return JfrSymbolTable::add(path);
+  }
+  return 0;
+}
+
+static traceid class_loader_path(const InstanceKlass* ik, JavaThread* jt) {
+  assert(ik != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(!ik->class_loader_data()->is_the_null_class_loader_data(), "invariant");
+  oop class_loader = ik->class_loader_data()->class_loader();
+  const char* class_loader_name = class_loader->klass()->external_name();
+  return class_loader_name != nullptr ? JfrSymbolTable::add(class_loader_name) : 0;
+}
+
+static inline bool is_not_retransforming(const InstanceKlass* ik, JavaThread* jt) {
+  return JfrClassTransformer::find_existing_klass(ik, jt) == nullptr;
+}
+
+static traceid get_source(const InstanceKlass* ik, JavaThread* jt) {
+  traceid source_id = 0;
+  if (is_jdk_module(ik, jt)) {
+    source_id = module_path(ik, jt);
+  } else if (ik->class_loader_data()->is_the_null_class_loader_data()) {
+    source_id = caller_path(ik, jt);
+  } else {
+    source_id = class_loader_path(ik, jt);
+  }
+  return source_id;
+}
+
+static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) {
+  assert(cl != nullptr, "invariant");
+  assert(!cl->is_modules_image(), "invariant");
+  const char* const path = cl->path();
+  assert(path != nullptr, "invariant");
+  size_t len = strlen(path);
+  const char* file_type = cl->file_type_string();
+  assert(file_type != nullptr, "invariant");
+  len += strlen(file_type) + 3; // ":/" + null
+  char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len);
+  jio_snprintf(url, len, "%s%s%s", file_type, ":/", path);
+  return JfrSymbolTable::add(url);
+}
+
+static inline void send_event(const InstanceKlass* ik, traceid source_id) {
+  EventClassDefine event;
+  event.set_definedClass(ik);
+  event.set_definingClassLoader(ik->class_loader_data());
+  event.set_source(source_id);
+  event.commit();
+}
+
+void JfrClassDefineEvent::on_creation(const InstanceKlass* ik, const ClassFileParser& parser, JavaThread* jt) {
+  assert(ik != nullptr, "invariant");
+  assert(ik->trace_id() != 0, "invariant");
+  assert(!parser.is_internal(), "invariant");
+  assert(jt != nullptr, "invariant");
+
+  if (EventClassDefine::is_enabled() && is_not_retransforming(ik, jt)) {
+    ResourceMark rm(jt);
+    traceid source_id = 0;
+    const ClassFileStream& stream = parser.stream();
+    if (stream.source() != nullptr) {
+      if (stream.from_boot_loader_modules_image()) {
+        assert(is_jdk_module(ik, jt), "invariant");
+        source_id = module_path(ik, jt);
+      } else {
+        source_id = JfrSymbolTable::add(stream.source());
+      }
+    } else {
+      source_id = get_source(ik, jt);
+    }
+    send_event(ik, source_id);
+  }
+}
+
+void JfrClassDefineEvent::on_restoration(const InstanceKlass* ik, JavaThread* jt) {
+  assert(ik != nullptr, "invariant");
+  assert(ik->trace_id() != 0, "invariant");
+  assert(jt != nullptr, "invariant");
+
+  if (EventClassDefine::is_enabled()) {
+    ResourceMark rm(jt);
+    assert(is_not_retransforming(ik, jt), "invariant");
+    const int index = ik->shared_classpath_index();
+    assert(index >= 0, "invariant");
+    const AOTClassLocation* const cl = AOTClassLocationConfig::runtime()->class_location_at(index);
+    assert(cl != nullptr, "invariant");
+    send_event(ik, cl->is_modules_image() ? module_path(ik, jt) : get_source(cl, jt));
+  }
+}
diff --git a/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp b/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp
new file mode 100644
index 00000000000..4a0926023ca
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_JFR_SUPPORT_JFRCLASSDEFINEEVENT_HPP
+#define SHARE_JFR_SUPPORT_JFRCLASSDEFINEEVENT_HPP
+
+#include "memory/allStatic.hpp"
+
+class ClassFileParser;
+class InstanceKlass;
+class JavaThread;
+
+class JfrClassDefineEvent : AllStatic {
+ public:
+  static void on_creation(const InstanceKlass* ik, const ClassFileParser& parser, JavaThread* jt);
+  static void on_restoration(const InstanceKlass* ik, JavaThread* jt);
+};
+
+#endif // SHARE_JFR_SUPPORT_JFRCLASSDEFINEEVENT_HPP
diff --git a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
index dc5f7aa7e90..54f5031dd3b 100644
--- a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
@@ -40,6 +40,5 @@
 #define EVENT_STICKY_BIT       8192
 #define IS_EVENT_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS)) != 0)
 #define IS_EVENT_OR_HOST_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS | EVENT_HOST_KLASS)) != 0)
-#define ON_KLASS_CREATION(k, p, t) Jfr::on_klass_creation(k, p, t)
 
 #endif // SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
diff --git a/src/hotspot/share/jfr/support/jfrSymbolTable.cpp b/src/hotspot/share/jfr/support/jfrSymbolTable.cpp
index 3fc639ffb5c..c791a05f818 100644
--- a/src/hotspot/share/jfr/support/jfrSymbolTable.cpp
+++ b/src/hotspot/share/jfr/support/jfrSymbolTable.cpp
@@ -24,131 +24,32 @@
 
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.hpp"
-#include "jfr/support/jfrSymbolTable.hpp"
+#include "jfr/recorder/jfrRecorder.hpp"
+#include "jfr/support/jfrSymbolTable.inline.hpp"
 #include "oops/klass.hpp"
 #include "oops/symbol.hpp"
+#include "runtime/atomicAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 
-// incremented on each rotation
-static u8 checkpoint_id = 1;
+JfrSymbolTable::Impl* JfrSymbolTable::_epoch_0 = nullptr;
+JfrSymbolTable::Impl* JfrSymbolTable::_epoch_1 = nullptr;
+JfrSymbolTable::StringEntry* JfrSymbolTable::_bootstrap = nullptr;
 
-// creates a unique id by combining a checkpoint relative symbol id (2^24)
-// with the current checkpoint id (2^40)
-#define CREATE_SYMBOL_ID(sym_id) (((u8)((checkpoint_id << 24) | sym_id)))
-
-static traceid create_symbol_id(traceid artifact_id) {
-  return artifact_id != 0 ? CREATE_SYMBOL_ID(artifact_id) : 0;
-}
-
-static uintptr_t string_hash(const char* str) {
-  return java_lang_String::hash_code(reinterpret_cast<const jbyte*>(str), static_cast<int>(strlen(str)));
-}
-
-static JfrSymbolTable::StringEntry* bootstrap = nullptr;
-
-static JfrSymbolTable* _instance = nullptr;
-
-static JfrSymbolTable& instance() {
-  assert(_instance != nullptr, "invariant");
-  return *_instance;
-}
-
-JfrSymbolTable* JfrSymbolTable::create() {
-  assert(_instance == nullptr, "invariant");
-  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-  _instance = new JfrSymbolTable();
-  return _instance;
-}
-
-void JfrSymbolTable::destroy() {
-  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-  if (_instance != nullptr) {
-    delete _instance;
-    _instance = nullptr;
-  }
-  assert(_instance == nullptr, "invariant");
-}
-
-JfrSymbolTable::JfrSymbolTable() :
-  _symbols(new Symbols(this)),
-  _strings(new Strings(this)),
-  _symbol_list(nullptr),
-  _string_list(nullptr),
-  _symbol_query(nullptr),
-  _string_query(nullptr),
-  _id_counter(1),
-  _class_unload(false) {
-  assert(_symbols != nullptr, "invariant");
-  assert(_strings != nullptr, "invariant");
-  bootstrap = new StringEntry(0, (const char*)&BOOTSTRAP_LOADER_NAME);
-  assert(bootstrap != nullptr, "invariant");
-  bootstrap->set_id(create_symbol_id(1));
-  _string_list = bootstrap;
-}
-
-JfrSymbolTable::~JfrSymbolTable() {
-  clear();
-  delete _symbols;
-  delete _strings;
-  delete bootstrap;
-}
-
-void JfrSymbolTable::clear() {
-  assert(_symbols != nullptr, "invariant");
-  if (_symbols->has_entries()) {
-    _symbols->clear_entries();
-  }
-  assert(!_symbols->has_entries(), "invariant");
-
-  assert(_strings != nullptr, "invariant");
-  if (_strings->has_entries()) {
-    _strings->clear_entries();
-  }
-  assert(!_strings->has_entries(), "invariant");
-
-  _symbol_list = nullptr;
-  _id_counter = 1;
-
-  _symbol_query = nullptr;
-  _string_query = nullptr;
-
-  assert(bootstrap != nullptr, "invariant");
-  bootstrap->reset();
-  _string_list = bootstrap;
-}
-
-void JfrSymbolTable::set_class_unload(bool class_unload) {
-  _class_unload = class_unload;
-}
-
-void JfrSymbolTable::increment_checkpoint_id() {
-  assert_lock_strong(ClassLoaderDataGraph_lock);
-  clear();
-  ++checkpoint_id;
-}
+JfrSymbolCallback::JfrSymbolCallback() : _id_counter(2) {} // 1 is reserved for "bootstrap" entry
 
 template <typename T>
-inline void JfrSymbolTable::assign_id(T* entry) {
+inline void JfrSymbolCallback::assign_id(const T* entry) {
   assert(entry != nullptr, "invariant");
   assert(entry->id() == 0, "invariant");
-  entry->set_id(create_symbol_id(++_id_counter));
+  entry->set_id(AtomicAccess::fetch_then_add(&_id_counter, (traceid)1));
 }
 
-void JfrSymbolTable::on_link(const SymbolEntry* entry) {
+void JfrSymbolCallback::on_link(const JfrSymbolTable::SymbolEntry* entry) {
   assign_id(entry);
   const_cast<Symbol*>(entry->literal())->increment_refcount();
-  entry->set_list_next(_symbol_list);
-  _symbol_list = entry;
 }
 
-bool JfrSymbolTable::on_equals(uintptr_t hash, const SymbolEntry* entry) {
-  assert(entry != nullptr, "invariant");
-  assert(entry->hash() == hash, "invariant");
-  assert(_symbol_query != nullptr, "invariant");
-  return _symbol_query == entry->literal();
-}
-
-void JfrSymbolTable::on_unlink(const SymbolEntry* entry) {
+void JfrSymbolCallback::on_unlink(const JfrSymbolTable::SymbolEntry* entry) {
   assert(entry != nullptr, "invariant");
   const_cast<Symbol*>(entry->literal())->decrement_refcount();
 }
@@ -162,75 +63,241 @@ static const char* resource_to_c_heap_string(const char* resource_str) {
   return c_string;
 }
 
-void JfrSymbolTable::on_link(const StringEntry* entry) {
+void JfrSymbolCallback::on_link(const JfrSymbolTable::StringEntry* entry) {
   assign_id(entry);
-  const_cast<StringEntry*>(entry)->set_literal(resource_to_c_heap_string(entry->literal()));
-  entry->set_list_next(_string_list);
-  _string_list = entry;
+  const_cast<JfrSymbolTable::StringEntry*>(entry)->set_literal(resource_to_c_heap_string(entry->literal()));
 }
 
-static bool string_compare(const char* query, const char* candidate) {
-  assert(query != nullptr, "invariant");
-  assert(candidate != nullptr, "invariant");
-  const size_t length = strlen(query);
-  return strncmp(query, candidate, length) == 0;
-}
-
-bool JfrSymbolTable::on_equals(uintptr_t hash, const StringEntry* entry) {
+void JfrSymbolCallback::on_unlink(const JfrSymbolTable::StringEntry* entry) {
   assert(entry != nullptr, "invariant");
-  assert(entry->hash() == hash, "invariant");
-  assert(_string_query != nullptr, "invariant");
-  return string_compare(_string_query, entry->literal());
+  JfrCHeapObj::free(const_cast<char*>(entry->literal()), strlen(entry->literal()) + 1);
 }
 
-void JfrSymbolTable::on_unlink(const StringEntry* entry) {
-  assert(entry != nullptr, "invariant");
-  JfrCHeapObj::free(const_cast<char*>(entry->literal()), strlen(entry->literal() + 1));
+static JfrSymbolCallback* _callback = nullptr;
+
+template <typename T, typename IdType>
+JfrSymbolTableEntry<T, IdType>::JfrSymbolTableEntry(unsigned hash, const T& data) :
+  JfrConcurrentHashtableEntry<T, IdType>(hash, data), _serialized(false), _unloading(false), _leakp(false) {}
+
+template <typename T, typename IdType>
+bool JfrSymbolTableEntry<T, IdType>::on_equals(const char* str) {
+  assert(str != nullptr, "invariant");
+  return strcmp((const char*)this->literal(), str) == 0;
+}
+
+static const constexpr unsigned max_capacity = 1 << 30;
+
+static inline unsigned calculate_capacity(unsigned size, unsigned capacity) {
+  assert(is_power_of_2(capacity), "invariant");
+  assert(capacity <= max_capacity, "invariant");
+  double load_factor = (double)size / (double)capacity;
+  if (load_factor < 0.75) {
+    return capacity;
+  }
+  do {
+    capacity <<= 1;
+    assert(is_power_of_2(capacity), "invariant");
+    guarantee(capacity <= max_capacity, "overflow");
+    load_factor = (double)size / (double)capacity;
+  } while (load_factor >= 0.75);
+  return capacity;
+}
+
+bool JfrSymbolTable::create() {
+  assert(_callback == nullptr, "invariant");
+  // Allocate callback instance before tables.
+  _callback = new JfrSymbolCallback();
+  if (_callback == nullptr) {
+    return false;
+  }
+  assert(_bootstrap == nullptr, "invariant");
+  _bootstrap = new StringEntry(0, (const char*)&BOOTSTRAP_LOADER_NAME);
+  if (_bootstrap == nullptr) {
+    return false;
+  }
+  _bootstrap->set_id(1);
+  assert(this_epoch_table() == nullptr, "invariant");
+  Impl* table = new JfrSymbolTable::Impl();
+  if (table == nullptr) {
+    return false;
+  }
+  set_this_epoch(table);
+  assert(previous_epoch_table() == nullptr, "invariant");
+  return true;
+}
+
+void JfrSymbolTable::destroy() {
+  if (_callback != nullptr) {
+    delete _callback;
+    _callback = nullptr;
+  }
+  if (_bootstrap != nullptr) {
+    delete _bootstrap;
+    _bootstrap = nullptr;
+  }
+  if (_epoch_0 != nullptr) {
+    delete _epoch_0;
+    _epoch_0 = nullptr;
+  }
+  if (_epoch_1 != nullptr) {
+    delete _epoch_1;
+    _epoch_1 = nullptr;
+  }
+}
+
+void JfrSymbolTable::allocate_next_epoch() {
+  assert(nullptr == previous_epoch_table(), "invariant");
+  const Impl* const current = this_epoch_table();
+  assert(current != nullptr, "invariant");
+  const unsigned next_symbols_capacity = calculate_capacity(current->symbols_size(), current->symbols_capacity());
+  const unsigned next_strings_capacity = calculate_capacity(current->strings_size(), current->strings_capacity());
+  assert(_callback != nullptr, "invariant");
+  // previous epoch to become the next epoch.
+  set_previous_epoch(new JfrSymbolTable::Impl(next_symbols_capacity, next_strings_capacity));
+  assert(this_epoch_table() != nullptr, "invariant");
+  assert(previous_epoch_table() != nullptr, "invariant");
+}
+
+void JfrSymbolTable::clear_previous_epoch() {
+  Impl* const table = previous_epoch_table();
+  assert(table != nullptr, "invariant");
+  set_previous_epoch(nullptr);
+  delete table;
+  assert(_bootstrap != nullptr, "invariant");
+  _bootstrap->reset();
+  assert(!_bootstrap->is_serialized(), "invariant");
+}
+
+void JfrSymbolTable::set_this_epoch(JfrSymbolTable::Impl* table) {
+  assert(table != nullptr, "invariant");
+  const u1 epoch = JfrTraceIdEpoch::current();
+  if (epoch == 0) {
+    _epoch_0 = table;
+  } else {
+    _epoch_1 = table;
+  }
+}
+
+void JfrSymbolTable::set_previous_epoch(JfrSymbolTable::Impl* table) {
+  const u1 epoch = JfrTraceIdEpoch::previous();
+  if (epoch == 0) {
+    _epoch_0 = table;
+  } else {
+    _epoch_1 = table;
+  }
+}
+
+inline bool JfrSymbolTable::Impl::has_symbol_entries() const {
+  return _symbols->is_nonempty();
+}
+
+inline bool JfrSymbolTable::Impl::has_string_entries() const {
+  return _strings->is_nonempty();
+}
+
+inline bool JfrSymbolTable::Impl::has_entries() const {
+  return has_symbol_entries() || has_string_entries();
+}
+
+inline unsigned JfrSymbolTable::Impl::symbols_capacity() const {
+  return _symbols->capacity();
+}
+
+inline unsigned JfrSymbolTable::Impl::symbols_size() const {
+  return _symbols->size();
+}
+
+inline unsigned JfrSymbolTable::Impl::strings_capacity() const {
+  return _strings->capacity();
+}
+
+inline unsigned JfrSymbolTable::Impl::strings_size() const {
+  return _strings->size();
+}
+
+bool JfrSymbolTable::has_entries(bool previous_epoch /* false */) {
+  const Impl* table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  return table->has_entries();
+}
+
+bool JfrSymbolTable::has_symbol_entries(bool previous_epoch /* false */) {
+  const Impl* table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  return table->has_symbol_entries();
+}
+
+bool JfrSymbolTable::has_string_entries(bool previous_epoch /* false */) {
+  const Impl* table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  return table->has_string_entries();
 }
 
 traceid JfrSymbolTable::bootstrap_name(bool leakp) {
-  assert(bootstrap != nullptr, "invariant");
+  assert(_bootstrap != nullptr, "invariant");
   if (leakp) {
-    bootstrap->set_leakp();
+    _bootstrap->set_leakp();
   }
-  return bootstrap->id();
+  return _bootstrap->id();
 }
 
-traceid JfrSymbolTable::mark(const Symbol* sym, bool leakp /* false */) {
+JfrSymbolTable::Impl::Impl(unsigned symbols_capacity /* 0*/, unsigned strings_capacity /* 0 */) :
+  _symbols(new Symbols(_callback, symbols_capacity)), _strings(new Strings(_callback, strings_capacity)) {}
+
+JfrSymbolTable::Impl::~Impl() {
+  delete _symbols;
+  delete _strings;
+}
+
+traceid JfrSymbolTable::Impl::mark(const Symbol* sym, bool leakp /* false */, bool class_unload /* false */) {
   assert(sym != nullptr, "invariant");
-  return mark(sym->identity_hash(), sym, leakp);
+  return mark(sym->identity_hash(), sym, leakp, class_unload);
 }
 
-traceid JfrSymbolTable::mark(uintptr_t hash, const Symbol* sym, bool leakp) {
+traceid JfrSymbolTable::Impl::mark(unsigned hash, const Symbol* sym, bool leakp, bool class_unload /* false */) {
   assert(sym != nullptr, "invariant");
   assert(_symbols != nullptr, "invariant");
-  _symbol_query = sym;
-  const SymbolEntry& entry = _symbols->lookup_put(hash, sym);
-  if (_class_unload) {
-    entry.set_unloading();
-  }
+  const SymbolEntry* entry = _symbols->lookup_put(hash, sym);
+  assert(entry != nullptr, "invariant");
   if (leakp) {
-    entry.set_leakp();
+    entry->set_leakp();
+  } else if (class_unload) {
+    entry->set_unloading();
   }
-  return entry.id();
+  return entry->id();
 }
 
-traceid JfrSymbolTable::mark(const char* str, bool leakp /* false*/) {
-  return mark(string_hash(str), str, leakp);
+traceid JfrSymbolTable::mark(const Symbol* sym, bool leakp /* false */, bool class_unload /* false */, bool previous_epoch /* false */) {
+  Impl* const table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  return table->mark(sym->identity_hash(), sym, leakp, class_unload);
 }
 
-traceid JfrSymbolTable::mark(uintptr_t hash, const char* str, bool leakp) {
+static inline unsigned string_hash(const char* str) {
+  return java_lang_String::hash_code(reinterpret_cast<const jbyte*>(str), static_cast<int>(strlen(str)));
+}
+
+traceid JfrSymbolTable::Impl::mark(const char* str, bool leakp /* false*/, bool class_unload /* false */) {
+  return mark(string_hash(str), str, leakp, class_unload);
+}
+
+traceid JfrSymbolTable::Impl::mark(unsigned hash, const char* str, bool leakp, bool class_unload /* false */) {
   assert(str != nullptr, "invariant");
   assert(_strings != nullptr, "invariant");
-  _string_query = str;
-  const StringEntry& entry = _strings->lookup_put(hash, str);
-  if (_class_unload) {
-    entry.set_unloading();
-  }
+  const StringEntry* entry = _strings->lookup_put(hash, str);
+  assert(entry != nullptr, "invariant");
   if (leakp) {
-    entry.set_leakp();
+    entry->set_leakp();
+  } else if (class_unload) {
+    entry->set_unloading();
   }
-  return entry.id();
+  return entry->id();
+}
+
+traceid JfrSymbolTable::mark(unsigned hash, const char* str, bool leakp, bool class_unload /* false */, bool previous_epoch /* false */) {
+  Impl* const table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  return table->mark(hash, str, leakp, class_unload);
 }
 
 /*
@@ -241,40 +308,47 @@ traceid JfrSymbolTable::mark(uintptr_t hash, const char* str, bool leakp) {
  *
  * Caller needs ResourceMark.
  */
-traceid JfrSymbolTable::mark_hidden_klass_name(const Klass* k, bool leakp) {
+inline traceid JfrSymbolTable::Impl::mark_hidden_klass_name(const Klass* k, bool leakp, bool class_unload /* false */) {
   assert(k != nullptr, "invariant");
   assert(k->is_hidden(), "invariant");
-  const uintptr_t hash = k->name()->identity_hash();
-  return mark(hash, k->external_name(), leakp);
+  return mark(k->name()->identity_hash(), k->external_name(), leakp, class_unload);
 }
 
-traceid JfrSymbolTable::mark(const Klass* k, bool leakp) {
+traceid JfrSymbolTable::Impl::mark(const Klass* k, bool leakp, bool class_unload /* false */) {
   assert(k != nullptr, "invariant");
   traceid symbol_id = 0;
   if (k->is_hidden()) {
-    symbol_id = mark_hidden_klass_name(k, leakp);
+    symbol_id = mark_hidden_klass_name(k, leakp, class_unload);
   } else {
     Symbol* const sym = k->name();
     if (sym != nullptr) {
-      symbol_id = mark(sym, leakp);
+      symbol_id = mark(sym, leakp, class_unload);
     }
   }
   assert(symbol_id > 0, "a symbol handler must mark the symbol for writing");
   return symbol_id;
 }
 
-template <typename T>
-traceid JfrSymbolTable::add_impl(const T* sym) {
-  assert(sym != nullptr, "invariant");
-  assert(_instance != nullptr, "invariant");
-  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-  return instance().mark(sym);
+traceid JfrSymbolTable::mark(const Klass* k, bool leakp, bool class_unload /* false */, bool previous_epoch /* false */) {
+  Impl* const table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  return table->mark(k, leakp, class_unload);
 }
 
-traceid JfrSymbolTable::add(const Symbol* sym) {
-  return add_impl(sym);
+inline traceid JfrSymbolTable::Impl::add(const Symbol* sym) {
+  assert(sym != nullptr, "invariant");
+  return _symbols->lookup_put(sym->identity_hash(), sym)->id();
+}
+
+traceid JfrSymbolTable::Impl::add(const char* str) {
+  assert(str != nullptr, "invariant");
+  return _strings->lookup_put(string_hash(str), str)->id();
+}
+
+inline traceid JfrSymbolTable::add(const Symbol* sym) {
+  return this_epoch_table()->add(sym);
 }
 
 traceid JfrSymbolTable::add(const char* str) {
-  return add_impl(str);
+  return this_epoch_table()->add(str);
 }
diff --git a/src/hotspot/share/jfr/support/jfrSymbolTable.hpp b/src/hotspot/share/jfr/support/jfrSymbolTable.hpp
index 8cefa287c8a..d2ee6cd4bc1 100644
--- a/src/hotspot/share/jfr/support/jfrSymbolTable.hpp
+++ b/src/hotspot/share/jfr/support/jfrSymbolTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,58 @@
 #ifndef SHARE_JFR_SUPPORT_JFRSYMBOLTABLE_HPP
 #define SHARE_JFR_SUPPORT_JFRSYMBOLTABLE_HPP
 
-#include "jfr/utilities/jfrHashtable.hpp"
+#include "jfr/utilities/jfrAllocation.hpp"
+#include "jfr/utilities/jfrConcurrentHashtable.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 
 template <typename T, typename IdType>
-class ListEntry : public JfrHashtableEntry<T, IdType> {
+class JfrSymbolTableEntry : public JfrConcurrentHashtableEntry<T, IdType> {
  public:
-  ListEntry(uintptr_t hash, const T& data) : JfrHashtableEntry<T, IdType>(hash, data),
-    _list_next(nullptr), _serialized(false), _unloading(false), _leakp(false) {}
-  const ListEntry<T, IdType>* list_next() const { return _list_next; }
-  void reset() const {
-    _list_next = nullptr; _serialized = false; _unloading = false; _leakp = false;
-  }
-  void set_list_next(const ListEntry<T, IdType>* next) const { _list_next = next; }
+  JfrSymbolTableEntry(unsigned hash, const T& data);
   bool is_serialized() const { return _serialized; }
   void set_serialized() const { _serialized = true; }
   bool is_unloading() const { return _unloading; }
   void set_unloading() const { _unloading = true; }
   bool is_leakp() const { return _leakp; }
   void set_leakp() const { _leakp = true; }
+  void reset() const {
+    _serialized = false;
+    _unloading = false;
+    _leakp = false;
+  }
+
+  bool on_equals(const Symbol* sym) {
+    assert(sym != nullptr, "invariant");
+    return sym == (const Symbol*)this->literal();
+  }
+
+  bool on_equals(const char* str);
+
  private:
-  mutable const ListEntry<T, IdType>* _list_next;
   mutable bool _serialized;
   mutable bool _unloading;
   mutable bool _leakp;
 };
 
+class JfrSymbolCallback : public JfrCHeapObj {
+  friend class JfrSymbolTable;
+ public:
+  typedef JfrConcurrentHashTableHost<const Symbol*, traceid, JfrSymbolTableEntry, JfrSymbolCallback> Symbols;
+  typedef JfrConcurrentHashTableHost<const char*, traceid, JfrSymbolTableEntry, JfrSymbolCallback> Strings;
+
+  void on_link(const Symbols::Entry* entry);
+  void on_unlink(const Symbols::Entry* entry);
+  void on_link(const Strings::Entry* entry);
+  void on_unlink(const Strings::Entry* entry);
+
+ private:
+  traceid _id_counter;
+
+  JfrSymbolCallback();
+  template <typename T>
+  void assign_id(const T* entry);
+};
+
 /*
  * This table maps an oop/Symbol* or a char* to the Jfr type 'Symbol'.
  *
@@ -58,88 +84,93 @@ class ListEntry : public JfrHashtableEntry<T, IdType> {
  * which is represented in the binary format as a sequence of checkpoint events.
  * The returned id can be used as a foreign key, but please note that the id is
  * epoch-relative, and is therefore only valid in the current epoch / chunk.
- * The table is cleared as part of rotation.
- *
- * Caller must ensure mutual exclusion by means of the ClassLoaderDataGraph_lock or by safepointing.
  */
-class JfrSymbolTable : public JfrCHeapObj {
-  template <typename, typename, template<typename, typename> class, typename, size_t>
-  friend class HashTableHost;
-  typedef HashTableHost<const Symbol*, traceid, ListEntry, JfrSymbolTable> Symbols;
-  typedef HashTableHost<const char*, traceid, ListEntry, JfrSymbolTable> Strings;
+class JfrSymbolTable : public AllStatic {
   friend class JfrArtifactSet;
+  template <typename, typename, template<typename, typename> class, typename, unsigned>
+  friend class JfrConcurrentHashTableHost;
+  friend class JfrRecorder;
+  friend class JfrRecorderService;
+  friend class JfrSymbolCallback;
+
+  typedef JfrConcurrentHashTableHost<const Symbol*, traceid, JfrSymbolTableEntry, JfrSymbolCallback> Symbols;
+  typedef JfrConcurrentHashTableHost<const char*, traceid, JfrSymbolTableEntry, JfrSymbolCallback> Strings;
 
  public:
-  typedef Symbols::HashEntry SymbolEntry;
-  typedef Strings::HashEntry StringEntry;
+  typedef Symbols::Entry SymbolEntry;
+  typedef Strings::Entry StringEntry;
 
   static traceid add(const Symbol* sym);
   static traceid add(const char* str);
 
  private:
-  Symbols* _symbols;
-  Strings* _strings;
-  const SymbolEntry* _symbol_list;
-  const StringEntry* _string_list;
-  const Symbol* _symbol_query;
-  const char* _string_query;
-  traceid _id_counter;
-  bool _class_unload;
+  class Impl : public JfrCHeapObj {
+    friend class JfrSymbolTable;
+   private:
+    Symbols* _symbols;
+    Strings* _strings;
 
-  JfrSymbolTable();
-  ~JfrSymbolTable();
-  static JfrSymbolTable* create();
+    Impl(unsigned symbol_capacity = 0, unsigned string_capacity = 0);
+    ~Impl();
+
+    void clear();
+
+    traceid add(const Symbol* sym);
+    traceid add(const char* str);
+
+    traceid mark(unsigned hash, const Symbol* sym, bool leakp, bool class_unload = false);
+    traceid mark(const Klass* k, bool leakp, bool class_unload = false);
+    traceid mark(const Symbol* sym, bool leakp = false, bool class_unload = false);
+    traceid mark(const char* str, bool leakp = false, bool class_unload = false);
+    traceid mark(unsigned hash, const char* str, bool leakp, bool class_unload = false);
+    traceid mark_hidden_klass_name(const Klass* k, bool leakp, bool class_unload = false);
+
+    bool has_entries() const;
+    bool has_symbol_entries() const;
+    bool has_string_entries() const;
+
+    unsigned symbols_capacity() const;
+    unsigned symbols_size() const;
+    unsigned strings_capacity() const;
+    unsigned strings_size() const;
+
+    template <typename Functor>
+    void iterate_symbols(Functor& functor);
+
+    template <typename Functor>
+    void iterate_strings(Functor& functor);
+  };
+
+  static Impl* _epoch_0;
+  static Impl* _epoch_1;
+  static StringEntry* _bootstrap;
+
+  static bool create();
   static void destroy();
 
-  void clear();
-  void increment_checkpoint_id();
-  void set_class_unload(bool class_unload);
+  static Impl* this_epoch_table();
+  static Impl* previous_epoch_table();
+  static Impl* epoch_table_selector(u1 epoch);
+  static void set_this_epoch(Impl* table);
+  static void set_previous_epoch(Impl* table);
 
-  traceid mark(uintptr_t hash, const Symbol* sym, bool leakp);
-  traceid mark(const Klass* k, bool leakp);
-  traceid mark(const Symbol* sym, bool leakp = false);
-  traceid mark(const char* str, bool leakp = false);
-  traceid mark(uintptr_t hash, const char* str, bool leakp);
-  traceid mark_hidden_klass_name(const Klass* k, bool leakp);
-  traceid bootstrap_name(bool leakp);
+  static void clear_previous_epoch();
+  static void allocate_next_epoch();
 
-  bool has_entries() const { return has_symbol_entries() || has_string_entries(); }
-  bool has_symbol_entries() const { return _symbol_list != nullptr; }
-  bool has_string_entries() const { return _string_list != nullptr; }
+  static bool has_entries(bool previous_epoch = false);
+  static bool has_symbol_entries(bool previous_epoch = false);
+  static bool has_string_entries(bool previous_epoch = false);
 
-  // hashtable(s) callbacks
-  void on_link(const SymbolEntry* entry);
-  bool on_equals(uintptr_t hash, const SymbolEntry* entry);
-  void on_unlink(const SymbolEntry* entry);
-  void on_link(const StringEntry* entry);
-  bool on_equals(uintptr_t hash, const StringEntry* entry);
-  void on_unlink(const StringEntry* entry);
-
-  template <typename T>
-  static traceid add_impl(const T* sym);
-
-  template <typename T>
-  void assign_id(T* entry);
+  static traceid mark(const Klass* k, bool leakp, bool class_unload = false, bool previous_epoch = false);
+  static traceid mark(const Symbol* sym, bool leakp = false, bool class_unload = false, bool previous_epoch = false);
+  static traceid mark(unsigned hash, const char* str, bool leakp, bool class_unload = false, bool previous_epoch = false);
+  static traceid bootstrap_name(bool leakp);
 
   template <typename Functor>
-  void iterate_symbols(Functor& functor) {
-    iterate(functor, _symbol_list);
-  }
+  static void iterate_symbols(Functor& functor, bool previous_epoch = false);
 
   template <typename Functor>
-  void iterate_strings(Functor& functor) {
-    iterate(functor, _string_list);
-  }
-
-  template <typename Functor, typename T>
-  void iterate(Functor& functor, const T* list) {
-    const T* symbol = list;
-    while (symbol != nullptr) {
-      const T* next = symbol->list_next();
-      functor(symbol);
-      symbol = next;
-    }
-  }
+  static void iterate_strings(Functor& functor, bool previous_epoch = false);
 };
 
 #endif // SHARE_JFR_SUPPORT_JFRSYMBOLTABLE_HPP
diff --git a/src/hotspot/share/jfr/support/jfrSymbolTable.inline.hpp b/src/hotspot/share/jfr/support/jfrSymbolTable.inline.hpp
new file mode 100644
index 00000000000..9e7ac8c9d47
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrSymbolTable.inline.hpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_JFR_SUPPORT_JFRSYMBOLTABLE_INLINE_HPP
+#define SHARE_JFR_SUPPORT_JFRSYMBOLTABLE_INLINE_HPP
+
+#include "jfr/support/jfrSymbolTable.hpp"
+
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
+#include "jfr/utilities/jfrConcurrentHashtable.inline.hpp"
+
+inline JfrSymbolTable::Impl* JfrSymbolTable::epoch_table_selector(u1 epoch) {
+  return epoch == 0 ? _epoch_0 : _epoch_1;
+}
+
+inline JfrSymbolTable::Impl* JfrSymbolTable::this_epoch_table() {
+  return epoch_table_selector(JfrTraceIdEpoch::current());
+}
+
+inline JfrSymbolTable::Impl* JfrSymbolTable::previous_epoch_table() {
+  return epoch_table_selector(JfrTraceIdEpoch::previous());
+}
+
+template <typename Functor>
+inline void JfrSymbolTable::Impl::iterate_symbols(Functor& functor) {
+  _symbols->iterate_entry(functor);
+}
+
+template <typename Functor>
+inline void JfrSymbolTable::iterate_symbols(Functor& functor, bool previous_epoch /* false */) {
+  Impl* const table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  table->iterate_symbols(functor);
+}
+
+template <typename Functor>
+inline void JfrSymbolTable::Impl::iterate_strings(Functor& functor) {
+  _strings->iterate_entry(functor);
+}
+
+template <typename Functor>
+inline void JfrSymbolTable::iterate_strings(Functor& functor, bool previous_epoch /* false */) {
+  Impl* const table = previous_epoch ? previous_epoch_table() : this_epoch_table();
+  assert(table != nullptr, "invariant");
+  if (!functor(_bootstrap)) {
+    return;
+  }
+  table->iterate_strings(functor);
+}
+
+#endif // SHARE_JFR_SUPPORT_JFRSYMBOLTABLE_INLINE_HPP
diff --git a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
index bb0e3e082fe..46b4d973ce4 100644
--- a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
@@ -42,7 +42,6 @@
 #define ASSIGN_PRIMITIVE_CLASS_ID(data) JfrTraceId::assign_primitive_klass_id()
 #define REMOVE_ID(k) JfrTraceId::remove(k);
 #define REMOVE_METHOD_ID(method) JfrTraceId::remove(method);
-#define RESTORE_ID(k) JfrTraceId::restore(k);
 
 static constexpr const uint16_t cleared_epoch_bits = 512 | 256;
 
diff --git a/src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.hpp b/src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.hpp
new file mode 100644
index 00000000000..5434023e636
--- /dev/null
+++ b/src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.hpp
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_JFR_UTILITIES_JFRCONCURRENTHASHTABLE_HPP
+#define SHARE_JFR_UTILITIES_JFRCONCURRENTHASHTABLE_HPP
+
+#include "jfr/utilities/jfrLinkedList.hpp"
+#include "memory/allocation.hpp"
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+class JfrConcurrentAscendingId {
+private:
+  IdType _id;
+public:
+  JfrConcurrentAscendingId() : _id(1) {}
+  // Callbacks.
+  void on_link(TableEntry<T, IdType>* entry);
+  bool on_equals(unsigned hash, const TableEntry<T, IdType>* entry);
+};
+
+template <typename T, typename IdType>
+class JfrConcurrentHashtableEntry : public CHeapObj<mtTracing> {
+  template <typename, typename>
+  friend class JfrLinkedList;
+ private:
+  typedef JfrConcurrentHashtableEntry<T, IdType> Entry;
+  Entry* _next;
+  T _literal;          // ref to item in table.
+  mutable IdType _id;
+  unsigned _hash;
+
+ public:
+  JfrConcurrentHashtableEntry(unsigned hash, const T& data) : _next(nullptr), _literal(data), _id(0), _hash(hash) {}
+  unsigned hash() const { return _hash; }
+  T literal() const { return _literal; }
+  T* literal_addr() { return &_literal; }
+  void set_literal(T s) { _literal = s; }
+  void set_next(Entry* next) { _next = next; }
+  Entry* next() const { return _next; }
+  Entry** next_addr() { return &_next; }
+  IdType id() const { return _id; }
+  void set_id(IdType id) const { _id = id; }
+  T& value() const { return *const_cast<Entry*>(this)->literal_addr(); }
+  const T* value_addr() const { return const_cast<Entry*>(this)->literal_addr(); }
+};
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+class JfrConcurrentHashtable : public CHeapObj<mtTracing> {
+ public:
+  typedef TableEntry<T, IdType> Entry;
+  typedef JfrLinkedList<Entry> Bucket;
+
+  unsigned capacity() const { return _capacity; }
+  unsigned size() const;
+
+ protected:
+  JfrConcurrentHashtable(unsigned size);
+  ~JfrConcurrentHashtable();
+
+  unsigned index(unsigned hash) const {
+    return hash & _mask;
+  }
+
+  Bucket& bucket(unsigned idx) { return _buckets[idx]; }
+  Bucket* bucket_addr(unsigned idx) { return &_buckets[idx]; }
+  Entry* head(unsigned idx) { return bucket(idx).head(); }
+
+  bool try_add(unsigned idx, Entry* entry, Entry* next);
+
+  template <typename Callback>
+  void iterate(Callback& cb);
+
+  template <typename Callback>
+  void iterate(unsigned idx, Callback& cb);
+
+  template <typename Callback>
+  static void iterate(Entry* entry, Callback& cb);
+
+  void unlink_entry(Entry* entry);
+
+ private:
+  Bucket* _buckets;
+  unsigned _capacity;
+  unsigned _mask;
+  unsigned _size;
+};
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry,
+  typename Callback = JfrConcurrentAscendingId<IdType,T, TableEntry>, unsigned TABLE_CAPACITY = 1024>
+class JfrConcurrentHashTableHost : public JfrConcurrentHashtable<T, IdType, TableEntry> {
+ public:
+  typedef TableEntry<T, IdType> Entry;
+  JfrConcurrentHashTableHost(unsigned initial_capacity = 0);
+  JfrConcurrentHashTableHost(Callback* cb, unsigned initial_capacity = 0);
+  ~JfrConcurrentHashTableHost();
+
+  // lookup entry, will put if not found
+  Entry* lookup_put(unsigned hash, const T& data);
+
+  // id retrieval
+  IdType id(unsigned hash, const T& data);
+
+  bool is_empty() const;
+  bool is_nonempty() const { return !is_empty(); }
+
+  template <typename Functor>
+  void iterate_value(Functor& f);
+
+  template <typename Functor>
+  void iterate_entry(Functor& f);
+
+ private:
+  Callback* _callback;
+
+  Entry* new_entry(unsigned hash, const T& data);
+};
+
+#endif // SHARE_JFR_UTILITIES_JFRCONCURRENTHASHTABLE_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.inline.hpp b/src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.inline.hpp
new file mode 100644
index 00000000000..6d6908234a3
--- /dev/null
+++ b/src/hotspot/share/jfr/utilities/jfrConcurrentHashtable.inline.hpp
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_JFR_UTILITIES_JFRCONCURRENTHASHTABLE_INLINE_HPP
+#define SHARE_JFR_UTILITIES_JFRCONCURRENTHASHTABLE_INLINE_HPP
+
+#include "jfr/utilities/jfrConcurrentHashtable.hpp"
+
+#include "jfr/utilities/jfrLinkedList.inline.hpp"
+#include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
+#include "runtime/atomicAccess.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline void JfrConcurrentAscendingId<T, IdType, TableEntry>::on_link(TableEntry<T, IdType>* entry) {
+  assert(entry != nullptr, "invariant");
+  assert(entry->id() == 0, "invariant");
+  entry->set_id(AtomicAccess::fetch_then_add(&_id, static_cast<IdType>(1)));
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline bool JfrConcurrentAscendingId<T, IdType, TableEntry>::on_equals(unsigned hash, const TableEntry<T, IdType>* entry) {
+  assert(entry != nullptr, "invariant");
+  assert(entry->hash() == hash, "invariant");
+  return true;
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline JfrConcurrentHashtable<T, IdType, TableEntry>::JfrConcurrentHashtable(unsigned initial_capacity) :
+  _buckets(nullptr), _capacity(initial_capacity), _mask(initial_capacity - 1), _size(0) {
+  assert(initial_capacity >= 2, "invariant");
+  assert(is_power_of_2(initial_capacity), "invariant");
+  _buckets = NEW_C_HEAP_ARRAY2(Bucket, initial_capacity, mtTracing, CURRENT_PC);
+  memset((void*)_buckets, 0, initial_capacity * sizeof(Bucket));
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline JfrConcurrentHashtable<T, IdType, TableEntry>::~JfrConcurrentHashtable() {
+  FREE_C_HEAP_ARRAY(Bucket, _buckets);
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline unsigned JfrConcurrentHashtable<T, IdType, TableEntry>::size() const {
+  return AtomicAccess::load(&_size);
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+template <typename Callback>
+inline void JfrConcurrentHashtable<T, IdType, TableEntry>::iterate(unsigned idx, Callback& cb) {
+  assert(idx < _capacity, "invariant");
+  bucket(idx).iterate(cb);
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+template <typename Callback>
+inline void JfrConcurrentHashtable<T, IdType, TableEntry>::iterate(Callback& cb) {
+  for (unsigned i = 0; i < _capacity; ++i) {
+    iterate(i, cb);
+  }
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+template <typename Callback>
+inline void JfrConcurrentHashtable<T, IdType, TableEntry>::iterate(TableEntry<T, IdType>* entry, Callback& cb) {
+  Bucket::iterate(entry, cb);
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline bool JfrConcurrentHashtable<T, IdType, TableEntry>::try_add(unsigned idx, TableEntry<T, IdType>* entry, TableEntry<T, IdType>* next) {
+  assert(entry != nullptr, "invariant");
+  entry->set_next(next);
+  const bool added = bucket(idx).try_add(entry, next);
+  if (added) {
+    AtomicAccess::inc(&_size);
+  }
+  return added;
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry>
+inline void JfrConcurrentHashtable<T, IdType, TableEntry>::unlink_entry(TableEntry<T, IdType>* entry) {
+  AtomicAccess::dec(&_size);
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::JfrConcurrentHashTableHost(unsigned initial_capacity /* 0 */) :
+  JfrConcurrentHashtable<T, IdType, TableEntry>(initial_capacity == 0 ? TABLE_CAPACITY : initial_capacity), _callback(new Callback()) {}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::JfrConcurrentHashTableHost(Callback* cb, unsigned initial_capacity /* 0 */) :
+  JfrConcurrentHashtable<T, IdType, TableEntry>(initial_capacity == 0 ? TABLE_CAPACITY : initial_capacity), _callback(cb) {}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline bool JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::is_empty() const {
+  return this->size() == 0;
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline TableEntry<T, IdType>* JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::new_entry(unsigned hash, const T& data) {
+  Entry* const entry = new Entry(hash, data);
+  assert(entry != nullptr, "invariant");
+  assert(0 == entry->id(), "invariant");
+  _callback->on_link(entry);
+  assert(0 != entry->id(), "invariant");
+  return entry;
+}
+
+template <typename T, typename Entry, typename Callback>
+class JfrConcurrentHashtableLookup {
+ private:
+  Callback* const _cb;
+  const T& _data;
+  Entry* _found;
+  unsigned _hash;
+ public:
+  JfrConcurrentHashtableLookup(unsigned hash, const T& data, Callback* cb) : _cb(cb), _data(data), _found(nullptr), _hash(hash) {}
+
+  bool process(Entry* entry) {
+    assert(entry != nullptr, "invariant");
+    if (entry->hash() == _hash && entry->on_equals(_data)) {
+      _found = entry;
+      return false;
+    }
+    return true;
+  }
+
+  bool found() const { return _found != nullptr; }
+  Entry* result() const { return _found; }
+};
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline TableEntry<T, IdType>* JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::lookup_put(unsigned hash, const T& data) {
+  JfrConcurrentHashtableLookup<T, Entry, Callback> lookup(hash, data, _callback);
+  const unsigned idx = this->index(hash);
+  Entry* entry = nullptr;
+  while (true) {
+    assert(!lookup.found(), "invariant");
+    Entry* next = this->head(idx);
+    if (next != nullptr) {
+      JfrConcurrentHashtable<T, IdType, TableEntry>::iterate(next, lookup);
+      if (lookup.found()) {
+        if (entry != nullptr) {
+          _callback->on_unlink(entry);
+          delete entry;
+        }
+        entry = lookup.result();
+        break;
+      }
+    }
+    if (entry == nullptr) {
+      entry = new_entry(hash, data);
+    }
+    assert(entry != nullptr, "invariant");
+    if (this->try_add(idx, entry, next)) {
+      break;
+    }
+    // Concurrent insertion to this bucket. Retry.
+  }
+  assert(entry != nullptr, "invariant");
+  return entry;
+}
+
+// id retrieval
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline IdType JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::id(unsigned hash, const T& data) {
+  assert(data != nullptr, "invariant");
+  const Entry* const entry = lookup_put(hash, data);
+  assert(entry != nullptr, "invariant");
+  assert(entry->id() > 0, "invariant");
+  return entry->id();
+}
+
+template <typename Entry, typename Callback>
+class JfrConcurrentHashtableClear {
+ private:
+  Callback* const _cb;
+ public:
+  JfrConcurrentHashtableClear(Callback* cb) : _cb(cb) {}
+
+  bool process(const Entry* entry) {
+    assert(entry != nullptr, "invariant");
+    _cb->on_unlink(entry);
+    delete entry;
+    return true;
+  }
+};
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+inline JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::~JfrConcurrentHashTableHost() {
+  JfrConcurrentHashtableClear<Entry, Callback> cls(_callback);
+  this->iterate(cls);
+}
+
+template <typename Entry, typename Functor>
+class JfrConcurrentHashtableValueDelegator {
+ private:
+  Functor& _f;
+ public:
+  JfrConcurrentHashtableValueDelegator(Functor& f) : _f(f) {}
+  bool process(const Entry* entry) {
+    assert(entry != nullptr, "invariant");
+    return _f(entry->value());
+  }
+};
+
+template <typename Entry, typename Functor>
+class JfrConcurrentHashtableEntryDelegator {
+ private:
+  Functor& _f;
+ public:
+  JfrConcurrentHashtableEntryDelegator(Functor& f) : _f(f) {}
+  bool process(const Entry* entry) {
+    assert(entry != nullptr, "invariant");
+    return _f(entry);
+  }
+};
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+template <typename Functor>
+inline void JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::iterate_value(Functor& f) {
+  JfrConcurrentHashtableValueDelegator<Entry, Functor> delegator(f);
+  this->iterate(delegator);
+}
+
+template <typename T, typename IdType, template <typename, typename> class TableEntry, typename Callback, unsigned TABLE_CAPACITY>
+template <typename Functor>
+inline void JfrConcurrentHashTableHost<T, IdType, TableEntry, Callback, TABLE_CAPACITY>::iterate_entry(Functor& f) {
+  JfrConcurrentHashtableEntryDelegator<Entry, Functor> delegator(f);
+  this->iterate(delegator);
+}
+
+#endif // SHARE_JFR_UTILITIES_JFRCONCURRENTHASHTABLE_INLINE_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrLinkedList.hpp b/src/hotspot/share/jfr/utilities/jfrLinkedList.hpp
index 96e3acc0daa..a0d18bd383c 100644
--- a/src/hotspot/share/jfr/utilities/jfrLinkedList.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrLinkedList.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,10 +43,13 @@ class JfrLinkedList : public AllocPolicy {
   bool is_empty() const;
   bool is_nonempty() const;
   void add(NodePtr node);
+  bool try_add(NodePtr node, NodePtr next);
   void add_list(NodePtr first);
   NodePtr remove();
   template <typename Callback>
   void iterate(Callback& cb);
+  template <typename Callback>
+  static void iterate(NodePtr node, Callback& cb);
   NodePtr head() const;
   NodePtr excise(NodePtr prev, NodePtr node);
   bool in_list(const NodeType* node) const;
diff --git a/src/hotspot/share/jfr/utilities/jfrLinkedList.inline.hpp b/src/hotspot/share/jfr/utilities/jfrLinkedList.inline.hpp
index fed379672dc..f481caa6528 100644
--- a/src/hotspot/share/jfr/utilities/jfrLinkedList.inline.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrLinkedList.inline.hpp
@@ -30,10 +30,10 @@
 #include "runtime/atomicAccess.hpp"
 
 template <typename NodeType, typename AllocPolicy>
-JfrLinkedList<NodeType, AllocPolicy>::JfrLinkedList() : _head(nullptr) {}
+inline JfrLinkedList<NodeType, AllocPolicy>::JfrLinkedList() : _head(nullptr) {}
 
 template <typename NodeType, typename AllocPolicy>
-bool JfrLinkedList<NodeType, AllocPolicy>::initialize() {
+inline bool JfrLinkedList<NodeType, AllocPolicy>::initialize() {
   return true;
 }
 
@@ -62,6 +62,13 @@ inline void JfrLinkedList<NodeType, AllocPolicy>::add(NodeType* node) {
   } while (AtomicAccess::cmpxchg(&_head, next, node) != next);
 }
 
+template <typename NodeType, typename AllocPolicy>
+inline bool JfrLinkedList<NodeType, AllocPolicy>::try_add(NodeType* node, NodeType* next) {
+  assert(node != nullptr, "invariant");
+  assert(node->_next == next, "invariant");
+  return head() == next && AtomicAccess::cmpxchg(&_head, next, node) == next;
+}
+
 template <typename NodeType, typename AllocPolicy>
 inline NodeType* JfrLinkedList<NodeType, AllocPolicy>::remove() {
   NodePtr node;
@@ -76,19 +83,24 @@ inline NodeType* JfrLinkedList<NodeType, AllocPolicy>::remove() {
 
 template <typename NodeType, typename AllocPolicy>
 template <typename Callback>
-void JfrLinkedList<NodeType, AllocPolicy>::iterate(Callback& cb) {
-  NodePtr current = head();
-  while (current != nullptr) {
-    NodePtr next = (NodePtr)current->_next;
-    if (!cb.process(current)) {
+inline void JfrLinkedList<NodeType, AllocPolicy>::iterate(Callback& cb) {
+  JfrLinkedList<NodeType, AllocPolicy>::iterate(head(), cb);
+}
+
+template <typename NodeType, typename AllocPolicy>
+template <typename Callback>
+inline void JfrLinkedList<NodeType, AllocPolicy>::iterate(NodeType* node, Callback& cb) {
+  while (node != nullptr) {
+    NodePtr next = (NodePtr)node->_next;
+    if (!cb.process(node)) {
       return;
     }
-    current = next;
+    node = next;
   }
 }
 
 template <typename NodeType, typename AllocPolicy>
-NodeType* JfrLinkedList<NodeType, AllocPolicy>::excise(NodeType* prev, NodeType* node) {
+inline NodeType* JfrLinkedList<NodeType, AllocPolicy>::excise(NodeType* prev, NodeType* node) {
   NodePtr next = (NodePtr)node->_next;
   if (prev == nullptr) {
     prev = AtomicAccess::cmpxchg(&_head, node, next);
@@ -106,7 +118,7 @@ NodeType* JfrLinkedList<NodeType, AllocPolicy>::excise(NodeType* prev, NodeType*
 }
 
 template <typename NodeType, typename AllocPolicy>
-bool JfrLinkedList<NodeType, AllocPolicy>::in_list(const NodeType* node) const {
+inline bool JfrLinkedList<NodeType, AllocPolicy>::in_list(const NodeType* node) const {
   assert(node != nullptr, "invariant");
   const NodeType* current = head();
   while (current != nullptr) {
@@ -119,7 +131,7 @@ bool JfrLinkedList<NodeType, AllocPolicy>::in_list(const NodeType* node) const {
 }
 
 template <typename NodeType, typename AllocPolicy>
-NodeType* JfrLinkedList<NodeType, AllocPolicy>::cut() {
+inline NodeType* JfrLinkedList<NodeType, AllocPolicy>::cut() {
   NodePtr node;
   do {
     node = head();
@@ -128,7 +140,7 @@ NodeType* JfrLinkedList<NodeType, AllocPolicy>::cut() {
 }
 
 template <typename NodeType, typename AllocPolicy>
-void JfrLinkedList<NodeType, AllocPolicy>::clear() {
+inline void JfrLinkedList<NodeType, AllocPolicy>::clear() {
   cut();
 }
 
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index b30ec2f4887..772541cdd10 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -57,6 +57,10 @@
 #include "utilities/rotate_bits.hpp"
 #include "utilities/stack.inline.hpp"
 
+#if INCLUDE_JFR
+#include "jfr/jfr.hpp"
+#endif
+
 void Klass::set_java_mirror(Handle m) {
   assert(!m.is_null(), "New mirror should never be null.");
   assert(_java_mirror.is_empty(), "should only be used to initialize mirror");
@@ -862,7 +866,6 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
   assert(is_klass(), "ensure C++ vtable is restored");
   assert(in_aot_cache(), "must be set");
   assert(secondary_supers()->length() >= (int)population_count(_secondary_supers_bitmap), "must be");
-  JFR_ONLY(RESTORE_ID(this);)
   if (log_is_enabled(Trace, aot, unshareable)) {
     ResourceMark rm(THREAD);
     oop class_loader = loader_data->class_loader();
@@ -876,10 +879,13 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
   if (class_loader_data() == nullptr) {
     set_class_loader_data(loader_data);
   }
+
   // Add to class loader list first before creating the mirror
   // (same order as class file parsing)
   loader_data->add_class(this);
 
+  JFR_ONLY(Jfr::on_restoration(this, THREAD);)
+
   Handle loader(THREAD, loader_data->class_loader());
   ModuleEntry* module_entry = nullptr;
   Klass* k = this;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index 91decb1aa20..5d72a9f85dc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -110,6 +110,15 @@ table = "COLUMN 'Time', 'Requested By', 'Operation', 'Classes'
          GROUP BY redefinitionId
          ORDER BY duration DESC"
 
+[jvm.classes-by-source]
+ label = "Classes by Source"
+ table = "COLUMN 'Source', 'Count'
+          FORMAT truncate-beginning, none
+          SELECT source, COUNT(*) AS C
+          FROM jdk.ClassDefine
+          GROUP BY source
+          ORDER BY C DESC"
+
 [jvm.compiler-configuration]
 label = "Compiler Configuration"
 form = "SELECT LAST(threadCount), LAST(dynamicCompilerThreadCount), LAST(tieredCompilation)
diff --git a/test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java b/test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java
index b0522741a1e..74fb8e71e87 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java
@@ -70,6 +70,8 @@ public final class TestClassDefineEvent {
                     "Expected type " + cl.getClass().getName() + ", got type " + definingClassLoaderType.getName());
                 Asserts.assertEquals(cl.getName(), definingClassLoader.getName(),
                     "Defining Class Loader should have the same name as the original class loader");
+                Asserts.assertTrue(event.getString("source").startsWith("file:/"), "Invalid source location");
+                Asserts.assertTrue(event.getString("source").endsWith(TEST_CLASS_NAME.substring(TEST_CLASS_NAME.lastIndexOf('.') + 1) + ".class"), "Invalid source location");
                 foundTestClasses = true;
             }
         }

From aff25f135af20ec89c7a68f2a0a0ede7eb1491a6 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 3 Dec 2025 18:20:31 +0000
Subject: [PATCH 486/512] 4690476: NegativeArraySizeException from
 AffineTransformOp with shear

Reviewed-by: psadhukhan, jdv
---
 .../java/awt/image/AffineTransformOp.java     | 82 ++++++++++++++++---
 .../AffineTransformOp/AffineTxOpSizeTest.java | 68 +++++++++++++++
 2 files changed, 140 insertions(+), 10 deletions(-)
 create mode 100644 test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java

diff --git a/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java b/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java
index 4c4179699f0..7a3ee8646a7 100644
--- a/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/AffineTransformOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,7 +186,13 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
      * {@code getBounds2D(BufferedImage)}
      * are not necessarily the same as the coordinates of the
      * {@code BufferedImage} returned by this method.  If the
-     * upper-left corner coordinates of the rectangle are
+     * application provides a {@code dst} that is always returned.
+     * If {@code dst} is {@code null} and a destination {code BufferedImage}
+     * with the transformed dimensions cannot be created, the {@code src}
+     * dimensions will be substituted.
+     *
+     * <p>
+     * If the upper-left corner coordinates of the rectangle are
      * negative then this part of the rectangle is not drawn.  If the
      * upper-left corner coordinates of the  rectangle are positive
      * then the filtered image is drawn at that position in the
@@ -224,7 +230,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
         BufferedImage origDst = dst;
 
         if (dst == null) {
-            dst = createCompatibleDestImage(src, null);
+            dst = createCompatibleDestImageInt(src, null);
             dstCM = srcCM;
             origDst = dst;
         }
@@ -272,7 +278,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
                 }
                 else {
                     needToConvert = true;
-                    dst = createCompatibleDestImage(src, null);
+                    dst = createCompatibleDestImageInt(src, null);
                 }
             }
 
@@ -320,7 +326,12 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
      * {@code getBounds2D(Raster)}
      * are not necessarily the same as the coordinates of the
      * {@code WritableRaster} returned by this method.  If the
-     * upper-left corner coordinates of rectangle are negative then
+     * application provides a {@code dst} that is always returned.
+     * If {@code dst} is {@code null} and a destination {code Raster}
+     * with the transformed dimensions cannot be created, the {@code src}
+     * dimensions will be substituted.
+     * <p>
+     * If the upper-left corner coordinates of rectangle are negative then
      * this part of the rectangle is not drawn.  If the coordinates
      * of the rectangle are positive then the filtered image is drawn at
      * that position in the destination {@code Raster}.
@@ -342,7 +353,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
             throw new NullPointerException("src image is null");
         }
         if (dst == null) {
-            dst = createCompatibleDestRaster(src);
+            dst = createCompatibleDestRasterInt(src);
         }
         if (src == dst) {
             throw new IllegalArgumentException("src image cannot be the "+
@@ -422,7 +433,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
     /**
      * Creates a zeroed destination image with the correct size and number of
      * bands.  A {@code RasterFormatException} may be thrown if the
-     * transformed width or height is equal to 0.
+     * transformed width or height is less than or equal to 0, or too large.
      * <p>
      * If {@code destCM} is null,
      * an appropriate {@code ColorModel} is used; this
@@ -437,9 +448,36 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
      */
     public BufferedImage createCompatibleDestImage (BufferedImage src,
                                                     ColorModel destCM) {
-        BufferedImage image;
         Rectangle r = getBounds2D(src).getBounds();
+        try {
+            return createCompatibleDestImage(src, destCM, r);
+        } catch (Exception e) {
+             if (e instanceof RasterFormatException) {
+                 throw e;
+             } else {
+                 RasterFormatException re =
+                     new RasterFormatException("Could not create transformed image of size " + r);
+                     re.initCause(e);
+                     throw re;
+             }
+        }
+    }
 
+    private BufferedImage createCompatibleDestImageInt(BufferedImage src,
+                                                      ColorModel destCM) {
+
+       try {
+           return createCompatibleDestImage(src, destCM);
+       } catch (Exception e) {
+           return createCompatibleDestImage(src, destCM, src.getRaster().getBounds());
+       }
+    }
+
+    private BufferedImage createCompatibleDestImage(BufferedImage src,
+                                                    ColorModel destCM,
+                                                    Rectangle r) {
+
+        BufferedImage image;
         // If r.x (or r.y) is < 0, then we want to only create an image
         // that is in the positive range.
         // If r.x (or r.y) is > 0, then we need to create an image that
@@ -482,14 +520,38 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp {
     /**
      * Creates a zeroed destination {@code Raster} with the correct size
      * and number of bands.  A {@code RasterFormatException} may be thrown
-     * if the transformed width or height is equal to 0.
+     * if the transformed width or height is less than or equal to 0, or too large.
      *
      * @param src The {@code Raster} to be transformed.
      *
      * @return The zeroed destination {@code Raster}.
      */
     public WritableRaster createCompatibleDestRaster (Raster src) {
-        Rectangle2D r = getBounds2D(src);
+        Rectangle r = getBounds2D(src).getBounds();
+        try {
+            return createCompatibleDestRaster(src, r);
+        } catch (Exception e) {
+             if (e instanceof RasterFormatException) {
+                 throw e;
+             } else {
+                 RasterFormatException re =
+                     new RasterFormatException("Could not create transformed raster of size " + r);
+                     re.initCause(e);
+                     throw re;
+             }
+        }
+    }
+
+    private WritableRaster createCompatibleDestRasterInt(Raster src) {
+       try {
+           return createCompatibleDestRaster(src);
+       } catch (Exception e) {
+           Rectangle r = src.getBounds();
+           return createCompatibleDestRaster(src, r);
+       }
+    }
+
+    private WritableRaster createCompatibleDestRaster (Raster src, Rectangle r) {
 
         return src.createCompatibleWritableRaster((int)r.getX(),
                                                   (int)r.getY(),
diff --git a/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java b/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java
new file mode 100644
index 00000000000..86f0c1030d6
--- /dev/null
+++ b/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 4690476
+ * @summary Verify behaviour with transform which creates too large an image.
+ */
+
+import java.awt.geom.AffineTransform;
+import java.awt.image.AffineTransformOp;
+import static java.awt.image.AffineTransformOp.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.Raster;
+import java.awt.image.RasterFormatException;
+
+public class AffineTxOpSizeTest {
+
+    static final int W = 2552, H = 3300;
+    // This transform will require an approx 60_000 x 60_000 raster which is too large
+    static final AffineTransform AT = new AffineTransform(0.2, 23, 18, 0.24, -70.0, -90.0);
+
+    public static void main(String[] args) {
+        BufferedImage src = new BufferedImage(W, H, BufferedImage.TYPE_INT_RGB);
+        testAOP(src, TYPE_BICUBIC);
+        testAOP(src, TYPE_BILINEAR);
+        testAOP(src, TYPE_NEAREST_NEIGHBOR);
+    }
+
+    static void testAOP(BufferedImage src, int iType) {
+        AffineTransformOp aop = new AffineTransformOp(AT, iType);
+        System.out.println("Bounds=" + aop.getBounds2D(src));
+
+        aop.filter(src, null);
+        aop.filter(src.getRaster(), null);
+        try {
+             aop.createCompatibleDestImage(src, src.getColorModel());
+             throw new RuntimeException("No exception for image");
+        } catch (RasterFormatException e) {
+        }
+        try {
+             aop.createCompatibleDestRaster(src.getRaster());
+             throw new RuntimeException("No exception for raster");
+        } catch (RasterFormatException e) {
+        }
+  }
+
+}

From 8a5db916aff1dc3eb37f25afbf0a633aa77baa20 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 3 Dec 2025 19:58:28 +0000
Subject: [PATCH 487/512] 8171432: (fs) WindowsWatchService.Poller::run does
 not call ReadDirectoryChangesW after a ERROR_NOTIFY_ENUM_DIR

Reviewed-by: alanb, djelinski
---
 .../sun/nio/fs/WindowsWatchService.java       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java b/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
index d051c833ee7..cd7cc38550c 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -610,23 +610,24 @@ class WindowsWatchService
                 boolean criticalError = false;
                 int errorCode = info.error();
                 int messageSize = info.bytesTransferred();
-                if (errorCode == ERROR_NOTIFY_ENUM_DIR) {
-                    // buffer overflow
-                    key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
-                } else if (errorCode != 0 && errorCode != ERROR_MORE_DATA) {
+                if (errorCode != 0 &&
+                    errorCode != ERROR_MORE_DATA &&
+                    errorCode != ERROR_NOTIFY_ENUM_DIR) {
                     // ReadDirectoryChangesW failed
                     criticalError = true;
                 } else {
                     // ERROR_MORE_DATA is a warning about incomplete
                     // data transfer over TCP/UDP stack. For the case
-                    // [messageSize] is zero in the most of cases.
+                    // [messageSize] is zero in most cases.
 
                     if (messageSize > 0) {
                         // process non-empty events.
                         processEvents(key, messageSize);
-                    } else if (errorCode == 0) {
-                        // insufficient buffer size
-                        // not described, but can happen.
+                    } else if (errorCode == 0 ||
+                               errorCode == ERROR_NOTIFY_ENUM_DIR) {
+                        // errorCode == 0: insufficient buffer size;
+                        //                 not described, but can happen.
+                        // errorCode == ERROR_NOTIFY_ENUM_DIR: buffer overflow
                         key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
                     }
 

From ba777f6610fa3744d5f4bdfb87066b137ab543af Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 3 Dec 2025 19:58:53 +0000
Subject: [PATCH 488/512] 8372851: Modify java/io/File/GetXSpace.java to print
 path on failure of native call

Reviewed-by: jpai, naoto
---
 test/jdk/java/io/File/GetXSpace.java | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java
index e61880edb2c..96ce4ede1b2 100644
--- a/test/jdk/java/io/File/GetXSpace.java
+++ b/test/jdk/java/io/File/GetXSpace.java
@@ -106,7 +106,7 @@ public class GetXSpace {
         Space(String name) {
             this.name = name;
             long[] sizes = new long[4];
-            if (Platform.isWindows() & isCDDrive(name)) {
+            if (Platform.isWindows() && isCDDrive(name)) {
                 try {
                     getCDDriveSpace(name, sizes);
                 } catch (IOException e) {
@@ -114,7 +114,7 @@ public class GetXSpace {
                     throw new RuntimeException("can't get CDDrive sizes");
                 }
             } else {
-                if (getSpace0(name, sizes))
+                if (getSpace(name, sizes))
                     System.err.println("WARNING: total space is estimated");
             }
             this.size = sizes[0];
@@ -184,7 +184,7 @@ public class GetXSpace {
 
         out.format("%s (%d):%n", s.name(), s.size());
         String fmt = "  %-4s total = %12d free = %12d usable = %12d%n";
-        String method = Platform.isWindows() & isCDDrive(s.name()) ? "getCDDriveSpace" : "getSpace0";
+        String method = Platform.isWindows() && isCDDrive(s.name()) ? "getCDDriveSpace" : "getSpace";
         out.format(fmt, method, s.total(), s.free(), s.available());
         out.format(fmt, "getXSpace", ts, fs, us);
 
@@ -336,7 +336,7 @@ public class GetXSpace {
     private static int testVolumes() {
         out.println("--- Testing volumes");
         // Find all of the partitions on the machine and verify that the sizes
-        // returned by File::getXSpace are equivalent to those from getSpace0 or getCDDriveSpace
+        // returned by File::getXSpace are equivalent to those from getSpace or getCDDriveSpace
         ArrayList<String> l;
         try {
             l = paths();
@@ -412,6 +412,19 @@ public class GetXSpace {
 
     private static native boolean isCDDrive(String root);
 
+    private static boolean getSpace(String root, long[] space) {
+        try {
+            return getSpace0(root, space);
+        } catch (RuntimeException e) {
+            File f = new File(root);
+            boolean exists = f.exists();
+            boolean readable = f.canRead();
+            System.err.printf("getSpace0 failed for %s (%s, %s)%n",
+                              root, exists, readable);
+            throw e;
+        }
+    }
+
     private static void getCDDriveSpace(String root, long[] sizes)
         throws IOException {
         String[] cmd = new String[] {"df", "-k", "-P", root};

From e534ee99327fed2263302a00061fb46fcdc6e302 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Wed, 3 Dec 2025 20:01:45 +0000
Subject: [PATCH 489/512] 8364343: Virtual Thread transition management needs
 to be independent of JVM TI

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: coleenp, dholmes, sspitsyn
---
 src/hotspot/share/classfile/javaClasses.cpp   |  44 +-
 src/hotspot/share/classfile/javaClasses.hpp   |  23 +-
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   8 +-
 src/hotspot/share/classfile/vmSymbols.hpp     |  12 +-
 src/hotspot/share/code/aotCodeCache.cpp       |  10 +-
 src/hotspot/share/include/jvm.h               |   8 +-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  11 +-
 src/hotspot/share/opto/c2compiler.cpp         |   8 +-
 src/hotspot/share/opto/library_call.cpp       | 109 ++--
 src/hotspot/share/opto/library_call.hpp       |   6 +-
 src/hotspot/share/opto/runtime.cpp            |  56 +--
 src/hotspot/share/opto/runtime.hpp            |  53 +-
 src/hotspot/share/prims/jvm.cpp               |  70 +--
 src/hotspot/share/prims/jvmtiEnv.cpp          |  77 +--
 src/hotspot/share/prims/jvmtiEnvBase.cpp      |  30 +-
 src/hotspot/share/prims/jvmtiExport.cpp       |  11 +-
 src/hotspot/share/prims/jvmtiExtensions.cpp   |   5 +-
 src/hotspot/share/prims/jvmtiTagMap.cpp       |   7 +-
 src/hotspot/share/prims/jvmtiThreadState.cpp  | 473 ------------------
 src/hotspot/share/prims/jvmtiThreadState.hpp  |  61 ---
 src/hotspot/share/runtime/continuation.cpp    |  63 +--
 .../share/runtime/continuationFreezeThaw.cpp  |  19 +-
 src/hotspot/share/runtime/handshake.cpp       |  22 +
 src/hotspot/share/runtime/handshake.hpp       |   1 +
 src/hotspot/share/runtime/javaThread.cpp      |  39 +-
 src/hotspot/share/runtime/javaThread.hpp      |  35 +-
 .../share/runtime/mountUnmountDisabler.cpp    | 450 +++++++++++++++++
 .../share/runtime/mountUnmountDisabler.hpp    |  92 ++++
 src/hotspot/share/runtime/mutexLocker.cpp     |   8 +-
 src/hotspot/share/runtime/mutexLocker.hpp     |   2 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |  28 --
 src/hotspot/share/runtime/sharedRuntime.hpp   |   8 -
 .../share/runtime/stubDeclarations.hpp        |  27 +-
 src/hotspot/share/runtime/stubInfo.cpp        |  11 +-
 src/hotspot/share/runtime/stubInfo.hpp        |  19 +-
 .../share/runtime/suspendResumeManager.cpp    |   3 +-
 src/hotspot/share/services/threadService.cpp  |  70 +--
 .../classes/java/lang/VirtualThread.java      |  39 +-
 .../share/native/libjava/VirtualThread.c      |   8 +-
 .../DumpThreadsWhenParking.java               | 159 ++++++
 .../DumpThreadsWithEliminatedLock.java        |   4 +
 41 files changed, 1140 insertions(+), 1049 deletions(-)
 create mode 100644 src/hotspot/share/runtime/mountUnmountDisabler.cpp
 create mode 100644 src/hotspot/share/runtime/mountUnmountDisabler.hpp
 create mode 100644 test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWhenParking.java

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index ee80dbbc45c..614a0199beb 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1684,8 +1684,8 @@ int java_lang_Thread::_name_offset;
 int java_lang_Thread::_contextClassLoader_offset;
 int java_lang_Thread::_eetop_offset;
 int java_lang_Thread::_jvmti_thread_state_offset;
-int java_lang_Thread::_jvmti_VTMS_transition_disable_count_offset;
-int java_lang_Thread::_jvmti_is_in_VTMS_transition_offset;
+int java_lang_Thread::_vthread_transition_disable_count_offset;
+int java_lang_Thread::_is_in_vthread_transition_offset;
 int java_lang_Thread::_interrupted_offset;
 int java_lang_Thread::_interruptLock_offset;
 int java_lang_Thread::_tid_offset;
@@ -1745,34 +1745,34 @@ void java_lang_Thread::set_jvmti_thread_state(oop java_thread, JvmtiThreadState*
   java_thread->address_field_put(_jvmti_thread_state_offset, (address)state);
 }
 
-int java_lang_Thread::VTMS_transition_disable_count(oop java_thread) {
-  return java_thread->int_field(_jvmti_VTMS_transition_disable_count_offset);
+int java_lang_Thread::vthread_transition_disable_count(oop java_thread) {
+  jint* addr = java_thread->field_addr<jint>(_vthread_transition_disable_count_offset);
+  return AtomicAccess::load(addr);
 }
 
-void java_lang_Thread::inc_VTMS_transition_disable_count(oop java_thread) {
-  assert(JvmtiVTMSTransition_lock->owned_by_self(), "Must be locked");
-  int val = VTMS_transition_disable_count(java_thread);
-  java_thread->int_field_put(_jvmti_VTMS_transition_disable_count_offset, val + 1);
+void java_lang_Thread::inc_vthread_transition_disable_count(oop java_thread) {
+  assert(VThreadTransition_lock->owned_by_self(), "Must be locked");
+  jint* addr = java_thread->field_addr<jint>(_vthread_transition_disable_count_offset);
+  int val = AtomicAccess::load(addr);
+  AtomicAccess::store(addr, val + 1);
 }
 
-void java_lang_Thread::dec_VTMS_transition_disable_count(oop java_thread) {
-  assert(JvmtiVTMSTransition_lock->owned_by_self(), "Must be locked");
-  int val = VTMS_transition_disable_count(java_thread);
-  assert(val > 0, "VTMS_transition_disable_count should never be negative");
-  java_thread->int_field_put(_jvmti_VTMS_transition_disable_count_offset, val - 1);
+void java_lang_Thread::dec_vthread_transition_disable_count(oop java_thread) {
+  assert(VThreadTransition_lock->owned_by_self(), "Must be locked");
+  jint* addr = java_thread->field_addr<jint>(_vthread_transition_disable_count_offset);
+  int val = AtomicAccess::load(addr);
+  AtomicAccess::store(addr, val - 1);
 }
 
-bool java_lang_Thread::is_in_VTMS_transition(oop java_thread) {
-  return java_thread->bool_field_volatile(_jvmti_is_in_VTMS_transition_offset);
+bool java_lang_Thread::is_in_vthread_transition(oop java_thread) {
+  jboolean* addr = java_thread->field_addr<jboolean>(_is_in_vthread_transition_offset);
+  return AtomicAccess::load(addr);
 }
 
-void java_lang_Thread::set_is_in_VTMS_transition(oop java_thread, bool val) {
-  assert(is_in_VTMS_transition(java_thread) != val, "already %s transition", val ? "inside" : "outside");
-  java_thread->bool_field_put_volatile(_jvmti_is_in_VTMS_transition_offset, val);
-}
-
-int java_lang_Thread::is_in_VTMS_transition_offset() {
-  return _jvmti_is_in_VTMS_transition_offset;
+void java_lang_Thread::set_is_in_vthread_transition(oop java_thread, bool val) {
+  assert(is_in_vthread_transition(java_thread) != val, "already %s transition", val ? "inside" : "outside");
+  jboolean* addr = java_thread->field_addr<jboolean>(_is_in_vthread_transition_offset);
+  AtomicAccess::store(addr, (jboolean)val);
 }
 
 void java_lang_Thread::clear_scopedValueBindings(oop java_thread) {
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 699dd39b887..33dc912404c 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -375,8 +375,8 @@ class java_lang_Class : AllStatic {
 
 #define THREAD_INJECTED_FIELDS(macro)                                  \
   macro(java_lang_Thread, jvmti_thread_state, intptr_signature, false) \
-  macro(java_lang_Thread, jvmti_VTMS_transition_disable_count, int_signature, false) \
-  macro(java_lang_Thread, jvmti_is_in_VTMS_transition, bool_signature, false) \
+  macro(java_lang_Thread, vthread_transition_disable_count, int_signature, false) \
+  macro(java_lang_Thread, is_in_vthread_transition, bool_signature, false) \
   JFR_ONLY(macro(java_lang_Thread, jfr_epoch, short_signature, false))
 
 class java_lang_Thread : AllStatic {
@@ -390,8 +390,8 @@ class java_lang_Thread : AllStatic {
   static int _contextClassLoader_offset;
   static int _eetop_offset;
   static int _jvmti_thread_state_offset;
-  static int _jvmti_VTMS_transition_disable_count_offset;
-  static int _jvmti_is_in_VTMS_transition_offset;
+  static int _vthread_transition_disable_count_offset;
+  static int _is_in_vthread_transition_offset;
   static int _interrupted_offset;
   static int _interruptLock_offset;
   static int _tid_offset;
@@ -444,12 +444,15 @@ class java_lang_Thread : AllStatic {
 
   static JvmtiThreadState* jvmti_thread_state(oop java_thread);
   static void set_jvmti_thread_state(oop java_thread, JvmtiThreadState* state);
-  static int  VTMS_transition_disable_count(oop java_thread);
-  static void inc_VTMS_transition_disable_count(oop java_thread);
-  static void dec_VTMS_transition_disable_count(oop java_thread);
-  static bool is_in_VTMS_transition(oop java_thread);
-  static void set_is_in_VTMS_transition(oop java_thread, bool val);
-  static int  is_in_VTMS_transition_offset();
+
+  static int  vthread_transition_disable_count(oop java_thread);
+  static void inc_vthread_transition_disable_count(oop java_thread);
+  static void dec_vthread_transition_disable_count(oop java_thread);
+  static int  vthread_transition_disable_count_offset() { return _vthread_transition_disable_count_offset; }
+
+  static bool is_in_vthread_transition(oop java_thread);
+  static void set_is_in_vthread_transition(oop java_thread, bool val);
+  static int  is_in_vthread_transition_offset() { return _is_in_vthread_transition_offset; }
 
   // Clear all scoped value bindings on error
   static void clear_scopedValueBindings(oop java_thread);
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 0895418ef84..6f9c2326a45 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -649,10 +649,10 @@ class methodHandle;
   do_intrinsic(_Continuation_unpin,        jdk_internal_vm_Continuation, unpin_name, void_method_signature, F_SN)       \
                                                                                                                         \
   /* java/lang/VirtualThread */                                                                                         \
-  do_intrinsic(_notifyJvmtiVThreadStart, java_lang_VirtualThread, notifyJvmtiStart_name, void_method_signature, F_RN)   \
-  do_intrinsic(_notifyJvmtiVThreadEnd, java_lang_VirtualThread, notifyJvmtiEnd_name, void_method_signature, F_RN)       \
-  do_intrinsic(_notifyJvmtiVThreadMount, java_lang_VirtualThread, notifyJvmtiMount_name, bool_void_signature, F_RN)     \
-  do_intrinsic(_notifyJvmtiVThreadUnmount, java_lang_VirtualThread, notifyJvmtiUnmount_name, bool_void_signature, F_RN) \
+  do_intrinsic(_vthreadEndFirstTransition, java_lang_VirtualThread, endFirstTransition_name, void_method_signature, F_RN) \
+  do_intrinsic(_vthreadStartFinalTransition, java_lang_VirtualThread, startFinalTransition_name, void_method_signature, F_RN) \
+  do_intrinsic(_vthreadStartTransition, java_lang_VirtualThread, startTransition_name, bool_void_signature, F_RN)       \
+  do_intrinsic(_vthreadEndTransition, java_lang_VirtualThread, endTransition_name, bool_void_signature, F_RN)           \
   do_intrinsic(_notifyJvmtiVThreadDisableSuspend, java_lang_VirtualThread, notifyJvmtiDisableSuspend_name, bool_void_signature, F_SN) \
                                                                                                                         \
   /* support for UnsafeConstants */                                                                                     \
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index d22700b8d1f..8388b98faae 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -395,10 +395,10 @@ class SerializeClosure;
   template(run_finalization_name,                     "runFinalization")                          \
   template(dispatchUncaughtException_name,            "dispatchUncaughtException")                \
   template(loadClass_name,                            "loadClass")                                \
-  template(notifyJvmtiStart_name,                     "notifyJvmtiStart")                         \
-  template(notifyJvmtiEnd_name,                       "notifyJvmtiEnd")                           \
-  template(notifyJvmtiMount_name,                     "notifyJvmtiMount")                         \
-  template(notifyJvmtiUnmount_name,                   "notifyJvmtiUnmount")                       \
+  template(startTransition_name,                      "startTransition")                          \
+  template(endTransition_name,                        "endTransition")                            \
+  template(startFinalTransition_name,                 "startFinalTransition")                     \
+  template(endFirstTransition_name,                   "endFirstTransition")                       \
   template(notifyJvmtiDisableSuspend_name,            "notifyJvmtiDisableSuspend")                \
   template(doYield_name,                              "doYield")                                  \
   template(enter_name,                                "enter")                                    \
@@ -497,8 +497,8 @@ class SerializeClosure;
   template(java_lang_Boolean_signature,               "Ljava/lang/Boolean;")                      \
   template(url_code_signer_array_void_signature,      "(Ljava/net/URL;[Ljava/security/CodeSigner;)V") \
   template(jvmti_thread_state_name,                   "jvmti_thread_state")                       \
-  template(jvmti_VTMS_transition_disable_count_name,  "jvmti_VTMS_transition_disable_count")      \
-  template(jvmti_is_in_VTMS_transition_name,          "jvmti_is_in_VTMS_transition")              \
+  template(vthread_transition_disable_count_name,     "vthread_transition_disable_count")         \
+  template(is_in_vthread_transition_name,             "is_in_vthread_transition")                 \
   template(module_entry_name,                         "module_entry")                             \
   template(resolved_references_name,                  "<resolved_references>")                    \
   template(init_lock_name,                            "<init_lock>")                              \
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 04776f4c16c..0314c5227d2 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -1346,18 +1346,16 @@ void AOTCodeAddressTable::init_extrs() {
     SET_ADDRESS(_extrs, OptoRuntime::multianewarray4_C);
     SET_ADDRESS(_extrs, OptoRuntime::multianewarray5_C);
     SET_ADDRESS(_extrs, OptoRuntime::multianewarrayN_C);
-#if INCLUDE_JVMTI
-    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_start);
-    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_end);
-    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_mount);
-    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_unmount);
-#endif
     SET_ADDRESS(_extrs, OptoRuntime::complete_monitor_locking_C);
     SET_ADDRESS(_extrs, OptoRuntime::monitor_notify_C);
     SET_ADDRESS(_extrs, OptoRuntime::monitor_notifyAll_C);
     SET_ADDRESS(_extrs, OptoRuntime::rethrow_C);
     SET_ADDRESS(_extrs, OptoRuntime::slow_arraycopy_C);
     SET_ADDRESS(_extrs, OptoRuntime::register_finalizer_C);
+    SET_ADDRESS(_extrs, OptoRuntime::vthread_end_first_transition_C);
+    SET_ADDRESS(_extrs, OptoRuntime::vthread_start_final_transition_C);
+    SET_ADDRESS(_extrs, OptoRuntime::vthread_start_transition_C);
+    SET_ADDRESS(_extrs, OptoRuntime::vthread_end_transition_C);
 #if defined(AARCH64)
     SET_ADDRESS(_extrs, JavaThread::verify_cross_modify_fence_failure);
 #endif // AARCH64
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index ce76a95fda7..dccdcacef71 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -1100,16 +1100,16 @@ JVM_GetEnclosingMethodInfo(JNIEnv* env, jclass ofClass);
  * Virtual thread support.
  */
 JNIEXPORT void JNICALL
-JVM_VirtualThreadStart(JNIEnv* env, jobject vthread);
+JVM_VirtualThreadEndFirstTransition(JNIEnv* env, jobject vthread);
 
 JNIEXPORT void JNICALL
-JVM_VirtualThreadEnd(JNIEnv* env, jobject vthread);
+JVM_VirtualThreadStartFinalTransition(JNIEnv* env, jobject vthread);
 
 JNIEXPORT void JNICALL
-JVM_VirtualThreadMount(JNIEnv* env, jobject vthread, jboolean hide);
+JVM_VirtualThreadStartTransition(JNIEnv* env, jobject vthread, jboolean is_mount);
 
 JNIEXPORT void JNICALL
-JVM_VirtualThreadUnmount(JNIEnv* env, jobject vthread, jboolean hide);
+JVM_VirtualThreadEndTransition(JNIEnv* env, jobject vthread, jboolean is_mount);
 
 JNIEXPORT void JNICALL
 JVM_VirtualThreadDisableSuspend(JNIEnv* env, jclass clazz, jboolean enter);
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 7ef16f6e32c..7f009eba5f1 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -37,6 +37,7 @@
 #include "runtime/continuationEntry.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/flags/jvmFlag.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/objectMonitor.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -259,13 +260,13 @@
   nonstatic_field(JavaThread,                  _om_cache,                                     OMCache)                               \
   nonstatic_field(JavaThread,                  _cont_entry,                                   ContinuationEntry*)                    \
   nonstatic_field(JavaThread,                  _unlocked_inflated_monitor,                    ObjectMonitor*)                        \
-  JVMTI_ONLY(nonstatic_field(JavaThread,       _is_in_VTMS_transition,                        bool))                                 \
+  nonstatic_field(JavaThread,                  _is_in_vthread_transition,                     bool)                                  \
   JVMTI_ONLY(nonstatic_field(JavaThread,       _is_disable_suspend,                           bool))                                 \
                                                                                                                                      \
   nonstatic_field(ContinuationEntry,           _pin_count,                                    uint32_t)                              \
   nonstatic_field(LockStack,                   _top,                                          uint32_t)                              \
                                                                                                                                      \
-  JVMTI_ONLY(static_field(JvmtiVTMSTransitionDisabler, _VTMS_notify_jvmti_events,             bool))                                 \
+  static_field(MountUnmountDisabler,           _notify_jvmti_events,                          bool)                                  \
                                                                                                                                      \
   static_field(java_lang_Class,                _klass_offset,                                 int)                                   \
   static_field(java_lang_Class,                _array_klass_offset,                           int)                                   \
@@ -435,7 +436,7 @@
   JFR_ONLY(nonstatic_field(Thread,          _jfr_thread_local,                                JfrThreadLocal))                       \
                                                                                                                                      \
   static_field(java_lang_Thread,            _tid_offset,                                      int)                                   \
-  static_field(java_lang_Thread,            _jvmti_is_in_VTMS_transition_offset,              int)                                   \
+  static_field(java_lang_Thread,            _is_in_vthread_transition_offset,                 int)                                   \
   JFR_ONLY(static_field(java_lang_Thread,   _jfr_epoch_offset,                                int))                                  \
                                                                                                                                      \
   JFR_ONLY(nonstatic_field(JfrThreadLocal,  _vthread_id,                                      traceid))                              \
@@ -877,10 +878,6 @@
   declare_function(SharedRuntime::enable_stack_reserved_zone)             \
   declare_function(SharedRuntime::frem)                                   \
   declare_function(SharedRuntime::drem)                                   \
-  JVMTI_ONLY(declare_function(SharedRuntime::notify_jvmti_vthread_start)) \
-  JVMTI_ONLY(declare_function(SharedRuntime::notify_jvmti_vthread_end))   \
-  JVMTI_ONLY(declare_function(SharedRuntime::notify_jvmti_vthread_mount)) \
-  JVMTI_ONLY(declare_function(SharedRuntime::notify_jvmti_vthread_unmount)) \
                                                                           \
   declare_function(os::dll_load)                                          \
   declare_function(os::dll_lookup)                                        \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index acc28964627..ead1b78cdea 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -859,11 +859,11 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_VectorBinaryLibOp:
     return EnableVectorSupport && Matcher::supports_vector_calling_convention();
   case vmIntrinsics::_blackhole:
+  case vmIntrinsics::_vthreadEndFirstTransition:
+  case vmIntrinsics::_vthreadStartFinalTransition:
+  case vmIntrinsics::_vthreadStartTransition:
+  case vmIntrinsics::_vthreadEndTransition:
 #if INCLUDE_JVMTI
-  case vmIntrinsics::_notifyJvmtiVThreadStart:
-  case vmIntrinsics::_notifyJvmtiVThreadEnd:
-  case vmIntrinsics::_notifyJvmtiVThreadMount:
-  case vmIntrinsics::_notifyJvmtiVThreadUnmount:
   case vmIntrinsics::_notifyJvmtiVThreadDisableSuspend:
 #endif
     break;
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index dc53cb08396..6d4a9104580 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -55,6 +55,7 @@
 #include "prims/jvmtiThreadState.hpp"
 #include "prims/unsafe.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/objectMonitor.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
@@ -479,15 +480,15 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_Continuation_pin:          return inline_native_Continuation_pinning(false);
   case vmIntrinsics::_Continuation_unpin:        return inline_native_Continuation_pinning(true);
 
+  case vmIntrinsics::_vthreadEndFirstTransition:    return inline_native_vthread_end_transition(CAST_FROM_FN_PTR(address, OptoRuntime::vthread_end_first_transition_Java()),
+                                                                                                "endFirstTransition", true);
+  case vmIntrinsics::_vthreadStartFinalTransition:  return inline_native_vthread_start_transition(CAST_FROM_FN_PTR(address, OptoRuntime::vthread_start_final_transition_Java()),
+                                                                                                  "startFinalTransition", true);
+  case vmIntrinsics::_vthreadStartTransition:       return inline_native_vthread_start_transition(CAST_FROM_FN_PTR(address, OptoRuntime::vthread_start_transition_Java()),
+                                                                                                  "startTransition", false);
+  case vmIntrinsics::_vthreadEndTransition:         return inline_native_vthread_end_transition(CAST_FROM_FN_PTR(address, OptoRuntime::vthread_end_transition_Java()),
+                                                                                                "endTransition", false);
 #if INCLUDE_JVMTI
-  case vmIntrinsics::_notifyJvmtiVThreadStart:   return inline_native_notify_jvmti_funcs(CAST_FROM_FN_PTR(address, OptoRuntime::notify_jvmti_vthread_start()),
-                                                                                         "notifyJvmtiStart", true, false);
-  case vmIntrinsics::_notifyJvmtiVThreadEnd:     return inline_native_notify_jvmti_funcs(CAST_FROM_FN_PTR(address, OptoRuntime::notify_jvmti_vthread_end()),
-                                                                                         "notifyJvmtiEnd", false, true);
-  case vmIntrinsics::_notifyJvmtiVThreadMount:   return inline_native_notify_jvmti_funcs(CAST_FROM_FN_PTR(address, OptoRuntime::notify_jvmti_vthread_mount()),
-                                                                                         "notifyJvmtiMount", false, false);
-  case vmIntrinsics::_notifyJvmtiVThreadUnmount: return inline_native_notify_jvmti_funcs(CAST_FROM_FN_PTR(address, OptoRuntime::notify_jvmti_vthread_unmount()),
-                                                                                         "notifyJvmtiUnmount", false, false);
   case vmIntrinsics::_notifyJvmtiVThreadDisableSuspend: return inline_native_notify_jvmti_sync();
 #endif
 
@@ -3042,46 +3043,80 @@ bool LibraryCallKit::inline_native_time_funcs(address funcAddr, const char* func
   return true;
 }
 
-
-#if INCLUDE_JVMTI
-
-// When notifications are disabled then just update the VTMS transition bit and return.
-// Otherwise, the bit is updated in the given function call implementing JVMTI notification protocol.
-bool LibraryCallKit::inline_native_notify_jvmti_funcs(address funcAddr, const char* funcName, bool is_start, bool is_end) {
-  if (!DoJVMTIVirtualThreadTransitions) {
-    return true;
-  }
+//--------------------inline_native_vthread_start_transition--------------------
+// inline void startTransition(boolean is_mount);
+// inline void startFinalTransition();
+// Pseudocode of implementation:
+//
+// java_lang_Thread::set_is_in_vthread_transition(vthread, true);
+// carrier->set_is_in_vthread_transition(true);
+// OrderAccess::storeload();
+// int disable_requests = java_lang_Thread::vthread_transition_disable_count(vthread)
+//                        + global_vthread_transition_disable_count();
+// if (disable_requests > 0) {
+//   slow path: runtime call
+// }
+bool LibraryCallKit::inline_native_vthread_start_transition(address funcAddr, const char* funcName, bool is_final_transition) {
   Node* vt_oop = _gvn.transform(must_be_not_null(argument(0), true)); // VirtualThread this argument
   IdealKit ideal(this);
 
-  Node* ONE = ideal.ConI(1);
-  Node* hide = is_start ? ideal.ConI(0) : (is_end ? ideal.ConI(1) : _gvn.transform(argument(1)));
-  Node* addr = makecon(TypeRawPtr::make((address)&JvmtiVTMSTransitionDisabler::_VTMS_notify_jvmti_events));
-  Node* notify_jvmti_enabled = ideal.load(ideal.ctrl(), addr, TypeInt::BOOL, T_BOOLEAN, Compile::AliasIdxRaw);
+  Node* thread = ideal.thread();
+  Node* jt_addr = basic_plus_adr(thread, in_bytes(JavaThread::is_in_vthread_transition_offset()));
+  Node* vt_addr = basic_plus_adr(vt_oop, java_lang_Thread::is_in_vthread_transition_offset());
+  access_store_at(nullptr, jt_addr, _gvn.type(jt_addr)->is_ptr(), ideal.ConI(1), TypeInt::BOOL, T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
+  access_store_at(nullptr, vt_addr, _gvn.type(vt_addr)->is_ptr(), ideal.ConI(1), TypeInt::BOOL, T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
+  insert_mem_bar(Op_MemBarVolatile);
+  ideal.sync_kit(this);
 
-  ideal.if_then(notify_jvmti_enabled, BoolTest::eq, ONE); {
+  Node* global_disable_addr = makecon(TypeRawPtr::make((address)MountUnmountDisabler::global_vthread_transition_disable_count_address()));
+  Node* global_disable = ideal.load(ideal.ctrl(), global_disable_addr, TypeInt::INT, T_INT, Compile::AliasIdxRaw, true /*require_atomic_access*/);
+  Node* vt_disable_addr = basic_plus_adr(vt_oop, java_lang_Thread::vthread_transition_disable_count_offset());
+  Node* vt_disable = ideal.load(ideal.ctrl(), vt_disable_addr, TypeInt::INT, T_INT, Compile::AliasIdxRaw, true /*require_atomic_access*/);
+  Node* disabled = _gvn.transform(new AddINode(global_disable, vt_disable));
+
+  ideal.if_then(disabled, BoolTest::ne, ideal.ConI(0)); {
     sync_kit(ideal);
-    // if notifyJvmti enabled then make a call to the given SharedRuntime function
-    const TypeFunc* tf = OptoRuntime::notify_jvmti_vthread_Type();
-    make_runtime_call(RC_NO_LEAF, tf, funcAddr, funcName, TypePtr::BOTTOM, vt_oop, hide);
+    Node* is_mount = is_final_transition ? ideal.ConI(0) : _gvn.transform(argument(1));
+    const TypeFunc* tf = OptoRuntime::vthread_transition_Type();
+    make_runtime_call(RC_NO_LEAF, tf, funcAddr, funcName, TypePtr::BOTTOM, vt_oop, is_mount);
     ideal.sync_kit(this);
-  } ideal.else_(); {
-    // set hide value to the VTMS transition bit in current JavaThread and VirtualThread object
-    Node* thread = ideal.thread();
-    Node* jt_addr = basic_plus_adr(thread, in_bytes(JavaThread::is_in_VTMS_transition_offset()));
-    Node* vt_addr = basic_plus_adr(vt_oop, java_lang_Thread::is_in_VTMS_transition_offset());
+  }
+  ideal.end_if();
 
-    sync_kit(ideal);
-    access_store_at(nullptr, jt_addr, _gvn.type(jt_addr)->is_ptr(), hide, _gvn.type(hide), T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
-    access_store_at(nullptr, vt_addr, _gvn.type(vt_addr)->is_ptr(), hide, _gvn.type(hide), T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
-
-    ideal.sync_kit(this);
-  } ideal.end_if();
   final_sync(ideal);
-
   return true;
 }
 
+bool LibraryCallKit::inline_native_vthread_end_transition(address funcAddr, const char* funcName, bool is_first_transition) {
+  Node* vt_oop = _gvn.transform(must_be_not_null(argument(0), true)); // VirtualThread this argument
+  IdealKit ideal(this);
+
+  Node* _notify_jvmti_addr = makecon(TypeRawPtr::make((address)MountUnmountDisabler::notify_jvmti_events_address()));
+  Node* _notify_jvmti = ideal.load(ideal.ctrl(), _notify_jvmti_addr, TypeInt::BOOL, T_BOOLEAN, Compile::AliasIdxRaw);
+
+  ideal.if_then(_notify_jvmti, BoolTest::eq, ideal.ConI(1)); {
+    sync_kit(ideal);
+    Node* is_mount = is_first_transition ? ideal.ConI(1) : _gvn.transform(argument(1));
+    const TypeFunc* tf = OptoRuntime::vthread_transition_Type();
+    make_runtime_call(RC_NO_LEAF, tf, funcAddr, funcName, TypePtr::BOTTOM, vt_oop, is_mount);
+    ideal.sync_kit(this);
+  } ideal.else_(); {
+    Node* thread = ideal.thread();
+    Node* jt_addr = basic_plus_adr(thread, in_bytes(JavaThread::is_in_vthread_transition_offset()));
+    Node* vt_addr = basic_plus_adr(vt_oop, java_lang_Thread::is_in_vthread_transition_offset());
+
+    sync_kit(ideal);
+    access_store_at(nullptr, jt_addr, _gvn.type(jt_addr)->is_ptr(), ideal.ConI(0), TypeInt::BOOL, T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
+    access_store_at(nullptr, vt_addr, _gvn.type(vt_addr)->is_ptr(), ideal.ConI(0), TypeInt::BOOL, T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
+    ideal.sync_kit(this);
+  } ideal.end_if();
+
+  final_sync(ideal);
+  return true;
+}
+
+#if INCLUDE_JVMTI
+
 // Always update the is_disable_suspend bit.
 bool LibraryCallKit::inline_native_notify_jvmti_sync() {
   if (!DoJVMTIVirtualThreadTransitions) {
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 7dbb57c1e5c..bfe29814dec 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -275,9 +275,11 @@ class LibraryCallKit : public GraphKit {
   bool inline_native_Continuation_pinning(bool unpin);
 
   bool inline_native_time_funcs(address method, const char* funcName);
+
+  bool inline_native_vthread_start_transition(address funcAddr, const char* funcName, bool is_final_transition);
+  bool inline_native_vthread_end_transition(address funcAddr, const char* funcName, bool is_first_transition);
+
 #if INCLUDE_JVMTI
-  bool inline_native_notify_jvmti_funcs(address funcAddr, const char* funcName, bool is_start, bool is_end);
-  bool inline_native_notify_jvmti_hide();
   bool inline_native_notify_jvmti_sync();
 #endif
 
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 32acbe57951..6dbbfb0a130 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -66,6 +66,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stackWatermarkSet.hpp"
@@ -92,12 +93,9 @@
 #define C2_STUB_FIELD_NAME(name) _ ## name ## _Java
 #define C2_STUB_FIELD_DEFINE(name, f, t, r) \
   address OptoRuntime:: C2_STUB_FIELD_NAME(name) = nullptr;
-#define C2_JVMTI_STUB_FIELD_DEFINE(name) \
-  address OptoRuntime:: STUB_FIELD_NAME(name) = nullptr;
-C2_STUBS_DO(C2_BLOB_FIELD_DEFINE, C2_STUB_FIELD_DEFINE, C2_JVMTI_STUB_FIELD_DEFINE)
+C2_STUBS_DO(C2_BLOB_FIELD_DEFINE, C2_STUB_FIELD_DEFINE)
 #undef C2_BLOB_FIELD_DEFINE
 #undef C2_STUB_FIELD_DEFINE
-#undef C2_JVMTI_STUB_FIELD_DEFINE
 
 // This should be called in an assertion at the start of OptoRuntime routines
 // which are entered from compiled code (all of them)
@@ -153,23 +151,9 @@ static bool check_compiled_frame(JavaThread* thread) {
                   pass_retpc);                                        \
   if (C2_STUB_FIELD_NAME(name) == nullptr) { return false; }          \
 
-#define C2_JVMTI_STUB_C_FUNC(name) CAST_FROM_FN_PTR(address, SharedRuntime::name)
-
-#define GEN_C2_JVMTI_STUB(name)                                       \
-  STUB_FIELD_NAME(name) =                                             \
-    generate_stub(env,                                                \
-                  notify_jvmti_vthread_Type,                          \
-                  C2_JVMTI_STUB_C_FUNC(name),                         \
-                  C2_STUB_NAME(name),                                 \
-                  C2_STUB_ID(name),                                   \
-                  0,                                                  \
-                  true,                                               \
-                  false);                                             \
-  if (STUB_FIELD_NAME(name) == nullptr) { return false; }             \
-
 bool OptoRuntime::generate(ciEnv* env) {
 
-  C2_STUBS_DO(GEN_C2_BLOB, GEN_C2_STUB, GEN_C2_JVMTI_STUB)
+  C2_STUBS_DO(GEN_C2_BLOB, GEN_C2_STUB)
 
   return true;
 }
@@ -182,8 +166,6 @@ bool OptoRuntime::generate(ciEnv* env) {
 #undef C2_STUB_NAME
 #undef GEN_C2_STUB
 
-#undef C2_JVMTI_STUB_C_FUNC
-#undef GEN_C2_JVMTI_STUB
 // #undef gen
 
 const TypeFunc* OptoRuntime::_new_instance_Type                   = nullptr;
@@ -257,12 +239,10 @@ const TypeFunc* OptoRuntime::_updateBytesCRC32C_Type              = nullptr;
 const TypeFunc* OptoRuntime::_updateBytesAdler32_Type             = nullptr;
 const TypeFunc* OptoRuntime::_osr_end_Type                        = nullptr;
 const TypeFunc* OptoRuntime::_register_finalizer_Type             = nullptr;
+const TypeFunc* OptoRuntime::_vthread_transition_Type             = nullptr;
 #if INCLUDE_JFR
 const TypeFunc* OptoRuntime::_class_id_load_barrier_Type          = nullptr;
 #endif // INCLUDE_JFR
-#if INCLUDE_JVMTI
-const TypeFunc* OptoRuntime::_notify_jvmti_vthread_Type           = nullptr;
-#endif // INCLUDE_JVMTI
 const TypeFunc* OptoRuntime::_dtrace_method_entry_exit_Type       = nullptr;
 const TypeFunc* OptoRuntime::_dtrace_object_alloc_Type            = nullptr;
 
@@ -572,6 +552,26 @@ JRT_BLOCK_ENTRY(void, OptoRuntime::monitor_notifyAll_C(oopDesc* obj, JavaThread*
   JRT_BLOCK_END;
 JRT_END
 
+JRT_ENTRY(void, OptoRuntime::vthread_end_first_transition_C(oopDesc* vt, jboolean is_mount, JavaThread* current))
+  MountUnmountDisabler::end_transition(current, vt, true /*is_mount*/, true /*is_thread_start*/);
+JRT_END
+
+JRT_ENTRY(void, OptoRuntime::vthread_start_final_transition_C(oopDesc* vt, jboolean is_mount, JavaThread* current))
+  java_lang_Thread::set_is_in_vthread_transition(vt, false);
+  current->set_is_in_vthread_transition(false);
+  MountUnmountDisabler::start_transition(current, vt, false /*is_mount */, true /*is_thread_end*/);
+JRT_END
+
+JRT_ENTRY(void, OptoRuntime::vthread_start_transition_C(oopDesc* vt, jboolean is_mount, JavaThread* current))
+  java_lang_Thread::set_is_in_vthread_transition(vt, false);
+  current->set_is_in_vthread_transition(false);
+  MountUnmountDisabler::start_transition(current, vt, is_mount, false /*is_thread_end*/);
+JRT_END
+
+JRT_ENTRY(void, OptoRuntime::vthread_end_transition_C(oopDesc* vt, jboolean is_mount, JavaThread* current))
+  MountUnmountDisabler::end_transition(current, vt, is_mount, false /*is_thread_start*/);
+JRT_END
+
 static const TypeFunc* make_new_instance_Type() {
   // create input type (domain)
   const Type **fields = TypeTuple::fields(1);
@@ -587,8 +587,7 @@ static const TypeFunc* make_new_instance_Type() {
   return TypeFunc::make(domain, range);
 }
 
-#if INCLUDE_JVMTI
-static const TypeFunc* make_notify_jvmti_vthread_Type() {
+static const TypeFunc* make_vthread_transition_Type() {
   // create input type (domain)
   const Type **fields = TypeTuple::fields(2);
   fields[TypeFunc::Parms+0] = TypeInstPtr::NOTNULL; // VirtualThread oop
@@ -602,7 +601,6 @@ static const TypeFunc* make_notify_jvmti_vthread_Type() {
 
   return TypeFunc::make(domain,range);
 }
-#endif
 
 static const TypeFunc* make_athrow_Type() {
   // create input type (domain)
@@ -2336,12 +2334,10 @@ void OptoRuntime::initialize_types() {
   _updateBytesAdler32_Type            = make_updateBytesAdler32_Type();
   _osr_end_Type                       = make_osr_end_Type();
   _register_finalizer_Type            = make_register_finalizer_Type();
+  _vthread_transition_Type            = make_vthread_transition_Type();
   JFR_ONLY(
     _class_id_load_barrier_Type       = make_class_id_load_barrier_Type();
   )
-#if INCLUDE_JVMTI
-  _notify_jvmti_vthread_Type          = make_notify_jvmti_vthread_Type();
-#endif // INCLUDE_JVMTI
   _dtrace_method_entry_exit_Type      = make_dtrace_method_entry_exit_Type();
   _dtrace_object_alloc_Type           = make_dtrace_object_alloc_Type();
 }
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index eb2b49311cf..b8cdd9a962a 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -115,15 +115,12 @@ class OptoRuntime : public AllStatic {
 #define C2_STUB_FIELD_NAME(name) _ ## name ## _Java
 #define C2_STUB_FIELD_DECLARE(name, f, t, r) \
   static address     C2_STUB_FIELD_NAME(name) ;
-#define C2_JVMTI_STUB_FIELD_DECLARE(name) \
-  static address     STUB_FIELD_NAME(name);
 
-  C2_STUBS_DO(C2_BLOB_FIELD_DECLARE, C2_STUB_FIELD_DECLARE, C2_JVMTI_STUB_FIELD_DECLARE)
+  C2_STUBS_DO(C2_BLOB_FIELD_DECLARE, C2_STUB_FIELD_DECLARE)
 
 #undef C2_BLOB_FIELD_DECLARE
 #undef C2_STUB_FIELD_NAME
 #undef C2_STUB_FIELD_DECLARE
-#undef C2_JVMTI_STUB_FIELD_DECLARE
 
   // static TypeFunc* data members
   static const TypeFunc* _new_instance_Type;
@@ -197,12 +194,10 @@ class OptoRuntime : public AllStatic {
   static const TypeFunc* _updateBytesAdler32_Type;
   static const TypeFunc* _osr_end_Type;
   static const TypeFunc* _register_finalizer_Type;
+  static const TypeFunc* _vthread_transition_Type;
 #if INCLUDE_JFR
   static const TypeFunc* _class_id_load_barrier_Type;
 #endif // INCLUDE_JFR
-#if INCLUDE_JVMTI
-  static const TypeFunc* _notify_jvmti_vthread_Type;
-#endif // INCLUDE_JVMTI
   static const TypeFunc* _dtrace_method_entry_exit_Type;
   static const TypeFunc* _dtrace_object_alloc_Type;
 
@@ -239,6 +234,11 @@ public:
   static void monitor_notify_C(oopDesc* obj, JavaThread* current);
   static void monitor_notifyAll_C(oopDesc* obj, JavaThread* current);
 
+  static void vthread_end_first_transition_C(oopDesc* vt, jboolean hide, JavaThread* current);
+  static void vthread_start_final_transition_C(oopDesc* vt, jboolean hide, JavaThread* current);
+  static void vthread_start_transition_C(oopDesc* vt, jboolean hide, JavaThread* current);
+  static void vthread_end_transition_C(oopDesc* vt, jboolean hide, JavaThread* current);
+
 private:
 
   // Implicit exception support
@@ -293,12 +293,11 @@ private:
 
   static address slow_arraycopy_Java()                   { return _slow_arraycopy_Java; }
   static address register_finalizer_Java()               { return _register_finalizer_Java; }
-#if INCLUDE_JVMTI
-  static address notify_jvmti_vthread_start()            { return _notify_jvmti_vthread_start; }
-  static address notify_jvmti_vthread_end()              { return _notify_jvmti_vthread_end; }
-  static address notify_jvmti_vthread_mount()            { return _notify_jvmti_vthread_mount; }
-  static address notify_jvmti_vthread_unmount()          { return _notify_jvmti_vthread_unmount; }
-#endif
+
+  static address vthread_end_first_transition_Java()     { return _vthread_end_first_transition_Java; }
+  static address vthread_start_final_transition_Java()   { return _vthread_start_final_transition_Java; }
+  static address vthread_start_transition_Java()         { return _vthread_start_transition_Java; }
+  static address vthread_end_transition_Java()           { return _vthread_end_transition_Java; }
 
   static UncommonTrapBlob* uncommon_trap_blob()                  { return _uncommon_trap_blob; }
   static ExceptionBlob*    exception_blob()                      { return _exception_blob; }
@@ -718,6 +717,27 @@ private:
     return _register_finalizer_Type;
   }
 
+  static inline const TypeFunc* vthread_transition_Type() {
+    assert(_vthread_transition_Type != nullptr, "should be initialized");
+    return _vthread_transition_Type;
+  }
+
+  static inline const TypeFunc* vthread_end_first_transition_Type() {
+    return vthread_transition_Type();
+  }
+
+  static inline const TypeFunc* vthread_start_final_transition_Type() {
+    return vthread_transition_Type();
+  }
+
+  static inline const TypeFunc* vthread_start_transition_Type() {
+    return vthread_transition_Type();
+  }
+
+  static inline const TypeFunc* vthread_end_transition_Type() {
+    return vthread_transition_Type();
+  }
+
 #if INCLUDE_JFR
   static inline const TypeFunc* class_id_load_barrier_Type() {
     assert(_class_id_load_barrier_Type != nullptr, "should be initialized");
@@ -725,13 +745,6 @@ private:
   }
 #endif // INCLUDE_JFR
 
-#if INCLUDE_JVMTI
-  static inline const TypeFunc* notify_jvmti_vthread_Type() {
-    assert(_notify_jvmti_vthread_Type != nullptr, "should be initialized");
-    return _notify_jvmti_vthread_Type;
-  }
-#endif
-
   // Dtrace support. entry and exit probes have the same signature
   static inline const TypeFunc* dtrace_method_entry_exit_Type() {
     assert(_dtrace_method_entry_exit_Type != nullptr, "should be initialized");
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index a868f6337e2..16d9efde410 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -84,6 +84,7 @@
 #include "runtime/javaThread.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/perfData.hpp"
@@ -3661,68 +3662,24 @@ JVM_LEAF(jint, JVM_FindSignal(const char *name))
   return os::get_signal_number(name);
 JVM_END
 
-JVM_ENTRY(void, JVM_VirtualThreadStart(JNIEnv* env, jobject vthread))
-#if INCLUDE_JVMTI
-  if (!DoJVMTIVirtualThreadTransitions) {
-    assert(!JvmtiExport::can_support_virtual_threads(), "sanity check");
-    return;
-  }
-  if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-    JvmtiVTMSTransitionDisabler::VTMS_vthread_start(vthread);
-  } else {
-    // set VTMS transition bit value in JavaThread and java.lang.VirtualThread object
-    JvmtiVTMSTransitionDisabler::set_is_in_VTMS_transition(thread, vthread, false);
-  }
-#endif
+JVM_ENTRY(void, JVM_VirtualThreadEndFirstTransition(JNIEnv* env, jobject vthread))
+  oop vt = JNIHandles::resolve_external_guard(vthread);
+  MountUnmountDisabler::end_transition(thread, vt, true /*is_mount*/, true /*is_thread_start*/);
 JVM_END
 
-JVM_ENTRY(void, JVM_VirtualThreadEnd(JNIEnv* env, jobject vthread))
-#if INCLUDE_JVMTI
-  if (!DoJVMTIVirtualThreadTransitions) {
-    assert(!JvmtiExport::can_support_virtual_threads(), "sanity check");
-    return;
-  }
-  if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-    JvmtiVTMSTransitionDisabler::VTMS_vthread_end(vthread);
-  } else {
-    // set VTMS transition bit value in JavaThread and java.lang.VirtualThread object
-    JvmtiVTMSTransitionDisabler::set_is_in_VTMS_transition(thread, vthread, true);
-  }
-#endif
+JVM_ENTRY(void, JVM_VirtualThreadStartFinalTransition(JNIEnv* env, jobject vthread))
+  oop vt = JNIHandles::resolve_external_guard(vthread);
+  MountUnmountDisabler::start_transition(thread, vt, false /*is_mount */, true /*is_thread_end*/);
 JVM_END
 
-// If notifications are disabled then just update the VTMS transition bit and return.
-// Otherwise, the bit is updated in the given jvmtiVTMSTransitionDisabler function call.
-JVM_ENTRY(void, JVM_VirtualThreadMount(JNIEnv* env, jobject vthread, jboolean hide))
-#if INCLUDE_JVMTI
-  if (!DoJVMTIVirtualThreadTransitions) {
-    assert(!JvmtiExport::can_support_virtual_threads(), "sanity check");
-    return;
-  }
-  if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-    JvmtiVTMSTransitionDisabler::VTMS_vthread_mount(vthread, hide);
-  } else {
-    // set VTMS transition bit value in JavaThread and java.lang.VirtualThread object
-    JvmtiVTMSTransitionDisabler::set_is_in_VTMS_transition(thread, vthread, hide);
-  }
-#endif
+JVM_ENTRY(void, JVM_VirtualThreadStartTransition(JNIEnv* env, jobject vthread, jboolean is_mount))
+  oop vt = JNIHandles::resolve_external_guard(vthread);
+  MountUnmountDisabler::start_transition(thread, vt, is_mount, false /*is_thread_end*/);
 JVM_END
 
-// If notifications are disabled then just update the VTMS transition bit and return.
-// Otherwise, the bit is updated in the given jvmtiVTMSTransitionDisabler function call below.
-JVM_ENTRY(void, JVM_VirtualThreadUnmount(JNIEnv* env, jobject vthread, jboolean hide))
-#if INCLUDE_JVMTI
-  if (!DoJVMTIVirtualThreadTransitions) {
-    assert(!JvmtiExport::can_support_virtual_threads(), "sanity check");
-    return;
-  }
-  if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-    JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount(vthread, hide);
-  } else {
-    // set VTMS transition bit value in JavaThread and java.lang.VirtualThread object
-    JvmtiVTMSTransitionDisabler::set_is_in_VTMS_transition(thread, vthread, hide);
-  }
-#endif
+JVM_ENTRY(void, JVM_VirtualThreadEndTransition(JNIEnv* env, jobject vthread, jboolean is_mount))
+  oop vt = JNIHandles::resolve_external_guard(vthread);
+  MountUnmountDisabler::end_transition(thread, vt, is_mount, false /*is_thread_start*/);
 JVM_END
 
 // Notification from VirtualThread about disabling JVMTI Suspend in a sync critical section.
@@ -3772,6 +3729,7 @@ JVM_ENTRY(jobject, JVM_TakeVirtualThreadListToUnblock(JNIEnv* env, jclass ignore
     parkEvent->park();
   }
 JVM_END
+
 /*
  * Return the current class's class file version.  The low order 16 bits of the
  * returned jint contain the class's major version.  The high order 16 bits
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 5642cd9ff8f..e0863c07f4f 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -66,6 +66,7 @@
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
@@ -147,7 +148,7 @@ jvmtiError
 JvmtiEnv::SetThreadLocalStorage(jthread thread, const void* data) {
   JavaThread* current = JavaThread::current();
   JvmtiThreadState* state = nullptr;
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current);
 
   JavaThread* java_thread = nullptr;
@@ -200,7 +201,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread thread, void** data_ptr) {
     VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
     DEBUG_ONLY(VMNativeEntryWrapper __vew;)
 
-    JvmtiVTMSTransitionDisabler disabler(thread);
+    MountUnmountDisabler disabler(thread);
     ThreadsListHandle tlh(current_thread);
 
     JavaThread* java_thread = nullptr;
@@ -561,7 +562,7 @@ JvmtiEnv::SetNativeMethodPrefixes(jint prefix_count, char** prefixes) {
 // size_of_callbacks - pre-checked to be greater than or equal to 0
 jvmtiError
 JvmtiEnv::SetEventCallbacks(const jvmtiEventCallbacks* callbacks, jint size_of_callbacks) {
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
   JvmtiEventController::set_event_callbacks(this, callbacks, size_of_callbacks);
   return JVMTI_ERROR_NONE;
 } /* end SetEventCallbacks */
@@ -585,7 +586,7 @@ JvmtiEnv::SetEventNotificationMode(jvmtiEventMode mode, jvmtiEvent event_type, j
   if (event_type == JVMTI_EVENT_CLASS_FILE_LOAD_HOOK && enabled) {
     record_class_file_load_hook_enabled();
   }
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
 
   if (event_thread == nullptr) {
     // Can be called at Agent_OnLoad() time with event_thread == nullptr
@@ -867,7 +868,7 @@ JvmtiEnv::GetJLocationFormat(jvmtiJlocationFormat* format_ptr) {
 jvmtiError
 JvmtiEnv::GetThreadState(jthread thread, jint* thread_state_ptr) {
   JavaThread* current_thread = JavaThread::current();
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -939,7 +940,7 @@ JvmtiEnv::SuspendThread(jthread thread) {
 
   jvmtiError err;
   {
-    JvmtiVTMSTransitionDisabler disabler(true);
+    MountUnmountDisabler disabler(true);
     ThreadsListHandle tlh(current);
     JavaThread* java_thread = nullptr;
     oop thread_oop = nullptr;
@@ -949,7 +950,7 @@ JvmtiEnv::SuspendThread(jthread thread) {
       return err;
     }
 
-    // Do not use JvmtiVTMSTransitionDisabler in context of self suspend to avoid deadlocks.
+    // Do not use MountUnmountDisabler in context of self suspend to avoid deadlocks.
     if (java_thread != current) {
       err = suspend_thread(thread_oop, java_thread, /* single_suspend */ true);
       return err;
@@ -974,7 +975,7 @@ JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvm
   int self_idx = -1;
 
   {
-    JvmtiVTMSTransitionDisabler disabler(true);
+    MountUnmountDisabler disabler(true);
     ThreadsListHandle tlh(current);
 
     for (int i = 0; i < request_count; i++) {
@@ -1007,7 +1008,7 @@ JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvm
     }
   }
   // Self suspend after all other suspends if necessary.
-  // Do not use JvmtiVTMSTransitionDisabler in context of self suspend to avoid deadlocks.
+  // Do not use MountUnmountDisabler in context of self suspend to avoid deadlocks.
   if (self_tobj() != nullptr) {
     // there should not be any error for current java_thread
     results[self_idx] = suspend_thread(self_tobj(), current, /* single_suspend */ true);
@@ -1028,7 +1029,7 @@ JvmtiEnv::SuspendAllVirtualThreads(jint except_count, const jthread* except_list
 
   {
     ResourceMark rm(current);
-    JvmtiVTMSTransitionDisabler disabler(true);
+    MountUnmountDisabler disabler(true);
     ThreadsListHandle tlh(current);
     GrowableArray<jthread>* elist = new GrowableArray<jthread>(except_count);
 
@@ -1078,7 +1079,7 @@ JvmtiEnv::SuspendAllVirtualThreads(jint except_count, const jthread* except_list
     }
   }
   // Self suspend after all other suspends if necessary.
-  // Do not use JvmtiVTMSTransitionDisabler in context of self suspend to avoid deadlocks.
+  // Do not use MountUnmountDisabler in context of self suspend to avoid deadlocks.
   if (self_tobj() != nullptr) {
     suspend_thread(self_tobj(), current, /* single_suspend */ false);
   }
@@ -1089,7 +1090,7 @@ JvmtiEnv::SuspendAllVirtualThreads(jint except_count, const jthread* except_list
 // thread - NOT protected by ThreadsListHandle and NOT pre-checked
 jvmtiError
 JvmtiEnv::ResumeThread(jthread thread) {
-  JvmtiVTMSTransitionDisabler disabler(true);
+  MountUnmountDisabler disabler(true);
   JavaThread* current = JavaThread::current();
   ThreadsListHandle tlh(current);
 
@@ -1111,7 +1112,7 @@ jvmtiError
 JvmtiEnv::ResumeThreadList(jint request_count, const jthread* request_list, jvmtiError* results) {
   oop thread_oop = nullptr;
   JavaThread* java_thread = nullptr;
-  JvmtiVTMSTransitionDisabler disabler(true);
+  MountUnmountDisabler disabler(true);
   ThreadsListHandle tlh;
 
   for (int i = 0; i < request_count; i++) {
@@ -1150,7 +1151,7 @@ JvmtiEnv::ResumeAllVirtualThreads(jint except_count, const jthread* except_list)
     return err;
   }
   ResourceMark rm;
-  JvmtiVTMSTransitionDisabler disabler(true);
+  MountUnmountDisabler disabler(true);
   GrowableArray<jthread>* elist = new GrowableArray<jthread>(except_count);
 
   // Collect threads from except_list for which suspended status must be restored (only for VirtualThread case)
@@ -1196,7 +1197,7 @@ jvmtiError
 JvmtiEnv::StopThread(jthread thread, jobject exception) {
   JavaThread* current_thread = JavaThread::current();
 
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
   JavaThread* java_thread = nullptr;
   oop thread_oop = nullptr;
@@ -1234,7 +1235,7 @@ JvmtiEnv::InterruptThread(jthread thread) {
   JavaThread* current_thread = JavaThread::current();
   HandleMark hm(current_thread);
 
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -1280,7 +1281,7 @@ JvmtiEnv::GetThreadInfo(jthread thread, jvmtiThreadInfo* info_ptr) {
   JavaThread* java_thread = nullptr;
   oop thread_oop = nullptr;
 
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   // if thread is null the current thread is used
@@ -1369,7 +1370,7 @@ JvmtiEnv::GetOwnedMonitorInfo(jthread thread, jint* owned_monitor_count_ptr, job
   JavaThread* calling_thread = JavaThread::current();
   HandleMark hm(calling_thread);
 
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(calling_thread);
 
   JavaThread* java_thread = nullptr;
@@ -1424,7 +1425,7 @@ JvmtiEnv::GetOwnedMonitorStackDepthInfo(jthread thread, jint* monitor_info_count
   JavaThread* calling_thread = JavaThread::current();
   HandleMark hm(calling_thread);
 
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(calling_thread);
 
   JavaThread* java_thread = nullptr;
@@ -1707,7 +1708,7 @@ JvmtiEnv::GetThreadListStackTraces(jint thread_count, const jthread* thread_list
       *stack_info_ptr = op.stack_info();
     }
   } else {
-    JvmtiVTMSTransitionDisabler disabler;
+    MountUnmountDisabler disabler;
 
     // JVMTI get stack traces at safepoint.
     VM_GetThreadListStackTraces op(this, thread_count, thread_list, max_frame_count);
@@ -1740,7 +1741,7 @@ JvmtiEnv::PopFrame(jthread thread) {
   if (thread == nullptr) {
     return JVMTI_ERROR_INVALID_THREAD;
   }
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -1795,7 +1796,7 @@ JvmtiEnv::GetFrameLocation(jthread thread, jint depth, jmethodID* method_ptr, jl
 jvmtiError
 JvmtiEnv::NotifyFramePop(jthread thread, jint depth) {
   ResourceMark rm;
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   JavaThread* current = JavaThread::current();
   ThreadsListHandle tlh(current);
 
@@ -1823,7 +1824,7 @@ JvmtiEnv::NotifyFramePop(jthread thread, jint depth) {
 jvmtiError
 JvmtiEnv::ClearAllFramePops(jthread thread) {
   ResourceMark rm;
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   JavaThread* current = JavaThread::current();
   ThreadsListHandle tlh(current);
 
@@ -2084,7 +2085,7 @@ JvmtiEnv::GetLocalObject(jthread thread, jint depth, jint slot, jobject* value_p
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2125,7 +2126,7 @@ JvmtiEnv::GetLocalInstance(jthread thread, jint depth, jobject* value_ptr){
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2167,7 +2168,7 @@ JvmtiEnv::GetLocalInt(jthread thread, jint depth, jint slot, jint* value_ptr) {
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2209,7 +2210,7 @@ JvmtiEnv::GetLocalLong(jthread thread, jint depth, jint slot, jlong* value_ptr)
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2251,7 +2252,7 @@ JvmtiEnv::GetLocalFloat(jthread thread, jint depth, jint slot, jfloat* value_ptr
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2293,7 +2294,7 @@ JvmtiEnv::GetLocalDouble(jthread thread, jint depth, jint slot, jdouble* value_p
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2334,7 +2335,7 @@ JvmtiEnv::SetLocalObject(jthread thread, jint depth, jint slot, jobject value) {
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2371,7 +2372,7 @@ JvmtiEnv::SetLocalInt(jthread thread, jint depth, jint slot, jint value) {
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2408,7 +2409,7 @@ JvmtiEnv::SetLocalLong(jthread thread, jint depth, jint slot, jlong value) {
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2445,7 +2446,7 @@ JvmtiEnv::SetLocalFloat(jthread thread, jint depth, jint slot, jfloat value) {
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2482,7 +2483,7 @@ JvmtiEnv::SetLocalDouble(jthread thread, jint depth, jint slot, jdouble value) {
   // doit_prologue(), but after doit() is finished with it.
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2574,7 +2575,7 @@ JvmtiEnv::ClearBreakpoint(Method* method, jlocation location) {
 
 jvmtiError
 JvmtiEnv::SetFieldAccessWatch(fieldDescriptor* fdesc_ptr) {
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
   // make sure we haven't set this watch before
   if (fdesc_ptr->is_field_access_watched()) return JVMTI_ERROR_DUPLICATE;
   fdesc_ptr->set_is_field_access_watched(true);
@@ -2587,7 +2588,7 @@ JvmtiEnv::SetFieldAccessWatch(fieldDescriptor* fdesc_ptr) {
 
 jvmtiError
 JvmtiEnv::ClearFieldAccessWatch(fieldDescriptor* fdesc_ptr) {
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
   // make sure we have a watch to clear
   if (!fdesc_ptr->is_field_access_watched()) return JVMTI_ERROR_NOT_FOUND;
   fdesc_ptr->set_is_field_access_watched(false);
@@ -2600,7 +2601,7 @@ JvmtiEnv::ClearFieldAccessWatch(fieldDescriptor* fdesc_ptr) {
 
 jvmtiError
 JvmtiEnv::SetFieldModificationWatch(fieldDescriptor* fdesc_ptr) {
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
   // make sure we haven't set this watch before
   if (fdesc_ptr->is_field_modification_watched()) return JVMTI_ERROR_DUPLICATE;
   fdesc_ptr->set_is_field_modification_watched(true);
@@ -2613,7 +2614,7 @@ JvmtiEnv::SetFieldModificationWatch(fieldDescriptor* fdesc_ptr) {
 
 jvmtiError
 JvmtiEnv::ClearFieldModificationWatch(fieldDescriptor* fdesc_ptr) {
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
    // make sure we have a watch to clear
   if (!fdesc_ptr->is_field_modification_watched()) return JVMTI_ERROR_NOT_FOUND;
   fdesc_ptr->set_is_field_modification_watched(false);
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 2b17eddbe94..4894a4dd21a 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -51,6 +51,7 @@
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/signature.hpp"
@@ -697,7 +698,7 @@ JvmtiEnvBase::check_and_skip_hidden_frames(bool is_in_VTMS_transition, javaVFram
 
 javaVFrame*
 JvmtiEnvBase::check_and_skip_hidden_frames(JavaThread* jt, javaVFrame* jvf) {
-  jvf = check_and_skip_hidden_frames(jt->is_in_VTMS_transition(), jvf);
+  jvf = check_and_skip_hidden_frames(jt->is_in_vthread_transition(), jvf);
   return jvf;
 }
 
@@ -719,7 +720,7 @@ JvmtiEnvBase::get_vthread_jvf(oop vthread) {
       return nullptr;
     }
     vframeStream vfs(java_thread);
-    assert(!java_thread->is_in_VTMS_transition(), "invariant");
+    assert(!java_thread->is_in_vthread_transition(), "invariant");
     jvf = vfs.at_end() ? nullptr : vfs.asJavaVFrame();
     jvf = check_and_skip_hidden_frames(false, jvf);
   } else {
@@ -1693,8 +1694,7 @@ private:
   // jt->jvmti_vthread() for VTMS transition protocol.
   void correct_jvmti_thread_states() {
     for (JavaThread* jt : ThreadsListHandle()) {
-      if (jt->is_in_VTMS_transition()) {
-        jt->set_VTMS_transition_mark(true);
+      if (jt->is_in_vthread_transition()) {
         continue; // no need in JvmtiThreadState correction below if in transition
       }
       correct_jvmti_thread_state(jt);
@@ -1711,7 +1711,7 @@ public:
     if (_enable) {
       correct_jvmti_thread_states();
     }
-    JvmtiVTMSTransitionDisabler::set_VTMS_notify_jvmti_events(_enable);
+    MountUnmountDisabler::set_notify_jvmti_events(_enable);
   }
 };
 
@@ -1722,7 +1722,7 @@ JvmtiEnvBase::enable_virtual_threads_notify_jvmti() {
   if (!Continuations::enabled()) {
     return false;
   }
-  if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+  if (MountUnmountDisabler::notify_jvmti_events()) {
     return false; // already enabled
   }
   VM_SetNotifyJvmtiEventsMode op(true);
@@ -1738,10 +1738,10 @@ JvmtiEnvBase::disable_virtual_threads_notify_jvmti() {
   if (!Continuations::enabled()) {
     return false;
   }
-  if (!JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+  if (!MountUnmountDisabler::notify_jvmti_events()) {
     return false; // already disabled
   }
-  JvmtiVTMSTransitionDisabler disabler(true); // ensure there are no other disablers
+  MountUnmountDisabler disabler(true); // ensure there are no other disablers
   VM_SetNotifyJvmtiEventsMode op(false);
   VMThread::execute(&op);
   return true;
@@ -1769,7 +1769,6 @@ JvmtiEnvBase::suspend_thread(oop thread_oop, JavaThread* java_thread, bool singl
   // Platform thread or mounted vthread cases.
 
   assert(java_thread != nullptr, "sanity check");
-  assert(!java_thread->is_in_VTMS_transition(), "sanity check");
 
   // Don't allow hidden thread suspend request.
   if (java_thread->is_hidden_from_external_view()) {
@@ -1828,7 +1827,6 @@ JvmtiEnvBase::resume_thread(oop thread_oop, JavaThread* java_thread, bool single
   // Platform thread or mounted vthread cases.
 
   assert(java_thread != nullptr, "sanity check");
-  assert(!java_thread->is_in_VTMS_transition(), "sanity check");
 
   // Don't allow hidden thread resume request.
   if (java_thread->is_hidden_from_external_view()) {
@@ -2008,12 +2006,12 @@ class AdapterClosure : public HandshakeClosure {
 };
 
 // Supports platform and virtual threads.
-// JvmtiVTMSTransitionDisabler is always set by this function.
+// MountUnmountDisabler is always set by this function.
 void
 JvmtiHandshake::execute(JvmtiUnitedHandshakeClosure* hs_cl, jthread target) {
   JavaThread* current = JavaThread::current();
   HandleMark hm(current);
-  JvmtiVTMSTransitionDisabler disabler(target);
+  MountUnmountDisabler disabler(target);
   ThreadsListHandle tlh(current);
   JavaThread* java_thread = nullptr;
   oop thread_obj = nullptr;
@@ -2030,7 +2028,7 @@ JvmtiHandshake::execute(JvmtiUnitedHandshakeClosure* hs_cl, jthread target) {
 // Supports platform and virtual threads.
 // A virtual thread is always identified by the target_h oop handle.
 // The target_jt is always nullptr for an unmounted virtual thread.
-// JvmtiVTMSTransitionDisabler has to be set before call to this function.
+// MountUnmountDisabler has to be set before call to this function.
 void
 JvmtiHandshake::execute(JvmtiUnitedHandshakeClosure* hs_cl, ThreadsListHandle* tlh,
                         JavaThread* target_jt, Handle target_h) {
@@ -2038,7 +2036,7 @@ JvmtiHandshake::execute(JvmtiUnitedHandshakeClosure* hs_cl, ThreadsListHandle* t
   bool is_virtual = java_lang_VirtualThread::is_instance(target_h());
   bool self = target_jt == current;
 
-  assert(!Continuations::enabled() || self || !is_virtual || current->is_VTMS_transition_disabler(), "sanity check");
+  assert(!Continuations::enabled() || self || !is_virtual || current->is_vthread_transition_disabler(), "sanity check");
 
   hs_cl->set_target_jt(target_jt);   // can be needed in the virtual thread case
   hs_cl->set_is_virtual(is_virtual); // can be needed in the virtual thread case
@@ -2211,7 +2209,7 @@ JvmtiEnvBase::force_early_return(jthread thread, jvalue value, TosState tos) {
   JavaThread* current_thread = JavaThread::current();
   HandleMark hm(current_thread);
 
-  JvmtiVTMSTransitionDisabler disabler(thread);
+  MountUnmountDisabler disabler(thread);
   ThreadsListHandle tlh(current_thread);
 
   JavaThread* java_thread = nullptr;
@@ -2612,7 +2610,7 @@ PrintStackTraceClosure::do_thread_impl(Thread *target) {
                    "is_VTMS_transition_disabler: %d, is_in_VTMS_transition = %d\n",
                    tname, java_thread->name(), java_thread->is_exiting(),
                    java_thread->is_suspended(), java_thread->is_carrier_thread_suspended(), is_vt_suspended,
-                   java_thread->is_VTMS_transition_disabler(), java_thread->is_in_VTMS_transition());
+                   java_thread->is_vthread_transition_disabler(), java_thread->is_in_vthread_transition());
 
   if (java_thread->has_last_Java_frame()) {
     RegisterMap reg_map(java_thread,
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 14b7d886bce..02f39460ff6 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -61,6 +61,7 @@
 #include "runtime/javaThread.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/keepStackGCProcessed.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
@@ -412,7 +413,7 @@ JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
     if (Continuations::enabled()) {
       // Virtual threads support for agents loaded into running VM.
       // There is a performance impact when VTMS transitions are enabled.
-      if (!JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+      if (!MountUnmountDisabler::notify_jvmti_events()) {
         JvmtiEnvBase::enable_virtual_threads_notify_jvmti();
       }
     }
@@ -426,7 +427,7 @@ JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
     if (Continuations::enabled()) {
       // Virtual threads support for agents loaded at startup.
       // There is a performance impact when VTMS transitions are enabled.
-      JvmtiVTMSTransitionDisabler::set_VTMS_notify_jvmti_events(true);
+      MountUnmountDisabler::set_notify_jvmti_events(true, true /*is_onload*/);
     }
     return JNI_OK;
 
@@ -1639,7 +1640,7 @@ void JvmtiExport::post_vthread_end(jobject vthread) {
         JVMTI_JAVA_THREAD_EVENT_CALLBACK_BLOCK(thread)
         jvmtiEventVirtualThreadEnd callback = env->callbacks()->VirtualThreadEnd;
         if (callback != nullptr) {
-          (*callback)(env->jvmti_external(), jem.jni_env(), vthread);
+          (*callback)(env->jvmti_external(), jem.jni_env(), jem.jni_thread());
         }
       }
     }
@@ -2924,13 +2925,13 @@ void JvmtiExport::vthread_post_monitor_waited(JavaThread *current, ObjectMonitor
   Handle vthread(current, current->vthread());
 
   // Finish the VTMS transition temporarily to post the event.
-  JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)vthread.raw_value(), false);
+  MountUnmountDisabler::end_transition(current, vthread(), true /*is_mount*/, false /*is_thread_start*/);
 
   // Post event.
   JvmtiExport::post_monitor_waited(current, obj_mntr, timed_out);
 
   // Go back to VTMS transition state.
-  JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount((jthread)vthread.raw_value(), true);
+  MountUnmountDisabler::start_transition(current, vthread(), false /*is_mount*/, false /*is_thread_start*/);
 }
 
 void JvmtiExport::post_vm_object_alloc(JavaThread *thread, oop object) {
diff --git a/src/hotspot/share/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp
index 603d62eff85..855c7bd4eba 100644
--- a/src/hotspot/share/prims/jvmtiExtensions.cpp
+++ b/src/hotspot/share/prims/jvmtiExtensions.cpp
@@ -29,6 +29,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 
 // the list of extension functions
 GrowableArray<jvmtiExtensionFunctionInfo*>* JvmtiExtensions::_ext_functions;
@@ -77,7 +78,7 @@ static jvmtiError JNICALL GetVirtualThread(const jvmtiEnv* env, ...) {
   va_end(ap);
 
   ThreadInVMfromNative tiv(current_thread);
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
   ThreadsListHandle tlh(current_thread);
 
   jvmtiError err;
@@ -135,7 +136,7 @@ static jvmtiError JNICALL GetCarrierThread(const jvmtiEnv* env, ...) {
 
   MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current_thread));
   ThreadInVMfromNative tiv(current_thread);
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
 
   ThreadsListHandle tlh(current_thread);
   JavaThread* java_thread;
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index c923f91f69d..90a3461f321 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -57,6 +57,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
@@ -3028,7 +3029,7 @@ void JvmtiTagMap::iterate_over_reachable_objects(jvmtiHeapRootCallback heap_root
                                                  jvmtiObjectReferenceCallback object_ref_callback,
                                                  const void* user_data) {
   // VTMS transitions must be disabled before the EscapeBarrier.
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
 
   JavaThread* jt = JavaThread::current();
   EscapeBarrier eb(true, jt);
@@ -3056,7 +3057,7 @@ void JvmtiTagMap::iterate_over_objects_reachable_from_object(jobject object,
   Arena dead_object_arena(mtServiceability);
   GrowableArray<jlong> dead_objects(&dead_object_arena, 10, 0, 0);
 
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
 
   {
     MutexLocker ml(Heap_lock);
@@ -3076,7 +3077,7 @@ void JvmtiTagMap::follow_references(jint heap_filter,
                                     const void* user_data)
 {
   // VTMS transitions must be disabled before the EscapeBarrier.
-  JvmtiVTMSTransitionDisabler disabler;
+  MountUnmountDisabler disabler;
 
   oop obj = JNIHandles::resolve(object);
   JavaThread* jt = JavaThread::current();
diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index 00a48dec111..fc965e568f7 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -209,479 +209,6 @@ JvmtiThreadState::periodic_clean_up() {
   }
 }
 
-//
-// Virtual Threads Mount State transition (VTMS transition) mechanism
-//
-
-// VTMS transitions for one virtual thread are disabled while it is positive
-volatile int JvmtiVTMSTransitionDisabler::_VTMS_transition_disable_for_one_count = 0;
-
-// VTMS transitions for all virtual threads are disabled while it is positive
-volatile int JvmtiVTMSTransitionDisabler::_VTMS_transition_disable_for_all_count = 0;
-
-// There is an active suspender or resumer.
-volatile bool JvmtiVTMSTransitionDisabler::_SR_mode = false;
-
-// Notifications from VirtualThread about VTMS events are enabled.
-bool JvmtiVTMSTransitionDisabler::_VTMS_notify_jvmti_events = false;
-
-// The JvmtiVTMSTransitionDisabler sync protocol is enabled if this count > 0.
-volatile int JvmtiVTMSTransitionDisabler::_sync_protocol_enabled_count = 0;
-
-// JvmtiVTMSTraansitionDisabler sync protocol is enabled permanently after seeing a suspender.
-volatile bool JvmtiVTMSTransitionDisabler::_sync_protocol_enabled_permanently = false;
-
-#ifdef ASSERT
-void
-JvmtiVTMSTransitionDisabler::print_info() {
-  log_error(jvmti)("_VTMS_transition_disable_for_one_count: %d\n", _VTMS_transition_disable_for_one_count);
-  log_error(jvmti)("_VTMS_transition_disable_for_all_count: %d\n\n", _VTMS_transition_disable_for_all_count);
-  int attempts = 10000;
-  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *java_thread = jtiwh.next(); ) {
-    if (java_thread->VTMS_transition_mark()) {
-      log_error(jvmti)("jt: %p VTMS_transition_mark: %d\n",
-                       (void*)java_thread, java_thread->VTMS_transition_mark());
-    }
-    ResourceMark rm;
-    // Handshake with target.
-    PrintStackTraceClosure pstc;
-    Handshake::execute(&pstc, java_thread);
-  }
-}
-#endif
-
-// disable VTMS transitions for one virtual thread
-// disable VTMS transitions for all threads if thread is nullptr or a platform thread
-JvmtiVTMSTransitionDisabler::JvmtiVTMSTransitionDisabler(jthread thread)
-  : _is_SR(false),
-    _is_virtual(false),
-    _is_self(false),
-    _thread(thread)
-{
-  if (!Continuations::enabled()) {
-    return; // JvmtiVTMSTransitionDisabler is no-op without virtual threads
-  }
-  if (Thread::current_or_null() == nullptr) {
-    return;  // Detached thread, can be a call from Agent_OnLoad.
-  }
-  JavaThread* current = JavaThread::current();
-  oop thread_oop = JNIHandles::resolve_external_guard(thread);
-  _is_virtual = java_lang_VirtualThread::is_instance(thread_oop);
-
-  if (thread == nullptr ||
-      (!_is_virtual && thread_oop == current->threadObj()) ||
-      (_is_virtual && thread_oop == current->vthread())) {
-    _is_self = true;
-    return; // no need for current thread to disable and enable transitions for itself
-  }
-  if (!sync_protocol_enabled_permanently()) {
-    JvmtiVTMSTransitionDisabler::inc_sync_protocol_enabled_count();
-  }
-
-  // Target can be virtual or platform thread.
-  // If target is a platform thread then we have to disable VTMS transitions for all threads.
-  // It is by several reasons:
-  // - carrier threads can mount virtual threads which may cause incorrect behavior
-  // - there is no mechanism to disable transitions for a specific carrier thread yet
-  if (_is_virtual) {
-    VTMS_transition_disable_for_one(); // disable VTMS transitions for one virtual thread
-  } else {
-    VTMS_transition_disable_for_all(); // disable VTMS transitions for all virtual threads
-  }
-}
-
-// disable VTMS transitions for all virtual threads
-JvmtiVTMSTransitionDisabler::JvmtiVTMSTransitionDisabler(bool is_SR)
-  : _is_SR(is_SR),
-    _is_virtual(false),
-    _is_self(false),
-    _thread(nullptr)
-{
-  if (!Continuations::enabled()) {
-    return; // JvmtiVTMSTransitionDisabler is no-op without virtual threads
-  }
-  if (Thread::current_or_null() == nullptr) {
-    return;  // Detached thread, can be a call from Agent_OnLoad.
-  }
-  if (!sync_protocol_enabled_permanently()) {
-    JvmtiVTMSTransitionDisabler::inc_sync_protocol_enabled_count();
-    if (is_SR) {
-      AtomicAccess::store(&_sync_protocol_enabled_permanently, true);
-    }
-  }
-  VTMS_transition_disable_for_all();
-}
-
-JvmtiVTMSTransitionDisabler::~JvmtiVTMSTransitionDisabler() {
-  if (!Continuations::enabled()) {
-    return; // JvmtiVTMSTransitionDisabler is a no-op without virtual threads
-  }
-  if (Thread::current_or_null() == nullptr) {
-    return;  // Detached thread, can be a call from Agent_OnLoad.
-  }
-  if (_is_self) {
-    return; // no need for current thread to disable and enable transitions for itself
-  }
-  if (_is_virtual) {
-    VTMS_transition_enable_for_one(); // enable VTMS transitions for one virtual thread
-  } else {
-    VTMS_transition_enable_for_all(); // enable VTMS transitions for all virtual threads
-  }
-  if (!sync_protocol_enabled_permanently()) {
-    JvmtiVTMSTransitionDisabler::dec_sync_protocol_enabled_count();
-  }
-}
-
-// disable VTMS transitions for one virtual thread
-void
-JvmtiVTMSTransitionDisabler::VTMS_transition_disable_for_one() {
-  assert(_thread != nullptr, "sanity check");
-  JavaThread* thread = JavaThread::current();
-  HandleMark hm(thread);
-  Handle vth = Handle(thread, JNIHandles::resolve_external_guard(_thread));
-  assert(java_lang_VirtualThread::is_instance(vth()), "sanity check");
-
-  MonitorLocker ml(JvmtiVTMSTransition_lock);
-
-  while (_SR_mode) { // suspender or resumer is a JvmtiVTMSTransitionDisabler monopolist
-    ml.wait(10); // wait while there is an active suspender or resumer
-  }
-  AtomicAccess::inc(&_VTMS_transition_disable_for_one_count);
-  java_lang_Thread::inc_VTMS_transition_disable_count(vth());
-
-  while (java_lang_Thread::is_in_VTMS_transition(vth())) {
-    ml.wait(10); // wait while the virtual thread is in transition
-  }
-#ifdef ASSERT
-  thread->set_is_VTMS_transition_disabler(true);
-#endif
-}
-
-// disable VTMS transitions for all virtual threads
-void
-JvmtiVTMSTransitionDisabler::VTMS_transition_disable_for_all() {
-  JavaThread* thread = JavaThread::current();
-  int attempts = 50000;
-  {
-    MonitorLocker ml(JvmtiVTMSTransition_lock);
-
-    assert(!thread->is_in_VTMS_transition(), "VTMS_transition sanity check");
-    while (_SR_mode) { // Suspender or resumer is a JvmtiVTMSTransitionDisabler monopolist.
-      ml.wait(10);     // Wait while there is an active suspender or resumer.
-    }
-    if (_is_SR) {
-      _SR_mode = true;
-      while (_VTMS_transition_disable_for_all_count > 0 ||
-             _VTMS_transition_disable_for_one_count > 0) {
-        ml.wait(10);   // Wait while there is any active jvmtiVTMSTransitionDisabler.
-      }
-    }
-    AtomicAccess::inc(&_VTMS_transition_disable_for_all_count);
-
-    // Block while some mount/unmount transitions are in progress.
-    // Debug version fails and prints diagnostic information.
-    for (JavaThreadIteratorWithHandle jtiwh; JavaThread *jt = jtiwh.next(); ) {
-      while (jt->VTMS_transition_mark()) {
-        if (ml.wait(10)) {
-          attempts--;
-        }
-        DEBUG_ONLY(if (attempts == 0) break;)
-      }
-    }
-    assert(!thread->is_VTMS_transition_disabler(), "VTMS_transition sanity check");
-#ifdef ASSERT
-    if (attempts > 0) {
-      thread->set_is_VTMS_transition_disabler(true);
-    }
-#endif
-  }
-#ifdef ASSERT
-    if (attempts == 0) {
-      print_info();
-      fatal("stuck in JvmtiVTMSTransitionDisabler::VTMS_transition_disable");
-    }
-#endif
-}
-
-// enable VTMS transitions for one virtual thread
-void
-JvmtiVTMSTransitionDisabler::VTMS_transition_enable_for_one() {
-  JavaThread* thread = JavaThread::current();
-  HandleMark hm(thread);
-  Handle vth = Handle(thread, JNIHandles::resolve_external_guard(_thread));
-  if (!java_lang_VirtualThread::is_instance(vth())) {
-    return; // no-op if _thread is not a virtual thread
-  }
-  MonitorLocker ml(JvmtiVTMSTransition_lock);
-  java_lang_Thread::dec_VTMS_transition_disable_count(vth());
-  AtomicAccess::dec(&_VTMS_transition_disable_for_one_count);
-  if (_VTMS_transition_disable_for_one_count == 0) {
-    ml.notify_all();
-  }
-#ifdef ASSERT
-  thread->set_is_VTMS_transition_disabler(false);
-#endif
-}
-
-// enable VTMS transitions for all virtual threads
-void
-JvmtiVTMSTransitionDisabler::VTMS_transition_enable_for_all() {
-  JavaThread* current = JavaThread::current();
-  {
-    MonitorLocker ml(JvmtiVTMSTransition_lock);
-    assert(_VTMS_transition_disable_for_all_count > 0, "VTMS_transition sanity check");
-
-    if (_is_SR) {  // Disabler is suspender or resumer.
-      _SR_mode = false;
-    }
-    AtomicAccess::dec(&_VTMS_transition_disable_for_all_count);
-    if (_VTMS_transition_disable_for_all_count == 0 || _is_SR) {
-      ml.notify_all();
-    }
-#ifdef ASSERT
-    current->set_is_VTMS_transition_disabler(false);
-#endif
-  }
-}
-
-void
-JvmtiVTMSTransitionDisabler::start_VTMS_transition(jthread vthread, bool is_mount) {
-  JavaThread* thread = JavaThread::current();
-  oop vt = JNIHandles::resolve_external_guard(vthread);
-  assert(!thread->is_in_VTMS_transition(), "VTMS_transition sanity check");
-
-  // Avoid using MonitorLocker on performance critical path, use
-  // two-level synchronization with lock-free operations on state bits.
-  assert(!thread->VTMS_transition_mark(), "sanity check");
-  thread->set_VTMS_transition_mark(true); // Try to enter VTMS transition section optmistically.
-  java_lang_Thread::set_is_in_VTMS_transition(vt, true);
-
-  if (!sync_protocol_enabled()) {
-    thread->set_is_in_VTMS_transition(true);
-    return;
-  }
-  HandleMark hm(thread);
-  Handle vth = Handle(thread, vt);
-  int attempts = 50000;
-
-  // Do not allow suspends inside VTMS transitions.
-  // Block while transitions are disabled or there are suspend requests.
-  int64_t thread_id = java_lang_Thread::thread_id(vth());  // Cannot use oops while blocked.
-
-  if (_VTMS_transition_disable_for_all_count > 0 ||
-      java_lang_Thread::VTMS_transition_disable_count(vth()) > 0 ||
-      thread->is_suspended() ||
-      JvmtiVTSuspender::is_vthread_suspended(thread_id)
-  ) {
-    // Slow path: undo unsuccessful optimistic set of the VTMS_transition_mark.
-    // It can cause an extra waiting cycle for VTMS transition disablers.
-    thread->set_VTMS_transition_mark(false);
-    java_lang_Thread::set_is_in_VTMS_transition(vth(), false);
-
-    while (true) {
-      MonitorLocker ml(JvmtiVTMSTransition_lock);
-
-      // Do not allow suspends inside VTMS transitions.
-      // Block while transitions are disabled or there are suspend requests.
-      if (_VTMS_transition_disable_for_all_count > 0 ||
-          java_lang_Thread::VTMS_transition_disable_count(vth()) > 0 ||
-          thread->is_suspended() ||
-          JvmtiVTSuspender::is_vthread_suspended(thread_id)
-      ) {
-        // Block while transitions are disabled or there are suspend requests.
-        if (ml.wait(200)) {
-          attempts--;
-        }
-        DEBUG_ONLY(if (attempts == 0) break;)
-        continue;  // ~ThreadBlockInVM has handshake-based suspend point.
-      }
-      thread->set_VTMS_transition_mark(true);
-      java_lang_Thread::set_is_in_VTMS_transition(vth(), true);
-      break;
-    }
-  }
-#ifdef ASSERT
-  if (attempts == 0) {
-    log_error(jvmti)("start_VTMS_transition: thread->is_suspended: %d is_vthread_suspended: %d\n\n",
-                     thread->is_suspended(), JvmtiVTSuspender::is_vthread_suspended(thread_id));
-    print_info();
-    fatal("stuck in JvmtiVTMSTransitionDisabler::start_VTMS_transition");
-  }
-#endif
-  // Enter VTMS transition section.
-  thread->set_is_in_VTMS_transition(true);
-}
-
-void
-JvmtiVTMSTransitionDisabler::finish_VTMS_transition(jthread vthread, bool is_mount) {
-  JavaThread* thread = JavaThread::current();
-
-  assert(thread->is_in_VTMS_transition(), "sanity check");
-  thread->set_is_in_VTMS_transition(false);
-  oop vt = JNIHandles::resolve_external_guard(vthread);
-  java_lang_Thread::set_is_in_VTMS_transition(vt, false);
-  assert(thread->VTMS_transition_mark(), "sanity check");
-  thread->set_VTMS_transition_mark(false);
-
-  if (!sync_protocol_enabled()) {
-    return;
-  }
-  int64_t thread_id = java_lang_Thread::thread_id(vt);
-
-  // Unblock waiting VTMS transition disablers.
-  if (_VTMS_transition_disable_for_one_count > 0 ||
-      _VTMS_transition_disable_for_all_count > 0) {
-    MonitorLocker ml(JvmtiVTMSTransition_lock);
-    ml.notify_all();
-  }
-  // In unmount case the carrier thread is attached after unmount transition.
-  // Check and block it if there was external suspend request.
-  int attempts = 10000;
-  if (!is_mount && thread->is_carrier_thread_suspended()) {
-    while (true) {
-      MonitorLocker ml(JvmtiVTMSTransition_lock);
-
-      // Block while there are suspend requests.
-      if ((!is_mount && thread->is_carrier_thread_suspended()) ||
-          (is_mount && JvmtiVTSuspender::is_vthread_suspended(thread_id))
-      ) {
-        // Block while there are suspend requests.
-        if (ml.wait(200)) {
-          attempts--;
-        }
-        DEBUG_ONLY(if (attempts == 0) break;)
-        continue;
-      }
-      break;
-    }
-  }
-#ifdef ASSERT
-  if (attempts == 0) {
-    log_error(jvmti)("finish_VTMS_transition: thread->is_suspended: %d is_vthread_suspended: %d\n\n",
-                     thread->is_suspended(), JvmtiVTSuspender::is_vthread_suspended(thread_id));
-    print_info();
-    fatal("stuck in JvmtiVTMSTransitionDisabler::finish_VTMS_transition");
-  }
-#endif
-}
-
-// set VTMS transition bit value in JavaThread and java.lang.VirtualThread object
-void JvmtiVTMSTransitionDisabler::set_is_in_VTMS_transition(JavaThread* thread, jobject vthread, bool in_trans) {
-  oop vt = JNIHandles::resolve_external_guard(vthread);
-  java_lang_Thread::set_is_in_VTMS_transition(vt, in_trans);
-  thread->set_is_in_VTMS_transition(in_trans);
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_vthread_start(jobject vthread) {
-  VTMS_mount_end(vthread);
-  JavaThread* thread = JavaThread::current();
-
-  assert(!thread->is_in_VTMS_transition(), "sanity check");
-
-  // If interp_only_mode has been enabled then we must eagerly create JvmtiThreadState
-  // objects for globally enabled virtual thread filtered events. Otherwise,
-  // it is an important optimization to create JvmtiThreadState objects lazily.
-  // This optimization is disabled when watchpoint capabilities are present. It is to
-  // work around a bug with virtual thread frames which can be not deoptimized in time.
-  if (JvmtiThreadState::seen_interp_only_mode() ||
-      JvmtiExport::should_post_field_access() ||
-      JvmtiExport::should_post_field_modification()){
-    JvmtiEventController::thread_started(thread);
-  }
-  if (JvmtiExport::should_post_vthread_start()) {
-    JvmtiExport::post_vthread_start(vthread);
-  }
-  // post VirtualThreadMount event after VirtualThreadStart
-  if (JvmtiExport::should_post_vthread_mount()) {
-    JvmtiExport::post_vthread_mount(vthread);
-  }
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_vthread_end(jobject vthread) {
-  JavaThread* thread = JavaThread::current();
-
-  assert(!thread->is_in_VTMS_transition(), "sanity check");
-
-  // post VirtualThreadUnmount event before VirtualThreadEnd
-  if (JvmtiExport::should_post_vthread_unmount()) {
-    JvmtiExport::post_vthread_unmount(vthread);
-  }
-  if (JvmtiExport::should_post_vthread_end()) {
-    JvmtiExport::post_vthread_end(vthread);
-  }
-  VTMS_unmount_begin(vthread, /* last_unmount */ true);
-  if (thread->jvmti_thread_state() != nullptr) {
-    JvmtiExport::cleanup_thread(thread);
-    assert(thread->jvmti_thread_state() == nullptr, "should be null");
-    assert(java_lang_Thread::jvmti_thread_state(JNIHandles::resolve(vthread)) == nullptr, "should be null");
-  }
-  thread->rebind_to_jvmti_thread_state_of(thread->threadObj());
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_vthread_mount(jobject vthread, bool hide) {
-  if (hide) {
-    VTMS_mount_begin(vthread);
-  } else {
-    VTMS_mount_end(vthread);
-    if (JvmtiExport::should_post_vthread_mount()) {
-      JvmtiExport::post_vthread_mount(vthread);
-    }
-  }
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount(jobject vthread, bool hide) {
-  if (hide) {
-    if (JvmtiExport::should_post_vthread_unmount()) {
-      JvmtiExport::post_vthread_unmount(vthread);
-    }
-    VTMS_unmount_begin(vthread, /* last_unmount */ false);
-  } else {
-    VTMS_unmount_end(vthread);
-  }
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_mount_begin(jobject vthread) {
-  JavaThread* thread = JavaThread::current();
-  assert(!thread->is_in_VTMS_transition(), "sanity check");
-  start_VTMS_transition(vthread, /* is_mount */ true);
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_mount_end(jobject vthread) {
-  JavaThread* thread = JavaThread::current();
-  oop vt = JNIHandles::resolve(vthread);
-
-  thread->rebind_to_jvmti_thread_state_of(vt);
-
-  assert(thread->is_in_VTMS_transition(), "sanity check");
-  finish_VTMS_transition(vthread, /* is_mount */ true);
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_unmount_begin(jobject vthread, bool last_unmount) {
-  JavaThread* thread = JavaThread::current();
-
-  assert(!thread->is_in_VTMS_transition(), "sanity check");
-
-  start_VTMS_transition(vthread, /* is_mount */ false);
-  if (!last_unmount) {
-    thread->rebind_to_jvmti_thread_state_of(thread->threadObj());
-  }
-}
-
-void
-JvmtiVTMSTransitionDisabler::VTMS_unmount_end(jobject vthread) {
-  JavaThread* thread = JavaThread::current();
-  assert(thread->is_in_VTMS_transition(), "sanity check");
-  finish_VTMS_transition(vthread, /* is_mount */ false);
-}
-
-
 //
 // Virtual Threads Suspend/Resume management
 //
diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp
index 17bdae4662e..43b568cf1fc 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.hpp
@@ -72,67 +72,6 @@ class JvmtiEnvThreadStateIterator : public StackObj {
   JvmtiEnvThreadState* next(JvmtiEnvThreadState* ets);
 };
 
-///////////////////////////////////////////////////////////////
-//
-// class JvmtiVTMSTransitionDisabler
-//
-// Virtual Thread Mount State Transition (VTMS transition) mechanism
-//
-class JvmtiVTMSTransitionDisabler : public AnyObj {
- private:
-  static volatile int _VTMS_transition_disable_for_one_count; // transitions for one virtual thread are disabled while it is positive
-  static volatile int _VTMS_transition_disable_for_all_count; // transitions for all virtual threads are disabled while it is positive
-  static volatile bool _SR_mode;                         // there is an active suspender or resumer
-  static volatile int _sync_protocol_enabled_count;      // current number of JvmtiVTMSTransitionDisablers enabled sync protocol
-  static volatile bool _sync_protocol_enabled_permanently; // seen a suspender: JvmtiVTMSTransitionDisabler protocol is enabled permanently
-
-  bool _is_SR;                                           // is suspender or resumer
-  bool _is_virtual;                                      // target thread is virtual
-  bool _is_self;                                         // JvmtiVTMSTransitionDisabler is a no-op for current platform, carrier or virtual thread
-  jthread _thread;                                       // virtual thread to disable transitions for, no-op if it is a platform thread
-
-  DEBUG_ONLY(static void print_info();)
-  void VTMS_transition_disable_for_one();
-  void VTMS_transition_disable_for_all();
-  void VTMS_transition_enable_for_one();
-  void VTMS_transition_enable_for_all();
-
- public:
-  static bool _VTMS_notify_jvmti_events;                 // enable notifications from VirtualThread about VTMS events
-  static bool VTMS_notify_jvmti_events()             { return _VTMS_notify_jvmti_events; }
-  static void set_VTMS_notify_jvmti_events(bool val) { _VTMS_notify_jvmti_events = val; }
-
-  static void inc_sync_protocol_enabled_count()      { AtomicAccess::inc(&_sync_protocol_enabled_count); }
-  static void dec_sync_protocol_enabled_count()      { AtomicAccess::dec(&_sync_protocol_enabled_count); }
-  static int  sync_protocol_enabled_count()          { return AtomicAccess::load(&_sync_protocol_enabled_count); }
-  static bool sync_protocol_enabled_permanently()    { return AtomicAccess::load(&_sync_protocol_enabled_permanently); }
-
-  static bool sync_protocol_enabled()                { return sync_protocol_enabled_permanently() || sync_protocol_enabled_count() > 0; }
-
-  // parameter is_SR: suspender or resumer
-  JvmtiVTMSTransitionDisabler(bool is_SR = false);
-  JvmtiVTMSTransitionDisabler(jthread thread);
-  ~JvmtiVTMSTransitionDisabler();
-
-  // set VTMS transition bit value in JavaThread and java.lang.VirtualThread object
-  static void set_is_in_VTMS_transition(JavaThread* thread, jobject vthread, bool in_trans);
-
-  static void start_VTMS_transition(jthread vthread, bool is_mount);
-  static void finish_VTMS_transition(jthread vthread, bool is_mount);
-
-  static void VTMS_vthread_start(jobject vthread);
-  static void VTMS_vthread_end(jobject vthread);
-
-  static void VTMS_vthread_mount(jobject vthread, bool hide);
-  static void VTMS_vthread_unmount(jobject vthread, bool hide);
-
-  static void VTMS_mount_begin(jobject vthread);
-  static void VTMS_mount_end(jobject vthread);
-
-  static void VTMS_unmount_begin(jobject vthread, bool last_unmount);
-  static void VTMS_unmount_end(jobject vthread);
-};
-
 ///////////////////////////////////////////////////////////////
 //
 // class VirtualThreadList
diff --git a/src/hotspot/share/runtime/continuation.cpp b/src/hotspot/share/runtime/continuation.cpp
index 8f1cbe39640..935f304a751 100644
--- a/src/hotspot/share/runtime/continuation.cpp
+++ b/src/hotspot/share/runtime/continuation.cpp
@@ -35,6 +35,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "runtime/vframe_hp.hpp"
@@ -56,66 +57,50 @@ JVM_ENTRY(void, CONT_unpin(JNIEnv* env, jclass cls)) {
 }
 JVM_END
 
-#if INCLUDE_JVMTI
-class JvmtiUnmountBeginMark : public StackObj {
+class UnmountBeginMark : public StackObj {
   Handle _vthread;
   JavaThread* _current;
   freeze_result _result;
   bool _failed;
 
  public:
-  JvmtiUnmountBeginMark(JavaThread* t) :
+  UnmountBeginMark(JavaThread* t) :
     _vthread(t, t->vthread()), _current(t), _result(freeze_pinned_native), _failed(false) {
-    assert(!_current->is_in_VTMS_transition(), "must be");
+    assert(!_current->is_in_vthread_transition(), "must be");
 
-    if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
-      JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount((jthread)_vthread.raw_value(), true);
+    MountUnmountDisabler::start_transition(_current, _vthread(), false /*is_mount*/, false /*is_thread_start*/);
 
-      // Don't preempt if there is a pending popframe or earlyret operation. This can
-      // be installed in start_VTMS_transition() so we need to check it here.
-      if (JvmtiExport::can_pop_frame() || JvmtiExport::can_force_early_return()) {
-        JvmtiThreadState* state = _current->jvmti_thread_state();
-        if (_current->has_pending_popframe() || (state != nullptr && state->is_earlyret_pending())) {
-          _failed = true;
-        }
-      }
-
-      // Don't preempt in case there is an async exception installed since
-      // we would incorrectly throw it during the unmount logic in the carrier.
-      if (_current->has_async_exception_condition()) {
+    // Don't preempt if there is a pending popframe or earlyret operation. This can
+    // be installed in in process_at_transition_start() so we need to check it here.
+    if (JvmtiExport::can_pop_frame() || JvmtiExport::can_force_early_return()) {
+      JvmtiThreadState* state = _current->jvmti_thread_state();
+      if (_current->has_pending_popframe() || (state != nullptr && state->is_earlyret_pending())) {
         _failed = true;
       }
-    } else {
-      _current->set_is_in_VTMS_transition(true);
-      java_lang_Thread::set_is_in_VTMS_transition(_vthread(), true);
+    }
+
+    // Don't preempt in case there is an async exception installed since
+    // we would incorrectly throw it during the unmount logic in the carrier.
+    if (_current->has_async_exception_condition()) {
+      _failed = true;
     }
   }
-  ~JvmtiUnmountBeginMark() {
+  ~UnmountBeginMark() {
     assert(!_current->is_suspended(), "must be");
-
-    assert(_current->is_in_VTMS_transition(), "must be");
-    assert(java_lang_Thread::is_in_VTMS_transition(_vthread()), "must be");
-
-    // Read it again since for late binding agents the flag could have
-    // been set while blocked in the allocation path during freeze.
-    bool jvmti_present = JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events();
+    assert(_current->is_in_vthread_transition(), "must be");
 
     if (_result != freeze_ok) {
       // Undo transition
-      if (jvmti_present) {
-        JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)_vthread.raw_value(), false);
-      } else {
-        _current->set_is_in_VTMS_transition(false);
-        java_lang_Thread::set_is_in_VTMS_transition(_vthread(), false);
-      }
+      MountUnmountDisabler::end_transition(_current, _vthread(), true /*is_mount*/, false /*is_thread_start*/);
     }
   }
   void set_result(freeze_result res) { _result = res; }
   bool failed() { return _failed; }
 };
 
+#if INCLUDE_JVMTI
 static bool is_vthread_safe_to_preempt_for_jvmti(JavaThread* current) {
-  if (current->is_in_VTMS_transition()) {
+  if (current->is_in_vthread_transition()) {
     // We are at the end of a mount transition.
     return false;
   }
@@ -150,11 +135,11 @@ freeze_result Continuation::try_preempt(JavaThread* current, oop continuation) {
     return freeze_pinned_native;
   }
 
-  JVMTI_ONLY(JvmtiUnmountBeginMark jubm(current);)
-  JVMTI_ONLY(if (jubm.failed()) return freeze_pinned_native;)
+  UnmountBeginMark ubm(current);
+  if (ubm.failed()) return freeze_pinned_native;
   freeze_result res = CAST_TO_FN_PTR(FreezeContFnT, freeze_preempt_entry())(current, current->last_Java_sp());
   log_trace(continuations, preempt)("try_preempt: %d", res);
-  JVMTI_ONLY(jubm.set_result(res);)
+  ubm.set_result(res);
 
   if (current->has_pending_exception()) {
     assert(res == freeze_exception, "expecting an exception result from freeze");
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 2a31e5fb5b2..ccbe78817d6 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -58,6 +58,7 @@
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/keepStackGCProcessed.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
@@ -1690,7 +1691,7 @@ static void jvmti_mount_end(JavaThread* current, ContinuationWrapper& cont, fram
   AnchorMark am(current, top);  // Set anchor so that the stack is walkable.
 
   JRT_BLOCK
-    JvmtiVTMSTransitionDisabler::VTMS_vthread_mount((jthread)vth.raw_value(), false);
+    MountUnmountDisabler::end_transition(current, vth(), true /*is_mount*/, false /*is_thread_start*/);
 
     if (current->pending_contended_entered_event()) {
       // No monitor JVMTI events for ObjectLocker case.
@@ -2629,19 +2630,21 @@ intptr_t* ThawBase::handle_preempted_continuation(intptr_t* sp, Continuation::pr
   DEBUG_ONLY(verify_frame_kind(top, preempt_kind);)
   NOT_PRODUCT(int64_t tid = _thread->monitor_owner_id();)
 
-#if INCLUDE_JVMTI
   // Finish the VTMS transition.
-  assert(_thread->is_in_VTMS_transition(), "must be");
+  assert(_thread->is_in_vthread_transition(), "must be");
   bool is_vthread = Continuation::continuation_scope(_cont.continuation()) == java_lang_VirtualThread::vthread_scope();
   if (is_vthread) {
-    if (JvmtiVTMSTransitionDisabler::VTMS_notify_jvmti_events()) {
+#if INCLUDE_JVMTI
+    if (MountUnmountDisabler::notify_jvmti_events()) {
       jvmti_mount_end(_thread, _cont, top, preempt_kind);
-    } else {
-      _thread->set_is_in_VTMS_transition(false);
-      java_lang_Thread::set_is_in_VTMS_transition(_thread->vthread(), false);
+    } else
+#endif
+    { // Faster version of MountUnmountDisabler::end_transition() to avoid
+      // unnecessary extra instructions from jvmti_mount_end().
+      java_lang_Thread::set_is_in_vthread_transition(_thread->vthread(), false);
+      _thread->set_is_in_vthread_transition(false);
     }
   }
-#endif
 
   if (fast_case) {
     // If we thawed in the slow path the runtime stub/native wrapper frame already
diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp
index f468f27e2c0..89b02717a7a 100644
--- a/src/hotspot/share/runtime/handshake.cpp
+++ b/src/hotspot/share/runtime/handshake.cpp
@@ -34,6 +34,7 @@
 #include "runtime/handshake.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/stackWatermarkSet.hpp"
@@ -361,6 +362,27 @@ void Handshake::execute(HandshakeClosure* hs_cl) {
   VMThread::execute(&handshake);
 }
 
+void Handshake::execute(HandshakeClosure* hs_cl, oop vthread) {
+  assert(java_lang_VirtualThread::is_instance(vthread), "");
+  Handle vth(JavaThread::current(), vthread);
+
+  MountUnmountDisabler md(vthread);
+  oop carrier_thread = java_lang_VirtualThread::carrier_thread(vth());
+  if (carrier_thread != nullptr) {
+    JavaThread* target = java_lang_Thread::thread(carrier_thread);
+    assert(target != nullptr, "");
+    // Technically there is no need for a ThreadsListHandle since the target
+    // will block if it tries to unmount the vthread, so it can never exit.
+    ThreadsListHandle tlh(JavaThread::current());
+    assert(tlh.includes(target), "");
+    execute(hs_cl, &tlh, target);
+    assert(target->threadObj() == java_lang_VirtualThread::carrier_thread(vth()), "");
+  } else {
+    // unmounted vthread, execute closure with the current thread
+    hs_cl->do_thread(nullptr);
+  }
+}
+
 void Handshake::execute(HandshakeClosure* hs_cl, JavaThread* target) {
   // tlh == nullptr means we rely on a ThreadsListHandle somewhere
   // in the caller's context (and we sanity check for that).
diff --git a/src/hotspot/share/runtime/handshake.hpp b/src/hotspot/share/runtime/handshake.hpp
index 1304dca12b7..c764bbcfcd2 100644
--- a/src/hotspot/share/runtime/handshake.hpp
+++ b/src/hotspot/share/runtime/handshake.hpp
@@ -69,6 +69,7 @@ class Handshake : public AllStatic {
   // This version of execute() relies on a ThreadListHandle somewhere in
   // the caller's context to protect target (and we sanity check for that).
   static void execute(HandshakeClosure*       hs_cl, JavaThread* target);
+  static void execute(HandshakeClosure*       hs_cl, oop vthread);
   // This version of execute() is used when you have a ThreadListHandle in
   // hand and are using it to protect target. If tlh == nullptr, then we
   // sanity check for a ThreadListHandle somewhere in the caller's context
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index a81a687a9c0..1bf4841e193 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -448,16 +448,11 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _do_not_unlock_if_synchronized(false),
 #if INCLUDE_JVMTI
   _carrier_thread_suspended(false),
-  _is_in_VTMS_transition(false),
   _is_disable_suspend(false),
   _is_in_java_upcall(false),
   _jvmti_events_disabled(0),
-  _VTMS_transition_mark(false),
   _on_monitor_waited_event(false),
   _contended_entered_monitor(nullptr),
-#ifdef ASSERT
-  _is_VTMS_transition_disabler(false),
-#endif
 #endif
   _jni_attach_state(_not_attaching_via_jni),
   _is_in_internal_oome_mark(false),
@@ -503,6 +498,10 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _handshake(this),
   _suspend_resume_manager(this, &_handshake._lock),
 
+  _is_in_vthread_transition(false),
+  DEBUG_ONLY(_is_vthread_transition_disabler(false) COMMA)
+  DEBUG_ONLY(_is_disabler_at_start(false) COMMA)
+
   _popframe_preserved_args(nullptr),
   _popframe_preserved_args_size(0),
 
@@ -1150,17 +1149,26 @@ void JavaThread::send_async_exception(JavaThread* target, oop java_throwable) {
   Handshake::execute(&iaeh, target);
 }
 
-#if INCLUDE_JVMTI
-void JavaThread::set_is_in_VTMS_transition(bool val) {
-  assert(is_in_VTMS_transition() != val, "already %s transition", val ? "inside" : "outside");
-  _is_in_VTMS_transition = val;
+bool JavaThread::is_in_vthread_transition() const {
+  DEBUG_ONLY(Thread* current = Thread::current();)
+  assert(is_handshake_safe_for(current) || SafepointSynchronize::is_at_safepoint()
+         || JavaThread::cast(current)->is_disabler_at_start(), "not safe");
+  return AtomicAccess::load(&_is_in_vthread_transition);
+}
+
+void JavaThread::set_is_in_vthread_transition(bool val) {
+  assert(is_in_vthread_transition() != val, "already %s transition", val ? "inside" : "outside");
+  AtomicAccess::store(&_is_in_vthread_transition, val);
 }
 
 #ifdef ASSERT
-void JavaThread::set_is_VTMS_transition_disabler(bool val) {
-  _is_VTMS_transition_disabler = val;
+void JavaThread::set_is_vthread_transition_disabler(bool val) {
+  _is_vthread_transition_disabler = val;
+}
+
+void JavaThread::set_is_disabler_at_start(bool val) {
+  _is_disabler_at_start = val;
 }
-#endif
 #endif
 
 // External suspension mechanism.
@@ -1170,11 +1178,8 @@ void JavaThread::set_is_VTMS_transition_disabler(bool val) {
 //   - Target thread will not enter any new monitors.
 //
 bool JavaThread::java_suspend(bool register_vthread_SR) {
-#if INCLUDE_JVMTI
-  // Suspending a JavaThread in VTMS transition or disabling VTMS transitions can cause deadlocks.
-  assert(!is_in_VTMS_transition(), "no suspend allowed in VTMS transition");
-  assert(!is_VTMS_transition_disabler(), "no suspend allowed for VTMS transition disablers");
-#endif
+  // Suspending a vthread transition disabler can cause deadlocks.
+  assert(!is_vthread_transition_disabler(), "no suspend allowed for vthread transition disablers");
 
   guarantee(Thread::is_JavaThread_protected(/* target */ this),
             "target JavaThread is not protected in calling context.");
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index ba2aa42132f..d4c12887e10 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -322,16 +322,11 @@ class JavaThread: public Thread {
                                                          // never locked) when throwing an exception. Used by interpreter only.
 #if INCLUDE_JVMTI
   volatile bool         _carrier_thread_suspended;       // Carrier thread is externally suspended
-  bool                  _is_in_VTMS_transition;          // thread is in virtual thread mount state transition
   bool                  _is_disable_suspend;             // JVMTI suspend is temporarily disabled; used on current thread only
   bool                  _is_in_java_upcall;              // JVMTI is doing a Java upcall, so JVMTI events must be hidden
   int                   _jvmti_events_disabled;          // JVMTI events disabled manually
-  bool                  _VTMS_transition_mark;           // used for sync between VTMS transitions and disablers
   bool                  _on_monitor_waited_event;        // Avoid callee arg processing for enterSpecial when posting waited event
   ObjectMonitor*        _contended_entered_monitor;      // Monitor for pending monitor_contended_entered callback
-#ifdef ASSERT
-  bool                  _is_VTMS_transition_disabler;    // thread currently disabled VTMS transitions
-#endif
 #endif
 
   // JNI attach states:
@@ -737,6 +732,20 @@ public:
   // current thread, i.e. reverts optimizations based on escape analysis.
   void wait_for_object_deoptimization();
 
+private:
+  bool _is_in_vthread_transition;                    // thread is in virtual thread mount state transition
+  DEBUG_ONLY(bool _is_vthread_transition_disabler;)  // thread currently disabled vthread transitions
+  DEBUG_ONLY(bool _is_disabler_at_start;)            // thread at process of disabling vthread transitions
+public:
+  bool is_in_vthread_transition() const;
+  void set_is_in_vthread_transition(bool val);
+#ifdef ASSERT
+  bool is_vthread_transition_disabler() const       { return _is_vthread_transition_disabler; }
+  void set_is_vthread_transition_disabler(bool val);
+  bool is_disabler_at_start() const                 { return _is_disabler_at_start; }
+  void set_is_disabler_at_start(bool val);
+#endif
+
 #if INCLUDE_JVMTI
   inline bool set_carrier_thread_suspended();
   inline bool clear_carrier_thread_suspended();
@@ -745,9 +754,6 @@ public:
     return AtomicAccess::load(&_carrier_thread_suspended);
   }
 
-  bool is_in_VTMS_transition() const             { return _is_in_VTMS_transition; }
-  void set_is_in_VTMS_transition(bool val);
-
   bool is_disable_suspend() const                { return _is_disable_suspend; }
   void toggle_is_disable_suspend()               { _is_disable_suspend = !_is_disable_suspend; }
 
@@ -757,15 +763,12 @@ public:
   void disable_jvmti_events()                    { _jvmti_events_disabled++; }
   void enable_jvmti_events()                     { _jvmti_events_disabled--; }
 
-  bool VTMS_transition_mark() const              { return AtomicAccess::load(&_VTMS_transition_mark); }
-  void set_VTMS_transition_mark(bool val)        { AtomicAccess::store(&_VTMS_transition_mark, val); }
-
   // Temporarily skip posting JVMTI events for safety reasons when executions is in a critical section:
-  // - is in a VTMS transition (_is_in_VTMS_transition)
+  // - is in a vthread transition (_is_in_vthread_transition)
   // - is in an interruptLock or similar critical section (_is_disable_suspend)
   // - JVMTI is making a Java upcall (_is_in_java_upcall)
   bool should_hide_jvmti_events() const {
-    return _is_in_VTMS_transition || _is_disable_suspend || _is_in_java_upcall || _jvmti_events_disabled != 0;
+    return _is_in_vthread_transition || _is_disable_suspend || _is_in_java_upcall || _jvmti_events_disabled != 0;
   }
 
   bool on_monitor_waited_event()             { return _on_monitor_waited_event; }
@@ -773,10 +776,6 @@ public:
 
   bool pending_contended_entered_event()         { return _contended_entered_monitor != nullptr; }
   ObjectMonitor* contended_entered_monitor()     { return _contended_entered_monitor; }
-#ifdef ASSERT
-  bool is_VTMS_transition_disabler() const       { return _is_VTMS_transition_disabler; }
-  void set_is_VTMS_transition_disabler(bool val);
-#endif
 #endif
 
   void set_contended_entered_monitor(ObjectMonitor* val) NOT_JVMTI_RETURN JVMTI_ONLY({ _contended_entered_monitor = val; })
@@ -931,9 +930,9 @@ public:
   static ByteSize preempt_alternate_return_offset() { return byte_offset_of(JavaThread, _preempt_alternate_return); }
   DEBUG_ONLY(static ByteSize interp_at_preemptable_vmcall_cnt_offset() { return byte_offset_of(JavaThread, _interp_at_preemptable_vmcall_cnt); })
   static ByteSize unlocked_inflated_monitor_offset() { return byte_offset_of(JavaThread, _unlocked_inflated_monitor); }
+  static ByteSize is_in_vthread_transition_offset()     { return byte_offset_of(JavaThread, _is_in_vthread_transition); }
 
 #if INCLUDE_JVMTI
-  static ByteSize is_in_VTMS_transition_offset()     { return byte_offset_of(JavaThread, _is_in_VTMS_transition); }
   static ByteSize is_disable_suspend_offset()        { return byte_offset_of(JavaThread, _is_disable_suspend); }
 #endif
 
diff --git a/src/hotspot/share/runtime/mountUnmountDisabler.cpp b/src/hotspot/share/runtime/mountUnmountDisabler.cpp
new file mode 100644
index 00000000000..5bf00323f10
--- /dev/null
+++ b/src/hotspot/share/runtime/mountUnmountDisabler.cpp
@@ -0,0 +1,450 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "classfile/javaClasses.inline.hpp"
+#include "prims/jvmtiEventController.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/jvmtiThreadState.inline.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/javaThread.hpp"
+#include "runtime/mountUnmountDisabler.hpp"
+#include "runtime/threadSMR.hpp"
+
+volatile int MountUnmountDisabler::_global_vthread_transition_disable_count = 0;
+volatile int MountUnmountDisabler::_active_disablers = 0;
+bool MountUnmountDisabler::_exclusive_operation_ongoing = false;
+bool MountUnmountDisabler::_notify_jvmti_events = false;
+
+#if INCLUDE_JVMTI
+class JVMTIStartTransition : public StackObj {
+  JavaThread* _current;
+  Handle _vthread;
+  bool _is_mount;
+  bool _is_thread_end;
+ public:
+  JVMTIStartTransition(JavaThread* current, oop vthread, bool is_mount, bool is_thread_end) :
+    _current(current), _vthread(current, vthread), _is_mount(is_mount), _is_thread_end(is_thread_end) {
+    assert(DoJVMTIVirtualThreadTransitions || !JvmtiExport::can_support_virtual_threads(), "sanity check");
+    if (DoJVMTIVirtualThreadTransitions && MountUnmountDisabler::notify_jvmti_events()) {
+      // post VirtualThreadUnmount event before VirtualThreadEnd
+      if (!_is_mount && JvmtiExport::should_post_vthread_unmount()) {
+        JvmtiExport::post_vthread_unmount((jthread)_vthread.raw_value());
+      }
+      if (_is_thread_end && JvmtiExport::should_post_vthread_end()) {
+        JvmtiExport::post_vthread_end((jthread)_vthread.raw_value());
+      }
+    }
+  }
+  ~JVMTIStartTransition() {
+    if (DoJVMTIVirtualThreadTransitions && MountUnmountDisabler::notify_jvmti_events()) {
+      if (_is_thread_end && _current->jvmti_thread_state() != nullptr) {
+        JvmtiExport::cleanup_thread(_current);
+        assert(_current->jvmti_thread_state() == nullptr, "should be null");
+        assert(java_lang_Thread::jvmti_thread_state(_vthread()) == nullptr, "should be null");
+      }
+      if (!_is_mount) {
+        _current->rebind_to_jvmti_thread_state_of(_current->threadObj());
+      }
+    }
+  }
+};
+
+class JVMTIEndTransition : public StackObj {
+  JavaThread* _current;
+  Handle _vthread;
+  bool _is_mount;
+  bool _is_thread_start;
+ public:
+  JVMTIEndTransition(JavaThread* current, oop vthread, bool is_mount, bool is_thread_start) :
+    _current(current), _vthread(current, vthread), _is_mount(is_mount), _is_thread_start(is_thread_start) {
+    assert(DoJVMTIVirtualThreadTransitions || !JvmtiExport::can_support_virtual_threads(), "sanity check");
+    if (DoJVMTIVirtualThreadTransitions && MountUnmountDisabler::notify_jvmti_events()) {
+      if (_is_mount) {
+        _current->rebind_to_jvmti_thread_state_of(_vthread());
+      }
+      DEBUG_ONLY(bool is_virtual = java_lang_VirtualThread::is_instance(_current->jvmti_vthread()));
+      assert(_is_mount == is_virtual, "wrong identity");
+    }
+  }
+  ~JVMTIEndTransition() {
+    if (DoJVMTIVirtualThreadTransitions && MountUnmountDisabler::notify_jvmti_events()) {
+      if (!_is_mount && _current->is_carrier_thread_suspended()) {
+        MonitorLocker ml(VThreadTransition_lock);
+        while (_current->is_carrier_thread_suspended()) {
+          ml.wait(200);
+        }
+      }
+
+      if (_is_thread_start) {
+        // If interp_only_mode has been enabled then we must eagerly create JvmtiThreadState
+        // objects for globally enabled virtual thread filtered events. Otherwise,
+        // it is an important optimization to create JvmtiThreadState objects lazily.
+        // This optimization is disabled when watchpoint capabilities are present. It is to
+        // work around a bug with virtual thread frames which can be not deoptimized in time.
+        if (JvmtiThreadState::seen_interp_only_mode() ||
+            JvmtiExport::should_post_field_access() ||
+            JvmtiExport::should_post_field_modification()){
+          JvmtiEventController::thread_started(_current);
+        }
+        if (JvmtiExport::should_post_vthread_start()) {
+          JvmtiExport::post_vthread_start((jthread)_vthread.raw_value());
+        }
+      }
+      if (_is_mount && JvmtiExport::should_post_vthread_mount()) {
+        JvmtiExport::post_vthread_mount((jthread)_vthread.raw_value());
+      }
+    }
+  }
+};
+#endif // INCLUDE_JVMTI
+
+bool MountUnmountDisabler::is_start_transition_disabled(JavaThread* thread, oop vthread) {
+  // We need to read the per-vthread and global counters to check if transitions are disabled.
+  // In case of JVMTI present, the global counter will always be at least 1. This is to force
+  // the slow path and check for possible event posting. Here we need to check if transitions
+  // are actually disabled, so we compare the global counter against 1 or 0 accordingly.
+  // In case of JVMTI we also need to check for suspension.
+  int base_disable_count = notify_jvmti_events() ? 1 : 0;
+  return java_lang_Thread::vthread_transition_disable_count(vthread) > 0
+         || global_vthread_transition_disable_count() > base_disable_count
+         JVMTI_ONLY(|| (JvmtiVTSuspender::is_vthread_suspended(java_lang_Thread::thread_id(vthread)) || thread->is_suspended()));
+}
+
+void MountUnmountDisabler::start_transition(JavaThread* current, oop vthread, bool is_mount, bool is_thread_end) {
+  assert(!java_lang_Thread::is_in_vthread_transition(vthread), "");
+  assert(!current->is_in_vthread_transition(), "");
+  Handle vth = Handle(current, vthread);
+  JVMTI_ONLY(JVMTIStartTransition jst(current, vthread, is_mount, is_thread_end);)
+
+  java_lang_Thread::set_is_in_vthread_transition(vth(), true);
+  current->set_is_in_vthread_transition(true);
+
+  // Prevent loads of disable conditions from floating up.
+  OrderAccess::storeload();
+
+  while (is_start_transition_disabled(current, vth())) {
+    java_lang_Thread::set_is_in_vthread_transition(vth(), false);
+    current->set_is_in_vthread_transition(false);
+    {
+      // Block while transitions are disabled
+      MonitorLocker ml(VThreadTransition_lock);
+      while (is_start_transition_disabled(current, vth())) {
+        ml.wait(200);
+      }
+    }
+
+    // Try to start transition again...
+    java_lang_Thread::set_is_in_vthread_transition(vth(), true);
+    current->set_is_in_vthread_transition(true);
+    OrderAccess::storeload();
+  }
+
+  // Start of the critical section. If this is a mount, we need an acquire barrier to
+  // synchronize with a possible disabler that executed an operation while this thread
+  // was unmounted. We make VirtualThread.mount guarantee such ordering and avoid barriers
+  // here. If this is an unmount, the handshake that the disabler executed against this
+  // thread already provided the needed synchronization.
+  // This pairs with the release barrier in xx_enable_for_one()/xx_enable_for_all().
+}
+
+void MountUnmountDisabler::end_transition(JavaThread* current, oop vthread, bool is_mount, bool is_thread_start) {
+  assert(java_lang_Thread::is_in_vthread_transition(vthread), "");
+  assert(current->is_in_vthread_transition(), "");
+  Handle vth = Handle(current, vthread);
+  JVMTI_ONLY(JVMTIEndTransition jst(current, vthread, is_mount, is_thread_start);)
+
+  // End of the critical section. If this is an unmount, we need a release barrier before
+  // clearing the in_transition flags to make sure any memory operations executed in the
+  // transition are visible to a possible disabler that executes while this thread is unmounted.
+  // We make VirtualThread.unmount guarantee such ordering and avoid barriers here. If this is
+  // a mount, the only thing that needs to be published is the setting of carrierThread, since
+  // the handshake that the disabler will execute against it already provides the needed
+  // synchronization. This order is already guaranteed by the barriers in VirtualThread.mount.
+  // This pairs with the acquire barrier in xx_disable_for_one()/xx_disable_for_all().
+
+  java_lang_Thread::set_is_in_vthread_transition(vth(), false);
+  current->set_is_in_vthread_transition(false);
+
+  // Unblock waiting transition disablers.
+  if (active_disablers() > 0) {
+    MonitorLocker ml(VThreadTransition_lock);
+    ml.notify_all();
+  }
+}
+
+// disable transitions for one virtual thread
+// disable transitions for all threads if thread is nullptr or a platform thread
+MountUnmountDisabler::MountUnmountDisabler(oop thread_oop)
+  : _is_exclusive(false),
+    _is_self(false)
+{
+  if (!Continuations::enabled()) {
+    return; // MountUnmountDisabler is no-op without virtual threads
+  }
+  if (Thread::current_or_null() == nullptr) {
+    return;  // Detached thread, can be a call from Agent_OnLoad.
+  }
+  JavaThread* current = JavaThread::current();
+  assert(!current->is_in_vthread_transition(), "");
+
+  bool is_virtual = java_lang_VirtualThread::is_instance(thread_oop);
+  if (thread_oop == nullptr ||
+      (!is_virtual && thread_oop == current->threadObj()) ||
+      (is_virtual && thread_oop == current->vthread())) {
+    _is_self = true;
+    return; // no need for current thread to disable and enable transitions for itself
+  }
+
+  // Target can be virtual or platform thread.
+  // If target is a platform thread then we have to disable transitions for all threads.
+  // It is by several reasons:
+  // - carrier threads can mount virtual threads which may cause incorrect behavior
+  // - there is no mechanism to disable transitions for a specific carrier thread yet
+  if (is_virtual) {
+    _vthread = Handle(current, thread_oop);
+    disable_transition_for_one(); // disable transitions for one virtual thread
+  } else {
+    disable_transition_for_all(); // disable transitions for all virtual threads
+  }
+}
+
+// disable transitions for all virtual threads
+MountUnmountDisabler::MountUnmountDisabler(bool exclusive)
+  : _is_exclusive(exclusive),
+    _is_self(false)
+{
+  if (!Continuations::enabled()) {
+    return; // MountUnmountDisabler is no-op without virtual threads
+  }
+  if (Thread::current_or_null() == nullptr) {
+    return;  // Detached thread, can be a call from Agent_OnLoad.
+  }
+  assert(!JavaThread::current()->is_in_vthread_transition(), "");
+  disable_transition_for_all();
+}
+
+MountUnmountDisabler::~MountUnmountDisabler() {
+  if (!Continuations::enabled()) {
+    return; // MountUnmountDisabler is a no-op without virtual threads
+  }
+  if (Thread::current_or_null() == nullptr) {
+    return;  // Detached thread, can be a call from Agent_OnLoad.
+  }
+  if (_is_self) {
+    return; // no need for current thread to disable and enable transitions for itself
+  }
+  if (_vthread() != nullptr) {
+    enable_transition_for_one(); // enable transitions for one virtual thread
+  } else {
+    enable_transition_for_all(); // enable transitions for all virtual threads
+  }
+}
+
+// disable transitions for one virtual thread
+void
+MountUnmountDisabler::disable_transition_for_one() {
+  MonitorLocker ml(VThreadTransition_lock);
+  while (exclusive_operation_ongoing()) {
+    ml.wait(10);
+  }
+
+  inc_active_disablers();
+  java_lang_Thread::inc_vthread_transition_disable_count(_vthread());
+
+  // Prevent load of transition flag from floating up.
+  OrderAccess::storeload();
+
+  while (java_lang_Thread::is_in_vthread_transition(_vthread())) {
+    ml.wait(10); // wait while the virtual thread is in transition
+  }
+
+  // Start of the critical section. If the target is unmounted, we need an acquire
+  // barrier to make sure memory operations executed in the last transition are visible.
+  // If the target is mounted, although the handshake that will be executed against it
+  // already provides the needed synchronization, we still need to prevent the load of
+  // carrierThread to float up.
+  // This pairs with the release barrier in end_transition().
+  OrderAccess::acquire();
+  DEBUG_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(true);)
+}
+
+// disable transitions for all virtual threads
+void
+MountUnmountDisabler::disable_transition_for_all() {
+  DEBUG_ONLY(JavaThread* thread = JavaThread::current();)
+  DEBUG_ONLY(thread->set_is_disabler_at_start(true);)
+
+  MonitorLocker ml(VThreadTransition_lock);
+  while (exclusive_operation_ongoing()) {
+    ml.wait(10);
+  }
+  if (_is_exclusive) {
+    set_exclusive_operation_ongoing(true);
+    while (active_disablers() > 0) {
+      ml.wait(10);
+    }
+  }
+  inc_active_disablers();
+  inc_global_vthread_transition_disable_count();
+
+  // Prevent loads of transition flag from floating up. Technically not
+  // required since JavaThreadIteratorWithHandle includes full fence.
+  OrderAccess::storeload();
+
+  // Block while some mount/unmount transitions are in progress.
+  // Debug version fails and prints diagnostic information.
+  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *jt = jtiwh.next(); ) {
+    while (jt->is_in_vthread_transition()) {
+      ml.wait(10);
+    }
+  }
+
+  // Start of the critical section. If some target is unmounted, we need an acquire
+  // barrier to make sure memory operations executed in the last transition are visible.
+  // If a target is mounted, although the handshake that will be executed against it
+  // already provides the needed synchronization, we still need to prevent the load of
+  // carrierThread to float up.
+  // This pairs with the release barrier in end_transition().
+  OrderAccess::acquire();
+  DEBUG_ONLY(thread->set_is_vthread_transition_disabler(true);)
+  DEBUG_ONLY(thread->set_is_disabler_at_start(false);)
+}
+
+// enable transitions for one virtual thread
+void
+MountUnmountDisabler::enable_transition_for_one() {
+  assert(java_lang_VirtualThread::is_instance(_vthread()), "");
+
+  // End of the critical section. If the target was unmounted, we need a
+  // release barrier before decrementing _vthread_transition_disable_count to
+  // make sure any memory operations executed by the disabler are visible to
+  // the target once it mounts again. If the target was mounted, the handshake
+  // executed against it already provided the needed synchronization.
+  // This pairs with the equivalent acquire barrier in start_transition().
+  OrderAccess::release();
+
+  MonitorLocker ml(VThreadTransition_lock);
+  dec_active_disablers();
+  java_lang_Thread::dec_vthread_transition_disable_count(_vthread());
+  if (java_lang_Thread::vthread_transition_disable_count(_vthread()) == 0) {
+    ml.notify_all();
+  }
+  DEBUG_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(false);)
+}
+
+// enable transitions for all virtual threads
+void
+MountUnmountDisabler::enable_transition_for_all() {
+  JavaThread* thread = JavaThread::current();
+
+  // End of the critical section. If some target was unmounted, we need a
+  // release barrier before decrementing _global_vthread_transition_disable_count
+  // to make sure any memory operations executed by the disabler are visible to
+  // the target once it mounts again. If a target was mounted, the handshake
+  // executed against it already provided the needed synchronization.
+  // This pairs with the equivalent acquire barrier in start_transition().
+  OrderAccess::release();
+
+  MonitorLocker ml(VThreadTransition_lock);
+  if (exclusive_operation_ongoing()) {
+    set_exclusive_operation_ongoing(false);
+  }
+  dec_active_disablers();
+  dec_global_vthread_transition_disable_count();
+  int base_disable_count = notify_jvmti_events() ? 1 : 0;
+  if (global_vthread_transition_disable_count() == base_disable_count || _is_exclusive) {
+    ml.notify_all();
+  }
+  DEBUG_ONLY(thread->set_is_vthread_transition_disabler(false);)
+}
+
+int MountUnmountDisabler::global_vthread_transition_disable_count() {
+  assert(_global_vthread_transition_disable_count >= 0, "");
+  return AtomicAccess::load(&_global_vthread_transition_disable_count);
+}
+
+void MountUnmountDisabler::inc_global_vthread_transition_disable_count() {
+  assert(VThreadTransition_lock->owned_by_self() || SafepointSynchronize::is_at_safepoint(), "Must be locked");
+  assert(_global_vthread_transition_disable_count >= 0, "");
+  AtomicAccess::store(&_global_vthread_transition_disable_count, _global_vthread_transition_disable_count + 1);
+}
+
+void MountUnmountDisabler::dec_global_vthread_transition_disable_count() {
+  assert(VThreadTransition_lock->owned_by_self() || SafepointSynchronize::is_at_safepoint(), "Must be locked");
+  assert(_global_vthread_transition_disable_count > 0, "");
+  AtomicAccess::store(&_global_vthread_transition_disable_count, _global_vthread_transition_disable_count - 1);
+}
+
+bool MountUnmountDisabler::exclusive_operation_ongoing() {
+  assert(VThreadTransition_lock->owned_by_self(), "Must be locked");
+  return _exclusive_operation_ongoing;
+}
+
+void MountUnmountDisabler::set_exclusive_operation_ongoing(bool val) {
+  assert(VThreadTransition_lock->owned_by_self(), "Must be locked");
+  assert(_exclusive_operation_ongoing != val, "");
+  _exclusive_operation_ongoing = val;
+}
+
+int MountUnmountDisabler::active_disablers() {
+  assert(_active_disablers >= 0, "");
+  return AtomicAccess::load(&_active_disablers);
+}
+
+void MountUnmountDisabler::inc_active_disablers() {
+  assert(VThreadTransition_lock->owned_by_self(), "Must be locked");
+  assert(_active_disablers >= 0, "");
+  _active_disablers++;
+}
+
+void MountUnmountDisabler::dec_active_disablers() {
+  assert(VThreadTransition_lock->owned_by_self(), "Must be locked");
+  assert(_active_disablers > 0, "");
+  _active_disablers--;
+}
+
+bool MountUnmountDisabler::notify_jvmti_events() {
+  return _notify_jvmti_events;
+}
+
+void MountUnmountDisabler::set_notify_jvmti_events(bool val, bool is_onload) {
+  if (val == _notify_jvmti_events || !DoJVMTIVirtualThreadTransitions) return;
+
+  // Force slow path on start/end vthread transitions for JVMTI bookkeeping.
+  // 'val' is always true except with WhiteBox methods for testing purposes.
+  if (is_onload) {
+    // Skip existing increment methods since asserts will fail.
+    assert(val && _global_vthread_transition_disable_count == 0, "");
+    AtomicAccess::inc(&_global_vthread_transition_disable_count);
+  } else {
+    assert(SafepointSynchronize::is_at_safepoint(), "");
+    if (val) {
+      inc_global_vthread_transition_disable_count();
+    } else {
+      dec_global_vthread_transition_disable_count();
+    }
+  }
+  log_trace(continuations,tracking)("%s _notify_jvmti_events, _global_vthread_transition_disable_count=%d", val ? "enabling" : "disabling", _global_vthread_transition_disable_count);
+  _notify_jvmti_events = val;
+}
diff --git a/src/hotspot/share/runtime/mountUnmountDisabler.hpp b/src/hotspot/share/runtime/mountUnmountDisabler.hpp
new file mode 100644
index 00000000000..2ebb09734a6
--- /dev/null
+++ b/src/hotspot/share/runtime/mountUnmountDisabler.hpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_RUNTIME_MOUNTUNMOUNTDISABLER_HPP
+#define SHARE_RUNTIME_MOUNTUNMOUNTDISABLER_HPP
+
+#include "memory/allocation.hpp"
+#include "runtime/handles.hpp"
+
+class JavaThread;
+
+// This class adds support to disable virtual thread transitions (mount/unmount).
+// This is needed to safely execute operations that access virtual thread state.
+// Users should use the Handshake class when possible instead of using this directly.
+class MountUnmountDisabler : public AnyObj {
+  // The global counter is used for operations that require disabling
+  // transitions for all virtual threads. Currently this is only used
+  // by some JVMTI operations. We also increment this counter when the
+  // first JVMTI agent attaches to always force the slowpath when starting
+  // a transition. This is needed because if JVMTI is present we need to
+  // check for possible event posting.
+  static volatile int _global_vthread_transition_disable_count;
+  static volatile int _active_disablers;
+  static bool    _exclusive_operation_ongoing;
+
+  bool _is_exclusive;    // currently only for suspender or resumer
+  bool _is_virtual;      // target thread is virtual
+  bool _is_self;         // MountUnmountDisabler is a no-op for current platform, carrier or virtual thread
+  Handle _vthread;       // virtual thread to disable transitions for, no-op if it is a platform thread
+
+  //DEBUG_ONLY(static void print_info();)
+  void disable_transition_for_one();
+  void disable_transition_for_all();
+  void enable_transition_for_one();
+  void enable_transition_for_all();
+
+ public:
+  MountUnmountDisabler(bool exlusive = false);
+  MountUnmountDisabler(oop thread_oop);
+  ~MountUnmountDisabler();
+
+  static int global_vthread_transition_disable_count();
+  static void inc_global_vthread_transition_disable_count();
+  static void dec_global_vthread_transition_disable_count();
+
+  static volatile int* global_vthread_transition_disable_count_address() {
+    return &_global_vthread_transition_disable_count;
+  }
+
+  static bool exclusive_operation_ongoing();
+  static void set_exclusive_operation_ongoing(bool val);
+
+  static int active_disablers();
+  static void inc_active_disablers();
+  static void dec_active_disablers();
+
+  static void start_transition(JavaThread* thread, oop vthread, bool is_mount, bool is_thread_end);
+  static void end_transition(JavaThread* thread, oop vthread, bool is_mount, bool is_thread_start);
+
+  static bool is_start_transition_disabled(JavaThread* thread, oop vthread);
+
+  // enable notifications from VirtualThread about Mount/Unmount events
+  static bool _notify_jvmti_events;
+  static bool notify_jvmti_events();
+  static void set_notify_jvmti_events(bool val, bool is_onload = false);
+  static bool* notify_jvmti_events_address() {
+    return &_notify_jvmti_events;
+  }
+};
+
+#endif // SHARE_RUNTIME_MOUNTUNMOUNTDISABLER_HPP
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index e4707a342a7..5d7e310fb11 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -49,7 +49,7 @@ Mutex*   JfieldIdCreation_lock        = nullptr;
 Monitor* JNICritical_lock             = nullptr;
 Mutex*   JvmtiThreadState_lock        = nullptr;
 Monitor* EscapeBarrier_lock           = nullptr;
-Monitor* JvmtiVTMSTransition_lock     = nullptr;
+Monitor* VThreadTransition_lock       = nullptr;
 Mutex*   JvmtiVThreadSuspend_lock     = nullptr;
 Monitor* Heap_lock                    = nullptr;
 #if INCLUDE_PARALLELGC
@@ -265,7 +265,7 @@ void mutex_init() {
   MUTEX_DEFN(CompileStatistics_lock          , PaddedMutex  , safepoint);
   MUTEX_DEFN(DirectivesStack_lock            , PaddedMutex  , nosafepoint);
 
-  MUTEX_DEFN(JvmtiVTMSTransition_lock        , PaddedMonitor, safepoint);   // used for Virtual Thread Mount State transition management
+  MUTEX_DEFN(VThreadTransition_lock          , PaddedMonitor, safepoint);
   MUTEX_DEFN(JvmtiVThreadSuspend_lock        , PaddedMutex,   nosafepoint-1);
   MUTEX_DEFN(EscapeBarrier_lock              , PaddedMonitor, nosafepoint); // Used to synchronize object reallocation/relocking triggered by JVMTI
   MUTEX_DEFN(Management_lock                 , PaddedMutex  , safepoint);   // used for JVM management
@@ -361,8 +361,8 @@ void mutex_init() {
   // JVMCIRuntime_lock must be acquired before JVMCI_lock to avoid deadlock
   MUTEX_DEFL(JVMCI_lock                     , PaddedMonitor, JVMCIRuntime_lock);
 #endif
-  MUTEX_DEFL(JvmtiThreadState_lock          , PaddedMutex  , JvmtiVTMSTransition_lock);   // Used by JvmtiThreadState/JvmtiEventController
-  MUTEX_DEFL(SharedDecoder_lock             , PaddedMutex  , NmtVirtualMemory_lock); // Must be lower than NmtVirtualMemory_lock due to MemTracker::print_containing_region
+  MUTEX_DEFL(JvmtiThreadState_lock          , PaddedMutex  , VThreadTransition_lock); // Used by JvmtiThreadState/JvmtiEventController
+  MUTEX_DEFL(SharedDecoder_lock             , PaddedMutex  , NmtVirtualMemory_lock);  // Must be lower than NmtVirtualMemory_lock due to MemTracker::print_containing_region
 
   // Allocate RecursiveMutex
   MultiArray_lock = new RecursiveMutex();
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 74fe4650b7c..f6c0a967718 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -47,7 +47,7 @@ extern Mutex*   JfieldIdCreation_lock;           // a lock on creating JNI stati
 extern Monitor* JNICritical_lock;                // a lock used while synchronizing with threads entering/leaving JNI critical regions
 extern Mutex*   JvmtiThreadState_lock;           // a lock on modification of JVMTI thread data
 extern Monitor* EscapeBarrier_lock;              // a lock to sync reallocating and relocking objects because of JVMTI access
-extern Monitor* JvmtiVTMSTransition_lock;        // a lock for Virtual Thread Mount State transition (VTMS transition) management
+extern Monitor* VThreadTransition_lock;          // a lock used when disabling virtual thread transitions
 extern Mutex*   JvmtiVThreadSuspend_lock;        // a lock for virtual threads suspension
 extern Monitor* Heap_lock;                       // a lock on the heap
 #if INCLUDE_PARALLELGC
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 3a7c60cf83e..7e3bf763d08 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -737,34 +737,6 @@ void SharedRuntime::throw_and_post_jvmti_exception(JavaThread* current, Symbol*
   throw_and_post_jvmti_exception(current, h_exception);
 }
 
-#if INCLUDE_JVMTI
-JRT_ENTRY(void, SharedRuntime::notify_jvmti_vthread_start(oopDesc* vt, jboolean hide, JavaThread* current))
-  assert(hide == JNI_FALSE, "must be VTMS transition finish");
-  jobject vthread = JNIHandles::make_local(const_cast<oopDesc*>(vt));
-  JvmtiVTMSTransitionDisabler::VTMS_vthread_start(vthread);
-  JNIHandles::destroy_local(vthread);
-JRT_END
-
-JRT_ENTRY(void, SharedRuntime::notify_jvmti_vthread_end(oopDesc* vt, jboolean hide, JavaThread* current))
-  assert(hide == JNI_TRUE, "must be VTMS transition start");
-  jobject vthread = JNIHandles::make_local(const_cast<oopDesc*>(vt));
-  JvmtiVTMSTransitionDisabler::VTMS_vthread_end(vthread);
-  JNIHandles::destroy_local(vthread);
-JRT_END
-
-JRT_ENTRY(void, SharedRuntime::notify_jvmti_vthread_mount(oopDesc* vt, jboolean hide, JavaThread* current))
-  jobject vthread = JNIHandles::make_local(const_cast<oopDesc*>(vt));
-  JvmtiVTMSTransitionDisabler::VTMS_vthread_mount(vthread, hide);
-  JNIHandles::destroy_local(vthread);
-JRT_END
-
-JRT_ENTRY(void, SharedRuntime::notify_jvmti_vthread_unmount(oopDesc* vt, jboolean hide, JavaThread* current))
-  jobject vthread = JNIHandles::make_local(const_cast<oopDesc*>(vt));
-  JvmtiVTMSTransitionDisabler::VTMS_vthread_unmount(vthread, hide);
-  JNIHandles::destroy_local(vthread);
-JRT_END
-#endif // INCLUDE_JVMTI
-
 // The interpreter code to call this tracing function is only
 // called/generated when UL is on for redefine, class and has the right level
 // and tags. Since obsolete methods are never compiled, we don't have
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index a696ce5a71b..140207e5d63 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -317,14 +317,6 @@ class SharedRuntime: AllStatic {
   static void throw_and_post_jvmti_exception(JavaThread* current, Handle h_exception);
   static void throw_and_post_jvmti_exception(JavaThread* current, Symbol* name, const char *message = nullptr);
 
-#if INCLUDE_JVMTI
-  // Functions for JVMTI notifications
-  static void notify_jvmti_vthread_start(oopDesc* vt, jboolean hide, JavaThread* current);
-  static void notify_jvmti_vthread_end(oopDesc* vt, jboolean hide, JavaThread* current);
-  static void notify_jvmti_vthread_mount(oopDesc* vt, jboolean hide, JavaThread* current);
-  static void notify_jvmti_vthread_unmount(oopDesc* vt, jboolean hide, JavaThread* current);
-#endif
-
   // RedefineClasses() tracing support for obsolete method entry
   static int rc_trace_method_entry(JavaThread* thread, Method* m);
 
diff --git a/src/hotspot/share/runtime/stubDeclarations.hpp b/src/hotspot/share/runtime/stubDeclarations.hpp
index b051c6d0e18..f9080364dc4 100644
--- a/src/hotspot/share/runtime/stubDeclarations.hpp
+++ b/src/hotspot/share/runtime/stubDeclarations.hpp
@@ -199,23 +199,10 @@
 // declaration order.
 
 #ifdef COMPILER2
-// do_jvmti_stub(name)
-#if INCLUDE_JVMTI
-#define C2_JVMTI_STUBS_DO(do_jvmti_stub)                               \
-  do_jvmti_stub(notify_jvmti_vthread_start)                            \
-  do_jvmti_stub(notify_jvmti_vthread_end)                              \
-  do_jvmti_stub(notify_jvmti_vthread_mount)                            \
-  do_jvmti_stub(notify_jvmti_vthread_unmount)                          \
-
-#else
-#define C2_JVMTI_STUBS_DO(do_jvmti_stub)
-#endif // INCLUDE_JVMTI
-
 // client macro to operate on c2 stubs
 //
 // do_blob(name, type)
 // do_stub(name, fancy_jump, pass_tls, return_pc)
-// do_jvmti_stub(name)
 //
 // do_blob is used for stubs that are generated via direct invocation
 // of the assembler to write into a blob of the appropriate type
@@ -225,10 +212,8 @@
 // in the IR graph employ a special type of jump (0, 1 or 2) or
 // provide access to TLS and the return pc.
 //
-// do_jvmti_stub generates a JVMTI stub as an IR intrinsic which
-// employs jump 0, and requires no special access
 
-#define C2_STUBS_DO(do_blob, do_stub, do_jvmti_stub)                   \
+#define C2_STUBS_DO(do_blob, do_stub)                                  \
   do_blob(uncommon_trap, UncommonTrapBlob)                             \
   do_blob(exception, ExceptionBlob)                                    \
   do_stub(new_instance, 0, true, false)                                \
@@ -239,16 +224,19 @@
   do_stub(multianewarray4, 0, true, false)                             \
   do_stub(multianewarray5, 0, true, false)                             \
   do_stub(multianewarrayN, 0, true, false)                             \
-  C2_JVMTI_STUBS_DO(do_jvmti_stub)                                     \
   do_stub(complete_monitor_locking, 0, false, false)                   \
   do_stub(monitor_notify, 0, false, false)                             \
   do_stub(monitor_notifyAll, 0, false, false)                          \
   do_stub(rethrow, 2, true, true)                                      \
   do_stub(slow_arraycopy, 0, false, false)                             \
   do_stub(register_finalizer, 0, false, false)                         \
+  do_stub(vthread_end_first_transition, 0, false, false)               \
+  do_stub(vthread_start_final_transition, 0, false, false)             \
+  do_stub(vthread_start_transition, 0, false, false)                   \
+  do_stub(vthread_end_transition, 0, false, false)                     \
 
 #else
-#define C2_STUBS_DO(do_blob, do_stub, do_jvmti_stub)
+#define C2_STUBS_DO(do_blob, do_stub)
 #endif
 
 // Stubgen stub declarations
@@ -1190,9 +1178,6 @@
 // ignore do_stub(name, fancy_jump, pass_tls, return_pc) declarations
 #define DO_STUB_EMPTY4(name, fancy_jump, pass_tls, return_pc)
 
-// ignore do_jvmti_stub(name) declarations
-#define DO_JVMTI_STUB_EMPTY1(stub_name)
-
 // ignore do_stub(blob_name, stub_name) declarations
 #define DO_STUB_EMPTY2(blob_name, stub_name)
 
diff --git a/src/hotspot/share/runtime/stubInfo.cpp b/src/hotspot/share/runtime/stubInfo.cpp
index bca6ff344ea..47a31fe7967 100644
--- a/src/hotspot/share/runtime/stubInfo.cpp
+++ b/src/hotspot/share/runtime/stubInfo.cpp
@@ -509,14 +509,6 @@ void StubInfo::process_stubgen_entry(StubGroup& group_cursor,
                   StubId:: JOIN3(c2, name, id),                   \
                   EntryId:: JOIN3(c2, name, id));                 \
 
-#define PROCESS_C2_JVMTI_STUB(name)                               \
-  process_c2_blob(_group_cursor, _blob_cursor,                    \
-                  _stub_cursor, _entry_cursor,                    \
-                  "C2 Runtime " # name "_blob",                   \
-                  BlobId:: JOIN3(c2, name, id),                   \
-                  StubId:: JOIN3(c2, name, id),                   \
-                  EntryId:: JOIN3(c2, name, id));                 \
-
 #define PROCESS_STUBGEN_BLOB(blob)                                \
   process_stubgen_blob(_group_cursor, _blob_cursor,               \
                        _stub_cursor, _entry_cursor,               \
@@ -610,7 +602,7 @@ void StubInfo::populate_stub_tables() {
   group_details(_group_cursor)._max = BlobId::NO_BLOBID;
   group_details(_group_cursor)._entry_base = EntryId::NO_ENTRYID;
   group_details(_group_cursor)._entry_max = EntryId::NO_ENTRYID;
-  C2_STUBS_DO(PROCESS_C2_BLOB, PROCESS_C2_STUB, PROCESS_C2_JVMTI_STUB);
+  C2_STUBS_DO(PROCESS_C2_BLOB, PROCESS_C2_STUB);
 
   _group_cursor = StubGroup::STUBGEN;
   group_details(_group_cursor)._name = "StubGen Stubs";
@@ -637,7 +629,6 @@ void StubInfo::populate_stub_tables() {
 #undef PROCESS_C1_BLOB
 #undef PROCESS_C2_BLOB
 #undef PROCESS_C2_STUB
-#undef PROCESS_C2_JVMTI_STUB
 #undef PROCESS_STUBGEN_BLOB
 #undef PROCESS_STUBGEN_STUB
 #undef PROCESS_STUBGEN_ENTRY
diff --git a/src/hotspot/share/runtime/stubInfo.hpp b/src/hotspot/share/runtime/stubInfo.hpp
index eaea07f7e6c..9ed6e0cb9f9 100644
--- a/src/hotspot/share/runtime/stubInfo.hpp
+++ b/src/hotspot/share/runtime/stubInfo.hpp
@@ -164,7 +164,6 @@ enum class StubGroup : int {
 
 #define SHARED_DECLARE_TAG(name, type) JOIN3(shared, name, id) ,
 #define C1_DECLARE_TAG(name) JOIN3(c1, name, id) ,
-#define C2_DECLARE_TAG1(name) JOIN3(c2, name, id) ,
 #define C2_DECLARE_TAG2(name, _1) JOIN3(c2, name, id) ,
 #define C2_DECLARE_TAG4(name, _1, _2, _3) JOIN3(c2, name, id) ,
 #define STUBGEN_DECLARE_TAG(name) JOIN3(stubgen, name, id) ,
@@ -177,8 +176,7 @@ enum class BlobId : int {
   C1_STUBS_DO(C1_DECLARE_TAG)
   // declare an enum tag for each opto runtime blob or stub
   C2_STUBS_DO(C2_DECLARE_TAG2,
-              C2_DECLARE_TAG4,
-              C2_DECLARE_TAG1)
+              C2_DECLARE_TAG4)
   // declare an enum tag for each stubgen blob
   STUBGEN_BLOBS_DO(STUBGEN_DECLARE_TAG)
   NUM_BLOBIDS
@@ -214,7 +212,6 @@ enum class BlobId : int {
 
 #define SHARED_DECLARE_TAG(name, type) JOIN3(shared, name, id) ,
 #define C1_DECLARE_TAG(name) JOIN3(c1, name, id) ,
-#define C2_DECLARE_TAG1(name) JOIN3(c2, name, id) ,
 #define C2_DECLARE_TAG2(name, _1) JOIN3(c2, name, id) ,
 #define C2_DECLARE_TAG4(name, _1, _2, _3) JOIN3(c2, name, id) ,
 #define STUBGEN_DECLARE_TAG(blob, name) JOIN3(stubgen, name, id) ,
@@ -227,8 +224,7 @@ enum class StubId : int {
   C1_STUBS_DO(C1_DECLARE_TAG)
   // declare an enum tag for each opto runtime blob or stub
   C2_STUBS_DO(C2_DECLARE_TAG2,
-              C2_DECLARE_TAG4,
-              C2_DECLARE_TAG1)
+              C2_DECLARE_TAG4)
   // declare an enum tag for each stubgen runtime stub
   STUBGEN_STUBS_DO(STUBGEN_DECLARE_TAG)
   NUM_STUBIDS
@@ -307,7 +303,7 @@ enum class StubId : int {
     type ::ENTRY_COUNT - 1,                                             \
 
 // macros to declare a tag for a C1 generated blob or a C2 generated
-// blob, stub or JVMTI stub all of which have a single unique entry
+// blob, stub all of which have a single unique entry
 
 #define C1_DECLARE_TAG(name)           \
   JOIN3(c1, name, id),                 \
@@ -318,9 +314,6 @@ enum class StubId : int {
 #define C2_DECLARE_STUB_TAG(name, fancy_jump, pass_tls, return_pc)    \
   JOIN3(c2, name, id),                                                \
 
-#define C2_DECLARE_JVMTI_STUB_TAG(name)                               \
-  JOIN3(c2, name, id),                                                \
-
 // macros to declare a tag for a StubGen normal entry or initialized
 // entry
 
@@ -366,8 +359,7 @@ enum class EntryId : int {
   C1_STUBS_DO(C1_DECLARE_TAG)
   // declare an enum tag for each opto runtime blob or stub
   C2_STUBS_DO(C2_DECLARE_BLOB_TAG,
-              C2_DECLARE_STUB_TAG,
-              C2_DECLARE_JVMTI_STUB_TAG)
+              C2_DECLARE_STUB_TAG)
   // declare an enum tag for each stubgen entry or, in the case of an
   // array of entries for the first and last entries.
   STUBGEN_ALL_ENTRIES_DO(STUBGEN_DECLARE_TAG,
@@ -382,7 +374,6 @@ enum class EntryId : int {
 #undef C1_DECLARE_TAG
 #undef C2_DECLARE_BLOB_TAG
 #undef C2_DECLARE_STUB_TAG
-#undef C2_DECLARE_JVMTI_STUB_TAG
 #undef STUBGEN_DECLARE_TAG
 #undef STUBGEN_DECLARE_INIT_TAG
 #undef STUBGEN_DECLARE_ARRAY_TAG
@@ -402,7 +393,7 @@ enum class EntryId : int {
   0 C1_STUBS_DO(COUNT1)
 
 #define C2_STUB_COUNT_INITIALIZER               \
-  0 C2_STUBS_DO(COUNT2, COUNT4, COUNT1)
+  0 C2_STUBS_DO(COUNT2, COUNT4)
 
 #define STUBGEN_BLOB_COUNT_INITIALIZER          \
   0 STUBGEN_BLOBS_DO(COUNT1)
diff --git a/src/hotspot/share/runtime/suspendResumeManager.cpp b/src/hotspot/share/runtime/suspendResumeManager.cpp
index 1b9606cf633..067579b6386 100644
--- a/src/hotspot/share/runtime/suspendResumeManager.cpp
+++ b/src/hotspot/share/runtime/suspendResumeManager.cpp
@@ -93,11 +93,12 @@ void SuspendResumeManager::set_suspended_current_thread(int64_t vthread_id, bool
 }
 
 bool SuspendResumeManager::suspend(bool register_vthread_SR) {
-  JVMTI_ONLY(assert(!_target->is_in_VTMS_transition(), "no suspend allowed in VTMS transition");)
   JavaThread* self = JavaThread::current();
   if (_target == self) {
     // If target is the current thread we can bypass the handshake machinery
     // and just suspend directly.
+    // Self-suspending while in transition can cause deadlocks.
+    assert(!self->is_in_vthread_transition(), "no self-suspend allowed in transition");
     // The vthread() oop must only be accessed before state is set to _thread_blocked.
     int64_t id = java_lang_Thread::thread_id(_target->vthread());
     ThreadBlockInVM tbivm(self);
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index 48f4eb16cf1..8772195df0b 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -1179,12 +1179,13 @@ public:
   GrowableArray<int>* _bcis;
   JavaThreadStatus _thread_status;
   OopHandle _thread_name;
+  OopHandle _carrier_thread;
   GrowableArray<OwnedLock>* _locks;
   Blocker _blocker;
 
-  GetThreadSnapshotHandshakeClosure(Handle thread_h, JavaThread* java_thread):
+  GetThreadSnapshotHandshakeClosure(Handle thread_h):
     HandshakeClosure("GetThreadSnapshotHandshakeClosure"),
-    _thread_h(thread_h), _java_thread(java_thread),
+    _thread_h(thread_h), _java_thread(nullptr),
     _frame_count(0), _methods(nullptr), _bcis(nullptr),
     _thread_status(), _thread_name(nullptr),
     _locks(nullptr), _blocker() {
@@ -1275,14 +1276,15 @@ private:
 public:
   void do_thread(Thread* th) override {
     Thread* current = Thread::current();
+    _java_thread = th != nullptr ? JavaThread::cast(th) : nullptr;
 
     bool is_virtual = java_lang_VirtualThread::is_instance(_thread_h());
     if (_java_thread != nullptr) {
       if (is_virtual) {
         // mounted vthread, use carrier thread state
-        oop carrier_thread = java_lang_VirtualThread::carrier_thread(_thread_h());
-        assert(carrier_thread != nullptr, "should only get here for a mounted vthread");
-        _thread_status = java_lang_Thread::get_thread_status(carrier_thread);
+        _carrier_thread = OopHandle(oop_storage(), java_lang_VirtualThread::carrier_thread(_thread_h()));
+        assert(_carrier_thread.resolve() == _java_thread->threadObj(), "");
+        _thread_status = java_lang_Thread::get_thread_status(_carrier_thread.resolve());
       } else {
         _thread_status = java_lang_Thread::get_thread_status(_thread_h());
       }
@@ -1459,67 +1461,21 @@ oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
   oop thread_oop;
   bool has_javathread = tlh.cv_internal_thread_to_JavaThread(jthread, &java_thread, &thread_oop);
   assert((has_javathread && thread_oop != nullptr) || !has_javathread, "Missing Thread oop");
-  Handle thread_h(THREAD, thread_oop);
-  bool is_virtual = java_lang_VirtualThread::is_instance(thread_h());  // Deals with null
+  bool is_virtual = java_lang_VirtualThread::is_instance(thread_oop);  // Deals with null
 
   if (!has_javathread && !is_virtual) {
     return nullptr; // thread terminated so not of interest
   }
 
-  // wrapper to auto delete JvmtiVTMSTransitionDisabler
-  class TransitionDisabler {
-    JvmtiVTMSTransitionDisabler* _transition_disabler;
-  public:
-    TransitionDisabler(): _transition_disabler(nullptr) {}
-    ~TransitionDisabler() {
-      reset();
-    }
-    void init(jobject jthread) {
-      _transition_disabler = new (mtInternal) JvmtiVTMSTransitionDisabler(jthread);
-    }
-    void reset() {
-      if (_transition_disabler != nullptr) {
-        delete _transition_disabler;
-        _transition_disabler = nullptr;
-      }
-    }
-  } transition_disabler;
-
-  Handle carrier_thread;
-  if (is_virtual) {
-    // 1st need to disable mount/unmount transitions
-    transition_disabler.init(jthread);
-
-    carrier_thread = Handle(THREAD, java_lang_VirtualThread::carrier_thread(thread_h()));
-    if (carrier_thread != nullptr) {
-      // Note: The java_thread associated with this carrier_thread may not be
-      // protected by the ThreadsListHandle above. There could have been an
-      // unmount and remount after the ThreadsListHandle above was created
-      // and before the JvmtiVTMSTransitionDisabler was created. However, as
-      // we have disabled transitions, if we are mounted on it, then it cannot
-      // terminate and so is safe to handshake with.
-      java_thread = java_lang_Thread::thread(carrier_thread());
-    } else {
-      // We may have previously found a carrier but the virtual thread has unmounted
-      // after that, so clear that previous reference.
-      java_thread = nullptr;
-    }
-  } else {
-    java_thread = java_lang_Thread::thread(thread_h());
-  }
-
   // Handshake with target
-  GetThreadSnapshotHandshakeClosure cl(thread_h, java_thread);
-  if (java_thread == nullptr) {
-    // unmounted vthread, execute on the current thread
-    cl.do_thread(nullptr);
+  Handle thread_h(THREAD, thread_oop);
+  GetThreadSnapshotHandshakeClosure cl(thread_h);
+  if (java_lang_VirtualThread::is_instance(thread_oop)) {
+    Handshake::execute(&cl, thread_oop);
   } else {
     Handshake::execute(&cl, &tlh, java_thread);
   }
 
-  // all info is collected, can enable transitions.
-  transition_disabler.reset();
-
   // StackTrace
   InstanceKlass* ste_klass = vmClasses::StackTraceElement_klass();
   assert(ste_klass != nullptr, "must be loaded");
@@ -1569,7 +1525,7 @@ oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
   Handle snapshot = jdk_internal_vm_ThreadSnapshot::allocate(InstanceKlass::cast(snapshot_klass), CHECK_NULL);
   jdk_internal_vm_ThreadSnapshot::set_name(snapshot(), cl._thread_name.resolve());
   jdk_internal_vm_ThreadSnapshot::set_thread_status(snapshot(), (int)cl._thread_status);
-  jdk_internal_vm_ThreadSnapshot::set_carrier_thread(snapshot(), carrier_thread());
+  jdk_internal_vm_ThreadSnapshot::set_carrier_thread(snapshot(), cl._carrier_thread.resolve());
   jdk_internal_vm_ThreadSnapshot::set_stack_trace(snapshot(), trace());
   jdk_internal_vm_ThreadSnapshot::set_locks(snapshot(), locks());
   if (!cl._blocker.is_empty()) {
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 51543f835c1..514bf07e665 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -246,11 +246,11 @@ final class VirtualThread extends BaseVirtualThread {
                 @Hidden
                 @JvmtiHideEvents
                 public void run() {
-                    vthread.notifyJvmtiStart(); // notify JVMTI
+                    vthread.endFirstTransition();
                     try {
                         vthread.run(task);
                     } finally {
-                        vthread.notifyJvmtiEnd(); // notify JVMTI
+                        vthread.startFinalTransition();
                     }
                 }
             };
@@ -491,8 +491,9 @@ final class VirtualThread extends BaseVirtualThread {
     @ChangesCurrentThread
     @ReservedStackAccess
     private void mount() {
-        // notify JVMTI before mount
-        notifyJvmtiMount(/*hide*/true);
+        startTransition(/*is_mount*/true);
+        // We assume following volatile accesses provide equivalent
+        // of acquire ordering, otherwise we need U.loadFence() here.
 
         // sets the carrier thread
         Thread carrier = Thread.currentCarrierThread();
@@ -533,8 +534,9 @@ final class VirtualThread extends BaseVirtualThread {
         }
         carrier.clearInterrupt();
 
-        // notify JVMTI after unmount
-        notifyJvmtiUnmount(/*hide*/false);
+        // We assume previous volatile accesses provide equivalent
+        // of release ordering, otherwise we need U.storeFence() here.
+        endTransition(/*is_mount*/false);
     }
 
     /**
@@ -543,11 +545,11 @@ final class VirtualThread extends BaseVirtualThread {
      */
     @Hidden
     private boolean yieldContinuation() {
-        notifyJvmtiUnmount(/*hide*/true);
+        startTransition(/*is_mount*/false);
         try {
             return Continuation.yield(VTHREAD_SCOPE);
         } finally {
-            notifyJvmtiMount(/*hide*/false);
+            endTransition(/*is_mount*/true);
         }
     }
 
@@ -1401,23 +1403,34 @@ final class VirtualThread extends BaseVirtualThread {
         this.carrierThread = carrier;
     }
 
-    // -- JVM TI support --
+    // The following four methods notify the VM when a "transition" starts and ends.
+    // A "mount transition" embodies the steps to transfer control from a platform
+    // thread to a virtual thread, changing the thread identity, and starting or
+    // resuming the virtual thread's continuation on the carrier.
+    // An "unmount transition" embodies the steps to transfer control from a virtual
+    // thread to its carrier, suspending the virtual thread's continuation, and
+    // restoring the thread identity to the platform thread.
+    // The notifications to the VM are necessary in order to coordinate with functions
+    // (JVMTI mostly) that disable transitions for one or all virtual threads. Starting
+    // a transition may block if transitions are disabled. Ending a transition may
+    // notify a thread that is waiting to disable transitions. The notifications are
+    // also used to post JVMTI events for virtual thread start and end.
 
     @IntrinsicCandidate
     @JvmtiMountTransition
-    private native void notifyJvmtiStart();
+    private native void endFirstTransition();
 
     @IntrinsicCandidate
     @JvmtiMountTransition
-    private native void notifyJvmtiEnd();
+    private native void startFinalTransition();
 
     @IntrinsicCandidate
     @JvmtiMountTransition
-    private native void notifyJvmtiMount(boolean hide);
+    private native void startTransition(boolean is_mount);
 
     @IntrinsicCandidate
     @JvmtiMountTransition
-    private native void notifyJvmtiUnmount(boolean hide);
+    private native void endTransition(boolean is_mount);
 
     @IntrinsicCandidate
     private static native void notifyJvmtiDisableSuspend(boolean enter);
diff --git a/src/java.base/share/native/libjava/VirtualThread.c b/src/java.base/share/native/libjava/VirtualThread.c
index 3cacf89e752..5936031f926 100644
--- a/src/java.base/share/native/libjava/VirtualThread.c
+++ b/src/java.base/share/native/libjava/VirtualThread.c
@@ -32,10 +32,10 @@
 #define VIRTUAL_THREAD  "Ljava/lang/VirtualThread;"
 
 static JNINativeMethod methods[] = {
-    { "notifyJvmtiStart",          "()V",  (void *)&JVM_VirtualThreadStart },
-    { "notifyJvmtiEnd",            "()V",  (void *)&JVM_VirtualThreadEnd },
-    { "notifyJvmtiMount",          "(Z)V", (void *)&JVM_VirtualThreadMount },
-    { "notifyJvmtiUnmount",        "(Z)V", (void *)&JVM_VirtualThreadUnmount },
+    { "endFirstTransition",       "()V",  (void *)&JVM_VirtualThreadEndFirstTransition },
+    { "startFinalTransition",     "()V",  (void *)&JVM_VirtualThreadStartFinalTransition },
+    { "startTransition",          "(Z)V", (void *)&JVM_VirtualThreadStartTransition },
+    { "endTransition",            "(Z)V", (void *)&JVM_VirtualThreadEndTransition },
     { "notifyJvmtiDisableSuspend", "(Z)V", (void *)&JVM_VirtualThreadDisableSuspend },
     { "postPinnedEvent",           "(" STR ")V", (void *)&JVM_VirtualThreadPinnedEvent },
     { "takeVirtualThreadListToUnblock", "()" VIRTUAL_THREAD, (void *)&JVM_TakeVirtualThreadListToUnblock},
diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWhenParking.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWhenParking.java
new file mode 100644
index 00000000000..bd7dc014460
--- /dev/null
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWhenParking.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=transitions
+ * @bug 8364343
+ * @summary HotSpotDiagnosticMXBean.dumpThreads while virtual threads are parking and unparking
+ * @requires vm.continuations
+ * @modules jdk.management
+ * @library /test/lib
+ * @run main/othervm/timeout=200 DumpThreadsWhenParking 1000 1 100
+ */
+
+/*
+ * @test id=concurrent
+ * @summary HotSpotDiagnosticMXBean.dumpThreads from concurrent threads while virtual threads
+ *    are parking and unparking
+ * @requires vm.continuations
+ * @modules jdk.management
+ * @library /test/lib
+ * @run main/othervm/timeout=200 DumpThreadsWhenParking 100 4 100
+ */
+
+/*
+ * @test id=concurrent_gcstress
+ * @summary HotSpotDiagnosticMXBean.dumpThreads from concurrent threads while virtual threads
+ *    are parking and unparking
+ * @requires vm.debug == true & vm.continuations
+ * @modules jdk.management
+ * @library /test/lib
+ * @run main/othervm/timeout=200 -XX:+UnlockDiagnosticVMOptions -XX:+FullGCALot -XX:FullGCALotInterval=10000 DumpThreadsWhenParking 100 4 100
+ */
+
+import java.lang.management.ManagementFactory;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+import java.util.stream.IntStream;
+import com.sun.management.HotSpotDiagnosticMXBean;
+import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.threaddump.ThreadDump;
+
+public class DumpThreadsWhenParking {
+
+    public static void main(String... args) throws Throwable {
+        int vthreadCount = Integer.parseInt(args[0]);
+        int concurrentDumpers = Integer.parseInt(args[1]);
+        int iterations = Integer.parseInt(args[2]);
+
+        // need >=2 carriers to make progress
+        VThreadRunner.ensureParallelism(2);
+
+        try (var executor = Executors.newVirtualThreadPerTaskExecutor();
+             var pool = Executors.newCachedThreadPool()) {
+
+            // start virtual threads that park and unpark
+            var done = new AtomicBoolean();
+            var phaser = new Phaser(vthreadCount + 1);
+            for (int i = 0; i < vthreadCount; i++) {
+                executor.submit(() -> {
+                    phaser.arriveAndAwaitAdvance();
+                    while (!done.get()) {
+                        LockSupport.parkNanos(1);
+                    }
+                });
+            }
+            // wait for all virtual threads to start so all have a non-empty stack
+            System.out.format("Waiting for %d virtual threads to start ...%n", vthreadCount);
+            phaser.arriveAndAwaitAdvance();
+            System.out.format("%d virtual threads started.%n", vthreadCount);
+
+            // Bash on HotSpotDiagnosticMXBean.dumpThreads from >= 1 threads
+            try {
+                String containerName = Objects.toIdentityString(executor);
+                for (int i = 1; i <= iterations; i++) {
+                    System.out.format("%s %d of %d ...%n", Instant.now(), i, iterations);
+                    List<Future<Void>> futures = IntStream.of(0, concurrentDumpers)
+                            .mapToObj(_ -> pool.submit(() -> dumpThreads(containerName, vthreadCount)))
+                            .toList();
+                    for (Future<?> future : futures) {
+                        future.get();
+                    }
+                }
+            } finally {
+                done.set(true);
+            }
+        }
+    }
+
+    /**
+     * Invoke HotSpotDiagnosticMXBean.dumpThreads to generate a thread dump to a file in
+     * JSON format. Parse the thread dump to ensure it contains a thread grouping with
+     * the expected number of virtual threads.
+     */
+    static Void dumpThreads(String containerName, int expectedVThreadCount) throws Exception {
+        long tid = Thread.currentThread().threadId();
+        Path file = Path.of("threads-" + tid + ".json").toAbsolutePath();
+        Files.deleteIfExists(file);
+        ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                .dumpThreads(file.toString(), HotSpotDiagnosticMXBean.ThreadDumpFormat.JSON);
+
+        // read and parse the dump
+        String jsonText = Files.readString(file);
+        ThreadDump threadDump = ThreadDump.parse(jsonText);
+        var container = threadDump.findThreadContainer(containerName).orElse(null);
+        if (container == null) {
+            fail(containerName + " not found in thread dump");
+        }
+
+        // check expected virtual thread count
+        long threadCount = container.threads().count();
+        if (threadCount != expectedVThreadCount) {
+            fail(threadCount + " virtual threads found, expected " + expectedVThreadCount);
+        }
+
+        // check each thread is a virtual thread with stack frames
+        container.threads().forEach(t -> {
+            if (!t.isVirtual()) {
+                fail("#" + t.tid() + "(" + t.name() + ") is not a virtual thread");
+            }
+            long stackFrameCount = t.stack().count();
+            if (stackFrameCount == 0) {
+                fail("#" + t.tid() + " has empty stack");
+            }
+        });
+        return null;
+    }
+
+    private static void fail(String message) {
+        throw new RuntimeException(message);
+    }
+}
diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java
index 4cbd0de460c..787d53ae045 100644
--- a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java
@@ -43,6 +43,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -73,9 +74,11 @@ public class DumpThreadsWithEliminatedLock {
 
         // A thread that spins creating and adding to a StringBuffer. StringBuffer is
         // synchronized, assume object will be scalar replaced and the lock eliminated.
+        var started = new CountDownLatch(1);
         var done = new AtomicBoolean();
         var ref = new AtomicReference<String>();
         Thread thread = factory.newThread(() -> {
+            started.countDown();
             while (!done.get()) {
                 StringBuffer sb = new StringBuffer();
                 sb.append(System.currentTimeMillis());
@@ -85,6 +88,7 @@ public class DumpThreadsWithEliminatedLock {
         });
         try {
             thread.start();
+            started.await();
             if (plain) {
                 testPlainFormat();
             } else {

From 5ea2b6402114d34465b2ad9e476ab8e36ddeea06 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Wed, 3 Dec 2025 20:03:33 +0000
Subject: [PATCH 490/512] 8372977: unnecessary gthread-2.0 loading

Reviewed-by: prr, kizune
---
 .../native/libawt_xawt/awt/gtk3_interface.c   | 21 -------------------
 .../native/libawt_xawt/awt/gtk_interface.h    |  6 ------
 2 files changed, 27 deletions(-)

diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
index e5b2dfa6db9..03dba969e8d 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
@@ -42,7 +42,6 @@
 #include "debug_assert.h"
 
 static void *gtk3_libhandle = NULL;
-static void *gthread_libhandle = NULL;
 
 static void transform_detail_string (const gchar *detail,
                                      GtkStyleContext *context);
@@ -79,15 +78,6 @@ static void* dl_symbol(const char* name)
     return result;
 }
 
-static void* dl_symbol_gthread(const char* name)
-{
-    void* result = dlsym(gthread_libhandle, name);
-    if (!result)
-        longjmp(j, NO_SYMBOL_EXCEPTION);
-
-    return result;
-}
-
 gboolean gtk3_check(const char* lib_name, gboolean load)
 {
     if (gtk3_libhandle != NULL) {
@@ -264,13 +254,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
         return FALSE;
     }
 
-    gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL);
-    if (gthread_libhandle == NULL) {
-        gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL);
-        if (gthread_libhandle == NULL)
-            return FALSE;
-    }
-
     if (setjmp(j) == 0)
     {
         fp_gtk_check_version = dl_symbol("gtk_check_version");
@@ -634,9 +617,6 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
         dlclose(gtk3_libhandle);
         gtk3_libhandle = NULL;
 
-        dlclose(gthread_libhandle);
-        gthread_libhandle = NULL;
-
         return NULL;
     }
 
@@ -735,7 +715,6 @@ static int gtk3_unload()
 
     dlerror();
     dlclose(gtk3_libhandle);
-    dlclose(gthread_libhandle);
     if ((gtk3_error = dlerror()) != NULL)
     {
         return FALSE;
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
index 11ec245ce8b..39be6a735d7 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
@@ -38,9 +38,6 @@
 #define TRUE            (!FALSE)
 #endif
 
-#define GTHREAD_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gthread-2.0", "0")
-#define GTHREAD_LIB JNI_LIB_NAME("gthread-2.0")
-
 #define _G_TYPE_CIC(ip, gt, ct)       ((ct*) ip)
 #define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)  \
                                     (_G_TYPE_CIC ((instance), (g_type), c_type))
@@ -850,9 +847,6 @@ typedef struct GtkApi {
 gboolean gtk_load(JNIEnv *env, GtkVersion version, gboolean verbose);
 gboolean gtk_check_version(GtkVersion version);
 
-typedef struct _GThreadFunctions GThreadFunctions;
-static gboolean (*fp_g_thread_get_initialized)(void);
-static void (*fp_g_thread_init)(GThreadFunctions *vtable);
 static void (*fp_gdk_threads_init)(void);
 static void (*fp_gdk_threads_enter)(void);
 static void (*fp_gdk_threads_leave)(void);

From 70e2bc876abe35b3d447f8004245bdbf2fead59f Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Wed, 3 Dec 2025 21:32:29 +0000
Subject: [PATCH 491/512] 8372816: New test
 sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java succeeds in case of
 error

Reviewed-by: azeller, mdoerr
---
 .../provider/acvp/ML_DSA_Intrinsic_Test.java  | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
index ea04b3c7eec..7f057603323 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
@@ -28,13 +28,6 @@ import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.util.HexFormat;
 
-/*
- * @test
- * @library /test/lib
- * @key randomness
- * @modules java.base/sun.security.provider:+open
- * @run main/othervm ML_DSA_Intrinsic_Test -XX:+UnlockDiagnosticVMOptions -XX:-UseDilithiumIntrinsics
- */
 /*
  * @test
  * @requires os.simpleArch == "x64"
@@ -55,7 +48,7 @@ import java.util.HexFormat;
 //  -XX:+UnlockDiagnosticVMOptions -XX:+UseDilithiumIntrinsics test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
 
 public class ML_DSA_Intrinsic_Test {
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) throws Exception, Throwable {
         MethodHandles.Lookup lookup = MethodHandles.lookup();
         Class<?> kClazz = sun.security.provider.ML_DSA.class;
 
@@ -114,27 +107,23 @@ public class ML_DSA_Intrinsic_Test {
         long seed = rnd.nextLong();
         rnd.setSeed(seed);
         //Note: it might be useful to increase this number during development of new intrinsics
-        final int repeat = 10000000;
+        final int repeat = 10000;
         int[] coeffs1 = new int[ML_DSA_N];
         int[] coeffs2 = new int[ML_DSA_N];
         int[] prod1 = new int[ML_DSA_N];
         int[] prod2 = new int[ML_DSA_N];
         int[] prod3 = new int[ML_DSA_N];
         int[] prod4 = new int[ML_DSA_N];
-        try {
-            for (int i = 0; i < repeat; i++) {
-                // Hint: if test fails, you can hardcode the seed to make the test more reproducible:
-                // rnd.setSeed(seed);
-                testMult(prod1, prod2, coeffs1, coeffs2, mult, multJava, rnd, seed, i);
-                testMultConst(prod1, prod2, multConst, multConstJava, rnd, seed, i);
-                testDecompose(prod1, prod2, prod3, prod4, coeffs1, coeffs2, decompose, decomposeJava, rnd, seed, i);
-                testAlmostNtt(coeffs1, coeffs2, almostNtt, almostNttJava, rnd, seed, i);
-                testInverseNtt(coeffs1, coeffs2, inverseNtt, inverseNttJava, rnd, seed, i);
-            }
-            System.out.println("Fuzz Success");
-        } catch (Throwable e) {
-            System.out.println("Fuzz Failed: " + e);
+        for (int i = 0; i < repeat; i++) {
+            // Hint: if test fails, you can hardcode the seed to make the test more reproducible:
+            // rnd.setSeed(seed);
+            testMult(prod1, prod2, coeffs1, coeffs2, mult, multJava, rnd, seed, i);
+            testMultConst(prod1, prod2, multConst, multConstJava, rnd, seed, i);
+            testDecompose(prod1, prod2, prod3, prod4, coeffs1, coeffs2, decompose, decomposeJava, rnd, seed, i);
+            testAlmostNtt(coeffs1, coeffs2, almostNtt, almostNttJava, rnd, seed, i);
+            testInverseNtt(coeffs1, coeffs2, inverseNtt, inverseNttJava, rnd, seed, i);
         }
+        System.out.println("Fuzz Success");
     }
 
     private static final int ML_DSA_N = 256;

From 9b386014a01b2bff47856bf9a8e113317db1f081 Mon Sep 17 00:00:00 2001
From: Evgeny Nikitin <enikitin@openjdk.org>
Date: Wed, 3 Dec 2025 21:58:17 +0000
Subject: [PATCH 492/512] 8373049: Update JCStress test suite

Reviewed-by: epavlova, lmesnik
---
 test/hotspot/jtreg/applications/jcstress/JcstressRunner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java b/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java
index a0c9488dfe3..eb785b06330 100644
--- a/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java
+++ b/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java
@@ -45,7 +45,7 @@ import java.util.List;
         revision = JcstressRunner.VERSION, extension = "jar", unpack = false)
 public class JcstressRunner {
 
-    public static final String VERSION = "0.17-SNAPSHOT-20241217";
+    public static final String VERSION = "0.17-SNAPSHOT-20250619";
     public static final String MAIN_CLASS = "org.openjdk.jcstress.Main";
 
     public static final String TIME_BUDGET_PROPERTY = "jcstress.time_budget";

From 1294d55b194704dce92c5132d6779e6f4d4850e6 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 3 Dec 2025 22:42:47 +0000
Subject: [PATCH 493/512] 8372769: Test
 runtime/handshake/HandshakeDirectTest.java failed - JVMTI ERROR 13

Reviewed-by: lmesnik, pchilanomate, cjplummer, amenkov
---
 .../jtreg/runtime/handshake/HandshakeDirectTest.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/handshake/HandshakeDirectTest.java b/test/hotspot/jtreg/runtime/handshake/HandshakeDirectTest.java
index af43c6059d5..600ef6089a6 100644
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeDirectTest.java
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeDirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ public class HandshakeDirectTest  implements Runnable {
     static Object[] locks = new Object[WORKING_THREADS];
     static AtomicInteger handshakeCount = new AtomicInteger(0);
 
-    static void suspendThread(Thread t) {
+    static boolean suspendThread(Thread t) {
         try {
             JVMTIUtils.suspendThread(t);
         } catch (JVMTIUtils.JvmtiException e) {
@@ -56,7 +56,9 @@ public class HandshakeDirectTest  implements Runnable {
                 && e.getCode() != JVMTIUtils.JVMTI_ERROR_WRONG_PHASE) {
                 throw e;
             }
+            return false; // failed to suspend
         }
+        return true; // suspended
     }
 
     static void resumeThread(Thread t) {
@@ -115,7 +117,10 @@ public class HandshakeDirectTest  implements Runnable {
             public void run() {
                 while (true) {
                     int i = ThreadLocalRandom.current().nextInt(0, WORKING_THREADS - 1);
-                    suspendThread(workingThreads[i]);
+                    boolean suspended = suspendThread(workingThreads[i]);
+                    if (!suspended) {
+                        continue; // skip resumeThread call if thread was not suspended
+                    }
                     try {
                         Thread.sleep(1); // sleep for 1 ms
                     } catch(InterruptedException ie) {

From db2a5420a2e3d0f5f0f066eace37a8fd4f075802 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Wed, 3 Dec 2025 22:43:17 +0000
Subject: [PATCH 494/512] 8372861: Genshen: Override parallel_region_stride of
 ShenandoahResetBitmapClosure to a reasonable value for better parallelism

Reviewed-by: kdnilsen, shade, wkemper
---
 src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp  | 3 +++
 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp        | 2 +-
 src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp        | 1 +
 .../share/gc/shenandoah/shenandoahHeapRegionClosures.hpp  | 8 ++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index ea421365614..123bd792126 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -76,6 +76,9 @@ public:
     }
   }
 
+  // Bitmap reset task is heavy-weight and benefits from much smaller tasks than the default.
+  size_t parallel_region_stride() override { return 8; }
+
   bool is_thread_safe() override { return true; }
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 5c4d10ca8a5..6d569e9b4ce 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1962,7 +1962,7 @@ void ShenandoahHeap::parallel_heap_region_iterate(ShenandoahHeapRegionClosure* b
   assert(blk->is_thread_safe(), "Only thread-safe closures here");
   const uint active_workers = workers()->active_workers();
   const size_t n_regions = num_regions();
-  size_t stride = ShenandoahParallelRegionStride;
+  size_t stride = blk->parallel_region_stride();
   if (stride == 0 && active_workers > 1) {
     // Automatically derive the stride to balance the work between threads
     // evenly. Do not try to split work if below the reasonable threshold.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index cd388ee7cf3..65e3803627c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -113,6 +113,7 @@ public:
 class ShenandoahHeapRegionClosure : public StackObj {
 public:
   virtual void heap_region_do(ShenandoahHeapRegion* r) = 0;
+  virtual size_t parallel_region_stride() { return ShenandoahParallelRegionStride; }
   virtual bool is_thread_safe() { return false; }
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.hpp
index 0daf268628c..3f3b57c9bb2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.hpp
@@ -44,6 +44,10 @@ public:
     }
   }
 
+  size_t parallel_region_stride() override {
+    return _closure->parallel_region_stride();
+  }
+
   bool is_thread_safe() override {
     return _closure->is_thread_safe();
   }
@@ -64,6 +68,10 @@ public:
     }
   }
 
+  size_t parallel_region_stride() override {
+    return _closure->parallel_region_stride();
+  }
+
   bool is_thread_safe() override {
     return _closure->is_thread_safe();
   }

From 8f8fda7c80b57e8a36827cc260f0be0e5d61f6a6 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Wed, 3 Dec 2025 22:46:18 +0000
Subject: [PATCH 495/512] 8373048: Genshen: Remove dead code from Shenandoah

Reviewed-by: wkemper
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 115 +-----------------
 .../gc/shenandoah/shenandoahGeneration.cpp    |   2 -
 .../shenandoah/shenandoahGenerationalHeap.cpp |  13 --
 .../shenandoah/shenandoahGenerationalHeap.hpp |  12 --
 .../shenandoahHeapRegion.inline.hpp           |   2 +-
 .../shenandoah/shenandoahRegulatorThread.hpp  |   1 -
 .../shenandoah/shenandoahScanRemembered.hpp   |   2 -
 7 files changed, 2 insertions(+), 145 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index ab7985b3d34..6a6cad68fd9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -175,7 +175,6 @@ ShenandoahRegionPartitions::ShenandoahRegionPartitions(size_t max_regions, Shena
 void ShenandoahFreeSet::account_for_pip_regions(size_t mutator_regions, size_t mutator_bytes,
                                                 size_t collector_regions, size_t collector_bytes) {
   shenandoah_assert_heaplocked();
-  size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
 
   // We have removed all of these regions from their respective partition. Each pip region is "in" the NotFree partition.
   // We want to account for all pip pad memory as if it had been consumed from within the Mutator partition.
@@ -1605,18 +1604,13 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
     }
   }
 
-  size_t ac = alloc_capacity(r);
   ShenandoahFreeSetPartitionId orig_partition;
-  ShenandoahGeneration* request_generation = nullptr;
   if (req.is_mutator_alloc()) {
-    request_generation = _heap->mode()->is_generational()? _heap->young_generation(): _heap->global_generation();
     orig_partition = ShenandoahFreeSetPartitionId::Mutator;
   } else if (req.is_old()) {
-    request_generation = _heap->old_generation();
     orig_partition = ShenandoahFreeSetPartitionId::OldCollector;
   } else {
     // Not old collector alloc, so this is a young collector gclab or shared allocation
-    request_generation = _heap->mode()->is_generational()? _heap->young_generation(): _heap->global_generation();
     orig_partition = ShenandoahFreeSetPartitionId::Collector;
   }
   if (alloc_capacity(r) < PLAB::min_size() * HeapWordSize) {
@@ -1688,7 +1682,6 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req, bo
   idx_t num = ShenandoahHeapRegion::required_regions(words_size * HeapWordSize);
 
   assert(req.is_young(), "Humongous regions always allocated in YOUNG");
-  ShenandoahGeneration* generation = _heap->generation_for(req.affiliation());
 
   // Check if there are enough regions left to satisfy allocation.
   if (num > (idx_t) _partitions.count(ShenandoahFreeSetPartitionId::Mutator)) {
@@ -1833,107 +1826,7 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req, bo
 }
 
 class ShenandoahRecycleTrashedRegionClosure final : public ShenandoahHeapRegionClosure {
-private:
-  static const ssize_t SentinelUsed = -1;
-  static const ssize_t SentinelIndex = -1;
-  static const size_t MaxSavedRegions = 128;
-
-  ShenandoahRegionPartitions* _partitions;
-  volatile size_t _recycled_region_count;
-  ssize_t _region_indices[MaxSavedRegions];
-  ssize_t _region_used[MaxSavedRegions];
-
-  void get_lock_and_flush_buffer(size_t region_count, size_t overflow_region_used, size_t overflow_region_index) {
-    ShenandoahHeap* heap = ShenandoahHeap::heap();
-    ShenandoahHeapLocker locker(heap->lock());
-    size_t recycled_regions = AtomicAccess::load(&_recycled_region_count);
-    size_t region_tallies[int(ShenandoahRegionPartitions::NumPartitions)];
-    size_t used_byte_tallies[int(ShenandoahRegionPartitions::NumPartitions)];
-    for (int p = 0; p < int(ShenandoahRegionPartitions::NumPartitions); p++) {
-      region_tallies[p] = 0;
-      used_byte_tallies[p] = 0;
-    }
-    ShenandoahFreeSetPartitionId p = _partitions->membership(overflow_region_index);
-    used_byte_tallies[int(p)] += overflow_region_used;
-    if (region_count <= recycled_regions) {
-      // _recycled_region_count has not been decremented after I incremented it to obtain region_count, so I will
-      // try to flush the buffer.
-
-      // Multiple worker threads may attempt to flush this buffer.  The first thread to acquire the lock does the work.
-      // _recycled_region_count is only decreased while holding the heap lock.
-      if (region_count > recycled_regions) {
-        region_count = recycled_regions;
-      }
-      for (size_t i = 0; i < region_count; i++) {
-        ssize_t used;
-        // wait for other threads to finish updating their entries within the region buffer before processing entry
-        do {
-          used = _region_used[i];
-        } while (used == SentinelUsed);
-        ssize_t index;
-        do {
-          index = _region_indices[i];
-        } while (index == SentinelIndex);
-
-        ShenandoahFreeSetPartitionId p = _partitions->membership(index);
-        assert(p != ShenandoahFreeSetPartitionId::NotFree, "Trashed regions should be in a free partition");
-        used_byte_tallies[int(p)] += used;
-        region_tallies[int(p)]++;
-      }
-      if (region_count > 0) {
-        for (size_t i = 0; i < MaxSavedRegions; i++) {
-          _region_indices[i] = SentinelIndex;
-          _region_used[i] = SentinelUsed;
-        }
-      }
-
-      // The almost last thing we do before releasing the lock is to set the _recycled_region_count to 0.  What happens next?
-      //
-      //  1. Any worker thread that attempted to buffer a new region while we were flushing the buffer will have seen
-      //     that _recycled_region_count > MaxSavedRegions. All such worker threads will first wait for the lock, then
-      //     discover that the _recycled_region_count is zero, then, while holding the lock, they will process the
-      //     region so it doesn't have to be placed into the buffer.  This handles the large majority of cases.
-      //
-      //  2. However, there's a race that can happen, which will result in someewhat different behavior.  Suppose
-      //     this thread resets _recycled_region_count to 0.  Then some other worker thread increments _recycled_region_count
-      //     in order to stores its region into the buffer and suppose this happens before all of the other worker threads
-      //     which are waiting to acquire the heap lock have finished their efforts to flush the buffer.  If this happens,
-      //     then the workers who are waiting to acquire the heap lock and flush the buffer will find that _recycled_region_count
-      //     has decreased from the value it held when they last tried to increment its value.  In this case, these worker
-      //     threads will process their overflow region while holding the lock, but they will not attempt to process regions
-      //     newly placed into the buffer.  Otherwise, confusion could result.
-      //
-      // Assumption: all worker threads who are attempting to acquire lock and flush buffer will finish their efforts before
-      //             the buffer once again overflows.
-      // How could we avoid depending on this assumption?
-      //   1. Let MaxSavedRegions be as large as number of regions, or at least as large as the collection set.
-      //   2. Keep a count of how many times the buffer has been flushed per instantation of the
-      //      ShenandoahRecycleTrashedRegionClosure object, and only consult/update this value while holding the heap lock.
-      //      Need to think about how this helps resolve the race.
-      _recycled_region_count = 0;
-    } else {
-      // Some other thread has already processed the buffer, resetting _recycled_region_count to zero. Its current value
-      // may be greater than zero because other workers may have accumulated entries into the buffer. But it is "extremely"
-      // unlikely that it will overflow again before all waiting workers have had a chance to clear their state. While I've
-      // got the heap lock, I'll go ahead and update the global state for my overflow region. I'll let other heap regions
-      // accumulate in the buffer to be processed when the buffer is once again full.
-      region_count = 0;
-    }
-    for (size_t p = 0; p < int(ShenandoahRegionPartitions::NumPartitions); p++) {
-      _partitions->decrease_used(ShenandoahFreeSetPartitionId(p), used_byte_tallies[p]);
-    }
-  }
-
 public:
-  ShenandoahRecycleTrashedRegionClosure(ShenandoahRegionPartitions* p): ShenandoahHeapRegionClosure() {
-    _partitions = p;
-    _recycled_region_count = 0;
-    for (size_t i = 0; i < MaxSavedRegions; i++) {
-      _region_indices[i] = SentinelIndex;
-      _region_used[i] = SentinelUsed;
-    }
-  }
-
   void heap_region_do(ShenandoahHeapRegion* r) {
     r->try_recycle();
   }
@@ -1950,14 +1843,12 @@ void ShenandoahFreeSet::recycle_trash() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   heap->assert_gc_workers(heap->workers()->active_workers());
 
-  ShenandoahRecycleTrashedRegionClosure closure(&_partitions);
+  ShenandoahRecycleTrashedRegionClosure closure;
   heap->parallel_heap_region_iterate(&closure);
 }
 
 bool ShenandoahFreeSet::transfer_one_region_from_mutator_to_old_collector(size_t idx, size_t alloc_capacity) {
   ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
-  ShenandoahYoungGeneration* young_gen = gen_heap->young_generation();
-  ShenandoahOldGeneration* old_gen = gen_heap->old_generation();
   size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
   assert(alloc_capacity == region_size_bytes, "Region must be empty");
   if (young_unaffiliated_regions() > 0) {
@@ -1985,7 +1876,6 @@ bool ShenandoahFreeSet::flip_to_old_gc(ShenandoahHeapRegion* r) {
   assert(_partitions.partition_id_matches(idx, ShenandoahFreeSetPartitionId::Mutator), "Should be in mutator view");
   assert(can_allocate_from(r), "Should not be allocated");
 
-  ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
   const size_t region_alloc_capacity = alloc_capacity(r);
 
   if (transfer_one_region_from_mutator_to_old_collector(idx, region_alloc_capacity)) {
@@ -2133,7 +2023,6 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
   size_t total_mutator_regions = 0;
   size_t total_old_collector_regions = 0;
 
-  bool is_generational = _heap->mode()->is_generational();
   size_t num_regions = _heap->num_regions();
   for (size_t idx = 0; idx < num_regions; idx++) {
     ShenandoahHeapRegion* region = _heap->get_region(idx);
@@ -2222,7 +2111,6 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
         }
       } else {
         assert(_partitions.membership(idx) == ShenandoahFreeSetPartitionId::NotFree, "Region should have been retired");
-        size_t ac = alloc_capacity(region);
         size_t humongous_waste_bytes = 0;
         if (region->is_humongous_start()) {
           oop obj = cast_to_oop(region->bottom());
@@ -3120,7 +3008,6 @@ void ShenandoahFreeSet::log_status() {
       size_t total_used = 0;
       size_t total_free = 0;
       size_t total_free_ext = 0;
-      size_t total_trashed_free = 0;
 
       for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator);
            idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator); idx++) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index 123bd792126..55d6033b3bc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -527,7 +527,6 @@ size_t ShenandoahGeneration::select_aged_regions(const size_t old_promotion_rese
   assert_no_in_place_promotions();
 
   auto const heap = ShenandoahGenerationalHeap::heap();
-  ShenandoahYoungGeneration* young_gen = heap->young_generation();
   ShenandoahFreeSet* free_set = heap->free_set();
   bool* const candidate_regions_for_promotion_by_copy = heap->collection_set()->preselected_regions();
   ShenandoahMarkingContext* const ctx = heap->marking_context();
@@ -565,7 +564,6 @@ size_t ShenandoahGeneration::select_aged_regions(const size_t old_promotion_rese
   size_t pip_mutator_bytes = 0;
   size_t pip_collector_bytes = 0;
 
-  size_t min_remnant_size = PLAB::min_size() * HeapWordSize;
   for (idx_t i = 0; i < num_regions; i++) {
     ShenandoahHeapRegion* const r = heap->get_region(i);
     if (r->is_empty() || !r->has_live() || !r->is_young() || !r->is_regular()) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index 134ae371bce..f887cc9064e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -688,19 +688,6 @@ void ShenandoahGenerationalHeap::reset_generation_reserves() {
   old_generation()->set_promoted_reserve(0);
 }
 
-void ShenandoahGenerationalHeap::TransferResult::print_on(const char* when, outputStream* ss) const {
-  auto heap = ShenandoahGenerationalHeap::heap();
-  ShenandoahYoungGeneration* const young_gen = heap->young_generation();
-  ShenandoahOldGeneration* const old_gen = heap->old_generation();
-  const size_t young_available = young_gen->available();
-  const size_t old_available = old_gen->available();
-  ss->print_cr("After %s, %s %zu regions to %s to prepare for next gc, old available: "
-                     PROPERFMT ", young_available: " PROPERFMT,
-                     when,
-                     success? "successfully transferred": "failed to transfer", region_count, region_destination,
-                     PROPERFMTARGS(old_available), PROPERFMTARGS(young_available));
-}
-
 void ShenandoahGenerationalHeap::coalesce_and_fill_old_regions(bool concurrent) {
   class ShenandoahGlobalCoalesceAndFill : public WorkerTask {
   private:
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
index 704c8538397..736026916f7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
@@ -132,24 +132,12 @@ public:
 
   bool requires_barriers(stackChunkOop obj) const override;
 
-  // Used for logging the result of a region transfer outside the heap lock
-  struct TransferResult {
-    bool success;
-    size_t region_count;
-    const char* region_destination;
-
-    void print_on(const char* when, outputStream* ss) const;
-  };
-
   // Zeros out the evacuation and promotion reserves
   void reset_generation_reserves();
 
   // Computes the optimal size for the old generation, represented as a surplus or deficit of old regions
   void compute_old_generation_balance(size_t old_xfer_limit, size_t old_cset_regions);
 
-  // Transfers surplus old regions to young, or takes regions from young to satisfy old region deficit
-  TransferResult balance_generations();
-
   // Balances generations, coalesces and fills old regions if necessary
   void complete_degenerated_cycle();
   void complete_concurrent_cycle();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
index 636f65e2553..4feeed815da 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
@@ -157,7 +157,7 @@ inline void ShenandoahHeapRegion::increase_live_data_gc_words(size_t s) {
 }
 
 inline void ShenandoahHeapRegion::internal_increase_live_data(size_t s) {
-  size_t new_live_data = AtomicAccess::add(&_live_data, s, memory_order_relaxed);
+  AtomicAccess::add(&_live_data, s, memory_order_relaxed);
 }
 
 inline void ShenandoahHeapRegion::clear_live_data() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp
index c23690b15d6..2519025b6fb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp
@@ -62,7 +62,6 @@ class ShenandoahRegulatorThread: public ConcurrentGCThread {
   bool start_old_cycle() const;
   bool start_young_cycle() const;
   bool start_global_cycle() const;
-  bool resume_old_cycle();
 
   // The generational mode can only unload classes in a global cycle. The regulator
   // thread itself will trigger a global cycle if metaspace is out of memory.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
index 9a0d28d2cb7..c758873a040 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
@@ -233,8 +233,6 @@ public:
   inline bool is_write_card_dirty(size_t card_index) const;
   inline void mark_card_as_dirty(size_t card_index);
   inline void mark_range_as_dirty(size_t card_index, size_t num_cards);
-  inline void mark_card_as_clean(size_t card_index);
-  inline void mark_range_as_clean(size_t card_index, size_t num_cards);
   inline bool is_card_dirty(HeapWord* p) const;
   inline bool is_write_card_dirty(HeapWord* p) const;
   inline void mark_card_as_dirty(HeapWord* p);

From 4856344668042fcbc4d15966519d27fb0a4f509f Mon Sep 17 00:00:00 2001
From: Chad Rakoczy <chadrako@amazon.com>
Date: Thu, 4 Dec 2025 00:21:53 +0000
Subject: [PATCH 496/512] 8371046: Segfault in
 compiler/whitebox/StressNMethodRelocation.java with -XX:+UseZGC

Reviewed-by: kvn, eastigeevich
---
 src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp |  2 +-
 src/hotspot/share/asm/codeBuffer.cpp          |  2 +-
 src/hotspot/share/asm/codeBuffer.hpp          |  2 +-
 src/hotspot/share/code/nmethod.cpp            | 57 ++++++++++++-------
 src/hotspot/share/code/nmethod.hpp            |  3 +
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  1 +
 src/hotspot/share/prims/whitebox.cpp          |  2 +-
 7 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
index 94694b58d2f..dbec2d76d4f 100644
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
@@ -85,7 +85,7 @@ void Relocation::pd_set_call_destination(address x) {
   } else {
     MacroAssembler::pd_patch_instruction(addr(), x);
   }
-  assert(pd_call_destination(addr()) == x, "fail in reloc");
+  guarantee(pd_call_destination(addr()) == x, "fail in reloc");
 }
 
 void trampoline_stub_Relocation::pd_fix_owner_after_move() {
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 2c6b7d7e96e..7871134e923 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -90,7 +90,7 @@ typedef CodeBuffer::csize_t csize_t;  // file-local definition
 
 // External buffer, in a predefined CodeBlob.
 // Important: The code_start must be taken exactly, and not realigned.
-CodeBuffer::CodeBuffer(CodeBlob* blob) DEBUG_ONLY(: Scrubber(this, sizeof(*this))) {
+CodeBuffer::CodeBuffer(const CodeBlob* blob) DEBUG_ONLY(: Scrubber(this, sizeof(*this))) {
   // Provide code buffer with meaningful name
   initialize_misc(blob->name());
   initialize(blob->content_begin(), blob->content_size());
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index 430d4949467..38e151273da 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -672,7 +672,7 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
   }
 
   // (2) CodeBuffer referring to pre-allocated CodeBlob.
-  CodeBuffer(CodeBlob* blob);
+  CodeBuffer(const CodeBlob* blob);
 
   // (3) code buffer allocating codeBlob memory for code & relocation
   // info but with lazy initialization.  The name must be something
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index c2f8b46f00e..edfca5c98ee 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1498,6 +1498,40 @@ nmethod::nmethod(const nmethod &nm) : CodeBlob(nm._name, nm._kind, nm._size, nm.
   //   - OOP table
   memcpy(consts_begin(), nm.consts_begin(), nm.data_end() - nm.consts_begin());
 
+  // Fix relocation
+  RelocIterator iter(this);
+  CodeBuffer src(&nm);
+  CodeBuffer dst(this);
+  while (iter.next()) {
+#ifdef USE_TRAMPOLINE_STUB_FIX_OWNER
+    // After an nmethod is moved, some direct call sites may end up out of range.
+    // CallRelocation::fix_relocation_after_move() assumes the target is always
+    // reachable and does not check branch range. Calling it without range checks
+    // could cause us to write an offset too large for the instruction.
+    //
+    // If a call site has a trampoline, we skip the normal call relocation. The
+    // associated trampoline_stub_Relocation will handle the call and the
+    // trampoline, including range checks and updating the branch as needed.
+    //
+    // If no trampoline exists, we can assume the call target is always
+    // reachable and therefore within direct branch range, so calling
+    // CallRelocation::fix_relocation_after_move() is safe.
+    if (iter.reloc()->is_call()) {
+      address trampoline = trampoline_stub_Relocation::get_trampoline_for(iter.reloc()->addr(), this);
+      if (trampoline != nullptr) {
+        continue;
+      }
+    }
+#endif
+
+    iter.reloc()->fix_relocation_after_move(&src, &dst);
+  }
+
+  {
+    MutexLocker ml(NMethodState_lock, Mutex::_no_safepoint_check_flag);
+    clear_inline_caches();
+  }
+
   post_init();
 }
 
@@ -1521,25 +1555,6 @@ nmethod* nmethod::relocate(CodeBlobType code_blob_type) {
     return nullptr;
   }
 
-  // Fix relocation
-  RelocIterator iter(nm_copy);
-  CodeBuffer src(this);
-  CodeBuffer dst(nm_copy);
-  while (iter.next()) {
-#ifdef USE_TRAMPOLINE_STUB_FIX_OWNER
-    // Direct calls may no longer be in range and the use of a trampoline may now be required.
-    // Instead, allow trampoline relocations to update their owners and perform the necessary checks.
-    if (iter.reloc()->is_call()) {
-      address trampoline = trampoline_stub_Relocation::get_trampoline_for(iter.reloc()->addr(), nm_copy);
-      if (trampoline != nullptr) {
-        continue;
-      }
-    }
-#endif
-
-    iter.reloc()->fix_relocation_after_move(&src, &dst);
-  }
-
   // To make dependency checking during class loading fast, record
   // the nmethod dependencies in the classes it is dependent on.
   // This allows the dependency checking code to simply walk the
@@ -1569,8 +1584,6 @@ nmethod* nmethod::relocate(CodeBlobType code_blob_type) {
   if (!is_marked_for_deoptimization() && is_in_use()) {
     assert(method() != nullptr && method()->code() == this, "should be if is in use");
 
-    nm_copy->clear_inline_caches();
-
     // Attempt to start using the copy
     if (nm_copy->make_in_use()) {
       ICache::invalidate_range(nm_copy->code_begin(), nm_copy->code_size());
@@ -1578,7 +1591,7 @@ nmethod* nmethod::relocate(CodeBlobType code_blob_type) {
       methodHandle mh(Thread::current(), nm_copy->method());
       nm_copy->method()->set_code(mh, nm_copy);
 
-      make_not_used();
+      make_not_entrant(InvalidationReason::RELOCATED);
 
       nm_copy->post_compiled_method_load_event();
 
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 0fa9d7fda9e..2391bc6d830 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -499,6 +499,7 @@ public:
     UNCOMMON_TRAP,
     WHITEBOX_DEOPTIMIZATION,
     ZOMBIE,
+    RELOCATED,
     INVALIDATION_REASONS_COUNT
   };
 
@@ -543,6 +544,8 @@ public:
         return "whitebox deoptimization";
       case InvalidationReason::ZOMBIE:
         return "zombie";
+      case InvalidationReason::RELOCATED:
+        return "relocated";
       default: {
         assert(false, "Unhandled reason");
         return "Unknown";
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 7f009eba5f1..77e98db9156 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -586,6 +586,7 @@
   declare_constant(nmethod::InvalidationReason::UNCOMMON_TRAP)                            \
   declare_constant(nmethod::InvalidationReason::WHITEBOX_DEOPTIMIZATION)                  \
   declare_constant(nmethod::InvalidationReason::ZOMBIE)                                   \
+  declare_constant(nmethod::InvalidationReason::RELOCATED)                                \
                                                                                           \
   declare_constant(CodeInstaller::VERIFIED_ENTRY)                         \
   declare_constant(CodeInstaller::UNVERIFIED_ENTRY)                       \
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 5514f7d3260..bbd7b4bf795 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1678,7 +1678,7 @@ WB_ENTRY(void, WB_RelocateNMethodFromAddr(JNIEnv* env, jobject o, jlong addr, ji
   CodeBlob* blob = CodeCache::find_blob(address);
   if (blob != nullptr && blob->is_nmethod()) {
     nmethod* code = blob->as_nmethod();
-    if (code->is_in_use()) {
+    if (code->is_in_use() && !code->is_unloading()) {
       CompiledICLocker ic_locker(code);
       code->relocate(static_cast<CodeBlobType>(blob_type));
     }

From 04c0f8d359a3f450ac2070c6d41834145d9c75f7 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 4 Dec 2025 01:36:54 +0000
Subject: [PATCH 497/512] 8372857: Improve debuggability of
 java/rmi/server/RemoteServer/AddrInUse.java test

Reviewed-by: msheppar, smarks, syan
---
 .../rmi/server/RemoteServer/AddrInUse.java    | 96 +++++++------------
 1 file changed, 37 insertions(+), 59 deletions(-)

diff --git a/test/jdk/java/rmi/server/RemoteServer/AddrInUse.java b/test/jdk/java/rmi/server/RemoteServer/AddrInUse.java
index 34e343b6193..86ac5b0313b 100644
--- a/test/jdk/java/rmi/server/RemoteServer/AddrInUse.java
+++ b/test/jdk/java/rmi/server/RemoteServer/AddrInUse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 /* @test
  * @bug 4111507
  * @summary retryServerSocket should not retry on BindException
- * @author Ann Wollrath
  *
  * @run main/othervm AddrInUse
  */
@@ -33,75 +32,54 @@ import java.net.ServerSocket;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.server.ExportException;
 
-public class AddrInUse implements Runnable {
+public class AddrInUse {
 
-    private static int port = -1;
-    private static final long TIMEOUT = 10000;
-
-    private boolean exportSucceeded = false;
-    private Throwable exportException = null;
-
-    public void run() {
-
-        /*
-         * Attempt to create (i.e. export) a registry on the port that
-         * has already been bound, and record the result.
-         */
-        try {
-            LocateRegistry.createRegistry(port);
-            synchronized (this) {
-                exportSucceeded = true;
-                notifyAll();
-            }
-        } catch (Throwable t) {
-            synchronized (this) {
-                exportException = t;
-                notifyAll();
-            }
-        }
-    }
+    private static volatile Throwable registryExportFailure = null;
 
     public static void main(String[] args) throws Exception {
-        System.err.println("\nRegression test for bug 4111507\n");
-
         /*
          * Bind a server socket to a port.
          */
-        ServerSocket server = new ServerSocket(0);
-        port = server.getLocalPort();
-        System.err.println("Created a ServerSocket on port " + port + "...");
-
-        /*
-         * Start a thread that creates a registry on the same port,
-         * and analyze the result.
-         */
-        System.err.println("create a registry on the same port...");
-        System.err.println("(should cause an ExportException)");
-        AddrInUse obj = new AddrInUse();
-        synchronized (obj) {
-            (new Thread(obj, "AddrInUse")).start();
+        try (ServerSocket server = new ServerSocket(0)) {
+            int port = server.getLocalPort();
+            System.err.println("Created a ServerSocket on port " + port + "...");
 
             /*
-             * Don't wait forever (original bug is that the export
-             * hangs).
+             * Start a thread that creates a registry on the same port,
+             * and analyze the result.
              */
-            obj.wait(TIMEOUT);
+            System.err.println("create a registry on the same port...");
+            System.err.println("(should cause an ExportException)");
 
-            if (obj.exportSucceeded) {
-                throw new RuntimeException(
-                    "TEST FAILED: export on already-bound port succeeded");
-            } else if (obj.exportException != null) {
-                obj.exportException.printStackTrace();
-                if (obj.exportException instanceof ExportException) {
-                    System.err.println("TEST PASSED");
-                } else {
-                    throw new RuntimeException(
-                        "TEST FAILED: unexpected exception occurred",
-                        obj.exportException);
+            Thread exportRegistryThread = new Thread(() -> {
+                /*
+                 * Attempt to create (i.e. export) a registry on the port that
+                 * has already been bound, and record the result.
+                 */
+                try {
+                    LocateRegistry.createRegistry(port);
+                } catch (Throwable t) {
+                    registryExportFailure = t;
                 }
-            } else {
-                throw new RuntimeException("TEST FAILED: export timed out");
+            }, "ExportRegistry-Thread");
+
+            exportRegistryThread.start();
+
+            /*
+             * Wait for the LocateRegistry.createRegistry() call to complete or
+             * if it blocks forever (due to the original bug), then let jtreg fail
+             * the test with a timeout
+             */
+            exportRegistryThread.join();
+            if (registryExportFailure == null) {
+                throw new RuntimeException(
+                        "TEST FAILED: export on already-bound port succeeded");
             }
+            if (!(registryExportFailure instanceof ExportException)) {
+                throw new RuntimeException(
+                        "TEST FAILED: unexpected exception occurred", registryExportFailure);
+            }
+            System.err.println("TEST PASSED, received expected exception: " + registryExportFailure);
         }
     }
 }

From db2cd1a4e0ee7b72339e7ee3c0286dc04fc5adbf Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 4 Dec 2025 02:15:54 +0000
Subject: [PATCH 498/512] 8372756: Mouse additional buttons and horizontal
 scrolling are broken on XWayland GNOME >= 47 after JDK-8351907

Reviewed-by: prr
---
 .../unix/classes/sun/awt/X11/XToolkit.java    | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
index eab0817af23..78cd4a7e57d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
@@ -138,8 +138,6 @@ import sun.awt.X11GraphicsDevice;
 import sun.awt.X11GraphicsEnvironment;
 import sun.awt.XSettings;
 import sun.awt.datatransfer.DataTransferer;
-import sun.awt.screencast.ScreencastHelper;
-import sun.awt.screencast.XdgDesktopPortal;
 import sun.awt.util.PerformanceLogger;
 import sun.awt.util.ThreadGroupUtils;
 import sun.font.FontConfigManager;
@@ -1523,21 +1521,16 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
         awtLock();
         try {
             if (numberOfButtons == 0) {
-                if (XdgDesktopPortal.isRemoteDesktop()
-                        && ScreencastHelper.isAvailable()) {
+                numberOfButtons = getNumberOfButtonsImpl();
+                numberOfButtons = (numberOfButtons > MAX_BUTTONS_SUPPORTED) ? MAX_BUTTONS_SUPPORTED : numberOfButtons;
+                //4th and 5th buttons are for wheel and shouldn't be reported as buttons.
+                //If we have more than 3 physical buttons and a wheel, we report N-2 buttons.
+                //If we have 3 physical buttons and a wheel, we report 3 buttons.
+                //If we have 1,2,3 physical buttons, we report it as is i.e. 1,2 or 3 respectively.
+                if (numberOfButtons >= 5) {
+                    numberOfButtons -= 2;
+                } else if (numberOfButtons == 4 || numberOfButtons == 5) {
                     numberOfButtons = 3;
-                } else {
-                    numberOfButtons = getNumberOfButtonsImpl();
-                    numberOfButtons = (numberOfButtons > MAX_BUTTONS_SUPPORTED) ? MAX_BUTTONS_SUPPORTED : numberOfButtons;
-                    //4th and 5th buttons are for wheel and shouldn't be reported as buttons.
-                    //If we have more than 3 physical buttons and a wheel, we report N-2 buttons.
-                    //If we have 3 physical buttons and a wheel, we report 3 buttons.
-                    //If we have 1,2,3 physical buttons, we report it as is i.e. 1,2 or 3 respectively.
-                    if (numberOfButtons >= 5) {
-                        numberOfButtons -= 2;
-                    } else if (numberOfButtons == 4 || numberOfButtons == 5) {
-                        numberOfButtons = 3;
-                    }
                 }
             }
             //Assume don't have to re-query the number again and again.

From 019df4d89c8a0fe2b27c6ec074499445ae45bc3f Mon Sep 17 00:00:00 2001
From: Dmitry Drobotov <dmitry.drobotov@jetbrains.com>
Date: Thu, 4 Dec 2025 03:22:42 +0000
Subject: [PATCH 499/512] 8372757: MacOS, Accessibility: Crash in
 [MenuAccessibility accessibilityChildren] after JDK-8341311

Reviewed-by: azvegint, psadhukhan
---
 .../macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
index 90a147aa5a2..14b7ee8c6b5 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
@@ -68,6 +68,11 @@ static jclass sjc_CAccessibility = NULL;
                                                              sjm_getCurrentAccessiblePopupMenu,
                                                              fAccessible, fComponent);
 
+    CHECK_EXCEPTION();
+    if (axComponent == nil) {
+        return nil;
+    }
+
     CommonComponentAccessibility *currentElement = [CommonComponentAccessibility createWithAccessible:axComponent
                                                             withEnv:env withView:self->fView isCurrent:YES];
 

From dbf0742bf205ec57477373ebd43016383f7e7791 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Thu, 4 Dec 2025 05:03:07 +0000
Subject: [PATCH 500/512] 8373046: Method::get_c2i_unverified_entry() and
 get_c2i_no_clinit_check_entry() are missing check for abstract method

Reviewed-by: kvn, vlivanov
---
 src/hotspot/share/oops/method.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index cb1c8ea37e8..1a2e5f0bee4 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -168,11 +168,17 @@ address Method::get_c2i_entry() {
 }
 
 address Method::get_c2i_unverified_entry() {
+  if (is_abstract()) {
+    return SharedRuntime::get_handle_wrong_method_abstract_stub();
+  }
   assert(adapter() != nullptr, "must have");
   return adapter()->get_c2i_unverified_entry();
 }
 
 address Method::get_c2i_no_clinit_check_entry() {
+  if (is_abstract()) {
+    return nullptr;
+  }
   assert(VM_Version::supports_fast_class_init_checks(), "");
   assert(adapter() != nullptr, "must have");
   return adapter()->get_c2i_no_clinit_check_entry();

From 828498c54b3b1089af9e076cb45f3cf3bea58e2f Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 4 Dec 2025 07:34:43 +0000
Subject: [PATCH 501/512] 8371978: tools/jar/ReproducibleJar.java fails on XFS

Reviewed-by: jpai
---
 test/jdk/tools/jar/ReproducibleJar.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/jdk/tools/jar/ReproducibleJar.java b/test/jdk/tools/jar/ReproducibleJar.java
index ed5e2ed2ae3..5f59d1cbe41 100644
--- a/test/jdk/tools/jar/ReproducibleJar.java
+++ b/test/jdk/tools/jar/ReproducibleJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,9 @@ public class ReproducibleJar {
     private static final TimeZone TZ = TimeZone.getDefault();
     private static final boolean DST = TZ.inDaylightTime(new Date());
     private static final String UNIX_2038_ROLLOVER_TIME = "2038-01-19T03:14:07Z";
+    private static final String UNIX_EPOCH_TIME = "1970-01-01T00:00:00Z";
     private static final Instant UNIX_2038_ROLLOVER = Instant.parse(UNIX_2038_ROLLOVER_TIME);
+    private static final Instant UNIX_EPOCH = Instant.parse(UNIX_EPOCH_TIME);
     private static final File DIR_OUTER = new File("outer");
     private static final File DIR_INNER = new File(DIR_OUTER, "inner");
     private static final File FILE_INNER = new File(DIR_INNER, "foo.txt");
@@ -231,12 +233,15 @@ public class ReproducibleJar {
 
         if (Math.abs(now - original) > PRECISION) {
             // If original time is after UNIX 2038 32bit rollover
-            // and the now time is exactly the rollover time, then assume
+            // and the now time is exactly the rollover time or UNIX epoch time, then assume
             // running on a file system that only supports to 2038 (e.g.XFS) and pass test
-            if (FileTime.fromMillis(original).toInstant().isAfter(UNIX_2038_ROLLOVER) &&
-                    FileTime.fromMillis(now).toInstant().equals(UNIX_2038_ROLLOVER)) {
-                System.out.println("Checking file time after Unix 2038 rollover," +
-                        " and extracted file time is " + UNIX_2038_ROLLOVER_TIME + ", " +
+            Instant originalInstant = FileTime.fromMillis(original).toInstant();
+            Instant nowInstant = FileTime.fromMillis(now).toInstant();
+            if (originalInstant.isAfter(UNIX_2038_ROLLOVER) &&
+                (nowInstant.equals(UNIX_2038_ROLLOVER) ||
+                nowInstant.equals(UNIX_EPOCH))) {
+                    System.out.println("Checking file time after Unix 2038 rollover," +
+                        " and extracted file time is " + nowInstant + ", " +
                         " Assuming restricted file system, pass file time check.");
             } else {
                 throw new AssertionError("checkFileTime failed," +

From 63a10e0099111d69b167abf99d1a00084c4d6c1e Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 4 Dec 2025 08:01:17 +0000
Subject: [PATCH 502/512] 8373024: JFR: CPU throttle rate can't handle
 incorrect values

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/PlatformEventType.java     | 3 ++-
 .../classes/jdk/jfr/internal/settings/CPUThrottleSetting.java | 2 +-
 src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index eaba86e6327..1180ebd6ea2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -34,6 +34,7 @@ import jdk.jfr.internal.periodic.PeriodicEvents;
 import jdk.jfr.internal.util.ImplicitFields;
 import jdk.jfr.internal.util.TimespanRate;
 import jdk.jfr.internal.util.Utils;
+import jdk.jfr.internal.settings.CPUThrottleSetting;
 import jdk.jfr.internal.settings.Throttler;
 import jdk.jfr.internal.tracing.Modification;
 
@@ -60,7 +61,7 @@ public final class PlatformEventType extends Type {
     private boolean stackTraceEnabled = true;
     private long thresholdTicks = 0;
     private long period = 0;
-    private TimespanRate cpuRate;
+    private TimespanRate cpuRate = TimespanRate.of(CPUThrottleSetting.DEFAULT_VALUE);
     private boolean hasHook;
 
     private boolean beginChunk;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
index 944827f6d6f..7ea0ace21bb 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
@@ -65,7 +65,7 @@ public final class CPUThrottleSetting extends SettingControl {
                 }
             }
         }
-        return Objects.requireNonNullElse(highestRate.toString(), DEFAULT_VALUE);
+        return highestRate == null ? DEFAULT_VALUE : highestRate.toString();
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
index 2632cd63848..0a7b14965cb 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ public record Rate(long amount, TimespanUnit unit) {
         String value = splitted[0].strip();
         String unit = splitted[1].strip();
         TimespanUnit tu = TimespanUnit.fromText(unit);
-        if (unit == null) {
+        if (tu == null) {
             return null;
         }
         try {

From 771253e285c48329a9b45dfaaa852b64e74b31d4 Mon Sep 17 00:00:00 2001
From: Frederic Thevenet <fthevenet@openjdk.org>
Date: Thu, 4 Dec 2025 08:23:33 +0000
Subject: [PATCH 503/512] 8372802: PrintFlagsFinal should also print locked
 flags

Reviewed-by: dholmes, stuefe, lmesnik
---
 src/hotspot/share/runtime/flags/jvmFlag.cpp   |  2 +-
 .../runtime/CommandLine/PrintAllFlags.java    | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/runtime/CommandLine/PrintAllFlags.java

diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 51517fa49db..405b47e1813 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -711,7 +711,7 @@ void JVMFlag::printFlags(outputStream* out, bool withComments, bool printRanges,
     for (size_t i = 0; i < length; i++) {
       const bool skip = (skipDefaults && flagTable[i].is_default());
       const bool visited = iteratorMarkers.at(i);
-      if (!visited && flagTable[i].is_unlocked() && !skip) {
+      if (!visited && !skip) {
         if ((bestFlag == nullptr) || (strcmp(bestFlag->name(), flagTable[i].name()) > 0)) {
           bestFlag = &flagTable[i];
           bestFlagIndex = i;
diff --git a/test/hotspot/jtreg/runtime/CommandLine/PrintAllFlags.java b/test/hotspot/jtreg/runtime/CommandLine/PrintAllFlags.java
new file mode 100644
index 00000000000..13b0dd70d4e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/CommandLine/PrintAllFlags.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025, IBM Corporation.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8372802
+ * @summary Test that +PrintFlagsFinal print the same options when +UnlockExperimentalVMOptions and
+ *  +UnlockDiagnosticVMOptions are set than when they aren't.
+ * @requires vm.flagless
+ * @library /test/lib
+ * @run driver PrintAllFlags
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class PrintAllFlags {
+    private static final Pattern optPattern = Pattern.compile("\\s*\\w+\\s\\w+\\s+=");
+
+    public static void main(String args[]) throws Exception {
+        var flagsFinal = runAndMakeVMOptionSet("-XX:+PrintFlagsFinal", "-version");
+        var flagsFinalUnlocked = runAndMakeVMOptionSet(
+                "-XX:+UnlockExperimentalVMOptions", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintFlagsFinal", "-version");
+        if (!flagsFinal.equals(flagsFinalUnlocked)) {
+            throw new RuntimeException("+PrintFlagsFinal should produce the same output" +
+                    " whether or not UnlockExperimentalVMOptions and UnlockDiagnosticVMOptions are set");
+        }
+    }
+
+    private static Set<String> runAndMakeVMOptionSet(String... args) throws IOException {
+        var output = new OutputAnalyzer(ProcessTools.createLimitedTestJavaProcessBuilder(args).start());
+        Set<String> optNameSet = output.asLines().stream()
+                .map(optPattern::matcher)
+                .filter(Matcher::find)
+                .map(Matcher::group)
+                .collect(Collectors.toSet());
+        if (optNameSet.isEmpty()) {
+            throw new RuntimeException("Sanity test failed: no match for option pattern in process output");
+        }
+        return optNameSet;
+    }
+
+}

From bb867ed23e2d6394d7e7dab55cf2122889fdf3ac Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 4 Dec 2025 08:32:00 +0000
Subject: [PATCH 504/512] 8372938: Fix reference to DeferredStatic<T> in
 HotSpot Style Guide

Reviewed-by: stefank, jsjolen
---
 doc/hotspot-style.html | 4 ++--
 doc/hotspot-style.md   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index a2ffb57e5a3..362245cd00a 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -1037,8 +1037,8 @@ running destructors at exit can lead to problems.</p>
 <p>Some of the approaches used in HotSpot to avoid dynamic
 initialization include:</p>
 <ul>
-<li><p>Use the <code>Deferred&lt;T&gt;</code> class template. Add a call
-to its initialization function at an appropriate place during VM
+<li><p>Use the <code>DeferredStatic&lt;T&gt;</code> class template. Add
+a call to its initialization function at an appropriate place during VM
 initialization. The underlying object is never destroyed.</p></li>
 <li><p>For objects of class type, use a variable whose value is a
 pointer to the class, initialized to <code>nullptr</code>. Provide an
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index c8f0f72b814..26549e3ca02 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -954,7 +954,7 @@ destructors at exit can lead to problems.
 Some of the approaches used in HotSpot to avoid dynamic initialization
 include:
 
-* Use the `Deferred<T>` class template. Add a call to its initialization
+* Use the `DeferredStatic<T>` class template. Add a call to its initialization
 function at an appropriate place during VM initialization. The underlying
 object is never destroyed.
 

From 317daa3c004fbb1738e0af6acfbaf50c403c8230 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 4 Dec 2025 08:36:00 +0000
Subject: [PATCH 505/512] 8372643: Warning message on macos when building the
 JDK - (arm64) /tmp/lto.o unable to open object file: No such file or
 directory

Reviewed-by: erikj
---
 make/common/native/Flags.gmk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/make/common/native/Flags.gmk b/make/common/native/Flags.gmk
index 843701cb4db..efb4c08e74c 100644
--- a/make/common/native/Flags.gmk
+++ b/make/common/native/Flags.gmk
@@ -229,6 +229,11 @@ define SetupLinkerFlags
   # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS
   ifeq ($$($1_LINK_TIME_OPTIMIZATION), true)
     $1_EXTRA_LDFLAGS += $(LDFLAGS_LTO)
+    # Instruct the ld64 linker not to delete the temporary object file
+    # generated during Link Time Optimization
+    ifeq ($(call isTargetOs, macosx), true)
+      $1_EXTRA_LDFLAGS += -Wl,-object_path_lto,$$($1_OBJECT_DIR)/$$($1_NAME)_lto_helper.o
+    endif
   endif
 
   $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \

From 14000a25e6efcbe55171d4cc8c68170a8cf0406f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Thu, 4 Dec 2025 09:37:56 +0000
Subject: [PATCH 506/512] 8373080: Parallel:
 gc/arguments/TestMinInitialErgonomics.java should not be run with Large Pages

Reviewed-by: ayang, aboldtch
---
 test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
index 6912499e53f..38eb07139bd 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
@@ -28,6 +28,7 @@ package gc.arguments;
  * @bug 8006088
  * @requires vm.gc.Parallel
  * @requires vm.compMode != "Xcomp"
+ * @requires !vm.opt.final.UseLargePages
  * @summary Test Parallel GC ergonomics decisions related to minimum and initial heap size.
  * @library /test/lib
  * @library /

From 16699a394d4d6c2b8a21e7de3c3d344c5a3309b4 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Thu, 4 Dec 2025 09:40:31 +0000
Subject: [PATCH 507/512] 8208693: HttpClient: Extend the request timeout's
 scope to cover the response body

Reviewed-by: jpai, dfuchs
---
 .../classes/java/net/http/HttpClient.java     |  12 +
 .../classes/java/net/http/HttpRequest.java    |  20 +-
 .../classes/java/net/http/WebSocket.java      |  12 +-
 .../jdk/internal/net/http/ExchangeImpl.java   |  12 +
 .../jdk/internal/net/http/Http1Exchange.java  |  24 +-
 .../internal/net/http/Http3ExchangeImpl.java  |  20 +-
 .../jdk/internal/net/http/HttpClientImpl.java |   7 +
 .../jdk/internal/net/http/MultiExchange.java  |  17 +-
 .../classes/jdk/internal/net/http/Stream.java |  25 +-
 .../common/HttpBodySubscriberWrapper.java     |  19 +-
 .../httpclient/TimeoutResponseBodyTest.java   | 285 ++++++++++++
 .../httpclient/TimeoutResponseHeaderTest.java | 138 ++++++
 .../TimeoutResponseTestSupport.java           | 415 ++++++++++++++++++
 .../net/http/HttpClientTimerAccess.java       |  59 +++
 .../httpclient/websocket/WebSocketTest.java   |  48 +-
 15 files changed, 1088 insertions(+), 25 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/TimeoutResponseBodyTest.java
 create mode 100644 test/jdk/java/net/httpclient/TimeoutResponseHeaderTest.java
 create mode 100644 test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
 create mode 100644 test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientTimerAccess.java

diff --git a/src/java.net.http/share/classes/java/net/http/HttpClient.java b/src/java.net.http/share/classes/java/net/http/HttpClient.java
index a7a2171857d..9ecb048342b 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpClient.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpClient.java
@@ -312,10 +312,22 @@ public abstract class HttpClient implements AutoCloseable {
          * need to be established, for example if a connection can be reused
          * from a previous request, then this timeout duration has no effect.
          *
+         * @implSpec
+         * A connection timeout applies to the entire connection phase, from the
+         * moment a connection is requested until it is established.
+         * Implementations are recommended to ensure that the connection timeout
+         * covers any SSL/TLS handshakes.
+         *
+         * @implNote
+         * The built-in JDK implementation of the connection timeout covers any
+         * SSL/TLS handshakes.
+         *
          * @param duration the duration to allow the underlying connection to be
          *                 established
          * @return this builder
          * @throws IllegalArgumentException if the duration is non-positive
+         * @see HttpRequest.Builder#timeout(Duration) Configuring timeout for
+         * request execution
          */
         public Builder connectTimeout(Duration duration);
 
diff --git a/src/java.net.http/share/classes/java/net/http/HttpRequest.java b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
index c56328ba4b4..741573e06b3 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpRequest.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
@@ -258,12 +258,28 @@ public abstract class HttpRequest {
          * {@link HttpClient#sendAsync(java.net.http.HttpRequest,
          * java.net.http.HttpResponse.BodyHandler) HttpClient::sendAsync}
          * completes exceptionally with an {@code HttpTimeoutException}. The effect
-         * of not setting a timeout is the same as setting an infinite Duration,
-         * i.e. block forever.
+         * of not setting a timeout is the same as setting an infinite
+         * {@code Duration}, i.e., block forever.
+         *
+         * @implSpec
+         * A timeout applies to the duration measured from the instant the
+         * request execution starts to, <em>at least</em>, the instant an
+         * {@link HttpResponse} is constructed. The elapsed time includes
+         * obtaining a connection for transport and retrieving the response
+         * headers.
+         *
+         * @implNote
+         * The JDK built-in implementation applies timeout over the duration
+         * measured from the instant the request execution starts to <b>the
+         * instant the response body is consumed</b>, if present. This is
+         * implemented by stopping the timer after the response body subscriber
+         * completion.
          *
          * @param duration the timeout duration
          * @return this builder
          * @throws IllegalArgumentException if the duration is non-positive
+         * @see HttpClient.Builder#connectTimeout(Duration) Configuring
+         * timeout for connection establishment
          */
         public abstract Builder timeout(Duration duration);
 
diff --git a/src/java.net.http/share/classes/java/net/http/WebSocket.java b/src/java.net.http/share/classes/java/net/http/WebSocket.java
index 313847cf449..84fc8472eef 100644
--- a/src/java.net.http/share/classes/java/net/http/WebSocket.java
+++ b/src/java.net.http/share/classes/java/net/http/WebSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,6 +144,16 @@ public interface WebSocket {
          * {@link HttpTimeoutException}. If this method is not invoked then the
          * infinite timeout is assumed.
          *
+         * @implSpec
+         * A connection timeout applies to the entire connection phase, from the
+         * moment a connection is requested until it is established.
+         * Implementations are recommended to ensure that the connection timeout
+         * covers any WebSocket and SSL/TLS handshakes.
+         *
+         * @implNote
+         * The built-in JDK implementation of the connection timeout covers any
+         * WebSocket and SSL/TLS handshakes.
+         *
          * @param timeout
          *         the timeout, non-{@linkplain Duration#isNegative() negative},
          *         non-{@linkplain Duration#ZERO ZERO}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
index 74600e78557..c1ed01ff07a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
@@ -581,6 +581,18 @@ abstract class ExchangeImpl<T> {
         // Needed for HTTP/2 to subscribe a dummy subscriber and close the stream
     }
 
+    /**
+     * {@return {@code true}, if it is allowed to cancel the request timer on
+     * response body subscriber termination; {@code false}, otherwise}
+     *
+     * @param webSocket indicates if the associated request is a WebSocket handshake
+     * @param statusCode the status code of the associated response
+     */
+    static boolean cancelTimerOnResponseBodySubscriberTermination(
+            boolean webSocket, int statusCode) {
+        return webSocket || statusCode < 100 || statusCode >= 200;
+    }
+
     /* The following methods have separate HTTP/1.1 and HTTP/2 implementations */
 
     abstract CompletableFuture<ExchangeImpl<T>> sendHeadersAsync();
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
index 02ce63b6314..72a47eca42c 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
@@ -206,8 +206,15 @@ class Http1Exchange<T> extends ExchangeImpl<T> {
      */
     static final class Http1ResponseBodySubscriber<U> extends HttpBodySubscriberWrapper<U> {
         final Http1Exchange<U> exchange;
-        Http1ResponseBodySubscriber(BodySubscriber<U> userSubscriber, Http1Exchange<U> exchange) {
+
+        private final boolean cancelTimerOnTermination;
+
+        Http1ResponseBodySubscriber(
+                BodySubscriber<U> userSubscriber,
+                boolean cancelTimerOnTermination,
+                Http1Exchange<U> exchange) {
             super(userSubscriber);
+            this.cancelTimerOnTermination = cancelTimerOnTermination;
             this.exchange = exchange;
         }
 
@@ -220,6 +227,14 @@ class Http1Exchange<T> extends ExchangeImpl<T> {
         protected void unregister() {
             exchange.unregisterResponseSubscriber(this);
         }
+
+        @Override
+        protected void onTermination() {
+            if (cancelTimerOnTermination) {
+                exchange.exchange.multi.cancelTimer();
+            }
+        }
+
     }
 
     @Override
@@ -459,9 +474,10 @@ class Http1Exchange<T> extends ExchangeImpl<T> {
     @Override
     Http1ResponseBodySubscriber<T> createResponseSubscriber(BodyHandler<T> handler, ResponseInfo response) {
         BodySubscriber<T> subscriber = handler.apply(response);
-        Http1ResponseBodySubscriber<T> bs =
-                new Http1ResponseBodySubscriber<T>(subscriber, this);
-        return bs;
+        var cancelTimerOnTermination =
+                cancelTimerOnResponseBodySubscriberTermination(
+                        exchange.request().isWebSocket(), response.statusCode());
+        return new Http1ResponseBodySubscriber<>(subscriber, cancelTimerOnTermination, this);
     }
 
     @Override
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java
index 41a4a84958a..81475a47c4a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java
@@ -554,8 +554,12 @@ final class Http3ExchangeImpl<T> extends Http3Stream<T> {
     }
 
     final class Http3StreamResponseSubscriber<U> extends HttpBodySubscriberWrapper<U> {
-        Http3StreamResponseSubscriber(BodySubscriber<U> subscriber) {
+
+        private final boolean cancelTimerOnTermination;
+
+        Http3StreamResponseSubscriber(BodySubscriber<U> subscriber, boolean cancelTimerOnTermination) {
             super(subscriber);
+            this.cancelTimerOnTermination = cancelTimerOnTermination;
         }
 
         @Override
@@ -568,6 +572,13 @@ final class Http3ExchangeImpl<T> extends Http3Stream<T> {
             registerResponseSubscriber(this);
         }
 
+        @Override
+        protected void onTermination() {
+            if (cancelTimerOnTermination) {
+                exchange.multi.cancelTimer();
+            }
+        }
+
         @Override
         protected void logComplete(Throwable error) {
             if (error == null) {
@@ -590,9 +601,10 @@ final class Http3ExchangeImpl<T> extends Http3Stream<T> {
     Http3StreamResponseSubscriber<T> createResponseSubscriber(BodyHandler<T> handler,
                                                               ResponseInfo response) {
         if (debug.on()) debug.log("Creating body subscriber");
-        Http3StreamResponseSubscriber<T> subscriber =
-                new Http3StreamResponseSubscriber<>(handler.apply(response));
-        return subscriber;
+        var cancelTimerOnTermination =
+                cancelTimerOnResponseBodySubscriberTermination(
+                        exchange.request().isWebSocket(), response.statusCode());
+        return new Http3StreamResponseSubscriber<>(handler.apply(response), cancelTimerOnTermination);
     }
 
     @Override
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index d02930f4f31..ff130e90358 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -1880,6 +1880,13 @@ final class HttpClientImpl extends HttpClient implements Trackable {
         }
     }
 
+    // Visible for tests
+    List<TimeoutEvent> timers() {
+        synchronized (this) {
+            return new ArrayList<>(timeouts);
+        }
+    }
+
     /**
      * Purges ( handles ) timer events that have passed their deadline, and
      * returns the amount of time, in milliseconds, until the next earliest
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
index ec621f7f955..60eb55ec0ad 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
@@ -25,7 +25,6 @@
 
 package jdk.internal.net.http;
 
-import java.io.IOError;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.ConnectException;
@@ -254,7 +253,7 @@ class MultiExchange<T> implements Cancelable {
                 .map(ConnectTimeoutTracker::getRemaining);
     }
 
-    private void cancelTimer() {
+    void cancelTimer() {
         if (responseTimerEvent != null) {
             client.cancelTimer(responseTimerEvent);
             responseTimerEvent = null;
@@ -404,6 +403,8 @@ class MultiExchange<T> implements Cancelable {
                         processAltSvcHeader(r, client(), currentreq);
                         Exchange<T> exch = getExchange();
                         if (bodyNotPermitted(r)) {
+                            // No response body consumption is expected, we can cancel the timer right away
+                            cancelTimer();
                             if (bodyIsPresent(r)) {
                                 IOException ioe = new IOException(
                                     "unexpected content length header with 204 response");
@@ -467,6 +468,8 @@ class MultiExchange<T> implements Cancelable {
 
     private CompletableFuture<Response> responseAsyncImpl(final boolean applyReqFilters) {
         if (currentreq.timeout().isPresent()) {
+            // Retried/Forwarded requests should reset the timer, if present
+            cancelTimer();
             responseTimerEvent = ResponseTimerEvent.of(this);
             client.registerTimer(responseTimerEvent);
         }
@@ -502,7 +505,6 @@ class MultiExchange<T> implements Cancelable {
                         }
                         return completedFuture(response);
                     } else {
-                        cancelTimer();
                         setNewResponse(currentreq, response, null, exch);
                         if (currentreq.isWebSocket()) {
                             // need to close the connection and open a new one.
@@ -520,11 +522,18 @@ class MultiExchange<T> implements Cancelable {
                     } })
                 .handle((response, ex) -> {
                     // 5. handle errors and cancel any timer set
-                    cancelTimer();
                     if (ex == null) {
                         assert response != null;
                         return completedFuture(response);
                     }
+
+                    // Cancel the timer. Note that we only do so if the
+                    // response has completed exceptionally. That is, we don't
+                    // cancel the timer if there are no exceptions, since the
+                    // response body might still get consumed, and it is
+                    // still subject to the response timer.
+                    cancelTimer();
+
                     // all exceptions thrown are handled here
                     final RetryContext retryCtx = checkRetryEligible(ex, exch);
                     assert retryCtx != null : "retry context is null";
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index 9a7ccd8f3a1..bf9170f8f51 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -390,9 +390,10 @@ class Stream<T> extends ExchangeImpl<T> {
 
     @Override
     Http2StreamResponseSubscriber<T> createResponseSubscriber(BodyHandler<T> handler, ResponseInfo response) {
-        Http2StreamResponseSubscriber<T> subscriber =
-                new Http2StreamResponseSubscriber<>(handler.apply(response));
-        return subscriber;
+        var cancelTimerOnTermination =
+                cancelTimerOnResponseBodySubscriberTermination(
+                        exchange.request().isWebSocket(), response.statusCode());
+        return new Http2StreamResponseSubscriber<>(handler.apply(response), cancelTimerOnTermination);
     }
 
     // The Http2StreamResponseSubscriber is registered with the HttpClient
@@ -1694,6 +1695,11 @@ class Stream<T> extends ExchangeImpl<T> {
                         .whenComplete((v, t) -> pushGroup.pushError(t));
         }
 
+        @Override
+        Http2StreamResponseSubscriber<T> createResponseSubscriber(BodyHandler<T> handler, ResponseInfo response) {
+            return new Http2StreamResponseSubscriber<T>(handler.apply(response), false);
+        }
+
         @Override
         void completeResponse(Response r) {
             Log.logResponse(r::toString);
@@ -1924,8 +1930,12 @@ class Stream<T> extends ExchangeImpl<T> {
     }
 
     final class Http2StreamResponseSubscriber<U> extends HttpBodySubscriberWrapper<U> {
-        Http2StreamResponseSubscriber(BodySubscriber<U> subscriber) {
+
+        private final boolean cancelTimerOnTermination;
+
+        Http2StreamResponseSubscriber(BodySubscriber<U> subscriber, boolean cancelTimerOnTermination) {
             super(subscriber);
+            this.cancelTimerOnTermination = cancelTimerOnTermination;
         }
 
         @Override
@@ -1938,6 +1948,13 @@ class Stream<T> extends ExchangeImpl<T> {
             unregisterResponseSubscriber(this);
         }
 
+        @Override
+        protected void onTermination() {
+            if (cancelTimerOnTermination) {
+                exchange.multi.cancelTimer();
+            }
+        }
+
     }
 
     private static final VarHandle DEREGISTERED;
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java
index 1c483ce99f4..f1c1f6f2d2a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@ import java.util.Objects;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscription;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -51,7 +50,6 @@ public class HttpBodySubscriberWrapper<T> implements TrustedSubscriber<T> {
     public static final Comparator<HttpBodySubscriberWrapper<?>> COMPARE_BY_ID
             = Comparator.comparing(HttpBodySubscriberWrapper::id);
 
-
     public static final Flow.Subscription NOP = new Flow.Subscription() {
         @Override
         public void request(long n) { }
@@ -75,7 +73,18 @@ public class HttpBodySubscriberWrapper<T> implements TrustedSubscriber<T> {
         this.userSubscriber = userSubscriber;
     }
 
-    private class SubscriptionWrapper implements Subscription {
+    /**
+     * A callback to be invoked <em>before</em> termination, whether due to the
+     * completion or failure of the subscriber, or cancellation of the
+     * subscription. To be precise, this method is called before
+     * {@link #onComplete()}, {@link #onError(Throwable) onError()}, or
+     * {@link #onCancel()}.
+     */
+    protected void onTermination() {
+        // Do nothing
+    }
+
+    private final class SubscriptionWrapper implements Subscription {
         final Subscription subscription;
         SubscriptionWrapper(Subscription s) {
             this.subscription = Objects.requireNonNull(s);
@@ -92,6 +101,7 @@ public class HttpBodySubscriberWrapper<T> implements TrustedSubscriber<T> {
                     subscription.cancel();
                 } finally {
                     if (markCancelled()) {
+                        onTermination();
                         onCancel();
                     }
                 }
@@ -284,6 +294,7 @@ public class HttpBodySubscriberWrapper<T> implements TrustedSubscriber<T> {
      */
     public final void complete(Throwable t) {
         if (markCompleted()) {
+            onTermination();
             logComplete(t);
             tryUnregister();
             t  = withError = Utils.getCompletionCause(t);
diff --git a/test/jdk/java/net/httpclient/TimeoutResponseBodyTest.java b/test/jdk/java/net/httpclient/TimeoutResponseBodyTest.java
new file mode 100644
index 00000000000..093885a6ba0
--- /dev/null
+++ b/test/jdk/java/net/httpclient/TimeoutResponseBodyTest.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.InputStream;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import static jdk.internal.net.http.HttpClientTimerAccess.assertNoResponseTimerEventRegistrations;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/*
+ * @test id=retriesDisabled
+ * @bug 8208693
+ * @summary Verifies `HttpRequest::timeout` is effective for *response body*
+ *          timeouts when all retry mechanisms are disabled.
+ *
+ * @library /test/lib
+ *          /test/jdk/java/net/httpclient/lib
+ *          access
+ * @build TimeoutResponseTestSupport
+ *        java.net.http/jdk.internal.net.http.HttpClientTimerAccess
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.test.lib.net.SimpleSSLContext
+ *
+ * @run junit/othervm
+ *      -Djdk.httpclient.auth.retrylimit=0
+ *      -Djdk.httpclient.disableRetryConnect
+ *      -Djdk.httpclient.redirects.retrylimit=0
+ *      -Dtest.requestTimeoutMillis=1000
+ *      TimeoutResponseBodyTest
+ */
+
+/*
+ * @test id=retriesEnabledForResponseFailure
+ * @bug 8208693
+ * @summary Verifies `HttpRequest::timeout` is effective for *response body*
+ *          timeouts, where some initial responses are intentionally configured
+ *          to fail to trigger retries.
+ *
+ * @library /test/lib
+ *          /test/jdk/java/net/httpclient/lib
+ *          access
+ * @build TimeoutResponseTestSupport
+ *        java.net.http/jdk.internal.net.http.HttpClientTimerAccess
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.test.lib.net.SimpleSSLContext
+ *
+ * @run junit/othervm
+ *      -Djdk.httpclient.auth.retrylimit=0
+ *      -Djdk.httpclient.disableRetryConnect
+ *      -Djdk.httpclient.redirects.retrylimit=3
+ *      -Dtest.requestTimeoutMillis=1000
+ *      -Dtest.responseFailureWaitDurationMillis=600
+ *      TimeoutResponseBodyTest
+ */
+
+/**
+ * Verifies {@link HttpRequest#timeout() HttpRequest.timeout()} is effective
+ * for <b>response body</b> timeouts.
+ *
+ * @implNote
+ *
+ * Using a response body subscriber (i.e., {@link InputStream}) of type that
+ * allows gradual consumption of the response body after successfully building
+ * an {@link HttpResponse} instance to ensure timeouts are propagated even
+ * after the {@code HttpResponse} construction.
+ * <p>
+ * Each test is provided a pristine ephemeral client to avoid any unexpected
+ * effects due to pooling.
+ */
+class TimeoutResponseBodyTest extends TimeoutResponseTestSupport {
+
+    private static final Logger LOGGER = Utils.getDebugLogger(
+            TimeoutResponseBodyTest.class.getSimpleName()::toString, Utils.DEBUG);
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#send(HttpRequest, HttpResponse.BodyHandler) HttpClient::send}
+     * against a server blocking without delivering the response body.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendOnMissingBody(ServerRequestPair pair) throws Exception {
+
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.BLOCK_BEFORE_BODY_DELIVERY;
+
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request");
+                var response = client.send(pair.request(), HttpResponse.BodyHandlers.ofInputStream());
+                LOGGER.log("Consuming the obtained response");
+                verifyResponseBodyDoesNotArrive(response);
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#sendAsync(HttpRequest, HttpResponse.BodyHandler) HttpClient::sendAsync}
+     * against a server blocking without delivering the response body.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendAsyncOnMissingBody(ServerRequestPair pair) throws Exception {
+
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.BLOCK_BEFORE_BODY_DELIVERY;
+
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request asynchronously");
+                var responseFuture = client.sendAsync(pair.request(), HttpResponse.BodyHandlers.ofInputStream());
+                LOGGER.log("Obtaining the response");
+                var response = responseFuture.get();
+                LOGGER.log("Consuming the obtained response");
+                verifyResponseBodyDoesNotArrive(response);
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+
+    }
+
+    private static void verifyResponseBodyDoesNotArrive(HttpResponse<InputStream> response) {
+        assertEquals(200, response.statusCode());
+        assertThrowsHttpTimeoutException(() -> {
+            try (var responseBodyStream = response.body()) {
+                var readByte = responseBodyStream.read();
+                fail("Unexpected read byte: " + readByte);
+            }
+        });
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#send(HttpRequest, HttpResponse.BodyHandler) HttpClient::send}
+     * against a server delivering the response body very slowly.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendOnSlowBody(ServerRequestPair pair) throws Exception {
+
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.DELIVER_BODY_SLOWLY;
+
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request");
+                var response = client.send(pair.request(), HttpResponse.BodyHandlers.ofInputStream());
+                LOGGER.log("Consuming the obtained response");
+                verifyResponseBodyArrivesSlow(response);
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#sendAsync(HttpRequest, HttpResponse.BodyHandler) HttpClient::sendAsync}
+     * against a server delivering the response body very slowly.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendAsyncOnSlowBody(ServerRequestPair pair) throws Exception {
+
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.DELIVER_BODY_SLOWLY;
+
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request asynchronously");
+                var responseFuture = client.sendAsync(pair.request(), HttpResponse.BodyHandlers.ofInputStream());
+                LOGGER.log("Obtaining the response");
+                var response = responseFuture.get();
+                LOGGER.log("Consuming the obtained response");
+                verifyResponseBodyArrivesSlow(response);
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+
+    }
+
+    private static void verifyResponseBodyArrivesSlow(HttpResponse<InputStream> response) {
+        assertEquals(200, response.statusCode());
+        assertThrowsHttpTimeoutException(() -> {
+            try (var responseBodyStream = response.body()) {
+                int i = 0;
+                int l = ServerRequestPair.CONTENT_LENGTH;
+                for (; i < l; i++) {
+                    LOGGER.log("Reading byte %s/%s", i, l);
+                    var readByte = responseBodyStream.read();
+                    if (readByte < 0) {
+                        break;
+                    }
+                    assertEquals(i, readByte);
+                }
+                fail("Should not have reached here! (i=%s)".formatted(i));
+            }
+        });
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#send(HttpRequest, HttpResponse.BodyHandler) HttpClient::send}
+     * against a server delivering 204, i.e., no content, which is handled
+     * through a specialized path served by {@code MultiExchange::handleNoBody}.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendOnNoBody(ServerRequestPair pair) throws Exception {
+
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.DELIVER_NO_BODY;
+
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request");
+                client.send(pair.request(), HttpResponse.BodyHandlers.discarding());
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#sendAsync(HttpRequest, HttpResponse.BodyHandler) HttpClient::sendAsync}
+     * against a server delivering 204, i.e., no content, which is handled
+     * through a specialized path served by {@code MultiExchange::handleNoBody}.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendAsyncOnNoBody(ServerRequestPair pair) throws Exception {
+
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.DELIVER_NO_BODY;
+
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request asynchronously");
+                client.sendAsync(pair.request(), HttpResponse.BodyHandlers.discarding()).get();
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/TimeoutResponseHeaderTest.java b/test/jdk/java/net/httpclient/TimeoutResponseHeaderTest.java
new file mode 100644
index 00000000000..ab562f8eab8
--- /dev/null
+++ b/test/jdk/java/net/httpclient/TimeoutResponseHeaderTest.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import static jdk.internal.net.http.HttpClientTimerAccess.assertNoResponseTimerEventRegistrations;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+
+/*
+ * @test id=retriesDisabled
+ * @bug 8208693
+ * @summary Verifies `HttpRequest::timeout` is effective for *response header*
+ *          timeouts when all retry mechanisms are disabled.
+ *
+ * @library /test/jdk/java/net/httpclient/lib
+ *          /test/lib
+ *          access
+ * @build TimeoutResponseTestSupport
+ *        java.net.http/jdk.internal.net.http.HttpClientTimerAccess
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.test.lib.net.SimpleSSLContext
+ *
+ * @run junit/othervm
+ *      -Djdk.httpclient.auth.retrylimit=0
+ *      -Djdk.httpclient.disableRetryConnect
+ *      -Djdk.httpclient.redirects.retrylimit=0
+ *      -Dtest.requestTimeoutMillis=1000
+ *      TimeoutResponseHeaderTest
+ */
+
+/*
+ * @test id=retriesEnabledForResponseFailure
+ * @bug 8208693
+ * @summary Verifies `HttpRequest::timeout` is effective for *response header*
+ *          timeouts, where some initial responses are intentionally configured
+ *          to fail to trigger retries.
+ *
+ * @library /test/jdk/java/net/httpclient/lib
+ *          /test/lib
+ *          access
+ * @build TimeoutResponseTestSupport
+ *        java.net.http/jdk.internal.net.http.HttpClientTimerAccess
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.test.lib.net.SimpleSSLContext
+ *
+ * @run junit/othervm
+ *      -Djdk.httpclient.auth.retrylimit=0
+ *      -Djdk.httpclient.disableRetryConnect
+ *      -Djdk.httpclient.redirects.retrylimit=3
+ *      -Dtest.requestTimeoutMillis=1000
+ *      -Dtest.responseFailureWaitDurationMillis=600
+ *      TimeoutResponseHeaderTest
+ */
+
+/**
+ * Verifies {@link HttpRequest#timeout() HttpRequest.timeout()} is effective
+ * for <b>response header</b> timeouts.
+ */
+class TimeoutResponseHeaderTest extends TimeoutResponseTestSupport {
+
+    private static final Logger LOGGER = Utils.getDebugLogger(
+            TimeoutResponseHeaderTest.class.getSimpleName()::toString, Utils.DEBUG);
+
+    static {
+        ServerRequestPair.SERVER_HANDLER_BEHAVIOUR =
+                ServerRequestPair.ServerHandlerBehaviour.BLOCK_BEFORE_HEADER_DELIVERY;
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#send(HttpRequest, HttpResponse.BodyHandler) HttpClient::send}
+     * against a server blocking without delivering any response headers.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSend(ServerRequestPair pair) throws Exception {
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(
+                    REQUEST_TIMEOUT.multipliedBy(2),
+                    () -> assertThrowsHttpTimeoutException(() -> {
+                        LOGGER.log("Sending the request");
+                        client.send(pair.request(), HttpResponse.BodyHandlers.discarding());
+                    }));
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+    }
+
+    /**
+     * Tests timeouts using
+     * {@link HttpClient#sendAsync(HttpRequest, HttpResponse.BodyHandler) HttpClient::sendAsync}
+     * against a server blocking without delivering any response headers.
+     */
+    @ParameterizedTest
+    @MethodSource("serverRequestPairs")
+    void testSendAsync(ServerRequestPair pair) throws Exception {
+        try (var client = pair.createClientWithEstablishedConnection()) {
+            assertTimeoutPreemptively(REQUEST_TIMEOUT.multipliedBy(2), () -> {
+                LOGGER.log("Sending the request asynchronously");
+                var responseFuture = client.sendAsync(pair.request(), HttpResponse.BodyHandlers.discarding());
+                assertThrowsHttpTimeoutException(() -> {
+                    LOGGER.log("Obtaining the response");
+                    responseFuture.get();
+                });
+            });
+            LOGGER.log("Verifying the registered response timer events");
+            assertNoResponseTimerEventRegistrations(client);
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java b/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
new file mode 100644
index 00000000000..4da63a2dff9
--- /dev/null
+++ b/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
@@ -0,0 +1,415 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestExchange;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.frame.ErrorFrame;
+import jdk.internal.net.http.http3.Http3Error;
+import jdk.test.lib.net.SimpleSSLContext;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.function.Executable;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpOption;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpTimeoutException;
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static jdk.httpclient.test.lib.common.HttpServerAdapters.createClientBuilderFor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Utilities for {@code TimeoutResponse*Test}s.
+ *
+ * @see TimeoutResponseBodyTest Server <b>response body</b> timeout tests
+ * @see TimeoutResponseHeaderTest Server <b>response header</b> timeout tests
+ * @see TimeoutBasic Server <b>connection</b> timeout tests
+ */
+public class TimeoutResponseTestSupport {
+
+    private static final String CLASS_NAME = TimeoutResponseTestSupport.class.getSimpleName();
+
+    private static final Logger LOGGER = Utils.getDebugLogger(CLASS_NAME::toString, Utils.DEBUG);
+
+    private static final SSLContext SSL_CONTEXT = createSslContext();
+
+    protected static final Duration REQUEST_TIMEOUT =
+            Duration.ofMillis(Long.parseLong(System.getProperty("test.requestTimeoutMillis")));
+
+    static {
+        assertTrue(
+                REQUEST_TIMEOUT.isPositive(),
+                "was expecting `test.requestTimeoutMillis > 0`, found: " + REQUEST_TIMEOUT);
+    }
+
+    protected static final int RETRY_LIMIT =
+            Integer.parseInt(System.getProperty("jdk.httpclient.redirects.retrylimit", "0"));
+
+    private static final long RESPONSE_FAILURE_WAIT_DURATION_MILLIS =
+            Long.parseLong(System.getProperty("test.responseFailureWaitDurationMillis", "0"));
+
+    static {
+        if (RETRY_LIMIT > 0) {
+
+            // Verify that response failure wait duration is provided
+            if (RESPONSE_FAILURE_WAIT_DURATION_MILLIS <= 0) {
+                var message = String.format(
+                        "`jdk.httpclient.redirects.retrylimit` (%s) is greater than zero. " +
+                                "`test.responseFailureWaitDurationMillis` (%s) must be greater than zero too.",
+                        RETRY_LIMIT, RESPONSE_FAILURE_WAIT_DURATION_MILLIS);
+                throw new AssertionError(message);
+            }
+
+            // Verify that the total response failure waits exceed the request timeout
+            var totalResponseFailureWaitDuration = Duration
+                    .ofMillis(RESPONSE_FAILURE_WAIT_DURATION_MILLIS)
+                    .multipliedBy(RETRY_LIMIT);
+            if (totalResponseFailureWaitDuration.compareTo(REQUEST_TIMEOUT) <= 0) {
+                var message = ("`test.responseFailureWaitDurationMillis * jdk.httpclient.redirects.retrylimit` (%s * %s = %s) " +
+                        "must be greater than `test.requestTimeoutMillis` (%s)")
+                        .formatted(
+                                RESPONSE_FAILURE_WAIT_DURATION_MILLIS,
+                                RETRY_LIMIT,
+                                totalResponseFailureWaitDuration,
+                                REQUEST_TIMEOUT);
+                throw new AssertionError(message);
+            }
+
+        }
+    }
+
+    protected static final ServerRequestPair
+            HTTP1 = ServerRequestPair.of(Version.HTTP_1_1, false),
+            HTTPS1 = ServerRequestPair.of(Version.HTTP_1_1, true),
+            HTTP2 = ServerRequestPair.of(Version.HTTP_2, false),
+            HTTPS2 = ServerRequestPair.of(Version.HTTP_2, true),
+            HTTP3 = ServerRequestPair.of(Version.HTTP_3, true);
+
+    private static SSLContext createSslContext() {
+        try {
+            return new SimpleSSLContext().get();
+        } catch (IOException exception) {
+            throw new UncheckedIOException(exception);
+        }
+    }
+
+    protected record ServerRequestPair(HttpTestServer server, HttpRequest request, boolean secure) {
+
+        private static final ExecutorService EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
+
+        private static final CountDownLatch SHUT_DOWN_LATCH = new CountDownLatch(1);
+
+        private static final AtomicInteger SERVER_COUNTER = new AtomicInteger();
+
+        /**
+         * An arbitrary content length to cause the client wait for it.
+         * It just needs to be greater than zero, and big enough to trigger a timeout when delivered slowly.
+         */
+        public static final int CONTENT_LENGTH = 1234;
+
+        public enum ServerHandlerBehaviour {
+            BLOCK_BEFORE_HEADER_DELIVERY,
+            BLOCK_BEFORE_BODY_DELIVERY,
+            DELIVER_BODY_SLOWLY,
+            DELIVER_NO_BODY
+        }
+
+        public static volatile ServerHandlerBehaviour SERVER_HANDLER_BEHAVIOUR;
+
+        public static volatile int SERVER_HANDLER_PENDING_FAILURE_COUNT = 0;
+
+        private static ServerRequestPair of(Version version, boolean secure) {
+
+            // Create the server and the request URI
+            var sslContext = secure ? SSL_CONTEXT : null;
+            var serverId = "" + SERVER_COUNTER.getAndIncrement();
+            var server = createServer(version, sslContext);
+            server.getVersion();
+            var handlerPath = "/%s/".formatted(CLASS_NAME);
+            var requestUriScheme = secure ? "https" : "http";
+            var requestUri = URI.create("%s://%s%s-".formatted(requestUriScheme, server.serverAuthority(), handlerPath));
+
+            // Register the request handler
+            server.addHandler(createServerHandler(serverId), handlerPath);
+
+            // Create the request
+            var request = createRequestBuilder(requestUri, version).timeout(REQUEST_TIMEOUT).build();
+
+            // Create the pair
+            var pair = new ServerRequestPair(server, request, secure);
+            pair.server.start();
+            LOGGER.log("Server[%s] is started at `%s`", serverId, server.serverAuthority());
+            return pair;
+
+        }
+
+        private static HttpTestServer createServer(Version version, SSLContext sslContext) {
+            try {
+                return switch (version) {
+                    case HTTP_1_1, HTTP_2 -> HttpTestServer.create(version, sslContext, EXECUTOR);
+                    case HTTP_3 -> HttpTestServer.create(HTTP_3_URI_ONLY, sslContext, EXECUTOR);
+                };
+            } catch (IOException exception) {
+                throw new UncheckedIOException(exception);
+            }
+        }
+
+        private static HttpTestHandler createServerHandler(String serverId) {
+            return (exchange) -> {
+                var connectionKey = exchange.getConnectionKey();
+                LOGGER.log(
+                        "Server[%s] has received request %s",
+                        serverId, Map.of("connectionKey", connectionKey));
+                try (exchange) {
+
+                    // Short-circuit on `HEAD` requests.
+                    // They are used for admitting established connections to the pool.
+                    if ("HEAD".equals(exchange.getRequestMethod())) {
+                        LOGGER.log(
+                                "Server[%s] is responding to the `HEAD` request %s",
+                                serverId, Map.of("connectionKey", connectionKey));
+                        exchange.sendResponseHeaders(200, 0);
+                        return;
+                    }
+
+                    // Short-circuit if instructed to fail
+                    synchronized (ServerRequestPair.class) {
+                        if (SERVER_HANDLER_PENDING_FAILURE_COUNT > 0) {
+                            LOGGER.log(
+                                    "Server[%s] is prematurely failing as instructed %s",
+                                    serverId,
+                                    Map.of(
+                                            "connectionKey", connectionKey,
+                                            "SERVER_HANDLER_PENDING_FAILURE_COUNT", SERVER_HANDLER_PENDING_FAILURE_COUNT));
+                            // Closing the exchange will trigger an `END_STREAM` without a headers frame.
+                            // This is a protocol violation, hence we must reset the stream first.
+                            // We are doing so using by rejecting the stream, which is known to make the client retry.
+                            if (Version.HTTP_2.equals(exchange.getExchangeVersion())) {
+                                exchange.resetStream(ErrorFrame.REFUSED_STREAM);
+                            } else if (Version.HTTP_3.equals(exchange.getExchangeVersion())) {
+                                exchange.resetStream(Http3Error.H3_REQUEST_REJECTED.code());
+                            }
+                            SERVER_HANDLER_PENDING_FAILURE_COUNT--;
+                            return;
+                        }
+                    }
+
+                    switch (SERVER_HANDLER_BEHAVIOUR) {
+
+                        case BLOCK_BEFORE_HEADER_DELIVERY -> sleepIndefinitely(serverId, connectionKey);
+
+                        case BLOCK_BEFORE_BODY_DELIVERY -> {
+                            sendResponseHeaders(serverId, exchange, connectionKey);
+                            sleepIndefinitely(serverId, connectionKey);
+                        }
+
+                        case DELIVER_BODY_SLOWLY -> {
+                            sendResponseHeaders(serverId, exchange, connectionKey);
+                            sendResponseBodySlowly(serverId, exchange, connectionKey);
+                        }
+
+                        case DELIVER_NO_BODY -> sendResponseHeaders(serverId, exchange, connectionKey, 204, 0);
+
+                    }
+
+                } catch (Exception exception) {
+                    var message = String.format(
+                            "Server[%s] has failed! %s",
+                            serverId, Map.of("connectionKey", connectionKey));
+                    LOGGER.log(System.Logger.Level.ERROR, message, exception);
+                    if (exception instanceof InterruptedException) {
+                        // Restore the interrupt
+                        Thread.currentThread().interrupt();
+                    }
+                    throw new RuntimeException(message, exception);
+                }
+            };
+        }
+
+        private static void sleepIndefinitely(String serverId, String connectionKey) throws InterruptedException {
+            LOGGER.log("Server[%s] is sleeping %s", serverId, Map.of("connectionKey", connectionKey));
+            SHUT_DOWN_LATCH.await();
+        }
+
+        private static void sendResponseHeaders(String serverId, HttpTestExchange exchange, String connectionKey)
+                throws IOException {
+            sendResponseHeaders(serverId, exchange, connectionKey, 200, CONTENT_LENGTH);
+        }
+
+        private static void sendResponseHeaders(
+                String serverId,
+                HttpTestExchange exchange,
+                String connectionKey,
+                int statusCode,
+                long contentLength)
+                throws IOException {
+            LOGGER.log("Server[%s] is sending headers %s", serverId, Map.of("connectionKey", connectionKey));
+            exchange.sendResponseHeaders(statusCode, contentLength);
+            // Force the headers to be flushed
+            exchange.getResponseBody().flush();
+        }
+
+        private static void sendResponseBodySlowly(String serverId, HttpTestExchange exchange, String connectionKey)
+                throws Exception {
+            var perBytePauseDuration = Duration.ofMillis(100);
+            assertTrue(
+                    perBytePauseDuration.multipliedBy(CONTENT_LENGTH).compareTo(REQUEST_TIMEOUT) > 0,
+                    "Per-byte pause duration (%s) must be long enough to exceed the timeout (%s) when delivering the content (%s bytes)".formatted(
+                            perBytePauseDuration, REQUEST_TIMEOUT, CONTENT_LENGTH));
+            try (var responseBody = exchange.getResponseBody()) {
+                for (int i = 0; i < CONTENT_LENGTH; i++) {
+                    LOGGER.log(
+                            "Server[%s] is sending the body %s/%s %s",
+                            serverId, i, CONTENT_LENGTH, Map.of("connectionKey", connectionKey));
+                    responseBody.write(i);
+                    responseBody.flush();
+                    Thread.sleep(perBytePauseDuration);
+                }
+                throw new AssertionError("Delivery should never have succeeded due to timeout!");
+            } catch (IOException _) {
+                // Client's timeout mechanism is expected to short-circuit and cut the stream.
+                // Hence, discard I/O failures.
+            }
+        }
+
+        public HttpClient createClientWithEstablishedConnection() throws IOException, InterruptedException {
+            var version = server.getVersion();
+            var client = createClientBuilderFor(version)
+                    .version(version)
+                    .sslContext(SSL_CONTEXT)
+                    .proxy(NO_PROXY)
+                    .build();
+            // Ensure an established connection is admitted to the pool. This
+            // helps to cross out any possibilities of a timeout before a
+            // request makes it to the server handler. For instance, consider
+            // HTTP/1.1 to HTTP/2 upgrades, or long-running TLS handshakes.
+            var headRequest = createRequestBuilder(request.uri(), version).HEAD().build();
+            client.send(headRequest, HttpResponse.BodyHandlers.discarding());
+            return client;
+        }
+
+        private static HttpRequest.Builder createRequestBuilder(URI uri, Version version) {
+            var requestBuilder = HttpRequest.newBuilder(uri).version(version);
+            if (Version.HTTP_3.equals(version)) {
+                requestBuilder.setOption(HttpOption.H3_DISCOVERY, HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY);
+            }
+            return requestBuilder;
+        }
+
+        @Override
+        public String toString() {
+            var version = server.getVersion();
+            var versionString = version.toString();
+            return switch (version) {
+                case HTTP_1_1, HTTP_2 -> secure ? versionString.replaceFirst("_", "S_") : versionString;
+                case HTTP_3 -> versionString;
+            };
+        }
+
+    }
+
+    @AfterAll
+    static void closeServers() {
+
+        // Terminate all handlers before shutting down the server, which would block otherwise.
+        ServerRequestPair.SHUT_DOWN_LATCH.countDown();
+        ServerRequestPair.EXECUTOR.shutdown();
+
+        // Shut down servers
+        Exception[] exceptionRef = {null};
+        serverRequestPairs()
+                .forEach(pair -> {
+                    try {
+                        pair.server.stop();
+                    } catch (Exception exception) {
+                        if (exceptionRef[0] == null) {
+                            exceptionRef[0] = exception;
+                        } else {
+                            exceptionRef[0].addSuppressed(exception);
+                        }
+                    }
+                });
+        if (exceptionRef[0] != null) {
+            throw new RuntimeException("failed closing one or more server resources", exceptionRef[0]);
+        }
+
+    }
+
+    /**
+     * Configures how many times the handler should fail.
+     */
+    @BeforeEach
+    void resetServerHandlerFailureIndex() {
+        ServerRequestPair.SERVER_HANDLER_PENDING_FAILURE_COUNT = Math.max(0, RETRY_LIMIT - 1);
+    }
+
+    /**
+     * Ensures that the handler has failed as many times as instructed.
+     */
+    @AfterEach
+    void verifyServerHandlerFailureIndex() {
+        assertEquals(0, ServerRequestPair.SERVER_HANDLER_PENDING_FAILURE_COUNT);
+    }
+
+    protected static Stream<ServerRequestPair> serverRequestPairs() {
+        return Stream.of(HTTP1, HTTPS1, HTTP2, HTTPS2, HTTP3);
+    }
+
+    protected static void assertThrowsHttpTimeoutException(Executable executable) {
+        var rootException = assertThrows(Exception.class, executable);
+        // Due to intricacies involved in the way exceptions are generated and
+        // nested, there is no bullet-proof way to determine at which level of
+        // the causal chain an `HttpTimeoutException` will show up. Hence, we
+        // scan through the entire causal chain.
+        Throwable exception = rootException;
+        while (exception != null) {
+            if (exception instanceof HttpTimeoutException) {
+                return;
+            }
+            exception = exception.getCause();
+        }
+        throw new AssertionError("was expecting an `HttpTimeoutException` in the causal chain", rootException);
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientTimerAccess.java b/test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientTimerAccess.java
new file mode 100644
index 00000000000..8bc1fac7b60
--- /dev/null
+++ b/test/jdk/java/net/httpclient/access/java.net.http/jdk/internal/net/http/HttpClientTimerAccess.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.internal.net.http;
+
+import java.net.http.HttpClient;
+
+public enum HttpClientTimerAccess {;
+
+    public static void assertNoResponseTimerEventRegistrations(HttpClient client) {
+        assertTimerEventRegistrationCount(client, ResponseTimerEvent.class, 0);
+    }
+
+    private static void assertTimerEventRegistrationCount(
+            HttpClient client,
+            Class<? extends TimeoutEvent> clazz,
+            long expectedCount) {
+        var facade = assertType(HttpClientFacade.class, client);
+        var actualCount = facade.impl.timers().stream().filter(clazz::isInstance).count();
+        if (actualCount != 0) {
+            throw new AssertionError(
+                    "Found %s occurrences of `%s` timer event registrations while expecting %s.".formatted(
+                            actualCount, clazz.getCanonicalName(), expectedCount));
+        }
+    }
+
+    private static <T> T assertType(Class<T> expectedType, Object instance) {
+        if (!expectedType.isInstance(instance)) {
+            var expectedTypeName = expectedType.getCanonicalName();
+            var actualTypeName = instance != null ? instance.getClass().getCanonicalName() : null;
+            throw new AssertionError(
+                    "Was expecting an instance of type `%s`, found: `%s`".formatted(
+                            expectedTypeName, actualTypeName));
+        }
+        @SuppressWarnings("unchecked")
+        T typedInstance = (T) instance;
+        return typedInstance;
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/websocket/WebSocketTest.java b/test/jdk/java/net/httpclient/websocket/WebSocketTest.java
index 83f8b6eab27..43bcb054b7d 100644
--- a/test/jdk/java/net/httpclient/websocket/WebSocketTest.java
+++ b/test/jdk/java/net/httpclient/websocket/WebSocketTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,10 @@
 
 /*
  * @test
- * @bug 8217429
+ * @bug 8217429 8208693
+ * @library ../access
  * @build DummyWebSocketServer
+ *        java.net.http/jdk.internal.net.http.HttpClientTimerAccess
  * @run testng/othervm
  *       WebSocketTest
  */
@@ -40,6 +42,7 @@ import java.net.http.WebSocket;
 import java.net.http.WebSocketHandshakeException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
@@ -48,6 +51,7 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
@@ -58,6 +62,7 @@ import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.newBuilder;
 import static java.net.http.WebSocket.NORMAL_CLOSURE;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.internal.net.http.HttpClientTimerAccess.assertNoResponseTimerEventRegistrations;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.fail;
@@ -143,6 +148,45 @@ public class WebSocketTest {
         }
     }
 
+    /**
+     * Verifies that the internally issued request to establish the WebSocket
+     * connection does not leave any response timers registered at the client
+     * after the WebSocket handshake.
+     */
+    @Test
+    public void responseTimerCleanUp() throws Exception {
+        try (var server = new DummyWebSocketServer()) {
+            server.open();
+            try (var client = newBuilder().proxy(NO_PROXY).build()) {
+                var connectionEstablished = new CountDownLatch(1);
+                var webSocketListener = new WebSocket.Listener() {
+
+                    @Override
+                    public void onOpen(WebSocket webSocket) {
+                        connectionEstablished.countDown();
+                    }
+
+                };
+                var webSocket = client
+                        .newWebSocketBuilder()
+                        // Explicitly configure a timeout to get a response
+                        // timer event get registered at the client. The query
+                        // should succeed without timing out.
+                        .connectTimeout(Duration.ofMinutes(2))
+                        .buildAsync(server.getURI(), webSocketListener)
+                        .join();
+                try {
+                    connectionEstablished.await();
+                    // We expect the response timer event to get evicted once
+                    // the WebSocket handshake headers are received.
+                    assertNoResponseTimerEventRegistrations(client);
+                } finally {
+                    webSocket.abort();
+                }
+            }
+        }
+    }
+
     @Test
     public void partialBinaryThenText() throws IOException {
         try (var server = new DummyWebSocketServer()) {

From df0165bd6933728fdcf1956323401afdc47b3f78 Mon Sep 17 00:00:00 2001
From: Ana-Maria Mihalceanu <ana-maria.m.mihalceanu@oracle.com>
Date: Thu, 4 Dec 2025 10:09:33 +0000
Subject: [PATCH 508/512] 8321139: jlink's compression plugin doesn't handle -c
 option correctly

Reviewed-by: jpai, alanb
---
 .../jdk/tools/jlink/internal/TaskHelper.java  |  7 ++-
 .../tools/jlink/resources/plugins.properties  | 12 ++---
 src/jdk.jlink/share/man/jlink.md              | 21 +++++---
 test/jdk/tools/jlink/JLinkTest.java           | 38 ++++++++++++--
 test/jdk/tools/jlink/TaskHelperTest.java      | 51 +++++++++++++++++--
 test/setup_aot/TestSetupAOT.java              |  2 +-
 6 files changed, 106 insertions(+), 25 deletions(-)

diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
index d53589dc388..dca4d57f764 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
@@ -362,10 +362,13 @@ public final class TaskHelper {
 
                 if (plugin instanceof DefaultCompressPlugin) {
                     plugOption
-                        = new PluginOption(false,
+                        = new PluginOption(true,
                             (task, opt, arg) -> {
                                 Map<String, String> m = addArgumentMap(plugin);
-                                m.put(plugin.getName(), DefaultCompressPlugin.LEVEL_2);
+                                String level = (arg != null && !arg.isEmpty())
+                                        ? arg
+                                        :"zip-6";
+                                m.put(plugin.getName(), level);
                             }, false, "--compress", "-c");
                     mainOptions.add(plugOption);
                 } else if (plugin instanceof DefaultStripDebugPlugin) {
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
index e9be0b4e587..7e3c26fa7b8 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
@@ -61,14 +61,14 @@ Class optimization: convert Class.forName calls to constant loads.
 class-for-name.usage=\
 \  --class-for-name          Class optimization: convert Class.forName calls to constant loads.
 
-compress.argument=<zip-[0-9]>[:filter=<pattern-list>]
+compress.argument=<zip-'{0-9}'>[:filter=<pattern-list>]
 
 compress.description= Compression to use in compressing resources.
 
 compress.usage=\
 \  --compress <compress>     Compression to use in compressing resources:\n\
 \                            Accepted values are:\n\
-\                            zip-[0-9], where zip-0 provides no compression,\n\
+\                            zip-'{0-9}', where zip-0 provides no compression,\n\
 \                            and zip-9 provides the best compression.\n\
 \                            Default is zip-6.
 
@@ -307,15 +307,15 @@ plugin.opt.disable-plugin=\
 \      --disable-plugin <pluginname>     Disable the plugin mentioned
 
 plugin.opt.compress=\
-\      --compress <compress>             Compression to use in compressing resources:\n\
+\      --compress <compress>             Compress all resources in the output image:\n\
 \                                        Accepted values are:\n\
-\                                        zip-[0-9], where zip-0 provides no compression,\n\
+\                                        zip-'{0-9}', where zip-0 provides no compression,\n\
 \                                        and zip-9 provides the best compression.\n\
 \                                        Default is zip-6.\n\
 \                                        Deprecated values to be removed in a future release:\n\
-\                                        0:  No compression. Equivalent to zip-0.\n\
+\                                        0:  No compression. Use zip-0 instead.\n\
 \                                        1:  Constant String Sharing\n\
-\                                        2:  Equivalent to zip-6.
+\                                        2:  ZIP. Use zip-6 instead.
 
 plugin.opt.strip-debug=\
 \  -G, --strip-debug                     Strip debug information
diff --git a/src/jdk.jlink/share/man/jlink.md b/src/jdk.jlink/share/man/jlink.md
index dc256af43b5..0d16e69c9ef 100644
--- a/src/jdk.jlink/share/man/jlink.md
+++ b/src/jdk.jlink/share/man/jlink.md
@@ -64,12 +64,15 @@ Developers are responsible for updating their custom runtime images.
 `--bind-services`
 :   Link service provider modules and their dependencies.
 
-`-c ={0|1|2}` or `--compress={0|1|2}`
-:   Enable compression of resources:
+`-c zip-{0-9}` or `--compress=zip-{0-9}`
+:   Enable compression of resources. The accepted values are:
+    zip-{0-9}, where zip-0 provides no compression,
+    and zip-9 provides the best compression. Default is zip-6.
 
-    -   `0`: No compression
+:   Deprecated values to be removed in a future release:
+    -   `0`: No compression. Use zip-0 instead.
     -   `1`: Constant string sharing
-    -   `2`: ZIP
+    -   `2`: ZIP. Use zip-6 instead.
 
 `--disable-plugin` *pluginname*
 :   Disables the specified plug-in. See [jlink Plug-ins] for the list of
@@ -170,14 +173,18 @@ For a complete list of all available plug-ins, run the command
 ### Plugin `compress`
 
 Options
-:   `--compress=`{`0`\|`1`\|`2`}\[`:filter=`*pattern-list*\]
+:   `--compress=zip-`{`0`-`9`}\[`:filter=`*pattern-list*\]
 
 Description
 :   Compresses all resources in the output image.
+    Accepted values are:
+    zip-{0-9}, where zip-0 provides no compression,
+    and zip-9 provides the best compression. Default is zip-6.
 
-    -   Level 0: No compression
+:   Deprecated values to be removed in a future release:
+    -   Level 0: No compression. Use zip-0 instead.
     -   Level 1: Constant string sharing
-    -   Level 2: ZIP
+    -   Level 2: ZIP. Use zip-6 instead.
 
     An optional *pattern-list* filter can be specified to list the pattern of
     files to include.
diff --git a/test/jdk/tools/jlink/JLinkTest.java b/test/jdk/tools/jlink/JLinkTest.java
index bc4d2a08800..1d84caaa147 100644
--- a/test/jdk/tools/jlink/JLinkTest.java
+++ b/test/jdk/tools/jlink/JLinkTest.java
@@ -42,10 +42,7 @@ import tests.JImageGenerator;
 /*
  * @test
  * @summary Test image creation
- * @bug 8189777
- * @bug 8194922
- * @bug 8206962
- * @bug 8240349
+ * @bug 8189777 8194922 8206962 8240349 8163382 8165735 8166810 8173717 8321139
  * @author Jean-Francois Denise
  * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../lib
@@ -358,6 +355,39 @@ public class JLinkTest {
             helper.generateDefaultImage(userOptions, moduleName).assertFailure("Error: Invalid compression level invalid");
         }
 
+        // short command  without argument
+        {
+            String[] userOptions = {"-c"};
+            String moduleName = "invalidCompressLevelEmpty";
+            helper.generateDefaultJModule(moduleName, "composite2");
+            helper.generateDefaultImage(userOptions, moduleName).assertFailure("Error: no value given for -c");
+        }
+
+        // invalid short command
+        {
+            String[] userOptions = {"-c", "3", "--output", "image"};
+            String moduleName = "invalidCompressLevel3";
+            helper.generateDefaultJModule(moduleName, "composite2");
+            helper.generateDefaultImage(userOptions, moduleName).assertFailure("Error: Invalid compression level 3");
+        }
+
+
+        // invalid argument value
+        {
+            String[] userOptions = {"--compress", "42", "--output", "image"};
+            String moduleName = "invalidCompressLevel42";
+            helper.generateDefaultJModule(moduleName, "composite2");
+            helper.generateDefaultImage(userOptions, moduleName).assertFailure("Error: Invalid compression level 42");
+        }
+
+        // invalid argument value
+        {
+            String[] userOptions = {"--compress", "zip-", "--output", "image"};
+            String moduleName = "invalidCompressLevelZip";
+            helper.generateDefaultJModule(moduleName, "composite2");
+            helper.generateDefaultImage(userOptions, moduleName).assertFailure("Error: Invalid compression level zip-");
+        }
+
         // orphan argument - JDK-8166810
         {
             String[] userOptions = {"--compress", "2", "foo" };
diff --git a/test/jdk/tools/jlink/TaskHelperTest.java b/test/jdk/tools/jlink/TaskHelperTest.java
index 51dea8de24a..26ac376a6ec 100644
--- a/test/jdk/tools/jlink/TaskHelperTest.java
+++ b/test/jdk/tools/jlink/TaskHelperTest.java
@@ -48,7 +48,7 @@ import jdk.tools.jlink.internal.TaskHelper.BadArgs;
 /*
  * @test
  * @summary Test TaskHelper option parsing
- * @bug 8303884
+ * @bug 8303884 8321139
  * @modules jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.plugin
  * @run junit TaskHelperTest
@@ -59,19 +59,22 @@ public class TaskHelperTest {
 
     private static final List<Option<TaskHelperTest>> OPTIONS = List.of(
         new Option<>(true, (task, opt, arg) -> {
-            System.out.println(arg);
             mainArgValue = arg;
         }, true, "--main-expecting"),
         new Option<>(false, (task, opt, arg) -> {
             mainFlag = true;
-        }, true, "--main-no-arg")
+        }, true, "--main-no-arg"),
+        new Option<>(true, (task, opt, arg) -> {
+            compressArgValue = (arg != null && !arg.isEmpty()) ? arg : "zip-6";
+        }, "--compress", "-c")
     );
 
     private static String argValue;
     private static String mainArgValue;
     private static boolean mainFlag = false;
+    private static String compressArgValue;
 
-    public record ArgTestCase(String cmdLine, String[] tokens, String pluginArgValue, String mainArgValue, boolean mainFlagSet) {};
+    public record ArgTestCase(String cmdLine, String[] tokens, String pluginArgValue, String mainArgValue, boolean mainFlagSet) {}
 
     public static class TestPluginWithRawOption implements Plugin {
         @Override
@@ -118,6 +121,7 @@ public class TaskHelperTest {
         argValue = null;
         mainArgValue = null;
         mainFlag = false;
+        compressArgValue= null;
     }
 
     public static Stream<ArgTestCase> gnuStyleUsages() {
@@ -217,4 +221,41 @@ public class TaskHelperTest {
         var remaining = optionsHelper.handleOptions(this, args);
         assertEquals(2, remaining.size());
     }
-}
\ No newline at end of file
+
+    record CompressTestCase(String[] tokens, String expectedCompressValue) {}
+
+    public static Stream<CompressTestCase> compressUsages() {
+        return Stream.of(
+
+                new CompressTestCase(new String[] {"-c", "0"}, "0"),
+                new CompressTestCase(new String[] {"--compress=zip-0"}, "zip-0"),
+
+                new CompressTestCase(new String[] {"-c", "1"}, "1"),
+                new CompressTestCase(new String[] {"--compress=zip-1"}, "zip-1"),
+
+                new CompressTestCase(new String[] {"-c", "2"}, "2"),
+                new CompressTestCase(new String[] {"--compress=zip-2"}, "zip-2"),
+
+                new CompressTestCase(new String[] {"--compress=zip-3"}, "zip-3"),
+                new CompressTestCase(new String[] {"--compress=zip-4"}, "zip-4"),
+                new CompressTestCase(new String[] {"--compress=zip-5"}, "zip-5"),
+                new CompressTestCase(new String[] {"--compress=zip-6"}, "zip-6"),
+                new CompressTestCase(new String[] {"--compress=zip-7"}, "zip-7"),
+                new CompressTestCase(new String[] {"--compress=zip-8"}, "zip-8"),
+                new CompressTestCase(new String[] {"--compress=zip-9"}, "zip-9")
+                );
+    }
+
+    @ParameterizedTest
+    @MethodSource("compressUsages")
+    public void testCompressOptionArg(CompressTestCase testCase) throws TaskHelper.BadArgs, IOException {
+        var remaining = optionsHelper.handleOptions(this, testCase.tokens);
+
+        // trigger Plugin::configure
+        taskHelper.getPluginsConfig(null, null, null);
+
+        assertTrue(remaining.isEmpty());
+        assertEquals(testCase.expectedCompressValue, compressArgValue);
+    }
+}
+
diff --git a/test/setup_aot/TestSetupAOT.java b/test/setup_aot/TestSetupAOT.java
index a46bd6e66c7..0ab17d6ca99 100644
--- a/test/setup_aot/TestSetupAOT.java
+++ b/test/setup_aot/TestSetupAOT.java
@@ -137,7 +137,7 @@ public class TestSetupAOT {
         String jlinkOutput = tmpDir + File.separator + "jlinkOutput";
 
         execTool("jlink", "--help")
-            .shouldContain("Compression to use in compressing resources");
+            .shouldContain("Compress all resources in the output image");
         execTool("jlink", "--list-plugins")
             .shouldContain("List of available plugins",
                            "--generate-cds-archive ");

From 91c5bd550a36e10e8b39d1b322fd433ee8df14f5 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Thu, 4 Dec 2025 10:17:34 +0000
Subject: [PATCH 509/512] 8337791: VectorAPI jtreg ABSMaskedByteMaxVectorTests
 crashes with UseAVX=0 -XX:MaxVectorSize=8

Reviewed-by: epeter, sviswanathan, dlunden
---
 src/hotspot/cpu/x86/x86.ad                    |  5 ++
 .../vectorapi/TestABSMaskedMaxByteVector.java | 54 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/TestABSMaskedMaxByteVector.java

diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 1d393897bca..42d2e815e45 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -3386,6 +3386,11 @@ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
         return false;
       }
       break;
+    case Op_VectorBlend:
+      if (UseAVX == 0 && size_in_bits < 128) {
+        return false;
+      }
+      break;
     case Op_VectorTest:
       if (UseSSE < 4) {
         return false; // Implementation limitation
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestABSMaskedMaxByteVector.java b/test/hotspot/jtreg/compiler/vectorapi/TestABSMaskedMaxByteVector.java
new file mode 100644
index 00000000000..356892fadf8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestABSMaskedMaxByteVector.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.vectorapi;
+
+import compiler.lib.ir_framework.*;
+import jdk.incubator.vector.*;
+
+/*
+ * @test
+ * @bug 8337791
+ * @summary Test byte vector predicated ABS with UseAVX=0 and MaxVectorSize=8
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run driver compiler.vectorapi.TestABSMaskedMaxByteVector
+ */
+
+public class TestABSMaskedMaxByteVector {
+    public static final VectorSpecies<Byte> BSP = ByteVector.SPECIES_MAX;
+    public static int idx = 0;
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-ea", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:UseAVX=0", "-XX:MaxVectorSize=8");
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-ea");
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ABS_VB}, applyIfAnd = {"MaxVectorSize", " <= 8 ", "UseAVX", "0"}, applyIfPlatform = {"x64", "true"}, applyIfCPUFeature = {"sse4.1", "true"})
+    @IR(counts = {IRNode.ABS_VB, "1"}, applyIf = {"MaxVectorSize", " > 8 "}, applyIfPlatform = {"x64", "true"}, applyIfCPUFeature = {"sse4.1", "true"})
+    public void test() {
+        assert ByteVector.broadcast(BSP, (byte)-4)
+                         .lanewise(VectorOperators.ABS, VectorMask.fromLong(BSP, 0xF))
+                         .lane(idx++ & 3) == 4;
+    }
+}

From b5970c97bdd5b1e079e9ada0fbd469850c0e23b4 Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Thu, 4 Dec 2025 10:21:53 +0000
Subject: [PATCH 510/512] 8373063: Test
 sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java fails on Aarch64 after
 JDK-8372816

Reviewed-by: dholmes, mdoerr
---
 .../provider/acvp/ML_DSA_Intrinsic_Test.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
index 7f057603323..1e9faf7fb74 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
@@ -38,6 +38,8 @@ import java.util.HexFormat;
  */
 /*
  * @test
+ * @comment This test should be reenabled on aarch64
+ * @requires os.simpleArch == "x64"
  * @library /test/lib
  * @key randomness
  * @modules java.base/sun.security.provider:+open
@@ -48,7 +50,7 @@ import java.util.HexFormat;
 //  -XX:+UnlockDiagnosticVMOptions -XX:+UseDilithiumIntrinsics test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
 
 public class ML_DSA_Intrinsic_Test {
-    public static void main(String[] args) throws Exception, Throwable {
+    public static void main(String[] args) throws Throwable {
         MethodHandles.Lookup lookup = MethodHandles.lookup();
         Class<?> kClazz = sun.security.provider.ML_DSA.class;
 
@@ -129,7 +131,7 @@ public class ML_DSA_Intrinsic_Test {
     private static final int ML_DSA_N = 256;
     public static void testMult(int[] prod1, int[] prod2, int[] coeffs1, int[] coeffs2,
         MethodHandle mult, MethodHandle multJava, Random rnd,
-        long seed, int i) throws Exception, Throwable {
+        long seed, int i) throws Throwable {
 
         for (int j = 0; j<ML_DSA_N; j++) {
             coeffs1[j] = rnd.nextInt();
@@ -146,7 +148,7 @@ public class ML_DSA_Intrinsic_Test {
 
     public static void testMultConst(int[] prod1, int[] prod2,
         MethodHandle multConst, MethodHandle multConstJava, Random rnd,
-        long seed, int i) throws Exception, Throwable {
+        long seed, int i) throws Throwable {
 
         for (int j = 0; j<ML_DSA_N; j++) {
             prod1[j] = prod2[j] = rnd.nextInt();
@@ -165,7 +167,7 @@ public class ML_DSA_Intrinsic_Test {
 
     public static void testDecompose(int[] low1, int[] high1, int[] low2, int[] high2, int[] coeffs1, int[] coeffs2,
         MethodHandle decompose, MethodHandle decomposeJava, Random rnd,
-        long seed, int i) throws Exception, Throwable {
+        long seed, int i) throws Throwable {
 
         for (int j = 0; j<ML_DSA_N; j++) {
             coeffs1[j] = coeffs2[j] = rnd.nextInt();
@@ -190,7 +192,7 @@ public class ML_DSA_Intrinsic_Test {
 
     public static void testAlmostNtt(int[] coeffs1, int[] coeffs2,
         MethodHandle almostNtt, MethodHandle almostNttJava, Random rnd,
-        long seed, int i) throws Exception, Throwable {
+        long seed, int i) throws Throwable {
         for (int j = 0; j<ML_DSA_N; j++) {
             coeffs1[j] = coeffs2[j] = rnd.nextInt();
         }
@@ -205,7 +207,7 @@ public class ML_DSA_Intrinsic_Test {
 
     public static void testInverseNtt(int[] coeffs1, int[] coeffs2,
         MethodHandle inverseNtt, MethodHandle inverseNttJava, Random rnd,
-        long seed, int i) throws Exception, Throwable {
+        long seed, int i) throws Throwable {
         for (int j = 0; j<ML_DSA_N; j++) {
             coeffs1[j] = coeffs2[j] = rnd.nextInt();
         }

From bcbdf90fce44ad87e7728ba0febef0951e361589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Thu, 4 Dec 2025 12:25:02 +0000
Subject: [PATCH 511/512] 8373062: JFR build failure with CDS disabled

Reviewed-by: egahlin
---
 .../share/classfile/systemDictionary.cpp      | 22 +++++++++----------
 src/hotspot/share/jfr/jfr.cpp                 |  2 ++
 src/hotspot/share/jfr/jfr.hpp                 |  2 +-
 .../share/jfr/support/jfrClassDefineEvent.cpp |  2 ++
 .../share/jfr/support/jfrClassDefineEvent.hpp |  3 ++-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index ac57293687c..c873347a197 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1146,17 +1146,6 @@ void SystemDictionary::load_shared_class_misc(InstanceKlass* ik, ClassLoaderData
   }
 }
 
-#if INCLUDE_JFR
-void SystemDictionary::post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld) {
-  assert(event != nullptr, "invariant");
-  assert(k != nullptr, "invariant");
-  event->set_loadedClass(k);
-  event->set_definingClassLoader(k->class_loader_data());
-  event->set_initiatingClassLoader(init_cld);
-  event->commit();
-}
-#endif // INCLUDE_JFR
-
 // This is much more lightweight than SystemDictionary::resolve_or_null
 // - There's only a single Java thread at this point. No need for placeholder.
 // - All supertypes of ik have been loaded
@@ -1217,6 +1206,17 @@ void SystemDictionary::preload_class(Handle class_loader, InstanceKlass* ik, TRA
 
 #endif // INCLUDE_CDS
 
+#if INCLUDE_JFR
+void SystemDictionary::post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld) {
+  assert(event != nullptr, "invariant");
+  assert(k != nullptr, "invariant");
+  event->set_loadedClass(k);
+  event->set_definingClassLoader(k->class_loader_data());
+  event->set_initiatingClassLoader(init_cld);
+  event->commit();
+}
+#endif // INCLUDE_JFR
+
 InstanceKlass* SystemDictionary::load_instance_class_impl(Symbol* class_name, Handle class_loader, TRAPS) {
 
   if (class_loader.is_null()) {
diff --git a/src/hotspot/share/jfr/jfr.cpp b/src/hotspot/share/jfr/jfr.cpp
index 3a2465e211d..b09a89594ad 100644
--- a/src/hotspot/share/jfr/jfr.cpp
+++ b/src/hotspot/share/jfr/jfr.cpp
@@ -173,6 +173,7 @@ bool Jfr::on_start_flight_recording_option(const JavaVMOption** option, char* de
   return JfrOptionSet::parse_start_flight_recording_option(option, delimiter);
 }
 
+#if INCLUDE_CDS
 void Jfr::on_restoration(const Klass* k, JavaThread* jt) {
   assert(k != nullptr, "invariant");
   JfrTraceId::restore(k);
@@ -180,3 +181,4 @@ void Jfr::on_restoration(const Klass* k, JavaThread* jt) {
     JfrClassDefineEvent::on_restoration(InstanceKlass::cast(k), jt);
   }
 }
+#endif
diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp
index 7b86e6c917e..db567cc9a29 100644
--- a/src/hotspot/share/jfr/jfr.hpp
+++ b/src/hotspot/share/jfr/jfr.hpp
@@ -79,7 +79,7 @@ class Jfr : AllStatic {
   static void initialize_main_thread(JavaThread* jt);
   static bool has_sample_request(JavaThread* jt);
   static void check_and_process_sample_request(JavaThread* jt);
-  static void on_restoration(const Klass* k, JavaThread* jt);
+  CDS_ONLY(static void on_restoration(const Klass* k, JavaThread* jt);)
 };
 
 #endif // SHARE_JFR_JFR_HPP
diff --git a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
index 06f361ced8c..5bdc0015a2b 100644
--- a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
+++ b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
@@ -171,6 +171,7 @@ void JfrClassDefineEvent::on_creation(const InstanceKlass* ik, const ClassFilePa
   }
 }
 
+#if INCLUDE_CDS
 void JfrClassDefineEvent::on_restoration(const InstanceKlass* ik, JavaThread* jt) {
   assert(ik != nullptr, "invariant");
   assert(ik->trace_id() != 0, "invariant");
@@ -186,3 +187,4 @@ void JfrClassDefineEvent::on_restoration(const InstanceKlass* ik, JavaThread* jt
     send_event(ik, cl->is_modules_image() ? module_path(ik, jt) : get_source(cl, jt));
   }
 }
+#endif
diff --git a/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp b/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp
index 4a0926023ca..3e242d8e4f2 100644
--- a/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp
+++ b/src/hotspot/share/jfr/support/jfrClassDefineEvent.hpp
@@ -26,6 +26,7 @@
 #define SHARE_JFR_SUPPORT_JFRCLASSDEFINEEVENT_HPP
 
 #include "memory/allStatic.hpp"
+#include "utilities/macros.hpp"
 
 class ClassFileParser;
 class InstanceKlass;
@@ -34,7 +35,7 @@ class JavaThread;
 class JfrClassDefineEvent : AllStatic {
  public:
   static void on_creation(const InstanceKlass* ik, const ClassFileParser& parser, JavaThread* jt);
-  static void on_restoration(const InstanceKlass* ik, JavaThread* jt);
+  CDS_ONLY(static void on_restoration(const InstanceKlass* ik, JavaThread* jt);)
 };
 
 #endif // SHARE_JFR_SUPPORT_JFRCLASSDEFINEEVENT_HPP

From c4ec983da57ee8aea71e88d5de2570c5d65a69df Mon Sep 17 00:00:00 2001
From: Robert Toyonaga <rtoyonag@redhat.com>
Date: Thu, 4 Dec 2025 13:56:17 +0000
Subject: [PATCH 512/512] 8370715: JFR: Races are possible when dumping
 recordings

Reviewed-by: egahlin, stuefe
---
 .../jdk/jfr/internal/PlatformRecording.java   | 10 ++-
 .../api/recording/dump/TestDumpOverwrite.java | 79 +++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/jdk/jfr/api/recording/dump/TestDumpOverwrite.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
index b07a71dd4d5..64454fc3cb4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
@@ -34,6 +34,7 @@ import static jdk.jfr.internal.LogTag.JFR;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -744,7 +745,14 @@ public final class PlatformRecording implements AutoCloseable {
     }
 
     private void transferChunks(WriteablePath path) throws IOException {
-        try (ChunksChannel cc = new ChunksChannel(chunks); FileChannel fc = FileChannel.open(path.getReal(), StandardOpenOption.WRITE, StandardOpenOption.APPEND)) {
+        // Before writing, wipe the file if it already exists.
+        try (ChunksChannel cc = new ChunksChannel(chunks); FileChannel fc = FileChannel.open(path.getReal(), StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING,  StandardOpenOption.CREATE)) {
+            // Mitigate races against other processes
+            FileLock l = fc.tryLock();
+            if (l == null) {
+                Logger.log(LogTag.JFR, LogLevel.INFO, "Dump operation skipped for recording \"" + name + "\" (" + id + "). File " + path.getRealPathText() + " is locked by other dump operation or activity.");
+                return;
+            }
             long bytes = cc.transferTo(fc);
             Logger.log(LogTag.JFR, LogLevel.INFO, "Transferred " + bytes + " bytes from the disk repository");
             // No need to force if no data was transferred, which avoids IOException when device is /dev/null
diff --git a/test/jdk/jdk/jfr/api/recording/dump/TestDumpOverwrite.java b/test/jdk/jdk/jfr/api/recording/dump/TestDumpOverwrite.java
new file mode 100644
index 00000000000..050b68eb538
--- /dev/null
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpOverwrite.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.api.recording.dump;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.SimpleEventHelper;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Test that multiple dumps to the same file by ongoing recordings do not mangle data.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.recording.dump.TestDumpOverwrite
+ */
+public class TestDumpOverwrite {
+    private static Path DUMP_PATH = Paths.get(".", "rec_TestDumpOverwrite.jfr");
+    public static void main(String[] args) throws Exception {
+        Recording recording1 = new Recording();
+        Recording recording2 = new Recording();
+        SimpleEventHelper.enable(recording1, true);
+        SimpleEventHelper.enable(recording2, true);
+        recording1.setDestination(DUMP_PATH);
+        recording2.setDestination(DUMP_PATH);
+
+        int actualId = 0;
+        recording1.start();
+        SimpleEventHelper.createEvent(actualId++);
+        recording2.start();
+        SimpleEventHelper.createEvent(actualId++);
+        // This is results in the initial write to the dump destination
+        recording2.stop();
+        SimpleEventHelper.createEvent(actualId++);
+        recording2.close();
+        SimpleEventHelper.createEvent(actualId++);
+        // This should first wipe the data previously written by recording2.
+        recording1.stop();
+        recording1.close();
+
+        Asserts.assertTrue(Files.exists(DUMP_PATH), "Recording file does not exist: " + DUMP_PATH);
+
+        // Verify events are read in order without duplicates (otherwise chunks may be out of order).
+        // If the dump file is not being overwritten correctly, we will see event ids: 1, 0, 1, 2, 3.
+        int expectedId = 0;
+        for (RecordedEvent event : RecordingFile.readAllEvents(DUMP_PATH)) {
+            Events.assertField(event, "id").equal(expectedId++);
+        }
+        Asserts.assertTrue(expectedId == actualId, "incorrect number of events found");
+    }
+}